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

2141 files changed, 198672 insertions, 1323 deletions

diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index d4b3a2f5..5d7294f1 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -1,58 +1,2170 @@
 <?xml version="1.0"?>
 <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-interfederations-2.0.xml">
+<xi:include href="swamid-interfederations-2.0/2012.qmplus.qmul.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/2013.qmplus.qmul.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/44new-primo.hosted.exlibrisgroup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai.arnes.si-test-edugain.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-login.fh-htwchur.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.bfh.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.fhnw.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.psi.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.uni.li-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai.rz.uni-leipzig.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai.sztaki.hu-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai.unifr.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/abcidp.askham-bryan.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/abertay.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/academic.mintel.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/academic.reportlinker.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/accesnoto.deboecksuperieur.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/access.hro.nl-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/access.lcb.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/access.procureweb.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/access.sant.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/access.wigan-leigh.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/acesso.ufabc.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/acm.jordanpublishing.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/activation.glew.org.uk.xml"/>
+<xi:include href="swamid-interfederations-2.0/adfs01.fhs.se-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/adfs.yz.yamagata-u.ac.jp-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/admin.safetynet.rmplc.co.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/admin.webfiltering.ja.net-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/adss-dev.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/adss.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/adss-sup.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/adss-tmp.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/adss.uas.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/adss-uat.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/afbi-shib.ads.qub.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/agata.suz.cvut.cz-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/agw-sparknet.utu.fi.xml"/>
+<xi:include href="swamid-interfederations-2.0/aishib.agropolis.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/alnbmth.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/alpha.bobnational.net-entityid.xml"/>
+<xi:include href="swamid-interfederations-2.0/alumniconnector.london.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ambre.vetagro-sup.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/antimoine.insa-strasbourg.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/api.credoreference.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/api.dev.credoreference.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/api.qa.credoreference.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-connect.xml"/>
+<xi:include href="swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/appdb.egi.eu-edugain-connect.xml"/>
+<xi:include href="swamid-interfederations-2.0/appdb.egi.eu-edugain-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/app.goodpractice.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/app.ords.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/appraisal.qmul.ac.uk.xml"/>
+<xi:include href="swamid-interfederations-2.0/apps.cricksoft.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/app.staging.goodpractice.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/apu.uepb.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/araripe.uece.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/arauto.fapesp.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/archive.conted.ox.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/archive.guardian.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/arts.idm.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/as1.jesus.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/astonsu-voting.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/athens.bruford.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/athens.gcc.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/athensla-dev.uwe.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/athenslart.nelson.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/athensla.uwe.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/athens.petroc.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/athensproxy.ids.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/athens.regents.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/athensri.forthvalley.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/athens.sfx.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/atlases.muni.cz-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/atrium.in2p3.fr-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.agrosupdijon.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/auth.asiaportal.info.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.aspirationtraining.com-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.buckingham.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.crous-versailles.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.cs.serialssolutions.com-auth-Metadata-Shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/authenticate.bvdep.com-ukfederation.xml"/>
+<xi:include href="swamid-interfederations-2.0/authest.bathspa.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.galegroup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.howcloud.co.uk-saml-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.ipublishcentral.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.mines-paristech.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.search.serialssolutions.com-auth-Metadata-Shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.services.bmj.com-auth.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.univ-paris-diderot.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.univ-pau.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.u-pec.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/avbmth.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/ballbcauth.balliol.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ballhmauth.balliol.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/bathspa.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/bcauth.balliol.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bcm.some.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bcm.sthughs.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bcmtest.new.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bcp-serviceadmin.company.ja.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/beaumontcollege.org-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/beta.aip.pub2web.ingenta.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/beta.asm.pub2web.ingenta.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/beta.brill.pub2web.ingenta.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/beta.digitaltheatreplus.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/beta.hp.pub2web.ingenta.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/beta.ingentaconnect.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/beta.jbep.pub2web.ingenta.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/beta.lawtel.com-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/beta.projecteuclid.org-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/beta.shib.manchester.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/beta.sketchengine.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/beta.telford.icebox.ingenta.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/betawww.itslearning.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bfas.scran.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bham-primo-stg.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/biggus.nesc.gla.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bits-qa.uas.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bits.uas.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/blogs.it.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/blogs-staging.it.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bmcidp.brooksbymelton.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bm.stars.manchester.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bmthbs.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/bmtheventskit.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/bmthmedia.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/bobnational.net-saml-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/bodportal.geant.net-autobahn-gui.xml"/>
+<xi:include href="swamid-interfederations-2.0/boleth.chi.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bolton.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/booking.ictf.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bookings.balliol.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bookingsdev.balliol.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/booksandjournals.brillonline.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/brad.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/bristol-shib.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/brunelstudents.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bsp-idp.shibboleth.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bsp-idp-test.shibboleth.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/butare.ifrn.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe1.ufes.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.accamargo.org.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe-idp.ufc.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.iec.pa.gov.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifb.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifes.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifg.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifnmg.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifpa.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifsp.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.on.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.pucminas.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafernp.insa.gov.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafetools.ufpi.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.udesc.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.uesb.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.uesc.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ufal.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ufop.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ufpa.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ufra.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.unicentro.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.unifap.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.unifran.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.unisc.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.upf.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.uscs.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cans.dev4.clientproof.co.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/capuccino.iff.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/capuccino.info.ufrn.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cardshibidp.cardonald.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cas.ac-martinique.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cas.cuni.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cas.educagri.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cas.ent-etrs.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/catalogue.clouds.geant.net-saml2-entityid.xml"/>
+<xi:include href="swamid-interfederations-2.0/cavle.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/census.mimas.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cerbere2.mines-douai.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cern.ch-login.xml"/>
+<xi:include href="swamid-interfederations-2.0/chronicle.bufvc.ac.uk-oa-metadata.xml"/>
 <xi:include href="swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/clarino.uib.no-.xml"/>
+<xi:include href="swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/classes.myplace.strath.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/clc2.uniservity.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/cloudstandards.cesnet.cz-sp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/colreg.de.dariah.eu-colreg.xml"/>
+<xi:include href="swamid-interfederations-2.0/community.ja.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/community.staging.company.ja.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/compute.deic.dk.xml"/>
+<xi:include href="swamid-interfederations-2.0/confluence.dev.ja.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/connectis-sso.qa.federatenow.net-broker-sso-tpd.xml"/>
+<xi:include href="swamid-interfederations-2.0/connectis-sso.staging.federatenow.net-broker-sso-tpd.xml"/>
+<xi:include href="swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/content.espresso.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/copac.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/copper-beech.oucs.ox.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/coursedev.conted.ox.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/courses.scholar.hw.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/coventry.ac.uk-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/crowd.nordu.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/csbmth.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/ct0.cirqahosting.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cts-dev.ngs.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/cts.ngs.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/customers.myunidays.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/c.yz.yamagata-u.ac.jp-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/dadotsdev02.essex.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dames.nesc.gla.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/darlfam.darlington.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/data.deic.dk.xml"/>
+<xi:include href="swamid-interfederations-2.0/decbmth.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/de.dariah.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dep.s2dv.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dep.software2.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev1.redclara.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev2.dariah.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev2.qmplus.qmul.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev2.webauth.soton.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/devapp.shibstats.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev.atomwide.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev.british-history.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev.emeraldinsight.com-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev.keynote.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev.k-int.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev.ords.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev.overtsoftware.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev.pf.adidas.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev.qmplus.qmul.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev-sso.knewknovel.com-entry-uk_federation-Metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev.staffsubs.ox.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/dev.wiseflow.dk.xml"/>
+<xi:include href="swamid-interfederations-2.0/dialect.liv-coll.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/digital-library.theiet.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/dlib-adidp.ucs.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dlib-jiscidp.edina.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dlib-jose.edina.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dlib-lockssdev2.ucs.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dlib-monidp.edina.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dlib-qwghlm.ucs.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dlib-schoolsidp.edina.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dlib-shandon.ucs.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dlib-tirnanog.ucs.ed.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dluat-pub2web.theiet.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dmponline.dcc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dmponline-test.dcc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dmz-shib-dg-01.dmz.roehampton.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/docs.nsms.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/doit.swisdom.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/draper.library.qmul.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dspace.jorum.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/duck-dev.bournemouth.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/du-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/dun-shib.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/e5.onthehub.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ec1.educationcity.com-sso-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/edev.cesnet.cz-sp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/edi.izum.si-idp-20100722.xml"/>
+<xi:include href="swamid-interfederations-2.0/edinburghcollege.cirqahosting.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/edocs.bathspa.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/educonf-directory.geant.net-simplesaml-module.php-saml-sp-metadata.php-eduCONF.xml"/>
+<xi:include href="swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/edugate.itb.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/edulidp01.hants.gov.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ed.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/eduroam.frizerska.si.xml"/>
+<xi:include href="swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml"/>
+<xi:include href="swamid-interfederations-2.0/edu.xtremeinformation.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/eeyore.sjc.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/efoyer.glam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/egiswamid.egi.kth.se-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/eka-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/elibrary.exeter.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/elibrary.worldbank.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/eliot.isae.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/elixir.mf.uni-lj.si-20140918.xml"/>
+<xi:include href="swamid-interfederations-2.0/e-localcourses.unibo.it.xml"/>
+<xi:include href="swamid-interfederations-2.0/el-shib.redbridge-college.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/encecafe.ibge.gov.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/endo-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/engine.surfconext.nl-authentication-sp-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/engs-web01.eng.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/engs-web02.eng.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/enroller.nesc.gla.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/epns.nottingham.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/epos.some.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/equinoxjournals.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/eresources.city.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/esds80.mcc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/esdsdev01.ds.man.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/esdswp01.ds.man.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/esodev.insrv.cf.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/espresso.ltscotland.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ethics-gradient.oucs.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/eu01.alma.exlibrisgroup.com-mng-login.xml"/>
+<xi:include href="swamid-interfederations-2.0/eu.alma.exlibrisgroup.com-mng-login.xml"/>
+<xi:include href="swamid-interfederations-2.0/events.ucl.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/exam.mvm.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ezproxy-dev.bodleian.ox.ac.uk-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ezproxy.rgu.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ezproxy.wlv.ac.uk-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/falcon-scratch.csx.cam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/falcon-test.csi.cam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/falmouthtechbookings.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/fam.carmel.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/fam.salford.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/febe.ufpe.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/fedauth.london.edu-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/federacao.ifpi.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federatedaccess.hrc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation2.univ-brest.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation2.univ-perp.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.agrocampus-ouest.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.bsigroup.com-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.citylit.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.crous-lille.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation-identite.univ-paris13.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.ined.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federationrenater.univ-montp2.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.sciences-po.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.umcg.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.u-pem.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.upf.pf-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.utbm.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/fede.supelec.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/fid.mnhn.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/fieldtrial.safetynet.rmplc.co.uk-shibboleth-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-hn-02-idp.orion.education.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/fod.geant.net-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/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.liu.se-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-tst.uas.ox.ac.uk-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/fs.uas.ox.ac.uk-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/gatekeeper.new.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/gateway.wolfson.ox.ac.uk-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/geoshibb.edina.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ghgtool.grnet.gr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/gidp.geant.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.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/gotodev.sbs.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/goto-prod.sbs.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/goto.sbs.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/goto-test.sbs.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.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/havana.ucs.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/health.balliol.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/hefce-shib.hefce.ac.uk-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/help.it.ox.ac.uk-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/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/hmauth.balliol.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/hornet.stars.manchester.ac.uk-shibboleth.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.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/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/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.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/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.istat.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.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/idm.ics.muni.cz-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp01.stfc.ac.uk-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.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.uwaterloo.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2-1.slu.se-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.hig.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.hv.se-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.kau.se-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/idp3.bucks.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp4.halesowen.ac.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.uni-mb.si-idp-20100614.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.abcolstudents.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.admin.grnet.gr-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.amersham.ac.uk-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.aquinas.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.arts.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aucb.ac.uk-oala-metadata.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.bath.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bc.cas.cz-idp-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.blackburn.ac.uk-entity.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.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.brock.ac.uk-entity.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.bsms.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bth.se-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.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.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.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.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.carnegiecollege.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cedia.org.ec-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cereq.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.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.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/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.coleggwent.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.coleg-powys.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.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/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.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-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-montpellier.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.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-css.irccs.garr.it-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.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.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.cyceron.fr:8443-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dante.net-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.sussex.ac.uk-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.dundee.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-devel.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.ehess.fr-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.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.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.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.escelje.si-idp-20140916.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.esher.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.esh.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.essingtoncc.co.uk-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.eurecom.fr-idp-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.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-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.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.georgikon.hu-idp-saml2-idp-metadata.php.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.glazer.si-idp-20131113.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gli.cas.cz-idp-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.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.gre.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.grimsby.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gssk.si-idp-20141130.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.harrow.ac.uk-idp-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.hesam.eu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hgo.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.highbury.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hiu.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.holycross.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hs-esslingen.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.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.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-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.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.ifc.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.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.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.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.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-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.irf.se-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.itam.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.itep.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.it.gu.se-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.it.su.se-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/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.kb.se-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.kmh.se-idp-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.kva.se-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.lapinamk.fi-idp-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.le.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lec.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.leedscitycollege.ac.uk-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.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.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.lnu.se-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.longroad.ac.uk-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.lu.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.macclesfield.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mah.se-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.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.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.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.mimas.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mmu.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.mta.hu-idp-saml2-idp-metadata.php.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.nesc.gla.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.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.niif.hu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nordu.net-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.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.nuigalway.ie-shibboleth.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-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.osfc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.os-selnica.si-idp-20131118.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.overtsoftware.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.pembrokeshire.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.phlu.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.plymouthart.ac.uk-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.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.primarylogon.co.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.protectnetwork.org-protectnetwork-idp.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.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.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.renater.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.rhul.ac.uk-oala.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.riversidecollege.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rnp.br-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.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.sciencespobordeaux.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.scptuj.si-idp-20111102.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.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.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.sics.se-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.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.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.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.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-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/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/idp.st-andrews.ac.uk-shibboleth.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.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.stmarysblackburn.ac.uk-idp-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.student.bth.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.suni.se-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.surfnet.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.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.ta.belnet.be-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.teicrete.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/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.warwick.ac.uk-idp-shibboleth.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.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.ttk.mta.hu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux1.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux4.fr-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.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.ucreative.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ucs.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ucuenca.edu.ec-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.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.uha.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uhk.cz-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.ul.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.umk.pl-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.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/idpunict.unict.it-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.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.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.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.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.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-tours.fr-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.u-paris2.fr-idp-shibboleth.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.urca.br-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.utia.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.utorauth.utoronto.ca-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uwic.ac.uk-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.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/idp.vet-alfort.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.vito.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.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.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.weston.ac.uk-idp-shibboleth.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.wlu.ca-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.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.wsc.ac.uk-oala-metadata.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.youngepilepsy.org.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml"/>
+<xi:include href="swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.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/ifs00sv056.ifsul.edu.br-idp-shibboleth.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/iif.iucc.ac.il-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ilearn.totton.ac.uk-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/infodev-d7-dev.nsms.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/infodev-d7-live.nsms.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/infodev-d7-test.nsms.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/informahealthcare.com-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/in-one-ear.oucs.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/intarch.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/integration.wcn.co.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/intranet1.balliol.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/intranet.balliol.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/intranetdev.balliol.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/intranet.hmc.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/intranet.merton.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ioe-shib.hosted.exlibrisgroup.com-shib.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/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-aai-logon.unibas.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/jcolls.mimas.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/jcrmail.new.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/jcr.new.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/jcrold.new.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/jcrtest.new.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/jcrweb.new.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/jenkins.ukfederation.org.uk-entity.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.heacademy.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/journals.rcni.com-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/keybucket.app.nordu.net-saml2-sp-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/kiidp.ki.se-idp-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-primo.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/ku-primo-prod.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/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/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/leedstrinity.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/leeds.wadham.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/library.qub.ac.uk-shibboleth-metadata.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/lists.geant.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/liverpool.idm.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/livesrv.ex.vr.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/lma-idp.lanet.lv.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.athena-innovation.gr-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.du.se-idp-shibboleth.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.fanshawec.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.fhv.at-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-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.idp.hhs.se-idp-shibboleth.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.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.liu.se-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.ntua.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.talisaspire.com-entity.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/login.uea.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.ufrgs.br-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.w-hs.de-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/lu-idp.lu.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/mail.secure.easymail.rm.com-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/masaq.oucs.ox.ac.uk-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/meals.oriel.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/meals.queens.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/meals.some.ox.ac.uk-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/members.myworks.co.uk-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/metalib01vapp2.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/metalib.library.qmul.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/mnementh.csi.cam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/mobileauth.labs.jisc.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.fsp.uni-lj.si-sp-201411192359.xml"/>
 <xi:include href="swamid-interfederations-2.0/moodle.helsinki.fi-shibboleth.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/mylogin.uni-freiburg.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/my.sbs.ox.ac.uk-shibboleth.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/naxos.queens.ox.ac.uk-shibboleth.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/neiss.nesc.gla.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/nerckwshibba.nerc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/netauth.new.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml"/>
+<xi:include href="swamid-interfederations-2.0/newcastle.kit-catalogue.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/new-primo.hosted.exlibrisgroup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/nortcoll.ac.uk-oala-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/nte.gemtech.fr-idp-shibboleth.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/oala.aaschool.ac.uk-oala-metadata.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/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/oasp.test.openathens.net-oa-metadata.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/online.learning.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/onlinepayments.gtc.ox.ac.uk-shibboleth.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/online.wadham.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/onurbantribe.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/opac.hull-college.ac.uk-secure.xml"/>
+<xi:include href="swamid-interfederations-2.0/openathens.aston.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/openathenstest1.test.openathens.net-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/openathenstest2.test.openathens.net-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/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/osms.maps-ict.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/ossdev.bsp.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ossqareg.bsp.ox.ac.uk-test-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ossqa.uas.ox.ac.uk-test-shibboleth.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.cesnet.cz-saml-sp.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/oxford.saasiteu.com-.xml"/>
+<xi:include href="swamid-interfederations-2.0/oxford-stg.saasiteu.com-.xml"/>
+<xi:include href="swamid-interfederations-2.0/oxford-uat.saasiteu.com-.xml"/>
+<xi:include href="swamid-interfederations-2.0/oxris.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/papercut.balliol.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/papercut.some.ox.ac.uk-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/passport2.e2bn.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/payments.balliol.ox.ac.uk-shibboleth.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.palgraveconnect.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.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-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/pp.webauth.soton.ac.uk-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/print.new.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/projecteuclid.org-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.amstat.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.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/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/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/rcm.ac.uk-oala-metadata.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/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/refserver.new.ox.ac.uk-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.shibboleth.ox.ac.uk-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-sp-ouls-ezproxy.xml"/>
+<xi:include href="swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.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/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/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/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/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/sabia.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/saml-delegation.data.kit.edu-shibboleth.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.sys.kth.se-idp-shibboleth.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/sant-ssp.sant.ox.ac.uk-shibboleth.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/sawfish.conted.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sbsintranet-prod.sbs.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sbsintranet-test.sbs.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sbsplatinum-prod.sbs.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sbsplatinum-test.sbs.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sbs-webhosting.sbs.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/scatfam.shrewsbury.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/school.c2kni.net-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/scsh.scran.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml"/>
+<xi:include href="swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-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/secure.anatomy.tv-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/secure.huygens.knaw.nl.xml"/>
+<xi:include href="swamid-interfederations-2.0/secure.ibisworld.co.uk-shibboleth-sp.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/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/serviceregistry.oerc.ox.ac.uk-simplesaml-.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.africa-grid.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sgw.garr.it-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/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.qmu.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib2sp.ntu.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib2.to.cnr.it-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/shibb1.hj.se-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/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/shibboleth2.crous-poitiers.fr-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.cab.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.mhp.semcs.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.now.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.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.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/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.amdigital.co.uk-shibboleth-sp.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.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.cavc.ac.uk-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.cranfield.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-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.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.ebscohost.com.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.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.ens-lyon.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.globaldata.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.grenoble-inp.fr-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.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.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.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.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.iumis.co.uk-shibboleth-sp.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.lsbu.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.metapress.com-shibboleth-sp.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.msacademicverify.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.mzk.cz-simplesaml-metadata.xml.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.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.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.reitoria.unesp.br-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-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.submit.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.techlib.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-test.cranfield.ac.uk-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.u-bourgogne.fr-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.ujf-grenoble.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.unb.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.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-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.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.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.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.ltu.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbox.charanga.com-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/shibb.ws.seemis.gov.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibby.wmc.ac.uk-shibboleth-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibdev2.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.dur.ac.uk:444-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibfederation.scientia.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.gcu.ac.uk-idp-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-idp-1.oru.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.cca.unipd.it-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.kgv.ac.uk-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/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/shibidp.to.cnr.it-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.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.varndean.ac.uk-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/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.manchester.ac.uk-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.pebblepad.co.uk-shibboleth-sp.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.rsc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.rsc-uat.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibserv.abdn.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.slcs.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibsles.brunel.ac.uk-idp-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.ntu.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibsp.proofidcloud.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-sp.unity.ac-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibtest.copac.ac.uk-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-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.u-paris10.fr-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.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/sids.somerset.ac.uk-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.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/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/solo-dev.bodleian.ox.ac.uk-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/solo-prd.bodleian.ox.ac.uk-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/solo-qa.bodleian.ox.ac.uk-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/solutions.sciquest.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.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/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/southdowns.ac.uk-oala-metadata.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.careknowledge.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sp.catalog.clarin.eu.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.cds.stfc.ac.uk-shibboleth.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.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-depot.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-kbplus.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-ukborders.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-vsm.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.gigajamvle.com-shibboleth.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.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/sp.primaryblogger.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.primarylogon.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/spprod.targetconnect.net-saml2.xml"/>
+<xi:include href="swamid-interfederations-2.0/sprov.d2digital.co.uk-.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-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-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-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.studentsponge.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp-test.canstudios.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp-test.wortech.ac.uk-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.vivomiles.com-shibboleth.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/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/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.connectis.nl-broker-sso-tpd-ukf.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.dshs-koeln.de-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-edu.datamonitor.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso-epos.some.ox.ac.uk-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.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.kgv.ac.uk-idp-shibboleth.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-meals.some.ox.ac.uk-shibboleth.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.onesource.com-shibboleth.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.sunderland.ac.uk-auth-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.tugraz.at-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/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.lifeisaboutlearning.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/staging.ords.ox.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/staging.weblearn.ox.ac.uk-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/store.lu.lv.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.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/studentstore.phoenixs.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/study.conted.ox.ac.uk-shibboleth-sp.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/sus-primo.hosted.exlibrisgroup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.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/take-shape-share.fenc.org.uk-shibboleth-sp.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/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.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/teledir5.telecoms.ox.ac.uk-shibboleth-sp.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-adfs.geant.net-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/test-auth.galegroup.com-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.ed.unidesk.ac.uk-shibboleth.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/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/testing.lifeisaboutlearning.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.myplace.strath.ac.uk-shibboleth.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.openathens.net-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-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/testshib.msacademicverify.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.shu.unidesk.ac.uk-shibboleth.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.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.worldbank.pub2web.ingenta.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/testx.rewley.ox.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/thalamoss-data.ics.muni.cz-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/timetable2.earth.ox.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/tkakin.nii.ac.jp-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/topdesk.bath.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/topdesk.test.bath.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/topdesk-training.test.bath.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/topup.chch.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/training.nicurriculum.org.uk-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/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.staffsubs.ox.ac.uk-shibboleth.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/ucl.epiclearninggroup.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/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ukaf.it-innovation.soton.ac.uk-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/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.ukpressonline.co.uk-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/unigepass.unige.it-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/uobhive.sisoshibboleth.co.uk-entity.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/upkdev.bsp.ox.ac.uk-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.nbi.ku.dk-saml-sp-wayf.xml"/>
+<xi:include href="swamid-interfederations-2.0/usertest.sciquest.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/utwente.nl-.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/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/verify.studentbeans.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.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/vmidgw3.miun.se-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/vmshib.ufrpe.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vote.kcl.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/voting.wlv.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/vvc.niif.hu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vwww.itslearning.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wakeonlan.liv.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wakshib1.wakefield.ac.uk-shibboleth.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.ordbogen.com.xml"/>
 <xi:include href="swamid-interfederations-2.0/wayf.wayf.dk.xml"/>
+<xi:include href="swamid-interfederations-2.0/wccidp.west-cheshire.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/webauth.soton.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/web.chorus.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/weblearn.ox.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/weblogin2.geant.net-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/webteam-stg.twig-world.com-shibboleth-sp.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.edugain.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki.helsinki.fi-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.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/wireless.balliol.ox.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/wiseflow.dk.xml"/>
+<xi:include href="swamid-interfederations-2.0/wolf-print.wolf.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/worc-helium.worc.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.123library.org-oa-metadata.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.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.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.bjhcm.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.blikbook.com-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.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.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.careers.ox.ac.uk-shibboleth.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.chinaclubhq.com-entity.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.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.dental-nursing.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.digitalmeasures.com-shibboleth-sp-.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.edgehillsu.org.uk-shibboleth.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.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.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.it.ox.ac.uk-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.jordanpublishingcpd.co.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.jstor.org-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.klarro.net-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.learninggrids.com-shibboleth.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.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.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-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.mmunion.co.uk-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.napierstudents.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.nejm.org-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.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.openaccessrepository.it-shibboleth.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.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.pathcal.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.pbyp.co.uk-sp-shibboleth.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.qoam.eu-.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rcpsych.org-shibboleth.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-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-urvidp.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.researchprofessional.com-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.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.sbs.ox.ac.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.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.sss.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.staffsubs.ox.ac.uk-shibboleth.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.studentsystemdr.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.studentsystem.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.studsysdr.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.studsys.ox.ac.uk-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.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.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/wwwtest.york.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.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.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/x5.bsp.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/x5-poc.bsp.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/x5-qa.bsp.ox.ac.uk-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/youidlite.youid.net-idp-shibboleth.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/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/.xml b/swamid-interfederations-2.0/.xml
index 740f12c7..951de878 100644
--- a/swamid-interfederations-2.0/.xml
+++ b/swamid-interfederations-2.0/.xml
@@ -1,33 +1,101 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2015-03-14T09:17:01Z" cacheDuration="PT345600S">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIHOTCCBiGgAwIBAgIQAg/p4rQP3A2b5rG7pJYglTANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBDQS0xMB4XDTEzMDQxMTAwMDAwMFoXDTE1MDUxNTEyMDAwMFowgfUxHTAbBgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzEcMBoGA1UECQwTw4VyaHVzZ2FkZSA4OCBTYWwgMTENMAsGA1UEERMEMjEwMDELMAkGA1UEBhMCREsxEzARBgNVBAgMCkvDuGJlbmhhdm4xEzARBgNVBAcMCkvDuGJlbmhhdm4xKTAnBgNVBAoTIEliaXN0aWMgVGVjaG5vbG9naWVzIERlbm1hcmsgQS9TMR0wGwYDVQQDExRzZXJ2aWNlcy5pYmlzdGljLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGGOlp7kpAShy2Duk6H4LhKps7Xveb9HBDRb0701v5dun0g3O1Im5wghIUcYnYuKAnMRQAG+nqlbpw22JKRfQei5snMSqaKiBG7zJl6EB8MeI+Ht1+iWvfn0ijDdU/kkE0U8ZPoJ9z5Wj0SG4KRLu8rkvBlq1V0Fa1sYBJcM9QQIh8GTALbOHkt4rzHXSqt9vb01Hai1hHmQz2Hu+04nGI2AZmTZYDSyyyx9sxSbEJHsyUPrXlEd1WHo8LQuIPmJ7L9SXAVmDmqehRkAKDxrvdi15JOCujpo3wVSbI9TYdZoDQXBQDjkHQliudWHYPHXsadJrkVHhKyk9bnE6lK2GcCAwEAAaOCA04wggNKMB8GA1UdIwQYMBaAFExYyyXwQU9S9CjIgUObpqig5pLlMB0GA1UdDgQWBBScCH5jpiDvtMm0IOrwRYri4+yAtjAfBgNVHREEGDAWghRzZXJ2aWNlcy5pYmlzdGljLm5ldDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGMGA1UdHwRcMFowK6ApoCeGJWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwK6ApoCeGJWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wfQYIKwYBBQUHAQEEcTBvMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRwYIKwYBBQUHMAKGO2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVkNBLTEuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKbx9nfzso6MmZijJupklvhCGi3CataD6GraOrki2BcAVfLka/VILsR6Lj8LXIN6zQK1XhiPSDvPaXpGFAtz2+IPUFUFJBT3JHsZ6AZDO8xNUMjfe8EYCVg46xyJF0vSSt6YxRcc7Bp+ksqJkmEEN0n/FfPbVDjhLkRUtU0KgockOhJydkDbCk888Ilhec446VRVIwRcHsfFj/CBOvodin14r7TtYphOOjXVp3xpvDSAgYIrWLkiBTFzPda524UeUOVawhcDhDyagmq8MtQp7os9TnyXRS4csHWNO0Wl77wUJcZ2KKFADUEPTrsbHb1sTcMhWW87neRM6fJa+AdGEp8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIHOTCCBiGgAwIBAgIQAg/p4rQP3A2b5rG7pJYglTANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBDQS0xMB4XDTEzMDQxMTAwMDAwMFoXDTE1MDUxNTEyMDAwMFowgfUxHTAbBgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzEcMBoGA1UECQwTw4VyaHVzZ2FkZSA4OCBTYWwgMTENMAsGA1UEERMEMjEwMDELMAkGA1UEBhMCREsxEzARBgNVBAgMCkvDuGJlbmhhdm4xEzARBgNVBAcMCkvDuGJlbmhhdm4xKTAnBgNVBAoTIEliaXN0aWMgVGVjaG5vbG9naWVzIERlbm1hcmsgQS9TMR0wGwYDVQQDExRzZXJ2aWNlcy5pYmlzdGljLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGGOlp7kpAShy2Duk6H4LhKps7Xveb9HBDRb0701v5dun0g3O1Im5wghIUcYnYuKAnMRQAG+nqlbpw22JKRfQei5snMSqaKiBG7zJl6EB8MeI+Ht1+iWvfn0ijDdU/kkE0U8ZPoJ9z5Wj0SG4KRLu8rkvBlq1V0Fa1sYBJcM9QQIh8GTALbOHkt4rzHXSqt9vb01Hai1hHmQz2Hu+04nGI2AZmTZYDSyyyx9sxSbEJHsyUPrXlEd1WHo8LQuIPmJ7L9SXAVmDmqehRkAKDxrvdi15JOCujpo3wVSbI9TYdZoDQXBQDjkHQliudWHYPHXsadJrkVHhKyk9bnE6lK2GcCAwEAAaOCA04wggNKMB8GA1UdIwQYMBaAFExYyyXwQU9S9CjIgUObpqig5pLlMB0GA1UdDgQWBBScCH5jpiDvtMm0IOrwRYri4+yAtjAfBgNVHREEGDAWghRzZXJ2aWNlcy5pYmlzdGljLm5ldDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGMGA1UdHwRcMFowK6ApoCeGJWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwK6ApoCeGJWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wfQYIKwYBBQUHAQEEcTBvMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRwYIKwYBBQUHMAKGO2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVkNBLTEuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKbx9nfzso6MmZijJupklvhCGi3CataD6GraOrki2BcAVfLka/VILsR6Lj8LXIN6zQK1XhiPSDvPaXpGFAtz2+IPUFUFJBT3JHsZ6AZDO8xNUMjfe8EYCVg46xyJF0vSSt6YxRcc7Bp+ksqJkmEEN0n/FfPbVDjhLkRUtU0KgockOhJydkDbCk888Ilhec446VRVIwRcHsfFj/CBOvodin14r7TtYphOOjXVp3xpvDSAgYIrWLkiBTFzPda524UeUOVawhcDhDyagmq8MtQp7os9TnyXRS4csHWNO0Wl77wUJcZ2KKFADUEPTrsbHb1sTcMhWW87neRM6fJa+AdGEp8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.ibistic.net/sso/wayf/saml/post/ac" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Ibistic Services</md:ServiceName>
-      <md:ServiceName xml:lang="da">Ibistic Services</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to handle and approve supplier invoices in a web-based solution</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at håndtere og godkende leverandørfakturarer i en webbaseret løsning</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
+<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>
+        <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>
+						MIIDLzCCAhegAwIBAgIUAnlMK5UZoNDOL9nbtSWzA8/XR4cwDQYJKoZIhvcNAQEF
+						BQAwHDEaMBgGA1UEAxMRc2dzYTAxLnNndWwuYWMudWswHhcNMTMwNjExMDkyMTAy
+						WhcNMzMwNjExMDkyMTAyWjAcMRowGAYDVQQDExFzZ3NhMDEuc2d1bC5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIp65woT8aiIkKpFnRy8WNIk
+						GbO/EL0wJnYI7/AuGoCCPbvnxwAXoIqyNjSnzy82dTn82rZGlKQFL7pfZ/vq3Pxl
+						PDn5mwF5VQYW17LunIhrj9JgnRuTxNW/XpsL74/hmeZwj859NmHA0HXQ+3T/kkS1
+						BHD3V1uQBYTAHGpjJHe8E0p3sDRNjldx2negX7mhmde1D1CeSEcpaDpod4DTrc3W
+						Q56/5tXTl6OrUYlHGyjzDlknrLNS8NyGRuY1vPXjaWJFesru3uRHI1FduWXgtY1F
+						a0A5FBy4btrIixxPgSfrJehzkjLdF7eYAd+efJTuoRoLOeWA+kHGJof6+vqtQ4kC
+						AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2dzYTAxLnNndWwuYWMudWuGKGh0dHBzOi8v
+						c2dzYTAxLnNndWwuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMBNSmc4
+						4s/YiTVkVD7VJ4AP/nlQMA0GCSqGSIb3DQEBBQUAA4IBAQAk/Ys37rY68WWcw9uj
+						FNcSiG0jetWek4UHPajBN/CKwEqgIizvpjFNQdWp/BsMg1SF9ItzvsyhN6S+HoaD
+						r6ndXU5h9vJTnOlbnE0aPMU0SC7Q5AZKjqtSx/OvyZ/sPG+OW08C70fsSQ5F7pj5
+						ZiEtvU8EPPeQo0XAekQjmZyoUpDqM+NfTCmaBSIXEgI1oUJrzrMFmY0cYzz3JDtD
+						T8Ji+J5vBVFGESak+uKDq7dDV9ERia7sy5CxS15L9dxc3SPTBGkTyDjTEAEKsXa/
+						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>
+						MIIDLzCCAhegAwIBAgIUAnlMK5UZoNDOL9nbtSWzA8/XR4cwDQYJKoZIhvcNAQEF
+						BQAwHDEaMBgGA1UEAxMRc2dzYTAxLnNndWwuYWMudWswHhcNMTMwNjExMDkyMTAy
+						WhcNMzMwNjExMDkyMTAyWjAcMRowGAYDVQQDExFzZ3NhMDEuc2d1bC5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIp65woT8aiIkKpFnRy8WNIk
+						GbO/EL0wJnYI7/AuGoCCPbvnxwAXoIqyNjSnzy82dTn82rZGlKQFL7pfZ/vq3Pxl
+						PDn5mwF5VQYW17LunIhrj9JgnRuTxNW/XpsL74/hmeZwj859NmHA0HXQ+3T/kkS1
+						BHD3V1uQBYTAHGpjJHe8E0p3sDRNjldx2negX7mhmde1D1CeSEcpaDpod4DTrc3W
+						Q56/5tXTl6OrUYlHGyjzDlknrLNS8NyGRuY1vPXjaWJFesru3uRHI1FduWXgtY1F
+						a0A5FBy4btrIixxPgSfrJehzkjLdF7eYAd+efJTuoRoLOeWA+kHGJof6+vqtQ4kC
+						AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2dzYTAxLnNndWwuYWMudWuGKGh0dHBzOi8v
+						c2dzYTAxLnNndWwuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMBNSmc4
+						4s/YiTVkVD7VJ4AP/nlQMA0GCSqGSIb3DQEBBQUAA4IBAQAk/Ys37rY68WWcw9uj
+						FNcSiG0jetWek4UHPajBN/CKwEqgIizvpjFNQdWp/BsMg1SF9ItzvsyhN6S+HoaD
+						r6ndXU5h9vJTnOlbnE0aPMU0SC7Q5AZKjqtSx/OvyZ/sPG+OW08C70fsSQ5F7pj5
+						ZiEtvU8EPPeQo0XAekQjmZyoUpDqM+NfTCmaBSIXEgI1oUJrzrMFmY0cYzz3JDtD
+						T8Ji+J5vBVFGESak+uKDq7dDV9ERia7sy5CxS15L9dxc3SPTBGkTyDjTEAEKsXa/
+						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>
diff --git a/swamid-interfederations-2.0/2012.qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/2012.qmplus.qmul.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..7c69f330
--- /dev/null
+++ b/swamid-interfederations-2.0/2012.qmplus.qmul.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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://2012.qmplus.qmul.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-30T09:22: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://2012.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>
+						MIIDCTCCAfGgAwIBAgIJAKfCPp1ZOBsNMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFjIwMTIucW1wbHVzLnFtdWwuYWMudWswHhcNMTQwNjI1MDk1ODE3WhcNMjQw
+						NjIyMDk1ODE3WjAhMR8wHQYDVQQDExYyMDEyLnFtcGx1cy5xbXVsLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtKJY1LEzeMszLBA7vIwDWTvd
+						a07jaXtUFBdFyEqnwBIr91EJxyCdkHd4qGhw3riCUE5XEEaHq7YkIA1sHjzAxkv3
+						bpjnI1iaP4gU4+Dwec0kJ4VkPFt4vE6TSICeA//DBrL+ZMcD8hjZDRhTxAHv9t96
+						bIfsmxrlBizuS6GAAAHm3eWbzYJ6V5tf79Z9GZjMTjZtrloem4B1+UsS0Ze17CU9
+						liUSJUZKT39gQN7JywnQ+DAkGe1rfQmQHdwdt1ekPnPomOBy9h6aymxgOqGHxmIK
+						l2tixtmYVZYoAPlrDEZEtdU6BRUMPiJCYlz/wG+QRN75PvMjbmpNIKAyJUwAZwID
+						AQABo0QwQjAhBgNVHREEGjAYghYyMDEyLnFtcGx1cy5xbXVsLmFjLnVrMB0GA1Ud
+						DgQWBBS9sdhTGd7ns9eUGONqUjAaTo1ADjANBgkqhkiG9w0BAQUFAAOCAQEAKtjj
+						o3HiYvqfjOcaUNv0yq3i3LCTf+PobbmX5YBXDBQhYrvkuaUcfTRr6hIE86RZwMC7
+						9rGV63IqTKQtpjF3odt/rSTNgRz0iEc2p+HtCdN4cBR6aSEwOyHfj8MotC8L5JO9
+						3GTfasl+ZuRDEtsgZeIZv+zIjO1CDL6eE/OyyMo9bFmvOrrvGKXp01LR2VuqEy+M
+						s9GzHa6yGaWQBoQaLVXMhRT3AM3y9hRh1P4GgsIS+Z0oOeW1VGEg6nDC29fXLfrN
+						YWbnO44vlTi3MGoezwxe/U2v+4+rXPEJ28rVZp74FaLYsR+5OpsC5VR7moj78OWF
+						uifWa1iscTfgACwOQg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://2012.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://2012.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://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://2012.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://2012.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://2012.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 :2012 Archive service QMPlus</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/2013.qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/2013.qmplus.qmul.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..8523aa55
--- /dev/null
+++ b/swamid-interfederations-2.0/2013.qmplus.qmul.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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://2013.qmplus.qmul.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-30T09:30: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://2013.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>
+						MIIDCTCCAfGgAwIBAgIJAPF6LFlIA32CMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFjIwMTMucW1wbHVzLnFtdWwuYWMudWswHhcNMTQwNjI1MTAzNDEyWhcNMjQw
+						NjIyMTAzNDEyWjAhMR8wHQYDVQQDExYyMDEzLnFtcGx1cy5xbXVsLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw6/lcGM+dX3Di5zb59Vgc9Nk
+						pua1wWdwr4a0f/r7OIpzAy9eAJyTh/OSOZ1OOBfnqUfyyyQDKYNEo/647esD2BsS
+						pcTVNI0gyiL5RDgrYWKUyHYR0ABfWE7dcH8C3dqqvA+p1Gw5919DhqJ5bGjid9aJ
+						FJcAIybDhEhLGPsrrleHYVJTvORhr5Nx9JSUPGOBbPrvnan6e4WDgF+0Ag9F2tqR
+						Ew1k3AAfcEQoJ1zYW30lpPvAcCcPXq0S0KMt7tyTCj8QwBzTL4grtUDrxHlNDGge
+						mh8y4mNRqovf6BaFtiw7qDR6bMb6zSMMQslba1elMPcKDsHpjVFrUyuSLaQrLQID
+						AQABo0QwQjAhBgNVHREEGjAYghYyMDEzLnFtcGx1cy5xbXVsLmFjLnVrMB0GA1Ud
+						DgQWBBT4f7ZeBIp8yxs6bHP+sIwzrWqgCDANBgkqhkiG9w0BAQUFAAOCAQEAo17z
+						s4xG2srq3DBGYf6AIjAnbFmdHwcJ+LlZ1iubB4mA6p/UhgmFo7VRQuguLCOu7ODN
+						l+hl7Dwrqlm5EFXy/wZ1U4PKFwubjcWRpdwTacucVE7gsJ89Fc+biQF9gx+wfbF9
+						ivhUzzOPK7uduFxzmkiVqBUMay2jzHk4PKavzUKYwyMJq67oEkgzAVqMhsrSY06Q
+						NXPEera7rHya4c+6acbmYPyzDIUPNe9AfBEkqiyIT2XoMtE+bJGEIyrhE1Guir4W
+						wW1DKXTMp8Y/c74joFVC0Eu3ZDdzGDLbkZRrYbH4868mcA+zAVLXWXpHVD62XXQX
+						d9OOKeCgcXtItuvjoQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://2013.qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://2013.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://2013.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://2013.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://2013.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://2013.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://2013.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 : 2013 Archive service QMPlus</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/44new-primo.hosted.exlibrisgroup.com-shibboleth.xml b/swamid-interfederations-2.0/44new-primo.hosted.exlibrisgroup.com-shibboleth.xml
new file mode 100644
index 00000000..cacc7f5d
--- /dev/null
+++ b/swamid-interfederations-2.0/44new-primo.hosted.exlibrisgroup.com-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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://44new-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-01-07T11:11: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://44new-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>
+						MIIDNjCCAh6gAwIBAgIJAIdGru6Iz9m0MA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
+						BAMTJWRjMDN2ZzAwMjJldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTEw
+						OTAxMTIyMTEzWhcNMjEwODI5MTIyMTEzWjAwMS4wLAYDVQQDEyVkYzAzdmcwMDIy
+						ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAuZcRSbYJXYqvCMDcsN1NvvfB37VY156cSBF8FUKYdu1yco+G
+						534wiphhYFRsnkDnUuAP9yQED27E/rGfdWrQ3OhkDViuEkKxWhzqYSzopxe/5y6i
+						4oNFORY6HpbdrqF21IZc8bfspS7uz6oOET6V1hYIhd3V5nOTB5VyO1CdKd7o65wr
+						CTGj2rzKDXb4uj0HKST3aRLK26jlER5x9uR68RW4nUM45/vmHRgyqfKd+pVMPld2
+						TCGDh/jmFvjyHlzZf6jXMgVAgDUAvFXWgCxPo2fuOqlWpVJTalj3CK7uuEx6+SUk
+						I3g+FyUC5sJGMTEOwFgKjhOECeYU8+5a/zqnFwIDAQABo1MwUTAwBgNVHREEKTAn
+						giVkYzAzdmcwMDIyZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
+						BBQPC+IZUQn+WJezFAf2U7VnfAJiKjANBgkqhkiG9w0BAQUFAAOCAQEAbK7NgNnG
+						T3qgmYt+4otVR0DBCGlsj50HFvNb4C4uWOEWREUZ9Bb3Ju7E49zMRzf96HpWZneS
+						cfaUQrhYl1n8grNGdy8O0PXffSkqr0d9FfaT3IkuIQSqy6mi198brqgVeyNR5BjR
+						bi3OGv48vQdkPhzzTR5/H5/mi4U0i54sSI8GFkcRjytrqS1eqdHDRVFkdXbaKsaU
+						o+p64ZHxRlqxaFsieCz+5CdiqP9pJwHX3ghS40QMYAMP+P43YJmSlc9FnseWulik
+						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://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://44new-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://44new-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://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://44new-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://44new-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://44new-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/Shibboleth.uem.br-idp-shibboleth.xml b/swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml
new file mode 100644
index 00000000..2e49404a
--- /dev/null
+++ b/swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIC4jCCAcoCAQAwDQYJKoZIhvcNAQEFBQAwNzEMMAoGA1UECxMDTlBEMQswCQYD
+VQQGEwJCUjEaMBgGA1UEAxMRU2hpYmJvbGV0aC51ZW0uYnIwHhcNMTQwNDE1MTQx
+NTIwWhcNMTkwNDE0MTQxNTIwWjA3MQwwCgYDVQQLEwNOUEQxCzAJBgNVBAYTAkJS
+MRowGAYDVQQDExFTaGliYm9sZXRoLnVlbS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALs/KHnZekrQFrHtk9e+vVMklEe0+7HfSu34nJHP7vOpQTZR
+KwpRnisPoSwBkeY4JcbgUa2/gSskUTSf4EBWvrfaUs5NATXc0l5VOT7T2vXrUye0
+Ua1LsAroWH2/yEB2gvs8THrtp+UZ1uAYJkoIxcc9ydZ7LKUpSuv/LrCAjHaiwD6q
+jNMSFYm+UUpt6tzAWBuHfoJng92JId0qelSGIT7WjjOPlyE/iA+gXZd1/k4FFS8V
+dxAcNYLlP8uqVjVR9RsHRjOphdxvvNg8r9210k2z8XH698EOKmunuVMkcFaBIevO
+pc6rhoGj/ldt9J8F5skvx2l9qwezMOXwgJyf/UsCAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEApYQmpGfiWbaWLXUYvh30t5YUPqvnPcNfz70mdUhm4zIDBzHIRZeBHg2L
+95GqLFmCdQnHXcVVVADx/w1FXOQk14l3tmukOCRGHga0Ut6DPvAcJSVcTAfUh03U
+mFETv9XACNN6qWfV0f6kUWU3O64runCgTATOHFNkT+wOusx8pIIwdXudj47+KbZS
+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>
+      
+MIIC4jCCAcoCAQAwDQYJKoZIhvcNAQEFBQAwNzEMMAoGA1UECxMDTlBEMQswCQYD
+VQQGEwJCUjEaMBgGA1UEAxMRU2hpYmJvbGV0aC51ZW0uYnIwHhcNMTQwNDE1MTQx
+NTIwWhcNMTkwNDE0MTQxNTIwWjA3MQwwCgYDVQQLEwNOUEQxCzAJBgNVBAYTAkJS
+MRowGAYDVQQDExFTaGliYm9sZXRoLnVlbS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALs/KHnZekrQFrHtk9e+vVMklEe0+7HfSu34nJHP7vOpQTZR
+KwpRnisPoSwBkeY4JcbgUa2/gSskUTSf4EBWvrfaUs5NATXc0l5VOT7T2vXrUye0
+Ua1LsAroWH2/yEB2gvs8THrtp+UZ1uAYJkoIxcc9ydZ7LKUpSuv/LrCAjHaiwD6q
+jNMSFYm+UUpt6tzAWBuHfoJng92JId0qelSGIT7WjjOPlyE/iA+gXZd1/k4FFS8V
+dxAcNYLlP8uqVjVR9RsHRjOphdxvvNg8r9210k2z8XH698EOKmunuVMkcFaBIevO
+pc6rhoGj/ldt9J8F5skvx2l9qwezMOXwgJyf/UsCAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEApYQmpGfiWbaWLXUYvh30t5YUPqvnPcNfz70mdUhm4zIDBzHIRZeBHg2L
+95GqLFmCdQnHXcVVVADx/w1FXOQk14l3tmukOCRGHga0Ut6DPvAcJSVcTAfUh03U
+mFETv9XACNN6qWfV0f6kUWU3O64runCgTATOHFNkT+wOusx8pIIwdXudj47+KbZS
+g1si2gBE4K06TiA8DygDCIaqS7roCrsGc1iY1FWop03y91TABSH9EzU25dgAW9Q2
+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>
diff --git a/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..93222079
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-idp.unibe.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-01-05T15:05:49Z">
+      <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.id.unibe.ch/content/helpdesk" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibe.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Bern</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Bern</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Universität Bern</mdui:Description>
+        <mdui:Description xml:lang="en">University of Bern</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAeVJREFUeJyUkr9LQlEUx58u6p8gOLq5CeKkq+gkooMi6CCCILi4ujyMokhLkSIJdDKMUmxoShOHkFwEHdR0CULQ5+Dv3yfPhSsVGTncx7vfe87nnPs9lwEA5r9rvV4zFosFqtXqA9X+nYxrPB6farVayGQy9W63e7k3gOO4C4VCAV6vF8xmM4xGo8BegFKp9OR0Oje/wJpMJqjVavd7ARKJxIfP54N6vX6n0+mg1+tFGGxjMpmcrFarg9lsdrxYLA6/JqG+XC6JlkqlmkajEbCLXC73Sjzw+/3gcrlApVKBUqmEZrOZpMlYTa1WQyAQAArr9/vn8/n8aDuFwWBwjhBm46dEIgF0mjqOe9RDodBq17Xww9psNhKIM6YH5XL5kc/nA4/HAzRvJ2DTDiOTyQggGAxuAdFodEC7Gg6HZzsBrVbrRiAQEECxWHymBw6Hg2h6vR52JRNAOp1++1lpOp2eSKVSAmBZlgBwZHQa3wDoNAYaDIZtpXg8zqGG989ms6+Y7Ha7twZ/A2AiBmMAvoF8Pl+02+1EEwqFZKwejweSyeT7r1eIRCJzkUgEYrEYrFYrhMPhZbvdvpbL5YDeaDQaiMVi3F9jZCqVygO+rEajcUsPOp3OVaFQeEGT/zLxEwAA//8DAH2UumiGm7jIAAAAAElFTkSuQmCC</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+hkAAAZRSURBVHic7Jp9TFNXGMaJMYpTg4tBF2OMATGYhYWZCUTEzSj+Y2Q47DLUyWAJKhsi39kQEIHJhLCBjgxxGwgCg/GhCOL4UNSKEw0MHBXHN8jnBAUc0MJz9pZbSiHGLN5LK5UnTXN73nNvnt8957znbW912GsmHf6XiI2NXb169dDQEP9LqUECAPv5+VlYWPC/jnokALBIJHJwcOB/HfVIAGBLS0tbW1tHR0dPT8/u7m7+F5xW8QUeHBw0MDAwMzMLDAyklWxnZwdAEGfTJL7Ara2tS5YsEYvFdJyTk7N48eKOjg4hjE2X+AKXlZURcFNTEx3funVr0aJFjY2NQhibLvEFTktLW7VqlVQqpePg4GBDQ0Oa5EIYmy7xBQ4NDV23bp1EIomOjqb5HB8fL4it6RNf4LCwsDVr1piYmGzZsiUjI0MQT9MqBXBqaqqXl5ePjw8l22PHjnl4eDg7O09Zjbm5uQEBARSlPs3NzVyjTCbrG5O6jb+sFMCnTp0KCgry9/dfuHChzphofnZ2dir70WZD+y0XmjdvnhJ4xmnSlKaygVIuR7Vt2zbVEMHr6+tzISokR0dH1etTME0CzsvL0xkXVciqoaKiImXI1dVVvSaF1CRg2leUVLRiVUOUjZWh5ORk9ZoUUpOAbWxsOCQ9Pb2WlhbV0I4dO7jQ/Pnzq6ur1WtSSE0ADwwMUNnAUZmbm4+MjChDT548WblyJRcyNjZ+xUuLF2sCuKqqitLvc1dpaWnpnDlzuJC9vb3aTQqpCeCkpCTlKk1JSVHtFBkZqQxFRUWp3aSQmgB2c3PjkBYsWFBTU6Paafv27VyIxpm+IXCNtbW1/f39ajUrhBTAVFdYWVlxVFQbq/5AVVFRQbeAC61YseLx48fU2NvbS93u3bunGdc8pADu6ekhGI5KJBIpw5S6du7cqZzP1tbWXLu3tzcNu2pimylSANMc1tXV5agIhmukCtnFxYWm+tKlS7mQr68vtefn5y9btuz+/fsac81DCuCuri5l5WhkZJSYmBgTE0MlZHh4OA3j2rVruRCNakREBG1R6enpmvX90ppIWnFxccuXL+fA5s6du3nz5oKCAi6UkJCgrLFNTU0LCws15FYATaq02traSkpKiouLKQNP6VdXV0ft5eXl9H1QjfaElwA/084szQJru2aBtV2zwNquWWBt1yywtmsWWNulAM7Qdk0FjtZ2TQV+faQAlkqlAwMDmrWiHimAJRJJVFTU8PCwZt2oQQpgsVjs7u4+5YGDVkoBnJmZGRISkp2drVk3apACuKOjo7KycuY+1///en6WhspLtZFNbnnuWVP64FEXqv5m7d0vPldtGgeuaWLXy1HXitJKNLUj+TLa/0FxGevtQ+5N1Lawgtvs2SByrqOxHXFZ+OUiep6yCyXsTDqrqGHDMpy/jNgMDA4hT4wHDeznC4hNR00jrt2FpSPEFZDUy1vOZrNeTT6CGwc+k8X2ByLlCg6dwKUb0DFBwI/45Cv2Vz02fIo/H2KTE9IK8LEvu1IKQxscP4uuHph/Bmtn7PbBjXK8+QGiU+XAFg64WobDJ7FhL6N7R+RvbUViLhoeYZMjvghj/c9eAeD4HGbvh7hMMoQL12DtAsMPYefNquvx3j6MjkLki3f3IKuYhh1v2+GHNDztx0YnvLMb/jGs7xm9w/gj+TBu+pzmMFLysddPPsk3OsJsn7yRjg+EIilPg7RsArixDTZHYH0IhX/g91JEpcDzOxz6Bg2t2HeU4mQUZvvRN8BuV2HrARwOR30rvvwW2dfk75IGOAfDxh2POuEUxB42yacJ3Qjqs+drlNzFLm80tyP0J3axRJO4k5KWVEarVH4wCvmLJBthAFM+Ex0Zy+HUMiRlA/8ySulcSCaTh3r7xj+OnUVXGBnrwP19mutM75reCF7XWpqV1+BgCDwjWVsXTqfhyAn8VoTaZhwIhnsEuNxz8hwoY+Xe1KhhvhoHziiWpxyjXexmBWw9IfKglcyK7sB4F0ztQQcHQ6H3vjyNhSdo1DBfjf/HI+sqrJzke0/2VdqNcPC4fEOm3WW9PWVp9qARbuHyHUvXAqd/1axjnhof4UvX8cYGGNjId8vdvtC3YF7fo/gOHINwNAbh55jrSeTewPq9LPK8Rg3z1WuXtP4DAAD//wMAnPfzPGW0I0UAAAAASUVORK5CYII=</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>195.176.0.128/28</mdui:IPHint>
+        <mdui:IPHint>195.176.3.0/26</mdui:IPHint>
+        <mdui:IPHint>195.176.3.128/28</mdui:IPHint>
+        <mdui:IPHint>192.41.149.0/24</mdui:IPHint>
+        <mdui:IPHint>192.41.152.0/21</mdui:IPHint>
+        <mdui:IPHint>192.41.160.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:620:400::/48</mdui:IPHint>
+        <mdui:IPHint>86.118.0.0/15</mdui:IPHint>
+        <mdui:IPHint>86.118.149.0/26</mdui:IPHint>
+        <mdui:IPHint>130.92.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>unibe.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:46.950509,7.438155</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>
+MIIFLjCCBBagAwIBAgIUSNx7E+uCPG6hqtUGUdmK6AYhNb4wDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDQxMTA3MzIx
+M1oXDTE2MDQxMTA3MzIxMVowgb8xEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsr
+BgEEAYI3PAIBAhMEQmVybjEaMBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzAR
+BgNVBAUTCjE4MzQtMDMtMTQxCzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRCZXJuMQ0w
+CwYDVQQHEwRCZXJuMRowGAYDVQQKExFVbml2ZXJzaXRhZXQgQmVybjEZMBcGA1UE
+AxMQYWFpLWlkcC51bmliZS5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAOIKnhNcUtzjdGnBWU5sJGuwQyrGH8PnKmW8SOmKMeArDjc3CNwz20NzSRWL
+fkyG5Ti098dGE5skUwjGoexhqQsECn4CtlosHmQNx6DWvY5lHIzPuZEEkQssYYtN
+jIOfCy6COhce3hi80+pFDHvFYUjWmW+IMeCky60qBZlcM2HiXhh4v/Dlmt/5FgGP
+rQwZUXT5uFCICvcAVpe5NL/bjJQs69yrLu/fEfgdwLeqxYqeol+yZxJZp77mElFB
+wur4fNR1798DsiBPRT4v8Ak73YN4sxwb0ZIvGa8QI/zgrkniRjeAjrP36WmRyoxg
+vZI5ZvkkVTp8uwZuf3/RPn/4mu8CAwEAAaOCAZEwggGNMHMGCCsGAQUFBwEBBGcw
+ZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDcG
+CCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3Ns
+ZzIuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYIKwYBBQUHAgEW
+KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwGwYDVR0R
+BBQwEoIQYWFpLWlkcC51bmliZS5jaDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFJEZYq1bF6cw+/DeOSWxvYy5
+uFEnMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwu
+Y29tL3F2c3NsZzIuY3JsMB0GA1UdDgQWBBSCX8oNHGUSht4v58mKWfgqQaG+pTAN
+BgkqhkiG9w0BAQsFAAOCAQEAr+tBEvztLUq6sDzB/I4N4reJiWs+HXM3Nt5zPwBG
+4QmH2X/P0EfIKCKFrcAiBDYK0BBTK5LM78uZoF/rC/eRNJdFqcUxO7V2I2EOr0/g
+dBmV88orKTsK3HJ/BOxy4KGdKeDAMYli35w99xjEfRu+XbGrn8jvDWL4Z93/zbmw
+fOl8C+fbd9vbPPGMbPBYCLuj+JLIjNJVMOFZUCV3qOHPf+llHS+epzBl47oTNWsh
+Fo1fKj/jbU9y/7hE+8uhbqzr8uppWJYcLUpX49pe+YGzfaq0gjMlMh8/Pzc4DXQ7
+W2X26PAcxR9Ni6k2VcPdwrF+wSz0jKwCrJzugJ1Z99ABWA==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-idp.unibe.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-idp.unibe.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://aai-idp.unibe.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-idp.unibe.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-idp.unibe.ch/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-idp.unibe.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">unibe.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFLjCCBBagAwIBAgIUSNx7E+uCPG6hqtUGUdmK6AYhNb4wDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDQxMTA3MzIx
+M1oXDTE2MDQxMTA3MzIxMVowgb8xEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsr
+BgEEAYI3PAIBAhMEQmVybjEaMBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzAR
+BgNVBAUTCjE4MzQtMDMtMTQxCzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRCZXJuMQ0w
+CwYDVQQHEwRCZXJuMRowGAYDVQQKExFVbml2ZXJzaXRhZXQgQmVybjEZMBcGA1UE
+AxMQYWFpLWlkcC51bmliZS5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAOIKnhNcUtzjdGnBWU5sJGuwQyrGH8PnKmW8SOmKMeArDjc3CNwz20NzSRWL
+fkyG5Ti098dGE5skUwjGoexhqQsECn4CtlosHmQNx6DWvY5lHIzPuZEEkQssYYtN
+jIOfCy6COhce3hi80+pFDHvFYUjWmW+IMeCky60qBZlcM2HiXhh4v/Dlmt/5FgGP
+rQwZUXT5uFCICvcAVpe5NL/bjJQs69yrLu/fEfgdwLeqxYqeol+yZxJZp77mElFB
+wur4fNR1798DsiBPRT4v8Ak73YN4sxwb0ZIvGa8QI/zgrkniRjeAjrP36WmRyoxg
+vZI5ZvkkVTp8uwZuf3/RPn/4mu8CAwEAAaOCAZEwggGNMHMGCCsGAQUFBwEBBGcw
+ZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDcG
+CCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3Ns
+ZzIuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYIKwYBBQUHAgEW
+KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwGwYDVR0R
+BBQwEoIQYWFpLWlkcC51bmliZS5jaDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFJEZYq1bF6cw+/DeOSWxvYy5
+uFEnMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwu
+Y29tL3F2c3NsZzIuY3JsMB0GA1UdDgQWBBSCX8oNHGUSht4v58mKWfgqQaG+pTAN
+BgkqhkiG9w0BAQsFAAOCAQEAr+tBEvztLUq6sDzB/I4N4reJiWs+HXM3Nt5zPwBG
+4QmH2X/P0EfIKCKFrcAiBDYK0BBTK5LM78uZoF/rC/eRNJdFqcUxO7V2I2EOr0/g
+dBmV88orKTsK3HJ/BOxy4KGdKeDAMYli35w99xjEfRu+XbGrn8jvDWL4Z93/zbmw
+fOl8C+fbd9vbPPGMbPBYCLuj+JLIjNJVMOFZUCV3qOHPf+llHS+epzBl47oTNWsh
+Fo1fKj/jbU9y/7hE+8uhbqzr8uppWJYcLUpX49pe+YGzfaq0gjMlMh8/Pzc4DXQ7
+W2X26PAcxR9Ni6k2VcPdwrF+wSz0jKwCrJzugJ1Z99ABWA==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-idp.unibe.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-idp.unibe.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">unibe.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Bern</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bern</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.unibe.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unibe.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Campus</md:GivenName>
+    <md:SurName>Admins</md:SurName>
+    <md:EmailAddress>mailto:admins@campus.unibe.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Campus</md:GivenName>
+    <md:SurName>Admins</md:SurName>
+    <md:EmailAddress>mailto:admins@campus.unibe.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..2b6b51cb
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-idp.uzh.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-01-23T07:23: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.id.uzh.ch/support.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">uzh.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Zürich</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Zurich</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Universität Zürich</mdui:Description>
+        <mdui:Description xml:lang="en">University of Zurich</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAepJREFUeJzMkl9IU1Ecx48W+SK99FKUPdgf3UznqkfpsYdlIE2DLKrXrAw30YegpwUhha9RRJLSS0SF7iVCogfBxG33LmyudG5t1wrdyiE6Kj+dc3aJIUFID3Xhd8/vfn+/7+fee85PlDWY/E2I/wcg6kvEXw1RO0q1db1lDQblLpPNbiUYbGqUeWNUrxWHo2w59KaouYua6tG5ywaI2giejgQDzxYRu8Ocu5ri+t2PnPAlmZpZJZ4q0N6bJHDnE2dlTVSFGHia1R5RE5YAeWvrTvJ8LI/YNUnnjQxDwRyVkr63eZpY+jueK0nuPV6gp3+erU6D0ddL2iNqIgoQodU/R/DVEmJniI5AmsGRnM5butOMxwoIh8ntRwt8zn4jPrvC8soPmi/N2oD9Bm3+BBNvVxF7TAL3F3kYzGrT2FSBo5c/ILZPMjico7ffYpvcwBfjeby+ORvgDOPwvsfKrfFk9Ctfltc4fc3ieFcKdT2Qxqb2dwzJr+rqyyB2hHg5kedUT6oI0DtZZ3DwTALfTYsWnyzUmbhPTnMhkMF/y6LeG+fI+Rm9KtOxiwmqPTHEAcOeA5dMHDL2SaL8JSGPSkH1swoJ1HVnRPaaxTdLs85/O13rBmfDo/xvAOWu6B8Bqqc0lPYTAAD//wMACNpDSI97aawAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAAAXNSR0IArs4c6QAAGy9pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIj4KICAgICAgICAgPHhtcDpDcmVhdGVEYXRlPjIwMTAtMDYtMDFUMTI6MzQ6NTFaPC94bXA6Q3JlYXRlRGF0ZT4KICAgICAgICAgPHhtcDpNb2RpZnlEYXRlPjIwMTItMDQtMjRUMTY6MzA6MTQrMDI6MDA8L3htcDpNb2RpZnlEYXRlPgogICAgICAgICA8eG1wOkNyZWF0b3JUb29sPklsbHVzdHJhdG9yPC94bXA6Q3JlYXRvclRvb2w+CiAgICAgICAgIDx4bXA6TWV0YWRhdGFEYXRlPjIwMTItMDQtMjRUMTY6MzA6MTQrMDI6MDA8L3htcDpNZXRhZGF0YURhdGU+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iPgogICAgICAgICA8ZGM6Zm9ybWF0PmltYWdlL3BuZzwvZGM6Zm9ybWF0PgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iCiAgICAgICAgICAgIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiCiAgICAgICAgICAgIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIj4KICAgICAgICAgPHhtcE1NOkhpc3Rvcnk+CiAgICAgICAgICAgIDxyZGY6U2VxPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5jb252ZXJ0ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnBhcmFtZXRlcnM+ZnJvbSBhcHBsaWNhdGlvbi9wb3N0c2NyaXB0IHRvIGFwcGxpY2F0aW9uL3ZuZC5hZG9iZS5waG90b3Nob3A8L3N0RXZ0OnBhcmFtZXRlcnM+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5zYXZlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6aW5zdGFuY2VJRD54bXAuaWlkOjAzODAxMTc0MDcyMDY4MTFCQjcxREY5M0RENTFGMDU3PC9zdEV2dDppbnN0YW5jZUlEPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6d2hlbj4yMDEyLTA0LTI0VDE2OjMwOjE0KzAyOjAwPC9zdEV2dDp3aGVuPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6c29mdHdhcmVBZ2VudD5BZG9iZSBQaG90b3Nob3AgRWxlbWVudHMgMTAuMCBNYWNpbnRvc2g8L3N0RXZ0OnNvZnR3YXJlQWdlbnQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpjaGFuZ2VkPi88L3N0RXZ0OmNoYW5nZWQ+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5jb252ZXJ0ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnBhcmFtZXRlcnM+ZnJvbSBhcHBsaWNhdGlvbi9wb3N0c2NyaXB0IHRvIGltYWdlL3BuZzwvc3RFdnQ6cGFyYW1ldGVycz4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPmRlcml2ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnBhcmFtZXRlcnM+Y29udmVydGVkIGZyb20gYXBwbGljYXRpb24vdm5kLmFkb2JlLnBob3Rvc2hvcCB0byBpbWFnZS9wbmc8L3N0RXZ0OnBhcmFtZXRlcnM+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5zYXZlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6aW5zdGFuY2VJRD54bXAuaWlkOjA0ODAxMTc0MDcyMDY4MTFCQjcxREY5M0RENTFGMDU3PC9zdEV2dDppbnN0YW5jZUlEPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6d2hlbj4yMDEyLTA0LTI0VDE2OjMwOjE0KzAyOjAwPC9zdEV2dDp3aGVuPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6c29mdHdhcmVBZ2VudD5BZG9iZSBQaG90b3Nob3AgRWxlbWVudHMgMTAuMCBNYWNpbnRvc2g8L3N0RXZ0OnNvZnR3YXJlQWdlbnQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpjaGFuZ2VkPi88L3N0RXZ0OmNoYW5nZWQ+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICA8L3JkZjpTZXE+CiAgICAgICAgIDwveG1wTU06SGlzdG9yeT4KICAgICAgICAgPHhtcE1NOkRlcml2ZWRGcm9tIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgPHN0UmVmOmluc3RhbmNlSUQ+eG1wLmlpZDowMzgwMTE3NDA3MjA2ODExQkI3MURGOTNERDUxRjA1Nzwvc3RSZWY6aW5zdGFuY2VJRD4KICAgICAgICAgICAgPHN0UmVmOmRvY3VtZW50SUQ+eG1wLmRpZDowMzgwMTE3NDA3MjA2ODExQkI3MURGOTNERDUxRjA1Nzwvc3RSZWY6ZG9jdW1lbnRJRD4KICAgICAgICAgICAgPHN0UmVmOm9yaWdpbmFsRG9jdW1lbnRJRD54bXAuZGlkOjAzODAxMTc0MDcyMDY4MTFCQjcxREY5M0RENTFGMDU3PC9zdFJlZjpvcmlnaW5hbERvY3VtZW50SUQ+CiAgICAgICAgIDwveG1wTU06RGVyaXZlZEZyb20+CiAgICAgICAgIDx4bXBNTTpEb2N1bWVudElEPnhtcC5kaWQ6MDM4MDExNzQwNzIwNjgxMUJCNzFERjkzREQ1MUYwNTc8L3htcE1NOkRvY3VtZW50SUQ+CiAgICAgICAgIDx4bXBNTTpJbnN0YW5jZUlEPnhtcC5paWQ6MDQ4MDExNzQwNzIwNjgxMUJCNzFERjkzREQ1MUYwNTc8L3htcE1NOkluc3RhbmNlSUQ+CiAgICAgICAgIDx4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ+eG1wLmRpZDowMzgwMTE3NDA3MjA2ODExQkI3MURGOTNERDUxRjA1NzwveG1wTU06T3JpZ2luYWxEb2N1bWVudElEPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIj4KICAgICAgICAgPHBob3Rvc2hvcDpDb2xvck1vZGU+MzwvcGhvdG9zaG9wOkNvbG9yTW9kZT4KICAgICAgICAgPHBob3Rvc2hvcDpJQ0NQcm9maWxlPnNSR0IgSUVDNjE5NjYtMi4xPC9waG90b3Nob3A6SUNDUHJvZmlsZT4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIj4KICAgICAgICAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgICAgPHRpZmY6WFJlc29sdXRpb24+NzIwMS8xMDA8L3RpZmY6WFJlc29sdXRpb24+CiAgICAgICAgIDx0aWZmOllSZXNvbHV0aW9uPjcyMDEvMTAwPC90aWZmOllSZXNvbHV0aW9uPgogICAgICAgICA8dGlmZjpSZXNvbHV0aW9uVW5pdD4yPC90aWZmOlJlc29sdXRpb25Vbml0PgogICAgICAgICA8dGlmZjpOYXRpdmVEaWdlc3Q+MjU2LDI1NywyNTgsMjU5LDI2MiwyNzQsMjc3LDI4NCw1MzAsNTMxLDI4MiwyODMsMjk2LDMwMSwzMTgsMzE5LDUyOSw1MzIsMzA2LDI3MCwyNzEsMjcyLDMwNSwzMTUsMzM0MzI7NzEzOThDMjdBQkYzMUM0Q0ExQ0M0NEZFQkE1QzI4RDc8L3RpZmY6TmF0aXZlRGlnZXN0PgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6ZXhpZj0iaHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8iPgogICAgICAgICA8ZXhpZjpQaXhlbFhEaW1lbnNpb24+Nzg8L2V4aWY6UGl4ZWxYRGltZW5zaW9uPgogICAgICAgICA8ZXhpZjpQaXhlbFlEaW1lbnNpb24+Mjc8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogICAgICAgICA8ZXhpZjpDb2xvclNwYWNlPjE8L2V4aWY6Q29sb3JTcGFjZT4KICAgICAgICAgPGV4aWY6TmF0aXZlRGlnZXN0PjM2ODY0LDQwOTYwLDQwOTYxLDM3MTIxLDM3MTIyLDQwOTYyLDQwOTYzLDM3NTEwLDQwOTY0LDM2ODY3LDM2ODY4LDMzNDM0LDMzNDM3LDM0ODUwLDM0ODUyLDM0ODU1LDM0ODU2LDM3Mzc3LDM3Mzc4LDM3Mzc5LDM3MzgwLDM3MzgxLDM3MzgyLDM3MzgzLDM3Mzg0LDM3Mzg1LDM3Mzg2LDM3Mzk2LDQxNDgzLDQxNDg0LDQxNDg2LDQxNDg3LDQxNDg4LDQxNDkyLDQxNDkzLDQxNDk1LDQxNzI4LDQxNzI5LDQxNzMwLDQxOTg1LDQxOTg2LDQxOTg3LDQxOTg4LDQxOTg5LDQxOTkwLDQxOTkxLDQxOTkyLDQxOTkzLDQxOTk0LDQxOTk1LDQxOTk2LDQyMDE2LDAsMiw0LDUsNiw3LDgsOSwxMCwxMSwxMiwxMywxNCwxNSwxNiwxNywxOCwyMCwyMiwyMywyNCwyNSwyNiwyNywyOCwzMDswRUVCOTNGNjc3MEYzODhFNjIzQjI3NzdFM0ZFMkFEOTwvZXhpZjpOYXRpdmVEaWdlc3Q+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4vWEzOAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAl3RFWHRDb21tZW50AGNIUk0gY2h1bmtsZW4gMzIgaWdub3JlZDoNQVNDSUk6IC4ueiUuLsOEw4kuLsuYy4cuLsOEw4guLnUwLi7DjWAuLjrDsi4uLm8NSEVYOiAwMDAwN0EyNTAwMDA4MDgzMDAwMEY5RkYwMDAwODBFOTAwMDA3NTMwMDAwMEVBNjAwMDAwM0E5ODAwMDAxNzZGo/aNewAABM1JREFUeJzsWtFxozAUTAn+y42+KIESKMElUAIl0AEluARKoATm/u6+XIJL4EJuFy1Cwo7v4jdKrJmNMXqSVqunpwfOy+9fP1+euB/mBHKHOYHcYU4gd5gTyB3mBHKHOYHcYU4gd5gTyB3mBHKHOYHcYU4gd5gTyB3mBHKHOYHcYU4gd/z9c6W41x/VG05v6IEhwFzXvKG42tkXKlcFfBPkCIFGiDSjhqBEh/sq5uGB8zArSQFnAcTTThDqACHLwLYB5vpW2h0fNhOjEhUQQtCbGnhhId7WB/azYGdcd7DvIXb9uOk8vmwEDMQrIQa9ahbzPNfBtob9BajEbhH7f4ooXl5et765z0Z3i8ZxzH9BaBMTkLFMY1sPD2wpLmwZC1vYVhD9JN+72LaX8ea2U+p7xH7uc5rt7hEr0eckc1rmh+9n7jDuPOW4EhDkuG07CNRJZ/SoEUJ1sOXh0sCuQFv1ytW2lz6TAmIM7gJ6Oz2QB1ghY1bSbvFSCT9LG/CuUV9jjBJzG6WvI20xdoG5zqJXoYD0NnpOG5ssB4DYrQzaiq0KzJO8/qCAA8YjeJhNsJsXaITtCC8hxzM+j3JvAieGnIt6XTieeOeFXhr0NS0Civrc72NkshWIsSMSZm4YCt7RE7g4dwh4cf70Z2ihgIsnBKKqkCe5pqfxfiHjpLYwvbcXXtst7Hy8q0GgewkK6gaKJUQ7F/FYtOmdDweDCxLtGwRcTSwQqwy8rZDvtG+DPpme0bOKlICoO8ui7ArIwF/jcxP0ZSVJ7iKeMSQEbLHq3PJ1UN+gT271mShTol0BcZ/ijfL9DDvGtVBAhqhJeOk4bK+euxHQaQzk5PC52b5o2LHe+YODp9RmC6MNFyQVV5k2Ma68k/+AgMsk8f3ofMziwqiAldQNMj7H6aS+kr5UQIaBKRSQq9EkBKyENE+0k3pbrI3zoaEl0a9SYgJ2FCos4tYtBOmdPxmrhIAFVrG1FnCapruwV1ICpjyQJ9/g/Ak4uP1DpAhi0ZcWcDllY8YQmFuxdP6UY8LbRtqUzieisRjI/hbPxn0+EvaxBXX+9Ny8sJA4Vz1SQJ7CTEuKCLFaYloVuY4JeBSb2Cm8Sl4lmN8i4CVRZyJgJxNtdojR6/RzT8BRYuYmDxQ7nqat88/dRXBdi6gMCRXaN9w9IiCzhu4RAuqTSJ/wQJJt5V70Wu5x4tEnEbHRx7LFg4JreuvZ+SSaW38CfxWQeep7+08VEMRPbp0Yh2CdZvqp6xjqhIB8MuACXRPwADsKuMpdpU2t7R8hYBVOOLFl+bZmEI/t5JPhQN/e7B1Mk3tdvfVR0Rq3FlCfU68JuFqATxcQgzNNYbZdYisc3VowbpGz829dQvGY7uy9D6RXqedz0oPzTwJ7AvZBH6YChq/zK+dfHpycP6V1u3aC5RR3PqjXKQIitOIgC0kP4+sx9VTuErU/OZ9ilXq9q8Sd5ZbfRChkCHrfGNxnXvc9fxNhcZFf5XCfud8o9UxTnr/KhUViH4XkFmXO2Ms9tfvevwuHRTyvFw8j+FLh+/5nwhP/+L8xTzwFfAqYK8wJ5A5zArnDnEDuMCeQO8wJ5A5zArnDnEDuMCeQO8wJ5A5zArnDnEDuMCeQO8wJ5I4/AAAA//8DAO++A/GNeIQPAAAAAElFTkSuQmCC</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>192.41.135.192/27</mdui:IPHint>
+        <mdui:IPHint>192.41.132.0/22</mdui:IPHint>
+        <mdui:IPHint>195.176.0.64/27</mdui:IPHint>
+        <mdui:IPHint>192.41.136.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:620:10::/48</mdui:IPHint>
+        <mdui:IPHint>2001:620:13::/48</mdui:IPHint>
+        <mdui:IPHint>160.85.2.16/28</mdui:IPHint>
+        <mdui:IPHint>160.85.2.128/27</mdui:IPHint>
+        <mdui:IPHint>160.85.3.24/29</mdui:IPHint>
+        <mdui:IPHint>160.85.3.128/25</mdui:IPHint>
+        <mdui:IPHint>192.12.247.0/24</mdui:IPHint>
+        <mdui:IPHint>89.206.64.0/18</mdui:IPHint>
+        <mdui:IPHint>130.60.0.0/16</mdui:IPHint>
+        <mdui:IPHint>130.60.10.0/25</mdui:IPHint>
+        <mdui:IPHint>130.60.128.64/26</mdui:IPHint>
+        <mdui:IPHint>193.138.69.0/24</mdui:IPHint>
+        <mdui:DomainHint>uzh.ch</mdui:DomainHint>
+        <mdui:DomainHint>unizh.ch</mdui:DomainHint>
+        <mdui:DomainHint>unizh.edu</mdui:DomainHint>
+        <mdui:DomainHint>uzh.edu</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.374571,8.548659</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.397194,8.548950</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.410914,8.540683</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>
+MIIFNjCCBB6gAwIBAgIUBATM4TCBtgHL7TTLYLT51WgCtTAwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDMxNDExMzUw
+NVoXDTE2MDMxNDExMzQ1MFowgckxEzARBgsrBgEEAYI3PAIBAxMCQ0gxGDAWBgsr
+BgEEAYI3PAIBAhMHWnVlcmljaDEaMBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkx
+EzARBgNVBAUTCjE4MzItMDktMjgxCzAJBgNVBAYTAkNIMRAwDgYDVQQIEwdadWVy
+aWNoMRAwDgYDVQQHEwdadWVyaWNoMR0wGwYDVQQKExRVbml2ZXJzaXRhZXQgWnVl
+cmljaDEXMBUGA1UEAxMOYWFpLWlkcC51emguY2gwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCiiuVzv5VrRVKDKd5wGJmA+nMY/qi1Pp4qpPM4l//BhAgK
+JPWyLqybIouWSMT2YKB0HITnPm3p7iJtzMtn7YZxK5wBqYenemFJptVUuS9jHzpq
+I3blM8TKUAoTY4b+Mppgj3njtM77a4YiMqEgSnTkPatEQ5QP0g+IOEI8I67FPXCu
+m+N/EDrviVB055ZEo2W2MTJxgTzRf+dpyoOvt0aVYlsKFcXxHiIfxJxufiO5aKgR
+0e/6lSjrOqhsQ+ZFtT6RkmiW2Oidplwo97B6uIh6Fhp/O7EixF8wN3UWMCWiRqh6
+V6VLOc73rK9hE3nnhF1N+UEowvJ8pVV5EoC2tXoVAgMBAAGjggGPMIIBizBzBggr
+BgEFBQcBAQRnMGUwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnF1b3ZhZGlzZ2xv
+YmFsLmNvbTA3BggrBgEFBQcwAoYraHR0cDovL3RydXN0LnF1b3ZhZGlzZ2xvYmFs
+LmNvbS9xdnNzbGcyLmNydDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBAjA2MDQG
+CCsGAQUFBwIBFihodHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0
+b3J5MBkGA1UdEQQSMBCCDmFhaS1pZHAudXpoLmNoMAsGA1UdDwQEAwIFoDAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsXpzD7
+8N45JbG9jLm4UScwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRp
+c2dsb2JhbC5jb20vcXZzc2xnMi5jcmwwHQYDVR0OBBYEFPdmvpYTb49/qkMzUnCN
+CHZqecp4MA0GCSqGSIb3DQEBCwUAA4IBAQBkxNx/LPp/L2FQRJE4XCHrH1f2LR2e
+BZsuBFBmNdAiXxNABZN/NIup7ADTTalALkY9qb0p7sYZOZ/P0mCIaQm4jrE4lXfC
+hW2bIAiqhmhW96Vg1tQt/hJdXOGwK9DgFM2VUfSrKt8MRRWpa/INWJWQIWsn1vZj
+DLrUq69KTMpWStYH/5ChSvbU6TRKRFp24y1OeMdBAP4kJZJoyocDmj3HCvz8VaSl
+kJTDI4IAgCLhzTnk7ljJI3qhaU7F9tp6iclLPcb/h3Zmzq8+cEPbRuXgTnmbSKX0
+o0HpMPl4e0ANFrH5CpAebxkqLtX1zryAm/Pi5wtxEqKwRv+3gUTol02q
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md: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://aai-idp.uzh.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">uzh.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Zürich</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Zurich</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uzh.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uzh.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UZH</md:GivenName>
+    <md:SurName>ID Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:support@id.uzh.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UZH</md:GivenName>
+    <md:SurName>AAI Administrator</md:SurName>
+    <md:EmailAddress>mailto:aaiadm@id.uzh.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-login.fh-htwchur.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-login.fh-htwchur.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..dd998d00
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-login.fh-htwchur.ch-idp-shibboleth.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-login.fh-htwchur.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-09-30T11:15:35Z">
+      <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 urn:oasis:names: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-htwchur.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">HTW Chur - Hochschule für Technik und Wirtschaft</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">HTW Chur - University of Applied Sciences HTW Chur</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Hochschule für Technik und Wirtschaft Chur</mdui:Description>
+        <mdui:Description xml:lang="en">University of Applied Sciences HTW Chur</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAACSNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4s45Y3AAABv0lEQVR4nGL4//8/A4OSRQkKVrYsYZDU1GYAAk5OLgYokFRVVfP19fVvLCwq2ZqZlfMMKMbNADYgY8V/FJy1+j+DT3UCTGdEZLTVvPmL/q9Zt/H/9p17/u8/eOT/gkVLgBoZrCAG5Kz/j4LzNv9n8G+EG5CUnMq7d/+hv7v3Hvi/a8/+/yB67fpN/9U1NHKgBqz7j4LzNgENaIAbYGdnz7B5645bIM0wDHKJj6/fXBwuQDWAm5uHYfnKNav27DsId8G+A4f/5xUUnoMYkA20FRnnohoAAjNmzak8cOjo/5279/3fuHnb86XLVm5OS8+shBhgHMyLgk1CeBlUbVlBGhkZGcEGJKekqVXX1AUAA1TGxNQMYTLYAFyAhR1McXFxY5UGG47XAGIAXgNYORkYmJiJMCCirxYFR06sZXDI0IcrEpJjYAhqTWGI6IeqAdJhPbUMKtbuEANAoY6MC7b+ZwhoSoAbIK7GwJC27Aw4gYHkQdEMim5drwlEpQMGcVUGhpTFZxhyNiDUZK0BGuA5gaiUSNiA7PWIRESWC7LX/kfBuRv/M/jVoxmw6AxYI1gN0KJMYI7V8ZgAAAAA//8DADTpV5fxOZV6AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAAAXNSR0IArs4c6QAACSNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4s45Y3AAAH2UlEQVR4nOyYSUxVZxTHn9G4qKZRa+PCXatNUaBqNdHQ1saoCxtr00XLQqMNC4e4MTGxCnHYNHGIVotFLAUFUQQHxAFwnhWcR0AQmZHBERAQ9PT9Dl763tNHjO3Lly/t4p973/ede77/PfeMzyUirv/x7jBOwHYYJ2A7jBOwHcYJ2A7jBGyHcQK2wzgB22GcgO0wTsB2GCdgO4wTsB3GCdgO4wRsh3ECtsM4AdthnIDtME7AdhgnYDuME7AdxgnYDlf2mTJJySyU7VlFCu7TjxZLS2u7eAq2t7dLU1OTPHjwQMrKyuTu3bvCmj/FJSUlcufOHeGKbEFBgdTV1cn9+/fl9u3bUlRUJHl5ebqPPmSrqqqkvLxc9ziHZ9j31Hv8+HGJiYmR3bt3S2trqz7X1tbml0fADRjyfYq4gn4TV/D6DgyJlr5fxkvNg2edpHjxq1evysWLFyU3N1dx4cIFaWxs9Et85syZ0qtXL1mwYIFMnDhR+vXrJzt37pRp06bJ8OHD9feIESNk1KhRMm/ePOndu7csX75cZs2aJUFBQZKZmSkDBgzQ347Offv2qQwfIDk5WRISEiQ6OlqePHnSpQFfvnwpL168CIiRXSPC08Q1LEZcn8d2YPgGGTB+s9Q+/NuADx8+lJycHDWgA4xYW1vrl9SZM2ekR48e+qIREREyePBg4UXmzp0r27dvVwPGxsbKjBkz1OsGDRokSUlJsnDhQpUtLCxUQ1dXV3eesWTJEqmvr/fitXjxYlmxYoWsXbtW+I2RnfPRu3XrVvXYrrgG3IAtLS1y+fLl1wx47949v6TOnj0r3bt3l8mTJ0toaKgMHTpUnj9/rmHHi+Fxqamp+hv5+fPny5gxY2TkyJHqueHh4TJ9+vRO/Rh/6dKl0tDQ4HUmBqypqVFDHT16VFauXKn7iYmJGjXLli2TioqKgBhPDTjsx1Rxhf6uhlN8FiMfjtvkZUDI37p1S8MW43HFI2/evKle9SbFeEK3bt30JRYtWiQDBw7s9J7r169Lz5491TOc5y9duuRm45Lx48fL1KlT9T4jI8NLN57Gh+MeXUeOHFHPIwcie+jQIVm1apXub9y4Ua5cuSLr1q2Tp0+fBs6AY39Klz5hcdLnq/gOfPGnfPLtVql71Ox1KIXg/PnzakAMQIKvrKx8Y27BKLNnz5YhQ4ZofpsyZYqEhIRoiLI/Z84cCQ4OlgkTJmjhYA0jTJo0SfMahSIsLEwePXrkpRvPjYyMVKNFRUXJqVOnZNu2bWrAY8eO6cdKSUmRNWvW6LlwJoX4eu2/asDquiYprXoqpdUNHahqkIqaRrdhvD2Lr0geoRJ3VX0dEPa+IIQ995qbm708GEM4vx1ZX7BO1XaM4nDhQzrPwhM5fr8N139kwEAq/y/AOAHbETDFTgg6VdbBm0LKd83zGcKQ9EHIO2vckw89+1DfYkY68D3bE4Q8Mk5qAaQUZ89Xl+dv+DicXftPlEhiRr4k7S1QJGYUSNrBImn2mESamtskJatQEl/JqFx6nlzJr/NLkGJDlc7KyuosOPR2Bw8e1EpaWlraOdEcPnxY6NuYPujlTp48qVMK7Qmg3WHiKC4u1taJPEyxoBvgeaYV2ibaGIoS53IWhYVqjSEfP36sUxAFkBxJl4BuChF9KRUcHfn5+cqZK/JckeUd4IxeWiZkMLQrmEnkU/ckMnR9B4KipY/PJFJ+v1HeGx2ne51yH/0qP68979eAEOOF4uPjtcXYsmWLGo+D+Z2WlqZr2dnZur5//37ZtWuXksU4q1evVsNiUAzIC9LbXbt2Tc/EyDTicXFxkp6eLidOnJC9e/eqXnShh57Q+TCs7dixQw4cOKCVm7PRDUcqP20PvOADRzhQwdG7Z88e1b1582aVQ4ZJSQ34No00Vbnv2ISOPtGRc498Uetz/RqQL84BeAAegZfcuHFDrxDHo/i67OFVjGNc8SqmD2TxJkITj8FzeObZsw5e6MUj8Qj0sEfbw7Pox7vwIHQQbkQE+pGBA+cQmo5nkhK4so8c5+HdtEbo4Dzu4cU9e4R9wAzIS/CyTvOMMf3NoxDBS3zXeUGMxD0pwLe1IWdhAM819PAck5MzgXjmz38brmE/vD6J9PeZRDDg++6wZq9Tzh32kdE5fonRdPNFcXXCj8mFNb4ga6dPn5Zz585pCPFlCU/2+ScGbyQFMGnwLB60YcMGlSd0kWMPoAcdrJPzCF2SPKHMHiFM2Dv6kEUPOjAyXMjJyPmbqro04LiIPdLfbZz+Xyd0wD2NBH23zWsSqXI32x9/k6x7jtwHo/+QX+Iu+T0QQ0GYvEJyJm9wTx5iIiGvMGo5eY/cxL81GILwY59nCCdCjhxGLiSBk8O4IkOe3LRpk+rBaJyJVzq5jfxKuJLzOJt91jiPez4cH4lC8i6e6sLTKt0eVln7Cu776vomr0mk3X2PET3l8MonjV23CVQtwthpEaiGhBd5hkmCdUIcGVoSvMQJZfIeL4T3OS/Gc3gP+QqPdnTisXgdz3LFkwhfdPJXHGdRuZ2K7JyLLFf235RC3sqAgcoN74JAj12BgHECtsM4AdthnIDtME7AdhgnYDuME7AdxgnYDuMEbIdxArbDOAHbYZyA7TBOwHYYJ2A7jBOwHcYJ2A7jBGyHcQK2wzgB22GcgO0wTsB2GCdgO/4CAAD//wMAgSuJBTXmaCsAAAAASUVORK5CYII=</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.5.58.254/32</mdui:IPHint>
+        <mdui:IPHint>193.5.58.11/32</mdui:IPHint>
+        <mdui:IPHint>193.5.58.23/32</mdui:IPHint>
+        <mdui:IPHint>195.176.242.0/24</mdui:IPHint>
+        <mdui:DomainHint>fh-htwchur.ch</mdui:DomainHint>
+        <mdui:DomainHint>htwchur.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:46.852909,9.512614</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>
+MIIDPDCCAiSgAwIBAgIJAKE9WIOjgzuqMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2FhaS1sb2dpbi5maC1odHdjaHVyLmNoMB4XDTEyMDcxMTE0MjQyMFoXDTE1
+MDcxMTE0MjQyMFowIjEgMB4GA1UEAxMXYWFpLWxvZ2luLmZoLWh0d2NodXIuY2gw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEN/79VVK/NhLKXtKTGQqw
+dC7TxQMe4Prdp+I/pJHGpk94Ub9DmguD4B5zqdQO2wof7nHoDFAejOvaNyt6i9Nh
+XBGSIHE9xdd2SVtewbklsDzTjw9MB36vq07/YNM81/F5P9Cqi3XZwYfvatBn+2L/
+PcibWkRlhZJkBj552I2Rryq22lq1YIRGb9AdKpBPKLAU/WXUb3RA2IieCmMoo3Oy
+etcYmwqWX+Ixl4RA/NGXKxViC5ArKub660TbETKNKrfnoH7Lby4yJomUNKFOh6DH
+N/fcIc2+SJcgIKvkhpn6rKBEkKzZ/gJCmAXMus9+Nl3QeT+QThkGtvlAEOouJWHN
+AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2FhaS1sb2dpbi5maC1odHdjaHVyLmNohi5o
+dHRwczovL2FhaS1sb2dpbi5maC1odHdjaHVyLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBQDA6qXY/SX7EaQXqUAK8sZxx+qEDANBgkqhkiG9w0BAQUFAAOCAQEA
+T2IAryzI+8HmvprZ/ov5VForqxJejRsBM02n2fMXyo3x4MqQVYTs4snsbM2LBmC6
+Hr5mXtwSMQagnArbg0hzJosGxSYMmv/M80jnpnnXkgnL2xWZzvCpc410n/qz9csa
+l7azAx3zHazW10PzNu44AmWT+wy+bDVtodDxmytfs0LbaW0TDzXVX2+FGp4dYuEz
+LpGz51VGv7dN4A0UweO7S3QJjTq4Vara326zprde+eVKOc32AxRKG0bJSSTY4bp3
+tBvjpsFG5Or9Sv0khcuYsfqKDY/8yKgrY2P+VI61/sFuUFoF56cJLTMddszkfdJY
+YpkbbBiPxDcMDk93CCNE2w==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.fh-htwchur.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://aai-login.fh-htwchur.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-login.fh-htwchur.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">fh-htwchur.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIJAKE9WIOjgzuqMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2FhaS1sb2dpbi5maC1odHdjaHVyLmNoMB4XDTEyMDcxMTE0MjQyMFoXDTE1
+MDcxMTE0MjQyMFowIjEgMB4GA1UEAxMXYWFpLWxvZ2luLmZoLWh0d2NodXIuY2gw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEN/79VVK/NhLKXtKTGQqw
+dC7TxQMe4Prdp+I/pJHGpk94Ub9DmguD4B5zqdQO2wof7nHoDFAejOvaNyt6i9Nh
+XBGSIHE9xdd2SVtewbklsDzTjw9MB36vq07/YNM81/F5P9Cqi3XZwYfvatBn+2L/
+PcibWkRlhZJkBj552I2Rryq22lq1YIRGb9AdKpBPKLAU/WXUb3RA2IieCmMoo3Oy
+etcYmwqWX+Ixl4RA/NGXKxViC5ArKub660TbETKNKrfnoH7Lby4yJomUNKFOh6DH
+N/fcIc2+SJcgIKvkhpn6rKBEkKzZ/gJCmAXMus9+Nl3QeT+QThkGtvlAEOouJWHN
+AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2FhaS1sb2dpbi5maC1odHdjaHVyLmNohi5o
+dHRwczovL2FhaS1sb2dpbi5maC1odHdjaHVyLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBQDA6qXY/SX7EaQXqUAK8sZxx+qEDANBgkqhkiG9w0BAQUFAAOCAQEA
+T2IAryzI+8HmvprZ/ov5VForqxJejRsBM02n2fMXyo3x4MqQVYTs4snsbM2LBmC6
+Hr5mXtwSMQagnArbg0hzJosGxSYMmv/M80jnpnnXkgnL2xWZzvCpc410n/qz9csa
+l7azAx3zHazW10PzNu44AmWT+wy+bDVtodDxmytfs0LbaW0TDzXVX2+FGp4dYuEz
+LpGz51VGv7dN4A0UweO7S3QJjTq4Vara326zprde+eVKOc32AxRKG0bJSSTY4bp3
+tBvjpsFG5Or9Sv0khcuYsfqKDY/8yKgrY2P+VI61/sFuUFoF56cJLTMddszkfdJY
+YpkbbBiPxDcMDk93CCNE2w==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.fh-htwchur.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">fh-htwchur.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">HTW Chur - Hochschule für Technik und Wirtschaft</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">HTW Chur - University of Applied Sciences HTW Chur</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.fh-htwchur.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fh-htwchur.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>AAI</md:GivenName>
+    <md:SurName>HTW</md:SurName>
+    <md:EmailAddress>mailto:aai@htwchur.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SWITCHaai</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..0fd68aaf
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-login.ph-gr.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-11-26T14:50: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-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://my.ph-gr.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">ph-gr.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">PHGR - Pädagogische Hochschule Graubünden</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">PHGR - University of Teacher Education Graubünden</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">PHGR - Alta Scuola Pedagogica dei Grigioni</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Pädagogische Hochschule Graubünden</mdui:Description>
+        <mdui:Description xml:lang="en">University of Teacher Education Graubünden</mdui:Description>
+        <mdui:Description xml:lang="it">Alta Scuola Pedagogica dei Grigioni</mdui:Description>
+        <mdui:Keywords xml:lang="en">Chur</mdui:Keywords>
+        <mdui:Keywords xml:lang="de">Chur</mdui:Keywords>
+        <mdui:Keywords xml:lang="it">Coira</mdui:Keywords>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAitJREFUeJyUUztv01AUPsBWhIRER1bEQEURSAgEA/+BAQkWBCNLFyQEEmIqDDACC0VCCFiogEpdWWjVgiGkjZ30JrFvTxOT+DqO7dw8becG22lDWipIBz/O6zvnfPe70Ov1YNTHLD9BRQKmZc7hlm+kQrH5datvqby8j5n6/f8DCCGG7P5/1XiMme/AvHZe2hVAiH9MItqgymdxPXMeh/1/JVqlh4jkEoqwYNjfakop+Ssw23xFI9v3y2FD7w+A11kH13pHsz/HOUkeRF27jrY5E3YL+gQWHiD5cYT7HoJrz9K8cgYL+WvYH73bAMd6Q3V6FeVvwFz7Pa2UH+HKAnC78pqKePwTWMxfQZs9xZrzkWxkL6O8DGxzdx+63ToYG7eRJMZY5AsCHaKEX3QKvXZWSofkaelT2OBfUlFcUy4gZk6ywQrdwIK1xFGuazdikurOPFlZBF6zZmnVeBZPY5Wm41innZNWl4Dz6jQOAGr2B6qEJDX5YtxBlU9jbvUYil4HVOU4qqkJ7IlOnMv0u5iWxlgQ4BaJAqL9MonD3OsQMIr3cC0kMyK2wRdScTf3E2m3spJtvsBccjzk4jkOjtH3DSDJQ6ilJ7BUuIXl4h30fT2OOZUZLGo342TuzBEa6sCp9I8yEltfYebLkP39rFn/TCJCdypwu73dF7+QXERVngzF0xr5Yg0AmvWllCIdYEZxCvdaHANEZEUSVZVJdO05sleA3wAAAP//AwBuF/0Z3Mc5jQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="43" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAArCAYAAADv9A+vAAAAAXNSR0IArs4c6QAACSNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4s45Y3AAAQ7UlEQVR4nOxaDYwc1X0fbEiqNFUbtZEinJbQFgi0sQHJSoPxR2piKDYfjbChATkWjatKAYOCSCLaFFSTtpYiEMExrnFVt8GJprKooThZHzJtalyvudu9vdvvj7nbvdu927vb2Y+3t7e7M/Pm3/d/897s7N6ez0dbaglOepq9mTdv5v3e7//7f7xRAEC51Gbb9iX37dtsNgZQxbYMNpbFGuXnzVZBrcz9VJ/UHiGZ2A0kHlJIdFCB8OC10Ji/EFjJc//H77jCtuTD+73ISl+uX3+LnaOs2bwxMMFWpgovkpH3FIgOKRDHFrwCEuw4ntpBqLXA+yD4K3nmBwEkPuMDB5BSi4HoAEcZGyn73WqkfIXc35DE8KcgGVQgMXwlRBigevFVYtumYoH1EYAugMhAECxkYFJuyqC0W2lfMriWgccARBCZGbcbEyowkAH7rvCZ/y8Avh9AVtQYUMg6br4UOmbMztf0E3p86Nc5A2NM//Ljf0Ysk4j76IoB/KDaMgyUqwl9f0tQuo6e+5diMToQKsCjtsHutZS89hSJM+BSwVWADqSuv60BN3FwNNB9hmCj+zy77xwuIxN2gETgvKCCdATgabbdBVz/SVDHjJFVjIXAWquZ8KVHd5BkgDkQ1pIjCmkupHzuGLYtPLhYQPc9vO942QJIBYBodhIgZzJdeoZsYmKPumZT2ncSkr2oe2iWCB6eL7MQJobAMfONMO87mdzHvG9FtSVjqWP2VCykAyB13+0yZqDXbCWQYjICUMpFngEiwLXEZJeeBOvDPKtcBKAtJT/2LDdfdCAYxpSmj+vAF8gSz6NO/OhxJh0pEaBeDgAu6iDjL2G+PPTgpmd1zJUDKPpQab60a1Juc02RjSNYarSyaiZ8B0mIGDAz+kXSmP+vgMNwyvWSL9AS5rqY5ZeTE5GZgxB+h3niyM5bVlmt66e0WulfdbOZUyU7L8oCl8EW/79euxBA3YsHHQBzmWeY+RKXZXwMKhgoHIhkonzeZWzCXhH3aKFoxfFnSDTwSZZB/Bqkop8h7WaW6ZbpEfw+k6BC0/A6JcpM4dVijAGXEg5kbuaYLhnPWWp3TLfTHD2EizDwsgCQmzAFEW7YHjZSxTDm1Mzol7nnTDD9yqW+SixDV11PKSbbGV/qF3VMHTB4Lqhjic0kgQ6EtdToV0hrIepzAHRYJ++n9jy7r+6OKy1i0TuvMG++1P5LhWTLAOiYHGqRIdIveb08d5wFvlcBTj6KzGH5bLuV9BntSdW0dBVcJkjTB8EYcLwvOzZIyIcZh3QeE+lvEgCDmzelJr/fNEpqvXo+gEydZa1WPue3zIqK16ndcSC9YExNTenh8KgeCARgaGgI8DgyMqKn0ymd/fm9/VutphKPx3S8HgqFeMPfyWRSr9frF2X4JZgw0zqcELKANcuYUSszP9XHwptJik06ObyaNYzdtpBk+CtEi2wn44k/J4XcAdKoXwjY1ODgOU0Gz2w8a16Zmfw7En8Pg2dk8SehVvoXHRfJoo7+Vio/19Kx3YAeGs0cA2xnsX5UxOuYI9Me3Y3H4/oLL7wAd955J5udAmvXfh7uuOPL8LnPfYb/j+0b3/hTyGZzupzr9HRBl9d62+OPPw6nTp0CSvvrbZem9TbvylKzqszN/AMZi3yNTyIWxLjt41z8k8OfBi1+G8lEf48gk6LvOZNNhzeQMtM0m7ZdjyrLWKZRVjPR3yGxQQfAzMjNpM3Y5mjjgjKb//tilC1MJv5FMhb9EjfzRGg1wTw5Hd5BzHaW96WemBOZdvvtt8Ndd90FAwMDMDMz40e2lctldiz5i8Wi/9y5c/Diiy/C5OSk3mGrA+AvfvEfUK2yec7N+bHFYjF97969HEgE0cWCdhZtWQZSy1CIfkZLR7eSaOizjF27GIhbCPecw1fwElQ+8z1CTV2lVkOpzP5Yx3oehiUJ7hg+BdWyT3MckIjrLFupV88FYsMI3pWALCxoewlet8ySUsy/QOKh3yTVuRMM/Cbz1MEAjxP5YiGQ6xm73w1433N4eJhP9OjRo1CpVPwX0zLTNDtOijNwigMYDof13v4I6FNPPQU7duyA+fn5bmzY/csCWK8OaImR3yC59LdIrfwzjRoFJZ9+lqBJce3invMn7oMpbSiF7F8RZGF6eBWv62VTewil844M2E62MpV7hrMvM/xLfBHmq/+uWeYsy4m/Q+Js3GY95JMOgzCtRACTQ062kg5tJAtYaBXPRJatX78enn/+eWi3212W09tonyxJMhB1TwLjNdnXXnsNbrvtNkBN7B17WQCNZsZXq/g0atb4/22WoyZHPssZyCcT3sYmMxSQnhaYLpHyWT+aMNdGBHpkM+sT8nGTw1zYIMpY7A9JTEhBJvJbxGgVlOncDwj+Xyu/o0n9tW1Dqcyd0pCl6cCVfEwt/MdgNsd8tkgFjxw5AnfffTdkMhnd++69Jtc7+V4GSgBlP3n9jTfegE2bNsHo6OgKAeyTOtVKpzVkDnpP1LvC+F8TDDcsnqI5tbv52mAAwUGTS3GtvJExbEBzGcUWJB5Yw8HAsWYnv0+KEwcYeL8CdcZE+Tzsa1pVpZD7tuNsmMPCYy71GHEyFFDmZmf9999/P7z88svQ640vpundAHYzsPeew4cPw5YtW7g09F67BC8MTsmJe2BdLWDZCdkQdACqzak88KUiZ8WsoVp5R5PFAa6DwVuhQf4zIMcuTj7H2YemiiCOJ79K0DHNTr9StFlu7DoHNq7RLqla7Fq+WLgYyOyZ/N8SubDvvHOGmdeXAJ1DP73rB6BkZAfAaQ7g6OjIIg2MRqP69u3bYf/+/dBvvOWdiKdzs5H2pUYY84IOOGPRe4jVmlRlesdjRmtBKRYPcw3E2h4GyJnRu0iLSQHXwPa0mo1/jXvTBIZAwV/moEym9xJMDWX6hqV8DLoX6hGfU6VeJcr910CjdtbVv3/652Owbu0XoFAouPq1FAOXylokgH6/H9DBLCwscOdx+vRpbrqPPPIIoFfuh9ElMdBZLUMpl05qjrat4oHvVPbbBEQtkL84a5ZZV3LaThIdcgBEBk6kHmX5bctxSuW3tETw0/x8cvhKHuOlw9cQYz7t6xQknJCHMhBnigfJKK/UXMHvySa2EdusK7KocOjQIbjllnU8/Og3By/bpAfGcAYD5F4A165dC/feey8Pg2688Ua477774KWXXgJ0Ur3ysCIAUdcw8M2lHySRQSd4RhMk5Z9rjmPoFFWNVl5NMJZy/QtdxU2vNHOEyHGnJ35YjAhzTAU/wTWwXDyuo7OQMiDTRWRzLnkv9/jJ0Mf5Vmdp5ihBSZHvd+jQQbj55nVQq9WU3kn20zuMCffs2QM+nw96TRhDlTVr1sCTTz4JZ86cgXQ63eVUVg6grNmxyTTrCR/XrMBVHLx0dC0LZlngSx39c5hoKKXpQ0UeHCPIWJ6K30oMY1blHt2YUrXoQ9wzp4Ifgxgz83GWaWAMic/hu3XUdEBk/6N3T4Su5fk2jpWO/S5pt4uqw3anmnP06Ktwww3XQT6fX+QAesHEI5riunXrAD2rZVldAL777rtw8OBB2LVrFyQSCb0f63q9vNJdNO3XySlplaYPFyM8a1gN0QvoOZ8lPMOgIkDGanS7pmRifySKAx/jk66WTuiWKCTMs9iOM3PYKV9hv/LsT0TxVDgiKvdB2GSnf8BjxTQuBjvOTbOsxm5y05bv9/rrJ+D666/jk1/OeeARzXHDhg19AUSHgfr30EMPwaOPPgoTExOLGNjrZJTuyq7noZ6KCuaz48ldvGqMQo4xYKPGsnOufZY7YZ1lIVHhXXHCU+P7CBUVGrBbSnnmDY2XrlD7sPaXfoJlMHNu6Z6C5RYIqFVTxhJ73H2ScaZ97WZOdbVNfNUQiYT1TZs2cq1azolIADEofvPNNxcBiEUE/H9sbEy/+uqr4bnnnoNGo6HIcfuN6Tkpy0Oy/ibqgOx6qz4UiIduIRK8ifg2YjBv6lRWHHa15uO+TGS7k+IhayK3Ms+b5X1Mdt1kppdjGQmPDxHg4K+yFO+k5rDP6sSb4lir/JuWCq7hz0OHVC2L+NASWwfIQgScTWzfvn3wwAMPAFZgljJjCWCpVOIM9AKITsUbB+L5s2fP8tTw5MmT4AVP/u7SQNsTx8nPLbhJilWem/5hESeSFsyamTxAMGWTmYBl1fm2JNYF8YsCLfz7pF5juSpnEuUpXLMe8+FuG0//WL+x5B5iUSK002RjVFnIkvThEccsjH2fpNhYqJOFzLecEAfAs7HVAQXNFyd74MAB8E6wn+khAzdu3NiXgd5MBFPC48eP83FljNlvUVwT9hYovQ+l1pyaTewlSdS/kVU81dLS9/DqM6Zt9fp7gcn0dwgCF0F2Zr5OmgsZn1tVxnDEXFDm8j/iledk8CrOqlrlbc2tWjM2TedfKqL557N/QSqz/0hSw+shwrR2cuwJYhozPTt0tBOfCqk5ceIEnyxWWiQT+zVCiLJ169YuDZQMlCYs544hD+bXeO38+fOLQOzSQHezm9pi39Z5OUJOa8nR6wjPaZl2JYSJZhOPkfz4fpIa3UwifgZuWCEzxVeZaRdU734FOiAsXWnx9QTZlDiP+x47iUnrDhBY+7PaSiaxm8QuONVt/oERO05nv0faCxMu85ytUEf/TFEdlwC2Wi3mUF7nk0UHcOzYMRgcHORlKyxroa4hCJg3Yx8EEAHCexFwh4GhRcE4grt7927AbETTtCVyYdsxWQlgZ/Js8MIr3HzRcyJ4mfCtJBvbShIjnyDJUYWMJe4hc8VXSLvFJmq3hNl0Yjlu4kadxX9/SeIj15N05BYyX/UH3MKqeJGqflLLRG8nqZGbyBgbv1b6mWZZxN1/dphnKe59QBdbC+uDoGER9KabboJt27bBgw/ugocffhh27tzJi6wbN26AJ554HDKZTownGSjLWb3j4nkc6+mnn+4CkTOw+wbL2fegBmemQXVVS33Tqe2JWlyFhSW22VBMBpjVrqgYt2GWYlHnIyGvRoEIN/h5xjJM4yyzpMrvYbxZB/8Ky6iyQHxKpUxTcUFBbKvatveTODkxb9DdHa6gaaKzCAaHYGDgNLz99gBcuOCHbHY83Gw22HXDXVzsbxiGgnFks7ngjtVhoc37l0qzfgQPx+0CsN/erxvINkZ8yZCT+yILtfjXwWhPqF5vuViwQeydiL1hWzopTz8Ad4vSOefZb5E7etC5F+R7geeajBLsxYxZvsmwrd/5xdlM7xcQPYG0FGer44F5WcpUqnNvaTynHXb2IqYm9xM3uLY9E/EMCp6JezehOkF5D+hdHwt5ftu2O773upxoZ+dv+W3NpX5f7Nuaxb+XykTEROV+hXQeRntWnUg/zMtMKSzRB64BUn3LU+iki16+HyMvjRH/e/f2A/D/qnXCGNdEOvrSnE/y3DchzTd6P1gsp+18hSVo3bOtuFQW8H7Or7Rfv+vd8rJ0ivd+36tLT5zPJ9AptJRS8QivvKRZ6ILhx3Tuu0Sme1TEYtClYx9SBromzMMYwwkbTJaHJjfzMhIvHmDpqjKg2SLZ936T8hGA0EnOqXhok4R8zr7var6rlo5eR8w2ywZs+XERiFTvIw1UOnGYCAmMipoff4ynbFgFxiJmLvMnxDZbnY8qXXPvaOCHF0DcZrSairmQ9C1UTmn57HdJbFh8eTC8itf08KuDOstdW+2sapiY7FORWn2kgdwhNOZzKn6mFvL/Noz4nYpKbIg5j8ErWFvN/48EvwCjQ38AmcRenp9Sq7MB/WFu/w0AAP//AwDF/aulqC4/dAAAAABJRU5ErkJggg==</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.5.58.160/27</mdui:IPHint>
+        <mdui:DomainHint>ph-gr.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:46.866984,9.536721</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>
+MIIDKDCCAhCgAwIBAgIJANPBvqI6uH7rMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMTEmFhaS1sb2dpbi5waC1nci5jaDAeFw0xMjA4MDMxMDU4NDZaFw0xNTA4MDMx
+MDU4NDZaMB0xGzAZBgNVBAMTEmFhaS1sb2dpbi5waC1nci5jaDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAM6DeV57x0ntO6ngsTUgFxL7gPqK1yc4JW6Q
+Bof970j9y11C9oIIOZMWadurnqdHsvGcX+GbmEvNVI0V4u3Wibg3JU1oXRtYLzDC
+IhVErP4qn3mvq0wQ5IC8br3xQu/PZp16iiZ9YK+ipn7HIow+tAQ2bxONAxtDbrFW
+o4+f5XE7RckoUplEkGFX9B3X2iy1V7rzJt8UsjY6vZVmkLhdSu+O1zBTnTU4DTkB
+1CPnshzK5qWg5Et7CkgPzhFORXPD9tp9QpRSukVee2rHlhIy9umVTzh1M+IcZrW8
+rB0cZfvs7RpOnHtkSpEVoMANC9az9IBU8GzqGy8OmffI+vL71q8CAwEAAaNrMGkw
+SAYDVR0RBEEwP4ISYWFpLWxvZ2luLnBoLWdyLmNohilodHRwczovL2FhaS1sb2dp
+bi5waC1nci5jaC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS3jMf00nQqVvJRH7
+r+2JO7i7iuowDQYJKoZIhvcNAQEFBQADggEBACipXitm/nMRmZswt0tAl0fE81DF
+1U8Xxgh7OVK6QjVIebjckobeeV9D4JT3bF+YfZLVxl/9XIRbpBV2aYDf4TXAtN1R
+VZ/km3VDZbHImJQls8VGoJzMXXGcywQwbZg5vXcdXB1FtYWQTkor5lg0mqRAIJES
+BqBm0XGj5gO0xpZnds5cvH94w/xzfI+BDmusQvjTaYPblemangtJ+MD0yXSaHo2z
+PdZQszzV/n+v286sSXaiO/Bd6QbtIRZUZiUR/2MfwjZ+exR0nymEiSNdiKch1ZpN
+3gDJq0hd3/Em8RDzJtiui0YIJVFZdxA3+9QhvGhX0OvziPHKbsxh1mNnI1k=
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.ph-gr.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.ph-gr.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://aai-login.ph-gr.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-login.ph-gr.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">ph-gr.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIJANPBvqI6uH7rMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMTEmFhaS1sb2dpbi5waC1nci5jaDAeFw0xMjA4MDMxMDU4NDZaFw0xNTA4MDMx
+MDU4NDZaMB0xGzAZBgNVBAMTEmFhaS1sb2dpbi5waC1nci5jaDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAM6DeV57x0ntO6ngsTUgFxL7gPqK1yc4JW6Q
+Bof970j9y11C9oIIOZMWadurnqdHsvGcX+GbmEvNVI0V4u3Wibg3JU1oXRtYLzDC
+IhVErP4qn3mvq0wQ5IC8br3xQu/PZp16iiZ9YK+ipn7HIow+tAQ2bxONAxtDbrFW
+o4+f5XE7RckoUplEkGFX9B3X2iy1V7rzJt8UsjY6vZVmkLhdSu+O1zBTnTU4DTkB
+1CPnshzK5qWg5Et7CkgPzhFORXPD9tp9QpRSukVee2rHlhIy9umVTzh1M+IcZrW8
+rB0cZfvs7RpOnHtkSpEVoMANC9az9IBU8GzqGy8OmffI+vL71q8CAwEAAaNrMGkw
+SAYDVR0RBEEwP4ISYWFpLWxvZ2luLnBoLWdyLmNohilodHRwczovL2FhaS1sb2dp
+bi5waC1nci5jaC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS3jMf00nQqVvJRH7
+r+2JO7i7iuowDQYJKoZIhvcNAQEFBQADggEBACipXitm/nMRmZswt0tAl0fE81DF
+1U8Xxgh7OVK6QjVIebjckobeeV9D4JT3bF+YfZLVxl/9XIRbpBV2aYDf4TXAtN1R
+VZ/km3VDZbHImJQls8VGoJzMXXGcywQwbZg5vXcdXB1FtYWQTkor5lg0mqRAIJES
+BqBm0XGj5gO0xpZnds5cvH94w/xzfI+BDmusQvjTaYPblemangtJ+MD0yXSaHo2z
+PdZQszzV/n+v286sSXaiO/Bd6QbtIRZUZiUR/2MfwjZ+exR0nymEiSNdiKch1ZpN
+3gDJq0hd3/Em8RDzJtiui0YIJVFZdxA3+9QhvGhX0OvziPHKbsxh1mNnI1k=
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.ph-gr.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.ph-gr.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">ph-gr.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">PHGR - Pädagogische Hochschule Graubünden</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">PHGR - University of Teacher Education Graubünden</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">PHGR - Alta Scuola Pedagogica dei Grigioni</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.ph-gr.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.ph-gr.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.ph-gr.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>AAI</md:GivenName>
+    <md:SurName>PHGR</md:SurName>
+    <md:EmailAddress>mailto:aai@ph-gr.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SWITCHaai</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.bfh.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.bfh.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..503f0422
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.bfh.ch-idp-shibboleth.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.bfh.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-01-27T10:18:54Z">
+      <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="https://it-support.bfh.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">bfh.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">BFH - Berner Fachhochschule</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">BFH - Bern University of Applied Sciences</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">BFH - Haute école spécialisée bernoise</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Berner Fachhochschule BFH</mdui:Description>
+        <mdui:Description xml:lang="en">BFH - Bern University of Applied Sciences</mdui:Description>
+        <mdui:Description xml:lang="fr">Haute école spécialisée bernoise BFH</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gQEDgYKIhOF+gAAANRJREFUOMtj/P//PwMDAwNDVt0kCAMLUFWQPhDiaVcoKyl6AV2OiYEIcPvBU4cJ89fue/z8tQFRBkx0y4djGPj+45fgtv0n69DVsuCyNX/XRAyxizfuBRLtBXQX4AIkuUBGQoS8QIQBL0fzRqIMwGa7haHmAgNN5Q1ku+DE+esJx89dSyA6GpFpGFi8Yc/8t+8/yZMdBgwMDAzHz19LIjoaiQFMpEQjSQbgAvqayuuR+YzE5EYYcLI06A/xtCvCmhI5Odjef//xSxBXdna0NJiILR0AAN4ETpBaPLgrAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:Logo height="58" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA6CAIAAACoHEnGAAAACXBIWXMAAC4jAAAuIwF4pT92AAALDElEQVR4nO2ay28b1xWHz7w5HHLIITmkSA7JISm+H3pbduQkjoskRZuiiz6Apt0UaNF21U2XXfYf6K7Iuou0y6JNuymapA2CJHYax7LsWJYVS7JI8f1+zLOLkRVHoSRbJoW48AeCuDM858zv8F6ee+dykMvf/XEifw5OQpIGpZ17Wxs3b1+/0u+2T7T/2oJ984c/eyQ7DGc5VyCazCysICi6t7Op6/qkxU0C9HEdCJI6d+lbr73+K5I0TULQpHnshA384fgrP/gpimLjVXMGnDJhAAhEkvnlS+NTckacPmEAmL/4MmUyj0vK2YCPPBtzrM9PfXxwuNMW3tte+aoZZaIjqZmb/31/UuomwOgeFu2fC+zOTlswXpWe6yj/QDQ5MW0TYXQPA0C5y4/s1UNwTs9Y9UycIxNGUY3ChkZ7qFJHmRHUUzY5HZlw1rX624u/M9q//+jXR41qRRpORNfEODLh6+XcH6//xGir+pHzbbNeGb+oSXJkwrqOHJPnAYWtjbHqmThPNA9rqnr35rVxSTkbRvfwTkvoDC0nOq+vXm01quOWNFlGJ3yzkjrRs9tuvv/Pv4xbz8Q55ZAe9Lpv/emNp/HG+MiidQz1yt7f33zjqavPBqfpYbuDX778moXlxq7mDDhNwgiKRtNz3//5bzyCOG49E+f00xJttnz7R7+wu9xjVHMGjE7YbS5Nc3eMtouuxB23R5pRJvNL33kdQZBJqZsAoxNO82uXQm8b7aTr1kviv47ynxLCoVhmEsomxBOttAwSM8tPHuTMGEPCfjH2FI3qI+dh0f75L+f/AACcqV4bOI4JQZlos8XWbTfGr24CHJlwted8d+sFAMjwNxx07fgolMn0tCy6jky4LVnXKmkAcNC1ExPWNG3MuibGGH7DmqZ1WvUnj3M2jE64PbRW+879tvRFeyTlwrYiy+OXNhlGD+mrxYWrxQWjfW1v5trezDEh1q9fGb+uifGkQ7rTrN+69sFYpJwNT7bFo2lv/+1N+anauDx9wrqm/futP29v3BqjmjPgNBsAANBtN9/+65tbd9bGq+YMwGvlooOfekRrXddq5eLtT6+sffyeNBxMVNmEQEiKdk35EOTksS0NB51mvd/rAjyVDzs84xnP+L9g4flXMwsrAI96Bx9O5GbOv0Qz1odPEiQVTuQBwCOINgf/VS+PX7SPOh/PLz18aLawQjjxqNJPBRZO5Ey0ubizmZ5f4XiPqiipufOKJE1nF2jGQjOW6cx8u1FNzizrut7rNGPZhbs3rw0HveziRYpmaMYaTc80KqXZC5dNNKNrqpjIEQRpMjPR9Oyg1/WHYh5/SNd1MZEnScrm4D3+UKtRnVm+pMiyGM95/MHS7lZwOmV3uoeDvt3Bs5xLjGfLxR19AnedqNnCAiAs5/IIIbvTbbZYdzZv0xZrcfuu0+0LJ/KqItudHpIylQtbAIAgCMdPESQFgHj8IUGMffrBO6qqFrY2aLMFADbWPmE5VyCSvPXJh6FY2uH23rr2IQBsrP3XwXtxgmCsNrcvWC7sVIo7vXazWasQBOl0+5xun6EpFEujOG5h7WPPFgBQDMNRFB102/12q1zY1lRVU/eRpWG1tAsAtXLhYME8HPTv3bnBWG0m2iwNB61mLXfuRQzHZVmWpaGqqJqmKrLUrFdS8xeqpYIiy8nZZVVRNE2T5aE06DNWe6dVFyJxty8oy5KiKLquW1iOYe2KLNEWtl4pSoN+u3nCrsOTgiDIyL04BB29Jjk4/3gGCGIcHvI6WPkYGo6K+YzHRwjHbQ7exh1+ZoUgKbPlS6WYNNGzFy5/NcJ0Zv74S4STeafHf3AYy35hP52ZJynTw1v5qbkLFtuX/qY7Mb6BEI4bReR4sPTCCophCII43N5IIl/d2/X4Qhw/xXJOMZ6VpWE8v9Ru1GRp6A1GzRa2Vi7EZ5bMDGtmrNH0bKdZF8R4vVLMLj4PCHRaDdeUEE3P1kqF/PKLvC9Y3bsfimUUWcZwPJE/12pUbJxblqXM4kq/2/EGIp1WHccJl0dw8FP9bscXig4HPZZzRdKzjUpRVZREfon3BjqtuhCOC5FkvVyce+4bnWYts7Bid3p63VZ64TkURRmrrV4t5ZZekOUhx3uiqdlauaCqyqGEUcZqszvdAEAQFO8L4gTJuTxub6DbbpZ3tyLJGVVRjP4R41kExZweH00zW3fW/OH4+upVMZEDAL8YR1HM7QsCAEmZTDRDEKSu6wRJujyCmWF5byAUy1z/8J1ep221cSRJgQ68NwAAvU7LwXtpxmoyMz5xGnRw+0KR5AwCCOeaAgBJGqyvXhXCcTGes7B2xmob9vvDQX/Q7zIWNjSdubP6cSCSxHGCICiGtRMEGUnkURQz8jqccKW4c3/ztqapbn9QkYaqIvO+AGmiFVnieG+zVtZUpVLcAYBmrSz1u9VSwWS2BKdT/W47nluslws4QbYbVQRFClt3AUCWhhiGm60sPyUwVlu7WdNUpbB1t12vZhYuUrRZUWTeF9RBVxUFw3EMJ1RV6bWbDre3VaugGFrcvtuolaRhv1YpAgCCoIn8UqtebTUq9XJx0O8qigQAqqIoilwvF2O5xV6npaoqiqK1UsHtF5v1yqDfrVf2Roxp5AEohhnPP2M4bpRKDCcAACfIA1OcIAAARfctcZwAABTbb+8XWATBcQLHify5FzEMNwKiKAoAhjuCoAiCYBhuXBT2KzeKfTmOYXwQ0HDE9hsIPDStYDhhHBltBEEA9l3OlK/nH07o/MWXDy1oD0EzFrvLw/uCD33laCR13MYtAExn5nGCpEz0yE9Tc+eNdRVJmcR4dqRNOJl3TfkP/Q4jyf3rpuefiz6kQUzkMPyRtqswIZw0W6yl+/fiuSWbw6Uqciy7IEvDWGaeMtGtepXlnDYHb3e6m7VKPLfoC063GlWasbB2pyJLVhsnJrI2h0tT1enMvCINE7mlRrVkd/JWu9MbjFAU3e+23d5gp9XwCGI0NdNu1rOLz6/fuKoqspjIhRP5zc8+DSdyYjxbr+7FMnNCJFEubIcTueGg3+u2A9GUxx9qVMtG2b+3fgNFsXhuafWjdzEMzy69oCgya3fUSoXMwgpttpAkNZ2eA0BsnDMUyzTrleziRV3TnR4/7xVQzuWmTGYLywnhuEcQLSxXLmxbbFxpd8vtCx36esyMVdO1fq/j8ggW1p6cPa9pul+Mu/0hq42rlXYp2kzRZk3TWLuz12lWSwWcIHLnXlBkCQACkeTmZ6uh6XSttDvs9wDAF4yiKMpyLpbj73++7gtGLSzXrJU51/5TyYyFjaZneW/Q7QvWysVuuwkAmqZu3Pxk5dXvGdNede8+zVjtTrfD7XULosPt2978zOnxC5HE6pX/+MUYTpDeYMTKciRFowCga6oiS/1uZ/fehq7rqqLomq6qqqqpADDodQORxJQggq6rqqJpqnHJe3fWOJe71aj0u53CA0d5OAQEsTlcmqaqiuJwTe1s3g5EksaaXBoOoqnZRq1sBEFQtNdtX3n3H0I4TjNMOJFrN+sWu8MXivV7HZOZ0TVN1/V2o1bcvttp1v1izGRmAIAgKafHBwDddjMQSfLegKaq/W5bkaXi1oamqZqq6poqDQepufPtZh1BoLC10WrWpoQwYBhmlFAMx436/KD6fbG0xgnSsDkojA/eHzhi+IELQVIHBjhBOPip1NwFI86hTx+Kg+SXLxEECQALF18x5oX9mAiCYphRPnCCPFhj4wRpVHiCIA9U4ThhLKIOpBoxCZIyZgQcJ/4HcAk2YtPORt0AAAAASUVORK5CYII=</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>2001:620:500::/48</mdui:IPHint>
+        <mdui:IPHint>193.5.80.0/21</mdui:IPHint>
+        <mdui:IPHint>147.87.0.0/16</mdui:IPHint>
+        <mdui:IPHint>195.176.3.0/26</mdui:IPHint>
+        <mdui:DomainHint>bfh.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.142358,7.244692</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.057423,7.621388</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.947922,7.444609</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.946692,7.391228</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.991818,7.468039</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.145776,7.219669</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>
+MIIDIDCCAgigAwIBAgIJAJVzWOYGQeKsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi5iZmguY2gwHhcNMTIwNjI1MTIwMDI3WhcNMTUwNjI1MTIw
+MDI3WjAbMRkwFwYDVQQDExBhYWktbG9nb24uYmZoLmNoMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAnwTKlepv4n191/BElXAMg/u+2St3X4T7Jyekhs0I
+hjOnVrhZg/KOmvpPGnaCEZwdN19Lstq4Wqt0PTJk0AkQn/NWLc3+lTJREQJ8G+hU
+5FAdySCDu2bOrgJjD4Bl7hUN0k4W+bkkdgplvcqXERFqt368qpu2c1lRAEwJ7Tn8
+2XxjoP9rOUpTTW+XJh5g5CK2V9BBPteeVf5Gfwe3/xiuQ4LuHsGW8vFLEZPEdIWD
+b9dPuO6WzmqFon+RxAwwUm9MgR+Fgd3vSqYINZFmOJ9kvEONK1hLv7e0a0MX7BhK
+c28dy/3UBhLZmNfiko8gsDR11rvaEw6GcONW2333o6VKcwIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24uYmZoLmNohidodHRwczovL2FhaS1sb2dvbi5iZmgu
+Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFByxTmSn9QFnFpQCJWhgYfKAc3bk
+MA0GCSqGSIb3DQEBBQUAA4IBAQAOIELg4Y21HCefARPwRAhwB3XTRAdoucBQt4xu
+s8UC39Yuzi6Eh6SJieGAm9ePLTpNFSH3jIqAiQyxH33jWZMSb229ByIGzbHrm8K7
+WLFuqcLltr9vdd6l1RT+hOt5wPRNQhWqDkWuBRDBZz4WHq3QNypCzSHyvLBYoahb
+JYkfFc6kusMIqlwnGzfxO450QRAdnhf38E9N1iz+nGoRNT+5xwVCsP/bdUVAyYNr
+M2r2BWHVZt2GQD4ZsRgLjtsaRoyobIN2CWhOVZqnlk4vbXFXlS++TwtBzJq8HKft
+2EhVU1pz8jnpJ90P3Nyj1HNw55DR9pn7DMQqIdSAOoyDkoXY
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.bfh.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.bfh.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://aai-logon.bfh.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.bfh.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.bfh.ch/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.bfh.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">bfh.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIJAJVzWOYGQeKsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi5iZmguY2gwHhcNMTIwNjI1MTIwMDI3WhcNMTUwNjI1MTIw
+MDI3WjAbMRkwFwYDVQQDExBhYWktbG9nb24uYmZoLmNoMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAnwTKlepv4n191/BElXAMg/u+2St3X4T7Jyekhs0I
+hjOnVrhZg/KOmvpPGnaCEZwdN19Lstq4Wqt0PTJk0AkQn/NWLc3+lTJREQJ8G+hU
+5FAdySCDu2bOrgJjD4Bl7hUN0k4W+bkkdgplvcqXERFqt368qpu2c1lRAEwJ7Tn8
+2XxjoP9rOUpTTW+XJh5g5CK2V9BBPteeVf5Gfwe3/xiuQ4LuHsGW8vFLEZPEdIWD
+b9dPuO6WzmqFon+RxAwwUm9MgR+Fgd3vSqYINZFmOJ9kvEONK1hLv7e0a0MX7BhK
+c28dy/3UBhLZmNfiko8gsDR11rvaEw6GcONW2333o6VKcwIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24uYmZoLmNohidodHRwczovL2FhaS1sb2dvbi5iZmgu
+Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFByxTmSn9QFnFpQCJWhgYfKAc3bk
+MA0GCSqGSIb3DQEBBQUAA4IBAQAOIELg4Y21HCefARPwRAhwB3XTRAdoucBQt4xu
+s8UC39Yuzi6Eh6SJieGAm9ePLTpNFSH3jIqAiQyxH33jWZMSb229ByIGzbHrm8K7
+WLFuqcLltr9vdd6l1RT+hOt5wPRNQhWqDkWuBRDBZz4WHq3QNypCzSHyvLBYoahb
+JYkfFc6kusMIqlwnGzfxO450QRAdnhf38E9N1iz+nGoRNT+5xwVCsP/bdUVAyYNr
+M2r2BWHVZt2GQD4ZsRgLjtsaRoyobIN2CWhOVZqnlk4vbXFXlS++TwtBzJq8HKft
+2EhVU1pz8jnpJ90P3Nyj1HNw55DR9pn7DMQqIdSAOoyDkoXY
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.bfh.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.bfh.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">bfh.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">BFH - Berner Fachhochschule</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">BFH - Bern University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">BFH - Haute école spécialisée bernoise</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.bfh.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.bfh.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.bfh.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>BFH-ITS</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:it-support@bfh.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 31 848 48 48</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>AAI</md:GivenName>
+    <md:SurName>Admins</md:SurName>
+    <md:EmailAddress>mailto:aai-admins@bfh.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.fhnw.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.fhnw.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..7e3d9b90
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.fhnw.ch-idp-shibboleth.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.fhnw.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-02-04T10:02:05Z">
+      <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.fhnw.ch/services/business-applications/supportadressen" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhnw.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">FHNW - Fachhochschule Nordwestschweiz</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">FHNW - University of Applied Sciences and Arts Northwestern Switzerland</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Fachhochschule Nordwestschweiz</mdui:Description>
+        <mdui:Description xml:lang="en">University of Applied Sciences and Arts Northwestern Switzerland</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAFdSURBVHicYvj//z8DJZgizdQxIC8vDwPn5+czpKenR2dlZYHZuNSAaDCjsLCQoaCgAE6jGwATA2mAsWE0Q0pKysbg4OB1sbGxi318fG5HR0dXIhuQk5OjB5TfBFRXAdIUGRlZnpaW1h4WFhYHVDOXITQ09DkDMChMTEw2qKio/ACy/wIVcGVmZoINANKGGhoa14Eae4BsNhkZmZdA+YKoqCi5xMTEGgagSSADviQlJTFEREScAhmWnJwsBDIgOzubITU1VUNJSek/kG0XFBQUDbToP9AlmlDDo2Au+Aw0DcMAoPMZgM7P19fXf5+RkSHi7+/fZW9v/yc3N5cR6CUbYJhogsMgICBgN1ADyLbZgYGBR4Cm8wE1gF0AdK47UON1oH9zgXwuoCv2Ai1rBmq2BgciLBZANHKMwAIRFjsweVjow6MRWxyDMMgAkKtwycPwIEjKA24AAAAA//8DAOXaFze+PYMuAAAAAElFTkSuQmCC</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+hkAAAjfSURBVHic7Ft/SJRnHLfOtGVellxYSR5dSBpqWVqWtfJHlmddXl5ZSplmmtaZmRlMGmMD/xCEYGOwBWNMFjQGgxiDQWwgOBgE/tHGYEEDIWhLYhTLofDu8z3uiecen+fufe5uXG/c4Lt7e5/n+X6/z+f9fH8871sphmGkJCV6SbgDVpeEO2B1SbgDVpeEO2B1SbgDVpfA//z+xDoxOjr6rKCgwEg0GFED2NfXBxD9pkQ1N5IONi7Ou3LlSsq5c+d+IAAvX74clW5diZe+BQDyiumavy+Kao7KYR0AVfZUelU+RPLZjN8qXSQhAEYC7P8QHQBfR+FyYPzCQ1fMhPDrKkkGWomBDLBoGKhaG29fYmIgrzgaJumyOByAuvZ0x+O1LtnGxJuBZo2LLDLjYDwBFO2rdMcKYCQb0iJiht50TZvt7+8nALIGBwedAwMD6QQG3ZOBrdKpG8JMN81l9ti1Tvowu0/6ZTbEvfFFxHPhwoUxmXR3dwd++c1dvXq1sbe395sTJ048q6urM44ePWocPHjQ8Hq9j8+ePXsHcxuxIZuMMdEyUHhw+fDrJuz/Wltba+zbt884c+bMNO63m4kM6LBhT6Nsb2yfly5don3m8vMvXrxYduTIkft79uwxWlpa/oG/Y7hvC2FgV1fX2Lp164zMzEwjKysrRFasWGFkZ2cbMECOZwC4bw8dOmSkp6djdYpUioqKjNbW1knMd0QKL50QxtxU2H9n9+7dczK7e/fuJR3NqhRD98gG9luxbNmywN7YPmk9CDALG+mcTcfmzZuf8zbq6+sNRNvIAgAdDocSEJKenp4MPKl7Lpfr1T2bzRYyZ9GiRSH3wI4pgGiXhUw4ABWhboMPt8k+2P79li1bZmR2T5069QsLNZkeGmtoaPhAtseOjo4fmQ/k18mTJzvp/pIlSwI22LzOzs5ZzMsMAXD16tVK8Ox2uwHwPt65c6fBFIYDe/Hixa+u4cSn5IwqrMIxkA9b2B+mOfjtGxoaSjl8+PAX4sOj3wMHDhh8rpLpKikp+U30ecOGDQZCeJjPzWBkD08Uti+320026kwDSBTftm1b4DotLS0seOKGsOk5OJUbCwMxp2Lr1q3zyHM3kH8DLEIoTcjsgvWzKgaS/vPnz5fJ1lEexbpKvkhhrgtjC9LF/v37DfjUbQpAnrpiyEYSNh+Fxc9vygwDOSakeTye3xF295B7bMEwfGvHjh2zMtaD8T+rGE/3oecWP59b9zfZ4m3DXgpyeX1+fv50amqqgULyb1NT04e7du0isPtNMzASeHzIysBvbGy8xTZlBkC+8KAK9m/fvv0lxlyMSbhXnZOTI7WJvbxPemQtCu7bYeelbB3YdputEx4gXadCrxPXduRJB4oYMbDHNIAcQPPIMePNzc2DeGI3a2pqnpphYnV19V1ZWJkBEL8FKB4+NkZ6EMpjsgeHwkLMKJPZCa5rl60rLi4m222qwsOuSQdap1Kq9rj2aDGQBH1QI9GaFJHg2oVk/jwSQ9ErTtI6nSLCO8/fJz3Q90DGdPgyLYYvH47Y+ISYlkioKGBdjqrQMaE9owPogB2aX6gFIJ7uhKxKoi8bU4UTl6AndRkoFhvuz07kJKkd5NpPZHZIL/rY4qVLl0ojq62tbUpVeMQmHmwdB5NfYH6aFoAIwxHxKBN8sm3l5eVh16JqTcpaC91Gmsbb29sHZDaoP8Qcn+zUQ+xjbY/YglH/SyRQNd88qGhzUvPy8mYw/7uQo5wZANE2vMsXAmbs2rVrbZWVlaYBjKaN4YHAsXFSFobIx/MYzxY3HYySXAA8R6ct0beKigoKR69snRgpyH9VwflddC9qAHkhAKkq6QAYLQOhIxf9oDQMcQKZUERICrUe1LsB5Geib3SO54FX2SY/kcbGYYfOw6ssB2Awj3XI9NOZFpV6WFY5AY5j48aNs8iPP+Fc+0Jce/r06Qeq9MIXDxzfctauXTsLnV8y3XELYV0AdYqIEEJ3eNYxQZ9Ia8tF32jNsWPHRoi1AP+66Nfy5cvpaDiuKhx87i0rKxuh6osH8jazYxkGsnloQ2Z4vSwPIkT/4n3jGu4cjL9A4XmAytkk5k6q5pg/LPokpA1inzM7O/sl9E3ywCYEQN0qzFXAEqfTKdWP08Fn/OmD5T6ci78uKSkxhoaGmtHD9ovrqIHG3JZwAJJ/YPC41+sl9tXyYwkNYbNVmIUQ5kjzH9oKA8xolaQFH43j9z69gEDyX9D+0AsEjPl4UMSHAHY30EPA9W3RN0swkIURABgRQ5CktLTUwGZcPNi4zsV/T3BqmMPGy+lea2trs5g/kdfIpk/FPDA7HyesGeTPh/BhlZiCLMNAWuvz+aTn3yAIGWwe9Dlwb4rCE3/uYRUce3SJTTQ13xh7TwSGmIf5eXa7/Q86dUBnqay4WaaIBAEYlDGQThJgSjfpp1f1RUVFjzZt2kSs/Eg8Q6Phf0hr6NzO9ICZj7CHDO58T2yvWbly5Z/IewRepczvBQyM9EpfZKAOgOJZOBKAslaCPiSBWfOkjzGJvcBYs2YNfYd5zDHyc8y3SappN/OJ3u/RL7Uybrd7CrnuusfjuYF8N0HfS3A+fgowq2T+SBmo+qjEPrjAiDKE6YsVzVGtxTk65j4wOHazsLBQ+pDWr19vHD9+nBjTq0oFZAvV+CvxpQIvOK1QUZrAXGc48EIA9If5rMl98quThRgMlcHgGP+JUFyLcb8qPDWPcjZc96OhfkLNM73/oy+ECLmHuD8KxuTy1VSlA2djP8Jzmr7x4HRiVFVVBcCHr3ehwy2+l1SJ1od1scyHu6ezVufDOhsLviV24qHSW+JVxG6zvjA2B3XkkA6sJz0h7x3N7MlyfztL9jAi6Q/nh0yHWT0LGChzNFpmmmWCLgPN6o9mD9GsS/7trBglCWA8AYyV/tGGzBvxV3yTDIyRgfF0TtfpNwJAkR2xVi8zOsIBqGtPdzxe65IhnGTga8LApMT4rzWTkgQwCaBVJeEOWF0S7oDVJeEOWF0S7oDV5T8AAAD//wMAK6fch+XN+x8AAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.fhnw.ch/about-us</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">http://www.fhnw.ch/ueber-uns/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.8.137.240/28</mdui:IPHint>
+        <mdui:IPHint>2001:620:300::/48</mdui:IPHint>
+        <mdui:IPHint>193.8.137.224/28</mdui:IPHint>
+        <mdui:IPHint>192.152.98.0/24</mdui:IPHint>
+        <mdui:IPHint>195.176.0.0/28</mdui:IPHint>
+        <mdui:IPHint>195.176.252.0/24</mdui:IPHint>
+        <mdui:IPHint>193.73.125.0/24</mdui:IPHint>
+        <mdui:IPHint>193.8.136.0/24</mdui:IPHint>
+        <mdui:IPHint>193.135.240.0/21</mdui:IPHint>
+        <mdui:IPHint>193.222.241.0/24</mdui:IPHint>
+        <mdui:IPHint>193.222.242.0/23</mdui:IPHint>
+        <mdui:IPHint>193.222.244.0/22</mdui:IPHint>
+        <mdui:IPHint>193.222.248.0/23</mdui:IPHint>
+        <mdui:IPHint>193.222.250.0/24</mdui:IPHint>
+        <mdui:IPHint>147.86.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>fhnw.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.392715,8.054434</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.562410,7.584170</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.485184,8.198633</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.475698,7.740292</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.533412,7.638095</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.346483,7.911239</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.212806,7.543743</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.480694,8.211173</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.282572,7.942067</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>
+MIIDJDCCAgygAwIBAgIJAIJ6DzWGAuMKMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWFhaS1sb2dvbi5maG53LmNoMB4XDTE0MDUxMTIxNDEwNFoXDTE3MDUxMDIx
+NDEwNFowHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZobncuY2gwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDOkHz+Vpux4iVD5VJ8jZo8Nc5Q5YZ2AgkRo0A1
+mXHGQV9zEol9GSfsI4bR/O2ZIyyrPzDIIt6gGY05kV+v3JrHDyPskU53o95zL/Wd
+RlXKZL01Cxr9e01LfKzOQ+RNcimbGHg/n2V96f0eyonFBgq3En/83U5YKLpxCGNl
+65RI6HwVNPEC8lVOcSpQ7wudWhhzozIo7R8UYCTIptz8IvVate9RZ4pTKt7liZL2
+ARBu14nYsDg4hVexYlfL83pjnHqLAjnGQFcPDTceqUaxvNNpix/vAE6jBKLLKbzd
+dV2+kpIGIlo5YvBXGBe8z6sFgKNAUuzjDFpYTofQhVML2ElZAgMBAAGjaTBnMEYG
+A1UdEQQ/MD2CEWFhaS1sb2dvbi5maG53LmNohihodHRwczovL2FhaS1sb2dvbi5m
+aG53LmNoL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTem4oyIQo/dTo3R/J2b+7+
+CNTz3DANBgkqhkiG9w0BAQUFAAOCAQEAjVnz/Y4A5DeISewPWxT/KlTWbYrWfkJd
+fMMtc0mV3TGJaWSVzQD0D0WgTnatZaab7A/eRrBHUHWcCtYpamNSsCo1a4TLJHPc
+9PrK0XLHC889mZBwz+dssMq4GXjc1vofxgI8kSmmmFAa7r7zAWPVhduwhnPE5mjY
+jemT6fUUBcDOW5UGKChiIrkN3/9pRGT6pBalNKen1C5P+lBh8bvD2DSzlzjtocHv
+WfOxP5GFY5ZCrTjbF/wFGhk3orBkAoFTpeRdTwE9eE3amEj+bGgiXsh0Z9LGkcJN
+HxsDKvqOV07q5mSPIh+RMYeL+YuHsgti6dcYgM2CtCQj90/ydFLMvQ==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.fhnw.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhnw.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://aai-logon.fhnw.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.fhnw.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.fhnw.ch/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.fhnw.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">fhnw.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIJAIJ6DzWGAuMKMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWFhaS1sb2dvbi5maG53LmNoMB4XDTE0MDUxMTIxNDEwNFoXDTE3MDUxMDIx
+NDEwNFowHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZobncuY2gwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDOkHz+Vpux4iVD5VJ8jZo8Nc5Q5YZ2AgkRo0A1
+mXHGQV9zEol9GSfsI4bR/O2ZIyyrPzDIIt6gGY05kV+v3JrHDyPskU53o95zL/Wd
+RlXKZL01Cxr9e01LfKzOQ+RNcimbGHg/n2V96f0eyonFBgq3En/83U5YKLpxCGNl
+65RI6HwVNPEC8lVOcSpQ7wudWhhzozIo7R8UYCTIptz8IvVate9RZ4pTKt7liZL2
+ARBu14nYsDg4hVexYlfL83pjnHqLAjnGQFcPDTceqUaxvNNpix/vAE6jBKLLKbzd
+dV2+kpIGIlo5YvBXGBe8z6sFgKNAUuzjDFpYTofQhVML2ElZAgMBAAGjaTBnMEYG
+A1UdEQQ/MD2CEWFhaS1sb2dvbi5maG53LmNohihodHRwczovL2FhaS1sb2dvbi5m
+aG53LmNoL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTem4oyIQo/dTo3R/J2b+7+
+CNTz3DANBgkqhkiG9w0BAQUFAAOCAQEAjVnz/Y4A5DeISewPWxT/KlTWbYrWfkJd
+fMMtc0mV3TGJaWSVzQD0D0WgTnatZaab7A/eRrBHUHWcCtYpamNSsCo1a4TLJHPc
+9PrK0XLHC889mZBwz+dssMq4GXjc1vofxgI8kSmmmFAa7r7zAWPVhduwhnPE5mjY
+jemT6fUUBcDOW5UGKChiIrkN3/9pRGT6pBalNKen1C5P+lBh8bvD2DSzlzjtocHv
+WfOxP5GFY5ZCrTjbF/wFGhk3orBkAoFTpeRdTwE9eE3amEj+bGgiXsh0Z9LGkcJN
+HxsDKvqOV07q5mSPIh+RMYeL+YuHsgti6dcYgM2CtCQj90/ydFLMvQ==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.fhnw.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhnw.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">fhnw.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">FHNW - Fachhochschule Nordwestschweiz</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">FHNW - University of Applied Sciences and Arts Northwestern Switzerland</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>Helpdesk AAI</md:GivenName>
+    <md:SurName>FHNW</md:SurName>
+    <md:EmailAddress>mailto:aaihelp@fhnw.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Schneider</md:SurName>
+    <md:EmailAddress>mailto:tom.schneider@fhnw.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Weboffice</md:GivenName>
+    <md:SurName>FHNW</md:SurName>
+    <md:EmailAddress>mailto:weboffice@fhnw.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..ba59b244
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.fhsg.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-09-05T08:54:49Z">
+      <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://portal.fhsg.ch/it" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhsg.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">FHS St. Gallen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">FHS St.Gallen</mdui:DisplayName>
+        <mdui:Description xml:lang="de">FHS St. Gallen - Hochschule für Angewandte Wissenschaften</mdui:Description>
+        <mdui:Description xml:lang="en">FHS St. Gallen - University of Applied Sciences St. Gallen</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAG/SURBVHicYvj//z8Dg5JFCQpWtixhkNTUZgACTk4uBiiQVFVV8/X19W8sLCrZmpmV8wwoxs0ANiBjxX8UnLX6P4NPdQJMZ0RktNW8+Yv+r1m38f/2nXv+7z945P+CRUuAGhmsIAbkrP+PgvM2/2fwb4QbkJScyrt3/6G/u/ce+L9rz/7/IHrt+k3/1TU0cqAGrPuPgvM2AQ1ogBtgZ2fPsHnrjlsgzTAMcomPr99cHC5ANYCbm4dh+co1q/bsOwh3wb4Dh//nFRSegxiQDbQVGeeiGgACM2bNqTxw6Oj/nbv3/d+4edvzpctWbk5Lz6yEGGAczIuCTUJ4GVRtWUEaGRkZwQYkp6SpVdfUBQADVMbE1AxhMtgAXICFHUxxcXFjlQYbjtcAYgBeA1g5GRiYmIkwIKKvFgVHTqxlcMjQhysSkmNgCGpNYYjoh6oB0mE9tQwq1u4QA0ChjowLtv5nCGhKgBsgrsbAkLbsDDiBgeRB0QyKbl2vCUSlAwZxVQaGlMVnGHI2INRkrQEa4DmBqJRI2IDs9YhERJYLstf+R8G5G/8z+NWjGbDoDFgjWA3QokxgjtXxmAAAAAD//wMANOlXl/E5lXoAAAAASUVORK5CYII=</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+hkAAAgNSURBVHic7JhZUFRXGsfzNnk0VvIQM5maVCWVROMwqLhkIIiOqYHBgbBjwMSJ6IPKk+IWFM0AQdlESwERZF8CJSDY3bLJ3s3ayL4JKossooKiIsr84Pbc3GacmaQqw9S091+nTt177ndOn/+3ne/0azOvGF77X29goSETNnTIhA0dMmFDh0zY0CETNnTIhA0dMmFDh0zY0CET/sl4+vTps2fPfsGtLAx0hPtHxoNT1NL2fUJ5eeNtqeiLFy8mJyeHhoY6OjpramoLC4t6e3vnLZeZecnf3++7745fuXKlq6szMTGRwYmJiYiIiHv37j169Cg8/Nz+/fsVCoU4BcXFx8d7eXmlpqaKI9I179y5ExYWduDAAXoWmfeLSqUyPz9/eHg4MjJi3sR/R1jd3L/IMnCRZdAbVrr2Kwt/37gyUe7x48dqtaagoFClylMoVErlVfr6eu285RwcHFxdXYKDg9lEZmamhYWFsONly5beuHGDTVtZWbLvmJgYcUpISPCnn647c+bM2bNneQ0PDw8KChK/9vT0mJqa7tjhERkZuXfv3ra2tnlK2bdv7+HDh5qbm01MTNAsI9PT08InLET//PnzlxCuah1454tT73wR9ms7XVtsFXQiqVKUw3uLi0vgefVqvtBgXlpaNs+rnZ2dk5KShOesrCxLS0t+dXBw0MRkFYSdnBwPHTo0T0eennu2bNmi07tabWz8e2Nj4/j4OGHEy2vf9u3bpfK3b9/28PBwdHTAlaampr799vCxYz6tra3m5p+hBRTt4uLs7u7W3t5eVlb21Sy2sn5HR8fPIwy0Wq2U8GzLy3/w4IFUhuXXrl1jbW2dkZFRUFDwwQfvOzjYb968eenSj2/evFlVVbV6tYmzsxPkxSnszMJi/eefb6qvr8fnd+3atWfP7rt37womwiOSkhJ5OHjwIDyvX7/OJ6KpsrJyzZrVGo3m2CxmCa9fb37r1i0zM1O2GBwc9PXXX12+nL18+fKGhoYvv9yyc+fOn00Y78KNpYThj76lMq6urr6+f6urqyPUc3IuwwQ1FRYWrlhh3Nk5q2PGPXZ4QIMYEWeNj49jeQjgk97e3kePHhE/2dnZEQI85OXl4bSs2dXVBZlvvvmrkdHvSktLjx8/LhDeuHFjTU3NJ58s27ZtG/bfunVrWlqqvb0dc318jrq4uOgR1rQOvG0T+rbNqSW2urboT4EBiRVSMmNjY7ix6M+wzc1VNDRcl8o4OTmJ3ii4NA+jo6MrV67AkgMDA7zCn5BmUBBDBcQFLvfRRx/29/fDnJhkvLu7m9fo6GghHBixtbUlF3p6ehK3Dx8+3LBhw7Vr12bt63O0tbUF5UIbzaIFctjg4J1Lly7Z2PyFibg9ltAjXNcx+LFbOG3pP9p7jqdPp1dLyRAhRUXXMHJeXkFJSWltbV1XV7fgeyLc3d2FzCwQtrGxESiZmv6hp2c2aaGCdevWkqiEjALIcPgzAiRqEkxCQryRkRGJYPfuXb6+voywXTMzM1tbm1WrVhIUJHNzc3MPj+1Ee3l5mZ+fHz7V3t62adMf8ZrAwEB+ws3NLS4uTqVSkTX4CXSC2fUIP52a5mSStr7h8fFHT2b0gaZ7e2/ev3+fbDHzMmBDMarxz76+vpm5hMcBxhQm4uGYTjoFWzU2NrJj4ZUcS8olz5HbR0ZGhEHinzDB4IKacJbOzk5kiPnROWAMAlj8StzyiZWFDbAOwnqEXx3IhA0dOsKTT6ZaekZaen9sTTeGh8YeSkUH704wKJVp7hlholRmYg5irQMIPKkASU4skghpDqT/Cq1/DR3h6raBd+3D3rU//RsHXXvLOjgwWe8c9rlQ8qZ1sCiA8G8dTzd2D4kC5AxOgtTUFEoIqhyO6OrqakpcjUbd0KAlf9TW1mZnZ//wQxpJiDRWVFSkVldyipBdFpowhccS29AltmHUHkJ7wzIwQL/w8I4qZlAU4KymPsHmUpnY2FhK4oSEhLS0tFOnQjm6eL5w4QKHTWJiQm5uLvR45ejiwoBMTEw0Z88t/eplgQj/x0rrSFQxg6IAwjjFPMIcORRkLS0tCoWS44Eao6m5uam5STMH6gRqQ75yDsEWR6BUQObJk/nn3/8NYQ5AXFc89GbmCtKfvhvOcE5yMQUQ8LwSGpzJ0jVfCn5IVByzmpqaXnpd/yUJk41CQkKKi4sxpkqpojZgB1RClI3cJaqrqyjrMTI90avRVOHe1BgUycR2SkoKzxcvXoyKisL4FEnsmInnzp2jFEtPTycpIIlCKyoqSA34BZfqwkJuKAVU17ySOwgoUgM3ZKoxIot1mMI1g+nM0iOsbulfbBXINXjxn3Xt9Q3f+8WXSwkfjChiUBRAmBzW0KWXtLKzszIy0mPjYs+fP08GhvnJkyehAZ/YWPrkiMgIf39/pUp14sQJymAUwQPXY0IaqvTJycnUldSLlZUVVEtHjniHhoaQCEiH8MnJyaG6pjJFjEQAJVaOijqPguBMOQk3VMygQqlAht8SJgYEBOgRHhqbiM7VSltEVl1tm54XaZr7IrPrfpTJ0cbkakcfTEplcD/u6CUlJWh6evo5PbQJWvyNZ5hAieoSFyV6MSm1KjbHRD1zYNOMYEbhvoUGiXm+siyJncsQiwt9a1sbtSSDJAIEuEjTU/ayJo7DUng1c7Xa+t45MK5HeGGAk//zfzQLjFe10np1IBM2dMiEDR0yYUOHTNjQIRM2dMiEDR0yYUOHTNjQIRM2dPwdAAD//wMANQzGak+BGLgAAAAASUVORK5CYII=</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>195.176.16.0/24</mdui:IPHint>
+        <mdui:IPHint>195.176.16.0/25</mdui:IPHint>
+        <mdui:IPHint>195.176.17.0/24</mdui:IPHint>
+        <mdui:IPHint>195.176.18.200/30</mdui:IPHint>
+        <mdui:IPHint>195.176.18.204/31</mdui:IPHint>
+        <mdui:IPHint>195.176.19.0/25</mdui:IPHint>
+        <mdui:IPHint>195.176.19.128/27</mdui:IPHint>
+        <mdui:IPHint>195.176.19.160/28</mdui:IPHint>
+        <mdui:IPHint>195.176.19.0/25</mdui:IPHint>
+        <mdui:IPHint>195.176.19.128/27</mdui:IPHint>
+        <mdui:IPHint>195.176.19.160/28</mdui:IPHint>
+        <mdui:IPHint>195.176.19.0/28</mdui:IPHint>
+        <mdui:DomainHint>fhsg.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.425413,9.371350</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>
+MIIDJDCCAgygAwIBAgIJAJPilzxxDSFSMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWFhaS1sb2dvbi5maHNnLmNoMB4XDTE0MDkwNDA3NDc1NFoXDTE3MDkwMzA3
+NDc1NFowHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZoc2cuY2gwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDDu7JMJ94andqk76Bv1KS2ZWWeDgrV+M1XkTK3
+ZUHWgJtzXIg9+9uQnOZel/TkDp6L+by+AGwcXod61E0uw1RbA+E1NNjYAZhr4JS/
+osFjJkz606hKYOAiv/68xQvmhi/P34U36qsKjX0Zhz2KX84j9lnEdhqQpre4nnsb
+41ykQWuQAJ5QOP0rW/BjjX+GXI+gLiORkHMtb3G34RG6NpzqSDy28wQFDDqFHSrA
+GJyGgNpg0t/gqO8zhI0nATXivoqlRoAd+U6OmUvpQEMQbC0UViv+/Iu2NWif0i2b
+NE36VFxhZSFg28pW9/Axqos+oDEA+zUlZkKz8QE5TGwtlzurAgMBAAGjaTBnMEYG
+A1UdEQQ/MD2CEWFhaS1sb2dvbi5maHNnLmNohihodHRwczovL2FhaS1sb2dvbi5m
+aHNnLmNoL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR2uqcGmoc4uzwkZ0o2rmgb
+RlsGXTANBgkqhkiG9w0BAQUFAAOCAQEAT9ApCu7pG2zaOzhiDM5LzcQnJcDMckV5
+6q0cpTnjYB90Ff0KIVTsUUDAQ7yixqY9PchIvdzOnMsti9Yc2RyOWj9xkQPS/wR2
+ZyWmBoXBl363F4kijL6zH4BD/e28hQx5FtFj1xTASJUhZuV47VlZglsM1rWeGyxf
+cr+IxYfp7Y4/zFsPuTlCDJrCdMan00AmEEyNDD0hCjuhOCNZVolP4BRJSLusiyRp
+aKbKSwtCxelgvX/DrTHG/CPz5LGC4mO8ZdagGbPscpwxQ97gzYfNoQG0BWoKX9BM
+8EEBPaXFRM+soV0oreSVta3bE4+da2JcQYWXypXGXA2vfp1ZqqBnbA==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.fhsg.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhsg.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://aai-logon.fhsg.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.fhsg.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.fhsg.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">fhsg.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIJAJPilzxxDSFSMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWFhaS1sb2dvbi5maHNnLmNoMB4XDTE0MDkwNDA3NDc1NFoXDTE3MDkwMzA3
+NDc1NFowHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZoc2cuY2gwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDDu7JMJ94andqk76Bv1KS2ZWWeDgrV+M1XkTK3
+ZUHWgJtzXIg9+9uQnOZel/TkDp6L+by+AGwcXod61E0uw1RbA+E1NNjYAZhr4JS/
+osFjJkz606hKYOAiv/68xQvmhi/P34U36qsKjX0Zhz2KX84j9lnEdhqQpre4nnsb
+41ykQWuQAJ5QOP0rW/BjjX+GXI+gLiORkHMtb3G34RG6NpzqSDy28wQFDDqFHSrA
+GJyGgNpg0t/gqO8zhI0nATXivoqlRoAd+U6OmUvpQEMQbC0UViv+/Iu2NWif0i2b
+NE36VFxhZSFg28pW9/Axqos+oDEA+zUlZkKz8QE5TGwtlzurAgMBAAGjaTBnMEYG
+A1UdEQQ/MD2CEWFhaS1sb2dvbi5maHNnLmNohihodHRwczovL2FhaS1sb2dvbi5m
+aHNnLmNoL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR2uqcGmoc4uzwkZ0o2rmgb
+RlsGXTANBgkqhkiG9w0BAQUFAAOCAQEAT9ApCu7pG2zaOzhiDM5LzcQnJcDMckV5
+6q0cpTnjYB90Ff0KIVTsUUDAQ7yixqY9PchIvdzOnMsti9Yc2RyOWj9xkQPS/wR2
+ZyWmBoXBl363F4kijL6zH4BD/e28hQx5FtFj1xTASJUhZuV47VlZglsM1rWeGyxf
+cr+IxYfp7Y4/zFsPuTlCDJrCdMan00AmEEyNDD0hCjuhOCNZVolP4BRJSLusiyRp
+aKbKSwtCxelgvX/DrTHG/CPz5LGC4mO8ZdagGbPscpwxQ97gzYfNoQG0BWoKX9BM
+8EEBPaXFRM+soV0oreSVta3bE4+da2JcQYWXypXGXA2vfp1ZqqBnbA==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.fhsg.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhsg.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">fhsg.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">FHS St. Gallen</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">FHS St.Gallen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.fhsg.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fhsg.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Hotline</md:GivenName>
+    <md:SurName>Support Contact</md:SurName>
+    <md:EmailAddress>mailto:switchaai@fhsg.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SWITCHaai Team</md:GivenName>
+    <md:SurName>Informatik</md:SurName>
+    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..5de2aeca
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.hes-so.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-03-02T09:27:19Z">
+      <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="https://aai-logon.hes-so.ch/idp/doc/ListeResp.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">hes-so.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">HES-SO : UAS Western Switzerland</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">HES-SO - Haute École Spécialisée de Suisse occidentale</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Applied Sciences Western Switzerland</mdui:Description>
+        <mdui:Description xml:lang="fr">Haute École Spécialisée de Suisse occidentale</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAW0lEQVR4nGL4TyFgABN5qxECSOyBNQBEI2OcYvgUYzOUdi4gxjYUm4kxgGgXUAJwGrBl9UI4Rhcj2gBcfGQ2A7Igsg3Y+HgNIOQSkg2gOAyIBRQbAAAAAP//AwDivI9ii0QGKQAAAABJRU5ErkJggg==</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+hkAAAlCSURBVHic7Fj5T1zXFebPqJzYDhgDTuV0r1RFjaJKTiI7UtNKbdJFXRSSYBsbx3bSuI3TxrFpUlsywanlpo4NMwzGBgzY2CYsw7Dv+zKswzIwLMOwzDDAgWHc892ZNzyGYUl/eXkKSJ/evHfPve/c731nuQQ9fvw4aBv/PxR3QO1Q3AG1Q3EH1A7FHVA7FHdA7VDcAbVDcQfUDsUdUDsUd0DtUNwBtUNxB9QOxR1QOxR3QO1Q3AG1Q3EH1A7FHVA7FHdA7VDcAbVDcQfUDsUdUDtW3Zis9rRms62gzmQtrTGNl/VP2G/7T3AzesZmMoVdn8duYMKxxu6bglU3r13Opb3HkynsWDLtPqyhE5py8oy5fTau5eWgQ/98QGFsFx6TTLuitHRKW0FKb+RrQeAv//WIgg9rKfyYjp5iYs7eqVpDDAg88OE92nM4icKjmei3tPTXlLV23xT4EZhDISCGFQgCz92tCUCgO+iFc/cp9GgSRcCOCfwwvXabwIAESsS4ZSHsWvYQeAQK1NHuKBmB7tW2APLlw4YBc2JxJ+lKu6jIaGmeW1y6hDG33Na9MgfjyK/p1SZbAs/T8jys0WGZyp5dWPxKG1xaWvzE4XBcnbBak2wTE9rZ2dkreLaevdu9fH5ubi5uanLyJuZMT09fX1xc335DAj+6W7dGWdj0C+fu+RS4ikDkSi8pHZbp7OibpfT9d+5QCJP9FKeGEIB//zouj+r7rUW+ObKPlNdsNr1y8RHti7klfAnm9YE9PO/bb6fQ0Rsl5PL7SIGJW4o19fbqKysrh4sMBoe+oICA4qIie2VFhcVsNt/3nzM2Nna7ob6+s7SkxCbZGwoLnbDv7u4uIqKLWyYwmK/vpVTSzBxdcdLiZSctXZrm35ZpZ8LP/p61DoEeNAxYDT/9IIN2vaWhsKM6QRpyKxDGqg2O0tCz72dQq9mWK1diYfuwcf/JFLbTiPwaynNR0PadSOE1tLTj9QT67af55N6EwOXl5fNtbW21IKBQr58vLyuzNou/plaQUZCfTx0dHRVyUfT09BhAFuaAwOamplb+q6/iDyCRWVdXa1pYWLi0JQLDeAPPnLpNB1htL3PVReU98NE9sfF9x28xeTqB3UyGnED7PMX//GIOK1gjxkHCH6/qKbO233oxu5H285phovhoKJrVtOx2nxeb5uuf2A7r4f1Q3MsfP6TSztH6pkFbwV0O599fyafTus0rvt1uvwalgbz6urruufm5OGkM4TgyMpI2MWFNkisP5MG+uqrK7HDYr8ntjcb2GoyBxE4Z8RsSGCFI1HnCzqsejGFjnnGdL9TlBCJXhRzxVGjYvnQhm+zzi/HS+BlWNRQIZf7g3VQatDmS8XxhyfXJS7HZFHo4SayNd732aR6NzszdlCtlZm7hymYE2my2BImQFtbdRorFWGNDQwdsEeqY62+D0IVyYVPGaparcEMCkYe+yznMg1T6HgPXCO94uDeEz9xaaWPev10l1BXhVdErl3JE8fjsyxb695etFPm5gQuQTrRKodFJlN861Il5XN0vvMp9aHCUxrf+Xib5J3/LoJiEMrpX32+RfwgJKArDw8OZcpU5nc74kuLiKZAIUpoaG42wwXN/MkEGQlxSn8vluhCIaKQE2GDNCS5GW8iBWjrNDfLQ5GySedKRhCtgGrenPf9BpghNicDT2nIfga//xyDmrpCQJMIZpKJnDPFWb5EL+V0pFT1OaW5KeY8TuS7Uq3KQ7JnP8/h6iENa3zbcIQ+v6urqAeS0Og5Vl2spVhrr7+vLNTB52HShNxcitzWw2hDCEpH4AMVFxSLcUUDWU6vJZCoQazEwf1MC4fT5jLVVGHiR2xgplAWBSZU+uz9fKxTE+FTMJ5aI48nenJlMT8ek0NMngFsUxgrXlXfP+8KJgZblOS5AouggH0brfGrHsx+9l0poZ2A/Pz9/ubSk1KZnAqEiosVVVRJKgXLKy8qtUkhLVxSNFQKLfASuF+oDAwOPpPkjFkv6lgg8F6BBlhrpPV47qOokh5g0DjWKAsKkIXf+Lj6fTGPT6d0jU1ndI9NZPaMzmb183zs2k44ztGOe4kQL4172vWOEK31KRbczkj/GMydvi3wpKXrXmxqRCiTCh4eHspq4Yo6Ojt5Zb/MIUxQK2CGkQQJIQ7HAGJQJcmpravpQwQOt0dXVVSopEGtticB3dJXrE3hkhcCYL0p9dlCQVEkRpigUVb3jFYGcGrTNBi3x0RBh4+Z+kO+TF13LsXIbhOx3ROXWedsmDcWuExmbAe9BKyMpaZyJwLOamuoBPEPeRNO9Zh6Timou2UC1WyLwbU1ZgH8mBCDwxgqB6BOfO5spxqFC9Is//Esqb7qecpoH+/TGYePnBe30alyuaI3QW2J9JvLCb+LzKPKagfTcD1qmnNopJ11NqzJN7T/paX3CvQRe5/kbEYWqaeEw82980VwjTA1eAif5tCHyZX9frqSuNu79/AvJEDfdRd582uxX1TckMOp68dYU6CPQs3BmbZ81QpwktD4litMEh+LeY55G+sk3Eukgtzjzi0tik8RtzMGPH4jne9n+x2fS6dmzGfwRdCIPSu96/h9ZZPa2PvLjnxxSXkMT3NnZWTY4OJiNIlBXW2uSmuWmpkajFK4oRiBWOnlAbTipoHK3t7fXYC2MoYVBjyl/16oXH4p9QDsiE8Wxa8cbCfSHzwoCKhAKe+LNRNrNdt/i08GR/xbL7Dy2DxsHBw7yeqG8+V1sC+xkPInfXJFRxU9xvpQaaRD4K7QxvOZOznNPRCYIYM5O2PM6v+CWqL5POgKuDxBYUV4+ik3n5+X5gGoNJbW2tDT5nyhwbzQaqxGisJPPk0jFudj/XatucprMfWgrUqt6p9Kqe21lXaO1a/PI46D79QOWlMoex52qXjtsy7vHagJtBOGJ41mioYNu6I10o8AortriLqrsGat2kmvVJsZm5r7IaxnqTvCzTzR0ksFoacVxcqv5Dv8QGB8fT0b4mQUGs6GoGSbBvSH5jqtoUzBPYGgoC6G+Xn/4lRPxNrYJ3Cbw6wTFHVA7FHdA7VDcAbVDcQfUDsUdUDsUd0DtUNwBtUNxB9QOxR1QOxR3QO1Q3AG1Q3EH1A7FHVA7FHdA7VDcAbVDcQfUDsUdUDsUd0Dt+B8AAAD//wMAZtOP6cvUNwcAAAAASUVORK5CYII=</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>195.176.12.0/22</mdui:IPHint>
+        <mdui:DomainHint>hes-so.ch</mdui:DomainHint>
+        <mdui:DomainHint>ecal.ch</mdui:DomainHint>
+        <mdui:DomainHint>eia-fr.ch</mdui:DomainHint>
+        <mdui:DomainHint>eif.ch</mdui:DomainHint>
+        <mdui:DomainHint>he-arc.ch</mdui:DomainHint>
+        <mdui:DomainHint>heds-fr.ch</mdui:DomainHint>
+        <mdui:DomainHint>hef-ts.ch</mdui:DomainHint>
+        <mdui:DomainHint>hefr.ch</mdui:DomainHint>
+        <mdui:DomainHint>heg-fr.ch</mdui:DomainHint>
+        <mdui:DomainHint>heig-vd.ch</mdui:DomainHint>
+        <mdui:DomainHint>hesge.ch</mdui:DomainHint>
+        <mdui:DomainHint>hevs.ch</mdui:DomainHint>
+        <mdui:DomainHint>hsw-fr.ch</mdui:DomainHint>
+        <mdui:DomainHint>hta-fr.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:46.996710,6.936891</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.793393,7.159078</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.207325,6.099785</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.293093,7.536841</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.379599,7.626590</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.235924,7.351375</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.287826,7.884015</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.361332,7.345858</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.779445,6.658656</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.526928,6.627963</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>
+MIIDLDCCAhSgAwIBAgIJAMqicqA49UbTMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2FhaS1sb2dvbi5oZXMtc28uY2gwHhcNMTMxMTI3MTAyODUyWhcNMTYxMTI2
+MTAyODUyWjAeMRwwGgYDVQQDExNhYWktbG9nb24uaGVzLXNvLmNoMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkJvxk2Aq0rv+KSKYZmat+KfRDoPngFG/
+q7vy+R2o3+em4jUkOI+FrKA87fGmVUTCTj39s6ySilxmeyDppzUG8OLcXYVR62gl
+9EKNAsaDAKLyk6+5EKrD92lgLJqd8mUkFEMsp8Vmp7dfS+3mCrFu1eUC5GdPc+aF
+xf1u+vjP4/ETBU13MNzacsqcXlM0ArPIp7oWrDQnrs151+2kZt5YgASyqtlv6Tz5
+8h153JjL4rkrVSqF3drEFZLN3Qu38zyUrPOYIv9c76lCQ6PUsq875riXZffIcdfP
+dlQtuRuOGnePrs7TP39F5ToJDR5dKdswnhyrgXsTTElkU7UHWlUgKQIDAQABo20w
+azBKBgNVHREEQzBBghNhYWktbG9nb24uaGVzLXNvLmNohipodHRwczovL2FhaS1s
+b2dvbi5oZXMtc28uY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLPdE7npAe4X
+MCJJ2tWOvKkGDRwTMA0GCSqGSIb3DQEBBQUAA4IBAQAKmIgNATIcA64ve8grxWDR
+cmBxDOoyl4m7zgaOz5TAhL65R3Ieb1wpvFYfIxtuhR3eSbcTYmD7A6BBp5C2QXZa
+2twKtrGfo/WJMhas9NNhthnZQDYpK/1E54nJPNAKY0eZUnh9QCEdcKmLh9TOl6BF
+eYrPRwFJZSV2pBHhXCaO/aEtTvrL7+DnDljnhb0zfBJ4TCCGnQ/MOALNxt/ZkKz5
+QYG9T2ud56O8FIRDi+rCME6nicN5HF4FVFA3Um8q9WED2vQ6mztFY9y+glOHdRqb
+Hpx/eGHluuFsDHUh9eaXQubano3fjXCVFAhHELlqLWa4uEDyoIQ6RID36NV3V7Ul
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.hes-so.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.hes-so.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://aai-logon.hes-so.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.hes-so.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.hes-so.ch/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.hes-so.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">hes-so.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFQjCCBCqgAwIBAgIUbQvY+OJqikCxxhTbXiF9bamtIiEwDQYJKoZIhvcNAQEF
+BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
+IEdsb2JhbCBTU0wgSUNBMB4XDTEzMTEyNzExMTkxNVoXDTE2MTEyNzExMTkxM1ow
+ga0xCzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRKdXJhMREwDwYDVQQHEwhEZWxlbW9u
+dDE/MD0GA1UEChM2SGF1dGUgRWNvbGUgU3BlY2lhbGlzZWUgZGUgU3Vpc3NlIG9j
+Y2lkZW50YWxlIChIRVMtU08pMR0wGwYDVQQLExRTZXJ2aWNlIEluZm9ybWF0aXF1
+ZTEcMBoGA1UEAxMTYWFpLWxvZ29uLmhlcy1zby5jaDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMND3PsEwdrvXK+DGAbsalJikrnHoy6SzdmAV13SR0QA
++pEPCgngo3UVsaTEz12PIEbPkw0O9neaAt8CbZLgSmAx4sqX0WZAYho20gXDY/Rl
+cXKryuMh/KlPyoC3fsmyVPDPD5uYmLNpCLKjl39I/oo3kpXzcmsdBx8ZFyz6YIod
+e7Aplq6SJhh7s9x8HDg0aavSA7RDRGrZBy9ekqzWCsyyNTpxQWKnEPv4mfjEiyC3
+j9Mv43K9/lE+zgGOiZPx/mJ2CcbJ1sfJIT2Ui0I6dEgyuawkNEIqXWaKer+hMoyM
+xAzDCR0moEAWQ6SPcHwt6jwI2D9vNGcC17Ttr31n//ECAwEAAaOCAZkwggGVMHQG
+CCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+bG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+YWwuY29tL3F2c3NsaWNhLmNydDAeBgNVHREEFzAVghNhYWktbG9nb24uaGVzLXNv
+LmNoMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEWKGh0
+dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0PAQH/
+BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
+gBQyTaFP6vCumbbumwcshAgRUIvifjA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8v
+Y3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGljYS5jcmwwHQYDVR0OBBYEFAX7
+qvdL23DqegSmlCxsX+LERI0AMA0GCSqGSIb3DQEBBQUAA4IBAQBK7qy3M7LVDRUz
+B4szCrhGs4SG5/hh0ZvjSseJaKPwVvqx4p8TdVfuo9VANqkmID1O+lgTBSmNgxai
+xJkCMalwtZDMTKT6SSYFi6khSiYxHDa5NcE7W/SVn5bf5FViuF9P0JeMKnLt+vzF
+wGYTdkdOoOjskmuZmGJhf1VGNtxZ7yI4I4claTWS/4XxAivHx44MmITQrQLLhQZR
+Bb4WgjlWX1X5Do9/nCqSpOJ+QpPb6PRLzsBazR1nwaTVqn7IBTXESQaf3KCAaMUx
+AGxVxS6Wr+7y0NG4xKIrpn+NBa7Tl/KsLcvH8PbmiGa93EFJtbENoO0ICT+2SQQh
+JT6DgiEX
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.hes-so.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.hes-so.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">hes-so.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">HES-SO : UAS Western Switzerland</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">HES-SO - Haute École Spécialisée de Suisse occidentale</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hes-so.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.hes-so.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Equipe</md:GivenName>
+    <md:SurName>AAI HES-SO</md:SurName>
+    <md:EmailAddress>mailto:idm@hes-so.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Equipe</md:GivenName>
+    <md:SurName>AAI HES-SO</md:SurName>
+    <md:EmailAddress>mailto:idm@hes-so.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.psi.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.psi.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..fa134334
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.psi.ch-idp-shibboleth.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.psi.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-11-09T14:16:35Z">
+      <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://ait.web.psi.ch/us/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psi.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">PSI - Paul Scherrer Institut</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">PSI - Paul Scherrer Institute</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Paul Scherrer Institut</mdui:Description>
+        <mdui:Description xml:lang="en">Paul Scherrer Institute</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAXpJREFUeJzMk89KAlEUxufNeoXUNOkJpIdo2lWQzijkHzTQFs2I4ejY+D/d5KZS1zqTDrgUQTAyUPuac0OpXFTYogsfF865v2/mnHMvt7fr5jbRRvDfGTjtDs6xbfuViGEGbqeLOzk65kWfj/edelcKiCIveNdjtNNZYohlBsV8AfKlhEq5gptqFeVSCeFgCEo6jWrlPUaKhMIoaHnIkgRimEEuq9a1aw2GbuBpMsFgMACteq2G0WiE4XCIXq+HvqVEPM5yhq6DGGK56fQFkUgUerfL4Ie7e8znczRuGxiPx2i32sgoCq5SKfgFEYvFAt1OhzHErgweDQMdK0G/l5STsGrERTyBrJJBXtOsw89sn81mnw2WJZimiaQkW72QUSwUEYvG0Go2Yfb7LAe8Qs2q6yUsm0hfPbegnKry+x4PR01T0sqqgeVSGaGz4HoTP44xIPr5wwN+i2KiIFhj9H4/xq8XyeXYYbEdm/1nF+l/vIVN9AYAAP//AwDOc/AYx5TiWAAAAABJRU5ErkJggg==</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+hkAAAepSURBVHic7JiJU9NXEMf9X+pM22nrjNaxdazVVgYvDhWvenAIhkNUIICCByoQ0KqcAUREIAmXLQIJIRCFgCJXFMIhyBUiUSDhjJBwJfYraWMS8EeSKs7E7OxkNvvbfb/3eVf2ZcXbL0xWfO4OLLdYgM1dLMDmLhZgcxcLsLmLBdjcxQJs7mIBNnfRB76VdDsvL1+lUo2NjZWX8+AZHx/nzcubN2/E4ldVj59ox6fcTo2MuAZDJpOR3DxbW59LBiVVVU/Kynizs7O9QtHlS6EdHZ2Tk5MRlD/5/KeI5PEqoqNiET83Nxd9M5bJLIKTRsvMysyBR9NycXEJutHe9uLxoypu6UN4+PV8N1d3ONGHoLMX2p63S6XSR5WP8aKbN2Ko8UmIqax8XF/Px4smJ+URlGt3U9OJgJF58cKlE16nRkZGBIImD3cvOF+/7o+KikEXQQLn7eQUTbxCofDz9ZdIpLAZjKzsrJzp6enm5paY6LgIytWpqSn0Jj6OKpfLRSLRSW+fkIuXEZmWluHhfqLsYfnU1HRw0LmhoSE4w8MivTy9+/rE6pZBhZFSKpUPuA8RTAmPhBNtVj+pgTE4OEj2C0Szz5+3JVCTEJyelpGdnYNH1PgEBj2TQc9CblwslcPmEAFjgEF780YUyNlsDtkvAORoPT4+ASqVSJuamu+mpmni8SY6/d3MwI6Oju3o6IDR1tZ+3M3jpPdpNFJdXePl4Y2RGhgYtNqyLTfnHgKSk1N22+8dHJRgvFyPkWqq3zGcPuXrc9oP46VpOTwsAp3GYnF2cr1wPgTO+rp69TgiEQY8AMaShMFiFpWWcmEkJd7Kyc5VdymTkV1bU0cEPDMzgxnGa9RDfvSIc21tHZgjIq5CMRWY4diYuOnpGU3K6Ogo2TcAKXdS7hbkF2LImgTNWOc3rkehZ5UVj24n30GzL1/2HTp4FHOLlNQ7aS7ObkKhcHJyAiQTExNwngu+EOB/BitfA3wp5Aqa5ZVXnD930dPDG04MR1goBe3DwPzD09LSSo1PhJF/v4DNLoYRH5eQmJCE5QY7PY32pKp6iRlmsYrwGhgcTgnmE9sGX9FpTMvcnLK/vx87FhtVk4JJy5mfN8zYtavXxWJxf/8AVjK39AFmuKdHiHihsBfjUlzMYRcVgwTTjqdPnz6DHRsT//BBGdKxdIvZHO0lzWKx5/dwOya5sJAJZ11dPTYLBgUjWMRiv53fbhW8ShiNjQLAw8DuxUh1d3XDrqmu7e7uIQL+EsQCbLBgldJpDGwhnJPEipiMdBqOAOyRxIRbCVRDUhKw/rG9sc5hv/dTE5OSknFWLTfw+LjMYfd+kptH6BVK6JVwLaX8pzoeHP4b1m+y+n0rTqCw908XBv/rvHI5bN/eg+t/3rjX4QBsTSQOraCz5zf+srmmpnZZgXF44qfFqBQA0GmZhsdLJJJ1a9fjWFr4CEddYECQUW/XiInAJZxSZ8djRqW4k7wKC5iGx4+Njm3faiOVDi18lJFBR8Fj1Ns1YiIwt4TrdNTFqBTScU/8UBserwZWl3F6gt9zFEVGvV0j+sBKlWpmTrmksotLPzUwirPNv25ZdIYB7OvrP2tAP+dUqg8CD0/M5PIHIjnCMHYPsUaW9DmH0VycdJY0fvrPngnGmaRW2A0NjQTAKEtQogcHndekaGkIPndst/3hu9XDwyMLgRk0+iYHj0iueOmucoSAApo+8LhiFo89Ge0ns1+cyuk4Sag+f/faB6fpAXd1dSffSkm9c1etsDs7uwiAUcz9dS8PRagmRVtRqKIgX/X9mkWBM2n0dbYk3/si4n6+A8l+4ZHZDjSZYlYHOK124ERWu09uhyFKzuvdfU4feEkxYQ9v+c0aF8BFgX+yI/nniwzsMNAAqAOMkTAweTmBP3RoGQsMBaAOsOGZJgPjWstisgyPHx0Z3Wa982MBQ3WAP/UMY8fabLdNpCZ9LmD9GaaUiAxnXhS44VmD4xEXXHSPLVAXZ1d7O4dVG3Z+/e3qQweP4EK/qB4+5IgL4KcABhoAdYB7h+W+9zq8DWNeFJhVWLjyR6t9obkOIYwFSj98vcjaPfyPA4e43Ac8XsWiWlZWjnLyowMDCmi9wwodYEhjnwzHNyJO57wgVr884a4FwEVM5tptjgHMV3iqp+Q8YSBTvMb6MJtpRGlJDLzOjkTOFy3ZVeAAqqFPpsnVqbSmZ5V9I4puqZxYhUOK9HssJ91auiC/4LAjSTQy1Tsk19Fh+csRRd/o1BEnEtOYWpoAOCM947iXr3B4asmuAgdQ2rkm19K4PLhqe5iFLNwWCVLwlDX/j6yBIhuX7dhmu2jhQaMxyMt8eaiv41tt2To2Nqb+qlKpIihXyX6BBCn+5DOU8EjVguL2Q4LKdOVX3/Dr+Xp+pVJ5JjAIN2cTuv3WZGBUwih3caHf53AQF117uz02O+w6OzsJUro6u2x22CMS8Uuqw5791lbbT3n74BO29iNbm117du8Ti8Wm9fx//afV3d0jaBQIBE3NzS1yuXzJeMQgEvFNhIoAQWNTf/+7YhB3JtgCrUetLa2av69NEMufeOYuFmBzFwuwuYsF2NzFAmzuYgE2d7EAm7tYgM1dvjjgfwAAAP//AwAf4gqZGF2rkQAAAABJRU5ErkJggg==</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>195.176.0.32/28</mdui:IPHint>
+        <mdui:IPHint>2001:620:170::/48</mdui:IPHint>
+        <mdui:IPHint>129.129.0.0/16</mdui:IPHint>
+        <mdui:IPHint>192.33.118.0/23</mdui:IPHint>
+        <mdui:IPHint>192.33.120.0/21</mdui:IPHint>
+        <mdui:DomainHint>psi.ch</mdui:DomainHint>
+        <mdui:DomainHint>psilab.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.537688,8.222623</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>
+MIIDIDCCAgigAwIBAgIJALQ2EjQw+BiNMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi5wc2kuY2gwHhcNMTMxMTI2MDg1MjQ2WhcNMTYxMTI1MDg1
+MjQ2WjAbMRkwFwYDVQQDExBhYWktbG9nb24ucHNpLmNoMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA53/6MrJPHxt8oigLyUvYLR83hN2cu3GbPfjBB4VJ
+kpQisdb3jaGRiwJFjVuc1THr3Ov/cNmQ2ONQaIIvJ5d2BEmkvUj1tSnwR2CfDmGy
+0lEPxjD5Da++9P/S/sCdClR+1RwPAVH8ravfWYPEi6Jgzw5iSR5Jx3MD3cK7KHw2
+Pliko6+ibmVf56nfHRTJpPjJ9EGiSH9GBrmpPH8r+a0gUm9Mb1Mdk+Df+nMxUo9H
+IY4YoLRgFpcWXdWLM0TxzXM8bdVDoel96FvMITgNIDktb6Ml5MCm/9rrxLcVUelx
+/xtNa88PYtRmsqsQUY4ZAKwANyKNeUHZBADLHaNLepKhiwIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24ucHNpLmNohidodHRwczovL2FhaS1sb2dvbi5wc2ku
+Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNazc1/qrmmqgEVueIN62F390Kni
+MA0GCSqGSIb3DQEBBQUAA4IBAQAAZuFgMpEZjoq8pxLjbQDtfw5NTG1Wggmefv4M
+omMi3arqsiYQTUuMKwj6T5B08lPUV0kGIhCNBANLBxw+2UxFo266dWD5g703RFdn
+EeMlJ6Uro2niBUSl/FqDJ2i5t9yOP8CS6lEBvWo3CwJye5uo1YFQFP7W/rnvjhSp
+kQL8Jo3n/ZJbIImhG9pYBDJFK1D4UA0zxfOZ0Vt3rG6hnGiMDZ6S8l34axecTT1o
+aAOK+xJsXSM4wiULQuUiqaqUQkUqowD35dc8NuH1KZa4TgpLacCbKEN4d6XibSQf
+5ESwtfL8jg5PPnAfIXXSYewO0a7Unlt+BbpkQ7KCOkpPLzNB
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.psi.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.psi.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://aai-logon.psi.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.psi.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.psi.ch/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.psi.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">psi.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIJALQ2EjQw+BiNMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi5wc2kuY2gwHhcNMTMxMTI2MDg1MjQ2WhcNMTYxMTI1MDg1
+MjQ2WjAbMRkwFwYDVQQDExBhYWktbG9nb24ucHNpLmNoMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA53/6MrJPHxt8oigLyUvYLR83hN2cu3GbPfjBB4VJ
+kpQisdb3jaGRiwJFjVuc1THr3Ov/cNmQ2ONQaIIvJ5d2BEmkvUj1tSnwR2CfDmGy
+0lEPxjD5Da++9P/S/sCdClR+1RwPAVH8ravfWYPEi6Jgzw5iSR5Jx3MD3cK7KHw2
+Pliko6+ibmVf56nfHRTJpPjJ9EGiSH9GBrmpPH8r+a0gUm9Mb1Mdk+Df+nMxUo9H
+IY4YoLRgFpcWXdWLM0TxzXM8bdVDoel96FvMITgNIDktb6Ml5MCm/9rrxLcVUelx
+/xtNa88PYtRmsqsQUY4ZAKwANyKNeUHZBADLHaNLepKhiwIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24ucHNpLmNohidodHRwczovL2FhaS1sb2dvbi5wc2ku
+Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNazc1/qrmmqgEVueIN62F390Kni
+MA0GCSqGSIb3DQEBBQUAA4IBAQAAZuFgMpEZjoq8pxLjbQDtfw5NTG1Wggmefv4M
+omMi3arqsiYQTUuMKwj6T5B08lPUV0kGIhCNBANLBxw+2UxFo266dWD5g703RFdn
+EeMlJ6Uro2niBUSl/FqDJ2i5t9yOP8CS6lEBvWo3CwJye5uo1YFQFP7W/rnvjhSp
+kQL8Jo3n/ZJbIImhG9pYBDJFK1D4UA0zxfOZ0Vt3rG6hnGiMDZ6S8l34axecTT1o
+aAOK+xJsXSM4wiULQuUiqaqUQkUqowD35dc8NuH1KZa4TgpLacCbKEN4d6XibSQf
+5ESwtfL8jg5PPnAfIXXSYewO0a7Unlt+BbpkQ7KCOkpPLzNB
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.psi.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.psi.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">psi.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">PSI - Paul Scherrer Institut</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">PSI - Paul Scherrer Institute</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>PSI</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@psi.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 56 310 8400</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>AAI</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:aai-support@psi.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..4638585e
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.switch.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-11-18T12:06:24Z">
+      <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.switch.ch/aai/contact/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">switch.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">SWITCH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SWITCH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">SWITCH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">SWITCH</mdui:DisplayName>
+        <mdui:Description xml:lang="de">SWITCH erbringt innovative, einzigartige Internet-Dienstleistungen für die Schweizer Hochschulen und Internetbenutzer.</mdui:Description>
+        <mdui:Description xml:lang="en">SWITCH provides innovative, unique internet services for the Swiss universities and internet users.</mdui:Description>
+        <mdui:Description xml:lang="fr">SWITCH fournit des prestations innovantes et uniques pour les hautes écoles suisses et les utilisateurs d'Internet.</mdui:Description>
+        <mdui:Description xml:lang="it">SWITCH eroga servizi Internet innovativi e unici per le scuole universitarie svizzere e per gli utenti di Internet.</mdui:Description>
+        <mdui:Keywords xml:lang="en">Zurich</mdui:Keywords>
+        <mdui:Keywords xml:lang="de">Zürich</mdui:Keywords>
+        <mdui:Keywords xml:lang="fr">Zurich</mdui:Keywords>
+        <mdui:Keywords xml:lang="it">Zurigo</mdui:Keywords>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAgFJREFUeJxi+P//P8PHXd1nfj484w1ik4rBxNsVeR+f1Kr+/7ira/Pfr++USTbg3aqCj4/LJP8/Lpf6/6LP8ce38+tb/v/7y0W8AWtKnj8qFvn/pFrp/+NKOTB+syD+0a/HF0KJMuD324eS79eVzwd64+/jCpn/T2qABgHpp/Ua/z9sadz759NLbbwGwPDP+ydNXs+NPPK4UhbsiifVimBvPe+2+f3l1LL+f39+8eM1AIz//mH8em5N5Is+p0cgzU+BhjytAhpWIf3/zeywF7/uH08EqmPEbQAU//v2nuvnockNj1uMv96r1vh/r0bz/70K5f/367T/P1pVc/zr2+cmeA348+8/49KtZ8Nt/ItvGzklvzd2SX2vZ5/0Xtc24X1xWevVp48e+uI04PCZW0YeKb2HWLWT/7PopIExg2rif1WP6p/z1x/v/P7rLy9WL9x59EoivW7hXF6jzL/Mmkn/ufTT/jMBaRHz3P9VfWt2vH73WR1rIL7/+JW9a862Mhn7oo+MGolgjSDb2XVT/gflTLl3/trDALzRmN+69DKDcux/Dt3U/xx6qf9BhhgF1H9bu+tM3b9//zkJJqSEyjkfGdUT/jMBNUpYF/xvnbF57ftP3+SJTsoJFXM+MgM1x5TOunbj3nNXkjNTet2Cx/PWHCoGsllJ0QzCAAAAAP//AwC4nrtuPmwfNwAAAABJRU5ErkJggg==</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+hkAAAiDSURBVHic7Fh7bFPXGT9x4vgR29fva1/HsRM78StODE0CCTQoJiEPh7wgNoFAgkt4jpF2/aNTira0/2za2qGC1IcoUwlTaaF0XRJRaLRB2QCxTtAHrxUWNfQBnWAPprFNNN5377UTO7GzKop2dKQc6ed7z3dev/O73znnO0aRSATNY/bAToB0YCdAOrATIB3YCZAO7ARIB3YCpAM7AdKBnQDpwE6AdGAnQDqwEyAd2AmQDuwESAd2AqQDOwHSgZ0A6cBOgHRgJ0A6sBMgHdgJkA7sBEgHdgKkg/9hk1jlkJvKX1LmN/9B62y/oXe03YTnNWV+06CMWbQBxSWpqWKv0tZwRiBjsnlLWqwoU5pTdUJhrdmPxBRnyFYj40AbdbqvSvyDWKUMAf/sKBbuOhpSXgiXiCr4AimSWfw/zzJXvslmTSZaMDh0HF4azirtjROgbIHJdwBC/rNjtz5ndj/9dDxNeZZh4ePKvLphtXP1ZXY+eseqm1oAZVkO3E01PPX0iQbpipx0hS0wLNF5f4pSJ4HcunwPlVf7m0kBhTKruqDlnrE4/GfaFTqhdwWPAF7Xu0Lv0O6Oy0zxY+OqvLonYj1IDAvLmaLwA2Ve/YF49TjWpvLHmeJND7OYRT42v69B8coXu4x3t5aJLJO1uCbG013qu3/aYXzfbxcIefkppHevOatxrPqIE5DRCYaG30Uor31E7w6NAJ8R2rP2gql4U4T2rPuQzbNAqGnk1q0vmN27owJKNLS2oPUq44N67rW/h7kMAQ7zcwoeNRZt/BjGuYfkZiaeu1DtRFA2qjRV/HIGAdNBo2Gjp/OrCQFlzOKfMb6e/8jMj1qTNBCq7I1XjEXhy0jtEMeMKlvgFaZoYwQK3TFRokqmaR2rryBn50ethXTZ2E46sr9JsYMtEAnSkCj6wXcszuy/08tE9tYrOE8QcSMpkM4VOqspaOUEzMqSokCgkX0DcRVcO5G+uIzxdkUyjaXNvOi8vaurC5WUlHDvytyalxjf5og8p7I6Vh6fJMYSZIL5yC3+XfH2DHUBCNg9Sn0LAWlXx+0JAZW5K44bvN03EJWbtIVYW/gdjX3lC0J1wQQbgdrhhsH+qbY1Hp6omMavTQFlLUL5XQ/fWOO/fX0b+sRKIyk3chovNOSs58Pav13ZQg/bDSgjap0m4MTE4ievL65kvN0RsaFkVcwmEsbVhQ8E7c/pXMFLKSUQyhHt7RrS2JsGEsaJCvhtPBBWZpyAeXUjBu/GsXSlfVrtNEFGooHL875G5a7YB0t5XKwrijYEe1pUD0PtW4fXBR7+uBpxHpYJE4t5X79feuDuE8w3/VXSIjYvjg2RQsD4lEzAqUnnaLuoLWg5g6ZsL/FJZCqvFuuLl8TbZi0g7FsvmxZsHqdya5bM0BClTWy4UV4yo9ZQuOEvQPjZaZWz9Ez9I4+8qpfxWUFsKkrEXOrR37/YQx9L6ItNcyUgtIc98H2UVMApJsGk+3ICemEJM2VHUvXNdkC7gr9KEBA23VwgPQLqfw0F52nXml9DpZOwmb+htjfuhz2lP1NdYOKbpyf0BifuNtisx7KMJcqEcqnZ2bV00YFCOkouyvvFgOL5r3tNo99bIub6E8Z3N2ceCAI6UgmYOvECdo3CATWmcQUHNa7Q8WlwBgdBp6/AC28nhjHpEiShfWaFeVm50lpdq7LVh9S2+i2a/OaXjd4N9+D0+xgpLFmTw0W5STQIBvxA71n7KhIpJwvpunNHOxvG99ShcMzoyUaqT7cb7ox0atsS+oil/4MHCoXCafVjtpiAEOqchgijHUK1oNJWPwUN7aDHB+BkUwSMS6KpeXphH1McjsjNSxckFES9TcaUP2ny9UQU5kreSylrLcrvHn9nfe39G9vRlzoN4hbyay1U/+1dzM2e0kyOcSwenJzJHAroaP1tqnKfz4dWrgxwKC0tnbDHLeFjqdoifgkPJSzhgYFD5oFDvzAfPHgQ+f3++Lr8Q25uNng6I5S12p+0ywypSe/uGKcL178JMaUATuzryNl9fWeFfcWdXt03L9TLnlqahyy3djJ/PRZU7U5JbY4E1DraLgHOpyrv7e1FQ8PvoWFAX1/f5DRme4g8tuX7Fzdtf3Y0HN6MnI786U0UlqCxcH2EsvgfnVYW9UIIrl+EgDuidrQ+B8HouCK3toMtPbFOc+raNvqzobXKPWM7jeONbuThWEz1PjbNkYBsGAOB8rVkZTKZNPq2fC9CNSPsm1zOn3SzFhChiiOoIPxvhEosyVrIc5a9DuI8kBrLbDN0bNA5V0eyF2yJGLwbbsC1iDM2eTJ8n3/XOH7/SVPkYKtieIb2cyYgRBN72S0ly1Q+/YNDytC62b3uJNy+EpZqhmqWgTQs0WVaV/ABeM5nsHfs09oCz+hsDc9o7YGfgCin4MbxUFPQ8hoSqZKfatEAWqwv2gM3FnapRyfHeafg7ZD65NWt9D9Kc5CLs6Y6G0Uq7iqnjV7lkiWJ3ldp8m6MiI1lKQVEYo0BlvB1mM/fIcQ6pLU1/JCbj62hHw6X50G839GFnf8S633L45sJNS4Ece2oMvt/COgODRs8675MPEQk6jJ59tIBuKKdUzlWf6JyBq+oHKsuQf6EPHvJU0iskvBipSftNY0XUSGzNZ5KV/COHFumWxcLyw6FpIOcbQZm7A2B/TNBlrMsZRwmVNoWULl1Z2CytcmJREcQynQwn32qgpYLKteaPwI+VTnbr6rymz+kLFXvIsrCRQLxF4UMyiqg8uqHJFrPj2ZgKZDnVD1H5dW+N/931lz9nTWPeQHnBSQV2AmQDuwESAd2AqQDOwHSgZ0A6cBOgHRgJ0A6sBMgHdgJkA7sBEgHdgKkAzsB0oGdAOnAToB0YCdAOrATIB3YCZAO7ARIB3YCpOO/AAAA//8DAB7/hgVtBuDqAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.switch.ch/about/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">http://www.switch.ch/de/about/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fr">http://www.switch.ch/fr/about/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.switch.ch/it/about/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>130.59.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:620::/48</mdui:IPHint>
+        <mdui:DomainHint>switch.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.37333,8.53111</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>
+MIIDLDCCAhSgAwIBAgIJAIHilzMu/j8KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2FhaS1sb2dvbi5zd2l0Y2guY2gwHhcNMTMxMjAyMTUxNzI5WhcNMTYxMjAx
+MTUxNzI5WjAeMRwwGgYDVQQDExNhYWktbG9nb24uc3dpdGNoLmNoMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA72Gf8Be0k33Ucdk6+m/wpe70eZdL8n9Q
+Dk4AuJ7uLFqo9vfJFRpEDbfGAt2s9esAfxX0harLVhEP7bX4HQxDt7uM9PeDXZ3M
+GGiKL4hCNR4RKY1pfx7PoLDHthiO5vVgQzlBAis3R24kL1omDGcHaxuazC5esJ5W
+cW3utZiVvmuLyysAuRupkMsLe2Cy4nEYA3IKVjqJskTACOyBhrv1TjJyVHgUPfqk
+acqMwIHL9fVmLpJwvNHd43btsx4RWtyTMeHxN4N09LnhUP7xlJZeFTgCW02Aqz8J
+HMzqwDJLBmSo7S3tQDUcoID8wXjjC0FH2WcrAi+A6mIaSwweXPXI1wIDAQABo20w
+azBKBgNVHREEQzBBghNhYWktbG9nb24uc3dpdGNoLmNohipodHRwczovL2FhaS1s
+b2dvbi5zd2l0Y2guY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKCIdiqWvBra
+kKosFDkwV2lqXHPPMA0GCSqGSIb3DQEBBQUAA4IBAQCebaL+8PbVVbIpGsr+ZwvG
+06XdJYWW6adQiOy110041UBodrjqi40rsqfJjhysrNxW9eCyVhJ8tq7Q/QUI6KHJ
+iOOciw+p2c2KNI1nq54Nebjkal+hTbUvS8N7HTMvhYdu7gqqDgnvgP7s3iFAXI5b
+qyPh4TWKXlb45GinyZ3T8OjB6UsHAmhn1hRFuwOa27csxu1qPvFhTgEgbXieo2Nr
+vmIdMu967nRbVMztmAfd7Vv0eMj+YoKuA/RUWqJI6lMjHVpkl2ggE/Kb8mXX/wX1
+pSfkm5o6j1ysHdGdoojvd+BikyPR7hGEs1lukWxump98WxdIHzmo5ErBr770nWRR
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.switch.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.switch.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://aai-logon.switch.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.switch.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.switch.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">switch.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFVDCCBDygAwIBAgIULqFVZ3v/ZWU2QoNe1Y/XyQSqGeAwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTEzMTIwOTEyMTgw
+N1oXDTE1MTIwOTEyMTcyNFowgcgxEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsr
+BgEEAYI3PAIBAhMEQmVybjEdMBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24x
+GzAZBgNVBAUTEkNILTAzNS43LjAwMS4yNzgtOTELMAkGA1UEBhMCQ0gxEDAOBgNV
+BAgTB1p1ZXJpY2gxEDAOBgNVBAcTB1p1ZXJpY2gxDzANBgNVBAoTBlNXSVRDSDEc
+MBoGA1UEAxMTYWFpLWxvZ29uLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKplsvC4tYqZuV9IOjCWn6r5gMxMnmJ2EVZkMU8SSW4To8aB
+/dhPc8MUkHQ3bQoew4iolSzBdQ8dCeALCHQLmHD5rqXsRvsTjtkPS7SjaEM4viLF
+dz8oC8Y3x9RA5ruZf5KKPh6f2Dd/1s0IKpf7lPJx6px4ho2QwnOmwIAe3+QWrhK5
+136hmtyObl+rDDkzCwBnir6BXYEPHMSXqR9u9McfCXHjw3qow/qSv2+Ae4lVHh2K
+fiNbFTMa2t5zF53NyQNbK33ckrAJ1R1QcysBT3lyPK4wy3IACZkR2S6Af/GLGE5y
+DWCiwZqKRI+TUcGGHNj7+GEFCfdfHgY8og8Rl/MCAwEAAaOCAa4wggGqMHMGCCsG
+AQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9i
+YWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwu
+Y29tL3F2c3NsZzIuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYI
+KwYBBQUHAgEWKGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRv
+cnkwOAYDVR0RBDEwL4ITYWFpLWxvZ29uLnN3aXRjaC5jaIIYeDUwOS5hYWktbG9n
+b24uc3dpdGNoLmNoMAsGA1UdDwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsXpzD78N45JbG9jLm4UScwOgYDVR0f
+BDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xn
+Mi5jcmwwHQYDVR0OBBYEFO5qHZPNwV4RRgjWgE/kQYdVOMgYMA0GCSqGSIb3DQEB
+CwUAA4IBAQAwEck5/yI4crrtFbfMDQzqBCXVQqLQPLZQuy6LcltubJgMY2gixwUk
+g11zTpP8ydZWUzZJ4TdmJwQSxWOiHrmrkpXjPMJ/NKCS7VUjsR9qSLDeJzEs61E0
+Pk8ssP/Caza7B5kUoY52NAfgCLyqGNNqDSCM02JD/sUIF4T5+OiVaDDzKPdBkOHE
+Rei3SQPXcLygCnwaXVWkmQLoqXESIXqmOwbWoACmBolMHKPGzp/4rvp3ejPUwYru
+FIwRkLdxvdKOzE/feFbX4GkXgvg6GmELxSZbakbuQoNeS/aTLYR2Y/GuE4UrA533
+Sih8+vYwOym3ZyV+cdIM1uoInD5lJmgl
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIJAIHilzMu/j8KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2FhaS1sb2dvbi5zd2l0Y2guY2gwHhcNMTMxMjAyMTUxNzI5WhcNMTYxMjAx
+MTUxNzI5WjAeMRwwGgYDVQQDExNhYWktbG9nb24uc3dpdGNoLmNoMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA72Gf8Be0k33Ucdk6+m/wpe70eZdL8n9Q
+Dk4AuJ7uLFqo9vfJFRpEDbfGAt2s9esAfxX0harLVhEP7bX4HQxDt7uM9PeDXZ3M
+GGiKL4hCNR4RKY1pfx7PoLDHthiO5vVgQzlBAis3R24kL1omDGcHaxuazC5esJ5W
+cW3utZiVvmuLyysAuRupkMsLe2Cy4nEYA3IKVjqJskTACOyBhrv1TjJyVHgUPfqk
+acqMwIHL9fVmLpJwvNHd43btsx4RWtyTMeHxN4N09LnhUP7xlJZeFTgCW02Aqz8J
+HMzqwDJLBmSo7S3tQDUcoID8wXjjC0FH2WcrAi+A6mIaSwweXPXI1wIDAQABo20w
+azBKBgNVHREEQzBBghNhYWktbG9nb24uc3dpdGNoLmNohipodHRwczovL2FhaS1s
+b2dvbi5zd2l0Y2guY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKCIdiqWvBra
+kKosFDkwV2lqXHPPMA0GCSqGSIb3DQEBBQUAA4IBAQCebaL+8PbVVbIpGsr+ZwvG
+06XdJYWW6adQiOy110041UBodrjqi40rsqfJjhysrNxW9eCyVhJ8tq7Q/QUI6KHJ
+iOOciw+p2c2KNI1nq54Nebjkal+hTbUvS8N7HTMvhYdu7gqqDgnvgP7s3iFAXI5b
+qyPh4TWKXlb45GinyZ3T8OjB6UsHAmhn1hRFuwOa27csxu1qPvFhTgEgbXieo2Nr
+vmIdMu967nRbVMztmAfd7Vv0eMj+YoKuA/RUWqJI6lMjHVpkl2ggE/Kb8mXX/wX1
+pSfkm5o6j1ysHdGdoojvd+BikyPR7hGEs1lukWxump98WxdIHzmo5ErBr770nWRR
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.switch.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.switch.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">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>SWITCHaai</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 44 268 1505</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SWITCHaai</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 44 268 1505</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.uni.li-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.uni.li-idp-shibboleth.xml
new file mode 100644
index 00000000..c05b6d89
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.uni.li-idp-shibboleth.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.uni.li/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-01-09T10:10:39Z">
+      <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 urn:oasis:names: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.li</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Liechtenstein</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Liechtenstein</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Universität Liechtenstein</mdui:Description>
+        <mdui:Description xml:lang="en">University of Liechtenstein</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAACRJREFUeJxiYBgFlINdalL/icG41I4aQKIBo4BGAAAAAP//AwAhn6eucY32zQAAAABJRU5ErkJggg==</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+hkAAAPLSURBVHic7JjbS1RRFMZXzjjOkDRqOmlY3siI0qDLg1Gm0cUoTI3RsgyjHiywi11U0lA00zK7QC/1UIEvDURvvfUQBZHUS9Hfc1qLvY5nexzRYpjVgtnw42zPXvucb39n7YsDjuNAhn9HXIB2xAVoR1yAdsQFaEdcgHbEBWhHXIB2xAVoR1yAdsQFaEdcgHbEBWhHXIB2xAVoR1yAdsQFaEdcgHbEBWhHXIB2xAVoR1yAdsQFaEdcgHa8SqbsRfYh4ZUELzKwOT+cSBWtBeFESShr/mV1uaFES8HSsVXhYJ2lbcSqX0VKkFlrkAeRC8gmpIvv08tuI/eYk0gcmUamkKDVHkF6kRPIG+Ql0oSs5zqVG8gHZAKpWpGB32uKnFTxa3vMaYyG5l/2vDzP+VkbSxr7G2PPFEbilrZpqz6EVCIzPMgG5Cgbu5oHCHxvNxvklvNIEXIZ2Yjcstru8LUZqec6tXfyh6Eymcy4JQ38vLXQSRVzaEz9Gs/Ax2VR59u2oqSxZGLH2mUN7GCzDvgMvMjm3OX4GTaH4rqRR5bJZNQYmGz0G7gKTIaGLKPVGjjKAwE2xjWQMuMFmEx0DcxF+pDrHD9hPYcysNj3PFrjWpMYeAh5iIyDmdYBzQbSWkSZQ9OxESlFDnMbZccOMFMtYpkW43o/MoycYnNoCm9BjrNpFBsFk7nAz9+FXLLeXwtmqejTaqCKknYD59DAL9jm58diA89Z9bNg1ieaojfBZAxN3SGmyYrPRtrBZBftppStm5FnXK8BL9MakA1ID5iMreMY6ncFaQGzJtL714HZ+fcjp7l/W1oNnEEDv6KBn7DND8W2LzRwxKrT4OiIMuBrz7P+djeQbPA2AHctzAezC1Ohqf8aKQMzxWlqT8HC4vbr4+cBx3dxH9rgaAm4llYDi7MD8cqcYLwiJ7AIPAPGo4Gs0mUMfAomA2m9GvcN+hW3DYC3bt3nKxn9no3dAyaTxtiMauQYmE0m19ePNqlBpM0ysJM/wkDaDfzLkszAQeveA1/8MF+D4GWga4SdgTvBTF3ahSnTqvl+HniZ5/ajD+EOwDaQTgS0DIz/zwZSNtGO2c2GkIGTfI8yho4zT3iQtNP2cz96YS/Xx/hK0+0t9z0C3qH5HVIOZh2lDGzk+6N87eE29xBOayv9d1MBZk3+mPkxIdU/JmTIGJgxUCPiArQjLkA74gK0Iy5AO+ICtCMuQDviArQjLkA74gK0Iy5AO+ICtCMuQDviArQjLkA74gK0Iy5AO+ICtCMuQDviArQjLkA7fwAAAP//AwCc7vsetROpDQAAAABJRU5ErkJggg==</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>195.176.84.0/23</mdui:IPHint>
+        <mdui:IPHint>193.5.26.0/23</mdui:IPHint>
+        <mdui:IPHint>193.5.26.0/24</mdui:IPHint>
+        <mdui:IPHint>193.5.27.0/24</mdui:IPHint>
+        <mdui:IPHint>193.222.112.0/20</mdui:IPHint>
+        <mdui:IPHint>193.222.112.0/21</mdui:IPHint>
+        <mdui:IPHint>193.222.120.0/22</mdui:IPHint>
+        <mdui:IPHint>193.222.124.0/23</mdui:IPHint>
+        <mdui:IPHint>195.176.80.0/22</mdui:IPHint>
+        <mdui:IPHint>193.222.126.0/24</mdui:IPHint>
+        <mdui:IPHint>193.222.127.0/24</mdui:IPHint>
+        <mdui:DomainHint>uni.li</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.149655,9.516456</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>
+MIIDIDCCAgigAwIBAgIJALPA8rj6XmsNMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTQwMTA5MDY0MTUwWhcNMTcwMTA4MDY0
+MTUwWjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA18QaCQt2hS2ln2UCEUZfRP4hnA6hx9VBY1qM0coX
+VawizlgqcaejKFZ3EEi+YlbrI8oqT/XxHfrN97TMMfzbfjpe4yfTO+4qO4kzLquv
+rUBc9Lz9zFn7hwFU6FkOL/ZHfRbztDakuehMi+5l63z8dIkAgS/HC1TsYX1QTnzF
+oZfESlJauTysw/ScDNCF9gnN0NNh1wzsWzguHue14kuwbNVpEcSuV7f6y115d+aC
+ENcifEX4jXQ02QpRb0aRebPEW1waVrUW1oTOhAzQ8aoQw8oO8zNGYAA36FN98Alt
+kib/Fc8e7geFgIdMwmd7sDMlwJr6hOzdJkDJTAZZaFJGXQIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24udW5pLmxphidodHRwczovL2FhaS1sb2dvbi51bmku
+bGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFL0xAMbCNYPb2WYBXyVIKNyIzPd4
+MA0GCSqGSIb3DQEBBQUAA4IBAQAAyrTtR1axJmDFepwN9piRyxwe25UjL7OlSKoN
+qpMUDlkEbdmQUg6UODYXC1mQ/QfuPnTDikj2zhr5ylfFSDYPj2kHUyOTN2koTT++
+g0s3ZNe5ly/e+JH1jPMAWLujlpkwflM/lBhgIA0sQXwJEDxigxuqm34Hd8jZv7h8
+a5Sf5EDutKrGtwIfDKSvBynp/cibY7H5Dse/EE4ktFWvMlMDaXPVOWqpzLTb3bIa
+NMeonKCuSuheHvNi2LPf6EyZLALj0VtSW5pxqlhOtcHSlaojESKTL1IrUy5pUmnr
+/LVDLvHUtsJPKNVR2iL2CUFeYjUoh4s2cZPgdMs8Q+XDvVL/
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.uni.li:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.uni.li:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md: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://aai-logon.uni.li/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.uni.li/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.uni.li/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.uni.li/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">uni.li</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIJALPA8rj6XmsNMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTQwMTA5MDY0MTUwWhcNMTcwMTA4MDY0
+MTUwWjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA18QaCQt2hS2ln2UCEUZfRP4hnA6hx9VBY1qM0coX
+VawizlgqcaejKFZ3EEi+YlbrI8oqT/XxHfrN97TMMfzbfjpe4yfTO+4qO4kzLquv
+rUBc9Lz9zFn7hwFU6FkOL/ZHfRbztDakuehMi+5l63z8dIkAgS/HC1TsYX1QTnzF
+oZfESlJauTysw/ScDNCF9gnN0NNh1wzsWzguHue14kuwbNVpEcSuV7f6y115d+aC
+ENcifEX4jXQ02QpRb0aRebPEW1waVrUW1oTOhAzQ8aoQw8oO8zNGYAA36FN98Alt
+kib/Fc8e7geFgIdMwmd7sDMlwJr6hOzdJkDJTAZZaFJGXQIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24udW5pLmxphidodHRwczovL2FhaS1sb2dvbi51bmku
+bGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFL0xAMbCNYPb2WYBXyVIKNyIzPd4
+MA0GCSqGSIb3DQEBBQUAA4IBAQAAyrTtR1axJmDFepwN9piRyxwe25UjL7OlSKoN
+qpMUDlkEbdmQUg6UODYXC1mQ/QfuPnTDikj2zhr5ylfFSDYPj2kHUyOTN2koTT++
+g0s3ZNe5ly/e+JH1jPMAWLujlpkwflM/lBhgIA0sQXwJEDxigxuqm34Hd8jZv7h8
+a5Sf5EDutKrGtwIfDKSvBynp/cibY7H5Dse/EE4ktFWvMlMDaXPVOWqpzLTb3bIa
+NMeonKCuSuheHvNi2LPf6EyZLALj0VtSW5pxqlhOtcHSlaojESKTL1IrUy5pUmnr
+/LVDLvHUtsJPKNVR2iL2CUFeYjUoh4s2cZPgdMs8Q+XDvVL/
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.uni.li:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.uni.li: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">uni.li</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Liechtenstein</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Liechtenstein</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni.li/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni.li/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>AAI</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:aai@uni.li</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>AAI</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:aai@uni.li</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..b90b827c
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.wsl.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-15T06:47:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML: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://helpdesk.wsl.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">wsl.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">WSL - Eidg. Forschungsanstalt für Wald, Schnee und Landschaft</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WSL - Swiss Federal Institute for Forest, Snow and Landscape Research</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Eidgenössische Forschungsanstalt für Wald, Schnee und Landschaft</mdui:Description>
+        <mdui:Description xml:lang="en">Swiss Federal Institute for Forest, Snow and Landscape Research</mdui:Description>
+        <mdui:Keywords xml:lang="en">forest+snow+landscape</mdui:Keywords>
+        <mdui:Keywords xml:lang="de">wald+schnee+landschaft</mdui:Keywords>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAlwSFlzAAC4gQAAuIEBxcbWvAAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAolJREFUeJxsk91Lk2EUwE8QQQTRTTfeFHgjEWlEdNNfULeyu4z20dyHbtOWOt3XO7fpNPuYZCbejUhNJWLW1JQsE+tiBGldJahD+gJRc+6hOJ3nPEPa2sV53+e8zzm/8/kCIkKxxOYXtir7HuKBgIbg1fDk7XvofJESP3azWrFtgeJIvRRguI5gNCM0tSIE2hE0Eo8PodbO56r+QSwJqOgfUMaNzeQYpnNU6UEJIT0YQQiF89/CWACoHh0X8uJgNIbHunoQ6huVoS+kHLV8JgHlDBY76p6MCQZ83dnRZMrFtUXmXot9R85GZkHAtgBCcxtCixd/CQFQPTzKpJnV1Vkw2ZgOHi/G371P/9zLwtm+fGk3W7A8fh8PRzoRWr3UExtOr6zMwuZuDl6trSW5cUQFb1A1zVDL+ptMJjm0tJwGWz1BPDi3tp4EpxvBZMX2+bdCNUJGbvVT5ym1OifTWfeQ6E2oGx4T27kc23789j0BljqUUj85JWBxfSMBJorm9uDxW3e4F4PpD5/BRiAzGYaofruLS7j8aIjqpyx9tB9X9Ph46VMaJr9QHWYrSkhsYXHr30ZW9D5QEJmZdHK5VSNdNwjq4GCwuZcDTpkg+mdJUTyN4WWq3+FWIDPZ1RgQrplwY3s3vr8HPFujBcspYqnVlrKYySSaUlOieXqmIAg/7M9TAvQ0hToXAy50xjD35zfoBgYwS7PWJxJ4LhzG89Eo31+K9xZuIh/8ND69WqiL3d38Pko/kwRU9txFaHDzN6mf6ej4H8CKlTpfY8SGkRE8okV4XeXWhSYmcvK+LBxRGXZ1lQZIuTr+lGusyhuV0RbK9wm/H0/FVGaHvD48HQzy+S8AAAD//wMAwcp34AlJRawAAAAASUVORK5CYII=</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+hkAAA+FSURBVHic5Fx5UFXXGf9AxIiKgsQF9w1kUwQUERQREBFkk8ciS9j3fRcBFVGzTtqk0ySTaSdpp2nTdPqHxkwTp7E2yUyadFKTdCadOJqamqY1TbOYuMvrd855595zz733gSYXcXqcO4977r1n+d3f932/s1zBbrfDaI7/tzRqXO4YgC4uRrkeeITB/IU54LeyHkJCd8OaiAEIDu2B5f61MHdeOl4PwWPSKMu77TROAcROTpggZsyDJctKYXPCM2Ar+BAq6m5CY4cd2nvt0Nlvh+69dujZx37JedtuOzS026Gs5hpk5f4FomOfQFBzsZzpSona8m87jS8ACTvc3PjZdJi3oAqSUk9CRf0wdPTZYc8BO/QfZEffEJ4PsTz5INfIwe/tHWSgllRdgbjEF2GaZx6WP5HWotZ3W2n8AKh2xB38A9oht/AL2mkOBAeHgEEPDtigNl+574D2PrGc5i47pNvOwLz5xVgfo+KE2wPyzgPo6sr/coG5vsVooueoGSosE8EZVEHrHTQBcFDKE0Ef1ILZii9oR9YprHsTe4kTb9lH3lkAVdYtg7itx6GlW2WJCIjmV2KbeE1+RncILBZNva51GNZF/QLbMZu25hb8450DcKI7+50yNQMKSr+hnSKdkU3xVo5es2smZfI88tJIEMqwnQcWvRkbxy2A7g7wVvg3Q23LDT3rREAsYKAIqmzaJdVfgpd3JnvJI4M49gAy8Nxg1ZonjU3WGcuMrhv5xVEyUCxPZGNN8zAsWNQ9GhDHFkButqvDnqIRlksM2dftMWKeEQNNGGfKQJPyxfsZEy9BfdsNFOoVtL1OzHnsAOQBwy+gTWGebEIyS3oP6IFTJIrEHB2ARlHYxAeK/pMFlYvQ1PkY/l4Cz+lptN0mgWVsAORSZYaXDRt105R5MkMMDwP27JHAk/OMJI4zBpKjqOIzBHE/jmYuY8tjaPsNJM5YmrA/FJZd1vk8I9+nYdqglklGQUSn9ZwwsFeuR2a38Lsz/y1o6enA4eBH2P4pRv7QegCZ/3CFhOQ/6kYT9FwYcolH35Bdf7+FQUR+gaT+Thw+Jqc9joL7CdSJPzAyZWsB5JRfuLiaqn6u81QR+19o7/05VDU0ohZMw1FIHOQWJUNxRRnKm0dx/PsnvFcvc8bqIPVWN9khJSMHI/Mb2JONY8tANr70gPzifyl+j00CXECAGiAxeTJGOnOjX7IcID5pLpTW7IOugQtOJY9hkBilkDZjIZc1O7LOwq6SAEjb+Q7plTgBYR2AnH3Bq0nnHazDxnT0vYBm4WOOmkkKCJ4EuYVl+PwZQyBHC6Am8joBUDTljj12lF61KLIrYNGS4rFhIPMVs9A0v3X4tavQ2FEDIaHqPVqnPAsCQ7ZDVEwFbNpSC+ujd+H5Bpg6dZoGyBX+7siGShx6/UNv2mZgGAAoTlSMBCKpx1ZwHjbG3YPm/DChB/eF1prwshUddB5v4NAwCtN89IUs312YKA4IToWcwpMI7k06ISp2tHuATD1dh/sqX4EtSffBvbM9lOfCIz2huvEZZULA0KxNTHj3fqL1jlD/OipTdrBw8dJKNOcQ8J0fay0Due4jU0UDh+3Q1NUHS5axvEn38LoXwc68Y9DVr4+64iHO47X0fA7Z+YdhmZ+vAmRKRiK+pL9p2ChqO83fQpnVjZ/ii2nGv69pQRw0OBy+MCXjfbQKgLXrU603YYBADBRkmv1pWBPhogFv4eIsqGq8aBhdjRggml0/9aPXEMgnYY4vm35aGTQZKuofwes3NGyUdaBswlm5J6Cyvk4JcHKd4jN9dIxMOhgOoeF+4FhvsQ7AwJB2BO8DfGtsADzJYbaLlyZBQ/t100BgqNVkAe0AsqXnC0hKrSKcd7BxPXT2n9WWbRC1eXAg0mpNRBSa56u0TCMBL7aFBMOVQbvByxvA09PHWgBTMo7gG9uu8YleM8ORlV8ZD+VGAtAASO7/Khtew+AU4HhxM1BXEt84rGOjkYuIjO5BVxNB7xf9pZF4J+UlbDvicFMu1gK4q+S3EBsvwrcYBfJnWl/lJPqNdIhDO1JmV/8V1GkHsJ7JtLbUzBg09VNOtSMBZHNiH47RAQX9UdNFKm00/rvYKWsAnOG1GDJzcmHKVLWmrSkv6n2ME41mZMKa+TvZRzrYWNX4HgStWk7r9A+YiIFiP0bdq5qFKQoe9aXDKIsi6L2lNSUq2CZmT66XVN1QXIZlAC5eugkiN6iSw3d+PLT2aIdysn/STBYc0HdEvq4BUGJjZ/9XyMAWIBO3JK3bMB87fj8C9ikDhMqSiyiNapQ22gpinAPoKLuijnRyhrUA+syahZpNZV9mzhtav+fELJ0ycCSzlnxjRf3bEBQSorRj2QpXFMMrIDZhHf7NBDpfXigozdKy1KBeCmA96aS3dQDKc2bTpq1BHSiwz0xv3YoJm+TJQYmxEX1jdh+BCuTEZ5o9pwM0d7+gatFBPYDchMtq7WJZ1gURnqJjf2gKjOgDZa3ndF1YBtjEZ4m+sb79AzTZTNF/KSmvOEONwiMEkfz7LoiPWgcgZ6Jt1znVfEWfJssF6puu4xDrV5BT0AP5xQ+i5HkTx7zD33k6i78Y8tvQ/hGK8Acw+qZD3NatUFJ9CPOvjFg+LyM57fjYAMjSLOozZADNlhR3leTo2BERGYKR9Dgdv35fQCq+bohF4z1Cu8wWpMg9ZO14ddi+sQRwLd0lJUdfGQRyvaH9OeUpMtPhKlla5IZkFObvK5uKZLPWnJtEejM/a2b+4jME6LoW0sGwsQPQe2YSDrcc5mPm9B3OPjNnM31G3i1FgFTBdMeAMICi+bJOkJsBKNclA2ekMeWFKc7c7eknlTaNCYAzfbbp9Z+k33jjErcv0pmvmMS1iJBQf6huOqULMjJIXC+aySdZ5+me4+wbslMl4eUdLTfLahOOHtGEOYBJqUucAkgSCUzqJOxkSLc9ggN8g60houmKADthoDMTJkfCtudprZKFWA3gIhzY2zXTRRoAOQMPEvMIGhFAnkQ2hoaHom98SxMMem8FQDMGOp4hbS+u+BT4zi0pWQ2gK8qRr/UASm+YXM+w6czDadKycSI+/xCycQTJIwIl+UzZX3Lw6tuGcWS1jfVGLyGtA9DNjQnBhG0v6dZ4ZanABGrWLQHIk7izNCR0LZTXva7RfWaSxBBAqU1NXTdghX8Z64/x/hjrAJwyZQbM8Z2IY85yuuNUNlvRSZPGlte23RaAJGnZ6AJxiQU48jitjImNpIrObCWLqG+7DH4BNlriRP0o0HoASQoNXw1ks3h57RXdtLk4lKM6sOPHtw0gT66aXQMTMDDVIBD/Vl6SvO4iA0rbiIK9sOyfMGt2zEjgWQ9gYHAKrI92hdj4X+sbLQBIzjv7TiJbvzOGDDoNkB4Qs7kQisqPoSa9Skc04nib+0xiJeW1FyBq4wA+w2ZqRrFL1eogMhtSM6tguX+UTs7IAPYOfg3Rsd/tmwM5yVvSfO6dBhHrE5GZ7ZCV+xiOiX+CwedHaPId4LeSbDRXETMIGEbJOgD5ZMLaqAPYyEUQn/SaqWPn5rMzb7Xm2e8rkfJGW6bL6IDjyVoGMgZ4Q17xs7A5IR6qGgVNKDCQjzWrm5p0HZcTZ5XcUS5wnT1jli9fv4UXaC2AvCErA6sRvBY0lSfp7gNNRBZY2Nn/OzQlbRlkOZRsQFqwCOjij9xBslWEL9q7CJ+IzfEFuhNi9hz13qBVgC/SCyKjJ9NJVJL4jPTMe1kdc+eNGjzrASSJ7w9MyXgTKupiYWf+GdMxbN/QFUhOYw5c9EFlNUehe+AkasViDYCBITMx/3MoqXpYU+fS5S7Q1PkivpCTEL8tn+Zl5wfhyzvliMbXobnrKF5TRz/p2X60jqqGk2A06XrHAFRTOJRWfwzFleUodq/r1ki41KhsqFSe4EBl5/8G9h62Q2vPcfCeqZaYnGaDgUN2aOs9Db7z1fwtSatpWWRvzZJlobBlqzeCdp5Og9W2XEOQPqcvMbfoXaBfNgJZVAqDvffb6UeM4w5AzqbZc2wYjU+jpLifNtRokqF77/tollonFB5ZSOVH7+BViIpRd2uVVv9UkSGbtqi2X1jWQwGvrD9Nz8tq2HlN8yd45ktBi9lciSYbrDyTvSuM7uMhamHcAUgS11RBq/Yjk97Bzj9LP1eVJxgIIDkFG+i96jDNh+7eIh20FeygOXPmArTu/pgGHzYUZAFosgfgEOz3lJnb05lpVzY8Tc8bOv4M8xZI7XK7SwAkial6V2TUL7Hz70HPvks6AAkr23Y/A74OZ87Zm1f8KmVRXevj9Dx6kz99pqnrP/S3seMYzY+I9MByLtN9LH4B7CPCzJxWCiAr+wi6hI3oJ1m5PIjcFQCqDXaDsLVP0M09Rt+L9B28Cmk7mVPjDNmwqdRh4mfpiMVW0EKfTUopQCaTEcYlZPdUDAYpzHwbzilATPO8B4oqTtDyCZD9h8jH2q/DxjjV7O8aAFUQyba0fVDXpl8sIkxp6X5QszjvPXMG5l2nnU9OC8ZgcBSj7Dfg5e2O0f0PFLQdWdn496MUiO3pD2heAHlpURvbMGKfp4tD9HPXngsod6bffQCSxAfpXt6VGFS+VaagVBZ+hSMYhiCfaSkqP0EZVN82hEz8GoPESzQ/NbPH4eOeg46+v1Lz9Q8M0bwsNbnh/b3KwlRUTP7dCSDtijL0XAIJya/Q9RPORgJm+57nFV9FUlxis2NS4rJj93wDzQ9eHcgE+tAVhxR6V1NPxHqyuclPOQ9f54rgXaMAro+pVwDcawKgk3HxnQVQ2zgXWLCwHvKKLlIGESAIqwrLlP3IKDtW0MhNwGVrtKoPq2s9p8z/pWQMKvkkGLV0H0Yf+Qnmz4FVa1DW1EbQ8klZ8xduVwAk9ZH/DiA80hXH8IB+mvhPp82/8wDypLLRBwKDD6Is+ZJu7N5z4G2IjVcHq2U1H8I+Kng/1jyfnf8UZRARzysDI4QrE7CsE2zq6tBnyLpjCBQT0mk7z+B1tu+YCGliwmyU9Ar+vowW8DIOB9fcHQCSpP1fOzyx8RVopifAtqtNGbtuSXqIRu+s3KfoOWdweGQqZU9R+VngowuV3R7Ivp+h77xJ3URdqx22pZIvj9SVwJSMMPoVaVMnO0hZ5CuleQs0u0THN4A8iZMCLM1FU3JxzMCQrWXhQLaN8MRAd3fks5kFDp62nIUYtBKAbIDnSV2493A8Lx/TnM3OfO8AKgcvnPzTPA/qObAT7TXhHrALZZDDVWyQ3ECpHiEP9O0D4WWzch1ZujaDpg2OAg3LdHb8DwAA//8DAGoy2SUDSfluAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.wsl.ch/index_EN</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">http://www.wsl.ch/index_DE</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.134.200.0/22</mdui:IPHint>
+        <mdui:IPHint>193.134.206.0/24</mdui:IPHint>
+        <mdui:DomainHint>wsl.ch</mdui:DomainHint>
+        <mdui:DomainHint>slf.ch</mdui:DomainHint>
+        <mdui:DomainHint>lfi.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.360644,8.454924</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>
+MIIDIDCCAgigAwIBAgIJAPZ97OKnIcuaMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi53c2wuY2gwHhcNMTQwMTI0MDc0MzM2WhcNMTcwMTIzMDc0
+MzM2WjAbMRkwFwYDVQQDExBhYWktbG9nb24ud3NsLmNoMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAw/9mnMeICEome9JwsYvR37cByiSK4bRDssG76ARD
+UjXBmxxgr+0RJFQgLtJiELwnJ41UMlY+CtorpReaf090OzqzbcKuDbZijOIi5Hic
+vfptOrRNwnsplNCpAQGzWar4yz9WnLTKrYhu24ysHZnjux3gMxLvqAl7+C21ExgA
+Fu0bp4MUv7L2wVLp3ersTkFs74GXxlv3IpjgO/gjv/rtvN/ACD97pjwZIkeLeByb
+9rqNYr8jSC15Hvq14GFYq2pBNZ+8UfK4tFtX2nhmr2uC9/5IvdGEcp77moi4BQac
+tSaHF09f+AAFe8lHxwpA96kcaWn6rMYwuMu2BpmdOQRzuQIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24ud3NsLmNohidodHRwczovL2FhaS1sb2dvbi53c2wu
+Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMSFarXK3mFRGfcZQsVzW7GkO2Fw
+MA0GCSqGSIb3DQEBBQUAA4IBAQAD3Xpnezw9EHK+4iPOarnrZ1m5DLIazLLvefGm
+TM8Ok8HCbTiJppiJtozZ1EpduYwqu+cmzHH96PL4HBJSi3yxjhipGQoUcJbXVKRd
+urS4IDybcHCGP/nQw7oWmnzmPAgt3TQjjqIZ6Bik17V4+YbrLxjVWOIQ5tDB1Rvt
+fd/yHuwao2QOyRuNXE4rPKuSlEJ0z8fXJzBEITbL5dtWvT+F8Z/dDjnIu1f2w6Mq
+wuj/MeTYd+DoM/lKiZ3CADkIsdr4bTon8wmb/adGFG45IPWjNouDPLODwB1stc0x
+QciXFnoeJldeK2oUlQAt7geKp0lMf/2Er+D6VuxBQQjmjXZz
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.wsl.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://aai-logon.wsl.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.wsl.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.wsl.ch/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.wsl.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">wsl.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIJAPZ97OKnIcuaMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi53c2wuY2gwHhcNMTQwMTI0MDc0MzM2WhcNMTcwMTIzMDc0
+MzM2WjAbMRkwFwYDVQQDExBhYWktbG9nb24ud3NsLmNoMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAw/9mnMeICEome9JwsYvR37cByiSK4bRDssG76ARD
+UjXBmxxgr+0RJFQgLtJiELwnJ41UMlY+CtorpReaf090OzqzbcKuDbZijOIi5Hic
+vfptOrRNwnsplNCpAQGzWar4yz9WnLTKrYhu24ysHZnjux3gMxLvqAl7+C21ExgA
+Fu0bp4MUv7L2wVLp3ersTkFs74GXxlv3IpjgO/gjv/rtvN/ACD97pjwZIkeLeByb
+9rqNYr8jSC15Hvq14GFYq2pBNZ+8UfK4tFtX2nhmr2uC9/5IvdGEcp77moi4BQac
+tSaHF09f+AAFe8lHxwpA96kcaWn6rMYwuMu2BpmdOQRzuQIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24ud3NsLmNohidodHRwczovL2FhaS1sb2dvbi53c2wu
+Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMSFarXK3mFRGfcZQsVzW7GkO2Fw
+MA0GCSqGSIb3DQEBBQUAA4IBAQAD3Xpnezw9EHK+4iPOarnrZ1m5DLIazLLvefGm
+TM8Ok8HCbTiJppiJtozZ1EpduYwqu+cmzHH96PL4HBJSi3yxjhipGQoUcJbXVKRd
+urS4IDybcHCGP/nQw7oWmnzmPAgt3TQjjqIZ6Bik17V4+YbrLxjVWOIQ5tDB1Rvt
+fd/yHuwao2QOyRuNXE4rPKuSlEJ0z8fXJzBEITbL5dtWvT+F8Z/dDjnIu1f2w6Mq
+wuj/MeTYd+DoM/lKiZ3CADkIsdr4bTon8wmb/adGFG45IPWjNouDPLODwB1stc0x
+QciXFnoeJldeK2oUlQAt7geKp0lMf/2Er+D6VuxBQQjmjXZz
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.wsl.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">wsl.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">WSL - Eidg. Forschungsanstalt für Wald, Schnee und Landschaft</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">WSL - Swiss Federal Institute for Forest, Snow and Landscape Research</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.wsl.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.wsl.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Support Contact</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@wsl.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>AAI</md:GivenName>
+    <md:SurName>WSL</md:SurName>
+    <md:EmailAddress>mailto:aai@wsl.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.arnes.si-test-edugain.xml b/swamid-interfederations-2.0/aai.arnes.si-test-edugain.xml
new file mode 100644
index 00000000..fad7eb18
--- /dev/null
+++ b/swamid-interfederations-2.0/aai.arnes.si-test-edugain.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:algsupport="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:req="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:disco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.arnes.si/test/edugain">
+  <md:Extensions>
+    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <algsupport:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-11-05T13:11:06Z">
+      <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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <req:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/Login"/>
+      <disco:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ArnesAAI IdP eduGAIN test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">ArnesAAI IdP eduGAIN test</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Aplication for testing IdP eduGAIN compatibility</mdui:Description>
+        <mdui:Description xml:lang="sl">Aplikacija za preizkušanje kompatibilnosti IdP-jev vključenih v eduGAIN</mdui:Description>
+        <mdui:Keywords xml:lang="en">arnesaai edugain test service</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">arnesaai edugain test service</mdui:Keywords>
+        <mdui:Logo height="28" width="128">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAAAcCAYAAACpmrfzAAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+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/FRgAACIRJREFUeNrsmntwXFUdxz/3brZ5mEfTltL0QR9AYSx9kVbxgYoUWpGCU0jBF05B4qhVk4YxqCMoCDRiJhFM1TBWGRxFAzpqqY+WEREsjk1aEEeotkJLH7Q0adk8Nvu41z/2u3B6vXd3kwZny+x35s7u3XvOuXfP7/f7/r7nd67lui4mGhqbeDPhkFPG6pJ/s6p0F31O2Rt1m+nALOCJXBpX3/bnvJkfmwLGAvuBecC5p9qDFxxgbOACLwHXFBwgD2HJRrYOC/eNuM1jwFSgquAAeYQkFsVWEuwoVXaMSjvGeDtKtR3FAly5xxhgAIgD7z+V5qfoze4AE60oPfFJHOmvJeaGcLBIYFMbPsIFxS8x7BTT74axg1nhbOAtwE6dvweYDZwBTAYc4Cngp9IC5xQcII9QbsXZm6zg2cQkQjgAxNwQT8Sm8nxiPNeVPscEO8lRp4SQvxPEgHcZDvAs8E9gvBxhCfBh4DPARODeggPkERLYlFkJyqyEkfdchgnxy+gcDiTLWVfew0Q7Sq9T4scELwJhYAawD+jV70eAfwF/0Plq4NvA7cAmtS1ogHyEg8U4HGaFIvwtPpmWSC2uC1XWMI6/JogDl2UZ9ufAX6Q59wKTCg6Q5+s2gJmhCDsTk7h3YCFFVoJSK+EnDDcBlwCVGYacDawCpgCPiB0KDnAqYEaon8di03g4Opcye5AiHG8ieAV4EngwwzBfA6Jii8ulEW71aVdVcIA8YwIbqLEH6Ro6i6eGz6AyNPBa9cBAGzAB+GHAUNcBnzfOPyWnMLEAuLLgAHnoBCVWgnIrzoaB+eyM1VBpDfs1XabofsTz+2YgAtxn/NYpNviQIRJvBLYWVgF5KgyrrBh7nEq645NZFH4Z3HHeZv3K8T3AMeBq4HTgYqDYZ9hvAmuAtwFvBT4LHDAb+Gy+VQN9uT53e1srDY1N1e1trX0FBjhJJLEoFRMQXCFMAgtF91uAHwOvktoHuEyFohW6/k6xRpmYYH+WR9iiZeb6XJ+5obFpPdDb0Ni0JUu77Q2NTdsLDjA2mAMsVY2gAbgf+DJwN3APcBvwPtUKHlWbbKiVswDUj+BZ6tLpqaGxaVmA8as1fq2+55wClknc9AMJ4A7g5YC2q4DFojgX+B5QIho8Td69UW1DmrBiKexjwI/0kF8Qze6S8NqdwyTcApyp+1rAFzM8ZxrfBSrU5zDwLeCgk9470ErAShWBikmVfRcBHwTOJ1UZnEdqD8BESCwBcBZwV46GbPakgWagJYc+c4zz+pFqjEwM0CqjPSPRM13GOD+g/XHlrg2a3LWKhCFN1A+Ajxu6a78mqA24E/i0omcH8Hvly+dIlVqDMAXYA3wC6JKDVQOHgAsD+pQBLwA1QAep0u3ntG6fG8LluDMOsNJJYDFwhQy/QM/3AeX2gYAUkcb8HGg/bfB09HYZwUcOAXpCH2+Ej1YEhoB1RqQMyAlcedgEnz6P6viKrt+iXNij6JkP3AA8QGoDZaOc6xqgXDnzQjECpGrw94hJlgQ47w45gZmwH9d6/HGN6zXSA8BMUm/wpDGo9fny8fbwridjNSwJH+bcol5edYt3KNpjo0gVM8Uu2VAvJ+gGbpZhl4kRu3NIGTcbTlSfA3NkZYAk8CUZyZTCA7pR0I5XqREBD8n4aSrEp5AyVZ8VwEcM42NU0haT2o3zYq2M75df79DnjT7XLvdJK18VGzxYTJJep4T/JCsJWQnc1FJuNMZPB1j3CPJ4lxhtaw5aIH2tq72t1exTN1YpYL0i1lxexPU5KwdW+bVn0msVzX7Yp2g2ETae8XSfPjfocxFwPfBJHWt4fU9+nU+/zdILD4nKxysNrAWOOFiELYcENlgJbBjt6yMTpei35EDjtZrnFqOGkM2YdWbb9rbWFo1RGyQGR1MHqAEuEpVOMxwmnINTxT36oCfjCmxkzlkGzNX306Qx7NeW9KlNmT9JhXtxE7AcuErHkNLbRuC3ABOsKJujM5lm97O0eC+DTjlDblGmdwaCVgrP6HnIJZLFrog1uuUYfmKw2UgZ3Ube79S1nMVgkAOEFa1rSO1ybZMBB0ltiCSzFNbwpI6TrUe4Phol3ad9hMp3t/7D/YqiUhV0rpZuub3ESjLkFtExuIBrnRJWlLxIqZXI9M6AH57OljpkOHPpVx/AEC0B4q+W17enT7iea3HIb+LnKSKu1+ReS2qf+1dZIv//iQhw0Ii0keBiCb6PSoOslDBEq5ZZSSyqrWGKSXLf4HncFVlCxAkzyR4I2i72Qy66IS3+9hhRbx59Rorwir++gD57NGb9aBngJlJbnwBfN363tK7PF/wCaJTDBmGyR4V/TMaOi6FeIbXVu4nUa10dWua+kMSizEowIxShOz6ZWyMX0Fy+nSmhCEed8pGmg2z03xmg3L+vNs2k9hLMesFWYHV7W6uXVeqNfi2jYYAKT+07jeWGGj8aMN6QQde51KaPZdAAx4zvRwJEKpy4A2dig2oJXocgQJilVwb/8OadmaEIB5wy7uxfyv5kFRX+G0UjQkNjU53Yqy+DoToNyq/21As6/Tq0t7V2igXm6B4jdoBWRUO6BlAj71soBZ2u+q2QODRTx0pDyFwBvCPgvpZq5it1Plusc6bO325cQ7WC8zxjHAYu1fdDmpiz5agPa8wOT58O4O9KA2ZB6yLgd8DPgOf/V6FaTLcH2Jcs5ydD5xC23LFggDpPEccP3Yr0akMjVBu/B6Er1yWhXwrYBrxXJcyrVNQ5KIHUAvxGk7wf+KPRb6EM/h0ZuEJG3hbgeMtUYu1QsF0p7bEbeLfSTYdRCxgm9UKmiS2qMdwtvXJczPFX5XMvhlXNa5OueVoqvVa1gG8EL1MsKq0YUTfEsFt0Ui+TNzQ2zfEu4zJgq+aqzsfAmRygGajTvQLZ+L8DAN9db4I0q2c6AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://aai.arnes.si</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">https://aai.arnes.si</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ArnesAAI eduGAIN test, ArnesAAI eduGAIN compatibility test</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ArnesAAI eduGAIN test, ArnesAAI eduGAIN compatibility test,L=Ljubljana,C=SI</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFnDCCA4SgAwIBAgIGElFhIMr9MA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExQzBBBgNVBAMMOkFybmVzQUFJIGVkdUdBSU4gdGVzdCwgQXJuZXNBQUkgZWR1R0FJTiBjb21wYXRpYmlsaXR5IHRlc3QwHhcNMTQwNzMxMDkxODAzWhcNMzQwNDE3MDkxODAzWjBmMQswCQYDVQQGEwJTSTESMBAGA1UEBwwJTGp1YmxqYW5hMUMwQQYDVQQDDDpBcm5lc0FBSSBlZHVHQUlOIHRlc3QsIEFybmVzQUFJIGVkdUdBSU4gY29tcGF0aWJpbGl0eSB0ZXN0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA50u+vFRcUPXXBX0jxdsT/9FQt6wFmLiukYOjhqxQxWjHozzNQSuEN3sONdKsn+pulXp6QrzhUfoAyCSoFbrPprbgs7dgvTNgAqf6C1+CYT2J9C3DgvrRBMQt59IC7PLrHeSRvScUDBtl5X9if9R+SgGkv+UcjhvVuIsb3nhRqAmLOxnMNBM7PiWXw5bbV465I3EHObAa8E0uDiRqiF4rdsXoV9X4s14Npa4bDFikh4ejpiKOnPFDS4LjAkRoKTSvFaNIw33T/AOXFgY+pL2SO0293gUGMRVqerPEWt2sy3KBmGFxTZz1o/LBYuKwmSSMRDTqlIWOh2F947p0JI3xuWvIlmVhs9zOqlA84yoVOsuZYYWtkq7unsBT75cEg6CtjbNCdTwPSGxg0TMoMfZm2Nc387wovmgnEflczqiqGjMGZo2HiTNgsGCogU4Cp2reaDr5bWr95XN6ha3gMsyTAxpgSUMXKr8OfXeXTH6imNzjru7cZiiYv90mOSi0NBUBdvhQoVcSHLN+riYvSrI3c6Fz2+ZaY4Capp57kx3JI41P7nDmvH146uy74MMzI3SpiKVffYPBh0gMWLNyS9oAAYe7nMMufd1eRq6SRgT/aARqxcOY9BU6DruklhCnY1SPU1ryKBLT487NEEdg2d3LpEhMwUw47vmCA1QCUjo8IHUCAwEAAaNQME4wHQYDVR0OBBYEFG6JrB/IKKGU9wJF7SCEGx52grk3MB8GA1UdIwQYMBaAFG6JrB/IKKGU9wJF7SCEGx52grk3MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBADOJI3lPqCNSacyydDLT/g2o6cHjtXTLhdH8omQ8jKADgrDdoRePkjaeLOopY+sE/1Q76B7AwZVPSWw1s+dvdH6esgcsaSVKDZPFEyujRI1vOYRUTWxGJTyk4V1XC75mm9Mb6ReUTh97eCYB/X5XKbri56qlUuGmOKJoXAc/NnsEioI/dhkdVGQVRkRf38Y9EXWfrUixklt7lt25ZSiJbTHsWOU8StKkaUgeDOgIzF8+sXaY3EMVG9PJN8jiwxyERnwjzyi6dYTFsJCiweVlVZZECcuCBRPO6En4XoGsUxKOdC9GkRGmcFYPnJtbATP06YL7G+xN15fhmYztCNN45XYDc0uu973DwZDDyaiS5k3iS0NdyAbexeFY1MIFAfGTH6BKYMzK07R/jQx4vBeTlsFfkB4Jr0TDwTbB2wf+bFb+RDCNKqTPltPFzPiqd19hxnFsXvmodNZUgqu+tcNWEbP5+EMXY4qTrF8b3s/SK8ZgKl4VlmIx8XJQf0TQsmdFZPFLuBkoBOB+tEvhdp5ssSHVK126kXk26ISUATQ2DjXHjxSDsJgdfvnuDBe+84DG+dqQmL0nw8AzjqFhkME6gGdM4Z2Z+MlwUXcNjdaprZhWLZpzDAyHG1JQ2jukmxwRcsUJcLx7vSxbVPQ71/+U5/0SVQmNafuX8FWNvOWI/aJY</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://aai.arnes.si/test/edugain/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">ArnesAAI IdP eduGAIN test</md:ServiceName>
+      <md:ServiceName xml:lang="sl">ArnesAAI IdP eduGAIN test</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Aplication for testing IdP eduGAIN compatibility</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sl">Aplikacija za preizkušanje kompatibilnosti IdP-jev vključenih v eduGAIN</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="commonName" 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="rfc822Mailbox" 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" 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="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="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="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="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="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">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">https://aai.arnes.si</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">https://aai.arnes.si</md:OrganizationURL>
+  </md:Organization>
+  <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="support">
+    <md:GivenName>Arnes</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@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/aai.rz.uni-leipzig.de-idp-shibboleth.xml b/swamid-interfederations-2.0/aai.rz.uni-leipzig.de-idp-shibboleth.xml
new file mode 100644
index 00000000..fe82cc7e
--- /dev/null
+++ b/swamid-interfederations-2.0/aai.rz.uni-leipzig.de-idp-shibboleth.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.rz.uni-leipzig.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-08-12T09:14: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-leipzig.de</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dzb.de</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ub.uni-leipzig.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Leipzig</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Leipzig</mdui:DisplayName>
+        <mdui:Description xml:lang="de">IdP der Uni Leipzig</mdui:Description>
+        <mdui:Description xml:lang="en">IdP University of Leipzig</mdui:Description>
+        <mdui:Logo height="37" width="233">https://www.zv.uni-leipzig.de/fileadmin/www.uni-leipzig.de/images/logo.jpg</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">https://www.uni-leipzig.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.uni-leipzig.de/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>aai.rz.uni-leipzig.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=aai.rz.uni-leipzig.de,OU=URZ,O=Universitaet Leipzig,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF5DCCBMygAwIBAgIEEi6wvTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJE
+RTEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxDDAKBgNVBAsTA1VSWjEg
+MB4GA1UEAxMXVU5JVkVSU0lUQUVUIExFSVBaSUcgQ0ExITAfBgkqhkiG9w0BCQEW
+EnBraUB1bmktbGVpcHppZy5kZTAeFw0xMTA3MDIxNTAzMTBaFw0xNjA2MzAxNTAz
+MTBaMFoxCzAJBgNVBAYTAkRFMR0wGwYDVQQKExRVbml2ZXJzaXRhZXQgTGVpcHpp
+ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVhYWkucnoudW5pLWxlaXB6aWcuZGUw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCh3JxzMGQsIZpSBajOsdg1
+PNiVwmvk8u0+BOBiKisnKfwq754g77HeLQN2F322UMxFX/Gd5SQBYJKvrvtFjcCD
+zK3yWmzcuC/6bjka1MVt0NRT3nzgtrRXz63/WQ5wWUZGZuSVeasyEObtI7w35VyN
+ccLHn1NXR3yLOAzaR/5JXFzi/mTZu4u/AvmSJFxaOfChhXEAVy+F7Umrbx1JnVF8
+PSFrvtzXhDkq82sgAYUhuAcdiDLxY+xYKzgEo/NCId3YQcaHm8Ej0jmJIYS7b51Y
+iXMNeluHgSMHjFJhcXmJfQIsUtqz9zGPRLSPhDoJY3ZZ77TM7cpvmWbqI7idmTJa
+myTwPY5q9N4UiGywrchC3fUyjXDdaPLuqSqAaw+WfRxnVIrtpTUiRdNKWrbkbvwL
+4XUMxJ3ZnM7AqHRIIJNLBdjqOFvTgM25lkEjuLsbwWvCp8PAiCzOzXLD393X4gtG
+iVnVVppyCxkSo5BpGeM6oCbgxyEnVVleyGRpmGt+AbsuyyqAU0o/XbFXnV8j+uo2
+FfI7UGVpwI7coC0IHZYhzL3gUZX/plAgXLQD0yvg38II4g/RAUR9IR+bq/YKurEa
+hLp8YYn7t7UBVkDAOLZJ5Bb55yV6IVClnRH1MSG9zxAzJha963b4Ldgl2iTBJxXo
+9hrcueYnTSFzy+aXTZxIPQIDAQABo4IBizCCAYcwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPM3g5EU6fDFKqWM
+A3R4EgtwDebPMB8GA1UdIwQYMBaAFDaM3R6c0bqQgPinird0ak3JN9oOMH0GA1Ud
+HwR2MHQwOKA2oDSGMmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1
+Yi9jcmwvY2FjcmwuY3JsMDigNqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
+aWxlaS1jYS9wdWIvY3JsL2NhY3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYI
+KwYBBQUHMAKGNmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRm
+bi5kZS91bmlsZWktY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQAvUWGrn9rasTZ53tV7AIwNqlQt+flcJFiPq0/AGEZF9Shk1AHh+7MS
+htDa6ydnZH8wVSUbke+18ie0gTBZFZTGs242OBaS7Qw4cJIo9+wLugtPsYd1whsR
+kuXwvt8/kDEgDLFuw8zF4HtoRmB+cdSAlM3can5H8/DDGnny0Y5LupIEJsN9f6mI
+qK13ds7GZa2qOvOgPp+FxCDBxWBnZyX1SEhjy80q+vZE0LJOxJtW88oKMWEJL+nY
+dR5QRlXFOhmaxQ8kzm0Q/kFV/LAW/wALLNsH6Apvcb6w04QbN3Uw3kjywWkF2Q3b
+dJK6wmgTVaqH2u5BMKaDvRQ5oqgkgvhU
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.rz.uni-leipzig.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.rz.uni-leipzig.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://aai.rz.uni-leipzig.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.rz.uni-leipzig.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.rz.uni-leipzig.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.rz.uni-leipzig.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-leipzig.de</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dzb.de</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ub.uni-leipzig.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>aai.rz.uni-leipzig.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=aai.rz.uni-leipzig.de,OU=URZ,O=Universitaet Leipzig,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF5DCCBMygAwIBAgIEEi6wvTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJE
+RTEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxDDAKBgNVBAsTA1VSWjEg
+MB4GA1UEAxMXVU5JVkVSU0lUQUVUIExFSVBaSUcgQ0ExITAfBgkqhkiG9w0BCQEW
+EnBraUB1bmktbGVpcHppZy5kZTAeFw0xMTA3MDIxNTAzMTBaFw0xNjA2MzAxNTAz
+MTBaMFoxCzAJBgNVBAYTAkRFMR0wGwYDVQQKExRVbml2ZXJzaXRhZXQgTGVpcHpp
+ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVhYWkucnoudW5pLWxlaXB6aWcuZGUw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCh3JxzMGQsIZpSBajOsdg1
+PNiVwmvk8u0+BOBiKisnKfwq754g77HeLQN2F322UMxFX/Gd5SQBYJKvrvtFjcCD
+zK3yWmzcuC/6bjka1MVt0NRT3nzgtrRXz63/WQ5wWUZGZuSVeasyEObtI7w35VyN
+ccLHn1NXR3yLOAzaR/5JXFzi/mTZu4u/AvmSJFxaOfChhXEAVy+F7Umrbx1JnVF8
+PSFrvtzXhDkq82sgAYUhuAcdiDLxY+xYKzgEo/NCId3YQcaHm8Ej0jmJIYS7b51Y
+iXMNeluHgSMHjFJhcXmJfQIsUtqz9zGPRLSPhDoJY3ZZ77TM7cpvmWbqI7idmTJa
+myTwPY5q9N4UiGywrchC3fUyjXDdaPLuqSqAaw+WfRxnVIrtpTUiRdNKWrbkbvwL
+4XUMxJ3ZnM7AqHRIIJNLBdjqOFvTgM25lkEjuLsbwWvCp8PAiCzOzXLD393X4gtG
+iVnVVppyCxkSo5BpGeM6oCbgxyEnVVleyGRpmGt+AbsuyyqAU0o/XbFXnV8j+uo2
+FfI7UGVpwI7coC0IHZYhzL3gUZX/plAgXLQD0yvg38II4g/RAUR9IR+bq/YKurEa
+hLp8YYn7t7UBVkDAOLZJ5Bb55yV6IVClnRH1MSG9zxAzJha963b4Ldgl2iTBJxXo
+9hrcueYnTSFzy+aXTZxIPQIDAQABo4IBizCCAYcwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPM3g5EU6fDFKqWM
+A3R4EgtwDebPMB8GA1UdIwQYMBaAFDaM3R6c0bqQgPinird0ak3JN9oOMH0GA1Ud
+HwR2MHQwOKA2oDSGMmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1
+Yi9jcmwvY2FjcmwuY3JsMDigNqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
+aWxlaS1jYS9wdWIvY3JsL2NhY3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYI
+KwYBBQUHMAKGNmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRm
+bi5kZS91bmlsZWktY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQAvUWGrn9rasTZ53tV7AIwNqlQt+flcJFiPq0/AGEZF9Shk1AHh+7MS
+htDa6ydnZH8wVSUbke+18ie0gTBZFZTGs242OBaS7Qw4cJIo9+wLugtPsYd1whsR
+kuXwvt8/kDEgDLFuw8zF4HtoRmB+cdSAlM3can5H8/DDGnny0Y5LupIEJsN9f6mI
+qK13ds7GZa2qOvOgPp+FxCDBxWBnZyX1SEhjy80q+vZE0LJOxJtW88oKMWEJL+nY
+dR5QRlXFOhmaxQ8kzm0Q/kFV/LAW/wALLNsH6Apvcb6w04QbN3Uw3kjywWkF2Q3b
+dJK6wmgTVaqH2u5BMKaDvRQ5oqgkgvhU
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.rz.uni-leipzig.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.rz.uni-leipzig.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">e256</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e256</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Leipzig</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Leipzig</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">https://www.uni-leipzig.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.uni-leipzig.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Uwe</md:GivenName>
+    <md:SurName>Toenjes</md:SurName>
+    <md:EmailAddress>mailto:toenjes@rz.uni-leipzig.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Uwe</md:GivenName>
+    <md:SurName>Toenjes</md:SurName>
+    <md:EmailAddress>mailto:toenjes@rz.uni-leipzig.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.sztaki.hu-idp.xml b/swamid-interfederations-2.0/aai.sztaki.hu-idp.xml
new file mode 100644
index 00000000..2a234389
--- /dev/null
+++ b/swamid-interfederations-2.0/aai.sztaki.hu-idp.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.sztaki.hu/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sztaki.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>195.111.0.0/22</mdui:IPHint>
+        <mdui:IPHint>193.225.86.0/23</mdui:IPHint>
+        <mdui:GeolocationHint>geo:47.518209,19.055844</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">MTA SZTAKI</mdui:Description>
+        <mdui:Description xml:lang="en">MTA SZTAKI</mdui:Description>
+        <mdui:Logo height="58" width="150">https://aai.sztaki.hu/logo/sztaki.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDwDCCAymgAwIBAgIBTzANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUx
+ETAPBgNVBAgTCEJ1ZGFwZXN0MREwDwYDVQQHEwhCdWRhcGVzdDETMBEGA1UEChMK
+TVRBIFNaVEFLSTENMAsGA1UECxMESVRBSzEeMBwGA1UEAxMVQ2VydGlmaWNhdGUg
+QXV0aG9yaXR5MSIwIAYJKoZIhvcNAQkBFhNzeXMtYWRtaW5Ac3p0YWtpLmh1MB4X
+DTA5MDgyNjEwMTc1M1oXDTE5MDgyNDEwMTc1M1owgYQxCzAJBgNVBAYTAkhVMREw
+DwYDVQQIEwhCdWRhcGVzdDETMBEGA1UEChMKTVRBIFNaVEFLSTENMAsGA1UECxME
+SVRBSzEaMBgGA1UEAxMRYWFpLnN6dGFraS5odS1pZHAxIjAgBgkqhkiG9w0BCQEW
+E3N5cy1hZG1pbkBzenRha2kuaHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+AOwYmjlZUiD3pG0R6EZuRHgBYNt5NfpjEDQkeGoGnD0o1LWse4/7Hmf8JoZDKRRk
+EFuZ0C1S20wxEnOsSK4lsftRpApaibVnAlFpmv04Y5FbAAt2G2cQjEy1L0z1Ks+i
+LXSZ1c3XDTBknRReUZweIndfB1Y35OEE2yUACiHKlzuPAgMBAAGjggEnMIIBIzAJ
+BgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0
+aWZpY2F0ZTAdBgNVHQ4EFgQUMdY3+6/zwEDnlpoSr0DJ5cG5rm4wgcgGA1UdIwSB
+wDCBvYAUGR0qvyO4kXX/r2cF74rzd2gIsruhgaGkgZ4wgZsxCzAJBgNVBAYTAkhV
+MREwDwYDVQQIEwhCdWRhcGVzdDERMA8GA1UEBxMIQnVkYXBlc3QxEzARBgNVBAoT
+Ck1UQSBTWlRBS0kxDTALBgNVBAsTBElUQUsxHjAcBgNVBAMTFUNlcnRpZmljYXRl
+IEF1dGhvcml0eTEiMCAGCSqGSIb3DQEJARYTc3lzLWFkbWluQHN6dGFraS5odYIB
+ADANBgkqhkiG9w0BAQQFAAOBgQAHI9LPaySa8/kmI6y+1z3xKh0xlyHgxY5zTq8Q
+gV03wBz9rRVu9qewfB4lEp0opGxQGx9r9Gck/XXoekYImjsNXOkQ4vXztLQToWCJ
+ZQEe2c8c6xfGM+QZG4wNR4yq++DK7LcttW4ZI0A91UoeipNYFqY8K7N9kWsLp7pT
+GtZEWQ==
+                                            </ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>aai.sztaki.hu-idp</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.sztaki.hu/idp/saml2/idp/SingleLogoutServiceiFrame.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://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</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">MTA SZTAKI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">https://aai.sztaki.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://aai.sztaki.hu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>AAI Administrator Team</md:SurName>
+    <md:EmailAddress>mailto:aai@sztaki.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>AAI Administrator Team</md:SurName>
+    <md:EmailAddress>mailto:aai@sztaki.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>AAI Administrator Team</md:SurName>
+    <md:EmailAddress>mailto:aai@sztaki.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.unifr.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai.unifr.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..f3027c0e
--- /dev/null
+++ b/swamid-interfederations-2.0/aai.unifr.ch-idp-shibboleth.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.unifr.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-03-04T10:55:56Z">
+      <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.unifr.ch/aai" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifr.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Freiburg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Fribourg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">Université de Fribourg</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Universität Freiburg</mdui:Description>
+        <mdui:Description xml:lang="en">University of Fribourg</mdui:Description>
+        <mdui:Description xml:lang="fr">Université de Fribourg</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KHwg5DseRCzwAAAIaSURBVDjLlZO9T1NRGMZ/595akF5bWuQjNrJgIguJizUEk+pIY4gkEP4L3FkM/AFCZWkZSJjLKh8TGCQgTCQyyGolBIwkeNvKxz2PQ0OlGg08yZlO3t85z/u+j7HWyhjDTSSJyxrHGMPOzg75fI7Dw0Oy2Tf4vs/i4hIrK6v4/g+mp99yfn7B/HyBhYV31D0oSVNTU0okEtra+ihAxeIXjYwMKxy+pXw+J2NQqVRSKvVYAwMvJEnWWkmSAxAKhWhqaiQS8QiHXYxx8DyP7u6HTEyM09p6FzA0NzcTjcbq7DgAqdQTQAwOvqSn5xGxWAxrRSaTYWxsDGvBGHAcF9d16xsSBIEkyfd97e9/1dnZmSTp5ORElUpFklQsFhUEgQ4ODnR0dKQgCGoWQo7jsLa2xvj4a6LRKNbC7OwsMzN51tc/4Hl3GB19RTKZpK2tDWstAMYYJFUtHB9/Z2Njg97eXvr7M8TjCXZ3P+F5HpVKmWx28rdnx6kVG2OqAKk620KhwPLyEsZAKOSyubnJ9vY2Q0PDNYAxpnYAQgAtLS2k08+Ym5sjHk8A0NX1gL6+pwRBwOrq+zrIVRlrpXK5hO/7nJ6eIomOjg4aGhr+2r7LH/x5oVwup0jktjo77yuZvKe9vc+6rhwA162SHccAwhhdOxchgHL5J75fRvqGtQEXFzcEpNPPyWYnaWxsQhLt7e3XBph/xflqZP+nX5gqPWD6ar6SAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:Logo height="60" width="90">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAAA8CAYAAADmBa1FAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+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/GMzLdsAAAAGYktHRAD/AP8A/6C9p5MAAAAJcEhZcwAALiMAAC4jAXilP3YAAAAHdElNRQfdCh8INRXhQY3cAAAQRElEQVR42u2ceXxV1bXHv/vcKfeGJIwJuTcTCWFIICYQhlDqp4IQiAIBqgQUQUZl0BZxrFYqoqUCKiFU+2kFZ4SKta/VqmgVtNL3JAgqGGYfQxIGGSTJHXLPen+ce09uSLC2fe17H7jr84Gcc/be55792+v89lprr7PVqZOn5NVXX8VisQLgcjkpm1gGwCvr1lNXV0dYpk2/2Tx+/fXfc+rkKQCsVis3TZlslr3w/Iv4/X4AAoEAs2bPRCkFwN49e9m8eYtxrqCwsJC8vN5c8vL555+LO8lj/ivIL5SwFBYUGtc7p4g7OVUiZfjVxc3a3Xf3fWZZj+wc83pykkcCgYBZ9tKLL0tyRLtV5RVyOYgGhqZJ6C8iTaOgFKJaud5UwTxas/ZZ9lTtCTcz/lPq25q0Xn6JigaCKNV6n5VC6TrSGsgigDTDb9jVxQSDQWNwRBARkzKa2kVgreuXE9CgRAxgLlA4REDTUKhITFtiHhqUxsZGBg4YZN5PKdVykCJvFeLpy0GsLUFTFyhuK1oZCZQYLUSM02NHjxmaqmmttlUS+Q7Itw7gJafREsGdmnYBdYTAbtlSa0IXmDLlRuM8fM0cAGmh/arpPbh8qEPTtBAwBgDHqmsA8Hq9HDty1NQ9u9XaGmGYk+SMWTPJzOzyt39RgajLbzK09ujRo4ksQqB5OqeY+qYAUYq4hISLmg/hun/e/GfSU7sYlPFtWEsT7Vw2Gq2UYlXFSgMwTTMmshBlRA5AuA4XDIqhmMp0XLb+9S8h9lUXnTkl1F4uI6W2AowdN5aMLhncvfBuqmuPU193HpRGXFwcKR4PT658nKyuWc0aut1uzp09B0oR8Pmw2QxqSU1L5YEHH2DNM2vRFNTVNzSbENu0aUNaWppxTYT4+PjLAmglIpfXrPR/aXVEJQr0pcXRWZnZJMQnhGYmAWlyycPM0rZtAu+9/67ZcNKkyVR9saspFhKa4Kx2K55kNw8teYjevXtHEY4EuqHei7fB28zZuFD8AX+z81PHT1BTW9uqoXz08FGKh5cw59bZ3P/T+6MoN1FHk0cnkYGeCG31+/wXM6NNW1pMh0ShRFi9+im+/vrrKMotYh2hGEXF6lU4HPZmRTab7aKxDgH27q+irq6O/N4FEeac4sCBg7Rv3z4KdDMHJARcXFwb7A6Hec1qsVA0qKhVkMPK/fWpr0NBJM30FZUS3O7kqDqbQIeD9CHXefLkqQYzhICMcTrZf3BvS89QKdB1RCkG9B+EQhBluNiapjHpxkm43e4oymGOjgQ1zK+RbnarYdKwRivNXAQQpVAYMegxY0tZ8sjDUYQvRh1KhH4D+jfNdUrhdDpbttT1CLAV/Qr78sknlQZtaIrXNr6G6EEqflkRRTnsgruTU1GhaI8ABw7tIyYm5lsbFg8fyec7PzNDrPsO7qGhoYHeOXmmFaKAozVHoigTsZQlNHG0rn+H8EczehFEjIBRpPUnSvHB+5ujKIepY/Yts3A6nUjIjg5H4r5NJt0wieO1tYAi0BjAZrNis9mo+GUFe6qqjPVC4MiRw1GUiUbvokGlS446gsEgZ8+eo6VDrVpYc+3atYsi9o8CvXvXboYPG0EzezqUj6FCKQNELYh/njqUppo7JSriPJSXoS4IMEXlH7I6VMsspW/Nt4vKPzgZtqK1kTZyKIfuckt4+RcA3XyFxAQ7nNYFKE3jskmS+1dqdCjPtvnqSkQ0L0oh/1t2dJgaIjU6Kv8ah0UiYtLNAL9YQnlU/n6rQ6ApBg1NKaWRNBKVfxboC7LkQqsmhiZrJqVEWfqfk2hQ6d/N0VGJAh0FOipRoKNAR4GOyuULdMEVfdn68dZLx46ur6vHFetCRPA2eHG6nNTX1+N0OlFKES73+XxYrVZ8Pj8Ohx2LxYLP50PTNHRdJ9gYBMAR40DXdQL+AAB2hz3Uzsehg4dISU0hNjYWr9eL1WqlsbERPdiUxRrjjOHEiROcOHGS7OyuOBwOs6y+rt54cK0psae+vj7kyYIr1mXW9Xq96EEdQXA4HASDQYJB4xljYmLQNM3sm9/vpzHQCAqz38FgkCNHjuBwOEhKSjKwqK/H5XKZz+KKdVFf32AE4CKeyefz8dWhr3B73EYaxpkzZyQ9JUNERKq+rJKCvD4iIpKZniVPP/0rERFJTkoREZEZ02bK5s1bZOGChfLIkkdFRGTw966U7ZXbZf6c26R0zDiZc8tcqdxWKeUrV8ngou/L2DHjJL93gYiIuDunSMWq1ZKc5JGvDn0lU2+aKuvWvSKryitkVMlo6V84QObNmS+VlZXSKzdP5s2ZL4+veMLcIaCurl7ciW65dfYcSUvJkKefMp7PneSRH9/+Y5k///ZmOwqUjhknpaPHyqyZt8jHH2+V2+f/SErHjJVBAwfLyBHXhPrmERGRJQ8/IsOHDpdBAwdL6ZhxIiLSJ6+PlF1XJt8bOFgmXD9RAoGAWV9EJCMtU0REumZ2k7m3zpM0T7psWL9BTp48JclJHln04M/E3TlFNr2zSayG193ym0FdFx5buoz+/fqFoiFNsY9Hfv4IGalduPe+eziwbz/5BfmIErp3yyYnN5fcXrl89OFHjC4dzdSbp5Cf1yfUXPhs52fsrvqChIQEUBqBQCNz583B4/HwzttvU16xku2V22mXkMCAooH07VvQ9PphBAzKK1ayfMUysjKzmTV7JgIM+t6gFtFcEaGkZASDvz+YnJwcXnrhJW67/TbaJiRww6TJzerquk5Obi6dEjsR8Ps5d+4c1bW1bNuxDTC+vbRara3mIdbX17NqdTk+r5fa2uMsXvQQDy76KbNvmcX9D/wEi8WCFvm9tmaxoIcS0X1+H+WrVjLhurKmVzdUz2az0a59O+656x5Kx5aaIxTjdBIXH2fe73evvc6wocWUTbgegMNHvyIrK5Oe3XOorq5utkOCIE1RFwUWq5WE+HjsdgctQzE6TpcTFTEACW3b0iauzQV1FVu2fMTaNc8Z5xaN5Y8t59prRvPU06tb1PX6vHTs2IEPP/zICARZWk5hkRGL8HGsy0XZ9RN54403mTtvDufr62nfvh2vrFtPUf8i1jyzBq1t27Z4fT6WP7acO360gOLi4ebDjxhZzJjSMeihGwYjtpQYNnw4zz//ImWTykyNOLD/AJ9+uoM9e/YSFJ2RJSP43e838urG19B1nTRPOmnp6YDC7/ej60EklH6m67rJnwCnT59h+/btbP5gc/OOKcVDP1tMXq987rrnLrNs239tY9t/bmsGSmMgwMSJE/jFYz83zv1+5t82j2efW8Ndd95j9hNAdJ1jR46ye9dudu3aTXx8PBarjXvvvpcbb5hs7pJjtdn46QMPMv3m6RT0Md6283V1rFv/Mn0L+/Lc2udYcMePWXjHXYgYeOm6YFm0aNGim6fdzN69e+lb2IcFCxcAkJKaQq9euQwZOoSUlBRye+WSmNiJbt2yiY2NpX+/fqSnpzFq9CgAEhM7kZjYiU4dO5Gd3ZX0tDSys7vSvXt3OrRvT35BPkOGXMWePVXMvmUW+QX5JCYlkZPbk3bt2hHXpg1ds7uSkuLB4YjB4/HQoUN7PB4PXbp0Cb1xGmlpqSQmJjJlymTG/3AcABnp6SS0TSAxqRM5uTkm0MnJncnNzTU/Gk1MTCQzK4v8gnxcsS569+5NWloqubm5tGvfnmS3m/T0dJ56ejUWi4WZs2Zw7Fg1PXv0YOmypQDMmXsrhw4cpEtmJo88+jBKKTIy0snJyaFoUBENDQ0UDSqiX79CDh44yJ1330laemo0evdvjEf//xOv18vmD7Zgt9vI7tYNj8d9aQDt8/lwOByICH6/H4fDgdfrNXOkw8eBQACLxUIgEMBut6NCu86E+TPMsXa7HREhEAiglGphB4ft6vD9Iu3bsN2+adMmYl0uXC4XiYmdmpVH3s/r9Rq0omnY7XbzPPzsjY2N5jNaLBZsNpvZX5/Ph4hgs9mwhAyBYDBo1rHb7YY/0Eo/vF4vogtOl/O7IX3mzBlJdaeJiMiXX34pV4RsXk/nFNn68VbRdd20HafdPEM++GCzlBSXyPpXNoiIyITrymTdy+tk3rzbJDnJI8mdU+QP//EHWflkubFLWOcUGV86XkRECq7oK57OKZKc5JEzZ87ITZOnyPpXNkjZ9RMlOXQ9PbWLiIj0LxwoPbvliIjIdeOvN3cVS0/LFF3XRUTE6/WKu3OKJCe65QdXDpHTp09LcucUY1ezJI94vV55ePEScSe5JTnJIzdOmiynT5+WwoJ+IiKS1+sK45mTPHLy5Cl5449vyPRpM4ydzrrlSNWXVbJi+ePmbmfXlowydzpzJxm/8dCih77rLmFgCZkxiqYvZmOcMYwb+8Om5BpAUwqlFEuXLWXp0l8AsGXzFiaUTUB0nTVrf8Ox6sOUXFMCCm6dO4dj1Yf5y9a/AlBTU0Pljm28+ac/Eh8fj6YZnuWLL79AefkTlJaOYd8BY6exI4cPExcfx86dn7Fu/cssf3w5AwcVsW9/VTNbNtbl4ljtUd57fxMBfwCH3c7R6sO0a9+WgwcOooA58+ZyrOYIz73wbLgjIfu3gV1ffs7Vw4byUcikC29FpFk0s+/TZ06nau9uKiu3IyIsXLCQ3Xu+4GjNEYpHFP8dsQ6lRTgFxnFDfQNTp95E2fUT0TStmTfTq1cvaqtreO7Z5xlQNNB4LTUL9//kAX5w5VXU1dWhUDy1+pdkpGVy2/x5AGx87bcU5PXhhkk3cv78eXO1XdM0LBYLIFitVlY+Wc60GdMYXjycDes3hMo1NKWwXrATzvm6OjzJqdx5x52gDBrMzupOZmZXevTsAUrx4gsvMbjo+1RWVjZzvJxOJ+PHXsemd94lNzcnIlmIZgvTz/z6GXrl5DFv3hy++eYb0DTi4+Mp7NOPKZOn8l3sCc3pdOL3+fF6vbz11tskJnUyMV3y6BJqamuJCfn2kau4A4sGsvhni5kQckaCus6COxawfsMrBmgiTJ8xnTVrf8PGjRtpaGhg2bIVHK05gtfro7amtunb8wuk/ImVnDl7FhHhN79+hhY/HiFtYmM5Wn2YZSuWmc7Upzsr2fbJJ5w6ZXy1W1o6mo2vv0qXjC4tJt3yiieZMOE6Vqx4gtjYWHZ9/oVR5vOZb87kKZNZ++wz/Pa3G4mLi0N04dPtn/Knt97k7Llz30mjLYsXL17UrVs37rvnPs6ePcOvfv0rnE4n+/fto+SaEkaOHEH1sWpKSkZy4vhxevbsSceOHenaNYua6moWLFyAzWbj1KmTvP/+ZjZtepf0jHRiY2Pp0LEjI0tGsPXjvzL+h+P56tAhnnyinCuvHMzYcWM5eeIE3bp3Jy0tlfN1ddhsdvKuyKOqqoqK1asYMnQIp0+fJj0jA7vdmLAGDBzQrAP/ffiw6WQFg0FqqmsYPWYUJ06cICcnB6UUO3bs5O233qb2+HH69+tHbU0tVw25ipqaWja9swmX08WDix4gKyuTffv2U1GxmmuvvYbRY0Zx9tw5OnbowNCrh7Jjx05Gjx7FsGFX8+iSR3n3vfcYOGAAw4uHXXwntZD8D6+onOSW8ZhTAAAAAElFTkSuQmCC</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>192.47.244.0/22</mdui:IPHint>
+        <mdui:IPHint>192.47.248.0/23</mdui:IPHint>
+        <mdui:IPHint>134.21.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>unifr.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:46.806228,7.152400</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>
+MIIDEDCCAfigAwIBAgIJAJwf/9bsnmsbMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
+BAMTDGFhaS51bmlmci5jaDAeFw0xNTAzMDQxMDU0MDZaFw0xODAzMDMxMDU0MDZa
+MBcxFTATBgNVBAMTDGFhaS51bmlmci5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALi9cO7nFb67iyLo1cJHvtP9caBhzkqpYNjs4zH7XkGH+/4W4Fd4
+UtXOUn3tBpAaARerqeOp6IFNZNpqTewpHDCHPDcyZ7aGq9ZdqzHb+6yQJRVvpzPu
+mIvCMOGgQ9kAVGy08/SdZzb5e6RiGnapFPowPjZvQcsXAGFMc4pjLJ9RCIx5zY7r
+5XGweXL7RWSQ4hH74IIe9XJdHxR5WNSsuSVyYNm20CmlcKInDamTkfLC5L2w4Hw8
+BGCpGNFgBNmZr63ESsoowQ6+YYGILEcbHh1yFOEAqCw4bUCeJCNsfT7EitVf5AiU
+VNMsSWEaVJegJYwX1lp5+9YXUj7a1De1ex0CAwEAAaNfMF0wPAYDVR0RBDUwM4IM
+YWFpLnVuaWZyLmNohiNodHRwczovL2FhaS51bmlmci5jaC9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUGXQ2JJpBYGPPjGeExyVpeYqc2N0wDQYJKoZIhvcNAQELBQAD
+ggEBAB+7vRDbeXosjAy/vRp2NTqAyQtNvSNf0YD6sPAK7GWG6QdIVUplFibdxbf3
+WVRsqjk8QwBSHBEzQV4RGeNp3taWPF4rGV63AYNsD3MDU5hCXwJt+09L2CksY8nf
+yf1aolXvUgj7h/6Q0qUS6Ar9jW9OEqGdYJlReuLEqzPYYS9yLvsQXmYcaTTnsamY
+TDPBT+eAiVIiu1yddN9nogFvpWWYVeEtSo/D8ksrguKEgRgyWbddRvtpytGF+ATi
+3wUQ9ojbIJj3e8Bb9gzzNITNevi8JO7yrP/n6qY0T62Ad5tUZeWxDRkpuTh+tFIY
+bZEODPJXkUWKEr7metQP4autmVY=
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIJAIp+DMI5Xj2FMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDGFhaS51bmlmci5jaDAeFw0xNDA0MDkwNjI2MDVaFw0xNzA0MDgwNjI2MDVa
+MBcxFTATBgNVBAMTDGFhaS51bmlmci5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALXStAT8W6nX2N3ZvU84FpTKuAmdfleTr+f1usWoKz1jnKKkayFu
+lNc39OiJIgqlh3FX1QXV39AJf3AC0OqBAhpeaONnyhdf/ZZ7zhWYbUBsL/3ilSL9
+N1sPzzxGkod0feZlAkXrse2NeZZ7n4pDEz0c59bfe7Egv5iYaaKytNgU8NLpLN9p
+SqpI9okOf7a2H/Fs9PTvTfMagi/VSNcTuKb6UMyhtbS7kSJwyjUQPC9tWyGln5/4
+N5559ice8Cv3Se9sYvBqTojDRgV8XyDtHkcDoTqJgseSLOzF647fs1hDoAZss/Yu
+gfqwPOPcvNWRgsQYfuy9K93Wv4cON8S5+9sCAwEAAaNfMF0wPAYDVR0RBDUwM4IM
+YWFpLnVuaWZyLmNohiNodHRwczovL2FhaS51bmlmci5jaC9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUc+thXESrJ14M3LZRKwaX2rAt+kQwDQYJKoZIhvcNAQEFBQAD
+ggEBAI+oyk62mRG3tZ5cv5cNM7wAPRpZ/GLjxvM08T5UuIS2zEzMKLGNYIBQXHyV
+4ag2oaNzxaeDejks0v4ixkyT/X+uxe7H0wsHvfBUFGBIpp/F3RF1wLi1fadeQZbn
+bTS8R+Ie5ZvPjfwFLLB8C8kqp587RHcVr9N6IWAKY/2R2wfXATJ5cGrneQirgu3D
+/mKOvEvu+I1xF3b4gc+e2LL7IHhOMNbQFMRkE1+NBWlMCL/C7UqF4ZHeeZSC8CXQ
+/yx90ElnzFiImgYBLDF5a8Aa7UO8f7+hU+m2YaFbj/CNdD+XwFWbfr0va1UP0xas
+ACCNIbiIfzXCYUVLsTaQK7e25kA=
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.unifr.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.unifr.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://aai.unifr.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.unifr.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.unifr.ch/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.unifr.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">unifr.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIJAJwf/9bsnmsbMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
+BAMTDGFhaS51bmlmci5jaDAeFw0xNTAzMDQxMDU0MDZaFw0xODAzMDMxMDU0MDZa
+MBcxFTATBgNVBAMTDGFhaS51bmlmci5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALi9cO7nFb67iyLo1cJHvtP9caBhzkqpYNjs4zH7XkGH+/4W4Fd4
+UtXOUn3tBpAaARerqeOp6IFNZNpqTewpHDCHPDcyZ7aGq9ZdqzHb+6yQJRVvpzPu
+mIvCMOGgQ9kAVGy08/SdZzb5e6RiGnapFPowPjZvQcsXAGFMc4pjLJ9RCIx5zY7r
+5XGweXL7RWSQ4hH74IIe9XJdHxR5WNSsuSVyYNm20CmlcKInDamTkfLC5L2w4Hw8
+BGCpGNFgBNmZr63ESsoowQ6+YYGILEcbHh1yFOEAqCw4bUCeJCNsfT7EitVf5AiU
+VNMsSWEaVJegJYwX1lp5+9YXUj7a1De1ex0CAwEAAaNfMF0wPAYDVR0RBDUwM4IM
+YWFpLnVuaWZyLmNohiNodHRwczovL2FhaS51bmlmci5jaC9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUGXQ2JJpBYGPPjGeExyVpeYqc2N0wDQYJKoZIhvcNAQELBQAD
+ggEBAB+7vRDbeXosjAy/vRp2NTqAyQtNvSNf0YD6sPAK7GWG6QdIVUplFibdxbf3
+WVRsqjk8QwBSHBEzQV4RGeNp3taWPF4rGV63AYNsD3MDU5hCXwJt+09L2CksY8nf
+yf1aolXvUgj7h/6Q0qUS6Ar9jW9OEqGdYJlReuLEqzPYYS9yLvsQXmYcaTTnsamY
+TDPBT+eAiVIiu1yddN9nogFvpWWYVeEtSo/D8ksrguKEgRgyWbddRvtpytGF+ATi
+3wUQ9ojbIJj3e8Bb9gzzNITNevi8JO7yrP/n6qY0T62Ad5tUZeWxDRkpuTh+tFIY
+bZEODPJXkUWKEr7metQP4autmVY=
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIJAIp+DMI5Xj2FMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDGFhaS51bmlmci5jaDAeFw0xNDA0MDkwNjI2MDVaFw0xNzA0MDgwNjI2MDVa
+MBcxFTATBgNVBAMTDGFhaS51bmlmci5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALXStAT8W6nX2N3ZvU84FpTKuAmdfleTr+f1usWoKz1jnKKkayFu
+lNc39OiJIgqlh3FX1QXV39AJf3AC0OqBAhpeaONnyhdf/ZZ7zhWYbUBsL/3ilSL9
+N1sPzzxGkod0feZlAkXrse2NeZZ7n4pDEz0c59bfe7Egv5iYaaKytNgU8NLpLN9p
+SqpI9okOf7a2H/Fs9PTvTfMagi/VSNcTuKb6UMyhtbS7kSJwyjUQPC9tWyGln5/4
+N5559ice8Cv3Se9sYvBqTojDRgV8XyDtHkcDoTqJgseSLOzF647fs1hDoAZss/Yu
+gfqwPOPcvNWRgsQYfuy9K93Wv4cON8S5+9sCAwEAAaNfMF0wPAYDVR0RBDUwM4IM
+YWFpLnVuaWZyLmNohiNodHRwczovL2FhaS51bmlmci5jaC9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUc+thXESrJ14M3LZRKwaX2rAt+kQwDQYJKoZIhvcNAQEFBQAD
+ggEBAI+oyk62mRG3tZ5cv5cNM7wAPRpZ/GLjxvM08T5UuIS2zEzMKLGNYIBQXHyV
+4ag2oaNzxaeDejks0v4ixkyT/X+uxe7H0wsHvfBUFGBIpp/F3RF1wLi1fadeQZbn
+bTS8R+Ie5ZvPjfwFLLB8C8kqp587RHcVr9N6IWAKY/2R2wfXATJ5cGrneQirgu3D
+/mKOvEvu+I1xF3b4gc+e2LL7IHhOMNbQFMRkE1+NBWlMCL/C7UqF4ZHeeZSC8CXQ
+/yx90ElnzFiImgYBLDF5a8Aa7UO8f7+hU+m2YaFbj/CNdD+XwFWbfr0va1UP0xas
+ACCNIbiIfzXCYUVLsTaQK7e25kA=
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.unifr.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.unifr.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">unifr.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Freiburg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Fribourg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">Université de Fribourg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.unifr.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unifr.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.unifr.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>AAI</md:GivenName>
+    <md:SurName>Support Uni Fribourg</md:SurName>
+    <md:EmailAddress>mailto:aai@unifr.ch</md:EmailAddress>
+    <md:TelephoneNumber>+4126 300 7207</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>AAI</md:GivenName>
+    <md:SurName>Support Uni Fribourg</md:SurName>
+    <md:EmailAddress>mailto:aai@unifr.ch</md:EmailAddress>
+    <md:TelephoneNumber>+4126 300 7207</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/abcidp.askham-bryan.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/abcidp.askham-bryan.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..f5e7aeea
--- /dev/null
+++ b/swamid-interfederations-2.0/abcidp.askham-bryan.ac.uk-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://abcidp.askham-bryan.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askham-bryan.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDYjCCAkoCCQCbjHqVpdODLjANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJH
+						QjESMBAGA1UECBMJWW9ya3NoaXJlMQ0wCwYDVQQHEwRZb3JrMR0wGwYDVQQKExRB
+						c2toYW0gQnJ5YW4gQ29sbGVnZTEiMCAGA1UEAxMZYWJjaWRwLmFza2hhbS1icnlh
+						bi5hYy51azAeFw0xMzA0MDIxNjIyMjhaFw0zMzAzMjgxNjIyMjhaMHMxCzAJBgNV
+						BAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxDTALBgNVBAcTBFlvcmsxHTAbBgNV
+						BAoTFEFza2hhbSBCcnlhbiBDb2xsZWdlMSIwIAYDVQQDExlhYmNpZHAuYXNraGFt
+						LWJyeWFuLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA92dw
+						/jLTq0PhWcfIRwHBB1yDYBU3l9eU+rJEjH0WXZJMmOuvHsdLeT2oMBUM60gWlwIz
+						/uAoilRVQiMg48uMaodL7/etHiAGoMpzscC3CwKhHlXH7puM0QDeEb70J1t1h30q
+						dDZBFtVmCs0B5CYBHjyqH+i82YWf0etzTdb73WBo1lOrRijZLcJGD/HCzijY1hPQ
+						EkbTXwhcKaeU2Rk+5UpnZJbSUmBIGWO6u4K3ObrjyXalvWUo/m/6gWDsukHrmNnv
+						qKGuuermOrnA4Noji85wfc8TwezFolrWvofPSdtworR8XKGejVEprQxou45d9tea
+						LfBok30AvU2losYWqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCSqC5N9FinG+AE
+						ZLrIMbFuudnUoVkMCtmZ9L9ItwB7fG6BtmcknMq369Bc6WeDBevEYAE900GUvb6y
+						M+DB9sO4MlBi+FRnFjPI//X7IIhSP7gER7W5l+ZBTxe+KqeJ+p5etShh/q+A/u6f
+						LHlwgzLRh/4NUIFiKRzG8Zebt5mYv1Bv3RIjHRr1kc9IfVpBljjidPgcRb3Kg8Yr
+						5OomYsqDIo+BJBq/4r6tJ3chZTH65s6nlROA6EJmfgM46053tjWiZ9AQ8oh6hXTH
+						/4IxUtQavt3994NTOWbuZyBOVkafzCiO8dVj00/fk/Gx6SNb+oKNHSfkcM7x8RPh
+						Up+S4ts+
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://abcidp.askham-bryan.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://abcidp.askham-bryan.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://abcidp.askham-bryan.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://abcidp.askham-bryan.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://abcidp.askham-bryan.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://abcidp.askham-bryan.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askham-bryan.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDYjCCAkoCCQCbjHqVpdODLjANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJH
+						QjESMBAGA1UECBMJWW9ya3NoaXJlMQ0wCwYDVQQHEwRZb3JrMR0wGwYDVQQKExRB
+						c2toYW0gQnJ5YW4gQ29sbGVnZTEiMCAGA1UEAxMZYWJjaWRwLmFza2hhbS1icnlh
+						bi5hYy51azAeFw0xMzA0MDIxNjIyMjhaFw0zMzAzMjgxNjIyMjhaMHMxCzAJBgNV
+						BAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxDTALBgNVBAcTBFlvcmsxHTAbBgNV
+						BAoTFEFza2hhbSBCcnlhbiBDb2xsZWdlMSIwIAYDVQQDExlhYmNpZHAuYXNraGFt
+						LWJyeWFuLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA92dw
+						/jLTq0PhWcfIRwHBB1yDYBU3l9eU+rJEjH0WXZJMmOuvHsdLeT2oMBUM60gWlwIz
+						/uAoilRVQiMg48uMaodL7/etHiAGoMpzscC3CwKhHlXH7puM0QDeEb70J1t1h30q
+						dDZBFtVmCs0B5CYBHjyqH+i82YWf0etzTdb73WBo1lOrRijZLcJGD/HCzijY1hPQ
+						EkbTXwhcKaeU2Rk+5UpnZJbSUmBIGWO6u4K3ObrjyXalvWUo/m/6gWDsukHrmNnv
+						qKGuuermOrnA4Noji85wfc8TwezFolrWvofPSdtworR8XKGejVEprQxou45d9tea
+						LfBok30AvU2losYWqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCSqC5N9FinG+AE
+						ZLrIMbFuudnUoVkMCtmZ9L9ItwB7fG6BtmcknMq369Bc6WeDBevEYAE900GUvb6y
+						M+DB9sO4MlBi+FRnFjPI//X7IIhSP7gER7W5l+ZBTxe+KqeJ+p5etShh/q+A/u6f
+						LHlwgzLRh/4NUIFiKRzG8Zebt5mYv1Bv3RIjHRr1kc9IfVpBljjidPgcRb3Kg8Yr
+						5OomYsqDIo+BJBq/4r6tJ3chZTH65s6nlROA6EJmfgM46053tjWiZ9AQ8oh6hXTH
+						/4IxUtQavt3994NTOWbuZyBOVkafzCiO8dVj00/fk/Gx6SNb+oKNHSfkcM7x8RPh
+						Up+S4ts+
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://abcidp.askham-bryan.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://abcidp.askham-bryan.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Askham Bryan College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Askham Bryan College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.askham-bryan.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Lea</md:SurName>
+    <md:EmailAddress>mailto:andy.lea@askham-bryan.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:IT@askham-bryan.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Lea</md:SurName>
+    <md:EmailAddress>mailto:andy.lea@askham-bryan.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/abertay.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/abertay.unidesk.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c40b3b4a
--- /dev/null
+++ b/swamid-interfederations-2.0/abertay.unidesk.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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://abertay.unidesk.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-29T09:00: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC/TCCAeWgAwIBAgIJAPHsl6kKrFrnMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEmxpdmUudW5pZGVzay5hYy51azAeFw0xMjA0MTExNDU4MjhaFw0yMjA0MDkx
+						NDU4MjhaMB0xGzAZBgNVBAMTEmxpdmUudW5pZGVzay5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAL9qh/Dehm5jJdWdeFPNKqcjMdiqii8Iz9Rc
+						tCAsEwRsYww4EQDG7MxG5hg4NSS+iIPFCp9gR+G7hTnZAMGgNpxs2vk4vs9lmhRY
+						GmB7Y1NFloP9Pcsu+MaufaLzxi6bzIXV4dBVHqVnIcgxchDIsXmPE6xlq4poEq+q
+						XJ3aFE/eWwxfwN9z0s5yeICzsil73xk9T9NLeNAeYq+jfVTcdqDbBHY6eHtMOYh/
+						uPVYYxkKXjkgSH5cwG0b+7qN4z+uzKDNBXxnI1Nz+bLOazXW6ljQIDtAPQZMJSlr
+						3OepVaQS+fMBi0Sku5yvADgINdXxkz6H4Zx4pZg/rTQBQ/8u2esCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISbGl2ZS51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBQ2tPlzxC8e
+						akC2nh9qrG4TWfI3tzANBgkqhkiG9w0BAQUFAAOCAQEAWPY3Nv9ChZ+4XVNANhLq
+						fGF7SbiPmUNj9vWGNjCp8Ma0tdDOZPvqBRzxKkkR+LS+fHpSQQ54RuNeZrulWBiN
+						akZe3LZiSH9AHG2uD0lDuxr0UQt1AHGDiLjFXuRg9+CdqqrdT3Anmy6exDDfRsjH
+						k+ZJflkEtqTNd0dbEVlkYlg8Baqx/ZMOxkccx8PtQt1yptAMsH4Rn92vXLd9d3JM
+						H1mrFuiriqrgsAfVLmzc4WeGmB+dK01cSB+CY7hKnoe7ds1y7kNhOmZ9HP3Iy7ev
+						gF2RCdnqkP9zScihW4b20PlVa/sWMUyCj2uZE1lSO51PJcGVU0H/JFrBEpaM7u6t
+						jg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://abertay.unidesk.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: Unidesk - University of Abertay</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:IS.Helpdesk@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/ablation.oucs.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..45eb793b
--- /dev/null
+++ b/swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ablation.oucs.ox.ac.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">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDNzCCAh+gAwIBAgIJAL+QQg4gKHSjMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFmFibGF0aW9uLm91Y3Mub3guYWMudWswHhcNMTIwMTIzMTQ0NTIwWhcNMjIw
+						MTIwMTQ0NTIwWjAhMR8wHQYDVQQDExZhYmxhdGlvbi5vdWNzLm94LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnz+8H7tA8WPyMdvx5M8mvPiw
+						8tsXvb9wXpMJ7ytRr4E+Mfw0x4V4Ze3Vlqpbl86GPPZ1UsaRt5BXPJc0+3CYE0iZ
+						Cwji3tB4j4a9mBEgIgDXfepSkhxrFIV55eV5NxiPaoZdn4r3HtcZ+UPViYeha0Sb
+						sQtp8qSYN1N7ro6XvGmPsRaMxciOgTHYuS1l1mATzicO2j1K1vAIPOwJY+64VCmm
+						aVEZIzZvbhbfs/UxjJ0QYL5OIakvh2NwPuJYxomPbPTJ7d8dkjQLKVLqeaBXZVd/
+						vRUUBN4JRiWqjCe/ydJI1PyPJx797uJQGcWY+Xc014uPzP6UKumQPvSUWKmDpwID
+						AQABo3IwcDBPBgNVHREESDBGghZhYmxhdGlvbi5vdWNzLm94LmFjLnVrhixodHRw
+						czovL2FibGF0aW9uLm91Y3Mub3guYWMudWsvc2hpYmJvbGV0aC1zcDAdBgNVHQ4E
+						FgQUWCsKQqfiwjR0/+IitEXa1hrQ9rIwDQYJKoZIhvcNAQEFBQADggEBAAh41Pwr
+						gIEJw5kIsm+8WEPol3+pS/wK2XZ8aDB07uwY39hoQJiBU9pY5YEBrNkbI6JpoHj7
+						SYXK/onH9mugafKVn0NX3uuHnFNIRfBP34CSJHWlfKvYU2sdWUmdZ0g7Es82O/U6
+						Md4CwQK9TN999XdFTGx8b+/cEzLYquAVHPq5+jRGwqlPbqZlBLz1GCzvWGpkmVcs
+						2fu4xbqDRoJCy+NB/fXg8O/0uiyIQexeGG5A76JDCGOLw988AwKkoykd1iIwrvhv
+						VLSRfMpjr+kLRRDFcKnLS0QzDd4ijKMiCnfKYJUzy49x8FUDH+P41uLKDxVB7Ep0
+						TZGHmnZDf5qYsqk=
+					</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://ablation.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ablation.oucs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Test SP 1.3</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/academic.mintel.com-shibboleth.xml b/swamid-interfederations-2.0/academic.mintel.com-shibboleth.xml
new file mode 100644
index 00000000..a72c7860
--- /dev/null
+++ b/swamid-interfederations-2.0/academic.mintel.com-shibboleth.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://academic.mintel.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>
+						MIIECDCCAvCgAwIBAgIJAO7HNDxW/p6sMA0GCSqGSIb3DQEBBQUAMIGEMQswCQYD
+						VQQGEwJHQjEQMA4GA1UECBMHRW5nbGFuZDEPMA0GA1UEBxMGTG9uZG9uMScwJQYD
+						VQQKEx5NaW50ZWwgSW50ZXJuYXRpb25hbCBHcm91cCBMdGQxCzAJBgNVBAsTAklU
+						MRwwGgYDVQQDExNhY2FkZW1pYy5taW50ZWwuY29tMB4XDTExMDMyMTEyMDQyNVoX
+						DTIxMDMxODEyMDQyNVowgYQxCzAJBgNVBAYTAkdCMRAwDgYDVQQIEwdFbmdsYW5k
+						MQ8wDQYDVQQHEwZMb25kb24xJzAlBgNVBAoTHk1pbnRlbCBJbnRlcm5hdGlvbmFs
+						IEdyb3VwIEx0ZDELMAkGA1UECxMCSVQxHDAaBgNVBAMTE2FjYWRlbWljLm1pbnRl
+						bC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBnMZaWUjR2Dn7
+						dACN6ecDbGRAm/Z2rHa9OhQMXQhkt5685OlvTBqy0NkHLo+IDK7CqELM3B41+EAb
+						6Lr3BLce/LFTxcBQsnHnnD5tINW64gJpD2H6QhSHJ2aqVLeY8wPl6fXtlVytluBV
+						k1T6yjiP/YfUBg7tUSOrsG9nLQCKbZa6+Swubuu0RD42y8v+eUBGZNYJe+MqidxJ
+						rx2/oBwLrbS/a6FgRckPXOU/PZIx/Xeb7I7TIiypTG+JclszphYYWyjowELVkdc/
+						2RYIjR0sPeGVE9XOvPd65Vu5iA3q7QX0TXfr/sfvSH6cHe6eMwHAGutUrzO6FtDs
+						d9E61PsXAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
+						U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSbbZMSZPF3EcrK/8Tf
+						Jqdvf+/RODAfBgNVHSMEGDAWgBSbbZMSZPF3EcrK/8TfJqdvf+/RODANBgkqhkiG
+						9w0BAQUFAAOCAQEAmV3hGvndRDttCzoB+u6FoKevaifS9x4cwcOZAuCQuLWM09E5
+						ryFxZMSkTKxnfRM9b183qq+rGWQyGJx6mv5GOBOOjlVWgxYfV2acxSRU8D0ZXZR+
+						R4wVx7CL3lg8INzzZ8xdGdToI8L8EH5Q2ogfiVhc6ubQ/rRvxDVlQga3AwN8zFhl
+						QHH2W6QQAh9NPHRac3MtTeISpyO9q8vmIYhG2/4iy8Y46zM9KgIoeZkG9tY4Of7L
+						RNNnH2p2d6Z13fL+4GtUD9vLGi+3LYpuexnMyK721t3z4gbMrNHq7PqmJayvMw4T
+						y1i5AwcB1d7VsdGmUDdaaAr5beJzjSS21W7tuw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md: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://academic.mintel.com/resolve_ukfed" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testacademic.mintel.com/resolve_ukfed" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://academic.mintel.com/resolve_ukfed" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testacademic.mintel.com/resolve_ukfed" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.mintel.com/Shibboleth.sso/SAML/POST" index="4" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.mintel.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-shibboleth.mintel.com/Shibboleth.sso/SAML/POST" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-shibboleth.mintel.com/Shibboleth.sso/SAML/Artifact" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mintel.com/Shibboleth.sso/SAML2/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.mintel.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-shibboleth.mintel.com/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-shibboleth.mintel.com/Shibboleth.sso/SAML2/Artifact" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Mintel International Group Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Mintel Oxygen Academic</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://academic.mintel.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Abdul</md:GivenName>
+    <md:SurName>Malik</md:SurName>
+    <md:EmailAddress>mailto:amalik@mintel.com</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/academic.reportlinker.com-shibboleth.xml b/swamid-interfederations-2.0/academic.reportlinker.com-shibboleth.xml
new file mode 100644
index 00000000..d3b791d0
--- /dev/null
+++ b/swamid-interfederations-2.0/academic.reportlinker.com-shibboleth.xml
@@ -0,0 +1,68 @@
+<?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://academic.reportlinker.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-28T14:55:01Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://academic.reportlinker.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://academic.reportlinker.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Reportlinker for Libraries</mdui:DisplayName>
+        <mdui:Logo height="96" width="350">https://www.reportlinker.com/public/images/commun/academic/logo_w350.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEADCCAuigAwIBAgIJAI2zAKYVKKSxMA0GCSqGSIb3DQEBBQUAMIGAMQswCQYD
+						VQQGEwJGUjEPMA0GA1UECBMGRnJhbmNlMQ0wCwYDVQQHEwRMeW9uMREwDwYDVQQK
+						EwhVYmlxdWljazEZMBcGA1UEAxMQcmVwb3J0bGlua2VyLmNvbTEjMCEGCSqGSIb3
+						DQEJARYUa2NhQHJlcG9ydGxpbmtlci5jb20wHhcNMTIwNjIwMTYxMTQ5WhcNMzIw
+						NjE1MTYxMTQ5WjCBgDELMAkGA1UEBhMCRlIxDzANBgNVBAgTBkZyYW5jZTENMAsG
+						A1UEBxMETHlvbjERMA8GA1UEChMIVWJpcXVpY2sxGTAXBgNVBAMTEHJlcG9ydGxp
+						bmtlci5jb20xIzAhBgkqhkiG9w0BCQEWFGtjYUByZXBvcnRsaW5rZXIuY29tMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoQ/PEL4omNHjglyYy0m9TtYy
+						Ps2EdFQy7nbt/EOav1ogaqNJwcF4d3KneSJuaJWsxFoPw0f0uqCuK1hHBQbTowjA
+						BW/RSPzzyv1MgtUqpKIWk07WgQcYAPEm8pkMoCrpgqb36p/2tFgwpp/9H2zqtLS9
+						qYKKPLG1CTAGT3CfbO22hFAeulyudcdo9u/hg/mIAhBlM84KVXY5SLp+yvTeUfSq
+						Ovk3H+EpdUESagO5sujHvPo6YM4g8ndnMqIbJtdslyXYtZLt71eViTSnEP/sfT+2
+						Ns7DPXSHcwcGV7sB961MeATYC1dGX3h45PYejtttA3JxEnGMzeN8+4Hg9Lu8cQID
+						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
+						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU8AkQ/A+PIm42swrGvEzXv4kxziMw
+						HwYDVR0jBBgwFoAU8AkQ/A+PIm42swrGvEzXv4kxziMwDQYJKoZIhvcNAQEFBQAD
+						ggEBAJ4bBp0Jkt+VyBt/MvAq86H79p0r4BoznVAgQgjrS7g5vy1b6TvcDze0F0qt
+						b381xndZhF2d4OVgDOBUjY1fRf+fom+uaBd5xT+oyPGICRBS26SUWm0xg7RPy02E
+						/Okd/Unoycb8mwOKFjI1J5FcWDF/RvQNEdgLPjYY0uD00sp13riYDz1MAwy7lTsz
+						Lk9Oa6pe822E2IFi2oGJ4oUB+dMSUmRuRps4xGxiy+XG9bXGIs1kgNJTc31EYYle
+						+PT1s+jOYaWdH5KVVcbTO2RGZVo6PMMVgIne6wwKzOY9L4P+LCtAO7NXiNKs170e
+						m7vEy4QyxlwygQmmFRKsLgO8M9I=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://academic.reportlinker.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://academic.reportlinker.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://academic.reportlinker.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://academic.reportlinker.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://academic.reportlinker.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://academic.reportlinker.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://academic.reportlinker.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UBIQUICK SAS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Reportlinker for Libraries</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.reportlinker.com/index/about/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Karim</md:GivenName>
+    <md:SurName>Cadi</md:SurName>
+    <md:EmailAddress>mailto:kca@reportlinker.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Karim</md:GivenName>
+    <md:SurName>Cadi</md:SurName>
+    <md:EmailAddress>mailto:kca@reportlinker.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/accesnoto.deboecksuperieur.com.xml b/swamid-interfederations-2.0/accesnoto.deboecksuperieur.com.xml
new file mode 100644
index 00000000..faded9e7
--- /dev/null
+++ b/swamid-interfederations-2.0/accesnoto.deboecksuperieur.com.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://accesnoto.deboecksuperieur.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-12-09T14:12:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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">De Boeck Supérieur License Desk</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Environment on which Noto and NotoBib customers can use educational resources of De Boeck Supérieur</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">De Boeck Supérieur License Desk</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Environnement sur lequel les clients de Noto et NotoBib peuvent utiliser les ressources éducatives de De Boeck Supérieur</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>
+					      MIIDRzCCAjOgAwIBAgIQcCffsQu+QppGk8fmt9tu8zAJBgUrDgMCHQUAMDAxLjAs
+BgNVBAMTJWh0dHA6Ly9hY2Nlc25vdG8uZGVib2Vja3N1cGVyaWV1ci5jb20wHhcN
+MTQxMjA5MTIzNTUwWhcNMzkxMjMxMjM1OTU5WjAwMS4wLAYDVQQDEyVodHRwOi8v
+YWNjZXNub3RvLmRlYm9lY2tzdXBlcmlldXIuY29tMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAsM8i9y0yvzOg2yXRsWRNI40R190pMoTeRhVzgTN1fsqJ
+v4J4HjvPfhR3njwpYejcsbBnxgs1G/CqIUjqAcJ3J4QluT3a9jNrXCZcdwR5eiUk
+fHciFJvH0tjA0/JkWRRfWGUI58bn5y+z5lgXsLuk6dDoKQczzlof/EBke4qbZP4j
+WISy+DCL1PurXCbVgr4oUZG/aXF4yYZwIaOPGDDe2wfpEpB/5SSSHr1SATmO33Rm
+w3cLnLjAU42reiuyoA68FlakbNoa7Am57QGmsyw/GL9g4c/1cmmioUHXodgsNwHv
+Ad0WZQ2DPMwZUFTTTL6SDw/L4a5YXfGEQJVFYO1inQIDAQABo2UwYzBhBgNVHQEE
+WjBYgBBcuwvkChnCuDGzSDS1bwoUoTIwMDEuMCwGA1UEAxMlaHR0cDovL2FjY2Vz
+bm90by5kZWJvZWNrc3VwZXJpZXVyLmNvbYIQcCffsQu+QppGk8fmt9tu8zAJBgUr
+DgMCHQUAA4IBAQCRN4UHa2BT1eCNp2DEItK6fo6hy01olz6rdod7n1otcE2ZpBXa
+SdPoUsCLChLct/kc3G7UDjN+RGPU9lbkbBeRXGM6Bh1x2WCI06yMbvTn19amhtLb
+jddJYUKpfyObtw0xzVUtcyMu61Zs//nWPmj84A+JALic8ayN9UfKTP9q1KK/GZwc
+AUgH/i8Unj7LErN6gpwIJhh1fT7Y2o91XHMX6rIWSiz6sPX0uGzbmKTNoWpTEQ1p
+aYokMrO/zaJasorhJxzIsEBAeu5j6fgK0EDZfm6t1LJlRN95kXYOPEL4MDvMjWBn
+kb+1yGp1iVZqYSoJbQciM6hqlGjMEm4kllZC
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDRzCCAjOgAwIBAgIQcCffsQu+QppGk8fmt9tu8zAJBgUrDgMCHQUAMDAxLjAs
+BgNVBAMTJWh0dHA6Ly9hY2Nlc25vdG8uZGVib2Vja3N1cGVyaWV1ci5jb20wHhcN
+MTQxMjA5MTIzNTUwWhcNMzkxMjMxMjM1OTU5WjAwMS4wLAYDVQQDEyVodHRwOi8v
+YWNjZXNub3RvLmRlYm9lY2tzdXBlcmlldXIuY29tMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAsM8i9y0yvzOg2yXRsWRNI40R190pMoTeRhVzgTN1fsqJ
+v4J4HjvPfhR3njwpYejcsbBnxgs1G/CqIUjqAcJ3J4QluT3a9jNrXCZcdwR5eiUk
+fHciFJvH0tjA0/JkWRRfWGUI58bn5y+z5lgXsLuk6dDoKQczzlof/EBke4qbZP4j
+WISy+DCL1PurXCbVgr4oUZG/aXF4yYZwIaOPGDDe2wfpEpB/5SSSHr1SATmO33Rm
+w3cLnLjAU42reiuyoA68FlakbNoa7Am57QGmsyw/GL9g4c/1cmmioUHXodgsNwHv
+Ad0WZQ2DPMwZUFTTTL6SDw/L4a5YXfGEQJVFYO1inQIDAQABo2UwYzBhBgNVHQEE
+WjBYgBBcuwvkChnCuDGzSDS1bwoUoTIwMDEuMCwGA1UEAxMlaHR0cDovL2FjY2Vz
+bm90by5kZWJvZWNrc3VwZXJpZXVyLmNvbYIQcCffsQu+QppGk8fmt9tu8zAJBgUr
+DgMCHQUAA4IBAQCRN4UHa2BT1eCNp2DEItK6fo6hy01olz6rdod7n1otcE2ZpBXa
+SdPoUsCLChLct/kc3G7UDjN+RGPU9lbkbBeRXGM6Bh1x2WCI06yMbvTn19amhtLb
+jddJYUKpfyObtw0xzVUtcyMu61Zs//nWPmj84A+JALic8ayN9UfKTP9q1KK/GZwc
+AUgH/i8Unj7LErN6gpwIJhh1fT7Y2o91XHMX6rIWSiz6sPX0uGzbmKTNoWpTEQ1p
+aYokMrO/zaJasorhJxzIsEBAeu5j6fgK0EDZfm6t1LJlRN95kXYOPEL4MDvMjWBn
+kb+1yGp1iVZqYSoJbQciM6hqlGjMEm4kllZC
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://accesnoto.deboecksuperieur.com/Security/Renater/AssertionConsumerService.aspx" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">De Boeck Supérieur License Desk</md:ServiceName>
+      <md:ServiceName xml:lang="en">De Boeck Supérieur License Desk</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Environnement sur lequel les clients de Noto et NotoBib peuvent utiliser les ressources éducatives de De Boeck Supérieur</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Environment on which Noto and NotoBib customers can use educational resources of De Boeck Supérieur</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="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="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="givenName" Name="urn:oid:2.5.4.42" 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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">DE BOECK SUPERIEUR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">DE BOECK SUPERIEUR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://deboeck.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>David Daenekint</md:SurName>
+    <md:EmailAddress>David.Daenekint@deboeck.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Roland Leijten</md:SurName>
+    <md:EmailAddress>role@threeships.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/access.hro.nl-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/access.hro.nl-simplesaml-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..788da64b
--- /dev/null
+++ b/swamid-interfederations-2.0/access.hro.nl-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://access.hro.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="2014-12-05T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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 Rotterdam</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Rotterdam University</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Hogeschool Rotterdam</mdui:Description>
+        <mdui:Description xml:lang="en">Hogeschool Rotterdam</mdui:Description>
+        <mdui:Logo height="26" width="108">https://static.surfconext.nl/media/idp/hro.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">Hogeschool Rotterdam University HRO HBO</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">Hogeschool Rotterdam University HRO 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/080d16c1fde039152735783fffd2c0c2"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Hogeschool Rotterdam</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Rotterdam University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">Hogeschool Rotterdam</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Rotterdam University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hro.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:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/access.lcb.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/access.lcb.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..4a0e1d12
--- /dev/null
+++ b/swamid-interfederations-2.0/access.lcb.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://access.lcb.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lcb.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEszCCA5ugAwIBAgIRAIm9F5IqfEtgz+aqJQ6z8OEwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjExMjEwMDAwMDBaFw0xNTExMjEyMzU5NTlaMIGCMQswCQYD
+						VQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxDjAMBgNVBAcTBUxlZWRz
+						MSIwIAYDVQQKExlMZWVkcyBDb2xsZWdlIG9mIEJ1aWxkaW5nMQswCQYDVQQLEwJJ
+						VDEZMBcGA1UEAxMQYWNjZXNzLmxjYi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBALQyZT/SwHUAS2OE3jpY3SF6hbNSykchdwFNI23nvArXybmq
+						l8/ZKXZOl7fG4kVxA/EviUGfi7uE17snR72FtsWpII0FYjV3XVWnnoj9hE7kdBh+
+						UEpeCAsXx2PYrL5h8GjFJuHiAPYGX3hjEuQHvGIojtoEL1z02jH1WX4I98u0B5Vm
+						yV2flqKGn+68eMPMVtgO7nnp889IJmQGVOXoRuotZi987UV3dzBK71oo6SAS5YR0
+						1PwnRD2FepU0DyLHIWAIhLe1hbqU8nN48RU9Lm6uoU/RPHCQ7hd6QtakSV9oIfaW
+						Zr7ps4YCZ0O0J3elLyIU/bvws2TUsJrRW6MpEHcCAwEAAaOCAW0wggFpMB8GA1Ud
+						IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSMhrVWHwGDq1Ml
+						xTe2LoaUWkLjYDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
+						FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQIC
+						HTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQw
+						EoIQYWNjZXNzLmxjYi5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAMs1x9M3D/j7o
+						PrmPdL5U2q0bDp7XqyrKUzqW2rN5c3qBElVS5aqV2nFoUSxI/SdBgom324APX4Iw
+						Y6RoFBJyAfUMZ6Dce7Jeyu1BzhxjGE/RjO0B8JnKPlNc8Q+FMlUHTpGFaUXvM7TK
+						QOe5Giavbh76bGQaAmhAFMGxXfEYnAWhwCI8YagY3N00OLQYag5QwrJa8e2t7szQ
+						NjNkLbJzs9g/pkmLRH/oDJqRvjPPcdk8ZffGqq9Y+yFsO9dyuVElCi+reb9XNEn8
+						4OwKftsJyCgu106HmCFWH/dRi0cZIJfAOKTbIivcEMKbERxqgwRYqy08StD/KPVn
+						CTyuNFCgDg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://access.lcb.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.lcb.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://access.lcb.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.lcb.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://access.lcb.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://access.lcb.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lcb.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEszCCA5ugAwIBAgIRAIm9F5IqfEtgz+aqJQ6z8OEwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjExMjEwMDAwMDBaFw0xNTExMjEyMzU5NTlaMIGCMQswCQYD
+						VQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxDjAMBgNVBAcTBUxlZWRz
+						MSIwIAYDVQQKExlMZWVkcyBDb2xsZWdlIG9mIEJ1aWxkaW5nMQswCQYDVQQLEwJJ
+						VDEZMBcGA1UEAxMQYWNjZXNzLmxjYi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBALQyZT/SwHUAS2OE3jpY3SF6hbNSykchdwFNI23nvArXybmq
+						l8/ZKXZOl7fG4kVxA/EviUGfi7uE17snR72FtsWpII0FYjV3XVWnnoj9hE7kdBh+
+						UEpeCAsXx2PYrL5h8GjFJuHiAPYGX3hjEuQHvGIojtoEL1z02jH1WX4I98u0B5Vm
+						yV2flqKGn+68eMPMVtgO7nnp889IJmQGVOXoRuotZi987UV3dzBK71oo6SAS5YR0
+						1PwnRD2FepU0DyLHIWAIhLe1hbqU8nN48RU9Lm6uoU/RPHCQ7hd6QtakSV9oIfaW
+						Zr7ps4YCZ0O0J3elLyIU/bvws2TUsJrRW6MpEHcCAwEAAaOCAW0wggFpMB8GA1Ud
+						IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSMhrVWHwGDq1Ml
+						xTe2LoaUWkLjYDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
+						FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQIC
+						HTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQw
+						EoIQYWNjZXNzLmxjYi5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAMs1x9M3D/j7o
+						PrmPdL5U2q0bDp7XqyrKUzqW2rN5c3qBElVS5aqV2nFoUSxI/SdBgom324APX4Iw
+						Y6RoFBJyAfUMZ6Dce7Jeyu1BzhxjGE/RjO0B8JnKPlNc8Q+FMlUHTpGFaUXvM7TK
+						QOe5Giavbh76bGQaAmhAFMGxXfEYnAWhwCI8YagY3N00OLQYag5QwrJa8e2t7szQ
+						NjNkLbJzs9g/pkmLRH/oDJqRvjPPcdk8ZffGqq9Y+yFsO9dyuVElCi+reb9XNEn8
+						4OwKftsJyCgu106HmCFWH/dRi0cZIJfAOKTbIivcEMKbERxqgwRYqy08StD/KPVn
+						CTyuNFCgDg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://access.lcb.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.lcb.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md: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 Building</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Leeds College of Building</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lcb.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Anne-Mary</md:GivenName>
+    <md:SurName>Inglehearn</md:SurName>
+    <md:EmailAddress>mailto:AInglehearn@lcb.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Grimley</md:SurName>
+    <md:EmailAddress>mailto:cgrimley@lcb.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/access.procureweb.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/access.procureweb.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..2827c214
--- /dev/null
+++ b/swamid-interfederations-2.0/access.procureweb.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,67 @@
+<?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://access.procureweb.ac.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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://access.procureweb.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">JISC Services Management Company Ltd: JISC Procureweb</mdui:DisplayName>
+        <mdui:Description xml:lang="en">JISC Procureweb, a procurement support service for the UK Higher and Further Education sectors</mdui:Description>
+        <mdui:Logo height="128" width="233">https://www.procureweb.ac.uk/images/Procureweb_Logo2.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDBjCCAe6gAwIBAgIJALUgGF9qVwMgMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXAyazh3ZWIwMi5hZC5jZi5hYy51azAeFw0xMjAxMDgyMjExNTVaFw0yMjAx
+						MDUyMjExNTVaMCAxHjAcBgNVBAMTFXAyazh3ZWIwMi5hZC5jZi5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKdar5W/cmwUfVkTxd7A+hTRpt6f
+						Cdfd++/ZeyGdBr49/t1T+zceln6arQYtbylxr/myZ5Lt2QdyFymwiaxmcIt46m9E
+						428hqMeL2DWctMa0ZhxJ374dDasiRFFxUXLb8gq0X7rxo0IKynCoVCgqdefKzxzp
+						I/fK4WlWY0jQ+OqIJ8Teulbu3807t4o09g2H6qS0AhYkRfZjVqBuqkg7t8lYd+yV
+						iwbEBuhKpLVZ6w0tEjrMDma2kOiycvdKt+5rZ0rsgOTRfJLye8lQeBOU66edLJd1
+						Rxbm80loSvgE0T0JzUiVmwnyA4H/JRqKfUtlAQThfOaTGwkgFc1YOGUfPwMCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVcDJrOHdlYjAyLmFkLmNmLmFjLnVrMB0GA1UdDgQW
+						BBRZEluMzvKX1J4CK2+K3V/K/FMvZjANBgkqhkiG9w0BAQUFAAOCAQEAUh2P7oiy
+						aNVsQc1ACkTQWKhfVFjVDSnS6POLwHOhRmEt6DnHbcNUFchQjw0WBAkzQnLed6FI
+						ZPbPzzohHqRiKTViIxfDbdl1E0iVdjDEV/WE0PzM4KbNsXWSSMkAU8hXsqZAvtMF
+						pCFKNbAKLGG1JksIU57qgOe7cRU1FU3rGmXugZHZ//c/iZf+MeuKYx6sUzbI0xts
+						uoudJ6z3NkV+KE9+m/i50kK8cKPdneTYAd6qZTIbwgwNusopNJb4oIp2Xx43r8jW
+						FUk/hEL49V7l1jwcR2T49iaBVn1jfVs/0GJaEvDgWk+NcqV159JezhyejHnTnQv1
+						BWKhfx7wG1mJNg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.procureweb.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">JISC Services Management Company Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">JISC Services Management Company Ltd: JISC Procureweb</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.procureweb.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nathan</md:GivenName>
+    <md:SurName>Skidmore</md:SurName>
+    <md:EmailAddress>mailto:nathan@procureweb.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Joe</md:GivenName>
+    <md:SurName>Wells</md:SurName>
+    <md:EmailAddress>mailto:joe@procureweb.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/access.sant.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/access.sant.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..2af3764c
--- /dev/null
+++ b/swamid-interfederations-2.0/access.sant.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,78 @@
+<?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://access.sant.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="2013-08-16T15:23: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://access.sant.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>
+						MIIDLDCCAhSgAwIBAgIJANvcUw2O9TNGMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFGFjY2Vzcy5zYW50Lm94LmFjLnVrMB4XDTEzMDgxNjEwMTE0NloXDTIzMDgx
+						NDEwMTE0NlowHzEdMBsGA1UEAxMUYWNjZXNzLnNhbnQub3guYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8k37VXOb/igIX3TqAUobawXKN4wUo
+						cVcXuIFPkHw1jzOEGGESVIIHuPf+mo2lzGtxm+Kf+81knq/DpW8umDVLfvCBvTWi
+						3n4Qw35+a/cjPBszryWveZHvf5h2qFJk0KzjZpJ/QyA7toE9Gyc2WJ5CeHpSZZ5F
+						oPMjagFRbjnR49o+P9dkK607UYXZrz7XWRN+c2Yoqz1Q5TsClsr3HT1qz1ot4WpK
+						WiA3LNmgTVhgbm06zBaVi8y8szX9fbN0vji+Pr6I/EHrYkh2tJ6TXCiKdGGoO+LE
+						yZJ7zn6aI6F7lu9JCbmDd/VmG/AwDj24cZznDkRqSbxQ+JideHuXVf3FAgMBAAGj
+						azBpMEgGA1UdEQRBMD+CFGFjY2Vzcy5zYW50Lm94LmFjLnVrhidodHRwczovL2Fj
+						Y2Vzcy5zYW50Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFGFeAxbCijMU
+						19VYtZMdljIy+tedMA0GCSqGSIb3DQEBBQUAA4IBAQChVmsTgMZUkNrCV/JUVlPH
+						lZmbHqbc0hWh2YrWT/qCo+Ct/cwaQp/OaLQ9oLQk05JEUBxK+RN2/6orVEpOBxvP
+						75f9G/7dMvshoXIMeJkudKkoaYFJh4yszHMRPCXOqDNp0BiGnQhedXOd0onD0leV
+						j44Q8kW9yOB8sgNBfQW0cIMtcz2SYcUlITeNfQrHibqHpjzLULDAtaQSekU1lYW0
+						wPHLRtw00ncAVwiZN8LcZUglmMucv82zPkMRBnlTn8ctkvBPEe9RXiw9CEXt1XB7
+						0G31ZiVCVRY5N6kENKrC4emYwjwGTJEIAWNZk0+/BH7bO429hQNFenhvhTgonegF
+					</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://access.sant.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.sant.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://access.sant.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://access.sant.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://access.sant.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, St Antony's College NAC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sant.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>St Antony's College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@sant.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Christopher</md:GivenName>
+    <md:SurName>Hoskin</md:SurName>
+    <md:EmailAddress>mailto:christopher.hoskin@sant.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/access.wigan-leigh.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/access.wigan-leigh.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..3095a924
--- /dev/null
+++ b/swamid-interfederations-2.0/access.wigan-leigh.ac.uk-oala-metadata.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://access.wigan-leigh.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-17T18:09:30Z"/>
+  </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">wigan-leigh.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDrzCCApegAwIBAgIJAP1hnrR7xnq9MA0GCSqGSIb3DQEBBQUAMEMxHjAcBgNV
+						BAoMFVdpZ2FuICYgTGVpZ2ggQ29sbGVnZTEhMB8GA1UEAxMYYWNjZXNzLndpZ2Fu
+						LWxlaWdoLmFjLnVrMB4XDTExMTEyOTE0MTYzOVoXDTIxMTEyNjE0MTYzOVowQzEe
+						MBwGA1UECgwVV2lnYW4gJiBMZWlnaCBDb2xsZWdlMSEwHwYDVQQDExhhY2Nlc3Mu
+						d2lnYW4tbGVpZ2guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC6QW6py7ewUg2xeF0DDyZEoQbF5FGK4aaTpNUIgruhXkT1kkBQx4/3CWNYN7Sy
+						J5zZzL85S42jX+R6ZpLFKLXZWRn0vMZkHfsAoBbE9DBu7EAS7GPHy+QzQ9nLOnT3
+						Tn2W4LB6v4ysmY4XQRqnk1ftLUJgsjiacJ36+cSVpJmsgRWYCVpQ0E/W5WRUnO0Q
+						Q9Hl5kj3uHo2c+oD3syu0YiLmoeDU8dOzcfCwrgB+y5EQ3tYxskRZmxMNEB76g5/
+						A5nz5HY0eMyIgc4HPsFNTNCZKzPx2RvVnxtvJFf1u6tziU5d9xIPptwLHA6Ljt/4
+						we1xqSZWQUwYvFhg6KDcYn+dAgMBAAGjgaUwgaIwHQYDVR0OBBYEFJliefRZwjmv
+						Ud7SvS1grr1Hw0/yMHMGA1UdIwRsMGqAFJliefRZwjmvUd7SvS1grr1Hw0/yoUek
+						RTBDMR4wHAYDVQQKDBVXaWdhbiAmIExlaWdoIENvbGxlZ2UxITAfBgNVBAMTGGFj
+						Y2Vzcy53aWdhbi1sZWlnaC5hYy51a4IJAP1hnrR7xnq9MAwGA1UdEwQFMAMBAf8w
+						DQYJKoZIhvcNAQEFBQADggEBABegtgKN+GXn4YH45KPg0LV3+JWXOvstp/DjvP9E
+						sWyLu8Oky2stpykPFIi75LKilSR9JaVAGVuOUATp7i8YpxOlEI07yyR7TTCvswLc
+						O5/XnV+ASpnnedAjSKwGb0DYRi6uiPD+NvCUyugp8kY9JT4uqairyOqrZcQBOhGu
+						3A2StwhfBUAmLiCs9/QLLe8vDiMz18rBA6k50NQHAo0uudsq4NNC4jmhwFjrPQuK
+						xuuv1aUDSSlQzhhLu0jCC+7TQRXm6Kj3TCdjIaSFyO0XCC/EPjkcBPpIvsq9hWLG
+						ZyqGxjHf9L6xy9iMR9HUdmPg+ajohCQYHHGiubPT1YvWKqk=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDrzCCApegAwIBAgIJAP1hnrR7xnq9MA0GCSqGSIb3DQEBBQUAMEMxHjAcBgNV
+						BAoMFVdpZ2FuICYgTGVpZ2ggQ29sbGVnZTEhMB8GA1UEAxMYYWNjZXNzLndpZ2Fu
+						LWxlaWdoLmFjLnVrMB4XDTExMTEyOTE0MTYzOVoXDTIxMTEyNjE0MTYzOVowQzEe
+						MBwGA1UECgwVV2lnYW4gJiBMZWlnaCBDb2xsZWdlMSEwHwYDVQQDExhhY2Nlc3Mu
+						d2lnYW4tbGVpZ2guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC6QW6py7ewUg2xeF0DDyZEoQbF5FGK4aaTpNUIgruhXkT1kkBQx4/3CWNYN7Sy
+						J5zZzL85S42jX+R6ZpLFKLXZWRn0vMZkHfsAoBbE9DBu7EAS7GPHy+QzQ9nLOnT3
+						Tn2W4LB6v4ysmY4XQRqnk1ftLUJgsjiacJ36+cSVpJmsgRWYCVpQ0E/W5WRUnO0Q
+						Q9Hl5kj3uHo2c+oD3syu0YiLmoeDU8dOzcfCwrgB+y5EQ3tYxskRZmxMNEB76g5/
+						A5nz5HY0eMyIgc4HPsFNTNCZKzPx2RvVnxtvJFf1u6tziU5d9xIPptwLHA6Ljt/4
+						we1xqSZWQUwYvFhg6KDcYn+dAgMBAAGjgaUwgaIwHQYDVR0OBBYEFJliefRZwjmv
+						Ud7SvS1grr1Hw0/yMHMGA1UdIwRsMGqAFJliefRZwjmvUd7SvS1grr1Hw0/yoUek
+						RTBDMR4wHAYDVQQKDBVXaWdhbiAmIExlaWdoIENvbGxlZ2UxITAfBgNVBAMTGGFj
+						Y2Vzcy53aWdhbi1sZWlnaC5hYy51a4IJAP1hnrR7xnq9MAwGA1UdEwQFMAMBAf8w
+						DQYJKoZIhvcNAQEFBQADggEBABegtgKN+GXn4YH45KPg0LV3+JWXOvstp/DjvP9E
+						sWyLu8Oky2stpykPFIi75LKilSR9JaVAGVuOUATp7i8YpxOlEI07yyR7TTCvswLc
+						O5/XnV+ASpnnedAjSKwGb0DYRi6uiPD+NvCUyugp8kY9JT4uqairyOqrZcQBOhGu
+						3A2StwhfBUAmLiCs9/QLLe8vDiMz18rBA6k50NQHAo0uudsq4NNC4jmhwFjrPQuK
+						xuuv1aUDSSlQzhhLu0jCC+7TQRXm6Kj3TCdjIaSFyO0XCC/EPjkcBPpIvsq9hWLG
+						ZyqGxjHf9L6xy9iMR9HUdmPg+ajohCQYHHGiubPT1YvWKqk=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://access.wigan-leigh.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://access.wigan-leigh.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Wigan &amp; Leigh College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Wigan &amp; Leigh College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wigan-leigh.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Unsworth</md:SurName>
+    <md:EmailAddress>mailto:a.unsworth@wigan-leigh.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Parr</md:SurName>
+    <md:EmailAddress>mailto:i.parr@wigan-leigh.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr-shibboleth.xml b/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr-shibboleth.xml
new file mode 100644
index 00000000..429e46ad
--- /dev/null
+++ b/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr-shibboleth.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://accounts.okeanos-global.grnet.gr/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:SPSSODescriptor protocolSupportEnumeration="urn:oasis: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">~okeanos global</mdui:DisplayName>
+        <mdui:Description xml:lang="en">~okeanos global GRNET cloud services</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://okeanos-global.grnet.gr/about/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://accounts.okeanos-global.grnet.gr/ui/approval_terms</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="el">https://accounts.okeanos-global.grnet.gr/ui/approval_terms#grterm</mdui:PrivacyStatementURL>
+        <mdui:Logo height="64" width="250" xml:lang="en">https://okeanos-global.grnet.gr/static/medialibrary/2013/10/dashboard_logo.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://accounts.okeanos-global.grnet.gr/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>accounts.okeanos-global.grnet.gr</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIEtjCCA56gAwIBAgIRAO4s6c+ETE33rnsC+Wz5hhQwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xMzA5MjQwMDAwMDBaFw0xNjA5MjMyMzU5NTlaMFExITAfBgNV
+                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEsMCoGA1UEAxMjdzAuYWNjb3Vu
+                            dHMub2tlYW5vcy1nbG9iYWwuZ3JuZXQuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+                            DwAwggEKAoIBAQDeVhIzHDfEKAsN7lZbAUI5kKTf254hHjcg6VSAOEaZJb6RaEHJ
+                            N8E0+t6XL/E7lCVTd+K09FWuGCJryA7Ahc7IuYdvI/wOfVDU608bMmwKz12FVyEH
+                            eO8riEFnBt7QZ8HQmdnuOo0o3KtX4+dxfjonA46nm2j/5lgpDsFi9LdqotmI/El2
+                            fkovex5Fvsuu7uEFbejqdXyo/lZ6C5yhAqdnC/h6Tfq7/8nZu55nDtTKYnWhhSkX
+                            eKTOdbwJT4Y1BjkcfCZuBV4zTkA6wwA12gz7wHuz/8eU52jkWmYbzijXwU+AidzB
+                            6BRkCEFL51fOjSis7/czhnExClBf2+Ogg4QNAgMBAAGjggGiMIIBnjAfBgNVHSME
+                            GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUziXgPt6+mYwwvgKL
+                            GoE2WB9Wr3UwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
+                            FAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0w
+                            CAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
+                            YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
+                            AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
+                            KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMFAGA1UdEQRJMEeC
+                            I3cwLmFjY291bnRzLm9rZWFub3MtZ2xvYmFsLmdybmV0LmdygiBhY2NvdW50cy5v
+                            a2Vhbm9zLWdsb2JhbC5ncm5ldC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAqIDuYFZF
+                            SR4jPn1dUu8RXku1Ck0kzsb/p+b6D5nZtvUQxRGhUUw4TJy3onRH7qHInWBrJz0T
+                            tN18fxo8W6kIiIJS28qGurFfb3+z+vC1RyjARH07L7Z+ug+ubZeVVW4S3as6mPlx
+                            6efiRqCJz4sojxjy4xHUB1rKy+7i3fRxHivJyDbCDGKOy2VY/A3ORPGngxpZ1l3A
+                            Cxahaaq/tBTC3+tT7PmPcoEKlmwrGXn3E6b95mQ0iE1tZHb/oIekB/yGUENKMrze
+                            yjODwZKEzsFZOiN5R5mh/mDUTT3GfuYsLKlRoWg07oXaG9JcK57PnHeOtl6sjXtO
+                            yJEZ5Wfqywx4Bw==
+                        </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>accounts.okeanos-global.grnet.gr</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIEtjCCA56gAwIBAgIRAO4s6c+ETE33rnsC+Wz5hhQwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xMzA5MjQwMDAwMDBaFw0xNjA5MjMyMzU5NTlaMFExITAfBgNV
+                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEsMCoGA1UEAxMjdzAuYWNjb3Vu
+                            dHMub2tlYW5vcy1nbG9iYWwuZ3JuZXQuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+                            DwAwggEKAoIBAQDeVhIzHDfEKAsN7lZbAUI5kKTf254hHjcg6VSAOEaZJb6RaEHJ
+                            N8E0+t6XL/E7lCVTd+K09FWuGCJryA7Ahc7IuYdvI/wOfVDU608bMmwKz12FVyEH
+                            eO8riEFnBt7QZ8HQmdnuOo0o3KtX4+dxfjonA46nm2j/5lgpDsFi9LdqotmI/El2
+                            fkovex5Fvsuu7uEFbejqdXyo/lZ6C5yhAqdnC/h6Tfq7/8nZu55nDtTKYnWhhSkX
+                            eKTOdbwJT4Y1BjkcfCZuBV4zTkA6wwA12gz7wHuz/8eU52jkWmYbzijXwU+AidzB
+                            6BRkCEFL51fOjSis7/czhnExClBf2+Ogg4QNAgMBAAGjggGiMIIBnjAfBgNVHSME
+                            GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUziXgPt6+mYwwvgKL
+                            GoE2WB9Wr3UwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
+                            FAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0w
+                            CAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
+                            YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
+                            AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
+                            KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMFAGA1UdEQRJMEeC
+                            I3cwLmFjY291bnRzLm9rZWFub3MtZ2xvYmFsLmdybmV0LmdygiBhY2NvdW50cy5v
+                            a2Vhbm9zLWdsb2JhbC5ncm5ldC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAqIDuYFZF
+                            SR4jPn1dUu8RXku1Ck0kzsb/p+b6D5nZtvUQxRGhUUw4TJy3onRH7qHInWBrJz0T
+                            tN18fxo8W6kIiIJS28qGurFfb3+z+vC1RyjARH07L7Z+ug+ubZeVVW4S3as6mPlx
+                            6efiRqCJz4sojxjy4xHUB1rKy+7i3fRxHivJyDbCDGKOy2VY/A3ORPGngxpZ1l3A
+                            Cxahaaq/tBTC3+tT7PmPcoEKlmwrGXn3E6b95mQ0iE1tZHb/oIekB/yGUENKMrze
+                            yjODwZKEzsFZOiN5R5mh/mDUTT3GfuYsLKlRoWg07oXaG9JcK57PnHeOtl6sjXtO
+                            yJEZ5Wfqywx4Bw==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">~okeanos global</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">~okeanos global GRNET cloud services</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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" 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="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="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="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" 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:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+    </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:GivenName>~okeanos support</md:GivenName>
+    <md:EmailAddress>support@okeanos.grnet.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/acesso.ufabc.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/acesso.ufabc.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..500a9858
--- /dev/null
+++ b/swamid-interfederations-2.0/acesso.ufabc.edu.br-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://acesso.ufabc.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFABC - Universidade Federal do ABC</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFABC - Universidade Federal do ABC</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFABC - Universidade Federal do ABC</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFABC - Universidade Federal do ABC</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufabc.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufabc.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>
+    MIIEMDCCAxgCAQAwDQYJKoZIhvcNAQEFBQAwgd0xLDAqBgNVBAoTI1VGQUJDIC0g
+				VW5pdmVyc2lkYWRlIEZlZGVyYWwgZG8gQUJDMTEwLwYDVQQLEyhOVEkgLSBOdWNs
+				ZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMSUwIwYJKoZIhvcNAQkBFhZ3
+				ZWJtYXN0ZXJAdWZhYmMuZWR1LmJyMRQwEgYDVQQHEwtTYW50byBBbmRyZTESMBAG
+				A1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTYWNlc3NvLnVm
+				YWJjLmVkdS5icjAeFw0xNDEwMDYyMDAyMDFaFw0xNzEwMDUyMDAyMDFaMIHdMSww
+				KgYDVQQKEyNVRkFCQyAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIEFCQzExMC8G
+				A1UECxMoTlRJIC0gTnVjbGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEl
+				MCMGCSqGSIb3DQEJARYWd2VibWFzdGVyQHVmYWJjLmVkdS5icjEUMBIGA1UEBxML
+				U2FudG8gQW5kcmUxEjAQBgNVBAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxHDAa
+				BgNVBAMTE2FjZXNzby51ZmFiYy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+				DwAwggEKAoIBAQC6mGtdNAUQx0I9sNxQdovn7t0/2USXnGKkw3kE9SOuyxq2b4/w
+				1F70EfFTDLi14Tu1U2GdaWhv1CksPhYF/MrmX5bdv2oykorrS+VTloxiVA/qWIPa
+				VdfHWSyLLa28kpQs39RtRVl1WgZ2acKYO48d0rWzm0NrRJ3gnm8W33d3VcDmQImQ
+				0/8HFYlF4SgAvOg5Pdywr8beFrNlSO2oZitc7turdF8cs2FoqHJ1Zb0hwDHbDTyp
+				D0cZoITbAdo3/JqYXM5eRh43Phvt/VjSuQy/haU3DbEfa5JMOsjad2k3WltaMluy
+				3FpD5sQAWqHzAXprcI3tkywJZkMbD/0BU3RTAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+				ggEBAJzEMvntE4fOAoqO18wZUhi7g1HZmHAzTtWLH+5YrvlcOIGRgEqe7g0j9eqU
+				z0Rm98+7LEwaCF+VshS125JNDmAjk2nbOUsJQ1GwtVo/hPrAsI9TZKkMftOqi+ga
+				zi2xUzSvhtE52kUIPm35PLVzKNDAQKGMgdQfcexhBjzBX7Ozt5h7hPaOutpR71t3
+				eTCiukdeCPU6k4+MzuUR1wAXBZUAqo+BOcrZE8/7YgGsUykaPS1YJyturDhgfq4U
+				V7x6Y5Rikv9YMJX2is1jMz31f8AOiDDliT7qLpmuhFX5Ub1TJiXuT3qfExNTh7Dj
+				9r2+SoV9gdVYdUvQjPmDt3ebeiM=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://acesso.ufabc.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://acesso.ufabc.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://acesso.ufabc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acesso.ufabc.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://acesso.ufabc.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://acesso.ufabc.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>
+      
+				MIIEMDCCAxgCAQAwDQYJKoZIhvcNAQEFBQAwgd0xLDAqBgNVBAoTI1VGQUJDIC0g
+				VW5pdmVyc2lkYWRlIEZlZGVyYWwgZG8gQUJDMTEwLwYDVQQLEyhOVEkgLSBOdWNs
+				ZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMSUwIwYJKoZIhvcNAQkBFhZ3
+				ZWJtYXN0ZXJAdWZhYmMuZWR1LmJyMRQwEgYDVQQHEwtTYW50byBBbmRyZTESMBAG
+				A1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTYWNlc3NvLnVm
+				YWJjLmVkdS5icjAeFw0xNDEwMDYyMDAyMDFaFw0xNzEwMDUyMDAyMDFaMIHdMSww
+				KgYDVQQKEyNVRkFCQyAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIEFCQzExMC8G
+				A1UECxMoTlRJIC0gTnVjbGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEl
+				MCMGCSqGSIb3DQEJARYWd2VibWFzdGVyQHVmYWJjLmVkdS5icjEUMBIGA1UEBxML
+				U2FudG8gQW5kcmUxEjAQBgNVBAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxHDAa
+				BgNVBAMTE2FjZXNzby51ZmFiYy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+				DwAwggEKAoIBAQC6mGtdNAUQx0I9sNxQdovn7t0/2USXnGKkw3kE9SOuyxq2b4/w
+				1F70EfFTDLi14Tu1U2GdaWhv1CksPhYF/MrmX5bdv2oykorrS+VTloxiVA/qWIPa
+				VdfHWSyLLa28kpQs39RtRVl1WgZ2acKYO48d0rWzm0NrRJ3gnm8W33d3VcDmQImQ
+				0/8HFYlF4SgAvOg5Pdywr8beFrNlSO2oZitc7turdF8cs2FoqHJ1Zb0hwDHbDTyp
+				D0cZoITbAdo3/JqYXM5eRh43Phvt/VjSuQy/haU3DbEfa5JMOsjad2k3WltaMluy
+				3FpD5sQAWqHzAXprcI3tkywJZkMbD/0BU3RTAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+				ggEBAJzEMvntE4fOAoqO18wZUhi7g1HZmHAzTtWLH+5YrvlcOIGRgEqe7g0j9eqU
+				z0Rm98+7LEwaCF+VshS125JNDmAjk2nbOUsJQ1GwtVo/hPrAsI9TZKkMftOqi+ga
+				zi2xUzSvhtE52kUIPm35PLVzKNDAQKGMgdQfcexhBjzBX7Ozt5h7hPaOutpR71t3
+				eTCiukdeCPU6k4+MzuUR1wAXBZUAqo+BOcrZE8/7YgGsUykaPS1YJyturDhgfq4U
+				V7x6Y5Rikv9YMJX2is1jMz31f8AOiDDliT7qLpmuhFX5Ub1TJiXuT3qfExNTh7Dj
+				9r2+SoV9gdVYdUvQjPmDt3ebeiM=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://acesso.ufabc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://acesso.ufabc.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">UFABC - Universidade Federal do ABC</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFABC - Universidade Federal do ABC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFABC - Universidade Federal do ABC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFABC - Universidade Federal do ABC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufabc.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufabc.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Leonardo Monteiro Bersan de Araujo</md:SurName>
+    <md:EmailAddress>contato.cafe@ufabc.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/acm.jordanpublishing.co.uk-shibboleth.xml b/swamid-interfederations-2.0/acm.jordanpublishing.co.uk-shibboleth.xml
new file mode 100644
index 00000000..69eea667
--- /dev/null
+++ b/swamid-interfederations-2.0/acm.jordanpublishing.co.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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://acm.jordanpublishing.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-01-24T14:36: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Jordan Publishing / Family Law</mdui:DisplayName>
+        <mdui:Description xml:lang="en">For access to law reports, case law, commentary, precedents and legal and administrative changes.</mdui:Description>
+        <mdui:Logo height="64" width="252">https://acm.jordanpublishing.co.uk/jordanslogo.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDXDCCAkQCCQDTaBl/liB+TjANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
+						QjEQMA4GA1UECBMHQnJpc3RvbDEQMA4GA1UEBxMHQnJpc3RvbDEYMBYGA1UEChMP
+						Sm9yZGFucyBMaW1pdGVkMSMwIQYDVQQDExphY20uam9yZGFucHVibGlzaGluZy5j
+						by51azAeFw0xNDA0MTExMzI0MDhaFw0zNDA0MDYxMzI0MDhaMHAxCzAJBgNVBAYT
+						AkdCMRAwDgYDVQQIEwdCcmlzdG9sMRAwDgYDVQQHEwdCcmlzdG9sMRgwFgYDVQQK
+						Ew9Kb3JkYW5zIExpbWl0ZWQxIzAhBgNVBAMTGmFjbS5qb3JkYW5wdWJsaXNoaW5n
+						LmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxdNdQ/zoNOHv
+						extaFGXUUXF+9ZtugYQ/crjvLAe5JHtyHf/AVm3U9sKk/4y5GTbkgGAwCsVQJuBL
+						nsTRquAex08OPjmLrz2XVxo6jJ7FPxVTpawIXE8+fsbQeVX2RYteRMDFmXWvESEc
+						D3i3C8O93BoDq5DbtJFTd5UQ2QLxIAmNFo+UWSrQeUIM208NETIEeanzhz3ijeFL
+						B+zrDbU/1JbFLTrHfi1gQ1hU+RuSqm/W/5CJ4DxH7yBvnkHvtPpUKqD2bTMz0hRs
+						xDz1+OIwycpuwDYjoGhahXmYhjy+p4psY4quT/KU3AUiXJXNI2oQxLSvIt5jPUHp
+						FECw7TCzaQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCqh2dvtGPtBBuT+AfL2xhB
+						nhK0hElXSK6GknMKVdABfEO61d0VOxcAg+Hz8aE1bAdyzOej4aWj96Jx6bJWtuGs
+						VrxEIH27lbu5u/MNPfcw8HjsN+lm1gadgsgjOv6+upzyNmaKuGR6B+1hOBlju3W5
+						2J7qMtO7HO8Rksw+kJu2LtJqxtf3HX6/guL21OnlwTTaeBj0mysrt6ZVwRfKhw07
+						2pDkzODd43svRZC2++k6vuhapuiiJaaBEBBnNgP5+nqRDXGbKRNXEIb3LAAfckBP
+						xpTob2Kh4PtL+W5T/4P0CreCM9f6V8GQemPBioiMrU9ihn9qChy/bYvPwRW7D+Rk
+					</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://acm.jordanpublishing.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jordan Publishing Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Jordan Publishing / Family Law</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jordanpublishing.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Withers</md:SurName>
+    <md:EmailAddress>mailto:simon_withers@jordanpublishing.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jordan Publishing technical support</md:GivenName>
+    <md:EmailAddress>mailto:electronic@jordanpublishing.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/activation.glew.org.uk.xml b/swamid-interfederations-2.0/activation.glew.org.uk.xml
new file mode 100644
index 00000000..6437df9b
--- /dev/null
+++ b/swamid-interfederations-2.0/activation.glew.org.uk.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://activation.glew.org.uk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-19T14:20:32Z"/>
+  </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>
+						MIIEvTCCA6WgAwIBAgIJAMGpTOsBYbUJMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIQWJlcmRlZW4xETAPBgNVBAcTCEFiZXJkZWVuMRIw
+						EAYDVQQKEwlDb21wRWROZXQxEDAOBgNVBAsTB1dlYnNpdGUxFDASBgNVBAMTC2ds
+						ZXcub3JnLnVrMSkwJwYJKoZIhvcNAQkBFhpjaGFybGllLmxvdmVAY29tcGVkbmV0
+						LmNvbTAeFw0xMTEwMjExMzE2NDNaFw0yMTEwMjAxMzE2NDNaMIGaMQswCQYDVQQG
+						EwJHQjERMA8GA1UECBMIQWJlcmRlZW4xETAPBgNVBAcTCEFiZXJkZWVuMRIwEAYD
+						VQQKEwlDb21wRWROZXQxEDAOBgNVBAsTB1dlYnNpdGUxFDASBgNVBAMTC2dsZXcu
+						b3JnLnVrMSkwJwYJKoZIhvcNAQkBFhpjaGFybGllLmxvdmVAY29tcGVkbmV0LmNv
+						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALptErmPrNvSJWRV+JOx
+						CUrnVOg6q71UsWhkNjFt/pPmiS5VeKL9sVFHFfdBvA0+i4b77W0BqMXPy4woNWjq
+						6r6fXb45VPVOe1RHogrTaEOtWpS/04bLa/cy0k7voIJMMTdxmWx9X6UGVVfi/x7f
+						8SePI9vaYX4uuWGAlUJzVHQgYNaE8vO9OOh5anjwBWx3CvDgtooqF0cI29HHMKKf
+						YFQHVM10ELDJwcsR4DuwytdKaKgnKmJf99GX3Z7BuidS4VHrR3x4D2Lyp1Kc+ESI
+						I3eL3TyhzCO5ltg9uR4qMHh+qsfhDs5wp80LW4T3c24BuJZhE+dLUQgJQejbnWUU
+						FO8CAwEAAaOCAQIwgf8wHQYDVR0OBBYEFJYiRGyVBAqcDW5InhVOhVhwQScjMIHP
+						BgNVHSMEgccwgcSAFJYiRGyVBAqcDW5InhVOhVhwQScjoYGgpIGdMIGaMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIQWJlcmRlZW4xETAPBgNVBAcTCEFiZXJkZWVuMRIw
+						EAYDVQQKEwlDb21wRWROZXQxEDAOBgNVBAsTB1dlYnNpdGUxFDASBgNVBAMTC2ds
+						ZXcub3JnLnVrMSkwJwYJKoZIhvcNAQkBFhpjaGFybGllLmxvdmVAY29tcGVkbmV0
+						LmNvbYIJAMGpTOsBYbUJMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+						ACDSblvAoquf1aBLjHXRQVzy2644F5iY3FXwxRUIXDj6nEsk6lM/sg0tYXrtcCus
+						KWK1pMdFPmcQxaIuF7JpFvlWwXd5aD+r0+XNaX6gN2FK0uZ2AQUqySn5mXaBxcKC
+						t78Kyp9rx5WwXXGZWKcE2ahRqVwL14q9RPGn8biMxM9nzIiVp0/il6DBl1RGN2ks
+						S7JUXHDy/plUXhPnjzExkfqSFp+Qcb7TXapLUvNWgu938jRrxx8CqpeYc7PGq1/P
+						6mye1BrytmYHdasp9JTppqfD+CLNCrRBRbq+i6sSRbk/o7RDdCcut4+/bOUtFUC9
+						jlT99JDZhXhsU8aXchL/rGQ=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEvTCCA6WgAwIBAgIJAMGpTOsBYbUJMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIQWJlcmRlZW4xETAPBgNVBAcTCEFiZXJkZWVuMRIw
+						EAYDVQQKEwlDb21wRWROZXQxEDAOBgNVBAsTB1dlYnNpdGUxFDASBgNVBAMTC2ds
+						ZXcub3JnLnVrMSkwJwYJKoZIhvcNAQkBFhpjaGFybGllLmxvdmVAY29tcGVkbmV0
+						LmNvbTAeFw0xMTEwMjExMzE2NDNaFw0yMTEwMjAxMzE2NDNaMIGaMQswCQYDVQQG
+						EwJHQjERMA8GA1UECBMIQWJlcmRlZW4xETAPBgNVBAcTCEFiZXJkZWVuMRIwEAYD
+						VQQKEwlDb21wRWROZXQxEDAOBgNVBAsTB1dlYnNpdGUxFDASBgNVBAMTC2dsZXcu
+						b3JnLnVrMSkwJwYJKoZIhvcNAQkBFhpjaGFybGllLmxvdmVAY29tcGVkbmV0LmNv
+						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALptErmPrNvSJWRV+JOx
+						CUrnVOg6q71UsWhkNjFt/pPmiS5VeKL9sVFHFfdBvA0+i4b77W0BqMXPy4woNWjq
+						6r6fXb45VPVOe1RHogrTaEOtWpS/04bLa/cy0k7voIJMMTdxmWx9X6UGVVfi/x7f
+						8SePI9vaYX4uuWGAlUJzVHQgYNaE8vO9OOh5anjwBWx3CvDgtooqF0cI29HHMKKf
+						YFQHVM10ELDJwcsR4DuwytdKaKgnKmJf99GX3Z7BuidS4VHrR3x4D2Lyp1Kc+ESI
+						I3eL3TyhzCO5ltg9uR4qMHh+qsfhDs5wp80LW4T3c24BuJZhE+dLUQgJQejbnWUU
+						FO8CAwEAAaOCAQIwgf8wHQYDVR0OBBYEFJYiRGyVBAqcDW5InhVOhVhwQScjMIHP
+						BgNVHSMEgccwgcSAFJYiRGyVBAqcDW5InhVOhVhwQScjoYGgpIGdMIGaMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIQWJlcmRlZW4xETAPBgNVBAcTCEFiZXJkZWVuMRIw
+						EAYDVQQKEwlDb21wRWROZXQxEDAOBgNVBAsTB1dlYnNpdGUxFDASBgNVBAMTC2ds
+						ZXcub3JnLnVrMSkwJwYJKoZIhvcNAQkBFhpjaGFybGllLmxvdmVAY29tcGVkbmV0
+						LmNvbYIJAMGpTOsBYbUJMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+						ACDSblvAoquf1aBLjHXRQVzy2644F5iY3FXwxRUIXDj6nEsk6lM/sg0tYXrtcCus
+						KWK1pMdFPmcQxaIuF7JpFvlWwXd5aD+r0+XNaX6gN2FK0uZ2AQUqySn5mXaBxcKC
+						t78Kyp9rx5WwXXGZWKcE2ahRqVwL14q9RPGn8biMxM9nzIiVp0/il6DBl1RGN2ks
+						S7JUXHDy/plUXhPnjzExkfqSFp+Qcb7TXapLUvNWgu938jRrxx8CqpeYc7PGq1/P
+						6mye1BrytmYHdasp9JTppqfD+CLNCrRBRbq+i6sSRbk/o7RDdCcut4+/bOUtFUC9
+						jlT99JDZhXhsU8aXchL/rGQ=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://activation.glew.org.uk/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://activation.glew.org.uk/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://activation.glew.org.uk/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://activation.glew.org.uk/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://activation.glew.org.uk/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Charles Love trading as Perfect Papers</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CompEdNet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.compednet.com/</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/adfs.geant.org-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml
new file mode 100644
index 00000000..eed9b4c1
--- /dev/null
+++ b/swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.geant.org/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-08T14:43:52Z">
+      <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" 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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT Web Presence</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Suite of websites and web applications for GÉANT Project.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://adfs.geant.org/PrivacyPolicy/GEANTWebPrivacyPolicy.htm</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>
+						MIIC3jCCAcagAwIBAgIQNCvbUYl4+6RA9jwSRvProjANBgkqhkiG9w0BAQsFADAr
+						MSkwJwYDVQQDEyBBREZTIEVuY3J5cHRpb24gLSBhZGZzLmdlYW50Lm9yZzAeFw0x
+						NTAxMDUxNzI1MThaFw0xNjAxMDUxNzI1MThaMCsxKTAnBgNVBAMTIEFERlMgRW5j
+						cnlwdGlvbiAtIGFkZnMuZ2VhbnQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEA30IY2MRgrSkAm+PyHBlPTQpGTseZO3LHJt1NRUYQrPT2gWW8HEHu
+						U6QsmRhIAcKZd62Uf8zFnFiBuVi7Z8R4DrfQBSp7thb0ecC6w4FHNEvQiUyyPwOP
+						0TSjtL2vKA1qL4REVOTJbjNRWnJuvxURQGSwP7bKT/4Q9qoi0XcNdCPNF70SSToZ
+						6dF72b42f5GaFyfbxyGPuBS1VgPqJ/NpeTaxZ+UReYHvpVPg38LzKL7x3eWbYD4B
+						2x8prA516mb4DS48pAC1/LAkNvAckIdJWYahG5RAukvYSOjh97xKJ0RdhsWERda4
+						JGcncH47u7/rI1ow3yCU7vXI8tM2zHqSfQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+						AQBbaHR5M/Nhl8XqsVzUWhsduIcajWGyUPuNqFqJ5kv+/lxd9GWxdDiy4XoaXqNR
+						PgUB3lm5CkLHZ0Xy8uGU1HtQEF+Ah4isruZX0RKOBWoM9iO9Gwl1arKfeEwUj16K
+						VzM+2z5CSIeWZUu6NAGiwKcDdd7Rce2+GhYvrdeSYpDA+NH0qFFnFo74ZdOCjNQO
+						pMLuTFae/RclQ2dPLq1yIVrqage2PE8akRx1Cb8hLkN1rOeAuGFC3JF2CgVk3A7n
+						BJHpWh6OHmU5BbvqkdGVyOn4dh725m13y28sBMWtbxetuKg8+4ABRVT4d3Yoo4Lp
+						ZqgR2NgRxpThAP74Xt3nJL9c
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC2DCCAcCgAwIBAgIQHEekTp8+u7dHPjnacxhaKTANBgkqhkiG9w0BAQsFADAo
+						MSYwJAYDVQQDEx1BREZTIFNpZ25pbmcgLSBhZGZzLmdlYW50Lm9yZzAeFw0xNTAx
+						MDUxNzI1MTdaFw0xNjAxMDUxNzI1MTdaMCgxJjAkBgNVBAMTHUFERlMgU2lnbmlu
+						ZyAtIGFkZnMuZ2VhbnQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAyabL1Th/fRkPS/7ypS2iSRe3FvnLKV38idwvfNX/KB7DpSYpF/Xb0aMmn5Y6
+						H83FMhHo+Jy954JTneFSgeETb9K/nakOKO6EmwPJrTuQ2C533aU5ulguyrI/hzzd
+						KoHBke+UcPEKYEBvGjQwQcqcKtzed61ZUjBxBWhm2UAakXZs8QqHSA9E0a46mRbO
+						Dd0qgPwJ+vB81iNFnNo7zKkKu/L29ISmV/lv8NXrQIimAZCbSUd1Mux2pK1UoGJw
+						IjkyLZNQknKuaia+Hg1DdEtiXQdomoedFNCTbIyiBdCcKit4fw/mfIVn0nDj0NZe
+						39z9L0VLnzfouS4tJpL7ftPa+QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBgy6rX
+						5kOhESj8LQB8iphzbKYfOYCf9f0yjPXpYT2YOM/qQVO6F+W/zt+OrEact0rCgR8a
+						/XzJoyP96nfFcqajDRoYdodSn0d+k+BSPZur1V8MHa2J/sRWSVhrzmUdkT5HkQ9O
+						WJSmyuwzB/2IXOUL2Cx0PsWXYINRk3zDDDlQ6o6tWQTQm2S/RNWJ3BUk1IWuFqit
+						Xdb7PE/rG+xYgvoMi81wQHHCZfbuljr1Fl5eaoV09oMIKezaT646Wk10pRwVS51O
+						zvoED8r9o9M5S2Ii+IVBO+Cj1ZRcn+HhBvPyu091w5ApZKr2+hnf4HOfiu58+Yj+
+						qUUDFVgtu+n/JlJy
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.geant.org/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.geant.org/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://adfs.geant.org/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.geant.org/adfs/ls/" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">GÉANT Web Presence</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
+				Suite of websites and web applications for GÉANT Project.
+			</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 Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>GÉANT Ltd. Support</md:GivenName>
+    <md:EmailAddress>mailto:DANTEITSupport@dante.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>GÉANT Ltd. IT</md:GivenName>
+    <md:EmailAddress>mailto:it@dante.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml
new file mode 100644
index 00000000..6fff4fe6
--- /dev/null
+++ b/swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.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>
+  </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">Technische Universiteit Eindhoven</mdui:Description>
+        <mdui:Logo height="60" width="120">https://static.surfconext.nl/media/idp/tue.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">Eindhoven University of Technology Technische Universiteit Eindhoven TUE</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">Eindhoven University of Technology 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/094f85b774f9b4334638677b70d5755c"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Technische Universiteit Eindhoven</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Technische Universiteit Eindhoven</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Technische Universiteit Eindhoven</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.surffederatie.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:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs.yz.yamagata-u.ac.jp-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.yz.yamagata-u.ac.jp-adfs-services-trust.xml
new file mode 100644
index 00000000..c1844a6d
--- /dev/null
+++ b/swamid-interfederations-2.0/adfs.yz.yamagata-u.ac.jp-adfs-services-trust.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.yz.yamagata-u.ac.jp/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.gakunin.jp" registrationInstant="2012-02-22T04:06:22Z">
+      <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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1: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://adfs.yz.yamagata-u.ac.jp/adfs/adfs/ls/IdpInitiatedSignOn.aspx" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SharePoint Foundation Service</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ja">シェアポイントサービス</mdui:DisplayName>
+        <mdui:Description xml:lang="ja">山形大学が提供するWindows系OSで動作するSPへの認証連携サービス．ユーザ向けサービスとしては，Sharepoint Foundationやe-サイエンスプラットフォームの提供する予定です．</mdui:Description>
+        <mdui:InformationURL xml:lang="ja">https://adfs.yz.yamagata-u.ac.jp/</mdui:InformationURL>
+        <mdui:Logo height="43" width="120">https://a.yamagata-u.ac.jp/amenity/img/federationbanner.aspx</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIE1zCCA7+gAwIBAgIIQS0FCDHAioYwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UE
+BhMCSlAxETAPBgNVBAcTCEFjYWRlbWUyMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0
+aXR1dGUgb2YgSW5mb3JtYXRpY3MxDTALBgNVBAsTBFVQS0kxIDAeBgNVBAsTF05J
+SSBPcGVuIERvbWFpbiBDQSAtIEcyMB4XDTE0MDIyNjA3NTMwM1oXDTE2MDMyNzA4
+MDMwM1owgYIxCzAJBgNVBAYTAkpQMREwDwYDVQQHEwhBY2FkZW1lMjEcMBoGA1UE
+ChMTWWFtYWdhdGEgVW5pdmVyc2l0eTEfMB0GA1UECxMWRmFjdWx0eSBvZiBFbmdp
+bmVlcmluZzEhMB8GA1UEAxMYYWRmcy55ei55YW1hZ2F0YS11LmFjLmpwMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Pt+7VATkbKs+83jX7yK4xW+aIV
+71fsrId64IUFGSzeLcg8DbPIdeIdcJFfY4NZR15t8hU0IjMDx0D0Qz2oxLpZz1OD
+dQz1kZuN2hmaAGL9m4b6taRPl1WPcG7PrEVqAqUqQbmfHvt/8vEiVyDY5Mtmatgn
+tw4Av2fFe3uM1XuPbsNArQ7KzH1sNmAE9AIYEQv93fFOIA97t1RTfOVnttMfzQS/
+MyR0hr786ZZzMOIM4Ustg+VP4yWj0+eO039xKiW3VnA0KUNi+KlL0FldKBp2cdI5
+J7eMIFdzYRFRRxrOWSYfyhtRBK2gKMil4838RDaMXNUwO737UYD2h+wwtwIDAQAB
+o4IBUzCCAU8wDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0G
+A1UdDgQWBBTfko5e2B2zNVY0VDLQIwwp9TmZ8zAfBgNVHSMEGDAWgBR7Cgf3GMqM
+DtbavFCAbCxHAtEN+zAjBgNVHREEHDAaghhhZGZzLnl6LnlhbWFnYXRhLXUuYWMu
+anAwZgYDVR0gBF8wXTBNBgoqgwiMnB4BAgIBMD8wPQYIKwYBBQUHAgEWMWh0dHBz
+Oi8vcmVwbzEuc2Vjb210cnVzdC5uZXQvc3BjcHAvY3BzL2luZGV4Lmh0bWwwDAYK
+KoMIjJsbZIcFATBIBgNVHR8EQTA/MD2gO6A5hjdodHRwOi8vcmVwbzEuc2Vjb210
+cnVzdC5uZXQvc3BwY2EvbmlpL29kY2EyL2Z1bGxjcmwuY3JsMBEGCWCGSAGG+EIB
+AQQEAwIGQDANBgkqhkiG9w0BAQUFAAOCAQEANlm58vz9JAzddz3PM/nndM5k948P
+ySIoBYycZ5WzvKok5cq71x9uwZ50ZWAt3ru8p/ARLK/AkirrgWpcu6Zz6CxOR8WK
+GBSjDsiLJ1/u2CW3i+G1pCZHtw6PfLVbBTFJTQUoPHb6Gq06w7XkK054/lb00h7T
+12nVVteu0PKFn4DtRtyTC9VT/EdPwocGQNHcgtzuUR+P/EpyKJnIIqvStueFoMs5
+FqvmriGO8NgObxRz1X8x1w5jx34iIXCberb2U8Kx1Cb4gO7EJAFx0nCyvHOaUJlt
+CpjWNdmP/KMtEP9w4Of6RWQudObp2gGhtUfrlP7devqnJsZjmIZR3R5kvg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.yz.yamagata-u.ac.jp/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.yz.yamagata-u.ac.jp/adfs/ls/"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.yz.yamagata-u.ac.jp/adfs/ls/" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adfs.yz.yamagata-u.ac.jp/adfs/ls/" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.yz.yamagata-u.ac.jp/adfs/ls/" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adfs.yz.yamagata-u.ac.jp/adfs/ls/" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adfs.yz.yamagata-u.ac.jp/adfs/ls/" index="5"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="ja">シェアポイントサービス</md:ServiceName>
+      <md:ServiceName xml:lang="en">SharePoint Foundation Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="ja">山形大学が提供するWindows系OSで動作するSPへの認証連携サービス．ユーザ向けサービスとしては，Sharepoint Foundationやe-サイエンスプラットフォームの提供する予定です．</md:ServiceDescription>
+      <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="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" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Yamagata University</md:OrganizationName>
+    <md:OrganizationName xml:lang="ja">山形大学</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SharePoint Foundation Service</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="ja">シェアポイントサービス</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.yamagata-u.ac.jp/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tomohiro</md:GivenName>
+    <md:SurName>Ito</md:SurName>
+    <md:EmailAddress>mailto:tomohiro@yz.yamagata-u.ac.jp</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs01.fhs.se-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs01.fhs.se-adfs-services-trust.xml
new file mode 100644
index 00000000..aed131bd
--- /dev/null
+++ b/swamid-interfederations-2.0/adfs01.fhs.se-adfs-services-trust.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs01.fhs.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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhs.se</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.fhs.se</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">op.fhs.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Försvarshögskolan</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Swedish National Defence College</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Försvarshögskolan</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Swedish National Defence College</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.fhs.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.fhs.se/en/</mdui:InformationURL>
+        <mdui:Logo height="118" width="106" xml:lang="sv">https://www.fhs.se/files/sidhuvud/logotyp-sv.jpg</mdui:Logo>
+        <mdui:Logo height="116" width="103" xml:lang="en">https://www.fhs.se/files/sidhuvud/logotyp-en.jpg</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">fhs</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">fhs</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>fhs.se</mdui:DomainHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIQFZiyu9vx3bVBXRoeCQUILTANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBhZGZzMDEuZmhzLnNlMB4XDTE0MTIyMzIxNDgwN1oXDTE1MTIyMzIxNDgwN1owKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2+ePiq76UBNnhcXAGacPiTg6kLX5OAmUM0ehzmMYLEywp/eH65OjzD6Gz0mYxXL9xCw9U/m61LGhVLzZt7ZmYPs8SlxMHzsjawrGp5gsFXdo99nwbxGElbCYlJiS7Y+GMkXUtAIW3N4MoktO9j7Q7Iu4f6bnOkRLgdGXkvv2RTiD5CaOodAnzdwncVmFORk3ued1ZeS0S4AyFJFC4RqYmDrvU3eLyCdHQZoZ3SO1RkSicpTHibOaYZ1pP8keEHJ2aP63iw1WFF49cIucVcyeJ+1SBkorXPKBKhw5BJP17USD290ZWzPmTXLLieHyYKINxK3xe1xCESVLxJJgnca78CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAZDl80K94WjYpIjpa2q6FZ7ZaLTGA7ffW5gdQfPcbJbCkuWCmCsCmOwDmFFZ5Gb+4tKJxHF2Z+Tzt8yIY/OCg0Y61lerXdoNC1bYahnUDDfU11m441vsCAyymftBZsOewupXdcyh3NPiduOlJd8iXybZ6BZaUoVUjfkFAmjkii+pJB+H+gXo2CBNksAXhUAbk4es/1FSSNdXGrDG8qj91uX+l69oQK1ERIpux2ALEv/j/zBNYNQgYiYPyP+/b06/MUTxNbFC4LGb3XcIk0OqOauhoZcoEcTLcmPycOYs8hJl80lWSEGhl9+qXhoxNpkh4ucYxvDArCsCgYQZd/HhN6w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQKEGE7N1PhqND4Izv6Nl9tzANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTE0MDExMjE5MjYwMloXDTE1MDExMjE5MjYwMlowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgssWOg27ZeOAIofyLaYIxZxFPVyWVMoX8uaAeM0mYEj+ENT1pM4+G7sGNwKEIyOST6Lu7L7BMMku8jFF6Rt2GgV7dWDgWa2nNQ3H3XDQIH4ggZTmibrfBoyEpgNwuPhCqW+n4sr19jmO5aYs3elwSc4ogiaEPQy+CDpBKq9wO4hD4YOuD6jBtmkySvkG/rE7BSkC/fxg6qeNFdC4xVhkJZuU+tJRbBIHznqAD6kErdgHlM82sKoTN6q1dZk9AkE8ZwmI9T1s2g2eY1cB77Px7rqXCvbA2+Tjt2I3f8m99JxY5gHedR7UJfKLBPlo3V0rMJZlFfGOGKR8z9AphA/G0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAtbBphHKTw16aTAZ1ihlZQNnT3UgVC2JwlnZD16iczLa+96NiBNwu6il9K7UwjA/JD6t7dNWoVXEJTREGJUs9IzN1XP7PwqU8zlIiug8p7q8Efit8JppO1vmgpofom+OVxZ1A8vc5wmsuvwLoEQGu0Y/3JawPsaDvA7wdF+Bnqo+DTVCIe3wOGAY6D2C4XIvYZirz3cFoTd4BrGLx/dfRkmBmIeDJ39G1DcRfAZF59b1c7n4OeEhq2dg7yKP1ql0e1bKOKKqW0wXStNHamceJWU/hbCNid87rKpvTMvH8ClkC2pf3R2/bR27VuhWyAbPTp1+hhIJKmCWTkEtt/JOg4w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQYSuOi8k52qFDiHIcmLzhUzANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTE0MTIyMzIxNDgxMVoXDTE1MTIyMzIxNDgxMVowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKeZpLVFfRtz3BFIEKaCOcf0w3041Vna4JAhxKT9hkhMW5TSh2S7hcgBiRm6Q2olmBtc+KMN9ReJT1ZJzQUa27qaGRepO/M+isJk4QqL9zOX/BpYFEWTRYMLlqqukZBhtwdtluIMCJlAClccRSikCx+bGN+fcPwfrv3T2y+C+MMp8GIN/QWJf97GEP5XR9VooItR8+nkUm1FOkvKMr5xFwZfilXQTzDer3Z42yMYRpr8rw7QdMJP11A7v7NIZTYRQIU+Qi0uPsvRI5FI7IG3NWyepslS1vwjU/dpKeBUYLQwwRxvV09YX+ULSKpClm2oZ7LuE/vt7Bok6vnPa3TG+i0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAktHUw5HNOOH/ETVIeAgdi5FXq5e8maX8Qe5vFsWRWPTP9MygRwNajY07XpXQmw2CKbAzY6ZD2RoA7g9swBpCcNYuJmAnA3LtyFiRrog/+XzWeRt7tbqDjiYZiBdVD84JbfVMD3q0Pi4iLn+KPAmYajYAzftf1vKr/fvwFt2D2eR+sXefEmcwNPSFFma0umEgSajxiN4gdTA3ZMTNV1J5tv1cwb9TYx0mDHP+FCwsEE2bHsDk5CDBWpgFVvEiQwfra1amz+BIPWG5Nln9bedfE0BjdGH5OK424DBwBTygzBV8OM9jB7dOcaA+0K0/UduM+ka42XxP7WFrq3VKmGfCbg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs01.fhs.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs01.fhs.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs01.fhs.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:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://adfs01.fhs.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs01.fhs.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs01.fhs.se/adfs/ls/"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="E-Mail Address" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Given Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="UPN" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Common Name" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x E-Mail Address" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x UPN" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Role" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Surname" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="PPID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name ID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication time stamp" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication method" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only group SID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Windows account name" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="eduPersonScopedAffiliation" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Försvarshögskolan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Försvarshögskolan</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish National Defence College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.fhs.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Swedish National Defence College</md:Company>
+    <md:SurName>FHS IT Helpdesk</md:SurName>
+    <md:EmailAddress>helpdesk@fhs.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 55342545</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Swedish National Defence College</md:Company>
+    <md:SurName>FHS IT Helpdesk</md:SurName>
+    <md:EmailAddress>helpdesk@fhs.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 55342545</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Swedish National Defence College</md:Company>
+    <md:SurName>FHS IT Helpdesk</md:SurName>
+    <md:EmailAddress>helpdesk@fhs.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 08 55342545</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/admin.safetynet.rmplc.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/admin.safetynet.rmplc.co.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..287d8199
--- /dev/null
+++ b/swamid-interfederations-2.0/admin.safetynet.rmplc.co.uk-shibboleth-sp.xml
@@ -0,0 +1,89 @@
+<?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://admin.safetynet.rmplc.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://admin.safetynet.rmplc.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>
+						MIIDGDCCAgCgAwIBAgIJAIDKIKpmE2tBMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG2FkbWluLnNhZmV0eW5ldC5ybXBsYy5jby51azAeFw0xMDA0MDgxNjE2MTha
+						Fw0yMDA0MDUxNjE2MThaMCYxJDAiBgNVBAMTG2FkbWluLnNhZmV0eW5ldC5ybXBs
+						Yy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyO69kuQy4+
+						R7W0KgA21wY7EnbY2qr8K1AKfX87jvsfDX5Jg+XwifaI/8f8sIju9jlgg0S2ju+M
+						uWQyCYV6cCMp790MEXXaOR0PiAkrallrkYg/+FbP7+flmOrPhj6UWCAc80ZWJ8wx
+						U6Un+UpDpmhRrQWjOn0sOW6PvkbZlRrEtW6XJ2PfhOCHHfAJIcB/r4frQFvmGBk1
+						6e24W46xEPi2gznxM9MRm/MMBnFHBzHlpgu+QmL+gBI6OQ0Gr1nmZgcTJqEJCahk
+						dp51SjegGKmXXWAdV7pGYkoRrwYH6TryXNaHUXQn0zoS+aa1kZIf0dVp0S508go6
+						aqwe92WWsAcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbYWRtaW4uc2FmZXR5bmV0LnJt
+						cGxjLmNvLnVrMB0GA1UdDgQWBBTiUv6qHBxNTHW11t8mP9SXPRvMmjANBgkqhkiG
+						9w0BAQUFAAOCAQEAhVafLlFnznxyNY5Zls8IiCN2kAqwUN5iBuVx2Q749LcVHlGy
+						NtTZVpLWcrZsklTl2mBJuGI5XjqjuEu/UJtaRx0p6oC32Pg2R8/McMcJjLtbwA9X
+						pIZsuOfARLq0AFS9ncrgZtVrua9YErJSWSCUkzZgJTu/1Aelc1Dlojdmp22GH4Rn
+						Fr1hRdDgtzpAwdBpxPdai7Pdaf47QVRSgfDjCuJ2zJopboYAbnk6UAuiLWDuLtcB
+						o8UiVcMPP/vvRio3IzTVoEKAmb8/EENkXRSR+we7CKNAQhZBvTvC2oWruki4UmMK
+						aFvLcsb+dVUZ5xAnv9teHQR18B9PVW+1Se6k3A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDGDCCAgCgAwIBAgIJAIDKIKpmE2tBMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG2FkbWluLnNhZmV0eW5ldC5ybXBsYy5jby51azAeFw0xMDA0MDgxNjE2MTha
+						Fw0yMDA0MDUxNjE2MThaMCYxJDAiBgNVBAMTG2FkbWluLnNhZmV0eW5ldC5ybXBs
+						Yy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyO69kuQy4+
+						R7W0KgA21wY7EnbY2qr8K1AKfX87jvsfDX5Jg+XwifaI/8f8sIju9jlgg0S2ju+M
+						uWQyCYV6cCMp790MEXXaOR0PiAkrallrkYg/+FbP7+flmOrPhj6UWCAc80ZWJ8wx
+						U6Un+UpDpmhRrQWjOn0sOW6PvkbZlRrEtW6XJ2PfhOCHHfAJIcB/r4frQFvmGBk1
+						6e24W46xEPi2gznxM9MRm/MMBnFHBzHlpgu+QmL+gBI6OQ0Gr1nmZgcTJqEJCahk
+						dp51SjegGKmXXWAdV7pGYkoRrwYH6TryXNaHUXQn0zoS+aa1kZIf0dVp0S508go6
+						aqwe92WWsAcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbYWRtaW4uc2FmZXR5bmV0LnJt
+						cGxjLmNvLnVrMB0GA1UdDgQWBBTiUv6qHBxNTHW11t8mP9SXPRvMmjANBgkqhkiG
+						9w0BAQUFAAOCAQEAhVafLlFnznxyNY5Zls8IiCN2kAqwUN5iBuVx2Q749LcVHlGy
+						NtTZVpLWcrZsklTl2mBJuGI5XjqjuEu/UJtaRx0p6oC32Pg2R8/McMcJjLtbwA9X
+						pIZsuOfARLq0AFS9ncrgZtVrua9YErJSWSCUkzZgJTu/1Aelc1Dlojdmp22GH4Rn
+						Fr1hRdDgtzpAwdBpxPdai7Pdaf47QVRSgfDjCuJ2zJopboYAbnk6UAuiLWDuLtcB
+						o8UiVcMPP/vvRio3IzTVoEKAmb8/EENkXRSR+we7CKNAQhZBvTvC2oWruki4UmMK
+						aFvLcsb+dVUZ5xAnv9teHQR18B9PVW+1Se6k3A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://admin.safetynet.rmplc.co.uk/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 Safetynet</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/admin.webfiltering.ja.net-shibboleth-sp.xml b/swamid-interfederations-2.0/admin.webfiltering.ja.net-shibboleth-sp.xml
new file mode 100644
index 00000000..237fc11b
--- /dev/null
+++ b/swamid-interfederations-2.0/admin.webfiltering.ja.net-shibboleth-sp.xml
@@ -0,0 +1,89 @@
+<?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://admin.webfiltering.ja.net/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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://admin.webfiltering.ja.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>
+						MIIDGDCCAgCgAwIBAgIJAIDKIKpmE2tBMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG2FkbWluLnNhZmV0eW5ldC5ybXBsYy5jby51azAeFw0xMDA0MDgxNjE2MTha
+						Fw0yMDA0MDUxNjE2MThaMCYxJDAiBgNVBAMTG2FkbWluLnNhZmV0eW5ldC5ybXBs
+						Yy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyO69kuQy4+
+						R7W0KgA21wY7EnbY2qr8K1AKfX87jvsfDX5Jg+XwifaI/8f8sIju9jlgg0S2ju+M
+						uWQyCYV6cCMp790MEXXaOR0PiAkrallrkYg/+FbP7+flmOrPhj6UWCAc80ZWJ8wx
+						U6Un+UpDpmhRrQWjOn0sOW6PvkbZlRrEtW6XJ2PfhOCHHfAJIcB/r4frQFvmGBk1
+						6e24W46xEPi2gznxM9MRm/MMBnFHBzHlpgu+QmL+gBI6OQ0Gr1nmZgcTJqEJCahk
+						dp51SjegGKmXXWAdV7pGYkoRrwYH6TryXNaHUXQn0zoS+aa1kZIf0dVp0S508go6
+						aqwe92WWsAcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbYWRtaW4uc2FmZXR5bmV0LnJt
+						cGxjLmNvLnVrMB0GA1UdDgQWBBTiUv6qHBxNTHW11t8mP9SXPRvMmjANBgkqhkiG
+						9w0BAQUFAAOCAQEAhVafLlFnznxyNY5Zls8IiCN2kAqwUN5iBuVx2Q749LcVHlGy
+						NtTZVpLWcrZsklTl2mBJuGI5XjqjuEu/UJtaRx0p6oC32Pg2R8/McMcJjLtbwA9X
+						pIZsuOfARLq0AFS9ncrgZtVrua9YErJSWSCUkzZgJTu/1Aelc1Dlojdmp22GH4Rn
+						Fr1hRdDgtzpAwdBpxPdai7Pdaf47QVRSgfDjCuJ2zJopboYAbnk6UAuiLWDuLtcB
+						o8UiVcMPP/vvRio3IzTVoEKAmb8/EENkXRSR+we7CKNAQhZBvTvC2oWruki4UmMK
+						aFvLcsb+dVUZ5xAnv9teHQR18B9PVW+1Se6k3A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDGDCCAgCgAwIBAgIJAIDKIKpmE2tBMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG2FkbWluLnNhZmV0eW5ldC5ybXBsYy5jby51azAeFw0xMDA0MDgxNjE2MTha
+						Fw0yMDA0MDUxNjE2MThaMCYxJDAiBgNVBAMTG2FkbWluLnNhZmV0eW5ldC5ybXBs
+						Yy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyO69kuQy4+
+						R7W0KgA21wY7EnbY2qr8K1AKfX87jvsfDX5Jg+XwifaI/8f8sIju9jlgg0S2ju+M
+						uWQyCYV6cCMp790MEXXaOR0PiAkrallrkYg/+FbP7+flmOrPhj6UWCAc80ZWJ8wx
+						U6Un+UpDpmhRrQWjOn0sOW6PvkbZlRrEtW6XJ2PfhOCHHfAJIcB/r4frQFvmGBk1
+						6e24W46xEPi2gznxM9MRm/MMBnFHBzHlpgu+QmL+gBI6OQ0Gr1nmZgcTJqEJCahk
+						dp51SjegGKmXXWAdV7pGYkoRrwYH6TryXNaHUXQn0zoS+aa1kZIf0dVp0S508go6
+						aqwe92WWsAcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbYWRtaW4uc2FmZXR5bmV0LnJt
+						cGxjLmNvLnVrMB0GA1UdDgQWBBTiUv6qHBxNTHW11t8mP9SXPRvMmjANBgkqhkiG
+						9w0BAQUFAAOCAQEAhVafLlFnznxyNY5Zls8IiCN2kAqwUN5iBuVx2Q749LcVHlGy
+						NtTZVpLWcrZsklTl2mBJuGI5XjqjuEu/UJtaRx0p6oC32Pg2R8/McMcJjLtbwA9X
+						pIZsuOfARLq0AFS9ncrgZtVrua9YErJSWSCUkzZgJTu/1Aelc1Dlojdmp22GH4Rn
+						Fr1hRdDgtzpAwdBpxPdai7Pdaf47QVRSgfDjCuJ2zJopboYAbnk6UAuiLWDuLtcB
+						o8UiVcMPP/vvRio3IzTVoEKAmb8/EENkXRSR+we7CKNAQhZBvTvC2oWruki4UmMK
+						aFvLcsb+dVUZ5xAnv9teHQR18B9PVW+1Se6k3A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://admin.webfiltering.ja.net/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 Safetynet JANET</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/adss-dev.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/adss-dev.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..f8be6b04
--- /dev/null
+++ b/swamid-interfederations-2.0/adss-dev.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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://adss-dev.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="2013-09-09T12:02: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://adss-dev.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>
+						MIIC+jCCAeKgAwIBAgIJALRbL0SFoPlaMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEWFkc3MtZGV2Lm94LmFjLnVrMB4XDTEzMDkwNjA1MTUzMVoXDTIzMDkwNDA1
+						MTUzMVowHDEaMBgGA1UEAxMRYWRzcy1kZXYub3guYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCuQ0pIlwNnrPL+HVvbWT2UQER/zvq7pmk06hz2
+						0LN1db0xAcMSjM25TMDk7HyCMRF9ccJh6TOPiHJMoWo9cTwkIWS5SMHEvwDXoSlT
+						yTMSNnlDvur/DUrzCUe5MHRwRcVPZK5Y+sZ8CFA6Ce0wMsdmbnibV/ENv/LGLHDj
+						iuoY28nn95SHAcbWFluckH6mx1WN+nba396qXfU4T9cH3kwNAjcltO4vN4OK1jX4
+						GCUVyrMtpcoqIPvUOZkGCq5oNQQMTKv1E7eDhhqk/Fd8wtfaYiZLhZZ4yLfEMOnl
+						xHzdWZHrMSWASKD78O5XBy2yHqsoZezZA1rpRuTCbUPyi3B/AgMBAAGjPzA9MBwG
+						A1UdEQQVMBOCEWFkc3MtZGV2Lm94LmFjLnVrMB0GA1UdDgQWBBRRqlphIc05j1bl
+						Jyp9PhFAS9c3KDANBgkqhkiG9w0BAQUFAAOCAQEAl5wymOP4JlgSCsa9JlkMvHRl
+						smc44HBXFPXfc4Tu1wDrkoWVxc0fQN0uF/U02AumJA7uDlENcGJ+/NHKBIA6m0wM
+						kLKaebcdxB/LBpPV2rYqfpbCklGZ9Tq09QTzPqZiiTwxbDennlcajal78OkTizdV
+						o7pu6V9WbjiAoAoyjGl3ab+YsZXw382uG2kH79JVgc+i8Mezx1lFCVvn7aoLGFdf
+						BcA77aH4dkhHyffN7L86jVDiZQ0RcfnsC34+vtvAcbt6+TFDDSCpANO1tOvoLirT
+						Z9iObgHErexwXys19e20DiNVrI9DE/xKHWZfIATT4J2DUMICKHJjqbdpOE7K4w==
+					</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://adss-dev.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-dev.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://adss-dev.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://adss-dev.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss-dev.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 development ADSS site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rob</md:GivenName>
+    <md:SurName>Hebron</md:SurName>
+    <md:EmailAddress>mailto:rob.hebron@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adss-sup.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/adss-sup.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..b8369711
--- /dev/null
+++ b/swamid-interfederations-2.0/adss-sup.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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://adss-sup.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="2014-12-03T11:05: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://adss-sup.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>
+						MIIC+jCCAeKgAwIBAgIJAKEmzYEyf7xxMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEWFkc3Mtc3VwLm94LmFjLnVrMB4XDTE0MTEyNzEyMjkyMVoXDTI0MTEyNDEy
+						MjkyMVowHDEaMBgGA1UEAxMRYWRzcy1zdXAub3guYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDSHfFTxy8aBmmoP8QKlFuozdECVsvolCQRUFps
+						dWeBq4LERrj68DTYRT8YDzK5IJ8tHQ4L3eEuOS1399MRV0BqkbjkVwipZPb8gTle
+						Ptj4jVsxk2/IshdO2HyRELiIvKV5DPmy059aLA7lx+20V3hQq++nb6GfhmBTQZ/b
+						dk9VFMMBfDnKvMjLM2jFUVO/lFSmbp+kkYybNQL6nt//KrQbrXDA3q/nSBXUHIgY
+						HD4Oziu946yM0y7awaLOGvlP2yzwGU3KpJdz53Fa4E63wiuG3eZAxz+1esNC1U14
+						LSx2RZiglivYkfkBku4X6WrqYiZiHBVsuK/4JVxpUjorBxVRAgMBAAGjPzA9MBwG
+						A1UdEQQVMBOCEWFkc3Mtc3VwLm94LmFjLnVrMB0GA1UdDgQWBBSDEebTgaTcHS2G
+						70WlBWHcgTCoizANBgkqhkiG9w0BAQUFAAOCAQEAj8hvwebVXE+tNgCiDt5LoyoY
+						P075Wguikjxn3vEmkTDcrjTT8K3bo0hTClf0hBHEQqATpR+2L8qbNe5bJSuUYUdV
+						/aMv8xwIyjkFF/9yxQTK2gCO8iw4mHWWVLAiu/wq+eidx7WtIO7PvhCO05u6muy3
+						nwlvQwyrn5SdmwRv5N2dBUu3iGDZABy47hDNQ1Rgtf+58TU9Cxe1mtEubuJ4k6hh
+						a5U4QaC4zu1wkpVeYKNzyRAL19XnE+faYuOuRPrQazh9df8EFKU4i55ZmWGUjQNZ
+						cNXil4aUZipFz0PcWQcen8w+6nc1blUDfD+1yYiFQTWaP0ZSICFJZFzMKX6bYQ==
+					</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://adss-sup.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-sup.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://adss-sup.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://adss-sup.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss-sup.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 Staff ADSS support site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rob</md:GivenName>
+    <md:SurName>Hebron</md:SurName>
+    <md:EmailAddress>mailto:rob.hebron@it.ox.ac.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adss-tmp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/adss-tmp.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..ded4cf59
--- /dev/null
+++ b/swamid-interfederations-2.0/adss-tmp.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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://adss-tmp.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="2014-08-14T13:53: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://adss-tmp.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>
+						MIIC+jCCAeKgAwIBAgIJALGFNW/JEWeXMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEWFkc3MtdG1wLm94LmFjLnVrMB4XDTE0MDgwNjE0MjU0NloXDTI0MDgwMzE0
+						MjU0NlowHDEaMBgGA1UEAxMRYWRzcy10bXAub3guYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCzt7iOu1lzJd5ltK+P6HyoJ9alCZnHvLhwxcFq
+						xrKG7/lSfhFsapOTrv+BO31HFx1TSJ+JhnjjZwS6FnIG6fadfU16TIiGkqxUHO4m
+						/bdqpQDtCa0cgBH6wUzUq1ErZgOswoOnatg3axFSUKQ0KEU6OSmhscH30Yvzd/OL
+						If8cD43EDmB55h34cAIZxIYb6mtWAKhun21+Qcxwh1pqVHT2dTdt1X0gmgUzUQ2d
+						58nezP2XkNJ5wbyl4onuZgVu1bwzqR3JjzHaCzRLS5aWdmit0DToRBgaMVKYPOqm
+						GN6mqJrvOZMhadp82C0UAYBtSZ+AqU/03frpmLUXvBtr52b9AgMBAAGjPzA9MBwG
+						A1UdEQQVMBOCEWFkc3MtdG1wLm94LmFjLnVrMB0GA1UdDgQWBBTf3EmuVSQjziD+
+						xl5znVbeA/b0EjANBgkqhkiG9w0BAQUFAAOCAQEAlwc9kHzQGhlBJtoST9UtlIS8
+						K4vZ7Sg/SLJYb59AkDHGu748k6s3IDGpjr6sbm+Td4WcvyDQOPfszraIIgcA1Fa8
+						YaLMwCVYRgD4dakLdQ6jh6RkZ45jEBGZwyx2itwmVzYI8S4jJ6nlIaOqsKeW78wV
+						gA8keRddbVG5zr2LDEzeWKNafqtkr9O1KACtGmMIG279aOVuMgNrmCT9RKwMRFAT
+						DyE4qiQqxUS32OHcB0vGKx0qPbSRMbrqdMNtkfWR3e/lVDGkX0QfgX2+ryu7UaVH
+						DVEWEa+6dxT8M8Bs1Bfw0K1QCqDMt5/r2wZ/xc8nChb6cVuojFF/JzXiUbi9dA==
+					</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://adss-tmp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-tmp.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://adss-tmp.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://adss-tmp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss-tmp.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 ADSS Temporary Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adss-uat.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/adss-uat.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..feed44b6
--- /dev/null
+++ b/swamid-interfederations-2.0/adss-uat.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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://adss-uat.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="2013-09-12T10:23: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://adss-uat.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>
+						MIIC+jCCAeKgAwIBAgIJALQdi5XV31KTMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEWFkc3MtdWF0Lm94LmFjLnVrMB4XDTEzMDkxMTA3MTQzNloXDTIzMDkwOTA3
+						MTQzNlowHDEaMBgGA1UEAxMRYWRzcy11YXQub3guYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQC6Be+SE7LxJuoJxu2sflorJFlkT4xKn1zo2PMv
+						cIDzeVYNmFGlPNCzF0ZRLMOfAgRuNwN1H3rToOo2P5+tQXxEAAkfe0h3aYd1OSEs
+						m0IrqeEZbXzZZyNRpxxTbszzH930Hs0YBCp7X2PlFR9eNeNWeMDddxzWf0iN3Mzl
+						rAB/bpQi0EpPJcr+wg7kNOe1RUI34lbig6bIABEEEIACmn4M8wXbJdIjtHvaaLGk
+						qVeN43D2tdQnzJHVq+iqZ5JbVjQZwUnwlycCV92v16mcdRCTjievh8cdTexdEsbr
+						CouifcNlSC6sTjCRs9wffik+QVbJ9cZLy+Vswwts3HaBMmU/AgMBAAGjPzA9MBwG
+						A1UdEQQVMBOCEWFkc3MtdWF0Lm94LmFjLnVrMB0GA1UdDgQWBBQdCm5MOKCVW4e3
+						lBzfalXj1sFx7DANBgkqhkiG9w0BAQUFAAOCAQEAOCEvxqL0Nn+YCabdtyak0EUK
+						zKYIdL5jkC8cmtpVzXDasIlMjh1Dm5HcKEZ6z4EXykT7Sg5CK3f3eyDO3mRQRbML
+						A0KSM7BG72WDtuyitJfT5huXgmt90B1qLXRdWb0WGnaempYecUPzLPV8Zbbup/cE
+						XLppYAJLYiLwm4VicU/+LbTigqgZtCEnKKUGPuINpo6RWKUd9LaO4bgY2+lJMnlx
+						oQtr3QoYpiepE/o5B7+K817qhjgyxbGdgUZQCyASoxdxpompcxTSe4XZtDfDFwcc
+						dPZXapVZvweV4/6LaDqp8pqL6M/7gLIhqC7gk5GT6h1//0JLGDYtIGlyPlBIZw==
+					</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://adss-uat.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-uat.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://adss-uat.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://adss-uat.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss-uat.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 ADSS UAT site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rob</md:GivenName>
+    <md:SurName>Hebron</md:SurName>
+    <md:EmailAddress>mailto:rob.hebron@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adss.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/adss.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..1f617e15
--- /dev/null
+++ b/swamid-interfederations-2.0/adss.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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://adss.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="2013-09-12T11:54: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://adss.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>
+						MIIC7jCCAdagAwIBAgIJAP/qxlEv7bfGMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDWFkc3Mub3guYWMudWswHhcNMTMwOTExMDgxMzQ5WhcNMjMwOTA5MDgxMzQ5
+						WjAYMRYwFAYDVQQDEw1hZHNzLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEArHVqMd2kMeKJpStSFHb7uEys8jMcMP6914I2kWcuDAyKeQVY
+						Wvg+ZJAabdhA7dmKjK+uIxpT5h+urWs2uQHHO0t4/4t5PET+T2qDMEU8sBbvWOn7
+						KRbjrT8/YEyQFp8yQGCMWcaUQLQRE3zaAvc9TUPJPzRIZz3kqyVZBv6TGOxgzsPb
+						WbOshySY++spJMYdfNa2++YruxX9mQjqqzZoecIRUswrGQNidF04QH9BhbLdaFh/
+						ObmQiUYvxbK91ZgQcd7SUfJ0KIRQiCv8dTEzb4mlpCcait5LDXNb21rme6UbS2Zx
+						XyE7QLzwYS+qNZE924zyQqWBf6kmTwaYKQiUOQIDAQABozswOTAYBgNVHREEETAP
+						gg1hZHNzLm94LmFjLnVrMB0GA1UdDgQWBBQB1FqDeiZFHC/T8F9PLbIfLCr13jAN
+						BgkqhkiG9w0BAQUFAAOCAQEAhmFOyd0wZBR+OJdsLQEe5CGK3Ym7FxIzZaUazWB+
+						4cjGFOJjKa1idVVCvIPXtO45eJrNQpRGAqznmS6uyRCTpndaJC/xB/HGcaXKScvx
+						Gc7wOk5UUMgCTmJ5LVVxtvV8MJzUMkYaenisg3OuEi1lma11jSXSDVC6a18ssHro
+						NgpvwcquNJKjqxwW7Y5aoAcmj2RxWpBmrNw8DRZugXSZ1j0XTPa3D5JjtiJuoZxC
+						nZfz8UQMp19+eDLajMn0nNIlBSJSiAuqegfPigwnbbG23PFVcrIrfEbgzmjhPQBX
+						0L5ahXHEBkMNbqkYJ4vYi9x12H0Q83bsljQhG1lAVGQt7Q==
+					</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://adss.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss.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://adss.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://adss.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss.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 ADSS site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rob</md:GivenName>
+    <md:SurName>Hebron</md:SurName>
+    <md:EmailAddress>mailto:rob.hebron@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adss.uas.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/adss.uas.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..7b30628d
--- /dev/null
+++ b/swamid-interfederations-2.0/adss.uas.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,71 @@
+<?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://adss.uas.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://adss.uas.ox.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>
+						MIIEbDCCA1SgAwIBAgIJAMHhwKmD2myoMA0GCSqGSIb3DQEBBQUAMIG2MQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
+						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxFDASBgNVBAsTC0lUIFNlcnZp
+						Y2VzMRowGAYDVQQDExFhZHNzLnVhcy5veC5hYy51azEvMC0GCSqGSIb3DQEJARYg
+						b3BzLXRlYW1AbWFpbGxpc3QuYWRtaW4ub3guYWMudWswHhcNMTIwODMxMDgyNjUw
+						WhcNMjIwODI5MDgyNjUwWjCBtjELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9y
+						ZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2Yg
+						T3hmb3JkMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEaMBgGA1UEAxMRYWRzcy51YXMu
+						b3guYWMudWsxLzAtBgkqhkiG9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFkbWlu
+						Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7Uq21vQR
+						aGkM8BRh+Rm2G6yIDXfg/u3+LFY0yLaN8CFI6Ke4vd5NB8FjKTLDqkCo7vOUIBxr
+						mSYGtmzI3xMj45nk5meFCF2DFPWW9Ahl2Eoiyf14H7dDljG5jvNNUqUBg2uUGd0s
+						+rkExZJOsVHcYOYk30pLR2RdRph2JpHR2hMpG5sMTx0wIPN/sphfYejYy8nDXmeI
+						TUmAh1fPbTw+lqhGiP3u1KEub1H8POW61pXHijTR8+vZhig58iJDCeAGIMt1Ohz+
+						fHY3PGWNyOSberjWmOfbRBPIFbsBZhgZCX5aUg51XJNL3MMmkcdwoueLX5JWniCd
+						rC+a/hUJzAd4JwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1P
+						cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU8GLgsgMbSHPL
+						7InagZMCUhfRxhUwHwYDVR0jBBgwFoAU8GLgsgMbSHPL7InagZMCUhfRxhUwDQYJ
+						KoZIhvcNAQEFBQADggEBAEfQGtUoP+adGHM14S7luh/rS8tIXpZIwt5apYwsZRmn
+						e1f12TeRm2U4kJeWa+tbpWZpHT8AyQ1MA83FZzpB+1sisRof5ef6MloOdPpFstBu
+						TZQQMT+BRbIDF5jGqd0CjGxjXk4EkzNINiyNR/luSPBILATUrukjlm0K6AnvXCK5
+						Jqv6VzqE7r9SANzaf6EzToudGI4lenAJK6QlFfkiT3ikcAf/wxjN+/KKk1FIupv1
+						+eaxb/3JNQCm9e3jWJQKuwGYS42TwD6nynJvZMNx4HbDTnHdnoFnRxshT8Lcj4Ux
+						Es1CiT3smbVVyekIg2yBRtwdwCM2CrOjlPKCYgxrMa4=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss.uas.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://adss.uas.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://adss.uas.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss.uas.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: ADSS Live System</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ops</md:GivenName>
+    <md:EmailAddress>mailto:ops@admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Livings</md:SurName>
+    <md:EmailAddress>mailto:tom.livings@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/afbi-shib.ads.qub.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/afbi-shib.ads.qub.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..ca4d8609
--- /dev/null
+++ b/swamid-interfederations-2.0/afbi-shib.ads.qub.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://afbi-shib.ads.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-04-08T14:20:53Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">afbi.qub.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSDCCAjCgAwIBAgIVAOO+228Co5G8VjtIFdZLgr8NcmkNMA0GCSqGSIb3DQEB
+						BQUAMCIxIDAeBgNVBAMTF2FmYmktc2hpYi5hZHMucXViLmFjLnVrMB4XDTEzMDMy
+						NTEyMjIwN1oXDTMzMDMyNTEyMjIwN1owIjEgMB4GA1UEAxMXYWZiaS1zaGliLmFk
+						cy5xdWIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC25Mj6
+						JDVixh+B5wf/GQ/FwqAoA5WDat5YscMWNpFNq5ZvXX3IT3kEzsWzK25KwXtUElGJ
+						TPz7+VVL/+HxRCSqgLvDeOMq4yD9AQjlB2uVuYMP9aTlFLrCUoi+JR0hjpE8Q5v6
+						0F2OldmMujRVNaJEmTjcuMWGitFk5pG1jTfGSZDXUFn3CFrr3e+xWRat6USHioD2
+						q7jLg5cmFE8JqViVRunGoYrJMC1W77RQ+R529HNt9K/F7ft7C4M+rkYteoAlx7yz
+						uPVaR0FsAK9xpr5q9y0aq2pKkaPUgEbeAjXTBuJNFIDnloCzAxWjLDXW/IB/LQco
+						6ha1LpRMU8vfGER7AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2FmYmktc2hpYi5hZHMu
+						cXViLmFjLnVrhi5odHRwczovL2FmYmktc2hpYi5hZHMucXViLmFjLnVrL2lkcC9z
+						aGliYm9sZXRoMB0GA1UdDgQWBBR+s3QwBH9KnP1UtNj2hV45cz/8lTANBgkqhkiG
+						9w0BAQUFAAOCAQEAtdu9lrEo9NY77txEQh1y0NzjP/fZVR+PkTEMWx2vbqxZfvhm
+						wlnUukYbcRCcdxVpCxAsQpyaXHEDfdSsSjLFmEJ7R1fzWymOkh/xKUOT6svwm5pI
+						PLE1K5tN+cBVo0RsRr6++HRjtHLsot2okTPMf/zMoUBK6pEkrOEdFpQFbvNLe0hG
+						pgJIhPjBjj1lP3cVVS0lPsqZQvxftz8E6sQpUzR9Sy2iNplzFne8WCjEN+YKoVnj
+						6tgvslECEk1hDFH4JV4HTpuVHJFF/1uXVgKht2p1cUavGWBCNINZQpoxYS/IyUa+
+						DR5nSDGrbwRnkSsU2KYlDMvbuxf5eLC1ZwSeqw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://afbi-shib.ads.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://afbi-shib.ads.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://afbi-shib.ads.qub.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://afbi-shib.ads.qub.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://afbi-shib.ads.qub.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://afbi-shib.ads.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">afbi.qub.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSDCCAjCgAwIBAgIVAOO+228Co5G8VjtIFdZLgr8NcmkNMA0GCSqGSIb3DQEB
+						BQUAMCIxIDAeBgNVBAMTF2FmYmktc2hpYi5hZHMucXViLmFjLnVrMB4XDTEzMDMy
+						NTEyMjIwN1oXDTMzMDMyNTEyMjIwN1owIjEgMB4GA1UEAxMXYWZiaS1zaGliLmFk
+						cy5xdWIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC25Mj6
+						JDVixh+B5wf/GQ/FwqAoA5WDat5YscMWNpFNq5ZvXX3IT3kEzsWzK25KwXtUElGJ
+						TPz7+VVL/+HxRCSqgLvDeOMq4yD9AQjlB2uVuYMP9aTlFLrCUoi+JR0hjpE8Q5v6
+						0F2OldmMujRVNaJEmTjcuMWGitFk5pG1jTfGSZDXUFn3CFrr3e+xWRat6USHioD2
+						q7jLg5cmFE8JqViVRunGoYrJMC1W77RQ+R529HNt9K/F7ft7C4M+rkYteoAlx7yz
+						uPVaR0FsAK9xpr5q9y0aq2pKkaPUgEbeAjXTBuJNFIDnloCzAxWjLDXW/IB/LQco
+						6ha1LpRMU8vfGER7AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2FmYmktc2hpYi5hZHMu
+						cXViLmFjLnVrhi5odHRwczovL2FmYmktc2hpYi5hZHMucXViLmFjLnVrL2lkcC9z
+						aGliYm9sZXRoMB0GA1UdDgQWBBR+s3QwBH9KnP1UtNj2hV45cz/8lTANBgkqhkiG
+						9w0BAQUFAAOCAQEAtdu9lrEo9NY77txEQh1y0NzjP/fZVR+PkTEMWx2vbqxZfvhm
+						wlnUukYbcRCcdxVpCxAsQpyaXHEDfdSsSjLFmEJ7R1fzWymOkh/xKUOT6svwm5pI
+						PLE1K5tN+cBVo0RsRr6++HRjtHLsot2okTPMf/zMoUBK6pEkrOEdFpQFbvNLe0hG
+						pgJIhPjBjj1lP3cVVS0lPsqZQvxftz8E6sQpUzR9Sy2iNplzFne8WCjEN+YKoVnj
+						6tgvslECEk1hDFH4JV4HTpuVHJFF/1uXVgKht2p1cUavGWBCNINZQpoxYS/IyUa+
+						DR5nSDGrbwRnkSsU2KYlDMvbuxf5eLC1ZwSeqw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://afbi-shib.ads.qub.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://afbi-shib.ads.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">AFBI: Agri-Food Biosciences Institute</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.afbini.gov.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Karen</md:GivenName>
+    <md:SurName>Murphy</md:SurName>
+    <md:EmailAddress>mailto:eresources@qub.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Karen</md:GivenName>
+    <md:SurName>Murphy</md:SurName>
+    <md:EmailAddress>mailto:k.l.murphy@qub.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/agata.suz.cvut.cz-shibboleth.xml b/swamid-interfederations-2.0/agata.suz.cvut.cz-shibboleth.xml
new file mode 100644
index 00000000..0e23cee0
--- /dev/null
+++ b/swamid-interfederations-2.0/agata.suz.cvut.cz-shibboleth.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://agata.suz.cvut.cz/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-08-16T09:51:28Z">
+      <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>
+      <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://agata.suz.cvut.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://agata.suz.cvut.cz/Shibboleth.sso/Login" index="1"/>
+      <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">Canteens of CTU in Prague</mdui:Description>
+        <mdui:Description xml:lang="cs">Menzy ČVUT v Praze</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.suz.cvut.cz/en/the-facilities-administration-department-of-the-czech-technical-university-in-prague</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">https://www.suz.cvut.cz/sprava-ucelovych-zarizeni-cvut</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:KeyName>agata.suz.cvut.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=agata.suz.cvut.cz,OU=Domain Control Validated</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEcDCCA1igAwIBAgIRAJSnezeeSwDm9u6PQ2mCUPswDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzA3MDEwMDAwMDBaFw0xNjA2MzAyMzU5NTlaMD8xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRYWdhdGEuc3V6
+LmN2dXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkNwyaiPvQ
+fx1lS9AYlyR5VAYOwy/1KBC3FhSdGLMVpYYFIvVCEK5yDqQs6D7edBnjvqoDkIkU
+cbb6LZGz0bmiSMOE5toxMb1r8XzNcjzXe4Rn8NtFbO2lSUp77eTvMt4sTdmq1Krg
+7n5XuS0SrbIcWTh4M81QazVCIpD4L/elNCgyptKWw77EbRYe6as5lJsCcujSDCHD
+gO+gOqCM3fvOLSoCZv6zDnBAS4BVnfOOB4yRZgW5koIMFVnuXkMmyrqSc9kUiWp4
+EjghtgPuVsuhf+KWHegH63HfRBA7wp6Ukz/gkkBmRRIg4ogPUkBQJpTIBmCFHune
+hMUcueegHqRfAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUWeCB62InMSMtp9LL306vFP2jVsgwDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWFnYXRhLnN1ei5jdnV0LmN6
+MA0GCSqGSIb3DQEBBQUAA4IBAQCb5NX/OotQMluDW6r3mCtXGnkSHRikC75D8+ua
+ZEobB7MQHoeJg6ked7FlkatHkoqH2CZL7B66y9mhFJUFSHhRqjmudWRrJBW4SnME
+qnYLXX2q6NSmac3fH7P6BL7FyhED9+T+zfHI99A8oplvnXf4Vws/89hbzopCoI0+
+b++srMBwK/0XLocTzlTHhzCeNKflpEsP5YlNRvj4S25FhCb82Cmd+hL2OQen5000
+C0SakbhPqTeJv59bCJOjYhLfDW90dnn3HjdManRagoyE2zGCa88C7vSqwxabi7fj
+Bie8tt/8TZ/a7EDN0YLJRmmMLKKCTwebuCYsUFiMOLdqCK2+
+</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://agata.suz.cvut.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <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>Tomas</md:GivenName>
+    <md:SurName>Kanovsky</md:SurName>
+    <md:EmailAddress>kanovsky@suz.cvut.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml
new file mode 100644
index 00000000..ac2942ad
--- /dev/null
+++ b/swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aginfra-sg.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-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:SPSSODescriptor protocolSupportEnumeration="urn:oasis: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">agINFRA Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">agINFRA Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This Science Gateway has been built mainly for the Virtual Research Community of the agINFRA project but it is of course open to everybody interested in agricultural sciences. The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</mdui:Description>
+        <mdui:Description xml:lang="it">This Science Gateway has been built mainly for the Virtual Research Community of the agINFRA project but it is of course open to everybody interested in agricultural sciences. The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://aginfra-sg.ct.infn.it/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://aginfra-sg.ct.infn.it/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aginfra-sg.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>
+MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
+VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
+EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
+c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
+T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
+3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
+O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
+i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
+LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
+TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
+AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
+BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
+A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
+IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
+KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
+AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
+Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
+ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
+ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
+bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
+LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
+ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
+cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
+iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
+PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
+n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
+zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
+2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
+j/MCNlE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aginfra-sg.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://aginfra-sg.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://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">agINFRA Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous 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="en">INFN Catania</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">INFN Catania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">agINFRA Science Gateway provided by INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">agINFRA Science Gateway erogato da INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/index.php?lang=en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/</md:OrganizationURL>
+  </md:Organization>
+  <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:riccardo.rotondo@garr.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/aishib.agropolis.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/aishib.agropolis.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..7bf7541d
--- /dev/null
+++ b/swamid-interfederations-2.0/aishib.agropolis.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aishib.agropolis.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-06-06T11:49: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agropolis.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Agropolis International</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDNzCCAh+gAwIBAgIUYY3sGXwChkj2CRy6QFDvkdj2zlAwDQYJKoZIhvcNAQEF
+BQAwHjEcMBoGA1UEAxMTYWlzaGliLmFncm9wb2xpcy5mcjAeFw0xMzA1MTUxMzM3
+MTJaFw0zMzA1MTUxMzM3MTJaMB4xHDAaBgNVBAMTE2Fpc2hpYi5hZ3JvcG9saXMu
+ZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxrDy6lrhIBjcxv16n
+4UJ2cEMYPO4wSmfDwhO6feoSIEuIblYRHE2nQKirMokwD6seF4rbDHyxLXg/ColL
+VLv+0CJteIOZjSCgSN90WzQRrC1Ex5sJfPu6yPEXvW8H1906gEg6ok8rlCIHRGfE
+15pHK5eqxQS5f2n8c2t/Uk33/FBj79/hb3Cd7vE4mdlvReD3AFswC0lV4bPmj3Ka
+KUuMj9xwipwnfWCu6p2/ZJF4M3ADU5grXHJ2Vqmd8DWm5raaObKjYwJddbRBByI8
+bJJLIwAQQmX4Dh4hf1QKlf2oqWPWVQxLQp0erL1U8IWmj1RG8TTH9xOJl6kkEhYq
+Z2gfAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2Fpc2hpYi5hZ3JvcG9saXMuZnKGKmh0
+dHBzOi8vYWlzaGliLmFncm9wb2xpcy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
+FgQU9A7iQ8Qo+t2JCpKuOOV9YBoYs4MwDQYJKoZIhvcNAQEFBQADggEBAG0LOW6I
+F+M8n2NpzyQjfVCJCA6QhWjbXrfemiPJFZGZZb2dVmHof4yCpCUYgHOBoZaXPOlB
+nLYsUWvFZ6V2GELZpLHzHSSrYidieW07qQkh1DwcIYpvtZgLviOtT/tCEGsk925f
+DUoGdeIqpqt54WZcW9+TbKicvjg3JT4BFOQ17bFNwPW+YjTbvsWYxen+e0mRp4vM
+V0yMu2f3bccVhePASSZGL3yod3sJ1dPvlrJO9c35BekhtirolVjZqMQ0AYPVifua
+yIU0dWXsZkAOcBL9kZFbJcYRUIxMgvp8U2Zdv1+ZlwOyXnnWDOOh9wjuT7FAyObU
+ChvjHlgZHkvLwJI=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aishib.agropolis.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aishib.agropolis.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aishib.agropolis.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Agropolis International</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Agropolis International</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean Cerda</md:SurName>
+    <md:EmailAddress>cerda@agropolis.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean-Pierre  Allano</md:SurName>
+    <md:EmailAddress>allano@agropolis.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..e049b8e9
--- /dev/null
+++ b/swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aleph.svkhk.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-01-09T13:46:49Z">
+      <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>
+      <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">svkhk.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Research Library in Hradec Králové</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Studijní a vědecká knihovna v Hradci Králové</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for patrons and staff of the Research Library in Hradec Králové</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro čtenáře a zaměstance Studijní a vědecké knihovny v Hradci Králové</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.svkhk.cz/Uvodni-stranka.aspx?lang=en-US</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.svkhk.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://aleph.svkhk.cz/idp/images/logo_40.png</mdui:Logo>
+        <mdui:Logo height="90" width="90">https://aleph.svkhk.cz/idp/images/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>
+MIIDIzCCAgugAwIBAgIUC7dbtKAQedxgZUwv3VFnAGDTwQ4wDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOYWxlcGguc3ZraGsuY3owHhcNMTQwMTA2MTcwNDQ2WhcN
+MzQwMTA2MTcwNDQ2WjAZMRcwFQYDVQQDEw5hbGVwaC5zdmtoay5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALT0PjFlLk3sfYzuMd4pWVRAYdsx9Kax
+GkF2/0OpAKJQzUA2yhJw3/JtQNbLkGahSkotsU3sbPaV7s6WTu9rJoth153eoLx1
+nNxATvfJ24MbzcK4vCU2HOOnAxFF40a64kn6BR42FpJMDvaDNrYNGC7QXnt9c16r
+drlJKZ9YeSBZ58ziOioU5hgQb3lo9AoN4/M+KVtTsc98F0oX30LYa7JklmQNukuH
+EL2fiDgQTboT8/D0lFwRb7fUXV7aV5Ycm2M9+vPWGY9/+lHNUWDV7m1V5p9QHtuQ
+Mk+j8eP1dKA7RYmpv40A5QN22YzrzUTuRhKQGthOU+VENAx+weL6ybcCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOYWxlcGguc3ZraGsuY3qGJWh0dHBzOi8vYWxlcGguc3Zr
+aGsuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFB6RVoK6wbDr4JhJu4Wd4JhW
+pfTXMA0GCSqGSIb3DQEBBQUAA4IBAQBpXII7Nhv1rB40LCIMAwk5K/+J6rZn9ng4
+4pvCT6G+FSDTPA39bVUEunlChaGYHNy4sP9UOr/YvK48zAcmdu5di15q43/FbsAr
+F6jP/7uhM3z7Il0N1/NvsQ2tRdpvuVNGiWRVwQ5RHeLTJSq0Nc1UL1I/oJTOTzcd
+ypflPtnNY6u+VVjoczH+s505mASs8NIsaYPiV2PZIRnsGbzNAz2O7efJsajyCcOV
+H1UmiGoOXaYvAlNI0OdAmLiuTyYCiMPx2HHi9mJnnc6wK5LlH5KP336KQLObLvU4
+/ygOfyI2RELa14PCEnCMPPI4NNry20Pp1kuXfT6B4DB+LvcQfREJ
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aleph.svkhk.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aleph.svkhk.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph.svkhk.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://aleph.svkhk.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aleph.svkhk.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aleph.svkhk.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aleph.svkhk.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">svkhk.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUC7dbtKAQedxgZUwv3VFnAGDTwQ4wDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOYWxlcGguc3ZraGsuY3owHhcNMTQwMTA2MTcwNDQ2WhcN
+MzQwMTA2MTcwNDQ2WjAZMRcwFQYDVQQDEw5hbGVwaC5zdmtoay5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALT0PjFlLk3sfYzuMd4pWVRAYdsx9Kax
+GkF2/0OpAKJQzUA2yhJw3/JtQNbLkGahSkotsU3sbPaV7s6WTu9rJoth153eoLx1
+nNxATvfJ24MbzcK4vCU2HOOnAxFF40a64kn6BR42FpJMDvaDNrYNGC7QXnt9c16r
+drlJKZ9YeSBZ58ziOioU5hgQb3lo9AoN4/M+KVtTsc98F0oX30LYa7JklmQNukuH
+EL2fiDgQTboT8/D0lFwRb7fUXV7aV5Ycm2M9+vPWGY9/+lHNUWDV7m1V5p9QHtuQ
+Mk+j8eP1dKA7RYmpv40A5QN22YzrzUTuRhKQGthOU+VENAx+weL6ybcCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOYWxlcGguc3ZraGsuY3qGJWh0dHBzOi8vYWxlcGguc3Zr
+aGsuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFB6RVoK6wbDr4JhJu4Wd4JhW
+pfTXMA0GCSqGSIb3DQEBBQUAA4IBAQBpXII7Nhv1rB40LCIMAwk5K/+J6rZn9ng4
+4pvCT6G+FSDTPA39bVUEunlChaGYHNy4sP9UOr/YvK48zAcmdu5di15q43/FbsAr
+F6jP/7uhM3z7Il0N1/NvsQ2tRdpvuVNGiWRVwQ5RHeLTJSq0Nc1UL1I/oJTOTzcd
+ypflPtnNY6u+VVjoczH+s505mASs8NIsaYPiV2PZIRnsGbzNAz2O7efJsajyCcOV
+H1UmiGoOXaYvAlNI0OdAmLiuTyYCiMPx2HHi9mJnnc6wK5LlH5KP336KQLObLvU4
+/ygOfyI2RELa14PCEnCMPPI4NNry20Pp1kuXfT6B4DB+LvcQfREJ
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph.svkhk.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">Studijní a vědecká knihovna v Hradci Králové</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">The Research Library in Hradec Králové</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="cs">Studijní a vědecká knihovna v Hradci Králové</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Research Library in Hradec Králové</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.svkhk.cz/Uvodni-stranka.aspx?lang=en-US</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.svkhk.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Sklenář</md:SurName>
+    <md:EmailAddress>petr.sklenar@svkhk.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/alnbmth.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/alnbmth.sisoshibboleth.co.uk-entity.xml
new file mode 100644
index 00000000..f5bb4074
--- /dev/null
+++ b/swamid-interfederations-2.0/alnbmth.sisoshibboleth.co.uk-entity.xml
@@ -0,0 +1,82 @@
+<?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://alnbmth.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-06-05T14: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://alnbmth.siso.co/sso/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://alnbmth.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 Bournemouth University ~ ALNBmth, Online Resource Booking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SiSo Bournemouth University ~ ALNBmth, 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>
+						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
+						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
+						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
+						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
+						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
+						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
+						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
+						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
+						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
+						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
+						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
+						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
+						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://alnbmth.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alnbmth.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://alnbmth.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://alnbmth.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://alnbmth.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://alnbmth.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://alnbmth.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 Bournemouth University ~ ALNBmth, 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/alpha.bobnational.net-entityid.xml b/swamid-interfederations-2.0/alpha.bobnational.net-entityid.xml
new file mode 100644
index 00000000..10827de0
--- /dev/null
+++ b/swamid-interfederations-2.0/alpha.bobnational.net-entityid.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://alpha.bobnational.net/entityid">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-12T09:14: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: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">BoB National (Test)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">BoB National 3.0 (Development version for testing only)</mdui:Description>
+        <mdui:Logo height="57" width="224">https://alpha.bobnational.net/images/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>
+						MIID2jCCAsICCQDGys3zsp9DtzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
+						R0IxFzAVBgNVBAgTDkNhbWJyaWRnZXNoaXJlMRMwEQYDVQQHEwpXaWxsaW5naGFt
+						MSYwJAYDVQQKEx1DYW1icmlkZ2UgSW1hZ2luZyBTeXN0ZW1zIEx0ZDEeMBwGA1UE
+						AxMVYWxwaGEuYm9ibmF0aW9uYWwubmV0MSkwJwYJKoZIhvcNAQkBFhpkbnNAY2Ft
+						YnJpZGdlaW1hZ2luZy5jby51azAeFw0xMzA2MTExNTIxNDFaFw0yMzA2MDkxNTIx
+						NDFaMIGuMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOQ2FtYnJpZGdlc2hpcmUxEzAR
+						BgNVBAcTCldpbGxpbmdoYW0xJjAkBgNVBAoTHUNhbWJyaWRnZSBJbWFnaW5nIFN5
+						c3RlbXMgTHRkMR4wHAYDVQQDExVhbHBoYS5ib2JuYXRpb25hbC5uZXQxKTAnBgkq
+						hkiG9w0BCQEWGmRuc0BjYW1icmlkZ2VpbWFnaW5nLmNvLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvf5+byCAsZiIEv92+YYjEKkY13N6tqWYHL5X
+						urwckcTwuHvarX3pNWV53JM0kpO2boPkvgdLYDEL4LxU5O622p+EK1b/7ue/KNrB
+						iJmIbmmhbsmq6zJatQW2TX0Ex91cJla9IEWWsAZY8iEac9Vo4iZpLGPNdGRWikD7
+						QFrXROd4OVMprGnTc2wZhbokx1jMf0nunDbB9hyRMX7odGnYB6X6pmqLS3fVgFrN
+						2G9yjFLY0hklexfY00+BX7KJXGRXJSDqqEujD3D3gP0aRZsNlFa70WNmwov+0nDi
+						VvdiCsmNXmRrfJ0OKg0DFJzVaO4WlGGePyCpR6U4t0o/1XQt0QIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQAURCybMxWvGAanPx/adIf7k9BJBcsOwS8/hLAwfoGkmKPQ
+						x363AquUnlM8r59HJnEfLIZpqVaNvknx0TDSuD7Ncwa25sTZpL3fuV0ZIeAyF9Gm
+						32e1q8ByVJWdTDYFw5M5htwOmj7dBjTCsvAyR9/47OzQ38EHyOsOke++dFIcxMDB
+						xRiuE4RpUmB7A6s839iyqv5XMZehEF1oNBlxF9HPJjdb3mteym3uxEGPK5qtjaCP
+						WCb3BNYjj6R6kXlddVgYnK8MIiheop0b9s0oXnquC6CN1K6C3LJM+BtcP4IrXnVF
+						kXrl7nZXgIhRp8teewcmJh1MXNeTZrU42X74QJ22
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID2jCCAsICCQDGys3zsp9DtzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
+						R0IxFzAVBgNVBAgTDkNhbWJyaWRnZXNoaXJlMRMwEQYDVQQHEwpXaWxsaW5naGFt
+						MSYwJAYDVQQKEx1DYW1icmlkZ2UgSW1hZ2luZyBTeXN0ZW1zIEx0ZDEeMBwGA1UE
+						AxMVYWxwaGEuYm9ibmF0aW9uYWwubmV0MSkwJwYJKoZIhvcNAQkBFhpkbnNAY2Ft
+						YnJpZGdlaW1hZ2luZy5jby51azAeFw0xMzA2MTExNTIxNDFaFw0yMzA2MDkxNTIx
+						NDFaMIGuMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOQ2FtYnJpZGdlc2hpcmUxEzAR
+						BgNVBAcTCldpbGxpbmdoYW0xJjAkBgNVBAoTHUNhbWJyaWRnZSBJbWFnaW5nIFN5
+						c3RlbXMgTHRkMR4wHAYDVQQDExVhbHBoYS5ib2JuYXRpb25hbC5uZXQxKTAnBgkq
+						hkiG9w0BCQEWGmRuc0BjYW1icmlkZ2VpbWFnaW5nLmNvLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvf5+byCAsZiIEv92+YYjEKkY13N6tqWYHL5X
+						urwckcTwuHvarX3pNWV53JM0kpO2boPkvgdLYDEL4LxU5O622p+EK1b/7ue/KNrB
+						iJmIbmmhbsmq6zJatQW2TX0Ex91cJla9IEWWsAZY8iEac9Vo4iZpLGPNdGRWikD7
+						QFrXROd4OVMprGnTc2wZhbokx1jMf0nunDbB9hyRMX7odGnYB6X6pmqLS3fVgFrN
+						2G9yjFLY0hklexfY00+BX7KJXGRXJSDqqEujD3D3gP0aRZsNlFa70WNmwov+0nDi
+						VvdiCsmNXmRrfJ0OKg0DFJzVaO4WlGGePyCpR6U4t0o/1XQt0QIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQAURCybMxWvGAanPx/adIf7k9BJBcsOwS8/hLAwfoGkmKPQ
+						x363AquUnlM8r59HJnEfLIZpqVaNvknx0TDSuD7Ncwa25sTZpL3fuV0ZIeAyF9Gm
+						32e1q8ByVJWdTDYFw5M5htwOmj7dBjTCsvAyR9/47OzQ38EHyOsOke++dFIcxMDB
+						xRiuE4RpUmB7A6s839iyqv5XMZehEF1oNBlxF9HPJjdb3mteym3uxEGPK5qtjaCP
+						WCb3BNYjj6R6kXlddVgYnK8MIiheop0b9s0oXnquC6CN1K6C3LJM+BtcP4IrXnVF
+						kXrl7nZXgIhRp8teewcmJh1MXNeTZrU42X74QJ22
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://alpha.bobnational.net/saml/module.php/saml/sp/saml2-logout.php/imagenweb"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alpha.bobnational.net/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://alpha.bobnational.net/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://alpha.bobnational.net/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://alpha.bobnational.net/saml/module.php/saml/sp/saml1-acs.php/imagenweb/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">alpha.bobnational.net</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">BoB National (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cambridgeimaging.co.uk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Wassall</md:SurName>
+    <md:EmailAddress>mailto:support@cambridgeimaging.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Wassall</md:SurName>
+    <md:EmailAddress>mailto:richard.wassall@cambridgeimaging.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/alumniconnector.london.edu-shibboleth.xml b/swamid-interfederations-2.0/alumniconnector.london.edu-shibboleth.xml
new file mode 100644
index 00000000..871dc5af
--- /dev/null
+++ b/swamid-interfederations-2.0/alumniconnector.london.edu-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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://alumniconnector.london.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="2014-06-03T15:15: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://alumniconnector.london.edu/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://alumniconnector.london.edu/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEgTCCA2mgAwIBAgIQb1k6svpWuK5jsDHuxauJGDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTE0MDUxMzAwMDAwMFoXDTE3MDUxMjIzNTk1OVowSDEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExphbHVtbmljb25u
+						ZWN0b3IubG9uZG9uLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AMVhwovtjykmWCVhdA/VqLWs4ralOO8jE7qyjMxoUEeasNcxE+7IopDI2HuV8joL
+						jPUNnqjA24fieLUwkd+/asyTQ0GTFbmGKAfE11mqPiOjUpw1sFcZyOAYFSSH2iBO
+						9JPRVr59UFKH7nwtrPfztFvuMzJ5wLL0/zUrDQzxVEMXsRtnRgM2pFjHf2XnimHu
+						jsxNNQT7KnEubHj3IeS6FVGLBKphup2L7Fr5Lz2G6+5epTuHaqMolEfhTPGowudB
+						QbTHCcqXIg+GW6QDe893Q+Pi0lLjvRcuSkKHqrTrohEW0MECBtic50jm5NMdm/CT
+						NF/hDNvQW7Ls9/akIwZ2yMUCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
+						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR5VXq22fX+3Cl+t0YGGKsSB2SZQTAO
+						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaYWx1bW5pY29u
+						bmVjdG9yLmxvbmRvbi5lZHUwDQYJKoZIhvcNAQEFBQADggEBAFi0t2vhnavwuw3T
+						UXRWyt2QxdLIKJpzJX+DOnkB8EXaU7VrwtUhy4idA5L4e2QDIZEEGELZDLC6LaI4
+						NZb7z2j2h5O1G70NhpyO6MvIlyMH/ZJ6g6YVoLiWgax4PnEPhLqq9R95rrZa5I5a
+						UO3yTnzIbaw6XAaP1Rk7i2qFCL9MIn8/BMUNoHbeU1JU9EJCL2npM0o0Uk7GCiZb
+						O0X28INlrfNnlOem0P6GjK7rqKerNY36IeL5hRicJuSMSEW8JPp5Ql0DRRkqPL9v
+						lQzS4P/mYJscNI0c5W4QvWnQ2AZI79uKl4jHKh4K1BFLEkoZpmwz8BrhvnWiB4gw
+						W7dyKKk=
+					</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://alumniconnector.london.edu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://alumniconnector.london.edu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://alumniconnector.london.edu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alumniconnector.london.edu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://alumniconnector.london.edu/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alumniconnector.london.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://alumniconnector.london.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://alumniconnector.london.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://alumniconnector.london.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://alumniconnector.london.edu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://alumniconnector.london.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">London Business School</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London Business School Alumni Connector</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.london.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Woodhead</md:SurName>
+    <md:EmailAddress>mailto:robbie.woodhead@freestyleinteractive.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Woodhead</md:SurName>
+    <md:EmailAddress>mailto:robbie.woodhead@freestyleinteractive.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ambre.vetagro-sup.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/ambre.vetagro-sup.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..0722e6f7
--- /dev/null
+++ b/swamid-interfederations-2.0/ambre.vetagro-sup.fr-idp-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ambre.vetagro-sup.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-14T16:11: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vetagro-sup.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Vetagro Sup</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDPDCCAiSgAwIBAgIVAL9PsuadPSIZcMHNxlK/oevezmzWMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMTFGFtYnJlLnZldGFncm8tc3VwLmZyMB4XDTEyMTEwODEw
+MTQwNFoXDTMyMTEwODEwMTQwNFowHzEdMBsGA1UEAxMUYW1icmUudmV0YWdyby1z
+dXAuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCc/ptfpmkomwmT
+4RsID+1Ce1dX0eUjcLgSOZN8hVpHWLag2ERWkpmvB5aK7BAFcI5i//Gk80tAiasu
+JtlZhBnEw54aTJRGpyL2CVkHyl6SMRxprIi1Ji67IoGqEgUeGaheAxo+tG5e1WSc
+bIbldcSKdwvjAV+7HSB4C6NqLsAzJH25++yaRH2uf2LTD0TDzNR9Q2hVj/VyYWR+
+K3HWI1Snjn/i7aFfZZhYmBkwHuQOaPhwCM+khikg5XicMsxUhHCMi93UgHGIsdkr
+IEGj4xydBTUKsLaykeuFS8EgXbWwCLGkeX76w8xDoFIpnppU/yFd9v7Zg3EBfn4p
+kTW3GdIjAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGFtYnJlLnZldGFncm8tc3VwLmZy
+hitodHRwczovL2FtYnJlLnZldGFncm8tc3VwLmZyL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBTPTqWkVHrHXFjmxMWkNt/sp2h5ozANBgkqhkiG9w0BAQUFAAOCAQEA
+FvXMtfBUmRZCzz8CjanGzr1TBUPmnkrKci5AtkseKw9YlfUmBXTHB01y697nYq6m
+RB6KhvfW212h9CF0IOEEjoadgDhXqGYhq8PnAOtT4Ty3XDy8SbRh8aQWfvnfSngv
+FdpHRiSpj5UXXuT5zTtkf59h58XKtEfCkMbUzvdOgUobJzpD0WISmQHPQnx+Neg6
+9j7oMRrDiZjS39Om8Imu9xvsnddDM3PlsDBIsvrr1o7K5iLkEdR1YYX0ZNDbiFuw
+QXXl2dwQPB8KrScPUvCe57slU2gFQvvIBzjQysxC6V6TPSuM3A/ee56lACuB3jKj
+oYkHQc5Gj/1rSMLmu9aLMg==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ambre.vetagro-sup.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ambre.vetagro-sup.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ambre.vetagro-sup.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Vetagro Sup</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Vetagro Sup</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Nicolas Aulas</md:SurName>
+    <md:EmailAddress>nicolas.aulas@vetagro-sup.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/antimoine.insa-strasbourg.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/antimoine.insa-strasbourg.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..da285937
--- /dev/null
+++ b/swamid-interfederations-2.0/antimoine.insa-strasbourg.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://antimoine.insa-strasbourg.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-11T08:44: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-strasbourg.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">INSA 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>
+					      MIIDXDCCAkSgAwIBAgIVAKI+qiqDCk9wTTqn7OVAoZrvj/CpMA0GCSqGSIb3DQEB
+BQUAMCcxJTAjBgNVBAMTHGFudGltb2luZS5pbnNhLXN0cmFzYm91cmcuZnIwHhcN
+MTQwMTEzMTAzOTU4WhcNMzQwMTEzMTAzOTU4WjAnMSUwIwYDVQQDExxhbnRpbW9p
+bmUuaW5zYS1zdHJhc2JvdXJnLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAtuM8lRjlVjjmrHq9VtguaOMQL+Wd99BiOs56kL3Mbctg1FwH69LYThCW
+6dOz6WJg/jU/naF7jEikXKc71xGyu7Ph7Iqa9S5hoXXAT8u/0q2nZDeTOraJqKe1
+FMF2RzXhEEMyQO3CiKNK9b+tbKoNZS7FQCixMZklWZPt4EcEKd6jyRq1WYX3dpnb
+r9I/aCdhtK/PGvGe5gKTDoTR2HKyWKJTc/obf8x/vlYIEwiaGgdlqI2KiBE0x48n
+zQdP6XVi3T8ZWbnkLmCfgJtP2C8PtEJuwDRAy0Z9N4DSwvxn5YCVYgBLSi0TLa10
+B/lUqqBezZrTrA9p9Lt8JtGXW5YGHwIDAQABo38wfTBcBgNVHREEVTBTghxhbnRp
+bW9pbmUuaW5zYS1zdHJhc2JvdXJnLmZyhjNodHRwczovL2FudGltb2luZS5pbnNh
+LXN0cmFzYm91cmcuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLFkjPZUc9JY
+qrWjldJ/iGGkKAt4MA0GCSqGSIb3DQEBBQUAA4IBAQBSk/wU1mRn4VF2ifmy261K
+DK7uX+t1H1hh8S38fKSFU7HoNXJTV3vQnmBOpYIGC1gtvmb+qjqpNtikU2zO84Gq
+Q0bXHxYF2d9RUP89mKaFxE5uNcXFmlOA3ChZY3pMT5zwAPI/T60tGrex7zci7OLn
+JDAQj/q4Yk9ejx6JTFggQSCCVh+oV/SDIMd2p5AY6H3mto3b6XCk7Lssa8a/D30k
+pEkZnhTKdN82eRyynuOR7UDU4tasV4d7Mi/j53f5ihnRcsvwh/pYodjoVYY8cEcZ
+JLnAXYF8coSwh8UN4D/0NHsvTuSOFQc85hGrqacMsvxiQiw9mv01AX5+A5YLEbVQ
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://antimoine.insa-strasbourg.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://antimoine.insa-strasbourg.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://antimoine.insa-strasbourg.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INSA de Strasbourg</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INSA de Strasbourg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Lahsen BOUZID</md:SurName>
+    <md:EmailAddress>lahsen.bouzid@insa-strasbourg.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Simon SCHERRER</md:SurName>
+    <md:EmailAddress>simon.scherrer@insa-strasbourg.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/api.credoreference.com-shibboleth-sp.xml b/swamid-interfederations-2.0/api.credoreference.com-shibboleth-sp.xml
new file mode 100644
index 00000000..99f3d99f
--- /dev/null
+++ b/swamid-interfederations-2.0/api.credoreference.com-shibboleth-sp.xml
@@ -0,0 +1,86 @@
+<?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://api.credoreference.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="2013-07-03T15:30: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://api.credoreference.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://api.credoreference.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="36" width="200">https://corp.credoreference.com/images/credo_horz_transparent_200w.gif</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Credo Reference Production RESTful API</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Credo Reference Production RESTful API. Contact support@credoreference.com for details.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDPzCCAiegAwIBAgIJAOsnADaxwuwdMA0GCSqGSIb3DQEBBQUAMDMxMTAvBgNV
+						BAMTKGF3cy11cy1lYS1wcm9kLWRlbW8tMS5jcmVkb3JlZmVyZW5jZS5jb20wHhcN
+						MTQwNDEwMTYwNjQxWhcNMjQwNDA3MTYwNjQxWjAzMTEwLwYDVQQDEyhhd3MtdXMt
+						ZWEtcHJvZC1kZW1vLTEuY3JlZG9yZWZlcmVuY2UuY29tMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAybu7QT+tSyTzBm4XgUzTRH8fU2N7Iqve9z3pHFJK
+						kqxB7x8PG2Tsg5h8PTxkRHbHlvCeK41u72nhUhgD8AGrSwxhGvFJS6ML6m+HgjuC
+						OpoVYrgQFkH7ba7s48nv5iZjWm3PA8EPyhH6+71VdJvCArjPTVhJiBVCTVr4GlRQ
+						aZCFT4DEfgkFSRMm63hGUjvyLNtQeaF3lodVcfseZf5rKshh72T56LADwk2gc3gD
+						RTFELvHLRunml5ocj+hocCc4pahjaI7Wvxxfmq30/9oQSOW/sIAYjBrCCLANPo62
+						ZXwHnpdaq/IK85dIJIWJo97C2Q8OrPDjm60MIGerf/LN7wIDAQABo1YwVDAzBgNV
+						HREELDAqgihhd3MtdXMtZWEtcHJvZC1kZW1vLTEuY3JlZG9yZWZlcmVuY2UuY29t
+						MB0GA1UdDgQWBBSb0bm0aAM/mcTdCLP6Bd7fVhZEIDANBgkqhkiG9w0BAQUFAAOC
+						AQEAWIr7gg8AYViRX60K6x6nCgTfqsc8FEzZevBYgeOpljhxRVu4raHp1e+ycckk
+						JYPzuuJFA/RPHH37xOthxrXUhb6lbOR2bmqOudji/l8m0njEWvlfK1O9APKnzIFK
+						DXo6w1tE/EzL30F2sDKO3z9X2N2bRVfm7i4aBH2G8ksM5gEDiNLXFEBjll/cFgGj
+						sQiZqRpyrEiu1DNYWR7cekhJ76MQ9vRAg+sRi+4+YcJqecm3uSAvfdi06Z50neEI
+						x4if+VFo6Qgx/Kc4nRLASPV0BQMywJZJ8tzI0HmZ8kdgloMtSsEAik7xdZ2qhYUU
+						6PpbbkDoIuMrrMqEbFW6Rk+q/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://api.credoreference.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://api.credoreference.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://api.credoreference.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://api.credoreference.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://api.credoreference.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://api.credoreference.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://api.credoreference.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://api.credoreference.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://api.credoreference.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://api.credoreference.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://api.credoreference.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Credo Reference Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Credo Reference Production RESTful API</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://corp.credoreference.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>McFarland</md:SurName>
+    <md:EmailAddress>mailto:Michael.mcfarland@credoreference.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>McFarland</md:SurName>
+    <md:EmailAddress>mailto:Michael.mcfarland@credoreference.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/api.dev.credoreference.com-shibboleth-sp.xml b/swamid-interfederations-2.0/api.dev.credoreference.com-shibboleth-sp.xml
new file mode 100644
index 00000000..3972f878
--- /dev/null
+++ b/swamid-interfederations-2.0/api.dev.credoreference.com-shibboleth-sp.xml
@@ -0,0 +1,84 @@
+<?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://api.dev.credoreference.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="2013-08-05T13:59: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://api.dev.credoreference.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://api.dev.credoreference.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Credo Reference Private DEV RESTful API</mdui:DisplayName>
+        <mdui:Logo height="36" width="200">https://corp.credoreference.com/images/credo_horz_transparent_200w.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDPzCCAiegAwIBAgIJAOsnADaxwuwdMA0GCSqGSIb3DQEBBQUAMDMxMTAvBgNV
+						BAMTKGF3cy11cy1lYS1wcm9kLWRlbW8tMS5jcmVkb3JlZmVyZW5jZS5jb20wHhcN
+						MTQwNDEwMTYwNjQxWhcNMjQwNDA3MTYwNjQxWjAzMTEwLwYDVQQDEyhhd3MtdXMt
+						ZWEtcHJvZC1kZW1vLTEuY3JlZG9yZWZlcmVuY2UuY29tMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAybu7QT+tSyTzBm4XgUzTRH8fU2N7Iqve9z3pHFJK
+						kqxB7x8PG2Tsg5h8PTxkRHbHlvCeK41u72nhUhgD8AGrSwxhGvFJS6ML6m+HgjuC
+						OpoVYrgQFkH7ba7s48nv5iZjWm3PA8EPyhH6+71VdJvCArjPTVhJiBVCTVr4GlRQ
+						aZCFT4DEfgkFSRMm63hGUjvyLNtQeaF3lodVcfseZf5rKshh72T56LADwk2gc3gD
+						RTFELvHLRunml5ocj+hocCc4pahjaI7Wvxxfmq30/9oQSOW/sIAYjBrCCLANPo62
+						ZXwHnpdaq/IK85dIJIWJo97C2Q8OrPDjm60MIGerf/LN7wIDAQABo1YwVDAzBgNV
+						HREELDAqgihhd3MtdXMtZWEtcHJvZC1kZW1vLTEuY3JlZG9yZWZlcmVuY2UuY29t
+						MB0GA1UdDgQWBBSb0bm0aAM/mcTdCLP6Bd7fVhZEIDANBgkqhkiG9w0BAQUFAAOC
+						AQEAWIr7gg8AYViRX60K6x6nCgTfqsc8FEzZevBYgeOpljhxRVu4raHp1e+ycckk
+						JYPzuuJFA/RPHH37xOthxrXUhb6lbOR2bmqOudji/l8m0njEWvlfK1O9APKnzIFK
+						DXo6w1tE/EzL30F2sDKO3z9X2N2bRVfm7i4aBH2G8ksM5gEDiNLXFEBjll/cFgGj
+						sQiZqRpyrEiu1DNYWR7cekhJ76MQ9vRAg+sRi+4+YcJqecm3uSAvfdi06Z50neEI
+						x4if+VFo6Qgx/Kc4nRLASPV0BQMywJZJ8tzI0HmZ8kdgloMtSsEAik7xdZ2qhYUU
+						6PpbbkDoIuMrrMqEbFW6Rk+q/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://api.dev.credoreference.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://api.dev.credoreference.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://api.dev.credoreference.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://api.dev.credoreference.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://api.dev.credoreference.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://api.dev.credoreference.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://api.dev.credoreference.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://api.dev.credoreference.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://api.dev.credoreference.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://api.dev.credoreference.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://api.dev.credoreference.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Credo Reference Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Credo Reference Private DEV RESTful API</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://corp.credoreference.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Credo Reference Support</md:GivenName>
+    <md:EmailAddress>mailto:support@credoreference.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>McFarland</md:SurName>
+    <md:EmailAddress>mailto:michael.mcfarland@credoreference.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/api.qa.credoreference.com-shibboleth-sp.xml b/swamid-interfederations-2.0/api.qa.credoreference.com-shibboleth-sp.xml
new file mode 100644
index 00000000..61126dae
--- /dev/null
+++ b/swamid-interfederations-2.0/api.qa.credoreference.com-shibboleth-sp.xml
@@ -0,0 +1,84 @@
+<?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://api.qa.credoreference.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="2013-08-07T14:52:35Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://api.qa.credoreference.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://api.qa.credoreference.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Credo Reference Private QA RESTful API</mdui:DisplayName>
+        <mdui:Logo height="36" width="200">https://corp.credoreference.com/images/credo_horz_transparent_200w.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDPzCCAiegAwIBAgIJAOsnADaxwuwdMA0GCSqGSIb3DQEBBQUAMDMxMTAvBgNV
+						BAMTKGF3cy11cy1lYS1wcm9kLWRlbW8tMS5jcmVkb3JlZmVyZW5jZS5jb20wHhcN
+						MTQwNDEwMTYwNjQxWhcNMjQwNDA3MTYwNjQxWjAzMTEwLwYDVQQDEyhhd3MtdXMt
+						ZWEtcHJvZC1kZW1vLTEuY3JlZG9yZWZlcmVuY2UuY29tMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAybu7QT+tSyTzBm4XgUzTRH8fU2N7Iqve9z3pHFJK
+						kqxB7x8PG2Tsg5h8PTxkRHbHlvCeK41u72nhUhgD8AGrSwxhGvFJS6ML6m+HgjuC
+						OpoVYrgQFkH7ba7s48nv5iZjWm3PA8EPyhH6+71VdJvCArjPTVhJiBVCTVr4GlRQ
+						aZCFT4DEfgkFSRMm63hGUjvyLNtQeaF3lodVcfseZf5rKshh72T56LADwk2gc3gD
+						RTFELvHLRunml5ocj+hocCc4pahjaI7Wvxxfmq30/9oQSOW/sIAYjBrCCLANPo62
+						ZXwHnpdaq/IK85dIJIWJo97C2Q8OrPDjm60MIGerf/LN7wIDAQABo1YwVDAzBgNV
+						HREELDAqgihhd3MtdXMtZWEtcHJvZC1kZW1vLTEuY3JlZG9yZWZlcmVuY2UuY29t
+						MB0GA1UdDgQWBBSb0bm0aAM/mcTdCLP6Bd7fVhZEIDANBgkqhkiG9w0BAQUFAAOC
+						AQEAWIr7gg8AYViRX60K6x6nCgTfqsc8FEzZevBYgeOpljhxRVu4raHp1e+ycckk
+						JYPzuuJFA/RPHH37xOthxrXUhb6lbOR2bmqOudji/l8m0njEWvlfK1O9APKnzIFK
+						DXo6w1tE/EzL30F2sDKO3z9X2N2bRVfm7i4aBH2G8ksM5gEDiNLXFEBjll/cFgGj
+						sQiZqRpyrEiu1DNYWR7cekhJ76MQ9vRAg+sRi+4+YcJqecm3uSAvfdi06Z50neEI
+						x4if+VFo6Qgx/Kc4nRLASPV0BQMywJZJ8tzI0HmZ8kdgloMtSsEAik7xdZ2qhYUU
+						6PpbbkDoIuMrrMqEbFW6Rk+q/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://api.qa.credoreference.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://api.qa.credoreference.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://api.qa.credoreference.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://api.qa.credoreference.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://api.qa.credoreference.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://api.qa.credoreference.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://api.qa.credoreference.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://api.qa.credoreference.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://api.qa.credoreference.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://api.qa.credoreference.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://api.qa.credoreference.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Credo Reference Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Credo Reference Private QA RESTful API</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://corp.credoreference.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Credo Reference Support</md:GivenName>
+    <md:EmailAddress>mailto:support@credoreference.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>McFarland</md:SurName>
+    <md:EmailAddress>mailto:michael.mcfarland@credoreference.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/app.goodpractice.net.xml b/swamid-interfederations-2.0/app.goodpractice.net.xml
new file mode 100644
index 00000000..de1b7bcc
--- /dev/null
+++ b/swamid-interfederations-2.0/app.goodpractice.net.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://app.goodpractice.net">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-11T10:58:54Z">
+      <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>
+						MIIDHDCCAgSgAwIBAgIJAPkZY/RifCMCMA0GCSqGSIb3DQEBCwUAMA8xDTALBgNV
+						BAMTBHRlc3QwHhcNMTQxMTEyMTEwMTM1WhcNMjQxMTA5MTEwMTM1WjAPMQ0wCwYD
+						VQQDEwR0ZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwbnYcv3B
+						IHH5O1Nu9aOw7IgjsYrzTFGmx/R/Lgbyh03t34FkAQ9SZ4ToKHRI7wJuHN2SveV2
+						LBjZ8PgoM7Nzkryl2fpF6sytuqMhKFzdSEbHEXMn1GqKCQoQGno5jzZAtcyqxXrF
+						iK5WrwSuPbopgGzu9UyPfaxaqmYVN0BW50z3NlKEZoQsc8w5WR9r1GDLNTSG0Jqx
+						sCpzRktkdKAsjskRiqp0X/gFquBEwajyWqF08PGsfwW0iqISc+bCmD1IWGZCQLcy
+						7eanVD3w13oFNPmqmxZSIiNNSXP5Gb7jcBZ+xWORwnIGOTBeThIPEWOlO4Kr7dDC
+						2fm1YW1OiJwRPQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1P
+						cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUwN4Ob3oWtiCr
+						FwqrickuFNGD/e8wHwYDVR0jBBgwFoAUwN4Ob3oWtiCrFwqrickuFNGD/e8wDQYJ
+						KoZIhvcNAQELBQADggEBAEOVm9crJjxi8CPsqJZEfV4ZnO4IlDyEFt3zNpKyamsC
+						01KFXkldoUhg1YNjLkpueysSyCpYrVe3BgkWdEccPO1GrGWYCYOgT3lf9LQ9hH5z
+						KTrkC+vftsNFv8YwWQgrncNscMPldbC6ig0khE2IC3mGJMKR8MgHLJWlNV3txgR5
+						Ri4pgGB+Ax6on6oQHks4I4EvDti7vtarY62Vuu8K6lJHltPkM6BjmQo2n0qJE9Hd
+						4Cp1NN51cLFIhjRA/gurU7ZUJMg84oaEpG+CVQn0ckKLb9JiKajXSh8HvjX5+COk
+						GvUxcf3q5ZXwJL6K+o0lrNadM/TN+8gZW441MEjl8Fc=
+					</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://app.goodpractice.net/security/saml2/response" index="0" isDefault="true"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">GoodPractice Ltd</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">GoodPractice provides relevant leadership and management programmes that improve performance and deliver measurable business change.</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"/>
+      <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="FirstName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="LastName" Name="urn:oid:2.5.4.4" 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">Good Practice Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GoodPractice Ltd</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/app.ords.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/app.ords.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..5e6458ae
--- /dev/null
+++ b/swamid-interfederations-2.0/app.ords.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,67 @@
+<?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://app.ords.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-29T09:07: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://app.ords.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>
+						MIIDIDCCAgigAwIBAgIJAKkU7zta8ElbMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEWFwcC5vcmRzLm94LmFjLnVrMB4XDTE0MDIyMDE2MTQxOFoXDTI0MDIxODE2
+						MTQxOFowHDEaMBgGA1UEAxMRYXBwLm9yZHMub3guYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDDJ+JzjD6rjHcjcHKlnGrYgYMBQ6XWsexSpLsD
+						QHGM2ytN0W0N/66dpBdiQwkWT7NqQcYgppAujj9xkdthnJpdcIkZTvh+nQE/mo97
+						enuLw23CXn3Rf4Hf+q0Emyoxnx7VSTD30J236PpWHVFSIqO0+DlLf4KlnA7Tsx1B
+						W1c92c2aGKGStcVQbI7JXL4MS8txtBqdX0EBEzSMPBWITXlF7QvU4yIPJS4WVGGQ
+						w1jQpQMBS7WjSemb1CxDo4uMf5W91ZEPp/R4kqSINKaoYgwRoflkRBlPu7FhUee2
+						A7NZ1DylUDQHV05Xw81OWVexAWfcCE1qc2NDGIa//TNyabfzAgMBAAGjZTBjMEIG
+						A1UdEQQ7MDmCEWFwcC5vcmRzLm94LmFjLnVrhiRodHRwczovL2FwcC5vcmRzLm94
+						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFFUctzCOP26SDJjvHgRJGCVCXthI
+						MA0GCSqGSIb3DQEBBQUAA4IBAQANWQ8NRS5C2+KUz3Kwb9+43AWUc9RFQdY62c35
+						cEomG8mBQhQdoNkVZ06g0uHXT94v/CUYYmcTY82HbQZ0ikJGiJODhWb9GVVFSTvS
+						HpS/NB9SqC2JwDsr9hGpdeSdK/cA14OtX+WUKZ0MlV3LuSJmH/tiGGZTpUU6YuAm
+						z0L3A3KcMl78xql30Fct61ciwZmyK5m7FpWFGu2qoPf9HkrSLSp03wstNdkBoFHK
+						HCU9m4vQ6uSSzCK0xlcYJ+WFq4mZb0gtRwzDCUtqYNWAFNggwKyYVgGZ4yV4b35Q
+						CTdb2siIqxI2D7KVX71agcKqUXJNnAdCZE5GKTBh1Lpccng7
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.ords.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://app.ords.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://app.ords.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://app.ords.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 ORDS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.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/app.staging.goodpractice.net.xml b/swamid-interfederations-2.0/app.staging.goodpractice.net.xml
new file mode 100644
index 00000000..671ac1e7
--- /dev/null
+++ b/swamid-interfederations-2.0/app.staging.goodpractice.net.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://app.staging.goodpractice.net">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-13T11:18: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:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDHDCCAgSgAwIBAgIJAPkZY/RifCMCMA0GCSqGSIb3DQEBCwUAMA8xDTALBgNV
+						BAMTBHRlc3QwHhcNMTQxMTEyMTEwMTM1WhcNMjQxMTA5MTEwMTM1WjAPMQ0wCwYD
+						VQQDEwR0ZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwbnYcv3B
+						IHH5O1Nu9aOw7IgjsYrzTFGmx/R/Lgbyh03t34FkAQ9SZ4ToKHRI7wJuHN2SveV2
+						LBjZ8PgoM7Nzkryl2fpF6sytuqMhKFzdSEbHEXMn1GqKCQoQGno5jzZAtcyqxXrF
+						iK5WrwSuPbopgGzu9UyPfaxaqmYVN0BW50z3NlKEZoQsc8w5WR9r1GDLNTSG0Jqx
+						sCpzRktkdKAsjskRiqp0X/gFquBEwajyWqF08PGsfwW0iqISc+bCmD1IWGZCQLcy
+						7eanVD3w13oFNPmqmxZSIiNNSXP5Gb7jcBZ+xWORwnIGOTBeThIPEWOlO4Kr7dDC
+						2fm1YW1OiJwRPQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1P
+						cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUwN4Ob3oWtiCr
+						FwqrickuFNGD/e8wHwYDVR0jBBgwFoAUwN4Ob3oWtiCrFwqrickuFNGD/e8wDQYJ
+						KoZIhvcNAQELBQADggEBAEOVm9crJjxi8CPsqJZEfV4ZnO4IlDyEFt3zNpKyamsC
+						01KFXkldoUhg1YNjLkpueysSyCpYrVe3BgkWdEccPO1GrGWYCYOgT3lf9LQ9hH5z
+						KTrkC+vftsNFv8YwWQgrncNscMPldbC6ig0khE2IC3mGJMKR8MgHLJWlNV3txgR5
+						Ri4pgGB+Ax6on6oQHks4I4EvDti7vtarY62Vuu8K6lJHltPkM6BjmQo2n0qJE9Hd
+						4Cp1NN51cLFIhjRA/gurU7ZUJMg84oaEpG+CVQn0ckKLb9JiKajXSh8HvjX5+COk
+						GvUxcf3q5ZXwJL6K+o0lrNadM/TN+8gZW441MEjl8Fc=
+					</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://app.staging.goodpractice.net/security/saml2/response" index="0" isDefault="true"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">GoodPractice Ltd</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">GoodPractice provides relevant leadership and management programmes that improve performance and deliver measurable business change.</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"/>
+      <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="FirstName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="LastName" Name="urn:oid:2.5.4.4" 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">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/appdb-dev.marie.hellasgrid.gr-edugain-connect.xml b/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-connect.xml
new file mode 100644
index 00000000..bc136e3c
--- /dev/null
+++ b/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-connect.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb-dev.marie.hellasgrid.gr/edugain-connect">
+  <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: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">EGI Applications Database (DEV - Connect)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">EGI Software &amp; Cloud Marketplace (Development Instance - Connect)</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.appdb.egi.eu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="el">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
+        <mdui:Logo width="120" height="128">https://appdb-dev.marie.hellasgrid.gr/images/appdblogo.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>MIIFHjCCBAagAwIBAgICA8swDQYJKoZIhvcNAQEFBQAwRTETMBEGCgmSJomT8ixkARkTA09SRzEYMBYGCgmSJomT8ixkARkTCFNFRS1HUklEMRQwEgYDVQQDEwtTRUUtR1JJRCBDQTAeFw0xMzEwMTcxNjEwMTdaFw0xNDA4MTMxNjEwMTdaMG4xEjAQBgoJkiaJk/IsZAEZFgJFVTETMBEGCgmSJomT8ixkARkWA0VHSTELMAkGA1UEBhMCTkwxDjAMBgNVBAoTBUhvc3RzMQ8wDQYDVQQKEwZFR0kuZXUxFTATBgNVBAMTDGFwcGRiLmVnaS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8aVSi+D+NoPI1mRwQGyiOVkxofhYb5ZZGICaQkT8Mu1YaxzxBUl9X94Ily/nv6jp6QfIRA11D7TOB70MoujLmRow/GOt0enkEb0XomI3wM/PiBOvZgjzlaav8R9adKK87lPEvn+LhcjBbMqoIk5C68lQ1dNtKX4G+lUlYY1dbSgPUe5RwEdM8X3EQ1lkYehiC4elDwYKlhTTODtiu7OBm2m/LsYEwWDeaA0XdUK2uv5zaaJyJ+E/NjYxDkIM75MGhS//sPYfEOzqwNm7XY2RlwJR5V47xadCXTxXz3HKuAxx7rwln+EO1bkA6QEgIJ2WLL2dERl2wuhz16QbzDfh8CAwEAAaOCAe0wggHpMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgbAMA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQURbjI/ju4HYZ9M0y+hyekx2aWZCswbQYDVR0jBGYwZIAUiz2pt50yJY8/6Nlcb4vnWpSU0MGhSaRHMEUxEzARBgoJkiaJk/IsZAEZEwNPUkcxGDAWBgoJkiaJk/IsZAEZEwhTRUUtR1JJRDEUMBIGA1UEAxMLU0VFLUdSSUQgQ0GCAQAwVQYDVR0fBE4wTDBKoEigRoZEaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2Evc2VydmljZXMvY3JsL3NlZWdyaWRjYS12Mi5jcmwwbAYDVR0gBGUwYzBTBg0rBgEEAYGBAxQCAQICMEIwQAYIKwYBBQUHAgEWNGh0dHA6Ly93d3cuZ3JpZC5hdXRoLmdyL3BraS9zZWVncmlkLWNhL2RvY3VtZW50cy9jcHMwDAYKKoZIhvdMBQICATBKBgNVHRIEQzBBgRdzZWVncmlkLWNhQGdyaWQuYXV0aC5ncoYmaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2EwFwYDVR0RBBAwDoIMYXBwZGIuZWdpLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAXCX8H4nqRDt0UQTdFj+2rbezYFmyw4vQk/zQW+5+bBzoPAI0+/AhcPU6G5MoOTS2AUvqglpdSOWB/XUHrS9J5DFnAaQNj16VYcfMVmVx+TQctZFdAPLriq2r+mCwFAJKA44p9xJZ0nL+YTcHFiUTn2houCvFCEVhF2iMS12fxm0mCRzyCGI7x5PHCsEw2giaAJrErDkFSlIaVUyhNTatIueXfnuclx5E91KQPu/d9Uz/Zn2P6fAJ9D3OaLTscCrij/AqY36Is/93aXkf3oatIc4WvSxJah0pzMFtx7bWj+Q3XDfFXmiy/q7JXQXVs0ZurIoZ5Ngv7UqiIBS9/UEK+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFHjCCBAagAwIBAgICA8swDQYJKoZIhvcNAQEFBQAwRTETMBEGCgmSJomT8ixkARkTA09SRzEYMBYGCgmSJomT8ixkARkTCFNFRS1HUklEMRQwEgYDVQQDEwtTRUUtR1JJRCBDQTAeFw0xMzEwMTcxNjEwMTdaFw0xNDA4MTMxNjEwMTdaMG4xEjAQBgoJkiaJk/IsZAEZFgJFVTETMBEGCgmSJomT8ixkARkWA0VHSTELMAkGA1UEBhMCTkwxDjAMBgNVBAoTBUhvc3RzMQ8wDQYDVQQKEwZFR0kuZXUxFTATBgNVBAMTDGFwcGRiLmVnaS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8aVSi+D+NoPI1mRwQGyiOVkxofhYb5ZZGICaQkT8Mu1YaxzxBUl9X94Ily/nv6jp6QfIRA11D7TOB70MoujLmRow/GOt0enkEb0XomI3wM/PiBOvZgjzlaav8R9adKK87lPEvn+LhcjBbMqoIk5C68lQ1dNtKX4G+lUlYY1dbSgPUe5RwEdM8X3EQ1lkYehiC4elDwYKlhTTODtiu7OBm2m/LsYEwWDeaA0XdUK2uv5zaaJyJ+E/NjYxDkIM75MGhS//sPYfEOzqwNm7XY2RlwJR5V47xadCXTxXz3HKuAxx7rwln+EO1bkA6QEgIJ2WLL2dERl2wuhz16QbzDfh8CAwEAAaOCAe0wggHpMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgbAMA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQURbjI/ju4HYZ9M0y+hyekx2aWZCswbQYDVR0jBGYwZIAUiz2pt50yJY8/6Nlcb4vnWpSU0MGhSaRHMEUxEzARBgoJkiaJk/IsZAEZEwNPUkcxGDAWBgoJkiaJk/IsZAEZEwhTRUUtR1JJRDEUMBIGA1UEAxMLU0VFLUdSSUQgQ0GCAQAwVQYDVR0fBE4wTDBKoEigRoZEaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2Evc2VydmljZXMvY3JsL3NlZWdyaWRjYS12Mi5jcmwwbAYDVR0gBGUwYzBTBg0rBgEEAYGBAxQCAQICMEIwQAYIKwYBBQUHAgEWNGh0dHA6Ly93d3cuZ3JpZC5hdXRoLmdyL3BraS9zZWVncmlkLWNhL2RvY3VtZW50cy9jcHMwDAYKKoZIhvdMBQICATBKBgNVHRIEQzBBgRdzZWVncmlkLWNhQGdyaWQuYXV0aC5ncoYmaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2EwFwYDVR0RBBAwDoIMYXBwZGIuZWdpLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAXCX8H4nqRDt0UQTdFj+2rbezYFmyw4vQk/zQW+5+bBzoPAI0+/AhcPU6G5MoOTS2AUvqglpdSOWB/XUHrS9J5DFnAaQNj16VYcfMVmVx+TQctZFdAPLriq2r+mCwFAJKA44p9xJZ0nL+YTcHFiUTn2houCvFCEVhF2iMS12fxm0mCRzyCGI7x5PHCsEw2giaAJrErDkFSlIaVUyhNTatIueXfnuclx5E91KQPu/d9Uz/Zn2P6fAJ9D3OaLTscCrij/AqY36Is/93aXkf3oatIc4WvSxJah0pzMFtx7bWj+Q3XDfFXmiy/q7JXQXVs0ZurIoZ5Ngv7UqiIBS9/UEK+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-logout.php/edugain-connect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-logout.php/edugain-connect"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-acs.php/edugain-connect" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml1-acs.php/edugain-connect" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-acs.php/edugain-connect" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml1-acs.php/edugain-connect/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">EGI Applications Database (DEV - Connect)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">EGI Software &amp; Cloud Marketplace (Development Instance - Connect)</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: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: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.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.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.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.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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IASA - GRNET</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">ΙΕΣΕ - ΕΔΕΤ</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Accelerating Systems and Applications - Greek Research and Technology Network</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Επιταχυντικών Συστημάτων και Εφαρμογών - Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iasa.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.iasa.gr/</md:OrganizationURL>
+    <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:GivenName>Marios</md:GivenName>
+    <md:SurName>Chatziangelou</md:SurName>
+    <md:EmailAddress>mhaggel@iasa.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Marios</md:GivenName>
+    <md:SurName>Chatziangelou</md:SurName>
+    <md:EmailAddress>appdb-support@iasa.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-sp.xml b/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-sp.xml
new file mode 100644
index 00000000..1546b87d
--- /dev/null
+++ b/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-sp.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb-dev.marie.hellasgrid.gr/edugain-sp">
+  <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: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">EGI Applications Database (DEV)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">EGI Software &amp; Cloud Marketplace (Development Instance)</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.appdb.egi.eu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="el">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
+        <mdui:Logo width="120" height="128">https://appdb-dev.marie.hellasgrid.gr/images/appdblogo.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>MIIFHjCCBAagAwIBAgICA8swDQYJKoZIhvcNAQEFBQAwRTETMBEGCgmSJomT8ixkARkTA09SRzEYMBYGCgmSJomT8ixkARkTCFNFRS1HUklEMRQwEgYDVQQDEwtTRUUtR1JJRCBDQTAeFw0xMzEwMTcxNjEwMTdaFw0xNDA4MTMxNjEwMTdaMG4xEjAQBgoJkiaJk/IsZAEZFgJFVTETMBEGCgmSJomT8ixkARkWA0VHSTELMAkGA1UEBhMCTkwxDjAMBgNVBAoTBUhvc3RzMQ8wDQYDVQQKEwZFR0kuZXUxFTATBgNVBAMTDGFwcGRiLmVnaS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8aVSi+D+NoPI1mRwQGyiOVkxofhYb5ZZGICaQkT8Mu1YaxzxBUl9X94Ily/nv6jp6QfIRA11D7TOB70MoujLmRow/GOt0enkEb0XomI3wM/PiBOvZgjzlaav8R9adKK87lPEvn+LhcjBbMqoIk5C68lQ1dNtKX4G+lUlYY1dbSgPUe5RwEdM8X3EQ1lkYehiC4elDwYKlhTTODtiu7OBm2m/LsYEwWDeaA0XdUK2uv5zaaJyJ+E/NjYxDkIM75MGhS//sPYfEOzqwNm7XY2RlwJR5V47xadCXTxXz3HKuAxx7rwln+EO1bkA6QEgIJ2WLL2dERl2wuhz16QbzDfh8CAwEAAaOCAe0wggHpMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgbAMA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQURbjI/ju4HYZ9M0y+hyekx2aWZCswbQYDVR0jBGYwZIAUiz2pt50yJY8/6Nlcb4vnWpSU0MGhSaRHMEUxEzARBgoJkiaJk/IsZAEZEwNPUkcxGDAWBgoJkiaJk/IsZAEZEwhTRUUtR1JJRDEUMBIGA1UEAxMLU0VFLUdSSUQgQ0GCAQAwVQYDVR0fBE4wTDBKoEigRoZEaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2Evc2VydmljZXMvY3JsL3NlZWdyaWRjYS12Mi5jcmwwbAYDVR0gBGUwYzBTBg0rBgEEAYGBAxQCAQICMEIwQAYIKwYBBQUHAgEWNGh0dHA6Ly93d3cuZ3JpZC5hdXRoLmdyL3BraS9zZWVncmlkLWNhL2RvY3VtZW50cy9jcHMwDAYKKoZIhvdMBQICATBKBgNVHRIEQzBBgRdzZWVncmlkLWNhQGdyaWQuYXV0aC5ncoYmaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2EwFwYDVR0RBBAwDoIMYXBwZGIuZWdpLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAXCX8H4nqRDt0UQTdFj+2rbezYFmyw4vQk/zQW+5+bBzoPAI0+/AhcPU6G5MoOTS2AUvqglpdSOWB/XUHrS9J5DFnAaQNj16VYcfMVmVx+TQctZFdAPLriq2r+mCwFAJKA44p9xJZ0nL+YTcHFiUTn2houCvFCEVhF2iMS12fxm0mCRzyCGI7x5PHCsEw2giaAJrErDkFSlIaVUyhNTatIueXfnuclx5E91KQPu/d9Uz/Zn2P6fAJ9D3OaLTscCrij/AqY36Is/93aXkf3oatIc4WvSxJah0pzMFtx7bWj+Q3XDfFXmiy/q7JXQXVs0ZurIoZ5Ngv7UqiIBS9/UEK+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFHjCCBAagAwIBAgICA8swDQYJKoZIhvcNAQEFBQAwRTETMBEGCgmSJomT8ixkARkTA09SRzEYMBYGCgmSJomT8ixkARkTCFNFRS1HUklEMRQwEgYDVQQDEwtTRUUtR1JJRCBDQTAeFw0xMzEwMTcxNjEwMTdaFw0xNDA4MTMxNjEwMTdaMG4xEjAQBgoJkiaJk/IsZAEZFgJFVTETMBEGCgmSJomT8ixkARkWA0VHSTELMAkGA1UEBhMCTkwxDjAMBgNVBAoTBUhvc3RzMQ8wDQYDVQQKEwZFR0kuZXUxFTATBgNVBAMTDGFwcGRiLmVnaS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8aVSi+D+NoPI1mRwQGyiOVkxofhYb5ZZGICaQkT8Mu1YaxzxBUl9X94Ily/nv6jp6QfIRA11D7TOB70MoujLmRow/GOt0enkEb0XomI3wM/PiBOvZgjzlaav8R9adKK87lPEvn+LhcjBbMqoIk5C68lQ1dNtKX4G+lUlYY1dbSgPUe5RwEdM8X3EQ1lkYehiC4elDwYKlhTTODtiu7OBm2m/LsYEwWDeaA0XdUK2uv5zaaJyJ+E/NjYxDkIM75MGhS//sPYfEOzqwNm7XY2RlwJR5V47xadCXTxXz3HKuAxx7rwln+EO1bkA6QEgIJ2WLL2dERl2wuhz16QbzDfh8CAwEAAaOCAe0wggHpMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgbAMA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQURbjI/ju4HYZ9M0y+hyekx2aWZCswbQYDVR0jBGYwZIAUiz2pt50yJY8/6Nlcb4vnWpSU0MGhSaRHMEUxEzARBgoJkiaJk/IsZAEZEwNPUkcxGDAWBgoJkiaJk/IsZAEZEwhTRUUtR1JJRDEUMBIGA1UEAxMLU0VFLUdSSUQgQ0GCAQAwVQYDVR0fBE4wTDBKoEigRoZEaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2Evc2VydmljZXMvY3JsL3NlZWdyaWRjYS12Mi5jcmwwbAYDVR0gBGUwYzBTBg0rBgEEAYGBAxQCAQICMEIwQAYIKwYBBQUHAgEWNGh0dHA6Ly93d3cuZ3JpZC5hdXRoLmdyL3BraS9zZWVncmlkLWNhL2RvY3VtZW50cy9jcHMwDAYKKoZIhvdMBQICATBKBgNVHRIEQzBBgRdzZWVncmlkLWNhQGdyaWQuYXV0aC5ncoYmaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2EwFwYDVR0RBBAwDoIMYXBwZGIuZWdpLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAXCX8H4nqRDt0UQTdFj+2rbezYFmyw4vQk/zQW+5+bBzoPAI0+/AhcPU6G5MoOTS2AUvqglpdSOWB/XUHrS9J5DFnAaQNj16VYcfMVmVx+TQctZFdAPLriq2r+mCwFAJKA44p9xJZ0nL+YTcHFiUTn2houCvFCEVhF2iMS12fxm0mCRzyCGI7x5PHCsEw2giaAJrErDkFSlIaVUyhNTatIueXfnuclx5E91KQPu/d9Uz/Zn2P6fAJ9D3OaLTscCrij/AqY36Is/93aXkf3oatIc4WvSxJah0pzMFtx7bWj+Q3XDfFXmiy/q7JXQXVs0ZurIoZ5Ngv7UqiIBS9/UEK+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-logout.php/edugain-sp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-logout.php/edugain-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-acs.php/edugain-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml1-acs.php/edugain-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-acs.php/edugain-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml1-acs.php/edugain-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">EGI Applications Database (DEV)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">EGI Software &amp; Cloud Marketplace (Development Instance)</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: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: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.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.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.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.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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IASA - GRNET</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">ΙΕΣΕ - ΕΔΕΤ</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Accelerating Systems and Applications - Greek Research and Technology Network</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Επιταχυντικών Συστημάτων και Εφαρμογών - Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iasa.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.iasa.gr/</md:OrganizationURL>
+    <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:GivenName>Marios</md:GivenName>
+    <md:SurName>Chatziangelou</md:SurName>
+    <md:EmailAddress>mhaggel@iasa.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Marios</md:GivenName>
+    <md:SurName>Chatziangelou</md:SurName>
+    <md:EmailAddress>appdb-support@iasa.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/appdb.egi.eu-edugain-connect.xml b/swamid-interfederations-2.0/appdb.egi.eu-edugain-connect.xml
new file mode 100644
index 00000000..24bcd4e5
--- /dev/null
+++ b/swamid-interfederations-2.0/appdb.egi.eu-edugain-connect.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb.egi.eu/edugain-connect">
+  <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: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">EGI Applications Database (Connect)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">EGI Software &amp; Cloud Marketplace (Connect)</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.appdb.egi.eu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="el">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
+        <mdui:Logo width="120" height="128">https://appdb.egi.eu/images/appdblogo.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>MIID9TCCAt2gAwIBAgIJAIXaE7tbXMMCMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYDVQQGEwJHUjEPMA0GA1UECAwGR3JlZWNlMQ8wDQYDVQQHDAZBdGhlbnMxDTALBgNVBAoMBElBU0ExEzARBgNVBAsMCkFwcERCL0lBU0ExFTATBgNVBAMMDGFwcGRiLmVnaS5ldTEkMCIGCSqGSIb3DQEJARYVYXBwZGItc3VwcG9ydEBpYXNhLmdyMB4XDTE0MTAyMTE2Mjc0N1oXDTI0MTAyMDE2Mjc0N1owgZAxCzAJBgNVBAYTAkdSMQ8wDQYDVQQIDAZHcmVlY2UxDzANBgNVBAcMBkF0aGVuczENMAsGA1UECgwESUFTQTETMBEGA1UECwwKQXBwREIvSUFTQTEVMBMGA1UEAwwMYXBwZGIuZWdpLmV1MSQwIgYJKoZIhvcNAQkBFhVhcHBkYi1zdXBwb3J0QGlhc2EuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD9cPAvFySX3f0rcBymgZ1uiW8xH4oo+E76USeAWBb5uext1yZiV6dM4lAw/s/rxiNV23yaY3T4ELVxe/84jkftxhoMQfP+TgqgGFpldwivdRWpnJs9FiYnd92OabOWNKYQDzx1eqIP1nqOwUiMNtbHH7kGDbkAelxP5eNwCrvk/UNX+Fp0vW7QXAdEQAzRahyC1i4VwgSEVfitLMTtAR3JZKybHhKr5tTK8oPO00pSj6L4TB9mBZB8LtR3RpyWgQlrMIIvd0upST24B5atYNW+J33Gmcu2jhhpDdQJ+QaFl/6j9Ye1aJFa1ysvwz6b+VsK3pvi2lpHGcCn9LjHF9ALAgMBAAGjUDBOMB0GA1UdDgQWBBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAfBgNVHSMEGDAWgBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPCzRBbiyVZnrO9YxU8VWhzMrQLpAYwcNygGy9emPXwR2iygauIoi7f5MYe5e+BekC57CSxASPCa1431+OgoUNBYROzeasUfXpT5ofFeOH3ciJXMkUbO9E36/S5icbBeMHW60EJoNAhihzVYDtqmbKH6Xfjo6eqH8X745S4yYBLlRvSRYWxxLlAS9Q3ODel7a8L5zzwLSSmbHywkmlton/paeUqku5nSSPs0sO3JIMQoRqH3Mne+CSP6jxrAJVNdhthpKltLtlWB8IZamVhUjGIK3OsF77Vxk3WktY+KwlpgNHnWAXqT9KGCWaZMesDSrXe/sszcgi6Su1WPg8NNTZ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID9TCCAt2gAwIBAgIJAIXaE7tbXMMCMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYDVQQGEwJHUjEPMA0GA1UECAwGR3JlZWNlMQ8wDQYDVQQHDAZBdGhlbnMxDTALBgNVBAoMBElBU0ExEzARBgNVBAsMCkFwcERCL0lBU0ExFTATBgNVBAMMDGFwcGRiLmVnaS5ldTEkMCIGCSqGSIb3DQEJARYVYXBwZGItc3VwcG9ydEBpYXNhLmdyMB4XDTE0MTAyMTE2Mjc0N1oXDTI0MTAyMDE2Mjc0N1owgZAxCzAJBgNVBAYTAkdSMQ8wDQYDVQQIDAZHcmVlY2UxDzANBgNVBAcMBkF0aGVuczENMAsGA1UECgwESUFTQTETMBEGA1UECwwKQXBwREIvSUFTQTEVMBMGA1UEAwwMYXBwZGIuZWdpLmV1MSQwIgYJKoZIhvcNAQkBFhVhcHBkYi1zdXBwb3J0QGlhc2EuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD9cPAvFySX3f0rcBymgZ1uiW8xH4oo+E76USeAWBb5uext1yZiV6dM4lAw/s/rxiNV23yaY3T4ELVxe/84jkftxhoMQfP+TgqgGFpldwivdRWpnJs9FiYnd92OabOWNKYQDzx1eqIP1nqOwUiMNtbHH7kGDbkAelxP5eNwCrvk/UNX+Fp0vW7QXAdEQAzRahyC1i4VwgSEVfitLMTtAR3JZKybHhKr5tTK8oPO00pSj6L4TB9mBZB8LtR3RpyWgQlrMIIvd0upST24B5atYNW+J33Gmcu2jhhpDdQJ+QaFl/6j9Ye1aJFa1ysvwz6b+VsK3pvi2lpHGcCn9LjHF9ALAgMBAAGjUDBOMB0GA1UdDgQWBBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAfBgNVHSMEGDAWgBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPCzRBbiyVZnrO9YxU8VWhzMrQLpAYwcNygGy9emPXwR2iygauIoi7f5MYe5e+BekC57CSxASPCa1431+OgoUNBYROzeasUfXpT5ofFeOH3ciJXMkUbO9E36/S5icbBeMHW60EJoNAhihzVYDtqmbKH6Xfjo6eqH8X745S4yYBLlRvSRYWxxLlAS9Q3ODel7a8L5zzwLSSmbHywkmlton/paeUqku5nSSPs0sO3JIMQoRqH3Mne+CSP6jxrAJVNdhthpKltLtlWB8IZamVhUjGIK3OsF77Vxk3WktY+KwlpgNHnWAXqT9KGCWaZMesDSrXe/sszcgi6Su1WPg8NNTZ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIRAIXc8Krve5VuXkhnojBEvuAwDQYJKoZIhvcNAQEFBQAwczELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxGTAXBgNVBAMTEFBvc2l0aXZlU1NMIENBIDIwHhcNMTMxMDAzMDAwMDAwWhcNMTQxMDAzMjM1OTU5WjBQMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMRUwEwYDVQQDEwxhcHBkYi5lZ2kuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9RMFe27ucrw5Uv2oCmfxIB2O4q/dwFNZVZmTWfiRisOyvSUtooCDneO4vhvt6h9YP7zAjPjfBA6SruBKtfXH5j3uPEEllpV4jq4mPJBo0D0P1aPq9ibbh0DrO+XRlcjjXAKYmlBZxa2oIjiFD7MgxAzf6VkTHCNDN/tGLFxCv1+/ExvPpOUZTPBkiGXkEDyJATpepFxROVoo7IZf5Azqpy3lLSMiqbTEKkQXbcW8egmP6wmMpUaNRYHtwNiU3qRVKrZw/322P2yYuFLUpCHPjTNKW4SMlhbt4RyMtO0LnIAJt9DgcMaiha2EDcaojV1fq7pFZzCg1YC6uvFG9atkxAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBSZ5EBfaxRePgXZ3dNjVPxiuPcArDAdBgNVHQ4EFgQUtxGXMez+256VFqWJT7kEz3zY5EEwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFAGA1UdIARJMEcwOwYLKwYBBAGyMQECAgcwLDAqBggrBgEFBQcCARYeaHR0cDovL3d3dy5wb3NpdGl2ZXNzbC5jb20vQ1BTMAgGBmeBDAECATA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcmwwbAYIKwYBBQUHAQEEYDBeMDYGCCsGAQUFBzAChipodHRwOi8vY3J0LmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTApBgNVHREEIjAgggxhcHBkYi5lZ2kuZXWCEHd3dy5hcHBkYi5lZ2kuZXUwDQYJKoZIhvcNAQEFBQADggEBAJTG+QIH44hiyl/vxEncKy6vAib3n7PbqphVmA4NDf0peKp8xdYoG23YnHG72aGsUwg9031RtN/1LqaAgb2A3JOF5of1pobqQbwPUC6mSNuXFm1cOtZR8gG5e6G3mwB9FWb0P6WK+yzsBhz3ekSziv4PgZjd1HIiSLUg1YwpWYvBIdi+MCDZVSgNmJr9QKsv+N50fcYuGYSmXOEnLNchyMUPcQzzSO/xI0JkeiQkAQ5WfCV03ykmBxSvefeJo35GMzGEIpxrQ/DgyvKIwkFtBf/ESA4ID3JN7+iZJs2XjWRgFZx5mKCwr5uY2tNmvbFvM7g1zFwOyLdlEV45Dp3d9bk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-logout.php/edugain-connect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-logout.php/edugain-connect"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-acs.php/edugain-connect" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml1-acs.php/edugain-connect" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-acs.php/edugain-connect" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml1-acs.php/edugain-connect/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">EGI Applications Database (Connect)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">EGI Software &amp; Cloud Marketplace (Connect)</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: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: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.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.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.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.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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IASA - GRNET</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">ΙΕΣΕ - ΕΔΕΤ</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Accelerating Systems and Applications - Greek Research and Technology Network</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Επιταχυντικών Συστημάτων και Εφαρμογών - Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iasa.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.iasa.gr/</md:OrganizationURL>
+    <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:GivenName>Marios</md:GivenName>
+    <md:SurName>Chatziangelou</md:SurName>
+    <md:EmailAddress>mhaggel@iasa.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Marios</md:GivenName>
+    <md:SurName>Chatziangelou</md:SurName>
+    <md:EmailAddress>appdb-support@iasa.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/appdb.egi.eu-edugain-sp.xml b/swamid-interfederations-2.0/appdb.egi.eu-edugain-sp.xml
new file mode 100644
index 00000000..ae09861e
--- /dev/null
+++ b/swamid-interfederations-2.0/appdb.egi.eu-edugain-sp.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb.egi.eu/edugain-sp">
+  <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: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">EGI Applications Database</mdui:DisplayName>
+        <mdui:Description xml:lang="en">EGI Software &amp; Cloud Marketplace</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.appdb.egi.eu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="el">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
+        <mdui:Logo width="120" height="128">https://appdb.egi.eu/images/appdblogo.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>MIID9TCCAt2gAwIBAgIJAIXaE7tbXMMCMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYDVQQGEwJHUjEPMA0GA1UECAwGR3JlZWNlMQ8wDQYDVQQHDAZBdGhlbnMxDTALBgNVBAoMBElBU0ExEzARBgNVBAsMCkFwcERCL0lBU0ExFTATBgNVBAMMDGFwcGRiLmVnaS5ldTEkMCIGCSqGSIb3DQEJARYVYXBwZGItc3VwcG9ydEBpYXNhLmdyMB4XDTE0MTAyMTE2Mjc0N1oXDTI0MTAyMDE2Mjc0N1owgZAxCzAJBgNVBAYTAkdSMQ8wDQYDVQQIDAZHcmVlY2UxDzANBgNVBAcMBkF0aGVuczENMAsGA1UECgwESUFTQTETMBEGA1UECwwKQXBwREIvSUFTQTEVMBMGA1UEAwwMYXBwZGIuZWdpLmV1MSQwIgYJKoZIhvcNAQkBFhVhcHBkYi1zdXBwb3J0QGlhc2EuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD9cPAvFySX3f0rcBymgZ1uiW8xH4oo+E76USeAWBb5uext1yZiV6dM4lAw/s/rxiNV23yaY3T4ELVxe/84jkftxhoMQfP+TgqgGFpldwivdRWpnJs9FiYnd92OabOWNKYQDzx1eqIP1nqOwUiMNtbHH7kGDbkAelxP5eNwCrvk/UNX+Fp0vW7QXAdEQAzRahyC1i4VwgSEVfitLMTtAR3JZKybHhKr5tTK8oPO00pSj6L4TB9mBZB8LtR3RpyWgQlrMIIvd0upST24B5atYNW+J33Gmcu2jhhpDdQJ+QaFl/6j9Ye1aJFa1ysvwz6b+VsK3pvi2lpHGcCn9LjHF9ALAgMBAAGjUDBOMB0GA1UdDgQWBBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAfBgNVHSMEGDAWgBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPCzRBbiyVZnrO9YxU8VWhzMrQLpAYwcNygGy9emPXwR2iygauIoi7f5MYe5e+BekC57CSxASPCa1431+OgoUNBYROzeasUfXpT5ofFeOH3ciJXMkUbO9E36/S5icbBeMHW60EJoNAhihzVYDtqmbKH6Xfjo6eqH8X745S4yYBLlRvSRYWxxLlAS9Q3ODel7a8L5zzwLSSmbHywkmlton/paeUqku5nSSPs0sO3JIMQoRqH3Mne+CSP6jxrAJVNdhthpKltLtlWB8IZamVhUjGIK3OsF77Vxk3WktY+KwlpgNHnWAXqT9KGCWaZMesDSrXe/sszcgi6Su1WPg8NNTZ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID9TCCAt2gAwIBAgIJAIXaE7tbXMMCMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYDVQQGEwJHUjEPMA0GA1UECAwGR3JlZWNlMQ8wDQYDVQQHDAZBdGhlbnMxDTALBgNVBAoMBElBU0ExEzARBgNVBAsMCkFwcERCL0lBU0ExFTATBgNVBAMMDGFwcGRiLmVnaS5ldTEkMCIGCSqGSIb3DQEJARYVYXBwZGItc3VwcG9ydEBpYXNhLmdyMB4XDTE0MTAyMTE2Mjc0N1oXDTI0MTAyMDE2Mjc0N1owgZAxCzAJBgNVBAYTAkdSMQ8wDQYDVQQIDAZHcmVlY2UxDzANBgNVBAcMBkF0aGVuczENMAsGA1UECgwESUFTQTETMBEGA1UECwwKQXBwREIvSUFTQTEVMBMGA1UEAwwMYXBwZGIuZWdpLmV1MSQwIgYJKoZIhvcNAQkBFhVhcHBkYi1zdXBwb3J0QGlhc2EuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD9cPAvFySX3f0rcBymgZ1uiW8xH4oo+E76USeAWBb5uext1yZiV6dM4lAw/s/rxiNV23yaY3T4ELVxe/84jkftxhoMQfP+TgqgGFpldwivdRWpnJs9FiYnd92OabOWNKYQDzx1eqIP1nqOwUiMNtbHH7kGDbkAelxP5eNwCrvk/UNX+Fp0vW7QXAdEQAzRahyC1i4VwgSEVfitLMTtAR3JZKybHhKr5tTK8oPO00pSj6L4TB9mBZB8LtR3RpyWgQlrMIIvd0upST24B5atYNW+J33Gmcu2jhhpDdQJ+QaFl/6j9Ye1aJFa1ysvwz6b+VsK3pvi2lpHGcCn9LjHF9ALAgMBAAGjUDBOMB0GA1UdDgQWBBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAfBgNVHSMEGDAWgBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPCzRBbiyVZnrO9YxU8VWhzMrQLpAYwcNygGy9emPXwR2iygauIoi7f5MYe5e+BekC57CSxASPCa1431+OgoUNBYROzeasUfXpT5ofFeOH3ciJXMkUbO9E36/S5icbBeMHW60EJoNAhihzVYDtqmbKH6Xfjo6eqH8X745S4yYBLlRvSRYWxxLlAS9Q3ODel7a8L5zzwLSSmbHywkmlton/paeUqku5nSSPs0sO3JIMQoRqH3Mne+CSP6jxrAJVNdhthpKltLtlWB8IZamVhUjGIK3OsF77Vxk3WktY+KwlpgNHnWAXqT9KGCWaZMesDSrXe/sszcgi6Su1WPg8NNTZ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIRAIXc8Krve5VuXkhnojBEvuAwDQYJKoZIhvcNAQEFBQAwczELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxGTAXBgNVBAMTEFBvc2l0aXZlU1NMIENBIDIwHhcNMTMxMDAzMDAwMDAwWhcNMTQxMDAzMjM1OTU5WjBQMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMRUwEwYDVQQDEwxhcHBkYi5lZ2kuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9RMFe27ucrw5Uv2oCmfxIB2O4q/dwFNZVZmTWfiRisOyvSUtooCDneO4vhvt6h9YP7zAjPjfBA6SruBKtfXH5j3uPEEllpV4jq4mPJBo0D0P1aPq9ibbh0DrO+XRlcjjXAKYmlBZxa2oIjiFD7MgxAzf6VkTHCNDN/tGLFxCv1+/ExvPpOUZTPBkiGXkEDyJATpepFxROVoo7IZf5Azqpy3lLSMiqbTEKkQXbcW8egmP6wmMpUaNRYHtwNiU3qRVKrZw/322P2yYuFLUpCHPjTNKW4SMlhbt4RyMtO0LnIAJt9DgcMaiha2EDcaojV1fq7pFZzCg1YC6uvFG9atkxAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBSZ5EBfaxRePgXZ3dNjVPxiuPcArDAdBgNVHQ4EFgQUtxGXMez+256VFqWJT7kEz3zY5EEwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFAGA1UdIARJMEcwOwYLKwYBBAGyMQECAgcwLDAqBggrBgEFBQcCARYeaHR0cDovL3d3dy5wb3NpdGl2ZXNzbC5jb20vQ1BTMAgGBmeBDAECATA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcmwwbAYIKwYBBQUHAQEEYDBeMDYGCCsGAQUFBzAChipodHRwOi8vY3J0LmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTApBgNVHREEIjAgggxhcHBkYi5lZ2kuZXWCEHd3dy5hcHBkYi5lZ2kuZXUwDQYJKoZIhvcNAQEFBQADggEBAJTG+QIH44hiyl/vxEncKy6vAib3n7PbqphVmA4NDf0peKp8xdYoG23YnHG72aGsUwg9031RtN/1LqaAgb2A3JOF5of1pobqQbwPUC6mSNuXFm1cOtZR8gG5e6G3mwB9FWb0P6WK+yzsBhz3ekSziv4PgZjd1HIiSLUg1YwpWYvBIdi+MCDZVSgNmJr9QKsv+N50fcYuGYSmXOEnLNchyMUPcQzzSO/xI0JkeiQkAQ5WfCV03ykmBxSvefeJo35GMzGEIpxrQ/DgyvKIwkFtBf/ESA4ID3JN7+iZJs2XjWRgFZx5mKCwr5uY2tNmvbFvM7g1zFwOyLdlEV45Dp3d9bk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-logout.php/edugain-sp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-logout.php/edugain-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-acs.php/edugain-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml1-acs.php/edugain-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-acs.php/edugain-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml1-acs.php/edugain-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">EGI Applications Database</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">EGI Software &amp; Cloud Marketplace</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: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: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.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.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.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.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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IASA - GRNET</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">ΙΕΣΕ - ΕΔΕΤ</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Accelerating Systems and Applications - Greek Research and Technology Network</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Επιταχυντικών Συστημάτων και Εφαρμογών - Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iasa.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.iasa.gr/</md:OrganizationURL>
+    <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:GivenName>Marios</md:GivenName>
+    <md:SurName>Chatziangelou</md:SurName>
+    <md:EmailAddress>mhaggel@iasa.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Marios</md:GivenName>
+    <md:SurName>Chatziangelou</md:SurName>
+    <md:EmailAddress>appdb-support@iasa.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml b/swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml
new file mode 100644
index 00000000..b79b06e8
--- /dev/null
+++ b/swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://applications.eu-decide.eu/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:SPSSODescriptor protocolSupportEnumeration="urn:oasis: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">DECIDE Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">DECIDE Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                        This service allows to access and use the applications of the DECIDE project
+                        which provides neurologists and physicians with software tools for the computer-aided
+                        extraction of diagnostic markers for Alzheimer's disease and schizophrenia from
+                        medical images.
+                    </mdui:Description>
+        <mdui:Description xml:lang="it">
+                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il
+                        progetto europeo DECIDE che ha come obiettivo quello di fornire a medici ed analisti tool software per
+                        l'individuazione di marker per l'Alzheimer e la schizzofrenia in immagini mediche
+                    </mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://applications.eu-decide.eu/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://applications.eu-decide.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>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
+dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
+uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
+3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
+TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
+7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
+F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
+BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
+LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
+cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
+bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
+Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
+aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
+bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
+BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
+VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
+nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
+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://applications.eu-decide.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">DECIDE Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This service allows to access and use the applications of the DECIDE project
+                    which provides neurologists and physicians with software tools for the computer-aided
+                    extraction of diagnostic markers for Alzheimer's disease and schizophrenia from
+                    medical images.
+                </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>
diff --git a/swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml b/swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml
new file mode 100644
index 00000000..0367f044
--- /dev/null
+++ b/swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://applications.eumedgrid.eu/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:SPSSODescriptor protocolSupportEnumeration="urn:oasis: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">EUMEDGRID Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">EUMEDGRID 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
+                        EUMEDGRID-Support project but many pages are of general interest
+                    </mdui:Description>
+        <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
+                        EUMEDGRID-Support 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://applications.eumedgrid.eu/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://applications.eumedgrid.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>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
+dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
+uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
+3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
+TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
+7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
+F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
+BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
+LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
+cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
+bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
+Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
+aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
+bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
+BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
+VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
+nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
+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://applications.eumedgrid.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">EUMEDGRID 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
+                    EUMEDGRID-Support project but many pages are of general interes
+                </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>
diff --git a/swamid-interfederations-2.0/appraisal.qmul.ac.uk.xml b/swamid-interfederations-2.0/appraisal.qmul.ac.uk.xml
new file mode 100644
index 00000000..702c758f
--- /dev/null
+++ b/swamid-interfederations-2.0/appraisal.qmul.ac.uk.xml
@@ -0,0 +1,66 @@
+<?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://appraisal.qmul.ac.uk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-18T14:36:12Z">
+      <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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://appraisal.qmul.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>
+						MIIDTjCCAjagAwIBAgIJALX9bGZHGFQXMA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
+						BAMTI2hvc3QtOTUtMTU0LTI1NC0xMjcucnNjbGllbnRkbnMuY29tMB4XDTE0MDcz
+						MTA5NDIzNVoXDTI0MDcyODA5NDIzNVowLjEsMCoGA1UEAxMjaG9zdC05NS0xNTQt
+						MjU0LTEyNy5yc2NsaWVudGRucy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQCt/HdEunDhkbUtvNlMhBKoLN3JTSfu7CsglaNYyTM05F9kRUsq/LOf
+						E4Hh1JRx9bb7TLazS6YvD8ZU+sc2WF3xCVPYDp4oY8ANDJYfB53dhtT4lLpqFB/0
+						aTjMj1PNvGqYJOElZhkp0m4nrHjNATuA7eQB3iff6v/0xdJ7AcTSfmTQTOXYyma+
+						vQadTmxs9990Xml3HosGy1IXCbbO2ht4sg7/MxmbJblrha31wGURTWkE+WmVRwV6
+						nMaituJhyk2d1UYEAjzpiAgwlOBVdUVNrdhTiTW5rWKNnPsIaam/XOhAeQeRj2IF
+						9I10RB3OSTshOZuDEw4zseUrBcEtWejpAgMBAAGjbzBtMEwGA1UdEQRFMEOCI2hv
+						c3QtOTUtMTU0LTI1NC0xMjcucnNjbGllbnRkbnMuY29thhxodHRwczovL2FwcHJh
+						aXNhbC5xbXVsLmFjLnVrMB0GA1UdDgQWBBTH7kFVLALHzYDH4QoBrsLhOiiDGjAN
+						BgkqhkiG9w0BAQUFAAOCAQEAnkihlzTiIbxprbKw818zRBsRexB9pqUFYuRBSmAB
+						jTRFLn+VouYicmETvhyVI4BU69mFz3nLsHG5HtmCeDS45ZoZhY/hBY3HqXJ/jOGB
+						RsYQQdkC5vHCrRJrimsZMKOUY7HR8OZWsDbcmAXXoYSk3yMaBHI4BcZAXZa4KRX7
+						69wlCV41DWzh3yKaHEQ0+eLnbVj2/ECVHaz1JzA0l/eRtH4vlSJpQQy/PymODDCc
+						lrIU37xyczOKjgW1LpMwbl2aSND2BxalCKHxXiOIeLudwu9VPws/eN3UxeD1Nc2q
+						d4bJN7QJIBsfqLD3Dr3yXiTkMO9vJbZvRHKJRmR8eaYZCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appraisal.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://appraisal.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://appraisal.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appraisal.qmul.ac.uk/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 Appraisal Simitive</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.simitive.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Joe</md:GivenName>
+    <md:SurName>Vallender</md:SurName>
+    <md:EmailAddress>mailto:joe.vallender@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Joe</md:GivenName>
+    <md:SurName>Vallender</md:SurName>
+    <md:EmailAddress>mailto:joe.vallender@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/apps.cricksoft.com-shibboleth.xml b/swamid-interfederations-2.0/apps.cricksoft.com-shibboleth.xml
new file mode 100644
index 00000000..7718ec0c
--- /dev/null
+++ b/swamid-interfederations-2.0/apps.cricksoft.com-shibboleth.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://apps.cricksoft.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>
+						MIIC9zCCAd+gAwIBAgIJANY32/xM/DNkMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHNwLmNyaWNrc29mdC5jb20wHhcNMTAxMDE0MTE1MDQ2WhcNMjAxMDExMTE1
+						MDQ2WjAbMRkwFwYDVQQDExBzcC5jcmlja3NvZnQuY29tMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAy4siLJ0xVcbDfbaFp/RWcva+0Yvrya3xakCBjK6h
+						c6hJ5l0iyoIZPXMNtHARMD1i8fmqJrNilD8AqX7izQcrBGTkLgtkVCOcepf1YdkM
+						3ZQZp+Wb2GIPXBpQWVNy62LPkHLL3LsX3SWiBP7kahZsazgXedgc+6anBnGQDho5
+						+od8Z+eeImTXw8JSQNpBa54T3UPFhnBE1h5hBVHZwdx3a57ejtf8oFymACHIFH+x
+						8soJDMlHyFPVu8GrhnxV4agrY36nxKZI5x0nS1tzXtEwzi4KmrWF78/XTbhBty7k
+						ocico+7Kj69Zazd0Px3L9ryHWevVF85sjX9SN4sQ4ccGnwIDAQABoz4wPDAbBgNV
+						HREEFDASghBzcC5jcmlja3NvZnQuY29tMB0GA1UdDgQWBBQ7Ph7OK0o3dQvZ+Xeg
+						jApzpz8CETANBgkqhkiG9w0BAQUFAAOCAQEAyAWqdVobl3x1fg7DZjOJGvKe8QVS
+						9tQBcYUIXROpPJmG27vAfeeaXMK2gGyD9ZlOuTmtHxeI+WRypyKJ1vovDZ1W90WD
+						Sin6sfJLyPC9WTgd/D2RbW4FiTkN01HaGupbWSVBzSsRZzqpUlB9eoM7pg5V/dMg
+						Zxyd/XYpfrX+tBEpSqioDxQPEZwcVkOKO4a4OsxtTg4UgOTDJT/lU6Pml/h5uxcM
+						NhU4jlCAvQmYRbbnW8dM7HwfZNdiDVCf9xcWAQd83B96KM2LcttZAxRFhxWyefC9
+						+vQzKLPAKu8sxHzuLbbYr0RUXeiQq/hIQIhwpxZRPlJUXB/bpcNvjMGfdg==
+					</ds:X509Certificate>
+        </ds: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+gAwIBAgIJANY32/xM/DNkMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHNwLmNyaWNrc29mdC5jb20wHhcNMTAxMDE0MTE1MDQ2WhcNMjAxMDExMTE1
+						MDQ2WjAbMRkwFwYDVQQDExBzcC5jcmlja3NvZnQuY29tMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAy4siLJ0xVcbDfbaFp/RWcva+0Yvrya3xakCBjK6h
+						c6hJ5l0iyoIZPXMNtHARMD1i8fmqJrNilD8AqX7izQcrBGTkLgtkVCOcepf1YdkM
+						3ZQZp+Wb2GIPXBpQWVNy62LPkHLL3LsX3SWiBP7kahZsazgXedgc+6anBnGQDho5
+						+od8Z+eeImTXw8JSQNpBa54T3UPFhnBE1h5hBVHZwdx3a57ejtf8oFymACHIFH+x
+						8soJDMlHyFPVu8GrhnxV4agrY36nxKZI5x0nS1tzXtEwzi4KmrWF78/XTbhBty7k
+						ocico+7Kj69Zazd0Px3L9ryHWevVF85sjX9SN4sQ4ccGnwIDAQABoz4wPDAbBgNV
+						HREEFDASghBzcC5jcmlja3NvZnQuY29tMB0GA1UdDgQWBBQ7Ph7OK0o3dQvZ+Xeg
+						jApzpz8CETANBgkqhkiG9w0BAQUFAAOCAQEAyAWqdVobl3x1fg7DZjOJGvKe8QVS
+						9tQBcYUIXROpPJmG27vAfeeaXMK2gGyD9ZlOuTmtHxeI+WRypyKJ1vovDZ1W90WD
+						Sin6sfJLyPC9WTgd/D2RbW4FiTkN01HaGupbWSVBzSsRZzqpUlB9eoM7pg5V/dMg
+						Zxyd/XYpfrX+tBEpSqioDxQPEZwcVkOKO4a4OsxtTg4UgOTDJT/lU6Pml/h5uxcM
+						NhU4jlCAvQmYRbbnW8dM7HwfZNdiDVCf9xcWAQd83B96KM2LcttZAxRFhxWyefC9
+						+vQzKLPAKu8sxHzuLbbYr0RUXeiQq/hIQIhwpxZRPlJUXB/bpcNvjMGfdg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apps.cricksoft.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apps.cricksoft.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://apps.cricksoft.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.cricksoft.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.cricksoft.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apps.cricksoft.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://apps.cricksoft.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.cricksoft.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.cricksoft.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Crick Software Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Crick Software Ltd</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cricksoft.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Burt</md:SurName>
+    <md:EmailAddress>mailto:andrew.burt@cricksoft.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Burt</md:SurName>
+    <md:EmailAddress>mailto:andrew.burt@cricksoft.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/apu.uepb.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/apu.uepb.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..ffcbb791
--- /dev/null
+++ b/swamid-interfederations-2.0/apu.uepb.edu.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://apu.uepb.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">uepb.edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UEPB - Universidade Estadual da Paraiba</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UEPB - Universidade Estadual da Paraiba</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uepb.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uepb.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>
+    MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKTAnBgNVBAoTIFVuaXZlcnNp
+ZGFkZSBFc3RhZHVhbCBkYSBQYXJhaWJhMQ0wCwYDVQQLEwRDVElDMSMwIQYJKoZI
+hvcNAQkBFhRnZXJlbmNpYUB1ZXBiLmVkdS5icjEXMBUGA1UEBxMOQ2FtcGluYSBH
+cmFuZGUxEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9h
+cHUudWVwYi5lZHUuYnIwHhcNMTQwNjA0MTQxMzExWhcNMTkwNjAzMTQxMzExWjCB
+sTEpMCcGA1UEChMgVW5pdmVyc2lkYWRlIEVzdGFkdWFsIGRhIFBhcmFpYmExDTAL
+BgNVBAsTBENUSUMxIzAhBgkqhkiG9w0BCQEWFGdlcmVuY2lhQHVlcGIuZWR1LmJy
+MRcwFQYDVQQHEw5DYW1waW5hIEdyYW5kZTEQMA4GA1UECBMHUGFyYWliYTELMAkG
+A1UEBhMCQlIxGDAWBgNVBAMTD2FwdS51ZXBiLmVkdS5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAL+PmDkRtaCnS6AZ0SNppN29pZ7E1NxuvDYw5JES
+hXKLFqnBjOqwMOvS5SYWxKOtzDhPWKuT96DXjt6SY5A+fFKCYQUaNIUxTyyuad/e
+5kdf8tMM5FRX3gtaMk9D595xvOyT2Xp7byLU1WolCTWXIBlVuapd7znWcVvoUSfr
+zxK7Kd7wfFu4RT38/zN5FEvPxPbNRYZtcs33rtkCl3fT3XatkTNGEZ/whRNYyN53
+4zr4RZeysJSrAilSdOcM9y+6oYCOFpqn5ygFlQXbj8zEzR9SDMcL5OYbMMmC8bd7
+FOpec0VKbWrOAV//+D9T/ncSBuXfn/zwKk2qneNdESzp8/cCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAuHfrqsDisexElOjxDcmMfvnHTUobLmdLiJL/KoW54icv/dZ2
+w35Ta036Qj5nWBscP++FLfZTbA2RRAIZH5FQJIikDJpDdlUM9wYcAPtP1irb0/h+
+v0pyfB2AONle6H8bQf7wh6yQ0UkyP1knHePbDOchyrWgyK/CA7YoieH20kQlrGQY
+yQ9KnlrE+xw2aYX6bnR2SidjvjrkdFEIWD54AD3VhhKetR+/WSe2C7O/KEJG2suU
+el0jb0m9uKw7IBcWNsHTD0UdQcmG5LmUFUTC6tG8Tv9Dw1LzAYWuR8NZAHsncJ/w
+ULuCd9hGR3D+ZDjlZKLLf3cU3c3+xTC9cp7NmA==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apu.uepb.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://apu.uepb.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://apu.uepb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apu.uepb.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://apu.uepb.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://apu.uepb.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>
+      
+MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKTAnBgNVBAoTIFVuaXZlcnNp
+ZGFkZSBFc3RhZHVhbCBkYSBQYXJhaWJhMQ0wCwYDVQQLEwRDVElDMSMwIQYJKoZI
+hvcNAQkBFhRnZXJlbmNpYUB1ZXBiLmVkdS5icjEXMBUGA1UEBxMOQ2FtcGluYSBH
+cmFuZGUxEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9h
+cHUudWVwYi5lZHUuYnIwHhcNMTQwNjA0MTQxMzExWhcNMTkwNjAzMTQxMzExWjCB
+sTEpMCcGA1UEChMgVW5pdmVyc2lkYWRlIEVzdGFkdWFsIGRhIFBhcmFpYmExDTAL
+BgNVBAsTBENUSUMxIzAhBgkqhkiG9w0BCQEWFGdlcmVuY2lhQHVlcGIuZWR1LmJy
+MRcwFQYDVQQHEw5DYW1waW5hIEdyYW5kZTEQMA4GA1UECBMHUGFyYWliYTELMAkG
+A1UEBhMCQlIxGDAWBgNVBAMTD2FwdS51ZXBiLmVkdS5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAL+PmDkRtaCnS6AZ0SNppN29pZ7E1NxuvDYw5JES
+hXKLFqnBjOqwMOvS5SYWxKOtzDhPWKuT96DXjt6SY5A+fFKCYQUaNIUxTyyuad/e
+5kdf8tMM5FRX3gtaMk9D595xvOyT2Xp7byLU1WolCTWXIBlVuapd7znWcVvoUSfr
+zxK7Kd7wfFu4RT38/zN5FEvPxPbNRYZtcs33rtkCl3fT3XatkTNGEZ/whRNYyN53
+4zr4RZeysJSrAilSdOcM9y+6oYCOFpqn5ygFlQXbj8zEzR9SDMcL5OYbMMmC8bd7
+FOpec0VKbWrOAV//+D9T/ncSBuXfn/zwKk2qneNdESzp8/cCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAuHfrqsDisexElOjxDcmMfvnHTUobLmdLiJL/KoW54icv/dZ2
+w35Ta036Qj5nWBscP++FLfZTbA2RRAIZH5FQJIikDJpDdlUM9wYcAPtP1irb0/h+
+v0pyfB2AONle6H8bQf7wh6yQ0UkyP1knHePbDOchyrWgyK/CA7YoieH20kQlrGQY
+yQ9KnlrE+xw2aYX6bnR2SidjvjrkdFEIWD54AD3VhhKetR+/WSe2C7O/KEJG2suU
+el0jb0m9uKw7IBcWNsHTD0UdQcmG5LmUFUTC6tG8Tv9Dw1LzAYWuR8NZAHsncJ/w
+ULuCd9hGR3D+ZDjlZKLLf3cU3c3+xTC9cp7NmA==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apu.uepb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://apu.uepb.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">UEPB - Universidade Estadual da Paraiba</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UEPB - Universidade Estadual da Paraiba</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uepb.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.uepb.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Gerencia de Redes</md:SurName>
+    <md:EmailAddress>gerencia@uepb.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/araripe.uece.br-idp-shibboleth.xml b/swamid-interfederations-2.0/araripe.uece.br-idp-shibboleth.xml
new file mode 100644
index 00000000..52878fec
--- /dev/null
+++ b/swamid-interfederations-2.0/araripe.uece.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://araripe.uece.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">uece.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UECE - Universidade Estadual do Ceara</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UECE - Universidade Estadual do Ceara</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UECE - Universidade Estadual do Ceara</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UECE - Universidade Estadual do Ceara</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uece.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uece.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxLzAtBgNVBAoTJlVFQ0UgLSBV
+bml2ZXJzaWRhZGUgRXN0YWRpdWFsIGRvIENlYXJhMSQwIgYDVQQLExtEZXBhcnRh
+bWVudG8gZGUgSW5mb3JtYXRpY2ExHzAdBgkqhkiG9w0BCQEWEGRpLmluZnJhQHVl
+Y2UuYnIxEjAQBgNVBAcTCUZvcnRhbGV6YTEOMAwGA1UECBMFQ2VhcmExCzAJBgNV
+BAYTAkJSMRgwFgYDVQQDEw9hcmFyaXBlLnVlY2UuYnIwHhcNMTQwMzIxMTkwNzUy
+WhcNMTcwMzIwMTkwNzUyWjCBwzEvMC0GA1UEChMmVUVDRSAtIFVuaXZlcnNpZGFk
+ZSBFc3RhZGl1YWwgZG8gQ2VhcmExJDAiBgNVBAsTG0RlcGFydGFtZW50byBkZSBJ
+bmZvcm1hdGljYTEfMB0GCSqGSIb3DQEJARYQZGkuaW5mcmFAdWVjZS5icjESMBAG
+A1UEBxMJRm9ydGFsZXphMQ4wDAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxGDAW
+BgNVBAMTD2FyYXJpcGUudWVjZS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALXknOC9F11nnTnNa8NuRD4cL/FDS9bzesfl/t/XaDMK32F/JgRxumWz
+SK6r0ejmmufDaIglY5kz2wgBry0jPZjkNoVhmDVpSdeEI3s3qDeWb/Jy6QVIYn71
+o25S3p/QTo9DVCjJIYoYD4OmNqU7yJa8sXN5FuvcuTgNXphdbXqMeskw9pGYb1zz
+b+h2jEaWo7wlljOYcwa8F2hJrd9W/ff6vit1cWrXv76afFVK1DjGkuS5H23vEz+Y
+3dRWHaflkxHo7iQ71mLmHGs6lyxf60PmJFyan5J8U1n9xcHlNIWbQsDdpPyxv0To
+PDI8+PywOWhoYYt+zA4Lv9V6CjRqpxMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ndu7rtfvY/dTDYWGTdYoTLACJCEsovnY8lzt+kyNIucdgJh//2egd8rKIL8BWUzK
+Ahpc0fitAklIDaVNzvJIrqMXLTFbT0deAJeeWN9e3Lke2bEqJPDO4xh1paedwk8b
+K8n//pcvw6uxKq5GEny5MEhVPaBJthThbH023ict7onBkUClgU7pAYh66JDscvXa
+jRIAsv0FeZt9c0urK4eU4vpnE7Bk0pNSD7pKqQ/ZXngjZSp6CXWlF2J9PGA2g53r
+JuB1tq80AmWAwgGdW4AxW7LLaxwFK6dl0lMIsWYyMleXuh2KhOGxLKrYa/EDs4Yi
+Z1AZ/tU3s4++vwyfNIfQkg==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://araripe.uece.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://araripe.uece.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn: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://araripe.uece.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://araripe.uece.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://araripe.uece.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://araripe.uece.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">uece.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxLzAtBgNVBAoTJlVFQ0UgLSBV
+bml2ZXJzaWRhZGUgRXN0YWRpdWFsIGRvIENlYXJhMSQwIgYDVQQLExtEZXBhcnRh
+bWVudG8gZGUgSW5mb3JtYXRpY2ExHzAdBgkqhkiG9w0BCQEWEGRpLmluZnJhQHVl
+Y2UuYnIxEjAQBgNVBAcTCUZvcnRhbGV6YTEOMAwGA1UECBMFQ2VhcmExCzAJBgNV
+BAYTAkJSMRgwFgYDVQQDEw9hcmFyaXBlLnVlY2UuYnIwHhcNMTQwMzIxMTkwNzUy
+WhcNMTcwMzIwMTkwNzUyWjCBwzEvMC0GA1UEChMmVUVDRSAtIFVuaXZlcnNpZGFk
+ZSBFc3RhZGl1YWwgZG8gQ2VhcmExJDAiBgNVBAsTG0RlcGFydGFtZW50byBkZSBJ
+bmZvcm1hdGljYTEfMB0GCSqGSIb3DQEJARYQZGkuaW5mcmFAdWVjZS5icjESMBAG
+A1UEBxMJRm9ydGFsZXphMQ4wDAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxGDAW
+BgNVBAMTD2FyYXJpcGUudWVjZS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALXknOC9F11nnTnNa8NuRD4cL/FDS9bzesfl/t/XaDMK32F/JgRxumWz
+SK6r0ejmmufDaIglY5kz2wgBry0jPZjkNoVhmDVpSdeEI3s3qDeWb/Jy6QVIYn71
+o25S3p/QTo9DVCjJIYoYD4OmNqU7yJa8sXN5FuvcuTgNXphdbXqMeskw9pGYb1zz
+b+h2jEaWo7wlljOYcwa8F2hJrd9W/ff6vit1cWrXv76afFVK1DjGkuS5H23vEz+Y
+3dRWHaflkxHo7iQ71mLmHGs6lyxf60PmJFyan5J8U1n9xcHlNIWbQsDdpPyxv0To
+PDI8+PywOWhoYYt+zA4Lv9V6CjRqpxMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ndu7rtfvY/dTDYWGTdYoTLACJCEsovnY8lzt+kyNIucdgJh//2egd8rKIL8BWUzK
+Ahpc0fitAklIDaVNzvJIrqMXLTFbT0deAJeeWN9e3Lke2bEqJPDO4xh1paedwk8b
+K8n//pcvw6uxKq5GEny5MEhVPaBJthThbH023ict7onBkUClgU7pAYh66JDscvXa
+jRIAsv0FeZt9c0urK4eU4vpnE7Bk0pNSD7pKqQ/ZXngjZSp6CXWlF2J9PGA2g53r
+JuB1tq80AmWAwgGdW4AxW7LLaxwFK6dl0lMIsWYyMleXuh2KhOGxLKrYa/EDs4Yi
+Z1AZ/tU3s4++vwyfNIfQkg==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://araripe.uece.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://araripe.uece.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">UECE - Universidade Estadual do Ceara</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UECE - Universidade Estadual do Ceara</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UECE - Universidade Estadual do Ceara</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UECE - Universidade Estadual do Ceara</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uece.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.uece.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>DI Infra</md:SurName>
+    <md:EmailAddress>di.infra@uece.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/arauto.fapesp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/arauto.fapesp.br-idp-shibboleth.xml
new file mode 100644
index 00000000..e10d7cf3
--- /dev/null
+++ b/swamid-interfederations-2.0/arauto.fapesp.br-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://arauto.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">fapesp.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</mdui:Description>
+        <mdui:Description xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.fapesp.br.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.fapesp.br.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIICzDCCAbQCAQAwDQYJKoZIhvcNAQEFBQAwLDEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEPMA0GA1UEAxMGYXJhdXRvMB4XDTEzMDcyNjE3MDQ1OVoXDTE2MDcy
+NTE3MDQ1OVowLDEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEPMA0GA1UEAxMG
+YXJhdXRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw+QLW8JyafF5
+N38EhTdjZhZVL/KDxzWP1fzt/PFIr/ZoX20/x1CcrppX3dVh5gvjv3REY7+7HsIK
+sSXxQq5xZncoY5E995xJM6TuSS3OCz86Te2XUnG8dr/kXAECdmbtBM0qT7WSRSJU
+ae6EkrpWRiSp23Ggz3k9ouOYq6CFpdwjZlCvmYmS7Mlbu/uXGM3NdTv7xAJUFHP4
+HdFvh73ZWBCpMzKo+U0PWXU1e5Y/s4Q5c72jFolx18MjaSMPWE91YjNYTb+35zV/
+SR1Oft3L05uvBX8TUEcKX/mqTd3C707Gy7j/3tGimMlfvGW3njG/3Ff8jWI1dvQU
+qPoDD0qnxQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAAntrrVTQK1XATS5H5bOCU
+5es7/siEh5QPiIQwgCLD9P+oXZVtcjW2I1EkF4mp63HQkcvhQmXrRTivqWVXi1Wl
+xz9Dt73NWumz6fDH8iHBeXYRKCyGXvQ8DBUxBZ3QUK9xFyYAbkj9FvuGr0zHs+UZ
+auKJ0Nxm7eIsSnHOXctSQA4VE4YRBqG75sQ/rC9DzJAooP/oIc9/Wqi3EWckxGPW
+Wmju6DPyLY2Bk/vrufHPWl5rvHeLFDU02UUJ2NlNNyOCHbM+MHoGv7DO6I7tdq+0
+xs9YgM0+0GuxfJp9i3sOGK8kbf0TZoMjFP2Iq6wIKZBT2Q2gBsYXd+8k6BksbGO0
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://arauto.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://arauto.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://arauto.fapesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://arauto.fapesp.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://arauto.fapesp.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://arauto.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>
+      
+MIICzDCCAbQCAQAwDQYJKoZIhvcNAQEFBQAwLDEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEPMA0GA1UEAxMGYXJhdXRvMB4XDTEzMDcyNjE3MDQ1OVoXDTE2MDcy
+NTE3MDQ1OVowLDEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEPMA0GA1UEAxMG
+YXJhdXRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw+QLW8JyafF5
+N38EhTdjZhZVL/KDxzWP1fzt/PFIr/ZoX20/x1CcrppX3dVh5gvjv3REY7+7HsIK
+sSXxQq5xZncoY5E995xJM6TuSS3OCz86Te2XUnG8dr/kXAECdmbtBM0qT7WSRSJU
+ae6EkrpWRiSp23Ggz3k9ouOYq6CFpdwjZlCvmYmS7Mlbu/uXGM3NdTv7xAJUFHP4
+HdFvh73ZWBCpMzKo+U0PWXU1e5Y/s4Q5c72jFolx18MjaSMPWE91YjNYTb+35zV/
+SR1Oft3L05uvBX8TUEcKX/mqTd3C707Gy7j/3tGimMlfvGW3njG/3Ff8jWI1dvQU
+qPoDD0qnxQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAAntrrVTQK1XATS5H5bOCU
+5es7/siEh5QPiIQwgCLD9P+oXZVtcjW2I1EkF4mp63HQkcvhQmXrRTivqWVXi1Wl
+xz9Dt73NWumz6fDH8iHBeXYRKCyGXvQ8DBUxBZ3QUK9xFyYAbkj9FvuGr0zHs+UZ
+auKJ0Nxm7eIsSnHOXctSQA4VE4YRBqG75sQ/rC9DzJAooP/oIc9/Wqi3EWckxGPW
+Wmju6DPyLY2Bk/vrufHPWl5rvHeLFDU02UUJ2NlNNyOCHbM+MHoGv7DO6I7tdq+0
+xs9YgM0+0GuxfJp9i3sOGK8kbf0TZoMjFP2Iq6wIKZBT2Q2gBsYXd+8k6BksbGO0
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://arauto.fapesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://arauto.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 - Fundacao de Amparo a pesquisa do estado de Sao Paulo</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fapesp.br.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.fapesp.br.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Leandro Costa</md:SurName>
+    <md:EmailAddress>lcosta@fapesp.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..77501e98
--- /dev/null
+++ b/swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://arch2moodle.conted.ox.ac.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-11-14T17:08: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>
+						MIIEpjCCA46gAwIBAgIJALdGk/GDLkgoMA0GCSqGSIb3DQEBBQUAMIHTMQswCQYD
+						VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
+						MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
+						bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMSQwIgYDVQQDDBthcmNoMm1vb2Rs
+						ZS5jb250ZWQub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5bG9yQGNv
+						bnRlZC5veC5hYy51azAeFw0xNDA1MTkxNTQ1MTFaFw0yNDA1MTYxNTQ1MTFaMIHT
+						MQswCQYDVQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94
+						Zm9yZDEdMBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0Rl
+						cGFydG1lbnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMSQwIgYDVQQDDBthcmNo
+						Mm1vb2RsZS5jb250ZWQub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5
+						bG9yQGNvbnRlZC5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAL0OZbHXRsG9wrB70737KdlY8xdaDGvSedBTPKYXIf00B4xMLSXsYov19yTO
+						rcPLuVda0rNt85mTrC/M/VD9hlHgzALnJIsApqUprsDzoTS/vClWwNyqOKP4mDWF
+						Yqw2nUUekJKrdcHETNptAsmqFcevv/EVCBd6OCNZExNAVYwvZvSDKT92Y0Ou3Nvt
+						c4Lxndyq3LQTbXwuB69ctx0SZbHB6MOUD0dFdmH6g22jzuA59M1Gevc0cXXUvw+a
+						qGsUTtRN85Q5t0lCs9UvW+9N4nvAHkuR8wnn7/ate0VyPuHrbkSOEoCbVtafkx6c
+						/A2SfiYmP5g8aCFSoGHqu3iWhocCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
+						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
+						FPXvl+z8qlRh81pc6/+0moo6Uz2NMB8GA1UdIwQYMBaAFPXvl+z8qlRh81pc6/+0
+						moo6Uz2NMA0GCSqGSIb3DQEBBQUAA4IBAQAph+BB117ucSrjA4bg1DjzeQYwMmgS
+						ndz5kQXqgTyafXs/3sSBNS9g9hKKadzntTLQdoSytzgcEDIhskzl9FkJQN6scq96
+						+LmZZjz9CIXyn3dBLOBpP2whuT4V8CetustNdbTMZE2xml0JCmeHL0uy87bQS37S
+						v9uevHXdxb1EoZxRZmue4mWPJYfEuT0xSLSLXxah60bgS/t3rBuRXVmOuicxHylM
+						Wr9ZuBF0R/9h9gbOS1vyTM9TCrZtA39HBCyDFCt6TH4KNiXX9B9a3cX3a8mADfZI
+						eouxo4D9OsCnCEJs7ZFa2Hbzcoxi+t2mOKR1BmE2YsOAIqyw4YnpARHv
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://arch2moodle.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://arch2moodle.conted.ox.ac.uk/Shibboleth.sso/SAML/POST" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Archive for award bearing courses site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.conted.ox.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@conted.ox.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@conted.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/archive.conted.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/archive.conted.ox.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..ac4bf4e7
--- /dev/null
+++ b/swamid-interfederations-2.0/archive.conted.ox.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,74 @@
+<?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://archive.conted.ox.ac.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-09T07:27: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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://archive.conted.ox.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>
+						MIIEnjCCA4agAwIBAgIJAKx7Kep4xsyPMA0GCSqGSIb3DQEBBQUAMIHPMQswCQYD
+						VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
+						MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
+						bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMSAwHgYDVQQDDBdhcmNoaXZlLmNv
+						bnRlZC5veC5hYy51azEqMCgGCSqGSIb3DQEJARYbbWlrZS50YXlsb3JAY29udGVk
+						Lm94LmFjLnVrMB4XDTE0MDUyMDA4MjE1OVoXDTI0MDUxNzA4MjE1OVowgc8xCzAJ
+						BgNVBAYTAlVLMRQwEgYDVQQIDAtPeGZvcmRzaGlyZTEPMA0GA1UEBwwGT3hmb3Jk
+						MR0wGwYDVQQKDBRVbml2ZXJzaXR5IG9mIE94Zm9yZDEsMCoGA1UECwwjRGVwYXJ0
+						bWVudCBmb3IgQ29udGludWluZyBFZHVjYXRpb24xIDAeBgNVBAMMF2FyY2hpdmUu
+						Y29udGVkLm94LmFjLnVrMSowKAYJKoZIhvcNAQkBFhttaWtlLnRheWxvckBjb250
+						ZWQub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSF//x
+						5ANAQ3e+hcEjYI5af4H49YP+x9SncP2aIATyUuMaZMOEv3VGn2TSDV9+bdSTgxiR
+						2oeSbE3ARkPbLquxCkqDXmZ91A9MP5pvZLdlLdLgE8EjgCCakfqRer/D7cphHvsa
+						9mCIKV0trO3Iqr6ep6X3qiH5x8JZPDEwmV3pQtkvsJ+Th4ErztvJNNvfzksLf72y
+						pzgtZEb8xN/YFnVFU1cSl5L3Fb/ZIqSHVvrlJzXPHMtUaep4kVO7i/OBXOUf3yVH
+						twAKo5IE+SWB7FJEfdkdbnDDF8qffyULe2+0JIO89ErRYvJx1s1exd25UjD0mK6P
+						ZixKiZjWMHrzTZm/AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
+						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSmF6Yw+AaK
+						jeX+6wLqozFCa7GJqTAfBgNVHSMEGDAWgBSmF6Yw+AaKjeX+6wLqozFCa7GJqTAN
+						BgkqhkiG9w0BAQUFAAOCAQEAuyOKC3Vd4cHf2JniPcmYBnze4y4CAHBEbT5wdnhH
+						zxZ1xu/iyz841JYV3OQYm3mNKMtLK5Xy/dPHUJoIXNvx/eH5recFFJ/a8FfrevHG
+						onZAMv7uhaiCkwIE/2WKq2awNaX3YXpWSowF3OCX5rWSFMeuoc/3Kv2/VHdFn8ZN
+						QCW4Tt5oSPMwq8oHiUy7ohmMdmdUM648K8rZ4PK0Im5iKRU6KZn5tc+Ng/8KhTGE
+						mQX2NuTpy4/FEA/Ynn3BjFNHZ7oj8G0agQbpuKha8bSVDfjqLokvksSg0uep/5nS
+						dLALrhbv5RJI1uKUJ9RryT0WMZtTQzPPENtmUQXOgSDs3Q==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.conted.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://archive.conted.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://archive.conted.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://archive.conted.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 Continuing Education Course Archive Site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.conted.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@conted.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@conted.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/archive.guardian.co.uk-shibboleth.xml b/swamid-interfederations-2.0/archive.guardian.co.uk-shibboleth.xml
new file mode 100644
index 00000000..531187c6
--- /dev/null
+++ b/swamid-interfederations-2.0/archive.guardian.co.uk-shibboleth.xml
@@ -0,0 +1,71 @@
+<?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://archive.guardian.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:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://archive.guardian.co.uk/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://archive.guardian.co.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://archive.guardian.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>
+						MIIDoDCCAogCCQD3vWcl7rNUgDANBgkqhkiG9w0BAQUFADCBkTELMAkGA1UEBhMC
+						R0IxEDAOBgNVBAgTB0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEeMBwGA1UEChQV
+						R3VhcmRpYW4gTmV3cyAmIE1lZGlhMR4wHAYDVQQLExVHdWFyZGlhbiBQcm9mZXNz
+						aW9uYWwxHzAdBgNVBAMTFmFyY2hpdmUuZ3VhcmRpYW4uY28udWswHhcNMTEwMjAx
+						MDkyNjE0WhcNMjEwMTI5MDkyNjE0WjCBkTELMAkGA1UEBhMCR0IxEDAOBgNVBAgT
+						B0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEeMBwGA1UEChQVR3VhcmRpYW4gTmV3
+						cyAmIE1lZGlhMR4wHAYDVQQLExVHdWFyZGlhbiBQcm9mZXNzaW9uYWwxHzAdBgNV
+						BAMTFmFyY2hpdmUuZ3VhcmRpYW4uY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
+						DwAwggEKAoIBAQClyvCzzPicg89DDrCTdwlSKxxhWkoDdDM/zvQplF33faQHBEX1
+						kX+NHiWm7bFsR1EgsZEXN5MShCkxSapGJ/KQNaqWCasBxOnlKPNmnSxg8DUf8Il/
+						Er6NDOm7w8mzyr6jKyLLBWSpRM79+aNqlp8mJnrEYEohwcmIjNX9yDhD9MMX4INh
+						npBKP3lHpUSEVcvF4l/CEaMHl37l2ipwqc2p9Yb3adKI3m5Mo1HwhIOX+FVMB3H8
+						s2wP8rBniNJLqzU61PCzgsj3yu8GuVyTHdy5MkzxsANiFZ5rM9x3MyMK81ddC+/h
+						6s/LPahVKDe8M/Dxpohi8T+245pBzAVmR7udAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+						ggEBABK63U1h8B1I3AFeaCir1rQjgvTLqIAwDPSO5O60CoA1Dsa5STjdOQHlWfU6
+						6yk2RMDl79avgQ79dZuKYfOTRgWNFttTe6qXfC7V8iPL1S6ZI5UD/QXNfUFDYnPT
+						2rKjPWOQSvtcFRNIQQEggIJJARCJ+6wmrQdSFdEwTApo1vUMrvewglWoZtOZYZjZ
+						5PqI5ayLcMUj4gYwtt3aTdAa+EeE9upHEvvAVkx4TT9sZzzH6UIFuAOqAdVxoixY
+						TYacJZq5++ryJ0ljizbVDyflHYPrnZq/F7FrsTLG0zWvKK+WwOClHU5na5YZIBA4
+						nhD5qKnl7TBNTd30v5ddf1XcImY=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.guardian.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.guardian.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.guardian.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.guardian.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.guardian.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.guardian.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.guardian.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.guardian.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.guardian.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Guardian News &amp; Media Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Guardian and Observer digital archive</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://archive.guardian.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lucy</md:GivenName>
+    <md:SurName>Haire</md:SurName>
+    <md:EmailAddress>mailto:lucy.haire@guardian.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rupert</md:GivenName>
+    <md:SurName>Bates</md:SurName>
+    <md:EmailAddress>mailto:rupert.bates@guardian.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c6de0299
--- /dev/null
+++ b/swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,92 @@
+<?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://ark.biology.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="2013-05-03T11:24: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ark.biology.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>
+						MIIEcjCCA1qgAwIBAgIJALXvZ+na+8FZMA0GCSqGSIb3DQEBBQUAMIG5MQswCQYD
+						VQQGEwJnYjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
+						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxHjAcBgNVBAsTFURlcGFydG1l
+						bnQgb2YgWm9vbG9neTEdMBsGA1UEAxMUYXJrLmJpb2xvZ3kub3guYWMudWsxJTAj
+						BgkqhkiG9w0BCQEWFndlYm1hc3RlckB6b28ub3guYWMudWswHhcNMTMwNDMwMTgx
+						MzMxWhcNMjMwNDI4MTgxMzMxWjCBuTELMAkGA1UEBhMCZ2IxFDASBgNVBAgTC094
+						Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkg
+						b2YgT3hmb3JkMR4wHAYDVQQLExVEZXBhcnRtZW50IG9mIFpvb2xvZ3kxHTAbBgNV
+						BAMTFGFyay5iaW9sb2d5Lm94LmFjLnVrMSUwIwYJKoZIhvcNAQkBFhZ3ZWJtYXN0
+						ZXJAem9vLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						7Gcag+bauSUOc+oeeS1vWw5TRYdBHCUejlqzl0kLmG0e4Kz/KQNj5+BthkxQKLw6
+						Jmpf68Ws3nAcWIz7pDRgiHoBfkjkc5vMbyehtnnW+17JwAuZAbqXcKVyv48qNFJe
+						NLKJI2tJ8iJ4wlce96cw7ouBbC1jawNvxlonb9T0D7xn8+XMwRZKJ8Sgbt5cGJFQ
+						p1SmCrM6shou3sEcZhwBAPindHCQyyppaabkQlivY1Vka8WiNkxsWCoj5igtLsEb
+						VyejLlkDsfp5BYPRRaormViEPyybFKmDTopVkm+xDjLgnMSyK+COYeujtkewx95y
+						29SSoiexAONJV8hqaKGrBQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
+						DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUModS
+						2TCZbpR0Xo3EGog6bIgUbvMwHwYDVR0jBBgwFoAUModS2TCZbpR0Xo3EGog6bIgU
+						bvMwDQYJKoZIhvcNAQEFBQADggEBAIucTNVYS1EKlXQKiFPO4oscBMSmq+LjwsDI
+						6EKsFCVY8wMnSWx3zU5skfoWjZw69xHFYVfTk+WKMOQ9qmMOFNItuw0wLqghN7w4
+						4gD+NdZAdadAudsPJiVF1cJPsQptU8xyPWSQc1lqJRFmxUo9lKj8Vq9zABM7373M
+						M8WeaMj+H+9A0U2dRGEzyJUyRRP1ogYQqc+jC/Qj9nnahqxKsrxu4rnc1Z3d2RMO
+						qumcP0hPqD+mCOlr9DnJyLsPYcPK8M964rOfemmeqtBExT9kgX1N5shs/P1c5+Lt
+						OHEYDdIFb2iPO4iL4JwvF4kJLIG6C2xz6ABtgHSgR7SANWZMqOU=
+					</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://ark.biology.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ark.biology.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://ark.biology.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://ark.biology.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ark.biology.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, Departments of Zoology and of Plant Sciences ARK</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.biology.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Department of Zoology IT Office</md:GivenName>
+    <md:EmailAddress>mailto:support@zoo.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Department of Zoology IT Office</md:GivenName>
+    <md:EmailAddress>mailto:support@zoo.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/arts.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/arts.idm.oclc.org-shibboleth.xml
new file mode 100644
index 00000000..818a5f38
--- /dev/null
+++ b/swamid-interfederations-2.0/arts.idm.oclc.org-shibboleth.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://arts.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-30T17:57: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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID6zCCAtOgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBcMRwwGgYDVQQDFBMqLmFy
+						dHMuaWRtLm9jbGMub3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzEgMB4G
+						CSqGSIb3DQEJARYRYWtraW5lbnZAb2NsYy5vcmcwHhcNMTQwNTA4MjA1NjIwWhcN
+						MjQwNTA3MjA1NjIwWjBcMRwwGgYDVQQDFBMqLmFydHMuaWRtLm9jbGMub3JnMQsw
+						CQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzEgMB4GCSqGSIb3DQEJARYRYWtraW5l
+						bnZAb2NsYy5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxhYmM
+						PDckQ2CMHBBJrHdBjDAsWnPgCA6g86v7Qizdq5ujo7zQEpmP83jQYVAo93g4dxT0
+						v0KH7uvfZ3eHJtLAjFBY4BCKCfWQ9b2zINAd4V/Aay0e99e3+cGd/XKi4/sf+mh6
+						QrHErw5TFGLKfassMrFWSyhxzH7pWL+DW6fDV1fdjH0LhbyrZF0UNeLTc/4+Y2e+
+						r1hV+BS2NUGSEXZPfWDR3/+1J5VgBLrEV1QyqMJtJIB3M9TIJGLnVyX8oIjN1MTP
+						hl8418xabyz8S+vkwCDhDfPWNQ+czGkPHNs0920wh+MpUKwyoH5VDidDTHCTEcDY
+						cetXuGrggUZ/iJoZAgMBAAGjgbcwgbQwHQYDVR0OBBYEFBuFHyLKMAenvRmdB0Zy
+						mLXvygvgMIGEBgNVHSMEfTB7gBQbhR8iyjAHp70ZnQdGcpi178oL4KFgpF4wXDEc
+						MBoGA1UEAxQTKi5hcnRzLmlkbS5vY2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNV
+						BAoTBE9DTEMxIDAeBgkqhkiG9w0BCQEWEWFra2luZW52QG9jbGMub3JnggEDMAwG
+						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAD6KWro7Cu4sxiXwRawL2LGf
+						bArwdzRjO61AlIXg+8XOvYq1BBxjqsP5r1aLlj9y/vAZGSPQQfLpz/omoU3vIu0o
+						59wlCvcH84ZZOnYUCCmZVoQe9LfYGprh9Gl2aESEwdxwilDjrqfuKMPgBD0DBQxc
+						vQQLWqSYZy3vAh6p+2Ul2rh0/Ue2sOjaUqAfrLhE7m+j7lxbBg70x45ckgW4gQBK
+						UVS0Rdy9MIWHbFmfvEjVZnirY746qWAGoSy1xn0H8V141ELqW9oe+Sjvc08HgzQ0
+						1VqrWlvm0Q4K50yGzWMyoFLb/QJfj0sbC0Sb/9w7LlHUj9b//QQ6qeEL4j1Qkdw=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.arts.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.arts.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.arts.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.arts.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 the Arts, London 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/as1.jesus.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/as1.jesus.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..1f62c7ff
--- /dev/null
+++ b/swamid-interfederations-2.0/as1.jesus.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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://as1.jesus.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="2014-09-22T13:48: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://as1.jesus.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>
+						MIIC/TCCAeWgAwIBAgIJAP1oldxO3zymMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEmFzMS5qZXN1cy5veC5hYy51azAeFw0xNDA5MTExMDEzMTBaFw0yNDA5MDgx
+						MDEzMTBaMB0xGzAZBgNVBAMTEmFzMS5qZXN1cy5veC5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAKZcXku3Zc8SySbCvMeljZQV5jypnNoVsKr+
+						xJ2aftBX3yEBy+EplJeb8c2zZy6wzDbYqmO44GgKtNnApNl3EACPvLIcs5STrd8E
+						/gpSMctx0yhFlt1bNlKXlN7oIlgLIkHxCq+HYOEOtl6jo1iWs+yomqyyDzy6rkBB
+						pmcsQOG6k8e+PV6n51gdrjzC2eMYQYx5cVC6BNTPZRQMyROMu8w6j30K9cRnFrLc
+						3zOl2BN/52qmYnjqhuKwHfGiCGa4bJXZTKOyq7vCiy9hPhjE6RAgZ/ou3oifvLfc
+						p4LPVKG9jfyYNS2Ujz4AFBZB3CogOqeKXHwlaG6FV/vVufhos9cCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISYXMxLmplc3VzLm94LmFjLnVrMB0GA1UdDgQWBBQIR4e76w+e
+						4xVKYSKirFqZw3OcTDANBgkqhkiG9w0BAQUFAAOCAQEAmaYiU1kGOEi6Kx5l9mWe
+						FIsUCQM5QUHu2Yzy5Jo0+Jlom41XOR5vWjrly8bcG/3ztQQ/0gahSFIaXuym2b9o
+						/LPSsHklOjB9oHPudlzBkkn1LSiAXE6kjaLEIZg+sTgTyVoo0ZmVa7NsBSF0LTe6
+						lWlhmg+eMMKF/RyzZRrS8pGv2HeRSsGXcpUKEZi3ltZkJahMrYGKGl2PgAdIk8Nw
+						JP2zMRijGCQPMTx3qNW2kPr6vJyU6FLjsvh4Pe7Iqy3f/I24hLv56yjq2/WnZcRT
+						05XT9RmfWaVoCNvoFqa9gTOmvVqt1dz4HU5QDuxnZ6sxlhc8z15p794mPat3aPmo
+						HQ==
+					</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://as1.jesus.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://as1.jesus.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://as1.jesus.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://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://as1.jesus.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, Jesus College meal booking</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jesus.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Gerard</md:GivenName>
+    <md:SurName>Fegan</md:SurName>
+    <md:EmailAddress>mailto:computing.officer@jesus.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Melson</md:SurName>
+    <md:EmailAddress>mailto:it.manager@jesus.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/astonsu-voting.org-shibboleth.xml b/swamid-interfederations-2.0/astonsu-voting.org-shibboleth.xml
new file mode 100644
index 00000000..bf3f327b
--- /dev/null
+++ b/swamid-interfederations-2.0/astonsu-voting.org-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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://astonsu-voting.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-10T10:45: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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://astonsu-voting.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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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://astonsu-voting.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://astonsu-voting.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://astonsu-voting.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://astonsu-voting.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://astonsu-voting.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://astonsu-voting.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://astonsu-voting.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://astonsu-voting.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://astonsu-voting.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://astonsu-voting.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://astonsu-voting.org/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://astonsu-voting.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://astonsu-voting.org/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://astonsu-voting.org/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://astonsu-voting.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">Aston SU Voting</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://astonsu-voting.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/athens.bruford.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athens.bruford.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..fd643a17
--- /dev/null
+++ b/swamid-interfederations-2.0/athens.bruford.ac.uk-oala-metadata.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://athens.bruford.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bruford.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Rose Bruford College (Athens LA)</mdui:DisplayName>
+        <mdui:Logo height="60" width="60">https://portal.bruford.ac.uk/rbc_60x60.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://portal.bruford.ac.uk/rbc_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>
+						MIIDoDCCAoigAwIBAgIJAIDJCuAZQOZXMA0GCSqGSIb3DQEBBQUAMD4xHTAbBgNV
+						BAoTFFJvc2UgQnJ1Zm9yZCBDb2xsZWdlMR0wGwYDVQQDExRhdGhlbnMuYnJ1Zm9y
+						ZC5hYy51azAeFw0xMTA5MjIxNzA2MTJaFw0yMTA5MTkxNzA2MTJaMD4xHTAbBgNV
+						BAoTFFJvc2UgQnJ1Zm9yZCBDb2xsZWdlMR0wGwYDVQQDExRhdGhlbnMuYnJ1Zm9y
+						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMol/apZOolw
+						gLqjxKayFRsnsSRFqMVmJxLdF9ATD/tm90corctZskNCt+MvfiPN98J/he37mOUt
+						SuHxeGIyJgSDI+jj3/VVkIjJ+UMxnCTwhCMKnpio8ZEMKuBxbxkldCIg1M//ZOUc
+						geG/L1fTVUUAJZcVBTCOyRJ+S4UP6tnSlGp8nO1caceXR66pPlT+ziIKST3M1eRH
+						dEpChP9repElvXsqcUST2FExVNGxaD/QUAnCHHY0QhmQ0abKwex8fU/np+ufIWZ5
+						a8t4jbFoFJDB0VupAQfTPIs/ZPfYmVzk/vH4EBsXNfU39wtcnRTj9Xfkq/jq0QDH
+						u0LgIpxuRdECAwEAAaOBoDCBnTAdBgNVHQ4EFgQUz9x2Vi5uTDixbL7zYpiTVSry
+						9EowbgYDVR0jBGcwZYAUz9x2Vi5uTDixbL7zYpiTVSry9EqhQqRAMD4xHTAbBgNV
+						BAoTFFJvc2UgQnJ1Zm9yZCBDb2xsZWdlMR0wGwYDVQQDExRhdGhlbnMuYnJ1Zm9y
+						ZC5hYy51a4IJAIDJCuAZQOZXMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAK5mVgWfbhwy9qJ/qT0bVTemdAjkXQU1uEEmfJc+cLMJtBtMV8nSE0s9cf1Q
+						msT/W7VCMWQp5IOoYO+xDDj/EMVmJNxHEG/DMn0iOUzdatNXgtfXbMjB0sChgTcH
+						zqeg/kXgYSzQND40RRSB199nhy67qdtIF+aPJciCZ98u/xdPSL6kSPP7aPPLb1Wu
+						+C6sZ+kdkNWDGLKgxanWSM2HDVta5MSm0n4Iy9kvlktFUcjiauWxV9MR3G0/bg+K
+						/pqLuisfI0ssY3bi/CuLKBRAw8tabT34gYFnHPHxA7Cr9BBE1fUB/fA6q1utWatY
+						tPNj67Bibl7d1TeU5BxZmOxrQKU=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDoDCCAoigAwIBAgIJAIDJCuAZQOZXMA0GCSqGSIb3DQEBBQUAMD4xHTAbBgNV
+						BAoTFFJvc2UgQnJ1Zm9yZCBDb2xsZWdlMR0wGwYDVQQDExRhdGhlbnMuYnJ1Zm9y
+						ZC5hYy51azAeFw0xMTA5MjIxNzA2MTJaFw0yMTA5MTkxNzA2MTJaMD4xHTAbBgNV
+						BAoTFFJvc2UgQnJ1Zm9yZCBDb2xsZWdlMR0wGwYDVQQDExRhdGhlbnMuYnJ1Zm9y
+						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMol/apZOolw
+						gLqjxKayFRsnsSRFqMVmJxLdF9ATD/tm90corctZskNCt+MvfiPN98J/he37mOUt
+						SuHxeGIyJgSDI+jj3/VVkIjJ+UMxnCTwhCMKnpio8ZEMKuBxbxkldCIg1M//ZOUc
+						geG/L1fTVUUAJZcVBTCOyRJ+S4UP6tnSlGp8nO1caceXR66pPlT+ziIKST3M1eRH
+						dEpChP9repElvXsqcUST2FExVNGxaD/QUAnCHHY0QhmQ0abKwex8fU/np+ufIWZ5
+						a8t4jbFoFJDB0VupAQfTPIs/ZPfYmVzk/vH4EBsXNfU39wtcnRTj9Xfkq/jq0QDH
+						u0LgIpxuRdECAwEAAaOBoDCBnTAdBgNVHQ4EFgQUz9x2Vi5uTDixbL7zYpiTVSry
+						9EowbgYDVR0jBGcwZYAUz9x2Vi5uTDixbL7zYpiTVSry9EqhQqRAMD4xHTAbBgNV
+						BAoTFFJvc2UgQnJ1Zm9yZCBDb2xsZWdlMR0wGwYDVQQDExRhdGhlbnMuYnJ1Zm9y
+						ZC5hYy51a4IJAIDJCuAZQOZXMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAK5mVgWfbhwy9qJ/qT0bVTemdAjkXQU1uEEmfJc+cLMJtBtMV8nSE0s9cf1Q
+						msT/W7VCMWQp5IOoYO+xDDj/EMVmJNxHEG/DMn0iOUzdatNXgtfXbMjB0sChgTcH
+						zqeg/kXgYSzQND40RRSB199nhy67qdtIF+aPJciCZ98u/xdPSL6kSPP7aPPLb1Wu
+						+C6sZ+kdkNWDGLKgxanWSM2HDVta5MSm0n4Iy9kvlktFUcjiauWxV9MR3G0/bg+K
+						/pqLuisfI0ssY3bi/CuLKBRAw8tabT34gYFnHPHxA7Cr9BBE1fUB/fA6q1utWatY
+						tPNj67Bibl7d1TeU5BxZmOxrQKU=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athens.bruford.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athens.bruford.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Rose Bruford College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Rose Bruford College (Athens LA)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bruford.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Zoe</md:GivenName>
+    <md:SurName>Ellis</md:SurName>
+    <md:EmailAddress>mailto:Zoe.Ellis@bruford.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marc</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:marc.wilson@bruford.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athens.gcc.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athens.gcc.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..239acea8
--- /dev/null
+++ b/swamid-interfederations-2.0/athens.gcc.ac.uk-oala-metadata.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://athens.gcc.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-28T11:32: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gcc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDVDCCAjygAwIBAgIIZDkGkl9vMnswDQYJKoZIhvcNAQEFBQAwQTEkMCIGA1UE
+						CgwbR3JlZW53aWNoIENvbW11bml0eSBDb2xsZWdlMRkwFwYDVQQDDBBhdGhlbnMu
+						Z2NjLmFjLnVrMB4XDTEyMDkyNjA5MTE1OFoXDTIyMDkyNjA5MTE1OFowQTEkMCIG
+						A1UECgwbR3JlZW53aWNoIENvbW11bml0eSBDb2xsZWdlMRkwFwYDVQQDDBBhdGhl
+						bnMuZ2NjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjizt
+						iasQN9XJEROq+jKdGAyMC/ZPA5WlWSiow8EtKCLgfVBteMtBQYfNdC46NimD/9R9
+						Zuz7J2rVyECCS1LJQ0DEBNMuoXjTURe8WcqzuwqtQmDNfxXR1KXl7oK7j9toSEfV
+						sjewKskG95BnUl/444TLhjdmFQITLRlouj95dTtisqlWaEkhEIcyY2A2tUPy6K03
+						2AJd6sAAeJtC3JY3dmrQmsKz0KKLXJPocr9gHffyssJLSCo0AeBWpryfNKBrefft
+						AS8/yEnULpnaoBvsyM/9Zbqhr3Fk0HDJ2/nImrQmd9qPVDy7JhZVaupXi/EGRleG
+						Kr0z1Eg5UHihgiGwMQIDAQABo1AwTjAdBgNVHQ4EFgQU/23/DDRDFN+xOV/RwtEC
+						jlykbJowHwYDVR0jBBgwFoAU/23/DDRDFN+xOV/RwtECjlykbJowDAYDVR0TBAUw
+						AwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAiG3o2/x1+ylakkGBN0jlX/qur0bYrGZx
+						1PN45rIOKbtrXmg9DxZ1n4whmxkTbtaXrkTHoufaOy45HRwYC3uo3lb567BHGT28
+						RX6A4eoRSNtOdkhV+FG/N6nrXcRE6e0zrinevb9zaXc2W/BdHhckAoiy/p6O7mkC
+						kdNeb73Roa/dVMKAqhadpN5GOjB5C8zJslHi1xz00mr8R536+yXXGVFrvNrxVz1i
+						UUbYQ08xGTNbEu0lWUKMXvu/o1UGff7xbocTLduVR2b7m3Trx3aQqHs9uQDDieFE
+						oHLQY5r0sjjy+wGMUU1G3PVqM24A0ZUlAtJLg3tpc6KvlMWetkbJmA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDVDCCAjygAwIBAgIIZDkGkl9vMnswDQYJKoZIhvcNAQEFBQAwQTEkMCIGA1UE
+						CgwbR3JlZW53aWNoIENvbW11bml0eSBDb2xsZWdlMRkwFwYDVQQDDBBhdGhlbnMu
+						Z2NjLmFjLnVrMB4XDTEyMDkyNjA5MTE1OFoXDTIyMDkyNjA5MTE1OFowQTEkMCIG
+						A1UECgwbR3JlZW53aWNoIENvbW11bml0eSBDb2xsZWdlMRkwFwYDVQQDDBBhdGhl
+						bnMuZ2NjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjizt
+						iasQN9XJEROq+jKdGAyMC/ZPA5WlWSiow8EtKCLgfVBteMtBQYfNdC46NimD/9R9
+						Zuz7J2rVyECCS1LJQ0DEBNMuoXjTURe8WcqzuwqtQmDNfxXR1KXl7oK7j9toSEfV
+						sjewKskG95BnUl/444TLhjdmFQITLRlouj95dTtisqlWaEkhEIcyY2A2tUPy6K03
+						2AJd6sAAeJtC3JY3dmrQmsKz0KKLXJPocr9gHffyssJLSCo0AeBWpryfNKBrefft
+						AS8/yEnULpnaoBvsyM/9Zbqhr3Fk0HDJ2/nImrQmd9qPVDy7JhZVaupXi/EGRleG
+						Kr0z1Eg5UHihgiGwMQIDAQABo1AwTjAdBgNVHQ4EFgQU/23/DDRDFN+xOV/RwtEC
+						jlykbJowHwYDVR0jBBgwFoAU/23/DDRDFN+xOV/RwtECjlykbJowDAYDVR0TBAUw
+						AwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAiG3o2/x1+ylakkGBN0jlX/qur0bYrGZx
+						1PN45rIOKbtrXmg9DxZ1n4whmxkTbtaXrkTHoufaOy45HRwYC3uo3lb567BHGT28
+						RX6A4eoRSNtOdkhV+FG/N6nrXcRE6e0zrinevb9zaXc2W/BdHhckAoiy/p6O7mkC
+						kdNeb73Roa/dVMKAqhadpN5GOjB5C8zJslHi1xz00mr8R536+yXXGVFrvNrxVz1i
+						UUbYQ08xGTNbEu0lWUKMXvu/o1UGff7xbocTLduVR2b7m3Trx3aQqHs9uQDDieFE
+						oHLQY5r0sjjy+wGMUU1G3PVqM24A0ZUlAtJLg3tpc6KvlMWetkbJmA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athens.gcc.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athens.gcc.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Greenwich Community College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Greenwich Community College OALA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gcc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Waller</md:SurName>
+    <md:EmailAddress>mailto:andyw@gcc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Flash</md:SurName>
+    <md:EmailAddress>mailto:andrewf@gcc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athens.petroc.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athens.petroc.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..8154b15c
--- /dev/null
+++ b/swamid-interfederations-2.0/athens.petroc.ac.uk-oala-metadata.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://athens.petroc.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">petroc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDczCCAlugAwIBAgIJAP49f9/KNkx3MA0GCSqGSIb3DQEBBQUAMC8xDzANBgNV
+						BAoTBlBFVFJPQzEcMBoGA1UEAxMTYXRoZW5zLnBldHJvYy5hYy51azAeFw0xMTEy
+						MTUwOTM4MzdaFw0yMTEyMTIwOTM4MzdaMC8xDzANBgNVBAoTBlBFVFJPQzEcMBoG
+						A1UEAxMTYXRoZW5zLnBldHJvYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAMhXweFC/U8mUhT+V2vJsH5ELaEs6xDfXD3ihHvvl1AEQtDyRcs0
+						N2Zh9QvTgRPWSl569JtcHVQ1G3FIxcUophl5tzKAbI/gxwfkIS1hGSUwKc65pUhY
+						4R5HyO26gC9TuHUTXFXL80K+e3IxXoPwaJzabncOz2DGfhXiDZ6PU+ahr+d14YYA
+						QZ46a0FsaO2msccY+kr4sdV1O1hXHotooIyyK0131Lt52dcK7mZ7a0LUdEey2TEf
+						/zYSPRUMkcxSDzwRlY4FUYLN5wjF4x+bCDlTU3tZZi7+qKH5rmnvHwu63/UbXxhr
+						+Z4fBSe8Liyca4xRIxPg1mJtYUb/9JexfGsCAwEAAaOBkTCBjjAdBgNVHQ4EFgQU
+						RH/geX2D4EXsTNSy0YbMV9SpA/wwXwYDVR0jBFgwVoAURH/geX2D4EXsTNSy0YbM
+						V9SpA/yhM6QxMC8xDzANBgNVBAoTBlBFVFJPQzEcMBoGA1UEAxMTYXRoZW5zLnBl
+						dHJvYy5hYy51a4IJAP49f9/KNkx3MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
+						BQADggEBALE84Lanege19wQ+QI/SfH7mz1X86E+HwT+Yq1g8PvE/WG82p8DyHbNm
+						nKibsrJhHI8bIIvx4FFswl5jlrZf4cXIgTyl2ccesWkk3cCFuaydFUxDzODIWop/
+						i7lcvme96nRYyyRXkJ1hh0kp+w7cylnYrP9oilR9XBMj7PQ/9PkHofIq+3U9bM5S
+						V9AuL7fbjfXXHWdszx56GKEEwvAhOy9Hfq2/oyRTPKUHNtveFH7WehyMJ0O0FMiC
+						6fwieIKJwU2kPV2L8cbfOxRa7nuqXWfqUFMCkx/ptt5joISvGLJqwNlIDzz5zIcu
+						QI6O4PXRJe/bHRba/8ghVSi3FUEfb5g=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDczCCAlugAwIBAgIJAP49f9/KNkx3MA0GCSqGSIb3DQEBBQUAMC8xDzANBgNV
+						BAoTBlBFVFJPQzEcMBoGA1UEAxMTYXRoZW5zLnBldHJvYy5hYy51azAeFw0xMTEy
+						MTUwOTM4MzdaFw0yMTEyMTIwOTM4MzdaMC8xDzANBgNVBAoTBlBFVFJPQzEcMBoG
+						A1UEAxMTYXRoZW5zLnBldHJvYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAMhXweFC/U8mUhT+V2vJsH5ELaEs6xDfXD3ihHvvl1AEQtDyRcs0
+						N2Zh9QvTgRPWSl569JtcHVQ1G3FIxcUophl5tzKAbI/gxwfkIS1hGSUwKc65pUhY
+						4R5HyO26gC9TuHUTXFXL80K+e3IxXoPwaJzabncOz2DGfhXiDZ6PU+ahr+d14YYA
+						QZ46a0FsaO2msccY+kr4sdV1O1hXHotooIyyK0131Lt52dcK7mZ7a0LUdEey2TEf
+						/zYSPRUMkcxSDzwRlY4FUYLN5wjF4x+bCDlTU3tZZi7+qKH5rmnvHwu63/UbXxhr
+						+Z4fBSe8Liyca4xRIxPg1mJtYUb/9JexfGsCAwEAAaOBkTCBjjAdBgNVHQ4EFgQU
+						RH/geX2D4EXsTNSy0YbMV9SpA/wwXwYDVR0jBFgwVoAURH/geX2D4EXsTNSy0YbM
+						V9SpA/yhM6QxMC8xDzANBgNVBAoTBlBFVFJPQzEcMBoGA1UEAxMTYXRoZW5zLnBl
+						dHJvYy5hYy51a4IJAP49f9/KNkx3MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
+						BQADggEBALE84Lanege19wQ+QI/SfH7mz1X86E+HwT+Yq1g8PvE/WG82p8DyHbNm
+						nKibsrJhHI8bIIvx4FFswl5jlrZf4cXIgTyl2ccesWkk3cCFuaydFUxDzODIWop/
+						i7lcvme96nRYyyRXkJ1hh0kp+w7cylnYrP9oilR9XBMj7PQ/9PkHofIq+3U9bM5S
+						V9AuL7fbjfXXHWdszx56GKEEwvAhOy9Hfq2/oyRTPKUHNtveFH7WehyMJ0O0FMiC
+						6fwieIKJwU2kPV2L8cbfOxRa7nuqXWfqUFMCkx/ptt5joISvGLJqwNlIDzz5zIcu
+						QI6O4PXRJe/bHRba/8ghVSi3FUEfb5g=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athens.petroc.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athens.petroc.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Petroc College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">PETROC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.petroc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Phil</md:GivenName>
+    <md:SurName>McDonald</md:SurName>
+    <md:EmailAddress>mailto:library@petroc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Fox</md:SurName>
+    <md:EmailAddress>mailto:simon.fox@petroc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athens.regents.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athens.regents.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..78ca76bc
--- /dev/null
+++ b/swamid-interfederations-2.0/athens.regents.ac.uk-oala-metadata.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://athens.regents.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-19T11:30: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">regents.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDRjCCAi6gAwIBAgIIMniGNVlQlUIwDQYJKoZIhvcNAQEFBQAwOjEZMBcGA1UE
+						CgwQUmVnZW50J3MgQ29sbGVnZTEdMBsGA1UEAwwUYXRoZW5zLnJlZ2VudHMuYWMu
+						dWswHhcNMTMwNDE3MDgxNTUyWhcNMjMwNDE3MDgxNTUyWjA6MRkwFwYDVQQKDBBS
+						ZWdlbnQncyBDb2xsZWdlMR0wGwYDVQQDDBRhdGhlbnMucmVnZW50cy5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIcO/FyCTw0Cja2F6MS05uEU
+						69TSJQPIe/PXEYQSL0qXBZshoIGCNqzwUhjHpBtrNd81kH1wxpE6wNwrUwOYcXm6
+						Pp+sPrtn/nkgKbVCz49tLs3DdUCkG/tzi+/DyaT38Gb3d1PgsNk9cOP7VlI4RSuW
+						m8RspO3ljdin9sgPDY0TKchCV9lnoOf38Vyajp0XVlABCwSfmH1/fOX8X2DNaZM4
+						MVKHZR3c+5GWMaolLkhdGolrT4bfBuJl/mMiGRKJuvTlENxIA3cPAkpDUK9MV9EY
+						giqvDrp96h0HZJXXX+O3JA4UhqLKatHVEBi9Xxk/qW8JMKLtE84BOIK10N30jG8C
+						AwEAAaNQME4wHQYDVR0OBBYEFAqjFwiH6vZXqQ8dWU1ya0hfv0yJMB8GA1UdIwQY
+						MBaAFAqjFwiH6vZXqQ8dWU1ya0hfv0yJMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
+						AQEFBQADggEBADY6kYiT2mc5moWnARG3cVeA3gS+HC7OA9w5rCQeh+4D6bSbbJjk
+						/8H92X30kyuuF0YTUvbNWxDwypvIBUtF7oiu46IKzbraBtQGqmU9GfJGdO5tPZge
+						LtW57E9jqJxlCjrTPyAm6OTjr7uyH2EnalWp8vwLaAWKJx8VcdH1k4RqQghGrqCq
+						Wm1C9N067zarj1pwml9lK/9y03jcda6jJ+z/OJCYEXSndXHqv0ATvZ5p1Cv0pACj
+						FueeLMHXoR5SRN5pRBeb3/EY8CgYQUPdAyE+hqtWhwM8u/tNXh9utG44i07NOV7e
+						SK8Sj6QUzuD0wOEXzl9vRh9tn6Ww9P3ltBc=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDRjCCAi6gAwIBAgIIMniGNVlQlUIwDQYJKoZIhvcNAQEFBQAwOjEZMBcGA1UE
+						CgwQUmVnZW50J3MgQ29sbGVnZTEdMBsGA1UEAwwUYXRoZW5zLnJlZ2VudHMuYWMu
+						dWswHhcNMTMwNDE3MDgxNTUyWhcNMjMwNDE3MDgxNTUyWjA6MRkwFwYDVQQKDBBS
+						ZWdlbnQncyBDb2xsZWdlMR0wGwYDVQQDDBRhdGhlbnMucmVnZW50cy5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIcO/FyCTw0Cja2F6MS05uEU
+						69TSJQPIe/PXEYQSL0qXBZshoIGCNqzwUhjHpBtrNd81kH1wxpE6wNwrUwOYcXm6
+						Pp+sPrtn/nkgKbVCz49tLs3DdUCkG/tzi+/DyaT38Gb3d1PgsNk9cOP7VlI4RSuW
+						m8RspO3ljdin9sgPDY0TKchCV9lnoOf38Vyajp0XVlABCwSfmH1/fOX8X2DNaZM4
+						MVKHZR3c+5GWMaolLkhdGolrT4bfBuJl/mMiGRKJuvTlENxIA3cPAkpDUK9MV9EY
+						giqvDrp96h0HZJXXX+O3JA4UhqLKatHVEBi9Xxk/qW8JMKLtE84BOIK10N30jG8C
+						AwEAAaNQME4wHQYDVR0OBBYEFAqjFwiH6vZXqQ8dWU1ya0hfv0yJMB8GA1UdIwQY
+						MBaAFAqjFwiH6vZXqQ8dWU1ya0hfv0yJMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
+						AQEFBQADggEBADY6kYiT2mc5moWnARG3cVeA3gS+HC7OA9w5rCQeh+4D6bSbbJjk
+						/8H92X30kyuuF0YTUvbNWxDwypvIBUtF7oiu46IKzbraBtQGqmU9GfJGdO5tPZge
+						LtW57E9jqJxlCjrTPyAm6OTjr7uyH2EnalWp8vwLaAWKJx8VcdH1k4RqQghGrqCq
+						Wm1C9N067zarj1pwml9lK/9y03jcda6jJ+z/OJCYEXSndXHqv0ATvZ5p1Cv0pACj
+						FueeLMHXoR5SRN5pRBeb3/EY8CgYQUPdAyE+hqtWhwM8u/tNXh9utG44i07NOV7e
+						SK8Sj6QUzuD0wOEXzl9vRh9tn6Ww9P3ltBc=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athens.regents.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athens.regents.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Regent's University London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Regent's University London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.regents.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jean</md:GivenName>
+    <md:SurName>Heckman</md:SurName>
+    <md:EmailAddress>mailto:heckmanj@regents.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Diane</md:GivenName>
+    <md:SurName>Pineda</md:SurName>
+    <md:EmailAddress>mailto:pinedad@regents.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athens.sfx.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athens.sfx.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..c33fd34b
--- /dev/null
+++ b/swamid-interfederations-2.0/athens.sfx.ac.uk-oala-metadata.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://athens.sfx.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-14T11:14:28Z"/>
+  </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">sfx.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUDCCAjigAwIBAgIIUrw3/3s/GpYwDQYJKoZIhvcNAQEFBQAwPzEiMCAGA1UE
+						CgwZU3QgRnJhbmNpcyBYYXZpZXIgQ29sbGVnZTEZMBcGA1UEAwwQYXRoZW5zLnNm
+						eC5hYy51azAeFw0xMjA4MzAxNTQ5MTdaFw0yMjA4MzAxNTQ5MTdaMD8xIjAgBgNV
+						BAoMGVN0IEZyYW5jaXMgWGF2aWVyIENvbGxlZ2UxGTAXBgNVBAMMEGF0aGVucy5z
+						ZnguYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbuIZE3JvJ
+						SLvlL/GTkpG8ZMwN/XEjaOMki9e0AH59+diThTfB7qWlWkeKcP3V3u+Qix0HXIER
+						5KPorCGlc9plEGisiMlB1VM7quRpo8rj5+epqcHEFvMP4uM3uYL6kLmtaU9xiIeA
+						2Rwc4JjSEWpNlA9foUG+5sOF8H9PZYcThe4yxxI38e7SzSBDQDnNFrBGkYp23bEK
+						8MH1Yc/BEu/mk4CZxrE/6WJbnOLLZHCu3A+J8InQyMPOUHbuOBo15yk7vpT0lDAT
+						LFXymhGJx4Cw5G9yAert/+iNrCuInsXrzwmAVcPkJhSlbcUtSESgSvJ52LfTA+lD
+						0ya6eHCUYTNvAgMBAAGjUDBOMB0GA1UdDgQWBBRfKyEp6Ee71d5mr8imf5Y0LNHm
+						xTAfBgNVHSMEGDAWgBRfKyEp6Ee71d5mr8imf5Y0LNHmxTAMBgNVHRMEBTADAQH/
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBY1cgB4u67JUxDDSCG9BC1B0q+cPUzi5GQYd0c
+						JMsKGuW/xIEOYCRV8KbSUjk5rhH5+Aa5AhVknAyMHQk1Ex3sr5inyUU1kKMth32o
+						xQP58zDF/bDG5IWhid4BDYsxz5eeblU3DDLBYelVCIDMtEGDr/EywCsDn++31clZ
+						6nAR2NVota0VkCGui5SIaNKP2xvXVmTXF6sgwEtrODA48USXZ5qYEtw4KebMRNgB
+						+5+F6kGugAhrGrzk2I/TXaHFaSK9VoZeeWhlP9TrUGs3OoZpcJIOn7YNWkRXjvc4
+						Jm97jXW671SIlxESNhiaaTRp6xcZFFm5iSsPcm5+BIy+VNTL
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUDCCAjigAwIBAgIIUrw3/3s/GpYwDQYJKoZIhvcNAQEFBQAwPzEiMCAGA1UE
+						CgwZU3QgRnJhbmNpcyBYYXZpZXIgQ29sbGVnZTEZMBcGA1UEAwwQYXRoZW5zLnNm
+						eC5hYy51azAeFw0xMjA4MzAxNTQ5MTdaFw0yMjA4MzAxNTQ5MTdaMD8xIjAgBgNV
+						BAoMGVN0IEZyYW5jaXMgWGF2aWVyIENvbGxlZ2UxGTAXBgNVBAMMEGF0aGVucy5z
+						ZnguYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbuIZE3JvJ
+						SLvlL/GTkpG8ZMwN/XEjaOMki9e0AH59+diThTfB7qWlWkeKcP3V3u+Qix0HXIER
+						5KPorCGlc9plEGisiMlB1VM7quRpo8rj5+epqcHEFvMP4uM3uYL6kLmtaU9xiIeA
+						2Rwc4JjSEWpNlA9foUG+5sOF8H9PZYcThe4yxxI38e7SzSBDQDnNFrBGkYp23bEK
+						8MH1Yc/BEu/mk4CZxrE/6WJbnOLLZHCu3A+J8InQyMPOUHbuOBo15yk7vpT0lDAT
+						LFXymhGJx4Cw5G9yAert/+iNrCuInsXrzwmAVcPkJhSlbcUtSESgSvJ52LfTA+lD
+						0ya6eHCUYTNvAgMBAAGjUDBOMB0GA1UdDgQWBBRfKyEp6Ee71d5mr8imf5Y0LNHm
+						xTAfBgNVHSMEGDAWgBRfKyEp6Ee71d5mr8imf5Y0LNHmxTAMBgNVHRMEBTADAQH/
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBY1cgB4u67JUxDDSCG9BC1B0q+cPUzi5GQYd0c
+						JMsKGuW/xIEOYCRV8KbSUjk5rhH5+Aa5AhVknAyMHQk1Ex3sr5inyUU1kKMth32o
+						xQP58zDF/bDG5IWhid4BDYsxz5eeblU3DDLBYelVCIDMtEGDr/EywCsDn++31clZ
+						6nAR2NVota0VkCGui5SIaNKP2xvXVmTXF6sgwEtrODA48USXZ5qYEtw4KebMRNgB
+						+5+F6kGugAhrGrzk2I/TXaHFaSK9VoZeeWhlP9TrUGs3OoZpcJIOn7YNWkRXjvc4
+						Jm97jXW671SIlxESNhiaaTRp6xcZFFm5iSsPcm5+BIy+VNTL
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athens.sfx.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athens.sfx.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">St Francis Xavier Sixth Form College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">St.Francis Xavier 6th Form College SSO</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sfx.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Learning Resources Centre</md:GivenName>
+    <md:EmailAddress>mailto:library@sfx.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pat</md:GivenName>
+    <md:SurName>Griffin</md:SurName>
+    <md:EmailAddress>mailto:p.griffin@sfx.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..f1bce6ea
--- /dev/null
+++ b/swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://athens.winchester.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="2013-07-08T13:59:39Z"/>
+  </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>
+						MIIDXDCCAkSgAwIBAgIIQmqDispxGNswDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE
+						CgwYVW5pdmVyc2l0eSBvZiBXaW5jaGVzdGVyMSAwHgYDVQQDDBdhdGhlbnMud2lu
+						Y2hlc3Rlci5hYy51azAeFw0xMzA3MDMxMDA5NTlaFw0yMzA3MDMxMDA5NTlaMEUx
+						ITAfBgNVBAoMGFVuaXZlcnNpdHkgb2YgV2luY2hlc3RlcjEgMB4GA1UEAwwXYXRo
+						ZW5zLndpbmNoZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+						AoIBAQCJ1jkVRgLTXubvfnTjrgldm0Lzg0A7LLkiBtcRhimvbf5ZWO69qaiPOi7U
+						ZqS2nI1OKErrQV8QImOv15sbYZesSqnErkOiitJbOvdGliwIR5x4njSrqA7d4heZ
+						G8dbYpEtJexNz1Lct4pzDxq7FP3uixX+CYuutrTsxCrrsO450zs0aVzM2qUEK9GZ
+						r144+6H4cA8AKQD0rB1uqv9aNDZljkWhkgMUoUCkjc1mXsmuSP+0DappKGBhIdRH
+						KBisDT4+d3QBvt7HaY9xi0bQllu05enGeA5PaPfIaZFOEXVA28bgrHcbDaa2Ccb9
+						xIpVaKsMGh/cK4JExZjTxdnGCvF5AgMBAAGjUDBOMB0GA1UdDgQWBBTZsfd42w9Y
+						1+pqgyYhGZqJp7Y2+jAfBgNVHSMEGDAWgBTZsfd42w9Y1+pqgyYhGZqJp7Y2+jAM
+						BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBjPCDp8APA44IqqaCxdxIe
+						+UqgLVMCRMSP2d4F5x99/OLOfSLLVqCZMVddqkwbgGi+/Q8Zw7NCcJw4QaY4nzO8
+						7UXTsACjlQz5fD+FdxjVGkfIc3aSRH8Ly83W5RveQdaTukhmaFdM1ndK0TqhMc7n
+						owepHnvJwak5PH6KyZ1FYNLhCfjh4xNuuwhmoh60XAweUWZzP9IfS2VxNNzBv3+5
+						fcaD4APnIG4TQqH263QTMpdv31bgHuYCs90L4+7ZjF90CCPxvhmEg0MYbdabCJOz
+						TQq4kHUbCj4NK67GjP305jurZGiOUQRqy3ma0TcwYkElPkKZj6hZEPvNfuRTp2V9
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDXDCCAkSgAwIBAgIIQmqDispxGNswDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE
+						CgwYVW5pdmVyc2l0eSBvZiBXaW5jaGVzdGVyMSAwHgYDVQQDDBdhdGhlbnMud2lu
+						Y2hlc3Rlci5hYy51azAeFw0xMzA3MDMxMDA5NTlaFw0yMzA3MDMxMDA5NTlaMEUx
+						ITAfBgNVBAoMGFVuaXZlcnNpdHkgb2YgV2luY2hlc3RlcjEgMB4GA1UEAwwXYXRo
+						ZW5zLndpbmNoZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+						AoIBAQCJ1jkVRgLTXubvfnTjrgldm0Lzg0A7LLkiBtcRhimvbf5ZWO69qaiPOi7U
+						ZqS2nI1OKErrQV8QImOv15sbYZesSqnErkOiitJbOvdGliwIR5x4njSrqA7d4heZ
+						G8dbYpEtJexNz1Lct4pzDxq7FP3uixX+CYuutrTsxCrrsO450zs0aVzM2qUEK9GZ
+						r144+6H4cA8AKQD0rB1uqv9aNDZljkWhkgMUoUCkjc1mXsmuSP+0DappKGBhIdRH
+						KBisDT4+d3QBvt7HaY9xi0bQllu05enGeA5PaPfIaZFOEXVA28bgrHcbDaa2Ccb9
+						xIpVaKsMGh/cK4JExZjTxdnGCvF5AgMBAAGjUDBOMB0GA1UdDgQWBBTZsfd42w9Y
+						1+pqgyYhGZqJp7Y2+jAfBgNVHSMEGDAWgBTZsfd42w9Y1+pqgyYhGZqJp7Y2+jAM
+						BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBjPCDp8APA44IqqaCxdxIe
+						+UqgLVMCRMSP2d4F5x99/OLOfSLLVqCZMVddqkwbgGi+/Q8Zw7NCcJw4QaY4nzO8
+						7UXTsACjlQz5fD+FdxjVGkfIc3aSRH8Ly83W5RveQdaTukhmaFdM1ndK0TqhMc7n
+						owepHnvJwak5PH6KyZ1FYNLhCfjh4xNuuwhmoh60XAweUWZzP9IfS2VxNNzBv3+5
+						fcaD4APnIG4TQqH263QTMpdv31bgHuYCs90L4+7ZjF90CCPxvhmEg0MYbdabCJOz
+						TQq4kHUbCj4NK67GjP305jurZGiOUQRqy3ma0TcwYkElPkKZj6hZEPvNfuRTp2V9
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athens.winchester.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athens.winchester.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Winchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Winchester Pilot</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.winchester.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:Helpdesk@winchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:Helpdesk@winchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athensla-dev.uwe.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athensla-dev.uwe.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..7deec322
--- /dev/null
+++ b/swamid-interfederations-2.0/athensla-dev.uwe.ac.uk-oala-metadata.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://athensla-dev.uwe.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-02-27T10:49:58Z"/>
+  </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">uwe.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDnDCCAoSgAwIBAgIIAj83J4NilnUwDQYJKoZIhvcNAQEFBQAwZTFCMEAGA1UE
+						Cgw5VW5pdmVyc2l0eSBvZiB0aGUgV2VzdCBvZiBFbmdsYW5kIChVV0UpIC0gT3Bl
+						bkF0aGVucyB0ZXN0MR8wHQYDVQQDDBZhdGhlbnNsYS1kZXYudXdlLmFjLnVrMB4X
+						DTEyMDEzMTE0NDQwOVoXDTIyMDEzMTE0NDQwOVowZTFCMEAGA1UECgw5VW5pdmVy
+						c2l0eSBvZiB0aGUgV2VzdCBvZiBFbmdsYW5kIChVV0UpIC0gT3BlbkF0aGVucyB0
+						ZXN0MR8wHQYDVQQDDBZhdGhlbnNsYS1kZXYudXdlLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqxbxAqe72n/rFUKC+8culLa4pBzN/nJtn9GF
+						6n6zV89BXbmtzJ+BHMaRxnK38RCbnD0DteMsOidfFH5cfiWCE2sc9QYEOnH33QKA
+						wE4hWKaTWgQPyGqZeuMYG1fJIUSVuO6Uv6BU8rPcUUA+Y5KMqtNW+7gqqMTZIzN8
+						9DAHQuFuAQ0eo45sQ9R/KlHGhCLxq7QfSc5Ubw0RDAu6LKNIcysE5Z2wHveSrOFl
+						ATfGvlIDqD3NgU5qTAgOmtdV7SMLV2GmUHchywsU5lAfe79F29eLR76I3VS7QvS/
+						pNFWaNEeZ6KzekjuP1AA9DTE6e/G8tGbp9TuN3Voxd17X3df6wIDAQABo1AwTjAd
+						BgNVHQ4EFgQUH09lZ8a/50v7n7KoHu5cPkXL4c0wHwYDVR0jBBgwFoAUH09lZ8a/
+						50v7n7KoHu5cPkXL4c0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
+						OddVOziOhr4dyJAY4qlb1KOoYmluG79TdWJX8j35+ZiyMzm/xgA0uHzwuSIu3XbE
+						dskHJou0p13BqDOMXXeTvCmOWylxPgrLv7bDfY3IiCJO/lLcCESJ+gDglkjDioGq
+						pwrdhq9wOFVThuqmQSQlBFxPauGazIs+9x1g+pb0xtHXQY3VQabwtgOF9j1kRJ34
+						6h/pyQvI3Xqs+z+v/LPb3Kgq9Xfx91U+KJcPgzrcqVYPRYcEXQnDIag3JO9KQvja
+						CBC55WV0qbeYU7fb3oAdceGRkKzS5oP0h0rtRxTaAKq6HIrmu65mF4upHfAR3KB+
+						i+gyuTDSHb2b8u6Rvfl54A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDnDCCAoSgAwIBAgIIAj83J4NilnUwDQYJKoZIhvcNAQEFBQAwZTFCMEAGA1UE
+						Cgw5VW5pdmVyc2l0eSBvZiB0aGUgV2VzdCBvZiBFbmdsYW5kIChVV0UpIC0gT3Bl
+						bkF0aGVucyB0ZXN0MR8wHQYDVQQDDBZhdGhlbnNsYS1kZXYudXdlLmFjLnVrMB4X
+						DTEyMDEzMTE0NDQwOVoXDTIyMDEzMTE0NDQwOVowZTFCMEAGA1UECgw5VW5pdmVy
+						c2l0eSBvZiB0aGUgV2VzdCBvZiBFbmdsYW5kIChVV0UpIC0gT3BlbkF0aGVucyB0
+						ZXN0MR8wHQYDVQQDDBZhdGhlbnNsYS1kZXYudXdlLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqxbxAqe72n/rFUKC+8culLa4pBzN/nJtn9GF
+						6n6zV89BXbmtzJ+BHMaRxnK38RCbnD0DteMsOidfFH5cfiWCE2sc9QYEOnH33QKA
+						wE4hWKaTWgQPyGqZeuMYG1fJIUSVuO6Uv6BU8rPcUUA+Y5KMqtNW+7gqqMTZIzN8
+						9DAHQuFuAQ0eo45sQ9R/KlHGhCLxq7QfSc5Ubw0RDAu6LKNIcysE5Z2wHveSrOFl
+						ATfGvlIDqD3NgU5qTAgOmtdV7SMLV2GmUHchywsU5lAfe79F29eLR76I3VS7QvS/
+						pNFWaNEeZ6KzekjuP1AA9DTE6e/G8tGbp9TuN3Voxd17X3df6wIDAQABo1AwTjAd
+						BgNVHQ4EFgQUH09lZ8a/50v7n7KoHu5cPkXL4c0wHwYDVR0jBBgwFoAUH09lZ8a/
+						50v7n7KoHu5cPkXL4c0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
+						OddVOziOhr4dyJAY4qlb1KOoYmluG79TdWJX8j35+ZiyMzm/xgA0uHzwuSIu3XbE
+						dskHJou0p13BqDOMXXeTvCmOWylxPgrLv7bDfY3IiCJO/lLcCESJ+gDglkjDioGq
+						pwrdhq9wOFVThuqmQSQlBFxPauGazIs+9x1g+pb0xtHXQY3VQabwtgOF9j1kRJ34
+						6h/pyQvI3Xqs+z+v/LPb3Kgq9Xfx91U+KJcPgzrcqVYPRYcEXQnDIag3JO9KQvja
+						CBC55WV0qbeYU7fb3oAdceGRkKzS5oP0h0rtRxTaAKq6HIrmu65mF4upHfAR3KB+
+						i+gyuTDSHb2b8u6Rvfl54A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athensla-dev.uwe.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athensla-dev.uwe.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <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) - OpenAthens test</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/athensla.uwe.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athensla.uwe.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..504c4cbb
--- /dev/null
+++ b/swamid-interfederations-2.0/athensla.uwe.ac.uk-oala-metadata.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://athensla.uwe.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwe.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of the West of England (UWE)</mdui:DisplayName>
+        <mdui:Logo height="60" width="155">https://library.uwe.ac.uk/uwe/uwelogoopenathens.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://library.uwe.ac.uk/uwe/favicon.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDcTCCAlmgAwIBAgIJAJ8fe5216tbDMA0GCSqGSIb3DQEBBQUAME8xMDAuBgNV
+						BAoMJ1VuaXZlcnNpdHkgb2YgdGhlIFdlc3Qgb2YgRW5nbGFuZCAoVVdFKTEbMBkG
+						A1UEAwwSYXRoZW5zbGEudXdlLmFjLnVrMB4XDTEzMTIwMjE2MzQ1N1oXDTIzMTEz
+						MDE2MzQ1N1owTzEwMC4GA1UECgwnVW5pdmVyc2l0eSBvZiB0aGUgV2VzdCBvZiBF
+						bmdsYW5kIChVV0UpMRswGQYDVQQDDBJhdGhlbnNsYS51d2UuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCc8ii9gKVq+K5jeXMigwfR7XdrauZT
+						EixNOzSZMJVmjvlQP1FYwkYY6+wq6c8OQ7OhxlCbWknz3bZo9CxS75OX8eIEr5Nx
+						Www4Qh8i3XOqXgtbSRN+bLvt1A1L6YRAjyP7weIZOic4VjPoBsOUWGXC+QzZB7lV
+						0x9Lq5FR3GZBQXLGXN+Vl/0WsCZYORGnkZutkUnTaJ0u3CJp7qfYJcTUIoyC1/mf
+						ghMBgaRr+zlXuN5B7gH89CfA8RLvSoQLzrE0y46+o9+0lEIScEzBUdBhvSABrslP
+						+e3Hf9aisLE6p0mRFxHI/Jp/9W68HRfFauzIKggwcKoTNQ9yKvrmLY9DAgMBAAGj
+						UDBOMB0GA1UdDgQWBBRTGhswU9gRevAWF9xO/U8h0e2K9DAfBgNVHSMEGDAWgBRT
+						GhswU9gRevAWF9xO/U8h0e2K9DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
+						A4IBAQBXSNwVMyQ6ZkJf28QyTOpTOySPoCJTbWeQh+ZMgvVYMhxcoV552G9fLKE+
+						Lz7uGElnjkYGPiLzRBC+hS4rv2xxzw1NY8JVPKSJQj3+NA5W2fb/rz/dzTG/ws5H
+						UQVopDsQO6nfhP39wWkc+V8j7ZdorE7OuqetlH/clf0rsXAUEvUKsnH/ZSqqCi6j
+						7HdU98sddgEqv6g71J+BPECPq4FBNr9S9Enbi7NxqMicfFMiEnK5DvDaDwI+RC54
+						Wa4FCcK/O6SB8OgD8Dk59xmFXwEGyMUjNvjTZqKMFRmwS8zDyDtCWyi87GKqrAP1
+						uzXnYMVigld+IhPeyJ4tin2r6+bQ
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athensla.uwe.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athensla.uwe.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <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)</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/athenslart.nelson.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athenslart.nelson.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..8a25fdc7
--- /dev/null
+++ b/swamid-interfederations-2.0/athenslart.nelson.ac.uk-oala-metadata.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://athenslart.nelson.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-24T16:03:12Z">
+      <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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nelson.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDXDCCAkSgAwIBAgIIMiDjsqVkEwwwDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE
+						CgwYTmVsc29uIGFuZCBDb2xuZSBDb2xsZWdlMSAwHgYDVQQDDBdhdGhlbnNsYXJ0
+						Lm5lbHNvbi5hYy51azAeFw0xNDA2MTExNTI3MDNaFw0yNDA2MTExNTI3MDNaMEUx
+						ITAfBgNVBAoMGE5lbHNvbiBhbmQgQ29sbmUgQ29sbGVnZTEgMB4GA1UEAwwXYXRo
+						ZW5zbGFydC5uZWxzb24uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+						AoIBAQCkv+4a7sZDYlsHkDF9Ey19/K24sKNVFTJs6l9cGYQAXNi5JmghZCMAZP/M
+						JytDMgksZZkzWFOwsteq5asZAT3Ui1X0elVbWRONMK8/SkOxfduxnqdKaVtqSAvl
+						2w2W4d3G2NudFHUcM4/uu0s6GKL64tD5TnI5IXQLpiuoy6HCawF1qDmgPGu0JPKl
+						9DA8BT6djWh3rBEpicMYNimdGbQXIjvmwl1p3UAKU7hmTzWIpQD7EPNXCZSLzHaU
+						A224+qsbFYg6yyv7E2xx/WC7KrO9M8D30DjF6cn8K16Y0VruhvYaOU4JVZXCnGc+
+						Fi/+6dTxyd+ugtANwjP2AE1BRbFbAgMBAAGjUDBOMB0GA1UdDgQWBBRJC78oYTfA
+						SeY3dbPP9aUaRl87+TAfBgNVHSMEGDAWgBRJC78oYTfASeY3dbPP9aUaRl87+TAM
+						BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCV3dbQRHN2fpZQU0APj2Er
+						wAEjnXXjf3soh7rdo7SyT3hW7lbg842/ejkhEzEemvH6kITXFJYeJ7M71+Lqhds0
+						Kw3EMKBy8BVKS0bM1pHrUYhT3AW/d7N0XshLYZb1L8233Wl4xP1ItfpRCxshmH3p
+						0Fo/N/jh3gMy93uZisFZ/VDTYIlUyy6aFLboylBiSRDU/pb1x0Ltp3OtFoqvAGNo
+						teXSqopxzYN+5SX393NDdWV6u5ozUVKvtNPqaw20B0g5z/lGmQmMtY29x6i2PDJF
+						OoXTiQu9KjiPG9OBQyebDt3nQA8gUQZJB+e7TcOZy0B+OylJclvjR3D3Ap7eKANw
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDXDCCAkSgAwIBAgIIMiDjsqVkEwwwDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE
+						CgwYTmVsc29uIGFuZCBDb2xuZSBDb2xsZWdlMSAwHgYDVQQDDBdhdGhlbnNsYXJ0
+						Lm5lbHNvbi5hYy51azAeFw0xNDA2MTExNTI3MDNaFw0yNDA2MTExNTI3MDNaMEUx
+						ITAfBgNVBAoMGE5lbHNvbiBhbmQgQ29sbmUgQ29sbGVnZTEgMB4GA1UEAwwXYXRo
+						ZW5zbGFydC5uZWxzb24uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+						AoIBAQCkv+4a7sZDYlsHkDF9Ey19/K24sKNVFTJs6l9cGYQAXNi5JmghZCMAZP/M
+						JytDMgksZZkzWFOwsteq5asZAT3Ui1X0elVbWRONMK8/SkOxfduxnqdKaVtqSAvl
+						2w2W4d3G2NudFHUcM4/uu0s6GKL64tD5TnI5IXQLpiuoy6HCawF1qDmgPGu0JPKl
+						9DA8BT6djWh3rBEpicMYNimdGbQXIjvmwl1p3UAKU7hmTzWIpQD7EPNXCZSLzHaU
+						A224+qsbFYg6yyv7E2xx/WC7KrO9M8D30DjF6cn8K16Y0VruhvYaOU4JVZXCnGc+
+						Fi/+6dTxyd+ugtANwjP2AE1BRbFbAgMBAAGjUDBOMB0GA1UdDgQWBBRJC78oYTfA
+						SeY3dbPP9aUaRl87+TAfBgNVHSMEGDAWgBRJC78oYTfASeY3dbPP9aUaRl87+TAM
+						BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCV3dbQRHN2fpZQU0APj2Er
+						wAEjnXXjf3soh7rdo7SyT3hW7lbg842/ejkhEzEemvH6kITXFJYeJ7M71+Lqhds0
+						Kw3EMKBy8BVKS0bM1pHrUYhT3AW/d7N0XshLYZb1L8233Wl4xP1ItfpRCxshmH3p
+						0Fo/N/jh3gMy93uZisFZ/VDTYIlUyy6aFLboylBiSRDU/pb1x0Ltp3OtFoqvAGNo
+						teXSqopxzYN+5SX393NDdWV6u5ozUVKvtNPqaw20B0g5z/lGmQmMtY29x6i2PDJF
+						OoXTiQu9KjiPG9OBQyebDt3nQA8gUQZJB+e7TcOZy0B+OylJclvjR3D3Ap7eKANw
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athenslart.nelson.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athenslart.nelson.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nelson and Colne College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nelson and Colne College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nelson.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Alan</md:GivenName>
+    <md:SurName>Rhodes</md:SurName>
+    <md:EmailAddress>mailto:a.rhodes@nelson.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Amanda</md:GivenName>
+    <md:SurName>Mills</md:SurName>
+    <md:EmailAddress>mailto:a.mills@nelson.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athensproxy.ids.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athensproxy.ids.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..99c0a443
--- /dev/null
+++ b/swamid-interfederations-2.0/athensproxy.ids.ac.uk-oala-metadata.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://athensproxy.ids.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-30T09:41: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ids.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDaDCCAlCgAwIBAgIIQR/nRSl1E04wDQYJKoZIhvcNAQEFBQAwSzEpMCcGA1UE
+						CgwgSW5zdGl0dXRlIG9mIERldmVsb3BtZW50IFN0dWRpZXMxHjAcBgNVBAMMFWF0
+						aGVuc3Byb3h5Lmlkcy5hYy51azAeFw0xMzA1MTcwODM1NDJaFw0yMzA1MTcwODM1
+						NDJaMEsxKTAnBgNVBAoMIEluc3RpdHV0ZSBvZiBEZXZlbG9wbWVudCBTdHVkaWVz
+						MR4wHAYDVQQDDBVhdGhlbnNwcm94eS5pZHMuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQC3grq+RMGcLnzS7Pt4Ec16BSPbqCJBlcXMV6JLJvnJ
+						KLwls/mSicpJam1/FtDyJyQyY8odsa5Cw8vykMmUqvwv2eNJE8z0Rntm9Wv+kOQi
+						k9W2Jb7A6Xhitln4E+H7OBkH/P2l6T3KhN1kSE4BMkgxcJJGOviLzVrEOummaGYy
+						/kFnpJtgGQ9Nm61dUr97HeqvuD6FnenRg1B1ytTsAVeBk7b0w4xmwB1tLtq5Qtwl
+						d2Wo9oS3tLWDxfgLK92F3lPIsxDKOdhfTO96IxRBdSQvL7i0ejcj2omKe3gXtA1i
+						WnbJMajaeRZPq1dlqfAgGSbdS3jBHXhQO1hvDyrd2eorAgMBAAGjUDBOMB0GA1Ud
+						DgQWBBR04tUI60ZrejiYTwYKKkK6LLPLBjAfBgNVHSMEGDAWgBR04tUI60ZrejiY
+						TwYKKkK6LLPLBjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAYFUNc
+						56JR4EXmIKJKTO3nSE9w37Fuhdr1XRM1dCaPdSqO5KpBa3Fgyg2mLGMepnIA7dg2
+						rtJmA9tcC2DRWX7argcQWt7F4hywafKck3hY5l5jVmHkx1Ey619S/FZeiNWHwmwf
+						+E9R8KwbKsJ8VWStJfEk/c8MawDOOZDpUEwGQIOpzYpjb0JGkmKCikRhAnVtxEBN
+						4lA7K579Y3dUiXkSt8cehuGjCon3fn8ppgn1ZDGmUI9uYS5ifXlHvMT7iDA3eVkn
+						rtpgg6nuNDeUfHaCe+UJWzC1a5y/CsOTAVRuU6bRU2obl2Yi3GOglFSCYj+tfPjv
+						qfy5h2rLe+ayys5I
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDaDCCAlCgAwIBAgIIQR/nRSl1E04wDQYJKoZIhvcNAQEFBQAwSzEpMCcGA1UE
+						CgwgSW5zdGl0dXRlIG9mIERldmVsb3BtZW50IFN0dWRpZXMxHjAcBgNVBAMMFWF0
+						aGVuc3Byb3h5Lmlkcy5hYy51azAeFw0xMzA1MTcwODM1NDJaFw0yMzA1MTcwODM1
+						NDJaMEsxKTAnBgNVBAoMIEluc3RpdHV0ZSBvZiBEZXZlbG9wbWVudCBTdHVkaWVz
+						MR4wHAYDVQQDDBVhdGhlbnNwcm94eS5pZHMuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQC3grq+RMGcLnzS7Pt4Ec16BSPbqCJBlcXMV6JLJvnJ
+						KLwls/mSicpJam1/FtDyJyQyY8odsa5Cw8vykMmUqvwv2eNJE8z0Rntm9Wv+kOQi
+						k9W2Jb7A6Xhitln4E+H7OBkH/P2l6T3KhN1kSE4BMkgxcJJGOviLzVrEOummaGYy
+						/kFnpJtgGQ9Nm61dUr97HeqvuD6FnenRg1B1ytTsAVeBk7b0w4xmwB1tLtq5Qtwl
+						d2Wo9oS3tLWDxfgLK92F3lPIsxDKOdhfTO96IxRBdSQvL7i0ejcj2omKe3gXtA1i
+						WnbJMajaeRZPq1dlqfAgGSbdS3jBHXhQO1hvDyrd2eorAgMBAAGjUDBOMB0GA1Ud
+						DgQWBBR04tUI60ZrejiYTwYKKkK6LLPLBjAfBgNVHSMEGDAWgBR04tUI60ZrejiY
+						TwYKKkK6LLPLBjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAYFUNc
+						56JR4EXmIKJKTO3nSE9w37Fuhdr1XRM1dCaPdSqO5KpBa3Fgyg2mLGMepnIA7dg2
+						rtJmA9tcC2DRWX7argcQWt7F4hywafKck3hY5l5jVmHkx1Ey619S/FZeiNWHwmwf
+						+E9R8KwbKsJ8VWStJfEk/c8MawDOOZDpUEwGQIOpzYpjb0JGkmKCikRhAnVtxEBN
+						4lA7K579Y3dUiXkSt8cehuGjCon3fn8ppgn1ZDGmUI9uYS5ifXlHvMT7iDA3eVkn
+						rtpgg6nuNDeUfHaCe+UJWzC1a5y/CsOTAVRuU6bRU2obl2Yi3GOglFSCYj+tfPjv
+						qfy5h2rLe+ayys5I
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athensproxy.ids.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athensproxy.ids.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Development Studies</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Development Studies</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ids.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Library Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:BLDS@ids.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Beaven</md:SurName>
+    <md:EmailAddress>mailto:d.beaven@ids.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athensri.forthvalley.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athensri.forthvalley.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..fb8c41ff
--- /dev/null
+++ b/swamid-interfederations-2.0/athensri.forthvalley.ac.uk-oala-metadata.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://athensri.forthvalley.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-02T12:17:37Z"/>
+  </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">forthvalley.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDsjCCApqgAwIBAgIJAJk2uGNIbkStMA0GCSqGSIb3DQEBBQUAMEQxHTAbBgNV
+						BAoTFEZvcnRoIFZhbGxleSBDb2xsZWdlMSMwIQYDVQQDExphdGhlbnNyaS5mb3J0
+						aHZhbGxleS5hYy51azAeFw0xMTA5MTIxMTUxMDFaFw0yMTA5MDkxMTUxMDFaMEQx
+						HTAbBgNVBAoTFEZvcnRoIFZhbGxleSBDb2xsZWdlMSMwIQYDVQQDExphdGhlbnNy
+						aS5mb3J0aHZhbGxleS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAK353WqmulmsLtwvvW1+hYO/kRDRRRmrAhAJvwEwopgABtd1T9a/6toJwYDJ
+						pFqzT0+VojwzdvRw/RCgYAZzd+HCK/giChdHIT25NUn4bTTlBM8arIH04lmswYvm
+						uTI4m+QOPTNJM5wWuD5T1plmCT/OdleDMHIsdyt5g8pMfPDT1DHcJ43aptC7mXMJ
+						DK8M4URKWWvuBlIVwL4+a3URxS3VvdxOGwX+WuYZ8q1IlzUG+PEf9lcIwPGfxucl
+						PbLE2Q3M3cU2yEzsZWas63vbYw6YniKjaMf3setK4A77shor7Di8wYGR3DkxJifv
+						UAq8/lHMZ9dLK0wxPYZFfI8VxA0CAwEAAaOBpjCBozAdBgNVHQ4EFgQUOK0xdbaZ
+						dIyNwo58vYn7Sv7Fy0kwdAYDVR0jBG0wa4AUOK0xdbaZdIyNwo58vYn7Sv7Fy0mh
+						SKRGMEQxHTAbBgNVBAoTFEZvcnRoIFZhbGxleSBDb2xsZWdlMSMwIQYDVQQDExph
+						dGhlbnNyaS5mb3J0aHZhbGxleS5hYy51a4IJAJk2uGNIbkStMAwGA1UdEwQFMAMB
+						Af8wDQYJKoZIhvcNAQEFBQADggEBACuUxXKYJpNFw504ykZnJs0NJAOA8OhXu2UM
+						Ub2QDWD/84kXZSxJkFcz6TaeByhNAPXWUxrt/G5RSzy7LIC9tH4roICTkttweujO
+						ble6Y8bLvoKA7f+x2LGZX9Tw75vsD5dr+vdoguW5L0d43q6f0tI4GHHGsgC5KrkX
+						bxzg27PJVX7V6LlRiLknVX6tfPbVu8mzEHU4t+lwcZFb+5JrEHF9c2wGf33pUZBZ
+						tiQ/jyZqHEHbOpi6o/DE5plkwKQBkHkimeFyXITgwiDto8yE2Lg3ld33yB/G529g
+						1e0NTIQeEWw/mB0MavXoJloNskmBulmLX3HlLMJLRgVh4hOHqkM=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDsjCCApqgAwIBAgIJAJk2uGNIbkStMA0GCSqGSIb3DQEBBQUAMEQxHTAbBgNV
+						BAoTFEZvcnRoIFZhbGxleSBDb2xsZWdlMSMwIQYDVQQDExphdGhlbnNyaS5mb3J0
+						aHZhbGxleS5hYy51azAeFw0xMTA5MTIxMTUxMDFaFw0yMTA5MDkxMTUxMDFaMEQx
+						HTAbBgNVBAoTFEZvcnRoIFZhbGxleSBDb2xsZWdlMSMwIQYDVQQDExphdGhlbnNy
+						aS5mb3J0aHZhbGxleS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAK353WqmulmsLtwvvW1+hYO/kRDRRRmrAhAJvwEwopgABtd1T9a/6toJwYDJ
+						pFqzT0+VojwzdvRw/RCgYAZzd+HCK/giChdHIT25NUn4bTTlBM8arIH04lmswYvm
+						uTI4m+QOPTNJM5wWuD5T1plmCT/OdleDMHIsdyt5g8pMfPDT1DHcJ43aptC7mXMJ
+						DK8M4URKWWvuBlIVwL4+a3URxS3VvdxOGwX+WuYZ8q1IlzUG+PEf9lcIwPGfxucl
+						PbLE2Q3M3cU2yEzsZWas63vbYw6YniKjaMf3setK4A77shor7Di8wYGR3DkxJifv
+						UAq8/lHMZ9dLK0wxPYZFfI8VxA0CAwEAAaOBpjCBozAdBgNVHQ4EFgQUOK0xdbaZ
+						dIyNwo58vYn7Sv7Fy0kwdAYDVR0jBG0wa4AUOK0xdbaZdIyNwo58vYn7Sv7Fy0mh
+						SKRGMEQxHTAbBgNVBAoTFEZvcnRoIFZhbGxleSBDb2xsZWdlMSMwIQYDVQQDExph
+						dGhlbnNyaS5mb3J0aHZhbGxleS5hYy51a4IJAJk2uGNIbkStMAwGA1UdEwQFMAMB
+						Af8wDQYJKoZIhvcNAQEFBQADggEBACuUxXKYJpNFw504ykZnJs0NJAOA8OhXu2UM
+						Ub2QDWD/84kXZSxJkFcz6TaeByhNAPXWUxrt/G5RSzy7LIC9tH4roICTkttweujO
+						ble6Y8bLvoKA7f+x2LGZX9Tw75vsD5dr+vdoguW5L0d43q6f0tI4GHHGsgC5KrkX
+						bxzg27PJVX7V6LlRiLknVX6tfPbVu8mzEHU4t+lwcZFb+5JrEHF9c2wGf33pUZBZ
+						tiQ/jyZqHEHbOpi6o/DE5plkwKQBkHkimeFyXITgwiDto8yE2Lg3ld33yB/G529g
+						1e0NTIQeEWw/mB0MavXoJloNskmBulmLX3HlLMJLRgVh4hOHqkM=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athensri.forthvalley.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athensri.forthvalley.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Forth Valley College of Further and Higher Education</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Forth Valley College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.forthvalley.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Graeme</md:GivenName>
+    <md:SurName>Robertson</md:SurName>
+    <md:EmailAddress>mailto:graeme.robertson@forthvalley.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Graeme</md:GivenName>
+    <md:SurName>Robertson</md:SurName>
+    <md:EmailAddress>mailto:graeme.robertson@forthvalley.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/atrium.in2p3.fr-sp.xml b/swamid-interfederations-2.0/atrium.in2p3.fr-sp.xml
new file mode 100644
index 00000000..6d56c681
--- /dev/null
+++ b/swamid-interfederations-2.0/atrium.in2p3.fr-sp.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://atrium.in2p3.fr/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-25T10:38:59Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">IN2P3 - Atrium - Gestion documentaire</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">IN2P3 - Atrium - Gestion documentaire
+basé sur le logiciel Nuxeo</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>
+					      MIIDEDCCAfigAwIBAgIJAMGXFtpKBnHgMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2F0cml1bS5pbjJwMy5mcjAeFw0xNDEwMTcwOTAzMTRaFw0yNDEwMTQwOTAz
+MTRaMBoxGDAWBgNVBAMTD2F0cml1bS5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANImZiGFAvKe8IsYWOo7/O3W9eakTCoNgmbUDnoW+EZt
+2MPRyxnYTm0+FIpFSi4V9QG0r/VI1WIH4jj09SvgVogIdCJY2BiJybZNzVGPLJFL
+3G6cJ/7G5Uc5FcLxLfp6b99IEb3kbcNlrNqcGaFNnFOyjHw9ByqIWAff5SBTUxsI
+tWWPXlOMMboZV/8JFbc2zpIfa+60Cn5xhkqY+7kYhmTXDFeFDIyffa9LR76300nV
+0bQ12SkrOiXw5stqTAX7xRK2/K7zfu1I4y0iQIBxQdmEMwVWUfk+Wo/eEZ6WG6YB
+96IGKwIUmbGCoYKWBQ4DSF329Z3K+9l36TVTxWObI+ECAwEAAaNZMFcwNgYDVR0R
+BC8wLYIPYXRyaXVtLmluMnAzLmZyhhpodHRwczovL2F0cml1bS5pbjJwMy5mci9z
+cDAdBgNVHQ4EFgQUX9KcNb++3ZK/lDgl92aqw9tThskwDQYJKoZIhvcNAQEFBQAD
+ggEBAMsAC/6QERa7FH8vlfRR7mRtFhzDzMaY7oZ8ZIH8ovtBWyEj5/5SQYgUEWcR
+xZ1JE/GKZn95Wxl7S0pp4vM+q+KjENuI+wDhxnC90xUUbwbnRFVB6GNUdpaZ0+KB
+F3684EGWKGiKv2tRX4M2BpFgNPfPppOWkIxD99G0Cesq5Ait1uVUWSdeIsq12v/q
+tBoVWbIwEBRt+bnZl3QDOsVQPcvje1aGHiGiYqsmFAEZoYQ5MEqq+wt/cINZsmIJ
+Xguic2EJqr1Ei4Q2DE91SVuoZVpApQM+R1BOMXC97H5rRU14BOR/Op38xAf9em1l
+yniZ5+JeJC4Wvu7wo3LF9QPfcJg=
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDEDCCAfigAwIBAgIJAMGXFtpKBnHgMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2F0cml1bS5pbjJwMy5mcjAeFw0xNDEwMTcwOTAzMTRaFw0yNDEwMTQwOTAz
+MTRaMBoxGDAWBgNVBAMTD2F0cml1bS5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANImZiGFAvKe8IsYWOo7/O3W9eakTCoNgmbUDnoW+EZt
+2MPRyxnYTm0+FIpFSi4V9QG0r/VI1WIH4jj09SvgVogIdCJY2BiJybZNzVGPLJFL
+3G6cJ/7G5Uc5FcLxLfp6b99IEb3kbcNlrNqcGaFNnFOyjHw9ByqIWAff5SBTUxsI
+tWWPXlOMMboZV/8JFbc2zpIfa+60Cn5xhkqY+7kYhmTXDFeFDIyffa9LR76300nV
+0bQ12SkrOiXw5stqTAX7xRK2/K7zfu1I4y0iQIBxQdmEMwVWUfk+Wo/eEZ6WG6YB
+96IGKwIUmbGCoYKWBQ4DSF329Z3K+9l36TVTxWObI+ECAwEAAaNZMFcwNgYDVR0R
+BC8wLYIPYXRyaXVtLmluMnAzLmZyhhpodHRwczovL2F0cml1bS5pbjJwMy5mci9z
+cDAdBgNVHQ4EFgQUX9KcNb++3ZK/lDgl92aqw9tThskwDQYJKoZIhvcNAQEFBQAD
+ggEBAMsAC/6QERa7FH8vlfRR7mRtFhzDzMaY7oZ8ZIH8ovtBWyEj5/5SQYgUEWcR
+xZ1JE/GKZn95Wxl7S0pp4vM+q+KjENuI+wDhxnC90xUUbwbnRFVB6GNUdpaZ0+KB
+F3684EGWKGiKv2tRX4M2BpFgNPfPppOWkIxD99G0Cesq5Ait1uVUWSdeIsq12v/q
+tBoVWbIwEBRt+bnZl3QDOsVQPcvje1aGHiGiYqsmFAEZoYQ5MEqq+wt/cINZsmIJ
+Xguic2EJqr1Ei4Q2DE91SVuoZVpApQM+R1BOMXC97H5rRU14BOR/Op38xAf9em1l
+yniZ5+JeJC4Wvu7wo3LF9QPfcJg=
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atrium.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://atrium.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">IN2P3 - Atrium - Gestion documentaire</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">IN2P3 - Atrium - Gestion documentaire
+basé sur le logiciel Nuxeo</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">
+        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">rouet@in2p3.fr</saml:AttributeValue>
+      </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://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean-René Rouet</md:SurName>
+    <md:EmailAddress>rouet@in2p3.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Foudil Brétel</md:SurName>
+    <md:EmailAddress>foudil.bretel@cc.in2p3.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml
new file mode 100644
index 00000000..df4d58b0
--- /dev/null
+++ b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://attribute-viewer.aai.switch.ch/interfederation-test/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-12-23T09:55: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:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor errorURL="http://www.switch.ch/aai/support/help" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">AAI Viewer Interfederation Test</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service is used to test the interfederation readiness of SWITCHaai Identity Providers.</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://attribute-viewer.aai.switch.ch/interfederation-test/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://attribute-viewer.aai.switch.ch/interfederation-test/privacy-statement.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDazCCAlOgAwIBAgIJAInsS/34xVwWMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHmF0dHJpYnV0ZS12aWV3ZXIuYWFpLnN3aXRjaC5jaDAeFw0xNDA1MTQxNDQ4
+MzVaFw0xNzA1MTMxNDQ4MzVaMCkxJzAlBgNVBAMTHmF0dHJpYnV0ZS12aWV3ZXIu
+YWFpLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMYE
+foYKQreiAh1ULU3g5YxUJeU3HHOk3AfWEKj2fQTA9UpPk2GIlXapEoAnbE4qpOoO
++LR4HEijEXlOdB8DIFIr+7r/lp0yIqM4rF9PIw+yz+bvUgnjLzAy+38QmQsrW1Zn
+xoJs+2tZ0JQ3HZMlGQsDXfJvhfwl5awgbyyKFq5BCIVI8NYqBsj8dbToh/cKJK5L
+7LyPxcU4nqQEgWBLD4ZOdcbTvjRb4EQuMeZL22iYPKIhk+7kLBO3riPP4QZiI8Kv
+bNeLjwbYXCEJ3GfWdIgIwEireu4f4gP6r1ZSegflyYyi4A4XFm56BF9gdyTsjp2Y
+vYAXlQLTMlJPsanyLdUCAwEAAaOBlTCBkjBxBgNVHREEajBogh5hdHRyaWJ1dGUt
+dmlld2VyLmFhaS5zd2l0Y2guY2iGRmh0dHBzOi8vYXR0cmlidXRlLXZpZXdlci5h
+YWkuc3dpdGNoLmNoL2ludGVyZmVkZXJhdGlvbi10ZXN0L3NoaWJib2xldGgwHQYD
+VR0OBBYEFKtMQ76UJ2imKPdoMOiGDQ7EgSfQMA0GCSqGSIb3DQEBBQUAA4IBAQB6
+lHFWlu87yTXTUpr5DTOcaXgsXqaguQBve9QWj39sylbbdNe7qlhfrkP4J4Y1Ye8G
+cQMM3yvHPOqX2yVIwc9lf/mwyhS3EYKS9A6xlGZBfWVAwIV193Lqyj9JgQAFsZV9
+i0w4/AIfJPTTPNNvBoXyLSGNjiDgddcOPbFpvcXmc2huQgafnpPUpHRvzftSqQct
+iJHJIIW6oKr6j3x3iEdvfCgxvjC97Cz2eSxYbaGrO2eBoqWZd46bgtCXE3ODksGX
+DfJWmpOBDWhAdKUZ7CAl9fCH4ztaREeTDK6z0WU3U3T8Q8BBV/jbFeav+tOqMhNH
+jCyyjtF4f+udUgUZm2Jt
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md: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://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">AAI Viewer Interfederation Test</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This service is used to test the interfederation readiness of SWITCHaai Identity Providers.</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="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="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="commonName" Name="urn:oid:2.5.4.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: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>AAI</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>AAI</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml
new file mode 100644
index 00000000..84304866
--- /dev/null
+++ b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://attribute-viewer.aai.switch.ch/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-02-23T14:11:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor errorURL="http://www.switch.ch/aai/support/help" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">AAI Attributes Viewer</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">AAI Attributes Viewer</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">AAI Attributes Viewer</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">AAI Attributes Viewer</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</mdui:Description>
+        <mdui:Description xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</mdui:Description>
+        <mdui:Description xml:lang="fr">Présente tous les attributs d'un utilisateur pour tester et pour obtenir des renseignements.</mdui:Description>
+        <mdui:Description xml:lang="it">Ha tutti gli attributi di un utente per testare e per ottenere informazioni.</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAZJJREFUeJyUk08og2Ecx5+SHNSW/DtQlHKg1MhByjIpLRNx0NZKk0kbbSStHXZdHOVP4bCi5swuXNxQLjiN5UBNc1AzbeR936/39zz7c7B/Dt+e31PP9/P8ft/3eRkARpKPnVDuQsjsy1W2kA8skKwM8tEsEH8tG5QDqEZpqZILdgblbB34+igJygG2RrlRWqsXcqi1pwXKdaAoJLehtk99kJa1wkxrupb9OihPl3lBf6kqiPLg3ThER3BVCRDl8/aI4oC0lFhYGOyiG9nTKIAECjqzQZdMmVqnEbBaAfi0gLeaQ6grGrkkIPqexJjFi+E+PSZGTDANGjHQq8dQdz8CPndhY+Q5hjnPPlirGazDBta5CNakrrVmmGybiETj+UegG3cOz8Gap4V6FgSgYRLthhXcP7zkDzH1/cONmjYrP8xNXXZea9Q6dHELOlPwM1pX98BqxoWRpLZep5uHf/cEic9UwceULaZc22LetGj+eCJZ/lOmYBgzwDizAQrw3z+T2x/E1U24bGNGvwAAAP//AwCkGcs+iePLFQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAaRSURBVHic7JZpUFNXFMf92A+dsR8ECrQ6Fq2tlVVELVQEZLNaoSwV1FEsy6CMuyJhFRAQQiAJEBCIiCigaAUFFARZlE0EAReoiiCgLGUnJIQktyc8GpKXSPnUzjzefzKZ9+4979z7u/fcc+4StMi05P+ewH8tEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FDMyZnLpT/Nzl+FXbgykObmw719TopLKe3hHoEolE2bkN9NTy8XGe9Me37zUHUQu7P4pt0EgHqo5EnRUy7qd56CkLteXBo0AovJRZc7f4BdbTNzAenfgwKqEkGn6sUkZKGS3pYRSrlMoqjaAX5z94Ie3mz/Z+WkrZbs/LtgdT7VzZ9m7snPxnXN60xIA/LUjOqCoqb5UnnOTykzKrwLMM8NgEz9krfc2WsF0uKY4elxzg535J35q63opa19gJBtl5jUqavuysGmlfj2rffrb8hBclR/xSehrRl6G+JpnRXuUg2lL0Oh8ep/gCw12xHt7XsZ62t31We1iWzizrPYnmTqyVm4MNdtC270uycmaZOcZFJpTMrphAeJ5e9K1RqJFNrL27GNXBnf2LS7LGjyFup7N4U9MSKj3LqFMhufLAg8McGHfpGm8ZYFjdlZuCi8tbBQKhxLS98y/tbRfcz2RjA8MCw+uHvlFpdyfP3f58tU99eSliqaOSkzJD8UZR2kZ0yw4JhdgmGNsxvHxzsE6hSARbxOXxebzpzu4hLbMLjNRyWBRogR8YY2aFZa/U1wcw2RVDIxyJY5hkes4TNV3/ipo3EmCDn6O9z+cpBDa2Y6rrBcgAw/Js+ZU5OsbFWZ8Nu+PpcwN7rn/2/iv9QL/IfGkD4FfXjzhmswOlrUGjnTIf1zMR7QvUXYW94YBxTtaZRsRcfCjfFRxzD7rGJ3i49o6uQY3NwUlXZp1zuPwN8wEz8MBGtnSIXtzugSBmpI/KmdC8FRuDnrd+lLahJtd4WpqipxHSjSLOAErUQAVukpZ5gCFTiIGTFAAHUAuM7ZmSDZcItjS/5Pnr9n7J64bt0ZSIO/IexiemTOzjVHX9ZYAhXcHuuRy/llfUUv30XW1jR/PLnvc9w9NSEQ7q6hleaxJ+8ESmSCiSNA6M8K/QqIjbK20pqAwRMVTRYNscMF8MfJiieIe1tl1QuMOB1AITxzh5YJy4XP6mnTG/n8x80tQJk5f8IAGVVLZt3hmjrOkrAwzKvd8CWcHQhg5faptH6phH/mASbr47obahQ9p1fNojFR2/4oq5fMgXoJrCXNHU+JwRcDJVURlF+sP5Qrp3RNMsgqYI2D+qwHQBwLDDP9nSVxmG6lqIZ65jESl+mHkGllWGIV/rB+KB0Uz5gS+HRyY/9o3CIamsfQvwkEVhcyQ2E5wpM8d4C6cEKGNYy+PG3qD99ujV5TlHxUdErFVorGuhwDM7HK0opAOphaaO8QsB3riDdjTg1sDgRO/AWG//GPbfNzDW+qYP1gK/w4+ftDe2dPOnhThHUCchMw8OT0g33n3wUlnbDytRsEZ7j988tssCXd2AuEPi7v5mxFAV1DFwruY/w5/a4aDoQghI4MG1Q6KGip2V24C9cmbOsE+4gjM8PDq51V4uSytr+ULuhj6cNTO1HIBh2XCDOR1K17WIgliorn+nph+SwWCgBGVUFwMrgHKdEVsP8YYWDoyFtMKkFRp7/3vjMMi0uHZILlBZvPxmvc2WpTAFwFhZUsMlLbhvrDYKrW2QqSucSf5vnmmmDnHSIY2pvun9CoMgmM2ew+lwbRBn8gJXxNJAzWmIoYKa2PID/2tI0xQB3y9rVdMLyLhZh2uvqn+33CAoPq1SFnjBZamza8h6byKcctdTWYd8bnh4Z3ucybZwZsEqZN1ukPeCZkr0lzr+yw3OQYYXvw+9RqxvEF0FXdsmvnLICS4VRjb0Q/9UdWlBSK/dGhadWCrfBWsNdxuYBlwEYVZwC4KJ7TuSsXZrOOSRrg/DmBmEtJ5V1OlP3LRg3GXrKDLA4gmPcJipFbqWkUpaFGUtP0jFTofTG5q75F1ggqJ14NhVmM1cRqlnirKtUXuRQnswOxH0R2xyuXwXHJn9RzOu5yleWaFQlHuv5TvjMCVNioq2n9I6CgQ5hMOQVJzDfcHz7PWLGdXyn4+N847637Q5kIwHXiQigYkuEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FB/w3AAAA//8DABFh2N/+esWhAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="it">https://attribute-viewer.aai.switch.ch/?lang=it</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fr">https://attribute-viewer.aai.switch.ch/?lang=fr</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://attribute-viewer.aai.switch.ch/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">https://attribute-viewer.aai.switch.ch/?lang=de</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://attribute-viewer.aai.switch.ch/privacy_statement.php</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fr">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=fr</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="de">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=de</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=it</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDVDCCAjygAwIBAgIJAKGvh4Rjh+jgMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHmF0dHJpYnV0ZS12aWV3ZXIuYWFpLnN3aXRjaC5jaDAeFw0xNDA1MTQxNDQ1
+MzhaFw0xNzA1MTMxNDQ1MzhaMCkxJzAlBgNVBAMTHmF0dHJpYnV0ZS12aWV3ZXIu
+YWFpLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7w
+bFh51f8XC/y1CJiXg32dC1TojB6F7RHxRuxpPuNh/zp9/7kWStnddGaaOtw9e2fU
+Q/BOe+ztIT5njJ34lKJqfY4mFj3SbuKjDEBk24o/M15IWTLR+0qx5l0uc/U/CSqu
+2wqS6H6u0BMfuRVGFM8NWXJ55SeKBLXbKJVyboweP2pO5AyRBXZHsM8ZEue9hKbn
+qTrXCMS//OfzLarQ7baYtHr+nRbcihJWa2xa+5swiOuf5vEG6sKJT7NbtVbI5b1v
+tzPiCH36ACSHaKkDMsPGCeu5ectunqxQWbufLijzvurKf7EHilIhNvfT+63CIfCp
+t5ViglqeiMJ1tDqham8CAwEAAaN/MH0wXAYDVR0RBFUwU4IeYXR0cmlidXRlLXZp
+ZXdlci5hYWkuc3dpdGNoLmNohjFodHRwczovL2F0dHJpYnV0ZS12aWV3ZXIuYWFp
+LnN3aXRjaC5jaC9zaGliYm9sZXRoMB0GA1UdDgQWBBSDmwCkWamUzbmbv6h8wpic
+9PoE7jANBgkqhkiG9w0BAQUFAAOCAQEAms0jw2xzz2dsT+y1sG6Omc9idxl2ffzf
+Km6t4tEACaDFWxGhP1xGZ9omE+UyuiftW8Tj/8+c4bVUTd/UhhiIdkmhld5M7awF
+8xtzM979p+uL5abezo5D/8O4IYFWpHZdQ+VSl/Wr9tc9N6dmB5c0xzUm4/YzCaNz
+anih2XoBQzYD8ZpxYWopH/Uwt6KiUf9TV92rR2EkmZloH3HyfxdmaOIxQU1boi8e
+GCyqkxNBftgYk65n7Yn5UVBeUr7IBTmzXLFmluhpNYmcslYf/ClArFLNGhHpI5F0
+UDgBXcQzpXHOg7ks4xbcEPCe0gaQhOKyWjMDALDCmiA7f7/Rnam3CA==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md: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://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">AAI Attributes Viewer</md:ServiceName>
+      <md:ServiceName xml:lang="en">AAI Attributes Viewer</md:ServiceName>
+      <md:ServiceName xml:lang="fr">AAI Attributes Viewer</md:ServiceName>
+      <md:ServiceName xml:lang="it">AAI Attributes Viewer</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="fr">Présente tous les attributs d'un utilisateur pour tester et pour obtenir des renseignements.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="it">Ha tutti gli attributi di un utente per testare e per ottenere informazioni.</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="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="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="postalAddress" Name="urn:oid:2.5.4.16" 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="telephoneNumber" Name="urn:oid:2.5.4.20" 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="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="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="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="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: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="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="ou" Name="urn:oid:2.5.4.11" 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="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" 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="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="primaryGroupID" Name="urn:oid:1.3.6.1.4.1.7165.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="isMemberOf" 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" 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="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="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="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="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: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>SWITCHaai</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SWITCHaai</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.agrosupdijon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.agrosupdijon.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..1b2ad690
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.agrosupdijon.fr-idp-shibboleth.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.agrosupdijon.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-09T14:10: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agrosupdijon.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Agrosup DIJON INSSAAE</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Students</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Agrosup DIJON INSSAAE</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Enseignants ; chercheurs ; documentalistes ; é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>
+					      MIIDPDCCAiSgAwIBAgIVAN9nAc/jY36hxrK5oQ/KqjAbjnCMMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMTFGF1dGguYWdyb3N1cGRpam9uLmZyMB4XDTE0MDUxMjA5
+NDYzNloXDTM0MDUxMjA5NDYzNlowHzEdMBsGA1UEAxMUYXV0aC5hZ3Jvc3VwZGlq
+b24uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdf0IvLcqavsNY
+cZ/SvKmM3KdjpOBdc0FsdBOJRCV/uQauirZSxE9VgE2MGTvVMPt2L9nR+JMznDpA
+1GKo6oUAIXhBE9BNZCG390qAFOXxrvqkULqWxcLh0r4S3fIedq8rLUab9NVnYwN8
+hvOeZQBO06ocmFbtkJjLGUwGqBqTW5PtUV3X0Zh9EXhY+ViruutXIGzyilH+b6eI
+836I5F0MDXE8oHboau6+w4sP977QLJbQU8xXmw2QloSFpkThoJ0ExGwJmtgVQYEN
+cPSSVQI80UeAmLvPQIqo8H0ebJAWLumL4z01W1/Zm4IMTp04R252U7FbDLTEiZRG
+78e/qIHBAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGF1dGguYWdyb3N1cGRpam9uLmZy
+hitodHRwczovL2F1dGguYWdyb3N1cGRpam9uLmZyL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBSmpVNWWBQe7203DC0x0nDL0wh/BDANBgkqhkiG9w0BAQUFAAOCAQEA
+Yv95oCB4bPj/ltSf9StUpnJ2z+y2XnVisIpcIsWE5IUJtfza7V0OwO71Ey/GCSKx
+kubwUxJHO1eTdzkce1ajnWW0s7oimDyBalnd+uLG5fESVtAme4hdMrfHVxka10b1
+liQbtPIneokIW/Z4W7h1PUmU+z435uZkJZhQjNbfOtiVhe/7c+ETyVy9LH1SKtLF
+TcyS0/H/Q8cq6DNdeFTwXHFcPRGrFLIFOYN0O/91Fm594fY4tSRF9rXnWZkmBDf0
+esBdxlabPOobsW4ezBttykeeWzbjGEQe6pQQuhnSYOR3du1zAuDmbSosyY2EWqCE
+iN6XFe4H5SWBUGO/Kgpxzg==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.agrosupdijon.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.agrosupdijon.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.agrosupdijon.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Agrosup DIJON INSSAAE</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Agrosup DIJON INSSAAE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>hostmaster@agrosupdijon.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.aspirationtraining.com-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.aspirationtraining.com-idp-shibboleth.xml
new file mode 100644
index 00000000..826dcefd
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.aspirationtraining.com-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.aspirationtraining.com/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-09T17:13: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aspirationtraining.com</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDejCCAmICCQDX1cojLXODTzANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
+						QjEXMBUGA1UECAwOV29yY2VzdGVyc2hpcmUxEzARBgNVBAcMCkJyb21zZ3JvdmUx
+						HDAaBgNVBAoME0FzcGlyYXRpb24gVHJhaW5pbmcxJDAiBgNVBAMMG2F1dGguYXNw
+						aXJhdGlvbnRyYWluaW5nLmNvbTAeFw0xMjEyMTgxMDA5NTNaFw0zMjEyMTMxMDA5
+						NTNaMH8xCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5Xb3JjZXN0ZXJzaGlyZTETMBEG
+						A1UEBwwKQnJvbXNncm92ZTEcMBoGA1UECgwTQXNwaXJhdGlvbiBUcmFpbmluZzEk
+						MCIGA1UEAwwbYXV0aC5hc3BpcmF0aW9udHJhaW5pbmcuY29tMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2NCaFs4yihlbWsPejTxurOzorKVniu++Hf64
+						2EQmqAEkw9eaHITpI47h+kJKP/Cm1kkdd1BheCcCGm66nJubzpIxTZ+HQxRzdG0/
+						EQ7ndwnvnun77iQ4FLI49i5NOYpqR26S5GBLwpPvuPSMPh1f4S09AkRDFlda1krb
+						qIhSxFLRT2kahKjiKCkTf5SOxmSponEwpnk+I+niPNT5HslNCjItKjTX9ykHZrnN
+						7+Rus9AlHV14jYrlZtLsN7wqvgXw+UC7RvbBTm/Wjsp06VUIBXs33bLTq0BfxCM/
+						uzoAfeFQlY67ariROz+KRCZR3P84V7bVT3KhI9BQjF6NY9t83wIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQAtVoxlBB777Ms2s5CGDSHFU4sSGih8KrLmnDly215yjrqv
+						sdFcnmehXE2tWd8MDZz6T+XGU6NwTPh7MJmPhghZA2smNEzCnrAV2w/G2oMKnepR
+						BdtDUBGPJ+ZCPoBRHBlFXlRcU4DO70eHDiEtSV/asAI4DTF358rjDMon2gmzM+dl
+						I916AQ8YHsISrO6ftTmjReZhBt3Q+TpFcPp98rC86O35HwAdDSXsEwuyO22rHgE2
+						NNvNPi4XVgdCvET15Z8/3sp6na0uWumk2S8Mvhzu4Sr65FbmUdUdXuabN+RO6teg
+						7ofaWoIudaTkckRrLtBv0iW2PfAl/Lene6U/UtCu
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.aspirationtraining.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.aspirationtraining.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://auth.aspirationtraining.com/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.aspirationtraining.com/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.aspirationtraining.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.aspirationtraining.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">aspirationtraining.com</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDejCCAmICCQDX1cojLXODTzANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
+						QjEXMBUGA1UECAwOV29yY2VzdGVyc2hpcmUxEzARBgNVBAcMCkJyb21zZ3JvdmUx
+						HDAaBgNVBAoME0FzcGlyYXRpb24gVHJhaW5pbmcxJDAiBgNVBAMMG2F1dGguYXNw
+						aXJhdGlvbnRyYWluaW5nLmNvbTAeFw0xMjEyMTgxMDA5NTNaFw0zMjEyMTMxMDA5
+						NTNaMH8xCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5Xb3JjZXN0ZXJzaGlyZTETMBEG
+						A1UEBwwKQnJvbXNncm92ZTEcMBoGA1UECgwTQXNwaXJhdGlvbiBUcmFpbmluZzEk
+						MCIGA1UEAwwbYXV0aC5hc3BpcmF0aW9udHJhaW5pbmcuY29tMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2NCaFs4yihlbWsPejTxurOzorKVniu++Hf64
+						2EQmqAEkw9eaHITpI47h+kJKP/Cm1kkdd1BheCcCGm66nJubzpIxTZ+HQxRzdG0/
+						EQ7ndwnvnun77iQ4FLI49i5NOYpqR26S5GBLwpPvuPSMPh1f4S09AkRDFlda1krb
+						qIhSxFLRT2kahKjiKCkTf5SOxmSponEwpnk+I+niPNT5HslNCjItKjTX9ykHZrnN
+						7+Rus9AlHV14jYrlZtLsN7wqvgXw+UC7RvbBTm/Wjsp06VUIBXs33bLTq0BfxCM/
+						uzoAfeFQlY67ariROz+KRCZR3P84V7bVT3KhI9BQjF6NY9t83wIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQAtVoxlBB777Ms2s5CGDSHFU4sSGih8KrLmnDly215yjrqv
+						sdFcnmehXE2tWd8MDZz6T+XGU6NwTPh7MJmPhghZA2smNEzCnrAV2w/G2oMKnepR
+						BdtDUBGPJ+ZCPoBRHBlFXlRcU4DO70eHDiEtSV/asAI4DTF358rjDMon2gmzM+dl
+						I916AQ8YHsISrO6ftTmjReZhBt3Q+TpFcPp98rC86O35HwAdDSXsEwuyO22rHgE2
+						NNvNPi4XVgdCvET15Z8/3sp6na0uWumk2S8Mvhzu4Sr65FbmUdUdXuabN+RO6teg
+						7ofaWoIudaTkckRrLtBv0iW2PfAl/Lene6U/UtCu
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.aspirationtraining.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.aspirationtraining.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">Aspiration Training Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Aspiration Training</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aspirationtraining.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Overt Software Solutions Support</md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Overt Software Solutions Support</md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.buckingham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/auth.buckingham.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..1908d235
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.buckingham.ac.uk-shibboleth.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.buckingham.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-25T08:59:24Z"/>
+  </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">buckingham.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUDCCAjigAwIBAgIITuplxzadgNMwDQYJKoZIhvcNAQEFBQAwPzEdMBsGA1UE
+						CgwURWR1c2VydiBUZXN0IFNlcnZpY2UxHjAcBgNVBAMMFWF1dGguYnVja2luZ2hh
+						bS5hYy51azAeFw0xMjA4MjQxMDI1MzdaFw0yMjA4MjQxMDI1MzdaMD8xHTAbBgNV
+						BAoMFEVkdXNlcnYgVGVzdCBTZXJ2aWNlMR4wHAYDVQQDDBVhdXRoLmJ1Y2tpbmdo
+						YW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCJnxt6TX6A
+						PmuM/I+rOnZ+Cx0P1DO1h+rlFmdtx9Sng8dd7OhmpYSlnk30NrZzKtWPXAVMYPHf
+						dgx70/z25svlFO/B02/eP+W3bJvxmLnDXTJ6vyam0I/6/vuXg8gcFyB8JlwjmQ/e
+						DQPRaEK/MXivjsmo+9Y0VL5dntmKUYgq1zzm/dfdGnJ+khczg2xeI+SUZGgRAwcy
+						T9KZfXmbF45RTCNDWIGQER7F8HzixesDHPemCavA6bbL/z9hpZqcoWeuXZi88Q3C
+						JoH66HvJnGJyYayl3eMdATWhbnUsYlcZTFQPYliy6hwhT+qfkxA+GLBkvpMVDqrG
+						nrirwFQjctWzAgMBAAGjUDBOMB0GA1UdDgQWBBSYtaC4R49myVJwK8kzCZGHAB74
+						DTAfBgNVHSMEGDAWgBSYtaC4R49myVJwK8kzCZGHAB74DTAMBgNVHRMEBTADAQH/
+						MA0GCSqGSIb3DQEBBQUAA4IBAQB6N8ifKsxb1zLu2QuOdIJwwuw2ycjvGUerLUqy
+						5LtnC4eCB302S9YUgprHSG7nlPuDYPv2dF45dudZahI7yo3/GyqeNgg12e0qpH/M
+						7S4aCOYfPEhU2MNjzfcRZBaBQaKhmPT66gCEZcDLFYUL9zB3EdlvhcLSJNvGG9ys
+						8WyvXEgs2IEnLh/SlEgXm2NRMSq1uONiUPRTE01r0n2wW4FHOnJTGtaWvfqCuNA5
+						0PAvY7F+1+HTZgtNnq5w1ms74QgsSj7Z7vgFohyDN4YjefZs/Zi+s22bmzN6yikc
+						dQIRgLcLkbamsq2LWs0Li52jrDapAHtHTxn2PsHVhIA+yIUG
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUDCCAjigAwIBAgIITuplxzadgNMwDQYJKoZIhvcNAQEFBQAwPzEdMBsGA1UE
+						CgwURWR1c2VydiBUZXN0IFNlcnZpY2UxHjAcBgNVBAMMFWF1dGguYnVja2luZ2hh
+						bS5hYy51azAeFw0xMjA4MjQxMDI1MzdaFw0yMjA4MjQxMDI1MzdaMD8xHTAbBgNV
+						BAoMFEVkdXNlcnYgVGVzdCBTZXJ2aWNlMR4wHAYDVQQDDBVhdXRoLmJ1Y2tpbmdo
+						YW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCJnxt6TX6A
+						PmuM/I+rOnZ+Cx0P1DO1h+rlFmdtx9Sng8dd7OhmpYSlnk30NrZzKtWPXAVMYPHf
+						dgx70/z25svlFO/B02/eP+W3bJvxmLnDXTJ6vyam0I/6/vuXg8gcFyB8JlwjmQ/e
+						DQPRaEK/MXivjsmo+9Y0VL5dntmKUYgq1zzm/dfdGnJ+khczg2xeI+SUZGgRAwcy
+						T9KZfXmbF45RTCNDWIGQER7F8HzixesDHPemCavA6bbL/z9hpZqcoWeuXZi88Q3C
+						JoH66HvJnGJyYayl3eMdATWhbnUsYlcZTFQPYliy6hwhT+qfkxA+GLBkvpMVDqrG
+						nrirwFQjctWzAgMBAAGjUDBOMB0GA1UdDgQWBBSYtaC4R49myVJwK8kzCZGHAB74
+						DTAfBgNVHSMEGDAWgBSYtaC4R49myVJwK8kzCZGHAB74DTAMBgNVHRMEBTADAQH/
+						MA0GCSqGSIb3DQEBBQUAA4IBAQB6N8ifKsxb1zLu2QuOdIJwwuw2ycjvGUerLUqy
+						5LtnC4eCB302S9YUgprHSG7nlPuDYPv2dF45dudZahI7yo3/GyqeNgg12e0qpH/M
+						7S4aCOYfPEhU2MNjzfcRZBaBQaKhmPT66gCEZcDLFYUL9zB3EdlvhcLSJNvGG9ys
+						8WyvXEgs2IEnLh/SlEgXm2NRMSq1uONiUPRTE01r0n2wW4FHOnJTGtaWvfqCuNA5
+						0PAvY7F+1+HTZgtNnq5w1ms74QgsSj7Z7vgFohyDN4YjefZs/Zi+s22bmzN6yikc
+						dQIRgLcLkbamsq2LWs0Li52jrDapAHtHTxn2PsHVhIA+yIUG
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.buckingham.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.buckingham.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Buckingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Buckingham</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.buckingham.ac.uk/about/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@buckingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@buckingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml b/swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml
new file mode 100644
index 00000000..44afcb55
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.chimie-paristech.fr/idp/saml2/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-05T11:03: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chimie-paristech.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 Paris</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Fédération d'identité Chime-ParisTech</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure de Chimie Paris</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Fédération d'identité Chime-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>
+					      MIIC+TCCAeGgAwIBAgIJAL+BQHJtGb0jMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+BAMMCHdob2NhcmVzMB4XDTE1MDIwNDEwMDQzN1oXDTI1MDIwMTEwMDQzN1owEzER
+MA8GA1UEAwwId2hvY2FyZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCkZ2KuLbuBdCKcDN9yAR/+RFajz85DENz+F8c7JGEUpUdCl3e8Lz5+QxC1D+rn
+3D4qrYozrsk+NcOa7IqC/sT0cmvWMpRaA/qCXpC4di8z+wsuUT9DSuAQu5XhXgz8
+gHXktqAT/qgmIo29Ofv0hNl1pi+TblnFGS6thfvRlmJ1gLGi9AMVickS7fgijSrq
+xZXYzUV7gqIenvftzyjD1axcHoF38gofLmyIpcTqCNpoJ1gstEJRCfzK+WRnBKlW
+XiDnMMpoupUPM8zU730aB13qY3BftPN1ZigwdVJipe9MGkXF/ZN5v/ofCytzQWCm
+zRBp8eSYKFxjdaDlhfUFBXcxAgMBAAGjUDBOMB0GA1UdDgQWBBSbnTR565qjMG81
+RyVzrUZFBlZYSTAfBgNVHSMEGDAWgBSbnTR565qjMG81RyVzrUZFBlZYSTAMBgNV
+HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBszIrhKOaT+2nPbOWo61o1FsGL
+K8XWHNs0q1PZUqAqt7TUvOjSmOqwafWVt+fRtN0qh1+8NoLcxVeAHAY0vudPeX+T
+2Sgj8LzDkSl5XssO2f9oUApZFgI2ctL74RpMLoPuhjQxJAv2sMxA52EFbarGLFfa
+7xbnuvP7wIHGbLfk9W8fWC/dJOkSaW0ysDh8ZIrJ7NeeymOxxZg1SnJ7q/51nKIA
+w8KIXJN0uLhGRREKNPFi76EzYueFntZ10zVmIxLcB1stQHt/uFCA8pP8z/7Wlg9k
+w82nDsQe1PSSeiiAhiTWSLTnzMyk7AofMUC2+jxRFaWTUSGZVQpGIbfMeJ/n
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.chimie-paristech.fr/idp/saml2/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.chimie-paristech.fr/idp/saml2/sso"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.chimie-paristech.fr/idp/saml2/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole Nationale Supérieure de Chimie Paris</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure de Chimie Paris</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>reseau@chimie-paristech.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.crous-versailles.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.crous-versailles.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..1dbee52f
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.crous-versailles.fr-idp-shibboleth.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.crous-versailles.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-22T11:00: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-versailles.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">CROUS Versailles - 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>
+					      MIIEezCCA2OgAwIBAgIQBQGbJx8ycfocbzaW5m+L4DANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDEzMTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowTjELMAkGA1UE
+BhMCRlIxHDAaBgNVBAoTE0NST1VTIGRlIFZFUlNBSUxMRVMxITAfBgNVBAMTGGF1
+dGguY3JvdXMtdmVyc2FpbGxlcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALT8ahras1SsgYWcRaFEu8/MSACuZsYe74VljdqW/gsn55hUpRSd+hR2
+igczY3H6lmJrnbXMaaOmRwO8OqESSvmqUp6ZLky0UxXpBFf1ouXuBd5Ghis8CD/q
+V5E/loQEVrakpJ0bCtkrEZpFD+4RNSpOOoAQAP4tfz7YM34dal6xCxUBcuy8n5pI
+Jnz5E9UmMAzFLvwr0iNMCR+SBunRFPjlYe+12UHu2cMsKPDWK89hgTfec3w1Tvux
+9/9/NCdRhiyQlnKiAXxmC+TWikrBZ1v9mV5VH9uLmfgRqZjgY648TIzMVVgCC2yo
+d+LTpATPAfmAMeY/uDpqK0IcEAvhtzUCAwEAAaOCAWswggFnMB8GA1UdIwQYMBaA
+FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRm9Gu4ap/VYe37uc/e4QCE
+q4D3gjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
+BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAjBgNVHREEHDAaghhhdXRoLmNyb3VzLXZl
+cnNhaWxsZXMuZnIwDQYJKoZIhvcNAQEFBQADggEBABQoWTgD8rOZ2cZ1DFXaR72R
+opGVuKwCxr2HuCD3L17jbfobHbWFVVMjbia5MGUozURJP6XEPFsPR6Gxuv38pI4B
+tySTtMz03p4hXk+q2ldOfQrJ+XergnpU/5r05DkELoqFjXb0qtHm3iUcR1ohRq17
+bApQ08Tt1gGKlZJauC1VqxBoDtYs7mnFLHPz7FOi0jilUsppcj6ph/N3QbBuwb7p
+VJwSJN4NmyTAZv/ErszB2z4hiHxOF/UwX1J38g93MBUSoLx/qMNtJOXkqOt7izen
++kEx04VnOsKWgTu9oGK57dt1dlLPml8CX9BCHdJ64IL9aTDeJMD2X1IH1/YgJdU=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.crous-versailles.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.crous-versailles.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.crous-versailles.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Versailles - Personnels</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Versailles - Personnels</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>service.informatique@crous-versailles.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.cs.serialssolutions.com-auth-Metadata-Shib.xml b/swamid-interfederations-2.0/auth.cs.serialssolutions.com-auth-Metadata-Shib.xml
new file mode 100644
index 00000000..75566672
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.cs.serialssolutions.com-auth-Metadata-Shib.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.cs.serialssolutions.com/auth/Metadata/Shib">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-02-13T09: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">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDjDCCAnSgAwIBAgIETQA4czANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
+						VVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMRowGAYDVQQKExFTZXJp
+						YWxzIFNvbHV0aW9uczEaMBgGA1UECxMRU2VyaWFscyBTb2x1dGlvbnMxITAfBgNV
+						BAMTGHd3dy5zZXJpYWxzc29sdXRpb25zLmNvbTAeFw0xMDEyMDkwMjAxMjNaFw0x
+						NjAxMDcwMjAxMjNaMIGHMQswCQYDVQQGEwJVUzELMAkGA1UECBMCV0ExEDAOBgNV
+						BAcTB1NlYXR0bGUxGjAYBgNVBAoTEVNlcmlhbHMgU29sdXRpb25zMRowGAYDVQQL
+						ExFTZXJpYWxzIFNvbHV0aW9uczEhMB8GA1UEAxMYd3d3LnNlcmlhbHNzb2x1dGlv
+						bnMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2cevLb70/ZI
+						7URgp+Rgz9KOHtJRg4W9ucFm91fvfoaww9tBBQ8GXEgq3wO3pmPYE4+bdA04xIW3
+						sQgmB9UQe1sPVOhffUhHm/+MBzddIZ1WYg1lLOl3CQ/2J5Uak+/3hV8Z+ppbV0tx
+						HBtqSrd+aaSrVftWKqoF5+gSmMi2ckuUGTrq9B8etqALhZoU4K2CFYhjrVK2vwaS
+						sjT3+AXlO2m7PmE4xC+2jXjp33uxMbhwfjY7XgpK06h8tQQXCH7GPRbYLjSPWFw3
+						IHQFm46bk4uyzDsJemjLcaGaazmbWwdMZhoWydGHphbO9Jw2so1Ht2ABOcfj3TpU
+						GIKW9dmQ6QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB699XlVrbgegSecfHkxdwK
+						J+7N2N5vqvAcOhoBEU1UAqIuuQF3lCpDot8QNfhxRHc3sxUh4OfqUDWcdD1rxavP
+						7LzrCu9hJFli2pzNWOMle/AyAfbVRT3tDSmjqOlyrJs/G50PQV9QJyJxLvXJHg0P
+						RQiV5GjOtMlE9fsVY5FIpoXTOJwP2yDvE5HF2QO4gEhKrNZvmXJ6X60NryxIApD2
+						nQQ5159Bha3+D9szK4wwaGQ04ry+UW0j9C7xbhDCc/Kkd5JCqzvLqFp73F6Ma6nK
+						32buuHZ/UERHs77NrmCGrS7i3oJppxFoakb9bfWEFMrbD7ZUV9DtoTDZFtFkR9jb
+					</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.serialssolutions.com/sso/auth/CS/rcv/saml1" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.serialssolutions.com/sso/auth/CS/rcv/saml1" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.cs.serialssolutions.com/auth/rcv" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.cs.serialssolutions.com/auth/rcv" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Proquest Information and Learning Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Proquest: Serials Solutions</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.serialssolutions.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Customer Care</md:GivenName>
+    <md:EmailAddress>mailto:clients@serialssolutions.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Nagy</md:SurName>
+    <md:EmailAddress>mailto:Andrew.Nagy@serialssolutions.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml b/swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml
new file mode 100644
index 00000000..966e789b
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml
@@ -0,0 +1,84 @@
+<?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://auth.digitaltheatreplus.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="2013-07-08T10:45: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="60" width="104">https://www.digitaltheatreplus.com/sites/all/themes/digitaltheatreplus/images/logo.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Digital Theatre Plus</mdui:DisplayName>
+        <mdui:Description xml:lang="en">At the heart of Digital Theatre Plus is the ethos to
+					share the best of British theatre with teachers and students all over the
+					world.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSzCCAjOgAwIBAgIJAIF+/2SALpqQMA0GCSqGSIb3DQEBBQUAMDcxNTAzBgNV
+						BAMTLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFs
+						MB4XDTE1MDMwNTE2NTAzM1oXDTI1MDMwMjE2NTAzM1owNzE1MDMGA1UEAxMsaXAt
+						MTAtMjEwLTEzMC0xODUuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWwwggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUhOG8fAf1z+P4MxfipVuLI7gGaTbn
+						XRjaqUcvn3q2RfG7uFflGdgTNPESECxFlRhQB9t8r6kP73HpmlDWAb1cK0iTfbVX
+						YzKQRZJZuYyk6dTR8Q+ipKA9VwzWCQC4HtFUxrGJJPqUesLUSxmPjwsjQzOdQPVQ
+						jB17OYwNSi5lCehWi6kyRpBNmPbB9Vjvx0PtaEe9OFoFOz93hBT6E7rnK6WJ1OSx
+						ATS6uWOtIwJIBfc1gCtX3L0OLFIEjBXTfoUDhfOJg/VTdudTVDbdy9sI/y9oa1CM
+						oV5dmFGEmNiCJ+WyVnt0ItkoQ9j1ZT+bw/FVJXFTRSDhDL9NlNsdFz03AgMBAAGj
+						WjBYMDcGA1UdEQQwMC6CLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21w
+						dXRlLmludGVybmFsMB0GA1UdDgQWBBSfagScxn6u6P0+nvmQwcSLk2XrdDANBgkq
+						hkiG9w0BAQUFAAOCAQEAlfdHL72URS71sqrZUfUiUWKHcJU1cfkO2Ekl/zhgRPrS
+						7FgP1HUYc9mRbceXJYqq38SSKDPANt3dIj+qeauUh7CNDSTm8pPmjrTaGYZCmOvV
+						STobyosM7a+CJgZvE9Ys7tVlsbainrET0agTjUWOUE3LOvBgUqPUkbbE8QIgmRa2
+						62dtMf95WBmt6OJkXmLcBwUVK+1NsOfGN4cg6ekrKqNU4+FobK6Vet2jY6cfLWET
+						fYj5FNoRpffRMQ9+MNEm/aK+SFpy1nXtc1XtD1sEqtnLGiIQMUhgEtvnas82T1f1
+						rxodZ8fzQWvmeZ7qOiheeiTxu5Fwylj1xVBJ7suMMQ==
+					</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://auth.digitaltheatreplus.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </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">http://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/auth.galegroup.com-shibboleth.xml b/swamid-interfederations-2.0/auth.galegroup.com-shibboleth.xml
new file mode 100644
index 00000000..61117883
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.galegroup.com-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+						MIIDTzCCAjegAwIBAgIJAJeid8J1f6CuMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHNoaWJib2xldGguZ2FsZWdyb3VwLmNvbTAeFw0xMjAzMTIxNzMwMjNaFw0z
+						MjAzMDcxNzMwMjNaMCMxITAfBgNVBAMTGHNoaWJib2xldGguZ2FsZWdyb3VwLmNv
+						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2Qn+1FW/n+4ZZGA0lv
+						z9F+I5FdDnX35oD5M7JuN6cbprWA4F8EHir6bYAuvU5lK0knO4w56aiH0uhbWXu1
+						SlUlxSbAIaJombApnC5AtCJ6WFOs+NaTi/gFlAyIh7w169ZhwfsLjQE/hkdplpWT
+						xjFUNpt12ZyU8LL1yEJmfkeBUN3oK2fa7Qe+oqnyY0eOHHTKVO9IIr9/SvzdhoA0
+						c8a2kXy4qM2T+qKGi7SGz3/Qhwpial3ZDGqeZ3m25n57h3I7BhxVSJGzzbSeOcib
+						jbWRk5VjYalmG0V+XGjEJtN4oUdAgnkvJMj+yOQ8IXzDws4OR+KWGYl5lEAijXce
+						qNcCAwEAAaOBhTCBgjAdBgNVHQ4EFgQUC3bQ/Jx1yAhQgWVLRtPePx/ipxYwUwYD
+						VR0jBEwwSoAUC3bQ/Jx1yAhQgWVLRtPePx/ipxahJ6QlMCMxITAfBgNVBAMTGHNo
+						aWJib2xldGguZ2FsZWdyb3VwLmNvbYIJAJeid8J1f6CuMAwGA1UdEwQFMAMBAf8w
+						DQYJKoZIhvcNAQEFBQADggEBABAvL5eepD3fliAIefJ/4pDBxKBcCynRXLlmUWir
+						1majii1tK0WEbDdF1a24njlftvCVDNDrrfdhu1rvXZ3UhyyiOS7fBpBvRPjCmzlf
+						DdvGiMuar/T+uNzbiNqcLsVeKvwZJfzMt9Y1T7MXDABez8BD3CkdFt05j+hPK0t5
+						3PLIZfOir72LoRAtXmilZs4ZAvvTL/BTTxYn4t165Vp5yBRPCLrdSAMIdTIENBZ7
+						/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://gada.oh.gale.com:8445/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.dev.ggtest.com/Shibboleth.sso/SAML/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.qa.gghybrid.com/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.galeext.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.galegroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.qa.gghybrid.com/Shibboleth.sso/SAML2/POST" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.galegroup.com/Shibboleth.sso/SAML2/POST" index="7"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cengage Learning Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Gale Databases from 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/auth.howcloud.co.uk-saml-metadata.php.xml b/swamid-interfederations-2.0/auth.howcloud.co.uk-saml-metadata.php.xml
new file mode 100644
index 00000000..76f7f238
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.howcloud.co.uk-saml-metadata.php.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.howcloud.co.uk/saml/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-12T16:48:46Z">
+      <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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">HowCloud</mdui:DisplayName>
+        <mdui:Logo height="54" width="78">https://www.howcloud.net/img/logo-shaded-2x.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>
+						MIID7zCCAtegAwIBAgIJANEl9lXQvmZ+MA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
+						VQQGEwJVSzEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMREwDwYD
+						VQQKDAhIb3dDbG91ZDERMA8GA1UECwwISG93Q2xvdWQxETAPBgNVBAMMCEhvd0Ns
+						b3VkMSIwIAYJKoZIhvcNAQkBFhNhdXRoQGhvd2Nsb3VkLmNvLnVrMB4XDTE0MDky
+						NDEzMzIxNFoXDTE1MDkyNDEzMzIxNFowgY0xCzAJBgNVBAYTAlVLMRAwDgYDVQQI
+						DAdFbmdsYW5kMQ8wDQYDVQQHDAZMb25kb24xETAPBgNVBAoMCEhvd0Nsb3VkMREw
+						DwYDVQQLDAhIb3dDbG91ZDERMA8GA1UEAwwISG93Q2xvdWQxIjAgBgkqhkiG9w0B
+						CQEWE2F1dGhAaG93Y2xvdWQuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQDp9Be3I4VxIUpZWTDhZn5oLaN0592SXJ/hEWOC8BsxtwObJNiSxrR2
+						k7pOLZlCYCwMJmvE5gI0lWZ+fPNsxHyxTrdnsiTVUZEgp2T8iA/HayZwGuTAZagF
+						WKcNL7AUH2kH8biiGxLK+8r9i58P5JEvLfl2RymNIdANIWSsuArCNIsVjgDXhyPF
+						7e3tYlyWxeIsm889P9XwG7SmFTg3Z06mO9AriW25hyUqiBmkohJcU/pVo3GJQwJ9
+						gIly786ROmEH7Z8bvu0WYreLK5qIbS8MHEeLvmTcqxjKbwl4HlCxw00fH/4vhJVd
+						XzHfVmyS9MdN0WCjdI0iymtOwM0htBo9AgMBAAGjUDBOMB0GA1UdDgQWBBT9nTDT
+						JHcrp9AURl4d0/HhVKwobTAfBgNVHSMEGDAWgBT9nTDTJHcrp9AURl4d0/HhVKwo
+						bTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCFEGU0hc5EiO4l7S0D
+						LY1QOaWTu1NO8yoWWjUKmMMq0jcHXbtQ05odL+3kVesi7/U/3D+58Y+DKBPetdkv
+						LvYmxf+b8MSsXR4BiQLUfeK7S5PcGUQePDHZ4DZc5inS0zJWccqyIMg3xP50bpG/
+						BACg/fD2qPZnZIJSI7VsrISV0qOqtBpGGZoJ7QunspZrPBB/of+9TN9eE6LkDnBf
+						Q8hP3jEVonM1IyECSQmuRxiqwEcv8Gxy39jlyMwoOOuR3jF0TLRLtYvtLk9Dl+i+
+						TFt0BBs42f813qt54IPnbPBED3gLilzcATo6VKILvL4Kn0dYeDXm3hf/3ZfMyVKv
+						0g3I
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID7zCCAtegAwIBAgIJANEl9lXQvmZ+MA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
+						VQQGEwJVSzEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMREwDwYD
+						VQQKDAhIb3dDbG91ZDERMA8GA1UECwwISG93Q2xvdWQxETAPBgNVBAMMCEhvd0Ns
+						b3VkMSIwIAYJKoZIhvcNAQkBFhNhdXRoQGhvd2Nsb3VkLmNvLnVrMB4XDTE0MDky
+						NDEzMzIxNFoXDTE1MDkyNDEzMzIxNFowgY0xCzAJBgNVBAYTAlVLMRAwDgYDVQQI
+						DAdFbmdsYW5kMQ8wDQYDVQQHDAZMb25kb24xETAPBgNVBAoMCEhvd0Nsb3VkMREw
+						DwYDVQQLDAhIb3dDbG91ZDERMA8GA1UEAwwISG93Q2xvdWQxIjAgBgkqhkiG9w0B
+						CQEWE2F1dGhAaG93Y2xvdWQuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQDp9Be3I4VxIUpZWTDhZn5oLaN0592SXJ/hEWOC8BsxtwObJNiSxrR2
+						k7pOLZlCYCwMJmvE5gI0lWZ+fPNsxHyxTrdnsiTVUZEgp2T8iA/HayZwGuTAZagF
+						WKcNL7AUH2kH8biiGxLK+8r9i58P5JEvLfl2RymNIdANIWSsuArCNIsVjgDXhyPF
+						7e3tYlyWxeIsm889P9XwG7SmFTg3Z06mO9AriW25hyUqiBmkohJcU/pVo3GJQwJ9
+						gIly786ROmEH7Z8bvu0WYreLK5qIbS8MHEeLvmTcqxjKbwl4HlCxw00fH/4vhJVd
+						XzHfVmyS9MdN0WCjdI0iymtOwM0htBo9AgMBAAGjUDBOMB0GA1UdDgQWBBT9nTDT
+						JHcrp9AURl4d0/HhVKwobTAfBgNVHSMEGDAWgBT9nTDTJHcrp9AURl4d0/HhVKwo
+						bTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCFEGU0hc5EiO4l7S0D
+						LY1QOaWTu1NO8yoWWjUKmMMq0jcHXbtQ05odL+3kVesi7/U/3D+58Y+DKBPetdkv
+						LvYmxf+b8MSsXR4BiQLUfeK7S5PcGUQePDHZ4DZc5inS0zJWccqyIMg3xP50bpG/
+						BACg/fD2qPZnZIJSI7VsrISV0qOqtBpGGZoJ7QunspZrPBB/of+9TN9eE6LkDnBf
+						Q8hP3jEVonM1IyECSQmuRxiqwEcv8Gxy39jlyMwoOOuR3jF0TLRLtYvtLk9Dl+i+
+						TFt0BBs42f813qt54IPnbPBED3gLilzcATo6VKILvL4Kn0dYeDXm3hf/3ZfMyVKv
+						0g3I
+					</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://auth.howcloud.co.uk/saml/acs.php" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en-US">HowCloud Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en-US">HowCloud</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en-US">http://www.howcloud.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Joseph</md:GivenName>
+    <md:SurName>Ros</md:SurName>
+    <md:EmailAddress>mailto:j.ros@howcloud.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Joseph</md:GivenName>
+    <md:SurName>Ros</md:SurName>
+    <md:EmailAddress>mailto:j.ros@howcloud.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.ipublishcentral.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/auth.ipublishcentral.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..932f80e1
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.ipublishcentral.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.ipublishcentral.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="2012-04-06T10:38: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:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEkjCCA3qgAwIBAgIJAI0+BerrsfziMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
+						VQQGEwJVUzERMA8GA1UECBMITmV3IFlvcmsxETAPBgNVBAcTCE5ldyBZb3JrMRUw
+						EwYDVQQKEwxJbXBlbHN5cyBJbmMxETAPBgNVBAsTCEltcGVsc3lzMQwwCgYDVQQD
+						EwNJUEMxHzAdBgkqhkiG9w0BCQEWEG5vY0BpbXBlbHN5cy5jb20wHhcNMTIwMjIz
+						MTEzNTM2WhcNMzIwMjE4MTEzNTM2WjCBjDELMAkGA1UEBhMCVVMxETAPBgNVBAgT
+						CE5ldyBZb3JrMREwDwYDVQQHEwhOZXcgWW9yazEVMBMGA1UEChMMSW1wZWxzeXMg
+						SW5jMREwDwYDVQQLEwhJbXBlbHN5czEMMAoGA1UEAxMDSVBDMR8wHQYJKoZIhvcN
+						AQkBFhBub2NAaW1wZWxzeXMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAuSjlGGZwmf6bpK/LSXlCsFZyxJhFRHUnhOQunH4ru+gDE46fme62Q8rO
+						e12ao1JWzgvScGKOS/qrWBFV7fdPYld3bNJ9ExvdNN4zXSKpzDt4O1IcjNnke/3G
+						RQHqH+/LGVYmDMYMxtmL1hBuYhBcLbtL1GaqClr55vpR2I4H60cmvNoYGQ6rOv6r
+						21HKTO4gEODhpaSnH4U/dInfpTeg+p0zs83rDlp2tpYJn40dhFYsDa6SXidPjCjZ
+						2HDAL1CJb/jAq2re3eoD33nhynOS+mQ5qEQXmSVyYJZx4o1Q4Le0UmrN0dTYbfhQ
+						fWDvG/gOkV4PlrChsFD0f3nufcllXwIDAQABo4H0MIHxMB0GA1UdDgQWBBRah5+n
+						q/E81bWQdxBmDk/SATsc8TCBwQYDVR0jBIG5MIG2gBRah5+nq/E81bWQdxBmDk/S
+						ATsc8aGBkqSBjzCBjDELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE5ldyBZb3JrMREw
+						DwYDVQQHEwhOZXcgWW9yazEVMBMGA1UEChMMSW1wZWxzeXMgSW5jMREwDwYDVQQL
+						EwhJbXBlbHN5czEMMAoGA1UEAxMDSVBDMR8wHQYJKoZIhvcNAQkBFhBub2NAaW1w
+						ZWxzeXMuY29tggkAjT4F6uux/OIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
+						AAOCAQEAY9ETSH26xWhQ2yRLQJ6Ixg7+Fq5WHhT9Z9B9OFIwFSPVM2KmdaY7stcc
+						YM8Sf5cbbauUL0gIDpRItaws9SaoV9+7EIiqoaFoKX+rUkGMQKknnYL/jAGmmnpE
+						6X4NcLxd2JZl1P7AIznc5e1ykw6rPhi6yA8m6pD45WR+g+5GLg1O3XG4wXeQf07j
+						BBpC2GmeOJC/YfvsTGKrZHiBzeQ9X2B9Br9QSgHVO3mOrjk+CQ95cXDF/yMthiUU
+						iWBh+8Jny7v1xCM9Wz6p7OqpaB1DxcA8/ztAB+PXSlOyEtaT68guwEm5cfO1eEa7
+						0Zmxm2/8crh8AS6oEKA/3zBlDXUGBA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEkjCCA3qgAwIBAgIJAI0+BerrsfziMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
+						VQQGEwJVUzERMA8GA1UECBMITmV3IFlvcmsxETAPBgNVBAcTCE5ldyBZb3JrMRUw
+						EwYDVQQKEwxJbXBlbHN5cyBJbmMxETAPBgNVBAsTCEltcGVsc3lzMQwwCgYDVQQD
+						EwNJUEMxHzAdBgkqhkiG9w0BCQEWEG5vY0BpbXBlbHN5cy5jb20wHhcNMTIwMjIz
+						MTEzNTM2WhcNMzIwMjE4MTEzNTM2WjCBjDELMAkGA1UEBhMCVVMxETAPBgNVBAgT
+						CE5ldyBZb3JrMREwDwYDVQQHEwhOZXcgWW9yazEVMBMGA1UEChMMSW1wZWxzeXMg
+						SW5jMREwDwYDVQQLEwhJbXBlbHN5czEMMAoGA1UEAxMDSVBDMR8wHQYJKoZIhvcN
+						AQkBFhBub2NAaW1wZWxzeXMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAuSjlGGZwmf6bpK/LSXlCsFZyxJhFRHUnhOQunH4ru+gDE46fme62Q8rO
+						e12ao1JWzgvScGKOS/qrWBFV7fdPYld3bNJ9ExvdNN4zXSKpzDt4O1IcjNnke/3G
+						RQHqH+/LGVYmDMYMxtmL1hBuYhBcLbtL1GaqClr55vpR2I4H60cmvNoYGQ6rOv6r
+						21HKTO4gEODhpaSnH4U/dInfpTeg+p0zs83rDlp2tpYJn40dhFYsDa6SXidPjCjZ
+						2HDAL1CJb/jAq2re3eoD33nhynOS+mQ5qEQXmSVyYJZx4o1Q4Le0UmrN0dTYbfhQ
+						fWDvG/gOkV4PlrChsFD0f3nufcllXwIDAQABo4H0MIHxMB0GA1UdDgQWBBRah5+n
+						q/E81bWQdxBmDk/SATsc8TCBwQYDVR0jBIG5MIG2gBRah5+nq/E81bWQdxBmDk/S
+						ATsc8aGBkqSBjzCBjDELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE5ldyBZb3JrMREw
+						DwYDVQQHEwhOZXcgWW9yazEVMBMGA1UEChMMSW1wZWxzeXMgSW5jMREwDwYDVQQL
+						EwhJbXBlbHN5czEMMAoGA1UEAxMDSVBDMR8wHQYJKoZIhvcNAQkBFhBub2NAaW1w
+						ZWxzeXMuY29tggkAjT4F6uux/OIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
+						AAOCAQEAY9ETSH26xWhQ2yRLQJ6Ixg7+Fq5WHhT9Z9B9OFIwFSPVM2KmdaY7stcc
+						YM8Sf5cbbauUL0gIDpRItaws9SaoV9+7EIiqoaFoKX+rUkGMQKknnYL/jAGmmnpE
+						6X4NcLxd2JZl1P7AIznc5e1ykw6rPhi6yA8m6pD45WR+g+5GLg1O3XG4wXeQf07j
+						BBpC2GmeOJC/YfvsTGKrZHiBzeQ9X2B9Br9QSgHVO3mOrjk+CQ95cXDF/yMthiUU
+						iWBh+8Jny7v1xCM9Wz6p7OqpaB1DxcA8/ztAB+PXSlOyEtaT68guwEm5cfO1eEa7
+						0Zmxm2/8crh8AS6oEKA/3zBlDXUGBA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.ipublishcentral.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://auth.ipublishcentral.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://auth.ipublishcentral.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://auth.ipublishcentral.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://auth.ipublishcentral.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Impelsys Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">iPublishCentral eBooks</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ipublishcentral.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Krishnaraj</md:GivenName>
+    <md:SurName>Ramakrishnan</md:SurName>
+    <md:EmailAddress>mailto:krishnaraj.vr@impelsys.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Krishnaraj</md:GivenName>
+    <md:SurName>Ramakrishnan</md:SurName>
+    <md:EmailAddress>mailto:krishnaraj.vr@impelsys.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.mines-paristech.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.mines-paristech.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..514392e8
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.mines-paristech.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.mines-paristech.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-05T10:46: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>
+      <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="fr">MINES 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>
+					      MIIDUzCCAjugAwIBAgIULpiQTz0SaR3yYl4od7IxCNrwBzUwDQYJKoZIhvcNAQEF
+BQAwJTEjMCEGA1UEAxMaYXV0aC5taW5lcy1wYXJpc3RlY2guZnI6ODAwHhcNMTAw
+NjMwMDg0NTUzWhcNMzAwNjMwMDg0NTUzWjAlMSMwIQYDVQQDExphdXRoLm1pbmVz
+LXBhcmlzdGVjaC5mcjo4MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AMgwMOQgpHeIUXIPrAidenRWJoNDtBbBtJewLYBVXNcjlw48JjYUe4kVAibhvpoB
+GtT/5LDpL7b0f3Dcn79TK1f71KO1NyTReRfE8hahq+9nSfUf9W0g7AE/wzEt/4s2
+oQmhxIaLo/y4d8Jm2gdweX7Zru+e8DmdBfH8XVHEFrleY+iZfHM/RH/uc9hN3XrD
+DFWojw8k+uFBU9MkT8Lw3/qPrCxbMEIcpvrkyDFYiCidJJf9kkSZOBFbfoXMwpyw
+6AUrfax3gCUtN55qexEt/kZlbZr/RWCWRXDlevEHoNm/96j9PntgRFahUALUyhxQ
+BbAx1yzWHRsT5hlPHihht1sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaYXV0aC5taW5l
+cy1wYXJpc3RlY2guZnI6ODCGMWh0dHBzOi8vYXV0aC5taW5lcy1wYXJpc3RlY2gu
+ZnI6ODAvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEzaglAXYAkaW5DIa13RKccd
+GCGNMA0GCSqGSIb3DQEBBQUAA4IBAQC81N/3UxzYjfCOJPaGkaJmTDkIXPvv45ym
+TCQlISY68bvtWQlf4yGHKW3aLuPZxoCJoGDcYZi4BF2QEPmvQ307GAqJzga3/FlE
+m6QhFpeYnyX6Wa5OEw/EkPj5yMxnymcEO0mWO/oYUnlzmy7yvUR7M+q/wRE2lKHP
+RDLESfEaYEQTniavE4zHDQPTfV0L4tmMMuZ1HrOU7w4kxw6QbHbF74GOC8YCRTDR
+lu66L8LI4yrW5jPq7gDBHSoOwFKbvssCjAdA4qiIU4LkBBspnboZZIP4uNTyp+qg
+SWg2P9PgjSZlwDZkaVgJlTTZJw1mYNCrsOiWjaa7c18O8gcBYmsL
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.mines-paristech.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.mines-paristech.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.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://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>federation@mines-paristech.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.search.serialssolutions.com-auth-Metadata-Shib.xml b/swamid-interfederations-2.0/auth.search.serialssolutions.com-auth-Metadata-Shib.xml
new file mode 100644
index 00000000..976b491a
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.search.serialssolutions.com-auth-Metadata-Shib.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.search.serialssolutions.com/auth/Metadata/Shib">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-24T12:33: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>
+						MIIDjDCCAnSgAwIBAgIETQA4czANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
+						VVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMRowGAYDVQQKExFTZXJp
+						YWxzIFNvbHV0aW9uczEaMBgGA1UECxMRU2VyaWFscyBTb2x1dGlvbnMxITAfBgNV
+						BAMTGHd3dy5zZXJpYWxzc29sdXRpb25zLmNvbTAeFw0xMDEyMDkwMjAxMjNaFw0x
+						NjAxMDcwMjAxMjNaMIGHMQswCQYDVQQGEwJVUzELMAkGA1UECBMCV0ExEDAOBgNV
+						BAcTB1NlYXR0bGUxGjAYBgNVBAoTEVNlcmlhbHMgU29sdXRpb25zMRowGAYDVQQL
+						ExFTZXJpYWxzIFNvbHV0aW9uczEhMB8GA1UEAxMYd3d3LnNlcmlhbHNzb2x1dGlv
+						bnMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2cevLb70/ZI
+						7URgp+Rgz9KOHtJRg4W9ucFm91fvfoaww9tBBQ8GXEgq3wO3pmPYE4+bdA04xIW3
+						sQgmB9UQe1sPVOhffUhHm/+MBzddIZ1WYg1lLOl3CQ/2J5Uak+/3hV8Z+ppbV0tx
+						HBtqSrd+aaSrVftWKqoF5+gSmMi2ckuUGTrq9B8etqALhZoU4K2CFYhjrVK2vwaS
+						sjT3+AXlO2m7PmE4xC+2jXjp33uxMbhwfjY7XgpK06h8tQQXCH7GPRbYLjSPWFw3
+						IHQFm46bk4uyzDsJemjLcaGaazmbWwdMZhoWydGHphbO9Jw2so1Ht2ABOcfj3TpU
+						GIKW9dmQ6QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB699XlVrbgegSecfHkxdwK
+						J+7N2N5vqvAcOhoBEU1UAqIuuQF3lCpDot8QNfhxRHc3sxUh4OfqUDWcdD1rxavP
+						7LzrCu9hJFli2pzNWOMle/AyAfbVRT3tDSmjqOlyrJs/G50PQV9QJyJxLvXJHg0P
+						RQiV5GjOtMlE9fsVY5FIpoXTOJwP2yDvE5HF2QO4gEhKrNZvmXJ6X60NryxIApD2
+						nQQ5159Bha3+D9szK4wwaGQ04ry+UW0j9C7xbhDCc/Kkd5JCqzvLqFp73F6Ma6nK
+						32buuHZ/UERHs77NrmCGrS7i3oJppxFoakb9bfWEFMrbD7ZUV9DtoTDZFtFkR9jb
+					</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.serialssolutions.com/sso/auth/LINK/rcv/saml1" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.serialssolutions.com/sso/auth/LINK/rcv/saml1" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.search.serialssolutions.com/auth/rcv" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.search.serialssolutions.com/auth/rcv" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Proquest Information and Learning Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ProQuest: Serials Solutions 360 Link/Core</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.serialssolutions.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Customer Care</md:GivenName>
+    <md:EmailAddress>mailto:clients@serialssolutions.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Nagy</md:SurName>
+    <md:EmailAddress>mailto:Andrew.Nagy@serialssolutions.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.services.bmj.com-auth.xml b/swamid-interfederations-2.0/auth.services.bmj.com-auth.xml
new file mode 100644
index 00000000..5bf4e33f
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.services.bmj.com-auth.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.services.bmj.com/auth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-05T11:42:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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>
+						MIIDqjCCApICCQCaKbK0unVYnjANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC
+						R0IxEDAOBgNVBAgTB0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEMMAoGA1UEChMD
+						Qk1KMRMwEQYDVQQLEwpUZWNobm9sb2d5MR4wHAYDVQQDExVhdXRoLnNlcnZpY2Vz
+						LmJtai5jb20xITAfBgkqhkiG9w0BCQEWEm9wZXJhdGlvbnNAYm1qLmNvbTAeFw0x
+						NDA3MTAxMzEyMzNaFw0yNDA3MDkxMzEyMzNaMIGWMQswCQYDVQQGEwJHQjEQMA4G
+						A1UECBMHRW5nbGFuZDEPMA0GA1UEBxMGTG9uZG9uMQwwCgYDVQQKEwNCTUoxEzAR
+						BgNVBAsTClRlY2hub2xvZ3kxHjAcBgNVBAMTFWF1dGguc2VydmljZXMuYm1qLmNv
+						bTEhMB8GCSqGSIb3DQEJARYSb3BlcmF0aW9uc0BibWouY29tMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2mKuJbaYm3cLrHLBDGh4Bw2Vvnars2/KLDLX
+						eTW/pqu0ePzYMwKO33MDxNtSJk1oAzVpu7fqjJnosdmC0iIuRssUfBDluh4K/heW
+						txI+9+2GEldxat1g1rgvyDncKuRd41BvOX5TwDnGSlQsC/KUaxxcBq5v6gA08vJS
+						QPjvTNRbDV0EJOyAkHteob9EQTAE1hMpFP1zUgHBnlAE8Ab02g8kbczsoaqqrjDY
+						QiVEz51xT/5sI/d554wCqyvukbapIYYU/TsEt/mg7d0dc/ios868l7N39nXae6+s
+						To+iY9C30RrgHfVw0dy3F1UURfu6UHWF6ghS4Ci4l8pfyeQczwIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQBXgJlzJX3Q8QMoxJdPTaeVY79y6nBLWf/PvIazYlgUePmU
+						ZmRhKo50L18R0X98OKCayw79q893a3uCkS/NfEqB819+AajzboYAalYHf+jD9NwB
+						z+vff+oRNERM9khBBnxQZhq21UnPcB4EpYyu9FygjmLrxxwZDzoMmG+sMRVrC1ff
+						LQtlqTHYLsAoyqjs/vmD72kr4MZUNEDwyk/SIRJUU86Axx0/F4XWHA5uzSpD8TM9
+						PN6l+KjcBSxV+BZ0RTY3AXUjDyEug23U8bCaXTaUmCIlIpJMxUwswuoKwSPCwesC
+						4j9ZrnewfA82UxIdQeHXbcTG4FME758xOTVMWUIr
+					</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://auth.services.bmj.com/auth/rcv" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.services.bmj.com/auth/rcv" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.services.bmj.com/auth/rcv/saml1" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.services.bmj.com/auth/rcv/saml1" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">BMJ Publishing Group Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The BMJ Group</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://group.bmj.com/group/about</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>BMJ Customer Support</md:GivenName>
+    <md:EmailAddress>mailto:support@bmjgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alex</md:GivenName>
+    <md:SurName>Hooper</md:SurName>
+    <md:EmailAddress>mailto:ahooper@bmj.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.u-pec.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.u-pec.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..da9f43ca
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.u-pec.fr-idp-shibboleth.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.u-pec.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-08-30T16:20: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-pec.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Paris Est Créteil - UPEC</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDHzCCAgegAwIBAgIUL8rXSh9z8lwFNYmrUxZVQXXbx1AwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNYXV0aC51LXBlYy5mcjAeFw0xMDA3MjMwOTI3MzJaFw0z
+MDA3MjMwOTI3MzJaMBgxFjAUBgNVBAMTDWF1dGgudS1wZWMuZnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3CIB42PQo6cg8vYefYuJnhAadIkFr7TKV
+lldoy+uQ8qcyF8ElQdIvvYxkUN0N1RVC9xqez1EiPQ8yKoiH3e24JbaLWMYO5J/K
+BxFYHwRkrSoW150GkvzCP1l7BuQr9x3fEQPsZjk48uZMzguOJY2JyEneyidxYv7g
++XgUrBDK+OerHBWRYXAezuguxn/zr+aOEXx3htVlUI3S6yXoEFr7URasktJ5qAKj
+O/DfX2rZcUKV9fvGS+dnq4a/kqWD8ycH6NUVu7IbLtCgHLp0BQg6QPkM2Z+AskJv
+gqHxqhpP8zzD5HU5T3aV+MQ9XIg7l3vlebhp6bF4mlM+K8r9noIvAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWF1dGgudS1wZWMuZnKGJGh0dHBzOi8vYXV0aC51LXBlYy5m
+ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUx0iOH60s6SQCa/NwoN7hZBocV8Iw
+DQYJKoZIhvcNAQEFBQADggEBAJvL8HOgBpnBhBJJwuM0fWUjxDDN8eoF4kL59Vlz
+maqV9N3mG3UDGBTcT6jjJ/zO7Pb53PJ69Adj7+d8PSyfSs2y2BC+YDOOzWfgrx3m
+DVmVBV/uKJfqRq4rMXsNekVyTmRiVojF3Qzeic6HbwTWMbLEmDxWgAVKOSg0Hu1j
+CANZRHLjo7NC6KWC0Hh0tXrenjG9yvVUxLOE7nnzMiQth4gMlRuLMsWuG5c12RZ7
+una3UJI0MM77yR3S40ltFU6EKnQi3HO3TsP2QNWtkyuBaAhBzI8MuL/P3RPpUTca
++m1oLcwCBV+imJ+QVPGoY154Eg5BcWrcB2wSC+6+CCPRZks=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.u-pec.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.u-pec.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.u-pec.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Paris Est Créteil - UPEC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Paris Est Créteil - UPEC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Bastien SORET</md:SurName>
+    <md:EmailAddress>bastien.soret@u-pec.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Baptiste Le Negaret</md:SurName>
+    <md:EmailAddress>baptiste.le-negaret@u-pec.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.univ-paris-diderot.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.univ-paris-diderot.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..bc7d9703
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.univ-paris-diderot.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.univ-paris-diderot.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-22T15:05: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris-diderot.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Paris 7 - Denis Diderot</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDSDCCAjCgAwIBAgIJAN6STuFrAhxnMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+BAMTGmF1dGgudW5pdi1wYXJpcy1kaWRlcm90LmZyMB4XDTE0MDMwNDEzMDA1NFoX
+DTE3MDMwMzEzMDA1NFowJTEjMCEGA1UEAxMaYXV0aC51bml2LXBhcmlzLWRpZGVy
+b3QuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpIa57mIoE7c60
+vKjcad8J0NnF2PS6JunZVvCQxdoFn7M7bNHLXnzbR3eRy/YOvs5Lap/PAZYeefUB
+XN7jsge+V1iqrz464yZGbNYHrweqp8EZU2L8GLNhHI6gOHHDGVR9NbsYFtrfrYnP
+unzON0yI99fg+YKRKIjbzPPsAcsaC6EtztqCzdui/iXpG2jNlvWWWx2TSQR4Dxn/
+cKHABFOwMmoqL/yJ0nvk2zEmL0etBSUdoiGeAOy4YxlrtRWKP8A4xrOwYwCt/v5k
+KWeLb5FHUvLMTRszxd56422oQnAS//0Xjr6k3rIGy6x4QaDj2pnGfBVF7Bj8KzeV
+7LAqpDoZAgMBAAGjezB5MFgGA1UdEQRRME+CGmF1dGgudW5pdi1wYXJpcy1kaWRl
+cm90LmZyhjFodHRwczovL2F1dGgudW5pdi1wYXJpcy1kaWRlcm90LmZyL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQ77uGaL//q8VYtszQ2KFmuivP1fzANBgkqhkiG
+9w0BAQUFAAOCAQEAdmP3c/NNbbabPnpFeykRfkHIOLkVNsqwxR0a2Jr3LNSm9SE/
+Uta0MubpVTrImYQ9Fj8d3/MbSJtFR83dQ7Ib3/JZ04RqHz1LThOga8Qjw7s/O4Do
+j0NW1Rv/3CDCeDM5nOJ+4QlCLu0NqoAKDURooIJf0VTr5LnOAKMeQMAejXrtFjZT
+2IjXihUHeROCpIja7zzo84eZbbZvmOmrIJBbtDIEVjqqq7v9cYAbsrFxRw7WZo8J
+AeQBiqc1r72+AtBF18BJnpvVviUUxNU+MWLbNl+SaWhuUOqKqpFYcmF2jUHrM+N4
+VMThjYGNfbI8izARv+4LCGkfOSrlpq/2KqJ+FQ==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.univ-paris-diderot.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.univ-paris-diderot.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.univ-paris-diderot.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Paris 7 - Denis Diderot</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Paris 7 - Denis Diderot</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>noc@univ-paris-diderot.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.univ-pau.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.univ-pau.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..01a72416
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.univ-pau.fr-idp-shibboleth.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.univ-pau.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-03T16:39: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-pau.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Pau et des Pays de l'Adour</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDIjCCAgoCCQC3OrRBueQaizANBgkqhkiG9w0BAQUFADBTMQswCQYDVQQGEwJG
+UjEMMAoGA1UEBxMDUGF1MQ0wCwYDVQQKEwRVUFBBMQwwCgYDVQQLEwNDUkkxGTAX
+BgNVBAMTEGF1dGgudW5pdi1wYXUuZnIwHhcNMTMwMjE5MTQ0NTQ4WhcNMjMwMjE3
+MTQ0NTQ4WjBTMQswCQYDVQQGEwJGUjEMMAoGA1UEBxMDUGF1MQ0wCwYDVQQKEwRV
+UFBBMQwwCgYDVQQLEwNDUkkxGTAXBgNVBAMTEGF1dGgudW5pdi1wYXUuZnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWTM/siVuTExMzX3c7YRDl71NX
+0wRsW3qKUbSwM1BI1x4eP9aXECEujPvKYaaudMZziwsAeP+ZCh2RU2URqu9YEGb4
+9ZBFBnFj6GgPtEUZuiJt6vJVKL5l7SUm2NBuNAVRFhFTYkvBQGzS/zd79W2S/8zr
+gMx9tJ7bVi8ZNIheYRJl2FZFqGHhFKKgqSkeFW7qGjiJfy2jY62Ba8TMM7cIDIZ+
+IJ6SmPLFSTONxDZ0hEuinFpO9DCA+ga6nzDXeyMSsU1xdjgn8BD58OBKBZtOjI/T
+58BVHfWrcagqK06C98vQNk97+H8xF+49l0fGXwaSRl1Uf2fqh5RJyupPTtIdAgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBAI2cHyACJMLw0Xjx7zOYUjwLWakZxNnBiEjX
+MX2t8nr8bi/ZUoABWYP5cypHk9jIY/XngWOmEDwaa5GZiuNokWNfH8glmqFKVTgB
+PILrumLWtA0/CkgmnlaBhgU4pRbxSGZ6FENYIY/P5Grp5P0DzOP8znSDvucrpXf5
+DPGkthWJn/ooDngwBJqQBwxShiRmL1bwRMvdRG9N1bZKO8kYGK1txDkLLOB2n+dA
+mXWnKcQd4kpmpFEoppdN4qgpgZjla+xLPhswKXB81UJ+csh+c7/+oikJZuAS5vPb
+U2avjI5AfKIKKFQYpjP1qpGGUNecL4Bw28IOM+JyrH4T6CmGgq8=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.univ-pau.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.univ-pau.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.univ-pau.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Pau et des Pays de l'Adour</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Pau et des Pays de l'Adour</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@univ-pau.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/authenticate.bvdep.com-ukfederation.xml b/swamid-interfederations-2.0/authenticate.bvdep.com-ukfederation.xml
new file mode 100644
index 00000000..eee77b39
--- /dev/null
+++ b/swamid-interfederations-2.0/authenticate.bvdep.com-ukfederation.xml
@@ -0,0 +1,101 @@
+<?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://authenticate.bvdep.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="2008-07-22T10: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: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://authenticate.bvdep.com/ukfederation/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Bureau van Dijk</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Global, regional and domestic company information - including financials, corporate structures and other business intelligence.</mdui:Description>
+        <mdui:Logo height="76" width="198">https://authenticate.bvdep.com/bvdlogo.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEBjCCAu6gAwIBAgIJAMGyauP3kg2oMA0GCSqGSIb3DQEBBQUAMIGDMQswCQYD
+						VQQGEwJCRTERMA8GA1UECBMIQnJ1c3NlbHMxETAPBgNVBAcTCEJydXNzZWxzMRgw
+						FgYDVQQKEw9CdXJlYXUgdmFuIERpamsxEzARBgNVBAsTClNoaWJib2xldGgxHzAd
+						BgNVBAMTFmF1dGhlbnRpY2F0ZS5idmRlcC5jb20wHhcNMTEwODAyMTUwODM2WhcN
+						MzEwNzI4MTUwODM2WjCBgzELMAkGA1UEBhMCQkUxETAPBgNVBAgTCEJydXNzZWxz
+						MREwDwYDVQQHEwhCcnVzc2VsczEYMBYGA1UEChMPQnVyZWF1IHZhbiBEaWprMRMw
+						EQYDVQQLEwpTaGliYm9sZXRoMR8wHQYDVQQDExZhdXRoZW50aWNhdGUuYnZkZXAu
+						Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1UtrmJ9RcT+Of4xe
+						+xWozbNe5JVuMOfZJ0kpeve2Hh30RHAzxJQjDkYBogjq+2aYPEqrlc8Zg7DO4wy4
+						CRDkr4nEIUsicM2qAZv9vAuV3wf204QWPg944iPvEIwoCEwHCwEoUtdtEYZpeMAE
+						EhP7RKc3UwbUbzaEnGBaqhAUlF+Fokq7INve7kca7AldsMTNPxelTISMO7eJLris
+						t/ZMyEUkVrri2vHJR5wW0vNBHVCcDAGjGt4ckTKVB0Xmqi77sHPOyS05KndzElMs
+						ULcRVbOVNv7GSzYTHRQlaq6VWyoBVTWH+rht00/97vf265Yn1pC9mm82YqZNlvEI
+						dRMsdwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
+						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUJHFh2uJtwpARwv+xpu5j
+						dRw5j4kwHwYDVR0jBBgwFoAUJHFh2uJtwpARwv+xpu5jdRw5j4kwDQYJKoZIhvcN
+						AQEFBQADggEBALRsYutdOD2SKEi3MGju3pQeqhgGQJk5y4aQ06CJmXjz8TQmWCFJ
+						hbIwR6347FUyyLiGqDSbJsZuzaFKq5oGVL3QgERisKBsvabFLvaICb/cKbz98UVR
+						oe4ZfgFKWKxDJTTk7R2RXCL5rFJFQvLGii3booGdkrWqY8FVjq8BHawgydcyIlMp
+						j/oj8ggh2OrS3vR6+8xasdDj5YqzG5rJgKP2fmnSOTVMfmPjAqEp/Yj37Wtl0NRR
+						fN9RkMQvRV7pufGoIJC0iPtOy6Fb7Hwh+61ELiTt5NCTewiFrOUilqhnpiJBqfI5
+						F3JhOKtgLsQEWD4nm3wzptv2ImHrjeaaNMA=
+					</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://authenticate.bvdep.com/ukfederation/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bureau Van Dijk - Electronic Publishing</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bureau van Dijk: authentication service for the UK federation</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bvdep.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Buelens</md:SurName>
+    <md:EmailAddress>mailto:Peter.Buelens@bvdinfo.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Buelens</md:SurName>
+    <md:EmailAddress>mailto:Peter.Buelens@bvdinfo.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/authest.bathspa.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/authest.bathspa.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..8cba5ff6
--- /dev/null
+++ b/swamid-interfederations-2.0/authest.bathspa.ac.uk-oala-metadata.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://authest.bathspa.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="2013-06-14T11:36:22Z"/>
+  </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">bathspa.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					MIIDUDCCAjigAwIBAgIIRqiLzGQHQaswDQYJKoZIhvcNAQEFBQAwPzEcMBoGA1UE
+					CgwTQmF0aCBTcGEgVW5pdmVyc2l0eTEfMB0GA1UEAwwWYXV0aHRlc3QuYmF0aHNw
+					YS5hYy51azAeFw0xMzA2MTIxMjAwMzNaFw0yMzA2MTIxMjAwMzNaMD8xHDAaBgNV
+					BAoME0JhdGggU3BhIFVuaXZlcnNpdHkxHzAdBgNVBAMMFmF1dGh0ZXN0LmJhdGhz
+					cGEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCW6aSWgT8R
+					ZcWJ4CPCq+q+Q7HkmVwkLmrzq6EGKw2iWsv5julaNTOl6WAx2+xQecNWag+3rfGp
+					uanS2frS+R7hO0x04VW4uBqfBKycUEvjJ9IeSaKifuVqui42YrUvypUAiMD0dyC1
+					2GxkuAPsnpUyIiiFf/+jB29HaOhHl55ZJL7PLU79X63qoLGOcEfx3JpXzWZknp1o
+					0+b3B6xWFTBElAuh/V7ZVwMnlQb6FDXdwURpP4Lfn2eNvEA5lj8nRgxqlFon0kGH
+					2FPhlJ61nAcS15eSaaTCnsfz8pVgjPdd1nZq3SajTeJaZq4Fb4LB6NkdSN4eDNrN
+					uQb4KDq96epdAgMBAAGjUDBOMB0GA1UdDgQWBBQem211nEnqC/c1sA/RIhSaKiOP
+					gzAfBgNVHSMEGDAWgBQem211nEnqC/c1sA/RIhSaKiOPgzAMBgNVHRMEBTADAQH/
+					MA0GCSqGSIb3DQEBBQUAA4IBAQAvZz0attopvGO1nP/afw1/j/5AaWTZVgE6aQqA
+					Pq5krYkN0eDdEh0pYuSOGE9yj2ol7GfDJJdVqg5XK6xmwRnXgLKYjo7wiHq6U+mf
+					tX2QESmKS5qiKc8GXZ7TB/Rzc4Q3pKcDC6ugMLPx3s4fKctttM2KU8FZ7YwA+esy
+					SV6EThbdpCA4FFpTyMOK8ITuoeUyq6YK6sEIxMkq2gE/R+cB4VL1z/rpVC/FgN/G
+					/MEIfzzKv+htixan0Vo0Gx5I6BPRvVi3Jk8mRjvw052p+1muveeBjeCvnBiXkkiT
+					2z1owf0akLc7gonqQhWx3mwrj9WXKUxSwI/KU9QyJ7+g24GQ
+				</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					MIIDUDCCAjigAwIBAgIIRqiLzGQHQaswDQYJKoZIhvcNAQEFBQAwPzEcMBoGA1UE
+					CgwTQmF0aCBTcGEgVW5pdmVyc2l0eTEfMB0GA1UEAwwWYXV0aHRlc3QuYmF0aHNw
+					YS5hYy51azAeFw0xMzA2MTIxMjAwMzNaFw0yMzA2MTIxMjAwMzNaMD8xHDAaBgNV
+					BAoME0JhdGggU3BhIFVuaXZlcnNpdHkxHzAdBgNVBAMMFmF1dGh0ZXN0LmJhdGhz
+					cGEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCW6aSWgT8R
+					ZcWJ4CPCq+q+Q7HkmVwkLmrzq6EGKw2iWsv5julaNTOl6WAx2+xQecNWag+3rfGp
+					uanS2frS+R7hO0x04VW4uBqfBKycUEvjJ9IeSaKifuVqui42YrUvypUAiMD0dyC1
+					2GxkuAPsnpUyIiiFf/+jB29HaOhHl55ZJL7PLU79X63qoLGOcEfx3JpXzWZknp1o
+					0+b3B6xWFTBElAuh/V7ZVwMnlQb6FDXdwURpP4Lfn2eNvEA5lj8nRgxqlFon0kGH
+					2FPhlJ61nAcS15eSaaTCnsfz8pVgjPdd1nZq3SajTeJaZq4Fb4LB6NkdSN4eDNrN
+					uQb4KDq96epdAgMBAAGjUDBOMB0GA1UdDgQWBBQem211nEnqC/c1sA/RIhSaKiOP
+					gzAfBgNVHSMEGDAWgBQem211nEnqC/c1sA/RIhSaKiOPgzAMBgNVHRMEBTADAQH/
+					MA0GCSqGSIb3DQEBBQUAA4IBAQAvZz0attopvGO1nP/afw1/j/5AaWTZVgE6aQqA
+					Pq5krYkN0eDdEh0pYuSOGE9yj2ol7GfDJJdVqg5XK6xmwRnXgLKYjo7wiHq6U+mf
+					tX2QESmKS5qiKc8GXZ7TB/Rzc4Q3pKcDC6ugMLPx3s4fKctttM2KU8FZ7YwA+esy
+					SV6EThbdpCA4FFpTyMOK8ITuoeUyq6YK6sEIxMkq2gE/R+cB4VL1z/rpVC/FgN/G
+					/MEIfzzKv+htixan0Vo0Gx5I6BPRvVi3Jk8mRjvw052p+1muveeBjeCvnBiXkkiT
+					2z1owf0akLc7gonqQhWx3mwrj9WXKUxSwI/KU9QyJ7+g24GQ
+				</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://authtest.bathspa.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://authtest.bathspa.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bath Spa University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bath Spa University Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bathspa.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Server Team</md:GivenName>
+    <md:EmailAddress>mailto:serverteam@bathspa.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Server Team</md:GivenName>
+    <md:EmailAddress>mailto:serverteam@bathspa.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/avbmth.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/avbmth.sisoshibboleth.co.uk-entity.xml
new file mode 100644
index 00000000..6ab6940c
--- /dev/null
+++ b/swamid-interfederations-2.0/avbmth.sisoshibboleth.co.uk-entity.xml
@@ -0,0 +1,82 @@
+<?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://avbmth.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-06-05T15:30: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://avbmth.siso.co/sso/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://avbmth.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 Bournemouth University ~ AVBmth, Online Resource Booking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SiSo Bournemouth University ~ AVBmth, 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>
+						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
+						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
+						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
+						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
+						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
+						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
+						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
+						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
+						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
+						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
+						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
+						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
+						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://avbmth.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://avbmth.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://avbmth.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://avbmth.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://avbmth.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://avbmth.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://avbmth.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 Bournemouth University ~ AVBmth, 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/ballbcauth.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ballbcauth.balliol.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..b5cedde8
--- /dev/null
+++ b/swamid-interfederations-2.0/ballbcauth.balliol.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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://ballbcauth.balliol.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-16T15:56:31Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ballbcauth.balliol.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>
+						MIIDGDCCAgCgAwIBAgIJAJF9q6+yquHvMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG2JhbGxiY2F1dGguYmFsbGlvbC5veC5hYy51azAeFw0xMjA3MTIwOTE2MjJa
+						Fw0yMjA3MTAwOTE2MjJaMCYxJDAiBgNVBAMTG2JhbGxiY2F1dGguYmFsbGlvbC5v
+						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKat3hIahwBr
+						e/9cy/6ZMwoPDxNGissjmiBD7cEI8YkW26EyrSFlcEgTVDUrWWMyFoh8nCLJIPfK
+						4Lhm2WSJCiWj5z1NEEO/LE5HtA6W4T6D9VheAe1wbmL3pfq6lOfQ2reyi3wiruzL
+						NsVxBq7NcVcoB1Rz+N6RezpU6eO4tI6OP+R8EgMvlAPw3/LgDix5rLsxnYuOrCsR
+						QfuwyY0QisuQWrGV3Ko6InoB4/VgJzRX7nuiKOk0PPpM/wYYZdcWnWK2992Tk2ss
+						/mHjW2D2yrfqjBc2KqCvMqk9w4SQRF58y1DNZhatoXSOreSGaL7gCYX3+M5zSLZ2
+						oUNVMpe3Yg8CAwEAAaNJMEcwJgYDVR0RBB8wHYIbYmFsbGJjYXV0aC5iYWxsaW9s
+						Lm94LmFjLnVrMB0GA1UdDgQWBBQghUPDCQ70pB3A1tKNvIxtuDoGszANBgkqhkiG
+						9w0BAQUFAAOCAQEAPshnzBIb3O4qrk/i9y9EhhF7x6Y8RNQ3JeWEieAKeouJwCE9
+						i7riRyhv0663cK2umvCMpTEvhprvzZLaoo3XtAgkAp4lInUBKbxu2Xz99r7tun8N
+						Yk0hPLYpF08aSroUlWuNz2Hu+/8rcx3faWIdnVoxZqL27MvN07BDa75lw4vWi6d4
+						rF06fgDgv85RmWNbT2Zf/IETkm7NKuIPxIq3B9n9EFTt6v6x2cys0y3e/Z6w/h0r
+						fIJa1nSZqkrUSmx+s7wjbMxAp1OQrlwKaLvnnaXMbzacxQV6vuFUZXYSaB5jO3Lk
+						haYMvhH56lpRhiY3alj0zO78dMy3bBTike/+tw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Balliol College - Main Site Network Registrations</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stewart</md:GivenName>
+    <md:SurName>Tolhurst</md:SurName>
+    <md:EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stewart</md:GivenName>
+    <md:SurName>Tolhurst</md:SurName>
+    <md:EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ballhmauth.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ballhmauth.balliol.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..a33cc1f6
--- /dev/null
+++ b/swamid-interfederations-2.0/ballhmauth.balliol.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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://ballhmauth.balliol.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-16T15:58: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ballhmauth.balliol.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>
+						MIIDGDCCAgCgAwIBAgIJAOGLhfhvZmWrMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG2JhbGxobWF1dGguYmFsbGlvbC5veC5hYy51azAeFw0xMjA3MTIwOTIzMTVa
+						Fw0yMjA3MTAwOTIzMTVaMCYxJDAiBgNVBAMTG2JhbGxobWF1dGguYmFsbGlvbC5v
+						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJVc+Rvpuetz
+						KGBDcLb5IE7kVWS9ocVnky49w1dPWfAzoCD6M8uUZXo5p3Uhz9qkjewinGfJzGGR
+						DuOFQY7vHqdkStjTD6KiJpGqc7KMEVS3ALqVKcDooWXxoXPFVLw/KSerK+vJ2f0S
+						dmQSzHZbybHrQiu/uSiEgiAS9LFNpTf1NqYzJKpgQHOk43Fy1qxcFmY9etlzyQNF
+						CIrmrrGKqPGhE4I5wdXa+iSuodHBok7f66EcgX425Icyy9jpAG+I4vK/ZW2QaFd+
+						ls2WoeyHqeHd+6bDzx9PM0IZg/yoBB+yNazI0UXXvmphPSpPUCxza+BBY4M2JOOc
+						9ckQg6JE+tcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbYmFsbGhtYXV0aC5iYWxsaW9s
+						Lm94LmFjLnVrMB0GA1UdDgQWBBRdqcX7hnNNa8HySZBpyM0WVZQPAzANBgkqhkiG
+						9w0BAQUFAAOCAQEAGs2pK0uRW742oR1oqbMsSclc+iFboWXUQgWGFv8MiuZllbwa
+						THJNCCpmBw2OYjfXaztvbJ8csEGsbYmaNO/hLqeIrEdhS4WyBqK4LpNKFiasX+a1
+						ChokEfss17afSc22gsbV+DL3NgCIpI+LwTjGHSHciZ6mfinYoMyyRDYGUJ+Ty75e
+						dU3NwYxplRumD3fneIrLsQ4NqV979yvJSWlShKdb0O+4t1qRSMVPZb74plelI/f0
+						c28WqAH/V6JwRtXQEm30eRjZhRD4SXJtDLyPkLuKXQ/FTXRdI1HSqVMMi2ll4VqN
+						+VBl8jTl7qVzQIzFCFIdwLOaSSCvNrDsB7b9Cg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Balliol College - HM and JWT Network Registrations</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stewart</md:GivenName>
+    <md:SurName>Tolhurst</md:SurName>
+    <md:EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stewart</md:GivenName>
+    <md:SurName>Tolhurst</md:SurName>
+    <md:EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..5bf94102
--- /dev/null
+++ b/swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,111 @@
+<?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://bamboo-server1.oerc.ox.ac.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-17T12: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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bamboo-server1.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>
+						MIIE9DCCA9ygAwIBAgIJAJjPinj3h+6JMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
+						VQQGEwJVSzEPMA0GA1UECBMGT3hmb3JkMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNV
+						BAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMQ0wCwYDVQQLEwRPZVJDMSUwIwYDVQQD
+						ExxiYW1ib28tc2VydmVyMS5vZXJjLm94LmFjLnVrMSYwJAYJKoZIhvcNAQkBFhd4
+						aW4ueGlvbmdAb2VyYy5veC5hYy51azAeFw0xMTA1MTIxNTQ0MzFaFw0yMTA1MDkx
+						NTQ0MzFaMIGsMQswCQYDVQQGEwJVSzEPMA0GA1UECBMGT3hmb3JkMQ8wDQYDVQQH
+						EwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMQ0wCwYDVQQL
+						EwRPZVJDMSUwIwYDVQQDExxiYW1ib28tc2VydmVyMS5vZXJjLm94LmFjLnVrMSYw
+						JAYJKoZIhvcNAQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAM6EbueETfZqk/3WdvBBlhiyoKsd+nFOp6Xq
+						XrzetyhGYiPvRM12mh0yNnwQVDfUo3hDPziCmos8E+94Du1adJz8ekiFb8Nz7oNh
+						MKhzPi3DPU7vUTFd6bF/TiFR8FSq8PQJH6gL8Kn6zfECo2h+taVEjns6XNhOXXWI
+						zB+GMUSxRPdeFsmFUyvBExevNhPuO3C7N5WtbW4tG9j2sqdBJYYdeoy9nS3DVgSM
+						ctT15kPkIx46o37R1fNYAQskeOEey8+qMcRIbb4HA3L5RiuKxJ0Y1LbtGgezGwz2
+						9hRFqtdnwHPDBiNuJmWVWnuVxF07IowkZwzEVPf2QvXJy2UfIrUCAwEAAaOCARUw
+						ggERMB0GA1UdDgQWBBSMBsi1+lhDNEtrwQerDmHatWTUOTCB4QYDVR0jBIHZMIHW
+						gBSMBsi1+lhDNEtrwQerDmHatWTUOaGBsqSBrzCBrDELMAkGA1UEBhMCVUsxDzAN
+						BgNVBAgTBk94Zm9yZDEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJz
+						aXR5IG9mIE94Zm9yZDENMAsGA1UECxMET2VSQzElMCMGA1UEAxMcYmFtYm9vLXNl
+						cnZlcjEub2VyYy5veC5hYy51azEmMCQGCSqGSIb3DQEJARYXeGluLnhpb25nQG9l
+						cmMub3guYWMudWuCCQCYz4p494fuiTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
+						BQUAA4IBAQAWU22GX9LpL7ZtQiiTTKdJg7zI3pUVNNcmZA5MARUdfZ6i+QmOWyDw
+						ReZmpq0sWkCMBYwOsYIYVzuCE45WBZ16wqrPZWvWfm/BSycMpuyr3aqNc2TwH38j
+						g09eFGbbX0haiMaUbicmEf72vL/n5K5lKZs/uFea5NIYUDvuKnLwXyYM6pN3mNLT
+						HMsIPDthR1ywJitmoVZaXYzQDjhHSe8oV4LEBULMU4erB/+Au/Q2nC+3OWYvUhhA
+						E7a86SCurSbeZylvzbNVrqMcR9Vs1Op1n374Ycb9kfXkweWc60RVvBBx6h474jLv
+						MbCgGVmfiQqekWeztRCKWq/Jqedw3vWF
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIE9DCCA9ygAwIBAgIJAJjPinj3h+6JMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
+						VQQGEwJVSzEPMA0GA1UECBMGT3hmb3JkMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNV
+						BAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMQ0wCwYDVQQLEwRPZVJDMSUwIwYDVQQD
+						ExxiYW1ib28tc2VydmVyMS5vZXJjLm94LmFjLnVrMSYwJAYJKoZIhvcNAQkBFhd4
+						aW4ueGlvbmdAb2VyYy5veC5hYy51azAeFw0xMTA1MTIxNTQ0MzFaFw0yMTA1MDkx
+						NTQ0MzFaMIGsMQswCQYDVQQGEwJVSzEPMA0GA1UECBMGT3hmb3JkMQ8wDQYDVQQH
+						EwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMQ0wCwYDVQQL
+						EwRPZVJDMSUwIwYDVQQDExxiYW1ib28tc2VydmVyMS5vZXJjLm94LmFjLnVrMSYw
+						JAYJKoZIhvcNAQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAM6EbueETfZqk/3WdvBBlhiyoKsd+nFOp6Xq
+						XrzetyhGYiPvRM12mh0yNnwQVDfUo3hDPziCmos8E+94Du1adJz8ekiFb8Nz7oNh
+						MKhzPi3DPU7vUTFd6bF/TiFR8FSq8PQJH6gL8Kn6zfECo2h+taVEjns6XNhOXXWI
+						zB+GMUSxRPdeFsmFUyvBExevNhPuO3C7N5WtbW4tG9j2sqdBJYYdeoy9nS3DVgSM
+						ctT15kPkIx46o37R1fNYAQskeOEey8+qMcRIbb4HA3L5RiuKxJ0Y1LbtGgezGwz2
+						9hRFqtdnwHPDBiNuJmWVWnuVxF07IowkZwzEVPf2QvXJy2UfIrUCAwEAAaOCARUw
+						ggERMB0GA1UdDgQWBBSMBsi1+lhDNEtrwQerDmHatWTUOTCB4QYDVR0jBIHZMIHW
+						gBSMBsi1+lhDNEtrwQerDmHatWTUOaGBsqSBrzCBrDELMAkGA1UEBhMCVUsxDzAN
+						BgNVBAgTBk94Zm9yZDEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJz
+						aXR5IG9mIE94Zm9yZDENMAsGA1UECxMET2VSQzElMCMGA1UEAxMcYmFtYm9vLXNl
+						cnZlcjEub2VyYy5veC5hYy51azEmMCQGCSqGSIb3DQEJARYXeGluLnhpb25nQG9l
+						cmMub3guYWMudWuCCQCYz4p494fuiTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
+						BQUAA4IBAQAWU22GX9LpL7ZtQiiTTKdJg7zI3pUVNNcmZA5MARUdfZ6i+QmOWyDw
+						ReZmpq0sWkCMBYwOsYIYVzuCE45WBZ16wqrPZWvWfm/BSycMpuyr3aqNc2TwH38j
+						g09eFGbbX0haiMaUbicmEf72vL/n5K5lKZs/uFea5NIYUDvuKnLwXyYM6pN3mNLT
+						HMsIPDthR1ywJitmoVZaXYzQDjhHSe8oV4LEBULMU4erB/+Au/Q2nC+3OWYvUhhA
+						E7a86SCurSbeZylvzbNVrqMcR9Vs1Op1n374Ycb9kfXkweWc60RVvBBx6h474jLv
+						MbCgGVmfiQqekWeztRCKWq/Jqedw3vWF
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bamboo-server1.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://bamboo-server1.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://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bamboo-server1.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://bamboo-server1.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://bamboo-server1.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: Surfnet testing server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oerc.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:support@oerc.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:support@oerc.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bathspa.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/bathspa.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..ee9dd3f8
--- /dev/null
+++ b/swamid-interfederations-2.0/bathspa.ac.uk-oala-metadata.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bathspa.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-11T18:26: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bathspa.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSDCCAjACCQDcLoBcXhuQpDANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
+						QjENMAsGA1UECAwEQmF0aDENMAsGA1UEBwwEQmF0aDEcMBoGA1UECgwTQmF0aCBT
+						cGEgVW5pdmVyc2l0eTEbMBkGA1UEAwwSYXV0aC5iYXRoc3BhLmFjLnVrMB4XDTE0
+						MDkxMTEyNDY0MFoXDTI0MDkwODEyNDY0MFowZjELMAkGA1UEBhMCR0IxDTALBgNV
+						BAgMBEJhdGgxDTALBgNVBAcMBEJhdGgxHDAaBgNVBAoME0JhdGggU3BhIFVuaXZl
+						cnNpdHkxGzAZBgNVBAMMEmF1dGguYmF0aHNwYS5hYy51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBANDnvw+jI/NjbEuPbKzjfQa5FqOZGYy2cGaX8opS
+						WODxFwY/Ua8a9JJQlX2a8b2Wu7niQyJo1z75+cTVTljXXi4z5sghIhheFu0nv6zs
+						jA73qefWlNkpUK7ytjPVrS1LE0OttEt5uvRVb4M0j3oIF3ueAMNeASJMGw7hHqM8
+						7s9diYWljFnIiAnN0SXtMNskRBOvXQCxY1tY/qB8g1t4vx9TXyC3s54JBhT+o3wU
+						dy0dCWpiY9iQNQLx3+l/74XqlwIIaFYHylheQMxkp1pEP1kO8LHor1n/0mtCzvK0
+						wGOUge2oW6AaDhqEZSOkcEIhDw4M6dKyNvOM7UiXFO853fUCAwEAATANBgkqhkiG
+						9w0BAQUFAAOCAQEARqEYYD8T5djkWXdTunxb9OCUNTVX6MOmBgFoE9wREI3zOWHR
+						sR0nLbQylmfpqQBvgncqlhc0Ozd+Va8MXYcAFxoCBLOVc28I+Buengp+lhbddHBX
+						1WaXAovAO8gzXCTO2KlUagzLDMGdUetz9UE+raA5D+RNPtchdNsXM+ma/rFzuZNI
+						WC36eJwChM8Lz+Pge/lQAb9tsllTwvy8fh/xGwBxR5N+f5tupZjbj3uuWevR8oa3
+						/egG7ermySwN33hXy3aWdP22CDWc8kxV44J5p8Cq3UTU08aXtlDMtaiTwBZ633Hx
+						/6/Zs/TcjIKAfbi6nBCf9z6u2SrAtIiRcU51nw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.bathspa.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.bathspa.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bath Spa University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bath Spa University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bathspa.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>E-Resources</md:GivenName>
+    <md:EmailAddress>mailto:e-resources@bathspa.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pete</md:GivenName>
+    <md:SurName>Fry</md:SurName>
+    <md:EmailAddress>mailto:p.fry@bathspa.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bcauth.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bcauth.balliol.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..01af365b
--- /dev/null
+++ b/swamid-interfederations-2.0/bcauth.balliol.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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://bcauth.balliol.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="2013-11-06T14:59: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcauth.balliol.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>
+						MIIDDDCCAfSgAwIBAgIJAKNJoARfVmrDMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF2JjYXV0aC5iYWxsaW9sLm94LmFjLnVrMB4XDTEzMTEwNTExMjEyNFoXDTIz
+						MTEwMzExMjEyNFowIjEgMB4GA1UEAxMXYmNhdXRoLmJhbGxpb2wub3guYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB1ycoTYISS4JQCewMhcX1
+						3OyFUiM7QkDUIzYcBPXDYB0HnPOKfxogtqqqpVaSDpV8PMctzmC0HFegyQUpiaay
+						MGpruiTHZt32SFpoElAzNgRiYhq07BpbreEtyqUOd4IN7hkoO0VGnwCbDQbpcOHS
+						lOJvpE3LJ4XLnYk3ehch48DIcVz6E1S7vcnuRhTZll6xFBZYvUC4/efdVGa+IwMu
+						/9PFZNLJjNyqNpsn25oqU6nGcjVl4RVuaqxKEkRP3UUBz7Mniw0VRiGkoooq7l+x
+						UAH5LethxKvE2cOnxlC7EPMgDFHzUQQUkvyLCbF+cojMy15tMpI1+6QXYNcL02In
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2JjYXV0aC5iYWxsaW9sLm94LmFjLnVrMB0G
+						A1UdDgQWBBQgpNW7Sez6+a15zS454YNgTixXQjANBgkqhkiG9w0BAQUFAAOCAQEA
+						U90aMn62TVY92FTIPhj5NaGr8ZsjfAZqalAgV6HZiPfQAEAFjsQc0ny6fpEpFR/8
+						1P8EbBzL28CdV4bwvH2o8J1rf7HMf1M2YWeQ279Kr0DYaz+JixBz7IgQOIlgx5p7
+						X3ZAP4qTqqCM9fNosD4JWIB/dsWotq9NBcXbqpF9u9pc9Uj04bccVHk9v9j7BVVT
+						qcw5/TzuUkZwnOiUFkbqwowwilrlWcvZZnOCqziVy2ywypo2r+HGmzIpy1HOYyDl
+						QrTN0bUfZD6pqaeYxXXOXA2f4+Ppgad6Lu1NOIJv5Q47NoFgP8ZUe2FOKbdoFTeY
+						o5iClvqE01UYKNRhpp+GsA==
+					</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://bcauth.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcauth.balliol.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://bcauth.balliol.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://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcauth.balliol.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 Balliol Broad Street Network</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stewart</md:GivenName>
+    <md:SurName>Tolhurst</md:SurName>
+    <md:EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stewart</md:GivenName>
+    <md:SurName>Tolhurst</md:SurName>
+    <md:EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bcm.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bcm.some.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..e469f25d
--- /dev/null
+++ b/swamid-interfederations-2.0/bcm.some.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,78 @@
+<?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://bcm.some.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="2014-04-02T09:46: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcm.some.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>
+						MIIC+jCCAeKgAwIBAgIJAIYejqWu46+zMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEWJjbS5zb21lLm94LmFjLnVrMB4XDTE0MDMzMTA5NDczM1oXDTI0MDMyODA5
+						NDczM1owHDEaMBgGA1UEAxMRYmNtLnNvbWUub3guYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQC3/pTZtwd+x63mfU8PYXNRNJK1qokqjUuaeeDL
+						VwX4A1PdXsbhzDusrbzxSR8P+/TDwrfJfWUflOXDYpjLG4zk8uuif/oLMQ4kEX4T
+						MbN0Jllyi74ph4hwB2Lq224zVhW2zgKAb2tksbDzggOnNoDjJUvG2+4IMKm1XtYA
+						CcofaYHW2fE/8IaS4qRz2utZuCbc+mkm7kDuHIYJ7+C8WHOQaKZcdVJRHvISDwEJ
+						JU2q+YqC0RyxpvIrdcGzSE1HkD4jfr7vflbvlQM0Jse1tt8xWBMrC89t7UrB/9cm
+						LdeyO63cxuoXDyKRN3WnnpxCMjwZbAmZkWtn9vQhIvSHAok/AgMBAAGjPzA9MBwG
+						A1UdEQQVMBOCEWJjbS5zb21lLm94LmFjLnVrMB0GA1UdDgQWBBQDdl2hRFoRRk9l
+						YNksqL0D1EqWfTANBgkqhkiG9w0BAQUFAAOCAQEAgZjYNkh3/Q+Qu7u5V0/8KFkB
+						+vKjcxg8BlfVX13l8baFBsTrY75SzZdGguoZGlKQwPD/nlvg0/6LUTfh1J7hRsRo
+						UYkiGki7Tm/bXUKADV20G3audlttxplZVdhjhnQMW8QTuqN30y+C6M/bebLZn2oO
+						Ofbpm65EVD46GAf3NjpUKABOS/52TH5xAlZE2CgVaLLgZuJ37SH1ajviemD8LEk9
+						oe0tlcwQnrqLD99fcQe9JxAfdx3KySdQVvbRajP1UQLC833vpkSPraxsG8MVRwQZ
+						I9ZcKjWaioIzqjMaGYuv6vKtRLeSBWBxbbruArMnqoGSY1k/gShcefyDAf12+g==
+					</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://bcm.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcm.some.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://bcm.some.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://bcm.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcm.some.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, Somerville College BCM</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Somerville College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it.support@some.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Somerville College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it.support@some.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bcm.sthughs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bcm.sthughs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..ce3087cd
--- /dev/null
+++ b/swamid-interfederations-2.0/bcm.sthughs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,81 @@
+<?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://bcm.sthughs.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="2013-09-27T10:58: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcm.sthughs.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>
+						MIIDAzCCAeugAwIBAgIJAOxYXh87TIZfMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFGJjbS5zdGh1Z2hzLm94LmFjLnVrMB4XDTEzMDkyMzExMDUyOVoXDTIzMDky
+						MTExMDUyOVowHzEdMBsGA1UEAxMUYmNtLnN0aHVnaHMub3guYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD8L9og/HG4pFGOXIRVIV0vXGXfIEa1
+						r+f0+F9psIaNtSjnoaFoxU3h+shtdxnEKL7+owmsYK6TE4gNTbshr1DZ3R2eX61Q
+						IuKPAPTgPxR0iBxLjYdhHGS0POzsZq4RWMgRs8HugQnHs/VmQjHH0tPPdHC/vTNm
+						ZkVHWJvljVwjPDKwZ8s04G5SX6URa3JYsQq4p3Ak8p1Jdu87IeZ43xOXReTcrc7B
+						5dxgVWs4z9CJXIkwgAExb6MwzBiEFh6z5OJPT9UTC9crCr/ubOH37ag3VBW+qDRy
+						82Wkhzqy23pejRo/XjD5HoNwciaS3V5XtbrGk3aeqwIlpKMfXO8fBUBlAgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFGJjbS5zdGh1Z2hzLm94LmFjLnVrMB0GA1UdDgQWBBQF
+						24GC7un9VlxSwrqH68P+G2RDoDANBgkqhkiG9w0BAQUFAAOCAQEAEWPSCBEugRn4
+						6d1kDa+tmDuBNMTIaHBjOI5lMUJcUKzdkQGqpm5TqyXvSnyRBnWFrUCgkxEqiqhI
+						CqDYpxEL4ZqPJE6gDj0fySXZ3BWY9WYVXZwCtFfPtAKwLSDhm5AxVQwN86QZzMtC
+						P7XBcaY6RnWCSBSlKvCkwMmCfaBaocmaI6FtXLRnffeiL7otKn+0CRU7H8eNFM3f
+						d0+9B6OXPhOYZLCZdi+lohyJJAgC69eGxmgkvOS9f2wHtvlmzCsT9+GDJdhdwhco
+						sTFffODhZHy7jZWOfOG0p1fkP7HBWhYhkwk+H1mwbkAeaFrzg0x3usgftcWPkGxT
+						Juej92IuLA==
+					</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://bcm.sthughs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcm.sthughs.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://bcm.sthughs.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://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcm.sthughs.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, St Hugh's College NAC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.st-hughs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Bridle</md:SurName>
+    <md:EmailAddress>mailto:it-services@st-hughs.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Bridle</md:SurName>
+    <md:EmailAddress>mailto:it-services@st-hughs.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bcmtest.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bcmtest.new.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c31dabfa
--- /dev/null
+++ b/swamid-interfederations-2.0/bcmtest.new.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,77 @@
+<?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://bcmtest.new.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="2013-06-10T10:15: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcmtest.new.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>
+						MIIDLDCCAhSgAwIBAgIJALCv+bulPWu6MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFGJjbXRlc3QubmV3Lm94LmFjLnVrMB4XDTEzMDYwNzA4MzcwNloXDTIzMDYw
+						NTA4MzcwNlowHzEdMBsGA1UEAxMUYmNtdGVzdC5uZXcub3guYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0cLeXLGI3vQXsQFBvnbD/YUF2vRSn
+						ox1F2qiLd2VSNL+j657o5wq0hZjLoro0Ee+gxA6ahVI0RlBN6uyc1S02FCd7PSa9
+						0n93KfKpL40Uj/0H+M6gwmMqv0CKQcM5uPQfMZPGZnFBI7G/i+XOWkRULP8fQ1lT
+						ZceJiIELd0d7OptgwVH3mAGgp5LEFDiuApLkLWENhcLb3qTDA74qX1uiYj0kD19I
+						U5Cbb97bTAcVyCj8LVgnp9b2hIoNOg0upDw3YqRp3m5CqTKNfqOm1CViqyBa4pYq
+						L+x6SxtoHP/D2cqG39irKX64oMcV7LdkfKbCeTC7EUyE1ctsRgRqojcrAgMBAAGj
+						azBpMEgGA1UdEQRBMD+CFGJjbXRlc3QubmV3Lm94LmFjLnVrhidodHRwczovL2Jj
+						bXRlc3QubmV3Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFBFln19MZG+e
+						J17IgU8o9c4pZlC1MA0GCSqGSIb3DQEBBQUAA4IBAQAiamHirEjlyEkzpYdtC47P
+						GGSaM8qLbmjzRUvb3Tgp0Bio21a9h/nQI0yu2u35/mUyWXipAQzA/qdMBq34KUgy
+						XxeWByT6dyncB9uS3ZTAIcR2IjHJUj+fiW3317QJpL2Oq9OSO5mZ9DH1cgKnWhK6
+						JQBogeOnB9c2hM7IzOwvNe2H0EtqxgFDYnzGsWlhvddNcTDpOAWvyBUfA7uFHEmU
+						f1O6QnyW1PJA9bamGntVs0curAhoEnYewZRHS7NxGl52wM9E+ESuMYb4VLb73GL0
+						iCE6OCCjV5non0T45y0UOL0t69mf/TRp//I21O+9bhDniCkuWLMVKfRTpyxUroPQ
+					</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://bcmtest.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcmtest.new.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://bcmtest.new.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://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcmtest.new.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, New College test BCM system</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@new.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@new.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bcp-serviceadmin.company.ja.net-shibboleth.xml b/swamid-interfederations-2.0/bcp-serviceadmin.company.ja.net-shibboleth.xml
new file mode 100644
index 00000000..8c726edc
--- /dev/null
+++ b/swamid-interfederations-2.0/bcp-serviceadmin.company.ja.net-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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://bcp-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="2014-04-11T14: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/WAYF"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC4jCCAcqgAwIBAgIJAKvL1FR4I0BGMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+						BAMTCWJjcDAwNDI3OTAeFw0xMTEyMDcxMjE3MzBaFw0yMTEyMDQxMjE3MzBaMBQx
+						EjAQBgNVBAMTCWJjcDAwNDI3OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAON8mrdgSPpMs4dHJC6hBIE10lGEzsoS35vckVgFUoyhMfHZEJu2t9SVTC0T
+						GUGYIyArxQt0KSK1qHHGw+2l99xPLEH2rMAiR4JCyeer9EvQrN/mn+aERKMNX8Dd
+						mXIoM/8rqIvqA3ftE/c3H/+C3hKvTRbN7wpG9Vam/olfkujCljqd9Ve4y+uokGry
+						6rqi+5IKcb/FM8ARfZ1uFWOzUj1+THWEJgC2w8dkquMUUlYNylOvdBrY6PTeTGmh
+						EItXPsq/P1fx2hn23vahUDelahUDgE7vQY0h4DlF2iRJSV6+zfVw51cgxUZ67xko
+						jDYNPpKD1QA4x9NsIwZ7sTpVPqUCAwEAAaM3MDUwFAYDVR0RBA0wC4IJYmNwMDA0
+						Mjc5MB0GA1UdDgQWBBRasuhXna2QNf3yqFpBP2RC5kpfTDANBgkqhkiG9w0BAQUF
+						AAOCAQEA4Lepl7qoBfXJZ7t4zmd5ihlIuGEiFIlXBKiAtQYiPmK0ADxYHn87f1qq
+						5i1/Hmx9jLXSmtts1uCzotkRtvYrrJRMWfUKiyPbfhRjy7rvx57VVe568QYpRKia
+						xk86+ZRKnckWG/jo5EFFhGrjBEh+Puw+9a/RqHf7C371HF0QmQA7isNGE0n9o28p
+						Pvz4RA25T97WH7AHcdNy5uokObzKg8lI3FqM8YFDWk6RPyq5lZzhftcNfU148nyH
+						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-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://bcp-serviceadmin.company.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcp-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://bcp-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://bcp-serviceadmin.company.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcp-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://bcp-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://bcp-serviceadmin.company.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">JISC Collections and Janet Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Service Admin (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/beaumontcollege.org-oala-metadata.xml b/swamid-interfederations-2.0/beaumontcollege.org-oala-metadata.xml
new file mode 100644
index 00000000..fc74864b
--- /dev/null
+++ b/swamid-interfederations-2.0/beaumontcollege.org-oala-metadata.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beaumontcollege.org/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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">beaumontcollege.org</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDqTCCApGgAwIBAgIJAIIf+NILbP9ZMA0GCSqGSIb3DQEBBQUAMEExGTAXBgNV
+						BAoTEEJlYXVtb250IENvbGxlZ2UxJDAiBgNVBAMTG3J1bnRpbWUuYmVhdW1vbnRj
+						b2xsZWdlLm5ldDAeFw0xMTA0MTkwOTM4NThaFw0yMTA0MTYwOTM4NThaMEExGTAX
+						BgNVBAoTEEJlYXVtb250IENvbGxlZ2UxJDAiBgNVBAMTG3J1bnRpbWUuYmVhdW1v
+						bnRjb2xsZWdlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANl6
+						6JunNXqxiJRO9GiIkbXTEujWniTLPlfEWcmT+RCaHdZRQ7F3r7X71csvqkGoqsia
+						tZ44njSv3Yy/Gpt5zpr2dPtuFIVLaXXhOmTMSx7uMMfMoVgSlextlg8sMe7xW54l
+						fZtMV+K/+i3AfthnA0PtBuMf3CPR40oyxNS/mZLjLyksFMfNN805ab9f07a+8UXQ
+						+poU1mJ38NUW+k9pNobehAAVty93wdYd9AqIcEoIx04gmHXBAeHb7yPph4h4jqal
+						dmT8CN8sYd8m+gFQ4Kb75qxbXdUuD/h8FHPbWZjJ077Tt9qanI3WO/AxTCxRJIN+
+						cwRiODuEA//RjF1LbuUCAwEAAaOBozCBoDAdBgNVHQ4EFgQUbHShUZqbjLWyOUDj
+						eMhjgP+pqsUwcQYDVR0jBGowaIAUbHShUZqbjLWyOUDjeMhjgP+pqsWhRaRDMEEx
+						GTAXBgNVBAoTEEJlYXVtb250IENvbGxlZ2UxJDAiBgNVBAMTG3J1bnRpbWUuYmVh
+						dW1vbnRjb2xsZWdlLm5ldIIJAIIf+NILbP9ZMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+						hvcNAQEFBQADggEBAImljg1eaEGn3TKc1xh5go74zGJv2pNhRKoxoMZ/HOmbFe7h
+						YlAyi2aSanJlLG9HmZ5uCTAve9TDyzNkYoFvD7sGy0Wf3BJ+z+EDnZVV8iqBradX
+						kovQ19tQkwdel0FYwkxiNUQ0L4GzJWUaYKxFX2pWtoWPKE+7DnP/kUef7enRLnqQ
+						GVbHpJZK/QDTcJ8tqdz+tDs/Z9r86RESEFm5Bod6q2TIDiZFSHu8nT1BDb/9Gk/j
+						b//hRbeDkCGfHk9Rv/CPBzuPQGEM1xROe5YL7SJTnH8TAuhBOFx5flFhfmiTNSBy
+						0oeR3asSGQqUrtsmH2BIYoeJXBtrWYJYWOGXG/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>
+						MIIDqTCCApGgAwIBAgIJAIIf+NILbP9ZMA0GCSqGSIb3DQEBBQUAMEExGTAXBgNV
+						BAoTEEJlYXVtb250IENvbGxlZ2UxJDAiBgNVBAMTG3J1bnRpbWUuYmVhdW1vbnRj
+						b2xsZWdlLm5ldDAeFw0xMTA0MTkwOTM4NThaFw0yMTA0MTYwOTM4NThaMEExGTAX
+						BgNVBAoTEEJlYXVtb250IENvbGxlZ2UxJDAiBgNVBAMTG3J1bnRpbWUuYmVhdW1v
+						bnRjb2xsZWdlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANl6
+						6JunNXqxiJRO9GiIkbXTEujWniTLPlfEWcmT+RCaHdZRQ7F3r7X71csvqkGoqsia
+						tZ44njSv3Yy/Gpt5zpr2dPtuFIVLaXXhOmTMSx7uMMfMoVgSlextlg8sMe7xW54l
+						fZtMV+K/+i3AfthnA0PtBuMf3CPR40oyxNS/mZLjLyksFMfNN805ab9f07a+8UXQ
+						+poU1mJ38NUW+k9pNobehAAVty93wdYd9AqIcEoIx04gmHXBAeHb7yPph4h4jqal
+						dmT8CN8sYd8m+gFQ4Kb75qxbXdUuD/h8FHPbWZjJ077Tt9qanI3WO/AxTCxRJIN+
+						cwRiODuEA//RjF1LbuUCAwEAAaOBozCBoDAdBgNVHQ4EFgQUbHShUZqbjLWyOUDj
+						eMhjgP+pqsUwcQYDVR0jBGowaIAUbHShUZqbjLWyOUDjeMhjgP+pqsWhRaRDMEEx
+						GTAXBgNVBAoTEEJlYXVtb250IENvbGxlZ2UxJDAiBgNVBAMTG3J1bnRpbWUuYmVh
+						dW1vbnRjb2xsZWdlLm5ldIIJAIIf+NILbP9ZMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+						hvcNAQEFBQADggEBAImljg1eaEGn3TKc1xh5go74zGJv2pNhRKoxoMZ/HOmbFe7h
+						YlAyi2aSanJlLG9HmZ5uCTAve9TDyzNkYoFvD7sGy0Wf3BJ+z+EDnZVV8iqBradX
+						kovQ19tQkwdel0FYwkxiNUQ0L4GzJWUaYKxFX2pWtoWPKE+7DnP/kUef7enRLnqQ
+						GVbHpJZK/QDTcJ8tqdz+tDs/Z9r86RESEFm5Bod6q2TIDiZFSHu8nT1BDb/9Gk/j
+						b//hRbeDkCGfHk9Rv/CPBzuPQGEM1xROe5YL7SJTnH8TAuhBOFx5flFhfmiTNSBy
+						0oeR3asSGQqUrtsmH2BIYoeJXBtrWYJYWOGXG/8=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://runtime.beaumontcollege.net/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://runtime.beaumontcollege.net/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Beaumont College - A Scope College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Beaumont College - A Scope College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.beaumontcollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Couzins</md:SurName>
+    <md:EmailAddress>mailto:couzinsj@beaumontcollege.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Couzins</md:SurName>
+    <md:EmailAddress>mailto:couzinsj@beaumontcollege.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.aip.pub2web.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/beta.aip.pub2web.ingenta.com-shibboleth.xml
new file mode 100644
index 00000000..88b04363
--- /dev/null
+++ b/swamid-interfederations-2.0/beta.aip.pub2web.ingenta.com-shibboleth.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.aip.pub2web.ingenta.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-24T09:47:04Z"/>
+  </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>
+						MIIDnDCCAoSgAwIBAgIEUPfWLDANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
+						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
+						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDExNzEw
+						NDUwMFoXDTIzMDExNTEwNDUwMFowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
+						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
+						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
+						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAKFQ00fvQS6nyq0xBOu7sOMA2E5CqZj14gpmxLudWNog6GFhdHXCEqNM
+						IF9RdIz9Vaf7Icnvf6B7c9C5SCAOSXcu9pAV04z4RVd/YmGmy9AeEAKbGz+C2kka
+						4du0tBTFLUSv150RZYdrd2lykNQkWPDs+TM6XoE1+qQBTOVyOe6O6u3MuCzDbkc8
+						ibvjJ0Om/miG3EbJ+bdAeoAtnD8b67BpkUymKG4zTL0nXI+kXpg8DupGLpP4ZtFd
+						+tg5/cZMO4AkRjB6vSSP/Gx6M3SyIidSgsrvVAFdNEygKxiQvAucz/6WKg17Thsl
+						t2yq1r6F8BWmzZcfJppUjDpdDoZTaV8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						HFy+6Iv+7HwyL/lzfOyv8DFmVbzZpFhhanWmEdxrCxbAhs2Fnj5dkdJBvKaW7GJZ
+						J0MoJB9apg/prOm9Cj2ZJHOzKCqVZUu4D1j/qJHEzPy/I3UyjgbzdWT1yuxyJMuV
+						K2KfVPLyzFKhYJZCwq7GKFFSGken1Sshfyw/RLFqRtwQPH4BFv+0NTcznD2WLifA
+						9CM0pNy/7Jn87ZH5udxUqI5UbwxBxLZvbL6ovROXymBOTVZogRb3H7M8YkH/VJTh
+						APFn3wPwDtfg6l17iC98oDdmqZGdM330Ps1ywc714ne0WcUKGZ51Dxqkh3U9mEQA
+						+7gHltEQPx/ItlMLX48ZbA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.aip.pub2web.ingenta.com/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.aip.pub2web.ingenta.com/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Publishing Technology plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Publishing Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.publishingtechnology.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tony</md:GivenName>
+    <md:SurName>Upton</md:SurName>
+    <md:EmailAddress>mailto:tony.upton@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Talvinder</md:GivenName>
+    <md:SurName>Matharu</md:SurName>
+    <md:EmailAddress>mailto:openathens@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.asm.pub2web.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/beta.asm.pub2web.ingenta.com-shibboleth.xml
new file mode 100644
index 00000000..9caf7991
--- /dev/null
+++ b/swamid-interfederations-2.0/beta.asm.pub2web.ingenta.com-shibboleth.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.asm.pub2web.ingenta.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-31T15:28:31Z"/>
+  </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
+						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDcyMzEx
+						MDUzN1oXDTE2MDcyMjExMDUzN1owgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
+						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
+						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
+						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAKz4tWwjcP2+Ld9vIqdI9ssmUF7yJVnDUoJqAPhejPOFSvrEZrjvofnY
+						6VIcPcL3tyUADrD/vTRCb3T1FuQKsRnXgYzYI9o84hK6IZyTVzzD1G3Kil5ivsNq
+						ndv5hcMNfbH5kjGLfKvgHixrkR5HkLfITBghQydtCur4Yze0+u3mFu4OTabmqILH
+						hcnWlLPohznyRtx5F3fTtFFC/cUHAonymmH8OG3xQOhLFR1dSK5i2oGoRdqme6mR
+						FiFHS8832tGjqsb072rFdpxKSmPLxz0vBxoa/YVw0RP6OYgt5Gze6mPOv1rFE5jq
+						nMegHU7gLilsR6AS9GQoE+KUNiBeYhsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						OlI/iGvczpy+BZErTXPBvizoKvFJzoi5Ri+zRRu+49qR67uMrnpKAQ51Weae6kj8
+						tz0+iQIcKbyOO/9A+7Iu55PWruI4w0Qe4c8cCmFg5crORj2Orel3IMrT5s4XXOZ2
+						MHweTl9+ZGFpshUYbSdPvj2vN8RhpC1c644lHVK0xceVxd3pFZA6VdtKfrnjyfXH
+						t2m6Pzr00zEvxcvZch5rXdtH/tdSp8fRQzAoAWB1MBXTLBL1xztRSTacPMJYdiNP
+						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>
+						MIIDnDCCAoSgAwIBAgIEUe5jgTANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
+						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
+						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDcyMzEx
+						MDUzN1oXDTE2MDcyMjExMDUzN1owgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
+						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
+						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
+						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAKz4tWwjcP2+Ld9vIqdI9ssmUF7yJVnDUoJqAPhejPOFSvrEZrjvofnY
+						6VIcPcL3tyUADrD/vTRCb3T1FuQKsRnXgYzYI9o84hK6IZyTVzzD1G3Kil5ivsNq
+						ndv5hcMNfbH5kjGLfKvgHixrkR5HkLfITBghQydtCur4Yze0+u3mFu4OTabmqILH
+						hcnWlLPohznyRtx5F3fTtFFC/cUHAonymmH8OG3xQOhLFR1dSK5i2oGoRdqme6mR
+						FiFHS8832tGjqsb072rFdpxKSmPLxz0vBxoa/YVw0RP6OYgt5Gze6mPOv1rFE5jq
+						nMegHU7gLilsR6AS9GQoE+KUNiBeYhsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						OlI/iGvczpy+BZErTXPBvizoKvFJzoi5Ri+zRRu+49qR67uMrnpKAQ51Weae6kj8
+						tz0+iQIcKbyOO/9A+7Iu55PWruI4w0Qe4c8cCmFg5crORj2Orel3IMrT5s4XXOZ2
+						MHweTl9+ZGFpshUYbSdPvj2vN8RhpC1c644lHVK0xceVxd3pFZA6VdtKfrnjyfXH
+						t2m6Pzr00zEvxcvZch5rXdtH/tdSp8fRQzAoAWB1MBXTLBL1xztRSTacPMJYdiNP
+						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://beta.asm.pub2web.ingenta.com/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.asm.pub2web.ingenta.com/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Publishing Technology plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ASM Science Beta</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>Peter</md:GivenName>
+    <md:SurName>Arbuthnott</md:SurName>
+    <md:EmailAddress>mailto:openathens@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.brill.pub2web.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/beta.brill.pub2web.ingenta.com-shibboleth.xml
new file mode 100644
index 00000000..ee95125d
--- /dev/null
+++ b/swamid-interfederations-2.0/beta.brill.pub2web.ingenta.com-shibboleth.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.brill.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>
+						MIIDdjCCAl6gAwIBAgIETk5pVDANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJH
+						QjEQMA4GA1UECBMHVW5rbm93bjEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQ
+						dWJsaXNoaW5nIFRlY2hub2xvZ3kxDzANBgNVBAsTBk9ubGluZTEaMBgGA1UEAxMR
+						VGFsdmluZGVyIE1hdGhhcnUwHhcNMTEwODE5MTM0NzAwWhcNMjEwODE2MTM0NzAw
+						WjB9MQswCQYDVQQGEwJHQjEQMA4GA1UECBMHVW5rbm93bjEPMA0GA1UEBxMGT3hm
+						b3JkMR4wHAYDVQQKExVQdWJsaXNoaW5nIFRlY2hub2xvZ3kxDzANBgNVBAsTBk9u
+						bGluZTEaMBgGA1UEAxMRVGFsdmluZGVyIE1hdGhhcnUwggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCBgsfPtWqw8h45x+RHc7GT+irvTYg0WVTlaMCooZv5
+						QNZX2DHRHSBfcmPikAhIN804cHGasoCHYmkGOotgTJyHL2VAYjPhUlgBDeORVzEo
+						Zj87C5juJgnC8y87nszfYoVQSmdLTD0J99foF3Ek6X9AfGPtLoUt9RwiW8laUeSy
+						1sqCUN2PKdC+wLOLVbDM17g+l9b/lCK9bumzGYx9Od/ToZAjwMWLQHeg+M1FP8h/
+						lSgGRc9G2H04JR2B752YJEe2AyJSpKXXJkm+K782AmJD+7bHxEWCILUbmQ1XD1IJ
+						o+G0IlPV5dIKbBj2kCbePM1505KuitB9TtGJ7RCQk/VjAgMBAAEwDQYJKoZIhvcN
+						AQEFBQADggEBAAUUkj9uefUKRXVBuuRLnEs6Ifh5044S376FDGHnvscHkj+PYPqi
+						dO16DsxhwfwUk1GgUGtQ1FuLu4SfNQtymiH1C/FTE49G3sRVQcFoYdG0VrZ5rWlg
+						nrbaqcfeexdDE+uLffgjjNHVAfMHLCNiBdgd8saIu1rwzL+2iV5q1bAZSApFgNG3
+						kVMW8BOxOIkezDlxFAJEc0Yd6JcfD4L/58teQWBg/SRq6GvJOMUtb7KI5bqkT+/+
+						aoJ/fguy6nyFOjyWP2SdCB1hNJy0C07j6/S0qyyRusDxKpq4WNLOsShn2UPGwrPe
+						WU3SgDnwOuu2trwvO6e5rm1xqPwB+RdK6Mc=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.brill.pub2web.ingenta.com/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.brill.pub2web.ingenta.com/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Publishing Technology plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Publishing Technology plc: Brill Online Books and Journals BETA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://booksandjournals.brillonline.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Brill Support</md:GivenName>
+    <md:EmailAddress>mailto:support@brill.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Talvinder</md:GivenName>
+    <md:SurName>Matharu</md:SurName>
+    <md:EmailAddress>mailto:talvinder.matharu@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dave</md:GivenName>
+    <md:SurName>Lord</md:SurName>
+    <md:EmailAddress>mailto:Dave.Lord@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hatim</md:GivenName>
+    <md:SurName>Ghadiyali</md:SurName>
+    <md:EmailAddress>mailto:Hatim.Ghadiyali@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.digitaltheatreplus.com.xml b/swamid-interfederations-2.0/beta.digitaltheatreplus.com.xml
new file mode 100644
index 00000000..64ebfbcf
--- /dev/null
+++ b/swamid-interfederations-2.0/beta.digitaltheatreplus.com.xml
@@ -0,0 +1,69 @@
+<?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://beta.digitaltheatreplus.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-04T16:07: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Digital Theatre Plus (setup site)</mdui:DisplayName>
+        <mdui:Logo height="60" width="104">https://live.digitaltheatreplus.vualto.com/sites/all/themes/digitaltheatreplus/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>
+						MIIDSzCCAjOgAwIBAgIJAN3dSNg4hiPsMA0GCSqGSIb3DQEBBQUAMDcxNTAzBgNV
+						BAMTLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFs
+						MB4XDTE0MTIwMjEwMjEyOVoXDTI0MTEyOTEwMjEyOVowNzE1MDMGA1UEAxMsaXAt
+						MTAtMjEwLTEzMC0xODUuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWwwggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWIBkrkj+I6eUqYNMmNdjkDF4phGN+
+						sNIjyo8kCcYc7Wb/WFYADECTYtZbKkSWBARejxCAGiqp2XGhpwN91cisYeeVY79B
+						EnI7O45meAasDOFGRVc8ciP5PaujLqz3zwWt8YAnsQizmq7bpvHerZQIkQt9c1Km
+						NeREIMJDB6FH0ZTsUbVLxDtQnAEHJ7jj0seNkDmNXP4ooiipKbZYbCVyksp6i6fV
+						xGp7bIZodBg7U70TK9zQuBPx3TWZsevxOcVwyaH5f3q5KijjBFOfPKGLkAhJ9xxF
+						sy1XhBPSaXCZ5wcfM86ZkmqjXauR90JwxDAciPorYV19BvHdFBVw0/7VAgMBAAGj
+						WjBYMDcGA1UdEQQwMC6CLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21w
+						dXRlLmludGVybmFsMB0GA1UdDgQWBBTcWEhiwHcbivBKw8bU1P5X912UljANBgkq
+						hkiG9w0BAQUFAAOCAQEAu9c6LYR9f4jCqfjUG+8aQohiqU4MYv9BWsTCchaEsjTX
+						TkbJP9r9G9ftc1eLUh9Ct8A4kKpk2qmb5dGYYn15YicvgTy1oS6foqck5IEmUllQ
+						pfw4r2O4rnTNaEKugxHrh9MTjy5aNOBAzJiLzz8Yy7kbVahaZJSloZySUeyLCbKh
+						OYvUnue1d7biTwQccRE7zMqTLO2B07KUzLVV75zhNIEeZlStQ0ubRBM7qmq52Jgh
+						LzDYGo/doin3Q2xtR/QRMHtxbxh1EFsRbPKbGjp89sNBrGI+RxE6SLb22dD7sy/m
+						5S4VgGuIjXcu5pGhndoGHXSmeg3DLMKSrmrkJUcNQg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://live.digitaltheatreplus.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 (setup site)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.live.digitaltheatreplus.vualto.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/beta.hp.pub2web.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/beta.hp.pub2web.ingenta.com-shibboleth.xml
new file mode 100644
index 00000000..a51eadb9
--- /dev/null
+++ b/swamid-interfederations-2.0/beta.hp.pub2web.ingenta.com-shibboleth.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.hp.pub2web.ingenta.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-18T12:18: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">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDiDCCAnCgAwIBAgIEUxEfCDANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
+						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEPMA0GA1UECxMGT25saW5lMR4wHAYD
+						VQQDExVQdWJsaXNoaW5nIFRlY2hub2xvZ3kwHhcNMTQwMjI4MjM0MzA0WhcNMTcw
+						MjI3MjM0MzA0WjCBhTELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJl
+						MQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNVBAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9n
+						eTEPMA0GA1UECxMGT25saW5lMR4wHAYDVQQDExVQdWJsaXNoaW5nIFRlY2hub2xv
+						Z3kwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtKdKPdmVZXkJajIXP
+						oD1MM4HDgaXr6DWwK3MCvhwAG4X7jXeP4TZ3UPM9VqAk1BywDFJ4ZKVvkVMJaavp
+						6CUcidSkba9FXEoxbcRmLinw9CIDyqrczOtTrh8Y0VlVUJWus2QCDZDjSghN6ZyF
+						R6tu9skOgnNTmlM7wZ6OH8wvOgSMgoLHsswqpWb7ZgujYxMXejrZgSGbezYyqD8b
+						4VEgbrwB4pGpZHmH9BQ3ozNIcDm/g5XTGm86useupVepZ8NOqfV9NkmAYI0r81L8
+						HsNvWFAtM2gifJLt64rBFgdGZYhKAb3Kr9DlmbarSwwG5gF+R5hdCzXX2z/y7tIC
+						2nYjAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGClcTLi5SJ1ia2FLgQcUy4vFeKx
+						/VmKPKWHFctm46dEccIAvHOOC3zCXOOHfCRZrR/pMVCfE9UnzvPIl1fRtm79SuxX
+						FjEs7GhibW9ALm1Yh2YVnGGaq7U1aO4kU3MJ9SBwZT4uXhbGRNdnUyyjPxQ7jrfO
+						R0GLxZfF8MvKnosafmF3d4ivcP/xzgmVtBG9WRZHASHfIfB8qAZXBLOLuDvDFVC6
+						29SPjnnodhSdRI0xaxAKOR0t1I0ljwDWroMrmDgVbAzdO4YaebiEj32qXoc8qF93
+						Bx+vY4qK5b2wm4W9P5WUTb2rM/ujSu26EkUZlP6uamM5xHaEBGAm2bixC9Q=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDiDCCAnCgAwIBAgIEUxEfCDANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
+						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEPMA0GA1UECxMGT25saW5lMR4wHAYD
+						VQQDExVQdWJsaXNoaW5nIFRlY2hub2xvZ3kwHhcNMTQwMjI4MjM0MzA0WhcNMTcw
+						MjI3MjM0MzA0WjCBhTELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJl
+						MQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNVBAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9n
+						eTEPMA0GA1UECxMGT25saW5lMR4wHAYDVQQDExVQdWJsaXNoaW5nIFRlY2hub2xv
+						Z3kwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtKdKPdmVZXkJajIXP
+						oD1MM4HDgaXr6DWwK3MCvhwAG4X7jXeP4TZ3UPM9VqAk1BywDFJ4ZKVvkVMJaavp
+						6CUcidSkba9FXEoxbcRmLinw9CIDyqrczOtTrh8Y0VlVUJWus2QCDZDjSghN6ZyF
+						R6tu9skOgnNTmlM7wZ6OH8wvOgSMgoLHsswqpWb7ZgujYxMXejrZgSGbezYyqD8b
+						4VEgbrwB4pGpZHmH9BQ3ozNIcDm/g5XTGm86useupVepZ8NOqfV9NkmAYI0r81L8
+						HsNvWFAtM2gifJLt64rBFgdGZYhKAb3Kr9DlmbarSwwG5gF+R5hdCzXX2z/y7tIC
+						2nYjAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGClcTLi5SJ1ia2FLgQcUy4vFeKx
+						/VmKPKWHFctm46dEccIAvHOOC3zCXOOHfCRZrR/pMVCfE9UnzvPIl1fRtm79SuxX
+						FjEs7GhibW9ALm1Yh2YVnGGaq7U1aO4kU3MJ9SBwZT4uXhbGRNdnUyyjPxQ7jrfO
+						R0GLxZfF8MvKnosafmF3d4ivcP/xzgmVtBG9WRZHASHfIfB8qAZXBLOLuDvDFVC6
+						29SPjnnodhSdRI0xaxAKOR0t1I0ljwDWroMrmDgVbAzdO4YaebiEj32qXoc8qF93
+						Bx+vY4qK5b2wm4W9P5WUTb2rM/ujSu26EkUZlP6uamM5xHaEBGAm2bixC9Q=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.hp.pub2web.ingenta.com/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.hp.pub2web.ingenta.com/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Publishing Technology plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NUMÉRIQUE PREMIUM</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://beta.hp.pub2web.ingenta.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:info@numeriquepremium.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hatim</md:GivenName>
+    <md:SurName>Ghadiyali</md:SurName>
+    <md:EmailAddress>mailto:openathens@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.ingentaconnect.com-shibboleth.xml b/swamid-interfederations-2.0/beta.ingentaconnect.com-shibboleth.xml
new file mode 100644
index 00000000..948c4738
--- /dev/null
+++ b/swamid-interfederations-2.0/beta.ingentaconnect.com-shibboleth.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.ingentaconnect.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-04T07:58:03Z"/>
+  </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>
+						MIIDgjCCAmqgAwIBAgIET/MHUjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxIjAgBgNV
+						BAoTGVB1Ymxpc2hpbmcgVGVjaG5vbG9neSBwbGMxFDASBgNVBAsTC0VuZ2luZWVy
+						aW5nMRIwEAYDVQQDEwlEYXZlIExvcmQwHhcNMTIwNzAzMTQ1MzA2WhcNMjIwNzAx
+						MTQ1MzA2WjCBgjELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8w
+						DQYDVQQHEwZPeGZvcmQxIjAgBgNVBAoTGVB1Ymxpc2hpbmcgVGVjaG5vbG9neSBw
+						bGMxFDASBgNVBAsTC0VuZ2luZWVyaW5nMRIwEAYDVQQDEwlEYXZlIExvcmQwggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3TelmPlKuuvssdQAwiYe7uOLU
+						pUBVXEcrlGWoPvOSysS4U6WJtc0EOChAF6VJu7SAy5D8IaiQOZZAfEAaQ+aqz1Of
+						Rj41U4U+q1yZPaccZCkq8q/SYhk22RKKbJpX5UJOK+4oD50GAO7ZzpbVrC8UNkkE
+						PtW15cg/Lx6n8NRfmJ2HB1CJMzGbTwUXMddkEfrCP/M/WItKuSUeUEjqzIK2VtY8
+						h1o+5Ha+mHpKyzBbxXhCzMa18xNtaDb1Rta39rdptQO5CilZMGaCyqJ9kVZE7XOP
+						XncH5VAWCTl6DVo3cTXAvir/ZwoZ86wp4+Q02qwxCt4LW9sj7dQpCcug5b9/AgMB
+						AAEwDQYJKoZIhvcNAQEFBQADggEBAFvaylkmAH2wnYXRl38TNq6NwIeQn1+p/6Lk
+						u98Z2E1gHJ2A5Y33Cgnq1a0RC1UrZrtYhKOHkvl1Et+RJOZRglAw/k4YodkMHlXC
+						LH2xxhcqGLLxxkgPihgBI7Cgl3JugRdXHUmClvGFwwGt0D/LqlNmlcr72NzwbeVK
+						epNHefzYvre2zPvJSm3YziYiCFLa8Ow2Puhrv0y+4dQzvjhN5+gvQmVB9QZuF8dO
+						txCKDafJqBvfACf2ZBKu5oNMcqGjYM6+I3TAtKXfygCFjFckXO9AAQBPwFdjn8zg
+						/wG1wsbpEf5/5YzR/qYCmWkTdHpry0ZqW3h9GTfxKan7eDF3A34=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.ingentaconnect.com/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.ingentaconnect.com/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Publishing Technology plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">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>Dave</md:GivenName>
+    <md:SurName>Lord</md:SurName>
+    <md:EmailAddress>mailto:Dave.Lord@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.jbep.pub2web.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/beta.jbep.pub2web.ingenta.com-shibboleth.xml
new file mode 100644
index 00000000..1e2c8d41
--- /dev/null
+++ b/swamid-interfederations-2.0/beta.jbep.pub2web.ingenta.com-shibboleth.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.jbep.pub2web.ingenta.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-13T11:58:04Z"/>
+  </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>
+						MIIDnDCCAoSgAwIBAgIET9muujANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
+						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
+						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEyMDYxNDA5
+						MjgyNloXDTIyMDYxMjA5MjgyNlowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
+						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
+						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
+						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBALdlro4BqkngGPKxtdYlzdp8E/fzI7nO4GVKVT4U3l+Ca8BelmRE1Bzj
+						aLBFqgdHCyVWTMGUZ/pUgmjgiV4Wqsy4GgZoXWkbcrc3S6nIYqZRXXD4nYPoeDvG
+						0wx0OfW6Ok9kcRQOgD7WwsXULBzqCP4FDS/HAUEMfh2n3zGJmR13zilNwI+mvDmi
+						3U90Kf6Goy3zjsuYjs/TXUICkDMWhRjAy3bRkERmnMJkYzbiqJg+vY5syM3daoAp
+						2Wf117nSkc7AbnZenavvqBDzvG4sz28VsGYpNIK5pN0KGfdbsRp7IN5Cn4Io7qgl
+						ynHOMQy0r5Pnwmy2mfyMZyAapYwN6fkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						q1DLlahfHpI88T0dVIZZUwvl3gPUPWwf44f6KgvuZgEr37Uxlft8gi4U4ihiWVlC
+						FlAXbQ6VxkIesG3ZJ4vhgC7NxPK+7pETtWrKgjkkyinCQ0pJnZbt9nL4vGjMO65q
+						yp1HReMDYYX/W2V0VPetNM7ewcqgi20kr8QE8nxRMmDxpMSPvJPfL7JN9rv4sqZr
+						oB1kB6VUHwDq+YF+yiSJb76lZsluQZPubqgCIAiUvByFLscndx0akdWbYnsS1iqD
+						1MxfWdyMseGkwVcSkhrBod7rzUZbecaQtHRPyZGijv/RPcwSCod39wX1p1/2dkBT
+						cpGuu5JrXAFJ/o31SeELng==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.jbep.pub2web.ingenta.com/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.jbep.pub2web.ingenta.com/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Publishing Technology plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">John Benjamins Publishing Company beta</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>Talvinder</md:GivenName>
+    <md:SurName>Matharu</md:SurName>
+    <md:EmailAddress>mailto:openathens@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.lawtel.com-oa-metadata.xml b/swamid-interfederations-2.0/beta.lawtel.com-oa-metadata.xml
new file mode 100644
index 00000000..448a416e
--- /dev/null
+++ b/swamid-interfederations-2.0/beta.lawtel.com-oa-metadata.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.lawtel.com/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-13T15:40:44Z"/>
+  </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>
+						MIIDZzCCAk+gAwIBAgIJAI1Uwq7I6bpMMA0GCSqGSIb3DQEBBQUAMCsxDzANBgNV
+						BAoTBkxhd3RlbDEYMBYGA1UEAxMPYmV0YS5sYXd0ZWwuY29tMB4XDTEyMDMwMjA4
+						NTEzOVoXDTIyMDIyODA4NTEzOVowKzEPMA0GA1UEChMGTGF3dGVsMRgwFgYDVQQD
+						Ew9iZXRhLmxhd3RlbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCxEgaufApwXsEAPskvBtI41FSV/q4gDprwIlB6BZYABV2ZSVa3slVq0x/kvnH7
+						WkV8rgpkSMVW6cDUQruNRvI0aoMl+1UaIrVEEN+CIxdWvnPlCiOrzapwGJ52cKMe
+						0xcUVnZiPaBoaR+JQO9M07Q7decSF910M4w0AaWaj/ELyU5qIPjdRJIpMlpG0DVq
+						jKljU+mfaxyZ9DG3r5nk8G8ajaFhg4pQAJMp/pis7s2CreP1T4+dxIpOVpjysCmL
+						glb3WYt0tsslJkVya3q2SMR1qi8F2RtKu973mgS+EEXF5afl5xA4SW6N8u2/EnQT
+						r8U/r5QaJDVixBYSMFWrnWB1AgMBAAGjgY0wgYowHQYDVR0OBBYEFLsFufpV+fZJ
+						k/h+DX4S+LxiDHCkMFsGA1UdIwRUMFKAFLsFufpV+fZJk/h+DX4S+LxiDHCkoS+k
+						LTArMQ8wDQYDVQQKEwZMYXd0ZWwxGDAWBgNVBAMTD2JldGEubGF3dGVsLmNvbYIJ
+						AI1Uwq7I6bpMMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGXQukuo
+						d33p2sDND2tkiWr4un7NXMe6oB5vS3AQEKvc6TEq5qRheZfpKzjbshcRqCDy1lHh
+						AKz779DDPPmh/0nhQMdi1NvbIGYshKgeus7JskhIZWLhuohKncsmuOq77Ojb4/T6
+						JqOWqSOzKdhguviaJiibb6GgBmTBLH5AHpbD5GEtyFdaH42HCK5DM3x1H15JM+5M
+						GPzgwXMbtYQ8AFsxGZvbVfK/YwHx36Z3Tn/cPZM93U2bQY/mjiAjhgoqiuyJJ1bB
+						wJZC0VQskEP1pPdAWJpI4EbOwUxSEHENXdKb1dXvMcYY+dK1O9vHLfXJXkbBGE2E
+						l2hv92HcUJJF5Ug=
+					</ds:X509Certificate>
+        </ds: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+gAwIBAgIJAI1Uwq7I6bpMMA0GCSqGSIb3DQEBBQUAMCsxDzANBgNV
+						BAoTBkxhd3RlbDEYMBYGA1UEAxMPYmV0YS5sYXd0ZWwuY29tMB4XDTEyMDMwMjA4
+						NTEzOVoXDTIyMDIyODA4NTEzOVowKzEPMA0GA1UEChMGTGF3dGVsMRgwFgYDVQQD
+						Ew9iZXRhLmxhd3RlbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCxEgaufApwXsEAPskvBtI41FSV/q4gDprwIlB6BZYABV2ZSVa3slVq0x/kvnH7
+						WkV8rgpkSMVW6cDUQruNRvI0aoMl+1UaIrVEEN+CIxdWvnPlCiOrzapwGJ52cKMe
+						0xcUVnZiPaBoaR+JQO9M07Q7decSF910M4w0AaWaj/ELyU5qIPjdRJIpMlpG0DVq
+						jKljU+mfaxyZ9DG3r5nk8G8ajaFhg4pQAJMp/pis7s2CreP1T4+dxIpOVpjysCmL
+						glb3WYt0tsslJkVya3q2SMR1qi8F2RtKu973mgS+EEXF5afl5xA4SW6N8u2/EnQT
+						r8U/r5QaJDVixBYSMFWrnWB1AgMBAAGjgY0wgYowHQYDVR0OBBYEFLsFufpV+fZJ
+						k/h+DX4S+LxiDHCkMFsGA1UdIwRUMFKAFLsFufpV+fZJk/h+DX4S+LxiDHCkoS+k
+						LTArMQ8wDQYDVQQKEwZMYXd0ZWwxGDAWBgNVBAMTD2JldGEubGF3dGVsLmNvbYIJ
+						AI1Uwq7I6bpMMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGXQukuo
+						d33p2sDND2tkiWr4un7NXMe6oB5vS3AQEKvc6TEq5qRheZfpKzjbshcRqCDy1lHh
+						AKz779DDPPmh/0nhQMdi1NvbIGYshKgeus7JskhIZWLhuohKncsmuOq77Ojb4/T6
+						JqOWqSOzKdhguviaJiibb6GgBmTBLH5AHpbD5GEtyFdaH42HCK5DM3x1H15JM+5M
+						GPzgwXMbtYQ8AFsxGZvbVfK/YwHx36Z3Tn/cPZM93U2bQY/mjiAjhgoqiuyJJ1bB
+						wJZC0VQskEP1pPdAWJpI4EbOwUxSEHENXdKb1dXvMcYY+dK1O9vHLfXJXkbBGE2E
+						l2hv92HcUJJF5Ug=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.beta.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.beta.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.beta.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.beta.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">Lawtel</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://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="support">
+    <md:GivenName>Jag</md:GivenName>
+    <md:SurName>Patara</md:SurName>
+    <md:EmailAddress>mailto:jagvir.patara@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <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>Jag</md:GivenName>
+    <md:SurName>Patara</md:SurName>
+    <md:EmailAddress>mailto:jagvir.patara@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.projecteuclid.org-shibboleth-sp.xml b/swamid-interfederations-2.0/beta.projecteuclid.org-shibboleth-sp.xml
new file mode 100644
index 00000000..bdea9034
--- /dev/null
+++ b/swamid-interfederations-2.0/beta.projecteuclid.org-shibboleth-sp.xml
@@ -0,0 +1,95 @@
+<?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://beta.projecteuclid.org/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-17T14:15: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://beta.projecteuclid.org/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://beta.projecteuclid.org/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://beta.projecteuclid.org/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://beta.projecteuclid.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>
+						MIIDNjCCAh6gAwIBAgIJANq1a2ZDBykIMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
+						BAMTJXNmLWxpYi1hcHAtMDA4LnNlcnZlcmZhcm0uY29ybmVsbC5lZHUwHhcNMTMw
+						NTMxMTUwNjIyWhcNMjMwNTI5MTUwNjIyWjAwMS4wLAYDVQQDEyVzZi1saWItYXBw
+						LTAwOC5zZXJ2ZXJmYXJtLmNvcm5lbGwuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAs3Hxfw7oGscg+A30MSnTHdbuukajMhIlCtrm+bfsayPDApUE
+						QLxW643U876lLNxMA5wmU0NV07gjj87yqv7ECGPLq95tIoTcTzI0MXLr8s3GTzwT
+						M9N0LEWdp37CRH2kgvYA3Cf5Oba8FxpEDHgc6rzAc2LccucdpWvi8Zon9OLZuEsH
+						qAjQlfIeuSB7YIe6z2/7VbZM9CcAb80cwYButlqMdIOcS7jBqofGq9YvovXJr7F0
+						vEXJtiL7fW28Lmv2SHdS2mL/34ud2fj5CEDaXAzKWCiDR0L7a1qYNW7upxD+w6no
+						rDAYfWrO8E6mcXv1d8P1JKLzsaZKopsuHE3BtQIDAQABo1MwUTAwBgNVHREEKTAn
+						giVzZi1saWItYXBwLTAwOC5zZXJ2ZXJmYXJtLmNvcm5lbGwuZWR1MB0GA1UdDgQW
+						BBSu8boXmoNWqSqD0y4uSmiE8p1EHzANBgkqhkiG9w0BAQUFAAOCAQEAQXOGXl4Y
+						fTXnrJQuD1xaOmLgUkLpN4eq89OisGTsdefpvAJ1SD6QSaIj1UFchfQ6Qb4vK2Fp
+						E1Ss6sZNU0rCE/C1EpQplAkQve8+IhQdIOQM7B/Yp4lHWd+3snJLF+fmIczVu9DB
+						odqQ2YbmpxPDBzZMRAIppajebSXLz2r65Uj8+cB28v4WhCt7v/T3M8w4h591pePO
+						xW2fpyIqGsGpuVRd2EOkYGmm7nqrAH9WGyUsRT1YHFY25mjgExVPYpah7eTsNYql
+						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://beta.projecteuclid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.projecteuclid.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta.projecteuclid.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.projecteuclid.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.projecteuclid.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.projecteuclid.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://beta.projecteuclid.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.projecteuclid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://beta.projecteuclid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.projecteuclid.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.projecteuclid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Project Euclid -- TEST</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 -- TEST</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:EUCLID-TECH-L@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/beta.shib.manchester.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..ae0e4af1
--- /dev/null
+++ b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk-shibboleth.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.shib.manchester.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-06T16:24: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>
+      <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">The University of Manchester (Beta)</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>
+						MIIEgjCCA2qgAwIBAgIRAO3e2IFUJk3Dd0HJQF3ZKBUwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xNDA0MjQwMDAwMDBaFw0xNzA0MjMyMzU5NTlaMEgxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEjMCEGA1UEAxMaYmV0YS5zaGli
+						Lm1hbmNoZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC7j0ZmPbM3J6dknUGo1FQF1QZP10Bitu67DJPczwy8WYSqXBhTQ3F7HIVNLAVH
+						geMs/ZfGi7ct3d5HBPyg84rcPRHXjfgWOFnokwUxcI7ZEIooUc7wtNk1LZ/89mzR
+						A4icZm+w7XCatdkYTSFQR6SN6n9mWDGMY//H7KDBwLxbqA0UfFIrmGwhW1kjnoaL
+						J3PTl2I8dXYNKXnvsZxtJM1n9XwGSlU7YipLhyjlyQ35JAXs1qeAtXYRNFTjV2Gx
+						EXjhejs9XrXNb0w8Gvv3iKwxzK8WWVFXh0udsKoeb/r84o98jDiDoSap9Lo5qDsJ
+						kIJd5dYCaP40h3qQHpFJiL7FAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
+						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUZIEkV81JvNOr4jmDXZhTgfg+MFQw
+						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCUGA1UdEQQeMByCGmJldGEuc2hp
+						Yi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQC7+XD/MdO9ubLu
+						VRzKDAiKfSGwMwAxOEyijhv2UzOxD3ISxji1UsCHPWXs30woYDgdKBC5WIVD8qYV
+						DszYqyLcRu2mwUtL/He30t8XqFZj4Y9R9faP+0321G1vn61SiUXe+c81reveIy5y
+						p8sry9f/ENJJpXNEEllrmi15TW32kSNAjoyV7OFiI1QAdfypeX2oAkyeL504UvZe
+						CYUUMyN2JAp7PTGI7WkP72AZFSMxzUZCj9UteUkKYMEXfOiKvqp6MEPSTNLVrXHn
+						HETktGDZoR6CEfyI6TGfxD6muKXhDZvFEm1t3z/Lc3mtZT0MSRwzcmQf/I27UnlD
+						rjZU5UPE
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beta.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://beta.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://beta.shib.manchester.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.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://beta.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://beta.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>
+						MIIEgjCCA2qgAwIBAgIRAO3e2IFUJk3Dd0HJQF3ZKBUwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xNDA0MjQwMDAwMDBaFw0xNzA0MjMyMzU5NTlaMEgxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEjMCEGA1UEAxMaYmV0YS5zaGli
+						Lm1hbmNoZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC7j0ZmPbM3J6dknUGo1FQF1QZP10Bitu67DJPczwy8WYSqXBhTQ3F7HIVNLAVH
+						geMs/ZfGi7ct3d5HBPyg84rcPRHXjfgWOFnokwUxcI7ZEIooUc7wtNk1LZ/89mzR
+						A4icZm+w7XCatdkYTSFQR6SN6n9mWDGMY//H7KDBwLxbqA0UfFIrmGwhW1kjnoaL
+						J3PTl2I8dXYNKXnvsZxtJM1n9XwGSlU7YipLhyjlyQ35JAXs1qeAtXYRNFTjV2Gx
+						EXjhejs9XrXNb0w8Gvv3iKwxzK8WWVFXh0udsKoeb/r84o98jDiDoSap9Lo5qDsJ
+						kIJd5dYCaP40h3qQHpFJiL7FAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
+						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUZIEkV81JvNOr4jmDXZhTgfg+MFQw
+						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCUGA1UdEQQeMByCGmJldGEuc2hp
+						Yi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQC7+XD/MdO9ubLu
+						VRzKDAiKfSGwMwAxOEyijhv2UzOxD3ISxji1UsCHPWXs30woYDgdKBC5WIVD8qYV
+						DszYqyLcRu2mwUtL/He30t8XqFZj4Y9R9faP+0321G1vn61SiUXe+c81reveIy5y
+						p8sry9f/ENJJpXNEEllrmi15TW32kSNAjoyV7OFiI1QAdfypeX2oAkyeL504UvZe
+						CYUUMyN2JAp7PTGI7WkP72AZFSMxzUZCj9UteUkKYMEXfOiKvqp6MEPSTNLVrXHn
+						HETktGDZoR6CEfyI6TGfxD6muKXhDZvFEm1t3z/Lc3mtZT0MSRwzcmQf/I27UnlD
+						rjZU5UPE
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beta.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://beta.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">The University of Manchester (Beta)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:IT-Servicedesk@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sam</md:GivenName>
+    <md:SurName>Jones</md:SurName>
+    <md:EmailAddress>mailto:sam.jones@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.sketchengine.co.uk-entity.xml b/swamid-interfederations-2.0/beta.sketchengine.co.uk-entity.xml
new file mode 100644
index 00000000..c64c1dde
--- /dev/null
+++ b/swamid-interfederations-2.0/beta.sketchengine.co.uk-entity.xml
@@ -0,0 +1,93 @@
+<?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://beta.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: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://beta.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 Beta</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="60" width="180">https://beta.sketchengine.co.uk/media/img/sketch_engine_beta_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>
+						MIIDDzCCAfegAwIBAgIJALdQBYI2gURnMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHRvYWQxLnNrZXRjaGVuZ2luZS5jby51azAeFw0xMjAyMTYxMDA2NTRaFw0y
+						MjAyMTMxMDA2NTRaMCMxITAfBgNVBAMTGHRvYWQxLnNrZXRjaGVuZ2luZS5jby51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJj9g9mNJt+syu5Hypi1
+						O7ozROE636f82MkvcGq3O49jW+lXaXa0TrdI6ZyWQWQQffObnp+UTI8Dy8dJPeJK
+						q0yolm/V4RGnVz9sOYOT89vk1dYNmYTCkCEPvr28O9tnNrGVm+Y1GbMN/Ng1Hy1z
+						0+Jw83Igqu9kZAxBxT9buBJL+1yag+f8fqL0Xh4siHHRIS20jnNWzI0sZoH4JLXA
+						L/t9xQazOawCXDqgMwaybWCp2pi/GLkgktcXJFSOjivMnivwM6XUOr1RJ/7v5NXZ
+						TbQiIDxOw+ur3lJaPi/04eWBTzrmLZLB/CZ+8xgG+umkMZhTF/jQTFqA3i64IDBq
+						czsCAwEAAaNGMEQwIwYDVR0RBBwwGoIYdG9hZDEuc2tldGNoZW5naW5lLmNvLnVr
+						MB0GA1UdDgQWBBTNszRhd97yo6rn4dsxJ4CO8ooO3zANBgkqhkiG9w0BAQUFAAOC
+						AQEAZJVCs/BF3pLJxr/EgySFE0T8n2yjWRvgsrxms8dovhm7IClLWjVubK87iOao
+						EyrLhKF8nlh8xX9SJQ7UVCkeK7m1X3mjx5lByKtbr/3mG+SJqCkBrG2neolJ0GRi
+						cGEDCLN9HPVhKPPwlKh2TJ/jx/orZsBw2H6rZnwh9t5kspTzzvoQ4dfjg/B1EL6B
+						PPwBUVBmaVzBxX1ZWIS78lHNNgynmPpcGpuhoxUzFYnc/hLuN14QALUbuad+iXWN
+						R5xEvTb1qWIm+zCyONzG6xmjd18ox6m/YD6wTh2+7u0AhB+XA15AmvkfPdJyjdmg
+						bpeg/CjdpV3/Q6Imu6H2cEHjkw==
+					</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://beta.sketchengine.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.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://beta.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://beta.sketchengine.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.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 Beta</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/beta.telford.icebox.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/beta.telford.icebox.ingenta.com-shibboleth.xml
new file mode 100644
index 00000000..c3943b69
--- /dev/null
+++ b/swamid-interfederations-2.0/beta.telford.icebox.ingenta.com-shibboleth.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.telford.icebox.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>
+						MIIDkjCCAnqgAwIBAgIETFGlfzANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMCR0IxFDASBgNV
+						BAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNVBAoTFVB1Ymxpc2hpbmcgVGVj
+						aG5vbG9neTEUMBIGA1UECxMLRW5naW5lZXJpbmcxHjAcBgNVBAMTFVB1Ymxpc2hpbmcgVGVjaG5v
+						bG9neTAeFw0xMDA3MjkxNTU5NTlaFw0yMDA3MjYxNTU5NTlaMIGKMQswCQYDVQQGEwJHQjEUMBIG
+						A1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEeMBwGA1UEChMVUHVibGlzaGluZyBU
+						ZWNobm9sb2d5MRQwEgYDVQQLEwtFbmdpbmVlcmluZzEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNo
+						bm9sb2d5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiAlpQC2xBxHxvd+1ZuwZJOYC
+						6qzPu4OwEyEfaF2wvvW7ZV+g3n6k5vy5rioxpo3PAm+6k1wHIFRXYw2Y9a1d/l9yCuKfINFEL7OK
+						+w0i88Yn3hlk1SJX35UYIZeR0PXCyMiP26zJsIGCMayXhq4I117GpfIsKLtkMWmfYuys9+d4O3pY
+						Tgkmh1LA2nvkN5g2cfLaVZe3/k5Jyyt+PMnL44mWq+kYovfcb2oiq5EqhOu8VqHbii20w6aHTzE8
+						wySe1XUTKkY3+cpO3K+raFPJ1sx6lAASkz0lZGNnViMPGoW6yCULSO7lccXvwyVdLfK5MpD2YMrF
+						Av4K40FJl546IQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB3ZTLOK/A2AuF+rHi1HRHeav8FPYsJ
+						jNmyrmydsXuB21ddn73s1nJN3YyiJzz2cvQdDm0BdnsZYoeWUCZsHn4EkP886dzh9OYocnzEVJng
+						wfiSIWbeWSnYywBr0usYCmzlYVkztYLy72Vrl6tT4DG4zmspJMyAbXQXejKapYBISBG/hNpIrEfB
+						jYAoXmaKvE4FLfPIVoicJ4Tk6SVlg4ug2hE3s2iTOf7IfljN+n3W18aqHGzEnps8gcTEhjZLsLsb
+						YXxkXUmLqybv+VPGhrtigrFlpZ1vN5/dpocApTcBSIa6glQaIFYTDj7DCQwiaMd3mnJPeNXY0oAw
+						+orBTWvf
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.telford.icebox.ingenta.com/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.telford.icebox.ingenta.com/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Publishing Technology plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Publishing Technology: ICE Virtual Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.icevirtuallibrary.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Librarians</md:GivenName>
+    <md:EmailAddress>mailto:librarians@icevl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hatim</md:GivenName>
+    <md:SurName>Ghadiyali</md:SurName>
+    <md:EmailAddress>mailto:Hatim.Ghadiyali@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/betawww.itslearning.com-shibboleth.xml b/swamid-interfederations-2.0/betawww.itslearning.com-shibboleth.xml
new file mode 100644
index 00000000..613d67e0
--- /dev/null
+++ b/swamid-interfederations-2.0/betawww.itslearning.com-shibboleth.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://betawww.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>
+						MIIDUDCCAjigAwIBAgIJAIpqSMSevorFMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+						BAMTHmJldGF3d3cuZWxvZ2luLml0c2xlYXJuaW5nLmNvbTAeFw0xMTAyMTgxMzA4
+						NDJaFw0yMTAyMTUxMzA4NDJaMCkxJzAlBgNVBAMTHmJldGF3d3cuZWxvZ2luLml0
+						c2xlYXJuaW5nLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPTk
+						Ku1qar6Ni1aG1x1JwjJUvGbSJOP7N0b7yw9ybzzOiq3vEnZXtIgAsb01YlC3nzqW
+						6qJ5iE/lKKg289oySLPrwGAIecPWMyD3n8ADy5fc/hn18rD7rmcsY/zBHaj1xSbl
+						Lg8YtD7hKCQ8KtyicEFR35CwGPEMosDm5eoih9uxkjlDGqvpIPsaCxLEu3QaGDut
+						7otZLtgmfDrYx7L0bUFfk4vXI3ylvN3FZCy2f3RvPizDGPKTYiDCtq7KWTrmy3r8
+						Qupk3loopZ77VQ9zwyawvrJaRn/k0OwENWRQpH02qrC/uAwwmCK0sPp0Lsw5CAbV
+						bTWb777CvWdZaLQE1LcCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0E
+						HxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFHUyplId
+						19IQi+iRVHhSm3VWjucpMB8GA1UdIwQYMBaAFHUyplId19IQi+iRVHhSm3VWjucp
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCUTWhvAerxQ33duwkc6iRNTgTrD/ftSKF6IL9F
+						+gGK7SQT8K/cuq5qgGd21zld3qb6KDBB3YAxIXqaOTMWYQF42IbpXufXUwiquUlZ
+						wEgTIBQkNTmnw7MxxG/5RZ85Os1PafXeXj1G4CFCxS8uSxO7q3VR8H4gA4RU/g/6
+						ICTS8fAaNnZguQiZKyJyiNLPUiMdWuPvQLwodRa1HqzdJHYGhvtjTnoS3MCmTxAb
+						/YTTrd+fRL4ZchK28dRbofcdGPgDbrN0ZeUh0ywt2/EUW3s3J29rBakXU53pPn+F
+						Cksvz2qqJnZqqE98f/5ecjEUxWxkZ7Kgs1t+yGDOkmvRK3+p
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://betawww.itslearning.com/elogin/logout.aspx"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://betawww.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: beta</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.itslearning.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Aunkher</md:GivenName>
+    <md:SurName>Sidhu</md:SurName>
+    <md:EmailAddress>mailto:aunkher.sidhu@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sukesh</md:GivenName>
+    <md:SurName>Nischal</md:SurName>
+    <md:EmailAddress>mailto:sukesh.nischal@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bfas.scran.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bfas.scran.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..cc6866d9
--- /dev/null
+++ b/swamid-interfederations-2.0/bfas.scran.ac.uk-shibboleth.xml
@@ -0,0 +1,117 @@
+<?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://bfas.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:42: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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Books for All Scotland</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Books for All Scotland provides accessible books to support pupils who have difficulty with ordinary printed text.</mdui:Description>
+        <mdui:Logo height="64" width="180">https://shib.scran.ac.uk/images/logo-bfas.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shib.scran.ac.uk/images/icon-bfas.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/DS/UKFederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/DS/UKFederation" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/glow"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/DS/UKFederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/DS/UKFederation" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/glow"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					MIIEpzCCA4+gAwIBAgIJAJr9uyuwy/Y2MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
+					VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEP
+					MA0GA1UEChMGUkNBSE1TMQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jh
+					bi5hYy51azEkMCIGCSqGSIb3DQEJARYVd2ViYWRtaW5zQHNjcmFuLmFjLnVrMB4X
+					DTEwMDIyMjExNDU1OVoXDTIwMDIyMDExNDU1OVowgZMxCzAJBgNVBAYTAkdCMREw
+					DwYDVQQIEwhTY290bGFuZDESMBAGA1UEBxMJRWRpbmJ1cmdoMQ8wDQYDVQQKEwZS
+					Q0FITVMxDjAMBgNVBAsTBVNjcmFuMRYwFAYDVQQDDA0qLnNjcmFuLmFjLnVrMSQw
+					IgYJKoZIhvcNAQkBFhV3ZWJhZG1pbnNAc2NyYW4uYWMudWswggEiMA0GCSqGSIb3
+					DQEBAQUAA4IBDwAwggEKAoIBAQDEywuow7F7KjwlfTa4vj/2QWvtexIy+OO0hWvn
+					SJ8B3goDjqaC7Mv1fNJdxtZMl/kR6ZfMT86Xa2VfK47NOe14jJDgZxN/0lbwsLwb
+					GyyxcZeDg0NCcv/jFKUiH6m2jSLkpSrSTHuUqRUhGpR0wcr3+HZjLZrpHI0FQ5EH
+					cnkhg1fYwZ5Z6vth+0NhZt9HjWLrUtia4Bj0orj0MkUAKlGEBudrPsC/OITO9oUp
+					pXV0PBi0hILJdbgeJXDFhxfcEpCczQlQgdx/KWD6q/6nSOmT9hNGMjkiprn/w/q1
+					SsAMRqSfrWrR6q8hWTkWmNsm/c39bJFuMvkfkiOgvvBVqE3nAgMBAAGjgfswgfgw
+					HQYDVR0OBBYEFG8UIQ7Hc9WHtlS6PKYYP/7RWNcrMIHIBgNVHSMEgcAwgb2AFG8U
+					IQ7Hc9WHtlS6PKYYP/7RWNcroYGZpIGWMIGTMQswCQYDVQQGEwJHQjERMA8GA1UE
+					CBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEPMA0GA1UEChMGUkNBSE1T
+					MQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jhbi5hYy51azEkMCIGCSqG
+					SIb3DQEJARYVd2ViYWRtaW5zQHNjcmFuLmFjLnVrggkAmv27K7DL9jYwDAYDVR0T
+					BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAWSSnSaVz28lDBISUNRmNJFwKvjo5
+					nC4+WM7h6Tg9QbC/EYNCwkH7bOoEcCJs28jn0EwRfn4GUgc1LFkf9UYc3rJ+mihD
+					+RZDHjaJSZDbQgZI55y8dpuYT8r70rCg+xtq1Iwv0NzcM+Q/3cEeiMlIXY6YFAAA
+					Dsp1/4NlItMUs6ZwAyMLjyIlSjIHjTVLI2bRTDlY4nUgZhqz4spvqDtnmq7PERUN
+					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/bfas/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/bfas/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/bfas/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scran.ac.uk/bfas/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/bfas/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/bfas/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scran.ac.uk/bfas/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/bfas/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/bfas/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/bfas/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/bfas/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/bfas/Shibboleth.sso/SAML2/Artifact" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.scran.ac.uk/bfas/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/bfas/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/bfas/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">Books For All Scotland</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.booksforallscotland.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/bham-primo-stg.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/bham-primo-stg.hosted.exlibrisgroup.com-shib.xml
new file mode 100644
index 00000000..617010e8
--- /dev/null
+++ b/swamid-interfederations-2.0/bham-primo-stg.hosted.exlibrisgroup.com-shib.xml
@@ -0,0 +1,87 @@
+<?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://bham-primo-stg.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-10T15:35:18Z">
+      <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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Birmingham - Primo Staging</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the University of Birmingham</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDNjCCAh6gAwIBAgIJALHUut8j1vljMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
+						BAMTJWRjMDN2ZzAxMzZldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTQw
+						MzA0MTUxNTU1WhcNMjQwMzAxMTUxNTU1WjAwMS4wLAYDVQQDEyVkYzAzdmcwMTM2
+						ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA3U1lgEiqNcgQJoV/0YBd0UMvGClU74tsjirUuQe9sSC5Sy5i
+						hRK55O19zxgswnJpjlsc8W7xd0viWQC8TJlJVK0uynKDaEVnnAfN+9st3GRlXIwo
+						w3px9K5dFvrrozI++5iWct7XJP6UXtOyeOKmlrWf0cIo8OZ4+UxoQlJdh80HdQch
+						2CBDII14LyF92xAmndjpHTbN3uCxLwZh3CL+M37NfOJ3KEJy5KEqFD/bGauGkyzL
+						SEyydSGkRgrn1mrKWYVLQX5QOLV3RDUr9GEtDq9H2R1u4fEVa6aGHlXVM/KstYe4
+						gru2K9988PysiuUIvbei6iqj/8roknoS5hajdwIDAQABo1MwUTAwBgNVHREEKTAn
+						giVkYzAzdmcwMTM2ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
+						BBSSMtN87MyD3qLQOMnL8J13o/zLqjANBgkqhkiG9w0BAQUFAAOCAQEAz/NHpExC
+						yRJZLZmY9iWr8XgYGgypyrdzuCK1E24QMmE/vbc3x+E5ZBH1Bw0e5tFSV+rb009z
+						AEEiM3LzzJMIz/ljPLubL+hVginfUHo73vMrDgGLpXfzywadN7fivhr917k+A7Dy
+						g9Wg6fwYKq7UktfwKRapt98ZO+LdWc5H5Y/ndu61+5Mhf/sgGrmOw5R5Un0rCNNb
+						nQD5lMBoaQtTeaGNg4gOBsx2pX7fhowUnxhpbI/4jKCqXU9+nMkOJBBZHyopaMFa
+						ZVGTEnum7GNeXpbotWItmn5mHGq/oo7+Q+b+5LwJUN4zvdkTKL3mYqkO+HoYWoLA
+						tnqjDjsk80/doQ==
+					</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://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bham-primo-stg.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://bham-primo-stg.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://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bham-primo-stg.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 Birmingham - Primo Staging</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/biblio.bo.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml
new file mode 100644
index 00000000..065f2a4c
--- /dev/null
+++ b/swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://biblio.bo.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">biblio.bo.cnr.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bo.imm.cnr.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CNR Bologna Research Area</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">CNR Area della Ricerca di Bologna</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for CNR Bologna Research Area users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti del CNR Area della Ricerca di Bologna</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://biblio.bo.cnr.it/info.php?inc=idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://biblio.bo.cnr.it</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://biblio.bo.cnr.it/informativa.php</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVAJbpaoeYyF5GVt7G11oqdFKzTieoMA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEGJpYmxpby5iby5jbnIuaXQwHhcNMTEwNDI5MTU0ODM4
+WhcNMzEwNDI5MTU0ODM4WjAbMRkwFwYDVQQDExBiaWJsaW8uYm8uY25yLml0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgJfFnp7SNaBBZ16ycfHpfG1A
+ZSmbJA1WQnMOkE/3LyHAcwuH4L3pzwZ+c8uHPEgb2XcWHT/ASPvVQ3WadwIhzHKM
+3xaS5Dp30fqlS/lB5jFdEOJaYGqsN0ZLsTH1krYcysm/ToDZ+PVhSCoOgdk6jG/G
+m/nrmnpyNai3uBAhOxugHadmcMGf87+fUz7W1mrqQrB+wHeF+LtogEsi77KcAwid
+snYqc/jQ5jvq2+x7ywlfFmf85aKMeyzfVO/6nXDYIEZaII/CkepegxP1CyqQsnmD
+2Wucrr+ZUo7JhgGFsF8js2vwXSQ/UAMsT+FvTni7QjhXK4jQXuiYrPhgrXKomwID
+AQABo2cwZTBEBgNVHREEPTA7ghBiaWJsaW8uYm8uY25yLml0hidodHRwczovL2Jp
+Ymxpby5iby5jbnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCT+SlxcKK+e
+etAAkTlQJ12HlnKLMA0GCSqGSIb3DQEBBQUAA4IBAQAbJeCTx4ki/AxCDbdFY9ae
+OUe1vwAPSpIKwkh4HgfxTQIYJ6qlgSDJp6tQBxU0kUMEQjVnNSm3wO1ybyAAyY09
+7ozayprctspLrZNnJ6mMac3xkJTKdndUmSaFt5P4iJCsoXAeFfnsbSgJdBmDvmYy
+wrmTmHCBy+x+Bffdkoct4jrEJLzzsegoW3Xef99vdLLUF3eABRkdqNGiSHrWxt4q
+U54oXUKAY4FIYbrat+RdEKwrq3NlApysLNVT2glyptc217T7w0JuMUgwTb3DXyG+
+1nkiY/BGUOL2/+jJkShC/nhoUFPUBy7VmLpTmaYnpLHyvSzFw/eJhmYdtWgOrHnU
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://biblio.bo.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://biblio.bo.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://biblio.bo.cnr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://biblio.bo.cnr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://biblio.bo.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://biblio.bo.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">biblio.bo.cnr.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bo.imm.cnr.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVAJbpaoeYyF5GVt7G11oqdFKzTieoMA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEGJpYmxpby5iby5jbnIuaXQwHhcNMTEwNDI5MTU0ODM4
+WhcNMzEwNDI5MTU0ODM4WjAbMRkwFwYDVQQDExBiaWJsaW8uYm8uY25yLml0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgJfFnp7SNaBBZ16ycfHpfG1A
+ZSmbJA1WQnMOkE/3LyHAcwuH4L3pzwZ+c8uHPEgb2XcWHT/ASPvVQ3WadwIhzHKM
+3xaS5Dp30fqlS/lB5jFdEOJaYGqsN0ZLsTH1krYcysm/ToDZ+PVhSCoOgdk6jG/G
+m/nrmnpyNai3uBAhOxugHadmcMGf87+fUz7W1mrqQrB+wHeF+LtogEsi77KcAwid
+snYqc/jQ5jvq2+x7ywlfFmf85aKMeyzfVO/6nXDYIEZaII/CkepegxP1CyqQsnmD
+2Wucrr+ZUo7JhgGFsF8js2vwXSQ/UAMsT+FvTni7QjhXK4jQXuiYrPhgrXKomwID
+AQABo2cwZTBEBgNVHREEPTA7ghBiaWJsaW8uYm8uY25yLml0hidodHRwczovL2Jp
+Ymxpby5iby5jbnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCT+SlxcKK+e
+etAAkTlQJ12HlnKLMA0GCSqGSIb3DQEBBQUAA4IBAQAbJeCTx4ki/AxCDbdFY9ae
+OUe1vwAPSpIKwkh4HgfxTQIYJ6qlgSDJp6tQBxU0kUMEQjVnNSm3wO1ybyAAyY09
+7ozayprctspLrZNnJ6mMac3xkJTKdndUmSaFt5P4iJCsoXAeFfnsbSgJdBmDvmYy
+wrmTmHCBy+x+Bffdkoct4jrEJLzzsegoW3Xef99vdLLUF3eABRkdqNGiSHrWxt4q
+U54oXUKAY4FIYbrat+RdEKwrq3NlApysLNVT2glyptc217T7w0JuMUgwTb3DXyG+
+1nkiY/BGUOL2/+jJkShC/nhoUFPUBy7VmLpTmaYnpLHyvSzFw/eJhmYdtWgOrHnU
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://biblio.bo.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://biblio.bo.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 Area della Ricerca di Bologna</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CNR Bologna Research Area</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">https://biblio.bo.cnr.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://biblio.bo.cnr.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alessandro</md:GivenName>
+    <md:SurName>Tugnoli</md:SurName>
+    <md:EmailAddress>mailto:biblio-idem@area.bo.cnr.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Silvana</md:GivenName>
+    <md:SurName>Mangiaracina</md:SurName>
+    <md:EmailAddress>mailto:biblio-idem@area.bo.cnr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/biggus.nesc.gla.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/biggus.nesc.gla.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..6d680583
--- /dev/null
+++ b/swamid-interfederations-2.0/biggus.nesc.gla.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://biggus.nesc.gla.ac.uk/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="2013-11-12T11:54: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 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">NeSC SimpleSAML Test SP Organisation</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A test SP running simpleSAMLPHP for federated access to NeSC PHP web applications</mdui:Description>
+        <mdui:Logo height="168" width="190">https://idp.nesc.gla.ac.uk:8444/nescgla.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>
+						MIIEGDCCAwCgAwIBAgIJAL6/1HPmy0WjMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxHjAc
+						BgNVBAoTFVVuaXZlcnNpdHkgb2YgR2xhc2dvdzEYMBYGA1UECxMPVHJ1c3RGYWJy
+						aWNDZXJ0MR4wHAYDVQQDExViaWdndXMubmVzYy5nbGEuYWMudWswHhcNMTMxMTA0
+						MTI1NDM2WhcNMjMxMTAyMTI1NDM2WjCBjDELMAkGA1UEBhMCR0IxETAPBgNVBAgT
+						CFNjb3RsYW5kMRAwDgYDVQQHEwdHbGFzZ293MR4wHAYDVQQKExVVbml2ZXJzaXR5
+						IG9mIEdsYXNnb3cxGDAWBgNVBAsTD1RydXN0RmFicmljQ2VydDEeMBwGA1UEAxMV
+						YmlnZ3VzLm5lc2MuZ2xhLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAqUmwvEs1PilqD3m3tY2ewYnYnLs8M02nXdP0J5SsKsUhvzLnXlpwd3lu
+						tUpuwlmw9rPSt25hQYwuZvrmSAgYjevC1theXq+E2zT/VDtXQCPcMRkrfSuj0vj0
+						wk8M+eWFT5+DLvna24t4BhPYPc9bT00I7LtOg0FNulDxigvtlOfktepG41rQ2czA
+						6qtkjtSGuE4BgbH485hQyJCT4JSLuBPT8K0B3rYRe6nqknsm+H+ohCWlzKXKaI6w
+						6BuZS91oPne5WczzOk7lkPgPcmzgAhTYujvOkLl7HvX/lX00CvOtRZn6TzY5i5eH
+						yvJdqvgmOrcn1aWoYeC5AyHdItOZkQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQUA8gR9hvw83GQ8eYi0y7ulT0D05MwHwYDVR0jBBgwFoAUA8gR9hvw83GQ8eYi
+						0y7ulT0D05MwDQYJKoZIhvcNAQEFBQADggEBAACtN3u83nptnsMlUsA3VwF4huER
+						Ebn1szPGSdAmVYh9xikyfk6KIav+lUywT3AcyX3Zz2EZu8Sg4cyNut01wbXSLu8E
+						69YVmwrjMQC9AxLS73P0vKExPUpNuiDc8RbC4bHz6cGHptSknfSeByXJ59wAday3
+						MNA0XQ2qk4zkCDMCU44CT99RBS3rC2HzTXGH2ChZD1LrMontBD2w3wXKxQ1rwAZq
+						uj2C2OONhg723em0w0L8zSf9NAg4e+IcWHyJxWeGTldm+20qUTEltukkf72BR6MT
+						F8ADSfyH6PnaKgq+jDPKxnTqU8h9Cfw3e/ICV8V+ErNlzXPsA9gkTnGtoPQ=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEGDCCAwCgAwIBAgIJAL6/1HPmy0WjMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxHjAc
+						BgNVBAoTFVVuaXZlcnNpdHkgb2YgR2xhc2dvdzEYMBYGA1UECxMPVHJ1c3RGYWJy
+						aWNDZXJ0MR4wHAYDVQQDExViaWdndXMubmVzYy5nbGEuYWMudWswHhcNMTMxMTA0
+						MTI1NDM2WhcNMjMxMTAyMTI1NDM2WjCBjDELMAkGA1UEBhMCR0IxETAPBgNVBAgT
+						CFNjb3RsYW5kMRAwDgYDVQQHEwdHbGFzZ293MR4wHAYDVQQKExVVbml2ZXJzaXR5
+						IG9mIEdsYXNnb3cxGDAWBgNVBAsTD1RydXN0RmFicmljQ2VydDEeMBwGA1UEAxMV
+						YmlnZ3VzLm5lc2MuZ2xhLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAqUmwvEs1PilqD3m3tY2ewYnYnLs8M02nXdP0J5SsKsUhvzLnXlpwd3lu
+						tUpuwlmw9rPSt25hQYwuZvrmSAgYjevC1theXq+E2zT/VDtXQCPcMRkrfSuj0vj0
+						wk8M+eWFT5+DLvna24t4BhPYPc9bT00I7LtOg0FNulDxigvtlOfktepG41rQ2czA
+						6qtkjtSGuE4BgbH485hQyJCT4JSLuBPT8K0B3rYRe6nqknsm+H+ohCWlzKXKaI6w
+						6BuZS91oPne5WczzOk7lkPgPcmzgAhTYujvOkLl7HvX/lX00CvOtRZn6TzY5i5eH
+						yvJdqvgmOrcn1aWoYeC5AyHdItOZkQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQUA8gR9hvw83GQ8eYi0y7ulT0D05MwHwYDVR0jBBgwFoAUA8gR9hvw83GQ8eYi
+						0y7ulT0D05MwDQYJKoZIhvcNAQEFBQADggEBAACtN3u83nptnsMlUsA3VwF4huER
+						Ebn1szPGSdAmVYh9xikyfk6KIav+lUywT3AcyX3Zz2EZu8Sg4cyNut01wbXSLu8E
+						69YVmwrjMQC9AxLS73P0vKExPUpNuiDc8RbC4bHz6cGHptSknfSeByXJ59wAday3
+						MNA0XQ2qk4zkCDMCU44CT99RBS3rC2HzTXGH2ChZD1LrMontBD2w3wXKxQ1rwAZq
+						uj2C2OONhg723em0w0L8zSf9NAg4e+IcWHyJxWeGTldm+20qUTEltukkf72BR6MT
+						F8ADSfyH6PnaKgq+jDPKxnTqU8h9Cfw3e/ICV8V+ErNlzXPsA9gkTnGtoPQ=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://biggus.nesc.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://biggus.nesc.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://biggus.nesc.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://biggus.nesc.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://biggus.nesc.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">NeSC SimpleSAML Test SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gla.ac.uk/escience/</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/bits-dev.uas.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..96e04fca
--- /dev/null
+++ b/swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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://bits-dev.uas.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-23T10:19:31Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bits-dev.uas.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>
+						MIIDHTCCAgWgAwIBAgIJAPX9ZMiSNYDiMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWJpdHMtZGV2LnVhcy5veC5hYy51azAeFw0xMjA1MTUxNTIwMTJaFw0yMjA1
+						MTMxNTIwMTJaMCAxHjAcBgNVBAMTFWJpdHMtZGV2LnVhcy5veC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7/B49gX3LryCKiTawlklJBKTNl
+						LrCIrohEDTEFEYRvGn/YETCR1I0z0LmNz6mrqR3ZVtX7pdQZxF7o5vBsFgKp19Dx
+						9iTl9MqaVfAmgD7wj+IOe5vCHMKiBT1HD1B8eJiCL9kWdG87AfH5LLZlflcUTBGY
+						hcL2iBfMIHdsU3qM4/h6wmBdQt15Rcc9rspuM9yahL3CgHt6ivTV5akZ0zWCCRXP
+						AP9lnice3cs4xxanhMeV3ldMbGPC4R8RP4uxloA19a18VvYC8JBYzVRfmdHq8A7E
+						aziSye+k6/pMDRuW2Q5pQmmwsHlLJwslapRkvnwh5bYjpZsU/wDXImMQ2bMCAwEA
+						AaNaMFgwNwYDVR0RBDAwLoIVYml0cy1kZXYudWFzLm94LmFjLnVrhhViaXRzLWRl
+						di51YXMub3guYWMudWswHQYDVR0OBBYEFA7Qoo+j5LHk9+MUiqKZqsIX8VL3MA0G
+						CSqGSIb3DQEBBQUAA4IBAQAfBJ6Yy4bPFD7IM62gmcjX5WPZXlQn7w0LeLRnzvPp
+						d+EKAkp2zRYHpimxkvkol/89QpJR6E6Ta3ZE0Kc6hm8DDPRcKZUQ6GevmIBJFKV2
+						uGltW8WOCjINAfVcLsVOnhxWo8z6PjL8V+wUJWIZ7gY3wTAhUHh9SpCIv/W6rTBM
+						09Fx9GjuCeASiKivQSpWDYjuZGCt50y7xN/Q8Nq4crOZ30b51QawNAusNqmNOuI9
+						ZjXp/kn1jcYC5+48iEzuS4xk2PApy43g+PQq/ZcBjHsdDcuiRZPDOmwKjpZEE3u2
+						2tGYyfRBDPB/0Mjc7RunWPkOvZUQLA7ndT/Hl+K828MZ
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bits-dev.uas.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bits-dev.uas.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bits-dev.uas.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits-dev.uas.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bits-dev.uas.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits-dev.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bits-dev.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bits-dev.uas.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bits-dev.uas.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bits-dev.uas.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bits-dev.uas.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Business Intelligence Development Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nick</md:GivenName>
+    <md:SurName>Letellier</md:SurName>
+    <md:EmailAddress>mailto:nick.letellier@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bits-qa.uas.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bits-qa.uas.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..d5e97adc
--- /dev/null
+++ b/swamid-interfederations-2.0/bits-qa.uas.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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://bits-qa.uas.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="2013-04-16T15:53:33Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bits-qa.uas.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>
+						MIIDFjCCAf6gAwIBAgIJAPu2m10yz119MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFGJpdHMtcWEudWFzLm94LmFjLnVrMB4XDTEzMDQxMjEwMzQyNFoXDTIzMDQx
+						MDEwMzQyNFowHzEdMBsGA1UEAxMUYml0cy1xYS51YXMub3guYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlCzyiE5Wj4Nnr3cNPtsUAf4OLK6ta
+						CWgT7Ph4neO0SjNX97p3A5EC+vtrRcoTrThCroeRKU7WHRIAV7yan/yJbfSWSXPl
+						3qhRIDlGPuzOK69mNEKJwzaGpgPSanevbKwbwghZ0dkHHD5EyKiKsQPzj2xI+tOc
+						fiNkCMRN21m8VmSpSXnSXzsvhUMDGmd7NnS0wsnqPNg2KTIUKWQMwDsPlTcP+8Ab
+						yU2GvBGYZDpbkyad1KPRq/WF25VBsSn0XB///1Eg717x0fkiVWhXu0/n7qWhNQ2D
+						X0UB87Kae7t5tMwt+tCzQoOp4bu0RjaEbCyM9aONep6ebrS0fTWmv3nHAgMBAAGj
+						VTBTMDIGA1UdEQQrMCmCFGJpdHMtcWEudWFzLm94LmFjLnVrhhFiaXRzLXVhcy5v
+						eC5hYy51azAdBgNVHQ4EFgQU2c8+vZ/VozJj9PLzIxuLAEUMkA0wDQYJKoZIhvcN
+						AQEFBQADggEBAA6d/Xb4sRTdNWIDaaOZR6bmamsRZUSXHXoct3AVK6OeQB++EPl6
+						Lqo0PzkshDSqU/eStc1hJ8H9jJRFM/MshrhVK6rPrO4DwVDF/fSfZlLT91J/IHj6
+						p8gOTesZZiycafwydtQeXNs5mmQuEy49mc70iH5yGYTlZg7L2okhk4asqSp2SpNJ
+						htEQ6a1J/AiQljH7j+xMzW02eHLgXgDsGZ2A7N4ocPo69ZJU/9FMvSzh3um25mXm
+						aX+mEeH1eblRgiKHwzymWw+S7GbyAIcwDs3mP3R9X/GUtSPI6xFk1C8vYWHxbRPr
+						TQgeoPeqJAMzETO1ZYr5fAK5+enpkTOgXNY=
+					</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://bits-qa.uas.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits-qa.uas.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://bits-qa.uas.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://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bits-qa.uas.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 - BI/Tableau QA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Malin</md:SurName>
+    <md:EmailAddress>mailto:ben.malin@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bits.uas.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bits.uas.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..9dc1b083
--- /dev/null
+++ b/swamid-interfederations-2.0/bits.uas.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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://bits.uas.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="2013-06-25T11:54: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bits.uas.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>
+						MIIDDTCCAfWgAwIBAgIJAN6n87m9JqBAMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEWJpdHMudWFzLm94LmFjLnVrMB4XDTEzMDYyMTEwNDU1MloXDTIzMDYxOTEw
+						NDU1MlowHDEaMBgGA1UEAxMRYml0cy51YXMub3guYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCd+fqX2VRSIL9K4DMFfZtObbZkbXEvSyHWtFI5
+						oAIIbfvmmE0pziAC2Rbxa9nLLRw2G7d9AEfW2ktOIS9AE1LVZLoK7v0gvatV7ZaH
+						13C6domsuQzWELqG+vHR9cyIX1tiL8oo+kJLrniHpMuifdm5I+XKTfjNmu493Het
+						sjxu0DpsezqE9F1tlA9mBlSjqKFfp8uYhS+1HjVhT9E+k/TSwz3K/k2EkcXFLKFG
+						4KCFr+bZeW5wiUmy3r87V1N0Zph8uObix00+aQKi0dwCLgIxSRM/LPfakN9gk0L/
+						j2EydLJw0APmPXh8D9IKZAtRGOcN44P2UMc3k9N+a8VR4OJBAgMBAAGjUjBQMC8G
+						A1UdEQQoMCaCEWJpdHMudWFzLm94LmFjLnVrhhFiaXRzLnVhcy5veC5hYy51azAd
+						BgNVHQ4EFgQUsUURuBA+9z5VuLCzxXXODxH4G5UwDQYJKoZIhvcNAQEFBQADggEB
+						AHY96+ozosd3+kYqe9+xKAobDbTX7ZczK51PfzwmLYBRlt6p/yauGoJqSEoNhrPy
+						x4BZ8fPKHgKA2iqAFm5RzBv6t883VR9Npt0P2hQ8+fArcczgwDeCBKTZ16VLlQSy
+						VPZm7/QRGNU8EKx+CEYa5xUAk03Q7XmtmKI3Au7lOkRG0rpHAPTCiEvNcTuniMKl
+						DUSludjtx5UzkiYMRp+5048aTmQBmiHWsvrIUWsaX5vMBt+9QQSOXJEmJ8bRkpkB
+						o8JhwcADWs/8/XCO8IgVJptowHEkJKlHdyyCTr106+Vp62wLwMHzZSlRKTK3VKO2
+						j+LYa2YPte02DhcTeM41wXo=
+					</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://bits.uas.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits.uas.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://bits.uas.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://bits.uas.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bits.uas.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 Business Intelligence Production Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ops Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nick</md:GivenName>
+    <md:SurName>Rumble</md:SurName>
+    <md:EmailAddress>mailto:nick.rumble@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/blogs-staging.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/blogs-staging.it.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..3dda0e47
--- /dev/null
+++ b/swamid-interfederations-2.0/blogs-staging.it.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://blogs-staging.it.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-16T15:20: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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDQDCCAiigAwIBAgIJAJyLQwUsXJSZMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGWJsb2dzLXN0YWdpbmcuaXQub3guYWMudWswHhcNMTMwNDE1MTY0ODUxWhcN
+						MjMwNDEzMTY0ODUxWjAkMSIwIAYDVQQDExlibG9ncy1zdGFnaW5nLml0Lm94LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1/YPIiOAoCXfALT8
+						WZfTK9PbQ6jJtwkJa8ETe89mFngzt27IQRq6HfbDGaae7xLi5NwHJGZy4VqujDDz
+						7s5wyJq5os1jTtWijGhTmOl++DG+ikxBJlcHY2/dfzQygm7Z9d2jmJIFtblU7xd/
+						sy/40p4zNBbn/doLgUrITgetvQRU6W34u4EjHDabbRP05xDHdjyxKI52XTYui9l3
+						tK5SSl88tjELz6SKGmVFcvralHrXV20N+z17Zpi27W/SPMLkRVlKyujB7dLefh1y
+						zVHz3gTx7d3YmavOqtLwYl6/myaDRVQlUcLZ2YXXfKdTb64tyq0apyj8SZVmoq+k
+						JO2ZGwIDAQABo3UwczBSBgNVHREESzBJghlibG9ncy1zdGFnaW5nLml0Lm94LmFj
+						LnVrhixodHRwczovL2Jsb2dzLXN0YWdpbmcuaXQub3guYWMudWsvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUFHP6ZM/XvChLzDtS5krGBp0Q6J4wDQYJKoZIhvcNAQEFBQAD
+						ggEBACzXiMpJ9mCcm4gG3Rs9k0rAOclS8yajKB5Y4VJfxWBu4gxOa9TFqmRbg903
+						xliozbxmynVpXLgeG5p62rHEr65d/iV625zQkzDBx3iFQ8mMjYzsogKsptU+1RwX
+						yJdKnSfoYBOupZFbyvAFoyBcL5RU5+1OnqBF2in/Wk7viR2BCGJ8ifooakfsOOXy
+						On1okBIY4STVJlE18KlMZUODxioKbjqb3Ng1jIPlrvmmPc4CzcawLPABIMC0YdKA
+						EJUJGg/45Qsye1PuZ/NbTkACvRPsggxh3uxzGcIZs2zQzShZRn7WLM/UfOS37HPs
+						b+AsEcMnbx8LooBYklkaNosfumI=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDQDCCAiigAwIBAgIJAJyLQwUsXJSZMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGWJsb2dzLXN0YWdpbmcuaXQub3guYWMudWswHhcNMTMwNDE1MTY0ODUxWhcN
+						MjMwNDEzMTY0ODUxWjAkMSIwIAYDVQQDExlibG9ncy1zdGFnaW5nLml0Lm94LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1/YPIiOAoCXfALT8
+						WZfTK9PbQ6jJtwkJa8ETe89mFngzt27IQRq6HfbDGaae7xLi5NwHJGZy4VqujDDz
+						7s5wyJq5os1jTtWijGhTmOl++DG+ikxBJlcHY2/dfzQygm7Z9d2jmJIFtblU7xd/
+						sy/40p4zNBbn/doLgUrITgetvQRU6W34u4EjHDabbRP05xDHdjyxKI52XTYui9l3
+						tK5SSl88tjELz6SKGmVFcvralHrXV20N+z17Zpi27W/SPMLkRVlKyujB7dLefh1y
+						zVHz3gTx7d3YmavOqtLwYl6/myaDRVQlUcLZ2YXXfKdTb64tyq0apyj8SZVmoq+k
+						JO2ZGwIDAQABo3UwczBSBgNVHREESzBJghlibG9ncy1zdGFnaW5nLml0Lm94LmFj
+						LnVrhixodHRwczovL2Jsb2dzLXN0YWdpbmcuaXQub3guYWMudWsvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUFHP6ZM/XvChLzDtS5krGBp0Q6J4wDQYJKoZIhvcNAQEFBQAD
+						ggEBACzXiMpJ9mCcm4gG3Rs9k0rAOclS8yajKB5Y4VJfxWBu4gxOa9TFqmRbg903
+						xliozbxmynVpXLgeG5p62rHEr65d/iV625zQkzDBx3iFQ8mMjYzsogKsptU+1RwX
+						yJdKnSfoYBOupZFbyvAFoyBcL5RU5+1OnqBF2in/Wk7viR2BCGJ8ifooakfsOOXy
+						On1okBIY4STVJlE18KlMZUODxioKbjqb3Ng1jIPlrvmmPc4CzcawLPABIMC0YdKA
+						EJUJGg/45Qsye1PuZ/NbTkACvRPsggxh3uxzGcIZs2zQzShZRn7WLM/UfOS37HPs
+						b+AsEcMnbx8LooBYklkaNosfumI=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs-staging.it.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://blogs-staging.it.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://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://blogs-staging.it.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">Oxford University IT services blog - Staging</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/blogs.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/blogs.it.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..8cabe582
--- /dev/null
+++ b/swamid-interfederations-2.0/blogs.it.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://blogs.it.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-19T07:45: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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDIDCCAgigAwIBAgIJAO5WjU+14S9UMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEWJsb2dzLml0Lm94LmFjLnVrMB4XDTEzMDQxNzE3MDUyNFoXDTIzMDQxNTE3
+						MDUyNFowHDEaMBgGA1UEAxMRYmxvZ3MuaXQub3guYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQC/NAROlo2gIDwjaBYvpeZjeCAqkgbdtBeOP0/3
+						cib9XK7twO3pSxBOMIzi9ugl7pZZLs07F5xnsZiVm1ARfdkzuxibp752MhSJHtup
+						BUM7ltGqjcyzd6L6EDaN/tmbgahnz7J9aR9Udzq5sQ7GZi4ZHQdtRcbhOKBl49no
+						/+ERleWGKnlusYKPsHzXlzmtApCjkBFpQ9IfX70QSF7CzhMdSmBbjzifsYPqET+8
+						DYhEqXRG7/wKguZAh5SjxA5QqZPxDYAf9ZdAN9hAmLfA9FDjBYhErEXmarGjhSt8
+						I2wU1DJcyCnGSRi1QZNnArFjXtf0dSJXMqbpC0DkGz057DtxAgMBAAGjZTBjMEIG
+						A1UdEQQ7MDmCEWJsb2dzLml0Lm94LmFjLnVrhiRodHRwczovL2Jsb2dzLml0Lm94
+						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFPmPa+TukWsGIl2/RDHAdOc0PqQ9
+						MA0GCSqGSIb3DQEBBQUAA4IBAQAgHD8SRXrO5EDHve1G4gz8j0BCtasDMI+cKpJF
+						Upa3vVWm1BW7FVvmqTRWXWINwb0phOKV1AhV3G2waCRRMnlCE+v/rlzIE79MUf6K
+						8dzME8hVrTz6Xug/IpjJUEc//YrIYHwGfRaT/eORlUNsIoyYfexp6pIh0mY2NGyw
+						yM827XYmiOC22BSY39au2iYWGSlIwxNNLewWZ6q5hoOXT5rz2c832cNW/gqslLde
+						8ml/l/rTR/v08q1mhPSN/EQppYXSBWnoAHW2lFmqC3XSrUqBd9xjU9fWX9ZjHWjQ
+						9bvV+ZPT6CP9dWRJJ0I9Yh50lBOGliCXKs50AqNCD5Qv6DVl
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDIDCCAgigAwIBAgIJAO5WjU+14S9UMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEWJsb2dzLml0Lm94LmFjLnVrMB4XDTEzMDQxNzE3MDUyNFoXDTIzMDQxNTE3
+						MDUyNFowHDEaMBgGA1UEAxMRYmxvZ3MuaXQub3guYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQC/NAROlo2gIDwjaBYvpeZjeCAqkgbdtBeOP0/3
+						cib9XK7twO3pSxBOMIzi9ugl7pZZLs07F5xnsZiVm1ARfdkzuxibp752MhSJHtup
+						BUM7ltGqjcyzd6L6EDaN/tmbgahnz7J9aR9Udzq5sQ7GZi4ZHQdtRcbhOKBl49no
+						/+ERleWGKnlusYKPsHzXlzmtApCjkBFpQ9IfX70QSF7CzhMdSmBbjzifsYPqET+8
+						DYhEqXRG7/wKguZAh5SjxA5QqZPxDYAf9ZdAN9hAmLfA9FDjBYhErEXmarGjhSt8
+						I2wU1DJcyCnGSRi1QZNnArFjXtf0dSJXMqbpC0DkGz057DtxAgMBAAGjZTBjMEIG
+						A1UdEQQ7MDmCEWJsb2dzLml0Lm94LmFjLnVrhiRodHRwczovL2Jsb2dzLml0Lm94
+						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFPmPa+TukWsGIl2/RDHAdOc0PqQ9
+						MA0GCSqGSIb3DQEBBQUAA4IBAQAgHD8SRXrO5EDHve1G4gz8j0BCtasDMI+cKpJF
+						Upa3vVWm1BW7FVvmqTRWXWINwb0phOKV1AhV3G2waCRRMnlCE+v/rlzIE79MUf6K
+						8dzME8hVrTz6Xug/IpjJUEc//YrIYHwGfRaT/eORlUNsIoyYfexp6pIh0mY2NGyw
+						yM827XYmiOC22BSY39au2iYWGSlIwxNNLewWZ6q5hoOXT5rz2c832cNW/gqslLde
+						8ml/l/rTR/v08q1mhPSN/EQppYXSBWnoAHW2lFmqC3XSrUqBd9xjU9fWX9ZjHWjQ
+						9bvV+ZPT6CP9dWRJJ0I9Yh50lBOGliCXKs50AqNCD5Qv6DVl
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.it.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://blogs.it.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://blogs.it.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://blogs.it.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: IT Services Blogs</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://blogs.it.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Services Help Centre</md:GivenName>
+    <md:EmailAddress>mailto:help@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/bm.stars.manchester.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bm.stars.manchester.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..3ad9b5dd
--- /dev/null
+++ b/swamid-interfederations-2.0/bm.stars.manchester.ac.uk-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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://bm.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bm.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>
+						MIIC3zCCAcegAwIBAgIJAJuqRlY/1A1jMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+						BAMTCHZpbGxhbnVzMB4XDTA5MDUyMjA5MjYyN1oXDTE5MDUyMDA5MjYyN1owEzER
+						MA8GA1UEAxMIdmlsbGFudXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDMytraxBwzCmyK3cnajuHo5sb2Hhs0aTIAEaUTpcP2qo/yQlT/S5Wjsm5tPtue
+						pA8z0h56Y4on/k9gGGXnjej+23pfX/dPFCLEyE3MODunTkml1ObptRdMJT6CWRwg
+						m9tdWr8r355vAbS/nEn0s0z3dwHBSuf7/q4GZoBkdbUG5TkOJidlWwe5y2OXSspU
+						lehsON69DPXTxujsn9QNYzmdGxui+nrhHsj8hjPEQc9QcFDq7kXuDkM3Lry84h2p
+						kWGXRebVqEGvs6b7CUxvS5xiOChpx6fTi0/LZQQRCzrtVOuYeb9o6wVejmzW6qun
+						KH7dJCc14fgN2Icd7XYqIXYNAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHZpbGxhbnVz
+						MB0GA1UdDgQWBBTwGMy2sDPsfBZdE/1WuaxJDqVNuzANBgkqhkiG9w0BAQUFAAOC
+						AQEAlvJzqsg5+ZiZ0XChtGL3j1n8PbGeah5AfEfXRvS6RrHu7/3w4WOy+XBpGteu
+						8rqE/HkgqcpnXGS61TEU2HmdnNxqMTpGZoI7zbOkkcsNpvvG+dU5OdlEoTgJHuRI
+						12EgBWjTXMweohxDkLANWaqfB9yVDT1MspMkxKmYalZK95N9M/d6gJfXWwU4GSd0
+						4jfwMr9FzpOLAbxAHIohMA2djNfA2gNuve8PqIfBz6iaUAN0SGhGWMWWEL2B+uYZ
+						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>
+						MIIC3zCCAcegAwIBAgIJAJuqRlY/1A1jMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+						BAMTCHZpbGxhbnVzMB4XDTA5MDUyMjA5MjYyN1oXDTE5MDUyMDA5MjYyN1owEzER
+						MA8GA1UEAxMIdmlsbGFudXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDMytraxBwzCmyK3cnajuHo5sb2Hhs0aTIAEaUTpcP2qo/yQlT/S5Wjsm5tPtue
+						pA8z0h56Y4on/k9gGGXnjej+23pfX/dPFCLEyE3MODunTkml1ObptRdMJT6CWRwg
+						m9tdWr8r355vAbS/nEn0s0z3dwHBSuf7/q4GZoBkdbUG5TkOJidlWwe5y2OXSspU
+						lehsON69DPXTxujsn9QNYzmdGxui+nrhHsj8hjPEQc9QcFDq7kXuDkM3Lry84h2p
+						kWGXRebVqEGvs6b7CUxvS5xiOChpx6fTi0/LZQQRCzrtVOuYeb9o6wVejmzW6qun
+						KH7dJCc14fgN2Icd7XYqIXYNAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHZpbGxhbnVz
+						MB0GA1UdDgQWBBTwGMy2sDPsfBZdE/1WuaxJDqVNuzANBgkqhkiG9w0BAQUFAAOC
+						AQEAlvJzqsg5+ZiZ0XChtGL3j1n8PbGeah5AfEfXRvS6RrHu7/3w4WOy+XBpGteu
+						8rqE/HkgqcpnXGS61TEU2HmdnNxqMTpGZoI7zbOkkcsNpvvG+dU5OdlEoTgJHuRI
+						12EgBWjTXMweohxDkLANWaqfB9yVDT1MspMkxKmYalZK95N9M/d6gJfXWwU4GSd0
+						4jfwMr9FzpOLAbxAHIohMA2djNfA2gNuve8PqIfBz6iaUAN0SGhGWMWWEL2B+uYZ
+						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://bm.stars.manchester.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bm.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://bm.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://bm.stars.manchester.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bm.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://bm.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://bm.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: Building Maintenance Organization</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/bmcidp.brooksbymelton.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/bmcidp.brooksbymelton.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..785b1c86
--- /dev/null
+++ b/swamid-interfederations-2.0/bmcidp.brooksbymelton.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bmcidp.brooksbymelton.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brooksbymelton.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDWDCCAkCgAwIBAgIVAM0zHQkz79mS9Xson1u81Xo9Aql3MA0GCSqGSIb3DQEB
+						BQUAMCYxJDAiBgNVBAMTG2JtY2lkcC5icm9va3NieW1lbHRvbi5hYy51azAeFw0x
+						MTA4MDExNTA1MzNaFw0zMTA4MDExNTA1MzNaMCYxJDAiBgNVBAMTG2JtY2lkcC5i
+						cm9va3NieW1lbHRvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAMo6p6KIO6Ib50pl1GzmgAgpAWiK/g1KPdMcKHlsnVo/h1789Ka9iqu4wGaN
+						DmRyBJ5EBgOjzNgEP9lgcnytxQBvJULUdqja3tYASeL2065N6kINtV+RFY0W9dbB
+						/1NFs+5Ira3hhQzqNrwU8fCpjwGjD0x0bgmlAfm7v6/i8W2fsNhewDAC4VoJNY/l
+						DJHnmH9fBO2O9E6CiOzP9z3KumIToKns+EI3GbYdrt+fWWqtIuBz/Sjnw9KsE6KM
+						J+0ddM0jDXeHIDlGVlaJWmuBL0j1dBrL+E7oaC5T6mZbC2IeGkupog/GtpesNs16
+						+qgYU4Jw3bEBtux8NSEVzvDFctMCAwEAAaN9MHswWgYDVR0RBFMwUYIbYm1jaWRw
+						LmJyb29rc2J5bWVsdG9uLmFjLnVrhjJodHRwczovL2JtY2lkcC5icm9va3NieW1l
+						bHRvbi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUxsgOb5l8DCKO46rw
+						s3mAo/nBc68wDQYJKoZIhvcNAQEFBQADggEBALG6xylWTVMrf8g4BSwi5juiVTEe
+						CzXeQEjivNHOYtAR0H+UL7RgLz3MGeTrRIDFfKOWQRpCo1TDSNWrwRESuROEK9Rs
+						Q95eQ93qJ/oHVOl3MvrmDy56N7pyDs3wM2biDwnGdJf2ZLR0+INiiuVg1qZs9/w5
+						WB4xV16ZE2oncKFAsHJHK2iVL6GbwtbxAYwTC5hDqOp8b+pXBn8ApsXDo/Ux1lV8
+						ZVxpgzxi7zNgtSP/mSbk5AB1niYm4AGo569Anr5zvX/Dl9Sn3qIv2uDaBhoHg2TT
+						veg66IFDer14n9QxiJiEhK0ywkzQddJ9YJDr+KiDVFpzN/t49uGiZc0+Wcc=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bmcidp.brooksbymelton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bmcidp.brooksbymelton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://bmcidp.brooksbymelton.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bmcidp.brooksbymelton.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bmcidp.brooksbymelton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bmcidp.brooksbymelton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brooksbymelton.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDWDCCAkCgAwIBAgIVAM0zHQkz79mS9Xson1u81Xo9Aql3MA0GCSqGSIb3DQEB
+						BQUAMCYxJDAiBgNVBAMTG2JtY2lkcC5icm9va3NieW1lbHRvbi5hYy51azAeFw0x
+						MTA4MDExNTA1MzNaFw0zMTA4MDExNTA1MzNaMCYxJDAiBgNVBAMTG2JtY2lkcC5i
+						cm9va3NieW1lbHRvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAMo6p6KIO6Ib50pl1GzmgAgpAWiK/g1KPdMcKHlsnVo/h1789Ka9iqu4wGaN
+						DmRyBJ5EBgOjzNgEP9lgcnytxQBvJULUdqja3tYASeL2065N6kINtV+RFY0W9dbB
+						/1NFs+5Ira3hhQzqNrwU8fCpjwGjD0x0bgmlAfm7v6/i8W2fsNhewDAC4VoJNY/l
+						DJHnmH9fBO2O9E6CiOzP9z3KumIToKns+EI3GbYdrt+fWWqtIuBz/Sjnw9KsE6KM
+						J+0ddM0jDXeHIDlGVlaJWmuBL0j1dBrL+E7oaC5T6mZbC2IeGkupog/GtpesNs16
+						+qgYU4Jw3bEBtux8NSEVzvDFctMCAwEAAaN9MHswWgYDVR0RBFMwUYIbYm1jaWRw
+						LmJyb29rc2J5bWVsdG9uLmFjLnVrhjJodHRwczovL2JtY2lkcC5icm9va3NieW1l
+						bHRvbi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUxsgOb5l8DCKO46rw
+						s3mAo/nBc68wDQYJKoZIhvcNAQEFBQADggEBALG6xylWTVMrf8g4BSwi5juiVTEe
+						CzXeQEjivNHOYtAR0H+UL7RgLz3MGeTrRIDFfKOWQRpCo1TDSNWrwRESuROEK9Rs
+						Q95eQ93qJ/oHVOl3MvrmDy56N7pyDs3wM2biDwnGdJf2ZLR0+INiiuVg1qZs9/w5
+						WB4xV16ZE2oncKFAsHJHK2iVL6GbwtbxAYwTC5hDqOp8b+pXBn8ApsXDo/Ux1lV8
+						ZVxpgzxi7zNgtSP/mSbk5AB1niYm4AGo569Anr5zvX/Dl9Sn3qIv2uDaBhoHg2TT
+						veg66IFDer14n9QxiJiEhK0ywkzQddJ9YJDr+KiDVFpzN/t49uGiZc0+Wcc=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bmcidp.brooksbymelton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bmcidp.brooksbymelton.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Brooksby Melton College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Brooksby Melton College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brooksbymelton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@BrooksbyMelton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@BrooksbyMelton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bmthbs.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/bmthbs.sisoshibboleth.co.uk-entity.xml
new file mode 100644
index 00000000..6e21fcec
--- /dev/null
+++ b/swamid-interfederations-2.0/bmthbs.sisoshibboleth.co.uk-entity.xml
@@ -0,0 +1,84 @@
+<?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://bmthbs.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-12-01T17:24: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bmth.siso.co/bs/sso/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bmth.siso.co/bs/sso/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SiSo Bournemouth University ~ Business School, Online Resource Booking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SiSo Bournemouth University ~ Business School, 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>
+						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
+						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
+						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
+						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
+						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
+						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
+						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
+						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
+						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
+						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
+						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
+						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
+						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://bmth.siso.co/bs/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bmth.siso.co/bs/sso/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bmth.siso.co/bs/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bmth.siso.co/bs/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bmth.siso.co/bs/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bmth.siso.co/bs/sso/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bmth.siso.co/bs/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 Bournemouth University ~ Business School, 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/bmtheventskit.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/bmtheventskit.sisoshibboleth.co.uk-entity.xml
new file mode 100644
index 00000000..56bcb06a
--- /dev/null
+++ b/swamid-interfederations-2.0/bmtheventskit.sisoshibboleth.co.uk-entity.xml
@@ -0,0 +1,84 @@
+<?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://bmtheventskit.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-12-09T14:52: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bmth.siso.co/eventskit/sso/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bmth.siso.co/eventskit/sso/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SiSo Bournemouth University ~ Events, Online Resource Booking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SiSo Bournemouth University ~ Events, 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>
+						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
+						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
+						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
+						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
+						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
+						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
+						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
+						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
+						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
+						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
+						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
+						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
+						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://bmth.siso.co/eventskit/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bmth.siso.co/eventskit/sso/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bmth.siso.co/eventskit/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bmth.siso.co/eventskit/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bmth.siso.co/eventskit/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bmth.siso.co/eventskit/sso/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bmth.siso.co/eventskit/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 Bournemouth University ~ Events, 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/bmthmedia.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/bmthmedia.sisoshibboleth.co.uk-entity.xml
new file mode 100644
index 00000000..6b949199
--- /dev/null
+++ b/swamid-interfederations-2.0/bmthmedia.sisoshibboleth.co.uk-entity.xml
@@ -0,0 +1,82 @@
+<?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://bmthmedia.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-06-06T10:17: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bmth.siso.co/bmthmedia/sso/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bmth.siso.co/bmthmedia/sso/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SiSo Bournemouth University ~ BmthMedia, Online Resource Booking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SiSo Bournemouth University ~ BmthMedia, 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>
+						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
+						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
+						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
+						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
+						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
+						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
+						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
+						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
+						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
+						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
+						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
+						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
+						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://bmth.siso.co/bmthmedia/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bmth.siso.co/bmthmedia/sso/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bmth.siso.co/bmthmedia/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bmth.siso.co/bmthmedia/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bmth.siso.co/bmthmedia/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bmth.siso.co/bmthmedia/sso/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bmth.siso.co/bmthmedia/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 Bournemouth University ~ BmthMedia, 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/bobnational.net-saml-metadata.xml b/swamid-interfederations-2.0/bobnational.net-saml-metadata.xml
new file mode 100644
index 00000000..31a0b16d
--- /dev/null
+++ b/swamid-interfederations-2.0/bobnational.net-saml-metadata.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bobnational.net/saml/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-27T18: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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDlDCCAnygAwIBAgIJANdrdMaQXWYoMA0GCSqGSIb3DQEBBQUAMDoxHjAcBgNV
+						BAoTFUJvQiBOYXRpb25hbCBXZWIgU2l0ZTEYMBYGA1UEAxMPYm9ibmF0aW9uYWwu
+						bmV0MB4XDTEyMDgxNjEyMTgzNFoXDTIyMDgxNDEyMTgzNFowOjEeMBwGA1UEChMV
+						Qm9CIE5hdGlvbmFsIFdlYiBTaXRlMRgwFgYDVQQDEw9ib2JuYXRpb25hbC5uZXQw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChVywMjnHBsEhfSHdWDwQy
+						4DJsfa3XdcYXf5TdNDAgDjuNnvNIsupLaatPNUsoLCywjEjR0a5xQkDx8SocntS4
+						ueA5aLQM2J/WvFu8w/I26VMqu3oOTi9D7FH4rhSLWpmEt42lCwyxgBrcoUlMSYcf
+						2dD66YqmI6qWiLhjukU49Qhu5L7q4eN3MZUWQ1RlHhq8a8i2E3+e5hUxaMmR0R+t
+						mnJUw2UhX7YaTVhTx/nKbevyGMQkyv7XgLa2JNe3+n+dyUsECNE+VLF7uwRPWHEp
+						/Gis0qTNn5yT1uu7Hx15UiqqitnWvHGlmLasEiC8UMlvjg06LdhyeBdAH84e7SGD
+						AgMBAAGjgZwwgZkwHQYDVR0OBBYEFLGc2FzkYAkjc5LCl9IhxPOXdAi/MGoGA1Ud
+						IwRjMGGAFLGc2FzkYAkjc5LCl9IhxPOXdAi/oT6kPDA6MR4wHAYDVQQKExVCb0Ig
+						TmF0aW9uYWwgV2ViIFNpdGUxGDAWBgNVBAMTD2JvYm5hdGlvbmFsLm5ldIIJANdr
+						dMaQXWYoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEzPhy3e0E05
+						ZwvsLtV0yUQv2NH8Y62CKhfWRoBMvVyVgEhIpl65RdMMpD0YniivY+d9cl+ObVEP
+						kFxJsBr86NUPHAA12qHf/QR9cGZAsQhQ8XFrCE3sWgCNlBxTOoE5pqwKTMxymDZD
+						rVMhRugvRv/VMVEv4py+98nu5KQedUVqkuYz7eG+GZlFJXHuqeMq3eXGVhW5UEcC
+						QWZjg8Usw8plmmXjPv6yiSxhwIQcFWVIe+/gU1b2F9H05k07ttptx49ahYji+mNj
+						fg+nv0Kg3/TODGxPdpgp4EISAkK+5Mxrat9/qpYjW59wZIrpoWu/IQodmLzxFi31
+						D51oPHcAyxM=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDlDCCAnygAwIBAgIJANdrdMaQXWYoMA0GCSqGSIb3DQEBBQUAMDoxHjAcBgNV
+						BAoTFUJvQiBOYXRpb25hbCBXZWIgU2l0ZTEYMBYGA1UEAxMPYm9ibmF0aW9uYWwu
+						bmV0MB4XDTEyMDgxNjEyMTgzNFoXDTIyMDgxNDEyMTgzNFowOjEeMBwGA1UEChMV
+						Qm9CIE5hdGlvbmFsIFdlYiBTaXRlMRgwFgYDVQQDEw9ib2JuYXRpb25hbC5uZXQw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChVywMjnHBsEhfSHdWDwQy
+						4DJsfa3XdcYXf5TdNDAgDjuNnvNIsupLaatPNUsoLCywjEjR0a5xQkDx8SocntS4
+						ueA5aLQM2J/WvFu8w/I26VMqu3oOTi9D7FH4rhSLWpmEt42lCwyxgBrcoUlMSYcf
+						2dD66YqmI6qWiLhjukU49Qhu5L7q4eN3MZUWQ1RlHhq8a8i2E3+e5hUxaMmR0R+t
+						mnJUw2UhX7YaTVhTx/nKbevyGMQkyv7XgLa2JNe3+n+dyUsECNE+VLF7uwRPWHEp
+						/Gis0qTNn5yT1uu7Hx15UiqqitnWvHGlmLasEiC8UMlvjg06LdhyeBdAH84e7SGD
+						AgMBAAGjgZwwgZkwHQYDVR0OBBYEFLGc2FzkYAkjc5LCl9IhxPOXdAi/MGoGA1Ud
+						IwRjMGGAFLGc2FzkYAkjc5LCl9IhxPOXdAi/oT6kPDA6MR4wHAYDVQQKExVCb0Ig
+						TmF0aW9uYWwgV2ViIFNpdGUxGDAWBgNVBAMTD2JvYm5hdGlvbmFsLm5ldIIJANdr
+						dMaQXWYoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEzPhy3e0E05
+						ZwvsLtV0yUQv2NH8Y62CKhfWRoBMvVyVgEhIpl65RdMMpD0YniivY+d9cl+ObVEP
+						kFxJsBr86NUPHAA12qHf/QR9cGZAsQhQ8XFrCE3sWgCNlBxTOoE5pqwKTMxymDZD
+						rVMhRugvRv/VMVEv4py+98nu5KQedUVqkuYz7eG+GZlFJXHuqeMq3eXGVhW5UEcC
+						QWZjg8Usw8plmmXjPv6yiSxhwIQcFWVIe+/gU1b2F9H05k07ttptx49ahYji+mNj
+						fg+nv0Kg3/TODGxPdpgp4EISAkK+5Mxrat9/qpYjW59wZIrpoWu/IQodmLzxFi31
+						D51oPHcAyxM=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bobnational.net/saml/module.php/saml/sp/saml2-logout.php/imagenweb"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bobnational.net/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://bobnational.net/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://bobnational.net/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://bobnational.net/saml/module.php/saml/sp/saml1-acs.php/imagenweb/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">BoB National</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">British Universities Film &amp; Video Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">British Universities Film &amp; Video Council: BoB National</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://bufvc.ac.uk/tvandradio/bob</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>CIS Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:support@cambridgeimaging.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>CIS Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:support@cambridgeimaging.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bodportal.geant.net-autobahn-gui.xml b/swamid-interfederations-2.0/bodportal.geant.net-autobahn-gui.xml
new file mode 100644
index 00000000..6727dcb7
--- /dev/null
+++ b/swamid-interfederations-2.0/bodportal.geant.net-autobahn-gui.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bodportal.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-17T13:37:01Z">
+      <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">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>
+						MIIDKjCCAhKgAwIBAgIJAJDmGErGOKVvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE2JvZHBvcnRhbC5nZWFudC5uZXQwHhcNMTQwNDExMTUxMDE1WhcNMTcwNDEx
+						MTUxMDE1WjAeMRwwGgYDVQQDExNib2Rwb3J0YWwuZ2VhbnQubmV0MIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx+u+ncMfh9UiMVWMm38eNH38kSQxGs53
+						YrgmXl2bJWx1cbDseJ28IIKa3xyR7kIDdGBSKgR9/+dcqmA0jitnQNkc0AxWO/SE
+						Ft9NXOWGPt8db1BuFD2DKtNnaqL5pxUFvv8ZvVtThf0cTWtbJXr9Fqscavh67Xs5
+						h8ZVV/PKJkWzI+MwNNZA4zY/XmlWgFj0JyOoNjKRj0CYdbAO9nxjDvglZBaBZhTL
+						yUFPKFK9PYhvCDGidE6vntyN0IerZR5CVZ4UVB4RpnxhbZJKz2ahDGYDMd7ALOGl
+						XVgbVZIEy1UaWSVw85hB3YolynSIDgQGMikPkm9Ob/p9MNqDSyzpyQIDAQABo2sw
+						aTBIBgNVHREEQTA/ghNib2Rwb3J0YWwuZ2VhbnQubmV0hihodHRwczovL2JvZHBv
+						cnRhbC5nZWFudC5uZXQvYXV0b2JhaG4tZ3VpMB0GA1UdDgQWBBSYqysjUZVqc/9I
+						LTMJw82mQm3zsTANBgkqhkiG9w0BAQUFAAOCAQEAh6tU+wzIMqNY47LypNVtdyZY
+						lLCWA5zLnspGrAZoHkiQWgD9ci7J/WBswCdrs/lSJ170u+CiBulzCNgp3c+z2mlq
+						6snJQNApKtE7JOOXXm7QiBmIeKycfmtkznSAfjQGjlfpIY/qmEPTljJQrj1cl0nH
+						7mHxBTgN/YlZj2H7XQZRQZMw5Y63exLyOzD38kGxt+dUUi07cGHenGHs7y7aPKZi
+						dTpN+ziSFq2kMwKJikMGPFrs84/iYCJxedloJqCXljGD5SMq4k5E4m36LpOyhduX
+						5Xv78mo22p+fa22GBf1a6s/flNWU8+CrOWGHHGO3mvNuS0wMHid3D5dSEk8cLw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDKjCCAhKgAwIBAgIJAJDmGErGOKVvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE2JvZHBvcnRhbC5nZWFudC5uZXQwHhcNMTQwNDExMTUxMDE1WhcNMTcwNDEx
+						MTUxMDE1WjAeMRwwGgYDVQQDExNib2Rwb3J0YWwuZ2VhbnQubmV0MIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx+u+ncMfh9UiMVWMm38eNH38kSQxGs53
+						YrgmXl2bJWx1cbDseJ28IIKa3xyR7kIDdGBSKgR9/+dcqmA0jitnQNkc0AxWO/SE
+						Ft9NXOWGPt8db1BuFD2DKtNnaqL5pxUFvv8ZvVtThf0cTWtbJXr9Fqscavh67Xs5
+						h8ZVV/PKJkWzI+MwNNZA4zY/XmlWgFj0JyOoNjKRj0CYdbAO9nxjDvglZBaBZhTL
+						yUFPKFK9PYhvCDGidE6vntyN0IerZR5CVZ4UVB4RpnxhbZJKz2ahDGYDMd7ALOGl
+						XVgbVZIEy1UaWSVw85hB3YolynSIDgQGMikPkm9Ob/p9MNqDSyzpyQIDAQABo2sw
+						aTBIBgNVHREEQTA/ghNib2Rwb3J0YWwuZ2VhbnQubmV0hihodHRwczovL2JvZHBv
+						cnRhbC5nZWFudC5uZXQvYXV0b2JhaG4tZ3VpMB0GA1UdDgQWBBSYqysjUZVqc/9I
+						LTMJw82mQm3zsTANBgkqhkiG9w0BAQUFAAOCAQEAh6tU+wzIMqNY47LypNVtdyZY
+						lLCWA5zLnspGrAZoHkiQWgD9ci7J/WBswCdrs/lSJ170u+CiBulzCNgp3c+z2mlq
+						6snJQNApKtE7JOOXXm7QiBmIeKycfmtkznSAfjQGjlfpIY/qmEPTljJQrj1cl0nH
+						7mHxBTgN/YlZj2H7XQZRQZMw5Y63exLyOzD38kGxt+dUUi07cGHenGHs7y7aPKZi
+						dTpN+ziSFq2kMwKJikMGPFrs84/iYCJxedloJqCXljGD5SMq4k5E4m36LpOyhduX
+						5Xv78mo22p+fa22GBf1a6s/flNWU8+CrOWGHHGO3mvNuS0wMHid3D5dSEk8cLw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bodportal.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://bodportal.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://bodportal.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://bodportal.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">DANTE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dante.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>DANTE IT Support</md:Company>
+    <md:EmailAddress>mailto:DANTEITSupport@dante.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>DANTE IT</md:Company>
+    <md:EmailAddress>mailto:it@dante.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/boleth.chi.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/boleth.chi.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..95878ef4
--- /dev/null
+++ b/swamid-interfederations-2.0/boleth.chi.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://boleth.chi.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-22T18: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chi.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDKzCCAhOgAwIBAgIULwL7oid36ZPtdvr3LZJNHVTCZGEwDQYJKoZIhvcNAQEF
+						BQAwGzEZMBcGA1UEAwwQYm9sZXRoLmNoaS5hYy51azAeFw0xNTAyMTYwODMwMjha
+						Fw0zNTAyMTYwODMwMjhaMBsxGTAXBgNVBAMMEGJvbGV0aC5jaGkuYWMudWswggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+fzYeakSO5FUusjI9Vhtog+BZ
+						M+0NjVqfiODCI3ncYZQSzh4ay3GUWSl/lvimyO1zzjJ+R9BkGfw2xdPXDmSRxf7C
+						FCGvKCR3n8Q1W8A1M85Mc3VnGE6Aj+d7tr4r1x945TdT2mP0ZH/3bCCgWite5Ui3
+						iKM/Ge8t3PghkryisBXRqsKaoQ0bwlT0tPhqCtJRaNcPvrNt9UKbcnvms+/5/KAW
+						ylG2Lg/9Ky2WP+wHUC5sTxu3s8AaA7+mZ+jU4Z7mvPnCaziwS0Agq+xVbPbHzMQp
+						fwVfiNbefl5+gu44gAjJTS2tC1MVu9PmHYxO1NzDq6sF4TJ5tuBczrmYjCd1AgMB
+						AAGjZzBlMB0GA1UdDgQWBBRlDfq/VVhb+hyVo6q++EpXUCh8zDBEBgNVHREEPTA7
+						ghBib2xldGguY2hpLmFjLnVrhidodHRwczovL2JvbGV0aC5jaGkuYWMudWsvaWRw
+						L3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAJ4fiImysQWUrTSzODaOh6l9
+						n1WQz1ZIof3BUJ7uloUSeT2hteVPTtzqTST5+1/CQu3AkE1Hr+lU9N0mw1d6tHYU
+						Pe3XZQmevFn1ulJ1vhB6uqrZU+7VxyC7bijyeLPGUFt42nndQrEGY6bBB8rakL7j
+						oOqkh3Mkziu6hJtedV43jr5chVPgvsKlt74EFJMtiTaxVhB9sTbrVEGJ0zqwalvM
+						yInsBUhcKzyT5IXsl88X1TSgWo34X/Q3C+Cub4AUEq7YJet89bnIVx8YZKfTfMWC
+						GtAN/WcamuAumN0ZlAzcbLNeMxTqEyZxGTF0vjvATxj2iceErIxGkBNOTSd9Kjs=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEhTCCA22gAwIBAgIQbvjmmkrogFEwI+iucB2P2DANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDMyMTAwMDAwMFoXDTE1MDMyMTIzNTk1OVowYDELMAkGA1UE
+						BhMCR0IxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGFVuaXZlcnNpdHkg
+						b2YgQ2hpY2hlc3RlcjEZMBcGA1UEAxMQYm9sZXRoLmNoaS5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMKBt8PF6ojvh7+wqVT+q0UFBW68fwjE
+						iyruGHbiBcuUFBpincjYQFIQUSRch6F/54QVIOgUk4z3aSxH/kpUb9AV8OUwtoWU
+						2uv1CLMvUA1pqRWK4Hj9B/xjXEkQtW0u0BtxHnjCOpAaqKpn4jUh9ys556rFZYTL
+						VoDcOQnBsZeRdhuDXKdqnQ3f9dRLG5PwJuo834b+VggEBWvnBE6cCyPcmvpx2fqt
+						x+W2MBLETjS6eL3gin7aW62D4OtQffe+czUGqmYzT7+nGpTDTIldGgrck7b2+iXw
+						htKzq68ktX0y0aoI8R7S+uW5YKuSJBzzthQg+fJSQKnRspI0ct+75vECAwEAAaOC
+						AWMwggFfMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQW
+						BBSm8emno8fO9kSdBhb7w/12OLshazAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/
+						BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzAN
+						BgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50
+						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYB
+						BQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0
+						MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREE
+						FDASghBib2xldGguY2hpLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQCENaTlCyQS
+						3jXOV6HdRHFFyQNbsVUnbLH6YSoeQRo9alpuMHxx9BNOc5edQS4+lpw4jgk27D2T
+						jA8cHt6P1ngG1mL1Ik1mttw7Od3aP+VaPslUwv6jRRyD7V9QpO0+OOrwhZ5BVKHC
+						a/X6w95OiYPTsdnJ2HX+xqudc4KUM7KdNo8EH/m7st17Wpr7MUw00tnttcABKRzI
+						i6DmnsfZyqhsXGGw5XyMbpXHIAriwM7QNVDRxMyPkOjFxqjEB6siXnED6zDjDTKq
+						FlhScxgz3l0BxePu0f5KaWZBLLc3ogbE7L2drI9xkpdx7Llx2SaWAjhrWKYmjXRl
+						bS11x3ltloR3
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://boleth.chi.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://boleth.chi.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>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.chi.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.chi.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.chi.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.chi.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chi.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDKzCCAhOgAwIBAgIULwL7oid36ZPtdvr3LZJNHVTCZGEwDQYJKoZIhvcNAQEF
+						BQAwGzEZMBcGA1UEAwwQYm9sZXRoLmNoaS5hYy51azAeFw0xNTAyMTYwODMwMjha
+						Fw0zNTAyMTYwODMwMjhaMBsxGTAXBgNVBAMMEGJvbGV0aC5jaGkuYWMudWswggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+fzYeakSO5FUusjI9Vhtog+BZ
+						M+0NjVqfiODCI3ncYZQSzh4ay3GUWSl/lvimyO1zzjJ+R9BkGfw2xdPXDmSRxf7C
+						FCGvKCR3n8Q1W8A1M85Mc3VnGE6Aj+d7tr4r1x945TdT2mP0ZH/3bCCgWite5Ui3
+						iKM/Ge8t3PghkryisBXRqsKaoQ0bwlT0tPhqCtJRaNcPvrNt9UKbcnvms+/5/KAW
+						ylG2Lg/9Ky2WP+wHUC5sTxu3s8AaA7+mZ+jU4Z7mvPnCaziwS0Agq+xVbPbHzMQp
+						fwVfiNbefl5+gu44gAjJTS2tC1MVu9PmHYxO1NzDq6sF4TJ5tuBczrmYjCd1AgMB
+						AAGjZzBlMB0GA1UdDgQWBBRlDfq/VVhb+hyVo6q++EpXUCh8zDBEBgNVHREEPTA7
+						ghBib2xldGguY2hpLmFjLnVrhidodHRwczovL2JvbGV0aC5jaGkuYWMudWsvaWRw
+						L3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAJ4fiImysQWUrTSzODaOh6l9
+						n1WQz1ZIof3BUJ7uloUSeT2hteVPTtzqTST5+1/CQu3AkE1Hr+lU9N0mw1d6tHYU
+						Pe3XZQmevFn1ulJ1vhB6uqrZU+7VxyC7bijyeLPGUFt42nndQrEGY6bBB8rakL7j
+						oOqkh3Mkziu6hJtedV43jr5chVPgvsKlt74EFJMtiTaxVhB9sTbrVEGJ0zqwalvM
+						yInsBUhcKzyT5IXsl88X1TSgWo34X/Q3C+Cub4AUEq7YJet89bnIVx8YZKfTfMWC
+						GtAN/WcamuAumN0ZlAzcbLNeMxTqEyZxGTF0vjvATxj2iceErIxGkBNOTSd9Kjs=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEhTCCA22gAwIBAgIQbvjmmkrogFEwI+iucB2P2DANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDMyMTAwMDAwMFoXDTE1MDMyMTIzNTk1OVowYDELMAkGA1UE
+						BhMCR0IxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGFVuaXZlcnNpdHkg
+						b2YgQ2hpY2hlc3RlcjEZMBcGA1UEAxMQYm9sZXRoLmNoaS5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMKBt8PF6ojvh7+wqVT+q0UFBW68fwjE
+						iyruGHbiBcuUFBpincjYQFIQUSRch6F/54QVIOgUk4z3aSxH/kpUb9AV8OUwtoWU
+						2uv1CLMvUA1pqRWK4Hj9B/xjXEkQtW0u0BtxHnjCOpAaqKpn4jUh9ys556rFZYTL
+						VoDcOQnBsZeRdhuDXKdqnQ3f9dRLG5PwJuo834b+VggEBWvnBE6cCyPcmvpx2fqt
+						x+W2MBLETjS6eL3gin7aW62D4OtQffe+czUGqmYzT7+nGpTDTIldGgrck7b2+iXw
+						htKzq68ktX0y0aoI8R7S+uW5YKuSJBzzthQg+fJSQKnRspI0ct+75vECAwEAAaOC
+						AWMwggFfMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQW
+						BBSm8emno8fO9kSdBhb7w/12OLshazAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/
+						BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzAN
+						BgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50
+						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYB
+						BQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0
+						MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREE
+						FDASghBib2xldGguY2hpLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQCENaTlCyQS
+						3jXOV6HdRHFFyQNbsVUnbLH6YSoeQRo9alpuMHxx9BNOc5edQS4+lpw4jgk27D2T
+						jA8cHt6P1ngG1mL1Ik1mttw7Od3aP+VaPslUwv6jRRyD7V9QpO0+OOrwhZ5BVKHC
+						a/X6w95OiYPTsdnJ2HX+xqudc4KUM7KdNo8EH/m7st17Wpr7MUw00tnttcABKRzI
+						i6DmnsfZyqhsXGGw5XyMbpXHIAriwM7QNVDRxMyPkOjFxqjEB6siXnED6zDjDTKq
+						FlhScxgz3l0BxePu0f5KaWZBLLc3ogbE7L2drI9xkpdx7Llx2SaWAjhrWKYmjXRl
+						bS11x3ltloR3
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://boleth.chi.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://boleth.chi.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md: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 Chichester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Chichester</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.chi.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@chi.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Mason</md:SurName>
+    <md:EmailAddress>mailto:j.mason@chi.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bolton.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/bolton.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..abe9cc60
--- /dev/null
+++ b/swamid-interfederations-2.0/bolton.ac.uk-oala-metadata.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bolton.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: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">bolton.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID9jCCAt6gAwIBAgIJAMeNs3EXVaFlMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
+						BAYTAkdCMQ4wDAYDVQQIEwVMYW5jczEPMA0GA1UEBxMGQm9sdG9uMSEwHwYDVQQK
+						ExhUaGUgVW5pdmVyc2l0eSBvZiBCb2x0b24xDDAKBgNVBAsTA0lTVDEbMBkGA1UE
+						AxMSbG9naW4uYm9sdG9uLmFjLnVrMB4XDTEzMDExNjE0MzAwOVoXDTIzMDExNDE0
+						MzAwOVowfDELMAkGA1UEBhMCR0IxDjAMBgNVBAgTBUxhbmNzMQ8wDQYDVQQHEwZC
+						b2x0b24xITAfBgNVBAoTGFRoZSBVbml2ZXJzaXR5IG9mIEJvbHRvbjEMMAoGA1UE
+						CxMDSVNUMRswGQYDVQQDExJsb2dpbi5ib2x0b24uYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDOjOVfVGLNGxU5idZ0TXO650ieACNjmzKRmsij
+						eGIOWRR1JdDt1f/Qzn3J4i44AwgTSQOTUb7LLEBXxGZ2IOdyg0Eo2sbdhfrakXSj
+						qupgMXzaRlJqS3Aj1dOPwD7sAoWieZaU9YUaci93pUdReWWRFJNS8+caRb2J86il
+						NUh3KGjFeChv/W5YjYKJJzYTz4I1bIiwxdmkaLKz1xItsrxlVJLb6FbpPQspf+4m
+						aR8odp3zp2C0p2VxCKB7bGrVjz8GtG+C9FLuqr14UAOUkP8gCM5bh5juAqFhiRxq
+						vjqKkt8E1U0GGSA/wrOmfee7jre3a9ZEQ2XDBnhL/vyl/o23AgMBAAGjezB5MAkG
+						A1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRp
+						ZmljYXRlMB0GA1UdDgQWBBQRjeujYHnHVAgjBV2q/kOIkS9oKzAfBgNVHSMEGDAW
+						gBQRjeujYHnHVAgjBV2q/kOIkS9oKzANBgkqhkiG9w0BAQUFAAOCAQEAHNtOuZaJ
+						D0zq7F+m2S/aRNcRldTcYg/SQJprEKG2v+N66K1xtVJRUqy0XaeRl5rXlDwVqgFc
+						IcWzxCQhc2p65iQMTp6ZAnyKFiIY0jGEfCQPYeSTV5rklZo/u1lfO5vruqEZCFsS
+						aoSTBFMoZZg1ERrwWk1KH1LXF+WjDNfRIDAgBr2OUDatFF+n1PMDtNxxXjeb/32d
+						TXO45yY5/ddNJywFOCm5293empnNnBsu/OSkkUX7RhYUr1IFwZXmUiNzvUDMtJym
+						3WiZ+NTdc2zIc4zfAgssu/HL6GwUTKSAGRVPcmJn8UqPawT00r2lqtzDb+54kv27
+						KCsozEp6AzhAYA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.bolton.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bolton.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Bolton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bolton</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bolton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Charlson</md:SurName>
+    <md:EmailAddress>mailto:I.Charlson@bolton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Antony</md:GivenName>
+    <md:SurName>Nikrooz</md:SurName>
+    <md:EmailAddress>mailto:A.Nikrooz@bolton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/booking.ictf.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/booking.ictf.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..2891e179
--- /dev/null
+++ b/swamid-interfederations-2.0/booking.ictf.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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://booking.ictf.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T15:52: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://booking.ictf.ox.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>
+						MIIDBjCCAe6gAwIBAgIJAK/ba/SUiWe2MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWJvb2tpbmcuaWN0Zi5veC5hYy51azAeFw0xMzAzMjEwOTU3NDdaFw0yMzAz
+						MTkwOTU3NDdaMCAxHjAcBgNVBAMTFWJvb2tpbmcuaWN0Zi5veC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/qxQYodiz2wlFTRKTunx1uXub3
+						aMGFCoCz+m7l9lGQdfA+C24PRxWi4StUGqQmMJa97t/WtYcCbr05Ba4Kwg5v4c7g
+						23YBXFVFrFBtZnohMQSg1IaZNkWK8MwQGJTxFD+2b/KHRkrcHGbjEgHgGM+MYtdb
+						kfWswHFR6HHKDV6zkAL+bK338bj/eCywT4hmhLx2iaI4BkkpQNtLZ3BkTVzC/Wxb
+						xZ+Dy6wAfIkv8RMWbHih0+juYDM4FVTzwcn5Q7+O3Lmf//RyQRdZW3Tm+yJoOT4V
+						0qWkqDidl8WUKwmc/oEbsWcMk0PsmZS8o93f59Rsxrjyn/uCcL6p8t2c72kCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVYm9va2luZy5pY3RmLm94LmFjLnVrMB0GA1UdDgQW
+						BBS5EwhqH1HRiDM3x+20r1OE1uZBDjANBgkqhkiG9w0BAQUFAAOCAQEATmwjfTI3
+						9y/e3p4hR77va41wvVS9TOlLCP8eZb9Kz4VwYW1yivqo2XfuLMgjniQWLJrZDDIL
+						I0Z4D8CbN2Bu2fYK9NE7njsUhfbZUrhBd2Ec2XlL2ef8tI5XP8X+okXMRdcUmAG8
+						7J/DKbjByjYOAgZSR2h2YUrV4UmIb1+40ToFUd8DWVlUdNhtNxRecIZvlSd6HDP6
+						PKn+cVXHEvUHhshA/8+FFbOlbBf+lKNiDKMlCdpEngK16aizDRPSbO7rrDyaz7fB
+						t22YY+B+nypOCwam1z5qvpa4YUyp/zhwyjCVuubNP+IZnM2QCvP1PJaI6bffxSng
+						cP2sORZYpAmpdg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://booking.ictf.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://booking.ictf.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://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://booking.ictf.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 ICTF Conference Booking Website</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ictf.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jim</md:GivenName>
+    <md:SurName>Leek</md:SurName>
+    <md:EmailAddress>mailto:jim.leek@eng.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jim</md:GivenName>
+    <md:SurName>Leek</md:SurName>
+    <md:EmailAddress>mailto:jim.leek@eng.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bookings.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bookings.balliol.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..0a15ec1d
--- /dev/null
+++ b/swamid-interfederations-2.0/bookings.balliol.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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://bookings.balliol.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-20T10:51:44Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bookings.balliol.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>
+						MIIDEjCCAfqgAwIBAgIJAMbZ2C/vjx5FMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGWJvb2tpbmdzLmJhbGxpb2wub3guYWMudWswHhcNMTIwNDE3MjA1MzU5WhcN
+						MjIwNDE1MjA1MzU5WjAkMSIwIAYDVQQDExlib29raW5ncy5iYWxsaW9sLm94LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxeX2Jcy7zo8Ul7no
+						hC4u+uyyxZ7iMhtkQl/XFen+x/CrJJ9tZAtN2jtL/k25RcjVHuk4Z6541aDqqR5G
+						1sWi86sPZWQMfeWMLWLgK8waONU50bwAOzuCyYBq1MjX0lJ+QVYJvgF6lkKu4+0H
+						bqKptvOpFcn9OeKU5DGUEz/H4DYvMSUMntmtN5Eluvtxy94r+wdDWdVrY7PZ2M48
+						FtvV8P9luRiBAoMuiGE0Pm/zpoM7Xxt7k4oYZfoG5HOtMKE9dV65pmCKPv+h2bhu
+						Z4FfHWt4U0/4XgvmeM5sY/JPFXGFBK8gXCoRfYMbrfQenzaVHdyN1HN0LCKOjSP3
+						+poaLQIDAQABo0cwRTAkBgNVHREEHTAbghlib29raW5ncy5iYWxsaW9sLm94LmFj
+						LnVrMB0GA1UdDgQWBBQBuS1FvgRlEaZWLgT0c14ZqONLXTANBgkqhkiG9w0BAQUF
+						AAOCAQEAcxupRmcfDqaidBsS+6Cutd16AGoI9wSwP4xfJRPYhtzxO8dzLRiF2iEu
+						QvA86Lpg2nWKDmcyT2o+Ekh9Obi+729Tsbn636ViuIx1oNEm77b6RO3WU1OL9KZp
+						fZfWsEyT20yddL1OW1iagc9xS+1EpRin5kDzxerGouEEr14WM5HD0Bgpn93+fTMx
+						UxXgdaE6PUQc5WC4iYZJGNZkpem9ib2AhZd/pw6stmRcRmS+KybbNTi8FmTWwzYV
+						2vs9eHkIBuxD5LoY31QnqxLDHZ45Zdyr/6mcslWCNti+vmiqzxK276aACCNxZ/4i
+						ceBywtbgjdTLOe0SORf6He5VlljeUg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Balliol Bookings</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stewart</md:GivenName>
+    <md:SurName>Tolhurst</md:SurName>
+    <md:EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stewart</md:GivenName>
+    <md:SurName>Tolhurst</md:SurName>
+    <md:EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bookingsdev.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bookingsdev.balliol.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..e1bbbb12
--- /dev/null
+++ b/swamid-interfederations-2.0/bookingsdev.balliol.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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://bookingsdev.balliol.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="2014-04-15T12:00: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bookingsdev.balliol.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>
+						MIIDGzCCAgOgAwIBAgIJAK5gDlJ0M0NBMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+						BAMTHGJvb2tpbmdzZGV2LmJhbGxpb2wub3guYWMudWswHhcNMTQwMjI3MTMzMTI5
+						WhcNMjQwMjI1MTMzMTI5WjAnMSUwIwYDVQQDExxib29raW5nc2Rldi5iYWxsaW9s
+						Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArdqcsCxH
+						turqSl/2MS79hrrCfoamaWtQvPG27Hkdl1iQLmTVSdkdWOVfdFEg7PGhoCxYKvZi
+						0KQZnMO1WcKLHyIUpaqJa+fITw7fmW4CVk1KvWuua3FYQ9WXceF4aoEFRjdtqmT5
+						pDfjiSRPcx4MTGBDzaAhodKKJKAG3QRkWGQWPY+jw6GuZ3uYRIPURPlJQCmkbYQy
+						l4xuT1rEUL/knv9oVbmoo4R+xHapRWj16fq0T4QPsBhYcrXwnUEWhADurE7POvDX
+						zTI2tNTH80Xgj9IpVjC56TO9GjqEbZ/2MUssHhrXF8CrztJ6n7gsvHuEd7oAC6eN
+						2w99RBgIBLkiewIDAQABo0owSDAnBgNVHREEIDAeghxib29raW5nc2Rldi5iYWxs
+						aW9sLm94LmFjLnVrMB0GA1UdDgQWBBQofjvUEVMYX6jGvsUFnh1OoumrCzANBgkq
+						hkiG9w0BAQUFAAOCAQEARJdCoSGbtzzHlyBvhj3eQINrJ6tw2w5VPjzsVSERmHlj
+						0Nh/RPcUQ1CQacA9HzpeiuHFr5kZ0wJNHcPinoIpQBmoHbKHpT8A+bFeTPHAb8Iu
+						J+5EFJqi/nloVooVsdNGNxeVlFhaycCfTg76VWwbjUzUKmJpKTiDTWDEg1xNO0pH
+						2ezUffGaOYagOM4/jLRjb78nKdG9rQJZJ5zM/HumnVO0xvFAHEZgWwxKF4CpM/FP
+						YPjKarM1GeukK0E8FLYdkJ24WELMhDVDXEZRNDdM+7gLzQgv+wQwYRpnMMrMRAX3
+						ZDKjBX8+kEWIGSHzBuV2+PXDsaik4/fsoIVK7liylQ==
+					</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://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bookingsdev.balliol.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://bookingsdev.balliol.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://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bookingsdev.balliol.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 Balliol Bookings Dev</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Balliol Computing</md:GivenName>
+    <md:EmailAddress>mailto:computing@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Balliol Computing</md:GivenName>
+    <md:EmailAddress>mailto:computing@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/booksandjournals.brillonline.com-shibboleth.xml b/swamid-interfederations-2.0/booksandjournals.brillonline.com-shibboleth.xml
new file mode 100644
index 00000000..442b8e66
--- /dev/null
+++ b/swamid-interfederations-2.0/booksandjournals.brillonline.com-shibboleth.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://booksandjournals.brillonline.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>
+						MIIDwDCCAqigAwIBAgIEToGSDTANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxIzAhBgNV
+						BAoTGlB1Ymxpc2hpbmcgVGVjaG5vbG9neSBQbGMuMRkwFwYDVQQLExBTY2hvbGFy
+						bHkgT25saW5lMSswKQYDVQQDDCJQdWJsaXNoaW5nIFRlY2hub2xvZ3kgW0JyaWxs
+						IExpdmVdMB4XDTExMDkyNzA5MDYyMVoXDTIxMDkyNDA5MDYyMVowgaExCzAJBgNV
+						BAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMSMw
+						IQYDVQQKExpQdWJsaXNoaW5nIFRlY2hub2xvZ3kgUGxjLjEZMBcGA1UECxMQU2No
+						b2xhcmx5IE9ubGluZTErMCkGA1UEAwwiUHVibGlzaGluZyBUZWNobm9sb2d5IFtC
+						cmlsbCBMaXZlXTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALlOyYcy
+						TfkadSzf7/kJAXnd8KY8nNhv1dJXzI9ozZMbLhHGzyr9VSPhjoQq+VUa3BhM6qj2
+						hh1cZezWz+LknFnyw5YttV47ePZ3/Vdddk44+GwF6JvmKBi8HguI5spGscOJrdO6
+						fdTxouDuOWn9iuBl7BbHCAnMxsTwHzFQ6D7ESnyaiXP+PVNc1OJNRjRTlSPm5iTJ
+						wcghLvX6uIYpL9/B8J7YGmdm6UTpKGApeRY8Jp30mc2TMAtC9Drrhl20KGSLTpjh
+						41Q+6w4MpfmRh/Wwz+c5XdIcEaN9qGtXwKSE0LhvXhr/WPTjK8s8zuQN4oR+MbB9
+						grHq7H5XI+slnFsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAUG0xLZOrP7Lzl+NZ
+						j6olGz00Zz9j+Sk9Z/K5x3CuOqTdPhJsYH4gFN/SpJygIeyh33b56HiOVsj2XzZM
+						nWjNX7PPMitpY5jdFkuOz5JM6ULQWP7OwTomVDeGeZAkn7hd0df/jvn/r++bi9II
+						2jvAFztPf8WC8dcNJkNEgt3ibRyVkUHUJVHR6cMaPD0MUCcJQ8HhXrmxYfgAUvm3
+						q3VHKXA1ED3ETRT86tXEjJmWsPdHJ6vzN+56c29WPM6CmbUa6IZOCBcqCixe1sG2
+						D7Xmd/6sfzNiEB5XmkkKgDxts+VWz7dnVvX8nSRX/fxI5KiDCSGRVljvsq6QQnb2
+						YJtBYQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://booksandjournals.brillonline.com/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://booksandjournals.brillonline.com/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Publishing Technology plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Publishing Technology plc: Brill Online Books and Journals</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://booksandjournals.brillonline.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Brill Support</md:GivenName>
+    <md:EmailAddress>mailto:support@brill.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Talvinder</md:GivenName>
+    <md:SurName>Matharu</md:SurName>
+    <md:EmailAddress>mailto:openathens@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..57a1eb38
--- /dev/null
+++ b/swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://box-idp.nordu.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://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.swamid.se/category/eu-adequate-protection</saml:AttributeValue>
+        <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: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://box-idp.nordu.net/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">NORDUnet Box Service Access</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">NORDUnet Box Service Access</mdui:Description>
+        <mdui:DisplayName xml:lang="en">NORDUnet Box Service Access</mdui:DisplayName>
+        <mdui:Description xml:lang="en">NORDUnet Box Service Access</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>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://box-idp.nordu.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://box-idp.nordu.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://box-idp.nordu.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://box-idp.nordu.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://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">NORDUnet Box Service Access</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">NORDUnet Box Service Access (box.com)</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="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:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="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="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="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="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="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="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:GivenName>NORDUNet</md:GivenName>
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/brad.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/brad.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..90e0a8ac
--- /dev/null
+++ b/swamid-interfederations-2.0/brad.ac.uk-oala-metadata.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://brad.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brad.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDlDCCAnygAwIBAgIJANXFuAkInLUOMA0GCSqGSIb3DQEBBQUAMDoxHzAdBgNV
+						BAoTFlVuaXZlcnNpdHkgb2YgQnJhZGZvcmQxFzAVBgNVBAMTDmlkcC5icmFkLmFj
+						LnVrMB4XDTExMTIxNTA3MzU0NloXDTIxMTIxMjA3MzU0NlowOjEfMB0GA1UEChMW
+						VW5pdmVyc2l0eSBvZiBCcmFkZm9yZDEXMBUGA1UEAxMOaWRwLmJyYWQuYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0g3A4ViQaWo3ooKJCJzMT
+						suHZpnYar65+6QiDmZvx1QDGMT+YlYS1jmkuz4YGwJOdj4h9Up9dSCx4M3XweUuD
+						bLclot8c05tOBBzm+8UHkaYnIYx/8GKE8+NKtscerr1UvHlOxTBPPFxogb4X0fQm
+						iW+PEz9wDPpegj4WlY0ktaxgzjhjvZQwFVqGIBxBvdT6phfkWeK5xj2er956tBgl
+						IgCq0fuBp6FVhH1fn+bzxyLN7ORWOnPYZeWbxwECCqRaYD6tsUH2+UL2G6SwnAct
+						7H1K8pvsfvCjHzzDF67B95lTtql/9ifhb4L5Pb58ntwKDoU/G9oYQaN069lwNRIZ
+						AgMBAAGjgZwwgZkwHQYDVR0OBBYEFDeVQv1JG+EQO/AiOsHDqnOjliqEMGoGA1Ud
+						IwRjMGGAFDeVQv1JG+EQO/AiOsHDqnOjliqEoT6kPDA6MR8wHQYDVQQKExZVbml2
+						ZXJzaXR5IG9mIEJyYWRmb3JkMRcwFQYDVQQDEw5pZHAuYnJhZC5hYy51a4IJANXF
+						uAkInLUOMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIby+5WHVMoP
+						2p0mzAeMxtM4hBVP3GKl1lkRTSO1AEXCrVbYuaAw45AfZnuadDiQAKFAC0OezT0S
+						DQcVSpxrLN2LP8nMoFzhlWkk6gIjvRDPkzxOse7EIhtRWerm52D5uQ9b+31OKVcU
+						TXce5suAR/hCXcr41iXDcNDJSQkV1WBfd6UR075umgTEi8ssmbYjM3tjWq+XIFSE
+						6hvalVaP6I5fpC+lcQZTvgHtIkwm0PPGtqyVThivuW9469EITTfXx1fAGKiTzuPC
+						u/73ycpe1n4szaouE0SYZplEht4mi/ZmDI7KrpwMISxEfdCAtz3E6mAfibmPoPie
+						/PZXD7xJX28= </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDlDCCAnygAwIBAgIJANXFuAkInLUOMA0GCSqGSIb3DQEBBQUAMDoxHzAdBgNV
+						BAoTFlVuaXZlcnNpdHkgb2YgQnJhZGZvcmQxFzAVBgNVBAMTDmlkcC5icmFkLmFj
+						LnVrMB4XDTExMTIxNTA3MzU0NloXDTIxMTIxMjA3MzU0NlowOjEfMB0GA1UEChMW
+						VW5pdmVyc2l0eSBvZiBCcmFkZm9yZDEXMBUGA1UEAxMOaWRwLmJyYWQuYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0g3A4ViQaWo3ooKJCJzMT
+						suHZpnYar65+6QiDmZvx1QDGMT+YlYS1jmkuz4YGwJOdj4h9Up9dSCx4M3XweUuD
+						bLclot8c05tOBBzm+8UHkaYnIYx/8GKE8+NKtscerr1UvHlOxTBPPFxogb4X0fQm
+						iW+PEz9wDPpegj4WlY0ktaxgzjhjvZQwFVqGIBxBvdT6phfkWeK5xj2er956tBgl
+						IgCq0fuBp6FVhH1fn+bzxyLN7ORWOnPYZeWbxwECCqRaYD6tsUH2+UL2G6SwnAct
+						7H1K8pvsfvCjHzzDF67B95lTtql/9ifhb4L5Pb58ntwKDoU/G9oYQaN069lwNRIZ
+						AgMBAAGjgZwwgZkwHQYDVR0OBBYEFDeVQv1JG+EQO/AiOsHDqnOjliqEMGoGA1Ud
+						IwRjMGGAFDeVQv1JG+EQO/AiOsHDqnOjliqEoT6kPDA6MR8wHQYDVQQKExZVbml2
+						ZXJzaXR5IG9mIEJyYWRmb3JkMRcwFQYDVQQDEw5pZHAuYnJhZC5hYy51a4IJANXF
+						uAkInLUOMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIby+5WHVMoP
+						2p0mzAeMxtM4hBVP3GKl1lkRTSO1AEXCrVbYuaAw45AfZnuadDiQAKFAC0OezT0S
+						DQcVSpxrLN2LP8nMoFzhlWkk6gIjvRDPkzxOse7EIhtRWerm52D5uQ9b+31OKVcU
+						TXce5suAR/hCXcr41iXDcNDJSQkV1WBfd6UR075umgTEi8ssmbYjM3tjWq+XIFSE
+						6hvalVaP6I5fpC+lcQZTvgHtIkwm0PPGtqyVThivuW9469EITTfXx1fAGKiTzuPC
+						u/73ycpe1n4szaouE0SYZplEht4mi/ZmDI7KrpwMISxEfdCAtz3E6mAfibmPoPie
+						/PZXD7xJX28= </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.brad.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brad.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Bradford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bradford</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brad.ac.uk/library/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Satu</md:GivenName>
+    <md:SurName>Nieminen</md:SurName>
+    <md:EmailAddress>mailto:s.nieminen@bradford.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Geoff</md:GivenName>
+    <md:SurName>Bell</md:SurName>
+    <md:EmailAddress>mailto:g.bell@bradford.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bristol-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/bristol-shib.hosted.exlibrisgroup.com-shib.xml
new file mode 100644
index 00000000..9166b0ad
--- /dev/null
+++ b/swamid-interfederations-2.0/bristol-shib.hosted.exlibrisgroup.com-shib.xml
@@ -0,0 +1,86 @@
+<?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://bristol-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-11T14:16: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bristol-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 Bristol - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">his is an Ex Libris Primo Hosted SP on behalf of the University of Bristol</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDNjCCAh6gAwIBAgIJAIkWelwTQdkGMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
+						BAMTJWRjMDNrZzAzNzlldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTQw
+						NTI2MDUyNjI4WhcNMjQwNTIzMDUyNjI4WjAwMS4wLAYDVQQDEyVkYzAza2cwMzc5
+						ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAmLLqAX90cJhcxejFx99BYTZazaK9Zy892I1i5cOIPdyRtEZm
+						W4/Lj7aUT+U7m2W7+Go9Q4EavP9OUBFxhPI0ffNDQHzkNecVpeJugMpExkOpziet
+						UQ7Hu9wpI0fS3k0CElMCcNkpWi/q6whlDyOMJ1W8a1uXuAkYLe6f9ySRdN8OV/6W
+						qFUtFmS6yziyYFKifhwqeJMIB88Xwm+ibH/p2NsWmCQ+sH15EJ6tNS9oxAXMbywn
+						TQw5Mlg560bGkeBRBD0yS+aEZs5hTg7SMXhJoV0GLPi2jb5IgsjL5/7nWtMMdSnG
+						m6/ZbPVmt/e4jwh8H4TJWCknLQRurM+XYMGizwIDAQABo1MwUTAwBgNVHREEKTAn
+						giVkYzAza2cwMzc5ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
+						BBQWr7RBWVGCpD0Xcucrg00yG2FZqjANBgkqhkiG9w0BAQUFAAOCAQEACbsq0lFP
+						3EdK7+SkT3LmUiRUCLZPopsAcIEmLeB7f35vKltAROGpxteWO1konftz5p8fSpec
+						bXaYtUGvwOcHmxik5SRBEJpuCWFSlUkBIhBJM8HKtSlx9OMqmBL449TVyShDZGqX
+						xr/8TbzueVRtB6IY4SfLsdmXKp9MTswSC94yyLkqMvAGIeAIDlIMYV6rP5w95Y9h
+						1T41keC9ILBwLYIqz7uKmynr91siE6F2ITwZ6Sp1hpa0o1sbcFq0j+KCD64eFaOh
+						AbzbMLCKIHRvB24eIqpA5vLt1u/7cbtuHOUrMxVqlDO9UqOlqhnxRdeN1lncqUnx
+						mAb78NKYEfHMBQ==
+					</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://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bristol-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://bristol-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://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bristol-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://bristol-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://bristol-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 Bristol - 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/brunelstudents.com-shibboleth.xml b/swamid-interfederations-2.0/brunelstudents.com-shibboleth.xml
new file mode 100644
index 00000000..36c14fe0
--- /dev/null
+++ b/swamid-interfederations-2.0/brunelstudents.com-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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://brunelstudents.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T16:10: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://brunelstudents.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://brunelstudents.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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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://brunelstudents.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://brunelstudents.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://brunelstudents.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://brunelstudents.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://brunelstudents.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://brunelstudents.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://brunelstudents.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://brunelstudents.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://brunelstudents.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://brunelstudents.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://brunelstudents.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">Union of Brunel Students</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://brunelstudents.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/bsp-idp-test.shibboleth.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bsp-idp-test.shibboleth.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..9f404085
--- /dev/null
+++ b/swamid-interfederations-2.0/bsp-idp-test.shibboleth.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bsp-idp-test.shibboleth.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="2011-07-19T16: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>
+      <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>
+						MIIDZzCCAk+gAwIBAgIJAM3e/P6wMOMuMA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
+						BAMTIGJzcC1pZHAtdGVzdC5zaGliYm9sZXRoLm94LmFjLnVrMB4XDTE0MDcwMjA3
+						MTI1NloXDTM0MDcwMjA3MTI1NlowKzEpMCcGA1UEAxMgYnNwLWlkcC10ZXN0LnNo
+						aWJib2xldGgub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCt/2e1JENtpBwhw42LY4rGCDtc90BV3+LCKws4GUTs+OWqUcgpzk0/uDSbIOtl
+						AuWR0Sl/EPSbrHdATYOxYXIvBuYWfrBu/h91EcJEaM+ZO72ElDQgahXnTarZMWX6
+						JJKPlYgLRVg5e5L98O9BU4u2w5xcvMAlKZ0UgHpTeEBPtgdXIVTltaPFI1601S+b
+						B/fDAofXpzYa3HkmaLNJ41QA0rFXAVsek5WFKgsY79ncYkMa5eb69ysj3BLIbAPy
+						7DSKFJKMX26+TSRs/j/v2lr1TgGnAvuAkZ9BXwhkRh6jaO59W0oGWtJ2kmxAL4fy
+						MuiWxYAuVe9Q+lgMs4Au9/a3AgMBAAGjgY0wgYowHQYDVR0OBBYEFGBKWbztDye4
+						IfOgk3iFZXCIcw8HMFsGA1UdIwRUMFKAFGBKWbztDye4IfOgk3iFZXCIcw8HoS+k
+						LTArMSkwJwYDVQQDEyBic3AtaWRwLXRlc3Quc2hpYmJvbGV0aC5veC5hYy51a4IJ
+						AM3e/P6wMOMuMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADTLWycf
+						BRfbYZl3N+08fIzb+d3lA82OKXTopCv4Jxn5dE8rnql8qunq19PKymn2JvMImTQ5
+						gEd+kCxCvWnQdQSmSUhfDbNB3LgBkIw4yIbOdzIlVmzAPL7WaIqjgRyx1JmMPheH
+						iGQYoLfVIcDSrLt7mu4ssIrgzxzH/xNgLru+ZW6yuY4UdntS3OyWTssGFW3pqftv
+						6aPCyW8KB6ycsPwZGHyGFIbBmJMRFztYVlfKi4MzI7uhsv6TXVfsIxzNopTLL8CS
+						w/O6T47a6BBXJjj5BtU9t7h15TTjG/X5Sie1mIPYUjprTZhcuNyzN/LX90F1yM0G
+						TIMOueSzlXJLKyY=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bsp-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://bsp-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://bsp-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://bsp-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://bsp-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://bsp-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>
+						MIIDZzCCAk+gAwIBAgIJAM3e/P6wMOMuMA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
+						BAMTIGJzcC1pZHAtdGVzdC5zaGliYm9sZXRoLm94LmFjLnVrMB4XDTE0MDcwMjA3
+						MTI1NloXDTM0MDcwMjA3MTI1NlowKzEpMCcGA1UEAxMgYnNwLWlkcC10ZXN0LnNo
+						aWJib2xldGgub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCt/2e1JENtpBwhw42LY4rGCDtc90BV3+LCKws4GUTs+OWqUcgpzk0/uDSbIOtl
+						AuWR0Sl/EPSbrHdATYOxYXIvBuYWfrBu/h91EcJEaM+ZO72ElDQgahXnTarZMWX6
+						JJKPlYgLRVg5e5L98O9BU4u2w5xcvMAlKZ0UgHpTeEBPtgdXIVTltaPFI1601S+b
+						B/fDAofXpzYa3HkmaLNJ41QA0rFXAVsek5WFKgsY79ncYkMa5eb69ysj3BLIbAPy
+						7DSKFJKMX26+TSRs/j/v2lr1TgGnAvuAkZ9BXwhkRh6jaO59W0oGWtJ2kmxAL4fy
+						MuiWxYAuVe9Q+lgMs4Au9/a3AgMBAAGjgY0wgYowHQYDVR0OBBYEFGBKWbztDye4
+						IfOgk3iFZXCIcw8HMFsGA1UdIwRUMFKAFGBKWbztDye4IfOgk3iFZXCIcw8HoS+k
+						LTArMSkwJwYDVQQDEyBic3AtaWRwLXRlc3Quc2hpYmJvbGV0aC5veC5hYy51a4IJ
+						AM3e/P6wMOMuMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADTLWycf
+						BRfbYZl3N+08fIzb+d3lA82OKXTopCv4Jxn5dE8rnql8qunq19PKymn2JvMImTQ5
+						gEd+kCxCvWnQdQSmSUhfDbNB3LgBkIw4yIbOdzIlVmzAPL7WaIqjgRyx1JmMPheH
+						iGQYoLfVIcDSrLt7mu4ssIrgzxzH/xNgLru+ZW6yuY4UdntS3OyWTssGFW3pqftv
+						6aPCyW8KB6ycsPwZGHyGFIbBmJMRFztYVlfKi4MzI7uhsv6TXVfsIxzNopTLL8CS
+						w/O6T47a6BBXJjj5BtU9t7h15TTjG/X5Sie1mIPYUjprTZhcuNyzN/LX90F1yM0G
+						TIMOueSzlXJLKyY=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bsp-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://bsp-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: (BSP-test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.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/bsp-idp.shibboleth.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bsp-idp.shibboleth.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..5a14c24d
--- /dev/null
+++ b/swamid-interfederations-2.0/bsp-idp.shibboleth.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bsp-idp.shibboleth.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"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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>
+						MIIEkDCCA3igAwIBAgIJAK74tuCrn4gMMA0GCSqGSIb3DQEBBQUAMIHIMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
+						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxGzAZBgNVBAsTEkNvbXB1dGlu
+						ZyBTZXJ2aWNlczEkMCIGA1UEAxMbYnNwLWlkcC5zaGliYm9sZXRoLm94LmFjLnVr
+						MTAwLgYJKoZIhvcNAQkBFiFlbWFpbEFkZHJlc3M9c3lzZGV2QG91Y3Mub3guYWMu
+						dWswHhcNMTIwNTE4MDg1MjMwWhcNMjIwNTE2MDg1MjMwWjCByDELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNV
+						BAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRswGQYDVQQLExJDb21wdXRpbmcgU2Vy
+						dmljZXMxJDAiBgNVBAMTG2JzcC1pZHAuc2hpYmJvbGV0aC5veC5hYy51azEwMC4G
+						CSqGSIb3DQEJARYhZW1haWxBZGRyZXNzPXN5c2RldkBvdWNzLm94LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvnBxr4sjCqHqNQuqRKlscoqV
+						n+KjKIL4oDVQY8lZpp9jbce7cLopWhAMhWXA5YwWBJTluYPkiEnzLQsWPdf4EKAG
+						PtXz9OVAjZzKq3KB/Rdi29LUjuI5Ugd39OJn1NIH2FsVG7z/te3IrHf/n7/mTmYl
+						OpPJ7XaAJgrRiNil5M2n/tmSg1rhbghR3TQAh0qtsO0h5N/b6cnRyFxVWk5Wn4U6
+						KPfYd+jVCUkOawC22bW+6Poxh6fDDm9RgCstP14MpdST7VWBidv7kc1HiuSS/DH0
+						dj3l9eqtpObDhUVHdDHTffpS32IuEdqPq5xJ80QRCmQxeRIQW3qzlAG3c4+WpwID
+						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
+						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUhm2QdhrbYvY9WzUEmTv/iAkRq5Uw
+						HwYDVR0jBBgwFoAUhm2QdhrbYvY9WzUEmTv/iAkRq5UwDQYJKoZIhvcNAQEFBQAD
+						ggEBAIO+pz3LCPf88PSx7Mm3KbJ+EPxPbwY+nlk2IuIkxIDR4IVpdCV6uY70uR8+
+						bN7mb9mpjGsJGcyDpSncQmM3qwC45Lv6F0giJQXCH84iTPoFoLSjToxE9kYaN9tg
+						UOQiZODEuQWLGp80qHHWKYpG1/wxok3chwUW0dy8zGSm9esWwbEsInkm0cKq4MiG
+						wZ0maBagoaennxoKP9DKJp7bSePoAh/nZTCzQaQGK1JcQZsgzkHnomf7UaUFuslH
+						pDq4lDx2f/mAtxY40toa3H7Bgm5Dd/lkqpgeYI5kkOJmlFCYroKrmhG0jtOX3RMT
+						8aC6ef6hAwmREKbmNT8faiMPsss=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bsp-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://bsp-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://bsp-idp.shibboleth.ox.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bsp-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://bsp-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://bsp-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>
+						MIIEkDCCA3igAwIBAgIJAK74tuCrn4gMMA0GCSqGSIb3DQEBBQUAMIHIMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
+						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxGzAZBgNVBAsTEkNvbXB1dGlu
+						ZyBTZXJ2aWNlczEkMCIGA1UEAxMbYnNwLWlkcC5zaGliYm9sZXRoLm94LmFjLnVr
+						MTAwLgYJKoZIhvcNAQkBFiFlbWFpbEFkZHJlc3M9c3lzZGV2QG91Y3Mub3guYWMu
+						dWswHhcNMTIwNTE4MDg1MjMwWhcNMjIwNTE2MDg1MjMwWjCByDELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNV
+						BAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRswGQYDVQQLExJDb21wdXRpbmcgU2Vy
+						dmljZXMxJDAiBgNVBAMTG2JzcC1pZHAuc2hpYmJvbGV0aC5veC5hYy51azEwMC4G
+						CSqGSIb3DQEJARYhZW1haWxBZGRyZXNzPXN5c2RldkBvdWNzLm94LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvnBxr4sjCqHqNQuqRKlscoqV
+						n+KjKIL4oDVQY8lZpp9jbce7cLopWhAMhWXA5YwWBJTluYPkiEnzLQsWPdf4EKAG
+						PtXz9OVAjZzKq3KB/Rdi29LUjuI5Ugd39OJn1NIH2FsVG7z/te3IrHf/n7/mTmYl
+						OpPJ7XaAJgrRiNil5M2n/tmSg1rhbghR3TQAh0qtsO0h5N/b6cnRyFxVWk5Wn4U6
+						KPfYd+jVCUkOawC22bW+6Poxh6fDDm9RgCstP14MpdST7VWBidv7kc1HiuSS/DH0
+						dj3l9eqtpObDhUVHdDHTffpS32IuEdqPq5xJ80QRCmQxeRIQW3qzlAG3c4+WpwID
+						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
+						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUhm2QdhrbYvY9WzUEmTv/iAkRq5Uw
+						HwYDVR0jBBgwFoAUhm2QdhrbYvY9WzUEmTv/iAkRq5UwDQYJKoZIhvcNAQEFBQAD
+						ggEBAIO+pz3LCPf88PSx7Mm3KbJ+EPxPbwY+nlk2IuIkxIDR4IVpdCV6uY70uR8+
+						bN7mb9mpjGsJGcyDpSncQmM3qwC45Lv6F0giJQXCH84iTPoFoLSjToxE9kYaN9tg
+						UOQiZODEuQWLGp80qHHWKYpG1/wxok3chwUW0dy8zGSm9esWwbEsInkm0cKq4MiG
+						wZ0maBagoaennxoKP9DKJp7bSePoAh/nZTCzQaQGK1JcQZsgzkHnomf7UaUFuslH
+						pDq4lDx2f/mAtxY40toa3H7Bgm5Dd/lkqpgeYI5kkOJmlFCYroKrmhG0jtOX3RMT
+						8aC6ef6hAwmREKbmNT8faiMPsss=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bsp-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://bsp-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 (BSP)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sysdev</md:GivenName>
+    <md:EmailAddress>mailto:sysdev@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Help</md:GivenName>
+    <md:EmailAddress>mailto:help@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/butare.ifrn.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/butare.ifrn.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..468945ad
--- /dev/null
+++ b/swamid-interfederations-2.0/butare.ifrn.edu.br-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://butare.ifrn.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">ifrn.local</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifrn.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifrn.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>
+    MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEOMAwGA1UECxMFRElHVEkxCzAJ
+BgNVBAYTAkJSMQ8wDQYDVQQDEwZidXRhcmUwHhcNMTQwNTIzMTcxNjA1WhcNMTkw
+NTIyMTcxNjA1WjAuMQ4wDAYDVQQLEwVESUdUSTELMAkGA1UEBhMCQlIxDzANBgNV
+BAMTBmJ1dGFyZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM36HWGk
+w9Q7QoZ/pbtE5BKDjrXkwJ9tZVggplOmcnG4XzvKsafA5oTyjkentzuk089/V8JN
+9mzTByAOyMJ1HZLoaWRKw5irjAh81RrPPZyLPjC3VCU6S7VGBwpwu/scnrLkIuz2
+PA4unF/vgPY0GCLtkVS7TKm59szt87xZQfhvKTibtji+DXqeJktm0L1DfZBWC1yH
+VTedJJUOzlGRh44xyZMcmyXO0J2sIu2BTHg0pbZkMmWubG0Gg5ieyn540znoTQ0Y
+ykhImtdHzr+NJnNJUrx0FP+tsfPlY+9+Jtd2hM8PwWoxyrMZ/Hrj6R3kblT4Ycu7
+zIgWdGliX+T+zoECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEASiVRDUu+K0fsrVl8
+Ld9zFoEKWhywzji/ySqDyIep1wf9HKzuPscMkol+lHcwqWdDfP4dSCeIbBp0HB/M
+/b9h67Kd8W2HMo1Mj12dOow0SfUtSkS8jbGctmwRxok5wf4SkCBlXmDKw04T7O0u
+lx+OaodZO13DPijFFDZ6R5nzOpwA6e+psoKODdqhm5mvQ+VDbRT/YZuunq68OAp7
+W35U8nuplIQL1tiVmUzL7Zub4O/riXx0JChZvR5A5tw4s3ciugLNbUx/UAJkntmG
+Xwk5tjWfp+KBfraGK4/jLrShRzEEXl6J8UQl9r5q7ZD1UqQdRentbihSj4pfN5ID
+UG8d4Q==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://butare.ifrn.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://butare.ifrn.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://butare.ifrn.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://butare.ifrn.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://butare.ifrn.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://butare.ifrn.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">ifrn.local</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEOMAwGA1UECxMFRElHVEkxCzAJ
+BgNVBAYTAkJSMQ8wDQYDVQQDEwZidXRhcmUwHhcNMTQwNTIzMTcxNjA1WhcNMTkw
+NTIyMTcxNjA1WjAuMQ4wDAYDVQQLEwVESUdUSTELMAkGA1UEBhMCQlIxDzANBgNV
+BAMTBmJ1dGFyZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM36HWGk
+w9Q7QoZ/pbtE5BKDjrXkwJ9tZVggplOmcnG4XzvKsafA5oTyjkentzuk089/V8JN
+9mzTByAOyMJ1HZLoaWRKw5irjAh81RrPPZyLPjC3VCU6S7VGBwpwu/scnrLkIuz2
+PA4unF/vgPY0GCLtkVS7TKm59szt87xZQfhvKTibtji+DXqeJktm0L1DfZBWC1yH
+VTedJJUOzlGRh44xyZMcmyXO0J2sIu2BTHg0pbZkMmWubG0Gg5ieyn540znoTQ0Y
+ykhImtdHzr+NJnNJUrx0FP+tsfPlY+9+Jtd2hM8PwWoxyrMZ/Hrj6R3kblT4Ycu7
+zIgWdGliX+T+zoECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEASiVRDUu+K0fsrVl8
+Ld9zFoEKWhywzji/ySqDyIep1wf9HKzuPscMkol+lHcwqWdDfP4dSCeIbBp0HB/M
+/b9h67Kd8W2HMo1Mj12dOow0SfUtSkS8jbGctmwRxok5wf4SkCBlXmDKw04T7O0u
+lx+OaodZO13DPijFFDZ6R5nzOpwA6e+psoKODdqhm5mvQ+VDbRT/YZuunq68OAp7
+W35U8nuplIQL1tiVmUzL7Zub4O/riXx0JChZvR5A5tw4s3ciugLNbUx/UAJkntmG
+Xwk5tjWfp+KBfraGK4/jLrShRzEEXl6J8UQl9r5q7ZD1UqQdRentbihSj4pfN5ID
+UG8d4Q==
+		    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://butare.ifrn.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://butare.ifrn.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">IFRN - Instituto Federal do Rio Grande do Norte</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifrn.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifrn.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Carlos Eduardo Egito</md:SurName>
+    <md:EmailAddress>eduardo.egito@ifrn.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..660c8411
--- /dev/null
+++ b/swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bwidpsrv01.bridgwater.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-10T08:33: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bridgwater.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEhDCCA2ygAwIBAgIRAMLq8DxqQ9VM4MxH2N6y4W0wDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA0MDkwMDAwMDBaFw0xNjA0MDgyMzU5NTlaMEkxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbYndpZHBzMTIw
+						MS5icmlkZ3dhdGVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEA0vlQR95+UaFwqN9If+FF/DU6lCK2B3IMNchzTjKYy+JjlA1HvOHRk3YvbqZZ
+						HYER7PGKedRiSLXp84T3+j1LJt0NsCsusT2HqJUOMtmA4TIJykbUCszM1+AhdlrM
+						EvZa64Sex4YHU/5pbhJM56Wvv407Zu8MadScmFI/wTUSbXFivXQ3Bo8oBS3noMGM
+						Vm5zWZo25rhdz9TKqIiqH8zIIrNoSDT/euxWFQHC+SaL63hvClgGKTskQPHtawsZ
+						eVwKvvK/3VA2kvp32cSyrakYQMSMUaDj/WJUL+hyhRAtVvHeF3cqiKj1260vbW26
+						1WGm1lm4Y2m4QTGnzvi/1TkO3wIDAQABo4IBeDCCAXQwHwYDVR0jBBgwFoAUDL2T
+						aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFB33fJXVzgHhXKe+YK6Bry+6aYIV
+						MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
+						BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
+						ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
+						UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
+						Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
+						hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdghtid2lkcHMx
+						MjAxLmJyaWRnd2F0ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAL7LFjSMYEy9
+						ZE++GoD34F7WvVSqKoHBKtAqemCe4xFzTCzskZhLkOY6SXnJJtbq5/DHpd2qL22g
+						wnhNCJtzTTzZSuzNrFzOeWhp1m+bJH/8Xcjl/5Cf/Eo4BIfeSrQuJOPSdxMMWG6A
+						tLzewEIs6Ibb+b8sUy7j8BA9ky+skXRQL2SlM3ioMDYIiK8Jckk1OKd1U35KQ++i
+						VKdye05mxWSD5Mknta9K1c8biDUf2BqPgy8+QsE2AvfY8+Nov3+bJq6ksSuwAXb6
+						nGnCuRnmVxN86RptKz5oaKroizlEAlQY7CaJ0vzcP9nqMA9B3A5JuUeIgKYEjEjA
+						+4L3YUYYg5I=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bwidps1201.bridgwater.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bwidps1201.bridgwater.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://bwidps1201.bridgwater.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bwidps1201.bridgwater.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bwidps1201.bridgwater.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bwidps1201.bridgwater.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bridgwater.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEhDCCA2ygAwIBAgIRAMLq8DxqQ9VM4MxH2N6y4W0wDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA0MDkwMDAwMDBaFw0xNjA0MDgyMzU5NTlaMEkxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbYndpZHBzMTIw
+						MS5icmlkZ3dhdGVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEA0vlQR95+UaFwqN9If+FF/DU6lCK2B3IMNchzTjKYy+JjlA1HvOHRk3YvbqZZ
+						HYER7PGKedRiSLXp84T3+j1LJt0NsCsusT2HqJUOMtmA4TIJykbUCszM1+AhdlrM
+						EvZa64Sex4YHU/5pbhJM56Wvv407Zu8MadScmFI/wTUSbXFivXQ3Bo8oBS3noMGM
+						Vm5zWZo25rhdz9TKqIiqH8zIIrNoSDT/euxWFQHC+SaL63hvClgGKTskQPHtawsZ
+						eVwKvvK/3VA2kvp32cSyrakYQMSMUaDj/WJUL+hyhRAtVvHeF3cqiKj1260vbW26
+						1WGm1lm4Y2m4QTGnzvi/1TkO3wIDAQABo4IBeDCCAXQwHwYDVR0jBBgwFoAUDL2T
+						aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFB33fJXVzgHhXKe+YK6Bry+6aYIV
+						MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
+						BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
+						ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
+						UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
+						Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
+						hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdghtid2lkcHMx
+						MjAxLmJyaWRnd2F0ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAL7LFjSMYEy9
+						ZE++GoD34F7WvVSqKoHBKtAqemCe4xFzTCzskZhLkOY6SXnJJtbq5/DHpd2qL22g
+						wnhNCJtzTTzZSuzNrFzOeWhp1m+bJH/8Xcjl/5Cf/Eo4BIfeSrQuJOPSdxMMWG6A
+						tLzewEIs6Ibb+b8sUy7j8BA9ky+skXRQL2SlM3ioMDYIiK8Jckk1OKd1U35KQ++i
+						VKdye05mxWSD5Mknta9K1c8biDUf2BqPgy8+QsE2AvfY8+Nov3+bJq6ksSuwAXb6
+						nGnCuRnmVxN86RptKz5oaKroizlEAlQY7CaJ0vzcP9nqMA9B3A5JuUeIgKYEjEjA
+						+4L3YUYYg5I=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bwidps1201.bridgwater.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bwidps1201.bridgwater.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bridgwater College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bridgwater College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bridgwater.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Anderson</md:SurName>
+    <md:EmailAddress>mailto:andersonr@bridgwater.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Anderson</md:SurName>
+    <md:EmailAddress>mailto:andersonr@bridgwater.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/c.yz.yamagata-u.ac.jp-shibboleth-sp.xml b/swamid-interfederations-2.0/c.yz.yamagata-u.ac.jp-shibboleth-sp.xml
new file mode 100644
index 00000000..56800ff3
--- /dev/null
+++ b/swamid-interfederations-2.0/c.yz.yamagata-u.ac.jp-shibboleth-sp.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://c.yz.yamagata-u.ac.jp/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.gakunin.jp" registrationInstant="2010-06-21T00: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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1: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://c.yz.yamagata-u.ac.jp/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Database Amenity Laboratory of Virtual Research Institute, Yamagata University</mdui:DisplayName>
+        <mdui:Description xml:lang="ja">科学技術の学術情報共有のための双方向コミュニケーションサービス</mdui:Description>
+        <mdui:Logo height="31" width="88">https://a.yamagata-u.ac.jp/amenity/jpg/youzan_banner8831.jpg</mdui:Logo>
+        <mdui:InformationURL xml:lang="ja">https://a.yamagata-u.ac.jp/amenity/menu/shibbolethmenu.aspx</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE4jCCA8qgAwIBAgIIfCMzoF9ue+4wDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UE
+BhMCSlAxETAPBgNVBAcTCEFjYWRlbWUyMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0
+aXR1dGUgb2YgSW5mb3JtYXRpY3MxDTALBgNVBAsTBFVQS0kxIDAeBgNVBAsTF05J
+SSBPcGVuIERvbWFpbiBDQSAtIEcyMB4XDTEzMTAwMzA4NTMwOVoXDTE1MTEwMjA5
+MDMwOVowgZAxCzAJBgNVBAYTAkpQMREwDwYDVQQHEwhBY2FkZW1lMjEcMBoGA1UE
+ChMTWWFtYWdhdGEgVW5pdmVyc2l0eTEwMC4GA1UECxMnTmV0d29ya2luZyBhbmQg
+Q29tcHV0aW5nIFNlcnZpY2UgQ2VudGVyMR4wHAYDVQQDExVjLnl6LnlhbWFnYXRh
+LXUuYWMuanAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC53hi5ZLsf
+w7TtCOZ/VmjjF+QlbbJw9/m79AKafPq5pgp/1+rdpouGVG9eqwsBk8TMY+0mN7e8
+9jrgeoOI2Lq1G2S9Q+WOyrr3QVrnFLEeMr/nhYKFzTGh18SsvvL1Rn4GxELPHFpm
+xyK5L3VFgDMQxXN+eNyAt9k/jsn/ugyJrMWAIwPZ3gN45KP1FzcAV5wCNNUK1vAw
+f91V+WzzuotlMUexXiVh+BPI6trkr7d1qAGHhQ3pOCE5akkWQ7qea4cfDHZDAXCK
+5+lajN2IsZK6p1mHxKUBw41To9RVJFIfptpBa+NMiK/wRNHVdQNur5EWojW1RgPo
+uv+3iWeOf8fNAgMBAAGjggFQMIIBTDAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAww
+CgYIKwYBBQUHAwEwHQYDVR0OBBYEFDoI009Wwrb56X0V/UCYX4Li65gMMB8GA1Ud
+IwQYMBaAFHsKB/cYyowO1tq8UIBsLEcC0Q37MCAGA1UdEQQZMBeCFWMueXoueWFt
+YWdhdGEtdS5hYy5qcDBmBgNVHSAEXzBdME0GCiqDCIycHgECAgEwPzA9BggrBgEF
+BQcCARYxaHR0cHM6Ly9yZXBvMS5zZWNvbXRydXN0Lm5ldC9zcGNwcC9jcHMvaW5k
+ZXguaHRtbDAMBgoqgwiMmxtkhwUBMEgGA1UdHwRBMD8wPaA7oDmGN2h0dHA6Ly9y
+ZXBvMS5zZWNvbXRydXN0Lm5ldC9zcHBjYS9uaWkvb2RjYTIvZnVsbGNybC5jcmww
+EQYJYIZIAYb4QgEBBAQDAgZAMA0GCSqGSIb3DQEBBQUAA4IBAQBcEuFzX4c1vnJw
+B0Y+uN7gr0EO/yFG2cnzEh6EhwAWTrDdF2uDY58HDKbRR0GGqojATgZvtXkE8jn+
+5REAlF0cu+qa5lXTbxYb2ArMjQHY/qTOBnO6/b/lo43+M3x3OXoc/2mV1zHBrh8c
+/NPWl6girCzKqTUd1JJUvjM/VPic8abmzOxIhWLa444jWgFWkA+EqQkJpe9p8r9M
+0h+lJYRn/zZsWA2AbYF0ppkixzk3hHbUwZuuTEZzkAebZh2ZPXZnS0CFfr3VrZbr
+s33kSvCLr3uJ6cetUI0He33NAju0L76lTrfm8lbstwvfvMaruo7tntGmBGL2WRrM
+ZH4U1IHm</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://c.yz.yamagata-u.ac.jp/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://c.yz.yamagata-u.ac.jp/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://c.yz.yamagata-u.ac.jp/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://c.yz.yamagata-u.ac.jp/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://c.yz.yamagata-u.ac.jp/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="en">Database Amenity Laboratory of Virtual Research Institute, Yamagata University</md:ServiceName>
+      <md:ServiceDescription xml:lang="ja">科学技術の学術情報共有のための双方向コミュニケーションサービス</md:ServiceDescription>
+      <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="eduPersonPrincipalName" Name="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">Yamagata University</md:OrganizationName>
+    <md:OrganizationName xml:lang="ja">山形大学</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Database Amenity Laboratory of Virtual Research Institute, Yamagata University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://a.yamagata-u.ac.jp/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tomohiro</md:GivenName>
+    <md:SurName>Ito</md:SurName>
+    <md:EmailAddress>mailto:virtual-amenity@yahoogroups.jp</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..781751de
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe-gateway.ifce.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFCE - Instituto Federal de Educacao do Ceara</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFCE - Instituto Federal de Educacao do Ceara</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifce.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifce.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>
+    MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQw
+NDIzMTQxMTM1WhcNMTkwNDIyMTQxMTM1WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMG0Ale+E+Hc6LXUIYFAyexypOGse0ZA
+iHv8A1m2SoiVpP/AuxZjHeZ8tgYB2g9wEV7sBVtRzcWPpfDnMEnwV0ycZLq1ud85
+anRUWHCXgqjgBOJPC5SNfur9b+c+z68csotN67l/4KhThVlX1bDSKsgb9sBzlHdx
+lmjPqPt4nPQG3f3eg+A+zVVoTbciDR+MM0aaoww0oFspsBxsSOzmwTO8y5SWh0Zt
+DN50/KIeZqdmLR/bNg0VIHieyKggu0df7583pofwhq/khw85kayRWOZRlK2DPqM4
+lkWYFa9hwi7SjViGte4iFBm5QyU9ROxtr1BrRruVh1gvRiQ21JEqYh0CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAgAWYi5wzaShN4+xW6GKvJB95rStAKuVBMNbvOaW+
+VvokC6np6tH3c6DmJS4Nk2ko8JvW46JKE7FDJ33yhdbg7DNFE8d9jTj1afNL99p8
+RnKzPbbDSpF86ZMV/CcGW3gKf/EpRr3M7g7Q+1bP5IBgF1wlxaP6hge0FbmKOML/
+cSsmJF5QDRLxFl+wUr9NYd05jJwNn87GVqad1+05/vnafFOk3c8k0ZD1BrCpX6eZ
+F/cL2jO5urN3UFVa2NBuec51EbyHkL8vkzLdUf3pGTP/aDDHiUofaXC1MA2+xo1o
+WKF3ut56xBKMt3NdUfAXqqOu8wRUZYIwpU2ZpT8Cn4Y7Yw==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-gateway.ifce.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://cafe-gateway.ifce.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://cafe-gateway.ifce.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe-gateway.ifce.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe-gateway.ifce.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe-gateway.ifce.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>
+      
+MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQw
+NDIzMTQxMTM1WhcNMTkwNDIyMTQxMTM1WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMG0Ale+E+Hc6LXUIYFAyexypOGse0ZA
+iHv8A1m2SoiVpP/AuxZjHeZ8tgYB2g9wEV7sBVtRzcWPpfDnMEnwV0ycZLq1ud85
+anRUWHCXgqjgBOJPC5SNfur9b+c+z68csotN67l/4KhThVlX1bDSKsgb9sBzlHdx
+lmjPqPt4nPQG3f3eg+A+zVVoTbciDR+MM0aaoww0oFspsBxsSOzmwTO8y5SWh0Zt
+DN50/KIeZqdmLR/bNg0VIHieyKggu0df7583pofwhq/khw85kayRWOZRlK2DPqM4
+lkWYFa9hwi7SjViGte4iFBm5QyU9ROxtr1BrRruVh1gvRiQ21JEqYh0CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAgAWYi5wzaShN4+xW6GKvJB95rStAKuVBMNbvOaW+
+VvokC6np6tH3c6DmJS4Nk2ko8JvW46JKE7FDJ33yhdbg7DNFE8d9jTj1afNL99p8
+RnKzPbbDSpF86ZMV/CcGW3gKf/EpRr3M7g7Q+1bP5IBgF1wlxaP6hge0FbmKOML/
+cSsmJF5QDRLxFl+wUr9NYd05jJwNn87GVqad1+05/vnafFOk3c8k0ZD1BrCpX6eZ
+F/cL2jO5urN3UFVa2NBuec51EbyHkL8vkzLdUf3pGTP/aDDHiUofaXC1MA2+xo1o
+WKF3ut56xBKMt3NdUfAXqqOu8wRUZYIwpU2ZpT8Cn4Y7Yw==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-gateway.ifce.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe-gateway.ifce.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">IFCE - Instituto Federal de Educacao do Ceara</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFCE - Instituto Federal de Educacao do Ceara</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifce.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifce.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jessyca</md:SurName>
+    <md:EmailAddress>jessyca@ifce.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe-idp.ufc.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe-idp.ufc.br-idp-shibboleth.xml
new file mode 100644
index 00000000..a25c44ff
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe-idp.ufc.br-idp-shibboleth.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe-idp.ufc.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">ufc.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFC - Universidade Federal do Ceara</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFC - Universidade Federal do Ceara</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFC - Universidade Federal do Ceara</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFC - Universidade Federal do Ceara</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufc.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufc.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIFVjCCBD6gAwIBAgISESGwx2jv72u5M30bUGytllkYMA0GCSqGSIb3DQEBCwUA
+MIGpMQswCQYDVQQGEwJCUjEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xFzAVBgNV
+BAcTDlJpbyBkZSBKYW5laXJvMSQwIgYDVQQLExtHZXJlbmNpYSBkZSBTZXJ2aWNv
+cyAoR1NlcikxMTAvBgNVBAoTKFJlZGUgTmFjaW9uYWwgZGUgRW5zaW5vIGUgUGVz
+cXVpc2EgLSBSTlAxDzANBgNVBAMTBklDUEVkdTAeFw0xNTAxMjkxODU2MDNaFw0x
+ODAxMjkxODU2MDNaMHAxCzAJBgNVBAYTAkJSMQswCQYDVQQIEwJDRTESMBAGA1UE
+BxMJRm9ydGFsZXphMSYwJAYDVQQKEx1VTklWRVJTSURBREUgRkVERVJBTCBETyBD
+RUFSQTEYMBYGA1UEAxMPY2FmZS1pZHAudWZjLmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA5mmwq3ScV2FZL+AbZxcuOALuAp0dnETymHyJeXQ4OStE
+mRrdINtjjDRiSPMYVWAY10rllQw73sjmZ64Hlf/ER4RhqZIhBFIu4XKEvglKO5dP
+MI0uCVvz1RIx6zz4Zny9GmxCzVQF5gCI81vksduFdVrqsZ0sIqd0MUyx9D/57O3c
+YhvJh/KMctF+53NH+OkXwUH7CvhluRUFI9IjtKISSsMPlnZIpVhIolHmqW834Bfe
+L4m80VOT1oUwg5JjNL/BWRyM9enzwSP0wT+rZnlmgqo3udBoO2g7LcLQ2GabxPID
+dLANiQv60Vw58RD7dVyzT/73M2JHIsOuzmpCOnVdiwIDAQABo4IBrjCCAaowDgYD
+VR0PAQH/BAQDAgWgMEkGA1UdIARCMEAwPgYGZ4EMAQICMDQwMgYIKwYBBQUHAgEW
+Jmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMBoGA1UdEQQT
+MBGCD2NhZmUtaWRwLnVmYy5icjAJBgNVHRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUF
+BwMBBggrBgEFBQcDAjA+BgNVHR8ENzA1MDOgMaAvhi1odHRwOi8vY3JsLmdsb2Jh
+bHNpZ24uY29tL2dzL2ljcGVkdXNoYTJnMi5jcmwwgYYGCCsGAQUFBwEBBHoweDBA
+BggrBgEFBQcwAoY0aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQv
+aWNwZWR1c2hhMmcyLmNydDA0BggrBgEFBQcwAYYoaHR0cDovL29jc3AyLmdsb2Jh
+bHNpZ24uY29tL2ljcGVkdXNoYTJnMjAdBgNVHQ4EFgQUEcKIonX/zpNFnXfdkUYP
+MRdG7mEwHwYDVR0jBBgwFoAUlfCkhBqnXCA2psUI12VCAuV3aOMwDQYJKoZIhvcN
+AQELBQADggEBAEyWJQd7Q20jRhjUM3Ue+ySclvHDETUhgnEYcnnJAUeBtNlF/e2l
+TmV/jfzWDX1tkHkyJbDUZyCOvsmPyGgre5n8ZR42Jf9iJkeEqm3LDnvHrEO2LIDV
+dHyNFUeaVBvn3hvA/tvwdRvaSEzxUtVUQ2X+J/4z/38VUXYtufumZekm8D+L6Koe
+5bIDnlUKqHjO/25ph8xm7K5S3BjkL0fQwrEZImgTIEBhWPLnwVUaOPahMwUGeWf8
+aGkhxUVPyqMyuAr0p2iujFM0X8kGWL9nJCAARH4f9rnJs2gOhphoSHpbAKZdtq4Z
+//f+GmXi7h7Buz4+dG0ibmbq8NCOoHJDdys=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-idp.ufc.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe-idp.ufc.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://cafe-idp.ufc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe-idp.ufc.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe-idp.ufc.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe-idp.ufc.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">ufc.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIFVjCCBD6gAwIBAgISESGwx2jv72u5M30bUGytllkYMA0GCSqGSIb3DQEBCwUA
+MIGpMQswCQYDVQQGEwJCUjEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xFzAVBgNV
+BAcTDlJpbyBkZSBKYW5laXJvMSQwIgYDVQQLExtHZXJlbmNpYSBkZSBTZXJ2aWNv
+cyAoR1NlcikxMTAvBgNVBAoTKFJlZGUgTmFjaW9uYWwgZGUgRW5zaW5vIGUgUGVz
+cXVpc2EgLSBSTlAxDzANBgNVBAMTBklDUEVkdTAeFw0xNTAxMjkxODU2MDNaFw0x
+ODAxMjkxODU2MDNaMHAxCzAJBgNVBAYTAkJSMQswCQYDVQQIEwJDRTESMBAGA1UE
+BxMJRm9ydGFsZXphMSYwJAYDVQQKEx1VTklWRVJTSURBREUgRkVERVJBTCBETyBD
+RUFSQTEYMBYGA1UEAxMPY2FmZS1pZHAudWZjLmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA5mmwq3ScV2FZL+AbZxcuOALuAp0dnETymHyJeXQ4OStE
+mRrdINtjjDRiSPMYVWAY10rllQw73sjmZ64Hlf/ER4RhqZIhBFIu4XKEvglKO5dP
+MI0uCVvz1RIx6zz4Zny9GmxCzVQF5gCI81vksduFdVrqsZ0sIqd0MUyx9D/57O3c
+YhvJh/KMctF+53NH+OkXwUH7CvhluRUFI9IjtKISSsMPlnZIpVhIolHmqW834Bfe
+L4m80VOT1oUwg5JjNL/BWRyM9enzwSP0wT+rZnlmgqo3udBoO2g7LcLQ2GabxPID
+dLANiQv60Vw58RD7dVyzT/73M2JHIsOuzmpCOnVdiwIDAQABo4IBrjCCAaowDgYD
+VR0PAQH/BAQDAgWgMEkGA1UdIARCMEAwPgYGZ4EMAQICMDQwMgYIKwYBBQUHAgEW
+Jmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMBoGA1UdEQQT
+MBGCD2NhZmUtaWRwLnVmYy5icjAJBgNVHRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUF
+BwMBBggrBgEFBQcDAjA+BgNVHR8ENzA1MDOgMaAvhi1odHRwOi8vY3JsLmdsb2Jh
+bHNpZ24uY29tL2dzL2ljcGVkdXNoYTJnMi5jcmwwgYYGCCsGAQUFBwEBBHoweDBA
+BggrBgEFBQcwAoY0aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQv
+aWNwZWR1c2hhMmcyLmNydDA0BggrBgEFBQcwAYYoaHR0cDovL29jc3AyLmdsb2Jh
+bHNpZ24uY29tL2ljcGVkdXNoYTJnMjAdBgNVHQ4EFgQUEcKIonX/zpNFnXfdkUYP
+MRdG7mEwHwYDVR0jBBgwFoAUlfCkhBqnXCA2psUI12VCAuV3aOMwDQYJKoZIhvcN
+AQELBQADggEBAEyWJQd7Q20jRhjUM3Ue+ySclvHDETUhgnEYcnnJAUeBtNlF/e2l
+TmV/jfzWDX1tkHkyJbDUZyCOvsmPyGgre5n8ZR42Jf9iJkeEqm3LDnvHrEO2LIDV
+dHyNFUeaVBvn3hvA/tvwdRvaSEzxUtVUQ2X+J/4z/38VUXYtufumZekm8D+L6Koe
+5bIDnlUKqHjO/25ph8xm7K5S3BjkL0fQwrEZImgTIEBhWPLnwVUaOPahMwUGeWf8
+aGkhxUVPyqMyuAr0p2iujFM0X8kGWL9nJCAARH4f9rnJs2gOhphoSHpbAKZdtq4Z
+//f+GmXi7h7Buz4+dG0ibmbq8NCOoHJDdys=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-idp.ufc.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe-idp.ufc.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">UFC - Universidade Federal do Ceara</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFC - Universidade Federal do Ceara</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFC - Universidade Federal do Ceara</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFC - Universidade Federal do Ceara</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufc.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufc.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Federacao CAFe</md:SurName>
+    <md:EmailAddress>federacao_cafe@sti.ufc.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.accamargo.org.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.accamargo.org.br-idp-shibboleth.xml
new file mode 100644
index 00000000..016ec01f
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.accamargo.org.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.accamargo.org.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">org.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ACC - A.C.Camargo Cancer Center</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">ACC - A.C.Camargo Cancer Center</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ACC - A.C.Camargo Cancer Center</mdui:Description>
+        <mdui:Description xml:lang="pt-br">ACC - A.C.Camargo Cancer Center</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.accamargo.org.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.accamargo.org.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxIjAgBgNVBAoTGUEuQy5DYW1h
+cmdvIENhbmNlciBDZW50ZXIxCzAJBgNVBAsTAlRJMSUwIwYJKoZIhvcNAQkBFhZp
+bmZyYUBhY2NhbWFyZ28ub3JnLmJyMRIwEAYDVQQHEwlTYW8gUGF1bG8xEjAQBgNV
+BAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxJTAjBgNVBAMTHGFjY2FmZS5jb3Jw
+LmFjY2FtYXJnby5vcmcuYnIwHhcNMTQwNzIyMTgwOTU4WhcNMTcwNzIxMTgwOTU4
+WjCBtDEiMCAGA1UEChMZQS5DLkNhbWFyZ28gQ2FuY2VyIENlbnRlcjELMAkGA1UE
+CxMCVEkxJTAjBgkqhkiG9w0BCQEWFmluZnJhQGFjY2FtYXJnby5vcmcuYnIxEjAQ
+BgNVBAcTCVNhbyBQYXVsbzESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJC
+UjElMCMGA1UEAxMcYWNjYWZlLmNvcnAuYWNjYW1hcmdvLm9yZy5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALY7jcZgj0WKZ4s0bkWLRwBKf7hOkYT9
+m4lQhe2Wg4nN6LiBEmcSbHdCOgFD/rpz6GptT0Z6nApwTmdIHsn7vzK+Jd9bbh/j
+z7fcvsk+r94PSrOLoRz9R77jq58k5OnEcAIZiz5YSWg9l5r9n7+YpMsIA8sARrVe
+EFjcqnXUcC24HfPlppXpUF03CROWXjuwUWMelVeFpAS2UKD1O01S9ch12PFqz0Tj
+5owqgBT9Vcn6hv6hfN8ogU6Ob7lyzgrVmlIFeAVfx58FbpW2z3tKSCAFXh1AdzsA
+TgABmcYBaMDTaOY7NsNBGQVIIhSalGPxpNEbJV+9YLg/c1KTszCSV5ECAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAk0bRv4nd7W6HTFmSGEsKPPM2ZKY8/c1EiZT283Gz
+VO27NGBym9ZhTv9bHftimmoMSvlOAdXILfwJsGdbFFh+B8s+7VDmbx1pRnq1kimU
+KaAy2jaC+ci8zFK7jN4Q6KgqzC1zZs8BTE8DCgEvXQM2dTIVr72bEPttKOCCbNIs
+9w0dgvDMZINHqX9D7fe3NBLD+3qT6huDlE2ZNwSyc+X8+u2eF2hnNzGpPEhXx/in
+WPQ16QixB5B6rtqjbR5194ASzPcn83Nq3+yCt0kYxyBx2zsH8TS1gkkMWhH+ryVi
+qityQ40gZWuWRd8gfBbCoN4OslA5NohCqtIm+5YasOdyzw==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.accamargo.org.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.accamargo.org.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://cafe.accamargo.org.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.accamargo.org.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.accamargo.org.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.accamargo.org.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">org.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxIjAgBgNVBAoTGUEuQy5DYW1h
+cmdvIENhbmNlciBDZW50ZXIxCzAJBgNVBAsTAlRJMSUwIwYJKoZIhvcNAQkBFhZp
+bmZyYUBhY2NhbWFyZ28ub3JnLmJyMRIwEAYDVQQHEwlTYW8gUGF1bG8xEjAQBgNV
+BAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxJTAjBgNVBAMTHGFjY2FmZS5jb3Jw
+LmFjY2FtYXJnby5vcmcuYnIwHhcNMTQwNzIyMTgwOTU4WhcNMTcwNzIxMTgwOTU4
+WjCBtDEiMCAGA1UEChMZQS5DLkNhbWFyZ28gQ2FuY2VyIENlbnRlcjELMAkGA1UE
+CxMCVEkxJTAjBgkqhkiG9w0BCQEWFmluZnJhQGFjY2FtYXJnby5vcmcuYnIxEjAQ
+BgNVBAcTCVNhbyBQYXVsbzESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJC
+UjElMCMGA1UEAxMcYWNjYWZlLmNvcnAuYWNjYW1hcmdvLm9yZy5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALY7jcZgj0WKZ4s0bkWLRwBKf7hOkYT9
+m4lQhe2Wg4nN6LiBEmcSbHdCOgFD/rpz6GptT0Z6nApwTmdIHsn7vzK+Jd9bbh/j
+z7fcvsk+r94PSrOLoRz9R77jq58k5OnEcAIZiz5YSWg9l5r9n7+YpMsIA8sARrVe
+EFjcqnXUcC24HfPlppXpUF03CROWXjuwUWMelVeFpAS2UKD1O01S9ch12PFqz0Tj
+5owqgBT9Vcn6hv6hfN8ogU6Ob7lyzgrVmlIFeAVfx58FbpW2z3tKSCAFXh1AdzsA
+TgABmcYBaMDTaOY7NsNBGQVIIhSalGPxpNEbJV+9YLg/c1KTszCSV5ECAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAk0bRv4nd7W6HTFmSGEsKPPM2ZKY8/c1EiZT283Gz
+VO27NGBym9ZhTv9bHftimmoMSvlOAdXILfwJsGdbFFh+B8s+7VDmbx1pRnq1kimU
+KaAy2jaC+ci8zFK7jN4Q6KgqzC1zZs8BTE8DCgEvXQM2dTIVr72bEPttKOCCbNIs
+9w0dgvDMZINHqX9D7fe3NBLD+3qT6huDlE2ZNwSyc+X8+u2eF2hnNzGpPEhXx/in
+WPQ16QixB5B6rtqjbR5194ASzPcn83Nq3+yCt0kYxyBx2zsH8TS1gkkMWhH+ryVi
+qityQ40gZWuWRd8gfBbCoN4OslA5NohCqtIm+5YasOdyzw==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.accamargo.org.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.accamargo.org.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">ACC - A.C.Camargo Cancer Center</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">ACC - A.C.Camargo Cancer Center</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ACC - A.C.Camargo Cancer Center</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">ACC - A.C.Camargo Cancer Center</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.accamargo.org.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.accamargo.org.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Bruno Alencar</md:SurName>
+    <md:EmailAddress>infra@accamargo.org.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml
new file mode 100644
index 00000000..f512d420
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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 em Contabilidade, Economia e Financas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</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>
+    MIIDkjCCAnoCAQAwDQYJKoZIhvcNAQEFBQAwgY4xDzANBgNVBAoTBkZVQ0FQRTEL
+MAkGA1UECxMCVEkxHTAbBgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYD
+VQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMC
+QlIxFzAVBgNVBAMTDmNhZmUuZnVjYXBlLmJyMB4XDTE0MDcyMTE0MTQzMloXDTE3
+MDcyMDE0MTQzMlowgY4xDzANBgNVBAoTBkZVQ0FQRTELMAkGA1UECxMCVEkxHTAb
+BgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYDVQQHEwdWaXRvcmlhMRcw
+FQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmNh
+ZmUuZnVjYXBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuelJ
+x+b7r1a3vz6ppasqWtnuIEm4peG1175sZV5n4Oi1Ue2l3RLaFIQCuN3QgMOX9aRw
+bHdyPcmVMx00V6h6+O5d9jEgQMAKmNaaZnk+Np0g9foDhas88QqGzOSiuVqqfM2t
+xKUeCrmtpcWfkA3m45bMqsJn6dXqw2ab1aAE4Q1IomGbEaKihPXeYjiTmUV/1Hi0
+Y1hNRA61k2nitSWQejfoWpwLtK70k+Puk9ATckYzEGxwnAdi9weymfGEvS/EOyf/
+SPJA9guZLqk1hI/+CuiBzJhtZCS4pKEHH+QLMCzUL9jkEoANkZdbRPrPiul9iQJ6
+eFiY+E1qLkm3UjAYDwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBDrq/iLpDIlO2N
+88cHM2THmN2Dxn7ZuQRr19FJCIirSSky4GOIsSB/14+BdR4eQoEbyEs5Uvm3ieF9
+61fcpTjzz++aO5InnG7lHizf7UWr9nzF2fU2IkGLwQxVfeaHDistKOK76rnI95mu
+E4OdkYGgyf+LHp/aUhHln+NTuJQpxrXdtXsIcPa3iZQqKRmeJRr1lOL8yyxtI/40
+dHLpEb2GiAkHQNRQKTTCQg+yOAk/nWBTzmu+TBpkzC5TnO3uDVKxdmt5T3OuWjdQ
+qMubODGxkJq4vSSeMKiYsZ5fRXyphXm3D/XUeBWkDNpllO0vCbW9BomAeLeAUJgj
+zD1vw9HJ
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.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://cafe.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://cafe.fucape.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.fucape.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.fucape.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.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>
+      
+MIIDkjCCAnoCAQAwDQYJKoZIhvcNAQEFBQAwgY4xDzANBgNVBAoTBkZVQ0FQRTEL
+MAkGA1UECxMCVEkxHTAbBgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYD
+VQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMC
+QlIxFzAVBgNVBAMTDmNhZmUuZnVjYXBlLmJyMB4XDTE0MDcyMTE0MTQzMloXDTE3
+MDcyMDE0MTQzMlowgY4xDzANBgNVBAoTBkZVQ0FQRTELMAkGA1UECxMCVEkxHTAb
+BgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYDVQQHEwdWaXRvcmlhMRcw
+FQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmNh
+ZmUuZnVjYXBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuelJ
+x+b7r1a3vz6ppasqWtnuIEm4peG1175sZV5n4Oi1Ue2l3RLaFIQCuN3QgMOX9aRw
+bHdyPcmVMx00V6h6+O5d9jEgQMAKmNaaZnk+Np0g9foDhas88QqGzOSiuVqqfM2t
+xKUeCrmtpcWfkA3m45bMqsJn6dXqw2ab1aAE4Q1IomGbEaKihPXeYjiTmUV/1Hi0
+Y1hNRA61k2nitSWQejfoWpwLtK70k+Puk9ATckYzEGxwnAdi9weymfGEvS/EOyf/
+SPJA9guZLqk1hI/+CuiBzJhtZCS4pKEHH+QLMCzUL9jkEoANkZdbRPrPiul9iQJ6
+eFiY+E1qLkm3UjAYDwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBDrq/iLpDIlO2N
+88cHM2THmN2Dxn7ZuQRr19FJCIirSSky4GOIsSB/14+BdR4eQoEbyEs5Uvm3ieF9
+61fcpTjzz++aO5InnG7lHizf7UWr9nzF2fU2IkGLwQxVfeaHDistKOK76rnI95mu
+E4OdkYGgyf+LHp/aUhHln+NTuJQpxrXdtXsIcPa3iZQqKRmeJRr1lOL8yyxtI/40
+dHLpEb2GiAkHQNRQKTTCQg+yOAk/nWBTzmu+TBpkzC5TnO3uDVKxdmt5T3OuWjdQ
+qMubODGxkJq4vSSeMKiYsZ5fRXyphXm3D/XUeBWkDNpllO0vCbW9BomAeLeAUJgj
+zD1vw9HJ
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.fucape.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.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 em Contabilidade, Economia e Financas</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</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>Alan Ruan</md:SurName>
+    <md:EmailAddress>alan@fucape.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.iec.pa.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.iec.pa.gov.br-idp-shibboleth.xml
new file mode 100644
index 00000000..62b973a6
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.iec.pa.gov.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.iec.pa.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">iec.pa.gov.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IEC - Instituto Evandro Chagas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IEC - Instituto Evandro Chagas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IEC - Instituto Evandro Chagas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IEC - Instituto Evandro Chagas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.iec.pa.gov.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.iec.pa.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>
+    MIIDwDCCAqgCAQAwDQYJKoZIhvcNAQEFBQAwgaUxITAfBgNVBAoTGEluc3RpdHV0
+byBFdmFuZHJvIENoYWdhczEUMBIGA1UECxMLSW5mb3JtYXRpY2ExITAfBgkqhkiG
+9w0BCQEWEnJlZGVAaWVjLnBhLmdvdi5icjEOMAwGA1UEBxMFQmVsZW0xDTALBgNV
+BAgTBFBhcmExCzAJBgNVBAYTAkJSMRswGQYDVQQDExJjYWZlLmllYy5wYS5nb3Yu
+YnIwHhcNMTUwMjI0MTIxNjMxWhcNMjAwMjIzMTIxNjMxWjCBpTEhMB8GA1UEChMY
+SW5zdGl0dXRvIEV2YW5kcm8gQ2hhZ2FzMRQwEgYDVQQLEwtJbmZvcm1hdGljYTEh
+MB8GCSqGSIb3DQEJARYScmVkZUBpZWMucGEuZ292LmJyMQ4wDAYDVQQHEwVCZWxl
+bTENMAsGA1UECBMEUGFyYTELMAkGA1UEBhMCQlIxGzAZBgNVBAMTEmNhZmUuaWVj
+LnBhLmdvdi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALh7iEs2
+Ni8j/GJ3Zw2jN9XApjZ+UL50nJDAL4XeLuP7e7yaXlW4BTU/5kpVyEKMBG6tdGRk
+hAhAySdMnYGevlMsh7ntx3rITe9IS6L7H9mHBbE8m3IJaoe3D16Y6tn5f1SZOD5M
+pZoxpQGfIB1vScKfg/uiFZ+uWKeFoU+Tv7849/muDsM+RS6oY+06jKui0oVLQGsg
+TVzLFY985RICZDPva3m44wO7MsiSaAv0IdtLG51N8GzEDJaHBNpMz148gdo7I0ec
+TF74zqwWvBvcuK0xE3+/3j/gDPrTcIzqd4vD8bcwwedrY62OClPCGD37hLBGfZKO
+z8DXr0u4hX+qc7kCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAaTtMhdCZIJqL/pMA
+pf91UXgHPVlvoJZYwEKJuTUF6pwlQAlSlL7J/fpEqXLbjWbVMPFTANx7c/MfwE54
+jh3NMxgaxfeH6A+Xk3bOPMiSWRtTuF+Fbma9qfuA7mSsFbX8y0oRP3jZWgKmrAYg
+EkuVIN8rWqCemhAdb7oIa4TV0HSgVWc5yFRu6bX+JFJhIAw8vCL+Ml6HqK+Hku08
+nsZVerrPzQbWGxKGwAvRVxaV0ahOrMSRgE8A0eCEpU5Gso2vDZ9lnMzs8hHGzA2n
+JU0I6DpaM7+LMDUe10IlIxclhBktiIfWjTSGIpXc6dvJZS+YKC7q1Xn4Hgfv2Pi0
+EFJUUg==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.iec.pa.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://cafe.iec.pa.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://cafe.iec.pa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.iec.pa.gov.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.iec.pa.gov.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.iec.pa.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">iec.pa.gov.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDwDCCAqgCAQAwDQYJKoZIhvcNAQEFBQAwgaUxITAfBgNVBAoTGEluc3RpdHV0
+byBFdmFuZHJvIENoYWdhczEUMBIGA1UECxMLSW5mb3JtYXRpY2ExITAfBgkqhkiG
+9w0BCQEWEnJlZGVAaWVjLnBhLmdvdi5icjEOMAwGA1UEBxMFQmVsZW0xDTALBgNV
+BAgTBFBhcmExCzAJBgNVBAYTAkJSMRswGQYDVQQDExJjYWZlLmllYy5wYS5nb3Yu
+YnIwHhcNMTUwMjI0MTIxNjMxWhcNMjAwMjIzMTIxNjMxWjCBpTEhMB8GA1UEChMY
+SW5zdGl0dXRvIEV2YW5kcm8gQ2hhZ2FzMRQwEgYDVQQLEwtJbmZvcm1hdGljYTEh
+MB8GCSqGSIb3DQEJARYScmVkZUBpZWMucGEuZ292LmJyMQ4wDAYDVQQHEwVCZWxl
+bTENMAsGA1UECBMEUGFyYTELMAkGA1UEBhMCQlIxGzAZBgNVBAMTEmNhZmUuaWVj
+LnBhLmdvdi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALh7iEs2
+Ni8j/GJ3Zw2jN9XApjZ+UL50nJDAL4XeLuP7e7yaXlW4BTU/5kpVyEKMBG6tdGRk
+hAhAySdMnYGevlMsh7ntx3rITe9IS6L7H9mHBbE8m3IJaoe3D16Y6tn5f1SZOD5M
+pZoxpQGfIB1vScKfg/uiFZ+uWKeFoU+Tv7849/muDsM+RS6oY+06jKui0oVLQGsg
+TVzLFY985RICZDPva3m44wO7MsiSaAv0IdtLG51N8GzEDJaHBNpMz148gdo7I0ec
+TF74zqwWvBvcuK0xE3+/3j/gDPrTcIzqd4vD8bcwwedrY62OClPCGD37hLBGfZKO
+z8DXr0u4hX+qc7kCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAaTtMhdCZIJqL/pMA
+pf91UXgHPVlvoJZYwEKJuTUF6pwlQAlSlL7J/fpEqXLbjWbVMPFTANx7c/MfwE54
+jh3NMxgaxfeH6A+Xk3bOPMiSWRtTuF+Fbma9qfuA7mSsFbX8y0oRP3jZWgKmrAYg
+EkuVIN8rWqCemhAdb7oIa4TV0HSgVWc5yFRu6bX+JFJhIAw8vCL+Ml6HqK+Hku08
+nsZVerrPzQbWGxKGwAvRVxaV0ahOrMSRgE8A0eCEpU5Gso2vDZ9lnMzs8hHGzA2n
+JU0I6DpaM7+LMDUe10IlIxclhBktiIfWjTSGIpXc6dvJZS+YKC7q1Xn4Hgfv2Pi0
+EFJUUg==
+		
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.iec.pa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.iec.pa.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">IEC - Instituto Evandro Chagas </md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IEC - Instituto Evandro Chagas </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IEC - Instituto Evandro Chagas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IEC - Instituto Evandro Chagas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iec.pa.gov.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.iec.pa.gov.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Equipe de Operacao da Rede IEC</md:SurName>
+    <md:EmailAddress>rede@iec.pa.gov.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifb.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifb.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..188a3409
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifb.edu.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ifb.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFB -Instituto Federal de Brasilia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFB -Instituto Federal de Brasilia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFB -Instituto Federal de Brasilia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFB -Instituto Federal de Brasilia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifb.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifb.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>
+    MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExJjAkBgNVBAoTHUluc3RpdHV0
+byBGZWRlcmFsIGRlIEJyYXNpbGlhMQwwCgYDVQQLEwNDUEQxJDAiBgkqhkiG9w0B
+CQEWFWh1Z28uZmFyaWFAaWZiLmVkdS5icjERMA8GA1UEBxMIQnJhc2lsaWExGTAX
+BgNVBAgTEERpc3RyaXRvIEZlZGVyYWwxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9j
+YWZlLmlmYi5lZHUuYnIwHhcNMTQwNDMwMTIwNjMzWhcNMTkwNDI5MTIwNjMzWjCB
+sTEmMCQGA1UEChMdSW5zdGl0dXRvIEZlZGVyYWwgZGUgQnJhc2lsaWExDDAKBgNV
+BAsTA0NQRDEkMCIGCSqGSIb3DQEJARYVaHVnby5mYXJpYUBpZmIuZWR1LmJyMREw
+DwYDVQQHEwhCcmFzaWxpYTEZMBcGA1UECBMQRGlzdHJpdG8gRmVkZXJhbDELMAkG
+A1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZiLmVkdS5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMl4NkWCkt4LPisjIniHMzV7ad52UPjkndK7dy2P
+PR4zZ4ssQ0em22DdCbv9g/UYtrUZkzbw1pVDuZkmrIEI6IpG235bYis1vdFV6Ezc
+sfqG6cVK07+ov7edKzSUAUL9JPCioRcbh+ol4MYGQ271tNpKI7paE1S3AWmpiiGE
+LKXLItn3SMncuQRjA8XLhYkZWLk76deWt43cKTeUQe4wMQgKjhV/sflk9Yisccnf
+fcqzJKlC7qH5yRm8yNQzUpp43V5sdkQ+yNFPZOJc0LndacUAoyDBle8s3n6rLkkQ
+Pet095bxY+ahltMWtcCZM5NWDVbWd/2WGru5NTtTG5SojbECAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAT/zrVbbQSdoaqk2/tut9i+nwzX3jVzbIdj4TFF0oFS9YmojK
+5Tu8s0wR3GdoyOPp367k9AFkrM5oVtdkN/wmzgiMYQzbh65t3bU/sx3/QNpvN1FF
+3ZrCo4vSxwMc0yEmdgT0eYUfyeWL/gqJ08nnsVoY8cmkoV37rjNhMLCz+WRdhoGI
+ziTBHSHSfT19MUBPshQtI8InKtZxzjo9PEPIzfxLyj1GNWzhmNVeAoEwefVjm4Wi
+XuahCg66qDobt3XR77O74guAdjEtcrIFLdXDQpZb/yrA4dCH3l53A6k8PB7Gcqxn
+lfIkoNoppJp00hFJFgb7O6y36a0AO2jY7LDjHA==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifb.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://cafe.ifb.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://cafe.ifb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifb.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifb.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifb.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>
+      
+MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExJjAkBgNVBAoTHUluc3RpdHV0
+byBGZWRlcmFsIGRlIEJyYXNpbGlhMQwwCgYDVQQLEwNDUEQxJDAiBgkqhkiG9w0B
+CQEWFWh1Z28uZmFyaWFAaWZiLmVkdS5icjERMA8GA1UEBxMIQnJhc2lsaWExGTAX
+BgNVBAgTEERpc3RyaXRvIEZlZGVyYWwxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9j
+YWZlLmlmYi5lZHUuYnIwHhcNMTQwNDMwMTIwNjMzWhcNMTkwNDI5MTIwNjMzWjCB
+sTEmMCQGA1UEChMdSW5zdGl0dXRvIEZlZGVyYWwgZGUgQnJhc2lsaWExDDAKBgNV
+BAsTA0NQRDEkMCIGCSqGSIb3DQEJARYVaHVnby5mYXJpYUBpZmIuZWR1LmJyMREw
+DwYDVQQHEwhCcmFzaWxpYTEZMBcGA1UECBMQRGlzdHJpdG8gRmVkZXJhbDELMAkG
+A1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZiLmVkdS5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMl4NkWCkt4LPisjIniHMzV7ad52UPjkndK7dy2P
+PR4zZ4ssQ0em22DdCbv9g/UYtrUZkzbw1pVDuZkmrIEI6IpG235bYis1vdFV6Ezc
+sfqG6cVK07+ov7edKzSUAUL9JPCioRcbh+ol4MYGQ271tNpKI7paE1S3AWmpiiGE
+LKXLItn3SMncuQRjA8XLhYkZWLk76deWt43cKTeUQe4wMQgKjhV/sflk9Yisccnf
+fcqzJKlC7qH5yRm8yNQzUpp43V5sdkQ+yNFPZOJc0LndacUAoyDBle8s3n6rLkkQ
+Pet095bxY+ahltMWtcCZM5NWDVbWd/2WGru5NTtTG5SojbECAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAT/zrVbbQSdoaqk2/tut9i+nwzX3jVzbIdj4TFF0oFS9YmojK
+5Tu8s0wR3GdoyOPp367k9AFkrM5oVtdkN/wmzgiMYQzbh65t3bU/sx3/QNpvN1FF
+3ZrCo4vSxwMc0yEmdgT0eYUfyeWL/gqJ08nnsVoY8cmkoV37rjNhMLCz+WRdhoGI
+ziTBHSHSfT19MUBPshQtI8InKtZxzjo9PEPIzfxLyj1GNWzhmNVeAoEwefVjm4Wi
+XuahCg66qDobt3XR77O74guAdjEtcrIFLdXDQpZb/yrA4dCH3l53A6k8PB7Gcqxn
+lfIkoNoppJp00hFJFgb7O6y36a0AO2jY7LDjHA==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifb.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">IFB -Instituto Federal de Brasilia </md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFB -Instituto Federal de Brasilia </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFB -Instituto Federal de Brasilia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFB -Instituto Federal de Brasilia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifb.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifb.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Hugo Faria</md:SurName>
+    <md:EmailAddress>hugo.faria@ifb.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifes.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifes.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..280185d2
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifes.edu.br-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIIEMjCCAxoCAQAwDQYJKoZIhvcNAQEFBQAwgd4xMzAxBgNVBAoUKklGRVMgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBFc3Dtcml0byBTYW50bzE0MDIGA1UECxQrRFRJ
+IC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYefjbzEeMBwGCSqG
+SIb3DQEJARYPZHRpQGlmZXMuZWR1LmJyMRAwDgYDVQQHFAdWaXTzcmlhMRcwFQYD
+VQQIFA5Fc3Dtcml0byBTYW50bzELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUu
+aWZlcy5lZHUuYnIwHhcNMTQwNjA1MTQyMjE1WhcNMTkwNjA0MTQyMjE1WjCB3jEz
+MDEGA1UEChQqSUZFUyAtIEluc3RpdHV0byBGZWRlcmFsIGRvIEVzcO1yaXRvIFNh
+bnRvMTQwMgYDVQQLFCtEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJ
+bmZvcm1h5+NvMR4wHAYJKoZIhvcNAQkBFg9kdGlAaWZlcy5lZHUuYnIxEDAOBgNV
+BAcUB1ZpdPNyaWExFzAVBgNVBAgUDkVzcO1yaXRvIFNhbnRvMQswCQYDVQQGEwJC
+UjEZMBcGA1UEAxMQY2FmZS5pZmVzLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOHrqlb5GFzgkBCiLEWBJHGcs6rIx3oSP7uXDldH7x5jXC47
+v5TyzCba+wZiOHG2rUrnVi/xozlrPc0W5Fk7ajPTxYDeefNprMJssFUl14DwbZIl
+3Truyemx8q9CRDVTqFlsieYF8HKshB1Z6KIUTmvWNXnHQnxo5o7ZQ/BLYKTuxN66
+omqnTU6IsojGiawP9hCYzedDHZeSJ5xsZl0UYktxxjsnAv6Ka+yBt+oXrXr0QNiR
+2NBbyosaTlKxt9riq8MzL7J383/eJGLSvxGdNsBXryf5Tjfx4GrCP9ka2Y/vbwcU
+mR2T1JXphD3AoeQtsKVnucp/mstxKYe+tSmrIXECAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEAPIVYpq1VJYhgJj65T7FcHROuwQkBKqqKjaHzEU2lCkwG/7KJj/BOb6nX
+H+wB+qKq44kqXJ2VB7FMuSk0NtCN/tas+iOqc5yXFCZh9X/d1aZQQXQ0t6jy65FC
+R3Hy4SgTU1uPfnUSTIeyg0yTON9YFIIyV4lKSTX4BiwqJiXWN4dHHVPBl/TkUp/F
+HXdqdhP5InrMMw5qWDvhEi3o0x0HRUo7jJft95JrR4yfX21sDFTCgqx+/ZPX8fOL
+mbkxXly2hawK1GQT+ghSrScruQDw6XX6zpokaEqkh/Zc8JDjkB2Drx2aWZfGL460
+sp005gwvb2/MIN7OTddNkm6l3VeaXQ==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.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://cafe.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://cafe.ifes.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifes.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifes.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.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>
+      
+MIIEMjCCAxoCAQAwDQYJKoZIhvcNAQEFBQAwgd4xMzAxBgNVBAoUKklGRVMgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBFc3Dtcml0byBTYW50bzE0MDIGA1UECxQrRFRJ
+IC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYefjbzEeMBwGCSqG
+SIb3DQEJARYPZHRpQGlmZXMuZWR1LmJyMRAwDgYDVQQHFAdWaXTzcmlhMRcwFQYD
+VQQIFA5Fc3Dtcml0byBTYW50bzELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUu
+aWZlcy5lZHUuYnIwHhcNMTQwNjA1MTQyMjE1WhcNMTkwNjA0MTQyMjE1WjCB3jEz
+MDEGA1UEChQqSUZFUyAtIEluc3RpdHV0byBGZWRlcmFsIGRvIEVzcO1yaXRvIFNh
+bnRvMTQwMgYDVQQLFCtEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJ
+bmZvcm1h5+NvMR4wHAYJKoZIhvcNAQkBFg9kdGlAaWZlcy5lZHUuYnIxEDAOBgNV
+BAcUB1ZpdPNyaWExFzAVBgNVBAgUDkVzcO1yaXRvIFNhbnRvMQswCQYDVQQGEwJC
+UjEZMBcGA1UEAxMQY2FmZS5pZmVzLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOHrqlb5GFzgkBCiLEWBJHGcs6rIx3oSP7uXDldH7x5jXC47
+v5TyzCba+wZiOHG2rUrnVi/xozlrPc0W5Fk7ajPTxYDeefNprMJssFUl14DwbZIl
+3Truyemx8q9CRDVTqFlsieYF8HKshB1Z6KIUTmvWNXnHQnxo5o7ZQ/BLYKTuxN66
+omqnTU6IsojGiawP9hCYzedDHZeSJ5xsZl0UYktxxjsnAv6Ka+yBt+oXrXr0QNiR
+2NBbyosaTlKxt9riq8MzL7J383/eJGLSvxGdNsBXryf5Tjfx4GrCP9ka2Y/vbwcU
+mR2T1JXphD3AoeQtsKVnucp/mstxKYe+tSmrIXECAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEAPIVYpq1VJYhgJj65T7FcHROuwQkBKqqKjaHzEU2lCkwG/7KJj/BOb6nX
+H+wB+qKq44kqXJ2VB7FMuSk0NtCN/tas+iOqc5yXFCZh9X/d1aZQQXQ0t6jy65FC
+R3Hy4SgTU1uPfnUSTIeyg0yTON9YFIIyV4lKSTX4BiwqJiXWN4dHHVPBl/TkUp/F
+HXdqdhP5InrMMw5qWDvhEi3o0x0HRUo7jJft95JrR4yfX21sDFTCgqx+/ZPX8fOL
+mbkxXly2hawK1GQT+ghSrScruQDw6XX6zpokaEqkh/Zc8JDjkB2Drx2aWZfGL460
+sp005gwvb2/MIN7OTddNkm6l3VeaXQ==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifes.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.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/cafe.ifg.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifg.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..f741c6ed
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifg.edu.br-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">ifg.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>
+    MIIDrDCCApQCAQAwDQYJKoZIhvcNAQEFBQAwgZsxIzAhBgNVBAoTGkluc3RpdHV0
+byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNDUEQxHTAbBgkqhkiG9w0BCQEW
+DmR0aUBpZmcuZWR1LmJyMRAwDgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQIEwVHb2lh
+czELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZnLmVkdS5icjAeFw0xNDA0
+MjIxMTM4MThaFw0xOTA0MjExMTM4MThaMIGbMSMwIQYDVQQKExpJbnN0aXR1dG8g
+RmVkZXJhbCBkZSBHb2lhczEMMAoGA1UECxMDQ1BEMR0wGwYJKoZIhvcNAQkBFg5k
+dGlAaWZnLmVkdS5icjEQMA4GA1UEBxMHR29pYW5pYTEOMAwGA1UECBMFR29pYXMx
+CzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLmlmZy5lZHUuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRTiGyg+AdoDTPTJWvRBL6Sx3OCpG0jjT5
+HUyXwsYB/VkDFC/IXLVwSQGCJ8+kzGaIAknzdL0QG1ZfY00neU6HmngzYE9t0NWC
+/UAySjQFlMZPyHmkZyCEIpiOKs1XR7WJgmxz/ga3LiLeNUY16J8ywVG61Gpl31TJ
+3kW3T/qupvrvg55tdc28PwKeAV3AgYY7a3xI2lgpr7ZsthXcsG2MO7xZ7tv/AcKd
+VUukgU90h3NfQz2cX96dqL5RfrdhCDH9Q8vF+ULVMKwoYUbIyY2oCDtNqM3UZyA0
+QjBAyHeKc/AAZKDnwHZb/UNAmURaRHC7Hm9bHjmwxRywNvrF3pZFAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAAsfixGI4x76q6PWV9pcCHEgtZwIHrbPXsVArUNw1tg1
+1ep86wzlRXWO3D4kHTwtbdJZHM/+DwOvRHow1Y75IS3ndB5SIFJJS4lYeQ0q9t/+
+GMoYs56Ao+iYSH+PjZ67buLhY6GEMV2GGfhblEeyOUZpjNS8hZxYrot5cIt4QqJm
+Fr6OhJD9LojPSNej7PHW49bbS6OZXE4KBsrq0s+uSjZ71LWsm7T3cJA09kF5rOTg
+E7qGH9SEZjeQ2U4XmVmCygCYiG1oFvG3lzh9cl7V9F3W0cW2nwSX6cYI93NJYUxY
+YvkC3d/bl14ZFppaITiyaqXSbOEud5hfZr+tbxOeGOQ=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://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://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://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://cafe.ifg.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifg.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://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>
+      
+MIIDrDCCApQCAQAwDQYJKoZIhvcNAQEFBQAwgZsxIzAhBgNVBAoTGkluc3RpdHV0
+byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNDUEQxHTAbBgkqhkiG9w0BCQEW
+DmR0aUBpZmcuZWR1LmJyMRAwDgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQIEwVHb2lh
+czELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZnLmVkdS5icjAeFw0xNDA0
+MjIxMTM4MThaFw0xOTA0MjExMTM4MThaMIGbMSMwIQYDVQQKExpJbnN0aXR1dG8g
+RmVkZXJhbCBkZSBHb2lhczEMMAoGA1UECxMDQ1BEMR0wGwYJKoZIhvcNAQkBFg5k
+dGlAaWZnLmVkdS5icjEQMA4GA1UEBxMHR29pYW5pYTEOMAwGA1UECBMFR29pYXMx
+CzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLmlmZy5lZHUuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRTiGyg+AdoDTPTJWvRBL6Sx3OCpG0jjT5
+HUyXwsYB/VkDFC/IXLVwSQGCJ8+kzGaIAknzdL0QG1ZfY00neU6HmngzYE9t0NWC
+/UAySjQFlMZPyHmkZyCEIpiOKs1XR7WJgmxz/ga3LiLeNUY16J8ywVG61Gpl31TJ
+3kW3T/qupvrvg55tdc28PwKeAV3AgYY7a3xI2lgpr7ZsthXcsG2MO7xZ7tv/AcKd
+VUukgU90h3NfQz2cX96dqL5RfrdhCDH9Q8vF+ULVMKwoYUbIyY2oCDtNqM3UZyA0
+QjBAyHeKc/AAZKDnwHZb/UNAmURaRHC7Hm9bHjmwxRywNvrF3pZFAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAAsfixGI4x76q6PWV9pcCHEgtZwIHrbPXsVArUNw1tg1
+1ep86wzlRXWO3D4kHTwtbdJZHM/+DwOvRHow1Y75IS3ndB5SIFJJS4lYeQ0q9t/+
+GMoYs56Ao+iYSH+PjZ67buLhY6GEMV2GGfhblEeyOUZpjNS8hZxYrot5cIt4QqJm
+Fr6OhJD9LojPSNej7PHW49bbS6OZXE4KBsrq0s+uSjZ71LWsm7T3cJA09kF5rOTg
+E7qGH9SEZjeQ2U4XmVmCygCYiG1oFvG3lzh9cl7V9F3W0cW2nwSX6cYI93NJYUxY
+YvkC3d/bl14ZFppaITiyaqXSbOEud5hfZr+tbxOeGOQ=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://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://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>Diretoria de Tecnologia da Informacao</md:SurName>
+    <md:EmailAddress>dti@ifg.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifnmg.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifnmg.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..cd80aa23
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifnmg.edu.br-idp-shibboleth.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ifnmg.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifnmg.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifnmg.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>
+    MIIEqjCCA5ICAQAwDQYJKoZIhvcNAQEFBQAwggEZMTswOQYDVQQKEzJJRk5NRyAt
+IEluc3RpdHV0byBGZWRlcmFsIGRvIE5vcnRlIGRlIE1pbmFzIEdlcmFpczFBMD8G
+A1UECxQ4REdUSSAtIERpcmV0b3JpYSBkZSBHZXN0w6NvIGUgVGVjbm9sb2dpYSBk
+YSBJbmZvcm1hw6fDo28xITAfBgkqhkiG9w0BCQEWEmFkbWluQGlmbm1nLmVkdS5i
+cjEWMBQGA1UEBxMNTW9udGVzIENsYXJvczEzMDEGA1UECBMqSW5zdGl0dXRvIEZl
+ZGVyYWwgZG8gTm9ydGUgZGUgTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEaMBgG
+A1UEAxMRY2FmZS5pZm5tZy5lZHUuYnIwHhcNMTQwNzMxMjAyMDAwWhcNMTkwNzMw
+MjAyMDAwWjCCARkxOzA5BgNVBAoTMklGTk1HIC0gSW5zdGl0dXRvIEZlZGVyYWwg
+ZG8gTm9ydGUgZGUgTWluYXMgR2VyYWlzMUEwPwYDVQQLFDhER1RJIC0gRGlyZXRv
+cmlhIGRlIEdlc3TDo28gZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEhMB8G
+CSqGSIb3DQEJARYSYWRtaW5AaWZubWcuZWR1LmJyMRYwFAYDVQQHEw1Nb250ZXMg
+Q2xhcm9zMTMwMQYDVQQIEypJbnN0aXR1dG8gRmVkZXJhbCBkbyBOb3J0ZSBkZSBN
+aW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFjYWZlLmlmbm1nLmVk
+dS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9uROMCbnEj8V6d
+i0FPFPgvZEkK/maZkaMPAeWFWBIsWdvvVcUYLPm/TKSgkEL3LA9gqD6LupuNHtuq
+VbihU2FRJ63ld57t/TI4K2hm1VwN9le1ajyf/GXgEcrSMkjpxbHI3rFF2PMoFR4y
+Xmt3FVdyEXrMnIg35viPKdWZyNSjdZjctPTDHoU5LZEVbdCJSm547nQdthFBUXnM
+xcHzsZwfx/duHrvlQaFDPTCKZpvy9RGTwEJ0B2iYnPz5eR8SbspvKefhQJUYRgCn
+ljf8x5qGRmzWQoT8Fy+4/mvZmg+nrpvA7fOJt1nz3fMTujY3nFM78hybPM5Rc9Ks
+PmRmLsECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAILjGqJqbxuulyeZRx5CDoILr
+d0l3/ulycfHSx1KuL3z/pq74Qnsd/bx5i+9t61ilDgjzaPfrSa2R/819VXOsDxXK
+9d43R7YMCLh7cHCLSxhTgZex3lGpV0EVoKUlk7nFuKR0l5WNIojSI9Hns2f7rRR0
+V3FOyySr+3VwErgEtQx6L2tsMIe+PXa0f1OmK2WXiYKjTVi12u8J3rNG9g7i357A
+a6ENAoHeYilId0ZTYlna/9aQ8wYmKM4WPGwG3XU3jdecq117R5+N0tfqoNXtCuri
+zG6SmyYA5YmlEzJQS1UXZtuchEwQlVajzGdGZAeQm2bPcbCgSrAx6EnU4ZLKIQ==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifnmg.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://cafe.ifnmg.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://cafe.ifnmg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifnmg.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifnmg.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifnmg.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>
+      
+MIIEqjCCA5ICAQAwDQYJKoZIhvcNAQEFBQAwggEZMTswOQYDVQQKEzJJRk5NRyAt
+IEluc3RpdHV0byBGZWRlcmFsIGRvIE5vcnRlIGRlIE1pbmFzIEdlcmFpczFBMD8G
+A1UECxQ4REdUSSAtIERpcmV0b3JpYSBkZSBHZXN0w6NvIGUgVGVjbm9sb2dpYSBk
+YSBJbmZvcm1hw6fDo28xITAfBgkqhkiG9w0BCQEWEmFkbWluQGlmbm1nLmVkdS5i
+cjEWMBQGA1UEBxMNTW9udGVzIENsYXJvczEzMDEGA1UECBMqSW5zdGl0dXRvIEZl
+ZGVyYWwgZG8gTm9ydGUgZGUgTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEaMBgG
+A1UEAxMRY2FmZS5pZm5tZy5lZHUuYnIwHhcNMTQwNzMxMjAyMDAwWhcNMTkwNzMw
+MjAyMDAwWjCCARkxOzA5BgNVBAoTMklGTk1HIC0gSW5zdGl0dXRvIEZlZGVyYWwg
+ZG8gTm9ydGUgZGUgTWluYXMgR2VyYWlzMUEwPwYDVQQLFDhER1RJIC0gRGlyZXRv
+cmlhIGRlIEdlc3TDo28gZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEhMB8G
+CSqGSIb3DQEJARYSYWRtaW5AaWZubWcuZWR1LmJyMRYwFAYDVQQHEw1Nb250ZXMg
+Q2xhcm9zMTMwMQYDVQQIEypJbnN0aXR1dG8gRmVkZXJhbCBkbyBOb3J0ZSBkZSBN
+aW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFjYWZlLmlmbm1nLmVk
+dS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9uROMCbnEj8V6d
+i0FPFPgvZEkK/maZkaMPAeWFWBIsWdvvVcUYLPm/TKSgkEL3LA9gqD6LupuNHtuq
+VbihU2FRJ63ld57t/TI4K2hm1VwN9le1ajyf/GXgEcrSMkjpxbHI3rFF2PMoFR4y
+Xmt3FVdyEXrMnIg35viPKdWZyNSjdZjctPTDHoU5LZEVbdCJSm547nQdthFBUXnM
+xcHzsZwfx/duHrvlQaFDPTCKZpvy9RGTwEJ0B2iYnPz5eR8SbspvKefhQJUYRgCn
+ljf8x5qGRmzWQoT8Fy+4/mvZmg+nrpvA7fOJt1nz3fMTujY3nFM78hybPM5Rc9Ks
+PmRmLsECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAILjGqJqbxuulyeZRx5CDoILr
+d0l3/ulycfHSx1KuL3z/pq74Qnsd/bx5i+9t61ilDgjzaPfrSa2R/819VXOsDxXK
+9d43R7YMCLh7cHCLSxhTgZex3lGpV0EVoKUlk7nFuKR0l5WNIojSI9Hns2f7rRR0
+V3FOyySr+3VwErgEtQx6L2tsMIe+PXa0f1OmK2WXiYKjTVi12u8J3rNG9g7i357A
+a6ENAoHeYilId0ZTYlna/9aQ8wYmKM4WPGwG3XU3jdecq117R5+N0tfqoNXtCuri
+zG6SmyYA5YmlEzJQS1UXZtuchEwQlVajzGdGZAeQm2bPcbCgSrAx6EnU4ZLKIQ==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifnmg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifnmg.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">IFNMG - Instituto Federal Do Norte De Minas Gerais</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFNMG - Instituto Federal Do Norte De Minas Gerais</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifnmg.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifnmg.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Christopher Mota</md:SurName>
+    <md:EmailAddress>christopher.mota@ifnmg.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifpa.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifpa.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..238f3857
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifpa.edu.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ifpa.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFPA - Instituto Federal do Para</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFPA - Instituto Federal do Para</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFPA - Instituto Federal do Para</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFPA - Instituto Federal do Para</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifpa.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifpa.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>
+    MIIDyDCCArACAQAwDQYJKoZIhvcNAQEFBQAwgakxIzAhBgNVBAoUGkluc3RpdHV0
+byBGZWRlcmFsIGRvIFBhcsOhMQwwCgYDVQQLEwNEVEkxKzApBgkqhkiG9w0BCQEW
+HGFuZGVyc29uLmFsbWVpZGFAaWZwYS5lZHUuYnIxDzANBgNVBAcUBkJlbMOpbTEO
+MAwGA1UECBQFUGFyw6ExCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcGEu
+ZWR1LmJyMB4XDTE0MDQwOTE4MzkxN1oXDTE5MDQwODE4MzkxN1owgakxIzAhBgNV
+BAoUGkluc3RpdHV0byBGZWRlcmFsIGRvIFBhcsOhMQwwCgYDVQQLEwNEVEkxKzAp
+BgkqhkiG9w0BCQEWHGFuZGVyc29uLmFsbWVpZGFAaWZwYS5lZHUuYnIxDzANBgNV
+BAcUBkJlbMOpbTEOMAwGA1UECBQFUGFyw6ExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
+ExBjYWZlLmlmcGEuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAuHQSNZdfuckLdr/4W1qtvMa3cS/lKPM3tSZY1UVTLH+KPn76aBWk+zOd92C+
+UgdL+WtJn8qdpX7a16SGfTLwwWtlKJdiC7AxTkPHv6v4HnVBYXBep/re7Yt7ztO3
+4D/6jgj99HMfbz8jtfl2RV6m+rFupKth8gU9hTcaVTtBKUc5Lx+SSYk5Ik3jjOXJ
+s3I/aluVe47GIuJcZAErB/8aCDlUkChGRF4262nzW92xqK5dmXbqd76uVNG5U5dV
+hhc1KlBaZD3kuinuMVlOqBRQoHU4HzDAGWbQ9Jguf6M/cSSQEVtGQp3ZIl6s+YK5
+Zgxdsxs56Sx5qcLQx+0GhRkpdQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCtxGdM
+SOa6Hj20lqQ04V855D6JVI5kbVoOjlBZ1UlxeO8BoD3535GhnGE2Ajik7MXfYYYF
+ByZEG/WX8TjiL1jVYNQS/XdrXbz/38XJM2O3q32G1eZ0AhtQEpAEYSN/owrFolbq
+hJx+tdKdIJ3hatboJsrZHX60LcvMz76lXtjb10GVj4g7Kpix7l13mOQgPZl4Ard3
+l7joZ5SsO3GzjI5ZNLiKafLrjpPqHMA1NdJ/OkaIiMuGqAC50ob3iXE87pfvQ7iZ
+Tsz8wWmk1P302VHoBrUz2NJmrpmvd2jCoMXmTdDfn3nKw/U0Is+nIgn1HnvHzgOQ
+IGfcjJxQ/HcjSANz
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifpa.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://cafe.ifpa.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://cafe.ifpa.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifpa.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifpa.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifpa.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>
+      
+MIIDyDCCArACAQAwDQYJKoZIhvcNAQEFBQAwgakxIzAhBgNVBAoUGkluc3RpdHV0
+byBGZWRlcmFsIGRvIFBhcsOhMQwwCgYDVQQLEwNEVEkxKzApBgkqhkiG9w0BCQEW
+HGFuZGVyc29uLmFsbWVpZGFAaWZwYS5lZHUuYnIxDzANBgNVBAcUBkJlbMOpbTEO
+MAwGA1UECBQFUGFyw6ExCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcGEu
+ZWR1LmJyMB4XDTE0MDQwOTE4MzkxN1oXDTE5MDQwODE4MzkxN1owgakxIzAhBgNV
+BAoUGkluc3RpdHV0byBGZWRlcmFsIGRvIFBhcsOhMQwwCgYDVQQLEwNEVEkxKzAp
+BgkqhkiG9w0BCQEWHGFuZGVyc29uLmFsbWVpZGFAaWZwYS5lZHUuYnIxDzANBgNV
+BAcUBkJlbMOpbTEOMAwGA1UECBQFUGFyw6ExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
+ExBjYWZlLmlmcGEuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAuHQSNZdfuckLdr/4W1qtvMa3cS/lKPM3tSZY1UVTLH+KPn76aBWk+zOd92C+
+UgdL+WtJn8qdpX7a16SGfTLwwWtlKJdiC7AxTkPHv6v4HnVBYXBep/re7Yt7ztO3
+4D/6jgj99HMfbz8jtfl2RV6m+rFupKth8gU9hTcaVTtBKUc5Lx+SSYk5Ik3jjOXJ
+s3I/aluVe47GIuJcZAErB/8aCDlUkChGRF4262nzW92xqK5dmXbqd76uVNG5U5dV
+hhc1KlBaZD3kuinuMVlOqBRQoHU4HzDAGWbQ9Jguf6M/cSSQEVtGQp3ZIl6s+YK5
+Zgxdsxs56Sx5qcLQx+0GhRkpdQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCtxGdM
+SOa6Hj20lqQ04V855D6JVI5kbVoOjlBZ1UlxeO8BoD3535GhnGE2Ajik7MXfYYYF
+ByZEG/WX8TjiL1jVYNQS/XdrXbz/38XJM2O3q32G1eZ0AhtQEpAEYSN/owrFolbq
+hJx+tdKdIJ3hatboJsrZHX60LcvMz76lXtjb10GVj4g7Kpix7l13mOQgPZl4Ard3
+l7joZ5SsO3GzjI5ZNLiKafLrjpPqHMA1NdJ/OkaIiMuGqAC50ob3iXE87pfvQ7iZ
+Tsz8wWmk1P302VHoBrUz2NJmrpmvd2jCoMXmTdDfn3nKw/U0Is+nIgn1HnvHzgOQ
+IGfcjJxQ/HcjSANz
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifpa.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifpa.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">IFPA - Instituto Federal do Para</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFPA - Instituto Federal do Para</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFPA - Instituto Federal do Para</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFPA - Instituto Federal do Para</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifpa.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifpa.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Anderson Almeida</md:SurName>
+    <md:EmailAddress>anderson.almeida@ifpa.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..6d24622f
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ifro.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFRO</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFRO</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFRO</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFRO</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifro.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifro.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>
+    MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzENMAsGA1UECxMEREdUSTELMAkG
+A1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwHhcNMTQwNzI0MTkxNzEwWhcNMTkwNzIz
+MTkxNzEwWjArMQ0wCwYDVQQLEwRER1RJMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
+Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6ZCm5rnhEwPjrr
+hJeWHqx+5Uj4/0xBuiU+7EIDJfkCWGAjmo3wyn7fnl9NkAsBzf+CKrWSOPEcgOS5
+p2EPsP4XL+/AH24s86tdFN/5GNY9gYVv9HdgxHXX5CsS+35X1J3vtVMbyc40+UNp
+YgLlocluN+xyYYFgi4hjXo64YGgWfAEOVkpQaQftVJTd5B06PlfI3zRV+s4yD+1r
+1hcz9coOSmsE/fZX7QRJQ1imxm6w6xBj5xP95hw3knOZ4G7m7YzApEg8P0nak2fs
+EYYYOnMSKnKB2Ss9Y57hffnvvXsBScSP+u28mJB6eFz92WMyH7hrhyttR9mVn8pj
+v/pqK00CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEATr5qM9J/dGnTA81HMB10gQ78
+V9o++8gwlRqjK+TEM5XdUqu1Fw6ela0etECzoaWQpuFbU2S3tkP0VrN5ONabgPGK
+lx9s8N+uY80QUzUaAIAePVA77dYaQK/nC+lRWtOSRig5ZfYW8nrbPkwe9YN/Z0Yl
+a5oKJj745bgtCC4E8ymffGQNW45/cbLXGGkZ/uxUyHWUhBg4GVmCa1sjXTJDBzDN
+iOLJsZO2Byu4nNTDHzRbtrIZDNsJ0M12sjEO2AVCOP4hXDoRFoZJtzCq+4q4f3lh
+zDUAzBmzpM9dLuP2WBQkKjZNg6PwOzmIF0JRBaGx4PaRAha3GWG91vo5zI+lVg==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifro.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://cafe.ifro.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://cafe.ifro.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifro.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifro.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifro.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>
+      
+MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzENMAsGA1UECxMEREdUSTELMAkG
+A1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwHhcNMTQwNzI0MTkxNzEwWhcNMTkwNzIz
+MTkxNzEwWjArMQ0wCwYDVQQLEwRER1RJMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
+Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6ZCm5rnhEwPjrr
+hJeWHqx+5Uj4/0xBuiU+7EIDJfkCWGAjmo3wyn7fnl9NkAsBzf+CKrWSOPEcgOS5
+p2EPsP4XL+/AH24s86tdFN/5GNY9gYVv9HdgxHXX5CsS+35X1J3vtVMbyc40+UNp
+YgLlocluN+xyYYFgi4hjXo64YGgWfAEOVkpQaQftVJTd5B06PlfI3zRV+s4yD+1r
+1hcz9coOSmsE/fZX7QRJQ1imxm6w6xBj5xP95hw3knOZ4G7m7YzApEg8P0nak2fs
+EYYYOnMSKnKB2Ss9Y57hffnvvXsBScSP+u28mJB6eFz92WMyH7hrhyttR9mVn8pj
+v/pqK00CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEATr5qM9J/dGnTA81HMB10gQ78
+V9o++8gwlRqjK+TEM5XdUqu1Fw6ela0etECzoaWQpuFbU2S3tkP0VrN5ONabgPGK
+lx9s8N+uY80QUzUaAIAePVA77dYaQK/nC+lRWtOSRig5ZfYW8nrbPkwe9YN/Z0Yl
+a5oKJj745bgtCC4E8ymffGQNW45/cbLXGGkZ/uxUyHWUhBg4GVmCa1sjXTJDBzDN
+iOLJsZO2Byu4nNTDHzRbtrIZDNsJ0M12sjEO2AVCOP4hXDoRFoZJtzCq+4q4f3lh
+zDUAzBmzpM9dLuP2WBQkKjZNg6PwOzmIF0JRBaGx4PaRAha3GWG91vo5zI+lVg==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifro.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifro.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">IFRO</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFRO</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFRO</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFRO</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifro.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifro.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Joilson Dantas</md:SurName>
+    <md:EmailAddress>suporte.reitoria@ifro.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..83011788
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ifrs.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifrs.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifrs.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>
+    MIIC4DCCAcgCAQAwDQYJKoZIhvcNAQEFBQAwNjEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZnJzLmVkdS5icjAeFw0xNTAyMDQxNDQz
+MzRaFw0xODAyMDMxNDQzMzRaMDYxDDAKBgNVBAsTA0NQRDELMAkGA1UEBhMCQlIx
+GTAXBgNVBAMTEGNhZmUuaWZycy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDB47pYuvBeA0eVzZhFqswwbQjC1pqS7mSTsAbeQ++Mk+eLTSzM
+42Lvxt/GrJshUayw0tkwvBb9BojMzPX6NNgjpo15sX9p5OP/HZF+AcwhIbhLUUro
+977TAAhlIvUVyajUMJfiKTKQPEcwstBuy4NStbseEZZ2BjzsNtrC1G0cZ/TOC3jt
+Aui2mqbyt2hi1dyCJcnYX7rEQaUbkvLht6ZJcLwSDbqN9KEMiKRmOx1yqsu+MD1Y
+Th4gh3fVASiMOaB4E+m9yXdCDHCdLBK0ammEH0TdIqujDl6x+qIRxednk403Z4cc
+BmQjr20A+ayDAUWh1bSEufxJLExXhNUURRizAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAL3Dqyd5FYJfH4NPfWbB4ytTOVdt76S3I0Zjh0qvDCsTy8yUnzXl7QyQB+0W
+rwcIdnqwcJuFmj4fzfJblcFuoTFvMk/u3NKx5zDcfksI6N03mKUtui6NwtJ3tT7H
+RrctCCHU1CKSk77nIuhPjFYDpdv1AJLTmwhV2H0+E470Yuf0FKOW/L28i+UN2Bkk
+s6FgNzGklkgW158ADE/eRdtecVDiMiBRX0Spk3Npcq9GrPOvoQYvDaB389Yo1kIs
+8TQVJ24GbGRSduOxjBtezmCTFzJpx1O/GhNz2GZ8QwZ+zZl7H/4o1QITRkACinGV
+RnAFWGZIRzkRjDNoUTJJrwo+52g=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifrs.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://cafe.ifrs.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://cafe.ifrs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifrs.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifrs.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifrs.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>
+      
+MIIC4DCCAcgCAQAwDQYJKoZIhvcNAQEFBQAwNjEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZnJzLmVkdS5icjAeFw0xNTAyMDQxNDQz
+MzRaFw0xODAyMDMxNDQzMzRaMDYxDDAKBgNVBAsTA0NQRDELMAkGA1UEBhMCQlIx
+GTAXBgNVBAMTEGNhZmUuaWZycy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDB47pYuvBeA0eVzZhFqswwbQjC1pqS7mSTsAbeQ++Mk+eLTSzM
+42Lvxt/GrJshUayw0tkwvBb9BojMzPX6NNgjpo15sX9p5OP/HZF+AcwhIbhLUUro
+977TAAhlIvUVyajUMJfiKTKQPEcwstBuy4NStbseEZZ2BjzsNtrC1G0cZ/TOC3jt
+Aui2mqbyt2hi1dyCJcnYX7rEQaUbkvLht6ZJcLwSDbqN9KEMiKRmOx1yqsu+MD1Y
+Th4gh3fVASiMOaB4E+m9yXdCDHCdLBK0ammEH0TdIqujDl6x+qIRxednk403Z4cc
+BmQjr20A+ayDAUWh1bSEufxJLExXhNUURRizAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAL3Dqyd5FYJfH4NPfWbB4ytTOVdt76S3I0Zjh0qvDCsTy8yUnzXl7QyQB+0W
+rwcIdnqwcJuFmj4fzfJblcFuoTFvMk/u3NKx5zDcfksI6N03mKUtui6NwtJ3tT7H
+RrctCCHU1CKSk77nIuhPjFYDpdv1AJLTmwhV2H0+E470Yuf0FKOW/L28i+UN2Bkk
+s6FgNzGklkgW158ADE/eRdtecVDiMiBRX0Spk3Npcq9GrPOvoQYvDaB389Yo1kIs
+8TQVJ24GbGRSduOxjBtezmCTFzJpx1O/GhNz2GZ8QwZ+zZl7H/4o1QITRkACinGV
+RnAFWGZIRzkRjDNoUTJJrwo+52g=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifrs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifrs.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">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifrs.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifrs.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Suporte CAFe IFRS</md:SurName>
+    <md:EmailAddress>cafe@ifrs.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifsp.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifsp.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..3d63ca44
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifsp.edu.br-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ifsp.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFSP - Instituto Federal de Sao Paulo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFSP - Instituto Federal de Sao Paulo</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifsp.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifsp.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>
+    MIICyDCCAbACAQAwDQYJKoZIhvcNAQEFBQAwKjEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjENMAsGA1UEAxMEY2FmZTAeFw0xNDA4MTUxODU4NDNaFw0xOTA4MTQx
+ODU4NDNaMCoxDDAKBgNVBAsTA0NQRDELMAkGA1UEBhMCQlIxDTALBgNVBAMTBGNh
+ZmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDoCA9jrziW3ypnZTNf
+ul1zcAvMpA2Wi0snGxd81AffY2WeOUzn9JreTYiGfaagoi1nz6bCcq+YQUbbYOW1
+pdut7EQf+oY56pT/VNsfgvJUQ5d8QEl8tB4kvlQmffD0XGqWNF3td/QwdHD6Ffgv
+IDjywdiKIoWdoVv6LhuqgfhDTKvTamE25KxD217xnSlttA1hxFoCXqGF+F2oEDoG
+KEXx4guEptgqaIhr/jPtgGVjNROmYTsbs3p0a9hm+TYAh/CkljKCx3YAm7GKLG8G
+vFbyxNMBplRGQ2q57TUGHcE3/2KxzkL/IcTalFYwQeb6rBL8V0vhqodYF4zz0gTW
+YfUlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIZXXTx3ywiElOXzDM7KjW4zILSz
+MyBqXN484rGXtrihqYPsRJusIS0SV8lf1wBc0ijhAckF31ktkiC5k/OKL2yJK1Ta
+pOi833wAhZSMfiDFQhSLZY0BC3K4nVTixprPgk51s3yx+N3d/FxmpSdyr+Ujs58P
+mcDAYwVa+FOEyaGFxby9oZT5wccbgIfnbGiKhMrAAnpsTKYRoT64yYqwZXLhA0h2
+arTHpzzgz+iz/2pgcGh039pwEbfs2+e2U9Ij2NRcvgYyp/paJBqYIXWeRx4zW2vO
+TEF9OsunACQdf0GwmnVXynHUtCJQN9QOAgoLLBvt7oF1mDNt0u6ZPKOzDII=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifsp.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://cafe.ifsp.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://cafe.ifsp.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifsp.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifsp.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifsp.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>
+      
+
+MIICyDCCAbACAQAwDQYJKoZIhvcNAQEFBQAwKjEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjENMAsGA1UEAxMEY2FmZTAeFw0xNDA4MTUxODU4NDNaFw0xOTA4MTQx
+ODU4NDNaMCoxDDAKBgNVBAsTA0NQRDELMAkGA1UEBhMCQlIxDTALBgNVBAMTBGNh
+ZmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDoCA9jrziW3ypnZTNf
+ul1zcAvMpA2Wi0snGxd81AffY2WeOUzn9JreTYiGfaagoi1nz6bCcq+YQUbbYOW1
+pdut7EQf+oY56pT/VNsfgvJUQ5d8QEl8tB4kvlQmffD0XGqWNF3td/QwdHD6Ffgv
+IDjywdiKIoWdoVv6LhuqgfhDTKvTamE25KxD217xnSlttA1hxFoCXqGF+F2oEDoG
+KEXx4guEptgqaIhr/jPtgGVjNROmYTsbs3p0a9hm+TYAh/CkljKCx3YAm7GKLG8G
+vFbyxNMBplRGQ2q57TUGHcE3/2KxzkL/IcTalFYwQeb6rBL8V0vhqodYF4zz0gTW
+YfUlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIZXXTx3ywiElOXzDM7KjW4zILSz
+MyBqXN484rGXtrihqYPsRJusIS0SV8lf1wBc0ijhAckF31ktkiC5k/OKL2yJK1Ta
+pOi833wAhZSMfiDFQhSLZY0BC3K4nVTixprPgk51s3yx+N3d/FxmpSdyr+Ujs58P
+mcDAYwVa+FOEyaGFxby9oZT5wccbgIfnbGiKhMrAAnpsTKYRoT64yYqwZXLhA0h2
+arTHpzzgz+iz/2pgcGh039pwEbfs2+e2U9Ij2NRcvgYyp/paJBqYIXWeRx4zW2vO
+TEF9OsunACQdf0GwmnVXynHUtCJQN9QOAgoLLBvt7oF1mDNt0u6ZPKOzDII=
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifsp.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifsp.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">IFSP - Instituto Federal de Sao Paulo</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFSP - Instituto Federal de Sao Paulo</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifsp.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifsp.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Paulo Orlando Ricarte Kawachi</md:SurName>
+    <md:EmailAddress>infra@ifsp.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.on.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.on.br-idp-shibboleth.xml
new file mode 100644
index 00000000..8f03861b
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.on.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.on.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">on.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ON - Observatorio Nacional</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">ON - Observatorio Nacional</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ON - Observatorio Nacional</mdui:Description>
+        <mdui:Description xml:lang="pt-br">ON - Observatorio Nacional</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.on.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.on.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDwDCCAqgCAQAwDQYJKoZIhvcNAQEFBQAwgaUxIzAhBgNVBAoTGk9OIC0gT2Jz
+ZXJ2YXRvcmlvIE5hY2lvbmFsMQ0wCwYDVQQLEwREVElOMRswGQYJKoZIhvcNAQkB
+FgxrYW50ZXJAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQI
+Ew5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxEzARBgNVBAMTCmNhZmUub24u
+YnIwHhcNMTQwMzEwMTgxMDEwWhcNMTcwMzA5MTgxMDEwWjCBpTEjMCEGA1UEChMa
+T04gLSBPYnNlcnZhdG9yaW8gTmFjaW9uYWwxDTALBgNVBAsTBERUSU4xGzAZBgkq
+hkiG9w0BCQEWDGthbnRlckBvbi5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
+FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjETMBEGA1UEAxMK
+Y2FmZS5vbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMROHVXk
+EXBIpMbnBW0YSLczCP9rKrGpzhXvP/TmLy+cB/XPdsqEewNT+jCXrqDANL4qR2KL
+yPC2XS/ce+heyQG8aFgFuoyWSkupef9HR5LLq7NX5kvFG/iiYcJa0RGBn23rUudR
+MLP1HFn50htCjDbPV6zSyxt29J+8otWdoc7KeHOd50hq1Wcr+OdxyTQV4nXCxWsq
+6yy9mGg4SFo3csLepNs2IRI75uW+Wwq/zYRvvYJ2iBXC1Pcqw/xpAEepzquMJQQr
+hycQHBeSlmeNig7KRmX/gzTokaifcyXzz8inwvMSrSskkZEvuXO8j9H5QwAknfi2
+H8++d0LMUYaz5isCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcY1w75rvSUZcTZq0
+MZvWHdSUhkE0RTbJgVVEiMOZMe/IViFNzh4RVFH3KWd/dOI9TL+hQLQ9MqdRCsvO
++9cj0vzf+0w8ZDbNB9EnSSRYFGSiYUilmZkPsK3FbuzsHgPFQRz4BJTvcu5WeJFH
+TFVaH7ESNc1aH+i7L8sApWBcJgpULtmdaIzK9Ipqva+5MLaCVKqU4vyhXfLg9LUa
+EdrSKYPZgsPA2cXQrKTg2BGpAE0cjEzQGh5L29JEpEixQjVLIaM2cLzEVpafZFc/
+mZGQjPivv0WXt2G/6594Gt3zwARJoqiPVGV7ppz8jQX5oQCVfSGXh4ztJsJYZLzM
+mncIMA==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.on.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.on.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://cafe.on.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.on.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.on.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.on.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">on.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDwDCCAqgCAQAwDQYJKoZIhvcNAQEFBQAwgaUxIzAhBgNVBAoTGk9OIC0gT2Jz
+ZXJ2YXRvcmlvIE5hY2lvbmFsMQ0wCwYDVQQLEwREVElOMRswGQYJKoZIhvcNAQkB
+FgxrYW50ZXJAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQI
+Ew5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxEzARBgNVBAMTCmNhZmUub24u
+YnIwHhcNMTQwMzEwMTgxMDEwWhcNMTcwMzA5MTgxMDEwWjCBpTEjMCEGA1UEChMa
+T04gLSBPYnNlcnZhdG9yaW8gTmFjaW9uYWwxDTALBgNVBAsTBERUSU4xGzAZBgkq
+hkiG9w0BCQEWDGthbnRlckBvbi5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
+FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjETMBEGA1UEAxMK
+Y2FmZS5vbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMROHVXk
+EXBIpMbnBW0YSLczCP9rKrGpzhXvP/TmLy+cB/XPdsqEewNT+jCXrqDANL4qR2KL
+yPC2XS/ce+heyQG8aFgFuoyWSkupef9HR5LLq7NX5kvFG/iiYcJa0RGBn23rUudR
+MLP1HFn50htCjDbPV6zSyxt29J+8otWdoc7KeHOd50hq1Wcr+OdxyTQV4nXCxWsq
+6yy9mGg4SFo3csLepNs2IRI75uW+Wwq/zYRvvYJ2iBXC1Pcqw/xpAEepzquMJQQr
+hycQHBeSlmeNig7KRmX/gzTokaifcyXzz8inwvMSrSskkZEvuXO8j9H5QwAknfi2
+H8++d0LMUYaz5isCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcY1w75rvSUZcTZq0
+MZvWHdSUhkE0RTbJgVVEiMOZMe/IViFNzh4RVFH3KWd/dOI9TL+hQLQ9MqdRCsvO
++9cj0vzf+0w8ZDbNB9EnSSRYFGSiYUilmZkPsK3FbuzsHgPFQRz4BJTvcu5WeJFH
+TFVaH7ESNc1aH+i7L8sApWBcJgpULtmdaIzK9Ipqva+5MLaCVKqU4vyhXfLg9LUa
+EdrSKYPZgsPA2cXQrKTg2BGpAE0cjEzQGh5L29JEpEixQjVLIaM2cLzEVpafZFc/
+mZGQjPivv0WXt2G/6594Gt3zwARJoqiPVGV7ppz8jQX5oQCVfSGXh4ztJsJYZLzM
+mncIMA==
+	
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.on.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.on.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">ON - Observatorio Nacional</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">ON - Observatorio Nacional</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ON - Observatorio Nacional</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">ON - Observatorio Nacional</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.on.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.on.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>luisriera</md:SurName>
+    <md:EmailAddress>luisriera@on.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.pucminas.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.pucminas.br-idp-shibboleth.xml
new file mode 100644
index 00000000..391e1ac8
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.pucminas.br-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.pucminas.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">pucminas.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</mdui:DisplayName>
+        <mdui:Description xml:lang="en">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</mdui:Description>
+        <mdui:Description xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.pucminas.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.pucminas.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIC7DCCAdQCAQAwDQYJKoZIhvcNAQEFBQAwPDESMBAGA1UECxMJUFVDIE1pbmFz
+MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5wdWNtaW5hcy5icjAeFw0xNDA4
+MDExNzI5MzVaFw0xNzA3MzExNzI5MzVaMDwxEjAQBgNVBAsTCVBVQyBNaW5hczEL
+MAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUucHVjbWluYXMuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwbRSZhSFejHJ757yOpWBXE63J1mukrT3E
+1LaOkUfCDgJgNSOpQDxvT3FgBv9LCRRY+X+z+vRAoT6ab7C+WS8Nuk4UzddO2sqJ
+VedwmDew2yvdaUCPSQ6VZwSca53rsWPYo1gbsz1p+RZMpHe/qoixw3Q2aAsNpx8w
+cBrdR0NUoA1Ud4sRyEd7585VIj7X3dkY/ae+QtbJx+dadjWw+EX4Ry3Ep8dvImMm
+fgOVOuunnKXLop5tRCeIJl6Oi6jQhYtOZld/FXTWufkcO0H+KLmA/gfoWaGN8scy
+XEhXQRMii8brZ/S2IXYCsQvBBgqvgsbT7a2u4C6iP7R8E7fiQeoPAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAGCmcvJ2ABwJPHZmxZxs/g51NPBgVuIthLckq7GPOv+i
+WwqVIwVoca9PqdUEc2AdG5J7ceQwU2COrq9DLumJAdsJuh/AvnjeF1XBUDGKXR3a
+SD624LId5gwTm4SZzyozjFoZG/WRzbEp3QXoZ0UgzzEFSZsd0K3Mu83qhyJRkNzG
+XhYRvX8ydDIygfAtw6+kMa4v+4Ak5usVOP2BD17H11TEU/Dw3I3LAk0aLwici1/o
+UUBMSFKVKhgKv5eBJYcujVACXvdM8XAxAnIwocuj/0uOVh0BwpEp4xqSTYtV7v/l
+ABmiz2DXLugHeiOCiOTKAhg8YLcH/wknW7uULQGn+O0=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.pucminas.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.pucminas.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://cafe.pucminas.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.pucminas.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.pucminas.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.pucminas.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">pucminas.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIC7DCCAdQCAQAwDQYJKoZIhvcNAQEFBQAwPDESMBAGA1UECxMJUFVDIE1pbmFz
+MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5wdWNtaW5hcy5icjAeFw0xNDA4
+MDExNzI5MzVaFw0xNzA3MzExNzI5MzVaMDwxEjAQBgNVBAsTCVBVQyBNaW5hczEL
+MAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUucHVjbWluYXMuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwbRSZhSFejHJ757yOpWBXE63J1mukrT3E
+1LaOkUfCDgJgNSOpQDxvT3FgBv9LCRRY+X+z+vRAoT6ab7C+WS8Nuk4UzddO2sqJ
+VedwmDew2yvdaUCPSQ6VZwSca53rsWPYo1gbsz1p+RZMpHe/qoixw3Q2aAsNpx8w
+cBrdR0NUoA1Ud4sRyEd7585VIj7X3dkY/ae+QtbJx+dadjWw+EX4Ry3Ep8dvImMm
+fgOVOuunnKXLop5tRCeIJl6Oi6jQhYtOZld/FXTWufkcO0H+KLmA/gfoWaGN8scy
+XEhXQRMii8brZ/S2IXYCsQvBBgqvgsbT7a2u4C6iP7R8E7fiQeoPAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAGCmcvJ2ABwJPHZmxZxs/g51NPBgVuIthLckq7GPOv+i
+WwqVIwVoca9PqdUEc2AdG5J7ceQwU2COrq9DLumJAdsJuh/AvnjeF1XBUDGKXR3a
+SD624LId5gwTm4SZzyozjFoZG/WRzbEp3QXoZ0UgzzEFSZsd0K3Mu83qhyJRkNzG
+XhYRvX8ydDIygfAtw6+kMa4v+4Ak5usVOP2BD17H11TEU/Dw3I3LAk0aLwici1/o
+UUBMSFKVKhgKv5eBJYcujVACXvdM8XAxAnIwocuj/0uOVh0BwpEp4xqSTYtV7v/l
+ABmiz2DXLugHeiOCiOTKAhg8YLcH/wknW7uULQGn+O0=
+		
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.pucminas.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.pucminas.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">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pucminas.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.pucminas.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jose Teixeira Horta Junior</md:SurName>
+    <md:EmailAddress>noc@pucminas.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml
new file mode 100644
index 00000000..c8d73b19
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.sti.uff.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">uff.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFF - Universidade Federal Fluminense</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFF - Universidade Federal Fluminense</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFF - Universidade Federal Fluminense</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFF - Universidade Federal Fluminense</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uff.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uff.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIC3jCCAcYCAQAwDQYJKoZIhvcNAQEFBQAwNTEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEYMBYGA1UEAxMPY2FmZS5zdGkudWZmLmJyMB4XDTE1MDMwNjEzMjYz
+MloXDTIwMDMwNDEzMjYzMlowNTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEY
+MBYGA1UEAxMPY2FmZS5zdGkudWZmLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA174aH+85vMtUCFZixKVVagtPNB8dDsOZy1yfoBtt5doQbTJ940sE
+fZaqV7ZseZUywzki5ywXb1exPWVIRcfcm4MXq0W9Aa4+ObS4+MnB24rHzAOTB9gq
+D2vtr500abR7kKmoj/DelinGZ3yQmsvTOLFn0O9TH+dsVuJeF7HGkGhqmX77PGSB
+kii2+lO1ZVBap6NTacu8H7GEK9ci5Qjl4xXYaDCq8SXs0Ms0psSzG++wpyyyPV9W
+q2qNmLGVxxXd+hWwQwCieLYc3PuE9jeDkWJe8a25AvjwTmoIohyYciOw2P+3muN4
+Pozn6TM3oFVw8cm41jTiuQJsUyxjFDAyTwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQBkp0lu/zIeWo4OHVVhqTbPxcoMQ7UnBUJuku12ZmIfDb6FDiHlQitwTuBrep87
+A3oEmVN9BTLr/r8iw58Bfze/kYGQW9P7QOObOWaBDVuWPN2DLvBO2uvMSuOEZoI0
+3NCuLr5mi+Ahkwg+3Skgxa/LoT9ata18j2g11Jpa1z609buu7LJ2BBZ0etaxG6M9
+5zCCsP9j3MJ90/gsPT+dv/c2F3zOBq1hH7zzU2D16+wPX75vEd6ZQWzRacaUhaCu
+XBWbFnTZT9kXDNGoyyO5IgDXwprECJG1PeeqgD/j7iNWqeynNxuOQY7bKFMx8sjj
+noYKknCKZFy1OZxKXL8q2O1w
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.sti.uff.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.sti.uff.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://cafe.sti.uff.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.sti.uff.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.sti.uff.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.sti.uff.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">uff.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIC3jCCAcYCAQAwDQYJKoZIhvcNAQEFBQAwNTEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEYMBYGA1UEAxMPY2FmZS5zdGkudWZmLmJyMB4XDTE1MDMwNjEzMjYz
+MloXDTIwMDMwNDEzMjYzMlowNTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEY
+MBYGA1UEAxMPY2FmZS5zdGkudWZmLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA174aH+85vMtUCFZixKVVagtPNB8dDsOZy1yfoBtt5doQbTJ940sE
+fZaqV7ZseZUywzki5ywXb1exPWVIRcfcm4MXq0W9Aa4+ObS4+MnB24rHzAOTB9gq
+D2vtr500abR7kKmoj/DelinGZ3yQmsvTOLFn0O9TH+dsVuJeF7HGkGhqmX77PGSB
+kii2+lO1ZVBap6NTacu8H7GEK9ci5Qjl4xXYaDCq8SXs0Ms0psSzG++wpyyyPV9W
+q2qNmLGVxxXd+hWwQwCieLYc3PuE9jeDkWJe8a25AvjwTmoIohyYciOw2P+3muN4
+Pozn6TM3oFVw8cm41jTiuQJsUyxjFDAyTwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQBkp0lu/zIeWo4OHVVhqTbPxcoMQ7UnBUJuku12ZmIfDb6FDiHlQitwTuBrep87
+A3oEmVN9BTLr/r8iw58Bfze/kYGQW9P7QOObOWaBDVuWPN2DLvBO2uvMSuOEZoI0
+3NCuLr5mi+Ahkwg+3Skgxa/LoT9ata18j2g11Jpa1z609buu7LJ2BBZ0etaxG6M9
+5zCCsP9j3MJ90/gsPT+dv/c2F3zOBq1hH7zzU2D16+wPX75vEd6ZQWzRacaUhaCu
+XBWbFnTZT9kXDNGoyyO5IgDXwprECJG1PeeqgD/j7iNWqeynNxuOQY7bKFMx8sjj
+noYKknCKZFy1OZxKXL8q2O1w
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.sti.uff.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.sti.uff.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">UFF - Universidade Federal Fluminense</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFF - Universidade Federal Fluminense</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFF - Universidade Federal Fluminense</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFF - Universidade Federal Fluminense</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uff.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.uff.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Uenes Vilaca</md:SurName>
+    <md:EmailAddress>uenesvilaca@id.uff.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.udesc.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.udesc.br-idp-shibboleth.xml
new file mode 100644
index 00000000..f80e5d70
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.udesc.br-idp-shibboleth.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.udesc.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">udesc.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UDESC - Universidade do Estado de Santa Catarina</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UDESC - Universidade do Estado de Santa Catarina</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.udesc.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.udesc.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEgDCCA2gCAQAwDQYJKoZIhvcNAQEFBQAwggEEMTkwNwYDVQQKEzBVREVTQyAt
+IFVuaXZlcnNpZGFkZSBkbyBFc3RhZG8gZGUgU2FudGEgQ2F0YXJpbmExSTBHBgNV
+BAsUQFNFVElDIC0gU2VjcmV0YXJpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHD
+p8OjbyBlIENvbXVuaWNhw6fDo28xJTAjBgkqhkiG9w0BCQEWFnNlaW5mcmEuc2V0
+aWNAdWRlc2MuYnIxFzAVBgNVBAcUDkZsb3JpYW7Ds3BvbGlzMRcwFQYDVQQIEw5T
+YW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUudWRlc2Mu
+YnIwHhcNMTQwNTE1MjAxMjEyWhcNMTcwNTE0MjAxMjEyWjCCAQQxOTA3BgNVBAoT
+MFVERVNDIC0gVW5pdmVyc2lkYWRlIGRvIEVzdGFkbyBkZSBTYW50YSBDYXRhcmlu
+YTFJMEcGA1UECxRAU0VUSUMgLSBTZWNyZXRhcmlhIGRlIFRlY25vbG9naWEgZGEg
+SW5mb3JtYcOnw6NvIGUgQ29tdW5pY2HDp8OjbzElMCMGCSqGSIb3DQEJARYWc2Vp
+bmZyYS5zZXRpY0B1ZGVzYy5icjEXMBUGA1UEBxQORmxvcmlhbsOzcG9saXMxFzAV
+BgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEWMBQGA1UEAxMNY2Fm
+ZS51ZGVzYy5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9PTe5l
+WC7jplN9PsFwipaPk1bB5UPXxEOeJgr/6xf5RMT//l1L6T/X4uOj+lK6KI8a4pRc
+oD+a83AlKb8cvYzDIQEBCDOPqjruIy+TyTwQ358x45mPM/aNivkugPKMaK8Aidma
+nUgeiRuZ1rtFyVqenDkH7qs9SwExR4NnJ/1l7DNkP6znKksBq7PGlYkj0mryxNCV
+1CAEZT6zEIyptWwd0TRHaybJc2uDD5Kl8HE54IvCwxfdKgJVQ/9FK2W9vvZowUQl
+bOGdUHqFvtudcU6VWOPxuRv4NgmkFGRaNBisnfZ3XfUah8yMIvlYXgkAevQNBjnz
+g3P3o8BU5YU6ieECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAUu6oCJTJ51HQeuiD
+06G3V1HddwBdddkaHK+WVNux+s8fVQH1Z6ZvkIH2xgmi9ZI9jK7OoBv1H0TfM27g
+4i8RC4jkVM9SHJFR5YFlNs/5tMaohIMZ2zURG72tRLtq603OqSzaeZPIthDasWww
+VEfbfbckLrCcjuLzb608J8d0brg+Cgn8YxQY17r/4GbkXYuC9k9zYshOCZelS703
+C7ZdXXJuI6/VXffvbqifT9BsY3SmAPw/JQAiSxpp2+ZTwauq3YLwxDcIq9b5YX35
+qcmfM3D3mVPH/aUvLhgtMSlmaGYm8o1mD9LUIR5b5C4A+j/qmzu1IIf3JYqMjb/V
+WiKadQ==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.udesc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.udesc.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://cafe.udesc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.udesc.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.udesc.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.udesc.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">udesc.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEgDCCA2gCAQAwDQYJKoZIhvcNAQEFBQAwggEEMTkwNwYDVQQKEzBVREVTQyAt
+IFVuaXZlcnNpZGFkZSBkbyBFc3RhZG8gZGUgU2FudGEgQ2F0YXJpbmExSTBHBgNV
+BAsUQFNFVElDIC0gU2VjcmV0YXJpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHD
+p8OjbyBlIENvbXVuaWNhw6fDo28xJTAjBgkqhkiG9w0BCQEWFnNlaW5mcmEuc2V0
+aWNAdWRlc2MuYnIxFzAVBgNVBAcUDkZsb3JpYW7Ds3BvbGlzMRcwFQYDVQQIEw5T
+YW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUudWRlc2Mu
+YnIwHhcNMTQwNTE1MjAxMjEyWhcNMTcwNTE0MjAxMjEyWjCCAQQxOTA3BgNVBAoT
+MFVERVNDIC0gVW5pdmVyc2lkYWRlIGRvIEVzdGFkbyBkZSBTYW50YSBDYXRhcmlu
+YTFJMEcGA1UECxRAU0VUSUMgLSBTZWNyZXRhcmlhIGRlIFRlY25vbG9naWEgZGEg
+SW5mb3JtYcOnw6NvIGUgQ29tdW5pY2HDp8OjbzElMCMGCSqGSIb3DQEJARYWc2Vp
+bmZyYS5zZXRpY0B1ZGVzYy5icjEXMBUGA1UEBxQORmxvcmlhbsOzcG9saXMxFzAV
+BgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEWMBQGA1UEAxMNY2Fm
+ZS51ZGVzYy5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9PTe5l
+WC7jplN9PsFwipaPk1bB5UPXxEOeJgr/6xf5RMT//l1L6T/X4uOj+lK6KI8a4pRc
+oD+a83AlKb8cvYzDIQEBCDOPqjruIy+TyTwQ358x45mPM/aNivkugPKMaK8Aidma
+nUgeiRuZ1rtFyVqenDkH7qs9SwExR4NnJ/1l7DNkP6znKksBq7PGlYkj0mryxNCV
+1CAEZT6zEIyptWwd0TRHaybJc2uDD5Kl8HE54IvCwxfdKgJVQ/9FK2W9vvZowUQl
+bOGdUHqFvtudcU6VWOPxuRv4NgmkFGRaNBisnfZ3XfUah8yMIvlYXgkAevQNBjnz
+g3P3o8BU5YU6ieECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAUu6oCJTJ51HQeuiD
+06G3V1HddwBdddkaHK+WVNux+s8fVQH1Z6ZvkIH2xgmi9ZI9jK7OoBv1H0TfM27g
+4i8RC4jkVM9SHJFR5YFlNs/5tMaohIMZ2zURG72tRLtq603OqSzaeZPIthDasWww
+VEfbfbckLrCcjuLzb608J8d0brg+Cgn8YxQY17r/4GbkXYuC9k9zYshOCZelS703
+C7ZdXXJuI6/VXffvbqifT9BsY3SmAPw/JQAiSxpp2+ZTwauq3YLwxDcIq9b5YX35
+qcmfM3D3mVPH/aUvLhgtMSlmaGYm8o1mD9LUIR5b5C4A+j/qmzu1IIf3JYqMjb/V
+WiKadQ==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.udesc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.udesc.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">UDESC - Universidade do Estado de Santa Catarina</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UDESC - Universidade do Estado de Santa Catarina</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.udesc.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.udesc.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Setor de Infraestrutura - SETIC</md:SurName>
+    <md:EmailAddress>seinfra.setic@udesc.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.uesb.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.uesb.br-idp-shibboleth.xml
new file mode 100644
index 00000000..798d9390
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.uesb.br-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.uesb.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UESB - Universidade Estadual do Sudoeste da Bahia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UESB - Universidade Estadual do Sudoeste da Bahia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uesb.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uesb.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDoDCCAogCAQAwDQYJKoZIhvcNAQEFBQAwgZUxDTALBgNVBAoTBFVFU0IxDzAN
+BgNVBAsTBlVJTkZPUjEjMCEGCSqGSIb3DQEJARYUbGVvbmFyZG9AdWVzYi5lZHUu
+YnIxHTAbBgNVBAcTFFZpdG9yaWEgZGEgQ29ucXVpc3RhMQswCQYDVQQIEwJCQTEL
+MAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYi5icjAeFw0xMzA5MjAxODIz
+MjFaFw0xNjA5MTkxODIzMjFaMIGVMQ0wCwYDVQQKEwRVRVNCMQ8wDQYDVQQLEwZV
+SU5GT1IxIzAhBgkqhkiG9w0BCQEWFGxlb25hcmRvQHVlc2IuZWR1LmJyMR0wGwYD
+VQQHExRWaXRvcmlhIGRhIENvbnF1aXN0YTELMAkGA1UECBMCQkExCzAJBgNVBAYT
+AkJSMRUwEwYDVQQDEwxjYWZlLnVlc2IuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDX5Qd680PTIaF0ZaDfpTfPIdAIp+ydojMhCd34S3idsFGwSKiJ
+NnfOn65iPMJFynxfQuqoo9wWnPAcS22fudOTuqdwf6NFl3sUM6fXh1UmQn2pyHxe
+UrJCwViQDV6ZplF0Uw3ABnYew3gZfUk/34NR8kkB2NdBs6jp7PD+nWn9fPLNd23p
+thdpumkzbkkzRM9SweDmFbbCwJcrn0JR2H1xtUlqT/Aq9Vb8BT3JD44mZypxKU4d
+jI2/Kr9ZqaidQTcOqloiBoT1Az/fKmd1xXDDH8VFJvCGOSaXyWdEPR5kazOTLYyL
+QAq5KdWcpqU23keAklg0tw41kt1Wl1E+rb9fAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAE0BAVExopeUKLY/yXZhQ+rw6uYi+JY64Y3w2qp3o4TKqgN9j5ziZge76fWL
+4zMh7PO1TsZLnlWPcP4oP1OQNc4EiiiNGgLT4DfNU3NtpFFhVCKU5v3JUcw/ZHGj
+J4diZ6Rb6Q2TCcBJV02Gz7p6U6nhXE0blVlyqWuZ4GZWg2PSTHgaG2JzHUHC+wzf
+7OaEuX3loT+wlm2Jq2ebDBlm+Yoth1pwE+puOluSk23P6aa71SkQjxb4pEv9sx8A
+W8Xj75F/MRL9CKazIOsUVwMSJnhDgZCDc/XxD29lBYLycFS5AJiCngmO+nYI61bv
+f+RldW1MxS+H81kufj7Rum74V4I=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesb.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesb.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://cafe.uesb.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.uesb.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.uesb.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.uesb.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>
+      
+MIIDoDCCAogCAQAwDQYJKoZIhvcNAQEFBQAwgZUxDTALBgNVBAoTBFVFU0IxDzAN
+BgNVBAsTBlVJTkZPUjEjMCEGCSqGSIb3DQEJARYUbGVvbmFyZG9AdWVzYi5lZHUu
+YnIxHTAbBgNVBAcTFFZpdG9yaWEgZGEgQ29ucXVpc3RhMQswCQYDVQQIEwJCQTEL
+MAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYi5icjAeFw0xMzA5MjAxODIz
+MjFaFw0xNjA5MTkxODIzMjFaMIGVMQ0wCwYDVQQKEwRVRVNCMQ8wDQYDVQQLEwZV
+SU5GT1IxIzAhBgkqhkiG9w0BCQEWFGxlb25hcmRvQHVlc2IuZWR1LmJyMR0wGwYD
+VQQHExRWaXRvcmlhIGRhIENvbnF1aXN0YTELMAkGA1UECBMCQkExCzAJBgNVBAYT
+AkJSMRUwEwYDVQQDEwxjYWZlLnVlc2IuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDX5Qd680PTIaF0ZaDfpTfPIdAIp+ydojMhCd34S3idsFGwSKiJ
+NnfOn65iPMJFynxfQuqoo9wWnPAcS22fudOTuqdwf6NFl3sUM6fXh1UmQn2pyHxe
+UrJCwViQDV6ZplF0Uw3ABnYew3gZfUk/34NR8kkB2NdBs6jp7PD+nWn9fPLNd23p
+thdpumkzbkkzRM9SweDmFbbCwJcrn0JR2H1xtUlqT/Aq9Vb8BT3JD44mZypxKU4d
+jI2/Kr9ZqaidQTcOqloiBoT1Az/fKmd1xXDDH8VFJvCGOSaXyWdEPR5kazOTLYyL
+QAq5KdWcpqU23keAklg0tw41kt1Wl1E+rb9fAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAE0BAVExopeUKLY/yXZhQ+rw6uYi+JY64Y3w2qp3o4TKqgN9j5ziZge76fWL
+4zMh7PO1TsZLnlWPcP4oP1OQNc4EiiiNGgLT4DfNU3NtpFFhVCKU5v3JUcw/ZHGj
+J4diZ6Rb6Q2TCcBJV02Gz7p6U6nhXE0blVlyqWuZ4GZWg2PSTHgaG2JzHUHC+wzf
+7OaEuX3loT+wlm2Jq2ebDBlm+Yoth1pwE+puOluSk23P6aa71SkQjxb4pEv9sx8A
+W8Xj75F/MRL9CKazIOsUVwMSJnhDgZCDc/XxD29lBYLycFS5AJiCngmO+nYI61bv
+f+RldW1MxS+H81kufj7Rum74V4I=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesb.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesb.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">UESB - Universidade Estadual do Sudoeste da Bahia</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UESB - Universidade Estadual do Sudoeste da Bahia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uesb.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.uesb.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Leonardo</md:SurName>
+    <md:EmailAddress>leonardo@uesb.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.uesc.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.uesc.br-idp-shibboleth.xml
new file mode 100644
index 00000000..6929fe4c
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.uesc.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.uesc.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">uesc.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UESC - Universidade Estadual de Santa Cruz</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UESC - Universidade Estadual de Santa Cruz</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uesc.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uesc.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDvjCCAqYCAQAwDQYJKoZIhvcNAQEFBQAwgaQxMzAxBgNVBAoTKlVFU0MgLSBV
+TklWRVJTSURBREUgRVNUQURVQUwgREUgU0FOVEEgQ1JVWjEMMAoGA1UECxMDQ09J
+MRowGAYJKoZIhvcNAQkBFgtDT0lAVUVTQy5CUjEPMA0GA1UEBxMGSUxIRVVTMQ4w
+DAYDVQQIEwVCQUhJQTELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYy5i
+cjAeFw0xNDA0MTAxMjAyMzRaFw0xOTA0MDkxMjAyMzRaMIGkMTMwMQYDVQQKEypV
+RVNDIC0gVU5JVkVSU0lEQURFIEVTVEFEVUFMIERFIFNBTlRBIENSVVoxDDAKBgNV
+BAsTA0NPSTEaMBgGCSqGSIb3DQEJARYLQ09JQFVFU0MuQlIxDzANBgNVBAcTBklM
+SEVVUzEOMAwGA1UECBMFQkFISUExCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZl
+LnVlc2MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC72oVZgtPa
+vTAXBK6xUApNT4lZl9nN7GnX9MELpR6d9Nd9Hdh2HiK82IFucx1Ma6o48gp2IMoM
+CeMvP9gE+nNh8dTsV949z/EkesXTLqfSx8ZyZkAbULVeBkfjvZ8B4Tc8kFG0FVka
+3niIPQZNV+ojIWUkpCvFE8F5f1Fg/AuGPT7ClVTd/wmJnaCzVeBOv1igIcPIcyUB
+FcJ8pLOhFCP+YOrhen+XEO0B7kMVAfkwFzic7odExmiknQ311Sdt/QaPMF2EWZ7r
+QcBRayAbIx13GYbKiVNZDHv2jSbfrqjbrACLxP17IHtKTjAHTq9zUbtTiaGcwwL8
+F6hxMk3iZrsfAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACAUW1b9UNotRq7BlSiy
+C4ATLQ4qidg/8vCZu1AqreLXU71C3SHnOFl+C+JhorczJyo4lLVJmoIZRvjmedZT
+RNpeSsT4NBPxFpfhjk+e5RbrQJFa2qw4AansX/ErUhvRDaI9yy5gE1YdiOeK58Pc
+Yr8RJQdsCybLWTCSlVWJbRzvv05uUlJNnNSuxvYBeY727sDomtaj6WsPy99HPEY+
+r5nqp5LUU4AWUhpm8faNRFZia439GTSibCoICMRy4WBe1HvAi2ljKA4uRXKgJQsq
+Vv4jw5WtdCEE2lDlRADuHz5lbijCzXEikhEBFAcDWGmdFTtXMvcAUqaCTVUkQDUE
+9N8=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesc.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://cafe.uesc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.uesc.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.uesc.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.uesc.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">uesc.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDvjCCAqYCAQAwDQYJKoZIhvcNAQEFBQAwgaQxMzAxBgNVBAoTKlVFU0MgLSBV
+TklWRVJTSURBREUgRVNUQURVQUwgREUgU0FOVEEgQ1JVWjEMMAoGA1UECxMDQ09J
+MRowGAYJKoZIhvcNAQkBFgtDT0lAVUVTQy5CUjEPMA0GA1UEBxMGSUxIRVVTMQ4w
+DAYDVQQIEwVCQUhJQTELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYy5i
+cjAeFw0xNDA0MTAxMjAyMzRaFw0xOTA0MDkxMjAyMzRaMIGkMTMwMQYDVQQKEypV
+RVNDIC0gVU5JVkVSU0lEQURFIEVTVEFEVUFMIERFIFNBTlRBIENSVVoxDDAKBgNV
+BAsTA0NPSTEaMBgGCSqGSIb3DQEJARYLQ09JQFVFU0MuQlIxDzANBgNVBAcTBklM
+SEVVUzEOMAwGA1UECBMFQkFISUExCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZl
+LnVlc2MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC72oVZgtPa
+vTAXBK6xUApNT4lZl9nN7GnX9MELpR6d9Nd9Hdh2HiK82IFucx1Ma6o48gp2IMoM
+CeMvP9gE+nNh8dTsV949z/EkesXTLqfSx8ZyZkAbULVeBkfjvZ8B4Tc8kFG0FVka
+3niIPQZNV+ojIWUkpCvFE8F5f1Fg/AuGPT7ClVTd/wmJnaCzVeBOv1igIcPIcyUB
+FcJ8pLOhFCP+YOrhen+XEO0B7kMVAfkwFzic7odExmiknQ311Sdt/QaPMF2EWZ7r
+QcBRayAbIx13GYbKiVNZDHv2jSbfrqjbrACLxP17IHtKTjAHTq9zUbtTiaGcwwL8
+F6hxMk3iZrsfAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACAUW1b9UNotRq7BlSiy
+C4ATLQ4qidg/8vCZu1AqreLXU71C3SHnOFl+C+JhorczJyo4lLVJmoIZRvjmedZT
+RNpeSsT4NBPxFpfhjk+e5RbrQJFa2qw4AansX/ErUhvRDaI9yy5gE1YdiOeK58Pc
+Yr8RJQdsCybLWTCSlVWJbRzvv05uUlJNnNSuxvYBeY727sDomtaj6WsPy99HPEY+
+r5nqp5LUU4AWUhpm8faNRFZia439GTSibCoICMRy4WBe1HvAi2ljKA4uRXKgJQsq
+Vv4jw5WtdCEE2lDlRADuHz5lbijCzXEikhEBFAcDWGmdFTtXMvcAUqaCTVUkQDUE
+9N8=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesc.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">UESC - Universidade Estadual de Santa Cruz</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UESC - Universidade Estadual de Santa Cruz</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uesc.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.uesc.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>UDO/COI</md:SurName>
+    <md:EmailAddress>coi@uesc.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufal.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ufal.br-idp-shibboleth.xml
new file mode 100644
index 00000000..5cdc6237
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ufal.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ufal.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">ufal.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFAL - Universidade Federal de Alagoas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFAL - Universidade Federal de Alagoas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFAL - Universidade Federal de Alagoas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFAL - Universidade Federal de Alagoas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.ufal.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">https://www.ufal.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDyDCCArACAQAwDQYJKoZIhvcNAQEFBQAwgakxLzAtBgNVBAoTJlVGQUwgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBBbGFnb2FzMQwwCgYDVQQLEwNOVEkxIDAe
+BgkqhkiG9w0BCQEWEWRpb2dvQG50aS51ZmFsLmJyMRAwDgYDVQQHFAdNYWNlacOz
+MRAwDgYDVQQIEwdBbGFnb2FzMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMY2FmZS51
+ZmFsLmJyMB4XDTE0MTAwNjIwNTEzOVoXDTE3MTAwNTIwNTEzOVowgakxLzAtBgNV
+BAoTJlVGQUwgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBBbGFnb2FzMQwwCgYD
+VQQLEwNOVEkxIDAeBgkqhkiG9w0BCQEWEWRpb2dvQG50aS51ZmFsLmJyMRAwDgYD
+VQQHFAdNYWNlacOzMRAwDgYDVQQIEwdBbGFnb2FzMQswCQYDVQQGEwJCUjEVMBMG
+A1UEAxMMY2FmZS51ZmFsLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAvwzH1otQwbdbx7uHECItOI3sAiO9DWNc9mzRRyNrY0t7Xx7xoiblHagjDM/9
+I+pxiJ33ETOdGyr0PGgbZCPccUdUz6Zif5j6g9ioTIg2GUBaH8xU0rJdZF2A3eLn
+Z3s8CzCtYK7gHJhiFfhKWUAyWVCV6wZS46+Iu1Y2g4j3/WnSJA4/65UEtQ40UDFT
+YJclb8X4RHcBXlE39T6RcSUDQWFdEsxunpc3twR5M7adK2oZ4ekQr3zIA64bEahy
+T2XuKNTOuEKtkFG1oRFG1dkhfO5IcYDOCAjd6IPaq0l4r3pqBDSxilriVsb2hLUW
+dKtsnDDdpvhWasb7oqMQTW8/NQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB0poIt
+L7OtIong6o5UdfsFQ/+Pw3LnIPsRXL39191AsSs8PMuVyDd32ngRLjij5fbeWNl6
+WxFh/OfVJJEzLlWylm8NhTQvxQZVLHKni1szVOYOMM7yFVzOoWrTB3eMD8ujJFs1
+1gG6NFum+liNs8R5b2HVgD4eUzK3Z1E1GPTztbA3MzApmmgZ4egDP+BGVZVcmGZv
+BWhIsbMNn/8HHvCtuhefamMfhoqm128bRzWvOcFvXVvv12Bd8hQqvKvI8ukvbfyq
+FqecVU8Rc3XGPdRjnSmC57zvq4iLH4ZJJFJNW2I06mnu2PdBzGe0GcrhsgjijQOI
+PvRE/EdtraBT9cvB
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufal.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufal.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://cafe.ufal.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufal.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufal.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufal.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">ufal.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDyDCCArACAQAwDQYJKoZIhvcNAQEFBQAwgakxLzAtBgNVBAoTJlVGQUwgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBBbGFnb2FzMQwwCgYDVQQLEwNOVEkxIDAe
+BgkqhkiG9w0BCQEWEWRpb2dvQG50aS51ZmFsLmJyMRAwDgYDVQQHFAdNYWNlacOz
+MRAwDgYDVQQIEwdBbGFnb2FzMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMY2FmZS51
+ZmFsLmJyMB4XDTE0MTAwNjIwNTEzOVoXDTE3MTAwNTIwNTEzOVowgakxLzAtBgNV
+BAoTJlVGQUwgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBBbGFnb2FzMQwwCgYD
+VQQLEwNOVEkxIDAeBgkqhkiG9w0BCQEWEWRpb2dvQG50aS51ZmFsLmJyMRAwDgYD
+VQQHFAdNYWNlacOzMRAwDgYDVQQIEwdBbGFnb2FzMQswCQYDVQQGEwJCUjEVMBMG
+A1UEAxMMY2FmZS51ZmFsLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAvwzH1otQwbdbx7uHECItOI3sAiO9DWNc9mzRRyNrY0t7Xx7xoiblHagjDM/9
+I+pxiJ33ETOdGyr0PGgbZCPccUdUz6Zif5j6g9ioTIg2GUBaH8xU0rJdZF2A3eLn
+Z3s8CzCtYK7gHJhiFfhKWUAyWVCV6wZS46+Iu1Y2g4j3/WnSJA4/65UEtQ40UDFT
+YJclb8X4RHcBXlE39T6RcSUDQWFdEsxunpc3twR5M7adK2oZ4ekQr3zIA64bEahy
+T2XuKNTOuEKtkFG1oRFG1dkhfO5IcYDOCAjd6IPaq0l4r3pqBDSxilriVsb2hLUW
+dKtsnDDdpvhWasb7oqMQTW8/NQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB0poIt
+L7OtIong6o5UdfsFQ/+Pw3LnIPsRXL39191AsSs8PMuVyDd32ngRLjij5fbeWNl6
+WxFh/OfVJJEzLlWylm8NhTQvxQZVLHKni1szVOYOMM7yFVzOoWrTB3eMD8ujJFs1
+1gG6NFum+liNs8R5b2HVgD4eUzK3Z1E1GPTztbA3MzApmmgZ4egDP+BGVZVcmGZv
+BWhIsbMNn/8HHvCtuhefamMfhoqm128bRzWvOcFvXVvv12Bd8hQqvKvI8ukvbfyq
+FqecVU8Rc3XGPdRjnSmC57zvq4iLH4ZJJFJNW2I06mnu2PdBzGe0GcrhsgjijQOI
+PvRE/EdtraBT9cvB
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufal.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufal.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">UFAL - Universidade Federal de Alagoas</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFAL - Universidade Federal de Alagoas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFAL - Universidade Federal de Alagoas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFAL - Universidade Federal de Alagoas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.ufal.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">https://www.ufal.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Diogo Cabral de Almeida</md:SurName>
+    <md:EmailAddress>diogo@nti.ufal.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml
new file mode 100644
index 00000000..3334d12e
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ufba.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFBA - Universidade Federal da Bahia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFBA - Universidade Federal da Bahia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFBA - Universidade Federal da Bahia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFBA - Universidade Federal da Bahia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufba.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufba.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDgDCCAmgCAQAwDQYJKoZIhvcNAQEFBQAwgYUxDTALBgNVBAoTBFVGQkExDDAK
+BgNVBAsTA1NUSTEfMB0GCSqGSIb3DQEJARYQbWVuZG9uY2FAdWZiYS5icjERMA8G
+A1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEVMBMG
+A1UEAxMMY2FmZS51ZmJhLmJyMB4XDTE0MDcyNDAxMzAwN1oXDTE3MDcyMzAxMzAw
+N1owgYUxDTALBgNVBAoTBFVGQkExDDAKBgNVBAsTA1NUSTEfMB0GCSqGSIb3DQEJ
+ARYQbWVuZG9uY2FAdWZiYS5icjERMA8GA1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgT
+BUJhaGlhMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMY2FmZS51ZmJhLmJyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1qVhH59Vq+x6Y9+AFa83YNVlkPHI
+5T1cCm3cYa9OLbhZejBLRSDPhVwDwsP1Uzb9y+N8PdlINCNQMptN7L9aeaSrC9xt
+ph4CpE56+TPwfu60ndQkog0QDB/toqHRJ4QQ59ZoEShA3MNW1oEJ3DyW4KDnhwpr
+3wOS5WdWTXm1mAmNMgck+P7IWn6o03SUAcI8a0f+cu7bgUjNQV8gEs6L32dzBtV4
+bwdz8REiMb+3NPG0naJ63xsZoOKl0wQirDqJgTbjSyGKGXIvxs7xX99ev0l9Pt/s
+1SY3CMnTFYADOTj+A12mvjtj+I7Cprt/nSqSK2TlvHJ9vQs4RL7nc3D4pwIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4IBAQDI4L2+vFnSaJEJDtXWOV5H0kRIy1DTPh39akWD
+TROWtqBhh3HJY2ia5I4J2HRAknCJi24ta4g8j9YMU3Dou3EJDUqSa3O8HxdGo9tp
+U7obTptHVzzLtEfDZSkhvMbQCfJG9G/kEN+cYetbEtxbypxoL2Khr7H2K5gD3SNB
+cGltkj8LUBoqdpeJE/yTDJ70OEbUjJUMypAt4bGCvodZxcDhxd9yAUqCyloUQ7aa
+cm/Zg111Mv04BDIY5e/J/5p4p2p1Iu1kwT23Rn+x5aF6/f4Lc65Qcvg40DamlFvq
+yM/4Rp+8JZktR/Az29BLMxaebhQH6kofiy2CD4hFt7+GwwwH
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufba.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufba.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn: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://cafe.ufba.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufba.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufba.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufba.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>
+      
+MIIDgDCCAmgCAQAwDQYJKoZIhvcNAQEFBQAwgYUxDTALBgNVBAoTBFVGQkExDDAK
+BgNVBAsTA1NUSTEfMB0GCSqGSIb3DQEJARYQbWVuZG9uY2FAdWZiYS5icjERMA8G
+A1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEVMBMG
+A1UEAxMMY2FmZS51ZmJhLmJyMB4XDTE0MDcyNDAxMzAwN1oXDTE3MDcyMzAxMzAw
+N1owgYUxDTALBgNVBAoTBFVGQkExDDAKBgNVBAsTA1NUSTEfMB0GCSqGSIb3DQEJ
+ARYQbWVuZG9uY2FAdWZiYS5icjERMA8GA1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgT
+BUJhaGlhMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMY2FmZS51ZmJhLmJyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1qVhH59Vq+x6Y9+AFa83YNVlkPHI
+5T1cCm3cYa9OLbhZejBLRSDPhVwDwsP1Uzb9y+N8PdlINCNQMptN7L9aeaSrC9xt
+ph4CpE56+TPwfu60ndQkog0QDB/toqHRJ4QQ59ZoEShA3MNW1oEJ3DyW4KDnhwpr
+3wOS5WdWTXm1mAmNMgck+P7IWn6o03SUAcI8a0f+cu7bgUjNQV8gEs6L32dzBtV4
+bwdz8REiMb+3NPG0naJ63xsZoOKl0wQirDqJgTbjSyGKGXIvxs7xX99ev0l9Pt/s
+1SY3CMnTFYADOTj+A12mvjtj+I7Cprt/nSqSK2TlvHJ9vQs4RL7nc3D4pwIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4IBAQDI4L2+vFnSaJEJDtXWOV5H0kRIy1DTPh39akWD
+TROWtqBhh3HJY2ia5I4J2HRAknCJi24ta4g8j9YMU3Dou3EJDUqSa3O8HxdGo9tp
+U7obTptHVzzLtEfDZSkhvMbQCfJG9G/kEN+cYetbEtxbypxoL2Khr7H2K5gD3SNB
+cGltkj8LUBoqdpeJE/yTDJ70OEbUjJUMypAt4bGCvodZxcDhxd9yAUqCyloUQ7aa
+cm/Zg111Mv04BDIY5e/J/5p4p2p1Iu1kwT23Rn+x5aF6/f4Lc65Qcvg40DamlFvq
+yM/4Rp+8JZktR/Az29BLMxaebhQH6kofiy2CD4hFt7+GwwwH
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufba.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufba.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">UFBA - Universidade Federal da Bahia</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFBA - Universidade Federal da Bahia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFBA - Universidade Federal da Bahia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFBA - Universidade Federal da Bahia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufba.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufba.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Luiz Claudio Mendonca</md:SurName>
+    <md:EmailAddress>mendonca@ufba.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufop.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ufop.br-idp-shibboleth.xml
new file mode 100644
index 00000000..5a75f795
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ufop.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ufop.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">ufop.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFOP - Universidade Federal de Ouro Preto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFOP - Universidade Federal de Ouro Preto</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufop.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufop.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDxjCCAq4CAQAwDQYJKoZIhvcNAQEFBQAwgagxKzApBgNVBAoTIlVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRlIE91cm8gUHJldG8xDDAKBgNVBAsTA05USTEbMBkGCSqG
+SIb3DQEJARYMY2FmZUB1Zm9wLmJyMRMwEQYDVQQHEwpPdXJvIFByZXRvMRUwEwYD
+VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZlLnVm
+b3AuYnIwHhcNMTQwNzE1MTgzMjAwWhcNMTcwNzE0MTgzMjAwWjCBqDErMCkGA1UE
+ChMiVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgT3VybyBQcmV0bzEMMAoGA1UECxMD
+TlRJMRswGQYJKoZIhvcNAQkBFgxjYWZlQHVmb3AuYnIxEzARBgNVBAcTCk91cm8g
+UHJldG8xFTATBgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxFTATBgNV
+BAMTDGNhZmUudWZvcC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AJ8tn2QtCdQheOm0AeLjxH+NHHvU+hboU5XLY3FOaO4esNLWPm3ekToB/QKM7kK2
+JXUlx6iaqC57hOq3zQgwRBDiq9NJidn57BLyxTcbxu9j/2+gyQPmOPgynrxHGN9Y
+8z1WtuVWlTXZ9XmFKYvPvtch/FYAA9+dvCc4/42V6DaosCXzGyiSLRDk4A9mOTaU
+i/juNLFuYbFN7lKTjFiK75Z8xonEvsQ/4QDUPDt5WREuDqKU7JgGwv0Rwkn/h1YR
+9n1SvINCKLpLnRtOk0Ts4RsdiPRKx4Q/G6GmsjuQSTHkEpqVbvZsindPWvFeDAj7
+pPv2sGYa7TUxh4cEcFN37F8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAdeSNmRaI
+55vnAf58XCUuOU60fYasvHysDTjbymaWiJjZ8St7QcgkspVrGcK0CzTltuquGck6
+Jy+t/sQOBU1h+qfWzbCDgHS7/vVFIa42yLzPBeibyVFeSaJU1xUXR+h3DxiEaHrK
+zPzQtr3obCWYOxj5tZF9G+QfDX4qRCHkF4EvYAsOMHr43Ic/Co9d4p+GV/O6QvMg
+0IdYi/CRmGBkMfaySFvMMgIgBSm5q+PZmwguZjBGn0FkaNWF4FYusfCLswUxifIA
+oY4ZtXsMxilW39DT5joXhgfwtd6JMxzzkXkmv+JBPxSj1+Xt4Ayuz13PFd1ylV++
+vL4JpRO/Msu6Zw==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufop.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufop.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://cafe.ufop.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufop.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufop.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufop.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">ufop.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDxjCCAq4CAQAwDQYJKoZIhvcNAQEFBQAwgagxKzApBgNVBAoTIlVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRlIE91cm8gUHJldG8xDDAKBgNVBAsTA05USTEbMBkGCSqG
+SIb3DQEJARYMY2FmZUB1Zm9wLmJyMRMwEQYDVQQHEwpPdXJvIFByZXRvMRUwEwYD
+VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZlLnVm
+b3AuYnIwHhcNMTQwNzE1MTgzMjAwWhcNMTcwNzE0MTgzMjAwWjCBqDErMCkGA1UE
+ChMiVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgT3VybyBQcmV0bzEMMAoGA1UECxMD
+TlRJMRswGQYJKoZIhvcNAQkBFgxjYWZlQHVmb3AuYnIxEzARBgNVBAcTCk91cm8g
+UHJldG8xFTATBgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxFTATBgNV
+BAMTDGNhZmUudWZvcC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AJ8tn2QtCdQheOm0AeLjxH+NHHvU+hboU5XLY3FOaO4esNLWPm3ekToB/QKM7kK2
+JXUlx6iaqC57hOq3zQgwRBDiq9NJidn57BLyxTcbxu9j/2+gyQPmOPgynrxHGN9Y
+8z1WtuVWlTXZ9XmFKYvPvtch/FYAA9+dvCc4/42V6DaosCXzGyiSLRDk4A9mOTaU
+i/juNLFuYbFN7lKTjFiK75Z8xonEvsQ/4QDUPDt5WREuDqKU7JgGwv0Rwkn/h1YR
+9n1SvINCKLpLnRtOk0Ts4RsdiPRKx4Q/G6GmsjuQSTHkEpqVbvZsindPWvFeDAj7
+pPv2sGYa7TUxh4cEcFN37F8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAdeSNmRaI
+55vnAf58XCUuOU60fYasvHysDTjbymaWiJjZ8St7QcgkspVrGcK0CzTltuquGck6
+Jy+t/sQOBU1h+qfWzbCDgHS7/vVFIa42yLzPBeibyVFeSaJU1xUXR+h3DxiEaHrK
+zPzQtr3obCWYOxj5tZF9G+QfDX4qRCHkF4EvYAsOMHr43Ic/Co9d4p+GV/O6QvMg
+0IdYi/CRmGBkMfaySFvMMgIgBSm5q+PZmwguZjBGn0FkaNWF4FYusfCLswUxifIA
+oY4ZtXsMxilW39DT5joXhgfwtd6JMxzzkXkmv+JBPxSj1+Xt4Ayuz13PFd1ylV++
+vL4JpRO/Msu6Zw==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufop.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufop.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">UFOP - Universidade Federal de Ouro Preto</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFOP - Universidade Federal de Ouro Preto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufop.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufop.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Daniel Magalhaes Bicalho</md:SurName>
+    <md:EmailAddress>daniel.bicalho@nti.ufop.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufpa.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ufpa.br-idp-shibboleth.xml
new file mode 100644
index 00000000..81e51473
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ufpa.br-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ufpa.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">ufpa.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFPA - Universidade Federal do Para</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFPA - Universidade Federal do Para</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFPA - Universidade Federal do Para</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFPA - Universidade Federal do Para</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufpa.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufpa.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDcDCCAlgCAQAwDQYJKoZIhvcNAQEFBQAwfjENMAsGA1UEChMEVUZQQTENMAsG
+A1UECxMEQ1RJQzEbMBkGCSqGSIb3DQEJARYMY3RpY0B1ZnBhLmJyMQ4wDAYDVQQH
+EwVCRUxFTTENMAsGA1UECBMEUEFSQTELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNh
+ZmUudWZwYS5icjAeFw0xNDExMDYxNDEzMzZaFw0xOTExMDUxNDEzMzZaMH4xDTAL
+BgNVBAoTBFVGUEExDTALBgNVBAsTBENUSUMxGzAZBgkqhkiG9w0BCQEWDGN0aWNA
+dWZwYS5icjEOMAwGA1UEBxMFQkVMRU0xDTALBgNVBAgTBFBBUkExCzAJBgNVBAYT
+AkJSMRUwEwYDVQQDEwxjYWZlLnVmcGEuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC9YBhCGCvghJfWlbqNqPAes/VvzKs2G7FQMPeeI0rvzgn6Dzyd
+wsexq07Cj1adg4lR80t/0lcQl2gfahCJMOlTcYMNvmeNhsxsq2VwsOI73mRmedlk
+jIPHPu8fpE69FV4nldafKWRSLfcVkWzMSB48BeM7NQQjC0MYwbaAfRSi49fq/cPo
+25kOXGI8a78fpTkCINthiC6fbicq9ztjNq8ni6WnNvde+zM+VKxgefk3OD+i8du9
+dAR2GzwPz7Qy547kUjen/6TrN1dYJt/sQ6+3MnEabD9YsMrlrg5zUoGuhYzaZRp9
+Ptjmo3OSUGCd6EIIAL89MJV9N2y1EFls2it5AgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBADjRSj+Wn2mBFAy4zYySVRu4C/hoSsO0954xKdrC6MUpWpz1E2R5CVps3dla
+CLZfsN8lAQuXsesz6tIWg3s/S/gxPcfDmyqpk/3QfQyRwFoBI0+vaolLJKuNRfUg
+TxuvnSG9eNxT+gVi4jVGq/VFMCqhNPXJPtIwLi+fFD3hDpf5kbGd0RxE55qgAvVk
+DyX8GBnEN1DrO9/fx9eVMtL4XZqhmi8+N7xzrR/ENvinmOcoBP+/MJBJbKXVogrk
+q+cyRSqYY5v1CHb8m6yXbvjEK/8d7eBqOk3DsqQDQqbAVvUwucunh1X4KE6c7/HR
+JgmG8SX7B3mxxMyusl3faqQlYgk=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufpa.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufpa.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://cafe.ufpa.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufpa.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufpa.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufpa.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">ufpa.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDcDCCAlgCAQAwDQYJKoZIhvcNAQEFBQAwfjENMAsGA1UEChMEVUZQQTENMAsG
+A1UECxMEQ1RJQzEbMBkGCSqGSIb3DQEJARYMY3RpY0B1ZnBhLmJyMQ4wDAYDVQQH
+EwVCRUxFTTENMAsGA1UECBMEUEFSQTELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNh
+ZmUudWZwYS5icjAeFw0xNDExMDYxNDEzMzZaFw0xOTExMDUxNDEzMzZaMH4xDTAL
+BgNVBAoTBFVGUEExDTALBgNVBAsTBENUSUMxGzAZBgkqhkiG9w0BCQEWDGN0aWNA
+dWZwYS5icjEOMAwGA1UEBxMFQkVMRU0xDTALBgNVBAgTBFBBUkExCzAJBgNVBAYT
+AkJSMRUwEwYDVQQDEwxjYWZlLnVmcGEuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC9YBhCGCvghJfWlbqNqPAes/VvzKs2G7FQMPeeI0rvzgn6Dzyd
+wsexq07Cj1adg4lR80t/0lcQl2gfahCJMOlTcYMNvmeNhsxsq2VwsOI73mRmedlk
+jIPHPu8fpE69FV4nldafKWRSLfcVkWzMSB48BeM7NQQjC0MYwbaAfRSi49fq/cPo
+25kOXGI8a78fpTkCINthiC6fbicq9ztjNq8ni6WnNvde+zM+VKxgefk3OD+i8du9
+dAR2GzwPz7Qy547kUjen/6TrN1dYJt/sQ6+3MnEabD9YsMrlrg5zUoGuhYzaZRp9
+Ptjmo3OSUGCd6EIIAL89MJV9N2y1EFls2it5AgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBADjRSj+Wn2mBFAy4zYySVRu4C/hoSsO0954xKdrC6MUpWpz1E2R5CVps3dla
+CLZfsN8lAQuXsesz6tIWg3s/S/gxPcfDmyqpk/3QfQyRwFoBI0+vaolLJKuNRfUg
+TxuvnSG9eNxT+gVi4jVGq/VFMCqhNPXJPtIwLi+fFD3hDpf5kbGd0RxE55qgAvVk
+DyX8GBnEN1DrO9/fx9eVMtL4XZqhmi8+N7xzrR/ENvinmOcoBP+/MJBJbKXVogrk
+q+cyRSqYY5v1CHb8m6yXbvjEK/8d7eBqOk3DsqQDQqbAVvUwucunh1X4KE6c7/HR
+JgmG8SX7B3mxxMyusl3faqQlYgk=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufpa.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufpa.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">UFPA - Universidade Federal do Para</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFPA - Universidade Federal do Para</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFPA - Universidade Federal do Para</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFPA - Universidade Federal do Para</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufpa.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufpa.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Hugo Pereira Kuribayashi</md:SurName>
+    <md:EmailAddress>hugok@ufpa.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufra.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ufra.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..e181eeb1
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ufra.edu.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ufra.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFRA - Universidade  Federal Rural da Amazonia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFRA - Universidade  Federal Rural da Amazonia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufra.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufra.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>
+    MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxODA2BgNVBAoUL1VGUkEgLSBV
+bml2ZXJzaWRhZGUgIEZlZGVyYWwgUnVyYWwgZGEgQW1hesO0bmlhMQ0wCwYDVQQL
+EwREU0lUMSAwHgYJKoZIhvcNAQkBFhFhZG1pbkB1ZnJhLmVkdS5icjEPMA0GA1UE
+BxQGQmVsw6ltMQ4wDAYDVQQIFAVQYXLDoTELMAkGA1UEBhMCQlIxGTAXBgNVBAMT
+EGNhZmUudWZyYS5lZHUuYnIwHhcNMTQwNTAyMTk1MDEzWhcNMTcwNTAxMTk1MDEz
+WjCBtDE4MDYGA1UEChQvVUZSQSAtIFVuaXZlcnNpZGFkZSAgRmVkZXJhbCBSdXJh
+bCBkYSBBbWF6w7RuaWExDTALBgNVBAsTBERTSVQxIDAeBgkqhkiG9w0BCQEWEWFk
+bWluQHVmcmEuZWR1LmJyMQ8wDQYDVQQHFAZCZWzDqW0xDjAMBgNVBAgUBVBhcsOh
+MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS51ZnJhLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDVPqQ0G2bqZ/6smSUXSXB+th/U25PH
+OQG7iM6MURKF8d9KSn7ZHagmMwhz+HqUyEJCYvHqy2q+uVQY3V8mQm0u27edFGwA
+sou14eWzswMIWb1dg2WYoto6nVG0t0qcazhKBQbXlsKh2lZeT00ZtAz7WeG0t9QJ
+zxQxXFdHpiBlc10Mcr2/Zd3aCDeZI6RpwcQvieR077bcr5JktYuVOSlUdrVpQsiO
+hJFlW6hNN35xranD/bhJ173ZiKnr1v8KiPSE1xoe/Lhwe9kYOvrD5yg8UFy6c4Wb
+sAow+RzjMkqnO84NbRh/CDaCfGDaxWqNELxh14FBWql0EgGqQooPpU0CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAtfE2fyL0C7xtbLJj/sQBAF0u/hmWSBCWjXjk+SET
+8ePbEIoHqrU8fu8sC7E9ixxSRpM71PZWAGpjaQD/pyJ0+3LDwPkVHTMz0pr917sN
+MtFr1T2LBAWC2FqPqulfaSxOc9AXstEldQuCp7ybMnqfuNXvBdQSp59kI64E3tt8
+zEnRgfjLnrfJG5/JNuDturpl6Oe2dE/SpPfstuJmNiM+twnpQpzOeTy7cyzV+SAp
+3u2CPoRhQiGaU87rID1OGhuCVaFnwLhatJ57eciDz88mxFLFxpRPsONJuIJqaCU9
+QUYJSI9AcSx1WqcLuKp3O1uujnxU6X43oDXEsST7Hq4Ewg==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufra.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://cafe.ufra.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://cafe.ufra.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufra.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufra.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufra.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>
+      
+MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxODA2BgNVBAoUL1VGUkEgLSBV
+bml2ZXJzaWRhZGUgIEZlZGVyYWwgUnVyYWwgZGEgQW1hesO0bmlhMQ0wCwYDVQQL
+EwREU0lUMSAwHgYJKoZIhvcNAQkBFhFhZG1pbkB1ZnJhLmVkdS5icjEPMA0GA1UE
+BxQGQmVsw6ltMQ4wDAYDVQQIFAVQYXLDoTELMAkGA1UEBhMCQlIxGTAXBgNVBAMT
+EGNhZmUudWZyYS5lZHUuYnIwHhcNMTQwNTAyMTk1MDEzWhcNMTcwNTAxMTk1MDEz
+WjCBtDE4MDYGA1UEChQvVUZSQSAtIFVuaXZlcnNpZGFkZSAgRmVkZXJhbCBSdXJh
+bCBkYSBBbWF6w7RuaWExDTALBgNVBAsTBERTSVQxIDAeBgkqhkiG9w0BCQEWEWFk
+bWluQHVmcmEuZWR1LmJyMQ8wDQYDVQQHFAZCZWzDqW0xDjAMBgNVBAgUBVBhcsOh
+MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS51ZnJhLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDVPqQ0G2bqZ/6smSUXSXB+th/U25PH
+OQG7iM6MURKF8d9KSn7ZHagmMwhz+HqUyEJCYvHqy2q+uVQY3V8mQm0u27edFGwA
+sou14eWzswMIWb1dg2WYoto6nVG0t0qcazhKBQbXlsKh2lZeT00ZtAz7WeG0t9QJ
+zxQxXFdHpiBlc10Mcr2/Zd3aCDeZI6RpwcQvieR077bcr5JktYuVOSlUdrVpQsiO
+hJFlW6hNN35xranD/bhJ173ZiKnr1v8KiPSE1xoe/Lhwe9kYOvrD5yg8UFy6c4Wb
+sAow+RzjMkqnO84NbRh/CDaCfGDaxWqNELxh14FBWql0EgGqQooPpU0CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAtfE2fyL0C7xtbLJj/sQBAF0u/hmWSBCWjXjk+SET
+8ePbEIoHqrU8fu8sC7E9ixxSRpM71PZWAGpjaQD/pyJ0+3LDwPkVHTMz0pr917sN
+MtFr1T2LBAWC2FqPqulfaSxOc9AXstEldQuCp7ybMnqfuNXvBdQSp59kI64E3tt8
+zEnRgfjLnrfJG5/JNuDturpl6Oe2dE/SpPfstuJmNiM+twnpQpzOeTy7cyzV+SAp
+3u2CPoRhQiGaU87rID1OGhuCVaFnwLhatJ57eciDz88mxFLFxpRPsONJuIJqaCU9
+QUYJSI9AcSx1WqcLuKp3O1uujnxU6X43oDXEsST7Hq4Ewg==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufra.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufra.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">UFRA - Universidade  Federal Rural da Amazonia</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFRA - Universidade  Federal Rural da Amazonia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufra.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufra.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Joaquim de Jesus Soares</md:SurName>
+    <md:EmailAddress>admin@ufra.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unicentro.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.unicentro.br-idp-shibboleth.xml
new file mode 100644
index 00000000..f4268e05
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.unicentro.br-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.unicentro.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">unicentro.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unicentro.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unicentro.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxOjA4BgNVBAoTMVVOSUNFTlRS
+TyAtIFVuaXZlcnNpZGFkZSBFc3RhZHVhbCBkbyBDZW50cm8tT2VzdGUxOjA4BgNV
+BAsTMUNPT1JUSSAtIENvb3JkZW5hZG9yaWEgZGUgVGVjbm9sb2dpYSBlIEluZm9y
+bWFjYW8xHzAdBgkqhkiG9w0BCQEWEHdlYkB1bmljZW50cm8uYnIxEzARBgNVBAcT
+Ckd1YXJhcHVhdmExDzANBgNVBAgTBlBhcmFuYTELMAkGA1UEBhMCQlIxGjAYBgNV
+BAMTEWNhZmUudW5pY2VudHJvLmJyMB4XDTE0MDYwNTEyMDk0OFoXDTE5MDYwNDEy
+MDk0OFowgegxOjA4BgNVBAoTMVVOSUNFTlRSTyAtIFVuaXZlcnNpZGFkZSBFc3Rh
+ZHVhbCBkbyBDZW50cm8tT2VzdGUxOjA4BgNVBAsTMUNPT1JUSSAtIENvb3JkZW5h
+ZG9yaWEgZGUgVGVjbm9sb2dpYSBlIEluZm9ybWFjYW8xHzAdBgkqhkiG9w0BCQEW
+EHdlYkB1bmljZW50cm8uYnIxEzARBgNVBAcTCkd1YXJhcHVhdmExDzANBgNVBAgT
+BlBhcmFuYTELMAkGA1UEBhMCQlIxGjAYBgNVBAMTEWNhZmUudW5pY2VudHJvLmJy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAutO0H5MeExCmIS65KP1n
+na/QnEWYcUxMCNYEokJ0dY07R+LXIl8yWFoS2kTGsl8Hb++/dDDYg3/nUKsMMiFV
+1EE8k8b7f2QVx7g83RSeeVGqs8XC+uD6cYbP0FKBbfvyDtnjloDpgHI+EeKInmy+
+tlCV0ojFFUOrbJmRY4lZwkd223/72iX59AL+dE4bepX9AUDnWiroP5YVaaLm15fh
+dfYB/usJ3vhnTMam+Bk7izZYiYlz5DAzyswBegzMB67jos+sy8702AJVSLDpR3Ea
+RyQ/T5u8JvcULWw6TWW0Wp7WXNN3Gtr6806T7TIUWVsoo9XI8MOfBsUV8qyy9fNC
+RwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAgz6S24xp8M29UhvObecU6I6PzMyz1
+DAWDwEGzdGeKTcoz/5nEEyEj+dBS7EfRV5ySjwls1Mhn09YpWtAgop/QvFHnC5s3
+2SOplajl3jfHgo08KywWZ3WVC3va/swyX1J7UtA2/gfqBMxE15YtB90NCJCMvw6f
+eT/0dWL7GrUU9fKzIZofFuGYcTS/AaoKOLv64SR9eeQkZWcQIv+rEA+/T1tY+/G1
+x5HA6F3s6LdZljTwzEQbSxQ0CumkcxpWVartEoUtZm7wXFnFEfbVnMuugnTdKsFl
+lGDbaAdH5q9/YdTmP3n91RELgSyB9oIB/Wzcmig21BMgPyBFA3zosbKV
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unicentro.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unicentro.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://cafe.unicentro.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unicentro.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unicentro.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unicentro.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">unicentro.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxOjA4BgNVBAoTMVVOSUNFTlRS
+TyAtIFVuaXZlcnNpZGFkZSBFc3RhZHVhbCBkbyBDZW50cm8tT2VzdGUxOjA4BgNV
+BAsTMUNPT1JUSSAtIENvb3JkZW5hZG9yaWEgZGUgVGVjbm9sb2dpYSBlIEluZm9y
+bWFjYW8xHzAdBgkqhkiG9w0BCQEWEHdlYkB1bmljZW50cm8uYnIxEzARBgNVBAcT
+Ckd1YXJhcHVhdmExDzANBgNVBAgTBlBhcmFuYTELMAkGA1UEBhMCQlIxGjAYBgNV
+BAMTEWNhZmUudW5pY2VudHJvLmJyMB4XDTE0MDYwNTEyMDk0OFoXDTE5MDYwNDEy
+MDk0OFowgegxOjA4BgNVBAoTMVVOSUNFTlRSTyAtIFVuaXZlcnNpZGFkZSBFc3Rh
+ZHVhbCBkbyBDZW50cm8tT2VzdGUxOjA4BgNVBAsTMUNPT1JUSSAtIENvb3JkZW5h
+ZG9yaWEgZGUgVGVjbm9sb2dpYSBlIEluZm9ybWFjYW8xHzAdBgkqhkiG9w0BCQEW
+EHdlYkB1bmljZW50cm8uYnIxEzARBgNVBAcTCkd1YXJhcHVhdmExDzANBgNVBAgT
+BlBhcmFuYTELMAkGA1UEBhMCQlIxGjAYBgNVBAMTEWNhZmUudW5pY2VudHJvLmJy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAutO0H5MeExCmIS65KP1n
+na/QnEWYcUxMCNYEokJ0dY07R+LXIl8yWFoS2kTGsl8Hb++/dDDYg3/nUKsMMiFV
+1EE8k8b7f2QVx7g83RSeeVGqs8XC+uD6cYbP0FKBbfvyDtnjloDpgHI+EeKInmy+
+tlCV0ojFFUOrbJmRY4lZwkd223/72iX59AL+dE4bepX9AUDnWiroP5YVaaLm15fh
+dfYB/usJ3vhnTMam+Bk7izZYiYlz5DAzyswBegzMB67jos+sy8702AJVSLDpR3Ea
+RyQ/T5u8JvcULWw6TWW0Wp7WXNN3Gtr6806T7TIUWVsoo9XI8MOfBsUV8qyy9fNC
+RwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAgz6S24xp8M29UhvObecU6I6PzMyz1
+DAWDwEGzdGeKTcoz/5nEEyEj+dBS7EfRV5ySjwls1Mhn09YpWtAgop/QvFHnC5s3
+2SOplajl3jfHgo08KywWZ3WVC3va/swyX1J7UtA2/gfqBMxE15YtB90NCJCMvw6f
+eT/0dWL7GrUU9fKzIZofFuGYcTS/AaoKOLv64SR9eeQkZWcQIv+rEA+/T1tY+/G1
+x5HA6F3s6LdZljTwzEQbSxQ0CumkcxpWVartEoUtZm7wXFnFEfbVnMuugnTdKsFl
+lGDbaAdH5q9/YdTmP3n91RELgSyB9oIB/Wzcmig21BMgPyBFA3zosbKV
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unicentro.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unicentro.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">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unicentro.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.unicentro.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Mauricio Adriano Teixeira</md:SurName>
+    <md:EmailAddress>madriano@unicentro.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unifap.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.unifap.br-idp-shibboleth.xml
new file mode 100644
index 00000000..33dd4617
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.unifap.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.unifap.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">unifap.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNIFAP -  Universidade Federal do Amapa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNIFAP -  Universidade Federal do Amapa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNIFAP -  Universidade Federal do Amapa</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNIFAP -  Universidade Federal do Amapa</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unifap.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unifap.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEAjCCAuoCAQAwDQYJKoZIhvcNAQEFBQAwgcYxLzAtBgNVBAoTJlVOSUZBUCAt
+IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIEFtYXBhMSwwKgYDVQQLEyNESU5GTyAt
+IERlcGFydGFtZW50byBkZSBJbmZvcm1hdGljYTEeMBwGCSqGSIb3DQEJARYPZGlu
+Zm9AdW5pZmFwLmJyMQ8wDQYDVQQHEwZNYWNhcGExDjAMBgNVBAgTBUFtYXBhMQsw
+CQYDVQQGEwJCUjEXMBUGA1UEAxMOY2FmZS51bmlmYXAuYnIwHhcNMTIwNDE3MjAw
+NDI2WhcNMTUwNDE3MjAwNDI2WjCBxjEvMC0GA1UEChMmVU5JRkFQIC0gVW5pdmVy
+c2lkYWRlIEZlZGVyYWwgZG8gQW1hcGExLDAqBgNVBAsTI0RJTkZPIC0gRGVwYXJ0
+YW1lbnRvIGRlIEluZm9ybWF0aWNhMR4wHAYJKoZIhvcNAQkBFg9kaW5mb0B1bmlm
+YXAuYnIxDzANBgNVBAcTBk1hY2FwYTEOMAwGA1UECBMFQW1hcGExCzAJBgNVBAYT
+AkJSMRcwFQYDVQQDEw5jYWZlLnVuaWZhcC5icjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALnDpFayIMY6LGSN8rr9/GpzUSfmzFcVRt1KF6NqMOIL4HFP
+OdaLWcWOsKNaUQBbJBiOPD4TDc/1ihU6X53UbtX7MCLJoizR7vk7NQqlhxwfuoCE
+di7Vaq2SRjTgX5oLV+ObOxjTqySJyZeF/9yj4w0/MzE1igT9Q/5N+E9dDbBza32m
+G3NcjSyPLH2/yNnq+xgROnT9plGKE0yWekscu0xvl4HVh6hC0QZmzHfHDsQnOPs2
++HoWK+NDK+Q13dPyTnRQ2dUpyXUdl3NjkFknkGtJkEhNk8te4gHfkdLZ/EMSYQt3
+rAm4Cv73Cx8ISOXScuaBUwsfc9Rvstd4p/7AF1ECAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEATSZBo/wzBEE/vxbHhBDDXRkXy6DjnOgOhc5u4cbon7HHJsgxOftZyA4H
+l7XR4R42245J6iV9BHcmCWMQaCNqjRW2LgANxpI1uKq8kDRwambPoCzhic66Jjnx
+DOcc/tR4Lop5El1G2a1lluD6Ogvk/ri7GUPQq/tBnNx6L9zTaCKB4Xkm07v4FHP+
+kQsvZVaeSRCj6TFU4UndfZx3G0HveTwTjkdEJb4u/VK1uHUgUScVz1oODMv0mCDF
+NUWidpyQsguPTdgzSCi4ztO1chZiTGRrY8BxRhBGsfkMirRVfhgdYLg0g89SP3ja
+AWH4N7Emw+Xy4wjbo3OMjdWiW0S0GQ==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifap.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifap.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://cafe.unifap.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unifap.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unifap.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unifap.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">unifap.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEAjCCAuoCAQAwDQYJKoZIhvcNAQEFBQAwgcYxLzAtBgNVBAoTJlVOSUZBUCAt
+IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIEFtYXBhMSwwKgYDVQQLEyNESU5GTyAt
+IERlcGFydGFtZW50byBkZSBJbmZvcm1hdGljYTEeMBwGCSqGSIb3DQEJARYPZGlu
+Zm9AdW5pZmFwLmJyMQ8wDQYDVQQHEwZNYWNhcGExDjAMBgNVBAgTBUFtYXBhMQsw
+CQYDVQQGEwJCUjEXMBUGA1UEAxMOY2FmZS51bmlmYXAuYnIwHhcNMTIwNDE3MjAw
+NDI2WhcNMTUwNDE3MjAwNDI2WjCBxjEvMC0GA1UEChMmVU5JRkFQIC0gVW5pdmVy
+c2lkYWRlIEZlZGVyYWwgZG8gQW1hcGExLDAqBgNVBAsTI0RJTkZPIC0gRGVwYXJ0
+YW1lbnRvIGRlIEluZm9ybWF0aWNhMR4wHAYJKoZIhvcNAQkBFg9kaW5mb0B1bmlm
+YXAuYnIxDzANBgNVBAcTBk1hY2FwYTEOMAwGA1UECBMFQW1hcGExCzAJBgNVBAYT
+AkJSMRcwFQYDVQQDEw5jYWZlLnVuaWZhcC5icjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALnDpFayIMY6LGSN8rr9/GpzUSfmzFcVRt1KF6NqMOIL4HFP
+OdaLWcWOsKNaUQBbJBiOPD4TDc/1ihU6X53UbtX7MCLJoizR7vk7NQqlhxwfuoCE
+di7Vaq2SRjTgX5oLV+ObOxjTqySJyZeF/9yj4w0/MzE1igT9Q/5N+E9dDbBza32m
+G3NcjSyPLH2/yNnq+xgROnT9plGKE0yWekscu0xvl4HVh6hC0QZmzHfHDsQnOPs2
++HoWK+NDK+Q13dPyTnRQ2dUpyXUdl3NjkFknkGtJkEhNk8te4gHfkdLZ/EMSYQt3
+rAm4Cv73Cx8ISOXScuaBUwsfc9Rvstd4p/7AF1ECAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEATSZBo/wzBEE/vxbHhBDDXRkXy6DjnOgOhc5u4cbon7HHJsgxOftZyA4H
+l7XR4R42245J6iV9BHcmCWMQaCNqjRW2LgANxpI1uKq8kDRwambPoCzhic66Jjnx
+DOcc/tR4Lop5El1G2a1lluD6Ogvk/ri7GUPQq/tBnNx6L9zTaCKB4Xkm07v4FHP+
+kQsvZVaeSRCj6TFU4UndfZx3G0HveTwTjkdEJb4u/VK1uHUgUScVz1oODMv0mCDF
+NUWidpyQsguPTdgzSCi4ztO1chZiTGRrY8BxRhBGsfkMirRVfhgdYLg0g89SP3ja
+AWH4N7Emw+Xy4wjbo3OMjdWiW0S0GQ==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifap.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifap.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">UNIFAP - Universidade Federal do Amapa</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UNIFAP - Universidade Federal do Amapa</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNIFAP -  Universidade Federal do Amapa</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNIFAP -  Universidade Federal do Amapa</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unifap.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.unifap.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Samir Patrice</md:SurName>
+    <md:EmailAddress>samir@unifap.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unifran.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.unifran.br-idp-shibboleth.xml
new file mode 100644
index 00000000..7f29e5ba
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.unifran.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.unifran.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">unifran.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNIFRAN - Universidade de Franca</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNIFRAN - Universidade de Franca</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNIFRAN - Universidade de Franca</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNIFRAN - Universidade de Franca</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unifran.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unifran.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID8DCCAtgCAQAwDQYJKoZIhvcNAQEFBQAwgb0xKTAnBgNVBAoTIFVOSUZSQU4g
+LSBVbml2ZXJzaWRhZGUgZGUgRnJhbmNhMSYwJAYDVQQLEx1USSAtIFRlY25vbG9n
+aWEgZGEgSW5mb3JtYWNhbzEcMBoGCSqGSIb3DQEJARYNdGlAdW5pZnJhbi5icjEP
+MA0GA1UEBxMGRnJhbmNhMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
+MRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTQwNDIzMTk1MTE4WhcNMTkw
+NDIyMTk1MTE4WjCBvTEpMCcGA1UEChMgVU5JRlJBTiAtIFVuaXZlcnNpZGFkZSBk
+ZSBGcmFuY2ExJjAkBgNVBAsTHVRJIC0gVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2Fv
+MRwwGgYJKoZIhvcNAQkBFg10aUB1bmlmcmFuLmJyMQ8wDQYDVQQHEwZGcmFuY2Ex
+EjAQBgNVBAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUu
+dW5pZnJhbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkqnGsj
+sJuGEO2HQO+byfGIGEvSQFGpWFn8aVT0C/hp9lbkA+KwJQ2frWlQKwF5CgOWw7gK
+9gY4Nm4UBMAQUkQPpzq9uARYEJ3PQr74h/EU8Tpq9+Req3LAYUanFkUjoQW5l/d8
+e0jLd4rZutqcGMJQzy1SeES8LPRYQbLWO4jWhZuoJaR/Wcm1Bir8ugkuLLCh9SbA
+i8tq6ZmWA/POw47YB+oFsd/WxY9HEiHdqb/BQyHa/mgAQtTVl2HzK8qvKT8vrtLW
+oLG+EBSzjxBik+gv94mLQ6dr3TY3wgdWu4V4dcJSdaq3WW4TIuAYTCKFGnpIabUd
+eSBTOpFYX01+UO8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAM8bz6vOOM8+NYRfS
+6Abk23tz9pKQXuewaotokabpY5f9dRS6jTtDTJ8dv6GCyCRFkI90p2/YtKbHp5mw
+kCTE4rv25tUv6kCFLvMREH9fLF6k8EwzSI+ijabecmi78+ZyQ+0xs3G6W1kysWz5
+ETrzYQq6QHiUEtAexRUwR7kyqiVbJuKolCQol6Fo4qO0PU++hhdwC6VizSRmgxRF
+WS+JFIULo6HkhHUl4THGBod5kdVdN210MW+v4yYIIf3LXTSejHTMaoX4KHiXxaLY
+NOFGKfeVT06NqrVbrXVXVS/FXK2inwE22JiuY0PDbxaFexqdkA7pZ8rgJKASXvCS
+KNS9lg==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifran.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifran.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://cafe.unifran.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unifran.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unifran.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unifran.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">unifran.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID8DCCAtgCAQAwDQYJKoZIhvcNAQEFBQAwgb0xKTAnBgNVBAoTIFVOSUZSQU4g
+LSBVbml2ZXJzaWRhZGUgZGUgRnJhbmNhMSYwJAYDVQQLEx1USSAtIFRlY25vbG9n
+aWEgZGEgSW5mb3JtYWNhbzEcMBoGCSqGSIb3DQEJARYNdGlAdW5pZnJhbi5icjEP
+MA0GA1UEBxMGRnJhbmNhMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
+MRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTQwNDIzMTk1MTE4WhcNMTkw
+NDIyMTk1MTE4WjCBvTEpMCcGA1UEChMgVU5JRlJBTiAtIFVuaXZlcnNpZGFkZSBk
+ZSBGcmFuY2ExJjAkBgNVBAsTHVRJIC0gVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2Fv
+MRwwGgYJKoZIhvcNAQkBFg10aUB1bmlmcmFuLmJyMQ8wDQYDVQQHEwZGcmFuY2Ex
+EjAQBgNVBAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUu
+dW5pZnJhbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkqnGsj
+sJuGEO2HQO+byfGIGEvSQFGpWFn8aVT0C/hp9lbkA+KwJQ2frWlQKwF5CgOWw7gK
+9gY4Nm4UBMAQUkQPpzq9uARYEJ3PQr74h/EU8Tpq9+Req3LAYUanFkUjoQW5l/d8
+e0jLd4rZutqcGMJQzy1SeES8LPRYQbLWO4jWhZuoJaR/Wcm1Bir8ugkuLLCh9SbA
+i8tq6ZmWA/POw47YB+oFsd/WxY9HEiHdqb/BQyHa/mgAQtTVl2HzK8qvKT8vrtLW
+oLG+EBSzjxBik+gv94mLQ6dr3TY3wgdWu4V4dcJSdaq3WW4TIuAYTCKFGnpIabUd
+eSBTOpFYX01+UO8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAM8bz6vOOM8+NYRfS
+6Abk23tz9pKQXuewaotokabpY5f9dRS6jTtDTJ8dv6GCyCRFkI90p2/YtKbHp5mw
+kCTE4rv25tUv6kCFLvMREH9fLF6k8EwzSI+ijabecmi78+ZyQ+0xs3G6W1kysWz5
+ETrzYQq6QHiUEtAexRUwR7kyqiVbJuKolCQol6Fo4qO0PU++hhdwC6VizSRmgxRF
+WS+JFIULo6HkhHUl4THGBod5kdVdN210MW+v4yYIIf3LXTSejHTMaoX4KHiXxaLY
+NOFGKfeVT06NqrVbrXVXVS/FXK2inwE22JiuY0PDbxaFexqdkA7pZ8rgJKASXvCS
+KNS9lg==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifran.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifran.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">UNIFRAN - Universidade de Franca</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UNIFRAN - Universidade de Franca</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNIFRAN - Universidade de Franca</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNIFRAN - Universidade de Franca</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unifran.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.unifran.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Gustavo Carrijo</md:SurName>
+    <md:EmailAddress>gustavo@unifran.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unisc.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.unisc.br-idp-shibboleth.xml
new file mode 100644
index 00000000..456d00ed
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.unisc.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.unisc.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">unisc.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNISC - Universidade de Santa Cruz do Sul</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNISC - Universidade de Santa Cruz do Sul</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unisc.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unisc.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID4DCCAsgCAQAwDQYJKoZIhvcNAQEFBQAwgbUxMjAwBgNVBAoTKVVuaXNjIC0g
+VW5pdmVyc2lkYWRlIGRlIFNhbnRhIENydXogZG8gU3VsMQ0wCwYDVQQLEwRTaW5m
+MRwwGgYJKoZIhvcNAQkBFg1yZWRlQHVuaXNjLmJyMRowGAYDVQQHExFTYW50YSBD
+cnV6IGRvIHN1bDEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYT
+AkJSMQ0wCwYDVQQDEwRjYWZlMB4XDTE0MDQxNzEzMTIyM1oXDTE5MDQxNjEzMTIy
+M1owgbUxMjAwBgNVBAoTKVVuaXNjIC0gVW5pdmVyc2lkYWRlIGRlIFNhbnRhIENy
+dXogZG8gU3VsMQ0wCwYDVQQLEwRTaW5mMRwwGgYJKoZIhvcNAQkBFg1yZWRlQHVu
+aXNjLmJyMRowGAYDVQQHExFTYW50YSBDcnV6IGRvIHN1bDEaMBgGA1UECBMRUmlv
+IEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMQ0wCwYDVQQDEwRjYWZlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvEDiskDVSzfG170Jdhxh+TEf+SY6
+wTWP030Gpxy5ZXzBJW4yRDxXwkNICb4zK9dOy7pzCGgZ5Zm278PAXO9LBfy9pdex
+IUUrH5YHpC2Y6pZfasRyfpnqcY0TjW9spgfzGbvWB7js1tMuSUkyXomdHypdqOvh
+7ApHiZyxnSbFrfGKLtovPkx54TRNBPg31hfyiQTwUAM1MKHducLt4RyNiGBs/vVU
+NlEkW4ceIiaf68ETZ1+wsXyxFZszyGFSRR9kS7fPmsNy2MfpNd92RYPYNTWRFKl3
+pnFuqgmwGthMZGUs3zcKQ2z+kzI/fJDYJDn/weEfkyHuqBG48DYedbJ73QIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4IBAQA8U3vYfawqzdWKtXKlFBJDe/cyGt35ZaS3STUp
+uMJCyF5+LHZ0Wg63F7p/rCe2K3I1n4YEOsc7838Egj2SQTBDamk+JkjKkBlXJTeZ
+c/q1x5wFGcYe1cPPWaN9IRomPWV1PBejZGqRAhuE1iU/jMX26OL9ll1UpHa3TFSb
+qgLKYYAOySR6bHBjKyTWhzb+7J19MkWfJlQelwJmMQN2oWhmTyzp24dVCwaRVO16
+7vKl+BQtSYOdanuO0JBC0/91A5GvLH6/O2Dkb0bI18KZPamN+9gBKu14fiK0j+Fp
+nj+u1r3qFps5kydBvlBDl3JOZA34f1F5ZkrjnWjRokMdjiXl
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unisc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unisc.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://cafe.unisc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unisc.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unisc.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unisc.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">unisc.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID4DCCAsgCAQAwDQYJKoZIhvcNAQEFBQAwgbUxMjAwBgNVBAoTKVVuaXNjIC0g
+VW5pdmVyc2lkYWRlIGRlIFNhbnRhIENydXogZG8gU3VsMQ0wCwYDVQQLEwRTaW5m
+MRwwGgYJKoZIhvcNAQkBFg1yZWRlQHVuaXNjLmJyMRowGAYDVQQHExFTYW50YSBD
+cnV6IGRvIHN1bDEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYT
+AkJSMQ0wCwYDVQQDEwRjYWZlMB4XDTE0MDQxNzEzMTIyM1oXDTE5MDQxNjEzMTIy
+M1owgbUxMjAwBgNVBAoTKVVuaXNjIC0gVW5pdmVyc2lkYWRlIGRlIFNhbnRhIENy
+dXogZG8gU3VsMQ0wCwYDVQQLEwRTaW5mMRwwGgYJKoZIhvcNAQkBFg1yZWRlQHVu
+aXNjLmJyMRowGAYDVQQHExFTYW50YSBDcnV6IGRvIHN1bDEaMBgGA1UECBMRUmlv
+IEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMQ0wCwYDVQQDEwRjYWZlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvEDiskDVSzfG170Jdhxh+TEf+SY6
+wTWP030Gpxy5ZXzBJW4yRDxXwkNICb4zK9dOy7pzCGgZ5Zm278PAXO9LBfy9pdex
+IUUrH5YHpC2Y6pZfasRyfpnqcY0TjW9spgfzGbvWB7js1tMuSUkyXomdHypdqOvh
+7ApHiZyxnSbFrfGKLtovPkx54TRNBPg31hfyiQTwUAM1MKHducLt4RyNiGBs/vVU
+NlEkW4ceIiaf68ETZ1+wsXyxFZszyGFSRR9kS7fPmsNy2MfpNd92RYPYNTWRFKl3
+pnFuqgmwGthMZGUs3zcKQ2z+kzI/fJDYJDn/weEfkyHuqBG48DYedbJ73QIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4IBAQA8U3vYfawqzdWKtXKlFBJDe/cyGt35ZaS3STUp
+uMJCyF5+LHZ0Wg63F7p/rCe2K3I1n4YEOsc7838Egj2SQTBDamk+JkjKkBlXJTeZ
+c/q1x5wFGcYe1cPPWaN9IRomPWV1PBejZGqRAhuE1iU/jMX26OL9ll1UpHa3TFSb
+qgLKYYAOySR6bHBjKyTWhzb+7J19MkWfJlQelwJmMQN2oWhmTyzp24dVCwaRVO16
+7vKl+BQtSYOdanuO0JBC0/91A5GvLH6/O2Dkb0bI18KZPamN+9gBKu14fiK0j+Fp
+nj+u1r3qFps5kydBvlBDl3JOZA34f1F5ZkrjnWjRokMdjiXl
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unisc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unisc.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">UNISC - Universidade de Santa Cruz do Sul</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNISC - Universidade de Santa Cruz do Sul</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unisc.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.unisc.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Cristiano Maynart</md:SurName>
+    <md:EmailAddress>rede@unisc.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.upf.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.upf.br-idp-shibboleth.xml
new file mode 100644
index 00000000..5e533d3f
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.upf.br-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.upf.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">upf.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UPF - Universidade de Passo Fundo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UPF - Universidade de Passo Fundo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UPF - Universidade de Passo Fundo</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UPF - Universidade de Passo Fundo</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.upf.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.upf.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDGDCCAgCgAwIBAgIVAKX43u2xOk6GZiZYCBjCZkKXx2/9MA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2NhZmUudXBmLmJyMB4XDTEyMDcxODEzMzMwMFoXDTMy
+MDcxODEzMzMwMFowFjEUMBIGA1UEAxMLY2FmZS51cGYuYnIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDQ4M1p+I5ah6Aw+O5/z9Be++lnk9Vs/F1rXbKj
+tP4ZLt+1ubEXIstFvgYbaQegfjGCmbSTLjeAhoKqQa+9oqHztvJCyi8tAAxm+DkR
+YUVjK7jdg+WhLSIXXjUw8kLQ7/0j9WoR5kANYpb0zgLX5txa6ag0yuiy3SZJdem5
+OxWcRMIgM9IT93D0Vtn4KOy33LuT1nJnlfXRe0e/6Uk3io8eX/sU1bFbYGSIoaBC
+wavXQpYI6doyMwp6jQ0ZTHMgPveJ9RgJVI1UjxPNarlfpkD3tbBoMW6jKzysuNza
+fdE/zhufAdpf1dEJLvW6NqFQhV/IntZ9uikpaZb0qYfccb+FAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2NhZmUudXBmLmJyhiJodHRwczovL2NhZmUudXBmLmJyL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQzZ13hyDuXco93Ne8aOzsxQ7pkVDANBgkqhkiG
+9w0BAQUFAAOCAQEAxN0o+TiTOnQ9DyT3sLjL7t08L2DXXzZS808wUPm9gxAxaKBy
+RP6v52aY5JQl+5KDp4kcYWcJ2HbmY93pdJr/ySf38ZnfDhE8/VtxTPN8i8flLpo6
+hAXpIVHrpchg/6A6wG94q2hoJHJlkjdMAUaqRluRVqUf3LCh9z0L2JYggLMO8t4i
+dZva6wWLqVLrj290MtPM6VyBwky4PyopG92JhFkovN6fO+N0XBOXO95k7vRhXHMq
+Q7lzc5HBe7iHhhH8bMVnNU4rnC5y/mAtB8RlGKu9xkgHFzxpk+Rf8ZvvI6hdpmCD
+CiIzIL92AYqWu+1Ec6sT4NbrfVhJlpfh0jshog==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.upf.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.upf.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://cafe.upf.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.upf.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.upf.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.upf.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">upf.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDGDCCAgCgAwIBAgIVAKX43u2xOk6GZiZYCBjCZkKXx2/9MA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2NhZmUudXBmLmJyMB4XDTEyMDcxODEzMzMwMFoXDTMy
+MDcxODEzMzMwMFowFjEUMBIGA1UEAxMLY2FmZS51cGYuYnIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDQ4M1p+I5ah6Aw+O5/z9Be++lnk9Vs/F1rXbKj
+tP4ZLt+1ubEXIstFvgYbaQegfjGCmbSTLjeAhoKqQa+9oqHztvJCyi8tAAxm+DkR
+YUVjK7jdg+WhLSIXXjUw8kLQ7/0j9WoR5kANYpb0zgLX5txa6ag0yuiy3SZJdem5
+OxWcRMIgM9IT93D0Vtn4KOy33LuT1nJnlfXRe0e/6Uk3io8eX/sU1bFbYGSIoaBC
+wavXQpYI6doyMwp6jQ0ZTHMgPveJ9RgJVI1UjxPNarlfpkD3tbBoMW6jKzysuNza
+fdE/zhufAdpf1dEJLvW6NqFQhV/IntZ9uikpaZb0qYfccb+FAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2NhZmUudXBmLmJyhiJodHRwczovL2NhZmUudXBmLmJyL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQzZ13hyDuXco93Ne8aOzsxQ7pkVDANBgkqhkiG
+9w0BAQUFAAOCAQEAxN0o+TiTOnQ9DyT3sLjL7t08L2DXXzZS808wUPm9gxAxaKBy
+RP6v52aY5JQl+5KDp4kcYWcJ2HbmY93pdJr/ySf38ZnfDhE8/VtxTPN8i8flLpo6
+hAXpIVHrpchg/6A6wG94q2hoJHJlkjdMAUaqRluRVqUf3LCh9z0L2JYggLMO8t4i
+dZva6wWLqVLrj290MtPM6VyBwky4PyopG92JhFkovN6fO+N0XBOXO95k7vRhXHMq
+Q7lzc5HBe7iHhhH8bMVnNU4rnC5y/mAtB8RlGKu9xkgHFzxpk+Rf8ZvvI6hdpmCD
+CiIzIL92AYqWu+1Ec6sT4NbrfVhJlpfh0jshog==
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.upf.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.upf.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">UPF - Universidade de Passo Fundo</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UPF - Universidade de Passo Fundo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UPF - Universidade de Passo Fundo</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UPF - Universidade de Passo Fundo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.upf.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.upf.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/cafe.uscs.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.uscs.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..d90930b2
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.uscs.edu.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.uscs.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">uscs.edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">USCS - Universidade Municipal de Sao Caetano do Sul</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</mdui:DisplayName>
+        <mdui:Description xml:lang="en">USCS - Universidade Municipal de Sao Caetano do Sul</mdui:Description>
+        <mdui:Description xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uscs.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uscs.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>
+    MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAoUNFVTQ1MgLSBV
+bml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2FldGFubyBkbyBTdWwxHDAa
+BgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxHDAaBgNVBAcUE1PDo28gQ2FldGFu
+byBkbyBTdWwxEzARBgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMQ0wCwYD
+VQQDEwRjYWZlMB4XDTE0MDQyMzEyMjkwOVoXDTE5MDQyMjEyMjkwOVowgawxPTA7
+BgNVBAoUNFVTQ1MgLSBVbml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2Fl
+dGFubyBkbyBTdWwxHDAaBgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxHDAaBgNV
+BAcUE1PDo28gQ2FldGFubyBkbyBTdWwxEzARBgNVBAgUClPDo28gUGF1bG8xCzAJ
+BgNVBAYTAkJSMQ0wCwYDVQQDEwRjYWZlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAnMgoOOS1q469sjuekkG6hOjIo0N0JLw+RFj20LasNRbdxpGNmlUu
+EO7/tXNMWs78BTtONVF9buyTZMOKUB2+Tw5qiZQ5w2y6B4quFS1zDv+jb361ZRhw
+/YHr17DZqYevPZfoIsMyr8PeXxGvpZvXIRxRWixFYXK6cSzxjZabK/HalaChWsok
+abWJvmtk3RUaNFDUg7m5fdysgCmMu1tXTIUqcCigHKvjIAi9VvUoTqs1sCFT916M
+PcORbfc+FpbNYbM+wW8nIJcwXTI94GhWiR1jJ4P8JfNRusbF6oaCOZe6WHIaysRN
+nuUwed10kYrBjIeh0+gH6WrvGi09VCbvFwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQBEI/TESsgFK6AN0nrNrdcnqoGCf0P3yS1THvE0Q48I0RRCows+U07LTj+W4sm6
+sN9bM16I1nIwZPWSbBB49L0+JkJHkmUAId8vamN1qHG5hjU13HaIY6g2PSZNYM61
+4nL8Hf18QK/WD5etufceyiqTWImfFPq3/6bUEeZCCIcW9gnY2GjOC9a8hhWu9GV0
+9id1ZjXEhJYRnD4N42qPDTc6I9QtnbDJo5QN7+BEB7dFZ9x/WsZWk5B9Na5r69d5
+DsvS7Z5Hdoz1fHcgr6M82y0DzBOCJYFv37NBx/o8iQ/0AeWPGP75Al9b3qzAzQmS
+QEjzHAKqUpXAKTtGQ1Gp7AIE
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uscs.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://cafe.uscs.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://cafe.uscs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.uscs.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.uscs.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.uscs.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">uscs.edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAoUNFVTQ1MgLSBV
+bml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2FldGFubyBkbyBTdWwxHDAa
+BgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxHDAaBgNVBAcUE1PDo28gQ2FldGFu
+byBkbyBTdWwxEzARBgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMQ0wCwYD
+VQQDEwRjYWZlMB4XDTE0MDQyMzEyMjkwOVoXDTE5MDQyMjEyMjkwOVowgawxPTA7
+BgNVBAoUNFVTQ1MgLSBVbml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2Fl
+dGFubyBkbyBTdWwxHDAaBgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxHDAaBgNV
+BAcUE1PDo28gQ2FldGFubyBkbyBTdWwxEzARBgNVBAgUClPDo28gUGF1bG8xCzAJ
+BgNVBAYTAkJSMQ0wCwYDVQQDEwRjYWZlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAnMgoOOS1q469sjuekkG6hOjIo0N0JLw+RFj20LasNRbdxpGNmlUu
+EO7/tXNMWs78BTtONVF9buyTZMOKUB2+Tw5qiZQ5w2y6B4quFS1zDv+jb361ZRhw
+/YHr17DZqYevPZfoIsMyr8PeXxGvpZvXIRxRWixFYXK6cSzxjZabK/HalaChWsok
+abWJvmtk3RUaNFDUg7m5fdysgCmMu1tXTIUqcCigHKvjIAi9VvUoTqs1sCFT916M
+PcORbfc+FpbNYbM+wW8nIJcwXTI94GhWiR1jJ4P8JfNRusbF6oaCOZe6WHIaysRN
+nuUwed10kYrBjIeh0+gH6WrvGi09VCbvFwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQBEI/TESsgFK6AN0nrNrdcnqoGCf0P3yS1THvE0Q48I0RRCows+U07LTj+W4sm6
+sN9bM16I1nIwZPWSbBB49L0+JkJHkmUAId8vamN1qHG5hjU13HaIY6g2PSZNYM61
+4nL8Hf18QK/WD5etufceyiqTWImfFPq3/6bUEeZCCIcW9gnY2GjOC9a8hhWu9GV0
+9id1ZjXEhJYRnD4N42qPDTc6I9QtnbDJo5QN7+BEB7dFZ9x/WsZWk5B9Na5r69d5
+DsvS7Z5Hdoz1fHcgr6M82y0DzBOCJYFv37NBx/o8iQ/0AeWPGP75Al9b3qzAzQmS
+QEjzHAKqUpXAKTtGQ1Gp7AIE
+					
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uscs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uscs.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">USCS - Universidade Municipal de Sao Caetano do Sul</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">USCS - Universidade Municipal de Sao Caetano do Sul</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uscs.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.uscs.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Eduardo dos Santos</md:SurName>
+    <md:EmailAddress>eduardo@uscs.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml
new file mode 100644
index 00000000..299b8be8
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe01.unicamp.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">unicamp.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unicamp.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unicamp.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xNDAyBgNVBAoTK1VOSUNBTVAg
+LSBVbml2ZXJzaWRhZGUgRXN0YWR1YWwgZGUgQ2FtcGluYXMxDjAMBgNVBAsTBUND
+VUVDMScwJQYJKoZIhvcNAQkBFhhzdXBvcnRlQGNjdWVjLnVuaWNhbXAuYnIxETAP
+BgNVBAcTCENhbXBpbmFzMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
+MRowGAYDVQQDExFjYWZlMDEudW5pY2FtcC5icjAeFw0xNDA0MjIxNDIwNDJaFw0x
+OTA0MjExNDIwNDJaMIG/MTQwMgYDVQQKEytVTklDQU1QIC0gVW5pdmVyc2lkYWRl
+IEVzdGFkdWFsIGRlIENhbXBpbmFzMQ4wDAYDVQQLEwVDQ1VFQzEnMCUGCSqGSIb3
+DQEJARYYc3Vwb3J0ZUBjY3VlYy51bmljYW1wLmJyMREwDwYDVQQHEwhDYW1waW5h
+czESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRY2Fm
+ZTAxLnVuaWNhbXAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCM
+iF3EtUDFn5jggzd0bF2+qrBLzCd51ZQEA8drersbboKF1nO6nhlX1ctexqn5AWXh
+OjY9U66/2bQ0+B0e69pG9Kb0ZZeFXdMVqOry2xy9WAixZhG1Xb5JtkvA3GHhuMZy
+wqjLZ26IlVIzTrRFQZAu+ok6v6tkM04JH/6QWRczmsGSfmjkFlYLoQ/ze5tAz1lH
+4iudmVYLoxXnsY4dTQYptS3T38J3Pgv/5ujOgur/WPH+wEQVel6uW9x/zO+yvy4E
+zH+dsS1B4BlF2I5jQLuheL8Wxx8V2GChe9KjzcgQJV1ttLCvChXmJC42Q7vh5x2S
+wbl2/tZVhKhQjchiWZtJAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGvAZ6zGUDpF
+Uye+8JwpFrVID+b/hGg/dw1xJ2FBeqmB7/i0hs56pT+A28W6MmNARBYChfnyuVo3
+AYIQWiSQKY02JyrVyfMCNdXWjV4VEobiR/hkRVgYuzzCWb0VIB0hIKyCxZMaWqpz
+MWWaZI9IbZ56UOjaTPHEstHi5q3bsVGSx7DRY5U2itCiIzduHYpkWtUqyenCiOy0
+AUE5FIGX0MTZ2r8rF+PcfZtM3FzDUkOyokBASjD/JL8kiEeQzMKJDo5FmAvOkvKx
+cwWHnFzf8pZJSYNAlGeL3BlK59YjqH9bRHzhp+Wc4gJpzFSUuA1waEuHkUeqcYCg
+FB2LP25VwJA=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe01.unicamp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe01.unicamp.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://cafe01.unicamp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe01.unicamp.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe01.unicamp.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe01.unicamp.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">unicamp.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xNDAyBgNVBAoTK1VOSUNBTVAg
+LSBVbml2ZXJzaWRhZGUgRXN0YWR1YWwgZGUgQ2FtcGluYXMxDjAMBgNVBAsTBUND
+VUVDMScwJQYJKoZIhvcNAQkBFhhzdXBvcnRlQGNjdWVjLnVuaWNhbXAuYnIxETAP
+BgNVBAcTCENhbXBpbmFzMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
+MRowGAYDVQQDExFjYWZlMDEudW5pY2FtcC5icjAeFw0xNDA0MjIxNDIwNDJaFw0x
+OTA0MjExNDIwNDJaMIG/MTQwMgYDVQQKEytVTklDQU1QIC0gVW5pdmVyc2lkYWRl
+IEVzdGFkdWFsIGRlIENhbXBpbmFzMQ4wDAYDVQQLEwVDQ1VFQzEnMCUGCSqGSIb3
+DQEJARYYc3Vwb3J0ZUBjY3VlYy51bmljYW1wLmJyMREwDwYDVQQHEwhDYW1waW5h
+czESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRY2Fm
+ZTAxLnVuaWNhbXAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCM
+iF3EtUDFn5jggzd0bF2+qrBLzCd51ZQEA8drersbboKF1nO6nhlX1ctexqn5AWXh
+OjY9U66/2bQ0+B0e69pG9Kb0ZZeFXdMVqOry2xy9WAixZhG1Xb5JtkvA3GHhuMZy
+wqjLZ26IlVIzTrRFQZAu+ok6v6tkM04JH/6QWRczmsGSfmjkFlYLoQ/ze5tAz1lH
+4iudmVYLoxXnsY4dTQYptS3T38J3Pgv/5ujOgur/WPH+wEQVel6uW9x/zO+yvy4E
+zH+dsS1B4BlF2I5jQLuheL8Wxx8V2GChe9KjzcgQJV1ttLCvChXmJC42Q7vh5x2S
+wbl2/tZVhKhQjchiWZtJAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGvAZ6zGUDpF
+Uye+8JwpFrVID+b/hGg/dw1xJ2FBeqmB7/i0hs56pT+A28W6MmNARBYChfnyuVo3
+AYIQWiSQKY02JyrVyfMCNdXWjV4VEobiR/hkRVgYuzzCWb0VIB0hIKyCxZMaWqpz
+MWWaZI9IbZ56UOjaTPHEstHi5q3bsVGSx7DRY5U2itCiIzduHYpkWtUqyenCiOy0
+AUE5FIGX0MTZ2r8rF+PcfZtM3FzDUkOyokBASjD/JL8kiEeQzMKJDo5FmAvOkvKx
+cwWHnFzf8pZJSYNAlGeL3BlK59YjqH9bRHzhp+Wc4gJpzFSUuA1waEuHkUeqcYCg
+FB2LP25VwJA=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe01.unicamp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe01.unicamp.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">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unicamp.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.unicamp.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sandra Regina de Souza</md:SurName>
+    <md:EmailAddress>sandra@ccuec.unicamp.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe1.ufes.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe1.ufes.br-idp-shibboleth.xml
new file mode 100644
index 00000000..bef192aa
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe1.ufes.br-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe1.ufes.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">ufes.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFES - Universidade Federal do Espirito Santo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFES - Universidade Federal do Espirito Santo</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufes.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufes.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDoDCCAogCAQAwDQYJKoZIhvcNAQEFBQAwgZUxDTALBgNVBAoTBFVGRVMxDDAK
+BgNVBAsTA05USTEmMCQGCSqGSIb3DQEJARYXYW50b25pby5tLnJvY2hhQHVmZXMu
+YnIxEDAOBgNVBAcTB1ZpdG9yaWExFzAVBgNVBAgTDkVzcGlyaXRvIFNhbnRvMQsw
+CQYDVQQGEwJCUjEWMBQGA1UEAxMNY2FmZTEudWZlcy5icjAeFw0xNTAxMDcxNzU0
+NTJaFw0xODAxMDYxNzU0NTJaMIGVMQ0wCwYDVQQKEwRVRkVTMQwwCgYDVQQLEwNO
+VEkxJjAkBgkqhkiG9w0BCQEWF2FudG9uaW8ubS5yb2NoYUB1ZmVzLmJyMRAwDgYD
+VQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMC
+QlIxFjAUBgNVBAMTDWNhZmUxLnVmZXMuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDLb0G4Z/B9GlxpGjL/b6HMukcpJZY4V5hInFe2jRELMHaOjC/H
+a8rkkGE+BF328i+j3TbadC2PztQLcIliu4RnchXFbHnf4rPcEslivY61ScD7Gr5A
+YyVZjy7IFTyujMt0xTxpCCa2ALafqz0wP+0h8vnDIuirI2sbZvMRVTZlEkGxLqiN
+P8E9eXrHeBF0Mqn5Y3ALtmxK/3EhJZGPFb3mpAKA8VVWBbCxcwEMTlBbD2khbxEQ
+4JuBr+c53Mw/Vw+nKwc3TnGC5JIpubdARd/zvBx2ITEw40snOBjVS9eQ2oJb7fQ2
+QUmZSeBOiyT7upWtr5iIRs+pgGx6aRiM7J8jAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAFaMTOaqN0tOvO4r9vNAE5jS9U06yyidIRvCS68Tvx7nbk2H6ij3fX8YxkcM
+pU7Tf5xRjM/4KKCiKn/paBWgiEykCHL49F4ncspsQPqkzV5HM6j/TdbSQXKSnzhT
+hC+UUBcEqAO7VKNIB61EmoYWEYLhb/nRwG3e6SwyqcyxuyslzLdlXTTWJTCFIL4e
+/lcdxU4qaDe9OVFviLm7VUSc5cKdsZ6D/L8y4rs++JDAHcY+AOALUg1f5OtFFn3S
+k0J2vt+xpANqnDVC4sBQlal4XvU3os8bHCVjktGc9TXnJ4ncKQYCX/f00JpRCM0/
+3zZYkTltfRJxIQam1OGU4pKCZlc=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe1.ufes.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe1.ufes.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://cafe1.ufes.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe1.ufes.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe1.ufes.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe1.ufes.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">ufes.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDoDCCAogCAQAwDQYJKoZIhvcNAQEFBQAwgZUxDTALBgNVBAoTBFVGRVMxDDAK
+BgNVBAsTA05USTEmMCQGCSqGSIb3DQEJARYXYW50b25pby5tLnJvY2hhQHVmZXMu
+YnIxEDAOBgNVBAcTB1ZpdG9yaWExFzAVBgNVBAgTDkVzcGlyaXRvIFNhbnRvMQsw
+CQYDVQQGEwJCUjEWMBQGA1UEAxMNY2FmZTEudWZlcy5icjAeFw0xNTAxMDcxNzU0
+NTJaFw0xODAxMDYxNzU0NTJaMIGVMQ0wCwYDVQQKEwRVRkVTMQwwCgYDVQQLEwNO
+VEkxJjAkBgkqhkiG9w0BCQEWF2FudG9uaW8ubS5yb2NoYUB1ZmVzLmJyMRAwDgYD
+VQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMC
+QlIxFjAUBgNVBAMTDWNhZmUxLnVmZXMuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDLb0G4Z/B9GlxpGjL/b6HMukcpJZY4V5hInFe2jRELMHaOjC/H
+a8rkkGE+BF328i+j3TbadC2PztQLcIliu4RnchXFbHnf4rPcEslivY61ScD7Gr5A
+YyVZjy7IFTyujMt0xTxpCCa2ALafqz0wP+0h8vnDIuirI2sbZvMRVTZlEkGxLqiN
+P8E9eXrHeBF0Mqn5Y3ALtmxK/3EhJZGPFb3mpAKA8VVWBbCxcwEMTlBbD2khbxEQ
+4JuBr+c53Mw/Vw+nKwc3TnGC5JIpubdARd/zvBx2ITEw40snOBjVS9eQ2oJb7fQ2
+QUmZSeBOiyT7upWtr5iIRs+pgGx6aRiM7J8jAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAFaMTOaqN0tOvO4r9vNAE5jS9U06yyidIRvCS68Tvx7nbk2H6ij3fX8YxkcM
+pU7Tf5xRjM/4KKCiKn/paBWgiEykCHL49F4ncspsQPqkzV5HM6j/TdbSQXKSnzhT
+hC+UUBcEqAO7VKNIB61EmoYWEYLhb/nRwG3e6SwyqcyxuyslzLdlXTTWJTCFIL4e
+/lcdxU4qaDe9OVFviLm7VUSc5cKdsZ6D/L8y4rs++JDAHcY+AOALUg1f5OtFFn3S
+k0J2vt+xpANqnDVC4sBQlal4XvU3os8bHCVjktGc9TXnJ4ncKQYCX/f00JpRCM0/
+3zZYkTltfRJxIQam1OGU4pKCZlc=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe1.ufes.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe1.ufes.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">UFES - Universidade Federal do Espirito Santo</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFES - Universidade Federal do Espirito Santo</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufes.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufes.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Renan Manola</md:SurName>
+    <md:EmailAddress>renan.manola@ufes.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafernp.insa.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafernp.insa.gov.br-idp-shibboleth.xml
new file mode 100644
index 00000000..6f7a543f
--- /dev/null
+++ b/swamid-interfederations-2.0/cafernp.insa.gov.br-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafernp.insa.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">insa.gov.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INSA - Instituto Nacional do Semiarido</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</mdui:DisplayName>
+        <mdui:Description xml:lang="en">INSA - Instituto Nacional do Semiarido</mdui:Description>
+        <mdui:Description xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.insa.gov.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.insa.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>
+    MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElOU0ExDDAK
+BgNVBAsTA0NQRDEjMCEGCSqGSIb3DQEJARYUcHBhY2hlY29AaW5zYS5nb3YuYnIx
+FzAVBgNVBAcTDkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYD
+VQQGEwJCUjEcMBoGA1UEAxMTY2FmZXJucC5pbnNhLmdvdi5icjAeFw0xMzA5MDUx
+MTQ3MDRaFw0xNjA5MDQxMTQ3MDRaMIGYMQ0wCwYDVQQKEwRJTlNBMQwwCgYDVQQL
+EwNDUEQxIzAhBgkqhkiG9w0BCQEWFHBwYWNoZWNvQGluc2EuZ292LmJyMRcwFQYD
+VQQHEw5DYW1waW5hIEdyYW5kZTEQMA4GA1UECBMHUGFyYWliYTELMAkGA1UEBhMC
+QlIxHDAaBgNVBAMTE2NhZmVybnAuaW5zYS5nb3YuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC6e7hlynC3DhhZh4vMpmlAGM9jGjQIRJNXmDIBU+YN
+TVhwfM8+HzMGuUhqPdoFL2aGJmJVn5TRsOjAIlK6TuHYPVJjZFrV5CGaimuXDkqH
+6nFgKoFLI6Zg0+vNUOGIQvfT1TpZaonPRqIu4MpKEDEtEk8bFkfsqxq55ivcLLYp
+GwGTZMGGBcaAztR0GRBooh3WDLIQR9gkzhxeTHEPiwF5jXGLIFZNR+kxo1ddmg4j
+svohDefVHSkTQZt6QptsGVa408tn2pokQ4K8Enmi9zMdR6LuKvdhoC8Rs1Cc8rlJ
+7Kj5KOMmOjniR03aokncdqNoBIUBijfV0gI58L1Uca53AgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAGVgBV46eVFwW+kASWxOC3FprDP5q/1GDcaD3rKu471uU+nd/L5n
+p5xIKFBVIhx42FbAW7wpLRvhjPDCRDlXVKBgthbWGFawAyjtfPwJvR0aAowP0xHX
+QFFg7t0AXj88u89109tEaxLXpm7tzPHUiuk/D/ZtFy1JtJxZfLPHII5q53ioxF7A
+GgD+wSudqXEc3gKs2bynFcvlWgiali2b3dxNWZ5qRP652Mebtdl4H67/bSsKnhEX
+CcE/6M9wD9oWIdgaoL49rKZnU3ubSz0A5AwNhZiqGk70SbcAYrVWfZH1ApyBnt+8
+jMogdK5eP4afg8zXeCSXaDF45MMQP7+gRsY=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafernp.insa.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://cafernp.insa.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://cafernp.insa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafernp.insa.gov.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafernp.insa.gov.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafernp.insa.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">insa.gov.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElOU0ExDDAK
+BgNVBAsTA0NQRDEjMCEGCSqGSIb3DQEJARYUcHBhY2hlY29AaW5zYS5nb3YuYnIx
+FzAVBgNVBAcTDkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYD
+VQQGEwJCUjEcMBoGA1UEAxMTY2FmZXJucC5pbnNhLmdvdi5icjAeFw0xMzA5MDUx
+MTQ3MDRaFw0xNjA5MDQxMTQ3MDRaMIGYMQ0wCwYDVQQKEwRJTlNBMQwwCgYDVQQL
+EwNDUEQxIzAhBgkqhkiG9w0BCQEWFHBwYWNoZWNvQGluc2EuZ292LmJyMRcwFQYD
+VQQHEw5DYW1waW5hIEdyYW5kZTEQMA4GA1UECBMHUGFyYWliYTELMAkGA1UEBhMC
+QlIxHDAaBgNVBAMTE2NhZmVybnAuaW5zYS5nb3YuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC6e7hlynC3DhhZh4vMpmlAGM9jGjQIRJNXmDIBU+YN
+TVhwfM8+HzMGuUhqPdoFL2aGJmJVn5TRsOjAIlK6TuHYPVJjZFrV5CGaimuXDkqH
+6nFgKoFLI6Zg0+vNUOGIQvfT1TpZaonPRqIu4MpKEDEtEk8bFkfsqxq55ivcLLYp
+GwGTZMGGBcaAztR0GRBooh3WDLIQR9gkzhxeTHEPiwF5jXGLIFZNR+kxo1ddmg4j
+svohDefVHSkTQZt6QptsGVa408tn2pokQ4K8Enmi9zMdR6LuKvdhoC8Rs1Cc8rlJ
+7Kj5KOMmOjniR03aokncdqNoBIUBijfV0gI58L1Uca53AgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAGVgBV46eVFwW+kASWxOC3FprDP5q/1GDcaD3rKu471uU+nd/L5n
+p5xIKFBVIhx42FbAW7wpLRvhjPDCRDlXVKBgthbWGFawAyjtfPwJvR0aAowP0xHX
+QFFg7t0AXj88u89109tEaxLXpm7tzPHUiuk/D/ZtFy1JtJxZfLPHII5q53ioxF7A
+GgD+wSudqXEc3gKs2bynFcvlWgiali2b3dxNWZ5qRP652Mebtdl4H67/bSsKnhEX
+CcE/6M9wD9oWIdgaoL49rKZnU3ubSz0A5AwNhZiqGk70SbcAYrVWfZH1ApyBnt+8
+jMogdK5eP4afg8zXeCSXaDF45MMQP7+gRsY=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafernp.insa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafernp.insa.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">INSA - Instituto Nacional do Semiarido</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INSA - Instituto Nacional do Semiarido</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.insa.gov.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.insa.gov.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Pedro Pacheco</md:SurName>
+    <md:EmailAddress>ppacheco@insa.gov.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafetools.ufpi.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafetools.ufpi.br-idp-shibboleth.xml
new file mode 100644
index 00000000..fa0189d3
--- /dev/null
+++ b/swamid-interfederations-2.0/cafetools.ufpi.br-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafetools.ufpi.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">ufpi.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFPI - Universidade Federal do Piaui</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFPI - Universidade Federal do Piaui</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFPI - Universidade Federal do Piaui</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFPI - Universidade Federal do Piaui</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufpi.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufpi.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEMDCCAxgCAQAwDQYJKoZIhvcNAQEFBQAwgd0xLjAsBgNVBAoUJVVGUEkgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBQaWF1w60xNDAyBgNVBAsUK05USSAtIE7D
+umNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xKDAmBgkqhkiG9w0B
+CQEWGWRpcmV0b3JpYS5udGlAdWZwaS5lZHUuYnIxETAPBgNVBAcTCFRlcmVzaW5h
+MQ8wDQYDVQQIFAZQaWF1w60xCzAJBgNVBAYTAkJSMRowGAYDVQQDExFjYWZldG9v
+bHMudWZwaS5icjAeFw0xNDExMTQxMzAzMTdaFw0xOTExMTMxMzAzMTdaMIHdMS4w
+LAYDVQQKFCVVRlBJIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZG8gUGlhdcOtMTQw
+MgYDVQQLFCtOVEkgLSBOw7pjbGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOn
+w6NvMSgwJgYJKoZIhvcNAQkBFhlkaXJldG9yaWEubnRpQHVmcGkuZWR1LmJyMREw
+DwYDVQQHEwhUZXJlc2luYTEPMA0GA1UECBQGUGlhdcOtMQswCQYDVQQGEwJCUjEa
+MBgGA1UEAxMRY2FmZXRvb2xzLnVmcGkuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCqSNE0nKTN/6lhDB8H4elZGeRVyD6Usj/CNCMI19yM15IWxdFV
+o8KtbNUnoOUydgzWzGSn1v5Z7kHn+3g/3Zcz5l4Uu8UR3mRuLnQmUCoUtVDFUGMs
+l0n0C9TEyfnltACH2bDgA0xvRTSJhwHbk84nq9aPEK5BHrzFXi2eqBg6Tz93b32l
+fF5l3xUw99qx9rPOi/V9rZqql2tvx2pf7r9EwmbvV3ecEew8m47LmLFGsTccdhLw
+rnYRqHn0ZjQ0EXcSl5qsOMIj9bYpWYwkTqQ20wOSrxyM4YtkKxvuwRv+4ulafRLF
+3s09zpWRHM3mbV4V7h1AHevPV3L2eARr4ZCPAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAAmsgsRWIlUth927g9UcnA1rT4LHc78ZV6AnJniQOLo+rsDqvOQ+lTN00/q0
+oKfhaScSzslE2YPG6VTyXsQEWOT/q0A+3110mWm3JphWsvCeik3nnzdQpXJdsT/Q
+1MxWTsxG3Xtueak/T1Nq3XVkaTSD5IdyDIKXUrHQ2OWlWurGw8/YBYTF2fq00OnI
+72aHstdeUOvFROEhdo4tEoP6uvXwNyzs69Uy6oTavBJCAKRQ17LuQixqeSWikIgu
+NXq23/pXhWb/nnrVc7SE/WNAWq7Wah2W1ZRuQ09HyRJ3M8JW1GrOjn+hZYSCne+x
+HBWX1bzoumpjN3JxtpmDWihKENM=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafetools.ufpi.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafetools.ufpi.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://cafetools.ufpi.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafetools.ufpi.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafetools.ufpi.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafetools.ufpi.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">ufpi.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEMDCCAxgCAQAwDQYJKoZIhvcNAQEFBQAwgd0xLjAsBgNVBAoUJVVGUEkgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBQaWF1w60xNDAyBgNVBAsUK05USSAtIE7D
+umNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xKDAmBgkqhkiG9w0B
+CQEWGWRpcmV0b3JpYS5udGlAdWZwaS5lZHUuYnIxETAPBgNVBAcTCFRlcmVzaW5h
+MQ8wDQYDVQQIFAZQaWF1w60xCzAJBgNVBAYTAkJSMRowGAYDVQQDExFjYWZldG9v
+bHMudWZwaS5icjAeFw0xNDExMTQxMzAzMTdaFw0xOTExMTMxMzAzMTdaMIHdMS4w
+LAYDVQQKFCVVRlBJIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZG8gUGlhdcOtMTQw
+MgYDVQQLFCtOVEkgLSBOw7pjbGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOn
+w6NvMSgwJgYJKoZIhvcNAQkBFhlkaXJldG9yaWEubnRpQHVmcGkuZWR1LmJyMREw
+DwYDVQQHEwhUZXJlc2luYTEPMA0GA1UECBQGUGlhdcOtMQswCQYDVQQGEwJCUjEa
+MBgGA1UEAxMRY2FmZXRvb2xzLnVmcGkuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCqSNE0nKTN/6lhDB8H4elZGeRVyD6Usj/CNCMI19yM15IWxdFV
+o8KtbNUnoOUydgzWzGSn1v5Z7kHn+3g/3Zcz5l4Uu8UR3mRuLnQmUCoUtVDFUGMs
+l0n0C9TEyfnltACH2bDgA0xvRTSJhwHbk84nq9aPEK5BHrzFXi2eqBg6Tz93b32l
+fF5l3xUw99qx9rPOi/V9rZqql2tvx2pf7r9EwmbvV3ecEew8m47LmLFGsTccdhLw
+rnYRqHn0ZjQ0EXcSl5qsOMIj9bYpWYwkTqQ20wOSrxyM4YtkKxvuwRv+4ulafRLF
+3s09zpWRHM3mbV4V7h1AHevPV3L2eARr4ZCPAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAAmsgsRWIlUth927g9UcnA1rT4LHc78ZV6AnJniQOLo+rsDqvOQ+lTN00/q0
+oKfhaScSzslE2YPG6VTyXsQEWOT/q0A+3110mWm3JphWsvCeik3nnzdQpXJdsT/Q
+1MxWTsxG3Xtueak/T1Nq3XVkaTSD5IdyDIKXUrHQ2OWlWurGw8/YBYTF2fq00OnI
+72aHstdeUOvFROEhdo4tEoP6uvXwNyzs69Uy6oTavBJCAKRQ17LuQixqeSWikIgu
+NXq23/pXhWb/nnrVc7SE/WNAWq7Wah2W1ZRuQ09HyRJ3M8JW1GrOjn+hZYSCne+x
+HBWX1bzoumpjN3JxtpmDWihKENM=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafetools.ufpi.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafetools.ufpi.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">UFPI - Univerisdade Federal do Piaui</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFPI - Univerisdade Federal do Piaui</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFPI - Universidade Federal do Piaui</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFPI - Universidade Federal do Piaui</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufpi.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufpi.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Arinaldo Silva</md:SurName>
+    <md:EmailAddress>arinaldo@ufpi.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cans.dev4.clientproof.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/cans.dev4.clientproof.co.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..6e28eef3
--- /dev/null
+++ b/swamid-interfederations-2.0/cans.dev4.clientproof.co.uk-shibboleth-sp.xml
@@ -0,0 +1,63 @@
+<?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://cans.dev4.clientproof.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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cans.dev4.clientproof.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>
+						MIIDGDCCAgCgAwIBAgIJAPv9EOsZc3NxMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG2NhbnMuZGV2NC5jbGllbnRwcm9vZi5jby51azAeFw0xMTA1MjMwOTA0Mjla
+						Fw0yMTA1MjAwOTA0MjlaMCYxJDAiBgNVBAMTG2NhbnMuZGV2NC5jbGllbnRwcm9v
+						Zi5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKSTqgatsKob
+						/N/yLNTpzDXPpdroAu7JESKu8EtYFCoE/xsQ3IfGxmdNu7lGmSLUwEWnBKJADfZ/
+						m7PgbJTmveOR60iU4Xj4jIFJuJsJ2DdAmktb38PyPm3UdqdQ+xXioZFNPurr73KT
+						7KFAZT190TlHtIA3QKf5EZP4sKWHWJaSoN4B59UDNc88glWmhgi2GKfoSnTB7pjT
+						Tc+yhjjJOR4fm7k4KF0sYq+IdL+rNnh+95eVl8hjYn1pmQJq9++7V6VtRZnSMmiY
+						6QVnDHl+uCr2uaBqu42t99ERAILWoQLvkkMYoM8rO/0cKd/pyhkZX4v9r+L9Pi9D
+						Hf3I5W3q5pcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbY2Fucy5kZXY0LmNsaWVudHBy
+						b29mLmNvLnVrMB0GA1UdDgQWBBSRKxbvQylc1QvWonlrXSaOFsTEAjANBgkqhkiG
+						9w0BAQUFAAOCAQEARyhRzBUAOCbEGSiSpMDw3w+d8NKmGZnVZ9t91TczDMqy7fBk
+						W9Ez8rkdotdDV2zwLg4zFp2wxQ+q8Llz92gGXQz1RuZpmoyHLsjVG+s9JXvnbHmk
+						LIsaCrjY1yrukdFOiY1X0RYlsZ4KZ8oAJfrbI7UaaQ1KDZxox/Ttmc1oCOWHFiUu
+						TEgD1oSP9UH1TBUPURnilOhZWEkfmRXgRzm+l7MMilWUnHkh5AP7K6wn9Gb+6b/L
+						EuINlP2aR+pgdphLjTLnyHw5ni6O+B+hw2IRX2fyWeK4BsFUmJGZ3WPl/l3R+uzE
+						fJd0URqxirZ4982sPAaiW118lw3XxgmkDmtHOw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </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: CANS Legal Information</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cans.org.uk/</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/capuccino.iff.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/capuccino.iff.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..6c8ac18a
--- /dev/null
+++ b/swamid-interfederations-2.0/capuccino.iff.edu.br-idp-shibboleth.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://capuccino.iff.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFF - Instituto Federal Fluminense</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFF - Instituto Federal Fluminense</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFF - Instituto Federal Fluminense</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFF - Instituto Federal Fluminense</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.iff.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.iff.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>
+    MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMCQlIx
+FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMR4wHAYDVQQHExVDYW1wb3MgZG9zIEdv
+eXRhY2F6ZXMxDDAKBgNVBAoTA0lGRjENMAsGA1UECxMEREdUSTEdMBsGA1UEAxMU
+Y2FwdWNjaW5vLmlmZi5lZHUuYnIxHjAcBgkqhkiG9w0BCQEWD2RndGlAaWZmLmVk
+dS5icjAeFw0xNDA1MDYxODI1MjlaFw0xNzA1MDUxODI1MjlaMIGiMQswCQYDVQQG
+EwJCUjEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xHjAcBgNVBAcTFUNhbXBvcyBk
+b3MgR295dGFjYXplczEMMAoGA1UEChMDSUZGMQ0wCwYDVQQLEwRER1RJMR0wGwYD
+VQQDExRjYXB1Y2Npbm8uaWZmLmVkdS5icjEeMBwGCSqGSIb3DQEJARYPZGd0aUBp
+ZmYuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA80pYCh/E
+audRt7/Kf2qHUJkoKEfQNUa4FKh/ysAT6E5FqvzomTo3uTSqCJiLEuz8MOKnuJm5
+/ly7CVJxwZ2X0JNol8dcP1o7sPpJHToICVBaPUuw1a+fmoMaXxuLiDp88ROwcW3S
+Pyp9s2QT3p18KkwmBUrCqrVAXA4GjMtUU5LWSpWVS9F05EAJGt6P5BUroFodEZbf
+CRd7lNBCOjTRUCaybY+/gPqPQmKw46FS9m00jy5WWe/zlsm+G0ibHRN51jCf5iMK
+0fsfLSC3xOHeXvJiBadb/Aiv8GPAdh41maXz/JvO6LMnTubrLGgw2rNUHTQgXmPj
+oaJdj0DUuYhXyQIDAQABo4IBAjCB/zAdBgNVHQ4EFgQUOHBSiatQxvVy78q6INXo
+i8IPZcYwgc8GA1UdIwSBxzCBxIAUOHBSiatQxvVy78q6INXoi8IPZcahgaikgaUw
+gaIxCzAJBgNVBAYTAkJSMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzEeMBwGA1UE
+BxMVQ2FtcG9zIGRvcyBHb3l0YWNhemVzMQwwCgYDVQQKEwNJRkYxDTALBgNVBAsT
+BERHVEkxHTAbBgNVBAMTFGNhcHVjY2luby5pZmYuZWR1LmJyMR4wHAYJKoZIhvcN
+AQkBFg9kZ3RpQGlmZi5lZHUuYnKCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
+AQUFAAOCAQEAidU39xZ6oiq7cuPC91caVg4grC5SoZ7MAYHuQ5MNbgQgF1bQBJ1E
+tGnpBVyJTf1nwYltymxwGov4FAo0qFiqxoDOat3pkgV9CxQSBI59fC9WNb7iS+DY
+X30fDa0t4i9bGTjjpCbuU7Sp5+MHcTJVXyA13dDRWaB+TaQn/NLjz+ilBe9/Tp1N
+QKwp2MNTYTRBCoVqIIrFhLQu2nb9AAMriuJ57gVEo8tdtgRLf5K2vjoipFCUc+R9
+uWZR1Bn1QFTSbPtu9lvgvdTlm8z0HwuDYFE5gbEvWllAHtzwNzz1NMz/S6hBw8W9
+pd0Oo1Kztbb+S9VqyAL+jGb+Hha5Kefw8g==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.iff.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://capuccino.iff.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://capuccino.iff.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://capuccino.iff.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://capuccino.iff.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://capuccino.iff.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>
+      
+MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMCQlIx
+FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMR4wHAYDVQQHExVDYW1wb3MgZG9zIEdv
+eXRhY2F6ZXMxDDAKBgNVBAoTA0lGRjENMAsGA1UECxMEREdUSTEdMBsGA1UEAxMU
+Y2FwdWNjaW5vLmlmZi5lZHUuYnIxHjAcBgkqhkiG9w0BCQEWD2RndGlAaWZmLmVk
+dS5icjAeFw0xNDA1MDYxODI1MjlaFw0xNzA1MDUxODI1MjlaMIGiMQswCQYDVQQG
+EwJCUjEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xHjAcBgNVBAcTFUNhbXBvcyBk
+b3MgR295dGFjYXplczEMMAoGA1UEChMDSUZGMQ0wCwYDVQQLEwRER1RJMR0wGwYD
+VQQDExRjYXB1Y2Npbm8uaWZmLmVkdS5icjEeMBwGCSqGSIb3DQEJARYPZGd0aUBp
+ZmYuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA80pYCh/E
+audRt7/Kf2qHUJkoKEfQNUa4FKh/ysAT6E5FqvzomTo3uTSqCJiLEuz8MOKnuJm5
+/ly7CVJxwZ2X0JNol8dcP1o7sPpJHToICVBaPUuw1a+fmoMaXxuLiDp88ROwcW3S
+Pyp9s2QT3p18KkwmBUrCqrVAXA4GjMtUU5LWSpWVS9F05EAJGt6P5BUroFodEZbf
+CRd7lNBCOjTRUCaybY+/gPqPQmKw46FS9m00jy5WWe/zlsm+G0ibHRN51jCf5iMK
+0fsfLSC3xOHeXvJiBadb/Aiv8GPAdh41maXz/JvO6LMnTubrLGgw2rNUHTQgXmPj
+oaJdj0DUuYhXyQIDAQABo4IBAjCB/zAdBgNVHQ4EFgQUOHBSiatQxvVy78q6INXo
+i8IPZcYwgc8GA1UdIwSBxzCBxIAUOHBSiatQxvVy78q6INXoi8IPZcahgaikgaUw
+gaIxCzAJBgNVBAYTAkJSMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzEeMBwGA1UE
+BxMVQ2FtcG9zIGRvcyBHb3l0YWNhemVzMQwwCgYDVQQKEwNJRkYxDTALBgNVBAsT
+BERHVEkxHTAbBgNVBAMTFGNhcHVjY2luby5pZmYuZWR1LmJyMR4wHAYJKoZIhvcN
+AQkBFg9kZ3RpQGlmZi5lZHUuYnKCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
+AQUFAAOCAQEAidU39xZ6oiq7cuPC91caVg4grC5SoZ7MAYHuQ5MNbgQgF1bQBJ1E
+tGnpBVyJTf1nwYltymxwGov4FAo0qFiqxoDOat3pkgV9CxQSBI59fC9WNb7iS+DY
+X30fDa0t4i9bGTjjpCbuU7Sp5+MHcTJVXyA13dDRWaB+TaQn/NLjz+ilBe9/Tp1N
+QKwp2MNTYTRBCoVqIIrFhLQu2nb9AAMriuJ57gVEo8tdtgRLf5K2vjoipFCUc+R9
+uWZR1Bn1QFTSbPtu9lvgvdTlm8z0HwuDYFE5gbEvWllAHtzwNzz1NMz/S6hBw8W9
+pd0Oo1Kztbb+S9VqyAL+jGb+Hha5Kefw8g==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.iff.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.iff.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">IFF - Instituto Federal Fluminense</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFF - Instituto Federal Fluminense</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFF - Instituto Federal Fluminense</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFF - Instituto Federal Fluminense</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iff.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.iff.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Andre de Azevedo Cunha</md:SurName>
+    <md:EmailAddress>acunha@iff.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/capuccino.info.ufrn.br-idp-shibboleth.xml b/swamid-interfederations-2.0/capuccino.info.ufrn.br-idp-shibboleth.xml
new file mode 100644
index 00000000..49745a77
--- /dev/null
+++ b/swamid-interfederations-2.0/capuccino.info.ufrn.br-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://capuccino.info.ufrn.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">ufrn.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufrn.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufrn.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIC0jCCAboCAQAwDQYJKoZIhvcNAQEFBQAwLzEMMAoGA1UECxMDQ1BEMQswCQYD
+               VQQGEwJCUjESMBAGA1UEAxMJY2FwdWNjaW5vMB4XDTE0MDYwNTEzMTQ0OVoXDTE5
+               MDYwNDEzMTQ0OVowLzEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjESMBAGA1UE
+               AxMJY2FwdWNjaW5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tLx
+               +5Q99cvQ6T4dFLqtoXnaeVtePhdogMKFxJsNwxWL901s+NPJT3f4dkEJ9rMry6g2
+               Wg9U+f96mY5iViRSP09RF6IPyHwU0xUh6gZE2ggvLKKbddkU9I380M3n0SJWRSXe
+               rMZwL1qiVEA+Ysgvh1CS+NWKmTzn1GC3MCUjB4mA8fdZ+Xh+SlCbSEtbTo0nQxqt
+               g2xx+t+jO2YZIawYp+pYEza5gMWTI58csYXijWzWV/SqaUXDN7nEd08UpLVyzKEf
+               rtFsA/U5/v3cqdQ3f9czTABbp6RQuN8sXJ1z/rpID+og2W3o0QmIaJ/GtocyEWtK
+               U8KkFewao0aPe2OITQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAv43rE0bYSXgqb
+               PUkmyZn/EfLe9dsr6RFGfRWU3eSPIbcaZTf6cXuwWBc3sMURUMjRRNX1DsNpK9Yr
+               pFrHXusucXsnBz/1owJyFSNq2m0NZhSabKJvXS8KgvH237db1OP4hbqbZZ7PcTm/
+               CjCtIiYSn4O/xil76jd7B0vFMcICdWmojoJXJOuVuMGGERXhpI2pFC2X9LVafY1q
+               HiaTJ8XDtqq27T9Q2BYJBQoIjPPBF9wF3L4OCAJUCIs/I2vTaG3oR6gPVRo4AP01
+               XkH1cct5hhIN0719bcHVK1Rp9xpSWZT3DFO0qggrszg/du71sHZOQgW+z0tGH3BK
+               EnZQnP4F
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.info.ufrn.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.info.ufrn.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://capuccino.info.ufrn.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://capuccino.info.ufrn.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://capuccino.info.ufrn.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://capuccino.info.ufrn.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">ufrn.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+               MIIC0jCCAboCAQAwDQYJKoZIhvcNAQEFBQAwLzEMMAoGA1UECxMDQ1BEMQswCQYD
+               VQQGEwJCUjESMBAGA1UEAxMJY2FwdWNjaW5vMB4XDTE0MDYwNTEzMTQ0OVoXDTE5
+               MDYwNDEzMTQ0OVowLzEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjESMBAGA1UE
+               AxMJY2FwdWNjaW5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tLx
+               +5Q99cvQ6T4dFLqtoXnaeVtePhdogMKFxJsNwxWL901s+NPJT3f4dkEJ9rMry6g2
+               Wg9U+f96mY5iViRSP09RF6IPyHwU0xUh6gZE2ggvLKKbddkU9I380M3n0SJWRSXe
+               rMZwL1qiVEA+Ysgvh1CS+NWKmTzn1GC3MCUjB4mA8fdZ+Xh+SlCbSEtbTo0nQxqt
+               g2xx+t+jO2YZIawYp+pYEza5gMWTI58csYXijWzWV/SqaUXDN7nEd08UpLVyzKEf
+               rtFsA/U5/v3cqdQ3f9czTABbp6RQuN8sXJ1z/rpID+og2W3o0QmIaJ/GtocyEWtK
+               U8KkFewao0aPe2OITQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAv43rE0bYSXgqb
+               PUkmyZn/EfLe9dsr6RFGfRWU3eSPIbcaZTf6cXuwWBc3sMURUMjRRNX1DsNpK9Yr
+               pFrHXusucXsnBz/1owJyFSNq2m0NZhSabKJvXS8KgvH237db1OP4hbqbZZ7PcTm/
+               CjCtIiYSn4O/xil76jd7B0vFMcICdWmojoJXJOuVuMGGERXhpI2pFC2X9LVafY1q
+               HiaTJ8XDtqq27T9Q2BYJBQoIjPPBF9wF3L4OCAJUCIs/I2vTaG3oR6gPVRo4AP01
+               XkH1cct5hhIN0719bcHVK1Rp9xpSWZT3DFO0qggrszg/du71sHZOQgW+z0tGH3BK
+               EnZQnP4F	
+	           
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.info.ufrn.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.info.ufrn.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">UFRN - Universidade Federal do Rio Grande do Norte</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufrn.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufrn.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>SINFO</md:SurName>
+    <md:EmailAddress>redes@info.ufrn.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cardshibidp.cardonald.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/cardshibidp.cardonald.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..388c6f2d
--- /dev/null
+++ b/swamid-interfederations-2.0/cardshibidp.cardonald.ac.uk-shibboleth.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cardshibidp.cardonald.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardonald.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDajCCAlICCQDmyaTj/dnWQTANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJH
+						QjEQMA4GA1UECBMHR2xhc2dvdzEQMA4GA1UEBxMHR2xhc2dvdzEeMBwGA1UEChMV
+						R2xhc2dvdyBDbHlkZSBDb2xsZWdlMSQwIgYDVQQDExtjYXJkc2hpYmlkcC5jYXJk
+						b25hbGQuYWMudWswHhcNMTQwNDA5MDkxNzA3WhcNMzQwNDA0MDkxNzA3WjB3MQsw
+						CQYDVQQGEwJHQjEQMA4GA1UECBMHR2xhc2dvdzEQMA4GA1UEBxMHR2xhc2dvdzEe
+						MBwGA1UEChMVR2xhc2dvdyBDbHlkZSBDb2xsZWdlMSQwIgYDVQQDExtjYXJkc2hp
+						YmlkcC5jYXJkb25hbGQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+						AoIBAQDUBR0+1loJ3T9kkKMKAs/KLAO8pXDtAeNpjNTFGwFRGQOI//gLgeNi3eGn
+						t6nBLcaqAZqVIjsnCkPsIZH5I8L9WXcg3Xrg1+X1PRdBWWicGyizbqqOqeufH2Jz
+						wuhXwEK6DQk2seKkduZtNkxwDELyQGs8U0muyb3/OnJ3KhvBfDIHtm7M0yVFtG2G
+						rE9D4AR6WY4bS2vQwK0dhiGKmPdhL1PpMhbK5spFiCHC9RLpbkKuhAC8ZmUHeCFT
+						5M3Y0SqckKXu1n1nzhIOIlcRFP+P1FBWDFZ5hPm+3el/I12jm129H8VVeWjTOhr6
+						OabPJQiJcOZ7s1iDg+BezNU5v/KzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBALQN
+						t30jSUt1DO6lkHtPVJUX3lnMUurAOX2ko9P2zwk3kKIiu4hgyjNiKJFRm4vmHNWB
+						qpv/zK0dGUFToqHcEU79sCQ3YUKNC3b+s8jE8NQe+lUmxsF4KqYo1SUamwLO9SbF
+						HiLXKmL+8/laltXrjKszX97RBFQakC5IuzrO6k2nzrU7i2E+NkwxqdFkQrwilmq3
+						K2Ieb7y2Bke7GLZHE6F64clptrsVkgXXjcX3mmzkG03i8aSVUqEUJgy1z8NcpH/m
+						54/ncBcKbY9hfoeAr4T4jkFePzJA1+UcnXTBR+SyYGLsjh1u/VG76kwAnwKR+Zyd
+						0qFR8jsJAPaduHvbjU8=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cardshibidp.cardonald.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cardshibidp.cardonald.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cardshibidp.cardonald.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cardshibidp.cardonald.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cardshibidp.cardonald.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cardshibidp.cardonald.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardonald.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDajCCAlICCQDmyaTj/dnWQTANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJH
+						QjEQMA4GA1UECBMHR2xhc2dvdzEQMA4GA1UEBxMHR2xhc2dvdzEeMBwGA1UEChMV
+						R2xhc2dvdyBDbHlkZSBDb2xsZWdlMSQwIgYDVQQDExtjYXJkc2hpYmlkcC5jYXJk
+						b25hbGQuYWMudWswHhcNMTQwNDA5MDkxNzA3WhcNMzQwNDA0MDkxNzA3WjB3MQsw
+						CQYDVQQGEwJHQjEQMA4GA1UECBMHR2xhc2dvdzEQMA4GA1UEBxMHR2xhc2dvdzEe
+						MBwGA1UEChMVR2xhc2dvdyBDbHlkZSBDb2xsZWdlMSQwIgYDVQQDExtjYXJkc2hp
+						YmlkcC5jYXJkb25hbGQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+						AoIBAQDUBR0+1loJ3T9kkKMKAs/KLAO8pXDtAeNpjNTFGwFRGQOI//gLgeNi3eGn
+						t6nBLcaqAZqVIjsnCkPsIZH5I8L9WXcg3Xrg1+X1PRdBWWicGyizbqqOqeufH2Jz
+						wuhXwEK6DQk2seKkduZtNkxwDELyQGs8U0muyb3/OnJ3KhvBfDIHtm7M0yVFtG2G
+						rE9D4AR6WY4bS2vQwK0dhiGKmPdhL1PpMhbK5spFiCHC9RLpbkKuhAC8ZmUHeCFT
+						5M3Y0SqckKXu1n1nzhIOIlcRFP+P1FBWDFZ5hPm+3el/I12jm129H8VVeWjTOhr6
+						OabPJQiJcOZ7s1iDg+BezNU5v/KzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBALQN
+						t30jSUt1DO6lkHtPVJUX3lnMUurAOX2ko9P2zwk3kKIiu4hgyjNiKJFRm4vmHNWB
+						qpv/zK0dGUFToqHcEU79sCQ3YUKNC3b+s8jE8NQe+lUmxsF4KqYo1SUamwLO9SbF
+						HiLXKmL+8/laltXrjKszX97RBFQakC5IuzrO6k2nzrU7i2E+NkwxqdFkQrwilmq3
+						K2Ieb7y2Bke7GLZHE6F64clptrsVkgXXjcX3mmzkG03i8aSVUqEUJgy1z8NcpH/m
+						54/ncBcKbY9hfoeAr4T4jkFePzJA1+UcnXTBR+SyYGLsjh1u/VG76kwAnwKR+Zyd
+						0qFR8jsJAPaduHvbjU8=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cardshibidp.cardonald.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cardshibidp.cardonald.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md: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 Clyde College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Glasgow Clyde College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cardonald.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Graeme</md:GivenName>
+    <md:SurName>MacCormick</md:SurName>
+    <md:EmailAddress>mailto:gmaccormick@glasgowclyde.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Cardonald College Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@glasgowclyde.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.ac-martinique.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.ac-martinique.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..72a4dd14
--- /dev/null
+++ b/swamid-interfederations-2.0/cas.ac-martinique.fr-idp-shibboleth.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.ac-martinique.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-10-11T17:08: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-martinique.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Rectorat de la Martinique</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIGWTCCBEGgAwIBAgIRAMqZetbGt8ukR4mFPKQv5A8wDQYJKoZIhvcNAQEFBQAw
+cTELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVyZSBlZHVjYXRpb24gbmF0
+aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEbMBkGA1UEAxMS
+QUMgSW5mcmFzdHJ1Y3R1cmVzMB4XDTE0MDQwODA2MjIyMloXDTE2MDQwODA2MjIy
+MlowgYsxCzAJBgNVBAYTAkZSMS8wLQYDVQQKEyZNaW5pc3RlcmUgRWR1Y2F0aW9u
+IE5hdGlvbmFsZSAoTUVORVNSKTEUMBIGA1UECxMLMTEwIDA0MyAwMTUxFjAUBgNV
+BAsTDWFjLW1hcnRpbmlxdWUxHTAbBgNVBAMTFGNhcy5hYy1tYXJ0aW5pcXVlLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk1caNqvUqxiNHJbirx+D
+8HeBeamvHd1aZNtfmXeWKCLYLyT0nREx0zB3B5HWMHyAH/NW5UcDuViszF0Me9Js
+XG/lcfi5EBfoT6XRIxYMcN7mIKQoYg03/ySLMQrCZZGqaHy4J6HHzqHxL6IfY3Zh
+oEjkhDdRloSYEKya7XTN7UUzzDzUHH0Vlj8m+6f9PBac2aEDUbjGTDfDGajAY+A+
+B5V90WtUXd/S9Tf6OrcCP/VPzM+olJTXEypJoGao7X9jFaMddbubaX8vBBVeYy2K
+oNgvVghw9WoN6LClGLNT6TlvKRF6FFUEeWFwIXqdn8cYQrNVFysT9s94Im8BoD7V
+QQIDAQABo4IBzzCCAcswVQYDVR0RBE4wTIIUY2FzLmFjLW1hcnRpbmlxdWUuZnKC
+GWlkcC1wZXJzLmFjLW1hcnRpbmlxdWUuZnKCGXNzby1wZXJzLmFjLW1hcnRpbmlx
+dWUuZnIwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vd3d3Lmln
+Yy5lZHVjYXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNydDAfBgNVHSMEGDAWgBS+
+OCJ/ckap1oQVn9XIKH9cswIgyzAaBgNVHSAEEzARMA8GDSsGAQQBgZ5mRQEBBAEw
+gaoGA1UdHwSBojCBnzCBnKCBmaCBloYwaHR0cDovL2NybDEuaWdjLmVkdWNhdGlv
+bi5mci9JbmZyYXN0cnVjdHVyZXMuY3JshjBodHRwOi8vY3JsMi5pZ2MuZWR1Y2F0
+aW9uLmZyL0luZnJhc3RydWN0dXJlcy5jcmyGMGh0dHA6Ly9jcmwzLmlnYy5lZHVj
+YXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNybDATBgNVHSUEDDAKBggrBgEFBQcD
+ATAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0OBA8EDUFVVE9fR0VORVJBVEUwDQYJKoZI
+hvcNAQEFBQADggIBACuEO2wSfgICblnd2LxPdpJsEdI//LRlzJF2ZHzL/l3PIgwd
+qflidLMDxQX2B2D/ELmHBicsdMH2S8GV4F72q0erECOlnPKYB+rAvmw8O57M8tsF
+xviveOe6DYd+jSyr7BgDymdzafrT624OrtmyfgRHAV7YZ2qjFLQVAIM4hVNP61S0
+dSsvoYV+swhHrfh7G6ZRYryL7WazgDBmyUMY5Lqo/THZAEC7u/7MCWfi4vwPoT9U
+3MOrJ3KGBG4tQ8xHXTCSvNV9FmLzb8QBEYaptdJhOu0if80KnPrjNM0EHWaFSgn6
+AnPSejCNgq/gT40FB4LnhLzqgFKEnRyqMCo8VVingDbkkTUdrymvtT/aYB2p01+i
+aN55n6XGzqdnBjgYk6/9tnEPUUSSYxINzmVBSHhyo/tNSob7dQO6kvq2NJqGID5M
+zYhjljK8wzOeMLjuv0bux7H/ojZQ0D/p2+YRaAlMQ2PrzbxL/dGCkD/yJcV1OMH5
+KLUe+w+8yPaPoTRCx47sYGA3OUiryiqCY5f34O9zDb1X+ric/zHCVrBhOdwS8V9R
+i/lo0Nch+3DxMyQVk7r4zqwqqjkuaPNn7qdyr03MfFMEqus5NFxaS0il4rg2ytF8
+bcdfuJUQwiErRhOCrnU4LNKkVeSIUkAQ0uA2GHwAy7ltey5aEv2LuQ4LRwXJ
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIGYDCCBEigAwIBAgIQTm3n7ppMPdFiwgEO8rUaNzANBgkqhkiG9w0BAQUFADBx
+MQswCQYDVQQGEwJGUjEvMC0GA1UEChMmTWluaXN0ZXJlIGVkdWNhdGlvbiBuYXRp
+b25hbGUgKE1FTkVTUikxFDASBgNVBAsTCzExMCAwNDMgMDE1MRswGQYDVQQDExJB
+QyBJbmZyYXN0cnVjdHVyZXMwHhcNMTIwMzMwMTcwNzIzWhcNMTQwMzMwMTcwNzIz
+WjCBizELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVyZSBFZHVjYXRpb24g
+TmF0aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEWMBQGA1UE
+CxMNYWMtbWFydGluaXF1ZTEdMBsGA1UEAxMUY2FzLmFjLW1hcnRpbmlxdWUuZnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClCwy1npXP58lr6jKwI6XM
+LuBOJqRdPqKkXTB7EjxzGQxHoklm2Fa5N57tZlcUKNJPyO1XpKmzra/FtGsJQF8p
+DCclirl54I7XU6fMwWEyYTb2udWiGQXVyVNg+Ph2ictCz6YV3UK55Ynvu3vG4VmH
+zjl4Q6tn96+6pGea3rJZMNG8NKPH2W1evPDlKoOnD8437n4/uXjE8tt9Aqv7S9We
+R276kj38bs4HJ6M3LlKRq6+Pg+bX7cf3JAzEaCkd+Vl8FrVk+e1rvrfeeAWS/ABe
+Ie63FN3luP0FZE5vcAPQ93aK2cq23PwtOK08w5kS3eqlnRwF0wVMHHj25qLJnDDR
+AgMBAAGjggHXMIIB0zATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHQ8BAf8EBQMD
+B6AAMFUGA1UdEQROMEyCFGNhcy5hYy1tYXJ0aW5pcXVlLmZyghlpZHAtcGVycy5h
+Yy1tYXJ0aW5pcXVlLmZyghlzc28tcGVycy5hYy1tYXJ0aW5pcXVlLmZyMEsGCCsG
+AQUFBwEBBD8wPTA7BggrBgEFBQcwAoYvaHR0cDovL3d3dy5pZ2MuZWR1Y2F0aW9u
+LmZyL0luZnJhc3RydWN0dXJlcy5jcnQwHwYDVR0jBBgwFoAUvjgif3JGqdaEFZ/V
+yCh/XLMCIMswGgYDVR0gBBMwETAPBg0rBgEEAYGeZkUBAQQBMIGqBgNVHR8EgaIw
+gZ8wgZyggZmggZaGMGh0dHA6Ly9jcmwxLmlnYy5lZHVjYXRpb24uZnIvSW5mcmFz
+dHJ1Y3R1cmVzLmNybIYwaHR0cDovL2NybDIuaWdjLmVkdWNhdGlvbi5mci9JbmZy
+YXN0cnVjdHVyZXMuY3JshjBodHRwOi8vY3JsMy5pZ2MuZWR1Y2F0aW9uLmZyL0lu
+ZnJhc3RydWN0dXJlcy5jcmwwHQYDVR0OBBYEFKy50amMEtWidJwOS3Ei8807iy9J
+MA0GCSqGSIb3DQEBBQUAA4ICAQBRtVZPiYYhMTqk0oPFNs5K/fHi909O+ATFJgav
+jI4wT2oY18uxPKBKSpchQ6nst6Y6OnHjZpufj0kO0B+2i5Wdd+98uFHVaRt1t6BT
+LWttIH1g2KSwzjTSGPhxmXOm+Cvfkjz7LpqtxSghDVIKKbHbsNAfd5CbEBLa4iEF
+WnE29FcscjXq/C/CXNn2jxJ1M7Tsa5jI07OgTDVORj0SftkxxfWyIOh01bm60DKS
+uSaGQbf6E6/+Mr1a+ReHloJtjt11EBenxLMCr+xPyvXvMs3/yjHBtDhIBV6bclbx
+tBMk695YhVZecIklJa2ZxsBfgLKXwBF0fAHqek4s933BSZ9YzZcYJcgOaXnUsmoo
+Cdm6ckM3AJKQmJ7Qm8ZON3xpRkCGME/LJZ0I5VyVH4LmwLjdxaPG/rlCkWGS7tZ2
+CCHsZyQl9nrFJr4hm5BnqR4OElWPgTgauuE/V/MgYutY5ddRSEZDGhQExrEWuUpD
+dp/IrK9QdMCUVExBLM3ytZF4o0h03QP+j6VooHxRfGnx8+oOmdrPqJwbaWVLIuN7
+M+N1xlI2Z97otMSsv58stg+5rn8YcurPuRLJj+Jrjy5msO5nTV8dOvbGX+KZtVh9
+ryE9kH5PnJp1K9rPo0fcFHuZ1FbypgMMWTXqcC6CeXNLifzWHmizh5LLIz77CwT3
+EcFaog==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas.ac-martinique.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.ac-martinique.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.ac-martinique.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">ac-martinique.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIGWTCCBEGgAwIBAgIRAMqZetbGt8ukR4mFPKQv5A8wDQYJKoZIhvcNAQEFBQAw
+cTELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVyZSBlZHVjYXRpb24gbmF0
+aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEbMBkGA1UEAxMS
+QUMgSW5mcmFzdHJ1Y3R1cmVzMB4XDTE0MDQwODA2MjIyMloXDTE2MDQwODA2MjIy
+MlowgYsxCzAJBgNVBAYTAkZSMS8wLQYDVQQKEyZNaW5pc3RlcmUgRWR1Y2F0aW9u
+IE5hdGlvbmFsZSAoTUVORVNSKTEUMBIGA1UECxMLMTEwIDA0MyAwMTUxFjAUBgNV
+BAsTDWFjLW1hcnRpbmlxdWUxHTAbBgNVBAMTFGNhcy5hYy1tYXJ0aW5pcXVlLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk1caNqvUqxiNHJbirx+D
+8HeBeamvHd1aZNtfmXeWKCLYLyT0nREx0zB3B5HWMHyAH/NW5UcDuViszF0Me9Js
+XG/lcfi5EBfoT6XRIxYMcN7mIKQoYg03/ySLMQrCZZGqaHy4J6HHzqHxL6IfY3Zh
+oEjkhDdRloSYEKya7XTN7UUzzDzUHH0Vlj8m+6f9PBac2aEDUbjGTDfDGajAY+A+
+B5V90WtUXd/S9Tf6OrcCP/VPzM+olJTXEypJoGao7X9jFaMddbubaX8vBBVeYy2K
+oNgvVghw9WoN6LClGLNT6TlvKRF6FFUEeWFwIXqdn8cYQrNVFysT9s94Im8BoD7V
+QQIDAQABo4IBzzCCAcswVQYDVR0RBE4wTIIUY2FzLmFjLW1hcnRpbmlxdWUuZnKC
+GWlkcC1wZXJzLmFjLW1hcnRpbmlxdWUuZnKCGXNzby1wZXJzLmFjLW1hcnRpbmlx
+dWUuZnIwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vd3d3Lmln
+Yy5lZHVjYXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNydDAfBgNVHSMEGDAWgBS+
+OCJ/ckap1oQVn9XIKH9cswIgyzAaBgNVHSAEEzARMA8GDSsGAQQBgZ5mRQEBBAEw
+gaoGA1UdHwSBojCBnzCBnKCBmaCBloYwaHR0cDovL2NybDEuaWdjLmVkdWNhdGlv
+bi5mci9JbmZyYXN0cnVjdHVyZXMuY3JshjBodHRwOi8vY3JsMi5pZ2MuZWR1Y2F0
+aW9uLmZyL0luZnJhc3RydWN0dXJlcy5jcmyGMGh0dHA6Ly9jcmwzLmlnYy5lZHVj
+YXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNybDATBgNVHSUEDDAKBggrBgEFBQcD
+ATAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0OBA8EDUFVVE9fR0VORVJBVEUwDQYJKoZI
+hvcNAQEFBQADggIBACuEO2wSfgICblnd2LxPdpJsEdI//LRlzJF2ZHzL/l3PIgwd
+qflidLMDxQX2B2D/ELmHBicsdMH2S8GV4F72q0erECOlnPKYB+rAvmw8O57M8tsF
+xviveOe6DYd+jSyr7BgDymdzafrT624OrtmyfgRHAV7YZ2qjFLQVAIM4hVNP61S0
+dSsvoYV+swhHrfh7G6ZRYryL7WazgDBmyUMY5Lqo/THZAEC7u/7MCWfi4vwPoT9U
+3MOrJ3KGBG4tQ8xHXTCSvNV9FmLzb8QBEYaptdJhOu0if80KnPrjNM0EHWaFSgn6
+AnPSejCNgq/gT40FB4LnhLzqgFKEnRyqMCo8VVingDbkkTUdrymvtT/aYB2p01+i
+aN55n6XGzqdnBjgYk6/9tnEPUUSSYxINzmVBSHhyo/tNSob7dQO6kvq2NJqGID5M
+zYhjljK8wzOeMLjuv0bux7H/ojZQ0D/p2+YRaAlMQ2PrzbxL/dGCkD/yJcV1OMH5
+KLUe+w+8yPaPoTRCx47sYGA3OUiryiqCY5f34O9zDb1X+ric/zHCVrBhOdwS8V9R
+i/lo0Nch+3DxMyQVk7r4zqwqqjkuaPNn7qdyr03MfFMEqus5NFxaS0il4rg2ytF8
+bcdfuJUQwiErRhOCrnU4LNKkVeSIUkAQ0uA2GHwAy7ltey5aEv2LuQ4LRwXJ
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIGYDCCBEigAwIBAgIQTm3n7ppMPdFiwgEO8rUaNzANBgkqhkiG9w0BAQUFADBx
+MQswCQYDVQQGEwJGUjEvMC0GA1UEChMmTWluaXN0ZXJlIGVkdWNhdGlvbiBuYXRp
+b25hbGUgKE1FTkVTUikxFDASBgNVBAsTCzExMCAwNDMgMDE1MRswGQYDVQQDExJB
+QyBJbmZyYXN0cnVjdHVyZXMwHhcNMTIwMzMwMTcwNzIzWhcNMTQwMzMwMTcwNzIz
+WjCBizELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVyZSBFZHVjYXRpb24g
+TmF0aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEWMBQGA1UE
+CxMNYWMtbWFydGluaXF1ZTEdMBsGA1UEAxMUY2FzLmFjLW1hcnRpbmlxdWUuZnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClCwy1npXP58lr6jKwI6XM
+LuBOJqRdPqKkXTB7EjxzGQxHoklm2Fa5N57tZlcUKNJPyO1XpKmzra/FtGsJQF8p
+DCclirl54I7XU6fMwWEyYTb2udWiGQXVyVNg+Ph2ictCz6YV3UK55Ynvu3vG4VmH
+zjl4Q6tn96+6pGea3rJZMNG8NKPH2W1evPDlKoOnD8437n4/uXjE8tt9Aqv7S9We
+R276kj38bs4HJ6M3LlKRq6+Pg+bX7cf3JAzEaCkd+Vl8FrVk+e1rvrfeeAWS/ABe
+Ie63FN3luP0FZE5vcAPQ93aK2cq23PwtOK08w5kS3eqlnRwF0wVMHHj25qLJnDDR
+AgMBAAGjggHXMIIB0zATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHQ8BAf8EBQMD
+B6AAMFUGA1UdEQROMEyCFGNhcy5hYy1tYXJ0aW5pcXVlLmZyghlpZHAtcGVycy5h
+Yy1tYXJ0aW5pcXVlLmZyghlzc28tcGVycy5hYy1tYXJ0aW5pcXVlLmZyMEsGCCsG
+AQUFBwEBBD8wPTA7BggrBgEFBQcwAoYvaHR0cDovL3d3dy5pZ2MuZWR1Y2F0aW9u
+LmZyL0luZnJhc3RydWN0dXJlcy5jcnQwHwYDVR0jBBgwFoAUvjgif3JGqdaEFZ/V
+yCh/XLMCIMswGgYDVR0gBBMwETAPBg0rBgEEAYGeZkUBAQQBMIGqBgNVHR8EgaIw
+gZ8wgZyggZmggZaGMGh0dHA6Ly9jcmwxLmlnYy5lZHVjYXRpb24uZnIvSW5mcmFz
+dHJ1Y3R1cmVzLmNybIYwaHR0cDovL2NybDIuaWdjLmVkdWNhdGlvbi5mci9JbmZy
+YXN0cnVjdHVyZXMuY3JshjBodHRwOi8vY3JsMy5pZ2MuZWR1Y2F0aW9uLmZyL0lu
+ZnJhc3RydWN0dXJlcy5jcmwwHQYDVR0OBBYEFKy50amMEtWidJwOS3Ei8807iy9J
+MA0GCSqGSIb3DQEBBQUAA4ICAQBRtVZPiYYhMTqk0oPFNs5K/fHi909O+ATFJgav
+jI4wT2oY18uxPKBKSpchQ6nst6Y6OnHjZpufj0kO0B+2i5Wdd+98uFHVaRt1t6BT
+LWttIH1g2KSwzjTSGPhxmXOm+Cvfkjz7LpqtxSghDVIKKbHbsNAfd5CbEBLa4iEF
+WnE29FcscjXq/C/CXNn2jxJ1M7Tsa5jI07OgTDVORj0SftkxxfWyIOh01bm60DKS
+uSaGQbf6E6/+Mr1a+ReHloJtjt11EBenxLMCr+xPyvXvMs3/yjHBtDhIBV6bclbx
+tBMk695YhVZecIklJa2ZxsBfgLKXwBF0fAHqek4s933BSZ9YzZcYJcgOaXnUsmoo
+Cdm6ckM3AJKQmJ7Qm8ZON3xpRkCGME/LJZ0I5VyVH4LmwLjdxaPG/rlCkWGS7tZ2
+CCHsZyQl9nrFJr4hm5BnqR4OElWPgTgauuE/V/MgYutY5ddRSEZDGhQExrEWuUpD
+dp/IrK9QdMCUVExBLM3ytZF4o0h03QP+j6VooHxRfGnx8+oOmdrPqJwbaWVLIuN7
+M+N1xlI2Z97otMSsv58stg+5rn8YcurPuRLJj+Jrjy5msO5nTV8dOvbGX+KZtVh9
+ryE9kH5PnJp1K9rPo0fcFHuZ1FbypgMMWTXqcC6CeXNLifzWHmizh5LLIz77CwT3
+EcFaog==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.ac-martinique.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">Rectorat de la Martinique</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Rectorat de la Martinique</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>dsi@ac-martinique.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..a409b51c
--- /dev/null
+++ b/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.crous-lyon.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-28T18:15: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-lyon.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS de Lyon</mdui:DisplayName>
+        <mdui:Description xml:lang="en">personnel</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CROUS de Lyon</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>
+					      MIIEazCCA1OgAwIBAgIQD/r9mkyd7FHhm+Vn+HXu9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDQyMzAwMDAwMFoXDTE2MDUxNDIzNTk1OVowPTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDFA8qLmNyb3VzLWx5
+b24uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUOIWis87bcAu0
+3sB8o4vXr6O54YuPdJM1wwn5uwyLl1BEXx4CytKCUAiNz4uNmVihqfxJo7inPsd/
+uysY1gqBoc7XDn8F3pbQUAOBGjyiGxNjgoo0a6d+8x48sOdC4kRgij+amXI0Y43J
+97x4UAVxjseFA/8vKnMt+sCVdHwrE5nHZuO4x4FkL3Y7Asg7ErEuXkyyUcGtpwk4
+t2mUw5GtZiUCT7V/Y5tmQAc9VeenXQWDouGLuJAoqa+3lPSOs6hNE/bFoxnKMNfI
+oThE10jbIyVJt3SxYMYvlYwFLAICjdgVoJo/8dsqSYsSz7rIzBoKnoRcdcQi4Q3h
+nhlCyMdfAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQUtZ9U7PnM4ivE9Akwvduvc11ew0owDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+LnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCDyouY3JvdXMtbHlvbi5mcjANBgkq
+hkiG9w0BAQUFAAOCAQEAXsM+FOuM52ITtsVPjcayktwJxdMf+rF10sniHA9/q/7Q
+UXroyYOBXnDheMdvYu+CLjQDWRAaMek6oS1vQNJ4fNiRdlmvMFz1EGqPp2wTIUn7
+xx+NsR8asSFGRzdzmgzjQq/KyQRjXndfJLh+Lcw4WVRCSdQx12zo2XGoRWjKPMBx
+Olm9t5o1HQY/jMoFY86UBrph2N/3JZfSsOM/ZMWv+fvTy9ctSWvurG5GPlqL6s9Y
+wnk2bbaPLI1Ph9DUkTrS0hRDCo6BkiEzzEkHAXWHIeKaibJgcqMLQWk6eU468EbX
+h7cEmTn+zP3Mcv2/sPPJum0wXY7GawIUe3rgFBenoA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas.crous-lyon.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.crous-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.crous-lyon.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-lyon.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEazCCA1OgAwIBAgIQD/r9mkyd7FHhm+Vn+HXu9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDQyMzAwMDAwMFoXDTE2MDUxNDIzNTk1OVowPTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDFA8qLmNyb3VzLWx5
+b24uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUOIWis87bcAu0
+3sB8o4vXr6O54YuPdJM1wwn5uwyLl1BEXx4CytKCUAiNz4uNmVihqfxJo7inPsd/
+uysY1gqBoc7XDn8F3pbQUAOBGjyiGxNjgoo0a6d+8x48sOdC4kRgij+amXI0Y43J
+97x4UAVxjseFA/8vKnMt+sCVdHwrE5nHZuO4x4FkL3Y7Asg7ErEuXkyyUcGtpwk4
+t2mUw5GtZiUCT7V/Y5tmQAc9VeenXQWDouGLuJAoqa+3lPSOs6hNE/bFoxnKMNfI
+oThE10jbIyVJt3SxYMYvlYwFLAICjdgVoJo/8dsqSYsSz7rIzBoKnoRcdcQi4Q3h
+nhlCyMdfAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQUtZ9U7PnM4ivE9Akwvduvc11ew0owDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+LnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCDyouY3JvdXMtbHlvbi5mcjANBgkq
+hkiG9w0BAQUFAAOCAQEAXsM+FOuM52ITtsVPjcayktwJxdMf+rF10sniHA9/q/7Q
+UXroyYOBXnDheMdvYu+CLjQDWRAaMek6oS1vQNJ4fNiRdlmvMFz1EGqPp2wTIUn7
+xx+NsR8asSFGRzdzmgzjQq/KyQRjXndfJLh+Lcw4WVRCSdQx12zo2XGoRWjKPMBx
+Olm9t5o1HQY/jMoFY86UBrph2N/3JZfSsOM/ZMWv+fvTy9ctSWvurG5GPlqL6s9Y
+wnk2bbaPLI1Ph9DUkTrS0hRDCo6BkiEzzEkHAXWHIeKaibJgcqMLQWk6eU468EbX
+h7cEmTn+zP3Mcv2/sPPJum0wXY7GawIUe3rgFBenoA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.crous-lyon.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 Lyon</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS de Lyon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>sinfo@crous-lyon.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.cuni.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.cuni.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..842dbc6d
--- /dev/null
+++ b/swamid-interfederations-2.0/cas.cuni.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.cuni.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:24: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cuni.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Charles University in Prague</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Univerzita Karlova v Praze</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Charles University students and staff</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro studenty a zaměstance Univerzity Karlovy v Praze</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.cuni.cz/UKENG-1.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.cuni.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="41">https://ldap.cuni.cz/images/UK_logo_40.png</mdui:Logo>
+        <mdui:Logo height="89" width="91">https://ldap.cuni.cz/images/UK_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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMTCCAhmgAwIBAgIJANqPbg8m3ZcAMA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNV
+BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMRQw
+EgYDVQQDEwtjYXMuY3VuaS5jejAeFw0xNTAxMjAwOTUwNDRaFw0yMDAxMTkwOTUw
+NDRaMEoxCzAJBgNVBAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkg
+aW4gUHJhZ3VlMRQwEgYDVQQDEwtjYXMuY3VuaS5jejCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAN0feuG6+FLnbIh05Zmy487kOMkpOxMC2herMuXuVR+l
+e/SlicUomEeJGImbTC/THTGvn0+Y9ROKkZHu16tQ8uyMDxNZX5g/JMZNIp+yOlnG
+cTwtUPtpgABNAVTVwdG34E24hQVzO3B+bTJXtGtzDOmu/c7R8uVwlK6d2BNQBlu9
+SA6W4xvNOwSjBCpdZgG++uj+GwGKuPEaFh534MX2LoCOExGC6khoj2thMhUMBQPt
+81Uio99xdbT3/e5bs89iRxmrsqGwOWUPdx1zBJG5NqI4b/m8wbJ1htH/6yLm8TCo
+V/mZlCLUBzn45secmhN3OhAoq4IiHH2XqAwc8xWKyRMCAwEAAaMaMBgwFgYDVR0R
+BA8wDYILY2FzLmN1bmkuY3owDQYJKoZIhvcNAQELBQADggEBALsTJzFgI0Nf+0l5
+FccXlhEbCxzHtHPmiETIus2hEKY0zuWsqm9mGOr/+30ng862mJ/kok4YZPGrJZue
+AgJo/dveZGCWetZv65XFDBl+gE2G/+TJplM41XEHSWJ15EhpCECxXhlBw0vRon+h
+6HBmGrLZzzy0F2+5dGqf6cZW8T6NToJRVWBxPTKs26bgER/Clj1EfkNubmU+u91F
+oErcj4bh09j1zv6Dt6c6N4Zdzsq6bg9sYRVRB4d80zhfw61qz0+Ln2Rp/k95aaOe
+czKNjg972Y385kSS8YEHXlVJbnuZHeqAnsq6v1L6b6FFQEkgFfoNPMLxpPzKFtRg
+qzjW2e0=
+                   </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.cuni.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas.cuni.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://cas.cuni.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas.cuni.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cas.cuni.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.cuni.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">cuni.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMTCCAhmgAwIBAgIJANqPbg8m3ZcAMA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNV
+BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMRQw
+EgYDVQQDEwtjYXMuY3VuaS5jejAeFw0xNTAxMjAwOTUwNDRaFw0yMDAxMTkwOTUw
+NDRaMEoxCzAJBgNVBAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkg
+aW4gUHJhZ3VlMRQwEgYDVQQDEwtjYXMuY3VuaS5jejCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAN0feuG6+FLnbIh05Zmy487kOMkpOxMC2herMuXuVR+l
+e/SlicUomEeJGImbTC/THTGvn0+Y9ROKkZHu16tQ8uyMDxNZX5g/JMZNIp+yOlnG
+cTwtUPtpgABNAVTVwdG34E24hQVzO3B+bTJXtGtzDOmu/c7R8uVwlK6d2BNQBlu9
+SA6W4xvNOwSjBCpdZgG++uj+GwGKuPEaFh534MX2LoCOExGC6khoj2thMhUMBQPt
+81Uio99xdbT3/e5bs89iRxmrsqGwOWUPdx1zBJG5NqI4b/m8wbJ1htH/6yLm8TCo
+V/mZlCLUBzn45secmhN3OhAoq4IiHH2XqAwc8xWKyRMCAwEAAaMaMBgwFgYDVR0R
+BA8wDYILY2FzLmN1bmkuY3owDQYJKoZIhvcNAQELBQADggEBALsTJzFgI0Nf+0l5
+FccXlhEbCxzHtHPmiETIus2hEKY0zuWsqm9mGOr/+30ng862mJ/kok4YZPGrJZue
+AgJo/dveZGCWetZv65XFDBl+gE2G/+TJplM41XEHSWJ15EhpCECxXhlBw0vRon+h
+6HBmGrLZzzy0F2+5dGqf6cZW8T6NToJRVWBxPTKs26bgER/Clj1EfkNubmU+u91F
+oErcj4bh09j1zv6Dt6c6N4Zdzsq6bg9sYRVRB4d80zhfw61qz0+Ln2Rp/k95aaOe
+czKNjg972Y385kSS8YEHXlVJbnuZHeqAnsq6v1L6b6FFQEkgFfoNPMLxpPzKFtRg
+qzjW2e0=
+                   </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.cuni.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas.cuni.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">Univerzita Karlova v Praze</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Charles University in Prague</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="cs">Univerzita Karlova v Praze</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Charles University in Prague</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cuni.cz/UKENG-1.html</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.cuni.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michal</md:GivenName>
+    <md:SurName>Vocu</md:SurName>
+    <md:EmailAddress>michal@cuni.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.educagri.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.educagri.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..7b15af83
--- /dev/null
+++ b/swamid-interfederations-2.0/cas.educagri.fr-idp-shibboleth.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.educagri.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-11-09T00:11: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">educagri.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Educagri - Enseignement Agricole</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEezCCA2OgAwIBAgIQHUcS+wnPV7LSIqe5j3rVeTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDEwOTAwMDAwMFoXDTE2MDExMTIzNTk1OVowVzELMAkGA1UE
+BhMCRlIxFjAUBgNVBAoTDUFncm9zdXAgRGlqb24xFjAUBgNVBAsTDUVkdXRlci1D
+TkVSVEExGDAWBgNVBAMTD2Nhcy5lZHVjYWdyaS5mcjCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALl111vi6dSX6qzz49BucGGumOP7B0OL7Rjjvctkyl65
+d6ECbrm8EloAQMfz1Ne43VzDoxiiWI9Unu+W4Reu0miOFIQDPDjZI0zRzYd2+bHs
+f/YWQygnCuiUHIAhFsMdnIW3yDC64xumVjZgGzTVby4hHEAY4CTYtm+FN8QXz1tm
+9uKDqkRbciLz0UBBgx0AGMfUmB4VhvjCJ6zIcQ1ePLTBZt4omT3h6HHYM3iVx4u2
+XBuOJhlnSl2BtcFz/Rwebyi6DWv/QprL0oJD5Fd8g9J1COfS5MKobZ24lKhFH2D6
+4ie40FVEFqf8ZK7gGaUV7l6WtN31AUULuk2a1unlAJkCAwEAAaOCAWIwggFeMB8G
+A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSv1jHfEt61
+xKbsudGwlFVU2Mh/TDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
+AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9jYXMu
+ZWR1Y2FncmkuZnIwDQYJKoZIhvcNAQEFBQADggEBABCKlz2uACI8H84L4XplIWXJ
+TpIHfFtWPiP2WtdmEdLoTcEOYffqULFaKPuJyNZjTOo8K4iB/bZIQxFhKXdosRiY
+vJp5LNr3XZcFwoIvYB8BmLLE4eNpdSpYtaPx5cnZDafuRwM/uWnjQRxoXQLhVuX9
+aEvmYbWSSh7ZEJutIyLgZMsXRUQR1lbnsvYit1u+BlBkOhsbDDzl5kw+F9TbR8uN
+GG2aPW9m3f9ndjoLUdCVg4D54KSiUTPDihaPSk2Ye2zo5BU4f8VLWCoDR7bFSs39
+lFt/OsRU7CWuaoEe+asPiuldDQ+7HxNUbXAXIWXZrc3svUj75V3wSRbPlSDmYUg=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas.educagri.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.educagri.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.educagri.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Educagri - Enseignement Agricole</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Educagri - Enseignement Agricole</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Albaro HOLGADO</md:SurName>
+    <md:EmailAddress>albaro.holgado@educagri.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Khalid FARRAHE</md:SurName>
+    <md:EmailAddress>khalid.farrahe@educagri.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.ent-etrs.net-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.ent-etrs.net-idp-shibboleth.xml
new file mode 100644
index 00000000..75ccd4dd
--- /dev/null
+++ b/swamid-interfederations-2.0/cas.ent-etrs.net-idp-shibboleth.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.ent-etrs.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-03-24T16:19: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ent-etrs.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Ecole des Transmissions - Cesson Sévigné</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDKzCCAhOgAwIBAgIUXvJvEuE8bWQyAkG8bh3m7vmoqzgwDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQY2FzLmVudC1ldHJzLm5ldDAeFw0xMTAzMjMxMTMzMDJa
+Fw0xNjAzMjMxMTMzMDJaMBsxGTAXBgNVBAMTEGNhcy5lbnQtZXRycy5uZXQwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHJPDrl8egS/TqUaTu75zjeaWy
+7EEl0GgROrdoy4vrvKYOmofMHol90Epqd2e6HVhqUOnqWuUhm95lHfThMezBIPBo
+0qOY1QcGstS5allQ/iRY+ODRe3e0CCraHt6JGkckseVDrwlRmZImpJqZkpQyk1Yc
+fL9mlOrnC9lPrN5THoaazjcREicc0crehoyLkzoZzWWP6vzNMmyW2L9zqUqhbWhP
+UG6hZQ4c+pRUpjE+EEedzgMnpPy+M5BNcCRyCUCNwL11EvoYEYhcMNvR1x/qS+l0
+qqNR2qurS7W/hChAbBjyFw0nWzsAwS6NtiUYgjJ4I3uhOSg54hBQ5lqUTeNbAgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGNhcy5lbnQtZXRycy5uZXSGJ2h0dHBzOi8vY2Fz
+LmVudC1ldHJzLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUiY4Lpt2DpIZo
+pwRHJPz4FWXDEcowDQYJKoZIhvcNAQEFBQADggEBAFGniMt16npf3zfKPwWo/bXn
+bivyG35m82xTRKspKLhUHkmXYN3ZaKz9Z44DShDGPlpddzaM7vFZqiEPQwu4Cw8G
+c3I06F53JEzhZgD9bScVrvONkZD4Si2WLqBpJX6vld2VJ6ptj+Sp0NpuO68tBYV3
+8kLkqSXtbGoPO+BmYG+1giEDSxIX/trYzzkzCtJgfZbPlnF0osjOl+vcyBdzwBdF
+Ww4LysygxWHWOWMRfDDZBdWiXN5hxqwt2AlXbg7bVUVs6yN077J+Cvrs3fJfSARB
+GE/cxG6DtyEQnF1mr7LZN8U7uNLg0uff90fHQPYL2y0ERDV04Ve9P0DVA0YjWuQ=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas.ent-etrs.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.ent-etrs.net/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole des Transmissions - Cesson Sévigné</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole des Transmissions - Cesson Sévigné</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Patrick JAOUEN</md:SurName>
+    <md:EmailAddress>patrick.jaouen@ent-etrs.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Dominique MULLER</md:SurName>
+    <md:EmailAddress>dominique.muller@ent-etrs.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..88705c1f
--- /dev/null
+++ b/swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr-idp-shibboleth.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.st-cyr.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="2009-03-04T11:02: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">st-cyr.terre.defense.gouv.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Ecoles de Saint- Cyr Coëtquidan</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDbjCCAlagAwIBAgIVANw8PR6YH5T2dmzYa0+BVTWT8L5xMA0GCSqGSIb3DQEB
+BQUAMCsxKTAnBgNVBAMTIGNhcy5zdC1jeXIudGVycmUuZGVmZW5zZS5nb3V2LmZy
+MB4XDTA5MDIyNDE0MDgyMVoXDTI5MDIyNDE0MDgyMVowKzEpMCcGA1UEAxMgY2Fz
+LnN0LWN5ci50ZXJyZS5kZWZlbnNlLmdvdXYuZnIwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCglhUEpGlM6njWTwNSv9YQJYSOjElt/d+t+zf7DodWanAz
+74WSJKLiARClYxevIXiRe3YWSlPbMnNpwMhycQMStSZVIuW5WKNXyLNm3sdgilEi
+tElL5FTnTb5PF58yKlJSWxlol0lqoEg3tO0sYU/4iRlo7ImcLvkDVGPmoUgYGrmy
+7gsBPlf7Xb06Naa4xRvo7j0wzlnPy4PD8SXEaHkkYyEehoJa5u907Zxl+P1AZMzs
+3SNlu99Gm9CfghmHzEmtpaF+9bwioDzOyMABzGqncrq3l+hqnDi6K2+lVieHaUf1
+0yHmlXKTNGgjXc2wBM2c60PQhFnU9beRpPT2Qa1bAgMBAAGjgYgwgYUwZAYDVR0R
+BF0wW4IgY2FzLnN0LWN5ci50ZXJyZS5kZWZlbnNlLmdvdXYuZnKGN2h0dHBzOi8v
+Y2FzLnN0LWN5ci50ZXJyZS5kZWZlbnNlLmdvdXYuZnIvaWRwL3NoaWJib2xldGgw
+HQYDVR0OBBYEFDE7bJFpR9H+7WO303Wj5a7aE9G9MA0GCSqGSIb3DQEBBQUAA4IB
+AQBR6BJEnGM+Y0/Dkw+6DKqJAs+ryXRyCL9lUWWaLT39RItOmZmPljt1LCIPn/6v
+NiwLtdbGYF5HmL5l9soaVhTO4ZHcSuBFH7NYOLPJtDXxinfT3CY9dWkNBDUl9p9V
+GgqanKTbB/HT8VHKwVULufd1RHiNfm+9MlJx1jln+KZGZbd8M4iwWOiG5z4f4lCD
+El4VVe053i2Bn8on/zvrUj3FvJRRt1xRgPecVrUrTTNAWYQGHH7KvsPNFqx8DA4L
+6N0Zw+YCL1OhzCoW18pc3yhVpXYCuuEvoFY0mlB74OpfULQ0cyoGE/641IcnitTV
+AyNij5Syavi1Vz/fsHxnh3gq
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas.st-cyr.terre.defense.gouv.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.st-cyr.terre.defense.gouv.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.st-cyr.terre.defense.gouv.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecoles de Saint- Cyr Coëtquidan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecoles de Saint- Cyr Coëtquidan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Patrick Jaouen</md:SurName>
+    <md:EmailAddress>patrick.jaouen@st-cyr.terre-net.defense.gouv.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Franck Le Calloch</md:SurName>
+    <md:EmailAddress>franck.lecalloch@st-cyr.terre-net.defense.gouv.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/catalogue.clouds.geant.net-saml2-entityid.xml b/swamid-interfederations-2.0/catalogue.clouds.geant.net-saml2-entityid.xml
new file mode 100644
index 00000000..b506d3e7
--- /dev/null
+++ b/swamid-interfederations-2.0/catalogue.clouds.geant.net-saml2-entityid.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://catalogue.clouds.geant.net/saml2/entityid">
+  <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: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">GEANT Cloud Catalogue</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GEANT Cloud Catalogue</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://catalogue.clouds.geant.net</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://catalogue.clouds.geant.net/#/privacy-statement</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>MIIC0DCCAbgCCQDB0aTWTlFZxzANBgkqhkiG9w0BAQUFADAqMSgwJgYDVQQDEx9zaWduLmNhdGFsb2d1ZS5jbG91ZHMuZ2VhbnQubmV0MB4XDTE0MTEwMzE0MjAzMVoXDTI0MTAzMTE0MjAzMVowKjEoMCYGA1UEAxMfc2lnbi5jYXRhbG9ndWUuY2xvdWRzLmdlYW50Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKT7WaFyHvVFWTOPINs787dJlC2BzgyX+v2xlrj0aRX3lxGPLlTvnfDR3ZNmDMSBgbLpDjfStMDQnFzWN3NcIDllcLFM4CMKTy2vK0BNjd/8ljEfwaB4UpZT2ezD8AWSasWk8GA3YrN6IlYq/9IILq3b2TVLh21tALtR5oVhoL8a5T+GTaO9TXHXl8Xs6FDzESUPfuaWwQp9rPfsJ8zuZ8wSOe1c+OaTsaeYq9m4PHyXjECMhK64x7LRHZJg70QLnpn+LcyTPuAxO1dkd1Ky4FQYPz+naT5dFFSCpMlLSYg2n0ruwkr37aACm39IIf+wUcPAUTkX8n34TIt7u8gUPD0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAlI74JrABdU6Xn8Ygha92ppx7rGhPVrwJbVBWB+8b2lUcp5UWmKJPox+3AeZwDUabZsMmWye9o2jr1T/ejjiBXwJ3jRaxQFF5RE+6F2A/rE3oZaExHmY3uTJzJttBJTdK0TQ0AvH6TKtbHjYFMa0FuxauvCKg6GfsENjGWWp6YctA+1qNb830y+Ns/nn18K7GEEQp6pKo3rKyiCJPBOVPxBZpgf/wmoAIT2h1+Lzec/XpSRpqAmAu+xzE+aCJn7EW5cP1tGNfCx1GPUAFJtcP+9/zeYdIWbb0A5w/4M4gv+iWAuYSb80Ebu36TMSi+ub7dn3VyaQhH/xqtcIX0AQQaQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC1jCCAb4CCQDggajQVqh3jjANBgkqhkiG9w0BAQUFADAtMSswKQYDVQQDEyJlbmNyeXB0LmNhdGFsb2d1ZS5jbG91ZHMuZ2VhbnQubmV0MB4XDTE0MTEwMzE0MTkxN1oXDTI0MTAzMTE0MTkxN1owLTErMCkGA1UEAxMiZW5jcnlwdC5jYXRhbG9ndWUuY2xvdWRzLmdlYW50Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO2Og7LfuT7iiqbEEBFIafyyEXt4unuB8qyRWvHmGyxEf2FWGkmpRX7Uy3As/M4sOiAju5B8iJzP+OAgS1BSLlu1Lft9MLRIL6W3llYFkqQaz6Y8JtkGKRmbn1CcMH1mpZf20vJbskEBLUAlzg11dYZuAkBFzPLUDZcSe6aopEWBB7RhuSUoWv8heEU8w8sHSQpwgGDIpLGJPAHMSdtEqKkXQxobOa965srjA21l1yAkEXrLXgvjWaCCbf0dUIV6axv0z54MakgUCKGnRokAXiDdhWnkaD8bdmmUIkMLLtTYHQtmU2TrmFodp5naroznUSiQmCDl3tA8cbwiU6w44yMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAot9VEUqJErGgoCza+4hngU7KwrY3sNMaEgNuCQJ0nxv5ukuWYW6Ksoor9n6ck1pZWMFV/orl/oiJFFsl7ADUMGZO7Q+r+u9RrCLqnJwYULDb2IVKpcuxpdo2F6kM7Udk+1LcTQg9WMJSawCM8+tsxe2sEfZWDf+bBvP2EwmyHNGAsfZ5aLYlIQS++r0o2y4EB/UzRT4xxK/LSskfPd2VfI+3JDf3ZNpsvh+B90fkIXAw1d+ivs7yeG36ZQqkWL1/oEdEjVI77tNg7cSobT9IgqoLy4Hqtkm2PA5I3HtKrAZcMzagAChNBJqK2uTy7RV6bGV1MOsvsmztaqkkDDTlZA==</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#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>
+                urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+            </md:NameIDFormat>
+    <md:AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalogue.clouds.geant.net/api/login/saml/callback"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">GEANT Cloud Catalogue</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">GEANT Cloud Catalogue</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="eduPersonPrincipalName" Name="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="cn" 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: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="en">GÉANT Association</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT Association</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.org</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>geant-cloud-catalogue@grnet.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>geant-cloud-catalogue@grnet.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cavle.org-shibboleth.xml b/swamid-interfederations-2.0/cavle.org-shibboleth.xml
new file mode 100644
index 00000000..f7a882ee
--- /dev/null
+++ b/swamid-interfederations-2.0/cavle.org-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cavle.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-08T08:32: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cavle.org</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDFjCCAf6gAwIBAgIQGVM0uhTD3rVCMPoy0rMlwzANBgkqhkiG9w0BAQsFADAd
+						MRswGQYDVQQDExJpZHAudW5pc2Vydml0eS5jb20wHhcNMTQxMDA3MTMyNTQ3WhcN
+						MzUxMjMwMjMwMDAwWjAdMRswGQYDVQQDExJpZHAudW5pc2Vydml0eS5jb20wggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRCBuPl18hR/OOGblHjWWTo9LR
+						c3BZ9sTsDw2oLTV7QZiPuzFkmaelEFjnkWUsbjKQcjaidaA/UxP0YGaTypRUJDyM
+						A83zRfCrqGOFE8qvjesl0VNJrhw+8pxxKnxnOsnzqLT2rMid4cGuTLtNK0BnCXaU
+						9tQ6ggrZEEZUtZsQ4GUhapc/FiX9SV2OGeVlUfeDPCCeegVxWnTjoW6NirXRHw7e
+						B8CZmculcAm549Di1chMRmy1W1TPPUS16hZI65fU8ra5anxtEjPrPm/42VI3b7EC
+						n9HKTZL90O38/iUu1CGZBvSd8BHsFpta9IuEcAPzwb5oggRe0jOqYfVVM0svAgMB
+						AAGjUjBQME4GA1UdAQRHMEWAEARX+D7bRC1NV+4PE+pA07ehHzAdMRswGQYDVQQD
+						ExJpZHAudW5pc2Vydml0eS5jb22CEBlTNLoUw961QjD6MtKzJcMwDQYJKoZIhvcN
+						AQELBQADggEBACLhDJtzDh6aqM/ZBf8nGEyVYEbav54Hnw+tHMdpRfgQXRT4UEed
+						zkG9b8TCFnbWuGkkdfT5GesY3P+KjJQ05AkvtVcgq6CTencq5a9mcocXeFhmO45a
+						/6w8VV+iNrMov2gxsOdTx6cbU0pP5UUxYRNCzMc20CoOb1YENt6LMxXn0zlM2uR+
+						5/xuR9hxY8TbZgoQzIU6ZSmfRND2VufgaL3ndxQgyd86qmIkkPfL1yOgPglINkrI
+						WArFmTaBqIHzgsuZgaqJNsEiLP8KgnKvtQoq7YyLXKGEjQGSlvEB3CY67XMAMleR
+						W/SZFaCEqoPVCkUSY5QwNt5efTT4YWfcwis=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniservity.com:8443/shib/profile/saml1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniservity.com:8443/shib/profile/saml2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniservity.com/shib/profile/saml2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniservity.com/shib/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.uniservity.com/shib/profile/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniservity.com/shib/profile/saml2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniservity.com/shib/profile/saml2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniservity.com/shib/profile/saml2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cavle.org</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDFjCCAf6gAwIBAgIQGVM0uhTD3rVCMPoy0rMlwzANBgkqhkiG9w0BAQsFADAd
+						MRswGQYDVQQDExJpZHAudW5pc2Vydml0eS5jb20wHhcNMTQxMDA3MTMyNTQ3WhcN
+						MzUxMjMwMjMwMDAwWjAdMRswGQYDVQQDExJpZHAudW5pc2Vydml0eS5jb20wggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRCBuPl18hR/OOGblHjWWTo9LR
+						c3BZ9sTsDw2oLTV7QZiPuzFkmaelEFjnkWUsbjKQcjaidaA/UxP0YGaTypRUJDyM
+						A83zRfCrqGOFE8qvjesl0VNJrhw+8pxxKnxnOsnzqLT2rMid4cGuTLtNK0BnCXaU
+						9tQ6ggrZEEZUtZsQ4GUhapc/FiX9SV2OGeVlUfeDPCCeegVxWnTjoW6NirXRHw7e
+						B8CZmculcAm549Di1chMRmy1W1TPPUS16hZI65fU8ra5anxtEjPrPm/42VI3b7EC
+						n9HKTZL90O38/iUu1CGZBvSd8BHsFpta9IuEcAPzwb5oggRe0jOqYfVVM0svAgMB
+						AAGjUjBQME4GA1UdAQRHMEWAEARX+D7bRC1NV+4PE+pA07ehHzAdMRswGQYDVQQD
+						ExJpZHAudW5pc2Vydml0eS5jb22CEBlTNLoUw961QjD6MtKzJcMwDQYJKoZIhvcN
+						AQELBQADggEBACLhDJtzDh6aqM/ZBf8nGEyVYEbav54Hnw+tHMdpRfgQXRT4UEed
+						zkG9b8TCFnbWuGkkdfT5GesY3P+KjJQ05AkvtVcgq6CTencq5a9mcocXeFhmO45a
+						/6w8VV+iNrMov2gxsOdTx6cbU0pP5UUxYRNCzMc20CoOb1YENt6LMxXn0zlM2uR+
+						5/xuR9hxY8TbZgoQzIU6ZSmfRND2VufgaL3ndxQgyd86qmIkkPfL1yOgPglINkrI
+						WArFmTaBqIHzgsuZgaqJNsEiLP8KgnKvtQoq7YyLXKGEjQGSlvEB3CY67XMAMleR
+						W/SZFaCEqoPVCkUSY5QwNt5efTT4YWfcwis=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniservity.com:8443/shib/profile/saml1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniservity.com:8443/shib/profile/saml2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UniServity Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UniServity: CAVLE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://uniservity.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Desk</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.zefaj@UniServity.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Brian</md:GivenName>
+    <md:SurName>Fraser</md:SurName>
+    <md:EmailAddress>mailto:brian.fraser@uniservity.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/census.mimas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/census.mimas.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..14890c91
--- /dev/null
+++ b/swamid-interfederations-2.0/census.mimas.ac.uk-shibboleth.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://census.mimas.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-01T11: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: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">Census Dissemination Unit</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Online access to aggregate data from the 1971, 1981, 1991 and 2001 UK Census of Population.</mdui:Description>
+        <mdui:Logo height="75" width="200">https://census.mimas.ac.uk/cdu_new.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEKzCCAxOgAwIBAgIJAMTX7HKZbFDFMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
+						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
+						CxMFTWltYXMxGzAZBgNVBAMTEmNlbnN1cy5taW1hcy5hYy51azAeFw0xMzA1MzAx
+						NTI3MzBaFw0yMzA1MjgxNTI3MzBaMIGLMQswCQYDVQQGEwJHQjETMBEGA1UECBMK
+						TWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3RlcjElMCMGA1UEChMcVGhlIFVu
+						aXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UECxMFTWltYXMxGzAZBgNVBAMT
+						EmNlbnN1cy5taW1hcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBALfJujuG3l2vwtdzi3/ZIcAKfFwC5RKAHLHLBUejvFA/nkt7OnOonu0x689R
+						IEBd877zeYd0ZH3GAMBVX7zJiQ11jdLYHUEVi8d/8Hx3dZ2nXXFdPzJL2OIJzHc2
+						aQQgdWmRrTge6r10NcVOAAJ5mIIHK7PPifDwVMMN1GuF4OBA3aojaMP0Dj+DO1gr
+						FCZtGi3VE17cxKTZdmuiRsFYGifIBvkSdmopv3+ibW6fukO564pRxHAywRqhZd2E
+						pMGx3G7pbXNIZYB6Xje5DGp/qOB0SOdC6kSJjdeaWsyYfSQOAdyVZm91ZFD8qmES
+						Z5aL66VIprPYDGjYx6tZ+eHsGfsCAwEAAaOBjzCBjDAJBgNVHRMEAjAAMAsGA1Ud
+						DwQEAwIEsDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0RBBYw
+						FIISY2Vuc3VzLm1pbWFzLmFjLnVrMDQGA1UdEgQtMCuBKW1pbWFzLXNoaWItdGVj
+						aEBsaXN0c2Vydi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQAl
+						pfv7zAn13s6WPzfCqNEBqsr9h8Vg79uNxsLfql484q/7CSkTcpe7pTVa1TlOqXbK
+						0emzlq6YDyESAw+jtlfFz0Rd1CUU9YrpS3dMXlx+7gbicJKi3H5dOpvMz1mxqni7
+						qERoTHr+xMHTNsnuIe/h7osNo7sJJhMrLhgmywVeSNbEg4Y5pudwDMBegts7Vwa1
+						CMLitQ8xllB/hq7QUaZNDgv4SVuWLaJENE4jmE6/Q3UVz82ocs0IlQT2+8eKcA8N
+						O+QI2PQgwQ5bUHCPKsZz/04ZwAGER/CGgN+2gRPSigWmcU/uFgp63mZ8Q1a3qA6m
+						2j+Cllx9NsHLxRQvuS3t
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://census.mimas.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://census.mimas.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://census.mimas.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://census.mimas.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://census.mimas.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://census.mimas.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://census.mimas.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://census.mimas.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://census.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://census.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://census.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://census.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://census.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://census.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: Census Datasets including SARs and CIDER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://cdu.mimas.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>CDU Census Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:census@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/cerbere2.mines-douai.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/cerbere2.mines-douai.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..77ab33e8
--- /dev/null
+++ b/swamid-interfederations-2.0/cerbere2.mines-douai.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cerbere2.mines-douai.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-03T09:42: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-douai.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Mines Douai</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDSDCCAjCgAwIBAgIVAPf+z/Alo2UGcIQMpD8+yoRE9DjEMA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMTF2NlcmJlcmUyLm1pbmVzLWRvdWFpLmZyMB4XDTEzMDkz
+MDEyMTA0N1oXDTMzMDkzMDEyMTA0N1owIjEgMB4GA1UEAxMXY2VyYmVyZTIubWlu
+ZXMtZG91YWkuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsehUd
+QZAcFM8YQRAuQ4MSbuE5yrEu7ZpH8ICDmKMlVudlEWSLSkCZqrbtNYOev8gdHQTh
+OvKd5IzIph5TaRjY1qQI5v2ud/ov+Xk0JLWkYWnh2wMIQ07LoQ66zQqHxVbfq6lR
+lNtaHXhcPNPp/61j4OOoHNbztglqpAeVnkgUqMksnDofsjVsVMYG+9naGfwHKJlH
+I9HW7aUEvYYl/mUKrHbu9+QWpLsJukiJEF6hyRgijs/kr2pm0pBB4djy1NTgrqfz
+qjYmCzxtkbogHsOs0KGdoMg6R5PmHojtQ00beeKC8/hfHP+sU3wnNO+Hb14B/NLB
+veexLjO3AQpMtMY5AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2NlcmJlcmUyLm1pbmVz
+LWRvdWFpLmZyhi5odHRwczovL2NlcmJlcmUyLm1pbmVzLWRvdWFpLmZyL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTHtKE6G3SkaEo+yuSQU4KTB9wxkDANBgkqhkiG
+9w0BAQUFAAOCAQEAqXrF4OYsvzcJ6djLo7hq52yqhYJtEdSGJkJ4n7CKX4WrHs5M
+YwWM3B6qbIjni0+cel8TJTCPG94ZZZOKZIPRv6eS2j77sRgnsht+mYpl9o4+zjrE
+CPVr99SlBCSuArEnnqDe26EJyV5M0fALwgHaBTPUlHhObgUuPuzlQQGEZKpoSlGT
+Hx5ewqQ+m/jii2h1IOzex/1uFA3euE8trn5LMmNZpvQ24yRBCVQ1LyTmmdTkNeHk
+GiluYTYk7G0sXbJWur7gK8jpHdojNfR2SUay9Z2lAllZ2V/cwxVOgOMgaFkaHAq1
+1Zj4drFJWcGthEvZ8uVYsc6wJoIy1fbrkBcMng==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cerbere2.mines-douai.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cerbere2.mines-douai.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cerbere2.mines-douai.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Mines Douai</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Mines Douai</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>net.supervision@mines-douai.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cern.ch-login.xml b/swamid-interfederations-2.0/cern.ch-login.xml
new file mode 100644
index 00000000..c3d61ee4
--- /dev/null
+++ b/swamid-interfederations-2.0/cern.ch-login.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cern.ch/login" 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">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-07-29T13:17:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor errorURL="http://cern.ch/serviceportal" 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">CERN Service Provider Proxy</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CERN Service Provider Proxy</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABPElEQVR42pVT21HDQAx0B5RACSkB25N/SqAEPs+ZfFACJaSElOAPrHwxQwmUkBKMdk+S5YRk4GYuj9NqT7vSNY2tbfl8aMvptRtk1D3/dTO5Kx+bbpi+mVzkGWT9Xh7bMr0bcMRZkxZyeIYPJPeDHDxYKwGhkeK7yLkd5C0IlJgEOATIAyBS8Fe3Oz1leUY2I1b/R/kK1rJ5M8gM0FwsVNUXORqeO0pZdMk537zSrOeUqt64LysCApz1JoHMRjCGZy7BAOMtAvNqbnfTC36HoTQNTt8h4K2Qp3G0Fl7Ak9QyLQ0GeWvSouNaJeMmk2Q6B8sQ8UADTgSgbpJbzIlXBmb3OXmqL/c79z37cNWprMmGJN4DNNeRrlNJbJrIMGnlOCqx0fXtmtmxO92K5DDpt46k4ftX8vKQ8Lgq5geGpVRM3R4TeQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="60" width="60">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAIAAAC1nk4lAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAACC9JREFUeNrsmk1MVFcUxxHF1EEqCR8pWNCkGaGatg6JjdUGSRq6GBa0iY26qEmLi0ZrohtoUk1MYAMbm/iRLqCLdlH7kTYsYFG6ABRjJWG6EANM0iBEsQ4aCIgNNKa/945c3rzvNzwbTXyZmJnLfff+77n/8z/nnuu63Z/8mPW8PdlZz+HzAvQL0C7PuhDH2hjJ2Vaez5ep6YWp6YfPIuiqyqKqiuJYZdG2snzgPtOWBt/B2m3xvVtKCnMxZ3/iTveV8an7aXaNluVHy/P3xTbzvS9xu3tgfGgk5T4s/fN8r3xNIJ0+Ur/jQG2UL10D4z/0JD05wG7E926t27t1aDTV0TnsCT1k0Ni19fM92KOj8+alnrH5hSX/c/BuQ/12oLPO9s7hQO/aPmtfjX3k2Qms7V++x2Qnz17+/frk4tLjQHPwIixKjKaO7n8Tzly78Xcg3Kw2LzcH5w7A6erY5tbje+DDV9//6X8yrFtSGMFTjY3NHYM0wvhA2gIhu9K9Yp2njU837OKdlo5BPxPQnzmqKooAzc/kxMzco5V1QhIx/NDolq4rt/oTt32Ombw041c9EIqLjTVDo/f8IMbnGup3ABegcBfP44vtDtCnuqqU3cPeeAgWCVPysPHcwmKzF2JwnGrYBRSAHmvrdZcIgHbxGRhnQ/Ii608c2on5W74ZdHorqkersQl/lobKfADhzmP6yNo84Vp3BnIfbes9Ur/9QmMNJkdYrN1EvE0YHHOPE4fe6vIKCvg1u0z4OHymJ6gGs4FYGjFpOncV+mFvtsuGohvW+02YQMOms3p3xKeWfTQD6eUVqA9J8BwGYdkswIqbZAbW+QKNo+DansLErD5VxfYhSIGYxYvOQBVb3L4szUAwFUlyf1OUezWBTQ86twW04GZAflbrSYs8rxRGrLazcURJdEwiykCSdqKA0FdlofLMLSwxJb6lWvB34QwgjKImLyoH6B+6g2kl9xJDkDbi2R823pPX+VNixAc9ouk04ucvbfED70fBwdCIMdMwMS5PMkTMo0WsRYsu1cUnDu78ta1O4gudlS0FBN3Uzz7dNNWxUtUiu0ciGUyntQi0rIsSXxhacRdjSIjm+5Ocs9PA8t+SbBFk7Tn/QcnyzgpNxd6miIM56VNdtRn3MDmopGXIf4dFCm0snbchR6kBRgK3ibsuDjr/aFHTYD3lmFseBLgme6eNdn8BZCYHlamDWVqxEClNLrPTRssP7pSI9c6nP6kW+YL6KqPKLhntbRtrFNGZrk93UHJDazh0jIhGlFGDw5kexNXU0t55kwg3Njlj8mMjbnvQFcXG8ATx6hprZAesJsu2TQ/Eh0QrJDn0q2KPFpvOX0V/OOOY/gRu/NsJd7R8k/EnCwArSmK7ydm2JDO+zIaqU5YsgCxHfdeOt/pHnQ5Zc7Melq2kbDo3YE39cCFe4UVTO9vF4vnXH+jphzGD4mIhHBEHv9BUwwe24N1zWk6cohGN4yPhgBYxDNygD2EVJ6ZREYy/EvZMzJEjnK5Iucb2hB4N/Dri3emFfYaYJN5jdaBjrb0uLUpwTN3AjY8a/U+t1vZEk7DLw2wsDY9Zoov/hfiwRQDlw6TGgKrcyW/uIV5sZWSdXgwIG3Sp6FpyYtbWTLbQ7bM89kvCiol88XfDBI1p4bEQT7N0eoiRTNp4CPcALU5gSgCgXUlBJETQeLA6SkoEMRqb9EaCvH9LP5Fno0cb9Xv1T52WbK3kFfOSJxqMTVJqq3fOoHVtx9jGWCBDmNwl4/oqYm86zjF+mqXL8hMORzjHM6KWN4+mWLqKbZKEVKerYWbPRT07NeVhQFSWZktZQJ9DYcQRNOk5DG5Jj22MYsx9M3vYPQA1nR8whWgsDVbxfmaBjbaVE3dLpxiCgYyJZbeeTGfMEOEbQ2Fj6+lddlLSWtxJpDBYsUYWyn5hbGIkkxHbmYxGzetHeoMiVnVXKRPb9sFGWCQvkkNnpz4eVdMtJS9XVRZrxxNNmGYPxysx0sWfbxRseomk6sHsP4GKiM2f7QYKQ31hCOOmp7Qwd8drBWxIcnKm27lc5nZRRGaDpYVk/XpFhrFaj+/RkpuCXJ98YJ0cMdEKDcrEDImeS38JMXik+znfrZYnwkfyJEELwpDrSKFRyofQjj6sxBQC4ACCRZYnBBXVlxTPvawjIWbq/kP3bh6lXuaDysYUD5QQGmPj4KSmTucDvZ57T3O40RRUpsUTsVzTSG7tXmTzAI3wsbMtWYO2p5t5ve5Ibm264zFeyX17ppaefhBLWVkLDpVFLl6Y5Xn5iTDDRVuNw4rAvdBYg3l08698FGIpxIDYSXFVSAexHHnoaT3FBLtzWVx6DKb1OWuv3bhr56l3NKbufwORgdkmPQEx77ojxiKoysfxyp7rkyfPXma6xX8fI1PdA7dcdsb7oujW3TnGSjrkLsN/PQB67dtlRHuMmpyclck8EQP3cPx10cHTX//xXfeItLPyI1ocSDGvE6Q1Yf1/D7aYgC9BQZSOqGQ9pGlkqyhGWORER2frBR8nUSlGZuiI/h85R0p9H99lSk4McmjAXzdGtIyeZEZdILV3DtPflgPodMw1UwjzQl+HlaupjV7ikAJVtHyTIAZKQtfQMeeSlVJruQf7P0DL3YBihbtsuQcHU6EsmOQFRQzQDK7YrIHJtnwTMmhCg5xEVnk3sJKmTs64JMDZoSA21bBX/0CMp2jpp4FYLG0tlIUDWhCTuYeLWBWMnIydOWjCBOmbnq8OPI2KmWROYYKWuxg/KXLmDEkvg6wWtCD2kyKv1hcdiqD/CTAAuHBP9rdH3GwAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.cern.ch</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIIEjCCBfqgAwIBAgIKLYgjvQAAAAAAMDANBgkqhkiG9w0BAQsFADBRMRIwEAYK
+CZImiZPyLGQBGRYCY2gxFDASBgoJkiaJk/IsZAEZFgRjZXJuMSUwIwYDVQQDExxD
+RVJOIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMTEwODA4Mzg1NVoXDTIz
+MDcyOTA5MTkzOFowVjESMBAGCgmSJomT8ixkARkWAmNoMRQwEgYKCZImiZPyLGQB
+GRYEY2VybjESMBAGA1UECxMJY29tcHV0ZXJzMRYwFAYDVQQDEw1sb2dpbi5jZXJu
+LmNoMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp6t1C0SGlLddL2M+
+ltffGioTnDT3eztOxlA9bAGuvB8/Rjym8en6+ET9boM02CyoR5Vpn8iElXVWccAE
+xPIQEq70D6LPe86vb+tYhuKPeLfuICN9Z0SMQ4f+57vk61Co1/uw/8kPvXlyd+Ai
+8Dsn/G0hpH67bBI9VOQKfpJqclcSJuSlUB5PJffvMUpr29B0eRx8LKFnIHbDILSu
+6nVbFLcadtWIjbYvoKorXg3J6urtkz+zEDeYMTvA6ZGOFf/Xy5eGtroSq9csSC97
+6tx+umKEPhXBA9AcpiCV9Cj5axN03Aaa+iTE36jpnjcd9d02dy5Q9jE2nUN6KXnB
+6qF6eQIDAQABo4ID5TCCA+EwPQYJKwYBBAGCNxUHBDAwLgYmKwYBBAGCNxUIg73Q
+CYLtjQ2G7Ysrgd71N4WA0GIehd2yb4Wu9TkCAWQCARkwHQYDVR0lBBYwFAYIKwYB
+BQUHAwIGCCsGAQUFBwMBMA4GA1UdDwEB/wQEAwIFoDBoBgNVHSAEYTBfMF0GCisG
+AQQBYAoEAQEwTzBNBggrBgEFBQcCARZBaHR0cDovL2NhLWRvY3MuY2Vybi5jaC9j
+YS1kb2NzL2NwLWNwcy9jZXJuLXRydXN0ZWQtY2EyLWNwLWNwcy5wZGYwJwYJKwYB
+BAGCNxUKBBowGDAKBggrBgEFBQcDAjAKBggrBgEFBQcDATAdBgNVHQ4EFgQUqtJc
+wUXasyM6sRaO5nCMFoFDenMwGAYDVR0RBBEwD4INbG9naW4uY2Vybi5jaDAfBgNV
+HSMEGDAWgBQdkBnqyM7MPI0UsUzZ7BTiYUADYTCCASoGA1UdHwSCASEwggEdMIIB
+GaCCARWgggERhkdodHRwOi8vY2FmaWxlcy5jZXJuLmNoL2NhZmlsZXMvY3JsL0NF
+Uk4lMjBDZXJ0aWZpY2F0aW9uJTIwQXV0aG9yaXR5LmNybIaBxWxkYXA6Ly8vQ049
+Q0VSTiUyMENlcnRpZmljYXRpb24lMjBBdXRob3JpdHksQ049Q0VSTlBLSTA3LENO
+PUNEUCxDTj1QdWJsaWMlMjBLZXklMjBTZXJ2aWNlcyxDTj1TZXJ2aWNlcyxDTj1D
+b25maWd1cmF0aW9uLERDPWNlcm4sREM9Y2g/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlP29iamVjdENsYXNzPWNSTERpc3RyaWJ1dGlvblBvaW50MIIBVAYI
+KwYBBQUHAQEEggFGMIIBQjBcBggrBgEFBQcwAoZQaHR0cDovL2NhZmlsZXMuY2Vy
+bi5jaC9jYWZpbGVzL2NlcnRpZmljYXRlcy9DRVJOJTIwQ2VydGlmaWNhdGlvbiUy
+MEF1dGhvcml0eS5jcnQwgbsGCCsGAQUFBzAChoGubGRhcDovLy9DTj1DRVJOJTIw
+Q2VydGlmaWNhdGlvbiUyMEF1dGhvcml0eSxDTj1BSUEsQ049UHVibGljJTIwS2V5
+JTIwU2VydmljZXMsQ049U2VydmljZXMsQ049Q29uZmlndXJhdGlvbixEQz1jZXJu
+LERDPWNoP2NBQ2VydGlmaWNhdGU/YmFzZT9vYmplY3RDbGFzcz1jZXJ0aWZpY2F0
+aW9uQXV0aG9yaXR5MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jZXJuLmNoL29j
+c3AwDQYJKoZIhvcNAQELBQADggIBAGKZ3bknTCfNuh4TMaL3PuvBFjU8LQ5NKY9G
+LZvY2ibYMRk5Is6eWRgyUsy1UJRQdaQQPnnysqrGq8VRw/NIFotBBsA978/+jj7v
+4e5Kr4o8HvwAQNLBxNmF6XkDytpLL701FcNEGRqIsoIhNzihi2VBADLC9HxljEyP
+T52IR767TMk/+xTOqClceq3sq6WRD4m+xaWRUJyOhn+Pqr+wbhXIw4wzHC6X0hcL
+j8P9Povtm6VmKkN9JPuymMo/0+zSrUt2+TYfmbbEKYJSP0+sceQ76IKxxmSdKAr1
+qDNE8v+c3DvPM2PKmfivwaV2l44FdP8ulzqTgphkYcN1daa9Oc+qJeyu/eL7xWzk
+6Zq5R+jVrMlM0p1y2XczI7Hoc96TMOcbVnwgMcVqRM9p57VItn6XubYPR0C33i1y
+UZjkWbIfqEjq6Vev6lVgngOyzu+hqC/8SDyORA3dlF9aZOD13kPZdF/JRphHREQt
+aRydAiYRlE/WHTvOcY52jujDftUR6oY0eWaWkwSHbX+kDFx8IlR8UtQCUgkGHBGw
+nOYLIGu7SRDGSfOBOiVhxKoHWVk/pL6eKY2SkmyOmmgO4JnQGg95qeAOMG/EQZt/
+2x8GAavUqGvYy9dPFwFf08678hQqkjNSuex7UD0ku8OP1QKvpP44l6vZhFc6A5Xq
+jdU9lus1
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cern.ch/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.cern.ch/adfs/ls/"/>
+    <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.cern.ch/adfs/ls/" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.cern.ch/adfs/ls/" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">CERN Service Provider Proxy</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">CERN Service Provider Proxy</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="swissEduPersonHomeOrganization" Name="urn:oid:2.16.756.1.2.5.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute 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" 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="swissEduPersonUniqueID" Name="urn:oid:2.16.756.1.2.5.1.1.1" 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:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="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="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="commonName" Name="urn:oid:2.5.4.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:AttributeConsumingService>
+  </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">cern.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CERN</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CERN Identity Provider</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABPElEQVR42pVT21HDQAx0B5RACSkB25N/SqAEPs+ZfFACJaSElOAPrHwxQwmUkBKMdk+S5YRk4GYuj9NqT7vSNY2tbfl8aMvptRtk1D3/dTO5Kx+bbpi+mVzkGWT9Xh7bMr0bcMRZkxZyeIYPJPeDHDxYKwGhkeK7yLkd5C0IlJgEOATIAyBS8Fe3Oz1leUY2I1b/R/kK1rJ5M8gM0FwsVNUXORqeO0pZdMk537zSrOeUqt64LysCApz1JoHMRjCGZy7BAOMtAvNqbnfTC36HoTQNTt8h4K2Qp3G0Fl7Ak9QyLQ0GeWvSouNaJeMmk2Q6B8sQ8UADTgSgbpJbzIlXBmb3OXmqL/c79z37cNWprMmGJN4DNNeRrlNJbJrIMGnlOCqx0fXtmtmxO92K5DDpt46k4ftX8vKQ8Lgq5geGpVRM3R4TeQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="60" width="60">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAIAAAC1nk4lAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAACC9JREFUeNrsmk1MVFcUxxHF1EEqCR8pWNCkGaGatg6JjdUGSRq6GBa0iY26qEmLi0ZrohtoUk1MYAMbm/iRLqCLdlH7kTYsYFG6ABRjJWG6EANM0iBEsQ4aCIgNNKa/945c3rzvNzwbTXyZmJnLfff+77n/8z/nnuu63Z/8mPW8PdlZz+HzAvQL0C7PuhDH2hjJ2Vaez5ep6YWp6YfPIuiqyqKqiuJYZdG2snzgPtOWBt/B2m3xvVtKCnMxZ3/iTveV8an7aXaNluVHy/P3xTbzvS9xu3tgfGgk5T4s/fN8r3xNIJ0+Ur/jQG2UL10D4z/0JD05wG7E926t27t1aDTV0TnsCT1k0Ni19fM92KOj8+alnrH5hSX/c/BuQ/12oLPO9s7hQO/aPmtfjX3k2Qms7V++x2Qnz17+/frk4tLjQHPwIixKjKaO7n8Tzly78Xcg3Kw2LzcH5w7A6erY5tbje+DDV9//6X8yrFtSGMFTjY3NHYM0wvhA2gIhu9K9Yp2njU837OKdlo5BPxPQnzmqKooAzc/kxMzco5V1QhIx/NDolq4rt/oTt32Ombw041c9EIqLjTVDo/f8IMbnGup3ABegcBfP44vtDtCnuqqU3cPeeAgWCVPysPHcwmKzF2JwnGrYBRSAHmvrdZcIgHbxGRhnQ/Ii608c2on5W74ZdHorqkersQl/lobKfADhzmP6yNo84Vp3BnIfbes9Ur/9QmMNJkdYrN1EvE0YHHOPE4fe6vIKCvg1u0z4OHymJ6gGs4FYGjFpOncV+mFvtsuGohvW+02YQMOms3p3xKeWfTQD6eUVqA9J8BwGYdkswIqbZAbW+QKNo+DansLErD5VxfYhSIGYxYvOQBVb3L4szUAwFUlyf1OUezWBTQ86twW04GZAflbrSYs8rxRGrLazcURJdEwiykCSdqKA0FdlofLMLSwxJb6lWvB34QwgjKImLyoH6B+6g2kl9xJDkDbi2R823pPX+VNixAc9ouk04ucvbfED70fBwdCIMdMwMS5PMkTMo0WsRYsu1cUnDu78ta1O4gudlS0FBN3Uzz7dNNWxUtUiu0ciGUyntQi0rIsSXxhacRdjSIjm+5Ocs9PA8t+SbBFk7Tn/QcnyzgpNxd6miIM56VNdtRn3MDmopGXIf4dFCm0snbchR6kBRgK3ibsuDjr/aFHTYD3lmFseBLgme6eNdn8BZCYHlamDWVqxEClNLrPTRssP7pSI9c6nP6kW+YL6KqPKLhntbRtrFNGZrk93UHJDazh0jIhGlFGDw5kexNXU0t55kwg3Njlj8mMjbnvQFcXG8ATx6hprZAesJsu2TQ/Eh0QrJDn0q2KPFpvOX0V/OOOY/gRu/NsJd7R8k/EnCwArSmK7ydm2JDO+zIaqU5YsgCxHfdeOt/pHnQ5Zc7Melq2kbDo3YE39cCFe4UVTO9vF4vnXH+jphzGD4mIhHBEHv9BUwwe24N1zWk6cohGN4yPhgBYxDNygD2EVJ6ZREYy/EvZMzJEjnK5Iucb2hB4N/Dri3emFfYaYJN5jdaBjrb0uLUpwTN3AjY8a/U+t1vZEk7DLw2wsDY9Zoov/hfiwRQDlw6TGgKrcyW/uIV5sZWSdXgwIG3Sp6FpyYtbWTLbQ7bM89kvCiol88XfDBI1p4bEQT7N0eoiRTNp4CPcALU5gSgCgXUlBJETQeLA6SkoEMRqb9EaCvH9LP5Fno0cb9Xv1T52WbK3kFfOSJxqMTVJqq3fOoHVtx9jGWCBDmNwl4/oqYm86zjF+mqXL8hMORzjHM6KWN4+mWLqKbZKEVKerYWbPRT07NeVhQFSWZktZQJ9DYcQRNOk5DG5Jj22MYsx9M3vYPQA1nR8whWgsDVbxfmaBjbaVE3dLpxiCgYyJZbeeTGfMEOEbQ2Fj6+lddlLSWtxJpDBYsUYWyn5hbGIkkxHbmYxGzetHeoMiVnVXKRPb9sFGWCQvkkNnpz4eVdMtJS9XVRZrxxNNmGYPxysx0sWfbxRseomk6sHsP4GKiM2f7QYKQ31hCOOmp7Qwd8drBWxIcnKm27lc5nZRRGaDpYVk/XpFhrFaj+/RkpuCXJ98YJ0cMdEKDcrEDImeS38JMXik+znfrZYnwkfyJEELwpDrSKFRyofQjj6sxBQC4ACCRZYnBBXVlxTPvawjIWbq/kP3bh6lXuaDysYUD5QQGmPj4KSmTucDvZ57T3O40RRUpsUTsVzTSG7tXmTzAI3wsbMtWYO2p5t5ve5Ibm264zFeyX17ppaefhBLWVkLDpVFLl6Y5Xn5iTDDRVuNw4rAvdBYg3l08698FGIpxIDYSXFVSAexHHnoaT3FBLtzWVx6DKb1OWuv3bhr56l3NKbufwORgdkmPQEx77ojxiKoysfxyp7rkyfPXma6xX8fI1PdA7dcdsb7oujW3TnGSjrkLsN/PQB67dtlRHuMmpyclck8EQP3cPx10cHTX//xXfeItLPyI1ocSDGvE6Q1Yf1/D7aYgC9BQZSOqGQ9pGlkqyhGWORER2frBR8nUSlGZuiI/h85R0p9H99lSk4McmjAXzdGtIyeZEZdILV3DtPflgPodMw1UwjzQl+HlaupjV7ikAJVtHyTIAZKQtfQMeeSlVJruQf7P0DL3YBihbtsuQcHU6EsmOQFRQzQDK7YrIHJtnwTMmhCg5xEVnk3sJKmTs64JMDZoSA21bBX/0CMp2jpp4FYLG0tlIUDWhCTuYeLWBWMnIydOWjCBOmbnq8OPI2KmWROYYKWuxg/KXLmDEkvg6wWtCD2kyKv1hcdiqD/CTAAuHBP9rdH3GwAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.cern.ch</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>128.141.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>cern.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:46.23304,6.05528</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>
+MIIIEjCCBfqgAwIBAgIKLYgjvQAAAAAAMDANBgkqhkiG9w0BAQsFADBRMRIwEAYK
+CZImiZPyLGQBGRYCY2gxFDASBgoJkiaJk/IsZAEZFgRjZXJuMSUwIwYDVQQDExxD
+RVJOIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMTEwODA4Mzg1NVoXDTIz
+MDcyOTA5MTkzOFowVjESMBAGCgmSJomT8ixkARkWAmNoMRQwEgYKCZImiZPyLGQB
+GRYEY2VybjESMBAGA1UECxMJY29tcHV0ZXJzMRYwFAYDVQQDEw1sb2dpbi5jZXJu
+LmNoMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp6t1C0SGlLddL2M+
+ltffGioTnDT3eztOxlA9bAGuvB8/Rjym8en6+ET9boM02CyoR5Vpn8iElXVWccAE
+xPIQEq70D6LPe86vb+tYhuKPeLfuICN9Z0SMQ4f+57vk61Co1/uw/8kPvXlyd+Ai
+8Dsn/G0hpH67bBI9VOQKfpJqclcSJuSlUB5PJffvMUpr29B0eRx8LKFnIHbDILSu
+6nVbFLcadtWIjbYvoKorXg3J6urtkz+zEDeYMTvA6ZGOFf/Xy5eGtroSq9csSC97
+6tx+umKEPhXBA9AcpiCV9Cj5axN03Aaa+iTE36jpnjcd9d02dy5Q9jE2nUN6KXnB
+6qF6eQIDAQABo4ID5TCCA+EwPQYJKwYBBAGCNxUHBDAwLgYmKwYBBAGCNxUIg73Q
+CYLtjQ2G7Ysrgd71N4WA0GIehd2yb4Wu9TkCAWQCARkwHQYDVR0lBBYwFAYIKwYB
+BQUHAwIGCCsGAQUFBwMBMA4GA1UdDwEB/wQEAwIFoDBoBgNVHSAEYTBfMF0GCisG
+AQQBYAoEAQEwTzBNBggrBgEFBQcCARZBaHR0cDovL2NhLWRvY3MuY2Vybi5jaC9j
+YS1kb2NzL2NwLWNwcy9jZXJuLXRydXN0ZWQtY2EyLWNwLWNwcy5wZGYwJwYJKwYB
+BAGCNxUKBBowGDAKBggrBgEFBQcDAjAKBggrBgEFBQcDATAdBgNVHQ4EFgQUqtJc
+wUXasyM6sRaO5nCMFoFDenMwGAYDVR0RBBEwD4INbG9naW4uY2Vybi5jaDAfBgNV
+HSMEGDAWgBQdkBnqyM7MPI0UsUzZ7BTiYUADYTCCASoGA1UdHwSCASEwggEdMIIB
+GaCCARWgggERhkdodHRwOi8vY2FmaWxlcy5jZXJuLmNoL2NhZmlsZXMvY3JsL0NF
+Uk4lMjBDZXJ0aWZpY2F0aW9uJTIwQXV0aG9yaXR5LmNybIaBxWxkYXA6Ly8vQ049
+Q0VSTiUyMENlcnRpZmljYXRpb24lMjBBdXRob3JpdHksQ049Q0VSTlBLSTA3LENO
+PUNEUCxDTj1QdWJsaWMlMjBLZXklMjBTZXJ2aWNlcyxDTj1TZXJ2aWNlcyxDTj1D
+b25maWd1cmF0aW9uLERDPWNlcm4sREM9Y2g/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlP29iamVjdENsYXNzPWNSTERpc3RyaWJ1dGlvblBvaW50MIIBVAYI
+KwYBBQUHAQEEggFGMIIBQjBcBggrBgEFBQcwAoZQaHR0cDovL2NhZmlsZXMuY2Vy
+bi5jaC9jYWZpbGVzL2NlcnRpZmljYXRlcy9DRVJOJTIwQ2VydGlmaWNhdGlvbiUy
+MEF1dGhvcml0eS5jcnQwgbsGCCsGAQUFBzAChoGubGRhcDovLy9DTj1DRVJOJTIw
+Q2VydGlmaWNhdGlvbiUyMEF1dGhvcml0eSxDTj1BSUEsQ049UHVibGljJTIwS2V5
+JTIwU2VydmljZXMsQ049U2VydmljZXMsQ049Q29uZmlndXJhdGlvbixEQz1jZXJu
+LERDPWNoP2NBQ2VydGlmaWNhdGU/YmFzZT9vYmplY3RDbGFzcz1jZXJ0aWZpY2F0
+aW9uQXV0aG9yaXR5MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jZXJuLmNoL29j
+c3AwDQYJKoZIhvcNAQELBQADggIBAGKZ3bknTCfNuh4TMaL3PuvBFjU8LQ5NKY9G
+LZvY2ibYMRk5Is6eWRgyUsy1UJRQdaQQPnnysqrGq8VRw/NIFotBBsA978/+jj7v
+4e5Kr4o8HvwAQNLBxNmF6XkDytpLL701FcNEGRqIsoIhNzihi2VBADLC9HxljEyP
+T52IR767TMk/+xTOqClceq3sq6WRD4m+xaWRUJyOhn+Pqr+wbhXIw4wzHC6X0hcL
+j8P9Povtm6VmKkN9JPuymMo/0+zSrUt2+TYfmbbEKYJSP0+sceQ76IKxxmSdKAr1
+qDNE8v+c3DvPM2PKmfivwaV2l44FdP8ulzqTgphkYcN1daa9Oc+qJeyu/eL7xWzk
+6Zq5R+jVrMlM0p1y2XczI7Hoc96TMOcbVnwgMcVqRM9p57VItn6XubYPR0C33i1y
+UZjkWbIfqEjq6Vev6lVgngOyzu+hqC/8SDyORA3dlF9aZOD13kPZdF/JRphHREQt
+aRydAiYRlE/WHTvOcY52jujDftUR6oY0eWaWkwSHbX+kDFx8IlR8UtQCUgkGHBGw
+nOYLIGu7SRDGSfOBOiVhxKoHWVk/pL6eKY2SkmyOmmgO4JnQGg95qeAOMG/EQZt/
+2x8GAavUqGvYy9dPFwFf08678hQqkjNSuex7UD0ku8OP1QKvpP44l6vZhFc6A5Xq
+jdU9lus1
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cern.ch/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.cern.ch/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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cern.ch/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.cern.ch/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">cern.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CERN</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cern.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>CERN</md:GivenName>
+    <md:SurName>Service Desk</md:SurName>
+    <md:EmailAddress>mailto:service-desk@cern.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>CERN</md:GivenName>
+    <md:SurName>Service Desk</md:SurName>
+    <md:EmailAddress>mailto:service-desk@cern.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/chronicle.bufvc.ac.uk-oa-metadata.xml b/swamid-interfederations-2.0/chronicle.bufvc.ac.uk-oa-metadata.xml
new file mode 100644
index 00000000..e3e09abd
--- /dev/null
+++ b/swamid-interfederations-2.0/chronicle.bufvc.ac.uk-oa-metadata.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://chronicle.bufvc.ac.uk/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-11-25T15:46: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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID4zCCAsugAwIBAgIJAM107+XEFIGEMA0GCSqGSIb3DQEBBQUAMFQxMjAwBgNV
+						BAoUKUJyaXRpc2ggVW5pdmVyc2l0aWVzIEZpbG0gJiBWaWRlbyBDb3VuY2lsMR4w
+						HAYDVQQDExVjaHJvbmljbGUuYnVmdmMuYWMudWswHhcNMTExMTE4MTYxMzQzWhcN
+						MjExMTE1MTYxMzQzWjBUMTIwMAYDVQQKFClCcml0aXNoIFVuaXZlcnNpdGllcyBG
+						aWxtICYgVmlkZW8gQ291bmNpbDEeMBwGA1UEAxMVY2hyb25pY2xlLmJ1ZnZjLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2+i+j9/++dpFcBX7
+						BaQ/M4OWQaJgutSft+Dodcrd5hFSg9nT5BznoIB0Ip/CEXAs6k/RbMlfFRNwgMQe
+						6X0fp8hjukr75WI4LiQBCp54axkuLW9ScUYl54xVoQ0QUzX+hZcYOKaY47BomBEN
+						8yzi/VjuunSxLrxSiHcRrp0i6RCaCo1uqLFK3jAFFgwJfme9jrzYcUTFCUkgpj9I
+						l67x4ufNkXjorsZ13f9JGTTVSCAYAaRRmqBleIULL2Wu2eDPTkqtIwoWJEHXw3BZ
+						4WX57ezURxYihU1M1ng4+HuQxQ20wvRUV/LlYVueWzABD1njy/PVYBHT9Iwi+qcK
+						4MCNAQIDAQABo4G3MIG0MB0GA1UdDgQWBBTVz59823vubr6Y9SOcECInWbD9tTCB
+						hAYDVR0jBH0we4AU1c+ffNt77m6+mPUjnBAiJ1mw/bWhWKRWMFQxMjAwBgNVBAoU
+						KUJyaXRpc2ggVW5pdmVyc2l0aWVzIEZpbG0gJiBWaWRlbyBDb3VuY2lsMR4wHAYD
+						VQQDExVjaHJvbmljbGUuYnVmdmMuYWMudWuCCQDNdO/lxBSBhDAMBgNVHRMEBTAD
+						AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDI0BREsN8bUqLFwYW8BPT4/E2WxOLIBuAt
+						wCdrGl2ehvsDGvyZS6eR4cXwA5joqCuHeDTBbCRlRwQ82P39i40Dy25l9SX1oGis
+						KheHJLIs45pJNwgRhJgsmL664bTMjGiachvElN7hSuyT3Lv0hIKk4T4hR6AHJ5X1
+						92/K0eWh1AqFPSajm/gEgASXulVnHVor5UH7O6bnTtedOwd+ymmlhyix6v83vx9J
+						DrM3GM749leO2w6NozsLMmcdbKaPwCvxlO+QGFrd3dFSa9e+cuhEvxUidsIK50FB
+						nexvkcwJaLImd7L56nkUt3AyXT+47jRHShQVLOJlYIFOehasKWwl
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID4zCCAsugAwIBAgIJAM107+XEFIGEMA0GCSqGSIb3DQEBBQUAMFQxMjAwBgNV
+						BAoUKUJyaXRpc2ggVW5pdmVyc2l0aWVzIEZpbG0gJiBWaWRlbyBDb3VuY2lsMR4w
+						HAYDVQQDExVjaHJvbmljbGUuYnVmdmMuYWMudWswHhcNMTExMTE4MTYxMzQzWhcN
+						MjExMTE1MTYxMzQzWjBUMTIwMAYDVQQKFClCcml0aXNoIFVuaXZlcnNpdGllcyBG
+						aWxtICYgVmlkZW8gQ291bmNpbDEeMBwGA1UEAxMVY2hyb25pY2xlLmJ1ZnZjLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2+i+j9/++dpFcBX7
+						BaQ/M4OWQaJgutSft+Dodcrd5hFSg9nT5BznoIB0Ip/CEXAs6k/RbMlfFRNwgMQe
+						6X0fp8hjukr75WI4LiQBCp54axkuLW9ScUYl54xVoQ0QUzX+hZcYOKaY47BomBEN
+						8yzi/VjuunSxLrxSiHcRrp0i6RCaCo1uqLFK3jAFFgwJfme9jrzYcUTFCUkgpj9I
+						l67x4ufNkXjorsZ13f9JGTTVSCAYAaRRmqBleIULL2Wu2eDPTkqtIwoWJEHXw3BZ
+						4WX57ezURxYihU1M1ng4+HuQxQ20wvRUV/LlYVueWzABD1njy/PVYBHT9Iwi+qcK
+						4MCNAQIDAQABo4G3MIG0MB0GA1UdDgQWBBTVz59823vubr6Y9SOcECInWbD9tTCB
+						hAYDVR0jBH0we4AU1c+ffNt77m6+mPUjnBAiJ1mw/bWhWKRWMFQxMjAwBgNVBAoU
+						KUJyaXRpc2ggVW5pdmVyc2l0aWVzIEZpbG0gJiBWaWRlbyBDb3VuY2lsMR4wHAYD
+						VQQDExVjaHJvbmljbGUuYnVmdmMuYWMudWuCCQDNdO/lxBSBhDAMBgNVHRMEBTAD
+						AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDI0BREsN8bUqLFwYW8BPT4/E2WxOLIBuAt
+						wCdrGl2ehvsDGvyZS6eR4cXwA5joqCuHeDTBbCRlRwQ82P39i40Dy25l9SX1oGis
+						KheHJLIs45pJNwgRhJgsmL664bTMjGiachvElN7hSuyT3Lv0hIKk4T4hR6AHJ5X1
+						92/K0eWh1AqFPSajm/gEgASXulVnHVor5UH7O6bnTtedOwd+ymmlhyix6v83vx9J
+						DrM3GM749leO2w6NozsLMmcdbKaPwCvxlO+QGFrd3dFSa9e+cuhEvxUidsIK50FB
+						nexvkcwJaLImd7L56nkUt3AyXT+47jRHShQVLOJlYIFOehasKWwl
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://chronicle.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://chronicle.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://chronicle.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://chronicle.bufvc.ac.uk/oa/auth/rcv/saml2/art" index="4"/>
+  </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: Chronicle - BBC NI's TV News from the 60s and 70s</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://bufvc.ac.uk/aboutus/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>CIS Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:support@cambridgeimaging.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>CIS Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:support@cambridgeimaging.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml b/swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml
index ce1d630c..701f86f7 100644
--- a/swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml
@@ -1,24 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://clarin.ids-mannheim.de/shibboleth">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<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://clarin.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-10-24T13:14: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" 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>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Institute for the German Language (IDS) - CLARIN services</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Institute for the German Language (IDS) - CLARIN services</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative</mdui:Description>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS) - CLARIN Dienste</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institut für Deutsche Sprache (IDS) - CLARIN services</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Verschiedene Dienste des Institut für Deutsche Sprache (IDS) im Rahmen der CLARIN-Initiative.</mdui:Description>
+        <mdui:Description xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative.</mdui:Description>
+        <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:PrivacyStatementURL xml:lang="fi">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://clarin.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>clarin.ids-mannheim.de</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=aai@ids-mannheim.de,CN=clarin.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
           <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGHGxHhl3eDANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UE
 BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFu
 bmhlaW0xJzAlBgNVBAoTHkluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNoZTEV
@@ -51,44 +61,49 @@ ABUoJ1obWyY9SigpZd9CB/VoXuLVlNumJhdE8pblkmiuQoPMjANXqSJxXTc3VoaM
 Hgk+0Pprizij1Ay8rR6gS02YjZqh0AFcxfRtgf0WDJpU73m0WLdinZ2/9WEF4HeX
 4kZ8oRe3FrE90Nk79pA+/ghhQWJey5ryo2+RZY/ST5PIhyNVonJxN24nHttUmC+x
 nEIJAu56xR9tXHpXpZbsdp6tGG7Q1lkVH3o/8UNzCtWDcSN1p9zjFU11jO79bgJo
-VElur4XCJuT+L7n7C+jsguSkQEbspfoJ7w0a5ADsE/Hqi20yLQtPgB6VuWfo</ds:X509Certificate>
+VElur4XCJuT+L7n7C+jsguSkQEbspfoJ7w0a5ADsE/Hqi20yLQtPgB6VuWfo
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/POST"/>
-    <md:NameIDFormat>urn:oasis:names: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://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Institute for the German Language (IDS) - CLARIN services</md:ServiceName>
-      <md:ServiceName xml:lang="en">Institute for the German Language (IDS) - CLARIN services</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Institut für Deutsche Sprache (IDS) - CLARIN Dienste</md:ServiceName>
+      <md:ServiceName xml:lang="en">Institut für Deutsche Sprache (IDS) - CLARIN services</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Verschiedene Dienste des Institut für Deutsche Sprache (IDS) im Rahmen der CLARIN-Initiative.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) 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="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="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="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="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="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>
diff --git a/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml b/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
new file mode 100644
index 00000000..48e3ebac
--- /dev/null
+++ b/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
@@ -0,0 +1,119 @@
+<?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://clarin.oeaw.ac.at/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2014-01-23T16: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://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#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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">CLARIN Centre Vienna</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CLARIN Centre Vienna</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Ein Repositorium für Archivieren und Publizieren von Sprachressourcen und Technologien und andere Dienste für digitale Geisteswissenschaften.</mdui:Description>
+        <mdui:Description xml:lang="en">A repository for depositing and publishing of language resources and technology and other infrastructure services for digital humanities.</mdui:Description>
+        <mdui:InformationURL xml:lang="de">https://clarin.oeaw.ac.at/ccv/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://clarin.oeaw.ac.at/ccv/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAI3rKBVKUcUJMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+BAMTFWNsYXJpbi5hcnoub2Vhdy5hYy5hdDAeFw0xNDAxMjAxNDU3MThaFw0yNDAx
+MTgxNDU3MThaMCAxHjAcBgNVBAMTFWNsYXJpbi5hcnoub2Vhdy5hYy5hdDCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMJ8B6WyydvbvIHJ1Cb34h8838G5
+JItPpmJC+D/K+6MI3YiydVKKlhaGh/GqcWcz0Qw30W7WYilUZ5IkzZA12QY1CF1g
+cJPNUmYibzP3sAZ9KrvaCEMxlseoldh0yc+8Q8eplQH9id4u5G+J8SvTBejt261y
+ATb6pIANsRQkOLMvxtq7/NrEnAmZQOM5obsshHxLlXlJ0qixakaYXWKCIuUUOEFY
+FT13vhWrUC4BWW0OGimoR1cBnyEJtS9kRNWQ85+03VVVvLk9AssoHWxOJVJ7HE1m
+5/xgMrmpOv1vbqDKDljrY19zheNOoFr3RdaSCb1Eh8lWCNigUgOwK8Mm7VECAwEA
+AaNDMEEwIAYDVR0RBBkwF4IVY2xhcmluLmFyei5vZWF3LmFjLmF0MB0GA1UdDgQW
+BBQ6IH3aND4GFYEEgrR0IKf/d4QEcDANBgkqhkiG9w0BAQUFAAOCAQEAhdcxQ+7/
+1WYPCTVz2HOk8J3eM3ZJylGdTnfgNDDGkBo0CGmyiulX8m+nimBKh7UNMkRkU8cH
+NUldSGR70wi0iQlx7t868V5pmkqxnaDu4+lo1QU59s5c7MRJXZ6OcbKB57O/d5l+
++kX3/YW9WAQkmwcyVWDbcmk4DZK5kqqTk+u3fS48cLqai5YVcj8pDDoUx6/ZkwDv
+Yqvva2v4+vhzX9SW3QyiChOgFo9sP/UD1U8JAZG0sds5ugwjwiXPPB41hwHdbdEj
+QZRW2NR0HHMFp0FZeSziXOeaap21wc/W1Nk7wpRI7jYdzLRJHmzhvWz95p0WSnt+
+rI8v6OTvibpLrg==
+</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://clarin.oeaw.ac.at/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">CLARIN Centre Vienna / Language Resources Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Ein Repositorium für Archivieren und Publizieren von Sprachressourcen und Technologien und andere Dienste für digitale Geisteswissenschaften.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">A repository for depositing and publishing of language resources and technology and other infrastructure services for digital humanities.</md:ServiceDescription>
+      <md:RequestedAttribute isRequired="true" 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 isRequired="false" FriendlyName="eduPersonPrincipalName" Name="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 isRequired="false" 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 isRequired="false" 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 isRequired="false" FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute isRequired="false" FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute isRequired="false" 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="de">Institut für Corpuslinguistik und Texttechnologie, Österreichische Akademie der Wissenschaften</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Institute for Corpus Linguistics und Text Technology, Austrian Academy of Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Institut für Corpuslinguistik und Texttechnologie</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Institute for Corpus Linguistics und Text Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oeaw.ac.at/icltt</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matej</md:GivenName>
+    <md:SurName>Durco</md:SurName>
+    <md:EmailAddress>matej.durco@oeaw.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Karlheinz</md:GivenName>
+    <md:SurName>Mörth</md:SurName>
+    <md:EmailAddress>karlheinz.moerth@oeaw.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ICLTT-tech</md:GivenName>
+    <md:SurName>Office</md:SurName>
+    <md:EmailAddress>icltt-tech@oeaw.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Akademie-Rechenzentrum</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>helpdesk@oeaw.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml b/swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml
new file mode 100644
index 00000000..1879a97b
--- /dev/null
+++ b/swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml
@@ -0,0 +1,91 @@
+<?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://clarin.phonetik.uni-muenchen.de">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-09-25T14:34: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>
+  </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.phonetik.uni-muenchen.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Bayerisches Archiv für Sprachsignale</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Bavarian Archive for Speech Signals</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Ein Repository von phonetischen Daten (Signale und Annotation/Segmentierungen) und verschiedene Webservices die diese Daten verarbeiten, bereitgestellt vom Bayerischen Archiv für Sprachsignale (BAS)</mdui:Description>
+        <mdui:Description xml:lang="en">A repository for data of phonetic data (signals and annotations/segmentations) and several services processing this data provided by the Bavarian Archive of Speech Signals (BAS)</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>clarin.phonetik.uni-muenchen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=clarin.phonetik.uni-muenchen.de,OU=Institut fuer Phonetik und Sprachverarbeitung,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGPTCCBSWgAwIBAgIHGN7gvIyUTjANBgkqhkiG9w0BAQsFADCBkDELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNV
+BAoTKEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzAN
+BgNVBAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xNTAx
+MjEwODI4MjhaFw0xNzAxMjEwMTAwMDBaMIHGMQswCQYDVQQGEwJERTEPMA0GA1UE
+CBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1h
+eGltaWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjE2MDQGA1UECxMtSW5zdGl0
+dXQgZnVlciBQaG9uZXRpayB1bmQgU3ByYWNodmVyYXJiZWl0dW5nMSgwJgYDVQQD
+Ex9jbGFyaW4ucGhvbmV0aWsudW5pLW11ZW5jaGVuLmRlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA6QUaqBRImG9Ayv8iBOiI1xkraHz2G5gNJ4GlMvx8
+iz6KQiVjU4PBQoJICEd1ZufLTYzFEw24yt4X4n5iUw4n3YC3/N+9yuEBpVPfgZqd
+J6KioL8X+aYMQI1qTBnKNQjlX/Jknur8P/jgsf06m+VU+hASX2OEJyzDkodF92Qh
+7V1TYicBwR7CWUq3iulyDjTV8foEjRkhYW9uKcGG6p9Gq0m9nk3HZf4JmWElJiwd
+p4FihwbzBUCJPaZ/L3gWl6yciP9x//23p0xwLDwgTqdQhxVMV3UnDVyRdrv7VONA
+Dc3gitorzt2IB7kXN2FLliSxB8L5+7gEo1OiFs5pFBqaywIDAQABo4ICYjCCAl4w
+TwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMB
+MA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNV
+HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
+BBTTo7l69ETUjD1MWAr0HmitNzMhvDAfBgNVHSMEGDAWgBR5h3hqL/qbvCNPlKaj
+dx0eDpSADzAqBgNVHREEIzAhgh9jbGFyaW4ucGhvbmV0aWsudW5pLW11ZW5jaGVu
+LmRlMIGLBgNVHR8EgYMwgYAwPqA8oDqGOGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+dW5pLW11ZW5jaGVuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD6gPKA6hjhodHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIvY3JsL2NhY3JsLmNy
+bDCB2QYIKwYBBQUHAQEEgcwwgckwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBj
+YS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBIBggrBgEFBQcwAoY8aHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS91bmktbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQu
+Y3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tdWVu
+Y2hlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEB
+AKoC3dDgzEfD2H7RuDvIW8pvPONXPkmhVg0oMReDbeFw5BJ2bxUQpNDzxvcUmVLh
+QLoWazb9Tb+Xqo47GQrqzdc9pUX0HDDIi/U8gMn+LVrnWVx/Nuhq5G0+zWsEnnS7
+kxTfM5w8IfUOK8tOo6JF7lDe1Y8d9LtMhAadjvfh3XKg3xYMnXoj8HGux6Fpfd2H
+7bXhWeSUsZwoyvkrpBSk29DD8YZHb9gEDBYT+0F7fWuAmKOMfKWbr/1KYC4Ml0af
+XaIzi4rLf+cstPUOYYP5DzKfCf6eZ2DEimz2Y62KXIXftNEGeQ8ELZSARlqvHc/m
+cdriseFaC9wD+9FMZhAznUg=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <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>Thomas</md:GivenName>
+    <md:SurName>Kisler</md:SurName>
+    <md:EmailAddress>mailto:kisler@phonetik.uni-muenchen.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Klaus</md:GivenName>
+    <md:SurName>Jänsch</md:SurName>
+    <md:EmailAddress>mailto:klausj@phonetik.uni-muenchen.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clarino.uib.no-.xml b/swamid-interfederations-2.0/clarino.uib.no-.xml
new file mode 100644
index 00000000..1390afc4
--- /dev/null
+++ b/swamid-interfederations-2.0/clarino.uib.no-.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarino.uib.no/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2013-08-20T06:55:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Clarino, UiB</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">Clarino, UiB</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Norwegian research infrastructure for language data and services, linked to the European CLARIN initiative.</mdui:Description>
+        <mdui:Description xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til det europeiske CLARIN-initiativet.</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>MIIEdzCCA1+gAwIBAgIQCA4E94tJ3rEzJC1noMhpNzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDUwODAwMDAwMFoXDTE2MDUwNzIzNTk1OVowPDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5jbGFyaW5vLnVpYi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQNT7Lca7R0tFZmm4Fes8xdGlJrbxiuA/A1e/dMXaHm/C65zZ2ZFbUXnIe+bq+9AlJPO1gr7vyMaiXDsEYGlBBL/oNeroJfv+DAInweaOkatmOGMCBDAmCY76M89Vshk0qDNTEbZwc15frhNGCJTUiHSToCFtvwDI4/0dbsUwNfCML0jRvi2QFnrgXh0QxTTNfcFdh72uL2WChsbteCE2P4/T1H5yL1P3YJvpDX0iAMszaG+ZntYmATVMm91ivcE6mRCDI+qcHJdDWdy2E8NOBNCr8aQle2P6txXC9w5hzoE49Bw0oAF49EHx3MroBEA47ECGbOJ0Hpb8RpiXnX6ECAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR5vbqCMC3rno6VxasCvrYHZy/fkDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIOY2xhcmluby51aWIubm+CDGluZXNzLnVpYi5ubzANBgkqhkiG9w0BAQUFAAOCAQEAOjOxk+g90GHRP56AovDdtglU77Xx9Cd7Xx5hvbGMQRVFshLn4YXpbi4UFnGru0A+k0Cy+7tfQ4i82ITL3f0epz9N5JB820waQRPTT55gk0iSAOSO5MhKeE6e+gf8RlDwF/p2y3RmalvxY/D+G6NKcwwbTe60Qd0b3DGOyN710RHzBLwtbIF3JmFw1M6m6w4Z433+XY/KiGMwpEGIw1J7I6XV1QeB7L7gZLFe+cry47IAqstheKHR0iUyR3+YgTVgS6pszAlhl46YYthpqSUiN0vpKB7EzRhPjli9gmQycjHS4iXBKe2aeFPsV5Cd7njw2oa9cmxMysqK+zjWJ4F1vQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEdzCCA1+gAwIBAgIQCA4E94tJ3rEzJC1noMhpNzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDUwODAwMDAwMFoXDTE2MDUwNzIzNTk1OVowPDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5jbGFyaW5vLnVpYi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQNT7Lca7R0tFZmm4Fes8xdGlJrbxiuA/A1e/dMXaHm/C65zZ2ZFbUXnIe+bq+9AlJPO1gr7vyMaiXDsEYGlBBL/oNeroJfv+DAInweaOkatmOGMCBDAmCY76M89Vshk0qDNTEbZwc15frhNGCJTUiHSToCFtvwDI4/0dbsUwNfCML0jRvi2QFnrgXh0QxTTNfcFdh72uL2WChsbteCE2P4/T1H5yL1P3YJvpDX0iAMszaG+ZntYmATVMm91ivcE6mRCDI+qcHJdDWdy2E8NOBNCr8aQle2P6txXC9w5hzoE49Bw0oAF49EHx3MroBEA47ECGbOJ0Hpb8RpiXnX6ECAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR5vbqCMC3rno6VxasCvrYHZy/fkDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIOY2xhcmluby51aWIubm+CDGluZXNzLnVpYi5ubzANBgkqhkiG9w0BAQUFAAOCAQEAOjOxk+g90GHRP56AovDdtglU77Xx9Cd7Xx5hvbGMQRVFshLn4YXpbi4UFnGru0A+k0Cy+7tfQ4i82ITL3f0epz9N5JB820waQRPTT55gk0iSAOSO5MhKeE6e+gf8RlDwF/p2y3RmalvxY/D+G6NKcwwbTe60Qd0b3DGOyN710RHzBLwtbIF3JmFw1M6m6w4Z433+XY/KiGMwpEGIw1J7I6XV1QeB7L7gZLFe+cry47IAqstheKHR0iUyR3+YgTVgS6pszAlhl46YYthpqSUiN0vpKB7EzRhPjli9gmQycjHS4iXBKe2aeFPsV5Cd7njw2oa9cmxMysqK+zjWJ4F1vQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarino.uib.no/feide/single-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://clarino.uib.no/feide/assertion-consumer" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Clarino, UiB</md:ServiceName>
+      <md:ServiceName xml:lang="no">Clarino, UiB</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Norwegian research infrastructure for language data and services, linked to the European CLARIN initiative.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til det europeiske CLARIN-initiativet.</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.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement" 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: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: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 Bergen</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">Universitetet i Bergen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bergen</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">Universitetet i Bergen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uib.no/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.uib.no/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Meurer</md:SurName>
+    <md:EmailAddress>paul.meurer@uni.no</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/classes.myplace.strath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/classes.myplace.strath.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..8d8470d6
--- /dev/null
+++ b/swamid-interfederations-2.0/classes.myplace.strath.ac.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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://classes.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="2013-12-02T18:00: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://classes.myplace.strath.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://classes.myplace.strath.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://classes.myplace.strath.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>
+						MIIDDDCCAfSgAwIBAgIJAK2qxPW88eF2MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF3Npbmdlci5taXMuc3RyYXRoLmFjLnVrMB4XDTEyMTIwNjExNTQxNloXDTE1
+						MTIwNjExNTQxNlowIjEgMB4GA1UEAxMXc2luZ2VyLm1pcy5zdHJhdGguYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVkAcwC1oEymS5IsPvpjnv
+						96EalU7kWFffdyBW2TYL4UmfQ5t6VRBG2nW1bXQvh+Lp94iL3Kt6w5ouOeLKg4bG
+						nXJn8DF5aKO7AG4unBo1xP+32E4f3lbGbmmg9a/zdYXeSCtLpIWzKT63yQQJpCYq
+						h1we1V/UIdkt+91Q80Y9qHp3Yd+7k3kktmKcjMInXntK5bWCRjXfFmrSBVo9L3sd
+						mMtQd5RHYsxTa2DILvw9+7YxWFc+C/H83JYlpuPCQlveQxk683vYZrAGpu3ipTI1
+						QMnAeVrsvJaNyQ3prfb3jfCHHUS5owqAFNGbSZadocb60OYrPvR0w5KD9sienZxL
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3Npbmdlci5taXMuc3RyYXRoLmFjLnVrMB0G
+						A1UdDgQWBBSr6cfR7cxfKoUkqQbi9xAs7hljFjANBgkqhkiG9w0BAQUFAAOCAQEA
+						ezHoDWRl7sw+QYrdldktqZQ7PrwGd6eOdfTeEwMR3q4ZvRmchnfU0t98jTI6n6Si
+						CoLCsyAhXlFEHSLXmdJWov8KYZ564vWb+oN0LnYthjqEO+8Z4DrWyDIkPyxWandl
+						XjxibAu/7RwLmlrzcx/ovaq7pvf9oZsLS8pP3YO4jKcev+650lTEJLXPkBzE4GhC
+						WxKdAhVgOZILdYta1Qs5b1y7cfQmO2y1ZhYMfwovKFa59bETKUCcOOVJ+BgFNHIX
+						YXiJDYJDXgeCdVWP0hr0LcOhskGfHrWAfef+FE6l5KFcfjxGlGbInQ8rxAoA+n1N
+						MEgiyk73ccbgt2MP/StXTg==
+					</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://classes.myplace.strath.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://classes.myplace.strath.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://classes.myplace.strath.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://classes.myplace.strath.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://classes.myplace.strath.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://classes.myplace.strath.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://classes.myplace.strath.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://classes.myplace.strath.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://classes.myplace.strath.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://classes.myplace.strath.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://classes.myplace.strath.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://classes.myplace.strath.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://classes.myplace.strath.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://classes.myplace.strath.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://classes.myplace.strath.ac.uk/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">University of Strathclyde Myplace</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/clc2.uniservity.com-shibboleth-sp.xml b/swamid-interfederations-2.0/clc2.uniservity.com-shibboleth-sp.xml
new file mode 100644
index 00000000..56f83f5a
--- /dev/null
+++ b/swamid-interfederations-2.0/clc2.uniservity.com-shibboleth-sp.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clc2.uniservity.com/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-05T13:26: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>
+						MIIDADCCAeigAwIBAgIJALqRFj7sKRi6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE2NsYzIudW5pc2Vydml0eS5jb20wHhcNMTAwODExMDcxNjQ0WhcNMjAwODA4
+						MDcxNjQ0WjAeMRwwGgYDVQQDExNjbGMyLnVuaXNlcnZpdHkuY29tMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7YzFYLLYggaCAIQfIurkw4BAY5iZsnqy
+						jFh/WXx28e3aYEGAm4bGoCIlZGYCz/g+fe2rFtRQWexeotbYyuQbujOF5Qbo5kbj
+						p+z1CuS39z0Y7kNBfwTjZ1k3KdA/EWed2fn2YcbyCrFppSfRDpMknC5Y61RwELYQ
+						02Bgdcoseyu1djWmN1eWIT0gnhcWK8GCd8+LrCq/27aTIeWX72NLPgavcufZQFhw
+						/lWAg+DP2tZFawBRwFY312l8xV2sWfRaRqDcknQNpkjgjKszWF91vEGGyg9lgjzq
+						+mVdMQ/07Iq/IXCiRZbg77kFlatiQRvyqUnh82ZBDg5B06qS2vwaQwIDAQABo0Ew
+						PzAeBgNVHREEFzAVghNjbGMyLnVuaXNlcnZpdHkuY29tMB0GA1UdDgQWBBS/dypG
+						zWKUa4YM5CYBqsxyNjGskDANBgkqhkiG9w0BAQUFAAOCAQEAU+nzkSWexr3vIEUA
+						zKOIxm9DbJMN6UhHDJbTmAK+JK/tUGQFneXWbdKN8PZJavvAktKWIayCLylk7NW8
+						M+XjI59aDQtZS6ny1p0sDp2vVqxcxDERg8Gz4iC0SaPSf7rkPM7US38pHIVv+G4V
+						x+A2ZrLj+M59HmN2VPY1l5FioWX6PNyOONqYwf1VJNu7HuORDjZ6aO/+vKqc0T0T
+						QQY6mVVXxS+/ggHz77z1CB6sxT5pNg7znlbuACPih4XKDiqrLcBnqccCKwDaAzA8
+						DV5vMzE7zGxO7lsrTdurjVHR3HyV957q8MidZo3u3xUOUihAMoNdterpWI/0aqoi
+						hyDqDQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDADCCAeigAwIBAgIJALqRFj7sKRi6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE2NsYzIudW5pc2Vydml0eS5jb20wHhcNMTAwODExMDcxNjQ0WhcNMjAwODA4
+						MDcxNjQ0WjAeMRwwGgYDVQQDExNjbGMyLnVuaXNlcnZpdHkuY29tMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7YzFYLLYggaCAIQfIurkw4BAY5iZsnqy
+						jFh/WXx28e3aYEGAm4bGoCIlZGYCz/g+fe2rFtRQWexeotbYyuQbujOF5Qbo5kbj
+						p+z1CuS39z0Y7kNBfwTjZ1k3KdA/EWed2fn2YcbyCrFppSfRDpMknC5Y61RwELYQ
+						02Bgdcoseyu1djWmN1eWIT0gnhcWK8GCd8+LrCq/27aTIeWX72NLPgavcufZQFhw
+						/lWAg+DP2tZFawBRwFY312l8xV2sWfRaRqDcknQNpkjgjKszWF91vEGGyg9lgjzq
+						+mVdMQ/07Iq/IXCiRZbg77kFlatiQRvyqUnh82ZBDg5B06qS2vwaQwIDAQABo0Ew
+						PzAeBgNVHREEFzAVghNjbGMyLnVuaXNlcnZpdHkuY29tMB0GA1UdDgQWBBS/dypG
+						zWKUa4YM5CYBqsxyNjGskDANBgkqhkiG9w0BAQUFAAOCAQEAU+nzkSWexr3vIEUA
+						zKOIxm9DbJMN6UhHDJbTmAK+JK/tUGQFneXWbdKN8PZJavvAktKWIayCLylk7NW8
+						M+XjI59aDQtZS6ny1p0sDp2vVqxcxDERg8Gz4iC0SaPSf7rkPM7US38pHIVv+G4V
+						x+A2ZrLj+M59HmN2VPY1l5FioWX6PNyOONqYwf1VJNu7HuORDjZ6aO/+vKqc0T0T
+						QQY6mVVXxS+/ggHz77z1CB6sxT5pNg7znlbuACPih4XKDiqrLcBnqccCKwDaAzA8
+						DV5vMzE7zGxO7lsrTdurjVHR3HyV957q8MidZo3u3xUOUihAMoNdterpWI/0aqoi
+						hyDqDQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clc2.uniservity.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clc2.uniservity.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clc2.uniservity.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clc2.uniservity.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clc2.uniservity.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clc2.uniservity.com/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: 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>John</md:GivenName>
+    <md:SurName>Burns</md:SurName>
+    <md:EmailAddress>mailto:john.burns@uniservity.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cloudstandards.cesnet.cz-sp-shibboleth.xml b/swamid-interfederations-2.0/cloudstandards.cesnet.cz-sp-shibboleth.xml
new file mode 100644
index 00000000..5110e92e
--- /dev/null
+++ b/swamid-interfederations-2.0/cloudstandards.cesnet.cz-sp-shibboleth.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cloudstandards.cesnet.cz/sp/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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"/>
+    <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-29T11:27: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/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>
+      <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://cloudstandards.cesnet.cz/Shibboleth.sso/Login"/>
+      <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://cloudstandards.cesnet.cz/Shibboleth.sso/Login"/>
+      <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://cloudstandards.cesnet.cz/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/DS" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/DSEG"/>
+      <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://cloudstandards.cesnet.cz/Shibboleth.sso/DSEG" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>staff-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=staff-sp</ds:X509SubjectName>
+          <ds:X509Certificate>MIICojCCAYoCCQDl+ffNPW8XLTANBgkqhkiG9w0BAQUFADATMREwDwYDVQQDEwhz
+dGFmZi1zcDAeFw0xMTA1MzExNTEyMDFaFw0yMTA2MDExNTEyMDFaMBMxETAPBgNV
+BAMTCHN0YWZmLXNwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArw2P
+fWdRZqiAvzuhmPl/ZNOTsN3Pvp/bsAWtEMfZDNcd7KAbeBuVsiprbX16tdiJYTgD
+0VqxCnzfYqt3FVHi4zKN4nUJEYG2q78Nz+iMdsbF8w4KzljL7VMv1hR3K9C2dPBj
+feZ0mupBlxpk6VcVoHmcVWVP5pN7bTK1uGak0Qx15aJoT6WvhmKwIUB/aAlTn+bQ
+j901evtXa02r/dUHEADEA8ZmhWyxmr8yN8Nol/orwqODKcP269mO8XfTegIZeVYQ
+qj/4S+AhDkXxapJcZXFdlh9elIsQYICRxvEA51Dy8guFoVNNAqpoLj89Fer1R/P3
+xz38pBg6pUW11iVWvwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAGfoWQpL9YnlGk
+yeKreOtzpaPNL6UeHPaw/fpTP5RJFlJtxvHmVwDMsRtx+jWpEXaxtCdIrYil8FJL
+68M26xrXtHWSiTovlqMkLZZw4Xwjd2jAeuYVrS84z3c3PCDylafQNddkLJoP3k+y
+v7MEHao5A1SEqRi7CJoeEjTQYV95fsjccLgrjQZWlyC9JauC0+TTbLt3VeASOqaW
+EG3oNAFsAT2ZTYrBpcc1SilLhSV9AtkoYk+g5Ek72S4mCdAb5PColu5krxYZ7gz6
+N02qjxZaJg7RvbagR5qJHKKMuXhYoh87YBC5eheBYdTc4LVIsz74sF6xrcgytZRL
+JcBgGx9A
+</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://cloudstandards.cesnet.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">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>Vladimir</md:GivenName>
+    <md:SurName>Trestik</md:SurName>
+    <md:EmailAddress>Vladimir.Trestik@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..0bc612b9
--- /dev/null
+++ b/swamid-interfederations-2.0/collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,84 @@
+<?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://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:43: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://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">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>
+						MIIDGDCCAgCgAwIBAgIJALy03M7u1gVPMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG2xhYy1yZXBvLWxpdmUxMS5pcy5lZC5hYy51azAeFw0xNDA4MTExNjE2MDVa
+						Fw0yNDA4MDgxNjE2MDVaMCYxJDAiBgNVBAMTG2xhYy1yZXBvLWxpdmUxMS5pcy5l
+						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALxmqAyAZJll
+						NsHWH/yK4hSEiqk/Ln1dF9FktB5rzP7FaUWIYL/Q9Igqr8UDqRBi+KTTFePHhi8k
+						H3E8Yh473ej0a1d2s2DtMIzVNjXMMaQxEksZGADtPp00L6SrvYZAtb5gIT71nATb
+						SIaoZWH2hyO9Ods6zhwU6uv4xogyHiL1Kmxz9jecJ/xIwXmn2twFgrLpRtjrHhzl
+						XYrDlSRX49rVsB4Ey8dBPGTgkfbJbk4ZkxFnKMOw9Lw0GBoVWtY7Vn9RPWbISPD/
+						+4y3CTwJbnljeJpZey0KTrOkHXQ8GqRBswEYJCHWBVrH6cmgdnGnciDnN1TttSOF
+						JM9XR+AgFfMCAwEAAaNJMEcwJgYDVR0RBB8wHYIbbGFjLXJlcG8tbGl2ZTExLmlz
+						LmVkLmFjLnVrMB0GA1UdDgQWBBQ1Ofx7Y4foN2eFktuJ0I1n+WcNJzANBgkqhkiG
+						9w0BAQUFAAOCAQEAjuI/UTy4EX8iQHPxVWxioob3+ORavEe+FX3sAEsfPeTNaFt2
+						bf1iFA90DwZBDLPAhUgGiMegR/qb6Uh+m7y4GznSK3esxyjssxuDSPpO2yipw2Pb
+						5M0dhW7gGi6CK0jWi/91WMNytDCW4RbTGDEXLBGO344Mhmbu163V0a656/Gub1hz
+						XlShSl3z0t8E32ipwG2X9d8JTAaqHtcdW001sfyAibFQh2y8a7ozLCQHmSXUcFde
+						NOR1PCznRoAlRPp4Wd8nBVPDNbHIzHT7QkYmx3iKPYKZXRMR7icUh6vyzUxskdjr
+						p1m+/fC5uLdMuu57gH/cV696hZae6vVbcI2R2g==
+					</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://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://collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://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://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://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://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://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://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</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/colreg.de.dariah.eu-colreg.xml b/swamid-interfederations-2.0/colreg.de.dariah.eu-colreg.xml
new file mode 100644
index 00000000..14850e25
--- /dev/null
+++ b/swamid-interfederations-2.0/colreg.de.dariah.eu-colreg.xml
@@ -0,0 +1,143 @@
+<?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://colreg.de.dariah.eu/colreg">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-01-12T10:39:23Z">
+      <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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://colreg.de.dariah.eu:443/colreg/saml/login/alias/colreg.de.dariah.eu" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Collection Registry</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Collection Registry</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Collection Registry</mdui:Description>
+        <mdui:Description xml:lang="en">Collection 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>colreg.de.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=colreg.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHFwXXzebkpDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAxMjcxMzA4MTRaFw0xOTAxMjYx
+MzA4MTRaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNjb2xyZWcuZGUuZGFyaWFoLmV1
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApXYpUGfB4grgZ+pP1qQR
+JKoSxfMrmmlt3F6gJuoe8vaun+GDn0j3AOhviZ+/HiasTMQv1VJ9/Zvc8rJEp/Sm
+9cYq15OoZo9LNC+kQsJo5jNpyljERgZniMN3NylNPUBiK9YPSt/oApycg1teAwif
+P0D85gmX5LtZPN4NKUa9ofEIjZARnOgNuS9uvWUiMYLRc+MUeXsbMlcijHs4rNwh
+PjQD4T1q/zX9rwcqqoqRfJQLsSRHjCXL8gFqcoA15ggis6gU1EZqm1mk7Ajb0Bpw
+tnJnfhRN/7n2CPthDUThf4lHcR84G4kchRwa/rT2RuydzW3fxTeNm9VbIqLPRrWZ
+2QIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
+KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFHEEs1fV
+g2shQl4/1DvRorTIy4bRMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
+MB4GA1UdEQQXMBWCE2NvbHJlZy5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
+oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
+dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
+gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
+ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQArMbCKkxkHsDeW
+C9CIVjoHqiYBNssKRbj1PECib/UkUsKYlKAyYl1UZ+BnZsyyVzXyKxXjkVgxIShX
+8ejR+rX2TAzweW5eJ9fUU+556HTTz2dLcSkv4uX5aVbd349F/3tavsyeaH8HTpiv
+8rA27qnqAih/4vbHV7WksLaLlqeCWskk8bh83NhpwEvMawuFH6CSRdJ+Ci04utIg
+NUFnuv92ZKKPuVTZNLN24s3fOiD9zotzRbDZ9p1yRVhFgCk+WK3HCMRLN0Oz60F+
+H7llf2BUo5B61cwTXmpYDfXTCTPO6x/L5lp6vnbRdeQWDVcDVXuNh4QNSzBoxAPg
+n+48kUsN
+</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>colreg.de.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=colreg.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHFwXXzebkpDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAxMjcxMzA4MTRaFw0xOTAxMjYx
+MzA4MTRaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNjb2xyZWcuZGUuZGFyaWFoLmV1
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApXYpUGfB4grgZ+pP1qQR
+JKoSxfMrmmlt3F6gJuoe8vaun+GDn0j3AOhviZ+/HiasTMQv1VJ9/Zvc8rJEp/Sm
+9cYq15OoZo9LNC+kQsJo5jNpyljERgZniMN3NylNPUBiK9YPSt/oApycg1teAwif
+P0D85gmX5LtZPN4NKUa9ofEIjZARnOgNuS9uvWUiMYLRc+MUeXsbMlcijHs4rNwh
+PjQD4T1q/zX9rwcqqoqRfJQLsSRHjCXL8gFqcoA15ggis6gU1EZqm1mk7Ajb0Bpw
+tnJnfhRN/7n2CPthDUThf4lHcR84G4kchRwa/rT2RuydzW3fxTeNm9VbIqLPRrWZ
+2QIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
+KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFHEEs1fV
+g2shQl4/1DvRorTIy4bRMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
+MB4GA1UdEQQXMBWCE2NvbHJlZy5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
+oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
+dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
+gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
+ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQArMbCKkxkHsDeW
+C9CIVjoHqiYBNssKRbj1PECib/UkUsKYlKAyYl1UZ+BnZsyyVzXyKxXjkVgxIShX
+8ejR+rX2TAzweW5eJ9fUU+556HTTz2dLcSkv4uX5aVbd349F/3tavsyeaH8HTpiv
+8rA27qnqAih/4vbHV7WksLaLlqeCWskk8bh83NhpwEvMawuFH6CSRdJ+Ci04utIg
+NUFnuv92ZKKPuVTZNLN24s3fOiD9zotzRbDZ9p1yRVhFgCk+WK3HCMRLN0Oz60F+
+H7llf2BUo5B61cwTXmpYDfXTCTPO6x/L5lp6vnbRdeQWDVcDVXuNh4QNSzBoxAPg
+n+48kUsN
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://colreg.de.dariah.eu:443/colreg/saml/SingleLogout/alias/colreg.de.dariah.eu"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://colreg.de.dariah.eu:443/colreg/saml/SingleLogout/alias/colreg.de.dariah.eu"/>
+    <md:NameIDFormat>urn:oasis:names: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://colreg.de.dariah.eu:443/colreg/saml/SSO/alias/colreg.de.dariah.eu" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://colreg.de.dariah.eu:443/colreg/saml/SSO/alias/colreg.de.dariah.eu" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Collection Registry</md:ServiceName>
+      <md:ServiceName xml:lang="en">Collection Registry</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Collection Registry</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Collection 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/community.ja.net-shibboleth.xml b/swamid-interfederations-2.0/community.ja.net-shibboleth.xml
new file mode 100644
index 00000000..0ea8deae
--- /dev/null
+++ b/swamid-interfederations-2.0/community.ja.net-shibboleth.xml
@@ -0,0 +1,70 @@
+<?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://community.ja.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-14T17:37:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://community.ja.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://community.ja.net/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Janet Community</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The community driven, social business, support, and information website for Janet products and services.</mdui:Description>
+        <mdui:Logo height="227" width="500">https://community.ja.net/sites/all/themes/janetbootstrap/logo_500x227.png</mdui:Logo>
+        <mdui:Logo height="109" width="240">https://community.ja.net/sites/all/themes/janetbootstrap/logo_240x109.png</mdui:Logo>
+        <mdui:Logo height="45" width="100">https://community.ja.net/sites/all/themes/janetbootstrap/logo_100x45.png</mdui:Logo>
+        <mdui:Logo height="75" width="75">https://community.ja.net/sites/all/themes/janetbootstrap/logo_75x75.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC9zCCAd+gAwIBAgIJAK3QNCbDRJQ8MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEGNvbW11bml0eS5qYS5uZXQwHhcNMTIwMjEwMTEyMzUzWhcNMjIwMjA3MTEy
+						MzUzWjAbMRkwFwYDVQQDExBjb21tdW5pdHkuamEubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAw39KjoNd8jwDOrw9GjxK6BGgk6YqR9CRd0YVbtlp
+						Kfpai5oueTqApoBfwQYiGQWloLbtCk6GG6j8YRpvlwrlOjoOR0+gUvz0yp+q6igx
+						o6lgJU2zzWWrTbt+oT9BGhFyYUj2EMbLkX8VWzyebKr3kS8ioVZlLjQ3ZWJcHa8Z
+						Dx7EVFEb/w/tEeIZP5ytz4/j5OLUA2oJzEO2U07dMsVTkpKVdQwatG5REgPrbC6B
+						+/QZOoURlABAav3m0v4++spVgYbzVJSRbQ1v5sxwVSGuSS0JoY4YADG7mxMv2e69
+						PkThTkxO36boOpZe1NJxrwKJXHSg8UoroG2iW4Rz/7OWhQIDAQABoz4wPDAbBgNV
+						HREEFDASghBjb21tdW5pdHkuamEubmV0MB0GA1UdDgQWBBTMN93e5HUiaDJVqZ8F
+						9SsogJ0U9DANBgkqhkiG9w0BAQUFAAOCAQEAKTkm2So0rhPk13AB436H0YnSVC24
+						braQWHHqQQOFMrszM/2ThzPnsYQXqKmX9kgCBy7yfufZiLhkYMSU61lGSeWdhVo5
+						v3bVshCenq42mWNM5LE0B5VPCY8WeM9dx7r36FfQRdjXtr85rE3a1ZYNwuu9ZsCS
+						+YO2x3amxRkdmkfCs0hxwu0QOkAjL0fACG0i6fnEYcwWS8ZIawKxYLKe1ktyG5uq
+						PuhVktg4i0oQ8Uk2GlzgvAClfrZqNSi48BTWrKX4GA5zgEhf8HcBaBQhr5q6ONZi
+						0B+wkoo8xl+IxAjKKhkoQxl+Bl9d/rxHOgvMGe/C+83bJ204rfCMdLgGzA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://community.ja.net/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://community.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://community.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://community.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://community.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://community.ja.net/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://community.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://community.ja.net/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://community.ja.net/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://community.ja.net/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://community.ja.net/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">JISC Collections and Janet Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Janet Community</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ja.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Login Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:web-submit@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:web-submit@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/community.staging.company.ja.net-shibboleth.xml b/swamid-interfederations-2.0/community.staging.company.ja.net-shibboleth.xml
new file mode 100644
index 00000000..b0bcd828
--- /dev/null
+++ b/swamid-interfederations-2.0/community.staging.company.ja.net-shibboleth.xml
@@ -0,0 +1,76 @@
+<?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://community.staging.company.ja.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-25T19:22: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://community.staging.company.ja.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://community.staging.company.ja.net/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Janet Community (Staging)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The community driven, social business, support, and information website for Janet products and services.</mdui:Description>
+        <mdui:Logo height="95" width="191">https://community.staging.company.ja.net/sites/all/themes/janetcommunity/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>
+						MIIDXjCCAkagAwIBAgIJAOCcPdISR/MjMA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
+						BAMTIGNvbW11bml0eS5zdGFnaW5nLmNvbXBhbnkuamEubmV0MB4XDTEzMDEyNTEy
+						NTE0NFoXDTE2MDEyNTEyNTE0NFowKzEpMCcGA1UEAxMgY29tbXVuaXR5LnN0YWdp
+						bmcuY29tcGFueS5qYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDPWOgoD8BXAEbRvLeICCdeiSCtGd5TnC1m8hSMOa26LsKP0zjhV7HrQREdfmLD
+						htdce5T+2xBjw1zXNOiD1AjkL+2cjpHdvroHjBIKd+XK8IvuXbTFwHKlD+YT7YHg
+						vlUsgndFVGLTWgIWB4cqjP4nHjNSv4oICe9qD5IhfCy7P45mjHYRZLS59mvQsNNU
+						fmJ5Gtxh93Ga57AWBGhj/rAWbH+lLZCUHDJw91BJf2NYtptTmiMBAmCwVFWrS5kL
+						77cRQRVjxmONjSVrnoUQObyQoCcMfDFa4i1MfT3pVUeNKufvozw3Bo6l0dNL0LBO
+						g/qNDWjewq5XvYPAFJN4zbt5AgMBAAGjgYQwgYEwYAYDVR0RBFkwV4IgY29tbXVu
+						aXR5LnN0YWdpbmcuY29tcGFueS5qYS5uZXSGM2h0dHBzOi8vY29tbXVuaXR5LnN0
+						YWdpbmcuY29tcGFueS5qYS5uZXQvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdtp8pIFT
+						ajJQn9wN8qKR9MRwlsIwDQYJKoZIhvcNAQEFBQADggEBAKgsVmXIr5EqZIsJTflv
+						/NK04PSwJC3Y4+A4A1mgcrMQBelas1HQxfFwK/ohUb2UOv8yqF3AXspbenHJqFqc
+						v1ndoEkICjewUoTpILMXz08vcwOU/qOlvIEuwBq49dnjTXYKQkb15hSSk3Q2bZ6T
+						SYSe6/NIbtrfcWdmvXCd71QyhYiLaB/9woO1Yb4jDQ9Fq9PWQd5bzEI0XsBfjbYj
+						a004CGcStT94SAmze/FE7w+YZtTANfHC41dhgEH/fwW0SJn/7Lb1d5uOhRiNM1p/
+						hrDiSI6b0gOx0wzz8NReyhFMG4Rk23HGJSUUwsZ05AFPGJbwAShqnvbVLajVIRnB
+						igk=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://community.staging.company.ja.net/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://community.staging.company.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://community.staging.company.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://community.staging.company.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://community.staging.company.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://community.staging.company.ja.net/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://community.staging.company.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://community.staging.company.ja.net/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://community.staging.company.ja.net/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://community.staging.company.ja.net/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://community.staging.company.ja.net/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.staging.company.ja.net/Shibboleth.sso/SAML2/POST" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.staging.company.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.staging.company.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.staging.company.ja.net/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.staging.company.ja.net/Shibboleth.sso/SAML/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.staging.company.ja.net/Shibboleth.sso/SAML/Artifact" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">JISC Collections and Janet Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Janet Community (Staging)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ja.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Login Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:web-submit@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:web-submit@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/confluence.dev.ja.net-shibboleth.xml b/swamid-interfederations-2.0/confluence.dev.ja.net-shibboleth.xml
new file mode 100644
index 00000000..2a56d2b2
--- /dev/null
+++ b/swamid-interfederations-2.0/confluence.dev.ja.net-shibboleth.xml
@@ -0,0 +1,82 @@
+<?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://confluence.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#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata: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-13T11:47: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://confluence.dev.ja.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://confluence.dev.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>
+						MIIDBjCCAe6gAwIBAgIJAINQcR2x7+fRMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWNvbmZsdWVuY2UuZGV2LmphLm5ldDAeFw0xMzEyMDMxNTQzNTRaFw0yMzEy
+						MDExNTQzNTRaMCAxHjAcBgNVBAMTFWNvbmZsdWVuY2UuZGV2LmphLm5ldDCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALuE9eH0J8KmfHm5kpnCkYXI25zf
+						plGq11UYrM2UhqOAQzWpjFjZEQSM+xY34aYjBVnILWFIGCzZYfYrQv1Do+FT7OeW
+						zi1C+cA15ZmqjknRU3A+EXBxqgKTtP9qFy3Wmn2bVkAm1bUnYZt9hg9JmEYmKYvR
+						+hoi9C4GiglaQbEtqhbTsYqENIUXZqu+6hLBECQfhfl6dQ7C59xDlad3XUr2D50R
+						HhrDVTu7b4SjGvYweefPSwQ9biXcbzpd8WQrdw06T9HlW2sSRsdzLcYwPCz3qhXC
+						t1HtCH9HEkHwGPihYEzT9tqXLlG3nVNPxt82BA5qz1akeM1a34OO4GFToOcCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVY29uZmx1ZW5jZS5kZXYuamEubmV0MB0GA1UdDgQW
+						BBSced8sVIHOO5PAAdVpmW3zTiQKuTANBgkqhkiG9w0BAQUFAAOCAQEAhK9miAEJ
+						SFqALhzBvd9bDDE0e+SRQ3ULnf50XcNi0kY0Aqd0E0LMApIAZc9JbPWj43LDfe6w
+						SGY2Szd5pA5BTQKrE2kbEJe/7JyzsSV8zEQoFvt6jB40/bdN9TqEytgo7vcZqVLS
+						8SZHDlmiFqLglKqnX5WMpq8+DAhoCJVT3P5ppBlHb5dmay42fZTENCzSZbQUXjOh
+						YOgItmfF6JHKzHGB3UozP/AKrt9qNmuV0TT80Qottl6+IunUqJpzp9NIG0JkERAy
+						iWQsQero8JtO2JsNUB0HjPqASOEw2kbQE6Ya6yrkcxq12t3QQYNN8O9uRKOGuDek
+						DmVGRHSIMGcD+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://confluence.dev.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence.dev.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://confluence.dev.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence.dev.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.dev.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence.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://confluence.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://confluence.dev.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence.dev.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://confluence.dev.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://confluence.dev.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">JISC Collections and Janet Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Confluence test service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://confluence.dev.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/connect-beta.sunet.se-shibboleth.xml b/swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml
new file mode 100644
index 00000000..69293ddb
--- /dev/null
+++ b/swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect-beta.sunet.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" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <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>
+      <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://connect-beta.sunet.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://connect-beta.sunet.se/Shibboleth.sso/DS/ds.sunet.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://connect-beta.sunet.se/Shibboleth.sso/DS/kalmar2" 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://connect-beta.sunet.se/Shibboleth.sso/DS/nordu.net" index="4"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>connect-beta.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=connect-beta.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAPlfAgYiS2HzMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+BAMTFWNvbm5lY3QtYmV0YS5zdW5ldC5zZTAeFw0xNDExMjkxMTE4NTVaFw0yNDEx
+MjYxMTE4NTVaMCAxHjAcBgNVBAMTFWNvbm5lY3QtYmV0YS5zdW5ldC5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANMhbRolAnPwqhMMJvS76dzc0tLp
+eEjwS5GTMFIZSic54pnHHEnBGgQAZkPmputFdioAV6eZw2qHAGvROcQTRk4jeIXo
+aULWXN9fNq+EZa/1SdzdtC3z5WqoyV+DYNWgOh0jI+iCh9mQpCEs8TtImWWZbVFY
+Uev5+Cf3wJCi5RMYSU6oBD0/zpHq/+7fDjXCs7Coe7q9o1mQqw08mDCH8/Gb+mgg
+UPjQWL6U7oGWBJ0s4Bclc9WPUQQQVE8C6wt+CvQw6Eg1maV2f28si3ez1ybZv27w
+XgH/pTnib1FmLWBTSETkFOZs4ZRxoKgU838lRUktc58CEGKQhwisaKqfd+ECAwEA
+AaNDMEEwIAYDVR0RBBkwF4IVY29ubmVjdC1iZXRhLnN1bmV0LnNlMB0GA1UdDgQW
+BBS4cKd+yNhVRbYHclbmpNeBJySm6TANBgkqhkiG9w0BAQUFAAOCAQEAHnWZUpzK
+FU+MdGvtwH249x7sQtj7mXSISsX1rnfy6M1Zz7SWtkSeFgijQvpNEDsIfRXtMApS
+zegZMJEAbnVQ9OVXcVD1zgoHdob0qjJ3KXlc/lByeosty1Q6TLI1NtGZzS23COmP
+H/AVOR5U++JOt28OOfoi7mtxOFPxkge3AooWLNFOEOGMSF78BG8NCrT0l59OnAtN
+3sN7PXo740wv8cQLou3/kv+NHOMwdhdiCTvY9JttcRsT55rHbWRpgDbqYTvyEhkD
+3Zul4UGjlp2ilyjkZqr+qOUEAdjC63hNBmNMEtJGi2vhEyi2BN+F1PfoB5mot7A0
+15RMslPZtWnEtQ==</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>connect-beta.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=connect-beta.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAPlfAgYiS2HzMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+BAMTFWNvbm5lY3QtYmV0YS5zdW5ldC5zZTAeFw0xNDExMjkxMTE4NTVaFw0yNDEx
+MjYxMTE4NTVaMCAxHjAcBgNVBAMTFWNvbm5lY3QtYmV0YS5zdW5ldC5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANMhbRolAnPwqhMMJvS76dzc0tLp
+eEjwS5GTMFIZSic54pnHHEnBGgQAZkPmputFdioAV6eZw2qHAGvROcQTRk4jeIXo
+aULWXN9fNq+EZa/1SdzdtC3z5WqoyV+DYNWgOh0jI+iCh9mQpCEs8TtImWWZbVFY
+Uev5+Cf3wJCi5RMYSU6oBD0/zpHq/+7fDjXCs7Coe7q9o1mQqw08mDCH8/Gb+mgg
+UPjQWL6U7oGWBJ0s4Bclc9WPUQQQVE8C6wt+CvQw6Eg1maV2f28si3ez1ybZv27w
+XgH/pTnib1FmLWBTSETkFOZs4ZRxoKgU838lRUktc58CEGKQhwisaKqfd+ECAwEA
+AaNDMEEwIAYDVR0RBBkwF4IVY29ubmVjdC1iZXRhLnN1bmV0LnNlMB0GA1UdDgQW
+BBS4cKd+yNhVRbYHclbmpNeBJySm6TANBgkqhkiG9w0BAQUFAAOCAQEAHnWZUpzK
+FU+MdGvtwH249x7sQtj7mXSISsX1rnfy6M1Zz7SWtkSeFgijQvpNEDsIfRXtMApS
+zegZMJEAbnVQ9OVXcVD1zgoHdob0qjJ3KXlc/lByeosty1Q6TLI1NtGZzS23COmP
+H/AVOR5U++JOt28OOfoi7mtxOFPxkge3AooWLNFOEOGMSF78BG8NCrT0l59OnAtN
+3sN7PXo740wv8cQLou3/kv+NHOMwdhdiCTvY9JttcRsT55rHbWRpgDbqYTvyEhkD
+3Zul4UGjlp2ilyjkZqr+qOUEAdjC63hNBmNMEtJGi2vhEyi2BN+F1PfoB5mot7A0
+15RMslPZtWnEtQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect-beta.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect-beta.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect-beta.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect-beta.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect-beta.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect-beta.sunet.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect-beta.sunet.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect-beta.sunet.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect-beta.sunet.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">SUNET E-Meeting Service (beta)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">SUNET E-Meeting Service (beta)</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" 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: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>noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml b/swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml
new file mode 100644
index 00000000..681272e5
--- /dev/null
+++ b/swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.sunet.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" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <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 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://connect.sunet.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://connect.sunet.se/Shibboleth.sso/DS/ds.sunet.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://connect.sunet.se/Shibboleth.sso/DS/nordu.net" 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://connect.sunet.se/Shibboleth.sso/DS/kalmar2" index="4"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>connect01.acp.sunet.se</ds:KeyName>
+        <ds:KeyName>https://connect.sunet.se/shibboleth</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=connect01.acp.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDLjCCAhagAwIBAgIJALJTE8wpfDmAMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmNvbm5lY3QwMS5hY3Auc3VuZXQuc2UwHhcNMDkwOTAyMTIwNTIwWhcNMTkw
+ODMxMTIwNTIwWjAhMR8wHQYDVQQDExZjb25uZWN0MDEuYWNwLnN1bmV0LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzaNMBLHGgzRrAHLQDUiM+xu6
+ghKwdRqBcg171qVDeA4wSoVJLVeAY2xWKjudYzXtcwqL7qkDcHD3wOd0FLQSFfxE
+o67z4chBMNrkK9b9NgdHWp/Nb8gsdYNZt2ZjJVOD/oWTFXRHZDJhqkXFvVjL1gKu
+E3a2vDK6LRqYCLx5cyFleuRoqBvMrDxKLHvmqxo+Qt2e+ntL1sDVyKeMxgZc2s0/
+xGYFFzSVDT08XrWlgpN0AmxhfC0ULDb8YzQiJxsdeZ3C57RnC0InabCCvzPQsy9t
+c1VU/TNXkkXQn3H5aC+LUu8olnYndtFac56k/OaAUPe15/1MQVXvL8vbGG6JkQID
+AQABo2kwZzBGBgNVHREEPzA9ghZjb25uZWN0MDEuYWNwLnN1bmV0LnNlhiNodHRw
+czovL2Nvbm5lY3Quc3VuZXQuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUxPAGA++l
+tPOMkUezKJJrwSNAz/0wDQYJKoZIhvcNAQEFBQADggEBADJJgcI6VADyB8749iGB
+UbK97Zav6/YoX3jMH21tpO0+iZyPlfCxlDmNIBSSrHmNIs7g8sBSi+z8ko2IaSKS
+Ya0fI0N+cvBoi+3Wfszq0LpUSu/5pMWiw3DacOCNesR76h+FKD/UPgUL+LDw7ebz
+K3aeVvtsIjPijrcCaUKrZg5dv/5CRx/oQLbV20L3xk5UTTO/RNrR1gef37yEowDd
+d8hQaQgw5uujjjdkr/6u03kjO6rEZAySsiBPGcpBDXAbk4lnJVQltP0MBE4pu+es
+0oZu+lC7LltiBjJxdh/7SaqdLbn7G7cApwQKqXHVFITX9ncVMM04FtM9MzMc9d4y
+bUs=
+</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>connect01.acp.sunet.se</ds:KeyName>
+        <ds:KeyName>https://connect.sunet.se/shibboleth</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=connect01.acp.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDLjCCAhagAwIBAgIJALJTE8wpfDmAMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmNvbm5lY3QwMS5hY3Auc3VuZXQuc2UwHhcNMDkwOTAyMTIwNTIwWhcNMTkw
+ODMxMTIwNTIwWjAhMR8wHQYDVQQDExZjb25uZWN0MDEuYWNwLnN1bmV0LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzaNMBLHGgzRrAHLQDUiM+xu6
+ghKwdRqBcg171qVDeA4wSoVJLVeAY2xWKjudYzXtcwqL7qkDcHD3wOd0FLQSFfxE
+o67z4chBMNrkK9b9NgdHWp/Nb8gsdYNZt2ZjJVOD/oWTFXRHZDJhqkXFvVjL1gKu
+E3a2vDK6LRqYCLx5cyFleuRoqBvMrDxKLHvmqxo+Qt2e+ntL1sDVyKeMxgZc2s0/
+xGYFFzSVDT08XrWlgpN0AmxhfC0ULDb8YzQiJxsdeZ3C57RnC0InabCCvzPQsy9t
+c1VU/TNXkkXQn3H5aC+LUu8olnYndtFac56k/OaAUPe15/1MQVXvL8vbGG6JkQID
+AQABo2kwZzBGBgNVHREEPzA9ghZjb25uZWN0MDEuYWNwLnN1bmV0LnNlhiNodHRw
+czovL2Nvbm5lY3Quc3VuZXQuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUxPAGA++l
+tPOMkUezKJJrwSNAz/0wDQYJKoZIhvcNAQEFBQADggEBADJJgcI6VADyB8749iGB
+UbK97Zav6/YoX3jMH21tpO0+iZyPlfCxlDmNIBSSrHmNIs7g8sBSi+z8ko2IaSKS
+Ya0fI0N+cvBoi+3Wfszq0LpUSu/5pMWiw3DacOCNesR76h+FKD/UPgUL+LDw7ebz
+K3aeVvtsIjPijrcCaUKrZg5dv/5CRx/oQLbV20L3xk5UTTO/RNrR1gef37yEowDd
+d8hQaQgw5uujjjdkr/6u03kjO6rEZAySsiBPGcpBDXAbk4lnJVQltP0MBE4pu+es
+0oZu+lC7LltiBjJxdh/7SaqdLbn7G7cApwQKqXHVFITX9ncVMM04FtM9MzMc9d4y
+bUs=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.sunet.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect.sunet.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.sunet.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.sunet.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://connect.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://connect.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">SUNET E-Meeting Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">SUNET E-Meeting Service (Adobe Connect Pro)</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" 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.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" 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.9" 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" 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 NOC</md:Company>
+    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/connectis-sso.qa.federatenow.net-broker-sso-tpd.xml b/swamid-interfederations-2.0/connectis-sso.qa.federatenow.net-broker-sso-tpd.xml
new file mode 100644
index 00000000..bfb4dce0
--- /dev/null
+++ b/swamid-interfederations-2.0/connectis-sso.qa.federatenow.net-broker-sso-tpd.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connectis-sso.qa.federatenow.net/broker/sso/tpd">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-19T12:36:02Z">
+      <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>
+						MIID6zCCAtOgAwIBAgIJALX4Kq2P8A1MMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYD
+						VQQGEwJOTDEVMBMGA1UECAwMWnVpZCBIb2xsYW5kMRIwEAYDVQQHDAlSb3R0ZXJk
+						YW0xEjAQBgNVBAoMCUNvbm5lY3RpczEfMB0GA1UECwwWRk9SIFRFU1QgUFVSUE9T
+						RVMgT05MWTEcMBoGA1UEAwwTZWguYWNjLmNvbm5lY3Rpcy5ubDAeFw0xMzAxMDIx
+						MDIzMTBaFw0xODAxMDIxMDIzMTBaMIGLMQswCQYDVQQGEwJOTDEVMBMGA1UECAwM
+						WnVpZCBIb2xsYW5kMRIwEAYDVQQHDAlSb3R0ZXJkYW0xEjAQBgNVBAoMCUNvbm5l
+						Y3RpczEfMB0GA1UECwwWRk9SIFRFU1QgUFVSUE9TRVMgT05MWTEcMBoGA1UEAwwT
+						ZWguYWNjLmNvbm5lY3Rpcy5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAMtjSnczA34cMYc8j5k8Rp0/Y1YizrPMtPjw1ClccygiLF/KoXy4A5vv6Ljz
+						XARpdF6yWSGekgzcrfQZ/RxKtv5wJq7KnayHU73ajCW0GZEN38yn0X54+e4daO79
+						VONFyGdpT5SPuRaXGxP/4YYH9Vn/+K9TfUffmICK/Gx0Ops3hywzpVvpcMEZtc9y
+						CvVOu3L0P2QoYeHLBGFVoiwCMfA5/AvIfG6yL1wX8yHLYotlvpZFEXk4EMJ9dCqK
+						dswcDz6p4GnSisC/89S35DDaCWDnGMB8wecWuEjZu+H/JWEhgjbJTjmctlSjoajE
+						H8WFLsUxvZ3xjjkXfvaaYhEdaF8CAwEAAaNQME4wHQYDVR0OBBYEFI2ApVPf1bEv
+						0ixBULEAK+SrT1XaMB8GA1UdIwQYMBaAFI2ApVPf1bEv0ixBULEAK+SrT1XaMAwG
+						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACKYFOtONqcBiSJB6dewD7xH
+						Cvcvfbr26QDQKNJlrXG+HBz7wB4nyxsGOfgpvyWKa582pRPI2/rFq5X0jgdYw7mb
+						HcVCYGZFf8/ijSI1fjkRr1LKMfSOWqQ5+REtLbCFBqKHyPyq1wsC535D+ktF04eL
+						mmesG6/QBCfwfqhmuyaW35TBYNBb3HHELlYLGOOKuo83/5cUgoFJiBKblPRg69E+
+						FgOARgihxdDzcTJIqD2bJExSkW8XFqn27Y1KhfCGIOpKZImfRIqxDmyWFtSecEzm
+						xMs+nAMoI6dUJf3swTToJIk4fFu1Ukk+jlyXtUnsN5VsjZHzGX0ueKCOSu0Cm/g=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connectis-sso.qa.federatenow.net/broker/acs/tpd" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connectis-sso.qa.federatenow.net/broker/acs/tpd" index="2" isDefault="false"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Connected Information Systems B.V.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Connectis</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/connectis-sso.staging.federatenow.net-broker-sso-tpd.xml b/swamid-interfederations-2.0/connectis-sso.staging.federatenow.net-broker-sso-tpd.xml
new file mode 100644
index 00000000..2bda8c83
--- /dev/null
+++ b/swamid-interfederations-2.0/connectis-sso.staging.federatenow.net-broker-sso-tpd.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connectis-sso.staging.federatenow.net/broker/sso/tpd">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-04T10:34:37Z">
+      <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>
+						MIIEETCCAvmgAwIBAgIEXjilzjANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UEBhMC
+						TkwxEzARBgNVBAgTClNvbWUtU3RhdGUxEjAQBgNVBAcTCVJvdHRlcmRhbTErMCkG
+						A1UEChMiQ29ubmVjdGVkIEluZm9ybWF0aW9uIFN5c3RlbXMgQi5WLjErMCkGA1UE
+						CxMiQ29ubmVjdGVkIEluZm9ybWF0aW9uIFN5c3RlbXMgQi5WLjEmMCQGA1UEAxMd
+						Y29ubmVjdGlzLXNzbyBzdGFnaW5nIHNpZ25pbmcwHhcNMTQwNjA0MDkyMTUwWhcN
+						MjQwNDEyMDkyMTUwWjCBuDELMAkGA1UEBhMCTkwxEzARBgNVBAgTClNvbWUtU3Rh
+						dGUxEjAQBgNVBAcTCVJvdHRlcmRhbTErMCkGA1UEChMiQ29ubmVjdGVkIEluZm9y
+						bWF0aW9uIFN5c3RlbXMgQi5WLjErMCkGA1UECxMiQ29ubmVjdGVkIEluZm9ybWF0
+						aW9uIFN5c3RlbXMgQi5WLjEmMCQGA1UEAxMdY29ubmVjdGlzLXNzbyBzdGFnaW5n
+						IHNpZ25pbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFL8GudeE6
+						+ZrNf9A29gp0GWT1ZzlMho1D7CkxqlWa6dLHlHHq/9yVimTJ+gBW98lM5Xtox9pB
+						Sl4NEhJYxnbzqxQQZHrYe2ePndaOA+I3Qt18s9Flii3CfKgivO8Gk7PIsJiUtmpa
+						VQs7VW3exfe9hct+u9+WNuyHvHaEnuf5m2NU3Ik5xyG19etoBhGqhhTeCWr/jXX+
+						r3dJSoCiRKCrw1vtd4H0AYkOu3vsvlGyzv468wj8ya7pSWKhUhYTWIaBI5lf6LYP
+						I3Ic7CixQJMYnjk3HjHUzBkWF4Br/7/REk94FRsCLbBy97DV/reOcGqSSazVMxnu
+						D4oW5vrbvcdfAgMBAAGjITAfMB0GA1UdDgQWBBS6TwUKWGxZJD3DZcMnO5rfH6UB
+						/DANBgkqhkiG9w0BAQsFAAOCAQEAbS/JqZ8HtJ1gVgsTLIGHqIarEov1U3sbijbY
+						5cmCMAT0KwBP0/0FrF3eSDoxBiAUhPyeYRLmgLDY2OMUoXctpsRQEKdSz2uygZgT
+						HUCbwj9m7Wbg7iPGXcoEJhQgJxBh+afOICDNfcOO/mT4LPhy9JY/fg6fqeCfNyeL
+						XbBPIFCJ6tnkwseBBdFN+bOpRLSQjhicQNd91+7E9D99NFw1AkZpj+pNq8cwFpOK
+						0LLFELmeT1gDlRAv5yjz4PyIUONaHGA35eIvyDcE3TV003+x3PNwqGrMwzsXvR6q
+						do7Z7JztljIHExhgDP6V7Ze4Y2nyrEqVhFWOdAwOH/PTaxIsgQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connectis-sso.staging.federatenow.net/broker/acs/tpd" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connectis-sso.staging.federatenow.net/broker/acs/tpd" index="2" isDefault="false"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Connected Information Systems B.V.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Connectis Staging</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/content.espresso.co.uk-shibboleth.xml b/swamid-interfederations-2.0/content.espresso.co.uk-shibboleth.xml
new file mode 100644
index 00000000..8650877d
--- /dev/null
+++ b/swamid-interfederations-2.0/content.espresso.co.uk-shibboleth.xml
@@ -0,0 +1,92 @@
+<?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://content.espresso.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:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://content.espresso.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>
+						MIIDNDCCAhygAwIBAgIJAPhU5DVHo3TdMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFmNvbnRlbnQuZXNwcmVzc28uY28udWswHhcNMDkxMTE5MDEzMTAzWhcNMTkx
+						MTE3MDEzMTAzWjAhMR8wHQYDVQQDExZjb250ZW50LmVzcHJlc3NvLmNvLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqsGFLIO2eS/U55TGvH6Em3/M
+						eHPzNoVB0BfUYJC7FHeU/fjU+BsR98zVGBrr31LGpmWiM7a3zte4nZ9om7Drd+/0
+						w8TP9+8gJ/GJE6VnUuy/PBB47l2F/rPGOx4aKnJIw0I461ufHxoqGHx/8LoIeJ1C
+						TvSu7ft4A/GW9lqWsk5jFBZpaH8r9g9GIQiFlfaWRrt795pyeya9YMaVUuiEtK/N
+						r3xelrI5F/wPEJR0Pr7JCYYv7q5X2rUhNsFth7647NvWY1MaJXcaHIXHxr1EI+wr
+						WH845jGpLJqIeIgy8CLMakqubboxfndAd6o8vVQoDU+5++w/GvIvnScylrExZwID
+						AQABo28wbTBMBgNVHREERTBDghZjb250ZW50LmVzcHJlc3NvLmNvLnVrhilodHRw
+						czovL2NvbnRlbnQuZXNwcmVzc28uY28udWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						WE1SXmUfBV+0nDCDzdYxWMKz0oEwDQYJKoZIhvcNAQEFBQADggEBAHsTwtMAXmfk
+						NqHSCZ2dllLFKu5ildGMxkwUBkYHskmHna5gJo8xLMiS4nXJvZTCvLaLg3Sxa1h0
+						W7DDxV7FMioj6Uzxzny8e4fqqcKeE4tj7OcjM1sZQM7sRBq3eQfykGqO2/1SoKl2
+						E5aAfgermY6QFkIe3XOTT4J+sj1vwcfS0C0GW3gTA1bsDfHwyGtNSpt2qeEljwbD
+						yM5Bvz7W8Zjqe0s6EvwkvbQdIMUMlSe2o1LHQcm59VTFHrEMhp8+Xi/BO8nC5Cns
+						9UYhqZeX8Ac4aOdOQmO2wcW9yfuWaQSO0miGJIQ3uIoDgOfdNGiVuHDYI4KIPm6E
+						9HHhFgsV7K8=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDNDCCAhygAwIBAgIJAPhU5DVHo3TdMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFmNvbnRlbnQuZXNwcmVzc28uY28udWswHhcNMDkxMTE5MDEzMTAzWhcNMTkx
+						MTE3MDEzMTAzWjAhMR8wHQYDVQQDExZjb250ZW50LmVzcHJlc3NvLmNvLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqsGFLIO2eS/U55TGvH6Em3/M
+						eHPzNoVB0BfUYJC7FHeU/fjU+BsR98zVGBrr31LGpmWiM7a3zte4nZ9om7Drd+/0
+						w8TP9+8gJ/GJE6VnUuy/PBB47l2F/rPGOx4aKnJIw0I461ufHxoqGHx/8LoIeJ1C
+						TvSu7ft4A/GW9lqWsk5jFBZpaH8r9g9GIQiFlfaWRrt795pyeya9YMaVUuiEtK/N
+						r3xelrI5F/wPEJR0Pr7JCYYv7q5X2rUhNsFth7647NvWY1MaJXcaHIXHxr1EI+wr
+						WH845jGpLJqIeIgy8CLMakqubboxfndAd6o8vVQoDU+5++w/GvIvnScylrExZwID
+						AQABo28wbTBMBgNVHREERTBDghZjb250ZW50LmVzcHJlc3NvLmNvLnVrhilodHRw
+						czovL2NvbnRlbnQuZXNwcmVzc28uY28udWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						WE1SXmUfBV+0nDCDzdYxWMKz0oEwDQYJKoZIhvcNAQEFBQADggEBAHsTwtMAXmfk
+						NqHSCZ2dllLFKu5ildGMxkwUBkYHskmHna5gJo8xLMiS4nXJvZTCvLaLg3Sxa1h0
+						W7DDxV7FMioj6Uzxzny8e4fqqcKeE4tj7OcjM1sZQM7sRBq3eQfykGqO2/1SoKl2
+						E5aAfgermY6QFkIe3XOTT4J+sj1vwcfS0C0GW3gTA1bsDfHwyGtNSpt2qeEljwbD
+						yM5Bvz7W8Zjqe0s6EvwkvbQdIMUMlSe2o1LHQcm59VTFHrEMhp8+Xi/BO8nC5Cns
+						9UYhqZeX8Ac4aOdOQmO2wcW9yfuWaQSO0miGJIQ3uIoDgOfdNGiVuHDYI4KIPm6E
+						9HHhFgsV7K8=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://content.espresso.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://content.espresso.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.espresso.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.espresso.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://content.espresso.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://content.espresso.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.espresso.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.espresso.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.espresso.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://content.espresso.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.espresso.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://content.espresso.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://content.espresso.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://content.espresso.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Espresso Education Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Espresso Education Limited: Espresso</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.espresso.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Nightingale</md:SurName>
+    <md:EmailAddress>mailto:tnightingale@espresso.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Nightingale</md:SurName>
+    <md:EmailAddress>mailto:tnightingale@espresso.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/copac.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/copac.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..6abf5fbe
--- /dev/null
+++ b/swamid-interfederations-2.0/copac.ac.uk-shibboleth.xml
@@ -0,0 +1,75 @@
+<?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://copac.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-02-03T17:10: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://copac.ac.uk/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Copac: National, Academic &amp; Specialist Library Catalogue</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Search increasing numbers of UK and Irish academic, national &amp; specialist library catalogues</mdui:Description>
+        <mdui:Logo height="117" width="300">https://copac.ac.uk/img/copac-shibboleth.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEFjCCAv6gAwIBAgIJAO6xAo1XfaxPMA0GCSqGSIb3DQEBBQUAMIGEMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
+						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
+						CxMFTWltYXMxFDASBgNVBAMTC2NvcGFjLmFjLnVrMB4XDTEzMDUzMDE1MzAxNFoX
+						DTIzMDUyODE1MzAxNFowgYQxCzAJBgNVBAYTAkdCMRMwEQYDVQQIEwpNYW5jaGVz
+						dGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVyMSUwIwYDVQQKExxUaGUgVW5pdmVyc2l0
+						eSBvZiBNYW5jaGVzdGVyMQ4wDAYDVQQLEwVNaW1hczEUMBIGA1UEAxMLY29wYWMu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkHGpQmx3P3Af0
+						fkVm9D8iNZVqBDVFjXZXfktCzU5Zq368JQsItRz03ON4xCmU7Qe/gugcmxNxukQ6
+						2B+tNcuFyVaJ+u6Fe2hvwjk1oP4Ss6fMFkE+UmOlqbwcrPdEeSVFIBWW8Wexhs1e
+						e71CR/LtzX369K8TSQrzAsVGIbhXCVnKDyhclgilF+20AaWTVj2iNrUd15POvmZQ
+						HP646gd9o8JxPlzILXdabJtd8liIIPsCqD8KH0K4M1rlhWDz0MLct8VM9GVuv23p
+						nOOEz3hkhhxfJUlDqt3C3HHtPwJ157tVMUJSAzRdOLnqt3B3hhftFzLzf/jT6/FZ
+						mazrYbP/AgMBAAGjgYgwgYUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0l
+						BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBYGA1UdEQQPMA2CC2NvcGFjLmFjLnVr
+						MDQGA1UdEgQtMCuBKW1pbWFzLXNoaWItdGVjaEBsaXN0c2Vydi5tYW5jaGVzdGVy
+						LmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQB5QfB/NqgTytj+KdQ2TrV8gySfKbGe
+						dOeM1cGSpX8FyXXiEavVAHlDsuhsd9RcMROqkj90oQQFUm3CJnh0m40++WXdI9+v
+						7bMQ0xYVzGnsX7qBxxHlSslGRNF7/4Ya6UTrDOTpmIVSvNDmMWqBnwBwVQ6zKxLP
+						xYs0qSlnDNKjXgpcWOJPz6cuCuOOOXDoMuIdpNSWHfHz9E1PfUo4QOClG+HVOus2
+						5SFQ7I6cUaJz3K8IQzOIyhqKJiWyr+U+c49UObr8HrurvvQ1GIibCEG5/5nV5y9R
+						UETawIuGZeVFL2GfLp1JS4Fe6QvAenQwPFVqKKhwRalihh53YYkNvchV
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://copac.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://copac.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://copac.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://copac.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://copac.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://copac.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://copac.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://copac.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://copac.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://copac.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://copac.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://copac.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://copac.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://copac.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 Copac</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://copac.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Copac Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:copac@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/copper-beech.oucs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/copper-beech.oucs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..f2a90a33
--- /dev/null
+++ b/swamid-interfederations-2.0/copper-beech.oucs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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://copper-beech.oucs.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-10T10:35: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://copper-beech.oucs.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>
+						MIIDFTCCAf2gAwIBAgIJAO1i0mrAIB8GMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGmNvcHBlci1iZWVjaC5vdWNzLm94LmFjLnVrMB4XDTEzMDMxMjEyMjE0MVoX
+						DTIzMDMxMDEyMjE0MVowJTEjMCEGA1UEAxMaY29wcGVyLWJlZWNoLm91Y3Mub3gu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC19odZWKUryeOs
+						Qm5Jped89f7vdvCnl1+Es27CxXYioSRtqBWWWSCmv5ihxDmoTL+aGNdyjf/5m7Ad
+						YPzpp/eVvjPtcMN1tHo7L9B6vs/wArIp8mcFK57vfdA+LM8TzMz74OGLrGBuKe6w
+						8BRbfG6amdvJczbZ7PqMJWI4f/3YXGM6aCqHY2L0ZNZf/ZRedTIuDiurk1PH30AN
+						PAGilDLIYDakAT/HnRMzoFYDg/Qyom4YQGCF1yIyG4WJAgjhnSnibbVF6C6uNU2u
+						BcGbeF+ZLpTZe8T3NoGjZbnamqd8PmoUE/8Iv3ciPWnxpIfEL7hdQBjnYqyuM8s/
+						FyOA42uzAgMBAAGjSDBGMCUGA1UdEQQeMByCGmNvcHBlci1iZWVjaC5vdWNzLm94
+						LmFjLnVrMB0GA1UdDgQWBBQu40vUe6XSE9/jGWlX6HR6uNg2rjANBgkqhkiG9w0B
+						AQUFAAOCAQEAUrxhUkIk/kX4ALnAPV6GtwkMBoq7KMauyCaTyPDEf/VFziwhW8Ha
+						5g2gEVqD2XcTVjb1+IhJHcXcvS6PNbU4XeFDDA4b9Ozu3KZSXFkKzU+tUYcJ7HFk
+						WIzImdVpATRsc/rb871QSCsf3NsP9k0sQWCRaMZP96vic88ZiZLM4RnD62BsARMv
+						MTiOHIJJN6qRECJAXcw7BPa2Fbb+CJYMy1vG8+a2XKe/B52gmWbBwkCI8xAy9k9y
+						MFD+d0ccJvCT04vBA238bfgsEDGo9spUMatdRlvt0fAjS2mkiQM589o1EAwywWjN
+						oG3ArnRN398e8bBWJnR3ndIw5Z14f3I/KA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford, Test Shibboleth SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.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/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index ac7aacde..fab02064 100644
--- a/swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2013-10-17T11:25:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdui:UIInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">UWAP</mdui:DisplayName>
         <mdui:DisplayName xml:lang="no">UWAP</mdui:DisplayName>
         <mdui:Description xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</mdui:Description>
         <mdui:Description xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</mdui:Description>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/coursedev.conted.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/coursedev.conted.ox.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..04995628
--- /dev/null
+++ b/swamid-interfederations-2.0/coursedev.conted.ox.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,76 @@
+<?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://coursedev.conted.ox.ac.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-06T13:36: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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://coursedev.conted.ox.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>
+						MIIEojCCA4qgAwIBAgIJAIo8n/wla25jMA0GCSqGSIb3DQEBBQUAMIHRMQswCQYD
+						VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
+						MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
+						bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMSIwIAYDVQQDDBljb3Vyc2VkZXYu
+						Y29udGVkLm94LmFjLnVrMSowKAYJKoZIhvcNAQkBFhttaWtlLnRheWxvckBjb250
+						ZWQub3guYWMudWswHhcNMTQwNTIwMTAzMTU0WhcNMjQwNTE3MTAzMTU0WjCB0TEL
+						MAkGA1UEBhMCVUsxFDASBgNVBAgMC094Zm9yZHNoaXJlMQ8wDQYDVQQHDAZPeGZv
+						cmQxHTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgT3hmb3JkMSwwKgYDVQQLDCNEZXBh
+						cnRtZW50IGZvciBDb250aW51aW5nIEVkdWNhdGlvbjEiMCAGA1UEAwwZY291cnNl
+						ZGV2LmNvbnRlZC5veC5hYy51azEqMCgGCSqGSIb3DQEJARYbbWlrZS50YXlsb3JA
+						Y29udGVkLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						oVwa9Vpu7YzAf0IQczc4zZBHCW1xsdqfuCVk71ahSnEQMl0QQXcM9ZvyqqDIy12Z
+						rA+5y/mGwfYv09M/DqrKqbT7Mk5CaksDjEwnZqobrGX+nKMKh/lKsSeJ/OkWvZbw
+						bGR5sIAO88Waz3QQAdouIahycyMxeZxxD6mHqGncLl87tWNng5R1bRTQ3ITMXwMY
+						pNtLkbS884EIChs9U+NJyqbiHhX6HCwG6Nn1n6VbKoavM47Cd5mf/2Gl1POYP6tT
+						YeTJ1ivUUEQ/KREWkZuGXy1pF5ZcoxkFnJwjaAUo+vxF0WUXSdRUpvlyOgDsnBqY
+						A3+nZkUXgZpz/ll88UeBzwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
+						DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUCsi1
+						iGkuhHJjuS5YZsmf/6hsBUYwHwYDVR0jBBgwFoAUCsi1iGkuhHJjuS5YZsmf/6hs
+						BUYwDQYJKoZIhvcNAQEFBQADggEBAJc4oY4qFkj0cJWBLn+9ch6DCLvJvbSmdcz9
+						prVUBdKavVISxGlbY4ro3KxAUNdEcmYESW6JKJcu4ek4/L47aVGSI7dX2CQ73DYM
+						WAcf6XzFpfEUGw6aOKi7UOYKzVAugbafAb2j1LMQrSt7FEFEtYlGoAN3JnH4+FIC
+						29gwvXQrXRFvqCfoVMfMUGlTdD1Xy9XbakTOWta0cTHtE+p6GRgoy0MpjYmVruUc
+						qre2Yz3OMGHP3FghGeUXQrDEzmnAbKW/RjHWrUapTgipkKdokN1JC2C67OCkQOsk
+						JD62ZhusHIcnhdoAfDzMtOVYFGLFs4JyeOlfG8MbmY4p1UJJuMA=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coursedev.conted.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://coursedev.conted.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://coursedev.conted.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://coursedev.conted.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: Department for Continuing Education Moodle V2 development site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.conted.ox.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@conted.ox.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@conted.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/courses.scholar.hw.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/courses.scholar.hw.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..4223eae2
--- /dev/null
+++ b/swamid-interfederations-2.0/courses.scholar.hw.ac.uk-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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://courses.scholar.hw.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="2008-08-07T10:57: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: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://courses.scholar.hw.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://courses.scholar.hw.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>
+						MIIEujCCA6KgAwIBAgIQRLomkyosVgECbA0c3XaRHzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMTAwMzAwMDAwMFoXDTE1MTAwMzIzNTk1OVowgYwxCzAJBgNV
+						BAYTAkdCMRMwEQYDVQQIEwpNaWRsb3RoaWFuMRIwEAYDVQQHEwlFZGluYnVyZ2gx
+						HzAdBgNVBAoTFkhlcmlvdC1XYXR0IFVuaXZlcnNpdHkxEDAOBgNVBAsTB1NDSE9M
+						QVIxITAfBgNVBAMTGGNvdXJzZXMuc2Nob2xhci5ody5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBANjbD0Ux5Uv0WiNcGkafLQKrrMDMiq8JS/tM
+						VYQ5u0AaYFTekO+LMzqqB/mOHlgm5Rs1xEo9VgG7gdFV943P61lTn/qweB1mHU7a
+						zJG16He+5yu21eJ+iT9kwTi7LU17208xEhkClEuy7pwGOW5+wiDNtpk3OSeqpEAW
+						EVPbwRPHC8Zyh3dbe/LFD8H9dxScmxYC8FTPAGGJWi1L4zXWwtMEJW4VlubYbaWQ
+						NlUuNyyiI+00jowg96aFDSwUqDBGo7uf0gYuVrgjUk1pjNdTEgq872JXRHN4e4P4
+						6bVMKYskLSkW4AMaEeCmnNaabJN0P3VJar1/Ptc/nJ3BKwlCRycCAwEAAaOCAWsw
+						ggFnMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTC
+						1f/4bAhBMH3eDvZ5AU1Z7gPd3zAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+						ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
+						BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+						bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+						MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+						CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAjBgNVHREEHDAa
+						ghhjb3Vyc2VzLnNjaG9sYXIuaHcuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAVp
+						IYPdo0+/kLxIcuqEu0q5v5Xgwj4cpug13IZGzrkorKNZvsMrclTl7WR+4XdTlseW
+						q1oQBqXAca6IftsheRJicQHKGdjUcdKWcKIR1dESiJTS6ZgVn+2P9+7cqO6g+7KA
+						KfgQOtbaWIjfuyyitrFdHpmNiDu6IbL7CE1D66SEpmGeudEd3iOqJ5Jg2cMYzp3m
+						5bgibxsUL6RmZZy4FTs3+EaTAgwYplToHWswYVcBKUOT8zHViaLoAGIa91Jdk8gs
+						he+WuTto9CopcLzbYhDq6+V4Z7wSPxXvIhsYR4XueFAdtfikwtJuG5ILtLylJBBE
+						IdO6f+kcAEgl9zyanis=
+					</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://courses.scholar.hw.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SAML2/ECP" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Heriot-Watt University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Heriot-Watt University: The SCHOLAR Programme</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://scholar.hw.ac.uk/sco.html</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/coventry.ac.uk-idp.xml b/swamid-interfederations-2.0/coventry.ac.uk-idp.xml
new file mode 100644
index 00000000..72197eb4
--- /dev/null
+++ b/swamid-interfederations-2.0/coventry.ac.uk-idp.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://coventry.ac.uk/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>
+      <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>
+						MIIDODCCAiCgAwIBAgIVAL0mMgDu5top1RP1uWsDIPodHtSIMA0GCSqGSIb3DQEB
+						BQUAMB4xHDAaBgNVBAMTE2lkcDIuY292ZW50cnkuYWMudWswHhcNMTMwNzEyMDkz
+						NjIyWhcNMzMwNzEyMDkzNjIyWjAeMRwwGgYDVQQDExNpZHAyLmNvdmVudHJ5LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn6tyDBeIOr1TNvvs
+						tzM3LABsvXKstxllmo4TKiRIdLHML9GeDmQeK5J+Ayly6uD+W++45pUrma0Yv9pM
+						6AGXJZsSRd+JNhBrv3IV2CWGWKAZIsd/nDLO6yPDAFNsyBrCLicibY8mH/o/uXYj
+						YUHkC/VB4Sjb5uzM1u+q4Vx93hYCwrZu6L6Wtr5jHdMepZ813c95wP+8+pVydY5x
+						tqWjB3iTXsl+AC7Y3bqVK0FgqidVhifjBO+p8aZfxm/Ycen1LJuS7JYCCDSn/UL5
+						SXo5qvEzXuKLwicugewrqXJwpzMkZif+ppl54yDwtG5pVHQT2+KwmDyXQiZAv1ji
+						DikFcwIDAQABo20wazBKBgNVHREEQzBBghNpZHAyLmNvdmVudHJ5LmFjLnVrhipo
+						dHRwczovL2lkcDIuY292ZW50cnkuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
+						BBYEFBv/ZE7Ke43/cMfhyAuTRI5/hE2kMA0GCSqGSIb3DQEBBQUAA4IBAQCIZQeM
+						D88/cHeyRWLIUoxBb8Pdb9HwEG51qmg7b+/dwkjomtO5uanQYdO78ar7zmnMAnNJ
+						QFV9WSrp4armb7XqUSrol4OR85F+TCCGJrkRHMHbl1GKECD1iyS1Pgd0DXbP+eqz
+						KaY8aNKN0PCKurzn4tTUAVXZ5vsup8GEps+/uhCHZbAAnH9ilcATposzClVpGvgl
+						LFYNPVs92nXyrx4PC7rfxNEr+AEIeGdjXpbVexdcgy1q9pvRX+dp/Q9jPtg1Gq1r
+						JDUzK95tyg7HYNkAgvc9sjxOxjHjJfhVob237ouSKvJHmKjF/DfNotgfYNCwqdYH
+						PpU40zSkez1KZrd9
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.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://idp2.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://idp2.coventry.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.coventry.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.coventry.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.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>
+						MIIDODCCAiCgAwIBAgIVAL0mMgDu5top1RP1uWsDIPodHtSIMA0GCSqGSIb3DQEB
+						BQUAMB4xHDAaBgNVBAMTE2lkcDIuY292ZW50cnkuYWMudWswHhcNMTMwNzEyMDkz
+						NjIyWhcNMzMwNzEyMDkzNjIyWjAeMRwwGgYDVQQDExNpZHAyLmNvdmVudHJ5LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn6tyDBeIOr1TNvvs
+						tzM3LABsvXKstxllmo4TKiRIdLHML9GeDmQeK5J+Ayly6uD+W++45pUrma0Yv9pM
+						6AGXJZsSRd+JNhBrv3IV2CWGWKAZIsd/nDLO6yPDAFNsyBrCLicibY8mH/o/uXYj
+						YUHkC/VB4Sjb5uzM1u+q4Vx93hYCwrZu6L6Wtr5jHdMepZ813c95wP+8+pVydY5x
+						tqWjB3iTXsl+AC7Y3bqVK0FgqidVhifjBO+p8aZfxm/Ycen1LJuS7JYCCDSn/UL5
+						SXo5qvEzXuKLwicugewrqXJwpzMkZif+ppl54yDwtG5pVHQT2+KwmDyXQiZAv1ji
+						DikFcwIDAQABo20wazBKBgNVHREEQzBBghNpZHAyLmNvdmVudHJ5LmFjLnVrhipo
+						dHRwczovL2lkcDIuY292ZW50cnkuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
+						BBYEFBv/ZE7Ke43/cMfhyAuTRI5/hE2kMA0GCSqGSIb3DQEBBQUAA4IBAQCIZQeM
+						D88/cHeyRWLIUoxBb8Pdb9HwEG51qmg7b+/dwkjomtO5uanQYdO78ar7zmnMAnNJ
+						QFV9WSrp4armb7XqUSrol4OR85F+TCCGJrkRHMHbl1GKECD1iyS1Pgd0DXbP+eqz
+						KaY8aNKN0PCKurzn4tTUAVXZ5vsup8GEps+/uhCHZbAAnH9ilcATposzClVpGvgl
+						LFYNPVs92nXyrx4PC7rfxNEr+AEIeGdjXpbVexdcgy1q9pvRX+dp/Q9jPtg1Gq1r
+						JDUzK95tyg7HYNkAgvc9sjxOxjHjJfhVob237ouSKvJHmKjF/DfNotgfYNCwqdYH
+						PpU40zSkez1KZrd9
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.coventry.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.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</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/crowd.nordu.net-shibboleth.xml b/swamid-interfederations-2.0/crowd.nordu.net-shibboleth.xml
new file mode 100644
index 00000000..4c334a97
--- /dev/null
+++ b/swamid-interfederations-2.0/crowd.nordu.net-shibboleth.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://crowd.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" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/category/nren-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 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://crowd.nordu.net/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://crowd.nordu.net/Shibboleth.sso/DS/nordu.net" 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://crowd.nordu.net/Shibboleth.sso/DS/kalmar2" index="3"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>crowd.nordu.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=crowd.nordu.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJANmt8Ciw6kb/MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2Nyb3dkLm5vcmR1Lm5ldDAeFw0xMDA1MzExMTI4MzVaFw0yMDA1MjgxMTI4
+MzVaMBoxGDAWBgNVBAMTD2Nyb3dkLm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAPX2dT9VdcfFwxu7VA00KB7MmJj43/ReptLZNF1qEIEY
+LurgE63gRpalC1RLNx40V0a692ae9vlUJwr5SSuPE///KcIGe7MqKYqxMNR0EVUM
+gkLl/Iws6X6IKPXZFg/WeE/C/cmU6OzaTwdPBmg360Ys9veUOnt/3/ddRhSGRlr/
+QhrFJwZpeRQG/G7f8wIrvVT6HvsY1QOjW6YV43fon8eMBFz1WV7dAAx4L5d1JXX3
+EH+vY6a1nRj98qZPXZ7MY4HBMS8uU/B2/zTN+N9DFBpbwHYWvZQynIviGrUlgGi6
+bDMJH2k+sTGgy9EGZcaAqb2AECMidmXJk3/nOsX5cFECAwEAAaM9MDswGgYDVR0R
+BBMwEYIPY3Jvd2Qubm9yZHUubmV0MB0GA1UdDgQWBBTvR6U7d9zdmqbIl+g3SLa9
+8CChvzANBgkqhkiG9w0BAQUFAAOCAQEAWvDhU3Tk+cCZoThs2I2HLChX7cEjsjz9
+3ZHdWbsgJzPS0xVAdoR1FraNf6PYUvZxbDhsoO2UEZS5IUyOxdWWuP2jaqUpVxY/
+1fSTQQbvOujO+fZzNhJ8nIy/4FgFDWWqABHbVTfGVzImcxC1AJoQ8jkU9Dio5dIl
+uKQCDz8fu1hbkQZ/NP53cNDkTV0t/bvRtEHGrOJYc1rEFRuTLSkPvItsGffWHhIC
+mCrhgP7LeIv2iiNK7qgbhaFRHXAs/JMXAc/Y4YD1renUQCA4cLPF679N4oixMvxD
+Neib9lWMnEYRIynoqQE3UXYnb3GDinEg/soKH73QAq0dyjcfuk30FA==
+</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>crowd.nordu.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=crowd.nordu.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJANmt8Ciw6kb/MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2Nyb3dkLm5vcmR1Lm5ldDAeFw0xMDA1MzExMTI4MzVaFw0yMDA1MjgxMTI4
+MzVaMBoxGDAWBgNVBAMTD2Nyb3dkLm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAPX2dT9VdcfFwxu7VA00KB7MmJj43/ReptLZNF1qEIEY
+LurgE63gRpalC1RLNx40V0a692ae9vlUJwr5SSuPE///KcIGe7MqKYqxMNR0EVUM
+gkLl/Iws6X6IKPXZFg/WeE/C/cmU6OzaTwdPBmg360Ys9veUOnt/3/ddRhSGRlr/
+QhrFJwZpeRQG/G7f8wIrvVT6HvsY1QOjW6YV43fon8eMBFz1WV7dAAx4L5d1JXX3
+EH+vY6a1nRj98qZPXZ7MY4HBMS8uU/B2/zTN+N9DFBpbwHYWvZQynIviGrUlgGi6
+bDMJH2k+sTGgy9EGZcaAqb2AECMidmXJk3/nOsX5cFECAwEAAaM9MDswGgYDVR0R
+BBMwEYIPY3Jvd2Qubm9yZHUubmV0MB0GA1UdDgQWBBTvR6U7d9zdmqbIl+g3SLa9
+8CChvzANBgkqhkiG9w0BAQUFAAOCAQEAWvDhU3Tk+cCZoThs2I2HLChX7cEjsjz9
+3ZHdWbsgJzPS0xVAdoR1FraNf6PYUvZxbDhsoO2UEZS5IUyOxdWWuP2jaqUpVxY/
+1fSTQQbvOujO+fZzNhJ8nIy/4FgFDWWqABHbVTfGVzImcxC1AJoQ8jkU9Dio5dIl
+uKQCDz8fu1hbkQZ/NP53cNDkTV0t/bvRtEHGrOJYc1rEFRuTLSkPvItsGffWHhIC
+mCrhgP7LeIv2iiNK7qgbhaFRHXAs/JMXAc/Y4YD1renUQCA4cLPF679N4oixMvxD
+Neib9lWMnEYRIynoqQE3UXYnb3GDinEg/soKH73QAq0dyjcfuk30FA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd.nordu.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowd.nordu.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.nordu.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd.nordu.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd.nordu.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowd.nordu.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.nordu.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd.nordu.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crowd.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowd.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crowd.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://crowd.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">NORDUnet Tools</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">NORDUnet Tools (confluence, jira)</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid: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">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:EmailAddress>operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/csbmth.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/csbmth.sisoshibboleth.co.uk-entity.xml
new file mode 100644
index 00000000..17a30743
--- /dev/null
+++ b/swamid-interfederations-2.0/csbmth.sisoshibboleth.co.uk-entity.xml
@@ -0,0 +1,82 @@
+<?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://csbmth.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-06-06T10:39: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://csbmth.siso.co/sso/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://csbmth.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 Bournemouth University ~ CSBmth, Online Resource Booking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SiSo Bournemouth University ~ CSBmth, 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>
+						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
+						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
+						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
+						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
+						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
+						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
+						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
+						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
+						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
+						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
+						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
+						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
+						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://csbmth.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://csbmth.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://csbmth.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://csbmth.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://csbmth.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://csbmth.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://csbmth.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 Bournemouth University ~ CSBmth, 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/ct0.cirqahosting.com-shibboleth.xml b/swamid-interfederations-2.0/ct0.cirqahosting.com-shibboleth.xml
new file mode 100644
index 00000000..bb8748b7
--- /dev/null
+++ b/swamid-interfederations-2.0/ct0.cirqahosting.com-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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://ct0.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-23T14:28: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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IS Oxford Heritage Cirqa Test Server 0</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IS Oxford's test server zero for Heritage Cirqa and Heritage Online.</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ct0.cirqahosting.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ct0.cirqahosting.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>
+						MIIDFTCCAf2gAwIBAgIJAJXCrMqE2P9KMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGmN0MC5pc294Zm9yZC1ob3N0aW5nLmxvY2FsMB4XDTE1MDEyMjE2MDMzOFoX
+						DTI1MDExOTE2MDMzOFowJTEjMCEGA1UEAxMaY3QwLmlzb3hmb3JkLWhvc3Rpbmcu
+						bG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDF0P3NYvYeSAcJ
+						pb6PAVJ3BJlwqOYn/gI32UQyMkDx1tuma1YMguN+qFhPXjPelPGLQjTu5uiVUKxq
+						923GT3K+zOjeHA2PYLEPb87c/4gEKNcISQ4+7HRbcQ4CNpka/gMYZwoj2n03AWR2
+						+3cLDIjFkxgGLUvCqf+woMCe4ibfDnNdNfHIRGHqf9Ig5/kA0rLLwdWiG3Ni3lS6
+						XnfbZiFlrl+pGphxn7DTz/kIOO30eyLqsMYTbN4a7stsTognmIvMn81SsHZFDlmc
+						bjG6Li4pup93azLJ/oL71lpCjq8X1UpkWjPPSnCVUcyGyhlbgt2MXAKDyzYyxW0i
+						FfWy+L6/AgMBAAGjSDBGMCUGA1UdEQQeMByCGmN0MC5pc294Zm9yZC1ob3N0aW5n
+						LmxvY2FsMB0GA1UdDgQWBBT8AZVMa93QvqUSr3jzjjqrnQbrUTANBgkqhkiG9w0B
+						AQUFAAOCAQEAYjPmH6RGRlaX8F7nFlBvBw3emJiDWM37n5AsaOFpFvT4cM9+821E
+						tkRHXx6RUgQsY0wtEDgGnfwUiOSMWZgDwHQ1tJIU3ZiUJX5jGvmVVXXQc1DP2aqS
+						7+W3hpSjMDqSg4UEdbdIRK6tp33FDU+N3ODPpMQiA9BO/9+I5HlVF9qTf3bboMRn
+						vzlz8MaQdTjd0WCNIWwgwHDV9oarqFVlR2ua47I4S0+uFZuVvANjT3aWHrs+HQEC
+						2d+z3aSYxXX1niPf2VzWZAt+EsudeCodby4bcK/ZAyJzWi4PaJ9RAlk7JFfVclmd
+						klAUpve3xeJcOQJGYv1NItVmF0PCkrmu0Q==
+					</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://ct0.cirqahosting.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ct0.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">IS Oxford Heritage Cirqa Test Server 0</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/cts-dev.ngs.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/cts-dev.ngs.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..729f0d9f
--- /dev/null
+++ b/swamid-interfederations-2.0/cts-dev.ngs.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,83 @@
+<?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://cts-dev.ngs.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-08-13T15:41:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="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://cts-dev.ngs.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CTS development</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Development SP for NES SARoNGS server.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC+jCCAeKgAwIBAgIJALEcGlMiED8+MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEWN0cy1kZXYubmdzLmFjLnVrMB4XDTEyMDgxNTE0MjM1MVoXDTIyMDgxMzE0
+						MjM1MVowHDEaMBgGA1UEAxMRY3RzLWRldi5uZ3MuYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDUdK6J5wg+5C3XYk84xtApr1yJtuCx4n6mcX0O
+						6VHocCab3ROfBhzZZIzzG88n5cE80bhLO+bPPGTv6RQGRz/zyH++S7halU+MUj6Y
+						S3S1E5z6EYPM2FuoY4O4PiKZbLsPAvBSRcPy9R32ZKDLi9/Wxu0AudB0Pueft0o2
+						4GmEwGQoEU1zcBnm5UTQkK8BFciPHGsnsRBnLjUbMDPYqOzvcMEfeyZ4TbVnyrFV
+						zjNSIIQAhoGOXcumy/TzWE3ItQOMKwpgFpJAu0ESH6+L4u7tzZh/YI55LSEIeWdT
+						5LWv73sD7qsmMrsaLywriBYqscQ+w0sXjRAwRHIwpFFz/I21AgMBAAGjPzA9MBwG
+						A1UdEQQVMBOCEWN0cy1kZXYubmdzLmFjLnVrMB0GA1UdDgQWBBRnwG5eWrKe/lPu
+						HZ4m4O7meVYuHjANBgkqhkiG9w0BAQUFAAOCAQEAQbFdqMTEPK1BXxPinmL7a+PY
+						MVNBX7GEFJtA5+pLDlFW1LONdaiWT+6DwjGhy5W8zNNAJA/HXnpVetU9JfAZq0Mj
+						8aHTadN84/xwzvYxparP7jA/lThYpFzEVm7IPZ09xHDR/FiH2oA9R4h3zD6gvBJD
+						mpR0lnz7iXjMB5vq1Hz1tHddkaX+ffp6cltDwRrOYzvYeuCXk6jkZHx5C/tBfB9r
+						YmAXwx0UJskbUvEL2EtPQBNcJUt0Xrs+P0HXxwA4uDQOBX5K/NhAhhz5A9n02l8r
+						DeRgH/OFbPn1DgrOvHjHOdgKHNxXPzW4BRhl9jaPwofj6qysJ183Wr7GLmTOlA==
+					</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://cts-dev.ngs.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cts-dev.ngs.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">CTS development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stfc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@grid-support.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Suleman</md:GivenName>
+    <md:SurName>Tariq</md:SurName>
+    <md:EmailAddress>mailto:suleman.tariq@stfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cts.ngs.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/cts.ngs.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..c9333905
--- /dev/null
+++ b/swamid-interfederations-2.0/cts.ngs.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,89 @@
+<?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://cts.ngs.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-11-12T17:11:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="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://cts.ngs.ac.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEuzCCA6OgAwIBAgIRAJBEMY4fVk7v47Bxgouy4uMwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjA0MjYwMDAwMDBaFw0xNTA0MjYyMzU5NTlaMIGXMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBkRpZGNvdDEy
+						MDAGA1UEChMpU2NpZW5jZSBhbmQgVGVjaG5vbG9neSBGYWNpbGl0aWVzIENvdW5j
+						aWwxFTATBgNVBAsTDFJBTC1lU2NpZW5jZTEWMBQGA1UEAxMNY3RzLm5ncy5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN4sCL+4v3+GM2v5uOoj
+						m5U+XqKDO3kn2GSLm5GB90FdXLicXR5+m9r24ER0aEevvlUrxgU/JilJB+XJPbcY
+						kjVdHll4D3x8+tzrosl294C9UEfy1j7FzEId8vqtjtodoPGoPmOvoljR/IeQfQHu
+						p6DRi1gpcE5hPu2nFJ0b/k2K8X1JbdCusIiqZaOIfQWLO06EYyMRCRqrL3HjajV1
+						iJx6uP8B2NippEeACGy18lt0YtHDs7qj/x7VzQ/cqodAUB/hpQZdLcubzI1TG0Xt
+						OL3JKSVjKziasH7Uw36iJUm8WLMTFa3SCIJT8VNdKvTfeCv7OggReqq/cRAdxbJm
+						rOcCAwEAAaOCAWAwggFcMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
+						MB0GA1UdDgQWBBRXa/dQtrbPu3JiHkWXxFJLeWeX1TAOBgNVHQ8BAf8EBAMCBaAw
+						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYD
+						VR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8v
+						Y3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRh
+						MF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+						U1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9y
+						ZzAYBgNVHREEETAPgg1jdHMubmdzLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQCP
+						NY1/mvTb5R+J1XIkVJYspHneyT7zch5JxeO5GRX9to3n0RrOjKa/fbEeqwd9L3kU
+						pCTzCun+14vVJxA0WZo+Dixn8pp8X8ynxVBxU+7lx0tuws4zYZ25KSDdel9dnE56
+						LWu+eY7A1/a/hzvwmU0FCmebc4AeZIto3/zxp+3Ru6MqvtmUxEKbySIWysRF2O2g
+						3VwFUbLMbqpZN8fRJYoSvID5dTSqYOjzvAa2Kx5u8mtzMF42omix//IwTu0AfQmH
+						Zm+1JamaX0c4BnlYUSaqixjzPb027m5uFDRvUK3hcmgOIBsvrPgmLO4pyUt/On2u
+						X3v8UWz50Il8mjxUF4Ok
+					</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://cts.ngs.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cts.ngs.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">STFC: NGS SARoNGS CTS SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ngs.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NGS HelpDesk</md:GivenName>
+    <md:EmailAddress>mailto:support@grid-support.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Suleman</md:GivenName>
+    <md:SurName>Tariq</md:SurName>
+    <md:EmailAddress>mailto:suleman.tariq@stfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/customers.myunidays.com-shibboleth.xml b/swamid-interfederations-2.0/customers.myunidays.com-shibboleth.xml
new file mode 100644
index 00000000..6e98dd78
--- /dev/null
+++ b/swamid-interfederations-2.0/customers.myunidays.com-shibboleth.xml
@@ -0,0 +1,76 @@
+<?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://customers.myunidays.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-16T17: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:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://customers.myunidays.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://customers.myunidays.com/Shibboleth.sso/Login" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://customers.myunidays.com/Shibboleth.sso/Login" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://customers.myunidays.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://customers.myunidays.com/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://customers.myunidays.com/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://customers.myunidays.com/Shibboleth.sso/DS" index="3"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNiDAYS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Delivering online student discount and promotions from the biggest retailers for free to students.</mdui:Description>
+        <mdui:Logo height="100" width="300">https://d2hltel0toual2.cloudfront.net/images/wayf/logo_300x100px.png</mdui:Logo>
+        <mdui:Logo height="16" width="80">https://d2hltel0toual2.cloudfront.net/images/wayf/logo_80x16px.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDKDCCAhACCQC8EjoQK/aL7jANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJH
+						QjETMBEGA1UECBMKU29tZS1TdGF0ZTEQMA4GA1UEChMHVW5pRGF5czEgMB4GA1UE
+						AxMXY3VzdG9tZXJzLm15dW5pZGF5cy5jb20wHhcNMTIwMzIwMDk0NzUyWhcNMzIw
+						MzE1MDk0NzUyWjBWMQswCQYDVQQGEwJHQjETMBEGA1UECBMKU29tZS1TdGF0ZTEQ
+						MA4GA1UEChMHVW5pRGF5czEgMB4GA1UEAxMXY3VzdG9tZXJzLm15dW5pZGF5cy5j
+						b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwMJfrb7y+eVIjMnMj
+						KQEaWZWX9omtsMmrkxgOAEO5snjni2OJfWShhGmTKpBHClE8AmomOdDr3grEW6Nd
+						5J0+yDh21A7bW6cdaxpwvr2FRZGaIkJFob0Lh7pnH59UIwfeO36fEUa/QfVWafZJ
+						JeWZe4gKcdI+ndY0tMvK4m/pMcO6rxy4AwsJdvxM0bE9R3WNlB8lgcxmbP4pjoZC
+						B29buyOS5/CmFzbA5IffwyJcyk+8dHVF7tbZ0CyjjOsXIrjCryUzsqDOdBLt5yup
+						n6BcBzob6bU8AMojnVT10NCxOWqL+O9i1VScJ/dzyiDbR05iWDa2VQ+/Ya9UpD4d
+						Pl5bAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKp/yt95eag2/oZdvxaIWLzjljEd
+						lZdlxzZVSXgI67Ci+RhBp+jrBAgNrk/2QxEtau8t54Ufy4hxCFh4o/YvQ3F/Rmaz
+						t7jz51Xj4/DeQ0Y/b5Kb+8MaZF8ZCNseU8Fd92c1Io+sAPQPtFqgR+kzxMOQAWET
+						L/IOUn+DhRh434WBVEciLUduGIpP+sI3gaszurWQIJslPrxOEf+X9aDjOSvLqJvw
+						jPsDxBi12zyperdHQgdNr6Jbd1h110XCpJzwCGXElxlNd+Z3R/sMW0wn7lCLYQA7
+						xmBjp1ntxjW8jWQiW/3pb5t/HODL79ntP17sTv4kT8EURtMRgYxttfreDdg=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://customers.myunidays.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://customers.myunidays.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://customers.myunidays.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://customers.myunidays.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://customers.myunidays.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://customers.myunidays.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://customers.myunidays.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MYUNiDAYS Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNiDAYS - Perks of Student Life - Customers</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.myunidays.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Bullock</md:SurName>
+    <md:EmailAddress>mailto:andrew@myunidays.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Bullock</md:SurName>
+    <md:EmailAddress>mailto:andrew@myunidays.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dadotsdev02.essex.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dadotsdev02.essex.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..da3474a5
--- /dev/null
+++ b/swamid-interfederations-2.0/dadotsdev02.essex.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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://dadotsdev02.essex.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:05: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDDCCAfSgAwIBAgIJAILDhwjr7ZN4MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF2RhZG90c2RldjAyLmVzc2V4LmFjLnVrMB4XDTE1MDIyNTE2MTUwM1oXDTI1
+						MDIyMjE2MTUwM1owIjEgMB4GA1UEAxMXZGFkb3RzZGV2MDIuZXNzZXguYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlsK18Tb2IK838pdwwylTu
+						HiF86/nYePu9WhXOBNHq+2LGaA73+j+RVMQnZIvLOWEFDmUtPUZQCALEAy9cVWEy
+						v+clmkXG+yrRB2u2rxMRydNZvPWRyAyceYJtnHUtd6WGqh5P5YzK/h7z8aedHsOe
+						/pINhgmqQowunjXpKPRcVGvd3H5WVzILM9mqROfIJ6sV8I7a0eBBJN2lDLgeUzMO
+						bIYITWKnnVYnzouQU1UDRDCrO3hhuhX21fLE6Lt4BrQJrNMrkSCxDAYuYaHZP2n7
+						c7K4q1A5haGXN9H32eIqCqUcYp/mtf2mQ0Mqm88eDc2IItbs36kUQG9gfUHJp5p9
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2RhZG90c2RldjAyLmVzc2V4LmFjLnVrMB0G
+						A1UdDgQWBBS7fh8aeRB64R+kY5/JJpy41IP9WjANBgkqhkiG9w0BAQUFAAOCAQEA
+						FmsAVt9WPTgZ1bHRZcs9q4CqtIGGRJiRsWbSXIi9rOvt3ZeRYoP/rIF023z9vpEe
+						qEIJZNmXuGwYc9VDL+6qwPdLSNKqb3Zz5M9x7qYAB7VjqLf8lhkzv9HJJ1Cmpwlm
+						q5rJlWCPvdViJ44hMFwB6QEsvDHH34CDQgPegG2EY7Xkm7ugwnniTBqZYcyFU2SH
+						GO+cggiW6+7by2FTk33qTZaSTVMwKK5ZbesGjIriSgQVdHt4FWbE5pKhnNPTaPXH
+						QcjOIA/E0+h92TKhws2T4jj2gyoLE2+f3ah6zfItTKwJgB1yuTSpkVo2Hpnq8lak
+						c3GH0A8MBMfaHeUkrOsmgA==
+					</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://dadotsdev02.essex.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dadotsdev02.essex.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 Development Server 02</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:syrotiuk@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dames.nesc.gla.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dames.nesc.gla.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..d88e735e
--- /dev/null
+++ b/swamid-interfederations-2.0/dames.nesc.gla.ac.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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://dames.nesc.gla.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dames.nesc.gla.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>
+						MIIDAzCCAeugAwIBAgIJAPQi2lDJZSZcMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFGRhbWVzLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDgwNTE2MTMxOVoXDTE5MDgw
+						MzE2MTMxOVowHzEdMBsGA1UEAxMUZGFtZXMubmVzYy5nbGEuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFiNFI3HRhi1pkWtlq5qrZi4EkX4Q1
+						ZphI0wyd3oYMRemFXDP7Qfz+aSOEOnPA5w755P2EGDe9u1O97ETEpcVI0L6ArAPf
+						tKJPQkX95DVgZUD0wnJJc3kuKT2rIWlx5au2cLkHLZCaOIW3k/pCL8DiEcpGCTdm
+						Fnc23dfCoHWZymteu+ddYqmXTYyp5cNEh/rJqx5iuY3hSYmfi0MHcKe7447qvuoS
+						fxl2Lb3cAZUZK/xIR866QWEXDhOABd2weZ+8QwVjAo0aSYFHsKM91YVSq6DHBQC8
+						PKayl04ua0sx5jO40OIFtWnnTaz5JVYeGXLSp/XhhA3xSl95aLGflmS5AgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFGRhbWVzLm5lc2MuZ2xhLmFjLnVrMB0GA1UdDgQWBBSS
+						LnX9HSDn4RLNE/BaliWemJU0YDANBgkqhkiG9w0BAQUFAAOCAQEAZaRyJs7v5746
+						UKnFKwHbhcV9BEdrqAlaSlVpzTW/MrZ9UPHVmwUvUkDbxGNJHGFWUP7RmWcKy3S1
+						fOdSHJaNUqxGN1rKXkXiu2Ti6XXk3SQVHh9A2SU/ihOuPuFc+8LIlNiznlpBnJWH
+						OwfkVyGYl/iixt8Q6QWvWniqkKbl7e6vAqrGMEkAFqVnXm/jZYUyp9sBnNmLLsQf
+						PCXbU+ts+rDkA9pH8rxv+NYkf7qa7+d4tJTJ7Akq5hwAKEGVOJHBksQNpDSkbBGZ
+						10RBzS9+he84NPSi0FdiJiKZf+rHfry5PWnH0KkdkfY/xW7Bf6ka3ZScxMIS++Jn
+						LVUfkyIKAQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDAzCCAeugAwIBAgIJAPQi2lDJZSZcMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFGRhbWVzLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDgwNTE2MTMxOVoXDTE5MDgw
+						MzE2MTMxOVowHzEdMBsGA1UEAxMUZGFtZXMubmVzYy5nbGEuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFiNFI3HRhi1pkWtlq5qrZi4EkX4Q1
+						ZphI0wyd3oYMRemFXDP7Qfz+aSOEOnPA5w755P2EGDe9u1O97ETEpcVI0L6ArAPf
+						tKJPQkX95DVgZUD0wnJJc3kuKT2rIWlx5au2cLkHLZCaOIW3k/pCL8DiEcpGCTdm
+						Fnc23dfCoHWZymteu+ddYqmXTYyp5cNEh/rJqx5iuY3hSYmfi0MHcKe7447qvuoS
+						fxl2Lb3cAZUZK/xIR866QWEXDhOABd2weZ+8QwVjAo0aSYFHsKM91YVSq6DHBQC8
+						PKayl04ua0sx5jO40OIFtWnnTaz5JVYeGXLSp/XhhA3xSl95aLGflmS5AgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFGRhbWVzLm5lc2MuZ2xhLmFjLnVrMB0GA1UdDgQWBBSS
+						LnX9HSDn4RLNE/BaliWemJU0YDANBgkqhkiG9w0BAQUFAAOCAQEAZaRyJs7v5746
+						UKnFKwHbhcV9BEdrqAlaSlVpzTW/MrZ9UPHVmwUvUkDbxGNJHGFWUP7RmWcKy3S1
+						fOdSHJaNUqxGN1rKXkXiu2Ti6XXk3SQVHh9A2SU/ihOuPuFc+8LIlNiznlpBnJWH
+						OwfkVyGYl/iixt8Q6QWvWniqkKbl7e6vAqrGMEkAFqVnXm/jZYUyp9sBnNmLLsQf
+						PCXbU+ts+rDkA9pH8rxv+NYkf7qa7+d4tJTJ7Akq5hwAKEGVOJHBksQNpDSkbBGZ
+						10RBzS9+he84NPSi0FdiJiKZf+rHfry5PWnH0KkdkfY/xW7Bf6ka3ZScxMIS++Jn
+						LVUfkyIKAQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Glasgow</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NeSC (Glasgow): DAMES Portal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dames.org.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/darlfam.darlington.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/darlfam.darlington.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..de926ed2
--- /dev/null
+++ b/swamid-interfederations-2.0/darlfam.darlington.ac.uk-shibboleth.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://darlfam.darlington.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">darlington.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDfjCCAmYCCQCfd04ndbp77DANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMC
+						R0IxDzANBgNVBAgTBkRVUkhBTTETMBEGA1UEBxMKREFSTElOR1RPTjEbMBkGA1UE
+						ChMSREFSTElOR1RPTiBDT0xMRUdFMQswCQYDVQQLEwJJVDEhMB8GA1UEAxMYZGFy
+						bGZhbS5kYXJsaW5ndG9uLmFjLnVrMB4XDTEzMDIyNzEzMDAwOFoXDTIzMDIyNTEz
+						MDAwOFowgYAxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZEVVJIQU0xEzARBgNVBAcT
+						CkRBUkxJTkdUT04xGzAZBgNVBAoTEkRBUkxJTkdUT04gQ09MTEVHRTELMAkGA1UE
+						CxMCSVQxITAfBgNVBAMTGGRhcmxmYW0uZGFybGluZ3Rvbi5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALf2S6/2r5IbxIWlR7SVi1/ba7sgWKa5
+						/GKP8XSwAc38MLyj4/kgLZ0dTN59VM5icjOPvpJaUdkDVecR5B6WpPABCsQ7L/vx
+						K0sQaf1arynMl2ZbAJLNeab7wzVIlmY6mF2EgV/Od/DujnC9tK9bUX7xdrR0IAE6
+						geCst6x/iAPCHWRs0rlabxzR3uuY8dva3VRy5Q1E3wZPLsd61Y70kDUiVsU/Wj8B
+						SKqM9xGp3ciNzJozqPwNKbO9+0y+W6dOv2qZP2w8kLeCRJ9/Gwq2+S2Yrjb0GoBK
+						VV/2oXnX4Q0lFeAzySTV8DzugCEmGzAbNnzwLGv2RiodnKIc9c2iQWMCAwEAATAN
+						BgkqhkiG9w0BAQUFAAOCAQEAsTzNvSkDG0Ldj0orl7Y4GgKi+GvxLJ9ZNWSrYl3+
+						Xjjjx7uKgvaz2mM80d8gUdrFOklykZyDQ80PQW/4KYUC7i+Mgrrdj8RkE3UdGErV
+						lFGZ8+TU7jDrdmmK9JtKDkrCXs7N22lFSTZs7e72pQcez2aq+B17+CV2fuJZeWDb
+						aJGf9FUS7ggB3GD+EtCwkhxQU1vGoDs9HxUbBMsD3T9ce2DryPYOqsSsdACvFil+
+						OBPR70odKIk4LhmIfx8Nc3MzXilS/XVMw9JG68sXalkYQDjBT3/YR9DrywbE5zVe
+						khhFuq8lOaH+cpW82kov+HN3rQQLklwtd3AEAlaM+w4jiQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://darlfam.darlington.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://darlfam.darlington.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://darlfam.darlington.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://darlfam.darlington.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://darlfam.darlington.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://darlfam.darlington.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">darlington.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDfjCCAmYCCQCfd04ndbp77DANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMC
+						R0IxDzANBgNVBAgTBkRVUkhBTTETMBEGA1UEBxMKREFSTElOR1RPTjEbMBkGA1UE
+						ChMSREFSTElOR1RPTiBDT0xMRUdFMQswCQYDVQQLEwJJVDEhMB8GA1UEAxMYZGFy
+						bGZhbS5kYXJsaW5ndG9uLmFjLnVrMB4XDTEzMDIyNzEzMDAwOFoXDTIzMDIyNTEz
+						MDAwOFowgYAxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZEVVJIQU0xEzARBgNVBAcT
+						CkRBUkxJTkdUT04xGzAZBgNVBAoTEkRBUkxJTkdUT04gQ09MTEVHRTELMAkGA1UE
+						CxMCSVQxITAfBgNVBAMTGGRhcmxmYW0uZGFybGluZ3Rvbi5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALf2S6/2r5IbxIWlR7SVi1/ba7sgWKa5
+						/GKP8XSwAc38MLyj4/kgLZ0dTN59VM5icjOPvpJaUdkDVecR5B6WpPABCsQ7L/vx
+						K0sQaf1arynMl2ZbAJLNeab7wzVIlmY6mF2EgV/Od/DujnC9tK9bUX7xdrR0IAE6
+						geCst6x/iAPCHWRs0rlabxzR3uuY8dva3VRy5Q1E3wZPLsd61Y70kDUiVsU/Wj8B
+						SKqM9xGp3ciNzJozqPwNKbO9+0y+W6dOv2qZP2w8kLeCRJ9/Gwq2+S2Yrjb0GoBK
+						VV/2oXnX4Q0lFeAzySTV8DzugCEmGzAbNnzwLGv2RiodnKIc9c2iQWMCAwEAATAN
+						BgkqhkiG9w0BAQUFAAOCAQEAsTzNvSkDG0Ldj0orl7Y4GgKi+GvxLJ9ZNWSrYl3+
+						Xjjjx7uKgvaz2mM80d8gUdrFOklykZyDQ80PQW/4KYUC7i+Mgrrdj8RkE3UdGErV
+						lFGZ8+TU7jDrdmmK9JtKDkrCXs7N22lFSTZs7e72pQcez2aq+B17+CV2fuJZeWDb
+						aJGf9FUS7ggB3GD+EtCwkhxQU1vGoDs9HxUbBMsD3T9ce2DryPYOqsSsdACvFil+
+						OBPR70odKIk4LhmIfx8Nc3MzXilS/XVMw9JG68sXalkYQDjBT3/YR9DrywbE5zVe
+						khhFuq8lOaH+cpW82kov+HN3rQQLklwtd3AEAlaM+w4jiQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://darlfam.darlington.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://darlfam.darlington.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Darlington College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Darlington College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.darlington.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dean</md:GivenName>
+    <md:SurName>Stockdale</md:SurName>
+    <md:EmailAddress>mailto:dstockdale@darlington.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeremy</md:GivenName>
+    <md:SurName>Mussell</md:SurName>
+    <md:EmailAddress>mailto:jmussell@darlington.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/de.dariah.eu-shibboleth.xml b/swamid-interfederations-2.0/de.dariah.eu-shibboleth.xml
new file mode 100644
index 00000000..4f5d0577
--- /dev/null
+++ b/swamid-interfederations-2.0/de.dariah.eu-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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://de.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: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" 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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://de.dariah.eu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DARIAH DE Portal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DARIAH DE Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="de">DARIAH DE Portal</mdui:Description>
+        <mdui:Description xml:lang="en">DARIAH DE Portal</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.dariah.eu</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.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>de.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF9DCCBNygAwIBAgIHF2tAZ4KASTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MTQxMTEzMjdaFw0xOTA0MTMx
+MTEzMjdaMIGAMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRUwEwYDVQQDEwxkZS5kYXJpYWguZXUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZp/ckQV5+5fVFKklNcaWwsXE1aqd7
+elspcZIWG9GFjZFXi1h9MW93AdkD23JsC2F9Go1YPkdyYJ80m5cGT6Bya7bk8Ofr
+tD8NYgqPrnVJTGOrr/u/rdtKqU7JCLp7/iP7XhahmAreLxSUYtZbfyNK9IH+Ngow
+hQTQ8CZsK/c2TQtLENN6LwBM45070Clxqzi05CyQPk9XN6pKyjfoA1uetfoIEhXE
+Qc2WE2yWaGo13bs+dRsRCYRbMofUSF3nv3BjKZ+7GqXlgY8zaI1ClzyFYWcc0VKg
+o/Xsto8RBi0mNIiG5QEacE6E9xlnd9PESmgHKzWySgJgaaF7ok55xym9AgMBAAGj
+ggJBMIICPTA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGt
+IYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUfJtiHWEOr3E4ysMy
+D3UlMdMiCuUwHwYDVR0jBBgwFoAUHb1zzG3ubhx0cNmjGzq6qCfevOswFwYDVR0R
+BBAwDoIMZGUuZGFyaWFoLmV1MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9jYWNybC5j
+cmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4t
+Y2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMGCCsGAQUF
+BzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSgYI
+KwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4t
+Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2Rw
+Mi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
+LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAjw9a18eRFlOY5CnWL0Dyv6iEr4JATxEM
+FhY4cwF+olbhh3FVRLIGe8DDJyeaJfXYEhWUF2TVZCG0W8Cv9Xi2bq5UNbCPzW1S
+Pw4FUAugElJ6xUAd1ENPRTI4ZxRCl2qA2ekta3ScdEq8yqyqvm1sr1AeeVTvVFUr
+IWOh5Xg8l6YkutMWCBczP0ziDxZg61X3qfZqwula8tCE9ntQIqs7Gdn41vOM5JF0
+7J1LhauZnorelWVLa9TJ0a+ZB1ksp6mSzU8miS48I16V8Hh33ZofOHEUe6IaON7h
+mE3K+QQokez7ktDhl8RWvR1efVjD76e6vIB2fItZVnP3Hxvt/ikRBw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://de.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://de.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://de.dariah.eu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://de.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">DARIAH DE Portal</md:ServiceName>
+      <md:ServiceName xml:lang="en">DARIAH DE Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">DARIAH DE Portal</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">DARIAH DE Portal</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="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>Bernd</md:GivenName>
+    <md:SurName>Schloer</md:SurName>
+    <md:EmailAddress>mailto:bernd.schloer@sub.uni-goettingen.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/decbmth.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/decbmth.sisoshibboleth.co.uk-entity.xml
new file mode 100644
index 00000000..cd29dfb2
--- /dev/null
+++ b/swamid-interfederations-2.0/decbmth.sisoshibboleth.co.uk-entity.xml
@@ -0,0 +1,82 @@
+<?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://decbmth.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-06-06T10:58:10Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://decbmth.siso.co/sso/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://decbmth.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 Bournemouth University ~ DECBmth, Online Resource Booking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SiSo Bournemouth University ~ DECBmth, 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>
+						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
+						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
+						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
+						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
+						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
+						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
+						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
+						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
+						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
+						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
+						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
+						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
+						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://decbmth.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://decbmth.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://decbmth.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://decbmth.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://decbmth.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://decbmth.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://decbmth.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 Bournemouth University ~ DECBmth, 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/dep.s2dv.co.uk-shibboleth.xml b/swamid-interfederations-2.0/dep.s2dv.co.uk-shibboleth.xml
new file mode 100644
index 00000000..ef45dc12
--- /dev/null
+++ b/swamid-interfederations-2.0/dep.s2dv.co.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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://dep.s2dv.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-28T09:04:45Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dep.s2dv.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dep.s2dv.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>
+						MIICrjCCAZYCCQDgMPi3gaCJaTANBgkqhkiG9w0BAQUFADAZMRcwFQYDVQQDEw5k
+						ZXAuczJkdi5jby51azAeFw0xMjAzMjAxMDM0NDhaFw0yMTEwMTkxMDM0NDhaMBkx
+						FzAVBgNVBAMTDmRlcC5zMmR2LmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEA260OtuavH9SsL1u8r3jFFu3h19Xo9rt7x9bu8eIM1WigGbMqm9ag
+						v3aVwamCnRyyjG8kJGChD6KrOrYjBSI4OE0smQSVW7SNy2cwY2ImrseKhyhap9Rr
+						NI6c3ddAawG7cvFNetkPddAoEI1Vs3TfFZnA02qUcScMT7ZTlLbL75j7RkIQepdy
+						l3/xD6Qrp3m3N1+tuLi4pxMYXmBlKLLmQcu0TLfYDmDKRowakyZKN4tqKx0tGw/v
+						kE4l5waECFbKBVWIk0A+GcCH1Uch11KbTE/6SOQMq4A5y+Ee7oqgldvUYyjcW1ic
+						q4wR8sOXVAtsElzk0eXycE5KuAYW3aAP4wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+						AQBvVkGHCryLmiekLnyjsSM6VQClJsQBmv8PYnPd27aFweEm1APcTRMETqSU+BHf
+						9WOERh4BYLgABtUG93L9mSSTEHCUjp9KdubGCEpzJP84lYW+dP3PnIolCP4D5P3N
+						WrLAdh9WvLpFR7I7yx1CQ2EUhY8ydszebZUc5FqbqoV/SV69mxsSTmyY2Jr44Zko
+						dOReO4xW0knkopP4t/0U8A8HlPCsV+1J/GNkUBhx7OQlZNnxejj8PZZET7zEeU4a
+						eBnOFtTWrMYru4OCuEepLXTjIRRit4mKuGqOz59j5woy2lfFP/tG35t0EYFiXHv6
+						PbImR0UCz6WD9A9knry75FGl
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dep.s2dv.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Software2 Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Software2 Shibboleth development server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.software2.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ryan</md:GivenName>
+    <md:SurName>Heath</md:SurName>
+    <md:EmailAddress>mailto:ryan.heath@software2.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ryan</md:GivenName>
+    <md:SurName>Heath</md:SurName>
+    <md:EmailAddress>mailto:ryan.heath@software2.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dep.software2.co.uk-shibboleth.xml b/swamid-interfederations-2.0/dep.software2.co.uk-shibboleth.xml
new file mode 100644
index 00000000..deaf9a1d
--- /dev/null
+++ b/swamid-interfederations-2.0/dep.software2.co.uk-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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://dep.software2.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-12T14:12: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dep.software2.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dep.software2.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>
+						MIIDKDCCAhCgAwIBAgIJALhZQuIuYjGPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE2RlcC5zb2Z0d2FyZTIuY28udWswHhcNMTIwNjExMTIyNTQ2WhcNMjIwNjA5
+						MTIyNTQ2WjAeMRwwGgYDVQQDExNkZXAuc29mdHdhcmUyLmNvLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz6rllkkIBrtqI9VLg4L1DFyORCK+5vPW
+						C62r7KVT6u7MrrJfmKLrIOsyuA3gS7dhqjYWS8/JUcc+oRn5jkEPZAlg6veNIAwr
+						cO1xTfNhO+6P1hl/sj3SJWW/UXtqCmJlCEd7MbwmUl12PBqXpzXIuAdctfOXv6gN
+						1nDZOKbCcComoWqP7Q5VjhDa/iSUnIA89UC4L4zdEiHwm2avGWcYYQRovGcb2Q3n
+						vVGMJCiKGZrpZdjK84VALygF2xon8gIuoNoSC2Moxshpz0tX2G3RUOmQeY9A1/g2
+						/S5SImzk1K2GTnEUHqP3SfNBKLkWrHssefeugawuQSy9M6rFyucpCwIDAQABo2kw
+						ZzBGBgNVHREEPzA9ghNkZXAuc29mdHdhcmUyLmNvLnVrhiZodHRwczovL2RlcC5z
+						b2Z0d2FyZTIuY28udWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUyNMP5j8ncGpyHluN
+						5S/3YEzjLREwDQYJKoZIhvcNAQEFBQADggEBAB5cn4wiopEayjYJ+8gO94iZ79PN
+						c3wOX55rdkxUpjzSQ5AmYOvL/oAhnc0RxHl1b0IKk6HaQE6P5Y0j6cMZgPf5EcLq
+						qctUZu48RP/XZtbGUGhSZiIb0GZA5n+rgReDJVo4edti8m5igXfVAyIjXKN4dk+B
+						Ks+tGJWmSvgusX/uVyyAtmEuleiGZQ0vetsLKJ8oZuKwCIpOYFM6tUYsNd1S+GOs
+						+65oVPVsOglAT+uLTXZ4e9HBQMjYNdbtYNqDQ4+zhU6J8hfZxSM4KuO/GpRdCRkE
+						ozWdui8KYHLFyd5pK5kGN7XKv9GwxzWcV/4hfiAY0UAqZqqdZWFNuKYTaWM=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dep.software2.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dep.software2.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dep.software2.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dep.software2.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dep.software2.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dep.software2.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dep.software2.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dep.software2.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dep.software2.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dep.software2.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dep.software2.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Software2 Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Software2 Software eDistribution Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.software2.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ryan</md:GivenName>
+    <md:SurName>Heath</md:SurName>
+    <md:EmailAddress>mailto:ryan.heath@software2.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ryan</md:GivenName>
+    <md:SurName>Heath</md:SurName>
+    <md:EmailAddress>mailto:ryan.heath@software2.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev-sso.knewknovel.com-entry-uk_federation-Metadata.xml b/swamid-interfederations-2.0/dev-sso.knewknovel.com-entry-uk_federation-Metadata.xml
new file mode 100644
index 00000000..717581a1
--- /dev/null
+++ b/swamid-interfederations-2.0/dev-sso.knewknovel.com-entry-uk_federation-Metadata.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev-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-06-21T13:15:39Z"/>
+  </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">The Knovel website integrates technical reference information with analytical and search tools for engineers.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Knovel Corporation: Phoenix Dev-SSO Test</mdui:DisplayName>
+        <mdui:Logo height="115" width="350">https://dev-content.knewknovel.com/web/integration/ukfed/images/logo_350_115.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDyjCCArKgAwIBAgIJALW6A/BUfZ3FMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNV
+						BAYTAlVTMQswCQYDVQQIEwJOWTEMMAoGA1UEBxMDTllDMRswGQYDVQQKExJLbm92
+						ZWwgQ29ycG9yYXRpb24xHzAdBgNVBAMTFmRldi1zc28ua25ld2tub3ZlbC5jb20w
+						HhcNMTQwNDE0MTMxMjU1WhcNMzQwNDA5MTMxMjU1WjBmMQswCQYDVQQGEwJVUzEL
+						MAkGA1UECBMCTlkxDDAKBgNVBAcTA05ZQzEbMBkGA1UEChMSS25vdmVsIENvcnBv
+						cmF0aW9uMR8wHQYDVQQDExZkZXYtc3NvLmtuZXdrbm92ZWwuY29tMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnX01rHw3vO6lIPsCouVCUF7ypKNSk9Gu
+						IXCKZ1P+bt4dtd0QE+8HyLkyk6e55Yx+sxsHuD0laHbzvuv35GdhT5Prgct2UMYN
+						UpChSHticrmfOV854FzKDJEfmbeLpS23GhMeHo1x0KFsFOM1tPYGjmxkRDMN5Cvv
+						z9mXmknF/0WEipOWBR4I9aUcmziiZZpqentVdEpYiodVJaOu0hSqOlXs1mDtB4tF
+						KOSzlvDS8qjlA2fynvwe1qAqUd8khp5w5jvVkh4NTPFSl2fIwrQc4irI6NM6Kw7o
+						izflkVuLV2aW2qb1IldI81g2qqOpeP1YYSGrFxDJ3XdEevoza4ozDwIDAQABo3sw
+						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
+						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUjcBQ9UtvvI+ytSMztbS5Z1hnz/cwHwYDVR0j
+						BBgwFoAUjcBQ9UtvvI+ytSMztbS5Z1hnz/cwDQYJKoZIhvcNAQEFBQADggEBAF00
+						MyzrFcM0daBiKqxG3dm7rw3noJF/wQkXNqtRWJvxnB3WpuWNJYn8g1s3m9HhNVNQ
+						8lFfIVzxMHhtZbj2AJSxB+3CtLlxEI+Ek+V4fbIcoAsTfe61OMuNVAJbyvdjjxSC
+						Ewv9B71RSXuU9nZw/Zl0Z3bO0vLvbgtlEKlO/M2U749PxqLjvIPTGL0k+nScpC4y
+						fuVAi8o5ufW2OccVaeMd5WupA7PhJHGGdAN4qszavFkTsE2JIheNdk4Zewob61iu
+						XWQKqMUCvhHMPkCVBWqbAJzSOIE0gqqbsWDxoOhWv6FDj15iOpPxmzc2g1v5g9N5
+						PCaBwus+SIk+uZ5o3uU=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev-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://dev-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://dev-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://dev-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://dev-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 Dev-SSO Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://why.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/dev.atomwide.com-shibboleth.xml b/swamid-interfederations-2.0/dev.atomwide.com-shibboleth.xml
new file mode 100644
index 00000000..56a76a56
--- /dev/null
+++ b/swamid-interfederations-2.0/dev.atomwide.com-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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://dev.atomwide.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-10-21T14:57: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://weather.atomwide.com/Shibboleth.sso/USO/LGfL"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://weather.atomwide.com/Shibboleth.sso/USO/UKAMF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://weather.atomwide.com/Shibboleth.sso/UKAMF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://weather.atomwide.com/Shibboleth.sso/EY"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Atomwide Network Weather Stations</mdui:DisplayName>
+        <mdui:Description xml:lang="en">An online weather station network which gathers data every minute of every day.</mdui:Description>
+        <mdui:Logo height="100" width="175">https://weather.atomwide.com/icons/sp_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>
+						MIIDDDCCAfSgAwIBAgIJAONeeRUO0yHOMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF2F3ZXh0aWlzMDUuYXRvbXdpZGUuY29tMB4XDTEzMTAxNzE1NTQyNVoXDTIz
+						MTAxNTE1NTQyNVowIjEgMB4GA1UEAxMXYXdleHRpaXMwNS5hdG9td2lkZS5jb20w
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFvpx2Ua9cvLumNpJvuWxj
+						uucuLgRXISlIcb/QGPF/+DBPBJVrhOTOsbDwm458yFxUuwT8CVH9S3ZmjcDuQlA/
+						fcyyNI2K5UZG8D8snPxrmUR6KrhhMTW/OHfnAGx6NjZ+yLmgzv/zCVYLpD0RDSNJ
+						/xE1yz2FBeCivGsLU/8fj41YNmBxHiwNn3t83QYh9ZQcsxn2YBGtvYEiYmp096RW
+						dkZoOI+Ak7nhznD8aNwNqHt2Y41zGAcWj1aoxBpHCnsyW7GDLtYaU+T72udTbEu6
+						qUy+MZ65rtNbIWDt9I9gkdu4vNlYOsdFcvbGJJQF9cm9cPA7MDxoktlNPdAf8G4J
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2F3ZXh0aWlzMDUuYXRvbXdpZGUuY29tMB0G
+						A1UdDgQWBBQBD5JKO1GLhc8wheQNQwhgc6jpqjANBgkqhkiG9w0BAQUFAAOCAQEA
+						qI6nu0h16izCKlRwvR8rVbYQzq5yQ+viqa+1UDmJNbMAz1VxrhrKjfDhEkJsAw9k
+						sPgn5H7GUqUmW9igIZ1idnnXNjgevlq4sX51uYjyFEjAYJIYIPDmdGGXaiRmOCED
+						ch63qSLjdmtt//0a4WX04KVBnXC+R1sGkN9sVJixcukI7FJ3zsDAlvmMrg+HkC6G
+						m28GNw7qHxX1MLdsArfCKCwqz7aUbAfnZKu02a+knvRC9kYKx48Mom9fEMDGF8Ev
+						RY26QS88MwyUyIJL1mcYosG0PjqkcpQV03bkbiSzJZLlnQMKi7Wlnyj7+Z8fIwpt
+						357QZECho6a7JiQXFGp1WA==
+					</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://weather.atomwide.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weather.atomwide.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weather.atomwide.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weather.atomwide.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weather.atomwide.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weather.atomwide.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weather.atomwide.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weather.atomwide.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weather.atomwide.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weather.atomwide.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://weather.atomwide.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weather.atomwide.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://weather.atomwide.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weather.atomwide.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://weather.atomwide.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atomwide Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atomwide Network Weather Stations</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.atomwide.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Phil</md:GivenName>
+    <md:SurName>Chapman</md:SurName>
+    <md:EmailAddress>mailto:shibboleth@lgfl.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Phil</md:GivenName>
+    <md:SurName>Chapman</md:SurName>
+    <md:EmailAddress>mailto:shibboleth@lgfl.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.british-history.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.british-history.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..05852cf9
--- /dev/null
+++ b/swamid-interfederations-2.0/dev.british-history.ac.uk-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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://dev.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="2014-08-12T15:43: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.british-history.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dev.british-history.ac.uk/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="33" width="487">https://dev.british-history.ac.uk/images/logo.gif</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">British History Online (Development)</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:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDEjCCAfqgAwIBAgIJAI7HlHmpqucIMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGWRldi5icml0aXNoLWhpc3RvcnkuYWMudWswHhcNMTQwODExMTIxNTEzWhcN
+						MjQwODA4MTIxNTEzWjAkMSIwIAYDVQQDExlkZXYuYnJpdGlzaC1oaXN0b3J5LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA92Lp3IYHaMCh16cu
+						LkWLxaWF0HHc/zTxY/ietppTfnB7RiWymuQftZgpdT/i5XMDoN6i/vsGaozhKB3R
+						uCTM1pWpf727BlQ+kRj05ubZQpU/7zhy5zUdVgB+beOFyeCxNB+vuYMjzLXIXjgg
+						Rja8WaDxw5z2DKRIkU33zctMVzs0xmsZoU9Kdb0EhHywBD2qKo/CtUHAUBRCN/f0
+						Jou6gLBCWhXvqtU+aXYZ45WgMjuIOFkAFEospma7BLMwnkL6naXaa2ZFLre2/W1j
+						eLF8dFYMmpILr4ADqefdI/mRiWMcVPG+c5HkOEC8p6J0bueEsg0qzVkgeKd6zRSK
+						SVXMlQIDAQABo0cwRTAkBgNVHREEHTAbghlkZXYuYnJpdGlzaC1oaXN0b3J5LmFj
+						LnVrMB0GA1UdDgQWBBTQUJ/POKKfY+yYnayMo0F/VtWHGDANBgkqhkiG9w0BAQUF
+						AAOCAQEAyWPC2vo0tNlrItLquM6u+AE9azWtnkpETqcfrpf91fPzIPOICXKcYf9l
+						GByWb5z1vnMaR37BwnOY3pe5228BvJMEeKv47y5z/WdhummD5K7dRjnyc1h0S1rv
+						f3sGhKevqjtc+V4FC0sXSdaYJ+GEk9Ba9rk5YNi4AZLcRU7reSeQDeKbYSBHRyEy
+						BNyc5/DxTFj3jlFPsitPNfLGmeUnShq/mblHv4EvE1UvDk0d7v3wEgTN6pfWn4RV
+						QqvzFvmhNR5slxAD/SNN2eqVsfL6i8K2WzrAqT0cFNNbkxJQf3kAYeCRke0dL1cW
+						w7gyOd8N9gcNQMsWbRCyuxHJB7d5kw==
+					</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://dev.british-history.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.british-history.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.british-history.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.british-history.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.british-history.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.british-history.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.british-history.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.british-history.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.british-history.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.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://dev.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://dev.british-history.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.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://dev.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://dev.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 (Development)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://dev.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/dev.emeraldinsight.com-entity.xml b/swamid-interfederations-2.0/dev.emeraldinsight.com-entity.xml
new file mode 100644
index 00000000..0d62ab2b
--- /dev/null
+++ b/swamid-interfederations-2.0/dev.emeraldinsight.com-entity.xml
@@ -0,0 +1,148 @@
+<?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://dev.emeraldinsight.com/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-09T12:25:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf" index="3"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/TestShib"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/wayf-test"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/dfn-test"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/dfn-test2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/abu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/asc"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/aru"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/asu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/bsu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/bmu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/blc"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/bfc"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/brc"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/bru"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/bnu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/cac"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/chc"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/cmj"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/cru"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/dmu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/doc"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/enu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/icl"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/kiu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/lsbu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/mmu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/nec"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/ncn"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/nrc"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/nou"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/ntu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/qmu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/qmul"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/rgu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/rou"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/ssu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/tvu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/uls"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/umi"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/urhb"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/uab"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/uad"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/ube"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/ubi"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/ubr"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/ubri"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/uco"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/ucu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/ugl"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/uglo"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/ulo"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/uma"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/unut"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/uno"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/upo"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/ure"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/uso"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/usa"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/ust"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/ustr"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/ute"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/ual"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/uwi"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/uwne"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/uwtsd"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/uwa"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/uwe"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/uyo"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/wac"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.emeraldinsight.com/Shibboleth.sso/auth/wel"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.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>
+						MIIDSzCCAjOgAwIBAgIJAPL5yXP0XbhAMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
+						BAMTH2VtLWwxLXJoLXVhdC5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTEwNTA1MDc1
+						MjEyWhcNMjEwNTAyMDc1MjEyWjAqMSgwJgYDVQQDEx9lbS1sMS1yaC11YXQuZW1l
+						cmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						1cPpwOpncLWxjS6YxesBuUjX7wyxMf01E7nIcYbdxYYiINMnd2j4Mi3uzdG8qqbp
+						INCMvPIgzL2827k28SktsY3AftMAYsAiBDzhFwcUce4mrK3QxofpP+aoH3/oswlZ
+						ur3rxHLJYWy/0aO9NqJvd9M5hh2K8L4TlD/FvedqRfrFuviNXoXzC5WqoSGxuT4R
+						gMP1ChbxzcWvJbhkdHuX/TrDH7lq+NUflJHjXDNsBYO0Ko9IPx9GTwfo0tNth9Ym
+						4PZfz6VY5nl4zlDxMktwcOI9ofzAtjAi2MUTDw9YnETqME9I9ums57ke84HCMXSW
+						0ToxuMcWkyjGsb2TEi4jqwIDAQABo3QwcjBRBgNVHREESjBIgh9lbS1sMS1yaC11
+						YXQuZW1lcmFsZGluc2lnaHQuY29thiVodHRwczovL2Rldi5lbWVyYWxkaW5zaWdo
+						dC5jb20vZW50aXR5MB0GA1UdDgQWBBSZx0zhhju5QWnvVBzwzb1HMBk2tTANBgkq
+						hkiG9w0BAQUFAAOCAQEAbw4E1yg5C8G5wWcWqPi/c8gG2kIyYdUtAoMxoVrF0NCe
+						x0YZUDMLIhUNdHKh1RZMbgKG19pTqUmEjPhfE9VXwfsSIv9QrJiJ2zFH7LbnA7bh
+						qnGVhPzee8x88rpS19GcxYitMzifqMxJ7K2bC2++kN87Z5niseL2nSYntB7EmwJp
+						EvutgzIJJoH7Xg8KieuPVJKaia1RHpcA4QAeuWPgyZ2Ez+zuszlq2650KCXgQreL
+						m0sivyuWv7TZVl8D+cLucd23bwknQLioqhhpdwmXrpcKyRHPaRrf3iznD/cHd0Ps
+						lHVWGtQ0Nh/tJIKoMcDif+nTn+Hm4+au0NFb1pX40A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.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 Group Publishing Ltd: Emerald Development Site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://dev.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/dev.k-int.com-shibboleth.xml b/swamid-interfederations-2.0/dev.k-int.com-shibboleth.xml
new file mode 100644
index 00000000..50629748
--- /dev/null
+++ b/swamid-interfederations-2.0/dev.k-int.com-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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://dev.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-09-09T14:33: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.k-int.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dev.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>
+						MIIDEDCCAfigAwIBAgIJANET7G0zB2ebMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDWRldi5rLWludC5jb20wHhcNMTQwOTA4MTUxNTQxWhcNMjQwOTA1MTUxNTQx
+						WjAYMRYwFAYDVQQDEw1kZXYuay1pbnQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA4FRK1M3lvxHPR22JlwT04/9qBnHfwh/Qb3HdfCxslyPnMZ0B
+						EK67BoSmJTwaOxgFc05qiPiFvtC5TAA7J2T9OEKXswsu45VWcDQ6ol/slKsUg8pC
+						1YzR/o935v7tlgLv/2q2MnQq+Be+aRfPDj3x/EEBbtyLl3SGECiz/RZvE0b5fmm6
+						b1vRlIkhaJcedMk0hKeI0HB0S/sVEYqFJ8UGyBA5R6x1Ix3uWqH29yB2nmPAXuTP
+						WEo4ErvyUmkOnzqm6Id4QNyN3ngaLojKRfOOQVbjZ5WSPz8krDydSe2T4VzAjozX
+						f+fizC/O3Vp7SQhoR5qmmE+lO4Crk2+4ZnIIPQIDAQABo10wWzA6BgNVHREEMzAx
+						gg1kZXYuay1pbnQuY29thiBodHRwczovL2Rldi5rLWludC5jb20vc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUYelLBe5LEJDiZ43Ly+/dldqjfOswDQYJKoZIhvcNAQEFBQAD
+						ggEBAGYaZug6eU/zrg+hL8qDgdrRqQMQuDF40s/aUyy5UU3p0Re+Z7KB7bf9tCle
+						Tf+f8zu9ZxxIkQQQuiAwE+x+DNLzldvf4fzYTtdE2VOw9SBV4uSI8fYxspPTnsZT
+						zhAG1Ftcp8OexmaBAK+N05f8Jh069tLoLlDLv4kigccyMWdGTOeHgBhXekm2W5w6
+						CmGRDp+nhCqLP48loKcq8oYJCP/DDpbfvkF8RQnV+x58NaXYZeg+fGRuz5YzDAMK
+						Jmuy/Q2tX05sTkOwM+nMe1p8LGRyZRuOYnEAarUWU/wJhTzVfP3FTonNwdGkCHVJ
+						NZQGTuoZ4yj8q5imTpVcX0ApBkk=
+					</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://dev.k-int.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.k-int.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.k-int.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.k-int.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.k-int.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.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://dev.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://dev.k-int.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.k-int.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.k-int.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.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">Development Server for Knowledge Integration</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.k-int.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chas</md:GivenName>
+    <md:SurName>Woodfield</md:SurName>
+    <md:EmailAddress>mailto:chas.woodfield@k-int.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chas</md:GivenName>
+    <md:SurName>Woodfield</md:SurName>
+    <md:EmailAddress>mailto:chas.woodfield@k-int.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.keynote.co.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.keynote.co.uk-shibboleth.xml
new file mode 100644
index 00000000..40b1dd62
--- /dev/null
+++ b/swamid-interfederations-2.0/dev.keynote.co.uk-shibboleth.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.keynote.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-07-28T15:54: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
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwNDE2
+						MDAwMDAwWhcNMTgwNDE3MjM1OTU5WjCB+TELMAkGA1UEBhMCR0IxEjAQBgNVBAgT
+						CU1pZGRsZXNleDEQMA4GA1UEBxQHSGFtcHRvbjERMA8GA1UEChQIS2V5IE5vdGUx
+						ETAPBgNVBAsUCEtleSBOb3RlMTUwMwYDVQQLFCxUZXJtcyBvZiB1c2UgYXQgd3d3
+						LnZlcmlzaWduLmNvLnVrL3JwYSAoYykwNTEiMCAGA1UECxMZQXV0aGVudGljYXRl
+						ZCBieSBWZXJpU2lnbjEnMCUGA1UECxMeTWVtYmVyLCBWZXJpU2lnbiBUcnVzdCBO
+						ZXR3b3JrMRowGAYDVQQDFBF3d3cua2V5bm90ZS5jby51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBANjKlKP40hmfmHrQdPo2rI+zJUl9eMvL5qNzLgAN
+						QnOgojsZFwpQ3UJxIcm8Od2eIWd1xJne5ijHaeTniBxeJOj2PfDVzFxuvPWXcMYs
+						wusvAOgEcSDjhe2Qk4hBY0dd1T0IvU+8zRK6I+lGfZGkP7kNc+jq6ATyxXB3ayb1
+						1/3yCljsnj27CH5hrym8IA7MCOZhYFXux66LGhT0c4WpKICIGapM6NLDDRI+zqQO
+						C7JUh/7bteC332DJlpp/hEedtcytwdznAsfuFYAqLW0m2C1+F0m42hRYRsdK/8BE
+						wZVvmVEtQ5nD0PhWJle+p5qY2vOsnCoux4w2d8vMnCVQWSECAwEAAaOCAdMwggHP
+						MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6
+						Ly9TVlJTZWN1cmUtRzMtY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmww
+						RgYDVR0gBD8wPTA7BgtghkgBhvhFAQcXAzAsMCoGCCsGAQUFBwIBFh5odHRwczov
+						L3d3dy52ZXJpc2lnbi5jby51ay9ycGEwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+						AQUFBwMCMB8GA1UdIwQYMBaAFA1EXBZTRMGCfh0gqyX0AWPYvnmlMHYGCCsGAQUF
+						BwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNpZ24uY29tMEAG
+						CCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJlLUczLWFpYS52ZXJpc2lnbi5jb20v
+						U1ZSU2VjdXJlRzMuY2VyMG4GCCsGAQUFBwEMBGIwYKFeoFwwWjBYMFYWCWltYWdl
+						L2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4mymsSweLIQUYMCYWJGh0dHA6
+						Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjANBgkqhkiG9w0BAQUFAAOC
+						AQEAVwvsWtkpYSAGQkJ2TV0wfnFg+tMRCSu3nB4KEYCremLxItsnnGuyDLb8/EYT
+						Mfwdr26NKunr+50Ry85EwmAPeYbx6NY9kLb2s/XyujeGHQaDOQTXMRtXvEYoJ5vw
+						lNqMPy5O1Ih3W4TJi+CeX2TVaX4PNS2PKv6GKfIKZC0aWP6ZSurvyBUoI5jaMcoj
+						0/2IqQ9HIxlRdTEIXGuvPfCMzQmQ48RmLHw3ImTb91JkQM31/FwsiIidjWkkgq5M
+						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>
+						MIIGDzCCBPegAwIBAgIQJh9i1AJonsnAFcGwgs/cvzANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwNDE2
+						MDAwMDAwWhcNMTgwNDE3MjM1OTU5WjCB+TELMAkGA1UEBhMCR0IxEjAQBgNVBAgT
+						CU1pZGRsZXNleDEQMA4GA1UEBxQHSGFtcHRvbjERMA8GA1UEChQIS2V5IE5vdGUx
+						ETAPBgNVBAsUCEtleSBOb3RlMTUwMwYDVQQLFCxUZXJtcyBvZiB1c2UgYXQgd3d3
+						LnZlcmlzaWduLmNvLnVrL3JwYSAoYykwNTEiMCAGA1UECxMZQXV0aGVudGljYXRl
+						ZCBieSBWZXJpU2lnbjEnMCUGA1UECxMeTWVtYmVyLCBWZXJpU2lnbiBUcnVzdCBO
+						ZXR3b3JrMRowGAYDVQQDFBF3d3cua2V5bm90ZS5jby51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBANjKlKP40hmfmHrQdPo2rI+zJUl9eMvL5qNzLgAN
+						QnOgojsZFwpQ3UJxIcm8Od2eIWd1xJne5ijHaeTniBxeJOj2PfDVzFxuvPWXcMYs
+						wusvAOgEcSDjhe2Qk4hBY0dd1T0IvU+8zRK6I+lGfZGkP7kNc+jq6ATyxXB3ayb1
+						1/3yCljsnj27CH5hrym8IA7MCOZhYFXux66LGhT0c4WpKICIGapM6NLDDRI+zqQO
+						C7JUh/7bteC332DJlpp/hEedtcytwdznAsfuFYAqLW0m2C1+F0m42hRYRsdK/8BE
+						wZVvmVEtQ5nD0PhWJle+p5qY2vOsnCoux4w2d8vMnCVQWSECAwEAAaOCAdMwggHP
+						MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6
+						Ly9TVlJTZWN1cmUtRzMtY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmww
+						RgYDVR0gBD8wPTA7BgtghkgBhvhFAQcXAzAsMCoGCCsGAQUFBwIBFh5odHRwczov
+						L3d3dy52ZXJpc2lnbi5jby51ay9ycGEwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+						AQUFBwMCMB8GA1UdIwQYMBaAFA1EXBZTRMGCfh0gqyX0AWPYvnmlMHYGCCsGAQUF
+						BwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNpZ24uY29tMEAG
+						CCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJlLUczLWFpYS52ZXJpc2lnbi5jb20v
+						U1ZSU2VjdXJlRzMuY2VyMG4GCCsGAQUFBwEMBGIwYKFeoFwwWjBYMFYWCWltYWdl
+						L2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4mymsSweLIQUYMCYWJGh0dHA6
+						Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjANBgkqhkiG9w0BAQUFAAOC
+						AQEAVwvsWtkpYSAGQkJ2TV0wfnFg+tMRCSu3nB4KEYCremLxItsnnGuyDLb8/EYT
+						Mfwdr26NKunr+50Ry85EwmAPeYbx6NY9kLb2s/XyujeGHQaDOQTXMRtXvEYoJ5vw
+						lNqMPy5O1Ih3W4TJi+CeX2TVaX4PNS2PKv6GKfIKZC0aWP6ZSurvyBUoI5jaMcoj
+						0/2IqQ9HIxlRdTEIXGuvPfCMzQmQ48RmLHw3ImTb91JkQM31/FwsiIidjWkkgq5M
+						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://dev.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://dev.keynote.co.uk/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.keynote.co.uk/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.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">Keynote Development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.keynote.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Vipul</md:GivenName>
+    <md:SurName>Agarwal</md:SurName>
+    <md:EmailAddress>mailto:vipul@byng-systems.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Vipul</md:GivenName>
+    <md:SurName>Agarwal</md:SurName>
+    <md:EmailAddress>mailto:vipul@byng-systems.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ollie</md:GivenName>
+    <md:SurName>Maitland</md:SurName>
+    <md:EmailAddress>mailto:ollie@byng-systems.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@byng-systems.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.ords.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.ords.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..2769bae5
--- /dev/null
+++ b/swamid-interfederations-2.0/dev.ords.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,67 @@
+<?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://dev.ords.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-29T09:08: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.ords.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>
+						MIIDIDCCAgigAwIBAgIJAMTekyIxruAZMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEWRldi5vcmRzLm94LmFjLnVrMB4XDTE0MDMyNjE1MjIwNVoXDTI0MDMyMzE1
+						MjIwNVowHDEaMBgGA1UEAxMRZGV2Lm9yZHMub3guYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCyUaAfy6/+4NEKbLUL7bkZIaaeAZRmerKMSR4L
+						mwgueQ4VAO1mVogr3abLNJz3xtXqHeA4+iYKVyvGVBXoqQGl9SeLuoDRPEOQCxXc
+						sXxt7fEMpuQfqP7Q3XPvPwSpBuvtaac2kZgXIuHcSZZFJTa4d1aSJFgclzwzGh77
+						f7w87Olj85QK1422M2RZq8LDdIcyi/nsqSLHe08Dg9ZiW/yOr22m6mN6oVUz1Prw
+						BEnH6WU5KbwiOweVBt7CzHlLQS47fg6a+O3sQlYQsPnjjYYtODYG015gPk+1CNlm
+						XM4ji6yHbtY7cEmfIcxUHLajFrXNPkrejk/QbZr3ldcE1kzBAgMBAAGjZTBjMEIG
+						A1UdEQQ7MDmCEWRldi5vcmRzLm94LmFjLnVrhiRodHRwczovL2Rldi5vcmRzLm94
+						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFLKTjIENem7hq6zmT3gfDgSqITHf
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCUSxq9Ltpxs0hCKwm+L7pv681mUDEeIlGFyVzy
+						A9GsMVTXJLh4iK+5hnsB1yxuOr5gyXpumDtThvrUNxs2ilhRFpl6FmSdj4B5e2by
+						bRbg/h91jdUuTRh48g9Y1PDD+ni6D672s9acjKqXv62mIAPxGob+2hDOVBHQtLj/
+						Yyug3pfNmTJyPkqZY7vEwuvsOvG+LR6z3hQzL/7kGd+OVtbaKYyeN0QDYozdYyHG
+						IChAFKDUiO1a4J05jUxLuGcto5ozOFurWGieiptFnhlr68t5vGXunQ55r41+5Ixw
+						USr1xa2CyDRm+G7gp/teublqbSKOfBTZ778RRMCK2KQiV+qh
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ords.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://dev.ords.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://dev.ords.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.ords.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 ORDS dev</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.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/dev.overtsoftware.com-shibboleth.xml b/swamid-interfederations-2.0/dev.overtsoftware.com-shibboleth.xml
new file mode 100644
index 00000000..7c354929
--- /dev/null
+++ b/swamid-interfederations-2.0/dev.overtsoftware.com-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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://dev.overtsoftware.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-10-26T10:51: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.overtsoftware.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dev.overtsoftware.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="169" width="350">https://dev.overtsoftware.com/overt-logo-ukfed.png</mdui:Logo>
+        <mdui:Description xml:lang="em">Overt Software Solutions Ltd test SP</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Overt Software Solutions Ltd test SP</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDiDCCAnACCQDQGWbiDKuX9zANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
+						R0IxFzAVBgNVBAgMDldvcmNlc3RlcnNoaXJlMRYwFAYDVQQHDA1LaWRkZXJtaW5z
+						dGVyMSUwIwYDVQQKDBxPdmVydCBTb2Z0d2FyZSBTb2x1dGlvbnMgTHRkMR4wHAYD
+						VQQDDBVkZXYub3ZlcnRzb2Z0d2FyZS5jb20wHhcNMTIxMDI2MDk0MzQ4WhcNMzIx
+						MDIxMDk0MzQ4WjCBhTELMAkGA1UEBhMCR0IxFzAVBgNVBAgMDldvcmNlc3RlcnNo
+						aXJlMRYwFAYDVQQHDA1LaWRkZXJtaW5zdGVyMSUwIwYDVQQKDBxPdmVydCBTb2Z0
+						d2FyZSBTb2x1dGlvbnMgTHRkMR4wHAYDVQQDDBVkZXYub3ZlcnRzb2Z0d2FyZS5j
+						b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpnaTvvvdx98eq58Uw
+						/SZceVTD2oqKhemP63ftjDJbFSwzvldYtELChPyol5N2FTJicgTcNDUG8TaojI5O
+						hD4DEJ8hOeJMyVpvqcLJ08fACvdTeELNRrLm0S5/EbECpwkzCuylFfcW/g3bUyWQ
+						Ygqwh4QdvsHZGt8gpNekL8HHanSHZM6nuqEKmxf3lTyX8HvMUHNpJ+MipJkMwL2C
+						E1t/PmptAma7eK7Fskf55YM+TEf+HDnFbUYEpyEJB5KJbDVPwz+MiClcFp3r96mr
+						4utUYVvNI63d88P6YO2iPF9cuZ/aAFjYDpA5VeDPNC+OebtctnTijuBPIAOO9KJQ
+						xk/1AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAB98gs+wZT9FXroh/WHhAa0DlSlB
+						g+RnjvE0i+sph+SL5yDHurgVS3t7kwCfgsZnlaGNmE5mLXarIC0H4XhZyRyaelyi
+						yZvjfQSjOOfG+cmWxFtyT85EzzIr1yXE9Ze03tkp03ryJKKyeNEyaUA185PhJ0Pd
+						BmzOOThwLq2F59TOtMVq7Zfv7uxtgf9jHPquke/OYQLfv6SpYek4JqUQAZ8vSRe/
+						7NwdnlukTdaDm+xbfscZdIjnSJ1vb6M2lFQXiSkSrlLhYLKejIioRAoelUMRQn1T
+						N9PikIwIaLGqefV92Nl+5+iv2esjVQiGk+O4YPBeuyJJwag601rn0FaL5Qs=
+					</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://dev.overtsoftware.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.overtsoftware.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.overtsoftware.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.overtsoftware.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.overtsoftware.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.overtsoftware.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.overtsoftware.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.overtsoftware.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.overtsoftware.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.overtsoftware.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.overtsoftware.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Overt Software Solutions Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Overt Software Solutions Ltd test SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.overtsoftware.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ed</md:GivenName>
+    <md:SurName>Beddows</md:SurName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ed</md:GivenName>
+    <md:SurName>Beddows</md:SurName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.pf.adidas.com.xml b/swamid-interfederations-2.0/dev.pf.adidas.com.xml
new file mode 100644
index 00000000..1cb0e427
--- /dev/null
+++ b/swamid-interfederations-2.0/dev.pf.adidas.com.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.pf.adidas.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-25T13:35: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>
+						MIIDdjCCAl6gAwIBAgIGAUAaKOiMMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNVBAYT
+						AkRFMQ8wDQYDVQQIEwZCYXllcm4xFzAVBgNVBAcTDkhlcnpvZ2VuYXVyYWNoMQ8w
+						DQYDVQQKEwZhZGlkYXMxHzAdBgNVBAsTFkNDIE1hcmtldGluZyBHbG9iYWwgSVQx
+						ETAPBgNVBAMMCHBpbmdfZGV2MB4XDTEzMDcyNjA4NDcwM1oXDTIzMDcyNDA4NDcw
+						M1owfDELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjEXMBUGA1UEBxMOSGVy
+						em9nZW5hdXJhY2gxDzANBgNVBAoTBmFkaWRhczEfMB0GA1UECxMWQ0MgTWFya2V0
+						aW5nIEdsb2JhbCBJVDERMA8GA1UEAwwIcGluZ19kZXYwggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCCDhQHa7AiG64TEr9I+GCjnBq3dUybpS7R8JI3JkHO
+						xaWXCDxOvuPcoi9xA9PW4TooQgD5QXz+eIyQ2Arb5tyOBmKekWPq4f5KkqYa6qyt
+						pJJTqUuoVbqjQjNP1NVHZmwFsL3Kadnes+87LsgbVtQnpiqYHz3s2WT7YfmlSqXR
+						mMrQt5iVSTX0Tdm5m7wA6Xyzq21faqb6CDYCFZXUe0f/G9WrbJTITN5yc4p8T7NW
+						yeRFVj2v0PFXdv+aAiqkv1W5781M8F5OfBNripwXfT12RONbYvgY8sUFDY6BDlNh
+						vDDKKBQRvTILTKL1QIsRPWvUti5vW9ySDXjFgLvS5DsvAgMBAAEwDQYJKoZIhvcN
+						AQEFBQADggEBAGMrOehUiULVhakwr/l9gIiKaw1txHUYlsVZ740an0vt6y+A2O8L
+						bzPaI2my/y0aV6ddk78ERK2bRkSKVgkLevu/SKTdrE+ClTccCsZquUPK8C/Rbqvd
+						G3trHaSjO91LKgbcA/IQZc3rojZShIsLp0CQ05HBOtB5EzSeLK67gEFiOOTXj49i
+						UOWl9vrHP5khiXkqjhYK2PwoM+wOGDm2PepftBEKb6fCv0IJH6+057xDOhE+rWHN
+						Sn9dCpFe0yTtmyASrOPeHHUbS8wqDEQQjWiA8UO+PKkFESfXduO7eqT/wve5Toj5
+						dkrEwvqRvyw71CgkUBhrKtFp+tc8WVA3MXw=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.pf.adidas.com/sp/ARS.ssaml2" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.pf.adidas.com/sp/SLO.saml2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.pf.adidas.com/sp/SLO.saml2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.pf.adidas.com/sp/SLO.saml2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.pf.adidas.com/sp/SLO.ssaml2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.pf.adidas.com/sp/acs.saml1" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.pf.adidas.com/sp/acs.saml1" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.pf.adidas.com/sp/ACS.saml2" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.pf.adidas.com/sp/ACS.saml2" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.pf.adidas.com/sp/ACS.saml2" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Adidas International Trading B.V.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">adidas UK</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.adidas.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>CRM-Support</md:GivenName>
+    <md:EmailAddress>mailto:CRM-Support@adidas-group.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>CRM-Support</md:GivenName>
+    <md:EmailAddress>mailto:CRM-Support@adidas-group.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Deborah</md:GivenName>
+    <md:SurName>Olivo</md:SurName>
+    <md:EmailAddress>mailto:Deborah.Olivo@externals.adidas-group.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.qmplus.qmul.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c3cbeaa5
--- /dev/null
+++ b/swamid-interfederations-2.0/dev.qmplus.qmul.ac.uk-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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://dev.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:56: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.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>
+						MIIDBjCCAe6gAwIBAgIJAIPqU3kVAWyhMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWRldi5xbXBsdXMucW11bC5hYy51azAeFw0xMjA2MDcxNDQ5MzRaFw0yMjA2
+						MDUxNDQ5MzRaMCAxHjAcBgNVBAMTFWRldi5xbXBsdXMucW11bC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJQ/1Fmpe7Y4Fczs9FF+B6/sS/N9
+						1SRvn3IYtio8Nt0JUB+thfKvl68yUnHwn5QXTZdBCZeQtAD26PY3CkdYtB/xoqLu
+						0/WB5oVFnYDPfHIFgbLGU4D3yTEpkJDjFEj2lfXs29JFvGs1veZnMup+QDTSeA2Q
+						Fl6efsN/zWkwqH0vEvLAm2ar7ovCRqekVVCU18z6XAlmBRAr3RPWCNJ1ANFyhHz0
+						iQKBDK4VWWRcK+851jcRqGQxtCq/e36pISLD90tay5T8zqBWsDJ5V5w57/vhVyN0
+						O/lPS2ACONnA/p2KJEJoPjfx4/8S5QIyWZr+B2sRUmxrn+2g4u5yclL6OTcCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVZGV2LnFtcGx1cy5xbXVsLmFjLnVrMB0GA1UdDgQW
+						BBS74EpjVaBI09AbjkKq11ifr73KtjANBgkqhkiG9w0BAQUFAAOCAQEALoXD6Y4c
+						BKSKOyINLvgG7cbakQBDQvrRKNI4upoY54PG/mt2PT7LD/GNqK59L6J8hGsC9dMI
+						Gtfg7x4lmxneJ/REhyrVH+WaUEH6jfjzHo8Dx7cnyDsRHEeOLLMMOmj5TuzFHwNq
+						VpRjDA9HUHxcewIEjI+kpgtKu29pt1PcKpGvQyQZHABdPOTJSkys8EL6b8gbYofG
+						5h+rt2LoqtmR6mtO/YvW9SDldfl5SLYEqBlrK4t6AYGzlUguqnTd24nVL9ow38OB
+						mFqHxq0Fz6XbSqKOAVhGMqqLplS1gusquKWYDLo5GdHCeFlw5qT42q9RZzBaGJrU
+						Fh/8cnvaYjotUw==
+					</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://dev.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://dev.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://dev.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://dev.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.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://dev.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://dev.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: Development 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/dev.staffsubs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.staffsubs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..7e0e2295
--- /dev/null
+++ b/swamid-interfederations-2.0/dev.staffsubs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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://dev.staffsubs.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="2014-09-29T13:49: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDCTCCAfGgAwIBAgIJAMPTupjyLfCfMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFmRldi5zdGFmZnN1YnMub3guYWMudWswHhcNMTQwOTI2MTMwODA5WhcNMjQw
+						OTIzMTMwODA5WjAhMR8wHQYDVQQDExZkZXYuc3RhZmZzdWJzLm94LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsIra3HDvpQGik+04o7Hi353+
+						0xtA8JgwRy78IYhWNWr4v0a5B5Ahpsc/i7slwZLHmgZirCdMZdgrDktVuEQTbi8m
+						TO7NLo9vra8odrHzHoHmWgvWIOp9Foj6POlPzTNU8snjUMUVNM7ShZ/4jV3H4CGZ
+						vd4zpHmfvkfOYPRkWt4VMUdzjs6fpt9hAeSiEZf7XuS/cbkE/0ZGfo7yHDrq8Ul0
+						1iEp+95odJCuyL3qIf8jSgyqJCJP918d5F6SE3t+u4Q1syQazgNSzHePrwCHSSGR
+						ztZSJeeNZUexdLOYASL/ysNXWVhP77WGjMVqwU4Zv7f0kpl1S9gH12CEaD/NAwID
+						AQABo0QwQjAhBgNVHREEGjAYghZkZXYuc3RhZmZzdWJzLm94LmFjLnVrMB0GA1Ud
+						DgQWBBRVSkzRfVG/AW8Ec4VyYVUEwJ1fZjANBgkqhkiG9w0BAQUFAAOCAQEAl4cc
+						V+K4waP0sgXUQAaNpl+N0r/2DLg0njCJN0QUiWzqvfan6jJ+5FlUYOqeUtLfuOMQ
+						Ikwx9PvFqhoyK+QuP0/9Y5REar4Oinc8xn2nWgpTaKgOcBihdrGeN0k72NbjS+UO
+						g81H9RzGsPzWp1rKC+4AmdJFIaWNiqlcg59FKzF4KiVfXfF123mKIiKr/Pj9ir2k
+						P1B0Wxj420naHJHUIHG2yt64DwKbWRsMgJCdyT4U3zTr7Q4ycO+cMExw7f2z9LIM
+						hvYWVctcejaX+2FYRleI+SzKFzZAT7jAUy1PrYQ7v0MRkBc68iAyycFfStNlZYNF
+						tkBUW7bI089WV6OA0Q==
+					</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://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.staffsubs.ox.ac.uk:8999/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 Development Staff Subscriptions Site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rob</md:GivenName>
+    <md:SurName>Hebron</md:SurName>
+    <md:EmailAddress>mailto:rob.hebron@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev1.redclara.net-shibboleth.xml b/swamid-interfederations-2.0/dev1.redclara.net-shibboleth.xml
new file mode 100644
index 00000000..662087d8
--- /dev/null
+++ b/swamid-interfederations-2.0/dev1.redclara.net-shibboleth.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev1.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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Communities - RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">Comunidades - RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA's Communities Service</mdui:Description>
+        <mdui:Description xml:lang="es">Servicio de Comunidades 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://dev1.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://dev1.redclara.net/Shibboleth.sso/DS" index="2"/>
+    </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
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
+aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
+MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
+bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
+cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
+RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
+l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
+/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
+UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
+amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
+AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
+G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
+ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
+dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
+cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
+KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
+BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
+bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
+ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
+DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
+8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
+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: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
+bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
+cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
+RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
+l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
+/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
+UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
+amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
+AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
+G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
+ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
+dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
+cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
+KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
+BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
+bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
+ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
+DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
+8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
+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:2.0:bindings:SOAP" Location="https://dev1.redclara.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev1.redclara.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev1.redclara.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev1.redclara.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev1.redclara.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev1.redclara.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev1.redclara.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev1.redclara.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev1.redclara.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev1.redclara.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev1.redclara.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev1.redclara.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev1.redclara.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev1.redclara.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev1.redclara.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Communities - RedCLARA</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
+Communities - 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>
diff --git a/swamid-interfederations-2.0/dev2.dariah.eu-shibboleth.xml b/swamid-interfederations-2.0/dev2.dariah.eu-shibboleth.xml
new file mode 100644
index 00000000..6aef4919
--- /dev/null
+++ b/swamid-interfederations-2.0/dev2.dariah.eu-shibboleth.xml
@@ -0,0 +1,110 @@
+<?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://dev2.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:19: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://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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dev2.dariah.eu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Dariah Wiki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Dariah Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="de">DARIAH-DE Wiki</mdui:Description>
+        <mdui:Description xml:lang="en">DARIAH-DE Wiki</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: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>wiki.de.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=wiki.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF/jCCBOagAwIBAgIHF2tAlMzjKDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MTQxMTE0MTJaFw0xOTA0MTMx
+MTE0MTJaMIGFMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRowGAYDVQQDExF3aWtpLmRlLmRhcmlhaC5ldTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANGNzmj1hudMzfTvXsltAAWT
+fmN0YgnhUCSbZ67cUp487ZvCicwFdhcg2uLHxtbQO3HbLagQg4Xa8oWA/4odBWfW
++CC3erj6Amqf+ypSVd/Rssd2Bq6Sm6zVNYC34cs0MOZaT06WQDyY9ygJyYhl4g04
+qAiCISpAbVy9TA81qwE0SCMfcj4mczClVg5nJHV93lRZZc7rzsC7xSWg2Akpv9TS
+uAfp5Ee0QfHeZl1Zsw9fWQAtumdFBlqU2uXBHBlwUN2xjwgX2j7vQJtllbOmQIDp
+ZkZjk26TIgbwrI7WPXjKAoTAEy+qAr7YL2b1oQbe+7BcJ4zhaM3yK3HOXRD1KAkC
+AwEAAaOCAkYwggJCMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMBMBEGDysG
+AQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB0GA1UdDgQWBBQn2EIzO3GM
+hnk0ubTuQl5owPwJpDAfBgNVHSMEGDAWgBQdvXPMbe5uHHRw2aMbOrqoJ9686zAc
+BgNVHREEFTATghF3aWtpLmRlLmRhcmlhaC5ldTCBjwYDVR0fBIGHMIGEMECgPqA8
+hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1n
+b2V0dGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHdBggrBgEFBQcBAQSB0DCB
+zTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZl
+ci9PQ1NQMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1n
+b2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY2Fj
+ZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBADS62Nr+Hh7LJ50zukIm
+JcNJ4BIMP255g5DnYmpaaJ+IDLPvNPRAxT+zqMlFdDGr3xrb+cp4BDY1OQswZaoj
+AMLxXsjv1VAv3bhBGkl+NEyTa7qIGdayIuSutArAo8WXlLfMwR7yNmpiJ3QY8BEj
+CqGJcXyswPLLU7G7v+ChZSJbe4YJOy4IJ8OD9PgTR3FMteX6f6WGr5nWWBO0tZNP
+Fr2Mggyxt/CGpTSZ4kAkQJni1qqJ+QPEPQF59/fNNg4WQ4WBbd0wzKVmc4ikpcmI
+O+llrInqXrOgVYgVxBhaxDOQcWkF8zLxl/C+XbEtG4Z+YPH43usoid2uq541zAb5
+9B0=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.dariah.eu/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.de.dariah.eu/Shibboleth.sso/SAML2/POST" index="8"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Dariah Wiki</md:ServiceName>
+      <md:ServiceName xml:lang="en">Dariah Wiki</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">DARIAH-DE Wiki</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">DARIAH-DE Wiki</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="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>Bernd</md:GivenName>
+    <md:SurName>Schlör</md:SurName>
+    <md:EmailAddress>mailto:bernd.schloer@sub.uni-goettingen.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/dev2.qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dev2.qmplus.qmul.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..26f0297f
--- /dev/null
+++ b/swamid-interfederations-2.0/dev2.qmplus.qmul.ac.uk-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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://dev2.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:58: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev2.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>
+						MIIDCTCCAfGgAwIBAgIJAKIXgZKgUS02MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFmRldjIucW1wbHVzLnFtdWwuYWMudWswHhcNMTQwMTEzMTE1MDE0WhcNMjQw
+						MTExMTE1MDE0WjAhMR8wHQYDVQQDExZkZXYyLnFtcGx1cy5xbXVsLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArfTNUnzPGeKks0JEURWVUhz+
+						fNsXrghIj4a0LpAEl5ez2kyU0q7mAc+uoeBJqNGs2CeOkar9YZseXi/pNXGjpRPS
+						RwGYYdG89vLgnAervT5U8ixW2egPGijU40Yc2pSldnhArOlYnwsILKCF9dDo5opG
+						KDTdEqcl6lCh2UsbAZTpRj1CSPcrPlbw42fWVsRWaxsPtwd2cMn5ioA/ijh3t4eN
+						3ZjpL3/lNhTdkp/CADiKfk1i+QTA0Y00Rc8GWrgh4beg83FEU2cpVbEb/c6tpHCe
+						+OXc1ORX3k928DMLcPMogv1Y8Cbb4LUNWpePrbdmK4EwXng/A0Vphgopx97heQID
+						AQABo0QwQjAhBgNVHREEGjAYghZkZXYyLnFtcGx1cy5xbXVsLmFjLnVrMB0GA1Ud
+						DgQWBBQqyXbyEctK4flSrdXeud1vaiYVqjANBgkqhkiG9w0BAQUFAAOCAQEAo1Xd
+						XXodRs7vG6pZVj1zphCQ18aCxKhyJwxhJXigZ4hSVCKhdt363N/DqrasXC80z1pj
+						L5FNmbl5hYqOO4dboLSNxSccW0gDl6SA16EfSACt6YQukiMsi4O1GiKYNFpC2uhp
+						spxt8IkaPUx5l5uwYr5iZGyMf5vLnJxMURcDTxT/YQT0PBLBktlkHOZuiCAvvnb3
+						BVmXbM2lPBT022q/vcrBjnh1jYlX29wh7fJfewNj7GDhIABwTtGjFJBAyY/Dh6jv
+						VvZoqdpyca2qXnwU8ndOaWizxzCA9JkcAxz5kl/Kd80KOplSaaXtvhazKHnCGPVx
+						6723v/DV2JeGagBADw==
+					</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://dev2.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://dev2.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://dev2.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://dev2.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev2.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://dev2.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://dev2.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: Development2 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/dev2.webauth.soton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dev2.webauth.soton.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..6eccc132
--- /dev/null
+++ b/swamid-interfederations-2.0/dev2.webauth.soton.ac.uk-shibboleth.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev2.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"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSzCCAjOgAwIBAgIUPOcPr59teRI4vOHciwPs5r9o5TkwDQYJKoZIhvcNAQEF
+						BQAwIzEhMB8GA1UEAxMYZGV2Mi53ZWJhdXRoLnNvdG9uLmFjLnVrMB4XDTEwMDYx
+						NTEwNDIxNVoXDTMwMDYxNTEwNDIxNVowIzEhMB8GA1UEAxMYZGV2Mi53ZWJhdXRo
+						LnNvdG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkbKW
+						FxrO0yijODGXGnZsTss0l1AFNxzbyKg1IgddAyCY6TGHdRoC6ZNfKJbWAw+QWf3B
+						KJwyuu//krjW5E87wZM7Dh8c2FTC36+MJJd3DLGqefQqxrYhVdJ0/StZjHZlpOj/
+						E6MMaJXhoCxQtQmP1aRQC8LSuXFv6bpDag9hjrZhaZhlWgaG0WgyPx8fF6AgZKjy
+						1MSZj54orWP3esFMmD2ezDScE9soIrGm4eSSsdqPhgTilmog6Uz2hUtcsnmlbbgA
+						lF83pRCXJ7OxkQO6mBJDQU9djmJdA0PoJP8FTla/ijZs6IiB9QiRdk7G2QbhPaP0
+						suUfeMqVnE1KqkRY1QIDAQABo3cwdTBUBgNVHREETTBLghhkZXYyLndlYmF1dGgu
+						c290b24uYWMudWuGL2h0dHBzOi8vZGV2Mi53ZWJhdXRoLnNvdG9uLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSgTna3WVRPamY0vInfC+IQ8ePCGDANBgkq
+						hkiG9w0BAQUFAAOCAQEAVWZaM6RBcVL8il/nWq30MvZXQ4JkisIQ9gpiMWMERU0j
+						UyYdJX9tlXZkNpuVuILS356iO73JOPt1LblSpQ6ZiBSaiyJjQqdscj3T/Ek7hSlY
+						oSPy6ZjbNqDClIPmVnHgSXriIJ3Aa07S40HgIBQxkZvIspPnazhMz/+v1E/6f88c
+						Oc+0MNLXz4767rs4wcCFppi3ZPVw3ncs3Bk22T5rBEa5mRBd5QWSqrkWQ6cRCqfD
+						mEn396/yBTAFpAWjc4TXmKy9hS8S9V5dZEWRexGH5GFvXCAkinm0FBH82xGjIPHK
+						d+ZyDCU4c8uPzoTu3FJLWrcOLWzaWH3OE/URxPKVfQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dev2.webauth.soton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev2.webauth.soton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dev2.webauth.soton.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.webauth.soton.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev2.webauth.soton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev2.webauth.soton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSzCCAjOgAwIBAgIUPOcPr59teRI4vOHciwPs5r9o5TkwDQYJKoZIhvcNAQEF
+						BQAwIzEhMB8GA1UEAxMYZGV2Mi53ZWJhdXRoLnNvdG9uLmFjLnVrMB4XDTEwMDYx
+						NTEwNDIxNVoXDTMwMDYxNTEwNDIxNVowIzEhMB8GA1UEAxMYZGV2Mi53ZWJhdXRo
+						LnNvdG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkbKW
+						FxrO0yijODGXGnZsTss0l1AFNxzbyKg1IgddAyCY6TGHdRoC6ZNfKJbWAw+QWf3B
+						KJwyuu//krjW5E87wZM7Dh8c2FTC36+MJJd3DLGqefQqxrYhVdJ0/StZjHZlpOj/
+						E6MMaJXhoCxQtQmP1aRQC8LSuXFv6bpDag9hjrZhaZhlWgaG0WgyPx8fF6AgZKjy
+						1MSZj54orWP3esFMmD2ezDScE9soIrGm4eSSsdqPhgTilmog6Uz2hUtcsnmlbbgA
+						lF83pRCXJ7OxkQO6mBJDQU9djmJdA0PoJP8FTla/ijZs6IiB9QiRdk7G2QbhPaP0
+						suUfeMqVnE1KqkRY1QIDAQABo3cwdTBUBgNVHREETTBLghhkZXYyLndlYmF1dGgu
+						c290b24uYWMudWuGL2h0dHBzOi8vZGV2Mi53ZWJhdXRoLnNvdG9uLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSgTna3WVRPamY0vInfC+IQ8ePCGDANBgkq
+						hkiG9w0BAQUFAAOCAQEAVWZaM6RBcVL8il/nWq30MvZXQ4JkisIQ9gpiMWMERU0j
+						UyYdJX9tlXZkNpuVuILS356iO73JOPt1LblSpQ6ZiBSaiyJjQqdscj3T/Ek7hSlY
+						oSPy6ZjbNqDClIPmVnHgSXriIJ3Aa07S40HgIBQxkZvIspPnazhMz/+v1E/6f88c
+						Oc+0MNLXz4767rs4wcCFppi3ZPVw3ncs3Bk22T5rBEa5mRBd5QWSqrkWQ6cRCqfD
+						mEn396/yBTAFpAWjc4TXmKy9hS8S9V5dZEWRexGH5GFvXCAkinm0FBH82xGjIPHK
+						d+ZyDCU4c8uPzoTu3FJLWrcOLWzaWH3OE/URxPKVfQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dev2.webauth.soton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev2.webauth.soton.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md: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 (Dev 2.x)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.soton.ac.uk/isolutions/</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/devapp.shibstats.com-shibboleth.xml b/swamid-interfederations-2.0/devapp.shibstats.com-shibboleth.xml
new file mode 100644
index 00000000..da132485
--- /dev/null
+++ b/swamid-interfederations-2.0/devapp.shibstats.com-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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://devapp.shibstats.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-04-16T14:34: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://devapp.shibstats.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://devapp.shibstats.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Overt Software Solutions Ltd</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is the development server of Overt Software's Shibboleth statistics tool. This tool provides useful statistics from your IdP.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDAzCCAeugAwIBAgIJAPXDaBba8NJ3MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFGRldmFwcC5zaGlic3RhdHMuY29tMB4XDTE0MDMwNzE1MDAzMFoXDTI0MDMw
+						NDE1MDAzMFowHzEdMBsGA1UEAxMUZGV2YXBwLnNoaWJzdGF0cy5jb20wggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkpnNYg2/0yWRlgPMw6GNlAkvKetoS
+						HagRXUgAs8h2c9FcNxwhluHpqFurMIBbXwIJahPJ+R+tqHWqm4A1L+5u90tdOIDl
+						VrZa+uBBowowtTwkXb3qWwI4ova7SOi/f9nyjg2iaUJHn1Cx1n0GRN+f8mP/jfMP
+						qPwJ/FHJ+POgIyxaDq9+H4CGRNLaw5jI0anxAs71voB01HzTL4Jcv/p1u0Gy4oI4
+						BLIU7XwqiiwAnATWcIZNv3GZCpsLgGBayR+sDHT6c+Tec06War2RqIuAWQrNfOun
+						dfonmB/ZbpeCqxwW6JsaV7XsHQjJNDYlhQHUuua577VdCgZJ37o+IbUTAgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFGRldmFwcC5zaGlic3RhdHMuY29tMB0GA1UdDgQWBBRR
+						k1ZGqhczGoKPo2Bx2eN9bWPnVzANBgkqhkiG9w0BAQUFAAOCAQEACmFwrgaWwsRB
+						LhXw4y5NNRhMGd4pumhaMUPvV2otLwM5/BWwbROzOfg1WgtEXOn2sStbefiQMgYE
+						J3iwfj8KD5QcKOeGV8jrBrM0aep8fEjZusAfqNqLF5SgywQBX2IBmtDt+uhM1bZQ
+						9D2qhsmFUHR4TLL9IOCZUTCUNMDY8fpE/DlscHI4KiXE3XRJxJs9grY32RRxkeVK
+						O+NIIOekToPVC6RKgiyN3uQbgs9qyjMJaFfskMZ1Iaz2dAlUulnwXW33a21wSOVs
+						luuCsEMDj0DApXM0/FkXU+FLjqyWHhC4csGN/ybD9YEv7j+J+vcK6oFo3InOc/oY
+						wgPKhs5/IQ==
+					</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://devapp.shibstats.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devapp.shibstats.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://devapp.shibstats.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devapp.shibstats.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://devapp.shibstats.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devapp.shibstats.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://devapp.shibstats.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://devapp.shibstats.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://devapp.shibstats.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://devapp.shibstats.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://devapp.shibstats.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Overt Software Solutions Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Shibboleth statistics web service</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/devidp.nottingham.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..1451f345
--- /dev/null
+++ b/swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://devidp.nottingham.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-28T09:44: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>
+      <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>
+						MIIDRzCCAi+gAwIBAgIUA5OS80D0LlA3LvS5eDD2Hq4DzrQwDQYJKoZIhvcNAQEF
+						BQAwIjEgMB4GA1UEAwwXZGV2aWRwLm5vdHRpbmdoYW0uYWMudWswHhcNMTQxMDMx
+						MDkyNjQ1WhcNMzQxMDMxMDkyNjQ1WjAiMSAwHgYDVQQDDBdkZXZpZHAubm90dGlu
+						Z2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKL+PFWa
+						8gmis/yuN7CVkMDMxgY/IodzeFxKp1LLQOp940Dyni6NZvQwcaopL1xy3qe3+CuP
+						K2J0UFSEhkjvuAq7rhPGq/qJ+kMMzK8nTxV5BM+YbmSXrefbc1M6uaobYAAofWum
+						DZRYFncvdn6TYDIE8Tcy2yz610u9ALvp0BV9VZKL3ht3ARiVnY+S/2KtDYeHhJRc
+						4trPc0QpDbM1I3pAFI8+XJbCNV7tWLI/wueWHZiZmrxZwHhi3i3M2DWB3qKpKLUU
+						HP1W38Qg/Grnnp4am7k5Lmx1/FNlN7dIAaFu6bSU54j46uAxQw4icuB+9FMyb4R2
+						T+VzCvesX7PNBGECAwEAAaN1MHMwHQYDVR0OBBYEFI2ESh06kKiJxg2xSCY8i9XH
+						MbvoMFIGA1UdEQRLMEmCF2RldmlkcC5ub3R0aW5naGFtLmFjLnVrhi5odHRwczov
+						L2RldmlkcC5ub3R0aW5naGFtLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+						DQEBBQUAA4IBAQCeTVMZuAQfGHHdMA1LaCRnCzIoZ4/U2akAK+roof9JcmcUrFgq
+						jGlWrFCwdl+SYJV1uKJUkHP2IxUqMAEBMowDGA7X6fmMt3o7FRi8XIs0fThDahZR
+						v1POHO+Zd1f1c/QdR3X+H3p4+StmIUlaZOAoYOO2dnnn2xq5uLqtXPMQEecBhvyw
+						/DisSotZvG7sBqAru684g6caj1anpFWp/4Lco33Tsfat05IhyPXFAejMBwWm+rOg
+						STEfg62t45ORYCcOVy3e4qS8WScVapCw0/IgXFz48aDArY9Q/wCt/LX2JgKHemZm
+						c7zhBwOf4JaiAhWWrcyhJ7LYH9d7aqLJuTO0
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://devidp.nottingham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devidp.nottingham.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://devidp.nottingham.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devidp.nottingham.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://devidp.nottingham.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.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>
+						MIIDRzCCAi+gAwIBAgIUA5OS80D0LlA3LvS5eDD2Hq4DzrQwDQYJKoZIhvcNAQEF
+						BQAwIjEgMB4GA1UEAwwXZGV2aWRwLm5vdHRpbmdoYW0uYWMudWswHhcNMTQxMDMx
+						MDkyNjQ1WhcNMzQxMDMxMDkyNjQ1WjAiMSAwHgYDVQQDDBdkZXZpZHAubm90dGlu
+						Z2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKL+PFWa
+						8gmis/yuN7CVkMDMxgY/IodzeFxKp1LLQOp940Dyni6NZvQwcaopL1xy3qe3+CuP
+						K2J0UFSEhkjvuAq7rhPGq/qJ+kMMzK8nTxV5BM+YbmSXrefbc1M6uaobYAAofWum
+						DZRYFncvdn6TYDIE8Tcy2yz610u9ALvp0BV9VZKL3ht3ARiVnY+S/2KtDYeHhJRc
+						4trPc0QpDbM1I3pAFI8+XJbCNV7tWLI/wueWHZiZmrxZwHhi3i3M2DWB3qKpKLUU
+						HP1W38Qg/Grnnp4am7k5Lmx1/FNlN7dIAaFu6bSU54j46uAxQw4icuB+9FMyb4R2
+						T+VzCvesX7PNBGECAwEAAaN1MHMwHQYDVR0OBBYEFI2ESh06kKiJxg2xSCY8i9XH
+						MbvoMFIGA1UdEQRLMEmCF2RldmlkcC5ub3R0aW5naGFtLmFjLnVrhi5odHRwczov
+						L2RldmlkcC5ub3R0aW5naGFtLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+						DQEBBQUAA4IBAQCeTVMZuAQfGHHdMA1LaCRnCzIoZ4/U2akAK+roof9JcmcUrFgq
+						jGlWrFCwdl+SYJV1uKJUkHP2IxUqMAEBMowDGA7X6fmMt3o7FRi8XIs0fThDahZR
+						v1POHO+Zd1f1c/QdR3X+H3p4+StmIUlaZOAoYOO2dnnn2xq5uLqtXPMQEecBhvyw
+						/DisSotZvG7sBqAru684g6caj1anpFWp/4Lco33Tsfat05IhyPXFAejMBwWm+rOg
+						STEfg62t45ORYCcOVy3e4qS8WScVapCw0/IgXFz48aDArY9Q/wCt/LX2JgKHemZm
+						c7zhBwOf4JaiAhWWrcyhJ7LYH9d7aqLJuTO0
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://devidp.nottingham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devidp.nottingham.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md: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 : Development</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/dialect.liv-coll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dialect.liv-coll.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..9690ca24
--- /dev/null
+++ b/swamid-interfederations-2.0/dialect.liv-coll.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dialect.liv-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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liv-coll.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEtjCCA56gAwIBAgIRAIO1zR0sJXDtO4ivkEIP7y8wDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjExMTUwMDAwMDBaFw0xNTExMTUyMzU5NTlaMIGKMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKTWVyc2V5c2lkZTESMBAGA1UEBxMJTGl2ZXJwb29s
+						MSQwIgYDVQQKExtMaXZlcnBvb2wgQ29tbXVuaXR5IENvbGxlZ2UxDDAKBgNVBAsT
+						A0xDQzEeMBwGA1UEAxMVZGlhbGVjdC5saXYtc3R1LmNvLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtuDrD0qkEOW4lgDg3jJZyrp+Ubyfw8ikv8xf
+						EUE5zFYTswon1XLddA+RSt0UL0+vM3KRALgl6kOnw6cMWyKxfDoNCDLMcKWtN39L
+						GSyA9cWidzRVrYQ2vRJEv6MUwBo2PMiLIq5Vmyh/A4H7jYviDPDr2QiyL2FNCWYp
+						xZiXDe4F9zj/CNGsfAOjUFjBVGxXyqdIPRmsRH4XNDjDigTepjIunHOZUS6IMWkx
+						RiPtovbpo5EifcNbTJo+lVXyX1lV/dij33GAiVyRSLaNfDTlcVQDrHj0tn2jP8N1
+						il2KohkqRNbfCvyKRrj1h674dXfzVCvt9iVFnJlVEuN0boLcbQIDAQABo4IBaDCC
+						AWQwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLVg
+						CxI5oup0l0VWVDHQPt1n1uAQMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
+						MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysG
+						AQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
+						YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
+						AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
+						KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeC
+						FWRpYWxlY3QubGl2LXN0dS5jby51azANBgkqhkiG9w0BAQUFAAOCAQEAf68MvoBq
+						uWJVyE652ZENKikd4eY99UShXF29WujSt5olh9on15TdKBF6TfY+a3PdfvNHLTfS
+						nTzghinaAf78yzeKFmS1QTPMiNRcKYMLi+4dwpgnb5DuiSvPhz9E0H1a+TkXmq4M
+						36ZxOA8QqFuHz2k1s0NG262BPy1qerEqnj5QJzs7mWKGxobpu9csfiU0NpZejFhv
+						rqomrqYHhrY6GYOENekKOTmbf8USDpzDyWXP0jI9ZpnF6OsC3PdfV3zcs1FGJMXr
+						6330NH1Unn35VsA+kr8kNc+XLCOgK/cw23VLIkroKJgzWdhNo2bEYdQnrZ0T65OZ
+						ZpWxzCt6Sli/hg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dialect.liv-stu.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dialect.liv-stu.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://dialect.liv-stu.co.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dialect.liv-stu.co.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dialect.liv-stu.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dialect.liv-stu.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">liv-coll.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEtjCCA56gAwIBAgIRAIO1zR0sJXDtO4ivkEIP7y8wDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjExMTUwMDAwMDBaFw0xNTExMTUyMzU5NTlaMIGKMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKTWVyc2V5c2lkZTESMBAGA1UEBxMJTGl2ZXJwb29s
+						MSQwIgYDVQQKExtMaXZlcnBvb2wgQ29tbXVuaXR5IENvbGxlZ2UxDDAKBgNVBAsT
+						A0xDQzEeMBwGA1UEAxMVZGlhbGVjdC5saXYtc3R1LmNvLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtuDrD0qkEOW4lgDg3jJZyrp+Ubyfw8ikv8xf
+						EUE5zFYTswon1XLddA+RSt0UL0+vM3KRALgl6kOnw6cMWyKxfDoNCDLMcKWtN39L
+						GSyA9cWidzRVrYQ2vRJEv6MUwBo2PMiLIq5Vmyh/A4H7jYviDPDr2QiyL2FNCWYp
+						xZiXDe4F9zj/CNGsfAOjUFjBVGxXyqdIPRmsRH4XNDjDigTepjIunHOZUS6IMWkx
+						RiPtovbpo5EifcNbTJo+lVXyX1lV/dij33GAiVyRSLaNfDTlcVQDrHj0tn2jP8N1
+						il2KohkqRNbfCvyKRrj1h674dXfzVCvt9iVFnJlVEuN0boLcbQIDAQABo4IBaDCC
+						AWQwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLVg
+						CxI5oup0l0VWVDHQPt1n1uAQMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
+						MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysG
+						AQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
+						YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
+						AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
+						KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeC
+						FWRpYWxlY3QubGl2LXN0dS5jby51azANBgkqhkiG9w0BAQUFAAOCAQEAf68MvoBq
+						uWJVyE652ZENKikd4eY99UShXF29WujSt5olh9on15TdKBF6TfY+a3PdfvNHLTfS
+						nTzghinaAf78yzeKFmS1QTPMiNRcKYMLi+4dwpgnb5DuiSvPhz9E0H1a+TkXmq4M
+						36ZxOA8QqFuHz2k1s0NG262BPy1qerEqnj5QJzs7mWKGxobpu9csfiU0NpZejFhv
+						rqomrqYHhrY6GYOENekKOTmbf8USDpzDyWXP0jI9ZpnF6OsC3PdfV3zcs1FGJMXr
+						6330NH1Unn35VsA+kr8kNc+XLCOgK/cw23VLIkroKJgzWdhNo2bEYdQnrZ0T65OZ
+						ZpWxzCt6Sli/hg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dialect.liv-stu.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dialect.liv-stu.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">The City of Liverpool College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The City of Liverpool College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.liv-coll.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dale</md:GivenName>
+    <md:SurName>Davies</md:SurName>
+    <md:EmailAddress>mailto:dale.davies@liv-coll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dale</md:GivenName>
+    <md:SurName>Davies</md:SurName>
+    <md:EmailAddress>mailto:dale.davies@liv-coll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/digital-library.theiet.org-shibboleth.xml b/swamid-interfederations-2.0/digital-library.theiet.org-shibboleth.xml
new file mode 100644
index 00000000..0f7d7d06
--- /dev/null
+++ b/swamid-interfederations-2.0/digital-library.theiet.org-shibboleth.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://digital-library.theiet.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-10T13: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">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDnDCCAoSgAwIBAgIEUO2gFjANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
+						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
+						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDEwOTE2
+						NTEzNFoXDTIzMDEwNzE2NTEzNFowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
+						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
+						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
+						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAJ6gmhbskGSc6JIIrgYkhU2HkGk56rsq3s5zClxG33mRdBBvDjIYseVy
+						VjodxZTobEhaz9tCgSCwmyh+3+vI1Gm+2QVFpWA1Bbe3NVX0qnMjbD2JC29gO82q
+						wdH0pS6ASSTrdsMdP0mOjlukzquGckWTSbD047/UlFQpHqP0fJXe2n720GAfcXzI
+						GaCHsjX+fpWR3dpjrDc8sJ4ughNajitSAk6Hj7QGDsXSp0EofrwBQ/URbtAuUlnn
+						VruiNrvvskPp0ws/6aRR0IKJpfYQ1FjB9+8h+f/h64PLNEI4/Ro2EOYaRYpoCvRK
+						jHHwV/3lIKs0tX0Qg+Nu9mjIe5+y7EECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						iM/OK0loLP5l5YoyY8gnODXO/+8z6D/QRx5rDqy2SlawXUFS9An/TZc0izm/8Jch
+						N2C5tkVX7mPb95PjNl8B2Oya5CV6nvZROxzVNGyVUY2BzCyR3Np1sYlS0gLgFEtn
+						ZiNR8ktmyaJnQGulYit+OeAx20Cls3AeW3ML/4z93Z8tHgO0hNzMK4cQQfjjCxin
+						vj58/p0mg0+Vl8Z3OpW+VGp/GEkxxfN4pzXGIpg+usyhwClJ8pg7gCDHiOao8tWj
+						zWC78aCP4PfduWFFeOMqoFriwS7V22Gk6CJRRMnHtoz4VLPL69JLX4hitD/w7xb3
+						1a6Bb/viRXYexhT/jLC2ew==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDnDCCAoSgAwIBAgIEUO2gFjANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
+						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
+						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDEwOTE2
+						NTEzNFoXDTIzMDEwNzE2NTEzNFowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
+						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
+						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
+						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAJ6gmhbskGSc6JIIrgYkhU2HkGk56rsq3s5zClxG33mRdBBvDjIYseVy
+						VjodxZTobEhaz9tCgSCwmyh+3+vI1Gm+2QVFpWA1Bbe3NVX0qnMjbD2JC29gO82q
+						wdH0pS6ASSTrdsMdP0mOjlukzquGckWTSbD047/UlFQpHqP0fJXe2n720GAfcXzI
+						GaCHsjX+fpWR3dpjrDc8sJ4ughNajitSAk6Hj7QGDsXSp0EofrwBQ/URbtAuUlnn
+						VruiNrvvskPp0ws/6aRR0IKJpfYQ1FjB9+8h+f/h64PLNEI4/Ro2EOYaRYpoCvRK
+						jHHwV/3lIKs0tX0Qg+Nu9mjIe5+y7EECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						iM/OK0loLP5l5YoyY8gnODXO/+8z6D/QRx5rDqy2SlawXUFS9An/TZc0izm/8Jch
+						N2C5tkVX7mPb95PjNl8B2Oya5CV6nvZROxzVNGyVUY2BzCyR3Np1sYlS0gLgFEtn
+						ZiNR8ktmyaJnQGulYit+OeAx20Cls3AeW3ML/4z93Z8tHgO0hNzMK4cQQfjjCxin
+						vj58/p0mg0+Vl8Z3OpW+VGp/GEkxxfN4pzXGIpg+usyhwClJ8pg7gCDHiOao8tWj
+						zWC78aCP4PfduWFFeOMqoFriwS7V22Gk6CJRRMnHtoz4VLPL69JLX4hitD/w7xb3
+						1a6Bb/viRXYexhT/jLC2ew==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://digital-library.theiet.org/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://digital-library.theiet.org/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Publishing Technology plc</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>Neil</md:GivenName>
+    <md:SurName>Dennis</md:SurName>
+    <md:EmailAddress>mailto:ndennis@theiet.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Talvinder</md:GivenName>
+    <md:SurName>Matharu</md:SurName>
+    <md:EmailAddress>mailto:openathens@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..3147883b
--- /dev/null
+++ b/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dimorus.intranet.ifrj.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFRJ - Instituto Federal do Rio de Janeiro</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFRJ - Instituto Federal do Rio de Janeiro</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifrj.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifrj.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>
+    MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjENMAsGA1UECxMEREdUSTELMAkG
+A1UEBhMCQlIxEDAOBgNVBAMTB2RpbW9ydXMwHhcNMTQwNDA5MTcwMTQ3WhcNMTkw
+NDA4MTcwMTQ3WjAuMQ0wCwYDVQQLEwRER1RJMQswCQYDVQQGEwJCUjEQMA4GA1UE
+AxMHZGltb3J1czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+zv7Fr
+iJbUyXPbTej3P+7DuIYOC/YhVThF56xHKmntH1m8Qof5ehdEe3OAxPzh9PeleDXv
+qycvCDGZK5BRJkPhb8kC0N6oJy9DMuSLFgrPVJAmdka1tuIoADCKZ3Cq2bjMmTJH
+El5bc5GLmGc3J2BYYHIOIidVDXbNb52aqO71KP2ZoohTw2tHv0KseLqAqs4N1tn6
+U90x5zPrBxH4Q/wyV9yiaAjfY+ZEt4yG79lU0bwEpMQUF4Rgeq3ix44z3YYa/sY0
+Tlw//U3AbIpbfUKFj4eTZVeo/JJzSf+yRIz7OM/seE5IGOcXy+VnEM8GMq9/sCxx
+byFREAOJlFuSuDUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAlN7MaEE3P59cno17
+nLTjRIIx7+IGaaOliaLqrD9MKtfNpc9AQNxh911C9/wP7ax1H/Q9un7WdzKOSpjt
+4iDmdOUkdZYXRP7DQvPgaH+xM3D/FlfjzlGmlXFl2VBRN5PaYDr9UGIJ8MBWp5La
+H65ef+sYS/MDc3GsIJocQdeKj1gRIUrBHHdy7vPn8Mk5kxCMddrPr5qA/jaKQOcY
+ZDJp0MNni0s8IGKGWgE6NrBSRTlI+T0vhjBMaTyWu/ypieYfqx2k80H31QuruJP4
+9nhL66LJ5uOeEkGubA7gBXLLjgv98TqdIw0MvFJPjfaK0RO5TUy79N7rSpp+Bk9e
+w/aOYw==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dimorus.intranet.ifrj.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://dimorus.intranet.ifrj.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://dimorus.intranet.ifrj.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dimorus.intranet.ifrj.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dimorus.intranet.ifrj.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dimorus.intranet.ifrj.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>
+      
+MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjENMAsGA1UECxMEREdUSTELMAkG
+A1UEBhMCQlIxEDAOBgNVBAMTB2RpbW9ydXMwHhcNMTQwNDA5MTcwMTQ3WhcNMTkw
+NDA4MTcwMTQ3WjAuMQ0wCwYDVQQLEwRER1RJMQswCQYDVQQGEwJCUjEQMA4GA1UE
+AxMHZGltb3J1czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+zv7Fr
+iJbUyXPbTej3P+7DuIYOC/YhVThF56xHKmntH1m8Qof5ehdEe3OAxPzh9PeleDXv
+qycvCDGZK5BRJkPhb8kC0N6oJy9DMuSLFgrPVJAmdka1tuIoADCKZ3Cq2bjMmTJH
+El5bc5GLmGc3J2BYYHIOIidVDXbNb52aqO71KP2ZoohTw2tHv0KseLqAqs4N1tn6
+U90x5zPrBxH4Q/wyV9yiaAjfY+ZEt4yG79lU0bwEpMQUF4Rgeq3ix44z3YYa/sY0
+Tlw//U3AbIpbfUKFj4eTZVeo/JJzSf+yRIz7OM/seE5IGOcXy+VnEM8GMq9/sCxx
+byFREAOJlFuSuDUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAlN7MaEE3P59cno17
+nLTjRIIx7+IGaaOliaLqrD9MKtfNpc9AQNxh911C9/wP7ax1H/Q9un7WdzKOSpjt
+4iDmdOUkdZYXRP7DQvPgaH+xM3D/FlfjzlGmlXFl2VBRN5PaYDr9UGIJ8MBWp5La
+H65ef+sYS/MDc3GsIJocQdeKj1gRIUrBHHdy7vPn8Mk5kxCMddrPr5qA/jaKQOcY
+ZDJp0MNni0s8IGKGWgE6NrBSRTlI+T0vhjBMaTyWu/ypieYfqx2k80H31QuruJP4
+9nhL66LJ5uOeEkGubA7gBXLLjgv98TqdIw0MvFJPjfaK0RO5TUy79N7rSpp+Bk9e
+w/aOYw==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dimorus.intranet.ifrj.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dimorus.intranet.ifrj.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">IFRJ - Instituto Federal do Rio de Janeiro</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFRJ - Instituto Federal do Rio de Janeiro</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifrj.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifrj.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Marcos Velten</md:SurName>
+    <md:EmailAddress>suporte@ifrj.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml b/swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml
new file mode 100644
index 00000000..2307bc19
--- /dev/null
+++ b/swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dl.acm.org/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>
+						MIIDWDCCAkCgAwIBAgIJANUcbffHlTOXMA0GCSqGSIb3DQEBBQUAMCYxDzANBgNV
+						BAoTBkFDTSBETDETMBEGA1UEAxMKZGwuYWNtLm9yZzAeFw0xMTA1MjUxNTUzMDVa
+						Fw0yMTA1MjIxNTUzMDVaMCYxDzANBgNVBAoTBkFDTSBETDETMBEGA1UEAxMKZGwu
+						YWNtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALQ8v2TtExw3
+						8oEYHxxUGRz1IrTTL7S3oHxZjeBVo4ZayLZQH8bA1qiPIJOodP0i66TA1k3GzdFz
+						jtXudOb6AitHb8Mk3G4JWlOsb+ADPUjFOJ3ju04F10TQfYbLojfWlyoZKwLQ3ah+
+						ua0epuBbTj9dr/AgvCskfzqGthLCxc+MaQAX9bbiLrpaVLANVTg5NxXjJ3AQoWRD
+						GSfnLFfeaj6P5X8w4ZVW7+a89I5BYyD9p4Dv41Y7JUJQYMrYO5ue56anlAnYfJOU
+						2iHiHRE1M55Bw/y8D73KzRJjHxEsbyOSeupyJnwrYPQdHNfTyZI+FG4qe6kOc3u0
+						8HSIqNoNrUcCAwEAAaOBiDCBhTAdBgNVHQ4EFgQUPEvl50vhfaxj5glDDqOnOXXA
+						QTAwVgYDVR0jBE8wTYAUPEvl50vhfaxj5glDDqOnOXXAQTChKqQoMCYxDzANBgNV
+						BAoTBkFDTSBETDETMBEGA1UEAxMKZGwuYWNtLm9yZ4IJANUcbffHlTOXMAwGA1Ud
+						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALDE3j+ryj/f1A0f2425vnckVzZd
+						fu5I6YyyY6p4jYbc9iF72M2JqoQpZAsuzIM2Ma0mJqTCHRpwgfbKsDcIAXJPaIxL
+						ssIElCPzTNvIKHRszZtf+bNoE9rVYa5l+PBkJGxtDy1kyzc65AU4uJTtmlgpgzmd
+						3UVCw4IF1iqhuU925ywULLDl+Ly7bFuif24A4ipqwPEzp9jOTfqkYSUPbCV8mJcE
+						6v6LJ5QxHWswmrQmKtsWxM/W+zqZHiUxfvJyP/iLtdFbnK8v60wK56zj5aTmP9Dy
+						KJoG3T5FEG114OLU9sciO8Tq0Ck/Yhax6jFuAabY2lKXa/Q/gxw+e/+/JlA=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDWDCCAkCgAwIBAgIJANUcbffHlTOXMA0GCSqGSIb3DQEBBQUAMCYxDzANBgNV
+						BAoTBkFDTSBETDETMBEGA1UEAxMKZGwuYWNtLm9yZzAeFw0xMTA1MjUxNTUzMDVa
+						Fw0yMTA1MjIxNTUzMDVaMCYxDzANBgNVBAoTBkFDTSBETDETMBEGA1UEAxMKZGwu
+						YWNtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALQ8v2TtExw3
+						8oEYHxxUGRz1IrTTL7S3oHxZjeBVo4ZayLZQH8bA1qiPIJOodP0i66TA1k3GzdFz
+						jtXudOb6AitHb8Mk3G4JWlOsb+ADPUjFOJ3ju04F10TQfYbLojfWlyoZKwLQ3ah+
+						ua0epuBbTj9dr/AgvCskfzqGthLCxc+MaQAX9bbiLrpaVLANVTg5NxXjJ3AQoWRD
+						GSfnLFfeaj6P5X8w4ZVW7+a89I5BYyD9p4Dv41Y7JUJQYMrYO5ue56anlAnYfJOU
+						2iHiHRE1M55Bw/y8D73KzRJjHxEsbyOSeupyJnwrYPQdHNfTyZI+FG4qe6kOc3u0
+						8HSIqNoNrUcCAwEAAaOBiDCBhTAdBgNVHQ4EFgQUPEvl50vhfaxj5glDDqOnOXXA
+						QTAwVgYDVR0jBE8wTYAUPEvl50vhfaxj5glDDqOnOXXAQTChKqQoMCYxDzANBgNV
+						BAoTBkFDTSBETDETMBEGA1UEAxMKZGwuYWNtLm9yZ4IJANUcbffHlTOXMAwGA1Ud
+						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALDE3j+ryj/f1A0f2425vnckVzZd
+						fu5I6YyyY6p4jYbc9iF72M2JqoQpZAsuzIM2Ma0mJqTCHRpwgfbKsDcIAXJPaIxL
+						ssIElCPzTNvIKHRszZtf+bNoE9rVYa5l+PBkJGxtDy1kyzc65AU4uJTtmlgpgzmd
+						3UVCw4IF1iqhuU925ywULLDl+Ly7bFuif24A4ipqwPEzp9jOTfqkYSUPbCV8mJcE
+						6v6LJ5QxHWswmrQmKtsWxM/W+zqZHiUxfvJyP/iLtdFbnK8v60wK56zj5aTmP9Dy
+						KJoG3T5FEG114OLU9sciO8Tq0Ck/Yhax6jFuAabY2lKXa/Q/gxw+e/+/JlA=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dl.acm.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://dl.acm.org/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dl.acm.org/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dl.acm.org/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Association for Computing Machinery, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Association For Computing Machinery: ACM Digital Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.acm.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Asad</md:GivenName>
+    <md:SurName>Ali</md:SurName>
+    <md:EmailAddress>mailto:ali@acm.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Greenberg</md:SurName>
+    <md:EmailAddress>mailto:greenberg@acm.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-adidp.ucs.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dlib-adidp.ucs.ed.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..2a7d7fdd
--- /dev/null
+++ b/swamid-interfederations-2.0/dlib-adidp.ucs.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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://dlib-adidp.ucs.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:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The EDINA Development 'Music Studio' test SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en"> This is a test SP. It is pretending to be a Music
+					studio and if it were a real one you would see lots of exciting verbiage here.</mdui:Description>
+        <mdui:Logo height="296" width="314">https://dlib-adidp.ucs.ed.ac.uk:442/studio/images/slogan-small.jpg</mdui:Logo>
+        <mdui:Logo height="58" width="110">https://dlib-adidp.ucs.ed.ac.uk:442/Images/edina-logo110x58.jpg</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://dlib-adidp.ucs.ed.ac.uk:442/images/edina-16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dlib-adidp.ucs.ed.ac.uk:442/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>
+						MIIDEjCCAfqgAwIBAgIJAOp8SWyvKcU8MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGWRsaWItYWRpZHAuZWRpbmEuYWMuZWQudWswHhcNMTAwMTA4MTUwMzIyWhcN
+						MjAwMTA2MTUwMzIyWjAkMSIwIAYDVQQDExlkbGliLWFkaWRwLmVkaW5hLmFjLmVk
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4MJyza/0LLunZfz
+						Qloxx+Lhuc17o+r6J3/lJQYKyDbDxA5I325cDTjO/uHWKZOMCvwJ2Ei+Vyo6amDU
+						MTGh3fkpnxuo49ZFtl3+m7/F8TqnxtLg9dC7MDgcbV0w7LOhMKAuW7YT/fHRgC1l
+						czXaiUCknsh2ZThg7nVxdyPpr06hzjW7GCnOeEyq9Ye7U7JiVIOF9v0PHtLDrEm9
+						0xR+cWM58mmk/DWublCdqlRDQMU9K6MJmNDwa54sIEl7uj8C991n18In/xPZVln3
+						+KpPbdiAOoZ4VquNg9UMgyoKmpjRsThNTzcw4z3clD5vQsFG4966kbf38AZ0/KMb
+						rgeN1wIDAQABo0cwRTAkBgNVHREEHTAbghlkbGliLWFkaWRwLmVkaW5hLmFjLmVk
+						LnVrMB0GA1UdDgQWBBRIF+Yh+lFwNDPMK7mU3bmoKmUsSjANBgkqhkiG9w0BAQUF
+						AAOCAQEAQPhbKEcjLNJkWri6phLQ3rf/gegyBfrObo6xdp051/r0ae38XHH8LnSo
+						3ittwFkFVFZ0OLJ4qj5V4UP0jxfRseAP+FYa3TxKHVFhSXKfEk01DWH1mBwus4K7
+						/jSVtxkdA4dmTeT9MDqyeshNOXxihOvWUrLaGew01DIFyIrtovTerU0wviLw+rcU
+						Ev39GsLAtk0xVUFmbP2jWJK6oY8TF99bMPDz/BIjmYFtQUiwBSxvgFgrrlhu2eoo
+						uQa45TasJ39hrEkVZcksB1AlaKnQBbE3AJFxFcnjal6K62WGCWhXRlK+Z6X+Hs9F
+						p1K0c9zlYflwJQRiinQLgUJ/UCNDJw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDEjCCAfqgAwIBAgIJAOp8SWyvKcU8MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGWRsaWItYWRpZHAuZWRpbmEuYWMuZWQudWswHhcNMTAwMTA4MTUwMzIyWhcN
+						MjAwMTA2MTUwMzIyWjAkMSIwIAYDVQQDExlkbGliLWFkaWRwLmVkaW5hLmFjLmVk
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4MJyza/0LLunZfz
+						Qloxx+Lhuc17o+r6J3/lJQYKyDbDxA5I325cDTjO/uHWKZOMCvwJ2Ei+Vyo6amDU
+						MTGh3fkpnxuo49ZFtl3+m7/F8TqnxtLg9dC7MDgcbV0w7LOhMKAuW7YT/fHRgC1l
+						czXaiUCknsh2ZThg7nVxdyPpr06hzjW7GCnOeEyq9Ye7U7JiVIOF9v0PHtLDrEm9
+						0xR+cWM58mmk/DWublCdqlRDQMU9K6MJmNDwa54sIEl7uj8C991n18In/xPZVln3
+						+KpPbdiAOoZ4VquNg9UMgyoKmpjRsThNTzcw4z3clD5vQsFG4966kbf38AZ0/KMb
+						rgeN1wIDAQABo0cwRTAkBgNVHREEHTAbghlkbGliLWFkaWRwLmVkaW5hLmFjLmVk
+						LnVrMB0GA1UdDgQWBBRIF+Yh+lFwNDPMK7mU3bmoKmUsSjANBgkqhkiG9w0BAQUF
+						AAOCAQEAQPhbKEcjLNJkWri6phLQ3rf/gegyBfrObo6xdp051/r0ae38XHH8LnSo
+						3ittwFkFVFZ0OLJ4qj5V4UP0jxfRseAP+FYa3TxKHVFhSXKfEk01DWH1mBwus4K7
+						/jSVtxkdA4dmTeT9MDqyeshNOXxihOvWUrLaGew01DIFyIrtovTerU0wviLw+rcU
+						Ev39GsLAtk0xVUFmbP2jWJK6oY8TF99bMPDz/BIjmYFtQUiwBSxvgFgrrlhu2eoo
+						uQa45TasJ39hrEkVZcksB1AlaKnQBbE3AJFxFcnjal6K62WGCWhXRlK+Z6X+Hs9F
+						p1K0c9zlYflwJQRiinQLgUJ/UCNDJw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dlib-adidp.ucs.ed.ac.uk:442/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">EDINA - Music Studio</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/about/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rod</md:GivenName>
+    <md:SurName>Widdowson</md:SurName>
+    <md:EmailAddress>mailto:idp-admin@steadingsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rod</md:GivenName>
+    <md:SurName>Widdowson</md:SurName>
+    <md:EmailAddress>mailto:idp-admin@steadingsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..b68e0fc5
--- /dev/null
+++ b/swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dlib-brewdog.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="2013-01-31T14:00:45Z">
+      <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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brewdog.edina.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="28" width="28">https://dlib-brewdog.ucs.ed.ac.uk/idp/images/brewdog.28x28.png</mdui:Logo>
+        <mdui:Logo height="128" width="128">https://dlib-brewdog.ucs.ed.ac.uk/idp/images/brewdog.128x128.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">dlib-brewdog test IdP</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUDCCAjigAwIBAgIVANeccAPs62oIBt2itOeJ9C/Li19lMA0GCSqGSIb3DQEB
+						BQUAMCQxIjAgBgNVBAMTGWRsaWItYnJld2RvZy51Y3MuZWQuYWMudWswHhcNMTQw
+						NTA3MTMzNTU3WhcNMzQwNTA3MTMzNTU3WjAkMSIwIAYDVQQDExlkbGliLWJyZXdk
+						b2cudWNzLmVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						mt/seiPGY8dcigWLBiTzvUrOWpZ2L0s7QjqoquCxdUZUUas1D26W4ckKwfWepNgS
+						CzrqVPiWiE57kOtnru7hgmbyr/H3wK61jk+AbBt6HJ1nu8C3UrFTTIp4n4qVxOyl
+						FfNv2Mac7G993nHcWJe+ZyTfKn60Lg467DrlXtF9YzZxVmlb9P5JRm82dINeRnEV
+						xUa4vH6/z8xTx8PQTEU+ysuIaeZrywILH1tlupF2FJXn1U7a3sJmQDvndQy2G7zJ
+						MhaQbRGt1YslAxswo9L3Oa6ppJQE6xEtVAYA1k0OhkFjJsILdsHz6hE18AzU6Q3y
+						BZi5KwEq1dsA0+xFqHsVDQIDAQABo3kwdzBWBgNVHREETzBNghlkbGliLWJyZXdk
+						b2cudWNzLmVkLmFjLnVrhjBodHRwczovL2RsaWItYnJld2RvZy51Y3MuZWQuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBaPv5VZ+7f+IBtMjmjk1+5H3+5W
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBECB+XMAUZwggIzv9rTb9JwRHL2cmOUAdAI4gD
+						uc0SPtNM3laQgk+j/oBgQh4usRhNzz46mp5R1T9KXqu8x9o56TljLuVoYPrBIdBg
+						Qh5/IrZmzLxW35Ukts2zAn7oj9OkEA3UGgiIOsJfW2jSJdNzcOQVXvBt5JKuWbFN
+						KqMISWTNoxDtowm4PB2RRHZ0qpvNQTazyCRdceQ1H10AO6m6LtHkQDWDEUWqYEwe
+						w4R47AnijgrdFW6VTGWagKAB8PLKQ91Ndpn8R5Xa/kR6eU/BgY7j/YoENy7mVLPk
+						YMXogWtrrMGCZRtuWctYDVPv85v7wT5R+k249KrW4f26VTDS
+					</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>
+						MIIDTzCCAjegAwIBAgIUKxS9ua7hRg+odcxJ71xyeIiNul0wDQYJKoZIhvcNAQEF
+						BQAwJDEiMCAGA1UEAxMZZGxpYi1icmV3ZG9nLnVjcy5lZC5hYy51azAeFw0xMzAx
+						MDkxNzA0NDlaFw0zMzAxMDkxNzA0NDlaMCQxIjAgBgNVBAMTGWRsaWItYnJld2Rv
+						Zy51Y3MuZWQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCC
+						vGpWIX/rn23mtBC6J5nPDalkxpZKqEQVkz0Md3PvPMFQLwDqOHzG0ZxDrEgMLFIu
+						iZtUV+v7K8Go5Os1hZH5fnrVAUcMJz/jjoOcY9ebpdISUMuQnzqAxgQZMxtvM7bg
+						hxu6XM06ptgMsOeEKClE+nK4N8D2Q4bqll4LmgAhAdMfYZOOIlYXkmoUq0/bH1Ct
+						86RW9P263Xg2f3uJAGGhwZzJZdLJoEGmjPLGiS86+Xgta5ROKZ7XlUzWKdZD9ksl
+						Ql6Ldp2hhaNgBLRiLCd2775kbdvFQBuPsqQWbgtud5a3s0fG7Dsj4liZvJMhbT0E
+						k7JXfkixQwsVTcD2/615AgMBAAGjeTB3MFYGA1UdEQRPME2CGWRsaWItYnJld2Rv
+						Zy51Y3MuZWQuYWMudWuGMGh0dHBzOi8vZGxpYi1icmV3ZG9nLnVjcy5lZC5hYy51
+						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUqnMv8kEdg9ODir6vmtnr+dCjULAw
+						DQYJKoZIhvcNAQEFBQADggEBABKGMuqUezdTzA44oDwMSS2EfXi5HlwrPt2EAxwa
+						XKYNAPCx1RMI4fJQ9NLpQxmM/32LEXK48p0MwMKPmPG9D9s5ie3ZE/flG1XRxkf1
+						cu97X/2y+6nfehK1RJTTZGH14clN94gjURQy847jT3sHVDN3izX04tMQqc80QhiP
+						MZfC8k4TtMiyljB23c+IQyISJUwdEZAeXsbsoS6/jKx9ZMLt6LOuTqOd17ro0gaL
+						JdExIybhdV1Mz1GvULt04yG1S7ChL0ZNRkeQS3ZvgLx9z3/ead37KJdzvfLNMF8G
+						vgZqgfwajoa65P684/Zk/RdxJdDMPFCzCD7EvDjs9kEUr6s=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-brewdog.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://dlib-brewdog.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://dlib-brewdog.ucs.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-brewdog.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://dlib-brewdog.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://dlib-brewdog.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">brewdog.edina.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUDCCAjigAwIBAgIVANeccAPs62oIBt2itOeJ9C/Li19lMA0GCSqGSIb3DQEB
+						BQUAMCQxIjAgBgNVBAMTGWRsaWItYnJld2RvZy51Y3MuZWQuYWMudWswHhcNMTQw
+						NTA3MTMzNTU3WhcNMzQwNTA3MTMzNTU3WjAkMSIwIAYDVQQDExlkbGliLWJyZXdk
+						b2cudWNzLmVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						mt/seiPGY8dcigWLBiTzvUrOWpZ2L0s7QjqoquCxdUZUUas1D26W4ckKwfWepNgS
+						CzrqVPiWiE57kOtnru7hgmbyr/H3wK61jk+AbBt6HJ1nu8C3UrFTTIp4n4qVxOyl
+						FfNv2Mac7G993nHcWJe+ZyTfKn60Lg467DrlXtF9YzZxVmlb9P5JRm82dINeRnEV
+						xUa4vH6/z8xTx8PQTEU+ysuIaeZrywILH1tlupF2FJXn1U7a3sJmQDvndQy2G7zJ
+						MhaQbRGt1YslAxswo9L3Oa6ppJQE6xEtVAYA1k0OhkFjJsILdsHz6hE18AzU6Q3y
+						BZi5KwEq1dsA0+xFqHsVDQIDAQABo3kwdzBWBgNVHREETzBNghlkbGliLWJyZXdk
+						b2cudWNzLmVkLmFjLnVrhjBodHRwczovL2RsaWItYnJld2RvZy51Y3MuZWQuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBaPv5VZ+7f+IBtMjmjk1+5H3+5W
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBECB+XMAUZwggIzv9rTb9JwRHL2cmOUAdAI4gD
+						uc0SPtNM3laQgk+j/oBgQh4usRhNzz46mp5R1T9KXqu8x9o56TljLuVoYPrBIdBg
+						Qh5/IrZmzLxW35Ukts2zAn7oj9OkEA3UGgiIOsJfW2jSJdNzcOQVXvBt5JKuWbFN
+						KqMISWTNoxDtowm4PB2RRHZ0qpvNQTazyCRdceQ1H10AO6m6LtHkQDWDEUWqYEwe
+						w4R47AnijgrdFW6VTGWagKAB8PLKQ91Ndpn8R5Xa/kR6eU/BgY7j/YoENy7mVLPk
+						YMXogWtrrMGCZRtuWctYDVPv85v7wT5R+k249KrW4f26VTDS
+					</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>
+						MIIDTzCCAjegAwIBAgIUKxS9ua7hRg+odcxJ71xyeIiNul0wDQYJKoZIhvcNAQEF
+						BQAwJDEiMCAGA1UEAxMZZGxpYi1icmV3ZG9nLnVjcy5lZC5hYy51azAeFw0xMzAx
+						MDkxNzA0NDlaFw0zMzAxMDkxNzA0NDlaMCQxIjAgBgNVBAMTGWRsaWItYnJld2Rv
+						Zy51Y3MuZWQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCC
+						vGpWIX/rn23mtBC6J5nPDalkxpZKqEQVkz0Md3PvPMFQLwDqOHzG0ZxDrEgMLFIu
+						iZtUV+v7K8Go5Os1hZH5fnrVAUcMJz/jjoOcY9ebpdISUMuQnzqAxgQZMxtvM7bg
+						hxu6XM06ptgMsOeEKClE+nK4N8D2Q4bqll4LmgAhAdMfYZOOIlYXkmoUq0/bH1Ct
+						86RW9P263Xg2f3uJAGGhwZzJZdLJoEGmjPLGiS86+Xgta5ROKZ7XlUzWKdZD9ksl
+						Ql6Ldp2hhaNgBLRiLCd2775kbdvFQBuPsqQWbgtud5a3s0fG7Dsj4liZvJMhbT0E
+						k7JXfkixQwsVTcD2/615AgMBAAGjeTB3MFYGA1UdEQRPME2CGWRsaWItYnJld2Rv
+						Zy51Y3MuZWQuYWMudWuGMGh0dHBzOi8vZGxpYi1icmV3ZG9nLnVjcy5lZC5hYy51
+						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUqnMv8kEdg9ODir6vmtnr+dCjULAw
+						DQYJKoZIhvcNAQEFBQADggEBABKGMuqUezdTzA44oDwMSS2EfXi5HlwrPt2EAxwa
+						XKYNAPCx1RMI4fJQ9NLpQxmM/32LEXK48p0MwMKPmPG9D9s5ie3ZE/flG1XRxkf1
+						cu97X/2y+6nfehK1RJTTZGH14clN94gjURQy847jT3sHVDN3izX04tMQqc80QhiP
+						MZfC8k4TtMiyljB23c+IQyISJUwdEZAeXsbsoS6/jKx9ZMLt6LOuTqOd17ro0gaL
+						JdExIybhdV1Mz1GvULt04yG1S7ChL0ZNRkeQS3ZvgLx9z3/ead37KJdzvfLNMF8G
+						vgZqgfwajoa65P684/Zk/RdxJdDMPFCzCD7EvDjs9kEUr6s=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-brewdog.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-brewdog.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">dlib-brewdog test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.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/dlib-jiscidp.edina.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dlib-jiscidp.edina.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..bd7c02fc
--- /dev/null
+++ b/swamid-interfederations-2.0/dlib-jiscidp.edina.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dlib-jiscidp.edina.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>
+      <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">collections.jisc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jiscadvance.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edina.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">JISC Executive New</mdui:DisplayName>
+        <mdui:Description xml:lang="en">JISC IdP (maintained by EDINA)</mdui:Description>
+        <mdui:Logo height="39" width="52">https://dlib-jiscidp.edina.ac.uk/img/jisc.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://dlib-jiscidp.edina.ac.uk/img/jiscicon.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>
+						MIIDSzCCAjOgAwIBAgIUZooYXtDuohUPtXHr8p6BHj6IAsEwDQYJKoZIhvcNAQEF
+						BQAwIzEhMB8GA1UEAxMYZGxpYi1qaXNjaWRwLmVkaW5hLmFjLnVrMB4XDTEwMDIy
+						NjEwMDM1OVoXDTMwMDIyNjEwMDM1OVowIzEhMB8GA1UEAxMYZGxpYi1qaXNjaWRw
+						LmVkaW5hLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA479P
+						sZNAGnDd+wlw7o+isg+M++16qHhHNzFPKQBhdA+ojQ0nUjQZZT5SgAVt6WeVE4P3
+						uwG/fWt3cdQ0xYz4pLneqyzve9uuLd0q4J/oqSGKsb9rfIw+Uw7I6K40WySukfpJ
+						7IPREX6z+ymubn7FQOsK9zQ8y6P3Gl67bnnS4CIkot2BKdsX882OoEsDcZGnmXaN
+						12L70pN5vQN3PJzNvc8/sz6u9DgDL8OlXY2fn6ASJ2y2etuHCLkAUSsB14pntgyA
+						WOL0fr7SETJq5y2bCz8SLyoEXqBNe32be2S1prWB5Ioq3gxA9vF1e2WRq/j6AL0U
+						q0s8dAFizK4WjN6nVQIDAQABo3cwdTBUBgNVHREETTBLghhkbGliLWppc2NpZHAu
+						ZWRpbmEuYWMudWuGL2h0dHBzOi8vZGxpYi1qaXNjaWRwLmVkaW5hLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRFE/N5nUQ7MQ/bdOJ1S5cFrY39wTANBgkq
+						hkiG9w0BAQUFAAOCAQEAIzqOynQb9fyfwh4A+r94vl+OvVxg1FPtcZtTYx+6S3L1
+						lLZV6V3urshRREuwOwVvF7a6vEk/G8cw8UCLUIuvbSa/kSFZokRhfkSaoBeeO8s3
+						75RIq10OY7S/GFtLI9yMb9Okm7O/CxVi4+0HWWk/59FDkKbnSgdqJ7vDZTMcErWo
+						YQuoeO3mFnbXMgpryJF95isXdiKSJMor9MhrnPkRaJ1KY8iX1PpYNCuvJKM/TrRM
+						lES1uOmAEuYzRJ7ih5DMjY9bdIiPHr/P6ACfsfx5GmjO1NMeLgtIHWG0lKwg9KkP
+						/qwJiPguX3f69bdizxAelZA/3dsl2Tmp9LLuliVkeg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-jiscidp.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://dlib-jiscidp.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://dlib-jiscidp.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-jiscidp.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-jiscidp.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-jiscidp.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">jisc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">collections.jisc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jiscadvance.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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>
+						MIIDSzCCAjOgAwIBAgIUZooYXtDuohUPtXHr8p6BHj6IAsEwDQYJKoZIhvcNAQEF
+						BQAwIzEhMB8GA1UEAxMYZGxpYi1qaXNjaWRwLmVkaW5hLmFjLnVrMB4XDTEwMDIy
+						NjEwMDM1OVoXDTMwMDIyNjEwMDM1OVowIzEhMB8GA1UEAxMYZGxpYi1qaXNjaWRw
+						LmVkaW5hLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA479P
+						sZNAGnDd+wlw7o+isg+M++16qHhHNzFPKQBhdA+ojQ0nUjQZZT5SgAVt6WeVE4P3
+						uwG/fWt3cdQ0xYz4pLneqyzve9uuLd0q4J/oqSGKsb9rfIw+Uw7I6K40WySukfpJ
+						7IPREX6z+ymubn7FQOsK9zQ8y6P3Gl67bnnS4CIkot2BKdsX882OoEsDcZGnmXaN
+						12L70pN5vQN3PJzNvc8/sz6u9DgDL8OlXY2fn6ASJ2y2etuHCLkAUSsB14pntgyA
+						WOL0fr7SETJq5y2bCz8SLyoEXqBNe32be2S1prWB5Ioq3gxA9vF1e2WRq/j6AL0U
+						q0s8dAFizK4WjN6nVQIDAQABo3cwdTBUBgNVHREETTBLghhkbGliLWppc2NpZHAu
+						ZWRpbmEuYWMudWuGL2h0dHBzOi8vZGxpYi1qaXNjaWRwLmVkaW5hLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRFE/N5nUQ7MQ/bdOJ1S5cFrY39wTANBgkq
+						hkiG9w0BAQUFAAOCAQEAIzqOynQb9fyfwh4A+r94vl+OvVxg1FPtcZtTYx+6S3L1
+						lLZV6V3urshRREuwOwVvF7a6vEk/G8cw8UCLUIuvbSa/kSFZokRhfkSaoBeeO8s3
+						75RIq10OY7S/GFtLI9yMb9Okm7O/CxVi4+0HWWk/59FDkKbnSgdqJ7vDZTMcErWo
+						YQuoeO3mFnbXMgpryJF95isXdiKSJMor9MhrnPkRaJ1KY8iX1PpYNCuvJKM/TrRM
+						lES1uOmAEuYzRJ7ih5DMjY9bdIiPHr/P6ACfsfx5GmjO1NMeLgtIHWG0lKwg9KkP
+						/qwJiPguX3f69bdizxAelZA/3dsl2Tmp9LLuliVkeg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-jiscidp.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-jiscidp.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">JISC Executive New</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>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/dlib-jose.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dlib-jose.edina.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..88c2b42c
--- /dev/null
+++ b/swamid-interfederations-2.0/dlib-jose.edina.ac.uk-shibboleth.xml
@@ -0,0 +1,80 @@
+<?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://dlib-jose.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-08-06T15:47: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dlib-jose.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>
+						MIIDBjCCAe6gAwIBAgIJALYAE6CsWAKPMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWRsaWItam9zZS5lZGluYS5hYy51azAeFw0xMzA2MjQxNDA5MDBaFw0yMzA2
+						MjIxNDA5MDBaMCAxHjAcBgNVBAMTFWRsaWItam9zZS5lZGluYS5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDMzbnN/ZQhuMO0p2GwUdvLKRmN
+						WRu4J6Yo5yG0lPU2rEdZwkqUyF1o2tDmvNMb3N/FEm4boh2dMnq70K7TihooxB9R
+						MBi2kDeY1y6Or9bzIGK7agEIjjOe+ZZu1jbisU5FOglWd38ek+xHdmVneoYt9hcP
+						ZBu3jsJXQIe3v6j7WoTSxCl0O/ZZpyWtStxZMsJn78czDfFiebS62PxtIBXOwddz
+						yDHn+9Jow05dlnn+pR/VBXScR5JML1Hs/Nwqf698LFU4G9RWe82KYINzfmqMTXYr
+						jZ/epj8Yh+wehFuF2cO5nzwFghl9esayZ8bHAirnu8OirUOF5yHiY4tbfD0CAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVZGxpYi1qb3NlLmVkaW5hLmFjLnVrMB0GA1UdDgQW
+						BBQVT27xYzls4PLIbWszwdXcFqoKDTANBgkqhkiG9w0BAQUFAAOCAQEAaJjZort4
+						F2qnOygolSXuwnFP10kVlYap+h8lgRNjRZnIP+vYQRLB5WcswQ/fmnoL0dI84QQf
+						1yhJ7ZQ8jM/aq2N/jt11LvxC4V+U/mu/pTk8WnnOKuJK0eKrEV84MHfTiNkNLz7Z
+						X6aF8fF73cLbuObYXA7///pfks7c4UHLm71EvHwzdzjUyZqxrYMKS8ipLGNQCqLn
+						Azq8TeL662wh5s/quVocAQoPPc3/wLZziVjyQm7uvs41X9rXaUcRDAcrpu+rMQ6A
+						SnmpP7/S2O5DR7fVHvZNzrU79Y9Y/fdhdJBdDMQkRxup7G+7lhdJTNDRI2ZLfZnM
+						af39Dy7gd0Nh+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://dlib-jose.edina.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-jose.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://dlib-jose.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://dlib-jose.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dlib-jose.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">dlib-jose Test SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ukfederation.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Monica</md:GivenName>
+    <md:SurName>Warnock</md:SurName>
+    <md:EmailAddress>mailto:monica.warnock@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Monica</md:GivenName>
+    <md:SurName>Warnock</md:SurName>
+    <md:EmailAddress>mailto:monica.warnock@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-lockssdev2.ucs.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dlib-lockssdev2.ucs.ed.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..f7f36d93
--- /dev/null
+++ b/swamid-interfederations-2.0/dlib-lockssdev2.ucs.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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://dlib-lockssdev2.ucs.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-06-03T14:44: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dlib-lockssdev2.ucs.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>
+						MIIDGzCCAgOgAwIBAgIJAIQtmbCJW/PuMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+						BAMTHGRsaWItbG9ja3NzZGV2Mi51Y3MuZWQuYWMudWswHhcNMTMwNTA3MDkyMTUy
+						WhcNMjMwNTA1MDkyMTUyWjAnMSUwIwYDVQQDExxkbGliLWxvY2tzc2RldjIudWNz
+						LmVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA34JSXcKK
+						YdYQSYRfOoS6GfkSrQAVlHAXn4sFmHOt7ToOWqEZNcnNqE9rVUxh5XWXpZ5tFec3
+						qrNdyUlIvZth+DR68wwZZYUwCjkwfs2GKQln6SVnVUne6k8QX93pXVgTSkzqc+RN
+						bl1mt4JcT41rD2/GgAKj7xGMtQziBzrpkNXpNvoKozyJphXyGgKvZi+z1h+KufND
+						kc0ZUSoRFJ5Gk3GZldgIHRhTQdh3tYrd+VCFb8Xold7asRvMzpIKMDuAWZ9Sps8o
+						QzIRZoqUcwA7vqLGY/C5SRIkDeIs+0s0TYSJZXihnnvXt72rOhavZw2bHDz2bZYw
+						8X+FdDwlNytgPQIDAQABo0owSDAnBgNVHREEIDAeghxkbGliLWxvY2tzc2RldjIu
+						dWNzLmVkLmFjLnVrMB0GA1UdDgQWBBTVk7N8XLDIxSb9lfiOMNXJY1M1cDANBgkq
+						hkiG9w0BAQUFAAOCAQEAuDDx9SeeUT1fSoQ5pgQ1arfpOolwRsn+mp/QlmMDL3yn
+						YLzoTBNdn6nVkx62vgSReb0zpI6MIeRmz0efJd4ulaRzSZmL228TCdajqc13wSxG
+						TZrMn9IlrpAl+1KCZCVY6sqwKmeKWreXwBGno2R4scmEgTYlqJ8AgWMandVSV0I1
+						ps2I/PUbZ3kc3/2zIdOM2qMkpFReB0KUoEzy27eSRFbLf5rPiaWOroW+wti0PlDi
+						V9+uuPyJCrE9JCuwsXge4oRLDXrG4ZozxXgGw6T7Ztv2sO7/Q777HZ5Cx198b30D
+						PH5PkyAFdq5eTMTwRJI6WIXZ4pL3aDDMKjySSPfbaA==
+					</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://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-lockssdev2.ucs.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://dlib-lockssdev2.ucs.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://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dlib-lockssdev2.ucs.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">EDINA Demonstrator LOCKSS service</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>Adam</md:GivenName>
+    <md:SurName>Rusbridge</md:SurName>
+    <md:EmailAddress>mailto:a.rusbridge@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-monidp.edina.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dlib-monidp.edina.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..62e95e2f
--- /dev/null
+++ b/swamid-interfederations-2.0/dlib-monidp.edina.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dlib-monidp.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="2014-01-28T11:41:45Z">
+      <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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dlib-monidp.edina.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSDCCAjCgAwIBAgIVALtTlT25wpRy7nrWLCeXhU1F1FojMA0GCSqGSIb3DQEB
+						BQUAMCIxIDAeBgNVBAMMF2RsaWItbW9uaWRwLmVkaW5hLmFjLnVrMB4XDTE0MTAy
+						ODA4MzgzNFoXDTM0MTAyODA3MzgzNFowIjEgMB4GA1UEAwwXZGxpYi1tb25pZHAu
+						ZWRpbmEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgkMJs
+						gx6xM9/s+mE0BLxlFcJ7qS0nlhGYMxkLQYegSN4F8SqRQv8GwYE5T3tLJxamPkDU
+						tv3TaAKSnmU2yjTi9hv8MfYP1LM6T0gEZcNdmnIwkOFmkPeMGo/CaQACePoSELAU
+						do8T12Tq73odRgTMI78EqQKa7wW91MFkxiqEYujYrtFkm2cWs4ANkmk5uoHzr9Oq
+						cTurPXdjh+Tf15nKZZP3iJ+kigLDdBZTIoYfXkoBsew58fsvWf2nVWjtG1xmvQ5D
+						KuffejrcK26IlCG3CfwATbTwX3KfKNXYkTBJZPkqeNa96HgHLCtx52PFK8x3oH0T
+						RRa4IhilfRcOOxcjAgMBAAGjdTBzMB0GA1UdDgQWBBQ9BCnSd0nXjDSPzn1ghWZM
+						caiH1jBSBgNVHREESzBJghdkbGliLW1vbmlkcC5lZGluYS5hYy51a4YuaHR0cHM6
+						Ly9kbGliLW1vbmlkcC5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+						9w0BAQUFAAOCAQEAKryMMyXr7iG/i72xyZsoTlfboMOYu481YSXJNWTkklObJQR5
+						dTKNgq4q3Rcdbf7EepKxn4n7nxOQ+z33b2XTSwO5r/94DCFQpoVcsibThOENpyxU
+						MguLDO6sfGWbpOvosux02phII9bCjusLY7P+lHRJzrkWxQH2Jg4Bo+t+yHrIYBG8
+						/99eMLUcncyrDFukEt8oIKGIkOPQ91LbEBMgmOh8Y2gVkXSSq3zbX4ZmSf4xS0gR
+						2zsJaKirvRyWbqCZMYXFNg7nliBvSb1XU7kJzZN72F1c29QPjpujdeTZGVoX+iz8
+						L/2W74aQA5rw9dMEeVPyAMg3aPln5C1Eh6cRqw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-monidp.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://dlib-monidp.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://dlib-monidp.edina.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-monidp.edina.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-monidp.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://dlib-monidp.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-monidp.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-monidp.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-monidp.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">dlib-monidp.edina.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSDCCAjCgAwIBAgIVALtTlT25wpRy7nrWLCeXhU1F1FojMA0GCSqGSIb3DQEB
+						BQUAMCIxIDAeBgNVBAMMF2RsaWItbW9uaWRwLmVkaW5hLmFjLnVrMB4XDTE0MTAy
+						ODA4MzgzNFoXDTM0MTAyODA3MzgzNFowIjEgMB4GA1UEAwwXZGxpYi1tb25pZHAu
+						ZWRpbmEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgkMJs
+						gx6xM9/s+mE0BLxlFcJ7qS0nlhGYMxkLQYegSN4F8SqRQv8GwYE5T3tLJxamPkDU
+						tv3TaAKSnmU2yjTi9hv8MfYP1LM6T0gEZcNdmnIwkOFmkPeMGo/CaQACePoSELAU
+						do8T12Tq73odRgTMI78EqQKa7wW91MFkxiqEYujYrtFkm2cWs4ANkmk5uoHzr9Oq
+						cTurPXdjh+Tf15nKZZP3iJ+kigLDdBZTIoYfXkoBsew58fsvWf2nVWjtG1xmvQ5D
+						KuffejrcK26IlCG3CfwATbTwX3KfKNXYkTBJZPkqeNa96HgHLCtx52PFK8x3oH0T
+						RRa4IhilfRcOOxcjAgMBAAGjdTBzMB0GA1UdDgQWBBQ9BCnSd0nXjDSPzn1ghWZM
+						caiH1jBSBgNVHREESzBJghdkbGliLW1vbmlkcC5lZGluYS5hYy51a4YuaHR0cHM6
+						Ly9kbGliLW1vbmlkcC5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+						9w0BAQUFAAOCAQEAKryMMyXr7iG/i72xyZsoTlfboMOYu481YSXJNWTkklObJQR5
+						dTKNgq4q3Rcdbf7EepKxn4n7nxOQ+z33b2XTSwO5r/94DCFQpoVcsibThOENpyxU
+						MguLDO6sfGWbpOvosux02phII9bCjusLY7P+lHRJzrkWxQH2Jg4Bo+t+yHrIYBG8
+						/99eMLUcncyrDFukEt8oIKGIkOPQ91LbEBMgmOh8Y2gVkXSSq3zbX4ZmSf4xS0gR
+						2zsJaKirvRyWbqCZMYXFNg7nliBvSb1XU7kJzZN72F1c29QPjpujdeTZGVoX+iz8
+						L/2W74aQA5rw9dMEeVPyAMg3aPln5C1Eh6cRqw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-monidp.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-monidp.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">dlib-monidp Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ukfederation.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Monica</md:GivenName>
+    <md:SurName>Warnock</md:SurName>
+    <md:EmailAddress>mailto:monica.warnock@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Monica</md:GivenName>
+    <md:SurName>Warnock</md:SurName>
+    <md:EmailAddress>mailto:monica.warnock@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-qwghlm.ucs.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dlib-qwghlm.ucs.ed.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..7024bfae
--- /dev/null
+++ b/swamid-interfederations-2.0/dlib-qwghlm.ucs.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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://dlib-qwghlm.ucs.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-07-03T20:24: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dlib-qwghlm.ucs.ed.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>
+						MIIDDzCCAfegAwIBAgIJAPiWVB4ghVD+MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGGRsaWItcXdnaGxtLnVjcy5lZC5hYy51azAeFw0xMTEyMDgxMzI2NTNaFw0y
+						MTEyMDUxMzI2NTNaMCMxITAfBgNVBAMTGGRsaWItcXdnaGxtLnVjcy5lZC5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDDdsNDEYlcSwpD+3Qc
+						9YREfCpy+qm6bLrSRfzfDZS2Dbxq3Hy1opl9HXM+ka+GQsGcLeKp8tSm/PUnjCh2
+						/bQ2GZ0ICjQvDdQtRDjdwZ6mtEMrriCy3fX4/89iEbl7qf7m4YL5YZZ3sPjyfJ1n
+						2dTIioIipvbxGbXqDb4gj+VcI2eYGiaZI/odZW4cTvICYB/iyiynJOMUAU/M0SB8
+						Rhrl9qJrpSKuSNarozLskbhb099GFDtHsH6znHRCa0ZpEJ5frNqovcj2GDXybB9P
+						RVioL6x8jJoM6IPI4DcOzMjU5xGcXwWSXiltGYhQXuJTtDRicOX8iKKJNMCyZzNO
+						lJsCAwEAAaNGMEQwIwYDVR0RBBwwGoIYZGxpYi1xd2dobG0udWNzLmVkLmFjLnVr
+						MB0GA1UdDgQWBBTxK6XE5xyMz3j2z1AMA7uDBjGQ4DANBgkqhkiG9w0BAQUFAAOC
+						AQEAHDLiFzDtoaKo49V2yWeLRNFTdxqs97iCSezJ9YWCbgWyMU/3M0nG4apsGgSI
+						Q14yLjFNbgOws9JViEL6UMVL9TSpuqck2GQnwqWGsiF0oI7xRCVprkIBm3kNiWlb
+						EL9dRcGybE8Awwa5K0yOyRI8w062x11gtH9Au4hhjwHsNsU52qOnNezlcpH1JXwI
+						8QRfP8nk+TAYT+/w3oSeJ9pPGqRXO2IlfIz7Jtdoi2xhOtyCtY6DW9dTnf+FWSgi
+						0JcZ85FvVPG9GICRkoKNHSNjysWh6qMMhgNQlQzxSXvkNqqJLKknmmvsQ9AhN7Z8
+						tDpV2fo/EP8RfABm/v+Xb8gZ5Q==
+					</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://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-qwghlm.ucs.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://dlib-qwghlm.ucs.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://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dlib-qwghlm.ucs.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">EDINA: SDSS test Service Provider</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://dlib-qwghlm.ucs.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Glover</md:SurName>
+    <md:EmailAddress>mailto:steve.glover@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Glover</md:SurName>
+    <md:EmailAddress>mailto:steve.glover@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-schoolsidp.edina.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dlib-schoolsidp.edina.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..a69bce35
--- /dev/null
+++ b/swamid-interfederations-2.0/dlib-schoolsidp.edina.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dlib-schoolsidp.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"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">schools.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>
+						MIIDVzCCAj+gAwIBAgIUO/h0MjhhFFYR9sFrpG5zi9vVo64wDQYJKoZIhvcNAQEF
+						BQAwJjEkMCIGA1UEAxMbZGxpYi1zY2hvb2xzaWRwLmVkaW5hLmFjLnVrMB4XDTA5
+						MDgwNjEyMjAwOFoXDTI5MDgwNjEyMjAwOFowJjEkMCIGA1UEAxMbZGxpYi1zY2hv
+						b2xzaWRwLmVkaW5hLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAvqi4P3wG3B/dkzSoOMs0ssqK4xB7bMh3nF+JGo2KqGjxDYyRJtWY5FwRsAI6
+						Y9rXPs16cGQSRb9l+RZhzO9Lg9wiC9z29pKCINyBbb7Ii97n+YS/6NBq3TiKCznp
+						DJWbNIuvCLt1r6pDo833XZvnQhaQkIAOPLaC3bpNBeIbo1NJHN07RLz6fHxBAkK8
+						KpjmUv2Ak1G99GdMWmCmtbpoW0t1gWCJBxGp5ZppWuOqvUDDxjs3D3hvnxw9Xpb7
+						VaBMkZKjwsitadeBKHBUyy7OxfSe9bInSwk3iT0VxX2Sx6ohB0K9yejJo7Mbe1hp
+						lm2mrAyaunzmICuPrrupZfPsoQIDAQABo30wezBaBgNVHREEUzBRghtkbGliLXNj
+						aG9vbHNpZHAuZWRpbmEuYWMudWuGMmh0dHBzOi8vZGxpYi1zY2hvb2xzaWRwLmVk
+						aW5hLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTtud1yQh+7MhTkM1bI
+						5x7oBcMJwTANBgkqhkiG9w0BAQUFAAOCAQEAp1x7CEh3Tbv+sS/Y0dxd74FvQYRk
+						e1r9+iAbXjs4vGGQHM+qpM3Ts7KoY3AXvUeCjTuLJ5/95EgFkX8isKBu2k+hWBzD
+						WiOeL9JhTjv7gULtUUaMf607R6r3h1EtwUMlSE5/6sGs+leVx7B23fcAMm0yxTzw
+						x06n46KjdnXotpL7tt+chfIeNPba166WSj8iG7kBljgXRYnvXhI3GUhGqITsfA9T
+						q1kGDVnHXsoaaZqHiNuZ0SYGo705GUzDmz5xrmINfGkNDwNpuvuVFfhPwmqUjXwe
+						hdMmtC9GkxRq1Rd/PEN3POsJHTeFZbO59d1n9Fp2MzloG5f5K2+GcRwKZA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-schoolsidp.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://dlib-schoolsidp.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://dlib-schoolsidp.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-schoolsidp.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-schoolsidp.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-schoolsidp.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">schools.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>
+						MIIDVzCCAj+gAwIBAgIUO/h0MjhhFFYR9sFrpG5zi9vVo64wDQYJKoZIhvcNAQEF
+						BQAwJjEkMCIGA1UEAxMbZGxpYi1zY2hvb2xzaWRwLmVkaW5hLmFjLnVrMB4XDTA5
+						MDgwNjEyMjAwOFoXDTI5MDgwNjEyMjAwOFowJjEkMCIGA1UEAxMbZGxpYi1zY2hv
+						b2xzaWRwLmVkaW5hLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAvqi4P3wG3B/dkzSoOMs0ssqK4xB7bMh3nF+JGo2KqGjxDYyRJtWY5FwRsAI6
+						Y9rXPs16cGQSRb9l+RZhzO9Lg9wiC9z29pKCINyBbb7Ii97n+YS/6NBq3TiKCznp
+						DJWbNIuvCLt1r6pDo833XZvnQhaQkIAOPLaC3bpNBeIbo1NJHN07RLz6fHxBAkK8
+						KpjmUv2Ak1G99GdMWmCmtbpoW0t1gWCJBxGp5ZppWuOqvUDDxjs3D3hvnxw9Xpb7
+						VaBMkZKjwsitadeBKHBUyy7OxfSe9bInSwk3iT0VxX2Sx6ohB0K9yejJo7Mbe1hp
+						lm2mrAyaunzmICuPrrupZfPsoQIDAQABo30wezBaBgNVHREEUzBRghtkbGliLXNj
+						aG9vbHNpZHAuZWRpbmEuYWMudWuGMmh0dHBzOi8vZGxpYi1zY2hvb2xzaWRwLmVk
+						aW5hLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTtud1yQh+7MhTkM1bI
+						5x7oBcMJwTANBgkqhkiG9w0BAQUFAAOCAQEAp1x7CEh3Tbv+sS/Y0dxd74FvQYRk
+						e1r9+iAbXjs4vGGQHM+qpM3Ts7KoY3AXvUeCjTuLJ5/95EgFkX8isKBu2k+hWBzD
+						WiOeL9JhTjv7gULtUUaMf607R6r3h1EtwUMlSE5/6sGs+leVx7B23fcAMm0yxTzw
+						x06n46KjdnXotpL7tt+chfIeNPba166WSj8iG7kBljgXRYnvXhI3GUhGqITsfA9T
+						q1kGDVnHXsoaaZqHiNuZ0SYGo705GUzDmz5xrmINfGkNDwNpuvuVFfhPwmqUjXwe
+						hdMmtC9GkxRq1Rd/PEN3POsJHTeFZbO59d1n9Fp2MzloG5f5K2+GcRwKZA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-schoolsidp.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-schoolsidp.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">EDINA services for schools</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/index.shtml</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/dlib-shandon.ucs.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dlib-shandon.ucs.ed.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..8318dccc
--- /dev/null
+++ b/swamid-interfederations-2.0/dlib-shandon.ucs.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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://dlib-shandon.ucs.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="2012-02-08T16: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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">EDINA test SP Shandon</mdui:DisplayName>
+        <mdui:Description xml:lang="en">EDINA test SP Shandon</mdui:Description>
+        <mdui:Logo height="128" width="128">https://dlib-shandon.ucs.ed.ac.uk/alex.stuart.128x128.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dlib-shandon.ucs.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>
+						MIIEiDCCA3CgAwIBAgIJAPqKfjAaPVnJMA0GCSqGSIb3DQEBBQUAMIHEMQswCQYD
+						VQQGEwJHQjERMA8GA1UECAwIU2NvdGxhbmQxEjAQBgNVBAcMCUVkaW5idXJnaDEg
+						MB4GA1UECgwXVW5pdmVyc2l0eSBvZiBFZGluYnVyZ2gxIzAhBgNVBAsMGkVESU5B
+						IGFuZCBUaGUgRGF0YSBMaWJyYXJ5MSIwIAYDVQQDDBlkbGliLXNoYW5kb24udWNz
+						LmVkLmFjLnVrMSMwIQYJKoZIhvcNAQkBFhRhbGV4LnN0dWFydEBlZC5hYy51azAe
+						Fw0xNDA1MDcxNTU4MjJaFw0yNDA1MDQxNTU4MjJaMIHEMQswCQYDVQQGEwJHQjER
+						MA8GA1UECAwIU2NvdGxhbmQxEjAQBgNVBAcMCUVkaW5idXJnaDEgMB4GA1UECgwX
+						VW5pdmVyc2l0eSBvZiBFZGluYnVyZ2gxIzAhBgNVBAsMGkVESU5BIGFuZCBUaGUg
+						RGF0YSBMaWJyYXJ5MSIwIAYDVQQDDBlkbGliLXNoYW5kb24udWNzLmVkLmFjLnVr
+						MSMwIQYJKoZIhvcNAQkBFhRhbGV4LnN0dWFydEBlZC5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAL0j7OIzaKbgJNrZe3ZLqU+uFjS7fz+JxRoM
+						TOeRH7NogfeG1PsaKQ4XS1yjcwYfdo+uXY26RGj9MCGzhzA4DLG1ATFjS+JTovkZ
+						VZKvqokVANinHj036TL/VblLNssHzwvylQB6/SS9R0TvLMShl/3QGIzy8OgHAFao
+						p7Bq34l40Y3Qyiz70bWhBGXvgdWdidfW5K7qm29MPiikZDrAhB96Ip1F4VPIiTDx
+						4WgITpb975DpWv73Doxu49DFXva79ap1any8fFITU8VzC2W2LStJF9bghIBOH2QX
+						QPY8nxd17eaUhcSZ0pVYsbp6nVeXCVDm0IPdiZbb+79V73XkN4sCAwEAAaN7MHkw
+						CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
+						dGlmaWNhdGUwHQYDVR0OBBYEFOC+S9U3B8a38AldV3o2P82UrA2UMB8GA1UdIwQY
+						MBaAFOC+S9U3B8a38AldV3o2P82UrA2UMA0GCSqGSIb3DQEBBQUAA4IBAQA+/SO8
+						WtEc1/L5m35DCHMXRko5cHlKvmi74Wl8pJuQvnUSiQ1wlwapAD2uQOfXtSOC/0Kp
+						MtuVbmDtF3YKlxJwRovhMS8D7P9EYkoFm8f2nALAoWkQ1Ol5MiYfunz+0eDaWwON
+						wlvP5m3o8h7UjFdcekE0A8aMBgc6eHbqwjJKRyk9kuoMVbi4zOW310AB+hyYDxuU
+						NM83E+8je9IYeR0ErHXsfcNeCABHeE35HgOOGAaQ0iMRnWfjNcLfHaPlhYHLx1PD
+						8HNLKwjHo3p8Ps2yLftHKlTlvs3Co3i4S06bIGwpTCqrsQrd9DX2TKU1yL2FerGf
+						aR2/8JsykowRxXZw
+					</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://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-shandon.ucs.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://dlib-shandon.ucs.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://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dlib-shandon.ucs.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">EDINA test SP Shandon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://dlib-shandon.ucs.ed.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/dlib-skaill.ucs.ed.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..37fdf4dd
--- /dev/null
+++ b/swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dlib-skaill.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-03-08T11:18: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dlib-skaill.ucs.ed.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Skaill Test IdP</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDRzCCAi+gAwIBAgIUSmTdfn763UNpnElLInB08fIfiOgwDQYJKoZIhvcNAQEF
+						BQAwIjEgMB4GA1UEAxMXZGxpYi1za2FpbGwuZWRpbmEuYWMudWswHhcNMTQwNjE4
+						MTIwMzIxWhcNMzQwNjE4MTIwMzIxWjAiMSAwHgYDVQQDExdkbGliLXNrYWlsbC5l
+						ZGluYS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJOx63EY
+						J4uh9FlNoNhB1KEi41z1uxuyWp3IOwX+EfUYXIshjnt1J4s0m36TFL7Ng6NfkHHs
+						vWZ2GVX4p0qbK9sPQ/m9jNvA4PI55un/hRBn/KYu3/35Mf4ioiKkFRP/iEl/+YM1
+						gURWxWd8bUyu0LbQRWbMRz9tU3dRruutxm47TNlZEfrEPaSAWb1otytGmw04vcjm
+						y5nWIzPhBrpL1Zu+JekBcwvD3vrIgeA2h3r+8EuG0WghcLcWJtwUlOb5jSXmA/b6
+						8l2F7Bbvy81x88NGBghZBhUnlLFwuUZ1zEDy5hqOVcGgoKlb216LzqRSPTxiiPQ9
+						1PGvxffMLGTYCAMCAwEAAaN1MHMwUgYDVR0RBEswSYIXZGxpYi1za2FpbGwuZWRp
+						bmEuYWMudWuGLmh0dHBzOi8vZGxpYi1za2FpbGwuZWRpbmEuYWMudWsvaWRwL3No
+						aWJib2xldGgwHQYDVR0OBBYEFOfvuXoBOS3z6kiFQNzznSPg5R1rMA0GCSqGSIb3
+						DQEBBQUAA4IBAQCQmnq2HC8MK+yGVLmKCr/wlDZKPwlUSvyNQXhgQYAtwUD9mb53
+						Wz+n7UXTYJQ/koVuJD+nDuQngkqAiEuW4NlMUQgtB5HQfIATQwkv7an029+4UL0m
+						sWryJGjvGbbfZZ6+kt00Rrz3BEaU6fRV63/vrY0PYItvb36tjn0xfrI74MFIdQoj
+						a3fa8kPIc1QYsCtNsV06GEpHpl0asgwNlCukFFyFUCuU/E/8Dadbwlw6o+ObNj3K
+						b6ettwdPpzsvba7W2w/oERE2IJLP1fwJ5I3KE2nOGnlUYaXQFon/w7vDDYfpqCzO
+						R313g/RR8Oq6ulpwKhbAPdoxFpyxxy3OS8K/
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-skaill.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://dlib-skaill.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://dlib-skaill.ucs.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-skaill.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://dlib-skaill.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://dlib-skaill.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">dlib-skaill.ucs.ed.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDRzCCAi+gAwIBAgIUSmTdfn763UNpnElLInB08fIfiOgwDQYJKoZIhvcNAQEF
+						BQAwIjEgMB4GA1UEAxMXZGxpYi1za2FpbGwuZWRpbmEuYWMudWswHhcNMTQwNjE4
+						MTIwMzIxWhcNMzQwNjE4MTIwMzIxWjAiMSAwHgYDVQQDExdkbGliLXNrYWlsbC5l
+						ZGluYS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJOx63EY
+						J4uh9FlNoNhB1KEi41z1uxuyWp3IOwX+EfUYXIshjnt1J4s0m36TFL7Ng6NfkHHs
+						vWZ2GVX4p0qbK9sPQ/m9jNvA4PI55un/hRBn/KYu3/35Mf4ioiKkFRP/iEl/+YM1
+						gURWxWd8bUyu0LbQRWbMRz9tU3dRruutxm47TNlZEfrEPaSAWb1otytGmw04vcjm
+						y5nWIzPhBrpL1Zu+JekBcwvD3vrIgeA2h3r+8EuG0WghcLcWJtwUlOb5jSXmA/b6
+						8l2F7Bbvy81x88NGBghZBhUnlLFwuUZ1zEDy5hqOVcGgoKlb216LzqRSPTxiiPQ9
+						1PGvxffMLGTYCAMCAwEAAaN1MHMwUgYDVR0RBEswSYIXZGxpYi1za2FpbGwuZWRp
+						bmEuYWMudWuGLmh0dHBzOi8vZGxpYi1za2FpbGwuZWRpbmEuYWMudWsvaWRwL3No
+						aWJib2xldGgwHQYDVR0OBBYEFOfvuXoBOS3z6kiFQNzznSPg5R1rMA0GCSqGSIb3
+						DQEBBQUAA4IBAQCQmnq2HC8MK+yGVLmKCr/wlDZKPwlUSvyNQXhgQYAtwUD9mb53
+						Wz+n7UXTYJQ/koVuJD+nDuQngkqAiEuW4NlMUQgtB5HQfIATQwkv7an029+4UL0m
+						sWryJGjvGbbfZZ6+kt00Rrz3BEaU6fRV63/vrY0PYItvb36tjn0xfrI74MFIdQoj
+						a3fa8kPIc1QYsCtNsV06GEpHpl0asgwNlCukFFyFUCuU/E/8Dadbwlw6o+ObNj3K
+						b6ettwdPpzsvba7W2w/oERE2IJLP1fwJ5I3KE2nOGnlUYaXQFon/w7vDDYfpqCzO
+						R313g/RR8Oq6ulpwKhbAPdoxFpyxxy3OS8K/
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-skaill.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-skaill.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">Skaill Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.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/dlib-skaill.ucs.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..fe1224fc
--- /dev/null
+++ b/swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,64 @@
+<?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://dlib-skaill.ucs.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: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://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dlib-skaill.ucs.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>
+						MIIDMzCCAhugAwIBAgIJAO+Ojk6L2U0+MA0GCSqGSIb3DQEBBQUAMC8xLTArBgNV
+						BAMTJGRsaWItc2thaWxsLmRsaWItc2thaWxsLnVjcy5lZC5hYy51azAeFw0xMDA4
+						MTMxNjQ4MjZaFw0yMDA4MTAxNjQ4MjZaMC8xLTArBgNVBAMTJGRsaWItc2thaWxs
+						LmRsaWItc2thaWxsLnVjcy5lZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAOMZKa9TKhbnao7zUzJOu+0+cjO1HmQrsSVAZhnKQD2q7GSWGejS
+						3vGFxDxFM0PB2QW0hyOd4RUJdROOSRKdIZDuv+olP3Mk8u9Grv/sCs5Zbvk9/szf
+						vj8GlmtPQyTiyKv0cv6wHLhN97e3/8Ym7WnL9JBIk2Ewa9xwRwJDCztMAE37MYQj
+						D2op00+1yFUJXPS7d8TrG9qa4J/IC62oagSUQjUGyTgz0Ha3o2o19TysaSOZaInb
+						6WPW09E1fKS3b3DTKF05zeKusGdNKaw7Vu3+m5Yy0Z2d++ZD4OmltOiYinOtzGst
+						WlvtPt4+pJ+HPfs7onJrt93kJWJtysQAv3kCAwEAAaNSMFAwLwYDVR0RBCgwJoIk
+						ZGxpYi1za2FpbGwuZGxpYi1za2FpbGwudWNzLmVkLmFjLnVrMB0GA1UdDgQWBBRA
+						rA3D8Loi6/EquAcMTzOo2I070zANBgkqhkiG9w0BAQUFAAOCAQEA20QAK3hFCooX
+						rgMEsMqlNMek5P6t4I67RxHtXSUD5d7YvGNuWWJdoujSPrQcBvgg5xw+51kqKF3H
+						RqfjilqH0x95gidhbp0W9hxGc8y4sHnJv9RIoVTloaDPp58FOa0sQFMv+Y6Ww6MI
+						jwkUgdGZLby1uPays7JuG8Fknwkt9fGAqWtLLkuGZrFLeQb0/uCjC6fju76YuxpM
+						ZNkVBZ3rIai3bInXJybjkSJzm27lPMpQ+fAfwQmXrzHuhN9S3zI9/w0uDdXkvf8c
+						0xZnbN4TYWgCB7krj2wrGg6YV3x8f9fGRFbH0EqIU63jGYuFP7rrlxv37ol+Zrrg
+						mfQhxVldkQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: SDSS Test SP (skaill)</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/dlib-tirnanog.ucs.ed.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dlib-tirnanog.ucs.ed.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..6e6745c1
--- /dev/null
+++ b/swamid-interfederations-2.0/dlib-tirnanog.ucs.ed.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dlib-tirnanog.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="2013-07-03T10:53: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dlib-tirnanog.ucs.ed.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDVDCCAjygAwIBAgIVAODyk7mMoUoYzltLzYC/JtGZQMb6MA0GCSqGSIb3DQEB
+						BQUAMCUxIzAhBgNVBAMTGmRsaWItdGlybmFub2cudWNzLmVkLmFjLnVrMB4XDTEz
+						MDUzMTEwMjk0M1oXDTMzMDUzMTEwMjk0M1owJTEjMCEGA1UEAxMaZGxpYi10aXJu
+						YW5vZy51Y3MuZWQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCKjx88FRe8y8+PDAV4FaB21YWDt+1VrC2AwecxLSum68NOg2dGJLoEj3SggRdJ
+						rwW1qisZCC43P3tKjP++vGOqwXJQjUBQ+NsE/1o+OMm4kdzT/3CtWlbMCt2LrOKK
+						Awcxctg+hQUBB/v5yJi2Li9j38MRFeqTMocia5N4z1d9LA2sQIk6G0ID23AL8sts
+						FG6n7kM1Sks/o4pWVC9MHbmJGPxSeAH0iypWT11y7Q2L/kyRwQstU7TTM3ORbTuE
+						XYn/hASx2+N7iCNdsj1SVo0bwL/RavQqW9vY7ha5cmmk+lGuMflO6Mue/Zhg9Y9F
+						F7sMMSXtI1q9Lo2ukd+O2WEJAgMBAAGjezB5MFgGA1UdEQRRME+CGmRsaWItdGly
+						bmFub2cudWNzLmVkLmFjLnVrhjFodHRwczovL2RsaWItdGlybmFub2cudWNzLmVk
+						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTUtDiVpBMT2JmUtdHVe/K2
+						ThCQHjANBgkqhkiG9w0BAQUFAAOCAQEAGbTsOEw+ZdABn5Am47D3dbq2Fx3ll4Ks
+						xWfE/mduKOphquJm+TPv0T3PUXefHTJk8ESpJxJPCkTWQqStmPw6Q4vB64ByN3N/
+						rY6oTSpAMRx4BnrRJMuhNoO6UVBIq/xQngO2pyDlDzp/3PUMCiir1SnAlHsr2wxQ
+						HABixOnaV5V8AvBo68uFfezbVcXHdxRBL274mAlHg1DGwyNWa6SKDrVxJca7Llnf
+						c3X9nWnjl1g6KSSvn2fMDte0Ciicj2QShW4RuiURv7wChltggjfFuvjnua2AQRLw
+						MB6cv6Ty6FnjVpmi9+PAdsw09nP5uatsgyQzRIgt36KO7a8ywJP8BQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-tirnanog.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://dlib-tirnanog.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://dlib-tirnanog.ucs.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-tirnanog.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://dlib-tirnanog.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://dlib-tirnanog.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">dlib-tirnanog.ucs.ed.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDVDCCAjygAwIBAgIVAODyk7mMoUoYzltLzYC/JtGZQMb6MA0GCSqGSIb3DQEB
+						BQUAMCUxIzAhBgNVBAMTGmRsaWItdGlybmFub2cudWNzLmVkLmFjLnVrMB4XDTEz
+						MDUzMTEwMjk0M1oXDTMzMDUzMTEwMjk0M1owJTEjMCEGA1UEAxMaZGxpYi10aXJu
+						YW5vZy51Y3MuZWQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCKjx88FRe8y8+PDAV4FaB21YWDt+1VrC2AwecxLSum68NOg2dGJLoEj3SggRdJ
+						rwW1qisZCC43P3tKjP++vGOqwXJQjUBQ+NsE/1o+OMm4kdzT/3CtWlbMCt2LrOKK
+						Awcxctg+hQUBB/v5yJi2Li9j38MRFeqTMocia5N4z1d9LA2sQIk6G0ID23AL8sts
+						FG6n7kM1Sks/o4pWVC9MHbmJGPxSeAH0iypWT11y7Q2L/kyRwQstU7TTM3ORbTuE
+						XYn/hASx2+N7iCNdsj1SVo0bwL/RavQqW9vY7ha5cmmk+lGuMflO6Mue/Zhg9Y9F
+						F7sMMSXtI1q9Lo2ukd+O2WEJAgMBAAGjezB5MFgGA1UdEQRRME+CGmRsaWItdGly
+						bmFub2cudWNzLmVkLmFjLnVrhjFodHRwczovL2RsaWItdGlybmFub2cudWNzLmVk
+						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTUtDiVpBMT2JmUtdHVe/K2
+						ThCQHjANBgkqhkiG9w0BAQUFAAOCAQEAGbTsOEw+ZdABn5Am47D3dbq2Fx3ll4Ks
+						xWfE/mduKOphquJm+TPv0T3PUXefHTJk8ESpJxJPCkTWQqStmPw6Q4vB64ByN3N/
+						rY6oTSpAMRx4BnrRJMuhNoO6UVBIq/xQngO2pyDlDzp/3PUMCiir1SnAlHsr2wxQ
+						HABixOnaV5V8AvBo68uFfezbVcXHdxRBL274mAlHg1DGwyNWa6SKDrVxJca7Llnf
+						c3X9nWnjl1g6KSSvn2fMDte0Ciicj2QShW4RuiURv7wChltggjfFuvjnua2AQRLw
+						MB6cv6Ty6FnjVpmi9+PAdsw09nP5uatsgyQzRIgt36KO7a8ywJP8BQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-tirnanog.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-tirnanog.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">Tirnanog Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ukfederation.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Glover</md:SurName>
+    <md:EmailAddress>mailto:steve.glover@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Glover</md:SurName>
+    <md:EmailAddress>mailto:steve.glover@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dluat-pub2web.theiet.org-shibboleth.xml b/swamid-interfederations-2.0/dluat-pub2web.theiet.org-shibboleth.xml
new file mode 100644
index 00000000..154b9ffe
--- /dev/null
+++ b/swamid-interfederations-2.0/dluat-pub2web.theiet.org-shibboleth.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dluat-pub2web.theiet.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-18T12:51: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">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDnDCCAoSgAwIBAgIEUO2c9zANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
+						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
+						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDEwOTE2
+						MzgxNVoXDTIzMDEwNzE2MzgxNVowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
+						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
+						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
+						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAL3ivjdsXAoP6HVxKmZg3aDgjOaw0vc3VHcTQbdCxuzd/1ydLHKkcy8f
+						EdBBRK8AlY1sbEue7yvnwVUiZP/THzHKj8jtJB/D2YECLB12zR7UV/v25CiIFjVW
+						vdHtnZ4pZDepKtHmRCPJWyfEsrX2l0qnoOtpKYVi+dP/Ie6gYOkVlaCUfdZx5mEY
+						lk3HJ8TVeS0VmEXlJXj8zXLFoVpmbjn9jru/qjj/HB+VZpVSbpVzI4BNlbWEoN/0
+						VOl7/d1C7+IWM59UZeIJpXSyO+Gh+3ydv4dJtpZing1hgCBss+5L8luA5wQQDSse
+						WN/zhK2Jn3DyhBx3H04IEkQkDYGQ5ZMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						F7amvU4Vs5KyKnubimDf/s7qAPlSN4Tz66tBN/WpWCLNuOQxtkTbC6pEXYkWfaQp
+						R1CiCFhzCW6h+Di7EQenU+ooO5DCXFYfwg/t8ygLeNhvTUor/ecGXTkeBT5zqYiM
+						PY/6QYCzwOh2IvItT+nTa9Rk8VL78VKg5cNjzCmibHWjoG6oFPxI77hkPRgc1u3w
+						lNEk/UBVoLnyYrnvgaibNFwXv6gXqRylWZykRsixdxAF029Lmj12LepRSie/cB4e
+						Ej/KMG3WOjuyeqeV1iBDU8NPzYL3buJDSrPR8DZaQt56CvXRZ0y8Nb7w+hsOIrwk
+						awOxBJ/9dlBVZxdn0CMTXQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDnDCCAoSgAwIBAgIEUO2c9zANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
+						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
+						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDEwOTE2
+						MzgxNVoXDTIzMDEwNzE2MzgxNVowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
+						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
+						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
+						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAL3ivjdsXAoP6HVxKmZg3aDgjOaw0vc3VHcTQbdCxuzd/1ydLHKkcy8f
+						EdBBRK8AlY1sbEue7yvnwVUiZP/THzHKj8jtJB/D2YECLB12zR7UV/v25CiIFjVW
+						vdHtnZ4pZDepKtHmRCPJWyfEsrX2l0qnoOtpKYVi+dP/Ie6gYOkVlaCUfdZx5mEY
+						lk3HJ8TVeS0VmEXlJXj8zXLFoVpmbjn9jru/qjj/HB+VZpVSbpVzI4BNlbWEoN/0
+						VOl7/d1C7+IWM59UZeIJpXSyO+Gh+3ydv4dJtpZing1hgCBss+5L8luA5wQQDSse
+						WN/zhK2Jn3DyhBx3H04IEkQkDYGQ5ZMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						F7amvU4Vs5KyKnubimDf/s7qAPlSN4Tz66tBN/WpWCLNuOQxtkTbC6pEXYkWfaQp
+						R1CiCFhzCW6h+Di7EQenU+ooO5DCXFYfwg/t8ygLeNhvTUor/ecGXTkeBT5zqYiM
+						PY/6QYCzwOh2IvItT+nTa9Rk8VL78VKg5cNjzCmibHWjoG6oFPxI77hkPRgc1u3w
+						lNEk/UBVoLnyYrnvgaibNFwXv6gXqRylWZykRsixdxAF029Lmj12LepRSie/cB4e
+						Ej/KMG3WOjuyeqeV1iBDU8NPzYL3buJDSrPR8DZaQt56CvXRZ0y8Nb7w+hsOIrwk
+						awOxBJ/9dlBVZxdn0CMTXQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dluat-pub2web.theiet.org/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dluat-pub2web.theiet.org/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Publishing Technology plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IET DIGITAL LIBRARY</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://dluat-pub2web.theiet.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:ietdl@theiet.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hatim</md:GivenName>
+    <md:SurName>Ghadiyali</md:SurName>
+    <md:EmailAddress>mailto:openathens@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dmponline-test.dcc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dmponline-test.dcc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..d49ee00e
--- /dev/null
+++ b/swamid-interfederations-2.0/dmponline-test.dcc.ac.uk-shibboleth.xml
@@ -0,0 +1,83 @@
+<?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://dmponline-test.dcc.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-08-16T10:40:48Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Test DMP Online</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is a test service for the Digital Curation Centre's data management planning tool, DMP Online.</mdui:Description>
+        <mdui:Logo height="310" width="92">https://dmponline-test.dcc.ac.uk/shib_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>
+						MIIDDzCCAfegAwIBAgIJAL3x+zI6nXF/MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGGRtcG9ubGluZS10ZXN0LmRjYy5hYy51azAeFw0xMjA4MTMxMzAwMDZaFw0y
+						MjA4MTExMzAwMDZaMCMxITAfBgNVBAMTGGRtcG9ubGluZS10ZXN0LmRjYy5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM5qkbtQGUwmojZSgJTc
+						1AyehL03gJsqWg7Bn/mIXFu+d6Qnyp5zulFgos5QWdGbH93GubsZhLTvKgUt7kmh
+						jYtn8B9e6MOYxeZFUk+MFmVDq4PXL7/YQ2XjBdDPYbImZL7i0zwBrxk0ZOksWYIw
+						OPZX6AQgkUwI6sN1p+o/7yEfefXcHcyNtNpuYjezeBdqbGdHBtja5cZNZYPBC6uc
+						4g3m60pd5W5PNSfA0E5ahH00wCLTt6+w5Qwfe6dZuWzcUATlBczcXv9ACleFcdrQ
+						T95/KzZrsvUeh9zrMZ8qHI7Dp3I32OwRpX+s/b6uM5wJqt0jBxi3Vc767OnDUWpG
+						hs8CAwEAAaNGMEQwIwYDVR0RBBwwGoIYZG1wb25saW5lLXRlc3QuZGNjLmFjLnVr
+						MB0GA1UdDgQWBBQighrVWJp/O+WQH1y4c/ESIrAjKDANBgkqhkiG9w0BAQUFAAOC
+						AQEAv/btN4bGohrEtiVoKW/MRRoCIaekw/1/bGFECwvIyjI+ifANO3wfp+S60mbK
+						ktZA4VtOBHKkuPdRJA5y6TyPBYtQMb8ARfJpZ++uD9uqOShBlrXxzu32jg7EzUxs
+						oo8Sl3c0LwUGKhCFOsKNEN62D4mJAIV35DF5E+LesWpJg5tDbi5CK3ifmp9tdfeL
+						dCDHH9Q2qm6zXTqxV2N5G3qPEAM3XReSqRcDmduAv293zolKih7pcJlm2oO7B1Oj
+						BiYUokzZvNzxaxg9xx50gCtzeblPk1VIU5bpDaLWxvPoIPlLdlfXMxkXEM2449yD
+						idoVrX4I/N/HxX/8Q1GFYpoGpA==
+					</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://dmponline-test.dcc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dmponline-test.dcc.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 Curation Centre Test DMP Online service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dcc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>DCC Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:support@dcc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>DCC Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:support@dcc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dmponline.dcc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dmponline.dcc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..ee28ff90
--- /dev/null
+++ b/swamid-interfederations-2.0/dmponline.dcc.ac.uk-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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://dmponline.dcc.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-11T08:16:33Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">DMP Online</mdui:DisplayName>
+        <mdui:Description xml:lang="en">DMP Online is a data management planning tool provided by the Digital Curation Centre.</mdui:Description>
+        <mdui:Logo height="92" width="310">https://dmponline.dcc.ac.uk/shib_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>
+						MIIDADCCAeigAwIBAgIJAOtCUnAkVkzgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE2RtcG9ubGluZS5kY2MuYWMudWswHhcNMTIwODMxMTM0OTUxWhcNMjIwODI5
+						MTM0OTUxWjAeMRwwGgYDVQQDExNkbXBvbmxpbmUuZGNjLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Y7lhKA+QuVcLVmN8ZaJ+5+bq1Tuv5Qt
+						kZVVoNBiO+Hg3F4p/wGIHyAS6XD1VB+7P2IokGt13JtCxJYoq2m51M4yhwp4kKtu
+						vTW5bvxY/Qwl5aCIq9l9ZCIgD2wQ0F7dumt6F9/MQjhnDd81UMNm8Szcwmi58HxC
+						MHYW/Gwto0FoMlursS/3/Cx/nl0jTF3U5Yl9/xEb9/Nooe6d2QZagN5JWl+jbEve
+						bURMzOFC0+7hmmvrmj2MinKfZEsX4RLoH3KKdPSWBhFM4xpsezBZjlfFNngzkLWH
+						47nsQnxHJyE4p33AXMb3SA8OxY06sudQUPgWIG4kBC9L68qIAegvBQIDAQABo0Ew
+						PzAeBgNVHREEFzAVghNkbXBvbmxpbmUuZGNjLmFjLnVrMB0GA1UdDgQWBBSg6Qwr
+						6uNEhUn4wQ5RJc3pKZbJHzANBgkqhkiG9w0BAQUFAAOCAQEASK4EQU4/iRNWN3T8
+						8uSl5RVdUyHEhqAvRLMpQn2UlZ4N1zfAHhTQx3V2Qb/WGz9DWXgTHHmPvUkwsMGk
+						Fy1OGGX4NcTb3xRa3c8i97TXOIWqWBNL73PnF2tvCEMR4ESckAzkKoIprbMYHsTA
+						kv6ZJIEbhewDT3v5zPUIZZl4eipFyV+5WIP3P9NIV89sheP3L5WeuSlkr7ne0ceO
+						FhpQ3ECRS+/8WHrJvRGtTO5xeecXvmQE1Opg21XyziVpANLFSjOGLywUOcg9e2zl
+						PrL11PMKc2fluPWs4Q1TVZzXOVVYw4P4LbvfWswPtvVlt2b7XNM/+uKApHYRd/Zu
+						isijLg==
+					</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://dmponline.dcc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Digital Curation Centre</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dcc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>DCC Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:support@dcc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>DCC Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:support@dcc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dmz-shib-dg-01.dmz.roehampton.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dmz-shib-dg-01.dmz.roehampton.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..803b8995
--- /dev/null
+++ b/swamid-interfederations-2.0/dmz-shib-dg-01.dmz.roehampton.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dmz-shib-dg-01.dmz.roehampton.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>
+      <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</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDejCCAmKgAwIBAgIVAJw0niI78J9LVDelS/WX6kLw2ONrMA0GCSqGSIb3DQEB
+						BQUAMC4xLDAqBgNVBAMTI2Rtei1zaGliLWRnLTAxLmRtei5yb2VoYW1wdG9uLmFj
+						LnVrMB4XDTA5MDQwNjEzNTgxOVoXDTI5MDQwNjEzNTgxOVowLjEsMCoGA1UEAxMj
+						ZG16LXNoaWItZGctMDEuZG16LnJvZWhhbXB0b24uYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCLewrO3PRLdkLPc0WQ8pyV3lUyqjQotbAoCwAD
+						J82zAjGEjM2f7ItT0znjoOeL+0mk82lGNLpnUgdlCN1/CCWsVtpDHiX/cONcetfB
+						LApwbhlC/VkyVw64Q31BpDpmwRR8xl0G7wIDyGLgm65F4YGwLAIJ29ekX0iPW23G
+						3cnRB+Qxuss+ltLppKbKOg0RRHw8rGMqvpcl5RNaG5RoDd75ke4sulXzmnsiT1kX
+						zJ3N6gbYuKuYGDFbTNPxmUn8tDOY9XiMYmSXYAPC76Tm67yrsACybYfhamAKGLDJ
+						LzRPcdb+4ztpSwg3JAmoV9Wh71x/QY5xqRFYc6BFR+qr49sTAgMBAAGjgY4wgYsw
+						agYDVR0RBGMwYYIjZG16LXNoaWItZGctMDEuZG16LnJvZWhhbXB0b24uYWMudWuG
+						Omh0dHBzOi8vZG16LXNoaWItZGctMDEuZG16LnJvZWhhbXB0b24uYWMudWsvaWRw
+						L3NoaWJib2xldGgwHQYDVR0OBBYEFMBb1DPf728KsP2L5BR2RK8T3MDIMA0GCSqG
+						SIb3DQEBBQUAA4IBAQBQsK2G0NUmIAzUjnxKvM29W2BCPmXAntHFOku6g3eLuh8b
+						mvIgoQ+vRpPTdw9rN0hmz7Rohq5CiL7avvIbhYrbvC4UX86eAiss224K7OVHZxUc
+						jQOd40XcNctmhu558CeKQGqfurB1k9l78q9rNgrIyx+TfcyXI7Imy+koBVDk+m0P
+						Pzdno7nVF6ijBmrRcO1f6Tjn84RIn6Vv6beCZzwe99TUaV3hQt2f+k/yeZmebKK4
+						CvUiVr5csHXAtF2UoDIIvaXipHbaN7g3XU8D3xPCIgism64TuiZZSnTQa4nNv1ZZ
+						tsCE45WFHTtwjDr3fhwnrvOO0mnQQ1sRXig53IR1
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dmz-shib-dg-01.dmz.roehampton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dmz-shib-dg-01.dmz.roehampton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dmz-shib-dg-01.dmz.roehampton.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmz-shib-dg-01.dmz.roehampton.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dmz-shib-dg-01.dmz.roehampton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dmz-shib-dg-01.dmz.roehampton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">roehampton.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDejCCAmKgAwIBAgIVAJw0niI78J9LVDelS/WX6kLw2ONrMA0GCSqGSIb3DQEB
+						BQUAMC4xLDAqBgNVBAMTI2Rtei1zaGliLWRnLTAxLmRtei5yb2VoYW1wdG9uLmFj
+						LnVrMB4XDTA5MDQwNjEzNTgxOVoXDTI5MDQwNjEzNTgxOVowLjEsMCoGA1UEAxMj
+						ZG16LXNoaWItZGctMDEuZG16LnJvZWhhbXB0b24uYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCLewrO3PRLdkLPc0WQ8pyV3lUyqjQotbAoCwAD
+						J82zAjGEjM2f7ItT0znjoOeL+0mk82lGNLpnUgdlCN1/CCWsVtpDHiX/cONcetfB
+						LApwbhlC/VkyVw64Q31BpDpmwRR8xl0G7wIDyGLgm65F4YGwLAIJ29ekX0iPW23G
+						3cnRB+Qxuss+ltLppKbKOg0RRHw8rGMqvpcl5RNaG5RoDd75ke4sulXzmnsiT1kX
+						zJ3N6gbYuKuYGDFbTNPxmUn8tDOY9XiMYmSXYAPC76Tm67yrsACybYfhamAKGLDJ
+						LzRPcdb+4ztpSwg3JAmoV9Wh71x/QY5xqRFYc6BFR+qr49sTAgMBAAGjgY4wgYsw
+						agYDVR0RBGMwYYIjZG16LXNoaWItZGctMDEuZG16LnJvZWhhbXB0b24uYWMudWuG
+						Omh0dHBzOi8vZG16LXNoaWItZGctMDEuZG16LnJvZWhhbXB0b24uYWMudWsvaWRw
+						L3NoaWJib2xldGgwHQYDVR0OBBYEFMBb1DPf728KsP2L5BR2RK8T3MDIMA0GCSqG
+						SIb3DQEBBQUAA4IBAQBQsK2G0NUmIAzUjnxKvM29W2BCPmXAntHFOku6g3eLuh8b
+						mvIgoQ+vRpPTdw9rN0hmz7Rohq5CiL7avvIbhYrbvC4UX86eAiss224K7OVHZxUc
+						jQOd40XcNctmhu558CeKQGqfurB1k9l78q9rNgrIyx+TfcyXI7Imy+koBVDk+m0P
+						Pzdno7nVF6ijBmrRcO1f6Tjn84RIn6Vv6beCZzwe99TUaV3hQt2f+k/yeZmebKK4
+						CvUiVr5csHXAtF2UoDIIvaXipHbaN7g3XU8D3xPCIgism64TuiZZSnTQa4nNv1ZZ
+						tsCE45WFHTtwjDr3fhwnrvOO0mnQQ1sRXig53IR1
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dmz-shib-dg-01.dmz.roehampton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dmz-shib-dg-01.dmz.roehampton.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Roehampton University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Roehampton</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.roehampton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Amos</md:GivenName>
+    <md:SurName>Eka</md:SurName>
+    <md:EmailAddress>mailto:A.Eka@roehampton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Amos</md:GivenName>
+    <md:SurName>Eka</md:SurName>
+    <md:EmailAddress>mailto:A.Eka@roehampton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml b/swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml
new file mode 100644
index 00000000..25926672
--- /dev/null
+++ b/swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://doccom.iml.unibe.ch/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-09-08T10:55:32Z">
+      <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:Attribute>
+    </mdattr:EntityAttributes>
+  </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">DOCCOM  Deutsch Universität Bern</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DOCCOM  German University Bern</mdui:DisplayName>
+        <mdui:Description xml:lang="de">DOCCOM Deutsch, Institut für medezinische Lehre, Universität Bern</mdui:Description>
+        <mdui:Description xml:lang="en">DOCCOM German, Institute for medical Education, University Bern</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://doccom.iml.unibe.ch/Customizing/global/agreement/privacypolicy_en.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIJAMU8stHHiSQ3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2RvY2NvbS5pbWwudW5pYmUuY2gwHhcNMTQwNDEwMDc1NzI5WhcNMTcwNDA5
+MDc1NzI5WjAeMRwwGgYDVQQDExNkb2Njb20uaW1sLnVuaWJlLmNoMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA081f+9+P/zwCwB/xPFLGYr/Olry6Ald8
+/VCcXHiO9V9OAezmSzMRfILyPLcpKZNl4rKmy3vcc67UzuJ+xA0SgzrsyqsOmxJc
+eAnPh58vkrhTooaP6JyXSV9rvrxA01m6TZMFjFJmljZ+5kmixjZ4F+zY9eBsXTXD
+utznEzh0DP1Ds6pL+eYeFezHlSSke4OhWDNVvCUSR3wE4IyImhc0afNhm7g8TOOm
+v/XavhPEw7xJBk40ivm9as/VjEe/Hu52C6McfJAUH2dyyG29jgqsFuMRDJd2zaU5
+1H+2Oxn7qLilqJ0nnbRck2RL5A2z/nOt8X4pBT6g4nBfrj+2zFA+PQIDAQABo2kw
+ZzBGBgNVHREEPzA9ghNkb2Njb20uaW1sLnVuaWJlLmNohiZodHRwczovL2RvY2Nv
+bS5pbWwudW5pYmUuY2gvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUIDmYnT2lN75n/KwN
+hAKm76KxX8swDQYJKoZIhvcNAQEFBQADggEBAJBf6iPfVq31qU4vL420UVjKdmMu
+lHAknUBiQgTiUsySUaAVPnPJcpzxlxKRBSd0s0/DbJQYmbCEEbGPZ6i2eLTMSocb
+kSy7D8uh0ZNtOAiTfeWc+76of+BHlXlq027rN5amd21nV4cdXmXMBuMyCidh4iNV
+zMKI709D+kxZvkCdIUlDM1TWd1v8aVViHnxNrlQ54wDFP4jRB9uDHAxUjtFfbdIL
+HpeGPZUR5zOfAiIl+zASdutD9TQVu20kr+/xSJybhXINXLj+r+x4P9xS8eYTQkLJ
+FLSCieH5zHtHuRj8cSafaBgJoQvFTOkZoD8D8N9CcCIKBUQleyBNpRBIfc0=
+						</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://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">DOCCOM  Deutsch Universität Bern</md:ServiceName>
+      <md:ServiceName xml:lang="en">DOCCOM  German University Bern</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">DOCCOM Deutsch, Institut für medezinische Lehre, Universität Bern</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">DOCCOM German, Institute for medical Education, University Bern</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="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:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="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="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="commonName" Name="urn:oid:2.5.4.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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">unibe.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Bern</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bern</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.unibe.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unibe.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michel</md:GivenName>
+    <md:SurName>Adrian</md:SurName>
+    <md:EmailAddress>mailto:adrian.michel@iml.unibe.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hahn</md:GivenName>
+    <md:SurName>Axel</md:SurName>
+    <md:EmailAddress>mailto:sysadmin@iml.unibe.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 031 631 58 53</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/docs.nsms.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/docs.nsms.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..40342eaa
--- /dev/null
+++ b/swamid-interfederations-2.0/docs.nsms.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://docs.nsms.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-22T11:38: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>
+						MIIC/TCCAeWgAwIBAgIJANItM4swegV3MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEmRvY3MubnNtcy5veC5hYy51azAeFw0xNDA1MjAxNDI5MjVaFw0yNDA1MTcx
+						NDI5MjVaMB0xGzAZBgNVBAMTEmRvY3MubnNtcy5veC5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAL7Qbx7ncFti/2duYSv5uq14whnJpO+qUUP2
+						3rbm2//RoT7CfGdrAwTQm/kBtHqCSP6e1HeKPDshMDq1Gu0ZgVyOcnDhML6go3YS
+						beQZEK9LEktW9wYxKk5S7GTsUZyeosN1ZJZQ93NVj7vAdGblBxiOV5p1WExicnDK
+						KzJ1fcHhfemiWbQ28tF40Jv2IVCW9qecAXrt4CNHFrFXLWrmmMiWxjq+odgnjddN
+						C7B9c6eJTzEj2uPvlBW20/Ucfdxats/OSrVuajpn8BdglxJkzy1aqIp2uy38x4oD
+						EqHPpE67+eORgTtMH804zPKVazBxEwqoyeyaqDzCgs3AZ/AK5v8CAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISZG9jcy5uc21zLm94LmFjLnVrMB0GA1UdDgQWBBQ/WjpW4JfV
+						7EorqP5jmbOILrvUqzANBgkqhkiG9w0BAQUFAAOCAQEAFCIv7u9pL1C2ti8k9KOn
+						Kg3CkOjZaeEtLHwIceZHDJvWQGbetLei6ptF4nAxvVzW/g7niVD+U0omv16bsONL
+						quEqQhmcwzQJnjkVO0BRAX/bB1/etiLFEQ6eJ+kALjKD44NlwpKytTctq7m7OqRt
+						bu6Tr5qTzkzvMJGQj2ct97ODWxUfSH52TPEqrJpEMdnTToYt6zC8ScZ11bNkyIoC
+						gPHcIH6KX4EXVZT3lXcKNL821unbxEM/V70BEpj+IXyoo8Jfls9ZRkplTaEYrKg0
+						hebx/WWoxPNmAaI8XGblLDzmXIN1nhZF0imrHYBzMRbMJUyOTnvB2fUQIDiSQB6c
+						+g==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://docs.nsms.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://docs.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://docs.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://docs.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://docs.orchard.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://docs.orchard.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://docs.orchard.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://docs.orchard.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - docs.nsms.ox.ac.uk</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://docs.nsms.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/doit.swisdom.org-shibboleth.xml b/swamid-interfederations-2.0/doit.swisdom.org-shibboleth.xml
new file mode 100644
index 00000000..f5c1fc80
--- /dev/null
+++ b/swamid-interfederations-2.0/doit.swisdom.org-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://doit.swisdom.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-25T12:32:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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">DOIT - Dermatology eLearning</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Dermatology Online with Interactive Technology</mdui:Description>
+        <mdui:Keywords xml:lang="it">elearning dermatologie</mdui:Keywords>
+        <mdui:Keywords xml:lang="fr">dermatologie elearning</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">elearning dermatology</mdui:Keywords>
+        <mdui:Keywords xml:lang="de">elearning dermatologie</mdui:Keywords>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAD72lDQ1BJQ0NQcm9maWxlAAB4nI1V3W/bVBQ/iW9cpBY/oLGODhWLr1VTW7kbGq3GBkmTpelCGrnN2CqkyXVuGlPXNrbTbVWf9gJvDPgDgLIHHpB4QhoMxPay7QG0SVNBFdUkpD102kBok/aCqnCur1O7Xca4ka9/Oed3Pu/RNUDHV5rjmEkZYN7yXTWfkY+fmJY7ViEJz0En9ECnpntOulwuAi7GhUfWw18hwd43B9rr/3N1VqmnAySeQmxXPX0e8WmAlKk7rg8g3kb58CnfQdzxPOIdLiaIWGF4luMswzMcHw84U+ooYpaLpNe1KuIlxP0zMflsDPMcgrUjTy3qGrrMelF27Zph0li6T1D/zzVvNlrxevHp8uYmj+K7j9Ved8fUEH+ua7lJxC8jvub4GSZ/FfG9xlwljXgvQPKZmnukwvnJNxbrU+8g3om4aviFqVC+aM2UJrhtcnnOPqqGnGu6N4o9gxcR36rTQpHnI0CVZnOsX4h7642x0L8w7i1M5lp+FuujJe5HcN/TxsuIexB/6NrqBM9ZWKZmXuX+hSuOXw5zENYts1TkPolEvaDGQO7Xp8a4LTng4yFyWzJdM44UQv6SYwaziLmR825DrYScG5qby3M/5D61KqHP1K6qlmW9HUR8GI4lNKBgwwzuOliwATKokIcMvh1wUVMDA0yUUNRSlBiJp2EOZe155YDDccSYDazXmTVGac/hEe6EHJt0E4Xsx+cgKZJDZJiMgEzeJG+RwySL0hFycNO2HIvPYt3Z9PM+NNAr4x2DzLmeRl8U76x70tCvf/T3Fmv7kZxpK594B8DDDrSYA/H6ry79sCvysUIuvHuz6+oSTDypv6nbqfXUCu6rqbWIkfo9tYa/VUhjbmaQ0Tw+RpCHF8sgXsNlfHzQcP8DeXaMtyVizTrXE2lYJ+gHpYclONsfSZXflD+VFeUL5bxyd1uX23ZJ+FT4VvhR+E74XvgZZOGScFn4SbgifCNcjJ3V4+dj8+yDelvVMk27XlMwpYy0W3pJykovSK9Ixcif1C0NSWPSHtTs3jy3eLx4LQacwL3V1faxOK+CWgNOBRV4QYctOLNt/kNr0kuGSGHb1A6zWW4xxJyYFdMgi3vFEXFIHGe4lZ+4B3UjuOe2TJ3+mApojBWvcyCYOjarzHoh0HlAfXraZxftqO2ccY3Zui/vU5TX5TR+qqhcsPTBflkzTTlQebJLPeou0OogsO8gv6IfqMH3LbHzeiTz3wY49BfeWTci2XQD4GsPoPu1SNaHd+KznwFcOKA33IXwzk8kfgHwavv38X9dGbybbjWbD/C+6vgEYOPjZvOf5WZz40v0vwZwyfwXWQBxeO6COJEAAAkjaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/Pgo8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA0LjQuMCI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiLz4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgIAo8P3hwYWNrZXQgZW5kPSJ3Ij8+p930kgAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAW5JREFUeJzUUT+rgnAUtSL6EC1tDY0hro5hZUtFLS0NDUFDkEGNImIQkvQHgjIjHCIoKKOkNxgOBQ1+g77KOz3DF+5veHe7v3vuueecH0H8eYVCoUAg4LXFYnE0GlmWdTgcRFHMZDLeKBwOB4PBd1MqlSaTyfF4PJ1O0+m0Wq02Gg1N0y6Xi2maiqJks9k3tFKpnM/n/X4/GAwKhYLHl06nwZLL5Vqt1nw+32w2vV4vHo8TgiA8n8/FYsGy7KfUTqeDCzirqqpt2xC5XC6j0ehrRtP0eDx+PB6O42CzVqu5O6lUiuf53W5nGAbDMJDXbreJSCTijmFgOBxKkgQbXz+1Xq+bzWa5XMYFAEC6Wq1+NQABDrwiqEQiQVFUPp+fzWYA3e93AEAHJy+oG2symeQ4Dpnebrftdgtt1+u13+/X63WSJAGQZRmJvek9YW7eiEXX9Vgs5osBYfr/8XPT13a7Xbj3L/zH+gYAAP//AwCk1qMzXSJnzgAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="25" width="68">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEQAAAAZCAIAAAAHYR/MAAAD72lDQ1BJQ0NQcm9maWxlAAB4nI1V3W/bVBQ/iW9cpBY/oLGODhWLr1VTW7kbGq3GBkmTpelCGrnN2CqkyXVuGlPXNrbTbVWf9gJvDPgDgLIHHpB4QhoMxPay7QG0SVNBFdUkpD102kBok/aCqnCur1O7Xca4ka9/Oed3Pu/RNUDHV5rjmEkZYN7yXTWfkY+fmJY7ViEJz0En9ECnpntOulwuAi7GhUfWw18hwd43B9rr/3N1VqmnAySeQmxXPX0e8WmAlKk7rg8g3kb58CnfQdzxPOIdLiaIWGF4luMswzMcHw84U+ooYpaLpNe1KuIlxP0zMflsDPMcgrUjTy3qGrrMelF27Zph0li6T1D/zzVvNlrxevHp8uYmj+K7j9Ved8fUEH+ua7lJxC8jvub4GSZ/FfG9xlwljXgvQPKZmnukwvnJNxbrU+8g3om4aviFqVC+aM2UJrhtcnnOPqqGnGu6N4o9gxcR36rTQpHnI0CVZnOsX4h7642x0L8w7i1M5lp+FuujJe5HcN/TxsuIexB/6NrqBM9ZWKZmXuX+hSuOXw5zENYts1TkPolEvaDGQO7Xp8a4LTng4yFyWzJdM44UQv6SYwaziLmR825DrYScG5qby3M/5D61KqHP1K6qlmW9HUR8GI4lNKBgwwzuOliwATKokIcMvh1wUVMDA0yUUNRSlBiJp2EOZe155YDDccSYDazXmTVGac/hEe6EHJt0E4Xsx+cgKZJDZJiMgEzeJG+RwySL0hFycNO2HIvPYt3Z9PM+NNAr4x2DzLmeRl8U76x70tCvf/T3Fmv7kZxpK594B8DDDrSYA/H6ry79sCvysUIuvHuz6+oSTDypv6nbqfXUCu6rqbWIkfo9tYa/VUhjbmaQ0Tw+RpCHF8sgXsNlfHzQcP8DeXaMtyVizTrXE2lYJ+gHpYclONsfSZXflD+VFeUL5bxyd1uX23ZJ+FT4VvhR+E74XvgZZOGScFn4SbgifCNcjJ3V4+dj8+yDelvVMk27XlMwpYy0W3pJykovSK9Ixcif1C0NSWPSHtTs3jy3eLx4LQacwL3V1faxOK+CWgNOBRV4QYctOLNt/kNr0kuGSGHb1A6zWW4xxJyYFdMgi3vFEXFIHGe4lZ+4B3UjuOe2TJ3+mApojBWvcyCYOjarzHoh0HlAfXraZxftqO2ccY3Zui/vU5TX5TR+qqhcsPTBflkzTTlQebJLPeou0OogsO8gv6IfqMH3LbHzeiTz3wY49BfeWTci2XQD4GsPoPu1SNaHd+KznwFcOKA33IXwzk8kfgHwavv38X9dGbybbjWbD/C+6vgEYOPjZvOf5WZz40v0vwZwyfwXWQBxeO6COJEAAAkjaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/Pgo8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA0LjQuMCI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiLz4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgIAo8P3hwYWNrZXQgZW5kPSJ3Ij8+p930kgAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAA/VJREFUeJzslkko7XEUxy1tLdmRDfU2NjJEylDGkqFMKQtEWCjKEJJcLwtKEYkioSRD5ikZHxEyZRYSC0UpFu99uqf36/b/33vfu1Kvp3sWt9895/zO7/c9w/f3d3Cwi13sYheL4u/v39XVtby8fHl5ubu7OzMzU15e7urq+q/vZYvExMT09fUdHh4+PT0tLCzU19f7+vrGxcX19vZubW29vr5ub2+zBqr1OG5ubg0NDXt7e9+NUlNTExYWZtbTycmpra1tYGDAz89PNI6Ojs3NzQaDQf39ZpTo6OiCggJSPDc3V1hYaPHsqKiowcHBi4uL29vbsbGxzMxMQujdPDw8amtrFxcXn5+fAdzR0eHl5aV3Ky4uBvZPnbAlMjJSuVVVVR0cHNzd3Yn1/v5eKg9y/k5OTjY2NuqDkOXh4WFnZ2czMEpLS/f39wVDSkqKRbi6dAJ4enp6Z2eHVkxLSzO11tXVzc/PczBlTE1NraiomJ2dFXjkS9JEjt/f39vb2yMiIqg/a6xNTU2YqKSAGRoaIjgdzi+a9fV1b29vi3cKDAyUhLm4uFi5OtHxOTs7+2EULgoMDkPPXd3d3RMSEjSVRE9k7qE0+fn5ktr09HT+Hh8fX11dqV0TExOYCMuayKzBaXoBZbUmtM3JycnLywsTkpWVZba7ROgBGjcoKCg5ObmysnJzc5Nmo6q0R3x8vB6//niaCiUmWoAFs6dMJSUlCryAwU0TDf0fwIgkJibSZjSboIK4zDel0ZMsktfOzk5p8dHR0ZWVFbNgNMdTVZRFRUVsYZGRkaFMUklogDUp0IAZGRmxAYxIUlLS29sbJ9HZtDidCqV4enpSLnI5Pj4OhqWlpZycHGgKSLKLsjCUfwPm/Pyc2SCgzICPj48yyazL0FIf1sBTVqmVbWCAsbGxIeuAgADagL/0EoHg5dbWVthMrGVlZTc3N7KGhXHQPEECZmpqSmlCQkLQwIQOv0tkWhnYlhGS9eeAIQopDw8Ph6ws+dB+TA6TRnSlZI1SD4YrKg1c9PDwIFS+traGtb+/X0zUivaGAz8TDE0FmT4+PtIMR0dH3d3dCpU8ZNfX1xQKWltdXWVmTMGQAj0Y2hXwNA9DxXuieII3DSsAePvYCDEAVe0VMLy5GjDwuw1glNAz8BWXhql4BBh6qPn09DQ7O9usvyaRSGxsrLwMjJMsSL+yBgcHg0S9g3wumfKNgDGldYgBDcz5ETAiVKOlpYXbwAo9PT1WWJvvNw0YnMkCheXe8Ip+S15eHjRAxSi4JnJ1dTXsYvptkZubiydbPg5GhCrxeWbdRw/mP5YvBYbp+jpgQkNDrbC5XezyBeQXAAAA//8DAMcQPBACQuP6AAAAAElFTkSuQmCC</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIJAJHcXT05fMs7MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGRvaXQuc3dpc2RvbS5vcmcwHhcNMTQwODI1MTE1ODExWhcNMTcwODI0MTE1
+ODExWjAbMRkwFwYDVQQDExBkb2l0LnN3aXNkb20ub3JnMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA7yfqRa1uZXzzBaC10gq40/I7xws9oK3wsbwFTlho
+4LQ1W3Ph48PlJGH0VIUEhCZE+ZEKY4QBB3a+ZZU7TWdiu0L2RZDm+pM60pfLaMZv
+sWEC5QwQQyJ27GuECU+mmXYfo7yXTdNu7JA797H7xpWdzLz37cBX6BlF5OvlkHQ2
+ViFO/xNLrw4JiBlRJkX0A+DETgutcyK6RwzQ0jstj1e/U8w9HMxYkuhJ79jcUJQx
+9F5rzfhXg9qHD0VtA9iiwlgbAdqChfyUXxQrOptaE0G3t/fuI2rwYJ3QoX7xQnwF
+arngEtm1LyfpeXWuI5IlzYrjVDs3Ba4TTYLUMuNDDFG/jQIDAQABo2MwYTBABgNV
+HREEOTA3ghBkb2l0LnN3aXNkb20ub3JnhiNodHRwczovL2RvaXQuc3dpc2RvbS5v
+cmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwAvg3JPnWCqyc595uuwFXNv2QScwDQYJ
+KoZIhvcNAQEFBQADggEBANPmBQZ+uWR42Q7Q32iCHn40YYGK0iLyyVsGYqVFjklF
+JQcQ5QiATQiLBMiXzGB8NO1LEVIEPuMQ/c0kQhBICPc+CUJkHpvIQziHwcM/GVNb
+3A60JjpG4L1hNJs+Upc6xUSYi3bteUsXE67c1pGdF5DB7IAWJjGyeM5q4BG6AmSv
+aAGKF8PQrkdLm2KLzgZIBCf+O/yVz6Yn1Jqb1JW6+TRLkWFF7eaYYAGH5YMQ8mwk
+Pu/Y3XLZI21tZN3bVaj/FW0nvSakrF6Ic+90NF+5i891xXjypJOthoe20x1ulX78
+nAvioAXLKLyPxl70a9Yj0TSJVsCSAk2bTcgY6WOnsBQ=
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md: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://aai.cyberderm.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cyberderm.net/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cyberderm.net/Shibboleth.sso/SAML2/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cyberderm.net/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/ECP" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/ECP" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cyberderm.net/Shibboleth.sso/SAML/POST" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://doit.mironet.ch/Shibboleth.sso/SAML/POST" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://doit.swisdom.org/Shibboleth.sso/SAML/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML/Artifact" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cyberderm.net/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://doit.mironet.ch/Shibboleth.sso/SAML/Artifact" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://doit.swisdom.org/Shibboleth.sso/SAML/Artifact" index="20"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">DOIT - Dermatology eLearning</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Dermatology Online with Interactive Technology</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="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" 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="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: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="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="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">uzh.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Zürich</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Zurich</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uzh.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uzh.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Vahid</md:GivenName>
+    <md:SurName>Djamei</md:SurName>
+    <md:EmailAddress>mailto:vahid.djamei@uzh.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>DOIT</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:vahid.djamei@uzh.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml b/swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml
new file mode 100644
index 00000000..3fa5676f
--- /dev/null
+++ b/swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dourado.ufs.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">ufs.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFS - Universidade Federal de Sergipe</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFS - Universidade Federal de Sergipe</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFS - Universidade Federal de Sergipe</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFS - Universidade Federal de Sergipe</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufs.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufs.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEBjCCAu4CAQAwDQYJKoZIhvcNAQEFBQAwgcgxLDAqBgNVBAoTI1VGUy1Vbml2
+ZXJzaWRhZGUgRmVkZXJhbCBkZSBTZXJnaXBlMTIwMAYDVQQLFClOVEktTsO6Y2xl
+byBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqGSIb3DQEJARYL
+Y2FmZUB1ZnMuYnIxEDAOBgNVBAcTB0FyYWNhanUxEDAOBgNVBAgTB1NlcmdpcGUx
+CzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5kb3VyYWRvLnVmcy5icjAeFw0xNDA0MTAx
+MjMxNDFaFw0xOTA0MDkxMjMxNDFaMIHIMSwwKgYDVQQKEyNVRlMtVW5pdmVyc2lk
+YWRlIEZlZGVyYWwgZGUgU2VyZ2lwZTEyMDAGA1UECxQpTlRJLU7DumNsZW8gZGUg
+VGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xGjAYBgkqhkiG9w0BCQEWC2NhZmVA
+dWZzLmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYDVQQIEwdTZXJnaXBlMQswCQYD
+VQQGEwJCUjEXMBUGA1UEAxMOZG91cmFkby51ZnMuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCuuogQEudWqFoQPdA7n9TrUUYXXauTI4yRaEuEoeyv
+KultDI/HnZDCQ1so3QIjjlWgY5bLTOuYZR/+bw1ufVCtQNH8zCgEmnbjZVuG01q2
+eoOzCyLjL7I/HwhFHTXOKoXNLyC6K2JgF4QYDISAcVG7XkhbD5dA6PGtwyCu+43h
+VKg42zu8R7KUJjj3Iu5FUTB9txGt4gM5j3twqDde6iNUXILh3Gf/V01JdGgIhLls
+Mf3d0ac1sH4Ks0KkaQsnhkc4Rt7fHDFlS3NkOTNt95oYyiOTSK/QZzbOr6TVOuC0
+8Y+ya8BE2spu37VBaUCuers4FbfFp2WIu/XO8hfG9MJTAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAH8eyp2vC7zx5oFdqWzFqZXkjGRQyih+grWeiNb3qCviPcCacyUl
+YQ2NuQEEDqManKPBPxAscO7UP1Rr9g3Ggh0vkL6KAxQqEFRwWxUkCnRd3z/TUrys
+aIt7WrF0J0mZx8qZQPasestDbSehM74s+pNsACQxY/zlbXD2Ybft9Mj62kxSdeMx
+JjjUtWoCYJwdzXAklw8r0ot7/TnVx1nNZRCV1mwFtzcKuwz8M5JDcI9sBlH+/oRd
+d6xRz2iXP9guO9SjSdWIz/LP3Px/E+ASWZ1LZBMwv8tTBmYbo9tEdUzG4DWEMwS2
+ppG+3mm7IVx2FODAFkApZmdPV4osxno36Ww=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dourado.ufs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dourado.ufs.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://dourado.ufs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dourado.ufs.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dourado.ufs.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dourado.ufs.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">ufs.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEBjCCAu4CAQAwDQYJKoZIhvcNAQEFBQAwgcgxLDAqBgNVBAoTI1VGUy1Vbml2
+ZXJzaWRhZGUgRmVkZXJhbCBkZSBTZXJnaXBlMTIwMAYDVQQLFClOVEktTsO6Y2xl
+byBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqGSIb3DQEJARYL
+Y2FmZUB1ZnMuYnIxEDAOBgNVBAcTB0FyYWNhanUxEDAOBgNVBAgTB1NlcmdpcGUx
+CzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5kb3VyYWRvLnVmcy5icjAeFw0xNDA0MTAx
+MjMxNDFaFw0xOTA0MDkxMjMxNDFaMIHIMSwwKgYDVQQKEyNVRlMtVW5pdmVyc2lk
+YWRlIEZlZGVyYWwgZGUgU2VyZ2lwZTEyMDAGA1UECxQpTlRJLU7DumNsZW8gZGUg
+VGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xGjAYBgkqhkiG9w0BCQEWC2NhZmVA
+dWZzLmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYDVQQIEwdTZXJnaXBlMQswCQYD
+VQQGEwJCUjEXMBUGA1UEAxMOZG91cmFkby51ZnMuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCuuogQEudWqFoQPdA7n9TrUUYXXauTI4yRaEuEoeyv
+KultDI/HnZDCQ1so3QIjjlWgY5bLTOuYZR/+bw1ufVCtQNH8zCgEmnbjZVuG01q2
+eoOzCyLjL7I/HwhFHTXOKoXNLyC6K2JgF4QYDISAcVG7XkhbD5dA6PGtwyCu+43h
+VKg42zu8R7KUJjj3Iu5FUTB9txGt4gM5j3twqDde6iNUXILh3Gf/V01JdGgIhLls
+Mf3d0ac1sH4Ks0KkaQsnhkc4Rt7fHDFlS3NkOTNt95oYyiOTSK/QZzbOr6TVOuC0
+8Y+ya8BE2spu37VBaUCuers4FbfFp2WIu/XO8hfG9MJTAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAH8eyp2vC7zx5oFdqWzFqZXkjGRQyih+grWeiNb3qCviPcCacyUl
+YQ2NuQEEDqManKPBPxAscO7UP1Rr9g3Ggh0vkL6KAxQqEFRwWxUkCnRd3z/TUrys
+aIt7WrF0J0mZx8qZQPasestDbSehM74s+pNsACQxY/zlbXD2Ybft9Mj62kxSdeMx
+JjjUtWoCYJwdzXAklw8r0ot7/TnVx1nNZRCV1mwFtzcKuwz8M5JDcI9sBlH+/oRd
+d6xRz2iXP9guO9SjSdWIz/LP3Px/E+ASWZ1LZBMwv8tTBmYbo9tEdUzG4DWEMwS2
+ppG+3mm7IVx2FODAFkApZmdPV4osxno36Ww=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dourado.ufs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dourado.ufs.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">UFS - Universidade Federal de Sergipe</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFS - Universidade Federal de Sergipe</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFS - Universidade Federal de Sergipe</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFS - Universidade Federal de Sergipe</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufs.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufs.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Rodrigus Oliveira Feitosa</md:SurName>
+    <md:EmailAddress>rodrigus@ufs.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/draper.library.qmul.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/draper.library.qmul.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..710ac1fa
--- /dev/null
+++ b/swamid-interfederations-2.0/draper.library.qmul.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://draper.library.qmul.ac.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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFMDCCBBigAwIBAgIQCR4X+YYxugtmUqrjt8DPOjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDcxNzAwMDAwMFoXDTE2MDcxNjIzNTk1OVowgdsxCzAJBgNV
+						BAYTAkdCMQ8wDQYDVQQREwZFMSA0TlMxFzAVBgNVBAgTDkNlbnRyYWwgTG9uZG9u
+						MQ8wDQYDVQQHEwZMT05ET04xGjAYBgNVBAkTETMyNyBNaWxlIEVuZCBSb2FkMT8w
+						PQYDVQQKEzZRdWVlbiBNYXJ5IGFuZCBXZXN0ZmllbGQgQ29sbGVnZSwgVW5pdmVy
+						c2l0eSBvZiBMb25kb24xEDAOBgNVBAsTB0xpYnJhcnkxIjAgBgNVBAMTGWRyYXBl
+						ci5saWJyYXJ5LnFtdWwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+						AoIBAQDFgBdbGL/GSo5oQqq88P2aZQsDZKGXcROQf+x9ooJAy7nZhbYjyohCyMPJ
+						Nfc541+v5+UqZgSU/GoN1s9RCPdvNkObiyEIzhBCTrTRE11H1MGJoUF0acx2jpWZ
+						0g8px6vi4mX2P/9hwVt6y9L++U6KdAoqDpG8vy1CNmyWV+b+39nn2hmGn8T/GDdJ
+						5Tg2bnA35B+H0n4M+0Ezcm/+fvexplwI31A90R7fWQryYyORlYC/mZRvDLgd7pDs
+						J8RXFNW3RAum7FHQxVsmMEYiKfobt1jLd+L7jsG+94W43dfv3s2x0Woin3douEBZ
+						tciHGAHATDTHzZcpkibQxNtROQLbAgMBAAGjggGSMIIBjjAfBgNVHSMEGDAWgBQM
+						vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU517jMU/gexoHTBO9dLm4x2eW
+						SmAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
+						BQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EM
+						AQICMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
+						VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
+						cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
+						MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMEAGA1UdEQQ5MDeCGWRyYXBl
+						ci5saWJyYXJ5LnFtdWwuYWMudWuCGm1ldGFsaWIubGlicmFyeS5xbXVsLmFjLnVr
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCK31/RCDY1vk7ZlYo2TsEMApl7BtMDHSSjBC8X
+						ynY3HufFVHn5MfOOWgd4lP8J2xkhWTrlNdN6HGWLHnyi1X83SWxeiFc8v24tIWDY
+						/l0lyk0vbTCl3WJqAlczmNCLHIIGLM6epn1zWgprydw6zh9tjKyTNTQGvpdxZm54
+						EyakhTXxRyQ8ZvhI7o0O5gdLR7G1O7TAi01VhlqYN2qZl2a1MKKMIh/in7W26lGw
+						qD1u5MIJDZI2AWzuWcbWVnG1eCS7OjS6L3VLGe42HdA/PcDTlP1Sa3fhtW0dicnN
+						lkd9ORqKnAn0Eu92u/K4wIU0zyHK7lXeeOVZsm/ErYmcGtTS
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://draper.library.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://draper.library.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://draper.library.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://draper.library.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: QMUL Metalib 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>Jeremy</md:GivenName>
+    <md:SurName>Acland</md:SurName>
+    <md:EmailAddress>mailto:j.acland@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kieran</md:GivenName>
+    <md:SurName>Whitbread</md:SurName>
+    <md:EmailAddress>mailto:k.j.whitbread@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..21a3f468
--- /dev/null
+++ b/swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://drupal-test1.admin.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-13T11:32: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">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDGDCCAgCgAwIBAgIJAJLwYa1nUjhIMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG2RydXBhbC10ZXN0MS5hZG1pbi5veC5hYy51azAeFw0xNDA2MTEwNzM4NTZa
+						Fw0yNDA2MDgwNzM4NTZaMCYxJDAiBgNVBAMTG2RydXBhbC10ZXN0MS5hZG1pbi5v
+						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCrjkmZs9yt
+						nETaaTxuF459aLEF5H12+vcuwsR662oNVitQqHO1XUUd5KVJ2502H3tpWZbT0rWA
+						wnv0nwHB14gm4evKInO/Da9yojWFUtOFExHqePyDfOQZyKb3mAlpRrQAtCpELTjq
+						Zr0HTht/ODhsmCKdRUzsNDOld6X7HYU834DoQoZCGpHuzDK/Nj6C9gweL1Uxn1RB
+						kVd2t+5/nU0aXSfyMmL++H4kxPDEYEcyZpz2xCwZDfqbSiMn2mltwxUM6Pl5YnwM
+						TMvEN9BiWdhTSckqWoqz9pxbJePM2k4kH2tm+v2oHRlC2/hKEtOggKTyeqdQxryK
+						qqj85s6HZa0CAwEAAaNJMEcwJgYDVR0RBB8wHYIbZHJ1cGFsLXRlc3QxLmFkbWlu
+						Lm94LmFjLnVrMB0GA1UdDgQWBBT8QD5mvc4hICi5sUNX2UZ/9hDmKjANBgkqhkiG
+						9w0BAQUFAAOCAQEAgQLx3imjfSX3QxSJqZPHuzLFoygwXm2EWm5m1LR8aUl1WWIo
+						2CwZR7wMZ0pVYiBJgYqwjkNpozJ1f6Fr9F48o/sSDG673zxjFbOAxLm7nTHBvc39
+						qIMNxvOmhl8f/A7gT+OnR+dmVfPI42BrHhUEAOSTmkTRRT1jV6WHKNwXjqngYqD+
+						EOASg50rUobY9bF+6k6vGhWxTBAS+UcBUsTGiGU9cDS1cuFpONYixQB7cYA++1SR
+						hxhDEKXAC6V3xfJiCLPEcKBaKRyFh+ImaDfcqWjollm0Y2xd/uF1/Tg8AMxLslGw
+						PI60xEImflkCgUGXgjTfpKljm+bcaUKAnUQMpg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-test1.admin.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://drupal-test1.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-test1.admin.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-test1.admin.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-test2.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-test2.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-test2.admin.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-test2.admin.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-test3.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-test3.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-test3.admin.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-test3.admin.ox.ac.uk/Shibboleth.sso/SAML/POST" index="12"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford IT Services drupal-test1</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dspace.jorum.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dspace.jorum.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..415c9100
--- /dev/null
+++ b/swamid-interfederations-2.0/dspace.jorum.ac.uk-shibboleth.xml
@@ -0,0 +1,125 @@
+<?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://dspace.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#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.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-16T17:01: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>
+      <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"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://window.jorum.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dspace.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"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://window.jorum.ac.uk/Shibboleth.sso/Login" index="4"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dspace.jorum.ac.uk/Shibboleth.sso/Login" index="5"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Jorum</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>
+						MIIDFTCCAf2gAwIBAgIJAJbPuHXi0UDYMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXZtLWpvcnVtLWxpdmUwHhcNMTQwNDE2MTIyNDI0WhcNMjQwNDEzMTIyNDI0
+						WjAYMRYwFAYDVQQDEw12bS1qb3J1bS1saXZlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAvlVUs6QM5xdt/Ri2V+fwBQvsXpOyZhZWC4wd5KeFxg4atgW4
+						jN64Lp4YU8KM+tABhiJ5GNhscmXFG9T7AhQN+f0Egg++dhx2n5L82v1D8wif1FGw
+						fHMS+JaDFhCfQWaxKzi0C+DMUaB/lqOObX5mV+oBZAadpHroDXuGu13tZixE4Hod
+						yORv3NSPHBFkn5Lmx9Hv8PntBqR2PEVpicEaokJtH8S4mXNcY1QEY8D7FlN1BHvR
+						irMl/JCDZTV5gw2axLFuGeholiqsZwKZvXRTXy9WYoqfxEio5r4pSctSM9ounb0H
+						4ILOUI9xMIiGf/jHD1OrHhWNwd63LzuBYC3RsQIDAQABo2IwYDA/BgNVHREEODA2
+						gg12bS1qb3J1bS1saXZlhiVodHRwczovL2RzcGFjZS5qb3J1bS5hYy51ay9zaGli
+						Ym9sZXRoMB0GA1UdDgQWBBTgE6iCbBgMAYLkrgLLpsJoDsFYGzANBgkqhkiG9w0B
+						AQUFAAOCAQEAg9kbdbOQ3PAeGUhokP5PUJeB3wp0IPGWK6d9TijrW2/ArFiGlJtT
+						1bri8JBAesX7ufonRR5MOXukpz9DHqhJxqcoE1RfJ+xvoZbvCuP+WdxPg/ya7/tZ
+						oiWM+mj+Y8lA35dptThCE3yW4c4n3YXwwZEgaYgmTsNODOD/6JrbNNj9/LS6xKyE
+						0oFQi38QenBFAmRz7GQjCfMg7upZZE1Rbq7+l0GNLltBwo+xCjvBZ7C3zBkb+SrI
+						2tydmwzbAnZl+iHmbcvRjZdCZfYk/9lYuc6xSA2OJMkad9w/h/jUZdtYTXN/blQR
+						Rv/EwHdvI+8G8Vuf/3+KmHHcv17aOEeuhA==
+					</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://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:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://window.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dspace.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="4"/>
+    <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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://window.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://window.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://window.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://window.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://window.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://window.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dspace.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dspace.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dspace.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dspace.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dspace.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dspace.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="29"/>
+  </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</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/du-idp.lanet.lv.xml b/swamid-interfederations-2.0/du-idp.lanet.lv.xml
new file mode 100644
index 00000000..9ab84dad
--- /dev/null
+++ b/swamid-interfederations-2.0/du-idp.lanet.lv.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://du-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>
+      <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">Daugavpils 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>
+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>
+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://du-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://du-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LAIFE - DU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Daugavpils University - DU 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/duck-dev.bournemouth.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/duck-dev.bournemouth.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..b4488e9c
--- /dev/null
+++ b/swamid-interfederations-2.0/duck-dev.bournemouth.ac.uk-oala-metadata.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://duck-dev.bournemouth.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"/>
+  </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>
+						MIIDXzCCAkegAwIBAgIJAO6CYqChSs/9MA0GCSqGSIb3DQEBBQUAMEYxHzAdBgNV
+						BAoMFkJvdXJuZW1vdXRoIFVuaXZlcnNpdHkxIzAhBgNVBAMMGmR1Y2stZGV2LmJv
+						dXJuZW1vdXRoLmFjLnVrMB4XDTE0MDEyNzEzMzczOFoXDTI0MDEyNTEzMzczOFow
+						RjEfMB0GA1UECgwWQm91cm5lbW91dGggVW5pdmVyc2l0eTEjMCEGA1UEAwwaZHVj
+						ay1kZXYuYm91cm5lbW91dGguYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQC8D4pXasrHRGOOesMTZ+4+sX9RMHMZ/OU9NXTxXFPIdNEB8HImGayd
+						VNXCUmhGIRySMBNhvHdMEui5OFq0hHd/Rxe6FO8itPxsxLvbW0K6pb5r7yI8s/mc
+						Rws8qC17OvhX0vgbWXAdp2/zPTCAYSoIA960f41KOc1jVO3gKXELkGV0rc8Fte2h
+						TuTHSVo1u0kg8IXoSTsyDVIBbkWmL8XJp39VZ8Im++N6l+vajxF8TH2oqz70xi60
+						khQy8JTBg2F5PPcCRIWauo9TXJiHFUHWaMZcl8RucOXNOcDts1yTZaFLD4kzTCE9
+						WqgFEOqpjD/IM4pPFAum0Z2oB08WaLDpAgMBAAGjUDBOMB0GA1UdDgQWBBSSJsuN
+						R63OgPcAndwv6yQOhWNjwDAfBgNVHSMEGDAWgBSSJsuNR63OgPcAndwv6yQOhWNj
+						wDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCfNUSVwmAjZdsH3md3
+						v9cfud8n5gNFKjnB54zZXZsa8inlIQ0pSfqqkxrffCeVlhWiZf9EIL30FDP1M5mX
+						88oj4mNj0hkVtujIFmd4cpf/Kij+96dOVhfXyezsvHFy/exyD94NUdTdrs53uZN/
+						LoeWfZyusHKVAQsa8Rm127ydCiCv+AQkAnYGPHD/DlGKJQ3V6QbZsNe0aEWDTiLE
+						3ZDX+jV9I0pM2AZemD6qlS2x7vxds8V9QI9yA7sFO1Ee/atoLO4R0e2Tqa3zzlqj
+						jzoKTt9nOBpUxTZMlQBNjpQZl6XHSk/dM3ECz+trlYpRcp8wMy9l6bku6zxxS4b1
+						uq1+
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://duck-dev.bournemouth.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://duck-dev.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_DEV</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>Claire</md:GivenName>
+    <md:SurName>Wilkinson</md:SurName>
+    <md:EmailAddress>mailto:wilkinsonc@bournemouth.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dun-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/dun-shib.hosted.exlibrisgroup.com-shib.xml
new file mode 100644
index 00000000..212e7949
--- /dev/null
+++ b/swamid-interfederations-2.0/dun-shib.hosted.exlibrisgroup.com-shib.xml
@@ -0,0 +1,85 @@
+<?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://dun-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-24T15:45: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://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dun-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">University of Dundee - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the University of Dundee</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC3DCCAcSgAwIBAgIJAJQ23rWbODdWMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB2FpbzAwMDQwHhcNMTQwNzE4MDkyNTEyWhcNMjQwNzE1MDkyNTEyWjASMRAw
+						DgYDVQQDEwdhaW8wMDA0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						5glgMq+fQ29qwkY7AJ+/uzOPwA1tLN5SptMA6+f0IolQ0HFpxZO8EeRGFCcSzJuA
+						5Hpqu7Nlw3w7Xr168dryTwlbGmk2bEe+kVIyExCSumaJnTDBKkfk2snt88BMyKjZ
+						20v8hgLWCQZRdDFkeNj8WJaaoh2NW2Mj5o/PLStyV5PRvDdd3NY6rwXaeEzU+DBG
+						oDBuyaW+55KCARSRk7G7jkVFpKFhpEfV3ZBoBHv2aK+8goph+1P2C6VvmuR20o91
+						mkw/4/wK/U/2XrQP+Ofjbko/R2/avHDXnURioval7bMqw79Cnoyv0jAlwA4MqRB2
+						x/OeHn0J9A1ThP7xJ6g11wIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDA0MB0G
+						A1UdDgQWBBTAa8dYEU0eoa5tnDvh5Vw1bCHlbTANBgkqhkiG9w0BAQUFAAOCAQEA
+						LLadg5+o6PZfG4zc/sp21OQJqVEg2bWRzvDxH1uWmRomROwoi9rLLU2aTc1JyGxi
+						zeBFZ9eU1zzpehoZU0bXoO6jriAEk+y2iGVNnDbNxFT+ZRnwhqLKXiMcCYsBSUr7
+						m+PE4dX9adMSg6Cbj3qBMeHhf7ldHlpbhl1mWF8gP8B89k0naEkPj++iXVdB8Mfc
+						Ti1c523T/2nNmxXcbV1bTFOTr0HqwqHfVPhaW9FJYhVcJUJbzxSE81NMw+mj1/Wg
+						q4siWF12Yd75zPaunEP9b6LSH9+jslVmnSHpbdS7wLa4wQuKifo6N8PteKoR1Aps
+						rWT//SBgFvxK3ozSue4Nlg==
+					</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://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dun-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://dun-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://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dun-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://dun-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://dun-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 Dundee - 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/e-localcourses.unibo.it.xml b/swamid-interfederations-2.0/e-localcourses.unibo.it.xml
new file mode 100644
index 00000000..bdb807f1
--- /dev/null
+++ b/swamid-interfederations-2.0/e-localcourses.unibo.it.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://e-localcourses.unibo.it">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-02-17T11: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">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">E-LOCAL courses of languages and cultures.</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Corsi E-LOCAL di lingue e culture.</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Language and culture courses of Dutch, Finnish, Hungarian, Italian, Polish and Portuguese.</mdui:Description>
+        <mdui:Description xml:lang="it">Corsi di lingua e cultura finlandese, italiana, nederlandese, polacca, portoghese e ungherese. </mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://e-localcourses.unibo.it/mod/resource/view.php?id=291</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://e-localcourses.unibo.it/mod/resource/view.php?id=292</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://e-localcourses.unibo.it/mod/resource/view.php?id=289</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://e-localcourses.unibo.it/mod/resource/view.php?id=290</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://e-localcourses.unibo.it/Shibboleth.sso/UniboAuth"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDDDCCAfSgAwIBAgIJAJQYlu3GGLHwMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2UtbG9jYWxjb3Vyc2VzLnVuaWJvLml0MB4XDTEzMDkzMDE1MzU1NVoXDTE4
+MDkyOTE1MzU1NVowIjEgMB4GA1UEAxMXZS1sb2NhbGNvdXJzZXMudW5pYm8uaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAWEo6p5B59kOr233RKoan
+vSs7+6MP9DMeLgFE2IGbhiTtr8E9FAvCw2lWB1Xew5GHzQ1rVZl9DHQB3xYj3K1b
+vQ6ZTsgITqh65VJHtNguLWezB98rl8LkxPRP0iUH1BLfoL4Dg9BPm/PIxUCv0+Bf
+Hl5G8aLzSrdTnrd7tAIw8aLsy0At/5v5ShlU8KcM4K5mqrCS7SSZ7micIp6IFQkH
+L6Ctqu8u9NznYvhEBmtz7N/z4CIk2yUTx7zjwPs68Ke79T/rAbvuAb8dTSwrgKDq
+MtTR9Romp57roAfS60NH8fVOs+wsGD/q36fV7Gd98SsP9nmHwf1z+dlt6VXSA+Px
+AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2UtbG9jYWxjb3Vyc2VzLnVuaWJvLml0MB0G
+A1UdDgQWBBT+SDB/78eV3AEQ1vDdZeTY+VBHQDANBgkqhkiG9w0BAQUFAAOCAQEA
+hTIVSita3rHPnKHeMKo17BjlrAZWihiAqKQe8WYxlkH/84FC3ZX0Y9U5rP41bYEV
+AjWaF22S1/zbVIxexnYLSiClxRykeEF/wsvFlDmLWSNaPFU8lEwlRUWPg3QOQOX0
+cX4GWkWRbeqjJNk9glo03imCXd6b8YVFJS5TxWTSzpzRrNkS3RMGRGKNZENWbyI5
+breUwiWdYuGgtTg4LZAjpb/ZygN0jF9b53lmKFpUEWXKblRluTcQQCss5Y8/Q82O
+XV33ikbzfFfZt6+Vl/jpXoforcFOpiiAbgKIsBnd95VtuBsBvRl+pzh3xdA2YQXS
+VrUi/sMWebysPZ53w+Pc5Q==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://e-localcourses.unibo.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e-localcourses.unibo.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">&gt;E-LOCAL courses of languages and cultures.</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Language and culture courses of Dutch, Finnish, Hungarian, Italian, Polish and Portuguese.</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: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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <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">E-LOCAL courses of languages and cultures provided by University of Bologna</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Corsi E-LOCAL di lingue e culture erogato da Università di Bologna</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.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/e5.onthehub.com.xml b/swamid-interfederations-2.0/e5.onthehub.com.xml
new file mode 100644
index 00000000..36a88539
--- /dev/null
+++ b/swamid-interfederations-2.0/e5.onthehub.com.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://e5.onthehub.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2014-07-08T00: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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>e5.onthehub.com</ds:KeyName>
+        <ds:KeyName>https://e5.onthehub.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=e5.onthehub.com</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJAKbfgH7m+qqbMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2U1Lm9udGhlaHViLmNvbTAeFw0xMzAyMTQxNjU2MjJaFw0yMzAyMTIxNjU2
+MjJaMBoxGDAWBgNVBAMTD2U1Lm9udGhlaHViLmNvbTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMPdcbl3hSq/42be9Xa5j7utNC0Ul1yS4JGLq4nEOP00
+VKMpzHAPTVZyc4h/vffPvVo0sEJ8s6qpcb9dnPZpKj4S2Jg5tWBtmJaZw6TsyOn0
+CHLox9NCwxS8Zz6DIRfuVY2ra+X8a5FR45voE80yeuB6AXH6hfOt81a6EYYAcCe2
+C8PocbRBBabRttUC8mMlcwBd22zO3k9guOJtpfMnCrBrl777h4g9zecLkVcdKwMB
+kmiGRxxYsCNeJUV5rVp6dwbVxPCnktRfavF43Fs8F7W11XKUoa4oS+BONM7IXtz5
+BirkXphcFit7KOFpeXENIXs2AKBwfcp5AvYZy6M6BX8CAwEAAaNWMFQwMwYDVR0R
+BCwwKoIPZTUub250aGVodWIuY29thhdodHRwczovL2U1Lm9udGhlaHViLmNvbTAd
+BgNVHQ4EFgQU5L1EIH24QVlXj4VDtjBocWPsrXEwDQYJKoZIhvcNAQEFBQADggEB
+AGAqH+9sP0Msq8iAj4AZv/TUHziUzCqwNQtfjKSHRkuT1mM5y7M78CVfdPpMYdCc
+kcnYDc3O2S8lliPcTKSrnEE24gPonVxoALCgdLf+oWaA+1BP1T66HDuXkM7NOuH5
+wySxOT3jXmNxymoGsVrT4f2k5Zt9+JCiLIiEJDXzqpJ+6H9k39YBtnUR+EooQr9m
+27vpFCFJWdvxCaRAJzB6ALkdtepu6GAn2ZR+jlJKB2ZheIFcEpuxphtbqFNc37S0
+/RHXXZ7eJ4LIqg7QHc+bvhjPRwx74BajIntgwn5YbOyYWvBU2rEYS41bdNo/6p4S
+tsXRh8I9G2b+om6fhCjEUmM=
+</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>e5.onthehub.com</ds:KeyName>
+        <ds:KeyName>https://e5.onthehub.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=e5.onthehub.com</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJAKiojggOXwYSMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2U1Lm9udGhlaHViLmNvbTAeFw0xMDAzMTkxODA0MjlaFw0xMzAzMTgxODA0
+MjlaMBoxGDAWBgNVBAMTD2U1Lm9udGhlaHViLmNvbTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALQ7NHoOjHN6VTNmMUBqlDXcbEbgjPcrjlMrW5s3JNWh
+61NT+AD+8+K0m4288Rc4yTuyaYcCc6K+erCPkivkktudh4rVProuClfpXTgEl+IF
+YkfHbeZHEc2tMLMrQ6zWpcUBiSPdKjhEgVWGe6q/lW2KWRsmbx2lCufhtSfAwyCb
+j/+Nt8tlF8+Tmi5SEZ1HbUhSRMdIKHU8epMkeRd7fPXgO/lqzKF1TIi3eO+L63KW
+4zC0O39Uh6ftULWvCvpyxVAhiQGId092CV8CxuqQPY4lXPDtTKcS0pZLtvlAAD3X
+UhdVOszNxL43oEVQyv/Vr5abab4C1ghZQ26KGaWpqDkCAwEAAaNWMFQwMwYDVR0R
+BCwwKoIPZTUub250aGVodWIuY29thhdodHRwczovL2U1Lm9udGhlaHViLmNvbTAd
+BgNVHQ4EFgQUiAUx8mQA/+5rLbZsyk/QgfTIKRgwDQYJKoZIhvcNAQEFBQADggEB
+AFl0fsWKeym+vqb8O7lPxICZpAMcr9hXn0/XA7FzTluuno4/+uRTljBn3rsPFoe5
+gxl+CtDFQnZ/ZKd6PAv6ulbj1w86JXiQ2dVjzPTSHnIzy408NLHiUKj5p7KmtvP6
+VUBknIxbt6krRtkAHWqpA4ykvAW5TyPSk7DFwFI+/lNlcegmMwlk9bVhIB9s6HdI
+K1+Mvw3ek0GCAlo2ucgpEIFXrRwMLLnucXLdWVug9w+ScsmKp19DlnpS2UMmRMfq
+eWPEpGoM/tepFG/JensNMEA41WKCXmmbruIGlh3TWFRE8s0JG3b8jy8aB3mgzq9T
+l8qQhkUldJphTqx2PEHORBM=
+</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>e5.onthehub.com</ds:KeyName>
+        <ds:KeyName>https://e5.onthehub.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=e5.onthehub.com</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJAKbfgH7m+qqbMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2U1Lm9udGhlaHViLmNvbTAeFw0xMzAyMTQxNjU2MjJaFw0yMzAyMTIxNjU2
+MjJaMBoxGDAWBgNVBAMTD2U1Lm9udGhlaHViLmNvbTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMPdcbl3hSq/42be9Xa5j7utNC0Ul1yS4JGLq4nEOP00
+VKMpzHAPTVZyc4h/vffPvVo0sEJ8s6qpcb9dnPZpKj4S2Jg5tWBtmJaZw6TsyOn0
+CHLox9NCwxS8Zz6DIRfuVY2ra+X8a5FR45voE80yeuB6AXH6hfOt81a6EYYAcCe2
+C8PocbRBBabRttUC8mMlcwBd22zO3k9guOJtpfMnCrBrl777h4g9zecLkVcdKwMB
+kmiGRxxYsCNeJUV5rVp6dwbVxPCnktRfavF43Fs8F7W11XKUoa4oS+BONM7IXtz5
+BirkXphcFit7KOFpeXENIXs2AKBwfcp5AvYZy6M6BX8CAwEAAaNWMFQwMwYDVR0R
+BCwwKoIPZTUub250aGVodWIuY29thhdodHRwczovL2U1Lm9udGhlaHViLmNvbTAd
+BgNVHQ4EFgQU5L1EIH24QVlXj4VDtjBocWPsrXEwDQYJKoZIhvcNAQEFBQADggEB
+AGAqH+9sP0Msq8iAj4AZv/TUHziUzCqwNQtfjKSHRkuT1mM5y7M78CVfdPpMYdCc
+kcnYDc3O2S8lliPcTKSrnEE24gPonVxoALCgdLf+oWaA+1BP1T66HDuXkM7NOuH5
+wySxOT3jXmNxymoGsVrT4f2k5Zt9+JCiLIiEJDXzqpJ+6H9k39YBtnUR+EooQr9m
+27vpFCFJWdvxCaRAJzB6ALkdtepu6GAn2ZR+jlJKB2ZheIFcEpuxphtbqFNc37S0
+/RHXXZ7eJ4LIqg7QHc+bvhjPRwx74BajIntgwn5YbOyYWvBU2rEYS41bdNo/6p4S
+tsXRh8I9G2b+om6fhCjEUmM=
+</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>e5.onthehub.com</ds:KeyName>
+        <ds:KeyName>https://e5.onthehub.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=e5.onthehub.com</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJAKiojggOXwYSMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2U1Lm9udGhlaHViLmNvbTAeFw0xMDAzMTkxODA0MjlaFw0xMzAzMTgxODA0
+MjlaMBoxGDAWBgNVBAMTD2U1Lm9udGhlaHViLmNvbTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALQ7NHoOjHN6VTNmMUBqlDXcbEbgjPcrjlMrW5s3JNWh
+61NT+AD+8+K0m4288Rc4yTuyaYcCc6K+erCPkivkktudh4rVProuClfpXTgEl+IF
+YkfHbeZHEc2tMLMrQ6zWpcUBiSPdKjhEgVWGe6q/lW2KWRsmbx2lCufhtSfAwyCb
+j/+Nt8tlF8+Tmi5SEZ1HbUhSRMdIKHU8epMkeRd7fPXgO/lqzKF1TIi3eO+L63KW
+4zC0O39Uh6ftULWvCvpyxVAhiQGId092CV8CxuqQPY4lXPDtTKcS0pZLtvlAAD3X
+UhdVOszNxL43oEVQyv/Vr5abab4C1ghZQ26KGaWpqDkCAwEAAaNWMFQwMwYDVR0R
+BCwwKoIPZTUub250aGVodWIuY29thhdodHRwczovL2U1Lm9udGhlaHViLmNvbTAd
+BgNVHQ4EFgQUiAUx8mQA/+5rLbZsyk/QgfTIKRgwDQYJKoZIhvcNAQEFBQADggEB
+AFl0fsWKeym+vqb8O7lPxICZpAMcr9hXn0/XA7FzTluuno4/+uRTljBn3rsPFoe5
+gxl+CtDFQnZ/ZKd6PAv6ulbj1w86JXiQ2dVjzPTSHnIzy408NLHiUKj5p7KmtvP6
+VUBknIxbt6krRtkAHWqpA4ykvAW5TyPSk7DFwFI+/lNlcegmMwlk9bVhIB9s6HdI
+K1+Mvw3ek0GCAlo2ucgpEIFXrRwMLLnucXLdWVug9w+ScsmKp19DlnpS2UMmRMfq
+eWPEpGoM/tepFG/JensNMEA41WKCXmmbruIGlh3TWFRE8s0JG3b8jy8aB3mgzq9T
+l8qQhkUldJphTqx2PEHORBM=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/CAF/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/CAF/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/CAF/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/CAF/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/CAF/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/CAF/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/CAF/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/CAF/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/CAF/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/CAF/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/CAF/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/CAF/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/CAF/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/CAF/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/CAF/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">e5.onthehub.com</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">e5.onthehub.com</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://e5.onthehub.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tobias</md:GivenName>
+    <md:SurName>Wynen</md:SurName>
+    <md:EmailAddress>shibboleth@kivuto.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Islam</md:GivenName>
+    <md:SurName>Gomaa</md:SurName>
+    <md:EmailAddress>shibboleth@kivuto.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>shibboleth@kivuto.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml b/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml
new file mode 100644
index 00000000..1a22771c
--- /dev/null
+++ b/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://earthserver-sg.consorzio-cometa.it/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-04-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:SPSSODescriptor protocolSupportEnumeration="urn:oasis: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">EarthServer Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">EarthServer Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service allows to use on a Grid infrastructure the applications of the EarthServer project which provides Earth and planetary science researchers with tools to achieve barrier-free "mix and match" access to multi-source, any-size, multi-dimensional spatio-temporal data based on open standards.</mdui:Description>
+        <mdui:Description xml:lang="it">Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il progetto europeo EarthServer che ha come obiettivo quello di fornire a ricercatori sui problemi della terra e degli astri tool l'accesso senza limiti ad un mix di dati provenienti da diverse sorgenti, con differenti dimensione e spazio-temporali, basati su open standards.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://earthserver-sg.consorzio-cometa.it/service</mdui:InformationURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://earthserver-sg.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>
+MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
+VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
+EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
+c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
+T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
+3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
+O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
+i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
+LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
+TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
+AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
+BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
+A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
+IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
+KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
+AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
+Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
+ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
+ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
+bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
+LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
+ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
+cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
+iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
+PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
+n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
+zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
+2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
+j/MCNlE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://earthserver-sg.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://earthserver-sg.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://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">EarthServer Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This service allows to use on a Grid infrastructure the applications of the EarthServer project which provides Earth and planetary science researchers with tools to achieve barrier-free "mix and match" access to multi-source, any-size, multi-dimensional spatio-temporal data based on open standards.</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:OrganizationName xml:lang="it">Consorzio COMETA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Earth Server Science Gateway provided by Consorzio COMETA</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Earth Server Science Gateway erogato da Consorzio COMETA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/en/home</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Riccardo</md:GivenName>
+    <md:SurName>Bruno</md:SurName>
+    <md:EmailAddress>mailto:riccardo.bruno@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <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:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml b/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml
new file mode 100644
index 00000000..4fedbd37
--- /dev/null
+++ b/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://easydb.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-10-21T05:40: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>
+  </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">EasyDB (Digitale Diathek) an der FU Berlin</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">EasyDB (Digitale Diathek) an der FU Berlin</mdui:DisplayName>
+        <mdui:Description xml:lang="de">EasyDB ist die gemeinsame Bilddatenbank der archäologischen und die kunsthistorischen Fächer des Fachbereich Geschichts- und Kulturwissenschaften der Freien Universität Berlin. Sie bietet Zugriff auf derzeit 250.000 Bilder für Forschung und Lehre.</mdui:Description>
+        <mdui:Description xml:lang="en">EasyDB ist die gemeinsame Bilddatenbank der archäologischen und die kunsthistorischen Fächer des Fachbereich Geschichts- und Kulturwissenschaften der Freien Universität Berlin. Sie bietet Zugriff auf derzeit 250.000 Bilder für Forschung und Lehre.</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.geschkult.fu-berlin.de/e/khi/diathek/digitale_diathek/index.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.geschkult.fu-berlin.de/e/khi/diathek/digitale_diathek/index.html</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>easydb.geschkult.fu-berlin.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=easydb.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGJTCCBQ2gAwIBAgIHGPlbfiq0XjANBgkqhkiG9w0BAQsFADCBtTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
+ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
+A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
+HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTUwMjEwMTAzMTEwWhcN
+MTkwNzA5MjM1OTAwWjCBtjELMAkGA1UEBhMCREUxDzANBgNVBAgMBkJlcmxpbjEP
+MA0GA1UEBwwGQmVybGluMSIwIAYDVQQKDBlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
+bGluMTkwNwYDVQQLDDBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
+d2lzc2Vuc2NoYWZ0ZW4xJjAkBgNVBAMMHWVhc3lkYi5nZXNjaGt1bHQuZnUtYmVy
+bGluLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApP7F9ySZ1qMs
+Pm1YPt3amWqd9NpjBxQdGSvWW8s5YO5yc/zM7K6s6jp71J9BEq6gQbCOb1J1Rkwu
+ANyZIbKF9YPzKixntzebSUt228zxCZmBL2zSvIVBOKxX0SXoRc3te93w4yhd1wK0
+zIkN/r4r7sCEbM7GUScLVnwn6vgVT0amPJ973sd1NEpkFiDqgvnOp9MbVRmejlVy
+OIcgeWBO7k+kR6wk8pZKhHv1EeUSI0MdN5NcuhcHLJqlTCS9mtao5wjHbKqOrsZq
+3+2BhAK+YsmU8kBAEWTJuGL295e0JUHg+n13/9TApNFckOgezXF3LTrQuht0aV8c
+AqYhXz7W6wIDAQABo4ICNTCCAjEwTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEE
+AwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGB
+rSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwIGCCsGAQUFBwMBMB0GA1UdDgQWBBTDwIXCByjCQwen9jTvzxD9U2HzlTAfBgNV
+HSMEGDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDAoBgNVHREEITAfgh1lYXN5ZGIu
+Z2VzY2hrdWx0LmZ1LWJlcmxpbi5kZTB1BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAwhi5o
+dHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHF
+BggrBgEFBQcBAQSBuDCBtTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRm
+bi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD4GCCsGAQUFBzAChjJodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL2Z1LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA+BggrBgEFBQcw
+AoYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQELBQADggEBADkcodl3suRysfy0lAGAsrejt9OLVH6A
+NRVH8n4eYS4q9TfhvkV1OCsaFMnsoBZzWwZK+kJ35IkNnBPhXGmsrm4CWaqZmEXe
+xPYcmvHkqSm+NHd45AFbGvVSXTCHJyMJwfcP9Y++0fiMZTFMS94Zm5Tnuopzul1d
+VL+IhzvGNQ+/UP7+b1LermUxrpj06jsbOdEK6invAoAnqMqXkXDmG1owA1cRPCY9
+tOE4g/hlvLMgOQ3413fJ/GR/R7RwYKuP/EFayaeZrt0cGZuRfCp7SJVLmMb48GBP
+VlBXGupf8n951icED+IDh47RglDOnvS8DpOvHDtysd/ctiSwZ8vJCOQ=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://easydb.geschkult.fu-berlin.de/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://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">EasyDB (Digitale Diathek) an der FU Berlin</md:ServiceName>
+      <md:ServiceName xml:lang="en">EasyDB (Digitale Diathek) an der FU Berlin</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">EasyDB ist die gemeinsame Bilddatenbank der archäologischen und die kunsthistorischen Fächer des Fachbereich Geschichts- und Kulturwissenschaften der Freien Universität Berlin. Sie bietet Zugriff auf derzeit 250.000 Bilder für Forschung und Lehre.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">EasyDB ist die gemeinsame Bilddatenbank der archäologischen und die kunsthistorischen Fächer des Fachbereich Geschichts- und Kulturwissenschaften der Freien Universität Berlin. Sie bietet Zugriff auf derzeit 250.000 Bilder für Forschung und Lehre.</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: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/ec1.educationcity.com-sso-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/ec1.educationcity.com-sso-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..27de87bf
--- /dev/null
+++ b/swamid-interfederations-2.0/ec1.educationcity.com-sso-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ec1.educationcity.com/sso/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="2014-08-20T14:23: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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEPTCCAyWgAwIBAgIJAIjiPhX9pD21MA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
+						VQQGEwJHQjEQMA4GA1UECAwHUnV0bGFuZDEPMA0GA1UEBwwGT2FraGFtMRswGQYD
+						VQQKDBJFZHVjYXRpb24gQ2l0eSBMdGQxEDAOBgNVBAsMB0lUIERlcHQxHjAcBgNV
+						BAMMFWVjMS5lZHVjYXRpb25jaXR5LmNvbTEzMDEGCSqGSIb3DQEJARYkRUMuVUsu
+						SVQuTGludXhUZWFtQEVkdWNhdGlvbkNpdHkuY29tMB4XDTE0MDgxOTA5NDA0M1oX
+						DTI0MDgxODA5NDA0M1owgbQxCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdSdXRsYW5k
+						MQ8wDQYDVQQHDAZPYWtoYW0xGzAZBgNVBAoMEkVkdWNhdGlvbiBDaXR5IEx0ZDEQ
+						MA4GA1UECwwHSVQgRGVwdDEeMBwGA1UEAwwVZWMxLmVkdWNhdGlvbmNpdHkuY29t
+						MTMwMQYJKoZIhvcNAQkBFiRFQy5VSy5JVC5MaW51eFRlYW1ARWR1Y2F0aW9uQ2l0
+						eS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5QxN9XYDVZTK0
+						usU9h6obEuliBKYsE/qLoqFMsw0dco3OrsVJ3f9Pqi2a+CU3Y79QhvTlXZ+vnDbA
+						tJJpuJeMWv2H+WIA7xg8n0fB06WptCyNTrJGLVbJV067y+ZVWccSHe79j61MSnT2
+						5LGIVDOnk+tPn7GY6oi2ZTtYxblyzwkyILZwibzr7qL8eBSTq280MfKIh7HVBHXu
+						w1B37r/xEx+WbCUh0jmMDOhbiqX55RFMJ3/QUyZ5MVbboBGeYPcFoYuUg7gpYdJ5
+						pLmZ4Nh+7r6w1if5vEkBpxFKoK2xBHjbkb8bm+GBVqsoGJSvUi0++YwtvzamoItT
+						NiKowoApAgMBAAGjUDBOMB0GA1UdDgQWBBT9bgLO7VbORM8dToe750exXs6tkzAf
+						BgNVHSMEGDAWgBT9bgLO7VbORM8dToe750exXs6tkzAMBgNVHRMEBTADAQH/MA0G
+						CSqGSIb3DQEBBQUAA4IBAQBTkg85PXmm+DmjVDQdiF8zqqOn8L4sdM+4Xsc07e9/
+						PyKEgwB3sHIJXG7epi8TreT8tMx0Z00tQ/GyAlk9lWBlhq1ZGkbDxda9M8qavDWY
+						OomRV6hd2tV4Gkz008oGhfY50f0Kc1zH0IBiirUV0UUk0tMgWCZS4xMUeIClFD0L
+						RFZyAKocyTEPKFZQ4Por2e2Bjt/2YP62oJWzCTtFQU2PPtaLvSiMjq7V5WQxuIkc
+						VWHrGzZgfMi1jKdxwyJ8oYZr7rpKviXgjOzQlEkUt2ncrEY75PMHk+bWjbNqNPds
+						jpTxJAAZ5N53YVB4oS8yLRl13dJv1rY522iqlxTkvBz0
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEPTCCAyWgAwIBAgIJAIjiPhX9pD21MA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
+						VQQGEwJHQjEQMA4GA1UECAwHUnV0bGFuZDEPMA0GA1UEBwwGT2FraGFtMRswGQYD
+						VQQKDBJFZHVjYXRpb24gQ2l0eSBMdGQxEDAOBgNVBAsMB0lUIERlcHQxHjAcBgNV
+						BAMMFWVjMS5lZHVjYXRpb25jaXR5LmNvbTEzMDEGCSqGSIb3DQEJARYkRUMuVUsu
+						SVQuTGludXhUZWFtQEVkdWNhdGlvbkNpdHkuY29tMB4XDTE0MDgxOTA5NDA0M1oX
+						DTI0MDgxODA5NDA0M1owgbQxCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdSdXRsYW5k
+						MQ8wDQYDVQQHDAZPYWtoYW0xGzAZBgNVBAoMEkVkdWNhdGlvbiBDaXR5IEx0ZDEQ
+						MA4GA1UECwwHSVQgRGVwdDEeMBwGA1UEAwwVZWMxLmVkdWNhdGlvbmNpdHkuY29t
+						MTMwMQYJKoZIhvcNAQkBFiRFQy5VSy5JVC5MaW51eFRlYW1ARWR1Y2F0aW9uQ2l0
+						eS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5QxN9XYDVZTK0
+						usU9h6obEuliBKYsE/qLoqFMsw0dco3OrsVJ3f9Pqi2a+CU3Y79QhvTlXZ+vnDbA
+						tJJpuJeMWv2H+WIA7xg8n0fB06WptCyNTrJGLVbJV067y+ZVWccSHe79j61MSnT2
+						5LGIVDOnk+tPn7GY6oi2ZTtYxblyzwkyILZwibzr7qL8eBSTq280MfKIh7HVBHXu
+						w1B37r/xEx+WbCUh0jmMDOhbiqX55RFMJ3/QUyZ5MVbboBGeYPcFoYuUg7gpYdJ5
+						pLmZ4Nh+7r6w1if5vEkBpxFKoK2xBHjbkb8bm+GBVqsoGJSvUi0++YwtvzamoItT
+						NiKowoApAgMBAAGjUDBOMB0GA1UdDgQWBBT9bgLO7VbORM8dToe750exXs6tkzAf
+						BgNVHSMEGDAWgBT9bgLO7VbORM8dToe750exXs6tkzAMBgNVHRMEBTADAQH/MA0G
+						CSqGSIb3DQEBBQUAA4IBAQBTkg85PXmm+DmjVDQdiF8zqqOn8L4sdM+4Xsc07e9/
+						PyKEgwB3sHIJXG7epi8TreT8tMx0Z00tQ/GyAlk9lWBlhq1ZGkbDxda9M8qavDWY
+						OomRV6hd2tV4Gkz008oGhfY50f0Kc1zH0IBiirUV0UUk0tMgWCZS4xMUeIClFD0L
+						RFZyAKocyTEPKFZQ4Por2e2Bjt/2YP62oJWzCTtFQU2PPtaLvSiMjq7V5WQxuIkc
+						VWHrGzZgfMi1jKdxwyJ8oYZr7rpKviXgjOzQlEkUt2ncrEY75PMHk+bWjbNqNPds
+						jpTxJAAZ5N53YVB4oS8yLRl13dJv1rY522iqlxTkvBz0
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ec1.educationcity.com/sso/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ec1.educationcity.com/sso/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://ec1.educationcity.com/sso/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://ec1.educationcity.com/sso/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://ec1.educationcity.com/sso/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">EducationCity Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EducationCity</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.educationcity.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Customer Support</md:GivenName>
+    <md:EmailAddress>mailto:support@educationcity.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matt</md:GivenName>
+    <md:SurName>Frost</md:SurName>
+    <md:EmailAddress>mailto:ShibbolethMgr@educationcity.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml b/swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml
new file mode 100644
index 00000000..ba881344
--- /dev/null
+++ b/swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ecsg.dch-rp.eu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-06-10T15: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">
+                        e-Culture Science Gateway
+                    </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">
+                        e-Culture Science Gateway
+                    </mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                        This service allows to use on a Grid infrastructure the applications of the DCH-RP Project which provides tools to store and preserve digital cultural heritage.
+                    </mdui:Description>
+        <mdui:Description xml:lang="it">
+                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il progetto europeo DCH-RP che ha come obiettivo quello di fornire strumenti per la memo
+                        rizzazione ed il mantenimento del patrimonio culturale
+                    </mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ecsg.dch-rp.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>
+MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
+VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
+EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
+c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
+T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
+3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
+O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
+i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
+LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
+TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
+AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
+BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
+A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
+IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
+KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
+AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
+Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
+ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
+ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
+bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
+LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
+ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
+cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
+iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
+PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
+n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
+zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
+2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
+j/MCNlE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">e-Culture Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
+                    This service allows to use on a Grid infrastructure the applications of the DCH-RP Project which provides tools to store and preserve digital cultural heritage.
+                </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 Catania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ct.infn.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/ed.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ed.unidesk.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..5220d52f
--- /dev/null
+++ b/swamid-interfederations-2.0/ed.unidesk.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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://ed.unidesk.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-29T17:06: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC/TCCAeWgAwIBAgIJAPHsl6kKrFrnMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEmxpdmUudW5pZGVzay5hYy51azAeFw0xMjA0MTExNDU4MjhaFw0yMjA0MDkx
+						NDU4MjhaMB0xGzAZBgNVBAMTEmxpdmUudW5pZGVzay5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAL9qh/Dehm5jJdWdeFPNKqcjMdiqii8Iz9Rc
+						tCAsEwRsYww4EQDG7MxG5hg4NSS+iIPFCp9gR+G7hTnZAMGgNpxs2vk4vs9lmhRY
+						GmB7Y1NFloP9Pcsu+MaufaLzxi6bzIXV4dBVHqVnIcgxchDIsXmPE6xlq4poEq+q
+						XJ3aFE/eWwxfwN9z0s5yeICzsil73xk9T9NLeNAeYq+jfVTcdqDbBHY6eHtMOYh/
+						uPVYYxkKXjkgSH5cwG0b+7qN4z+uzKDNBXxnI1Nz+bLOazXW6ljQIDtAPQZMJSlr
+						3OepVaQS+fMBi0Sku5yvADgINdXxkz6H4Zx4pZg/rTQBQ/8u2esCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISbGl2ZS51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBQ2tPlzxC8e
+						akC2nh9qrG4TWfI3tzANBgkqhkiG9w0BAQUFAAOCAQEAWPY3Nv9ChZ+4XVNANhLq
+						fGF7SbiPmUNj9vWGNjCp8Ma0tdDOZPvqBRzxKkkR+LS+fHpSQQ54RuNeZrulWBiN
+						akZe3LZiSH9AHG2uD0lDuxr0UQt1AHGDiLjFXuRg9+CdqqrdT3Anmy6exDDfRsjH
+						k+ZJflkEtqTNd0dbEVlkYlg8Baqx/ZMOxkccx8PtQt1yptAMsH4Rn92vXLd9d3JM
+						H1mrFuiriqrgsAfVLmzc4WeGmB+dK01cSB+CY7hKnoe7ds1y7kNhOmZ9HP3Iy7ev
+						gF2RCdnqkP9zScihW4b20PlVa/sWMUyCj2uZE1lSO51PJcGVU0H/JFrBEpaM7u6t
+						jg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ed.unidesk.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: Unidesk - University of Edinburgh</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:IS.Helpdesk@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/edev.cesnet.cz-sp-shibboleth.xml b/swamid-interfederations-2.0/edev.cesnet.cz-sp-shibboleth.xml
new file mode 100644
index 00000000..ca2a7156
--- /dev/null
+++ b/swamid-interfederations-2.0/edev.cesnet.cz-sp-shibboleth.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edev.cesnet.cz/sp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2012-10-10T20:28:16Z">
+      <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>
+      <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://edev.cesnet.cz/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Edev SP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Edev SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CESNET development service provider</mdui:Description>
+        <mdui:Description xml:lang="cs">CESNET development service provider</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://edev.cesnet.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">https://edev.cesnet.cz/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>edev.cesnet.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=edev.cesnet.cz,O=CESNET,L=Prague,ST=Czech Republic,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPjCCAiYCCQCOJsi4C7DaXDANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJD
+WjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcTBlByYWd1ZTEPMA0G
+A1UEChMGQ0VTTkVUMRcwFQYDVQQDEw5lZGV2LmNlc25ldC5jejAeFw0xMjEwMTAx
+NzU2NDBaFw0yMjEwMDgxNzU2NDBaMGExCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5D
+emVjaCBSZXB1YmxpYzEPMA0GA1UEBxMGUHJhZ3VlMQ8wDQYDVQQKEwZDRVNORVQx
+FzAVBgNVBAMTDmVkZXYuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAqRDUJ+PwMSlE0IyXab2jcgfP2hT+fGUIOll5bOLvccECzS2GNAXO
+1JyZG2RR5XJdLc8j+8ppGU/eU9KznI/hJK4OLJmJRSujQwnXGw8xbgUWTqL96BIM
+t1++U4PxblhqU13SR1JwILkKIld1YpzmYZeUZSU8McGn0MWTNy52kuKMeGTB/bTG
+yCnAIYymnRC+F7S1O5p00gZ8Y8fLAv4cuKA4gkss1PkbpbAEDl3vMFWYVrHSfQ40
+ervXpIR8d+JjBEipdIi1S6+0XLu18bHuhiACBb0Yxvndi6Kf0x3LhebvDA26Ql3N
+haZtUB18QHbJ1QHePbDrK3xKkt/mlBgOQQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQA3rep/ITfO4SeXlbpGUZQS/ez6Yjd9mQah/Wve3gRpp9G4FQRy2iuTCX3pDvne
+Y5WdPUYhSdjbhnbvGmpbO5/QFh/gzWTUlXedmdmN5RJmIRzOHpAhdhQ9cCoKB/xL
+TDrAqxoj+yQuQpjpMdTlhawqjkqee+cn7j8zGbR5HXpVM3cJPAMsRQx19sFWpnGX
+QkpkQ90+gQMK2zAPvIXtZfVTK1F0xlZ6+4NYPuoC3C8xklxfwzNoiktEgtqFPzOB
+Eq3JVPaoY+S7mCigJcJM/YAZFL+/m7SfG70iJt51GF5kfKGNQEK0A7t6+GD9RiKo
+qAMOJmOQterSszZaX0mMz1k7
+</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>edev.cesnet.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=edev.cesnet.cz,O=CESNET,L=Prague,ST=Czech Republic,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPjCCAiYCCQCOJsi4C7DaXDANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJD
+WjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcTBlByYWd1ZTEPMA0G
+A1UEChMGQ0VTTkVUMRcwFQYDVQQDEw5lZGV2LmNlc25ldC5jejAeFw0xMjEwMTAx
+NzU2NDBaFw0yMjEwMDgxNzU2NDBaMGExCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5D
+emVjaCBSZXB1YmxpYzEPMA0GA1UEBxMGUHJhZ3VlMQ8wDQYDVQQKEwZDRVNORVQx
+FzAVBgNVBAMTDmVkZXYuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAqRDUJ+PwMSlE0IyXab2jcgfP2hT+fGUIOll5bOLvccECzS2GNAXO
+1JyZG2RR5XJdLc8j+8ppGU/eU9KznI/hJK4OLJmJRSujQwnXGw8xbgUWTqL96BIM
+t1++U4PxblhqU13SR1JwILkKIld1YpzmYZeUZSU8McGn0MWTNy52kuKMeGTB/bTG
+yCnAIYymnRC+F7S1O5p00gZ8Y8fLAv4cuKA4gkss1PkbpbAEDl3vMFWYVrHSfQ40
+ervXpIR8d+JjBEipdIi1S6+0XLu18bHuhiACBb0Yxvndi6Kf0x3LhebvDA26Ql3N
+haZtUB18QHbJ1QHePbDrK3xKkt/mlBgOQQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQA3rep/ITfO4SeXlbpGUZQS/ez6Yjd9mQah/Wve3gRpp9G4FQRy2iuTCX3pDvne
+Y5WdPUYhSdjbhnbvGmpbO5/QFh/gzWTUlXedmdmN5RJmIRzOHpAhdhQ9cCoKB/xL
+TDrAqxoj+yQuQpjpMdTlhawqjkqee+cn7j8zGbR5HXpVM3cJPAMsRQx19sFWpnGX
+QkpkQ90+gQMK2zAPvIXtZfVTK1F0xlZ6+4NYPuoC3C8xklxfwzNoiktEgtqFPzOB
+Eq3JVPaoY+S7mCigJcJM/YAZFL+/m7SfG70iJt51GF5kfKGNQEK0A7t6+GD9RiKo
+qAMOJmOQterSszZaX0mMz1k7
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edev.cesnet.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edev.cesnet.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edev.cesnet.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edev.cesnet.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edev.cesnet.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edev.cesnet.cz/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edev.cesnet.cz/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edev.cesnet.cz/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edev.cesnet.cz/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Edev SP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Shows available attributes and assertions</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"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="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: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="email" Name="urn:mace:dir:attribute-def:mail" 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="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+    </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, a. l. e.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CESNET, z. s. p. o.</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>Ivan</md:GivenName>
+    <md:SurName>Novakov</md:SurName>
+    <md:EmailAddress>novakoi@fel.cvut.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edi.izum.si-idp-20100722.xml b/swamid-interfederations-2.0/edi.izum.si-idp-20100722.xml
new file mode 100644
index 00000000..50dba823
--- /dev/null
+++ b/swamid-interfederations-2.0/edi.izum.si-idp-20100722.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edi.izum.si/idp/20100722">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-01-12T12:01:24Z">
+      <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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izum.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IZUM</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">IZUM</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for organization IZUM</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije IZUM</mdui:Description>
+        <mdui:Keywords xml:lang="en">Identity provider for organization IZUM</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije IZUM</mdui:Keywords>
+        <mdui:Logo height="200" width="200">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAKumlDQ1BJQ0MgUHJvZmlsZQAASImVlwdQk9kWx+/3pYeEFoh0Qm/SpUuvoUivohKSEEIJIQUVGyLiCq4FERFQF2QpouCq1EVFRLEtgr0vyKKgrosFUVF5H/AI7715O2/ef+ZOfjlzvpNzbu6d+X8AkEYZfH4aLAtAOk8kCPP1oMXExtFwvwMIoAEeEIAtgynku4eEBIK/1ce7SDaiW6Yztf4+779KjsUWMgGAQhBOZAmZ6QifRlYfky8QAYDKQ+I6q0X8Ga5DWEGANIhw5wxz5rh/hhPn+I/ZnIgwT4Q/AYAnMRgCDgAkNBKnZTE5SB2SLsIWPBaXh3AEwi7MZAYL4WKEF6enZ8xwF8KGif9Sh/NvNRMlNRkMjoTnZpkV3osr5Kcx1v6f2/G/lZ4mnv8NbWSRkgV+YcinPrJndakZARLmJS4LnmcuazZ/lpPFfpHzzBR6xs0zi+EVMM/i1Ej3eWYIFp7liugR8yzICJPUZwu9wyX12fRASQ9pyyScxPWhz3N2ckT0PGdxo5bNszA1PGAhx1MSF4jDJD0nCXwkM6YLF3pjMhZ6ECVH+C30FiPpgcX28pbEeZGSfL7IQ1KTnxYiyWen+UriwqxwybMi5IDNcwrDP2ShTohkf0AESAZiwAMswAYCkAgyQBoQARrwAlwgBHzkGwMgx0PEXiOaGcIzg79WwOUki2juyC1i0+g8ptlimpWFpQ0AM3dy7i9/T529axD16kIsswsAhwIkyFmIMXQAaH8OAOXjQkznHXJcdgNwpp8pFmTNxWaOLcAAIpABCkAZaAAdYAhMgRWwBU7ADXgDfxCMTBILVgImMk86MslqsB5sBvmgEOwG+0AZOAyOgDpwHJwEraATnAeXwDXQD+6AR2AQjIBXYBx8BFMQBOEgMkSBlCFNSA8ygawge8gF8oYCoTAoFkqAOBAPEkProS1QIVQElUGVUD30C9QOnYeuQAPQA2gIGoPeQV9gFEyCFWB1WB82h+1hdzgAjoBXwBw4E86G8+CdcClcBR+DW+Dz8DX4DjwIv4InUAAlhaKitFCmKHuUJyoYFYdKQglQG1EFqBJUFaoR1YHqRd1CDaJeoz6jsWgKmoY2RTuh/dCRaCY6E70RvQNdhq5Dt6B70LfQQ+hx9HcMGaOGMcE4YuiYGAwHsxqTjynB1GCaMRcxdzAjmI9YLJaKNcDaYf2wsdgU7DrsDuxBbBO2CzuAHcZO4HA4ZZwJzhkXjGPgRLh83AHcMdw53E3cCO4TXgqvibfC++Dj8Dx8Lr4EfxR/Fn8T/wI/RZAl6BEcCcEEFmEtYRehmtBBuEEYIUwR5YgGRGdiBDGFuJlYSmwkXiQ+Jr6XkpLSlnKQCpXiSuVIlUqdkLosNST1mSRPMiZ5kuJJYtJOUi2pi/SA9J5MJuuT3chxZBF5J7mefIH8lPxJmiJtJk2XZklvki6XbpG+Kf1GhiCjJ+Mus1ImW6ZE5pTMDZnXsgRZfVlPWYbsRtly2XbZe7ITchQ5S7lguXS5HXJH5a7Ijcrj5PXlveVZ8nnyR+QvyA9TUBQdiieFSdlCqaZcpIwoYBUMFOgKKQqFCscV+hTGFeUVlyhGKa5RLFc8ozhIRVH1qXRqGnUX9ST1LvXLIvVF7ovYi7Yvalx0c9GkkqqSmxJbqUCpSemO0hdlmrK3cqryHuVW5ScqaBVjlVCV1SqHVC6qvFZVUHVSZaoWqJ5UfagGqxmrhamtUzuidl1tQl1D3Vedr35A/YL6aw2qhptGikaxxlmNMU2KposmV7NY85zmS5oizZ2WRiul9dDGtdS0/LTEWpVafVpT2gbakdq52k3aT3SIOvY6STrFOt0647qaukG663UbdB/qEfTs9ZL19uv16k3qG+hH62/Tb9UfNVAyoBtkGzQYPDYkG7oaZhpWGd42whrZG6UaHTTqN4aNbYyTjcuNb5jAJrYmXJODJgOLMYsdFvMWVy2+Z0oydTfNMm0wHTKjmgWa5Zq1mr0x1zWPM99j3mv+3cLGIs2i2uKRpbylv2WuZYflOytjK6ZVudVta7K1j/Um6zbrt0tMlrCXHFpy34ZiE2Szzabb5putna3AttF2zE7XLsGuwu6evYJ9iP0O+8sOGAcPh00OnQ6fHW0dRY4nHf9yMnVKdTrqNLrUYCl7afXSYWdtZ4ZzpfOgC80lweUnl0FXLVeGa5XrMzcdN5ZbjdsLdyP3FPdj7m88LDwEHs0ek56Onhs8u7xQXr5eBV593vLekd5l3k99tH04Pg0+4742vut8u/wwfgF+e/zu0dXpTHo9fdzfzn+Df08AKSA8oCzgWaBxoCCwIwgO8g/aG/R4md4y3rLWYBBMD94b/CTEICQz5NdQbGhIaHno8zDLsPVhveGU8FXhR8M/RnhE7Ip4FGkYKY7sjpKJio+qj5qM9oouih6MMY/ZEHMtViWWG9sWh4uLiquJm1juvXzf8pF4m/j8+LsrDFasWXFlpcrKtJVnVsmsYqw6lYBJiE44mvCVEcyoYkwk0hMrEseZnsz9zFcsN1Yxa4ztzC5iv0hyTipKGuU4c/ZyxpJdk0uSX3M9uWXctyl+KYdTJlODU2tTp9Oi05rS8ekJ6e08eV4qrydDI2NNxgDfhJ/PH8x0zNyXOS4IENQIIeEKYZtIATE/18WG4q3ioSyXrPKsT6ujVp9aI7eGt+b6WuO129e+yPbJ/nkdeh1zXfd6rfWb1w9tcN9QuRHamLixe5POprxNIzm+OXWbiZtTN/+Wa5FblPthS/SWjjz1vJy84a2+WxvypfMF+fe2OW07/AP6B+4Pfduttx/Y/r2AVXC10KKwpPDrDuaOqz9a/lj64/TOpJ19u2x3HdqN3c3bfXeP6566Irmi7KLhvUF7W4ppxQXFH/at2nelZEnJ4f3E/eL9g6WBpW0HdA/sPvC1LLnsTrlHeVOFWsX2ismDrIM3D7kdajysfrjw8JefuD/dr/StbKnSryo5gj2SdeR5dVR178/2P9fXqNQU1nyr5dUO1oXV9dTb1dcfVTu6qwFuEDeMHYs/1n/c63hbo2ljZRO1qfAEOCE+8fKXhF/ungw42X3K/lTjab3TFc2U5oIWqGVty3hrcutgW2zbQLt/e3eHU0fzr2a/1nZqdZafUTyz6yzxbN7Z6XPZ5ya6+F2vz3POD3ev6n50IebC7Z7Qnr6LARcvX/K5dKHXvffcZefLnVccr7Rftb/aes32Wst1m+vNv9n81txn29dyw+5GW79Df8fA0oGzN11vnr/ldevSbfrta3eW3Rm4G3n3/r34e4P3WfdHH6Q9ePsw6+HUo5zHmMcFT2SflDxVe1r1u9HvTYO2g2eGvIauPwt/9miYOfzqD+EfX0fynpOfl7zQfFE/ajXaOeYz1v9y+cuRV/xXU6/z/5T7s+KN4ZvTf7n9dX08ZnzkreDt9Lsd75Xf135Y8qF7ImTi6cf0j1OTBZ+UP9V9tv/c+yX6y4up1V9xX0u/GX3r+B7w/fF0+vQ0nyFgzFoBFLLgpCQA3tUCQI5FvAPiq4nSc555VtCcz58l8Hc856tnZQtArRsAkTkABCIe5RCy9HLmvPWMZYpwA7C1tWT9U8Ika6u5WiTEeWI+TU+/VwcA1wHAN8H09NTB6elv1UizDwDoypzz6jPCIm8wRQZKGri8Gx8acsB/6B8trAuGsVeyoAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAdVpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpDb21wcmVzc2lvbj4xPC90aWZmOkNvbXByZXNzaW9uPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICAgICA8dGlmZjpQaG90b21ldHJpY0ludGVycHJldGF0aW9uPjI8L3RpZmY6UGhvdG9tZXRyaWNJbnRlcnByZXRhdGlvbj4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CgLYgAUAAC+OSURBVHgB7X0JdJ3FlebV8rQ8SU/7vsuSF3nDxgYTMGBIHBKadAhJSCfd6XS2nplkmk5n+qRPzzndneXk9JA5ydBnegsESGdh6RDa0AwEgo3Bxna84F2WLGRZ+76vT9t8X/3vl957evol4Sc23wL5/f9f262v7q26VXWrKqKurm5G1CkCikBIBCJDftWPioAiYBBQAVFGUAQcEFABcQBHvRQBFRDlAUXAAQEVEAdw1EsRUAFRHlAEHBBQAXEAR70UARUQ5QFFwAEBFRAHcNRLEVABUR5QBBwQUAFxAEe9FAEVEOUBRcABARUQB3DUSxFQAVEeUAQcEFABcQBHvRQBFRDlAUXAAQEVEAdw1EsRUAFRHlAEHBBQAXEAR70UARUQ5QFFwAEBFRAHcNRLEVABUR5QBBwQUAFxAEe9FAEVEOUBRcABARUQB3DUSxFQAVEeUAQcEFABcQBHvRQBFRDlAUXAAQEVEAdw1EsRUAFRHlAEHBBQAXEAR70UARUQ5QFFwAEBFRAHcNRLEVABUR5QBBwQUAFxAEe9FAEVEOUBRcABARUQB3DUSxFQAVEeUAQcEFABcQBHvRQBFRDlAUXAAQEVEAdw1EsRUAFRHlAEHBBQAXEAR70UARUQ5QFFwAEBFRAHcNRLEVABUR5QBBwQUAFxAEe9FAEVEOUBRcABARUQB3DUSxFQAVEeUAQcEFABcQBHvRQBFRDlAUXAAQEVEAdw1EsRUAFRHlAEHBBQAXEAR70UARUQ5QFFwAEBFRAHcNRLEVABUR5QBBwQUAFxAEe9FAEVEOUBRcABARUQB3DUSxFQAVEeUAQcEFABcQBHvRQBFRDlAUXAAQEVEAdw1EsRUAFRHlAEHBBQAXEAR70UARUQ5QFFwAEBFRAHcNRLEVABUR5QBBwQUAFxAEe9FAEVEOUBRcABARUQB3DUSxFQAVEeUAQcEIh28HtLXjMzItHRkeZP8Px2uonJKZmampbIyAhxRUdJRESEzJAgB8cwdN6JKROWoaMRPypqgbbDCo5Q9gNihMoC3sx6EjTxNwppRoOmGQYOFZ5E0IEepsx4k9Mz5tnEj7LKZKL6lwmBGYP0M57LhTz8/Zmmn5tCmsRouS4G6S7kbJyJP7OOBnYL4rdQIlf4fRJlImZ2fV5hcrPRwyogrJjYWJecONMoz756SdI9MagMIMaasx1r2P/d/n5FvxEyNj4pn/299VKcnyqtXcPy9N6LMjw0KqmpieKKYeUGZkpGnQKgA/2jMgFwP/vR9ZKV5iZ/ypvN/bL/RDOEDIISGWkYbtrHWNMIO40yWf+JRCLdOHcMhHJOoJjGyMi4pHpiZdf2EklLipVTFzvltwfrJDk53oS3qPGnyWLcoYFR6R2ZlHt2rZLKVZmmXHGx0VLb0COPv1gjGUgzPiFWIiBwjD02NiGMcy/on56akof3nJPsdLfEgyaLWaxw06ibce+kbN+QKxtK04TlWcyR2SnYU9PT8hTw7Bkcl3jQwu90Noa9PSOmTJ+7Y60kJsTJkTNNsu9wvSS5XcJ8V8yRPjQc3QNeuevmUtm6sVDGxyfCKiRhFhAwDLije9ArD77cK67VbpmYWEGAiDy5ZBIt4uCkfPIOq8VlC5aVmSRHer3yo5caJCMuUtJjIk0wRkGdG6GoH5mWT1SmyZaSZGELybpk3JaOIfn2bxqkPCnK9EZt4xCkbi+4Hvkkx4gkAbbYKCmKi5ZViS5p7ukQL4QmGmVn2+xxRcrJmkH5m08ViychxjCjJzFWhqNc8sCrreihpmVVfPQsPRQoMlJdz4TcuQH0FKdIXBzi+ZiLv7Ex0eJOdsv9x9vFOzAua1NiZHBiWprbvHLPDVkSD1rGx1G2RLd892iHyJBX1oJWBDEQofhyvn1cvhsxI5vLM0DTFKFYxAFPENcKAfjV643yWueYrE1wIU1+FyM4lwan5EPlKfLRonTTSPB7L/L+p9/2iJS5EWhl69/lipCJmmH5wJZ8U6+EjDSEy0XU1dWFrQQkjupVW+egNHcO+br7cJEaOh1iwZ6LTFRemIpWC0wBgRkam5SBYa9U13XKA3uqpXVsWpIBpmk4EXYQbf+f7SqSW7cVSEJ8jKSAkQlsHHrAFw7Uypd+fFY2ZbnkNATjplUe+fzOQklPgnCgp4jyqW8uV7S0dI/KA0+fl5aRCaRv9SLeyRnpQGKPffka2bEp3/QCVJe6+sZMT/DE3jr5bcOQFEJwyT/ErcE7Jf/7Y6vkmso8CFWseND6xiA90kuB9oLTyXgdXYPy9Gv18siJDrkp1y2fvbVY1pdnSkFWklGdOvvHpbd3SH7x4kV57EKfVCAPL4QkDr1hdd+E3LMuWb71x9slOzVeJpH5YszE+nz21Tfla09ekLIYqKzE24f5GLD42q2FsvOaAklOipfkhGijWrV1D5lGhmouw66kI/0TUC/zMxMlB3+TqPtwqllh7UFILAnMQeudn+1ZSVxCpk3BYKVzDJKCli4zJV7Sk+Pk2UONcvbSoGTHWRVWBxXmloJ4qD/FUlHgkXEATJXDVjuoRgmZHL3f57dlyiduLZN1ZVkQvujZMCSADNABYbo4igpCD8Rhiwsg1A1NyJ/uyJGKkgxUHvsUjB+gChRnJ0ouKrGuqVf+37k+cSfFyTjoHcNfGlSXD2wplJK8FKMKUegpOIDU/LrAqHnp8VKUnSSRyOiRA21yw+o0uX1HmSSiXGPo5dj7FWYmSFmeRy62DMpjVf0mbgyEg1SsSY6Wpy6PyN2Xe8BQhcBq0tCGf+Y55k2tcQyCe+Zil0j/pCTkxcooaHUB39rhSbm9KF5uu65EViE/qm8UZmKYm5EkBaz/lZYOP6o5tnrXj0FIL4WEg0Cow++IY/50BAwcIDFgzGSoNzIziK8zEoUA4+hNilNjJCMlDgxgVawvmqF/Bjq3DE9J5YZk+czu1bJ1TbaMQrflOIeOzEtm7Ogdkadfrcc4YEriU1xoqWdkCEKahZZ019Z8M/YYB4PZNI1BEN1QnbIwNpNR0mIJAHuXwuRYiYUQsIEhfqFaQTYAEjEl5fnJUL4jpCQrXhLjXcjfOxueg1UydxrGOuUeF7TBCBkcBd3IKw7poyuV5tZ+9LIFs3FMoeb9A/oio6SuuU/qOkbkQ+s80ozeibAiSZkAhqXpsaYRCsbwnar/UJjNK9YyP1g6wTIjvZeCsxGjirKwm/MkI7PzMIw4PiOfuqlINkJ9GcFAmEwX4BCYA/k9tUOyAS0zewGOQS6jN7mj3CNb1mRBPtluzznmZHoGfp7L1qhZCRz8Wv3FXIRQT6CDAiXozVh5Js3gcPg4DSEvS42VD6xJlyGEZzjTmXmi5OzlfmnHuCIaQkZ6FnLsic9e7JDGsRn54PZ80zvY4w8CwgE8/97P7n0vIKy8eSxABsJHW6UyYfBOhhiGMLT0jEl0eZzcuDnPhPFnIvITe4+egTGpehOqB4UAgkE2YQ8ShRmzHYhnpluZSQj+wdd5btmtn2HuecnMfuCYpQgCsmN9tmQkYlwGAZ4E8RsxwfCzEz3S2NqH8ULoMQLLaGExKU1tA/Lxa7IlK9WN3tEas/gXabYssw+zJLwvHt7/AoKKY4WHcv4VTTHiDNzw6IQ0QkD+cFMWxhgYos2LjJ4CY4+q2g758cFO2ZQeY3oPqkvdGA3vzHLLTRtzTevMiYPAPEJRYX3jlOmynF8vFJwH35na9My05GEssGtNmtRjzED1ksIsUBU7e4bN2ItlDnakheOrN5v65J9P9crd6EnZUzSNTEksfv0pnY09+xCc2nv7/f0vIMuoH7aao5j9utA1Jr9/Q764od9TTbJbd/YkZJw2MNdLJ9ug5kBt8XELw/SCgTirlOCOxRqL1bMsI/vlB/Xl7c+wTITvKIq09k+YdZMb1qSKdE2CualmzUgSVMJ957qlB2tA7A39e0hDBBLgRMBg/5AMtY9BqCLNWI3SvqAcBBNhEnrv/3N1C0iI2uaiGOZ6JT3FbQbR/lVsGA+M09s7LI8caceaANcy2PNgzI0B+KYij6wpSRMza7SM3sM/j2U9++gPUQzTUXBc5MUkQaIHklzkBo0YwCOD3PgoefJUp1nMpCD48zY7TE7t9mJR8Eh1j/zFRzANDoHnZIPjYC4UEcsqzLsz8NUtIH51wh6AvUUOVtP/+U82S05GIgbrc6YLVu8RKQND4/Lvr9SDiyxthZqOGwxV3zguf3pTrhTnJptBvt3r+GXxjjyOT0yCphT5whqPVGMxlVO0dqUfre4yExBUnygYdFSv2Kv09w/LD5++LDvXZ0oS1og4Azcb0Qp6VfxrY3VVFHZeIe2m02YO/HK9IR3rJ5bqERiDI4omrLI/fa4Lq+hRs1Oe7dDvr9+UImtWZZmxxzyVJTCZuTc7/7kvYX/ijFw6pnzL8pIwi+DjcbT2sVj0O3C2QybB+DSnsRQzS4Xi3EIXprAlEz1pWhJKbS3Ehp2490CCV7eA2BUUpB74z24xCFtXY2sFzjlwvEE6hifEjVE5NBiJw29r36R8cH26FOeh92BLG2Lga2cV8BuUb4DfUl4WEzCkzyDoEKQS09Vrc+OkFwuKtB/LQEPwRtOgNMHigQLBHo+CTSNDrve8gjHWX92cLdnsSVGmd0uPuBRYwhkmrCvpJMzWYY01p91vh5PiBdOCTQ5UIjL3UvlzwaTmeXDOP1JqMavz1LE2Y2vFPAheO9Y9KvPj5AbMXMVjipcryosy05UKRhB9FIKQSfoEiIumFUWpck12nDxeNS4bYUeWAMGugUXBiepOmOikGMwoKJzVGhn1yg8Pd8hDn64wtmRDI1iIDMoz4JX5+BFh1kcwmTGrtwUEXokXy6DyXb+SbgtHW+eAtGD+3AVbordLRigYq4rTYU2KGaSgBborrRIyvBeqChcGz8GeqTIxyiy6xUB3b8OK8meuy5QK5E0BXZJ0+hjXMNWVErdYfFQAsaGtWQlMQgTmJxQEmr6wCzxT2y1337oKEwvYHmBUKTGr51sx01UEsxdjdjObxwJiws++MtHKuJ22WG39ZrC/0vXPhoo9XF5OMkycPGE3NwlrD8IumlaxZ2o65MufPS5yRyLm3Dnd6UPYZgy+2qDafvxGf/s7320//3j8TmeHo5JIXad1Ql595DZJgcWrZbBmQl3xP9bgnCYX/fLaaUztRiIv1Arnfga4GAdzDi4osvcwU8LLydEun1+cUEX1817+o8mDYwiRaytzpOhIq6E7Gea9nG1r6hqRtu4RKc6BjReYmyvw/3mkSW6GNUBZQUrARMWsFCxABbGKhnnK2dpO+eK9x0R2Y/YMi4u28Jhodpntgtrv9OQ3/3f7G3/9v9vh+Mu56xeG5KFfXiuFuak+dZARwuPCKiCUZrbeuVke+cYP1koKVnA5a7rSjpXqRb7x8bGmxSMdS3JLCMc1cjLX0XOtsrd2WDbnxMBMCw0B6qURvcdXtqbJtWuzEIbGhVTvFkn0yrwDi+VLK1SSc9+sGSrwPszc02V9Rqw83zQiSejdyzHdux8m8EfPt0tprscYNA5DvfpdTY987qZ8s/eDKuNSHcvOushMT5Rv3L8GNnAxK65BcH6h73av4TnmvRj8Sy2LHS7MAgJDQHR3NL/etDobeVDE3y7HaVrswoOgsKLIrIu6RYIwDfaIl1oH5ZVznZKQGCkw0TLLARjrYiYoUm67vsjkZ4195thy0bzDGIDFWCxnwsFZuA3YC/J8U4MR6FiqWbA8bm3pNftjOIN3HGOSCNiFVaL+jNHkUun0EUAcaL92zdta/9YYhLy3aAO11PL4woVVQJgmcSJIS9uQ46PiHf0xnLMwh2EVubGpW5470iWbS+NlGCoDrVl7oF7dXJQsazH45aCU06lLqhxys4NbxDswpi+wjzcD/ALSQYMxhcaDOxNvuSZHfrC3wWg+Eejds1Oi5eDlIflgY59sqciU42dbsAksSjavyjAbogISXeiFmfHPT0jeifoPhcNCJC/1OzV4dSEQsHsPDjifPNQiadg8xb0bdNyz3tU9If9ld6lZcfdfUPRPit09t4Qu6AK4eMFQoT2QLNfFF+op/XPlM3sQqlmZsBC4NjdBxiDQVAuzsJ5zuG5YOjoGjEHjMEz3K2ANQGZnnCU5/8yWFOG9E+jqFhBTsfgnRAWzN6AFbFV9j+yp7pVMMBLlgwZ/PdhfcdPGVGzr9SDqfC4ywoVZoctQzf7l2QvSh9X32YVH/7woQT5n2QOHJMUOEviLXprrGei2Ar8v8MZgVJk82Pn38WtzpAn7XVgWzjrReLEfpiVHqzrkVMuI7N6Wb3pDI3xLS34ZhC9A4Lv089UtIPN521QTGYMMPYEB6guHGvDNsrfifAPkRFq6puTe63KlELv7QqlWbHmjoM8PDQ7L6xexN3ueBAZmTB6cgeXtkh0zgIpHpjdxlxSRevqM2WC1rhCr6oPTRlWkvZYn3SX7T7fLz56/IKnYiZmdnrCkFK+GQFe3gCxQw+w9qH4cr+6Q/7jYL6WYSmTvwXWPqsEJuX2DRzatyYGqRcYOZHYmyelSblVt7BiWtdh1F4sp4NlwCB6BcQ2a/1kdhoxuqW/z01qARFhH4ogd23P2wf4Q+pfB2OOx59u5OVW6oE5RwLKxcHiyFbsjq3rlji05mA3k7OMyBJbZLZEGBn0vORWQoNoiI3M1mT0DFwaHYf4ej1E5Gl/h9iLvhMgtm7IlPyvRLB4GD8yt3idCuPq872yXlGW7zUwYBc7uSCIpWX6LqMxvEPlYQkSWdXZmOzHiR+PQCMOZIaKQX4N51qiNmOnJhfnIRzam48CJCRzOYkWO9An6hrI0icXMHSdaZgl2JsfyDUHDUqK928Nc9QISql45sOY5VAdrMPZA78G2lFawF7Hf4wO58XITFgZjDYMHs6CvusHwPX0jGNx3SiYOjeD0qS0fFAIPzc+50co388VhQDvMPgwt+GeBVM24gHxL+ynYu0gixhNML1QZOKYJ/s53W80qwsIgltNNfOY/BJVtZ6nHGGrOxpt9sNl43gfb4337e1UICFWYYGc+4R+ad9uOTEz1aASLHC8cwUkoXV7JwaADfAxm48FrM3LbxgwpNyvM/BiYsB1/ElPBp7GaLA1j5vA0a4DOfKz5+iIYNd6V75ZqqEmcMuZfH1Qy7sEw6yk2QX6/TNvKbkYOYkX/DghqaX6KWffxCzb7yLDsmYJINO80zcjNTpEPrkmSOgzWeZhDK0zh79qaLUmJcWY9yQScgwavLKvfB19O87/MkvC+eHj/CwjqlVUb4FCrbDXJQIHO2jFIo8RXLvRIbgIG6ghLLaQfwrEG44ntOOfKqEuIGBybyUVjn3crbNEeevmySGqUsXliPjaD86TJAhz9sxpTrYLDEEgHxzZ0h893GNWOQsrwgc5S/YawJfg3J9vl2uIkYx6y0DlQZOhxzFpRVfR3/M7FVNplXb8qRYYhIDguDLwfIZvKUo1xImk0FFlkmejWo98HhDA0zqPTP7f3/vOKCUgglHbrF17AgvNYKHWboWf9EZFbTydpmhDE5lRBqmvb5RROK8mGKYbZMYiIzdhv/qF1abIeawTMN5gvKByM24tjQH/+Uq2c6sMxh2kuX8EDQ3MdpZxrDThAgbv8+M5EXz7RKoNDY5Zp/Syx1gOFjOkfPN0ix9HaryrN8PUepGa+41m9B3q8OKxu1PSK/hSTsWMwS1fE44Nw+mILJh52V6aKOwGHyZlNYr70/MjmIRB2GkYwMJs3hm9m9ZrE+4VlbFIVijLzLdjD/x3P/q9Mi474vhNuRQSEFekF0Gy9uIhGS1gCzGfrz362f+3voX5DhbG+BeZhHT4dDCLVid7eUd9nMBkq0oVxRdvAhHTyO4HHN+ryPN6z6lK33L+/RcpzXTKCwORd2lvSfRLn5UZDbzcHzaEVZkvMFpzMSNXoInqeL/3DIfmXw62y2Q0OwuxQJE8O8WMe5kOB3X19MXb5JWNcg8ThXwlh3NeMIz5fqbP2lOAj4/GPeNKdx5rMf/91tXwBR3reurUA6xr8bvmZAL5/uN7RhvOJpXZEWnB6iR1/LgwtHaalsixDfi8vXloaxuUjmzOkMMdj6sxSpxiaaVvbCBqxUYyv7E1pf+gGho19XmntRj6GeefosOvfv37suicvsE5s3jDfzbuv7vFswszyivU9kH9sPiEfWLwwv4xzpb2Sp7CamrDyeXTnwZON8qMX6qUCA1FzhtOVULhIXNYNF/QGMG74289sxIl+SYZhucGpH8eB/uz5avnP5lHsH48yx/IwuXKcKfV8/aAUvVQjf/Kx9ZKDYzi5DDGGXqK2oVfa2oZlPXbTceqVAjIGhrupIFEGMGY4iVMGu3DkzyjGDH04g7itZ1QawDytGDiPIj6P/imHcDCO8ChO7osgZxkmwg97AvjxZJTP31Up+y4fxSamCWM8uAYmHg/ux4YsnL37yV3lUpiRYISwHYK890STPLT/smQjnT/6/Y1mY1PI/Q9Inwt+zxxvk5wilzz6equkpXvkhg05mFjwEQFiKHN5WO8owGmNgrWPjLQEY907BmMzW0D4O46G7cCZNnkRuw9LON2N0rAxKAGGLwLDUhxq/QUcGm4wRP0T96PnmuWBF+qkLD1uVh0l7uF2FEkzeYLjYb9xR4nceE2hOeBvvur81nMOr4CADoI6AjXh0LMtcnqrW4ahu6+os+scU5bfvGs19qCkSmP7oHz/lyelvXNYjuJwZa4ZXMCcf4ADWf96rF0O13RLPNSNf/jzG+E9I19/ssbw8zmoJ6YBZSSEbRkdlO6HjpkZrSEIzjiYpA9J8qhTM4rnL/43gkCa+O7GWjfwCHb8RuZehUH2o1+/Tr7+8Ek5V9cneak4jxcJHDzfKXUNOJrUN708ilbyeNe49E9Hym//x3XmDGJbOOwsOWp4/WSTfO/xM1gdj5QLOLibxLaNjch38C3JdVY+vbNE/mB3hbEdY2PG2br1MF5cf3nQHA9k9Ug+apHG3kNvyn99rEpKIQy1xCPYIfN/Pdour53vlrLMePneV7bDqjYZOwKm5PUX2uTYRjcaK1K4ci4BBqPDJ4ZxHkCOhbUNSJiyXIHDq7GJCN17M5jTTG+GidCFkiH7sbLZ1VZgZ1wKzrsdxBpEDYzvZsDEbpx6zl4guFXh7BWimTNtR2BqsRmGeuTwajBmHNcYIDS2I+ZUi+ZUGt/IBemS2UkD5cAWBr5TvSCjcjo1Ab3qFOLzu7+zBGUaZ3F5zX6T599ok8P1/XKmB+MXTPsaiUtyye35SfLp63NlC5g5FdPGnAhgmf0dy8fjiOqaB8w2A56aSJrYU5DuIfSmvN7BTO/6IjJOLxqzduwHKcN4xIUyM1UmTeFpQkPThHpMRg9Dg0y7rHa+DMuzt0bQ+LB0lSWpOAjcZcY9l1qwYQrpMQ7DrZQjpqz7fJxJnIMe0bbmDld+YRUQmyjqg6yYt9ORYbhLzlQI8uadH2Rd8Khx/O7vzPQuwpFOqgwxXLxDVQJrI1BW8Lk4NkMGF2suBKIjkv1OgeIzGWsxx+3JoxBSnpjixSkkFGw7P9JNNS0JOyV53wa/k4FDOZaD6iaZ2+TKfxCWwXmnCb+Hooe9IO9C8U+XUakesy7tOPMxZPrWmIpxKWDEDVEQD0DOooHHFXWgERlz9i/cbkUEhEQSqJCOtbWQX8gIS/8YUMF2HsiPWS7kbDrtuOY9RBw7OUP7AgnyM8PZv8xzgaD0CnDMly16MBMyENOg0MybjQtIwXqx6eebPx0kzC5jcDSb5uDvfA9Ozz+MHc+EgYd/+vY3//Ar+eyfdzjzCesYxJ8wR4KXyjX+CS7z2TF/v7SCwwW/20FnSZ59sH0Cf21v+zfQd+E35ks1zGLrhcMt5hNM/ywdsw/zU3DwCmD64Jh2vOA8GS7Ut+D474X3OUU7jNSyZaH+uZx76tj9B48Tgkliuktxs/n7ulyqCJY+HBibFcw86RfO7plp2mpJYI6h35g3w4fCi98WwyV0qvO/Mi2W1XYGF6iWi7X2PNGFPZuNoS0YdjpOv6wLUzaUz8YlVDmd0gjwQ+bEi39vhxCGvQch2Jwu7WwfMBWejelDJ+aj2sCCcj49Ic6FQXasGWgFMwXD8HRys6gWgNjcCysOuJmpyU5Mu7JCeYFOB6ZiqeNngpYEDNqpI9MxLAf0PKmd5/Cme+Isjyv4l4zUPzwuoxh480wp0u3kSEsv8jeXiOKFp6j749XcMYiJBtcV7+8mzi24F4QMm4PbqMi0bcCcR/xk4cIbN9ZsQtHKeJ241SoRp6L0Yvo5BRjZGDKthZxdFxxAd/fifF+4eKwz8d0Li89cXLL0Vhz3r3TDzo38keqJX5La+VbysePMNSf2lyv4JcAknLZMf/uLM/K/nr5gBnqsDAoO/+jsZw4AOdtF84nHDzXLmy0DqLAJ6e63ALXDk2G435yzKv7xzYvvH5Mmnnl8DU8F/PtnLsp+TJdybWIP9nTs+uExacV6Ag+fJhn8i4U17Nk6LAw+VyunL/WalGzmtGm00w1495WDEezvjMcr3/rxV4vbnfYcvGwYnQLDMHNhrXEGGYi4cAbrN8db5UBVl/wci4S8jMb0aL5IT7x2WaqBi9WKB6djvc+l7fPHj50n64TPFMSf7a2TP3vwhKGRe+2f2Pum7Pr2YWMDZtL3i8c4pI9j7WcPXMK1ekPyP5+uMfvzae1LaWKx7HyYs1VWX2HhzzURLjA+cbBR9mNP/xt1vbLvTLv86AlMRSM8MbPj89d+NmmZ9PhkfWfadDHYOnDkbCvugOzAs9W++8czgcL4T1gFhIRymi0Xi0+3lCZIJi64ZHfKC2iGMc3IPRKcaeEVA/ztxJ19Dz9XbW4mvXENVnKxyPfCoXrZDxCtlgarqmAYClI/Wtk9L1aZonPWhWmYNQh8IRMwbTIb5666ugZkV0GMfPyGYnMyx/rCZPnDikRzBCdbTArhKGhCMtLa3CNf3JEtN2/KM2nSj60mD2u2wk2alXM+m3cIP3+5DkG62DPxnVOvh043y3OHG8x0Kg+uoNGi8TcX8PjSxG1QpIGnv/OOw1b0tCfremTXxhzZBlNzqyyTpixcpd9YmiqlwIW4WmWeNmVlGnznoiPIAMaTuGmKJvPsQafMKfWc8WKdcBGUTP2xG4rkeNsYFvLazGwXZ7zurEzCgqHbxOHdKCw3y2XqjHhCQvJx5lQsbsYqwB2NNONnmQxGoM+myYpjlY29IeudNP/H0RbJT4yWD2/JNb15cVYC7i3BqflIl3VG7MgLPFWfeTMO0zJlQD6sYx7AzbolTZyN46JmRmqCmfHjt+WcvLJc2Ym67777/m65kRYLT2b5HZjFBVBLAMh/e/gN+evf1Eka7sTLhgrxxQffkHW4PoxXgX375Ub5HOb49wBIHhzdUN8J0+9puYy1lPr6LmnvGpJazO1fxDVgJ2vBSNsKYSnbJV/EAta1OW7Jy8BiJJj2yf2X5LvosbYUJ8tr53DrLL5tXcfV40ipQz71SOMDuGzymb01cs8vL0hEa7ek43iixw80yOaSFICeKH/9byfl+TOdsr0sRfYda5QvP1Ujk83dOGp0Ur75qyrZc+CytMG26f++XC/FsahU7Hp64PlaOXSsQdbhyuYLF9vlYvuI9OI4oOlxr7kG+h9R7qdA2w3rMuXF401y/56L8mv0LjvKPFB1PKb1/stf4ZJRmIT8sW8R79F99fJX/35edhYnyHkITzGO5OnGVQWf/+kZqcTqNHucb++pke+83iQfLU6UKJdL/vKnJ6XlUoesrciW5481y4Mv1srN63H7LQ5qIDPTdWLlvwvqyeqkCIlNjJdD9QOShkZ4+7psOVjVKR9++JTkYK08GWYvf/fz0/LLA42SETMj3biNiusnVZf75NlTHXIc9bCZOCPOXb84J7uyYrBsMyN//tAJeexom2RGTJiTbdjIdWFP/zcfqpIb13pwYEQ+brbCGhnWSEoK0+TRfZflJ7Bb21GRKj96Bg0ldmBOYTMZhfBVrN4/ibTycDXdyfPNcudPq6S1qsWkewZXaqfictJTWDP6ySuXpb+tV7ZU5prGwu5pFuPRpfqvjIBAjTl2pkWmUXFrsMh1BOrDx7HJ6BJUhRkIyVjfsHx4R4kMgYm7cCPuR7bm4eCAftmYj01Iw6NSihP9uPVzYgTm4rgueQjGUDTtjhgZkRxcCPPjvfWyCsBdgu3TLoB+vrpVjiH+ZrTAbzb2SnFanHhiYZ26Ntu0SA1tgybvW64tlHow0d0bs+QszEkyMD5JxtEepblJcggr6jxIrRLmMfG4B5DmHSO4VfY7X7pORgaG5HLHKAQpVdIE97HvyJVzuMZsIjJa8rGQ9wI2Rm0tTRHXNO7jwEHRpWCm3u5BicJVyyW4uzAVZahB/EQI6/WFbtmYlyAtuLujFGbvWTBzua7ALd//P9VoHQdwW22CTA8Ny51bcQkPcOwFQ4/NRMKCF8wC05WLrUPSBCG9DTfv3lmUKEk4hLoGNlq83HMteq2Otj7ZB7zHYJ2LVRNZg96TvQgXC9mQbCtIgMrTJNnA0YvWdxRrL5tXZ8ib2P2YjF6RPdqOijTUWafc94lKuR6HzZ2G6UhxQSrO8h2Wr+4qlpTpcYzdJsQ7OCJf2ZYjT/yuDRvDPDLTNyDf+tQGKeeV0MiTi5V5MJdpB37fv/+s3Lg9WeJwdlk78kiA2QqO6DJ1db4F/IALi7phBV1alin17UNoHLslF3fCR3nHjGHl7rJkaYT9XCa+pUFo2evQDGYTTIDO1/fJalyYmgic+T2cQhJWFStYKq12yxoMU9/krrXtqIy6gUk5fso6esblmyGZHacgEd5PwbEMQTZjAvxyUp+Lebwo/rmuUfnq7SXyrXs3mYteRkbGpQK2U1kArxtqGwdyjAvt1agcVBOsRtSiiCv85Bq2rGYhEb/tGMhn4MQPWrla200jpCQj3kwcMCWmx7GBC3ovf9n1byhNky60yqdghWHoRDimzXEOc+JiJS8RRXBpxwWYZFTO1pFxmDef+yCE5WhNX//F7TINYp473mLsvG7ZWmgsA3jKCC8VPQwmunt7nvwN7M0KcfkoeMPgwTS70Sozj1uvyZMp9Fz52Ex1/x9tko9uLzCqDhnGlBx5JkOAnzk/IMkzyDcnUZoGvJiciJUi3LvejJ4yCdttucjHi0hz0dtbm70sVY2nqPBqOdbNPmwHoBpES4Vq3Mg1gTEiy5WGSZZ00EcViz0I6f/Bl7fJg9/bLI/sa0SP6UWvhgMwgA0Xdpl+M7BPBV33PdMAlbfbGI1eQk/86V1lsntnhelReCU2y2F6Q5SZ5c6C6ncJvECVjPhbtQuPMDrAGn5HAGmxye2q5MzGfi/uLZ/CRfajMoDfr95ahO4erRdquRUzHNSf32gewoUuXjObcwRdOCWiuXtM6ttGjMUsgWyAmjWJVvs2TDb97nybnGnAObOoGLcnQY42j8kbGGgno1KZL8+UNcyPlNiq0HCRAFL3Z35kbM62DeKkdlbs5lWpaIm7paEXm5YgWOOYaRlBz8WKYB7NoLcLzDyCGSoq9SiWHDnVJN99pcFYzfbBzJ2LefuquuUSZp4mRsdNpdWgzA1oEdfjoATen878SRv1eA6Um1t7Ze9RjFswk5SJ22+NuvFSgzyKAxRGoHv39gzhFJUpuS4jRo5Xtcm5pgHcHMVZsglMbli7EGOgLv0FJiVO1HTKUIRLfghr5FNQQ1+FafxPnjopfZg44OwfZwqTcBnO13YXQf2NNWUZxSatHvw9tu8SVKZeacSkCQvHiRbixbrk2IBYnaX6CFVvFH63rE4RkCFn0XrfiM1b8TCnGQeujPePvzol52taTWPy1MF6M/mSA2bmldtD6LU4c8hGprZjTOowoVEBO640NE5/sDXTmP5sKE4BTV558rUGacTRqKh6jEFwbRy+UbCIM4Xv4sU2+fXJTtQ96EIZzBVzPjEB6WFxYVWxCChnQ3rRbfOY/Vx0r6mYFiyAOsT7uyvMmCEBemaUuct7Hbr/QlzHzDu1cUillKFFK8ZuvSzcz8E7xZNgV5WEloVHipbgPQUtE3fzlUMN6QXzrs73iAfmF7zgxQ2jtWyoTLdswImOYIapqGgz3mHP1ABbI8blNG4kmDIOTJKPiQSjYuGbKzYGd30nG6bnPRobYQbOCyvTQfca5DGIslBN2oyD4tKhEsUiPtMoQPnu2ZAhd9+YIyVQ0zLxzm88oI20b4LK44V6VID965tWpcsIGoQYTNm64uIkEVdTExM68L90Ygp1DdJfj7zXAqcZ3I9YBvNzqkpFiL+tPE36UOYixPEg/QyM13iPCY/xWVucBoPCKHPm1Sb0ahsgTBxU5yHMQaieFSgTD6++AGZk670NR5DymmgKYBrKyHoqxlju3muzZBt6eDfKFoWeshD5soGAVTumyN2yvRDT1qjffNQFy+ZBGcdRvl2bcjAOwm1b8KMBZgfGj5zj4tm+aPJNPmPA88bKLOuYIZTN3MQFLNhzXLcuC/ZeHK+6zQCcY9GslFiJQE9chM1lxCceNOWlxUsmGkDeeEUBz0D5b12bIduBDY9ONb0d8AxnHxJRV1dHvg6bI6BswanvstUy6gTUAdo+sXuMRaHZyngwxuDVx2zdqDqxhXdjCo9dNlUTxmWLy1kNthYUBC/UmgSEGcc7z5rKgGrAbpdCwLvAGS4FM2d9OE5zHPp0shuMgq65E9PGLCTzMeoG6EC9GSBJL3uYVDDsAGiIxjiE8Toxa8bv6VAZhjlThb84CBftk9h7sBK4HkB1EBoJ3i3dl929PctDgeS0L/NMxNbdXvRA8CYYhvFSgAEfiFfP4JjkgjHcwIT4ML9EpD8Ao0WaqXOw3Q0hSgYO9AMURu2jakF62SixVU7Debg9yIeOPdXr1d2ysxJMjxa+A60/McgAXaSzHy059XjWQxwEgljwO2eheKMUvzN9YhuPBogzYcSINFLfZ08yiJ4sDfXA2SzWOfGqxpYBOjYKLBun8VmnLB/HLtxoxXriHg+qqjSG5IwbghjMSSO3E1CFI8bMgwjTMJI9GhthgkhVlvU7AT4hRqyXcLuwCwgJJNAsCJ1hJuvR924xEoWFfkZ3xAPDEyQyEKPSj7+YKZ+tONTVrD/DszJtZ/KjP74xTTwirJUHBYiOaRoP34/fq0mL8ci8NPmwFySZBz8bwQqKZ/RhfDMO8Ux6vrD8ZmhhIfiMNG06zAf8Y9NP2lnnfKew8Zn5MT7jkG47Pn/pZ6Vqlcn2YzjSDo3RjAEonGTIfPQQbGhMWqQF6dIZnBCWKov1xXw2aZv8mSD+t+qIj1bepp58dNr1wGLymX5dUHdouMhei3lxTEh6LSz96xNf8b9ND8PwndkyPRsDUy+Wl0Wnj1hDNZ99cRg93G5FBCTcRGp6bw0Bm2ltQXxrqSw/ln9DY5h++Um8a2KE3dTkXVMyJcS0xJYB5NsLRkCP8PZmHfbcqMypUwQUgQUQUAFZABj9rAgQARUQ5QNFwAEBFRAHcNRLEVABUR5QBBwQUAFxAEe9FAEVEOUBRcABARUQB3DUSxFQAVEeUAQcEFABcQBHvRQBFRDlAUXAAQEVEAdw1EsRUAFRHlAEHBBQAXEAR70UARUQ5QFFwAEBFRAHcNRLEVABUR5QBBwQUAFxAEe9FAEVEOUBRcABARUQB3DUSxFQAVEeUAQcEFABcQBHvRQBFRDlAUXAAQEVEAdw1EsRUAFRHlAEHBBQAXEAR70UARUQ5QFFwAEBFRAHcNRLEVABUR5QBBwQUAFxAEe9FAEVEOUBRcABARUQB3DUSxFQAVEeUAQcEFABcQBHvRQBFRDlAUXAAQEVEAdw1EsRUAFRHlAEHBBQAXEAR70UARUQ5QFFwAEBFRAHcNRLEVABUR5QBBwQUAFxAEe9FAEVEOUBRcABARUQB3DUSxFQAVEeUAQcEFABcQBHvRQBFRDlAUXAAQEVEAdw1EsRUAFRHlAEHBBQAXEAR70UARUQ5QFFwAEBFRAHcNRLEVABUR5QBBwQUAFxAEe9FAEVEOUBRcABARUQB3DUSxFQAVEeUAQcEFABcQBHvRQBFRDlAUXAAQEVEAdw1EsRUAFRHlAEHBBQAXEAR70UARUQ5QFFwAEBFRAHcNRLEVABUR5QBBwQUAFxAEe9FAEVEOUBRcABARUQB3DUSxFQAVEeUAQcEFABcQBHvRQBFRDlAUXAAQEVEAdw1EsRUAFRHlAEHBBQAXEAR70UARUQ5QFFwAEBFRAHcNRLEfj/AZI7zOponM0AAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.izum.si/default-EN.htm</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.izum.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>MIIEOTCCAyGgAwIBAgIJAIROtRqsRhxmMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNVBAYTAlNJMRAwDgYDVQQHEwdNYXJpYm9yMQ0wCwYDVQQKEwRJWlVNMQwwCgYDVQQLEwNBQUkxETAPBgNVBAMTCElaVU0gSWRQMR8wHQYJKoZIhvcNAQkBFhBoZWxwZGVza0BpenVtLnNpMB4XDTEwMDgxMTA5MDkwN1oXDTE2MDIwMTA5MDkwN1owcDELMAkGA1UEBhMCU0kxEDAOBgNVBAcTB01hcmlib3IxDTALBgNVBAoTBElaVU0xDDAKBgNVBAsTA0FBSTERMA8GA1UEAxMISVpVTSBJZFAxHzAdBgkqhkiG9w0BCQEWEGhlbHBkZXNrQGl6dW0uc2kwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGGT1oDFpLWvfxTbjr0YxZrcU6uVoMj6rWAVlID2LEc/a4VyswnHczFPSZ7c3EdQhupAZKisrIH8svKgmnCSpNQiNx0VUct0N9/pUfTPwO24PhmDlmv+74KTbKe3epH5qamYoKGvWVvScIRExNGhMCO3JqXSi4GgMeuWQ3//oWb79Y60Morfvp+yhiP0xk01PsE1TfO0GeBFTKjfIr7GJu2tZWu4TKlYI1+QIZzOFVKz48tTelG5wQjMAxSOXugoFAZadhoUIzhIIci/aMOkC6t2vYi4cJO2m354L/q0GlqE48LipmqndNabY9bfv2hngNPzfdSvME++fARgEWkJSjAgMBAAGjgdUwgdIwHQYDVR0OBBYEFL42WWdi/1kd4jO+N0lSixh6b5L2MIGiBgNVHSMEgZowgZeAFL42WWdi/1kd4jO+N0lSixh6b5L2oXSkcjBwMQswCQYDVQQGEwJTSTEQMA4GA1UEBxMHTWFyaWJvcjENMAsGA1UEChMESVpVTTEMMAoGA1UECxMDQUFJMREwDwYDVQQDEwhJWlVNIElkUDEfMB0GCSqGSIb3DQEJARYQaGVscGRlc2tAaXp1bS5zaYIJAIROtRqsRhxmMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB1HSDQOUHlA4CU2L5NqZn1phioXwkH1NX2UHCvQkdS+Uv1hV9JMK3/tsXW5etEVvmT2UBpHyDgO3eYkRaTjsMGOblsLYXY0HuZRcB2Vyp/tCO+OWP7FfMv4mvfEDE7529tUi9i0im6uA1dgRLoYmDagzSzihkoJc1Q1zIXjqelRZWMApU++9uWpB1orzXoos+wew8HVsihaNOnDAMvIpaHVGZnepos8U6lI1q1W8fzodTD4/BMroV3w2oFay5nmIewYdGKB3q+TzAk4eaXhhosRSLhTnkKFpRdLhBZxfGP4vYTCM7RjFIAciMaT7j5dZTdDII9aZyoFKe9U0xR/lzc=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEOTCCAyGgAwIBAgIJAIROtRqsRhxmMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNVBAYTAlNJMRAwDgYDVQQHEwdNYXJpYm9yMQ0wCwYDVQQKEwRJWlVNMQwwCgYDVQQLEwNBQUkxETAPBgNVBAMTCElaVU0gSWRQMR8wHQYJKoZIhvcNAQkBFhBoZWxwZGVza0BpenVtLnNpMB4XDTEwMDgxMTA5MDkwN1oXDTE2MDIwMTA5MDkwN1owcDELMAkGA1UEBhMCU0kxEDAOBgNVBAcTB01hcmlib3IxDTALBgNVBAoTBElaVU0xDDAKBgNVBAsTA0FBSTERMA8GA1UEAxMISVpVTSBJZFAxHzAdBgkqhkiG9w0BCQEWEGhlbHBkZXNrQGl6dW0uc2kwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGGT1oDFpLWvfxTbjr0YxZrcU6uVoMj6rWAVlID2LEc/a4VyswnHczFPSZ7c3EdQhupAZKisrIH8svKgmnCSpNQiNx0VUct0N9/pUfTPwO24PhmDlmv+74KTbKe3epH5qamYoKGvWVvScIRExNGhMCO3JqXSi4GgMeuWQ3//oWb79Y60Morfvp+yhiP0xk01PsE1TfO0GeBFTKjfIr7GJu2tZWu4TKlYI1+QIZzOFVKz48tTelG5wQjMAxSOXugoFAZadhoUIzhIIci/aMOkC6t2vYi4cJO2m354L/q0GlqE48LipmqndNabY9bfv2hngNPzfdSvME++fARgEWkJSjAgMBAAGjgdUwgdIwHQYDVR0OBBYEFL42WWdi/1kd4jO+N0lSixh6b5L2MIGiBgNVHSMEgZowgZeAFL42WWdi/1kd4jO+N0lSixh6b5L2oXSkcjBwMQswCQYDVQQGEwJTSTEQMA4GA1UEBxMHTWFyaWJvcjENMAsGA1UEChMESVpVTTEMMAoGA1UECxMDQUFJMREwDwYDVQQDEwhJWlVNIElkUDEfMB0GCSqGSIb3DQEJARYQaGVscGRlc2tAaXp1bS5zaYIJAIROtRqsRhxmMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB1HSDQOUHlA4CU2L5NqZn1phioXwkH1NX2UHCvQkdS+Uv1hV9JMK3/tsXW5etEVvmT2UBpHyDgO3eYkRaTjsMGOblsLYXY0HuZRcB2Vyp/tCO+OWP7FfMv4mvfEDE7529tUi9i0im6uA1dgRLoYmDagzSzihkoJc1Q1zIXjqelRZWMApU++9uWpB1orzXoos+wew8HVsihaNOnDAMvIpaHVGZnepos8U6lI1q1W8fzodTD4/BMroV3w2oFay5nmIewYdGKB3q+TzAk4eaXhhosRSLhTnkKFpRdLhBZxfGP4vYTCM7RjFIAciMaT7j5dZTdDII9aZyoFKe9U0xR/lzc=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edi.izum.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://edi.izum.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Inštitut informacijskih znanosti - IZUM</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">Inštitut informacijskih znanosti - IZUM</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Inštitut informacijskih znanosti - IZUM</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">Inštitut informacijskih znanosti - IZUM</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.izum.si/default-EN.htm</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.izum.si</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Batič</md:GivenName>
+    <md:SurName>Boštjan</md:SurName>
+    <md:EmailAddress>mailto:bostjan.batic@izum.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:bostjan.batic@izum.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Batič</md:GivenName>
+    <md:SurName>Boštjan</md:SurName>
+    <md:EmailAddress>mailto:bostjan.batic@izum.si</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edinburghcollege.cirqahosting.com-shibboleth.xml b/swamid-interfederations-2.0/edinburghcollege.cirqahosting.com-shibboleth.xml
new file mode 100644
index 00000000..13e049d0
--- /dev/null
+++ b/swamid-interfederations-2.0/edinburghcollege.cirqahosting.com-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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://edinburghcollege.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-29T12:19: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDHjCCAgagAwIBAgIJAMLy719Eg3tSMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+						BAMTHWVkaW5idS5pc294Zm9yZC1ob3N0aW5nLmxvY2FsMB4XDTE1MDEyNTE2NTU0
+						OVoXDTI1MDEyMjE2NTU0OVowKDEmMCQGA1UEAxMdZWRpbmJ1Lmlzb3hmb3JkLWhv
+						c3RpbmcubG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+kePo
+						yKtQCwhXQqYw7fzZHw9vIQ9mXEI2crCoOPkPvwIjiV687/EqNcNft1UjzSXdkBVB
+						WbyaXU22MS6lHFnnnHCiAG1WteOOlk1YR/xSbPX9yTjWzlF44xbc6rCUFslssBbD
+						x4SIdp3+eVFZHlRoOeo/qXepzHW5B5VAFdCgWc2bNq71gZ+U0rYKY68iMwNq5hwQ
+						w+TJcIN0UOOaL8o9cgfMXP5y4ttBce1WnmcSddu8/tvtwYVOMV88PvlrEI7h6QeG
+						vg1WtRN5leQ738HXN0PVRy3FecUP8IYUGOfALNi9mk5OFton+o+4q26ag2aUvkYX
+						caG6Ve7hjHnDlr+hAgMBAAGjSzBJMCgGA1UdEQQhMB+CHWVkaW5idS5pc294Zm9y
+						ZC1ob3N0aW5nLmxvY2FsMB0GA1UdDgQWBBSj7q47xzeFnVpWBzLzn1GDD0VaoDAN
+						BgkqhkiG9w0BAQUFAAOCAQEAYI4dif6kiOaPyAXYUh+TwmNl1FldNTkcNWQvpvHh
+						67tYn4RpEdUYAbm/FN/hKbNebmq6Uzjlaf+fA0HVnvBFuoyDN+AyKhL8o+s/nNTs
+						29Ec3d9bJFMBi8HkGh6fsHAp/y+uzF6iqHV2OeeeCuAacotJPhQrQqlDNR3i7ti/
+						a7M9kzk8vPFwBSsLZl99rc7KltgJVWmiumNY0bjw09ikw8lFCPuNm+FW0Dd7xEs7
+						J59IBvcAbDBTiSucBWkyJZgS/krRf2+aHfg1IQ7OopLhGWyDKSBIZoRyXaZUaxx7
+						hNWZYJ7F1b5HIi//FSgUwMllV6SzbEYyKMsrimhNpmPP4g==
+					</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://edinburghcollege.cirqahosting.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edinburghcollege.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">Edinburgh College 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/edocs.bathspa.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/edocs.bathspa.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..9ac8d9b0
--- /dev/null
+++ b/swamid-interfederations-2.0/edocs.bathspa.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,62 @@
+<?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://edocs.bathspa.ac.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-22T16:13: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDzCCAfegAwIBAgIJAKvu+ZotXOBYMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51azAeFw0xMjA0MTIxNTA4MDhaFw0y
+						MjA0MTAxNTA4MDhaMCMxITAfBgNVBAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAONwiFdIwZkaerJXg8Wm
+						47ddT4dPw4AYVWgk2Uy64qQvAgbaSQi1mknnR27bhWyg5iCA3z9IrfLtLmF6O4do
+						Q5nMjXcnCVivz0hubTlFLgqtbo1XXddm+WYrpsoBhATbgLcz8XG/TdQWzqPjf6xR
+						jslpbjf8YTDCigoLpxnrBfJeY8ns81RaxtDOS/eg5JgjpohSbnJK5kum4twpEVPK
+						/Z6EmoIKsCQ2YTzcn1PmlxT3czYxBS5Hr54tt1W7JUtZPlrWyMJnQVof7MZSTeLr
+						piH74BxtfbN1n7AwWvGSdj7D8saRahKv9YzexaGKNggAlXE7lwDSRAagh/MKIX4V
+						oasCAwEAAaNGMEQwIwYDVR0RBBwwGoIYZGlnaXRhcnkuZGFyZS51bGNjLmFjLnVr
+						MB0GA1UdDgQWBBQJeESLMMOvuBxCw/egquAAUDHR2zANBgkqhkiG9w0BAQUFAAOC
+						AQEAPF1yxkncDbJ0WwRpnleXV2P7GGDKenIbcIH69ad+0IARiyCvKJxX1vpfkD2C
+						Fmis9+MURBeMMpRUpRsIGh9O2SMMQT/aTMHqoSWOMGiJW9fM6PCS18Z5Zx4aTgyq
+						O1ez0wHjbR1vW/TfSM/b6A2ovLqR+6bbbaymu0wu5UbNofG1uSRgkKT9kgeiGLWq
+						VqagedqlmGej4hnCq2/+hMGTdeRiCrgFwUwVL8ZLfs8YptRka8WPuEsXieI7m7rf
+						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://edocs.bathspa.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edocs.bathspa.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/edu.xtremeinformation.com-shibboleth.xml b/swamid-interfederations-2.0/edu.xtremeinformation.com-shibboleth.xml
new file mode 100644
index 00000000..88e6bc56
--- /dev/null
+++ b/swamid-interfederations-2.0/edu.xtremeinformation.com-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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://edu.xtremeinformation.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-19T12:34: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://edu.xtremeinformation.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>
+						MIIDAzCCAeugAwIBAgIJAKUdMtp0wHmJMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFHdlYi0wMDEueHRyZW1lLmNvLnVrMB4XDTA5MTExODEyMTQxMFoXDTE5MTEx
+						NjEyMTQxMFowHzEdMBsGA1UEAxMUd2ViLTAwMS54dHJlbWUuY28udWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDP2ZbA5SAqPMAhAeX994ZNooqO5VUG
+						EtTHvZfmKSVpFLNI+LuT4dloL1eKLrFhMtVCRsR94oX15ZnMGJ8go3GXbGUqhT5I
+						soGDNIMHnvA0zeQr/VmHwrRImddyiiB9MR1C1dghV83zw1/04kcZMKd3fdXlsXaR
+						lWCTuYDKstG4wivDN/rTJIlgFtLJnplVpAYnTIgxxY/cU+3j140OUX3yFQu04/BM
+						uEtlz5ypWek2bHNZWH1aDYmWcpB32ao/oWEsyCoraZR5knluYNwt2uJgChfTh8zC
+						yFo713ketgUndktx5sWhJnNjQeWYweMSuu1w0HzE2uKgDld1c8m1o0qLAgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFHdlYi0wMDEueHRyZW1lLmNvLnVrMB0GA1UdDgQWBBR0
+						5U9o3XTImfdd6YXxvMwlBN2vujANBgkqhkiG9w0BAQUFAAOCAQEAErdNoI5vHTQ4
+						apBJD/KDf4+MeJRVFtsgkX0OgRAGApMILddenUgqj55eCKFu25BB2+JNpD72pLcD
+						KvcRgJX9FeqyaHpUJ3u9Hq6FwyY2t0xFHEUk7VXaJm1Y7VhVuPEovGz97bj4ffYZ
+						riMV/JRg/7SDxjL4z4BjknQdLTYxr0vfAfkv7K679mdTRCIcho9x7b8n0V95UwhK
+						Gb8PQktjjg5GUaFHk7bZjPdBffYgABNwrdEoLrWBDRtUYVfRv52m7HEOa/wIuzdm
+						/K9EI6W5q9FIrAy11+Z44GB/xe6WI/18xax/sGbafbwj+g0Aov5EwVcgbjmjCrjT
+						pjmPlQZwNg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDAzCCAeugAwIBAgIJAKUdMtp0wHmJMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFHdlYi0wMDEueHRyZW1lLmNvLnVrMB4XDTA5MTExODEyMTQxMFoXDTE5MTEx
+						NjEyMTQxMFowHzEdMBsGA1UEAxMUd2ViLTAwMS54dHJlbWUuY28udWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDP2ZbA5SAqPMAhAeX994ZNooqO5VUG
+						EtTHvZfmKSVpFLNI+LuT4dloL1eKLrFhMtVCRsR94oX15ZnMGJ8go3GXbGUqhT5I
+						soGDNIMHnvA0zeQr/VmHwrRImddyiiB9MR1C1dghV83zw1/04kcZMKd3fdXlsXaR
+						lWCTuYDKstG4wivDN/rTJIlgFtLJnplVpAYnTIgxxY/cU+3j140OUX3yFQu04/BM
+						uEtlz5ypWek2bHNZWH1aDYmWcpB32ao/oWEsyCoraZR5knluYNwt2uJgChfTh8zC
+						yFo713ketgUndktx5sWhJnNjQeWYweMSuu1w0HzE2uKgDld1c8m1o0qLAgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFHdlYi0wMDEueHRyZW1lLmNvLnVrMB0GA1UdDgQWBBR0
+						5U9o3XTImfdd6YXxvMwlBN2vujANBgkqhkiG9w0BAQUFAAOCAQEAErdNoI5vHTQ4
+						apBJD/KDf4+MeJRVFtsgkX0OgRAGApMILddenUgqj55eCKFu25BB2+JNpD72pLcD
+						KvcRgJX9FeqyaHpUJ3u9Hq6FwyY2t0xFHEUk7VXaJm1Y7VhVuPEovGz97bj4ffYZ
+						riMV/JRg/7SDxjL4z4BjknQdLTYxr0vfAfkv7K679mdTRCIcho9x7b8n0V95UwhK
+						Gb8PQktjjg5GUaFHk7bZjPdBffYgABNwrdEoLrWBDRtUYVfRv52m7HEOa/wIuzdm
+						/K9EI6W5q9FIrAy11+Z44GB/xe6WI/18xax/sGbafbwj+g0Aov5EwVcgbjmjCrjT
+						pjmPlQZwNg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edu.xtremeinformation.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edu.xtremeinformation.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edu.xtremeinformation.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edu.xtremeinformation.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edu.xtremeinformation.com/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: Portfolio ADS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.xtremeinformation.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ADS Client Services</md:GivenName>
+    <md:EmailAddress>mailto:ad.clientservice@ebiquity.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rob</md:GivenName>
+    <md:SurName>Ryan</md:SurName>
+    <md:EmailAddress>mailto:rob.ryan@ebiquity.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/educonf-directory.geant.net-simplesaml-module.php-saml-sp-metadata.php-eduCONF.xml b/swamid-interfederations-2.0/educonf-directory.geant.net-simplesaml-module.php-saml-sp-metadata.php-eduCONF.xml
new file mode 100644
index 00000000..00e6bbc0
--- /dev/null
+++ b/swamid-interfederations-2.0/educonf-directory.geant.net-simplesaml-module.php-saml-sp-metadata.php-eduCONF.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/metadata.php/eduCONF">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-28T13:11:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc: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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">eduCONF</mdui:DisplayName>
+        <mdui:Description xml:lang="en">eduCONF supports and facilitates the use and adoption of videoconferencing, simplifying the videoconference experience and reducing operational costs. It enables further integration of the NRENs’ videoconferencing services within a coherent service, reduces travel costs, environmental impact and increases the awareness of Partners’ videoconferencing services across Europe.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://educonf-directory.geant.net/privacy_policy.php</mdui:PrivacyStatementURL>
+        <mdui:Logo height="96" width="350" xml:lang="en">https://educonf-directory.geant.net/pic/eduCONF_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>
+						MIIECTCCAvGgAwIBAgIJAPAcrGLtMuPXMA0GCSqGSIb3DQEBBAUAMGAxCzAJBgNV
+						BAYTAlBMMRUwEwYDVQQIEwxXaWVsa29wb2xza2ExDzANBgNVBAcTBlBvem5hbjEN
+						MAsGA1UEChMEUFNOQzELMAkGA1UECxMCTkQxDTALBgNVBAMTBFBTTkMwHhcNMTQw
+						MzI1MTI0MTI2WhcNMjQwMzI0MTI0MTI2WjBgMQswCQYDVQQGEwJQTDEVMBMGA1UE
+						CBMMV2llbGtvcG9sc2thMQ8wDQYDVQQHEwZQb3puYW4xDTALBgNVBAoTBFBTTkMx
+						CzAJBgNVBAsTAk5EMQ0wCwYDVQQDEwRQU05DMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAprLbGmrldyPqbXlk5Y2mE78VYdLbsn6/LtQEVO4UNuYU6kxK
+						hy38FDjZ20Zrsgjz4fspJxP08yjeyw2qGGVcZXJRZAlJ3IRhjLlq9cZi5t5XDA4A
+						HfD+LSzUFmllZdNRS6oOceLXRkR7BYeHVeMYQHLTc6SABjCSs9oDpGwlxj8iHqbH
+						P50zh7PxBNxRv8PlEgsWEgGZ5Vgk1U1sT0490t7VB7ksqO+ka0BLQORPmZj7JNiJ
+						On20X7w/fXeSTcOgRcoGhf9d5QaOU/k7yP4BPXx1fX6gPsPM63zJzvtKfD/3WCdj
+						tqHHhEC1IP6eYzM3PJNa67N0HMiwzxpjjAPv+wIDAQABo4HFMIHCMB0GA1UdDgQW
+						BBTzO8Ze8XJHf1jHWJ30yMxIB1BpXzCBkgYDVR0jBIGKMIGHgBTzO8Ze8XJHf1jH
+						WJ30yMxIB1BpX6FkpGIwYDELMAkGA1UEBhMCUEwxFTATBgNVBAgTDFdpZWxrb3Bv
+						bHNrYTEPMA0GA1UEBxMGUG96bmFuMQ0wCwYDVQQKEwRQU05DMQswCQYDVQQLEwJO
+						RDENMAsGA1UEAxMEUFNOQ4IJAPAcrGLtMuPXMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+						hvcNAQEEBQADggEBAEUL4IvCbJkcFE976QP/9k+zN5aXOXIIW7CSH1KJLjvCY0UJ
+						Kzz+hzdaYIQ08DYq++SI+P0tUX3joUkPCQPCKiddGtRCaQLtvkl4Jt8S+eqC9rX2
+						l+A/wry/VIjxpntaz+A+Vwz1FEiuUAHrMAchJnuCEaGXOZ9NSLErOTD6d7e2j6+5
+						1Jy2cd/WUFGtxlhkMPD4Zax1uKiJj3Ptw1Q4pBPFKNLsyObFWL2igel2fEVGxxBH
+						AXaXuUUk8l+3BWmYoCbsZdnN36DqXqsK1NLhCCl+VIYEvr62U0B4AWlLcCfyt4Dy
+						7eK+5ZFB6MaRVtCwdykxbQQXWNv60u8dwrbkTqk=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIECTCCAvGgAwIBAgIJAPAcrGLtMuPXMA0GCSqGSIb3DQEBBAUAMGAxCzAJBgNV
+						BAYTAlBMMRUwEwYDVQQIEwxXaWVsa29wb2xza2ExDzANBgNVBAcTBlBvem5hbjEN
+						MAsGA1UEChMEUFNOQzELMAkGA1UECxMCTkQxDTALBgNVBAMTBFBTTkMwHhcNMTQw
+						MzI1MTI0MTI2WhcNMjQwMzI0MTI0MTI2WjBgMQswCQYDVQQGEwJQTDEVMBMGA1UE
+						CBMMV2llbGtvcG9sc2thMQ8wDQYDVQQHEwZQb3puYW4xDTALBgNVBAoTBFBTTkMx
+						CzAJBgNVBAsTAk5EMQ0wCwYDVQQDEwRQU05DMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAprLbGmrldyPqbXlk5Y2mE78VYdLbsn6/LtQEVO4UNuYU6kxK
+						hy38FDjZ20Zrsgjz4fspJxP08yjeyw2qGGVcZXJRZAlJ3IRhjLlq9cZi5t5XDA4A
+						HfD+LSzUFmllZdNRS6oOceLXRkR7BYeHVeMYQHLTc6SABjCSs9oDpGwlxj8iHqbH
+						P50zh7PxBNxRv8PlEgsWEgGZ5Vgk1U1sT0490t7VB7ksqO+ka0BLQORPmZj7JNiJ
+						On20X7w/fXeSTcOgRcoGhf9d5QaOU/k7yP4BPXx1fX6gPsPM63zJzvtKfD/3WCdj
+						tqHHhEC1IP6eYzM3PJNa67N0HMiwzxpjjAPv+wIDAQABo4HFMIHCMB0GA1UdDgQW
+						BBTzO8Ze8XJHf1jHWJ30yMxIB1BpXzCBkgYDVR0jBIGKMIGHgBTzO8Ze8XJHf1jH
+						WJ30yMxIB1BpX6FkpGIwYDELMAkGA1UEBhMCUEwxFTATBgNVBAgTDFdpZWxrb3Bv
+						bHNrYTEPMA0GA1UEBxMGUG96bmFuMQ0wCwYDVQQKEwRQU05DMQswCQYDVQQLEwJO
+						RDENMAsGA1UEAxMEUFNOQ4IJAPAcrGLtMuPXMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+						hvcNAQEEBQADggEBAEUL4IvCbJkcFE976QP/9k+zN5aXOXIIW7CSH1KJLjvCY0UJ
+						Kzz+hzdaYIQ08DYq++SI+P0tUX3joUkPCQPCKiddGtRCaQLtvkl4Jt8S+eqC9rX2
+						l+A/wry/VIjxpntaz+A+Vwz1FEiuUAHrMAchJnuCEaGXOZ9NSLErOTD6d7e2j6+5
+						1Jy2cd/WUFGtxlhkMPD4Zax1uKiJj3Ptw1Q4pBPFKNLsyObFWL2igel2fEVGxxBH
+						AXaXuUUk8l+3BWmYoCbsZdnN36DqXqsK1NLhCCl+VIYEvr62U0B4AWlLcCfyt4Dy
+						7eK+5ZFB6MaRVtCwdykxbQQXWNv60u8dwrbkTqk=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-logout.php/eduCONF"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-acs.php/eduCONF" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml1-acs.php/eduCONF" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-acs.php/eduCONF" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml1-acs.php/eduCONF/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">eduCONF</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">eduCONF supports and facilitates the use and adoption of videoconferencing, simplifying the videoconference experience and reducing operational costs. It enables further integration of the NRENs’ videoconferencing services within a coherent service, reduces travel costs, environmental impact and increases the awareness of Partners’ videoconferencing services across Europe.</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="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="commonName" Name="urn:oid:2.5.4.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="eduPersonPrincipalName" Name="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="en">GÉANT Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT Intranet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>eduCONF</md:GivenName>
+    <md:EmailAddress>mailto:support@geant.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>eduCONF VC Team</md:GivenName>
+    <md:EmailAddress>mailto:educonf@geant.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..0f2dd88e
--- /dev/null
+++ b/swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edugain-group.cesnet.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-23T11:20: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/sp-group/aa.cesnet.cz</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edugain-group.cesnet.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">eduGAIN Group AA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">eduGAIN Group AA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Attribute Authority for eduGAIN Group Sevice.</mdui:Description>
+        <mdui:Description xml:lang="cs">Atributová autorita pro službu eduGAIN skupiny.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://perun.cesnet.cz/apps/edugain-group/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://perun.cesnet.cz/apps/edugain-group/</mdui:InformationURL>
+        <mdui:Logo height="87" width="293">https://perun.cesnet.cz/web/img/logo_color_shades.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>
+MIIEqTCCA5GgAwIBAgIRAKTDcyjAM5LIjbwt/gIRhBMwDQYJKoZIhvcNAQELBQAw
+ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
+CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
+IENBIDIwHhcNMTQxMDIxMDAwMDAwWhcNMTcxMDIwMjM1OTU5WjBFMSEwHwYDVQQL
+ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxIDAeBgNVBAMTF2VkdWdhaW4tZ3Jv
+dXAuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7h40
+7VUKwoW/zRyupdmroy6rSeb0t2szy683Ac8zJbFQT7lMEE4LEpBF40CxitQN4zkq
+6rZ1avCDfgUA5UOCqDRsDZiVhVZVHTUsewOWnA4I5cI38oKsi7Ai9eSTmgcWVaeS
+EjluoKZW2ycVmABMGLbOLo1odikKDCmXniNZLYRbXH6mGQrZ4bWYW6vXyGJJAyu7
+i5oJIYXv9G6Ok9PZe/nfs2vlU7D3sUFjBOGeTAarwtDdpEb+MzznB+Y49tF6u9f+
+2LWAVV7cQakXx6RATzcbkNcfCV21z9M4UCzQUbMPYfmkT2MT104L9kOcPIWGdA8z
+x0TdmOaFHJHLhqRjLwIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUW9CKHJoyW+C1
+3ZZUG+GGKLD9tr0wHQYDVR0OBBYEFPxW7rdUfjv3tljZIZesDtk45SGsMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NM
+Q0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRw
+Oi8vb2NzcC51c2VydHJ1c3QuY29tMCIGA1UdEQQbMBmCF2VkdWdhaW4tZ3JvdXAu
+Y2VzbmV0LmN6MA0GCSqGSIb3DQEBCwUAA4IBAQA8oL553U23dlBWyYfRp1HzcDSy
+tl/UlWh8FSjUi9CIrCkIzfjUgwZeAYOTTQ/Hszl8EtxxdY3WPqDmtm5VkL8KyMqk
+Pnndn1ebFpK5vLjI1304TNRsR4iZU9/ntNREeaSVzAA135kSnfz+F3KiDMpmnjkB
+58KT0EUE/YEv8hAOyZpOAt/cXwkkKUvlcArIrexXGhFDG5S6Iy9KHzDJ9fJDbAcn
+fmkgS5Dai/VEkvtdEN4d2BpXZHCC8EGPQQLU6ajpoe+P+ls7oLfM5B+rH9/EBHXJ
+cU/I3dCI+bvdo7O6bNqXqahLqhpBXuEaFFzDuT+6kbx8N9SRf0urvUNlejHQ
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://edugain-group.cesnet.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edugain-group.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</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">CESNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CESNET z.s.p.o.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cesnet.cz/?lang=en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michal</md:GivenName>
+    <md:SurName>Prochazka</md:SurName>
+    <md:EmailAddress>michalp@ics.muni.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Slávek</md:GivenName>
+    <md:SurName>Licehammer</md:SurName>
+    <md:EmailAddress>slavek@ics.muni.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml b/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml
new file mode 100644
index 00000000..f927c78d
--- /dev/null
+++ b/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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://edugate.heanet.ie/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T00:00:00Z"/>
+  </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://edugate.heanet.ie/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://edugate.heanet.ie/Shibboleth.sso/DS" index="0"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Edugate Resource Registry</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Edugate Resource Registry website is a central administration tool for managing the Edugate federation and additional bilateral relationships. This website also serves 
+The website will process your userid, name and email address to authorise access. Further data is used for the Whoami section of the website for troubleshooting purposes only and this additional data is not retained after you logout/leave the site.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://edugate.heanet.ie/rr3</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://edugate.heanet.ie/rr3/p/page/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="108" width="306">https://edugate.heanet.ie/rr3/logos/edugate.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFbjCCA1YCCQCB0T3DNIZANDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJJ
+RTEPMA0GA1UECBMGRHVibGluMQ8wDQYDVQQHEwZEdWJsaW4xEzARBgNVBAoTCkhF
+QW5ldCBMdGQxEDAOBgNVBAMTB0VkdWdhdGUxITAfBgkqhkiG9w0BCQEWEnN1cHBv
+cnRAZWR1Z2F0ZS5pZTAeFw0xMDAzMDUxMTEwMTdaFw0yMDAzMDIxMTEwMTdaMHkx
+CzAJBgNVBAYTAklFMQ8wDQYDVQQIEwZEdWJsaW4xDzANBgNVBAcTBkR1YmxpbjET
+MBEGA1UEChMKSEVBbmV0IEx0ZDEQMA4GA1UEAxMHRWR1Z2F0ZTEhMB8GCSqGSIb3
+DQEJARYSc3VwcG9ydEBlZHVnYXRlLmllMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEA01w+k8x58Sqqs+X0a/vScGc2g4BMBO0KE9lXujcNpXX+fwkzAhLK
+kQuvMtp0sSn7/WrsGa5MNSm5Z6+U3yGV3VCNRlUuiPdPe4zzXaMV3lPGDPNZeSTD
+BMlDXGALtzWBlAriQhctfvjamBRYwXrC0KDFkUCNu6DphR8bjBHhWFx9V20oQ75o
+3wLC7irMa09JkJpc82SVg3PqJ3ogt9Y0BTuqUgoiSGZIoTCsLrkLUotSZOkzxRQq
+u3nVL7cEFEWRmVEkaD3qjq6epo4EHDSUO6HB6WCV5gDccgGb0A5yCIvQY7SjEaaY
+hKmVMixwdki44+hNFPP5Qv+4A5NPxUVlAB8WzdRsrTTc4wDW4XDDAF7+0NmNZECc
+wN9/tLZROATQiFg6Fsmzar39DZos5EUo+4L/ozL8yBXOqdTwrTKKwrWmaQQTDpO6
+ASxGFWyXFbWIoun6/iUSpSgTnjRpgTnGVwFRmMV3bI7jd3egNemNhHZgwQ8js88N
+eQK2Uq3kjNa33NSEjpFNYShR7Tg4d8OUmdCdR3olakF/W6huToc46Skfp783+yqo
+L6qQ5xwL6XCeeB9EFtuGyy/J578W70Y5N0QnlIO14ShfBhMH9DL+wxidVuriJlrM
+mx130sELvNIpPJHf4gXpGAWDhxn2QqMAu1QK0+EueWfZTddglzRrk70CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAgEAhImtRqXMbxZNIog0TgaQvy62DFtbABS0FCM/xMGo
+vuY5l7YF/ot5SNE4MqWYX1pyOQRVIELuvNByH+FLKDmF6jyU9U0c8w9c6Uhf7Zs/
+0lgIfpR8LGvTHiNjbSuy6aCK+0JxGugaZZloSmGkIir9Yi6MQr8HOLdCkRYCISZQ
+pdGJFTwwDEoUDVr0szV4Aupm3wI/MtU80clwrHiVVyY0BoHc63gZ6j3Bn2BiuIb8
+pnxV3nwDnU9pSxkaBAH8Mo6zTo3dM9kdfdXlKvU3VIZ60O/Y8E2FZIKgqUK3enab
+YnX59OpeUExsaEUYRav5CQQlnNoYTOfG5E/foM4ojZhDv8hfeJmnvTjlDvQF4IaC
+WzziDM/1e/mGLjUHShbjv+OaxWBOwQjmPrsqEHTg7iTMTxuHfxnIVnv5/efknDiA
+9QPAVCY5BHH61FMxYfEoIhnLc3qSBGhx1keledDoXRzTyycfZi88Dj2YDBzLCbbT
+KxocVWR5wlAkMpxpFHsLIRp+XYNdc1cG6NQO4eHwoAJ/y1qdGssA9RR9/TEnlKMT
+mUavwgBEqGeMh1w0GwTmXGruoBOZMJNks9WzCmp+3QKsVCjZd/KIxHITq+jNeFRf
+LzMJnF1row2YXqF4AYDluUyCMPo89glxvlX9lDJ3TW5Xz4OJWqrz4WvEyWJIAMZy
+UBY=
+</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://edugate.heanet.ie/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edugate.heanet.ie/Shibboleth.sso/SAML2/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edugate.heanet.ie/Shibboleth.sso/SAML2/ECP" index="8"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Edugate Resource Registry</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The Edugate Resource Registry website is a central administration tool for managing the Edugate federation and additional bilateral relationships. This website also serves 
+The website will process your userid, name and email address to authorise access. Further data is used for the Whoami section of the website for troubleshooting purposes only and this additional data is not retained after you logout/leave the site.</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="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <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="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: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="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="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="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="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: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="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="ou" Name="urn:oid:2.5.4.11" 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="eduPersonPrincipalName" Name="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="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" 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="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="freebusyurl" Name="urn:oid:1.3.6.1.4.1.250.1.57" 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="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="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="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="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="RCSidNumber" Name="urn:oid:1.2.840.113556.1.8000.2092.3.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="awsRoles" Name="https://aws.amazon.com/SAML/Attributes/Role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="awsRoleSessionName" Name="https://aws.amazon.com/SAML/Attributes/RoleSessionName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sAMAccountName" Name="urn:oid:1.2.840.113556.1.4.221" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HEAnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">HEAnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://edugate.heanet.ie/rr3</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Glenn</md:GivenName>
+    <md:SurName>Wearen</md:SurName>
+    <md:EmailAddress>mailto:glenn.wearen@heanet.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NOC</md:GivenName>
+    <md:SurName>HEAnet</md:SurName>
+    <md:EmailAddress>mailto:noc@heanet.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NOC</md:GivenName>
+    <md:SurName>HEAnet</md:SurName>
+    <md:EmailAddress>mailto:noc@heanet.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edugate.itb.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/edugate.itb.ie-idp-shibboleth.xml
new file mode 100644
index 00000000..9e7afee3
--- /dev/null
+++ b/swamid-interfederations-2.0/edugate.itb.ie-idp-shibboleth.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edugate.itb.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-03-08T00:00:00Z"/>
+  </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">itb.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Technology Blanchardstown</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.itb.ie</mdui:InformationURL>
+        <mdui:Logo height="65" width="235">https://edugate.heanet.ie/rr3/logos/itb.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.40572644015631,-6.378046274185181</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUWE0VPYPdB8l/5af8W6PkkZDYFm4wDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOZWR1Z2F0ZS5pdGIuaWUwHhcNMTEwNjAxMTQ1NjA1WhcN
+MzEwNjAxMTQ1NjA1WjAZMRcwFQYDVQQDEw5lZHVnYXRlLml0Yi5pZTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJg3AH4MXYhZXU7pdFdV6lhsNB0/Qjqg
+eYSiWfLoZydHcJXTJw7Tfk2/8iX/NkLiyX+zouYTuw99HJtb+oZ4WzW3vwD0pupy
+eM4eteWkGycQBoW7aE+KAH8Qrsj3xiGSv0A6Yod6wHn7KyCAmxUb7wPOCf/yuj5z
+SvxZwdQWUXRqlirDhJgLsOSedru92hVRXbo8uMvnkdkWbwggBd5UMNGPZsPRBPKN
+P+nw5Ccvw2GWCZkpel4nqoIFu+8GbJVHYOrUliVLgNcv+lL22SlmI4ahqZDHTToC
+AzfRGuYUOtkpHlBp/H3ZQLEQ/61o5HWYB7RAtQNRCMU0u145/2uJ2TcCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOZWR1Z2F0ZS5pdGIuaWWGJWh0dHBzOi8vZWR1Z2F0ZS5p
+dGIuaWUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFARmPTDY2ovy8VOaLRwUc5al
+PqZNMA0GCSqGSIb3DQEBBQUAA4IBAQAZIThM8v0IQ++IyxuLKCPziFcDdl3Cptbv
+0LHvMWnVhskz5hxqaFBIyCCXtBwsVOMMGX5gNWtUm+7l+toa3AWC6bvjzDTCU64Z
+LW30XFU05arBASH+s1VNeOVnKHunsK1PN6qDH1VrXKkREyfDNWhQDHm1TE8JlBxY
+gbKMqJzGMLYTLc7xwiEn2qRh4Yh9TaoYwBHlPVTKR0Zd+p4N1xh3Bu5hr/V3MeHD
+6H4JYebKv15gO1dpxnngMQsnFs9lUqkcoMvPsJXj81AAO2WQUK4RC8SH+CL+pzqZ
+hj8bmirIgUuG9EBuz/X57eigHOWaytDx61rjjuvtKOWT2LgfwXqY
+</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://edugate.itb.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edugate.itb.ie/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Technology Blanchardstown</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Blanchardstown</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.itb.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dave</md:GivenName>
+    <md:SurName>Curran</md:SurName>
+    <md:EmailAddress>mailto:dave.curran@itb.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Eamonn</md:GivenName>
+    <md:SurName>O'Brien</md:SurName>
+    <md:EmailAddress>mailto:Eamonn.OBrien@itb.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edulidp01.hants.gov.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/edulidp01.hants.gov.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..9ac7d71d
--- /dev/null
+++ b/swamid-interfederations-2.0/edulidp01.hants.gov.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edulidp01.hants.gov.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hants.gov.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDRDCCAiygAwIBAgIVAItvDndSZma37nVve6iWg0pw8KVmMA0GCSqGSIb3DQEB
+						BQUAMCExHzAdBgNVBAMTFmVkdWxpZHAwMS5oYW50cy5nb3YudWswHhcNMTEwNjAz
+						MDgwNzIzWhcNMzEwNjAzMDgwNzIzWjAhMR8wHQYDVQQDExZlZHVsaWRwMDEuaGFu
+						dHMuZ292LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArR3KsSDW
+						b06i0KYMDPvX86rGjYAdZ8Fk7KEb+Chx71umaIEZMZ+C0nXWNq5xO0+6XVDe0f2I
+						z5WVzoQjIlEnx84C+zxGFLHyB/1JXKslo3EZQjAcl37AROndH0ONdKgvmRS5ZM4u
+						EVo0NlWG1p2P7pz+kMfFb+mT+Bi+bcyO5UtyMZbvXD6iVax1kb1m1+r1BgHLvDP0
+						rFJCK2mzyuSJuiMxwu9WTc3jMqltnmGwWe1AyLQCaSvch1Xg3PerBFO0rPWEDWdz
+						j9We9SXGXoVlVMdx5ttrUOYQIo/p0sbqNSKslB4MaWaFZ7SwR+DdKagtAxW2catQ
+						LelvYpERLNeXNQIDAQABo3MwcTBQBgNVHREESTBHghZlZHVsaWRwMDEuaGFudHMu
+						Z292LnVrhi1odHRwczovL2VkdWxpZHAwMS5oYW50cy5nb3YudWsvaWRwL3NoaWJi
+						b2xldGgwHQYDVR0OBBYEFFHhnpqMIOC7wc8J37OSqa7W/LJZMA0GCSqGSIb3DQEB
+						BQUAA4IBAQBnwvEGRoWUVFjl3zntI4LUY7/PVNe0JSklGtE44sBSl5AwWSROkt3U
+						Q5gv2d/Cjp7Y1adDF9fF1KjrjCsv188xGXqv96C+qcED9nV9/mE25GfMAWBAn+94
+						yTsvBdA7JsVHRPBWhXzkLZkA0/9nGmn2dQx7dwTnVaDW58SgOml+WO0j5bn4hk9b
+						uxD/Qa526RvMoHEBk1cmy15UVfCvZXRewVPeKDSHy5x13rnIK7rejXRzEaWNyQDi
+						iTIi5utX40Mu6owRgH2ITRxgHg+TkWgZ09jsvvP+mPH0OwySBmEP1KShjREYY8xc
+						KVCAwfy+2kJgcyZ1eZjwKeZlIzZRW6C+
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://edulidp01.hants.gov.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edulidp01.hants.gov.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://edulidp01.hants.gov.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edulidp01.hants.gov.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://edulidp01.hants.gov.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edulidp01.hants.gov.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hants.gov.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDRDCCAiygAwIBAgIVAItvDndSZma37nVve6iWg0pw8KVmMA0GCSqGSIb3DQEB
+						BQUAMCExHzAdBgNVBAMTFmVkdWxpZHAwMS5oYW50cy5nb3YudWswHhcNMTEwNjAz
+						MDgwNzIzWhcNMzEwNjAzMDgwNzIzWjAhMR8wHQYDVQQDExZlZHVsaWRwMDEuaGFu
+						dHMuZ292LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArR3KsSDW
+						b06i0KYMDPvX86rGjYAdZ8Fk7KEb+Chx71umaIEZMZ+C0nXWNq5xO0+6XVDe0f2I
+						z5WVzoQjIlEnx84C+zxGFLHyB/1JXKslo3EZQjAcl37AROndH0ONdKgvmRS5ZM4u
+						EVo0NlWG1p2P7pz+kMfFb+mT+Bi+bcyO5UtyMZbvXD6iVax1kb1m1+r1BgHLvDP0
+						rFJCK2mzyuSJuiMxwu9WTc3jMqltnmGwWe1AyLQCaSvch1Xg3PerBFO0rPWEDWdz
+						j9We9SXGXoVlVMdx5ttrUOYQIo/p0sbqNSKslB4MaWaFZ7SwR+DdKagtAxW2catQ
+						LelvYpERLNeXNQIDAQABo3MwcTBQBgNVHREESTBHghZlZHVsaWRwMDEuaGFudHMu
+						Z292LnVrhi1odHRwczovL2VkdWxpZHAwMS5oYW50cy5nb3YudWsvaWRwL3NoaWJi
+						b2xldGgwHQYDVR0OBBYEFFHhnpqMIOC7wc8J37OSqa7W/LJZMA0GCSqGSIb3DQEB
+						BQUAA4IBAQBnwvEGRoWUVFjl3zntI4LUY7/PVNe0JSklGtE44sBSl5AwWSROkt3U
+						Q5gv2d/Cjp7Y1adDF9fF1KjrjCsv188xGXqv96C+qcED9nV9/mE25GfMAWBAn+94
+						yTsvBdA7JsVHRPBWhXzkLZkA0/9nGmn2dQx7dwTnVaDW58SgOml+WO0j5bn4hk9b
+						uxD/Qa526RvMoHEBk1cmy15UVfCvZXRewVPeKDSHy5x13rnIK7rejXRzEaWNyQDi
+						iTIi5utX40Mu6owRgH2ITRxgHg+TkWgZ09jsvvP+mPH0OwySBmEP1KShjREYY8xc
+						KVCAwfy+2kJgcyZ1eZjwKeZlIzZRW6C+
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://edulidp01.hants.gov.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edulidp01.hants.gov.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Hampshire County Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hampshire County Council</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hants.gov.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Reynolds</md:SurName>
+    <md:EmailAddress>mailto:Andy.Reynolds@hants.gov.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Wigley</md:SurName>
+    <md:EmailAddress>mailto:David.Wigley@hants.gov.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eduroam.frizerska.si.xml b/swamid-interfederations-2.0/eduroam.frizerska.si.xml
new file mode 100644
index 00000000..8d32e251
--- /dev/null
+++ b/swamid-interfederations-2.0/eduroam.frizerska.si.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eduroam.frizerska.si">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-12-16T12:12: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frizerska.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Secondary  Vocational School for Hairdressers</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">Srednja frizerska šola LJubljana</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Secondary  Vocational School</mdui:Description>
+        <mdui:Description xml:lang="sl">Srednja poklicna šola</mdui:Description>
+        <mdui:Keywords xml:lang="en">Hairdressing, School, Ljubljana</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">Frizerska, Srednja, Šola, Ljubljana</mdui:Keywords>
+        <mdui:Logo height="107" width="249">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPkAAABrCAYAAAC14STYAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAOdAAADnQBaySz1gAAABh0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzT7MfTgAAIABJREFUeJztnXmcHFW1+L8zk33rJCSEfYnAQxQUUCBQkFGgpIFBkCVTEvHRPluIhEVAEURWgzzBH0JAHLFZDFQHF5YGG0qQ7bIvyg8EDfsaSMjSTJYJyUy/P86t6Zqaqp7uYSbpGe/380mmu+reqlvdfe4999xzz6nr6OigFikkUxsBbwOvJfKZXaqtr2xnC8tz3+37lhkMA4v6Dd2AKArJ1AjgPaR9e1RTV9nOTsp2FgHvKNvZqT/aZzAMJNaLkBeSqTGFZOoz1VQBhgEPJfKZtkorKdv5HfA3oAPYGni/qoYaDIOQIevpPm8BJwKv9VSwkEy9jAj4u8CsSi6ubGcX4HZgCjAU2BFYZnlua28bbDAMFvpdyAvJ1F8QwbungrJzge2AIrAgkc+83lMdZTs7IgK+LdKZ/Nby3B7rha4xFtja8twXq6lnMAwE6vrT8FZIpiYBbwCLEvlMWXW9kEztC9wJjAdWAhsn8plV5eoo27kLaARGIyr+Dy3Pbamkbcp2JgC7ALP1NRLAcZbnupXUNxgGCv09kr8BjAGurKDsQ0Cdfv1CBQKuECEdDXwC/KQSAdcj/y8Qg94YYCSwENgXWF1BOw2GAUW/CXkhmToEWKrfPt1D2esRFb0OmYufGVdW2U498ADwZWTu3gGssDx3brl7KNvZB7gOmbdP0IcXAXcAp1ueu7CHRzIYBiS9EvJCMjUWaO9htL0U2ApYAjxe5lpbAl+nZOl/P5HPqDLXfReYhMzzAZZanjs5rrCynT2BLCLcI/XhT4C1wDGW5z5U5l4Gw4Cnt0to44CVhWTq21EnC8nUVsgcF2BUIp/5sMy1bqQ0srYCsSOysp3T6SrgrwDfiim7ubKdVmRJbRtKAv428CAw3gi44T+B3qrr4xGBHBtz/khgon7997iLFJKpLYAvhA7/Iaqssp3jgJ9QEvBW4EzLc7tZ7ZXtHA9chsy5g3yAGOfmx7XJYBhs9FbI/wsxeNXFnP8fYJR+HauqAz+m1BkAPBHl/KJs50vAuUjn4rPS8tw7IsreCBxNaeQGWIV40O1lee7ScB2DYTDTWyE/GFH1u6n7hWRqGOJtBtAOPFnmOicEXi8n3gp/AbJ+7vMeYIULKdvpoHvHswK43PLc88u0w2AYtPRWyL+q/w6POLcNIlijkSWpt6MuUEimdkGs75P0oXbgkXA5ZTvTEEu6z0rAtTz3zUCZrYH76C7gi4ADLM99odzDBK7je8vtjCyx7YxoGpORZx2CrAIAzLY89+ZKrmswbEh6K+Tb6L8bR5ybSlcr9rKYaxwKbBR435bIZwoR5W5DhMynHjgrVObNiHpvAU09Cbiync2B04GDEA1kFWI0HBpRfBlih3gM+LjcdQ2GWqFqIS8kUwlEtZ4A7BBRZFtkFAcZ9VbGXOprdB15rw0XULYzFVgXOLQEuMDy3PZAmbwuE3yWfwNOnIAr22kATkGMc8uR1YIGfXpUoGg7ItgrEWed3wBPWJ5bm/tzDYYIejOST0BGaIDtY877AlMfKBvm84HXBaKt8E3I+rbPCstzr/LfKNv5OrAXXZ/jFeBky3MjrfrKdtLI3H8t0slMiCi2GBHs24FfBacGBsNAozdCPoLSCBw1kq8NvO4gfi1+fKjcUxFljqXUxtXAFf4JPQ+/PHSdhcBJlud64Qsp29kGUbPHIPPrsD3hE+S5bgUuszz3HzHtNhgGFN2EvJBMDUGs13cm8pnvRtTpoGR8WlFIpsYk8pkVgfNLEDXXH82HxdzjTuBwfWg4MpqHCRrc1gBB3/RfIh51Pq3AOTECvhcyt98k4h4rEBvCTOBPRhU3DDaiRvJ2xOJ9LBAl5KvpOpc+EBEgn9cRgZ2oy42mO5sihi6f+kQ+00WtV7YzBfiIkvX9SctzV+lzDYjhzjeOdQDzLc+9PnSN7YEtEbU77LizRrfzKstzL45oo8EwKOimSifymSLwErBWG9nCFCh1DuMAO3R+ASJ0ICPkFhH3eIeu6nKUBX4rSp3JMrquof+MrtOC9y3PjeqQDgDup7uAvwtcYnnuFCPghsFO3Hz5Y2SUnBY+kchnPqarl1qqkEzVB86/T2n0HgnsGXOPxYHXUVs8N0Pm/yDTg+CmldMC91iEuLt2QdnOecgmmSBLEIPaVyzPvSCmXQbDoCJOyD9CBPSMmPN3BV4X6O59FnRlPTTmGi8HXke5x25EScjfsjz3YwBlO5si82+ff1mee2OworKdSxBvuuAI/gpwm+W5YyzPfTWmTQbDoCNOyN/Qf7uN5Jo7EacREEeV8Eh6CiVnkbhoq8EdYFEbXcZSMt4FLe/pQPmVwCHBSsp2hgE/oKuRbTHioRal0hsMg5q4JbSnkHl1RyGZshP5TNhi/UdgDiXHkd0KydRGiXxmCUAin3mxkEz58/IVhWRq10Q+E163vh8J7jiZrp5vPr4Fv42uHcIMShb76yzPXUFXCoHzRWSl4HO+JlANLU3NkxDvt1GUjHxrkelFK/BxOpc10WQMNU2ckL+LzF8nI5bpoBcYiXxmWSGZegw4TB+agBjDghtOfoIsc40DTgXCe8+foSSMqwvJ1PBEPrMmcN4XnhXoKK/aqr6NPv4hshe9E2U7j1HqHNqBV4GvVSLgLU3NGyMrBTOQUFDjkM+gqP/5Wo+/CaYOGN7S1DwWeAfZxvo48E/EcPlMOpcNPo/BsEGIU9dfpDRPbi0kU00RZVKUVPJ64OhCMhU0yF0TuP5x4co6qow/N14FhAM9tlLySvMzoWyLuKGCRITp1A6U7UwGPkvJb34hsrX0rZhnBKClqfmYlqbmBYhwXod42Y3XbZ+M+OdP0a8n69cb69fjdPu2QqYlp+jnvgtY0tLUHBlUw2BYn0QKeSKfWUppJN0Y6BbBVKvmweQFE4H5gfNFxHC3ClhXSKauoDuXIh3FeOAroXPLKK3J+yPiFohVfS3wo1D5pyl5v70H7GZ57nJiaGlqnt3S1FwErkfccydRMvQF8f3Xl+tnWY5siFHAX4DfI4J9JfD/kMg2tyCecxXtfjMY+pMhhWRqM+DjkNcaiAD+L1pVLyRT5ybymYtCZXZB5sD+6PmFQjL11UQ+8zeARD7zq0Iy9TNkWnACorYHuR24QZ9vBK4OnPsIcTUdQsn/3UKMbouATrdTZTubUFrWWwgcZnlucImuk5amZgu4l1IHNypUpBWZRhQQJ5+/ISsB7wGt6Vx2LQbDAKIeMaL9POJc0IV0NPD9cKqjRD6zFriK0og+GbijkEwFt2keiMxXhxaSqbMi6t+IzHkPLyRTwaW0AjKK1lOaZ++AjOzrLM99J1DW92hbiWwoeS7qYVuamrOI4I6i66jdqtt4E7A3MDqdy05J57InpHPZW9O57AvpXHapEXDDQKQeUXOPKyRTXdaztQCei1i3Qeai/w5fIJHP/AhRp331fhRicPPPP46MhuuAWYVkKrymfi4i0MuAZOD428hmknZKBkI/HtwzfiHtl+4vl31oeW7YAQaAlqbmVcA3KLnJrkU0hFuB/0rnspumc9lvp3PZF9O5bHvUNQyGgUg98iNfA1yvQy13kshnfomMcJ3lC8lUVBLBHRCh8UfeIwvJVKfqnchnjkVG4C2B34XusQQJ8DAZOMI/bnnuJ8g0oEjJCj8FEczfBy5xDBLsYTmwf7hhLU3N9S1Nzcv1tYZS2t9+RDqXHZ7OZWekc1kTc90waPFH8lGIpTjK1XM7RHhBBHWjQjJVDBZI5DPrkKWt9xCh3BQ4sJBMHRO6zvvAloVkKuw8sxeiMRwbOv68/uu7sPoplJ4DULYzBFlrB7gvvO+7pan5aGR5K0FJ5Z+XzmXr0rns3RHPajAMOvzdX28io2UqYjRvBy5Cdpehy60uJFNPhsotQwxxTyNrydsjSQ38828jeceWA+lCMvWFwLk2JL7bukIydVTgss8iXm9jlO3U6ddFSstoKWRkX6qv3UlLU/MuiOFwM8SC/wst3MG1fINh0FPX0dFBIZn6HrIENAzIJfKZw8IFC8nUscC8wKF1yDLSt7UAB8s+hwREHIn4jO+vd55RSKYuAk4G/p7IZxpD9YrAvYl85iAAZTszEYv7QYjALwVGWJ47RJ+/F9kFd7/luQf41wk4qCSQkf+AdC77RPiZWpqaJyDhpZuQJbyNEe+7kej0S4i94EPEmv8goq0sSOeySyI/UYOhxvCFfATi3z0G+UH/NpHPnBsuXEimxiGjfjBk0mvAIYl85t+hss8io/lY4N1EPrNl4FwWEdzrE/nMaYHjJwIXA9MS+cwCZTtfRPKeHYG42i5EjGs7KNvx2/wxcJTluZ2bYlqamtuQrayLga3SuWyXWO4tTc1HIkEi9tHlxlX4eX2CCL2/T/5vSMd3P/BROpctlqlrMGwQ6qFTXZ6LjF5TgB8WkqmR4cJ6m+lnEacQf57+GeDBQjK1X6js7kgmlZXAFoVkqi1wrhmxkM/S6Y19bkRCNO2m3y8EHtXtGop0Qv404TDd/o9CAv4CYo3/azqX3Tgo4C1NzZY2wl2NRKXxvdYqZZiuMwkZ7Q/RbV4ArG1pan6opan5qy1NzbG52QyG9U2X/OSFZGoppVH6Q2DPRD7TzS1Uh286B/ghJWeSNsQD7OREPvNeoOwYxH11HGJF30l7w1FIpu4GXk3kM6f01FCdT/xmZLvob5XtPIsY+/b347G1NDXfgFjbR6Zz2c4195am5nogh4ST6kkA1yId0zpklG+gtBuuXR9fp1/XIevtwXRMK5BOcBnif3BrOpctm4bZYOhPwkJ+PHA+pdhpS4DZiXymm1urLr8Rok5vTWlEXAh8J5HP5ENlr0OWuDYFjkjkM3mtLYzQRruK0RtV1iHhmc8HaGlq/j6yOjAmnct2Orq0NDXvBjyBCGrYjdc32g1DpgPPIir4QsRBZhmlpUF0/aGIYI9D5u+bIZ/X/sCu+v1KSir9J4jQn5/OZa+p5jkNhr6gi5ADFJKpmXRdh16OZCc5wd9KGqaQTH0dSVS4Gvnxr0EcZ05P5DP3BcodhvjBX5HIZ87pbaO1kNdbnrsWOl1VfwdsDkzwPdNampr3AP5E1xBUa5F5/BNIHPUX0rnsm71tSxitNYxHPOd2Rub+OwBPpnPZbqmdDIb+JkrIt0SE9V903ee9BLgD+HEin1kUvpB2Sd0TmdtvhcxbFyEj/cWJfOafulyDXpbrM1qamj9GrN5HpnPZl/QxhcR29+PUrURG4mOAR9O5bFXaw6ds31RgRTqX7fa5GQz9TV1h1lnDgdPGzp3TxX9d5xj/N6Lm+r7o7YjF+hHgh4l85s2oi+q65wAOpf3YNwNXJfKZf/XlA7Q0NX8JOBsR8KI+9g/Eu24istGlDtg7ncsu6Mt7GwwDgbrCrLPeoaG+jfaOTcbOndPFEaaQTDUA/42otb4hymcJss/7auBuHcCRUP1hiKfbcUg64UP6WsjDtDQ1v4TkY2tARu/L0rmsichq+I+lrqOjg9bZZz/IkIZ9WNu+ZOzcOd0SEGhV/FxE4CdSCpYAMrov1++vRkI1qVCUl35Hz79vQua/i4E70rlsen22wWCoRTrn5K0nnb2YoQ2TWNu+Ath/7Nw5UWmLKCRTmyPupCcigj0UWXbzLdetyChaQNa87wGeS+Qzkds/+4qWpub5yLbWdYCdzmVNmiODgaCQn3zOMDqKK+qGNQwtrut4m2LxmLFXzXmyXOVCMjUFmfvugSwh7Y4Y3DoQYfP9zYcn8pmoXOZ9RktT81HASelctrE/72MwDDS6WNdbTzr7CobUO9TVbUx7RyvF4kMUSY2dOycyykoc2k12NDLCj0fcWj8oX8tgMPQH3ZbQWmeffRb19T+ua6gbV+woQnvHCooUqONWijyAbDh5b+zcOa2RVzQYDDVFNyEHaJ199oXU1Z1UN6R+AkCxqP/rYDUUWykWh1FkPOIZtpw6FiKW9o8o0oqsj6/Q/9YgXl+vjp07541uNzMYDP1KpJADtJ509peAx2iob6W+bmJdRCKjYjHmTbHzbzsU19FRXAtMrVbtNxgMn55YIfdpPens2cA3gT2oZzHUDYO6EdQFHGSKrIHiJ1DsoMhQigxHfMJfQ3zBc2PnzglnUDEYDOuBHoU8SOtJZ09FrOebIvvE6xBf8GWIar5I/1s5du6cdeH6bfPmjxgxc0Zb+LjBYOg/ugl527z530Us47eOmDkjKmhjVbTNm58AvoVsu1wMbDdi5gwTDdVgWE9ECfmHiJCvRvaKv4l4sd2JBGJ8F1g+YuaMbipA27z59ciy2WeQ8MoOMuqDxIjbD1gzYuaMT8J1DQZD/xCprrfNm38Rkv53BCVPtjZki2YDoqqvQ7zb1iH7sUdTCnk8VL/3s5HMGDFzxh39+SAGgyGa2Dl527z5w4BLgO8hG1PiMqBGsRRZNjt9xMwZt3zaRhoMht7To+Gtbd78EUiYp58ic+pRSLgjf4QvIiN8K6Ka/wpoGTFzRrdsKwaDYf1TlXW9bd78LZEoK7siAR+LSNy2N4GFI2bO6NdtpAaDoXqqEnKDwTDwiMxPbjAYBg9GyA2GQY4RcoNhkGOE3GAY5FSz9r3eULYzCTgJCQL5T+Aay3MLZcofjXjZ+SwH7rA8NzbvuLKdM4h+/lWW514ZUf4UJDUSyKrCCuDvluc+VuYepwB1ludeEXHvhyzPfTqubqj8LOAly3Mf7KHcl5EIPXdZnvtiJdeuBmU7ewGNMacfCqarCtSZTSn1dBHxmvyz5bkrw2UDdWbSNVY+wMNxn7Wyne8QnxnnOctzvYg65Z7Fszy3W7gyZTv7IfH0fdqAey3PfTnmOn69LYFZyDM9A7RYnru6TPnjgYWW594TOLYPkpzzestzY3PuKds5DfkN/8Y/VnNCrgX8KWQt/nng64CjbGcvy3Pj0g39N7AvspzXgKRPulTZziGW56qYOhchncFHoePLkAyvYY5CcrR9grj2jgSmKtu5AzjGT/QQ4lxgI2U7D/qpnDQXI2GkKxJy4CzgFiSrajm+D3wb2UR0RoXXroZG4GfASxHnlgDdhBzwc9EvQpyqpgLnK9uZbnnuuzH3+RrwRSQoZysSt2AZEjMwikORASHIZGSZ96sxdRqJf5Y3gaiYhAci38W/EC14c+AyZTvfszz3d1E3UbYzFUnk4SccuRQ4XNnOAZbnxu3hOAWRgXv0NYYBLcAHwPUxdVC2sy3wS6Bd2U7WHxhrTsiBMxEB/5zluYuV7eyMpC/6LuJoE8cjluceAqBsJ4HkZbte2c4OZXq+yyzPvbySRlmeu6+ynceBVy3P/Za+z0HA3Uhu9F/GVG0HmpHUx/3NdESYGvvxHistz925yjrXWp57HnT+6BVwGfK5dCPw+b4K3Gl57g/KXdzy3CPCx5TtPAi8a3nuA2Wq9uZZPvLrKNsZClwLzFW2c5fluR9GlL8Q6aB2szx3pbKd/ZGMREcAf6zwnj8CtgUOLzeKI9/7MkRzspDfZk3OyRuBeyzPXQxgee4LwK8pJVbsEd2DXYH07p/thzb697kH+SC/U6bYA8AMZTsRYTf6DmU72yAazK+AL+qOruawPPd1JHT2of31mehpy3SkI+k3tPY2B9njcWBMsekEpieW596PJBqZWMk9lO3sgGh9F1ue+0oPxacjHehzBDr6WhzJGyglGATA8twes55G4Peqk8qW+vT8FfnBTrA8Nyr10oOIh+BeRKuzfUUjYie4Fhk99gXu6sf7fRoWIaPNSCQZZF9zBjJ1q3Sk/DT09DtrQKIXd2J57sxKLqw7wd8gcRV/UUGVRmRAnExAyGtxJH8MmbN87lNexzfcfOo98T3wChI8Y2rM+SLwZ2BGP7djOvCk5blLgRf1+1plc8QeEmt86i16OnAkcIXlud0Cl/QDPf3OHgO+pWxnq5jz5Tge2Z6djrH5dKLn41sDj+p/uyrbGQe1OZJfCBwAPKFs50fIfK4q31ttqDgRsUi/Wqbonsp2/ifwfp3luTdU2V7fcBfXkw8BssDvle38oNpnqYJGRA0G+ZIb++k+Q0OfGcDLluc+WkllZTtTkDgDuR7ml73lVMRYF2kICxH1LE9Znvv/K7mRHmlPRrSR+2OKnQk8DDyrbGe25bnZSq6N5DD4BvBry3OfqKD8dMS49wyS5LMB0eburjkhtzz3I2U7eyJWyCsRy/pxluf2FOl1T2U7DyCj6vbIgyZ7qHMQ8kH4tAE3VNlkPx1UueQRD+l2TUfm6H1KYD7uC9qjwPeU7STKLT32kuHIykSQmwL3juLbevlpCJLOeTkyz+xTlO1MRLL7XGV5biUhw6Oe5WKgnJBP1L8zkFz02wEnWJ4bmdbb8tw3lO3sjtiIXGU7xwLfsTy3pwy3WyJTmtd6KOfTCDxreW4b0KZs5xXk91Z7Qg6gv6BZynauR3KlP65sZx/Lc8s98MeIBXt/JKHDFyswVFxQqXW9DHWhv92wPLdd2c4fEWtynws58mW2I0s1IMaXBgIW1j5kheW5m/ZcrAsfIN/NN5Hlx/30tKKvOREJWHJVheV78yxrkWfZGVnia7I8t6ztQwv0N5XtZJBB5DFlO9N843IMtyNLeRco2/lDmeVGn+nArYH3ndpcLc7JO9HOIvsi89o5PRR/2fLc0xB1bRSSm3x9MEb/7Wl+mQWO1MsukWqqsp0tlO30Zi7diAj53cp2HkGst0X6dymtGu7V383liENHn1v+le2MQByobrE8tz/tMK36WWYimt+elVa0PPc+ZI69CfDjCqpcBrxHD51WQJP7hrKdR/Rv4CvAbsp2xtW0kAPo3u4WKjQkWZ77N+BJxGlhfbCZ/tuT+vU4Yv32kzJGcRRira+W6cgorgL/nqF2hNzn18h8uT8cdWYizi+fVjOrCMtzfceU7yvbGdtT+UC915FVjx5/z5bnfoL4YByubOfrZYo2Ip38nyh9/39Ga3M1JeTKdqYq23lH2c4BoVNLKT/nDfNzYA9lO3HeTn3JrogKVzYSjjYyzUdU9jhLaRvQoGynIXR8tD7XDWU7WyOOEpdbnvtj/x+ylNZpYa0F9DTsauB4bYDrE5Tt1AOnIxpDn7vzluEyJN7h92LaNU3ZzkJlOzuFTlX8e9ajfxa4StnOmJhi04HnLc89K/Ab+AHwDtBYU0KOqCYT6e6KuDviSlgpdyI+7/06mmsVsRnxda5kOWg+4qYbFmKfBcgUqlMF1B5/E/W5KBoR1Tzs8vkoJQtrLXEl0t5T+/CahwI70s/OL2H0qDwfOE3ZTpTQvoFoF18JHd+dHgaFEKcjU5wLY843Em34fBSYXlOGN8tz1yjbmQecrK2DzwMHA4cD4aWOctfpULZzKXCTsp0vWZ77TEzRnZTtHBo6tsby3G4qs7IdGwk3vbmuk9Bt2gxRsytp13PKdhYi89IoHka+/IyynVMRP/nLkc4vLtrtdODflueGffAXIDH5ptP3xrdeo12VrwNOVLbz8yjrv7KdvZGObRSyP+BQ5BnjDKlnIE4pIyO+z5VlXFuHRJQHeMHy3LcqeiBZBfomsmegJXjC8twPlO38BThP2c5ixFJ+LJLq+6cVXh/Lc99XtnMe4ic/L7h5JmJlJcijwFG1NpKDrCveh6xzPgucgyxrxDrmx5BFvJ6+UaZMCsiF/t0cU/YWRDi/ostdgyyf7Wd5bjUpoObHndDOG4cjwp1H1l6HAYeU2bW1NxFfsJ4ePEbXXVO1wuWUdwX9X+Qz3hTRfHLEOBPp5dZ9kREz/F3mgN+WacfImDqHVPog2u36LuJ/Z99BNsHMR+wk3wVOsTz33krvoZmLODkdHzo+Tf+NE/IhNRvjTdnOJoh73huW567o5TU262dLa7+gnSy2R9TaV3vYWjgaSEQ9p/ayWlzhVGK9omxnU6vMVuCBhLKdjYGl5TzslO1sgSztvtbb70PfZ3H496BsZ/soLUfbdratWSE3GAx9Qy2q6waDoQ8xQm4wDHKMkBsMgxwj5AbDIMcIucEwyDFCbjAMcoyQGwyDHCPkBsMgp+aEXO8oqvi4wWAoTy0KzrXKdlx/e56ynYOV7TwFHL2B22UwDEhqUcjPRDZovKBsZwESVvcW4A8btFUGwwClZn3Xle0cicTsOsXy3H9u6PYYDAOVmhRyVWXCQ11nN2RP73hki2WmXKxqZTvHAB2W51YVgF/vEDsDWGJ5bqaauhVefxKyT/0Wy3Pf7uU1hiKBBv4SFV5Y2c4EJJrJ/GAUXL23eqLluTdF1EkCXwgc6gBeB27vYffVTOBjy3Pv7M2zBNo1wfLc3/dQbgqyFfN5y3PzZcolkAHkzWCIZGU7k5GtoTdbnvtOmfr7INtb/2x5blwwj5qh5tR1VUp4OAvZI3w28Iiyndg0Scp2DkZinB2MBJi/Cri9B2Pd8UinUC2fR/Y7X60jw/Q1U4BLiE/WUAlD9TV2jzk/SZ/fPnT8GORzj2IaEs3lZ0g8tdnIFOoRvd01jhOIyXlWBTPKtCtIEnmuuAgqPhN1uRZlOyMDxzfRx7ftof4PdDmngjZtcGpOyOma8PBAJOjBjshm+27oPbPXINFPdrQ8txGJiPk1+sdYNx2JuDIMSX30H4HluT9FYoevtDz385bnbol8FrsiWkMt0IgE1Ny1wlxwo6giQAR0anL76fvUcpaaTmpRyBupLuHhfsjofYGlU8HqjBP3ICNOf7TvPiTax4D4kvsLy3MfRuLIH7Sh26KZjgSKLFJZbLsHqF7L+DyiCf0KmBYT262mqEUhj0x4aHnuJTHl90YSKzwfOv4kfTzS6l58OqV8U419ef0BSisSymmDEoh15iG/hUo64D8BB1cZ0bYRGcVvQJ675rW5WhTyahMebgu8ExEi6QNgUjUxsSvgc0gv7gv5Xv00Lx8Q6Ln43nSPFLshaEQSXDyHxB1vrKDOG0gU4HIxzaPu85gOt/U6A0Cbq0UhvxBYiCQ8nFWBp9tEJGlBGD+O1vg+bFuvNVycAAAD/UlEQVQjojW8gAj5CKrIoDFIGK5s5xJlO78EnkYSPp6/YZsEyHfzlE5I4Gf17Gle3oAE/KxIZQ/Mx4M55xp709j1Sc0JuQ4tvCeSA+1K4CElaVnjGEZIvdf4a4N9GXa6EXjC8tx2HXN7IQPgS+5jGpBntpCVgMmsv5RU5fCnUVCKOW9VUG8+cICynY0qKOvPx4P32avW5+U1J+QgmTYsz52FLNtMRhIefqZMlbhkBRCTd6xaInpx9OuaV9f6mFWW506zPHcPJOb8w8BtFQpJvxCOPa5V6TeooAPW8dWfoXzobp/piIb4rH7/KBLWuaa1uZoUcp8KEx6uRj7oMMP031V91JzPIR3ONwNJ5fZiA1tYle3soGznyxvi3pbnrgF+gkyJmj7t9ZTtjFG201jh8lcQv6O9MPDdTKDyDthX2XsaEBr13/v1PX4TOl6T1LSQQ0UJDz9EVKgwE5GcY5F5o3uB34vfRimp3B1seAvrqVSfeKIveQMRjs374FrbIcta1ar/jbodf6X03dyPzupZQf0/IoNJ1O8I6LKyEkwq+TCVW/I3GDWVJknZzlTgIeB4nejNp1yCuJeQXObjLc9dHji+I/Avf+28D2gEntbJBP321iFeT9N1uzcEbZS0Fh/fp2BNTB3/MxkaOj6M+IyrcYxDcrP3KgFGCL+94ecZTfyzgHw3t4W+m88ARyLCWzZNlOW5C/XIfHiZYv7KyiXBtEvKdj4ALlG2M1xrNjVHrY3kvUl46OctO8w/oNXnQ4BqU9FEElof7ySQiqixL+7TSxYA2+qMMz7+yBKXVO8DRMsJZ9v8PFCtv7zvCPN0lfWieBMRZj/1D8p2fM/CyGfRWV23oft38xrynNWo7EeWOd+IfGZPhY7X/Ly8pkby3iQ8tDz3FWU7twG/ULazCukozkQSEs7t4ZZTYhLevWJ5bvBHtRMyH4/LN/XTfujJp8Wkqr0ntCHkD4gf9XxlO+ci8+MrEGeg5yLqY3nuKmU7twM/VLbzFrLe24yMVj+KqqNsZxdEOwomCZwKnId8Bo+XeZbNYj7nl7Uw+u1arWznZuAsZTvvIR37qchn3xJRH0odbNx30xhxPIo/I95ycTQC/4jISfcPYCXSmTxc4b3WKzUl5JozkaWZ3yFqYBs9Jzz8Ll33nH8AHF1BZsovIwnuwlxE16yTeyNLclFOH35PviuySaaviDM0jgc6d+RZnrtE2c7hyJKjP2V4BHDK5VBDNo64lBIwrgLOtDw3TrU9mdKGHv8zK+jXp/Zwr+lEj6hn0j3d8KmI0ewG/f4jYKbluc8Szd5IvrgPIs4p4FJlO6Mszy1rgNWf41+RQSWKacCtEfXWKdt5ktpMLAnA/wEq9EV1OzbsCwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.frizerska.si</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.frizerska.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>MIIFpjCCA46gAwIBAgIGElF3aebNMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExSDBGBgNVBAMMP1NyZWRuamEgZnJpemVyc2thIHNvbGEgTGp1YmxqYW5hLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDExMDUwNzI5MzFaFw0zNDA3MjMwNzI5MzFaMGsxCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExSDBGBgNVBAMMP1NyZWRuamEgZnJpemVyc2thIHNvbGEgTGp1YmxqYW5hLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAM1avH8mv3VpxTVB06cxcbtZPiPcFaiXlZ8R2jLx8c23WeI4lH2OaJW5ZZKDPh8IVaEmiLO1zKDpdfAEFAzhH/aEcIzrG5Uo6AMGNBYJYBdg3TH9kfesWSO5N/f7EUKxAhBfIf/MNtttL3y/dc2exD0UG9WJHvhlHTtMnudmxvyJVaM3PCRdhaj9UnF8Xk2kp1yKPh1Um6IgHbcTUkgKplkY+8b6YvthnyC0uhDHqlxYo5cQbGrLEAUNHW6o17TQIRY9li2jBA324A5o+PNcb7N7Q0rAkIN6dpnS7zEAJdEVFqrhF6t+67pPkdgggPgjO27hQTz5zbpYOFykEfzIoF9J+SS13iHWcwVxE1GzDmtwaw20siuKyGdZiBJV9ZalbZCriuznJ6R9QY+xVDOfHPzj9bpKpAitTEEjWab00iSanTx8di2YuP10DvmLksyUDAdTeLB6/KkXLrm0opp3gEPw3LqoQWhCkMXemtzU47Jgv90zpdwOUsuLi0YNDyAypVmapA8LTIspmELQovY+BShgxsHnYNxZ0+/Cm16vIQ5kcbCavaVtwLkBhPueDbR40rrSuLzgZGJyedZobcZk8ySCX0ZJ44DmFOPDCa4HO79BpagWtTF/Fi6DsSWFQn3esD38Fxj5/6Zmgaa7cOx9YjWw/TP/xJZJAqsETQTQsJGfAgMBAAGjUDBOMB0GA1UdDgQWBBReG6wKpXSlK4V7DhrEuJjmagf07jAfBgNVHSMEGDAWgBReG6wKpXSlK4V7DhrEuJjmagf07jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQB6cP0RCwQO3yVng3U95do8S0+ms8R9qklsUWm+9NEjA4CASTK++ottXYt44jW/2M7nWOnHuRiV66+0plMxI7KUw0giDQtARrp5jCUsMQOWYy+jNyZtohT8qvV6otEIc1G0Bn50rvf2AFpc3Ttxh3BOlk+S3lZ84SO7NvvEsJfjv8UN5DhqACfYlLWYn4OqWqzAdBKwRBsZ4Lx2DFvdeXIY+AEwV0RmHSvYUPE7WzZlGK4azW8xp36tW0AkHjjbmFJKE7lAywAEtGvLLoB+vo3z0/0ULgLsiceZbwpgYSDAEMB2JhuFRy7uh6kOblXHcZdgG8rSRTEAMWuY47lcTHbJ7dtgeeEVjHTYlO/yIJq1Uh8RUzHwDjqdN7Q7OCT+rNtN1N3TlmP9lQ40UBGebQzXtUCWePNCzHZplVTAGAInHYFhrvNZnQEEYrTrA3KrAyz4QUaohECp4BmlAwIp2e9yRf5J2wU6Z4fElXUMiF4hTq0Pk7Gl9weneybvzPmUER49FRDbBFsKdvoi9653PLgsuchmO+scK394Xho5UDZCpR8Pqx2q+HxzHOp203NkKCOxYUpX5rOBkWCf6Dy3x8gwmxS87hucojPLbNEVjI5Sfs0fRrSCNgUAcNRyv5wz5ZVaxu9fTAuk8+2VhU3u7BtDeeDzNayOPSZPSpOcopH4uw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFpjCCA46gAwIBAgIGElF3aebNMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExSDBGBgNVBAMMP1NyZWRuamEgZnJpemVyc2thIHNvbGEgTGp1YmxqYW5hLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDExMDUwNzI5MzFaFw0zNDA3MjMwNzI5MzFaMGsxCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExSDBGBgNVBAMMP1NyZWRuamEgZnJpemVyc2thIHNvbGEgTGp1YmxqYW5hLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAM1avH8mv3VpxTVB06cxcbtZPiPcFaiXlZ8R2jLx8c23WeI4lH2OaJW5ZZKDPh8IVaEmiLO1zKDpdfAEFAzhH/aEcIzrG5Uo6AMGNBYJYBdg3TH9kfesWSO5N/f7EUKxAhBfIf/MNtttL3y/dc2exD0UG9WJHvhlHTtMnudmxvyJVaM3PCRdhaj9UnF8Xk2kp1yKPh1Um6IgHbcTUkgKplkY+8b6YvthnyC0uhDHqlxYo5cQbGrLEAUNHW6o17TQIRY9li2jBA324A5o+PNcb7N7Q0rAkIN6dpnS7zEAJdEVFqrhF6t+67pPkdgggPgjO27hQTz5zbpYOFykEfzIoF9J+SS13iHWcwVxE1GzDmtwaw20siuKyGdZiBJV9ZalbZCriuznJ6R9QY+xVDOfHPzj9bpKpAitTEEjWab00iSanTx8di2YuP10DvmLksyUDAdTeLB6/KkXLrm0opp3gEPw3LqoQWhCkMXemtzU47Jgv90zpdwOUsuLi0YNDyAypVmapA8LTIspmELQovY+BShgxsHnYNxZ0+/Cm16vIQ5kcbCavaVtwLkBhPueDbR40rrSuLzgZGJyedZobcZk8ySCX0ZJ44DmFOPDCa4HO79BpagWtTF/Fi6DsSWFQn3esD38Fxj5/6Zmgaa7cOx9YjWw/TP/xJZJAqsETQTQsJGfAgMBAAGjUDBOMB0GA1UdDgQWBBReG6wKpXSlK4V7DhrEuJjmagf07jAfBgNVHSMEGDAWgBReG6wKpXSlK4V7DhrEuJjmagf07jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQB6cP0RCwQO3yVng3U95do8S0+ms8R9qklsUWm+9NEjA4CASTK++ottXYt44jW/2M7nWOnHuRiV66+0plMxI7KUw0giDQtARrp5jCUsMQOWYy+jNyZtohT8qvV6otEIc1G0Bn50rvf2AFpc3Ttxh3BOlk+S3lZ84SO7NvvEsJfjv8UN5DhqACfYlLWYn4OqWqzAdBKwRBsZ4Lx2DFvdeXIY+AEwV0RmHSvYUPE7WzZlGK4azW8xp36tW0AkHjjbmFJKE7lAywAEtGvLLoB+vo3z0/0ULgLsiceZbwpgYSDAEMB2JhuFRy7uh6kOblXHcZdgG8rSRTEAMWuY47lcTHbJ7dtgeeEVjHTYlO/yIJq1Uh8RUzHwDjqdN7Q7OCT+rNtN1N3TlmP9lQ40UBGebQzXtUCWePNCzHZplVTAGAInHYFhrvNZnQEEYrTrA3KrAyz4QUaohECp4BmlAwIp2e9yRf5J2wU6Z4fElXUMiF4hTq0Pk7Gl9weneybvzPmUER49FRDbBFsKdvoi9653PLgsuchmO+scK394Xho5UDZCpR8Pqx2q+HxzHOp203NkKCOxYUpX5rOBkWCf6Dy3x8gwmxS87hucojPLbNEVjI5Sfs0fRrSCNgUAcNRyv5wz5ZVaxu9fTAuk8+2VhU3u7BtDeeDzNayOPSZPSpOcopH4uw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eduroam.frizerska.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://eduroam.frizerska.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SREDNJA FRIZERSKA ŠOLA LJUBLJANA</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">SREDNJA FRIZERSKA ŠOLA LJUBLJANA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SREDNJA FRIZERSKA ŠOLA LJUBLJANA</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">SREDNJA FRIZERSKA ŠOLA LJUBLJANA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.frizerska.si</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.frizerska.si</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Žiga</md:GivenName>
+    <md:SurName>Erhatič</md:SurName>
+    <md:EmailAddress>mailto:srednja-frizerska-sola@guest.arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:aai@frizerska.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Žiga</md:GivenName>
+    <md:SurName>Erhatič</md:SurName>
+    <md:EmailAddress>mailto:ziga.erhatic@guest.arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Primož</md:GivenName>
+    <md:SurName>Hvala Kamenšček</md:SurName>
+    <md:EmailAddress>mailto:srednja-frizerska-sola@guest.arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml b/swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml
new file mode 100644
index 00000000..8bb21630
--- /dev/null
+++ b/swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eduspot.ens-cachan.fr/authsaml2/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-12T10:48:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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="fr">ENS de Cachan - Portail Eduspot</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Accès aux Wifi pour les participants au projet Eduspot via le portail captif Univnautes.</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>
+					      MIIEpDCCA4ygAwIBAgIQeTFgbQWRlGanItIwtJ/w0jANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDEwMTcwMDAwMDBaFw0xNzEwMTYyMzU5NTlaMEMxITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVZWR1c3BvdC5lbnMt
+Y2FjaGFuLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuNjLcYRU
+VIYvwbFG89dp+n0NMsDR6SrHZ/AMit0airV2ReNm1H+Wcuq0UGQKLsrhytQsL3vK
+lgBCbUi2LbIFlPubTIBx8pNoH8AkBcOyfg1kiN2yJ4z+gaqjoy+gp7zChSKhga3D
+LsIkAfBK2hKiw+t1Cod/LCgbeBdGKnB4gDTZScYf8r3rSIyE1mtDI93VJfsMHkKD
+j3WOmhAnoT1KDXFHI1utdUwyM/u2nGgAjgupEbDTAOfx/N56/yUkR88Q22itXKdS
+Er3v66gp0CJluEPUFTmmCCdklnv12rFR16hrgm/fiZWyj6z9BtRQUW6cC35fDtmq
+9CMXI8aYdpMTEwIDAQABo4IBcTCCAW0wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZU
+G+GGKLD9tr0wHQYDVR0OBBYEFHeYAb+69vprObDtE1PM63PWKio0MA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0Ey
+LmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNl
+cnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8v
+b2NzcC51c2VydHJ1c3QuY29tMCAGA1UdEQQZMBeCFWVkdXNwb3QuZW5zLWNhY2hh
+bi5mcjANBgkqhkiG9w0BAQsFAAOCAQEANOYe63FGB6CrqW/Hl8uRbBrJsYHnzknp
+h6NjKRuvnzeOOOrDVW75T3//6AepZzJ0k1ZzzYIYJ0crBavEEo9L5AvwMPvs7mYw
+RAUTEMhGTm/nYQct1jwbCgNKCDgYuydZUcixtiq3LXz1SglHXGNhg+SLGCGXrHrJ
+JxuaneWu5FgReUB3EDUC0bCrM9nx2cHitLtox3aXU/fhiPXCEkP2HV4DnjLu3fBJ
+S5gBayfEa2U6VDzvwdEk71Pw3PKsdEl7f9N5mp3rpjvr36r5TH5LXhbk0utRGo7u
+yn+WFioypXnVKl7dgWzQsVdGI4NnnsfGgmah+vJMEtRPPnBtjRrV3A==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEpDCCA4ygAwIBAgIQeTFgbQWRlGanItIwtJ/w0jANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDEwMTcwMDAwMDBaFw0xNzEwMTYyMzU5NTlaMEMxITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVZWR1c3BvdC5lbnMt
+Y2FjaGFuLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuNjLcYRU
+VIYvwbFG89dp+n0NMsDR6SrHZ/AMit0airV2ReNm1H+Wcuq0UGQKLsrhytQsL3vK
+lgBCbUi2LbIFlPubTIBx8pNoH8AkBcOyfg1kiN2yJ4z+gaqjoy+gp7zChSKhga3D
+LsIkAfBK2hKiw+t1Cod/LCgbeBdGKnB4gDTZScYf8r3rSIyE1mtDI93VJfsMHkKD
+j3WOmhAnoT1KDXFHI1utdUwyM/u2nGgAjgupEbDTAOfx/N56/yUkR88Q22itXKdS
+Er3v66gp0CJluEPUFTmmCCdklnv12rFR16hrgm/fiZWyj6z9BtRQUW6cC35fDtmq
+9CMXI8aYdpMTEwIDAQABo4IBcTCCAW0wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZU
+G+GGKLD9tr0wHQYDVR0OBBYEFHeYAb+69vprObDtE1PM63PWKio0MA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0Ey
+LmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNl
+cnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8v
+b2NzcC51c2VydHJ1c3QuY29tMCAGA1UdEQQZMBeCFWVkdXNwb3QuZW5zLWNhY2hh
+bi5mcjANBgkqhkiG9w0BAQsFAAOCAQEANOYe63FGB6CrqW/Hl8uRbBrJsYHnzknp
+h6NjKRuvnzeOOOrDVW75T3//6AepZzJ0k1ZzzYIYJ0crBavEEo9L5AvwMPvs7mYw
+RAUTEMhGTm/nYQct1jwbCgNKCDgYuydZUcixtiq3LXz1SglHXGNhg+SLGCGXrHrJ
+JxuaneWu5FgReUB3EDUC0bCrM9nx2cHitLtox3aXU/fhiPXCEkP2HV4DnjLu3fBJ
+S5gBayfEa2U6VDzvwdEk71Pw3PKsdEl7f9N5mp3rpjvr36r5TH5LXhbk0utRGo7u
+yn+WFioypXnVKl7dgWzQsVdGI4NnnsfGgmah+vJMEtRPPnBtjRrV3A==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDTDCCAjQCCQCR6CZCuHxqRDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJG
+UjErMCkGA1UEChMiRUNPTEUgTk9STUFMRSBTVVBFUklFVVJFIERFIENBQ0hBTjEM
+MAoGA1UECxMDRFNJMR4wHAYDVQQDExVlZHVzcG90LmVucy1jYWNoYW4uZnIwHhcN
+MTQwNDE0MTIzNjI4WhcNMTUwNDE0MTIzNjI4WjBoMQswCQYDVQQGEwJGUjErMCkG
+A1UEChMiRUNPTEUgTk9STUFMRSBTVVBFUklFVVJFIERFIENBQ0hBTjEMMAoGA1UE
+CxMDRFNJMR4wHAYDVQQDExVlZHVzcG90LmVucy1jYWNoYW4uZnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaN/r/9eegiIWfM7W+cBepylzyQKasGNVV
+pOGqQtClO+RDnHw1e+VjLofvQkCrkXqO0Yk2+3fFluaVEKefRhz87KkfCwqmmMVv
+N7QPL7wdjefp7z0QQQd500er/lWzNEZ16noFKNAKIVQ7L8nwEID2szf2o7lwiHUM
+I0/WYrcHtglX+KFiKCajf8lMQHQlnLvrODzBvZPuY+hcjyPMet8C77jsQs9KcBa/
+WOZ0XHwpfP6qSedCp1feHWNG/6H/ngPhFH+Yfh8dCYvnf8evL+WKL+b2L22s009K
+6pGpup0ZJaS2UbMblHeOCRf9kfT6peLwcOawPi9M7W68vSBtNd4DAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAAm4J2729rV0T1ZHR7GhruA+x8Kt0SXeXwvng8Zuaijz
+NSNK9Ej3j9Y/NRYKPTPAm2fGCrbbr89lZ+0680b6ZqicZU2c4juHe0u5/5zN1wmV
+h98Us4F37tUL4aT6fvi+FTJUkeHR3ZV/wGkdbzTLWqKqVQ8POO8Q55DZEjIrFiq3
+LmIbOYK8bfdAZTc2XWVsU1bNQyJMY6Qiu2mA1VTc61b5gUI94RmMpfEP0hl7DBgh
+KIz/GZRjl9UB3x6EEgmPi+ihRwPs/tQORLZpaS9pyqdPzrH3NuP/iVO5Dv/D7Ss9
+U3vIxlLV3X9ESLFrZiZgFRyKOqQOri3RHniJ7Yt9v+k=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduspot.ens-cachan.fr/authsaml2/singleSignOnPost" index="1"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">ENS de Cachan - Portail Eduspot</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Accès aux Wifi pour les participants au projet Eduspot via le portail captif Univnautes.</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" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole Normale Supérieure de Cachan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole Normale Supérieure de Cachan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>eduspot@ens-cachan.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml b/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml
new file mode 100644
index 00000000..f538d6a5
--- /dev/null
+++ b/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edustore.adeptscience.co.uk/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-04T10:38:08Z">
+      <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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Adept Scientific UK Education Store</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Fast track access to low software prices for students and educators with no post purchase verification.  If you are a student at an organisation that has a site licence, you may also be eligible for special reduced prices for personal licences.</mdui:Description>
+        <mdui:Logo height="164" width="207">https://edustore.adeptscience.co.uk/images/Adept-LH-logo-store-WEB.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>
+						MIIFyDCCBLCgAwIBAgIQNYZVhZ6xUYZZKhRI4Ou2IDANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTExMTA5
+						MDAwMDAwWhcNMTQxMjA4MjM1OTU5WjCBtDELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
+						DUhlcnRmb3Jkc2hpcmUxEzARBgNVBAcUCkxldGNod29ydGgxHTAbBgNVBAoUFEFk
+						ZXB0IFNjaWVudGlmaWMgUExDMTMwMQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3
+						LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxJDAiBgNVBAMUG2VkdXN0b3JlLmFkZXB0
+						c2NpZW5jZS5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjq
+						bNLrDFYokbHKskeF5Oxhf/zBZSeTdgD3c30Wwv8WD6w3k7jqCsIEN6tdZkIZMSLp
+						sQv27VpSau6oC8tDvNaxMkxrpJEGGuOI4BeIkcpDFaMQ+R43zTHwSUDRu17Dyjmh
+						6mbZ7Kizja8LMcPehjvryk2+AxfGyWhtG/j40gD9uaaZ69sRUnr4mItNKRPDMSE+
+						cDNQXy7iovQ/0d9FVsz1YjdB4Dm01IC5TSY7fRGrkioGObGk1W2P19r52yU0Yg8z
+						CVCB+sZTeSpw0qQD8FtBdP0ADZMQ5hIiL+iJRljaTl9KI1ES4FLRra1D6ycDtLM9
+						DvinO4p1kJg8Dn1GR6kCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQD
+						AgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzMtY3JsLnZl
+						cmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhF
+						AQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBh
+						MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBQNRFwW
+						U0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0
+						dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNl
+						Y3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBuBggrBgEF
+						BQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7ko
+						lgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNs
+						b2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJcXRTU7G991oWCsCISna6fW9Gc9
+						2mAZyqoVdbZ++1b1g6WJHgbx9mv8ev01t3DRqShJtcihDbXPHwYXSJPSXHrF0o2b
+						plH5SecvOQZLYLhdYELuENgFuGnpNbwFNuLShwxSqJ8sP1KAVZCzVXaUGBh/uTga
+						YEJazv1XAChyIsHdasSR5LXssAKyqCpdQK4Anf+HPdP4dhG8TP70JW1JXdi9dFpn
+						jcNgfAG9iGMA98plT7ZpiTVpA8jd5tEkEF+LuoCCYxal1eEc4cgwMHtukW6XA7RM
+						CbkzvDlBR1tog67/sYGILCskqGHcCLSs0a2b5mhe7UGJLSoZJ1fGugCn/aI=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFyDCCBLCgAwIBAgIQNYZVhZ6xUYZZKhRI4Ou2IDANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTExMTA5
+						MDAwMDAwWhcNMTQxMjA4MjM1OTU5WjCBtDELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
+						DUhlcnRmb3Jkc2hpcmUxEzARBgNVBAcUCkxldGNod29ydGgxHTAbBgNVBAoUFEFk
+						ZXB0IFNjaWVudGlmaWMgUExDMTMwMQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3
+						LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxJDAiBgNVBAMUG2VkdXN0b3JlLmFkZXB0
+						c2NpZW5jZS5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjq
+						bNLrDFYokbHKskeF5Oxhf/zBZSeTdgD3c30Wwv8WD6w3k7jqCsIEN6tdZkIZMSLp
+						sQv27VpSau6oC8tDvNaxMkxrpJEGGuOI4BeIkcpDFaMQ+R43zTHwSUDRu17Dyjmh
+						6mbZ7Kizja8LMcPehjvryk2+AxfGyWhtG/j40gD9uaaZ69sRUnr4mItNKRPDMSE+
+						cDNQXy7iovQ/0d9FVsz1YjdB4Dm01IC5TSY7fRGrkioGObGk1W2P19r52yU0Yg8z
+						CVCB+sZTeSpw0qQD8FtBdP0ADZMQ5hIiL+iJRljaTl9KI1ES4FLRra1D6ycDtLM9
+						DvinO4p1kJg8Dn1GR6kCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQD
+						AgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzMtY3JsLnZl
+						cmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhF
+						AQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBh
+						MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBQNRFwW
+						U0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0
+						dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNl
+						Y3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBuBggrBgEF
+						BQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7ko
+						lgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNs
+						b2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJcXRTU7G991oWCsCISna6fW9Gc9
+						2mAZyqoVdbZ++1b1g6WJHgbx9mv8ev01t3DRqShJtcihDbXPHwYXSJPSXHrF0o2b
+						plH5SecvOQZLYLhdYELuENgFuGnpNbwFNuLShwxSqJ8sP1KAVZCzVXaUGBh/uTga
+						YEJazv1XAChyIsHdasSR5LXssAKyqCpdQK4Anf+HPdP4dhG8TP70JW1JXdi9dFpn
+						jcNgfAG9iGMA98plT7ZpiTVpA8jd5tEkEF+LuoCCYxal1eEc4cgwMHtukW6XA7RM
+						CbkzvDlBR1tog67/sYGILCskqGHcCLSs0a2b5mhe7UGJLSoZJ1fGugCn/aI=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edustore.adeptscience.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://edustore.adeptscience.co.uk/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edustore.adeptscience.co.uk/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edustore.adeptscience.co.uk/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Adept Scientific plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Adept Scientific UK Education Store</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.adeptscience.co.uk/about/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Ridley</md:SurName>
+    <md:EmailAddress>mailto:mark.ridley@adeptscientific.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Ridley</md:SurName>
+    <md:EmailAddress>mailto:mark.ridley@adeptscientific.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml b/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml
new file mode 100644
index 00000000..59ade9b0
--- /dev/null
+++ b/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edustore.adeptscience.co.uk/oasp">
+  <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>
+						MIIFyDCCBLCgAwIBAgIQNYZVhZ6xUYZZKhRI4Ou2IDANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTExMTA5
+						MDAwMDAwWhcNMTQxMjA4MjM1OTU5WjCBtDELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
+						DUhlcnRmb3Jkc2hpcmUxEzARBgNVBAcUCkxldGNod29ydGgxHTAbBgNVBAoUFEFk
+						ZXB0IFNjaWVudGlmaWMgUExDMTMwMQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3
+						LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxJDAiBgNVBAMUG2VkdXN0b3JlLmFkZXB0
+						c2NpZW5jZS5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjq
+						bNLrDFYokbHKskeF5Oxhf/zBZSeTdgD3c30Wwv8WD6w3k7jqCsIEN6tdZkIZMSLp
+						sQv27VpSau6oC8tDvNaxMkxrpJEGGuOI4BeIkcpDFaMQ+R43zTHwSUDRu17Dyjmh
+						6mbZ7Kizja8LMcPehjvryk2+AxfGyWhtG/j40gD9uaaZ69sRUnr4mItNKRPDMSE+
+						cDNQXy7iovQ/0d9FVsz1YjdB4Dm01IC5TSY7fRGrkioGObGk1W2P19r52yU0Yg8z
+						CVCB+sZTeSpw0qQD8FtBdP0ADZMQ5hIiL+iJRljaTl9KI1ES4FLRra1D6ycDtLM9
+						DvinO4p1kJg8Dn1GR6kCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQD
+						AgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzMtY3JsLnZl
+						cmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhF
+						AQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBh
+						MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBQNRFwW
+						U0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0
+						dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNl
+						Y3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBuBggrBgEF
+						BQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7ko
+						lgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNs
+						b2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJcXRTU7G991oWCsCISna6fW9Gc9
+						2mAZyqoVdbZ++1b1g6WJHgbx9mv8ev01t3DRqShJtcihDbXPHwYXSJPSXHrF0o2b
+						plH5SecvOQZLYLhdYELuENgFuGnpNbwFNuLShwxSqJ8sP1KAVZCzVXaUGBh/uTga
+						YEJazv1XAChyIsHdasSR5LXssAKyqCpdQK4Anf+HPdP4dhG8TP70JW1JXdi9dFpn
+						jcNgfAG9iGMA98plT7ZpiTVpA8jd5tEkEF+LuoCCYxal1eEc4cgwMHtukW6XA7RM
+						CbkzvDlBR1tog67/sYGILCskqGHcCLSs0a2b5mhe7UGJLSoZJ1fGugCn/aI=
+					</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://edustore.adeptscience.co.uk/a4e/auth/rcv" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edustore5.adeptscience.co.uk/a4e/auth/rcv" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore.adeptscience.co.uk/a4e/auth/rcv" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore5.adeptscience.co.uk/a4e/auth/rcv" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Adept Scientific plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Adept Scientific plc: Adept4Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.adeptscience.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Ridley</md:SurName>
+    <md:EmailAddress>mailto:mark.ridley@adeptscientific.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Ridley</md:SurName>
+    <md:EmailAddress>mailto:mark.ridley@adeptscientific.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eeyore.sjc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/eeyore.sjc.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..87e983ac
--- /dev/null
+++ b/swamid-interfederations-2.0/eeyore.sjc.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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://eeyore.sjc.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="2013-08-13T16:03: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://eeyore.sjc.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>
+						MIIDADCCAeigAwIBAgIJAOXHkHR5abqcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE2VleW9yZS5zamMub3guYWMudWswHhcNMTMwODEyMTAzMjIzWhcNMjMwODEw
+						MTAzMjIzWjAeMRwwGgYDVQQDExNlZXlvcmUuc2pjLm94LmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuBOxdHKNQUD0B0kpIWMJEcpWgLxC1/S6
+						ZwH3owCAJnqwS8qtJpZWr4peEIDYX4E8uGNEubxui5ioMWxy/UAuUmWfcFoqZ6hV
+						KKT82iVjspi55puGb7SgBDWqMcQt/S03bVAl5XEJqmLg0L3kZSj1pCdUFijRTUPL
+						477LhTyaoZqCoTbnIpKkVUh8UjeIjco6pIhDv/bVTqSkO920lUVx8cnamZPy1jXG
+						tjAEzZxcpAH8zSXwkuffxNFWT1u2yhssIt1fjIGoO0DuJme74Ls3O8vP10Rl/gkh
+						0eGSvGlERCfQcM+KGu0xmHzLfd2vi0GtMYQYe03xFDOMGoUZW6P0iwIDAQABo0Ew
+						PzAeBgNVHREEFzAVghNlZXlvcmUuc2pjLm94LmFjLnVrMB0GA1UdDgQWBBR3TJq8
+						XWc8yOsnJiEBJAzZm09K9jANBgkqhkiG9w0BAQUFAAOCAQEAHnBwN4rEVqh3b2Jl
+						HntNXIGqths1B+mdHXFEyWs8WcE0NZHp4Pvom4DYyWmwy2td4MaXwY4iEQLQFNCN
+						TZvcXjREowzMEu5Sx7odpGTffsJPMDhVzZpRYR5P3NBh4RxirdIS6NYec/bIf56I
+						4SqpthhygQU+TIz8CKekAe+9HI10m7iMxAnvSddcIR9dk9Zc56waQoynoE0lBo82
+						aT93LqeJd5zMxGEaSoZrxCsoOPW4zYUrHFNqQkmgKU5PMK1y7RIkERB4HTEl4QAg
+						b0Tcl7t7OcEG7lKUdAjOqW8E4DgrdSqzvhQCRI2rm2bKqpHq9CIMXFLlGITTKKOS
+						1FZTdQ==
+					</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://eeyore.sjc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eeyore.sjc.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://eeyore.sjc.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://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://eeyore.sjc.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 John's College NAC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sjc.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Matt</md:GivenName>
+    <md:SurName>Jennings</md:SurName>
+    <md:EmailAddress>mailto:it-support@sjc.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matt</md:GivenName>
+    <md:SurName>Jennings</md:SurName>
+    <md:EmailAddress>mailto:it-support@sjc.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/efoyer.glam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/efoyer.glam.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..d6acc288
--- /dev/null
+++ b/swamid-interfederations-2.0/efoyer.glam.ac.uk-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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://efoyer.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: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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://efoyer.glam.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>
+						MIIEFjCCAv6gAwIBAgIJANpMyk1kQRAJMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYD
+						VQQGEwJHQjEbMBkGA1UECBMSUmhvbmRkYSBDeW5vbiBUYWZmMRIwEAYDVQQHEwlU
+						cmVmb3Jlc3QxIDAeBgNVBAoTF1VuaXZlcnNpdHkgb2YgR2xhbW9yZ2FuMQ0wCwYD
+						VQQLEwRMQ1NTMRowGAYDVQQDExFlZm95ZXIuZ2xhbS5hYy51azAeFw0xMjA1MDgw
+						OTA2MzNaFw0zMjA1MDMwOTA2MzNaMIGLMQswCQYDVQQGEwJHQjEbMBkGA1UECBMS
+						UmhvbmRkYSBDeW5vbiBUYWZmMRIwEAYDVQQHEwlUcmVmb3Jlc3QxIDAeBgNVBAoT
+						F1VuaXZlcnNpdHkgb2YgR2xhbW9yZ2FuMQ0wCwYDVQQLEwRMQ1NTMRowGAYDVQQD
+						ExFlZm95ZXIuZ2xhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAN4kgz4TvCUcw44kQHtV73yTm23GSLQ2iMySRCUthIbTCdg3nj7icN433D3o
+						RsT0iUCjOWKlroCQOx1Rt5HubJzQ6CptodtqujNFaGGBpzlXpFeqyt60vu6AX5xa
+						lcEdBBfPctYbfn6ioW/pJhNaBiYLAyt4u5ds3iCpj3VTkKWF2rLlIZ16QGtMq0bP
+						XgjUBRqufWWzcRLy496G6Wv9namhV9wBrJpzWf4jYVDdm5U8zc3NtXih3vdyn9gj
+						L5jnDnGsTIyrkxyL+GLwuQoEPtkomAnpJBTB+71cNuoottmqdaIv+DwR1HVS2gwv
+						e0RDi02Umo3UfeLpYONNsjnM4acCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
+						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
+						FO7rrCmESBalKYdXW1ALKFihdCsjMB8GA1UdIwQYMBaAFO7rrCmESBalKYdXW1AL
+						KFihdCsjMA0GCSqGSIb3DQEBBQUAA4IBAQC6j+4T1O1FXXDC8kZ+JCGwilaKKfxh
+						Ivwnas/R+j6xv7TszUzIjaaSXycZdjH8z7DYXgedtotm9v4oO5ItrcsS/jsV0G8V
+						bwn7jJ518Dq9OIdvuvs3lFIdwoajxJdwQiQddOznFh4cWzG5/XgqVNSEUtjiPuK6
+						lee/vFySOO/silc+hYPLZO3Uf0fC/pE7LOf940D5rEmAH6KoEMNAE8MdXFJ/H+km
+						/Icjg2pu0TrSKd4w2J+oNs4zx2V9mDthQ9El/gOUlP66C49AHryg3Q2Frton8rcy
+						LhM4j8K3Z85HZOMAm5o9KbdApcJ5tX1yBg3JtB/LC5Keg5X7PxRoK8ck                        
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEFjCCAv6gAwIBAgIJANpMyk1kQRAJMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYD
+						VQQGEwJHQjEbMBkGA1UECBMSUmhvbmRkYSBDeW5vbiBUYWZmMRIwEAYDVQQHEwlU
+						cmVmb3Jlc3QxIDAeBgNVBAoTF1VuaXZlcnNpdHkgb2YgR2xhbW9yZ2FuMQ0wCwYD
+						VQQLEwRMQ1NTMRowGAYDVQQDExFlZm95ZXIuZ2xhbS5hYy51azAeFw0xMjA1MDgw
+						OTA2MzNaFw0zMjA1MDMwOTA2MzNaMIGLMQswCQYDVQQGEwJHQjEbMBkGA1UECBMS
+						UmhvbmRkYSBDeW5vbiBUYWZmMRIwEAYDVQQHEwlUcmVmb3Jlc3QxIDAeBgNVBAoT
+						F1VuaXZlcnNpdHkgb2YgR2xhbW9yZ2FuMQ0wCwYDVQQLEwRMQ1NTMRowGAYDVQQD
+						ExFlZm95ZXIuZ2xhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAN4kgz4TvCUcw44kQHtV73yTm23GSLQ2iMySRCUthIbTCdg3nj7icN433D3o
+						RsT0iUCjOWKlroCQOx1Rt5HubJzQ6CptodtqujNFaGGBpzlXpFeqyt60vu6AX5xa
+						lcEdBBfPctYbfn6ioW/pJhNaBiYLAyt4u5ds3iCpj3VTkKWF2rLlIZ16QGtMq0bP
+						XgjUBRqufWWzcRLy496G6Wv9namhV9wBrJpzWf4jYVDdm5U8zc3NtXih3vdyn9gj
+						L5jnDnGsTIyrkxyL+GLwuQoEPtkomAnpJBTB+71cNuoottmqdaIv+DwR1HVS2gwv
+						e0RDi02Umo3UfeLpYONNsjnM4acCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
+						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
+						FO7rrCmESBalKYdXW1ALKFihdCsjMB8GA1UdIwQYMBaAFO7rrCmESBalKYdXW1AL
+						KFihdCsjMA0GCSqGSIb3DQEBBQUAA4IBAQC6j+4T1O1FXXDC8kZ+JCGwilaKKfxh
+						Ivwnas/R+j6xv7TszUzIjaaSXycZdjH8z7DYXgedtotm9v4oO5ItrcsS/jsV0G8V
+						bwn7jJ518Dq9OIdvuvs3lFIdwoajxJdwQiQddOznFh4cWzG5/XgqVNSEUtjiPuK6
+						lee/vFySOO/silc+hYPLZO3Uf0fC/pE7LOf940D5rEmAH6KoEMNAE8MdXFJ/H+km
+						/Icjg2pu0TrSKd4w2J+oNs4zx2V9mDthQ9El/gOUlP66C49AHryg3Q2Frton8rcy
+						LhM4j8K3Z85HZOMAm5o9KbdApcJ5tX1yBg3JtB/LC5Keg5X7PxRoK8ck                        
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of South Wales</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of South Wales: Efoyer</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/egiswamid.egi.kth.se-shibboleth.xml b/swamid-interfederations-2.0/egiswamid.egi.kth.se-shibboleth.xml
new file mode 100644
index 00000000..e645d46d
--- /dev/null
+++ b/swamid-interfederations-2.0/egiswamid.egi.kth.se-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://egiswamid.egi.kth.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>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc: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://egiswamid.egi.kth.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://egiswamid.egi.kth.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://egiswamid.egi.kth.se/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://egiswamid.egi.kth.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>egiswamid.egi.kth.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=egiswamid.egi.kth.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAOKn91RkenjIMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFGVnaXN3YW1pZC5lZ2kua3RoLnNlMB4XDTEzMDMwNTExNDU0NFoXDTIzMDMw
+MzExNDU0NFowHzEdMBsGA1UEAxMUZWdpc3dhbWlkLmVnaS5rdGguc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa3DK9UMbKQsvIuJuWLUT3nKRpKUfv
+P0hG4Y9YIjNTXuZWjAVt//FHHVyVVFiyOVjdS7ccgKBdlaQAgxz9TlVXWGkImFDr
+3FB2MBKAXZsqdK8goFzb6QKJJyIS7PRLWQgWWrZkUfESf2HZFbOZK4Q5XxdPu8VY
+DZMU/bwOPwGnO2D8NuJhiMUNSvsw652D0fft5iqoMu68T+RqkvHjt6etgOIRjOUe
+x0FEWmNjOEUXfmR8KEILSgE4LLn4MgBLjwS9f4AklfNaJzubq2CoDDKr5+QqObKa
+s4xt7xB5zaI8n2pWFi1Lik453ZjbyGNNrmIMVoKq8YqfbYbScT+dbGPFAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFGVnaXN3YW1pZC5lZ2kua3RoLnNlMB0GA1UdDgQWBBSe
+YTmnl+7QvxX3lojqwxfovXBD7TANBgkqhkiG9w0BAQUFAAOCAQEAvjYyfsLqwLUA
+l1jw+FSIRQj1ync3bzU0Pw1i79RjYvSMip+TTScKqMlvfCowOaux0zrD9L9Zezbu
+38fVIa/77VZYFRNkt8uzaB5guMvO1O0XJbuCHl7/J9cdsRnhxFFMrGSQEAFKjXS4
+KhnBVBTB618v+Z3Yr3D4A+2ph5GhQreKEyWrEfKUCNLvI2s9IgF3NlnItHT0Z0VL
+PTw0p2GJzoMLwXYaiWVvGMDnJI9hSxIs+cJCtUUb19wCt3p2cILcFRfkHZR7aO1/
+/es1MnuKqzg9hCb7lpizP/bzSTUxfcVYd7rYACatWWZmXTB2INi4BbF8sFrdUYL9
+VESdo2ebFA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eka-idp.lanet.lv.xml b/swamid-interfederations-2.0/eka-idp.lanet.lv.xml
new file mode 100644
index 00000000..193fcf44
--- /dev/null
+++ b/swamid-interfederations-2.0/eka-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eka-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>
+      <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">The University College of Economics and Culture</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <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>
+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://eka-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://eka-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LAIFE - EKA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The University College of Economics and Culture- EKA IDP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="lv">http://eka.edu.lv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/el-shib.redbridge-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/el-shib.redbridge-college.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..e7cb15ce
--- /dev/null
+++ b/swamid-interfederations-2.0/el-shib.redbridge-college.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://el-shib.redbridge-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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">redbridge-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>
+						MIIEwDCCA6igAwIBAgIRAOIFRAsgYGQ47TBLkuFk0xUwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjA5MTEwMDAwMDBaFw0xNTA5MTEyMzU5NTlaMIGKMQswCQYD
+						VQQGEwJHQjEQMA4GA1UECBMHUm9tZm9yZDEOMAwGA1UEBxMFRXNzZXgxGjAYBgNV
+						BAoTEVJlZGJyaWRnZSBDb2xsZWdlMRMwEQYDVQQLEwpFLUxlYXJuaW5nMSgwJgYD
+						VQQDEx9lbC1zaGliLnJlZGJyaWRnZS1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs4orLy5QnpSUHTjIhQL7VxQd6qXWSwBzqcCz
+						i7/Z+q5PYI8J+HplveLcqL1qC7vpDRYY4qmYukXRFjXFqxFahEovaeIfjBrSYr1M
+						v2TkCIxmwG0vndr/CEUVb5Dq13+Tw5JVg3on5LGIt0FGfYvmOCCBu0skUxE/ltC3
+						tuU6ZYRGNuaX0yCCGTm7AAX9G/xRDWlUlyVTzgDk8ndL1IrTR66xB3Y7ufjlXssE
+						mhOo87cnzOEmPs5hZLiJDsBW6j2I+zYaQjZz97fyIwkLOXenvi/XNA8DiiTqSJIV
+						5WmicXaqC5oBZ0D7J4k2W2qFO9X4DSAVCdCyUgFVTkBQa9+QywIDAQABo4IBcjCC
+						AW4wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFOLF
+						y0014/mnDphFXRx1nl/SCObhMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
+						MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysG
+						AQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
+						YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
+						AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
+						KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCoGA1UdEQQjMCGC
+						H2VsLXNoaWIucmVkYnJpZGdlLWNvbGxlZ2UuYWMudWswDQYJKoZIhvcNAQEFBQAD
+						ggEBAK+y2q9cP34wYcOvF5c3jSUJB4bp4nWIJiWwgE8xJfoVAeGQCoUhQzZn8Fnu
+						yl/HzkeTXvBz6ujlyrZNgn9+DA8ZW3HAJEUDOBqtXZ9gqJlxe3fmO8s1oCy3gxdf
+						p6oXlfSkKHHIgt0njmoa19NgjCys95WCwWjNmbrHQ+q5M03mxHNgtwA/vK7EGBL2
+						UKSjEncSw+NLp/FpDTcwu/haHACR5cvzIMjCMWsiGDcK8PwiqnvPhthoBf92Yo7c
+						RQ7/EvQIvQGv1Sp9vGrfDj7BHT5OCpi8tkYMJSQ81+nsjQfGZB9yr/q1LwlHlFDi
+						2mGhuEODCFY1HUmMM9OD1yNH/co=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://el-shib.redbridge-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://el-shib.redbridge-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://el-shib.redbridge-college.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://el-shib.redbridge-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://el-shib.redbridge-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://el-shib.redbridge-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">redbridge-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>
+						MIIEwDCCA6igAwIBAgIRAOIFRAsgYGQ47TBLkuFk0xUwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjA5MTEwMDAwMDBaFw0xNTA5MTEyMzU5NTlaMIGKMQswCQYD
+						VQQGEwJHQjEQMA4GA1UECBMHUm9tZm9yZDEOMAwGA1UEBxMFRXNzZXgxGjAYBgNV
+						BAoTEVJlZGJyaWRnZSBDb2xsZWdlMRMwEQYDVQQLEwpFLUxlYXJuaW5nMSgwJgYD
+						VQQDEx9lbC1zaGliLnJlZGJyaWRnZS1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs4orLy5QnpSUHTjIhQL7VxQd6qXWSwBzqcCz
+						i7/Z+q5PYI8J+HplveLcqL1qC7vpDRYY4qmYukXRFjXFqxFahEovaeIfjBrSYr1M
+						v2TkCIxmwG0vndr/CEUVb5Dq13+Tw5JVg3on5LGIt0FGfYvmOCCBu0skUxE/ltC3
+						tuU6ZYRGNuaX0yCCGTm7AAX9G/xRDWlUlyVTzgDk8ndL1IrTR66xB3Y7ufjlXssE
+						mhOo87cnzOEmPs5hZLiJDsBW6j2I+zYaQjZz97fyIwkLOXenvi/XNA8DiiTqSJIV
+						5WmicXaqC5oBZ0D7J4k2W2qFO9X4DSAVCdCyUgFVTkBQa9+QywIDAQABo4IBcjCC
+						AW4wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFOLF
+						y0014/mnDphFXRx1nl/SCObhMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
+						MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysG
+						AQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
+						YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
+						AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
+						KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCoGA1UdEQQjMCGC
+						H2VsLXNoaWIucmVkYnJpZGdlLWNvbGxlZ2UuYWMudWswDQYJKoZIhvcNAQEFBQAD
+						ggEBAK+y2q9cP34wYcOvF5c3jSUJB4bp4nWIJiWwgE8xJfoVAeGQCoUhQzZn8Fnu
+						yl/HzkeTXvBz6ujlyrZNgn9+DA8ZW3HAJEUDOBqtXZ9gqJlxe3fmO8s1oCy3gxdf
+						p6oXlfSkKHHIgt0njmoa19NgjCys95WCwWjNmbrHQ+q5M03mxHNgtwA/vK7EGBL2
+						UKSjEncSw+NLp/FpDTcwu/haHACR5cvzIMjCMWsiGDcK8PwiqnvPhthoBf92Yo7c
+						RQ7/EvQIvQGv1Sp9vGrfDj7BHT5OCpi8tkYMJSQ81+nsjQfGZB9yr/q1LwlHlFDi
+						2mGhuEODCFY1HUmMM9OD1yNH/co=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://el-shib.redbridge-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://el-shib.redbridge-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">Redbridge College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Redbridge College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.redbridge-college.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Costas</md:GivenName>
+    <md:SurName>Calcanis</md:SurName>
+    <md:EmailAddress>mailto:ccalcanis@redbridge-college.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Costas</md:GivenName>
+    <md:SurName>Calcanis</md:SurName>
+    <md:EmailAddress>mailto:ccalcanis@redbridge-college.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/elibrary.exeter.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/elibrary.exeter.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..6d1d9204
--- /dev/null
+++ b/swamid-interfederations-2.0/elibrary.exeter.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elibrary.exeter.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-28T11:40: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: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">exeter.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDQDCCAiigAwIBAgIVAOP6GrMkKxO9yMqoKbYdziUW5Us3MA0GCSqGSIb3DQEB
+						BQUAMCAxHjAcBgNVBAMTFWVsaWJyYXJ5LmV4ZXRlci5hYy51azAeFw0xNDA0MDMx
+						MjMwMjZaFw0zNDA0MDMxMjMwMjZaMCAxHjAcBgNVBAMTFWVsaWJyYXJ5LmV4ZXRl
+						ci5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKojNDBQ8LbZ
+						Uf61goxjh4qDc6zHNorfqopmt9DY4x4glyXSNWNoR6X0wWdYuw1z5GtkJ3OusPnt
+						27LxXzfuVvlvTUoSGHN4vyfYZJXBV17UY2cQ6fUOFr2sJHVbrdZq/ZmAcioElWsD
+						ju1IVuJhKb9L+1022JVjN14vExmTWTIojSqqVyTBFnaI5XCtscw43Anr0iC0nutD
+						enlLoYcb8nA/e4aILaHDEyeI7IOnXrQHONeGyjl57ZADPbTC2qzR4NaJXzcGXqI5
+						Yy9efygA64gj4AtGZ67N91tW5HvV4p2R+qlqcHibwTw8Enm3gaxW0lVXIyjH1faz
+						q4WWzOT7BosCAwEAAaNxMG8wTgYDVR0RBEcwRYIVZWxpYnJhcnkuZXhldGVyLmFj
+						LnVrhixodHRwczovL2VsaWJyYXJ5LmV4ZXRlci5hYy51ay9pZHAvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUN7GPtVF+uf94nJBrKy9ijZCZCJkwDQYJKoZIhvcNAQEFBQAD
+						ggEBAJfyEYB5cvTYpykqYa21KPVIk1VWE0yN4SF1Z5+fjMMqtUaIRmn7ibD35DOZ
+						G+5tomhmvABCOmJxp9aE5Xwad8KKjOIEA3xbbCrGGt7f6y1BXx6uMlG6AtR0FRt5
+						iuU7ZQa80d4m/MvjkgSqE1m4rb4jpQXRu1HJC15vr18CTCYbp8RNlK2k/vdeVLNO
+						2hFZ2UpcmkXByppuzNmBRcBEWiv5LY/Hkqfo/uZxRU3L3usXS7NkitiutCkw+ONX
+						QK8acXLPGLA7lZvEvn9Evdtmww7nVxXgDn4szwnBDMrK5Oa3iIOfERc8vGwOhml9
+						k/ghAamkGmPY9rRXgtQYfnZ2NwE=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://elibrary.exeter.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elibrary.exeter.ac.uk:8443/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://elibrary.exeter.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elibrary.exeter.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://elibrary.exeter.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elibrary.exeter.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.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>
+						MIIDQDCCAiigAwIBAgIVAOP6GrMkKxO9yMqoKbYdziUW5Us3MA0GCSqGSIb3DQEB
+						BQUAMCAxHjAcBgNVBAMTFWVsaWJyYXJ5LmV4ZXRlci5hYy51azAeFw0xNDA0MDMx
+						MjMwMjZaFw0zNDA0MDMxMjMwMjZaMCAxHjAcBgNVBAMTFWVsaWJyYXJ5LmV4ZXRl
+						ci5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKojNDBQ8LbZ
+						Uf61goxjh4qDc6zHNorfqopmt9DY4x4glyXSNWNoR6X0wWdYuw1z5GtkJ3OusPnt
+						27LxXzfuVvlvTUoSGHN4vyfYZJXBV17UY2cQ6fUOFr2sJHVbrdZq/ZmAcioElWsD
+						ju1IVuJhKb9L+1022JVjN14vExmTWTIojSqqVyTBFnaI5XCtscw43Anr0iC0nutD
+						enlLoYcb8nA/e4aILaHDEyeI7IOnXrQHONeGyjl57ZADPbTC2qzR4NaJXzcGXqI5
+						Yy9efygA64gj4AtGZ67N91tW5HvV4p2R+qlqcHibwTw8Enm3gaxW0lVXIyjH1faz
+						q4WWzOT7BosCAwEAAaNxMG8wTgYDVR0RBEcwRYIVZWxpYnJhcnkuZXhldGVyLmFj
+						LnVrhixodHRwczovL2VsaWJyYXJ5LmV4ZXRlci5hYy51ay9pZHAvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUN7GPtVF+uf94nJBrKy9ijZCZCJkwDQYJKoZIhvcNAQEFBQAD
+						ggEBAJfyEYB5cvTYpykqYa21KPVIk1VWE0yN4SF1Z5+fjMMqtUaIRmn7ibD35DOZ
+						G+5tomhmvABCOmJxp9aE5Xwad8KKjOIEA3xbbCrGGt7f6y1BXx6uMlG6AtR0FRt5
+						iuU7ZQa80d4m/MvjkgSqE1m4rb4jpQXRu1HJC15vr18CTCYbp8RNlK2k/vdeVLNO
+						2hFZ2UpcmkXByppuzNmBRcBEWiv5LY/Hkqfo/uZxRU3L3usXS7NkitiutCkw+ONX
+						QK8acXLPGLA7lZvEvn9Evdtmww7nVxXgDn4szwnBDMrK5Oa3iIOfERc8vGwOhml9
+						k/ghAamkGmPY9rRXgtQYfnZ2NwE=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://elibrary.exeter.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elibrary.exeter.ac.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 Exeter</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Exeter</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/elibrary.worldbank.org-shibboleth.xml b/swamid-interfederations-2.0/elibrary.worldbank.org-shibboleth.xml
new file mode 100644
index 00000000..19c8631d
--- /dev/null
+++ b/swamid-interfederations-2.0/elibrary.worldbank.org-shibboleth.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elibrary.worldbank.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-25T15:34: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">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDNDCCAhygAwIBAgIJAI5LIjhAEpIhMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFmVsaWJyYXJ5LndvcmxkYmFuay5vcmcwHhcNMTMwOTE3MDA1MDQwWhcNMjMw
+						OTE1MDA1MDQwWjAhMR8wHQYDVQQDExZlbGlicmFyeS53b3JsZGJhbmsub3JnMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3S7w37V6m/GqIL1LGWuPeQKw
+						1FL3uCT8+q6+0OervJkZgHCJJ++CYHdSNF9Jb4UjVGWv2sSxTgg5P3eNxUVh5R0g
+						hySv7X/aK9t0LVqQiSsLyLD253BZG85FYZMsNDiuv1Xfl7TL/QQy+B6hTxz8Wgxx
+						lQXIyE8FEZGqdw40gPgwfPQIBMoN9lg4n9vzxSm76eaz6+tWvdmNDarieQWzVJfS
+						VY5ag5yJaP+eed6cg/el7JYR5GKKRYg7NdfK+bxboweqp2Dt/wBZJRGuU6eP9hEb
+						0nw/C0s+DctACkwaFedLMKqtFL1oDvQ5yH2tdo0HlHb0lMDtgBUUSwwG+nnqHwID
+						AQABo28wbTBMBgNVHREERTBDghZlbGlicmFyeS53b3JsZGJhbmsub3JnhilodHRw
+						czovL2VsaWJyYXJ5LndvcmxkYmFuay5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						E/UPyX8ixQSfN/glJWMYTjzp0qwwDQYJKoZIhvcNAQEFBQADggEBANUr3Z6lfY5F
+						hFtckOlFEmhIqflcg1l97HvZjNOuN6oyDELHUQPuwNLePhvw3g/9nlLiGHUKsOSx
+						sJUg2pnhKTYSv9uRZKLnOBlCGYcUCq8ujZbeumMeQkpvNPS9uOXPhk5uVXb7Fpbz
+						idO7RtqcE3SBE2HvAoabnSQEjcfqGgzkAAWHZJleNUcTVLmJXQ0TiCKjbnHAVhw+
+						iuGKiF0alO/SBU25m6KejfGVie/MMQ8jXzXME7dsrLbHkbzmhgDvt0F/MCBYo3Uu
+						4bnQnWMrou+VPRJp4eaUHXVBGBahrzgLvCm4VwljY9141+R58jaaV44VwntYJnIe
+						nkzg8bDWiJo=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elibrary.worldbank.org/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://elibrary.worldbank.org/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elibrary.worldbank.org/action/samlACS" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The World Bank eLibrary</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://elibrary.worldbank.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/eliot.isae.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/eliot.isae.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..871ab817
--- /dev/null
+++ b/swamid-interfederations-2.0/eliot.isae.fr-idp-shibboleth.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eliot.isae.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-13T08:51: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isae.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ISAE</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ISAE Employees and students</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">ISAE Institut Supérieur de l'Aéronautique et de l'Espace</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Employés et étudiants ISAE</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>
+					      MIIDHzCCAgegAwIBAgIUUF5LStU9oX9W8OSO7seziErEk2MwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNZWxpb3QuaXNhZS5mcjAeFw0xNDA0MTAwODQxMDRaFw0z
+NDA0MTAwODQxMDRaMBgxFjAUBgNVBAMTDWVsaW90LmlzYWUuZnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWVaMV3mMeY0J7vAJiDrPzjoYBBnGlWQCT
+Z5i+9tCVoQ67vjsuFZL4ZoRGkjVQH7Dskk1URknskk4/VYv2xyh84z6uD6w/x7K5
+GLAaZErI3jBim9m+xZyt6fczF5upF835K2M7zygoLqytfw++26LrcKlgcRnIIb43
+au+iLlWmsyn6/LW4W1uyvEnZ++mUTpDWTXnSqBdwPcoCDIZD8Gxa1s6X4fOYwPKJ
+/JG+1rsp1yzoTkR40of9ZoufEAj7JwxfgsGw3D234mttq3NfhWznhG0xLEOXAHrB
+bgHiq8/3bOdDP9RlHRC1xQs6wchEHCkN0J2bDixcfRqY4rwUumjTAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWVsaW90LmlzYWUuZnKGJGh0dHBzOi8vZWxpb3QuaXNhZS5m
+ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUo4NH7dIbfnxOrheABU7lrQSs4pQw
+DQYJKoZIhvcNAQEFBQADggEBAAVIAhB9Tzy+3wcWouCFXa4otqppu79egey/moyB
+UmkQbgK/WK/t4Fz8QXSQpxsl6NAgDRoKy2KB853uZ+/5y6Pb52ud4mH5UuO+wET8
+Y+vBglWCCGwAmHXqJCj92bZBmbc2jyCLaB3nwjrhnesvd0gY+QOGCQvIzyBX/5Bo
+n/M8NyW5g94ZiS1rrgfw4yeUcjXdIy8iV0w8PLYlootxA93eTBBBJZmwL5UWOz1d
+vLVV2/HCTPHrGBYGv4LlacaMicPW9OXKWnzG3FNfqXYclvCFDxJJvu4ZojdjgNoT
+b4uZkuDSDQgxcqdqqSriAnunZenW8oqMOHkocH9i2GtE1NA=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eliot.isae.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eliot.isae.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://eliot.isae.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ISAE Institut Supérieur de l'Aéronautique et de l'Espace</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ISAE Institut Supérieur de l'Aéronautique et de l'Espace</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Mouchoir</md:SurName>
+    <md:EmailAddress>david.mouchoir@isae.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Villemur</md:SurName>
+    <md:EmailAddress>jacques.villemur@isae.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/elixir.mf.uni-lj.si-20140918.xml b/swamid-interfederations-2.0/elixir.mf.uni-lj.si-20140918.xml
new file mode 100644
index 00000000..432dfe28
--- /dev/null
+++ b/swamid-interfederations-2.0/elixir.mf.uni-lj.si-20140918.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:algsupport="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:req="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:disco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elixir.mf.uni-lj.si/20140918">
+  <md:Extensions>
+    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <algsupport:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-11-26T10:11:10Z">
+      <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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <req:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/Login"/>
+      <disco:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ELIXIR eLearning platform</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">ELIXIR eLearning platform</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ELIXIR eLearning platform</mdui:Description>
+        <mdui:Description xml:lang="sl">ELIXIR eLearning platform</mdui:Description>
+        <mdui:Keywords xml:lang="en">ELIXIR eLearning platform medical faculty life sciences uni-lj slovenia</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">Spletna učilnica elixir medicinska fakulteta uni-lj slovenia</mdui:Keywords>
+        <mdui:Logo height="93" width="150">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJYAAABdCAYAAABHLp+VAAAKQWlDQ1BJQ0MgUHJvZmlsZQAASA2dlndUU9kWh8+9N73QEiIgJfQaegkg0jtIFQRRiUmAUAKGhCZ2RAVGFBEpVmRUwAFHhyJjRRQLg4Ji1wnyEFDGwVFEReXdjGsJ7601896a/cdZ39nnt9fZZ+9917oAUPyCBMJ0WAGANKFYFO7rwVwSE8vE9wIYEAEOWAHA4WZmBEf4RALU/L09mZmoSMaz9u4ugGS72yy/UCZz1v9/kSI3QyQGAApF1TY8fiYX5QKUU7PFGTL/BMr0lSkyhjEyFqEJoqwi48SvbPan5iu7yZiXJuShGlnOGbw0noy7UN6aJeGjjAShXJgl4GejfAdlvVRJmgDl9yjT0/icTAAwFJlfzOcmoWyJMkUUGe6J8gIACJTEObxyDov5OWieAHimZ+SKBIlJYqYR15hp5ejIZvrxs1P5YjErlMNN4Yh4TM/0tAyOMBeAr2+WRQElWW2ZaJHtrRzt7VnW5mj5v9nfHn5T/T3IevtV8Sbsz55BjJ5Z32zsrC+9FgD2JFqbHbO+lVUAtG0GQOXhrE/vIADyBQC03pzzHoZsXpLE4gwnC4vs7GxzAZ9rLivoN/ufgm/Kv4Y595nL7vtWO6YXP4EjSRUzZUXlpqemS0TMzAwOl89k/fcQ/+PAOWnNycMsnJ/AF/GF6FVR6JQJhIlou4U8gViQLmQKhH/V4X8YNicHGX6daxRodV8AfYU5ULhJB8hvPQBDIwMkbj96An3rWxAxCsi+vGitka9zjzJ6/uf6Hwtcim7hTEEiU+b2DI9kciWiLBmj34RswQISkAd0oAo0gS4wAixgDRyAM3AD3iAAhIBIEAOWAy5IAmlABLJBPtgACkEx2AF2g2pwANSBetAEToI2cAZcBFfADXALDIBHQAqGwUswAd6BaQiC8BAVokGqkBakD5lC1hAbWgh5Q0FQOBQDxUOJkBCSQPnQJqgYKoOqoUNQPfQjdBq6CF2D+qAH0CA0Bv0BfYQRmALTYQ3YALaA2bA7HAhHwsvgRHgVnAcXwNvhSrgWPg63whfhG/AALIVfwpMIQMgIA9FGWAgb8URCkFgkAREha5EipAKpRZqQDqQbuY1IkXHkAwaHoWGYGBbGGeOHWYzhYlZh1mJKMNWYY5hWTBfmNmYQM4H5gqVi1bGmWCesP3YJNhGbjS3EVmCPYFuwl7ED2GHsOxwOx8AZ4hxwfrgYXDJuNa4Etw/XjLuA68MN4SbxeLwq3hTvgg/Bc/BifCG+Cn8cfx7fjx/GvyeQCVoEa4IPIZYgJGwkVBAaCOcI/YQRwjRRgahPdCKGEHnEXGIpsY7YQbxJHCZOkxRJhiQXUiQpmbSBVElqIl0mPSa9IZPJOmRHchhZQF5PriSfIF8lD5I/UJQoJhRPShxFQtlOOUq5QHlAeUOlUg2obtRYqpi6nVpPvUR9Sn0vR5Mzl/OX48mtk6uRa5Xrl3slT5TXl3eXXy6fJ18hf0r+pvy4AlHBQMFTgaOwVqFG4bTCPYVJRZqilWKIYppiiWKD4jXFUSW8koGStxJPqUDpsNIlpSEaQtOledK4tE20Otpl2jAdRzek+9OT6cX0H+i99AllJWVb5SjlHOUa5bPKUgbCMGD4M1IZpYyTjLuMj/M05rnP48/bNq9pXv+8KZX5Km4qfJUilWaVAZWPqkxVb9UU1Z2qbapP1DBqJmphatlq+9Uuq43Pp893ns+dXzT/5PyH6rC6iXq4+mr1w+o96pMamhq+GhkaVRqXNMY1GZpumsma5ZrnNMe0aFoLtQRa5VrntV4wlZnuzFRmJbOLOaGtru2nLdE+pN2rPa1jqLNYZ6NOs84TXZIuWzdBt1y3U3dCT0svWC9fr1HvoT5Rn62fpL9Hv1t/ysDQINpgi0GbwaihiqG/YZ5ho+FjI6qRq9Eqo1qjO8Y4Y7ZxivE+41smsImdSZJJjclNU9jU3lRgus+0zwxr5mgmNKs1u8eisNxZWaxG1qA5wzzIfKN5m/krCz2LWIudFt0WXyztLFMt6ywfWSlZBVhttOqw+sPaxJprXWN9x4Zq42Ozzqbd5rWtqS3fdr/tfTuaXbDdFrtOu8/2DvYi+yb7MQc9h3iHvQ732HR2KLuEfdUR6+jhuM7xjOMHJ3snsdNJp9+dWc4pzg3OowsMF/AX1C0YctFx4bgccpEuZC6MX3hwodRV25XjWuv6zE3Xjed2xG3E3dg92f24+ysPSw+RR4vHlKeT5xrPC16Il69XkVevt5L3Yu9q76c+Oj6JPo0+E752vqt9L/hh/QL9dvrd89fw5/rX+08EOASsCegKpARGBFYHPgsyCRIFdQTDwQHBu4IfL9JfJFzUFgJC/EN2hTwJNQxdFfpzGC4sNKwm7Hm4VXh+eHcELWJFREPEu0iPyNLIR4uNFksWd0bJR8VF1UdNRXtFl0VLl1gsWbPkRoxajCCmPRYfGxV7JHZyqffS3UuH4+ziCuPuLjNclrPs2nK15anLz66QX8FZcSoeGx8d3xD/iRPCqeVMrvRfuXflBNeTu4f7kufGK+eN8V34ZfyRBJeEsoTRRJfEXYljSa5JFUnjAk9BteB1sl/ygeSplJCUoykzqdGpzWmEtPi000IlYYqwK10zPSe9L8M0ozBDuspp1e5VE6JA0ZFMKHNZZruYjv5M9UiMJJslg1kLs2qy3mdHZZ/KUcwR5vTkmuRuyx3J88n7fjVmNXd1Z752/ob8wTXuaw6thdauXNu5Tnddwbrh9b7rj20gbUjZ8MtGy41lG99uit7UUaBRsL5gaLPv5sZCuUJR4b0tzlsObMVsFWzt3WazrWrblyJe0fViy+KK4k8l3JLr31l9V/ndzPaE7b2l9qX7d+B2CHfc3em681iZYlle2dCu4F2t5czyovK3u1fsvlZhW3FgD2mPZI+0MqiyvUqvakfVp+qk6oEaj5rmvep7t+2d2sfb17/fbX/TAY0DxQc+HhQcvH/I91BrrUFtxWHc4azDz+ui6rq/Z39ff0TtSPGRz0eFR6XHwo911TvU1zeoN5Q2wo2SxrHjccdv/eD1Q3sTq+lQM6O5+AQ4ITnx4sf4H++eDDzZeYp9qukn/Z/2ttBailqh1tzWibakNml7THvf6YDTnR3OHS0/m/989Iz2mZqzymdLz5HOFZybOZ93fvJCxoXxi4kXhzpXdD66tOTSna6wrt7LgZevXvG5cqnbvfv8VZerZ645XTt9nX297Yb9jdYeu56WX+x+aem172296XCz/ZbjrY6+BX3n+l37L972un3ljv+dGwOLBvruLr57/17cPel93v3RB6kPXj/Mejj9aP1j7OOiJwpPKp6qP6391fjXZqm99Oyg12DPs4hnj4a4Qy//lfmvT8MFz6nPK0a0RupHrUfPjPmM3Xqx9MXwy4yX0+OFvyn+tveV0auffnf7vWdiycTwa9HrmT9K3qi+OfrW9m3nZOjk03dp76anit6rvj/2gf2h+2P0x5Hp7E/4T5WfjT93fAn88ngmbWbm3/eE8/syOll+AAAACXBIWXMAAC4jAAAuIwF4pT92AAACL2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iCiAgICAgICAgICAgIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIj4KICAgICAgICAgPHhtcDpDcmVhdG9yVG9vbD5BZG9iZSBJbWFnZVJlYWR5PC94bXA6Q3JlYXRvclRvb2w+CiAgICAgICAgIDx0aWZmOllSZXNvbHV0aW9uPjMwMDwvdGlmZjpZUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgICAgPHRpZmY6WFJlc29sdXRpb24+MzAwPC90aWZmOlhSZXNvbHV0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KsBaN+QAAN0tJREFUeAHtnQmAXUWZ76vOOffevrc7G6uEhCyECIRF6AiIKI2D2SCAYJg3o+MuODM4OKM8ZQlcCLiN44biI6IPR2eeEgeQAEkQpBWRRYIIBhRCFpbIlgTS3Xc/57zfv849nUuTQLOmE1LJ7bNUnVr/9X1fffVVlTXb3VZZA/EVxrcnm/DRfx2TH9mR+bhn4mMpyIH8domNWW5is9Sa+CftF66+XgVMw+v+jXD2jUhkexqvbQ3cXDTBUUXT6Cnusa8Xej8s5LxDDS0ZNWJT5ZfPesb4xtSrsanH8aWF9cHp9uLl1TcSXORgu9uaaiAudjlQPfuFPSb6obew0O4fWqpEcakSNyqNOIJamVI1CkvluBFBtvA/tW9k/TKVURQuLpo3pM3fkES2poYbynkVKGyxu6E8ZjLev+fb/YmlvrAGtQJPccDrpD2t6FUchFHcKPWGpr3N/2DfuRM+mZaNwK87pxrywHojKiGt8CF/XdMJYIwpFye8m8vx9UrExXqgZJPtaK0V2Gr84JPxP8XF0QVbNJGZs+nwLtxr9GeTGXqN4n5NoqHS4niOeuCb27kONnppqFqIGubIQpvn18OY5zjAb5MuxoNfplpzIfYvh9n9NxnwdXg5pIFFpTiSbRcgGwAuV7mvQyVsFVEWjXXURpm10R6qGf6LZL2oswSCJZp8xvomtmNfNPBr6ClSOeRcIktQaRdPyvae2/hSYOwie8HKX0pwjYvdIXW1uU465Moy2AwlQnWX12263Sddpotrd9QPJve25Q+IGcqVMCSBZYqi4PTQf1le7TtnwvrQxAt75o6fjuD66/iUzkw8f2ljWwLXzagPABBCeXcLBep2KEpVBAKYKLjDU2wfg4bLfzAiQhx41pbrcWgD+4iL9A34MyRZoQMNpF/lb79w5bzYmu+R0ZtKxfGH2flL6+aUzqHZIV5Bg4nFH+VAZUylOHFy37njZvaeM35GpbjHREXnVAQSAxgRPnnGrgW9C1B3omKoZn1LtVh1sk06sUFcI5t1N3/MP1e/b5MBX4eXm8vT65DUy48y7a36sjR3/BWxid8XG//gjnkr7osv7czYUwHZVuwEKsmPfcWxo03kXwhFOt63ZgcVCYL0NMzuZ/V6fO7ILz+yPi1mXJzS0dfo+zigOauQ9XZBZ6U6QFpIOmIaLrlaqGAcIOibUiX8ePu81T8UQMURaPjXlZMOSYqVVo7rrbA+PRfmrTqZ6rjXmuiWcnHiHgKVwJWG3dquKah6i+PfYkL/WhSZH80Hdgf1dP0KGbtzoSM4Lch4VwGmrMpXOmfCp0th3/9Ap0ZFkZ3TV4vuLwzzM3wgyUH6LY0am7+44VtA1eGbvkp0uUClOOReb1A103BpDek/y6jYKcVltd6zJuxq/fhBMvt0teZ17vCVFc9J5nLscUiX4PmZ65eVeI0MeVlhuPfxUg+KzgRTqdzUAC4ZqI2FKv0CPw1aKrz8zvB5q29TjBuK4/cOQjM/n/Pe5dAImRMZkiAm6avGlE4jjC5+4KmdPjsVESIFs759vZ06x1bhUtZXLo7vast6N5fL8U2FeSuPVuYh703hd6soikkb+Nlzxk2Ahy1tC+wo5vhCKJGvUYucsBFH0DK94zk09kMdF6z8sfPkT9rZHvr0pNzoEfUP8sFJfDIJgOWiKN7A891E9qP8hat/pW/SNNPvX+/r1gMs9WY0xpJJSueO/3x+ZPDl0vrwkvZ5K/95S1Tcq2mYm+kIEth7z9njaM96vxSIIk3svVBOiiSg10LT6/vhgW3FR1bE356UM+uW161GiU0LhzQvcXH8yL6azbVnqz22uKa08b2mgl5a55WGfy2uW83oSh242ZlN4YJVX+mbO/7Iwsjgn/rOGXc/piHfNVPwv8JxgTTYa1E/ryoOJygzDXP/6Iotr2mLOy9FTYI81LWv41hMxPhoAKBG/SV7YXLOK44zYT2QUL/C3LK8Qedyaon+SeVllJsOZ4urnm2NQcCjM0ak2aLGaA3x+t1vNcBSFajy7kKmkrxQ96PTSs82/pDPeN8pnzN+GZXaHZsuypNM0r5+VTa4mDdSk6UbG3V+wpLM/V3Aqds0auFdNuM9ACvcpxJL6HYTyS4BAgh9jUzGZhtRvDofRMs3lXJKiQCgNefzA2TqZKbIUAdrhk1980a8U/63KkdlW3MFpJ1KK88d/5G2Dv//MoP/qI0a7yhc9Njj0s6nFgBbqmCiVGmDl86ecEjsx7vFnlndUVx1T2ue1jApPCLM/paR3UGlDWEdP4/SNdsECSu2PqM629cbntVx4aovubLrz9BWursiDml1Q2sjpPfUemwWJE/5easuL/VG/1PYITM29oLv6q1AJUE1Df9GX6+Qbgp5pnLO2D1h14tiL/4teb4aZcDtfXMnLOgp7rmL8sRo8JOASlQoW+qJbi3kvQwGe34GmUpyVSHjSVVgMYtZ0D52x6+5ckjG3ApApbxudcBSpsUSUx0WA6fzSuvq62mE43vnjv+C/IU717v18AY6Afpk5Q0hmvmTn0GJZvgezI485DI2Vyh47/cajf9B2XtTNjDzoU03hI36kQU/PhpDvS+WatHKRhiXavz66vFDlVJ4VuHJHT/gdHZNZeobWJxXldRWxwpbS9s/ugJQ7QX/S/TuehTbo4ddtPI3qXqiNfzree+AXIRLQa36zh3/j4W8f0mphIGLczBCqZgQokWZSuVoBTzvI/l5K29pzRNWoaMybXYCklFc8TMP71hcvkH+b7SqoDVPr/R+qxLeBxaya5kIE/OJvY1vMbY+kVHi25FV/iP+ylvfQy/veUPlrSaoXB5jc0gyho0jem7WZdJ1Yes0mPydn79w5S2JwN0F204mn23RTd20TN8kHAWwbjEhfGCdD/Z5SABrzpw5/tNPMzU2wHV3uwrfOKpK/PvDOZaYCOtlqMRF1Z7G1VCKqeXe2rkEPcPJWy2C9IDoX/WjAwaxpHJP/0jQmr86yEOjNCknJ3Alo36ZRZmce6lRXIsZkCjT0lGdXufoYfGCZd3x1ggoVy7+DAlgLViw4MV6pJrGdfpisehkQq4Cm8cVP3dv2i9Y9Yu+ueN+TlO9P47j03vPnXADmupfGtPFNwlFSAv9aq8OUCc7QdrlWwI76Vh7cqrqiB9vIikDnGCHsQeVqrN6JodVAlQsuinJQxdmxek3hEQ+MyaxEn21edzS3/f3/i2QkRQwdvbMaUdFsbeL75saoGCqy8YY3eZgJ/cuXLJkmfImUDUBNTCrXnN43ygVGdqH8a+Y0G0vlcI7e0rl97zla0/29VOSgV++gmcQDoFKgD7w87g4aXhf2DgT/8/mfJtRbwgyPMl2CrMFfcW83wXt81adp28F0JTaDYxra3/eYhRL1IZfDBvMVHp7vpHPZQ+o1euQgWSgmskFplavfYoKXnbKKadkCFvv7OzMjN555w/x7giCPdww3mXXX3/9E90JVTKF4so7GeL/mIb8FCYlhyAq/xth55n7ncSzWUAMthHBRX8cUMT3Av+/17ewtp8Cm7ZyGH6tfYfMJEapfy2H5jNebEbUouhjAGgHrxE/AZn9Yce8VT9y34hFbwGN+GDL+mrDbTFgbcz405iE5DIhk2U0P/OnsfU8z9ZqNaY/vKUKN3/+fDe6AlSX5HLZT8iU0vcYaFWrx8+aNWv2UcXrn7j5I11tR13eXYn86OJSxb6/0GZ3QlL+LBYRv7DFlfdC1QLD/NzGdF/BnVa3wK565477+8DG/5UrwAGxJ2f09+FcYK2PQV15Xe0nsW/PGFZc+YRSIKuXPXv++BGjWqZbmhRW7HybdQl52ALFQzB3aZdKwS4om3eM3Cws81pMY4g/cF3hlUrLm1mLj5s16928/kSj0TD1er1cqVbDXDY7NYhDUTDzdN/OLPo1dljxkfv59j/FdtrbvBGY2RTljyDckL/uX4lzis9ER9WGRH5GLofxXF9YQXVQywIqJoobveXoHwvzVv8DGvYnpO5wLBiFZgqqmwG38kBetmlQqX63GLAm9/QkjRwGe4GBXZCt1OpwD2MdNTL2/qu7u5/ViFEZZSptDKSMFSdusa8M39BZxWqhsfI/mQHA8n+Z5AzimNu9FFnmSYELML6vdO64kxTGzH/lJs1zpoxHEJeradplWFQncgin3mhhH9RxTYff/hM9oyBtk1JT006iThrt6XoU4CY/fLjtuy0GrAeHDXMVjKCxfxBgxQ1IhAOqPAGcMX9oVr9rvND4d0HV1mcTA+7Y9/02fePF9laFEwAnXby8pgZsK654ELnnv/WeSWri9s7U5hlOg60Z/5fhRHWEeSa5KzG2T6UwdzafjwUgBpwLbIEnlmjMn8yyZWXdGLNKRnvOWaiTRnu6pu/eDNctBSwLK0zkHRsfKNaHw7yDQTnjp0bIqDuK/thsgBDB3UNIfxCt0OnIXuuQwYIwDCPY4teuWbz4pwo3ZcoUqYxi01wtHHlmPlMka7WbQT5jOndsD05x8TnLgmbML3IRyJ11KlRHVKZ89sQjSqMa3chuZzGnl2XVy7NEHWFC7PVtaPwx8v3PJ3o1CNibDESbqsYtAiyoi0uXax4o7CvKg+MSx2KDokyB7z+QZhhguQALr1/yY8wpO+GHJyI0v33hosVnKIyAx89RBJkpi2oNL676M7Tv51qALtiCuk/LvjxRmna96KBFrMsZFbq4pmRRvhZjL7qhUPAPE90p18Ifh7E9jDhnlWrx+9r94N3Dig//qUi620GVtNqLVnAS5LX/O2oFU2VodyobNkykKSY0gSUARB48Loyjh4L16x9tSVnAos34LV68inv9nCvCkVJQNV9x6SL+bsxO4kuhWh9ChZSHyuyJcvJUPM8/Hz/H3jYh77Ta0PcVxx3cF/Z9sz2LTTncTsI6n5yNgP71Zlp/SdMUmLeDKq0N5IONtxvvRAHSUdvOO+/sqMVG38HfpdM0xAVvkwjVdJ2dKJiXIrjYffmx4iQhNvJtssX7Ftx2m5NXxOLQzFtROWlK5zD3RrxePp+PDz300PoLQUWg80ivyKhw3uo/YPGwMJfxTg6lpLTmlPVnT7h8VHHl6vMGGAUmvp1BujADC4R/iUIzrz3nDRfiNXGMrHZq+4UrbiQFs7LY1fbA2sfifM8YOyzbgwy16aVokv0UvtVRnkjlUf1srn4Jo/raauWyFwBLFUFjCQivdaEcR1IFjx49WvHDnuIDAz8w9Qa7hdHs/AkEMobzziBOAFc4nMDlvuE+vZpFixbJrz9ePchJJurXtsfe96uN6OQwcpYFo005/gRB5mqOLqVabkoGq0uBw7HLML64LWPf7yIjU6VqfKMX2U/kL1qx2r3jz4RidyW5TzUi7qk1L+6+Jd/pp+66ufetgVT+TXac1kBD9P55wGoWJOzq6mobXsh1QWMOwAxlJDK1E6xhWaqszToJ39Jvgkn1Ug2tn2aRya+vvv56AcWBhzSkcW+SKLt/k0IJLIhD1kcgV4P/SYmsWbjQn790aX32jBlHgLaTAFxz1KXQtkDARdctXrxET/wU/0aHtl0PXwtW/Opz4fhfQ3mOrLtdV+JPsi7x+7a44pH4ZKkBuhjxMZDAiKv3nIlH2zC6tJDzJwrrUiOUG9H3Vvntn5kyb1ktPsVkTnxs+gersXdgBlu9Zn2oDhuh71923XXXrVAdKl2V8YQTThgZViqfMp7ZBaiXiDHjxZgfx/H3/EJjfaOc+QB+u/Gc1KsGL7G4iK3ZRuO7xLFGHX0wIFSaQ8n1AyulVMcfM+3wOPK/TUk7vcB3Y3NGYVTyJgSSTZQE3Tn15FQHzjdsNCKA8bmFixd/gxfxsmXLaBNTe9+0abuApr0l7DRdjHzFFj2NR00QPKR36ydOtGKZuCMK+cJnNOUjJzBKyK9Wa07GYaonWAoAnWf6p0g2mnLP5+eay3l9ZB0lJuv0doWtfZTn881bJsmMuapPes+ZcIa10ZexP8cWLzYY29Ha8edgp6k8Zex8Uz92pv3w8EL+SBS0Ds2ZTMZwX/a8+n8qHokQPYmOLkKRuwPKjrPzuXxHtVZjs7SMlLsMTuJKoxL8TSabOTTSCFgIbnEB9c6k6QhenQao1AkVoL+iWoIO2VvXu6BQgXrFMcccvU8UeVdns5lONbhAIdak6RUqb321Wnl2078a7+Vf3aDGh7UZKE8c1hv1gK3nqJbisce+d69mLTiZo+55e1JTeyh+HFCRCYAbwf3l2muvXdMM69gefu2Kk/wQY72OqkGNuYHwbuEmwGoG33hRfN00md40GsF15Wq8vJAxAUvWldon3OJX9uVcj7Vnae64H7e32a/yjbIgUG2A9r4/FdIf+vRMZ+YiSo4GN0N9GPJQS35oTaL49p6emuOJrTITMBpFWrFARTn5zF17ydrn2traDlXepPR15VbZ+blOSRZB9UebdRaT7gvkNH07lJ0qXoI6tcNNlDmHaZKdqYgaFVuHgnjoge4BYzMY4h8e+wy3rP/ugT/CHslqy/c0jD0YYv4l1zpJLzMAQVEP9+veON309vYmSPLiKVJyCli0peQrtzCTqzau0OT0RhZgzSTCqMtKVam5REW1KgqCh3Wzfv16F6fuW13XeYk8NuxLy5/m05+bwBo2K6ujixrDAoe/Fbiyob0xXwg+yIixzopig37qETbvnF64cPWVonj67XUfU8q4YcOCXZALx6jxm44Gd4C4N63DJoVx3mHsTSavw5rhUbTGIc8d8qxUKnfQT26h8/2OTnNr2Ah5btxLfayi+iW//WDq1He68hG3S99FupX8CU7p7JQcE82ePn0KlT/TKSfJPMYrmWYP+v61ixffNNjyHD9jxu9pfEe76X6uR9Jd67HnOfmoo6PDgRivA8XO6PV6BovWEyUCYvcqLUZMYpnhtGnT2nmpaR/nEqri4r//mmuu6dHL1sZMQiV/HQFoLsFHvrkSFng6k8X5SjUSKfscUD4d1qh9PKuYDOfwv9cP/JPa5z28XNanGl0qjlM6e3xWbpmo5o/zrd3N6SrEKT3Pjxg6RjZR5kJZAoEAttwso30b8alzOeADKsJHFXrRh65ZvGTB7NmzCz2spFBuhw0bJk1LNgx7h9t6MHJDpXK/5DR+W6UAHyDHRE6O8e0RgeePErBEQUSi6UE160VOkFYD05OqkydPxtvJPUnrcStZCEpkGaVVmUU+KsO68HpdIz0m02gZ4PJkHNQf1QdiuWoAoLG/wCJxVcKMCxdFPYxFnf0VLEVEyuRyZmzcMHtKFlG++Ab5F5V3bO6Wf7MxXUPqeaBbsD5Z11eYt+Ku0twJv/Iz9hiWs9cA2FiJNlCqGosccuVK/NtIoCo+/FRiL99dN8UktrSO2BNvis9CGldHlEuUOQqjXii4qKzR/GdXc3AiQNx1++0Hu0IkI1mL0tdgRvMbZgsYKhizcOHC/tXKesbpWYtOH9FDKvfqfmtzTrZymY7MVC+gH0NBaDw3EUzveqRhggflP2LEiIpAQY90wVv/FGfPdr1Klbn0jtsP4HN5s4mFOjUADaMHFi688bH0m0KhsDsDzclig4BKgWUrI1lldVvYeLgZDjyCooa/H5kZ6ahZQtmc/IaXA5Yas1sBN+Oaq2baNNfXa6L/hsEfA6CyqCDYX8PGUKoslOqXhY7cSfbzf+kZuAijSTGSvMTmYI9Ok9aR8oyosKqtVntIyQuADyZWG9Gdd945lt7D4CQZzNBVHaunZ7heCWikj4tSmUw6LcUhwV8i4+jRszWV5dLV+63NuVGhSLIJ6weIgjjpEXolNoh7UIZ0XPXgQx3cS3mkThXDSC/Lc/nu226bSDeerJEhAR2zcHGaWPN+Ed+LVTRIdDIVvZuAhaOlxHn5wsYPLLjxxuf0EsVoAyBDwKKpWS9IWaaTr6Bej2fi+H6FS6mJ7jflnCa9uLSirYDKYe9MpQi14x/6ipwXQLEWFXobJ9l5q8oDQaX4KJsrs+qI0ciBTfFK0WAs40p5f5pnsWTK6ARtBKq3UvYxUDTqQmWzNuH6xrH6FStWxCnLVDqtLhkIt3CFVs+t5N4Bi/H1eIoPBXHsRkKyBE3q3tzULIcUlP0z9psoW6Jf8v0JcLXdnNEegahLX5SGinUKT0AoEAlyBwQZFKMM8HjSO8feSNBNPKs301tdesTRKXC6JuTi2E9s/nzlkiV/5fVm5Sv5pUCJWVbFvlI/Y6HFe6FOzsu1tkRvG//JfuOxshSqZg6y0any3uhSSqI6Ih9vHciSiaCVJYuiOypDvAcGQcbJV6LKiTzZeJbKdWyzOfmwMaFt7M4BC8qxn58JEnbTpFYCBCYpE46dMeN93IykYTcpx4A/SzhtWd9DPHMC2EPTZsrJTbx7LvJjJ6dRd03SHh+k3k6cEA/hj96MOoHdgB2waEwHwGOPPXb3OGxMEWVz4Qihj9LGfN7IcUDDpKAqnT1m95LvXQmoDsEOnhV7+p7cYs9FbuBl9n+Vz57wXXvyytVOYDfJCDmNLmVVzToa0WTJDuDIoIrMmfe0ylfuW9imyqiRIPltcgC7om34sBXyX78e2bZVVnUfbTt/HLCo3oPRLKTsBitH1T56Jc+eFlj/tMEWF4QJVGp7CdnIuT5xRqs8L+cqUzKaBgH04P1SsCTpYNEQhk8xunLsTfOAStOLavvS11OW6QR3sZbYRo5PpNRkYP5SUJXZf4rx3zWoF/YDVOg9rMWEJhDNQoD3maA22MaPxUJhOq/mG5ZcDYjLKs/unee11pEb3CA8rmED0H6WvL7JNp3GvVo5QCKBnOpDIANmfyI+UXfFm3i6ENveH1EGyu0d7EiCZI+mUxej9sS2Bv/jWwnrEmr5GOrP99Yuk1pAQrCizlk7HoTsKWApuP4QVgk/XCiMWq3ncjnRG8WR1yktNEBPAifUcAOM2skpKTXRN6lLQaW9EyCkiwoFQFWO6hQyZvQXsCXerZw5c4U07CRad7TLxCeSvtsKyJnMNCMjz3zmnD6f2lpHYsnU3J8ZCT+mEK1AqddLe/JqTycSUDjiRh9IEWwy4NBMAf683nZdMHPmzN0p4xRVQjpCQ5/ClFl4pY0b3wFXw5nVH1TvQlCybILBzIjqEqpQq2cgWU59gOwhEGnOcV8oWUfKUhROwMLdJ+rQZG8p2327WgOn+KCgzlZreaPhr9TLpuWDbp1LQSVKxUTlde157606rEioQPmZhWo9ZfzwZBva3RqRfzJRZ7SdIu7I0lnjDjJfXH139xTeOmXARsH9ROqIIeS+aR1Be5JMxcbJjs08R2l+vNiTVWwOVqnIE7bpCuy58C6z2/ifIBtFe2NdN7pJQVRhrtJoi59dc92Sm1+L8ota8WvKV+YgAYR6RvlIbwa1rb0ZfZh6c3jCCV0jwyq6riY7UT5EJaBt9yxatNjN7xGnQ4X83OgPO3PtQByF9hcCVRlKJUi2ZW0WG/g+kH1yvvjomrXFSb25Rv1P7Tl/P9ihlKNtpVJ8DNHcLW19fF5KRBWzhDEj854WlkxPI19U1F3yT1ky+XEdkMnyTketE5kyYZth+Bhmrw8o/ETUEowIdbvNuiDyvM5M0D9CS4fzUvq5SoCi5VJt+SupBfXiJgAcCPhzUH88kvwBCwpHSe5OcIcNJtSgVniricPxKa54mYwcjecakzgF1iTOpnZdm2qYhncVLG9/sT9A5bHLi88UjUDwCbY9cgcQYB6zAWXpDbDB/chLIgDYeDY27V+1lnP9io5FxykFAv6wZDeB7DpHs2P08mU/SyYvbp1kFyoVePfBTe7tiqoOgTnYA1fdcMNTetHKNl2AbfAPupi407WkKhinSmPqeSWrFR7Ws0D1ciuiqHYsFvlflJpCwHIgAKQ7k8zeTeqoBJ0pMvNkjwb5RMmYCu5QsoNhJ07LrXyAQEb8jSj0kpFjU78UaSSHhUJdm70Gjb6fsgqa0Z8bYmqE7+wGMMQ5ne28fyocm/MxAsWx5v2GetX8G7dtmuIhM1N7Rtam8nyrYchA3jCnSSgQQ1dYsnOqo2bnix5uG/7cCr0VAFN9V3t7+x5xFKKWSIgXiTnOydWNHl9sJOtS2Eb+iAq4ERrlcRUuCsLtXel0g+QeXqhCB/0rIksBJtWsvjFN+cpkvVAWDmObbEQJObmJlB+46qqb1ipsSh2lGHWDAMll/DRqJbJVUeQ/pHALFkxJjPlkS4WbEPVe1l7wpjHvh0qByRcKgYBuKnXzA0D1bSlIKRrGfMucfgwrjLvqUbScUaF0HlWoHB/5MxSXVk4vaNrla4RHnbTWUWKFYc09CxYkVq7qQO47/qC424/OuaMT3MkDHskcqP98tpmG31aviB12L1iRKsY1hkOXiZ57tQU++uijR8AW2lrjQZw6DCqUKF9JGL+mJVLslIZiIwLynDnvyJMx2MnGYSrzt4pqGaOwp3Vzc7HbbRepe3bKuyif8/8B9iealBSB6UTUCOiQ4qlsgHsLCtJ7CPdd7a+gb4Z/6fG1jDVukcUDzi1QJOw07XFqi4ZOcb9LMKpWtW3uRMl6AEyBmZrhX3OuUtRYEYhq6cro5J0Mftyt/ohsYn/1bGRDV8ZNjWQVbltzEpQ3UBE7IEtLILb0ZKZn7MmzZ07HstFyeqdlLQLVOEjHyFL1PoZfBYXYB/mskmqjURq8G1FdMcksxDUIoNb+UU4XtHO1KouGRqVnxH404SSnNMU8Cn/aNcIvASDPdumaZMErO8x8rC0wZ1XRSeGkSdV0nsXO3bWuydgDHdQEoGq0T7lW/y/C/U6B2W3vZtZHf5TbbC1ZgHrgPqPXH8jzXTu3J7MEpHUE9aMZBFE6Hk0GqzAJh07pKxZY5GWTQpNUPLXJ6tOZCjpXvMLatscJ9oKRrN5tiy6gJn6E8P6vKENzKXwg5aOZif/bl1tg1bowKEvJDT0986+66aa1yBRZqFDthFmz3sbqm+M0w08Tt9EwogD6gE8abnpmFAaFLgobfwhZqwMLCcXnwmpRaz1MLCSWf3pSdurFS6ta6wfL/K6+CSO2C2L1WICZBDJVWK5FkhExBVUUtg416mAIekul7i9TeDmM/n7PWX7rOctvVIVJaUySZeVwFF53HcU+EO/Q8rS+no9kKQ/RaD7UKP/Yq4XE5YCid91dXR78Pjp2+vRDKNN7RLFURtUH9m0sxCj3pKIFCNQn27wL2tqHnV3t3fAEHZ3hdrwTFRKg+MHcUezgZTsIlsmUK4jDXnSxvpY5ja70YhammscxvSkRSJRFsOJ00LiGRb0bLcm+XZp53o+plCt/pWHW8ymUJ5bgjmbErFJce2H5qUUPcRjpBPc2GenxmoGIsVlCMwM5d82zwdcn7egN66n2ObzrO7E/XdMtvYflVi0vh+Pv8TL2KCz0sVMkPzbuIsi/K9zovucOqKFZKJcrK3nEFpn5mTDs4H61ydZl3pIK7rrVwOdtsG+VsVfPlINDvys7cutGj3pXFNjfBE4yjaYYvgpl+Y/GunUjjbrbK3QV34+hVl6tWq0vWXTDOkUjGy1dvba2X1DhS9AavgCwj6xdKwA5h3lOvVpd9ym/4qxM0temj/Y4aXyu9/rmGy80l+QL/l5uqgZFJ83YyOdtgJy1QFtXN4O5tPsj4QaCCvyWOtMgeFijd665g9dH8UO55tr8IB0ClWexxRG71P7yi6cKfzMq3JjnsK0BvArhwQcftu6aa27qZ4FKoxpFP6f6rmktYzUIvFqtrjpO3ZsCWNK9eJITmqO/tPCv9ZXOO6ieOqhwnOf3eRSgX3bCunLKHDbzgTKBWc2w7PB2lKDxv+/abvp2qpu1VbucIJMUbsfl2kPBsduUavWdM/4E2OdVOt5WJMYZHMbRiYULVl8lEEIFBwuEQeVd2XgzuABgOQoi/UqqQX41BZehGma2MQK7a8BmXE6XhZzhyy+NvyVsq0rDMjr0Uz9ZDcznm98dVM0c/o3byuWz9ziCkdeFDQnbcFj+sqbKCFTSRn14GKCShz3jyT4MV3X7PJeCpbP5lmny+5jeeYI9GN5Sqse1bM5myxV7GN5XdZ/f5WOWbNMNTPRJmq8B5ZOXs9PHzsobWEZp2l/njqv0h5RTLxvyLl18+sTndm0fls/fglx1UKnqtPUa1UY8e5zJ9zMTmM8Exu9gpGer7IyWw7PKvxz/ashpvaby2GgOLwKM/Qc+Ke7yfeNvzLd5XeVKVOaaZ8/1Gzn86b2qGGnhoXIvYN/y2+42XwNuyL957y3v40DQXHw6PN9WZPEDoNJEj1OCkkEbSXiHZb3bhuwMG4a/DW30G+blbuH+liAMdO32w+hOToK40i37Eluewx+xuuS8mXvFBnEonXSJ9pacpbt09xp3v/3PoGtAPX5ou0vZT4HJ5Z5zxncBhH91LFCaMszpyXhUyNqAHao0dtzNjTMJ5K6tpRLDRMNuyuF01BAT8HoSzZk1p8p8hd1pWBkUI87zKbbwhDV2NGPEydw8wt42290rqIEhDayEBSZH9JYfW3tBPu/57PeJTopRIDhgi0YP64Rl8LkHoT9arub2Y9hEPUCHQlkPdrOhsjMlNkXsRy+FeeKgdA+U47iaCWwO3WcIa/VZ4LoPXjeaUS2nd20i4u2vNl0DQxZYojuas1O2ex9d96mONu9dgEoLNNjg2jYKWQT2evxE6Jv3ay+sVA7bdDGf/9axQE0n/DUZSPC8khBPckDSHgCrAfWTruOt+kqssoicxc8xyefHtP1pczUwZGWs7mJyitYz2KxjiXCGg5jleFuVBA27Zhlp/G+5DdZ41ZSVNlfO/vcpqJIX3Q4shYdWPwVYHxVzRVZLAGRjsUznztMZgNvdy6qBIUmx1Pj8kwrCYE18GorQscmBR8hTJm6wMCJgBPdQ5NcuU5inijt3PLd2RD3YsWHH74Ayv+lWrWt55h7jCO2As1ENUkwoorZ4LM2NHxWR5OMUWrthEDjcHZTUYlWaxr39+uI1MCSBhWmwrB7C586ZyNL66NTITTDDBJGrmNMMQnRY2BpcMLy45hkVb5fi00yhOKOHFy8tvq3qA9KIZeMuYBGf038RxNnncB2Vr1eGcd1gTBeXbn7b3WBrYMgBy1GMpmzlW06YyHujoFZanKiZ3RAbK19n+TEnt7TnzEk7Nzxkbfa3MZzHtulCazYlzwRibPMPPrwGnZQT8Ps16lO6sHHvFsSekdE/jikbR/Taapgk6MV29/JrYMgBq/9YXvRIWGF+0E0vb4SMj8CuUu7MCPAXXtCQogEYYBPj9hbZVAVkeInBmRd3lPaecOuGM2unWostVpNSpV9AIssJYxQvdL9qNoheMNeYht9+ffEaGHrAkn4Jx7zvBzhZYheUn0ISFlb8hRViw66jRUaiuxopSA3KSRznOBJTiU4q9wVf5+l3pkmplq99TJPuzCxD1lzKpKIDlerxw/l9H/+ri3/f7kEm5EJv/0MNDClgOSrCJLHb7N8zJzdbSMth1PixbK1QYK6y/NCNOhgMUgcQ2V7TDi5/3b5j6GzP3c7JolqY4CgdYjtC134X28XuZAmFSbTz/V7bb166BoYUsO6fMsU3C5aFO7T7R4GatzmrTsEHRMh2rgHxQpP18WEXrv6V1hCavw7ybD+pC9zmtYkqAfLDYg8nUTlc9p074ZNEPJ2polpz95mH2dLoR676Uhnspetye4iWGnC9vuV5i926xtYfxn6YslxCA/8jbFANL10bu/DpLOXwrsLYnQ7XFM8rzWgTVKzASUBWOnf8N/Pt/unOABpRjcUYZbQdJ3RcuPIGRpCsAGpRT7zSRN+E3w0diiWFKDqm+MsTR5T6oiOgUhJ5pMvCSh4fKS89e5M7D6fIE0u0mEiOzPkKNkiXUClJZhu/iW1Y6g2lq+hjaujP7BF2EUZ+vyVQvy5tkLFvD9ZSA0MHWLtpeeNSU+kx+7OrwmRt/0bjilqhu2I/QCShRmR/5/IOqFrkHnDy8pyolcBFgnFh3srPorb4cj0X5XfAalQxFQVcKKf8X17M20OnNTB0gNWc7EUt8DZ3drKUogmdQnfl5gWfihsNt5rHuIOWutMyvKKrQJOCK9n8NonmZthfF7qu7aB6RdXa/9GQAJbThjdHXjT2Pm4MiKwO0SB/LBpjPRcy0KrhbVFTO97dX4BXc+PAJerEZtAunuTk+I1TPq8m8jf5t0MCWGxnSxv3u3HuTupvmhtYSdYR43rUYv0pvwXLXjsWlQjx3YPUWricbf8ziBpIeuogAr6uQTTJi4u/Poa5l3gnJ7i7mUFesnVLknbcPxk4B9VB8m7736FaA0MDWKYrqZ9aNgvEABfw0qjM3UjGFsGyLI5ouvNeFbAU30v90pQGhkvfb+46MPzA54HfvZR/Gj4NN/A5fb+p64uFTf3Sa/r9wOeB71P/1msaJr06vyECrG6XmfVaXchg0D2kf9yGeO69Mv6qnFYisSopjUdL3+CEZuNvo9/LTkdx8+uvTxd3sdk5mrEpDLdp+oNKg3jSONN6Gfj988uRlGFzYdM0B8aRvn+5V5f2gI9eq7gHRPsKHjUS02fxtzlzee6E38YXTYw5L7DKL2Zvhnr8xYlcJ3w/jVrCfno/2GvRDP6blwj7goprafxBZeclwvfHXxxQzpf47nlpDyJsfzrP+3DzwB8YfuBzazQJm2l9syXu3agw1YTPHX8Ftu1zZNuOPku27TWetcn/ovZ5q2YpfwMtE14qz6pkftGsWbPewlY3cxgX7KC9BBHfMmxs2ezdTrVVQKa7V0cEa8O5jI0+yg45owkiz3Ws5f/hgu7u3jQ+pZvez2F3nUo2eB/arz2YeRTrzsifuYMGG85oVyMUwPa2hYsW3aD3OmKG7VbIC/tKmIgJcLu8p1T5SXO9ovKruKPjZs48iImsD/H9ldctWXKLdpJmw/gPk6esvuWqdEQJER/YrCC2HTzdes11i6885phjRnHGysf4XjvsVElf2xRU+fDy5nbmAkc8e9aMU8lyrqdSuUTpH3fM9GMox2HEVycNy3zaFRyZ94AortZHFumk/NyA59iZM/8Wy8j9CVdR/BT46oVLltw9NEaFReqE3glPUgP+CTDNgWGAAYqtHiSVlrV7aelWxxdXPplaJjjfl/ijyqCBwgRU0TVtudzbtRuMNpjTqRGugzYT8oPAsGfE93n5Y9Lbh8r6blsu66HxZ8Pdyn2MHi5Rcukma2ncs2d37VRpBAuymWyXG8wSvrnxmrFME+mdz6YSnFjWOG769GnXLFlyMxnYi81YzlMRtaNiqVx6JJfLXcPjOhbsap/7isBNu/+ULZwmE+FlSttE9WltbfmLtN986nS2j3Ncs4ip7BchefRKlsAdEuSyX9OOgjqmRVsqUZGmVqk+iv9P+MXHHXfcrmxG/3/oZb8HVN9WPFTL3EI+f6h6Q10nndnGIr0fNWqUOEW4kPOXOCYnmj1r2rH0lp8GmZwrb0Zpl/qyhLn7ZbMUJfBaO7pNbHYjszh2gvstc4QhCxtcIfAJqpxxRPNMgmEeoDDd/Buks1OSI3BBafixXC77dho3rrNXE/uWfAod7Lh6tXYg2xJN4fzNAyqVviMhHxcobk5OfBsN4hE+ZO8F3sTXqzenvZYXNt0TyzTy/wQoutibwp1HyDmKX2NPrKlsRX5YrV67Wg1EPBENGwCoCYqfMq+u1RvPcohCzElgPFsPSjJCfuyh5ahBxsZncvzcZDY/+QhUYJn8OOm1k3WShiJUddQeGwifBYgPY5elafVGeHRfqXw05/V8U2Fjz7xD5yOS9sNsqhKySw74Yl86r3+HQgy9K293u+NYc5W+mT1t2t7kZQ82dnFlofPdMXr0OGcRopNxAb07G9JRztj7njbHo7wl8kLx2fXK2DGKZ2hQLOXkxmSZVdvYnW4pPbr2jkzGHs4RcKymZzcGOg4nyGdgjycQ8pdHMTEMp3jJlTOAwCsmOxJSy/ZdzX2r6Nf0cEaf7CM/Gd7REWmPvihavXDJDb9RVuQsZwv52QACUXeb70K17tT79KB0KliUUEDLVnp7pqnBmm4DR+x9Z+F1163WM2yGoxmxdoanArA+duH5s95jfL8uiKNeGsbZlZGjHWwQaGealbCb2vGzZjG1Zc8DdEs41OlH+sYdTdNoTE2oopejPI9zMtuX5LcpB57fS/09RGn+Hx3z3CZdE0WaSv7b6Cjsm+m9m8zxP7pDcbBMhV2BrE59ZaMxulcU/XH+/PnqWVaUWp1L4Tjx4SfEN7IRNr5B2NP4xrF+3k0UpR0SFMtlFLvzdOdjKu4SLSCFo2TIqHqvL7t33n+gUpw4WeHPW5NQON1vzqV7UVDQMQCJQz5d1bJdEQdxef43PC/zy8DPXJXJBFcG2czSY2fNOFNxJYccxK4BqTALq3kmrkeu17bu46Cw1Z6eCWTM7ava3KhnGfuQum2ZSHdPJLh3aDdAgQu3qlBlHSSO/b7WkZt1RA9LdroVzjMKd5WfHJTie+oIcRB9JnnDN1E0jjqY0gLiaPbMmWcfN3P6/+Y3l83yzjpuxgy3bE0n2BL1IcT0e6jj1aRVFktUnFz24aCsPRQvSXdBzNb6uZpbbwnf79QeYIQHa1S9NbcpHB0ok1Lo42bNOANW2UXZPsnhHt8iQmcnQN4Ib3fnbLxdhgywlHkzOrGv6rho9X+VG/GVbXm4I4dd4GMr9Thkj9ERkP3zFFSnzSdHlOhp0y7dlhGyvD8NO06VilPPEli0JbiTPdg5UGwKuZ3V1Lg2z9sTku7A0gTEsoU33LBSfvRYR5rSuHl1AIDaUVsOquGo4TuhOG7bIo6WmkxV7+6Agx+N9If0QCcdqsCrpwQsXCjqgJz8Fj0Alk/n29reyZDhzIULb/izqKILFEVs+Ot30IBKTvu3js0E/oWeH3wll2u7gATOwctxoYbvdyJvce/9/ppFi+gU9jGxLX1HfkdxiuJkURZSfxv5Wnr11d3PQoGRRJK138otFLYX4CxV2jhRaAGZDVPsV0uV8pVQ0p+2t5fWEnaN6yCq3zjehdM+xwwpYDnhPVU9+Oaf2ftqGbsgCwgixZxKGhlOl/97tjE6Xc86JDxuhtfz5hyVTbkhf+zMB6Wwuoq68F6faFG9lSwCKH7TjOMgGnoEjcBu5UCseRScGoKDQ3V4aEajI4VlXuCQJqVikYY6bnIcSxKP/3alp/fOL7aO3ZzCPqfuW2OeSIGlOLjPkgYjuPjryDj3co72VxQOyut6BAL24QIHTiCGe8dfbIT1mWHUeH+1Uv07jpw5ZrdnnmFVuAvyTrKvG0dpycB9Aj6unuyq6O3PZvWHcLQyxt7mFnlwFN4kLvvqu2aHenDMmCcd61ZnmTOni03n4h8g9wlAk4+bOWNxpTd3I/W3i0uLcvJdG9LxeIduRTpUHOACLF3aYvuJSnHPE7DNuqrQ4e/X14fQyb6mjRCCYs030WuV2RFmfhI+GVEOLMOUKQvYDtwY5JDrGY29B2q3F2HYRS1qsFM3W1CaL0D6J6jRoSrrWZF4l+KgAQ8VBYOiaQc/Letxo6J0E7k0HY4uASDxIfoeVGjr8GdiP/Or1B/61dkEjuKpk9bv5ffoowmnAO9rXFhuXByGBonj73AyWsCA4TT8YoFZ6TZluUPUgOQNuTNas2O5Mu9y5CQXxwv+eO9CYF8bcFak80LVQRoncp/sl88W44BgR5WP5H+nMPCH/QHfW4jbjVQZfPx+PpwBLyEyrvS0Xcx54fuy9eWDdLcdKPUeeGHQ1O9E+b24EU4acsBSFhNK5MC1HBXD0Vh1fq89570PrzaZDwOsLOsdLuWQ8L0qNf9CW1zxXHETwjzv3NG3d9xxx46cgnA739+KMBxcy8mmjH4m0EL/G6Zi6LUaAd1/9eLFq8QO7r799gNVucoKVOEZeniPdEI0ajuUhfoErNde+/joUaNgnXZvDeVdzesk2TgeDgjWVXp7D4FOddK4jkrCbv/CyfT36NuxY8cmkbOtpOvpvCN9UcAPAKrdOSv6m9JZ8eyl5wo5Wc7GkwACW5PL3MM8tKFQ2PW4497LsNJqpybOb7EV6afmTJ++Q9XEOlvxtvTQAtBzO/kUCHKMKLkY9rSP30H5VlEB9+oFBzYc5AUZul0D291I6+mcfCUfZLcP5tpyHylXK9/Jd1TPbDyXLeiTAw8//Jm777z9y2D9DPJWoXIK8IdxQxJYynALuJ7k8UQo1Cco3xcwWd4TtR0EgrcjMp+zz9ZFqn9wHo1QhEVw7xyN65R5S++8c1Zg4qsZuem97Kzs7JkzxEpyApR7SeMT48W6v/vOOw/meKnDpVui86l37wQ4bsaMlVG6afhxNJxzHf+ToB+u+X4v7VkTa+DcZ6n2UVs07iEtKSOHieXSs5Nhu4kuQjcqyuM/+OCDDpzk5SmlQy/PSA5jI9zdURc8VK6HReWFsBY2qFtybd+D3MUorAliDnhnn/plpg6d0YrLhimQOQn63yp73nvaC/kR6JRSYGgUei/a5qfZNHiMgEXaY5Xvnt4e+tnCZ5Qv9qI9Rnow2H+b21i4yUaPP2b6u9CU/Bi1xd3XLlryaZcfttTQFeCaY2dOW5oLcmLlBX3fKDUOGbLAUqZbwNWA7V22oTj56r5S7R8A1d+BhH3N+savUQPdrLADTWlSNkhPBVfmN9QkFQHLUfND+2nIRq1aUw+uUsk/h11KOakKBzvRVRWUPpKMSIuWs3ndIk9BL8KR3PxSYZcsWbLuuFnTP1mulD+EPzoFQnMaMOEBJPsDV+tstmxKPP3s2kU3LNY3yCqiohq2qyHurVQrP3PfAXr0aQUQd/GNnDIryslPVIwMK+dRL3LXQvz7SIWsWR2I0CYuzpMQjGomdqxW49hSqbQwtL4rU7OTbUDw/hZs7N2uLihOvbdvOPeXK/4NGzaMYKen21DUrtAz6pZVuWHD1GlRftqpUdhYjFDuZFuxZ1FSQOqLTbNbzx+pr/8mqN8ISxIPnvz/q3QfW8qozcQAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://elixir.mf-uni-lj.si</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">https://elixir.mf-uni-lj.si</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>elixir.mf.uni-lj.si</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=elixir.mf.uni-lj.si</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFADCCAuigAwIBAgIJAO8ad9fwiJL9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE2VsaXhpci5tZi51bmktbGouc2kwHhcNMTQwOTE4MTI0OTM5WhcNMjQwOTE1MTI0OTM5WjAeMRwwGgYDVQQDExNlbGl4aXIubWYudW5pLWxqLnNpMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqA/GmkgC+iCCCZh7RWFGz3Q1cnjE24zx0q4L15ia7G2heB0N2ERQT+tg8zyRIZV1Kdzk1OhIqQhvHnNHhgt2BHva9nh+z/mPbVObfjR+DDVnoyZBYnHLKzVDRGNMHMQM9kS/p5dMRb8OBwjW+iRN9aw6zdwsqwC1NprOhcgPQuvDOQ/jX/6NXX39DwxQ03uYcTKbgl+u/slIvuGJDg0tS+8iMedKyHTXFebszbR5nRKr3yakYTIUrLI5WuHssi84JHxydXg37BK3uDqjMGAXT4V8e17cwyxTB7E7qBi5g0FNREnhQ3lzXX5aFmNhNPf46Yr0FQM9fwaRTteumMD9TDfGuEDlB2P/zuDjt43eBi0SPY88sGMOfvfn9i4H5hj4KDxFJhrFbAoI5YGUtJ183tAj12P7HryWMpk9TQhtPdZ1H2QxzwlCy22waeOm0zVBuNEAlTlHZcswBxWfQzwSI4pklkVgFrQ5D3lPi34BSVf5UgBj/FFnnI/fLM1Agy069vrDlFp+I7Tp2eRLxU2UBL/gRHimBGBOf7VLUR3PzzSYxHVDnvRBF2DE46w+C3T1kFNgEhLjcY2pYy9ExqVii5W05EsQXKRbpjoxdJstOpW9dPRzOup5+ttQ1+dwfRzvHwnQBDOuUMF8L5BORrVomHU9vPIT46A3UE4dwtFFU6kCAwEAAaNBMD8wHgYDVR0RBBcwFYITZWxpeGlyLm1mLnVuaS1sai5zaTAdBgNVHQ4EFgQUeQnbD0nYm0aw9HPyYkS45iQNWWcwDQYJKoZIhvcNAQEFBQADggIBAAZxUWehEX3qA0ZfWXSLhMYx95M+HrR9SIg+ekcxEMKPFl8+eStzVQu9jpF4shRBmHrKhZh+4g+gB2/4KxNoaHkLLaguxMcHEUkdkP3e14m1xHEHA3RA+2PSuz/216uQsOqd42Stmogz6Sqx1OJrxgpi0w2b7oqm5uZvVDqRf239Ruq44Iomm33VaJX8msDQb9LNQqQWv1exN5iYLudCD6+F0Uk8Z9JkZA+s+8B3wwIGoG7hDF09rUiNE4/z0z7ndZAprohWiXHhWCIPHSmjuagLN3ubnZ8837jDU4oSh54FBO1/1e0YQoIhKDGcc5G7iYsHdfSEShL79RgsM/WWkRsfU4wcq6Ju0ZLKkU4eUPM7Wwmr4Iy0+U93qTCNeT5Lm//BJKOuq5NxlwPTCxxkERGwNM4bsvHSsCmlxK/K/oDIWF7K7isSNSx06BGitXgE2qhvoFMCoW+/B5XXjPNzzpotXA3EmaJDmxrlb+kaB82H5MPWPuC69wOlXEWrwexfqVzPMpEW73chik2l480XhzreiXRY7EgV78wqQ88prvIj1+hv9OPnwSWoeryZTTPa2tCwn3n98pxvG7RTP82EQPvYoN/Dpen4M0oLWYT56zHDtVm7eIww+FPy/RTG0NN2CV3mM9br80uepO2kvnaNfQL+IX41mXh1GgwXy+MnCQ50</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://elixir.mf.uni-lj.si/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">ELIXIR eLearning platform</md:ServiceName>
+      <md:ServiceName xml:lang="sl">ELIXIR eLearning platform</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">ELIXIR eLearning platform</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sl">ELIXIR eLearning 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="rfc822Mailbox" 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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <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">https://elixir.mf-uni-lj.si</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">https://elixir.mf-uni-lj.si</md:OrganizationURL>
+  </md:Organization>
+  <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="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:elixir@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="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>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>Jure</md:GivenName>
+    <md:SurName>Pesko</md:SurName>
+    <md:EmailAddress>mailto:jure.pesko@mf.uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/encecafe.ibge.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/encecafe.ibge.gov.br-idp-shibboleth.xml
new file mode 100644
index 00000000..8ad1c450
--- /dev/null
+++ b/swamid-interfederations-2.0/encecafe.ibge.gov.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://encecafe.ibge.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">gov.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ence.ibge.gov.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ence.ibge.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>
+    MIIEGjCCAwICAQAwDQYJKoZIhvcNAQEFBQAwgdIxODA2BgNVBAoTL0VOQ0UgLSBF
+U0NPTEEgTkFDSU9OQUwgREUgQ0lFTkNJQVMgRVNUQVRJU1RJQ0FTMQ4wDAYDVQQL
+EwVDT1RFTDEoMCYGCSqGSIb3DQEJARYZc3Vwb3J0ZS5jb3RlbEBpYmdlLmdvdi5i
+cjEXMBUGA1UEBxMOUklPIERFIEpBTkVJUk8xFzAVBgNVBAgTDlJJTyBERSBKQU5F
+SVJPMQswCQYDVQQGEwJCUjEdMBsGA1UEAxMURU5DRUNBRkUuSUJHRS5HT1YuQlIw
+HhcNMTQwNDE3MTQ1OTQzWhcNMTkwNDE2MTQ1OTQzWjCB0jE4MDYGA1UEChMvRU5D
+RSAtIEVTQ09MQSBOQUNJT05BTCBERSBDSUVOQ0lBUyBFU1RBVElTVElDQVMxDjAM
+BgNVBAsTBUNPVEVMMSgwJgYJKoZIhvcNAQkBFhlzdXBvcnRlLmNvdGVsQGliZ2Uu
+Z292LmJyMRcwFQYDVQQHEw5SSU8gREUgSkFORUlSTzEXMBUGA1UECBMOUklPIERF
+IEpBTkVJUk8xCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRFTkNFQ0FGRS5JQkdFLkdP
+Vi5CUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKcKBwOhT6Gr6FgQ
+4uSzluNmpMlM/vrmI0pqYr8QI8V1lYQnr4ezAdoUNXlaJx2CMCDUPFi47uIRhlXy
+Gh8OZi4WwAEprrIToui2a0Mv6y+JgD/RR4+pm6JggjIlJjijLDjU5VYxoM3TsVQ4
+Vk6RYx81pPhUgnckZ3IV4A5pNtLzxdsEwkPpnoCNFlsKEAVUkMfTAQokQji0aWwc
+iAwAp+dl045oNY1xRiJ4tCZk7VE/Dm7WoddSxAceYJtbUxvH+oE1xD0ZOW3ts7sj
+E4s1W4Eai1femBRrv19dWTXtPG2RWw6I6bYYLQetAvs1kRSqKrJHiHbVBzZ9InpC
+F/vS8tcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAC78+ABZ2uxuYLkTI3uPi5Wtc
+/HN58FWUyPq+l8/6RrSDI6/uPJ0g490/j5U3L4B4LdjSs3y9kq4sDQ44MSglLcWS
+3WeHhEDiIwWEYy8ZQkEtQfvAxXMkmEfCBaS57dwwzNNaj7CWpo8OBQrsjjboK9tM
+ohbLi2e2DPJtdWztwGYxjAl/b5f2gQVLYgAuoDFs6NEk8wqjuH3fyjs5BrHigzJD
+y/CFOm3UyxZuE6AXLTDxqEzCzdHDAtZP8tK/32zu7Kv7pCP6OI6RdVphaLOxKn7X
+xG6lNFUhNi72Kxw/UnI9yYKJzYkw2v8rC6VfbJ4UOyenQeR27aELT9w3tGOOYg==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://encecafe.ibge.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://encecafe.ibge.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://encecafe.ibge.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://encecafe.ibge.gov.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://encecafe.ibge.gov.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://encecafe.ibge.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>
+      
+MIIEGjCCAwICAQAwDQYJKoZIhvcNAQEFBQAwgdIxODA2BgNVBAoTL0VOQ0UgLSBF
+U0NPTEEgTkFDSU9OQUwgREUgQ0lFTkNJQVMgRVNUQVRJU1RJQ0FTMQ4wDAYDVQQL
+EwVDT1RFTDEoMCYGCSqGSIb3DQEJARYZc3Vwb3J0ZS5jb3RlbEBpYmdlLmdvdi5i
+cjEXMBUGA1UEBxMOUklPIERFIEpBTkVJUk8xFzAVBgNVBAgTDlJJTyBERSBKQU5F
+SVJPMQswCQYDVQQGEwJCUjEdMBsGA1UEAxMURU5DRUNBRkUuSUJHRS5HT1YuQlIw
+HhcNMTQwNDE3MTQ1OTQzWhcNMTkwNDE2MTQ1OTQzWjCB0jE4MDYGA1UEChMvRU5D
+RSAtIEVTQ09MQSBOQUNJT05BTCBERSBDSUVOQ0lBUyBFU1RBVElTVElDQVMxDjAM
+BgNVBAsTBUNPVEVMMSgwJgYJKoZIhvcNAQkBFhlzdXBvcnRlLmNvdGVsQGliZ2Uu
+Z292LmJyMRcwFQYDVQQHEw5SSU8gREUgSkFORUlSTzEXMBUGA1UECBMOUklPIERF
+IEpBTkVJUk8xCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRFTkNFQ0FGRS5JQkdFLkdP
+Vi5CUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKcKBwOhT6Gr6FgQ
+4uSzluNmpMlM/vrmI0pqYr8QI8V1lYQnr4ezAdoUNXlaJx2CMCDUPFi47uIRhlXy
+Gh8OZi4WwAEprrIToui2a0Mv6y+JgD/RR4+pm6JggjIlJjijLDjU5VYxoM3TsVQ4
+Vk6RYx81pPhUgnckZ3IV4A5pNtLzxdsEwkPpnoCNFlsKEAVUkMfTAQokQji0aWwc
+iAwAp+dl045oNY1xRiJ4tCZk7VE/Dm7WoddSxAceYJtbUxvH+oE1xD0ZOW3ts7sj
+E4s1W4Eai1femBRrv19dWTXtPG2RWw6I6bYYLQetAvs1kRSqKrJHiHbVBzZ9InpC
+F/vS8tcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAC78+ABZ2uxuYLkTI3uPi5Wtc
+/HN58FWUyPq+l8/6RrSDI6/uPJ0g490/j5U3L4B4LdjSs3y9kq4sDQ44MSglLcWS
+3WeHhEDiIwWEYy8ZQkEtQfvAxXMkmEfCBaS57dwwzNNaj7CWpo8OBQrsjjboK9tM
+ohbLi2e2DPJtdWztwGYxjAl/b5f2gQVLYgAuoDFs6NEk8wqjuH3fyjs5BrHigzJD
+y/CFOm3UyxZuE6AXLTDxqEzCzdHDAtZP8tK/32zu7Kv7pCP6OI6RdVphaLOxKn7X
+xG6lNFUhNi72Kxw/UnI9yYKJzYkw2v8rC6VfbJ4UOyenQeR27aELT9w3tGOOYg==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://encecafe.ibge.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://encecafe.ibge.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">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas)</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ence.ibge.gov.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ence.ibge.gov.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Mendonca</md:SurName>
+    <md:EmailAddress>mauro.mendonca@ibge.gov.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/endo-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml b/swamid-interfederations-2.0/endo-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml
new file mode 100644
index 00000000..5b3257a1
--- /dev/null
+++ b/swamid-interfederations-2.0/endo-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://endo-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-19T12:45: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: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">Endocrine Society Test SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Endocrine Society Test SP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://endo-test.literatumonline.com/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDKDCCAhCgAwIBAgIJANVJSQxqshdJMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE3ByZXNzLmVuZG9jcmluZS5vcmcwHhcNMTQwMzE0MDUwMzM2WhcNMTcwMzEz
+						MDUwMzM2WjAeMRwwGgYDVQQDExNwcmVzcy5lbmRvY3JpbmUub3JnMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3UGyo6ttd7bwlzSgZsk1I4RA30LoNfTM
+						8gZB/+K39VOI2QD8Pfhrk1WIuQF4GAmVkYE7NklLw5M++OJtX28BXZNYx5B5R4gj
+						1pyuhZy5sYFQsV6G2k1juhLXJXD0+AGCuBulYYSgzAAY9Z1nwZ1XQWLscXbaH3PC
+						nq8cc14V/bQp6myQPahxIjkzwwGEGvWCWCuRe/gSFFMIMYEX4tnzX1CTf5kHDA6M
+						JkTYI6LlyVnT1wNgzjZRZmszyMY5CUK2585Fs5EiOuOyhjpk2yX4wpcyaSMNmg4Z
+						w07YKVDZAqs3TPlevvM5v8YsTI8gtmax5xJzmcWLl4ePiWQQIFlmywIDAQABo2kw
+						ZzBGBgNVHREEPzA9ghNwcmVzcy5lbmRvY3JpbmUub3JnhiZodHRwczovL3ByZXNz
+						LmVuZG9jcmluZS5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUGmOP9EhvjdoesbPh
+						vynbx5uw5vMwDQYJKoZIhvcNAQEFBQADggEBABmbaNUQvxhPvcdkn5bvZuAV5kSf
+						FI+va5RzRQ4RJbAhoLMc5rQObPJuJ+5sxhccmihmcxRJRzyfrw+uoNClm6DL3r9F
+						FQ0T0/ycfBo9mK04Th6J2UR6k6afdiaucbW4R+LCapQR98FrNGBsTh6YFhhgIRyx
+						5OXJvPJAQL+uVkrqQSuxtwNSaz52WyZXjb6mOSMg2+JK4WftBrPYY1XEG0QP4nMt
+						qHZa5OSpp+euqH6Gyw0LT/E1wdjIx6VeYk05G7rLd8+pxEPIojYUKfEIzggIDC8J
+						PS8Hhs0OkV2+QCImniSi1ZMVhcHp6Db1t2lE9LRnJz2mSTdqqocXb1O5m/s=
+					</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>
+						MIIDKDCCAhCgAwIBAgIJAIDfY9h2oTCVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE3ByZXNzLmVuZG9jcmluZS5vcmcwHhcNMTMxMjExMDUzOTQ2WhcNMjMxMjA5
+						MDUzOTQ2WjAeMRwwGgYDVQQDExNwcmVzcy5lbmRvY3JpbmUub3JnMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw2Hn+r9tAA0W/oAXm9ShLD2wvy+YKkeV
+						yrmUJbzdU8DeJ0mQ0SS6/Y3yKZEAT6vsh4j4xso51qtly0HHh459F8y8n3vd829B
+						vhxRwdE5PMZixPbWyltRPbx3XogpswBust9PXIWW4Unmo37NZhxrZQrt7GHvVvIX
+						kuUAEoTkLkSurvgkLuUrPs/wm179D50kbx4E50Uz7nvJYVyEWqHdf3TGaD8gMM1E
+						6DR2w0j4pKHBAjkLDy9mHGV6c91qFVNnWrhACmX35JjBiCvc1+JTVRpapM1/JgzP
+						HNTCJogvQNn5SDU3cZsZV0T1Bu23Pb8MlXoZPmWJy2djNPzw1JtO6QIDAQABo2kw
+						ZzBGBgNVHREEPzA9ghNwcmVzcy5lbmRvY3JpbmUub3JnhiZodHRwczovL3ByZXNz
+						LmVuZG9jcmluZS5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUG3/mbZR4LTuD9+bU
+						dU0k7Li0WNkwDQYJKoZIhvcNAQEFBQADggEBAC4Sz/Os31gGbtIPklQ8SJHBs0ji
+						MgbcKx15S3OkM06S75oDVI2qIrWXnAuWidexconSD35izsAscXlGI4EJgOflRJIB
+						1kD9LOsHiz9kqUS2q7MNxWVloiQzxYCX14HGwPMtmKVTeTg5Vjo2BAuCRAhdxdFH
+						seE5nYMbC4i31u1taTsM1Ydifr3UzmWTI5AZ884SYR9TfPh07rcW5m26Pmr3LLOa
+						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://endo-test.literatumonline.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://endo-test.literatumonline.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://endo-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">Endocrine Society Test SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://endo-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/engine.surfconext.nl-authentication-sp-metadata.xml b/swamid-interfederations-2.0/engine.surfconext.nl-authentication-sp-metadata.xml
new file mode 100644
index 00000000..83a3348d
--- /dev/null
+++ b/swamid-interfederations-2.0/engine.surfconext.nl-authentication-sp-metadata.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://engine.surfconext.nl/authentication/sp/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00: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" WantAssertionsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">SURFconext | SURFnet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SURFconext | SURFnet</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">SURFconext is een samenwerkingsinfrastructuur die nieuwe vormen van samenwerken mogelijk maakt door diensten van verschillende aanbieders te combineren.</mdui:Description>
+        <mdui:Description xml:lang="en">SURFconext is a collaboration infrastructure that creates new opportunities to collaborate online based on a combination of applications from different providers.</mdui:Description>
+        <mdui:Logo height="44" width="108">https://static.surfconext.nl/media/idp/surfnet.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
+VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
+A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
+DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
+Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
+dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
+VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
+MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
+efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
+HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
+TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
+n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
+4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
+MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
+FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
+9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
+UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
+7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
+MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engine.surfconext.nl/authentication/sp/consume-assertion" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="nl">SURFconext - Engine | SURFnet</md:ServiceName>
+      <md:ServiceName xml:lang="en">SURFconext - Engine | SURFnet</md:ServiceName>
+      <md:ServiceDescription xml:lang="nl">SURFconext is een samenwerkingsinfrastructuur die nieuwe vormen van samenwerken mogelijk maakt door diensten van verschillende aanbieders te combineren.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">SURFconext is a collaboration infrastructure that creates new opportunities to collaborate online based on a combination of applications from different providers.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def: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="urn:mace:dir:attribute-def: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="urn:mace:dir:attribute-def:sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:terena.org:attribute-def: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="urn:mace:dir:attribute-def: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="urn:mace:dir:attribute-def:cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def: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="urn:mace:dir:attribute-def: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="urn:mace:dir:attribute-def:eduPersonPrincipalName" Name="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="urn:mace:dir:attribute-def: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="nl">SURFnet BV</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">SURFnet BV</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">SURFnet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">SURFnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.surfnet.nl/nl/Pages/default.aspx</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/en/Pages/default.aspx</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext</md:GivenName>
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>surfconext-beheer@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext</md:GivenName>
+    <md:SurName>Administrative Contact</md:SurName>
+    <md:EmailAddress>surfconext-beheer@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engs-web01.eng.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/engs-web01.eng.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..f71fae66
--- /dev/null
+++ b/swamid-interfederations-2.0/engs-web01.eng.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,85 @@
+<?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://engs-web01.eng.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="2012-10-05T09:22:44Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://engs-web01.eng.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>
+						MIIDDDCCAfSgAwIBAgIJANQNL49idvBrMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF2VuZ3Mtd2ViMDEuZW5nLm94LmFjLnVrMB4XDTEyMDcxOTEzNDA1OFoXDTIy
+						MDcxNzEzNDA1OFowIjEgMB4GA1UEAxMXZW5ncy13ZWIwMS5lbmcub3guYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9jbGCzmHl3ERccTim8QY0
+						NZmYT7sUvcN950gp13qRDPNO7ceYoeHiU313RyrSlk5VPNYAsT6MqS8UlK+ay8g4
+						Jloi4kUBFkUk+U1Pj2nC9qw0tll/ogmB8tXrPUXcOYhXI+uUVSDj892IUyMElNUk
+						3nldP+J0qA0//+SNFSrCHd44ytJ/bcAfBgL+HzDJn0bgCfGu1xPm7g1AfGUOpbyE
+						eta2BFLbqRhFTzNTdnCQkJixHoM917tvtxie4t9QsegXMJOcYpQRzZ1RE6QrSJsR
+						BB26tXX+3tC8aseRhUITN13m+wTrj1SR5pZk1jrctUHKwYZ2GcV+dZ+1dacOAdfp
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2VuZ3Mtd2ViMDEuZW5nLm94LmFjLnVrMB0G
+						A1UdDgQWBBR5snO7Txci4muSWxMZnmooKdVrmzANBgkqhkiG9w0BAQUFAAOCAQEA
+						NJrUBIaD/R5t2jC58UrsQFwA0aI0Ph/oQqWDDdoXPZ/tgctqO31Wi9raeYp/H/Ge
+						ZGDP6Rjudy1wWSEcRqu0VF5ZNI4uJ/7irMbWrlSlQhpdodJuOamUPqUm+yAEI//V
+						YgTB2F+FGrbNqTZjnY3GozCD3ZpLoHM7Y5Nl00g7vhCa3NSqXijAup2aaNfJJRKu
+						cWFdxBdzzqeABGZYH9herzoSZkFB6fCdhQb/blccGiOev+5g5c5ZnNAEb7wQPCca
+						fZRIPt9mAORaBZ8QrLddGgfdw3rq5NvXppbAXxo79OaMlwnkMD9n0hQ5FehL5y5e
+						6dl8d+0ivNjPUDcvd0ZLzA==
+					</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://engs-web01.eng.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engs-web01.eng.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://engs-web01.eng.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://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://engs-web01.eng.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">Engineering Science Synch Portal Main Server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eng.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Engineering Science IT Support</md:GivenName>
+    <md:EmailAddress>mailto:support@eng.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Engineering Science IT Support</md:GivenName>
+    <md:EmailAddress>mailto:support@eng.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engs-web02.eng.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/engs-web02.eng.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..9e9c7c88
--- /dev/null
+++ b/swamid-interfederations-2.0/engs-web02.eng.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,85 @@
+<?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://engs-web02.eng.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="2012-10-05T09:28: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://engs-web02.eng.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>
+						MIIDDDCCAfSgAwIBAgIJAPZQTWtL1gpBMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF2VuZ3Mtd2ViMDIuZW5nLm94LmFjLnVrMB4XDTEyMTAwMTA5MzA0N1oXDTIy
+						MDkyOTA5MzA0N1owIjEgMB4GA1UEAxMXZW5ncy13ZWIwMi5lbmcub3guYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDuJ5sgm8gUZwskOGv95l5A
+						u0jq8BVNM/myMYBWPWLXpSCsAMZikQ1tkmg9pj9Skr9WVinpLNs7mtSwyp+z8ngi
+						XmgMb42iym1EaS/PbHxbdrRkM0BwjHNkMA+hXfZ5mS2lZd86pLXAbBStH8r6Zfz7
+						f0ebULyv3lA1K+Iy/04FssusWFprGgAiG8hPF5PSk5pWlQLX3CTPK9j8HDJ0nZ/1
+						pnt4W7OTDgs00e0uLodx0uoT5VZWNWhJ3oVdPdB2MyyT01QY3V0B7FKMm7PaSOz1
+						WpxIn111cPf2NRh/OkdxU1CEpgPtECuRETWJiH8EnIglOmnzBt+YNOFZke3o0EVN
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2VuZ3Mtd2ViMDIuZW5nLm94LmFjLnVrMB0G
+						A1UdDgQWBBTAlDRr8FU/W1V5loiAcviNc90aGjANBgkqhkiG9w0BAQUFAAOCAQEA
+						YcZHhS4wvOHeSa2jrvYQdt3/ojRNilzu9UOIqlTEkQKNG4NFu6+bchqE3FVoRN+X
+						O9esYL+kpD2PtTgzND6ag+MZrFmOedXOX9E1w9gMyFyH9EjhXNrr1BZVWD6KOuh7
+						LCX4nIPzTqwf5naBgPeM4EWcPHt2DFH9tQXttVZURn65gCzYjdjpTJU4nuu23wUW
+						RdGvfx8n9D93wK/BQ8VXI6dXmldl3+3dgfSRBtewCp4/jmTheXang6OrS3eMHruz
+						6e0flNky3LOCnUCbMSmT1NzyrYqXVw55MtJMwxUDIT8CT1T/6IdFI+ux6IBc2ZGI
+						EYQ4Ag/ODAxvW2NDIgXr5Q==
+					</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://engs-web02.eng.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engs-web02.eng.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://engs-web02.eng.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://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://engs-web02.eng.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">Engineering Science Synch Portal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eng.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Engineering Science IT Support</md:GivenName>
+    <md:EmailAddress>mailto:support@eng.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Engineering Science IT Support</md:GivenName>
+    <md:EmailAddress>mailto:support@eng.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/enroller.nesc.gla.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/enroller.nesc.gla.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..370601d3
--- /dev/null
+++ b/swamid-interfederations-2.0/enroller.nesc.gla.ac.uk-shibboleth.xml
@@ -0,0 +1,65 @@
+<?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://enroller.nesc.gla.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://enroller.nesc.gla.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>
+						MIIDDDCCAfSgAwIBAgIJAOo3G2vF7X0FMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF2Vucm9sbGVyLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDkxNzE0MTgwNFoXDTE5
+						MDkxNTE0MTgwNFowIjEgMB4GA1UEAxMXZW5yb2xsZXIubmVzYy5nbGEuYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1sYYn11DWBxLmEvcWLkDA
+						ZiDpFxuCO1TGxzuTw/1q86VR0Gaupv77C2eCQuD3sjAwxk4Nl7bV1t8vfK8XAGeC
+						34xoAQjHJhOp8+H6g2i4FTGugI4tH4z0+TdXyzHWbFxL/cr2f17opzlldQSzCqRB
+						Bdi+H4qY7a4t/UZqXwLm2TxN8lFBODlaONLE/FyYtWQRSNBdvz3/XKl3eSQyOITv
+						FpD3X57AjR7q8KB6J4qtFIa5bwCIemfRjL0kPi+Imreh8vBYoPRCw5Pjte1XTlAc
+						VF1f4FDpOcWC6yfgACTMDjAb1+9QBVuSLlcrC81l3ynKrDz2/IW+8FVz4ZFvB4aB
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2Vucm9sbGVyLm5lc2MuZ2xhLmFjLnVrMB0G
+						A1UdDgQWBBQIgPGsNFh+L38QqY45owJxEVFz5DANBgkqhkiG9w0BAQUFAAOCAQEA
+						Scp2FbOCuWz7i8wXXfhZO2A6L7oZnpHs19fhc1QsBixoMo8nK1rzWdHH7L9uX6NQ
+						LHX2gPTRhxeWu+tna8T4k0QanV8YyciQ+QuCdk4V/9pfaQgiqbCQ/NaX9czUusfY
+						PNC7Fmgw7A9F0OX4chyMylBWPKVwrVqi8xWxKuxKzUOV66HgesgZaw67tj2eOYLv
+						lXzRdcVw7afVvGGj5KbuxJKJFK95wToSMn6V4gdwEt8Q2PhKhKTf5+8OXmOJUXsz
+						nG8OLGCO2cYCCXYsaYyEAgSeC8R/xoE7fxVqav1OcaWepi8c+Wtj5EHL1EI6rEjO
+						jgViuQCUreNnTkGNNV//Wg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Glasgow</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NeSC (Glasgow): ENROLLER Portal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.enroller.org.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/epns.nottingham.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/epns.nottingham.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..1138b8b5
--- /dev/null
+++ b/swamid-interfederations-2.0/epns.nottingham.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,98 @@
+<?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://epns.nottingham.ac.uk/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="2014-03-04T10: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: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">Survey of English Place-Names</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A county-by-county guide to the linguistic origins of England’s place-names</mdui:Description>
+        <mdui:Logo height="121" width="115">https://epns.nottingham.ac.uk/img/logos/epns_logo_hd2.png</mdui:Logo>
+      </mdui:UIInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEPTCCAyWgAwIBAgIJAPuVtfrq5tThMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
+						VQQGEwJVSzEYMBYGA1UECAwPTm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHDApOb3R0
+						aW5naGFtMSEwHwYDVQQKDBhVbml2ZXJzaXR5IG9mIE5vdHRpbmdoYW0xDTALBgNV
+						BAsMBEVQTlMxFzAVBgNVBAMMDmRlZXAuZGV2LmxvY2FsMSswKQYJKoZIhvcNAQkB
+						FhxhZGFtLmNvb3BlckBub3R0aW5naGFtLmFjLnVrMB4XDTE0MDExNjEzMjczM1oX
+						DTI0MDExNjEzMjczM1owgbQxCzAJBgNVBAYTAlVLMRgwFgYDVQQIDA9Ob3R0aW5n
+						aGFtc2hpcmUxEzARBgNVBAcMCk5vdHRpbmdoYW0xITAfBgNVBAoMGFVuaXZlcnNp
+						dHkgb2YgTm90dGluZ2hhbTENMAsGA1UECwwERVBOUzEXMBUGA1UEAwwOZGVlcC5k
+						ZXYubG9jYWwxKzApBgkqhkiG9w0BCQEWHGFkYW0uY29vcGVyQG5vdHRpbmdoYW0u
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3VcWl3+bs7lxp
+						YQo1rjJnwTjzYpLBSkH2laB8+hUr4a+mz4dGZ+2iDLnbAh2jDVuUBs3usMuxC+ns
+						Zcb2cHATDCAyOSIIpErrhA5Js552fRyv1TLgJ5C0qRdfaynvgDoo5vvPAoZyO1Si
+						n3Tt4TPfY+4u+eox1tcc3wArDvxqSGvuR9fDLjB0ExmZHhAaN6WFcKjbgGh3Lb3Q
+						ccd9OZyvPF5JJSaH+eowd0n+l6ijdiAgIwGrEs3hC90n9QTAuySzll2W99qob9TE
+						i+47EZzkf+PK+CKHNDp+cb8lMyl7oKtb6rtN42KPiXgvEwbzPYQTdA7yXbvyPbqI
+						ah9S8ddZAgMBAAGjUDBOMB0GA1UdDgQWBBTSTtm0pOB5ug51Fl7uX34xMkBGWjAf
+						BgNVHSMEGDAWgBTSTtm0pOB5ug51Fl7uX34xMkBGWjAMBgNVHRMEBTADAQH/MA0G
+						CSqGSIb3DQEBBQUAA4IBAQBxwxVEx1tD7stI/Nbs4WE9tFktQKHcGw+OZfnU4WDV
+						Mc5d7/4dBVbPdkmlhlV1ApxnBXE8upLZQI6k6PjdTUmeJ9WKkHas2oftlIzqmoU2
+						BeY2jhW3dhvyfUzuS7yBznoKxAJzF31O8mEH+kZ3r4bHKHA6nuYerypAb2alL8in
+						YqX91F3Iw92nODat3eMemd/GuEj5EJj1NUd16ivXxwYkd7JRp24LtrkwEJn1wtcJ
+						/ni4HvTNy6R1Sa6oKvG9NBytMo39AcaSZXlPg9lqmj2doAlANBF0V3RztB/j4l22
+						tT+XZBO11iX4MVqiZfonPFgJ2YKD9/QznhrzqMPwV2TI
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEPTCCAyWgAwIBAgIJAPuVtfrq5tThMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
+						VQQGEwJVSzEYMBYGA1UECAwPTm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHDApOb3R0
+						aW5naGFtMSEwHwYDVQQKDBhVbml2ZXJzaXR5IG9mIE5vdHRpbmdoYW0xDTALBgNV
+						BAsMBEVQTlMxFzAVBgNVBAMMDmRlZXAuZGV2LmxvY2FsMSswKQYJKoZIhvcNAQkB
+						FhxhZGFtLmNvb3BlckBub3R0aW5naGFtLmFjLnVrMB4XDTE0MDExNjEzMjczM1oX
+						DTI0MDExNjEzMjczM1owgbQxCzAJBgNVBAYTAlVLMRgwFgYDVQQIDA9Ob3R0aW5n
+						aGFtc2hpcmUxEzARBgNVBAcMCk5vdHRpbmdoYW0xITAfBgNVBAoMGFVuaXZlcnNp
+						dHkgb2YgTm90dGluZ2hhbTENMAsGA1UECwwERVBOUzEXMBUGA1UEAwwOZGVlcC5k
+						ZXYubG9jYWwxKzApBgkqhkiG9w0BCQEWHGFkYW0uY29vcGVyQG5vdHRpbmdoYW0u
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3VcWl3+bs7lxp
+						YQo1rjJnwTjzYpLBSkH2laB8+hUr4a+mz4dGZ+2iDLnbAh2jDVuUBs3usMuxC+ns
+						Zcb2cHATDCAyOSIIpErrhA5Js552fRyv1TLgJ5C0qRdfaynvgDoo5vvPAoZyO1Si
+						n3Tt4TPfY+4u+eox1tcc3wArDvxqSGvuR9fDLjB0ExmZHhAaN6WFcKjbgGh3Lb3Q
+						ccd9OZyvPF5JJSaH+eowd0n+l6ijdiAgIwGrEs3hC90n9QTAuySzll2W99qob9TE
+						i+47EZzkf+PK+CKHNDp+cb8lMyl7oKtb6rtN42KPiXgvEwbzPYQTdA7yXbvyPbqI
+						ah9S8ddZAgMBAAGjUDBOMB0GA1UdDgQWBBTSTtm0pOB5ug51Fl7uX34xMkBGWjAf
+						BgNVHSMEGDAWgBTSTtm0pOB5ug51Fl7uX34xMkBGWjAMBgNVHRMEBTADAQH/MA0G
+						CSqGSIb3DQEBBQUAA4IBAQBxwxVEx1tD7stI/Nbs4WE9tFktQKHcGw+OZfnU4WDV
+						Mc5d7/4dBVbPdkmlhlV1ApxnBXE8upLZQI6k6PjdTUmeJ9WKkHas2oftlIzqmoU2
+						BeY2jhW3dhvyfUzuS7yBznoKxAJzF31O8mEH+kZ3r4bHKHA6nuYerypAb2alL8in
+						YqX91F3Iw92nODat3eMemd/GuEj5EJj1NUd16ivXxwYkd7JRp24LtrkwEJn1wtcJ
+						/ni4HvTNy6R1Sa6oKvG9NBytMo39AcaSZXlPg9lqmj2doAlANBF0V3RztB/j4l22
+						tT+XZBO11iX4MVqiZfonPFgJ2YKD9/QznhrzqMPwV2TI
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://epns.nottingham.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://epns.nottingham.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://epns.nottingham.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://epns.nottingham.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://epns.nottingham.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 Nottingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Survey of English Place-Names</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nottingham.ac.uk/ins/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Helpline</md:GivenName>
+    <md:EmailAddress>mailto:itservicedesk@nottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Team</md:GivenName>
+    <md:EmailAddress>mailto:digitalepns@nottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml b/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml
new file mode 100644
index 00000000..4635e36f
--- /dev/null
+++ b/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://epoq.compilatio.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-24T11:36:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Compilatio - Prévention du plagiat</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Service payant d'analyse de document en ligne mis à la disposition de l'enseignement supérieur et permettant la détection de plagiat dans les travaux é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>
+					      MIIFNjCCBB6gAwIBAgIDEF5UMA0GCSqGSIb3DQEBCwUAMDwxCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
+HhcNMTQwMTI4MDM0MzI2WhcNMTYwMjI5MTgwMDU1WjCBvzEpMCcGA1UEBRMgOW5L
+LXA1Zkpsam1leVg1aXREZTFMS2VnTHB1WWJtVUQxEzARBgNVBAsTCkdUMjgzMzcw
+OTIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
+KGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
+U1NMKFIpMRkwFwYDVQQDDBAqLmNvbXBpbGF0aW8ubmV0MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAxU1Kzma74qazOCj/66wzcyZHB7XtSgIFEw1LtLq/
+9OA5efe/5yL6nK6H0pZoEpWGDLSzQkQJFP1OlozStQAAf/U0N5mWY5JUqwJce+Y5
+8bA7jg2JIDp8zPDvKMJ3izkeJUxBdYiV6aZW3aRjt22tTlxlXgU3wovicu+acSY9
+YAZLMWkvNoVHfNTmXZA8rzMif2qPSHnv2HIu+vUiTmD39BPxHfbunvCjmmFZWM2f
+O/QEyG2n4/YuttEzNd9yhU7t++KFiK+D1vlCbRRnjffyhQfEhcj6zauCDtfOzadt
+O+LzMSdS+g/B3mx2ic9ixgC0ml2Mw7De29XHzcbhcYuD/wIDAQABo4IBuzCCAbcw
+HwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWg
+MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjArBgNVHREEJDAighAqLmNv
+bXBpbGF0aW8ubmV0gg5jb21waWxhdGlvLm5ldDBDBgNVHR8EPDA6MDigNqA0hjJo
+dHRwOi8vcmFwaWRzc2wtY3JsLmdlb3RydXN0LmNvbS9jcmxzL3JhcGlkc3NsLmNy
+bDAdBgNVHQ4EFgQURW26V/eSqhDZz4+cUahkSIp9/XgwDAYDVR0TAQH/BAIwADB4
+BggrBgEFBQcBAQRsMGowLQYIKwYBBQUHMAGGIWh0dHA6Ly9yYXBpZHNzbC1vY3Nw
+Lmdlb3RydXN0LmNvbTA5BggrBgEFBQcwAoYtaHR0cDovL3JhcGlkc3NsLWFpYS5n
+ZW90cnVzdC5jb20vcmFwaWRzc2wuY3J0MEwGA1UdIARFMEMwQQYKYIZIAYb4RQEH
+NjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdlb3RydXN0LmNvbS9yZXNvdXJj
+ZXMvY3BzMA0GCSqGSIb3DQEBCwUAA4IBAQAXnQ0EXVz77PiovvYKBMjktoylywL0
+hHKQDl//Uogoq9bTLvp91pfTMagvmGBZwL5l+9CPtal+yJc6ogh2cCjddqWleSAQ
+F2ikd/QRMXaolcSNofFG9M+cmJHPmhFIJPOOqHdfTbcaM54swrgdEXhsKCd56t3X
+hUSa267XqAf+UgSVXa5/9+7niYKbPm6S7ENEdzmJBjzC6xZ3o0IpncmQpC1cPNOy
+v6m7bak466pL1Vevz4zJrf1D/GO7tuEr1UKaACEO7dN9s48BIszFS876vdltnwqo
+6Y+OhZYur/8jg4W7AsT50u4Nm1YhbT4O+wl3P1dAZTirIjdcLJPi1Igc
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIFNjCCBB6gAwIBAgIDEF5UMA0GCSqGSIb3DQEBCwUAMDwxCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
+HhcNMTQwMTI4MDM0MzI2WhcNMTYwMjI5MTgwMDU1WjCBvzEpMCcGA1UEBRMgOW5L
+LXA1Zkpsam1leVg1aXREZTFMS2VnTHB1WWJtVUQxEzARBgNVBAsTCkdUMjgzMzcw
+OTIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
+KGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
+U1NMKFIpMRkwFwYDVQQDDBAqLmNvbXBpbGF0aW8ubmV0MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAxU1Kzma74qazOCj/66wzcyZHB7XtSgIFEw1LtLq/
+9OA5efe/5yL6nK6H0pZoEpWGDLSzQkQJFP1OlozStQAAf/U0N5mWY5JUqwJce+Y5
+8bA7jg2JIDp8zPDvKMJ3izkeJUxBdYiV6aZW3aRjt22tTlxlXgU3wovicu+acSY9
+YAZLMWkvNoVHfNTmXZA8rzMif2qPSHnv2HIu+vUiTmD39BPxHfbunvCjmmFZWM2f
+O/QEyG2n4/YuttEzNd9yhU7t++KFiK+D1vlCbRRnjffyhQfEhcj6zauCDtfOzadt
+O+LzMSdS+g/B3mx2ic9ixgC0ml2Mw7De29XHzcbhcYuD/wIDAQABo4IBuzCCAbcw
+HwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWg
+MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjArBgNVHREEJDAighAqLmNv
+bXBpbGF0aW8ubmV0gg5jb21waWxhdGlvLm5ldDBDBgNVHR8EPDA6MDigNqA0hjJo
+dHRwOi8vcmFwaWRzc2wtY3JsLmdlb3RydXN0LmNvbS9jcmxzL3JhcGlkc3NsLmNy
+bDAdBgNVHQ4EFgQURW26V/eSqhDZz4+cUahkSIp9/XgwDAYDVR0TAQH/BAIwADB4
+BggrBgEFBQcBAQRsMGowLQYIKwYBBQUHMAGGIWh0dHA6Ly9yYXBpZHNzbC1vY3Nw
+Lmdlb3RydXN0LmNvbTA5BggrBgEFBQcwAoYtaHR0cDovL3JhcGlkc3NsLWFpYS5n
+ZW90cnVzdC5jb20vcmFwaWRzc2wuY3J0MEwGA1UdIARFMEMwQQYKYIZIAYb4RQEH
+NjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdlb3RydXN0LmNvbS9yZXNvdXJj
+ZXMvY3BzMA0GCSqGSIb3DQEBCwUAA4IBAQAXnQ0EXVz77PiovvYKBMjktoylywL0
+hHKQDl//Uogoq9bTLvp91pfTMagvmGBZwL5l+9CPtal+yJc6ogh2cCjddqWleSAQ
+F2ikd/QRMXaolcSNofFG9M+cmJHPmhFIJPOOqHdfTbcaM54swrgdEXhsKCd56t3X
+hUSa267XqAf+UgSVXa5/9+7niYKbPm6S7ENEdzmJBjzC6xZ3o0IpncmQpC1cPNOy
+v6m7bak466pL1Vevz4zJrf1D/GO7tuEr1UKaACEO7dN9s48BIszFS876vdltnwqo
+6Y+OhZYur/8jg4W7AsT50u4Nm1YhbT4O+wl3P1dAZTirIjdcLJPi1Igc
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://epoq.compilatio.net/shibboleth/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epoq.compilatio.net/shibboleth/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">Compilatio - Prévention du plagiat</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Service payant d'analyse de document en ligne mis à la disposition de l'enseignement supérieur et permettant la détection de plagiat dans les travaux étudiants ...</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="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="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"/>
+      <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:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="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"/>
+      <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"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">COMPILATIO</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">COMPILATIO</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>ent@compilatio.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/epos.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/epos.some.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..24cfeea8
--- /dev/null
+++ b/swamid-interfederations-2.0/epos.some.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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://epos.some.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="2014-04-02T09:53: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://epos.some.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>
+						MIIC/TCCAeWgAwIBAgIJAIeX2OzTvmynMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEmVwb3Muc29tZS5veC5hYy51azAeFw0xNDA1MDcxMjE5NTZaFw0yNDA1MDQx
+						MjE5NTZaMB0xGzAZBgNVBAMTEmVwb3Muc29tZS5veC5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBANoYLxr0nZQXjMkLpIu8EdDajPHthrne+eWK
+						oF12T0H5RYUw0YE3pMKwK3VWoXHdRzH4ePvND1PW7lTOHTiNtausoL8QlhrPFFQz
+						8AC3EXaBHyq+jVRxNMxqhCtVj72luACc4zA/cRsogZeYZPF4KlmpBA8KCqr1mCmM
+						6fxup0StnVye/crUmEqg7dYWEIqR7mIMZWi4QLV/VMEV5UOX0KU4Qm7Pu7oTNtL3
+						bLUIE5bXsGhlvzF86jCxO9Y8NKSlFKUaddBUjVfYqUsEu4oXQSTlMmSVD3djy8Yc
+						ncy2uY3JELglba34miJSBoQvnw6uoKWU2LmMyNaPs6RV8xXULlMCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISZXBvcy5zb21lLm94LmFjLnVrMB0GA1UdDgQWBBS4MB3W4HW8
+						tZYm+obee7zmUo9IEjANBgkqhkiG9w0BAQUFAAOCAQEAPr/z/iLjWcFujxOYgHR+
+						bg0I7OYGQzDVhED0ECK8sQuNMS3oQBqQPp601lgIdaQVBbQRB7hwdp8wm53Zhmqb
+						SgqmfLmzaW3WU9YXNLE6082liVKhchZbhSSq0SjglXNlxlTcAGtkBESjfHH5K6Se
+						OL7WxfOEJkc4jY8haTScAZ+wFcUFbuWtxpfz0nd2OfYn7qkR2jo3J6e7FCfXzR1C
+						6ZCffO7hx2tmAfC7gPRWLKV5AHTJ/tkgLAtH80nepDjZw586qjywlEBM7qYI/GlK
+						XxF0pyDgcq3CujFb3JC3x5aIEq9zFiy/6R7bZhkuCSCgGA/Ey5RPXslWSgQTyF9i
+						CA==
+					</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://epos.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epos.some.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://epos.some.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://epos.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://epos.some.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, Somerville College EPOS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Somerville College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it.support@some.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Somerville College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it.support@some.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/equinoxjournals.com-shibboleth-sp.xml b/swamid-interfederations-2.0/equinoxjournals.com-shibboleth-sp.xml
new file mode 100644
index 00000000..63484c4f
--- /dev/null
+++ b/swamid-interfederations-2.0/equinoxjournals.com-shibboleth-sp.xml
@@ -0,0 +1,77 @@
+<?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://equinoxjournals.com/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-03T09:28: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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Equinox Publishing</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Publishing academic journals, textbooks, anthologies, monographs and reference books in the areas of archaeology, linguistics, cultural history, religious studies, theology, biblical studies, cookery and popular music.</mdui:Description>
+        <mdui:Logo height="79" width="363">https://www.equinoxpub.com/equinox/images/home_logo.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.equinoxpub.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.equinoxpub.com/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.equinoxpub.com/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.equinoxpub.com/Shibboleth.sso/DS" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEXDCCA0SgAwIBAgIJAI+ovrSiKZbIMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
+						VQQGEwJHQjEYMBYGA1UECBMPU291dGggWW9ya3NoaXJlMRIwEAYDVQQHEwlTaGVm
+						ZmllbGQxHzAdBgNVBAoTFkVxdWlub3ggUHVibGlzaGluZyBMdGQxCzAJBgNVBAsT
+						AklUMRwwGgYDVQQDExNlcXVpbm94am91cm5hbHMuY29tMSUwIwYJKoZIhvcNAQkB
+						FhZzdXBwb3J0QGVxdWlub3hwdWIuY29tMB4XDTEyMDQwMzIyMjkzOFoXDTIyMDQw
+						MTIyMjkzOFowga4xCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9Tb3V0aCBZb3Jrc2hp
+						cmUxEjAQBgNVBAcTCVNoZWZmaWVsZDEfMB0GA1UEChMWRXF1aW5veCBQdWJsaXNo
+						aW5nIEx0ZDELMAkGA1UECxMCSVQxHDAaBgNVBAMTE2VxdWlub3hqb3VybmFscy5j
+						b20xJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZXF1aW5veHB1Yi5jb20wggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGZpYDMaxM9v0cDM+JkoNQSMRPwOUo
+						iwl45P9jJh1zwJRi++9/uu9e/kQIEJmiZYowkyea2wPDYZVAukOgfkk4m+0VVoV6
+						Ro/mNO1jBCsVXXQ6DeT8Aq/UCI1N4LlBD9DHPp+neQZvhoQp1V1zouXqMUBTRtW+
+						77h2IIidOGlaU6OS7qJLqGLQQCWZD1mxb6Sms+5Sa1xdf9WOUq3inB6gB6GReJdC
+						tWInflUNrFS8mvM0lHUQs18SmulMokgb+s8xSJljpcbCMpSWKshHZjWuOmzc15a4
+						a3rSgZxZDJMqioQzpGMOyd7FZEIgnBY6KFurNkha7ddISbaSmrWtnytBAgMBAAGj
+						ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
+						IENlcnRpZmljYXRlMB0GA1UdDgQWBBRoLYcAzpJhhw9sBy/6ACALL0qpczAfBgNV
+						HSMEGDAWgBRoLYcAzpJhhw9sBy/6ACALL0qpczANBgkqhkiG9w0BAQUFAAOCAQEA
+						SqIXjnqGhkkRA5cSJherE2uyt7eDmA7VXbJjGV+KgM4dWf+R+Y81NzYuddknTeGZ
+						eQTcGy67dYnzDan8ZN+AfS98NgHx4qaTI+rwq5/0Vo+MaG57NiGUt6pkR1LKTbtw
+						Zf8QgAhLAWH66w4tK+/507XY5GS+Cfkjznnm2hT6pftCg13mMO4YFGzH7LUwPYSR
+						UdH7G5kkGwV0FhZaDP0e5SKWfHGjihDcw5RbOLiD5hv7m1Ls7PDKPR+izh+40wf/
+						d0RO7oiZKGZjtKMvJPh++lYFflUPLH/lmg3nzKYmwTdJFmC4m9NL+9QRn0Ned2D8
+						pztQ4C1nPvNFJOO9MeGj6g==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.equinoxpub.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.equinoxpub.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.equinoxpub.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.equinoxpub.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.equinoxpub.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.equinoxpub.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.equinoxpub.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.equinoxpub.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.equinoxpub.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.equinoxpub.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.equinoxpub.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Equinox Publishing Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Equinox Publishing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.equinoxpub.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Willis</md:SurName>
+    <md:EmailAddress>mailto:mwillis@equinoxpub.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Willis</md:SurName>
+    <md:EmailAddress>mailto:mwillis@equinoxpub.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eresources.city.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/eresources.city.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..61ad7783
--- /dev/null
+++ b/swamid-interfederations-2.0/eresources.city.ac.uk-oala-metadata.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eresources.city.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">city.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDqTCCApGgAwIBAgIJANEnL7ss8XzBMA0GCSqGSIb3DQEBBQUAMEExHzAdBgNV
+						BAoTFkNpdHkgVW5pdmVyc2l0eSBMb25kb24xHjAcBgNVBAMTFWVyZXNvdXJjZXMu
+						Y2l0eS5hYy51azAeFw0xMTA1MTgxMzA0MDhaFw0yMTA1MTUxMzA0MDhaMEExHzAd
+						BgNVBAoTFkNpdHkgVW5pdmVyc2l0eSBMb25kb24xHjAcBgNVBAMTFWVyZXNvdXJj
+						ZXMuY2l0eS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK4B
+						2cssI9cYHB6pShfCTfHPbLxpvtS6UDCSiyk59QjBkEe+xNOooWADPm/hOpJ8YSaJ
+						+P0YtBcGASJH7TZDoRDrQv4ilKnf4q3j634N3W7M/a/9QYhFb5+hoLCCFKW8k/Ci
+						2HGccZoXf71l1fm8WbaARlxr+jbfXm27xNTRYI0DQuLljCYEX4CbVULdJwJEDbly
+						zjE/m35pFfBSGkIfLW2Pb1kfqhQibPK9OFgaIS+CqnLjeeSu+vKCLZTReLO066k+
+						kD7w4sA5iQO8wgI/tplI3Qfk5nVYZ+U/lvwTErkUv8SHMRrSM5IpLCZJlt5c/kSs
+						dO3LGvR9DRDu5ZKeiKMCAwEAAaOBozCBoDAdBgNVHQ4EFgQU+ZtIxxwofqtAgktA
+						4ikJYEOr5Y8wcQYDVR0jBGowaIAU+ZtIxxwofqtAgktA4ikJYEOr5Y+hRaRDMEEx
+						HzAdBgNVBAoTFkNpdHkgVW5pdmVyc2l0eSBMb25kb24xHjAcBgNVBAMTFWVyZXNv
+						dXJjZXMuY2l0eS5hYy51a4IJANEnL7ss8XzBMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+						hvcNAQEFBQADggEBAAc1kylLE8KGgvXnA/WBu/ZQ/A/oHL0upJqpWr3cJeP3PMCG
+						T7XSvNK9gmFPakF0A5w14wtn+Q3cQTkPlfcEVbyUSOENFazXGRUxCzAZsVH7gnL+
+						FyZK+NT73wdvqR2OiwAMUWITHISyem029BRpbe59MR2V1uYk2l4xEHrqTt520XCQ
+						fRIGR+/ORhOm5ANGNp+uIL3YRPth2g0z+j3EB130sVfEt1LQdC6nsf6Nn1v7JXuV
+						HIkvnhXmEYmfriKBwfQlQmXn8e/r6MalkbDoyAwpj89nad1Qnt64y7Xlwuhv73Yh
+						IzI6BtUZKeH0qlf6/tMjgAJWUSgRl/w2i1F6Kf0=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDqTCCApGgAwIBAgIJANEnL7ss8XzBMA0GCSqGSIb3DQEBBQUAMEExHzAdBgNV
+						BAoTFkNpdHkgVW5pdmVyc2l0eSBMb25kb24xHjAcBgNVBAMTFWVyZXNvdXJjZXMu
+						Y2l0eS5hYy51azAeFw0xMTA1MTgxMzA0MDhaFw0yMTA1MTUxMzA0MDhaMEExHzAd
+						BgNVBAoTFkNpdHkgVW5pdmVyc2l0eSBMb25kb24xHjAcBgNVBAMTFWVyZXNvdXJj
+						ZXMuY2l0eS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK4B
+						2cssI9cYHB6pShfCTfHPbLxpvtS6UDCSiyk59QjBkEe+xNOooWADPm/hOpJ8YSaJ
+						+P0YtBcGASJH7TZDoRDrQv4ilKnf4q3j634N3W7M/a/9QYhFb5+hoLCCFKW8k/Ci
+						2HGccZoXf71l1fm8WbaARlxr+jbfXm27xNTRYI0DQuLljCYEX4CbVULdJwJEDbly
+						zjE/m35pFfBSGkIfLW2Pb1kfqhQibPK9OFgaIS+CqnLjeeSu+vKCLZTReLO066k+
+						kD7w4sA5iQO8wgI/tplI3Qfk5nVYZ+U/lvwTErkUv8SHMRrSM5IpLCZJlt5c/kSs
+						dO3LGvR9DRDu5ZKeiKMCAwEAAaOBozCBoDAdBgNVHQ4EFgQU+ZtIxxwofqtAgktA
+						4ikJYEOr5Y8wcQYDVR0jBGowaIAU+ZtIxxwofqtAgktA4ikJYEOr5Y+hRaRDMEEx
+						HzAdBgNVBAoTFkNpdHkgVW5pdmVyc2l0eSBMb25kb24xHjAcBgNVBAMTFWVyZXNv
+						dXJjZXMuY2l0eS5hYy51a4IJANEnL7ss8XzBMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+						hvcNAQEFBQADggEBAAc1kylLE8KGgvXnA/WBu/ZQ/A/oHL0upJqpWr3cJeP3PMCG
+						T7XSvNK9gmFPakF0A5w14wtn+Q3cQTkPlfcEVbyUSOENFazXGRUxCzAZsVH7gnL+
+						FyZK+NT73wdvqR2OiwAMUWITHISyem029BRpbe59MR2V1uYk2l4xEHrqTt520XCQ
+						fRIGR+/ORhOm5ANGNp+uIL3YRPth2g0z+j3EB130sVfEt1LQdC6nsf6Nn1v7JXuV
+						HIkvnhXmEYmfriKBwfQlQmXn8e/r6MalkbDoyAwpj89nad1Qnt64y7Xlwuhv73Yh
+						IzI6BtUZKeH0qlf6/tMjgAJWUSgRl/w2i1F6Kf0=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://eresources.city.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eresources.city.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">City University London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">City University London (IT log-in)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.city.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>E-Resources Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:e-access@city.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Zakrocki</md:SurName>
+    <md:EmailAddress>mailto:Robert.zakrocki.1@city.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/esds80.mcc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/esds80.mcc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..5b888e35
--- /dev/null
+++ b/swamid-interfederations-2.0/esds80.mcc.ac.uk-shibboleth.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://esds80.mcc.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>
+						MIIDBjCCAe6gAwIBAgIJAPsrc/dHrh27MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWVzZHN3cDAyLmRzLm1hbi5hYy51azAeFw0xMTA0MTQwODMwNTRaFw0yMTA0
+						MTEwODMwNTRaMCAxHjAcBgNVBAMTFWVzZHN3cDAyLmRzLm1hbi5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOIW9zW3cx5qTffqwVyTfkIZq9rB
+						2hwtpbPPD3pMOVzayJTjjjhFIbqOZ5cClg9KG4Z+fqrE8stkZnkvyyqYskQ1D17A
+						VPqzz7pZHXgw3siViaK5+h4Pt6M0KTybcmEYpE25UB6liRoVaS74tUsLnQrbt3Kr
+						yJuNjux6u0AJ6iLji2uEzI1VKp6vWNKLLN2kLYcm3b4oHIIetSOkSOnDTFtiWyGT
+						MwEg5ocJZVOIW3BDAtylsYVHDKzO+uiTWgQ4pL5oljifBsM8tQloL8jGbFZ1vq/5
+						3ZeXKG1NJ/X7/DjZKri7VDdVv7tRzuJdcookpTR61gjWXBkjQOB/znYKesUCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVZXNkc3dwMDIuZHMubWFuLmFjLnVrMB0GA1UdDgQW
+						BBSZAvZof+nlO9BXlVnwD3uiwxovDTANBgkqhkiG9w0BAQUFAAOCAQEAUr7hL/Z9
+						xBMNAbVWZ1116SclReYyutdoqjMvS9mQjhbAzvERGDC2lnq7773bJvsqQKNB2WDY
+						m3bsGaMXLY2XsQcV5SRzYADvvsxarruzzf41u2EIWrORuHZ44r4qSib7fU1rUIKt
+						CQQkpXFl5bF861syiHahW874Ps24A2yOTqGLdFpLXXOHYeNd1DppxJ24NQT8Zbv4
+						QRsxHJeqy5eD5bAq5w7k2OTTcK+wk9hOh/ZI9M3/Addini0dUUVGZIL4mX0szJ+C
+						rfxNIEq53mqQ2E3bBjXuEJxt54BJ7aaa2dPvhOq1RTZtKk8fzlkB7kYvLBJne4UB
+						gjkwmpPei6RNFQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDBjCCAe6gAwIBAgIJAPsrc/dHrh27MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWVzZHN3cDAyLmRzLm1hbi5hYy51azAeFw0xMTA0MTQwODMwNTRaFw0yMTA0
+						MTEwODMwNTRaMCAxHjAcBgNVBAMTFWVzZHN3cDAyLmRzLm1hbi5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOIW9zW3cx5qTffqwVyTfkIZq9rB
+						2hwtpbPPD3pMOVzayJTjjjhFIbqOZ5cClg9KG4Z+fqrE8stkZnkvyyqYskQ1D17A
+						VPqzz7pZHXgw3siViaK5+h4Pt6M0KTybcmEYpE25UB6liRoVaS74tUsLnQrbt3Kr
+						yJuNjux6u0AJ6iLji2uEzI1VKp6vWNKLLN2kLYcm3b4oHIIetSOkSOnDTFtiWyGT
+						MwEg5ocJZVOIW3BDAtylsYVHDKzO+uiTWgQ4pL5oljifBsM8tQloL8jGbFZ1vq/5
+						3ZeXKG1NJ/X7/DjZKri7VDdVv7tRzuJdcookpTR61gjWXBkjQOB/znYKesUCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVZXNkc3dwMDIuZHMubWFuLmFjLnVrMB0GA1UdDgQW
+						BBSZAvZof+nlO9BXlVnwD3uiwxovDTANBgkqhkiG9w0BAQUFAAOCAQEAUr7hL/Z9
+						xBMNAbVWZ1116SclReYyutdoqjMvS9mQjhbAzvERGDC2lnq7773bJvsqQKNB2WDY
+						m3bsGaMXLY2XsQcV5SRzYADvvsxarruzzf41u2EIWrORuHZ44r4qSib7fU1rUIKt
+						CQQkpXFl5bF861syiHahW874Ps24A2yOTqGLdFpLXXOHYeNd1DppxJ24NQT8Zbv4
+						QRsxHJeqy5eD5bAq5w7k2OTTcK+wk9hOh/ZI9M3/Addini0dUUVGZIL4mX0szJ+C
+						rfxNIEq53mqQ2E3bBjXuEJxt54BJ7aaa2dPvhOq1RTZtKk8fzlkB7kYvLBJne4UB
+						gjkwmpPei6RNFQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://esds80.mcc.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 New ESDS Server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.esds.ac.uk/international/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ESDS International Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:international@esds.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/esdsdev01.ds.man.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/esdsdev01.ds.man.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..0224a99b
--- /dev/null
+++ b/swamid-interfederations-2.0/esdsdev01.ds.man.ac.uk-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://esdsdev01.ds.man.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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ESDS International (Development)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Online access to socio-economic time series datasets aggregated to the country or regional level.</mdui:Description>
+        <mdui:Logo height="350" width="161">https://esdsdev01.ds.man.ac.uk/esdsint-med.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>
+						MIIDCTCCAfGgAwIBAgIJAOegVyCLESWpMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFmVzZHNkZXYwMS5kcy5tYW4uYWMudWswHhcNMTEwNDE2MTQzNDUwWhcNMjEw
+						NDEzMTQzNDUwWjAhMR8wHQYDVQQDExZlc2RzZGV2MDEuZHMubWFuLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArSSkzgeZ0lVbjh4jmzl6EwL+
+						UmBfmiXE25AQdHm69bZ18Xi5Mq6ekkw/WuNIztu4p14Nj3bOCXvmrILQE3sV0TNr
+						ge7XAAvfhwhwW8P/0KSF3PPO2mN1yZToSWJKb04idjSLttNTrOchEAapCfwYu4JE
+						r8uXNcccYNpuePE6wncoxWknWPJW4L+sarfQbAKmcksEiIwwlz/8gY0D4OhR+mhM
+						q/OsLzY4Os4+1QwGbO99uQbbH3ni8wnXZZWPRp/VbdAYjavb2CihJE0gxbCwl2Sb
+						wXCy6cYXSz5APMoNbdmnHHMaBH8Wfr9Iqj0H/8Mf22qnGT9QZQHotKY9Jxs99wID
+						AQABo0QwQjAhBgNVHREEGjAYghZlc2RzZGV2MDEuZHMubWFuLmFjLnVrMB0GA1Ud
+						DgQWBBTBQrWo24UVCTROZnBZNmP+c+/ksjANBgkqhkiG9w0BAQUFAAOCAQEABr5E
+						AteCYpWEIOSa2pd6O/J8RYs0eTev/erX86SOr9CzWVSbQWOOrGWIGGfzl6pr/InJ
+						HMODUl83ef2aqCLSPQNvWzLZUhZRWjIlrM7HEy+mreLg8SvS+/rXbD5GY7SoIPK1
+						wkg/sCG2ySIT2ar5mhIGBlMa5VCOqTSp0jf5bgnYHiBRK31gHA0U61ELt2CwymGb
+						AIcitktbUS8oKIi3s3VRVHS3gNmWDJheXPW3n1pOs59qvtKbgLaMKVik5TGCCDUL
+						bQGCEE/TE6oiedAX5+v00cmtKcjecUniOHdq1YbFBKFbFreehIOQVpM0ElONGtVN
+						N7ls4b7fnGvaF5RY9Q==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDCTCCAfGgAwIBAgIJAOegVyCLESWpMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFmVzZHNkZXYwMS5kcy5tYW4uYWMudWswHhcNMTEwNDE2MTQzNDUwWhcNMjEw
+						NDEzMTQzNDUwWjAhMR8wHQYDVQQDExZlc2RzZGV2MDEuZHMubWFuLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArSSkzgeZ0lVbjh4jmzl6EwL+
+						UmBfmiXE25AQdHm69bZ18Xi5Mq6ekkw/WuNIztu4p14Nj3bOCXvmrILQE3sV0TNr
+						ge7XAAvfhwhwW8P/0KSF3PPO2mN1yZToSWJKb04idjSLttNTrOchEAapCfwYu4JE
+						r8uXNcccYNpuePE6wncoxWknWPJW4L+sarfQbAKmcksEiIwwlz/8gY0D4OhR+mhM
+						q/OsLzY4Os4+1QwGbO99uQbbH3ni8wnXZZWPRp/VbdAYjavb2CihJE0gxbCwl2Sb
+						wXCy6cYXSz5APMoNbdmnHHMaBH8Wfr9Iqj0H/8Mf22qnGT9QZQHotKY9Jxs99wID
+						AQABo0QwQjAhBgNVHREEGjAYghZlc2RzZGV2MDEuZHMubWFuLmFjLnVrMB0GA1Ud
+						DgQWBBTBQrWo24UVCTROZnBZNmP+c+/ksjANBgkqhkiG9w0BAQUFAAOCAQEABr5E
+						AteCYpWEIOSa2pd6O/J8RYs0eTev/erX86SOr9CzWVSbQWOOrGWIGGfzl6pr/InJ
+						HMODUl83ef2aqCLSPQNvWzLZUhZRWjIlrM7HEy+mreLg8SvS+/rXbD5GY7SoIPK1
+						wkg/sCG2ySIT2ar5mhIGBlMa5VCOqTSp0jf5bgnYHiBRK31gHA0U61ELt2CwymGb
+						AIcitktbUS8oKIi3s3VRVHS3gNmWDJheXPW3n1pOs59qvtKbgLaMKVik5TGCCDUL
+						bQGCEE/TE6oiedAX5+v00cmtKcjecUniOHdq1YbFBKFbFreehIOQVpM0ElONGtVN
+						N7ls4b7fnGvaF5RY9Q==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esdsdev01.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://esdsdev01.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://esdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://esdsdev01.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://esdsdev01.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://esdsdev01.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 ESDS Development Server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.esds.ac.uk/international/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ESDS International Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:international@esds.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/esdswp01.ds.man.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/esdswp01.ds.man.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..30212e58
--- /dev/null
+++ b/swamid-interfederations-2.0/esdswp01.ds.man.ac.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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://esdswp01.ds.man.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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://esdswp01.ds.man.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>
+						MIIDBjCCAe6gAwIBAgIJAKCst/LT2atiMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWVzZHN3cDAxLmRzLm1hbi5hYy51azAeFw0xMTA4MjUxNDU3MzBaFw0yMTA4
+						MjIxNDU3MzBaMCAxHjAcBgNVBAMTFWVzZHN3cDAxLmRzLm1hbi5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2VrVToTVgEsS1K8MyHK+nvCOeV
+						T5gtFk9LTY6C5vAVD/lIWp76KmwpvOCnc1ZwEOzpzTJKvsLmN6OpI0oB56DgAU30
+						eb7VE72IlrZzq41Jwt6pt5Eda08npE0YY4mzeSmjuZwzV/TsjtFbDjB4k22LDZrE
+						1UHMNy9OP4FvBYm1eCKkYMpW7XGr2HZWMzVmavdCe8wtQzoIZCjvH+7gF/hokArN
+						8RRKvw2HxBsQBMWPmoEaoosT//9RS+W/daVjqyU/47WFxOAJBMf3s7WqcNumPcbI
+						IV4ApR+eaR5+xMsHx3sXxBGZrPkRm461XCSnrq/Rzb5Vc9ecJL+4h6m+eIECAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVZXNkc3dwMDEuZHMubWFuLmFjLnVrMB0GA1UdDgQW
+						BBQFfo7/j+0kUsgcDL9JM2MZB8uFgDANBgkqhkiG9w0BAQUFAAOCAQEAELePcQjX
+						STeh/K/A6eK5AzOXb76gtbtzdXAAOyPkQMI7nl1SmntgVtFb3SqbGmPyf24fwyjE
+						ghRwKp+cqkDTMRt4mAnky4gSVqFb978gN2+0qeLd1wOW+sSxCHy7QGnNv/+NMPTr
+						qmSwMnuP3icuaClHB4wndhDLjuGHJI8hzVB/gvNMRY607Jj01vof3um3J6hZVELa
+						QqvJf1p4AzkEqc/UVs5mNkeieg9eSkxCYMG7gWhu8P7peMnuEmRjenws3gh4gzWP
+						ZYoFe5iqgYhhtBTcwBEgRI825ISfRwE78qCfBOv8OS7rzGzjDO/lI8QuF12VNU5w
+						1K0XFxLVLmEFpw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MIMAS: ESDS International Web Server One</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://esds.mcc.ac.uk//</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ESDS International Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:international@esds.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/esodev.insrv.cf.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/esodev.insrv.cf.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..869300fb
--- /dev/null
+++ b/swamid-interfederations-2.0/esodev.insrv.cf.ac.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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://esodev.insrv.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-23T13:43: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDBjCCAe6gAwIBAgIJAOTb7E3AJLSnMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWVzb2Rldi5pbnNydi5jZi5hYy51azAeFw0xMjAzMDcxMDU5MzJaFw0yMjAz
+						MDUxMDU5MzJaMCAxHjAcBgNVBAMTFWVzb2Rldi5pbnNydi5jZi5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO6F55cSihSA/x76lMyqjJrD5Jg5
+						MsTC+z8XzlBFDozBygx855+CwIVJbZPIUG1OeU4NKolb3ajhunSLRvXMieV8ggKZ
+						kKmUrlze9Es5+4VjgIP7TN6DqPBoyvgAn/wdhwXYRebARb9gmQaXQngDMErJ9RzE
+						y0Q8jvsxH4V/Dg7XhvoqZmiC1fTX4/Pu0a35gSG91hQGlq7YEevXR6fM0mndANiM
+						W1m/bVQLFYdnqpWluda+4NQL1vQLY9s4/vNjZWuyOGG2wapxoYYZ1FVBicM85AWG
+						eHsSM3GflEKXKP+wMAyXLWeY42a9XhVKhLUO83UorFR77gL/lp38zlBE+8ECAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVZXNvZGV2Lmluc3J2LmNmLmFjLnVrMB0GA1UdDgQW
+						BBStsckECWrhJTx3JjU4j6MfCiUceTANBgkqhkiG9w0BAQUFAAOCAQEAf6oKwWJH
+						its+N8IRS3V3853Q9JSfsACBaWo+InbckPmW2+D1PYhngdHRga/GGxJvF2drepBi
+						p5L3rTqhS6+1dDQeXB5239MGQQyZZIuaUWqzgwkHhlbtwDZlcUDlsGyW7s3Wkbvf
+						GC5FNlx3+gj5WpFo6l/iMpWwBK/kxEN+SRW8TJjAOqg8dLxcMUBnZw1Kydgc4tWm
+						GeIoKDPY2grHcp4hT9Me12tj2DYcDjyw5rGiv0BL6YghzapXGFTcFI6BZoMnRji3
+						ldYUb4/0ivef8X0aOal+/U5alUlfmBCL8pMXh1ckpzJa55KMb+CkkMhGoQY95VuL
+						Pukhmwd1O96IqQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esodev.insrv.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://esodev.insrv.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://esodev.insrv.cf.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cardiff University: European Sources Online Development Server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.europeansources.info/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ESO Webmaster</md:GivenName>
+    <md:EmailAddress>mailto:esowebmaster@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:smith@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/espresso.ltscotland.org.uk-shibboleth.xml b/swamid-interfederations-2.0/espresso.ltscotland.org.uk-shibboleth.xml
new file mode 100644
index 00000000..ab7a619a
--- /dev/null
+++ b/swamid-interfederations-2.0/espresso.ltscotland.org.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://espresso.ltscotland.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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDRDCCAiygAwIBAgIJAIeqTze25mL+MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGmVzcHJlc3NvLmx0c2NvdGxhbmQub3JnLnVrMB4XDTEwMDcyMDE2MTk1M1oX
+						DTIwMDcxNzE2MTk1M1owJTEjMCEGA1UEAxMaZXNwcmVzc28ubHRzY290bGFuZC5v
+						cmcudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuCr8tj+kHF4ZP
+						1x+WJSl4h9zsrALKUwz90Nx8ZGBBfcO8LL1T5/8r3xO3uJgJNDVaLCQ10j7VgwQf
+						i19HjPBElKtCPcGDyvJsTR6sCijXWjDZUfXlKgL5wTrGdGCqGrfhD0ZLW8y20LDx
+						s2XW7r60/sgrF75YnqpBSPy3kFc7lrZTDfseFyafA7KshjHfll7NVsKCLfXPKLuY
+						R+MCwl2BYi94Bq9xGPSsTQdvIxphcq5yZYWXFLnqa9Knus/7+2bWVxaNao9xRahp
+						N/+NhXv1ECz1xvTxVc7f1746aIqSEDW02QEHy3s7pmDfPUDsdIcDOO7vd4t2g9Rp
+						ngyRSm+JAgMBAAGjdzB1MFQGA1UdEQRNMEuCGmVzcHJlc3NvLmx0c2NvdGxhbmQu
+						b3JnLnVrhi1odHRwczovL2VzcHJlc3NvLmx0c2NvdGxhbmQub3JnLnVrL3NoaWJi
+						b2xldGgwHQYDVR0OBBYEFJki6pKJFO2mJGvIV+QAKyDPpmzbMA0GCSqGSIb3DQEB
+						BQUAA4IBAQAdecqQ0xQkgDOtpHwjWDldS9PbQFVTcWX7tTwhRb+TtzcUQOa+mFAA
+						TPkSFIWO8jp1L6llQxyKWdqDFJm3bTmpDj9WcRkG/5wjl0gTmeZer0bMCwIaC7EZ
+						hbAQy2Ugv/ie1DFU8Utm0jVIKLOMNa+KbuqNkAfuOwl2PdEbyn0sJAiiIgKlbHqa
+						yr7UZjtwW2H3Mwlp8GZILKFmvQLxKMtcnp3iPSrqZNtsRvPtQ8Qg3NL2CmczwdBm
+						nbxqu2CEkRcRfZf1pHACgSR44DkxX52pa9MfHd00Z/PnmctS1+m4FDR/FglcgWhq
+						kjnnl+e0Q+6WhaKDvcT5wPGT4x0SH1CK
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDRDCCAiygAwIBAgIJAIeqTze25mL+MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGmVzcHJlc3NvLmx0c2NvdGxhbmQub3JnLnVrMB4XDTEwMDcyMDE2MTk1M1oX
+						DTIwMDcxNzE2MTk1M1owJTEjMCEGA1UEAxMaZXNwcmVzc28ubHRzY290bGFuZC5v
+						cmcudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuCr8tj+kHF4ZP
+						1x+WJSl4h9zsrALKUwz90Nx8ZGBBfcO8LL1T5/8r3xO3uJgJNDVaLCQ10j7VgwQf
+						i19HjPBElKtCPcGDyvJsTR6sCijXWjDZUfXlKgL5wTrGdGCqGrfhD0ZLW8y20LDx
+						s2XW7r60/sgrF75YnqpBSPy3kFc7lrZTDfseFyafA7KshjHfll7NVsKCLfXPKLuY
+						R+MCwl2BYi94Bq9xGPSsTQdvIxphcq5yZYWXFLnqa9Knus/7+2bWVxaNao9xRahp
+						N/+NhXv1ECz1xvTxVc7f1746aIqSEDW02QEHy3s7pmDfPUDsdIcDOO7vd4t2g9Rp
+						ngyRSm+JAgMBAAGjdzB1MFQGA1UdEQRNMEuCGmVzcHJlc3NvLmx0c2NvdGxhbmQu
+						b3JnLnVrhi1odHRwczovL2VzcHJlc3NvLmx0c2NvdGxhbmQub3JnLnVrL3NoaWJi
+						b2xldGgwHQYDVR0OBBYEFJki6pKJFO2mJGvIV+QAKyDPpmzbMA0GCSqGSIb3DQEB
+						BQUAA4IBAQAdecqQ0xQkgDOtpHwjWDldS9PbQFVTcWX7tTwhRb+TtzcUQOa+mFAA
+						TPkSFIWO8jp1L6llQxyKWdqDFJm3bTmpDj9WcRkG/5wjl0gTmeZer0bMCwIaC7EZ
+						hbAQy2Ugv/ie1DFU8Utm0jVIKLOMNa+KbuqNkAfuOwl2PdEbyn0sJAiiIgKlbHqa
+						yr7UZjtwW2H3Mwlp8GZILKFmvQLxKMtcnp3iPSrqZNtsRvPtQ8Qg3NL2CmczwdBm
+						nbxqu2CEkRcRfZf1pHACgSR44DkxX52pa9MfHd00Z/PnmctS1+m4FDR/FglcgWhq
+						kjnnl+e0Q+6WhaKDvcT5wPGT4x0SH1CK
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://espresso.ltscotland.org.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: LTS Espresso</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ltscotland.org.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/ethics-gradient.oucs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ethics-gradient.oucs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..bf102555
--- /dev/null
+++ b/swamid-interfederations-2.0/ethics-gradient.oucs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,69 @@
+<?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://ethics-gradient.oucs.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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ethics-gradient.oucs.ox.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>
+						MIIERjCCAy6gAwIBAgIJALgZeahxwEy4MA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
+						VQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEL
+						MAkGA1UEChMCT1UxDTALBgNVBAsTBE9VQ1MxJjAkBgNVBAMTHWV0aGljcy1ncmFk
+						aWVudC5vdWNzLm94LmFjLnVrMSkwJwYJKoZIhvcNAQkBFhpkYXZpZC5wYWluZUBv
+						dWNzLm94LmFjLnVrIDAeFw0xMTEwMjUxMDAyMzdaFw0yMTEwMjIxMDAyMzdaMIGj
+						MQswCQYDVQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94
+						Zm9yZDELMAkGA1UEChMCT1UxDTALBgNVBAsTBE9VQ1MxJjAkBgNVBAMTHWV0aGlj
+						cy1ncmFkaWVudC5vdWNzLm94LmFjLnVrMSkwJwYJKoZIhvcNAQkBFhpkYXZpZC5w
+						YWluZUBvdWNzLm94LmFjLnVrIDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBANpgnm1ZdH5VrhKZt66jAFXdsWxVUVhJJUT9HmViJJkAeGIwKML3tld0/j1v
+						KRXs+QjQys61FzpfETql2eFT7CZb3iUVUMTbV1VBwu0Lf25H8dEtgRY0Tt+ZV0gI
+						fzNnMFpfb7EtNZZHdbU6rxKmY7xeZCvOBRWdy5kF78J7gvGnYaHV2ArgmaMRCIm9
+						QA3bqRlLeRxT8owEhQgPaxHE3jZVQX9o6hTJqM3/L/uRCpdf3EJepL4ZC9AMDStK
+						bfdSOcHq8WrbTx4juTedJc2QjI0CLeRzD18pzMZj8Y3mc/bUeMoh1mXnPLe6e2Kc
+						zW4NN5vGCYjihHZga9v+51oOgSUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
+						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
+						FCGPm3EqAWvjN9zModxeKu784rsTMB8GA1UdIwQYMBaAFCGPm3EqAWvjN9zModxe
+						Ku784rsTMA0GCSqGSIb3DQEBBQUAA4IBAQAnR9s594S+zzVQzrOtYwxpr2Z103xZ
+						7rCQUmolApSAvd4dZ0srrUl5f7DQqACGKbvaYMuLwUObqxXGnJeK5/II4ZoByE0c
+						D/Po9V/MCTpL/Nas2z5Suc4vFsCbKmbngOS2FmXHFQMCraKhIJCp4eCfqWY3Tj3i
+						1sttvjMWb/KMokwV6cH6gkSqDRgbLuvKsy4B/0LeAM0FkswOtQDbxuKlIsgkdsjp
+						S3EDoLO9KauhnpwuvCqRYuV/NQi2FMCKl/5tiOmKW8l/BaQy2FY/VImjGYZFOpvm
+						QLNfViPTeObrR0sZF2spXInDR2IWwMyZ+MCl4p07RuKQWQwqKp4mCfzG
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Test SP for Vidaas Project</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://vidaas.oucs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dave</md:GivenName>
+    <md:SurName>Paine</md:SurName>
+    <md:EmailAddress>mailto:david.paine@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dave</md:GivenName>
+    <md:SurName>Paine</md:SurName>
+    <md:EmailAddress>mailto:david.paine@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eu.alma.exlibrisgroup.com-mng-login.xml b/swamid-interfederations-2.0/eu.alma.exlibrisgroup.com-mng-login.xml
new file mode 100644
index 00000000..fc19e950
--- /dev/null
+++ b/swamid-interfederations-2.0/eu.alma.exlibrisgroup.com-mng-login.xml
@@ -0,0 +1,78 @@
+<?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://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="2013-08-01T14:41: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://eu.alma.exlibrisgroup.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>
+						MIIEUDCCArigAwIBAgIEUWQ+bzANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJJ
+						TDESMBAGA1UECBMJSmVydXNhbGVtMRIwEAYDVQQHEwlKZXJ1c2FsZW0xETAPBgNV
+						BAoTCEV4bGlicmlzMQ0wCwYDVQQLEwRBbG1hMREwDwYDVQQDEwhTQU1MIEpLUzAe
+						Fw0xMzA0MDkxNjE0MzlaFw0yMzA0MDcxNjE0MzlaMGoxCzAJBgNVBAYTAklMMRIw
+						EAYDVQQIEwlKZXJ1c2FsZW0xEjAQBgNVBAcTCUplcnVzYWxlbTERMA8GA1UEChMI
+						RXhsaWJyaXMxDTALBgNVBAsTBEFsbWExETAPBgNVBAMTCFNBTUwgSktTMIIBojAN
+						BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAkZEP11/7z1BnlfvByEfwmvkEeWdS
+						4h0500whQeaSyLAeIQLnBvv0AL+yrnHUCQhdXtuKcB2KP1hHkORujT/AoyX5KaV6
+						iO+afUWdMfePg6nHRXhg/Efpkg4pzq1suDRNlY36nloFU39LHMTDOm6fc6cli5/h
+						v0mSgEI3rwTQRYKxe3gt7Yx2HCnyehxdEMYxxLgTUst+fnDvlJ8XSeLcIgwMe8S6
+						5tDQJDxCSumDG9gLv4mHIeIWKbAaX3boeDKXM0cj7k1MA0ppDjXZiYeTeM11c3A9
+						YNHnosQPN03vKl2Z38Qtg5wBJfGKxbI9mmO517iLpZWw0ppnW0VuxOuzUoIRRgM8
+						H9Ic4MdrHrOBpdkjTdiC5P6Dy9CvPsKAf53L2olwlWtv0fAljQ1Zd7tABvUjzOHD
+						I+oGLmP5JKt42Pr1xQtA3HEm6Gdi7CMclBAFqOb//xt9fmCh6o8Elxr4p70qU48S
+						hZAXj5G1oykPWWL0Z9/Jf106wQ4fK5ePxhapAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+						ggGBAIfkCOJbJuchcJJOQVa1Ryw6T5MDdOS81uZW8MyFRlBI9bB0CfcM0BcddzFs
+						WAGslqQra8XWpTQXUrkyY+Uqt5pM1fIupPciVoeCJcK899u+5RM5D6gP5HpC/yc3
+						IKyHg91SiGq3nUynaMsRUgGPHZ5rjsXoFg+wYbfT6fDcO+ca4y8OI/mrGczTRjWb
+						WWDkVX4RzUZgk8DqwTMytfOdUzhml7qKfdoJyP7+ScfhEkwri1ZinIJ+Drn7lQdw
+						xCofIkXeJ/2llGWekavHYf+wCINX2m7zrsl7u0pBdbvOrqB54xJ9Jd03tKlyFs7k
+						87lAj02qwCOxkOQ1PmbzjBji8NOq05yfUEHzKG/l3mPfj25HTLqLQ8M8Qs87S/H/
+						2lA7QhxVaWc0V7kPWo1yIE0KYVnXbHy4Hw2on+dcwH7wPLItCneryp8rM1WRSE+X
+						s7Q3F7NVAvvfPrcXUfxw67jc3NQEGPGESn2ZCdcD8SQNPBymdG0572nebb4AhmBR
+						2PN4Eg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eu.alma.exlibrisgroup.com/mng/pdsHandleLogin"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eu.alma.exlibrisgroup.com/mng/pdsHandleLogin" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://eu.alma.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 Alma - 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/eu01.alma.exlibrisgroup.com-mng-login.xml b/swamid-interfederations-2.0/eu01.alma.exlibrisgroup.com-mng-login.xml
new file mode 100644
index 00000000..ad7cf527
--- /dev/null
+++ b/swamid-interfederations-2.0/eu01.alma.exlibrisgroup.com-mng-login.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eu01.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-11-18T14:42:51Z">
+      <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
+						Fw0xMzA0MDkxNjE0MzlaFw0yMzA0MDcxNjE0MzlaMGoxCzAJBgNVBAYTAklMMRIw
+						EAYDVQQIEwlKZXJ1c2FsZW0xEjAQBgNVBAcTCUplcnVzYWxlbTERMA8GA1UEChMI
+						RXhsaWJyaXMxDTALBgNVBAsTBEFsbWExETAPBgNVBAMTCFNBTUwgSktTMIIBojAN
+						BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAkZEP11/7z1BnlfvByEfwmvkEeWdS
+						4h0500whQeaSyLAeIQLnBvv0AL+yrnHUCQhdXtuKcB2KP1hHkORujT/AoyX5KaV6
+						iO+afUWdMfePg6nHRXhg/Efpkg4pzq1suDRNlY36nloFU39LHMTDOm6fc6cli5/h
+						v0mSgEI3rwTQRYKxe3gt7Yx2HCnyehxdEMYxxLgTUst+fnDvlJ8XSeLcIgwMe8S6
+						5tDQJDxCSumDG9gLv4mHIeIWKbAaX3boeDKXM0cj7k1MA0ppDjXZiYeTeM11c3A9
+						YNHnosQPN03vKl2Z38Qtg5wBJfGKxbI9mmO517iLpZWw0ppnW0VuxOuzUoIRRgM8
+						H9Ic4MdrHrOBpdkjTdiC5P6Dy9CvPsKAf53L2olwlWtv0fAljQ1Zd7tABvUjzOHD
+						I+oGLmP5JKt42Pr1xQtA3HEm6Gdi7CMclBAFqOb//xt9fmCh6o8Elxr4p70qU48S
+						hZAXj5G1oykPWWL0Z9/Jf106wQ4fK5ePxhapAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+						ggGBAIfkCOJbJuchcJJOQVa1Ryw6T5MDdOS81uZW8MyFRlBI9bB0CfcM0BcddzFs
+						WAGslqQra8XWpTQXUrkyY+Uqt5pM1fIupPciVoeCJcK899u+5RM5D6gP5HpC/yc3
+						IKyHg91SiGq3nUynaMsRUgGPHZ5rjsXoFg+wYbfT6fDcO+ca4y8OI/mrGczTRjWb
+						WWDkVX4RzUZgk8DqwTMytfOdUzhml7qKfdoJyP7+ScfhEkwri1ZinIJ+Drn7lQdw
+						xCofIkXeJ/2llGWekavHYf+wCINX2m7zrsl7u0pBdbvOrqB54xJ9Jd03tKlyFs7k
+						87lAj02qwCOxkOQ1PmbzjBji8NOq05yfUEHzKG/l3mPfj25HTLqLQ8M8Qs87S/H/
+						2lA7QhxVaWc0V7kPWo1yIE0KYVnXbHy4Hw2on+dcwH7wPLItCneryp8rM1WRSE+X
+						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://eu01.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 EU01 - 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/events.ucl.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/events.ucl.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c07fec7a
--- /dev/null
+++ b/swamid-interfederations-2.0/events.ucl.ac.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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://events.ucl.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="2011-01-12T18: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:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://events.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>
+						MIIDHDCCAgSgAwIBAgIJAMhx5buX5u6lMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEGV2ZW50cy51Y2wuYWMudWswHhcNMTMwODE1MjAwMjMzWhcNMjgwODExMjAw
+						MjMzWjAbMRkwFwYDVQQDExBldmVudHMudWNsLmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAvMZJYxOssGkpBVd67l0fLZwUUZYrI96V+LYxRETF
+						COiwY4F9qZakjGLeSu6grE0/IfXqVQmRJrBnD7ZylFgZNwUymZutBAKf+MUvZ4tg
+						tbjmCRNjp1YXMMNuacZKafM8pXOGf6JVnao02m8KojOqHXWH8/iZ6Q8ZICp7HyUf
+						6FSfbSjIcfEWJETqMOjll7//X/xevT6tLqOYM6mGvkL8+v59yiylL6dmubuc0eku
+						oI+qx4oEcOZQG7Kh8Ma338Ir+K4r3GRyBmeDAf6bf73DgCsm9LYzbZJAfBj2k17e
+						vEHZklAMEC61C0kZ+uw97JsnbuKwg5Lr1x2O23uRe+Uu+wIDAQABo2MwYTBABgNV
+						HREEOTA3ghBldmVudHMudWNsLmFjLnVrhiNodHRwczovL2V2ZW50cy51Y2wuYWMu
+						dWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUtVIfzTtfXXYgsLzHKV+nlYpC0YkwDQYJ
+						KoZIhvcNAQEFBQADggEBAAuzenNPDyESW0NGiFOujy4iN1sUci5R971Q52J5vRI6
+						VAOkcorPF1pQZQG+0ysy8IO7z8pMrcjnPnihMoEieWhevuQ3rH0GQTIsZp2R44QT
+						8Ef85tFNRNtBl4N+wzR8YsimKuO6yF5LzYv4qmny7VTb2Vgy5D7cRbrdkPDunseV
+						gcWtiFfrJ88ZfwGpzLxu3+NciV2dCWpydaJOm9UbnhPCQBJpOeISLFnWyVsd+aHt
+						S4692p+l8NLdLIr36qthKjOIlrARIpG/vcpJKBlrq+YecfaICiUCCHH0DvMHb4Ev
+						fKI+L2d7dTFS5x6olfRCjRqlj5p4sXouizdqc0Ak10M=
+					</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://events.ucl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://events.ucl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://events.ucl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://events.ucl.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://events.ucl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://events.ucl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://events.ucl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://events.ucl.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://events.ucl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://events.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://events.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://events.ucl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://events.ucl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://events.ucl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://events.ucl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University College London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University College London: Events Calendar</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucl.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Adrian</md:GivenName>
+    <md:SurName>Barker</md:SurName>
+    <md:EmailAddress>mailto:systems@ucl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Jomaron</md:SurName>
+    <md:EmailAddress>mailto:cmj@candjsoftware.co.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:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Jomaron</md:SurName>
+    <md:EmailAddress>mailto:cmj@candjsoftware.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/exam.mvm.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/exam.mvm.ed.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..36967cc2
--- /dev/null
+++ b/swamid-interfederations-2.0/exam.mvm.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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://exam.mvm.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:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://exam.mvm.ed.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>
+						MIIDIDCCAgigAwIBAgIJALQh8bzNfyAWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEWV4YW0ubXZtLmVkLmFjLnVrMB4XDTExMDQwODE0MTUxM1oXDTIxMDQwNTE0
+						MTUxM1owHDEaMBgGA1UEAxMRZXhhbS5tdm0uZWQuYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCeaSQzsMoZUnTOhwMymQk9Vm+FPF7jOZ10NIv/
+						P0ac9f5qjTGhlmzsnswGObNPGwE/5cXtySLww3+3C4E7RzYgfeNfdu4Gf24ZNj0A
+						lP3Pws/N+efi84aqe8Xw63HdpEE4btvVRPa85pRKV8D6yVGI+9DWs3I0UGwEoLpP
+						VfaL5eIJZXnwO1/+EI18wufQn3vtvtAF1oEwPzhsCRfmnt4hqqldHEs0XBe+5IMo
+						DMYp/+ZG7bYAAdWJ4aK1FNPdjAe4MnlyItELveVHNeVwUMcRPUXzN1pLQKFWI/X6
+						E3EJTwmRZl1IQIQBx9xpE8YX8BZZTBQuIiVmiseMdbK0p5i9AgMBAAGjZTBjMEIG
+						A1UdEQQ7MDmCEWV4YW0ubXZtLmVkLmFjLnVrhiRodHRwczovL2V4YW0ubXZtLmVk
+						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFNUzFri1AubM0m6NAuN1gi3zcwHG
+						MA0GCSqGSIb3DQEBBQUAA4IBAQAEZXS+2a8+9rgQvK45/M56c4UkF115bfuoMHvz
+						ZvoJdWP7QUNGNQVjfQ/aonEpDpT66estmT1+Ay9M11+d0FHCWSrnVPOo7ynddrx8
+						DxWA651hLbYQCWOBPd4iZc2ccZE0P51Y0THN6DXqX45QyQWm3jqrlSbgkmVRoOeD
+						jj++u/9h5VDw6A0xnSlKdIxNR/zQ3+57KyTbctw0WRyhopVE6SLhthMVj8uz7y59
+						DK6n55hivO1qFExt6GbDOy+OpuElPY8hHkTgMXwVDXTGlc3/aTVRI/t4ckHRvMZE
+						SS5ZRxtb97uIxWPMjgimihx0qvqmmzOD1MjGAvGXoQKh5EAA
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDIDCCAgigAwIBAgIJALQh8bzNfyAWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEWV4YW0ubXZtLmVkLmFjLnVrMB4XDTExMDQwODE0MTUxM1oXDTIxMDQwNTE0
+						MTUxM1owHDEaMBgGA1UEAxMRZXhhbS5tdm0uZWQuYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCeaSQzsMoZUnTOhwMymQk9Vm+FPF7jOZ10NIv/
+						P0ac9f5qjTGhlmzsnswGObNPGwE/5cXtySLww3+3C4E7RzYgfeNfdu4Gf24ZNj0A
+						lP3Pws/N+efi84aqe8Xw63HdpEE4btvVRPa85pRKV8D6yVGI+9DWs3I0UGwEoLpP
+						VfaL5eIJZXnwO1/+EI18wufQn3vtvtAF1oEwPzhsCRfmnt4hqqldHEs0XBe+5IMo
+						DMYp/+ZG7bYAAdWJ4aK1FNPdjAe4MnlyItELveVHNeVwUMcRPUXzN1pLQKFWI/X6
+						E3EJTwmRZl1IQIQBx9xpE8YX8BZZTBQuIiVmiseMdbK0p5i9AgMBAAGjZTBjMEIG
+						A1UdEQQ7MDmCEWV4YW0ubXZtLmVkLmFjLnVrhiRodHRwczovL2V4YW0ubXZtLmVk
+						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFNUzFri1AubM0m6NAuN1gi3zcwHG
+						MA0GCSqGSIb3DQEBBQUAA4IBAQAEZXS+2a8+9rgQvK45/M56c4UkF115bfuoMHvz
+						ZvoJdWP7QUNGNQVjfQ/aonEpDpT66estmT1+Ay9M11+d0FHCWSrnVPOo7ynddrx8
+						DxWA651hLbYQCWOBPd4iZc2ccZE0P51Y0THN6DXqX45QyQWm3jqrlSbgkmVRoOeD
+						jj++u/9h5VDw6A0xnSlKdIxNR/zQ3+57KyTbctw0WRyhopVE6SLhthMVj8uz7y59
+						DK6n55hivO1qFExt6GbDOy+OpuElPY8hHkTgMXwVDXTGlc3/aTVRI/t4ckHRvMZE
+						SS5ZRxtb97uIxWPMjgimihx0qvqmmzOD1MjGAvGXoQKh5EAA
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exam.mvm.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://exam.mvm.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://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://exam.mvm.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: Medical student online assessment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lts.mvm.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MVM Learning Technology Section</md:GivenName>
+    <md:EmailAddress>mailto:mvmlts-elearning-support@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/ezproxy-dev.bodleian.ox.ac.uk-sp.xml b/swamid-interfederations-2.0/ezproxy-dev.bodleian.ox.ac.uk-sp.xml
new file mode 100644
index 00000000..0748dde8
--- /dev/null
+++ b/swamid-interfederations-2.0/ezproxy-dev.bodleian.ox.ac.uk-sp.xml
@@ -0,0 +1,64 @@
+<?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://ezproxy-dev.bodleian.ox.ac.uk/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-19T11:27: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 ">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ezproxy-dev.bodleian.ox.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>
+						MIIEwjCCA6qgAwIBAgIBBTANBgkqhkiG9w0BAQUFADCBoTEmMCQGA1UEAxMdZXpw
+						cm94eS1kZXYuYm9kbGVpYW4ub3guYWMudWsxCzAJBgNVBAYTAkdCMR0wGwYDVQQK
+						ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEbMBkGA1UECxMSQm9kbGVpYW4gTGlicmFy
+						aWVzMS4wLAYJKoZIhvcNAQkBFh9zaW1vbi5tY2xlaXNoQGJvZGxlaWFuLm94LmFj
+						LnVrMB4XDTE0MDMxMjA5NDYyMloXDTI0MDMxMTA5NDYyMlowgaExJjAkBgNVBAMT
+						HWV6cHJveHktZGV2LmJvZGxlaWFuLm94LmFjLnVrMQswCQYDVQQGEwJHQjEdMBsG
+						A1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxGzAZBgNVBAsTEkJvZGxlaWFuIExp
+						YnJhcmllczEuMCwGCSqGSIb3DQEJARYfc2ltb24ubWNsZWlzaEBib2RsZWlhbi5v
+						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGSmVu41X8W
+						Gv+lhkrjZEjSRDjISyDpxkvs+L9KScpbWjyUe83d+E7pxl/KXqCJPTUPM/iqy5G3
+						MO9EdHJoVtRSadXgw+fqbPhSmefBFeLWQY+1xp+DZSBfncUOXJJIUWDFjCIGYKRu
+						n6YzzB0NnTx4GrGYXRdCUhrhCLn48eIrl1BuRFU2UR8JdEgD2cR+F21x5ZTlWeJB
+						zdMPTq6+YRC8lnuVmqKZ8uMuwlAAd2srkwWcoh8b3+r2tQx6/4RfT435ooV9Cd0w
+						DdoGflxHT1KCe74voJ56Z87TK8IhTLCB4k4WZmk4ltZhbLCvCav1SaDasgxuXlBM
+						fmiKJEwqzWUCAwEAAaOCAQEwgf4wHQYDVR0OBBYEFFZbT+1hVIbJuJz/2vy/1fpn
+						Rf8pMIHOBgNVHSMEgcYwgcOAFFZbT+1hVIbJuJz/2vy/1fpnRf8poYGnpIGkMIGh
+						MSYwJAYDVQQDEx1lenByb3h5LWRldi5ib2RsZWlhbi5veC5hYy51azELMAkGA1UE
+						BhMCR0IxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRswGQYDVQQLExJC
+						b2RsZWlhbiBMaWJyYXJpZXMxLjAsBgkqhkiG9w0BCQEWH3NpbW9uLm1jbGVpc2hA
+						Ym9kbGVpYW4ub3guYWMudWuCAQUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
+						AAOCAQEAUtn7eo+/UFIkxAP++WQut9InVxR+s2kGghtOYDPNMqVJfk+ODXnU2oKJ
+						Vkh4/eSVTCi7UkTTZ7kTWpA6g0aseG14mY47w6Subl+8Cg5V0k6p7ZYI2NSRq+GU
+						GSKjrfIB3Vca6QATPnDjOaWjT2JvAXyt0lZr5a339hvorzqRqOGTfUbbRiRkZ4rB
+						sfaHlME0KgtNGJKWyOT3oY9xvNNQUs7TXj1407LPpxe+ip+WMjrx61KeYg4rqqMP
+						gxddMQbBW4a1taVv4xKTIMdlAaKhqKDYlUUN0Wx+UaKdc3RRUdxVpQS1Ilq1SQf1
+						e++9G2F76AB+7FNf2Xs4G3K3mhIm+A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ezproxy-dev.bodleian.ox.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://ezproxy-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Test EZProxy server at the Bodleian Libraries</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bodleian.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>McLeish</md:SurName>
+    <md:EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>McLeish</md:SurName>
+    <md:EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml b/swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml
new file mode 100644
index 00000000..c7e71485
--- /dev/null
+++ b/swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml
@@ -0,0 +1,64 @@
+<?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://ezproxy.bodleian.ox.ac.uk/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-01T13:52: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">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ezproxy-prd.bodleian.ox.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>
+						MIIEwjCCA6qgAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBoTEmMCQGA1UEAxMdZXpw
+						cm94eS1wcmQuYm9kbGVpYW4ub3guYWMudWsxCzAJBgNVBAYTAkdCMR0wGwYDVQQK
+						ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEbMBkGA1UECxMSQm9kbGVpYW4gTGlicmFy
+						aWVzMS4wLAYJKoZIhvcNAQkBFh9zaW1vbi5tY2xlaXNoQGJvZGxlaWFuLm94LmFj
+						LnVrMB4XDTE0MDYyMzE0NDkyMFoXDTI0MDYyMjE0NDkyMFowgaExJjAkBgNVBAMT
+						HWV6cHJveHktcHJkLmJvZGxlaWFuLm94LmFjLnVrMQswCQYDVQQGEwJHQjEdMBsG
+						A1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxGzAZBgNVBAsTEkJvZGxlaWFuIExp
+						YnJhcmllczEuMCwGCSqGSIb3DQEJARYfc2ltb24ubWNsZWlzaEBib2RsZWlhbi5v
+						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMy7FpGCv0m1
+						vFDU51um8KLgUHdvb86ItBRdFWZAG0L0DN771m4KKP0zvhvsTOM9r7Ed3gj+eOp0
+						BpE/MmZ52ZB6qBYaC2Ele7WXIQuRR0Uzp4uENyHMrduTc/MjNQPsw9Ncfp8u6M11
+						aQ1lTkVVudandM0EEUY01PiyBfIg0bMECn/alNpSONbOH95RCogN3ekJfWHQiDlK
+						pYqTVi+ru87WQHeDsJeP7RHxZRJCS1Sb0qA+61RpheQ4XEDWU9Z0uqxOqO7qduDT
+						yU3y5fNcTPaGPj8dW26/Jo9T7lugq88564Y26Qa3ZtNW/GZlhZ5icWxPZNzIpp6C
+						HosCP69zjJkCAwEAAaOCAQEwgf4wHQYDVR0OBBYEFLB6ps4ijHla7Ge8uzD+d9JG
+						hymdMIHOBgNVHSMEgcYwgcOAFLB6ps4ijHla7Ge8uzD+d9JGhymdoYGnpIGkMIGh
+						MSYwJAYDVQQDEx1lenByb3h5LXByZC5ib2RsZWlhbi5veC5hYy51azELMAkGA1UE
+						BhMCR0IxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRswGQYDVQQLExJC
+						b2RsZWlhbiBMaWJyYXJpZXMxLjAsBgkqhkiG9w0BCQEWH3NpbW9uLm1jbGVpc2hA
+						Ym9kbGVpYW4ub3guYWMudWuCAQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
+						AAOCAQEAZOF4suQjW4BS/mEX5wBI1onO3jm//y6AqG+afYPYzbKdTI/v6vgSEmgt
+						Z2n7Oon+IGaSThSQ6/AVXE3WtqF7ForHBXeiFbLMPVDnMb9toJ0fj18QGwXDUTEM
+						V2jxmheFqbFz7lzBocD3gdSe2RiPyK6r7eVbKKhWTxSi6/26kuzkxj1ZRYLDzQ2z
+						+6g14ZhRzndwXfP02gR0vJI+W4qbhFAwXLUpHYDHseOHmi0YMZqGYSI2MPW6p0mQ
+						s+JAy11ZO8tyNj2GE4xM5kuvlct2QeU7ylJS/g/ZRsIShr+vQYUhb0/vWdHKCrRj
+						UAF75n0odH/cwINMGEcK6L4NNU1orA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ezproxy-prd.bodleian.ox.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://ezproxy-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford EZproxy service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://bodleian.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>McLeish</md:SurName>
+    <md:EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>McLeish</md:SurName>
+    <md:EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ezproxy.rgu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ezproxy.rgu.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..d0a67482
--- /dev/null
+++ b/swamid-interfederations-2.0/ezproxy.rgu.ac.uk-shibboleth.xml
@@ -0,0 +1,65 @@
+<?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://ezproxy.rgu.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-01T10:29: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:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ezproxy.rgu.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>
+						MIIEpDCCA4ygAwIBAgIJAJgUTeTAeKehMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYD
+						VQQGEwJHQjEWMBQGA1UECBMNQWJlcmRlZW5zaGlyZTERMA8GA1UEBxMIQWJlcmRl
+						ZW4xITAfBgNVBAoTGFJvYmVydCBHb3Jkb24gVW5pdmVyc2l0eTEZMBcGA1UECxMQ
+						TGlicmFyeSBTZXJ2aWNlczEaMBgGA1UEAxMRZXpwcm94eS5yZ3UuYWMudWswHhcN
+						MTQwNTA2MTQ1NTA1WhcNMjQwNTAzMTQ1NTA1WjCBkjELMAkGA1UEBhMCR0IxFjAU
+						BgNVBAgTDUFiZXJkZWVuc2hpcmUxETAPBgNVBAcTCEFiZXJkZWVuMSEwHwYDVQQK
+						ExhSb2JlcnQgR29yZG9uIFVuaXZlcnNpdHkxGTAXBgNVBAsTEExpYnJhcnkgU2Vy
+						dmljZXMxGjAYBgNVBAMTEWV6cHJveHkucmd1LmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEA2Tzm0+NmopoXeqyx5SHaQ9UMNC5vb4EXAQ9JSSY/
+						DuLy/LjQDjJBSFB3oDpOIb5Sm9OG9GOPB5Z5U37tQvV5iZQuNq7YXr3b1CPN/thw
+						jESnCHBHvdUXCPGRldDA/g0lrAyiniLwkYGyyzDWUZFwhNOy+WYPlYSr+gQy6Wjz
+						cEySDW5Pad8KvMKraaXugNLpwM/+ZjoBuDY9XESZzga4OQ2SdAZAeeAU4nt/k9Gx
+						Tmwb73+Z3lSMQHRgyOmMadk+zCftSAOFWyvLQrawv87qaeCwG4vBhpCTQ/NxS9C3
+						mryv/uf3HMYqhjFF8OogmG8rcCwlu3AFbEF9OPF4gS17twIDAQABo4H6MIH3MB0G
+						A1UdDgQWBBREOo8/1pVkYbj7YXLrtyZGOv2gRDCBxwYDVR0jBIG/MIG8gBREOo8/
+						1pVkYbj7YXLrtyZGOv2gRKGBmKSBlTCBkjELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
+						DUFiZXJkZWVuc2hpcmUxETAPBgNVBAcTCEFiZXJkZWVuMSEwHwYDVQQKExhSb2Jl
+						cnQgR29yZG9uIFVuaXZlcnNpdHkxGTAXBgNVBAsTEExpYnJhcnkgU2VydmljZXMx
+						GjAYBgNVBAMTEWV6cHJveHkucmd1LmFjLnVrggkAmBRN5MB4p6EwDAYDVR0TBAUw
+						AwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAXgyDbrL+z46zzEuYEPIQSq6zVjQb8SDM
+						g7UrEgIEJbM+3H7HXde8A7ZAxlKy76/qDDPm7/ICd763e8wWA8NSlZRwQ+ZTD8ea
+						d/b0Mt0DWAPz7TilJLLV2fgqlzn+jKJaOrl766XomUI1j/MnTdRGQKoDEg3Q+iox
+						TZ1cyu6zsXR4vtq0M7r/9SIqblFYq12Ma9mnR4DgECY+UUP6DeBYjv16SQ2R4NMN
+						EK298jRhTkhZLszADzTcL/ARxSV//GCmgUnKd4RCybWtA7uRP71/3qflHFpkVjoU
+						gA28CO1KdN7ReDk2vPP0F+SahxgArJHT62ZbKptfiRR7I+m3nsR/+A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ezproxy.rgu.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ezproxy.rgu.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ezproxy.rgu.ac.uk/Shibboleth.sso/SAML2/POST" index="3" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ezproxy.rgu.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Robert Gordon University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Robert Gordon University: EZproxy Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rgu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Cunningham</md:SurName>
+    <md:EmailAddress>mailto:m.cunningham@rgu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Edward</md:GivenName>
+    <md:SurName>Alaszewski</md:SurName>
+    <md:EmailAddress>mailto:e.alaszewski@rgu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ezproxy.wlv.ac.uk-sp.xml b/swamid-interfederations-2.0/ezproxy.wlv.ac.uk-sp.xml
new file mode 100644
index 00000000..5853645f
--- /dev/null
+++ b/swamid-interfederations-2.0/ezproxy.wlv.ac.uk-sp.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ezproxy.wlv.ac.uk/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-16T07:56:29Z"/>
+  </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>
+						MIIE4TCCA8mgAwIBAgIBBTANBgkqhkiG9w0BAQUFADCBqzEgMB4GA1UEAxMXbG9n
+						aW4uZXpwcm94eS53bHYuYWMudWsxCzAJBgNVBAYTAkdCMRYwFAYDVQQIEw1XZXN0
+						IE1pZGxhbmRzMRYwFAYDVQQHEw1Xb2x2ZXJoYW1wdG9uMSQwIgYDVQQKExtVbml2
+						ZXJzaXR5IG9mIFdvbHZlcmhhbXB0b24xJDAiBgkqhkiG9w0BCQEWFWQuaGVuZGVy
+						c29uQHdsdi5hYy51azAeFw0xMjA3MTMwODU4MTBaFw0yMjA3MTMwODU4MTBaMIGr
+						MSAwHgYDVQQDExdsb2dpbi5lenByb3h5Lndsdi5hYy51azELMAkGA1UEBhMCR0Ix
+						FjAUBgNVBAgTDVdlc3QgTWlkbGFuZHMxFjAUBgNVBAcTDVdvbHZlcmhhbXB0b24x
+						JDAiBgNVBAoTG1VuaXZlcnNpdHkgb2YgV29sdmVyaGFtcHRvbjEkMCIGCSqGSIb3
+						DQEJARYVZC5oZW5kZXJzb25Ad2x2LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAznoylhFt3MASgSBsG7czD9Wsvxz/02asNA4T5CajtAefmrsm
+						ZTMHSxf9pmbCziWmWqq/9zQ2iEO0hH7MJg81pP1qtPCdDCNRrKVfVgmbgsxvWd0b
+						oiBXYHad0wBqBbv2lz8JcJKo4hTIrDA3OL/xt5C3b0qhNdpItiyzYndt9VtIgUAj
+						nGHGotc/0KgcCz3K0jLuQDH23glQyd8yveAsoZ2DKBfE2N6rTDQxWfG7qGJxNTml
+						fS6leTgSAN7dl0n1jEimJXmox9uyk/IF2FzcQSVx+Mpy/horRv43NkWmt8fNVZIF
+						xLwznTWWSL4p5WY8oVvXqK8hQg7n/4iTqXe4PQIDAQABo4IBDDCCAQgwHQYDVR0O
+						BBYEFN2wrxBJwZZbhFqvvF3UbC2NO6m1MIHYBgNVHSMEgdAwgc2AFN2wrxBJwZZb
+						hFqvvF3UbC2NO6m1oYGxpIGuMIGrMSAwHgYDVQQDExdsb2dpbi5lenByb3h5Lnds
+						di5hYy51azELMAkGA1UEBhMCR0IxFjAUBgNVBAgTDVdlc3QgTWlkbGFuZHMxFjAU
+						BgNVBAcTDVdvbHZlcmhhbXB0b24xJDAiBgNVBAoTG1VuaXZlcnNpdHkgb2YgV29s
+						dmVyaGFtcHRvbjEkMCIGCSqGSIb3DQEJARYVZC5oZW5kZXJzb25Ad2x2LmFjLnVr
+						ggEFMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAClhsJ2RbVyic9sQ
+						CWJSLBHYvR1i37eXYUlaqT5AImq3KF3RZLHUJ+3qyN6lfkJulGQoAUBy7RJR+OD6
+						MmVxXDos+kr+MqRiIjUfxopOpTtLOa8cUB8pnk4OLMO2ZixQ9nn5dj8mhMnhT6Ie
+						lnxJWM/V5XtP6votpZ/wR64/evLcuyjIQx/AYegCD942K+4btlbRqmng5tr3IXKs
+						s8OxJ1Gk4nTci0wXRBkFQ6PWuMUDmchlM7D68F/sPR6LEB12As9mF3w/zPhP6kfS
+						3WgYxlcio+mumRLvxAYu2WW2g9FagvIgLiKT+OEw32ejFiraBUJ5ln1f8AF0x+wK
+						KKbOZKk=
+					</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.wlv.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.wlv.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.ezproxy.wlv.ac.uk/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.ezproxy.wlv.ac.uk/Shibboleth.sso/SAML/Artifact" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wolverhampton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wolverhampton EZproxy</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/falcon-scratch.csx.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/falcon-scratch.csx.cam.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..ea5fcd02
--- /dev/null
+++ b/swamid-interfederations-2.0/falcon-scratch.csx.cam.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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://falcon-scratch.csx.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://falcon-scratch.csx.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>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
+						RsenNm/aXp0wIU+jHVmi/GAPCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
+						RsenNm/aXp0wIU+jHVmi/GAPCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://falcon-scratch.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://falcon-scratch.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://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://falcon-scratch.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://falcon-scratch.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://falcon-scratch.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 Service demonstration site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cam.ac.uk/cs/falcon/</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/falcon-test.csi.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/falcon-test.csi.cam.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..acfde146
--- /dev/null
+++ b/swamid-interfederations-2.0/falcon-test.csi.cam.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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://falcon-test.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>
+      <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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
+						RsenNm/aXp0wIU+jHVmi/GAPCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
+						RsenNm/aXp0wIU+jHVmi/GAPCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://falcon-test.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://falcon-test.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://falcon-test.csi.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://falcon-test.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://falcon-test.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://falcon-test.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">University of Cambridge: Falcon CMS Test Site</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/falmouthtechbookings.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/falmouthtechbookings.sisoshibboleth.co.uk-entity.xml
new file mode 100644
index 00000000..8da7c6c6
--- /dev/null
+++ b/swamid-interfederations-2.0/falmouthtechbookings.sisoshibboleth.co.uk-entity.xml
@@ -0,0 +1,84 @@
+<?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://falmouthtechbookings.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-10-07T08:51: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://falmouthtechbookings.siso.co/sso/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://falmouthtechbookings.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 Falmouth University Online Resource Booking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SiSo Falmouth University Online Resource Booking</mdui:Description>
+        <mdui:Logo height="60" width="60">https://falmouthtechbookings.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>
+						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
+						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
+						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
+						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
+						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
+						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
+						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
+						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
+						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
+						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
+						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
+						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
+						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://falmouthtechbookings.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://falmouthtechbookings.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://falmouthtechbookings.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://falmouthtechbookings.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://falmouthtechbookings.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://falmouthtechbookings.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://falmouthtechbookings.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 Falmouth University 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/fam.carmel.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/fam.carmel.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..41bd0fba
--- /dev/null
+++ b/swamid-interfederations-2.0/fam.carmel.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fam.carmel.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-01T14:46:18Z">
+      <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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">carmel.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDPDCCAiSgAwIBAgIVAIqLMP1+YZiVFuSl3+ML0bJOAduCMA0GCSqGSIb3DQEB
+						BQUAMB8xHTAbBgNVBAMTFHNoaWJpZHAuY2FybWVsLmFjLnVrMB4XDTE0MDQzMDE1
+						MTE1NloXDTM0MDQzMDE1MTE1NlowHzEdMBsGA1UEAxMUc2hpYmlkcC5jYXJtZWwu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCOeIdZOIToq8RS
+						2E76IiVkssLXCGshL1IRzhwql+hB1tcDbyyQ86cKz8EbJcuoob+PO/z8G/oK3bmj
+						CxqzK0tzlV9QxOykUVYJJMGiIl/hyvjURIrq6FN8TW22zmMOJcKbq3jSvNOy4z8p
+						W2efstF5aI7hKh5hQ6t/HwIQrc5jvqbVSQIucfoC5LECE3MC00o0rOeCU9SphxRd
+						6YgzqamXaxtwj0ON5RUL+CMF0s5rmFmNluaEypSwb7jtvIlS60EP5owBiimkWYp4
+						U0hBey4VxGItqNQ/qQAQsLHzfS4IOyI1JpspcmfU8krltECZEV1DiSblrN2+Uwjy
+						1njykW/nAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJpZHAuY2FybWVsLmFjLnVr
+						hitodHRwczovL3NoaWJpZHAuY2FybWVsLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBQcbtOJdw/shpXLO82zmaTiYMOw0jANBgkqhkiG9w0BAQUFAAOCAQEA
+						HO9dtyYWJuaFG/1EzSYcICuWD+1FvPvkWpc74PxXeii9GXlJm8T3YGlylsh9Hm+Q
+						CtCgNo5nEX6cEFdBF0W4MLiAC60dUG9tFhxYfq0Eki2wGdYW6il4p6rqMriVVLHa
+						YYVAPLqBmY+AFtmnkrv3AYLb7QxhGCuoTp6NGD1bghV33LL1JbmNzTSNhb+29AMf
+						5vt3p/Xvx26NA4w+9mi1ALSUYiX5mYJ6BI7ZSmcRms46coPLhpSpKCATfXeMwgOO
+						H6FIFa78iAxfsERmipMjp31yExWQ2jMfbQFMrMwocThoymgkjwX39KpLUGE6VkTN
+						W23+BuUVpxDOnTQb4XrNbg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.carmel.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.carmel.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>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.carmel.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.carmel.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.carmel.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.carmel.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">carmel.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDPDCCAiSgAwIBAgIVAIqLMP1+YZiVFuSl3+ML0bJOAduCMA0GCSqGSIb3DQEB
+						BQUAMB8xHTAbBgNVBAMTFHNoaWJpZHAuY2FybWVsLmFjLnVrMB4XDTE0MDQzMDE1
+						MTE1NloXDTM0MDQzMDE1MTE1NlowHzEdMBsGA1UEAxMUc2hpYmlkcC5jYXJtZWwu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCOeIdZOIToq8RS
+						2E76IiVkssLXCGshL1IRzhwql+hB1tcDbyyQ86cKz8EbJcuoob+PO/z8G/oK3bmj
+						CxqzK0tzlV9QxOykUVYJJMGiIl/hyvjURIrq6FN8TW22zmMOJcKbq3jSvNOy4z8p
+						W2efstF5aI7hKh5hQ6t/HwIQrc5jvqbVSQIucfoC5LECE3MC00o0rOeCU9SphxRd
+						6YgzqamXaxtwj0ON5RUL+CMF0s5rmFmNluaEypSwb7jtvIlS60EP5owBiimkWYp4
+						U0hBey4VxGItqNQ/qQAQsLHzfS4IOyI1JpspcmfU8krltECZEV1DiSblrN2+Uwjy
+						1njykW/nAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJpZHAuY2FybWVsLmFjLnVr
+						hitodHRwczovL3NoaWJpZHAuY2FybWVsLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBQcbtOJdw/shpXLO82zmaTiYMOw0jANBgkqhkiG9w0BAQUFAAOCAQEA
+						HO9dtyYWJuaFG/1EzSYcICuWD+1FvPvkWpc74PxXeii9GXlJm8T3YGlylsh9Hm+Q
+						CtCgNo5nEX6cEFdBF0W4MLiAC60dUG9tFhxYfq0Eki2wGdYW6il4p6rqMriVVLHa
+						YYVAPLqBmY+AFtmnkrv3AYLb7QxhGCuoTp6NGD1bghV33LL1JbmNzTSNhb+29AMf
+						5vt3p/Xvx26NA4w+9mi1ALSUYiX5mYJ6BI7ZSmcRms46coPLhpSpKCATfXeMwgOO
+						H6FIFa78iAxfsERmipMjp31yExWQ2jMfbQFMrMwocThoymgkjwX39KpLUGE6VkTN
+						W23+BuUVpxDOnTQb4XrNbg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.carmel.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.carmel.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Carmel College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Carmel College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.carmel.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Burke</md:SurName>
+    <md:EmailAddress>mailto:kev@carmel.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Burke</md:SurName>
+    <md:EmailAddress>mailto:kev@carmel.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fam.salford.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/fam.salford.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..00dfcf54
--- /dev/null
+++ b/swamid-interfederations-2.0/fam.salford.ac.uk-oala-metadata.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fam.salford.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-09T14:40:38Z">
+      <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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">salford.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSjCCAjKgAwIBAgIISWizH5lKvIkwDQYJKoZIhvcNAQEFBQAwPDEeMBwGA1UE
+						CgwVVW5pdmVyc2l0eSBvZiBTYWxmb3JkMRowGAYDVQQDDBFmYW0uc2FsZm9yZC5h
+						Yy51azAeFw0xMjA4MDYxMTM0NDZaFw0yMjA4MDYxMTM0NDZaMDwxHjAcBgNVBAoM
+						FVVuaXZlcnNpdHkgb2YgU2FsZm9yZDEaMBgGA1UEAwwRZmFtLnNhbGZvcmQuYWMu
+						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2N5bbB0d6OUykoom7
+						zjJ2RpnQ85NNbKrKR9KLxwH7Vvcc7y69PcPmfFf+8yvRGkQn4sBWoyrq+uuVETOW
+						oUn0r/kOaOSIUHb8/U4IX1gN+TWatWN5jTe6LV8lV84gNJdRV92hYW4twH+1c0SS
+						zarbdX6WiDBO8XjfTKj0+DYmoobkYx2L5LZHo5bfaZd1YnEsW1kCTW9wdz+SBgSm
+						91LUrDzQe2aStk5xlGkCTAsiECV9b2sAjQbP6Omm5JfFCdAyB5oP8oDcHBHCJA7U
+						nKN8dVe9opLmC5r7An0cRmtrmIQn2/J6L2lZCgAwbvoU3zmq2+5kpPJ26M5w1s6S
+						e0lzAgMBAAGjUDBOMB0GA1UdDgQWBBTMdjshjBe7s8oWmzyc9Mx96TbOzzAfBgNV
+						HSMEGDAWgBTMdjshjBe7s8oWmzyc9Mx96TbOzzAMBgNVHRMEBTADAQH/MA0GCSqG
+						SIb3DQEBBQUAA4IBAQBqPiuHHi9oZMbWecwj0h0j8aYd80h7B2CVm7raPdGHqZtM
+						4geXmYIxadUe26WCtZLPyMxW4sgeU2J/0Lp2z2l0CS4lifBwP5MHE88KbAYKzpPm
+						ZOW2DolpYIUfo4CcgZnH0XEWE03mBXWj5JU4TYTQjZMc+tpyOB3CZeUj5oGrdPML
+						qzpdvLCnVr0yZER30UvOFHPmpLBdso0phzBNMp2YG0cy10ycNJ5NmCXUanO515VQ
+						Q9m+Wj7WR34H/sROTQPcpsuayyU6N6AE9TGg75VwrbqHq7/Z5RYTTIlKCzzrsHNm
+						/gELPAAk66PahcDoQFc4NTQz/gCIt8l4YbWxC2AS
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSjCCAjKgAwIBAgIISWizH5lKvIkwDQYJKoZIhvcNAQEFBQAwPDEeMBwGA1UE
+						CgwVVW5pdmVyc2l0eSBvZiBTYWxmb3JkMRowGAYDVQQDDBFmYW0uc2FsZm9yZC5h
+						Yy51azAeFw0xMjA4MDYxMTM0NDZaFw0yMjA4MDYxMTM0NDZaMDwxHjAcBgNVBAoM
+						FVVuaXZlcnNpdHkgb2YgU2FsZm9yZDEaMBgGA1UEAwwRZmFtLnNhbGZvcmQuYWMu
+						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2N5bbB0d6OUykoom7
+						zjJ2RpnQ85NNbKrKR9KLxwH7Vvcc7y69PcPmfFf+8yvRGkQn4sBWoyrq+uuVETOW
+						oUn0r/kOaOSIUHb8/U4IX1gN+TWatWN5jTe6LV8lV84gNJdRV92hYW4twH+1c0SS
+						zarbdX6WiDBO8XjfTKj0+DYmoobkYx2L5LZHo5bfaZd1YnEsW1kCTW9wdz+SBgSm
+						91LUrDzQe2aStk5xlGkCTAsiECV9b2sAjQbP6Omm5JfFCdAyB5oP8oDcHBHCJA7U
+						nKN8dVe9opLmC5r7An0cRmtrmIQn2/J6L2lZCgAwbvoU3zmq2+5kpPJ26M5w1s6S
+						e0lzAgMBAAGjUDBOMB0GA1UdDgQWBBTMdjshjBe7s8oWmzyc9Mx96TbOzzAfBgNV
+						HSMEGDAWgBTMdjshjBe7s8oWmzyc9Mx96TbOzzAMBgNVHRMEBTADAQH/MA0GCSqG
+						SIb3DQEBBQUAA4IBAQBqPiuHHi9oZMbWecwj0h0j8aYd80h7B2CVm7raPdGHqZtM
+						4geXmYIxadUe26WCtZLPyMxW4sgeU2J/0Lp2z2l0CS4lifBwP5MHE88KbAYKzpPm
+						ZOW2DolpYIUfo4CcgZnH0XEWE03mBXWj5JU4TYTQjZMc+tpyOB3CZeUj5oGrdPML
+						qzpdvLCnVr0yZER30UvOFHPmpLBdso0phzBNMp2YG0cy10ycNJ5NmCXUanO515VQ
+						Q9m+Wj7WR34H/sROTQPcpsuayyU6N6AE9TGg75VwrbqHq7/Z5RYTTIlKCzzrsHNm
+						/gELPAAk66PahcDoQFc4NTQz/gCIt8l4YbWxC2AS
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fam.salford.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fam.salford.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Salford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Salford (Network Username)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.salford.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Allen</md:SurName>
+    <md:EmailAddress>mailto:J.Allen1@salford.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Library Systems Team</md:GivenName>
+    <md:EmailAddress>mailto:library-systems@salford.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/febe.ufpe.br-idp-shibboleth.xml b/swamid-interfederations-2.0/febe.ufpe.br-idp-shibboleth.xml
new file mode 100644
index 00000000..1670b284
--- /dev/null
+++ b/swamid-interfederations-2.0/febe.ufpe.br-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://febe.ufpe.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">ufpe.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFPE - Universidade Federal de Pernambuco</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFPE - Universidade Federal de Pernambuco</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufpe.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufpe.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxETAPBgNVBAoTCFVGUEUvTlRJ
+MREwDwYDVQQLEwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNA
+dWZwZS5icjEPMA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQsw
+CQYDVQQGEwJCUjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMB4XDTE0MDIxMDE3NTcx
+NloXDTE5MDIwOTE3NTcxNlowgZQxETAPBgNVBAoTCFVGUEUvTlRJMREwDwYDVQQL
+EwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNAdWZwZS5icjEP
+MA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQGEwJC
+UjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA8hMgKxpUf115lxMz4k3SC+wUvqRVy9SuTcFYyi5SUixTxYFsp/DC
+RTCC8OOpgyBJWBovYLRGBXJ9JN/KLopSTZeZHHq8WBDccqW1VH3pK08mIrRN2B8S
+KqOTHAKq1Y/LgplsM5iVpP/72EG9x41jlD2VRFdWmLpmGkHynvggRtkXDE7ORpEY
+KG7FjoLuGWq412vXKN/Amug9QHVWhzB+ks5NoS0n9QiV3RHJJkRYo4E5d1J03PKg
+rWwe5iTx1x7kzYOfcBkTMsYbBXbaBvMr3LfihwbNns2jxuzYLZCRc1f1MnEgB7M3
+3/9AVD2V0xXfP6dbfPgHj9mpjtL9X9mYqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQByr1Cf89bQB/Tb6DGk8fJfZkgC0FBxc7nTuAvZo2hKArY2eX8s6ohlxgocAwqT
+pcc/5MQvWvEgg7nbEfQvCiQ0dcuTGpuqk9FiWlp/sjQ2KFRjH4na9VmxHVnMORSa
+efvuPMN9KMRPQjz7tDsqHNI/ooFFdZNH4odkOi+zsnvIdzz8alZuiQO3pUSeV48Z
+KzaND6lPrBa/+TPf2i9gLtJ0k2WJyrcqLSKbRBTjLzmeKfkDXdj147LM9242/lO8
+mFuuCvO6D4sRNVCkpuJiKX/QfVJKVhSkWcj1dYSlbmTFP5PIo/E+syTLaqoeBv/V
+bNzNXeVqF1LYziLN8/BFb+Rs
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://febe.ufpe.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://febe.ufpe.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://febe.ufpe.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://febe.ufpe.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://febe.ufpe.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://febe.ufpe.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">ufpe.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxETAPBgNVBAoTCFVGUEUvTlRJ
+MREwDwYDVQQLEwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNA
+dWZwZS5icjEPMA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQsw
+CQYDVQQGEwJCUjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMB4XDTE0MDIxMDE3NTcx
+NloXDTE5MDIwOTE3NTcxNlowgZQxETAPBgNVBAoTCFVGUEUvTlRJMREwDwYDVQQL
+EwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNAdWZwZS5icjEP
+MA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQGEwJC
+UjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA8hMgKxpUf115lxMz4k3SC+wUvqRVy9SuTcFYyi5SUixTxYFsp/DC
+RTCC8OOpgyBJWBovYLRGBXJ9JN/KLopSTZeZHHq8WBDccqW1VH3pK08mIrRN2B8S
+KqOTHAKq1Y/LgplsM5iVpP/72EG9x41jlD2VRFdWmLpmGkHynvggRtkXDE7ORpEY
+KG7FjoLuGWq412vXKN/Amug9QHVWhzB+ks5NoS0n9QiV3RHJJkRYo4E5d1J03PKg
+rWwe5iTx1x7kzYOfcBkTMsYbBXbaBvMr3LfihwbNns2jxuzYLZCRc1f1MnEgB7M3
+3/9AVD2V0xXfP6dbfPgHj9mpjtL9X9mYqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQByr1Cf89bQB/Tb6DGk8fJfZkgC0FBxc7nTuAvZo2hKArY2eX8s6ohlxgocAwqT
+pcc/5MQvWvEgg7nbEfQvCiQ0dcuTGpuqk9FiWlp/sjQ2KFRjH4na9VmxHVnMORSa
+efvuPMN9KMRPQjz7tDsqHNI/ooFFdZNH4odkOi+zsnvIdzz8alZuiQO3pUSeV48Z
+KzaND6lPrBa/+TPf2i9gLtJ0k2WJyrcqLSKbRBTjLzmeKfkDXdj147LM9242/lO8
+mFuuCvO6D4sRNVCkpuJiKX/QfVJKVhSkWcj1dYSlbmTFP5PIo/E+syTLaqoeBv/V
+bNzNXeVqF1LYziLN8/BFb+Rs
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://febe.ufpe.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://febe.ufpe.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">UFPE - Universidade Federal de Pernambuco</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFPE - Universidade Federal de Pernambuco</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufpe.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufpe.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Anderson Queiroz</md:SurName>
+    <md:EmailAddress>aalqufpe@gmail.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.xml b/swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.xml
new file mode 100644
index 00000000..cf252a60
--- /dev/null
+++ b/swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fed.id.univ-bordeaux.fr/idp_ubx/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-24T11:30: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-bordeaux.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">CUEA - Communauté d'universités et d'établissements 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>
+					      MIIDlDCCAnygAwIBAgIJAMmv2toaoAEMMA0GCSqGSIb3DQEBBQUAMDoxCzAJBgNV
+BAYTAkZSMQwwCgYDVQQKEwNVQngxHTAbBgNVBAMTFGlkcC51bml2LWJvcmRlYXV4
+LmZyMB4XDTExMDUxOTEwMTMzMVoXDTMxMDUxNDEwMTMzMVowOjELMAkGA1UEBhMC
+RlIxDDAKBgNVBAoTA1VCeDEdMBsGA1UEAxMUaWRwLnVuaXYtYm9yZGVhdXguZnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/fbuGXQzSGD9NIpWeKHgx
+uUOIFJnnuGTkASR2nUsiLVC5T85Pc23LHd2q+QVuEzrApgZHPaQ/dvwkoyD26K+z
+JPfsVSFNObGxTHIh3erH8ELPVSUWWBTBdxhOqqjsY2Oi6wOiiPRAHJIJ8GtR+WiY
+flaN2pyuP6E6y9klVO1a5A592ClTEJW+TjpcqE3REmcwqjEBcx2rGOlgipwBGRbt
+g2VjDWfP745U9Nu7s77bWbcP1fFlSYX6fY5jlBsS9KiTkjNEyLQv6H7f6gkA4JAf
+vtlg/+wgT5yjoeLnO1PXU94Fg9MiwXw9bmBccrdZEYbRE4Yj7erzk8yAqZkdeRx5
+AgMBAAGjgZwwgZkwHQYDVR0OBBYEFEDi7aDbyQrP92cicg3Ybs52s69CMGoGA1Ud
+IwRjMGGAFEDi7aDbyQrP92cicg3Ybs52s69CoT6kPDA6MQswCQYDVQQGEwJGUjEM
+MAoGA1UEChMDVUJ4MR0wGwYDVQQDExRpZHAudW5pdi1ib3JkZWF1eC5mcoIJAMmv
+2toaoAEMMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAK4ev4MBRPS6
+jZgF6rlty35EfLflTFhQNFtTypW7O/yljgpIs1UNahDNmlJBSBZpw1DeZvuLJwsw
+sK8mb9ldbs3+euCK/6N/zXj48S7/2KIt32jUTsjMcByOvhxqrsax4APYKCqh0ErB
+f5aCPGBKrlMf99jeG4Iegf8YkkU2i+ZCq04GkBDZPawtEWNJL1LTykMvY09Wf1pU
+oiMV0/Zcv53VXdVLsHwCYFg3lf1uIlGcwaJPxb4NCAGAktixPig8B2sqE7ryk8ss
+QiRmgUZzF4TgaBu7lYjlYOmUMvrC+KaOPvT+UlYrWidEok60vOY+kIJ683KK7QhE
+V+xNY9y95Z8=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed.id.univ-bordeaux.fr/idp_ubx/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed.id.univ-bordeaux.fr/idp_ubx/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fed.id.univ-bordeaux.fr/idp_ubx/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CUEA - Communauté d'universités et d'établissements d'Aquitaine</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CUEA - Communauté d'universités et d'établissements d'Aquitaine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cue-aquitaine.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>ssr@univ-bordeaux.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fedauth.london.edu-oala-metadata.xml b/swamid-interfederations-2.0/fedauth.london.edu-oala-metadata.xml
new file mode 100644
index 00000000..eec4b4d0
--- /dev/null
+++ b/swamid-interfederations-2.0/fedauth.london.edu-oala-metadata.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fedauth.london.edu/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-27T13:03:24Z"/>
+  </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">london.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDTjCCAjagAwIBAgIIFcy1w+ieQigwDQYJKoZIhvcNAQEFBQAwPjEfMB0GA1UE
+						CgwWTG9uZG9uIEJ1c2luZXNzIFNjaG9vbDEbMBkGA1UEAwwSZmVkYXV0aC5sb25k
+						b24uZWR1MB4XDTEzMDIyNjEzMDk0MFoXDTIzMDIyNjEzMDk0MFowPjEfMB0GA1UE
+						CgwWTG9uZG9uIEJ1c2luZXNzIFNjaG9vbDEbMBkGA1UEAwwSZmVkYXV0aC5sb25k
+						b24uZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmuoPnUfdF5F/
+						mWAfYMh6b3QPssEJRxpSepwoygicWu/BnpK2ZEJ/VhmcODjHYObT4et0XyQLSelg
+						hKZhkUbxpxpI7AeVZHthIKymXC06ihIHVtzA10jjskWmy97R0HB5NZ92taNa23kK
+						I9UEhy0+fYsf2zgbjB1X6sEMEWWGQ5mR3fiEKxL6ttyZ8+Sue1oPxnrX8rGr0wiT
+						a6HJFZwmYA7qkXpAHlQq7nPIqvYPoG3KIBubl+6iKJ0VHfiV1JQ8Zfmb13pHpjEr
+						noiTZlUm/88+EQj4TVaFaQUH/gbHrk3TOS+5s/11fhqd4QEWe2Rxl/xGcGpaGxr4
+						m114hKQKSQIDAQABo1AwTjAdBgNVHQ4EFgQU0Pk2SB/JtZVI4qSyB/cgh1R3A+Mw
+						HwYDVR0jBBgwFoAU0Pk2SB/JtZVI4qSyB/cgh1R3A+MwDAYDVR0TBAUwAwEB/zAN
+						BgkqhkiG9w0BAQUFAAOCAQEASVcMlTZG8x4IF2uXi2BIHuJLgyqHBKGi0OIZkIvX
+						sZWkXqoUDoodThj+U5HzXoDAJ3dNRmJ1fx4FKOi2elJtkWuQqk4qLUuugvND1no1
+						gPqqWJh2fP3/WoP16gK3J8k5Loq8BjpTHc8qsRuQi7keFgVTst2HolaeWBGoIJi1
+						B17UjY+cQDtzk+fdzACii21YhFEEEV0/jYQNmPlzW4LKLDOrjlvBZXfGUoh4cB6G
+						1+hOSOP088MsXmqmwytyAn9lF/V0DuHgYuUNEUiX0oUWSpqLyaWxfForagSk3yYA
+						WQo5UCat9zUgUtjVh8qsUJDnrzFRrQcRzyeWnvIRG0cd/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>
+						MIIDTjCCAjagAwIBAgIIFcy1w+ieQigwDQYJKoZIhvcNAQEFBQAwPjEfMB0GA1UE
+						CgwWTG9uZG9uIEJ1c2luZXNzIFNjaG9vbDEbMBkGA1UEAwwSZmVkYXV0aC5sb25k
+						b24uZWR1MB4XDTEzMDIyNjEzMDk0MFoXDTIzMDIyNjEzMDk0MFowPjEfMB0GA1UE
+						CgwWTG9uZG9uIEJ1c2luZXNzIFNjaG9vbDEbMBkGA1UEAwwSZmVkYXV0aC5sb25k
+						b24uZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmuoPnUfdF5F/
+						mWAfYMh6b3QPssEJRxpSepwoygicWu/BnpK2ZEJ/VhmcODjHYObT4et0XyQLSelg
+						hKZhkUbxpxpI7AeVZHthIKymXC06ihIHVtzA10jjskWmy97R0HB5NZ92taNa23kK
+						I9UEhy0+fYsf2zgbjB1X6sEMEWWGQ5mR3fiEKxL6ttyZ8+Sue1oPxnrX8rGr0wiT
+						a6HJFZwmYA7qkXpAHlQq7nPIqvYPoG3KIBubl+6iKJ0VHfiV1JQ8Zfmb13pHpjEr
+						noiTZlUm/88+EQj4TVaFaQUH/gbHrk3TOS+5s/11fhqd4QEWe2Rxl/xGcGpaGxr4
+						m114hKQKSQIDAQABo1AwTjAdBgNVHQ4EFgQU0Pk2SB/JtZVI4qSyB/cgh1R3A+Mw
+						HwYDVR0jBBgwFoAU0Pk2SB/JtZVI4qSyB/cgh1R3A+MwDAYDVR0TBAUwAwEB/zAN
+						BgkqhkiG9w0BAQUFAAOCAQEASVcMlTZG8x4IF2uXi2BIHuJLgyqHBKGi0OIZkIvX
+						sZWkXqoUDoodThj+U5HzXoDAJ3dNRmJ1fx4FKOi2elJtkWuQqk4qLUuugvND1no1
+						gPqqWJh2fP3/WoP16gK3J8k5Loq8BjpTHc8qsRuQi7keFgVTst2HolaeWBGoIJi1
+						B17UjY+cQDtzk+fdzACii21YhFEEEV0/jYQNmPlzW4LKLDOrjlvBZXfGUoh4cB6G
+						1+hOSOP088MsXmqmwytyAn9lF/V0DuHgYuUNEUiX0oUWSpqLyaWxfForagSk3yYA
+						WQo5UCat9zUgUtjVh8qsUJDnrzFRrQcRzyeWnvIRG0cd/w==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fedauth.london.edu/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fedauth.london.edu/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">London Business School</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London Business School</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.london.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT-Library Help</md:GivenName>
+    <md:EmailAddress>mailto:help@london.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jonathan</md:GivenName>
+    <md:SurName>Eaton</md:SurName>
+    <md:EmailAddress>mailto:jeaton@london.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fede.supelec.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/fede.supelec.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..bb6b53fe
--- /dev/null
+++ b/swamid-interfederations-2.0/fede.supelec.fr-idp-shibboleth.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fede.supelec.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-25T17: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">supelec.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CentraleSupelec</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Teachers, Researchers, Staff, Students</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CentraleSupelec</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Enseignants, Chercheurs, Personnels, 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>
+					      MIIDKDCCAhCgAwIBAgIVAJM8CQeFJc3xn6Z1VQJmlIUprCAEMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMMD2ZlZGUuc3VwZWxlYy5mcjAeFw0xNDEwMTYwOTUxNTla
+Fw0zNDEwMTYwOTUxNTlaMBoxGDAWBgNVBAMMD2ZlZGUuc3VwZWxlYy5mcjCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJUgXB50hjGYdLKHZxLSCPztkFuA
+WtNJocV4c/4dZGMjAiarkeiaWkQ6h+NrsCj5qoYeXekfkVHw+1G2+NbhB0miUnxh
+ex1Y5FJ+7Fet31zqk9whwmU6WbpwCCQRPWj/52qSciK66rZyFlqMnID33MWOR6hW
+86VtXZwWjBl2QmQuqFzHQ0aZU7ihUGW6YyodXc/GA8u72AEgzg74NiUgR9ewHsjW
+3d6rDhq6TOuOVpqfxNWZEdnw5qdIz8RhHKHh3W5fHv5xIp0meruvhv6mmXv7NltA
+S0mVt4iCe4MLcTRBtNtIkA8FvdwHnmfFdrwiZvxt7PW3JbPp27JJ5Ozl7fECAwEA
+AaNlMGMwHQYDVR0OBBYEFJaRXAI+mqD0ehgvH9spPnE6a5AxMEIGA1UdEQQ7MDmC
+D2ZlZGUuc3VwZWxlYy5mcoYmaHR0cHM6Ly9mZWRlLnN1cGVsZWMuZnIvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAGSd2uPxo+hqnAQjN1fAlVr24vO0
++PHkWq5/LD836eb8UWgCvlGB1/D5fQZzvszShofbnnBYA3sT/ZA32uQeCnn2JcXD
+Ggl9/kBDXaLe4sDFRvEmme/5aacES06cuHVQOfo1geiU9b0BWZfQ+PhIs7zMD6lW
+oG7DQC+PuWokOA53MCcMZFGkx9Jc7WYE/mDDUwktRKyKdmWkhBhPqX9WG9TiVjQ8
+4es7yiwOGihNdSw+Fo57loP3CpPYNpbirQy38W98qv2UNRabSrnRG26Pnr6Olitl
+0Mk7i7JvwcZoVBdgutFiM5YhZNH2Lm01vGPdFTeoUvatALsHf2c43PtH/PM=
+					    </ds:X509Certificate>
+        </ds: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+gAwIBAgIUI3GVT0U51zI/+zqt7XjPQwAliqIwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPZmVkZS5zdXBlbGVjLmZyMB4XDTE0MDYxOTA5MzUxOVoX
+DTM0MDYxOTA5MzUxOVowGjEYMBYGA1UEAxMPZmVkZS5zdXBlbGVjLmZyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp4mY5iMIDfdfYOaZfhJ8f1cGJWtW
+nmOqq4X/dpvqIIDS99IpWCL3bDg5v8XtTtywfIdrAStQKiTSW5OXYMvuMpZwQzdX
+lz2b0huK+9h+wK4sEr/VvedRaxR41d2EWCgKRNglSSC8d0je5ohwKBXkdqiscbTN
+/5qRqVR1QPpWRJN0HlLIvE1J0Geb5RRsBtciWMSLAlRxfWKCqFgBZVzL8WlqF624
+cioE1U6K+TUnNXDoZxWdf/Ynn/9VC634ud1KectCNb2dRJO6ywwh4z+Zdd6gVKxu
+YBXngIYRgXdWFfCkhBj1Tj3TaDLkKaKRSZejotINWXUHIrFO0RA0KjWI/QIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9mZWRlLnN1cGVsZWMuZnKGJmh0dHBzOi8vZmVkZS5z
+dXBlbGVjLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRNa4jLphWoCFgrx/Pa
+OM2r2uMx5zANBgkqhkiG9w0BAQUFAAOCAQEAGfZyDAr7cL5vT+7jigc0oYdjfPQ+
+CG8shDpjTOwWjRXThxLX32IUhYPF0mZ+EvrCQdyg01CTE2bkMpcDilnDpsmMOoRo
+p820ReMScYoFNB/nQio21BR1Galps7TdErp8XFNvgwbPW6YdFpqXYxAFNm5wWnxz
+u9dm0M2dMSEe1xgJjYRaU2H/BN5qyGuoyM4K0maM8AHOS9iBnRzuzcZQ7WUWA1JP
+VgWhf5jRP9RPKVQUQOLb036aw3uZ51fSvN/ceCPq5ibwqUEHw9gikRWchPerrYnR
+eDUxLltLVzLhUUNHbW5A2MlBwDFMqCWhZy8vqCJFdLUkTAFhRuJ/VVyYzA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fede.supelec.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fede.supelec.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fede.supelec.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">supelec.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDKDCCAhCgAwIBAgIVAJM8CQeFJc3xn6Z1VQJmlIUprCAEMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMMD2ZlZGUuc3VwZWxlYy5mcjAeFw0xNDEwMTYwOTUxNTla
+Fw0zNDEwMTYwOTUxNTlaMBoxGDAWBgNVBAMMD2ZlZGUuc3VwZWxlYy5mcjCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJUgXB50hjGYdLKHZxLSCPztkFuA
+WtNJocV4c/4dZGMjAiarkeiaWkQ6h+NrsCj5qoYeXekfkVHw+1G2+NbhB0miUnxh
+ex1Y5FJ+7Fet31zqk9whwmU6WbpwCCQRPWj/52qSciK66rZyFlqMnID33MWOR6hW
+86VtXZwWjBl2QmQuqFzHQ0aZU7ihUGW6YyodXc/GA8u72AEgzg74NiUgR9ewHsjW
+3d6rDhq6TOuOVpqfxNWZEdnw5qdIz8RhHKHh3W5fHv5xIp0meruvhv6mmXv7NltA
+S0mVt4iCe4MLcTRBtNtIkA8FvdwHnmfFdrwiZvxt7PW3JbPp27JJ5Ozl7fECAwEA
+AaNlMGMwHQYDVR0OBBYEFJaRXAI+mqD0ehgvH9spPnE6a5AxMEIGA1UdEQQ7MDmC
+D2ZlZGUuc3VwZWxlYy5mcoYmaHR0cHM6Ly9mZWRlLnN1cGVsZWMuZnIvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAGSd2uPxo+hqnAQjN1fAlVr24vO0
++PHkWq5/LD836eb8UWgCvlGB1/D5fQZzvszShofbnnBYA3sT/ZA32uQeCnn2JcXD
+Ggl9/kBDXaLe4sDFRvEmme/5aacES06cuHVQOfo1geiU9b0BWZfQ+PhIs7zMD6lW
+oG7DQC+PuWokOA53MCcMZFGkx9Jc7WYE/mDDUwktRKyKdmWkhBhPqX9WG9TiVjQ8
+4es7yiwOGihNdSw+Fo57loP3CpPYNpbirQy38W98qv2UNRabSrnRG26Pnr6Olitl
+0Mk7i7JvwcZoVBdgutFiM5YhZNH2Lm01vGPdFTeoUvatALsHf2c43PtH/PM=
+					    </ds:X509Certificate>
+        </ds: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+gAwIBAgIUI3GVT0U51zI/+zqt7XjPQwAliqIwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPZmVkZS5zdXBlbGVjLmZyMB4XDTE0MDYxOTA5MzUxOVoX
+DTM0MDYxOTA5MzUxOVowGjEYMBYGA1UEAxMPZmVkZS5zdXBlbGVjLmZyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp4mY5iMIDfdfYOaZfhJ8f1cGJWtW
+nmOqq4X/dpvqIIDS99IpWCL3bDg5v8XtTtywfIdrAStQKiTSW5OXYMvuMpZwQzdX
+lz2b0huK+9h+wK4sEr/VvedRaxR41d2EWCgKRNglSSC8d0je5ohwKBXkdqiscbTN
+/5qRqVR1QPpWRJN0HlLIvE1J0Geb5RRsBtciWMSLAlRxfWKCqFgBZVzL8WlqF624
+cioE1U6K+TUnNXDoZxWdf/Ynn/9VC634ud1KectCNb2dRJO6ywwh4z+Zdd6gVKxu
+YBXngIYRgXdWFfCkhBj1Tj3TaDLkKaKRSZejotINWXUHIrFO0RA0KjWI/QIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9mZWRlLnN1cGVsZWMuZnKGJmh0dHBzOi8vZmVkZS5z
+dXBlbGVjLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRNa4jLphWoCFgrx/Pa
+OM2r2uMx5zANBgkqhkiG9w0BAQUFAAOCAQEAGfZyDAr7cL5vT+7jigc0oYdjfPQ+
+CG8shDpjTOwWjRXThxLX32IUhYPF0mZ+EvrCQdyg01CTE2bkMpcDilnDpsmMOoRo
+p820ReMScYoFNB/nQio21BR1Galps7TdErp8XFNvgwbPW6YdFpqXYxAFNm5wWnxz
+u9dm0M2dMSEe1xgJjYRaU2H/BN5qyGuoyM4K0maM8AHOS9iBnRzuzcZQ7WUWA1JP
+VgWhf5jRP9RPKVQUQOLb036aw3uZ51fSvN/ceCPq5ibwqUEHw9gikRWchPerrYnR
+eDUxLltLVzLhUUNHbW5A2MlBwDFMqCWhZy8vqCJFdLUkTAFhRuJ/VVyYzA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fede.supelec.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">CentraleSupelec</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CentraleSupelec</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">www.supelec.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Laura NEGRE</md:SurName>
+    <md:EmailAddress>laura.negre@supelec.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Thibault LE MEUR</md:SurName>
+    <md:EmailAddress>thibault.lemeur@supelec.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federacao.ifpi.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/federacao.ifpi.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..1171a34c
--- /dev/null
+++ b/swamid-interfederations-2.0/federacao.ifpi.edu.br-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federacao.ifpi.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFPI - Instituto Federal do Piaui</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFPI - Instituto Federal do Piaui</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFPI - Instituto Federal do Piaui</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFPI - Instituto Federal do Piaui</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifpi.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifpi.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>
+    MIIDGDCCAgACAQAwDQYJKoZIhvcNAQEFBQAwUjEMMAoGA1UECxMDRFRJMREwDwYD
+VQQHEwhUZXJlc2luYTEOMAwGA1UECBMFUGlhdWkxCzAJBgNVBAYTAkJSMRIwEAYD
+VQQDEwlmZWRlcmFjYW8wHhcNMTQwNDE2MTYwMzI0WhcNMTkwNDE1MTYwMzI0WjBS
+MQwwCgYDVQQLEwNEVEkxETAPBgNVBAcTCFRlcmVzaW5hMQ4wDAYDVQQIEwVQaWF1
+aTELMAkGA1UEBhMCQlIxEjAQBgNVBAMTCWZlZGVyYWNhbzCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAM+X6ZVCrx5gqcXZXUuiC5ermIFV+dcDd/6BEQN4
+ufvSfALSdZCOhFuCB2OBn1PZkGKYLMiP9uhsaYFQrNPdX7sNwJahZRnimwbbd9YZ
+uyAp5JN/DFcVxYIDtDy9Xo52pLBteqnNJuW8gWZaGUwivk8sG4IfXKuyRf6HauEK
+vwF8S63cxGG+cWEpr3OXYyhQQGpPq0AgrT/zwXEXBKUGCgWECjgV0xII09RGfkm+
+HedznbHuJc5U0J+rUneiUiTaDH9cUjG+nVuBsMRy+4aeZEolO5MN/Vr7iRP+y5om
+LysxRCvOs77sR/mNlnC8vJr+Y74YFz4I3edxsQ2coBJksasCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEApkUH0E14hDpfCakAsJA7Du1zmvgf1uwqJ0Db5iYgjsTuvCZD
+CkyF2tRhXFUd1IgjhT5kScN43BfOfxL+qgcgUeTRaHgxv8tdsoe5H9UIfPJ4/wgs
+YlreWAp7AwLpLUEfxuhRg0jtvd4MOklqaFq+glegAMohgGa2lTZYmTDGTR7/W9v5
+twH+A+m4zbCnd6MfzaglK4+nW2EWz7CPfvyBDcXSe1CRi6U/DAcdu2L17TBt+4Sc
+NTspSiMFvbL4XPaveBG/P2fqDs8BWYdipfJS9PajdrtOVaTSAanU7xW0TUhXd5Z2
+ESiur7i2cJdTtG/Jfbx8BA+uJa12EQx7tup6qQ==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.ifpi.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://federacao.ifpi.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://federacao.ifpi.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federacao.ifpi.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federacao.ifpi.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federacao.ifpi.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>
+      
+MIIDGDCCAgACAQAwDQYJKoZIhvcNAQEFBQAwUjEMMAoGA1UECxMDRFRJMREwDwYD
+VQQHEwhUZXJlc2luYTEOMAwGA1UECBMFUGlhdWkxCzAJBgNVBAYTAkJSMRIwEAYD
+VQQDEwlmZWRlcmFjYW8wHhcNMTQwNDE2MTYwMzI0WhcNMTkwNDE1MTYwMzI0WjBS
+MQwwCgYDVQQLEwNEVEkxETAPBgNVBAcTCFRlcmVzaW5hMQ4wDAYDVQQIEwVQaWF1
+aTELMAkGA1UEBhMCQlIxEjAQBgNVBAMTCWZlZGVyYWNhbzCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAM+X6ZVCrx5gqcXZXUuiC5ermIFV+dcDd/6BEQN4
+ufvSfALSdZCOhFuCB2OBn1PZkGKYLMiP9uhsaYFQrNPdX7sNwJahZRnimwbbd9YZ
+uyAp5JN/DFcVxYIDtDy9Xo52pLBteqnNJuW8gWZaGUwivk8sG4IfXKuyRf6HauEK
+vwF8S63cxGG+cWEpr3OXYyhQQGpPq0AgrT/zwXEXBKUGCgWECjgV0xII09RGfkm+
+HedznbHuJc5U0J+rUneiUiTaDH9cUjG+nVuBsMRy+4aeZEolO5MN/Vr7iRP+y5om
+LysxRCvOs77sR/mNlnC8vJr+Y74YFz4I3edxsQ2coBJksasCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEApkUH0E14hDpfCakAsJA7Du1zmvgf1uwqJ0Db5iYgjsTuvCZD
+CkyF2tRhXFUd1IgjhT5kScN43BfOfxL+qgcgUeTRaHgxv8tdsoe5H9UIfPJ4/wgs
+YlreWAp7AwLpLUEfxuhRg0jtvd4MOklqaFq+glegAMohgGa2lTZYmTDGTR7/W9v5
+twH+A+m4zbCnd6MfzaglK4+nW2EWz7CPfvyBDcXSe1CRi6U/DAcdu2L17TBt+4Sc
+NTspSiMFvbL4XPaveBG/P2fqDs8BWYdipfJS9PajdrtOVaTSAanU7xW0TUhXd5Z2
+ESiur7i2cJdTtG/Jfbx8BA+uJa12EQx7tup6qQ==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.ifpi.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federacao.ifpi.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">IFPI - Instituto Federal do Piaui</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFPI - Instituto Federal do Piaui</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFPI - Instituto Federal do Piaui</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFPI - Instituto Federal do Piaui</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifpi.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifpi.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Manuel Goncalves da Silva Neto</md:SurName>
+    <md:EmailAddress>manuel@ifpi.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federatedaccess.hrc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/federatedaccess.hrc.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..b41c6818
--- /dev/null
+++ b/swamid-interfederations-2.0/federatedaccess.hrc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federatedaccess.hrc.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-07-11T17:18: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>
+      <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
+						Y2Nlc3MuaHJjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						koOul030k6LhcQ2zW3YErb4osJQwvj7gskGciL2HdKH/BKI1EFOqfayB3QKS7cJ6
+						ekdeHdkhhwamDnXGW2IZO3xaeGXiebT9vy/m3bi3VScUZsydhCC5vZ6vKJHqA2aN
+						qWPH6uNqS9D9X+BXQ1Yaa0zaB671M1gbZ9TwCP473+jtBjRh3b5LaNh41MbOJ4xk
+						7UyQvG1Q2tiO1+0OfBnjen3cKnL2u8HrKXq0aZFV1FXmL/S/C7RSlXp3+FX3+VZa
+						Pn/jlBBQHn7j8hEoQ3KkrnO7PFIiD4szmm40ubKk9m1iR3JKu8wsP/wkFll1MCxq
+						3QDeoo8c6I/RHgIa7zzHgQIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0ZWRh
+						Y2Nlc3MuaHJjLmFjLnVrhjBodHRwczovL2ZlZGVyYXRlZGFjY2Vzcy5ocmMuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFB7hyBviehtzOyJTo/85hiqrmtaS
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCPwEmDe/HVq9orxzy9lS7qYg4tte2dqJHpsLD+
+						AxcI5Uamg1/7IbuG5P6r9gPgdVzB1qo5DWaXbJSo8wY+003v2kvdXYK2x0/85DZ4
+						dtkftolCrgwGJqeEePUV4TWCoihdSjaqr7/0Qe27nZi83hNjy3OipfMm/lDZQDgB
+						3mIg0IbbBXVh4BjnnaJZqGj7qqhCJduCaU0hUK1cvb31Po/Ub+8fqmobstCFxcw4
+						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>
+						MIIDUDCCAjigAwIBAgIVAOg3Fb090dB9p32MB4EgjYEXyiOxMA0GCSqGSIb3DQEB
+						BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRlZGFjY2Vzcy5ocmMuYWMudWswHhcNMTMw
+						NzA2MDcyMjMxWhcNMzMwNzA2MDcyMjMxWjAkMSIwIAYDVQQDExlmZWRlcmF0ZWRh
+						Y2Nlc3MuaHJjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						koOul030k6LhcQ2zW3YErb4osJQwvj7gskGciL2HdKH/BKI1EFOqfayB3QKS7cJ6
+						ekdeHdkhhwamDnXGW2IZO3xaeGXiebT9vy/m3bi3VScUZsydhCC5vZ6vKJHqA2aN
+						qWPH6uNqS9D9X+BXQ1Yaa0zaB671M1gbZ9TwCP473+jtBjRh3b5LaNh41MbOJ4xk
+						7UyQvG1Q2tiO1+0OfBnjen3cKnL2u8HrKXq0aZFV1FXmL/S/C7RSlXp3+FX3+VZa
+						Pn/jlBBQHn7j8hEoQ3KkrnO7PFIiD4szmm40ubKk9m1iR3JKu8wsP/wkFll1MCxq
+						3QDeoo8c6I/RHgIa7zzHgQIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0ZWRh
+						Y2Nlc3MuaHJjLmFjLnVrhjBodHRwczovL2ZlZGVyYXRlZGFjY2Vzcy5ocmMuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFB7hyBviehtzOyJTo/85hiqrmtaS
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCPwEmDe/HVq9orxzy9lS7qYg4tte2dqJHpsLD+
+						AxcI5Uamg1/7IbuG5P6r9gPgdVzB1qo5DWaXbJSo8wY+003v2kvdXYK2x0/85DZ4
+						dtkftolCrgwGJqeEePUV4TWCoihdSjaqr7/0Qe27nZi83hNjy3OipfMm/lDZQDgB
+						3mIg0IbbBXVh4BjnnaJZqGj7qqhCJduCaU0hUK1cvb31Po/Ub+8fqmobstCFxcw4
+						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 - Test</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/federation-identite.univ-paris13.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation-identite.univ-paris13.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..ee1cd1d9
--- /dev/null
+++ b/swamid-interfederations-2.0/federation-identite.univ-paris13.fr-idp-shibboleth.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation-identite.univ-paris13.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-10-27T17:00: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris13.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University Paris 13</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Members of University Paris 13 (Students, Teaching staff, Researchers and Administrative and Technical staff)</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université Paris 13</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnes membres de l'Université Paris 13 (Etudiants, Personnels, Enseignants, Enseignants-Chercheurs, 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>
+					      MIIDejCCAmKgAwIBAgIVAK7XWBt0cfWGEv/HUzJRJYhKWFD6MA0GCSqGSIb3DQEB
+BQUAMC4xLDAqBgNVBAMTI2ZlZGVyYXRpb24taWRlbnRpdGUudW5pdi1wYXJpczEz
+LmZyMB4XDTEwMTAyMzEyMTExNFoXDTMwMTAyMzEyMTExNFowLjEsMCoGA1UEAxMj
+ZmVkZXJhdGlvbi1pZGVudGl0ZS51bml2LXBhcmlzMTMuZnIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCc/y6YY56o8yN7kpm+WTki591jEzoyfZhI883X
+RMP54gc9B/YlMvhOX0c3yKxsAA9DGZqhC3IpzhNIwEqZdznaDtLyb8qfExgP37zU
+sKJlqU3fmiZ3PLB1H3MKMu850bQpxcY9mQnboBSfwybTkiggCei2uVls8dgDhr6O
+M/JkWo2JzAnBKYP8B1nEG3Ynabbk1ncktx1XlUb5Ar7L33GXSBHZmZjQczgifXbl
+euOjVRlBJodDaQS0dZMKVvEWxPIU2n0Kd7leiWrVe9UJgIOlc9XPCX0EXfNb90fx
+z5anJggWlCClzAI2BNPM1BlTk+Sf0B4j0Df250uvsqM+6dUjAgMBAAGjgY4wgYsw
+agYDVR0RBGMwYYIjZmVkZXJhdGlvbi1pZGVudGl0ZS51bml2LXBhcmlzMTMuZnKG
+Omh0dHBzOi8vZmVkZXJhdGlvbi1pZGVudGl0ZS51bml2LXBhcmlzMTMuZnIvaWRw
+L3NoaWJib2xldGgwHQYDVR0OBBYEFPPj9MEZxWRXVouk6e4gI+J1lfjsMA0GCSqG
+SIb3DQEBBQUAA4IBAQAIvX5H/FQEOM68IPlr/uhjuDKEhngLhPp/oJB2rewP6ryS
+PtgXpCpFVF2LKK5WJGtoXtpAxHg5DFz1UVvcCG2ELivEtZa0L15DxQNQRCkx9ot2
+z4FPpojZ5AfAzJixC8QxXL6Em97K5iJic1cin5oRNaX5TJBki5VVGpy1HGJuw2jT
+rk2djX0eDw4AXkvCk9v20rg2f/JQtCu7Ai1rlRzHzq1bAhaepZmdXOBedBSiPTlX
+HtqWfXo71mMZC74xUh+ctHhBLqZJ8oKWIif43XpoA5ZXUsgSKKQ11d+l8l9UEFDQ
+0pZI2DZg+vSvz1Lncsgyiuy4FDU0VFXEc+gRL3aZ
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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-identite.univ-paris13.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation-identite.univ-paris13.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation-identite.univ-paris13.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université Paris 13</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université Paris 13</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-contact@univ-paris13.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.agrocampus-ouest.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.agrocampus-ouest.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..8b32f4aa
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.agrocampus-ouest.fr-idp-shibboleth.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.agrocampus-ouest.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-27T17:16: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agrocampus-ouest.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">AGROCAMPUS OUEST</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDZjCCAk6gAwIBAgIVALlE+KiCBNQALvnetyzr7WFhuKaRMA0GCSqGSIb3DQEB
+BQUAMCkxJzAlBgNVBAMTHmZlZGVyYXRpb24uYWdyb2NhbXB1cy1vdWVzdC5mcjAe
+Fw0xMjEyMjAxMDE4MzBaFw0zMjEyMjAxMDE4MzBaMCkxJzAlBgNVBAMTHmZlZGVy
+YXRpb24uYWdyb2NhbXB1cy1vdWVzdC5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMojdY5dsi66PVE/E/BJ+JMLKFX1DXfjr1EhuN6EL2iDQRX6yn3+
+cU4ng5pBxf7f/il3ClFAkshpIoSGbqzcfeS67N9pxhD0yAD/s3ljoFQ7UP5VoCvI
+iYaPcPSCzEmUguCyWoZctNQBSNqZJOiYpy0QJqHtXge3CiD7cF4xQK+lJxxFBtkW
+74vtAG9f0MIyhioBRqAlwfHF1v3WuWk7E+5P6jqWS2iVs6eG88tNZdXfzW9faDPj
+8/h5XMWUsQXzQ2V1c0oT1Zva7aSix6t7+DxW4OwHR8BkeTxs/hVuigr8FcR12KmT
+0DxDCUiiXtefGjgTa+pCagTXoyEklnihrtsCAwEAAaOBhDCBgTBgBgNVHREEWTBX
+gh5mZWRlcmF0aW9uLmFncm9jYW1wdXMtb3Vlc3QuZnKGNWh0dHBzOi8vZmVkZXJh
+dGlvbi5hZ3JvY2FtcHVzLW91ZXN0LmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQW
+BBTXOuWNbcdej3DUhAmdgQvMWVquFDANBgkqhkiG9w0BAQUFAAOCAQEAf6fKMGX4
+N304qzgFikEqzsksyCK0WTN7U5U8FAHUUFbh8Fh026uYbopScyQcZ/ylJdUB7h0N
+CXbbce96Y7WXwZBdtMlMDya7hMzCaCgsuNqFLSXnh1HhuWKG7K5zBy50wLuHEBx+
+McIqs5yi8GpYWmS6sVE8EVZetU62NaiA2t3hgqPkCodjYQkVkd3x576bjaqmhbr6
+XZdv1L/uqqycvp33bKDQ43435KdThNlpjWWtu3LQ1akUBJ31dv8gAwUha2xX6kU8
+2MCUHWkgnXy+8hvKPj5LOXuJ4W44Y6Tvt5LxNGh5Mt8srDpZt8ivktQ9oa+PjXob
+5Adfu8PBDYuGpA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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.agrocampus-ouest.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.agrocampus-ouest.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.agrocampus-ouest.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">AGROCAMPUS OUEST</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">AGROCAMPUS OUEST</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Lionel DURANDET</md:SurName>
+    <md:EmailAddress>lionel.durandet@agrocampus-ouest.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Emmanuel DOLLÉ</md:SurName>
+    <md:EmailAddress>emmanuel.dolle@agrocampus-ouest.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..2565c475
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.bretagne.iufm.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-10-12T16:14: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bretagne.iufm.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">espe-bretagne.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">ESPE de Bretagne</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels et étudiant de l'ESPE de Bretagne</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>
+					      MIIEhDCCA2ygAwIBAgIRAPSODBFpc8g+0TGgl6Q8SN8wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAyMTEwMDAwMDBaFw0xNjA0MDUyMzU5NTlaMEkxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbZmVkZXJhdGlv
+bi5icmV0YWduZS5pdWZtLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA0W8trO2zbN+5N30+4N+JpWEmcmUbp2wYAJB0v4rinl6MzMs007wHfKj14rKC
+5eIvkbtgzbhs/biZVvA+/Xky7TyIL/Z/34Ha1JeoYsezfmdf0qT8J2jOcuG8DVU3
+/J6Mtg9Zfz4GwNq4NFO4qx0vXZhX3LT3+8sQmPH96a9XmrPQB514Flc1mWZmZ/he
+XdTkhmu/o9/3fx2guNwjddQ9ruWalmSpTD7FSt5LMsavWfp4niATTcGXR+yQsWuG
+ULjIMfWUjmaY+0s+658WSZzD+o9sFknoQpNKjufCkEFUMQuUfFfZGJlGxZOYRhDq
+eHNFgFBHzZHXixrjge2HVA1fxQIDAQABo4IBeDCCAXQwHwYDVR0jBBgwFoAUDL2T
+aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFC4C3PlQ1bY/T8VIR4gpUtQKnfm8
+MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
+BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
+ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
+UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
+Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
+hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdghtmZWRlcmF0
+aW9uLmJyZXRhZ25lLml1Zm0uZnIwDQYJKoZIhvcNAQEFBQADggEBABBedNTktIew
+Jsv/6U2BjnnBtL7+nRX5nHE5M+oqIO39NJg0iDuWNAXJK9p36C31ucuNTAYrFvQq
+vBrMiwjDwpaNCAs6/3c1J9iH8GH9r2FONFFXHGswvKhlwqE7MaQh2l/+qHs4wfRe
+nsP2N+nWD1nvxIlQvfcF5W2mZWxE5ZT73etDiilcorRvI423P5BeeRYciBa8im8A
+GrGTlcvHZkTfuZ01NQiTnXnWmghzyqug72nwj42FLThQgDdeDOrzTEKREtehNcpp
+PULGkDErBea0SdXtVN3swhySNl9Ba69OYezLZ8hdDCrcN3wPw8VGi6xDMa4ENkKL
+hjz3pTN+SFo=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIErDCCA5SgAwIBAgIQRmz9EXsKgXSG7w3iHBAacTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDQwODAwMDAwMFoXDTEzMDQwNzIzNTk1OVowfDELMAkGA1UE
+BhMCRlIxDjAMBgNVBAcTBUJyZXN0MRwwGgYDVQQKExNVTklWRVJTSVRFIERFIEJS
+RVNUMRkwFwYDVQQLExBJVUZNIGRlIEJyZXRhZ25lMSQwIgYDVQQDExtmZWRlcmF0
+aW9uLmJyZXRhZ25lLml1Zm0uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC9io/anctVdl1XJKVAOdH/smD4k5iu6z/izJwt32LXFSgs5KLYi7pUThAv
+awK8Iky5+60HAXI6Oyxj4GYY9+2mlyjTi+HXeE4BeIUzznGFcp0tL+Iz3WrY5x+P
+HQaR9YdjhRbe72jyGPA0lnS6OI7dxJaI18IXqh8nmcS1uJcxyFBsRG9MGVX2PWWZ
+8hB3TEL3vNybl59VOltoAjm1m2NikQK70Hr6w+TofDEmht0qAubTWLN7c9v2UGos
++/Z1qfAJTZ5En4eG0V2z2NHDwcqbg8dUjUVgmw05aIkhS1ecIp9EkRLdUzbyh5aY
+yFXaM/6L77+BqHTSswf6X4sKjn9NAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQM
+vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUzLxiXZeukJyQudQQyHUqS7vX
+9XwwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
+BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+L29jc3AudGNzLnRlcmVuYS5vcmcwJgYDVR0RBB8wHYIbZmVkZXJhdGlvbi5icmV0
+YWduZS5pdWZtLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQChVtxeBUo5Y/kZfvLjKZB2
+lgotm/dUiZHxscZRh/Rcnb37Eo9NcuA3UbY9IjkUbS3p1VbLtfFQxjK7SEa/z0ry
+qxZy9/94Zs43Ntpm2XijY5uL9x6pykzLVFDLG3ZdpnrnJz3MMC6wtF14VcOTwfjm
+10hAOLHnc4xuPCEKBZMTeeNaBmARfnbrBiv0cdWI74sE0hJbq2W7e3/atzwvH1O4
+LJWCNOb6ewDwXycbnYzCnEvL1z34BTU6GAb4t4yEjQEyPmqOTMbHeE/TD9//7LO6
+HF+7wdprWF0e2/C+accIlza8LuwyPv+M5K2Q6XonBrAbHEuWJTFfJ9CxkzK9oj5+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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.bretagne.iufm.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.bretagne.iufm.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.bretagne.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">bretagne.iufm.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">espe-bretagne.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEhDCCA2ygAwIBAgIRAPSODBFpc8g+0TGgl6Q8SN8wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAyMTEwMDAwMDBaFw0xNjA0MDUyMzU5NTlaMEkxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbZmVkZXJhdGlv
+bi5icmV0YWduZS5pdWZtLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA0W8trO2zbN+5N30+4N+JpWEmcmUbp2wYAJB0v4rinl6MzMs007wHfKj14rKC
+5eIvkbtgzbhs/biZVvA+/Xky7TyIL/Z/34Ha1JeoYsezfmdf0qT8J2jOcuG8DVU3
+/J6Mtg9Zfz4GwNq4NFO4qx0vXZhX3LT3+8sQmPH96a9XmrPQB514Flc1mWZmZ/he
+XdTkhmu/o9/3fx2guNwjddQ9ruWalmSpTD7FSt5LMsavWfp4niATTcGXR+yQsWuG
+ULjIMfWUjmaY+0s+658WSZzD+o9sFknoQpNKjufCkEFUMQuUfFfZGJlGxZOYRhDq
+eHNFgFBHzZHXixrjge2HVA1fxQIDAQABo4IBeDCCAXQwHwYDVR0jBBgwFoAUDL2T
+aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFC4C3PlQ1bY/T8VIR4gpUtQKnfm8
+MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
+BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
+ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
+UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
+Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
+hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdghtmZWRlcmF0
+aW9uLmJyZXRhZ25lLml1Zm0uZnIwDQYJKoZIhvcNAQEFBQADggEBABBedNTktIew
+Jsv/6U2BjnnBtL7+nRX5nHE5M+oqIO39NJg0iDuWNAXJK9p36C31ucuNTAYrFvQq
+vBrMiwjDwpaNCAs6/3c1J9iH8GH9r2FONFFXHGswvKhlwqE7MaQh2l/+qHs4wfRe
+nsP2N+nWD1nvxIlQvfcF5W2mZWxE5ZT73etDiilcorRvI423P5BeeRYciBa8im8A
+GrGTlcvHZkTfuZ01NQiTnXnWmghzyqug72nwj42FLThQgDdeDOrzTEKREtehNcpp
+PULGkDErBea0SdXtVN3swhySNl9Ba69OYezLZ8hdDCrcN3wPw8VGi6xDMa4ENkKL
+hjz3pTN+SFo=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIErDCCA5SgAwIBAgIQRmz9EXsKgXSG7w3iHBAacTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDQwODAwMDAwMFoXDTEzMDQwNzIzNTk1OVowfDELMAkGA1UE
+BhMCRlIxDjAMBgNVBAcTBUJyZXN0MRwwGgYDVQQKExNVTklWRVJTSVRFIERFIEJS
+RVNUMRkwFwYDVQQLExBJVUZNIGRlIEJyZXRhZ25lMSQwIgYDVQQDExtmZWRlcmF0
+aW9uLmJyZXRhZ25lLml1Zm0uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC9io/anctVdl1XJKVAOdH/smD4k5iu6z/izJwt32LXFSgs5KLYi7pUThAv
+awK8Iky5+60HAXI6Oyxj4GYY9+2mlyjTi+HXeE4BeIUzznGFcp0tL+Iz3WrY5x+P
+HQaR9YdjhRbe72jyGPA0lnS6OI7dxJaI18IXqh8nmcS1uJcxyFBsRG9MGVX2PWWZ
+8hB3TEL3vNybl59VOltoAjm1m2NikQK70Hr6w+TofDEmht0qAubTWLN7c9v2UGos
++/Z1qfAJTZ5En4eG0V2z2NHDwcqbg8dUjUVgmw05aIkhS1ecIp9EkRLdUzbyh5aY
+yFXaM/6L77+BqHTSswf6X4sKjn9NAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQM
+vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUzLxiXZeukJyQudQQyHUqS7vX
+9XwwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
+BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+L29jc3AudGNzLnRlcmVuYS5vcmcwJgYDVR0RBB8wHYIbZmVkZXJhdGlvbi5icmV0
+YWduZS5pdWZtLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQChVtxeBUo5Y/kZfvLjKZB2
+lgotm/dUiZHxscZRh/Rcnb37Eo9NcuA3UbY9IjkUbS3p1VbLtfFQxjK7SEa/z0ry
+qxZy9/94Zs43Ntpm2XijY5uL9x6pykzLVFDLG3ZdpnrnJz3MMC6wtF14VcOTwfjm
+10hAOLHnc4xuPCEKBZMTeeNaBmARfnbrBiv0cdWI74sE0hJbq2W7e3/atzwvH1O4
+LJWCNOb6ewDwXycbnYzCnEvL1z34BTU6GAb4t4yEjQEyPmqOTMbHeE/TD9//7LO6
+HF+7wdprWF0e2/C+accIlza8LuwyPv+M5K2Q6XonBrAbHEuWJTFfJ9CxkzK9oj5+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.bretagne.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">ESPE de Bretagne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ESPE de Bretagne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>federation@espe-bretagne.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.bsigroup.com-oa-metadata.xml b/swamid-interfederations-2.0/federation.bsigroup.com-oa-metadata.xml
new file mode 100644
index 00000000..1a8023ae
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.bsigroup.com-oa-metadata.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.bsigroup.com/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-02T13:31: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: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">British Standards Institution subscription services</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Access to the British Standards Institution's online standards subscription services</mdui:Description>
+        <mdui:Logo height="73" width="116">https://federationsupportdata.bsigroup.com/logo_116x73.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFITCCBAmgAwIBAgIJAOUhlNL9S5KmMA0GCSqGSIb3DQEBBQUAMIG7MQswCQYD
+						VQQGEwJVSzERMA8GA1UECBMIQ2hpc3dpY2sxDzANBgNVBAcTBkxvbmRvbjEmMCQG
+						A1UEChMdQnJpdGlzaCBTdGFuZGFyZHMgSW5zdGl0dXRpb24xETAPBgNVBAsTCEdy
+						b3VwIElUMSAwHgYDVQQDExdmZWRlcmF0aW9uLmJzaWdyb3VwLmNvbTErMCkGCSqG
+						SIb3DQEJARYcbWFyay5vJ3N1bGxpdmFuQGJzaWdyb3VwLmNvbTAeFw0xNDEwMTUx
+						MzQ2MTVaFw0yNDEwMTIxMzQ2MTVaMIG7MQswCQYDVQQGEwJVSzERMA8GA1UECBMI
+						Q2hpc3dpY2sxDzANBgNVBAcTBkxvbmRvbjEmMCQGA1UEChMdQnJpdGlzaCBTdGFu
+						ZGFyZHMgSW5zdGl0dXRpb24xETAPBgNVBAsTCEdyb3VwIElUMSAwHgYDVQQDExdm
+						ZWRlcmF0aW9uLmJzaWdyb3VwLmNvbTErMCkGCSqGSIb3DQEJARYcbWFyay5vJ3N1
+						bGxpdmFuQGJzaWdyb3VwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAMEYRpNo2uI1Rt7yykpMc66SqN16ona2qZihqSkhIVKOEWgiQ7UaF9W1lOeX
+						pByClRBzQkgSdOc6bJ+A+YCR4kzbkXeV96fawhhiZKeYwHgXoEq9Tg7TCkLFxs97
+						ZZXUE8IJsundnXfOJe/E4WuFFXNqxI7dLsjClIKbpweGH8/P0dpq2B54BHGlsjeQ
+						Wg2uPlt01VO9r/9VTxk/NzkomwdtbuKtKROkLIa30mEOhR+ZnsTb50hqOpBWWtia
+						QIPJlCtQ2KsnLzUCEN+Ud/CuMkNpw7mv/J0L3KYb3tktfj/ehzusXPtuEOExlRdS
+						C+nq4myT7nWaTt1wyi9vxYcmIiUCAwEAAaOCASQwggEgMB0GA1UdDgQWBBRALFY3
+						lIzStlyzGgxzFb/uCruPIDCB8AYDVR0jBIHoMIHlgBRALFY3lIzStlyzGgxzFb/u
+						CruPIKGBwaSBvjCBuzELMAkGA1UEBhMCVUsxETAPBgNVBAgTCENoaXN3aWNrMQ8w
+						DQYDVQQHEwZMb25kb24xJjAkBgNVBAoTHUJyaXRpc2ggU3RhbmRhcmRzIEluc3Rp
+						dHV0aW9uMREwDwYDVQQLEwhHcm91cCBJVDEgMB4GA1UEAxMXZmVkZXJhdGlvbi5i
+						c2lncm91cC5jb20xKzApBgkqhkiG9w0BCQEWHG1hcmsubydzdWxsaXZhbkBic2ln
+						cm91cC5jb22CCQDlIZTS/UuSpjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
+						A4IBAQAaFsGT0hV9hZTchsFy4jMxCGd3XA0efbnkn95k1epRtJz4/Tk604MZ7NTa
+						XuAZEuqvyi3gxW2xSPFYg9kIjq6E00QpxqPxkytJmut28Nr7pi6TIDXcyBn/eWg1
+						9gXpvcypeEQTS8LIioyB2ipfK5Zbz7hW8NMzXdRV7sqRmH7d8v9BB46+X5SHkTab
+						84iL5r/Iivv75c/AiB2a6SsaRNNYUrlNTVrQPAlMNaYhXL9YJZ7cdzNfSYh6X/Ob
+						fLfVi10Ulv83wbOU5XAYHtsEhnOQQooohsrKEKcRDC0pkUuiOpvgloC4HxRmVrsZ
+						nQzraqnKpsGJ8Pc9j4fEJesIGB0J
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://federation.bsigroup.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://federation.bsigroup.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.bsigroup.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://federation.bsigroup.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">British Standards Institution</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">British Standards Institution subscription services</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bsigroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Yaqub</md:GivenName>
+    <md:SurName>Rab</md:SurName>
+    <md:EmailAddress>mailto:Yaqub.Rab@bsigroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Yaqub</md:GivenName>
+    <md:SurName>Rab</md:SurName>
+    <md:EmailAddress>mailto:Yaqub.Rab@bsigroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.citylit.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/federation.citylit.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..ac416aa7
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.citylit.ac.uk-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.citylit.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">citylit.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID3zCCAsegAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMRQwEgYDVQQKDAtJbnRl
+						cm5ldDJRSTEdMBsGA1UECwwUSW50ZXJuZXRRdWlja0luc3RhbGwxITAfBgNVBAMM
+						GGZlZGVyYXRpb24uY2l0eWxpdC5hYy51azAeFw0wODEwMDExNTI3MDFaFw0xODEw
+						MDExNTI3MDFaMFgxFDASBgNVBAoMC0ludGVybmV0MlFJMR0wGwYDVQQLDBRJbnRl
+						cm5ldFF1aWNrSW5zdGFsbDEhMB8GA1UEAwwYZmVkZXJhdGlvbi5jaXR5bGl0LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm8uZyZuCsmNPxwh5
+						wYzBQxH5Lm4k88NjijrPczsmMv6ytTktOryvUT53onCvV56Q/K9fNFp6n2oED1qT
+						GBFULXBjn2V05mXOcbxP10gbmVP3ik8K+uSfZWrG6Zhko2mCx+N1Ic9lvnjELAMZ
+						n4iX9/XJpnYyzHJTCJ+nhsG3q1wYftXblAm3UQn3kBpzjAKTWmAKEFnfLYt2hXQi
+						SJpTEMAMc7LF4x2Wn65D8Yy7ZUDv9D0gXvHCfLKaY9KP3nb5v9jxxOy2MY9myApV
+						1FBauyD5N4zh5CoiXa5Kc4ulsPpgl7rsJzVK40nDsSTBh5z4zhKFoLY2ed9D4u5m
+						N7gC2wIDAQABo4GzMIGwMB0GA1UdDgQWBBQt1uPa7g7op1dL4DqzM9jEUGbEjDCB
+						gAYDVR0jBHkwd4AULdbj2u4O6KdXS+A6szPYxFBmxIyhXKRaMFgxFDASBgNVBAoM
+						C0ludGVybmV0MlFJMR0wGwYDVQQLDBRJbnRlcm5ldFF1aWNrSW5zdGFsbDEhMB8G
+						A1UEAwwYZmVkZXJhdGlvbi5jaXR5bGl0LmFjLnVrggEBMAwGA1UdEwQFMAMBAf8w
+						DQYJKoZIhvcNAQEFBQADggEBAHUFXipOGkG4InAusODqfe1aUG+skCY9zzXTaIOP
+						kpXQ0Q5FifQiShE/b2vIp15lQG+qDE0kppyk5cBkdZkGAVb5K0aQIxcl9MiL67QX
+						h6iqlSpAgMU6u6L2/VWBeVjNmqcc9X88nXWDv4VAOJy4YIZVMn16bkeD40doSuQJ
+						S9ipahSI+KhN8a84nx+inBjh2W47rle5BYVjblu3eCKf3i4/W03r2jurW2+yEwlA
+						auQ7PwLXsxQpFa/sfc+gSM6AvKc88UT/q3sQHt8vzrr6i2yN6U7s5jbeJ8UhXYeA
+						EzP9054/ECA5LnVNOe+dKhGm84MWiC1ovYbuPx0vFQTzRJE=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.citylit.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federation.citylit.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.citylit.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.citylit.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://federation.citylit.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.citylit.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">citylit.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID3zCCAsegAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMRQwEgYDVQQKDAtJbnRl
+						cm5ldDJRSTEdMBsGA1UECwwUSW50ZXJuZXRRdWlja0luc3RhbGwxITAfBgNVBAMM
+						GGZlZGVyYXRpb24uY2l0eWxpdC5hYy51azAeFw0wODEwMDExNTI3MDFaFw0xODEw
+						MDExNTI3MDFaMFgxFDASBgNVBAoMC0ludGVybmV0MlFJMR0wGwYDVQQLDBRJbnRl
+						cm5ldFF1aWNrSW5zdGFsbDEhMB8GA1UEAwwYZmVkZXJhdGlvbi5jaXR5bGl0LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm8uZyZuCsmNPxwh5
+						wYzBQxH5Lm4k88NjijrPczsmMv6ytTktOryvUT53onCvV56Q/K9fNFp6n2oED1qT
+						GBFULXBjn2V05mXOcbxP10gbmVP3ik8K+uSfZWrG6Zhko2mCx+N1Ic9lvnjELAMZ
+						n4iX9/XJpnYyzHJTCJ+nhsG3q1wYftXblAm3UQn3kBpzjAKTWmAKEFnfLYt2hXQi
+						SJpTEMAMc7LF4x2Wn65D8Yy7ZUDv9D0gXvHCfLKaY9KP3nb5v9jxxOy2MY9myApV
+						1FBauyD5N4zh5CoiXa5Kc4ulsPpgl7rsJzVK40nDsSTBh5z4zhKFoLY2ed9D4u5m
+						N7gC2wIDAQABo4GzMIGwMB0GA1UdDgQWBBQt1uPa7g7op1dL4DqzM9jEUGbEjDCB
+						gAYDVR0jBHkwd4AULdbj2u4O6KdXS+A6szPYxFBmxIyhXKRaMFgxFDASBgNVBAoM
+						C0ludGVybmV0MlFJMR0wGwYDVQQLDBRJbnRlcm5ldFF1aWNrSW5zdGFsbDEhMB8G
+						A1UEAwwYZmVkZXJhdGlvbi5jaXR5bGl0LmFjLnVrggEBMAwGA1UdEwQFMAMBAf8w
+						DQYJKoZIhvcNAQEFBQADggEBAHUFXipOGkG4InAusODqfe1aUG+skCY9zzXTaIOP
+						kpXQ0Q5FifQiShE/b2vIp15lQG+qDE0kppyk5cBkdZkGAVb5K0aQIxcl9MiL67QX
+						h6iqlSpAgMU6u6L2/VWBeVjNmqcc9X88nXWDv4VAOJy4YIZVMn16bkeD40doSuQJ
+						S9ipahSI+KhN8a84nx+inBjh2W47rle5BYVjblu3eCKf3i4/W03r2jurW2+yEwlA
+						auQ7PwLXsxQpFa/sfc+gSM6AvKc88UT/q3sQHt8vzrr6i2yN6U7s5jbeJ8UhXYeA
+						EzP9054/ECA5LnVNOe+dKhGm84MWiC1ovYbuPx0vFQTzRJE=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.citylit.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federation.citylit.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md: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 Lit</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">City Lit</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.citylit.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ratcliffe</md:GivenName>
+    <md:SurName>Cassell</md:SurName>
+    <md:EmailAddress>mailto:cliff.Cassell@citylit.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ratcliffe</md:GivenName>
+    <md:SurName>Cassell</md:SurName>
+    <md:EmailAddress>mailto:cliff.Cassell@citylit.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.crous-lille.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.crous-lille.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..680e376a
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.crous-lille.fr-idp-shibboleth.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.crous-lille.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-02T15:28: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-lille.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Lille</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Staffs</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CROUS Lille</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>
+					      MIIEgDCCA2igAwIBAgIRAOe2cWAZ40jrksSS84mgafQwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA5MjUwMDAwMDBaFw0xNjEyMzEyMzU5NTlaMEcxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZZmVkZXJhdGlv
+bi5jcm91cy1saWxsZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANnI5vHZtv9EG1YcpR+Lu0i2zEHwg9REfT60TKOuRZ4uGEO5HkPz0EZk//g5ANrL
+E/wM6Dc+FzWERy1FIrDEve8rPcSfWjOnei32N0+xmWb470gkXHMHa768JZgYYKPT
+YQtw2w3mO2K6xPSVSgcGp0cToCgeN3Zmj7OjnP1d8FRXQNZfkNbGeTkcE14zTGvn
+il9gGSg6eLp4n+AhzzFqVrsh7nhjDQUVGYSS13gc3QqrbvzhgVA3ezUhuTSf6a2Q
+Ayc/aZ+fsPc2lqBxAN5+CXE+F8hZ2EwT4lS9tPyC9LMmkG6Z/5p2LxjiWD9BAmPs
+8PpBgiv2PQDYpEiImOr7cg8CAwEAAaOCAXYwggFyMB8GA1UdIwQYMBaAFAy9k2gM
+896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQA6VUfnc6ew1jN4PWrQ88BPAFhLzAO
+BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYDVR0RBB0wG4IZZmVkZXJhdGlv
+bi5jcm91cy1saWxsZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAIgY+7c4wkrbZpY3o
+iGyUJ13AjbqyUReqedYEhOC7a6/QfR+AvhSpsig+qPHGz6ouGx7AbSagW3cUvN9Y
+XKAEMvaZDTvgXldQma8/KHxls7sRAKa/xj52C7KJPNynjZCtry3Ibaf/XVG2436/
+qA1F99mmPzg1kwJTnKvUUpWxazcipfKPxw9diYudxPUSxVKS+k1TCynaP40T5r+F
+Zu+ubcxq2fxvr9Hg44hUNPmDGZUE7UFMb97y2oVl/Wt9M6Uv85P593e9GHh9RO98
+rIzZ+UPSX0Y5lkCcEuqMR9FoY/Hs4jGsVBMrwmWGZJGMM2PlT9xIcY2cCqeKu2E/
+Lfrh4A==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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.crous-lille.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.crous-lille.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.crous-lille.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Lille</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Lille</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>informatique@crous-lille.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..c80c8e7f
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.esiee.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-26T14:48: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esiee.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.esiee.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">ESIEE 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>
+					      MIIDODCCAiCgAwIBAgIVAKuyv3oaAeA68eduLXR1T/BYmgCRMA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMTE2ZlZGVyYXRpb24uZXNpZWUuZnIwHhcNMTMwNzIyMTYx
+MjQzWhcNMTYwNzIyMTYxMjQzWjAeMRwwGgYDVQQDExNmZWRlcmF0aW9uLmVzaWVl
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg4im4BqmjCQRPDiM
+lU5aRUcI/IgpMyroXGhOVzLwP1GwvBH8DN1WFlJKNWa1C+RuiY63YTaA6OhIeGBh
+geUzFjXOm8apQ0Ll/TuArQYgt3mRX+TECa37tYz0dtVwfX+tJtQRkT58S05NlNU0
+iUEH/1/2JXSRsEfind9jDTrk4LB9FG89Z6Rhgky2BsoaIu+9bjJVj5f4QoNZ/lkV
+YQDrUhCENq7EctTHoVwLFbJixOSPrdJKtEP2dBFHVuiJpm/EaqSBNYMd79f0ULkR
+2oBN6QDFjkzMZK4TpdgJpurEHCeDmu01cXAz09TNqYz4qWLACWUJ0gedae3u43/8
+kd8mWQIDAQABo20wazBKBgNVHREEQzBBghNmZWRlcmF0aW9uLmVzaWVlLmZyhipo
+dHRwczovL2ZlZGVyYXRpb24uZXNpZWUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFCMSL4g1n6Tu2M2FueYzdebfSG2WMA0GCSqGSIb3DQEBBQUAA4IBAQABYo8u
+VOc3nALTBlfjDgoNV1S3/YcqXsoXnQa+LSTqO7cVtpspFWrBKgbv7uJlRG3Xn0li
+GKDq6wfaD3p9d1sPYo8dsSEfkL5qMphAQs35rFtRiuJnMQZIjVZsMOGuicxwsaiT
+9rGdRhKuRwQj9Rk4A2+NI45ZuZSexGVYFWKWFE3habZ5DEGxHpIMTTCKCOPxxpv7
+VUoaiUNEbmH6WsJ3BuERc66xcCT/kB3oV8QfB+Viu/61/17QI6zfMJcEvG4wwFbi
+cXPVzn3z8dnQlFcgDl+GdXleDdRkMRz9GGCepLb3tW8MGx11hkQ2+P0XiM3rqI83
+lLvxcvJ5CJp7Xtli
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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.esiee.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.esiee.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.esiee.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">esiee.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.esiee.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDODCCAiCgAwIBAgIVAKuyv3oaAeA68eduLXR1T/BYmgCRMA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMTE2ZlZGVyYXRpb24uZXNpZWUuZnIwHhcNMTMwNzIyMTYx
+MjQzWhcNMTYwNzIyMTYxMjQzWjAeMRwwGgYDVQQDExNmZWRlcmF0aW9uLmVzaWVl
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg4im4BqmjCQRPDiM
+lU5aRUcI/IgpMyroXGhOVzLwP1GwvBH8DN1WFlJKNWa1C+RuiY63YTaA6OhIeGBh
+geUzFjXOm8apQ0Ll/TuArQYgt3mRX+TECa37tYz0dtVwfX+tJtQRkT58S05NlNU0
+iUEH/1/2JXSRsEfind9jDTrk4LB9FG89Z6Rhgky2BsoaIu+9bjJVj5f4QoNZ/lkV
+YQDrUhCENq7EctTHoVwLFbJixOSPrdJKtEP2dBFHVuiJpm/EaqSBNYMd79f0ULkR
+2oBN6QDFjkzMZK4TpdgJpurEHCeDmu01cXAz09TNqYz4qWLACWUJ0gedae3u43/8
+kd8mWQIDAQABo20wazBKBgNVHREEQzBBghNmZWRlcmF0aW9uLmVzaWVlLmZyhipo
+dHRwczovL2ZlZGVyYXRpb24uZXNpZWUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFCMSL4g1n6Tu2M2FueYzdebfSG2WMA0GCSqGSIb3DQEBBQUAA4IBAQABYo8u
+VOc3nALTBlfjDgoNV1S3/YcqXsoXnQa+LSTqO7cVtpspFWrBKgbv7uJlRG3Xn0li
+GKDq6wfaD3p9d1sPYo8dsSEfkL5qMphAQs35rFtRiuJnMQZIjVZsMOGuicxwsaiT
+9rGdRhKuRwQj9Rk4A2+NI45ZuZSexGVYFWKWFE3habZ5DEGxHpIMTTCKCOPxxpv7
+VUoaiUNEbmH6WsJ3BuERc66xcCT/kB3oV8QfB+Viu/61/17QI6zfMJcEvG4wwFbi
+cXPVzn3z8dnQlFcgDl+GdXleDdRkMRz9GGCepLb3tW8MGx11hkQ2+P0XiM3rqI83
+lLvxcvJ5CJp7Xtli
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.esiee.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">ESIEE Paris</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ESIEE Paris</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>system@esiee.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.ined.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.ined.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..1f9701bc
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.ined.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.ined.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-26T17:01: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ined.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">INED - Institut National d'Etudes Démographiques</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDNDCCAhygAwIBAgIVALSDfGTkP7KOu8osupywHMFeyFANMA0GCSqGSIb3DQEB
+BQUAMB0xGzAZBgNVBAMTEmZlZGVyYXRpb24uaW5lZC5mcjAeFw0xMzA3MjMxNzE3
+MzJaFw0zMzA3MjMxNzE3MzJaMB0xGzAZBgNVBAMTEmZlZGVyYXRpb24uaW5lZC5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMJG3Cg6FzR6km9GqLst
+gxKkkLLSsfnfncy+/ulDiS5tu3ueqr2c/dwz6o0kn97WrBLLlrFIiYaQPIZp1Lp3
+gA7utUMZeEs3ABn631suaI4ra+sMdrhIKgPBRmXchfPrWEk0QgqIkZhK7vP+yH4Z
+h4Tx+s5aLIDDmsh3tESGaWvP4OEE4oE6lTXS5coGrD1P3LqRLRBmmD/VBur3YDQG
+MfXKthCrBXfSsawSITjqN/HIRZO+75ZcO8L29BGu3jpDZQJOocvzsXEGcf1Yfzro
+BSf3w9wCRkuTpYqgvSqaIjG0BVxlq5S8V9NpVjgmQSiBBTBjDfXEhQnbvARg9o3i
+/2cCAwEAAaNrMGkwSAYDVR0RBEEwP4ISZmVkZXJhdGlvbi5pbmVkLmZyhilodHRw
+czovL2ZlZGVyYXRpb24uaW5lZC5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+H5JcyQ9+maCLgPuzsi40nhRq8hgwDQYJKoZIhvcNAQEFBQADggEBAGtHb3XbAcb0
+bOuPVgifcFmXV7/AnUciKnhZBaMPSt8Q4brCg7+BPzNsGH0k9FGRfH8EHrHLa2qm
+0xqrBf1dEM3v1vq981fLnuks3rmqTrWApPYvxehrAlmtYRexYMv7QXVH06zECBee
+xgHHvFcGJ/JEHRYO8ZFeytl4dQej4tIKxfeW2WUR8zrrfBZNPKvPeN8Y/sHwO8EL
+NbDmdeOfpc1PjxHHbPkJQDLMdAZuMPTYYRdv7+v4s2saF8T3e7kazMNQOW8tQdwL
+i3VOe/mxnZMuPaIV1sWncTmcvo1hUtT89R4DQIimZCyCorKfPM4DNSPp/4KWB8SE
+SCHrArErnq8=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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.ined.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.ined.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.ined.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INED - Institut National d'Etudes Démographiques</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INED - Institut National d'Etudes Démographiques</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Marc Lamouche</md:SurName>
+    <md:EmailAddress>marc.lamouche@ined.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Rainer Kugel</md:SurName>
+    <md:EmailAddress>rainer.kugel@ined.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.sciences-po.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.sciences-po.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..92c17ee1
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.sciences-po.fr-idp-shibboleth.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.sciences-po.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-26T17:55: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciences-po.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciences-po.org</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespo.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Sciences Po 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>
+					      MIIDUDCCAjigAwIBAgIVAPSayRf4eNPJKhqMWVppnJInJ6XeMA0GCSqGSIb3DQEB
+BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24uc2NpZW5jZXMtcG8uZnIwHhcNMDkx
+MTA5MTcwMjM1WhcNMjkxMTA5MTcwMjM1WjAkMSIwIAYDVQQDExlmZWRlcmF0aW9u
+LnNjaWVuY2VzLXBvLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+3uIR9QwANsZZFf0MAGhbhYdMLZRGMijmIN2T/s/dxsQyYDybx7cfQMctEvsWP1NR
+dMEZ6rNR0wD3uyLI3DZUCoezeHkyY/s1vPqeJFIlzoaQvzR5uVm2Is37gqGEDTKs
+/M0tCLiXiTZQkxaOxq+HXypNrhUTw2EkXuhomk8LD6sRdAzaKpxGatqkfwByGUXS
+SkTJqeV0eX5BmC32WPG/vtWqaKUM7H+OjJ/QRQrbfir2znW3Wf4aAAkppJtnvtYY
+ZkUiOjvziKNlbvwI4GyDiDfl5oGvP5JHIzy4vPBCdLW1JBZhnnOnLv7+nca/g9Ke
+RlmoOOR2VGqwkAzmwm+83wIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0aW9u
+LnNjaWVuY2VzLXBvLmZyhjBodHRwczovL2ZlZGVyYXRpb24uc2NpZW5jZXMtcG8u
+ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAFHMcFjXGUqoshwWJhBzgyBC4zL
+MA0GCSqGSIb3DQEBBQUAA4IBAQDKpWas1Dj9IjKV3yYvTDsxGeZ2uFa1WGo5iKdV
++1US2VwADvq7896oRvLDWCpQmh04X6wNee1T6HgHBLsvnFv9PlAjqRmC0likrtet
+mEf2+tD06zwxnJFj8EwwPTRGXKU5z6vq5QUQtKckCfZTf7W+LhBOd3Oi7/GFHyea
+p8xY8/Xkx+nxiEJk5IPN1oboKWe0b7Liy7ZowGCXqRsWcFf41APBmzxvqiXGuTem
+YLbweS7USGQdYgrw8ZYIBgH59pVjdPORwc8c0tCr9jwAavYehWEDd1Hs8S/rma+Q
+juXUI4qWzUOgFDOh1MiSBezPFp1576XseU8Hiw1T7QZIAhgK
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDUDCCAjigAwIBAgIVALYXRzpnlr2ss74It/kPDT1kzxV4MA0GCSqGSIb3DQEB
+BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24uc2NpZW5jZXMtcG8uZnIwHhcNMDkw
+NjE5MDk1MTM3WhcNMjkwNjE5MDk1MTM3WjAkMSIwIAYDVQQDExlmZWRlcmF0aW9u
+LnNjaWVuY2VzLXBvLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+s1g13BW6C5N7THGGpG7yk4HoX1kjbFjPYihbslRlGYSm2zccvivUkf5dENcIqfE6
+qPT3D7uYqvrkeYcELXJ38BiHrtAmuzW3ss9gO/01g+uBjZDaXRguDG3qPz4fgxDl
+SbuahErVw5m7U7l388P/7veoBeaWzFx/eJeTX/hfIHvHa9I0kvnVUfS+D74WQ5vJ
+RjcF4nTL2g2vBQb+aytlC9PHid90ptvG2R9/WPCqz4vwUJVgIgemeJiUsQfOrnj2
+6LkYCg4hd0WAV+fAaH25fE9ggu6iBqJcUfeyQ/mP3pJB00pE6dNjc5QfpXmFA/j7
+jBC9mfHbBQ7KXIjdepwehQIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0aW9u
+LnNjaWVuY2VzLXBvLmZyhjBodHRwczovL2ZlZGVyYXRpb24uc2NpZW5jZXMtcG8u
+ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNuAcsGNTTS7GMoor6NWV6kgG2ys
+MA0GCSqGSIb3DQEBBQUAA4IBAQBJcsldsyHR5MGPmkwziCuf3sM2PwzCa40/Mu3H
+NBbieS8YpQQQNaXsdct1xTCFjkS/gqNRsfd/ngelulZ4xD66h3oVbP1p03t0y3It
+D+x9X+p9S3TCld38H14x51zV3xPRf/fPDQen6bJ5VH7nqg9d7nnuyC1FLDkW6Eql
+HTcgCpmWplZnMsMkTqnvi5davtUgK2IxXvhzhN+pLdPxHELoMN4y4oyxnpRxs3A7
+tKczTo9NPfV3G9zLwdktz35HRkF7mBfBGdZbJYHJZibHALTxeqXtFzkC+FK0R0hM
+RCOmYdr+xspPrnyaTVp1P2oNrHXtLHlWmLvtyoKzr0lGAMA8
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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.sciences-po.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.sciences-po.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.sciences-po.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">sciences-po.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciences-po.org</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespo.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDUDCCAjigAwIBAgIVAPSayRf4eNPJKhqMWVppnJInJ6XeMA0GCSqGSIb3DQEB
+BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24uc2NpZW5jZXMtcG8uZnIwHhcNMDkx
+MTA5MTcwMjM1WhcNMjkxMTA5MTcwMjM1WjAkMSIwIAYDVQQDExlmZWRlcmF0aW9u
+LnNjaWVuY2VzLXBvLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+3uIR9QwANsZZFf0MAGhbhYdMLZRGMijmIN2T/s/dxsQyYDybx7cfQMctEvsWP1NR
+dMEZ6rNR0wD3uyLI3DZUCoezeHkyY/s1vPqeJFIlzoaQvzR5uVm2Is37gqGEDTKs
+/M0tCLiXiTZQkxaOxq+HXypNrhUTw2EkXuhomk8LD6sRdAzaKpxGatqkfwByGUXS
+SkTJqeV0eX5BmC32WPG/vtWqaKUM7H+OjJ/QRQrbfir2znW3Wf4aAAkppJtnvtYY
+ZkUiOjvziKNlbvwI4GyDiDfl5oGvP5JHIzy4vPBCdLW1JBZhnnOnLv7+nca/g9Ke
+RlmoOOR2VGqwkAzmwm+83wIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0aW9u
+LnNjaWVuY2VzLXBvLmZyhjBodHRwczovL2ZlZGVyYXRpb24uc2NpZW5jZXMtcG8u
+ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAFHMcFjXGUqoshwWJhBzgyBC4zL
+MA0GCSqGSIb3DQEBBQUAA4IBAQDKpWas1Dj9IjKV3yYvTDsxGeZ2uFa1WGo5iKdV
++1US2VwADvq7896oRvLDWCpQmh04X6wNee1T6HgHBLsvnFv9PlAjqRmC0likrtet
+mEf2+tD06zwxnJFj8EwwPTRGXKU5z6vq5QUQtKckCfZTf7W+LhBOd3Oi7/GFHyea
+p8xY8/Xkx+nxiEJk5IPN1oboKWe0b7Liy7ZowGCXqRsWcFf41APBmzxvqiXGuTem
+YLbweS7USGQdYgrw8ZYIBgH59pVjdPORwc8c0tCr9jwAavYehWEDd1Hs8S/rma+Q
+juXUI4qWzUOgFDOh1MiSBezPFp1576XseU8Hiw1T7QZIAhgK
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDUDCCAjigAwIBAgIVALYXRzpnlr2ss74It/kPDT1kzxV4MA0GCSqGSIb3DQEB
+BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24uc2NpZW5jZXMtcG8uZnIwHhcNMDkw
+NjE5MDk1MTM3WhcNMjkwNjE5MDk1MTM3WjAkMSIwIAYDVQQDExlmZWRlcmF0aW9u
+LnNjaWVuY2VzLXBvLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+s1g13BW6C5N7THGGpG7yk4HoX1kjbFjPYihbslRlGYSm2zccvivUkf5dENcIqfE6
+qPT3D7uYqvrkeYcELXJ38BiHrtAmuzW3ss9gO/01g+uBjZDaXRguDG3qPz4fgxDl
+SbuahErVw5m7U7l388P/7veoBeaWzFx/eJeTX/hfIHvHa9I0kvnVUfS+D74WQ5vJ
+RjcF4nTL2g2vBQb+aytlC9PHid90ptvG2R9/WPCqz4vwUJVgIgemeJiUsQfOrnj2
+6LkYCg4hd0WAV+fAaH25fE9ggu6iBqJcUfeyQ/mP3pJB00pE6dNjc5QfpXmFA/j7
+jBC9mfHbBQ7KXIjdepwehQIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0aW9u
+LnNjaWVuY2VzLXBvLmZyhjBodHRwczovL2ZlZGVyYXRpb24uc2NpZW5jZXMtcG8u
+ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNuAcsGNTTS7GMoor6NWV6kgG2ys
+MA0GCSqGSIb3DQEBBQUAA4IBAQBJcsldsyHR5MGPmkwziCuf3sM2PwzCa40/Mu3H
+NBbieS8YpQQQNaXsdct1xTCFjkS/gqNRsfd/ngelulZ4xD66h3oVbP1p03t0y3It
+D+x9X+p9S3TCld38H14x51zV3xPRf/fPDQen6bJ5VH7nqg9d7nnuyC1FLDkW6Eql
+HTcgCpmWplZnMsMkTqnvi5davtUgK2IxXvhzhN+pLdPxHELoMN4y4oyxnpRxs3A7
+tKczTo9NPfV3G9zLwdktz35HRkF7mBfBGdZbJYHJZibHALTxeqXtFzkC+FK0R0hM
+RCOmYdr+xspPrnyaTVp1P2oNrHXtLHlWmLvtyoKzr0lGAMA8
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.sciences-po.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">Sciences Po Paris</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sciences Po Paris</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>prs@sciences-po.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.u-pem.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.u-pem.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..3d9223b2
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.u-pem.fr-idp-shibboleth.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.u-pem.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-19T12:09: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-pem.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-mlv.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umlv.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etud.u-pem.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Paris-Est Marne-la-Vallée University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Every university member</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université Paris-Est Marne-la-Vallée</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Tous les membres de l'université</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>
+					      MIIDODCCAiCgAwIBAgIVAM2PTKt1TV1kFUzpXmOV0ZzH5/RrMA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMTE2ZlZGVyYXRpb24udS1wZW0uZnIwHhcNMTQwNTE5MTAw
+NzU0WhcNMzQwNTE5MTAwNzU0WjAeMRwwGgYDVQQDExNmZWRlcmF0aW9uLnUtcGVt
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0t2Ou0usGY1JzkfP
+1fqEphJbvG9dCqmyAy3aWE1udBLfjDtjLLjfHfIafRLkm2OVLwjI/5nbY6krNTXk
+nZNO0L8LJuOLImqfMluR75jWUWAJQsXrbJ+hOmsmt2nDfVGIRvkO8E59+vnsOZW4
+mYn+S1qbOxfy+FCff4zrqP6vij73UffoFYwrxg07q8jQP9Dhie/6nRKQtoXfDRwu
+hN7KJVuwBAT8OB1to1td7ETcFHrV3TBdCiykYQONpIQcbc3BJDHjSndn5TZtwmBr
+KoWVe7+FAdoASTriJPUgPSapdnsJS31nQaKwOPxcfqzobysb3FHRZ3c9e+k9s2lj
+pl1qwQIDAQABo20wazBKBgNVHREEQzBBghNmZWRlcmF0aW9uLnUtcGVtLmZyhipo
+dHRwczovL2ZlZGVyYXRpb24udS1wZW0uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFKsWCrm5woMmq5whBpJxFE7z3oSdMA0GCSqGSIb3DQEBBQUAA4IBAQA0yHMD
+eBNRPmppFMlR71VZ+30TVxMBE6asRnn/69Ni/cYRxr+7EEVUgMzzxJfT2gwtkocg
+YkZR6nCR+KJmfk3KwR6CFfKV/eLuVA883x8j7tqY4YHmHn7RInFdibHwF6Ka58P7
+zwdoCWFvLZjFjaAWERxqGGjIZex/3FhxtgKEN4rWtUqlRNwhCMJP2ee4BIY84dTK
+rw154uC2Ng7lchO5gbMyUTxxVWX0K/oqpKW4nvpbsj2kkZI5rFSt5FRC/kVwkWJK
+9UTDRWo5w/HbzA8JVAnU0vwax0/E2nDrYSu1pbGOb0F97H+UBSWBMaBqZHoJLkEi
+wDJ2bH/IB8MKNLHT
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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.u-pem.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.u-pem.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.u-pem.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université Paris-Est Marne-la-Vallée</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université Paris-Est Marne-la-Vallée</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>adm-federation@u-pem.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.umcg.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federation.umcg.nl-adfs-services-trust.xml
new file mode 100644
index 00000000..9a7d5512
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.umcg.nl-adfs-services-trust.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federation.umcg.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-12-05T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</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">umcg.nl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">UMC Groningen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">UMC Groningen</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">UMCG</mdui:Description>
+        <mdui:Description xml:lang="en">UMCG</mdui:Description>
+        <mdui:Logo height="264" width="500">https://static.surfconext.nl/media/sp/UMCGkort_fc.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">UMC Groningen UMCG</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">UMCG UMC Groningen</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/32171f5a7a012631cb41c6824947cf99"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">UMC Groningen</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">UMC Groningen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">UMC Groningen</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">UMC Groningen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.umcg.nl</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.umcg.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:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..178f4305
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.unimes.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-09-07T13:55: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimes.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Nimes</mdui:DisplayName>
+        <mdui:Description xml:lang="en">All members of the UNIMES community: staff, students, library readers, alumni, staff from other institutions working locally, guests, etc.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université de Nimes</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Tous les membres de la communauté UNIMES : personnels, étudiants, lecteurs des bibliothèques, anciens étudiants, personnels d'autres établissement saillant 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>
+					      MIIEdTCCA12gAwIBAgIQA+x4/gpIpc75aHTaD2HjdjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTAyMzAwMDAwMFoXDTE1MTIwOTIzNTk1OVowTDELMAkGA1UE
+BhMCRlIxHjAcBgNVBAoMFVVuaXZlcnNpdMOpIGRlIE7Drm1lczEdMBsGA1UEAxMU
+ZmVkZXJhdGlvbi51bmltZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDfE7PieWyEg8LeR53J/lE/B59bPXfHLEO+uLd3OBC8jTGkIRWvaqPgM1Gk
+lCzK/efmA1s11KncwGOTvJJJPeWFAOisznFMbNfhI1tPSYDIxlULXQBEnTCy9eUm
+JV2zo3MvCVFw1vJPXgyA7m4KsMu39meUuhK6emBfv0vz1Kh8eABMDR/c945d0TXP
+XCizQ9I3SyU/zVJ18XcaniaZ777mjNaNmT3ZJhqj85cSRQNBH1nAT4/GeLUMuyv1
+5ymGq0ytEhp8QKcWfwRvU5InOQlG17R8z7BxXtJbuvuaG7kk7UO8TJ4bHNU+14T9
+EqCKaalydIILjRBNfwe8fZ6b+ohvAgMBAAGjggFnMIIBYzAfBgNVHSMEGDAWgBQM
+vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU720AGcrCuWMx7XX5CLNo5qGm
+JyswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
+BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZmVkZXJhdGlvbi51bmlt
+ZXMuZnIwDQYJKoZIhvcNAQEFBQADggEBAJJRjU+uJplLJdi4qKubLFQv61lnWLMg
+w3IbQ2icm7u9dEUNIY2nXj8a2nBn6svWzNyPlvipHhEbj/KWkQPwmEIQWSBXz8aK
+cRG0kNEqEvrpkLVFakNWzm/T6pEh6VhRiu85LMQeMHo2zrFGOo92b/OY9NGq+nyX
+8kDchVM7wj/JlMU57UuZ7hCRsE/T+GgghBgCoU1u9Way8ker6s6DvPv38jgOT7/P
+cMz63qOCn2FWBpvJL1ykjw+vu4cL8NXdo51ZgYG+03hcb3lBFv5f3Y2y7Pitgy+K
+R2jCO9a/ZWDePkmPnf1zmgyJ+twxhYqPwTbGDoNozxNNLsXQLOPNSaU=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEpDCCA4ygAwIBAgIQL1M6BUXb9ey/N5UwsW6q8zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTA5MTExOTAwMDAwMFoXDTEyMTExODIzNTk1OVowezELMAkGA1UE
+BhMCRlIxDzANBgNVBAcMBk7Drm1lczEeMBwGA1UECgwVVW5pdmVyc2l0w6kgZGUg
+TsOubWVzMRwwGgYDVQQLExN1bml2ZXJzaXRlIGRlIG5pbWVzMR0wGwYDVQQDExRm
+ZWRlcmF0aW9uLnVuaW1lcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBANHvYAl0+rpik/m50vPpeormI0yeYWtu37gDW9P159zOraMiKjfTBU3r5Oe6
+PUa4jVWXfDuAO97LWdUMX4m1cTRO/v20JYPeSEVVJSOULzazC/kV9W7wPJRqONkt
+btJr7a0VgbGR1ZVVEJ3sZggLafUVT09n0YLhMMwdRPDpsD7iE7tdBQuEc7AlpLS0
+XWHx4P+6vDdIwyhFIJt8nyVkTs+JkZ+troK8wkYgW/l4bktrajcwQjOHiisdk4ZP
+WxRiNEcAdWcH4qp86pi6fG2YXy1deYnMtOIz5xyTTVwcl/7xCpWEnj1hbR2x7wRX
+twgfqAH95T0PhwuioSaj35DShFMCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9
+k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTBXcQRRBdoAv1nWM2OU71HTFaZ
+xjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
+BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzAfBgNVHREEGDAWghRmZWRlcmF0aW9uLnVuaW1l
+cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAQi35VtjG2PEd7o4yAWU6acXgddghxls2
+2kqlN7KcFl6PpQ2lpHfUHVmncTmafoQEHmlgjFscWYgagRb1UQZ4pmquoEfr2v8Y
+0Fox/MQHIUV4xCPyRSIiSGOHAI62rG3HOrV2ha6LusjaJPNdNaetCgX+XJFFNKMm
+dnUIrUnxSsaMhx/zACINKnb09Ob2AGDz5KgFvq8V0IRcl09d/qWLE61m/wvIZfaF
+VTP5+9UA1RfGxEIOG3zA4D309fxapoVnb84yM9eRNgtw6hZrzDyZfNWQ1VkSVrFO
+xqaW8/4VYHjxNTVZ2KxsKKVL1ykc/9Gk5YAITiyKeWFjYhP17R9+Cw==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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.unimes.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.unimes.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.unimes.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">unimes.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEdTCCA12gAwIBAgIQA+x4/gpIpc75aHTaD2HjdjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTAyMzAwMDAwMFoXDTE1MTIwOTIzNTk1OVowTDELMAkGA1UE
+BhMCRlIxHjAcBgNVBAoMFVVuaXZlcnNpdMOpIGRlIE7Drm1lczEdMBsGA1UEAxMU
+ZmVkZXJhdGlvbi51bmltZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDfE7PieWyEg8LeR53J/lE/B59bPXfHLEO+uLd3OBC8jTGkIRWvaqPgM1Gk
+lCzK/efmA1s11KncwGOTvJJJPeWFAOisznFMbNfhI1tPSYDIxlULXQBEnTCy9eUm
+JV2zo3MvCVFw1vJPXgyA7m4KsMu39meUuhK6emBfv0vz1Kh8eABMDR/c945d0TXP
+XCizQ9I3SyU/zVJ18XcaniaZ777mjNaNmT3ZJhqj85cSRQNBH1nAT4/GeLUMuyv1
+5ymGq0ytEhp8QKcWfwRvU5InOQlG17R8z7BxXtJbuvuaG7kk7UO8TJ4bHNU+14T9
+EqCKaalydIILjRBNfwe8fZ6b+ohvAgMBAAGjggFnMIIBYzAfBgNVHSMEGDAWgBQM
+vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU720AGcrCuWMx7XX5CLNo5qGm
+JyswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
+BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZmVkZXJhdGlvbi51bmlt
+ZXMuZnIwDQYJKoZIhvcNAQEFBQADggEBAJJRjU+uJplLJdi4qKubLFQv61lnWLMg
+w3IbQ2icm7u9dEUNIY2nXj8a2nBn6svWzNyPlvipHhEbj/KWkQPwmEIQWSBXz8aK
+cRG0kNEqEvrpkLVFakNWzm/T6pEh6VhRiu85LMQeMHo2zrFGOo92b/OY9NGq+nyX
+8kDchVM7wj/JlMU57UuZ7hCRsE/T+GgghBgCoU1u9Way8ker6s6DvPv38jgOT7/P
+cMz63qOCn2FWBpvJL1ykjw+vu4cL8NXdo51ZgYG+03hcb3lBFv5f3Y2y7Pitgy+K
+R2jCO9a/ZWDePkmPnf1zmgyJ+twxhYqPwTbGDoNozxNNLsXQLOPNSaU=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEpDCCA4ygAwIBAgIQL1M6BUXb9ey/N5UwsW6q8zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTA5MTExOTAwMDAwMFoXDTEyMTExODIzNTk1OVowezELMAkGA1UE
+BhMCRlIxDzANBgNVBAcMBk7Drm1lczEeMBwGA1UECgwVVW5pdmVyc2l0w6kgZGUg
+TsOubWVzMRwwGgYDVQQLExN1bml2ZXJzaXRlIGRlIG5pbWVzMR0wGwYDVQQDExRm
+ZWRlcmF0aW9uLnVuaW1lcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBANHvYAl0+rpik/m50vPpeormI0yeYWtu37gDW9P159zOraMiKjfTBU3r5Oe6
+PUa4jVWXfDuAO97LWdUMX4m1cTRO/v20JYPeSEVVJSOULzazC/kV9W7wPJRqONkt
+btJr7a0VgbGR1ZVVEJ3sZggLafUVT09n0YLhMMwdRPDpsD7iE7tdBQuEc7AlpLS0
+XWHx4P+6vDdIwyhFIJt8nyVkTs+JkZ+troK8wkYgW/l4bktrajcwQjOHiisdk4ZP
+WxRiNEcAdWcH4qp86pi6fG2YXy1deYnMtOIz5xyTTVwcl/7xCpWEnj1hbR2x7wRX
+twgfqAH95T0PhwuioSaj35DShFMCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9
+k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTBXcQRRBdoAv1nWM2OU71HTFaZ
+xjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
+BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzAfBgNVHREEGDAWghRmZWRlcmF0aW9uLnVuaW1l
+cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAQi35VtjG2PEd7o4yAWU6acXgddghxls2
+2kqlN7KcFl6PpQ2lpHfUHVmncTmafoQEHmlgjFscWYgagRb1UQZ4pmquoEfr2v8Y
+0Fox/MQHIUV4xCPyRSIiSGOHAI62rG3HOrV2ha6LusjaJPNdNaetCgX+XJFFNKMm
+dnUIrUnxSsaMhx/zACINKnb09Ob2AGDz5KgFvq8V0IRcl09d/qWLE61m/wvIZfaF
+VTP5+9UA1RfGxEIOG3zA4D309fxapoVnb84yM9eRNgtw6hZrzDyZfNWQ1VkSVrFO
+xqaW8/4VYHjxNTVZ2KxsKKVL1ykc/9Gk5YAITiyKeWFjYhP17R9+Cw==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.unimes.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 Nimes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Nimes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>reseaux@unimes.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.upf.pf-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.upf.pf-idp-shibboleth.xml
new file mode 100644
index 00000000..700a5a53
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.upf.pf-idp-shibboleth.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.upf.pf/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-05-31T22:29: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upf.pf</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of French Polynesia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Employee, Student</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université de Polynésie française</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels, 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>
+					      MIIDLzCCAhegAwIBAgIUFC0XwDnBlYK71GiAUaF7vx7MRXIwDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRZmVkZXJhdGlvbi51cGYucGYwHhcNMTMwNDE4MDI1NjA5
+WhcNMzMwNDE4MDI1NjA5WjAcMRowGAYDVQQDExFmZWRlcmF0aW9uLnVwZi5wZjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMKdTj5nsNnLZKNJKeb8m9lf
+eGVP3AjbhAJo0Fc0KjE3mFUUOc8ScnvT5ms3tD3fvY4OM57ysI+6fXIfqks+K3fU
+p6dbTUUA7EayO/AXEeEZIYmGobqhFbf/+HL+XbaNj6Fu66otgU83ENyz9hWKsd7L
+UoKc/IpYYb5lxRiZObLsD3cZLkQUdaEKmVqBnsl4QBRFgqbbujg9+b9yGc7S6tWt
+tiz0VU9mmDzYz7RvUg3rlxrt/XHTdv9pyNIBfXyWbHwBl20x9RLWantPh5B/gzMg
+NG9Gsxrg2s6jOJkWExAaJui9udv6ZG4Om006MXimSQQJQjefxaFf5tMPkohQuQMC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRZmVkZXJhdGlvbi51cGYucGaGKGh0dHBzOi8v
+ZmVkZXJhdGlvbi51cGYucGYvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFErV+rWb
+dP0OnShtmHsMw4ScsryqMA0GCSqGSIb3DQEBBQUAA4IBAQCQtbM/X3jSinJzQ/iM
+GssEbM/bT5sysN1Y1rsSXCn/Voy27ikk5WN5dbfWZZ1KIYnZtFvJwk3JUUpAXvYS
+TjDkoYhatlfdXSR0ZDJUrtGeo+Rpf8s4Y1UX6EuiywKKU/rxUaGs5m4sG94Xixys
++/WSNcRFx+Oub984KlUVGNJdFsW4QJhLm0SIlzhn1XmHyF8Zk6111bBBVXVGqO7r
+bA2FN5TC8+oLwbU4vngFuLBu3cNt0xDE5C3760iVBLU++kah8FBjAZQsK0dnXyM3
+Jlfc1EsNYvnxkLXlrcZIC5yU8s+4ht45VLUahR9HNHB+sCw9hGlcbV3QigKTlJav
+pbip
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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.upf.pf/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.upf.pf/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.upf.pf/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Polynésie française</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Polynésie française</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>dsi@upf.pf</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.utbm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.utbm.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..74d33cbd
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.utbm.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.utbm.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-13T13:48: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utbm.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Technologie de Belfort-Montbéliard</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDMzCCAhugAwIBAgIUb4XRw/k+kZc+WFwzq1F9FsvDbwEwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSZmVkZXJhdGlvbi51dGJtLmZyMB4XDTEyMDcxMjEyNDEw
+NFoXDTMyMDcxMjEyNDEwNFowHTEbMBkGA1UEAxMSZmVkZXJhdGlvbi51dGJtLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApR6JQmSaezaESAFmv21B
+sXk5DXZmezdLDuKlPjQJp68eOc/1MDaS+b0UCQzjW9CJGNKRGecNkts0EYlnS+fd
+9I3hukKCpKbQB+fzqyLfEbOktQ8HeSXCOVuZqbKyWn/tAeqRXPWa60j6aouZHGcs
+QsCxdN4A5H3m3BxRBUKZWl9YPhshoYS0X5s1cN3ryEM0F178F4Dx/d7wJSxjcqYp
+TkmwYOYLrDxIG34/12JrWhheephvSV6KHGqylZGm8PieeU/dMfYoqlPDygx3lLmG
+WYJ4czikUXYXutSxa9sx1YqjslDNjN/opVnL5ej/H7L0I6XaBuxvZ7EY8Ez5l8gW
+EwIDAQABo2swaTBIBgNVHREEQTA/ghJmZWRlcmF0aW9uLnV0Ym0uZnKGKWh0dHBz
+Oi8vZmVkZXJhdGlvbi51dGJtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRn
+KDMEILCZOOzXatLQKA9dtx9RMzANBgkqhkiG9w0BAQUFAAOCAQEAAxvjTcRA2lsE
+MdepN1Pw8qgKgIVT8ptE7xspkSp3vbiMbFB6WUCBbmo9OGRXz/ml034OqIEmtOQA
+HD4bLKWak9FlZmvtKisClNpFUblWcHHCdEkw6gHNj+GEuLSREVDiXlyuPMiHIiM/
+NBS2NevXTCRtrWWYtLsy/8/9DIqp5wl+Tw4KhYzbnmAp1HXijhjQTlEU9so74g9M
+p1/I8t00rET4cbu2OgNnsnJsJ7eYlxs2/7r7ym92Brq94Cq+DqlVo6lAsnumtDFY
+pWS70X7hmXF+uwJn5EAqK6m4fQdJouyaQD1Eyosj5vYiQG02H8/+HE+FTthzgvq7
+DM8klPBfXg==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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.utbm.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.utbm.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.utbm.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Technologie de Belfort-Montbéliard</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Technologie de Belfort-Montbéliard</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Arnaud Sinteff</md:SurName>
+    <md:EmailAddress>arnaud.sinteff@utbm.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Dominique Dal Ponte</md:SurName>
+    <md:EmailAddress>dominique.dalponte@utbm.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation2.univ-brest.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation2.univ-brest.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..5a69fd79
--- /dev/null
+++ b/swamid-interfederations-2.0/federation2.univ-brest.fr-idp-shibboleth.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation2.univ-brest.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-26T15:36: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-brest.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Bretagne Occidentale</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDTzCCAjegAwIBAgIUbLNw35nuqDWZoyy6h3P4LlkzPIAwDQYJKoZIhvcNAQEF
+BQAwJDEiMCAGA1UEAxMZZmVkZXJhdGlvbjIudW5pdi1icmVzdC5mcjAeFw0xMzAz
+MTIyMTE1MDVaFw0zMzAzMTIyMTE1MDVaMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24y
+LnVuaXYtYnJlc3QuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe
+kMm2n9YaUsOi8wAXfTnfE7/jehc3Mnc5UP4iR2A9mTF6fZc025FTK/O5O3lEowUh
+FCT8cD2sYjRm+hX+G8qqKDM6zPkvq2IOB5T9WxOMi/M7oaXrhnDUieoc0Bf72R9W
+Q/yBigsLVTCCxFP/qf6lsqpgtaZgQXm9Js4AuHKvcrxoZgJvmwH7r8ON0uJrP2rJ
+fUEgNYsCYx/R3yogLteMYKS01YUSmL0Q6rVUyZRC3VmU8bWJENBNkKhdUfP4dW0w
+eXR6heUDqvoP3xJzpsH0o6bGXYa684T3rbWWt0Kpc1mQVsmTWsxwZMaSrMiPH9OW
+W0J8sZuQjLzex1XcuAjVAgMBAAGjeTB3MFYGA1UdEQRPME2CGWZlZGVyYXRpb24y
+LnVuaXYtYnJlc3QuZnKGMGh0dHBzOi8vZmVkZXJhdGlvbjIudW5pdi1icmVzdC5m
+ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUOemOV1cIWomxjeTIq5jtpWN1HEow
+DQYJKoZIhvcNAQEFBQADggEBAD/ZBa+xOskPywe5pYfAusdeil2y0z7Nhse5HcnJ
+Odjkk3n1qeYUE7agiStMzh2i2I4VY2WM5/vmhodmdIn4hYcDpWz8PSj+uLcVBcQO
+czrADiucBs72+PSEYiaOjrEQZOkLuyszWEWLkwID6n8e4nbJoK2NNf5ujIqm9C2s
+2RHyJVXxVHUczOR/0hnZtc2fyrRY5281u6Caenoxgoed88E4ua7FSnzjZnnBb0+T
+YvneR/KwwVHLp54Fg5QDQlLHbcDX3O+H59/Jmi2dRUgl7+SdCyug2APyBTWvNI6K
+V6haQaNennUWPfKNVUx9kRADhvU84XK1fH8ynIIBY7o3zIg=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDTzCCAjegAwIBAgIUcGVhc58lBOziviLuEFA04RVPhjAwDQYJKoZIhvcNAQEF
+BQAwJDEiMCAGA1UEAxMZZmVkZXJhdGlvbjIudW5pdi1icmVzdC5mcjAeFw0wOTAy
+MDUxMTUxNDFaFw0yOTAyMDUxMTUxNDFaMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24y
+LnVuaXYtYnJlc3QuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCW
+RzPe3Vq2lpziOaEyUzKIEfjZXr23PfYVy/rwvT64y+Zk+eKNvgjWHMpSqbuX7nqx
+/2q5G/mox/pk1xaG0iZlsVu97qoUlSJ+POQCp8dAIJNKYpP/vFGUW1RTdE9vzACT
+U8NRNgZz1Df1e/SwwDUyFOfU58xEgsSUhgxc1skKCvJSpkTH8aDavnVvbKGv08Dr
+cjvKakemcoPeil5fV40/REHDGHHLtFgE/k8wHIvtRxw+UZ3qF/Pwss1Yvszph5aU
+b2f/nP9KL6cCIwomwrJYZcQ/llP+ksuwjum6m0V/H0wQYL+EkebIFh1M055RdpAP
+ilBFaCiL5geQo0RSBrqhAgMBAAGjeTB3MFYGA1UdEQRPME2CGWZlZGVyYXRpb24y
+LnVuaXYtYnJlc3QuZnKGMGh0dHBzOi8vZmVkZXJhdGlvbjIudW5pdi1icmVzdC5m
+ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbnsYQCi+qnK7dB3sTYe7ArIKwlQw
+DQYJKoZIhvcNAQEFBQADggEBAIHQBrg0VjCQ1ApOWOBpOVDujQHG7/+oazQ/kJWA
+YxWZCLCzg5yW74ut1rxxwYlSN/c3ZYU5paZRUeok61SiCNs0ggzqEy6pYt4yJqCu
+gdmhUHokWFzxzReL34u+XCXzZjd/g52B3DDvHU8OLKzOqc7EXppiuFLh2hRjffjX
+XIZgjVVgHmtDcih29YmV+LcRlQrHpze8o976ovyXcM/katGaUei8OHAy8LJh7cvu
+9Xvuti2J+axxQXdzeUa4KIQ8Gi7EUEEwQ5PVGE/T0AP/fSWlCHuQWk+y9wESI1NL
+dZkkc0h92MuezOhzNpM1FfXU/7Zb8eYTeQZbOUQhqiLTogg=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation2.univ-brest.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation2.univ-brest.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation2.univ-brest.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-brest.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDTzCCAjegAwIBAgIUbLNw35nuqDWZoyy6h3P4LlkzPIAwDQYJKoZIhvcNAQEF
+BQAwJDEiMCAGA1UEAxMZZmVkZXJhdGlvbjIudW5pdi1icmVzdC5mcjAeFw0xMzAz
+MTIyMTE1MDVaFw0zMzAzMTIyMTE1MDVaMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24y
+LnVuaXYtYnJlc3QuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe
+kMm2n9YaUsOi8wAXfTnfE7/jehc3Mnc5UP4iR2A9mTF6fZc025FTK/O5O3lEowUh
+FCT8cD2sYjRm+hX+G8qqKDM6zPkvq2IOB5T9WxOMi/M7oaXrhnDUieoc0Bf72R9W
+Q/yBigsLVTCCxFP/qf6lsqpgtaZgQXm9Js4AuHKvcrxoZgJvmwH7r8ON0uJrP2rJ
+fUEgNYsCYx/R3yogLteMYKS01YUSmL0Q6rVUyZRC3VmU8bWJENBNkKhdUfP4dW0w
+eXR6heUDqvoP3xJzpsH0o6bGXYa684T3rbWWt0Kpc1mQVsmTWsxwZMaSrMiPH9OW
+W0J8sZuQjLzex1XcuAjVAgMBAAGjeTB3MFYGA1UdEQRPME2CGWZlZGVyYXRpb24y
+LnVuaXYtYnJlc3QuZnKGMGh0dHBzOi8vZmVkZXJhdGlvbjIudW5pdi1icmVzdC5m
+ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUOemOV1cIWomxjeTIq5jtpWN1HEow
+DQYJKoZIhvcNAQEFBQADggEBAD/ZBa+xOskPywe5pYfAusdeil2y0z7Nhse5HcnJ
+Odjkk3n1qeYUE7agiStMzh2i2I4VY2WM5/vmhodmdIn4hYcDpWz8PSj+uLcVBcQO
+czrADiucBs72+PSEYiaOjrEQZOkLuyszWEWLkwID6n8e4nbJoK2NNf5ujIqm9C2s
+2RHyJVXxVHUczOR/0hnZtc2fyrRY5281u6Caenoxgoed88E4ua7FSnzjZnnBb0+T
+YvneR/KwwVHLp54Fg5QDQlLHbcDX3O+H59/Jmi2dRUgl7+SdCyug2APyBTWvNI6K
+V6haQaNennUWPfKNVUx9kRADhvU84XK1fH8ynIIBY7o3zIg=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDTzCCAjegAwIBAgIUcGVhc58lBOziviLuEFA04RVPhjAwDQYJKoZIhvcNAQEF
+BQAwJDEiMCAGA1UEAxMZZmVkZXJhdGlvbjIudW5pdi1icmVzdC5mcjAeFw0wOTAy
+MDUxMTUxNDFaFw0yOTAyMDUxMTUxNDFaMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24y
+LnVuaXYtYnJlc3QuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCW
+RzPe3Vq2lpziOaEyUzKIEfjZXr23PfYVy/rwvT64y+Zk+eKNvgjWHMpSqbuX7nqx
+/2q5G/mox/pk1xaG0iZlsVu97qoUlSJ+POQCp8dAIJNKYpP/vFGUW1RTdE9vzACT
+U8NRNgZz1Df1e/SwwDUyFOfU58xEgsSUhgxc1skKCvJSpkTH8aDavnVvbKGv08Dr
+cjvKakemcoPeil5fV40/REHDGHHLtFgE/k8wHIvtRxw+UZ3qF/Pwss1Yvszph5aU
+b2f/nP9KL6cCIwomwrJYZcQ/llP+ksuwjum6m0V/H0wQYL+EkebIFh1M055RdpAP
+ilBFaCiL5geQo0RSBrqhAgMBAAGjeTB3MFYGA1UdEQRPME2CGWZlZGVyYXRpb24y
+LnVuaXYtYnJlc3QuZnKGMGh0dHBzOi8vZmVkZXJhdGlvbjIudW5pdi1icmVzdC5m
+ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbnsYQCi+qnK7dB3sTYe7ArIKwlQw
+DQYJKoZIhvcNAQEFBQADggEBAIHQBrg0VjCQ1ApOWOBpOVDujQHG7/+oazQ/kJWA
+YxWZCLCzg5yW74ut1rxxwYlSN/c3ZYU5paZRUeok61SiCNs0ggzqEy6pYt4yJqCu
+gdmhUHokWFzxzReL34u+XCXzZjd/g52B3DDvHU8OLKzOqc7EXppiuFLh2hRjffjX
+XIZgjVVgHmtDcih29YmV+LcRlQrHpze8o976ovyXcM/katGaUei8OHAy8LJh7cvu
+9Xvuti2J+axxQXdzeUa4KIQ8Gi7EUEEwQ5PVGE/T0AP/fSWlCHuQWk+y9wESI1NL
+dZkkc0h92MuezOhzNpM1FfXU/7Zb8eYTeQZbOUQhqiLTogg=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation2.univ-brest.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 Bretagne Occidentale</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Bretagne Occidentale</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>federation@univ-brest.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation2.univ-perp.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation2.univ-perp.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..8732c176
--- /dev/null
+++ b/swamid-interfederations-2.0/federation2.univ-perp.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation2.univ-perp.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-31T09:00: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-perp.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Perpignan Via Domitia</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDSzCCAjOgAwIBAgIULLAo5s+4ROzy5UZMrAIGbK8dOywwDQYJKoZIhvcNAQEF
+BQAwIzEhMB8GA1UEAxMYZmVkZXJhdGlvbjIudW5pdi1wZXJwLmZyMB4XDTEwMDYw
+NzE1NDAxMFoXDTMwMDYwNzE1NDAxMFowIzEhMB8GA1UEAxMYZmVkZXJhdGlvbjIu
+dW5pdi1wZXJwLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Q5K
+a1AqPThLeQFDdXi+ebPZnmmv5LdDpm+wEUmZYEK+gPyKwsnCOqueO4bf1YJHWRMq
+8hOi16t3RzW85OTuFbkTNfoTSC94Mmq1xM9OiYwYdEhzkSE17k7gngrJhBD/g5gd
+nCENIs1cPJrmuZOPUstg3CDKC10hBHN8p2cBcpqAkbSJJfSWpJus/6mwpL8aC/Sy
+P48MZFkOGfonwtZApKq5LogC9FdA3D+iUK2gX6Gmx87VVdblMz4gy1bMExGlpJh1
+sLZXzFH6lytiwEki3TQ+FVeARP9YEuMjO/MmlsdyTQ59X+InZRneSw+AX707wwbs
+CMeQn65kV9+25CostQIDAQABo3cwdTBUBgNVHREETTBLghhmZWRlcmF0aW9uMi51
+bml2LXBlcnAuZnKGL2h0dHBzOi8vZmVkZXJhdGlvbjIudW5pdi1wZXJwLmZyL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBR+rUoTfBcWEnKttfZNC2Ij1kszCDANBgkq
+hkiG9w0BAQUFAAOCAQEAhaevpVw7aySNgUnq2UphJVWGJCnewO9dFjK2puynLYYS
+0N4Kml/TwsPMMqxWYYM59QKnExmXxQiEqaXARBMwGxAFsvIMbhoreXuVCkBPuGNM
+ROvYP6oKNTBWLFZim/NFM0I50TUdhxI9dVgzJfysQZAQ3OAf0u8yBWt8ECqjIAPj
+cK8jIB+jY0Y2xRYsOyjG2ITF7C8QZRl1/N0xLSINbHzPNHZMvxBdJKhiXXbnOYnz
+fBD7fiQYaQ/ngsB/aj4MOLHzcFDOyxUXTf5iO7tXX+zioMpLZ4TWPz4VQRoh9V6X
+GRhvA308h9KMK3qNV6NKcFJeTNJP1BepoG51kFLhSw==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation2.univ-perp.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation2.univ-perp.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation2.univ-perp.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Perpignan Via Domitia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Perpignan Via Domitia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>federation@univ-perp.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federationrenater.univ-montp2.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federationrenater.univ-montp2.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..03350901
--- /dev/null
+++ b/swamid-interfederations-2.0/federationrenater.univ-montp2.fr-idp-shibboleth.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federationrenater.univ-montp2.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-02T16:09: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp2.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Montpellier 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>
+					      MIIDbTCCAlWgAwIBAgIUd7qthRFKphaqjAKa3OfPkTgoQCgwDQYJKoZIhvcNAQEF
+BQAwKzEpMCcGA1UEAxMgZmVkZXJhdGlvbnJlbmF0ZXIudW5pdi1tb250cDIuZnIw
+HhcNMDkwMTI5MTYwOTI1WhcNMjkwMTI5MTYwOTI1WjArMSkwJwYDVQQDEyBmZWRl
+cmF0aW9ucmVuYXRlci51bml2LW1vbnRwMi5mcjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKbCEkUY6PCN5cAR9Xm2tLH78tkAas47YTI8ExEkF7VBiusg
+I+xopi8kCGN3wXufANOyfHI3zsphl3eLlwhdsF6c+IbegBywKSnDfMimvB3YWFbh
+jYOMOZOiFEphCdB2p6hvIKk+YFXH0m4KT1DVHMSzX8CwvXJ2am9lyI6wQdYShFdM
+zlDIqtQJR48n6HUlDQnWwq9jXxS/rXOOUzIe6w53cG6/mNMutXBoGfMVNSIoNSEC
+NHBD9RSwTJ5bzv2S2wiBjnCOj5vOpfysZ+duZgEGWM8JNpapB6M4YLoPr3OhcU+e
+pRahD0suZZUqU0R14hMJgEh2phxXF5pttQM0dwkCAwEAAaOBiDCBhTBkBgNVHREE
+XTBbgiBmZWRlcmF0aW9ucmVuYXRlci51bml2LW1vbnRwMi5mcoY3aHR0cHM6Ly9m
+ZWRlcmF0aW9ucmVuYXRlci51bml2LW1vbnRwMi5mci9pZHAvc2hpYmJvbGV0aDAd
+BgNVHQ4EFgQUWzhOl/tjSF/4azXQikbyjjVrPMEwDQYJKoZIhvcNAQEFBQADggEB
+AB4ts6C72K9/Wi1Tq91wHJdE83rJrfNpAVyZ1qKUSx6Okrkjga2keVBHSBXuNdfr
+eYkjMNbj2xLbX+BxKRxMgUnBjmaAdfOrOJFgsN/cqc3TEYo8BQZ7MiCOvzJWAgPV
+9TVhrm5qRx8AICoXee0NenuxWoSKYzH2pv4VIkGM0IIRVkDrkOxbxTQCk3Y0yUZ4
+iPn+hAxA9eFoYosSr16IJsBRCYiS0Rdr61YUCLgqf87nhWMbpKz5aPc3S0s0SEqa
+do3SW6CiYjzJ2ZYrYdmDzP0OuN/ZZK9gzH2hyOFaKlDJRKQtkdZ7RKb2tik/PPD6
+cHXXZfLohck3GRQ/MJmd5x4=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federationrenater.univ-montp2.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federationrenater.univ-montp2.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federationrenater.univ-montp2.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Montpellier 2</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Montpellier 2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Loïc Bonavent</md:SurName>
+    <md:EmailAddress>loic.bonavent@univ-montp2.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Nicolas Arles</md:SurName>
+    <md:EmailAddress>nicolas.arles@univ-montp2.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fid.mnhn.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/fid.mnhn.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..4e20c908
--- /dev/null
+++ b/swamid-interfederations-2.0/fid.mnhn.fr-idp-shibboleth.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fid.mnhn.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-12-31T13:57: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mnhn.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Muséum National d'Histoire Naturelle (MNHN)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Research and students</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Muséum National d'Histoire Naturelle (MNHN)</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Les chercheurs 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>
+					      MIIDFzCCAf+gAwIBAgIUDlRdBDkJESYW6n2HShweS3jdr8swDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAwwLZmlkLm1uaG4uZnIwHhcNMTQxMjAxMTQxMzEzWhcNMzQx
+MjAxMTQxMzEzWjAWMRQwEgYDVQQDDAtmaWQubW5obi5mcjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALaoJeXjuTBCZdOtdlxs0/5ZHzxjTJP9zOtAYQOe
+6enHOV4diw5kEQRW0P8vB18yO3GkdzfUBMizbF6Q7wzh2QIYY9AZq4eWn858qyy2
+Wgzi06c3vox3pcnJMoMTTxe87kSXUwEjDdGFqpkzyEXKHLBJHvUllq7UOhT8EJeb
+q1lFoQk+P5XXoiaqFT3djyqVYgBqNf6M1KPTgK8YpaziAeXqGPLIya9wQNSXw7SX
+k933EOXd61SxxBDMIgpnU4eZH0OqtcsWEz2+iMT2DTRBGkFg4Sw9YfjZwKrQceao
+EtebvucPR1l65WtHkbBEgn1j1Kn/A0VuWnpLkfEWtjgwoD8CAwEAAaNdMFswHQYD
+VR0OBBYEFC3y0NSAMWWxMPbIbU6jPAUNjsvBMDoGA1UdEQQzMDGCC2ZpZC5tbmhu
+LmZyhiJodHRwczovL2ZpZC5tbmhuLmZyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBBQUAA4IBAQArN80LjEyavMOC3fqbILBkByDBaMyfx0G0Tar+v38pa+Yw3PUO
+H9KJlucttn9gauL4T6KK0lpY54D+mldhmQMuGjWuP9/L3kbysU1/rQ+iTK6K3Va5
+dmnqSXiMZpMroaV9yoAiM4v1KfYj92MWg5T6JghWcqQfS/nePGYETcsSiHOgSH4O
+y3+b1691vR2PbgGl29/bdRGHWShN5UxvmWg4H96JzVkhAMkbRNZZBo/hWpLf7Wzo
+5QHuZrX7Nn5+lJG0MtXdClgXYtGbg72ThCCXvovoQtYVY9TEBqJBGNe3VAs2/kDG
+/7NmLRYW0sbMhZeKGTdr7qth0ZOX+aj3+nnZ
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDGDCCAgCgAwIBAgIVAN2WCywAfMl5MJ8cVRoKFLyV+pBoMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5tbmhuLmZyMB4XDTExMDUyMzA4NTUyNloXDTMx
+MDUyMzA4NTUyNlowFjEUMBIGA1UEAxMLaWRwLm1uaG4uZnIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCmAwtKt4Gn/OnH/ER/RWlu+XXXicirD/hyUooa
+K5KKEsbiRAr//R+vzCwC3svUQJ5F6f9mMaLoPC06cALnyMmylUJhT1D7XW2mJQMX
+XroZC1fa+UCmxtdvZIM7qjesRIfLYEZMoa4/weBEbEElUfuqPkoqShTp5kbO/L5Y
+/phmvhYV0MnReY5UYOH59yzCHcZ1N9vDu4K5HwvaK56nYTc/yVfAlhK7T2KTZldP
++yf8tU2UBdhympcm4WCaH2wbZSlVt5Vr4V0CgQmF3AkkSmmr+l2z0WmIyj5DqYc5
+UwVu5q/YteHRNqy2HD0BpyFnWd+OumQRRtMLOQYqqTmMVtBHAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5tbmhuLmZyhiJodHRwczovL2lkcC5tbmhuLmZyL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTwc9EzS0upzHexvPHSjyyBXtJRzzANBgkqhkiG
+9w0BAQUFAAOCAQEAUjcVU43UjPS2yZa2B98B2GixtGn5JcBnE1QLt5pgGsnr4CIx
+I8cC/jZT5L7NXrTNt/6nPGMCycxAWv7tlueZ0WdzZ+UGtB/rRYkL2r469oLZ3rYa
++UjhcWk/BF913fSK/FsRHrdp/Ml4qKsgePY0XovshBV95lfyRSfO2fOYkOE9DqWi
+xFPoC+FB1H96Xlqm9MNJTjVHOlK/dsWepngeGtSThDfw6Zu2YBffGKmjUxZupnz/
+x1tBulh4y7eU//huta68Wi6YRz4yzVlzbowBI/RxtKs0bme6vXeCkL1b5TCJBpHy
+vRrHv8r51u7XXy3b5wfo2T+mRkq36Qzb3+UX7w==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fid.mnhn.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fid.mnhn.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fid.mnhn.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Muséum National d'Histoire Naturelle (MNHN)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Muséum National d'Histoire Naturelle (MNHN)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>zyxad@mnhn.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fieldtrial.safetynet.rmplc.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/fieldtrial.safetynet.rmplc.co.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..c48f15c8
--- /dev/null
+++ b/swamid-interfederations-2.0/fieldtrial.safetynet.rmplc.co.uk-shibboleth-sp.xml
@@ -0,0 +1,89 @@
+<?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://fieldtrial.safetynet.rmplc.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://fieldtrial.safetynet.rmplc.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>
+						MIIDCTCCAfGgAwIBAgIJALB0hSzEevYIMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnNuZnR3ZWIwMS5pZGV2LmlmbC5uZXQwHhcNMTAwMjE5MTMyODQ2WhcNMjAw
+						MjE3MTMyODQ2WjAhMR8wHQYDVQQDExZzbmZ0d2ViMDEuaWRldi5pZmwubmV0MIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Cu9o/6D/wmBP45C/0SSxgPv
+						MuYMz8MwX/HJFP2+W4ADHmQhb4DL9x0kxF5ESuy26jCdtB4aUSl1BIi0qNhQ363t
+						sPMrD19R3xgZ1plxt+A9Y6VkkB+lO8A2WFpuwmI+pl7mP8jLvBKgG0g1oxLIqFZS
+						0S9Q7c4Fn9zQTcCNBiirlfTMXggVvASHfpqFIVe+NF5BWrGZqJ7RiPIB4ZnkR1AZ
+						ZNVpu5BsoZdpX601qTf6kT2xDuObdjmWvZWG+Z7VfiRts3lWStSHJe1RoN7nQBQt
+						byBkOzLT/41IrlpJYzzRgfBc0zV+WvMlxqz7rvmNQAPwfEm2bIUrCRRXrDPTHQID
+						AQABo0QwQjAhBgNVHREEGjAYghZzbmZ0d2ViMDEuaWRldi5pZmwubmV0MB0GA1Ud
+						DgQWBBTpdGvCZNgsXYU87SWVZdDvBacV3jANBgkqhkiG9w0BAQUFAAOCAQEANeg4
+						Io4/wYni0tlCN7ObChWNEEb7yuWOA8hKqrxHw0KowzlwY6aXa+cAoibNs8nU2Vfg
+						aeJCm1z87cz/HtvzRtMRW/ddjS/cTbZPzWu8p9EADOGEOGTkofXnJZqFSdCCeFOy
+						78yqS1GCf3hm7Qvj3hhJ8Wbz+jFX0BEjR3kjxMgFCDXz/a0iohCbfFY5ZiByIIHZ
+						rNaIlPACPcHWrUIOzukV7ZeN+wlxbNhm5aXHiEWC6xSLSRHTDYMNhoac/1wEjU9Z
+						zz1XVHG0KovZIi9psy0ehbjZyjupNcsIGjY/flxs6qLNoD1gNxDkJ+2qt+NMZMGJ
+						pEJ7l2rYmZM+/vn4aw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDCTCCAfGgAwIBAgIJALB0hSzEevYIMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnNuZnR3ZWIwMS5pZGV2LmlmbC5uZXQwHhcNMTAwMjE5MTMyODQ2WhcNMjAw
+						MjE3MTMyODQ2WjAhMR8wHQYDVQQDExZzbmZ0d2ViMDEuaWRldi5pZmwubmV0MIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Cu9o/6D/wmBP45C/0SSxgPv
+						MuYMz8MwX/HJFP2+W4ADHmQhb4DL9x0kxF5ESuy26jCdtB4aUSl1BIi0qNhQ363t
+						sPMrD19R3xgZ1plxt+A9Y6VkkB+lO8A2WFpuwmI+pl7mP8jLvBKgG0g1oxLIqFZS
+						0S9Q7c4Fn9zQTcCNBiirlfTMXggVvASHfpqFIVe+NF5BWrGZqJ7RiPIB4ZnkR1AZ
+						ZNVpu5BsoZdpX601qTf6kT2xDuObdjmWvZWG+Z7VfiRts3lWStSHJe1RoN7nQBQt
+						byBkOzLT/41IrlpJYzzRgfBc0zV+WvMlxqz7rvmNQAPwfEm2bIUrCRRXrDPTHQID
+						AQABo0QwQjAhBgNVHREEGjAYghZzbmZ0d2ViMDEuaWRldi5pZmwubmV0MB0GA1Ud
+						DgQWBBTpdGvCZNgsXYU87SWVZdDvBacV3jANBgkqhkiG9w0BAQUFAAOCAQEANeg4
+						Io4/wYni0tlCN7ObChWNEEb7yuWOA8hKqrxHw0KowzlwY6aXa+cAoibNs8nU2Vfg
+						aeJCm1z87cz/HtvzRtMRW/ddjS/cTbZPzWu8p9EADOGEOGTkofXnJZqFSdCCeFOy
+						78yqS1GCf3hm7Qvj3hhJ8Wbz+jFX0BEjR3kjxMgFCDXz/a0iohCbfFY5ZiByIIHZ
+						rNaIlPACPcHWrUIOzukV7ZeN+wlxbNhm5aXHiEWC6xSLSRHTDYMNhoac/1wEjU9Z
+						zz1XVHG0KovZIi9psy0ehbjZyjupNcsIGjY/flxs6qLNoD1gNxDkJ+2qt+NMZMGJ
+						pEJ7l2rYmZM+/vn4aw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fieldtrial.safetynet.rmplc.co.uk/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: Safetynet Field Trial</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rm.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Technical Contact</md:GivenName>
+    <md:EmailAddress>mailto:shibtechcontact@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/filesender.cesnet.cz-saml-sp.xml b/swamid-interfederations-2.0/filesender.cesnet.cz-saml-sp.xml
new file mode 100644
index 00000000..ca73b2e6
--- /dev/null
+++ b/swamid-interfederations-2.0/filesender.cesnet.cz-saml-sp.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.cesnet.cz/saml/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2011-11-04T10:27: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:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">FileSender</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">FileSender</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CESNETs servis for sending files.</mdui:Description>
+        <mdui:Description xml:lang="cs">Cesnetí služba pro posílání souborů.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://filesender.cesnet.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://filesender.cesnet.cz/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="15"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ces.net/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lubos</md:GivenName>
+    <md:SurName>Kopecky - administrator</md:SurName>
+    <md:EmailAddress>du-support@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/filesender.du1.cesnet.cz-saml-sp.xml b/swamid-interfederations-2.0/filesender.du1.cesnet.cz-saml-sp.xml
new file mode 100644
index 00000000..64f64ad0
--- /dev/null
+++ b/swamid-interfederations-2.0/filesender.du1.cesnet.cz-saml-sp.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.du1.cesnet.cz/saml/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-09-01T17:40:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">FileSender</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">FileSender</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CESNETs servis for sending files.</mdui:Description>
+        <mdui:Description xml:lang="cs">Cesnetí služba pro posílání souborů.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://filesender.du1.cesnet.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://filesender.du1.cesnet.cz/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.du1.cesnet.cz"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.du1.cesnet.cz" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.du1.cesnet.cz" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.du1.cesnet.cz" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.du1.cesnet.cz/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.du1.cesnet.cz" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ces.net/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lubos</md:GivenName>
+    <md:SurName>Kopecky - administrator</md:SurName>
+    <md:EmailAddress>du-support@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/filesender.funet.fi.xml b/swamid-interfederations-2.0/filesender.funet.fi.xml
index da3a3dbe..6d81fa4c 100644
--- a/swamid-interfederations-2.0/filesender.funet.fi.xml
+++ b/swamid-interfederations-2.0/filesender.funet.fi.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://filesender.funet.fi">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.funet.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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://filesender.funet.fi/simplesaml/module.php/saml/disco.php" index="1"/>
-      <mdui:UIInfo>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://filesender.funet.fi/simplesaml/module.php/saml/disco.php" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="fi">Funet FileSender</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Funet FileSender</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Funet FileSender</mdui:DisplayName>
@@ -14,13 +24,9 @@
         <mdui:PrivacyStatementURL xml:lang="fi">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIE2TCCA8GgAwIBAgIQX2leAqJlB3Q/3iPF8QljNTANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -61,10 +67,10 @@ o9pAScnCYOeqNoQ//wrcSVQcwozZLhGlymlLAyDI0rx/hM9v+8PL1E0iFmf/</ds:X509Certificate
       <md:ServiceDescription xml:lang="fi">Funet FileSender tarjoaa helpon ja turvallisen tavan jakaa suuria tiedostoja.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Funet FileSender offers an easy and a secure way to share large files with anyone.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="sv">Funet FileSender erbjuder en latt och saker satt att dela stora datafilar till vem som helst.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md: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="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>
diff --git a/swamid-interfederations-2.0/filesender.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/filesender.internet2.edu-shibboleth.xml
new file mode 100644
index 00000000..89083ca3
--- /dev/null
+++ b/swamid-interfederations-2.0/filesender.internet2.edu-shibboleth.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.internet2.edu/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="https://incommon.org"/>
+  </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://filesender.internet2.edu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">FileSender</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service allows any researcher at an institution who is a research and education member of InCommon, is willing to release EPPN and e-mail attributes, and operates an IdP to temporarily store a file of up to 1TB in size and notify recipients of its availability and how to retrieve it.  It is designed to provide a solution to the e-mail large file attachement restriction in most mail systems. </mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.internet2.edu/filesender/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/filesender/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>
+MIIEAzCCAuugAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxDELMAkGA1UEBhMCVVMx
+ETAPBgNVBAgTCE1pY2hpZ2FuMRIwEAYDVQQHEwlBbm4gQXJib3IxQTA/BgNVBAoT
+OFVuaXZlcnNpdHkgQ29ycG9yYXRpb24gZm9yIEFkdmFuY2VkIEludGVybmV0IERl
+dmVsb3BtZW50MSEwHwYDVQQDExhmaWxlc2VuZGVyLmludGVybmV0Mi5lZHUxKDAm
+BgkqhkiG9w0BCQEWGXRlY2hzdXBwb3J0QGludGVybmV0Mi5lZHUwHhcNMTIwNTMw
+MTEyOTI5WhcNMjIwNTI4MTEyOTI5WjCBxDELMAkGA1UEBhMCVVMxETAPBgNVBAgT
+CE1pY2hpZ2FuMRIwEAYDVQQHEwlBbm4gQXJib3IxQTA/BgNVBAoTOFVuaXZlcnNp
+dHkgQ29ycG9yYXRpb24gZm9yIEFkdmFuY2VkIEludGVybmV0IERldmVsb3BtZW50
+MSEwHwYDVQQDExhmaWxlc2VuZGVyLmludGVybmV0Mi5lZHUxKDAmBgkqhkiG9w0B
+CQEWGXRlY2hzdXBwb3J0QGludGVybmV0Mi5lZHUwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDJB0GAiWyeyrR5PgW3rnNspNceX1w3M1HL8jY4ZABYUTQz
+hfHhzhrXxxHwM8Ei8yUczK9hSnHtnURP7GulLfj/4cJZT7lwE/rJopJLPCpS2rXh
+JsAhhpjJVV80FF+wVofDMGZwu/gWR2DKcee6Spok7f2pJJLBbmX5DtenMoR6n7Tp
+aVpEtD+wgxrauh/7zzyUJtUbahflUoGxX0Il7LLetOYGgT4u65Du4f/t0fkBxmrl
+vZaNQDDwiJC9g2vZZ5poukx61okmvvkJHs2IsFGbIPrO6lE0v9kDZ93MawTuXuz1
+vldyvULlZ08p7rNIFWI6qqcdtlROgU0iKCcIOUXXAgMBAAEwDQYJKoZIhvcNAQEF
+BQADggEBAKfZknSamtnmWlj0WogmIDn68RoEu8VdU8ny8G0+tErvGGUI9l/y68+h
+X6XyGHPmKUzNMs++wO6e2NjnT+cNNiYgNoSNom+t3I4IxfIE6AGvzqFlhwZrgqAg
+TFow06r0ratzBhfcRlNldAJ30SIFSn/5TyjyR/fAQ8S228saq7hMA8NyzrUY0rqT
+TTiYKzVJRFUVeY1tyDhvMC6PfF5sZLe8hG/rOWVG+h8U5a7FcKkGElxxDDCNsehy
+IGjK2QnyLyqzPNnHwosEzEZDf2yLb6Ee2PIApSqKtO9Syl5QMCiG1dJpb2my00IF
+LXYiHXLNNHaUlb4KEmLyRIb/SCUFu/g=
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://filesender.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://filesender.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.internet2.edu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.internet2.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">FileSender</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This service allows any researcher at an institution who is a research and education member of InCommon, is willing to release EPPN and e-mail attributes, and operates an IdP to temporarily store a file of up to 1TB in size and notify recipients of its availability and how to retrieve it.  It is designed to provide a solution to the e-mail large file attachement restriction in most mail systems. </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">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>TSG</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>TSG</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>TSG</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</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
new file mode 100644
index 00000000..4e7fe04d
--- /dev/null
+++ b/swamid-interfederations-2.0/filesender.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,64 @@
+<?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">
+http://cofre.reuna.cl/index.php/es/reglas-federacion
+</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Filesender - 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>
diff --git a/swamid-interfederations-2.0/fim-hn-02-idp.orion.education.fr.xml b/swamid-interfederations-2.0/fim-hn-02-idp.orion.education.fr.xml
new file mode 100644
index 00000000..b21adf50
--- /dev/null
+++ b/swamid-interfederations-2.0/fim-hn-02-idp.orion.education.fr.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fim-hn-02-idp.orion.education.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-07T09:43: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">education.gouv.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-orleans-tours.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">orion.education.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">FRENCH DEPARTMENT OF EDUCATION - HUB HN02</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Employees of french department of education</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">MINISTERE DE L'EDUCATION NATIONALE - HUB HN02</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnel enseignant, non enseignant et scolaire de l'éducation nationale</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>
+					      MIIGCDCCA/CgAwIBAgIQcg8ekp3qju7yFn9efv+bjTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQG
+EwJGUjEvMC0GA1UEChMmTWluaXN0ZXJlIGVkdWNhdGlvbiBuYXRpb25hbGUgKE1FTkVTUikxFDAS
+BgNVBAsTCzExMCAwNDMgMDE1MRswGQYDVQQDExJBQyBJbmZyYXN0cnVjdHVyZXMwHhcNMTQwNjAz
+MDkwMDUyWhcNMTYwNjAzMDkwMDUyWjCBkjELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVy
+ZSBFZHVjYXRpb24gTmF0aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEjMCEG
+A1UECxMaQ2VudHJlIE5hdGlvbmFsIGRlIFNlcnZpY2UxFzAVBgNVBAMTDmZzLXBobS1naWQtMS4w
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyplBIXFUapQgLMiL0wrEzFNYodsuIwdg
+tLfelo0uyiLmiG1teQ4/A7glwhPAuKjPj7dSEbQcw3F70ACUn+eu6z+qoFmmKLKDFNQgE6A58lsO
+yu7PoQInNaQPguyh/M1lUdvSWWqEipXblrLk0D/cDPrn3ieYk2l1QNsvD6s5cAfuw2KyjUrAYIGe
+Fz6yKFeu7W6VBjX3uG9KUPbtAw0Eh/rJW+nJZ3h3++i427jbfNZR0A88pL2omut3+r4REYAHE/xX
+KkHj8kpADhztAXlIqbu6o8s901FV0RmSXp9h6Ddqwu4LrDbrzf3QMfDRtHqtdq/2tXWWfk1VSsaT
+GGFGyQIDAQABo4IBeDCCAXQwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vd3d3
+LmlnYy5lZHVjYXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNydDAfBgNVHSMEGDAWgBS+OCJ/ckap
+1oQVn9XIKH9cswIgyzAaBgNVHSAEEzARMA8GDSsGAQQBgZ5mRQEBBAEwgaoGA1UdHwSBojCBnzCB
+nKCBmaCBloYwaHR0cDovL2NybDEuaWdjLmVkdWNhdGlvbi5mci9JbmZyYXN0cnVjdHVyZXMuY3Js
+hjBodHRwOi8vY3JsMi5pZ2MuZWR1Y2F0aW9uLmZyL0luZnJhc3RydWN0dXJlcy5jcmyGMGh0dHA6
+Ly9jcmwzLmlnYy5lZHVjYXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNybDATBgNVHSUEDDAKBggr
+BgEFBQcDATAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0OBA8EDUFVVE9fR0VORVJBVEUwDQYJKoZIhvcN
+AQEFBQADggIBADtUXZmogUZLbB9EQfIpMBBsE2D1EibJdx1leRdnxgH8dr6AuL6NzMBmOIcegISd
+76sXKESJ8Lf2R/ubA03gNILSduygi0POt02lRqzew2zmpd+qMAaa5t4QaWiUeuesdiQ3apHRa58L
+5cEksQ5g8O6ZL21VqHD4PMtnsES5uyVriDniwUbyXRvLNJy3iHPChwVGwpmtzyhw94s7vcFhuHGr
+BzZ7xqAgircBLGDFVvvtnfvowbMwD02lFbPBeTb52FSAhOMouTMjfLaB/BJ+/Bf6zgpB9GWDQ2lk
+yGsbxAXUpUsnervXd7tBG5jjLUm7z2lq+LPuP37fifskeuWwAE+t9hDud0vOl3Qrpfwl1EY9tfXR
+O63bDGvVB7v7rNOhFRAZQZIviqoSf47SUVKvfJOPekoaULk3o24UzBiH/1tSgx1j0Vsgp2CskBl8
+DWVWlAwhKl1opyRNGyRqgGYMf6P0ZhwuL+iSK23tV7bGPT88Z24SxR7aoj6iKON1L2X+YoGXNgi2
+9MFyYqmVEqb68vHgEcQt0qLmUeWgQdwkKAOh+ArsL2VDf/1buKJHlnNkUe65PIc2fvEvhuzRGuC2
+iMR3P/Jy7hd/GHmThaVaWYRSSJ8jMHbr6GwHH17MQaE1JkjB1+poFz5oKv0pMnHxQyqKu76Vr0vn
+u3Uio5jQe/vo
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fim-hn-02-idp.orion.education.fr/sso/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fim-hn-02-idp.orion.education.fr/sso/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fim-hn-02-idp.orion.education.fr/sso/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MINISTERE DE L'EDUCATION NATIONALE - HUB HN02</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MINISTERE DE L'EDUCATION NATIONALE - HUB HN02</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>pole-hebergement@ac-orleans-tours.fr</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
new file mode 100644
index 00000000..4c77d1ec
--- /dev/null
+++ b/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIEjTCCA3WgAwIBAgIRALMOFHysegGUCjSEYcftmJowDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MTYwMDAwMDBaFw0xNzA0MTUyMzU5NTlaMEExITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTc2Vydml6aXdl
+Yi51bml0by5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO3e9ULQ
+7Jx4dvGUcStS+blvUigQrfOGh7RUZYWEV71pBHazp8ajnNCCw1gfSi3iF2PSEC1Q
+OFZnhivkLmgJ3GaiAtaIMWb9zhjDV9ILfaKdwHZ6p9Fzb54M7qFNDn0iIJyCNCbe
+wAxyyNPx8mKnQn3KfHfiGCMi73X+u1XDiJLSXTvaOcd6rRJ3ol7335mH6eK+VN1X
+dDJJcIBaUGrhCwSt5zis0n1CH07OdXcbeC62kbxUVQxf7QzgECPsld/E4/bbCNSh
+74i82A6AlKKvAkzd8P/LMDKVjlaok89erKuWQoSWusWSaGegmig34D4/0Mh/m0B6
+kxKnR3QUP4jOCvsCAwEAAaOCAYkwggGFMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
+KzdXR+qQ47ntMB0GA1UdDgQWBBQIiUxAEj/RAjyl0nYAsamjHHQmbDAOBgNVHQ8B
+Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
+BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
+BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+L29jc3AudGNzLnRlcmVuYS5vcmcwNwYDVR0RBDAwLoITc2Vydml6aXdlYi51bml0
+by5pdIIXd3d3LnNlcnZpeml3ZWIudW5pdG8uaXQwDQYJKoZIhvcNAQEFBQADggEB
+ACDeDzqAHJ6FEj6VnX2+MqsnG5qdbfO8f+WDbEUtX1uQEskLl52A6C7fOhUvwb+z
+P1T+LD5OxEDWFOfDuMjOY8p+eqbXjL8Pj6B2c6QVJZoDVI6AJAQdRckAZJepzdzV
+mRwkKgxoOhhJGR/rpzuTjRxQbZugh7iVKKnMPSF52O1hibTJosYRGFyM4ICpo8Yf
+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>
diff --git a/swamid-interfederations-2.0/fod.geant.net-shibboleth.xml b/swamid-interfederations-2.0/fod.geant.net-shibboleth.xml
new file mode 100644
index 00000000..2131d427
--- /dev/null
+++ b/swamid-interfederations-2.0/fod.geant.net-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fod.geant.net/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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc: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://fod.geant.net/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT FoD pilot</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GÉANT FoD pilot</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://fod.geant.net/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://fod.geant.net/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="45" width="220" xml:lang="en">https://fod.geant.net/static/fodlogo2.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>fod.geant.net</ds:KeyName>
+        <ds:KeyName>https://fod.geant.net/shibboleth</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=fod.geant.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDEDCCAfigAwIBAgIJALpwpqVM41ahMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+                            BAMTDWZvZC5nZWFudC5uZXQwHhcNMTQwNjIzMTAwMDQ3WhcNMTkwNjIyMTAwMDQ3
+                            WjAYMRYwFAYDVQQDEw1mb2QuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+                            AQ8AMIIBCgKCAQEA7xERTh1Nm2VyuqI9t3nPILhB0OT2gwNZZYQ7S0YWDbwQSZu8
+                            98n9ky46onJm6ie3hA3CQKO86/0IqoF8idhnMFrODrvVNL+MTXj/kfb3oRwm0HzR
+                            ZXOExZM4zCLCaAAmlIvkYASjjRrY8tZnyXkw1IXE/wApfU4foL8as0Wskq3vQgvm
+                            dL9xXc+T7CsR7ZkvzgekLw8IhXT8zwoiKKWzw7cNJMr0yvkow2El0GJevpT4H1n4
+                            B0L4WeipLH3grmBa4vL7fjOnBomnou6mjbfeKy3e0sbeMq64fLeJoJyDdoxx8s3r
+                            uketgyYh5BG7Z6tFpHVrrQ5lxqAk8eSOC+tziwIDAQABo10wWzA6BgNVHREEMzAx
+                            gg1mb2QuZ2VhbnQubmV0hiBodHRwczovL2ZvZC5nZWFudC5uZXQvc2hpYmJvbGV0
+                            aDAdBgNVHQ4EFgQUWYtmspsehNvR1pD1f1+qEUfoDEIwDQYJKoZIhvcNAQEFBQAD
+                            ggEBAHV/TTiiQGeGW3YhuyV5dA+FkSNPMJbYPi38Oy36Vv732NYv22ONtKjop45I
+                            LVz6tPVLtpV+TVwtSGw+Rca79FwDf6g3tu2rLN+xElLk8M7gYtoRY2kdoq1A/UaO
+                            51L2b9wEqYcXQMig2hRwdtxSUgfRcGSwDO75us6b6OsSs3L1UZoWgsHbyynT04Hz
+                            +pgaYx67ZJZZ7Mb26w1ScHJUenjHhFY3Xqr/yG6+cwmA/7ihdnpwyOp8VGLA8kKD
+                            Faf69w08P93wE8CS9U+gcN8RdvhC9W+iYhGRLHCPg7o6gRjeFB+p6zeyb/kNuuLU
+                            VYAFoJvsnMeKzPxMe+iSHgeolLI=
+                        </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://fod.geant.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fod.geant.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fod.geant.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fod.geant.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fod.geant.net/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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fod.geant.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fod.geant.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fod.geant.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fod.geant.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fod.geant.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fod.geant.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">GÉANT FoD pilot</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">GÉANT FoD pilot</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"/>
+      <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: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="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="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" 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:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" 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="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="givenName" Name="urn:oid:2.5.4.42" 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="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+    </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:GivenName>Leonidas</md:GivenName>
+    <md:SurName>Poulopoulos</md:SurName>
+    <md:EmailAddress>leopoul@noc.grnet.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Leonidas</md:GivenName>
+    <md:SurName>Poulopoulos</md:SurName>
+    <md:EmailAddress>leopoul@noc.grnet.gr</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 91edbfcc..de7f7a57 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,15 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-05-05T06:16:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Foodle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">Foodle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="nn">Foodle</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</mdui:Description>
+        <mdui:Description xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</mdui:Description>
+        <mdui:Description xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://rnd.feide.no/software/foodle/foodle-privacy-policy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
         </ds:X509Data>
@@ -22,20 +43,26 @@
       <md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid: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:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid: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: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:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:Company>UNINETT AS</md:Company>
-    <md:GivenName>Andreas</md:GivenName>
-    <md:SurName>Solberg</md:SurName>
-    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
-    <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
+    <md:GivenName>Feide Support</md:GivenName>
+    <md:EmailAddress>support@feide.no</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml b/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
new file mode 100644
index 00000000..bd93ba87
--- /dev/null
+++ b/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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="2014-10-27T15:54:56Z">
+      <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>
+    </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>
+      <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>
+MIIDGDCCAgCgAwIBAgIJAMzTQ7ZX7H85MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2ZvcmdlLnN3aXRjaC5jaDAeFw0xMzA2MDYwNjM5MjhaFw0xNjA2MDUwNjM5
+MjhaMBoxGDAWBgNVBAMTD2ZvcmdlLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMRsrEbfa2dByTHw8nNmWXKluBIqNBddjm2OOssE0dIJ
+PHokGICd3fh9TvoRiB1T5xECoGDM3TmzxlFeS8a+KDSeI58lUj3ZOjjMx8c/S/5U
+yyZYkXNBvTTVXKEWVA+3SEDc92aPeUldK6D4vWwx1EeWqVxO/LoNOi5ZlkPES5qL
+5sXEAl6YFEK6Z65WOEO/KVCdBJfCooWUH3vnl2y/k1u9Iybt2sO/ugXL9ltgmdXF
+o+768lPn1mpME6bvaHaJ5QlDrwXYvCusZD6PBeY8eDyeuXbA3QI9TC2L8Nc/EQgL
+LbFOH7qC1zmW5VwPROrTrKb4XTixuju57lwuoWXTz2cCAwEAAaNhMF8wPgYDVR0R
+BDcwNYIPZm9yZ2Uuc3dpdGNoLmNohiJodHRwczovL2ZvcmdlLnN3aXRjaC5jaC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBRInInngJvjyAHf4YVeGVTNbhSHQjANBgkqhkiG
+9w0BAQUFAAOCAQEAHw9YM3UKHdvpA2bMp1MoB765kRHU58ydqf51ydskOCpeZfv8
+pTw+kbvEsE1c2RbjcQ6oB5KXh5qA/jB8Ig/Ur/lN9ben25w70rcNJmt6bxbXKXVn
+BDg+G/oxuX8JS7BTlt9oz7UKuQYA7jcdmai1TgLe/ITzX4ieEWcErlf3CR4QLo6v
+LcIY8wseU5bZaSoQLD3O1sTGsRa68TO8RgJw2REWVPbt/wDRHQut2n/+P/3dam5i
+d3GxkhfzcE0Wj9lX4dzlC6CqKBdAF8UxXYAf3BDVjheesYf2Ps1iy3KW7XBX0Lci
+D5s3OfoyrsZf5VHSjcxoteZ+NQBmcCgYkgjzXQ==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md: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="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">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>SWITCHaai</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lukas</md:GivenName>
+    <md:SurName>Hämmerle</md:SurName>
+    <md:EmailAddress>mailto:lukas.haemmerle@switch.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 44 268 15 05</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
new file mode 100644
index 00000000..96e8e6d1
--- /dev/null
+++ b/swamid-interfederations-2.0/franklin-shib01.franklin.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						aW4tc2hpYjAxLmZyYW5rbGluLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEA0ffs3wu73Gh7k0HUFbl9H0cdSF9Elc11El7uJGXEthMHau0HYCdt
+						BE645S7EpW0poknu1HaLVqv9aSmEcTRI77bZ4xjGbODR8PiVlxVCfPT+FDDAulY8
+						Os7ORD099SbgMJtkU/JLheEzZpgFqFf8TgLNDazfdRryi3MVgWeEoKwYOO2H9BV0
+						KSETpu9Wn7miyt0salbeX9bjpSEURqNRX0WymJT/dxDTKSh1bVx02+BcqbUDyQQ4
+						jo6xBJARO+c5idPv85E/NFd2WVrA4vWYiXdGQns99n2YQbG2gECw5vxQr/MyWzt1
+						2xhzjsR0pno6QdveIWMmAMw/og69QjRIiQIDAQABo4GEMIGBMGAGA1UdEQRZMFeC
+						HmZyYW5rbGluLXNoaWIwMS5mcmFua2xpbi5hYy51a4Y1aHR0cHM6Ly9mcmFua2xp
+						bi1zaGliMDEuZnJhbmtsaW4uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYE
+						FPD7x48+M7C+18p79NOvITXP81FxMA0GCSqGSIb3DQEBBQUAA4IBAQAYPiPM9HJm
+						900vq4X29iZz4r8gFEly/D3YN/8KqIAbKTY3CUZBcBse0NEOXwkw5JJrMbFSYcPN
+						MUyp7GCuYXGxfJ79SLwuI/fzZE/DDpXy9DsG9oNFsr2svJl03hOx3myXngbmZGQZ
+						qxMGVl3tJHV4GARfeo9p9hknnPt59sjPX+r9+ppG/V80jcD0CMHynW1/sxpcUOSN
+						yXPJFkmpdhrtXRsebF4g2O93bc+8pJETG16teg4zGHeF7iKsjnQSISvFV4xj5vIu
+						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>
+						MIIDZTCCAk2gAwIBAgIUcOe08w8KtBXNXbH+PNNNyO51KrswDQYJKoZIhvcNAQEF
+						BQAwKTEnMCUGA1UEAxMeZnJhbmtsaW4tc2hpYjAxLmZyYW5rbGluLmFjLnVrMB4X
+						DTEwMDMwMjEzNDYxN1oXDTMwMDMwMjEzNDYxN1owKTEnMCUGA1UEAxMeZnJhbmts
+						aW4tc2hpYjAxLmZyYW5rbGluLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEA0ffs3wu73Gh7k0HUFbl9H0cdSF9Elc11El7uJGXEthMHau0HYCdt
+						BE645S7EpW0poknu1HaLVqv9aSmEcTRI77bZ4xjGbODR8PiVlxVCfPT+FDDAulY8
+						Os7ORD099SbgMJtkU/JLheEzZpgFqFf8TgLNDazfdRryi3MVgWeEoKwYOO2H9BV0
+						KSETpu9Wn7miyt0salbeX9bjpSEURqNRX0WymJT/dxDTKSh1bVx02+BcqbUDyQQ4
+						jo6xBJARO+c5idPv85E/NFd2WVrA4vWYiXdGQns99n2YQbG2gECw5vxQr/MyWzt1
+						2xhzjsR0pno6QdveIWMmAMw/og69QjRIiQIDAQABo4GEMIGBMGAGA1UdEQRZMFeC
+						HmZyYW5rbGluLXNoaWIwMS5mcmFua2xpbi5hYy51a4Y1aHR0cHM6Ly9mcmFua2xp
+						bi1zaGliMDEuZnJhbmtsaW4uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYE
+						FPD7x48+M7C+18p79NOvITXP81FxMA0GCSqGSIb3DQEBBQUAA4IBAQAYPiPM9HJm
+						900vq4X29iZz4r8gFEly/D3YN/8KqIAbKTY3CUZBcBse0NEOXwkw5JJrMbFSYcPN
+						MUyp7GCuYXGxfJ79SLwuI/fzZE/DDpXy9DsG9oNFsr2svJl03hOx3myXngbmZGQZ
+						qxMGVl3tJHV4GARfeo9p9hknnPt59sjPX+r9+ppG/V80jcD0CMHynW1/sxpcUOSN
+						yXPJFkmpdhrtXRsebF4g2O93bc+8pJETG16teg4zGHeF7iKsjnQSISvFV4xj5vIu
+						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>
diff --git a/swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..f1822aca
--- /dev/null
+++ b/swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-15T12: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: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 for ELCIRA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Filesender per ELCIRA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">FileSender ELCIRA by GARR is a secure way to share big files with everybody!</mdui:Description>
+        <mdui:Description xml:lang="it">FileSender ELCIRA da GARR è un modo sicuro di condividere grossi file con tutti!</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://fs-elcira-srv01.dir.garr.it/elcira/index.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://fs-elcira-srv01.dir.garr.it/elcira/index.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://fs-elcira-srv01.dir.garr.it/elcira/privacy_en.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://fs-elcira-srv01.dir.garr.it/elcira/privacy_it.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://primo-login.garrbox.garr.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://primo-login.garrbox.garr.it/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>
+MIIDHzCCAgegAwIBAgIJAO2pE5Vwv7FYMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMMG2ZzLWVsY2lyYS1zcnYwMS5kaXIuZ2Fyci5pdDAeFw0xNDAxMTYwOTU4MDZa
+Fw0zNDAxMTEwOTU4MDZaMCYxJDAiBgNVBAMMG2ZzLWVsY2lyYS1zcnYwMS5kaXIu
+Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANqr3aW47/9U
+URqjOL6HmX1aZ4+5UGQ/CT0PcYJ2GibpuNms31QIEtm6PqRAQ/r3Qc7V4wDclat2
+ww0SfKDT2NxRBah8QagbVxVVwWPFBFu4uvmbehz8jCahq5zia0hBlrR/Y0VgWj0Z
+7HKo7rfUyOhNRU0VxkesatjSqls8e1LxnNHTEM22aLbvrgcwSvX/XvNUclvA+edd
+OzCpWUQb4HJtDFAA0fKmbGueE45vwdvTpyVx1BL2N4PZpsDm5TdTEEr6zsMLtOFX
++Dq7V9wWTYvILX8i5VaeVnZBH9a1Ou95fy2D+ZDlt+nnDJWo3Wqkr92lvV87oFA+
+0O4TBp4Wx3MCAwEAAaNQME4wHQYDVR0OBBYEFLJde/JWquiDiJENwGPkXggyxJSy
+MB8GA1UdIwQYMBaAFLJde/JWquiDiJENwGPkXggyxJSyMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBAL/MIhivMBtcl6mGu2V+JppTsgLfGdrQ7YPBVNr1
+4RKxQjhLUfOY8UXji0aIUHmXXJBRQ3aYtu/n93S5lTMT4iX1bdugLDEL4UWUXgey
+8Ag7LUT8NNXnfoJ5eWcvxX8ijMw1h9I4J9NLosipIOIunRDBvt2YZHqWz6HE6zLk
+PWgsJBLXOn8WzFUQILgE58UNB8FRyszfjwQaMZxbr450A7MLzoocoHruvtyGmU/b
+u+8MvFPZtUgqakjD/z7nC7Xb8sLzvLIl2ImMzcnNvh3w25+kDZiDyhs/HpuLyWp0
+Q1BGI7m2w2Bezwz70P9B1CA26dzfKrAkCDGytwKMtiUwEB4=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIJAO2pE5Vwv7FYMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMMG2ZzLWVsY2lyYS1zcnYwMS5kaXIuZ2Fyci5pdDAeFw0xNDAxMTYwOTU4MDZa
+Fw0zNDAxMTEwOTU4MDZaMCYxJDAiBgNVBAMMG2ZzLWVsY2lyYS1zcnYwMS5kaXIu
+Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANqr3aW47/9U
+URqjOL6HmX1aZ4+5UGQ/CT0PcYJ2GibpuNms31QIEtm6PqRAQ/r3Qc7V4wDclat2
+ww0SfKDT2NxRBah8QagbVxVVwWPFBFu4uvmbehz8jCahq5zia0hBlrR/Y0VgWj0Z
+7HKo7rfUyOhNRU0VxkesatjSqls8e1LxnNHTEM22aLbvrgcwSvX/XvNUclvA+edd
+OzCpWUQb4HJtDFAA0fKmbGueE45vwdvTpyVx1BL2N4PZpsDm5TdTEEr6zsMLtOFX
++Dq7V9wWTYvILX8i5VaeVnZBH9a1Ou95fy2D+ZDlt+nnDJWo3Wqkr92lvV87oFA+
+0O4TBp4Wx3MCAwEAAaNQME4wHQYDVR0OBBYEFLJde/JWquiDiJENwGPkXggyxJSy
+MB8GA1UdIwQYMBaAFLJde/JWquiDiJENwGPkXggyxJSyMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBAL/MIhivMBtcl6mGu2V+JppTsgLfGdrQ7YPBVNr1
+4RKxQjhLUfOY8UXji0aIUHmXXJBRQ3aYtu/n93S5lTMT4iX1bdugLDEL4UWUXgey
+8Ag7LUT8NNXnfoJ5eWcvxX8ijMw1h9I4J9NLosipIOIunRDBvt2YZHqWz6HE6zLk
+PWgsJBLXOn8WzFUQILgE58UNB8FRyszfjwQaMZxbr450A7MLzoocoHruvtyGmU/b
+u+8MvFPZtUgqakjD/z7nC7Xb8sLzvLIl2ImMzcnNvh3w25+kDZiDyhs/HpuLyWp0
+Q1BGI7m2w2Bezwz70P9B1CA26dzfKrAkCDGytwKMtiUwEB4=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/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://fs-elcira-srv01.dir.garr.it/simplesamlphp/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://fs-elcira-srv01.dir.garr.it/simplesamlphp/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://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="it">Filesender erogato da GARR per il progetto ELCIRA</md:ServiceName>
+      <md:ServiceName xml:lang="en">Filesender provided by GARR for the ELCIRA project</md:ServiceName>
+      <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="cn" Name="urn:oid:2.5.4.3" 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="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="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="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="it">Consortium GARR</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">La rete italiana dell'universitàe della ricerca</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Italian Academic and Research Network</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>Administrator</md:GivenName>
+    <md:SurName>GARR</md:SurName>
+    <md:EmailAddress>mailto:grid-tech@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs-tst.uas.ox.ac.uk-adfs-services-trust.xml b/swamid-interfederations-2.0/fs-tst.uas.ox.ac.uk-adfs-services-trust.xml
new file mode 100644
index 00000000..b6957e5f
--- /dev/null
+++ b/swamid-interfederations-2.0/fs-tst.uas.ox.ac.uk-adfs-services-trust.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fs-tst.uas.ox.ac.uk/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-17T15:58:44Z"/>
+  </md:Extensions>
+  <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>
+						MIIEdTCCA12gAwIBAgIQAYeNkmekB/SM25iBZ344pTANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDUxNTAwMDAwMFoXDTE2MDUxNDIzNTk1OVowQjEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDExRmc2QtdHN0LnVh
+						cy5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALYVAWpu
+						sOdCft81RDGMmpFYRtzwQKWpMdCygldUxjphjl8x7h4YOh3EnTHFV969JZO0OM2N
+						Pd0OkOJpRIxQ+1NMlkEjDciIcV3hDqK6q7tUcOGN7Wxdshj1kprpABz7uwZY9voJ
+						QARQJDJsAcV4smSLcD5My+7ZuOZ/jE6CEOaE5e3RUYIevfTk4PUsT4vrQ1N32Hjs
+						lKlTzeaKhY2jLVQMO+mHNgufEGv/hUQFVGPYGDdXmLaJLw+K0sMbEY+IPRknlEBf
+						nTgW+ZY8HbQPrUlSeb7gWOL8wJG3g3CbXKGy7wl+XoSjwVrvJN/Pc0fBX6pChgAP
+						vcKXSX8rMG2bJv8CAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
+						KzdXR+qQ47ntMB0GA1UdDgQWBBRVo3xu6xD4PEcrqyYc/nZ7PnykbzAOBgNVHQ8B
+						Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
+						BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
+						BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+						QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+						cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+						L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZnNkLXRzdC51YXMub3gu
+						YWMudWswDQYJKoZIhvcNAQEFBQADggEBABlAGHmGLEBxaxnsE0cK3KLd2gbB8b3U
+						6eUylt0uD9i40aSgxhZaG5lP1CPco+jomeyZCtdnQJMz07NSWTet0Bzms6ZPMYOX
+						L/A7PAWjGP+nsdVHkKWO/LCwa1RwpQY7Y5gD89toQUNrVTc8UuNRpWdjpkFWrzQc
+						5ReHSCcpG3XnZgJiYeD8Fbm62qLq8DFStGxNl0LadOWtm0SYHk9AcXt0D3e63cde
+						KRxLQLd/2BKKh0D9ea3I2EIMU5uwzx11M6xDVTXyzwSf34Msj6YyYWx4QASETezM
+						Mz48c4qnZn8LgQbdVM0km+HhYvRWTRmWYSJMfP5oUKjKwY6omSi/R+0=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEdTCCA12gAwIBAgIQUBxe1RI1OSeeGJz+HrEzhjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDUxNTAwMDAwMFoXDTE2MDUxNDIzNTk1OVowQjEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDExRmc3MtdHN0LnVh
+						cy5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANdJ3HyV
+						4zb2QhQ7+oZ4pSt1mdc4zhkKxz2Uh3re0pTG72YxfiZTuyjcbE4MQysotAAQHvrt
+						ezyyC5RXOEAF5Rnvsmda4Qm4NF0FHFVSjULopBm6w363doFz79pL8Uj7OcG5w8Tw
+						ESotHf8a0UQcliwpTRY+seFSuLcexOGKNHG/F0bCMXTiNcJFYLAhJ5aF5WqDttPN
+						g3WwBozla6QRDZpvOPVZAVsR79wJ9ntVxy8U0zs1ErBm5AF1bpHLcQBHTOXvcreO
+						LeB8r0micOvJYndfD7ZpNnhCF80L3Msy/FmxyrAd1n4B/NfluCd8dB/wutSIlQfh
+						nhfN+1JcgUtIDRMCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
+						KzdXR+qQ47ntMB0GA1UdDgQWBBRf/qdLfo/Qs/aJMHLCOf/7p35aDDAOBgNVHQ8B
+						Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
+						BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
+						BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+						QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+						cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+						L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZnNzLXRzdC51YXMub3gu
+						YWMudWswDQYJKoZIhvcNAQEFBQADggEBAKn8mZS6VfJxeShly/I/YixiHwSnAsG8
+						rtH8N0rE7wmrnYUlZ048ihBc4Pv4f4i4YAL8ilujcqSNWt5XNBCM3+FyNDVOZOlm
+						94WZ9clNsDicnG4jC/jop0lETzrN/rYoqmIIqaKPd0HnUQU89Q/9K853+VOYY/Md
+						VmeNJ1CSgMW4bjC/oS4JutCCrrRisnlleRhWH5vQYIVSKOGOCaNqlHEkLSdX1irz
+						WeWFbCJV+mzUy6Glo2J5TT24L8LyZuPTpBqNura5SWBcT76qY7FYfnMrx54YhlEc
+						uZg2deYNiyxcEP4vZgQi764am9mYbcP3sYt1cTy8W+sTQYGKp/q0MoA=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs-tst.uas.ox.ac.uk/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs-tst.uas.ox.ac.uk/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-tst.uas.ox.ac.uk/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs-tst.uas.ox.ac.uk/adfs/ls/" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UAS Test Federation Server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.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/fs.liu.se-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml
new file mode 100644
index 00000000..e175793b
--- /dev/null
+++ b/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml
@@ -0,0 +1,564 @@
+<?xml version="1.0" encoding="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" ServiceDisplayName="fs.liu.se" 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" xsi:type="fed:ApplicationServiceType">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIRAIx+qgJAs6l/0gCkhAqJxJYwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMjAyMjgwMDAwMDBaFw0xNTAyMjcyMzU5NTlaMFQxCzAJBgNVBAYTAlNFMSAwHgYDVQQKDBdMaW5rw7ZwaW5ncyB1bml2ZXJzaXRldDEPMA0GA1UECxMGbGl1LWl0MRIwEAYDVQQDEwlmcy5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwrSCTd2hy/LyqOIdNuhewGL4YSNp2CBV/ZjUcOZe/qvKVuze7G/BwV+hheJKfd6OOkpj23T64y50qscNv4D1ge04hC0xtbCGZwJbjioD8iP5hmKeTnGsGWYlvsb6AO4YQzpaTxT0XgmT0eRBVkZ7yW/afQg/AWS19UOpmiBptnFnvpCIO/K0/71Y1Xn/WcRrfVMSWgCDLxQUyMb1dR3zkz+lfQcxsy1SGd/V6GWWZVrBu4lCmZSxp26VzpFcQr1KpyRtrQAJtqh/qvDpzYN/j7kSkVfUu6mekh1bkmciiuQ1j844Px+l3192DezDABlodDzFG1t3n4UNrSbhoS+EXAgMBAAGjggFcMIIBWDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUuVihgvK1m0ssH/3DACxPZ0yqPNQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFAYDVR0RBA0wC4IJZnMubGl1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQCKLN9EqeM45DjWs9wQplYHFRocX7WNpvQ1cIh45UjsaThCAJL1kID5nvUYU5Y4JAb1EgqFIAGzT17G9xbX7KUhgFbgyRBCuI3MPErjL4ERxGDEPSMHRK2KiNuAJjuC5JLrHFUBtN9RkJvRVkfQApdVspCNEEXplqn0/CGCz+b39PzayHEqrLrJ+ecDdOaWIvhO1eiGi70oRZWk7KoxzW3xvEnBAXc35JX04zhPip6DGOyJyINK0hNhkNeWdoK7QXG+FVhIcFtwFpR2nUt957L+qFsjcj2OVFbWhemsMagqnrf3HeZiPwzWJ2WsbdAgPDeAWDdLnLCsCIbVwtJmXYwU</ds:X509Certificate>
+        </ds: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
+EwJTRTEXMBUGA1UECAwOw5ZzdGVyZ8O2dGxhbmQxEzARBgNVBAcMCkxpbmvDtnBp
+bmcxIDAeBgNVBAoMF0xpbmvDtnBpbmdzIHVuaXZlcnNpdGV0MQ8wDQYDVQQLEwZM
+aVUtSVQxGTAXBgNVBAMTEGZzZGVjcnlwdC5saXUuc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQChPGysC8lsTi7EJHyrabNiyAW1pKBt8hDR7PiEOHWz
+/kDoxdoBftjelfewOvT+DM1t6WwQ3K2hbNDGuHmapaIuG/K491tXAZCiopcwZ4ud
+w7npBYJM3Err3sth2Yk3JtB69iN61t77hezMYyWd9yGmt5zd+DlXzzeJxNacWgkw
+W5ONAMRFCPV0VNBSk3QpxKe0V/VkhkGrwp2Jc+qVgykkUDPamyxc7cCnot1AFslS
+0WWl6LN1XllNxaqg8aYgNmRu/2w93SKPNfNEj94dlD5s4y4HuTIQhDtBLt4PEwPj
+5YUZRAu5LisOjhdljwkd3FrbTS/T5f/+pb8iYN8eY7YJAgMBAAGjggG/MIIBuzAf
+BgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQURqiugOjE
+pXEKObsutOUXMD8ucwkwGwYDVR0RBBQwEoIQZnNkZWNyeXB0LmxpdS5zZTAOBgNV
+HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1Ud
+HwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xD
+QTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NM
+Q0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxo
+dHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggr
+BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixo
+dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNV
+HRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB/beJOqNGjOrssjwprX+jSVvno
+IAv+XZgMIei0sLe4x0Ag6wp0sRG8/gchprI4cbZPPG70wDQcHIu8q/Rz4xV50FX9
+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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/claims/CommonName">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/claims/EmailAddress">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/claims/Group">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/claims/UPN">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname">
+        <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" ServiceDisplayName="fs.liu.se" 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" xsi:type="fed:SecurityTokenServiceType">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRAISQTiee8BSp/9eebQq2YZswDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMjAxMjYwMDAwMDBaFw0xNTAxMjUyMzU5NTlaMFsxCzAJBgNVBAYTAlNFMSAwHgYDVQQKDBdMaW5rw7ZwaW5ncyB1bml2ZXJzaXRldDEPMA0GA1UECxMGTGlVLUlUMRkwFwYDVQQDExBmc3NpZ25pbmcubGl1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJpMHOTDns/BTtMshB4C2J0Vqw+MjHpVcWc+u3PtFOjLjnZ6E4gN7zPuDvLJrVir9e2VnVNNOr0bUbVfdtd4JjGy/7GlSuXL5kcuynh4x6f6H6n4d5dtbtEtGLHIuQS9aIFdjTjtxqzQvQbYKyArIkVRdF/8tktF8rvFKseRKFjq2yfiE+0u9rgd0UYpItqc88sDdUUlA3O/C+WBxRty/TBobxNG8GsEk8E6/SSTgNNo4YSJRHQNjVSGXsZYgJPyVGiKIUga15Z91ZwK09Nyrm/Ua7mGmM+4hKRlm7K1RzScHfp5jGPwP/tGC/zkZ68NGeRtOVCGWgB7D1pUqGb5RQIDAQABo4IBYzCCAV8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLr1wkvttaxyXSeux9OCnl9vHxmJMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBsGA1UdEQQUMBKCEGZzc2lnbmluZy5saXUuc2UwDQYJKoZIhvcNAQEFBQADggEBAG9DoHcG664W4dp8xRHvyJg5C9G2ekXR6Zvq0X/OnKf1RXaBT2rEjQ2rpQhsmBUeIxdUunLSaMEtLckVq8SlLEXsGmyGraATDJKXmn+/fwVJGTGyHzDH7s0R3LpNRK85EpvXmJ2H3TXyvA6nhyC5SRSW76WoikpTbyh6E20B8Nn0Ba4JOyJ1QjPvqOwWVrVKAJKLjzPjyXp/YCnattTaMv/6qxFA3uWIf8VxOF6+qdr7XhdrTQtGCs7ufzhTvvNNuTKiLgWQkcIIadJUbmaEgPSVHXpvReb4uagfQpldYK9186Jl7Dhp6yVdWTHNleWzJPycBrMeX05CYmlqXhhXHIg=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAdlHVjMUXk6RFVjqYeenpjANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
+EwJTRTEXMBUGA1UECAwOw5ZzdGVyZ8O2dGxhbmQxEzARBgNVBAcMCkxpbmvDtnBp
+bmcxIDAeBgNVBAoMF0xpbmvDtnBpbmdzIHVuaXZlcnNpdGV0MQ8wDQYDVQQLEwZM
+aVUtSVQxGTAXBgNVBAMTEGZzc2lnbmluZy5saXUuc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCS5bpEkEcbJAsNdgyK1QYAbuq5PKl8bAcujqKIRZAr
+4uixWudDxRVhwOxDyZMTZGN0vNVdf+ZtUZQ9NWYaLcgEvzxhNbsA0fmTSwRlMvxj
+0R/JbDs5Slmew11wZ6rxgX7wRv8rjB3PSdf/SVc5LKgcDuCCGCLv+OE7d4K13OfK
+BxUv/vrD7upz6lgT79OWX6udFhU8sXmP8u8P/mID83o5N32hwxymRuEmjnLiVIrU
+R4cF5EwgblrpoqQKeGKdkroZApU0EJxvtopesVgUEGXW4tkogTJ8qtSPQK8iPEet
+eR6YpFCIxIbE0gpwDgo0bubt8T+FkQE71SLvbhv9RcZBAgMBAAGjggG/MIIBuzAf
+BgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQU8vPdaPx+
+JhyN970NWqrTcbU/c0MwGwYDVR0RBBQwEoIQZnNzaWduaW5nLmxpdS5zZTAOBgNV
+HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1Ud
+HwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xD
+QTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NM
+Q0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxo
+dHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggr
+BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixo
+dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNV
+HRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQCgqdZfizsQZYpLif+sV+mgkkln
+6WVGv1KVw2xvRDO9jF192qjkL9zmB081qOydPtt8aLbXQHp13M/URoFK2Vvdikq5
+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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/claims/CommonName">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/claims/EmailAddress">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/claims/Group">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/claims/UPN">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname">
+        <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:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+            <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>
+        </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="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIRAIx+qgJAs6l/0gCkhAqJxJYwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMjAyMjgwMDAwMDBaFw0xNTAyMjcyMzU5NTlaMFQxCzAJBgNVBAYTAlNFMSAwHgYDVQQKDBdMaW5rw7ZwaW5ncyB1bml2ZXJzaXRldDEPMA0GA1UECxMGbGl1LWl0MRIwEAYDVQQDEwlmcy5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwrSCTd2hy/LyqOIdNuhewGL4YSNp2CBV/ZjUcOZe/qvKVuze7G/BwV+hheJKfd6OOkpj23T64y50qscNv4D1ge04hC0xtbCGZwJbjioD8iP5hmKeTnGsGWYlvsb6AO4YQzpaTxT0XgmT0eRBVkZ7yW/afQg/AWS19UOpmiBptnFnvpCIO/K0/71Y1Xn/WcRrfVMSWgCDLxQUyMb1dR3zkz+lfQcxsy1SGd/V6GWWZVrBu4lCmZSxp26VzpFcQr1KpyRtrQAJtqh/qvDpzYN/j7kSkVfUu6mekh1bkmciiuQ1j844Px+l3192DezDABlodDzFG1t3n4UNrSbhoS+EXAgMBAAGjggFcMIIBWDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUuVihgvK1m0ssH/3DACxPZ0yqPNQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFAYDVR0RBA0wC4IJZnMubGl1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQCKLN9EqeM45DjWs9wQplYHFRocX7WNpvQ1cIh45UjsaThCAJL1kID5nvUYU5Y4JAb1EgqFIAGzT17G9xbX7KUhgFbgyRBCuI3MPErjL4ERxGDEPSMHRK2KiNuAJjuC5JLrHFUBtN9RkJvRVkfQApdVspCNEEXplqn0/CGCz+b39PzayHEqrLrJ+ecDdOaWIvhO1eiGi70oRZWk7KoxzW3xvEnBAXc35JX04zhPip6DGOyJyINK0hNhkNeWdoK7QXG+FVhIcFtwFpR2nUt957L+qFsjcj2OVFbWhemsMagqnrf3HeZiPwzWJ2WsbdAgPDeAWDdLnLCsCIbVwtJmXYwU</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRAISQTiee8BSp/9eebQq2YZswDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMjAxMjYwMDAwMDBaFw0xNTAxMjUyMzU5NTlaMFsxCzAJBgNVBAYTAlNFMSAwHgYDVQQKDBdMaW5rw7ZwaW5ncyB1bml2ZXJzaXRldDEPMA0GA1UECxMGTGlVLUlUMRkwFwYDVQQDExBmc3NpZ25pbmcubGl1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJpMHOTDns/BTtMshB4C2J0Vqw+MjHpVcWc+u3PtFOjLjnZ6E4gN7zPuDvLJrVir9e2VnVNNOr0bUbVfdtd4JjGy/7GlSuXL5kcuynh4x6f6H6n4d5dtbtEtGLHIuQS9aIFdjTjtxqzQvQbYKyArIkVRdF/8tktF8rvFKseRKFjq2yfiE+0u9rgd0UYpItqc88sDdUUlA3O/C+WBxRty/TBobxNG8GsEk8E6/SSTgNNo4YSJRHQNjVSGXsZYgJPyVGiKIUga15Z91ZwK09Nyrm/Ua7mGmM+4hKRlm7K1RzScHfp5jGPwP/tGC/zkZ68NGeRtOVCGWgB7D1pUqGb5RQIDAQABo4IBYzCCAV8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLr1wkvttaxyXSeux9OCnl9vHxmJMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBsGA1UdEQQUMBKCEGZzc2lnbmluZy5saXUuc2UwDQYJKoZIhvcNAQEFBQADggEBAG9DoHcG664W4dp8xRHvyJg5C9G2ekXR6Zvq0X/OnKf1RXaBT2rEjQ2rpQhsmBUeIxdUunLSaMEtLckVq8SlLEXsGmyGraATDJKXmn+/fwVJGTGyHzDH7s0R3LpNRK85EpvXmJ2H3TXyvA6nhyC5SRSW76WoikpTbyh6E20B8Nn0Ba4JOyJ1QjPvqOwWVrVKAJKLjzPjyXp/YCnattTaMv/6qxFA3uWIf8VxOF6+qdr7XhdrTQtGCs7ufzhTvvNNuTKiLgWQkcIIadJUbmaEgPSVHXpvReb4uagfQpldYK9186Jl7Dhp6yVdWTHNleWzJPycBrMeX05CYmlqXhhXHIg=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAdlHVjMUXk6RFVjqYeenpjANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
+EwJTRTEXMBUGA1UECAwOw5ZzdGVyZ8O2dGxhbmQxEzARBgNVBAcMCkxpbmvDtnBp
+bmcxIDAeBgNVBAoMF0xpbmvDtnBpbmdzIHVuaXZlcnNpdGV0MQ8wDQYDVQQLEwZM
+aVUtSVQxGTAXBgNVBAMTEGZzc2lnbmluZy5saXUuc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCS5bpEkEcbJAsNdgyK1QYAbuq5PKl8bAcujqKIRZAr
+4uixWudDxRVhwOxDyZMTZGN0vNVdf+ZtUZQ9NWYaLcgEvzxhNbsA0fmTSwRlMvxj
+0R/JbDs5Slmew11wZ6rxgX7wRv8rjB3PSdf/SVc5LKgcDuCCGCLv+OE7d4K13OfK
+BxUv/vrD7upz6lgT79OWX6udFhU8sXmP8u8P/mID83o5N32hwxymRuEmjnLiVIrU
+R4cF5EwgblrpoqQKeGKdkroZApU0EJxvtopesVgUEGXW4tkogTJ8qtSPQK8iPEet
+eR6YpFCIxIbE0gpwDgo0bubt8T+FkQE71SLvbhv9RcZBAgMBAAGjggG/MIIBuzAf
+BgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQU8vPdaPx+
+JhyN970NWqrTcbU/c0MwGwYDVR0RBBQwEoIQZnNzaWduaW5nLmxpdS5zZTAOBgNV
+HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1Ud
+HwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xD
+QTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NM
+Q0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxo
+dHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggr
+BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixo
+dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNV
+HRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQCgqdZfizsQZYpLif+sV+mgkkln
+6WVGv1KVw2xvRDO9jF192qjkL9zmB081qOydPtt8aLbXQHp13M/URoFK2Vvdikq5
+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
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
+EwJTRTEXMBUGA1UECAwOw5ZzdGVyZ8O2dGxhbmQxEzARBgNVBAcMCkxpbmvDtnBp
+bmcxIDAeBgNVBAoMF0xpbmvDtnBpbmdzIHVuaXZlcnNpdGV0MQ8wDQYDVQQLEwZM
+aVUtSVQxGTAXBgNVBAMTEGZzZGVjcnlwdC5saXUuc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQChPGysC8lsTi7EJHyrabNiyAW1pKBt8hDR7PiEOHWz
+/kDoxdoBftjelfewOvT+DM1t6WwQ3K2hbNDGuHmapaIuG/K491tXAZCiopcwZ4ud
+w7npBYJM3Err3sth2Yk3JtB69iN61t77hezMYyWd9yGmt5zd+DlXzzeJxNacWgkw
+W5ONAMRFCPV0VNBSk3QpxKe0V/VkhkGrwp2Jc+qVgykkUDPamyxc7cCnot1AFslS
+0WWl6LN1XllNxaqg8aYgNmRu/2w93SKPNfNEj94dlD5s4y4HuTIQhDtBLt4PEwPj
+5YUZRAu5LisOjhdljwkd3FrbTS/T5f/+pb8iYN8eY7YJAgMBAAGjggG/MIIBuzAf
+BgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQURqiugOjE
+pXEKObsutOUXMD8ucwkwGwYDVR0RBBQwEoIQZnNkZWNyeXB0LmxpdS5zZTAOBgNV
+HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1Ud
+HwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xD
+QTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NM
+Q0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxo
+dHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggr
+BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixo
+dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNV
+HRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB/beJOqNGjOrssjwprX+jSVvno
+IAv+XZgMIei0sLe4x0Ag6wp0sRG8/gchprI4cbZPPG70wDQcHIu8q/Rz4xV50FX9
+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 height="68" width="350" xml:lang="sv">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
+        <mdui:Logo height="68" width="350" xml:lang="en">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="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIRAIx+qgJAs6l/0gCkhAqJxJYwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMjAyMjgwMDAwMDBaFw0xNTAyMjcyMzU5NTlaMFQxCzAJBgNVBAYTAlNFMSAwHgYDVQQKDBdMaW5rw7ZwaW5ncyB1bml2ZXJzaXRldDEPMA0GA1UECxMGbGl1LWl0MRIwEAYDVQQDEwlmcy5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwrSCTd2hy/LyqOIdNuhewGL4YSNp2CBV/ZjUcOZe/qvKVuze7G/BwV+hheJKfd6OOkpj23T64y50qscNv4D1ge04hC0xtbCGZwJbjioD8iP5hmKeTnGsGWYlvsb6AO4YQzpaTxT0XgmT0eRBVkZ7yW/afQg/AWS19UOpmiBptnFnvpCIO/K0/71Y1Xn/WcRrfVMSWgCDLxQUyMb1dR3zkz+lfQcxsy1SGd/V6GWWZVrBu4lCmZSxp26VzpFcQr1KpyRtrQAJtqh/qvDpzYN/j7kSkVfUu6mekh1bkmciiuQ1j844Px+l3192DezDABlodDzFG1t3n4UNrSbhoS+EXAgMBAAGjggFcMIIBWDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUuVihgvK1m0ssH/3DACxPZ0yqPNQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFAYDVR0RBA0wC4IJZnMubGl1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQCKLN9EqeM45DjWs9wQplYHFRocX7WNpvQ1cIh45UjsaThCAJL1kID5nvUYU5Y4JAb1EgqFIAGzT17G9xbX7KUhgFbgyRBCuI3MPErjL4ERxGDEPSMHRK2KiNuAJjuC5JLrHFUBtN9RkJvRVkfQApdVspCNEEXplqn0/CGCz+b39PzayHEqrLrJ+ecDdOaWIvhO1eiGi70oRZWk7KoxzW3xvEnBAXc35JX04zhPip6DGOyJyINK0hNhkNeWdoK7QXG+FVhIcFtwFpR2nUt957L+qFsjcj2OVFbWhemsMagqnrf3HeZiPwzWJ2WsbdAgPDeAWDdLnLCsCIbVwtJmXYwU</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRAISQTiee8BSp/9eebQq2YZswDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMjAxMjYwMDAwMDBaFw0xNTAxMjUyMzU5NTlaMFsxCzAJBgNVBAYTAlNFMSAwHgYDVQQKDBdMaW5rw7ZwaW5ncyB1bml2ZXJzaXRldDEPMA0GA1UECxMGTGlVLUlUMRkwFwYDVQQDExBmc3NpZ25pbmcubGl1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJpMHOTDns/BTtMshB4C2J0Vqw+MjHpVcWc+u3PtFOjLjnZ6E4gN7zPuDvLJrVir9e2VnVNNOr0bUbVfdtd4JjGy/7GlSuXL5kcuynh4x6f6H6n4d5dtbtEtGLHIuQS9aIFdjTjtxqzQvQbYKyArIkVRdF/8tktF8rvFKseRKFjq2yfiE+0u9rgd0UYpItqc88sDdUUlA3O/C+WBxRty/TBobxNG8GsEk8E6/SSTgNNo4YSJRHQNjVSGXsZYgJPyVGiKIUga15Z91ZwK09Nyrm/Ua7mGmM+4hKRlm7K1RzScHfp5jGPwP/tGC/zkZ68NGeRtOVCGWgB7D1pUqGb5RQIDAQABo4IBYzCCAV8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLr1wkvttaxyXSeux9OCnl9vHxmJMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBsGA1UdEQQUMBKCEGZzc2lnbmluZy5saXUuc2UwDQYJKoZIhvcNAQEFBQADggEBAG9DoHcG664W4dp8xRHvyJg5C9G2ekXR6Zvq0X/OnKf1RXaBT2rEjQ2rpQhsmBUeIxdUunLSaMEtLckVq8SlLEXsGmyGraATDJKXmn+/fwVJGTGyHzDH7s0R3LpNRK85EpvXmJ2H3TXyvA6nhyC5SRSW76WoikpTbyh6E20B8Nn0Ba4JOyJ1QjPvqOwWVrVKAJKLjzPjyXp/YCnattTaMv/6qxFA3uWIf8VxOF6+qdr7XhdrTQtGCs7ufzhTvvNNuTKiLgWQkcIIadJUbmaEgPSVHXpvReb4uagfQpldYK9186Jl7Dhp6yVdWTHNleWzJPycBrMeX05CYmlqXhhXHIg=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAdlHVjMUXk6RFVjqYeenpjANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
+EwJTRTEXMBUGA1UECAwOw5ZzdGVyZ8O2dGxhbmQxEzARBgNVBAcMCkxpbmvDtnBp
+bmcxIDAeBgNVBAoMF0xpbmvDtnBpbmdzIHVuaXZlcnNpdGV0MQ8wDQYDVQQLEwZM
+aVUtSVQxGTAXBgNVBAMTEGZzc2lnbmluZy5saXUuc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCS5bpEkEcbJAsNdgyK1QYAbuq5PKl8bAcujqKIRZAr
+4uixWudDxRVhwOxDyZMTZGN0vNVdf+ZtUZQ9NWYaLcgEvzxhNbsA0fmTSwRlMvxj
+0R/JbDs5Slmew11wZ6rxgX7wRv8rjB3PSdf/SVc5LKgcDuCCGCLv+OE7d4K13OfK
+BxUv/vrD7upz6lgT79OWX6udFhU8sXmP8u8P/mID83o5N32hwxymRuEmjnLiVIrU
+R4cF5EwgblrpoqQKeGKdkroZApU0EJxvtopesVgUEGXW4tkogTJ8qtSPQK8iPEet
+eR6YpFCIxIbE0gpwDgo0bubt8T+FkQE71SLvbhv9RcZBAgMBAAGjggG/MIIBuzAf
+BgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQU8vPdaPx+
+JhyN970NWqrTcbU/c0MwGwYDVR0RBBQwEoIQZnNzaWduaW5nLmxpdS5zZTAOBgNV
+HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1Ud
+HwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xD
+QTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NM
+Q0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxo
+dHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggr
+BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixo
+dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNV
+HRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQCgqdZfizsQZYpLif+sV+mgkkln
+6WVGv1KVw2xvRDO9jF192qjkL9zmB081qOydPtt8aLbXQHp13M/URoFK2Vvdikq5
+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
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
+EwJTRTEXMBUGA1UECAwOw5ZzdGVyZ8O2dGxhbmQxEzARBgNVBAcMCkxpbmvDtnBp
+bmcxIDAeBgNVBAoMF0xpbmvDtnBpbmdzIHVuaXZlcnNpdGV0MQ8wDQYDVQQLEwZM
+aVUtSVQxGTAXBgNVBAMTEGZzZGVjcnlwdC5saXUuc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQChPGysC8lsTi7EJHyrabNiyAW1pKBt8hDR7PiEOHWz
+/kDoxdoBftjelfewOvT+DM1t6WwQ3K2hbNDGuHmapaIuG/K491tXAZCiopcwZ4ud
+w7npBYJM3Err3sth2Yk3JtB69iN61t77hezMYyWd9yGmt5zd+DlXzzeJxNacWgkw
+W5ONAMRFCPV0VNBSk3QpxKe0V/VkhkGrwp2Jc+qVgykkUDPamyxc7cCnot1AFslS
+0WWl6LN1XllNxaqg8aYgNmRu/2w93SKPNfNEj94dlD5s4y4HuTIQhDtBLt4PEwPj
+5YUZRAu5LisOjhdljwkd3FrbTS/T5f/+pb8iYN8eY7YJAgMBAAGjggG/MIIBuzAf
+BgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQURqiugOjE
+pXEKObsutOUXMD8ucwkwGwYDVR0RBBQwEoIQZnNkZWNyeXB0LmxpdS5zZTAOBgNV
+HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1Ud
+HwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xD
+QTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NM
+Q0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxo
+dHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggr
+BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixo
+dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNV
+HRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB/beJOqNGjOrssjwprX+jSVvno
+IAv+XZgMIei0sLe4x0Ag6wp0sRG8/gchprI4cbZPPG70wDQcHIu8q/Rz4xV50FX9
+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" FriendlyName="E-Mail Address" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Given Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="UPN" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Common Name" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x E-Mail Address" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x UPN" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Role" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Surname" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="PPID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name ID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication time stamp" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication method" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only group SID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Windows account name" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+  </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>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>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.uas.ox.ac.uk-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.uas.ox.ac.uk-adfs-services-trust.xml
new file mode 100644
index 00000000..1ba945a5
--- /dev/null
+++ b/swamid-interfederations-2.0/fs.uas.ox.ac.uk-adfs-services-trust.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fs.uas.ox.ac.uk/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-05T11:05:53Z"/>
+  </md:Extensions>
+  <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>
+						MIIEbTCCA1WgAwIBAgIQMQY/7MXlAw+1Tl71n40arTANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDczMTAwMDAwMFoXDTE2MDczMDIzNTk1OVowPjEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBmc2QudWFzLm94
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2PsgyM8FIz8Q
+						lHrIVQvVwOS48zVrG0x2cssguV85eR4uDsFN32+QySrDW1lkJtoSim0BeRg2e60x
+						PawlF5IYUjTzAdUICwpXQWXvIqKbDggQlsMgKtVB9PXsQy40fOhrnwgsV6Af7Pi7
+						5knD5gLoKpTcp9odZdqRV33e4JrUkdm3YCPcGD6L4RYOn9ebUCO6dyG/xchkiOqE
+						BSUJCy3JZy25Zz7QvOPML7LPmqlu8Qv0RF2+sF4TF/U+tEVm7mx+gTLaaW9YFvaL
+						f7oRzu+W6NZ5h+DtsArIngTYjW2/1ZLUC12HPGI9+NSicKJQmYFTOJWCJEiq2akL
+						QlKPmlGVXwIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+						6pDjue0wHQYDVR0OBBYEFH7b9Q1+6IMLbrwmwa8iUX644vSeMA4GA1UdDwEB/wQE
+						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+						cC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBmc2QudWFzLm94LmFjLnVrMA0G
+						CSqGSIb3DQEBBQUAA4IBAQBGzlxDHF1+8ihZg3lgn+z2zzkCQLaLoklE8+tyWwSe
+						j43QQmk0RZlOdC6znIUt+3R4ojqZyt+UWXQEXAmLFCRjZrlAoCsFUPRe4J++0PzK
+						5wSwmACShNC33p2Akt56UGpsCoyCxRJFYBv3x3ypOpI3EvEuFiNtE3Pgx7AH3aNE
+						az44a9ZQ04GILbDV5wOfnkTuyIex3nlpwEliY7tAXeo+5cs+pHmwqQQHSaLE/ozZ
+						JyqA/DlMNJJjJzNCo9raeuuw3j0A+bWjeY7smiWhBFNUYyGeWwcDCAMo5uqGTOGf
+						AuFy/3fEpMBaIz8MHJYjeAZJiymMUv+hOo/OtUKtuQj3
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEbjCCA1agAwIBAgIRALxjGrZNPULfZMV/GGfax6cwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA3MzEwMDAwMDBaFw0xNjA3MzAyMzU5NTlaMD4xITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQZnNzLnVhcy5v
+						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEJ/jsJh4AO
+						qqIqYTWvTsob4PPzlhAWTzLtEDZxwS7foQfH2Q5adr4CEX781ZWGUafyOLADrEj7
+						1FUFZ2CLDxu/2/865ZjN/eRVlWWJkjqyxCXrVs63fCJpxj5ZLQ1m27Kx2i10/n/O
+						ZoEr5Zd5732f8a9hMYU6einwUvaku3NLlkzBv4ALiXoqAB+xLBeF+tenxg0abugZ
+						jnsvkjlWQoq723NVAc1nTZB6ngqAOLKl80DqU1jwVdmpdir1utWeadGRYrVcAZMW
+						OJ/moFSWDtG8TAwEdCJoOx8Ka/dgwYjXkH5eumT7jBuCRplz13a3+61oK45pKqeT
+						NHHUw4xOvh0CAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+						R+qQ47ntMB0GA1UdDgQWBBReU+BBsSo9x5OVvVRIYNXb4jB0yzAOBgNVHQ8BAf8E
+						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+						MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+						cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+						c3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQZnNzLnVhcy5veC5hYy51azAN
+						BgkqhkiG9w0BAQUFAAOCAQEAmAPn0j0WX1XekgeMqTvqQkDx9+95SjmOVW4UHmi8
+						jM712t1G+tvaRztm8q9e+YK3TWj6Tjd7cdZK68TO+VggUuTKu0tfiaU0+Z0FUomy
+						7+z5Kt1+yivEqyKBtvi0ihuhLIBwZDd6FN3/0gkGoENnVntOZEy+b4vj+wI+88e9
+						3PNTPU55j1nD8JnMt0iMH04Z2R/kGG0GCkFFFT4J1zf2ViHoX3YPxTqFvvIkcUDU
+						e6h1UYCvavHLlQEC+czI6vJRez2hUUjy/oAWhVJplQJgWNCo+Kbwn4gwgxJflKMy
+						ixBBoodIxlw3Tiy8SOzpfplaySdFtJStux1l1daGfEQhfQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.uas.ox.ac.uk/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.uas.ox.ac.uk/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.uas.ox.ac.uk/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.uas.ox.ac.uk/adfs/ls/" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford, UAS Federation Server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.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/fsso-qa1.springer.com.xml b/swamid-interfederations-2.0/fsso-qa1.springer.com.xml
new file mode 100644
index 00000000..4b67eaa5
--- /dev/null
+++ b/swamid-interfederations-2.0/fsso-qa1.springer.com.xml
@@ -0,0 +1,90 @@
+<?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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDEzCCAfugAwIBAgIJAIgB6MX8x0mOMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMMFWZzc28tcWExLnNwcmluZ2VyLmNvbTAeFw0xMjA5MTkxMzQxMjZaFw0xNTA5
+						MTkxMzQxMjZaMCAxHjAcBgNVBAMMFWZzc28tcWExLnNwcmluZ2VyLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANIFkFjck1/rKaDpJrszCV8VnSwq
+						6EVJkRpHY26HOZ7VGCHsl6u2Gv2L3t9erYwEu9LmEjXiuoW5smERPRC4BqiU+ULU
+						0S3jEzjCyM0vOeJ9j8uNjYmbxYJzggiN1Y8MuhQ+JPtj3pdB3cr2FONFtFeN2W4a
+						sgH42IlykGrdhKKPoURkLWuHJRw1U0ZhRB7rXY8tVD+ChqaV/IJelIIovpLUfEdM
+						OC3wQzEogeuCtSKpbquJJhQFbtOqp46+diEIFJkD9L8P7tTzGYgGfWL+/4Ea51wg
+						CKqWDeinI0VVjftVKpxIerwYyKOmOAl4pw7DEEvT38PbFK5ObowkLglsziMCAwEA
+						AaNQME4wHQYDVR0OBBYEFO6zvNR3jfkuVFwSXjnS8ag18UxPMB8GA1UdIwQYMBaA
+						FO6zvNR3jfkuVFwSXjnS8ag18UxPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
+						BQADggEBAJVtHWCr4dbkypJa24kie/p9X55HnRbj47BTQwrCHeThAfW67zDDbC99
+						wxWq7epxWfq8PSdICkUm1svz4ZWefZJHe8lvg4+l/ATtxBH7BHfCW6luupNTMEV4
+						CpC4vZKPvaVfo6sQskQEFlWoLJbewQlJsdd6AwLToc3059MZQM7O6gqCDIInqm1u
+						m3lp3+AzxtkFg9g9w7heUfBX2wjif+ollAiY/2XI6etkiYp9RffatyD64ccUq1Jo
+						yPcZVCGr34WZ1fQUOx4vXlz1zXtv2ZRz2OGnISefzep2Divi51DnexJFgsZV0wUt
+						5DWi+0pXRTwWmWEpu69CK55YWwy6BgI=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDEzCCAfugAwIBAgIJAIgB6MX8x0mOMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMMFWZzc28tcWExLnNwcmluZ2VyLmNvbTAeFw0xMjA5MTkxMzQxMjZaFw0xNTA5
+						MTkxMzQxMjZaMCAxHjAcBgNVBAMMFWZzc28tcWExLnNwcmluZ2VyLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANIFkFjck1/rKaDpJrszCV8VnSwq
+						6EVJkRpHY26HOZ7VGCHsl6u2Gv2L3t9erYwEu9LmEjXiuoW5smERPRC4BqiU+ULU
+						0S3jEzjCyM0vOeJ9j8uNjYmbxYJzggiN1Y8MuhQ+JPtj3pdB3cr2FONFtFeN2W4a
+						sgH42IlykGrdhKKPoURkLWuHJRw1U0ZhRB7rXY8tVD+ChqaV/IJelIIovpLUfEdM
+						OC3wQzEogeuCtSKpbquJJhQFbtOqp46+diEIFJkD9L8P7tTzGYgGfWL+/4Ea51wg
+						CKqWDeinI0VVjftVKpxIerwYyKOmOAl4pw7DEEvT38PbFK5ObowkLglsziMCAwEA
+						AaNQME4wHQYDVR0OBBYEFO6zvNR3jfkuVFwSXjnS8ag18UxPMB8GA1UdIwQYMBaA
+						FO6zvNR3jfkuVFwSXjnS8ag18UxPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
+						BQADggEBAJVtHWCr4dbkypJa24kie/p9X55HnRbj47BTQwrCHeThAfW67zDDbC99
+						wxWq7epxWfq8PSdICkUm1svz4ZWefZJHe8lvg4+l/ATtxBH7BHfCW6luupNTMEV4
+						CpC4vZKPvaVfo6sQskQEFlWoLJbewQlJsdd6AwLToc3059MZQM7O6gqCDIInqm1u
+						m3lp3+AzxtkFg9g9w7heUfBX2wjif+ollAiY/2XI6etkiYp9RffatyD64ccUq1Jo
+						yPcZVCGr34WZ1fQUOx4vXlz1zXtv2ZRz2OGnISefzep2Divi51DnexJFgsZV0wUt
+						5DWi+0pXRTwWmWEpu69CK55YWwy6BgI=
+					</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>
diff --git a/swamid-interfederations-2.0/fsso-qa2.springer.com.xml b/swamid-interfederations-2.0/fsso-qa2.springer.com.xml
new file mode 100644
index 00000000..71d9433e
--- /dev/null
+++ b/swamid-interfederations-2.0/fsso-qa2.springer.com.xml
@@ -0,0 +1,90 @@
+<?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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDEzCCAfugAwIBAgIJAJsXfRoT9nFiMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMMFWZzc28tcWEyLnNwcmluZ2VyLmNvbTAeFw0xMjA5MTkxMzQ4NDRaFw0xNTA5
+						MTkxMzQ4NDRaMCAxHjAcBgNVBAMMFWZzc28tcWEyLnNwcmluZ2VyLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwj/bQpeZnvV33uM0k9Tfk8vLnj
+						OD/UxaqCYeEGXKHhdjnHDLiBvyPb7VrL7wVhqfvHuElpQIMA1/bBJCiOZ8BiSu1Z
+						BQ57iNGCtezvaOxzrW0MLgLo41QiVFFrYNzg3i585anaAMBLFrutSlh05rGCbocz
+						xq0gMrSGOhwtxrYQvDhsKt2Yc6+5LzzAn91A8B5R/NvzVRsbrwf8q8Oy0WcB++IY
+						wLyiwUWJbFxpmpDcqedzN1seTu2F8cl55ksu6ZJWttnkcnOJuzHcNKcl0+xg2aya
+						8RQcKHYqQVB0bzo9DCXRADseJEdoPxh52qWHZkIfbW9VKFs0/t1A9eOVHgcCAwEA
+						AaNQME4wHQYDVR0OBBYEFFsaSHVyMUFffDSP4TeXUCW60XLhMB8GA1UdIwQYMBaA
+						FFsaSHVyMUFffDSP4TeXUCW60XLhMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
+						BQADggEBAH4tkSu6O/t+ajPtRhHOKjIZUCRoCzNBtaOJ9I/vUCZqcpgOJ0m4xDDf
+						LHiQssArvTgbm3D6c64l+dcRyEyvgX71A18H0l+OJNpZGkqwzI4HhsbUFfGkSKa+
+						oWy1agHoITPBRy27Vx9s6BB6S/9usu5AEsoZEulKVw+pfI843UyzYY2uGvU4r4Nw
+						r6CqNtkAbPJiGfWiFJOCtph7ivSFGJZuZa+SfbiV/GoUfANNUIz48rqf5aNXH1x/
+						B4/qkA7WocSLG9e1TWCYIVskbQ8gJMFrADqKnZCDiZumwSOHB3K1KPhW6TAZpuaS
+						m5RO/6R5WHAfZ4PUemmVk1HPJ22XsXE=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDEzCCAfugAwIBAgIJAJsXfRoT9nFiMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMMFWZzc28tcWEyLnNwcmluZ2VyLmNvbTAeFw0xMjA5MTkxMzQ4NDRaFw0xNTA5
+						MTkxMzQ4NDRaMCAxHjAcBgNVBAMMFWZzc28tcWEyLnNwcmluZ2VyLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwj/bQpeZnvV33uM0k9Tfk8vLnj
+						OD/UxaqCYeEGXKHhdjnHDLiBvyPb7VrL7wVhqfvHuElpQIMA1/bBJCiOZ8BiSu1Z
+						BQ57iNGCtezvaOxzrW0MLgLo41QiVFFrYNzg3i585anaAMBLFrutSlh05rGCbocz
+						xq0gMrSGOhwtxrYQvDhsKt2Yc6+5LzzAn91A8B5R/NvzVRsbrwf8q8Oy0WcB++IY
+						wLyiwUWJbFxpmpDcqedzN1seTu2F8cl55ksu6ZJWttnkcnOJuzHcNKcl0+xg2aya
+						8RQcKHYqQVB0bzo9DCXRADseJEdoPxh52qWHZkIfbW9VKFs0/t1A9eOVHgcCAwEA
+						AaNQME4wHQYDVR0OBBYEFFsaSHVyMUFffDSP4TeXUCW60XLhMB8GA1UdIwQYMBaA
+						FFsaSHVyMUFffDSP4TeXUCW60XLhMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
+						BQADggEBAH4tkSu6O/t+ajPtRhHOKjIZUCRoCzNBtaOJ9I/vUCZqcpgOJ0m4xDDf
+						LHiQssArvTgbm3D6c64l+dcRyEyvgX71A18H0l+OJNpZGkqwzI4HhsbUFfGkSKa+
+						oWy1agHoITPBRy27Vx9s6BB6S/9usu5AEsoZEulKVw+pfI843UyzYY2uGvU4r4Nw
+						r6CqNtkAbPJiGfWiFJOCtph7ivSFGJZuZa+SfbiV/GoUfANNUIz48rqf5aNXH1x/
+						B4/qkA7WocSLG9e1TWCYIVskbQ8gJMFrADqKnZCDiZumwSOHB3K1KPhW6TAZpuaS
+						m5RO/6R5WHAfZ4PUemmVk1HPJ22XsXE=
+					</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>
diff --git a/swamid-interfederations-2.0/fsso.springer.com.xml b/swamid-interfederations-2.0/fsso.springer.com.xml
new file mode 100644
index 00000000..3a684c63
--- /dev/null
+++ b/swamid-interfederations-2.0/fsso.springer.com.xml
@@ -0,0 +1,117 @@
+<?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>
+      <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>
+						MIIFCjCCA/KgAwIBAgIQLjTwCOU9tS/TtpogR6vgozANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTQwODE5
+						MDAwMDAwWhcNMTcwODE0MjM1OTU5WjBeMQswCQYDVQQGEwJHQjEPMA0GA1UECBMG
+						TG9uZG9uMQ8wDQYDVQQHFAZMb25kb24xETAPBgNVBAoUCFNwcmluZ2VyMRowGAYD
+						VQQDFBFmc3NvLnNwcmluZ2VyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAK2hLMYUogo2xzXswFPraYX07zwDLpetg/Fev9O8EmYjdBMoX18P857n
+						FTsyOEi9L3KaUlXQ7IaX6LWHWC19m0BTbXjdCBy8tqzuS6ZX7sFZ6WMEHtkYCeCV
+						0ThN1BG1KG3fZ4W045Ys+/f25zXXyO123wkxa7Qx/xSJM/zNP3mKLReww68RL98q
+						HbNjkDoQ2YP9R6YzAuPCZukw8UkbhK0STJqzRn3VcBXvCVKCdYAKD4U7uRWsssUu
+						YDJU329KJv4LasZBwZ4TCIdKQh317wRXFw0BKFVL1AVb/0Hs9YEyuHfB5qVXC8+7
+						fAjC3nmSxK7f9Jk/nnHdV14704zAH9UCAwEAAaOCAWowggFmMBwGA1UdEQQVMBOC
+						EWZzc28uc3ByaW5nZXIuY29tMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMCsG
+						A1UdHwQkMCIwIKAeoByGGmh0dHA6Ly9zZC5zeW1jYi5jb20vc2QuY3JsMGUGA1Ud
+						IAReMFwwWgYKYIZIAYb4RQEHNjBMMCMGCCsGAQUFBwIBFhdodHRwczovL2Quc3lt
+						Y2IuY29tL2NwczAlBggrBgEFBQcCAjAZFhdodHRwczovL2Quc3ltY2IuY29tL3Jw
+						YTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUDURc
+						FlNEwYJ+HSCrJfQBY9i+eaUwVwYIKwYBBQUHAQEESzBJMB8GCCsGAQUFBzABhhNo
+						dHRwOi8vc2Quc3ltY2QuY29tMCYGCCsGAQUFBzAChhpodHRwOi8vc2Quc3ltY2Iu
+						Y29tL3NkLmNydDANBgkqhkiG9w0BAQUFAAOCAQEAN0E+lQkTOxlaKMAyBWN3EwBt
+						/YeVGMW3L7BEqXnczaUdFWDrx6do0QacO0JAzzl1GR4qBa1OxZ/ciQSK+tLeyxN1
+						pPy054DP0jPzUsD/GV4LzxuUR5kai8lN0TLaUCAotaSIS5mqWfBnqv6mCfCOrTj+
+						ajZ6OJCB/FyTrpLkSx0+ERwxQcVY2bNToqSKkj2rI82FAzWXLO1Gy7AI8MVk9f2A
+						h984zlHxUYlsiOJEnD+dv7prP1fvSFnbjvk5aOLfPb3vm6xyuf10Ed91+bSkQC3A
+						xAg9HHHsfCPTG31sKeOQb6/m0I+Bl2Hupnqbv01S40s+byHF5EGeZhNKrQleWg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFCjCCA/KgAwIBAgIQLjTwCOU9tS/TtpogR6vgozANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTQwODE5
+						MDAwMDAwWhcNMTcwODE0MjM1OTU5WjBeMQswCQYDVQQGEwJHQjEPMA0GA1UECBMG
+						TG9uZG9uMQ8wDQYDVQQHFAZMb25kb24xETAPBgNVBAoUCFNwcmluZ2VyMRowGAYD
+						VQQDFBFmc3NvLnNwcmluZ2VyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAK2hLMYUogo2xzXswFPraYX07zwDLpetg/Fev9O8EmYjdBMoX18P857n
+						FTsyOEi9L3KaUlXQ7IaX6LWHWC19m0BTbXjdCBy8tqzuS6ZX7sFZ6WMEHtkYCeCV
+						0ThN1BG1KG3fZ4W045Ys+/f25zXXyO123wkxa7Qx/xSJM/zNP3mKLReww68RL98q
+						HbNjkDoQ2YP9R6YzAuPCZukw8UkbhK0STJqzRn3VcBXvCVKCdYAKD4U7uRWsssUu
+						YDJU329KJv4LasZBwZ4TCIdKQh317wRXFw0BKFVL1AVb/0Hs9YEyuHfB5qVXC8+7
+						fAjC3nmSxK7f9Jk/nnHdV14704zAH9UCAwEAAaOCAWowggFmMBwGA1UdEQQVMBOC
+						EWZzc28uc3ByaW5nZXIuY29tMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMCsG
+						A1UdHwQkMCIwIKAeoByGGmh0dHA6Ly9zZC5zeW1jYi5jb20vc2QuY3JsMGUGA1Ud
+						IAReMFwwWgYKYIZIAYb4RQEHNjBMMCMGCCsGAQUFBwIBFhdodHRwczovL2Quc3lt
+						Y2IuY29tL2NwczAlBggrBgEFBQcCAjAZFhdodHRwczovL2Quc3ltY2IuY29tL3Jw
+						YTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUDURc
+						FlNEwYJ+HSCrJfQBY9i+eaUwVwYIKwYBBQUHAQEESzBJMB8GCCsGAQUFBzABhhNo
+						dHRwOi8vc2Quc3ltY2QuY29tMCYGCCsGAQUFBzAChhpodHRwOi8vc2Quc3ltY2Iu
+						Y29tL3NkLmNydDANBgkqhkiG9w0BAQUFAAOCAQEAN0E+lQkTOxlaKMAyBWN3EwBt
+						/YeVGMW3L7BEqXnczaUdFWDrx6do0QacO0JAzzl1GR4qBa1OxZ/ciQSK+tLeyxN1
+						pPy054DP0jPzUsD/GV4LzxuUR5kai8lN0TLaUCAotaSIS5mqWfBnqv6mCfCOrTj+
+						ajZ6OJCB/FyTrpLkSx0+ERwxQcVY2bNToqSKkj2rI82FAzWXLO1Gy7AI8MVk9f2A
+						h984zlHxUYlsiOJEnD+dv7prP1fvSFnbjvk5aOLfPb3vm6xyuf10Ed91+bSkQC3A
+						xAg9HHHsfCPTG31sKeOQb6/m0I+Bl2Hupnqbv01S40s+byHF5EGeZhNKrQleWg==
+					</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>Casper Support</md:GivenName>
+    <md:EmailAddress>mailto:caspersupport@springer.com</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
new file mode 100644
index 00000000..c64be8e7
--- /dev/null
+++ b/swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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:Logo height="16" width="16" xml:lang="en">https://garr-idp-prod.irccs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://garr-idp-prod.irccs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://garr-idp-prod.irccs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://garr-idp-prod.irccs.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
+        <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:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDWDCCAkCgAwIBAgIVAPZKMgdGcoQkXqZIfy0VDEQIQwOIMA0GCSqGSIb3DQEB
+BQUAMCYxJDAiBgNVBAMTG2dhcnItaWRwLXByb2QuaXJjY3MuZ2Fyci5pdDAeFw0x
+MzA3MjYxMjI1MTRaFw0zMzA3MjYxMjI1MTRaMCYxJDAiBgNVBAMTG2dhcnItaWRw
+LXByb2QuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAJHeyOXSuq5y8ZW7+87i+ytu5woxrwcXfXLyGEO5ELCwqfv2KR3BEhmxg5xR
+3DSOdStOAt2gzKn+MbJbUgsbSrUr3jyYoy2lggZuLtKl8QSs/tIvV2FSsi4JdI9k
+vDRcNtIPoiKzhMQmduvEFwBHt7mZ2p3Sq4PmQ2ZFCb1S5Na9isbtJxuyxB2wnMXM
+LvkR6zfbVvVZcgAlJ8ZP299aI0U3gWfO75qhhoLs4ZZpEzg/a9M6yHKjxj+Vg1Vl
+Pp9WASd3fV2yHVAsDvsCsBin4DDsFUt0WDpt4mNsutTIdgNxofCDaPcdlN0504DJ
+V9ZjIpkBMBs/DPo24jRPurHiUy0CAwEAAaN9MHswWgYDVR0RBFMwUYIbZ2Fyci1p
+ZHAtcHJvZC5pcmNjcy5nYXJyLml0hjJodHRwczovL2dhcnItaWRwLXByb2QuaXJj
+Y3MuZ2Fyci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUtvMwiFgS2v2SqYoH
+spgVmkVreXowDQYJKoZIhvcNAQEFBQADggEBAEqUfDgfRPY88jYVuF8+kHAtyUep
+VoXt6jqZqrjAw0bt22Je+StgCVx1d9ymK7YW2LGRtaTmn2P/u+5a7imm5eiOzXQu
+Wom9Jpo9eO0Sgt6JGWxn84JEesHX84lOtq1Zk4vt6ikCiO+b4PZXvFX57VzfINKZ
+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>
+MIIDWDCCAkCgAwIBAgIVAPZKMgdGcoQkXqZIfy0VDEQIQwOIMA0GCSqGSIb3DQEB
+BQUAMCYxJDAiBgNVBAMTG2dhcnItaWRwLXByb2QuaXJjY3MuZ2Fyci5pdDAeFw0x
+MzA3MjYxMjI1MTRaFw0zMzA3MjYxMjI1MTRaMCYxJDAiBgNVBAMTG2dhcnItaWRw
+LXByb2QuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAJHeyOXSuq5y8ZW7+87i+ytu5woxrwcXfXLyGEO5ELCwqfv2KR3BEhmxg5xR
+3DSOdStOAt2gzKn+MbJbUgsbSrUr3jyYoy2lggZuLtKl8QSs/tIvV2FSsi4JdI9k
+vDRcNtIPoiKzhMQmduvEFwBHt7mZ2p3Sq4PmQ2ZFCb1S5Na9isbtJxuyxB2wnMXM
+LvkR6zfbVvVZcgAlJ8ZP299aI0U3gWfO75qhhoLs4ZZpEzg/a9M6yHKjxj+Vg1Vl
+Pp9WASd3fV2yHVAsDvsCsBin4DDsFUt0WDpt4mNsutTIdgNxofCDaPcdlN0504DJ
+V9ZjIpkBMBs/DPo24jRPurHiUy0CAwEAAaN9MHswWgYDVR0RBFMwUYIbZ2Fyci1p
+ZHAtcHJvZC5pcmNjcy5nYXJyLml0hjJodHRwczovL2dhcnItaWRwLXByb2QuaXJj
+Y3MuZ2Fyci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUtvMwiFgS2v2SqYoH
+spgVmkVreXowDQYJKoZIhvcNAQEFBQADggEBAEqUfDgfRPY88jYVuF8+kHAtyUep
+VoXt6jqZqrjAw0bt22Je+StgCVx1d9ymK7YW2LGRtaTmn2P/u+5a7imm5eiOzXQu
+Wom9Jpo9eO0Sgt6JGWxn84JEesHX84lOtq1Zk4vt6ikCiO+b4PZXvFX57VzfINKZ
+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>
diff --git a/swamid-interfederations-2.0/gatekeeper.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/gatekeeper.new.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..2bfb1eda
--- /dev/null
+++ b/swamid-interfederations-2.0/gatekeeper.new.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,85 @@
+<?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://gatekeeper.new.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="2013-11-28T10:27: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gatekeeper.new.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>
+						MIIDDDCCAfSgAwIBAgIJAOQwjabMZUfkMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF2dhdGVrZWVwZXIubmV3Lm94LmFjLnVrMB4XDTEzMTEyNzE0MDMwNVoXDTIz
+						MTEyNTE0MDMwNVowIjEgMB4GA1UEAxMXZ2F0ZWtlZXBlci5uZXcub3guYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIZzpzGZMdO8WNqgTiaHTh
+						4h7xBDoIBX2FgZMc5cvIvltA1Zbg1RCgskKcid/EGCWT+Xe9zPM7H/LablZ5KGU8
+						p6tg40jzZc6ZQzPrgsPCxFDarVdn4itgm2YLhWJKMAcfhtpFc2hcD+5Cxv7QOFzg
+						n/XXmQWqXedsVFftpZ2ZIbMs6LmSY8x+Eq92Him1dgiGTrxBNBKS+nqGXXt6orH8
+						qkP11tQ88b9FSCuQ05vBoc0yj9wezx8BT+PYmw/2BK/fCyrLdMIYDh2RmMQnlJGI
+						iLu3jrPVAi4buEVMLCPsGE20mNkDsdrCN3BCMzJ6Zi2bAX7dL6bfQT3SK+YfZk/1
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2dhdGVrZWVwZXIubmV3Lm94LmFjLnVrMB0G
+						A1UdDgQWBBQVbXUza42WR0tfgqKagp9z1hPDPzANBgkqhkiG9w0BAQUFAAOCAQEA
+						p9qmPeKyV8MSth4Qf82n5DH6n74JnnSQ85Mtq7rp5WK4KwJ42U3Yw768AgexjJKR
+						l8WqgG2lHP3k0ZREUTFip0fEmY08RnzpMmOAdzcedeWrO1ABqNW1724hcStLQPrf
+						uRLIycISwMcnPrgqK5uMxqwbp5itzomWeNRDYG6MdToJ81rOs/E5kKlGmjE7d1YS
+						fvLGueVy3BbIsyJEjCz7dj5dm8+eguh3VMjRQUT4r79H+sjginc+QTBByxnSZ641
+						9ISVAGvfUB2sQMp+B3QPlrubAwMpAVKlgnmiJEYS6R8LOKZEbAOA+nBoFE9+lxmR
+						xug/F2NSE54Sg/nepxJpqw==
+					</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://gatekeeper.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gatekeeper.new.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://gatekeeper.new.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://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gatekeeper.new.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, New College Wifi authentication server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Office</md:GivenName>
+    <md:EmailAddress>mailto:it-support@new.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Dore</md:SurName>
+    <md:EmailAddress>mailto:james.dore@new.ox.ac.uk</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
new file mode 100644
index 00000000..046033f4
--- /dev/null
+++ b/swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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>
+						MIIDLzCCAhegAwIBAgIULMVH+d794/0tHGBCoqe7TG75FeMwDQYJKoZIhvcNAQEF
+						BQAwHDEaMBgGA1UEAxMRZ2F0ZXdheS5uY2wuYWMudWswHhcNMDkwMzMxMDgzNjQy
+						WhcNMjkwMzMxMDgzNjQyWjAcMRowGAYDVQQDExFnYXRld2F5Lm5jbC5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALm01D6AF7BDlk72DEDkVOfV
+						hJYOTQUmgZlVj2LYKhX4hA+3/qT5h3J18Q5ap5++HbgqyGW3vDWoqBWZb/MY3eal
+						nhhVv/EPr/ArGThyTOy1pXUBsCH18EpbXsgqP+VTG4LrS5usYLP/3RFqFgb/KxmT
+						kbVGK5lxXFjHgYIegfF/QYIQ9VYCNSxl2DgE1/bl3XxoDEf2Jckh3vrjfDIYxhsb
+						JYmK9QQymOqCZSwBB9t4HvUEGjSQBidaBvfpLEciztWHCaYVoRoeupA53Unl5xnC
+						H/4+Ds1nUg7Kjn6dxHZI5U65U3054ev5hOJjGeal/ebUjAH1TfVFWRdrM1rnnUEC
+						AwEAAaNpMGcwRgYDVR0RBD8wPYIRZ2F0ZXdheS5uY2wuYWMudWuGKGh0dHBzOi8v
+						Z2F0ZXdheS5uY2wuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGAesT0R
+						oVezoU/7a8tsnsNtS3waMA0GCSqGSIb3DQEBBQUAA4IBAQC3ksC1VClv88voWcgq
+						l4BZ6fjIoFTiXGWD26lbm2earRfkSigJY1incBZ75rF7zpuUHLPs3rnVqoNf91PX
+						PoGx9HcJXjzm4EXtNznjjWfHbzr5R18YFOJL8VrTwBlB8PMbPIH/Tmq+g0+EAdMf
+						X4FAN+ZuyeVOUh7U4vKP5VdtJhuFduepCTR7rz+Pwcwr1EgN2LyXQ+5wuUScw5iF
+						HSiU3gRV6PZDcbhausvsBGCpIdgwl5dgieqgoLBaQqpR7KrSgpT12wUPHSFSzPGD
+						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>
+						MIIDLzCCAhegAwIBAgIULMVH+d794/0tHGBCoqe7TG75FeMwDQYJKoZIhvcNAQEF
+						BQAwHDEaMBgGA1UEAxMRZ2F0ZXdheS5uY2wuYWMudWswHhcNMDkwMzMxMDgzNjQy
+						WhcNMjkwMzMxMDgzNjQyWjAcMRowGAYDVQQDExFnYXRld2F5Lm5jbC5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALm01D6AF7BDlk72DEDkVOfV
+						hJYOTQUmgZlVj2LYKhX4hA+3/qT5h3J18Q5ap5++HbgqyGW3vDWoqBWZb/MY3eal
+						nhhVv/EPr/ArGThyTOy1pXUBsCH18EpbXsgqP+VTG4LrS5usYLP/3RFqFgb/KxmT
+						kbVGK5lxXFjHgYIegfF/QYIQ9VYCNSxl2DgE1/bl3XxoDEf2Jckh3vrjfDIYxhsb
+						JYmK9QQymOqCZSwBB9t4HvUEGjSQBidaBvfpLEciztWHCaYVoRoeupA53Unl5xnC
+						H/4+Ds1nUg7Kjn6dxHZI5U65U3054ev5hOJjGeal/ebUjAH1TfVFWRdrM1rnnUEC
+						AwEAAaNpMGcwRgYDVR0RBD8wPYIRZ2F0ZXdheS5uY2wuYWMudWuGKGh0dHBzOi8v
+						Z2F0ZXdheS5uY2wuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGAesT0R
+						oVezoU/7a8tsnsNtS3waMA0GCSqGSIb3DQEBBQUAA4IBAQC3ksC1VClv88voWcgq
+						l4BZ6fjIoFTiXGWD26lbm2earRfkSigJY1incBZ75rF7zpuUHLPs3rnVqoNf91PX
+						PoGx9HcJXjzm4EXtNznjjWfHbzr5R18YFOJL8VrTwBlB8PMbPIH/Tmq+g0+EAdMf
+						X4FAN+ZuyeVOUh7U4vKP5VdtJhuFduepCTR7rz+Pwcwr1EgN2LyXQ+5wuUScw5iF
+						HSiU3gRV6PZDcbhausvsBGCpIdgwl5dgieqgoLBaQqpR7KrSgpT12wUPHSFSzPGD
+						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/iss/</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>Caleb</md:GivenName>
+    <md:SurName>Racey</md:SurName>
+    <md:EmailAddress>mailto:Caleb.Racey@ncl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gateway.wolfson.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/gateway.wolfson.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..90c34ac5
--- /dev/null
+++ b/swamid-interfederations-2.0/gateway.wolfson.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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://gateway.wolfson.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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gateway.wolfson.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>
+						MIIDDzCCAfegAwIBAgIJAOkS8eC5Y3zuMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGGdhdGV3YXkud29sZnNvbi5veC5hYy51azAeFw0xMjAyMDMxMzU0MjlaFw0y
+						MjAxMzExMzU0MjlaMCMxITAfBgNVBAMTGGdhdGV3YXkud29sZnNvbi5veC5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMmt177KXs5KAESLHAE6
+						msW2Jce4pFG5mmhaSrL8gFQs85FN+o6/gW3k5unIxZu+NUJ6moX4ndWNfEQiS6AN
+						WLDRCnohMPPZ0+7Dxh7YdLrHUphP37aAYriv2B0caMwDicS5UAILZUlseD9SSJIH
+						3yLlMUuJ/W0qQQX6t/jOYH8QS580cCZozyoy4/4B5d8RfkPRRx1eEh0F3vip+CXv
+						MiqPcjj4yLDRmpgaj5vb+6nReaw3xZNTBz/YCMQoHe2lzSAeRKKgeSQ4XFZA+jo+
+						5CrgW4SX0Ee5Bgjp9owJai8SQ+CfqQk0D73vRco3TWq5ECjX22GvpUdDueNOrZaL
+						3oMCAwEAAaNGMEQwIwYDVR0RBBwwGoIYZ2F0ZXdheS53b2xmc29uLm94LmFjLnVr
+						MB0GA1UdDgQWBBSzAatpjhACRYzE8BCtxnHdVt+6PjANBgkqhkiG9w0BAQUFAAOC
+						AQEAZSYFk41ZDyTd62QwjxpjSSqwICuV0RFiZwQzwRzCVhv5F8JxHjklC7SKOpKE
+						8T1lhR5OjHGV60lst5XM3eS6A7VBjmK4JY6ladf06IeKVtkby9gbHN5P69Iv9s4o
+						upHabcw0/gz9clmaCxOjgKdPfVZrHcfXfwbrNU+b/QONcvHs1Xmr05sL7f6n11cU
+						Ti/ntWb0fTkn3XtkhaML4EsDPZIYW9iz2ZXTI3Hh1OBbNPZQuMBT4zeEfHPCk5hU
+						d2IccXOROWcZUMinWh2lVzj6id/tIyKEUzJypBdkrkCvau1FcNz7Z/NIJ4GFet6n
+						57qQTrBZCtib803Sq8yAEbi+WQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Wolfson College Members Portal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wolfson.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Wolfson College IT Team</md:GivenName>
+    <md:EmailAddress>mailto:it.support@wolfson.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Wolfson College IT Team</md:GivenName>
+    <md:EmailAddress>mailto:it.support@wolfson.ox.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
new file mode 100644
index 00000000..fde1b58f
--- /dev/null
+++ b/swamid-interfederations-2.0/gcidp.gloscol.ac.uk-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						ZHAuZ2xvc2NvbC5hYy51azAeFw0xNDA5MDQxMjM1MDNaFw0zNDA4MzAxMjM1MDNa
+						MHwxCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9HbG91Y2VzdGVyc2hpcmUxEzARBgNV
+						BAcTCkdsb3VjZXN0ZXIxIDAeBgNVBAoTF0dsb3VjZXN0ZXJzaGlyZSBDb2xsZWdl
+						MRwwGgYDVQQDExNnY2lkcC5nbG9zY29sLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEF
+						AAOCAQ8AMIIBCgKCAQEAsMUVkCGjKBCiO/eUFXf5dKpvjFOkca/nkGxMGgB9nG6+
+						/fCol/mEu0ctS0NgDQSadkfSIJGm4la5vIZKmbfnzZcxUHW8L1n/OkmQf8UwDjCZ
+						u9TZWi7022U1tetOIYf6grw9YPbXYvBZ/X6bddOHgQS7iy78ygadig7C+dTyNFqm
+						1O2T6tJ9U6DbI8lolkvApz9BEo+yeFq0oIibO0C+77Jt7TlIqv7C7g74RKCxNZr2
+						WhZsCQ0qFNqASEOIFxeDI7uXcNyx1eBPxIKf/LsrFf0Kr++yCe0FpGIjjQFGvKoi
+						roEqZSojBi/D4bOlCBNM4UoSD9YTCHT5gukFTD2xSQIDAQABMA0GCSqGSIb3DQEB
+						BQUAA4IBAQClJpH/7g2E6cGYU+NMuXUwzWKhuDnmyB8nb8+Y/RfpMJbBRZvLPuI9
+						+jGTaso1W01S2GX/uI6n5n8awxd/LZjIfbw/aKHBeMYpmzYlarJlUqWinLh30S01
+						f5A6YDpZXHtcZzPvV0jsIunjj5OZ3XEYuhRzbyzSxLoHHEHR3f7GYJ0pvKDtuOUp
+						v8D1vRzVBo5+J76Z7KDyOYrmrnN1S1K3VAQjSOy1QPADspwnnzKWhO69ipXLZFcY
+						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>
+						MIIDdDCCAlwCCQCFLFRZJoQD7DANBgkqhkiG9w0BAQUFADB8MQswCQYDVQQGEwJH
+						QjEYMBYGA1UECBMPR2xvdWNlc3RlcnNoaXJlMRMwEQYDVQQHEwpHbG91Y2VzdGVy
+						MSAwHgYDVQQKExdHbG91Y2VzdGVyc2hpcmUgQ29sbGVnZTEcMBoGA1UEAxMTZ2Np
+						ZHAuZ2xvc2NvbC5hYy51azAeFw0xNDA5MDQxMjM1MDNaFw0zNDA4MzAxMjM1MDNa
+						MHwxCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9HbG91Y2VzdGVyc2hpcmUxEzARBgNV
+						BAcTCkdsb3VjZXN0ZXIxIDAeBgNVBAoTF0dsb3VjZXN0ZXJzaGlyZSBDb2xsZWdl
+						MRwwGgYDVQQDExNnY2lkcC5nbG9zY29sLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEF
+						AAOCAQ8AMIIBCgKCAQEAsMUVkCGjKBCiO/eUFXf5dKpvjFOkca/nkGxMGgB9nG6+
+						/fCol/mEu0ctS0NgDQSadkfSIJGm4la5vIZKmbfnzZcxUHW8L1n/OkmQf8UwDjCZ
+						u9TZWi7022U1tetOIYf6grw9YPbXYvBZ/X6bddOHgQS7iy78ygadig7C+dTyNFqm
+						1O2T6tJ9U6DbI8lolkvApz9BEo+yeFq0oIibO0C+77Jt7TlIqv7C7g74RKCxNZr2
+						WhZsCQ0qFNqASEOIFxeDI7uXcNyx1eBPxIKf/LsrFf0Kr++yCe0FpGIjjQFGvKoi
+						roEqZSojBi/D4bOlCBNM4UoSD9YTCHT5gukFTD2xSQIDAQABMA0GCSqGSIb3DQEB
+						BQUAA4IBAQClJpH/7g2E6cGYU+NMuXUwzWKhuDnmyB8nb8+Y/RfpMJbBRZvLPuI9
+						+jGTaso1W01S2GX/uI6n5n8awxd/LZjIfbw/aKHBeMYpmzYlarJlUqWinLh30S01
+						f5A6YDpZXHtcZzPvV0jsIunjj5OZ3XEYuhRzbyzSxLoHHEHR3f7GYJ0pvKDtuOUp
+						v8D1vRzVBo5+J76Z7KDyOYrmrnN1S1K3VAQjSOy1QPADspwnnzKWhO69ipXLZFcY
+						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>
diff --git a/swamid-interfederations-2.0/gcs.simitive.com.xml b/swamid-interfederations-2.0/gcs.simitive.com.xml
new file mode 100644
index 00000000..438e4240
--- /dev/null
+++ b/swamid-interfederations-2.0/gcs.simitive.com.xml
@@ -0,0 +1,81 @@
+<?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>
+      <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>
+						MIIC+TCCAeGgAwIBAgIJAJRQgVZWDd/zMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+						BAMTCElTLTI0ODMxMB4XDTE0MTIxNjExMTkyOFoXDTI0MTIxMzExMTkyOFowEzER
+						MA8GA1UEAxMISVMtMjQ4MzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC0THPJbqQqabRo8UmrYIVXK5FbfeMbRzh+KY+OKj+y1JPBwaF2eiyGW6y6yfaW
+						u/ht+IVlmEIGkNCPSYDhRLVeX/EoFjXMSO8WFNUmrcK3V/nzvl4LpD1+5EIUT9ew
+						X20Orkct5earRWmIa/DUfwL+7nHucu48b/0CNVVVqs1t/Qpnk1RU3n1lWZhN4R3m
+						cUu8w1tyrZ52+bGUVPKtYgQSt9Qi66lonzz5k/ZLlSHTbdpPl85eO9ZGetiqqDjT
+						kYF0juPHPQJyhX1y3N9yhDSX4MYKbCVXwLUek4UbYX9YjGfaaegGPv5g7DjgfPGV
+						nxTINfawpUcYazq3Gq/wZTVRAgMBAAGjUDBOMC0GA1UdEQQmMCSCCElTLTI0ODMx
+						hhhodHRwczovL2djcy5zaW1pdGl2ZS5jb20wHQYDVR0OBBYEFEW/SH169Rn82c3p
+						hFRU/6GjSchgMA0GCSqGSIb3DQEBBQUAA4IBAQCWFmKpMIImEy1wWxc2vbZzqFIw
+						w+k/dBQIXXrBfUckYA6WqvsUCGkGQpkUDtmaGRwkOWr2rGvhZZOqTDk2gt09Eatq
+						DmiFWH4n7Bn9J02xXL+A+b0NRWtm4+UBRMZtyO5tvdW9ZzNNyBzAzo10i6WkcntJ
+						kFuhwz2Y7CKka8ekE0gvanRjChmghI+SapQSdyLaa0RYTD/Dhoe4CqbsNkuGg/2A
+						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>Joe</md:GivenName>
+    <md:SurName>Vallender</md:SurName>
+    <md:EmailAddress>mailto:joe.vallender@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Joe</md:GivenName>
+    <md:SurName>Vallender</md:SurName>
+    <md:EmailAddress>mailto:joe.vallender@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
new file mode 100644
index 00000000..7f65a2da
--- /dev/null
+++ b/swamid-interfederations-2.0/gcu.idm.oclc.org-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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>
+						MIIEAjCCAuqgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBjMRswGQYDVQQDFBIqLmdj
+						dS5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xDMSgwJgYJ
+						KoZIhvcNAQkBFhlqYW1lcy5odXRjaGluc29uQG9jbGMub3JnMB4XDTE0MDQwODA5
+						MjMwNFoXDTI0MDQwNzA5MjMwNFowYzEbMBkGA1UEAxQSKi5nY3UuaWRtLm9jbGMu
+						b3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzEoMCYGCSqGSIb3DQEJARYZ
+						amFtZXMuaHV0Y2hpbnNvbkBvY2xjLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAMT0xloPYpMr8p6BWPrrVfiOCy/o3FUyA5TshNxjVayC0Y+jHlwf
+						jlqZoseU0tFUkRPll5wioukxcvR1O1fgBRM1hdNAbiHg6y2T677ji4GO+/Ya8Lt6
+						7OdgDtoliP7wUaBq7rHiQgpzWDh82tEKQ95m+qEIBtOG2lGEeAoy0D01+p2W5grm
+						FZyoN/YA68Cd5xtloOwRNaOZ63imjXi9mjxrHaLrlRCEHnvRGm6HWW1niCeu7EDY
+						S9g4fVQY0rMIMd/Q9ISzqzhF1akZERG2GsjJctSVtbq1MIN6aC4Eh2kdbEytfEbD
+						dlK/4kvT9ycYMm0kOk/LdmOtTN11t15jzE0CAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
+						enw01HVcsPIbyZ8kLsB/u2a6BS8wgY0GA1UdIwSBhTCBgoAUenw01HVcsPIbyZ8k
+						LsB/u2a6BS+hZ6RlMGMxGzAZBgNVBAMUEiouZ2N1LmlkbS5vY2xjLm9yZzELMAkG
+						A1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxKDAmBgkqhkiG9w0BCQEWGWphbWVzLmh1
+						dGNoaW5zb25Ab2NsYy5vcmeCAQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
+						AAOCAQEAeEfQ8o/m5HDO/5H5Hk2KFUVB7eh6eLGrT8cO4uj6ajWvx2DMkjiI7Xfg
+						gYmIbLsbSR3iryoxoTsiakLB1Cvt3reVagah1sAkVqQl9yLw56q8V4AbfJN4OdTH
+						6u49A/SY7quj8eDrUDqTVP9arCWu153U/h+KFzjTuEVTxxYuMGXMzElf32lYMjrO
+						4FFpcyVbHiLfkGed+1e9c9tVQm6gNj34Yim0xTEQIW+TD3PV9OxZvTZ5wKxYAZuP
+						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>
diff --git a/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..6311a49a
--- /dev/null
+++ b/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor 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">
+    <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://vsp2.edina.ac.uk/public/images/splogos/digimap.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>
+						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
+						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						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/digimap/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/digimap/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/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: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/ghgtool.grnet.gr-shibboleth.xml b/swamid-interfederations-2.0/ghgtool.grnet.gr-shibboleth.xml
new file mode 100644
index 00000000..bc6f8e56
--- /dev/null
+++ b/swamid-interfederations-2.0/ghgtool.grnet.gr-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ghgtool.grnet.gr/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:SPSSODescriptor protocolSupportEnumeration="urn:oasis: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">GHG report tool</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GHG online reporting tool</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://ghgtool.grnet.gr/about/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://ghgtool.grnet.gr/about/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="el">https://ghgtool.grnet.gr/about/privacy#greek</mdui:PrivacyStatementURL>
+        <mdui:Logo height="64" width="250" xml:lang="en">https://ghgtool.grnet.gr/about/ghgtoollogo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ghgtool.grnet.gr/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ghgtool.grnet.gr/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFwTCCA6mgAwIBAgIJAMzPE0+nt+YbMA0GCSqGSIb3DQEBBQUAMEkxCzAJBgNV
+                            BAYTAkdSMQ4wDAYDVQQIEwVQQVRSQTEMMAoGA1UEBxMDUklPMQ4wDAYDVQQKEwVH
+                            Uk5FVDEMMAoGA1UECxMDUlU2MB4XDTEzMTExMjAxMjI1NloXDTE0MTExMjAxMjI1
+                            NlowSTELMAkGA1UEBhMCR1IxDjAMBgNVBAgTBVBBVFJBMQwwCgYDVQQHEwNSSU8x
+                            DjAMBgNVBAoTBUdSTkVUMQwwCgYDVQQLEwNSVTYwggIiMA0GCSqGSIb3DQEBAQUA
+                            A4ICDwAwggIKAoICAQDCNiDRCIEqgOS4RtYPP04QBw632zSJ9tklRo5VcnzrneYH
+                            r2APRVeUQO4uPUMeJEs3a/MQkh8C/zWctIrTWyJh/RVO77uXhxYFQyptNx3hhg3Y
+                            GABTxJ5Jv6Jkzznhr2+Rq/ayEKLuIxQDt5aG3pcBEX9M59LLjIJa1gtT06wYq2Bn
+                            eHBJshDCeEQvC4N7bZLbcCo60Yge7cPfam67Gyrrvr2e7VW/VJJ0hFSvjbh3bGco
+                            TRYRurdtIyjxKRoUvDMFujcbnP1KaHQS5vZlneWcVanu0FWW3ieOYiDPZcZ5yKUq
+                            MGGY3OzWpEOzrOh2Bmgx7zWmcoye+5Rj+1+NvOmkkNqTJs0x+Y0mKY63xfzpHbzj
+                            1iyzSkfoW0sd4V+3ymd951gUkgigJs7WPpkUz5PMt8QmIUH9e+nxBiU2UPA3TTXw
+                            DWs3i40tiGBSkAKLLEz/7wCOgiA733JgkKAbi6TLUFr0VNAQlRZwlyjzD3j8ixis
+                            qBKjnKJ+3uAJ7T3pRNnZCw9s0Qg9Hj6st3u7DmQ9McH3QFgvmS9pWAVKqW95PPtO
+                            MvIASOCdDDnry8yrMG/sUYmbAc8+Nr2+GZR5e14ZmMaN2ImM7xDdLEUdE9jFqInv
+                            fErEbIu+00EVYYijNmIamywaCrSr09LlXXC6/1vPlZdiGhBcFE/i5KbUeUlwMwID
+                            AQABo4GrMIGoMB0GA1UdDgQWBBTiec00rlpZRRGu2TrFpqW1sjMCRzB5BgNVHSME
+                            cjBwgBTiec00rlpZRRGu2TrFpqW1sjMCR6FNpEswSTELMAkGA1UEBhMCR1IxDjAM
+                            BgNVBAgTBVBBVFJBMQwwCgYDVQQHEwNSSU8xDjAMBgNVBAoTBUdSTkVUMQwwCgYD
+                            VQQLEwNSVTaCCQDMzxNPp7fmGzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
+                            A4ICAQA7Ii3a/ZLBsRavzMBp54dnbC66oSiIPylHo2Xkc413uHVrMJEnroT/o1jk
+                            RKq90Mvqr2sGfTpYjz6fGX3A+LHUOW2XYnqQCTILMcJgvSnqXW3Fxcd00ogSdZWx
+                            0KS5VVNCZ5mPEgsQwr+BtOKdB2sb8PGhWYKnVSKYLCrt4FjX7gJBYLpqUGWxMyoq
+                            fWg2ovutdRW/izFIGuEEW1031+HZ+9f66AMexswnAIUhEeF6Ew14saA2f23Rvoyl
+                            4rFqQ0wbXsnOy+PeS9bnF6QLCEXMVlEkJg+MNPkESPY6Lns98ExIP0gh9rcOSR97
+                            4KHhgFsJMWG6PfcQ328wjeMtQF9ZqThhtb+//5eODBtIZZvZjZfcICh6lEHiwh2a
+                            8pX39iau26q7Oy5WtMXf8lLFS/ECfmc1WLfZZlh9C/cjHRkrFLwqyCiwpQ/QfGFZ
+                            HgfCEKwvZ7gS7UuiT7Aa6gGy8IXwZFC4gwtcQ5n7Fo35K6WBeA9tJ+n2GWwDF/5M
+                            tkmYhp5t+sCXM4ygUfHnvwLvxkLN2yUzFZCpPsoaQwbWOhvmAsvaz4c9ZMlySGia
+                            hr0y8arTsb1cPFQvcM/1xvjWw8nlx3OaoHV4hV3K+B2e+heYkP11DLoY5ZiG2Dh/
+                            eMqY26cZtNFIW4tgT7/uLpwzbeTrVDCG/PuoSyYicbEMLQ+hDA==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ghgtool.grnet.gr/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ghgtool.grnet.gr/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: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://ghgtool.grnet.gr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">GHG report tool</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">GHG online reporting tool</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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="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="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="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="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="shacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="shacHomeOrganization" Name="urn:mace:terena.org:attribute-def:schacHomeOrganization" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="orgName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="orgName" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+    </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:GivenName>Vasiliki Giannikopoulou</md:GivenName>
+    <md:EmailAddress>vasilg@admin.grnet.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Constantinos Vassilakis</md:GivenName>
+    <md:EmailAddress>cvassilakis@admin.grnet.gr</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
new file mode 100644
index 00000000..b9e105bb
--- /dev/null
+++ b/swamid-interfederations-2.0/gidp.geant.net.xml
@@ -0,0 +1,104 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-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: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>
+      <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">GEANT 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>
+						MIIEkzCCA3ugAwIBAgIRAMu+xHPPachtpqZqP5LsTqswDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzEyMTMwMDAwMDBaFw0xNjEyMTIyMzU5NTlaMDwxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOZ2lkcC5nZWFu
+						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGyGX8egmFqg1S
+						BpnwdMh7Gwco3avst57R/6TTgnGeajqjk5q7E6kzT33UHXG37kXJehuA2NBIhwoo
+						S8vBpMfsdhgj1ta98d9VdpjM84vJI8qj5zdOV1t+rQ1RejXxla5Fp0Rpj7BoKFye
+						WQ/vKrdk/G9rhpZS8DiIKqmNtkakxigm9aGse5r3zaYE6rb2Pb7VXBGkEVq96s5v
+						Z/iN6eGWfGy28XopRKboHpjVdR/AkyMARfFd1qLtGh3OddXykKgkwbKfYY3sKUYK
+						rqoeq1J6vF3KYYc1WlHuldnW0X+YjskiwX40USuZklxbv2mXublmhk1H5IgN7F2D
+						X8jJ124bAgMBAAGjggGUMIIBkDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+						kOO57TAdBgNVHQ4EFgQUCsQex91m+Wk7E+C4/38Sf3T80yAwDgYDVR0PAQH/BAQD
+						AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+						MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+						L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+						MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+						LnRjcy50ZXJlbmEub3JnMEIGA1UdEQQ7MDmCDmdpZHAuZ2VhbnQubmV0ghNwcm9k
+						LWdpZHAuZ2VhbnQubmV0ghJ1YXQtZ2lkcC5nZWFudC5uZXQwDQYJKoZIhvcNAQEF
+						BQADggEBAB3iJ9REvIWq6OkRaiGMBN5wrH8RY0QulseOufbf7Cclx58+Y5hqf+bZ
+						1gNQQfGQB8wFw2HaHg/X7RyHA6GRPgjz2w6hLQqI5aWdoKpF26jSbfnQ0Ia+Ko6J
+						9JTawaCJzEqDOYO0vfdK19sOtouZoMpFyj5IGKUhJQfnXl4IxRAKbxOsdmZnlKfC
+						MHfKZ3Hkd137e5Vl6PPCD1SgKKyxklGL7kvUJLaI5H+fmyUZhYdLkabuViam16ok
+						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>
+						MIIEkzCCA3ugAwIBAgIRAMu+xHPPachtpqZqP5LsTqswDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzEyMTMwMDAwMDBaFw0xNjEyMTIyMzU5NTlaMDwxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOZ2lkcC5nZWFu
+						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGyGX8egmFqg1S
+						BpnwdMh7Gwco3avst57R/6TTgnGeajqjk5q7E6kzT33UHXG37kXJehuA2NBIhwoo
+						S8vBpMfsdhgj1ta98d9VdpjM84vJI8qj5zdOV1t+rQ1RejXxla5Fp0Rpj7BoKFye
+						WQ/vKrdk/G9rhpZS8DiIKqmNtkakxigm9aGse5r3zaYE6rb2Pb7VXBGkEVq96s5v
+						Z/iN6eGWfGy28XopRKboHpjVdR/AkyMARfFd1qLtGh3OddXykKgkwbKfYY3sKUYK
+						rqoeq1J6vF3KYYc1WlHuldnW0X+YjskiwX40USuZklxbv2mXublmhk1H5IgN7F2D
+						X8jJ124bAgMBAAGjggGUMIIBkDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+						kOO57TAdBgNVHQ4EFgQUCsQex91m+Wk7E+C4/38Sf3T80yAwDgYDVR0PAQH/BAQD
+						AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+						MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+						L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+						MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+						LnRjcy50ZXJlbmEub3JnMEIGA1UdEQQ7MDmCDmdpZHAuZ2VhbnQubmV0ghNwcm9k
+						LWdpZHAuZ2VhbnQubmV0ghJ1YXQtZ2lkcC5nZWFudC5uZXQwDQYJKoZIhvcNAQEF
+						BQADggEBAB3iJ9REvIWq6OkRaiGMBN5wrH8RY0QulseOufbf7Cclx58+Y5hqf+bZ
+						1gNQQfGQB8wFw2HaHg/X7RyHA6GRPgjz2w6hLQqI5aWdoKpF26jSbfnQ0Ia+Ko6J
+						9JTawaCJzEqDOYO0vfdK19sOtouZoMpFyj5IGKUhJQfnXl4IxRAKbxOsdmZnlKfC
+						MHfKZ3Hkd137e5Vl6PPCD1SgKKyxklGL7kvUJLaI5H+fmyUZhYdLkabuViam16ok
+						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">GEANT 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
new file mode 100644
index 00000000..7f6f80bf
--- /dev/null
+++ b/swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
@@ -0,0 +1,125 @@
+<?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>
+      <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 height="107" width="204" xml:lang="sv">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>
+
+MIIDOzCCAiOgAwIBAgIUX4LM+yBFUKdFziHUCVyiPPGiL8YwDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUZ2loaWRlbnRpdHkwMS5paHMuc2UwHhcNMTMwOTIwMTA1
+NTIzWhcNMzMwOTIwMTA1NTIzWjAfMR0wGwYDVQQDExRnaWhpZGVudGl0eTAxLmlo
+cy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjZBXC3TcY47KYX
+t3n4IH6X8Jszyeinq+Zo6mtsJgzu9JPikIiG9jDJj+ylQiTDSSTBMSAUZ3p6ola/
++/IlDu0q5oLFCMEe3m9AdJIwyT6CjIJOiLSzeaTOqQNtXowLFCxj+PPrVRaqJiYc
++7f3+5SMwn2iOLkr6/ZFW5cuhw9flzR/Qp7m9ByTIcs73XK1JcQPP1UoPgo8mUXj
+/IHbxB/+P0NzjMXbKZEFEnZQzDoxNYDbARh6T/hJreIKBr+B0KnKogZnM9WgdJof
+O6GKR1lETrGgmCITblP7dbrRIL2VxMmXQEMhdS78Y5GNRPnGxp00kT2h/tTA1Reb
+52sROA0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUZ2loaWRlbnRpdHkwMS5paHMuc2WG
+K2h0dHBzOi8vZ2loaWRlbnRpdHkwMS5paHMuc2UvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFIzCrjaWTfLensnYqTm/G3CNWsbNMA0GCSqGSIb3DQEBBQUAA4IBAQB7
+pVQO0Su0rB9WHWpitL0kNNfFQgapWHHZ8hYUDFWxiON7IGG6GlVsqgvwGCQwYgci
+E+WrKirES8+tE/EWhNfSvydlBuHwkvBP2WqsjUVbG0U4xbguE3C1ZrcfKcjBkSDH
+YmMuoYqX6RkHuwExl0xLr1ApVz8l2D9HVXdVi3aG31gMpo4/G1GukY8Pny8ZSbNP
+cb9+7g88/LLBLc5cx1iccfK4h0Er5QAFjNd3uKD3p0sxQYKPGs5X2ZwOxJlmeAiU
+3Ujhy7jzfaV7bFtz+GL8WTHoi2OfI1YqES5Jr3sQnlArhemcYUxnpBN4yvDF2QK1
+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>
+
+MIIDOzCCAiOgAwIBAgIUX4LM+yBFUKdFziHUCVyiPPGiL8YwDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUZ2loaWRlbnRpdHkwMS5paHMuc2UwHhcNMTMwOTIwMTA1
+NTIzWhcNMzMwOTIwMTA1NTIzWjAfMR0wGwYDVQQDExRnaWhpZGVudGl0eTAxLmlo
+cy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjZBXC3TcY47KYX
+t3n4IH6X8Jszyeinq+Zo6mtsJgzu9JPikIiG9jDJj+ylQiTDSSTBMSAUZ3p6ola/
++/IlDu0q5oLFCMEe3m9AdJIwyT6CjIJOiLSzeaTOqQNtXowLFCxj+PPrVRaqJiYc
++7f3+5SMwn2iOLkr6/ZFW5cuhw9flzR/Qp7m9ByTIcs73XK1JcQPP1UoPgo8mUXj
+/IHbxB/+P0NzjMXbKZEFEnZQzDoxNYDbARh6T/hJreIKBr+B0KnKogZnM9WgdJof
+O6GKR1lETrGgmCITblP7dbrRIL2VxMmXQEMhdS78Y5GNRPnGxp00kT2h/tTA1Reb
+52sROA0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUZ2loaWRlbnRpdHkwMS5paHMuc2WG
+K2h0dHBzOi8vZ2loaWRlbnRpdHkwMS5paHMuc2UvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFIzCrjaWTfLensnYqTm/G3CNWsbNMA0GCSqGSIb3DQEBBQUAA4IBAQB7
+pVQO0Su0rB9WHWpitL0kNNfFQgapWHHZ8hYUDFWxiON7IGG6GlVsqgvwGCQwYgci
+E+WrKirES8+tE/EWhNfSvydlBuHwkvBP2WqsjUVbG0U4xbguE3C1ZrcfKcjBkSDH
+YmMuoYqX6RkHuwExl0xLr1ApVz8l2D9HVXdVi3aG31gMpo4/G1GukY8Pny8ZSbNP
+cb9+7g88/LLBLc5cx1iccfK4h0Er5QAFjNd3uKD3p0sxQYKPGs5X2ZwOxJlmeAiU
+3Ujhy7jzfaV7bFtz+GL8WTHoi2OfI1YqES5Jr3sQnlArhemcYUxnpBN4yvDF2QK1
+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>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>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>charlie.skog@gih.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 12053792</md:TelephoneNumber>
+  </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
new file mode 100644
index 00000000..d64ca370
--- /dev/null
+++ b/swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis: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">
+                        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>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
+dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
+uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
+3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
+TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
+7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
+F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
+BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
+LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
+cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
+bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
+Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
+aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
+bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
+BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
+VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
+nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
+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
+                    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>
diff --git a/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml b/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml
new file mode 100644
index 00000000..244f2499
--- /dev/null
+++ b/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml
@@ -0,0 +1,96 @@
+<?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: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">IN2P3 - Gitlab dev</mdui:DisplayName>
+        <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>
+					      MIIDIDCCAgigAwIBAgIJAMq3CLil3CmcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2dpdGxhYi1kZXYuaW4ycDMuZnIwHhcNMTQxMDE3MDkwMTIyWhcNMjQxMDE0
+MDkwMTIyWjAeMRwwGgYDVQQDExNnaXRsYWItZGV2LmluMnAzLmZyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzH82rDfD9niEHMAZXa6gHOxNkW4XSKv7
+7DtPOQ2Ft0z6eYkYrgCIadDx0btS8fCiTINg90OUbjYrrHvStbdWD2hKKOM5OAeo
+xQMRec+yZ93IDt67hrsDo8dqA8eBM+MicwmQbw3pHwQ4pQ73i6/ly3jTK+Iz/UQQ
+06jjuNKmVX7IXA75OFckM7jopUvZ1TuCrA0vg2L14qqp7zkuO3MP8pkX8CwRW1iV
+P0VaFOvztkIxMWT7Amacigqk16msg4M/swnrs5el6j97CAK5VJ/RD/OSvm61GjZF
+kbMPA1W2CRBVqF4+9J7YCOAbt00maZZeoXQPiLtfO1oOYKHBPslzrwIDAQABo2Ew
+XzA+BgNVHREENzA1ghNnaXRsYWItZGV2LmluMnAzLmZyhh5odHRwczovL2dpdGxh
+Yi1kZXYuaW4ycDMuZnIvc3AwHQYDVR0OBBYEFCusYwwMg6gWFnDUd31Yb+blT7lA
+MA0GCSqGSIb3DQEBBQUAA4IBAQBebrDXws3zc1y+MulOe0B17GO68qdSbAaQkNuj
+sBkhPgP+ie1gqlgTvgpT5lO115K8o7ePcqnZ1CiHg1/Q7uyyKj2XX3JaXZkUrGvH
+THNe8fYK+oRCoPth6Zpbho7MKITdjVwIOHhNh5xSsLm5ylvy5JCFyJxcv7QxMJ9L
+0HgVAHcaKrKDVRL2RqhpurBM+IRkepzQzoQuGAadDNnhHHsXvykwztVLWbiEfPLr
+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>
+					      MIIDIDCCAgigAwIBAgIJAMq3CLil3CmcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2dpdGxhYi1kZXYuaW4ycDMuZnIwHhcNMTQxMDE3MDkwMTIyWhcNMjQxMDE0
+MDkwMTIyWjAeMRwwGgYDVQQDExNnaXRsYWItZGV2LmluMnAzLmZyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzH82rDfD9niEHMAZXa6gHOxNkW4XSKv7
+7DtPOQ2Ft0z6eYkYrgCIadDx0btS8fCiTINg90OUbjYrrHvStbdWD2hKKOM5OAeo
+xQMRec+yZ93IDt67hrsDo8dqA8eBM+MicwmQbw3pHwQ4pQ73i6/ly3jTK+Iz/UQQ
+06jjuNKmVX7IXA75OFckM7jopUvZ1TuCrA0vg2L14qqp7zkuO3MP8pkX8CwRW1iV
+P0VaFOvztkIxMWT7Amacigqk16msg4M/swnrs5el6j97CAK5VJ/RD/OSvm61GjZF
+kbMPA1W2CRBVqF4+9J7YCOAbt00maZZeoXQPiLtfO1oOYKHBPslzrwIDAQABo2Ew
+XzA+BgNVHREENzA1ghNnaXRsYWItZGV2LmluMnAzLmZyhh5odHRwczovL2dpdGxh
+Yi1kZXYuaW4ycDMuZnIvc3AwHQYDVR0OBBYEFCusYwwMg6gWFnDUd31Yb+blT7lA
+MA0GCSqGSIb3DQEBBQUAA4IBAQBebrDXws3zc1y+MulOe0B17GO68qdSbAaQkNuj
+sBkhPgP+ie1gqlgTvgpT5lO115K8o7ePcqnZ1CiHg1/Q7uyyKj2XX3JaXZkUrGvH
+THNe8fYK+oRCoPth6Zpbho7MKITdjVwIOHhNh5xSsLm5ylvy5JCFyJxcv7QxMJ9L
+0HgVAHcaKrKDVRL2RqhpurBM+IRkepzQzoQuGAadDNnhHHsXvykwztVLWbiEfPLr
+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="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: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: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://unknown.site.com</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
new file mode 100644
index 00000000..6b08b904
--- /dev/null
+++ b/swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml
@@ -0,0 +1,95 @@
+<?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: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">IN2P3 - Gitlab</mdui:DisplayName>
+        <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>
+					      MIIDEDCCAfigAwIBAgIJAN4P422/DAqiMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2dpdGxhYi5pbjJwMy5mcjAeFw0xNDEwMTcwOTAyMjZaFw0yNDEwMTQwOTAy
+MjZaMBoxGDAWBgNVBAMTD2dpdGxhYi5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALc/8+ereTIUyTcBF7sxZGfRdkl2qGOav3hWPPkrRQd6
+wVsgTFS1IrjSAM+v8SUZXCQmEuCiK11RR4hiGo7jt/mHcorD0I5N/b8PHsYLiBVX
++rw29uP31ufcvKRKgga0KzYFOjer090e0YNt/h2ybPDJWOCSOsOmfYSgiWuVAq2X
+BnEyswPm9t/TvxQLH+UEFwweyNqVi59XxFICfIBqCJ7O+NfEI+x8uNfr++sjkYVJ
+YybukhEftB8pUDC4iBT+S31YT8vO+u1WMakuETm4N2t6Vi1oCzdTwExfDFeT9ptH
+ZbEkyQ6jK+kVmxYx3jeWZAPlT4yTfLDqEyoJ2d1J1skCAwEAAaNZMFcwNgYDVR0R
+BC8wLYIPZ2l0bGFiLmluMnAzLmZyhhpodHRwczovL2dpdGxhYi5pbjJwMy5mci9z
+cDAdBgNVHQ4EFgQUubCjI0lAVt2nFgU1JGBhOPkiAr8wDQYJKoZIhvcNAQEFBQAD
+ggEBAKzgpHdu8MHO6AmnA6fgbXWLXj+CIcLRGj9yzsyJanRkH1PLetl8QHqcFFDI
+23CYC6DctR6BsjqBW2vFD2sXOqznbp7/yEtkGGjNbFyPrUf9HsDYbUwXPeSF2dbF
+ytVhSgqHurk+LzuoWQtr5ZaidBiv4+G8RtwvMhxM1jvwSng6waF1IpEemDzAubAL
+egooHKMFutA/QLDwwxnNkVFYY0smKOyPGnpTqe2UMDi7k3UB4LqhckWHqZZdBKA7
+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>
+					      MIIDEDCCAfigAwIBAgIJAN4P422/DAqiMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2dpdGxhYi5pbjJwMy5mcjAeFw0xNDEwMTcwOTAyMjZaFw0yNDEwMTQwOTAy
+MjZaMBoxGDAWBgNVBAMTD2dpdGxhYi5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALc/8+ereTIUyTcBF7sxZGfRdkl2qGOav3hWPPkrRQd6
+wVsgTFS1IrjSAM+v8SUZXCQmEuCiK11RR4hiGo7jt/mHcorD0I5N/b8PHsYLiBVX
++rw29uP31ufcvKRKgga0KzYFOjer090e0YNt/h2ybPDJWOCSOsOmfYSgiWuVAq2X
+BnEyswPm9t/TvxQLH+UEFwweyNqVi59XxFICfIBqCJ7O+NfEI+x8uNfr++sjkYVJ
+YybukhEftB8pUDC4iBT+S31YT8vO+u1WMakuETm4N2t6Vi1oCzdTwExfDFeT9ptH
+ZbEkyQ6jK+kVmxYx3jeWZAPlT4yTfLDqEyoJ2d1J1skCAwEAAaNZMFcwNgYDVR0R
+BC8wLYIPZ2l0bGFiLmluMnAzLmZyhhpodHRwczovL2dpdGxhYi5pbjJwMy5mci9z
+cDAdBgNVHQ4EFgQUubCjI0lAVt2nFgU1JGBhOPkiAr8wDQYJKoZIhvcNAQEFBQAD
+ggEBAKzgpHdu8MHO6AmnA6fgbXWLXj+CIcLRGj9yzsyJanRkH1PLetl8QHqcFFDI
+23CYC6DctR6BsjqBW2vFD2sXOqznbp7/yEtkGGjNbFyPrUf9HsDYbUwXPeSF2dbF
+ytVhSgqHurk+LzuoWQtr5ZaidBiv4+G8RtwvMhxM1jvwSng6waF1IpEemDzAubAL
+egooHKMFutA/QLDwwxnNkVFYY0smKOyPGnpTqe2UMDi7k3UB4LqhckWHqZZdBKA7
+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="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="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: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://unknown.site.com</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
new file mode 100644
index 00000000..149e3d02
--- /dev/null
+++ b/swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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>
+                            MIIDHDCCAgSgAwIBAgIJAJMOS4lZGZTGMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+                            BAMTD2duLXZoby5ncm5ldC5ncjAeFw0xNDAzMDcxODI1MzNaFw0xOTAzMDYxODI1
+                            MzNaMBoxGDAWBgNVBAMTD2duLXZoby5ncm5ldC5ncjCCASIwDQYJKoZIhvcNAQEB
+                            BQADggEPADCCAQoCggEBAOh9S7NB2MuQqUBKOiEe05XHFCBBc9e6icfod97VFeug
+                            hdLsAZK/hpPAADzXQsKz2eHG3abRgxWUneQ7e8hSPCckGRG06FtbSI4zOitlx9id
+                            QHk1ah1vaVFLKiFdFhpqsE8Gjbb7FfA4cwXjMO4l8D4m3kFkKQk5x0Ok5EIumDlx
+                            RHPSRxIS6RsGE9y/xvCu+NNvc8zG6eSXrNLPgLHau3aNPY/NeYaV9UZg6pV8PlS4
+                            DbNLIg6U+rbYMBztRzfkHL5UTuykGwmECgKP7E/cajAS3siR6c7avkeMaqmdyCSt
+                            GB0JofKDSWEC+rIIMUafxM2JMpcmqDSe1a7gRij/Gk0CAwEAAaNlMGMwQgYDVR0R
+                            BDswOYIPZ24tdmhvLmdybmV0LmdyhiZodHRwczovL2duLXZoby5ncm5ldC5nci9p
+                            ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbS3VHThd6Vyhy9/Pki68p/j4ZRYwDQYJ
+                            KoZIhvcNAQEFBQADggEBAOMWzzekuxdAwdr8DY8tM6tCKjq/YRP70b9eKH3zwXWc
+                            XZZwcv57B7z1wwt/4eCLQai4bPIIAGnFJIr+LRV2hhy3HJZ/CtFs5LqYFP/OCaLa
+                            VbwyzBQMRwAy5Jbt7ikfc7P7BOPjQ1zQzTxkNUmWGXoTIkPJ4naSmNUV26WWSvA9
+                            15ZjygTLXMVwuOAFXhuBBU5AWfzfQa6nxlFUQ4NYw7ow4h73KWrVRRpXTV7U4g3s
+                            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>
+                            MIIDHDCCAgSgAwIBAgIJAJMOS4lZGZTGMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+                            BAMTD2duLXZoby5ncm5ldC5ncjAeFw0xNDAzMDcxODI1MzNaFw0xOTAzMDYxODI1
+                            MzNaMBoxGDAWBgNVBAMTD2duLXZoby5ncm5ldC5ncjCCASIwDQYJKoZIhvcNAQEB
+                            BQADggEPADCCAQoCggEBAOh9S7NB2MuQqUBKOiEe05XHFCBBc9e6icfod97VFeug
+                            hdLsAZK/hpPAADzXQsKz2eHG3abRgxWUneQ7e8hSPCckGRG06FtbSI4zOitlx9id
+                            QHk1ah1vaVFLKiFdFhpqsE8Gjbb7FfA4cwXjMO4l8D4m3kFkKQk5x0Ok5EIumDlx
+                            RHPSRxIS6RsGE9y/xvCu+NNvc8zG6eSXrNLPgLHau3aNPY/NeYaV9UZg6pV8PlS4
+                            DbNLIg6U+rbYMBztRzfkHL5UTuykGwmECgKP7E/cajAS3siR6c7avkeMaqmdyCSt
+                            GB0JofKDSWEC+rIIMUafxM2JMpcmqDSe1a7gRij/Gk0CAwEAAaNlMGMwQgYDVR0R
+                            BDswOYIPZ24tdmhvLmdybmV0LmdyhiZodHRwczovL2duLXZoby5ncm5ldC5nci9p
+                            ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbS3VHThd6Vyhy9/Pki68p/j4ZRYwDQYJ
+                            KoZIhvcNAQEFBQADggEBAOMWzzekuxdAwdr8DY8tM6tCKjq/YRP70b9eKH3zwXWc
+                            XZZwcv57B7z1wwt/4eCLQai4bPIIAGnFJIr+LRV2hhy3HJZ/CtFs5LqYFP/OCaLa
+                            VbwyzBQMRwAy5Jbt7ikfc7P7BOPjQ1zQzTxkNUmWGXoTIkPJ4naSmNUV26WWSvA9
+                            15ZjygTLXMVwuOAFXhuBBU5AWfzfQa6nxlFUQ4NYw7ow4h73KWrVRRpXTV7U4g3s
+                            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>
diff --git a/swamid-interfederations-2.0/goto-prod.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/goto-prod.sbs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..7a9d71db
--- /dev/null
+++ b/swamid-interfederations-2.0/goto-prod.sbs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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://goto-prod.sbs.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-13T12:26: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://goto-prod.sbs.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>
+						MIIDCTCCAfGgAwIBAgIJAMAONeRqTU2xMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFmdvdG8tcHJvZC5zYnMub3guYWMudWswHhcNMTIxMjEyMDgxMDExWhcNMjIx
+						MjEwMDgxMDExWjAhMR8wHQYDVQQDExZnb3RvLXByb2Quc2JzLm94LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0OE96RgaUQaT5/T2QJyauFFB
+						aK3eWXF4S9ortfE06ofcp3JIvqPzSoxQ2IHMzQpXEmy7fGIKgusCXpjUAtgbRFrP
+						oK4DGCS2E8HmP1PryKj6UTpj7HBR+2kJ8JCVCslOEsLvjPQRjNDliZ2wvr8bw7+H
+						NnAQ1GmObjVHp7Mm4aY7TzJ5oKI1GZTV7nyhWvQATS3qdGLYvgNm86gAi1GTKIwv
+						qbon2bBRs96HYzH+BtPObBl1HJwjCXSACRHGxG4l5TBy0bde/9vp+O3rqjDrspxt
+						om6j5N5xenRhZyaY9UGpGsTpU8P4MfWjeRe5UG2IfCYAvafvHfc499lhPSXwIwID
+						AQABo0QwQjAhBgNVHREEGjAYghZnb3RvLXByb2Quc2JzLm94LmFjLnVrMB0GA1Ud
+						DgQWBBSeowx6+U31cl0vAiB9QBPLDyzoGzANBgkqhkiG9w0BAQUFAAOCAQEAucxx
+						6svK/sfjLoJN1yvVw1fOUkeIWJQ5cxvINN2S6VrifOxYnODAGPKmMluQZSA/veco
+						+2YrAbpGCftbZhUK1h2TAupy7/Kob6dpqaPfpiZTL2mWFUUShHapyZQzV6U2qtjU
+						ZBkzwMpBcaqQFRDo17qrebrskP7Baw6G4Z7p5PEVxzkvsecryOKEbZ+umu0tJkIU
+						X07ML5IKwkPS9TgHu5K1N9fP8H143PPO4xbc1HOLN+EjTM7v4lbebDaR0mbq4Pf1
+						kUtULGLhBnRXk4+7BNARn1XTkVz5pm8paytoEuj0XaICV1XFBFRjuioehkZsDzlg
+						qGeMk89a5KytkMHT/g==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School GOTO production</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Aaron</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/goto-test.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/goto-test.sbs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..6a3fefb8
--- /dev/null
+++ b/swamid-interfederations-2.0/goto-test.sbs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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://goto-test.sbs.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-13T12:26: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://goto-test.sbs.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>
+						MIIDCTCCAfGgAwIBAgIJAK4NFQlrOPTZMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFmdvdG8tdGVzdC5zYnMub3guYWMudWswHhcNMTIxMjEyMDgwOTUxWhcNMjIx
+						MjEwMDgwOTUxWjAhMR8wHQYDVQQDExZnb3RvLXRlc3Quc2JzLm94LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwN78tIqm1HaRSzAbBC57G0Rn
+						sd3H7OjbdoNWvY+LpLsVnsCRAzhMzty4gtLeKooTBI2bVNTpQOIXaINWpvZWk2qM
+						hRrykAdzLZd25li6AJAPRgy6KwS0kE3KvzaSLoC755RSChxtT82tZgX3g+eTY9//
+						4qVakTe+RfjWrx/VwHTJUSPJ36LiG6UhU7pMMYbkccxa5U3fpIRCyWdRDH2T8Rdx
+						LB1JpwHW8q4pUbHQphaRevJLu4mPdf6NxvCNnTAfDylpo5WGzL901fMBdZjrC9Xh
+						wyRLFzhQ0LlN1k9fohiO0NDIS5nTja/Ve8dTf7GdDLE+QQY2bZ63Qi6ip4ltBQID
+						AQABo0QwQjAhBgNVHREEGjAYghZnb3RvLXRlc3Quc2JzLm94LmFjLnVrMB0GA1Ud
+						DgQWBBRKKlFeaR+LtgyfVmnGIuR5P+IUOTANBgkqhkiG9w0BAQUFAAOCAQEAq2lB
+						FuRq1gW83y/NJwZeWj098TSXPD+3s7PdnUTZq5PDGLubx1Xl+aWkC07x6Q+uLgmz
+						WKjR8jZl9eQR4T0hKu4+pzcQ+tdG/+AUTArHSFQj0r7J2yolKDzDOYsm8jL6IODs
+						yZedsc//NYUn+880r3gWA4xpIGpp66ONXSCCBcGNnnNI/q6SqmF4oiChJEMqnNyg
+						3Z81IFG5BwddG3DMmaif787Zi5cKeZWv4JjiHz6d4GF+nfNmF0Zjn77dfbnTbu0V
+						BRfD+J+9Fiemupo5x2aW+XZ06Hrfd56MJbyEZkEB5c+JRfD+RxxkTQemwQsAeoQ2
+						w7NRClEZf+d10tzZmg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School GOTO test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Aaron</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/goto.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/goto.sbs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..858e6eb5
--- /dev/null
+++ b/swamid-interfederations-2.0/goto.sbs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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://goto.sbs.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-13T12:25: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://goto.sbs.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>
+						MIIC+jCCAeKgAwIBAgIJAMmSuBKQmM1rMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEWdvdG8uc2JzLm94LmFjLnVrMB4XDTEyMTIxMjA3NTc1NFoXDTIyMTIxMDA3
+						NTc1NFowHDEaMBgGA1UEAxMRZ290by5zYnMub3guYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDQ+u2W+HEKK/t0hZ3j6LQRIoj5YJDVw5Uz/Nrk
+						GsWLQf5NgXca0FggN4/MuT5wBOt11knZcqkroo9eTd5+JXYVKq8FNFLHcBm7F/D2
+						JMEofQssbW3jAfC5Ih9ns7dxWRPlQIyy747Czj5QeYgsd3VwxTCTmImet8QcczuE
+						60qUZwE57QYia1EbuQelVkFQaQFfObAlCp+z4zDbd5S4yqF+9KJIGgYgKSM5BGr0
+						TUILXxGKNwSV2W34nCGq7uyVbnKlQ/oNibOvc7kJD73QyRVQF9hJsEwCqR/Ie+xq
+						YlSMf7+oreYt6tBfAbsSYyMD/Yqj/3dGqAEmrqgsrummjnPZAgMBAAGjPzA9MBwG
+						A1UdEQQVMBOCEWdvdG8uc2JzLm94LmFjLnVrMB0GA1UdDgQWBBS4YdkEzNKVMvr3
+						16Wgs7zbMgV5+zANBgkqhkiG9w0BAQUFAAOCAQEAYRhCCsoR4ju1QbL51GKTmwOW
+						Qcc4Gx4bAu+ICEYHf65bbuY9H3LgwM7DIC+2iF9lyldaDO1VftBT2t5LFi6uoEU6
+						i1X6ArIXbiMBw/zmZVKSZnClBY/X5QkeDg+tA3FnDQ45WWXlukyx3DUThr1qne1A
+						sL1zu3tS/jg10A9ZTy6rgtNln6r/Zaumc7jQnRSv8zYICghX6YQHxaznQkBG4RYY
+						ieWFGVN7lSw52O0YCd9DwGNg44HuTea+hE/XIkqx0LNcEGtmuJsqVGZv9yKykY0B
+						iYcth/iCOH/Jh/+w1+VW3sZV3mKLQDT80uDGsCDg3LGDBpY95xQAek9MapwQ4w==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School GOTO</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Aaron</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gotodev.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/gotodev.sbs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..9db2901e
--- /dev/null
+++ b/swamid-interfederations-2.0/gotodev.sbs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,69 @@
+<?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://gotodev.sbs.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-09T14: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gotodev.sbs.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>
+						MIIEYjCCA0qgAwIBAgIJAMxRpN+bfVZcMA0GCSqGSIb3DQEBBQUAMIGxMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
+						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxHTAbBgNVBAsTFFNhaWQgQnVz
+						aW5lc3MgU2Nob29sMR0wGwYDVQQDExRnb3RvZGV2LnNicy5veC5hYy51azEeMBwG
+						CSqGSIb3DQEJARYPaXRAc2JzLm94LmFjLnVrMB4XDTEyMTEwNjEzNDc0MloXDTIy
+						MTExNDEzNDc0MlowgbExCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGly
+						ZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9y
+						ZDEdMBsGA1UECxMUU2FpZCBCdXNpbmVzcyBTY2hvb2wxHTAbBgNVBAMTFGdvdG9k
+						ZXYuc2JzLm94LmFjLnVrMR4wHAYJKoZIhvcNAQkBFg9pdEBzYnMub3guYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMUo3kXqzjNhZ47wpN836R
+						JRjPTKNjkrrT99lDQCgkUQWrQCiX5q0MWU3EfkeTUv5kvtNiA/ud+bFWSk+u2Mr0
+						HXjFzDLo3uHMNWGOhY8gcUpYrfT2SSDZ/G5U3mdC+lFAhZGxi8aMMTzzbPtlw/cf
+						uJrJ2XuKHhGCZAk37v+aszDsMwK6T7O2EDNeLHhD/2UKdt15tsRjL351ynf0oNUZ
+						QFkwBwtCc4o3DeFI44v0FbWhMVU4h+zi8ShybiyIMwE0hjijlk9o9wZPEk77SCRG
+						tKZ18k0prKpsU/R/kiWGA6oUmKGpGdohOAgY5hp6bK/1XMHAFvU8NRbvhbunEIml
+						AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2Vu
+						ZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRbIHw8+hvh5bg/mOK4XN1rQ4ZG
+						TzAfBgNVHSMEGDAWgBRbIHw8+hvh5bg/mOK4XN1rQ4ZGTzANBgkqhkiG9w0BAQUF
+						AAOCAQEAbfdWWFYJrdAjMzQrJX5yOtLb/EhBp1tV0UxYZtqFW639rjOs6KcqUXn2
+						Fox/NxmjR1JmKu90xrZvzAH8J/pAzzViNVIpu8e/TlPOcecCQb88trfPTE2LpJaq
+						kwn1+rFTwV1IibpmG9nkZ70yrLly8gAkeDcnU4THkUG6Qk9c1F+92tgxAhEPjBCy
+						9CfllJl01IvvzuZbpWjnCPNDiSntlhIda9zxiLtQyKjigEJwdaIP13bRZQ4108Xf
+						+Z624SIh+fsdncCNJ0L2KckxNe6p4Ji6TtHJoLdaS3fwj5fL0uuyxGbEd4bjTbYb
+						MGkV0HZLEY8UU6+u3JprQ4btOSl4ig==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SBS GOTO development server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Woods</md:SurName>
+    <md:EmailAddress>mailto:andrew.woods@sbs.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Woods</md:SurName>
+    <md:EmailAddress>mailto:andrew.woods@sbs.ox.ac.uk</md:EmailAddress>
+  </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
new file mode 100644
index 00000000..037a82ef
--- /dev/null
+++ b/swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml
@@ -0,0 +1,78 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0: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="https://incommon.org"/>
+  </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>
+MIIDHzCCAgegAwIBAgIJAPkWkyNL3l8nMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGdyYWNlZGIubGlnby5vcmcwHhcNMTQxMDIwMTUyODQ2WhcNMjQxMDE3MTUy
+ODQ2WjAbMRkwFwYDVQQDExBncmFjZWRiLmxpZ28ub3JnMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA/o9eGY4UWkqL2GhIryXEpNAqqXTEJnEVv7zaV62o
+DDiDbYEZdYkd9r9wuKtDO7t1OqHE98BrvcOZI+2Yu4REUm6I0MSsdtQTDr5SUfAe
+aS6C1XS1hg1b+IMeRBOVunmdGYGPqOjBkQ32MhPFPyJ57DFTfEYiSAI16kMJH2xe
+cw/sbnJt0+0x6zL9O4sGUM3BKHeFh2n6Z7lV8rrDR/5pJAAD7Ida4bSNCe7ovuWJ
+XIgWdxskeqOuZT45biPEjT+UGTfZG7jEzMc2IXBBg55sIFSihv6utwGpD43jX3ex
+Hl9opHgB1djMdK3rOsBQbI2um+ssrMqtL3RArd7u3YF6SwIDAQABo2YwZDBDBgNV
+HREEPDA6ghBncmFjZWRiLmxpZ28ub3JnhiZodHRwczovL2dyYWNlZGIubGlnby5v
+cmcvc2hpYmJvbGV0aC1zcDAdBgNVHQ4EFgQU/oULXvyKrAjzat8Uex0YHjAZCWow
+DQYJKoZIhvcNAQEFBQADggEBAPgDTXaELegbLw3Zf7/BE/NCjjGNrX6Cj6wqkp98
+1KT886B7bDlCdmiPDLXgok3oI67+Flk1PFw9r8KFYkZOgB2EPKYLsUTUg+yH8NSe
+b6H/iq+ziJOQmnSZWvx/d88xTkOF4aEP1f0hQOXt3ElmZldgQfCCteVLLbhSF5D0
+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: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: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="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/groupes.france-bioinformatique.fr-sympa.xml b/swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml
new file mode 100644
index 00000000..52ff64b0
--- /dev/null
+++ b/swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml
@@ -0,0 +1,115 @@
+<?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>
+  </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: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 : 
+-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>
+					      MIIEKjCCAxKgAwIBAgIJAI2rvCn3oTieMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
+BAYTAkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZv
+cm1hdGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1
+ZS5mcjAeFw0xNDEwMjAwOTEyMzdaFw0zNDEwMTUwOTEyMzdaMGsxCzAJBgNVBAYT
+AkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZvcm1h
+dGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1ZS5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANHjwFnlwrpydxosra2C
+A5wxUhpAShLUknop3e1B4K+x2aIXvbN6sChUkOLV/JKhhH52BMBZwI4qr/tv6ego
+BU6pnhYhWO8QtKKXyvox5NRbgeCX3CI8pQ5PJtWc++pOjq/10v4koBfbJcogsMGc
+3B/khJK4tmKHFvcEngRiwhaHVL4MPO65rYyjisg5Tr6EuDGW1xGD5ETHe1aliLyQ
+uIqN3Pirmqb8h32OlPkqQ/A2jzkYx9sTX2cEgSFFGL3Docr2bB7ie+GuiDgcnm5h
+YyQ5Ej1Of1jjOGF4UcSUKCLphukAbQyswRLqzYNr8No4JzY6ZcL/tSS32wfNG6BV
+7ZECAwEAAaOB0DCBzTAdBgNVHQ4EFgQUGAA0QcYlCVagyA/JmGcP9vm336EwgZ0G
+A1UdIwSBlTCBkoAUGAA0QcYlCVagyA/JmGcP9vm336Ghb6RtMGsxCzAJBgNVBAYT
+AkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZvcm1h
+dGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1ZS5m
+coIJAI2rvCn3oTieMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALrL
+S1BIC0tCkQx5G+ZnI9BGlHMeeqQqd9faGOFPtcyrrl6sUwMj8b1aNrJMICPxnwPG
+3Z9qjLOfihRz96pxhaxI7HYOuv987xRqD2l/ubkz/NF3l8A+k+hNSwILhwR0vjTo
+HSfX+jCW8FBrLlsgSkCv2xxE6Liwl+VcEczBYfMbBffD0kXPDo4KdY/zxs5dHYDI
+bLYBU/O/n+4v/kcj1VwwHX2/Lc40lLAQUe6cN+red1ELmJ7J6afTr5ru6vwG4P0g
+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>
+					      MIIEKjCCAxKgAwIBAgIJAI2rvCn3oTieMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
+BAYTAkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZv
+cm1hdGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1
+ZS5mcjAeFw0xNDEwMjAwOTEyMzdaFw0zNDEwMTUwOTEyMzdaMGsxCzAJBgNVBAYT
+AkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZvcm1h
+dGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1ZS5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANHjwFnlwrpydxosra2C
+A5wxUhpAShLUknop3e1B4K+x2aIXvbN6sChUkOLV/JKhhH52BMBZwI4qr/tv6ego
+BU6pnhYhWO8QtKKXyvox5NRbgeCX3CI8pQ5PJtWc++pOjq/10v4koBfbJcogsMGc
+3B/khJK4tmKHFvcEngRiwhaHVL4MPO65rYyjisg5Tr6EuDGW1xGD5ETHe1aliLyQ
+uIqN3Pirmqb8h32OlPkqQ/A2jzkYx9sTX2cEgSFFGL3Docr2bB7ie+GuiDgcnm5h
+YyQ5Ej1Of1jjOGF4UcSUKCLphukAbQyswRLqzYNr8No4JzY6ZcL/tSS32wfNG6BV
+7ZECAwEAAaOB0DCBzTAdBgNVHQ4EFgQUGAA0QcYlCVagyA/JmGcP9vm336EwgZ0G
+A1UdIwSBlTCBkoAUGAA0QcYlCVagyA/JmGcP9vm336Ghb6RtMGsxCzAJBgNVBAYT
+AkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZvcm1h
+dGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1ZS5m
+coIJAI2rvCn3oTieMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALrL
+S1BIC0tCkQx5G+ZnI9BGlHMeeqQqd9faGOFPtcyrrl6sUwMj8b1aNrJMICPxnwPG
+3Z9qjLOfihRz96pxhaxI7HYOuv987xRqD2l/ubkz/NF3l8A+k+hNSwILhwR0vjTo
+HSfX+jCW8FBrLlsgSkCv2xxE6Liwl+VcEczBYfMbBffD0kXPDo4KdY/zxs5dHYDI
+bLYBU/O/n+4v/kcj1VwwHX2/Lc40lLAQUe6cN+red1ELmJ7J6afTr5ru6vwG4P0g
+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 : 
+-listes de diffusions
+-wikis
+-sondages
+-planification de réunion</md:ServiceDescription>
+      <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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">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/gteavirtual.org.xml b/swamid-interfederations-2.0/gteavirtual.org.xml
new file mode 100644
index 00000000..91b9b491
--- /dev/null
+++ b/swamid-interfederations-2.0/gteavirtual.org.xml
@@ -0,0 +1,44 @@
+<?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
+							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
+							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>
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
new file mode 100644
index 00000000..f4556f4a
--- /dev/null
+++ b/swamid-interfederations-2.0/guardian.otl.lstest.co.uk-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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>
+						MIIC/TCCAeWgAwIBAgIJAIC+mVqksujcMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEmphY2tzb24ubHNkbC5sb2NhbDAeFw0xNDA2MTMwOTEyMTRaFw0yNDA2MTAw
+						OTEyMTRaMB0xGzAZBgNVBAMTEmphY2tzb24ubHNkbC5sb2NhbDCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBALvN/EIs7X3jeG1Nfb3z4p2DFAiu021Nkxax
+						mXWCxF04c+6E96orGzHsBAXyXX/p52mQTV97oMBxVCoA+NtKJxKlRZPAZ7b6myPe
+						IrS5qnclav1tc93LJTXnq7ebDx+YI3R1yf/7wAJMWkh9r7wJF6CTE7JblQ4oXzOt
+						0VuLvXg43BGBpgD5pG/WK986vMOlbjxIJvWH6MFtjKSokGhEItkxtYqapD5nPT96
+						HDrMfCIJLjR8e/dcM7m6GVgYjP5pOpcKlCC5QD+aTObTmXdDe7wxeEGdvyokGB/0
+						/dcv0ymilEjGVy/5Gc+MNcGyGeB/YeouHh/AobPUQOFIrfA1YHcCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISamFja3Nvbi5sc2RsLmxvY2FsMB0GA1UdDgQWBBRfX3iNqzGm
+						mRtsw9rVmqWuNGlvgzANBgkqhkiG9w0BAQUFAAOCAQEAV6T62R7NDAhoFJMYH331
+						t/ZG/zRF9d3g+1pVtEztUUJj8I3mzK3PX9xilRQF/usZdUAjR04BHxhRREuPSK0q
+						eEJzDJdLu6L35VHGxuXFblsb8nQ1tphszZSoUaB/6/k4Y3fSN9hRwWKnJMUAmW17
+						pdFmkeYsCt3ZPzSLCscM0p47vP0Wm75GKnx+iqt0PxTWhIRrvi99iUecxRdzeWFr
+						xk2uAecO5lDszLN0N8s7cUVs1q2Zt2+TGFOWlhMK7Wq6mVrWuK7BKHQ1GdtV9kjR
+						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>
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
new file mode 100644
index 00000000..859e32af
--- /dev/null
+++ b/swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml
@@ -0,0 +1,85 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0: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="https://incommon.org"/>
+  </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>
+MIIEWDCCA0CgAwIBAgIBPjANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
+ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
+BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
+dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMTA0MjkxNzI0MTJaFw0yMTA0
+MjgxNzI0MTJaMGoxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
+FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxFzAV
+BgNVBAMTDmd1ZXN0LmxpZ28ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApxrDaMIRCnagFhhjD4rY47JBOHKjA4IS6EG1MvqG6kMXm73ZdYRhRraQ
+onVmFMUPPlkR5zTlok+qvb+Iy58s6PqguQe0Tz3eEnfRlVqLaXniKNGxkef5pXFY
+hndYXzkfeoclycdYZGwu12ANoG5wjADhYcWEuiyJKprfWXF/msa65rkczuMd5WFw
+lde6hnpZTXa6FaeYb1Hi8Me36pHFCU3DfhARdup7DQ4t3QDEttQY1mn/pnY6vd2o
+oa/jmL1iHkJbTDT6+EWhk/3XdrC1tfo1VKQ+B4RebTyzRY8Wsgn3CAyAz9K5nA7w
+aYBOYhK26Z6envlE+vXviDI89J/C7QIDAQABo4HqMIHnMAwGA1UdEwEB/wQCMAAw
+DgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAZ
+BgNVHSAEEjAQMA4GDCsGAQQBgfpGAgECATA5BgNVHR8EMjAwMC6gLKAqhihodHRw
+Oi8vY2EubGlnby5vcmcvNTQxNDA0YzMvNTQxNDA0YzMuY3JsMB8GA1UdIwQYMBaA
+FFJu3Xuqb4VcCCLTl5+tfyNWHmrRMDEGA1UdEQQqMCiCDmd1ZXN0LmxpZ28ub3Jn
+gRZzY290dC5rb3JhbmRhQGxpZ28ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBXTyxj
+WEiIQ4kG8I9ujY9AssDMi63g9m4AT7uAm6mbNJVRaYkYVy7lnRi227fBjIXr8rku
+gfUhzwRULi9OUuY5eO713iB/urMn3mysch9R6heciYGzccnn5nN3gWrUN3kZ0AWd
+XaIE5G8rZOACTDp7SCVyNH1eZNkk6apK9LJgblo44XppU8gZk1OIzBzeknCuZhGz
+6Lnu58KItVKI+8w7FepUsXIdF6pHRLevhzW7d61QZ5iW8o2qW0TG24RDY4JJE45m
+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>
diff --git a/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml b/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml
new file mode 100644
index 00000000..3fb0dd9c
--- /dev/null
+++ b/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml
@@ -0,0 +1,93 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0: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="https://incommon.org"/>
+  </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>
+MIIEWDCCA0CgAwIBAgIBPjANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
+ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
+BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
+dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMTA0MjkxNzI0MTJaFw0yMTA0
+MjgxNzI0MTJaMGoxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
+FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxFzAV
+BgNVBAMTDmd1ZXN0LmxpZ28ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApxrDaMIRCnagFhhjD4rY47JBOHKjA4IS6EG1MvqG6kMXm73ZdYRhRraQ
+onVmFMUPPlkR5zTlok+qvb+Iy58s6PqguQe0Tz3eEnfRlVqLaXniKNGxkef5pXFY
+hndYXzkfeoclycdYZGwu12ANoG5wjADhYcWEuiyJKprfWXF/msa65rkczuMd5WFw
+lde6hnpZTXa6FaeYb1Hi8Me36pHFCU3DfhARdup7DQ4t3QDEttQY1mn/pnY6vd2o
+oa/jmL1iHkJbTDT6+EWhk/3XdrC1tfo1VKQ+B4RebTyzRY8Wsgn3CAyAz9K5nA7w
+aYBOYhK26Z6envlE+vXviDI89J/C7QIDAQABo4HqMIHnMAwGA1UdEwEB/wQCMAAw
+DgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAZ
+BgNVHSAEEjAQMA4GDCsGAQQBgfpGAgECATA5BgNVHR8EMjAwMC6gLKAqhihodHRw
+Oi8vY2EubGlnby5vcmcvNTQxNDA0YzMvNTQxNDA0YzMuY3JsMB8GA1UdIwQYMBaA
+FFJu3Xuqb4VcCCLTl5+tfyNWHmrRMDEGA1UdEQQqMCiCDmd1ZXN0LmxpZ28ub3Jn
+gRZzY290dC5rb3JhbmRhQGxpZ28ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBXTyxj
+WEiIQ4kG8I9ujY9AssDMi63g9m4AT7uAm6mbNJVRaYkYVy7lnRi227fBjIXr8rku
+gfUhzwRULi9OUuY5eO713iB/urMn3mysch9R6heciYGzccnn5nN3gWrUN3kZ0AWd
+XaIE5G8rZOACTDp7SCVyNH1eZNkk6apK9LJgblo44XppU8gZk1OIzBzeknCuZhGz
+6Lnu58KItVKI+8w7FepUsXIdF6pHRLevhzW7d61QZ5iW8o2qW0TG24RDY4JJE45m
+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>
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
new file mode 100644
index 00000000..c1aef287
--- /dev/null
+++ b/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml
@@ -0,0 +1,84 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0: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="https://incommon.org"/>
+  </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>
+MIIEWDCCA0CgAwIBAgIBPjANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
+ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
+BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
+dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMTA0MjkxNzI0MTJaFw0yMTA0
+MjgxNzI0MTJaMGoxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
+FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxFzAV
+BgNVBAMTDmd1ZXN0LmxpZ28ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApxrDaMIRCnagFhhjD4rY47JBOHKjA4IS6EG1MvqG6kMXm73ZdYRhRraQ
+onVmFMUPPlkR5zTlok+qvb+Iy58s6PqguQe0Tz3eEnfRlVqLaXniKNGxkef5pXFY
+hndYXzkfeoclycdYZGwu12ANoG5wjADhYcWEuiyJKprfWXF/msa65rkczuMd5WFw
+lde6hnpZTXa6FaeYb1Hi8Me36pHFCU3DfhARdup7DQ4t3QDEttQY1mn/pnY6vd2o
+oa/jmL1iHkJbTDT6+EWhk/3XdrC1tfo1VKQ+B4RebTyzRY8Wsgn3CAyAz9K5nA7w
+aYBOYhK26Z6envlE+vXviDI89J/C7QIDAQABo4HqMIHnMAwGA1UdEwEB/wQCMAAw
+DgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAZ
+BgNVHSAEEjAQMA4GDCsGAQQBgfpGAgECATA5BgNVHR8EMjAwMC6gLKAqhihodHRw
+Oi8vY2EubGlnby5vcmcvNTQxNDA0YzMvNTQxNDA0YzMuY3JsMB8GA1UdIwQYMBaA
+FFJu3Xuqb4VcCCLTl5+tfyNWHmrRMDEGA1UdEQQqMCiCDmd1ZXN0LmxpZ28ub3Jn
+gRZzY290dC5rb3JhbmRhQGxpZ28ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBXTyxj
+WEiIQ4kG8I9ujY9AssDMi63g9m4AT7uAm6mbNJVRaYkYVy7lnRi227fBjIXr8rku
+gfUhzwRULi9OUuY5eO713iB/urMn3mysch9R6heciYGzccnn5nN3gWrUN3kZ0AWd
+XaIE5G8rZOACTDp7SCVyNH1eZNkk6apK9LJgblo44XppU8gZk1OIzBzeknCuZhGz
+6Lnu58KItVKI+8w7FepUsXIdF6pHRLevhzW7d61QZ5iW8o2qW0TG24RDY4JJE45m
+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>
diff --git a/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml
new file mode 100644
index 00000000..d437c199
--- /dev/null
+++ b/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
+dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
+uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
+3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
+TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
+7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
+F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
+BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
+LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
+cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
+bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
+Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
+aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
+bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
+BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
+VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
+nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
+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>
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
new file mode 100644
index 00000000..2a455270
--- /dev/null
+++ b/swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIEhzCCA2+gAwIBAgIQYJH5E+/63l61Qiby7wHhYjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMDYyNTAwMDAwMFoXDTE1MDYyNTIzNTk1OVowXTELMAkGA1UE
+BhMCSVQxLjAsBgNVBAoTJUlzdGl0dXRvIE5hemlvbmFsZSBkaSBGaXNpY2EgTnVj
+bGVhcmUxHjAcBgNVBAMTFWhhbGZiYWNrLmNuYWYuaW5mbi5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAOH0IRtQc7utWIumhJaEwwBdovpOu3eUH3X5
+DK7/OaQYHpo2+E1tnoHdG1JU+QgZocacuw3oJz74tGdknUsvDj9MCdp2lGYLpPW9
+p4WMK5+ElpVFjLcKdxndPNME8SF0nOcRoM9aMQhpOSnSLX3Ybeov/MO0dT9iVVmW
+KAau3hSeUZ2renaL/oQp+bK3+EoYImYV/5R1rkpTTf0brmaQg3GBdxADnAdwFBgG
+Y93qnKsYQjPsOg7ik7kf0jUSrITGo7rgLHvkElm4ySG01jOOtfw4AoglUppUan2x
+hlHYWrUhdqzNV2uasqHP3t7EA4tITv8IrgJj3k2coinPbB9s1mUCAwEAAaOCAWgw
+ggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTz
+kh/WAe7TMeep782t7Dy4EX8J/DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
+BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAX
+ghVoYWxmYmFjay5jbmFmLmluZm4uaXQwDQYJKoZIhvcNAQEFBQADggEBAHW8TsHv
+D7EM9iMprOIH+5VeRSh0cYEdttX033scsifCFCArRJvhofIkR/1F23DIWRnc8//4
+7MKSrLoC9PNeIjXa6anC3O9IZNCeBxb9UEcRvPW3Yc1wEe4ATp1aR8EXtH3G2Sef
+EELgyGnKzScgkUSGIbgf9P05XOyok0RuKWTHDvYNHr/GW/NW5optwXz6apDDE2mX
+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>
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
new file mode 100644
index 00000000..962115af
--- /dev/null
+++ b/swamid-interfederations-2.0/harper-adams.ac.uk-oala-metadata.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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>
+						MIIEAjCCAuoCCQDNHBk2GcsHfjANBgkqhkiG9w0BAQUFADCBwjELMAkGA1UEBhMC
+						R0IxEzARBgNVBAgTClNocm9wc2hpcmUxEDAOBgNVBAcTB05ld3BvcnQxIDAeBgNV
+						BAoTF0hhcnBlciBBZGFtcyBVbml2ZXJzaXR5MR0wGwYDVQQLExRJbmZvcm1hdGlv
+						biBTZXJ2aWNlczEfMB0GA1UEAxMWaWRwLmhhcnBlci1hZGFtcy5hYy51azEqMCgG
+						CSqGSIb3DQEJARYbc29mdHdhcmVAaGFycGVyLWFkYW1zLmFjLnVrMB4XDTE0MDcy
+						MzE2NTk0MVoXDTI0MDcyMDE2NTk0MVowgcIxCzAJBgNVBAYTAkdCMRMwEQYDVQQI
+						EwpTaHJvcHNoaXJlMRAwDgYDVQQHEwdOZXdwb3J0MSAwHgYDVQQKExdIYXJwZXIg
+						QWRhbXMgVW5pdmVyc2l0eTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMx
+						HzAdBgNVBAMTFmlkcC5oYXJwZXItYWRhbXMuYWMudWsxKjAoBgkqhkiG9w0BCQEW
+						G3NvZnR3YXJlQGhhcnBlci1hZGFtcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBALEONJ55wbiivBF8gwlBSeXD7Dj/fQIEYzghkwoB72twLO8t
+						WruKDBri6vZPmw+ghlF91JCyLrCci5BWqV7Bmy+OacuYFyVOoYUj9fwcRXDvDp8A
+						3aUHn0Hbv11SsHdR/d24zleK0L5TMN/h0XcGJqvod/suJwzniFY8/kvoZGHV1LQA
+						tPz3lhlmcnh1dtdVKt+lskVzhoylO7YOFIYoyxQEt1JclHAFfHwmhu1um3A3/6xY
+						n9IrMQUI4RDZgM97dFb1HcxWI+gAVXj/CFOeLBVLomVeuTj6SeUL9IYYFPRR1cdY
+						+PbsPtha5BuH3v4aNugdNN63gQRndk2/RtiDjVUCAwEAATANBgkqhkiG9w0BAQUF
+						AAOCAQEAQZJQOD87UQCXBk5JnTar9EKuoBApbvwMSyAIQ05PQPoSWaEeevFcN/1y
+						uxOEzWHfXoNjj1+88Y6CfSDShnpXZAXKacwaq1Aw6oCRZLhV5UZVN483s+Ca6DEF
+						FhQrDXkhfUIS5nd28ftvFaJ+KCSNNQX9F7ceWvY5osqU2rz1QdXN5eeIXYC4q151
+						ltkIk3Qy1uShE+B9c13u2PoaUZa4PcsBbympy7adBqF/W1kf9a9UF0NGpQ8UZ5/V
+						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>
diff --git a/swamid-interfederations-2.0/hau.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/hau.idm.oclc.org-shibboleth.xml
new file mode 100644
index 00000000..25d49a8d
--- /dev/null
+++ b/swamid-interfederations-2.0/hau.idm.oclc.org-shibboleth.xml
@@ -0,0 +1,54 @@
+<?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>
+						MIIEAjCCAuqgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBjMRswGQYDVQQDFBIqLmhh
+						dS5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xDMSgwJgYJ
+						KoZIhvcNAQkBFhlqYW1lcy5odXRjaGluc29uQG9jbGMub3JnMB4XDTEzMDYxOTEz
+						NDI0OVoXDTIzMDYxOTEzNDI0OVowYzEbMBkGA1UEAxQSKi5oYXUuaWRtLm9jbGMu
+						b3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzEoMCYGCSqGSIb3DQEJARYZ
+						amFtZXMuaHV0Y2hpbnNvbkBvY2xjLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAL+VJNJG4tqZr20wvtzRlanUsfO1ABtqgQlFBYcD4DHqxHa/uCi9
+						rXpelbL/JA0VbfCImusX41lvY+lQmCit2KX1+3UxDcP7HEhifQS2GQeu4Mddfyyt
+						VIzWGB0Nf5rBATk8lZoQ7zQyICP9/829pxkVAhBh0jUy5u8dYNfftK+IZ5nO6CpW
+						TcySNz5jFUgYwIdwVFYUMaPqOLVeqe75LdHkrjdGcpKZGyfy1/sXVL/Ckq5sinhK
+						VNVH1ECU49lkO64gLbg/6/ySjDjayFzFB8mPSAtWrlQgujYkfxIeqTTxZ25HJtGA
+						eLcdYVL9qAz7G7BtvJRY6eOnN06d1F+rLmkCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
+						eOxbtlcwwkedaRnaoihkJ55Bn9QwgY0GA1UdIwSBhTCBgoAUeOxbtlcwwkedaRna
+						oihkJ55Bn9ShZ6RlMGMxGzAZBgNVBAMUEiouaGF1LmlkbS5vY2xjLm9yZzELMAkG
+						A1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxKDAmBgkqhkiG9w0BCQEWGWphbWVzLmh1
+						dGNoaW5zb25Ab2NsYy5vcmeCAQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
+						AAOCAQEAM+XxeKigNVAlRB9uju8MoJPMIyzGFl4//GuDmPwvPj28FHRziy2f38L2
+						UOua3OfllHjzY+rTCpuiC5FLKWDR/x4Zk6JNEC5NWZFszBhv5QK+T2qoa7ZqLdfL
+						aUOa+zIXkG9oqJv8V+cjvikl3y03GVPIJaSnqZ8ZqvZHUD6LTL1i6jbDmQS56B8w
+						Y20Exlm2l53EUtht3XyuABZiPmhAEly26MlvzWz4y6FkvVWAFph9aKwa1m+W5ZgD
+						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>
diff --git a/swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..735e0e1f
--- /dev/null
+++ b/swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://havana.ucs.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>
+						MIID2DCCAsACCQDhpWXD/oCByTANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
+						R0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGluYnVyZ2gxJDAiBgNV
+						BAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEPMA0GA1UECxMGSVMtSVRJ
+						MRwwGgYDVQQDExNoYXZhbmEudWNzLmVkLmFjLnVrMSIwIAYJKoZIhvcNAQkBFhNt
+						Lm1jaW50b3NoQGVkLmFjLnVrMB4XDTEzMDczMDE0MDM1N1oXDTMzMDcyNTE0MDM1
+						N1owga0xCzAJBgNVBAYTAkdCMREwDwYDVQQIEwhTY290bGFuZDESMBAGA1UEBxMJ
+						RWRpbmJ1cmdoMSQwIgYDVQQKExtUaGUgVW5pdmVyc2l0eSBvZiBFZGluYnVyZ2gx
+						DzANBgNVBAsTBklTLUlUSTEcMBoGA1UEAxMTaGF2YW5hLnVjcy5lZC5hYy51azEi
+						MCAGCSqGSIb3DQEJARYTbS5tY2ludG9zaEBlZC5hYy51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBAK2yC2qIxgLO+wMp4SKVyKCDpwDurMHkZkkTSidQ
+						MtWLNgYwHezrL0m8iZKnCNEzT2R5i2w23aKtBkBpDqyLFWKHVGEj5O386T4AB1BL
+						NJ1uqL6tNf1tkTxIBpubWWKKE8XIM/lLoN/mRJ54f/2yxiqvzvImoWA+3Uz7fIpW
+						/kcfyDNnWInxPDkY65Jj7Ymd9L1bRvejIeMTkAwjMatA+astXHL/fepWEu7dvXCU
+						6Bhi95nmZTAw1dmiOCE7pfMYLM7Dn9yDNxTsk+pw0RQrEtFNoGPwxp68xJ2OmKmD
+						iIdxOp9Q0hm9KnnflTTMeGKFxsp+sjksdHh2M0N/h4JMAl8CAwEAATANBgkqhkiG
+						9w0BAQUFAAOCAQEAUdniY6kaIwI0T6XxNTDUihAOwp2DAoEM/EaYRcR6DrxarzIu
+						1UbxqKRkavje+s9HO8iiFPwpLM7fnksxBAnaeNTveH7hgvJ67ELGmTd303yf7FaY
+						PpB7VX5d95seuSYqedgciSA6pJRi7oalCryRSCZ0+9uqfO7DZQ8BnzjGZKvOU44q
+						TjlvzyFrtqiwsl8a0vDk7a7YLpD+tsgxgzvQ++x7x4RBiMLxPfoLtN4h13SoLya5
+						JwJJ+DMu7camjdGd1nyg1jv/eEUA3vuQg7CPR3jONSw5dSsNK+jHMzeogG165oAV
+						IKD+m69XgWLE9gQQCzekuQChiZg5+O5EcyPAUA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://havana.ucs.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://havana.ucs.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://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://havana.ucs.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: JANET(UK) JVCS booking system</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jvcs.ja.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>McIntosh</md:SurName>
+    <md:EmailAddress>mailto:M.McIntosh@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>McIntosh</md:SurName>
+    <md:EmailAddress>mailto:M.McIntosh@ed.ac.uk</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
new file mode 100644
index 00000000..8b197be8
--- /dev/null
+++ b/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml
@@ -0,0 +1,159 @@
+<?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>
+      <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 height="90" width="350" xml:lang="sv">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+science borås+university+of+library+science</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+science borås+university+of+library+science</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>hb.se</mdui:DomainHint>
+        <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>
+MIIEfjCCA2agAwIBAgIQQh0tAUo8tbGvjLhvMULUFjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTA5MTAwMTAwMDAwMFoXDTEyMDkzMDIzNTk1OVowTjELMAkGA1UE
+BhMCU0UxHDAaBgNVBAoME0jDtmdza29sYW4gaSBCb3LDpXMxCzAJBgNVBAsTAklU
+MRQwEgYDVQQDEwtoYmlkcC5oYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANmhPsWXpER8PlBGqHtoR1hsTeLWqTRGhaFm9Vuc57qf7xd328jkwZ3C
+tyBL65rNHYI/EVrsiA5nNAm/NLuPl5Wh8IOztI26XcHgNhYgqe6Tlpw5kN4pn0ME
++KAMAGKh1PAaKP2E3sHN2k3QdqHU0hesmaFHRAm+9JqcP++Frkdr1WVIcxYniOBa
+dorbeA+Mui3WaMsUm/tkYTOOQ3QCHi2VT9U6JOIVyuyIjX6slHhS2LkCSAKn4sKD
+DUVaeSyTxWrH12Dx/mMd8BfXV8XkjBbDNzfFizxTzHsdrj8K8y9ggGiv5+g1Mmsf
+2ehMfEhN0TNtVLaiw9Br2N7XSLLGuaMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaA
+FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRNDaiYtvTh/NO79ufN3n7k
+Zx6CjjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
+BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdggtoYmlkcC5oYi5zZYIO
+dm0taGJpZHAuaGIuc2UwDQYJKoZIhvcNAQEFBQADggEBACUT4mjeYXLYfWz4oKhH
+ou/S52jlhiVtskXArO7Ntxk0Oy6tpSkRYgyBN4NDuaFfS//69Et4kQWfxpe7tS8X
+t2cEEtTRhYhwBpBHCMnixRxcoYyeH60fnHoeCn+w7HmD+ffyRojbtcE86O+7bRTP
+J2xZfZxoRzyEYBVfLBEcBSOYTQrlIBtZmZS/w4whSQs5ruf5X9Wj7BrFLjo8nnli
+rA6Msf8vaeuR1RNKQFHIx/vX3Aj+s2E4rq+L9O3BDAyfc1vKiNy8LLhlvYUFl9If
+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>
+MIIEfjCCA2agAwIBAgIQQh0tAUo8tbGvjLhvMULUFjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTA5MTAwMTAwMDAwMFoXDTEyMDkzMDIzNTk1OVowTjELMAkGA1UE
+BhMCU0UxHDAaBgNVBAoME0jDtmdza29sYW4gaSBCb3LDpXMxCzAJBgNVBAsTAklU
+MRQwEgYDVQQDEwtoYmlkcC5oYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANmhPsWXpER8PlBGqHtoR1hsTeLWqTRGhaFm9Vuc57qf7xd328jkwZ3C
+tyBL65rNHYI/EVrsiA5nNAm/NLuPl5Wh8IOztI26XcHgNhYgqe6Tlpw5kN4pn0ME
++KAMAGKh1PAaKP2E3sHN2k3QdqHU0hesmaFHRAm+9JqcP++Frkdr1WVIcxYniOBa
+dorbeA+Mui3WaMsUm/tkYTOOQ3QCHi2VT9U6JOIVyuyIjX6slHhS2LkCSAKn4sKD
+DUVaeSyTxWrH12Dx/mMd8BfXV8XkjBbDNzfFizxTzHsdrj8K8y9ggGiv5+g1Mmsf
+2ehMfEhN0TNtVLaiw9Br2N7XSLLGuaMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaA
+FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRNDaiYtvTh/NO79ufN3n7k
+Zx6CjjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
+BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdggtoYmlkcC5oYi5zZYIO
+dm0taGJpZHAuaGIuc2UwDQYJKoZIhvcNAQEFBQADggEBACUT4mjeYXLYfWz4oKhH
+ou/S52jlhiVtskXArO7Ntxk0Oy6tpSkRYgyBN4NDuaFfS//69Et4kQWfxpe7tS8X
+t2cEEtTRhYhwBpBHCMnixRxcoYyeH60fnHoeCn+w7HmD+ffyRojbtcE86O+7bRTP
+J2xZfZxoRzyEYBVfLBEcBSOYTQrlIBtZmZS/w4whSQs5ruf5X9Wj7BrFLjo8nnli
+rA6Msf8vaeuR1RNKQFHIx/vX3Aj+s2E4rq+L9O3BDAyfc1vKiNy8LLhlvYUFl9If
+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>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>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>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/health.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/health.balliol.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..934822d1
--- /dev/null
+++ b/swamid-interfederations-2.0/health.balliol.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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://health.balliol.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="2013-06-19T17:10:03Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://health.balliol.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>
+						MIIDDDCCAfSgAwIBAgIJAISjz39anYvxMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF2hlYWx0aC5iYWxsaW9sLm94LmFjLnVrMB4XDTEzMDYxNDE1NDcxMVoXDTIz
+						MDYxMjE1NDcxMVowIjEgMB4GA1UEAxMXaGVhbHRoLmJhbGxpb2wub3guYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEM4MhQGL1WH/wnDLogYmE
+						22fAMVtR3DdC2JCgUbjFNDij2iEGwo+uq6sqOPxgFI8LHJd6DG0RTpn6TdPC8q6o
+						q2vtpa6ncJcFIKjger8UPcOaCBf74+x2O+UF1W7BQw6MVt1dJaM05s7kk2lg+ezX
+						LdMOpbzy0JLY2c6x5PEMuHqkK8slABuKBBEqxZQwrLgo4SYgxP9I2Et7OEyQHw4G
+						EO5ADb7ZVpwY6JaSmcvHYbrXU9AsInhAhKa8AL4oSMFmbgvkgc3Y76+h+N3GPYOD
+						y3XEEY38hWvPHSOP0cA/97PeD8G0MaGx2MfY1JizaPuFWv7l/0gGMK4qyW/wtiQR
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2hlYWx0aC5iYWxsaW9sLm94LmFjLnVrMB0G
+						A1UdDgQWBBRHj9z9ifwaUesGamTczMNhu52ttzANBgkqhkiG9w0BAQUFAAOCAQEA
+						K7y6McC/jFSF5NSFePI1TYzPvgm7b5aJ5ZYyjbYvib4zqzICoEr+ehFG0lK/Q2Go
+						BJa4gr7dVZLR09n15Z/OaLxpJPXfcSPCYFtMi3ZUUXbFmLjp/U2G0rB1Lciv6leY
+						NCxxd7afv6NbvsRDXLCadPbRULjQepz6R0A0ewyrlw2kl1k5GB52HsjbPpXpWKTd
+						xFFtqC450OBmGvKCxrBmXmKRgKSqBMCZuayejedIlTc3CsXfL3Yt89oqbINUAlHk
+						jH6XT7Moapdct22P+qnwRCS/apvjf+xLuRWz7qEm/HK+dnMG1ZLEYTMAMY2tvPsr
+						AKnWzztuE6aBJIRLC1YhqQ==
+					</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://health.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://health.balliol.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://health.balliol.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://health.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://health.balliol.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 Balliol College Health Monitoring</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Plummer</md:SurName>
+    <md:EmailAddress>mailto:ian.plummer@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Plummer</md:SurName>
+    <md:EmailAddress>mailto:ian.plummer@balliol.ox.ac.uk</md:EmailAddress>
+  </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
new file mode 100644
index 00000000..aeec8976
--- /dev/null
+++ b/swamid-interfederations-2.0/hefce-shib.hefce.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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>
+						MIIDQzCCAiugAwIBAgIUezj/faBM5uouEQmqmYzIjOz/6JEwDQYJKoZIhvcNAQEF
+						BQAwITEfMB0GA1UEAxMWaGVmY2Utc2hpYi5oZWZjZS5hYy51azAeFw0wOTA3MTYx
+						MjA3MzZaFw0yOTA3MTYxMjA3MzZaMCExHzAdBgNVBAMTFmhlZmNlLXNoaWIuaGVm
+						Y2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEaksTLYnl
+						GL5voE3VgwtWMCMv3geB6Py4KTrP31bm1+lh0uOmLnvA/hWynXSVZlNneaxRKFMG
+						VWeqPzA7Pgr18kNGsN3dL5Uqgsa5wHRssRERQLi7gGsOgDLeDHAVPeHdfq4Xf7xa
+						txX+0OEQ8o/8rBrVCrXvbb5+bYSdmrN9EljMpb9Thos3LN4kSentD6Ynmatsh/yc
+						+aAc7T6OrIG1tIsahaIMAdS2bWufCKhKZTLvkQy5RypcfTUiRqdfGm+YUt5mI29J
+						NVx0zVTfiv6EZNwrWdk23E0JyRn2qEQlnShyJD6TmVJfrX4XpPGx54DbZebMNpVK
+						81xTMIgY9/69AgMBAAGjczBxMFAGA1UdEQRJMEeCFmhlZmNlLXNoaWIuaGVmY2Uu
+						YWMudWuGLWh0dHBzOi8vaGVmY2Utc2hpYi5oZWZjZS5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQUGy/6MNFxhre5bjKaqpv+vZ9gETEwDQYJKoZIhvcNAQEF
+						BQADggEBAGMdM/fMvuLzyNWsEiFZ9/8j0w3J24GP3vVHW5Qo78cgJFefvRCIiRyc
+						Vgd9xbOwa73jQmJfJVdVU2wQxE/zDlblpuVJRF2C5ZeNb02utv6k4z//aitqeJWs
+						+iUj1PrebWVVQowkSjAs2q94qaQcwjYRajsp5WZak+nwknPJghRqwr3zhW4RlxV6
+						ZdwS2D2Ckz3bxI+EQDS4PNpxQA/rczG4H2FgvsLGXV9+s3LmVMtkrfGNdLhTd9yi
+						wXj9oLBF9cMb98YjywMT6pVbuGtbJVxnFqb0RAAkUrCkNdNLAUUGD8S3tRVLi7Cv
+						BNj9t+EYKF8K7y4unRFf9gVHwyWBLq0=
+					</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 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>
+						MIIDQzCCAiugAwIBAgIUezj/faBM5uouEQmqmYzIjOz/6JEwDQYJKoZIhvcNAQEF
+						BQAwITEfMB0GA1UEAxMWaGVmY2Utc2hpYi5oZWZjZS5hYy51azAeFw0wOTA3MTYx
+						MjA3MzZaFw0yOTA3MTYxMjA3MzZaMCExHzAdBgNVBAMTFmhlZmNlLXNoaWIuaGVm
+						Y2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEaksTLYnl
+						GL5voE3VgwtWMCMv3geB6Py4KTrP31bm1+lh0uOmLnvA/hWynXSVZlNneaxRKFMG
+						VWeqPzA7Pgr18kNGsN3dL5Uqgsa5wHRssRERQLi7gGsOgDLeDHAVPeHdfq4Xf7xa
+						txX+0OEQ8o/8rBrVCrXvbb5+bYSdmrN9EljMpb9Thos3LN4kSentD6Ynmatsh/yc
+						+aAc7T6OrIG1tIsahaIMAdS2bWufCKhKZTLvkQy5RypcfTUiRqdfGm+YUt5mI29J
+						NVx0zVTfiv6EZNwrWdk23E0JyRn2qEQlnShyJD6TmVJfrX4XpPGx54DbZebMNpVK
+						81xTMIgY9/69AgMBAAGjczBxMFAGA1UdEQRJMEeCFmhlZmNlLXNoaWIuaGVmY2Uu
+						YWMudWuGLWh0dHBzOi8vaGVmY2Utc2hpYi5oZWZjZS5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQUGy/6MNFxhre5bjKaqpv+vZ9gETEwDQYJKoZIhvcNAQEF
+						BQADggEBAGMdM/fMvuLzyNWsEiFZ9/8j0w3J24GP3vVHW5Qo78cgJFefvRCIiRyc
+						Vgd9xbOwa73jQmJfJVdVU2wQxE/zDlblpuVJRF2C5ZeNb02utv6k4z//aitqeJWs
+						+iUj1PrebWVVQowkSjAs2q94qaQcwjYRajsp5WZak+nwknPJghRqwr3zhW4RlxV6
+						ZdwS2D2Ckz3bxI+EQDS4PNpxQA/rczG4H2FgvsLGXV9+s3LmVMtkrfGNdLhTd9yi
+						wXj9oLBF9cMb98YjywMT6pVbuGtbJVxnFqb0RAAkUrCkNdNLAUUGD8S3tRVLi7Cv
+						BNj9t+EYKF8K7y4unRFf9gVHwyWBLq0=
+					</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:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hefce-shib.hefce.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md: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/heinonline.org-entity.xml b/swamid-interfederations-2.0/heinonline.org-entity.xml
new file mode 100644
index 00000000..13fce878
--- /dev/null
+++ b/swamid-interfederations-2.0/heinonline.org-entity.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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>
+						MIID1jCCAr6gAwIBAgIJAKKIx7G8Se2XMA0GCSqGSIb3DQEBBQUAMGwxCzAJBgNV
+						BAYTAlVTMREwDwYDVQQIEwhOZXcgWW9yazEPMA0GA1UEBxMGSXRoYWNhMSAwHgYD
+						VQQKExdXUyBIZWluIGFuZCBDb21wYW55IEluYzEXMBUGA1UEAxMOaGVpbm9ubGlu
+						ZS5vcmcwHhcNMTEwNTIwMTYzNjEzWhcNMjEwNTE3MTYzNjEzWjBsMQswCQYDVQQG
+						EwJVUzERMA8GA1UECBMITmV3IFlvcmsxDzANBgNVBAcTBkl0aGFjYTEgMB4GA1UE
+						ChMXV1MgSGVpbiBhbmQgQ29tcGFueSBJbmMxFzAVBgNVBAMTDmhlaW5vbmxpbmUu
+						b3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2w2m3RnHsi1LOOmJ
+						cbxPV/qCPbUoG7J6MqodKyKB3cLpGTvTk1u+iFh/TpYGe2jvUZywoW7fH6cc6rZM
+						QC3Ix9BODKBIFuvMs5XYqdwIHq3kZ1st8FubN6sQZ9dEf9IKDflvHSMYzxzsZnfR
+						Y5XsEnQRU9R9M91NEabXF4SMCyn45obWpKhBdLzX435I41AFtRLBYIr46bq89lWE
+						VHkc8ic/w4Q+QB1f1q5ej37ogiuiPbSLDpvscUTpUipUHzOj1oE7/zvAoZ48WYqx
+						8x01C8xVtwiIy8p3new658A7rwrveq8CbeglUE1uaXq+swePZMH57TIT1SB4Hrnu
+						97sWEwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
+						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUrKKkqy079i1m8wc8+kyp
+						Jne7OtMwHwYDVR0jBBgwFoAUrKKkqy079i1m8wc8+kypJne7OtMwDQYJKoZIhvcN
+						AQEFBQADggEBADFtM86JUBLYkundSv7WlNQK7HDi76ZHeYg4PcHMVQhdOHTvQm9J
+						WqwyHRB7Lk+eOl2DQDXMjWjh+FgvM7VNHqGzldR+uLgLShJgZrb6pYZYuxXNrK6l
+						MxfOkN2YPwIsI+jK1DEKArjZ+Z0QlH8osJTR1HtWjbLEqi7Vy3k6jXq7rDD+QTiV
+						L/+tbPcnYvRa54AKEdoHGsnFlw/WTWT/umc330g9aAGFeD1KlI1cSW2naSUqRnvK
+						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>
+						MIID1jCCAr6gAwIBAgIJAKKIx7G8Se2XMA0GCSqGSIb3DQEBBQUAMGwxCzAJBgNV
+						BAYTAlVTMREwDwYDVQQIEwhOZXcgWW9yazEPMA0GA1UEBxMGSXRoYWNhMSAwHgYD
+						VQQKExdXUyBIZWluIGFuZCBDb21wYW55IEluYzEXMBUGA1UEAxMOaGVpbm9ubGlu
+						ZS5vcmcwHhcNMTEwNTIwMTYzNjEzWhcNMjEwNTE3MTYzNjEzWjBsMQswCQYDVQQG
+						EwJVUzERMA8GA1UECBMITmV3IFlvcmsxDzANBgNVBAcTBkl0aGFjYTEgMB4GA1UE
+						ChMXV1MgSGVpbiBhbmQgQ29tcGFueSBJbmMxFzAVBgNVBAMTDmhlaW5vbmxpbmUu
+						b3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2w2m3RnHsi1LOOmJ
+						cbxPV/qCPbUoG7J6MqodKyKB3cLpGTvTk1u+iFh/TpYGe2jvUZywoW7fH6cc6rZM
+						QC3Ix9BODKBIFuvMs5XYqdwIHq3kZ1st8FubN6sQZ9dEf9IKDflvHSMYzxzsZnfR
+						Y5XsEnQRU9R9M91NEabXF4SMCyn45obWpKhBdLzX435I41AFtRLBYIr46bq89lWE
+						VHkc8ic/w4Q+QB1f1q5ej37ogiuiPbSLDpvscUTpUipUHzOj1oE7/zvAoZ48WYqx
+						8x01C8xVtwiIy8p3new658A7rwrveq8CbeglUE1uaXq+swePZMH57TIT1SB4Hrnu
+						97sWEwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
+						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUrKKkqy079i1m8wc8+kyp
+						Jne7OtMwHwYDVR0jBBgwFoAUrKKkqy079i1m8wc8+kypJne7OtMwDQYJKoZIhvcN
+						AQEFBQADggEBADFtM86JUBLYkundSv7WlNQK7HDi76ZHeYg4PcHMVQhdOHTvQm9J
+						WqwyHRB7Lk+eOl2DQDXMjWjh+FgvM7VNHqGzldR+uLgLShJgZrb6pYZYuxXNrK6l
+						MxfOkN2YPwIsI+jK1DEKArjZ+Z0QlH8osJTR1HtWjbLEqi7Vy3k6jXq7rDD+QTiV
+						L/+tbPcnYvRa54AKEdoHGsnFlw/WTWT/umc330g9aAGFeD1KlI1cSW2naSUqRnvK
+						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>
diff --git a/swamid-interfederations-2.0/helium.jcu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/helium.jcu.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..2a0d7b1a
--- /dev/null
+++ b/swamid-interfederations-2.0/helium.jcu.cz-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?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>
+      <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>
+MIIDHzCCAgegAwIBAgIUT352/cuSCyIoBXXvytfYj0l2xeAwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaGVsaXVtLmpjdS5jejAeFw0xMDA1MDMwOTQ1MDZaFw0z
+MDA1MDMwOTQ1MDZaMBgxFjAUBgNVBAMTDWhlbGl1bS5qY3UuY3owggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVeR3QqDjqBUa8PvQHUCAYk16vc/tCuGH0
+330jNRPCXp4/OBBH8Z/jNe1ikVgzYXnN8qgf8ZqVXMDhdZD4T2Ewhhg1ZoqasCIV
+8lGFGCdGkQlTfM1NZWLcXtC/aB99EtV9yXowIHWZiggW5PLB2ggGxn4hk7EMEywa
+IKJ+rUSzx0cXgxNQMrHTcYtCVOlwKWbAk8l9ZlKllSgekwyhXknx9kXAIkr12N3h
+wHixnVqaMNAHkb4Ghcx66HTByRQhvh5g5mDcGV9ZhwSTPrXsfRyD06P7fVzCZjV8
+FiuNxgdNQ9Q+PvZcy/sH5Gxdu1i4VaJvPK9Gk3jCnDaXmBTT/UwlAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWhlbGl1bS5qY3UuY3qGJGh0dHBzOi8vaGVsaXVtLmpjdS5j
+ei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUl6GU8/XvLl9I4+OaJjqAEW22yY8w
+DQYJKoZIhvcNAQEFBQADggEBAC5Rgn6IZByCrNOSqggl7j1T254ZzUKauG7joWW8
+HvrPcYWQsl4OU+FHErx4GAwOq9YpKpoJzcLGX3XBCJyo+Pw9ohbqWAgyBCYyBTQh
+mWV8+7BTWEZ6RCnGKcWfNRGg8mEMB6y+7YNdm+60YdCrbVasOstlDKoqTOa1gwD8
+fKpd1AzFldX7PwxwagGWYycYkSDXoS7nADEFzgn3cGlU9QnW4YtBBp30sOJjGgTj
+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>
+MIIDHzCCAgegAwIBAgIUT352/cuSCyIoBXXvytfYj0l2xeAwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaGVsaXVtLmpjdS5jejAeFw0xMDA1MDMwOTQ1MDZaFw0z
+MDA1MDMwOTQ1MDZaMBgxFjAUBgNVBAMTDWhlbGl1bS5qY3UuY3owggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVeR3QqDjqBUa8PvQHUCAYk16vc/tCuGH0
+330jNRPCXp4/OBBH8Z/jNe1ikVgzYXnN8qgf8ZqVXMDhdZD4T2Ewhhg1ZoqasCIV
+8lGFGCdGkQlTfM1NZWLcXtC/aB99EtV9yXowIHWZiggW5PLB2ggGxn4hk7EMEywa
+IKJ+rUSzx0cXgxNQMrHTcYtCVOlwKWbAk8l9ZlKllSgekwyhXknx9kXAIkr12N3h
+wHixnVqaMNAHkb4Ghcx66HTByRQhvh5g5mDcGV9ZhwSTPrXsfRyD06P7fVzCZjV8
+FiuNxgdNQ9Q+PvZcy/sH5Gxdu1i4VaJvPK9Gk3jCnDaXmBTT/UwlAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWhlbGl1bS5qY3UuY3qGJGh0dHBzOi8vaGVsaXVtLmpjdS5j
+ei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUl6GU8/XvLl9I4+OaJjqAEW22yY8w
+DQYJKoZIhvcNAQEFBQADggEBAC5Rgn6IZByCrNOSqggl7j1T254ZzUKauG7joWW8
+HvrPcYWQsl4OU+FHErx4GAwOq9YpKpoJzcLGX3XBCJyo+Pw9ohbqWAgyBCYyBTQh
+mWV8+7BTWEZ6RCnGKcWfNRGg8mEMB6y+7YNdm+60YdCrbVasOstlDKoqTOa1gwD8
+fKpd1AzFldX7PwxwagGWYycYkSDXoS7nADEFzgn3cGlU9QnW4YtBBp30sOJjGgTj
+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>
diff --git a/swamid-interfederations-2.0/help.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/help.it.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..99605d4b
--- /dev/null
+++ b/swamid-interfederations-2.0/help.it.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://help.it.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-12T12:49: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">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC9zCCAd+gAwIBAgIJANte3kl4BkiUMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEGhlbHAuaXQub3guYWMudWswHhcNMTQwOTA5MDY1OTQ3WhcNMjQwOTA2MDY1
+						OTQ3WjAbMRkwFwYDVQQDExBoZWxwLml0Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEA2zwEWrEoHWjxIRuQAw521bgEWTgvziYBx2XtNzG+
+						AGfK9XPrIn9KDxR9Ve0ROx5bvTMYEKi8TMWp2wUaGIYqizDfoDADSeTOaBa8XnC1
+						MgshF/zYKLPbOtoXMwu8kc5p5h+ETXzw7XYG3l1+ERS8cdQ9ozNVlJEYjnYLDT2Z
+						px1yHmlpul9jFpMqgT4qIzaMFv0EFo69R1REa4eLDiLrJk32Fb14X2tQWCYdMMlK
+						5jXj+RfTvIQgfwTvdur+3v87orQB952uXJ0fXTbPPgq76ri3YH0IbYMYaiZRirqX
+						YJ+WNkKuD9pejZiEWpdD+l9zbrCTUDzBK2NYdCKelN/scQIDAQABoz4wPDAbBgNV
+						HREEFDASghBoZWxwLml0Lm94LmFjLnVrMB0GA1UdDgQWBBTRtIlT5Ks2V33XiWgA
+						U9eviW2LwTANBgkqhkiG9w0BAQUFAAOCAQEALmvigxrsTaGMK+RTB4MmI17ARfNe
+						UFgG42mqlEqLaeW1SzfD3v1jkwcKAccd4V5XcgKB09fa9bVjX2PN58XvX8K/bRBw
+						0Spa+fhxS/QqjatYKGrMqSood+WRaQi/voduAv11W1utpn9qTwaaZYKdzhx/dEK5
+						RJZzJiHWSDd121TIo2JsZ22GTCwt/aZjTpSHsl+PmYtXMu/wwPxD/7Lh37hNwqq4
+						RE9E7Wvu6AtrcbaVeu1r574c808GWDiArwPSBD5AHVBALXvTlO+W4+YmN9Ua3Y9N
+						A12BEgZWkUPf9LMkt++7lXugQ8mmODZtHFKglE1pty65rct/NFdRfErFwg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://help.it.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://help.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - help.it.ox.ac.uk</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://help.it.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NSMS</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</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
new file mode 100644
index 00000000..96e09fb2
--- /dev/null
+++ b/swamid-interfederations-2.0/hereford.ac.uk-oala-metadata.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIDWDCCAkCgAwIBAgIILT4zd54jo/wwDQYJKoZIhvcNAQEFBQAwQzEkMCIGA1UE
+						CgwbSGVyZWZvcmQgU2l4dGggRm9ybSBDb2xsZWdlMRswGQYDVQQDDBJpZHAuaGVy
+						ZWZvcmQuYWMudWswHhcNMTMwNjE5MTAzNTM2WhcNMjMwNjE5MTAzNTM2WjBDMSQw
+						IgYDVQQKDBtIZXJlZm9yZCBTaXh0aCBGb3JtIENvbGxlZ2UxGzAZBgNVBAMMEmlk
+						cC5oZXJlZm9yZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AIfFoXIUvMYf21sWKJQfFVVOi0h8y7aC/dvDJA4lOBImafBE5Nj5X4LzK2LKMVp8
+						majS8DXN3GHhjtNWNiq6H/+7uGUZZjOhXvirrt8NIunX3Sxh+utQHV1MHkcHYaLz
+						4k6j7ZdzFv1XrAsELK+/qjLkj0stXwYPSwYFIzrF1wBdqn8wqc8dzem30D8gWJ8i
+						GzXXDGnp3UHqxgk1rx26HCbWqNY4BqwT3OO7H324hxQIcFWdD096NYxE9Cam8fUI
+						qknu5RBAD25wqJVDrOWBYtl9A4IvczNVjcOrs6MpjmI0OspHQvY9V9G5TYObHG5Q
+						bnzhYPyG7EVtsldbNWMeSjUCAwEAAaNQME4wHQYDVR0OBBYEFANLmaGyW7F0uvbZ
+						Ve1RHwWuqN7DMB8GA1UdIwQYMBaAFANLmaGyW7F0uvbZVe1RHwWuqN7DMAwGA1Ud
+						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAQPkd/yCL7mA9DSkO8t65XZ+IDT
+						VCBxORxaTmXjmtbtiKkFfF5LxCOAaoVbiuBQLPm5mn6vH9kgzyApMhfwSYgGMssP
+						eckyVfa28lGU5B+0Ug6QOb90kjFD7OUFx+510xyRkPtU6WmF+VJgXbsJQa6z96wb
+						vfK1jq82mtG1hUGG5CzNxAGeyGLE3w7wd22gXclr//LVjdCBDmrKDCZuRZtIcspl
+						/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>
+						MIIDWDCCAkCgAwIBAgIILT4zd54jo/wwDQYJKoZIhvcNAQEFBQAwQzEkMCIGA1UE
+						CgwbSGVyZWZvcmQgU2l4dGggRm9ybSBDb2xsZWdlMRswGQYDVQQDDBJpZHAuaGVy
+						ZWZvcmQuYWMudWswHhcNMTMwNjE5MTAzNTM2WhcNMjMwNjE5MTAzNTM2WjBDMSQw
+						IgYDVQQKDBtIZXJlZm9yZCBTaXh0aCBGb3JtIENvbGxlZ2UxGzAZBgNVBAMMEmlk
+						cC5oZXJlZm9yZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AIfFoXIUvMYf21sWKJQfFVVOi0h8y7aC/dvDJA4lOBImafBE5Nj5X4LzK2LKMVp8
+						majS8DXN3GHhjtNWNiq6H/+7uGUZZjOhXvirrt8NIunX3Sxh+utQHV1MHkcHYaLz
+						4k6j7ZdzFv1XrAsELK+/qjLkj0stXwYPSwYFIzrF1wBdqn8wqc8dzem30D8gWJ8i
+						GzXXDGnp3UHqxgk1rx26HCbWqNY4BqwT3OO7H324hxQIcFWdD096NYxE9Cam8fUI
+						qknu5RBAD25wqJVDrOWBYtl9A4IvczNVjcOrs6MpjmI0OspHQvY9V9G5TYObHG5Q
+						bnzhYPyG7EVtsldbNWMeSjUCAwEAAaNQME4wHQYDVR0OBBYEFANLmaGyW7F0uvbZ
+						Ve1RHwWuqN7DMB8GA1UdIwQYMBaAFANLmaGyW7F0uvbZVe1RHwWuqN7DMAwGA1Ud
+						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAQPkd/yCL7mA9DSkO8t65XZ+IDT
+						VCBxORxaTmXjmtbtiKkFfF5LxCOAaoVbiuBQLPm5mn6vH9kgzyApMhfwSYgGMssP
+						eckyVfa28lGU5B+0Ug6QOb90kjFD7OUFx+510xyRkPtU6WmF+VJgXbsJQa6z96wb
+						vfK1jq82mtG1hUGG5CzNxAGeyGLE3w7wd22gXclr//LVjdCBDmrKDCZuRZtIcspl
+						/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>
diff --git a/swamid-interfederations-2.0/hermes.kendal.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/hermes.kendal.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..cf8bcd00
--- /dev/null
+++ b/swamid-interfederations-2.0/hermes.kendal.ac.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						MDQwNzQ1MjZaMFUxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZLZW5kYWwxFzAVBgNV
+						BAoTDktlbmRhbCBDb2xsZWdlMRwwGgYDVQQDExNoZXJtZXMua2VuZGFsLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuFaEIWh3r5giUZD7uIDh
+						OoIuUVdZk1FGrFAjRqOHQFLy6Hn7nWTDvUs4TmrIk/iJUhQ+J9m03R+0b5lIvzyX
+						6Ln8x4ROrEgNHjTAHexaISufWOD5n9Tpbb6Ty3B6KkoKHKbiwTQIULiAQ6kexY7n
+						l7+ygcj8FgjMpf58SWplsBuvvBDf/2AZ8hAax9m3KSvF6JM31o49q+xdMmAlbr9t
+						RGXgY4+SyRAu3k0cnJengS6IyiUU+xAMU6i5p6vOGMedXRega8cZ5brWVujIxFR0
+						UWbdZF801hazxntEA60mENp5oe9XaGOVfx8mz43MTStI0Zu88MtcnXpHzjzf0wxY
+						uQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCGEX09Mj8zeAGHJYoN9zulj6Clf8Ho
+						ZckCbIS9TmADXSzLi4WGrXT5MwRxWZAvyJM6tL2XqZDjLcRzoFZrqy6UHedbWPbk
+						yI+BvWNcI+5qA6vzp102hh4oe9o6zQYnM/RnQHxWPLChdviskN+sjDk9vXi6ggAg
+						ZhXigT6XazIAF42mib9Cb2CWmT5DC5ELdUgZNPdkSeHEHcf3OTmMTfyuZM6P4woT
+						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>
+						MIIDJjCCAg4CCQCftH7JV+1i/jANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJH
+						QjEPMA0GA1UECBMGS2VuZGFsMRcwFQYDVQQKEw5LZW5kYWwgQ29sbGVnZTEcMBoG
+						A1UEAxMTaGVybWVzLmtlbmRhbC5hYy51azAeFw0xNDA0MDkwNzQ1MjZaFw0zNDA0
+						MDQwNzQ1MjZaMFUxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZLZW5kYWwxFzAVBgNV
+						BAoTDktlbmRhbCBDb2xsZWdlMRwwGgYDVQQDExNoZXJtZXMua2VuZGFsLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuFaEIWh3r5giUZD7uIDh
+						OoIuUVdZk1FGrFAjRqOHQFLy6Hn7nWTDvUs4TmrIk/iJUhQ+J9m03R+0b5lIvzyX
+						6Ln8x4ROrEgNHjTAHexaISufWOD5n9Tpbb6Ty3B6KkoKHKbiwTQIULiAQ6kexY7n
+						l7+ygcj8FgjMpf58SWplsBuvvBDf/2AZ8hAax9m3KSvF6JM31o49q+xdMmAlbr9t
+						RGXgY4+SyRAu3k0cnJengS6IyiUU+xAMU6i5p6vOGMedXRega8cZ5brWVujIxFR0
+						UWbdZF801hazxntEA60mENp5oe9XaGOVfx8mz43MTStI0Zu88MtcnXpHzjzf0wxY
+						uQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCGEX09Mj8zeAGHJYoN9zulj6Clf8Ho
+						ZckCbIS9TmADXSzLi4WGrXT5MwRxWZAvyJM6tL2XqZDjLcRzoFZrqy6UHedbWPbk
+						yI+BvWNcI+5qA6vzp102hh4oe9o6zQYnM/RnQHxWPLChdviskN+sjDk9vXi6ggAg
+						ZhXigT6XazIAF42mib9Cb2CWmT5DC5ELdUgZNPdkSeHEHcf3OTmMTfyuZM6P4woT
+						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>
diff --git a/swamid-interfederations-2.0/historicaltexts.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/historicaltexts.jisc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..7dc0252a
--- /dev/null
+++ b/swamid-interfederations-2.0/historicaltexts.jisc.ac.uk-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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>
+						MIIEETCCAvmgAwIBAgIJAOP4YayhAdK+MA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNV
+						BAYTAkdCMRMwEQYDVQQIEwpNYW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVy
+						MQ0wCwYDVQQKEwRKaXNjMQ4wDAYDVQQLEwVNaW1hczEjMCEGA1UEAxMaaGlzdG9y
+						aWNhbHRleHRzLmppc2MuYWMudWswHhcNMTQwNDI1MDk0MTU2WhcNMjQwNDIyMDk0
+						MTU2WjB7MQswCQYDVQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UE
+						BxMKTWFuY2hlc3RlcjENMAsGA1UEChMESmlzYzEOMAwGA1UECxMFTWltYXMxIzAh
+						BgNVBAMTGmhpc3RvcmljYWx0ZXh0cy5qaXNjLmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEA+VVk9NbTl+5Gfe3+UD0WJ8B94T7FHT3qq6rXPqiy
+						Q1TqfU+hfseNm/kOSZKbvJJ6ejAnJutSS+srq1G/FcfWVksyQqkaL/hYcYRaanO6
+						rnhxts8phGiVK3jmFQH8ABviUtqzfEl/6fLdkK96+BoQChYYy+n1ixc/CjX2CvIm
+						h+uqkoTx3HfFVTeSA8ts693oAETQ8KQLgx72Iat6VNCmQ+IbFTBdhpKkmrz0b2PY
+						qXdJiBwVAHcyUtgiOzeQmFlLqIEJynMZfJOrtJFsl/K7up8XralxOptZjf5e3MEF
+						Jav0iuF/bPEBZxDEr/jdMalUWWpOigUovyPnMc95ErrcDwIDAQABo4GXMIGUMAkG
+						A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+						BQcDAjAlBgNVHREEHjAcghpoaXN0b3JpY2FsdGV4dHMuamlzYy5hYy51azA0BgNV
+						HRIELTArgSltaW1hcy1zaGliLXRlY2hAbGlzdHNlcnYubWFuY2hlc3Rlci5hYy51
+						azANBgkqhkiG9w0BAQUFAAOCAQEAO9iMvuz4oMurJ+4kOGnB6mHtMcUkWkBCCr3r
+						UswJA0PD8C1Tln+X7f7d3ClTg/6endwI045/joh4FWfo0yBrvHirGoyZhW/8bvWH
+						De91vuWDRcEqeUhBWjbfe2wcLMk5r4Lmy2bsYuhaNjLdC2+xxMSyziKtiNIl9Wfd
+						6fsIsQjIx0YTnn6MN99JphafYPY/evhmVXn1XOxpLIVAUAPJDh8HYhnYxToJiy7D
+						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>
diff --git a/swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml b/swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml
new file mode 100644
index 00000000..d85468d4
--- /dev/null
+++ b/swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml
@@ -0,0 +1,79 @@
+<?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>
+						MIIDWDCCAkCgAwIBAgIJAIF9qCDnlp/PMA0GCSqGSIb3DQEBBQUAMCYxDDAKBgNV
+						BAoTA1VXRTEWMBQGA1UEAxMNaGxzLnV3ZS5hYy51azAeFw0xMzExMTIxMTAxNTJa
+						Fw0yMzExMTAxMTAxNTJaMCYxDDAKBgNVBAoTA1VXRTEWMBQGA1UEAxMNaGxzLnV3
+						ZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKeL+4hyrrRQ
+						44APl//eH/UQDbjO/tyPSpmOi50u6u/qfoYr4bc5qCSlToN3im30Gxq8YJ58mHVx
+						dto7txqz4D0CFUMZBmRCcarLrMXEXUfebzPNkFV0LL6Ae12G9MfqWLCGJDQrJraX
+						gT4xQYcMZlzHBTFfsGMF6LaOic/l3wyXVq3qeEwo2hmcEHTnW3wEf1+cY8dwL7Ms
+						8hBsGGl8lKYOvUCv28rhBsHjffkf3DtJNlaE/0CeU1K0qRFiVusta7FuEG3K8B1p
+						o1B6sEuXPRbgjzHLeIWySE8GLJlb6iErpjLsym93acFQXYgBPdku78TUEQMiX4+k
+						CnHLSb+E+Z8CAwEAAaOBiDCBhTAdBgNVHQ4EFgQU3PcvI9B6dkUu9jAFhjLjjnPN
+						b2AwVgYDVR0jBE8wTYAU3PcvI9B6dkUu9jAFhjLjjnPNb2ChKqQoMCYxDDAKBgNV
+						BAoTA1VXRTEWMBQGA1UEAxMNaGxzLnV3ZS5hYy51a4IJAIF9qCDnlp/PMAwGA1Ud
+						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJmty3rQooOzSXU6q/IsS6+/DIpo
+						2YUrHeuWtiS9yZKVFu+UkjXBs6pub/R7K70119ju/6XzkYYuF7uCjht6m3VaX5pK
+						0v5p1+TTSxad18iyWBdZCSEbhnyhw39hg1BBrzxPHjgGANTxiw3KY90+4kDvfQM+
+						B8jDb19FkDP2s385z0fqejBp+5LeEtY518lIdmQgT8cnqrW2z+2oLc0FdLL072Vo
+						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>
+						MIIDWDCCAkCgAwIBAgIJAIF9qCDnlp/PMA0GCSqGSIb3DQEBBQUAMCYxDDAKBgNV
+						BAoTA1VXRTEWMBQGA1UEAxMNaGxzLnV3ZS5hYy51azAeFw0xMzExMTIxMTAxNTJa
+						Fw0yMzExMTAxMTAxNTJaMCYxDDAKBgNVBAoTA1VXRTEWMBQGA1UEAxMNaGxzLnV3
+						ZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKeL+4hyrrRQ
+						44APl//eH/UQDbjO/tyPSpmOi50u6u/qfoYr4bc5qCSlToN3im30Gxq8YJ58mHVx
+						dto7txqz4D0CFUMZBmRCcarLrMXEXUfebzPNkFV0LL6Ae12G9MfqWLCGJDQrJraX
+						gT4xQYcMZlzHBTFfsGMF6LaOic/l3wyXVq3qeEwo2hmcEHTnW3wEf1+cY8dwL7Ms
+						8hBsGGl8lKYOvUCv28rhBsHjffkf3DtJNlaE/0CeU1K0qRFiVusta7FuEG3K8B1p
+						o1B6sEuXPRbgjzHLeIWySE8GLJlb6iErpjLsym93acFQXYgBPdku78TUEQMiX4+k
+						CnHLSb+E+Z8CAwEAAaOBiDCBhTAdBgNVHQ4EFgQU3PcvI9B6dkUu9jAFhjLjjnPN
+						b2AwVgYDVR0jBE8wTYAU3PcvI9B6dkUu9jAFhjLjjnPNb2ChKqQoMCYxDDAKBgNV
+						BAoTA1VXRTEWMBQGA1UEAxMNaGxzLnV3ZS5hYy51a4IJAIF9qCDnlp/PMAwGA1Ud
+						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJmty3rQooOzSXU6q/IsS6+/DIpo
+						2YUrHeuWtiS9yZKVFu+UkjXBs6pub/R7K70119ju/6XzkYYuF7uCjht6m3VaX5pK
+						0v5p1+TTSxad18iyWBdZCSEbhnyhw39hg1BBrzxPHjgGANTxiw3KY90+4kDvfQM+
+						B8jDb19FkDP2s385z0fqejBp+5LeEtY518lIdmQgT8cnqrW2z+2oLc0FdLL072Vo
+						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>
diff --git a/swamid-interfederations-2.0/hmauth.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/hmauth.balliol.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..e964a469
--- /dev/null
+++ b/swamid-interfederations-2.0/hmauth.balliol.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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://hmauth.balliol.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="2013-11-06T15:22: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://hmauth.balliol.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>
+						MIIDDDCCAfSgAwIBAgIJAMpMPemIjmgrMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF2htYXV0aC5iYWxsaW9sLm94LmFjLnVrMB4XDTEzMTAyMjEyNDgyNVoXDTIz
+						MTAyMDEyNDgyNVowIjEgMB4GA1UEAxMXaG1hdXRoLmJhbGxpb2wub3guYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBtZ/YetQGdunVnG/sWKrK
+						cJ6dRGvUBlZQhyVeMmgqceFbWUyCZd6pTgMoXO/rkxM6+NgD1jYZ4hZ8kMnqNAei
+						iko+UCEh2NK+js+mrVP6AEcYbg/gr2AlLhyKVXxNHNsGJHeVqpF0cNQY6T+pGHOI
+						TbVfRAFSTB5XavhDbvjcO7iMl0P3EDMXykXmn82Eaomo8FBvF0kziKn7isiWHacv
+						/VuTCIK9JhKc4p1kSGZtDf4FmwoItbXQYe2N2HnEdMqrudQuBqmY546RxFhM4eoq
+						AXp2PLnPiKveVKmdQNSdz+5v9eotACDQ9I5E/DQAy+EBvnZag8AHDK+sC+15CiK9
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2htYXV0aC5iYWxsaW9sLm94LmFjLnVrMB0G
+						A1UdDgQWBBQR0m+Jjz9sdV3MM2jrQtuqQxRERjANBgkqhkiG9w0BAQUFAAOCAQEA
+						Xf86t46FkrRK33WlZvzSASZuE9a5e/w5eVpMjhJjVirO6TA9WbjP3H16Ru4B0WiA
+						pXxEhKt8Essw0bddsuxXbBzImVkMZb6NjdEZmwtzlAM9iSTJj1S/nUDow9s3g/8M
+						XeUZjMow7WEwStRerRyyL75rjjRYWDgvxqR8GleNgJOmh3I5Bro3DqP5H6XurxS5
+						rkwtsUVWEIyXjrS9x1lqQW0Bbmu2yOh3pRVrmPB0Ap2VKjno4ywQSBDW+lZeCwQa
+						Vf5FPYgZfoknCmWSh1gmL0HXSCP5U0x1IKDAke487auoocgT5PGCOiYMAsNplYdR
+						b5EutOMJW28GnGrGr4vYhw==
+					</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://hmauth.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hmauth.balliol.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://hmauth.balliol.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://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hmauth.balliol.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 Balliol Holywell &amp; Jowett Walk Network</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stewart</md:GivenName>
+    <md:SurName>Tolhurst</md:SurName>
+    <md:EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stewart</md:GivenName>
+    <md:SurName>Tolhurst</md:SurName>
+    <md:EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</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
new file mode 100644
index 00000000..1df61652
--- /dev/null
+++ b/swamid-interfederations-2.0/hornet.stars.manchester.ac.uk-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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>
+      <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>
+						MIIC3zCCAcegAwIBAgIJAJuqRlY/1A1jMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+						BAMTCHZpbGxhbnVzMB4XDTA5MDUyMjA5MjYyN1oXDTE5MDUyMDA5MjYyN1owEzER
+						MA8GA1UEAxMIdmlsbGFudXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDMytraxBwzCmyK3cnajuHo5sb2Hhs0aTIAEaUTpcP2qo/yQlT/S5Wjsm5tPtue
+						pA8z0h56Y4on/k9gGGXnjej+23pfX/dPFCLEyE3MODunTkml1ObptRdMJT6CWRwg
+						m9tdWr8r355vAbS/nEn0s0z3dwHBSuf7/q4GZoBkdbUG5TkOJidlWwe5y2OXSspU
+						lehsON69DPXTxujsn9QNYzmdGxui+nrhHsj8hjPEQc9QcFDq7kXuDkM3Lry84h2p
+						kWGXRebVqEGvs6b7CUxvS5xiOChpx6fTi0/LZQQRCzrtVOuYeb9o6wVejmzW6qun
+						KH7dJCc14fgN2Icd7XYqIXYNAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHZpbGxhbnVz
+						MB0GA1UdDgQWBBTwGMy2sDPsfBZdE/1WuaxJDqVNuzANBgkqhkiG9w0BAQUFAAOC
+						AQEAlvJzqsg5+ZiZ0XChtGL3j1n8PbGeah5AfEfXRvS6RrHu7/3w4WOy+XBpGteu
+						8rqE/HkgqcpnXGS61TEU2HmdnNxqMTpGZoI7zbOkkcsNpvvG+dU5OdlEoTgJHuRI
+						12EgBWjTXMweohxDkLANWaqfB9yVDT1MspMkxKmYalZK95N9M/d6gJfXWwU4GSd0
+						4jfwMr9FzpOLAbxAHIohMA2djNfA2gNuve8PqIfBz6iaUAN0SGhGWMWWEL2B+uYZ
+						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>
+						MIIC3zCCAcegAwIBAgIJAJuqRlY/1A1jMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+						BAMTCHZpbGxhbnVzMB4XDTA5MDUyMjA5MjYyN1oXDTE5MDUyMDA5MjYyN1owEzER
+						MA8GA1UEAxMIdmlsbGFudXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDMytraxBwzCmyK3cnajuHo5sb2Hhs0aTIAEaUTpcP2qo/yQlT/S5Wjsm5tPtue
+						pA8z0h56Y4on/k9gGGXnjej+23pfX/dPFCLEyE3MODunTkml1ObptRdMJT6CWRwg
+						m9tdWr8r355vAbS/nEn0s0z3dwHBSuf7/q4GZoBkdbUG5TkOJidlWwe5y2OXSspU
+						lehsON69DPXTxujsn9QNYzmdGxui+nrhHsj8hjPEQc9QcFDq7kXuDkM3Lry84h2p
+						kWGXRebVqEGvs6b7CUxvS5xiOChpx6fTi0/LZQQRCzrtVOuYeb9o6wVejmzW6qun
+						KH7dJCc14fgN2Icd7XYqIXYNAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHZpbGxhbnVz
+						MB0GA1UdDgQWBBTwGMy2sDPsfBZdE/1WuaxJDqVNuzANBgkqhkiG9w0BAQUFAAOC
+						AQEAlvJzqsg5+ZiZ0XChtGL3j1n8PbGeah5AfEfXRvS6RrHu7/3w4WOy+XBpGteu
+						8rqE/HkgqcpnXGS61TEU2HmdnNxqMTpGZoI7zbOkkcsNpvvG+dU5OdlEoTgJHuRI
+						12EgBWjTXMweohxDkLANWaqfB9yVDT1MspMkxKmYalZK95N9M/d6gJfXWwU4GSd0
+						4jfwMr9FzpOLAbxAHIohMA2djNfA2gNuve8PqIfBz6iaUAN0SGhGWMWWEL2B+uYZ
+						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>
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
new file mode 100644
index 00000000..23ecf215
--- /dev/null
+++ b/swamid-interfederations-2.0/hscshib1.qub.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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>
+						MIIDQzCCAiugAwIBAgIUUCR0nbDS1EjDLxTwsqHxFHPSU70wDQYJKoZIhvcNAQEF
+						BQAwITEfMB0GA1UEAxMWaHNjLXNoaWIuYWRzLnF1Yi5hYy51azAeFw0xMjExMTUx
+						MTQwNTlaFw0zMjExMTUxMTQwNTlaMCExHzAdBgNVBAMTFmhzYy1zaGliLmFkcy5x
+						dWIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/jdWz2mJl
+						mIh7ojDKV20RYhhnhhHiyICzKaNBnJk0kh6C6Cgb6OsWGLffzFQ/N/pdaN+zvgrV
+						MCHXkerqcKM3symZjsGiIWNTZxOK3ZqzbjxUhi1+NCXRHdDo/pn5GkMMSwpUJVzF
+						3u0g8UE8WzDQDP4mwoUEmH28mho14dGUMKg82ODy2jlMI03G3LzlAYObiTb04qXv
+						1EIeAk+1SLwe+rrYNwHIcwO7qUM79B3xG6uUk858fhfodDx4mtffLHn0xGUv/+Lz
+						LzazvXwlQ9GPzzxsrbCIh+9FKG1d6GGJCUQipe9phPYRCwceLjnaLxg8InnPWhIc
+						D34tvrRMY00RAgMBAAGjczBxMFAGA1UdEQRJMEeCFmhzYy1zaGliLmFkcy5xdWIu
+						YWMudWuGLWh0dHBzOi8vaHNjLXNoaWIuYWRzLnF1Yi5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQUaH8xASkLOLt7Ro7bwsrM881RkXUwDQYJKoZIhvcNAQEF
+						BQADggEBABCQFkzyCIUfIJdAEskROk7tj1QjByMskkONo7NEdNGyJBygmw6mJ9a6
+						/khyl66FnUdsVOYoklo5Sa/FpGvY3rgH8lnW0kdC4akcTLa/PJjuz0Ng8cKkZYjk
+						dzIWjZ9UfU8kRrlh1EUWmjPndSVP2Ambfn8ZD0lhiQm3hP784AH0Skot74hEEatl
+						tSA5IRwWXolSHLF0tFF/gkcKGo3rCR21BKI9l4EERzKq3jhbsPj0ebP2SaU/p+aF
+						PRRi7jeZXQ9BdCz8GNbhop9K1SLoh/RGorAghyk3UomeFLLFfnkR4LOxKrlWOVuR
+						o6PZAqmRF/YOpMqnhCly7UOxEA4HmIE=
+					</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.ads.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.ads.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.ads.qub.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsc-shib.ads.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.ads.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.ads.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>
+						MIIDQzCCAiugAwIBAgIUUCR0nbDS1EjDLxTwsqHxFHPSU70wDQYJKoZIhvcNAQEF
+						BQAwITEfMB0GA1UEAxMWaHNjLXNoaWIuYWRzLnF1Yi5hYy51azAeFw0xMjExMTUx
+						MTQwNTlaFw0zMjExMTUxMTQwNTlaMCExHzAdBgNVBAMTFmhzYy1zaGliLmFkcy5x
+						dWIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/jdWz2mJl
+						mIh7ojDKV20RYhhnhhHiyICzKaNBnJk0kh6C6Cgb6OsWGLffzFQ/N/pdaN+zvgrV
+						MCHXkerqcKM3symZjsGiIWNTZxOK3ZqzbjxUhi1+NCXRHdDo/pn5GkMMSwpUJVzF
+						3u0g8UE8WzDQDP4mwoUEmH28mho14dGUMKg82ODy2jlMI03G3LzlAYObiTb04qXv
+						1EIeAk+1SLwe+rrYNwHIcwO7qUM79B3xG6uUk858fhfodDx4mtffLHn0xGUv/+Lz
+						LzazvXwlQ9GPzzxsrbCIh+9FKG1d6GGJCUQipe9phPYRCwceLjnaLxg8InnPWhIc
+						D34tvrRMY00RAgMBAAGjczBxMFAGA1UdEQRJMEeCFmhzYy1zaGliLmFkcy5xdWIu
+						YWMudWuGLWh0dHBzOi8vaHNjLXNoaWIuYWRzLnF1Yi5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQUaH8xASkLOLt7Ro7bwsrM881RkXUwDQYJKoZIhvcNAQEF
+						BQADggEBABCQFkzyCIUfIJdAEskROk7tj1QjByMskkONo7NEdNGyJBygmw6mJ9a6
+						/khyl66FnUdsVOYoklo5Sa/FpGvY3rgH8lnW0kdC4akcTLa/PJjuz0Ng8cKkZYjk
+						dzIWjZ9UfU8kRrlh1EUWmjPndSVP2Ambfn8ZD0lhiQm3hP784AH0Skot74hEEatl
+						tSA5IRwWXolSHLF0tFF/gkcKGo3rCR21BKI9l4EERzKq3jhbsPj0ebP2SaU/p+aF
+						PRRi7jeZXQ9BdCz8GNbhop9K1SLoh/RGorAghyk3UomeFLLFfnkR4LOxKrlWOVuR
+						o6PZAqmRF/YOpMqnhCly7UOxEA4HmIE=
+					</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.ads.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.ads.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>Karen</md:GivenName>
+    <md:SurName>Murphy</md:SurName>
+    <md:EmailAddress>mailto:eresources@qub.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Karen</md:GivenName>
+    <md:SurName>Murphy</md:SurName>
+    <md:EmailAddress>mailto:k.l.murphy@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
new file mode 100644
index 00000000..71ff994c
--- /dev/null
+++ b/swamid-interfederations-2.0/hstalks.com-shibboleth.xml
@@ -0,0 +1,84 @@
+<?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>
+      <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>
+						MIIDDDCCAfSgAwIBAgIJAPOoQOYTDcolMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTFzIxMTA0Ni13d3cxLmhzdGFsa3MuY29tMB4XDTEzMDgxOTA4NDIzNVoXDTIz
+						MDgxNzA4NDIzNVowIjEgMB4GA1UEAxMXMjExMDQ2LXd3dzEuaHN0YWxrcy5jb20w
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDwUS4Z4M6ixecb4Vbc0df
+						SM0rK7UoFyUZL/uSvhDcDQ1mVIaZW2/JVrNwvyoypQfezCAYrHhynA/JajADjftM
+						rh/TEUSh/BcL/xyohZ6WsyWn22vvQRRSWTNOvY0P+c2VnW59o6yS3Xlw7HVIBS3E
+						jUBu2NDbU/UmxAAAgtv2ItIq3vY0zAj11ZsXypvGY9UiB2sWVdaz/DhffJlMUfKw
+						6seKYXY24FoRLO1NsxPl5K3sA6h9kpvh/ptuoaqUiWurVW5b09Cag/C3qTWGZ3f4
+						bSTAlNfBzESKAKQ6p7i7ykSGBxFOzyuSgOrdzBmiHHTSADN2s8kOqmMq8SdFRJ09
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCFzIxMTA0Ni13d3cxLmhzdGFsa3MuY29tMB0G
+						A1UdDgQWBBRcbPDBD7FUM6VckPyUUf1FJaoOljANBgkqhkiG9w0BAQUFAAOCAQEA
+						Qf4hezdmCmhSfbg3ocxbWrROdwYUAW8JaBxerYTKdVOVIVgsNHZh8e1joDYBcmjK
+						TYGmC4C0mXhzdIwqnPdBpY7S8RXcl71FRbn4CdqOzIgn4O8Y4bgwMwSNs7JH+qFy
+						OpekXMCX0409+PmdbNvQBFk3uznEiCdkW+P2RnlNF3HaAfd8U9YBVGZvlHE/i1Qt
+						evKdTg8DniD9m/fmUJySob5xsbCyNb0DW+52VzVBlOWDteMdD5snEKi49Lod1RIN
+						/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>
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
new file mode 100644
index 00000000..d0ca1f58
--- /dev/null
+++ b/swamid-interfederations-2.0/iam.cf.ac.uk-sp-shibboleth.xml
@@ -0,0 +1,84 @@
+<?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>
+      <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>
+						MIIDDzCCAfegAwIBAgIJAMuQ3vgWPWjiMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+						BAMTDGlhbS5jZi5hYy51azAeFw0xMzAyMTUxMDM1MjBaFw0zMzAyMTAxMDM1MjBa
+						MBcxFTATBgNVBAMTDGlhbS5jZi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAL6J4304XtLySk3GhICIZf9SWzmwHwtlUDhA+pH+03WiCv6ZWOJl
+						piGglBiTyYB6aOPRSsz89pzGBUoUgApTH4zGvD6tkFrzQsX7QCWmi48UnkrsgSw7
+						bTvwMP6EQOgR/cJH3lftaQGlspt2+CxGj8+inSKdzA5/v24GLWUKrLSI7+vk9z3P
+						HIEVY0mxRWZIomtb9Z3vCaSdESR0fR6egsT6pbRl9X7EdQJVwQmKC0PzL260cBmk
+						JmckbSpY1POebUgOXF2CzJup6tTSiIJrN9ppKY4aLKSNIoQPxEF2Zzl7Lsx5HffV
+						De6GIYKjgp9y0CTsIn4xYdHhlAmUUbV4y/ECAwEAAaNeMFwwOwYDVR0RBDQwMoIM
+						aWFtLmNmLmFjLnVrhiJodHRwczovL2lhbS5jZi5hYy51ay9zcC9zaGliYm9sZXRo
+						MB0GA1UdDgQWBBRpauq5kzBefcX+Qm3CixEbP3/3RDANBgkqhkiG9w0BAQUFAAOC
+						AQEAkrz51AVE6XZK3fq+CX/g+xC58we4jFRkGVA9dmcIpKJsSJMsEaeo78GPFKLq
+						gYiy7pHHqSGFXc+8ySrN5kex7bGqERg1qldhQ2CkVEEV6sVd5X1LOnc9D9uJrl9n
+						jDOiI//2rGM+hR5xCFQ04hVlpgxN+yHwvK/idqxiV2HpoynB2MadfarxAPGEOe+i
+						wmv/9U74Jjd93zhGfQNEfTOXTP/h/dt6v86cJ9Z4DkAtOUnVA6bLi08ANaJDBBgp
+						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">
+				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>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:smith@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
new file mode 100644
index 00000000..1e1c369b
--- /dev/null
+++ b/swamid-interfederations-2.0/iamlearning.co.uk-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIC2TCCAcGgAwIBAgIJAMokAyU3GHytMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
+						BAMTBmlkNjMxOTAeFw0xMDAxMTkwOTU0MDZaFw0yMDAxMTcwOTU0MDZaMBExDzAN
+						BgNVBAMTBmlkNjMxOTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMYE
+						oDy4UOTnFc4+FU/zVYM1/+TpqI2+7paafYg6wwacMkMbEGHqp4F/uvM8UnPZcPGO
+						4s4BJO30ltKsCqexIxnTvg66V6aw5Gq/PooUCxXGP6rnUyDyTrSm9WWF17WVuLpH
+						pzMo5Ki8zlBWPxD2gd1uJuy+Lf8BJJ9aa9cYzx+glEARMXepiDaKpJFfkeSKemh5
+						BGVfH38NvBfN+lzaqhkjfyc9IuDPbFoNS5FNCiEN4zgvKxzGXVCZ6kdOgIuJ5Y0G
+						xENR6oRTJuXQqSSXyaVg1Vk4Z4a5IRIZaM/bOEFwDQGMKFWFIALybFncKQu5/wW1
+						4x5aIyLLxHmCnbobTsUCAwEAAaM0MDIwEQYDVR0RBAowCIIGaWQ2MzE5MB0GA1Ud
+						DgQWBBSbQnqKj1RxIHMszD6H3Yutb3tlkzANBgkqhkiG9w0BAQUFAAOCAQEAeEED
+						N2aGD0CE1PGcyPhARqR6RiXouYrXPhLmHz17SRn0VWBIDMSdZz7OKV8aoq08/qcA
+						V9ZnxpUBa6fFOOdMhWcMpHT6Wuroiv2Ny5NQBXT7Xpuswqnv+MuNgOqpKBTQCmU5
+						ILxIOviUIcAGZgNej3nHfgsT4NzydsiHVgFALirWLXH1J/NmB34+phUtMtaBa9T9
+						GrFRWzfWm+K5BCsK7pee4B0GXvbvmDO2BQ7WfIhuZ++8b3uIR+0Z0Giri+waZNPp
+						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>
+						MIIC2TCCAcGgAwIBAgIJAMokAyU3GHytMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
+						BAMTBmlkNjMxOTAeFw0xMDAxMTkwOTU0MDZaFw0yMDAxMTcwOTU0MDZaMBExDzAN
+						BgNVBAMTBmlkNjMxOTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMYE
+						oDy4UOTnFc4+FU/zVYM1/+TpqI2+7paafYg6wwacMkMbEGHqp4F/uvM8UnPZcPGO
+						4s4BJO30ltKsCqexIxnTvg66V6aw5Gq/PooUCxXGP6rnUyDyTrSm9WWF17WVuLpH
+						pzMo5Ki8zlBWPxD2gd1uJuy+Lf8BJJ9aa9cYzx+glEARMXepiDaKpJFfkeSKemh5
+						BGVfH38NvBfN+lzaqhkjfyc9IuDPbFoNS5FNCiEN4zgvKxzGXVCZ6kdOgIuJ5Y0G
+						xENR6oRTJuXQqSSXyaVg1Vk4Z4a5IRIZaM/bOEFwDQGMKFWFIALybFncKQu5/wW1
+						4x5aIyLLxHmCnbobTsUCAwEAAaM0MDIwEQYDVR0RBAowCIIGaWQ2MzE5MB0GA1Ud
+						DgQWBBSbQnqKj1RxIHMszD6H3Yutb3tlkzANBgkqhkiG9w0BAQUFAAOCAQEAeEED
+						N2aGD0CE1PGcyPhARqR6RiXouYrXPhLmHz17SRn0VWBIDMSdZz7OKV8aoq08/qcA
+						V9ZnxpUBa6fFOOdMhWcMpHT6Wuroiv2Ny5NQBXT7Xpuswqnv+MuNgOqpKBTQCmU5
+						ILxIOviUIcAGZgNej3nHfgsT4NzydsiHVgFALirWLXH1J/NmB34+phUtMtaBa9T9
+						GrFRWzfWm+K5BCsK7pee4B0GXvbvmDO2BQ7WfIhuZ++8b3uIR+0Z0Giri+waZNPp
+						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>
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
new file mode 100644
index 00000000..42cf9e37
--- /dev/null
+++ b/swamid-interfederations-2.0/ibook.conel.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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
+						b25kb24xGjAYBgNVBAMTEWlib29rLmNvbmVsLmFjLnVrMB4XDTE0MDgxOTA5NTgw
+						NloXDTM0MDgxNDA5NTgwNlowgYwxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25k
+						b24xDzANBgNVBAcTBkxvbmRvbjE/MD0GA1UEChM2VGhlIENvbGxlZ2Ugb2YgSGFy
+						aW5nZXksIEVuZmllbGQgYW5kIE5vcnRoIEVhc3QgTG9uZG9uMRowGAYDVQQDExFp
+						Ym9vay5jb25lbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						ALI+EwkxJR4p9fFczE57JfAem52vTCttAPtmBYDi1yYWbLJoxU1cJ6rUg8XF55ko
+						XdntgC1lNhywPVI3wz391cTC1uEnI3aFzl2at2n52PZvxjXIdCjdKAbPJe8yDfAn
+						WlXwas6bmA5XB6gKiH8jlILbf8y9kKfS1mtIPZRcpLI4jJRmLwjH+XRB5u7OmyJP
+						umIc09m4n2F/lweM9iTCtpVX9386b53Y/vwC2hZvhyfkgdlzJJrsFboUSi/HHFQi
+						Q30yJ2mVYL5ouNibulPvKDML+z5eEsi2GmWmzN6LWaEsOo922G29hS4b3rTSXhs6
+						OQ9Nkzv8dTZyUyUT1t4sfD0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAmPG1EWh8
+						xeUk2+eIWxLUQIGfIvz+WQ1bMjsZ5gm5/OhcXDDXXs5cbDOXU80HLs+wrnBJYzTi
+						dgFduibuySRlLoJCx1bYuXtDF3YK1t0n53bHInvH/PXdmyY7JtKhq7Pz3QC50nBU
+						hvvt9vs0J534adQVSjdqRmWkztXfuavPpYRuBY2ShKWQ1NvQHOqQFnyhjoa102Cg
+						YR1ERoGgZVHUbUQ54/imCgKab0BIX3jQEqKrG+I9r0N9wuDN5ipzOJLhZ5P+7pcG
+						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>
+						MIIDljCCAn4CCQC2GrtEWJa7ZDANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
+						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMT8wPQYDVQQKEzZU
+						aGUgQ29sbGVnZSBvZiBIYXJpbmdleSwgRW5maWVsZCBhbmQgTm9ydGggRWFzdCBM
+						b25kb24xGjAYBgNVBAMTEWlib29rLmNvbmVsLmFjLnVrMB4XDTE0MDgxOTA5NTgw
+						NloXDTM0MDgxNDA5NTgwNlowgYwxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25k
+						b24xDzANBgNVBAcTBkxvbmRvbjE/MD0GA1UEChM2VGhlIENvbGxlZ2Ugb2YgSGFy
+						aW5nZXksIEVuZmllbGQgYW5kIE5vcnRoIEVhc3QgTG9uZG9uMRowGAYDVQQDExFp
+						Ym9vay5jb25lbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						ALI+EwkxJR4p9fFczE57JfAem52vTCttAPtmBYDi1yYWbLJoxU1cJ6rUg8XF55ko
+						XdntgC1lNhywPVI3wz391cTC1uEnI3aFzl2at2n52PZvxjXIdCjdKAbPJe8yDfAn
+						WlXwas6bmA5XB6gKiH8jlILbf8y9kKfS1mtIPZRcpLI4jJRmLwjH+XRB5u7OmyJP
+						umIc09m4n2F/lweM9iTCtpVX9386b53Y/vwC2hZvhyfkgdlzJJrsFboUSi/HHFQi
+						Q30yJ2mVYL5ouNibulPvKDML+z5eEsi2GmWmzN6LWaEsOo922G29hS4b3rTSXhs6
+						OQ9Nkzv8dTZyUyUT1t4sfD0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAmPG1EWh8
+						xeUk2+eIWxLUQIGfIvz+WQ1bMjsZ5gm5/OhcXDDXXs5cbDOXU80HLs+wrnBJYzTi
+						dgFduibuySRlLoJCx1bYuXtDF3YK1t0n53bHInvH/PXdmyY7JtKhq7Pz3QC50nBU
+						hvvt9vs0J534adQVSjdqRmWkztXfuavPpYRuBY2ShKWQ1NvQHOqQFnyhjoa102Cg
+						YR1ERoGgZVHUbUQ54/imCgKab0BIX3jQEqKrG+I9r0N9wuDN5ipzOJLhZ5P+7pcG
+						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>
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
new file mode 100644
index 00000000..b050951b
--- /dev/null
+++ b/swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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="fr">Agence universitaire de la Francophonie (AUF)</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDIzCCAgugAwIBAgIJAMD4vAdNkHSQMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+BAMTCmlkLmF1Zi5vcmcwHhcNMTIwNDE3MjEyNTE5WhcNMjIwNDE1MjEyNTE5WjAV
+MRMwEQYDVQQDEwppZC5hdWYub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA9ODvRDmfe5haOQ25r5lUfCb2Cmike2HOZtHGX+3o7hTDcsAnRl+f5Iha
+BO7uNkO/clZlHbwhkg5anAgWJkpySYJ1eo/srDet6kjvR/VhH4HhRYk314UykR/X
+dYXMokox39z/AZGib4+jE1o8Awe8Cgo8Vl1Hq9WBFzrSfqJtv7XzXsMg7/wH7yBX
+pW5JlFiSaEtTjbDdqxUQTwSpJ1StlE34DfHhK6UUf3ZDp6gMRBWBlN/QAR7PJC1R
+RerAPYeL+tD1tOrupvhGSYXOsaYxPE3sPIuLM9pAFG9zr+vh6GgFpKmCL34lI9hl
+65Uxm7h0bLHaGOXcaM5H31mtkpXtmwIDAQABo3YwdDAdBgNVHQ4EFgQUO7LPmMhP
+4Mi7VXHTyPXck0S9NpMwRQYDVR0jBD4wPIAUO7LPmMhP4Mi7VXHTyPXck0S9NpOh
+GaQXMBUxEzARBgNVBAMTCmlkLmF1Zi5vcmeCCQDA+LwHTZB0kDAMBgNVHRMEBTAD
+AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDNXpdywIIY/5sBr4TwuE+FhlZXM2PSbghs
+PKtp8s+XXzHQ2QwmKU954vLthhaf3Y9Fpy/CAnZ5LtwrqFK/a8OEKjkzipsLCWBG
+cZGPsNoKPnCr+R4Gp0hRFybB4uFgxlxhR4ZAjBoOWiIxOVRdV4+gpqWIy+mzFrwD
+D9kMcuFHcLbJOXb8PgVDZv6v2zSHVd16RJKlzmZYaS5/7Aiv8jUZ7EM6dpcXScfF
+q1HyzPKSsmoqmMtetxB2F6w+m9mTyhqeNue//NZuqHXlv/J3F4qkPUHc0Zlydb5j
+flcTH2tpneZeVm9kXovpBSKYeQ7AUu8asTwVXKY2JopEvxOOo76T
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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/sso"/>
+  </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://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean Christophe André</md:SurName>
+    <md:EmailAddress>jean-christophe.andre@auf.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Moussa Nombré</md:SurName>
+    <md:EmailAddress>moussa.nombre@auf.org</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
new file mode 100644
index 00000000..d3d3d5ca
--- /dev/null
+++ b/swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml
@@ -0,0 +1,54 @@
+<?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>
+      <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="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>
+					      MIIDFDCCAfygAwIBAgIVALIQSKLiYZiTtbhSIn/FqoqHWb/ZMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkLnVjbHkuZnIwHhcNMTIwNTA5MTQ0MzU3WhcNMzIw
+NTA5MTQ0MzU3WjAVMRMwEQYDVQQDEwppZC51Y2x5LmZyMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEApA+WTKh4qbC76TAzEqDdG6i/6gxQLbPiLXGU/mJV
+w46XAgXuxZm3Edm0DEq5pdOwOIN/NDsqTk+aDHsYFxI957r9LLnJ0n1pWsZNluga
+PqwY2MOwyxfquiTkTQmOhK9M1xF+LYLectQ749SXejWTb5B96ys0ttzV4fSPChxL
+/L6puCfpVPGR58A9S15/MuAsMYM9UCLi2FoAF+lHlT99Ahx7VEgicMx1JELeDsYf
+yO0niRcKXEYC4j3KgOP3ADPImYdb2nhx8WHCYgphpMHY151KZv5XdaT2GLOOnJPa
+sDgDd+RcY/M7kKqGEnRUAMUCJnqML/CtYNwqidftlrso0wIDAQABo1swWTA4BgNV
+HREEMTAvggppZC51Y2x5LmZyhiFodHRwczovL2lkLnVjbHkuZnIvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFGuAsMRpkg/OYgexd/zImIz8WPTSMA0GCSqGSIb3DQEB
+BQUAA4IBAQAp96dB5+rGpdlCSVU6XZB6hygG5wNWTVm+alAjFtKQW2iqz1RgoVm4
+D2T+28kF/xlbFBUrDha5CNuZ1Dfq8Whfad4SZs9pzm/3I/2DBH/KO6guHXUe5rjT
+icWlXaDm7uvJrZSAQbZky/A9Bgyv0oJK+UHfvtIa2tNo5gjEcc92rRPwoWPDW6Yy
+0+reX1eRTjDbz+ZAkIqg6P/9UQsMzyjKIqfGCJ/YJDRvbJEGiZ2fkrhnIyziYq9a
+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://unknown.site.com</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.vse.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/id.vse.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..25aa4b40
--- /dev/null
+++ b/swamid-interfederations-2.0/id.vse.cz-idp-shibboleth.xml
@@ -0,0 +1,129 @@
+<?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>
+      <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>
+MIIEpDCCAowCCQCHTyuMkLIypDANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDEwlp
+ZC52c2UuY3owHhcNMTQwNzAzMTIxMjQ3WhcNMjQwNjMwMTIxMjQ3WjAUMRIwEAYD
+VQQDEwlpZC52c2UuY3owggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDA
+KcUzwd4FJSmiZKSwuDNtK6LXqRsqxID8o+BDYZ2xJEnLHLU0IXV+eUGCdX28aGqC
+uZ0RzwhZVAJHCjJ8kM5c7KxpKRXHXM6KennjFCYJEkwyX0al29wSlpBh9Vce3rST
+OXdU7m3zZ7G6rc276Fg21fNaYFfi5NYqzsR/BXJfsrUzTFztQwbBlSRg+fjRyL5k
+ZxRRNTzVaIoVNmRB9vsB7rRvCAENxckJdndTJ76iBiAviOhFGXvjFfAZRsNmNva5
+xO3MLLx1MLUwwBXJe144ucXg/v1OTDPllgD7Wyc/4rc/XoFB6KrsBfoPNVwg/A0b
+42Im+ArAWZCnXmh/d4Pip+aBaKC5tBeRYtzFSjkMQQlgOtDWbIW91MmHbBBNpdbi
+44nCj1kD2aJxLuXXlsnYQCTnImaC1YeLzXqn+zBVvY2RApD5VPyNGp87bTz0bdKG
+NUzZOylSa4zbDK8tgztconVSXTN288dp+gZ9vtwIuG/sOqYTlMc0tcnJe8DcqL35
+8QVSEqEx+YxEwBxQ3iBD6LcyBFY2lINoqe/kzO/pF8fRQ62cpGjOg0duYDvd+hco
+EA/GbkJYvM04Q9j59d3Zqh1SQ2Sp/Cj6U1fh9DA98alpXss1WZcV7MQVXFwoFhPi
+sSfTCL/tTFbOMM015TowWA6YIw7Bn/Hld5KSAKqFqwIDAQABMA0GCSqGSIb3DQEB
+BQUAA4ICAQC4Rv4jmbW3BA7oLMZjuUF58iSGwMd8YiEqs9YYBO/2ZCDMPfMAyEhl
+iuep69Fy//3RY5/ERyJ4f27dE4eFpVteV38ldDPhEda1XtZH60e4DuqiLmbpP0p/
+PMoNONBSARX/+SfPWrBayggrLekar4+N2Ghb9A22cBmcGh3KZ9c5VI+WKCryUoxV
+V1FLZDUAeRzKITdSvUXLdjG9fobl8/cjicBf5OPcmDRmlF7l1XIRDAj3XdL40OOr
+ZclXpiBDcV4mrtfrIOoKM51TqLVv85uAGwsLIqelivJ5dU7PcZ9zarAyd6JK5jhC
+LBwXc8cFRPFNAS7T+Nj3FvU4ket0wahnvZYsMPXfYjihhIPu3Y1W2eYP6tOld7Dl
+cDGsv4OjlepMz/Xrap7qCwcoSa++HIg2iM/5tgypk/lRGuRzwoHv9jwfHpYndUnc
+ONYmPl02Fc1jPaQwANyGkrLrHWMneYoF5AnplmIDH3WbwOPpv0Wik8MXqBHPL361
+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>
+MIIEpDCCAowCCQCHTyuMkLIypDANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDEwlp
+ZC52c2UuY3owHhcNMTQwNzAzMTIxMjQ3WhcNMjQwNjMwMTIxMjQ3WjAUMRIwEAYD
+VQQDEwlpZC52c2UuY3owggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDA
+KcUzwd4FJSmiZKSwuDNtK6LXqRsqxID8o+BDYZ2xJEnLHLU0IXV+eUGCdX28aGqC
+uZ0RzwhZVAJHCjJ8kM5c7KxpKRXHXM6KennjFCYJEkwyX0al29wSlpBh9Vce3rST
+OXdU7m3zZ7G6rc276Fg21fNaYFfi5NYqzsR/BXJfsrUzTFztQwbBlSRg+fjRyL5k
+ZxRRNTzVaIoVNmRB9vsB7rRvCAENxckJdndTJ76iBiAviOhFGXvjFfAZRsNmNva5
+xO3MLLx1MLUwwBXJe144ucXg/v1OTDPllgD7Wyc/4rc/XoFB6KrsBfoPNVwg/A0b
+42Im+ArAWZCnXmh/d4Pip+aBaKC5tBeRYtzFSjkMQQlgOtDWbIW91MmHbBBNpdbi
+44nCj1kD2aJxLuXXlsnYQCTnImaC1YeLzXqn+zBVvY2RApD5VPyNGp87bTz0bdKG
+NUzZOylSa4zbDK8tgztconVSXTN288dp+gZ9vtwIuG/sOqYTlMc0tcnJe8DcqL35
+8QVSEqEx+YxEwBxQ3iBD6LcyBFY2lINoqe/kzO/pF8fRQ62cpGjOg0duYDvd+hco
+EA/GbkJYvM04Q9j59d3Zqh1SQ2Sp/Cj6U1fh9DA98alpXss1WZcV7MQVXFwoFhPi
+sSfTCL/tTFbOMM015TowWA6YIw7Bn/Hld5KSAKqFqwIDAQABMA0GCSqGSIb3DQEB
+BQUAA4ICAQC4Rv4jmbW3BA7oLMZjuUF58iSGwMd8YiEqs9YYBO/2ZCDMPfMAyEhl
+iuep69Fy//3RY5/ERyJ4f27dE4eFpVteV38ldDPhEda1XtZH60e4DuqiLmbpP0p/
+PMoNONBSARX/+SfPWrBayggrLekar4+N2Ghb9A22cBmcGh3KZ9c5VI+WKCryUoxV
+V1FLZDUAeRzKITdSvUXLdjG9fobl8/cjicBf5OPcmDRmlF7l1XIRDAj3XdL40OOr
+ZclXpiBDcV4mrtfrIOoKM51TqLVv85uAGwsLIqelivJ5dU7PcZ9zarAyd6JK5jhC
+LBwXc8cFRPFNAS7T+Nj3FvU4ket0wahnvZYsMPXfYjihhIPu3Y1W2eYP6tOld7Dl
+cDGsv4OjlepMz/Xrap7qCwcoSa++HIg2iM/5tgypk/lRGuRzwoHv9jwfHpYndUnc
+ONYmPl02Fc1jPaQwANyGkrLrHWMneYoF5AnplmIDH3WbwOPpv0Wik8MXqBHPL361
+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>
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
new file mode 100644
index 00000000..8a8e1915
--- /dev/null
+++ b/swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDKDCCAhCgAwIBAgIVAPXQh7YfSjXSWrkZLXYT1bUm2Vj+MA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkZWEuaWZjLmNuci5pdDAeFw0wODExMjYxNjA0MTBa
+Fw0yODExMjYxNjA0MTBaMBoxGDAWBgNVBAMTD2lkZWEuaWZjLmNuci5pdDCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI6NBU4faqRoOEnab3DbjGPsno9a
+1j712yFWDpdxErwUmAAHUh83NmtwVKRSrVvZmymnGGEjBk7/2jTGfmpC/YdGm67j
+n/dbU3WCTnl+RhJh4/LrSJCsUmgw9r0JNo5BfHA781xvBIGprsHD8GOnmNIdK4nV
+dGSrslc3VpSP8Zhlaov5F5bGZuHa/dFM/GVI4YLZR0O2QNm6U3gIWM9TeaLofmA3
+p1fFP/3CZlPPyNAHWUkylA4XebuLFwrA4bzpgJgkTdmc1NclfF/qPmYLsE6dxag1
+7mQNp4RPdvgf43Ivmp6Cx4UMYc1+Wu0DolG1c/vesbMnK3QdIYy3xFDjAnsCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRlYS5pZmMuY25yLml0hiZodHRwczovL2lkZWEu
+aWZjLmNuci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUAMIFF2Om2oTqwjUJ
+WyZb5He25R8wDQYJKoZIhvcNAQEFBQADggEBAG2loG5n8grIuX6Vr1H77E3N94O4
+QtNspFXjFOEtsFvgb+glgIRFd/4L3HCW2oWAebZ/s9JRXn+6YcrOA22SP+xg1OcQ
+JWlqTvr3XiSYQ9FjudBSt39cnOxlmwp/7SptWqLeMiZYs/muHaxcLeQMJ7W6z3wc
+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>
+MIIDKDCCAhCgAwIBAgIVAPXQh7YfSjXSWrkZLXYT1bUm2Vj+MA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkZWEuaWZjLmNuci5pdDAeFw0wODExMjYxNjA0MTBa
+Fw0yODExMjYxNjA0MTBaMBoxGDAWBgNVBAMTD2lkZWEuaWZjLmNuci5pdDCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI6NBU4faqRoOEnab3DbjGPsno9a
+1j712yFWDpdxErwUmAAHUh83NmtwVKRSrVvZmymnGGEjBk7/2jTGfmpC/YdGm67j
+n/dbU3WCTnl+RhJh4/LrSJCsUmgw9r0JNo5BfHA781xvBIGprsHD8GOnmNIdK4nV
+dGSrslc3VpSP8Zhlaov5F5bGZuHa/dFM/GVI4YLZR0O2QNm6U3gIWM9TeaLofmA3
+p1fFP/3CZlPPyNAHWUkylA4XebuLFwrA4bzpgJgkTdmc1NclfF/qPmYLsE6dxag1
+7mQNp4RPdvgf43Ivmp6Cx4UMYc1+Wu0DolG1c/vesbMnK3QdIYy3xFDjAnsCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRlYS5pZmMuY25yLml0hiZodHRwczovL2lkZWEu
+aWZjLmNuci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUAMIFF2Om2oTqwjUJ
+WyZb5He25R8wDQYJKoZIhvcNAQEFBQADggEBAG2loG5n8grIuX6Vr1H77E3N94O4
+QtNspFXjFOEtsFvgb+glgIRFd/4L3HCW2oWAebZ/s9JRXn+6YcrOA22SP+xg1OcQ
+JWlqTvr3XiSYQ9FjudBSt39cnOxlmwp/7SptWqLeMiZYs/muHaxcLeQMJ7W6z3wc
+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>
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
new file mode 100644
index 00000000..ebcb575c
--- /dev/null
+++ b/swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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-13T15: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>
+      <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 of 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 of 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.cnr.it/istituti/DatiGenerali_eng.html?cds=048</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDNzCCAh+gAwIBAgIUXkyFgauxs3Gvhmwuh/SlNXsNSc0wDQYJKoZIhvcNAQEF
+BQAwHjEcMBoGA1UEAxMTaWRlbS1pZHAuaWxjLmNuci5pdDAeFw0wOTA0MTcxNTM5
+MzlaFw0yOTA0MTcxNTM5MzlaMB4xHDAaBgNVBAMTE2lkZW0taWRwLmlsYy5jbnIu
+aXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCldH2pporkbRUOfzYX
+Wk0eARcI/cJeLA1IoAG/UY0fqsWvcNeL5XpJfd/0k6dUW6Rs/FxJ4TMqpwlo8wzX
+8FPHOX4LgZyMyhTL4iSt+aQGL/hkUPhljKblOTNHFZb/wd0K0wAU2qpTHhkMxQw2
+aQNf9jwWF3RJZjfKa3vyXzJJiwp/w2ZRGdX3DX3tLVDqMGZKjn9nSKJ/0RGq3moT
+3XmDi58xnro1YOo5XeTfwoXwNoj/OQEkC09xE7ziXWgSm6X9I2WQz3qeCeTkQz6X
+lrs8EcBXk13A+nRiCvh4EakvkkvR0MndmgjGU4SviQOBC3lW8bHrnZ2umeAydA/d
+KHIhAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkZW0taWRwLmlsYy5jbnIuaXSGKmh0
+dHBzOi8vaWRlbS1pZHAuaWxjLmNuci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
+FgQUolK5cLQOplyydlyGGibaknSuMpwwDQYJKoZIhvcNAQEFBQADggEBADf3UkpS
+n1jL36PgbCKtDRkzdsOZybkaDixZw1zZ/AFX7cfJ0E/9/jveXzbIxF1VxHbZvQtl
+woq3TK2t3R3sr9BN+uF0C/fMXYfwKxTUVwm9z/QxkXrzZWbfrMvLlZaaE4HyeLTk
+VP1W/JE/J2pT9ohGd0qYMoecrcQJRuiSSnb0wXEZqHFROcirBcvtoitOtESU1JQ6
+5eYHD7pnBG2EiQK5oPXh2U1qphgYCliTuWz4PNv5KtQuBJmH3TBeWj8Ku1V/FVdz
+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:1.1:protocol urn:oasis:names:tc:SAML:2.0: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
+aXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCldH2pporkbRUOfzYX
+Wk0eARcI/cJeLA1IoAG/UY0fqsWvcNeL5XpJfd/0k6dUW6Rs/FxJ4TMqpwlo8wzX
+8FPHOX4LgZyMyhTL4iSt+aQGL/hkUPhljKblOTNHFZb/wd0K0wAU2qpTHhkMxQw2
+aQNf9jwWF3RJZjfKa3vyXzJJiwp/w2ZRGdX3DX3tLVDqMGZKjn9nSKJ/0RGq3moT
+3XmDi58xnro1YOo5XeTfwoXwNoj/OQEkC09xE7ziXWgSm6X9I2WQz3qeCeTkQz6X
+lrs8EcBXk13A+nRiCvh4EakvkkvR0MndmgjGU4SviQOBC3lW8bHrnZ2umeAydA/d
+KHIhAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkZW0taWRwLmlsYy5jbnIuaXSGKmh0
+dHBzOi8vaWRlbS1pZHAuaWxjLmNuci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
+FgQUolK5cLQOplyydlyGGibaknSuMpwwDQYJKoZIhvcNAQEFBQADggEBADf3UkpS
+n1jL36PgbCKtDRkzdsOZybkaDixZw1zZ/AFX7cfJ0E/9/jveXzbIxF1VxHbZvQtl
+woq3TK2t3R3sr9BN+uF0C/fMXYfwKxTUVwm9z/QxkXrzZWbfrMvLlZaaE4HyeLTk
+VP1W/JE/J2pT9ohGd0qYMoecrcQJRuiSSnb0wXEZqHFROcirBcvtoitOtESU1JQ6
+5eYHD7pnBG2EiQK5oPXh2U1qphgYCliTuWz4PNv5KtQuBJmH3TBeWj8Ku1V/FVdz
+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</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CNR Institute of 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.cnr.it/istituti/DatiGenerali_eng.html?cds=048</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: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
new file mode 100644
index 00000000..00536823
--- /dev/null
+++ b/swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDPDCCAiSgAwIBAgIVAIF5g404xBT9pz/2nuMWOQA6KHj6MA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMTFGlkZW0taWRwLmltdGx1Y2NhLml0MB4XDTEzMDkxMDE2
+MTEyNVoXDTMzMDkxMDE2MTEyNVowHzEdMBsGA1UEAxMUaWRlbS1pZHAuaW10bHVj
+Y2EuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCecL5DE82gqAf8
+cuxD6rg+49Rt5l/hie4RKn2YpPYoxLxrr0TuE2PV2D/04dHJmT4g8HClV80HwHHx
+cT6hItjkLtBN2JeogwefBnk4tQdaEluvd/r3RNZF9Re5NKcrHNMPJGd8RqZPwL/Z
+MpPIHTJzO1WNpPO+H4w/tYVJdhlE1vn/0d3lCYBdX6FT4i10XxWx7er9sdEj9ndX
+8LhHuA2O2z197jHEEufG6XAThBV8XACOaqNkw+nVbk2GS4EltIOZRqdeC0qvATs8
+AiWGpK5K7bgdIfItscYTkDpbOeZwFUkdxpOJ7ujqMgjZCbJ0WfPXmWEFGuixYXki
+LXM7vQQLAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkZW0taWRwLmltdGx1Y2NhLml0
+hitodHRwczovL2lkZW0taWRwLmltdGx1Y2NhLml0L2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRw6DX3JFHnfUlXHQXxcYUaIkKDmTANBgkqhkiG9w0BAQUFAAOCAQEA
+EzNzUHWImZwxpf8bu1BudPjcmtyQqHyPThTrpAd6UWm+MiwCPRdEYEfgWSnvGh0B
+STzyTtF/0PTMXNt+ocPryWFlpigO6d4H/QBWNtlPqWmLfLFsrTm1Cvy6ihmSsqVk
+nFN3qHAfJd0Xl05zk0oxDg6u8CXWzlFJcKxm2P8ujJYkJVHkt3saNinZop7+oazU
+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>
+MIIDPDCCAiSgAwIBAgIVAIF5g404xBT9pz/2nuMWOQA6KHj6MA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMTFGlkZW0taWRwLmltdGx1Y2NhLml0MB4XDTEzMDkxMDE2
+MTEyNVoXDTMzMDkxMDE2MTEyNVowHzEdMBsGA1UEAxMUaWRlbS1pZHAuaW10bHVj
+Y2EuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCecL5DE82gqAf8
+cuxD6rg+49Rt5l/hie4RKn2YpPYoxLxrr0TuE2PV2D/04dHJmT4g8HClV80HwHHx
+cT6hItjkLtBN2JeogwefBnk4tQdaEluvd/r3RNZF9Re5NKcrHNMPJGd8RqZPwL/Z
+MpPIHTJzO1WNpPO+H4w/tYVJdhlE1vn/0d3lCYBdX6FT4i10XxWx7er9sdEj9ndX
+8LhHuA2O2z197jHEEufG6XAThBV8XACOaqNkw+nVbk2GS4EltIOZRqdeC0qvATs8
+AiWGpK5K7bgdIfItscYTkDpbOeZwFUkdxpOJ7ujqMgjZCbJ0WfPXmWEFGuixYXki
+LXM7vQQLAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkZW0taWRwLmltdGx1Y2NhLml0
+hitodHRwczovL2lkZW0taWRwLmltdGx1Y2NhLml0L2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRw6DX3JFHnfUlXHQXxcYUaIkKDmTANBgkqhkiG9w0BAQUFAAOCAQEA
+EzNzUHWImZwxpf8bu1BudPjcmtyQqHyPThTrpAd6UWm+MiwCPRdEYEfgWSnvGh0B
+STzyTtF/0PTMXNt+ocPryWFlpigO6d4H/QBWNtlPqWmLfLFsrTm1Cvy6ihmSsqVk
+nFN3qHAfJd0Xl05zk0oxDg6u8CXWzlFJcKxm2P8ujJYkJVHkt3saNinZop7+oazU
+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>
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
new file mode 100644
index 00000000..3b87e368
--- /dev/null
+++ b/swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDKzCCAhOgAwIBAgIUC8sYEfq/qhT3iv/2z9PwJsH/ZLgwDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQaWRlbS5jZWQuaW5hZi5pdDAeFw0xMDEwMDgxMzExNTFa
+Fw0zMDEwMDgxMzExNTFaMBsxGTAXBgNVBAMTEGlkZW0uY2VkLmluYWYuaXQwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEbHJhnfBE+5sri7Pw8QW6xscD
+2mDzd9WaDDzQMBVXljRzjxZ81/DeqFnwVdMFdZHM+ipUFGIUlmc21AtC+6rrSvDu
+LeYL/5F7JRu9LxAT7GRrQS3dkJkDC3QzGC3BW9SQO8hoXir2QqE5bwkTBy0F8V/F
+eDq8c9cPFd1HlnO7D2K7An3OMI/hkZWOx41e0Vdsr1nUTcnLnLeZ/JXRMfFO8mD6
+rTCLq0XWZA2oRUd1QKeINLk8ERZqfp9MYh0pjfFFlFyFuWKafQtPV1lb+BKua4kn
+cFCn6QS7BpyAb6UGy84ag2Qk/2JumjZqzxfJ+L7mbuogOO+gt+JNuiZbsA2DAgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGlkZW0uY2VkLmluYWYuaXSGJ2h0dHBzOi8vaWRl
+bS5jZWQuaW5hZi5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUypTVjZYa6twi
+vL+dwAqyQszxAZ4wDQYJKoZIhvcNAQEFBQADggEBAEiu9EK1DdBA6V8ZuszZnYLs
+3v983CaxOcMYv8rgAUavlI+hGa/1MPCDgmNsMHjfOvG3aBelwkCK302u+veFwQRa
+je20+UOa2xpYLGaZ8HTEU0qEEip4VHoWHBxLCdfIlBhf5sziVpWdZCwF968QHoFX
+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>
+MIIDKzCCAhOgAwIBAgIUC8sYEfq/qhT3iv/2z9PwJsH/ZLgwDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQaWRlbS5jZWQuaW5hZi5pdDAeFw0xMDEwMDgxMzExNTFa
+Fw0zMDEwMDgxMzExNTFaMBsxGTAXBgNVBAMTEGlkZW0uY2VkLmluYWYuaXQwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEbHJhnfBE+5sri7Pw8QW6xscD
+2mDzd9WaDDzQMBVXljRzjxZ81/DeqFnwVdMFdZHM+ipUFGIUlmc21AtC+6rrSvDu
+LeYL/5F7JRu9LxAT7GRrQS3dkJkDC3QzGC3BW9SQO8hoXir2QqE5bwkTBy0F8V/F
+eDq8c9cPFd1HlnO7D2K7An3OMI/hkZWOx41e0Vdsr1nUTcnLnLeZ/JXRMfFO8mD6
+rTCLq0XWZA2oRUd1QKeINLk8ERZqfp9MYh0pjfFFlFyFuWKafQtPV1lb+BKua4kn
+cFCn6QS7BpyAb6UGy84ag2Qk/2JumjZqzxfJ+L7mbuogOO+gt+JNuiZbsA2DAgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGlkZW0uY2VkLmluYWYuaXSGJ2h0dHBzOi8vaWRl
+bS5jZWQuaW5hZi5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUypTVjZYa6twi
+vL+dwAqyQszxAZ4wDQYJKoZIhvcNAQEFBQADggEBAEiu9EK1DdBA6V8ZuszZnYLs
+3v983CaxOcMYv8rgAUavlI+hGa/1MPCDgmNsMHjfOvG3aBelwkCK302u+veFwQRa
+je20+UOa2xpYLGaZ8HTEU0qEEip4VHoWHBxLCdfIlBhf5sziVpWdZCwF968QHoFX
+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>
diff --git a/swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml
new file mode 100644
index 00000000..7e9770f3
--- /dev/null
+++ b/swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDJDCCAgygAwIBAgIVAMeHVbcMgkiyi7G8YIyVSk6/OsAEMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pbmEyLml0MB4XDTEwMDkyNDEyNTcxNFoX
+DTMwMDkyNDEyNTcxNFowGTEXMBUGA1UEAxMOaWRlbS51bmluYTIuaXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEJP3ZKXEqVvt+BU4r7yPQG3RNUCTx
+WQ+4k+nPi/UFRpRk5IHLpbO+/mqbkEJ8Z45eF+uSIsU37DGBmEkWB1ig6OrLqKdZ
+Y7/9XAxM2bACl8uCQqDZSod8etUQU60bxlxvAhYips6zKV3d7GKcvLbg6DwYCjL9
+rEdiXlbf/XMkx8H0s5JT/WeJN1UZmlfBbwAMj3kXPrxzexGFMj+xg87C/WWA4wPL
+EjIRMRu4URhwqowcaYBXDN6/d7zXoLCC7VzJjV2mPNqJXJD6Cius5aqLcGImmJPF
+OwufXmPu+cpYc7h5NWd6KMjvUEQ3ucniAEucn8S78Iakd3Kcm3VLZX9/AgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkZW0udW5pbmEyLml0hiVodHRwczovL2lkZW0udW5p
+bmEyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRh0OcndkGzMmnRUBpvGQ4s
+F9pzKzANBgkqhkiG9w0BAQUFAAOCAQEAJ7aS6KvM/hgIoSgK0iGogbCpxrLTVz/3
+MzsgbGBceGiv+zLe0kV8Qz4SIQYPg8Yi71vCel/Fn8UPCC9O9PzD/wwqmFxFnCtB
+kO/ERSlXHZ1X2JM/1mEfBQvyYONbf/8EaYQkuhu/niLB3arnftrOoWNFpGfVttgw
+9OCxJa+998vCAZF9Bj++lZ5LxBDMVbKhxj0XSZw+r8KTon6/X/xRmYpOLjqDiYUd
+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>
+MIIDJDCCAgygAwIBAgIVAMeHVbcMgkiyi7G8YIyVSk6/OsAEMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pbmEyLml0MB4XDTEwMDkyNDEyNTcxNFoX
+DTMwMDkyNDEyNTcxNFowGTEXMBUGA1UEAxMOaWRlbS51bmluYTIuaXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEJP3ZKXEqVvt+BU4r7yPQG3RNUCTx
+WQ+4k+nPi/UFRpRk5IHLpbO+/mqbkEJ8Z45eF+uSIsU37DGBmEkWB1ig6OrLqKdZ
+Y7/9XAxM2bACl8uCQqDZSod8etUQU60bxlxvAhYips6zKV3d7GKcvLbg6DwYCjL9
+rEdiXlbf/XMkx8H0s5JT/WeJN1UZmlfBbwAMj3kXPrxzexGFMj+xg87C/WWA4wPL
+EjIRMRu4URhwqowcaYBXDN6/d7zXoLCC7VzJjV2mPNqJXJD6Cius5aqLcGImmJPF
+OwufXmPu+cpYc7h5NWd6KMjvUEQ3ucniAEucn8S78Iakd3Kcm3VLZX9/AgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkZW0udW5pbmEyLml0hiVodHRwczovL2lkZW0udW5p
+bmEyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRh0OcndkGzMmnRUBpvGQ4s
+F9pzKzANBgkqhkiG9w0BAQUFAAOCAQEAJ7aS6KvM/hgIoSgK0iGogbCpxrLTVz/3
+MzsgbGBceGiv+zLe0kV8Qz4SIQYPg8Yi71vCel/Fn8UPCC9O9PzD/wwqmFxFnCtB
+kO/ERSlXHZ1X2JM/1mEfBQvyYONbf/8EaYQkuhu/niLB3arnftrOoWNFpGfVttgw
+9OCxJa+998vCAZF9Bj++lZ5LxBDMVbKhxj0XSZw+r8KTon6/X/xRmYpOLjqDiYUd
+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>
diff --git a/swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml
new file mode 100644
index 00000000..2cc5b25d
--- /dev/null
+++ b/swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDHzCCAgegAwIBAgIUF0Qp2OA2O0eaUmNRzOKIr5PdtskwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRlbS51bmlzYS5pdDAeFw0xMTExMTQxNTI4NDdaFw0z
+MTExMTQxNTI4NDdaMBgxFjAUBgNVBAMTDWlkZW0udW5pc2EuaXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEQl3iUVQXoyUdnsJj2LhJBTXdTXNPxilI
+RnA0/U4qRE6JgMd9o2A711AFBwhh+Ytd7iEwdflGFmcfXVzM4e6BuEoMwQJ02Eku
+YelP1CjNtc6sHBCAFsw2S1eYM62HWOvtPrNLWfd4SC9mSvC5wluXjwkYZawUMkRW
+PWjUkB5fh3aEzH5hJxmTSDhmOTC87BSuF/48CCs9HBtHuj0cMjZTFufyeRju/FeR
+Ox6vES5ekZXL3Mbdfvo6T/dayVWA8XTgf48S51wnQSPoasvamcSfWFMJLY+7nAja
+pivHwrgplz29/TT2Q7nLSsfhM7X1R5AZz6VCCIp5gIFdG3BMSnV3AgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkZW0udW5pc2EuaXSGJGh0dHBzOi8vaWRlbS51bmlzYS5p
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU076FG2mz4pBmuIrxKU4Jvl9aNBYw
+DQYJKoZIhvcNAQEFBQADggEBAAeeuss99oqaXRhHaEZYtMFQyvGleDg+9czzntvF
+jnizjmnL5xdQQZSQZdwvmvjw6x+Sp1y0fKhtILBoTjXW6ixqTX1RxHLcpibvfDkY
+klUoee6N/lvdYfNVRQAkpfvgVqHjeQ5EtrkRrdvsZ759/KhWZK+b6H/JKIGorZzG
+1z5GEsTXJn6pedvrhQ0BpqR+q+9kN4GhQg4kqk3A1GWngQ6O7SU1XlaCX3ycuWCU
+D3UMnH1MIVjIB9tmDIFL2xmmdSH4ou2+JPD3CCP2vZaO/TuHB9V5J7yESvsqol4C
+sJwcUuF/ZeWReGaw7eRU6k0lYCAwzkktNpJA0svun9TxbVA=
+</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>
+MIIDHzCCAgegAwIBAgIUF0Qp2OA2O0eaUmNRzOKIr5PdtskwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRlbS51bmlzYS5pdDAeFw0xMTExMTQxNTI4NDdaFw0z
+MTExMTQxNTI4NDdaMBgxFjAUBgNVBAMTDWlkZW0udW5pc2EuaXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEQl3iUVQXoyUdnsJj2LhJBTXdTXNPxilI
+RnA0/U4qRE6JgMd9o2A711AFBwhh+Ytd7iEwdflGFmcfXVzM4e6BuEoMwQJ02Eku
+YelP1CjNtc6sHBCAFsw2S1eYM62HWOvtPrNLWfd4SC9mSvC5wluXjwkYZawUMkRW
+PWjUkB5fh3aEzH5hJxmTSDhmOTC87BSuF/48CCs9HBtHuj0cMjZTFufyeRju/FeR
+Ox6vES5ekZXL3Mbdfvo6T/dayVWA8XTgf48S51wnQSPoasvamcSfWFMJLY+7nAja
+pivHwrgplz29/TT2Q7nLSsfhM7X1R5AZz6VCCIp5gIFdG3BMSnV3AgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkZW0udW5pc2EuaXSGJGh0dHBzOi8vaWRlbS51bmlzYS5p
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU076FG2mz4pBmuIrxKU4Jvl9aNBYw
+DQYJKoZIhvcNAQEFBQADggEBAAeeuss99oqaXRhHaEZYtMFQyvGleDg+9czzntvF
+jnizjmnL5xdQQZSQZdwvmvjw6x+Sp1y0fKhtILBoTjXW6ixqTX1RxHLcpibvfDkY
+klUoee6N/lvdYfNVRQAkpfvgVqHjeQ5EtrkRrdvsZ759/KhWZK+b6H/JKIGorZzG
+1z5GEsTXJn6pedvrhQ0BpqR+q+9kN4GhQg4kqk3A1GWngQ6O7SU1XlaCX3ycuWCU
+D3UMnH1MIVjIB9tmDIFL2xmmdSH4ou2+JPD3CCP2vZaO/TuHB9V5J7yESvsqol4C
+sJwcUuF/ZeWReGaw7eRU6k0lYCAwzkktNpJA0svun9TxbVA=
+</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>
diff --git a/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml
new file mode 100644
index 00000000..2539fcf3
--- /dev/null
+++ b/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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 University of Salento users</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:PrivacyStatementURL xml:lang="it">http://idem-idp.unisalento.it/info</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMzCCAhugAwIBAgIUA+PvTTuv3pJPbxuuJd/3LE3JtcEwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0MB4XDTEwMDcxMzEyMTg1
+NloXDTMwMDcxMzEyMTg1NlowHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgla3juJH8iD+hOUKUgES
+hp9QqZOEuEPDSaS9SpYZHxscsgz0RXljN2yMw8fS7ih4LCZT98okH+lBG4wKndMg
+0X2gDQfpMpA9ly/Ei5htxtBQGcuIVtmfI1BPwMTGqlvxnO3HCRNdzbb/UivCtvZt
+g0cr0P6qYr11ExntVQInEq2S18S1xRLAZOL5SId8AcGUugVqZM1Q4L8anJclCww5
+Hmnl27QQSrVTgoPjPt2KI7ALVEsTbY54gEti6YRX6VmXYtCiFOkLFK0A/Q5hcy7Z
+XDuZnhqYGh11iwh2xGRu8ZXYPKtEhKf+Y3+BqOB9j7+kSHRHbVqegREOm/Ude+WC
+lwIDAQABo2swaTBIBgNVHREEQTA/ghJpZGVtLnVuaXNhbGVudG8uaXSGKWh0dHBz
+Oi8vaWRlbS51bmlzYWxlbnRvLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSD
+vtPQz4E2/RAEnZwWLaMi6MgpXzANBgkqhkiG9w0BAQUFAAOCAQEALqmALOf4h9Q+
+OT27WFz2eBzr8X39M3MZ60b2xXxGn36VRlkfrBS2sCSZz/8JZrFsDr650I0v5ZHV
+8I0pMfTzUyylxch4T8Y92779JifANL1ypLKLzsgXtO0zKut6AvxRG+6AnECQtFMg
+i3JWjW8VY7HVpvCSRpIZtLEBoYfSsGEB8vkdhbJvz15cmwwtBX9bHGyiqGdG8NSi
+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>
+MIIDMzCCAhugAwIBAgIUA+PvTTuv3pJPbxuuJd/3LE3JtcEwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0MB4XDTEwMDcxMzEyMTg1
+NloXDTMwMDcxMzEyMTg1NlowHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgla3juJH8iD+hOUKUgES
+hp9QqZOEuEPDSaS9SpYZHxscsgz0RXljN2yMw8fS7ih4LCZT98okH+lBG4wKndMg
+0X2gDQfpMpA9ly/Ei5htxtBQGcuIVtmfI1BPwMTGqlvxnO3HCRNdzbb/UivCtvZt
+g0cr0P6qYr11ExntVQInEq2S18S1xRLAZOL5SId8AcGUugVqZM1Q4L8anJclCww5
+Hmnl27QQSrVTgoPjPt2KI7ALVEsTbY54gEti6YRX6VmXYtCiFOkLFK0A/Q5hcy7Z
+XDuZnhqYGh11iwh2xGRu8ZXYPKtEhKf+Y3+BqOB9j7+kSHRHbVqegREOm/Ude+WC
+lwIDAQABo2swaTBIBgNVHREEQTA/ghJpZGVtLnVuaXNhbGVudG8uaXSGKWh0dHBz
+Oi8vaWRlbS51bmlzYWxlbnRvLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSD
+vtPQz4E2/RAEnZwWLaMi6MgpXzANBgkqhkiG9w0BAQUFAAOCAQEALqmALOf4h9Q+
+OT27WFz2eBzr8X39M3MZ60b2xXxGn36VRlkfrBS2sCSZz/8JZrFsDr650I0v5ZHV
+8I0pMfTzUyylxch4T8Y92779JifANL1ypLKLzsgXtO0zKut6AvxRG+6AnECQtFMg
+i3JWjW8VY7HVpvCSRpIZtLEBoYfSsGEB8vkdhbJvz15cmwwtBX9bHGyiqGdG8NSi
+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 Salentoo</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://www.unisalento.it/web/guest/home_page</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
new file mode 100644
index 00000000..ca38cfa1
--- /dev/null
+++ b/swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDJDCCAgygAwIBAgIVAJRPddpXPFSzRqSfPdrn/IFdufKtMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pdnBtLml0MB4XDTEzMDgyNzA4Mjk1MVoX
+DTE2MDgyNzA4Mjk1MVowGTEXMBUGA1UEAxMOaWRlbS51bml2cG0uaXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrVLl1s2FWb4lmcg+qOwTW/SfzsEEK
+ozdQMTP66NHa/cNfGsIfnJsilNPRXedR7zCdtWzAQ81XZ8Yi0fwUjo3C1tEoNcaH
+GM1asCRUu1jYjGfT72weUEzHHlU+QlGzhlm6mcI9tAU9CJfB3CMwPYotrlufWHTQ
+bbKwNTBHS+9bmICLeSy7P6SqJOyCTqsU7FqF2B3nW7aLwRba7X5u3T1gUyAUYmjW
+7Ej8fTh9IYpCC2tCYgjYy99R9eF3RePUx2znbR8/Kap6fA0OgjN4DuM265HsLXgp
+U9te4k04BcxbFJ6K81yRGGE5qrhowJGvSbcv8qLEP0LKtuK3/RaInmGNAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkZW0udW5pdnBtLml0hiVodHRwczovL2lkZW0udW5p
+dnBtLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRv4qE5cJdI0tWc0PcoXfKY
+BG4YFDANBgkqhkiG9w0BAQUFAAOCAQEAXVsfjXIBRoEQ3AMcYlOcQ5lggDuHFdcB
+PDxVUzYlTDEyxhr4G0Nr/QjyQepInZneIKpSIiQTLN7iWaVz8CTTn5aiphMzF0hb
+dghLRtKuft4+M4ke7dEod8Xdu2vNFCoA9fdS44ycClWo7KlNmEdCKVsSK5UX8CRL
+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>
+MIIDJDCCAgygAwIBAgIVAJRPddpXPFSzRqSfPdrn/IFdufKtMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pdnBtLml0MB4XDTEzMDgyNzA4Mjk1MVoX
+DTE2MDgyNzA4Mjk1MVowGTEXMBUGA1UEAxMOaWRlbS51bml2cG0uaXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrVLl1s2FWb4lmcg+qOwTW/SfzsEEK
+ozdQMTP66NHa/cNfGsIfnJsilNPRXedR7zCdtWzAQ81XZ8Yi0fwUjo3C1tEoNcaH
+GM1asCRUu1jYjGfT72weUEzHHlU+QlGzhlm6mcI9tAU9CJfB3CMwPYotrlufWHTQ
+bbKwNTBHS+9bmICLeSy7P6SqJOyCTqsU7FqF2B3nW7aLwRba7X5u3T1gUyAUYmjW
+7Ej8fTh9IYpCC2tCYgjYy99R9eF3RePUx2znbR8/Kap6fA0OgjN4DuM265HsLXgp
+U9te4k04BcxbFJ6K81yRGGE5qrhowJGvSbcv8qLEP0LKtuK3/RaInmGNAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkZW0udW5pdnBtLml0hiVodHRwczovL2lkZW0udW5p
+dnBtLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRv4qE5cJdI0tWc0PcoXfKY
+BG4YFDANBgkqhkiG9w0BAQUFAAOCAQEAXVsfjXIBRoEQ3AMcYlOcQ5lggDuHFdcB
+PDxVUzYlTDEyxhr4G0Nr/QjyQepInZneIKpSIiQTLN7iWaVz8CTTn5aiphMzF0hb
+dghLRtKuft4+M4ke7dEod8Xdu2vNFCoA9fdS44ycClWo7KlNmEdCKVsSK5UX8CRL
+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>
diff --git a/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml
new file mode 100644
index 00000000..4380a225
--- /dev/null
+++ b/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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-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>
+      <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 IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Trieste IdP</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>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAIPn0rci7ca2nc6Pd0a8kS35GFVlMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWlkZW1mZXJvLnVuaXRzLml0MB4XDTExMDYzMDE1Mzgw
+NFoXDTMxMDYzMDE1MzgwNFowHDEaMBgGA1UEAxMRaWRlbWZlcm8udW5pdHMuaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm2d1TVod551/AHgSkFZa/
+DgfKePtHqC88H9qlcDGhhZfdhN1KCubG7H2sY1awLQ3HwonlfyCN+FjxL15jiTtS
+SGM3bE9tb8p6NoryPTtPSiF4JZraE5Y8PnWN7i49QhhOY/dzsYGUGzKWY8GzSaKB
+BJAA+XXbj2l6s/6Ksj/ii7KGjt/opcJ5rBE0+ttDanuC0w8upUAL29rQ5Yx6n7IG
+FMI7PS2W1IeKrU0Fm93ujdm3Itx9L+5bmd/WQyJInXt9DWQXBhek3oh5ZCK+H7Or
+h9Sk4ld8BxFlgsw96xjVX246jTCBgGcCOlRRW9d21tYmCEn/ew4JVtHHRktnblD3
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkZW1mZXJvLnVuaXRzLml0hihodHRwczov
+L2lkZW1mZXJvLnVuaXRzLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQDNZRh
+1OdCXmX7+5k2XwRmfMQ4iDANBgkqhkiG9w0BAQUFAAOCAQEASeWVPZ+W5q+LxyZP
+uEpGw+uysbNIBbpxglKfli3QX9MQrBOG1S1Y5gQ5Rsi26ipWidgEORbX6mUKtax+
+85NYvi3faIcbLMf87Xbxmn+oYMv/ksfeoevZAkLPXb6DLNjoOEV2UbQuz/03o9bM
+05QJuuY1K9ioCMat4+WZ3XvLxNoKZwRLtERV5Ibr+ffOu1WhXkdoW1PX6K12p044
+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:1.1:protocol urn:oasis:names:tc:SAML:2.0: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
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm2d1TVod551/AHgSkFZa/
+DgfKePtHqC88H9qlcDGhhZfdhN1KCubG7H2sY1awLQ3HwonlfyCN+FjxL15jiTtS
+SGM3bE9tb8p6NoryPTtPSiF4JZraE5Y8PnWN7i49QhhOY/dzsYGUGzKWY8GzSaKB
+BJAA+XXbj2l6s/6Ksj/ii7KGjt/opcJ5rBE0+ttDanuC0w8upUAL29rQ5Yx6n7IG
+FMI7PS2W1IeKrU0Fm93ujdm3Itx9L+5bmd/WQyJInXt9DWQXBhek3oh5ZCK+H7Or
+h9Sk4ld8BxFlgsw96xjVX246jTCBgGcCOlRRW9d21tYmCEn/ew4JVtHHRktnblD3
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkZW1mZXJvLnVuaXRzLml0hihodHRwczov
+L2lkZW1mZXJvLnVuaXRzLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQDNZRh
+1OdCXmX7+5k2XwRmfMQ4iDANBgkqhkiG9w0BAQUFAAOCAQEASeWVPZ+W5q+LxyZP
+uEpGw+uysbNIBbpxglKfli3QX9MQrBOG1S1Y5gQ5Rsi26ipWidgEORbX6mUKtax+
+85NYvi3faIcbLMf87Xbxmn+oYMv/ksfeoevZAkLPXb6DLNjoOEV2UbQuz/03o9bM
+05QJuuY1K9ioCMat4+WZ3XvLxNoKZwRLtERV5Ibr+ffOu1WhXkdoW1PX6K12p044
+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>
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
new file mode 100644
index 00000000..7ee0d0e9
--- /dev/null
+++ b/swamid-interfederations-2.0/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIEOTCCAyGgAwIBAgIJAPHensWnKvc4MA0GCSqGSIb3DQEBBQUAMIGyMQswCQYD
+VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxFDASBgNVBAcMC0FsZXNzYW5kcmlhMSow
+KAYDVQQKDCF1bml2ZXJzaXRhIGRlbCBwaWVtb250ZSBvcmllbnRhbGUxFjAUBgNV
+BAsMDXVmZmljaW8gcmVmb3MxGjAYBgNVBAMMEWlkZW1pZHAudW5pcG1uLml0MR0w
+GwYJKoZIhvcNAQkBFg5yZXRlQHVuaXBtbi5pdDAeFw0xNDA5MDIwOTM1MzFaFw00
+NDA4MjUwOTM1MzFaMIGyMQswCQYDVQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxFDAS
+BgNVBAcMC0FsZXNzYW5kcmlhMSowKAYDVQQKDCF1bml2ZXJzaXRhIGRlbCBwaWVt
+b250ZSBvcmllbnRhbGUxFjAUBgNVBAsMDXVmZmljaW8gcmVmb3MxGjAYBgNVBAMM
+EWlkZW1pZHAudW5pcG1uLml0MR0wGwYJKoZIhvcNAQkBFg5yZXRlQHVuaXBtbi5p
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALzKLUEUSuClrvGdFqdn
+jAhBqxjjecka5KyBUY92QwqY0FSRzG14PN62ZHEghdLvZ8MBLrEuMUHfENNY1xFB
+k0rqydhooZmk6fW56WF3DGdFTkm7IvIxsqqTcxR2V1I2R10QHIaDYgx/fNE7VSd6
+7n7eP7PhwIslSDFcxq45M+ETa8VZ0q1256w7XyUsZFRSBZtrz+bY4hVf6pNpTLkk
+RRU0cbf2U2KmcNP8T05ax1PSupJX+RU6yMVvgXMQh86s6h8sKcD13oOj1OeM7CI1
+gH92uKM4HzxD7wmiFRlwPabCjPUZzBDggMgeOL96heJK8EtBH/yERq8CDvW0OYaR
+AtUCAwEAAaNQME4wHQYDVR0OBBYEFDbNfOhxDESf0UuXY6AarCfFlzvqMB8GA1Ud
+IwQYMBaAFDbNfOhxDESf0UuXY6AarCfFlzvqMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADggEBAFFI0ONX+syhY0MtoUrf5WPa8pmRFSxzjW0X/FB8kmGxfQ/w
+1P/ocgLffsjR32FEueGnWvBhSnsdxeMEhEjnMcCtqYm4g5+lbddpD11FyaDBXOeb
+AS0NPOsaEToivw/303/fepy9jv1+VGKOrDUJNwL4txEp8q7QD+9VrtRC2nPHnZeW
+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>
+MIIEOTCCAyGgAwIBAgIJAPHensWnKvc4MA0GCSqGSIb3DQEBBQUAMIGyMQswCQYD
+VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxFDASBgNVBAcMC0FsZXNzYW5kcmlhMSow
+KAYDVQQKDCF1bml2ZXJzaXRhIGRlbCBwaWVtb250ZSBvcmllbnRhbGUxFjAUBgNV
+BAsMDXVmZmljaW8gcmVmb3MxGjAYBgNVBAMMEWlkZW1pZHAudW5pcG1uLml0MR0w
+GwYJKoZIhvcNAQkBFg5yZXRlQHVuaXBtbi5pdDAeFw0xNDA5MDIwOTM1MzFaFw00
+NDA4MjUwOTM1MzFaMIGyMQswCQYDVQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxFDAS
+BgNVBAcMC0FsZXNzYW5kcmlhMSowKAYDVQQKDCF1bml2ZXJzaXRhIGRlbCBwaWVt
+b250ZSBvcmllbnRhbGUxFjAUBgNVBAsMDXVmZmljaW8gcmVmb3MxGjAYBgNVBAMM
+EWlkZW1pZHAudW5pcG1uLml0MR0wGwYJKoZIhvcNAQkBFg5yZXRlQHVuaXBtbi5p
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALzKLUEUSuClrvGdFqdn
+jAhBqxjjecka5KyBUY92QwqY0FSRzG14PN62ZHEghdLvZ8MBLrEuMUHfENNY1xFB
+k0rqydhooZmk6fW56WF3DGdFTkm7IvIxsqqTcxR2V1I2R10QHIaDYgx/fNE7VSd6
+7n7eP7PhwIslSDFcxq45M+ETa8VZ0q1256w7XyUsZFRSBZtrz+bY4hVf6pNpTLkk
+RRU0cbf2U2KmcNP8T05ax1PSupJX+RU6yMVvgXMQh86s6h8sKcD13oOj1OeM7CI1
+gH92uKM4HzxD7wmiFRlwPabCjPUZzBDggMgeOL96heJK8EtBH/yERq8CDvW0OYaR
+AtUCAwEAAaNQME4wHQYDVR0OBBYEFDbNfOhxDESf0UuXY6AarCfFlzvqMB8GA1Ud
+IwQYMBaAFDbNfOhxDESf0UuXY6AarCfFlzvqMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADggEBAFFI0ONX+syhY0MtoUrf5WPa8pmRFSxzjW0X/FB8kmGxfQ/w
+1P/ocgLffsjR32FEueGnWvBhSnsdxeMEhEjnMcCtqYm4g5+lbddpD11FyaDBXOeb
+AS0NPOsaEToivw/303/fepy9jv1+VGKOrDUJNwL4txEp8q7QD+9VrtRC2nPHnZeW
+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>
diff --git a/swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml
new file mode 100644
index 00000000..f876304a
--- /dev/null
+++ b/swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDNDCCAhygAwIBAgIVALEKMVRz1NfaMCKF5EPhGe+47TRvMA0GCSqGSIb3DQEB
+BQUAMB0xGzAZBgNVBAMTEmlkZW1zaGliYi51bmluYS5pdDAeFw0xMDA1MjgxMDQ0
+MjdaFw0zMDA1MjgxMDQ0MjdaMB0xGzAZBgNVBAMTEmlkZW1zaGliYi51bmluYS5p
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbuWYYevoNFjmTCeWFz
+2/1VIW8CA0IQe3eS4gkQNaeT2M048DrDpxdnVRmmqU0QEemG3VkYhwm8TISWMcfJ
+CvnOQ0s5mmBm40fdPkeXnrGv+5SMJw9OA8Ph7U9RIXkqqiuXNiw7torML1mHkYAI
+AXPd+4cyK9QKc228fj5FFOrq9bT3hr+TgoChfrRcpmh8b5FFjpZSOtrH47kWe7Tz
+HlE4ie/jH5TXfExk/9ZDKYelEui9WbmiaT80cMMCmDMDZuCp3l6TN0wWyjPCbbn2
+FBKtJu1lmNnbSF+CAf87EUwjzWfK/KhmfjLf0jlS7jpuANaXPeOEMzDjP3Baj0i4
+tAcCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRlbXNoaWJiLnVuaW5hLml0hilodHRw
+czovL2lkZW1zaGliYi51bmluYS5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+oeCNNNtnZLqkQBIKTTmQkkhGXZIwDQYJKoZIhvcNAQEFBQADggEBAK9tcsT8mMjt
+k2nE3Onmy61lfPKF9CX34dMX4Wsowx48LJpVWghi66rzbX3ZAK3vTrCkkYX372J8
+k6QCA7H45VhW/JVwRFnPtYiTYGXpgUQmisZgCIsS4gWUK4yc+7e5+vHz34wDEyFO
+LZU/u4XA2QSiTwZvixf1f9iFc18yhCCQhNQFcbjqqcPTidm6FiYLSqu5X166Ydip
+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>
+MIIDNDCCAhygAwIBAgIVALEKMVRz1NfaMCKF5EPhGe+47TRvMA0GCSqGSIb3DQEB
+BQUAMB0xGzAZBgNVBAMTEmlkZW1zaGliYi51bmluYS5pdDAeFw0xMDA1MjgxMDQ0
+MjdaFw0zMDA1MjgxMDQ0MjdaMB0xGzAZBgNVBAMTEmlkZW1zaGliYi51bmluYS5p
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbuWYYevoNFjmTCeWFz
+2/1VIW8CA0IQe3eS4gkQNaeT2M048DrDpxdnVRmmqU0QEemG3VkYhwm8TISWMcfJ
+CvnOQ0s5mmBm40fdPkeXnrGv+5SMJw9OA8Ph7U9RIXkqqiuXNiw7torML1mHkYAI
+AXPd+4cyK9QKc228fj5FFOrq9bT3hr+TgoChfrRcpmh8b5FFjpZSOtrH47kWe7Tz
+HlE4ie/jH5TXfExk/9ZDKYelEui9WbmiaT80cMMCmDMDZuCp3l6TN0wWyjPCbbn2
+FBKtJu1lmNnbSF+CAf87EUwjzWfK/KhmfjLf0jlS7jpuANaXPeOEMzDjP3Baj0i4
+tAcCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRlbXNoaWJiLnVuaW5hLml0hilodHRw
+czovL2lkZW1zaGliYi51bmluYS5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+oeCNNNtnZLqkQBIKTTmQkkhGXZIwDQYJKoZIhvcNAQEFBQADggEBAK9tcsT8mMjt
+k2nE3Onmy61lfPKF9CX34dMX4Wsowx48LJpVWghi66rzbX3ZAK3vTrCkkYX372J8
+k6QCA7H45VhW/JVwRFnPtYiTYGXpgUQmisZgCIsS4gWUK4yc+7e5+vHz34wDEyFO
+LZU/u4XA2QSiTwZvixf1f9iFc18yhCCQhNQFcbjqqcPTidm6FiYLSqu5X166Ydip
+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>
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
new file mode 100644
index 00000000..4b614ee8
--- /dev/null
+++ b/swamid-interfederations-2.0/ident-shib.ensc-rennes.fr-idp-shibboleth.xml
@@ -0,0 +1,58 @@
+<?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>
+      <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: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>
+					      MIIDUDCCAjigAwIBAgIVAJzCGVHITFdUQZHToPMuBqK1RWD4MA0GCSqGSIb3DQEB
+BQUAMCQxIjAgBgNVBAMTGWlkZW50LXNoaWIuZW5zYy1yZW5uZXMuZnIwHhcNMTQw
+MjAzMTYxODExWhcNMzQwMjAzMTYxODExWjAkMSIwIAYDVQQDExlpZGVudC1zaGli
+LmVuc2MtcmVubmVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+hIpbRHGHJooNDAMhOEiava+ybI8svFXqhXjfsTxwbfGWvsKD523Ll//RtVnLXAk9
+Z2bYEwHrc/4sfdnMaWpHt2mQ0+eEOvhP0MK34WHfiZgS9RxcHDYZVvzHRhBxBnMO
+AG4WoO1nUrwQqooKN+WmPVqBwYWvMPh44i9grueh7hIau+VXdKtB0CUlZHLksNoa
+HXzRajFTEqfL1AVocovZ9CB+3uBaV12VWpK9IVe0zcsL2fV3/5/bFj4RWIZ3CYzw
+ibKUV0WuuhT7UDOMCVZtgEC71Eio8QYVGHiySF1erOHnypSBN47/n2PqKQrmn10C
+8F4MJ0U/29CG+fbprAAxxwIDAQABo3kwdzBWBgNVHREETzBNghlpZGVudC1zaGli
+LmVuc2MtcmVubmVzLmZyhjBodHRwczovL2lkZW50LXNoaWIuZW5zYy1yZW5uZXMu
+ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAOSOecw1ZOscoOQfSu2szw1P0e2
+MA0GCSqGSIb3DQEBBQUAA4IBAQBuFiTaiuedPd3pNbg5I9PIOmDqkbfewLVQiUhW
+Cw/H+wBLeU3Pu1J2I1bGktcXAKrb7NPXhDkqAjFga8DHwhQiwT3VHuO8Oe5JmfeN
+rYT51++eLm4vSoZUuRqBMgceSPoJNZuGzcixdeVnSCEyEohHuOjsEJNTMB4+n3K3
+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://unknown.site.com</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
new file mode 100644
index 00000000..3f92489c
--- /dev/null
+++ b/swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr-idp-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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: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>
+					      MIIDajCCAlKgAwIBAgIVAPG2ptbp0UjCApRyqdnLPcwZfygNMA0GCSqGSIb3DQEB
+BQUAMCoxKDAmBgNVBAMTH2lkZW50LXNoaWIuc2NpZW5jZXNwby1yZW5uZXMuZnIw
+HhcNMTQwMzA1MDk0NjQxWhcNMzQwMzA1MDk0NjQxWjAqMSgwJgYDVQQDEx9pZGVu
+dC1zaGliLnNjaWVuY2VzcG8tcmVubmVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAis17JWHBLBfS8PU4tH7WX46gSxcMn1qrK5r7hZgLbyLb2BTJ
+H7S93L3rcoqls2YMcWuziTRweu9vcCalDICVazQlp8VfNQjdGFLqPxuGSbewoimk
+obngfwTck0cb1RHDKFLkzgUc4YJ3rgsriWqTsVlmN+JDz1f/mly0rO3iz7UiYAu5
+EeNwcHgdc+4e4/orknjwp7cWUyRAtwoSXMlQfttYn6ZtQTiZOmF4JSVseP+4Gawj
+VGrZIgysDT+W+9UMwdk8/oFue7wAZaYtoV3imWr0EyrIG7v1FD/58rAQZF8c1Myl
+xsQ3OUC1tAGBLcnoDgVD85N6F8e5v5zAYGepfwIDAQABo4GGMIGDMGIGA1UdEQRb
+MFmCH2lkZW50LXNoaWIuc2NpZW5jZXNwby1yZW5uZXMuZnKGNmh0dHBzOi8vaWRl
+bnQtc2hpYi5zY2llbmNlc3BvLXJlbm5lcy5mci9pZHAvc2hpYmJvbGV0aDAdBgNV
+HQ4EFgQUxhh6YW27b6x27CQ9vu4PZc21OpQwDQYJKoZIhvcNAQEFBQADggEBADXY
+cwvGXPbtQksBGQupD9DIRdE2mmlISK6M3Zuv5c3aPu6QLw1fqHUYGRC5MNas7763
+GLI1ALEfxo7X29gpfXmLfB6hQO2zplYucodgQjI1jQD+Ds5elCgeH8pPAR+g7CDp
+dMQSGjHjulT3jQeJBgcVbH9UaV7X/fOPQ+EWD0E8UOAabzgOtWXCeWHJb/fWYwGD
+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://unknown.site.com</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
new file mode 100644
index 00000000..0868d5f9
--- /dev/null
+++ b/swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+      <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="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>
+					      MIIDPDCCAiSgAwIBAgIVAIEsfLZbOVKR5umlzQTdFNcppbAhMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMTFGR1bmRlZS5lbnNpZXRhLmVjb2xlMB4XDTEzMDIxNTEy
+MjY1NVoXDTMzMDIxNTEyMjY1NVowHzEdMBsGA1UEAxMUZHVuZGVlLmVuc2lldGEu
+ZWNvbGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjkoPRA+/M6G74
+s1PymwU6YHSEJBDhMpYhjm9WmleJqao/BEV1BU1BpSTmbHg0CVo0ZrFZ/kHu5Z9Q
+veqPk3dM4rao4I/a3f1atZh77jQWhxPauiLgRC2EoWWDYDwZi6LfdkeQwDFm8SnN
+Ug+NRspwOWM7lXxo1d4DpU1aeMhosQMyqazzumrBhucT1QbtWrrJth1XN//z/7kW
+xK4hERSTRC4jKG03e4FKEliWG+WTdR0mMgypur+ZuQ2PwASjMV29L2ilm7o9inKK
+OPLbqATNoYgXhNgsMueyRqqfti9sxMo0aRW6wDu5iEBhy9hUo6PMWhBuw7lc+1K9
+SQaQgCU3AgMBAAGjbzBtMEwGA1UdEQRFMEOCFGR1bmRlZS5lbnNpZXRhLmVjb2xl
+hitodHRwczovL2R1bmRlZS5lbnNpZXRhLmVjb2xlL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBTOl8EfVH85x42e4K+brZLAl2llFTANBgkqhkiG9w0BAQUFAAOCAQEA
+YZRNdG+23m13Vs/QtqNH9eCRJa2xjWgRhdtgy+O+1V9apu5T2jspd6eI+r8kgv+T
+TcN2NgDOt3WaArJCrOJZ6eFdN7zx19Jcl5BwcRaX/13X4yt/QVqr8lEpmFC/JUFb
+M+YJV34AexxYJ5Trev/8iit0Ihmo0yLPakEvlPil/UOiNPjQMluHliAaBQpGI4xF
+/oMMMCl3sk9TTAPX+16NaqdBBDmUWIglw20NRFR1dHpRjdUIfJGSHhhEcfWbGfik
+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://unknown.site.com</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
new file mode 100644
index 00000000..f10d747e
--- /dev/null
+++ b/swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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="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>
+					      MIIDJDCCAgygAwIBAgIVAIE5ZcyxZPjFLm75fbkW0LiVO5fRMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkZW50LmVuc3RhLmZyMB4XDTExMDgyMjE2MDc0MVoX
+DTMxMDgyMjE2MDc0MVowGTEXMBUGA1UEAxMOaWRlbnQuZW5zdGEuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCLUeb4d/P26zell2IAVzJBcMdqWuw
+qudpEy3TnwNFhIjtE/B9BOu4zSYOXCYhYHk+6aJlttHU3t9nyO/tMQV4eIx/8+Os
+TyiF8RlgB6o/0dNElQArztPxtpQD9bdWzkVijpP8EnoGq/EiVi8BhYUeMsg8kVs7
+8Xj57AGFwqZmcPGIsEl3alykgFRQhgT/CYnudFeVzXSVb5y3ieFpdtv9JH036jQZ
+3IMgNtiASoa7pSiTe4Wmbe/4OlCc5XG7djWIPHE8GycHS6oXKSSCm1Zi6oQX88wn
+PyPP3V7X4VBL7EEuG/qAQf9rw1nheNOsfr1IlN3M23kAICwjf1t/UuWdAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkZW50LmVuc3RhLmZyhiVodHRwczovL2lkZW50LmVu
+c3RhLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSB9b2goKj1aewRYxlw9Aa6
+LDUomjANBgkqhkiG9w0BAQUFAAOCAQEALeX6AhrW0ejRY6ujqd31yDoIVltDfYBO
+IX+3JAbiCqSVm5b3uWyqxnKv/q+O1Wz0Oe7X8mIJKpu2Pi5Ley23/SfAA2Gf4rEp
+kOXIGlJgDo5hv/WcX374GnMQkUfyT1J9t9ZQecfdlpm4bPTDBkdcATUa/l1YU5zb
+2OeYp+sNAaOEk61WsALn1iJpMd4Ypg9VCQKTZrbfXO+LYKt11rx1WEzFHaBq5He1
+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://unknown.site.com</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>Joseph LIGIER</md:SurName>
+    <md:EmailAddress>joseph.ligier@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
new file mode 100644
index 00000000..4bee36f0
--- /dev/null
+++ b/swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+      <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="fr">Ecole Supérieure d'Agriculture d'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>
+					      MIIDPDCCAiSgAwIBAgIVAIrbDRCxNtaYnhNe0Q7DpuLVmgMHMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMTFGlkZW50Lmdyb3VwZS1lc2EuY29tMB4XDTEzMDkxMDA5
+MTI1M1oXDTMzMDkxMDA5MTI1M1owHzEdMBsGA1UEAxMUaWRlbnQuZ3JvdXBlLWVz
+YS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvf9ar+jST7FHc
+VUA37MOpTu6ViObVTFdfjSZks2PrsTgKGlq6aUoVHW6+ldF9c7z0gXD37qGmHmP3
+BrWq6W80bjg5rqgYeMpJxQsTXUaGXaEnsjKKiDQbv4rN3mtp9oufLPfPxLP/BC0W
+UCBFizNyP36hnFp6VbCOk2Ljg+1LVIEAEv8hx8kKhvcz93SjZg1P/IXuu8Evr7wk
+JoXb7awSIpfEzHSikaC3lhBg7SRdCUrKzTEG09nMRT8jBaQ6GmoG6A742ocd7FmD
+BJfJlJLmSu9XoY6eNN9Bdt+Cqb58Q9YavgSncLRXuz+9BhNKSwM3cqRO/ENey5Sr
+Bgh1CxQDAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkZW50Lmdyb3VwZS1lc2EuY29t
+hitodHRwczovL2lkZW50Lmdyb3VwZS1lc2EuY29tL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBTVK5X4uYZ3DYMRinUl83LfoBkQDDANBgkqhkiG9w0BAQUFAAOCAQEA
+PJHMoIiE+3KJVyjhM65mcvjfK/QMr2p3rGCyPOC3Gqe3DC6+ktEBMabL7Mgzhrpg
+44xN+Apygl7D3Vs0d3HbZtxSCr8IZSWXLF852pniTnW3UVFzvgqqxBe2rn5aKkke
+Wmsgnk/M+A+wwiooVjl81aYlOx/kMDa9t+7/AN3V4BC8e2hdii9UdGzZsWrjTngt
+3iJ4ZVI3jadnCbclS68vf9yVy4JtDQ4F1sC9b1tMBx5a9It73GIL6p3RaKP5JjzR
+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://unknown.site.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/identites.ec-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..0e4d09b8
--- /dev/null
+++ b/swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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="2012-04-20T10:17: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>
+      <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="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>
+					      MIIDQDCCAiigAwIBAgIVAJrguR/jXhFque4KJfEyebuerBj4MA0GCSqGSIb3DQEB
+BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguZWMtbHlvbi5mcjAeFw0xMjAzMDcx
+MzUxMDFaFw0zMjAzMDcxMzUxMDFaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguZWMt
+bHlvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMFBE2ZGRJed
+X1yuAPuuFwufY2BHUSXDcF+pYE5e9YpBcljwE9DWgoQLRtBzsEBR7EyRZJDe+XZI
+DGe+gT7p0yrIsNjVXAJld3l9YHo3EKZ2YcTDC9EtUVDF70EqQL1+KFzMqHLmnojr
+/7FYR5iiRwcQ7+dQa8RBLwgXckpTzsjiJyuHzvUrDJmatKMsct5a16Hk/UG/BEjz
+m270xkFclPImp5hgG3Y0yLcuPAVoj/0aydnp8+/ZRaRL03EHbuSt2ewf4OvoQeAm
+J/xtpiOpVFQwApeCx+G7YEgC4W48lo797QlCpaw7fXUPxKhBxU38yDXE27mIt6Zh
+k0/JtUTCCG0CAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYmJvbGV0aC5lYy1seW9u
+LmZyhixodHRwczovL3NoaWJib2xldGguZWMtbHlvbi5mci9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUQwnjctonyj2JIsIKaPFhCV9oIFEwDQYJKoZIhvcNAQEFBQAD
+ggEBAC0S2ZzH4X+GcKFny1NkFcMz6z1tlJ+iDgcKrv44m1ZyqOtiPm8k91rYYr5f
+NqezE6TGWH/taqN+/Y5+cTnPOjmJKwbIGu56Pt3nilhtcRShgVmW6msVdaKtf5Sr
+2dfNYQTHRm/YBAU+VzBUraMijeL2XnR+PFm3VNE+TdfParaLAMHurmYBE/6tQfXt
+4D6wA3/uLosIJ9ofWuJlPEsmYBTm5RukxnH0Qb1Gb5n2E8V+ZNCImpjZFsxSSrYz
+RiwCcgJOD+DOge8blZpwqnL6EKHFiSVauCzZAQ4B/k+9m0kZBXapgA2Fs3FI8uC3
+ywgk8luEHvdrWWSkFWa4yb2TuI4=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Cheval Régis</md:SurName>
+    <md:EmailAddress>regis.cheval@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
new file mode 100644
index 00000000..9c8aefd0
--- /dev/null
+++ b/swamid-interfederations-2.0/identites.enim.fr-idp-.xml
@@ -0,0 +1,54 @@
+<?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>
+      <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="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>
+					      MIIDFzCCAf+gAwIBAgIUXFUXeBlCuUekINLHfPFZiIPUrsAwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwLmVuaW0uZnIwHhcNMTIxMTE0MTMzODMyWhcNMzIx
+MTE0MTMzODMyWjAWMRQwEgYDVQQDEwtpZHAuZW5pbS5mcjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAPzw0RQQQxTO08j91FfloACjUJPfi7MnbcVZ5wpX
+v7DSZ1FOxQ+4qK6lBnNjqj2d6Y7q/6hfpU/jywg0WMzzUq+mJ+cLBKwBECJcYHt3
+V+EKb5+iLQ7jFIKn2IKOla/xTnNdhAcPhNfYRZ0b9MW5ZvSqB+Ype9cOiAgaE13i
+QszdnZQCt7iZPaWuRILIqOL9r+bzIjBT3ueQK6Pdofe4+D9bCD+Rw7K9ucj//Xwm
+oJtfFUM79Lwtd4mVs+qleXUEwYSCttBnNWh4mIj9+s46JlN9XE2OLdtLE8E4wRla
+wF6s0mbvZIWJ0UMFdlOSANu6qCEusFa+N+a3k1aLbjD3y60CAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwLmVuaW0uZnKGImh0dHBzOi8vaWRwLmVuaW0uZnIvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFOexEULHTKANUZhFIldEyXBwm7EiMA0GCSqGSIb3
+DQEBBQUAA4IBAQCx5cOFFV30wtnqGHbRTkwDqRTkNV5DJlYaFIW9YAVuzokQuAym
+lUUBC1QjNusjF2+iI+iKwp8D18sW9ZONF+Kw4D+uPtIfT4SDms1NQWrw4+Huvy30
+lCGjPWut+kDsKco2xhQdG2DoU9NrnoAFrs5uC3SjWYIhWAKAp57VuXt8RhN4BeBt
+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://unknown.site.com</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
new file mode 100644
index 00000000..ebf58531
--- /dev/null
+++ b/swamid-interfederations-2.0/identites.ensea.fr-idp-shibboleth.xml
@@ -0,0 +1,165 @@
+<?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>
+      <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="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>
+					      MIIEcTCCA1mgAwIBAgIQUg9Ih5mPMJpavDCAsMuZqTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxNTAwMDAwMFoXDTE3MDQxNDIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZGVudGl0ZXMu
+ZW5zZWEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQWllKmvIV
+9KtnhWX8cmcTAmcq5cxrkRCWzZZJXSyvqZ1Glf5jvvErdyXPBhI1bJ7+wP0AkOVk
+I/WznWeap7PcnDjeDspzDP9FDoEJOAkw8LGsAtuJI64TGfnTBSvjAcxAexubp3zW
+0FjrqL+6oQxkL4GcZ6eaQF1uvFl7CPO7D3lWcFBgg2PRUl0Ig6ZUK0/PBgdjNRbi
+vxhRyQRloYJp3AGhSNn+STyNSAB071vUZG8ChVs2lNZY1insE46cYdVo1YqSgjL5
+t6zdNJaJRHs7aTWq4S7Z700sKJ7W42mlUpF9SCjGUU8gS3xoHlI+9o5vnRmsO3fa
++j0FPaw+9QZbAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUrahgQ8RDG2G7cIicKcbpWSxYc5MwDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkZW50aXRlcy5lbnNlYS5m
+cjANBgkqhkiG9w0BAQUFAAOCAQEAnQAOMurBNe5YOWk6SekHmnTsHcGz0h2aLp36
+IIorkCb3f78T6/oPRvlFWvTIOjVNbxXzFKJrJA4fu7dDRx/6ckPGjVJwXHRb7rOv
+gc9hEfb3v4bMhxWOX7WyvNEyewKe84vrobDxHqpXpL7KU5LAJNPYglZr62yiJI9z
+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>
+					      MIIEcTCCA1mgAwIBAgIQG4CD0xtQn3PW9uGm5cYkdzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDEyNDAwMDAwMFoXDTE3MDMwODIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZGVudGl0ZXMu
+ZW5zZWEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDF0Ed4XZzY
+rYz4dsdiRwqrHk+MC33vn/BJf+JkwnSBPtfVsOUcFH3BGJ0B051QpD2oCPOIiz2V
+9rzP6E9PFP3MGuuwKtnGZnDBBSMYEp+yKewjehfV07qgoO/VLZtAA3dxjbxQrmal
+C13sqrKaafTJdHtyjhZNUpDzc8Ig5pgEj/rLymcJVgp3mjEAkm3J8fP/upEYdx4e
+EQD2XgIBuBGZThSuJOTOUXtf1qF9JhDswlHst28jHzp31MDybWdZ1xTyUVo3pYwW
+UPStS9HdvfNoz/fR5+Pmdfu+rpXTZ7jjgnMkQy84qHtbH4u/d3vFjKPCx0DZ7UFA
+SHaH/Ue3OQZtAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUhUrcsTUfWA/zwCZFVUrW0BpWBCIwDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkZW50aXRlcy5lbnNlYS5m
+cjANBgkqhkiG9w0BAQUFAAOCAQEAgym0ss96sn/udEY0m2qHQ5VNt3gfc1oAlX8w
+o44C1pPjZRbvySLWF+qc7VQP6HrbuiEjA47o1tZoqkh01FntuQfM+9V3naFa74Wl
+KOAbEiTSJsOTZLbmr1j0lovOlxJ4UddRVWMjCIfbgsUw+ZtoRvUqnO16pcZXrLCa
+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>
+					      MIIEcTCCA1mgAwIBAgIQUg9Ih5mPMJpavDCAsMuZqTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxNTAwMDAwMFoXDTE3MDQxNDIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZGVudGl0ZXMu
+ZW5zZWEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQWllKmvIV
+9KtnhWX8cmcTAmcq5cxrkRCWzZZJXSyvqZ1Glf5jvvErdyXPBhI1bJ7+wP0AkOVk
+I/WznWeap7PcnDjeDspzDP9FDoEJOAkw8LGsAtuJI64TGfnTBSvjAcxAexubp3zW
+0FjrqL+6oQxkL4GcZ6eaQF1uvFl7CPO7D3lWcFBgg2PRUl0Ig6ZUK0/PBgdjNRbi
+vxhRyQRloYJp3AGhSNn+STyNSAB071vUZG8ChVs2lNZY1insE46cYdVo1YqSgjL5
+t6zdNJaJRHs7aTWq4S7Z700sKJ7W42mlUpF9SCjGUU8gS3xoHlI+9o5vnRmsO3fa
++j0FPaw+9QZbAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUrahgQ8RDG2G7cIicKcbpWSxYc5MwDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkZW50aXRlcy5lbnNlYS5m
+cjANBgkqhkiG9w0BAQUFAAOCAQEAnQAOMurBNe5YOWk6SekHmnTsHcGz0h2aLp36
+IIorkCb3f78T6/oPRvlFWvTIOjVNbxXzFKJrJA4fu7dDRx/6ckPGjVJwXHRb7rOv
+gc9hEfb3v4bMhxWOX7WyvNEyewKe84vrobDxHqpXpL7KU5LAJNPYglZr62yiJI9z
+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>
+					      MIIEcTCCA1mgAwIBAgIQG4CD0xtQn3PW9uGm5cYkdzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDEyNDAwMDAwMFoXDTE3MDMwODIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZGVudGl0ZXMu
+ZW5zZWEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDF0Ed4XZzY
+rYz4dsdiRwqrHk+MC33vn/BJf+JkwnSBPtfVsOUcFH3BGJ0B051QpD2oCPOIiz2V
+9rzP6E9PFP3MGuuwKtnGZnDBBSMYEp+yKewjehfV07qgoO/VLZtAA3dxjbxQrmal
+C13sqrKaafTJdHtyjhZNUpDzc8Ig5pgEj/rLymcJVgp3mjEAkm3J8fP/upEYdx4e
+EQD2XgIBuBGZThSuJOTOUXtf1qF9JhDswlHst28jHzp31MDybWdZ1xTyUVo3pYwW
+UPStS9HdvfNoz/fR5+Pmdfu+rpXTZ7jjgnMkQy84qHtbH4u/d3vFjKPCx0DZ7UFA
+SHaH/Ue3OQZtAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUhUrcsTUfWA/zwCZFVUrW0BpWBCIwDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkZW50aXRlcy5lbnNlYS5m
+cjANBgkqhkiG9w0BAQUFAAOCAQEAgym0ss96sn/udEY0m2qHQ5VNt3gfc1oAlX8w
+o44C1pPjZRbvySLWF+qc7VQP6HrbuiEjA47o1tZoqkh01FntuQfM+9V3naFa74Wl
+KOAbEiTSJsOTZLbmr1j0lovOlxJ4UddRVWMjCIfbgsUw+ZtoRvUqnO16pcZXrLCa
+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://unknown.site.com</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
new file mode 100644
index 00000000..54387e4d
--- /dev/null
+++ b/swamid-interfederations-2.0/identities.univ-jfc.fr-idp-prod.xml
@@ -0,0 +1,96 @@
+<?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>
+      <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="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>
+					      MIIEnjCCA4agAwIBAgIQKfC7PoBqgitD7hgMJJZhtzANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDEyMTUwMDAwMDBaFw0xNzEyMTQyMzU5NTlaMEAxITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSY2FicmVsLnVuaXYt
+amZjLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApTfvTrYBl56c
+iIbkgBbvhrgC1LViU8mt0cqFUEsumOqCnpM21XfZTeE60cK35tl00bU9rvAvOsS6
+gVEnTIW1JfjE4j+dyODlCETWExkbfEVpRlhzSDO1hClOobWOS9top0Z9LfpRaUk2
+Bf0Nnf0IWrvH+fM/N+LquRzVLTMBZl3pm5CiQM4TofMVNadgVR66E8HllM/kFnPB
+LSsJD9Fa/66QgIxeRsN7Yos2tTjMTbnwQ4sYa5Q/B12/5c3SG1ImcJWHOYe/+scZ
+tiNUuOXKXucZsj7nKEOmaAqupbOCey/dPxDi4F5/QsJR0O+KlY4cfIOFHJeIgcpx
+ZhFPxUpz0wIDAQABo4IBbjCCAWowHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GG
+KLD9tr0wHQYDVR0OBBYEFCKA92H/uYHKIR4GxXHdlujIJvc7MA4GA1UdDwEB/wQE
+AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+MC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNy
+bDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRy
+dXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2Nz
+cC51c2VydHJ1c3QuY29tMB0GA1UdEQQWMBSCEmNhYnJlbC51bml2LWpmYy5mcjAN
+BgkqhkiG9w0BAQsFAAOCAQEAdZc1KklhQc9qUvXfLL8pSRDf1YAr3TiazYRgs11d
+VT49T+XjywaEwt/EuO37kjgWEdDaUIixW+GbeOFmiOVL1SEzMfKFY8I3kOpvDObD
+3jsmc+bgInT2XR30NXpZqEZ/SR4E8Arhx1x88INL/vkZ8kc6fJ3Jd7JP90nTt9WV
+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>
+					      MIIEmjCCA4KgAwIBAgIRAJUDuJkaRvWHyWeev34/8hgwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMTExMjkwMDAwMDBaFw0xNDExMjgyMzU5NTlaMHIxCzAJBgNV
+BAYTAkZSMUYwRAYDVQQKEz1DRU5UUkUgVU5JVkVSU0lUQUlSRSBERSBGT1JNQVRJ
+T04gRVQgUkVDSEVSQ0hFIEpGIENIQU1QT0xMSU9OMRswGQYDVQQDExJjYWJyZWwu
+dW5pdi1qZmMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3d+Rm
+UDXoUgVRpi6/M8k3JLM+icOPc+m2rVaVzaJ1r1YUtOI9IbQx5WWAJBQiaaOqbZl1
+9dQNaPBgirUCYs6fzEmiN+68Ea+Hl+V9na60PrCtE7f/iNREMsPdr0hyxkxbO5Rq
+XEvTcS4iBFW03z5iaAyPCVRckVFMLQ2wKo6AchS9kAMrkMDVnpe4fbp/viRytHZ0
+8JAzN9xh/XGdIQomMk7XCPBxmvRjaKhTuCaHfhnpQ2WVpxDL4bh+pR6FNm7cyM5q
+RyivGSxzfZzL1UhDyM2mp1JsJPpbMMNIIR73BurbBProSyNbNg0L3W7Y5SqmoziN
+cLxkrPjM/ALj6+o5AgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+ays3V0fqkOO57TAdBgNVHQ4EFgQUPwIsj+FMgUkCQS2yepLOs8XFoTIwDgYDVR0P
+AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2g
+K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
+KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
+LnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISY2FicmVsLnVuaXYtamZjLmZyMA0GCSqG
+SIb3DQEBBQUAA4IBAQBELDfgRtQGFFnCqUo2VOmdlMXrb+9jTvBcv3Uf5cyv9JDk
+lC5y4qKcUpdofmaBvTJ89CX+vRVwmwdSnCs0SmY7MgopBQKSelC6ioPSdo9NpVLG
+8SlCQ0p/bynWt0jAdav2bvOVGtHSkC0xw4Pa+KNkhQxIr+Q4lFEL+lR8glB0MjpI
+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://unknown.site.com</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.istat.it-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml
new file mode 100644
index 00000000..bf73ca3a
--- /dev/null
+++ b/swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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">Italian National Institute of Statistics</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">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>
+MIIDLzCCAhegAwIBAgIUGtRU3zo/2OMlhNaUyGcCUcx93HowDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRaWRlbnRpdHkuaXN0YXQuaXQwHhcNMTEwMjI0MTEyMTIx
+WhcNMzEwMjI0MTEyMTIxWjAcMRowGAYDVQQDExFpZGVudGl0eS5pc3RhdC5pdDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMuRDh3nQ52K48KChGDuTuRN
+/DUGcOruszmQXShTktPdfLd5sw15vVKsW1Nenwyoda5c2NUkyE1JfIOBvmbntzg+
+coCAT5/QKsZymsBgRpOKCbzrXDK3oBO1ptkflLXb91M9lrNN06fhhiduJS4wmAUU
+hAhAV3xRurswE5DSah1I8NmwwbIN5Us4uDKxWoXEn6Z6Y2ugT/ZygbhvjCELu+Ht
+hHggctKBY5bqHbvgf72SWCl6tesRpE8/2HtCXgNeDDyLdVTGZoTa9Ni0vXVcTKuW
+0wlT0LC4Awo44FpBVzsOyGFIJ9S96MV3gzrC88Z4gFkYqeTsEQ7gk7kZuDryLOsC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRlbnRpdHkuaXN0YXQuaXSGKGh0dHBzOi8v
+aWRlbnRpdHkuaXN0YXQuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLcpT4bm
+slGxKZUp7NmUOpBoP4ORMA0GCSqGSIb3DQEBBQUAA4IBAQBLCO43R7UyOAycOGPk
+Xys3D3GVpLUw51Yr9BRLN16cJkqjRNwOPP1Cyro07i+DK9dp2OQqPDA5XMQy06Ws
+x1spOeR0hbkUTsrSTQVIcg9qoXnL6gDOALsCqB1GXnpp9yDK+HrJoYfRSFEU6GP9
+liKdSZe4QD78Y+MnMLjOtEwRp8fLy5zh0tpKBLDoln1GW+WhAtPCRdAWSr7dZhko
+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>
+MIIDLzCCAhegAwIBAgIUGtRU3zo/2OMlhNaUyGcCUcx93HowDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRaWRlbnRpdHkuaXN0YXQuaXQwHhcNMTEwMjI0MTEyMTIx
+WhcNMzEwMjI0MTEyMTIxWjAcMRowGAYDVQQDExFpZGVudGl0eS5pc3RhdC5pdDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMuRDh3nQ52K48KChGDuTuRN
+/DUGcOruszmQXShTktPdfLd5sw15vVKsW1Nenwyoda5c2NUkyE1JfIOBvmbntzg+
+coCAT5/QKsZymsBgRpOKCbzrXDK3oBO1ptkflLXb91M9lrNN06fhhiduJS4wmAUU
+hAhAV3xRurswE5DSah1I8NmwwbIN5Us4uDKxWoXEn6Z6Y2ugT/ZygbhvjCELu+Ht
+hHggctKBY5bqHbvgf72SWCl6tesRpE8/2HtCXgNeDDyLdVTGZoTa9Ni0vXVcTKuW
+0wlT0LC4Awo44FpBVzsOyGFIJ9S96MV3gzrC88Z4gFkYqeTsEQ7gk7kZuDryLOsC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRlbnRpdHkuaXN0YXQuaXSGKGh0dHBzOi8v
+aWRlbnRpdHkuaXN0YXQuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLcpT4bm
+slGxKZUp7NmUOpBoP4ORMA0GCSqGSIb3DQEBBQUAA4IBAQBLCO43R7UyOAycOGPk
+Xys3D3GVpLUw51Yr9BRLN16cJkqjRNwOPP1Cyro07i+DK9dp2OQqPDA5XMQy06Ws
+x1spOeR0hbkUTsrSTQVIcg9qoXnL6gDOALsCqB1GXnpp9yDK+HrJoYfRSFEU6GP9
+liKdSZe4QD78Y+MnMLjOtEwRp8fLy5zh0tpKBLDoln1GW+WhAtPCRdAWSr7dZhko
+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">Istituto Nazionale di Statistica</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">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.mdh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml
new file mode 100644
index 00000000..3a227ae9
--- /dev/null
+++ b/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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:Logo height="216" width="117">https://identity.mdh.se/img/logo-sv.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>mdh.se</mdui:DomainHint>
+        <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>
+MIIDKDCCAhCgAwIBAgIVAIPxTFqNFghYnsNGOQDHDvRnU53tMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTAeFw0wOTA5MDIxMzE5MDRa
+Fw0yOTA5MDIxMzE5MDRaMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBpGX8JJ+RvjMMMD3q/j01q58p8
+z0R9tuklMD5smW+Tz0JgiG3KDnynWvcYyg3s9DevNRUMmsQqzDBko771ecyhqkHy
+SoCkfVNJ9k7RaQmoaglSGZlR5N9lgcysHNA8qVqJYpUpsSFuQckr1dzS3RjngcTM
+ICcuBjy/JviV8fKzYzF0v7F9HW+BEuJXHH6lhqhDIuI4R4n7I9/lYYxJWvQZVelJ
+F6/Z+RnbqaSzViq1qcMe5AWcnZgC85i0KiIcnaKiImNRJbVrVUN+eniQSj9ROJyf
+uk7Ldhpg8gvqsaUVd2drDY43XymAu7XFVnBBX340JKgb7F8wxpvIK6Gh6ZMCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRlbnRpdHkubWRoLnNlhiZodHRwczovL2lkZW50
+aXR5Lm1kaC5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU/qdjANz6BbQi/0eQ
+PgsaI1I0V4MwDQYJKoZIhvcNAQEFBQADggEBAG3OEKV7S8aojN/D7UOqURiCRrjC
+Dk6wEnMLX6uIYAFCv6jc5QdkMWaaDBR0tgGhmgzRZOGnl9pvzT1AjMIhvMu2/luI
+b2oawOhycFG1rECJCpDi+gLDGhxzbQY/E9VIz+AcBAxglBFbDqqIynhFs+GZn+fv
+P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
+7UwSK+MqY42FI27aHfIMAN7ccEun9HViAHU9HT/tng0kSydoF9VOvTI657LX7vpb
+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>
+MIIDKDCCAhCgAwIBAgIVAIPxTFqNFghYnsNGOQDHDvRnU53tMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTAeFw0wOTA5MDIxMzE5MDRa
+Fw0yOTA5MDIxMzE5MDRaMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBpGX8JJ+RvjMMMD3q/j01q58p8
+z0R9tuklMD5smW+Tz0JgiG3KDnynWvcYyg3s9DevNRUMmsQqzDBko771ecyhqkHy
+SoCkfVNJ9k7RaQmoaglSGZlR5N9lgcysHNA8qVqJYpUpsSFuQckr1dzS3RjngcTM
+ICcuBjy/JviV8fKzYzF0v7F9HW+BEuJXHH6lhqhDIuI4R4n7I9/lYYxJWvQZVelJ
+F6/Z+RnbqaSzViq1qcMe5AWcnZgC85i0KiIcnaKiImNRJbVrVUN+eniQSj9ROJyf
+uk7Ldhpg8gvqsaUVd2drDY43XymAu7XFVnBBX340JKgb7F8wxpvIK6Gh6ZMCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRlbnRpdHkubWRoLnNlhiZodHRwczovL2lkZW50
+aXR5Lm1kaC5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU/qdjANz6BbQi/0eQ
+PgsaI1I0V4MwDQYJKoZIhvcNAQEFBQADggEBAG3OEKV7S8aojN/D7UOqURiCRrjC
+Dk6wEnMLX6uIYAFCv6jc5QdkMWaaDBR0tgGhmgzRZOGnl9pvzT1AjMIhvMu2/luI
+b2oawOhycFG1rECJCpDi+gLDGhxzbQY/E9VIz+AcBAxglBFbDqqIynhFs+GZn+fv
+P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
+7UwSK+MqY42FI27aHfIMAN7ccEun9HViAHU9HT/tng0kSydoF9VOvTI657LX7vpb
+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="technical">
+    <md:Company>Mälardalen University</md:Company>
+    <md:EmailAddress>peter.falck@mdh.se</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
new file mode 100644
index 00000000..106aecc6
--- /dev/null
+++ b/swamid-interfederations-2.0/identity.unamur.be-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-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>
+      <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>
+MIIDMzCCAhugAwIBAgIUOFEO17meQZ7yZbR00GFaaEZCBIUwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJlMB4XDTE0MTAwMTExMzAz
+MloXDTM0MTAwMTExMzAzMlowHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoBOrnhzyOHqWdf3eka1y
+4cQ9PU9DgvGVBKPkBVy8N3vNXrFQIgMbObDS1l9eYYuvyY+hHAPucMS0i1OdP2Aj
+Ev/UE4gx4z2hiXwQb/ne1cdwJ0hocacKwoj8U7VjOcVmb6jkj8iQ+cf4xVm8g4tH
+rdYJ44FWWzyTbhJqdsh7LlxLBl7OiXNib9Mdmgc0/yR21q4z6Gfzq9lAL8n0Qol2
+oa32RWvsOdbvUsfHGH+MzcmI7KENiz/ppbrgmKDqpfWX9RNNDzE4RIDqt4Vh40Is
+EjAuizxuaWGGuGE/aPxdUji6xUB18USEE7/yMm6PGfgsibwxBmFGBiUq8qrS7sH0
+CwIDAQABo2swaTAdBgNVHQ4EFgQUY7BxMDAhCKPAsUtkHiqjikltMpAwSAYDVR0R
+BEEwP4ISaWRlbnRpdHkudW5hbXVyLmJlhilodHRwczovL2lkZW50aXR5LnVuYW11
+ci5iZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAjoKO8E/Geoa1
+6W+nbLFir4Fm6k9SW4cJW3Wabnf5yC7M5Qf7CDPQOmt/dC/IwKHLfkMu/AfmbOEe
+8GmK3mrqWZEAU/R7vg/AbiX9ci0PGOeSg1Zg4TE1Gl+vDCx47gBsqNJk/j09EJ0E
+QQrqWCW9oHfWcjENvvErtwTKuYhGV/8BdQNDd9D+ji40xn2JVLhnTyeyCpVYAGFh
+Piz6aamOjjjdutjif20mGC2CWwQOF754FFmYl9Zy11PlcKtxmU8h3rMUO+L6u6jp
+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>
+MIIDMzCCAhugAwIBAgIUOFEO17meQZ7yZbR00GFaaEZCBIUwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJlMB4XDTE0MTAwMTExMzAz
+MloXDTM0MTAwMTExMzAzMlowHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoBOrnhzyOHqWdf3eka1y
+4cQ9PU9DgvGVBKPkBVy8N3vNXrFQIgMbObDS1l9eYYuvyY+hHAPucMS0i1OdP2Aj
+Ev/UE4gx4z2hiXwQb/ne1cdwJ0hocacKwoj8U7VjOcVmb6jkj8iQ+cf4xVm8g4tH
+rdYJ44FWWzyTbhJqdsh7LlxLBl7OiXNib9Mdmgc0/yR21q4z6Gfzq9lAL8n0Qol2
+oa32RWvsOdbvUsfHGH+MzcmI7KENiz/ppbrgmKDqpfWX9RNNDzE4RIDqt4Vh40Is
+EjAuizxuaWGGuGE/aPxdUji6xUB18USEE7/yMm6PGfgsibwxBmFGBiUq8qrS7sH0
+CwIDAQABo2swaTAdBgNVHQ4EFgQUY7BxMDAhCKPAsUtkHiqjikltMpAwSAYDVR0R
+BEEwP4ISaWRlbnRpdHkudW5hbXVyLmJlhilodHRwczovL2lkZW50aXR5LnVuYW11
+ci5iZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAjoKO8E/Geoa1
+6W+nbLFir4Fm6k9SW4cJW3Wabnf5yC7M5Qf7CDPQOmt/dC/IwKHLfkMu/AfmbOEe
+8GmK3mrqWZEAU/R7vg/AbiX9ci0PGOeSg1Zg4TE1Gl+vDCx47gBsqNJk/j09EJ0E
+QQrqWCW9oHfWcjENvvErtwTKuYhGV/8BdQNDd9D+ji40xn2JVLhnTyeyCpVYAGFh
+Piz6aamOjjjdutjif20mGC2CWwQOF754FFmYl9Zy11PlcKtxmU8h3rMUO+L6u6jp
+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">
+	UNamur
+	</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">
+	Universite de Namur
+	</md:OrganizationDisplayName>
+    <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>
diff --git a/swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml
new file mode 100644
index 00000000..00ffaa9b
--- /dev/null
+++ b/swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDLzCCAhegAwIBAgIUDWEaqSaZUTmDi7c3RlBaYiGftv0wDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRaWRlbnRpdHkudW5pZmUuaXQwHhcNMDkwNzI5MTEwNTIw
+WhcNMjkwNzI5MTEwNTIwWjAcMRowGAYDVQQDExFpZGVudGl0eS51bmlmZS5pdDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIuX3iSXtW169zLcTcysXr9e
+25aIejzGKV1IDrJBbJq2uKe4nZ3GGxlqtGRSJafP1RtemUbJ6LU0hxkHvsa6aCfT
+4UcRWEADvcDLa/KGih65D1GkY7oKA3ByAS7e2QgpoaEYy5U8Qb6vu7/+bTl6oKbe
+qrtGQmPwexue4zRjNmq3LOyTSsaQzF/Z9j5STbm2uiwMZ0vErhvCg8eX+Lmaq3Sh
+RCan/C8kcaXrTQlxb0BDcORmXnod8C4ga7Rg4JIdncNTFji32bF0mKWS2rmXBK+4
+R1GHOh7oExCsGk2fUN5435A0Umg065UxeeUdgKnIykPCjSmMx8WgMPk5KI0cxUUC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRlbnRpdHkudW5pZmUuaXSGKGh0dHBzOi8v
+aWRlbnRpdHkudW5pZmUuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCjBKR23
+A353XL6vQpwmLg5C301wMA0GCSqGSIb3DQEBBQUAA4IBAQB7g5t/5SuRdF+WPqnj
+IsmWerN+wALIsmFpq+AAqSSTA5a+9SXxczO/Ui6y+/zE714UiE0CCAeYmJztBDtA
+BwQx/dj8QgX80/++MIB+5obKRFRztpuwChGHAStxY4vNF9Lnc+urdi3hSMVn+rZS
+34ONTWpp+DkiXajfsNRaN4w1egn3cWFquIlQAHr21OcZCbDuCO6p7UVnkdM8unGV
+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>
+MIIDLzCCAhegAwIBAgIUDWEaqSaZUTmDi7c3RlBaYiGftv0wDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRaWRlbnRpdHkudW5pZmUuaXQwHhcNMDkwNzI5MTEwNTIw
+WhcNMjkwNzI5MTEwNTIwWjAcMRowGAYDVQQDExFpZGVudGl0eS51bmlmZS5pdDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIuX3iSXtW169zLcTcysXr9e
+25aIejzGKV1IDrJBbJq2uKe4nZ3GGxlqtGRSJafP1RtemUbJ6LU0hxkHvsa6aCfT
+4UcRWEADvcDLa/KGih65D1GkY7oKA3ByAS7e2QgpoaEYy5U8Qb6vu7/+bTl6oKbe
+qrtGQmPwexue4zRjNmq3LOyTSsaQzF/Z9j5STbm2uiwMZ0vErhvCg8eX+Lmaq3Sh
+RCan/C8kcaXrTQlxb0BDcORmXnod8C4ga7Rg4JIdncNTFji32bF0mKWS2rmXBK+4
+R1GHOh7oExCsGk2fUN5435A0Umg065UxeeUdgKnIykPCjSmMx8WgMPk5KI0cxUUC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRlbnRpdHkudW5pZmUuaXSGKGh0dHBzOi8v
+aWRlbnRpdHkudW5pZmUuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCjBKR23
+A353XL6vQpwmLg5C301wMA0GCSqGSIb3DQEBBQUAA4IBAQB7g5t/5SuRdF+WPqnj
+IsmWerN+wALIsmFpq+AAqSSTA5a+9SXxczO/Ui6y+/zE714UiE0CCAeYmJztBDtA
+BwQx/dj8QgX80/++MIB+5obKRFRztpuwChGHAStxY4vNF9Lnc+urdi3hSMVn+rZS
+34ONTWpp+DkiXajfsNRaN4w1egn3cWFquIlQAHr21OcZCbDuCO6p7UVnkdM8unGV
+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>
diff --git a/swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml b/swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml
new file mode 100644
index 00000000..7418c38d
--- /dev/null
+++ b/swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+    <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 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://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"/>
+      <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">Perun instance for Masaryk University</mdui:Description>
+        <mdui:Description xml:lang="cs">Instance Peruna pro Masarykovu universitu</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: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>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
+ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxGDAWBgNVBAMTD2lkbS5pY3MubXVu
+aS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALm+U00en5+mxTGj
+oF1vryCcv7o8RHQcSVZpeQlNiGq7FBSzcP0RZ33iX52JpVKJNCWIl2PIusZSdfSZ
+Ja6uJuhVor3LA7BmwqcK24SPI7yokqFy2CCSpgWZw91F+KVTg09GEX1x+ocVF/1H
+skSWnCcJlaKsI2yN2j5xfzdyNFo7XFoxucG24/u+qpSIjw9mS+wJM+TRQjZTehPu
+9ZIP6M7j5ao6bxUWS2dh9GaSszSQGGX+6KLM2qFlUqJ1x8hqLdpnRhxleTVSTAD5
+E9/BdL+Gxu/NW/SM3f/7RxllWqDoUaNV9PpM+1VTUjJaBUpVm55m5mV7k25Trj/W
+KAXvjg8CAwEAAaOCAWswggFnMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvhhiiw
+/ba9MB0GA1UdDgQWBBSLh7sZxQLN+1gVj1CcDggq4Ql1/DAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
+oC2gK4YpaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcmww
+bAYIKwYBBQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0cnVz
+dC5jb20vVEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3Au
+dXNlcnRydXN0LmNvbTAaBgNVHREEEzARgg9pZG0uaWNzLm11bmkuY3owDQYJKoZI
+hvcNAQELBQADggEBAIptaltbQyIAUiB9nlTHs0xlUa0aTxTwHyhWiHRqa5pbqJ8n
+h2qxi3aNXBM30qzftnXaZvQUyaqW3poFBd2Rw5RJ5dh++z9b20kXVnmN/IyBzGf4
+s4Q5EE0iIZw3KARUqSb0PG3gCtiYeV+SXsnehxvUvaYNNyR8mZ0zUUd+WcHWvazN
+8VFAm3TNxwz92EWGnNvx9p2hHcMbR0Cix4TpxP9cLUwu9m1+am1U+WJkhNMkFoP5
+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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idm.ics.muni.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idm.ics.muni.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idm.ics.muni.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idm.ics.muni.cz/Shibboleth.sso/SLO/Artifact"/>
+    <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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Perun instance for Masaryk University</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Identity and access management system for Masaryk 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" 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="o" Name="urn:oid:2.5.4.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="cn" Name="urn:oid:2.5.4.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:AttributeConsumingService>
+  </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>Slavek</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
new file mode 100644
index 00000000..c2af193d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEMMAoGA1UECxMDRFRJMQswCQYD
+VQQGEwJCUjERMA8GA1UEAxMIaWRwLWNhZmUwHhcNMTQwNDA5MTYyNzU1WhcNMTkw
+NDA4MTYyNzU1WjAuMQwwCgYDVQQLEwNEVEkxCzAJBgNVBAYTAkJSMREwDwYDVQQD
+EwhpZHAtY2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2QLiQp
+v/NepaRdzlGTeoyC//4t4vPsByuVLTF9BJ9zXfpgb70bFt5Ka4FXaYEafGC76n8H
+uCzk/nWrzEKuNMZMPgQbteCpvhrGm8RziPF7zelZl2Q4FDAORAOQwfw/GIyadsmY
+38BYCGQmuppiCAL5SUvGBHvEPyGwJnLBqnE/f1e66ZXfLvniYqRjKvU1VSsUUF5Y
+BrVE/LqUB6OA7uJEKTtp6uCx8XNUNYGML6hHR9joDZrQuK4wYOocjdWuWn0/1/uw
+hvb8sOYiTgAPap4UtTxTqVZ6XBRWmWVP9fTEjpSNEgeaWBvNpmJx+Ci9Hi5+F0zq
+GZMyVBZZAXsBBj0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAl6toGY7toL1HPVtj
+pjGi7ed76phnITf4cHJi6Ny99tsCK29pdkWKGQ4p1F8usGy8QoWCBBLTAo/LhZye
+/AzLnW+zUV9qioGw+guncG8/GCg8SM2FR2nwUt2BXsXUodHg2kl8S8I7NbXcw9p1
+oI8OT1fkM3RcJ5F4XBErp9PI9KK5zaLGYjDgCOm4m09GmIuPbzlIBlx77B8+WZXA
+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>
+      
+MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEMMAoGA1UECxMDRFRJMQswCQYD
+VQQGEwJCUjERMA8GA1UEAxMIaWRwLWNhZmUwHhcNMTQwNDA5MTYyNzU1WhcNMTkw
+NDA4MTYyNzU1WjAuMQwwCgYDVQQLEwNEVEkxCzAJBgNVBAYTAkJSMREwDwYDVQQD
+EwhpZHAtY2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2QLiQp
+v/NepaRdzlGTeoyC//4t4vPsByuVLTF9BJ9zXfpgb70bFt5Ka4FXaYEafGC76n8H
+uCzk/nWrzEKuNMZMPgQbteCpvhrGm8RziPF7zelZl2Q4FDAORAOQwfw/GIyadsmY
+38BYCGQmuppiCAL5SUvGBHvEPyGwJnLBqnE/f1e66ZXfLvniYqRjKvU1VSsUUF5Y
+BrVE/LqUB6OA7uJEKTtp6uCx8XNUNYGML6hHR9joDZrQuK4wYOocjdWuWn0/1/uw
+hvb8sOYiTgAPap4UtTxTqVZ6XBRWmWVP9fTEjpSNEgeaWBvNpmJx+Ci9Hi5+F0zq
+GZMyVBZZAXsBBj0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAl6toGY7toL1HPVtj
+pjGi7ed76phnITf4cHJi6Ny99tsCK29pdkWKGQ4p1F8usGy8QoWCBBLTAo/LhZye
+/AzLnW+zUV9qioGw+guncG8/GCg8SM2FR2nwUt2BXsXUodHg2kl8S8I7NbXcw9p1
+oI8OT1fkM3RcJ5F4XBErp9PI9KK5zaLGYjDgCOm4m09GmIuPbzlIBlx77B8+WZXA
+CX6Zy+sNmrpOzcg/UDotLp5yCOWlJQkcNH4U4gqCMiwbpys3zMLPjKcH+N2th9MB
+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>
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
new file mode 100644
index 00000000..238dbe28
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-cafe.unir.br-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxMTAvBgNVBAoUKFVOSVIgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0BgNVBAsULURUSSAt
+IERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqG
+SIb3DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMRIwEAYD
+VQQIFAlSb25kw7RuaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBpZHAtY2FmZS51
+bmlyLmJyMB4XDTE0MDgyMDEyMDgxOFoXDTE3MDgxOTEyMDgxOFowgdkxMTAvBgNV
+BAoUKFVOSVIgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0
+BgNVBAsULURUSSAtIERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHD
+p8OjbzEaMBgGCSqGSIb3DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRv
+IFZlbGhvMRIwEAYDVQQIFAlSb25kw7RuaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
+ExBpZHAtY2FmZS51bmlyLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAsm9YPz01gnftklbFm5tNLpQHVXbLIlku3xGMIxL+8HNJaFV30ZNme68r/Pq9
+Ja10EPKSogvdIY5TPI52OC5rEH7hGMpUKkogcv2Yhq2rIrjZaOf8fML5hyW0/DYm
+jaLiWrpXgmesepXu4TfwxiZ/aJTjXYQhO2LFkP+/ybj5ANuuFj6kk6z98x+zUn/X
+/xHPrS+sXz+NRusK/EMi2y7PJ1d0l2V4t4Zr/T1EQqQJOR1DvKmcKgZ84I6WPk9M
+o1o/m/OOyCuz1q1+TESJ9nuyAOK19Vch7Qh1lIt/kTrM2Ac/Gi9XAuhCLeDbUTxG
+sWdppd2oOgnVcbKNSzvuEuCD0QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB3QvGv
+7r93VG+qdmZFkw+6mtkJ6m9dEDmzVf4rzR1Pyra/CmLYQ1S31aVqNXf1IVr+egFV
+DWoxNX1BIHK9lZpcZugnl3i4FQ/fwl7RFwVrYri7cJx4XUL3pT+PVQk8XkarnJ6q
+WhISOtn2v/OKrrVgiwcNcUqdX9kn6YJK+PQWDE7y3lul+0L1SbJQGL8VkQ3zJnnD
+3zPFjycxg3Gu4KLvWlq7ZCkxsw7+DBjGXlXCs2JR188YRl6Oz+LKMkKIucnTQGB9
+/GOiJLIQ0IwVq5i5OTyUaEvXEiDopznRsqPTwbdgFFl9qS8Ilf+nCgmy/E+CBv93
+S/VP03ihbZgT9/Pt
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
+IERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqG
+SIb3DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMRIwEAYD
+VQQIFAlSb25kw7RuaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBpZHAtY2FmZS51
+bmlyLmJyMB4XDTE0MDgyMDEyMDgxOFoXDTE3MDgxOTEyMDgxOFowgdkxMTAvBgNV
+BAoUKFVOSVIgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0
+BgNVBAsULURUSSAtIERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHD
+p8OjbzEaMBgGCSqGSIb3DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRv
+IFZlbGhvMRIwEAYDVQQIFAlSb25kw7RuaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
+ExBpZHAtY2FmZS51bmlyLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAsm9YPz01gnftklbFm5tNLpQHVXbLIlku3xGMIxL+8HNJaFV30ZNme68r/Pq9
+Ja10EPKSogvdIY5TPI52OC5rEH7hGMpUKkogcv2Yhq2rIrjZaOf8fML5hyW0/DYm
+jaLiWrpXgmesepXu4TfwxiZ/aJTjXYQhO2LFkP+/ybj5ANuuFj6kk6z98x+zUn/X
+/xHPrS+sXz+NRusK/EMi2y7PJ1d0l2V4t4Zr/T1EQqQJOR1DvKmcKgZ84I6WPk9M
+o1o/m/OOyCuz1q1+TESJ9nuyAOK19Vch7Qh1lIt/kTrM2Ac/Gi9XAuhCLeDbUTxG
+sWdppd2oOgnVcbKNSzvuEuCD0QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB3QvGv
+7r93VG+qdmZFkw+6mtkJ6m9dEDmzVf4rzR1Pyra/CmLYQ1S31aVqNXf1IVr+egFV
+DWoxNX1BIHK9lZpcZugnl3i4FQ/fwl7RFwVrYri7cJx4XUL3pT+PVQk8XkarnJ6q
+WhISOtn2v/OKrrVgiwcNcUqdX9kn6YJK+PQWDE7y3lul+0L1SbJQGL8VkQ3zJnnD
+3zPFjycxg3Gu4KLvWlq7ZCkxsw7+DBjGXlXCs2JR188YRl6Oz+LKMkKIucnTQGB9
+/GOiJLIQ0IwVq5i5OTyUaEvXEiDopznRsqPTwbdgFFl9qS8Ilf+nCgmy/E+CBv93
+S/VP03ihbZgT9/Pt
+                  
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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-css.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml
new file mode 100644
index 00000000..899f3fdb
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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:Logo height="60" width="80" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
+        <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:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDPzCCAiegAwIBAgIUatdmXg8WrEt1In2rF4jLwoE2ExUwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5nYXJyLml0MB4XDTEzMTIwOTEz
+NDYyMVoXDTMzMTIwOTEzNDYyMVowIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5n
+YXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3VFhN4BK8bGv
+OpfsmnkMKK1K64/Ref079D7hERL/AnLWBH3xTR8cXdYmm0zqUIHL224b6WQAa1kx
+1jCrBseoyK/D16PwzmuKaZBtvnXq4hdEonm8jXT4mJnRJpkJtlsBzqxi5c0KdXiC
+ijcHBlgqLDR8wZOBJV1tIN8VyEPkiFtm7W1oabFSzJRBfWgQ40Ku4qvRmcSbcYke
+8DbcRQS1HULWC4Erxx6hR9I9epkWc2ubd4MiYH2HMlrV35IJR2AcoP753rJ+HpLb
+3kr3//8eOEaK0pD52RuRQbo7tYOwS0aINmnEmKrJt18udKmb45XN3Ntw0j+u0peV
+Latd8xQt6wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAtY3NzLmlyY2NzLmdhcnIu
+aXSGLGh0dHBzOi8vaWRwLWNzcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBT/nCGumeHDpDhV5xEzXsEzK3YdFDANBgkqhkiG9w0BAQUFAAOC
+AQEAQrLhSycAVaJvvN4rIhxlZhYMi24tJIG27nMqg5aCnUbwsH97g4fyRC/PJrAU
+yLsvni9innZWp9btFrpZUXSVZTvVB2Kk+Q670m7VKEkPkOyXaWI22M3OeLNQAHs6
+wshwq6xuRHQV9Al7Ksa3VRYO6xXOGa0L7anouGijzpatNQa7FXlHvriVrWI8MJAf
+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>
+MIIDPzCCAiegAwIBAgIUatdmXg8WrEt1In2rF4jLwoE2ExUwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5nYXJyLml0MB4XDTEzMTIwOTEz
+NDYyMVoXDTMzMTIwOTEzNDYyMVowIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5n
+YXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3VFhN4BK8bGv
+OpfsmnkMKK1K64/Ref079D7hERL/AnLWBH3xTR8cXdYmm0zqUIHL224b6WQAa1kx
+1jCrBseoyK/D16PwzmuKaZBtvnXq4hdEonm8jXT4mJnRJpkJtlsBzqxi5c0KdXiC
+ijcHBlgqLDR8wZOBJV1tIN8VyEPkiFtm7W1oabFSzJRBfWgQ40Ku4qvRmcSbcYke
+8DbcRQS1HULWC4Erxx6hR9I9epkWc2ubd4MiYH2HMlrV35IJR2AcoP753rJ+HpLb
+3kr3//8eOEaK0pD52RuRQbo7tYOwS0aINmnEmKrJt18udKmb45XN3Ntw0j+u0peV
+Latd8xQt6wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAtY3NzLmlyY2NzLmdhcnIu
+aXSGLGh0dHBzOi8vaWRwLWNzcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBT/nCGumeHDpDhV5xEzXsEzK3YdFDANBgkqhkiG9w0BAQUFAAOC
+AQEAQrLhSycAVaJvvN4rIhxlZhYMi24tJIG27nMqg5aCnUbwsH97g4fyRC/PJrAU
+yLsvni9innZWp9btFrpZUXSVZTvVB2Kk+Q670m7VKEkPkOyXaWI22M3OeLNQAHs6
+wshwq6xuRHQV9Al7Ksa3VRYO6xXOGa0L7anouGijzpatNQa7FXlHvriVrWI8MJAf
+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>
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
new file mode 100644
index 00000000..cf4e484d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-dev.bangor.ac.uk-shibboleth.xml
@@ -0,0 +1,108 @@
+<?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>
+      <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>
+						MIIDPDCCAiSgAwIBAgIVAKmysGQnotgkz47fU4wbfPvxaTf1MA0GCSqGSIb3DQEB
+						BQUAMB8xHTAbBgNVBAMTFGlkcC1kZXYuYmFuZ29yLmFjLnVrMB4XDTEzMDEwOTE2
+						MzY0NVoXDTMzMDEwOTE2MzY0NVowHzEdMBsGA1UEAxMUaWRwLWRldi5iYW5nb3Iu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCA3wF9jL1ckLqJ
+						8vWJ9FnW3DT/jytDdHTPcquK/N05Et3RQGxaP5ZQ4ToDej1q9x2cmyhdwnsMVSDJ
+						g7kuhbEyrLagh570FxBVPkEcDfho63As2C2a0WUH7d3aNOSMFGRsM+x+5+R1oItl
+						wcGWGjO40SN+n0POE0lB6CZvWwJXd1rG6xBAXUUMzdkfHrc7lAr4SuC30GXyk+3G
+						neGeDNcmOMbsjKhegJV3IC+BbisiZ2el7SM9pLsoRgIcmQN/Wn4mMsZGmXwhl2Da
+						lYrulj8U5+L33nzOnSvPZsj4GgtmzEYUzZmswYHgQJcpCQ2zigfwICQx5NHBwi2Q
+						nf7TcDjNAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcC1kZXYuYmFuZ29yLmFjLnVr
+						hitodHRwczovL2lkcC1kZXYuYmFuZ29yLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBRpMzDTSqUcqggU6NNbFaGjxVxKQzANBgkqhkiG9w0BAQUFAAOCAQEA
+						dKnHPvi+VdsbWai4TPQbjRGAoRtgrpSqH+nE0N1mqUGVTC/L8mBeHJEXPJgA7etu
+						l7USXan5zL3ZXG/+3fQ+QBU07l3oeatYoit1P1R1c5tJTxR+N5fIpQ12xy1amEWx
+						X5EPAaS/y+BXJhAtZnqJi7FqtkfcfHWIsju8GBekUSaeDWSmhO6Jd/9ehr7H6k5r
+						0msFJOQWAsi3+KyEtbmjuI8UadcqwBY/9+1Y4exr7G0bZRFJDqO7Yy6d53MhAjVA
+						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>
+						MIIDPDCCAiSgAwIBAgIVAKmysGQnotgkz47fU4wbfPvxaTf1MA0GCSqGSIb3DQEB
+						BQUAMB8xHTAbBgNVBAMTFGlkcC1kZXYuYmFuZ29yLmFjLnVrMB4XDTEzMDEwOTE2
+						MzY0NVoXDTMzMDEwOTE2MzY0NVowHzEdMBsGA1UEAxMUaWRwLWRldi5iYW5nb3Iu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCA3wF9jL1ckLqJ
+						8vWJ9FnW3DT/jytDdHTPcquK/N05Et3RQGxaP5ZQ4ToDej1q9x2cmyhdwnsMVSDJ
+						g7kuhbEyrLagh570FxBVPkEcDfho63As2C2a0WUH7d3aNOSMFGRsM+x+5+R1oItl
+						wcGWGjO40SN+n0POE0lB6CZvWwJXd1rG6xBAXUUMzdkfHrc7lAr4SuC30GXyk+3G
+						neGeDNcmOMbsjKhegJV3IC+BbisiZ2el7SM9pLsoRgIcmQN/Wn4mMsZGmXwhl2Da
+						lYrulj8U5+L33nzOnSvPZsj4GgtmzEYUzZmswYHgQJcpCQ2zigfwICQx5NHBwi2Q
+						nf7TcDjNAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcC1kZXYuYmFuZ29yLmFjLnVr
+						hitodHRwczovL2lkcC1kZXYuYmFuZ29yLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBRpMzDTSqUcqggU6NNbFaGjxVxKQzANBgkqhkiG9w0BAQUFAAOCAQEA
+						dKnHPvi+VdsbWai4TPQbjRGAoRtgrpSqH+nE0N1mqUGVTC/L8mBeHJEXPJgA7etu
+						l7USXan5zL3ZXG/+3fQ+QBU07l3oeatYoit1P1R1c5tJTxR+N5fIpQ12xy1amEWx
+						X5EPAaS/y+BXJhAtZnqJi7FqtkfcfHWIsju8GBekUSaeDWSmhO6Jd/9ehr7H6k5r
+						0msFJOQWAsi3+KyEtbmjuI8UadcqwBY/9+1Y4exr7G0bZRFJDqO7Yy6d53MhAjVA
+						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>
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
new file mode 100644
index 00000000..359e7458
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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:1.1:protocol urn:oasis:names:tc:SAML:2.0: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>
+						MIIDLDCCAhSgAwIBAgIVALNT+AdUt2+81m3rncPOX7CvBavdMA0GCSqGSIb3DQEB
+						BQUAMBsxGTAXBgNVBAMTEGlkcC1kZXYuY2YuYWMudWswHhcNMTEwNjEwMTYzNjE1
+						WhcNMzEwNjEwMTYzNjE1WjAbMRkwFwYDVQQDExBpZHAtZGV2LmNmLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHK/62C9csv4UEWcGy5lo97k
+						7zXUCDf1wW5k83sn9BzqG4YJoM9G9pefXU2AHFZtEhZjgxQgbOUdG9MdOHmeeuXr
+						8/izvK6BOyFmNFgBi/h2uwjI1T86WHMJG91IQFUTWbRlDm43zAoigsscOYDJ8+Fk
+						6KZWDAngo5Ip0NlwUcKGqjdZbHeWyuLITCwgqU1aQHEg2eLzT+eC2/c+sbTy6GqO
+						5wsTLZGNNSifEPo2JzMi9WvdyklXcHj1X5cVExixeQ9cgb6VeqS6NtKRgG7PvZZU
+						REdZZAQ3yMWZeqOoWyhOteUcnlZQo3yWytLXy7vsVpMZWG6dXw90XTVuLwObTQID
+						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAtZGV2LmNmLmFjLnVrhidodHRwczovL2lk
+						cC1kZXYuY2YuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMJ9mnoUnJdL
+						2PYWanl07bVy1yRbMA0GCSqGSIb3DQEBBQUAA4IBAQA0vIW7kIcy6RA+OkshiraI
+						9D8m8H3Q5ye4QgbqdiLAaMy2/pHjHKirdseOl+3XLyrzDelXtl/4DhQCHAbUPssS
+						pgZIVEk4aOVuzjbqKfUOW/Dny9cPYLTVcU/ybhGdMC1FwGikZ499qISPoyJ2zmnC
+						6WH5uvbdmmiBmbvipWBRu6/imITVjzH7hWoz5SMuSFzy68yn5C00t7L9dtI3DgXo
+						zCmMlR+TxITKeAh433Gv+ldwYr4/NRClZBPKtOg4EHun7G7FVjXfEjNYts5aUwfF
+						WlUNTYrQTmfEqypOCvR3sjkLbbv3H/li9NLbE0dCr2DkR0SaOp7mjFqiiXR7z8JT
+					</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: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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDLDCCAhSgAwIBAgIVALNT+AdUt2+81m3rncPOX7CvBavdMA0GCSqGSIb3DQEB
+						BQUAMBsxGTAXBgNVBAMTEGlkcC1kZXYuY2YuYWMudWswHhcNMTEwNjEwMTYzNjE1
+						WhcNMzEwNjEwMTYzNjE1WjAbMRkwFwYDVQQDExBpZHAtZGV2LmNmLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHK/62C9csv4UEWcGy5lo97k
+						7zXUCDf1wW5k83sn9BzqG4YJoM9G9pefXU2AHFZtEhZjgxQgbOUdG9MdOHmeeuXr
+						8/izvK6BOyFmNFgBi/h2uwjI1T86WHMJG91IQFUTWbRlDm43zAoigsscOYDJ8+Fk
+						6KZWDAngo5Ip0NlwUcKGqjdZbHeWyuLITCwgqU1aQHEg2eLzT+eC2/c+sbTy6GqO
+						5wsTLZGNNSifEPo2JzMi9WvdyklXcHj1X5cVExixeQ9cgb6VeqS6NtKRgG7PvZZU
+						REdZZAQ3yMWZeqOoWyhOteUcnlZQo3yWytLXy7vsVpMZWG6dXw90XTVuLwObTQID
+						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAtZGV2LmNmLmFjLnVrhidodHRwczovL2lk
+						cC1kZXYuY2YuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMJ9mnoUnJdL
+						2PYWanl07bVy1yRbMA0GCSqGSIb3DQEBBQUAA4IBAQA0vIW7kIcy6RA+OkshiraI
+						9D8m8H3Q5ye4QgbqdiLAaMy2/pHjHKirdseOl+3XLyrzDelXtl/4DhQCHAbUPssS
+						pgZIVEk4aOVuzjbqKfUOW/Dny9cPYLTVcU/ybhGdMC1FwGikZ499qISPoyJ2zmnC
+						6WH5uvbdmmiBmbvipWBRu6/imITVjzH7hWoz5SMuSFzy68yn5C00t7L9dtI3DgXo
+						zCmMlR+TxITKeAh433Gv+ldwYr4/NRClZBPKtOg4EHun7G7FVjXfEjNYts5aUwfF
+						WlUNTYrQTmfEqypOCvR3sjkLbbv3H/li9NLbE0dCr2DkR0SaOp7mjFqiiXR7z8JT
+					</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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md: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 - Dev)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/insrv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:smith@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:smith@cardiff.ac.uk</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
new file mode 100644
index 00000000..96d3daef
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-dev.sussex.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?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>
+      <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>
+						MIIDOzCCAiOgAwIBAgIUaXHTQJ0iHL7M96NNUnD8cG38agowDQYJKoZIhvcNAQEF
+						BQAwHzEdMBsGA1UEAxMUaWRwLWRldi5zdXNzZXguYWMudWswHhcNMTMwODAyMTMy
+						MjI3WhcNMzMwODAyMTMyMjI3WjAfMR0wGwYDVQQDExRpZHAtZGV2LnN1c3NleC5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIw2HMiV8nzFA8Af
+						OW2WvgKdr/rsNxXTNhMFNH8dFKnUlBkz7SHAg9ikrDOrJYsZ+19o0B6eUFzO9O9j
+						/weeCN6hSXp3Fm9PKrWx8atVR6mK3sBvN4UjwPy5SrArkvDeZddNYAiklIDo2VXg
+						Qt5C2/0uCfa7GnRwKYrN0Pr83V4w1XAOaY10PhV5au7q2kTtNJo1WZHHT6Kf4K5g
+						fEEYG9P+9M7C846vqEkow5K57cz+/LDBTKJXeuCRNdWydnfn6leDFtCh2ZXviAYs
+						Fhug70+RxVSsJ0eZx5G31y3Z8GB8UfWjWF+a1fQy6vrgK4XZc9QxLc6urOMdmDfL
+						NKzkbdECAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLWRldi5zdXNzZXguYWMudWuG
+						K2h0dHBzOi8vaWRwLWRldi5zdXNzZXguYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
+						VR0OBBYEFKuGMvjPXWBURM7ApWOBW81l8cfZMA0GCSqGSIb3DQEBBQUAA4IBAQAx
+						XWbyQnOLcIsVg77HRr+FBRmkIv11efMGAdGx8N5S3RJ1T52QquHuizTKO0pldfzx
+						uHPc1FoAW92dIdlaImZbss9BNFvdjQ+oDbjst32RpXmpBr703p4FbxTk30ceZhhd
+						HLTr8pd9Ti2k9XNI+cAaSjCfwcXiJ0BVDDhs+tD6aLmnFPZZbab6Rd01acxmXn/H
+						ac+9/iJP8c3w50IarnevAh7/3Jpfxgrv8MilBzFuDu1VqR1mRvQqaI86FLYkxhgF
+						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>
+						MIIDOzCCAiOgAwIBAgIUaXHTQJ0iHL7M96NNUnD8cG38agowDQYJKoZIhvcNAQEF
+						BQAwHzEdMBsGA1UEAxMUaWRwLWRldi5zdXNzZXguYWMudWswHhcNMTMwODAyMTMy
+						MjI3WhcNMzMwODAyMTMyMjI3WjAfMR0wGwYDVQQDExRpZHAtZGV2LnN1c3NleC5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIw2HMiV8nzFA8Af
+						OW2WvgKdr/rsNxXTNhMFNH8dFKnUlBkz7SHAg9ikrDOrJYsZ+19o0B6eUFzO9O9j
+						/weeCN6hSXp3Fm9PKrWx8atVR6mK3sBvN4UjwPy5SrArkvDeZddNYAiklIDo2VXg
+						Qt5C2/0uCfa7GnRwKYrN0Pr83V4w1XAOaY10PhV5au7q2kTtNJo1WZHHT6Kf4K5g
+						fEEYG9P+9M7C846vqEkow5K57cz+/LDBTKJXeuCRNdWydnfn6leDFtCh2ZXviAYs
+						Fhug70+RxVSsJ0eZx5G31y3Z8GB8UfWjWF+a1fQy6vrgK4XZc9QxLc6urOMdmDfL
+						NKzkbdECAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLWRldi5zdXNzZXguYWMudWuG
+						K2h0dHBzOi8vaWRwLWRldi5zdXNzZXguYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
+						VR0OBBYEFKuGMvjPXWBURM7ApWOBW81l8cfZMA0GCSqGSIb3DQEBBQUAA4IBAQAx
+						XWbyQnOLcIsVg77HRr+FBRmkIv11efMGAdGx8N5S3RJ1T52QquHuizTKO0pldfzx
+						uHPc1FoAW92dIdlaImZbss9BNFvdjQ+oDbjst32RpXmpBr703p4FbxTk30ceZhhd
+						HLTr8pd9Ti2k9XNI+cAaSjCfwcXiJ0BVDDhs+tD6aLmnFPZZbab6Rd01acxmXn/H
+						ac+9/iJP8c3w50IarnevAh7/3Jpfxgrv8MilBzFuDu1VqR1mRvQqaI86FLYkxhgF
+						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>
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
new file mode 100644
index 00000000..8ead76c9
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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:Logo height="16" width="16" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
+        <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:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDUzCCAjugAwIBAgIUP1k5hfSRuNvbFEuq697H3+caJKQwDQYJKoZIhvcNAQEF
+BQAwJTEjMCEGA1UEAxMaaWRwLWRnbm9jY2hpLmlyY2NzLmdhcnIuaXQwHhcNMTMx
+MTI4MTQ0NTI3WhcNMzMxMTI4MTQ0NTI3WjAlMSMwIQYDVQQDExppZHAtZGdub2Nj
+aGkuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AJcayGTp5Elhk5nXeuntBEg2r0Le/6nIsQG8FgkNf+qggXSHNVWxhFvw3EblGttY
+9jISmSjGdUwNpGknPPEXdZ3w/RO+czI3zZmMNUxIvF+RBOv45FQRd6JpMojAOBjZ
+blIJ9uxIZl9CTc7AytutChk/JS0uME0bZnCdIxitsMraRITSiUqZw9FDlghcbAPU
+66+EIqmAas0pNzHIgICsTQFpVpR7aOCrGDgLH8ZhnE895Bte5hdTbDwEBVFYZ4NE
+oMGUwgRhly0g9EAh04ercObE4NZLuF9XIrw6L5bUoOAn7AXCiIfGcUHukEt2NbSi
+zwOfrKyshMvwQeUu1QXdr2sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLWRnbm9j
+Y2hpLmlyY2NzLmdhcnIuaXSGMWh0dHBzOi8vaWRwLWRnbm9jY2hpLmlyY2NzLmdh
+cnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMfsRTXhI2SK/tSeRLeojBMD
+y034MA0GCSqGSIb3DQEBBQUAA4IBAQBZTmIO9IWCOi8wbPcBpgyZYhwn39CfeBJp
+qf4NhXa9ZO6IC+qMG3+dZGlg0FkqTkbArc7tTATUL0b7p1zWXsH8GgtyigKjzdKB
+6mKwtYErqp0gF4438G8XpXsolrjF/RyCrxj7aXDzIKktk2cXKVqF9xtMc5H1AAkq
+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>
+MIIDUzCCAjugAwIBAgIUP1k5hfSRuNvbFEuq697H3+caJKQwDQYJKoZIhvcNAQEF
+BQAwJTEjMCEGA1UEAxMaaWRwLWRnbm9jY2hpLmlyY2NzLmdhcnIuaXQwHhcNMTMx
+MTI4MTQ0NTI3WhcNMzMxMTI4MTQ0NTI3WjAlMSMwIQYDVQQDExppZHAtZGdub2Nj
+aGkuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AJcayGTp5Elhk5nXeuntBEg2r0Le/6nIsQG8FgkNf+qggXSHNVWxhFvw3EblGttY
+9jISmSjGdUwNpGknPPEXdZ3w/RO+czI3zZmMNUxIvF+RBOv45FQRd6JpMojAOBjZ
+blIJ9uxIZl9CTc7AytutChk/JS0uME0bZnCdIxitsMraRITSiUqZw9FDlghcbAPU
+66+EIqmAas0pNzHIgICsTQFpVpR7aOCrGDgLH8ZhnE895Bte5hdTbDwEBVFYZ4NE
+oMGUwgRhly0g9EAh04ercObE4NZLuF9XIrw6L5bUoOAn7AXCiIfGcUHukEt2NbSi
+zwOfrKyshMvwQeUu1QXdr2sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLWRnbm9j
+Y2hpLmlyY2NzLmdhcnIuaXSGMWh0dHBzOi8vaWRwLWRnbm9jY2hpLmlyY2NzLmdh
+cnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMfsRTXhI2SK/tSeRLeojBMD
+y034MA0GCSqGSIb3DQEBBQUAA4IBAQBZTmIO9IWCOi8wbPcBpgyZYhwn39CfeBJp
+qf4NhXa9ZO6IC+qMG3+dZGlg0FkqTkbArc7tTATUL0b7p1zWXsH8GgtyigKjzdKB
+6mKwtYErqp0gF4438G8XpXsolrjF/RyCrxj7aXDzIKktk2cXKVqF9xtMc5H1AAkq
+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>
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
new file mode 100644
index 00000000..79651d76
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-ensr.ens-rennes.fr-idp-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+      <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="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>
+					      MIIDRDCCAiygAwIBAgIVAMWqxLx7lYiNhlTPapEholL2ajx8MA0GCSqGSIb3DQEB
+BQUAMCExHzAdBgNVBAMTFmlkcC1lbnNyLmVucy1yZW5uZXMuZnIwHhcNMTQwMjI1
+MTgzNDE1WhcNMzQwMjI1MTgzNDE1WjAhMR8wHQYDVQQDExZpZHAtZW5zci5lbnMt
+cmVubmVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmDxunK9B
+VB2RZVJ2YdtrKMLZpQ+7U9dDBnjD2xkwKFyEswtX/U2OK0nALFkJCgK+RSeU2A6e
+kmHZIcYKN4giqcXt0UyAVdXDQP8Ovs6KgL6vdcLofuYthL5mvQeBHG3AtGLffpZp
+7Xg/RpjBtQSC/5R4/O9IMRPYPGD9ZJpQMxl1lBiVw36e+/9zwysyhjpGAIm96h1f
+KkZaYNsMT8Y+aHNmcvYXB/EPKj9iLtFxOYmD19DbIFSVSOrc3N81xtYZSg3w+K9M
+JvBT+jJ8Tr7tXaVoNAUL50qfTR9V8Otftlxlrm+btFQANxOwfmAa6NtLqChTuErG
+ZMZyvh7dvtDFDQIDAQABo3MwcTBQBgNVHREESTBHghZpZHAtZW5zci5lbnMtcmVu
+bmVzLmZyhi1odHRwczovL2lkcC1lbnNyLmVucy1yZW5uZXMuZnIvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFMWCwroMGof468uwDOVo9CmJtFCmMA0GCSqGSIb3DQEB
+BQUAA4IBAQBuJkugeq35RQ1eJVCFpQEF1cvz3HI2WNaYJVAzNKVHjQKLTgeEXTAw
+2n0U0wijhjNhLn0KU7RjF/YKq3byxsvmw2V/dkor6Uj/o24QRIS/rnGp0OOAm8md
+KuATxDlbfiUiLZ8P09LWfCj7kBofKAWpdSA3EqK3C1r1ABP3cfgy6bCEAKmImZ/g
+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://unknown.site.com</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
new file mode 100644
index 00000000..0576da95
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-etu.crous-grenoble.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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="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>
+					      MIIDTzCCAjegAwIBAgIUa/WpAhPdXKjK1Y6xsR36dWY2AtEwDQYJKoZIhvcNAQEF
+BQAwJDEiMCAGA1UEAxMZaWRwLWV0dS5jcm91cy1ncmVub2JsZS5mcjAeFw0xMjA5
+MDIwNzAzMDFaFw0zMjA5MDIwNzAzMDFaMCQxIjAgBgNVBAMTGWlkcC1ldHUuY3Jv
+dXMtZ3Jlbm9ibGUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCf
+gyZIiwrGg4ymD1H8U7fRJUPj2EFmjkDfkQxcUmHcp4awF20Mz3+305sfmdmnPuSl
+lJS28Z6Ex/z9YDeLjiJvJ8MHvcssj6sZUCils9Rda1U7P1YzvNTV4njkL78VulU+
+MFCxJ3/Binam+304Vlgi9gsgqvPLiWAtQwB6woPWgwUMgRTOQpUyXrx5X6TfL7M+
+7xxjOCBK/FquKuHPB1EzLEazZdhLnXKIhBTFHXDjjQJq8qCTmv9J1LTQfA5mEKYr
+qyf4qY3T4smCC1I/4PmdjtIVwQvpwdKAn6HuzlgB94EvwCdNqC6S8gUp/JRTPLwL
+wS2MbLjn17IIxcnNBW6bAgMBAAGjeTB3MFYGA1UdEQRPME2CGWlkcC1ldHUuY3Jv
+dXMtZ3Jlbm9ibGUuZnKGMGh0dHBzOi8vaWRwLWV0dS5jcm91cy1ncmVub2JsZS5m
+ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUWfgO9igdn2WDjh7y8cL/SHlyC1Aw
+DQYJKoZIhvcNAQEFBQADggEBAJwDc/Gpl87rxpPmFJ4dLpo+6Khq2NGaHnSnw05s
+HYQhqfO4Kl4XxSti4ELAayJp8elDh5ZWHNOOvC9Uxf1s0TXJP8P3xEcIlFsRPBp2
+L3NVouYwx9zlXJSppN0Bx9+zh2iwp2omJPmH0ebqyPSm2sfsD3xA/IYXpRtRC7Aq
+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://unknown.site.com</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-iccu.beniculturali.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml
new file mode 100644
index 00000000..3911b638
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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="16" width="16" xml:lang="en">https://idp-iccu.beniculturali.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-iccu.beniculturali.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-iccu.beniculturali.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-iccu.beniculturali.garr.it/idp/images/logoEnte-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>
+MIIDZTCCAk2gAwIBAgIUIBwjXMe2oAvEscwSyDPZ2w15rKAwDQYJKoZIhvcNAQEF
+BQAwKTEnMCUGA1UEAxMeaWRwLWljY3UuYmVuaWN1bHR1cmFsaS5nYXJyLml0MB4X
+DTE0MDMzMTE0MDMyMloXDTM0MDMzMTE0MDMyMlowKTEnMCUGA1UEAxMeaWRwLWlj
+Y3UuYmVuaWN1bHR1cmFsaS5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA0hRtV5cbO/QFVeesgFrHkXERWyEgi0kWbzUkN28vJcQ4pBZE2vhn
+ev+TswjSjxAA6LgknhU8OrIMT6kjCPaxWiFrp/4WWQSy5JJTFI2uxUEVy9obZn5w
+mpGfWipEMyjwRGo0Bi3jywdRdviVPG7noRUA/BSvk2GX/6gNuEU1oZ++paCtf+nz
+qW1lVLWgOMEx4otPOkh+gusmuE/VijvzLfVnoddbQCnG8WUiYdy1S6IKqHEgC3uv
+FPmXKGPO5L91fhKqIdgBt4sTyV5YLsQ2G5RRGZX5FthUixjGJeVO5c0SZHC0uGvH
+0QXhBWDUTfyHj8Kzlxd3m4q+4aLw+OKBkQIDAQABo4GEMIGBMGAGA1UdEQRZMFeC
+HmlkcC1pY2N1LmJlbmljdWx0dXJhbGkuZ2Fyci5pdIY1aHR0cHM6Ly9pZHAtaWNj
+dS5iZW5pY3VsdHVyYWxpLmdhcnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYE
+FNoX/Ke7X3A11sdLTRKRSc0fjdoDMA0GCSqGSIb3DQEBBQUAA4IBAQCyyso8o1SP
+eoywZJwORU95X4iUXHFlHN+GV1EBMHbrbMSzQeQemNUaWcqTQ5N1j3RCE/1RE/op
+4JrLgKGgjCCxxN72bKw/6INzMT6qp5gQ8jMPxVONAxLqyFt86w/XkiJ83pb0VKmC
+pUVSCkv9vwCDd0O4ztRogxZ6enT9oEBBreD5UoRAi1yaVV1BAbR15A9qe2ryQDeA
+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>
+MIIDZTCCAk2gAwIBAgIUIBwjXMe2oAvEscwSyDPZ2w15rKAwDQYJKoZIhvcNAQEF
+BQAwKTEnMCUGA1UEAxMeaWRwLWljY3UuYmVuaWN1bHR1cmFsaS5nYXJyLml0MB4X
+DTE0MDMzMTE0MDMyMloXDTM0MDMzMTE0MDMyMlowKTEnMCUGA1UEAxMeaWRwLWlj
+Y3UuYmVuaWN1bHR1cmFsaS5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA0hRtV5cbO/QFVeesgFrHkXERWyEgi0kWbzUkN28vJcQ4pBZE2vhn
+ev+TswjSjxAA6LgknhU8OrIMT6kjCPaxWiFrp/4WWQSy5JJTFI2uxUEVy9obZn5w
+mpGfWipEMyjwRGo0Bi3jywdRdviVPG7noRUA/BSvk2GX/6gNuEU1oZ++paCtf+nz
+qW1lVLWgOMEx4otPOkh+gusmuE/VijvzLfVnoddbQCnG8WUiYdy1S6IKqHEgC3uv
+FPmXKGPO5L91fhKqIdgBt4sTyV5YLsQ2G5RRGZX5FthUixjGJeVO5c0SZHC0uGvH
+0QXhBWDUTfyHj8Kzlxd3m4q+4aLw+OKBkQIDAQABo4GEMIGBMGAGA1UdEQRZMFeC
+HmlkcC1pY2N1LmJlbmljdWx0dXJhbGkuZ2Fyci5pdIY1aHR0cHM6Ly9pZHAtaWNj
+dS5iZW5pY3VsdHVyYWxpLmdhcnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYE
+FNoX/Ke7X3A11sdLTRKRSc0fjdoDMA0GCSqGSIb3DQEBBQUAA4IBAQCyyso8o1SP
+eoywZJwORU95X4iUXHFlHN+GV1EBMHbrbMSzQeQemNUaWcqTQ5N1j3RCE/1RE/op
+4JrLgKGgjCCxxN72bKw/6INzMT6qp5gQ8jMPxVONAxLqyFt86w/XkiJ83pb0VKmC
+pUVSCkv9vwCDd0O4ztRogxZ6enT9oEBBreD5UoRAi1yaVV1BAbR15A9qe2ryQDeA
+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>
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
new file mode 100644
index 00000000..d3c5b997
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-iov.irccs.garr.it-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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/logoEnte-16x16_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-iov.irccs.garr.it/idp/images/logoEnte-16x16_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-iov.irccs.garr.it/idp/images/logoEnte-80x60_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-iov.irccs.garr.it/idp/images/logoEnte-80x60_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>
+MIIDQDCCAiigAwIBAgIVAKZ6hm3VBBJOouu37feeqiHLQhlAMA0GCSqGSIb3DQEB
+BQUAMCAxHjAcBgNVBAMTFWlkcC1pb3YuaXJjY3MuZ2Fyci5pdDAeFw0xMzA3MjQx
+MzIzMzNaFw0zMzA3MjQxMzIzMzNaMCAxHjAcBgNVBAMTFWlkcC1pb3YuaXJjY3Mu
+Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1xUKxiZIEL
+P35mXSO10mng2aL/TVZJAj9Z3NfTq7SrfdfFnEWX/VT6or/p9s4RgUYOZosRfY98
+H8IpOuDfpiUWv0bQRUe+pjk6IPBTreQf6GwwqeojmpG2BLsllq8vvb0am0yl/rn6
+Uv9yCfsFAtIm3cmhHkS0AI8mOcsh+0BVT794pDz70W+o3DdiNF0Dp+VINpXXSUoE
+F72QcC9SkOVryiGjErJL97YzHGXRZmY1Rqqjf/jQFJovxvBh9ATBOF90ilHHKeR6
+y6Ey4vrXgez/WDWsHm0lS0S6LzuUf0keT3yoeFQgnCW/PTUqw/jv4/v1v+e2yBUz
+ugZCI9kqhqMCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLWlvdi5pcmNjcy5nYXJy
+Lml0hixodHRwczovL2lkcC1pb3YuaXJjY3MuZ2Fyci5pdC9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQU2lu3OlDrvKjMBNWa0xF78Dlx4TgwDQYJKoZIhvcNAQEFBQAD
+ggEBAFIYXX2LtDHTX+yX8plAqqgBuud3FGUa3id/jsnQ8ODoHRT31tbsfLkvXYjU
+H4JJaNVP563A0sEnPTzunIStxDwp8dAylqWNNspGRtN/a5YUx+psjp/05ishMwKE
+aIUFfOUa5DvEyGOLXp5jaSvcgUEMKWc8naSQ6JA0W9gQeaK+knz3ayK6TSzLFTAP
+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>
+MIIDQDCCAiigAwIBAgIVAKZ6hm3VBBJOouu37feeqiHLQhlAMA0GCSqGSIb3DQEB
+BQUAMCAxHjAcBgNVBAMTFWlkcC1pb3YuaXJjY3MuZ2Fyci5pdDAeFw0xMzA3MjQx
+MzIzMzNaFw0zMzA3MjQxMzIzMzNaMCAxHjAcBgNVBAMTFWlkcC1pb3YuaXJjY3Mu
+Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1xUKxiZIEL
+P35mXSO10mng2aL/TVZJAj9Z3NfTq7SrfdfFnEWX/VT6or/p9s4RgUYOZosRfY98
+H8IpOuDfpiUWv0bQRUe+pjk6IPBTreQf6GwwqeojmpG2BLsllq8vvb0am0yl/rn6
+Uv9yCfsFAtIm3cmhHkS0AI8mOcsh+0BVT794pDz70W+o3DdiNF0Dp+VINpXXSUoE
+F72QcC9SkOVryiGjErJL97YzHGXRZmY1Rqqjf/jQFJovxvBh9ATBOF90ilHHKeR6
+y6Ey4vrXgez/WDWsHm0lS0S6LzuUf0keT3yoeFQgnCW/PTUqw/jv4/v1v+e2yBUz
+ugZCI9kqhqMCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLWlvdi5pcmNjcy5nYXJy
+Lml0hixodHRwczovL2lkcC1pb3YuaXJjY3MuZ2Fyci5pdC9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQU2lu3OlDrvKjMBNWa0xF78Dlx4TgwDQYJKoZIhvcNAQEFBQAD
+ggEBAFIYXX2LtDHTX+yX8plAqqgBuud3FGUa3id/jsnQ8ODoHRT31tbsfLkvXYjU
+H4JJaNVP563A0sEnPTzunIStxDwp8dAylqWNNspGRtN/a5YUx+psjp/05ishMwKE
+aIUFfOUa5DvEyGOLXp5jaSvcgUEMKWc8naSQ6JA0W9gQeaK+knz3ayK6TSzLFTAP
+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>
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
new file mode 100644
index 00000000..5e2e2341
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-oasi.irccs.garr.it-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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="16" width="16" xml:lang="en">https://idp-oasi.irccs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-oasi.irccs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-oasi.irccs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-oasi.irccs.garr.it/idp/images/logoEnte-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>
+MIIDRDCCAiygAwIBAgIVAItYUuNAsLYinqdB4KXgk7MQhAUoMA0GCSqGSIb3DQEB
+BQUAMCExHzAdBgNVBAMTFmlkcC1vYXNpLmlyY2NzLmdhcnIuaXQwHhcNMTQwNDA5
+MTQxMDI0WhcNMzQwNDA5MTQxMDI0WjAhMR8wHQYDVQQDExZpZHAtb2FzaS5pcmNj
+cy5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHli0IW5
+P2W6uTNhHtrV8Ovst07uI53ND6aPqY3cGdh7yE3o+LHZ/EUorhQV+VqvdF6Xc9ph
+H3y79BvN95CBuWORPETP4ykQI0oj7+X4h2bCkROtLb2/Uqvd0ezdsky/ib9KlPIB
+9ITaXYzvQFQhb2SL6k0IqFgK/V5F5TtcpbwcqdOze7sI6DFFRv5ILnHmoi1/zzig
+PJ3LbbGtmmDyScshtdmIEd576NJ2ZBVFKp3bNsJLlHU2QsEZ7CdhEl2pGX5pT5F9
+kwv7bpsjHfy8c/4Kd/MGQdNu0Ed+GH0mkwaUI1bM4ue6nle9RK+WpgRBafe1ateR
+WESnoVCkdRziZwIDAQABo3MwcTBQBgNVHREESTBHghZpZHAtb2FzaS5pcmNjcy5n
+YXJyLml0hi1odHRwczovL2lkcC1vYXNpLmlyY2NzLmdhcnIuaXQvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFG95nc5uYtIKO3eNZgvDoTbETHipMA0GCSqGSIb3DQEB
+BQUAA4IBAQB67cYPYRgCpIyYlTtnkX/2+85GueTDpk3dI048t8/nyyNugq/W8B4o
+SHjHtI9H1l7lTWtDFejySri3uBzL5Qe1xq6RkcxCuLwcNKPJAlTFadl3PTVDqD/s
+/EVEOXzkt5VTd6RT8h5ILl388vaImuaYxv3vBhYBJ7xAIfNznIiCSkpXsuFOswHn
+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>
+MIIDRDCCAiygAwIBAgIVAItYUuNAsLYinqdB4KXgk7MQhAUoMA0GCSqGSIb3DQEB
+BQUAMCExHzAdBgNVBAMTFmlkcC1vYXNpLmlyY2NzLmdhcnIuaXQwHhcNMTQwNDA5
+MTQxMDI0WhcNMzQwNDA5MTQxMDI0WjAhMR8wHQYDVQQDExZpZHAtb2FzaS5pcmNj
+cy5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHli0IW5
+P2W6uTNhHtrV8Ovst07uI53ND6aPqY3cGdh7yE3o+LHZ/EUorhQV+VqvdF6Xc9ph
+H3y79BvN95CBuWORPETP4ykQI0oj7+X4h2bCkROtLb2/Uqvd0ezdsky/ib9KlPIB
+9ITaXYzvQFQhb2SL6k0IqFgK/V5F5TtcpbwcqdOze7sI6DFFRv5ILnHmoi1/zzig
+PJ3LbbGtmmDyScshtdmIEd576NJ2ZBVFKp3bNsJLlHU2QsEZ7CdhEl2pGX5pT5F9
+kwv7bpsjHfy8c/4Kd/MGQdNu0Ed+GH0mkwaUI1bM4ue6nle9RK+WpgRBafe1ateR
+WESnoVCkdRziZwIDAQABo3MwcTBQBgNVHREESTBHghZpZHAtb2FzaS5pcmNjcy5n
+YXJyLml0hi1odHRwczovL2lkcC1vYXNpLmlyY2NzLmdhcnIuaXQvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFG95nc5uYtIKO3eNZgvDoTbETHipMA0GCSqGSIb3DQEB
+BQUAA4IBAQB67cYPYRgCpIyYlTtnkX/2+85GueTDpk3dI048t8/nyyNugq/W8B4o
+SHjHtI9H1l7lTWtDFejySri3uBzL5Qe1xq6RkcxCuLwcNKPJAlTFadl3PTVDqD/s
+/EVEOXzkt5VTd6RT8h5ILl388vaImuaYxv3vBhYBJ7xAIfNznIiCSkpXsuFOswHn
+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>
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
new file mode 100644
index 00000000..7add6a17
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,131 @@
+<?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>
+      <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>
+						MIIErDCCA5SgAwIBAgIRAOYsRgGmDwZDq4ktIsUqyQQwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzAxMTAwMDAwMDBaFw0xNjAxMTAyMzU5NTlaMHgxCzAJBgNV
+						BAYTAkdCMQ4wDAYDVQQIEwVXYWxlczEbMBkGA1UEChMSQ2FyZGlmZiBVbml2ZXJz
+						aXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEdMBsGA1UEAxMUaWRw
+						LXByZXByb2QuY2YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDQK7+T3U6Nj6Vc3XKjyiY1fzXA8j1vN91RbPV96DJGnr0vQnls/S5qqY5U8VJi
+						+qzS61+V8TqcpjGUViPYsRnlXISGHnQ7KWccZB2f9lApnJsMhNH6BxCzOYwcLbJw
+						sLbwVoJ11Wxv+O8n3dsO5vr4QSHkXen36WbS1YuVQI9rCri0lzdriB5oy+8J7aQq
+						Gh0azuz7iBc+yFA5RROl7g0cPPXwGpo3p3beWgiVERVdO9Kz5z6sTN306TkT/RKL
+						B5mqHnEN/1GNh8BLJcLPJcYt5CkxJLk+YMiNHs7ssv9QLk7mRzq2OAuQFtbMOlyL
+						TzFBk3EVKcEHYQlWDaSOlQxfAgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNo
+						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUVcZWoy8Sj9k5JJOCpW7IY/XjKYIw
+						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIC
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC1wcmVw
+						cm9kLmNmLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBttEXXeJl3ORiixGzvb3bk
+						B1I4hjBX8lQ+U/W7AytyWOsvF8Qzs7mz6an5bakjinYkl5dIRm4eUzTt2KkS8N4a
+						J7dkThSzTAotQ8QgzsrakajH9twHMcccO0Ol5bt/J6dTJ4LhNMc/ULjcApiRjgl/
+						8Fh6kwPdGEkRjN7q3xzcJuKJPbfPOVq5HVINafV65BR+r41DlJ05Cll7WxZZ4+zy
+						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>
+						MIIErDCCA5SgAwIBAgIRAOYsRgGmDwZDq4ktIsUqyQQwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzAxMTAwMDAwMDBaFw0xNjAxMTAyMzU5NTlaMHgxCzAJBgNV
+						BAYTAkdCMQ4wDAYDVQQIEwVXYWxlczEbMBkGA1UEChMSQ2FyZGlmZiBVbml2ZXJz
+						aXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEdMBsGA1UEAxMUaWRw
+						LXByZXByb2QuY2YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDQK7+T3U6Nj6Vc3XKjyiY1fzXA8j1vN91RbPV96DJGnr0vQnls/S5qqY5U8VJi
+						+qzS61+V8TqcpjGUViPYsRnlXISGHnQ7KWccZB2f9lApnJsMhNH6BxCzOYwcLbJw
+						sLbwVoJ11Wxv+O8n3dsO5vr4QSHkXen36WbS1YuVQI9rCri0lzdriB5oy+8J7aQq
+						Gh0azuz7iBc+yFA5RROl7g0cPPXwGpo3p3beWgiVERVdO9Kz5z6sTN306TkT/RKL
+						B5mqHnEN/1GNh8BLJcLPJcYt5CkxJLk+YMiNHs7ssv9QLk7mRzq2OAuQFtbMOlyL
+						TzFBk3EVKcEHYQlWDaSOlQxfAgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNo
+						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUVcZWoy8Sj9k5JJOCpW7IY/XjKYIw
+						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIC
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC1wcmVw
+						cm9kLmNmLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBttEXXeJl3ORiixGzvb3bk
+						B1I4hjBX8lQ+U/W7AytyWOsvF8Qzs7mz6an5bakjinYkl5dIRm4eUzTt2KkS8N4a
+						J7dkThSzTAotQ8QgzsrakajH9twHMcccO0Ol5bt/J6dTJ4LhNMc/ULjcApiRjgl/
+						8Fh6kwPdGEkRjN7q3xzcJuKJPbfPOVq5HVINafV65BR+r41DlJ05Cll7WxZZ4+zy
+						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>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:smith@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:smith@cardiff.ac.uk</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
new file mode 100644
index 00000000..d542f56e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-sicilia.izs.garr.it-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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="16" width="16" xml:lang="en">https://idp-sicilia.izs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-sicilia.izs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-sicilia.izs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-sicilia.izs.garr.it/idp/images/logoEnte-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>
+MIIDSDCCAjCgAwIBAgIVAPEWcrJjf1McdVn5rw3nQ6Gim4w8MA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMTF2lkcC1zaWNpbGlhLml6cy5nYXJyLml0MB4XDTE0MDIw
+NTE2MDMyM1oXDTM0MDIwNTE2MDMyM1owIjEgMB4GA1UEAxMXaWRwLXNpY2lsaWEu
+aXpzLmdhcnIuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCR9Z1x
+JehS/JqknbxipZrecsFTPiFxJGZ5dAXv2zhWd8Qfz8QICRird41HMbm7KJlXYcrM
+P2t/mDZppK0RK1rQFk22Jl4ao/yTH9MDMZbQk6PVjv7xFwTvH8xUYa23rjAfQwxE
+7Q50pZ9SAkMP1kcMeVO7stnHxto3gs0aZOAq9FeeX+oYzcMkplhlz/eejVeeCUPM
+EMgt4cE43lvz1FHzyYa0njwgQpPGZCOqsKmTdCOaYMUK6iiKrY3YwAsdya1sWLW0
+4SWr9Ag5r6tZ+pGJ7Yz2cCumzdvOQbQDjqBrQC26MYib+uRqG4SrpukB/AsyVoTZ
+l/bw/Wedcd4QRG53AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC1zaWNpbGlhLml6
+cy5nYXJyLml0hi5odHRwczovL2lkcC1zaWNpbGlhLml6cy5nYXJyLml0L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTM1pPjW1tY7OE5cQFT6Dhr7DPhJjANBgkqhkiG
+9w0BAQUFAAOCAQEAPElPerHGkqU6Gla03PS5WccIUazEgyiG3bhQTl1iGBEeo0Lx
+Zc9R7E5N+VX5UKIe2kkkAYXGdXBhgR8kLptTlbiS7ZdMm4g+iSnc4nrNw3BnXHog
+ConqGhfg/9loGA83A69/axkSZIyaKBCIMq+lhBcuSJ0ug26WSDU4ujh3rfabFpyg
+7EOla/1MHSnxaxtglWwyk2EsCcqRKeaZvqeC7zDICxjP510OHp9SksmAMMK7fopr
+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>
+MIIDSDCCAjCgAwIBAgIVAPEWcrJjf1McdVn5rw3nQ6Gim4w8MA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMTF2lkcC1zaWNpbGlhLml6cy5nYXJyLml0MB4XDTE0MDIw
+NTE2MDMyM1oXDTM0MDIwNTE2MDMyM1owIjEgMB4GA1UEAxMXaWRwLXNpY2lsaWEu
+aXpzLmdhcnIuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCR9Z1x
+JehS/JqknbxipZrecsFTPiFxJGZ5dAXv2zhWd8Qfz8QICRird41HMbm7KJlXYcrM
+P2t/mDZppK0RK1rQFk22Jl4ao/yTH9MDMZbQk6PVjv7xFwTvH8xUYa23rjAfQwxE
+7Q50pZ9SAkMP1kcMeVO7stnHxto3gs0aZOAq9FeeX+oYzcMkplhlz/eejVeeCUPM
+EMgt4cE43lvz1FHzyYa0njwgQpPGZCOqsKmTdCOaYMUK6iiKrY3YwAsdya1sWLW0
+4SWr9Ag5r6tZ+pGJ7Yz2cCumzdvOQbQDjqBrQC26MYib+uRqG4SrpukB/AsyVoTZ
+l/bw/Wedcd4QRG53AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC1zaWNpbGlhLml6
+cy5nYXJyLml0hi5odHRwczovL2lkcC1zaWNpbGlhLml6cy5nYXJyLml0L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTM1pPjW1tY7OE5cQFT6Dhr7DPhJjANBgkqhkiG
+9w0BAQUFAAOCAQEAPElPerHGkqU6Gla03PS5WccIUazEgyiG3bhQTl1iGBEeo0Lx
+Zc9R7E5N+VX5UKIe2kkkAYXGdXBhgR8kLptTlbiS7ZdMm4g+iSnc4nrNw3BnXHog
+ConqGhfg/9loGA83A69/axkSZIyaKBCIMq+lhBcuSJ0ug26WSDU4ujh3rfabFpyg
+7EOla/1MHSnxaxtglWwyk2EsCcqRKeaZvqeC7zDICxjP510OHp9SksmAMMK7fopr
+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/index.php/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
new file mode 100644
index 00000000..8a6aac61
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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">SSBAR - Soprintendenza Archeologica di Roma</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Soprintendenza Speciale per i Beni Archeologici di Roma</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti della Soprintendenza Speciale per i Beni Archeologici di Roma</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="16" width="16" xml:lang="en">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-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>
+MIIDajCCAlKgAwIBAgIVAK1w02d7b+IBhciTHgzqFmh3HoqaMA0GCSqGSIb3DQEB
+BQUAMCoxKDAmBgNVBAMTH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXQw
+HhcNMTQwNTMwMDkwNjUxWhcNMzQwNTMwMDkwNjUxWjAqMSgwJgYDVQQDEx9pZHAt
+c3NiYXIuYmVuaWN1bHR1cmFsaS5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAtUyDEbuWYgBDLthfID5RiAaqAVV+VVSwK9JsbPyA0WEQG4mU
+wTwk9baImykOzOksmIgWY1XgBOy8jtI/fJ/9VBpz71paCkEjMQH7u6tHGuAVx6ZC
+QcWsSu1Iemktd2K8P+gWNUSW32GwRHOe8IrNVsuAQV0BnDvLKFnOyIaCSxJe1aCA
+mlobazivS7xvZ4fIKScfhmxX2vMcAogy6SlVrk5Nbz1g4ptLSMe2H6eP7pjp9Dw2
+JVCraHiCPlDUfLqKNANYLIcv03k8cY89NT0rEBS8ILawQCT5wdAj+toLOk7Dg9S9
+fc++QHWOnlI9eU6WBNIHnDxer2xep24CE7vHpwIDAQABo4GGMIGDMGIGA1UdEQRb
+MFmCH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXSGNmh0dHBzOi8vaWRw
+LXNzYmFyLmJlbmljdWx0dXJhbGkuZ2Fyci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNV
+HQ4EFgQU5OBUAd7iE3QPu87pd4OJ35n3xDwwDQYJKoZIhvcNAQEFBQADggEBAEtE
+EPZSrzpFbPHz65DWhxm6+FXDuRKYG9jwTabcikn4y19ykhauySmYUYfDE91vmKA/
+cJr4u720j9qvmZ/Z3pO6w8vD+SKrUHG5ez8m4ArGK35sYEEMA1JrW8oV6rcMk46x
+nL/TyhPinDLChZjlYEt5i4m2KlCipHc302KnbtLyjm8HsTAVkMxTibNCQHzI0m0B
+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>
+MIIDajCCAlKgAwIBAgIVAK1w02d7b+IBhciTHgzqFmh3HoqaMA0GCSqGSIb3DQEB
+BQUAMCoxKDAmBgNVBAMTH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXQw
+HhcNMTQwNTMwMDkwNjUxWhcNMzQwNTMwMDkwNjUxWjAqMSgwJgYDVQQDEx9pZHAt
+c3NiYXIuYmVuaWN1bHR1cmFsaS5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAtUyDEbuWYgBDLthfID5RiAaqAVV+VVSwK9JsbPyA0WEQG4mU
+wTwk9baImykOzOksmIgWY1XgBOy8jtI/fJ/9VBpz71paCkEjMQH7u6tHGuAVx6ZC
+QcWsSu1Iemktd2K8P+gWNUSW32GwRHOe8IrNVsuAQV0BnDvLKFnOyIaCSxJe1aCA
+mlobazivS7xvZ4fIKScfhmxX2vMcAogy6SlVrk5Nbz1g4ptLSMe2H6eP7pjp9Dw2
+JVCraHiCPlDUfLqKNANYLIcv03k8cY89NT0rEBS8ILawQCT5wdAj+toLOk7Dg9S9
+fc++QHWOnlI9eU6WBNIHnDxer2xep24CE7vHpwIDAQABo4GGMIGDMGIGA1UdEQRb
+MFmCH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXSGNmh0dHBzOi8vaWRw
+LXNzYmFyLmJlbmljdWx0dXJhbGkuZ2Fyci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNV
+HQ4EFgQU5OBUAd7iE3QPu87pd4OJ35n3xDwwDQYJKoZIhvcNAQEFBQADggEBAEtE
+EPZSrzpFbPHz65DWhxm6+FXDuRKYG9jwTabcikn4y19ykhauySmYUYfDE91vmKA/
+cJr4u720j9qvmZ/Z3pO6w8vD+SKrUHG5ez8m4ArGK35sYEEMA1JrW8oV6rcMk46x
+nL/TyhPinDLChZjlYEt5i4m2KlCipHc302KnbtLyjm8HsTAVkMxTibNCQHzI0m0B
+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">SSBAR - Soprintendenza Archeologica di Roma</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SSBAR - Soprintendenza Archeologica di Roma</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</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
new file mode 100644
index 00000000..51f3c6bd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-staf-prod.cineca.it-idp-shibboleth.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIEezCCA2OgAwIBAgIQHvkLjPc6sKc/y3ML5fDtCjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDgyOTAwMDAwMFoXDTE2MDgyODIzNTk1OVowRTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSAwHgYDVQQDExdpZHAtc3RhZi1w
+cm9kLmNpbmVjYS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1o
+S5a3gDgHXWvpiXSIMP27bxsuFk4+C1zWUAP1OA8ryPf4RI1PfWzqSCosY4BJv43a
+Oe3nvkKJ5bZN2bAD8+Swd87ErVglHIopx4eUdjDeKGl9QvOzWLVnbP7EWxQtr8UO
+4chaywyiixUSZ95yf2dY/5x3bhiong46mFPBj7aUYw5WBgPy9DgVYYF/i3DRSUMp
+mEtYFNGTOGRkqDosTN4zF+tksQUcOJGwZ+AYtb0tjgefPJ18wYi/UQWYaDgW9Tuv
+Fgw2BPn7iC7gj0cUgGrT8JtAH9wZsrUvJHSPGmnu2moKHrLFwol36wD/FxJPCbTo
+5T/+PXuSePY4/7j62MUCAwEAAaOCAXQwggFwMB8GA1UdIwQYMBaAFAy9k2gM896r
+o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSZiwnGwfISVNpZA5rwwrXyP9a2azAOBgNV
+HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
+VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
+U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
+LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
+cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIXaWRwLXN0YWYtcHJv
+ZC5jaW5lY2EuaXQwDQYJKoZIhvcNAQEFBQADggEBAAfichwgOLLw/LMdKky6/k9+
+szwlUqnZ9T7ReNXmK+csh2ZaXp3BTIDPsA6W51biiWvTT15jcIlsMKGPdQVIUfwQ
+s1Ad7XP/21AWj6PC7MuBxBxRdSjPp6/dg2dx7gNyR3o1H37MlueD6c2N0A6lGcxJ
+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>
+MIIEezCCA2OgAwIBAgIQHvkLjPc6sKc/y3ML5fDtCjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDgyOTAwMDAwMFoXDTE2MDgyODIzNTk1OVowRTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSAwHgYDVQQDExdpZHAtc3RhZi1w
+cm9kLmNpbmVjYS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1o
+S5a3gDgHXWvpiXSIMP27bxsuFk4+C1zWUAP1OA8ryPf4RI1PfWzqSCosY4BJv43a
+Oe3nvkKJ5bZN2bAD8+Swd87ErVglHIopx4eUdjDeKGl9QvOzWLVnbP7EWxQtr8UO
+4chaywyiixUSZ95yf2dY/5x3bhiong46mFPBj7aUYw5WBgPy9DgVYYF/i3DRSUMp
+mEtYFNGTOGRkqDosTN4zF+tksQUcOJGwZ+AYtb0tjgefPJ18wYi/UQWYaDgW9Tuv
+Fgw2BPn7iC7gj0cUgGrT8JtAH9wZsrUvJHSPGmnu2moKHrLFwol36wD/FxJPCbTo
+5T/+PXuSePY4/7j62MUCAwEAAaOCAXQwggFwMB8GA1UdIwQYMBaAFAy9k2gM896r
+o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSZiwnGwfISVNpZA5rwwrXyP9a2azAOBgNV
+HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
+VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
+U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
+LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
+cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIXaWRwLXN0YWYtcHJv
+ZC5jaW5lY2EuaXQwDQYJKoZIhvcNAQEFBQADggEBAAfichwgOLLw/LMdKky6/k9+
+szwlUqnZ9T7ReNXmK+csh2ZaXp3BTIDPsA6W51biiWvTT15jcIlsMKGPdQVIUfwQ
+s1Ad7XP/21AWj6PC7MuBxBxRdSjPp6/dg2dx7gNyR3o1H37MlueD6c2N0A6lGcxJ
+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>
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
new file mode 100644
index 00000000..c0642513
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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/logoEnte-16x16_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-16x16_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-80x60_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-80x60_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>
+MIIDYDCCAkigAwIBAgIUFMkZfuL5qKNNf1/kspMp2S6XOIMwDQYJKoZIhvcNAQEF
+BQAwKDEmMCQGA1UEAxMdaWRwLXN0ZWxsYW1hcmlzLmlyY2NzLmdhcnIuaXQwHhcN
+MTMwOTAzMDkxNTAwWhcNMzMwOTAzMDkxNTAwWjAoMSYwJAYDVQQDEx1pZHAtc3Rl
+bGxhbWFyaXMuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAInbhmdOnasbq+dw01M5N2VHMh3OrBIaHsmgVGOcn8dmWUL2j1WzSYZZ
+Ozgav7kY2dC5rCfFPabqpdfDoaM7OI56R6JTjg6KIHHj+gpVz+nWvBrlgiE0d1IL
+Hk2Xt6yP+0SYv8IjV7OoehHTTT/uvkX0nAKaJb+JjHLwiAE1JJmNrvI5JeURBgw2
+jbG+V4gF5EmN9xaWRyRumCCEYuzAnlB58kdMY6bV2A6n8BMB5MVS5i04dbwuckNQ
+LaibNzSSVyTJ5pyZZEVkRF57drR2FKENxW5bkZ7ipGnLEKoXC5mmADYmXcu0t96b
+TUiIkYIUWXDkS8XJML8y7X0qogM9A28CAwEAAaOBgTB/MF4GA1UdEQRXMFWCHWlk
+cC1zdGVsbGFtYXJpcy5pcmNjcy5nYXJyLml0hjRodHRwczovL2lkcC1zdGVsbGFt
+YXJpcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQ5DrW
+VFYfupI80cbtPn5VpSFKOTANBgkqhkiG9w0BAQUFAAOCAQEADCkGyy6JL919kwGU
+72HLcSUCQ5dd00/B73MQwCRvSikVg5QtE+UiI5TFF6wvLLvGYItGJMTsoh4sWGRK
+XK6uukR2v5/vHcPLCmT34M4kGiSrSSjr/YETB7Ygb5av91u+CwzDJNr4en/rBgVc
+eZEro1ZfDubMkAy/ZjUYe50BzBikWjGbLNVz/yIinTAwaMbpDBfGkl5WYOIYJijy
+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>
+MIIDYDCCAkigAwIBAgIUFMkZfuL5qKNNf1/kspMp2S6XOIMwDQYJKoZIhvcNAQEF
+BQAwKDEmMCQGA1UEAxMdaWRwLXN0ZWxsYW1hcmlzLmlyY2NzLmdhcnIuaXQwHhcN
+MTMwOTAzMDkxNTAwWhcNMzMwOTAzMDkxNTAwWjAoMSYwJAYDVQQDEx1pZHAtc3Rl
+bGxhbWFyaXMuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAInbhmdOnasbq+dw01M5N2VHMh3OrBIaHsmgVGOcn8dmWUL2j1WzSYZZ
+Ozgav7kY2dC5rCfFPabqpdfDoaM7OI56R6JTjg6KIHHj+gpVz+nWvBrlgiE0d1IL
+Hk2Xt6yP+0SYv8IjV7OoehHTTT/uvkX0nAKaJb+JjHLwiAE1JJmNrvI5JeURBgw2
+jbG+V4gF5EmN9xaWRyRumCCEYuzAnlB58kdMY6bV2A6n8BMB5MVS5i04dbwuckNQ
+LaibNzSSVyTJ5pyZZEVkRF57drR2FKENxW5bkZ7ipGnLEKoXC5mmADYmXcu0t96b
+TUiIkYIUWXDkS8XJML8y7X0qogM9A28CAwEAAaOBgTB/MF4GA1UdEQRXMFWCHWlk
+cC1zdGVsbGFtYXJpcy5pcmNjcy5nYXJyLml0hjRodHRwczovL2lkcC1zdGVsbGFt
+YXJpcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQ5DrW
+VFYfupI80cbtPn5VpSFKOTANBgkqhkiG9w0BAQUFAAOCAQEADCkGyy6JL919kwGU
+72HLcSUCQ5dd00/B73MQwCRvSikVg5QtE+UiI5TFF6wvLLvGYItGJMTsoh4sWGRK
+XK6uukR2v5/vHcPLCmT34M4kGiSrSSjr/YETB7Ygb5av91u+CwzDJNr4en/rBgVc
+eZEro1ZfDubMkAy/ZjUYe50BzBikWjGbLNVz/yIinTAwaMbpDBfGkl5WYOIYJijy
+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>
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
new file mode 100644
index 00000000..77d4deb8
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-test.brighton.ac.uk-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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>
+      <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>
+						MIIDQjCCAiqgAwIBAgITX3a30d9XiqM9vVXseM3W2/n/pTANBgkqhkiG9w0BAQUF
+						ADAiMSAwHgYDVQQDExdpZHAtdGVzdC5icmlnaHRvbi5hYy51azAeFw0xMjAxMDQx
+						NjI4MDJaFw0zMjAxMDQxNjI4MDJaMCIxIDAeBgNVBAMTF2lkcC10ZXN0LmJyaWdo
+						dG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtXsLP8lj
+						TZBZq7GWtNTG8NKBOiJXmCUooceYKX8EyBa+XFgh5M9LrlmA0Tj4RisfUloypn6S
+						lYrBPa7CGk69QUvi9DMv2dNPnvM6KR86u9NRmmT0s8s+/KERqAMbiLMzqbHbfNIY
+						Y564ereP2g24Hfx9/nvOHcQvYIhtjel3T2ML1Zxbzluo9r37KGI4wb3Ci3KHXsNo
+						4FNpHSZXEDU9DpOsl5t5xbNymZEqMk4s7Gc7ZF0soK8I2jw4t/sCzx8gdBK1sDf5
+						psoZTwc8mpzxE/PeGvMv4h1/J20zX/3vqi7WWumFjV/kAsf4KzYmW1UIIYnmdRds
+						qD8YHc/XcePrkwIDAQABo3EwbzBOBgNVHREERzBFghdpZHAtdGVzdC5icmlnaHRv
+						bi5hYy51a4YqaHR0cHM6Ly9pZHAtdGVzdC5icmlnaHRvbi5hYy51ay9zaGliYm9s
+						ZXRoMB0GA1UdDgQWBBRqz9oLJ6hnTdKJOE6IPOMwqMqt8zANBgkqhkiG9w0BAQUF
+						AAOCAQEANMlzps/viJeW3tg2wYNqkesMZqlTALqLKIUtprj1KDDpeMk8gHPB7ToP
+						NlDa/raTGb5+zgQDQpBmnd/RfN4XpRQaNjXCFEG+3TUxLhhCik0uutmHC4cH7609
+						B8ZdsKsygm3s1Vwejw8itwnSER2nw7xsliE4WiG93fd6VW0DtYDGGLBnX506d/3U
+						vM+/JtaiL84GEjgw7jRMXaMEJofZIEUIjbYZgGdUvlqrvJBAzN71MB5Ry0Nr1qDq
+						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>
+						MIIDQjCCAiqgAwIBAgITX3a30d9XiqM9vVXseM3W2/n/pTANBgkqhkiG9w0BAQUF
+						ADAiMSAwHgYDVQQDExdpZHAtdGVzdC5icmlnaHRvbi5hYy51azAeFw0xMjAxMDQx
+						NjI4MDJaFw0zMjAxMDQxNjI4MDJaMCIxIDAeBgNVBAMTF2lkcC10ZXN0LmJyaWdo
+						dG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtXsLP8lj
+						TZBZq7GWtNTG8NKBOiJXmCUooceYKX8EyBa+XFgh5M9LrlmA0Tj4RisfUloypn6S
+						lYrBPa7CGk69QUvi9DMv2dNPnvM6KR86u9NRmmT0s8s+/KERqAMbiLMzqbHbfNIY
+						Y564ereP2g24Hfx9/nvOHcQvYIhtjel3T2ML1Zxbzluo9r37KGI4wb3Ci3KHXsNo
+						4FNpHSZXEDU9DpOsl5t5xbNymZEqMk4s7Gc7ZF0soK8I2jw4t/sCzx8gdBK1sDf5
+						psoZTwc8mpzxE/PeGvMv4h1/J20zX/3vqi7WWumFjV/kAsf4KzYmW1UIIYnmdRds
+						qD8YHc/XcePrkwIDAQABo3EwbzBOBgNVHREERzBFghdpZHAtdGVzdC5icmlnaHRv
+						bi5hYy51a4YqaHR0cHM6Ly9pZHAtdGVzdC5icmlnaHRvbi5hYy51ay9zaGliYm9s
+						ZXRoMB0GA1UdDgQWBBRqz9oLJ6hnTdKJOE6IPOMwqMqt8zANBgkqhkiG9w0BAQUF
+						AAOCAQEANMlzps/viJeW3tg2wYNqkesMZqlTALqLKIUtprj1KDDpeMk8gHPB7ToP
+						NlDa/raTGb5+zgQDQpBmnd/RfN4XpRQaNjXCFEG+3TUxLhhCik0uutmHC4cH7609
+						B8ZdsKsygm3s1Vwejw8itwnSER2nw7xsliE4WiG93fd6VW0DtYDGGLBnX506d/3U
+						vM+/JtaiL84GEjgw7jRMXaMEJofZIEUIjbYZgGdUvlqrvJBAzN71MB5Ry0Nr1qDq
+						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>
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
new file mode 100644
index 00000000..b8ad8b0b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-test.bsms.ac.uk-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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>
+						MIIDNDCCAhygAwIBAgIVAMOvj1rjzW6b/X9XZ3j1EUBtCU2TMA0GCSqGSIb3DQEB
+						BQUAMB4xHDAaBgNVBAMTE2lkcC10ZXN0LmJzbXMuYWMudWswHhcNMTIwMTA0MTYy
+						ODA5WhcNMzIwMTA0MTYyODA5WjAeMRwwGgYDVQQDExNpZHAtdGVzdC5ic21zLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxzsApSD1TEB3bPOk
+						+DTAPumCIRiZmHOncQ5ki6b/znHmtqsFWmfQp8lHBB7DNEUvhdLi7O/yRYKZe8Hj
+						evuPCTv4bHAejyME8XYyoQmHkVGfyOeT8xPSI1AIkV3R6lGEi7Xdi8M15M4PMJ/V
+						X+FoMACN/5z16y7ppoioCMnVPpmV/6QbzJSwYsVGUFPYvBxEpHVVVoShjgxVhAYL
+						pdFC+C9tdtpNpxLWYhF+n9Z7t6A7T6TfogFmXH7SFruwU7vVCp1/dMehg2TOppPi
+						9GouMfeFj44ijf/RViKwGZPNW6kE0/amfhslCfsv3/lq4YeI+JlNPMqmTXfoJUSu
+						mxGF8wIDAQABo2kwZzBGBgNVHREEPzA9ghNpZHAtdGVzdC5ic21zLmFjLnVrhiZo
+						dHRwczovL2lkcC10ZXN0LmJzbXMuYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						hqiSOiWevN21AzwBuYHdQSX/y5EwDQYJKoZIhvcNAQEFBQADggEBAFC5TWxPIPTm
+						/QVEjmIP6V0YmE7/uHDv+2xt8X6OC0uDndotIsQEmdpoK2DbdsQA+YrNDB2IrZpu
+						RqB+Cdfe9s5sDkoWzk5ID7Hv6PRMQCFs+Vdl0ab46Ru2+y+CbydcyMJVt2lg2olA
+						Ba60gQz6HR1eSBkTuCV8CkN+8rSFv+mkWkWHfmS3GZRLH81/YjCLdoU+LJvdjPZ8
+						s63TODIhTZQ5JqX4DDpP1ptSTuD2toVIgJbt5/0cixm4HDE79mgFYvq5praLbzXy
+						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>
+						MIIDNDCCAhygAwIBAgIVAMOvj1rjzW6b/X9XZ3j1EUBtCU2TMA0GCSqGSIb3DQEB
+						BQUAMB4xHDAaBgNVBAMTE2lkcC10ZXN0LmJzbXMuYWMudWswHhcNMTIwMTA0MTYy
+						ODA5WhcNMzIwMTA0MTYyODA5WjAeMRwwGgYDVQQDExNpZHAtdGVzdC5ic21zLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxzsApSD1TEB3bPOk
+						+DTAPumCIRiZmHOncQ5ki6b/znHmtqsFWmfQp8lHBB7DNEUvhdLi7O/yRYKZe8Hj
+						evuPCTv4bHAejyME8XYyoQmHkVGfyOeT8xPSI1AIkV3R6lGEi7Xdi8M15M4PMJ/V
+						X+FoMACN/5z16y7ppoioCMnVPpmV/6QbzJSwYsVGUFPYvBxEpHVVVoShjgxVhAYL
+						pdFC+C9tdtpNpxLWYhF+n9Z7t6A7T6TfogFmXH7SFruwU7vVCp1/dMehg2TOppPi
+						9GouMfeFj44ijf/RViKwGZPNW6kE0/amfhslCfsv3/lq4YeI+JlNPMqmTXfoJUSu
+						mxGF8wIDAQABo2kwZzBGBgNVHREEPzA9ghNpZHAtdGVzdC5ic21zLmFjLnVrhiZo
+						dHRwczovL2lkcC10ZXN0LmJzbXMuYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						hqiSOiWevN21AzwBuYHdQSX/y5EwDQYJKoZIhvcNAQEFBQADggEBAFC5TWxPIPTm
+						/QVEjmIP6V0YmE7/uHDv+2xt8X6OC0uDndotIsQEmdpoK2DbdsQA+YrNDB2IrZpu
+						RqB+Cdfe9s5sDkoWzk5ID7Hv6PRMQCFs+Vdl0ab46Ru2+y+CbydcyMJVt2lg2olA
+						Ba60gQz6HR1eSBkTuCV8CkN+8rSFv+mkWkWHfmS3GZRLH81/YjCLdoU+LJvdjPZ8
+						s63TODIhTZQ5JqX4DDpP1ptSTuD2toVIgJbt5/0cixm4HDE79mgFYvq5praLbzXy
+						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>
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
new file mode 100644
index 00000000..fa6d7fb8
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-test.lancs.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIYOZJi8AQIEug05
+						w+DVk2VhVCZJU2o4JVj70tGyXnj1CEMAwZGjFKmPTX8YtDv3e4eHwjk2AgX3rcKy
+						Ohr5sD0vaAdHdY51aq2P8QQ+8zTZSP4CNML2fMtrbCNzDj+L/KPA9Tnm3iXStDqd
+						bKiEn7Sc+DgPKPe4o3oz00pymHGMuL2MHMnCUqyOE+vtF6YQzAFei81IUCVeiF/p
+						jtKqtDvTHST4LNcSslqDaVA90zRv/QynXaUnsr6WYwEoBefGBzSBWpn6rYG6jFgu
+						T6stqf0q3CpziDw6cxKrnl6HR9bRDFnYFElg0/g8Al7jcPB/lAkLmGU3GILG8mcq
+						dax/4YsCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLXRlc3QubGFuY3MuYWMudWuG
+						K2h0dHBzOi8vaWRwLXRlc3QubGFuY3MuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
+						VR0OBBYEFOcwlLDv1eWSzgWtwDtw8slIuiKQMA0GCSqGSIb3DQEBBQUAA4IBAQAB
+						C0NMk4y8FnYX9JrWYhp8XQcPc/q0ezkF3w3gUtHNEVllAmUSiNaGapkJcufMMNtk
+						eM1za6BnrhPrNeXJlOzc8P6ZyT8HSOPx/oIoKY+UuLyAfLk0FZM3KkHobSiLO+K6
+						4B7u30Q93XTgelXKnViqTC1XW/QptiH2n3uyBh1ojrrkUTqZZDLit+54JZpG6qVo
+						cxQedBTTZehgVYUnS3FidiJwSg+aUQUf0ubVzooYOkhCtr+C9C8W8dxj1O4Tj+68
+						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>
+						MIIDOzCCAiOgAwIBAgIUYU6NkvsQbpPZ0YcuNXj04ufIkuUwDQYJKoZIhvcNAQEF
+						BQAwHzEdMBsGA1UEAxMUaWRwLXRlc3QubGFuY3MuYWMudWswHhcNMTMwMjIyMTA0
+						MDQ5WhcNMzMwMjIyMTA0MDQ5WjAfMR0wGwYDVQQDExRpZHAtdGVzdC5sYW5jcy5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIYOZJi8AQIEug05
+						w+DVk2VhVCZJU2o4JVj70tGyXnj1CEMAwZGjFKmPTX8YtDv3e4eHwjk2AgX3rcKy
+						Ohr5sD0vaAdHdY51aq2P8QQ+8zTZSP4CNML2fMtrbCNzDj+L/KPA9Tnm3iXStDqd
+						bKiEn7Sc+DgPKPe4o3oz00pymHGMuL2MHMnCUqyOE+vtF6YQzAFei81IUCVeiF/p
+						jtKqtDvTHST4LNcSslqDaVA90zRv/QynXaUnsr6WYwEoBefGBzSBWpn6rYG6jFgu
+						T6stqf0q3CpziDw6cxKrnl6HR9bRDFnYFElg0/g8Al7jcPB/lAkLmGU3GILG8mcq
+						dax/4YsCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLXRlc3QubGFuY3MuYWMudWuG
+						K2h0dHBzOi8vaWRwLXRlc3QubGFuY3MuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
+						VR0OBBYEFOcwlLDv1eWSzgWtwDtw8slIuiKQMA0GCSqGSIb3DQEBBQUAA4IBAQAB
+						C0NMk4y8FnYX9JrWYhp8XQcPc/q0ezkF3w3gUtHNEVllAmUSiNaGapkJcufMMNtk
+						eM1za6BnrhPrNeXJlOzc8P6ZyT8HSOPx/oIoKY+UuLyAfLk0FZM3KkHobSiLO+K6
+						4B7u30Q93XTgelXKnViqTC1XW/QptiH2n3uyBh1ojrrkUTqZZDLit+54JZpG6qVo
+						cxQedBTTZehgVYUnS3FidiJwSg+aUQUf0ubVzooYOkhCtr+C9C8W8dxj1O4Tj+68
+						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>
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
new file mode 100644
index 00000000..d339cd50
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-test.londonmet.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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
+						bmRvbm1ldC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAID+
+						dg8AkTAgBe05Q3qR5tGRDPl53Ziss6MIUTthVI/tUDI9zwh6OxcoulGNKjbYQah8
+						NqbbRbMsBiaL8tYeJxI84nZlAlQQtWUhlO4fCwy9U2PpqGUVZqJtJ2tGrHqbUIJG
+						fywNBtA6OOOMhiusyJOkY9R85mCSUlsuZ/XDSZ+fFAEYlVn7gE/ypKzR9MZatElO
+						xYUxKwfQUzONUlT4me1Cq/RyjkB6xDjpM59ByuS91t/xYoAgd0Vwha8YcgBpuDaH
+						VsIxlEEVY5Sx1Tr3Z+2KWd+N9ApWyQrGZiLOp0wcDtAZduWXi3z20w9FB3b2Hxxz
+						S3Y88pjGSh+s3xyUve8CAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLXRlc3QubG9u
+						ZG9ubWV0LmFjLnVrhi9odHRwczovL2lkcC10ZXN0LmxvbmRvbm1ldC5hYy51ay9p
+						ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhxXd7trX1bTg9l2tEg61AIXkPXwwDQYJ
+						KoZIhvcNAQEFBQADggEBADVh39wUjao0ZwNiMy3/P/V4ls1/pyT8wZgBwEr+XDqM
+						vg2AD5eP+Ys/W9FY22/Zetu2AEWqxOq07sAQ6EKTbqHcSjF849tO7KrwvJRzldKh
+						7uVuFnLB5KltBJHh6c9osJhuNyR3WhLmMaWlrWo+WSNqWQCmTroE7WJnopZ0J3TR
+						FLMQIOXLLWqe+oOFFl2bJ5vNaIljMfM/0mkFt4+NRRdmpCjLv4vQq8PsCr37Bq2o
+						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>
+						MIIDTDCCAjSgAwIBAgIVAPy27MCB6aTiLx0QJJIVl19/Nlg5MA0GCSqGSIb3DQEB
+						BQUAMCMxITAfBgNVBAMTGGlkcC10ZXN0LmxvbmRvbm1ldC5hYy51azAeFw0xNDA2
+						MjQwNzIwNDdaFw0zNDA2MjQwNzIwNDdaMCMxITAfBgNVBAMTGGlkcC10ZXN0Lmxv
+						bmRvbm1ldC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAID+
+						dg8AkTAgBe05Q3qR5tGRDPl53Ziss6MIUTthVI/tUDI9zwh6OxcoulGNKjbYQah8
+						NqbbRbMsBiaL8tYeJxI84nZlAlQQtWUhlO4fCwy9U2PpqGUVZqJtJ2tGrHqbUIJG
+						fywNBtA6OOOMhiusyJOkY9R85mCSUlsuZ/XDSZ+fFAEYlVn7gE/ypKzR9MZatElO
+						xYUxKwfQUzONUlT4me1Cq/RyjkB6xDjpM59ByuS91t/xYoAgd0Vwha8YcgBpuDaH
+						VsIxlEEVY5Sx1Tr3Z+2KWd+N9ApWyQrGZiLOp0wcDtAZduWXi3z20w9FB3b2Hxxz
+						S3Y88pjGSh+s3xyUve8CAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLXRlc3QubG9u
+						ZG9ubWV0LmFjLnVrhi9odHRwczovL2lkcC10ZXN0LmxvbmRvbm1ldC5hYy51ay9p
+						ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhxXd7trX1bTg9l2tEg61AIXkPXwwDQYJ
+						KoZIhvcNAQEFBQADggEBADVh39wUjao0ZwNiMy3/P/V4ls1/pyT8wZgBwEr+XDqM
+						vg2AD5eP+Ys/W9FY22/Zetu2AEWqxOq07sAQ6EKTbqHcSjF849tO7KrwvJRzldKh
+						7uVuFnLB5KltBJHh6c9osJhuNyR3WhLmMaWlrWo+WSNqWQCmTroE7WJnopZ0J3TR
+						FLMQIOXLLWqe+oOFFl2bJ5vNaIljMfM/0mkFt4+NRRdmpCjLv4vQq8PsCr37Bq2o
+						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>
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
new file mode 100644
index 00000000..db1ee6ff
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-test.shibboleth.ox.ac.uk-shibboleth-idp.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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
+						Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0+4POi97
+						yt16S/kjeolw+uj6SEdMFqfgQhgwd/AC05Fp9MQ8pPNIQR5DhIRPFi6L4H0ea/Uk
+						frc0twJtfrqEx7tp0eCe0wB6LecKxx6+DnYtmfyz/tCjvvvFmfbrJ14ubrMHmF1u
+						RfeWSQBtg36lcpPV9QIQM1FAwab9CLREmxsZ72zZSuZCeNRmaCrdQd43NgfHzFYb
+						xnvKP8D806OEEniSBFcPpwzKPp2ctho+NNmsJT/8GyVTbrKzSpvZjf5zgsPK+O0R
+						kH7qZ8cExZkSDktyRyhCNi95FXbnPrANI6oSVs8+ouhe9J/6bnO04FyFecA893hJ
+						pxNXNrmpXhZgFQIDAQABo4GJMIGGMB0GA1UdDgQWBBQMsSajqoz91UxUUJ52fzjF
+						n5Gy/TBXBgNVHSMEUDBOgBQMsSajqoz91UxUUJ52fzjFn5Gy/aErpCkwJzElMCMG
+						A1UEAxMcaWRwLXRlc3Quc2hpYmJvbGV0aC5veC5hYy51a4IJAJndjhMuiIt3MAwG
+						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFjpOucHm+eFuvP/AhCEd4ei
+						3VUoKeVNUdtX1qpbv+ZH/ftkJaeRsRan4DAx4MWcEYED/+2DfYa+IWrNLVqp/ikl
+						omdSgjL+KHjIUh+YZR3M/Citl60RLQp8x1leC1jInfafS8S/MJLAwCRtKlgcVHeL
+						s1Tsvt1k++uaB4uKV/lWE8PS0H3hFnzE4i1S94HNWhC3S+2XB7AE6MXUCHQTknep
+						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>
+						MIIDWzCCAkOgAwIBAgIJAJndjhMuiIt3MA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+						BAMTHGlkcC10ZXN0LnNoaWJib2xldGgub3guYWMudWswHhcNMTMxMjEzMTIwNTM3
+						WhcNMzMxMjA4MTIwNTM3WjAnMSUwIwYDVQQDExxpZHAtdGVzdC5zaGliYm9sZXRo
+						Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0+4POi97
+						yt16S/kjeolw+uj6SEdMFqfgQhgwd/AC05Fp9MQ8pPNIQR5DhIRPFi6L4H0ea/Uk
+						frc0twJtfrqEx7tp0eCe0wB6LecKxx6+DnYtmfyz/tCjvvvFmfbrJ14ubrMHmF1u
+						RfeWSQBtg36lcpPV9QIQM1FAwab9CLREmxsZ72zZSuZCeNRmaCrdQd43NgfHzFYb
+						xnvKP8D806OEEniSBFcPpwzKPp2ctho+NNmsJT/8GyVTbrKzSpvZjf5zgsPK+O0R
+						kH7qZ8cExZkSDktyRyhCNi95FXbnPrANI6oSVs8+ouhe9J/6bnO04FyFecA893hJ
+						pxNXNrmpXhZgFQIDAQABo4GJMIGGMB0GA1UdDgQWBBQMsSajqoz91UxUUJ52fzjF
+						n5Gy/TBXBgNVHSMEUDBOgBQMsSajqoz91UxUUJ52fzjFn5Gy/aErpCkwJzElMCMG
+						A1UEAxMcaWRwLXRlc3Quc2hpYmJvbGV0aC5veC5hYy51a4IJAJndjhMuiIt3MAwG
+						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFjpOucHm+eFuvP/AhCEd4ei
+						3VUoKeVNUdtX1qpbv+ZH/ftkJaeRsRan4DAx4MWcEYED/+2DfYa+IWrNLVqp/ikl
+						omdSgjL+KHjIUh+YZR3M/Citl60RLQp8x1leC1jInfafS8S/MJLAwCRtKlgcVHeL
+						s1Tsvt1k++uaB4uKV/lWE8PS0H3hFnzE4i1S94HNWhC3S+2XB7AE6MXUCHQTknep
+						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>
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
new file mode 100644
index 00000000..5daa9191
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-test.shu.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,122 @@
+<?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>
+      <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>
+						MIIDxjCCAq6gAwIBAgIEU62O9jANBgkqhkiG9w0BAQsFADCBpDELMAkGA1UEBhMC
+						R0IxGDAWBgNVBAgMD1NvdXRoIFlvcmtzaGlyZTESMBAGA1UEBwwJU2hlZmZpZWxk
+						MSQwIgYDVQQKDBtTaGVmZmllbGQgSGFsbGFtIFVuaXZlcnNpdHkxJDAiBgNVBAsM
+						G1N0dWRlbnQgJiBMZWFybmluZyBTZXJ2aWNlczEbMBkGA1UEAwwSaWRwLXRlc3Qu
+						c2h1LmFjLnVrMB4XDTE0MDYyNzE1MzUwMFoXDTI0MDYyNzE1MzUwMFowgaQxCzAJ
+						BgNVBAYTAkdCMRgwFgYDVQQIDA9Tb3V0aCBZb3Jrc2hpcmUxEjAQBgNVBAcMCVNo
+						ZWZmaWVsZDEkMCIGA1UECgwbU2hlZmZpZWxkIEhhbGxhbSBVbml2ZXJzaXR5MSQw
+						IgYDVQQLDBtTdHVkZW50ICYgTGVhcm5pbmcgU2VydmljZXMxGzAZBgNVBAMMEmlk
+						cC10ZXN0LnNodS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AImtxGNIGiEzwpQuB45m9gWeFZqDrQnsMMNNsNRIOwjC0r4pnv2CUpxNTyC/s5fy
+						IgHFam/uNa9uoUd572ZCLkbz9aJzl9WIJWig30wMZmcYMWmShWnVfTT5sFqY8wT3
+						KH9H2YzZg9CsLY533aY0zytJPeTa3Zrv9doQ1HXT0Ucx+lCaLKaLQwjxN8q/t0eT
+						gw763kcBvJl9eD8At1OXicH9zqWWa30wL80HQgQQEpBdcvrwL28oJ6zV2AJzheGD
+						X4X28k3SC5XDC0YEobewiufbQrWa6GBvluZxl1vk2/s/awKa+ACZVgQxlqWCRoWo
+						hXe19s8y8DPKNxsWOkrGCE8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAEnzcbMqy
+						SJlvgznSg3U2qzvQAEqHcS3O9q/9vgH2vsNhHJNlNYuO0pdYsZLnjiynZfJCqlCz
+						xM377Ai/n2dIopidnFrVhUhmBHrPLZrWN4not/whSiampJbEk+FtRUqlvnlOwPMS
+						7FEVpljvIUM5yH2gwxykwUDh6Cww6vb0LmMIg3XXqoWb7W1La3/SN861kE3lrjBd
+						kLbSWD/+/ZKH8U8PpRzt3jQ7qs6Y6oU+AViuijrqABVEMkkQQ95TNl8gOlx7GV9H
+						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>
+						MIIDxjCCAq6gAwIBAgIEU62O9jANBgkqhkiG9w0BAQsFADCBpDELMAkGA1UEBhMC
+						R0IxGDAWBgNVBAgMD1NvdXRoIFlvcmtzaGlyZTESMBAGA1UEBwwJU2hlZmZpZWxk
+						MSQwIgYDVQQKDBtTaGVmZmllbGQgSGFsbGFtIFVuaXZlcnNpdHkxJDAiBgNVBAsM
+						G1N0dWRlbnQgJiBMZWFybmluZyBTZXJ2aWNlczEbMBkGA1UEAwwSaWRwLXRlc3Qu
+						c2h1LmFjLnVrMB4XDTE0MDYyNzE1MzUwMFoXDTI0MDYyNzE1MzUwMFowgaQxCzAJ
+						BgNVBAYTAkdCMRgwFgYDVQQIDA9Tb3V0aCBZb3Jrc2hpcmUxEjAQBgNVBAcMCVNo
+						ZWZmaWVsZDEkMCIGA1UECgwbU2hlZmZpZWxkIEhhbGxhbSBVbml2ZXJzaXR5MSQw
+						IgYDVQQLDBtTdHVkZW50ICYgTGVhcm5pbmcgU2VydmljZXMxGzAZBgNVBAMMEmlk
+						cC10ZXN0LnNodS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AImtxGNIGiEzwpQuB45m9gWeFZqDrQnsMMNNsNRIOwjC0r4pnv2CUpxNTyC/s5fy
+						IgHFam/uNa9uoUd572ZCLkbz9aJzl9WIJWig30wMZmcYMWmShWnVfTT5sFqY8wT3
+						KH9H2YzZg9CsLY533aY0zytJPeTa3Zrv9doQ1HXT0Ucx+lCaLKaLQwjxN8q/t0eT
+						gw763kcBvJl9eD8At1OXicH9zqWWa30wL80HQgQQEpBdcvrwL28oJ6zV2AJzheGD
+						X4X28k3SC5XDC0YEobewiufbQrWa6GBvluZxl1vk2/s/awKa+ACZVgQxlqWCRoWo
+						hXe19s8y8DPKNxsWOkrGCE8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAEnzcbMqy
+						SJlvgznSg3U2qzvQAEqHcS3O9q/9vgH2vsNhHJNlNYuO0pdYsZLnjiynZfJCqlCz
+						xM377Ai/n2dIopidnFrVhUhmBHrPLZrWN4not/whSiampJbEk+FtRUqlvnlOwPMS
+						7FEVpljvIUM5yH2gwxykwUDh6Cww6vb0LmMIg3XXqoWb7W1La3/SN861kE3lrjBd
+						kLbSWD/+/ZKH8U8PpRzt3jQ7qs6Y6oU+AViuijrqABVEMkkQQ95TNl8gOlx7GV9H
+						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>
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
new file mode 100644
index 00000000..d4572d92
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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
+						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKk0/tK2QdQr
+						T72QiLa3ntSOTJGlFEGDuwAAnhOXxH6T2+4oqy3QsoUCgI+6f4J8meXYmuCpOIHh
+						BrTv32n9SYgXI+KE40BLSym0ToGzWdz+fZAU+IHaX6gixQRjQdYTPPefDCfeLk3U
+						KTFpHZCK5tMJYiflwS/X7abnOF/yNypoeB3ZpI13qbHV+I5v8iHz6lxs8V2yutXE
+						srjCB+YKVuB5dyVU5ettupnpDQI7vzl3QzHVTm46NoT0MiGS3FH+Xkr/zDXl6ynr
+						Fxkg322Re8D3U1XzQTC/rP4WMqx0cc9Im3JaAf7happqm9fDJqeMdxodKqdgAMDI
+						dH1R1b4lyfUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLXRlc3QudWNzLmVkLmFj
+						LnVrhixodHRwczovL2lkcC10ZXN0LnVjcy5lZC5hYy51ay9pZHAvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUcMIFOHTjJnX/8pzUK1pZ+4jarLQwDQYJKoZIhvcNAQEFBQAD
+						ggEBAI6diGFybO93xeSV7Ww2N8thw3KZrSKou+SASMkCENS81L2Z2f0c9sAmpWZN
+						8Ewi3i7iPcGOvzxD8WQ6sY+roCvgbPJz/CY0NafC1OwJvZwYrv5MBRvWblilkGAr
+						jHp3oD7zQUgx7UsBSOFEnpVlY/JmXmhXYSwIZcSA6ShmyQTo+TRbM206gGCu6R4C
+						dB+g+QtBW0jl56x/wf7d86zb1KGp4f9/UalrP+7RCkQBqkGqZC714/Ib/GURnDSP
+						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>
+						MIIDQDCCAiigAwIBAgIVANRDl0zVDHZ6OYfXOdpdFYUK94KWMA0GCSqGSIb3DQEB
+						BQUAMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5lZC5hYy51azAeFw0xMTA4MTcw
+						ODQ4NDRaFw0zMTA4MTcwODQ4NDRaMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5l
+						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKk0/tK2QdQr
+						T72QiLa3ntSOTJGlFEGDuwAAnhOXxH6T2+4oqy3QsoUCgI+6f4J8meXYmuCpOIHh
+						BrTv32n9SYgXI+KE40BLSym0ToGzWdz+fZAU+IHaX6gixQRjQdYTPPefDCfeLk3U
+						KTFpHZCK5tMJYiflwS/X7abnOF/yNypoeB3ZpI13qbHV+I5v8iHz6lxs8V2yutXE
+						srjCB+YKVuB5dyVU5ettupnpDQI7vzl3QzHVTm46NoT0MiGS3FH+Xkr/zDXl6ynr
+						Fxkg322Re8D3U1XzQTC/rP4WMqx0cc9Im3JaAf7happqm9fDJqeMdxodKqdgAMDI
+						dH1R1b4lyfUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLXRlc3QudWNzLmVkLmFj
+						LnVrhixodHRwczovL2lkcC10ZXN0LnVjcy5lZC5hYy51ay9pZHAvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUcMIFOHTjJnX/8pzUK1pZ+4jarLQwDQYJKoZIhvcNAQEFBQAD
+						ggEBAI6diGFybO93xeSV7Ww2N8thw3KZrSKou+SASMkCENS81L2Z2f0c9sAmpWZN
+						8Ewi3i7iPcGOvzxD8WQ6sY+roCvgbPJz/CY0NafC1OwJvZwYrv5MBRvWblilkGAr
+						jHp3oD7zQUgx7UsBSOFEnpVlY/JmXmhXYSwIZcSA6ShmyQTo+TRbM206gGCu6R4C
+						dB+g+QtBW0jl56x/wf7d86zb1KGp4f9/UalrP+7RCkQBqkGqZC714/Ib/GURnDSP
+						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>
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
new file mode 100644
index 00000000..2b6e87eb
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-test.warwick.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?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>
+      <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
+						Y2suYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlWqm4NoAE
+						tvOm4rJwmxQROFZePbsoT+s2AKABtCe+huTRwccxoMVKxNcRgiXrC9axXOMYtn2F
+						7Vet6JPTSh2byxP/GRAFzgmbB5wUtDEWnrchbDELwDBBs4gf0f2+xsW8CcDnwAKO
+						Yn70mFO5z+gOfrNQjUN4NoIrrXKhOXmvus+3igWcJtgZBjZ4GWEybkk45PNPvLmM
+						NTAchGTn+XJeOqYQi5YrxQOr7AaQX5lMNULZ/vC8d38lfwnKEbnZ6RNA7BS7Oo4K
+						/kYbnZCJ4Surzd86PCRXqPWECqZukH30QUclQ7vgajZNQ5nYkw17fRVxRl0lzR6y
+						AwwbVjUr63NxAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcC10ZXN0LndhcndpY2su
+						YWMudWuGLWh0dHBzOi8vaWRwLXRlc3Qud2Fyd2ljay5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQUNlj6h7hKB35Ej1IlTOV6jeEtFt4wDQYJKoZIhvcNAQEF
+						BQADggEBAHARtRPuPljRh+ExT44KfsA82jRt5H9y/B4BRR4Inn0is2F5RgYn4N3u
+						KkCYBEos0ntfnjx+pzI7wJS3AETizZoqVGdPscxsXrvqyx563yr4ceoy0DSRfroE
+						x9r1dEYMCwmk21c4LSB7pKY3n0bGfKkoxoOU2HtjeZ2c0W0YfnhgUu1YWPBRMah6
+						ZYMBot6VqwVMhwBhubbKp1qmLGS8s6YT7UvTUtSI3G9h6W8FWgCQF4X5i8MjTisJ
+						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>
+						MIIDQzCCAiugAwIBAgIUMIS+8kDOqLvJbUPFF2xn+2rtu2AwDQYJKoZIhvcNAQEF
+						BQAwITEfMB0GA1UEAxMWaWRwLXRlc3Qud2Fyd2ljay5hYy51azAeFw0xNDA3MDkx
+						NDM4NTdaFw0zNDA3MDkxNDM4NTdaMCExHzAdBgNVBAMTFmlkcC10ZXN0Lndhcndp
+						Y2suYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlWqm4NoAE
+						tvOm4rJwmxQROFZePbsoT+s2AKABtCe+huTRwccxoMVKxNcRgiXrC9axXOMYtn2F
+						7Vet6JPTSh2byxP/GRAFzgmbB5wUtDEWnrchbDELwDBBs4gf0f2+xsW8CcDnwAKO
+						Yn70mFO5z+gOfrNQjUN4NoIrrXKhOXmvus+3igWcJtgZBjZ4GWEybkk45PNPvLmM
+						NTAchGTn+XJeOqYQi5YrxQOr7AaQX5lMNULZ/vC8d38lfwnKEbnZ6RNA7BS7Oo4K
+						/kYbnZCJ4Surzd86PCRXqPWECqZukH30QUclQ7vgajZNQ5nYkw17fRVxRl0lzR6y
+						AwwbVjUr63NxAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcC10ZXN0LndhcndpY2su
+						YWMudWuGLWh0dHBzOi8vaWRwLXRlc3Qud2Fyd2ljay5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQUNlj6h7hKB35Ej1IlTOV6jeEtFt4wDQYJKoZIhvcNAQEF
+						BQADggEBAHARtRPuPljRh+ExT44KfsA82jRt5H9y/B4BRR4Inn0is2F5RgYn4N3u
+						KkCYBEos0ntfnjx+pzI7wJS3AETizZoqVGdPscxsXrvqyx563yr4ceoy0DSRfroE
+						x9r1dEYMCwmk21c4LSB7pKY3n0bGfKkoxoOU2HtjeZ2c0W0YfnhgUu1YWPBRMah6
+						ZYMBot6VqwVMhwBhubbKp1qmLGS8s6YT7UvTUtSI3G9h6W8FWgCQF4X5i8MjTisJ
+						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>
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
new file mode 100644
index 00000000..e9642c3d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDVDCCAjygAwIBAgIVANS07VaPc/gsZ/51WPOjK7yoKLkxMA0GCSqGSIb3DQEB
+BQUAMCUxIzAhBgNVBAMTGmlkcC1kZXYxLnByaXZhdGUuY2luZWNhLml0MB4XDTA4
+MDUyMjEyMTQzMVoXDTI4MDUyMjEyMTQzMVowJTEjMCEGA1UEAxMaaWRwLWRldjEu
+cHJpdmF0ZS5jaW5lY2EuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCgnlCuoVO1sb9tZmBwkCvQgwNPOpOsYPjA4i1u1AXrsylRET2CX70hT4UK6BK+
+KDOV5uSpuS+NaSWVEBmJ6tC0X8fVzOv29g4qtCmhxEWAI48u4wT6FWFsuKFhTxja
+hs6efm5twHi2mErT6f6lqlSIJ4xO2tCBCNIg5fkrRQ95VuvwMv4DJH3vxh7Df+Uy
+jb4bIOtqf5dvf8Xyex72xF0fJxhA+fSz3bmUrF1JQHmYHbfI+YA9n6iqe12QjZZM
+hIFMh/8EH//KGv6CbKrADzvQcsxp5/E7D9RxMHE+fMZXiAG6G2Ecnr7SGjtZo1bN
+iMkNcmMF1HA8cDS7C9LjX/LrAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC1kZXYx
+LnByaXZhdGUuY2luZWNhLml0hjFodHRwczovL2lkcC1kZXYxLnByaXZhdGUuY2lu
+ZWNhLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQA5cxSUsB+rEi7tszL9OEk
+j0g3UDANBgkqhkiG9w0BAQUFAAOCAQEADhdCzQ4Ykhg8L8cwJkxPqUd5v5r+NDt5
+pDoaiQRYc3fHdtFwM3gP/EjoDaUiVG0Y33ujAiuHUG3xsFdOXD74F4xHukvWi1Ju
+5JLy4jbfiflYlVG+tBnQJLGTs17XlfrCwu7rxkxwYUdoU/HsON+ILktn528x2VOu
+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>
+MIIDVDCCAjygAwIBAgIVANS07VaPc/gsZ/51WPOjK7yoKLkxMA0GCSqGSIb3DQEB
+BQUAMCUxIzAhBgNVBAMTGmlkcC1kZXYxLnByaXZhdGUuY2luZWNhLml0MB4XDTA4
+MDUyMjEyMTQzMVoXDTI4MDUyMjEyMTQzMVowJTEjMCEGA1UEAxMaaWRwLWRldjEu
+cHJpdmF0ZS5jaW5lY2EuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCgnlCuoVO1sb9tZmBwkCvQgwNPOpOsYPjA4i1u1AXrsylRET2CX70hT4UK6BK+
+KDOV5uSpuS+NaSWVEBmJ6tC0X8fVzOv29g4qtCmhxEWAI48u4wT6FWFsuKFhTxja
+hs6efm5twHi2mErT6f6lqlSIJ4xO2tCBCNIg5fkrRQ95VuvwMv4DJH3vxh7Df+Uy
+jb4bIOtqf5dvf8Xyex72xF0fJxhA+fSz3bmUrF1JQHmYHbfI+YA9n6iqe12QjZZM
+hIFMh/8EH//KGv6CbKrADzvQcsxp5/E7D9RxMHE+fMZXiAG6G2Ecnr7SGjtZo1bN
+iMkNcmMF1HA8cDS7C9LjX/LrAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC1kZXYx
+LnByaXZhdGUuY2luZWNhLml0hjFodHRwczovL2lkcC1kZXYxLnByaXZhdGUuY2lu
+ZWNhLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQA5cxSUsB+rEi7tszL9OEk
+j0g3UDANBgkqhkiG9w0BAQUFAAOCAQEADhdCzQ4Ykhg8L8cwJkxPqUd5v5r+NDt5
+pDoaiQRYc3fHdtFwM3gP/EjoDaUiVG0Y33ujAiuHUG3xsFdOXD74F4xHukvWi1Ju
+5JLy4jbfiflYlVG+tBnQJLGTs17XlfrCwu7rxkxwYUdoU/HsON+ILktn528x2VOu
+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>
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
new file mode 100644
index 00000000..89005b36
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
@@ -0,0 +1,312 @@
+<?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>
+      <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">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">seps.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">osmesto.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">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">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">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">sgtsizola.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">tsckr.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">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">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>
+      <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 identityd</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">arnes idp identiteta</mdui:Keywords>
+        <mdui:Logo height="135" width="150">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJYAAACHCAYAAAD0i6DcAAAKymlDQ1BJQ0MgUHJvZmlsZQAASA2tlndU08kWx+f3S2+0QChSQm+C9Cq9BpBeBBshCSSUEBKCiNiQxRVYUVREQF2BpYiCawFkLYgoFhbBhn2DLCrKc7FgQ+X9Akt23ztv/3tzzsx8ft+5c3935tw55wJAHmQKBOmwAgAZ/GxhZIA3fWl8Ah33GOAADMjADNCYLJHAKzw8BPxje38HQNLFmxZSX/9o9r8XFNkcEQsAKBxZTmKLWBkIn0B6O0sgzAYAJfWnvzpbIOXtCCsLkQARrpdyyhx3SjlpjvtnbaIjfRAbCQB4MpMpTAGANIHo9BxWCuKHTEbYis/m8RFejLA7i8tkI5yP8MKMjEwpNyFskvQ3Pyl/YyYzSeaTyUyR8dxZkJ3Ij315IkE6c83sx/9zyEgXI/c123SRkcwVBkYiswZyZzVpmcEy5ieFhs3rPORE88wVB8bMM0vkg9zl3F420zd4nsVpMV7zzBQi9KcNL5sRPc/CzEiZf356aMi8zuUwZMwR+UXN68k8f8Y853Gj4+Y5hxcbOs+itChZDHlcH5kuFEfKYk4W+svOmCFCdv4ZG4v517+yudGB8zqb4+s3zxx+jCweQba3zI8gfTa/Z++Qkx4g00U5UbK92cJomZ7KDJLm66y9IDtcdicgBPiBUEBH5mhgA+yAPTIKwGqAZGM2JxfJPQB8MgVrhLwUbjbdC3ktHDqDz7JcSLexsrYDQPr2pDYAvL07+6YgGv4vLX0ZAI6bkbyWpj191gwkIT5PeACgsO8vzQSHPAd3AM6ZssTCnDk7tHTCACKQB8pAHWgDfWACLJDoHIAr8ESiDgJhSMzxYCVgAS7IAEIk6nywCRSBErAd7AZV4ACoA03gCDgGOsBpcB5cAtfAILgNHgAJGAMvwSR4D6YhCMJBFIgKqUM6kCFkDtlATpA75AeFQJFQPJQIpUB8SAzlQ5uhEqgcqoIOQs3Qz9Ap6Dx0BRqC7kEj0Dj0BvoMo2AyrAxrwUbwItgJ9oKD4Wh4BZwCZ8F5cCG8Da6Ea+HDcDt8Hr4G34Yl8Et4CgVQJBQNpYuyQDmhfFBhqARUMkqIWo8qRlWgalGtqC5UH+omSoKaQH1CY9FUNB1tgXZFB6Jj0Cx0Fno9uhRdhW5Ct6N70TfRI+hJ9DcMBaOJMce4YBiYpZgUzGpMEaYC04A5ibmIuY0Zw7zHYrE0rDHWERuIjcemYtdiS7H7sG3YbuwQdhQ7hcPh1HHmODdcGI6Jy8YV4fbiDuPO4W7gxnAf8SS8Dt4G749PwPPxBfgK/CH8WfwN/DP8NEGBYEhwIYQR2IQ1hDJCPaGLcJ0wRpgmKhKNiW7EaGIqcROxkthKvEh8SHxLIpH0SM6kCBKPtJFUSTpKukwaIX0iK5HNyD7k5WQxeRu5kdxNvkd+S6FQjCielARKNmUbpZlygfKY8lGOKmcpx5Bjy22Qq5Zrl7sh90qeIG8o7yW/Uj5PvkL+uPx1+QkFgoKRgo8CU2G9QrXCKYVhhSlFqqK1YphihmKp4iHFK4rPlXBKRkp+SmylQqU6pQtKo1QUVZ/qQ2VRN1PrqRepY8pYZWNlhnKqconyEeUB5UkVJRU7lViVXJVqlTMqEhqKZkRj0NJpZbRjtDu0z6paql6qHNWtqq2qN1Q/qC1Q81TjqBWrtandVvusTlf3U09T36Heof5IA61hphGhsVpjv8ZFjYkFygtcF7AWFC84tuC+JqxpphmpuVazTrNfc0pLWytAS6C1V+uC1oQ2TdtTO1V7l/ZZ7XEdqo67Dk9nl845nRd0FboXPZ1eSe+lT+pq6gbqinUP6g7oTusZ68XoFei16T3SJ+o76Sfr79Lv0Z800DFYYpBv0GJw35Bg6GTINdxj2Gf4wcjYKM5oi1GH0XNjNWOGcZ5xi/FDE4qJh0mWSa3JLVOsqZNpmuk+00Ez2MzejGtWbXbdHDZ3MOeZ7zMfWohZ6LyQv7B24bAF2cLLIseixWLEkmYZYllg2WH5apHBooRFOxb1LfpmZW+VblVv9cBayTrIusC6y/qNjZkNy6ba5pYtxdbfdoNtp+1rO3M7jt1+u7v2VPsl9lvse+y/Ojg6CB1aHcYdDRwTHWsch52UncKdSp0uO2OcvZ03OJ92/uTi4JLtcszlD1cL1zTXQ67PFxsv5iyuXzzqpufGdDvoJnGnuye6/+gu8dD1YHrUejzx1PdkezZ4PvMy9Ur1Ouz1ytvKW+h90vuDj4vPOp9uX5RvgG+x74Cfkl+MX5XfY389/xT/Fv/JAPuAtQHdgZjA4MAdgcMMLQaL0cyYDHIMWhfUG0wOjgquCn4SYhYiDOlaAi8JWrJzycNQw1B+aEcYCGOE7Qx7FG4cnhX+SwQ2IjyiOuJppHVkfmRfFDVqVdShqPfR3tFl0Q9iTGLEMT2x8rHLY5tjP8T5xpXHSZYuWrpu6bV4jXhefGcCLiE2oSFhapnfst3LxpbbLy9afmeF8YrcFVdWaqxMX3lmlfwq5qrjiZjEuMRDiV+YYcxa5lQSI6kmaZLlw9rDesn2ZO9ij3PcOOWcZ8luyeXJz1PcUnamjHM9uBXcCZ4Pr4r3OjUw9UDqh7SwtMa0mfS49LYMfEZixim+Ej+N35upnZmbOSQwFxQJJFkuWbuzJoXBwgYRJFoh6sxWRoqcfrGJ+DvxSI57TnXOx9Wxq4/nKubyc/vXmK3ZuuZZnn/eT2vRa1lre/J18zflj6zzWndwPbQ+aX3PBv0NhRvGNgZsbNpE3JS26dcCq4Lygneb4zZ3FWoVbiwc/S7gu5YiuSJh0fAW1y0Hvkd/z/t+YKvt1r1bvxWzi6+WWJVUlHwpZZVe/cH6h8ofZrYlbxsocyjbvx27nb/9zg6PHU3liuV55aM7l+xs30XfVbzr3e5Vu69U2FUc2EPcI94jqQyp7NxrsHf73i9V3Krb1d7VbTWaNVtrPuxj77ux33N/6wGtAyUHPv/I+/HuwYCD7bVGtRV12Lqcuqf1sfV9Pzn91Nyg0VDS8LWR3yhpimzqbXZsbj6keaisBW4Rt4wfXn548Ijvkc5Wi9aDbbS2kqPgqPjoi58Tf75zLPhYz3Gn460nDE/UnKSeLG6H2te0T3ZwOySd8Z1Dp4JO9XS5dp38xfKXxtO6p6vPqJwpO0s8W3h25lzeualuQffE+ZTzoz2reh5cWHrhVm9E78DF4IuXL/lfutDn1Xfustvl01dcrpy66nS145rDtfZ++/6Tv9r/enLAYaD9uuP1zkHnwa6hxUNnb3jcOH/T9+alW4xb126H3h66E3Pn7vDyYcld9t3n99Lvvb6fc3/6wcaHmIfFjxQeVTzWfFz7m+lvbRIHyZkR35H+J1FPHoyyRl/+Lvr9y1jhU8rTimc6z5qf2zw/Pe4/Pvhi2Yuxl4KX0xNF/1L8V80rk1cn/vD8o39y6eTYa+HrmTelb9XfNr6ze9czFT71+H3G++kPxR/VPzZ9cvrU9znu87Pp1V9wXyq/mn7t+hb87eFMxsyMgClkztYCKGSEk5MBeNMIACUeAOogAES5udp41gKaq+cRhv7sUvm/eK5+li4gNQSo6wYgGunhGwHY7wmAMQBACZnDkR7tCWBbW1lHVqRNlGxrMwsQqQMpTSpmZt4iNSHOFICvwzMz0x0zM18bkFrnPgDd7+dqcqm1VSsAir5SGqDmSqf/aP8GsNP+fxCsRgoAAAAJcEhZcwAACxMAAAsTAQCanBgAAAGdaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA1LjQuMCI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5zOmV4aWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vZXhpZi8xLjAvIj4KICAgICAgICAgPGV4aWY6UGl4ZWxYRGltZW5zaW9uPjUwMDwvZXhpZjpQaXhlbFhEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOlBpeGVsWURpbWVuc2lvbj40NTA8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4K4RlDEgAAJ9RJREFUeAHtXQd4XNWVPm9mNJIly5ZkuclNci+44optbHqHhGyWhARiwBBMEkI22c2GZJNNSHazJdmE0EILNaEHMLjjbuMGuBfcu2RJtmVZlqbv/9/3rjwaRtKMPJJG0rv6Rq/deu5/zzn33PPuM0IIYgebAgmmgCPB+dnZ2RRQFLCBZQOhUShgA6tRyGpnagMrHgxQHbVV0pgoZgMrJjIxEkBlGObPBle9VLOBVS+JiClOnA0JlZVI8EypDa4YaGYDKwYi6SjBU8XiffWXIsGACS5yMTtEpYANrKhkibhJEQiu5cwfIkZ2D/GtfN+MELSBFUGp6ksbWNWkiO0k5ao7xD/vXyVYekzEAfLZ+lZUwtnAikqWKDctruXolCeOcd8V3wdPRIlk39IUsIGlKRHHMWXqrRJY9xsJ7N9qKfLBOFK3jag2sOLpZ821cnuIc/KvxTf79xCFVORtMkaS0aZIJEXqvTYVdtekWyS45i/i373JTBGyuVY46WxghVMjlnNyLQRnz/7iGHmL+Je8ZHOtKHSzgRWFKHXfMk0PkpImzgnflOCKP0rg0C4ziT1DrCadDaxqUsR/4hgwSiRVJPDJwvgTt/IUNrAa0sGmNBRH5x7iuOgbmCH+jwRPnbCXesJoaQMrjBixn5ri0HC3E8fAaRI6cFQC+zZbyW1rPAlhAyt2NEXENAHk6D1EicPg1mW2Eh9GIRtYYcSI79SUh47cPDG6Zkpw95sSPFlkZmEr8TbHig9MYbEtPcvI7gJgXSOhE7skeHSvFcEWhzbHCsNKfKcmsoy0dDE6DxXxw5vmwDYrCwt18WXYqmLbwLqQ7lQizyFGpz4iLgDr8AYJ+TyWr9aFZNzy09rASkAfGh07irihuxcBWDQ7MLRxPasFACtefQXxuW6nfjy3fmZ3R/+v44Sni8U71AKP0bE7uBSKKt90HlixpI9em1ZxN+mB5VvxngRL4FTHEBMXQA/T20D9eG79VAYAXJDKkM880jOBANBxwtMRKQwaoNGAYkUxUtspUWggu2DpUTNdG/8PzSBJA0GEDg+VHpFgUTfhtF6BQHd4ZLV1/PKTEjiC2dm5s5j+HwIXKVfnoYrjIt4yrL9AB3KkiKS0E8OdKZKeK9K+sxjpaeLI6ipGh1wxsvDrkCNGaroJUF2WAjbrFTEeXS51i49DehDUVk+dVys/Jj2wjK75Eiw+iG6YGFNXBAsPSWDDHIAlG7hETzsNMTJSAZIeEvJ0llBVlciZPQDsZxI8DUc9YE1wi8q3pOFHLHUcIUbOUDHyxoijYLg4ewzAzA/2Klja8RQ/BMXJcOQlgKUMNzgPlR4yn0WCj2naUEheYFn9Z2R1k+Ani8wuqauztDsLFoadXByuK/g9EvLiV3FGQnidK1hyVILH9kno8HoJHVsEcGyW0Gks0Rx8TQKrYUlIBUfK+7o4hlwhzoFjxdGznxjwbtAYA3RVaYYTwC0vhu+fXwwXtPk2HJIXWFZnOTp1E3/hRnCbc6ZoUrqOhbraOk6JrCgPLfCJCxyMv/QOIp17irPfSBU55K2UUPExiNLPJbjzYwnueRfA20IWBgPoavHvf1kCc3HZ7y5xjr5FnIMBMniTSopbMTDDnSuhs7tFKs+KZOaAc5niPEpNWv2t5AWWhR1HVicR2IYo4px9BqOz0Cf14Eop43V2HZUhHcE6ATekqDN69BMHfjLhWiji90vg808hWjGB2PMsniNN+yngavPFtwPeo5kp4rz0MbwSBuu7CyA1QM5z4FjeqnqrqEtvrcfkBZbuGuo1nQdJEN4DClgJ6Qkgsxqc1SfIWQMORwBNvZEzKU9cY6+CVf0B8a8BwDb8EhwKj7tPB+BPi3/+tyEWkTR9OP75ASrkF4pQ7vGkrYXkpgAVZATngHES2DgbZ7jW4kw9SfQ/gIL5a11OTfOCAE4q6jBaUu/4hbh/sBU+WA9DNC7FLPMYlPppIhmjASaYMQx4/fm2g7vuP1+x2sTy+Rit8iy5gWWxFUefIfAeeEWCJywbUVN1Vg2QEeQG3oYeJqnfekTcs9aIdIJYLFoGvHNaCUDCPmakDxbfS5eInxMOlR73m6q+SQTRJAeWSSlHt96wLWVJYNvHFukgqpo6VHMxck2HuIZOkLTvvSium16wagIAUZRSz0q9SLzPXSXeBS/jnsVl2xi4khtYHPHoECOtvThG/VT8Kx+HDlOpOlZ1otWlTXrQAAtCRKJe7mu+JY6+N2EmCM8GB7V7gsspRpfx4v/7neJ563dQvayF6TYEruQGlkKMyZ2cwyB2tiyHCzCMmgzN3UkOcihUo7Icdq/PYSSFBZ+g8p/G7wwYlRd+WpMksPhfxPO330Afg7i0BopK2Mr/tQBgmR3o7D1QjL554l/9FvoPi3KaczRXB5l4lxC8RkNF70L89YLifhIuNONgkhgIs8NG1NMDzgVwrXsE4HpEmU3aCriSH1haHMLg6Jj4Ewku+28JHNhuwsmaNTYPtkxkBU5gPRLSWVJgRC07LI7hX5bUWS+IZF8nUvEpwAXO1QngWv8f4nn7f8HJOHs0RXzz1LtpSk1+YCk6mJ3oGjFdren5l7+BDjOV6KYhU7RSTE4a3A/LvJPPUUfcoiXekd0N4HoepogvA1yfmODqfIkElv1MvPP+YmVmpo+Wc2u41zKAZYk9Z+8B4hj7HQms/LUEdqHDGKBEN30giOB5UXVWQntXwMQAfyx/OY4AVrd8VR1HTjdx3/ekSA44VyW8LQKV0Lkmin/2feJbO0+BUA2Opq98k5TYMoBFUpBDYX3PNeFWNYP3LXxSrR82y+ZnJgNVy0zBo2/DKwL6VdUBWONvEyMXIGPAdpKO7K6SOvMpeJdiPdEPNwrYu4zOo8T/2nUSOLgD4AL5m1Wcm1VtjP8tB1iWsdQ5dDws31+T4Gas1a3DyGdophlicA90KKhM4kyDngXFvf80c6Gc9XFAPoKbOrr0FveMlyV0bh8iQvxRv3LniO+Nn6sZpQkuC6lsSysJLQdYSuE1bUeuKXcpH3P/3O8pdxfFtZpMJAIEFIPwtghsmQNfLyyS0yMVE1VnP+2uYwFFbSUZFGf/0ZLytQ/hBPgZ0mJhsd0ACR58S3xLXmslMPpiM1oOsFTdTYXXOWIKXm2/Ey4qx8T73u/wZgxsRE21H6jFHYOHd0tw398Akn4inhJlVnD2hJkhrJ7mqVnnlInXwxPi1/DzWqfEn5EzVvwL7jNnuNagsRK3ikPLApbmWnAZdl31AMAEZrHrCfF91JQj3wSKf9NiVT6t7aGK3eIYeivctsC9yKxYz+qAcwuM7htmQQe7HMbSQqTFfUhL3/w/g9vRBJHArmgm1aC6yThJYGvCs23Ec6sDuFbnHP8rrp5IYO5d4t+83OzQxhSJ7DCAhi93BD/5oxiZw4BsL36YVwyfbjUaF5GBQEO9DNjiUr70CLxMDysAGpnjJbjlUfFvX2umSIQib9XRyjCyJk123fKARdJYIzLlmpkQRYPhrTlEfK9OwwZoOzFU0KTGBBeK929cCs/SgzCKwrmvcp848m+Db/xQq9MAomhBiWoA8KJLxDnpV0i/XnEpA+5m/qUvWFZ5doeln0XLo757FqhCZ0+Ld87TyBigb6bQMoFlcQBHp+6S8hUsTJ/G1N09UrzP331+//VEg0tzqzMlsKP9CW/x9EeXhaDnlYhz3D+enw3WEIORvWqCJuWKO4AwPPPDZJ8xAeL8WfHv2WRGtgZNZMp6r6360bLveeknEMswe8A8owdhvekTHKFlAotEIAdAcI2+XJyX/S/ECzrGWyyeZ74DoBU3GucKrJuP2d0aABn6lPcUdKbRwslETIGgAwBoRHVNfxr1RJ3Vq2gQ5xs+RBYUtQ3oEg0qpK966edYQiqQlMk3mVWqE+gx1bpBkRrQigaV0ziJrNHtvv7bEEd3QgTCq+DUYoDru9hhryhx4LI6jm/z+BeDG2RBt0IIle3CttwP4X3ELiZniKMTXRNugM6VD3CexnE0dK1fSfD4AeSKYLXLvKjnfxioPK//VqRwi7hvfdBMFE8+9RQT7+OWDSzFAaAUt4Nf1Df/AzoP2L87H2/azBHPEzPwousBE1xKKb4A3cWiqm/pa5gBQvF2ZUCMnQHAhopr3DXx0VxzLbyA65z0Y4ATbkDQ1UIVyFIvU8WaI8U98wv4xPPGf0tw1cPivv8589U0tjkOoMdaZKzxWjaw2EqKDhCYi7/ue16Fu8pmKPRDRMq3iefRyyWwG9ZxJV5MMRQrYarjWZ0X2LUBi8g/ApjgFgMLeujkDpg8fqmWbRSHaUAnOsdcqdzkxY9X2zIw29y6EOjyxAYI1gvqQMhTIZ5XfymB+f8q7n/eaXJPVefm7drmLb269y7wRM24YOGGP3rKvWvABTDjSu2GDkoX7+MXi2/1B2YB7HwSPdZAUcLOqygT398fQedD5NG2ULUXovdWcY2/NtacasazQOjM66tezJBy1Dd9nIQOPl2/Xz/rRG6EelHce579Jwks+o24f7RGnL0Gme0jPZo5NH8NEkUAciUQ3TV4grjvXW2Ci0aurEnie+Um8fwVVm/s66CUfkrFmPQPABHBO+85LB29D7D2AVhdaibouvFflAhWndwAbmWmc4hz1NXwkkAhzgwlDgOHMMNVgZWMCFq8oa2BvRvF89jtElz7NN4cWiyuIRPMNiUBqFjr1gMstoYdTHANmySpD4ALVEEsVh1S7wAG1v6bVP3xq+LfugrxzsetFWBKnEAyrV8ggcU/xF4O41X+odK1mIX+Tr1ModIqMcvC4w0maJ0Fw7AcBFB4S+FDD4azh+5AAFV4vhwEWrxBn/ItfVM8fxqNF2cXi/v7izAzvswElZllvBVplPitC1gkkQUu7rHgfhCjPx32plNL4a5yOZzuPhfvU1OUD3qw6JAZ14pfA2DsRIx8ft3L99o1ANUIdCwWmhVIr8cLFHdfeGdYXM7omCuOwbeAC2IQpA/F4vQynMPFhqEaUEAMRV/hQal68afiex12MzBj9/1LxXXxFWGgSh5ktT5gsUPYaQCHs9dgSf3eG2L0/7aEji+G31QfAAxuwmt/JlW/7yfe+S/AlnSiJsACcFNgJ+JDl94X7kHv9cZz9CLZXGWhuL/+WzHaZ6EzAT4LHCyyQYF5IDgHTQTHwglsY6GSxSi7UN1X/1AXKui+ZW+BS03Dm9j/gzaMlJRZn4pr5LSkBBXr3TqBpVqGpgFcDuyrkDrz/8R13VN4exli0FMIDnQp9mEYAm/OuwCwq/H+30vYKumwCRSnE/pZiXie+z5mmPBEwEYf4kiFCQMd+bUPxIltjbR+pDr+gv6ZHMaRh91rMrsiXyxGY1Ko6sJ8A17xb1kpnsdn4lWyr6plJMfgGRgs74sLrjimKGYeZj4XVJUEJzZCCAnOM7myU5zFHD/sJN/bP8R2juuwkQe4BDmO9ySAtAtcCF+ZGPcbcQ6bLP6Pnseb13/GsshY1ZbQsQ14MfUJcd88K7EcgqRHHejb5XnqAQkVLoHzHzY/mfYoFrWnim/hM0LvDW4QF/KUi+vS30nK9fdi0pCpBo2aiCQXtatr0/qBxabqscNOhOjzzn9OAisehvkAIo2L2HydDD7poXIYK6FKGR2wXEMRSCW6YqM4p/5B3F8CB9NB5afHo8Ut1KE2zoG4Onr1CeKGiVLv+0+Kf+ED4KYAc+AcZojbYeMCt/SXQIQPxproE6aSzjqEDRZdpWQ7cim09QfdgRCNBpZfUm/7ifhHXCH+D2Gt3vs21vsg3mCfMrIuRmdDnwpg/s/9GLhvkdqtz6W2MzKwVxdFqzhIttpAFI2cBJG+X32itu7m1pLBo3skeGgjzG7tUS4NpHiTGntAhM7sxKfrfiEp192ndr4xMQmEhs8YdbZJdmwbHCuc6IrbmB3Nfaz8GxZA17oTAAKH0pvdOtvhHB2oOhl2qzOYsZGT5WILyTx4r/YYoRaSDbzmZWRiS8qMDgqAhhveBAp0YQWCu6i9330++L3jrR7uIHiyUEJH4YF6aB2Ob2IWiDd4OvaCFp+DhNCzwLGkw1BJufZH4hp1Ke5BlLcALhXWauW8EX7d+s/JMMC5OOoNVwp0F3InTu8JNnAi+KSHymBLQl8a7eBqDJAZndi5ABr2wwrtfUL823AJ6UkPUCOjB1xfCkyrfHpPGFGxKS7dVRBCeFNHbah77gjAc0wEP3qbqrRghkY7mELSYMdylqn7RgZuOqk/7ceWSfMB4AEmwFl2C+BSqtHWv7bFscJGfbD4iHjf/q0ENz6uXskSJzoVdiqaFByT/gvnZRLc9x50MqAITERttsZdlFP7gjtBZDlgzWSg2CSHCWAVOQDLfvCUOVnjM4LYAS7khK7kRFqYDtRN/1nkvwugxhUwaPS+QxwD4Ki46U1svAvbm9MhqQ8tx/onuBg5pxblzLOFhLahYynxhx7hqId/ue+Tj8T/7kwspRyBaJuKe1DcSzFT7HyppNzxjrLcU/QETz+I+8fhJXEQetBu7NEAMJTiIwEQjYYXCjYBRxMXf8SMhRviSelDYIwh7OcgfvyADwXO9kMgUrF3aQ/M7voMFZoa1DZN2Nyt6sBaLG7PR34FJldlPi00tG5gkUMpEae6Wrku++Y9BS4Ff/XckTA59BU5vRydDyZ0xZ8k5YrboTOBwxAEACFfOBX8nP3N17pC3G0ZVvFQRTm8J0okWFEBkBVBxMFkwW2+fRB9SsyiPLwsYbhTMOtMxyyTuhhEJPeO5y8zC8+gx4UHeH4aqTArsMpOpFPcLTxCyzpvfcBS3MnSSSy9JFh4QHyr3pHgyh8CQcBM3mUQOfCCKKnEvlsPifuqmWASw8yeCxOXSgwplOER8lI7LdOpjz/ppxhVze4mIsODCejwOzXOFYpwh/XkC66p2FgE2DScHU1w1Yjcsi5aB7A0mKq5EzoUPRTA9wP96+dKcM1DalYnWZNhl4K4Ob4E63P3SMr0GeZiMjlEuLjUfah0mwhw6HgEnOJs1vNocZmPjs+j1pVUEvyzgG8Wh2sX9DYAi9Z+tY+8+aBF/m+BwLI61OxVs7PCOjV09pTanC3wKQC17T8hmtAvaUOwm9AOMU6ugv/TQ/Dc/Eesz40+33nhXKq+btTgUCCuLzKe6/j6WFcSmirIsVKzAS5rcmDhtq5kyfgs+YDFka1Gt0WuaFxBj3gVBW/KlJVKAF+WCH6+XgLb54EjfWAmplINYBntuolr4oN46WG6OHv2h5ixmq0BVYNzWOU2x4FyUNU3E+KQMwGGloms5AKWFhfhozuSrnidPngWnyo5VahePgju3wTr+WwJHYH/FZRwfg/HgCmIe1Nxkw7nwHHizMdMDN/WqQ4KUMg4WQClKoYR5KfpAhcd+9g6VnVnXeiJBSpapdVmZvwWjR8b8vvwq4Bt6ORh/E6oT4+EilaLlKJAAgl4Mbpg36wRd4vRbRi+czPQnMJ37oFlEVjEdWD+FJ8EU1IByqqgMqaeMUVhx264CeDrgabb0IKOycWxSDh+3uT4HtNGVAUnJXCoEIyQ/OiRkYXd8rrPwBQer3vBQU46dIWY43S+EyzfEB+RU3gNpnClPlk7B2aKUCWARUaa0zlZaxlzvZIHWBR/AIKjax9x3zgr5gZ8IaKawiMvBiVSrXPzThL+JyeF14Uf7PfcKWVEdeT0sOppPkvCStdbpeQBFqtqgeuLtSY4SOSIEC4qFH7wLxnFXES1a1xa2AlVYB2SFv2sPBhuNcdK9kFRoyU1LvTUo8bNZr0guL7wQ42+cA/xaJ3W9ylDWnAI0Yp/Eg6H3fGuIbdDYmjBTUo+YJkkbUP/TU4cwhKRQBIavceZuqK63XKRZQOr2SFsgidUfFS9UOHsO9yskdIVm71yDa6ADawGky5BCSnKoT8GD28X6Q7p3qO/mbG6n6AymiEbG1jNQPTqIpU5BLA6Vw7fr7n45vR34b5FGxaCDSyTDvb/hlMgyO/x7MEb1qOuMb0cLMA1PMfmT2lzrObvA3wWGF6qcDDlV1xbS7CB1Zw9SXFH957PPoTHxU/VVkyqOi1cDLINNrCaC1iWuAuWYG1067MA1pfNmrTw2aAmpw0sTYkmP5r2q8BO+Nr3vkpc/SwzQyvgViSlDawmB5RVIJeesCWRf+Vz4rrmx/AehTdH+Dpnc9UrQeXawEoQIePKxhJ3gT1b4NgXwK4xU8zkrYRbsTE2sOJCRKIim2T3rXgdbzv/M1yk8XJhK+JWNrAShZN48lEeGZCC/GCA96y4xkwzU7c0r4x62mxzrHoI1FiPQ5VnJeWG78HCDsf8VmAQjaRT23rFPrL1yXCtOFjL9WKojYQ2x6qNMk1xv5WCiqSzgdUUAKqtjFY0C4xsog2sSIrY1wmhgA2shJDRziSSAjawIiliXyeEAjawEkJGO5NICtjAiqSIfZ0QCjTpe4XhW8obTTAjaozyGiNP3ZPheet7iaCTaX/F5ilwqAgneyLy1vWMPDa6gVQTK1oj6noWWdF4rmvLl/ej1SOWvGtLW1tZseSp49SWd6zPdbzIY311q+95ZH7xXDcqsMIJVomtFCvOnsU+H35Ja9dO2me0xxbq3GeIKxoN7/DIxobnde7cOamoOCcpKS7JysLHAmIoSxObcQnC8PxY99KTJ8Xr9Upaapq0b58h7dAWhvB46kYM/3RZGuxnQZ/i4hKprKqUVLdbOnfuLB06mBubxJt/ePzKyio5euyoMH+Wldm+vXTp0gX1xya9COFxY6h2TFEaVRSyEceOHZPVa9bK1q3bJD29nWRkZEjlOexrjreYLx49SsaOvVg1MNbGzVuwQPbs3iPt0tqJKyUFL0PjK13YsDY9PV1uvukmSUtLlRPFxbJgwSLZum27AnJGRroMGjRQbrrhesnMxD6fpmxQRN6NvN6fPVsyQGQHFoIJQtb7LN5Mvv7aa6Vv3wLxYY/2NWvXyvIVq+TMmXJ0UIWK17NHngwePEimTpksHTtim8c4Bkh43EOHDsnKVatVfbt17SqZHTKlrKwMtCuUkSOGy7RLp0jPntjqO8ag82a9P16zRhZ9tESyUL9OueYb1keP4gNUGBxjLx4jl06dCvCaNNEAj7GYOqM1CsfSDdu0abO8+MqrUgVu9c3bvy4XjxltASGAjlonL7z0igweNEDu/OY3JC8vL6aOOXr0qFSAE3ErhzfffkeKS4oBBAdGYab8/GcPy/79++XFl1+Rq6+6UnqhM1asXCXbd+yQcozWsWPGyJ13fEOc/BCTBQICpbCwEJwnTT79bKPMmbdAOqMDDh0+Ij97+MfSu1cv+cOjj6lBcdUVV0gunnnRYatXfyyrP8a2k/jrlJMj3753JrhA5+p866K6Lpsd/9HiJfLue7NRTk+5/favqfI4WBhn9+7d8txfXgT9PHL712+TCePH1Zu/zpvc+uVX/ypbtm6XWffNlCFDBivas16VlZXyzLPPyzbQpW9Bvtx7zz2Sk5Ndb951tSnymfPfESJvXsi1btjJk6fk2ef/Im5wFY7mW26+UXEVEi0F9/r06S3FJ4plH4Cwb/8BGTVypKSmuuttHEVDp06d1G/Hjp1CAlJsdOvWVfK6d5e/vva63A9CDhs2VLKzs1SZK1evVs/2Hzggw4YOVfVhGzlCU1NTVV6s4zlw0i1bt0pOdrbqhGFDh6hOz0ddZ3zrToimXMVxO4DrDRo4UA4fPiwejwfitkKBc/SokQq0ddFP08fvD8hbb78t88BZmf+s+++T7t2wuzLqpOvGdvLe5i1bAfrPhNwsL697nTTS6f/+7nuyYOFi+cH3vyMXDcNHCpCvLpv5Mz9y6OJifIATRQ4ZPLi6XHVygf8azdxQerJUysvPKtFTdOKE7Nu3X1WVjdMN7Nq1C0RXmhQWFcm69diRL4bAtAwBfFeQOk+Q+0rhHjtq9odz5Ctf/hJA1k09ZzwC14WtIXW8ykpwu7DAtEF+oxDBB/Gg8gInycxsLx/Mmat0s1uRJ4POg2W78I2d8ePGyqnTpwHgbNmxc5cQuAy6juqiln+LlyyBmFqnyrny8sskGzpgIMANU82g86AIL8jvjXgd5K13/q50MA0SHVcfdZqDEK1Ll69E/cbIgP7mm9X6GeMehXqy6/Pd4saAdGMwU3Xgcw1Knd+FHBsNWOQeHIkHDx2Gop4BroD90xHCK09u4fWiE6HfbMGopNwPfx6tYfo5jxxpJAjzITGpK5Dl8x7FHTuKuh05Gu8FcZ2enlEjW5UPuKgKzJABR4KH4vPaa69Wt5ie3JbxeWTIgQhk2QQm7x88eFDdr+0f82C8w0eOyLz5C5X4YdsHDhygkjiwN7wOjMf45O59C/pCz/OKB/ShzlRfOAyak5Ydwd1ZP+YTHnLBCQcNGKBAGsCA5ADR5YXHu5DzhCvvuoJU0mfecxcU0OMKVJzhMOjnutJsNEc/R81pKKxdEE93gI5T35F5+rGl5BhMBhg0IZ3YIJZEe+e996WypEouv2ya9IDCzcA0UQP6wAngnITudc3VVyr9qbb6cMQrbmi1oaSE+1fWkbdV4DrolwQRxWi/vn0VV9d11kdG1eUqvQ4DkHrQ5s1bZPq0aXUq3NRB22PCcvjwETkBacEZoM6PXJezwXvuniHHjxeqc+qGDLXSRD2N71/CgaUrSKJQH4qcLvO+JpiuKjkAp8RnIToJrHiCAhVEIjliXvfzoNFEmjp1CjjCQCjcXqVnaW5TZxkAHWeaBfn5KhqqDKJHSWHdY3sIYnZoZNt0Kn2fs71t0A3ZuadPl0n37vhUncUBdVx91G2gqGUcqg2lpaUYhCcUsHS8yCPNIKgxOJwPE5lX5eYbb1BKegoGgs6TZhLOeBsrNAqwWFk2gMTkCHHgnOYFfV83jsQK4SUCXgfwtoofndmQQLFFccuZnQoRKKAuF3dQPuimCInILnpWiKR1MN2+aBHJmU+eOqUmCDS/7N6zV6hosw2R6Ug/cvPCwiI5h5lcMdIeOnJUThSdkP79+tUK4oJ8fI0M9eFk6DR0wCeffkYK8vvIwAH9oZ7kS3dMAGh+0EGDXl8n4thowNKVpa6jAxXsKhj/OIuiLWXT5s1q5LJDQCX8dMz4j0GkZxbRAuvCENlx0eJW36slr+rnDTxhR1PXY13Y7nQai8G9OBHB8KtBAkRR4OnXry9mbYPIhMTr8Uo3cDmGyPbwmm3lzJFc6m+vv6HOO0OnKgIYOftmAeTuBObwi4Yp/U7rYZH5qUIa+K9xgIXKs5K0eu/bvw9K7SE5gpHm8XqUMkndpFfPHkp0FReXKKNmA+tfnQw0rzUkkmC1FhLjAyrVtH2RW3PWfBHMIpdcMinG1DWjRWuXvncZ9Mk0cPDZH8wRmn7aY5ZLpZ26HSdMNDfQcN0P4vBLN98kBQX5CpQ6fc2S4r9KPLDIHQAqWr1nz/5AjsH46INiffMN18ko2HmoL1BXYAMWfbRYGf+0HhZ/9VteCir7OhBcVVDgGTiDDZ8V6ji1HesCADkhn0+aOAHib4CSDJx1H4FxmcZWrk5wBSI72wVOViR/fOxxefA7s6Bz9U0YuM63srYWxHFfiz9auh9/8s/Kgp2BpZbbvvoPMtqasTE7LZpoeSZx21LgIKJhkjRwQOGvwqSFgaCqCyzx0CicphR7l182XaZMvkSBiOD6HDasnbs+V+aLHBiRWZcP586Dhf4+LJMlBhKJycVqNQnDETFn7nxM07MVpyKr1aAyAXVeaFGpp1hoSyE3N1cZRamsp0AxpyLPECuoSMO64nKwcimNRmmuDvTvbyr5Sv3A8lQv/CZNnKjMEMtXrMTS2npVH65LcoGdE536yoilvxLGLkzQCEZFIewjx5W442o6G8agKwssVQc/Z0LUSNtA0GCgTYqKM00T9JDgLJH2rFiCpmG0uJr+S5ctl8cgLRYvWSa//8OjatmJZfO5/jE9bVv/8JVbsQg9WRmC+ayK38dOUEgYsHR9fJjdVC9NADPt8EmSyKCJfBIjhNNpTRQ1ZYmM3Iqu2U62nYvJ9PCgeYSz4xNYM2U4T4eajdb3mfaTTz5Vs+qaMUyORy64c9cu6YFZIY2pNFKjyOrA9Jr2aiaOJ8OHX4SvGQeUKHaFzeCrEzXwJOHAUvUAoNgAEkSvw2niBINmSzlT2bptBxqfrqbdSFEtFHXcaG3Sz/SxZhyLiuHUrBkh6lWNvDQDxVFnU+N5eA5hnaZv61vR0uhOpavNhAnjIAZPY2A55ZNPP9XJa4CLeWgAMMIqeFTMnb9ADcbqBGEnNO10yjG9L8rLy+FycxFEn+luo8sOi65Oz5w5Iz58boXKfMeOps9aZJyGXCccWHQhobGSdhlad7mGx0CFkoTSMx/6N02aOF7d4xJKEIZSHnVcdRLlnyYQicjz8J+2mek4UZJHvaWVXX1UeSImrekM+r66wD+dv1kH85oinfd1G3QcnUYfSQM+4xSf9iZymbXrNsi27dur26LjMh7L5pH+Wu9/8KE8AC8IbXfS8XjUQJ4M0wXzJP2pV+l6EKCMwx/PmS/1sXXrN8DsUSETAXRa7HX9wvNuyHnCgMUGsFI0J9xw/XVqapuGBdAtWASmMsnAOGzMbBCIHXALiMtZSxlGDUFIsUB9g2YIGhIZmGd4oHGV8bmuSDOGSURa7QNwwjsjZzBSqdvFGmhXOgUFmj5KdMEJgaOyjjS40tmP91kXlsPA+rAc1qP8bDlWDIKqE7kE5IN9iPXisg3TRQuaTjSKzrx7hjIHlJ0pkxdefFktMJPTEBT8sYy9e/fJ0888B51pqfzoB99XC9/ROl/nS3ekb8G/jfVfATCuga2K8TVAGY/nzPvNt96RpctWwHftcswaJ0erboPvGSi0Zs81OKuaCWmAW7hosRyHHausrFyGDxsC0GWpWdAIyPUr4TTHRtIiTMc8ekGwKpkYNZwaX3/dtVF9m957f7Zshs8UuaICQADVV6IXX7tNcaulj0HwFqBiWldgWSyfOsnfXn8TSxwd1EI2l5ZUhvhP/Y+SkXrj3TPuVAovgfgS1t9KSkqEa29+gFAR0Oo83iO4rsQUn+uUupzIuuj7HBwUhasAgi2w/XVEPeh3xecEMJfCpiGfy6ZPq+ZUrHd9gQvQCxYuko+x4D1oQH8ZB0/dHAxiWv3pXUEHSOZzI5jApEkTq3XdWPKur2w+bzRgMXOOWgKLo5DcgMsXPXv2BJcyXWSpb1E08tkBuJxwlPJZD3iT1hZo9+GaYm0EYIdQRGlf9Nry0ffZsR7MhmrLT8djfhzpzJ/tYt1r61/GobsLRVZdgfF0uTTTFJ0oklJ4SJDrcp0vt1Ou5MEbg7ZAhvD4seRLkXcMM3RyPc7UtX6bkdFOCgoKpCA/X+lW8eRdV7nhzxoNWHURIfxZ+Hl4xdrSeX004HMGDcJYaFNfnjqPWOPp+LEeGw1YrIBJjy9K2kgCacIxPrlA5PPIxuj4kff1dX3pdTx9rC8/xovMs740kfF1WXUda8uzIXnpcmrLUz+/kLx1HtGOjQqsaAXa99oGBRI2K2wb5LJbGSsFbGDFSik7XlwUsIEVF7nsyLFSwAZWrJSy48VFARtYcZHLjhwrBWxgxUopO15cFLCBFRe57MixUsAGVqyUsuPFRQEbWHGRy44cKwX+H92F5CAaTGppAAAAAElFTkSuQmCC</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: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="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="support">
+    <md:GivenName>Arnes</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@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.uni-mb.si-idp-20100614.xml b/swamid-interfederations-2.0/idp.aai.uni-mb.si-idp-20100614.xml
new file mode 100644
index 00000000..061f64d5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.aai.uni-mb.si-idp-20100614.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aai.uni-mb.si/idp/20100614">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-02-06T11:02:33Z">
+      <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>
+      <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">student.um.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mb.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,iVBORw0KGgoAAAANSUhEUgAAASwAAAEsCAMAAABOo35HAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAYBQTFRFUpWsEW2NzeDnYZ6z8Pb42ejtbKW5wdnhI3iV/v//OYahmsHPfa/BqcrW4u3xyd7lWpqwdKq8PYiiGHGQjLnI1OXq+vz9TZKqMoKdudXelr/MhbTFHHSSrs3YnsTRvtfgibfGAWSFRY6mCWmJ3Onu9Pj6vNbf7vX3Xp2yAFl+5vDzpsnUea6/oMXSosbTkLvKFnCQIHaU0eLp6vL15O7ygLHCLX+attLc+Pv8sM7ZKn2ZQIukkrzKNIOestDacKi7aKO3DGqLD2yM7fT2BGWGSpCoZaC1x9zkR42mVpiuNoSfKnSSWJmvLHqXBmeIxNvjwtriAGGD1ubrD2OGcqm8xdzj6fL0ZqK2L4CbrMzXOISeHnWTXpetZqG2d6y+FHCPJnuY6PH0GnOR0+Tq/f7+g7PEQ4yl8/j5Yp+06/P1+/393+vw2Ofsq8zXKHuY9fn69/r7o8fTW5uxtNHblb3LCmeIT5OrosXSMX+budHbu9PdIm+OvNPdhLPDAGOF////pnTxhQAAAIB0Uk5T/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////wA4BUtnAAAMg0lEQVR42uzd+V/aTAIGcEBE3iAeUCuKB4eCRdqKFVQochi0uC6trla6vhKKinhXX7d7Z/71nZkcBKptd9e3+n7e5/khJiEN+HVmMhnSxESQ744JBMACFrCABSxggQBYwAIWsIAFLBAAC1jAAhawgAUCYAELWMACFrBAACxgAQtYwAIWCIAFLGABC1jAAgGwgAUsYAELWCAAFrCABSxgAQsEwAIWsIAFLGCBAFjAAhawgAUsEAALWMACFrCABQJgAQtYwAIWsEAALGABC1jAAhYIgAUsYAELWMACAbCABSxgAQtYIAAWsIAFLGD9gPzUHmDdnaua3ZBYch9Yd6fzLxvGeBaAdXdOBmVjvGizvpbxqayenZX3wPpam1VfE5pZK8wD665MfJbbkz0G1q2Z35W/THoAWLdkNCffltgAsL7I9u1WspxYBlZbPiblu3INrLbYmjj2wKDJFHA3V3wAVjPHETIb1GTcFZupXq+v90/pq8pH5PQSWEqie2RPgylFXanroml9Kt1o6EVrmiTfAUutglOTI5qLmPG4zKIsjqyZpnSsAqkNAUvJVNZi6FhllJ/+JzV9nXtiZAlY6ofYuWlirdfVmR1BXyeex66ApeSNSW+y5GB/Xiti/U3Bin0YWEqEVEBnKTeb+rikrzXt+oDFc+JZa9a4xlpztjm4lXJ3A4vn6MLj0VunreZZT7VZD11mG7B4whcub7GPx9Td0WyoRF9mqoNnypvfARbPwuHrdXuVJ7Zz3cTy2wKJMk81Hj0HFk+v2aOfGdanDCUrq7Xw5oqUuAQWS0je1VunN0Ysm9Yt3Y3K0jKwWMbl2NbtWNrIw0hUHgkDi2VIdmf1w57JMJA1ZVZnJBtKlpqIY3H/+RXP2Hjv2JWaFy9mR5XVzz9sPp8++C1jhX7eu5c0+ifiGVu/mkymv5nMljqzZcucb3fcz/vt/Tz547F8z+T7SX4++B1bFYfv6e3kZ8c/HuvlfWHtdrm/Y6uO5/eGtfxbxhoHFrCA9fiw/CKwvoZVNg1WtS7om0rFFFMXZgImIQcsI1Z+a0twRbMlWqiqjW5TrDZYsbmYUco7uNbnTQLLgNVgZzl+OpX6+9/w4T8xsdcdkO3dM3Q+GTcDq4mlngSaZXO1+YL7wp9T+qv5ILBaGni/X2vdZT+ftiwCy4AlDfX2Onn981lWez1susqvq8lYti2fgdWCNXJJyCmvjOyr5xSf8u95buhMFlgtWLUwIZ155SIQQlyyk31Dxhaf0MUOYN2B5fwSqwEsYP1PWBLtJjCsXGs1LKMafnk5cohiSRTrLMh6CQxLYFgHadadUEqWX74eAxbre55NOxxXr6zWuTGHwzF8ZrVaF2826XR0mC5a6Mz4jeOm1wEs9j3XasCT9thjMXuaZq0ai8WSZTb1rNHFJJ1JrKUThyhZvBqO59tXVROGMRqlL9+HNqt5upP2ZuzqCeKb7pWpqEldyu88qeN0p/VEOhuNCd5iThbtK93rMdqVKFQyKbMsug4LsZ1oFVgGrEKRXSG5Isj2rYD2xVhi51qesbFBwLWdErCaWGoTJcqi3/BKUFtPuxDAMg7ReBJagy+IfFpSexaCGW1WG1aFLCiX3q7NkemgnIoQB6+P1TPyzgysFizzMSGbXOdK78Hz0x12lfI1sFrHs6yETPD6Nkr3HWDjWfR0h+YlXdwD1ldGHeryIkYdgPX/Y820j5SmWrEwRGMYosnRBp62WZ2ihiXwliuhNfDsOtN1YPGO1Oaw1/v6vdXa88Tr8x3OWq3WKzYNjx3SxXd0cSnui3dhiIYP0bxNJcqJmts9wv+LQMztdifVKY2dzlQ95WQ3hmh4NRwSv2Orz6iGvBruH/ZXvpWtJVRDlpolu379rRQdqIb60fCbKaIaGkYdvpEGsG7HqrkGPcG2MXh0Sg1Y5UWnemmWGO+hu3/rUpe653eA1YpVshAyr3QhXir7Py4rJYqe97iA1TpEM0nIKT83TJ+ob/CB17/XuOToK6MOe9ob7Ocx6vAtrIb2BhZgAetXxsJ4VlsDv0BIj/kWLHZNqQ1YLViSc37ekbsFyxaaH8LVym2dUpFGvgXLXxJLfmDdcbrThqUFWMAC1pd5cm9j8ONSi4qO1TLM1TEGLDasPNRShPq0N+gttay+v2HlB7hVwdw/uu4l46vW8aGQlvF5/bEVR6GQcfX70P28X9e/nv54rN9hgAUsYAHr94G1MHukzFxuWtte2u+8x094aum5db710Nx7QPsajchjxZr407jaeWy/SfSBcI/l9akpWD3SSKrBqdu38gYnCXGKm48Vq/NZSMUyt99Re2z0/j7gSSApTavzjuDuHZ9320c7T6PmzsePJf2atx8/SWVMg+q80N8Y/Mqmvx0s2m69OutUWq+jS3ISVvvJ4U9s2jNwypcPrAuERI4Olo9ZltnmC8c9nZ3NW0WG1WepWdX7kp64Gku5U6UpFFevP/P9RybOTtXN6OYfw2SB7WlUilyebmqtWrjzbE5pFdhHiVjJpfLhFqwPjnVctzWqpVJykX26qX4yGVDuHG1JWNiTmiQx7+qii2eurtk+99BmonpxcZFMCO/JQKoqlUrVMW23HUqrFElPa1jXJ/kbPptJHhUY1ktPLC/mCkzlVWq0s2NkjDgEavtLrk8w+81F1swfeKtBcebzGftDCaGB65qTvHbxv8PrNycPjfVRcmeHziyF/ARd41on5LrK70MYl47IcXVtaGK7kBughUMSasJLa/jD+fn5qDPomiRzw4urs5aGPKudn8sf2Y/npX0Na510eHh5qlZIgGGFHCHL5pLEZiMjnlrZGyHe0iT7Rjt103v2PPiZakRLvv3OUbv9Ff1TSWm3x/eKRPO8kHf/8+Gx3OyrY3Lsf0GndVo65v3810/sEVJxs8PZ01iDliyz0KXvIePWOwJHtSfq3ECQF6lrj9ZmuYq0yFiYkf9MwdJa+2VaskY8/OEWvvwlr4acO3hGIuY4P2KLXtrfkAR+3O6WeMk6/MMjwHLwhWpcxVrOs1+/M+ckJ4Jye3JbeoEMuBf1HQzLvzT3ltbu976QuOZ4hwasy90oq6ACMWINsUL8cUSpvwqW0sBbxCHSpZZUV4FhKQfnx4eV7lexiElgDYQ0R8JV2/7s7OzAXjVMsfS7b2/LcUXn7XDlui7qTxLI2Glr/85vMWCRfvsnEpaGNayeUZ/NVJVOGZbjC6wJWrqdstK4d9A/0KnkfKRYQkbDGs7TSjaYolXTXpLMNMH6EcVyah1Mt9ILmKubAx3RQ70kkXfyNi2FyUkj1qx/iIxRdwXLWbso2nwdd2Gdyg5yJSud+Wz50yPBUnvws7djdeZekPdmWhrC9uirCAstMTrWScquDFhmcuyIRTz6Yxcua91kIblCjFgLa+uEHwgZVsScZS11KH8H1pnfSUZlpTnsEJ7qWIfmywfD+vhMPbiHgu9uwyLlKbIo0nblUzqr/yMdq6Id/gT+2LSjRFzfppEgltxSCxbx2S3BeRXrrdzLXli8CysU3CZv1WpcHyQ61o2Z9+a8D4F18scEf/PLADvYtWLxLx3iNbKyxrqiezPhdqzRktbQBwJKs958+sl07pUjd9SKNedOX1hVLItyYFgyL7djKUfD9doyiUgVXseD3ibWL0GOHH8ILPL3kv3w/NyXFFkJi+SUC/YSWXYiXeQt+MaTGdbck03znz+8DS3+lX7W2Rx/2NBEzu68GR6+GbskrzdeWkKv32y49LH3HnPWcCb+NF3gAhv8t3fVaac9cdHV+2ErtuE7plWS91jIv0Xaxp2Lw+9Wl/o22CN6ujcqXavTFzHKN/GXF3yb49jffll1FsUHwSKWnaQkJRur/OSiqFQcG+ts9/NicrQnFBQBS9Htdts91Om0yLtZs4MBF43weZl8OhyJ2Qsvr4SCvt+okBpvFuAtXkF7zvmTf6OsaRsYdO+Wd0bj7jES7lO6H84ibcZ6XSMzNXeBP+DvwCHM1HZXWL2MFLXhkYLkLscPVx4ES3n6ujZr+KGv+8m4ofEl49PalR/GJ7e3PMW95YnuzX+ubtby9i0PgG/O/2T8vG07xEgphpWBBSxgIcACFrCABSxgIcACFrCABSxgIcACFrCABSxgIcACFrCABSxgIcACFrCABSxgIcACFrCABSxgIcACFrCABSxgIcACFrCABSxgIcACFrCABSxgIcACFrCABSxgIcACFrCABSxgIcACFrCABSxgIcACFrCABSxgIcACFrCABSxgIcACFrCABSxgIcD6r/IfAQYAD3yYiPycKHsAAAAASUVORK5CYII=</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>MIIEbzCCA1egAwIBAgIQGydARAgRllyMchH9n/20tDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDQwNTAwMDAwMFoXDTE2MDQwNDIzNTk1OVowPzEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAuYWFpLnVuaS1tYi5zaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMv6FWZcSMfkJ+dCXrrcOo1XQSgikBMybpgcNAXvC3tyBidPt+UCLzJ9OM2XxHJRLlsQOQPW8w+NkaU8oshs0WmzzJkoIppOEF6mul3htBqIVCZmvv0IWOsrzMHbgx3IPfy4/pKmWueLPMXVHt+5a3NarBSs076LruJIXBkllrgou6gMYUg7T5HdHv8tqOtZpgt/5zB5jhRsHVROwm/bc6bKQby7/+LsrjQBARyMRpPrU6u4ROVVwRSvNKyZTI4YPzLyHXpqxcogaMLmlMPeZsswn3Pn9qR/e0NLxodr4E9MNYbZcwcs8P+jp4ebYBBuJWNOhLT33rpzicgHy9akBRsCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRQW7zSmEln7cleE8f8x+ZF/uPrsTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLmFhaS51bmktbWIuc2kwDQYJKoZIhvcNAQEFBQADggEBAIsg2qCwCHmOsJc+3CUrzTePQ/io9QMewsIFZGy8hTJIwssWzBHHQIqk782ZJmTgSh5/HDfbWdk0+GA+B9+qkelpajcmAdAWD9BxLexSH2TAtwiFO5n4q9oSpeCa+QujOWdGv8OlV4YGISalLkq07D3IpOGOJF3RReO5/lRRsynXCbkfe5bb4OE4rWXhAxGhbaQmd6dAy/40TOVMeDW+TEyKoEhaAsbX9Gfoe5YG/rhT51omx6cw81B1kMNJfFWI05n6aD86Q5SHYUTtGtDLzXHR1mA827Sm3Xz5tS2MUTshXqBc2pCVp5QcXd6T9SkUAJLFvn+8quGij9fEluFGvgU=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQGydARAgRllyMchH9n/20tDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDQwNTAwMDAwMFoXDTE2MDQwNDIzNTk1OVowPzEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAuYWFpLnVuaS1tYi5zaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMv6FWZcSMfkJ+dCXrrcOo1XQSgikBMybpgcNAXvC3tyBidPt+UCLzJ9OM2XxHJRLlsQOQPW8w+NkaU8oshs0WmzzJkoIppOEF6mul3htBqIVCZmvv0IWOsrzMHbgx3IPfy4/pKmWueLPMXVHt+5a3NarBSs076LruJIXBkllrgou6gMYUg7T5HdHv8tqOtZpgt/5zB5jhRsHVROwm/bc6bKQby7/+LsrjQBARyMRpPrU6u4ROVVwRSvNKyZTI4YPzLyHXpqxcogaMLmlMPeZsswn3Pn9qR/e0NLxodr4E9MNYbZcwcs8P+jp4ebYBBuJWNOhLT33rpzicgHy9akBRsCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRQW7zSmEln7cleE8f8x+ZF/uPrsTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLmFhaS51bmktbWIuc2kwDQYJKoZIhvcNAQEFBQADggEBAIsg2qCwCHmOsJc+3CUrzTePQ/io9QMewsIFZGy8hTJIwssWzBHHQIqk782ZJmTgSh5/HDfbWdk0+GA+B9+qkelpajcmAdAWD9BxLexSH2TAtwiFO5n4q9oSpeCa+QujOWdGv8OlV4YGISalLkq07D3IpOGOJF3RReO5/lRRsynXCbkfe5bb4OE4rWXhAxGhbaQmd6dAy/40TOVMeDW+TEyKoEhaAsbX9Gfoe5YG/rhT51omx6cw81B1kMNJfFWI05n6aD86Q5SHYUTtGtDLzXHR1mA827Sm3Xz5tS2MUTshXqBc2pCVp5QcXd6T9SkUAJLFvn+8quGij9fEluFGvgU=</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.uni-mb.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.uni-mb.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:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.abcolstudents.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.abcolstudents.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..23b61701
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.abcolstudents.ac.uk-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.abcolstudents.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abcol.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEazCCA1OgAwIBAgIQWFCsR4118wFHf6QomFJIKzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDcwMjAwMDAwMFoXDTE2MDcwMTIzNTk1OVowPTEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDEw9pZHAuYWJjb2wu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjzjy7IGELdcJY
+						q1+i2nNp8OsBRrVmdLhjRqZlJZ3f1cDOe8yDar0n42y60QPG3jgtsH6FI3B4Lzm6
+						tDNX/v29iFoiyfMQYdYCF7DwAyQFCycwHwEbTcXEdf8Y6IX3jUDqSeP3hgR1+YaQ
+						EeOIJjjSpPzSuL2Ul0zxjmrHJnmBZUEKJz3Ehdtk+cW3LcflKtUhVF72VoaG1z2r
+						J/cNZm2zPe+BIFoy8/M0vgIB4JVHIJQYeSI4Vadd3McgHTM50jbXIRSvcYqfXy9r
+						KNdepJeE6ilKk4xzrN9aBpzBniSJAv1Y6UAoAMMTIaKy2lWi1+RmU4fkX9FK/36p
+						2dSDOx/zAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+						kOO57TAdBgNVHQ4EFgQUI0fnT1n1QGoAHbsRLic/ix/ZO90wDgYDVR0PAQH/BAQD
+						AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+						MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+						L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+						MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+						LnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD2lkcC5hYmNvbC5hYy51azANBgkq
+						hkiG9w0BAQUFAAOCAQEASrIrG4gq7T0pClccyhnLQPKv8VN78Cs34XPtTOVMRPJ9
+						NMKboL9GLcAJtqBJxfhfehN5IKrSHkjiW9R7b54YbISWT8EXeo3kVq/HpG81oBs/
+						VFJJRgeUUgDx3FaaZvUpArHhcE85b1TQ0THzFfDlla6D5NW9B1rzZnNTA4eosyLT
+						zdwMoCo1HOMHTZjuH7I+gHT9yIAVR6Ta8WuqiuMp6EPNOPa/Hn6o+XnW+QemAn1b
+						TLOnwbPjz3Oj+2iU+qJxX8H1l8Zm0eqdX9jwUEXvY+MQTN7t/l75dboWxoJEgFc2
+						AEc9TSZC/52ZK8pdi8uPrmoni5mnqRFdF8VH/seegw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.abcol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.abcol.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.abcol.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.abcol.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.abcol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.abcol.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abcol.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEazCCA1OgAwIBAgIQWFCsR4118wFHf6QomFJIKzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDcwMjAwMDAwMFoXDTE2MDcwMTIzNTk1OVowPTEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDEw9pZHAuYWJjb2wu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjzjy7IGELdcJY
+						q1+i2nNp8OsBRrVmdLhjRqZlJZ3f1cDOe8yDar0n42y60QPG3jgtsH6FI3B4Lzm6
+						tDNX/v29iFoiyfMQYdYCF7DwAyQFCycwHwEbTcXEdf8Y6IX3jUDqSeP3hgR1+YaQ
+						EeOIJjjSpPzSuL2Ul0zxjmrHJnmBZUEKJz3Ehdtk+cW3LcflKtUhVF72VoaG1z2r
+						J/cNZm2zPe+BIFoy8/M0vgIB4JVHIJQYeSI4Vadd3McgHTM50jbXIRSvcYqfXy9r
+						KNdepJeE6ilKk4xzrN9aBpzBniSJAv1Y6UAoAMMTIaKy2lWi1+RmU4fkX9FK/36p
+						2dSDOx/zAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+						kOO57TAdBgNVHQ4EFgQUI0fnT1n1QGoAHbsRLic/ix/ZO90wDgYDVR0PAQH/BAQD
+						AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+						MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+						L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+						MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+						LnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD2lkcC5hYmNvbC5hYy51azANBgkq
+						hkiG9w0BAQUFAAOCAQEASrIrG4gq7T0pClccyhnLQPKv8VN78Cs34XPtTOVMRPJ9
+						NMKboL9GLcAJtqBJxfhfehN5IKrSHkjiW9R7b54YbISWT8EXeo3kVq/HpG81oBs/
+						VFJJRgeUUgDx3FaaZvUpArHhcE85b1TQ0THzFfDlla6D5NW9B1rzZnNTA4eosyLT
+						zdwMoCo1HOMHTZjuH7I+gHT9yIAVR6Ta8WuqiuMp6EPNOPa/Hn6o+XnW+QemAn1b
+						TLOnwbPjz3Oj+2iU+qJxX8H1l8Zm0eqdX9jwUEXvY+MQTN7t/l75dboWxoJEgFc2
+						AEc9TSZC/52ZK8pdi8uPrmoni5mnqRFdF8VH/seegw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.abcol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.abcol.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md: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 East Scotland College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">North East Scotland College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.abcol.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.aco.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml
new file mode 100644
index 00000000..54585fb4
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml
@@ -0,0 +1,121 @@
+<?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>
+      <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="en">ACOnet staff</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="de">ACOnet Team</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for ACOnet staff</mdui:Description>
+        <mdui:Description xml:lang="de">Identity Provider des ACOnet-Teams</mdui:Description>
+        <mdui:Logo width="137" height="60">https://www.aco.net/fileadmin/aconet/Logos/Banner/137x60.gif</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://eduid.at/style/aconet16x16.gif</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.aco.net/organisation.html?L=1</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">http://www.aco.net/organisation.html</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>
+MIIDGDCCAgCgAwIBAgIVAOmKQ6SgpmK/8vtQmiMBkQ1+yZ1XMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5hY28ubmV0MB4XDTA5MTEwMzA5MjIzOFoXDTI5
+MTEwMzA5MjIzOFowFjEUMBIGA1UEAxMLaWRwLmFjby5uZXQwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDtABRog8uPB0h8aNilZFdYFII8iLgBkDQoAXH1
+AIMLVP8dDaK6dRnwyBfrq4dfEH/BqQxxpmASXK1s6O1YbZcx5X9M48yzzpdKFkGU
+3SIdu4lLNYtR1nfePX0120NTBk9tzCR0R9mmV6YMajFQ8YQkyDzwboTTyILx1E70
+RsFIvmx59QDtdPjP8fi2X5ZsRb1kOFDKeJlI15/SQkWAJGBIjtb7Dhs5K6jlp2lh
+T3R5G+faRrC761qR0ddcmh6qkq6fBGRRydxn85N5L6XkoxfD2evTSEkTB2sKn8UG
+cDNupxjPSD6PIPQhDuQlDyg6sFcMj1N6/PvH6FDhca/WZ72hAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5hY28ubmV0hiJodHRwczovL2lkcC5hY28ubmV0L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBStGKLf2/BAuxR9PAnCFKg1lXw+azANBgkqhkiG
+9w0BAQUFAAOCAQEAcYbfERAghPNJSFLnx4SYwmh19ln2j67IdFaEzGnZ10oNtMF5
+MXbJXqLN/JCEj7QLjRQ7PkhCpIUnKJ14ELCt/7ChnxfUHqwiYDyB3Vtm+FIlaNnJ
+Bhet+AJpiVyb6xce6tLQnQ/UwNmPozPjOwEbuKhz5dO1uftI38FT4hBYzsdo76Hm
+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>
+MIIDGDCCAgCgAwIBAgIVAOmKQ6SgpmK/8vtQmiMBkQ1+yZ1XMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5hY28ubmV0MB4XDTA5MTEwMzA5MjIzOFoXDTI5
+MTEwMzA5MjIzOFowFjEUMBIGA1UEAxMLaWRwLmFjby5uZXQwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDtABRog8uPB0h8aNilZFdYFII8iLgBkDQoAXH1
+AIMLVP8dDaK6dRnwyBfrq4dfEH/BqQxxpmASXK1s6O1YbZcx5X9M48yzzpdKFkGU
+3SIdu4lLNYtR1nfePX0120NTBk9tzCR0R9mmV6YMajFQ8YQkyDzwboTTyILx1E70
+RsFIvmx59QDtdPjP8fi2X5ZsRb1kOFDKeJlI15/SQkWAJGBIjtb7Dhs5K6jlp2lh
+T3R5G+faRrC761qR0ddcmh6qkq6fBGRRydxn85N5L6XkoxfD2evTSEkTB2sKn8UG
+cDNupxjPSD6PIPQhDuQlDyg6sFcMj1N6/PvH6FDhca/WZ72hAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5hY28ubmV0hiJodHRwczovL2lkcC5hY28ubmV0L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBStGKLf2/BAuxR9PAnCFKg1lXw+azANBgkqhkiG
+9w0BAQUFAAOCAQEAcYbfERAghPNJSFLnx4SYwmh19ln2j67IdFaEzGnZ10oNtMF5
+MXbJXqLN/JCEj7QLjRQ7PkhCpIUnKJ14ELCt/7ChnxfUHqwiYDyB3Vtm+FIlaNnJ
+Bhet+AJpiVyb6xce6tLQnQ/UwNmPozPjOwEbuKhz5dO1uftI38FT4hBYzsdo76Hm
+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>
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
new file mode 100644
index 00000000..242223ab
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.admin.grnet.gr-idp-shibboleth.xml
@@ -0,0 +1,119 @@
+<?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>
+      <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>
+                            MIIDKDCCAhCgAwIBAgIJAJzvjilzprtbMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+                            BAMTEmlkcC5hZG1pbi5ncm5ldC5ncjAeFw0xNDA0MDgxNjUyNDhaFw0xOTA0MDcx
+                            NjUyNDhaMB0xGzAZBgNVBAMTEmlkcC5hZG1pbi5ncm5ldC5ncjCCASIwDQYJKoZI
+                            hvcNAQEBBQADggEPADCCAQoCggEBAOzRbV+pz5RuGqwAOzI4jUXUSQXHFy6IYlLr
+                            VjisR2+7ZI24GybJAstcpmmNCtFQsM1CKte1x7TFHZFfDWCVv4IVGqtx9lLw+Jhg
+                            VjV8DzX0EYVIKyJimKWwIEn2BuEKWAcTUMdGehiYVeI4sxS+FgbiJxcWiMgq4bB5
+                            QV4gBoglEbI/S1vfoBBOEdKoEUamM+MAWCR83E2+JrhMXL+BrK+ojunyq/qyoL21
+                            GLTKL8jHTUgYMidSOx0oeMzTly8LzTONRDSs6ABxgQODU+b7qgjIqoCwY/kA1mUk
+                            ziqX/eQkxhK/ycf3HMrUVSwHLyOl5SMfpKWPcPuryTTTuFczmBsCAwEAAaNrMGkw
+                            SAYDVR0RBEEwP4ISaWRwLmFkbWluLmdybmV0LmdyhilodHRwczovL2lkcC5hZG1p
+                            bi5ncm5ldC5nci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUb4DIDVDxNLIg4MDr
+                            gAyL+erDTzkwDQYJKoZIhvcNAQEFBQADggEBAED8EAttcxvYdQGcE8UpuDYyMqZ1
+                            gH0fSBbs61hh/bv4NjT/2ycWik/xtdiQj5foFcDNRBDD0Z09NteURUqqwaMXZrFX
+                            0YVUlIIZ6Pi7bTFRD4Rv+uX3edLVOZekPL9H28Rkk1ndCHsFLm2cQYd9Rd+DxjS4
+                            KRtNmyH8BYTzE8YKdX173kc2gdYKTAPNpt2Vj1+ctB9OgFybzIoEKwVtGA4upU5Z
+                            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>
+                            MIIDKDCCAhCgAwIBAgIJAJzvjilzprtbMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+                            BAMTEmlkcC5hZG1pbi5ncm5ldC5ncjAeFw0xNDA0MDgxNjUyNDhaFw0xOTA0MDcx
+                            NjUyNDhaMB0xGzAZBgNVBAMTEmlkcC5hZG1pbi5ncm5ldC5ncjCCASIwDQYJKoZI
+                            hvcNAQEBBQADggEPADCCAQoCggEBAOzRbV+pz5RuGqwAOzI4jUXUSQXHFy6IYlLr
+                            VjisR2+7ZI24GybJAstcpmmNCtFQsM1CKte1x7TFHZFfDWCVv4IVGqtx9lLw+Jhg
+                            VjV8DzX0EYVIKyJimKWwIEn2BuEKWAcTUMdGehiYVeI4sxS+FgbiJxcWiMgq4bB5
+                            QV4gBoglEbI/S1vfoBBOEdKoEUamM+MAWCR83E2+JrhMXL+BrK+ojunyq/qyoL21
+                            GLTKL8jHTUgYMidSOx0oeMzTly8LzTONRDSs6ABxgQODU+b7qgjIqoCwY/kA1mUk
+                            ziqX/eQkxhK/ycf3HMrUVSwHLyOl5SMfpKWPcPuryTTTuFczmBsCAwEAAaNrMGkw
+                            SAYDVR0RBEEwP4ISaWRwLmFkbWluLmdybmV0LmdyhilodHRwczovL2lkcC5hZG1p
+                            bi5ncm5ldC5nci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUb4DIDVDxNLIg4MDr
+                            gAyL+erDTzkwDQYJKoZIhvcNAQEFBQADggEBAED8EAttcxvYdQGcE8UpuDYyMqZ1
+                            gH0fSBbs61hh/bv4NjT/2ycWik/xtdiQj5foFcDNRBDD0Z09NteURUqqwaMXZrFX
+                            0YVUlIIZ6Pi7bTFRD4Rv+uX3edLVOZekPL9H28Rkk1ndCHsFLm2cQYd9Rd+DxjS4
+                            KRtNmyH8BYTzE8YKdX173kc2gdYKTAPNpt2Vj1+ctB9OgFybzIoEKwVtGA4upU5Z
+                            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>
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
new file mode 100644
index 00000000..2409ebe6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.altoncollege.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						Fw0xMzAyMTkxNzI0MjRaFw0zMzAyMTQxNzI0MjRaMGoxCzAJBgNVBAYTAkdCMRIw
+						EAYDVQQIDAlIYW1wc2hpcmUxDjAMBgNVBAcMBUFsdG9uMRYwFAYDVQQKDA1BbHRv
+						biBDb2xsZWdlMR8wHQYDVQQDDBZpZHAuYWx0b25jb2xsZWdlLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0QQESMIq4pyRj3urGeRTqGCnKkqI
+						otYZ90HBsx9qQM2WB5/7VjyFdP8SHj9gZXeLODaZQpKHcP/QUPjJkQb8PGLc1C5r
+						TLMN4KcQlNUOHJf7ss60JfVs9YAUC6ClMyY/jB/FTD4o0bAjAbkWt3Bgd6Hd89XC
+						xhZA/oRJ+fYEciD6SwctjIWKRA4s6/+QLy/ON1YugiQNTwa2dhDrx1n4pedE1eVN
+						MpOnkeHHU57ri98ta+KvzayPYSBoC0m+vG8ChxDySdsBsRUBxxU+OUVYRyatgklc
+						FyRx2jIblObP7/MDHsKDtrOj6hhoVqY+QDlIGIo0+FeP4cUMcShCWMDp/wIDAQAB
+						MA0GCSqGSIb3DQEBBQUAA4IBAQApabwAaLn7eBgnFmqTd4VeOcFVN4N4nmNkXcrq
+						YlFfcZEGxH0S8chY5wUg49DwzJlSbOsOBV+xTqeE1wBaEKO+oMRi1iP2eSKucAp7
+						ryH8LDb0Wa6BO80rjG1P0lfYlldDmPGycIF2qhHPIiuKSBxdCptKyHGDBk6kgAnk
+						UtX3A3o6EO/So2nHKr4niblixFI/pkBfbMbln3Yv/ExIpi/TX9r4p/YeJHiSnbGA
+						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>
+						MIIDUDCCAjgCCQC9aDsLCT+yJTANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJH
+						QjESMBAGA1UECAwJSGFtcHNoaXJlMQ4wDAYDVQQHDAVBbHRvbjEWMBQGA1UECgwN
+						QWx0b24gQ29sbGVnZTEfMB0GA1UEAwwWaWRwLmFsdG9uY29sbGVnZS5hYy51azAe
+						Fw0xMzAyMTkxNzI0MjRaFw0zMzAyMTQxNzI0MjRaMGoxCzAJBgNVBAYTAkdCMRIw
+						EAYDVQQIDAlIYW1wc2hpcmUxDjAMBgNVBAcMBUFsdG9uMRYwFAYDVQQKDA1BbHRv
+						biBDb2xsZWdlMR8wHQYDVQQDDBZpZHAuYWx0b25jb2xsZWdlLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0QQESMIq4pyRj3urGeRTqGCnKkqI
+						otYZ90HBsx9qQM2WB5/7VjyFdP8SHj9gZXeLODaZQpKHcP/QUPjJkQb8PGLc1C5r
+						TLMN4KcQlNUOHJf7ss60JfVs9YAUC6ClMyY/jB/FTD4o0bAjAbkWt3Bgd6Hd89XC
+						xhZA/oRJ+fYEciD6SwctjIWKRA4s6/+QLy/ON1YugiQNTwa2dhDrx1n4pedE1eVN
+						MpOnkeHHU57ri98ta+KvzayPYSBoC0m+vG8ChxDySdsBsRUBxxU+OUVYRyatgklc
+						FyRx2jIblObP7/MDHsKDtrOj6hhoVqY+QDlIGIo0+FeP4cUMcShCWMDp/wIDAQAB
+						MA0GCSqGSIb3DQEBBQUAA4IBAQApabwAaLn7eBgnFmqTd4VeOcFVN4N4nmNkXcrq
+						YlFfcZEGxH0S8chY5wUg49DwzJlSbOsOBV+xTqeE1wBaEKO+oMRi1iP2eSKucAp7
+						ryH8LDb0Wa6BO80rjG1P0lfYlldDmPGycIF2qhHPIiuKSBxdCptKyHGDBk6kgAnk
+						UtX3A3o6EO/So2nHKr4niblixFI/pkBfbMbln3Yv/ExIpi/TX9r4p/YeJHiSnbGA
+						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>
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
new file mode 100644
index 00000000..8f502918
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.amersham.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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>
+						MIIDNDCCAhygAwIBAgIVALWxW6Db2xAPZ4pIJ+T4NU75vxlwMA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEmlkcC5hbWVyc2hhbS5hYy51azAeFw0xMzA2MjUwOTAy
+						MDBaFw0zMzA2MjUwOTAyMDBaMB0xGzAZBgNVBAMTEmlkcC5hbWVyc2hhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBkBn27OKELkBJlv3xe
+						xyxrvYJPhrrcBe5aaNzPDLZTjf2zpF92jpg6oyMJv7PQK2HXEx2fHFy/NCXjkDl+
+						pxiqgb7SZJiJ1YGecBRPG1oknGjfUqVXwXTCr26QB33MXVIbgQj1408jC9qdZo9x
+						ncXPgZYFOChtwsfu2U6aGRjikTuLSh4zTsVIFWR/gR8ngaqILV6cYx3tiS2c3rct
+						/porpcnulNMws8d2YzKV3QX6/W6arNh+lPjBs6Vs1BdkvwumJahwuZulIxMQcpZ6
+						7i/JO6SguAWwfbTJTecgXR5gffP6Yu/O33XgL2jk+04YFIn9LUGilJmiybv+NS18
+						//ECAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmFtZXJzaGFtLmFjLnVrhilodHRw
+						czovL2lkcC5hbWVyc2hhbS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						VMTR+Ij7KaIfnySohB/Q57z9M+AwDQYJKoZIhvcNAQEFBQADggEBADSE/dbwVCpK
+						ZrwpDxt4orHeX9/xPeUmxu8+uE34TgjCtmUq1HrkvIIDAQBtJlxcSC3hC4YTCa+S
+						ha1f6ydDdui5qhnXB9lsp3GIoiEQ6dp9+UdugUnugk8Fr+PCkqKg4DLlZDexgWRQ
+						2yYSL7KWBmNJsV+SnTOS2HZcFRKP1JxLjquZ49MXqmb0zm0itXCBkjsTUBbnAkCV
+						Vrs01QqpXSy391maFDQlnzLS9Tf1lDC9k2Ap41tV34a39CdU4hk5eSd1izdg1F/C
+						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>
+						MIIDNDCCAhygAwIBAgIVALWxW6Db2xAPZ4pIJ+T4NU75vxlwMA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEmlkcC5hbWVyc2hhbS5hYy51azAeFw0xMzA2MjUwOTAy
+						MDBaFw0zMzA2MjUwOTAyMDBaMB0xGzAZBgNVBAMTEmlkcC5hbWVyc2hhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBkBn27OKELkBJlv3xe
+						xyxrvYJPhrrcBe5aaNzPDLZTjf2zpF92jpg6oyMJv7PQK2HXEx2fHFy/NCXjkDl+
+						pxiqgb7SZJiJ1YGecBRPG1oknGjfUqVXwXTCr26QB33MXVIbgQj1408jC9qdZo9x
+						ncXPgZYFOChtwsfu2U6aGRjikTuLSh4zTsVIFWR/gR8ngaqILV6cYx3tiS2c3rct
+						/porpcnulNMws8d2YzKV3QX6/W6arNh+lPjBs6Vs1BdkvwumJahwuZulIxMQcpZ6
+						7i/JO6SguAWwfbTJTecgXR5gffP6Yu/O33XgL2jk+04YFIn9LUGilJmiybv+NS18
+						//ECAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmFtZXJzaGFtLmFjLnVrhilodHRw
+						czovL2lkcC5hbWVyc2hhbS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						VMTR+Ij7KaIfnySohB/Q57z9M+AwDQYJKoZIhvcNAQEFBQADggEBADSE/dbwVCpK
+						ZrwpDxt4orHeX9/xPeUmxu8+uE34TgjCtmUq1HrkvIIDAQBtJlxcSC3hC4YTCa+S
+						ha1f6ydDdui5qhnXB9lsp3GIoiEQ6dp9+UdugUnugk8Fr+PCkqKg4DLlZDexgWRQ
+						2yYSL7KWBmNJsV+SnTOS2HZcFRKP1JxLjquZ49MXqmb0zm0itXCBkjsTUBbnAkCV
+						Vrs01QqpXSy391maFDQlnzLS9Tf1lDC9k2Ap41tV34a39CdU4hk5eSd1izdg1F/C
+						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>
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
new file mode 100644
index 00000000..ac842927
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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">iuf.cpu.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">espe.amue.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <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>
+					      MIIDgTCCAmmgAwIBAgIJAJz0e9ITZF9gMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
+BAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMQ4wDAYDVQQHDAVQYXJpczENMAsG
+A1UECgwEQU1VRTEUMBIGA1UEAwwLaWRwLmFtdWUuZnIwHhcNMTQxMDE1MTQyMjUz
+WhcNMjQxMDE2MTQyMjUzWjBXMQswCQYDVQQGEwJGUjETMBEGA1UECAwKU29tZS1T
+dGF0ZTEOMAwGA1UEBwwFUGFyaXMxDTALBgNVBAoMBEFNVUUxFDASBgNVBAMMC2lk
+cC5hbXVlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA241uUmwE
+4O95iIpPgHVBmvQsXgqUx6Jz1tKGQn4T2TQntn//Y2P8qRykhQ2YV+qLbJNrYWC9
+UYMlE+/aP4muMF4ChLV7ij3c6gCkxCAigOoHiQZFwLNPDzjiNs/eAxE/RDB9BUcf
+HL+953Q3lL/EEsWkTggPxaqWatyXbtPRaGl4WypVsztziF9D/Kdo5VVP9dElasBO
+aBXRy5HZLVHmGpCaaiOydcMyLf2CO0hA6pxDl3aYvyh1BLF5vcbMTg4tpu7Ks33c
+0H8Gdv8i8FYXZzHrHTghsfHp42obl0f7E7hUuHxRdwOgq7szbMeXIh5HPWm1Yz2S
+XPBwe5LjhuZw3wIDAQABo1AwTjAdBgNVHQ4EFgQUtFPL4vJjppV2NlZrKkczRW4j
+1l8wHwYDVR0jBBgwFoAUtFPL4vJjppV2NlZrKkczRW4j1l8wDAYDVR0TBAUwAwEB
+/zANBgkqhkiG9w0BAQUFAAOCAQEAe3jRuNrsDnBpwD2x6Yep61EPOXTjix12k2iy
+U6x6ggpL3hBjfJuEzMViHB/x2tVc/KaM2QiqRqiIsK73Woa1G00IS7AZvzFm1uyo
+I+tTmgFAcNORr5ucYnCdj3BzirEwLhGbczidsBquyvKL4VzT0oMlVND4jD5DFSlG
+/UFZ57goJxGSNK7pG4RsTi+Eha6CQgm7rNeHMr4lnBLjIOMft37/vkSo1Wx2vXTA
+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>
+					      MIIDgTCCAmmgAwIBAgIJANYhmQZ/PLaYMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
+BAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMQ4wDAYDVQQHDAVQYXJpczENMAsG
+A1UECgwEQU1VRTEUMBIGA1UEAwwLaWRwLmFtdWUuZnIwHhcNMTMxMTI1MDk0NzM3
+WhcNMTMxMjI1MDk0NzM3WjBXMQswCQYDVQQGEwJGUjETMBEGA1UECAwKU29tZS1T
+dGF0ZTEOMAwGA1UEBwwFUGFyaXMxDTALBgNVBAoMBEFNVUUxFDASBgNVBAMMC2lk
+cC5hbXVlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA241uUmwE
+4O95iIpPgHVBmvQsXgqUx6Jz1tKGQn4T2TQntn//Y2P8qRykhQ2YV+qLbJNrYWC9
+UYMlE+/aP4muMF4ChLV7ij3c6gCkxCAigOoHiQZFwLNPDzjiNs/eAxE/RDB9BUcf
+HL+953Q3lL/EEsWkTggPxaqWatyXbtPRaGl4WypVsztziF9D/Kdo5VVP9dElasBO
+aBXRy5HZLVHmGpCaaiOydcMyLf2CO0hA6pxDl3aYvyh1BLF5vcbMTg4tpu7Ks33c
+0H8Gdv8i8FYXZzHrHTghsfHp42obl0f7E7hUuHxRdwOgq7szbMeXIh5HPWm1Yz2S
+XPBwe5LjhuZw3wIDAQABo1AwTjAdBgNVHQ4EFgQUtFPL4vJjppV2NlZrKkczRW4j
+1l8wHwYDVR0jBBgwFoAUtFPL4vJjppV2NlZrKkczRW4j1l8wDAYDVR0TBAUwAwEB
+/zANBgkqhkiG9w0BAQUFAAOCAQEAtHnVQXFET0Lq3wjCqbbJFe7wMf2L2y+R2soV
+hFmVuJPW6e2We5MFw3uzw0LWgjFX4+cddimjw1tTDbQO1GRWV1XQiSUpd4iFcqSL
+UncJxo6pOMwQMU/pptjSEKvzGMfkCuPbs8P7KA3KveDJj7r0h/SAJL3Lq42u1dWE
+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://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Philippe Bader</md:SurName>
+    <md:EmailAddress>philippe.bader@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
new file mode 100644
index 00000000..118e6f6f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.anglia.ac.uk-openathens.xml
@@ -0,0 +1,62 @@
+<?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>
+      <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>
+						MIIEbjCCA1agAwIBAgIJAKgOBqreKA7kMA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
+						VQQGEwJHQjEOMAwGA1UECAwFRXNzZXgxEzARBgNVBAcMCkNoZWxtc2ZvcmQxITAf
+						BgNVBAoMGEFuZ2xpYSBSdXNraW4gVW5pdmVyc2l0eTEbMBkGA1UECwwSVW5pdmVy
+						c2l0eSBMaWJyYXJ5MRkwFwYDVQQDDBBpZHAuYW5nbGlhLmFjLnVrMSgwJgYJKoZI
+						hvcNAQkBFhlhbGV4LmNvbGxpbnNAYW5nbGlhLmFjLnVrMB4XDTEzMDQyMzEyMTcy
+						MFoXDTIzMDQyMTEyMTcyMFowgbcxCzAJBgNVBAYTAkdCMQ4wDAYDVQQIDAVFc3Nl
+						eDETMBEGA1UEBwwKQ2hlbG1zZm9yZDEhMB8GA1UECgwYQW5nbGlhIFJ1c2tpbiBV
+						bml2ZXJzaXR5MRswGQYDVQQLDBJVbml2ZXJzaXR5IExpYnJhcnkxGTAXBgNVBAMM
+						EGlkcC5hbmdsaWEuYWMudWsxKDAmBgkqhkiG9w0BCQEWGWFsZXguY29sbGluc0Bh
+						bmdsaWEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9zvXg
+						KC3ZqFlCLXKPIkXy3+RBCGjq6MdFPna0mTN78dDm3BGxDa5ZSGOAbmymkLifZQAO
+						auoab/IP4+cwRLk1mVZs64zGr7HkWjisEJxJ1prP+L7Vhxx5im1SITbMcf3YbfRu
+						e88es/O2pJuAMNl3FG6ZskxKxT1cwKuvd9exelplJfBwYI0lbKZkQLMTvGfMr7B2
+						X0HXeGnb4mVRAI3C/uLQ3Y3zCgHyFoofvLUEugAh8zfInnLsk6CQee4tmdL/Vhj1
+						2FoKZcAywTv0MxR0zvROKkB/9N1ARtnqUQ6+wndtTJmKkvAEZjC33l5VuguzAbgr
+						LmgzQJBSbcb5r8a7AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
+						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRC1E3gBT7m
+						KDcJFkGEIMx61RnTrTAfBgNVHSMEGDAWgBRC1E3gBT7mKDcJFkGEIMx61RnTrTAN
+						BgkqhkiG9w0BAQUFAAOCAQEAFnUD7xfFhO6ypILsd3MSTO9piV3Wn+aNbtHHvZTk
+						cwwQzPAX3ZeZfSRbXA8VANOMedxhWnAppPy3qus8kwMtM7YrZe9yYasppou7+uWp
+						dSKq0fC8MLIKyC4JSujcTDKNB7aBNm9OPGE0oCoeYDIyTrWMHX2GFzR5xf/N6o/M
+						aHYdqraRkIveOsr8qqIX0ivXULDDVobITuWReZDqvPKnnbMbuSAt/2gp5+5+RN28
+						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>
diff --git a/swamid-interfederations-2.0/idp.aquinas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.aquinas.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..f3b946f5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.aquinas.ac.uk-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						Fw0xNDA0MDgxMDA3MjBaFw0zNDA0MDMxMDA3MjBaMGoxCzAJBgNVBAYTAkdCMREw
+						DwYDVQQIEwhDaGVzaGlyZTESMBAGA1UEBxMJU3RvY2twb3J0MRgwFgYDVQQKEw9B
+						cXVpbmFzIENvbGxlZ2UxGjAYBgNVBAMTEWlkcC5hcXVpbmFzLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tlIUE/uX9+0jJwcVVuvnketFM++
+						XqlEGjnrZ5cbnC8diPZ4msx1IsZQuOuvc36VIp9IzU0xqbw7sNr6lBbfO3ORTn9W
+						tuceKX6lFRm2U9GJpj3FEDUG0adBprgCgaEZ4StYNe2tgOSF1W9PkLTMn1UplH0w
+						r+e+D7v2o1uo/0gHE1AEJwbwK/JHBE8rnVLSzHkcvT820QEybW1pLjcN4WeL6IO+
+						ECxpje1qZNuI42aKrya56iMqxdtVcsjWzJq8fS0ihY+lC+rV+IzZasscyU214O2G
+						z9qw7MqglfBXDKInLK66Sb/v06OlE+sv+DQ81mDiSGIvk6fkkC1wTxEuqwIDAQAB
+						MA0GCSqGSIb3DQEBBQUAA4IBAQC0OqEHX/q+5l3PHh5rXnLKalvBWD/BaIgGXXL1
+						bYhSYA85A4sZ+dXznZPH1hLbv4g4YV2S8rrN6o/nFZFzGF6jTW+2FeYIkSnLUEY8
+						uxFL/+DTMbYpGhvTpkZdetmzE1IDygV9UaTqA7M80yyQxBVy60LIdekJcp7Fpn5Y
+						LRU8AVk2UUQgQ7rM51uy8hyTp2cN8OVGcNPJMbVtiAcPRn/0aYwMhJ9gFkPFEatC
+						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>
+						MIIDUDCCAjgCCQCg2y4jrOTluTANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJH
+						QjERMA8GA1UECBMIQ2hlc2hpcmUxEjAQBgNVBAcTCVN0b2NrcG9ydDEYMBYGA1UE
+						ChMPQXF1aW5hcyBDb2xsZWdlMRowGAYDVQQDExFpZHAuYXF1aW5hcy5hYy51azAe
+						Fw0xNDA0MDgxMDA3MjBaFw0zNDA0MDMxMDA3MjBaMGoxCzAJBgNVBAYTAkdCMREw
+						DwYDVQQIEwhDaGVzaGlyZTESMBAGA1UEBxMJU3RvY2twb3J0MRgwFgYDVQQKEw9B
+						cXVpbmFzIENvbGxlZ2UxGjAYBgNVBAMTEWlkcC5hcXVpbmFzLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tlIUE/uX9+0jJwcVVuvnketFM++
+						XqlEGjnrZ5cbnC8diPZ4msx1IsZQuOuvc36VIp9IzU0xqbw7sNr6lBbfO3ORTn9W
+						tuceKX6lFRm2U9GJpj3FEDUG0adBprgCgaEZ4StYNe2tgOSF1W9PkLTMn1UplH0w
+						r+e+D7v2o1uo/0gHE1AEJwbwK/JHBE8rnVLSzHkcvT820QEybW1pLjcN4WeL6IO+
+						ECxpje1qZNuI42aKrya56iMqxdtVcsjWzJq8fS0ihY+lC+rV+IzZasscyU214O2G
+						z9qw7MqglfBXDKInLK66Sb/v06OlE+sv+DQ81mDiSGIvk6fkkC1wTxEuqwIDAQAB
+						MA0GCSqGSIb3DQEBBQUAA4IBAQC0OqEHX/q+5l3PHh5rXnLKalvBWD/BaIgGXXL1
+						bYhSYA85A4sZ+dXznZPH1hLbv4g4YV2S8rrN6o/nFZFzGF6jTW+2FeYIkSnLUEY8
+						uxFL/+DTMbYpGhvTpkZdetmzE1IDygV9UaTqA7M80yyQxBVy60LIdekJcp7Fpn5Y
+						LRU8AVk2UUQgQ7rM51uy8hyTp2cN8OVGcNPJMbVtiAcPRn/0aYwMhJ9gFkPFEatC
+						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>
diff --git a/swamid-interfederations-2.0/idp.arts.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.arts.ac.uk-entity.xml
new file mode 100644
index 00000000..df9ee9a3
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.arts.ac.uk-entity.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						SVQgU2VydmljZXMxFzAVBgNVBAMMDmlkcC5hcnRzLmFjLnVrMSIwIAYJKoZIhvcN
+						AQkBFhNzc2xhZG1pbkBhcnRzLmFjLnVrMB4XDTE0MDEwODExMjAzMVoXDTM0MDEy
+						MzExMjAzMVowgbMxCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5HcmVhdGVyIExvbmRv
+						bjEPMA0GA1UEBwwGTG9uZG9uMScwJQYDVQQKDB5Vbml2ZXJzaXR5IG9mIHRoZSBB
+						cnRzLCBMb25kb24xFDASBgNVBAsMC0lUIFNlcnZpY2VzMRcwFQYDVQQDDA5pZHAu
+						YXJ0cy5hYy51azEiMCAGCSqGSIb3DQEJARYTc3NsYWRtaW5AYXJ0cy5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6O2rZ7nuoylsc2Zd9Mahbc
+						yvGGqZMmx+mO414AqbuMn4R0kat5rKpuaq2kj/M18NBJaNti2UzYBvfEx+SPOZDl
+						zCFAup8NqJwZXGPP5NGNXeAFQWCzIfDZpcOqrrjDA5/dJtDpIST4kGLaFUUwfmE3
+						6Ikpye28h3v4oYPH4bxGkodWsVkU2AMAObbsFu2C5FxRP9jXE42q7AjRyZNOM5jt
+						izy1jjFEhdsU1gYJyaN/XEpMZA2x1h+t+DcCEqlp9+BFn24t2krubxfXo6fy/zqH
+						tUPPMHElAALmzFZyhz4BMtfxGmuYu5+5nROjz7wh0QANgo5s2chALSVBhN1coMsC
+						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAvL41pZYkDiD0qBQK+ndeXOsBSQbHXLEl
+						WwQttoLoo23kRPU+Q1guFwk2pIgKb6SDSSflwrT+SjeCAmNOnBE5+J2fXqynj/CW
+						up2U9ejHg5ZEn4GPwLOftqycM/2tOzxjY/6/5NbM+BEZs+T15XqhsBQacPMg2PSJ
+						i+e8IPQeKWZlpBRf4NMghdfb7+vfTpDqOFB4kik+VesdEBE/zgGSTdcUNaAB1Hqq
+						+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>
+						MIID5DCCAswCCQD996epTPDENDANBgkqhkiG9w0BAQUFADCBszELMAkGA1UEBhMC
+						R0IxFzAVBgNVBAgMDkdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xJzAl
+						BgNVBAoMHlVuaXZlcnNpdHkgb2YgdGhlIEFydHMsIExvbmRvbjEUMBIGA1UECwwL
+						SVQgU2VydmljZXMxFzAVBgNVBAMMDmlkcC5hcnRzLmFjLnVrMSIwIAYJKoZIhvcN
+						AQkBFhNzc2xhZG1pbkBhcnRzLmFjLnVrMB4XDTE0MDEwODExMjAzMVoXDTM0MDEy
+						MzExMjAzMVowgbMxCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5HcmVhdGVyIExvbmRv
+						bjEPMA0GA1UEBwwGTG9uZG9uMScwJQYDVQQKDB5Vbml2ZXJzaXR5IG9mIHRoZSBB
+						cnRzLCBMb25kb24xFDASBgNVBAsMC0lUIFNlcnZpY2VzMRcwFQYDVQQDDA5pZHAu
+						YXJ0cy5hYy51azEiMCAGCSqGSIb3DQEJARYTc3NsYWRtaW5AYXJ0cy5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6O2rZ7nuoylsc2Zd9Mahbc
+						yvGGqZMmx+mO414AqbuMn4R0kat5rKpuaq2kj/M18NBJaNti2UzYBvfEx+SPOZDl
+						zCFAup8NqJwZXGPP5NGNXeAFQWCzIfDZpcOqrrjDA5/dJtDpIST4kGLaFUUwfmE3
+						6Ikpye28h3v4oYPH4bxGkodWsVkU2AMAObbsFu2C5FxRP9jXE42q7AjRyZNOM5jt
+						izy1jjFEhdsU1gYJyaN/XEpMZA2x1h+t+DcCEqlp9+BFn24t2krubxfXo6fy/zqH
+						tUPPMHElAALmzFZyhz4BMtfxGmuYu5+5nROjz7wh0QANgo5s2chALSVBhN1coMsC
+						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAvL41pZYkDiD0qBQK+ndeXOsBSQbHXLEl
+						WwQttoLoo23kRPU+Q1guFwk2pIgKb6SDSSflwrT+SjeCAmNOnBE5+J2fXqynj/CW
+						up2U9ejHg5ZEn4GPwLOftqycM/2tOzxjY/6/5NbM+BEZs+T15XqhsBQacPMg2PSJ
+						i+e8IPQeKWZlpBRf4NMghdfb7+vfTpDqOFB4kik+VesdEBE/zgGSTdcUNaAB1Hqq
+						+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>
diff --git a/swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml
new file mode 100644
index 00000000..866c307e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.athukfed2.openathens.net/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" registrationInstant="2013-01-29T10:19: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed2.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>
+						MIIEiDCCA3CgAwIBAgIQOBNA+hb81eyfqXol6z3klDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDcwNjAwMDAwMFoXDTE1MDcwNjIzNTk1OVowXjELMAkGA1UE
+						BhMCR0IxDjAMBgNVBAgTBUJBTkVTMQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdF
+						ZHVzZXJ2MR4wHAYDVQQDExVnYXRld2F5LmF0aGVuc2Ftcy5uZXQwggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbB17KWAYcAxwqBJLKiCNrX18NQpeYoJBv
+						6/ilSgtEYJxmcvS+dDFWoFoLCKJt+nfuoegPOZHTeNxyxmg4fMXw0PulVWgQxW0s
+						0zggonUc7VQ98Ny4rkBY0IpOcMzJv1leKk7w0mXfCGZwMacZ9uy5BpM84raTyOTz
+						P0MI28PjWTVAohhVK34CeUm0vUwVzemN0INctgyIdzEHlb6nteKCYKCnjsi2KTO8
+						spumdA3rcU/u+0rUR5auJ0ZsDtUMg7BQw0W6MAkcXEHuC5uGJuLSyhO3h1G1D5L4
+						5Xq5rKvV5FqyRP++hrEoiA2z3lMXtjxEaT4CELiiHbxdukaqw2aZAgMBAAGjggFo
+						MIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+						f4VPXF2nfnxOVFGmLcxxPaq5y+wwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+						MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+						KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIAYDVR0RBBkw
+						F4IVZ2F0ZXdheS5hdGhlbnNhbXMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQBDDpET
+						eseuUBypZlPJMfm2eg3jFIgJOTdxvMNU88EuLXTiSSgRWQAjy7QPHprkFiXUyOu5
+						EdBbXhuTcecRESOqM5pHxZulnWtrggXc9IGy7TzjxsrxFXb881qiVwGu7kiYPv1F
+						IwK6IQfbdbUXiTLNxrLogMYI4T7YwYkkKdA4nCy3aUuucz5uuIovLvLVrtZ9YN66
+						XWcW/d0prifYI70Cwo4ydOJgm0WbqllJRVnP5jI9+pDa1cX6tku8raFkDUZxJfU9
+						IlvryvkiiZTpoo7QOu6aJVAwU33BXcTQyEeCyp5PAvaeNJWCFpQ85gNSxJdVPIqm
+						6pd2Nd0SphPSYavr
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfederation"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed2.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>
+						MIIEiDCCA3CgAwIBAgIQOBNA+hb81eyfqXol6z3klDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDcwNjAwMDAwMFoXDTE1MDcwNjIzNTk1OVowXjELMAkGA1UE
+						BhMCR0IxDjAMBgNVBAgTBUJBTkVTMQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdF
+						ZHVzZXJ2MR4wHAYDVQQDExVnYXRld2F5LmF0aGVuc2Ftcy5uZXQwggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbB17KWAYcAxwqBJLKiCNrX18NQpeYoJBv
+						6/ilSgtEYJxmcvS+dDFWoFoLCKJt+nfuoegPOZHTeNxyxmg4fMXw0PulVWgQxW0s
+						0zggonUc7VQ98Ny4rkBY0IpOcMzJv1leKk7w0mXfCGZwMacZ9uy5BpM84raTyOTz
+						P0MI28PjWTVAohhVK34CeUm0vUwVzemN0INctgyIdzEHlb6nteKCYKCnjsi2KTO8
+						spumdA3rcU/u+0rUR5auJ0ZsDtUMg7BQw0W6MAkcXEHuC5uGJuLSyhO3h1G1D5L4
+						5Xq5rKvV5FqyRP++hrEoiA2z3lMXtjxEaT4CELiiHbxdukaqw2aZAgMBAAGjggFo
+						MIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+						f4VPXF2nfnxOVFGmLcxxPaq5y+wwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+						MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+						KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIAYDVR0RBBkw
+						F4IVZ2F0ZXdheS5hdGhlbnNhbXMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQBDDpET
+						eseuUBypZlPJMfm2eg3jFIgJOTdxvMNU88EuLXTiSSgRWQAjy7QPHprkFiXUyOu5
+						EdBbXhuTcecRESOqM5pHxZulnWtrggXc9IGy7TzjxsrxFXb881qiVwGu7kiYPv1F
+						IwK6IQfbdbUXiTLNxrLogMYI4T7YwYkkKdA4nCy3aUuucz5uuIovLvLVrtZ9YN66
+						XWcW/d0prifYI70Cwo4ydOJgm0WbqllJRVnP5jI9+pDa1cX6tku8raFkDUZxJfU9
+						IlvryvkiiZTpoo7QOu6aJVAwU33BXcTQyEeCyp5PAvaeNJWCFpQ85gNSxJdVPIqm
+						6pd2Nd0SphPSYavr
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Eduserv athukfed2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eduserv.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.athukfed3.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml
new file mode 100644
index 00000000..94bca424
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.athukfed3.openathens.net/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" registrationInstant="2013-02-12T16:04:09Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed3.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>
+						MIIEiDCCA3CgAwIBAgIQOBNA+hb81eyfqXol6z3klDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDcwNjAwMDAwMFoXDTE1MDcwNjIzNTk1OVowXjELMAkGA1UE
+						BhMCR0IxDjAMBgNVBAgTBUJBTkVTMQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdF
+						ZHVzZXJ2MR4wHAYDVQQDExVnYXRld2F5LmF0aGVuc2Ftcy5uZXQwggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbB17KWAYcAxwqBJLKiCNrX18NQpeYoJBv
+						6/ilSgtEYJxmcvS+dDFWoFoLCKJt+nfuoegPOZHTeNxyxmg4fMXw0PulVWgQxW0s
+						0zggonUc7VQ98Ny4rkBY0IpOcMzJv1leKk7w0mXfCGZwMacZ9uy5BpM84raTyOTz
+						P0MI28PjWTVAohhVK34CeUm0vUwVzemN0INctgyIdzEHlb6nteKCYKCnjsi2KTO8
+						spumdA3rcU/u+0rUR5auJ0ZsDtUMg7BQw0W6MAkcXEHuC5uGJuLSyhO3h1G1D5L4
+						5Xq5rKvV5FqyRP++hrEoiA2z3lMXtjxEaT4CELiiHbxdukaqw2aZAgMBAAGjggFo
+						MIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+						f4VPXF2nfnxOVFGmLcxxPaq5y+wwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+						MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+						KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIAYDVR0RBBkw
+						F4IVZ2F0ZXdheS5hdGhlbnNhbXMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQBDDpET
+						eseuUBypZlPJMfm2eg3jFIgJOTdxvMNU88EuLXTiSSgRWQAjy7QPHprkFiXUyOu5
+						EdBbXhuTcecRESOqM5pHxZulnWtrggXc9IGy7TzjxsrxFXb881qiVwGu7kiYPv1F
+						IwK6IQfbdbUXiTLNxrLogMYI4T7YwYkkKdA4nCy3aUuucz5uuIovLvLVrtZ9YN66
+						XWcW/d0prifYI70Cwo4ydOJgm0WbqllJRVnP5jI9+pDa1cX6tku8raFkDUZxJfU9
+						IlvryvkiiZTpoo7QOu6aJVAwU33BXcTQyEeCyp5PAvaeNJWCFpQ85gNSxJdVPIqm
+						6pd2Nd0SphPSYavr
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net/ukfederation"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfederation"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed3.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>
+						MIIEiDCCA3CgAwIBAgIQOBNA+hb81eyfqXol6z3klDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDcwNjAwMDAwMFoXDTE1MDcwNjIzNTk1OVowXjELMAkGA1UE
+						BhMCR0IxDjAMBgNVBAgTBUJBTkVTMQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdF
+						ZHVzZXJ2MR4wHAYDVQQDExVnYXRld2F5LmF0aGVuc2Ftcy5uZXQwggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbB17KWAYcAxwqBJLKiCNrX18NQpeYoJBv
+						6/ilSgtEYJxmcvS+dDFWoFoLCKJt+nfuoegPOZHTeNxyxmg4fMXw0PulVWgQxW0s
+						0zggonUc7VQ98Ny4rkBY0IpOcMzJv1leKk7w0mXfCGZwMacZ9uy5BpM84raTyOTz
+						P0MI28PjWTVAohhVK34CeUm0vUwVzemN0INctgyIdzEHlb6nteKCYKCnjsi2KTO8
+						spumdA3rcU/u+0rUR5auJ0ZsDtUMg7BQw0W6MAkcXEHuC5uGJuLSyhO3h1G1D5L4
+						5Xq5rKvV5FqyRP++hrEoiA2z3lMXtjxEaT4CELiiHbxdukaqw2aZAgMBAAGjggFo
+						MIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+						f4VPXF2nfnxOVFGmLcxxPaq5y+wwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+						MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+						KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIAYDVR0RBBkw
+						F4IVZ2F0ZXdheS5hdGhlbnNhbXMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQBDDpET
+						eseuUBypZlPJMfm2eg3jFIgJOTdxvMNU88EuLXTiSSgRWQAjy7QPHprkFiXUyOu5
+						EdBbXhuTcecRESOqM5pHxZulnWtrggXc9IGy7TzjxsrxFXb881qiVwGu7kiYPv1F
+						IwK6IQfbdbUXiTLNxrLogMYI4T7YwYkkKdA4nCy3aUuucz5uuIovLvLVrtZ9YN66
+						XWcW/d0prifYI70Cwo4ydOJgm0WbqllJRVnP5jI9+pDa1cX6tku8raFkDUZxJfU9
+						IlvryvkiiZTpoo7QOu6aJVAwU33BXcTQyEeCyp5PAvaeNJWCFpQ85gNSxJdVPIqm
+						6pd2Nd0SphPSYavr
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Eduserv athukfed3</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eduserv.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.athukfed4.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.xml
new file mode 100644
index 00000000..f20a2212
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.athukfed4.openathens.net/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" registrationInstant="2013-02-25T13:51:09Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed4.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>
+						MIIEiDCCA3CgAwIBAgIQOBNA+hb81eyfqXol6z3klDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDcwNjAwMDAwMFoXDTE1MDcwNjIzNTk1OVowXjELMAkGA1UE
+						BhMCR0IxDjAMBgNVBAgTBUJBTkVTMQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdF
+						ZHVzZXJ2MR4wHAYDVQQDExVnYXRld2F5LmF0aGVuc2Ftcy5uZXQwggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbB17KWAYcAxwqBJLKiCNrX18NQpeYoJBv
+						6/ilSgtEYJxmcvS+dDFWoFoLCKJt+nfuoegPOZHTeNxyxmg4fMXw0PulVWgQxW0s
+						0zggonUc7VQ98Ny4rkBY0IpOcMzJv1leKk7w0mXfCGZwMacZ9uy5BpM84raTyOTz
+						P0MI28PjWTVAohhVK34CeUm0vUwVzemN0INctgyIdzEHlb6nteKCYKCnjsi2KTO8
+						spumdA3rcU/u+0rUR5auJ0ZsDtUMg7BQw0W6MAkcXEHuC5uGJuLSyhO3h1G1D5L4
+						5Xq5rKvV5FqyRP++hrEoiA2z3lMXtjxEaT4CELiiHbxdukaqw2aZAgMBAAGjggFo
+						MIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+						f4VPXF2nfnxOVFGmLcxxPaq5y+wwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+						MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+						KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIAYDVR0RBBkw
+						F4IVZ2F0ZXdheS5hdGhlbnNhbXMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQBDDpET
+						eseuUBypZlPJMfm2eg3jFIgJOTdxvMNU88EuLXTiSSgRWQAjy7QPHprkFiXUyOu5
+						EdBbXhuTcecRESOqM5pHxZulnWtrggXc9IGy7TzjxsrxFXb881qiVwGu7kiYPv1F
+						IwK6IQfbdbUXiTLNxrLogMYI4T7YwYkkKdA4nCy3aUuucz5uuIovLvLVrtZ9YN66
+						XWcW/d0prifYI70Cwo4ydOJgm0WbqllJRVnP5jI9+pDa1cX6tku8raFkDUZxJfU9
+						IlvryvkiiZTpoo7QOu6aJVAwU33BXcTQyEeCyp5PAvaeNJWCFpQ85gNSxJdVPIqm
+						6pd2Nd0SphPSYavr
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net/ukfed/67475576"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfed/67475576"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed4.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>
+						MIIEiDCCA3CgAwIBAgIQOBNA+hb81eyfqXol6z3klDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDcwNjAwMDAwMFoXDTE1MDcwNjIzNTk1OVowXjELMAkGA1UE
+						BhMCR0IxDjAMBgNVBAgTBUJBTkVTMQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdF
+						ZHVzZXJ2MR4wHAYDVQQDExVnYXRld2F5LmF0aGVuc2Ftcy5uZXQwggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbB17KWAYcAxwqBJLKiCNrX18NQpeYoJBv
+						6/ilSgtEYJxmcvS+dDFWoFoLCKJt+nfuoegPOZHTeNxyxmg4fMXw0PulVWgQxW0s
+						0zggonUc7VQ98Ny4rkBY0IpOcMzJv1leKk7w0mXfCGZwMacZ9uy5BpM84raTyOTz
+						P0MI28PjWTVAohhVK34CeUm0vUwVzemN0INctgyIdzEHlb6nteKCYKCnjsi2KTO8
+						spumdA3rcU/u+0rUR5auJ0ZsDtUMg7BQw0W6MAkcXEHuC5uGJuLSyhO3h1G1D5L4
+						5Xq5rKvV5FqyRP++hrEoiA2z3lMXtjxEaT4CELiiHbxdukaqw2aZAgMBAAGjggFo
+						MIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+						f4VPXF2nfnxOVFGmLcxxPaq5y+wwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+						MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+						KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIAYDVR0RBBkw
+						F4IVZ2F0ZXdheS5hdGhlbnNhbXMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQBDDpET
+						eseuUBypZlPJMfm2eg3jFIgJOTdxvMNU88EuLXTiSSgRWQAjy7QPHprkFiXUyOu5
+						EdBbXhuTcecRESOqM5pHxZulnWtrggXc9IGy7TzjxsrxFXb881qiVwGu7kiYPv1F
+						IwK6IQfbdbUXiTLNxrLogMYI4T7YwYkkKdA4nCy3aUuucz5uuIovLvLVrtZ9YN66
+						XWcW/d0prifYI70Cwo4ydOJgm0WbqllJRVnP5jI9+pDa1cX6tku8raFkDUZxJfU9
+						IlvryvkiiZTpoo7QOu6aJVAwU33BXcTQyEeCyp5PAvaeNJWCFpQ85gNSxJdVPIqm
+						6pd2Nd0SphPSYavr
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Eduserv athukfed4</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eduserv.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.athukfed5.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml
new file mode 100644
index 00000000..7d5c17b1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.athukfed5.openathens.net/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" registrationInstant="2013-02-25T13:51:09Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed5.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>
+						MIIEiDCCA3CgAwIBAgIQOBNA+hb81eyfqXol6z3klDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDcwNjAwMDAwMFoXDTE1MDcwNjIzNTk1OVowXjELMAkGA1UE
+						BhMCR0IxDjAMBgNVBAgTBUJBTkVTMQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdF
+						ZHVzZXJ2MR4wHAYDVQQDExVnYXRld2F5LmF0aGVuc2Ftcy5uZXQwggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbB17KWAYcAxwqBJLKiCNrX18NQpeYoJBv
+						6/ilSgtEYJxmcvS+dDFWoFoLCKJt+nfuoegPOZHTeNxyxmg4fMXw0PulVWgQxW0s
+						0zggonUc7VQ98Ny4rkBY0IpOcMzJv1leKk7w0mXfCGZwMacZ9uy5BpM84raTyOTz
+						P0MI28PjWTVAohhVK34CeUm0vUwVzemN0INctgyIdzEHlb6nteKCYKCnjsi2KTO8
+						spumdA3rcU/u+0rUR5auJ0ZsDtUMg7BQw0W6MAkcXEHuC5uGJuLSyhO3h1G1D5L4
+						5Xq5rKvV5FqyRP++hrEoiA2z3lMXtjxEaT4CELiiHbxdukaqw2aZAgMBAAGjggFo
+						MIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+						f4VPXF2nfnxOVFGmLcxxPaq5y+wwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+						MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+						KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIAYDVR0RBBkw
+						F4IVZ2F0ZXdheS5hdGhlbnNhbXMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQBDDpET
+						eseuUBypZlPJMfm2eg3jFIgJOTdxvMNU88EuLXTiSSgRWQAjy7QPHprkFiXUyOu5
+						EdBbXhuTcecRESOqM5pHxZulnWtrggXc9IGy7TzjxsrxFXb881qiVwGu7kiYPv1F
+						IwK6IQfbdbUXiTLNxrLogMYI4T7YwYkkKdA4nCy3aUuucz5uuIovLvLVrtZ9YN66
+						XWcW/d0prifYI70Cwo4ydOJgm0WbqllJRVnP5jI9+pDa1cX6tku8raFkDUZxJfU9
+						IlvryvkiiZTpoo7QOu6aJVAwU33BXcTQyEeCyp5PAvaeNJWCFpQ85gNSxJdVPIqm
+						6pd2Nd0SphPSYavr
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net/ukfed/67484437"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfed/67484437"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed5.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>
+						MIIEiDCCA3CgAwIBAgIQOBNA+hb81eyfqXol6z3klDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDcwNjAwMDAwMFoXDTE1MDcwNjIzNTk1OVowXjELMAkGA1UE
+						BhMCR0IxDjAMBgNVBAgTBUJBTkVTMQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdF
+						ZHVzZXJ2MR4wHAYDVQQDExVnYXRld2F5LmF0aGVuc2Ftcy5uZXQwggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbB17KWAYcAxwqBJLKiCNrX18NQpeYoJBv
+						6/ilSgtEYJxmcvS+dDFWoFoLCKJt+nfuoegPOZHTeNxyxmg4fMXw0PulVWgQxW0s
+						0zggonUc7VQ98Ny4rkBY0IpOcMzJv1leKk7w0mXfCGZwMacZ9uy5BpM84raTyOTz
+						P0MI28PjWTVAohhVK34CeUm0vUwVzemN0INctgyIdzEHlb6nteKCYKCnjsi2KTO8
+						spumdA3rcU/u+0rUR5auJ0ZsDtUMg7BQw0W6MAkcXEHuC5uGJuLSyhO3h1G1D5L4
+						5Xq5rKvV5FqyRP++hrEoiA2z3lMXtjxEaT4CELiiHbxdukaqw2aZAgMBAAGjggFo
+						MIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+						f4VPXF2nfnxOVFGmLcxxPaq5y+wwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+						MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+						KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIAYDVR0RBBkw
+						F4IVZ2F0ZXdheS5hdGhlbnNhbXMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQBDDpET
+						eseuUBypZlPJMfm2eg3jFIgJOTdxvMNU88EuLXTiSSgRWQAjy7QPHprkFiXUyOu5
+						EdBbXhuTcecRESOqM5pHxZulnWtrggXc9IGy7TzjxsrxFXb881qiVwGu7kiYPv1F
+						IwK6IQfbdbUXiTLNxrLogMYI4T7YwYkkKdA4nCy3aUuucz5uuIovLvLVrtZ9YN66
+						XWcW/d0prifYI70Cwo4ydOJgm0WbqllJRVnP5jI9+pDa1cX6tku8raFkDUZxJfU9
+						IlvryvkiiZTpoo7QOu6aJVAwU33BXcTQyEeCyp5PAvaeNJWCFpQ85gNSxJdVPIqm
+						6pd2Nd0SphPSYavr
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Eduserv athukfed5</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eduserv.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.aucb.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.aucb.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..f6e380a5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.aucb.ac.uk-oala-metadata.xml
@@ -0,0 +1,83 @@
+<?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"/>
+  </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>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDuzCCAqOgAwIBAgIJANuNY6K0MaZtMA0GCSqGSIb3DQEBBQUAMEcxLDAqBgNV
+						BAoTI0FydHMgVW5pdmVyc2l0eSBDb2xsZWdlIEJvdXJuZW1vdXRoMRcwFQYDVQQD
+						Ew5pZHAuYXVjYi5hYy51azAeFw0xMjAyMDExMjA3MDNaFw0yMjAxMjkxMjA3MDNa
+						MEcxLDAqBgNVBAoTI0FydHMgVW5pdmVyc2l0eSBDb2xsZWdlIEJvdXJuZW1vdXRo
+						MRcwFQYDVQQDEw5pZHAuYXVjYi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAKv6k0vcQFpzY8P7/Y4ZenX5dKi1MetOcDf7q8zNLd/gy6BzOpK9
+						DZ+BqUN83VaCly9/9PotjQsqS4XylcV7OVx4AFv6D1fTkQrknMb0bLAabvz3iepd
+						1f3RA8o9ANjzWsxPEtiBsYxlKp/tmpn6JkpVKIUvUwpQs9FTQ1R4ir917jJznAx9
+						lTFE+2a1LSPjOcHazpJ49Odi8fjWku8IJMd5evHaC14iBUPhAa2ZA1q8g3uiGhVe
+						BuAKepZlGVDgNsK3IdDMpTHMonGHucJTOtSFfLZt37iOiY7fXCN8apJ7NqnTOK00
+						k3/toioGQpRXeyd8tu8OhhE2X0eHE8L2rycCAwEAAaOBqTCBpjAdBgNVHQ4EFgQU
+						Wqc09IEu3dXIWoIQguIFZTta1rcwdwYDVR0jBHAwboAUWqc09IEu3dXIWoIQguIF
+						ZTta1rehS6RJMEcxLDAqBgNVBAoTI0FydHMgVW5pdmVyc2l0eSBDb2xsZWdlIEJv
+						dXJuZW1vdXRoMRcwFQYDVQQDEw5pZHAuYXVjYi5hYy51a4IJANuNY6K0MaZtMAwG
+						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAfBYhKmhFOJO0bTWFKSf/JR
+						YobSCSBcEkNAja2jddT3qj8Zi+1o6X0Q/DlqqabuswfIlxjWmAVdzcBJv8fCkKJW
+						K+ZIAtmPBAsQjIaabNA8OW+GAMEI2w5d7EuX0570tA3EiGSCenDWPpDhBYxWPBEp
+						IKP/onJdqAdt522GG+Ifuq/2roGoxQL14a3PFuUQ+Kf1nDZEx+KUEjHj1fHc40hK
+						8Jh9HnCYgj0igC6d+99cmtF+755ROx0NDD8vgQ/duVKsA+7ywJT1meW++iuNCGJi
+						a7E72NL3q9GgdVYNoDnMVrx9riAXs+GXchtuk5+mSlwdkAj7uB4YiKHyRcAnJxA=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDuzCCAqOgAwIBAgIJANuNY6K0MaZtMA0GCSqGSIb3DQEBBQUAMEcxLDAqBgNV
+						BAoTI0FydHMgVW5pdmVyc2l0eSBDb2xsZWdlIEJvdXJuZW1vdXRoMRcwFQYDVQQD
+						Ew5pZHAuYXVjYi5hYy51azAeFw0xMjAyMDExMjA3MDNaFw0yMjAxMjkxMjA3MDNa
+						MEcxLDAqBgNVBAoTI0FydHMgVW5pdmVyc2l0eSBDb2xsZWdlIEJvdXJuZW1vdXRo
+						MRcwFQYDVQQDEw5pZHAuYXVjYi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAKv6k0vcQFpzY8P7/Y4ZenX5dKi1MetOcDf7q8zNLd/gy6BzOpK9
+						DZ+BqUN83VaCly9/9PotjQsqS4XylcV7OVx4AFv6D1fTkQrknMb0bLAabvz3iepd
+						1f3RA8o9ANjzWsxPEtiBsYxlKp/tmpn6JkpVKIUvUwpQs9FTQ1R4ir917jJznAx9
+						lTFE+2a1LSPjOcHazpJ49Odi8fjWku8IJMd5evHaC14iBUPhAa2ZA1q8g3uiGhVe
+						BuAKepZlGVDgNsK3IdDMpTHMonGHucJTOtSFfLZt37iOiY7fXCN8apJ7NqnTOK00
+						k3/toioGQpRXeyd8tu8OhhE2X0eHE8L2rycCAwEAAaOBqTCBpjAdBgNVHQ4EFgQU
+						Wqc09IEu3dXIWoIQguIFZTta1rcwdwYDVR0jBHAwboAUWqc09IEu3dXIWoIQguIF
+						ZTta1rehS6RJMEcxLDAqBgNVBAoTI0FydHMgVW5pdmVyc2l0eSBDb2xsZWdlIEJv
+						dXJuZW1vdXRoMRcwFQYDVQQDEw5pZHAuYXVjYi5hYy51a4IJANuNY6K0MaZtMAwG
+						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAfBYhKmhFOJO0bTWFKSf/JR
+						YobSCSBcEkNAja2jddT3qj8Zi+1o6X0Q/DlqqabuswfIlxjWmAVdzcBJv8fCkKJW
+						K+ZIAtmPBAsQjIaabNA8OW+GAMEI2w5d7EuX0570tA3EiGSCenDWPpDhBYxWPBEp
+						IKP/onJdqAdt522GG+Ifuq/2roGoxQL14a3PFuUQ+Kf1nDZEx+KUEjHj1fHc40hK
+						8Jh9HnCYgj0igC6d+99cmtF+755ROx0NDD8vgQ/duVKsA+7ywJT1meW++iuNCGJi
+						a7E72NL3q9GgdVYNoDnMVrx9riAXs+GXchtuk5+mSlwdkAj7uB4YiKHyRcAnJxA=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aucb.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aucb.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.bangor.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bangor.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..5699b336
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.bangor.ac.uk-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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>
+						MIIDKzCCAhOgAwIBAgIUF2tfR3F/95LsBO8Z7dI/3Od1JrEwDQYJKoZIhvcNAQEF
+						BQAwGzEZMBcGA1UEAxMQaWRwLmJhbmdvci5hYy51azAeFw0xMzAxMTYxNjM3NTNa
+						Fw0zMzAxMTYxNjM3NTNaMBsxGTAXBgNVBAMTEGlkcC5iYW5nb3IuYWMudWswggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJBQhi8lIehZpcfLy6pzq9+YrE
+						s8ECs4yWxQ9zaw8YFq19G1ErjQiP9lr7MVho9zUfl2d0Amo/zXvfU6Uhbc9ZFk3R
+						nE8taqdwTya5x8m8vpbzxCw0h2+v8+FneDuPrxRgTajeHGhqm6hSb8XuJyoXQL5h
+						lkPaP0aXcGnpehaGJORhFTy7eBxWGOAqEs0FswNVYDo2RjUhlkO2t3YkjVuvdaOU
+						4gXKkoC+mpZJNHyz1soHz6gfbPgoDe7tzY+x4riJJPJ83LoEvYLzBR8FeSIbHhLQ
+						LmNOk/Y0fKjIqtGFscZ+zm8iRvL/i0fo9p7SnSOH6IOkQAQlV4hGZtjrGi0fAgMB
+						AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC5iYW5nb3IuYWMudWuGJ2h0dHBzOi8vaWRw
+						LmJhbmdvci5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU42JN8CxdI3UM
+						PnzBlxj2J0DY1AEwDQYJKoZIhvcNAQEFBQADggEBAFq+GsW2kGNchObmYHO6sBFs
+						YVXlPEhrw2c/IsnentSOUV+1HJpfBajvdIHvGeCjG2Hwn+iCTW6P7LMDoqaJDxH7
+						PhvzJzMk8haPjzOMIZhbRghkg45abX6SDP7AHsCoAkROHz4aVC4EuN+UyNCsxSTC
+						KHuE39z3Nw3ENn7zSt0oTeHUy5anfrYDsECbp6NKFcPCeEHHgcRltqssPOcNj84X
+						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>
+						MIIDKzCCAhOgAwIBAgIUF2tfR3F/95LsBO8Z7dI/3Od1JrEwDQYJKoZIhvcNAQEF
+						BQAwGzEZMBcGA1UEAxMQaWRwLmJhbmdvci5hYy51azAeFw0xMzAxMTYxNjM3NTNa
+						Fw0zMzAxMTYxNjM3NTNaMBsxGTAXBgNVBAMTEGlkcC5iYW5nb3IuYWMudWswggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJBQhi8lIehZpcfLy6pzq9+YrE
+						s8ECs4yWxQ9zaw8YFq19G1ErjQiP9lr7MVho9zUfl2d0Amo/zXvfU6Uhbc9ZFk3R
+						nE8taqdwTya5x8m8vpbzxCw0h2+v8+FneDuPrxRgTajeHGhqm6hSb8XuJyoXQL5h
+						lkPaP0aXcGnpehaGJORhFTy7eBxWGOAqEs0FswNVYDo2RjUhlkO2t3YkjVuvdaOU
+						4gXKkoC+mpZJNHyz1soHz6gfbPgoDe7tzY+x4riJJPJ83LoEvYLzBR8FeSIbHhLQ
+						LmNOk/Y0fKjIqtGFscZ+zm8iRvL/i0fo9p7SnSOH6IOkQAQlV4hGZtjrGi0fAgMB
+						AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC5iYW5nb3IuYWMudWuGJ2h0dHBzOi8vaWRw
+						LmJhbmdvci5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU42JN8CxdI3UM
+						PnzBlxj2J0DY1AEwDQYJKoZIhvcNAQEFBQADggEBAFq+GsW2kGNchObmYHO6sBFs
+						YVXlPEhrw2c/IsnentSOUV+1HJpfBajvdIHvGeCjG2Hwn+iCTW6P7LMDoqaJDxH7
+						PhvzJzMk8haPjzOMIZhbRghkg45abX6SDP7AHsCoAkROHz4aVC4EuN+UyNCsxSTC
+						KHuE39z3Nw3ENn7zSt0oTeHUy5anfrYDsECbp6NKFcPCeEHHgcRltqssPOcNj84X
+						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>
diff --git a/swamid-interfederations-2.0/idp.barkingcollege.ac.uk-shibbolethidp.xml b/swamid-interfederations-2.0/idp.barkingcollege.ac.uk-shibbolethidp.xml
new file mode 100644
index 00000000..084d3d93
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.barkingcollege.ac.uk-shibbolethidp.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						Z2VuaGFtY29sbGVnZS5hYy51azAeFw0xNDA5MTAwOTE4MTBaFw0zNDA5MDUwOTE4
+						MTBaMH8xCzAJBgNVBAYTAkdCMQ4wDAYDVQQIEwVFc3NleDEQMA4GA1UEBxMHUm9t
+						Zm9yZDEjMCEGA1UEChQaQmFya2luZyAmIERhZ2VuaGFtIENvbGxlZ2UxKTAnBgNV
+						BAMTIGlkcC5iYXJraW5nZGFnZW5oYW1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxosouASSI48U5Rj7J/CAeIpA7GAK+JXFuqtN
+						ApG5F1+uVRqoUPBZ07ToDpqBMYlNq0FRRf5kPb/M/I60OqMcQUuKMJKj9tiYYNS1
+						FvTX9nMCKCxx+HUpUenQ6BUhDElu3TqiHbh1nsIqErDLShY+/rYOeOYqmiIOJthr
+						cWeXJ+x90ZjIJcJe9RdC5LXQF67e8xEyZttS1fgl2k1IN1PQrUr/rfrbE5U0sta4
+						9stGa8EtjiRMk/5yPH/gLZrQs3qyh0nOaP4K4m7oOC5iubiNIm4CiCEl9vLtY4G/
+						Gw0eNzn89+0C6TR0Iyw7jpYg7cOXf/uXTf8n7Gtxe2pk9xznswIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQBuvV6Pq6axEKaDG3tESzL7mmB3rZAnNx6AZKJ2KlUysBRQ
+						gmRiTWpoPF7alHkLb853H7w13+uw4698rQyh+iVmWBcH4bgcLDerV40aB8AI7Ii1
+						IPIw+3XVWeWmREG402NBelkfp4FKL2Bj5moWISC+Jo7za2/5lA/Jj/eEqV+xtY5C
+						6U2QcOAeaJNeJgrMYWhTPEbd9cdx7/kiku89UdXzmKD29fC8C1c0/G7rXhvzcCsu
+						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>
+						MIIDejCCAmICCQCUfpmzVfedFDANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
+						QjEOMAwGA1UECBMFRXNzZXgxEDAOBgNVBAcTB1JvbWZvcmQxIzAhBgNVBAoUGkJh
+						cmtpbmcgJiBEYWdlbmhhbSBDb2xsZWdlMSkwJwYDVQQDEyBpZHAuYmFya2luZ2Rh
+						Z2VuaGFtY29sbGVnZS5hYy51azAeFw0xNDA5MTAwOTE4MTBaFw0zNDA5MDUwOTE4
+						MTBaMH8xCzAJBgNVBAYTAkdCMQ4wDAYDVQQIEwVFc3NleDEQMA4GA1UEBxMHUm9t
+						Zm9yZDEjMCEGA1UEChQaQmFya2luZyAmIERhZ2VuaGFtIENvbGxlZ2UxKTAnBgNV
+						BAMTIGlkcC5iYXJraW5nZGFnZW5oYW1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxosouASSI48U5Rj7J/CAeIpA7GAK+JXFuqtN
+						ApG5F1+uVRqoUPBZ07ToDpqBMYlNq0FRRf5kPb/M/I60OqMcQUuKMJKj9tiYYNS1
+						FvTX9nMCKCxx+HUpUenQ6BUhDElu3TqiHbh1nsIqErDLShY+/rYOeOYqmiIOJthr
+						cWeXJ+x90ZjIJcJe9RdC5LXQF67e8xEyZttS1fgl2k1IN1PQrUr/rfrbE5U0sta4
+						9stGa8EtjiRMk/5yPH/gLZrQs3qyh0nOaP4K4m7oOC5iubiNIm4CiCEl9vLtY4G/
+						Gw0eNzn89+0C6TR0Iyw7jpYg7cOXf/uXTf8n7Gtxe2pk9xznswIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQBuvV6Pq6axEKaDG3tESzL7mmB3rZAnNx6AZKJ2KlUysBRQ
+						gmRiTWpoPF7alHkLb853H7w13+uw4698rQyh+iVmWBcH4bgcLDerV40aB8AI7Ii1
+						IPIw+3XVWeWmREG402NBelkfp4FKL2Bj5moWISC+Jo7za2/5lA/Jj/eEqV+xtY5C
+						6U2QcOAeaJNeJgrMYWhTPEbd9cdx7/kiku89UdXzmKD29fC8C1c0/G7rXhvzcCsu
+						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>
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
new file mode 100644
index 00000000..2fcd7089
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.barkingdagenhamcollege.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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>
+      <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
+						Z2VuaGFtY29sbGVnZS5hYy51azAeFw0xMTA5MjkxODM3MzJaFw0zMTA5MjQxODM3
+						MzJaMH8xCzAJBgNVBAYTAkdCMQ4wDAYDVQQIEwVFc3NleDEQMA4GA1UEBxMHUm9t
+						Zm9yZDEjMCEGA1UEChQaQmFya2luZyAmIERhZ2VuaGFtIENvbGxlZ2UxKTAnBgNV
+						BAMTIGlkcC5iYXJraW5nZGFnZW5oYW1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwa9EQ61PP+dHS22rPI0rhCuFbGAmZP4FRaXp
+						MWAg+KNnU/iFw/L//5Fe7vOw+x3mrCgmVejtDcjM4V3eOrcQ6Uhw0ju2hKFDXtA1
+						jkSKDh5AZjAQ4wFh/+Yz3QVPui57hzzP6uvPOGFFrTPXAJ31FPuTjtRJ9xV743MU
+						pnAlNpr7VobIB77/S4TIOF6VTIe1WVHEx2UnsLc39D5FAotX58NM9zTI0s2l780T
+						wG+8HgGwAaDLFJE6P5m+p/2CwaWipuRW0NjZ1cjExANYxCO0EKUKdQ7GiFtFFRSI
+						fSnRmW+TcdqRV2cHW/kC8507BqEXPeX1cq/8W/Kh4agoGOS6VQIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQC1rDTuyYlLsswBpXgfHf5ODCNmkmU7QKECKl4p6KhZrdki
+						acVnen1fOpY+1mqJ1v+YdStYVffuTfFcZfdXNrdaWklUYfkTJYRtq8LwvkTgoi8O
+						KJTZODdFgfWHHAvAv2QNELLN6OSkMZ3uZ4n/oW1h5m+ROtAxYSbRQjSjG8PHeYBg
+						Os+DeSwUoaH6XdBTJmoWnRiGuMLNvKpzrgCNMAxmIJZI1kb0iGqcV7rHQn1DvZlv
+						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>
+						MIIDejCCAmICCQD/ZQQfcmZ8hjANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
+						QjEOMAwGA1UECBMFRXNzZXgxEDAOBgNVBAcTB1JvbWZvcmQxIzAhBgNVBAoUGkJh
+						cmtpbmcgJiBEYWdlbmhhbSBDb2xsZWdlMSkwJwYDVQQDEyBpZHAuYmFya2luZ2Rh
+						Z2VuaGFtY29sbGVnZS5hYy51azAeFw0xMTA5MjkxODM3MzJaFw0zMTA5MjQxODM3
+						MzJaMH8xCzAJBgNVBAYTAkdCMQ4wDAYDVQQIEwVFc3NleDEQMA4GA1UEBxMHUm9t
+						Zm9yZDEjMCEGA1UEChQaQmFya2luZyAmIERhZ2VuaGFtIENvbGxlZ2UxKTAnBgNV
+						BAMTIGlkcC5iYXJraW5nZGFnZW5oYW1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwa9EQ61PP+dHS22rPI0rhCuFbGAmZP4FRaXp
+						MWAg+KNnU/iFw/L//5Fe7vOw+x3mrCgmVejtDcjM4V3eOrcQ6Uhw0ju2hKFDXtA1
+						jkSKDh5AZjAQ4wFh/+Yz3QVPui57hzzP6uvPOGFFrTPXAJ31FPuTjtRJ9xV743MU
+						pnAlNpr7VobIB77/S4TIOF6VTIe1WVHEx2UnsLc39D5FAotX58NM9zTI0s2l780T
+						wG+8HgGwAaDLFJE6P5m+p/2CwaWipuRW0NjZ1cjExANYxCO0EKUKdQ7GiFtFFRSI
+						fSnRmW+TcdqRV2cHW/kC8507BqEXPeX1cq/8W/Kh4agoGOS6VQIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQC1rDTuyYlLsswBpXgfHf5ODCNmkmU7QKECKl4p6KhZrdki
+						acVnen1fOpY+1mqJ1v+YdStYVffuTfFcZfdXNrdaWklUYfkTJYRtq8LwvkTgoi8O
+						KJTZODdFgfWHHAvAv2QNELLN6OSkMZ3uZ4n/oW1h5m+ROtAxYSbRQjSjG8PHeYBg
+						Os+DeSwUoaH6XdBTJmoWnRiGuMLNvKpzrgCNMAxmIJZI1kb0iGqcV7rHQn1DvZlv
+						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>
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
new file mode 100644
index 00000000..5d15e30a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.barnetsouthgate.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						c291dGhnYXRlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						r+e9wCL7JCdkcPekUVtvWeyGBt9ZmEbhfpqp6iGU8k4V648rLJ+WgcdmG8ySslRW
+						nwC9arYzJe0CKxr2a2Ym2/Zr+FQfC8/N4fC8gGyofCWKMraP96+DuP9s2f8cpuG9
+						xZ739oFkWYINupeHRamXQQunTXUahLpG1gho7qZwMsscPT0LKTevGOYisnyZ3U5+
+						yQNCPqftvM9LXyr+NOoPEOFm+VBHBSmoe2S8WkG9ZzchC87LXmrpibMAPk8UOsQT
+						3ccwonJznnKmwXxV8WK1BGrhXGtQzKnCsoPtz22gvA56svSIiGsrCeUp/K1cq1mu
+						xKGZWCfPV0Wd1LsCyrgAsQIDAQABo3kwdzBWBgNVHREETzBNghlpZHAuYmFybmV0
+						c291dGhnYXRlLmFjLnVrhjBodHRwczovL2lkcC5iYXJuZXRzb3V0aGdhdGUuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFI5dJH5PCJgmNc6UAyQicW7aF6Tr
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBez0X0P76l74nbqKmG5TDpPnkC+J3T1Gagpp6X
+						gg1GC85s41bASa2ZnRnJfILR4aWxU0OsZalJUULbloG82iamTiT5ziS5a+zB7wel
+						8BXuVVvIaT2KUZqpVm/katlQwWRbrq1HwcoyxKV8i/Yph4SyK0fn/ZX/3Btvp2+j
+						45yt334InrF0dzqxTGy3dIEfig3KuEvgJYZlX5sA2v7Ru08VfjD/8ufLRxxaFwoD
+						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>
+						MIIDUDCCAjigAwIBAgIVALtgf/tnX8POhw6lNPBrB0KlwpZ6MA0GCSqGSIb3DQEB
+						BQUAMCQxIjAgBgNVBAMTGWlkcC5iYXJuZXRzb3V0aGdhdGUuYWMudWswHhcNMTMw
+						MTE0MTI0MzQ4WhcNMzMwMTE0MTI0MzQ4WjAkMSIwIAYDVQQDExlpZHAuYmFybmV0
+						c291dGhnYXRlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						r+e9wCL7JCdkcPekUVtvWeyGBt9ZmEbhfpqp6iGU8k4V648rLJ+WgcdmG8ySslRW
+						nwC9arYzJe0CKxr2a2Ym2/Zr+FQfC8/N4fC8gGyofCWKMraP96+DuP9s2f8cpuG9
+						xZ739oFkWYINupeHRamXQQunTXUahLpG1gho7qZwMsscPT0LKTevGOYisnyZ3U5+
+						yQNCPqftvM9LXyr+NOoPEOFm+VBHBSmoe2S8WkG9ZzchC87LXmrpibMAPk8UOsQT
+						3ccwonJznnKmwXxV8WK1BGrhXGtQzKnCsoPtz22gvA56svSIiGsrCeUp/K1cq1mu
+						xKGZWCfPV0Wd1LsCyrgAsQIDAQABo3kwdzBWBgNVHREETzBNghlpZHAuYmFybmV0
+						c291dGhnYXRlLmFjLnVrhjBodHRwczovL2lkcC5iYXJuZXRzb3V0aGdhdGUuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFI5dJH5PCJgmNc6UAyQicW7aF6Tr
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBez0X0P76l74nbqKmG5TDpPnkC+J3T1Gagpp6X
+						gg1GC85s41bASa2ZnRnJfILR4aWxU0OsZalJUULbloG82iamTiT5ziS5a+zB7wel
+						8BXuVVvIaT2KUZqpVm/katlQwWRbrq1HwcoyxKV8i/Yph4SyK0fn/ZX/3Btvp2+j
+						45yt334InrF0dzqxTGy3dIEfig3KuEvgJYZlX5sA2v7Ru08VfjD/8ufLRxxaFwoD
+						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>
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
new file mode 100644
index 00000000..268a679a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.barnfield.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn2fQZU1OD3HxwwjM
+						sMaiV9e6lHs0zhXle9vH+OTQY88KxItAnQH9vO8AlBChb8FtDIANpVYjD0zfrUNI
+						D0NUs97fPIVnt1/X+28XbgKR23jt//BQ710iHIokB/MShyYwRfM/NxERtrbS1GRf
+						06S6+D9QKEl1G/PoCaQARrW94GA4pXYNuuyxzs8WycxtMpSOnmCCA0BjvkVPvxRG
+						dpKndZW0Nb+rKhoaRr9C8zrSUMzxFusi3+bc9qBG8mGHe8EFzByweCrkGzKcrlg4
+						oVUUihKM7AE+6xORjuSkMPkutbvVZVoUbQDIobRsLoLrUe5YL5xCELdFBrShHuZJ
+						8kARewIDAQABo20wazBKBgNVHREEQzBBghNpZHAuYmFybmZpZWxkLmFjLnVrhipo
+						dHRwczovL2lkcC5iYXJuZmllbGQuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
+						BBYEFFtBAaXbDnJ/zV4WWTnLReZzRhQ8MA0GCSqGSIb3DQEBBQUAA4IBAQAK3zaH
+						/TESVviKnN3cHyX9d4Q/iklnt2Uh8jpccpG/YmpSHxm1+9jpAHaewxARDGl5eCB5
+						Y5usjhoo8CuPnZzaWc5OE9DOdyHijJYjKAKMniUV02efAoMPR2MBZ9v1lpFkM7sH
+						xKICAwo9ItYnV8qsRBhTgcI2YdXVtFuiyOtUhATalnO2nM011izOG4weF5ppUaVt
+						k9youSyNB8DkibbpcjM+l4PlmllCq+c7yh07tdKUnGIKynR/+WsJPWCIRiV9v44l
+						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>
+						MIIDODCCAiCgAwIBAgIVAPkbgLWmrMD9YvMjkZ3ZIvYHZY8yMA0GCSqGSIb3DQEB
+						BQUAMB4xHDAaBgNVBAMTE2lkcC5iYXJuZmllbGQuYWMudWswHhcNMTMwNzA4MTAx
+						NDIyWhcNMzMwNzA4MTAxNDIyWjAeMRwwGgYDVQQDExNpZHAuYmFybmZpZWxkLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn2fQZU1OD3HxwwjM
+						sMaiV9e6lHs0zhXle9vH+OTQY88KxItAnQH9vO8AlBChb8FtDIANpVYjD0zfrUNI
+						D0NUs97fPIVnt1/X+28XbgKR23jt//BQ710iHIokB/MShyYwRfM/NxERtrbS1GRf
+						06S6+D9QKEl1G/PoCaQARrW94GA4pXYNuuyxzs8WycxtMpSOnmCCA0BjvkVPvxRG
+						dpKndZW0Nb+rKhoaRr9C8zrSUMzxFusi3+bc9qBG8mGHe8EFzByweCrkGzKcrlg4
+						oVUUihKM7AE+6xORjuSkMPkutbvVZVoUbQDIobRsLoLrUe5YL5xCELdFBrShHuZJ
+						8kARewIDAQABo20wazBKBgNVHREEQzBBghNpZHAuYmFybmZpZWxkLmFjLnVrhipo
+						dHRwczovL2lkcC5iYXJuZmllbGQuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
+						BBYEFFtBAaXbDnJ/zV4WWTnLReZzRhQ8MA0GCSqGSIb3DQEBBQUAA4IBAQAK3zaH
+						/TESVviKnN3cHyX9d4Q/iklnt2Uh8jpccpG/YmpSHxm1+9jpAHaewxARDGl5eCB5
+						Y5usjhoo8CuPnZzaWc5OE9DOdyHijJYjKAKMniUV02efAoMPR2MBZ9v1lpFkM7sH
+						xKICAwo9ItYnV8qsRBhTgcI2YdXVtFuiyOtUhATalnO2nM011izOG4weF5ppUaVt
+						k9youSyNB8DkibbpcjM+l4PlmllCq+c7yh07tdKUnGIKynR/+WsJPWCIRiV9v44l
+						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>
diff --git a/swamid-interfederations-2.0/idp.bath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bath.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..68ce4aa9
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.bath.ac.uk-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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>
+						MIIDKDCCAhCgAwIBAgIVAOqBrGCnJlQiSzyI6NPPnvws1tCfMA0GCSqGSIb3DQEB
+						BQUAMBoxGDAWBgNVBAMTD2F1dGguYmF0aC5hYy51azAeFw0xMTA4MTYwNjM1MjVa
+						Fw0zMTA4MTYwNjM1MjVaMBoxGDAWBgNVBAMTD2F1dGguYmF0aC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL95cyOywpJXBzn8efSdlNIJQiZi
+						dNagu7t8YjInzqARwzB/7Ii2QHNkYVbOHeYuRdlQGeSS350NdHV7Cyn4IhurrEUW
+						NG9JFQ1knyw2O6A8ZkoT6QE5XBt1j/aQi9emY8id3vcIdZCWFVRBVjEZ6BR58ne9
+						5FGMVVusGfHgtayt3MoJvQUcl7m7bP+mvNwPL/wXBWmvg83g3Ngi6B4R3uHY0kkL
+						hSsYJEkoX91cv7RAspKYDjtuhdrvoywcwltwD7GDs+e6wXAdMyVgMRNq2ACK+age
+						IQCWZ3o/1cd0RFAVCwmUOzGd4jFmqaWneQFK+DqFyOxTW3LO3zLZ3xq22RsCAwEA
+						AaNlMGMwQgYDVR0RBDswOYIPYXV0aC5iYXRoLmFjLnVrhiZodHRwczovL2F1dGgu
+						YmF0aC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUMBAXgoXqNZufAstd
+						XJjQBDQka9wwDQYJKoZIhvcNAQEFBQADggEBAJlY93MwsogYvqEA32y+uhe516tb
+						VpnagIQ6EdPfZlibvHM5RQy1sYdSXkg5aab1aBP05yaA/S23DARAQocbBUGvmM3q
+						2Kv/r6XoGZxWZp1d0iIRnDnRBcY/KlGqzoHGOpEp06wgbUSSrYQAgLMcZat7lER7
+						TRrqZ6mwhHVpiJkRsZWTshVZEw0Mz44NoeADcM2Ao6U+h6oc9CCJmBguXdPFH+ti
+						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>
+						MIIDKDCCAhCgAwIBAgIVAOqBrGCnJlQiSzyI6NPPnvws1tCfMA0GCSqGSIb3DQEB
+						BQUAMBoxGDAWBgNVBAMTD2F1dGguYmF0aC5hYy51azAeFw0xMTA4MTYwNjM1MjVa
+						Fw0zMTA4MTYwNjM1MjVaMBoxGDAWBgNVBAMTD2F1dGguYmF0aC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL95cyOywpJXBzn8efSdlNIJQiZi
+						dNagu7t8YjInzqARwzB/7Ii2QHNkYVbOHeYuRdlQGeSS350NdHV7Cyn4IhurrEUW
+						NG9JFQ1knyw2O6A8ZkoT6QE5XBt1j/aQi9emY8id3vcIdZCWFVRBVjEZ6BR58ne9
+						5FGMVVusGfHgtayt3MoJvQUcl7m7bP+mvNwPL/wXBWmvg83g3Ngi6B4R3uHY0kkL
+						hSsYJEkoX91cv7RAspKYDjtuhdrvoywcwltwD7GDs+e6wXAdMyVgMRNq2ACK+age
+						IQCWZ3o/1cd0RFAVCwmUOzGd4jFmqaWneQFK+DqFyOxTW3LO3zLZ3xq22RsCAwEA
+						AaNlMGMwQgYDVR0RBDswOYIPYXV0aC5iYXRoLmFjLnVrhiZodHRwczovL2F1dGgu
+						YmF0aC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUMBAXgoXqNZufAstd
+						XJjQBDQka9wwDQYJKoZIhvcNAQEFBQADggEBAJlY93MwsogYvqEA32y+uhe516tb
+						VpnagIQ6EdPfZlibvHM5RQy1sYdSXkg5aab1aBP05yaA/S23DARAQocbBUGvmM3q
+						2Kv/r6XoGZxWZp1d0iIRnDnRBcY/KlGqzoHGOpEp06wgbUSSrYQAgLMcZat7lER7
+						TRrqZ6mwhHVpiJkRsZWTshVZEw0Mz44NoeADcM2Ao6U+h6oc9CCJmBguXdPFH+ti
+						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>
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
new file mode 100644
index 00000000..1e533415
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.bc.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDIDCCAgigAwIBAgIVAPqdd5taKpjAToNxaMGZQFNCCsUiMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcC5iYy5jYXMuY3owHhcNMTQwNDAxMDk0NTU3WhcN
+MzQwNDAxMDk0NTU3WjAYMRYwFAYDVQQDEw1pZHAuYmMuY2FzLmN6MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg+Edl/InvpuZlyI4uXGWWh3byDeowddy
+kgO3jp88IR3C7zBnSD40HavmkPRbhBr85ZcUkOZCAyAWrYu6fseN9cRa+ILGQZtT
+vkgLGYHk8FM/Eo3U3FZn+SM/9i9Zow5u/BZJNO2PtX/GUqb1IC1lL+7l1aN5NZ6n
+nOERRJOhWLnckDCgGpu1lQFMUUb6LdHmZUvw7nV0qCQQL1KzDmAkX7Rowylycf1/
+975mMLKSDvHPeiOlORbYSZEaDKVbg+iV+L7ecZvNR1RxPy1E5JRr/dB+Pw6UjAXN
+O1azxIVdoCkumVjZM9LfIF+vPdaJcSkHoZJiu6T+GSQaS9jKtwjvNQIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHAuYmMuY2FzLmN6hiRodHRwczovL2lkcC5iYy5jYXMu
+Y3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCHLsDXLe66ZYx4c1WiJSKuOD8YW
+MA0GCSqGSIb3DQEBBQUAA4IBAQBQKv6/5c6F4+LPXk6wd40PkPNMilJ2GZAiXhBt
+OIdP6L4sClDnsvs2mIIoOk7rvdt3fUILskSdd+sApjN8MemZXKxfsrXLIKnyrF1Z
+ieIGIzWbbteGotGaSPEadpHy9PKY/mfkNuEoIjfcjitqxMktTCsq40P+Z6EzExpL
+RUxZJa5mDx51/ENu7PSKaQsFNNfdmaLzjb4gtwtTQTnbw1sdSX5NwwMJNZsqt5J6
+6f0TcqgbfoS8WaaylyEOk/mIA5/f7GrLQnwSR3bVkmwsSrQQgIxx18LSLc05bNya
+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>
+MIIDIDCCAgigAwIBAgIVAPqdd5taKpjAToNxaMGZQFNCCsUiMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcC5iYy5jYXMuY3owHhcNMTQwNDAxMDk0NTU3WhcN
+MzQwNDAxMDk0NTU3WjAYMRYwFAYDVQQDEw1pZHAuYmMuY2FzLmN6MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg+Edl/InvpuZlyI4uXGWWh3byDeowddy
+kgO3jp88IR3C7zBnSD40HavmkPRbhBr85ZcUkOZCAyAWrYu6fseN9cRa+ILGQZtT
+vkgLGYHk8FM/Eo3U3FZn+SM/9i9Zow5u/BZJNO2PtX/GUqb1IC1lL+7l1aN5NZ6n
+nOERRJOhWLnckDCgGpu1lQFMUUb6LdHmZUvw7nV0qCQQL1KzDmAkX7Rowylycf1/
+975mMLKSDvHPeiOlORbYSZEaDKVbg+iV+L7ecZvNR1RxPy1E5JRr/dB+Pw6UjAXN
+O1azxIVdoCkumVjZM9LfIF+vPdaJcSkHoZJiu6T+GSQaS9jKtwjvNQIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHAuYmMuY2FzLmN6hiRodHRwczovL2lkcC5iYy5jYXMu
+Y3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCHLsDXLe66ZYx4c1WiJSKuOD8YW
+MA0GCSqGSIb3DQEBBQUAA4IBAQBQKv6/5c6F4+LPXk6wd40PkPNMilJ2GZAiXhBt
+OIdP6L4sClDnsvs2mIIoOk7rvdt3fUILskSdd+sApjN8MemZXKxfsrXLIKnyrF1Z
+ieIGIzWbbteGotGaSPEadpHy9PKY/mfkNuEoIjfcjitqxMktTCsq40P+Z6EzExpL
+RUxZJa5mDx51/ENu7PSKaQsFNNfdmaLzjb4gtwtTQTnbw1sdSX5NwwMJNZsqt5J6
+6f0TcqgbfoS8WaaylyEOk/mIA5/f7GrLQnwSR3bVkmwsSrQQgIxx18LSLc05bNya
+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>
diff --git a/swamid-interfederations-2.0/idp.beds.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.beds.ac.uk-entity.xml
new file mode 100644
index 00000000..6d994d28
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.beds.ac.uk-entity.xml
@@ -0,0 +1,109 @@
+<?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>
+      <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
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5pZHAuYmVkcy5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKetA8/6veT4+GRV
+						uOGRULFxQkPXGXQ1V04ax3w9/xwgh60cCo/YnuVlcEjDkcSeXamwUp1lduMi8dRg
+						CHH0wfD4vni2iacjSnnfO9rSsLchaGJgvUpW+NO/Byh77rFVE4iWz7j/P2oMaxWJ
+						/mAxGcF/4SvrzSJpQ4Bvb3ERkT2IlOvS0RDJ2hpaFCH3QPSLbItg4zmg3gNigO/c
+						fJFiM0l5ej3j8A9TM7rnsQkqCRYvVQ4Hx0cCo0T0NfNIqpd4qe02itjS8KisLM5K
+						xWAAsKxu7vm8MNDBwbz1fdrtU2y95rvba27iU0wsGvXMOW7AuAKcVghw8Kj3RSRN
+						WjHQtzcCAwEAAaOCAWswggFnMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+						47ntMB0GA1UdDgQWBBT8n949CVd+XA8RY2eIr6uEvqJKTzAOBgNVHQ8BAf8EBAMC
+						BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+						IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
+						oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
+						bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
+						bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
+						dGNzLnRlcmVuYS5vcmcwGQYDVR0RBBIwEIIOaWRwLmJlZHMuYWMudWswDQYJKoZI
+						hvcNAQEFBQADggEBAKV1I2UeqFfZJD9iJqVigp+RHtC4czWu83SSV9b/sNFlUp8U
+						MPrEiFQyrKePjkpXOV0nampl2sfH+tlleaPJE6HQkU0fYXlPakWFn6V/4E9zoTuH
+						ezaXF+x9paTlrcjj46VCA/Ioo/DG7O1fg+Al7/NAofrMcDwEtuEbFoXesj1cAbxL
+						AfI9EdCkiY/95rhoDk3F3B/NrdNPLsJwLw5R5kQpaVhSIEdiUaYZ50yLQzLtHLRF
+						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>
+						MIIEaTCCA1GgAwIBAgIQSzfaeKahBOK3I4on09FG0DANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowPDEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5pZHAuYmVkcy5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKetA8/6veT4+GRV
+						uOGRULFxQkPXGXQ1V04ax3w9/xwgh60cCo/YnuVlcEjDkcSeXamwUp1lduMi8dRg
+						CHH0wfD4vni2iacjSnnfO9rSsLchaGJgvUpW+NO/Byh77rFVE4iWz7j/P2oMaxWJ
+						/mAxGcF/4SvrzSJpQ4Bvb3ERkT2IlOvS0RDJ2hpaFCH3QPSLbItg4zmg3gNigO/c
+						fJFiM0l5ej3j8A9TM7rnsQkqCRYvVQ4Hx0cCo0T0NfNIqpd4qe02itjS8KisLM5K
+						xWAAsKxu7vm8MNDBwbz1fdrtU2y95rvba27iU0wsGvXMOW7AuAKcVghw8Kj3RSRN
+						WjHQtzcCAwEAAaOCAWswggFnMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+						47ntMB0GA1UdDgQWBBT8n949CVd+XA8RY2eIr6uEvqJKTzAOBgNVHQ8BAf8EBAMC
+						BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+						IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
+						oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
+						bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
+						bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
+						dGNzLnRlcmVuYS5vcmcwGQYDVR0RBBIwEIIOaWRwLmJlZHMuYWMudWswDQYJKoZI
+						hvcNAQEFBQADggEBAKV1I2UeqFfZJD9iJqVigp+RHtC4czWu83SSV9b/sNFlUp8U
+						MPrEiFQyrKePjkpXOV0nampl2sfH+tlleaPJE6HQkU0fYXlPakWFn6V/4E9zoTuH
+						ezaXF+x9paTlrcjj46VCA/Ioo/DG7O1fg+Al7/NAofrMcDwEtuEbFoXesj1cAbxL
+						AfI9EdCkiY/95rhoDk3F3B/NrdNPLsJwLw5R5kQpaVhSIEdiUaYZ50yLQzLtHLRF
+						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>
diff --git a/swamid-interfederations-2.0/idp.bham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bham.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..0ea16aa7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.bham.ac.uk-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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>
+      <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>
+						MIIDUDCCAjigAwIBAgIVANTuNiziz4l2CViQyzhD3hfr5trpMA0GCSqGSIb3DQEB
+						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGhpZHAyLmJoYW0uYWMudWswHhcNMTIw
+						NjE5MDgyMzM2WhcNMzIwNjE5MDgyMzM2WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
+						aWRwMi5iaGFtLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						oRlhyEKWt6PWevWIRBbE7g8uCdCUmFsjY+hGWYAOrYKworqlT0zuDIHU1AtFpcNo
+						CrjfCaRTAzi6llolA3R5oe+Yj/9tT9Ft/dHGPejxto/Dmr3ujIvNhNRRl0I0K2/X
+						AYipqla6kgQ9dz23JDLjDewVolNrSULW2/Az42z6BMeIpGd/S796U+5Zy4D0CSK9
+						H79IbfRH6/gf2rUWq9x44yVEZHDFtT9yc0Ve1xL73ztznhTTh4WaM4JV5DDnAQs7
+						glE6OILv+6ELDlv44jaCn0Q0CC+s++4WPXo46b6jYFfSWUdDd++Kujmg9TfAnOX5
+						MzK3WMSnR7ersXEl1K1bcQIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
+						aWRwMi5iaGFtLmFjLnVrhjBodHRwczovL3NoaWJib2xldGhpZHAyLmJoYW0uYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLeRPHREWj++JVtbqdmpnHmmDGCy
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBb/EvK4M26WIFe28cgRYlQZjUv90JzxWtvnQRk
+						jdBW18+PWJ+mFdZ4B0p+iNO5/hw/mZs7ueHjQlaofEs1NZvGbbusKgGn4Nn4hO77
+						reVGThMKjpxkQR2NXq6nPKSnJBOGTdbjJ2woNReNakMIDs5JQAXpl1qmtwOQNKnG
+						E6ayBTQAANKDAY5rVawdHIBqUO4GPD1waxXh/1zKAcVktHtamRinthZXRh0WHdHO
+						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>
+						MIIDUDCCAjigAwIBAgIVANTuNiziz4l2CViQyzhD3hfr5trpMA0GCSqGSIb3DQEB
+						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGhpZHAyLmJoYW0uYWMudWswHhcNMTIw
+						NjE5MDgyMzM2WhcNMzIwNjE5MDgyMzM2WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
+						aWRwMi5iaGFtLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						oRlhyEKWt6PWevWIRBbE7g8uCdCUmFsjY+hGWYAOrYKworqlT0zuDIHU1AtFpcNo
+						CrjfCaRTAzi6llolA3R5oe+Yj/9tT9Ft/dHGPejxto/Dmr3ujIvNhNRRl0I0K2/X
+						AYipqla6kgQ9dz23JDLjDewVolNrSULW2/Az42z6BMeIpGd/S796U+5Zy4D0CSK9
+						H79IbfRH6/gf2rUWq9x44yVEZHDFtT9yc0Ve1xL73ztznhTTh4WaM4JV5DDnAQs7
+						glE6OILv+6ELDlv44jaCn0Q0CC+s++4WPXo46b6jYFfSWUdDd++Kujmg9TfAnOX5
+						MzK3WMSnR7ersXEl1K1bcQIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
+						aWRwMi5iaGFtLmFjLnVrhjBodHRwczovL3NoaWJib2xldGhpZHAyLmJoYW0uYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLeRPHREWj++JVtbqdmpnHmmDGCy
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBb/EvK4M26WIFe28cgRYlQZjUv90JzxWtvnQRk
+						jdBW18+PWJ+mFdZ4B0p+iNO5/hw/mZs7ueHjQlaofEs1NZvGbbusKgGn4Nn4hO77
+						reVGThMKjpxkQR2NXq6nPKSnJBOGTdbjJ2woNReNakMIDs5JQAXpl1qmtwOQNKnG
+						E6ayBTQAANKDAY5rVawdHIBqUO4GPD1waxXh/1zKAcVktHtamRinthZXRh0WHdHO
+						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>John</md:GivenName>
+    <md:SurName>Turnbull</md:SurName>
+    <md:EmailAddress>mailto:J.Turnbull@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.blackburn.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.blackburn.ac.uk-entity.xml
new file mode 100644
index 00000000..844ef041
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.blackburn.ac.uk-entity.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						Yy51azAeFw0xNDA0MDkwNzU2MzNaFw0zNDA0MDQwNzU2MzNaMHAxCzAJBgNVBAYT
+						AkdCMRMwEQYDVQQIEwpMYW5jYXNoaXJlMRIwEAYDVQQHEwlCbGFja2J1cm4xGjAY
+						BgNVBAoTEUJsYWNrYnVybiBDb2xsZWdlMRwwGgYDVQQDExNpZHAuYmxhY2tidXJu
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwBW5mNKzK19M
+						0cPz3xt5l5rckUonhNxfbzrEYqrRomyBRMPwv9rDcepIvl/ATrRqkhqppibRnAk9
+						s7RsDCoLboLTHLi/1bb3I8+Pm1Hy+ay0+BgSvMnBHeLqCAwLiE5V+oexN4ha3JJH
+						PVpwN7+HFdGtHO2ZO9K2VrpvwuaUZfhOEAnfuNFnTHA7doKwQWWyvlTfqrY2XNuE
+						ZkUD6RdvxeDB555Nzl7BvMWL+nr41WuWW5r7jZyl5EEOgr7AiwbyRrpaKdZ4ditW
+						ozyRSSo/gQDbXF0fhlomrPQzegnOwRmmD96lKAcd1xk61PE3AkrC8oA0pj+PWe90
+						vUxeeftg2QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBjnFevePhXMt3YQOIs3l2p
+						35bLcLUc1yLy+2+7ynCH2Vsy8UpB1puQQE3wug7/zYhxp6RV2OKpTXPugW9Mx8TB
+						8eM/ZCoqVbc4H6VH29G8XhwI+XYBnsnT6wS9KU3v5fEUIErP2dLnSBDpqBKyuAwP
+						yzpDwmqPTzifuv5QB2MaFMM5t/qBUFAXbSuueRgA1gICtdb7kVUv0n/7BE6IsncC
+						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>
+						MIIDXDCCAkQCCQCDh5l0tXKOTzANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
+						QjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2tidXJuMRowGAYD
+						VQQKExFCbGFja2J1cm4gQ29sbGVnZTEcMBoGA1UEAxMTaWRwLmJsYWNrYnVybi5h
+						Yy51azAeFw0xNDA0MDkwNzU2MzNaFw0zNDA0MDQwNzU2MzNaMHAxCzAJBgNVBAYT
+						AkdCMRMwEQYDVQQIEwpMYW5jYXNoaXJlMRIwEAYDVQQHEwlCbGFja2J1cm4xGjAY
+						BgNVBAoTEUJsYWNrYnVybiBDb2xsZWdlMRwwGgYDVQQDExNpZHAuYmxhY2tidXJu
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwBW5mNKzK19M
+						0cPz3xt5l5rckUonhNxfbzrEYqrRomyBRMPwv9rDcepIvl/ATrRqkhqppibRnAk9
+						s7RsDCoLboLTHLi/1bb3I8+Pm1Hy+ay0+BgSvMnBHeLqCAwLiE5V+oexN4ha3JJH
+						PVpwN7+HFdGtHO2ZO9K2VrpvwuaUZfhOEAnfuNFnTHA7doKwQWWyvlTfqrY2XNuE
+						ZkUD6RdvxeDB555Nzl7BvMWL+nr41WuWW5r7jZyl5EEOgr7AiwbyRrpaKdZ4ditW
+						ozyRSSo/gQDbXF0fhlomrPQzegnOwRmmD96lKAcd1xk61PE3AkrC8oA0pj+PWe90
+						vUxeeftg2QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBjnFevePhXMt3YQOIs3l2p
+						35bLcLUc1yLy+2+7ynCH2Vsy8UpB1puQQE3wug7/zYhxp6RV2OKpTXPugW9Mx8TB
+						8eM/ZCoqVbc4H6VH29G8XhwI+XYBnsnT6wS9KU3v5fEUIErP2dLnSBDpqBKyuAwP
+						yzpDwmqPTzifuv5QB2MaFMM5t/qBUFAXbSuueRgA1gICtdb7kVUv0n/7BE6IsncC
+						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>
diff --git a/swamid-interfederations-2.0/idp.boltoncc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.boltoncc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..15c0740c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.boltoncc.ac.uk-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						MjA5MDk1NjEyWhcNMzMxMjA0MDk1NjEyWjBlMQswCQYDVQQGEwJHQjEPMA0GA1UE
+						CBMGQm9sdG9uMQ8wDQYDVQQHEwZCb2x0b24xFzAVBgNVBAoTDkJvbHRvbiBDb2xs
+						ZWdlMRswGQYDVQQDExJpZHAuYm9sdG9uY2MuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQDt/7etyusEoPkmBjb+vlI5qWaSK/nunnDDfKji4Rf1
+						J2LcJ0AQBE7EZ9a3uaFLe3sHLIxav/VwuOGlLEFA+bIlpfuIUI00Pkv5lWpoSv3Q
+						qDHKniLxLgOxeO3WKO0ziALCM9gKor0iZkPwESKjp8PkM4Kn9CgpM8BlYBdvedBA
+						fxF3+OHy+RtsRRw1ObfG7U3mS8msLKjV8ziVK50XiM60EOvoK9Bb2QzLVxzL/Z3C
+						Kwv8EpTSZMD0OFTBI/+vZ7evhPT96qYGvMomPZ2WjkcdfkmXRc8+IY7vfL1m5jp3
+						3C2DkOHgEny4lQd/qJucf9jnhUkT69YoEsEXf0JE29NjAgMBAAEwDQYJKoZIhvcN
+						AQEFBQADggEBAEjerzNXlUF0L/dYMpidDZmVpQpHSEjBhbcR3wravACGkwJcL2ek
+						YUD5Jee1Kd7D/H2MmmBKtK8u7j7FbLIxxA/lnXMbAOecD1apzeG2jEz88PGnJswl
+						g9XnRu/DvUggQs626CbJ3a9QkFrHel3VrL/WMnHn0aVEiBZphoiFSBZUpb8QuNyy
+						FGkWWWeUJO9f7TG5qbW6TGKeOx6IlxmVmbui8gYrZ8rur5zKhAzd640zbtCgYh6O
+						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>
+						MIIDRjCCAi4CCQCsi3PM6isCkjANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJH
+						QjEPMA0GA1UECBMGQm9sdG9uMQ8wDQYDVQQHEwZCb2x0b24xFzAVBgNVBAoTDkJv
+						bHRvbiBDb2xsZWdlMRswGQYDVQQDExJpZHAuYm9sdG9uY2MuYWMudWswHhcNMTMx
+						MjA5MDk1NjEyWhcNMzMxMjA0MDk1NjEyWjBlMQswCQYDVQQGEwJHQjEPMA0GA1UE
+						CBMGQm9sdG9uMQ8wDQYDVQQHEwZCb2x0b24xFzAVBgNVBAoTDkJvbHRvbiBDb2xs
+						ZWdlMRswGQYDVQQDExJpZHAuYm9sdG9uY2MuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQDt/7etyusEoPkmBjb+vlI5qWaSK/nunnDDfKji4Rf1
+						J2LcJ0AQBE7EZ9a3uaFLe3sHLIxav/VwuOGlLEFA+bIlpfuIUI00Pkv5lWpoSv3Q
+						qDHKniLxLgOxeO3WKO0ziALCM9gKor0iZkPwESKjp8PkM4Kn9CgpM8BlYBdvedBA
+						fxF3+OHy+RtsRRw1ObfG7U3mS8msLKjV8ziVK50XiM60EOvoK9Bb2QzLVxzL/Z3C
+						Kwv8EpTSZMD0OFTBI/+vZ7evhPT96qYGvMomPZ2WjkcdfkmXRc8+IY7vfL1m5jp3
+						3C2DkOHgEny4lQd/qJucf9jnhUkT69YoEsEXf0JE29NjAgMBAAEwDQYJKoZIhvcN
+						AQEFBQADggEBAEjerzNXlUF0L/dYMpidDZmVpQpHSEjBhbcR3wravACGkwJcL2ek
+						YUD5Jee1Kd7D/H2MmmBKtK8u7j7FbLIxxA/lnXMbAOecD1apzeG2jEz88PGnJswl
+						g9XnRu/DvUggQs626CbJ3a9QkFrHel3VrL/WMnHn0aVEiBZphoiFSBZUpb8QuNyy
+						FGkWWWeUJO9f7TG5qbW6TGKeOx6IlxmVmbui8gYrZ8rur5zKhAzd640zbtCgYh6O
+						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>
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
new file mode 100644
index 00000000..cfc5d074
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.borderscollege.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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>
+      <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
+						cnRtZW50MSEwHwYDVQQDDBhpZHAuYm9yZGVyc2NvbGxlZ2UuYWMudWsxKTAnBgkq
+						hkiG9w0BCQEWGkdTYXVuQGJvcmRlcnNjb2xsZWdlLmFjLnVrMB4XDTE1MDIxODE1
+						MzQ1M1oXDTI1MDIxNTE1MzQ1M1owgb8xCzAJBgNVBAYTAkdCMRowGAYDVQQIDBFT
+						Y290dGlzaCBCb3JkZXJzIDETMBEGA1UEBwwKR2FsYXNoaWVsczEYMBYGA1UECgwP
+						Qm9yZGVycyBDb2xsZWdlMRcwFQYDVQQLDA5JQ1QgRGVwYXJ0bWVudDEhMB8GA1UE
+						AwwYaWRwLmJvcmRlcnNjb2xsZWdlLmFjLnVrMSkwJwYJKoZIhvcNAQkBFhpHU2F1
+						bkBib3JkZXJzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAO/lris+8qS70Yb/6096UTgmMZcJEsPHweU8GmZDgIeb3b+/5vSlixlh
+						utP8tiF7oeLx/rapMSSLbbP0muG+aePPk2TNCR8mklYYzaAumBKIfJL4NJLz5qYN
+						XXeu31yHoK865kN7d27l7EaH0hlbGz9KR1PbCtD5/Db35MU1uPWAaNAUB9KZrqeF
+						x+C+bCvRbAfbQXAIOg0E0mdJpYQnx2b1wIucY7zoemkivBdlHkr00OUn8hCSD+bb
+						zL/OQO77/CKxPYn2cAeE8cPQPNJOISiupEVSY7rqNuktw6knrl4zQdXNoCXO86Nd
+						uQK4fRC9lCq9/HNmwiWjzHbtRZ/UpnMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						LtT/rEHRmejcFxajw0S+QrvnQOo51UbCrn5Uj+sB/vNWNNO/H2q7Z4vqcttd5Md3
+						B5pcDenz3EnlsNb/MPQNxA2ilf56llPM7WBQlbM74gKRIo5i5Nn98henvD8+m3tj
+						NdapAU3pl5pqocCwQL3gE5NC4L6YhY7UBKdqbRE6vPBOtbHIJAF0BKM5Crxp3ee+
+						YWig50w3rNKFyBWQ0xHLVEs+FeiZBbSBNBBK1Gqjg8bWylPyvK0kCgLyVIjZX9D9
+						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>
+						MIID/DCCAuQCCQDmNVK58fWDtTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
+						R0IxGjAYBgNVBAgMEVNjb3R0aXNoIEJvcmRlcnMgMRMwEQYDVQQHDApHYWxhc2hp
+						ZWxzMRgwFgYDVQQKDA9Cb3JkZXJzIENvbGxlZ2UxFzAVBgNVBAsMDklDVCBEZXBh
+						cnRtZW50MSEwHwYDVQQDDBhpZHAuYm9yZGVyc2NvbGxlZ2UuYWMudWsxKTAnBgkq
+						hkiG9w0BCQEWGkdTYXVuQGJvcmRlcnNjb2xsZWdlLmFjLnVrMB4XDTE1MDIxODE1
+						MzQ1M1oXDTI1MDIxNTE1MzQ1M1owgb8xCzAJBgNVBAYTAkdCMRowGAYDVQQIDBFT
+						Y290dGlzaCBCb3JkZXJzIDETMBEGA1UEBwwKR2FsYXNoaWVsczEYMBYGA1UECgwP
+						Qm9yZGVycyBDb2xsZWdlMRcwFQYDVQQLDA5JQ1QgRGVwYXJ0bWVudDEhMB8GA1UE
+						AwwYaWRwLmJvcmRlcnNjb2xsZWdlLmFjLnVrMSkwJwYJKoZIhvcNAQkBFhpHU2F1
+						bkBib3JkZXJzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAO/lris+8qS70Yb/6096UTgmMZcJEsPHweU8GmZDgIeb3b+/5vSlixlh
+						utP8tiF7oeLx/rapMSSLbbP0muG+aePPk2TNCR8mklYYzaAumBKIfJL4NJLz5qYN
+						XXeu31yHoK865kN7d27l7EaH0hlbGz9KR1PbCtD5/Db35MU1uPWAaNAUB9KZrqeF
+						x+C+bCvRbAfbQXAIOg0E0mdJpYQnx2b1wIucY7zoemkivBdlHkr00OUn8hCSD+bb
+						zL/OQO77/CKxPYn2cAeE8cPQPNJOISiupEVSY7rqNuktw6knrl4zQdXNoCXO86Nd
+						uQK4fRC9lCq9/HNmwiWjzHbtRZ/UpnMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						LtT/rEHRmejcFxajw0S+QrvnQOo51UbCrn5Uj+sB/vNWNNO/H2q7Z4vqcttd5Md3
+						B5pcDenz3EnlsNb/MPQNxA2ilf56llPM7WBQlbM74gKRIo5i5Nn98henvD8+m3tj
+						NdapAU3pl5pqocCwQL3gE5NC4L6YhY7UBKdqbRE6vPBOtbHIJAF0BKM5Crxp3ee+
+						YWig50w3rNKFyBWQ0xHLVEs+FeiZBbSBNBBK1Gqjg8bWylPyvK0kCgLyVIjZX9D9
+						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>
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
new file mode 100644
index 00000000..9d45749a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.bournemouth.ac.uk-oala-metadata.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+      <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>
+						MIIDqTCCApGgAwIBAgIJALZkHs4cgnSCMA0GCSqGSIb3DQEBBQUAMEExHzAdBgNV
+						BAoTFkJvdXJuZW1vdXRoIFVuaXZlcnNpdHkxHjAcBgNVBAMTFWlkcC5ib3VybmVt
+						b3V0aC5hYy51azAeFw0xNDAxMjAwOTI3NDlaFw0yNDAxMTgwOTI3NDlaMEExHzAd
+						BgNVBAoTFkJvdXJuZW1vdXRoIFVuaXZlcnNpdHkxHjAcBgNVBAMTFWlkcC5ib3Vy
+						bmVtb3V0aC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOCN
+						LseVokel4GJsn3t04U7WLorCo75qr7okZHWI+OONBJmdREUjdB56r4pzHgpQGXJq
+						vlK4FNS35wStcziZwZNI9tH1Q4yieZSGdQ0bqBqxQJ/Jz4bEHV4sD88qoFiXgH3+
+						ri3ONHw0q7R5A7ZbDEuV0dJm8yIRo9jDKo4muW8OEe9sCorp4CyQpCFBXnTOWzKN
+						7soj7VW8GAYNPim3uiuwv62wTykWw+zEQI40cjttauEFTv+UwqX9OgfVHA/je2HA
+						48hZav2g9YU+Yo/WouwgMO+Y8wDSrlcTs+p2shDDdcSU26O2uoQyKqY+cNKmBtF3
+						TiZE/+zRt3DE/akHl+MCAwEAAaOBozCBoDAdBgNVHQ4EFgQUXssZRCo90zME4EbK
+						maLozgGIjZ8wcQYDVR0jBGowaIAUXssZRCo90zME4EbKmaLozgGIjZ+hRaRDMEEx
+						HzAdBgNVBAoTFkJvdXJuZW1vdXRoIFVuaXZlcnNpdHkxHjAcBgNVBAMTFWlkcC5i
+						b3VybmVtb3V0aC5hYy51a4IJALZkHs4cgnSCMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+						hvcNAQEFBQADggEBANwscCtfXRADL1PjVgDyt2tiCitj/0DFJUSgj1g+9vpxo94s
+						cwRAn3TF/w8izcwAOp5h3R+Sgfqdgeaqm0FzruZHHfpPnG+o+UUwaxymt/wMMtOE
+						Tal5ajyjgcvHp5D4PvKvvZfV1VlB9FO4F21+suY4aeLfet9s238s1Kzh66PHfn8b
+						gRycyQReJHmOqpqfmcvhv1dd0itTz1W4D7ZcA0PkAfjoAf3Lb6ChExbfuujm3S0Q
+						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>
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
new file mode 100644
index 00000000..cd161aa6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.bournville.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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>
+						MIIDPDCCAiSgAwIBAgIVAMVOqQ1Map32HnZJGhKs8Wp1jYykMA0GCSqGSIb3DQEB
+						BQUAMB8xHTAbBgNVBAMTFGlkcC5ib3VybnZpbGxlLmFjLnVrMB4XDTEzMDExNDA5
+						MTAxOFoXDTMzMDExNDA5MTAxOFowHzEdMBsGA1UEAxMUaWRwLmJvdXJudmlsbGUu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYoem7DBPG4jdk
+						EVlcLTjO/LIKz3gGO7e9grN1421mzM3A1kZSyeuxafhpOoAFJyJjyCjnl4zMaj/l
+						Y0OZER+9uRxRRoXjDPL669HNq8cpxDIxS7NOW+kAEm57hd6ep4HCqXbnlfWt8WGe
+						Hb4SN7VPkv77cHXa6dgd3KAhyZ6WPxYiLvat0ek9I/FgePw7+4OGqal94HgNLFE9
+						BUKBk5LXHM4mu60jgdquizkFNf0nLpgoyFYRmN8khbWF9qa9wlLgv5PkqhBrKmlO
+						8k4+3udGbA1OjwDTqtwyMVHtvAb+F0iiud6g6Q2tQ7SroqG0znygy1rwIxKgq5Ox
+						3aN+OVYTAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcC5ib3VybnZpbGxlLmFjLnVr
+						hitodHRwczovL2lkcC5ib3VybnZpbGxlLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBT4YMqKmVMZslHbFSfAyWXTnYAJ4jANBgkqhkiG9w0BAQUFAAOCAQEA
+						fHiWcumz6a+MOT0mhfrS8aSmW50uxoJcKcao/DiNRFvQGBLb/WaDVV4OkvE2sPuH
+						o/36kgbsZPOBsefMQLvvztijWO/mKtKztRyq7T3wIOx931Yt3v8DNGyIBG7nx5l1
+						HjYILU50oZ3l/UEZrLirbbdjNTQ9xmVL0s/0/SnZDHwesiyqrQJDz5FGdOe1Y0dd
+						eYqNqQ5BLnDstFFIEBsh5PKdJed7yFYlZPWnin3jjYmvOFPClS8irmcImEONqoBq
+						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>
+						MIIDPDCCAiSgAwIBAgIVAMVOqQ1Map32HnZJGhKs8Wp1jYykMA0GCSqGSIb3DQEB
+						BQUAMB8xHTAbBgNVBAMTFGlkcC5ib3VybnZpbGxlLmFjLnVrMB4XDTEzMDExNDA5
+						MTAxOFoXDTMzMDExNDA5MTAxOFowHzEdMBsGA1UEAxMUaWRwLmJvdXJudmlsbGUu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYoem7DBPG4jdk
+						EVlcLTjO/LIKz3gGO7e9grN1421mzM3A1kZSyeuxafhpOoAFJyJjyCjnl4zMaj/l
+						Y0OZER+9uRxRRoXjDPL669HNq8cpxDIxS7NOW+kAEm57hd6ep4HCqXbnlfWt8WGe
+						Hb4SN7VPkv77cHXa6dgd3KAhyZ6WPxYiLvat0ek9I/FgePw7+4OGqal94HgNLFE9
+						BUKBk5LXHM4mu60jgdquizkFNf0nLpgoyFYRmN8khbWF9qa9wlLgv5PkqhBrKmlO
+						8k4+3udGbA1OjwDTqtwyMVHtvAb+F0iiud6g6Q2tQ7SroqG0znygy1rwIxKgq5Ox
+						3aN+OVYTAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcC5ib3VybnZpbGxlLmFjLnVr
+						hitodHRwczovL2lkcC5ib3VybnZpbGxlLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBT4YMqKmVMZslHbFSfAyWXTnYAJ4jANBgkqhkiG9w0BAQUFAAOCAQEA
+						fHiWcumz6a+MOT0mhfrS8aSmW50uxoJcKcao/DiNRFvQGBLb/WaDVV4OkvE2sPuH
+						o/36kgbsZPOBsefMQLvvztijWO/mKtKztRyq7T3wIOx931Yt3v8DNGyIBG7nx5l1
+						HjYILU50oZ3l/UEZrLirbbdjNTQ9xmVL0s/0/SnZDHwesiyqrQJDz5FGdOe1Y0dd
+						eYqNqQ5BLnDstFFIEBsh5PKdJed7yFYlZPWnin3jjYmvOFPClS8irmcImEONqoBq
+						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>
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
new file mode 100644
index 00000000..d344de23
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.bpc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						LmFjLnVrMB4XDTEzMDUxNTA4MDcxNFoXDTMzMDUxMDA4MDcxNFowcjELMAkGA1UE
+						BhMCR0IxDzANBgNVBAgTBkRvcnNldDEOMAwGA1UEBxMFUG9vbGUxKjAoBgNVBAoT
+						IVRoZSBCb3VybmVtb3V0aCBhbmQgUG9vbGUgQ29sbGVnZTEWMBQGA1UEAxMNaWRw
+						LmJwYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAObHXYyl
+						+LXHlkgq7okCVpPnwlmS++5Rm5npa3NT26lPzKOvCt1q0yxFoA5BUeP9s/Do+n1U
+						TIv64PAgNeS3Qct6+TvZ2ZQnf0GJxEA7fcP+OSCseYRU2BzLf2WveS/Zl67WnJpR
+						nE+65CCYQ513xpJ4LHAKrBcoScQpJRSeFuFiMHztp+63uSZAK52ovAYMFi6P0wIA
+						yfdAQtx2WIqgpYMCzeNGuLHD2JTlAfcfgybLEAaTIG+ahOrZ2ZFG9FQ+ZnCqJ2nR
+						+3+MMDcC0BWzoEw7BVzH/IYe0QnELkKCC6tHO12n1SHlLSfAHvBNqsyO2B7RzaPy
+						1BmiAtVH/v6u2x8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAdoT73tpcY2zUt9HQ
+						qOcu+wmVVIM2Xmcn1z1deW9Sqw5+MKrKoIPflT3iOKYd8qvcweJ5pKfNuSVPPlkl
+						s+/u5+OgIbbh7nN0mUTn1C4frdRcO/7wArwML1+1LWcMt17bJZu0B/BxO6e0DCcH
+						DT1R9QQNblw0sO0faT2txKm7bhiQEmQh+LZdsi5wH5M33/dsE+HxrJ78fqMKX/sf
+						c238Fq/VBxwiL7zwzyWV6mleZHqnHKqshbQvieDVkzvcnX7H+lyXnk3UtIG9QNAE
+						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>
+						MIIDYDCCAkgCCQC43jaLLv2IZzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
+						QjEPMA0GA1UECBMGRG9yc2V0MQ4wDAYDVQQHEwVQb29sZTEqMCgGA1UEChMhVGhl
+						IEJvdXJuZW1vdXRoIGFuZCBQb29sZSBDb2xsZWdlMRYwFAYDVQQDEw1pZHAuYnBj
+						LmFjLnVrMB4XDTEzMDUxNTA4MDcxNFoXDTMzMDUxMDA4MDcxNFowcjELMAkGA1UE
+						BhMCR0IxDzANBgNVBAgTBkRvcnNldDEOMAwGA1UEBxMFUG9vbGUxKjAoBgNVBAoT
+						IVRoZSBCb3VybmVtb3V0aCBhbmQgUG9vbGUgQ29sbGVnZTEWMBQGA1UEAxMNaWRw
+						LmJwYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAObHXYyl
+						+LXHlkgq7okCVpPnwlmS++5Rm5npa3NT26lPzKOvCt1q0yxFoA5BUeP9s/Do+n1U
+						TIv64PAgNeS3Qct6+TvZ2ZQnf0GJxEA7fcP+OSCseYRU2BzLf2WveS/Zl67WnJpR
+						nE+65CCYQ513xpJ4LHAKrBcoScQpJRSeFuFiMHztp+63uSZAK52ovAYMFi6P0wIA
+						yfdAQtx2WIqgpYMCzeNGuLHD2JTlAfcfgybLEAaTIG+ahOrZ2ZFG9FQ+ZnCqJ2nR
+						+3+MMDcC0BWzoEw7BVzH/IYe0QnELkKCC6tHO12n1SHlLSfAHvBNqsyO2B7RzaPy
+						1BmiAtVH/v6u2x8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAdoT73tpcY2zUt9HQ
+						qOcu+wmVVIM2Xmcn1z1deW9Sqw5+MKrKoIPflT3iOKYd8qvcweJ5pKfNuSVPPlkl
+						s+/u5+OgIbbh7nN0mUTn1C4frdRcO/7wArwML1+1LWcMt17bJZu0B/BxO6e0DCcH
+						DT1R9QQNblw0sO0faT2txKm7bhiQEmQh+LZdsi5wH5M33/dsE+HxrJ78fqMKX/sf
+						c238Fq/VBxwiL7zwzyWV6mleZHqnHKqshbQvieDVkzvcnX7H+lyXnk3UtIG9QNAE
+						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>
diff --git a/swamid-interfederations-2.0/idp.braidense.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.braidense.it-simplesaml-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..9ae0b2f5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.braidense.it-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.braidense.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-06-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:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">braidense.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Biblioteca Nazionale Braidense</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Biblioteca Nazionale Braidense</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Biblioteca Nazionale Braidense users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti della Biblioteca Nazionale Braidense</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://www.braidense.it/servizi/idem.php</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.braidense.it/index_en.php</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.braidense.it/servizi/idem.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>
+MIIEvTCCA6WgAwIBAgIJAKoe0ICAn2PqMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
+VQQGEwJJVDETMBEGA1UECBMKU29tZS1TdGF0ZTEPMA0GA1UEBxMGTWlsYW5vMScw
+JQYDVQQKEx5CaWJsaW90ZWNhIE5hemlvbmFsZSBCcmFpZGVuc2UxGTAXBgNVBAMT
+EGlkcC5icmFpZGVuc2UuaXQxITAfBgkqhkiG9w0BCQEWEnN0YWZmX2FhaUBjaWxl
+YS5pdDAeFw0xMjA1MTcwODQ3NDNaFw0yMjA1MTcwODQ3NDNaMIGaMQswCQYDVQQG
+EwJJVDETMBEGA1UECBMKU29tZS1TdGF0ZTEPMA0GA1UEBxMGTWlsYW5vMScwJQYD
+VQQKEx5CaWJsaW90ZWNhIE5hemlvbmFsZSBCcmFpZGVuc2UxGTAXBgNVBAMTEGlk
+cC5icmFpZGVuc2UuaXQxITAfBgkqhkiG9w0BCQEWEnN0YWZmX2FhaUBjaWxlYS5p
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOJ+4MEKxdD1YuwbybMg
+H+LV0vmw9YsLmktL3WkJkHUpEYl6RomsaP+4fz4ugrnSUI3RZuKY1+Hz4RWXeweP
+c1vetbHoz0wzBtZuARj6fC9tQW7It0lRGeWIyO4mnMexfa2IGuUn8YD21WUT4be5
+aYICi10JM1muUcEGuqcV7/cGHGsTdgFubLGUrXq84Yb8Cjg7tG6RkBymNbA/xmod
+iuuIDrODJsQI17MXgzeedyy85FhgqIqsOrBOKUqf40XA6oBP54S04VJF+82rRkgT
+TfrjSilxITya8+Bez1WWPccFBjdamCtmOwwvazX7k2QCocQJXgQYdFtJ8vNAJxdx
+td8CAwEAAaOCAQIwgf8wHQYDVR0OBBYEFLepRlg0/cmwZl7TagT4ZuiSARbJMIHP
+BgNVHSMEgccwgcSAFLepRlg0/cmwZl7TagT4ZuiSARbJoYGgpIGdMIGaMQswCQYD
+VQQGEwJJVDETMBEGA1UECBMKU29tZS1TdGF0ZTEPMA0GA1UEBxMGTWlsYW5vMScw
+JQYDVQQKEx5CaWJsaW90ZWNhIE5hemlvbmFsZSBCcmFpZGVuc2UxGTAXBgNVBAMT
+EGlkcC5icmFpZGVuc2UuaXQxITAfBgkqhkiG9w0BCQEWEnN0YWZmX2FhaUBjaWxl
+YS5pdIIJAKoe0ICAn2PqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+ANTSsYzqWdHwD0LPMAlL8bccFq3j2JihAhMVomPBnwxiwUosRneHmvzn6AQW0YbV
+ck7UAH5dgpVd9ztlhFP/Bhq+1slodFz61fz3DkU8rDpTrQKhIYvcNCY2vwhKq12n
+JJN/GoYkTr0NlMmPD+pUr0BMuiic2d5rKQBv5UWNbYoT9gBrujIToVjg45uzqL5S
+RTijkVLaaEAn1KpGCcPr04bXH3ENXJOzF/+wf/GCgcdgNHPbhAblGwSWiPCISzdw
+ep81NcbzNK0XZJLI4dVtJnvr8eE3YyRROe0lT8f7Oa1btTk2n8RNWA6UCdJtAOw3
+A0BHS0jXr1yTM2p2/tqoNbc=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEvTCCA6WgAwIBAgIJAKoe0ICAn2PqMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
+VQQGEwJJVDETMBEGA1UECBMKU29tZS1TdGF0ZTEPMA0GA1UEBxMGTWlsYW5vMScw
+JQYDVQQKEx5CaWJsaW90ZWNhIE5hemlvbmFsZSBCcmFpZGVuc2UxGTAXBgNVBAMT
+EGlkcC5icmFpZGVuc2UuaXQxITAfBgkqhkiG9w0BCQEWEnN0YWZmX2FhaUBjaWxl
+YS5pdDAeFw0xMjA1MTcwODQ3NDNaFw0yMjA1MTcwODQ3NDNaMIGaMQswCQYDVQQG
+EwJJVDETMBEGA1UECBMKU29tZS1TdGF0ZTEPMA0GA1UEBxMGTWlsYW5vMScwJQYD
+VQQKEx5CaWJsaW90ZWNhIE5hemlvbmFsZSBCcmFpZGVuc2UxGTAXBgNVBAMTEGlk
+cC5icmFpZGVuc2UuaXQxITAfBgkqhkiG9w0BCQEWEnN0YWZmX2FhaUBjaWxlYS5p
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOJ+4MEKxdD1YuwbybMg
+H+LV0vmw9YsLmktL3WkJkHUpEYl6RomsaP+4fz4ugrnSUI3RZuKY1+Hz4RWXeweP
+c1vetbHoz0wzBtZuARj6fC9tQW7It0lRGeWIyO4mnMexfa2IGuUn8YD21WUT4be5
+aYICi10JM1muUcEGuqcV7/cGHGsTdgFubLGUrXq84Yb8Cjg7tG6RkBymNbA/xmod
+iuuIDrODJsQI17MXgzeedyy85FhgqIqsOrBOKUqf40XA6oBP54S04VJF+82rRkgT
+TfrjSilxITya8+Bez1WWPccFBjdamCtmOwwvazX7k2QCocQJXgQYdFtJ8vNAJxdx
+td8CAwEAAaOCAQIwgf8wHQYDVR0OBBYEFLepRlg0/cmwZl7TagT4ZuiSARbJMIHP
+BgNVHSMEgccwgcSAFLepRlg0/cmwZl7TagT4ZuiSARbJoYGgpIGdMIGaMQswCQYD
+VQQGEwJJVDETMBEGA1UECBMKU29tZS1TdGF0ZTEPMA0GA1UEBxMGTWlsYW5vMScw
+JQYDVQQKEx5CaWJsaW90ZWNhIE5hemlvbmFsZSBCcmFpZGVuc2UxGTAXBgNVBAMT
+EGlkcC5icmFpZGVuc2UuaXQxITAfBgkqhkiG9w0BCQEWEnN0YWZmX2FhaUBjaWxl
+YS5pdIIJAKoe0ICAn2PqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+ANTSsYzqWdHwD0LPMAlL8bccFq3j2JihAhMVomPBnwxiwUosRneHmvzn6AQW0YbV
+ck7UAH5dgpVd9ztlhFP/Bhq+1slodFz61fz3DkU8rDpTrQKhIYvcNCY2vwhKq12n
+JJN/GoYkTr0NlMmPD+pUr0BMuiic2d5rKQBv5UWNbYoT9gBrujIToVjg45uzqL5S
+RTijkVLaaEAn1KpGCcPr04bXH3ENXJOzF/+wf/GCgcdgNHPbhAblGwSWiPCISzdw
+ep81NcbzNK0XZJLI4dVtJnvr8eE3YyRROe0lT8f7Oa1btTk2n8RNWA6UCdJtAOw3
+A0BHS0jXr1yTM2p2/tqoNbc=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.braidense.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.braidense.it/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Biblioteca Nazionale Braidense</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Biblioteca Nazionale Braidense</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Biblioteca Nazionale Braidense</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Biblioteca Nazionale Braidense</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.braidense.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.braidense.it/index_en.php</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Staff</md:GivenName>
+    <md:SurName>AAI CILEA</md:SurName>
+    <md:EmailAddress>mailto:staff_aai@cilea.it</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
new file mode 100644
index 00000000..261cc36c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.brighton.ac.uk-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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>
+						MIIDMDCCAhigAwIBAgIVAJtTrJ6fUZBDJiA/AL+K10ByMCF5MA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEmlkcC5icmlnaHRvbi5hYy51azAeFw0xMjAxMTExMDE3
+						MzlaFw0zMjAxMTExMDE3MzlaMB0xGzAZBgNVBAMTEmlkcC5icmlnaHRvbi5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK78vKo40NZ7No1AlT01
+						oewusm35cDYzGHmgVI+Blb8Pd1LmwfIIGOTyyOab+3+qV/PTVwTPIjQBRDINhUk6
+						TFZN/AspdbZQhAGLKbW7QAwvJEiHDjEPYpwIByCPz3dr9OM3awLThovrdoegnYg1
+						s+nhT0ub2TI43rYRZds0P1xx8uBBst4Q1dTfeRN3aq2XUtMoR0d5O4fSVpfZ1mBe
+						WZTLlbfrS+j0I5IsCd2EXmKaeIeJtyTr2qIfFk+0RdT5RqI2vt513+zwNHi3dJmb
+						wlR5rQdTphXcQkgsegdvpxom59vRwjvGrwohDwWvjKgAmede4SjRS0Fwbas6wylX
+						fjMCAwEAAaNnMGUwRAYDVR0RBD0wO4ISaWRwLmJyaWdodG9uLmFjLnVrhiVodHRw
+						czovL2lkcC5icmlnaHRvbi5hYy51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBSa7vVm
+						ylujM9iFlPHXlbcIG3n5oDANBgkqhkiG9w0BAQUFAAOCAQEAUmCdQF3CHxz5dfbv
+						28Mrc83FzRVCexxa6iHL/lDlsIRxN0M+sN/qj0EovgUh7rYITpCZ30daaawUUbM5
+						j1XOYsvkiAOjYJ/hDwpKm+6Ww+Rl6yhDFTRX5cyDiOwZFIBhTZwkiQ1aJ6xpuDI6
+						BQTHaVODaE+nKb2CKSmozuIejYEvRVxKRQJgzpgv1AaLI0MTwMpk3gVoz5MzPCod
+						JGjYZQTFlvBAGdjsXeKfXxxDk8W+lO2Nb4+gE8HEN1hAXTKRJZW0G1M/wFJ+MSUd
+						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>
+						MIIDMDCCAhigAwIBAgIVAJtTrJ6fUZBDJiA/AL+K10ByMCF5MA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEmlkcC5icmlnaHRvbi5hYy51azAeFw0xMjAxMTExMDE3
+						MzlaFw0zMjAxMTExMDE3MzlaMB0xGzAZBgNVBAMTEmlkcC5icmlnaHRvbi5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK78vKo40NZ7No1AlT01
+						oewusm35cDYzGHmgVI+Blb8Pd1LmwfIIGOTyyOab+3+qV/PTVwTPIjQBRDINhUk6
+						TFZN/AspdbZQhAGLKbW7QAwvJEiHDjEPYpwIByCPz3dr9OM3awLThovrdoegnYg1
+						s+nhT0ub2TI43rYRZds0P1xx8uBBst4Q1dTfeRN3aq2XUtMoR0d5O4fSVpfZ1mBe
+						WZTLlbfrS+j0I5IsCd2EXmKaeIeJtyTr2qIfFk+0RdT5RqI2vt513+zwNHi3dJmb
+						wlR5rQdTphXcQkgsegdvpxom59vRwjvGrwohDwWvjKgAmede4SjRS0Fwbas6wylX
+						fjMCAwEAAaNnMGUwRAYDVR0RBD0wO4ISaWRwLmJyaWdodG9uLmFjLnVrhiVodHRw
+						czovL2lkcC5icmlnaHRvbi5hYy51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBSa7vVm
+						ylujM9iFlPHXlbcIG3n5oDANBgkqhkiG9w0BAQUFAAOCAQEAUmCdQF3CHxz5dfbv
+						28Mrc83FzRVCexxa6iHL/lDlsIRxN0M+sN/qj0EovgUh7rYITpCZ30daaawUUbM5
+						j1XOYsvkiAOjYJ/hDwpKm+6Ww+Rl6yhDFTRX5cyDiOwZFIBhTZwkiQ1aJ6xpuDI6
+						BQTHaVODaE+nKb2CKSmozuIejYEvRVxKRQJgzpgv1AaLI0MTwMpk3gVoz5MzPCod
+						JGjYZQTFlvBAGdjsXeKfXxxDk8W+lO2Nb4+gE8HEN1hAXTKRJZW0G1M/wFJ+MSUd
+						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>
diff --git a/swamid-interfederations-2.0/idp.bris.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bris.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..036d9152
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.bris.ac.uk-shibboleth.xml
@@ -0,0 +1,111 @@
+<?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>
+      <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
+						Q0EgMjAeFw0xNDEyMTYwMDAwMDBaFw0xNzEyMTUyMzU5NTlaMDwxITAfBgNVBAsT
+						GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOaWRwLmJyaXMuYWMu
+						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNcvws6DzheGMeK50J
+						DT/+cCH9lHlzh+Viy2+latyjB7vyqX183o1Nz9z8BX9t/c9svXdu+qmMI99FAUPZ
+						V0LCZnIQfHVpbLiMshtil8Bp/MXziVJsjOhdqE7/EDtEeVGXBwaT/Dfnx/MMv7ez
+						HtW9051m2t6VoxCOcYw9ZBwEeHgHwWhRyq063JJ1sL6juGGOGrWA3VNqxlZR/8Kw
+						JEkLZvSOHIBLkrHQOq8dEA/YaD8peoP4HkGCxrvVGNAsm/PXq7QJGLcPgHbfFPPs
+						6L2rEPECQOLdyJ0j1vbcge/gixIk3mT9rS42XqJucPj0RDNDDL+pbYfEa2l9DAZk
+						U1B/AgMBAAGjggFqMIIBZjAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb4YYosP22
+						vTAdBgNVHQ4EFgQUIsFG5x1s52UwPP6n70N14TtRV7AwDgYDVR0PAQH/BAQDAgWg
+						MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
+						A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
+						oCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3JsMGwG
+						CCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2VydHJ1c3Qu
+						Y29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3NwLnVz
+						ZXJ0cnVzdC5jb20wGQYDVR0RBBIwEIIOaWRwLmJyaXMuYWMudWswDQYJKoZIhvcN
+						AQELBQADggEBAJzI7SxFz5KPYhKkIecGpL3b0DuNyMrXYR1j9gUXWQMLLayTqhFn
+						oiGCsWF2Xa9LdAryGq0vyQWmVg47I5xsBfFVrbaddax9pSw+/1DigFIK956XV3Rr
+						cY4t10ey1wyP8pMjyER+Lrvg1J9+ZKYuRq4+XQO197HbL85OHw1YKLT7pcqCPuZd
+						2C0uQE7Yiv9dPnrzptjMknuk+eDTm1XDKAccz3LoBrOxOAzFlgOxxv2pE7d8lCU/
+						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>
+						MIIEljCCA36gAwIBAgIQOrmPBwdw3r9jz9aNrrpM0jANBgkqhkiG9w0BAQsFADBk
+						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+						Q0EgMjAeFw0xNDEyMTYwMDAwMDBaFw0xNzEyMTUyMzU5NTlaMDwxITAfBgNVBAsT
+						GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOaWRwLmJyaXMuYWMu
+						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNcvws6DzheGMeK50J
+						DT/+cCH9lHlzh+Viy2+latyjB7vyqX183o1Nz9z8BX9t/c9svXdu+qmMI99FAUPZ
+						V0LCZnIQfHVpbLiMshtil8Bp/MXziVJsjOhdqE7/EDtEeVGXBwaT/Dfnx/MMv7ez
+						HtW9051m2t6VoxCOcYw9ZBwEeHgHwWhRyq063JJ1sL6juGGOGrWA3VNqxlZR/8Kw
+						JEkLZvSOHIBLkrHQOq8dEA/YaD8peoP4HkGCxrvVGNAsm/PXq7QJGLcPgHbfFPPs
+						6L2rEPECQOLdyJ0j1vbcge/gixIk3mT9rS42XqJucPj0RDNDDL+pbYfEa2l9DAZk
+						U1B/AgMBAAGjggFqMIIBZjAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb4YYosP22
+						vTAdBgNVHQ4EFgQUIsFG5x1s52UwPP6n70N14TtRV7AwDgYDVR0PAQH/BAQDAgWg
+						MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
+						A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
+						oCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3JsMGwG
+						CCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2VydHJ1c3Qu
+						Y29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3NwLnVz
+						ZXJ0cnVzdC5jb20wGQYDVR0RBBIwEIIOaWRwLmJyaXMuYWMudWswDQYJKoZIhvcN
+						AQELBQADggEBAJzI7SxFz5KPYhKkIecGpL3b0DuNyMrXYR1j9gUXWQMLLayTqhFn
+						oiGCsWF2Xa9LdAryGq0vyQWmVg47I5xsBfFVrbaddax9pSw+/1DigFIK956XV3Rr
+						cY4t10ey1wyP8pMjyER+Lrvg1J9+ZKYuRq4+XQO197HbL85OHw1YKLT7pcqCPuZd
+						2C0uQE7Yiv9dPnrzptjMknuk+eDTm1XDKAccz3LoBrOxOAzFlgOxxv2pE7d8lCU/
+						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>
diff --git a/swamid-interfederations-2.0/idp.brock.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.brock.ac.uk-entity.xml
new file mode 100644
index 00000000..f7d71ffe
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.brock.ac.uk-entity.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIrnJtQiC1X81M7+DWcfoRnbQG4W
+						6npvaBkLrBFA8ax53ocICKOyJ6GM1lKOKG3D34U7r6KO+vdFk/xKqQ+SOmNc6flx
+						VCv4hyY6hL2I43+XpPYyhVYLdHOBUmhwS1iI/MV2ZBEe2Lde39JwAlsDG1maL7Gm
+						QffCCWkzECXQj4tTCB7A/IjTqchH15ONVQ5E/FLNBoJgMexsOttaF5mriUjeeE0Z
+						NQRTdquqqfUsH1b5fupGBrJ8mAEEvy5Mq2kTCqwjTjLnbSNBCDUeiFNJc2VmH4Fa
+						RHs556u+sB+2/UkV83dfMS90SEJeAVc8dpA5GUWSWOKpC9ucRyc2Zl192SsCAwEA
+						AaNlMGMwQgYDVR0RBDswOYIPaWRwLmJyb2NrLmFjLnVrhiZodHRwczovL2lkcC5i
+						cm9jay5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU87QGKLBQ6rJ9iKC9
+						tMLCBSx1qXUwDQYJKoZIhvcNAQEFBQADggEBAEX8DbfcfkOH6Qx8L35niQuZQA6h
+						6ysVBS9A1rfs2wmBktWJhBAtSx4vfZBervafqstZ75Tf0OOXtjWR2r5HzZKXF7/N
+						wYBpFm/ZeCGIXIWqRMsZTZpaZ1p3VuzXrr5R+LwI3pheNqI9gUMIkXyC4rsI+Dbb
+						VNGTt+C4rwqOvpwY2yEtmYgUffYG6gYi5t/PznbObAUfXNGIrBYdj3qQvNxaTrV4
+						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>
+						MIIDKDCCAhCgAwIBAgIVANN1qLwgEDjyuLo3Focb4T3EV2gCMA0GCSqGSIb3DQEB
+						BQUAMBoxGDAWBgNVBAMTD2lkcC5icm9jay5hYy51azAeFw0xMzAyMTgwOTA1NDla
+						Fw0zMzAyMTgwOTA1NDlaMBoxGDAWBgNVBAMTD2lkcC5icm9jay5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIrnJtQiC1X81M7+DWcfoRnbQG4W
+						6npvaBkLrBFA8ax53ocICKOyJ6GM1lKOKG3D34U7r6KO+vdFk/xKqQ+SOmNc6flx
+						VCv4hyY6hL2I43+XpPYyhVYLdHOBUmhwS1iI/MV2ZBEe2Lde39JwAlsDG1maL7Gm
+						QffCCWkzECXQj4tTCB7A/IjTqchH15ONVQ5E/FLNBoJgMexsOttaF5mriUjeeE0Z
+						NQRTdquqqfUsH1b5fupGBrJ8mAEEvy5Mq2kTCqwjTjLnbSNBCDUeiFNJc2VmH4Fa
+						RHs556u+sB+2/UkV83dfMS90SEJeAVc8dpA5GUWSWOKpC9ucRyc2Zl192SsCAwEA
+						AaNlMGMwQgYDVR0RBDswOYIPaWRwLmJyb2NrLmFjLnVrhiZodHRwczovL2lkcC5i
+						cm9jay5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU87QGKLBQ6rJ9iKC9
+						tMLCBSx1qXUwDQYJKoZIhvcNAQEFBQADggEBAEX8DbfcfkOH6Qx8L35niQuZQA6h
+						6ysVBS9A1rfs2wmBktWJhBAtSx4vfZBervafqstZ75Tf0OOXtjWR2r5HzZKXF7/N
+						wYBpFm/ZeCGIXIWqRMsZTZpaZ1p3VuzXrr5R+LwI3pheNqI9gUMIkXyC4rsI+Dbb
+						VNGTt+C4rwqOvpwY2yEtmYgUffYG6gYi5t/PznbObAUfXNGIrBYdj3qQvNxaTrV4
+						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>
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
new file mode 100644
index 00000000..5116eb26
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.brookes.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWkInyc7OtvgQF9bYDoP1+
+						DUiDKJBZBCzzK6soKUD6WGVcKUsqN9ACyKj/i0kYEMigaYZE3XSLYENrWxA+sPbd
+						KW6V1ko3TDzmJF/COoCMXUHWsp5JK8HWO5NncY6ruapEYdkjBpUN0LKJBaQBvbz8
+						teaQ6LXt7zFm67+9B2GCsRd7WO3snUVNtiD2/7Q6lfCl5MnCzDex0xRZwHkN358n
+						F5kAMhl8+dX+O4hzMiCeMSxyh4exQoGE6kPUy4v/1v74EVmnhHZfmF0Wb05QIESL
+						671BS0ztGBPPHmgmyfM3uwRYqp0kIiZRU+vSHMZn1w7pad42O+HDjW5CTbONEhNb
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC5icm9va2VzLmFjLnVrhihodHRwczov
+						L2lkcC5icm9va2VzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBShqU0t
+						7KfNrqRSbJXdLu1nKL5U9zANBgkqhkiG9w0BAQUFAAOCAQEALY66hUj/NgEuTmQB
+						38jSG6Cy8Po8btADRxDq21TpoBoP0yqQRk/7dgB/9xa3kYDTJHrhA8FD1Piv+tDZ
+						P8Nx/6hJwDn0GIIonx3Kxkn1PYmUsG8tQAmIBXGN+g1X/gjKcKrAPCyWqGzrqRuX
+						o8KO6F6oQ8P6q6XVkJVEEAus2dkzJg1BxLxbWR9h9rEH2UCjWrTAgCSi0nRaqpZk
+						tx+h/tvZMJljItE3iOWjnxOagFweI1EUoGW1JCaTCl/MCB+jGG45W7JCWqSqI/CQ
+						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>
+						MIIDMDCCAhigAwIBAgIVAJUaJYwXesdgxfeIuyhEEzVnxSpLMA0GCSqGSIb3DQEB
+						BQUAMBwxGjAYBgNVBAMTEWlkcC5icm9va2VzLmFjLnVrMB4XDTEyMTAyMzEwNTUz
+						NFoXDTMyMTAyMzEwNTUzNFowHDEaMBgGA1UEAxMRaWRwLmJyb29rZXMuYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWkInyc7OtvgQF9bYDoP1+
+						DUiDKJBZBCzzK6soKUD6WGVcKUsqN9ACyKj/i0kYEMigaYZE3XSLYENrWxA+sPbd
+						KW6V1ko3TDzmJF/COoCMXUHWsp5JK8HWO5NncY6ruapEYdkjBpUN0LKJBaQBvbz8
+						teaQ6LXt7zFm67+9B2GCsRd7WO3snUVNtiD2/7Q6lfCl5MnCzDex0xRZwHkN358n
+						F5kAMhl8+dX+O4hzMiCeMSxyh4exQoGE6kPUy4v/1v74EVmnhHZfmF0Wb05QIESL
+						671BS0ztGBPPHmgmyfM3uwRYqp0kIiZRU+vSHMZn1w7pad42O+HDjW5CTbONEhNb
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC5icm9va2VzLmFjLnVrhihodHRwczov
+						L2lkcC5icm9va2VzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBShqU0t
+						7KfNrqRSbJXdLu1nKL5U9zANBgkqhkiG9w0BAQUFAAOCAQEALY66hUj/NgEuTmQB
+						38jSG6Cy8Po8btADRxDq21TpoBoP0yqQRk/7dgB/9xa3kYDTJHrhA8FD1Piv+tDZ
+						P8Nx/6hJwDn0GIIonx3Kxkn1PYmUsG8tQAmIBXGN+g1X/gjKcKrAPCyWqGzrqRuX
+						o8KO6F6oQ8P6q6XVkJVEEAus2dkzJg1BxLxbWR9h9rEH2UCjWrTAgCSi0nRaqpZk
+						tx+h/tvZMJljItE3iOWjnxOagFweI1EUoGW1JCaTCl/MCB+jGG45W7JCWqSqI/CQ
+						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>
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
new file mode 100644
index 00000000..bd6f8dc9
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.brooklands.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK52gpxhDNJWpaRz
+						rgnCHXO9t7IgexRTKM3V2IPmsj/kVRGcnYjCrD9BI54sjWuYuNtknVmvu4XSc6pq
+						qQyK5mQKqfBuenloi/RtOuOzdspu7DnQ85WDaln6Enhtxr0D/ZsUEZwBupltWVv9
+						9REW2YFliMNir7g/uW3BDmAMjOpkbi8ee5zG7TbBzyIOYZqTo0evLF2u2BRY54HL
+						CBKxSfNXmglhD8IHvj0Z7fbWMKODuZQ4ZKdy0UTxVFyrshcZXV2Qx7NGAnPgIRLA
+						VOD4Q+NyeV4lJZ5d6n/Jz9Aja4QaERIVum5nN8Y0lg2lYRZLJjEr39EepGWXPgQk
+						+clOFysCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLmJyb29rbGFuZHMuYWMudWuG
+						K2h0dHBzOi8vaWRwLmJyb29rbGFuZHMuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
+						VR0OBBYEFJUptrrUSg7zjWY1J4ZMTmZIsuFPMA0GCSqGSIb3DQEBBQUAA4IBAQCZ
+						0U77Z4Eqi/I+xBREEDxCkLzqb3wPGIcOQ7S1K12/mtFOnTSM0v4N/OGBtQZOtPjp
+						Cr2TRcibo93Cs3RW3NaDsARpeluuZmJWrIGnRnKustgGmqqfHFSpYfD8kcWZHiRr
+						Ss1wyDGmprH2xyySRH0mSAwwz9tFYT+k31PI52hiP3n0zJh9SC3p3nWyGEsj6lMW
+						93ledG58FkdklzARJiruUuAYZwAxCER7VdxCjb+Do6YSu5cNdXIk8ZH8AQsigAp6
+						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>
+						MIIDOzCCAiOgAwIBAgIUXTHSnL92ioEhfn9CpPYcgVRrCm0wDQYJKoZIhvcNAQEF
+						BQAwHzEdMBsGA1UEAxMUaWRwLmJyb29rbGFuZHMuYWMudWswHhcNMTQwNTI4MTM1
+						OTQ3WhcNMzQwNTI4MTM1OTQ3WjAfMR0wGwYDVQQDExRpZHAuYnJvb2tsYW5kcy5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK52gpxhDNJWpaRz
+						rgnCHXO9t7IgexRTKM3V2IPmsj/kVRGcnYjCrD9BI54sjWuYuNtknVmvu4XSc6pq
+						qQyK5mQKqfBuenloi/RtOuOzdspu7DnQ85WDaln6Enhtxr0D/ZsUEZwBupltWVv9
+						9REW2YFliMNir7g/uW3BDmAMjOpkbi8ee5zG7TbBzyIOYZqTo0evLF2u2BRY54HL
+						CBKxSfNXmglhD8IHvj0Z7fbWMKODuZQ4ZKdy0UTxVFyrshcZXV2Qx7NGAnPgIRLA
+						VOD4Q+NyeV4lJZ5d6n/Jz9Aja4QaERIVum5nN8Y0lg2lYRZLJjEr39EepGWXPgQk
+						+clOFysCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLmJyb29rbGFuZHMuYWMudWuG
+						K2h0dHBzOi8vaWRwLmJyb29rbGFuZHMuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
+						VR0OBBYEFJUptrrUSg7zjWY1J4ZMTmZIsuFPMA0GCSqGSIb3DQEBBQUAA4IBAQCZ
+						0U77Z4Eqi/I+xBREEDxCkLzqb3wPGIcOQ7S1K12/mtFOnTSM0v4N/OGBtQZOtPjp
+						Cr2TRcibo93Cs3RW3NaDsARpeluuZmJWrIGnRnKustgGmqqfHFSpYfD8kcWZHiRr
+						Ss1wyDGmprH2xyySRH0mSAwwz9tFYT+k31PI52hiP3n0zJh9SC3p3nWyGEsj6lMW
+						93ledG58FkdklzARJiruUuAYZwAxCER7VdxCjb+Do6YSu5cNdXIk8ZH8AQsigAp6
+						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>
diff --git a/swamid-interfederations-2.0/idp.brunel.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.brunel.ac.uk-entity.xml
new file mode 100644
index 00000000..c6e1c7ad
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.brunel.ac.uk-entity.xml
@@ -0,0 +1,110 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-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-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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Brunel University (New)</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>
+						MIIDJDCCAgygAwIBAgIVAN2ITPb7HnQnnS6Q5lFqSQWjQjlUMA0GCSqGSIb3DQEB
+						BQUAMBsxGTAXBgNVBAMTEGlkcC5icnVuZWwuYWMudWswHhcNMTMwODE5MTE0NzE5
+						WhcNMzMwODE5MTE0NzE5WjAbMRkwFwYDVQQDExBpZHAuYnJ1bmVsLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnkfBXFS9PX/FYzw7I/LYOOn9
+						gkCpLbs8qI8QuyxJ2klbG9RdImTz7R+WrBmAHHoaqkyOSOJYAtBb7Gh+IaD8VsvV
+						GrmQt2eJJ5KKxJnam+GLg9bfJSQ5d+vnyWEubMyCRYUCFig8QTTplK6Izum0Er6L
+						pON/bhJeGZiUp6zoXQaQ81jWS+/qS6hH960SxrTdqRl8E8ZJa9pRYCPUYLbUUoNt
+						Oewf5CD62CUTJIyk2wiz6oczWbNzkvk4ZVtccFEKdnH4G12edZzU9dLZAlquVFm5
+						ofSZecXeNdcpzGC1gqmJVHVKRq18aKi0SHnQLs9yom4XZ4smDSatESalOHvXVQID
+						AQABo18wXTA8BgNVHREENTAzghBpZHAuYnJ1bmVsLmFjLnVrhh9odHRwczovL2lk
+						cC5icnVuZWwuYWMudWsvZW50aXR5MB0GA1UdDgQWBBSjsC6Rm0NkXec+MLFab1O1
+						BuP5IjANBgkqhkiG9w0BAQUFAAOCAQEAnX5jlFGsB2NFZO4VsQAp4IUNn46lxGfP
+						wNJHiDFKI8CB95C/LSPZjn0VVZxZgvNZrSmd+fWEsevpPymn2fme+sTHVog8zO+w
+						PWmhIUfskbfJ02l3/AwtWkAougMAd5uf1j8cnNY9qjiyS459TYmz0/R5le53V8E7
+						nAH57apwn9GHm9SQ06K/kP5ayMskIkptz/Bhi815NVoI5F3stNyu6oBVT4xKVXCN
+						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>
+						MIIDJDCCAgygAwIBAgIVAN2ITPb7HnQnnS6Q5lFqSQWjQjlUMA0GCSqGSIb3DQEB
+						BQUAMBsxGTAXBgNVBAMTEGlkcC5icnVuZWwuYWMudWswHhcNMTMwODE5MTE0NzE5
+						WhcNMzMwODE5MTE0NzE5WjAbMRkwFwYDVQQDExBpZHAuYnJ1bmVsLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnkfBXFS9PX/FYzw7I/LYOOn9
+						gkCpLbs8qI8QuyxJ2klbG9RdImTz7R+WrBmAHHoaqkyOSOJYAtBb7Gh+IaD8VsvV
+						GrmQt2eJJ5KKxJnam+GLg9bfJSQ5d+vnyWEubMyCRYUCFig8QTTplK6Izum0Er6L
+						pON/bhJeGZiUp6zoXQaQ81jWS+/qS6hH960SxrTdqRl8E8ZJa9pRYCPUYLbUUoNt
+						Oewf5CD62CUTJIyk2wiz6oczWbNzkvk4ZVtccFEKdnH4G12edZzU9dLZAlquVFm5
+						ofSZecXeNdcpzGC1gqmJVHVKRq18aKi0SHnQLs9yom4XZ4smDSatESalOHvXVQID
+						AQABo18wXTA8BgNVHREENTAzghBpZHAuYnJ1bmVsLmFjLnVrhh9odHRwczovL2lk
+						cC5icnVuZWwuYWMudWsvZW50aXR5MB0GA1UdDgQWBBSjsC6Rm0NkXec+MLFab1O1
+						BuP5IjANBgkqhkiG9w0BAQUFAAOCAQEAnX5jlFGsB2NFZO4VsQAp4IUNn46lxGfP
+						wNJHiDFKI8CB95C/LSPZjn0VVZxZgvNZrSmd+fWEsevpPymn2fme+sTHVog8zO+w
+						PWmhIUfskbfJ02l3/AwtWkAougMAd5uf1j8cnNY9qjiyS459TYmz0/R5le53V8E7
+						nAH57apwn9GHm9SQ06K/kP5ayMskIkptz/Bhi815NVoI5F3stNyu6oBVT4xKVXCN
+						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 (New)</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.bsms.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bsms.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..ed474e0d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.bsms.ac.uk-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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>
+						MIIDHzCCAgegAwIBAgIUVPdR3/QgLrYLEH5e7QfhKE8r9VkwDQYJKoZIhvcNAQEF
+						BQAwGTEXMBUGA1UEAxMOaWRwLmJzbXMuYWMudWswHhcNMTIwMTExMTAxNzQ5WhcN
+						MzIwMTExMTAxNzQ5WjAZMRcwFQYDVQQDEw5pZHAuYnNtcy5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALnAV+wrTxO7xJI38Rgiug18H58qBLB0
+						6WuUwpUieb4FL263NiSvFn/PF2JLjTUx/1/B2JHyfaDxFpgco9PjQvOizTW4VRHV
+						T4Oh5anJHbMPzECm1MgxqBS8RXSuqBiTWXMCZG3X84Qq6BzGuAzEOh05JFx9xn3K
+						e8u3LTAFDiQS/Ig9u80NER1Coc0D8YXIsP+2A5XzfZ+o15aPPMaj+4oiKYzHj078
+						vGA5krpb8hevv0n0meUo1iadCA5GUaGqEmV3J6mSHAE/28/ehFdj2SN4b5AkBsNa
+						NvQ30i0ZZbMzV2F4LnJ0lIM+7Q73dfVS1IdUrH/e02ahbJal4ez5v2MCAwEAAaNf
+						MF0wPAYDVR0RBDUwM4IOaWRwLmJzbXMuYWMudWuGIWh0dHBzOi8vaWRwLmJzbXMu
+						YWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUNEeuu+lzrJ9Cm/bRaeX/5qVeEsIw
+						DQYJKoZIhvcNAQEFBQADggEBAA6T6+dtIoK6TMsHCgocxshlDa/fkPVc4QxVuf7+
+						gqEGqiSdKs559ttMw12onBtfqEgLippyVo9M0mi8Xu5/iid+BYQrPKPh0ibVMaik
+						msKZhO1AlmgGwi0ZosGVywcVeYnADEuDYMAO3ENEOzcs3nwYrHgoPUT8ozEoWRfU
+						36CbxIdpBxW9E8KbPY9ILo6EH/AeaPY9HNklJr/oaWYgFyHlasMruZrD77mgNwCI
+						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>
+						MIIDHzCCAgegAwIBAgIUVPdR3/QgLrYLEH5e7QfhKE8r9VkwDQYJKoZIhvcNAQEF
+						BQAwGTEXMBUGA1UEAxMOaWRwLmJzbXMuYWMudWswHhcNMTIwMTExMTAxNzQ5WhcN
+						MzIwMTExMTAxNzQ5WjAZMRcwFQYDVQQDEw5pZHAuYnNtcy5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALnAV+wrTxO7xJI38Rgiug18H58qBLB0
+						6WuUwpUieb4FL263NiSvFn/PF2JLjTUx/1/B2JHyfaDxFpgco9PjQvOizTW4VRHV
+						T4Oh5anJHbMPzECm1MgxqBS8RXSuqBiTWXMCZG3X84Qq6BzGuAzEOh05JFx9xn3K
+						e8u3LTAFDiQS/Ig9u80NER1Coc0D8YXIsP+2A5XzfZ+o15aPPMaj+4oiKYzHj078
+						vGA5krpb8hevv0n0meUo1iadCA5GUaGqEmV3J6mSHAE/28/ehFdj2SN4b5AkBsNa
+						NvQ30i0ZZbMzV2F4LnJ0lIM+7Q73dfVS1IdUrH/e02ahbJal4ez5v2MCAwEAAaNf
+						MF0wPAYDVR0RBDUwM4IOaWRwLmJzbXMuYWMudWuGIWh0dHBzOi8vaWRwLmJzbXMu
+						YWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUNEeuu+lzrJ9Cm/bRaeX/5qVeEsIw
+						DQYJKoZIhvcNAQEFBQADggEBAA6T6+dtIoK6TMsHCgocxshlDa/fkPVc4QxVuf7+
+						gqEGqiSdKs559ttMw12onBtfqEgLippyVo9M0mi8Xu5/iid+BYQrPKPh0ibVMaik
+						msKZhO1AlmgGwi0ZosGVywcVeYnADEuDYMAO3ENEOzcs3nwYrHgoPUT8ozEoWRfU
+						36CbxIdpBxW9E8KbPY9ILo6EH/AeaPY9HNklJr/oaWYgFyHlasMruZrD77mgNwCI
+						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>
diff --git a/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml
new file mode 100644
index 00000000..c308e901
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml
@@ -0,0 +1,119 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Personnel</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola för personal</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for personnel</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
+        <mdui:Keywords xml:lang="sv">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology </mdui:Keywords>
+        <mdui:Keywords xml:lang="en">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology </mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>bth.se</mdui:DomainHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUQgDlaShYZmw+iODFd4PDl1a+3QEwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLmJ0aC5zZTAeFw0wOTExMDMxMDA0NTFaFw0yOTEx
+MDMxMDA0NTFaMBUxEzARBgNVBAMTCmlkcC5idGguc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCNOKwblSFiLSbItG/y118MRAXCguQJ4e7t+/e4bYhD
+fl9Qs5gTx3QJxXRgjISLrha44rc+awS6fr4In3N61ijS/X4Q0qrD5BszzCUw2Lni
+YITovYjH9wzZ3oOt5k67rtXoDL98B+Xqbh/M8lOXkcKba3Slsbz/QKg5Qf6ZCebc
+76rl3J3fM6ebYOyiCseCVTn+avpbqNKMi7sY6vfKDIo/zCkN3ZntH4ibGOi0j9z4
+5NlHLtWLShfwF/QLLKjd2alHTbyBjdDe22li9apxZB3LhZXFVGdYqBCJu0OBeFDP
+ZA4ZSWoxXMqxDbbJofMMbHysc7teqG3mJyDm/FL6hXH/AgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5idGguc2WGIWh0dHBzOi8vaWRwLmJ0aC5zZS9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUtNB3i29Xb36JeEa7RhFXM4OYTYYwDQYJKoZIhvcNAQEF
+BQADggEBAEGhHaZmmHhnfrsYc/trO15JWt5hU/UC9J7xhiF2iIk41ymeX+gvm6n5
+h2f4/xEgvmBwV6WM+BlQE+weK+nQNceV+aAO51xTM828O9SrmZ9ZPkw7+TxGiVdM
+SnxSTRcEWngxpJ+CGpgzy1SgV7WqO2NszSP+XRRJHjb0Aw39iKLP+yfvGdR71lu/
+2WPhhxaK7wun8loJJC2WI4ORwsh3mJoYZcVEIOXe/H2Kf+Hj1le8z9j1pxEG7ECY
+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>
+MIIDEzCCAfugAwIBAgIUQgDlaShYZmw+iODFd4PDl1a+3QEwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLmJ0aC5zZTAeFw0wOTExMDMxMDA0NTFaFw0yOTEx
+MDMxMDA0NTFaMBUxEzARBgNVBAMTCmlkcC5idGguc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCNOKwblSFiLSbItG/y118MRAXCguQJ4e7t+/e4bYhD
+fl9Qs5gTx3QJxXRgjISLrha44rc+awS6fr4In3N61ijS/X4Q0qrD5BszzCUw2Lni
+YITovYjH9wzZ3oOt5k67rtXoDL98B+Xqbh/M8lOXkcKba3Slsbz/QKg5Qf6ZCebc
+76rl3J3fM6ebYOyiCseCVTn+avpbqNKMi7sY6vfKDIo/zCkN3ZntH4ibGOi0j9z4
+5NlHLtWLShfwF/QLLKjd2alHTbyBjdDe22li9apxZB3LhZXFVGdYqBCJu0OBeFDP
+ZA4ZSWoxXMqxDbbJofMMbHysc7teqG3mJyDm/FL6hXH/AgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5idGguc2WGIWh0dHBzOi8vaWRwLmJ0aC5zZS9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUtNB3i29Xb36JeEa7RhFXM4OYTYYwDQYJKoZIhvcNAQEF
+BQADggEBAEGhHaZmmHhnfrsYc/trO15JWt5hU/UC9J7xhiF2iIk41ymeX+gvm6n5
+h2f4/xEgvmBwV6WM+BlQE+weK+nQNceV+aAO51xTM828O9SrmZ9ZPkw7+TxGiVdM
+SnxSTRcEWngxpJ+CGpgzy1SgV7WqO2NszSP+XRRJHjb0Aw39iKLP+yfvGdR71lu/
+2WPhhxaK7wun8loJJC2WI4ORwsh3mJoYZcVEIOXe/H2Kf+Hj1le8z9j1pxEG7ECY
+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</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology - Personnel</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>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>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>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
new file mode 100644
index 00000000..73d0c57b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.bucks.ac.uk-entity.xml
@@ -0,0 +1,110 @@
+<?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>
+      <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>
+						MIIEyzCCA7OgAwIBAgIQKhsxWaLd/VuKbUtlgKhc4jANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDEzMDAwMDAwMFoXDTE2MDEzMDIzNTk1OVowgZsxCzAJBgNV
+						BAYTAkdCMRgwFgYDVQQIEw9CdWNraW5naGFtc2hpcmUxFTATBgNVBAcTDEhpZ2gg
+						V3ljb21iZTEnMCUGA1UEChMeQnVja2luZ2hhbXNoaXJlIE5ldyBVbml2ZXJzaXR5
+						MRcwFQYDVQQLEw5JVCBEaXJlY3RvcmF0ZTEZMBcGA1UEAxMQaWRwMi5idWNrcy5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKM04VA4Kbek8u9V
+						b30GRMHCAemlgXZgEpEZ7BRhiCUEbzGX3UuA8nhRzWi0JCihvBpyBoxyACkvnE/p
+						vxWvMpMdBfRdMxQHdT8aiM4bYtNBDxlVGv9dDo4dcX5CDEZG3kk+5S+dnUqu9Fc5
+						HryLeGssoV4lqQqjn6yGbszgZfvR4uf3RWJiMf+kl2T2oKsOfO9knlhuHzMmwpqP
+						e19lJwqY1GAUf4D0I0uW6Hko5wjaLvfwT98SM7gFPAB6pJPkcQVINVvZbpLK3vxk
+						BtIdcAlpEoPh+NaOh+lG2giWan0St0W5sDWj54RmwlHr17PlsvUd4jDFIMDlR5Q8
+						w5ucs5sCAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+						47ntMB0GA1UdDgQWBBQhN197WOXg8eZ8DtJbLOB1Z9FxTDAOBgNVHQ8BAf8EBAMC
+						BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+						IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgIwOgYDVR0fBDMwMTAv
+						oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
+						bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
+						bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
+						dGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQaWRwMi5idWNrcy5hYy51azANBgkq
+						hkiG9w0BAQUFAAOCAQEAspuTzuHyh8coQfuAXXKBjIEeGvFs8yE2+DoPMbuHEa3h
+						I/vLxwbyf57VGabj9q1BOp5wEO+NfRcZ7nZKtGHNHdngi1L5vzGepVdk4ULm+SW8
+						+Nj7+Pp1BKwvOo7XdpzdKw1Dy8BcjSVL2RSrCjT4K88J7S8hL/ks9zWuOd1AvgzY
+						3Pn4pXq12gEDDIBcvQ6Z6/yH2BkoJOaXNtDPDq4gq/kiOX94/3FVPNnI3yYPBk0Q
+						VcY8uY0dfJ0KqDY3kDOJrdsTE7yFkXxYKPmkKgz1RPHbe/CGzxeQu1pelWNGgZ40
+						djhkajocIVv9CB1MG+9XYcNwoieK6sei+w4XVk1Afw==
+					</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>
+						MIIEyzCCA7OgAwIBAgIQKhsxWaLd/VuKbUtlgKhc4jANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDEzMDAwMDAwMFoXDTE2MDEzMDIzNTk1OVowgZsxCzAJBgNV
+						BAYTAkdCMRgwFgYDVQQIEw9CdWNraW5naGFtc2hpcmUxFTATBgNVBAcTDEhpZ2gg
+						V3ljb21iZTEnMCUGA1UEChMeQnVja2luZ2hhbXNoaXJlIE5ldyBVbml2ZXJzaXR5
+						MRcwFQYDVQQLEw5JVCBEaXJlY3RvcmF0ZTEZMBcGA1UEAxMQaWRwMi5idWNrcy5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKM04VA4Kbek8u9V
+						b30GRMHCAemlgXZgEpEZ7BRhiCUEbzGX3UuA8nhRzWi0JCihvBpyBoxyACkvnE/p
+						vxWvMpMdBfRdMxQHdT8aiM4bYtNBDxlVGv9dDo4dcX5CDEZG3kk+5S+dnUqu9Fc5
+						HryLeGssoV4lqQqjn6yGbszgZfvR4uf3RWJiMf+kl2T2oKsOfO9knlhuHzMmwpqP
+						e19lJwqY1GAUf4D0I0uW6Hko5wjaLvfwT98SM7gFPAB6pJPkcQVINVvZbpLK3vxk
+						BtIdcAlpEoPh+NaOh+lG2giWan0St0W5sDWj54RmwlHr17PlsvUd4jDFIMDlR5Q8
+						w5ucs5sCAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+						47ntMB0GA1UdDgQWBBQhN197WOXg8eZ8DtJbLOB1Z9FxTDAOBgNVHQ8BAf8EBAMC
+						BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+						IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgIwOgYDVR0fBDMwMTAv
+						oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
+						bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
+						bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
+						dGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQaWRwMi5idWNrcy5hYy51azANBgkq
+						hkiG9w0BAQUFAAOCAQEAspuTzuHyh8coQfuAXXKBjIEeGvFs8yE2+DoPMbuHEa3h
+						I/vLxwbyf57VGabj9q1BOp5wEO+NfRcZ7nZKtGHNHdngi1L5vzGepVdk4ULm+SW8
+						+Nj7+Pp1BKwvOo7XdpzdKw1Dy8BcjSVL2RSrCjT4K88J7S8hL/ks9zWuOd1AvgzY
+						3Pn4pXq12gEDDIBcvQ6Z6/yH2BkoJOaXNtDPDq4gq/kiOX94/3FVPNnI3yYPBk0Q
+						VcY8uY0dfJ0KqDY3kDOJrdsTE7yFkXxYKPmkKgz1RPHbe/CGzxeQu1pelWNGgZ40
+						djhkajocIVv9CB1MG+9XYcNwoieK6sei+w4XVk1Afw==
+					</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>Michael</md:GivenName>
+    <md:SurName>Thompson</md:SurName>
+    <md:EmailAddress>mailto:Michael.Thompson@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
new file mode 100644
index 00000000..d809b367
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cadcol.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,111 @@
+<?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>
+      <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
+						BAYTAkdCMRYwFAYDVQQIEw1XZXN0IE1pZGxhbmRzMRMwEQYDVQQHEwpCaXJtaW5n
+						aGFtMSMwIQYDVQQKExpDYWRidXJ5IFNpeHRoIEZvcm0gQ29sbGVnZTEQMA4GA1UE
+						CxMHSVQgRGVwdDEZMBcGA1UEAxMQaWRwLmNhZGNvbC5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBANtWIz33YCsijFXx4/b95qkgF1m0MeB6S8dX
+						oOaZnEQUOWcPgBh4JJBwHH3SLvQP3G1F58YXL0v8Pgab5tDDavLgbi7DFkW0OetW
+						jT4/xPT9UxHiHmMnxCjs0JpxahCxucQYU5EG6c1sCdi3/6z04RGutyp3UEoVkXpK
+						5+mtQCt8bhu0HOT9tvHIPxy4KXaFsb22RjIQFq98gW4bI4phXQTrDbeab21OPwJ3
+						QRSIQ8i2/J8i5pyQO8uNSyuu+JEDiXiijkUbVEzgMD0O+kvzTtZ/7RV7Cg0Mnvaf
+						hYW5l5iMCnU7kCrIAnGMtrHnhprIvHzeJdVGb1SUhHQupxawKBECAwEAAaOCAWMw
+						ggFfMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRb
+						f5RSMowa+lFIjSPl8Xfv6CL8sDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+						ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
+						BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+						bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+						MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+						CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDAS
+						ghBpZHAuY2FkY29sLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBF7oVjVs9tgJ1B
+						rvciHb+40CQqIbz86igO5mdrzpj+FgZtIWbkgEAa9Vboy8lZz2OQsFX1IfLc6GqJ
+						bnOqyjKPokM3xInZIjJKB5klR7pwb8ew7xztth6HI5kunUbqgJyUIps/UW5Wmebk
+						s4C3/IyCgKKhFuyy3TjvzaZ3AgNaIevVG1J86kdJp/o/e8lcK+B1Uc+YUXw88d7e
+						cqnkbj0rF6nJt0Qv6ybzByBjB/NyjQ0I45WALx6pRfyw7zau8ySfvBrjY8PcFvq1
+						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>
+						MIIEsjCCA5qgAwIBAgIQC6lglEc1muN3LFkfQ12m7DANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMTExNjAwMDAwMFoXDTE1MTExNjIzNTk1OVowgYwxCzAJBgNV
+						BAYTAkdCMRYwFAYDVQQIEw1XZXN0IE1pZGxhbmRzMRMwEQYDVQQHEwpCaXJtaW5n
+						aGFtMSMwIQYDVQQKExpDYWRidXJ5IFNpeHRoIEZvcm0gQ29sbGVnZTEQMA4GA1UE
+						CxMHSVQgRGVwdDEZMBcGA1UEAxMQaWRwLmNhZGNvbC5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBANtWIz33YCsijFXx4/b95qkgF1m0MeB6S8dX
+						oOaZnEQUOWcPgBh4JJBwHH3SLvQP3G1F58YXL0v8Pgab5tDDavLgbi7DFkW0OetW
+						jT4/xPT9UxHiHmMnxCjs0JpxahCxucQYU5EG6c1sCdi3/6z04RGutyp3UEoVkXpK
+						5+mtQCt8bhu0HOT9tvHIPxy4KXaFsb22RjIQFq98gW4bI4phXQTrDbeab21OPwJ3
+						QRSIQ8i2/J8i5pyQO8uNSyuu+JEDiXiijkUbVEzgMD0O+kvzTtZ/7RV7Cg0Mnvaf
+						hYW5l5iMCnU7kCrIAnGMtrHnhprIvHzeJdVGb1SUhHQupxawKBECAwEAAaOCAWMw
+						ggFfMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRb
+						f5RSMowa+lFIjSPl8Xfv6CL8sDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+						ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
+						BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+						bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+						MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+						CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDAS
+						ghBpZHAuY2FkY29sLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBF7oVjVs9tgJ1B
+						rvciHb+40CQqIbz86igO5mdrzpj+FgZtIWbkgEAa9Vboy8lZz2OQsFX1IfLc6GqJ
+						bnOqyjKPokM3xInZIjJKB5klR7pwb8ew7xztth6HI5kunUbqgJyUIps/UW5Wmebk
+						s4C3/IyCgKKhFuyy3TjvzaZ3AgNaIevVG1J86kdJp/o/e8lcK+B1Uc+YUXw88d7e
+						cqnkbj0rF6nJt0Qv6ybzByBjB/NyjQ0I45WALx6pRfyw7zau8ySfvBrjY8PcFvq1
+						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>Kamran</md:GivenName>
+    <md:SurName>Nasrullah</md:SurName>
+    <md:EmailAddress>mailto:Kamran.nasrullah@cadcol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kamran</md:GivenName>
+    <md:SurName>Nasrullah</md:SurName>
+    <md:EmailAddress>mailto:Kamran.nasrullah@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
new file mode 100644
index 00000000..5d74a9ff
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.calderdale.ac.uk-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						bGUuYWMudWswHhcNMTMwODIwMDk0OTE1WhcNMzMwODE1MDk0OTE1WjB0MQswCQYD
+						VQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxEDAOBgNVBAcTB0hhbGlm
+						YXgxGzAZBgNVBAoTEkNhbGRlcmRhbGUgQ29sbGVnZTEdMBsGA1UEAxMUaWRwLmNh
+						bGRlcmRhbGUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDl
+						d9r2GlhawshfKg2mLNnNM/cDXMuNmFyO5WqggGq/KYHz0IBPyiyta6i+br5eXBKO
+						1AqN50NOCd/+R8Sn6od72hEt8Rqw/mNeBpeunugR6osrfXU2jLJC3s1arRzeq9Su
+						tiJIfcH5W+D/DNU8HohGu0S1O850RDNczxgv3XRtgpIZ7+StR/i7K/87CnfqPa7N
+						Z5HnroRkOvnJvWVQqxeWq4uyg1SvmduZM3M5q9GHPIWNNOGD2tweqedebRfuKGS0
+						zFli/TuNt71KRfbe69XRJJ8+qonpZQnBXAB9Yoy54Cdfx5xVEPM8cDIym18PPFBt
+						z8XvtHII5NLdfyVeXR8TAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBALpqSF1/M+T+
+						tgTfWN+2Okc+AH9CyDweJWpzlrOGNyp7A5ZlACnxtDacwOweI2smD2dw40kePPYG
+						EDXNI38vkdzVLOOEVdJYXNIl48Y2bXuqP+vpzu6LCP7YtuaooutLN5o+XEuGyvkn
+						teHT5ghzinJTZSYxJbm3KoXntug1voV18Z6naYJiazdhs2e5EvrnjFkwNgzjKXqx
+						lDLBTzo4/aBLVsUmfJ1ulvsIeUja2lHL7jZ68ENOjtH3ttQgoCcsd26iKqyaTzrI
+						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>
+						MIIDZDCCAkwCCQDCBJgSsIDDIjANBgkqhkiG9w0BAQUFADB0MQswCQYDVQQGEwJH
+						QjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxEDAOBgNVBAcTB0hhbGlmYXgxGzAZ
+						BgNVBAoTEkNhbGRlcmRhbGUgQ29sbGVnZTEdMBsGA1UEAxMUaWRwLmNhbGRlcmRh
+						bGUuYWMudWswHhcNMTMwODIwMDk0OTE1WhcNMzMwODE1MDk0OTE1WjB0MQswCQYD
+						VQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxEDAOBgNVBAcTB0hhbGlm
+						YXgxGzAZBgNVBAoTEkNhbGRlcmRhbGUgQ29sbGVnZTEdMBsGA1UEAxMUaWRwLmNh
+						bGRlcmRhbGUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDl
+						d9r2GlhawshfKg2mLNnNM/cDXMuNmFyO5WqggGq/KYHz0IBPyiyta6i+br5eXBKO
+						1AqN50NOCd/+R8Sn6od72hEt8Rqw/mNeBpeunugR6osrfXU2jLJC3s1arRzeq9Su
+						tiJIfcH5W+D/DNU8HohGu0S1O850RDNczxgv3XRtgpIZ7+StR/i7K/87CnfqPa7N
+						Z5HnroRkOvnJvWVQqxeWq4uyg1SvmduZM3M5q9GHPIWNNOGD2tweqedebRfuKGS0
+						zFli/TuNt71KRfbe69XRJJ8+qonpZQnBXAB9Yoy54Cdfx5xVEPM8cDIym18PPFBt
+						z8XvtHII5NLdfyVeXR8TAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBALpqSF1/M+T+
+						tgTfWN+2Okc+AH9CyDweJWpzlrOGNyp7A5ZlACnxtDacwOweI2smD2dw40kePPYG
+						EDXNI38vkdzVLOOEVdJYXNIl48Y2bXuqP+vpzu6LCP7YtuaooutLN5o+XEuGyvkn
+						teHT5ghzinJTZSYxJbm3KoXntug1voV18Z6naYJiazdhs2e5EvrnjFkwNgzjKXqx
+						lDLBTzo4/aBLVsUmfJ1ulvsIeUja2lHL7jZ68ENOjtH3ttQgoCcsd26iKqyaTzrI
+						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>
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
new file mode 100644
index 00000000..33a06d9c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cambria.ac.uk-oala-metadata.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIDQDCCAiigAwIBAgIIJdvNXzLQftIwDQYJKoZIhvcNAQEFBQAwNzEWMBQGA1UE
+						CgwNQ29sZWcgQ2FtYnJpYTEdMBsGA1UEAwwUb2EuaWRwLmNhbWJyaWEuYWMudWsw
+						HhcNMTQwMzE3MTY0MTE5WhcNMjQwMzE3MTY0MTE5WjA3MRYwFAYDVQQKDA1Db2xl
+						ZyBDYW1icmlhMR0wGwYDVQQDDBRvYS5pZHAuY2FtYnJpYS5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIF4LXxMc/8UP7vZal6t9DeVSbXFa3Gv
+						5B/ckX4ICa+pfG7qwnr9WNzXISW0iUN+DukAFkvnMrWPJDrOm1HSsfLq2nvDXK81
+						hmuRmRK2V+gUiFh1qhkD9gkaLYzL65xSdC0gz9yP/MwZ+ZKyuNSm+X75GpJ63sLU
+						r+CQEq7S7bKzhftuyFy2OmO5FF8g4BCpHT9C3raOkw5Ni3gyuQkecCJwEtjPFRd4
+						zAM5J/B80c55sTqGh3UfsiUvTaxP5hGpEsnBRdsuFpK0zHozP6jVjxtTbsCrepU1
+						Y2GMGrM+uosjww21YCrj56kDPFMOMaV1463oI9R2TS2OYHwrmZDYlAkCAwEAAaNQ
+						ME4wHQYDVR0OBBYEFGKhkgRWPho7NkRfT3ECt9pkbulGMB8GA1UdIwQYMBaAFGKh
+						kgRWPho7NkRfT3ECt9pkbulGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBABv/D6QzfsuSGfYDgHy/aNPw9VGZJX1pf+5EZXE/vJOKdE+GIasZD1NcSV7I
+						n7UK+JcRDXbeHRc7BvTSth8/MZZPfeh69CIoLsucrQSmh5GasMjplOe8twJSGvRS
+						snKY2a+aGqmh++cCg05uyErkSSFo1SzdQtrLs8kUmsdw06eIzYL1enkIIYwB29Bq
+						Ov2I/duV8Tjgwq8KBpha0dNd1RWT2xp6pKxEwKfPtbNEV4+fZe8lfFHmtajqlIya
+						jApRsetq7QEV/7x+RV5EbhiimKvcEMYW+6js87AIgF5t4ULsFq23KCRu6bQdyku+
+						tBTjcCcqhVBGKeac/ZQWuEP2P2I=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDQDCCAiigAwIBAgIIJdvNXzLQftIwDQYJKoZIhvcNAQEFBQAwNzEWMBQGA1UE
+						CgwNQ29sZWcgQ2FtYnJpYTEdMBsGA1UEAwwUb2EuaWRwLmNhbWJyaWEuYWMudWsw
+						HhcNMTQwMzE3MTY0MTE5WhcNMjQwMzE3MTY0MTE5WjA3MRYwFAYDVQQKDA1Db2xl
+						ZyBDYW1icmlhMR0wGwYDVQQDDBRvYS5pZHAuY2FtYnJpYS5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIF4LXxMc/8UP7vZal6t9DeVSbXFa3Gv
+						5B/ckX4ICa+pfG7qwnr9WNzXISW0iUN+DukAFkvnMrWPJDrOm1HSsfLq2nvDXK81
+						hmuRmRK2V+gUiFh1qhkD9gkaLYzL65xSdC0gz9yP/MwZ+ZKyuNSm+X75GpJ63sLU
+						r+CQEq7S7bKzhftuyFy2OmO5FF8g4BCpHT9C3raOkw5Ni3gyuQkecCJwEtjPFRd4
+						zAM5J/B80c55sTqGh3UfsiUvTaxP5hGpEsnBRdsuFpK0zHozP6jVjxtTbsCrepU1
+						Y2GMGrM+uosjww21YCrj56kDPFMOMaV1463oI9R2TS2OYHwrmZDYlAkCAwEAAaNQ
+						ME4wHQYDVR0OBBYEFGKhkgRWPho7NkRfT3ECt9pkbulGMB8GA1UdIwQYMBaAFGKh
+						kgRWPho7NkRfT3ECt9pkbulGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBABv/D6QzfsuSGfYDgHy/aNPw9VGZJX1pf+5EZXE/vJOKdE+GIasZD1NcSV7I
+						n7UK+JcRDXbeHRc7BvTSth8/MZZPfeh69CIoLsucrQSmh5GasMjplOe8twJSGvRS
+						snKY2a+aGqmh++cCg05uyErkSSFo1SzdQtrLs8kUmsdw06eIzYL1enkIIYwB29Bq
+						Ov2I/duV8Tjgwq8KBpha0dNd1RWT2xp6pKxEwKfPtbNEV4+fZe8lfFHmtajqlIya
+						jApRsetq7QEV/7x+RV5EbhiimKvcEMYW+6js87AIgF5t4ULsFq23KCRu6bQdyku+
+						tBTjcCcqhVBGKeac/ZQWuEP2P2I=
+					</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>
diff --git a/swamid-interfederations-2.0/idp.cambridgeimaging.co.uk-entity.xml b/swamid-interfederations-2.0/idp.cambridgeimaging.co.uk-entity.xml
new file mode 100644
index 00000000..b739a77a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cambridgeimaging.co.uk-entity.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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
+						ZGdlaW1hZ2luZy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AMoKTCTiBT2WdSJHckKjl5POvjT+j37fzENQRrdyTtU7OAI4EPZ4RXTC38K2hPFQ
+						09pK904bqaWP4y/Kvg7cXLJ7+//lJQZDFFO7TFKLsUJK086hkEsKrWUx9ykU4kFG
+						P2LdBxvYcZvtdthzfVtDrdmiJwVwgrCHmhqxX1ICGiz4oXC8FTRSGmgkBZesaD33
+						aItvb4WK78dpQdcCmaZkFFLGUsFcSTCLKwYVcTJeBJ5HSdOvBPJ8Kcvd6RUFbp5N
+						jBk68T4sfH1tsKHqnGHg+UK22WOtpGgIt8zT5pS2l17EJ2s3hz0snJF3c6Lh8eMO
+						nzpq+MFhVFQpV/ZOm920iZ0CAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLmNhbWJy
+						aWRnZWltYWdpbmcuY28udWuGMWh0dHBzOi8vaWRwLmNhbWJyaWRnZWltYWdpbmcu
+						Y28udWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJcUHacY77LJTqyMRSqeZtkF
+						Dbr6MA0GCSqGSIb3DQEBBQUAA4IBAQAFXd/wFyF3UWF5q1NMFqCPPjyqk1jL60WO
+						E0NBCfM9VX24CgrL3QSYTLeVHKwJ/qGznh7/pbMhfAsPFAiX0vQyYTBeKeP1o2V/
+						Dq16b525gritaMhhPg+205Bf3MpD0oJWfM3YwDboC49bqN2/pe2l0QG5+hVp6YN9
+						Hem1W9OFrByZNezVqUxqtWzkShG9xUdsB2DlaRGkakzYz4NY4hAYcsNjQQ7DLXsx
+						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>
+						MIIDUzCCAjugAwIBAgIUFqyUnksKx2uVyCZeWl+JRq1o2rcwDQYJKoZIhvcNAQEF
+						BQAwJTEjMCEGA1UEAxMaaWRwLmNhbWJyaWRnZWltYWdpbmcuY28udWswHhcNMTMw
+						MjIxMTA0NDQ4WhcNMzMwMjIxMTA0NDQ4WjAlMSMwIQYDVQQDExppZHAuY2FtYnJp
+						ZGdlaW1hZ2luZy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AMoKTCTiBT2WdSJHckKjl5POvjT+j37fzENQRrdyTtU7OAI4EPZ4RXTC38K2hPFQ
+						09pK904bqaWP4y/Kvg7cXLJ7+//lJQZDFFO7TFKLsUJK086hkEsKrWUx9ykU4kFG
+						P2LdBxvYcZvtdthzfVtDrdmiJwVwgrCHmhqxX1ICGiz4oXC8FTRSGmgkBZesaD33
+						aItvb4WK78dpQdcCmaZkFFLGUsFcSTCLKwYVcTJeBJ5HSdOvBPJ8Kcvd6RUFbp5N
+						jBk68T4sfH1tsKHqnGHg+UK22WOtpGgIt8zT5pS2l17EJ2s3hz0snJF3c6Lh8eMO
+						nzpq+MFhVFQpV/ZOm920iZ0CAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLmNhbWJy
+						aWRnZWltYWdpbmcuY28udWuGMWh0dHBzOi8vaWRwLmNhbWJyaWRnZWltYWdpbmcu
+						Y28udWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJcUHacY77LJTqyMRSqeZtkF
+						Dbr6MA0GCSqGSIb3DQEBBQUAA4IBAQAFXd/wFyF3UWF5q1NMFqCPPjyqk1jL60WO
+						E0NBCfM9VX24CgrL3QSYTLeVHKwJ/qGznh7/pbMhfAsPFAiX0vQyYTBeKeP1o2V/
+						Dq16b525gritaMhhPg+205Bf3MpD0oJWfM3YwDboC49bqN2/pe2l0QG5+hVp6YN9
+						Hem1W9OFrByZNezVqUxqtWzkShG9xUdsB2DlaRGkakzYz4NY4hAYcsNjQQ7DLXsx
+						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>
diff --git a/swamid-interfederations-2.0/idp.canarie.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.canarie.ca-idp-shibboleth.xml
new file mode 100644
index 00000000..85f55d09
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.canarie.ca-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-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">
+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>
+      <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>
+MIIDJDCCAgygAwIBAgIVAJ3fH1HeYIxXxMXYbZ/Bx85j/JgKMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5jYW5hcmllLmNhMB4XDTExMDcwNjE0MzUxMloX
+DTMxMDcwNjE0MzUxMlowGTEXMBUGA1UEAxMOaWRwLmNhbmFyaWUuY2EwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcmyqTo01QVuqHI/ZXAdYP+iX6NjP2
+topfFsR4y8TVYFN4vMvb5ZSFWPPjJ8T3O2epI8Hy9q4FWyPn1Pa/CZoFi1EMhu7b
+QJpOmLzeX6FOvf1X/5De2JnWv7JWMpUMeVqupe2YeCtoaXfViHOB9pW0go2zr6R8
+ajvQKxNX46V/o1ND6YwnlKRNsh4hn46cPtl/DNeKYFz4Uj6OHBRSfMHTZCWVENJB
+ife66AS7X5hC6o7o2Sd5VHr0TgY+ZeKrl3/33war+RIGXr6cRW9iA9yEeW0Oi13Q
+3hkjPT7MNkvNJjWpERR7aBogQ3z5Id8Ygl+WASbyfoiXNCHPa3USAaynAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5jYW5hcmllLmNhhiVodHRwczovL2lkcC5jYW5h
+cmllLmNhL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRDEuTlL5Y/HfiEJ/wzCfCz
+otFdxjANBgkqhkiG9w0BAQUFAAOCAQEAD6WiCAdkGjA7Bza59pnn+/z5/Jhwn7Mf
++WS0WAPz686nIxYjblMBjIVITedkAFvwnEBn0Rs+XNXrc90uRFCNFf4VfSP9NLEf
+7cTPNxHiGt6TqOju2Rg6OBmNwRqAtFNqKG7VeKgoiZ4FcRVU2AdQ8fYnxxtwO4xJ
+8Md//Yp0lGQzj2FpSU7dnbVRGWAEE3g1Ghjrwe9Aj6e6lunZNaIdTZ6Yvnsa5qly
+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>
+MIIDJDCCAgygAwIBAgIVAJ3fH1HeYIxXxMXYbZ/Bx85j/JgKMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5jYW5hcmllLmNhMB4XDTExMDcwNjE0MzUxMloX
+DTMxMDcwNjE0MzUxMlowGTEXMBUGA1UEAxMOaWRwLmNhbmFyaWUuY2EwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcmyqTo01QVuqHI/ZXAdYP+iX6NjP2
+topfFsR4y8TVYFN4vMvb5ZSFWPPjJ8T3O2epI8Hy9q4FWyPn1Pa/CZoFi1EMhu7b
+QJpOmLzeX6FOvf1X/5De2JnWv7JWMpUMeVqupe2YeCtoaXfViHOB9pW0go2zr6R8
+ajvQKxNX46V/o1ND6YwnlKRNsh4hn46cPtl/DNeKYFz4Uj6OHBRSfMHTZCWVENJB
+ife66AS7X5hC6o7o2Sd5VHr0TgY+ZeKrl3/33war+RIGXr6cRW9iA9yEeW0Oi13Q
+3hkjPT7MNkvNJjWpERR7aBogQ3z5Id8Ygl+WASbyfoiXNCHPa3USAaynAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5jYW5hcmllLmNhhiVodHRwczovL2lkcC5jYW5h
+cmllLmNhL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRDEuTlL5Y/HfiEJ/wzCfCz
+otFdxjANBgkqhkiG9w0BAQUFAAOCAQEAD6WiCAdkGjA7Bza59pnn+/z5/Jhwn7Mf
++WS0WAPz686nIxYjblMBjIVITedkAFvwnEBn0Rs+XNXrc90uRFCNFf4VfSP9NLEf
+7cTPNxHiGt6TqOju2Rg6OBmNwRqAtFNqKG7VeKgoiZ4FcRVU2AdQ8fYnxxtwO4xJ
+8Md//Yp0lGQzj2FpSU7dnbVRGWAEE3g1Ghjrwe9Aj6e6lunZNaIdTZ6Yvnsa5qly
+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>
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
new file mode 100644
index 00000000..72cedcc1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.candi.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						YWMudWswHhcNMTQwODExMTA1MDAxWhcNMzQwODA2MTA1MDAxWjBxMQswCQYDVQQG
+						EwJHQjEPMA0GA1UECBMGTG9uZG9uMRIwEAYDVQQHEwlJc2xpbmd0b24xIzAhBgNV
+						BAoTGkNpdHkgYW5kIElzbGluZ3RvbiBDb2xsZWdlMRgwFgYDVQQDEw9pZHAuY2Fu
+						ZGkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYGeuw+zrL
+						Zf6PQdtZWCTr8hno/45ceRQxSzgkTQTvn9RNXjx1uUeXbektJang4mm8WPIBgPcf
+						qeP+ySSswFnCQW/sH2qKUYUjQ8k9Jvumjc5z1EJJLSPnwCn4xKmNVTcioMZXmdz8
+						0dbbJQllbRNUJzesKpEY3BxlaxtvNyY+G7l7dcDdtpCcuC5qpeFmBobH8+l6x5kv
+						dwTqyynGIkzGGF9CmV24ZEDuRGhxmllkOeous5PGIugTS/fJzNUt0YutPO9gVJl6
+						lSuLndEYogecKvlegQJ+cj7jxbK/PTFrHP+hQcjKYbZqRT5h9pBHsxzEoSYSzpvX
+						XIKIQtCwkpgRAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADiE+smBM3xMAZ9uD5rX
+						/cVK+a9iC4ZLq99x6sbuCt40/nUkQeImH0XMQS2D8OqY0dkVC3Sgdpxr2rk9uNzB
+						5BuP1ESK1Qm0PZ9883V0N5JJI5nAxlMvwBq0qFbiUpgs9XASK9vcL84a9B43IhKP
+						BmUkLXnsyH/2lb5FqnOOOIASLg+kPH5pZgaBzlevct+T1EJ0n9lUpJOsCG7xG40R
+						OTQ0RbpF+nldggrOT5IdT2xfd4GVmYuqBjnEZTjCFonujU5hVJ2rqacxDjK/qy1r
+						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>
+						MIIDXjCCAkYCCQCg/FLFP/fzOTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJH
+						QjEPMA0GA1UECBMGTG9uZG9uMRIwEAYDVQQHEwlJc2xpbmd0b24xIzAhBgNVBAoT
+						GkNpdHkgYW5kIElzbGluZ3RvbiBDb2xsZWdlMRgwFgYDVQQDEw9pZHAuY2FuZGku
+						YWMudWswHhcNMTQwODExMTA1MDAxWhcNMzQwODA2MTA1MDAxWjBxMQswCQYDVQQG
+						EwJHQjEPMA0GA1UECBMGTG9uZG9uMRIwEAYDVQQHEwlJc2xpbmd0b24xIzAhBgNV
+						BAoTGkNpdHkgYW5kIElzbGluZ3RvbiBDb2xsZWdlMRgwFgYDVQQDEw9pZHAuY2Fu
+						ZGkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYGeuw+zrL
+						Zf6PQdtZWCTr8hno/45ceRQxSzgkTQTvn9RNXjx1uUeXbektJang4mm8WPIBgPcf
+						qeP+ySSswFnCQW/sH2qKUYUjQ8k9Jvumjc5z1EJJLSPnwCn4xKmNVTcioMZXmdz8
+						0dbbJQllbRNUJzesKpEY3BxlaxtvNyY+G7l7dcDdtpCcuC5qpeFmBobH8+l6x5kv
+						dwTqyynGIkzGGF9CmV24ZEDuRGhxmllkOeous5PGIugTS/fJzNUt0YutPO9gVJl6
+						lSuLndEYogecKvlegQJ+cj7jxbK/PTFrHP+hQcjKYbZqRT5h9pBHsxzEoSYSzpvX
+						XIKIQtCwkpgRAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADiE+smBM3xMAZ9uD5rX
+						/cVK+a9iC4ZLq99x6sbuCt40/nUkQeImH0XMQS2D8OqY0dkVC3Sgdpxr2rk9uNzB
+						5BuP1ESK1Qm0PZ9883V0N5JJI5nAxlMvwBq0qFbiUpgs9XASK9vcL84a9B43IhKP
+						BmUkLXnsyH/2lb5FqnOOOIASLg+kPH5pZgaBzlevct+T1EJ0n9lUpJOsCG7xG40R
+						OTQ0RbpF+nldggrOT5IdT2xfd4GVmYuqBjnEZTjCFonujU5hVJ2rqacxDjK/qy1r
+						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>
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
new file mode 100644
index 00000000..afcd4e04
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.capes.gov.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIDmDCCAoACAQAwDQYJKoZIhvcNAQEFBQAwgZExDjAMBgNVBAoTBUNBUEVTMQ4w
+DAYDVQQLEwVDQVBFUzEgMB4GCSqGSIb3DQEJARYRcmVkZUBjYXBlcy5nb3YuYnIx
+EjAQBgNVBAcUCUJyYXPDaWxpYTERMA8GA1UECBMIQnJhc2lsaWExCzAJBgNVBAYT
+AkJSMRkwFwYDVQQDExBpZHAuY2FwZXMuZ292LmJyMB4XDTE1MDIyNDIwMDQ1MloX
+DTIwMDIyMzIwMDQ1MlowgZExDjAMBgNVBAoTBUNBUEVTMQ4wDAYDVQQLEwVDQVBF
+UzEgMB4GCSqGSIb3DQEJARYRcmVkZUBjYXBlcy5nb3YuYnIxEjAQBgNVBAcUCUJy
+YXPDaWxpYTERMA8GA1UECBMIQnJhc2lsaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
+ExBpZHAuY2FwZXMuZ292LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAwI90QNUmsF2GRpWA4DR+UEg0fXIkwS1u25J4ZcQIcSyCwmxgS7uuuwPYnfAO
+XkGMGUs63+ZDfRj6Es75AyBr15+inuH5gO4HAb+rfQmCTGz0LXh2MCR53jF9YT3C
+nRPwqkftNUe9hggxQgOsbVNGjJ6U9ZHKTFbkAtyz9hmSVCJhSCGh92HkJC3o4BRo
+XsgQKuj5zv8l0e83SWPKyx8zmA8REdsVF1V6MxxMo6IuO1UoJTXJ0J6zs2FGYlZk
+35PqNa/DxkRHsdCTA5/opIRHk6+M80jLLeUB7AES6Jub8g+DsJzciaPZCRCxygzF
+E1vIruhQpozTE/xXCgst1jemvwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQC1ZrRa
+gcKuLZlFmgq8Cb5R8qpWNc8HJG+cFArJ82EfVrfHE/Sbs2y+OQAYrRwueCgXiOpi
+WhmRjyfa9dXncRd9OgJ4iuiAC4LyKyBrr0hNF/CBeMATH1TY9ExwMo7Ib2AyL9yL
+IjoiAa4xqjg5SLe5/kagAGY8wmkKl9d0RfAWJLhyFI9vBBZC7s8J8Zi/n24164xN
+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>
+      
+
+MIIDmDCCAoACAQAwDQYJKoZIhvcNAQEFBQAwgZExDjAMBgNVBAoTBUNBUEVTMQ4w
+DAYDVQQLEwVDQVBFUzEgMB4GCSqGSIb3DQEJARYRcmVkZUBjYXBlcy5nb3YuYnIx
+EjAQBgNVBAcUCUJyYXPDaWxpYTERMA8GA1UECBMIQnJhc2lsaWExCzAJBgNVBAYT
+AkJSMRkwFwYDVQQDExBpZHAuY2FwZXMuZ292LmJyMB4XDTE1MDIyNDIwMDQ1MloX
+DTIwMDIyMzIwMDQ1MlowgZExDjAMBgNVBAoTBUNBUEVTMQ4wDAYDVQQLEwVDQVBF
+UzEgMB4GCSqGSIb3DQEJARYRcmVkZUBjYXBlcy5nb3YuYnIxEjAQBgNVBAcUCUJy
+YXPDaWxpYTERMA8GA1UECBMIQnJhc2lsaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
+ExBpZHAuY2FwZXMuZ292LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAwI90QNUmsF2GRpWA4DR+UEg0fXIkwS1u25J4ZcQIcSyCwmxgS7uuuwPYnfAO
+XkGMGUs63+ZDfRj6Es75AyBr15+inuH5gO4HAb+rfQmCTGz0LXh2MCR53jF9YT3C
+nRPwqkftNUe9hggxQgOsbVNGjJ6U9ZHKTFbkAtyz9hmSVCJhSCGh92HkJC3o4BRo
+XsgQKuj5zv8l0e83SWPKyx8zmA8REdsVF1V6MxxMo6IuO1UoJTXJ0J6zs2FGYlZk
+35PqNa/DxkRHsdCTA5/opIRHk6+M80jLLeUB7AES6Jub8g+DsJzciaPZCRCxygzF
+E1vIruhQpozTE/xXCgst1jemvwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQC1ZrRa
+gcKuLZlFmgq8Cb5R8qpWNc8HJG+cFArJ82EfVrfHE/Sbs2y+OQAYrRwueCgXiOpi
+WhmRjyfa9dXncRd9OgJ4iuiAC4LyKyBrr0hNF/CBeMATH1TY9ExwMo7Ib2AyL9yL
+IjoiAa4xqjg5SLe5/kagAGY8wmkKl9d0RfAWJLhyFI9vBBZC7s8J8Zi/n24164xN
+rmpcmEWQr4TehtiDJTAWcxlPuBp4SepXQwiFl3mnc7T7YHFLah5FLiIgnp6okU97
+WcQDFcFmVxjm4aNnbIYplvTtHd9skzcB5myj5qSNvVgHAqsL0WNXRQIfZk87IdZG
+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>Marcio Jesus</md:SurName>
+    <md:EmailAddress>marcio.jesus@capes.rnp.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
new file mode 100644
index 00000000..e68731b5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cardiff.ac.uk-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+						MIIDHDCCAgSgAwIBAgIUe8wsOBcOivZ/X/QVj8+2Uw+jnbAwDQYJKoZIhvcNAQEF
+						BQAwFzEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMB4XDTE0MDgxNDEzMTMxNVoXDTM0
+						MDgxNDEzMTMxNVowFzEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEApqXJD7Pmm0di7+qRkZYSDcc3JLPzVQkylFiV
+						bvpNphN9Rt9cRVv/qvN1nZVMYCanwzDJSz6idD4jip33u1up1szRTn5vfQLT5ta5
+						+PBzZad2lIao4CGH4PzSbUTUxivhldMQShlonsxmtpdFinHOKMjt8WYXB7iF0qDm
+						PQnJJC7tjHku/yc+d1Zh2VgzTG/OQ0fGvvkp5dFywjAAUH/ot/kheCqw4g0F/LHj
+						PlKUMvGFZc7PnmYgVa7Xz9YI0ZJjdc8uCHsvEZfCpoDnTpigUUvqwuuvwdSR7aew
+						SLcJi74+DXEZh/aa23HLVWrxk4xfMojpKVC+SwweohEeg4Wr3QIDAQABo2AwXjA9
+						BgNVHREENjA0ggxpZHAuY2YuYWMudWuGJGh0dHBzOi8vaWRwLmNhcmRpZmYuYWMu
+						dWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUGzP0X/B4uf8Nz8c3KPWxG4gG8dQwDQYJ
+						KoZIhvcNAQEFBQADggEBAGfqyC6ItIgEs3LtHUApmqvKDpFT90Uw03q4G5mwYT/Z
+						8V2ml+ppXGJJbz2tdQcyJOXr+Ik2UmFauYvtedsAuc+q2j1i4LMrveo03XP1NrHY
+						BMwMbvsjPqRbHk8398M4XA92712iB448+8kwI8zwu5Nlbayu9JF84eSEsufQHaA3
+						2tEqUYZYw+5SIhUPPL+rJbOTh/sPYy0niY2RVX22MsBGHIH+c93gpSYoCdQI5XBu
+						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>
+						MIIDHDCCAgSgAwIBAgIUe8wsOBcOivZ/X/QVj8+2Uw+jnbAwDQYJKoZIhvcNAQEF
+						BQAwFzEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMB4XDTE0MDgxNDEzMTMxNVoXDTM0
+						MDgxNDEzMTMxNVowFzEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEApqXJD7Pmm0di7+qRkZYSDcc3JLPzVQkylFiV
+						bvpNphN9Rt9cRVv/qvN1nZVMYCanwzDJSz6idD4jip33u1up1szRTn5vfQLT5ta5
+						+PBzZad2lIao4CGH4PzSbUTUxivhldMQShlonsxmtpdFinHOKMjt8WYXB7iF0qDm
+						PQnJJC7tjHku/yc+d1Zh2VgzTG/OQ0fGvvkp5dFywjAAUH/ot/kheCqw4g0F/LHj
+						PlKUMvGFZc7PnmYgVa7Xz9YI0ZJjdc8uCHsvEZfCpoDnTpigUUvqwuuvwdSR7aew
+						SLcJi74+DXEZh/aa23HLVWrxk4xfMojpKVC+SwweohEeg4Wr3QIDAQABo2AwXjA9
+						BgNVHREENjA0ggxpZHAuY2YuYWMudWuGJGh0dHBzOi8vaWRwLmNhcmRpZmYuYWMu
+						dWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUGzP0X/B4uf8Nz8c3KPWxG4gG8dQwDQYJ
+						KoZIhvcNAQEFBQADggEBAGfqyC6ItIgEs3LtHUApmqvKDpFT90Uw03q4G5mwYT/Z
+						8V2ml+ppXGJJbz2tdQcyJOXr+Ik2UmFauYvtedsAuc+q2j1i4LMrveo03XP1NrHY
+						BMwMbvsjPqRbHk8398M4XA92712iB448+8kwI8zwu5Nlbayu9JF84eSEsufQHaA3
+						2tEqUYZYw+5SIhUPPL+rJbOTh/sPYy0niY2RVX22MsBGHIH+c93gpSYoCdQI5XBu
+						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>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:smith@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
new file mode 100644
index 00000000..e8ea444d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cardiffmet.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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>
+      <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 - new</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://idplogos.uwic.ac.uk/uwic-logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idplogos.uwic.ac.uk/icon1.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>
+						MIIDPDCCAiSgAwIBAgIVAM/WrHuhoD12UZd9duSVXiTcAQKqMA0GCSqGSIb3DQEB
+						BQUAMB8xHTAbBgNVBAMMFGlkcC5jYXJkaWZmbWV0LmFjLnVrMB4XDTE0MTEyODE0
+						NTA1OFoXDTM0MTEyODE0NTA1OFowHzEdMBsGA1UEAwwUaWRwLmNhcmRpZmZtZXQu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCibib8LKS+kWc/
+						4jFZaF5lJlCYKGc2M3h7Dzx7En9rOaP/4BnyRXmIfX0XQQ43Zl/M3TZ1V3lfOMl0
+						mS7qxiNP9tRR44Imj4tAlPGTL0/G6wKrRgZwT5Ya5Situ4uGSjRqlEXKp0WPX9DB
+						rV40f+n3amXbG6968QkBgMTVQoYSfPYPDeYvMkJgIBJ7fFEfoiUEMLbmApFvKAOF
+						fh3AyRIgIvNZGuhCmOurAxrK83NQf8GxYCrxWVYBDxy2zM+ieqIQfXq7vKPwRj0i
+						I93TqeH3tW+NNXxp3L2Vhqp6QjNwTJuQoq8CyeFAppZ3R7I76gS0a/G65BnDexXr
+						s35piiX3AgMBAAGjbzBtMB0GA1UdDgQWBBRhlIKvVhsJq55eRmziUxsfKVzMkjBM
+						BgNVHREERTBDghRpZHAuY2FyZGlmZm1ldC5hYy51a4YraHR0cHM6Ly9pZHAuY2Fy
+						ZGlmZm1ldC5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
+						V2tNA0SAzHCAXhPCbT2SAMgB4bSGM51OLwKn+tJNC5gasFq62kERnXcRbl/Ii5VZ
+						Iu1t8ml0jTLBjiFYCFtq4uGEMeDPPxKNUNEPkWfIqCq693CrSHc1M5Lso4CmhiCK
+						CAnz0V1oVkgyBW9e7WnDzRGvVN12hTGmS33ZINOamwmQErUbeEdRnlB7fa3BZHB9
+						kdW3SZRhb7CynWQoB6byYyBBWKfTuD1qScRQlIFhOscGX3qxBYBIqwzsJkd4qXPK
+						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>
+						MIIDPDCCAiSgAwIBAgIVAM/WrHuhoD12UZd9duSVXiTcAQKqMA0GCSqGSIb3DQEB
+						BQUAMB8xHTAbBgNVBAMMFGlkcC5jYXJkaWZmbWV0LmFjLnVrMB4XDTE0MTEyODE0
+						NTA1OFoXDTM0MTEyODE0NTA1OFowHzEdMBsGA1UEAwwUaWRwLmNhcmRpZmZtZXQu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCibib8LKS+kWc/
+						4jFZaF5lJlCYKGc2M3h7Dzx7En9rOaP/4BnyRXmIfX0XQQ43Zl/M3TZ1V3lfOMl0
+						mS7qxiNP9tRR44Imj4tAlPGTL0/G6wKrRgZwT5Ya5Situ4uGSjRqlEXKp0WPX9DB
+						rV40f+n3amXbG6968QkBgMTVQoYSfPYPDeYvMkJgIBJ7fFEfoiUEMLbmApFvKAOF
+						fh3AyRIgIvNZGuhCmOurAxrK83NQf8GxYCrxWVYBDxy2zM+ieqIQfXq7vKPwRj0i
+						I93TqeH3tW+NNXxp3L2Vhqp6QjNwTJuQoq8CyeFAppZ3R7I76gS0a/G65BnDexXr
+						s35piiX3AgMBAAGjbzBtMB0GA1UdDgQWBBRhlIKvVhsJq55eRmziUxsfKVzMkjBM
+						BgNVHREERTBDghRpZHAuY2FyZGlmZm1ldC5hYy51a4YraHR0cHM6Ly9pZHAuY2Fy
+						ZGlmZm1ldC5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
+						V2tNA0SAzHCAXhPCbT2SAMgB4bSGM51OLwKn+tJNC5gasFq62kERnXcRbl/Ii5VZ
+						Iu1t8ml0jTLBjiFYCFtq4uGEMeDPPxKNUNEPkWfIqCq693CrSHc1M5Lso4CmhiCK
+						CAnz0V1oVkgyBW9e7WnDzRGvVN12hTGmS33ZINOamwmQErUbeEdRnlB7fa3BZHB9
+						kdW3SZRhb7CynWQoB6byYyBBWKfTuD1qScRQlIFhOscGX3qxBYBIqwzsJkd4qXPK
+						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 - new</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
new file mode 100644
index 00000000..b0dbcb48
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cardinalnewman.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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>
+      <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
+						bG5ld21hbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJQW
+						EmuHiLRzTQs3XvnVaQGZvME2NGRwEOUfrWsoVCSJjV3YUZ7inuMBtqJXTul3PlAZ
+						ELzz3+NgNX/PP7HT4rV5Uhj/L5R/VwgmgjTXYUIi2d7wdg1HOJ2nYvAm9LnkSYFY
+						0b1OT5YmIL/LSfSaj0RVs4SOCuvzOu+WaZjo6Z5MnLV/MiwCno4vBn0TrIcZ9H4y
+						BsOR6+gh3iBev/PSjt5VN9oViD/vD3RNYY0woYZtbKvGhACVAKLok4HEYsJ2hcbS
+						P+LwOFsCMy69FHawLejegqCF+Yhh1HMHRwz6MGxBrrGo100vdeJTcQtACguXL0bn
+						rPFqeboyfkZ/j1P3uicCAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLmNhcmRpbmFs
+						bmV3bWFuLmFjLnVrhi9odHRwczovL2lkcC5jYXJkaW5hbG5ld21hbi5hYy51ay9p
+						ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVZfvR2nlc/IkJOBss2ktW/Hg3uswDQYJ
+						KoZIhvcNAQEFBQADggEBAB6DXw0SAw+1hnjApCsG20tA0U2y6RgVJrylms5BM2ca
+						zkgFwYNpbEq5NpuWwTzf5APbEIyAbF90Im5x5YBf0BqFuUYu4k7+KDRZKkMkkbmV
+						gEWKlkI33tF+OmMIhjJPeFwMMMe+yeBWed2quQYky7DhDnGQDgjaczug4GfZcty6
+						D65BSsxZ1l+pD/MIz+bEFMWckIGCI20CufIMzBasW8+CwQL6DOu80yQe+/fTSNxM
+						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>
+						MIIDTDCCAjSgAwIBAgIVAJXtCjT47ZPtsA2VBKyWHL0NGjqUMA0GCSqGSIb3DQEB
+						BQUAMCMxITAfBgNVBAMTGGlkcC5jYXJkaW5hbG5ld21hbi5hYy51azAeFw0xMTA4
+						MDgwOTU2NTBaFw0zMTA4MDgwOTU2NTBaMCMxITAfBgNVBAMTGGlkcC5jYXJkaW5h
+						bG5ld21hbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJQW
+						EmuHiLRzTQs3XvnVaQGZvME2NGRwEOUfrWsoVCSJjV3YUZ7inuMBtqJXTul3PlAZ
+						ELzz3+NgNX/PP7HT4rV5Uhj/L5R/VwgmgjTXYUIi2d7wdg1HOJ2nYvAm9LnkSYFY
+						0b1OT5YmIL/LSfSaj0RVs4SOCuvzOu+WaZjo6Z5MnLV/MiwCno4vBn0TrIcZ9H4y
+						BsOR6+gh3iBev/PSjt5VN9oViD/vD3RNYY0woYZtbKvGhACVAKLok4HEYsJ2hcbS
+						P+LwOFsCMy69FHawLejegqCF+Yhh1HMHRwz6MGxBrrGo100vdeJTcQtACguXL0bn
+						rPFqeboyfkZ/j1P3uicCAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLmNhcmRpbmFs
+						bmV3bWFuLmFjLnVrhi9odHRwczovL2lkcC5jYXJkaW5hbG5ld21hbi5hYy51ay9p
+						ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVZfvR2nlc/IkJOBss2ktW/Hg3uswDQYJ
+						KoZIhvcNAQEFBQADggEBAB6DXw0SAw+1hnjApCsG20tA0U2y6RgVJrylms5BM2ca
+						zkgFwYNpbEq5NpuWwTzf5APbEIyAbF90Im5x5YBf0BqFuUYu4k7+KDRZKkMkkbmV
+						gEWKlkI33tF+OmMIhjJPeFwMMMe+yeBWed2quQYky7DhDnGQDgjaczug4GfZcty6
+						D65BSsxZ1l+pD/MIz+bEFMWckIGCI20CufIMzBasW8+CwQL6DOu80yQe+/fTSNxM
+						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>
diff --git a/swamid-interfederations-2.0/idp.carnegiecollege.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.carnegiecollege.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..4981771d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.carnegiecollege.ac.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.carnegiecollege.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">carnegiecollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUDCCAjigAwIBAgIVAOUN5zR4W0Yp623P7ivOXWG1NWWNMA0GCSqGSIb3DQEB
+						BQUAMCQxIjAgBgNVBAMTGWlkcC5jYXJuZWdpZWNvbGxlZ2UuYWMudWswHhcNMTEw
+						ODAxMTE1MTA0WhcNMzEwODAxMTE1MTA0WjAkMSIwIAYDVQQDExlpZHAuY2FybmVn
+						aWVjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						jiGLbGd7T4/psE8UmyiVNE1j/T4sNaEwOdLvp0stPmfu8I+heqJ/TgblcJs0d3Vg
+						2I0SQoXqecXxZMYEXvHL80lHKZUKgCF5U7hEbCdc2Q6mtGhxbcmxonbGxXEEnzci
+						v2HMvXND/uKlS/walNdpWxUZTruElufziDsJJ2bvbOFbK29JQmpbtovryCP68+TC
+						qUHeyhy9vekri0tHeB/R1lIZHuUUVkhlhHD9njlNxaireJDmOouef7aYmKpX+CA7
+						HD/pWazQnBLTJi1cLSbez12QDwDjKhIEh17+ne945Ibo9laDBmxhkHQ8CHsk09T5
+						Bh+mImcqg2fREh8c+ELjLQIDAQABo3kwdzBWBgNVHREETzBNghlpZHAuY2FybmVn
+						aWVjb2xsZWdlLmFjLnVrhjBodHRwczovL2lkcC5jYXJuZWdpZWNvbGxlZ2UuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMz/6hexyF79UfvamqhIzF41IeCX
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBPsSxzTWj/1zTaokQqCzcw3ULAb77rgV3ldUN/
+						BdFGDIOn96JBAH5th8IBduafAFr9C8tfzmAV9uYLPoIeVWaZy+vjI2jIMr6Ciurt
+						uV96WaUEfdqHXzST6zGQl3Zg1XLZIyNJFDTPjurufLNCEGdC1/9qFtYfNL/MVXsK
+						qawDw3GsR+96Nl1QTYpYeRllUABAbxTZO/jm7gOLx+II4b7/3y5cpnKKlLmO7ALx
+						6HponMBdA1XIp7jA/UAjqgj1uxj0VWwIB3th1ZHHC5iGSZoZsT2F/61MWws0DoTz
+						UcbdW5gmbo27wUFi3yN1cTFz2SMowbSx4fOzJcu/ulqb2Cz+
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.carnegiecollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.carnegiecollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.carnegiecollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.carnegiecollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.carnegiecollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.carnegiecollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">carnegiecollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUDCCAjigAwIBAgIVAOUN5zR4W0Yp623P7ivOXWG1NWWNMA0GCSqGSIb3DQEB
+						BQUAMCQxIjAgBgNVBAMTGWlkcC5jYXJuZWdpZWNvbGxlZ2UuYWMudWswHhcNMTEw
+						ODAxMTE1MTA0WhcNMzEwODAxMTE1MTA0WjAkMSIwIAYDVQQDExlpZHAuY2FybmVn
+						aWVjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						jiGLbGd7T4/psE8UmyiVNE1j/T4sNaEwOdLvp0stPmfu8I+heqJ/TgblcJs0d3Vg
+						2I0SQoXqecXxZMYEXvHL80lHKZUKgCF5U7hEbCdc2Q6mtGhxbcmxonbGxXEEnzci
+						v2HMvXND/uKlS/walNdpWxUZTruElufziDsJJ2bvbOFbK29JQmpbtovryCP68+TC
+						qUHeyhy9vekri0tHeB/R1lIZHuUUVkhlhHD9njlNxaireJDmOouef7aYmKpX+CA7
+						HD/pWazQnBLTJi1cLSbez12QDwDjKhIEh17+ne945Ibo9laDBmxhkHQ8CHsk09T5
+						Bh+mImcqg2fREh8c+ELjLQIDAQABo3kwdzBWBgNVHREETzBNghlpZHAuY2FybmVn
+						aWVjb2xsZWdlLmFjLnVrhjBodHRwczovL2lkcC5jYXJuZWdpZWNvbGxlZ2UuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMz/6hexyF79UfvamqhIzF41IeCX
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBPsSxzTWj/1zTaokQqCzcw3ULAb77rgV3ldUN/
+						BdFGDIOn96JBAH5th8IBduafAFr9C8tfzmAV9uYLPoIeVWaZy+vjI2jIMr6Ciurt
+						uV96WaUEfdqHXzST6zGQl3Zg1XLZIyNJFDTPjurufLNCEGdC1/9qFtYfNL/MVXsK
+						qawDw3GsR+96Nl1QTYpYeRllUABAbxTZO/jm7gOLx+II4b7/3y5cpnKKlLmO7ALx
+						6HponMBdA1XIp7jA/UAjqgj1uxj0VWwIB3th1ZHHC5iGSZoZsT2F/61MWws0DoTz
+						UcbdW5gmbo27wUFi3yN1cTFz2SMowbSx4fOzJcu/ulqb2Cz+
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.carnegiecollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.carnegiecollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Fife College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Carnegie College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://carnegiecollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sarah Louise</md:GivenName>
+    <md:SurName>MacAdie</md:SurName>
+    <md:EmailAddress>mailto:sarahlouisemacadie@fife.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Campbell</md:SurName>
+    <md:EmailAddress>mailto:paulcampbell@fife.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cedia.org.ec-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cedia.org.ec-idp-shibboleth.xml
new file mode 100644
index 00000000..def2d0ce
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cedia.org.ec-idp-shibboleth.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-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.cedia.org.ec/idp/shibboleth">
+  <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="es">
+                                http://www.cedia.org.ec/minga
+                        </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol 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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CEDIA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">CEDIA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                                CEDIA - Ecuadorean Consortium for Advanced Internet Development
+                        </mdui:Description>
+        <mdui:Description xml:lang="es">
+                                CEDIA - Consorcio Ecuatoriano para el Desarrollo de Internet Avanzado
+                        </mdui:Description>
+        <mdui:InformationURL xml:lang="en">
+                                http://www.cedia.org.ec
+                        </mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">
+                                http://www.cedia.org.ec
+                        </mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIHnzCCBYegAwIBAgIBCDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMCRUMx
+DjAMBgNVBAgTBUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElB
+MUYwRAYDVQQLEz1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJv
+bGxvIGRlIEludGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVj
+MR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE0MDIwMTAxMjU0
+OFoXDTE2MDIwMTAxMjU0OFowgcIxCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVh
+eTEPMA0GA1UEBxMGQ3VlbmNhMQ4wDAYDVQQKEwVDRURJQTFGMEQGA1UECxM9Q29u
+c29yY2lvIEVjdWF0b3JpYW5vIHBhcmEgZWwgRGVzYXJyb2xsbyBkZSBJbnRlcm5l
+dCBBdmFuemFkbzEZMBcGA1UEAxMQaWRwLmNlZGlhLm9yZy5lYzEfMB0GCSqGSIb3
+DQEJARYQbmVnQGNlZGlhLm9yZy5lYzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+AgoCggIBAKSsCSs49O1Pt5o6DSOaCGd5tzQALUWSn+MaOJEf/T+OlO47Ao1b5mz2
+Qn2+2fKhjNfTmxEaLCGkrtlMfZvGpVCpatYjVOqw1faGHc/MoohcsgjQQhUMEUBd
+Ez9UV9z4ogC5mWE9KoVlUbCT8+z2TfU4qlQgB/nOx0F71Frnex9cRhkmiYI2z8OC
+Gmeio8wxXU0jYvEYv3Hk6/Q+dPOIKwyPItk9rg/gL/aVor2uAZ6B6UJiasU7riOq
+qth/6cnriUymDX04wSJZWGfAX+/IJ1VRwPyYAT/szRMVoBzV/bEWgRnO2zTGjLn0
+/zS76W7JAdVu5i/x3nrZL00dzu8wFAZmC4CurMznL8Rz1CI7u/F/TJjpq6Tgw+fT
+jzL9pBn95sLe0dQzsxWJ4COe/yK/ANO1LhDUUGV83nHVLMphfUsHj9bh2NTtECbt
+uKVmnSRLLtXPION6r+arqXfWqSN0EqfVZGdFK+Z+dAaVtr1BX2sXZVm1pQNpjNeJ
+fcMrpDPGSQXPCLZfVAmfvHGsXvq6VDmv1dXULUFauTGnsXbG1GkRGU70A5CR2oyF
+RWnL/5nMXAnIb8trJmN2u6kIKV+AyjeNKgn3OnT5xSW1XD66nhzTtOhnGzuCPcH/
+2wG0fyUCshwc1gY2Tl2u8YplLndWlTXFvFUMyWzyBXAyKtAR53KhAgMBAAGjggGf
+MIIBmzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGQDArBglghkgBhvhCAQ0E
+HhYcVGlueUNBIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUpu+3H1k4
+WykGUu2yNZioiqwV6HAwgfQGA1UdIwSB7DCB6YAUXr5EvOJqnceMOEVQzXKYLF9c
+/jOhgcWkgcIwgb8xCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVheTEPMA0GA1UE
+BxMGQ3VlbmNhMQ4wDAYDVQQKEwVDRURJQTFGMEQGA1UECxM9Q29uc29yY2lvIEVj
+dWF0b3JpYW5vIHBhcmEgZWwgRGVzYXJyb2xsbyBkZSBJbnRlcm5ldCBBdmFuemFk
+bzEWMBQGA1UEAxMNY2EuZWR1cm9hbS5lYzEfMB0GCSqGSIb3DQEJARYQbmVnQGNl
+ZGlhLm9yZy5lY4IJANQ3cRbGqAp6MBsGA1UdEgQUMBKBEG5lZ0BjZWRpYS5vcmcu
+ZWMwGwYDVR0RBBQwEoEQbmVnQGNlZGlhLm9yZy5lYzANBgkqhkiG9w0BAQUFAAOC
+AgEAUbDgG1MR04EhdgEQUTt99d2ipr7ehfMKwfm7W3XiaHzqXOmqsogjlOJVBkUo
+4+PWVC0kfy7pOI0CWji7TfmKsh6iW9peM5TT2Iir/NLZD2PJl9EiOgSavmtjlL3N
+Dm0pBh0dpYXxJQpPtWjYntuuP6YLpQHM0PUgOhbGe9N3d3k1DZHOtDaOcA7UjKcW
+PvsCD3+jciSw33//J/asuixqvpoxZO1TUQbFm9HpLgEiw4iPVu/lo7mEsuz4LxQd
+N00udea/m/hhE5xmoQa4HSfvB/SahN3JOzljhpKEVABrPFfgBtMPw57HFI/SY4X0
++P4Uvc95C/KHisKv56PXq/3YSJs4wWY7nHdMNn7VKajvQ12HMQAZ+9nlUqeo7Crh
+npeGWSfCa3GJLtEYDbdWEIQdj5aJRgsV2EdSplgB23W/o5H4mvip90bWxKJdu0Av
+oeRBRK2PKulEhMstu76LPfv/oAA1hYWaPoIkQGsotqlAl3tvG1+/W9VCwcPuH/nQ
+WHgEVQZSqFt3m+FzghJRRQvGe7foGZoddosgg3tLgrzaWF+Vr8SkzRNlvdBdK/rU
+cJA93fCpqCNEcakWGckj7E/ieF/X9MKTS7c3Ui83BpY2jmQ9U3fX8g+44UsO2w4A
+a8vDEfSWxvi6ARpCFm1bcC8P5WcwHW/f72CcmM1RwWQBLKE=
+
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cedia.org.ec/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cedia.org.ec/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cedia.org.ec/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cedia.org.ec/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cedia.org.ec/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cedia.org.ec/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">org.ec</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIHnzCCBYegAwIBAgIBCDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMCRUMx
+DjAMBgNVBAgTBUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElB
+MUYwRAYDVQQLEz1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJv
+bGxvIGRlIEludGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVj
+MR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE0MDIwMTAxMjU0
+OFoXDTE2MDIwMTAxMjU0OFowgcIxCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVh
+eTEPMA0GA1UEBxMGQ3VlbmNhMQ4wDAYDVQQKEwVDRURJQTFGMEQGA1UECxM9Q29u
+c29yY2lvIEVjdWF0b3JpYW5vIHBhcmEgZWwgRGVzYXJyb2xsbyBkZSBJbnRlcm5l
+dCBBdmFuemFkbzEZMBcGA1UEAxMQaWRwLmNlZGlhLm9yZy5lYzEfMB0GCSqGSIb3
+DQEJARYQbmVnQGNlZGlhLm9yZy5lYzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+AgoCggIBAKSsCSs49O1Pt5o6DSOaCGd5tzQALUWSn+MaOJEf/T+OlO47Ao1b5mz2
+Qn2+2fKhjNfTmxEaLCGkrtlMfZvGpVCpatYjVOqw1faGHc/MoohcsgjQQhUMEUBd
+Ez9UV9z4ogC5mWE9KoVlUbCT8+z2TfU4qlQgB/nOx0F71Frnex9cRhkmiYI2z8OC
+Gmeio8wxXU0jYvEYv3Hk6/Q+dPOIKwyPItk9rg/gL/aVor2uAZ6B6UJiasU7riOq
+qth/6cnriUymDX04wSJZWGfAX+/IJ1VRwPyYAT/szRMVoBzV/bEWgRnO2zTGjLn0
+/zS76W7JAdVu5i/x3nrZL00dzu8wFAZmC4CurMznL8Rz1CI7u/F/TJjpq6Tgw+fT
+jzL9pBn95sLe0dQzsxWJ4COe/yK/ANO1LhDUUGV83nHVLMphfUsHj9bh2NTtECbt
+uKVmnSRLLtXPION6r+arqXfWqSN0EqfVZGdFK+Z+dAaVtr1BX2sXZVm1pQNpjNeJ
+fcMrpDPGSQXPCLZfVAmfvHGsXvq6VDmv1dXULUFauTGnsXbG1GkRGU70A5CR2oyF
+RWnL/5nMXAnIb8trJmN2u6kIKV+AyjeNKgn3OnT5xSW1XD66nhzTtOhnGzuCPcH/
+2wG0fyUCshwc1gY2Tl2u8YplLndWlTXFvFUMyWzyBXAyKtAR53KhAgMBAAGjggGf
+MIIBmzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGQDArBglghkgBhvhCAQ0E
+HhYcVGlueUNBIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUpu+3H1k4
+WykGUu2yNZioiqwV6HAwgfQGA1UdIwSB7DCB6YAUXr5EvOJqnceMOEVQzXKYLF9c
+/jOhgcWkgcIwgb8xCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVheTEPMA0GA1UE
+BxMGQ3VlbmNhMQ4wDAYDVQQKEwVDRURJQTFGMEQGA1UECxM9Q29uc29yY2lvIEVj
+dWF0b3JpYW5vIHBhcmEgZWwgRGVzYXJyb2xsbyBkZSBJbnRlcm5ldCBBdmFuemFk
+bzEWMBQGA1UEAxMNY2EuZWR1cm9hbS5lYzEfMB0GCSqGSIb3DQEJARYQbmVnQGNl
+ZGlhLm9yZy5lY4IJANQ3cRbGqAp6MBsGA1UdEgQUMBKBEG5lZ0BjZWRpYS5vcmcu
+ZWMwGwYDVR0RBBQwEoEQbmVnQGNlZGlhLm9yZy5lYzANBgkqhkiG9w0BAQUFAAOC
+AgEAUbDgG1MR04EhdgEQUTt99d2ipr7ehfMKwfm7W3XiaHzqXOmqsogjlOJVBkUo
+4+PWVC0kfy7pOI0CWji7TfmKsh6iW9peM5TT2Iir/NLZD2PJl9EiOgSavmtjlL3N
+Dm0pBh0dpYXxJQpPtWjYntuuP6YLpQHM0PUgOhbGe9N3d3k1DZHOtDaOcA7UjKcW
+PvsCD3+jciSw33//J/asuixqvpoxZO1TUQbFm9HpLgEiw4iPVu/lo7mEsuz4LxQd
+N00udea/m/hhE5xmoQa4HSfvB/SahN3JOzljhpKEVABrPFfgBtMPw57HFI/SY4X0
++P4Uvc95C/KHisKv56PXq/3YSJs4wWY7nHdMNn7VKajvQ12HMQAZ+9nlUqeo7Crh
+npeGWSfCa3GJLtEYDbdWEIQdj5aJRgsV2EdSplgB23W/o5H4mvip90bWxKJdu0Av
+oeRBRK2PKulEhMstu76LPfv/oAA1hYWaPoIkQGsotqlAl3tvG1+/W9VCwcPuH/nQ
+WHgEVQZSqFt3m+FzghJRRQvGe7foGZoddosgg3tLgrzaWF+Vr8SkzRNlvdBdK/rU
+cJA93fCpqCNEcakWGckj7E/ieF/X9MKTS7c3Ui83BpY2jmQ9U3fX8g+44UsO2w4A
+a8vDEfSWxvi6ARpCFm1bcC8P5WcwHW/f72CcmM1RwWQBLKE=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CEDIA - Consorcio Ecuatoriano para el desarrollo de Internet Avanzado</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CEDIA - Consorcio Ecuatoriano para el desarrollo de Internet Avanzado</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cedia.org.ec/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Claudio Chacon A</md:SurName>
+    <md:EmailAddress>neg@cedia.org.ec</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cereq.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cereq.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..c8386e3f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cereq.fr-idp-shibboleth.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cereq.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-29T11:42: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>
+      <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="fr">CEREQ - Centre d'études et de recherches sur les qualifications</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDHDCCAgSgAwIBAgIVAOjMbhrsfOCDjExPYxhACw4jRvB6MA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC5jZXJlcS5mcjAeFw0xMzA5MjcwOTA0MDJaFw0x
+NjA5MjcwOTA0MDJaMBcxFTATBgNVBAMTDGlkcC5jZXJlcS5mcjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJgjISx2Xe/SFbLNuYAxijARJxrqmqAxSr+h
+l4id6zNomZYbjFZdQYVNhx2L7opOH3/9ADiMO1a8Ve+yG8Gof2fYXl3bMd/XL7Hb
+SS0eBc5a3H0b1U8gGEp9kfDSXYijDYV9HHmstvju8j99RHZejnXrmiUioG6P4qU0
+raMTTBASqFBfDruGS1UiPYPAq/C7cqgnyNI4sm7jSvbzonrGSbs1XlHM0bdhFL+O
+eoZ9yS8fTIMD2vVsZii541/K3V9CMhOAoBG8SA2YAejVWOZwJdMvmpK4X3/GLwoG
+UIF+HUeQYbvc3XZqh8IzWHF81RIjxpU1KGp39T3TUdDK/L9tMasCAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLmNlcmVxLmZyhiNodHRwczovL2lkcC5jZXJlcS5mci9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8nfoSUP0/WYyq31ReN3zCpK32XAwDQYJ
+KoZIhvcNAQEFBQADggEBAIx3XQUabG1j7RIk67rwMEIXqeYNGt1eakcqwwaq4UKG
+4hSJbUUoR+MET7C6PrvKq2lafC4Za14xO9CjFFnuroCReSJ9pfRV6hR+1qnpwhhB
+GhTgaMJY1QPLfvI12pJjFf5deMIZ2Uet70h+haXLyiimkezT3lzsvT3DGVkD8BnK
+OBtxuHB99XtrB8VrDGqpw5x7VuiiApy5MeMlduhrXskS4+V2q5TOs4jbcrEc78iy
+Vhfsf5Rcol2AkYmeLthOcledgXQtj0r0mOxA1FDH3NBuCBKavpg20gnMlZ8gfAG1
+wsA88wxSrNn+0crrQBnCCoFM6QgGRbFes23UYMEEbw0=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cereq.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cereq.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cereq.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">cereq.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDHDCCAgSgAwIBAgIVAOjMbhrsfOCDjExPYxhACw4jRvB6MA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC5jZXJlcS5mcjAeFw0xMzA5MjcwOTA0MDJaFw0x
+NjA5MjcwOTA0MDJaMBcxFTATBgNVBAMTDGlkcC5jZXJlcS5mcjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJgjISx2Xe/SFbLNuYAxijARJxrqmqAxSr+h
+l4id6zNomZYbjFZdQYVNhx2L7opOH3/9ADiMO1a8Ve+yG8Gof2fYXl3bMd/XL7Hb
+SS0eBc5a3H0b1U8gGEp9kfDSXYijDYV9HHmstvju8j99RHZejnXrmiUioG6P4qU0
+raMTTBASqFBfDruGS1UiPYPAq/C7cqgnyNI4sm7jSvbzonrGSbs1XlHM0bdhFL+O
+eoZ9yS8fTIMD2vVsZii541/K3V9CMhOAoBG8SA2YAejVWOZwJdMvmpK4X3/GLwoG
+UIF+HUeQYbvc3XZqh8IzWHF81RIjxpU1KGp39T3TUdDK/L9tMasCAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLmNlcmVxLmZyhiNodHRwczovL2lkcC5jZXJlcS5mci9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8nfoSUP0/WYyq31ReN3zCpK32XAwDQYJ
+KoZIhvcNAQEFBQADggEBAIx3XQUabG1j7RIk67rwMEIXqeYNGt1eakcqwwaq4UKG
+4hSJbUUoR+MET7C6PrvKq2lafC4Za14xO9CjFFnuroCReSJ9pfRV6hR+1qnpwhhB
+GhTgaMJY1QPLfvI12pJjFf5deMIZ2Uet70h+haXLyiimkezT3lzsvT3DGVkD8BnK
+OBtxuHB99XtrB8VrDGqpw5x7VuiiApy5MeMlduhrXskS4+V2q5TOs4jbcrEc78iy
+Vhfsf5Rcol2AkYmeLthOcledgXQtj0r0mOxA1FDH3NBuCBKavpg20gnMlZ8gfAG1
+wsA88wxSrNn+0crrQBnCCoFM6QgGRbFes23UYMEEbw0=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cereq.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">CEREQ - Centre d'études et de recherches sur les qualifications</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CEREQ - Centre d'études et de recherches sur les qualifications</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean Pele</md:SurName>
+    <md:EmailAddress>pele@cereq.fr</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
new file mode 100644
index 00000000..c5b07b53
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="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>
+  </md:Extensions>
+  <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp.chalmers.se" 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" xsi:type="fed:ApplicationServiceType">
+    <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/claims/CommonName">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/claims/EmailAddress">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/claims/Group">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/claims/UPN">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname">
+        <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" ServiceDisplayName="idp.chalmers.se" 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" xsi:type="fed:SecurityTokenServiceType">
+    <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/claims/CommonName">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/claims/EmailAddress">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/claims/Group">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/claims/UPN">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod">
+        <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" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid">
+        <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" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname">
+        <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:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+            <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>
+    </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" FriendlyName="E-Mail Address" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Given Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="UPN" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Common Name" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x E-Mail Address" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x UPN" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Role" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Surname" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="PPID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name ID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication time stamp" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication method" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only group SID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Windows account name" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+  </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:EmailAddress>nrq@chalmers.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Chalmers</md:Company>
+    <md:EmailAddress>biorn@chalmers.se</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
new file mode 100644
index 00000000..20b57c70
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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
+						IFNlcnZpY2VzMR8wHQYDVQQDDBZpZHAuY2hlc3RlcmZpZWxkLmFjLnVrMB4XDTE0
+						MDkwMzA3MzI1MFoXDTI0MDgzMTA3MzI1MFowgZAxCzAJBgNVBAYTAkdCMRMwEQYD
+						VQQIDApEZXJieXNoaXJlMRUwEwYDVQQHDAxDaGVzdGVyZmllbGQxHTAbBgNVBAoM
+						FENoZXN0ZXJmaWVsZCBDb2xsZWdlMRUwEwYDVQQLDAxJQ1QgU2VydmljZXMxHzAd
+						BgNVBAMMFmlkcC5jaGVzdGVyZmllbGQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQDQ4RgYUZeGBKe+Fhgtg9h00S6vTVBeD8923xUfwF53XKbu
+						NvfQq3331N0ELndolFPFknRdJt0tfUxlpqa9GospV+JJ3tIv6MrpVbkOZyxPI5Fd
+						Ja1lc+5gkw/1S7k8dWJVlN1pcXrV9XBxIcANKsVZG0smM1H8cuenopMfCWC9PdNE
+						TJzU/NvNthQizV4dEC5SP2/MVBUTvltN2JUq0/SjVl0GyKe4lHO6FVsKo5SlIEx/
+						pUVCiyTufkaCf+PhULsOlgdGYd0NIT5pmnL58LRVbF9EqDKHeTcqJeSkfKTedwVN
+						wzvU3wtdh8c7Ub5oODs50Ec5ast+oyksmhCc5f0fAgMBAAGjezB5MAkGA1UdEwQC
+						MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
+						MB0GA1UdDgQWBBRwFnwr6pO2a5pd2/7uh8/ktJxREDAfBgNVHSMEGDAWgBRwFnwr
+						6pO2a5pd2/7uh8/ktJxREDANBgkqhkiG9w0BAQUFAAOCAQEANhffi0UUOoXQPaPg
+						ayl8ylOUKb6ne6GyeE0qPiQG21JR+ndijGw9WkyVc62cvDJBrU9tXUhmxjdsd+Ro
+						zyZvVHL+pQaym/nPu6XoNHdjed68b5vVc0d7ImDP2Pre3VgGdpfCxWCHVmC6kCG7
+						wRwnF/Le1YKLChloc++jgu0mSFozmws0xT8jHZC/Dl6+vERzgcVWY4raB6Z4qY19
+						2GwOn1AMDj0vpiTWn7fvv9hivJLcJ45DLMG9ItiAQqaXsgmLGUrLsQPV/waJBcWn
+						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>
+						MIIEIDCCAwigAwIBAgIJAI1fOA60F77hMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
+						VQQGEwJHQjETMBEGA1UECAwKRGVyYnlzaGlyZTEVMBMGA1UEBwwMQ2hlc3RlcmZp
+						ZWxkMR0wGwYDVQQKDBRDaGVzdGVyZmllbGQgQ29sbGVnZTEVMBMGA1UECwwMSUNU
+						IFNlcnZpY2VzMR8wHQYDVQQDDBZpZHAuY2hlc3RlcmZpZWxkLmFjLnVrMB4XDTE0
+						MDkwMzA3MzI1MFoXDTI0MDgzMTA3MzI1MFowgZAxCzAJBgNVBAYTAkdCMRMwEQYD
+						VQQIDApEZXJieXNoaXJlMRUwEwYDVQQHDAxDaGVzdGVyZmllbGQxHTAbBgNVBAoM
+						FENoZXN0ZXJmaWVsZCBDb2xsZWdlMRUwEwYDVQQLDAxJQ1QgU2VydmljZXMxHzAd
+						BgNVBAMMFmlkcC5jaGVzdGVyZmllbGQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQDQ4RgYUZeGBKe+Fhgtg9h00S6vTVBeD8923xUfwF53XKbu
+						NvfQq3331N0ELndolFPFknRdJt0tfUxlpqa9GospV+JJ3tIv6MrpVbkOZyxPI5Fd
+						Ja1lc+5gkw/1S7k8dWJVlN1pcXrV9XBxIcANKsVZG0smM1H8cuenopMfCWC9PdNE
+						TJzU/NvNthQizV4dEC5SP2/MVBUTvltN2JUq0/SjVl0GyKe4lHO6FVsKo5SlIEx/
+						pUVCiyTufkaCf+PhULsOlgdGYd0NIT5pmnL58LRVbF9EqDKHeTcqJeSkfKTedwVN
+						wzvU3wtdh8c7Ub5oODs50Ec5ast+oyksmhCc5f0fAgMBAAGjezB5MAkGA1UdEwQC
+						MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
+						MB0GA1UdDgQWBBRwFnwr6pO2a5pd2/7uh8/ktJxREDAfBgNVHSMEGDAWgBRwFnwr
+						6pO2a5pd2/7uh8/ktJxREDANBgkqhkiG9w0BAQUFAAOCAQEANhffi0UUOoXQPaPg
+						ayl8ylOUKb6ne6GyeE0qPiQG21JR+ndijGw9WkyVc62cvDJBrU9tXUhmxjdsd+Ro
+						zyZvVHL+pQaym/nPu6XoNHdjed68b5vVc0d7ImDP2Pre3VgGdpfCxWCHVmC6kCG7
+						wRwnF/Le1YKLChloc++jgu0mSFozmws0xT8jHZC/Dl6+vERzgcVWY4raB6Z4qY19
+						2GwOn1AMDj0vpiTWn7fvv9hivJLcJ45DLMG9ItiAQqaXsgmLGUrLsQPV/waJBcWn
+						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>Richard</md:GivenName>
+    <md:SurName>Houghton</md:SurName>
+    <md:EmailAddress>mailto:houghtonr@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
new file mode 100644
index 00000000..9b07d337
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.chichester.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCPypPq8ApF4OPt
+						ENNcoWFIOnyJtNDbGoaRRlMTg7CDf1HkQb6Y9+zeK3gg1HC4PdI4Hxw+gqyhdeLE
+						Op9uKvu9Mc2vx3ekfzQ5gbt9m0XgmnBAo+Pp21nOIwwQHRM3bLmld1A9jW3hcgA6
+						MIjuJ6SeETWpbuFx00KNUXO7BuxBtvnhPesp1NRK03yHSI9T+pevq1Im1U0aplHP
+						747tAS7/lGZBk/f3Xa0iCkriO6/9fEuXianylagIyJnvLBTImwMHPFYU1hrcpBez
+						nfHYpHmUEQ26ol83ZrwT+oDgY6mBsZKcMp4pn9aBVxqXSIP9wB3C0kMYzTPvj6vI
+						3tAIJ0krAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcC5jaGljaGVzdGVyLmFjLnVr
+						hitodHRwczovL2lkcC5jaGljaGVzdGVyLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBQVTtCrfHJjvTZ+wDTp5oNJlTJRRjANBgkqhkiG9w0BAQUFAAOCAQEA
+						O3KMZhp4iLbEGamacfT0kOrh9IDuhcjHlwRbATf7VBW2IuHZbBPNO11Z8Km6a2g0
+						NDIHuc8jPYxY6rt//kjQwf4UEGxjiYwuplGsiN9FJfHcbXUkt9+8HUJpCX2C/jcg
+						yEX9NGRp+4VGnqLV5ddJcFa7hH2g08bj6hfNBKQcmSdeuWAKR/XBM6xCW9yNskpb
+						GMvVNbPQiLbkXCaEqgu3qOHuUXExez+BYT3WL7XL4yencFGtbZccgDMjS5zk3gYL
+						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>
+						MIIDPDCCAiSgAwIBAgIVAJjvxUK9DXhdlH/EkMId7VAbUERjMA0GCSqGSIb3DQEB
+						BQUAMB8xHTAbBgNVBAMTFGlkcC5jaGljaGVzdGVyLmFjLnVrMB4XDTEzMDcwMzE1
+						MjUxNloXDTMzMDcwMzE1MjUxNlowHzEdMBsGA1UEAxMUaWRwLmNoaWNoZXN0ZXIu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCPypPq8ApF4OPt
+						ENNcoWFIOnyJtNDbGoaRRlMTg7CDf1HkQb6Y9+zeK3gg1HC4PdI4Hxw+gqyhdeLE
+						Op9uKvu9Mc2vx3ekfzQ5gbt9m0XgmnBAo+Pp21nOIwwQHRM3bLmld1A9jW3hcgA6
+						MIjuJ6SeETWpbuFx00KNUXO7BuxBtvnhPesp1NRK03yHSI9T+pevq1Im1U0aplHP
+						747tAS7/lGZBk/f3Xa0iCkriO6/9fEuXianylagIyJnvLBTImwMHPFYU1hrcpBez
+						nfHYpHmUEQ26ol83ZrwT+oDgY6mBsZKcMp4pn9aBVxqXSIP9wB3C0kMYzTPvj6vI
+						3tAIJ0krAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcC5jaGljaGVzdGVyLmFjLnVr
+						hitodHRwczovL2lkcC5jaGljaGVzdGVyLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBQVTtCrfHJjvTZ+wDTp5oNJlTJRRjANBgkqhkiG9w0BAQUFAAOCAQEA
+						O3KMZhp4iLbEGamacfT0kOrh9IDuhcjHlwRbATf7VBW2IuHZbBPNO11Z8Km6a2g0
+						NDIHuc8jPYxY6rt//kjQwf4UEGxjiYwuplGsiN9FJfHcbXUkt9+8HUJpCX2C/jcg
+						yEX9NGRp+4VGnqLV5ddJcFa7hH2g08bj6hfNBKQcmSdeuWAKR/XBM6xCW9yNskpb
+						GMvVNbPQiLbkXCaEqgu3qOHuUXExez+BYT3WL7XL4yencFGtbZccgDMjS5zk3gYL
+						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>
diff --git a/swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..e577a3fb
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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="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>
+					      MIIDHDCCAgSgAwIBAgIVAIpsWCg8y/CbjokdRD9xw1tntEMjMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC5jaXJhZC5mcjAeFw0xMTA5MDkxMjEwMTZaFw0z
+MTA5MDkxMjEwMTZaMBcxFTATBgNVBAMTDGlkcC5jaXJhZC5mcjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAIK0BA0EwHBB7StG57NlgpNBqyQEM1Cg9QYw
+pNUPFGF4Jdxkho0yFmo5P++oTVHNl0XAYuDYXDOSShnwBuaqBETJJ2oXmHNtL1/J
+C8T/hXboKgs0gRz8vmSah7xaEFtsGrlhWfomY7JJg0tLfEOioP8gtcXDoujhsnmg
+k31s1ItCWqLMyKfUVJq/UjldS3yO4UHvWaM72Pr8/BhaeboLsAodOVuuARyB53cN
+lK5lbJ+wv/ar/OvKZQ6J+N38jRID9gOfbX9FJpEkxvsw8JrAigyVXoxXqwGeHSt+
+ku5mPLHOkcfeqoDOYlZAGOhr0Dsgq58TdYyfDfd/vvkUjhGXDUECAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLmNpcmFkLmZyhiNodHRwczovL2lkcC5jaXJhZC5mci9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUqRmJdkayB7m9gT7Hlj7ZWMvTxj4wDQYJ
+KoZIhvcNAQEFBQADggEBACYw1tFvkAe2ITVFgPC+DObsRMo+0IsLTDp04SDoic6p
+8LwkBedIsHMast0CX3oVHM31Wo9n1boW8qDJ+cd5u5adT9ZdxYiqqH6VCF3xSLr9
+I3Fjlm4KLIDYh9w7jhOIPPkvK5491naqIGcyrwxkpmttm2LsdUTrk3Fc0LylLBly
+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://unknown.site.com</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
new file mode 100644
index 00000000..22fb7a9b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cirencester.ac.uk-oala-metadata.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIDTjCCAjagAwIBAgIIRKejSpcxL9UwDQYJKoZIhvcNAQEFBQAwPjEcMBoGA1UE
+						CgwTQ2lyZW5jZXN0ZXIgQ29sbGVnZTEeMBwGA1UEAwwVaWRwLmNpcmVuY2VzdGVy
+						LmFjLnVrMB4XDTE0MDcyMTA5NTIwNFoXDTI0MDcyMTA5NTIwNFowPjEcMBoGA1UE
+						CgwTQ2lyZW5jZXN0ZXIgQ29sbGVnZTEeMBwGA1UEAwwVaWRwLmNpcmVuY2VzdGVy
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqBjd6qPpatXK
+						rzW4mAym0qYPqX4p7ZNX5LynuSpZupD+p1apZmRJDIPLQZUfIV5k6b0hvu+jPFCo
+						ChQC74PBjEh+WdWDoG/l3Ab1w81GA5MjKIi3kvd98eAuBRdDp7kTy8xU8HeMZ/Jb
+						gjgHgkvJIOhA7KAEuEn3iz8DF+sAhtzNYO/2YXlULo+qdqSPKu/exsddEiSOlrxv
+						B2ocRmcxjstHHWbl709CoxP3Uf6tmc8uQKTnqNF/abYQBofx1rEk2DIT6x+Qnlj9
+						MBpxme2BlRY2QFYsWQBgaMgUiaxHXFYmBAA2B4+JbJIMbXx+OLHguAyv8srAb0TV
+						nHLOWLgOxQIDAQABo1AwTjAdBgNVHQ4EFgQU2MzRSQipMAAPr5CCC2qd8JujL9Uw
+						HwYDVR0jBBgwFoAU2MzRSQipMAAPr5CCC2qd8JujL9UwDAYDVR0TBAUwAwEB/zAN
+						BgkqhkiG9w0BAQUFAAOCAQEALLzd9/KWXmLO2bLM0bxMC3/xmGxMJFbcS3F+Bf/u
+						XRFDiZDWvOa4bS01h95kGcR1geN2Ag0414B1nF8jHvQ+px7+bjzJgakGeUtgbo2W
+						kyY++i1YitrgSbBp5m50a1kBh/gRhBsFx9qU14XEft11f1Eht5Q2L52B6S89HB8I
+						SzbB/2SijZht33CJYqDVG9SKLhoVI27MCRVNUlmXFFvUXi05KFDbmtadPkSAR5R0
+						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>
+						MIIDTjCCAjagAwIBAgIIRKejSpcxL9UwDQYJKoZIhvcNAQEFBQAwPjEcMBoGA1UE
+						CgwTQ2lyZW5jZXN0ZXIgQ29sbGVnZTEeMBwGA1UEAwwVaWRwLmNpcmVuY2VzdGVy
+						LmFjLnVrMB4XDTE0MDcyMTA5NTIwNFoXDTI0MDcyMTA5NTIwNFowPjEcMBoGA1UE
+						CgwTQ2lyZW5jZXN0ZXIgQ29sbGVnZTEeMBwGA1UEAwwVaWRwLmNpcmVuY2VzdGVy
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqBjd6qPpatXK
+						rzW4mAym0qYPqX4p7ZNX5LynuSpZupD+p1apZmRJDIPLQZUfIV5k6b0hvu+jPFCo
+						ChQC74PBjEh+WdWDoG/l3Ab1w81GA5MjKIi3kvd98eAuBRdDp7kTy8xU8HeMZ/Jb
+						gjgHgkvJIOhA7KAEuEn3iz8DF+sAhtzNYO/2YXlULo+qdqSPKu/exsddEiSOlrxv
+						B2ocRmcxjstHHWbl709CoxP3Uf6tmc8uQKTnqNF/abYQBofx1rEk2DIT6x+Qnlj9
+						MBpxme2BlRY2QFYsWQBgaMgUiaxHXFYmBAA2B4+JbJIMbXx+OLHguAyv8srAb0TV
+						nHLOWLgOxQIDAQABo1AwTjAdBgNVHQ4EFgQU2MzRSQipMAAPr5CCC2qd8JujL9Uw
+						HwYDVR0jBBgwFoAU2MzRSQipMAAPr5CCC2qd8JujL9UwDAYDVR0TBAUwAwEB/zAN
+						BgkqhkiG9w0BAQUFAAOCAQEALLzd9/KWXmLO2bLM0bxMC3/xmGxMJFbcS3F+Bf/u
+						XRFDiZDWvOa4bS01h95kGcR1geN2Ag0414B1nF8jHvQ+px7+bjzJgakGeUtgbo2W
+						kyY++i1YitrgSbBp5m50a1kBh/gRhBsFx9qU14XEft11f1Eht5Q2L52B6S89HB8I
+						SzbB/2SijZht33CJYqDVG9SKLhoVI27MCRVNUlmXFFvUXi05KFDbmtadPkSAR5R0
+						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>
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
new file mode 100644
index 00000000..f43cfcfe
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.citybathcoll.ac.uk-oala-metadata.xml
@@ -0,0 +1,80 @@
+<?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>
+      <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>
+						MIIDUjCCAjqgAwIBAgIIfbSOFSC/ASkwDQYJKoZIhvcNAQEFBQAwQDEdMBsGA1UE
+						CgwUQ2l0eSBvZiBCYXRoIENvbGxlZ2UxHzAdBgNVBAMMFmlkcC5jaXR5YmF0aGNv
+						bGwuYWMudWswHhcNMTMwNDE4MTMyMTUzWhcNMjMwNDE4MTMyMTUzWjBAMR0wGwYD
+						VQQKDBRDaXR5IG9mIEJhdGggQ29sbGVnZTEfMB0GA1UEAwwWaWRwLmNpdHliYXRo
+						Y29sbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIpNwR6K
+						qvXHyj9FgnJ49oM25jOaqYfwXfc4EIq/1wEmuulwRVz0YdizYN0nQZNyujfFi7Wn
+						V+1r14vOg6Zke+VT6u4jlL9H+reg8gieN/ybVIMNqzfddY7a82N/ZABoEQ1Wckol
+						GAjcYrxO2hW71AKIixUT0S0sw8zpCCTntvqIhw+SB7fDT1v5oN0snLPplTdfwEk2
+						lLLEECZnf0IP/+5o76K/7KYO/+LrKS0eSrFQwQxz1IX6Vh413lMwa597gAXT2IKn
+						aYPAStni01WUFPuAs5eVWoXtAEx7sbhmPoxmhFGo4xVwhTVzJLo19QdagBb9jSRa
+						QaX+wKN6Ykp2RQsCAwEAAaNQME4wHQYDVR0OBBYEFHCktVxixSE9H7lUY6M2eMtN
+						KdKjMB8GA1UdIwQYMBaAFHCktVxixSE9H7lUY6M2eMtNKdKjMAwGA1UdEwQFMAMB
+						Af8wDQYJKoZIhvcNAQEFBQADggEBAEVLIzBFQ9u2sQ6esQMyWGZ74U5lgWqKOrLy
+						hjRFKFlEmL14S3w9b/Lj/KOGQ7QyH4P8bc7pnApftQSFTpCtLIjRRgSyuvoTUYXX
+						9mnEB4xpMDZfoHd+CP3Ipcfg08KTh1G9BEFJEeQW4zVxXp1YHd32/XBvT6vfxrKE
+						7zQPX/4mWDTmOTOs+7LmxhioeAeSgPbRh8waA0O3YRJCZ4Sw/Fel8wfmnu9X6DAH
+						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>
+						MIIDUjCCAjqgAwIBAgIIfbSOFSC/ASkwDQYJKoZIhvcNAQEFBQAwQDEdMBsGA1UE
+						CgwUQ2l0eSBvZiBCYXRoIENvbGxlZ2UxHzAdBgNVBAMMFmlkcC5jaXR5YmF0aGNv
+						bGwuYWMudWswHhcNMTMwNDE4MTMyMTUzWhcNMjMwNDE4MTMyMTUzWjBAMR0wGwYD
+						VQQKDBRDaXR5IG9mIEJhdGggQ29sbGVnZTEfMB0GA1UEAwwWaWRwLmNpdHliYXRo
+						Y29sbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIpNwR6K
+						qvXHyj9FgnJ49oM25jOaqYfwXfc4EIq/1wEmuulwRVz0YdizYN0nQZNyujfFi7Wn
+						V+1r14vOg6Zke+VT6u4jlL9H+reg8gieN/ybVIMNqzfddY7a82N/ZABoEQ1Wckol
+						GAjcYrxO2hW71AKIixUT0S0sw8zpCCTntvqIhw+SB7fDT1v5oN0snLPplTdfwEk2
+						lLLEECZnf0IP/+5o76K/7KYO/+LrKS0eSrFQwQxz1IX6Vh413lMwa597gAXT2IKn
+						aYPAStni01WUFPuAs5eVWoXtAEx7sbhmPoxmhFGo4xVwhTVzJLo19QdagBb9jSRa
+						QaX+wKN6Ykp2RQsCAwEAAaNQME4wHQYDVR0OBBYEFHCktVxixSE9H7lUY6M2eMtN
+						KdKjMB8GA1UdIwQYMBaAFHCktVxixSE9H7lUY6M2eMtNKdKjMAwGA1UdEwQFMAMB
+						Af8wDQYJKoZIhvcNAQEFBQADggEBAEVLIzBFQ9u2sQ6esQMyWGZ74U5lgWqKOrLy
+						hjRFKFlEmL14S3w9b/Lj/KOGQ7QyH4P8bc7pnApftQSFTpCtLIjRRgSyuvoTUYXX
+						9mnEB4xpMDZfoHd+CP3Ipcfg08KTh1G9BEFJEeQW4zVxXp1YHd32/XBvT6vfxrKE
+						7zQPX/4mWDTmOTOs+7LmxhioeAeSgPbRh8waA0O3YRJCZ4Sw/Fel8wfmnu9X6DAH
+						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">City of Bath College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">City of 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:elliottn@citybathcoll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Justin</md:GivenName>
+    <md:SurName>Haskins</md:SurName>
+    <md:EmailAddress>mailto:haskinsj@citybathcoll.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
new file mode 100644
index 00000000..3442afb1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cityofbristol.ac.uk-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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
+						A1UEAxMXaWRwLmNpdHlvZmJyaXN0b2wuYWMudWsxLjAsBgkqhkiG9w0BCQEWH2l0
+						LmhlbHBkZXNrQGNpdHlvZmJyaXN0b2wuYWMudWswHhcNMTMwOTA5MTQyMTA2WhcN
+						MjMwOTA3MTQyMTA2WjCBszELMAkGA1UEBhMCR0IxEDAOBgNVBAgTB0JyaXN0b2wx
+						EDAOBgNVBAcTB0JyaXN0b2wxIDAeBgNVBAoTF0NpdHkgb2YgQnJpc3RvbCBDb2xs
+						ZWdlMQwwCgYDVQQLEwNJQ1QxIDAeBgNVBAMTF2lkcC5jaXR5b2ZicmlzdG9sLmFj
+						LnVrMS4wLAYJKoZIhvcNAQkBFh9pdC5oZWxwZGVza0BjaXR5b2ZicmlzdG9sLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxEl6P5t+xyRzY0Wa
+						bd/a2MC83Kxrc97VfUi3fMh2+FPQ/Dgu7o7KwTL+HhC7cQNJUHyTRUMV43TrIRPs
+						LjHtCzVi0XYQSBE88p77aVX7K/OEcrxkKdQ/pIAafw9pXeSc1FAu48npCypP6w3b
+						4cFRd0SzbYHGThMBDVoSqraK6c2lB1g2z4f0q4IP6RmM3/5UCqO2vw4wKNLfvfVV
+						tC9fu+UHv1hMvBjb0JLpRNQk/RWQSIXJmAycpzAzbnUJnEtief8xktMbcsWRrJL4
+						T0xeFFlfH6vf3MMaJ2IvRuIqr5yf/RqACda27qKxuxND3TXb2ZFBYv9p8ECxWmda
+						0GnIdQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
+						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUzvFe/y/teU8C+1OsLgTj
+						kDxpTrgwHwYDVR0jBBgwFoAUzvFe/y/teU8C+1OsLgTjkDxpTrgwDQYJKoZIhvcN
+						AQEFBQADggEBAK0jlGscDnh+m84UTJ364uJ5tzDQaaVQ+OhjQBGQV9m2uRj4t2EU
+						/Exc05LVgRK14pBWwlJ6EaJm7y5PUOQRD7PiCTq3nIEObvbg7X+8/Cj3KHrquSBE
+						Ww9GQ/d4MSbRMJISEkaCy4onoTlg4ulzzkSChpqJeRyk+acUCVYcfZxW2aHcAdFm
+						pPyEOMOQGHUDtD+9c1fb2ICmcVs6vHM05QXaXzAP5wS66+Z2L3wI0RPHJji8RMzT
+						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>
+						MIIEZjCCA06gAwIBAgIJAI1toHyODheqMA0GCSqGSIb3DQEBBQUAMIGzMQswCQYD
+						VQQGEwJHQjEQMA4GA1UECBMHQnJpc3RvbDEQMA4GA1UEBxMHQnJpc3RvbDEgMB4G
+						A1UEChMXQ2l0eSBvZiBCcmlzdG9sIENvbGxlZ2UxDDAKBgNVBAsTA0lDVDEgMB4G
+						A1UEAxMXaWRwLmNpdHlvZmJyaXN0b2wuYWMudWsxLjAsBgkqhkiG9w0BCQEWH2l0
+						LmhlbHBkZXNrQGNpdHlvZmJyaXN0b2wuYWMudWswHhcNMTMwOTA5MTQyMTA2WhcN
+						MjMwOTA3MTQyMTA2WjCBszELMAkGA1UEBhMCR0IxEDAOBgNVBAgTB0JyaXN0b2wx
+						EDAOBgNVBAcTB0JyaXN0b2wxIDAeBgNVBAoTF0NpdHkgb2YgQnJpc3RvbCBDb2xs
+						ZWdlMQwwCgYDVQQLEwNJQ1QxIDAeBgNVBAMTF2lkcC5jaXR5b2ZicmlzdG9sLmFj
+						LnVrMS4wLAYJKoZIhvcNAQkBFh9pdC5oZWxwZGVza0BjaXR5b2ZicmlzdG9sLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxEl6P5t+xyRzY0Wa
+						bd/a2MC83Kxrc97VfUi3fMh2+FPQ/Dgu7o7KwTL+HhC7cQNJUHyTRUMV43TrIRPs
+						LjHtCzVi0XYQSBE88p77aVX7K/OEcrxkKdQ/pIAafw9pXeSc1FAu48npCypP6w3b
+						4cFRd0SzbYHGThMBDVoSqraK6c2lB1g2z4f0q4IP6RmM3/5UCqO2vw4wKNLfvfVV
+						tC9fu+UHv1hMvBjb0JLpRNQk/RWQSIXJmAycpzAzbnUJnEtief8xktMbcsWRrJL4
+						T0xeFFlfH6vf3MMaJ2IvRuIqr5yf/RqACda27qKxuxND3TXb2ZFBYv9p8ECxWmda
+						0GnIdQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
+						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUzvFe/y/teU8C+1OsLgTj
+						kDxpTrgwHwYDVR0jBBgwFoAUzvFe/y/teU8C+1OsLgTjkDxpTrgwDQYJKoZIhvcN
+						AQEFBQADggEBAK0jlGscDnh+m84UTJ364uJ5tzDQaaVQ+OhjQBGQV9m2uRj4t2EU
+						/Exc05LVgRK14pBWwlJ6EaJm7y5PUOQRD7PiCTq3nIEObvbg7X+8/Cj3KHrquSBE
+						Ww9GQ/d4MSbRMJISEkaCy4onoTlg4ulzzkSChpqJeRyk+acUCVYcfZxW2aHcAdFm
+						pPyEOMOQGHUDtD+9c1fb2ICmcVs6vHM05QXaXzAP5wS66+Z2L3wI0RPHJji8RMzT
+						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>
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
new file mode 100644
index 00000000..7b2a8406
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cityofglasgowcollege.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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
+						aXR5b2ZnbGFzZ293Y29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAJthr2byyj0MBLQhYUMjKtn4jUJzN+1/3bzxFjCYtgPf6rQqhG2e
+						gaoOkDx2r3Tqq/Rh66oQYqqR/+T02JzQKFaUrYllBNDLRmoY6ks52ayLTrhY3kZy
+						VYntEzsKiRZ15lPMDxGs/LpyXoxW2DfWhUF6clXeyTUJwLBVSM1eHvtXcaMpf85F
+						+F3zfdt+ReHqBM2gzy/6zN9QPi3u6UUSDkKHjkxjnn4Uf2vyo8WREjildb4Xdon2
+						Tf3Gmg3zfLgs0qZI2X5+Z/KbSu+Dp1MjnannE+MKoqPU6cjc13CFxXR3CDozwrAc
+						8O7tJktCHDTMqkBEwFCijV70OTukkapjP8ECAwEAAaOBhDCBgTBgBgNVHREEWTBX
+						gh5pZHAuY2l0eW9mZ2xhc2dvd2NvbGxlZ2UuYWMudWuGNWh0dHBzOi8vaWRwLmNp
+						dHlvZmdsYXNnb3djb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQW
+						BBRAcYAdOlKRaOjN2yAIoJy7Q1hAyjANBgkqhkiG9w0BAQUFAAOCAQEAQTWIeg+3
+						VunEEEvdbvvhcDwMJkzK+AXoCMU9CwXn0fIpjNCV9/sGLdKLJr9RlYk3mnOWRwR6
+						JNWOWRBe9OVw7t59LY0orNSLGR6hK1lv74P7sjmwy3wOuN1suPGYkgj9Z20n7Q/j
+						3P5yoL9o3OR5qheUO1q/nB9BSf3PZMWtgGHuas4xd9H611JaFXn3Twol6IZfqfjP
+						JTx/ZE9prDzEYog9nZyWMrazcMRg0ZKNvgd7vuk6x8VIZYTUYONQ2h0h+Crz1dz6
+						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>
+						MIIDZjCCAk6gAwIBAgIVAI38uSRnFA9tDvzGsjh8FcUJn5XSMA0GCSqGSIb3DQEB
+						BQUAMCkxJzAlBgNVBAMTHmlkcC5jaXR5b2ZnbGFzZ293Y29sbGVnZS5hYy51azAe
+						Fw0xNDA1MTkwOTIyMDVaFw0zNDA1MTkwOTIyMDVaMCkxJzAlBgNVBAMTHmlkcC5j
+						aXR5b2ZnbGFzZ293Y29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAJthr2byyj0MBLQhYUMjKtn4jUJzN+1/3bzxFjCYtgPf6rQqhG2e
+						gaoOkDx2r3Tqq/Rh66oQYqqR/+T02JzQKFaUrYllBNDLRmoY6ks52ayLTrhY3kZy
+						VYntEzsKiRZ15lPMDxGs/LpyXoxW2DfWhUF6clXeyTUJwLBVSM1eHvtXcaMpf85F
+						+F3zfdt+ReHqBM2gzy/6zN9QPi3u6UUSDkKHjkxjnn4Uf2vyo8WREjildb4Xdon2
+						Tf3Gmg3zfLgs0qZI2X5+Z/KbSu+Dp1MjnannE+MKoqPU6cjc13CFxXR3CDozwrAc
+						8O7tJktCHDTMqkBEwFCijV70OTukkapjP8ECAwEAAaOBhDCBgTBgBgNVHREEWTBX
+						gh5pZHAuY2l0eW9mZ2xhc2dvd2NvbGxlZ2UuYWMudWuGNWh0dHBzOi8vaWRwLmNp
+						dHlvZmdsYXNnb3djb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQW
+						BBRAcYAdOlKRaOjN2yAIoJy7Q1hAyjANBgkqhkiG9w0BAQUFAAOCAQEAQTWIeg+3
+						VunEEEvdbvvhcDwMJkzK+AXoCMU9CwXn0fIpjNCV9/sGLdKLJr9RlYk3mnOWRwR6
+						JNWOWRBe9OVw7t59LY0orNSLGR6hK1lv74P7sjmwy3wOuN1suPGYkgj9Z20n7Q/j
+						3P5yoL9o3OR5qheUO1q/nB9BSf3PZMWtgGHuas4xd9H611JaFXn3Twol6IZfqfjP
+						JTx/ZE9prDzEYog9nZyWMrazcMRg0ZKNvgd7vuk6x8VIZYTUYONQ2h0h+Crz1dz6
+						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>
diff --git a/swamid-interfederations-2.0/idp.citysun.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.citysun.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..0c264906
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.citysun.ac.uk-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						Yy51azAeFw0xNDA2MDMwOTQzNDFaFw0zNDA1MjkwOTQzNDFaMHAxCzAJBgNVBAYT
+						AkdCMRMwEQYDVQQIDApTdW5kZXJsYW5kMRMwEQYDVQQHDApTdW5kZXJsYW5kMRsw
+						GQYDVQQKDBJTdW5kZXJsYW5kIENvbGxlZ2UxGjAYBgNVBAMMEWlkcC5jaXR5c3Vu
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAre4HrH3LHyb0
+						9qb9U8p4/8prj/rZrN7FJDyMeeYC6a9/S+PMk+iQXk3h52l1kudDn8G67kSOEbhc
+						HTAenOXlIF9r3oeBjrpc6IPwzMsM8jX0h+Gs5dOBtu1HrpVfy2XwYuDjkM5J0Pzx
+						eYP2qvZFDsZiwzj4t+1Cq1G74dLpjQmyP7P6jrNf05wsXdzL12d7t8KWk14FuOIQ
+						lEDON2GUaHx2rgi1lyG5UqqILWAhAqj+SxIZ+33nVXG+xrhFPJT8BIrkeMmlP88l
+						ck8r1qF9/K8mkA5qY9HOJKjnI4yk1tdIfGG3/u83OUwuoFXMlbj8Q8jbPVbDOeK2
+						E7HuEfA6SwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBufJMekr7JjV7klcgwXNm8
+						KNnAaK7noWqHerMF5/ZQShvaDVTlkwzgonnZI3ZbmUJBk6a2Tu3b4uwCPsGvQ+Hj
+						mQssqbYEVWnN0rNeHlQkS3haXZHFXX4wlpTdbv43fAtrxEG+8Jp8QKitKhG8GAtB
+						bto0gBmpteW4fc8opi/+U8K1OfnTRtGOnZfkfcfOKc1LZRhN8PvToLeOStRPNdLP
+						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>
+						MIIDXDCCAkQCCQCvtyS3mHeGmjANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
+						QjETMBEGA1UECAwKU3VuZGVybGFuZDETMBEGA1UEBwwKU3VuZGVybGFuZDEbMBkG
+						A1UECgwSU3VuZGVybGFuZCBDb2xsZWdlMRowGAYDVQQDDBFpZHAuY2l0eXN1bi5h
+						Yy51azAeFw0xNDA2MDMwOTQzNDFaFw0zNDA1MjkwOTQzNDFaMHAxCzAJBgNVBAYT
+						AkdCMRMwEQYDVQQIDApTdW5kZXJsYW5kMRMwEQYDVQQHDApTdW5kZXJsYW5kMRsw
+						GQYDVQQKDBJTdW5kZXJsYW5kIENvbGxlZ2UxGjAYBgNVBAMMEWlkcC5jaXR5c3Vu
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAre4HrH3LHyb0
+						9qb9U8p4/8prj/rZrN7FJDyMeeYC6a9/S+PMk+iQXk3h52l1kudDn8G67kSOEbhc
+						HTAenOXlIF9r3oeBjrpc6IPwzMsM8jX0h+Gs5dOBtu1HrpVfy2XwYuDjkM5J0Pzx
+						eYP2qvZFDsZiwzj4t+1Cq1G74dLpjQmyP7P6jrNf05wsXdzL12d7t8KWk14FuOIQ
+						lEDON2GUaHx2rgi1lyG5UqqILWAhAqj+SxIZ+33nVXG+xrhFPJT8BIrkeMmlP88l
+						ck8r1qF9/K8mkA5qY9HOJKjnI4yk1tdIfGG3/u83OUwuoFXMlbj8Q8jbPVbDOeK2
+						E7HuEfA6SwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBufJMekr7JjV7klcgwXNm8
+						KNnAaK7noWqHerMF5/ZQShvaDVTlkwzgonnZI3ZbmUJBk6a2Tu3b4uwCPsGvQ+Hj
+						mQssqbYEVWnN0rNeHlQkS3haXZHFXX4wlpTdbv43fAtrxEG+8Jp8QKitKhG8GAtB
+						bto0gBmpteW4fc8opi/+U8K1OfnTRtGOnZfkfcfOKc1LZRhN8PvToLeOStRPNdLP
+						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">City of 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.cnous.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cnous.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..9a78723f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cnous.fr-idp-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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="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>
+					      MIIDHDCCAgSgAwIBAgIVAISouLAcDEdM79Z0SpsLrgjU/8rtMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC5jbm91cy5mcjAeFw0xMjA1MDMxNTU4NTVaFw0z
+MjA1MDMxNTU4NTVaMBcxFTATBgNVBAMTDGlkcC5jbm91cy5mcjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALl+NBrwCB2xYd0y4dbi3QADG3oBYfNLiGJw
+rajvTmKUZaTKrQvgjtesfvM04pSOoMwRjkaG2ae3Pp/5fsuYc83zaOakgWSgc5/j
+zZfJOaxk+RGBofTInmWwgoCqDHGZ4WHLYphzwlLnV8VH6Ca7qa5bR+uEsZeLpICw
+C7d22rk2+llioeyFhwPMQBT9IRydChqGr79B7t1iT7ssTHP9v1ZDgtIB29+gkP4S
+YdzA11oZOJzeaGZXl0h9QsUBBnn6cyUgYE0SEgxBMl6+qlmQAuwrWO24pungPYx3
+C1k0i8xuFF3+98we5US4mQkRitgm0JVvB4pn6TtkgG+RTV+/uz8CAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLmNub3VzLmZyhiNodHRwczovL2lkcC5jbm91cy5mci9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPLiOl86NYkKW2Dz3T05kKwEcuCQwDQYJ
+KoZIhvcNAQEFBQADggEBAA9/88dlu6RIXF2MsXqLOFguSQcRXyjUe7qRbneRLhk7
+3m5pH/AKRWpgfWPllLy1ui8ZgJ3upJg8NDF9pipAXGm9XXUlYwgO/bD91o591iw+
+ffKTKQATF1SxMVKBwNtUOdR7HUaHNgz38w5DNd5DE0ZEAatVFsCbJdYG1WKgFPhU
+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://unknown.site.com</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
new file mode 100644
index 00000000..8afc86b1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cnr.it-idp-shibboleth.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDEzCCAfugAwIBAgIUQn+v41WHgk0kt62N0i1wzsHc0TgwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLmNuci5pdDAeFw0xMDAyMjQwODE1MTBaFw0zMDAy
+MjQwODE1MTBaMBUxEzARBgNVBAMTCmlkcC5jbnIuaXQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDlDQud7JblaNOgr0fuqphs5R2I3dvRfaL1ttm6MlmK
+2/GQZ9M+vn3ACHQoWVxmibPiZSm45Q9cdD3ZOE0GOeFbj6mE5zRlUleFI4mI17iB
+LtcjV4CsdpG2l7MC3Lreh6UEL1xkkjQk2PSMvY8l2x4ojyRsxOQDIsZksvkdLz0P
+L/2YV5+0R7ZSBN6kvWKTfDn38zl3kDuq39GcXphbcaqXlymNSXw7BH7p/Psm+J/C
+aOHFxtZ5CU4TyrCMqXWscNDgtdqWajwFVY7yQzNDHSFwccS6ToY23Mr6kGdfC4Z0
+Sm87uudoPxUKRi9MrWzSYLKjaEGXUF89KXO0UKdHyH2fAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5jbnIuaXSGIWh0dHBzOi8vaWRwLmNuci5pdC9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQU9zuZcJbHOOpslfMMz71HfiXR1iEwDQYJKoZIhvcNAQEF
+BQADggEBAKWK5XLASdpMoZAnAZ0uZfONig7/GQPyEINJpyh4BQj6ioZfbLl9MviB
+dNo0K0YdbE5/8eVQ9W9ZiERf0nGY3eSeJRa1mgxmcZbHtEjn9e8GKrUM39XGmWNX
+T+R15myyOYa+1d1FX4DIjnFhXozMCwOwpiWUgHQAPuSJhlcLKRCgByfYazBFI8Rq
+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>
+MIIDEzCCAfugAwIBAgIUQn+v41WHgk0kt62N0i1wzsHc0TgwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLmNuci5pdDAeFw0xMDAyMjQwODE1MTBaFw0zMDAy
+MjQwODE1MTBaMBUxEzARBgNVBAMTCmlkcC5jbnIuaXQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDlDQud7JblaNOgr0fuqphs5R2I3dvRfaL1ttm6MlmK
+2/GQZ9M+vn3ACHQoWVxmibPiZSm45Q9cdD3ZOE0GOeFbj6mE5zRlUleFI4mI17iB
+LtcjV4CsdpG2l7MC3Lreh6UEL1xkkjQk2PSMvY8l2x4ojyRsxOQDIsZksvkdLz0P
+L/2YV5+0R7ZSBN6kvWKTfDn38zl3kDuq39GcXphbcaqXlymNSXw7BH7p/Psm+J/C
+aOHFxtZ5CU4TyrCMqXWscNDgtdqWajwFVY7yQzNDHSFwccS6ToY23Mr6kGdfC4Z0
+Sm87uudoPxUKRi9MrWzSYLKjaEGXUF89KXO0UKdHyH2fAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5jbnIuaXSGIWh0dHBzOi8vaWRwLmNuci5pdC9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQU9zuZcJbHOOpslfMMz71HfiXR1iEwDQYJKoZIhvcNAQEF
+BQADggEBAKWK5XLASdpMoZAnAZ0uZfONig7/GQPyEINJpyh4BQj6ioZfbLl9MviB
+dNo0K0YdbE5/8eVQ9W9ZiERf0nGY3eSeJRa1mgxmcZbHtEjn9e8GKrUM39XGmWNX
+T+R15myyOYa+1d1FX4DIjnFhXozMCwOwpiWUgHQAPuSJhlcLKRCgByfYazBFI8Rq
+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>
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
new file mode 100644
index 00000000..c0986090
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cnwl.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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>
+      <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
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKw5eKNDVnIjYE4C57t/K2+u+4c/tirp
+						rk9ozEGO0JCSnCq+GcxJm5Mfxs5sM6u919g7BOZZU5zm5sykEvhM1YonMcjzcBsd
+						EHVs78c9Nlv6ZueO5923ArCYybTPTpqZWr9px0XdltBkLafFOWPUt3mUVUglv6X6
+						esMQaiDPAbrG+Nvdo0ZbnlA5tBy7WMNEk6SyB0VhxIN3KDWsTi39tRpNVaroO+VG
+						pdrC31S4g5aropb/27kOTIltrxVokJDLHjo0PMO2o2eKLZvtgYRnL8/XTTXexZyy
+						U85U3G5zPw2jptUHHx1W9Ojs/9rUsp61znAJEXfgMS5iQLl2JwA9EsUCAwEAAaNj
+						MGEwQAYDVR0RBDkwN4IOaWRwLmNud2wuYWMudWuGJWh0dHBzOi8vaWRwLmNud2wu
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBWW2Q/zTBI5/JWM/SHx/Kg2
+						YRleMA0GCSqGSIb3DQEBBQUAA4IBAQAFcWzf6iOnJGNSlIOCJjj6aOoM3wNqLZ7s
+						WAtBhxVb+w2vs5w2mTrgpj24wbfpyQVhCrQjUFLdVmOqyUlpF9A/kJOgUYuq5JZa
+						GeJy1cwl1CdVtzsZ7UZPz6ToC97uVuhKiVevPoAmaJ+zDiFdVPBiTmkOz7nMZnCt
+						5PqDYeRNAlFDTx0nQ1WjaPuwWBhdii3EaHLQWrFPN6dfoxX6YPtboQKZk9b3/r7N
+						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>
+						MIIDIzCCAgugAwIBAgIUEJciO46aX1zd30VubLZW8mTbPWcwDQYJKoZIhvcNAQEF
+						BQAwGTEXMBUGA1UEAxMOaWRwLmNud2wuYWMudWswHhcNMTMwMjIyMTM0MTQ2WhcN
+						MzMwMjIyMTM0MTQ2WjAZMRcwFQYDVQQDEw5pZHAuY253bC5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKw5eKNDVnIjYE4C57t/K2+u+4c/tirp
+						rk9ozEGO0JCSnCq+GcxJm5Mfxs5sM6u919g7BOZZU5zm5sykEvhM1YonMcjzcBsd
+						EHVs78c9Nlv6ZueO5923ArCYybTPTpqZWr9px0XdltBkLafFOWPUt3mUVUglv6X6
+						esMQaiDPAbrG+Nvdo0ZbnlA5tBy7WMNEk6SyB0VhxIN3KDWsTi39tRpNVaroO+VG
+						pdrC31S4g5aropb/27kOTIltrxVokJDLHjo0PMO2o2eKLZvtgYRnL8/XTTXexZyy
+						U85U3G5zPw2jptUHHx1W9Ojs/9rUsp61znAJEXfgMS5iQLl2JwA9EsUCAwEAAaNj
+						MGEwQAYDVR0RBDkwN4IOaWRwLmNud2wuYWMudWuGJWh0dHBzOi8vaWRwLmNud2wu
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBWW2Q/zTBI5/JWM/SHx/Kg2
+						YRleMA0GCSqGSIb3DQEBBQUAA4IBAQAFcWzf6iOnJGNSlIOCJjj6aOoM3wNqLZ7s
+						WAtBhxVb+w2vs5w2mTrgpj24wbfpyQVhCrQjUFLdVmOqyUlpF9A/kJOgUYuq5JZa
+						GeJy1cwl1CdVtzsZ7UZPz6ToC97uVuhKiVevPoAmaJ+zDiFdVPBiTmkOz7nMZnCt
+						5PqDYeRNAlFDTx0nQ1WjaPuwWBhdii3EaHLQWrFPN6dfoxX6YPtboQKZk9b3/r7N
+						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>
diff --git a/swamid-interfederations-2.0/idp.coleg-powys.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.coleg-powys.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..4b21c9d5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.coleg-powys.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.coleg-powys.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coleg-powys.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NPTC Group (former Coleg Powys users)</mdui:DisplayName>
+        <mdui:Logo height="122" width="100">https://idp.coleg-powys.ac.uk/idp/images/coleg-powys-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>
+						MIIDgDCCAmgCCQCjEQP33+OFtzANBgkqhkiG9w0BAQUFADCBgTEUMBIGA1UEChML
+						Q29sZWcgUG93eXMxGjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMRAwDgYDVQQH
+						EwdOZXd0b3duMQ4wDAYDVQQIEwVQb3d5czELMAkGA1UEBhMCR0IxHjAcBgNVBAMT
+						FWlkcC5jb2xlZy1wb3d5cy5hYy51azAeFw0xMzA1MDkxNTU3MTVaFw0yMzA1MDcx
+						NTU3MTVaMIGBMRQwEgYDVQQKEwtDb2xlZyBQb3d5czEaMBgGA1UECxMRQ29tcHV0
+						ZXIgU2VydmljZXMxEDAOBgNVBAcTB05ld3Rvd24xDjAMBgNVBAgTBVBvd3lzMQsw
+						CQYDVQQGEwJHQjEeMBwGA1UEAxMVaWRwLmNvbGVnLXBvd3lzLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dfdyK7811MVGI1rUn+ftWqIsSd2
+						TlpUnse7ohcs5Wk1goFph32IMhJO4A/utB0ruCK9fBmDI52cfAuIpnK/CoKIymsp
+						y0YfqQy9zj+lvCVHi985l9YN7nL6xFzyqJ38/7roOc4qDZy5E7ZpA6b70R90K8rD
+						h59MLJ/rrUWhBR94aQ3JzKDUeYyMGoAK2oTnmq7ecLy6Z0egAVbMLY9KnadKi9WL
+						ulKCOLNkd/j7+TVxLTrC92z8trXLrXZYjBvjCyVZiGHD/8DQ9ZagNbLxL8HvY/F/
+						g5a52Ep0db408n4TGLUzp6xdg7Q9pc5NoKxVoEtiD3okafByvvHMjC3LTQIDAQAB
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCHuH6vFAogF0VBZXgrgSbBx6vi/w981vUnO71H
+						1bbirh216vUn8a/BPAHuLU1KwK6aOZvnNbFTE5xgORHQWA0gEsUKAhgZt+dUuAVs
+						qWpIzgc5eyqFMA9mOJGy6HbHsUtu4ZnnnL/gSJ5A68eP0drtjfK/84N0HOZnPXqF
+						2SP8s6cs6Qc8aO/C/iLcAg+UYprIs8pcIbYQOPeuqo8bYAAzD78udsaiBmdB9mqh
+						t6sfik6Q3GLW1U0wRHE0JN42Y8EqJ96/2PFxun0sAkNJczpt9R8P6PxM0cfLVOth
+						gugBHo3aeeUlP0WHK5s/hswzuZwxBV4lGIu0R5azAEx9EXem
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coleg-powys.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleg-powys.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.coleg-powys.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.coleg-powys.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.coleg-powys.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.coleg-powys.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coleg-powys.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDgDCCAmgCCQCjEQP33+OFtzANBgkqhkiG9w0BAQUFADCBgTEUMBIGA1UEChML
+						Q29sZWcgUG93eXMxGjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMRAwDgYDVQQH
+						EwdOZXd0b3duMQ4wDAYDVQQIEwVQb3d5czELMAkGA1UEBhMCR0IxHjAcBgNVBAMT
+						FWlkcC5jb2xlZy1wb3d5cy5hYy51azAeFw0xMzA1MDkxNTU3MTVaFw0yMzA1MDcx
+						NTU3MTVaMIGBMRQwEgYDVQQKEwtDb2xlZyBQb3d5czEaMBgGA1UECxMRQ29tcHV0
+						ZXIgU2VydmljZXMxEDAOBgNVBAcTB05ld3Rvd24xDjAMBgNVBAgTBVBvd3lzMQsw
+						CQYDVQQGEwJHQjEeMBwGA1UEAxMVaWRwLmNvbGVnLXBvd3lzLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dfdyK7811MVGI1rUn+ftWqIsSd2
+						TlpUnse7ohcs5Wk1goFph32IMhJO4A/utB0ruCK9fBmDI52cfAuIpnK/CoKIymsp
+						y0YfqQy9zj+lvCVHi985l9YN7nL6xFzyqJ38/7roOc4qDZy5E7ZpA6b70R90K8rD
+						h59MLJ/rrUWhBR94aQ3JzKDUeYyMGoAK2oTnmq7ecLy6Z0egAVbMLY9KnadKi9WL
+						ulKCOLNkd/j7+TVxLTrC92z8trXLrXZYjBvjCyVZiGHD/8DQ9ZagNbLxL8HvY/F/
+						g5a52Ep0db408n4TGLUzp6xdg7Q9pc5NoKxVoEtiD3okafByvvHMjC3LTQIDAQAB
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCHuH6vFAogF0VBZXgrgSbBx6vi/w981vUnO71H
+						1bbirh216vUn8a/BPAHuLU1KwK6aOZvnNbFTE5xgORHQWA0gEsUKAhgZt+dUuAVs
+						qWpIzgc5eyqFMA9mOJGy6HbHsUtu4ZnnnL/gSJ5A68eP0drtjfK/84N0HOZnPXqF
+						2SP8s6cs6Qc8aO/C/iLcAg+UYprIs8pcIbYQOPeuqo8bYAAzD78udsaiBmdB9mqh
+						t6sfik6Q3GLW1U0wRHE0JN42Y8EqJ96/2PFxun0sAkNJczpt9R8P6PxM0cfLVOth
+						gugBHo3aeeUlP0WHK5s/hswzuZwxBV4lGIu0R5azAEx9EXem
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coleg-powys.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleg-powys.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md: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 (former Coleg Powys users)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.coleg-powys.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@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/idp.coleggwent.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.coleggwent.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..749818a6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.coleggwent.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1MAfdEF6a0yIc
+						NuS/2PRg5YVuRi2PezJggImTYVpNYZ9zd6RZGdBdWMs3jqPZUMJFUvK+RIdzMHp6
+						zNXTIORDX0HNwaMmzhqDjpK3SrNj8V6R2YN9jeQPC4LCpxBDejems7eT+xch+QyZ
+						dSR5N0aL6XWFfQdnDyJU/ADDlSTnegmyGaYZSxJ/7zwFjG5+mDhJVtVwrr/Bfbwi
+						pOECsI9ZSYjnvA9FdeX8X8/mOs3RYXDVLFHEF/lSQiUffBH2CNXuy6v945tBaGk9
+						BV9vw3UdKUFEZJ9v7POxIG2S6cN+gNd8BHOhcHLxJKVlDDbGpuEFNhAqRnTkLdg6
+						nMYEMrg/AgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcC5jb2xlZ2d3ZW50LmFjLnVr
+						hitodHRwczovL2lkcC5jb2xlZ2d3ZW50LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBSG0tN9RyOtbHWu1y8wN6J9tLIlbTANBgkqhkiG9w0BAQUFAAOCAQEA
+						IFJqEr40T7U8Bz8oECDeUaeUacZZDgV50qoGegCDpcjbO4rxq0scjBtLNu/rd+1N
+						3oOyfkhPPxGpDzFjezywMAn/6wfl6yAzOLU4ctTcs4Z41uYZYvGktwSEvVhKgK9k
+						/BRzjmalx7FXZwnvUcVG+h2vCk6I+vN3/d6eEL2+CQumK9S32fS60pP7jAF8sYe+
+						FfZmV1VDEv2FnYJkXRb5YIZd45OtU9xF+HdkAIhhHVf1s6Hl3HJR4SoU58iEK7Qy
+						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>
+						MIIDPDCCAiSgAwIBAgIVAPoQhjG640bUBDqHyzpK76yMFB02MA0GCSqGSIb3DQEB
+						BQUAMB8xHTAbBgNVBAMTFGlkcC5jb2xlZ2d3ZW50LmFjLnVrMB4XDTE0MDQyNTA4
+						MzYyM1oXDTM0MDQyNTA4MzYyM1owHzEdMBsGA1UEAxMUaWRwLmNvbGVnZ3dlbnQu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1MAfdEF6a0yIc
+						NuS/2PRg5YVuRi2PezJggImTYVpNYZ9zd6RZGdBdWMs3jqPZUMJFUvK+RIdzMHp6
+						zNXTIORDX0HNwaMmzhqDjpK3SrNj8V6R2YN9jeQPC4LCpxBDejems7eT+xch+QyZ
+						dSR5N0aL6XWFfQdnDyJU/ADDlSTnegmyGaYZSxJ/7zwFjG5+mDhJVtVwrr/Bfbwi
+						pOECsI9ZSYjnvA9FdeX8X8/mOs3RYXDVLFHEF/lSQiUffBH2CNXuy6v945tBaGk9
+						BV9vw3UdKUFEZJ9v7POxIG2S6cN+gNd8BHOhcHLxJKVlDDbGpuEFNhAqRnTkLdg6
+						nMYEMrg/AgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcC5jb2xlZ2d3ZW50LmFjLnVr
+						hitodHRwczovL2lkcC5jb2xlZ2d3ZW50LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBSG0tN9RyOtbHWu1y8wN6J9tLIlbTANBgkqhkiG9w0BAQUFAAOCAQEA
+						IFJqEr40T7U8Bz8oECDeUaeUacZZDgV50qoGegCDpcjbO4rxq0scjBtLNu/rd+1N
+						3oOyfkhPPxGpDzFjezywMAn/6wfl6yAzOLU4ctTcs4Z41uYZYvGktwSEvVhKgK9k
+						/BRzjmalx7FXZwnvUcVG+h2vCk6I+vN3/d6eEL2+CQumK9S32fS60pP7jAF8sYe+
+						FfZmV1VDEv2FnYJkXRb5YIZd45OtU9xF+HdkAIhhHVf1s6Hl3HJR4SoU58iEK7Qy
+						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>
diff --git a/swamid-interfederations-2.0/idp.colegsirgar.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.colegsirgar.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..1fb22053
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.colegsirgar.ac.uk-shibboleth.xml
@@ -0,0 +1,96 @@
+<?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>
+      <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
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn/fhd3ZpIGbd
+						CclJAt2vSNKAbIjElHCPeNqFHaf1N876DrQKCBl3a9jll6k0IqqM4Fuc5x8WqBhv
+						f7gQHqnsq+9omih0daOpaAJlB9mxeJEthQVB2R/C8JYAJK5akNIc84tDJqI4wSM9
+						5dl9CftHSdd/tj/+63RLotEYsStKsnCS1jxm5qNiVfUdn08xIOp1NieF1zRTrdNU
+						jvgI/91Q/3kgz81nGcmd2XWO4MIdPEpdxSiHriBpTuWPd/phN9uaCCYrc1SBkcG1
+						SOMgvuUxlRvbUeDamHEtLvfJ4n7Os4UmJtjp/yGBdoLyhRl3aiEd34gPG6fdKOib
+						1yQqxKRz1wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAuY29sZWdzaXJnYXIuYWMu
+						dWuGLGh0dHBzOi8vaWRwLmNvbGVnc2lyZ2FyLmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MB0GA1UdDgQWBBSJsyRsmK01s/7klVm/PRh/sgHQujANBgkqhkiG9w0BAQUFAAOC
+						AQEALQtvoB83wkiziavm5rKms3q465cEno7Ze85297sTez3VVUSjuCg+yfZhN/Eh
+						uBBPX2/eE44d51DHWMb9hWcKGAvBpWFOIFMgUY4xMpFRpSEtlNr0GHUb58sgcBAS
+						AVDTrhhRKC9mNMA0yXI1NlX8QetQbeTR9H6XEOHWiyuf8mZ8BvA3mqZ6I1Uhb4EM
+						8PPEnYnz4zaL0xBKYuc6sUqmQthnnSK2n9YtXaM76xysgu38wGRLV5GmxM8vm+6P
+						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>
+						MIIDPzCCAiegAwIBAgIUcXEex5qLM9Uo7l8DfFXeVTtBhmYwDQYJKoZIhvcNAQEF
+						BQAwIDEeMBwGA1UEAxMVaWRwLmNvbGVnc2lyZ2FyLmFjLnVrMB4XDTE0MDQwOTEw
+						NDI0NloXDTM0MDQwOTEwNDI0NlowIDEeMBwGA1UEAxMVaWRwLmNvbGVnc2lyZ2Fy
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn/fhd3ZpIGbd
+						CclJAt2vSNKAbIjElHCPeNqFHaf1N876DrQKCBl3a9jll6k0IqqM4Fuc5x8WqBhv
+						f7gQHqnsq+9omih0daOpaAJlB9mxeJEthQVB2R/C8JYAJK5akNIc84tDJqI4wSM9
+						5dl9CftHSdd/tj/+63RLotEYsStKsnCS1jxm5qNiVfUdn08xIOp1NieF1zRTrdNU
+						jvgI/91Q/3kgz81nGcmd2XWO4MIdPEpdxSiHriBpTuWPd/phN9uaCCYrc1SBkcG1
+						SOMgvuUxlRvbUeDamHEtLvfJ4n7Os4UmJtjp/yGBdoLyhRl3aiEd34gPG6fdKOib
+						1yQqxKRz1wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAuY29sZWdzaXJnYXIuYWMu
+						dWuGLGh0dHBzOi8vaWRwLmNvbGVnc2lyZ2FyLmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MB0GA1UdDgQWBBSJsyRsmK01s/7klVm/PRh/sgHQujANBgkqhkiG9w0BAQUFAAOC
+						AQEALQtvoB83wkiziavm5rKms3q465cEno7Ze85297sTez3VVUSjuCg+yfZhN/Eh
+						uBBPX2/eE44d51DHWMb9hWcKGAvBpWFOIFMgUY4xMpFRpSEtlNr0GHUb58sgcBAS
+						AVDTrhhRKC9mNMA0yXI1NlX8QetQbeTR9H6XEOHWiyuf8mZ8BvA3mqZ6I1Uhb4EM
+						8PPEnYnz4zaL0xBKYuc6sUqmQthnnSK2n9YtXaM76xysgu38wGRLV5GmxM8vm+6P
+						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>
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
new file mode 100644
index 00000000..5041ca95
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.company.ja.net-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?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>
+      <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>
+						MIIDxDCCAqwCCQCSYXHhJnkuQDANBgkqhkiG9w0BAQUFADCBozELMAkGA1UEBhMC                                                                                  
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3QxMTAvBgNV                                                                                  
+						BAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChVSykxHTAb                                                                                  
+						BgNVBAsTFEpBTkVUKFVLKSBJUyBTdXBwb3J0MRswGQYDVQQDExJpZHAuY29tcGFu                                                                                  
+						eS5qYS5uZXQwHhcNMTMwODI4MDkzMzQ0WhcNMzMwODIzMDkzMzQ0WjCBozELMAkG                                                                                  
+						A1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3Qx                                                                                  
+						MTAvBgNVBAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChV                                                                                  
+						SykxHTAbBgNVBAsTFEpBTkVUKFVLKSBJUyBTdXBwb3J0MRswGQYDVQQDExJpZHAu                                                                                  
+						Y29tcGFueS5qYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA
+						CHs8wVfzqZ7PrFLGngMY/nmawPUO7E0DcwDNsarh+04vbE3jrcQf7iZNsG8lo/ZF
+						Z8NfNvNwHYZ7z40O7cf5Kr7YSpqCNcC+InWsXOjhRo2blpwSpUSQpH1IzHCMf3Xf
+						efm1vG6Ud5zm2M05GJklL8Imz6u2pLQqgcxsLhe7C1aoP5P2GfQCVukgJ8rtcXN/
+						Hh0JggwZ/ZEKTHL8EJQrU0zAj/YSVeffpmOUAmUVOb8Tdy+NL1PHNNTNkmZ/p8Fb
+						vw7i66T0BDgbjmL/s4pq1DhI51Rh/qaMsCaAH6nGmcmnLmi7RpjQ8cMQlCVBpfWM
+						LRVVoHVjZegHjqqZ1f65AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEtsQZdMCu0F
+						3VG7uyuu7UwUJPqfrp2DVd+ZW7ZePOzB0HWxsLKPEl0rdpeE+aMrMh3wbyV+1nJu
+						N7P1L0khqg/Tw4N/30tdbAYQKo+TjguzFCThenplL2zC618RtSyWFCOO2ox+4Arl
+						PhqPY3Zo7m2A1nfYkb9dL5VSbIUFztPgH5JpTTzutkJD9lQssw7JbB2cgkmHN+z/
+						F3+Xa4HqsEp30yzUMbAyA6jhduRqxMxmpDKB1micNlYOOQCKU5m9IBsHd6Vv2MYr
+						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>
+						MIIDxDCCAqwCCQCSYXHhJnkuQDANBgkqhkiG9w0BAQUFADCBozELMAkGA1UEBhMC                                                                                  
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3QxMTAvBgNV                                                                                  
+						BAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChVSykxHTAb                                                                                  
+						BgNVBAsTFEpBTkVUKFVLKSBJUyBTdXBwb3J0MRswGQYDVQQDExJpZHAuY29tcGFu                                                                                  
+						eS5qYS5uZXQwHhcNMTMwODI4MDkzMzQ0WhcNMzMwODIzMDkzMzQ0WjCBozELMAkG                                                                                  
+						A1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3Qx                                                                                  
+						MTAvBgNVBAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChV                                                                                  
+						SykxHTAbBgNVBAsTFEpBTkVUKFVLKSBJUyBTdXBwb3J0MRswGQYDVQQDExJpZHAu                                                                                  
+						Y29tcGFueS5qYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA
+						CHs8wVfzqZ7PrFLGngMY/nmawPUO7E0DcwDNsarh+04vbE3jrcQf7iZNsG8lo/ZF
+						Z8NfNvNwHYZ7z40O7cf5Kr7YSpqCNcC+InWsXOjhRo2blpwSpUSQpH1IzHCMf3Xf
+						efm1vG6Ud5zm2M05GJklL8Imz6u2pLQqgcxsLhe7C1aoP5P2GfQCVukgJ8rtcXN/
+						Hh0JggwZ/ZEKTHL8EJQrU0zAj/YSVeffpmOUAmUVOb8Tdy+NL1PHNNTNkmZ/p8Fb
+						vw7i66T0BDgbjmL/s4pq1DhI51Rh/qaMsCaAH6nGmcmnLmi7RpjQ8cMQlCVBpfWM
+						LRVVoHVjZegHjqqZ1f65AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEtsQZdMCu0F
+						3VG7uyuu7UwUJPqfrp2DVd+ZW7ZePOzB0HWxsLKPEl0rdpeE+aMrMh3wbyV+1nJu
+						N7P1L0khqg/Tw4N/30tdbAYQKo+TjguzFCThenplL2zC618RtSyWFCOO2ox+4Arl
+						PhqPY3Zo7m2A1nfYkb9dL5VSbIUFztPgH5JpTTzutkJD9lQssw7JbB2cgkmHN+z/
+						F3+Xa4HqsEp30yzUMbAyA6jhduRqxMxmpDKB1micNlYOOQCKU5m9IBsHd6Vv2MYr
+						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 Collections and Janet 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
new file mode 100644
index 00000000..727f86ba
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-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.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:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">condorcet.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEmjCCA4KgAwIBAgIQDsq9gZQLUlBQpZUM30AfjTANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDExMjMwMDAwMDBaFw0xNzEyMDUyMzU5NTlaMD4xITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQaWRwLmNvbmRvcmNl
+dC5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoaPpsKJBMsbjnR
+8J4kj4hqrCpAT6EIYwYe5gNTVWfYdDdN5fsqLGOsPek4wFtZKRB2PQ/7ymtqeyFi
+UxItaribFWejJUxvdgQvg/OPR0VRVUPgjJRDCRWi056YzTQA6JFSgPq0qBbg/MZp
+JGLWh+yoSZdo2pwEWUUseO51f6zpn7r8B5Ttiyf4qkXMFK8oBHBBYz3n5sx8oPHb
+qAFw3Gu20/L+Pvu1s58kz7rM2L2Ken3h6rXqyiaScSAYxr1sjPYfe+R8rYNFO2+O
+STwt3+nATalka67tQPJtf5Z9NHFK36/gTxdEVWSbuCU1Gk8a5dIx457L1+nLFvPT
+bTz0uwMCAwEAAaOCAWwwggFoMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvhhiiw
+/ba9MB0GA1UdDgQWBBRu298TfoJotRm3ohTjLiftg1ne8zAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
+oC2gK4YpaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcmww
+bAYIKwYBBQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0cnVz
+dC5jb20vVEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3Au
+dXNlcnRydXN0LmNvbTAbBgNVHREEFDASghBpZHAuY29uZG9yY2V0LmJlMA0GCSqG
+SIb3DQEBCwUAA4IBAQABnau5m7g3HpN7GVS5QEMKJbh89+rTeDZ49nbDBpOhV3QA
+dAaM3mIuYmZwaqvQGS3jocEl2Y+UefB5TVoEom7N2XiNYSI0h+ojrYnzusoeTju0
+3i8guDudOEjbE94fGl7j9G/G8hcrmFILkjv+B7f2MJ+lPl6aHh+hsh2iF1m9avvG
+Dhn1aNNn2m0LK4nqALPP0m3ryQCdzZPKPcB5DTPZgOwDQprkfFrHH3v1VKI46QUy
+wqLcG+m0nqfP2hJAMBXtfh6ffQvj65s/FxFb/ezzPqCsN9wcOGqtr0Y8x8VmBEVE
+PzOwLkJyCcoZRlNh8Y6dRl4UQvwXY6nCk1H9Lhkx
+                    </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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn: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:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">condorcet.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEmjCCA4KgAwIBAgIQDsq9gZQLUlBQpZUM30AfjTANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDExMjMwMDAwMDBaFw0xNzEyMDUyMzU5NTlaMD4xITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQaWRwLmNvbmRvcmNl
+dC5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoaPpsKJBMsbjnR
+8J4kj4hqrCpAT6EIYwYe5gNTVWfYdDdN5fsqLGOsPek4wFtZKRB2PQ/7ymtqeyFi
+UxItaribFWejJUxvdgQvg/OPR0VRVUPgjJRDCRWi056YzTQA6JFSgPq0qBbg/MZp
+JGLWh+yoSZdo2pwEWUUseO51f6zpn7r8B5Ttiyf4qkXMFK8oBHBBYz3n5sx8oPHb
+qAFw3Gu20/L+Pvu1s58kz7rM2L2Ken3h6rXqyiaScSAYxr1sjPYfe+R8rYNFO2+O
+STwt3+nATalka67tQPJtf5Z9NHFK36/gTxdEVWSbuCU1Gk8a5dIx457L1+nLFvPT
+bTz0uwMCAwEAAaOCAWwwggFoMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvhhiiw
+/ba9MB0GA1UdDgQWBBRu298TfoJotRm3ohTjLiftg1ne8zAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
+oC2gK4YpaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcmww
+bAYIKwYBBQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0cnVz
+dC5jb20vVEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3Au
+dXNlcnRydXN0LmNvbTAbBgNVHREEFDASghBpZHAuY29uZG9yY2V0LmJlMA0GCSqG
+SIb3DQEBCwUAA4IBAQABnau5m7g3HpN7GVS5QEMKJbh89+rTeDZ49nbDBpOhV3QA
+dAaM3mIuYmZwaqvQGS3jocEl2Y+UefB5TVoEom7N2XiNYSI0h+ojrYnzusoeTju0
+3i8guDudOEjbE94fGl7j9G/G8hcrmFILkjv+B7f2MJ+lPl6aHh+hsh2iF1m9avvG
+Dhn1aNNn2m0LK4nqALPP0m3ryQCdzZPKPcB5DTPZgOwDQprkfFrHH3v1VKI46QUy
+wqLcG+m0nqfP2hJAMBXtfh6ffQvj65s/FxFb/ezzPqCsN9wcOGqtr0Y8x8VmBEVE
+PzOwLkJyCcoZRlNh8Y6dRl4UQvwXY6nCk1H9Lhkx
+                   </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">Haute Ecole Provinciale de Hainaut - Condorcet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">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: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
new file mode 100644
index 00000000..c4b44523
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cornwall.ac.uk-shibboleth-idp.xml
@@ -0,0 +1,96 @@
+<?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>
+      <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
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLIUX5+M6fr44ZuLex4
+						m4EfwVdRt6Wm/9Cj7uxUXcYKoVHdpKWeyWKD27Fuc/eI7b5B2v1MO0i/IpeT1o2H
+						tSmty0gKcYt6+7FMfydazu8MFVgHklElFeFtMxOLsnnIS618gcP5uwbiWkba4BN6
+						80XHQyECDqKf6XOPAls+ZDqm85IzLZc9+EyFNJBGrNzC6nUASXuJjU5Ws1BdVn/r
+						eD9XQH6n5IjEB9ZJdmyuD8PyAoEDhmAG67A8BiAx6mLLWbBc32yvNuVRoOOWxLSA
+						Ai+huqmGrkrk48QGiF9IIyC1FjdYsjhWbnx+cJJInuxi+8R6f4i9vUOG8OOcTcYx
+						p78CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmNvcm53YWxsLmFjLnVrhilodHRw
+						czovL2lkcC5jb3Jud2FsbC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						uT8cKbmugXbKgJV02McvjAUP1N8wDQYJKoZIhvcNAQEFBQADggEBABvVUiY2qgLg
+						SI27b2IFdRhGorAJ9Ed/hCOO/lE0ICRzb6qksRiKCyWEm9uEG7TSQfsjJ2s6KaT3
+						FWdt3UaVomeaVyuu/jDO1kxIO8CCZXl/m9nrK/3AazVwlfgGvE5jDi13Gw2iS69I
+						7hZL/RId3JYKJUAiXyaUOojiyL36A2M5/ZJgwrZJlgUiJX/eonzUznVRLGW9hU1q
+						QLN5cohidCL6W7v51hKwIxs1FdB1kRHuqNjF3DLwgf8tx4+a4W5LMKOlgMZzfVCj
+						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>
+						MIIDNDCCAhygAwIBAgIVAOk7GwlKWRg+w8gK7LWBuLRrQts1MA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEmlkcC5jb3Jud2FsbC5hYy51azAeFw0xMzA5MDIxMDE4
+						MjdaFw0zMzA5MDIxMDE4MjdaMB0xGzAZBgNVBAMTEmlkcC5jb3Jud2FsbC5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLIUX5+M6fr44ZuLex4
+						m4EfwVdRt6Wm/9Cj7uxUXcYKoVHdpKWeyWKD27Fuc/eI7b5B2v1MO0i/IpeT1o2H
+						tSmty0gKcYt6+7FMfydazu8MFVgHklElFeFtMxOLsnnIS618gcP5uwbiWkba4BN6
+						80XHQyECDqKf6XOPAls+ZDqm85IzLZc9+EyFNJBGrNzC6nUASXuJjU5Ws1BdVn/r
+						eD9XQH6n5IjEB9ZJdmyuD8PyAoEDhmAG67A8BiAx6mLLWbBc32yvNuVRoOOWxLSA
+						Ai+huqmGrkrk48QGiF9IIyC1FjdYsjhWbnx+cJJInuxi+8R6f4i9vUOG8OOcTcYx
+						p78CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmNvcm53YWxsLmFjLnVrhilodHRw
+						czovL2lkcC5jb3Jud2FsbC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						uT8cKbmugXbKgJV02McvjAUP1N8wDQYJKoZIhvcNAQEFBQADggEBABvVUiY2qgLg
+						SI27b2IFdRhGorAJ9Ed/hCOO/lE0ICRzb6qksRiKCyWEm9uEG7TSQfsjJ2s6KaT3
+						FWdt3UaVomeaVyuu/jDO1kxIO8CCZXl/m9nrK/3AazVwlfgGvE5jDi13Gw2iS69I
+						7hZL/RId3JYKJUAiXyaUOojiyL36A2M5/ZJgwrZJlgUiJX/eonzUznVRLGW9hU1q
+						QLN5cohidCL6W7v51hKwIxs1FdB1kRHuqNjF3DLwgf8tx4+a4W5LMKOlgMZzfVCj
+						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>
diff --git a/swamid-interfederations-2.0/idp.coulsdon.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.coulsdon.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..77457e55
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.coulsdon.ac.uk-shibboleth.xml
@@ -0,0 +1,107 @@
+<?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>
+      <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
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAuY291bHNk
+						b24uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKZJnCyrgv
+						aLfVlYa+UZ2acK6Ar+dvMpZwzImpr0pRAO6AnUXQvu0pfDiFmZaPiKxXqruXKHDv
+						8zcbK+zkhTw3MEsWUMrR9z1vrGV/3HJ5N8o0Ruosiu08VVeQWu6gV9XqWvwBHpE2
+						29Ks8xYi2OjxciIsdYkEQVFtQOITWlqxDgawaixpNNjupUpCDhD57jzPRMt3K4bi
+						FnO1D7fY5aGnVAE86KGmeehe+3OvNPzuohTAatcgAwQMTpzrkK7DuGPrz0o4BsfZ
+						Dvixo2bhTsxY5iQ0x5qxvi75jPUXnJfS4zRgONk8v2EL6ICIAt4pqSHSgNDkapbN
+						RdDj3hejrBYfAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+						V0fqkOO57TAdBgNVHQ4EFgQU51eJ++2LXmhsG5ZPFnLIEdNx5s8wDgYDVR0PAQH/
+						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+						BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+						Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+						Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5jb3Vsc2Rvbi5hYy51
+						azANBgkqhkiG9w0BAQUFAAOCAQEAWpY694i09h9vXRu8Bjf24MEtUMndoHt5SkyJ
+						whDc2n1xIynpxJXFobAAIx69dlVx/u1cEyPprqVcI2AY1Ru3lfJL0e+vtMH+5rXz
+						/22F5Rwth2bgeL/Veu7dEZXakzlolQfbRpV2QqKKUDlicIxypHMjbeqtBSLk45eW
+						x84AKfCKhDmSxTVGoIEON34LbjTb1CjmhwEaAK/3yvwjY+czY+62LjxYw4GILlhZ
+						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>
+						MIIEcTCCA1mgAwIBAgIQJOqN2v68Irpt7BTwM8+KxjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTE0MDMyMTAwMDAwMFoXDTE3MDMyMDIzNTk1OVowQDEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAuY291bHNk
+						b24uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKZJnCyrgv
+						aLfVlYa+UZ2acK6Ar+dvMpZwzImpr0pRAO6AnUXQvu0pfDiFmZaPiKxXqruXKHDv
+						8zcbK+zkhTw3MEsWUMrR9z1vrGV/3HJ5N8o0Ruosiu08VVeQWu6gV9XqWvwBHpE2
+						29Ks8xYi2OjxciIsdYkEQVFtQOITWlqxDgawaixpNNjupUpCDhD57jzPRMt3K4bi
+						FnO1D7fY5aGnVAE86KGmeehe+3OvNPzuohTAatcgAwQMTpzrkK7DuGPrz0o4BsfZ
+						Dvixo2bhTsxY5iQ0x5qxvi75jPUXnJfS4zRgONk8v2EL6ICIAt4pqSHSgNDkapbN
+						RdDj3hejrBYfAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+						V0fqkOO57TAdBgNVHQ4EFgQU51eJ++2LXmhsG5ZPFnLIEdNx5s8wDgYDVR0PAQH/
+						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+						BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+						Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+						Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5jb3Vsc2Rvbi5hYy51
+						azANBgkqhkiG9w0BAQUFAAOCAQEAWpY694i09h9vXRu8Bjf24MEtUMndoHt5SkyJ
+						whDc2n1xIynpxJXFobAAIx69dlVx/u1cEyPprqVcI2AY1Ru3lfJL0e+vtMH+5rXz
+						/22F5Rwth2bgeL/Veu7dEZXakzlolQfbRpV2QqKKUDlicIxypHMjbeqtBSLk45eW
+						x84AKfCKhDmSxTVGoIEON34LbjTb1CjmhwEaAK/3yvwjY+czY+62LjxYw4GILlhZ
+						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>
diff --git a/swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..9dc90603
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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="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>
+					      MIIEJDCCAwygAwIBAgIJAIuC7i5giNpjMA0GCSqGSIb3DQEBBQUAMGkxEzARBgNV
+BAMTCmlkcC5jcGUuZnIxLjAsBgNVBAoTJUVDT0xFIFNVUCBDSElNSUUgUEhZUyBF
+TEVDVFJPTklRIExZT04xFTATBgNVBAcTDFZJTExFVVJCQU5ORTELMAkGA1UEBhMC
+RlIwHhcNMTQwMjIwMDgwNTA5WhcNMjQwMjE4MDgwNTA5WjBpMRMwEQYDVQQDEwpp
+ZHAuY3BlLmZyMS4wLAYDVQQKEyVFQ09MRSBTVVAgQ0hJTUlFIFBIWVMgRUxFQ1RS
+T05JUSBMWU9OMRUwEwYDVQQHEwxWSUxMRVVSQkFOTkUxCzAJBgNVBAYTAkZSMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAocIpHMAzh/c23VTx4XYN3+LB
+AjUpoogp3vpofbkduSkz/FjaRNPaIkN9ktXTUB2KTDPw6q36znFvSGZmRk75szn5
+QitoLMxjuu3vEappnszPBzUxSOiNkjkeXrhx7wi2DKvPEH9/lnITPGWVTukdyE4Z
+R/5WMSQxrPlJVdiqhh5NL/z7ffHezZczVlOkQTIew9srvWT3tAf3d1taJ163PPJZ
+3O/+tNHSZcnZkBVWrpXGVVZxmEb7xvJVKwLpoHMHbnD2KHw0SGWC1nKFkbr+VxH5
+T7Q+MlIa5DFJLU1XCx9AqMQBoDqDlgNDOb3pskWm3nSbeHf4/WbjfWzRV3a1jwID
+AQABo4HOMIHLMB0GA1UdDgQWBBSMZBt4Ak7Vg2PxKHncCs16Qai6IzCBmwYDVR0j
+BIGTMIGQgBSMZBt4Ak7Vg2PxKHncCs16Qai6I6FtpGswaTETMBEGA1UEAxMKaWRw
+LmNwZS5mcjEuMCwGA1UEChMlRUNPTEUgU1VQIENISU1JRSBQSFlTIEVMRUNUUk9O
+SVEgTFlPTjEVMBMGA1UEBxMMVklMTEVVUkJBTk5FMQswCQYDVQQGEwJGUoIJAIuC
+7i5giNpjMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABwupHR6LVNW
+pTEB8I6nVYqHYSMduk89SzUK3U9JSqlGDE5L19IaEvYoelfEEGbxZ9UM0RQaneJI
+NcGTD/z3H+eOGAuq2sWew2XbBRGVHBU5Fdgy8H6XQicHSjurL0u+eu+Oul8xH54p
+MD9JupVLbRI/GZghxNmNtyJZQoi2+/PuFnW/c8R0zRoYOfn8fio7nLf7peRpPEdB
+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://unknown.site.com</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.craw.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml
new file mode 100644
index 00000000..3aa34e23
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-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>
+      <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>
+MIIDGDCCAgCgAwIBAgIVAIP1OBVd297uoZOia+Zqp6HAJ9DDMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5jcmF3LmV1MB4XDTEzMDIxNTA3NDMyMVoXDTMz
+MDIxNTA3NDMyMVowFjEUMBIGA1UEAxMLaWRwLmNyYXcuZXUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDuCWtJ/aDFBmejY17mEqrlgFxmetfLJWKCy6vU
+25241tsMqWW42YVuxtPwKP6Z5ure+RCzgUF0ZdddKqyaUpmNxeIq7OC7q21mMeBQ
+yahzvjzq8VgcM2iKcgCw/nNnrSZwkIaJMaej7Aw2U5VVs65rZ6bbztQbMKj51BbJ
+FM28lyTLC96+mTaofJ8hvkn2cPH3IecCFlRwNcx4w5SGuVGIPNEISQ8ypEzd2MNA
+DcnwemG46Ipv/MyILJPWP19xjl7z6VgeBLNHc0iigepBOrSnSq49WXpdwvFlkjMY
+sbPxGD1CQfPXBo6dDBNQdjn3V4cdfWRO5/Dp0J4mkkFsJkzDAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5jcmF3LmV1hiJodHRwczovL2lkcC5jcmF3LmV1L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQNbK63mDGwrA0LIPx4J3pCP/MHqjANBgkqhkiG
+9w0BAQUFAAOCAQEANbBixgiBQhJ/xB9Et8d+kZwK/OIC+Q08aCUuSlJ8URS7yB8a
+tQlX9xCW1Dj9eBVzsCNEVZQVhUA7SepbCHXwPh3cjim/255V/dboxEa5HtH76Pn5
+RSqOLhoN5SrqZn9JMZfJqIbU8vcLEwR9HqbFT0gDseyCExBdGEZb2cbnidxaTIrr
+yf6vu9LsSxP4gck3NrkfrUAWqxYis+a2qSXTni00wDcj5Si0DxZTIIFUfVeTPm02
+tEQG0fUEqzyBDxdQFuNsput7RfHF9S6iXjAEUyOc8+dXbxLs+kziJteBX01SSNI4
+NuU+VQNtPt46TiTwvP7DiXqrbeMbYZkfPB/jLQ==
+                	</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
+DQEBAQUAA4IBDwAwggEKAoIBAQDuCWtJ/aDFBmejY17mEqrlgFxmetfLJWKCy6vU
+25241tsMqWW42YVuxtPwKP6Z5ure+RCzgUF0ZdddKqyaUpmNxeIq7OC7q21mMeBQ
+yahzvjzq8VgcM2iKcgCw/nNnrSZwkIaJMaej7Aw2U5VVs65rZ6bbztQbMKj51BbJ
+FM28lyTLC96+mTaofJ8hvkn2cPH3IecCFlRwNcx4w5SGuVGIPNEISQ8ypEzd2MNA
+DcnwemG46Ipv/MyILJPWP19xjl7z6VgeBLNHc0iigepBOrSnSq49WXpdwvFlkjMY
+sbPxGD1CQfPXBo6dDBNQdjn3V4cdfWRO5/Dp0J4mkkFsJkzDAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5jcmF3LmV1hiJodHRwczovL2lkcC5jcmF3LmV1L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQNbK63mDGwrA0LIPx4J3pCP/MHqjANBgkqhkiG
+9w0BAQUFAAOCAQEANbBixgiBQhJ/xB9Et8d+kZwK/OIC+Q08aCUuSlJ8URS7yB8a
+tQlX9xCW1Dj9eBVzsCNEVZQVhUA7SepbCHXwPh3cjim/255V/dboxEa5HtH76Pn5
+RSqOLhoN5SrqZn9JMZfJqIbU8vcLEwR9HqbFT0gDseyCExBdGEZb2cbnidxaTIrr
+yf6vu9LsSxP4gck3NrkfrUAWqxYis+a2qSXTni00wDcj5Si0DxZTIIFUfVeTPm02
+tEQG0fUEqzyBDxdQFuNsput7RfHF9S6iXjAEUyOc8+dXbxLs+kziJteBX01SSNI4
+NuU+VQNtPt46TiTwvP7DiXqrbeMbYZkfPB/jLQ==
+			</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..b2566795
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crihan.fr-saml2-idp-metadata.php.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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: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>
+					      MIIDuTCCAqGgAwIBAgIJAOLMseq7bx2/MA0GCSqGSIb3DQEBBQUAMHMxCzAJBgNV
+BAYTAkZSMRgwFgYDVQQIDA9IYXV0ZS1Ob3JtYW5kaWUxITAfBgNVBAcMGFNhaW50
+LUV0aWVubmUgZHUgUm91dnJheTEPMA0GA1UECgwGQ1JJSEFOMRYwFAYDVQQDDA1p
+ZHAuY3JpaGFuLmZyMB4XDTE0MDMzMDIwMzMwOVoXDTE1MDMzMDIwMzMwOVowczEL
+MAkGA1UEBhMCRlIxGDAWBgNVBAgMD0hhdXRlLU5vcm1hbmRpZTEhMB8GA1UEBwwY
+U2FpbnQtRXRpZW5uZSBkdSBSb3V2cmF5MQ8wDQYDVQQKDAZDUklIQU4xFjAUBgNV
+BAMMDWlkcC5jcmloYW4uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDYz/YtjOJXUDjxiYvZ7DgydKh6SprShSQNGmnuGPiSG3gy/BGu3o4RdYcwpjjb
+juNiOfO3NO/d5CRd0Q/+/oZ+U428dR7TZ4KXLIeNq1Uc1yArkCw5C1PKATvhIrYf
+mfkeTSm5fVTidjpPTyausemv2tfL3TVRsQCWN/AvM60X2W2c1urXUF1z0j1aujGf
+ZagdEN/cZqd5vfr9gzt4z+h37Pfu2l2VFbrYvwUmqocAxJtbK9VGh1iy2Bwv7XFo
+xB0ARBIAo5NiKvimN+yDeckZUuxnOiy4DypabitPZxW7EkrQFZnn8xlFxFltAR5A
+alP/+NiJo5LTAbjVAcgumBx7AgMBAAGjUDBOMB0GA1UdDgQWBBTDMtkGXCjC/fQO
+Qo5ghr96ywqGJzAfBgNVHSMEGDAWgBTDMtkGXCjC/fQOQo5ghr96ywqGJzAMBgNV
+HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAGtApy7G1jQfy7qR3mvdEgj1ky
+UbunBQDtVIZf+OvrkhA225cnTFmrV8GEYiBKh5HWqbd1NOcRv3ynmx23u4JuOmLL
+kiXdrp0C7R3hqacCtIhkZqxwWYUsI6+cYSnJZK/hKwHC/FF/bflIwpHdcQchcnZt
+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://unknown.site.com</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
new file mode 100644
index 00000000..2897e3ae
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-antillesguyane.fr-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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: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>
+					      MIIEgzCCA2ugAwIBAgIQBjZn7mnVRLUqdolaNDbbYTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDMxMDAwMDAwMFoXDTE3MDMwOTIzNTk1OVowSTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSQwIgYDVQQDExtpZHAuY3JvdXMt
+YW50aWxsZXNndXlhbmUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDDK7ihTFYb45TPYFb6Iy5q3kl6WzlHN/qK1/fMWkkrVEAsTqo90WRDcuVfcv5/
+6rZwnTMRLGUteLBM9gKPDR/82dQIp5Sv7rzihNl5PcnhFdrq8TFaN5FhhjqfTiOx
+oEzhEQHo+8+bNSFbPkqBRWw+uXNqnX1x3r6Oqp5lbwdHXOkJ6NkhFCigSp//Nx5A
+D6JD1kNJI1fgRwrNyPoms79UnF2bgRB61V+4wooGpyARUPFu2gcYGYKWxuM+aLth
+D5r/s7eE2wfJiAUIos/LIWPnZVq29cNFJLZsVy7q4Ww2mo3pP0PJYQF6kWUX2oay
+vrbs70bwuytOQjR3ZToZtgJ3AgMBAAGjggF4MIIBdDAfBgNVHSMEGDAWgBQMvZNo
+DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUhS79GiH1iog1fHCKwLFJ0/Xj70Uw
+DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
+MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCYGA1UdEQQfMB2CG2lkcC5jcm91
+cy1hbnRpbGxlc2d1eWFuZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAL8oG09k+jEKj
+MPr0RsBqYHJGB+X7N1UYYZzWaPy382j6ALeOEIIUa9YqGpMlG63b1k41FQb9/mou
+NAXe+SDURvTWzrZ8FHkC5cG05khGCCf+K4NToozehETd8dAHQ3N+KZHXaK2Q/4Xi
+so5n1j85kEn2GToLlZIRcQThcmI0bz4vFsHeoTPL35yTrkIu8uM6gc6gVksxcGHj
+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>
+					      MIIEgzCCA2ugAwIBAgIQBjZn7mnVRLUqdolaNDbbYTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDMxMDAwMDAwMFoXDTE3MDMwOTIzNTk1OVowSTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSQwIgYDVQQDExtpZHAuY3JvdXMt
+YW50aWxsZXNndXlhbmUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDDK7ihTFYb45TPYFb6Iy5q3kl6WzlHN/qK1/fMWkkrVEAsTqo90WRDcuVfcv5/
+6rZwnTMRLGUteLBM9gKPDR/82dQIp5Sv7rzihNl5PcnhFdrq8TFaN5FhhjqfTiOx
+oEzhEQHo+8+bNSFbPkqBRWw+uXNqnX1x3r6Oqp5lbwdHXOkJ6NkhFCigSp//Nx5A
+D6JD1kNJI1fgRwrNyPoms79UnF2bgRB61V+4wooGpyARUPFu2gcYGYKWxuM+aLth
+D5r/s7eE2wfJiAUIos/LIWPnZVq29cNFJLZsVy7q4Ww2mo3pP0PJYQF6kWUX2oay
+vrbs70bwuytOQjR3ZToZtgJ3AgMBAAGjggF4MIIBdDAfBgNVHSMEGDAWgBQMvZNo
+DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUhS79GiH1iog1fHCKwLFJ0/Xj70Uw
+DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
+MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCYGA1UdEQQfMB2CG2lkcC5jcm91
+cy1hbnRpbGxlc2d1eWFuZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAL8oG09k+jEKj
+MPr0RsBqYHJGB+X7N1UYYZzWaPy382j6ALeOEIIUa9YqGpMlG63b1k41FQb9/mou
+NAXe+SDURvTWzrZ8FHkC5cG05khGCCf+K4NToozehETd8dAHQ3N+KZHXaK2Q/4Xi
+so5n1j85kEn2GToLlZIRcQThcmI0bz4vFsHeoTPL35yTrkIu8uM6gc6gVksxcGHj
+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://unknown.site.com</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
new file mode 100644
index 00000000..cfa6898d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-besancon.fr-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?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>
+      <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="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>
+					      MIIEdTCCA12gAwIBAgIRAMZII76u8I/UaoGm5SHA9bswDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMTQwMDAwMDBaFw0xNjAxMTQyMzU5NTlaMEoxCzAJBgNV
+BAYTAkZSMRswGQYDVQQKDBJDUk9VUyBkZSBCZXNhbsOnb24xHjAcBgNVBAMTFWlk
+cC5jcm91cy1iZXNhbmNvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALpNghTEzhTIawLDDjS/sesh2W/WcgCNgVLIzoa1795aVCaY3aDhz+16lMI+
+TKb4kkuyhCeJIXejqsXw4U+Le+kC+sK4gUp5mA5L+uo/BuEhIEGx6zvO7vWatqAa
+D2EuxFJA9rCwP/TVown6joGk02+9uz5Gw8Nfj7vZm8tah/HjGrDO3Vn3d53bICZ5
+T+om3m17qlljZiQ2LWXZTK9jpmE7kWy4mQQaqq2a1Mp7jHusJiYnn8D9IRRY6Ey0
+4qGeY8+VBRujOLyp4PZaK58zaI7Ed4Ss7nNS2CnqK1ltdP4YMFRVbxwQTlYIj2q7
+0Nxre0tUcvJx2oJ24FVDzOPL5D0CAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9
+k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRdTWXEAZpCffTTzWWVcU5re0Yg
+ETAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
+BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVpZHAuY3JvdXMtYmVzYW5j
+b24uZnIwDQYJKoZIhvcNAQEFBQADggEBACAPs8z9GwVDKrtfurYVM0G4WqoKRy5g
+WiCF2CPTi5AcVOSurS6xVJg8ROL9eZOvpGh/rQ30RWpKCMoKjKU2pjrMIT7a3+EM
+7GskmRa87RVaBjIIU5ObwYBFVJ8BPoTuNBRM8PqfPSJtOAzAGtV99X+HNv29+E18
+z6UFnzhaE553mUhn77cHzWpV6nXPGkT3XBhj6I8i84tPkvWOc93zkZQNmBnSn5Ih
+2ZK+P9ZxijpVuWiOyRonrEm2hPgZT2hzTEJ1SRqSXCU7nQyu0aTXIt+2hAJMsLYI
+n7hoK/jQFwrxRIsNXyDdM5LA+HYeesO0vSRGBmVDpcZsaQ7AvSiri4U=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc: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>
+					      MIIEdTCCA12gAwIBAgIRAMZII76u8I/UaoGm5SHA9bswDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMTQwMDAwMDBaFw0xNjAxMTQyMzU5NTlaMEoxCzAJBgNV
+BAYTAkZSMRswGQYDVQQKDBJDUk9VUyBkZSBCZXNhbsOnb24xHjAcBgNVBAMTFWlk
+cC5jcm91cy1iZXNhbmNvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALpNghTEzhTIawLDDjS/sesh2W/WcgCNgVLIzoa1795aVCaY3aDhz+16lMI+
+TKb4kkuyhCeJIXejqsXw4U+Le+kC+sK4gUp5mA5L+uo/BuEhIEGx6zvO7vWatqAa
+D2EuxFJA9rCwP/TVown6joGk02+9uz5Gw8Nfj7vZm8tah/HjGrDO3Vn3d53bICZ5
+T+om3m17qlljZiQ2LWXZTK9jpmE7kWy4mQQaqq2a1Mp7jHusJiYnn8D9IRRY6Ey0
+4qGeY8+VBRujOLyp4PZaK58zaI7Ed4Ss7nNS2CnqK1ltdP4YMFRVbxwQTlYIj2q7
+0Nxre0tUcvJx2oJ24FVDzOPL5D0CAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9
+k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRdTWXEAZpCffTTzWWVcU5re0Yg
+ETAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
+BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVpZHAuY3JvdXMtYmVzYW5j
+b24uZnIwDQYJKoZIhvcNAQEFBQADggEBACAPs8z9GwVDKrtfurYVM0G4WqoKRy5g
+WiCF2CPTi5AcVOSurS6xVJg8ROL9eZOvpGh/rQ30RWpKCMoKjKU2pjrMIT7a3+EM
+7GskmRa87RVaBjIIU5ObwYBFVJ8BPoTuNBRM8PqfPSJtOAzAGtV99X+HNv29+E18
+z6UFnzhaE553mUhn77cHzWpV6nXPGkT3XBhj6I8i84tPkvWOc93zkZQNmBnSn5Ih
+2ZK+P9ZxijpVuWiOyRonrEm2hPgZT2hzTEJ1SRqSXCU7nQyu0aTXIt+2hAJMsLYI
+n7hoK/jQFwrxRIsNXyDdM5LA+HYeesO0vSRGBmVDpcZsaQ7AvSiri4U=
+					    </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://unknown.site.com</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-caen.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-caen.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..131f6d1e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-caen.fr-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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>
+      <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: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>
+					      MIIEcDCCA1igAwIBAgIRAIWsCoLazwNaSeCwR4r4mw8wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAzMzEwMDAwMDBaFw0xNzAzMzAyMzU5NTlaMD8xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRaWRwLmNyb3Vz
+LWNhZW4uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTFSohRXDn
+CnvxZd86dGAifbs6BUZuqKHPGWiQcepaxGp4U5Ivls0y+pWqaWJqBcbCO8yH/Yme
+FozWr8YqHtftwydrB2ktVKqs15xqMkodjhFpmJHp3Bkk9n5V9xIWg6pAyUXk3snf
+AaPcBVIGP6ObTer3WKBcAM7rm9QiB6dXGrKsG0q27CY+SToNV5VuRUBiJrwSRoKd
+vWodQksuhrlN+c1sA9coBD6BKketpvv3d4bVJ7NR1ZgDPvMfWyqTBF3jEqkf2+eT
+F4iDsxEQb6DQ0OXhuYH0SBd/UkGsXagxaCNLNGmMsO+n31Mvq2eCVyJKV8f3MWxr
+qs8Z83VR5aZ1AgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUJnW8QFQ+qp57ZDxP6o/OTRDBDi8wDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWlkcC5jcm91cy1jYWVuLmZy
+MA0GCSqGSIb3DQEBBQUAA4IBAQArg36XXkJ687hPW1Njtu2rQVExvAilcslSCCjg
+hE6o/dya/QltStjg3QymVlqJhEF+vvYA3aQJbaYtJt1FQ32VEI3zC7PXcAiAkekg
+yCF7zHtMKrE3caHZuKA7X8H6tb3IzX8g55P8sel2rPNPgz/BI1ieEdgE+p1Zgn9G
+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>
+					      MIIEcDCCA1igAwIBAgIRAIWsCoLazwNaSeCwR4r4mw8wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAzMzEwMDAwMDBaFw0xNzAzMzAyMzU5NTlaMD8xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRaWRwLmNyb3Vz
+LWNhZW4uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTFSohRXDn
+CnvxZd86dGAifbs6BUZuqKHPGWiQcepaxGp4U5Ivls0y+pWqaWJqBcbCO8yH/Yme
+FozWr8YqHtftwydrB2ktVKqs15xqMkodjhFpmJHp3Bkk9n5V9xIWg6pAyUXk3snf
+AaPcBVIGP6ObTer3WKBcAM7rm9QiB6dXGrKsG0q27CY+SToNV5VuRUBiJrwSRoKd
+vWodQksuhrlN+c1sA9coBD6BKketpvv3d4bVJ7NR1ZgDPvMfWyqTBF3jEqkf2+eT
+F4iDsxEQb6DQ0OXhuYH0SBd/UkGsXagxaCNLNGmMsO+n31Mvq2eCVyJKV8f3MWxr
+qs8Z83VR5aZ1AgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUJnW8QFQ+qp57ZDxP6o/OTRDBDi8wDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWlkcC5jcm91cy1jYWVuLmZy
+MA0GCSqGSIb3DQEBBQUAA4IBAQArg36XXkJ687hPW1Njtu2rQVExvAilcslSCCjg
+hE6o/dya/QltStjg3QymVlqJhEF+vvYA3aQJbaYtJt1FQ32VEI3zC7PXcAiAkekg
+yCF7zHtMKrE3caHZuKA7X8H6tb3IzX8g55P8sel2rPNPgz/BI1ieEdgE+p1Zgn9G
+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://unknown.site.com</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
new file mode 100644
index 00000000..7eab877e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-clermont.fr-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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="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>
+					      MIIEeDCCA2CgAwIBAgIRALsQfprdKL/wDycsZup+t2UwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAyMDYwMDAwMDBaFw0xNjAyMDYyMzU5NTlaMEMxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVaWRwLmNyb3Vz
+LWNsZXJtb250LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyeWI
+rH5JgGXXLn1toJKE4uQB2O8Inq44XRbzewIM/NHxn3tsreYba2Yce8xPrMf4gYzZ
+Rp+93mlMPk/e9M95bIcPCt46yPk6jVl3TXO5ITrXnsgW5Bs9/Mr23YrBhanNotGs
+o2vKJ7FrLv0Iy7VGcGRT9b5mKQ0Ir5TbfwEC11FEAIgE21mi4FV2TJI+JC4Pj2U7
+u9GWguzZr7Z4k0XQkZuhhf3tpm5wiDI4tDgSJytrv8ypGc3fMhqv3ot5v3i+kbga
+7XyFXFGcRkfaQHwZh/nOCJ4E6WXn1OgBa81tt6ofy3LfWJ18DUf3K1Nkx9pOTDs4
+jSjIbf765ZxttnoyDQIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFDwwqrZsAbpKnPY7+y5tue2HeOZGMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVpZHAuY3JvdXMtY2xl
+cm1vbnQuZnIwDQYJKoZIhvcNAQEFBQADggEBAGvcMZiDnaj4ancf6aD2HI91jhPn
+kRLo2jkhCLostGVCqtifeF6Iqr8xupBmLHNnT81DHHmgsqpqVa9Mqm9mpdHF6T27
+o2lbKuarjHXj0PXQMvunxVRFZwgUsu0pxIuV4HmydbSaZgHoNcv0+NkwOQ++ulJW
+X/gRzlyJR7PfXIiPu4qmfi2ke60hVg9+c7E2Diyj7y9D0pgZ7KgpodYH7AanQiIF
+kPD96G/i31YlrxNcHekcHT2l/KnzVqvD0Pwc3GLMTvdMtcktTGG68leu+XnrnXuj
+q9mjbunZ1wMETpOgXde+gZJ5/yyLI1G0oAp5fBmOH994BmtO4BCj9f/g/yA=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc: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>
+					      MIIEeDCCA2CgAwIBAgIRALsQfprdKL/wDycsZup+t2UwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAyMDYwMDAwMDBaFw0xNjAyMDYyMzU5NTlaMEMxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVaWRwLmNyb3Vz
+LWNsZXJtb250LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyeWI
+rH5JgGXXLn1toJKE4uQB2O8Inq44XRbzewIM/NHxn3tsreYba2Yce8xPrMf4gYzZ
+Rp+93mlMPk/e9M95bIcPCt46yPk6jVl3TXO5ITrXnsgW5Bs9/Mr23YrBhanNotGs
+o2vKJ7FrLv0Iy7VGcGRT9b5mKQ0Ir5TbfwEC11FEAIgE21mi4FV2TJI+JC4Pj2U7
+u9GWguzZr7Z4k0XQkZuhhf3tpm5wiDI4tDgSJytrv8ypGc3fMhqv3ot5v3i+kbga
+7XyFXFGcRkfaQHwZh/nOCJ4E6WXn1OgBa81tt6ofy3LfWJ18DUf3K1Nkx9pOTDs4
+jSjIbf765ZxttnoyDQIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFDwwqrZsAbpKnPY7+y5tue2HeOZGMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVpZHAuY3JvdXMtY2xl
+cm1vbnQuZnIwDQYJKoZIhvcNAQEFBQADggEBAGvcMZiDnaj4ancf6aD2HI91jhPn
+kRLo2jkhCLostGVCqtifeF6Iqr8xupBmLHNnT81DHHmgsqpqVa9Mqm9mpdHF6T27
+o2lbKuarjHXj0PXQMvunxVRFZwgUsu0pxIuV4HmydbSaZgHoNcv0+NkwOQ++ulJW
+X/gRzlyJR7PfXIiPu4qmfi2ke60hVg9+c7E2Diyj7y9D0pgZ7KgpodYH7AanQiIF
+kPD96G/i31YlrxNcHekcHT2l/KnzVqvD0Pwc3GLMTvdMtcktTGG68leu+XnrnXuj
+q9mjbunZ1wMETpOgXde+gZJ5/yyLI1G0oAp5fBmOH994BmtO4BCj9f/g/yA=
+					    </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://unknown.site.com</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
new file mode 100644
index 00000000..7617e326
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-creteil.fr-idp-shibboleth.xml
@@ -0,0 +1,64 @@
+<?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>
+      <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: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>
+					      MIIEdjCCA16gAwIBAgIRAJ5lMINLv4KL948DJ4za9FIwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAzMTAwMDAwMDBaFw0xNzAzMDkyMzU5NTlaMEIxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUaWRwLmNyb3Vz
+LWNyZXRlaWwuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhR4WQ
+mTRASe7QJ+SnbMD4o2Ol6ZGgThvO+B7UvPL63IVUydDq1bDO0S7QvFdg/79pX9GP
++WyALvuCPLDNmLXo0akCstsXmDeDgbwSumE1vgH49bCyo8LsaIm4CGyEv8EyBGIf
+5ocwzeIChFZIz93+ckldwv2cANfPNFeZehC2pprBtQwZWpHaB773p/vkkJB9ZnAc
+FHCGBDZK83Z8diQ0gcGWT5I458Iyy/GsspkboahISiH4E3RXv/crfXA3NPiz1MEl
+0DJ2Fsa5FZbUPWBVrxyITyhr3D6CBS3uPBzr52d/hycV7sIu2yE1IouoMTnrDRix
+gIyzzBOuncz7XqR1AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+ays3V0fqkOO57TAdBgNVHQ4EFgQU12L8b6JRjRbvP/2h8rSpSyj/NcwwDgYDVR0P
+AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC5jcm91cy1jcmV0
+ZWlsLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQB1+6zzpZFAyRF9Sp3qwwPQkuV7bRLV
+5hLkfhEAfCMP25E9DuAMWC9Vb0rldlneSl06dk2pA72AHrQZ+n799wCmynxNzooB
+fJXUOunDwz37fDJAbb729YAXmt4iPPG8NCSlIu2WkueaOhH2GJPJOPatItGQIUEy
+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://unknown.site.com</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
new file mode 100644
index 00000000..de066333
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml
@@ -0,0 +1,169 @@
+<?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>
+      <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="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>
+					      MIIEeDCCA2CgAwIBAgIQf+6eC3eoq8nlGO+mc54ogjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIxODAwMDAwMFoXDTE1MTIxODIzNTk1OVowUTELMAkGA1UE
+BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIERJSk9OMQwwCgYDVQQLEwNEU0kxGzAZ
+BgNVBAMTEmlkcC5jcm91cy1kaWpvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANyo4kf9llcPjqVcO+vxWaz3i1SkL+QC+CE3tgiUEb46hF2kQHad
+HtTmjHyk990C4cVRFoKq6+Gj2N5axkxRnHUptz0guu33kzk8JxUkWF1vnb5faKdL
+CFtZRHUElPoONAadyHJchqVfb2IfGEsiG60XP23WiCVKOq5c3CRsxSKXig48/PFl
+c4TAwkGuAKB7Y2m4fXcAN6LAMo4WxMRuHay4oDdfDfQe0QvH0B6ZkcI2NGfpddLF
+D8pane6HfZQtyqYkX3GDI6dU5TyjeRComWtbVoAvSfl/rrKwyeTGOnww3mPmf1ES
+LGJed6zMJdxYmqQM+DuqkApNFjBa2j8BEUECAwEAAaOCAWUwggFhMB8GA1UdIwQY
+MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRQG26cWzC6R1jFe8Gh
+iGyDLnQTAzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
+BggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6
+BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
+QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
+cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
+dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAuY3JvdXMt
+ZGlqb24uZnIwDQYJKoZIhvcNAQEFBQADggEBAIRuZDitOJc9Xi9K6yuHv2Om0lrD
+wKZvwNq1hGmyO0zy1+uohXCjkfV5P8fNSDPhFom6xGXqDjXO6+S7cvyt8AbBKgjV
+PmJPgCLN54b60fEONGWsbRPlfcrT7rvz0h5ArMRU5ZntA5Yc/YLEmI+o57AKraUp
+ZyADGtvD12IY6WL2zFdjMRwqgGTmpIdz7Ab+lt7rzDDhGUHBkXkCQZZhGQZbgaaR
+FgFdbxqMVJ71Vz+iUOHcHZNmXLC7HBNvh87IGqmSIJUc7lijeaoHUtVovANM8X2W
+rEJaVJ/XHu7r2/Ui5qEpkWkldy75/hdLiLj4Wr5oqPlgHZfwHNvNdy4DoQk=
+					    </ds:X509Certificate>
+        </ds: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
+BAYTAkZSMQ4wDAYDVQQHEwVEaWpvbjEXMBUGA1UEChMOQ1JPVVMgZGUgRElKT04x
+DDAKBgNVBAsTA0RTSTEaMBgGA1UEAxMRbnMuY3JvdXMtZGlqb24uZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4CnU/wibyinuaPI2EqcrvmaWCV9dz
+Z9zkKanUn0KVoPGaFayhJCI/H0c5D+FEJl/lsA0YKzghi8baSc8L+pmq+LV4DF0k
+k3Ke9Yfn9gDr5Y+IadmSo7nmxiE42LJrFZBSzPrqK7HClDKskkgHu6lIXX3vDwX9
+NTUWOITDsqh+iLziudBc4DLim1brrMVwdpZVwCGWixI+pnx+Mn1KaLkW2migteMW
+TvAj7uf37zucUa0RhHXI5IbsmRXsH04r7Xq2et74nQETmGS861kBfEtqNWs8oZNF
+GGT4y7VCq4XIN2ZFp7xZetyzEkrlaGxJyL+2H0PFy2PJkVgU0BRpEA//AgMBAAGj
+ggGMMIIBiDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
+FgQUkCg4s3FgI7pzpdqRGT3IeDfAkSUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
+/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
+DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
+AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwRAYDVR0R
+BD0wO4IRbnMuY3JvdXMtZGlqb24uZnKCEmNhcy5jcm91cy1kaWpvbi5mcoISaWRw
+LmNyb3VzLWRpam9uLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAIUjdnsILs5B0S4r30
+7X842J3m5zaE7xQ2kKKAa8FiF2TNZ+dzQQDbYrB8+nLD85ziWEwLzqGPHulDWbTI
+YxUX6Stt/KMW5frhCXX2i7hEp3gfKazu+jXou9ISXRuqKCU198d2Ic1Pqu8VoxwF
+7BgmqM7TDu+t8FTDF7rufbSKwCIR+yY+3oHtdNlZEdGCvCGOakfBEgqyZ4H6USuH
+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>
+					      MIIEeDCCA2CgAwIBAgIQf+6eC3eoq8nlGO+mc54ogjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIxODAwMDAwMFoXDTE1MTIxODIzNTk1OVowUTELMAkGA1UE
+BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIERJSk9OMQwwCgYDVQQLEwNEU0kxGzAZ
+BgNVBAMTEmlkcC5jcm91cy1kaWpvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANyo4kf9llcPjqVcO+vxWaz3i1SkL+QC+CE3tgiUEb46hF2kQHad
+HtTmjHyk990C4cVRFoKq6+Gj2N5axkxRnHUptz0guu33kzk8JxUkWF1vnb5faKdL
+CFtZRHUElPoONAadyHJchqVfb2IfGEsiG60XP23WiCVKOq5c3CRsxSKXig48/PFl
+c4TAwkGuAKB7Y2m4fXcAN6LAMo4WxMRuHay4oDdfDfQe0QvH0B6ZkcI2NGfpddLF
+D8pane6HfZQtyqYkX3GDI6dU5TyjeRComWtbVoAvSfl/rrKwyeTGOnww3mPmf1ES
+LGJed6zMJdxYmqQM+DuqkApNFjBa2j8BEUECAwEAAaOCAWUwggFhMB8GA1UdIwQY
+MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRQG26cWzC6R1jFe8Gh
+iGyDLnQTAzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
+BggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6
+BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
+QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
+cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
+dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAuY3JvdXMt
+ZGlqb24uZnIwDQYJKoZIhvcNAQEFBQADggEBAIRuZDitOJc9Xi9K6yuHv2Om0lrD
+wKZvwNq1hGmyO0zy1+uohXCjkfV5P8fNSDPhFom6xGXqDjXO6+S7cvyt8AbBKgjV
+PmJPgCLN54b60fEONGWsbRPlfcrT7rvz0h5ArMRU5ZntA5Yc/YLEmI+o57AKraUp
+ZyADGtvD12IY6WL2zFdjMRwqgGTmpIdz7Ab+lt7rzDDhGUHBkXkCQZZhGQZbgaaR
+FgFdbxqMVJ71Vz+iUOHcHZNmXLC7HBNvh87IGqmSIJUc7lijeaoHUtVovANM8X2W
+rEJaVJ/XHu7r2/Ui5qEpkWkldy75/hdLiLj4Wr5oqPlgHZfwHNvNdy4DoQk=
+					    </ds:X509Certificate>
+        </ds: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
+BAYTAkZSMQ4wDAYDVQQHEwVEaWpvbjEXMBUGA1UEChMOQ1JPVVMgZGUgRElKT04x
+DDAKBgNVBAsTA0RTSTEaMBgGA1UEAxMRbnMuY3JvdXMtZGlqb24uZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4CnU/wibyinuaPI2EqcrvmaWCV9dz
+Z9zkKanUn0KVoPGaFayhJCI/H0c5D+FEJl/lsA0YKzghi8baSc8L+pmq+LV4DF0k
+k3Ke9Yfn9gDr5Y+IadmSo7nmxiE42LJrFZBSzPrqK7HClDKskkgHu6lIXX3vDwX9
+NTUWOITDsqh+iLziudBc4DLim1brrMVwdpZVwCGWixI+pnx+Mn1KaLkW2migteMW
+TvAj7uf37zucUa0RhHXI5IbsmRXsH04r7Xq2et74nQETmGS861kBfEtqNWs8oZNF
+GGT4y7VCq4XIN2ZFp7xZetyzEkrlaGxJyL+2H0PFy2PJkVgU0BRpEA//AgMBAAGj
+ggGMMIIBiDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
+FgQUkCg4s3FgI7pzpdqRGT3IeDfAkSUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
+/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
+DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
+AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwRAYDVR0R
+BD0wO4IRbnMuY3JvdXMtZGlqb24uZnKCEmNhcy5jcm91cy1kaWpvbi5mcoISaWRw
+LmNyb3VzLWRpam9uLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAIUjdnsILs5B0S4r30
+7X842J3m5zaE7xQ2kKKAa8FiF2TNZ+dzQQDbYrB8+nLD85ziWEwLzqGPHulDWbTI
+YxUX6Stt/KMW5frhCXX2i7hEp3gfKazu+jXou9ISXRuqKCU198d2Ic1Pqu8VoxwF
+7BgmqM7TDu+t8FTDF7rufbSKwCIR+yY+3oHtdNlZEdGCvCGOakfBEgqyZ4H6USuH
+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://unknown.site.com</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
new file mode 100644
index 00000000..7206c2a0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-grenoble.fr-idp-shibboleth.xml
@@ -0,0 +1,66 @@
+<?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>
+      <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="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>
+					      MIIEdzCCA1+gAwIBAgIQJXNY9IPVDDkw5l9yCMhrQTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDkxNTAwMDAwMFoXDTE3MDkxNDIzNTk1OVowQzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVpZHAuY3JvdXMt
+Z3Jlbm9ibGUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHPm9t
+Jjz1cm0wZpVpxnN8vANWsur6N3iue42UeYbyXWTvHRSmO+QZMTYMULmTLf5zhp1r
+zF56kyPMfO7PMtJ5E1xlz22L+mlg7Rd3FQH3JZxlpZPDDVqXAL4mxZH/kPfrHr98
+kkp9tMbuGVC0CKyE6pVVw8HQrp2ZMNLVsHnwta0dMRDxUzOjpY3STs7BQxqO0rhy
+n53wd3jb74oIj5oTi1AW/r2lvu5d2IXTSWjlOxgpAg+Pay+rwT98yv0Ox0G6XdXQ
+8IhPrWdL421/VKIu5xqfDtSKgJeq2JNlamqx0crk7MlBRyUEXGMlOL0CPqzAiPfp
+TBn3LYg95jrVJ5ofAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+ays3V0fqkOO57TAdBgNVHQ4EFgQUiAemAdbi7dUgmxf4rUhJVqdgFAIwDgYDVR0P
+AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFWlkcC5jcm91cy1ncmVu
+b2JsZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEATZ2G4Kb8XApp47+o/4/GFetVkiZc
+L113ZiOXH4Q/ZD9sfAqh/6G5kvAYDdCLCL5UxmOcOkXH/wkXyoeP82yyFF5GeGzp
+mwKoOpr34+0ux4ctI1T1UZNPz5Bv4AUAEBbru6ZpCsEmw5KwFpSGOjPnlPspkJBT
+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://unknown.site.com</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
new file mode 100644
index 00000000..a79469fd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-limoges.fr-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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>
+      <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: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>
+					      MIIEdjCCA16gAwIBAgIRALZcQBV2KHd5bIl5Qpk5ONAwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAzMjcwMDAwMDBaFw0xNzAzMjYyMzU5NTlaMEIxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUaWRwLmNyb3Vz
+LWxpbW9nZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYnE9D
+NfGEpBj3Iy72odoL+yZSdhS+FsM/IU2BJANw6dbXRpNMFfNnLRkWWPTwdeJh8r4A
+eNmRKLQCMZP+E/NY3zQlnAOakL2c/fgBTv5Oawe3speWTS3N0whStUMtbgzWafBE
+cToI3gFcC4x0JPklum99m+ZZ17D3oLrIttOYZ4fXjsQj2yJwFBp3nJ7qh1rfwfKf
+rAYKF0gxekGUR5YgjFKpU4zbcZSHeIAHaD8WLJRkdEBvEC/tF8gjrBSP2aTAgLUS
+bk81rZWRXXA0CCZynsTpDvtycQhL3/4zMIkUPpV9So68DZz63QXXZTwUIyyjWtOv
+C8ZDw3WvVWTsxdf9AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+ays3V0fqkOO57TAdBgNVHQ4EFgQUfiR82eCVOYTgD0HPV8QeEe5jLSIwDgYDVR0P
+AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC5jcm91cy1saW1v
+Z2VzLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQCQRcYk/yvCdP/VT7R890J3pvAXlEm8
+7/DWetj4M6P3pV41o8wiuZT49jsSvGKvFEiq8QrE3MQjpWO+ASd90WCfKGJGgWta
+9oftaIHINRmEd2mDQ1WMuZMbaXEwOf7lxiSvzlxRXHgAJ3C0oexBx6z16GRPLDMY
+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>
+					      MIIEdjCCA16gAwIBAgIRALZcQBV2KHd5bIl5Qpk5ONAwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAzMjcwMDAwMDBaFw0xNzAzMjYyMzU5NTlaMEIxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUaWRwLmNyb3Vz
+LWxpbW9nZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYnE9D
+NfGEpBj3Iy72odoL+yZSdhS+FsM/IU2BJANw6dbXRpNMFfNnLRkWWPTwdeJh8r4A
+eNmRKLQCMZP+E/NY3zQlnAOakL2c/fgBTv5Oawe3speWTS3N0whStUMtbgzWafBE
+cToI3gFcC4x0JPklum99m+ZZ17D3oLrIttOYZ4fXjsQj2yJwFBp3nJ7qh1rfwfKf
+rAYKF0gxekGUR5YgjFKpU4zbcZSHeIAHaD8WLJRkdEBvEC/tF8gjrBSP2aTAgLUS
+bk81rZWRXXA0CCZynsTpDvtycQhL3/4zMIkUPpV9So68DZz63QXXZTwUIyyjWtOv
+C8ZDw3WvVWTsxdf9AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+ays3V0fqkOO57TAdBgNVHQ4EFgQUfiR82eCVOYTgD0HPV8QeEe5jLSIwDgYDVR0P
+AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC5jcm91cy1saW1v
+Z2VzLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQCQRcYk/yvCdP/VT7R890J3pvAXlEm8
+7/DWetj4M6P3pV41o8wiuZT49jsSvGKvFEiq8QrE3MQjpWO+ASd90WCfKGJGgWta
+9oftaIHINRmEd2mDQ1WMuZMbaXEwOf7lxiSvzlxRXHgAJ3C0oexBx6z16GRPLDMY
+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://unknown.site.com</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-montpellier.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-montpellier.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..24ce26a7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-montpellier.fr-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-montpellier.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-16T10:39: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous34.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-montpellier.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-montpellier.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">CROUS 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>
+					      MIIEfTCCA2WgAwIBAgIQW84RLDvn4CKSrQzHY8mYBDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDQwNTAwMDAwMFoXDTE2MDQwNDIzNTk1OVowRjEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSEwHwYDVQQDExhpZHAuY3JvdXMt
+bW9udHBlbGxpZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDN
+ipxZYjH7Okg/AxioyADxQjZ0Nh0Zo53WIWAyFUnC6C+nMgUJ1D/00DAQNyret7d9
+QsWPZ91tpNvJe/TmMF3LEAVmlCKlB0VUM4PDhHSC6oVvQfwmNVfbY6HnxeDaei1V
+MwW5Xyg+84tbKXhflWO7CradjLBhCpcUO4HCXiep9VGbSj/0bAVHxndqJ25n2zRa
+SrqdWPkwXtdr5Ui2ZvsO5Hjv+MbDdmoHOhggKfPYGm19qL+Z7qOwMQBpd0lj017n
+PQM42NBtpNT0BDuBNvtjf5eaBZC8LS7fSMRMQwPf4VhpNY1I70MwdomiDxqNwYXx
+9anx5kqh7PBMZZZ0UIxzAgMBAAGjggF1MIIBcTAfBgNVHSMEGDAWgBQMvZNoDPPe
+q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUe3icn+qHFOTQo351iBCQVUwSD8owDgYD
+VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
+A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGGlkcC5jcm91cy1t
+b250cGVsbGllci5mcjANBgkqhkiG9w0BAQUFAAOCAQEAPUj56pqt4omDji87y4AW
+oSvMlOm2D/BKs05Y+73RGi4uWLJBm5kDFjf1sGz13mBqvDOcRmgVwyvwshoN+ore
+TDXjzlln23EryRcKFR0UWhTr+YJx1gnKKh5l2zkfESbW6GzBWUCNpPET6yfGnYEi
+9zwT4/4fTCyZFQ4Gobp8txuRxEYK04TXMfisRWalUsaN+RvQ4P67PybkKkGpYT2m
+ZYgF8wFNPxv7zYjytnwMsgooqbljTUNZ4l8X3CkWyQtg+fEs/YTq/N6nJxTr9lum
+rfFn3UDbcx+AygODjXAnt3UQ3xAOFeZtQIL55aqo9p7NAdd0cTd3JAQYcCoqUDWT
+IQ==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc: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-montpellier.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-montpellier.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-montpellier.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">crous34.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-montpellier.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-montpellier.com</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEfTCCA2WgAwIBAgIQW84RLDvn4CKSrQzHY8mYBDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDQwNTAwMDAwMFoXDTE2MDQwNDIzNTk1OVowRjEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSEwHwYDVQQDExhpZHAuY3JvdXMt
+bW9udHBlbGxpZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDN
+ipxZYjH7Okg/AxioyADxQjZ0Nh0Zo53WIWAyFUnC6C+nMgUJ1D/00DAQNyret7d9
+QsWPZ91tpNvJe/TmMF3LEAVmlCKlB0VUM4PDhHSC6oVvQfwmNVfbY6HnxeDaei1V
+MwW5Xyg+84tbKXhflWO7CradjLBhCpcUO4HCXiep9VGbSj/0bAVHxndqJ25n2zRa
+SrqdWPkwXtdr5Ui2ZvsO5Hjv+MbDdmoHOhggKfPYGm19qL+Z7qOwMQBpd0lj017n
+PQM42NBtpNT0BDuBNvtjf5eaBZC8LS7fSMRMQwPf4VhpNY1I70MwdomiDxqNwYXx
+9anx5kqh7PBMZZZ0UIxzAgMBAAGjggF1MIIBcTAfBgNVHSMEGDAWgBQMvZNoDPPe
+q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUe3icn+qHFOTQo351iBCQVUwSD8owDgYD
+VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
+A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGGlkcC5jcm91cy1t
+b250cGVsbGllci5mcjANBgkqhkiG9w0BAQUFAAOCAQEAPUj56pqt4omDji87y4AW
+oSvMlOm2D/BKs05Y+73RGi4uWLJBm5kDFjf1sGz13mBqvDOcRmgVwyvwshoN+ore
+TDXjzlln23EryRcKFR0UWhTr+YJx1gnKKh5l2zkfESbW6GzBWUCNpPET6yfGnYEi
+9zwT4/4fTCyZFQ4Gobp8txuRxEYK04TXMfisRWalUsaN+RvQ4P67PybkKkGpYT2m
+ZYgF8wFNPxv7zYjytnwMsgooqbljTUNZ4l8X3CkWyQtg+fEs/YTq/N6nJxTr9lum
+rfFn3UDbcx+AygODjXAnt3UQ3xAOFeZtQIL55aqo9p7NAdd0cTd3JAQYcCoqUDWT
+IQ==
+					    </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-montpellier.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 Montpellier</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Montpellier</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Olivier COUADE</md:SurName>
+    <md:EmailAddress>olivier.couade@crous-montpellier.com</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
new file mode 100644
index 00000000..feef5042
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-nancy-metz.fr-idp-shibboleth.xml
@@ -0,0 +1,66 @@
+<?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>
+      <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="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>
+					      MIIEfDCCA2SgAwIBAgIRAM5o4WD6O95qTaaU1z+tWw4wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAzMjAwMDAwMDBaFw0xNjAzMTkyMzU5NTlaMEUxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXaWRwLmNyb3Vz
+LW5hbmN5LW1ldHouZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDL
+R1c4GL3zTfYfOGNLV5wcJIlhDDYdk1286uSM4zbrXIbWc5C+vxbuYKXCN3BJeOpX
+rxGjVMP0Kz/nJQVsWZGAIOxiejcXo4npAEgnPjnHVl0Y263vS5/QrT0H2ttIQsdt
+HBZy2Gq+AOIO4hUOL4MuIFK6uZBC12yqoARb34+IO2DJ77ElbvSHu03bJAoSGLXG
+ERdGIS3lEO0jJTdVbho3EmPR+ht+GysuVfSGrUNWlQf7ZMrche+fI5unjbUS4LRm
+XB92H+3kJA+51EWrgdslcIB43Yr7oxlZUng3V9WByIY5x7/U4GhXobyI/rkyqISo
+q0lzXR5ZQLBgRkil30FdAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
+q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUPqT/EG7DgKwpR5aj+ZaZTv2QOlYwDgYD
+VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
+A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF2lkcC5jcm91cy1u
+YW5jeS1tZXR6LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAZXnrox99qVZFbXueFnN9l
+uY6MZnN393FnefeNNGadvEWF0gXyI3rdd3AYKz36cob+ByC3RaMyopOMDJZ5yfX/
+yC1aBqSGPHAkmFazWwFevwegau0rDil+QOhZfrMPJT+YTfFSmvym++tbrgIWyOTF
+2tNGJyeSA8S6qxrnnVFqvxt4W6jNupG5axSfrdvX+WETG9Im9B3Ulc81t3cYzItC
+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://unknown.site.com</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
new file mode 100644
index 00000000..6425b5cb
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-nantes.fr-idp-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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: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>
+					      MIIDODCCAiCgAwIBAgIVAMI83efvzywvxHitZXX4VZlwTMCTMA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMTE2lkcC5jcm91cy1uYW50ZXMuZnIwHhcNMTQwNDEwMTI1
+NzAyWhcNMzQwNDEwMTI1NzAyWjAeMRwwGgYDVQQDExNpZHAuY3JvdXMtbmFudGVz
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqNwp1Kemrmrbq+EJ
+AjqE4/C9R90pS4T5FShT/qCBlZUysiApI0/F1rcYqDfccHINp0Z6wsKAVcM10eOv
+1JokHOc1CKiPRMDTy1GLCjELj7JyLacZeEkg4Tja/6ILXcnWMOe/WrddVCvuOjxN
+nekRqxkrTMsOI44zV2Z5grnGReyhAYmV38VphFBYFn5IFZAbJNcip82rJsJAr6rS
+yN+NtX1u70UyJ9jlZlH0pu796AQX8CnsG7DBrRzSO2bttQySFrvqf1MkQJknDIuC
+rWcCGBNmCgSs5GusevCbRMvJxhLhE2F/19pyKawjM6/2QaG5LhYprQRXWLnBnJY3
+vXzmOQIDAQABo20wazBKBgNVHREEQzBBghNpZHAuY3JvdXMtbmFudGVzLmZyhipo
+dHRwczovL2lkcC5jcm91cy1uYW50ZXMuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFA0ym8iOuZOL8OiKnoyrOXIteMCPMA0GCSqGSIb3DQEBBQUAA4IBAQBOElqO
+epb/E6K9bXwf7GFHqGWr4W7qEpqjJWvwbYLD8CUFKQaiEIQnWDywPpOTaVqwY548
++4vNNu/xab3U8INNmnRf26TD2CuknF2GUqDy5FBPkwwrTHoQbsNp7c1nCABpH3gF
+pM9wqeKv332VzQPVFERNYY2ZtngdmvALe7EGyMntjtYm6J1NFQGAl0w5dx7KRU59
+/NV3jddW4fqkuqKKCNEzWx+mOcunNLWoJMnZwixbLczf1qw5bA3uEdL4qEepqyUe
+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>
+					      MIIEdDCCA1ygAwIBAgIRALmCI9KfSplaBaEw3OkzCqswDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzEyMDQwMDAwMDBaFw0xNjEyMDMyMzU5NTlaMEExITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTaWRwLmNyb3Vz
+LW5hbnRlcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN7dNk66
+6Q8SjuXbyYGRJDmUcZzfrQbZo2tm93Q6UW0OwyidY+HQ2kwjnfFtAO8k9nYJbUR7
+sbffjlJ6cE7UqvzCCLhdQ+ljv0qMQIUFCdQyq7Qc1JtJ5wDppK7gFFxHi0JkZKzc
+eI5a8MGJ9QmBa9dqeD6bR116TkiF8zBpuUvTz64E9OIb0RuO/auFn0T0fpOh3WlS
+Gl2viccrsMKLBYqYNVESBlKbO2KvfcgYJJF5FcwBL+UWoCms5wo/R4jr4CfyOZ7D
+1S4Em8Id62+3iIVybn17BF0iO1zhuExh8NHGT4HpfZbqfwZh+3i7X1CflXRoZ/bi
+b3xYhYGmkkphqg0CAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
+KzdXR+qQ47ntMB0GA1UdDgQWBBQ48HcJP0W24khejtyhRVxcWxIkgTAOBgNVHQ8B
+Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
+BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
+BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+L29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITaWRwLmNyb3VzLW5hbnRl
+cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEABJnxgwEeQraM3Xe7rLl95ex0B+QUrBVY
+GCjumdLmvDf8i26sr8V1S/Y7pnFvwOwJutrf4P23tYEcFlMRjxkSZqGhfkzws+A4
+oGEtdmL2SZwX4kkhczWk2VboqCaywOPKhLrZBlsezqwpNODU5MSEs7DHZB4RV1kx
+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://unknown.site.com</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
new file mode 100644
index 00000000..893f91b5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-nice.fr-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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>
+      <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: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>
+					      MIIEcDCCA1igAwIBAgIRAMHTGdw9yTpb8GTC7eORirkwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MjMwMDAwMDBaFw0xNzA1MjIyMzU5NTlaMD8xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRaWRwLmNyb3Vz
+LW5pY2UuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnQ3RV1nfN
+L8sIsz8lErI6GirN9Gm96VGgQIlFVdE4MQt1zJ8v8VfPeFH++a/N/I56emmGRc/G
+sihTWAXZ8prWUYisSPtuTmnHXFmAEOJZp4/ajdVUUBT+WMGpJx2XUfIUPfa1+TK+
+w+0eqRpCh6IWtPqyPOLs24lKdDcLV55j65LLcBfyejeUsjtyGrimC64Dy1vXTAJf
+yHVk5GeOvAvcdCBZUO5GRjIhlWiH0YLJJ439MzpbEgXYhIFQvPEVBY+he448SQXS
+anD9JJalMmA9/tmWHqo9qCusDxXVzGUhgW2FHKh49AjMaXp/W5n1p50ZLoicEq7k
+s5NtBCw8jCGDAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUs/OdYrZbtOAjgBXRUwXEVH/bhJ0wDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWlkcC5jcm91cy1uaWNlLmZy
+MA0GCSqGSIb3DQEBBQUAA4IBAQA+TVHB9HB1aQF2emZfL4BKmI+ULDlvSPunwG1w
+BYzKcYeg2pH39CFREkXTGXn/VDFGXdMOmVlvTGvNeQwEWQVbqrHEyFSyney0e7ZE
+KsS81CNBYBd7KTWJC4NpYXsrlGT43cKIeWsbbhVRrG8xv3y66AOrzW8HO0kHbkb5
+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>
+					      MIIEcDCCA1igAwIBAgIRAMHTGdw9yTpb8GTC7eORirkwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MjMwMDAwMDBaFw0xNzA1MjIyMzU5NTlaMD8xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRaWRwLmNyb3Vz
+LW5pY2UuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnQ3RV1nfN
+L8sIsz8lErI6GirN9Gm96VGgQIlFVdE4MQt1zJ8v8VfPeFH++a/N/I56emmGRc/G
+sihTWAXZ8prWUYisSPtuTmnHXFmAEOJZp4/ajdVUUBT+WMGpJx2XUfIUPfa1+TK+
+w+0eqRpCh6IWtPqyPOLs24lKdDcLV55j65LLcBfyejeUsjtyGrimC64Dy1vXTAJf
+yHVk5GeOvAvcdCBZUO5GRjIhlWiH0YLJJ439MzpbEgXYhIFQvPEVBY+he448SQXS
+anD9JJalMmA9/tmWHqo9qCusDxXVzGUhgW2FHKh49AjMaXp/W5n1p50ZLoicEq7k
+s5NtBCw8jCGDAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUs/OdYrZbtOAjgBXRUwXEVH/bhJ0wDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWlkcC5jcm91cy1uaWNlLmZy
+MA0GCSqGSIb3DQEBBQUAA4IBAQA+TVHB9HB1aQF2emZfL4BKmI+ULDlvSPunwG1w
+BYzKcYeg2pH39CFREkXTGXn/VDFGXdMOmVlvTGvNeQwEWQVbqrHEyFSyney0e7ZE
+KsS81CNBYBd7KTWJC4NpYXsrlGT43cKIeWsbbhVRrG8xv3y66AOrzW8HO0kHbkb5
+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://unknown.site.com</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
new file mode 100644
index 00000000..c64a87b3
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-orleans-tours.fr-idp-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+      <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: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>
+					      MIIDVDCCAjygAwIBAgIVAMl6t3QQN7SBNiEk1q64K1duI81gMA0GCSqGSIb3DQEB
+BQUAMCUxIzAhBgNVBAMTGmlkcC5jcm91cy1vcmxlYW5zLXRvdXJzLmZyMB4XDTE0
+MDUyNjEzNTUwNVoXDTM0MDUyNjEzNTUwNVowJTEjMCEGA1UEAxMaaWRwLmNyb3Vz
+LW9ybGVhbnMtdG91cnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDMVDqwA5RAg6HnDR7KyX0G3DKH0AnRsMZcbL2nU3Kt7eOnn/vKncGA/VoYPW7o
+CPWEPJZ8WsHODOtt//PCIVwfp7REAol0oUDPu2XYRHkKOtbhpp4mqF/CSuWT7bSQ
+EmLv94O9/aPjN5b/D1z8oj6di7EJz7JGr4ARHw9NEcVEgsg5b5gAT87A5wASoNbn
+T0fpOpmJQy2lCNfxAfJsq0O2PSa5Hfxg1KeVI6mDsSSLnlaS/n4uMXLGono7QbeB
+6tXq0D4wy3f2tUF54CiG9epe79VU+VqZQjb+33LO+r+DbizBbl0Q1pqvNHeaN07i
+rMVAuAFYBBquiReXwzXVlZ/pAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC5jcm91
+cy1vcmxlYW5zLXRvdXJzLmZyhjFodHRwczovL2lkcC5jcm91cy1vcmxlYW5zLXRv
+dXJzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQteIp+4pKTwpW1QSeCeYi3
+ZwHBdDANBgkqhkiG9w0BAQUFAAOCAQEAa2opfhVRYW/GQmbtQC7HzNd/E5ovBrns
+l3Feh3q6gyL5kZlxcM2LasVUiv99v9hqw4eLmOhZrYtieQyPNTmijxGhFFqCCd+m
+sPQWi85i0R4/y7BKoZ7IkdeBuFxYsT9hGKMYtPXFHu2oNAAF9n19MY48vuVxJse5
+3W4/oX/WiSm1Fj+mDMmo11+zRjk2dwykd8TPKlo4klWxN0rcLrcUc9Zr1BRbZngi
+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://unknown.site.com</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
new file mode 100644
index 00000000..e0b6c72f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-paris.fr-idp-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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: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>
+					      MIIEcjCCA1qgAwIBAgIRAM7lNOy1/r/jbhKXln6a66wwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzA1MzAwMDAwMDBaFw0xNjA1MjkyMzU5NTlaMEAxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSaWRwLmNyb3Vz
+LXBhcmlzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzQAmbWEI
+R0hGecLlfeDWLKnX8jIgjvZ6vGpCQSuk+haMglzUgOWhVfOdvJHyUK2FuFcu1KME
+6JtSmgVjI3ooZuzfSS2eTl/Cc/4+6ZwoxhFpIjUHXdlgdG4aLSuduAimH5hPWegU
+Jlt4faTSAiGe6OTvDJLDtbfRYYNCgkXJjV21PQbtGOeTBdrfjFm07y2O+EzygAkM
+xQsz8dRV4uRJOSmUdUcaVOYvAIrnapJtJChfn/peP8kViX6Qe4Po+sdQEtUOlL7c
+uAs+g7YNlvlLglzyLzItAJKlafOK3xU/zwB6JZ86T6cjnalCGQhwErnCWIiMbLY5
+vuR39ofOwLFL8wIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFEHqA+ucEkHkbVIO5lq71eNIwXeYMA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAuY3JvdXMtcGFyaXMu
+ZnIwDQYJKoZIhvcNAQEFBQADggEBAB6Vle1wXkVbFC43JvqOvdraHJP5F7IxnPwd
+h3tIBYhgG8x2+49+OcNy4cOTkp7R7yrkw1r5G0T4vcwWvyBRLL9l8UTdmUv1HRZl
+NXSLMAk1TFxS2Vk6HUa/xGHVvGrzaxWC4s02RWC9HFGnNWCDn2+YbJr2se39+wM+
+2ACLK8Gn8FjSfGoc9hcm6d8ISjP3fQOqMjfrozsuzcWH9wrZpjPdJ/T2PMN8drcV
+CTgq1R0X/PiDgj9XuHMMkN7W6FK3t6TKUZ3gD2DTvZNPrL6Iasuf0TSIy89oHQce
+RQGzRlb3b9mZzx8kOGWx8O/wqV5Rq3m+rl5koGZabWayn6GXzMQ=
+					    </ds:X509Certificate>
+        </ds: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
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzNUjklU6Rh2sEVjN3AHt
+oB5bghVwXkIVxCfW4SIVH3W1iLYH3dCKEbNNbfJ65kUVWzXTQV2jT4lfx/1BeC3C
+36tS+JGMtb5gvyJw22Pg8sLzOUPHACYncYhfaNDFIyZpUfHiRKfEUCUIyriecWmL
+i4LApNNvjmmV0/8GT1WBv9rQhy5CbJXznLk3fphqAb9Yu/2YYhXfHsSl21kTjApR
+o+EeCmdWAKROC1fn7yV/Velu051YLC8ILaijms2dyEvXLmLVG97MjCsIpnWL0UPJ
+pEwGBWSa6lBzE5/YzHIZZ3HQBXlq8TzMjaEOtjgHuht0t7f1K2i81K7JXheP9muq
+xwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuY3JvdXMtcGFyaXMuZnKGKWh0dHBz
+Oi8vaWRwLmNyb3VzLXBhcmlzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTZ
+e98ddDx7TkaHMxapxpn4NmdkkjANBgkqhkiG9w0BAQUFAAOCAQEAb9Vl+xXRr2Zq
+sB7websZjpGg/SiukcN5stPPHEvKoNEMs7YclSDEiW7FyI/IWHjKsE3n1Ah+8jjB
+iLzOO77y2MuY/qOIKD2HT6cXBYGU2Sxss/FEPyMPGpIhEe+tv12D5tRX5B1FG/sW
+FicTUZlz3duoTqsrz/sNoTozpwtThMBvALu1w7yrMLWIZgEa0V+csm/2/cAc4qXt
+3yg0OxbBqyK7V1fBEkL35vL4xZJesk/NdiDq+K1D5fzWFHqvq8d3PCcRu9mZFonS
+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://unknown.site.com</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
new file mode 100644
index 00000000..38221de6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-poitiers.fr-idp-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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="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>
+					      MIIEdzCCA1+gAwIBAgIQN3OORXWc3cChLNqDZoOjGDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDcxOTAwMDAwMFoXDTE2MDcxODIzNTk1OVowQzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVpZHAuY3JvdXMt
+cG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8oGB5
+P3shavDXjX9yTT/z+7Or9BOJ6YB+bf34xX7Javtb4fze/7mA5dDijJ6khVaULAzT
+YbxZX4uTbnl0V1k8jJofjEv/0dNHJK7tARzS21jn8Uj9qdDnLf0kgNFI9KrzgSOA
+h8orYsEMO9JRaXO5adt9Y6fub/ePGnod73xC4LeG0jQIFJDEN1d/fOamalc4TDUe
++Bts0Sa9vx/wx+oqBhhrxrgMzXMRDzdR/e2+2EbQITW0V1AIiX7AlX30N3lV4L3b
+LxU9jyHX2XOB5oo3Kaj7RerWSDgXWrgv8+fz8lc1jBd2fyXIKsiC/d7i7FTaTWwt
+r+YAZcyl8NNsxukdAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+ays3V0fqkOO57TAdBgNVHQ4EFgQUtazuewoiBQj6dX2wFmouplCmJwAwDgYDVR0P
+AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFWlkcC5jcm91cy1wb2l0
+aWVycy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAKJt2lulJryvECmZz04CvNsBtNs1X
+uL/vYf2XCnqNoiOR9UWTir/2Y1pyfq/MG7SdhNVtPia66gt88gU0RHpkgbuTqAjA
+VtMaW02SKhNTJ70Ujbi5YQfRewTA/efsTahZ5jx3qYhGelFuqTWtvRCDcCPjO/4f
+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://unknown.site.com</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
new file mode 100644
index 00000000..cec55187
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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: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>
+					      MIIEajCCA1KgAwIBAgIQa6ko9Kashh39Z5Tcht03DzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDEwODAwMDAwMFoXDTE2MDEwODIzNTk1OVowQzELMAkGA1UE
+BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIFJFSU1TMRswGQYDVQQDExJpZHAuY3Jv
+dXMtcmVpbXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC555WB
+8B1fRb8vSWEVIm0fFonTJazsqrpwELDuWp9zUHdP0bgjSW1AmzSrSyNUWcflmqw2
+yQD7ouaCQ2g8JWNaMo73Z4E9t8ttNVYzpnP4MaMkWATQtsi4eP/EVCRX3v0yaQcR
+yQ8T2YjpJOHviOcI7lfyHG6Nxks3kW7SjzfweWLt9jEW8pH9UE7jYDsLnHwLml0q
+Zp+MglspxeqgziNhk91qS3W/ZtvbnDVLXXLetYjXrlLZGHw08Qo0hq9OYrio3OOZ
+dshYmQL0bD5egtq61kbU3ayzIc1IbrD1mtI3EP2CtZEdVr9JgCRCNrlrcAOEqnfT
+rCfA75FdYGYZROQnAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+ays3V0fqkOO57TAdBgNVHQ4EFgQUjAtStb1iJUaE03HYtDq+0Udv1hwwDgYDVR0P
+AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2g
+K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
+KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
+LnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwLmNyb3VzLXJlaW1zLmZyMA0GCSqG
+SIb3DQEBBQUAA4IBAQBP0ba+bGMAePVNe5hvffTp4SW2wRDL6y9gNabJnQrGIln+
+tiitKXKTHYT+uxa3DqTpxYCHr5FtKPPhPKPIS7dyIVIxvkRAWOee+/spfUPC7Y8J
+/Mx3kyMlSZQGXzhDJkRDJqYKkoNVp0F/hEtJMAJKlWq2ERKrVzdF+x2ipvCMkRUQ
++Ta0RqsMn+JrYiptiNpafPwigC7kYJ4YB1UnrfI94RkWADh3qjyRbj1UZfY5jTjv
+quzYxmp0LyZyMdkQcCQ3FVJ+AxPgSJaRjjDOc8yEDIG2kkxnZf2qoctXs077A4XH
+LgLBAZ0NCQeidPwxsKvCoYW5xQKIBaqW2ZTmqAbG
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDMzCCAhugAwIBAgIUfRwORyarbfU3vwL5jzorKTWH+LcwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLmNyb3VzLXJlaW1zLmZyMB4XDTEyMTIxOTE0MTE1
+NFoXDTMyMTIxOTE0MTE1NFowHTEbMBkGA1UEAxMSaWRwLmNyb3VzLXJlaW1zLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApN9Hhsw5OxO8lOw7AvwU
++LydZuDCjvPBDhz/UmxKWAjxd3nIgQP1BZAcjU8P2foyQP+dPd3BUqH5MZG/h2gH
+aa9sWo2bmloRyu4IyFsg8eGjU7rkvHXjBsd1UZyDgWTM3XcBd5KDbExrZq9eWLyU
+QRHI/NMo0J2mIICiwwn2d3vGDaGnGnc7pCgl66LedDn9gPl120dLJcsK729Xouey
+r4paGsUvd18Gbwbbcr9LKMXYWeeblq3GfZxlxeH5IQVUPISynAoJXWoN6Vep1eD3
+PQa0nYw8oYWNkxzSctZsu3lrgy9znxdWc2WDDHwkA1CXBaa//PKFDw9HkASBHDtA
+YQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuY3JvdXMtcmVpbXMuZnKGKWh0dHBz
+Oi8vaWRwLmNyb3VzLXJlaW1zLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTa
+0GLFE02TA2lqS6qSiG+jPjYPgzANBgkqhkiG9w0BAQUFAAOCAQEAF3YzNTu819Lj
+4KCoIa8dN5Zm9v303F0cRTyYlhm/W0+N4nMxobAnRyCa9sLIOyS/Jojgnlw4tU9h
+s7F9orEeUqzJOdWs+XvLBfjt9R2XPqgIHq9JbgzQxyn8I06JcAYXVxm42N7IRlio
+e4+Xu18Ir16E9SYYzi1CqP5/WTX0+Cs0O7EV0n9a2ZpMMSkkrKMWrPjpnux55H39
+ROEeNsBCVGUrYwulnuAByJXiDjvggMTFuORtE9ZgFpvGM/2G76ZG7rDnEE/HDXAb
+0mHlwqsPy6FpFA2w23omABLBcKO/DGwyQVbxBA8lLf3RNgJGQf1bhj3l6srF2y1h
+iFgHP+HFiA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc: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://unknown.site.com</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
new file mode 100644
index 00000000..ae79f049
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-rennes.fr-idp-shibboleth.xml
@@ -0,0 +1,66 @@
+<?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>
+      <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="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>
+					      MIIEdDCCA1ygAwIBAgIRAL5fVabkZawTDxzKI0ESjOYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzEyMDUwMDAwMDBaFw0xNjEyMDQyMzU5NTlaMEExITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTaWRwLmNyb3Vz
+LXJlbm5lcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMToPjIY
+EKGrNIwJhXle5sZXA9vse+uVBEU2CpCHfx7X+sD2RQCPtIrcw0g2CMQqCJV8ZYLM
+3ZQU22KCDsmmaabvs1xvumWRtXMEEB8CTyveGX+qYMYi2M/a4I+Q+LIpBIBaSdcs
+uNj0ICIbdLM0i6g1qEpG6F+uUFziVqIbzgs0lS+P54AeIS6mKe5JddPQXlwPpgd4
+DYkKYeL9++ItnOpoaCg6Jc3j48G9y4+2R1RcTXwxtvCW+2Tpz9cNGH6UC04NdoUk
+Vd72lwRqA25wubIU7ZVzRnlpkegMX01u/FoeQack5jmlI8pBHZMaLqB0pNLBeFEK
+6eJxAe5fb1DSV78CAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
+KzdXR+qQ47ntMB0GA1UdDgQWBBQdYX2QH6UnjgYOd4KnbTh8YmDJrTAOBgNVHQ8B
+Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
+BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
+BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+L29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITaWRwLmNyb3VzLXJlbm5l
+cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAbgsDlas2dzrysn9qqmxmpqXHBGDIoXuq
+GQifopkpEVi51JmrvMl6ztKqyYVXLEdhbv2ZRJmitDyfxtvTvFfFlAU9iJiErVsq
+zbZAATD/8aC8kUoFmuRK6uvzec+chMS5kGlf7AKJSxgPIhTGdBGwllBUof5aE50Q
+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://unknown.site.com</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
new file mode 100644
index 00000000..62cf0bf2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.crous-strasbourg.fr-idp-shibboleth.xml
@@ -0,0 +1,64 @@
+<?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>
+      <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: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>
+					      MIIEezCCA2OgAwIBAgIQeZpbhzUV4+gL9K3eNTs3hDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDMyNDAwMDAwMFoXDTE3MDMyMzIzNTk1OVowRTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSAwHgYDVQQDExdpZHAuY3JvdXMt
+c3RyYXNib3VyZy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6w
+f8Zbcbh3/fHcTMnr9qtmvV/DDfhwhpMNlZ3WIKp4LDeX3rq/qsS6xVPrfOMOj7+p
+FHvyGJKzY9BKCVVwioRYkx5UG7hZaxJ4vEAfremNqFB/5/BL3iNs//Xgg3J/TdXQ
+RQIrv3Wimj/Fa/2jalr6jPJC2PlBCfxwS9a3vtuqo2qs0v5B3/gDBQGzZYQlHeGP
+aCrJ+luS/dBZDzsMfDE4gqm1hvGT1tabfuUZGmBxXNDpBgoqQRkqbFo7wHzwaTgD
+XBzLUrXz3s2CaAslDF+U/anQ+bMT126KRo+FxrlTvMoRADYYaf9V2GbRzzRQqpG0
+BVqR6KfiAyauyGSysGECAwEAAaOCAXQwggFwMB8GA1UdIwQYMBaAFAy9k2gM896r
+o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSAAdpSjTa8MV+nybPYNenLhdM5bDAOBgNV
+HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
+VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
+U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
+LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
+cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIXaWRwLmNyb3VzLXN0
+cmFzYm91cmcuZnIwDQYJKoZIhvcNAQEFBQADggEBAHkNtIeJ+9SmBfRSCUGVgfLK
+Lk9TXjYP3kBgfvu/brnuC9XcaNnpWK6bLU6+ok+iVbexVKE0H5+41wfNV2WfTAiI
+FRhT0gAh4Ian/8DVfJTci9AyowV0vNo6jiolia3jrj7pT2JV0zi68D7ia7qCq+8W
+1BcH7QcZhbEla3A4vYWXDL2ZkOGVtHwu8+bISH5kkwbAR1kSj1W6j68WOMHzzk2q
+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://unknown.site.com</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.cs.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cs.cas.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..b9ee2b38
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cs.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDIDCCAgigAwIBAgIVAKK9oHWp4NhakdhRINFSNcMlO+RbMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcC5jcy5jYXMuY3owHhcNMTQwNDIzMDk0MjA0WhcN
+MzQwNDIzMDk0MjA0WjAYMRYwFAYDVQQDEw1pZHAuY3MuY2FzLmN6MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjjkBmvDKH/5+UN1okmPOjP4WiCHwmGw7
+KQ9Zxk/myiYmAgk9qF/0PTHMdli5C4rbSbffG+G+28B6N+hJL8GoCL5+BSfKxjsq
+0EkXH81pbIl6/V9X888aitvMa8sKYcI5SUaTdv5DfO9KPizzDh4q7ckC3pyYvYT9
+fM30sxWOSoNHgMCPEg6kUt7BViZCGqzuucqJ/OIh01GLcsu56YH7FYWSQZ6gxCjk
+mqAPSwsFveWweKxIzv/Fudact5JA2OPv6E0QtxiZl2IrrbszCTfiihqvd4Kkh2gz
+3KAI7B8HS0obOhYoi6VSNVJ2CpyQOff2M1HmIeyTe0up4bEGnbu81QIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHAuY3MuY2FzLmN6hiRodHRwczovL2lkcC5jcy5jYXMu
+Y3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFO+bvv+xOMV6uPQ6HEydpZESVVHW
+MA0GCSqGSIb3DQEBBQUAA4IBAQAIvc78aeMLcz35NBrOwdpFTkyjxddzw8In/WkZ
+f460lIhMMqc4wBe2fdqUx6OOkGDOGFTt4nWhLxp5+RI4v6ZwawGmZBxTBWxJgCrI
+2wOrZ+LAjcah4H+dESHtufvkv5GpcpHaqclECIJBSdBw40JO0GaIRHfNAnpLW8Uu
+QMhmIIxoZBWR/Fw+FJbKlseHsLR67FxmkuIrj9a+R3tL63j6xktGkzh3pvmjzTu9
+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>
+MIIDIDCCAgigAwIBAgIVAKK9oHWp4NhakdhRINFSNcMlO+RbMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcC5jcy5jYXMuY3owHhcNMTQwNDIzMDk0MjA0WhcN
+MzQwNDIzMDk0MjA0WjAYMRYwFAYDVQQDEw1pZHAuY3MuY2FzLmN6MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjjkBmvDKH/5+UN1okmPOjP4WiCHwmGw7
+KQ9Zxk/myiYmAgk9qF/0PTHMdli5C4rbSbffG+G+28B6N+hJL8GoCL5+BSfKxjsq
+0EkXH81pbIl6/V9X888aitvMa8sKYcI5SUaTdv5DfO9KPizzDh4q7ckC3pyYvYT9
+fM30sxWOSoNHgMCPEg6kUt7BViZCGqzuucqJ/OIh01GLcsu56YH7FYWSQZ6gxCjk
+mqAPSwsFveWweKxIzv/Fudact5JA2OPv6E0QtxiZl2IrrbszCTfiihqvd4Kkh2gz
+3KAI7B8HS0obOhYoi6VSNVJ2CpyQOff2M1HmIeyTe0up4bEGnbu81QIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHAuY3MuY2FzLmN6hiRodHRwczovL2lkcC5jcy5jYXMu
+Y3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFO+bvv+xOMV6uPQ6HEydpZESVVHW
+MA0GCSqGSIb3DQEBBQUAA4IBAQAIvc78aeMLcz35NBrOwdpFTkyjxddzw8In/WkZ
+f460lIhMMqc4wBe2fdqUx6OOkGDOGFTt4nWhLxp5+RI4v6ZwawGmZBxTBWxJgCrI
+2wOrZ+LAjcah4H+dESHtufvkv5GpcpHaqclECIJBSdBw40JO0GaIRHfNAnpLW8Uu
+QMhmIIxoZBWR/Fw+FJbKlseHsLR67FxmkuIrj9a+R3tL63j6xktGkzh3pvmjzTu9
+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>
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
new file mode 100644
index 00000000..6cf85fe2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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-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>
+      <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>
+      <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>
+MIIEfDCCA2SgAwIBAgIRAOgs3+B31TERERfJASxzXvYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMjgwMDAwMDBaFw0xNjAxMjgyMzU5NTlaMFYxCzAJBgNV
+BAYTAklUMSwwKgYDVQQKDCNVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBDYW1l
+cmlubzEZMBcGA1UEAxMQaWRwLmNzLnVuaWNhbS5pdDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKT3N48e6nmcWjwBz3ePL+7tU5Nc+Lw26bQDeFWBSQvv
+kydsS1lXrgX3KOpQrRcPxJjGj9zGIjm7xtUVzWkPrrs31xOI32DJEwcXoGAE1xYu
+H2KiBJU0dOcBKFIzmG5gROYupg2nfFglw8c9UYon68ijwJyvrfJA5FVsDmHOV1ye
+UlL2xByb/+4xAObDcgh7Ch5o0Gftoo61whsrwmdUTtULdyYtxRXXrvVHn4+Kvhvb
+yOJTkO1FhqhYiZJg/pVqZE3oP7jm4juLJnyOgcCavCp6tUDG8PyDozO/pGf8TFUM
+AJZwhnDhGOVmDVmC1gAFKBip4S2U82x5//2UK+eiEgkCAwEAAaOCAWMwggFfMB8G
+A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR3pdAQO58E
+cxsg3VQr4ZHa5XCPGDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
+AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAu
+Y3MudW5pY2FtLml0MA0GCSqGSIb3DQEBBQUAA4IBAQC26PQ1dLZLbyh3ju1J09C4
+oiR0SmJPN/R4U7HDQyl4XEKe5mSuCgQoLPdcmmLQAMtoLZYOLA4IJKKcSF35wnU2
+vX0bR2tykCgLm2MHwX6FLICf29LV1FrfU4JkzK5MWEwgldsJgE7z3sSlmnXQG+Qb
+ZFZil9eNRDQZufyYoGXYjmgD7OeipgCkiehoAmEwCma9bh+0g6HKxx+Sq0Lu3HB8
+LY1z9p7iDg7if8hjoMenPCR4IZnwo/h2GMCUbwYa662rz47L0ljNySq+tc8XbAIw
+rDw7hsCAc6V/pEBg0fiRxhcmkoGuctH13pNHAPNBIu0IXOn4SQbSOAuD0As+SpR2
+</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:1.1:protocol urn:oasis:names:tc:SAML:2.0: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>
+MIIEfDCCA2SgAwIBAgIRAOgs3+B31TERERfJASxzXvYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMjgwMDAwMDBaFw0xNjAxMjgyMzU5NTlaMFYxCzAJBgNV
+BAYTAklUMSwwKgYDVQQKDCNVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBDYW1l
+cmlubzEZMBcGA1UEAxMQaWRwLmNzLnVuaWNhbS5pdDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKT3N48e6nmcWjwBz3ePL+7tU5Nc+Lw26bQDeFWBSQvv
+kydsS1lXrgX3KOpQrRcPxJjGj9zGIjm7xtUVzWkPrrs31xOI32DJEwcXoGAE1xYu
+H2KiBJU0dOcBKFIzmG5gROYupg2nfFglw8c9UYon68ijwJyvrfJA5FVsDmHOV1ye
+UlL2xByb/+4xAObDcgh7Ch5o0Gftoo61whsrwmdUTtULdyYtxRXXrvVHn4+Kvhvb
+yOJTkO1FhqhYiZJg/pVqZE3oP7jm4juLJnyOgcCavCp6tUDG8PyDozO/pGf8TFUM
+AJZwhnDhGOVmDVmC1gAFKBip4S2U82x5//2UK+eiEgkCAwEAAaOCAWMwggFfMB8G
+A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR3pdAQO58E
+cxsg3VQr4ZHa5XCPGDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
+AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAu
+Y3MudW5pY2FtLml0MA0GCSqGSIb3DQEBBQUAA4IBAQC26PQ1dLZLbyh3ju1J09C4
+oiR0SmJPN/R4U7HDQyl4XEKe5mSuCgQoLPdcmmLQAMtoLZYOLA4IJKKcSF35wnU2
+vX0bR2tykCgLm2MHwX6FLICf29LV1FrfU4JkzK5MWEwgldsJgE7z3sSlmnXQG+Qb
+ZFZil9eNRDQZufyYoGXYjmgD7OeipgCkiehoAmEwCma9bh+0g6HKxx+Sq0Lu3HB8
+LY1z9p7iDg7if8hjoMenPCR4IZnwo/h2GMCUbwYa662rz47L0ljNySq+tc8XbAIw
+rDw7hsCAc6V/pEBg0fiRxhcmkoGuctH13pNHAPNBIu0IXOn4SQbSOAuD0As+SpR2
+</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>
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 c4e60ff7..8b7384c9 100644
--- a/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
@@ -1,34 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.csc.fi/idp/shibboleth">
+<md: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>
-      <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
-      <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
-      <mdui:UIInfo>
+      <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="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <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:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</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/idp/img/csc.jpg</mdui:Logo>
         <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>csc.fi</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:60.1785928,24.8332895</mdui:GeolocationHint>
         <mdui:GeolocationHint>geo:64.2311008,27.7041552</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:60.1785928,24.8332895</mdui:GeolocationHint>
       </mdui:DiscoHints>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIRAL73x8HVOpETqtPrUQiDLkowDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
diff --git a/swamid-interfederations-2.0/idp.csp.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.csp.it-idp-shibboleth.xml
new file mode 100644
index 00000000..3bcf09f9
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.csp.it-idp-shibboleth.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIFMDCCBBigAwIBAgIBfDANBgkqhkiG9w0BAQUFADBXMQswCQYDVQQGEwJJVDEi
+MCAGA1UEChMZQ1NQIElubm92YXppb25lIG5lbGxlIElDVDEkMCIGA1UEAxMbQ1NQ
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEyMDcxODEyNDY1NloXDTE1MDMz
+MTEyMDAwMFowVzELMAkGA1UEBhMCSVQxIjAgBgNVBAoTGUNTUCBJbm5vdmF6aW9u
+ZSBuZWxsZSBJQ1QxDzANBgNVBAsTBkRpclBSTzETMBEGA1UEAxMKaWRwLmNzcC5p
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKu4bGQVp+tXWSaF8zEi
+Gea7kbROlBc79D34tnsLaGw0E8QWyxUXenJJF3kHOeReZIY9lkDLZr/e41gIQ9Wu
+Ri50DBeWuhN9+5w6hx6edW2LjPu80DVG1UK1PELoerNLsQ4KabvLsrIzKFsRIcRj
+0Mem3MTNZuqym+uQR5nktSIhKCJhfTpT9Nr+RjRXCsI0xKlqSBZwpFr3JnTBeYm9
+eaGnrwE6RgnJqloj6S53cBB4YwJib/VbLj1kikp9X1WGnEjPud+Or3ztEkK3aeKP
+Ux/biS8evcwVBZdSHuoFvznIjZdR3a7mQ2eN+o+e6LudKtqRQaTvpcjY7R6YxAtv
+jecCAwEAAaOCAgUwggIBMIGTBglghkgBhvhCAQ0EgYUWgYJJc3N1ZWQgdW5kZXIg
+cG9saWNpZXM6XCBodHRwOi8vd3d3LmV1cm9wa2kub3JnL2NhL3Jvb3QvY3BzLzEu
+MS9cIGh0dHA6Ly93d3cuZXVyb3BraS5vcmcvY2EvaXQvY3BzLzEuMS9cIGh0dHBz
+Oi8vY2EuY3NwLml0L2Nwcy8xLjEvMBEGCWCGSAGG+EIBAQQEAwIGQDAqBgNVHR8E
+IzAhMB+gHaAbhhlodHRwczovL2NhLmNzcC5pdC9jYS9jcmwvMAwGA1UdEwEB/wQC
+MAAwgcsGA1UdIASBwzCBwDBDBgorBgEEAakHAQEBMDUwMwYIKwYBBQUHAgEWJ2h0
+dHA6Ly93d3cuZXVyb3BraS5vcmcvY2Evcm9vdC9jcHMvMS4xLzBBBgorBgEEAakH
+AgEBMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZXVyb3BraS5vcmcvY2EvaXQv
+Y3BzLzEuMS8wNgYKKwYBBAGsFQEBATAoMCYGCCsGAQUFBwIBFhpodHRwczovL2Nh
+LmNzcC5pdC9jcHMvMS4xLzAOBgNVHQ8BAf8EBAMCBeAwHQYDVR0OBBYEFNpr4PoE
+V8T6lHjrA2oUGTI5J5+qMB8GA1UdIwQYMBaAFHW5jyajIrTMYJwIJ0WYxMGCNXLI
+MA0GCSqGSIb3DQEBBQUAA4IBAQBviJ5zSLuRgZiI+oqRG7ljKIrwNaVfC2bQ0LVA
+RR/7mzBEI/8J/ROyTx9Q89PZ33pRtqoWZrlIn0xx0PF7hxUMOZojfbC/tTE9+iLN
+L+24bDpIjvsuyWx+5zFje4wh/aPm34KubzJTUScfGkhmJcxocuQaMi13xZwXAXQJ
+Mm+2fRlRnwChUoYeEDapwWnSvZoT8nkT8Hsllc6OC/j01iTyq03KRD6M0UgOUQ1J
+EKOg6oGdgMFWMiO7TIQzqRmnduQhOgn/kkHFrNTSMuCV37lFCEfaRL2KyvJKlQ46
+Ynan19FJNuDwmlLR0hL1tmWReJ94Gjfx4btlL5iLPyDkvzgJ
+</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>
+MIIFMDCCBBigAwIBAgIBfDANBgkqhkiG9w0BAQUFADBXMQswCQYDVQQGEwJJVDEi
+MCAGA1UEChMZQ1NQIElubm92YXppb25lIG5lbGxlIElDVDEkMCIGA1UEAxMbQ1NQ
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEyMDcxODEyNDY1NloXDTE1MDMz
+MTEyMDAwMFowVzELMAkGA1UEBhMCSVQxIjAgBgNVBAoTGUNTUCBJbm5vdmF6aW9u
+ZSBuZWxsZSBJQ1QxDzANBgNVBAsTBkRpclBSTzETMBEGA1UEAxMKaWRwLmNzcC5p
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKu4bGQVp+tXWSaF8zEi
+Gea7kbROlBc79D34tnsLaGw0E8QWyxUXenJJF3kHOeReZIY9lkDLZr/e41gIQ9Wu
+Ri50DBeWuhN9+5w6hx6edW2LjPu80DVG1UK1PELoerNLsQ4KabvLsrIzKFsRIcRj
+0Mem3MTNZuqym+uQR5nktSIhKCJhfTpT9Nr+RjRXCsI0xKlqSBZwpFr3JnTBeYm9
+eaGnrwE6RgnJqloj6S53cBB4YwJib/VbLj1kikp9X1WGnEjPud+Or3ztEkK3aeKP
+Ux/biS8evcwVBZdSHuoFvznIjZdR3a7mQ2eN+o+e6LudKtqRQaTvpcjY7R6YxAtv
+jecCAwEAAaOCAgUwggIBMIGTBglghkgBhvhCAQ0EgYUWgYJJc3N1ZWQgdW5kZXIg
+cG9saWNpZXM6XCBodHRwOi8vd3d3LmV1cm9wa2kub3JnL2NhL3Jvb3QvY3BzLzEu
+MS9cIGh0dHA6Ly93d3cuZXVyb3BraS5vcmcvY2EvaXQvY3BzLzEuMS9cIGh0dHBz
+Oi8vY2EuY3NwLml0L2Nwcy8xLjEvMBEGCWCGSAGG+EIBAQQEAwIGQDAqBgNVHR8E
+IzAhMB+gHaAbhhlodHRwczovL2NhLmNzcC5pdC9jYS9jcmwvMAwGA1UdEwEB/wQC
+MAAwgcsGA1UdIASBwzCBwDBDBgorBgEEAakHAQEBMDUwMwYIKwYBBQUHAgEWJ2h0
+dHA6Ly93d3cuZXVyb3BraS5vcmcvY2Evcm9vdC9jcHMvMS4xLzBBBgorBgEEAakH
+AgEBMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZXVyb3BraS5vcmcvY2EvaXQv
+Y3BzLzEuMS8wNgYKKwYBBAGsFQEBATAoMCYGCCsGAQUFBwIBFhpodHRwczovL2Nh
+LmNzcC5pdC9jcHMvMS4xLzAOBgNVHQ8BAf8EBAMCBeAwHQYDVR0OBBYEFNpr4PoE
+V8T6lHjrA2oUGTI5J5+qMB8GA1UdIwQYMBaAFHW5jyajIrTMYJwIJ0WYxMGCNXLI
+MA0GCSqGSIb3DQEBBQUAA4IBAQBviJ5zSLuRgZiI+oqRG7ljKIrwNaVfC2bQ0LVA
+RR/7mzBEI/8J/ROyTx9Q89PZ33pRtqoWZrlIn0xx0PF7hxUMOZojfbC/tTE9+iLN
+L+24bDpIjvsuyWx+5zFje4wh/aPm34KubzJTUScfGkhmJcxocuQaMi13xZwXAXQJ
+Mm+2fRlRnwChUoYeEDapwWnSvZoT8nkT8Hsllc6OC/j01iTyq03KRD6M0UgOUQ1J
+EKOg6oGdgMFWMiO7TIQzqRmnduQhOgn/kkHFrNTSMuCV37lFCEfaRL2KyvJKlQ46
+Ynan19FJNuDwmlLR0hL1tmWReJ94Gjfx4btlL5iLPyDkvzgJ
+</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>
diff --git a/swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml b/swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml
new file mode 100644
index 00000000..c92910ab
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIC0DCCAbigAwIBAgIJAMxj7o7FT11OMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
+BAMTA2lkcDAeFw0xMzAyMjUxMDEwNTBaFw0yMzAyMjMxMDEwNTBaMA4xDDAKBgNV
+BAMTA2lkcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBf7mmx56i5
+D21+iW0FYxVaZtRjZiWsP7+1OgDXYoFFCw6I3d3IyBw/w2l248/SHFA8Tb3R8rn7
+yjY/3X1KHfR/tjiJql9WuW1S++2jfhTWMc1BZaf2oKseBaFHWSMJ9wnnCU64P6GX
+ssxauRpLXT6Yv1kAINnHqmaP1MsN5Y4TL5hGK2g764gLjXNqv1+rUMhqIs5o3Owx
+utg/xEiqZY1pOrP385b+JTzg4Cv5fuGC/b3+nq490paML9R5URQVHErpL8tSFcwr
+mnq8ymoghRXgsQ70O+1EAt1HTJc/oKwKVxtuR+5uXvBPPU1s777WH1iB0U6pZdAf
++/qitsavsCUCAwEAAaMxMC8wDgYDVR0RBAcwBYIDaWRwMB0GA1UdDgQWBBT9zbqw
+THojBpjCsQhOhg2kIPzj5DANBgkqhkiG9w0BAQUFAAOCAQEAYUg98pUGUlGri0H0
+ZO8UEtMpd+6QRXZp0JYYz5JFBtFEVIW8pcr7VIB2THSJGFnttpQKBDy6/TedQcsf
+5Bz1hVAOL8R5UG5GcRhxZ+trh9XcdBls7dCXRgLaZIi0FJgxGjZXObvrjVxggGv9
+rHrgSt0DmAux/xTmzgorGgor6Fue9O0/q+PyMuoUBOzZ3sSldkh09CA1f96mBu3f
+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: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="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.cue-lillenorddefrance.fr-shibboleth.xml b/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-shibboleth.xml
new file mode 100644
index 00000000..e46e0b14
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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: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>
+					      MIIEhjCCA26gAwIBAgIRANSLXSw4ru5ryYhm5hf/p58wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA2MTYwMDAwMDBaFw0xNzA2MTUyMzU5NTlaMEoxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDElMCMGA1UEAxMcaWRwLmN1ZS1s
+aWxsZW5vcmRkZWZyYW5jZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAPFaRQj5mYaG4U4ROsOmg7AtHftdd/UNBNDz36zXv99uRcrbhSi+rVrgfsnC
+elpbxwACvNNRYvxov5oxBFR9UeFT9sSzrM+PacXR1Qa435AP8hao5TmGR4O8i4JW
+ahGqQHjwooVCoZt1i0ri2aE5tI4HVp8GBl1lNGRlTPYDWjh4a/irL0JeqMs8DAnN
+swJBuiJ4I1exC3/KIy37cqMleGnpwbx1E1RKPitFtbpHKENiYIgAPmhnNDk1FQOj
+F6O2eIGwKguruSAMJe/ObpYCObIdYXhxBMiSAUX8KQpx5ASBxzE4BgT+rdrOv82q
+9z1Z71Tb2bPSXZ24PzLyTwIMX4sCAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9
+k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQyUKxCROm0WgHBk0YYobumdPLD
+ejAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
+BQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwB
+AgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9U
+RVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRw
+Oi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcw
+AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIcaWRwLmN1
+ZS1saWxsZW5vcmRkZWZyYW5jZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAM5EI+tv8
+A6F8sdy0LjO+LcVeIO7i7QMaaN6CQyn1wh/P+rEBk0mk6kiCqDbjksjAsGTPYYZ7
+Fdq4bS6Bmqd9BQyZMbq4Sm3eFiMqa87oDZHjsuiWWIccmrCKAIWKr447PpDBBs95
+GOL5hwuqjHIPvb1qKFUBvriW0B8ujEdcJl3ja/oy0oBz8xlSmpvCZPS6vNc0cCn+
+Ym0QTm2dtTLNmPUW4DcV32K0eJCsrrT/nNy18Vw5aatD6U3TuggE7Ocgcb+QUsH+
+k3M5769UhOUotF3wRjXyBQsbW81d7LsdsxPvhAF9GQiX3uGrBDEYWK4Uq3KQE0/L
+pjRCf2fUkk8Bag==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc: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
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDElMCMGA1UEAxMcaWRwLmN1ZS1s
+aWxsZW5vcmRkZWZyYW5jZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAPFaRQj5mYaG4U4ROsOmg7AtHftdd/UNBNDz36zXv99uRcrbhSi+rVrgfsnC
+elpbxwACvNNRYvxov5oxBFR9UeFT9sSzrM+PacXR1Qa435AP8hao5TmGR4O8i4JW
+ahGqQHjwooVCoZt1i0ri2aE5tI4HVp8GBl1lNGRlTPYDWjh4a/irL0JeqMs8DAnN
+swJBuiJ4I1exC3/KIy37cqMleGnpwbx1E1RKPitFtbpHKENiYIgAPmhnNDk1FQOj
+F6O2eIGwKguruSAMJe/ObpYCObIdYXhxBMiSAUX8KQpx5ASBxzE4BgT+rdrOv82q
+9z1Z71Tb2bPSXZ24PzLyTwIMX4sCAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9
+k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQyUKxCROm0WgHBk0YYobumdPLD
+ejAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
+BQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwB
+AgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9U
+RVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRw
+Oi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcw
+AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIcaWRwLmN1
+ZS1saWxsZW5vcmRkZWZyYW5jZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAM5EI+tv8
+A6F8sdy0LjO+LcVeIO7i7QMaaN6CQyn1wh/P+rEBk0mk6kiCqDbjksjAsGTPYYZ7
+Fdq4bS6Bmqd9BQyZMbq4Sm3eFiMqa87oDZHjsuiWWIccmrCKAIWKr447PpDBBs95
+GOL5hwuqjHIPvb1qKFUBvriW0B8ujEdcJl3ja/oy0oBz8xlSmpvCZPS6vNc0cCn+
+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://unknown.site.com</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
new file mode 100644
index 00000000..f355cae0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cumbria.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdWjeuWQMYzEhv2jD6MRfP
+						W9l3zXUEudlO8XkGrEZWh3l/eplcaXarfz2z1oG0tYtv+xEcQ4NftHo4fWaaU89h
+						pAT70SpKG+PcFX2huAWil+sRy9N0etuisjwBhKGSju1L9V1rbWal9tqjMQhV09vf
+						YP9fguCVG2DrkGWtnmjDmhM1Eh1p+EQm0kaMP0pggK5uSt9C17x6m411Dj3VaP3w
+						zFeCa+0r8tm4IDhw+uUNkmTg+mufUSr7S5VALSnX0ar4k94GykReJYbwewb3Tcro
+						jd/QJPHpNEtZsh3GfQnQxx9sVYgLkMzU8Jz5gdSnGOuMPrGVRYvpSQbl8Urm36cL
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC5jdW1icmlhLmFjLnVrhihodHRwczov
+						L2lkcC5jdW1icmlhLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBT+Y0Hg
+						StI1y0DAcJa8e/llpIYdqzANBgkqhkiG9w0BAQUFAAOCAQEARy2hdKks9/AOlcZO
+						GxfN/9kyO4ho4j2PRQuoOOwI8Pj4DztWjOtrWFcqqKYx40LzoyFtDnadfAnaSTti
+						/nBWQeLK0gz2CRXOJWc2GkCBGT0YEAiwfRn4d86JSH/CssDRDZ62w2znxsll3RPe
+						gW5SuXclwMfcFrtJNeH4Uh6X/lDbrrHZOwQn9muNeZ56g15ShGZrAhW/Ji2ELc/Q
+						VD5iBtR6NguO05rckJFHFCAoR496bf3yvsV3y8PMPFypErQ+ZQgoms3YVMS/JJqM
+						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>
+						MIIDMDCCAhigAwIBAgIVAOXrI5dTcF3eJhiLgfzEAFQ4YYsBMA0GCSqGSIb3DQEB
+						BQUAMBwxGjAYBgNVBAMTEWlkcC5jdW1icmlhLmFjLnVrMB4XDTA5MDExNTE1NTIz
+						N1oXDTI5MDExNTE1NTIzN1owHDEaMBgGA1UEAxMRaWRwLmN1bWJyaWEuYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdWjeuWQMYzEhv2jD6MRfP
+						W9l3zXUEudlO8XkGrEZWh3l/eplcaXarfz2z1oG0tYtv+xEcQ4NftHo4fWaaU89h
+						pAT70SpKG+PcFX2huAWil+sRy9N0etuisjwBhKGSju1L9V1rbWal9tqjMQhV09vf
+						YP9fguCVG2DrkGWtnmjDmhM1Eh1p+EQm0kaMP0pggK5uSt9C17x6m411Dj3VaP3w
+						zFeCa+0r8tm4IDhw+uUNkmTg+mufUSr7S5VALSnX0ar4k94GykReJYbwewb3Tcro
+						jd/QJPHpNEtZsh3GfQnQxx9sVYgLkMzU8Jz5gdSnGOuMPrGVRYvpSQbl8Urm36cL
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC5jdW1icmlhLmFjLnVrhihodHRwczov
+						L2lkcC5jdW1icmlhLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBT+Y0Hg
+						StI1y0DAcJa8e/llpIYdqzANBgkqhkiG9w0BAQUFAAOCAQEARy2hdKks9/AOlcZO
+						GxfN/9kyO4ho4j2PRQuoOOwI8Pj4DztWjOtrWFcqqKYx40LzoyFtDnadfAnaSTti
+						/nBWQeLK0gz2CRXOJWc2GkCBGT0YEAiwfRn4d86JSH/CssDRDZ62w2znxsll3RPe
+						gW5SuXclwMfcFrtJNeH4Uh6X/lDbrrHZOwQn9muNeZ56g15ShGZrAhW/Ji2ELc/Q
+						VD5iBtR6NguO05rckJFHFCAoR496bf3yvsV3y8PMPFypErQ+ZQgoms3YVMS/JJqM
+						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>
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
new file mode 100644
index 00000000..6fdbbf7f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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 Centre AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Centrum výzkumu globální změny AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider GCRC AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance CVGZ 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="74">https://jiftach.cas.cz/loga/logo-cvgz-44.png</mdui:Logo>
+        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-cvgz-148.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVALr7AqT0+uw7MEykFT/aUKQi4cNOMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkcC5jdmd6LmNhcy5jejAeFw0xNDA0MDEwNzU3MDBa
+Fw0zNDA0MDEwNzU3MDBaMBoxGDAWBgNVBAMTD2lkcC5jdmd6LmNhcy5jejCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMIsJTIygU6zF5Wew+vVaUUCdhol
+bEqlFy8ou2zPpXp7l39eAzUb027Ng0KBZT863EcySGiacYKIdCRdVlZ+uLn6PoBD
+6dkNJHbVzlNXlh5pY5XJFyF6ZZrtVb2V9jo5DCpCWHzUtQdWNmClZIwmG09Xvwef
+OvZax6Q/gJz0NgUCHFNiaQLkVI8iqZncdUyImce2V1RWrxHZMm0DpWLm0/w/MP8d
+c7GAqzBwxMEGyJ2v2SR02sccBg89l4LcBTr4ZzMAAYjX7XgnEARl8Th9eCH/Zo39
+fZNUk8msi0mxIv43LZA9AaPveDFbVf1Q4DJOiqQNK750eG+FzwXepK7aieECAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRwLmN2Z3ouY2FzLmN6hiZodHRwczovL2lkcC5j
+dmd6LmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUaiD1JRJQWoj+Z/OG
+c0RxmP8OB+0wDQYJKoZIhvcNAQEFBQADggEBAFv+QmlxUptujxtgJ8NHv+9XLlQY
+3Z6ovkPnpBKPLxNWwGBwYtu2g4rtIpfo8yaspDfeF7Os2ZhRhxO5n3SREE2fnyQs
+v2DHJGGD8KTXe4AdE/XV56CgnCPzAWiqHe896F/IzuwNQUo4LsF0xwBtvDPHCfzn
+tBU0C7k4tdoXIGwQZ6tgpaNYIpQB1Y3uCYySgmk0XNGdd485ejnqWNXbYeVMKRlO
+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>
+MIIDKDCCAhCgAwIBAgIVALr7AqT0+uw7MEykFT/aUKQi4cNOMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkcC5jdmd6LmNhcy5jejAeFw0xNDA0MDEwNzU3MDBa
+Fw0zNDA0MDEwNzU3MDBaMBoxGDAWBgNVBAMTD2lkcC5jdmd6LmNhcy5jejCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMIsJTIygU6zF5Wew+vVaUUCdhol
+bEqlFy8ou2zPpXp7l39eAzUb027Ng0KBZT863EcySGiacYKIdCRdVlZ+uLn6PoBD
+6dkNJHbVzlNXlh5pY5XJFyF6ZZrtVb2V9jo5DCpCWHzUtQdWNmClZIwmG09Xvwef
+OvZax6Q/gJz0NgUCHFNiaQLkVI8iqZncdUyImce2V1RWrxHZMm0DpWLm0/w/MP8d
+c7GAqzBwxMEGyJ2v2SR02sccBg89l4LcBTr4ZzMAAYjX7XgnEARl8Th9eCH/Zo39
+fZNUk8msi0mxIv43LZA9AaPveDFbVf1Q4DJOiqQNK750eG+FzwXepK7aieECAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRwLmN2Z3ouY2FzLmN6hiZodHRwczovL2lkcC5j
+dmd6LmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUaiD1JRJQWoj+Z/OG
+c0RxmP8OB+0wDQYJKoZIhvcNAQEFBQADggEBAFv+QmlxUptujxtgJ8NHv+9XLlQY
+3Z6ovkPnpBKPLxNWwGBwYtu2g4rtIpfo8yaspDfeF7Os2ZhRhxO5n3SREE2fnyQs
+v2DHJGGD8KTXe4AdE/XV56CgnCPzAWiqHe896F/IzuwNQUo4LsF0xwBtvDPHCfzn
+tBU0C7k4tdoXIGwQZ6tgpaNYIpQB1Y3uCYySgmk0XNGdd485ejnqWNXbYeVMKRlO
+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 Centre AS CR</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Centrum výzkumu globální změny AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Global Change Research Centre AS CR, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Centrum 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
new file mode 100644
index 00000000..5cba0470
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cwc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsO608HeIDdoDe9MLtR9Q6F9ZfWR0u90jc
+						Zp6DwseLlwwNHbysoJQocFh5rxY5IYPxz3W1S1WbN3apcYJ9eNO7ze3QLWycl2J8
+						4KS6Y76ViCpcBut3JhJHa/w9p4pfev27yfEIpc/wd9GsTHnz0hvUFKeFhAi/et9e
+						nsDwJivp2Nj3MvK7K+j0HGwdwwmww6K0/YneMnTb6/piCOBrLc04/picXISI64H/
+						oU7FwCXLQLTQY4MWhZccPhuSlI+KhnhFF+mJHsbfjpp5ClNYtK1UmQJghp/UoroM
+						13O2DyjGbC6vKS+9M6XWinhhp743/m/Aykiakb853/HOsjM0bAx1AgMBAAGjYTBf
+						MD4GA1UdEQQ3MDWCDWlkcC5jd2MuYWMudWuGJGh0dHBzOi8vaWRwLmN3Yy5hYy51
+						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU/CWbrA4a96ioSsOcKUzzmWC2sSAw
+						DQYJKoZIhvcNAQEFBQADggEBAE7Mk9gNMgKIfx8J9blqvCakuxkHoNMJCH+74kre
+						1ZBFXl3dlr8LINw8EDiAXUigQgSb3FSpGlsEzi9UUreJ45y+E0sbrzFRRcsIi2GP
+						8fuXkweKi7mZVFPjVv9dC771tMij7vioKljDxPYsFTXVORnnrdWcAse2BxnGbydf
+						M1xHoXl+agxTld1R3L4aP1guxomfOK48a1UCz0VlNNius0IVgw7fMCXjSrNDM3nL
+						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>
+						MIIDHzCCAgegAwIBAgIUGMUEvqcH0AW3uF4F0/urAdo29hQwDQYJKoZIhvcNAQEF
+						BQAwGDEWMBQGA1UEAxMNaWRwLmN3Yy5hYy51azAeFw0xMzA5MTgxMTIwNDJaFw0z
+						MzA5MTgxMTIwNDJaMBgxFjAUBgNVBAMTDWlkcC5jd2MuYWMudWswggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsO608HeIDdoDe9MLtR9Q6F9ZfWR0u90jc
+						Zp6DwseLlwwNHbysoJQocFh5rxY5IYPxz3W1S1WbN3apcYJ9eNO7ze3QLWycl2J8
+						4KS6Y76ViCpcBut3JhJHa/w9p4pfev27yfEIpc/wd9GsTHnz0hvUFKeFhAi/et9e
+						nsDwJivp2Nj3MvK7K+j0HGwdwwmww6K0/YneMnTb6/piCOBrLc04/picXISI64H/
+						oU7FwCXLQLTQY4MWhZccPhuSlI+KhnhFF+mJHsbfjpp5ClNYtK1UmQJghp/UoroM
+						13O2DyjGbC6vKS+9M6XWinhhp743/m/Aykiakb853/HOsjM0bAx1AgMBAAGjYTBf
+						MD4GA1UdEQQ3MDWCDWlkcC5jd2MuYWMudWuGJGh0dHBzOi8vaWRwLmN3Yy5hYy51
+						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU/CWbrA4a96ioSsOcKUzzmWC2sSAw
+						DQYJKoZIhvcNAQEFBQADggEBAE7Mk9gNMgKIfx8J9blqvCakuxkHoNMJCH+74kre
+						1ZBFXl3dlr8LINw8EDiAXUigQgSb3FSpGlsEzi9UUreJ45y+E0sbrzFRRcsIi2GP
+						8fuXkweKi7mZVFPjVv9dC771tMij7vioKljDxPYsFTXVORnnrdWcAse2BxnGbydf
+						M1xHoXl+agxTld1R3L4aP1guxomfOK48a1UCz0VlNNius0IVgw7fMCXjSrNDM3nL
+						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>
diff --git a/swamid-interfederations-2.0/idp.cyceron.fr:8443-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cyceron.fr:8443-idp-shibboleth.xml
new file mode 100644
index 00000000..b011619f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cyceron.fr:8443-idp-shibboleth.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cyceron.fr:8443/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-08T12:08: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>
+      <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:Description xml:lang="en">Cyceron</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Cyceron</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">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>
+					      MIIDIzCCAgugAwIBAgIUZJvKK5L/LCvXeY1r8fw0trUoarwwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLmN5Y2Vyb24uZnIwHhcNMTQwMjE0MTExMTE1WhcN
+MzQwMjE0MTExMTE1WjAZMRcwFQYDVQQDEw5pZHAuY3ljZXJvbi5mcjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALH37gLW5fRWQoGy5KEMNWpao0t2jb3i
+QLtnRqPBL1q8BYL7rjCAfHCi2xxaaBi/Wt+y+YSsqqBXlSx9fCIc9gtVTTmBfVh0
+NaFKBwOpEHRCg0cLePApucYodvIJLpZP9SMdEco5piCOV20Wll1P08h4ZqbV2Mfv
+P6ttEzwKwEfBveuHo20xHQ/F1BNnmMrXaBLR7cVM8M/i/xiFYlpx8sylMnmQx8T7
+ue+aCqiC2C/Kqt6BMUw8V3BjFb2Kia6+XK0xPZnTXZeue9xSYM/7iZnR4ifC9YCu
+2hueKZQt8P9Vxs6er7uUWIzX8ACqchv5Q/OXxiAKj1C1Nob4bt/7pVcCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLmN5Y2Vyb24uZnKGJWh0dHBzOi8vaWRwLmN5Y2Vy
+b24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKxj+M3a/I4mPX0PFe9L6bjc
+JJ/dMA0GCSqGSIb3DQEBBQUAA4IBAQCJyjOIUeLEjgP0QcF0NImz05xlcNMvIZvF
+i/dPtD02FQ70VLz4IbCWCdkThqXJHALUEkiamXTBTFMl8rCuU3VqHVN3ZkLvAIyv
+cpsCYAlcrrK3jKG0jVNaWcBhEdGDxBT7/n7yHLAbWfgTeKJbEi54Sgbw3bVRFcKh
+w7ZW3ahqeRklkTca9Vn4KPEPcZEdUkatXwtLD1ZsAxAjqBDZY3yxip+KP+GYq4S4
+6ZfbLL4duNYFqUmzZnjnwPKH7gwlQf9J5Dc5tPSXT0F9xN1xzbZExr73GSIlM63I
+stLKk6cKIPPqdpryfUa5CBWcfuxb3foFGuu53LZYPjORDsZhYA2O
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cyceron.fr:8443/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cyceron.fr:8443/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cyceron.fr:8443/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">cyceron.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDIzCCAgugAwIBAgIUZJvKK5L/LCvXeY1r8fw0trUoarwwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLmN5Y2Vyb24uZnIwHhcNMTQwMjE0MTExMTE1WhcN
+MzQwMjE0MTExMTE1WjAZMRcwFQYDVQQDEw5pZHAuY3ljZXJvbi5mcjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALH37gLW5fRWQoGy5KEMNWpao0t2jb3i
+QLtnRqPBL1q8BYL7rjCAfHCi2xxaaBi/Wt+y+YSsqqBXlSx9fCIc9gtVTTmBfVh0
+NaFKBwOpEHRCg0cLePApucYodvIJLpZP9SMdEco5piCOV20Wll1P08h4ZqbV2Mfv
+P6ttEzwKwEfBveuHo20xHQ/F1BNnmMrXaBLR7cVM8M/i/xiFYlpx8sylMnmQx8T7
+ue+aCqiC2C/Kqt6BMUw8V3BjFb2Kia6+XK0xPZnTXZeue9xSYM/7iZnR4ifC9YCu
+2hueKZQt8P9Vxs6er7uUWIzX8ACqchv5Q/OXxiAKj1C1Nob4bt/7pVcCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLmN5Y2Vyb24uZnKGJWh0dHBzOi8vaWRwLmN5Y2Vy
+b24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKxj+M3a/I4mPX0PFe9L6bjc
+JJ/dMA0GCSqGSIb3DQEBBQUAA4IBAQCJyjOIUeLEjgP0QcF0NImz05xlcNMvIZvF
+i/dPtD02FQ70VLz4IbCWCdkThqXJHALUEkiamXTBTFMl8rCuU3VqHVN3ZkLvAIyv
+cpsCYAlcrrK3jKG0jVNaWcBhEdGDxBT7/n7yHLAbWfgTeKJbEi54Sgbw3bVRFcKh
+w7ZW3ahqeRklkTca9Vn4KPEPcZEdUkatXwtLD1ZsAxAjqBDZY3yxip+KP+GYq4S4
+6ZfbLL4duNYFqUmzZnjnwPKH7gwlQf9J5Dc5tPSXT0F9xN1xzbZExr73GSIlM63I
+stLKk6cKIPPqdpryfUa5CBWcfuxb3foFGuu53LZYPjORDsZhYA2O
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cyceron.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">Cyceron</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cyceron</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</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/idp.dante.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dante.net-idp-shibboleth.xml
new file mode 100644
index 00000000..cdceb1dc
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dante.net-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?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>
+      <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">DANTE</mdui:DisplayName>
+        <mdui:Description xml:lang="en">DANTE 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/16x16-DANTE.jpg</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://idp.dante.net/idp/images/80x60-DANTE.jpg</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>
+						MIIDqjCCApICCQCOEbOuEI0OxzANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC
+						R0IxFzAVBgNVBAgMDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHDAlDYW1icmlkZ2Ux
+						QjBABgNVBAoMOURlbGl2ZXJ5IG9mIEFkdmFuY2VkIE5ldHdvcmsgVGVjaG5vbG9n
+						eSB0byBFdXJvcGUgTGltaXRlZDEWMBQGA1UEAwwNaWRwLmRhbnRlLm5ldDAeFw0x
+						MzEyMjMxMTEzMzlaFw0xNjEyMjIxMTEzMzlaMIGWMQswCQYDVQQGEwJHQjEXMBUG
+						A1UECAwOQ2FtYnJpZGdlc2hpcmUxEjAQBgNVBAcMCUNhbWJyaWRnZTFCMEAGA1UE
+						Cgw5RGVsaXZlcnkgb2YgQWR2YW5jZWQgTmV0d29yayBUZWNobm9sb2d5IHRvIEV1
+						cm9wZSBMaW1pdGVkMRYwFAYDVQQDDA1pZHAuZGFudGUubmV0MIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOW6u4C7wEIQdogPpt/CNjn84HnsdJsadN0s
+						XQQg+SzfJICuxXYGAMDV4k/W9wTGIodOM4Be7O7edGzOdw4RLSJq4vxW5yu4gOuJ
+						yMSYPkEl8nwDOpU4uRTCh2wXE6xe8Eu2eUnXVu+puye4VdKRbQe4Ni1sWgupHO9O
+						+9YWBYkwRN/Gqca9PrPr28nZ+XrX+S/NaSRNwjAHEORgFOUqdcPSztCqq8y2924F
+						dU7PXE6Twh3qx0aEMfKyZGrheuHzSVwb6DC1TMTkY48onXflF84V1CYF9xXbLcSW
+						TZlnzsOW5XbDlQHPEMqFzoyYxfa9zUyd3tNgomu4Ak1t/JO1OQIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQCTMnPRHLCez8ElwBmqvQaEExeDh4DmPsSnv+M1DdrQ/Da5
+						Bx4xi1lMclBNDMRJ8jTcXDoJAvYkZYAGR1o+doJZrU5dv+JM4QWQsNLVwBJg8gSB
+						ITDrzrpwFUCwVLudO9w/6yDoTbKpyogeMffcGcmiGniKytpI0KK3FhmnFJs+E+0E
+						IA9xqZmnx9NyC2BMTeQqqgKi7wM4Q9oIYk6sbm0a//tsryhXcAjX5GRndGfoKBhY
+						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>
+						MIIDqjCCApICCQCOEbOuEI0OxzANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC
+						R0IxFzAVBgNVBAgMDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHDAlDYW1icmlkZ2Ux
+						QjBABgNVBAoMOURlbGl2ZXJ5IG9mIEFkdmFuY2VkIE5ldHdvcmsgVGVjaG5vbG9n
+						eSB0byBFdXJvcGUgTGltaXRlZDEWMBQGA1UEAwwNaWRwLmRhbnRlLm5ldDAeFw0x
+						MzEyMjMxMTEzMzlaFw0xNjEyMjIxMTEzMzlaMIGWMQswCQYDVQQGEwJHQjEXMBUG
+						A1UECAwOQ2FtYnJpZGdlc2hpcmUxEjAQBgNVBAcMCUNhbWJyaWRnZTFCMEAGA1UE
+						Cgw5RGVsaXZlcnkgb2YgQWR2YW5jZWQgTmV0d29yayBUZWNobm9sb2d5IHRvIEV1
+						cm9wZSBMaW1pdGVkMRYwFAYDVQQDDA1pZHAuZGFudGUubmV0MIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOW6u4C7wEIQdogPpt/CNjn84HnsdJsadN0s
+						XQQg+SzfJICuxXYGAMDV4k/W9wTGIodOM4Be7O7edGzOdw4RLSJq4vxW5yu4gOuJ
+						yMSYPkEl8nwDOpU4uRTCh2wXE6xe8Eu2eUnXVu+puye4VdKRbQe4Ni1sWgupHO9O
+						+9YWBYkwRN/Gqca9PrPr28nZ+XrX+S/NaSRNwjAHEORgFOUqdcPSztCqq8y2924F
+						dU7PXE6Twh3qx0aEMfKyZGrheuHzSVwb6DC1TMTkY48onXflF84V1CYF9xXbLcSW
+						TZlnzsOW5XbDlQHPEMqFzoyYxfa9zUyd3tNgomu4Ak1t/JO1OQIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQCTMnPRHLCez8ElwBmqvQaEExeDh4DmPsSnv+M1DdrQ/Da5
+						Bx4xi1lMclBNDMRJ8jTcXDoJAvYkZYAGR1o+doJZrU5dv+JM4QWQsNLVwBJg8gSB
+						ITDrzrpwFUCwVLudO9w/6yDoTbKpyogeMffcGcmiGniKytpI0KK3FhmnFJs+E+0E
+						IA9xqZmnx9NyC2BMTeQqqgKi7wM4Q9oIYk6sbm0a//tsryhXcAjX5GRndGfoKBhY
+						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">DANTE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dante.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>DANTE Support</md:GivenName>
+    <md:EmailAddress>mailto:idp-support@dante.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>DANTE Support</md:GivenName>
+    <md:EmailAddress>mailto:idp-support@dante.net</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
new file mode 100644
index 00000000..8ec1cdfc
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.derby-college.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						bGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANKo3Qc2
+						RMSfWk1c1/JbDgHOfWx7BuEhOPpxw1wA315Bx7qEY028YMvkjdBB4DZ6ZPlzGFGi
+						u1bQ2nVGz4ahT+LJ+1e9kdye++z2/y/na9kccJVONn6pQlPgug52YYVs1wI/ACIt
+						PiJB6IOIIUgtJN72uinqr+I8wWKcRPBJ6ZUFU4BHFzmC0iC7UPijsv+fHmcthY3k
+						kjdMKKVLbEyq48zV/oPzDI+4B2VQu1P9M1m7+XXKRFYuXuUS7710UsaU2j4gQOjh
+						FCthyCt3gttOTbLlaec/V0Hr8ctqhTGuaW634A0Bko/fODY/cpIrLU6jRfAduOys
+						X+tyrAWT8hOxaOMCAwEAAaN1MHMwUgYDVR0RBEswSYIXaWRwLmRlcmJ5LWNvbGxl
+						Z2UuYWMudWuGLmh0dHBzOi8vaWRwLmRlcmJ5LWNvbGxlZ2UuYWMudWsvaWRwL3No
+						aWJib2xldGgwHQYDVR0OBBYEFOVeW4p4HL3i4+XUVYpOWc8AfM+cMA0GCSqGSIb3
+						DQEBBQUAA4IBAQC+SiFq81er0JPaxOKmw0XHjk0PKu2DAIsB1Xq0A1Djk1OMHpKQ
+						/lCjaD3qU6RASglCJZTvxk5gzqgDIxDNjQSpMg9/V809+obnMfKm1wwm9KHTFSEk
+						tO+NXUTVcPDWuvSyz/Xv/M0dwxGcBsA+saiw+UvZu2gbWgNVLosn4SZoAFyD1l8w
+						6YNqj0N7g3wnxLC6Dteg+/Lf6j4jHLDpcCxxUisEe0+GFAOSw2bGoeyQEeiTF6KH
+						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>
+						MIIDRzCCAi+gAwIBAgIUcC6CXJaCoz2x+pFU5TLdMtrg238wDQYJKoZIhvcNAQEF
+						BQAwIjEgMB4GA1UEAxMXaWRwLmRlcmJ5LWNvbGxlZ2UuYWMudWswHhcNMTMwMjI3
+						MTQ1MjI3WhcNMzMwMjI3MTQ1MjI3WjAiMSAwHgYDVQQDExdpZHAuZGVyYnktY29s
+						bGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANKo3Qc2
+						RMSfWk1c1/JbDgHOfWx7BuEhOPpxw1wA315Bx7qEY028YMvkjdBB4DZ6ZPlzGFGi
+						u1bQ2nVGz4ahT+LJ+1e9kdye++z2/y/na9kccJVONn6pQlPgug52YYVs1wI/ACIt
+						PiJB6IOIIUgtJN72uinqr+I8wWKcRPBJ6ZUFU4BHFzmC0iC7UPijsv+fHmcthY3k
+						kjdMKKVLbEyq48zV/oPzDI+4B2VQu1P9M1m7+XXKRFYuXuUS7710UsaU2j4gQOjh
+						FCthyCt3gttOTbLlaec/V0Hr8ctqhTGuaW634A0Bko/fODY/cpIrLU6jRfAduOys
+						X+tyrAWT8hOxaOMCAwEAAaN1MHMwUgYDVR0RBEswSYIXaWRwLmRlcmJ5LWNvbGxl
+						Z2UuYWMudWuGLmh0dHBzOi8vaWRwLmRlcmJ5LWNvbGxlZ2UuYWMudWsvaWRwL3No
+						aWJib2xldGgwHQYDVR0OBBYEFOVeW4p4HL3i4+XUVYpOWc8AfM+cMA0GCSqGSIb3
+						DQEBBQUAA4IBAQC+SiFq81er0JPaxOKmw0XHjk0PKu2DAIsB1Xq0A1Djk1OMHpKQ
+						/lCjaD3qU6RASglCJZTvxk5gzqgDIxDNjQSpMg9/V809+obnMfKm1wwm9KHTFSEk
+						tO+NXUTVcPDWuvSyz/Xv/M0dwxGcBsA+saiw+UvZu2gbWgNVLosn4SZoAFyD1l8w
+						6YNqj0N7g3wnxLC6Dteg+/Lf6j4jHLDpcCxxUisEe0+GFAOSw2bGoeyQEeiTF6KH
+						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>
diff --git a/swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml
new file mode 100644
index 00000000..a1d03165
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml
@@ -0,0 +1,159 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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 use="signing">
+      <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
+ZXJsaW4xDzANBgNVBAcTBkJlcmxpbjETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcG
+A1UECxMQR2VzY2hhZWZ0c3N0ZWxsZTETMBEGA1UEAxMKaWRwLmRmbi5kZTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANLulBKv3/WE3HhIhXkl+u974zhl
+sQF6VLuZ90e3EDX7jD7Hbb2x9ntefY3whu8rpGKqkP4r6Au9QydnulyRTBg7ss7O
+pEy/hfoTug2QwEZEXRZZgTcxYptkoIUxyoKaZfWxe2/0IFWObSlmNx9jvY3oR1W0
+eVHDCb4FB2NVYoLNaOHLxaOF+pQZKgJnm96emX+JeC/YP9ecdtRi7ZYiFRA2uUXR
+ux0+r3zrYEVmBM7vWu1paHGvGMDpNHG7s+5a33ercMAB31G1MIcgDyXCHiWPuYlj
+p3X3OyYMkL+jGbhJ9Db3ChE9aiG93Lb4Qo5NQuCCcSJs1tz78vkCfJ7tNOBVk5KK
+YJK9i48zwg22+MicX5pPdxllRrEh0Psp6MoVdTNIq8Minyr1BrmdZB9DZBmraMXp
+J6unZoll3KWr2WTlrr43V9QMoFjKjToYEhG+2U1kWeXwK0WM8fTxuUEFvUtqNbEX
+6CAgEFoef/Jf59k2JdTvLvtZZs5DHgWKbH/VR9j8z+91nij8QmPUuBWeuWeyeirt
+UD+G07BSDS7Lebi3OnsumpGPWrxmKWEOHccgGflaRA2pQYCiW8Rv8x7adLcf0sAo
+BDCX7+737ywrDqshRDX5y75tAES6aCm/fARsZKQ4/HiOvx5vNefHElMY3w3YMUKd
+NthdnrYZeKe0WmW1AgMBAAGjggJDMIICPzA5BgNVHSAEMjAwMBEGDysGAQQBga0h
+giwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
+HQ4EFgQUaWmQ/Clpu7Zdjqw/7viZtheoEiQwHwYDVR0jBBgwFoAUeaJiL87xBjlS
+53ZtYsfem2p1S0kwFQYDVR0RBA4wDIIKaWRwLmRmbi5kZTCBkQYDVR0fBIGJMIGG
+MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2Ev
+cHViL2NybC9nX2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd8GCCsGAQUF
+BwEBBIHSMIHPMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09D
+U1AtU2VydmVyL09DU1AwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4u
+ZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBLBggr
+BgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNh
+L3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBhogS0
+luPrkG27IJ+U533cyV407S0PPN2WbiS/i+BqVXJt0JkEz9WP3oFMg5jF3V/R0czH
+2pXqx6sVuRqXUczNCKQ7ayRkQLJJRRKvWBxTk4P3/BivbEmoszIL0m7POge3hZLe
+dH+9WswAHIDwczkPqip77o6kbrjiDeEj8epv8dNBGLnHMHoQuAntnehIb6fr+BF1
+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: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 use="signing">
+      <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
+ZXJsaW4xDzANBgNVBAcTBkJlcmxpbjETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcG
+A1UECxMQR2VzY2hhZWZ0c3N0ZWxsZTETMBEGA1UEAxMKaWRwLmRmbi5kZTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANLulBKv3/WE3HhIhXkl+u974zhl
+sQF6VLuZ90e3EDX7jD7Hbb2x9ntefY3whu8rpGKqkP4r6Au9QydnulyRTBg7ss7O
+pEy/hfoTug2QwEZEXRZZgTcxYptkoIUxyoKaZfWxe2/0IFWObSlmNx9jvY3oR1W0
+eVHDCb4FB2NVYoLNaOHLxaOF+pQZKgJnm96emX+JeC/YP9ecdtRi7ZYiFRA2uUXR
+ux0+r3zrYEVmBM7vWu1paHGvGMDpNHG7s+5a33ercMAB31G1MIcgDyXCHiWPuYlj
+p3X3OyYMkL+jGbhJ9Db3ChE9aiG93Lb4Qo5NQuCCcSJs1tz78vkCfJ7tNOBVk5KK
+YJK9i48zwg22+MicX5pPdxllRrEh0Psp6MoVdTNIq8Minyr1BrmdZB9DZBmraMXp
+J6unZoll3KWr2WTlrr43V9QMoFjKjToYEhG+2U1kWeXwK0WM8fTxuUEFvUtqNbEX
+6CAgEFoef/Jf59k2JdTvLvtZZs5DHgWKbH/VR9j8z+91nij8QmPUuBWeuWeyeirt
+UD+G07BSDS7Lebi3OnsumpGPWrxmKWEOHccgGflaRA2pQYCiW8Rv8x7adLcf0sAo
+BDCX7+737ywrDqshRDX5y75tAES6aCm/fARsZKQ4/HiOvx5vNefHElMY3w3YMUKd
+NthdnrYZeKe0WmW1AgMBAAGjggJDMIICPzA5BgNVHSAEMjAwMBEGDysGAQQBga0h
+giwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
+HQ4EFgQUaWmQ/Clpu7Zdjqw/7viZtheoEiQwHwYDVR0jBBgwFoAUeaJiL87xBjlS
+53ZtYsfem2p1S0kwFQYDVR0RBA4wDIIKaWRwLmRmbi5kZTCBkQYDVR0fBIGJMIGG
+MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2Ev
+cHViL2NybC9nX2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd8GCCsGAQUF
+BwEBBIHSMIHPMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09D
+U1AtU2VydmVyL09DU1AwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4u
+ZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBLBggr
+BgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNh
+L3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBhogS0
+luPrkG27IJ+U533cyV407S0PPN2WbiS/i+BqVXJt0JkEz9WP3oFMg5jF3V/R0czH
+2pXqx6sVuRqXUczNCKQ7ayRkQLJJRRKvWBxTk4P3/BivbEmoszIL0m7POge3hZLe
+dH+9WswAHIDwczkPqip77o6kbrjiDeEj8epv8dNBGLnHMHoQuAntnehIb6fr+BF1
+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>
diff --git a/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml
new file mode 100644
index 00000000..b83f7ac5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml
@@ -0,0 +1,73 @@
+<?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.edugate.ie/welcome-edugate-federation/membership</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">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>
+MIIDFzCCAf+gAwIBAgIUD82Rv6ZhMvwGESzIOJRkEtryOk4wDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwLmRpYXMuaWUwHhcNMTMxMTE1MTAxODExWhcNMzMx
+MTE1MTAxODExWjAWMRQwEgYDVQQDEwtpZHAuZGlhcy5pZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAINbJEvXC7qeIqXcCt3l6qrIw7ckk6FIy/rBBbO0
+0HkzFWd6JsOO3QZ8ymRgVeap9N1SycxIuox63M8sa89KwNVXAvNyDfrbvmbqIxzJ
+T5RmHl4ISgrsQubAWJ7eNiqVXiMvQe+e2A7iPpplPJYGqhvG/TB6F/4QDfGO+G9/
+tK+EdCvntS8wEy/s0UrDVOo+upvJnypzNJLcavfZWWwfjzR57Rcx48jTlRjZRe0R
+4/2rWS5yAJ8UhjBksoGD36ZHIpc1GFI5JeSNbGA7V501qhhjK9X09A+/NAlLGIj3
+s2ZJPfNGMPaY6Uc7u6sfEvwUJoz8kUnIV7Ac8HNw/d8Joi8CAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwLmRpYXMuaWWGImh0dHBzOi8vaWRwLmRpYXMuaWUvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFJ8KCzRdsORXHfsuXHNeCrKqR4owMA0GCSqGSIb3
+DQEBBQUAA4IBAQBPyzwZNTdiO9/RRp0f8hBqP0rOsO7mueuDbGvZoCPUEYiBkYiG
+zYB2DHkcfAYQls/vuI7DiuLWQC5COLsoDVgAW59VBrRKTRwpIjktvTM3C2aexomw
+GW7M9XqyiTdArQb3Inyl8Jca4HiniDEorh7OqjGEIakT4cIj8Vfu43b+E0L28otA
+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: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: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.dijon.iufm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dijon.iufm.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..5e0713b7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dijon.iufm.fr-idp-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dijon.iufm.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-28T12:03: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dijon.iufm.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">ESPE de Bourgogne - Dpt MEEF</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDMDCCAhigAwIBAgIVAPJxU6vXRtyZ2B8/iZhhakdOe/SBMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWRpcC5kaWpvbi5pdWZtLmZyMB4XDTEyMTAzMTA5MDYz
+OVoXDTMyMTAzMTA5MDYzOVowHDEaMBgGA1UEAxMRZGlwLmRpam9uLml1Zm0uZnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ2TDr3Xoz5TBEKdyL3ZSS
+oWgPsLaId+qegB3aYnBcLK9/Oge/K8WThAVVAUSX7A/FyFrZdeQBR9HpUqaOb2p3
+UE0MHs0w3h80vQ3btvM4ag6ZxakEZh066VxgSb6bRAD4G1kmwDUbXl/Hm+pypx7O
+kndJYVDWke+M8Y9Hqvjl9F0ZLH58HPwtCwN3Gg9IGfbiSMtvLLZoHfifSc6O2m0R
+kHDGg4LMqbhNoFo2Z9VTwqV/7dd2qy+4+11C0Sd9v9vzdRCB5MawK40ARyhhwwFE
+WoqxXKmndbh+rnvCDZadM0jT3A9QuUm6/PVVhaXnMXGAlm97EWtP+CL8/AdFCm3f
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWRpcC5kaWpvbi5pdWZtLmZyhihodHRwczov
+L2RpcC5kaWpvbi5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBT1MxRC
+yvoAAjqWbajuVCCe5OQ2OjANBgkqhkiG9w0BAQUFAAOCAQEAiewYRJ5OUQoPEThR
+5JKesIDaeCUz9QoGBsRPUVGudb2FiuKp+iKVLPXZ9CuRidg6ZDk0ejXQjThk/Xaz
+scNJ39+zbOBNqE+v7XhYsCLSG/3DhrfTWz4XosuqKojH9ZwXsBhQqB1Rk/Vebr50
+IUHP0I8OQKilNbv7IYx3eduXIVAicsVOW5DaWYZBQJ2zFa+9we5ZBMeZ/Lq6DkGC
+YpPfDGEAblTPzFEiMw7TlhPvLehjCzmBggW8fG061FZ8J2rBeOzBlTNBRMqekUaf
+V5IHw211pa1xInH+EzE4//vuvfemALnv0wPbbvUbroFeb/qqwNMZP22D9p2r+s9J
+27C2qA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dijon.iufm.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dijon.iufm.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dijon.iufm.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ESPE de Bourgogne - Dpt MEEF</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ESPE de Bourgogne - Dpt MEEF</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Bourdin Jean-Michel</md:SurName>
+    <md:EmailAddress>jean-michel.bourdin@dijon.iufm.fr</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
new file mode 100644
index 00000000..622cc6c2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDJzCCAg+gAwIBAgIUMJUKlH8ou/Aqe5RpN9dGZSep/CQwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MB4XDTExMTEyMTEwNDY1NloX
+DTMxMTEyMTEwNDY1NlowGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtQSmT31kE2g6itpnCjcLrFBCUL04
+LsMioxbBFbCFsMn3vgHOubmhpwuNOUBYhl8MkSIGjoAcYCbDc4hDSucQMSx1fgvF
+X/S2QfJr7Bu6mNxzt9RqMoXWnuqkKKZYZw+DjITqzZp3g2+lB3i3b9x1jOh4AhSe
+OoWoVyXx/x+EQS9WJ55GEw/fKi70GtrrKI5wu4D/z+bigZG5TOg3A3o197mLt0ns
+jwSd51WdtbZ+AccwyTOyQgFCqwRxszQEvqIt2wyNYt0AOcYi2jRUlpc2jnikytXN
+9hsNZPT0Y9Yuxi5IVRxSIkdeIs9eGOxrJqxg6FWwIdFHpNyF9MVjx4eZewIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAuZGlyLmdhcnIuaXSGJmh0dHBzOi8vaWRwLmRp
+ci5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRybtrE0ndZvt7hHlAA
++e035msGLzANBgkqhkiG9w0BAQUFAAOCAQEAWFusaIXa/wOcsEEvKRA83mFVulM/
+R0lA/D+Zm0LH1SxVEprX7/Iv001U1M5c6ySFWHgR6v7CIHHVpNF+aMr1kNw4U2wc
+XMWli2Htykpd8sgrjx7Eg4+3WITxupXwxbvxU86orNntPcJCASVcDVbrBReC6mZ2
+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>
+MIIDJzCCAg+gAwIBAgIUMJUKlH8ou/Aqe5RpN9dGZSep/CQwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MB4XDTExMTEyMTEwNDY1NloX
+DTMxMTEyMTEwNDY1NlowGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtQSmT31kE2g6itpnCjcLrFBCUL04
+LsMioxbBFbCFsMn3vgHOubmhpwuNOUBYhl8MkSIGjoAcYCbDc4hDSucQMSx1fgvF
+X/S2QfJr7Bu6mNxzt9RqMoXWnuqkKKZYZw+DjITqzZp3g2+lB3i3b9x1jOh4AhSe
+OoWoVyXx/x+EQS9WJ55GEw/fKi70GtrrKI5wu4D/z+bigZG5TOg3A3o197mLt0ns
+jwSd51WdtbZ+AccwyTOyQgFCqwRxszQEvqIt2wyNYt0AOcYi2jRUlpc2jnikytXN
+9hsNZPT0Y9Yuxi5IVRxSIkdeIs9eGOxrJqxg6FWwIdFHpNyF9MVjx4eZewIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAuZGlyLmdhcnIuaXSGJmh0dHBzOi8vaWRwLmRp
+ci5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRybtrE0ndZvt7hHlAA
++e035msGLzANBgkqhkiG9w0BAQUFAAOCAQEAWFusaIXa/wOcsEEvKRA83mFVulM/
+R0lA/D+Zm0LH1SxVEprX7/Iv001U1M5c6ySFWHgR6v7CIHHVpNF+aMr1kNw4U2wc
+XMWli2Htykpd8sgrjx7Eg4+3WITxupXwxbvxU86orNntPcJCASVcDVbrBReC6mZ2
+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>
diff --git a/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml
new file mode 100644
index 00000000..d3f6fb84
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml
@@ -0,0 +1,74 @@
+<?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"/>
+  </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">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: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>
+MIIDFDCCAfygAwIBAgIVAJ7TJcMtAwNtz/8vec1TyPtNeUveMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5kaXQuaWUwHhcNMTAwNjIyMTExNTAwWhcNMzAw
+NjIyMTExNTAwWjAVMRMwEQYDVQQDEwppZHAuZGl0LmllMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAs8xgb2mE8WJaUYR0fVcH8dEAS7f7bGWpyzrT+SPa
+v5egAD27fcuhUP+QFILf6plDW6YqXBcbymxHE1yPExVYO84v8lfpULEMbii1wRg+
+z/ywHqZ1Bio+aq8OrcCdjrlR84n3fpR/6aaVr21JbwVPR6+sCuc4+q3opXzaGGFa
+LvTT3hcl5C/cGiJQra81rlv9Q1dWwZh6xvmR5wrqzxkKiyJ8mr1KjuePyJV3BOJJ
+zeaki3SYdkB+xM8gO6P19lXkvsVYnkUWVR79E61mFReUWPzr9Bjub0A/aE2Pwzuq
+ZWPedEsVR4NfTZANVhewKCNFDadRDbRFDDRW9W2Lc2v3rwIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuZGl0LmllhiFodHRwczovL2lkcC5kaXQuaWUvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFF6EGb7A7x+2xLW/hEJHpulkdzkYMA0GCSqGSIb3DQEB
+BQUAA4IBAQA2kPu6oYpbBoldko99FX4ePbXa9ty11/I+EamddnzkAsLWsNd2JLQW
+R9wo+2vSkUzaxck11FMBS5hbqNsKdUjqTtscGP2MfmIiQJG+dgN7ThHKVvaxyTpc
+3JPQIvaew08s7L8ShjCuhkjmYmlOa4olGV1Z0aG7SjSI9b5w3MfDwN2lecAAUKVW
+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: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: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
new file mode 100644
index 00000000..1f6b5c3a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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">
+    <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:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.984667,-6.394150</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUXWnVlumk2ydwS9DRW7Xoxc2vfvcwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwLmRraXQuaWUwHhcNMDkwODExMTAyNTQ3WhcNMjkw
+ODExMTAyNTQ3WjAWMRQwEgYDVQQDEwtpZHAuZGtpdC5pZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBANkYoFuj1yxD2P68jA2zsEtokAAUExRcur1pdVIF
+3iTS3l/vifRLxstc0IVniaOcWvBxWcLKLueZeBMTuWsyePGz5BhecXzs2u6alYZW
+ITUxJTE0jxZ+WfpPQqnWsysa4rIzksw9l7sbccSz7qvZPLFlwdprrU1rMAMqAcXv
+hYg5iJLRPfRHMN9piFrlibi0RM+u9QPj8/KqJnYVjDZ1+oMeVArEdLk787YlMp79
+GaiKbP6u1cJ3FIgtnWmtph4XWhdMNoh3VBVIo30LnxANGSotMEo+pz/UphUarBjF
+wUzy8vyJdF5+L/Lh/3q6JKVIViC064jQe+PsSJYG0R3ynVcCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwLmRraXQuaWWGImh0dHBzOi8vaWRwLmRraXQuaWUvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFHrvvvBubZqHTcyxZa3VdPhPDWX3MA0GCSqGSIb3
+DQEBBQUAA4IBAQAPn2bTK88XJI8cyWVVRvKXQuNTwIY3KLE+dRs+6EGeF46Ipzfn
+fGIF1je7IrsIUAIKs+8KBWoCwoOp0Nasilib/F90OK6NwEXNKqGdwZXQxJLdvOK7
+yHOXKS+J27t05krcLbutSwcNdnOVEdWbtOz7+/qbx2CSxbrOIDSgTcVDwn/wqm7G
+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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dkit.ie/idp/profile/SAML2/Redirect/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>Andrew</md:GivenName>
+    <md:SurName>Clarke</md:SurName>
+    <md:EmailAddress>mailto:andrew.clarke@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.dundee.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.dundee.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c759f3b6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dundee.ac.uk-shibboleth.xml
@@ -0,0 +1,112 @@
+<?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>
+      <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>
+						MIIEbTCCA1WgAwIBAgIQV2n6T3aZYb1/Q1TOgutwUDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPjEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBpZHAuZHVuZGVl
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6aM3dG470zLr
+						E1ZfL3otFt97pzqN7dOgZfspYFemKltvl5pgkkUCh/APf1Z/VOwJb9P0nGpvipDF
+						wg2CpiPATch++ibtEM+usyE9HP6LyPGqdmN2nX987lRgzDiEZh5mkti9Mx8K1SqD
+						FI8NnApuBJuOCZvdV70Ls1FtuCuKgFGVdY7O/4VM4TIEz4HDOy0guETkrpY45S+1
+						LAqjgCcLn80oW9dXFvzIGQCB/XVf0AZdADH67wIv/WOmHUyCPmxYBmp5GHSHSjLZ
+						B0P50FktnCIIOhWZyecK30yeANwa2Fnn3OSRSOoN+NrxmglhbdNtMdZ/FBis8BwM
+						PscTJoZrTwIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+						6pDjue0wHQYDVR0OBBYEFCzxjhGJww5E4wXnImLxRONeoHnbMA4GA1UdDwEB/wQE
+						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+						cC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAuZHVuZGVlLmFjLnVrMA0G
+						CSqGSIb3DQEBBQUAA4IBAQAZuc8up4a9nKNHHv2wkU76tQ2u6gIkMz6dGDVPGbZ2
+						qRTLYyNVjkpXQHagA9uNed7xn34whCpXLNmaz5iNLdr1RFbBnQkSN4NPUWUG+vdF
+						q9MkZCJuy29f25cArKPI54PghhRyA7r1+6DG0uOrcOsKRTNbcxm3ITKIA9ZpIZV1
+						DNuEZiiHUJrUFmnPtKVRmDfFG97lWi/aeP4lfnzlZtk+DICTOINJsCuGY4VCCeCT
+						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>
+						MIIEbTCCA1WgAwIBAgIQV2n6T3aZYb1/Q1TOgutwUDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPjEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBpZHAuZHVuZGVl
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6aM3dG470zLr
+						E1ZfL3otFt97pzqN7dOgZfspYFemKltvl5pgkkUCh/APf1Z/VOwJb9P0nGpvipDF
+						wg2CpiPATch++ibtEM+usyE9HP6LyPGqdmN2nX987lRgzDiEZh5mkti9Mx8K1SqD
+						FI8NnApuBJuOCZvdV70Ls1FtuCuKgFGVdY7O/4VM4TIEz4HDOy0guETkrpY45S+1
+						LAqjgCcLn80oW9dXFvzIGQCB/XVf0AZdADH67wIv/WOmHUyCPmxYBmp5GHSHSjLZ
+						B0P50FktnCIIOhWZyecK30yeANwa2Fnn3OSRSOoN+NrxmglhbdNtMdZ/FBis8BwM
+						PscTJoZrTwIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+						6pDjue0wHQYDVR0OBBYEFCzxjhGJww5E4wXnImLxRONeoHnbMA4GA1UdDwEB/wQE
+						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+						cC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAuZHVuZGVlLmFjLnVrMA0G
+						CSqGSIb3DQEBBQUAA4IBAQAZuc8up4a9nKNHHv2wkU76tQ2u6gIkMz6dGDVPGbZ2
+						qRTLYyNVjkpXQHagA9uNed7xn34whCpXLNmaz5iNLdr1RFbBnQkSN4NPUWUG+vdF
+						q9MkZCJuy29f25cArKPI54PghhRyA7r1+6DG0uOrcOsKRTNbcxm3ITKIA9ZpIZV1
+						DNuEZiiHUJrUFmnPtKVRmDfFG97lWi/aeP4lfnzlZtk+DICTOINJsCuGY4VCCeCT
+						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>
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
new file mode 100644
index 00000000..13729a4c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ebi.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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 - 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>
+						MIIDHzCCAgegAwIBAgIUWQaCmO3/wgoyUm1kMsbfovSvHTcwDQYJKoZIhvcNAQEF
+						BQAwGDEWMBQGA1UEAxMNaWRwLmViaS5hYy51azAeFw0xMjAzMjIxNzE4NTVaFw0z
+						MjAzMjIxNzE4NTVaMBgxFjAUBgNVBAMTDWlkcC5lYmkuYWMudWswggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMiq+DPwgvEvXHVvsqsWViCDVZv/q+qWZf
+						AAFse/KaiA0HPbdailVUaFg/s3ce4elzfWpEbHBoeb+SIVkQPNwmtpVgix92H7dj
+						0YEkYBiSvTDTp54b76yKjFKOpWGGYis+pWY8D8WwWeHce+nHxrCOHB0oCHageY1j
+						bONXdq3AI4153yWAX62za7/F7bdOM+RuDzCj+ezqzRJEk2pP49ZFsaAbVbLfFMqt
+						IgCEclMephDqXLM8MlgP3KIzaq9PhSC4vXS3xxKTbMfRqT+Dzgt1pZvY3jY2T702
+						i99SOhame/gdYXiILCD2XjKnjZhFSNMfvy/FfQDCpx++yFTXEFZzAgMBAAGjYTBf
+						MD4GA1UdEQQ3MDWCDWlkcC5lYmkuYWMudWuGJGh0dHBzOi8vaWRwLmViaS5hYy51
+						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdskpfLSwe6x0/paoWOMdXjPcSZ4w
+						DQYJKoZIhvcNAQEFBQADggEBAA7P/MO6GYM8Qev0usgkT58VRk1uRQMqFUc+cGUP
+						QEhjFILRIwlAKyQzT5hg6wMRdFcgbye5NSDx23GCL3UqqoNpMmZ/wd/cSNuwd/TZ
+						ZDLn4NCFoBv/MbHzKwQPa0E4lD5eiPtwtm3SlRqfSCAL/FMK2RC5DtmKKVPIzBoN
+						XjfN5xEXaK1Fqt+IcN1iKY7gEs115CL5oeing5GRNtUpW2/FGPKy2OYFhmIQs93n
+						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>
+						MIIDHzCCAgegAwIBAgIUWQaCmO3/wgoyUm1kMsbfovSvHTcwDQYJKoZIhvcNAQEF
+						BQAwGDEWMBQGA1UEAxMNaWRwLmViaS5hYy51azAeFw0xMjAzMjIxNzE4NTVaFw0z
+						MjAzMjIxNzE4NTVaMBgxFjAUBgNVBAMTDWlkcC5lYmkuYWMudWswggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMiq+DPwgvEvXHVvsqsWViCDVZv/q+qWZf
+						AAFse/KaiA0HPbdailVUaFg/s3ce4elzfWpEbHBoeb+SIVkQPNwmtpVgix92H7dj
+						0YEkYBiSvTDTp54b76yKjFKOpWGGYis+pWY8D8WwWeHce+nHxrCOHB0oCHageY1j
+						bONXdq3AI4153yWAX62za7/F7bdOM+RuDzCj+ezqzRJEk2pP49ZFsaAbVbLfFMqt
+						IgCEclMephDqXLM8MlgP3KIzaq9PhSC4vXS3xxKTbMfRqT+Dzgt1pZvY3jY2T702
+						i99SOhame/gdYXiILCD2XjKnjZhFSNMfvy/FfQDCpx++yFTXEFZzAgMBAAGjYTBf
+						MD4GA1UdEQQ3MDWCDWlkcC5lYmkuYWMudWuGJGh0dHBzOi8vaWRwLmViaS5hYy51
+						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdskpfLSwe6x0/paoWOMdXjPcSZ4w
+						DQYJKoZIhvcNAQEFBQADggEBAA7P/MO6GYM8Qev0usgkT58VRk1uRQMqFUc+cGUP
+						QEhjFILRIwlAKyQzT5hg6wMRdFcgbye5NSDx23GCL3UqqoNpMmZ/wd/cSNuwd/TZ
+						ZDLn4NCFoBv/MbHzKwQPa0E4lD5eiPtwtm3SlRqfSCAL/FMK2RC5DtmKKVPIzBoN
+						XjfN5xEXaK1Fqt+IcN1iKY7gEs115CL5oeing5GRNtUpW2/FGPKy2OYFhmIQs93n
+						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 - EBI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ebi.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jenny</md:GivenName>
+    <md:SurName>Martin</md:SurName>
+    <md:EmailAddress>mailto:jenny@ebi.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jenny</md:GivenName>
+    <md:SurName>Martin</md:SurName>
+    <md:EmailAddress>mailto:jenny@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
new file mode 100644
index 00000000..d025ab74
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ec-lille.fr-idp-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+      <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="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>
+					      MIIDJzCCAg+gAwIBAgIUZqE7Q+IH1nvI8J9EfTCnG/5KwYQwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmVjLWxpbGxlLmZyMB4XDTEyMDMyOTA3MjEwMFoX
+DTMyMDMyOTA3MjEwMFowGjEYMBYGA1UEAxMPaWRwLmVjLWxpbGxlLmZyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAurcjSe2yQvV0wftgNyRCtoGWYADp
+MfWXihXrJtPQjLcuI3ipqN5bJz8W5dwKOa1ca6CNtI7J5UO4ORtQhm+GTXSnqKU3
+hNDPcTXvwt8XJ6UhiXxc8k7Rd38ajwobf1hUih3rMJXC34I1pU2REtQrBZls9T32
+B4HjoN1+FR5kCbAGrTpnTzUnEoZUivoXR0aVQdZoNvvyESM4tBnVCFDgVatGAn9/
+ZnkKyk5tyXtF4+eeTo1hDx/rYNvUhYmWXeI2CYVsVYUxmRUp13W6d1+sE1Jajcpr
+X1kwgGNk1H/JIChetxD3KMcTrreF4qEDztzghCs/nMosCe5D0aTzliCqdQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAuZWMtbGlsbGUuZnKGJmh0dHBzOi8vaWRwLmVj
+LWxpbGxlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS8k5z2mHglPmRe5mYj
+jPcglb7IxDANBgkqhkiG9w0BAQUFAAOCAQEAiPcyMDpgvPV9HRgodx8GFUQyhrpg
+mkJdDlSTqe3tC6tC84RbAJ1iz1lznmNTtmao4meoZclddh/6xn0GLB6YL7j3e0Zm
+TD40/6j6PL4ECXmqhNLEIUi1gPGGbJk8h1tIlhNLWmQVKQmpR8G3j1EksUsAWCoY
+envB4RkNo6WLpReZj5bRF0iSr6n7+ffuSAl22cis1d8QMYcu/rsL7CKXuCHN2sRb
+IOtBkZ38jQP2f/nTz5h2cliO4tiMckGW+284yHmxNX+6cLriWj6hRsFa5gt8dPSJ
+Kg3NiOUmGq2VSgHAqi8QEVsRCKvmIgZmEyQRzB+NjEoqCqBnhxXKKhqmlA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc: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://unknown.site.com</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
new file mode 100644
index 00000000..51899561
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ecam.fr-idp-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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: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>
+					      MIIDFzCCAf+gAwIBAgIUXFGDVnYfC4TCE7Lq/bUOsxSKIrswDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwLmVjYW0uZnIwHhcNMTQwNDI4MTMxMTQ4WhcNMzQw
+NDI4MTMxMTQ4WjAWMRQwEgYDVQQDEwtpZHAuZWNhbS5mcjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAIIMTqPcyJZJxgn7lOirdEZMejGbdNX/90ZcBGYa
+6Ks1nT8smP+xyctNKS2vP7kZ59N+Ml7LB0Mne/teKkH1Qx/IEftRsTeuW70kFU6B
+RUEyHMnAyz5rZAozonbbaxKcLf383RvztwifOfcx04haXs3Du9KFGsIz2D8bYUuQ
+7yoBQy/00lTOhn+C92NSZP2iTWwNVfPAh3cEXj1VZQ47y0fkGUd/dBQIT4p4mii/
+4w3PLI4wnU44JlWcsDJllGZjBa/MQY4dRBeKibxDz8oMHxZj4nqc/ZIQ1MIIKd9v
+T24bBwL+RSa6/kGnk5M0hGwHliXGnsiM4/+4TnFJL0wWAfkCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwLmVjYW0uZnKGImh0dHBzOi8vaWRwLmVjYW0uZnIvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFOtnyyDaZuvbEOS/oJjhfM9qSbeBMA0GCSqGSIb3
+DQEBBQUAA4IBAQAeDlQG75QPvtH7RH4XgFjbtuK0Vx+C+RG+JjelVwtcUz6+P2jx
+/t16CRXS6GYSuKlL8X9hWzfxdMxcSSpdynEeh1s99w/9f19tJEPEsJNQ0AdLB80Q
+bXG9s8yhrIeO8Z7fHM6/23ay0uqXSw/DtAMFQ1dBKpKJ129nhuhELdDyw3IU3lwX
+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>
+					      MIIDFzCCAf+gAwIBAgIUXFGDVnYfC4TCE7Lq/bUOsxSKIrswDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwLmVjYW0uZnIwHhcNMTQwNDI4MTMxMTQ4WhcNMzQw
+NDI4MTMxMTQ4WjAWMRQwEgYDVQQDEwtpZHAuZWNhbS5mcjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAIIMTqPcyJZJxgn7lOirdEZMejGbdNX/90ZcBGYa
+6Ks1nT8smP+xyctNKS2vP7kZ59N+Ml7LB0Mne/teKkH1Qx/IEftRsTeuW70kFU6B
+RUEyHMnAyz5rZAozonbbaxKcLf383RvztwifOfcx04haXs3Du9KFGsIz2D8bYUuQ
+7yoBQy/00lTOhn+C92NSZP2iTWwNVfPAh3cEXj1VZQ47y0fkGUd/dBQIT4p4mii/
+4w3PLI4wnU44JlWcsDJllGZjBa/MQY4dRBeKibxDz8oMHxZj4nqc/ZIQ1MIIKd9v
+T24bBwL+RSa6/kGnk5M0hGwHliXGnsiM4/+4TnFJL0wWAfkCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwLmVjYW0uZnKGImh0dHBzOi8vaWRwLmVjYW0uZnIvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFOtnyyDaZuvbEOS/oJjhfM9qSbeBMA0GCSqGSIb3
+DQEBBQUAA4IBAQAeDlQG75QPvtH7RH4XgFjbtuK0Vx+C+RG+JjelVwtcUz6+P2jx
+/t16CRXS6GYSuKlL8X9hWzfxdMxcSSpdynEeh1s99w/9f19tJEPEsJNQ0AdLB80Q
+bXG9s8yhrIeO8Z7fHM6/23ay0uqXSw/DtAMFQ1dBKpKJ129nhuhELdDyw3IU3lwX
+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://unknown.site.com</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
new file mode 100644
index 00000000..b27f02e4
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ecole-navale.fr-idp-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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>
+      <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: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>
+					      MIIHFDCCBfygAwIBAgIRAN/99OwB6bXHosvP+tqCI94wDQYJKoZIhvcNAQEFBQAw                                                                                                          
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B                                                                                                          
+IFNTTCBDQTAeFw0xNDA0MTgwMDAwMDBaFw0xNzA0MTcyMzU5NTlaMEExITAfBgNV                                                                                                          
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTd3d3LmVjb2xl                                                                                                          
+LW5hdmFsZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALsw+dln                                                                                                          
+sBBhHCxtW6vz2ty64+0kFZ+Wzi7mb3bj+jAs1ybeABQxtMtmULlYGmmve/AKrdfc                                                                                                          
+RuoZw2/CnO9pqrVtd3d2dZecyC+BFLwbn5ZfQUvgQBeU6W7DlTUIs33o2nvB5Th8                                                                                                          
+1hkdNkT0hnOu2firWt7GZt6opzsvC/DK4HFMECoAbZkxwSdr0wqPFJlrDy/Zesu0                                                                                                          
+VgZ9DHpbdKlqu1FIN3Y7oQ6HxTqh4zJkgRuIKEAc5Qk9qEOGXtD3ONpmu4J5n8KH                                                                                                          
+wqm0tKItMlso1u/w8Bo4SmqnCzYv8CHN+WoO+V/77VShmGUwNG3zqoXUzJnqWrd8                                                                                                          
+givD+8yzm+2Tb70CAwEAAaOCBBAwggQMMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr                                                                                                          
+KzdXR+qQ47ntMB0GA1UdDgQWBBTge8meqqavoNPKBO/AxAmtOhOvADAOBgNVHQ8B                                                                                                          
+Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB                                                                                                          
+BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f                                                                                                          
+BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+L29jc3AudGNzLnRlcmVuYS5vcmcwggK8BgNVHREEggKzMIICr4ITd3d3LmVjb2xl
+LW5hdmFsZS5mcoIVYWlnbGUuZWNvbGUtbmF2YWxlLmZyghhhbm51YWlyZS5lY29s
+ZS1uYXZhbGUuZnKCGmFzc2lzdGFuY2UuZWNvbGUtbmF2YWxlLmZyghRhdXRoLmVj
+b2xlLW5hdmFsZS5mcoIVY291cnMuZWNvbGUtbmF2YWxlLmZyghlkaWZmdXNpb24u
+ZWNvbGUtbmF2YWxlLmZyghhkb2xpYmFyci5lY29sZS1uYXZhbGUuZnKCFWZpbGV6
+LmVjb2xlLW5hdmFsZS5mcoIVZm9ydW0uZWNvbGUtbmF2YWxlLmZyghdnZXN0aW9u
+LmVjb2xlLW5hdmFsZS5mcoITaWRwLmVjb2xlLW5hdmFsZS5mcoIWamFwcGl4LmVj
+b2xlLW5hdmFsZS5mcoIWbGlzdGVzLmVjb2xlLW5hdmFsZS5mcoIUbGl2ZS5lY29s
+ZS1uYXZhbGUuZnKCFW1lZGlhLmVjb2xlLW5hdmFsZS5mcoIbbWVzZmljaGllcnMu
+ZWNvbGUtbmF2YWxlLmZyghVwaG90by5lY29sZS1uYXZhbGUuZnKCG3Bob3RvdGhl
+cXVlLmVjb2xlLW5hdmFsZS5mcoIYcGlsb3RhZ2UuZWNvbGUtbmF2YWxlLmZyghhw
+bGFubmluZy5lY29sZS1uYXZhbGUuZnKCF3JlZG1pbmUuZWNvbGUtbmF2YWxlLmZy
+ghtyZXNlcnZhdGlvbi5lY29sZS1uYXZhbGUuZnKCF3NlY291cnMuZWNvbGUtbmF2
+YWxlLmZyghhzb25kYWdlcy5lY29sZS1uYXZhbGUuZnKCE3N2bi5lY29sZS1uYXZh
+bGUuZnKCF3dlYm1haWwuZWNvbGUtbmF2YWxlLmZyghR3aWtpLmVjb2xlLW5hdmFs
+ZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAKpU8yupf4hYd+QxSmgNJ+J9nWT3FUnMv
+s/EOxEm2Olexxu7avf9ywoQ7ejCPZIJ+cuFq7yfQnOpxFOYemeTw7jMkNMrO9f7p
+dG8EUqxt7PuyvbYm/f5/QbM/Xy/1y078y7wgElgS4j+Sls9FKe6soQuQP+1KIAbF
+2Lgz6hNu74TPcEBL4BaEjRSXeexkE77+JIYnF1CYqluXAaCnswAdtQoK7BXwJ3DA
+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://unknown.site.com</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
new file mode 100644
index 00000000..92a8c46c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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>
+						MIIDGzCCAgOgAwIBAgIUaNzLeqDgCpvqZ+xdntpj4UryL9AwDQYJKoZIhvcNAQEF
+						BQAwFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMB4XDTEwMDYyMzE0MTIzNFoXDTMw
+						MDYyMzE0MTIzNFowFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8RXQWoMfry/rRwfXVCxnRdkS05zIfHerw0/c
+						ObSFOORK8zOShk1QKuv+TevSZFJgD+iu96A1s55q6k0ZtbpW1iKzTAbHLXikt0yT
+						GYg5th2Gp3PqBFdzChse1Sdk8exRou10yOGZaqCyfG61u+BRgdEzefdG6to7PpG4
+						BNWD1njtO6zDl/zzsX9DiV3Kc7Fuo6P7ak+XPHGxztXVNwDRSoKZYiM5K11dpGvG
+						nhyhL2gbIO98AzGMELdkurTf4EYXuELGPY836NNdzhBEZ0Mo+g9EUqvPQ8inFOT4
+						TloSEUtxUzLr530YPOezm55QCDjH7JIS4rc+G4rN1B7b1zTybwIDAQABo18wXTA8
+						BgNVHREENTAzggxpZHAuZWQuYWMudWuGI2h0dHBzOi8vaWRwLmVkLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQmHZOct2bza0v07qT/d1ATgFYrajANBgkq
+						hkiG9w0BAQUFAAOCAQEAEgOOXyutNIWNlWoDj3VKfkZFDpw/2qvrP09EaYGBCwZ+
+						NAmPHWtN+3jlDxfnYBwhTAaCWlZBqfhk4JObVH2Q3xu08zWEHBqo4fr/YGYYWAGp
+						nZ29epYGOJAYbuJcWwwMJ4onFHyygRgmec4xPnz53noB8h6VEMmfP77y0JzZIF86
+						+1icvTyJg4ydkh8iPir4WwZzuP7wj+cPb3uyNTGSusxhghVoREkGIG2YBwgp3cyv
+						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>
+						MIIDGzCCAgOgAwIBAgIUaNzLeqDgCpvqZ+xdntpj4UryL9AwDQYJKoZIhvcNAQEF
+						BQAwFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMB4XDTEwMDYyMzE0MTIzNFoXDTMw
+						MDYyMzE0MTIzNFowFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8RXQWoMfry/rRwfXVCxnRdkS05zIfHerw0/c
+						ObSFOORK8zOShk1QKuv+TevSZFJgD+iu96A1s55q6k0ZtbpW1iKzTAbHLXikt0yT
+						GYg5th2Gp3PqBFdzChse1Sdk8exRou10yOGZaqCyfG61u+BRgdEzefdG6to7PpG4
+						BNWD1njtO6zDl/zzsX9DiV3Kc7Fuo6P7ak+XPHGxztXVNwDRSoKZYiM5K11dpGvG
+						nhyhL2gbIO98AzGMELdkurTf4EYXuELGPY836NNdzhBEZ0Mo+g9EUqvPQ8inFOT4
+						TloSEUtxUzLr530YPOezm55QCDjH7JIS4rc+G4rN1B7b1zTybwIDAQABo18wXTA8
+						BgNVHREENTAzggxpZHAuZWQuYWMudWuGI2h0dHBzOi8vaWRwLmVkLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQmHZOct2bza0v07qT/d1ATgFYrajANBgkq
+						hkiG9w0BAQUFAAOCAQEAEgOOXyutNIWNlWoDj3VKfkZFDpw/2qvrP09EaYGBCwZ+
+						NAmPHWtN+3jlDxfnYBwhTAaCWlZBqfhk4JObVH2Q3xu08zWEHBqo4fr/YGYYWAGp
+						nZ29epYGOJAYbuJcWwwMJ4onFHyygRgmec4xPnz53noB8h6VEMmfP77y0JzZIF86
+						+1icvTyJg4ydkh8iPir4WwZzuP7wj+cPb3uyNTGSusxhghVoREkGIG2YBwgp3cyv
+						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>
diff --git a/swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth-devel.xml b/swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth-devel.xml
new file mode 100644
index 00000000..00cef6ef
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth-devel.xml
@@ -0,0 +1,115 @@
+<?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-devel">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">EDINA - development</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test IdP for DS &amp; IdP development</mdui:Description>
+        <mdui:Logo height="58" width="110">https://dlib-adidp.ucs.ed.ac.uk:442/Images/EdinaLogo110x58px.jpg</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://dlib-adidp.ucs.ed.ac.uk:442/images/edina-16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>82.68.124.32/29</mdui:IPHint>
+        <mdui:DomainHint>ucs.ed.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:55.935575,-3.1800687</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sdss.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDQjCCAiqgAwIBAgIJAK0rgSd/uZWTMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMMF2RsaWItYWRpZHAudWNzLmVkLmFjLnVrMB4XDTEzMDQyNTA4MDMyN1oXDTIz
+						MDQyMzA4MDMyN1owIjEgMB4GA1UEAwwXZGxpYi1hZGlkcC51Y3MuZWQuYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDk39sTO/cBCGsSsoD9jV8g
+						5SMiKKDPRrGQcNiYadjhhnQhvDu8GgCtaJxkdFPf8jFNJeiaiEj/dF/fupX41gBy
+						7j+wDbxeB19GwEAZV8zLvLTL3/R3HooXNP3dEoX8lyzWaO9EGI0D3ow16T6b7JLN
+						Od2AIdMX6/Hbk4gnyPM2t/JFatI4PrfxllU88BZnmp+1ViSmzD07El3YqlE2VcZd
+						Wp9WnEAn8VCvl1WSP8LjjYnLo94SNQYkoAixrdsRTj3rwoEbF1dQKxlEbdgACCWq
+						SuBADzOYe8zrQ4Zx170nv9MkoW3LPlA47e5K7PLJJxS7iKK8MvR9VqMJyXMPDfK9
+						AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2Vu
+						ZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBT7Rvy1Cv6qn4zu/hh6y2ukpRlV
+						AjAfBgNVHSMEGDAWgBT7Rvy1Cv6qn4zu/hh6y2ukpRlVAjANBgkqhkiG9w0BAQUF
+						AAOCAQEAz3byn5zwGYZmAyWIcvrcKdB4XIRSMHtcJuDMRhGxVwGx3pFjaYkRY/le
+						tqo05KlnbGBKygEJYlA1ukpwbGXSU2WX8gRelFQX7KJFuITMawejR5qH3z45XniQ
+						AvFZJy2DYcIoIEGJcLIWyD4vOP8VQXEIDkgLZ1+EydiKlg2Az2uElc7jniaaVJh0
+						p7Gkyk+vHsgl9lUE+ZG4DX3G4FfolDHdyNRw1cLkjshebXCqzM2AcjAmcHMB0dYg
+						pIGtkImdP6hN2vNeuqaTC9IpGGC+o79WGeH7ZX5GLf5G//peP0FqNWdyzXoTn+SX
+						RSdfrDdMNzV9UpPuCre7zj6+ww7aEw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-adidp.ucs.ed.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-adidp.ucs.ed.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-adidp.ucs.ed.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-adidp.ucs.ed.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-adidp.ucs.ed.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-adidp.ucs.ed.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sdss.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDQjCCAiqgAwIBAgIJAK0rgSd/uZWTMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMMF2RsaWItYWRpZHAudWNzLmVkLmFjLnVrMB4XDTEzMDQyNTA4MDMyN1oXDTIz
+						MDQyMzA4MDMyN1owIjEgMB4GA1UEAwwXZGxpYi1hZGlkcC51Y3MuZWQuYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDk39sTO/cBCGsSsoD9jV8g
+						5SMiKKDPRrGQcNiYadjhhnQhvDu8GgCtaJxkdFPf8jFNJeiaiEj/dF/fupX41gBy
+						7j+wDbxeB19GwEAZV8zLvLTL3/R3HooXNP3dEoX8lyzWaO9EGI0D3ow16T6b7JLN
+						Od2AIdMX6/Hbk4gnyPM2t/JFatI4PrfxllU88BZnmp+1ViSmzD07El3YqlE2VcZd
+						Wp9WnEAn8VCvl1WSP8LjjYnLo94SNQYkoAixrdsRTj3rwoEbF1dQKxlEbdgACCWq
+						SuBADzOYe8zrQ4Zx170nv9MkoW3LPlA47e5K7PLJJxS7iKK8MvR9VqMJyXMPDfK9
+						AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2Vu
+						ZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBT7Rvy1Cv6qn4zu/hh6y2ukpRlV
+						AjAfBgNVHSMEGDAWgBT7Rvy1Cv6qn4zu/hh6y2ukpRlVAjANBgkqhkiG9w0BAQUF
+						AAOCAQEAz3byn5zwGYZmAyWIcvrcKdB4XIRSMHtcJuDMRhGxVwGx3pFjaYkRY/le
+						tqo05KlnbGBKygEJYlA1ukpwbGXSU2WX8gRelFQX7KJFuITMawejR5qH3z45XniQ
+						AvFZJy2DYcIoIEGJcLIWyD4vOP8VQXEIDkgLZ1+EydiKlg2Az2uElc7jniaaVJh0
+						p7Gkyk+vHsgl9lUE+ZG4DX3G4FfolDHdyNRw1cLkjshebXCqzM2AcjAmcHMB0dYg
+						pIGtkImdP6hN2vNeuqaTC9IpGGC+o79WGeH7ZX5GLf5G//peP0FqNWdyzXoTn+SX
+						RSdfrDdMNzV9UpPuCre7zj6+ww7aEw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-adidp.ucs.ed.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-adidp.ucs.ed.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 - development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/about/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rod</md:GivenName>
+    <md:SurName>Widdowson</md:SurName>
+    <md:EmailAddress>mailto:idp-admin@steadingsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rod</md:GivenName>
+    <md:SurName>Widdowson</md:SurName>
+    <md:EmailAddress>mailto:idp-admin@steadingsoftware.com</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
new file mode 100644
index 00000000..236acd0c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth.xml
@@ -0,0 +1,123 @@
+<?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>
+      <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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEsDCCA5igAwIBAgIRAMQPXNT/ixUHnoW1X6rTlLYwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjA1MjIwMDAwMDBaFw0xNTA1MjIyMzU5NTlaMIGFMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEg
+						MB4GA1UEChMXVW5pdmVyc2l0eSBvZiBFZGluYnVyZ2gxDjAMBgNVBAsTBUVESU5B
+						MR0wGwYDVQQDExRkbGliLWlkcC5lZGluYS5hYy51azCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAOGx88tQrqjkQasImchJRv2oX0m2233CXpwCCpLMTph2
+						ArRQ+GokqZ8anAz/Y5IYbLntGc8w42Qp6NDuLsX9ir32eUbEfRKvzDH8iJeP2bma
+						fe7wJVNHsNZ0nCZPqmp0wcWXfKPT8XKVyiz7RMJjqKrL04PVou6g7YHuUq1LYTul
+						qL1ScXZS8I8untGshULq4oi3k5cT+9JMU4YbrrMI74Nuj4o4AtdZ3SFwQKu2yLWl
+						nIcPMyZH1hlvDlzpvqL/StUb26YLmE35jT/1794khT73TwvX+WojS+9Ok2Sze82m
+						1ru0Q4mF7uSYv/MWRDMzCQAzMegR4q/HUMAXDijxyIECAwEAAaOCAWcwggFjMB8G
+						A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQNo/wVzmA5
+						1XzsRMuYjloRuRiZkDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
+						HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
+						AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+						L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+						dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+						BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAfBgNVHREEGDAWghRkbGli
+						LWlkcC5lZGluYS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEACHJvGryrLo8QB2bL
+						+uIBNSG2sXzSqGf28PsUNpfKivbEFlutzz+6weEHaNXIYM+UWDJifCuCY8f1fmJl
+						XBybp5bU3JbB/KGgShDEGXRP8UfT4WJJXTaVUAQgEHgQqUzGmkfVUyG7SSe3hv66
+						2Gg9w/L1j4i4rXB1AGFcMiLe0OnPzOrQSWGYMHsRA7WKBfYduhApLs0kvztxk2VH
+						xcLkfi3czTvRPyikacsE1VmXxRk3MnmGiR+HDgraCvTCGu/hDUCBgqVPr13Sw5yw
+						1AeG9/PSofb6/BW8DYlDtHcKwZrX7JbokXAzgYEYN8fhB2pkD2SYf1CL+XRUNcwO
+						3VfgQw==
+					</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEsDCCA5igAwIBAgIRAMQPXNT/ixUHnoW1X6rTlLYwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjA1MjIwMDAwMDBaFw0xNTA1MjIyMzU5NTlaMIGFMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEg
+						MB4GA1UEChMXVW5pdmVyc2l0eSBvZiBFZGluYnVyZ2gxDjAMBgNVBAsTBUVESU5B
+						MR0wGwYDVQQDExRkbGliLWlkcC5lZGluYS5hYy51azCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAOGx88tQrqjkQasImchJRv2oX0m2233CXpwCCpLMTph2
+						ArRQ+GokqZ8anAz/Y5IYbLntGc8w42Qp6NDuLsX9ir32eUbEfRKvzDH8iJeP2bma
+						fe7wJVNHsNZ0nCZPqmp0wcWXfKPT8XKVyiz7RMJjqKrL04PVou6g7YHuUq1LYTul
+						qL1ScXZS8I8untGshULq4oi3k5cT+9JMU4YbrrMI74Nuj4o4AtdZ3SFwQKu2yLWl
+						nIcPMyZH1hlvDlzpvqL/StUb26YLmE35jT/1794khT73TwvX+WojS+9Ok2Sze82m
+						1ru0Q4mF7uSYv/MWRDMzCQAzMegR4q/HUMAXDijxyIECAwEAAaOCAWcwggFjMB8G
+						A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQNo/wVzmA5
+						1XzsRMuYjloRuRiZkDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
+						HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
+						AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+						L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+						dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+						BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAfBgNVHREEGDAWghRkbGli
+						LWlkcC5lZGluYS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEACHJvGryrLo8QB2bL
+						+uIBNSG2sXzSqGf28PsUNpfKivbEFlutzz+6weEHaNXIYM+UWDJifCuCY8f1fmJl
+						XBybp5bU3JbB/KGgShDEGXRP8UfT4WJJXTaVUAQgEHgQqUzGmkfVUyG7SSe3hv66
+						2Gg9w/L1j4i4rXB1AGFcMiLe0OnPzOrQSWGYMHsRA7WKBfYduhApLs0kvztxk2VH
+						xcLkfi3czTvRPyikacsE1VmXxRk3MnmGiR+HDgraCvTCGu/hDUCBgqVPr13Sw5yw
+						1AeG9/PSofb6/BW8DYlDtHcKwZrX7JbokXAzgYEYN8fhB2pkD2SYf1CL+XRUNcwO
+						3VfgQw==
+					</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>
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
new file mode 100644
index 00000000..26fc2b52
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.edinburghcollege.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,119 @@
+<?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>
+      <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
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExppZHAuZWRpbmJ1
+						cmdoY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						ANDTceThPhtkN4vHjeJeXfWN6vv+haVyaabv0If2HIsQQfinei7rKJ7+QfaMZbVI
+						SdhNx9FlnsE8O4KHYCrr4wZbRuvarj/5VVpEccczxIIqrMa1GSCAF6WS456+RYwK
+						mFcQxENki52AhuTbtgaDtI9Lv0oU1N+oqMqk88VkKMR6APV1EVyLbUE8NQhfrC5f
+						dadIGwwK9ws/H7DgMcUYzeHfUQtjd0ePq8bYXS0YbD336ytQmuNnEXqPlFD8Qjyv
+						oYw9SDRRQPMbBRDU9rvLcDJDj4tjqinH+SHYcUdjd4bQlWDxlZaIIbP29mUskhPY
+						xPqd1s59EQAAAauHjzQxKI0CAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
+						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBS6CgBynqxsyXiGOQ1pI61lS7LoojAO
+						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaaWRwLmVkaW5i
+						dXJnaGNvbGxlZ2UuYWMudWswDQYJKoZIhvcNAQEFBQADggEBABYjPfDTpKf2NKnz
+						LTrQ5IvyeVTu/xSCNkmG7M2yI7anN7nZ9xJVWO0ymbjJjZJ4623lLlWnx8gMUIdl
+						xpqJRf8af4uGONpbj5wNIphbPnexaTYEQHi0n8DPSsiPTt7clDI3SYQf9DyLnUEI
+						VNk9o5wwI4R1SfiCTFEoOcLaVrfBTuLmXl2TOVZ5M3tqOkOQeLkP/jPeQq7LxfSd
+						TfwVM+xalQwYU80gajMoy8UIarLR3blfjbe/s1W971x9oFfTIpcayIHioyCsn3jd
+						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>
+						MIIEgTCCA2mgAwIBAgIQK6upqHeZFTtRMqjw0pSkmzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMTAxNDAwMDAwMFoXDTE2MTAxMzIzNTk1OVowSDEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExppZHAuZWRpbmJ1
+						cmdoY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						ANDTceThPhtkN4vHjeJeXfWN6vv+haVyaabv0If2HIsQQfinei7rKJ7+QfaMZbVI
+						SdhNx9FlnsE8O4KHYCrr4wZbRuvarj/5VVpEccczxIIqrMa1GSCAF6WS456+RYwK
+						mFcQxENki52AhuTbtgaDtI9Lv0oU1N+oqMqk88VkKMR6APV1EVyLbUE8NQhfrC5f
+						dadIGwwK9ws/H7DgMcUYzeHfUQtjd0ePq8bYXS0YbD336ytQmuNnEXqPlFD8Qjyv
+						oYw9SDRRQPMbBRDU9rvLcDJDj4tjqinH+SHYcUdjd4bQlWDxlZaIIbP29mUskhPY
+						xPqd1s59EQAAAauHjzQxKI0CAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
+						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBS6CgBynqxsyXiGOQ1pI61lS7LoojAO
+						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaaWRwLmVkaW5i
+						dXJnaGNvbGxlZ2UuYWMudWswDQYJKoZIhvcNAQEFBQADggEBABYjPfDTpKf2NKnz
+						LTrQ5IvyeVTu/xSCNkmG7M2yI7anN7nZ9xJVWO0ymbjJjZJ4623lLlWnx8gMUIdl
+						xpqJRf8af4uGONpbj5wNIphbPnexaTYEQHi0n8DPSsiPTt7clDI3SYQf9DyLnUEI
+						VNk9o5wwI4R1SfiCTFEoOcLaVrfBTuLmXl2TOVZ5M3tqOkOQeLkP/jPeQq7LxfSd
+						TfwVM+xalQwYU80gajMoy8UIarLR3blfjbe/s1W971x9oFfTIpcayIHioyCsn3jd
+						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>Jessica</md:GivenName>
+    <md:SurName>Wilkinson</md:SurName>
+    <md:EmailAddress>mailto:jessica.wilkinson@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.ehess.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..98421195
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml
@@ -0,0 +1,54 @@
+<?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>
+      <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="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>
+					      MIIDHDCCAgSgAwIBAgIVALeCOqpROd3E1etW0cL7TxFT+Z3rMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC5laGVzcy5mcjAeFw0xMTA3MjUxMDMxNThaFw0z
+MTA3MjUxMDMxNThaMBcxFTATBgNVBAMTDGlkcC5laGVzcy5mcjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALomrxhDCkuM+MNokRhVvEkg095vk1wsvflA
+wYfTuhsVSW13bZVHcOHTjILhWiHOVz8RZVXy6vOmEEWXl2KWn9Tvovh/Sey2rRe/
+/svsSpIUKgnU2tC3rC41XJ5V/mIJUoSPhcQCKCx5t4CV4xG5eNa4rYJxsJDDUviA
+Pd+jKkiVMUEvDJ4Qt4o/scjjuUGUrKJ1/EmMqZfG2HO7Xqkg5j8z6n1U6KpOXUb0
+kMhL9SKCiWZX9iYt810mkOlx7TNJlAENOqlGybAnMjEY85rJ/LbEnpgTyWEmNEPc
+1BCN84l4VVEJc7F2WxDjtFMG7YQwjWdUIJbVz/dHHvJQgxIoSrUCAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLmVoZXNzLmZyhiNodHRwczovL2lkcC5laGVzcy5mci9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUL5PgjhSfsllLhl0wF9vbNDc9PpgwDQYJ
+KoZIhvcNAQEFBQADggEBAKARW3uivnFto2JRaKGtnqcaDO5dS3RKj7uf/eIaU/Uq
+Fm3PADZE5gVTUcwlILrDmci0202/Boo03srZ0RCvSZ6HxjZM5gsPGZ0D2SiMf8b3
+UVSLt38rXXyd6Xm0kXvBP2ZsFlRkzanI0G8pa3wOslVGEZccBKY4dmRToIm7cQeB
+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://unknown.site.com</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.elte.hu-auth-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.elte.hu-auth-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..2ce3b570
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.elte.hu-auth-saml2-idp-metadata.php.xml
@@ -0,0 +1,84 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elte.hu</shibmd:Scope>
+      <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>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFYzCCBEugAwIBAgIQLIaNDr+iCPZ0Iz6P3Q9VqTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowOTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAuZWx0ZS5o
+dTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANI/ii7DympWU2khMzlP
+c5m0zeArm9zB6yLik398aLncEEXj9uAXqmZlzD3PlmEehRV554zhjuzPxGS1poQH
+M/em9ctBQXH3sdcNmTi3aRUldO0nr3uH/g38SF2lfZdw+A8wlLYHu3e3nxHKrwIF
+xRR7pNdB1DitfWZ7VArrxt2djsaIOXsECEtos3AyEospySVC/pGwimJv/z3Agykd
+eBVpHB6X9ftn4ptuM+0/ZQgaN7ktP+sR2mcOdgu+ip28rxLS4hd2NNMmfsb1jy14
+YMKKD8ryWb0fI0yyaKKz3AC9DBdKB4o8i/jpBQTsjq0MppL6LT6iDEBb1IO7OagN
+0eAPTt+lMPmW2EPUg3HLZVPYKRHqsaUdE3+gMTTOd8HEc39oRDLaFjsD0H7hoLY9
+DL3Q/CcwYOyCNYbLdzXFn1Cj04T2Oxj94Xw0zAp2Pw0WE9iIzpi/izca7DW8WiEE
+FIPLCDVIqi80GY4AZWFEbTV+I3wDCTfF5lNY67XhH7pWhU5dWJaD5XPYahQd1kve
+jA1+hviqhMQkZvkRTmCMZHpv9amjmFg1CEgk7XGSO5/Rj7fNjSTZ5Ysuh2wjjDWd
+In5sIe1UCVJEqEVCZj1iBU3WXvpDv6Kn6Vr2Zz2jgm4S9CjGOIpueB4MjInVoJFO
+HOsKB63tpuDNSJGj7E/XKCWlAgMBAAGjggFoMIIBZDAfBgNVHSMEGDAWgBQMvZNo
+DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUb9JqTdA6YG8FiGd1gBUvIHMdjA8w
+DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
+MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBYGA1UdEQQPMA2CC2lkcC5lbHRl
+Lmh1MA0GCSqGSIb3DQEBBQUAA4IBAQBOvYggdrH+sTjvU6TRdCOUAFs5YOK//s0x
+CbiC/E1rfb04dSPDSUdjLwOv6bP06N64EugFZakJIweWUPREy5lNP1F3d9JClPMm
+CJNYlbNJ7R750lWHudqTvJ1AU3emNED+Vgp2iBtdyYZHrHMHi+z296f4HxF3V95h
+hCswMCMaw3+NC4WTr7Y84ygGprMRQDWhQTwx06glpjl8h59UdtS9EjSB6KBjkgrG
+/+S37MMUrppeyFis715FtYLoBjz/oLvqNch2KYKThfoW1BrTQZpCq+sot1908yBh
+yUSJRsLqWra9NGM1E1Y+4NLbGwAHhPtuRMGIYDWks3zoyVFm6PvO
+                                            </ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.elte.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.elte.hu/auth/saml2/idp/ArtifactResolutionService.php"/>
+    <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">Eötvös Loránd Tudományegyetem</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Eötvös Loránd University Budapest</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">Eötvös Loránd Tudományegyetem</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Eötvös Loránd University Budapest</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://iig.elte.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://iig.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.enib.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.enib.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..d29eb28f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.enib.fr-idp-shibboleth.xml
@@ -0,0 +1,54 @@
+<?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="2013-01-28T16:44: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>
+      <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="fr">ENIB - Ecole Nationale d'Ingénieurs de Brest</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDFzCCAf+gAwIBAgIUIH+7zKjLBFasnSwAkq7HW97UJBwwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwLmVuaWIuZnIwHhcNMTIxMjE0MTYyODAzWhcNMzIx
+MjE0MTYyODAzWjAWMRQwEgYDVQQDEwtpZHAuZW5pYi5mcjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAIfAnsjxqLmzoMkWf45AjMNfFXQSOVwc55I6P+JQ
+ACcdaXeUxlT/7MU8GnG1VORPU2Mj/UVUHw3tJ7qDEpcJcX+PW0egZwxGt/R0K+v2
+pcpqjtLT2yQLf+wdQUsU5gMY5s1jmzlqgmQhwkl/5wMNlvkX4rNSvPeWHQ9j0cvB
+goXgzD8ewIhzsXi6kiTU9tjI6xjvOIfSj8GHmmizEkqcR+mSliYQxjP6IxmdsC3Z
+nI2Z91h0IqAhOxsjbaRLPijYcfXPUxePLau7OVUHxI7yC4VsOq5FUy2GwkG0DG9S
+xXzlG4mJ+pZKE3wVIc/xbAJ1so5eC8iYTOQv2yIBbn7hGlsCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwLmVuaWIuZnKGImh0dHBzOi8vaWRwLmVuaWIuZnIvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFLjYoxphKa8kgdOgHBCQQLeS5987MA0GCSqGSIb3
+DQEBBQUAA4IBAQCHpO5p/7gsSJWbZkMq0DI+ryw8U4AGSGNGloV0HTkLjX0m1U/2
+V2N+K5TuSdbwkCYeHyGeTvd56L2Y3bGiLBWrjUiaaWr8g0PgMjlTuQ/WKRl2/DCq
+rxGJLLWkiCrieRzHbbYMGeFFaug8I1KdWhUfIxbvBaiFS9AbYWOlEpKKX1HwnXJ0
+3fjSkupZt66x5W3W+PVomTeRnd8RGTlF/rHwlgHRFaGtuRsJhn284vJDiRi1bJSl
+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://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>cri@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
new file mode 100644
index 00000000..e2697a98
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.enit.fr-idp-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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="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>
+					      MIIDGDCCAgCgAwIBAgIVAP4SLqi+2pminMR8C652zJZyirCyMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5lbml0LmZyMB4XDTExMDYyODEyNTYyMVoXDTMx
+MDYyODEyNTYyMVowFjEUMBIGA1UEAxMLaWRwLmVuaXQuZnIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCBzWn8nDXCVpi+0KdNV9lzB3Q9HfFrZcMiLZaj
+o6rzdI1VtYnTE0fgHOfQX0fwiSBhRFmwaTMVHDy6jRZQWkB8Zg7IxBdvQnEn7tUx
+gLW0/gZ6Pgw4V/ZRimpWUn0Ga/s7EBv7Nsyn7HZhRLse0t7d8dTgAD01TivVHx54
+SEOiZF5b+GFJJjeGJHpxTwj7Dto0Pr0vhmQ+4C3ppPigrrideIc9EaiiW+kAm/q1
+4tNlttLaOUp3u5l+5lDfUlfcPiHYGCgXdmkJ/Hg6iIoYl6A+QdqiSFuUO8z/Jk0G
+mdGixe/BrTC0fWjwOF4EG8b2TbYYjBVU3/BwA319eP4tqdvHAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5lbml0LmZyhiJodHRwczovL2lkcC5lbml0LmZyL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTidErzqd3TgXkbgGawiY3XHdywljANBgkqhkiG
+9w0BAQUFAAOCAQEAR2vDr33t9oTs96KycknrBoQk+I1nGpvaogo0qNbK1db0/NIW
+HjsiQgteVwvIm2BWsYjeaNiKI3VFAJ2jd0DVTIHASrq4Zuhv73VrEVfPPv/BcAot
+QyZM/38k0QU0zzr/XobhBP2pk5l7CMtYnmYKamQBvQrFq+JWe6mg6rXpLt5dai3q
+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://unknown.site.com</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
new file mode 100644
index 00000000..048b17ba
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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="fr">ENITA 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>
+					      MIIDHzCCAgegAwIBAgIUE3+YG/RODtnMAftUk+3SD6KCU4cwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLmVuaXRhYi5mcjAeFw0xMDA3MDYxNDQzMjZaFw0z
+MDA3MDYxNDQzMjZaMBgxFjAUBgNVBAMTDWlkcC5lbml0YWIuZnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmAH5cAW+LbvKpIc1p6okFSKDpURUGUZrz
+58lRZ+/3G6Ec1sP25XXIoQYFH6M+9/SY6dxEKG3KdcdCp5bU7P2x32zuiIFSbefk
+whaKouyaDgqyl04ow0Dt1MsbxQ3f6RKZN1dTJe1B1VBG5xPdvCRX/E3qlslvpl/q
+1zoI73C4buazgandQQbqhlvPJgQHNjD5wPevxhNRdysnywxO3Zo4lmM3vDNv6/R4
+iHUDhyOz0MaJoSyeLLAOAXlOQRqaNJoMC1EDgSD2M8763XvCjTyvs4Wz5/jp3CxP
+fwtDJ0gq9jPFrBj8v8Ls62Ps32p1LS9mEy9Q8wvc06ePY6XQSy+nAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5lbml0YWIuZnKGJGh0dHBzOi8vaWRwLmVuaXRhYi5m
+ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQULabgfYRKdPMaeTNuFAvY4XAW8p4w
+DQYJKoZIhvcNAQEFBQADggEBAJUlgO7TmUkBy+szO2JL3nc4ZdfPrGzBqkcfSQPq
+JlY3pZjMX9AJOuRUTXfwuc6A5sTZMu56lHoncJZr/crOHXj7NCMiV99V0M9DNk3s
+8iZ7Kdnziura1Btg3158+rNpgbgbtjOxq5tQbxDw41W4M+VOT76ttdJjq3QIiAvQ
+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">ENITA de Bordeaux</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENITA de Bordeaux</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</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>ppx@enitab.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
new file mode 100644
index 00000000..2829aa83
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ens.fr-idp-idp.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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="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>
+					      MIIDEzCCAfugAwIBAgIUUlGCB1tXdKMlojKQasf9KdmcqBkwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLmVucy5mcjAeFw0xMTA4MDMwOTIzMDdaFw0zMTA4
+MDMwOTIzMDdaMBUxEzARBgNVBAMTCmlkcC5lbnMuZnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC7h6xC+WGiUlpC70MJcuYS8Oc9FhxbVbg33IE1bM4R
+4bLY6ve5nNq4yE2EaTtYy1qskb3B55l6M1nSGKxl3Ey5ovh4cBE5r6fd2fjwlkgB
+5hqNxAbZhA9NPoval38EMYlepR6QtJny+faKWmCe9h4G9MRD+I8tP35z7Gq+3bPT
+ivLLgzBjGumdyj0ggNN/qvd1EisO3TPB+DHR9ygtRm6iNcV7om25k4QZVMHqNyKL
+8J/XDkBkyqqZPJv30xM5xfBP6dK6eRYOLXOCvdwuWNwqS5mtItc+b8S3Oj5K5AcR
+EuDXjgEMCRXo8eNxkjbJlGkgD0l2O0pXJhZFjr+ygsclAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5lbnMuZnKGIWh0dHBzOi8vaWRwLmVucy5mci9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUHX2nM2/snLOaYle+MS5sYYpqXWAwDQYJKoZIhvcNAQEF
+BQADggEBAE09V2ugOzVp7Ow5RQWnsKEgkdIqcNiXcjZTLqCTmbHmG3kGlRG6h0vx
+gy83fcPTkzdaI6ZwVWQF8b+T4Pl+0o1x9vk9CrGHMP0I2smHc1vp/Xqsk+d03tRx
+D2hRBVIDMR95A1pa4yFD2NrWQSLcpfzo3I1TyktpQsncW6LGr7DFi0WwiUAKXO2n
+1Vb9HK0GFd1U2HbFaF5Qc0Hu7rB0UCCmMBzu8brmlMsBgI9Y66zu19Rhmbyx/PdM
+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://unknown.site.com</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.ensai.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ensai.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..e5bfc3a0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ensai.fr-idp-shibboleth.xml
@@ -0,0 +1,54 @@
+<?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>
+      <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="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>
+					      MIIDGzCCAgOgAwIBAgIUBcH+nan7a+sFhj5CUOXlWAboLgAwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLmVuc2FpLmZyMB4XDTExMTExNjEwMDc0M1oXDTMx
+MTExNjEwMDc0M1owFzEVMBMGA1UEAxMMaWRwLmVuc2FpLmZyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjFY36uWwrcZiSD/8ZApHmMQ+SEkM+LD2bzJc
+6ydkDt2kbwWD7yj91jKyIcgiPa+npM8yPSUObi5teu1dY9v/xXb3tBfMbrHauNqD
+EDIcYlUBOmmv0hwDeMAPlguEGBf/Ebw8QQf6ndC//6jZh4Lsk/DUmLpko4rGMEd7
+vh7knLGbVRO+1ApqBUzL5qsdpI/xL/aevT02hlDDtjBvSmg7QRe/33T/8UPB63w1
+yef4g8Pe+u2y0SaP1LbHok4yuRDZtAF/lFjx4e8F561gTtvPYAsOWFnMyVo4FIvH
+TvE+wO8y8SSz9LqkU1Yohwez+FCXWoQuE9eYrJR3p53Q7gpcLwIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAuZW5zYWkuZnKGI2h0dHBzOi8vaWRwLmVuc2FpLmZyL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRK4qgy029V/NzztuGy/V9sjOs1+DANBgkq
+hkiG9w0BAQUFAAOCAQEADpOdVAvfnmUypEQYqmevrRFL+06paiEiMUUbS/+pRlvq
+JoaWPqvM2BASwe4WlL3sNgLBwRjybMMgTcGOAFlfLGmYG1JvDjJ5EXPV5CUnKMxs
+B4eJf9U+c24UGeDezM+BE4A3EarzD7k3X7KBO28w4LtNocZgxQ1bIwAnbjJxPL9K
+4+qYNbni8ry6QGE5U7x7VwmAC1IgPbxnSF3Xzao8COx/20E9jvhpdkpLBlgXAWxg
+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://unknown.site.com</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
new file mode 100644
index 00000000..89f3914c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ensait.fr-idp-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+      <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="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>
+					      MIIDOzCCAiOgAwIBAgIUQaof2K6agQCF8gpgtk0a0RLQaWQwDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5lbnNhaXQuZnIwHhcNMTIwNTMwMjEz
+NDI0WhcNMzIwNTMwMjEzNDI0WjAfMR0wGwYDVQQDExRzaGliYm9sZXRoLmVuc2Fp
+dC5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJbZ3w1hWqsxOWvC
+91NvUAw9j3ZoKxO/oOsMMEvUjqj4ByYVb9eBN62rCT14cjaadGwdKPjQlPZ9HDVs
+QIpjnQxazohlPsKYDzROQSuQEWzSWysl0fUtMTk2tTXn9fshyw2UFaheR/3gzHrw
+B4opDzZLPnaXvW2XfptE8QEt51+YWouoc7ZTGj6O35jWlijguScZmU54aN2KTLAe
+JLPVb/Sj6I70vpCEbTaIu7JKsl/ItbdG2AzCMP84a6Sy30Tb5ZYcJH9angf3KTkT
+QLi/03swqNUBoIk+ETYdrpjfXCv/pnzuyKEy+LDta70lJs7mfu/kngPaq98ntVmo
+XU4wE+0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmJvbGV0aC5lbnNhaXQuZnKG
+K2h0dHBzOi8vc2hpYmJvbGV0aC5lbnNhaXQuZnIvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFKYKdm8Oq9xVUEY0k/00dVCpDDdlMA0GCSqGSIb3DQEBBQUAA4IBAQBD
+vKvLHs7gAJOPgG3fy1lfsAtqH6lvv5oEVMFl4Ko0mTvpAq+MBCd4pGVaH8JRMfK4
+OL+CPSRU/HNZ2DaglwXpRsO8eOawWAXRlBDvC62NufoXSEOTEOWrHL/n4KlF7yB9
+1BsDcBcKr3t8WCw1qPOBteOryF16tNw875qjgZrn5AmfobaC/Nw722oIN+I8f3vO
+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://unknown.site.com</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
new file mode 100644
index 00000000..53c5a251
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ensma.fr-idp-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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="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>
+					      MIIDHDCCAgSgAwIBAgIVAONDoCnsNCIcCqPLaGuGULtVfBEkMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC5lbnNtYS5mcjAeFw0xMzA5MDMxNTMzNDlaFw0z
+MzA5MDMxNTMzNDlaMBcxFTATBgNVBAMTDGlkcC5lbnNtYS5mcjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANogeeITK3rs1Zr84TOyih09tiR3YRSUNJ9A
++Zy0IIcIk4qo8XA8j6IVUcjFcWJ6pg/Dted7Sc8O/FF9PGfPROPkWZiV6PVGtfYX
+fQR2x5w7ZrtBNIX5np+b5HlHgQQ8k4RfUmXbG6LolvBb5cHrgtHcdK7fHD2119J2
+sXN/JcF0ybdCJuRdvE05lPMVjMtgBd0Q6OovJBbJDQ6idEJj0j2yxf6jfqDEQaO1
+onzunPr65wMxBqYxhE1q8OC6uymLGwWfboKbPFwrxP5sa53UXHlMuvd7UPEG4mSQ
+VNZnwkGxIWU/RfuBi2mcRVKHP2CwhsPxQXJCFhc/nFELtsqm9/sCAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLmVuc21hLmZyhiNodHRwczovL2lkcC5lbnNtYS5mci9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUuIffU6QF5T/auaaGjizZ2SlOp8cwDQYJ
+KoZIhvcNAQEFBQADggEBAKmtZ8NR9PcNGoFqlyD2oWq6FtufoSD7zOs8eaPJfaOa
+ZA1m7QwZ0znQnO2eU7d4+2eMtuHRW2g7zYNyRglX1CrkJLAtnOMue/cvWHtj1I42
+j+8FkTeCD1YKFjuXJz28GAivPF77ddBADJny1s+KW5SgNcqi2mpQ+S2wVglyTsJZ
+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://unknown.site.com</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
new file mode 100644
index 00000000..ab88e436
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.enssib.fr-idp-shibboleth.xml
@@ -0,0 +1,92 @@
+<?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>
+      <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="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>
+					      MIIDIDCCAgigAwIBAgIVAJvmABrY/zRrXJu3cOVw4zlfFh6qMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcC5lbnNzaWIuZnIwHhcNMTIwMTMxMTYxOTAzWhcN
+MzIwMTMxMTYxOTAzWjAYMRYwFAYDVQQDEw1pZHAuZW5zc2liLmZyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA03FT48G8rTsowAqD+4Z9CQk8myTkYZje
++JH0a83a1iYEj4sBBftOlGJMOfbHS4bwidJO6Q1q0c7aQRD5xmNuqQYDudLlFhfg
+bZzaUTKX9CEbyazfvjf0aEUwxkH+ez1ULt5Z8NuECLAmHEUE5R4a3o2jYhpZSMcj
+heizmo+jXZc9rJXjGwe80u65xy+wI0ehV5POFCuML3lLxraBTTcm4sXm8JfpQZoE
+9HkM1gDyn+4+R9/W+Soc1382xwY5ZfgU49rQH9h21jB89LFDlno5H+gAewwLNVah
++I3SnEm+qhnhOLn4WN5ZiTQXKM3j4OkGffEJH9mHcLA1LyUsJVhYUQIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHAuZW5zc2liLmZyhiRodHRwczovL2lkcC5lbnNzaWIu
+ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLwMl3n3xOC7r6xGK55bcvAYcnF/
+MA0GCSqGSIb3DQEBBQUAA4IBAQBKk2ZMuISXcOrJOZbRxuxbbKTJn113O4otW7AA
+ldWxlFtUyJrzEoVCu1nEtzS+pVP6hg/7t3lB3iQ17tiLHle7LHfEihkyDwsNVFpk
+W4dlYmetZT4l6CM3DESk2ak0KWUjHbniPHp+NPtK7sAwtfBwoCsJwU9vYF0ysB1S
+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>
+					      MIIDIDCCAgigAwIBAgIVAJvmABrY/zRrXJu3cOVw4zlfFh6qMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcC5lbnNzaWIuZnIwHhcNMTIwMTMxMTYxOTAzWhcN
+MzIwMTMxMTYxOTAzWjAYMRYwFAYDVQQDEw1pZHAuZW5zc2liLmZyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA03FT48G8rTsowAqD+4Z9CQk8myTkYZje
++JH0a83a1iYEj4sBBftOlGJMOfbHS4bwidJO6Q1q0c7aQRD5xmNuqQYDudLlFhfg
+bZzaUTKX9CEbyazfvjf0aEUwxkH+ez1ULt5Z8NuECLAmHEUE5R4a3o2jYhpZSMcj
+heizmo+jXZc9rJXjGwe80u65xy+wI0ehV5POFCuML3lLxraBTTcm4sXm8JfpQZoE
+9HkM1gDyn+4+R9/W+Soc1382xwY5ZfgU49rQH9h21jB89LFDlno5H+gAewwLNVah
++I3SnEm+qhnhOLn4WN5ZiTQXKM3j4OkGffEJH9mHcLA1LyUsJVhYUQIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHAuZW5zc2liLmZyhiRodHRwczovL2lkcC5lbnNzaWIu
+ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLwMl3n3xOC7r6xGK55bcvAYcnF/
+MA0GCSqGSIb3DQEBBQUAA4IBAQBKk2ZMuISXcOrJOZbRxuxbbKTJn113O4otW7AA
+ldWxlFtUyJrzEoVCu1nEtzS+pVP6hg/7t3lB3iQ17tiLHle7LHfEihkyDwsNVFpk
+W4dlYmetZT4l6CM3DESk2ak0KWUjHbniPHp+NPtK7sAwtfBwoCsJwU9vYF0ysB1S
+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>
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
new file mode 100644
index 00000000..a1dea69f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ent.dauphine.fr-idp-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+      <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="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>
+					      MIIDODCCAiCgAwIBAgIVAL8Gc+NXLeRBFscDZy7qdwGaAlMdMA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMTE2lkcC5lbnQuZGF1cGhpbmUuZnIwHhcNMTEwMTI0MTgw
+ODU4WhcNMzEwMTI0MTgwODU4WjAeMRwwGgYDVQQDExNpZHAuZW50LmRhdXBoaW5l
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuglXJZxWOmFxzj1u
+NPB0ExGFjXusnDSm+P3D4tWBIrmxVj1z9DK3S9nVUf4jDkSzslwhunSs1GBU0URt
+MDhQEkKCt9O30Fd4lIGjuH1DoFC/l1KF5plmIbEKkDrr3BMo7BtC+5VHYFm65Jgo
+AY+ZrBFFNj/CxYDx+oZ9gywwxuP2CGT59t9tRH0Sol4IzPJbcqDKBHGBsKrOajN9
+UAjkDxGnx5PjiLVy1raywgE3qKSW9sFy4rukFs6B1TLt1xXSmIhPme9Q2PNmNLsf
+H31l0mO491gWP5F6dz6OXqtrubBWuqjtEZNLcHL3eduHeUybgXnkWF84BV0376l9
+uDEdtwIDAQABo20wazBKBgNVHREEQzBBghNpZHAuZW50LmRhdXBoaW5lLmZyhipo
+dHRwczovL2lkcC5lbnQuZGF1cGhpbmUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFPaZs/R1MZFlljBBXfrcl1Z4jCNBMA0GCSqGSIb3DQEBBQUAA4IBAQBW53Ob
+BRvf38GLJi2TfLH/7HSL7cGlR2aNH2Gin7rumq2TNugtDlqxokdn5lZkr/5+s+Zu
+51/n8bawgIyTQdaSHxd0l46o80xKtVfjiWBUm6e1O2sKJmuahbv+Y5sqMW1wr12u
+th+XQOM174MQMWNMrS7EERMUs9tiBY7qXQTbAPKs+rssU3gRz1APUrZ1MSbwZ3he
+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://unknown.site.com</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
new file mode 100644
index 00000000..d5336e02
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.net</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <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>
+					      MIIDHDCCAgSgAwIBAgIVAIcupykPhzWwN/P9ju7uKjH1/diEMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC5lbnRwZS5mcjAeFw0xMjA4MzAxMzQyMzRaFw0z
+MjA4MzAxMzQyMzRaMBcxFTATBgNVBAMTDGlkcC5lbnRwZS5mcjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAIBXq+m0dzCNCaWhUxNWKFezemlJDt+bxukb
+a8mtA3V2EXQnENCt8YQUC64SdA3TWwdx8IJ/YRIpTqbX8WssBaNXU2ugWbFkaJ2P
+2LUIAXTycbU+j2XzM1eonxfeqn8qcIEN4Saz65OiHtXBamjm4Uc3H5ICCLJJb+yB
+B96JQeScJU39kQEL26dVIJuaW5kjRNEQa2kZW9r2Ovf1mfiRcyXZBvYss4HTM0jV
+8Jo5xULb3fQXE7+s9dox218g/ITBtYnGBa38Og6dDTurbjuhyJNA/xWq0fbQp6K1
+OVLR64FG6gi/UHkG7SQlA40Jeb7dbi5ehocyfOjvPO5AH0UiUXcCAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLmVudHBlLmZyhiNodHRwczovL2lkcC5lbnRwZS5mci9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUX9y2zApvJ+zBx2GaVq+hWcrLdTowDQYJ
+KoZIhvcNAQEFBQADggEBAEq1KyPR75ZoWdwLXL/z/dn0SPYRAyhQQizq7Oy9kqTL
+V8VoisIXbe+J1kLrgNTz27n7ly1ulJWT/NZcdAL0xoX4tDpBZLs/eLIfhKHpcyhl
+3GzzFSiFOVjz1NlaVwElBfPf7A4SZqWHgVZkrmKVt0I5Ai6ZKrARayGdQi0cvC43
+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.net</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.fr</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
+hvcNAQEBBQADggEPADCCAQoCggEBAIBXq+m0dzCNCaWhUxNWKFezemlJDt+bxukb
+a8mtA3V2EXQnENCt8YQUC64SdA3TWwdx8IJ/YRIpTqbX8WssBaNXU2ugWbFkaJ2P
+2LUIAXTycbU+j2XzM1eonxfeqn8qcIEN4Saz65OiHtXBamjm4Uc3H5ICCLJJb+yB
+B96JQeScJU39kQEL26dVIJuaW5kjRNEQa2kZW9r2Ovf1mfiRcyXZBvYss4HTM0jV
+8Jo5xULb3fQXE7+s9dox218g/ITBtYnGBa38Og6dDTurbjuhyJNA/xWq0fbQp6K1
+OVLR64FG6gi/UHkG7SQlA40Jeb7dbi5ehocyfOjvPO5AH0UiUXcCAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLmVudHBlLmZyhiNodHRwczovL2lkcC5lbnRwZS5mci9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUX9y2zApvJ+zBx2GaVq+hWcrLdTowDQYJ
+KoZIhvcNAQEFBQADggEBAEq1KyPR75ZoWdwLXL/z/dn0SPYRAyhQQizq7Oy9kqTL
+V8VoisIXbe+J1kLrgNTz27n7ly1ulJWT/NZcdAL0xoX4tDpBZLs/eLIfhKHpcyhl
+3GzzFSiFOVjz1NlaVwElBfPf7A4SZqWHgVZkrmKVt0I5Ai6ZKrARayGdQi0cvC43
+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://unknown.site.com</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
new file mode 100644
index 00000000..5a088b45
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
@@ -0,0 +1,148 @@
+<?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="2014-12-02T16:36: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://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+b5x77r85PAQ6kalRPj8S40srMycsZ5EFhTvHj5vEEd8WbfZ/4XBO5PFZ/sE426mXacMnLIeRBYqspuFBsz3fkdeU/gXoNPzATSOhJxRs5VRvY1qE0vy0bgBzz/TmxeOFa1Gcfra+c1gbuS6a8aefnfUmVkpSInE4E3iDdc72WbezJcD8QzEVgai/cONYFIoHcm04fregSuvAACOxkMNBhg4FKgORdC4MhYvOfBPCDwiCJwmTJyGAnqk4XATKIJvI/XA+hgvp/AUbF4r1ATiCG8O5X+tolH4CJlZGMfORdKYF9f3XRVhxWMDI3F2oeewD2p4uNtI6dnkanKyB7VTKCesUegoFskWmtfmAkEDhgMisZKaOR1ykh/GnKxBF6t6hagoLHx/N2p4qN7w0wgEunp8cStNBIpy9808tVqJhATza+iNhlQsLEo9db+MBMI5dcVJdeqRe8B8dbCEUXAxRII2cq634XbZDPjhRWXIpXJGYEYPh+l0kebF0Qch48pEgZUM4ETVP0kFLQ3cdDocSzXwzjn+4Hl8cRgGnmleAmy3lCoDgLhdb+wfh8KMIzNCNh8IMwE4n3IO8nUjqS3e7WdRuJ9RosLIHDGOQiE6GS9PwoGRGPdsSbPKYHIl3KJL81kUhFP9KeReKdxgka+Xc0ENjX4g232GBTAC9cUJrccMToc4oiobsiwWGxOLjHCoF80NlxNJpiZ5xN4K1dLnWcjp6tq0yxLG8gI1a4hCpoVRBqUxeLzR+UIZ9HlslyWSyQJsa6fCFqRsAq+BMAuMRbi2LzE2hJ52i1id0yKxL4QR3zCMqwp2+HdbQ3eo4HYbaXxvnuXGyCNuYvn7QwGEZPFJtRYik1h/WiDXvyN/rFzM5T3xkPuwj5KxdvZ7sf7YR8R+SBSGmzgYg5J8NpCsXG0K69JUKcYbevJchz7816lLJsmNgUT9tOROt8vfDu4mJWI85jt3E4vpJ7YnZQi1fEG/l7uI2uJVH3bJrxfI4MHDeobPKrqQCw2GUrE+0oBBq0yqEtlnbjZGYTfzWsc+aN9+jpdnKzmEaRgGdmZ525NDhKwwdFUqq7TZ7F8HusgAw2uETuRzXb2Yq/ueoO2Yl/g+MX/Fu1FHpf5yjeL9RotILADO8bTna7qQMBaqUogBBuq+sU7RKc3IPA2sRsUFeIRouUl8fYM32AZCGxI/eFRE1nuCLxZqr6v6WZwp2QmsCl1xDXypLpoERs4gevjfWwtVbaYx1U+pZfImQIC3f4f3qxtUHWtxT7xErErjbPd6yn123kgBEN6nk9f//XaA2E4RtNGsa8JII5AONBCdV2ZQXuxQ7gDy+DtGFH4rOT0Q18jdjjBQ/D5BEgcz8Zd2SniHZ7OTQatxHoPnjLiE96aIQauExs36iglZtFIJ3hieKoD2AfiFGLKShoIUvHS/FmxwxmCsLFCvDACg7DeHcFz3A/xbBT7B4nLeYxRz2LWu71IhKnH+bucfbt7QS949zL2iXCCfA8hxe0ugdDnpGr4uCw+wXBH7IYTDBT7oGue7QIncNFsKwIn8Mo+52iTL4KJAl4YydYAgRhDCkO4RGx64VwTbo/hjeHiAuwVYt1+jGozUOzwdoKh44YLhunt4n3P0oR9jJWqszbCAYbScLFhQXgNJh6kM/VV227sU4v7DC7K+7v+YAuGbBuxQ9O1Q9/6I6fB6jeGKOJfDdU+wnulxaZj453Ni9kAscblcy6pxiTgdk0wa01hmzm+NvDa+ayD4IHoQK5/p8XLzbTg3lfxNwK4yx1X09i4aotcUc/4qMOmqou/S1WdC/bz2KeLpcj3dNaBSdFNLCCoB+3ZJV5u6nRC+oR4eYoDBGw8/U68YKNSThMIeV28CWOMagOPmCyeR6HuIWWQn0D04U+6p4hHIGQNj9i1maAMh2C06AA+nDpMy9CfIxBe9b7SaRLrXIoylragL6Q5XWgrUryXxU6eFWwLPTFRnUq2XY51Lg9MULFMHthd7NOEkWkqBi9yTzSTB/qXjlPEIxDDZRF/r87Q1u+BeFeMuO1IXypezJrJIx5uK94XaRlWEggNc1lfziNSGXwR4QjEw0F2sl68dAspz2kPRKLpZhe47iZehE6wDY8n0o0G1mebVwxGqjYu3VlGclzuh8wfq4MtYtMA3LcF+4TXN1Qk4APMybwXYibCApZlO8WGhDaq7Uj2hXsMoTGOSJACgqfzOI51Lt8rI2kupsIW5HWLxQsTC0hgO/E+L0E8fJe/sXzEgx0d+L8JhB2BKxB2BK5A2BG4AmFH4AqEHYErEHYErkDYEbgCYUfgCoQdgSsQdgSuQNjxLwAAAP//AwBkyVWrN8BywQAAAABJRU5ErkJggg==</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>
+MIIDDDCCAfSgAwIBAgIJAPOb5N7pnCviMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC2lkcC5lcGZsLmNoMB4XDTEzMDQxODA5MTM0MFoXDTE2MDQxNzA5MTM0MFow
+FjEUMBIGA1UEAxMLaWRwLmVwZmwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDIBrHGK9eROQuDVC8YG/Q1Cv31Fvc8JdezQOgqqkASU6PvymRDEmLQ
+3Y9hNPB6YgkcF5UJzGTPMvoLMnIkqAiT+J11bMpHXrimLz+v6xwFxQb8at8qKbz7
+3LpyUdwGe9fZDoVgyXHCl/fKxTdeUI/yskSD3w1SQIasIKnb5Qr/lDQ+yCqq2iYK
+wNe5PnPd/XVxjfD09FmkXfYRLQVA5h4XH+q1HlhdpchB/DB9qxZcxalwaTQw70mG
+HLOsl+4Flehsi18gCjMyaX/EO6rYzDMbXm1GvhkobZ1YcRzJRvb8J//TjJgxue3K
+VRAyULjs517E1jJHnRBvEBg9yxZLd/9TAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
+cC5lcGZsLmNohiJodHRwczovL2lkcC5lcGZsLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBQ/WGIfS2XSjumGqpYplSwMU52FhTANBgkqhkiG9w0BAQUFAAOCAQEA
+mejhQf4W7YHubVMVqZ7N7Zq6mGRY9TJSp0w88Ehvv0LfLKfyvwbqrrbbTYP9ERr+
+ufnrYUTclvVlSlutkLuGrJ1YkIjhEc6qqPLdtUAHE3cJpAYZMK4zGCmbg64eQBTt
+/UiBgOx6UgoS1m7ix6F7qS37iqGYngwanb0HoNRjYAP2cqAxVdmS8sLGERWRWzn9
+jV9Dj9Wwx4s9vL5rS6OxV8OXi42yQ+dfBR+eih6ebNEs+SbbWhLi83/U60WFwa1P
+btvDbgeRSa7SgaA72pCtk5Blb9fArSq5yBXqARTtXFMaH8hZOd3iu9h4Mnsl8879
+EyP/QDjoD02nYu++815n4g==
+						</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>
+MIIDDDCCAfSgAwIBAgIJAPOb5N7pnCviMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC2lkcC5lcGZsLmNoMB4XDTEzMDQxODA5MTM0MFoXDTE2MDQxNzA5MTM0MFow
+FjEUMBIGA1UEAxMLaWRwLmVwZmwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDIBrHGK9eROQuDVC8YG/Q1Cv31Fvc8JdezQOgqqkASU6PvymRDEmLQ
+3Y9hNPB6YgkcF5UJzGTPMvoLMnIkqAiT+J11bMpHXrimLz+v6xwFxQb8at8qKbz7
+3LpyUdwGe9fZDoVgyXHCl/fKxTdeUI/yskSD3w1SQIasIKnb5Qr/lDQ+yCqq2iYK
+wNe5PnPd/XVxjfD09FmkXfYRLQVA5h4XH+q1HlhdpchB/DB9qxZcxalwaTQw70mG
+HLOsl+4Flehsi18gCjMyaX/EO6rYzDMbXm1GvhkobZ1YcRzJRvb8J//TjJgxue3K
+VRAyULjs517E1jJHnRBvEBg9yxZLd/9TAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
+cC5lcGZsLmNohiJodHRwczovL2lkcC5lcGZsLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBQ/WGIfS2XSjumGqpYplSwMU52FhTANBgkqhkiG9w0BAQUFAAOCAQEA
+mejhQf4W7YHubVMVqZ7N7Zq6mGRY9TJSp0w88Ehvv0LfLKfyvwbqrrbbTYP9ERr+
+ufnrYUTclvVlSlutkLuGrJ1YkIjhEc6qqPLdtUAHE3cJpAYZMK4zGCmbg64eQBTt
+/UiBgOx6UgoS1m7ix6F7qS37iqGYngwanb0HoNRjYAP2cqAxVdmS8sLGERWRWzn9
+jV9Dj9Wwx4s9vL5rS6OxV8OXi42yQ+dfBR+eih6ebNEs+SbbWhLi83/U60WFwa1P
+btvDbgeRSa7SgaA72pCtk5Blb9fArSq5yBXqARTtXFMaH8hZOd3iu9h4Mnsl8879
+EyP/QDjoD02nYu++815n4g==
+						</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>
diff --git a/swamid-interfederations-2.0/idp.escelje.si-idp-20140916.xml b/swamid-interfederations-2.0/idp.escelje.si-idp-20140916.xml
new file mode 100644
index 00000000..1c98172b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.escelje.si-idp-20140916.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.escelje.si/idp/20140916">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-02-13T13:02: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>
+      <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">idp.escelje.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">School of economics Celje</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">Ekonomska šola Celje</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for school of economics Celje</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet ekonomske šole Celje</mdui:Description>
+        <mdui:Keywords xml:lang="en">identity provider school economics idp</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">ponudnik identit ekonomska šola Celje idp</mdui:Keywords>
+        <mdui:Logo height="180" width="180">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALQAAAC0CAIAAACyr5FlAAAKQWlDQ1BJQ0MgUHJvZmlsZQAASA2dlndUU9kWh8+9N73QEiIgJfQaegkg0jtIFQRRiUmAUAKGhCZ2RAVGFBEpVmRUwAFHhyJjRRQLg4Ji1wnyEFDGwVFEReXdjGsJ7601896a/cdZ39nnt9fZZ+9917oAUPyCBMJ0WAGANKFYFO7rwVwSE8vE9wIYEAEOWAHA4WZmBEf4RALU/L09mZmoSMaz9u4ugGS72yy/UCZz1v9/kSI3QyQGAApF1TY8fiYX5QKUU7PFGTL/BMr0lSkyhjEyFqEJoqwi48SvbPan5iu7yZiXJuShGlnOGbw0noy7UN6aJeGjjAShXJgl4GejfAdlvVRJmgDl9yjT0/icTAAwFJlfzOcmoWyJMkUUGe6J8gIACJTEObxyDov5OWieAHimZ+SKBIlJYqYR15hp5ejIZvrxs1P5YjErlMNN4Yh4TM/0tAyOMBeAr2+WRQElWW2ZaJHtrRzt7VnW5mj5v9nfHn5T/T3IevtV8Sbsz55BjJ5Z32zsrC+9FgD2JFqbHbO+lVUAtG0GQOXhrE/vIADyBQC03pzzHoZsXpLE4gwnC4vs7GxzAZ9rLivoN/ufgm/Kv4Y595nL7vtWO6YXP4EjSRUzZUXlpqemS0TMzAwOl89k/fcQ/+PAOWnNycMsnJ/AF/GF6FVR6JQJhIlou4U8gViQLmQKhH/V4X8YNicHGX6daxRodV8AfYU5ULhJB8hvPQBDIwMkbj96An3rWxAxCsi+vGitka9zjzJ6/uf6Hwtcim7hTEEiU+b2DI9kciWiLBmj34RswQISkAd0oAo0gS4wAixgDRyAM3AD3iAAhIBIEAOWAy5IAmlABLJBPtgACkEx2AF2g2pwANSBetAEToI2cAZcBFfADXALDIBHQAqGwUswAd6BaQiC8BAVokGqkBakD5lC1hAbWgh5Q0FQOBQDxUOJkBCSQPnQJqgYKoOqoUNQPfQjdBq6CF2D+qAH0CA0Bv0BfYQRmALTYQ3YALaA2bA7HAhHwsvgRHgVnAcXwNvhSrgWPg63whfhG/AALIVfwpMIQMgIA9FGWAgb8URCkFgkAREha5EipAKpRZqQDqQbuY1IkXHkAwaHoWGYGBbGGeOHWYzhYlZh1mJKMNWYY5hWTBfmNmYQM4H5gqVi1bGmWCesP3YJNhGbjS3EVmCPYFuwl7ED2GHsOxwOx8AZ4hxwfrgYXDJuNa4Etw/XjLuA68MN4SbxeLwq3hTvgg/Bc/BifCG+Cn8cfx7fjx/GvyeQCVoEa4IPIZYgJGwkVBAaCOcI/YQRwjRRgahPdCKGEHnEXGIpsY7YQbxJHCZOkxRJhiQXUiQpmbSBVElqIl0mPSa9IZPJOmRHchhZQF5PriSfIF8lD5I/UJQoJhRPShxFQtlOOUq5QHlAeUOlUg2obtRYqpi6nVpPvUR9Sn0vR5Mzl/OX48mtk6uRa5Xrl3slT5TXl3eXXy6fJ18hf0r+pvy4AlHBQMFTgaOwVqFG4bTCPYVJRZqilWKIYppiiWKD4jXFUSW8koGStxJPqUDpsNIlpSEaQtOledK4tE20Otpl2jAdRzek+9OT6cX0H+i99AllJWVb5SjlHOUa5bPKUgbCMGD4M1IZpYyTjLuMj/M05rnP48/bNq9pXv+8KZX5Km4qfJUilWaVAZWPqkxVb9UU1Z2qbapP1DBqJmphatlq+9Uuq43Pp893ns+dXzT/5PyH6rC6iXq4+mr1w+o96pMamhq+GhkaVRqXNMY1GZpumsma5ZrnNMe0aFoLtQRa5VrntV4wlZnuzFRmJbOLOaGtru2nLdE+pN2rPa1jqLNYZ6NOs84TXZIuWzdBt1y3U3dCT0svWC9fr1HvoT5Rn62fpL9Hv1t/ysDQINpgi0GbwaihiqG/YZ5ho+FjI6qRq9Eqo1qjO8Y4Y7ZxivE+41smsImdSZJJjclNU9jU3lRgus+0zwxr5mgmNKs1u8eisNxZWaxG1qA5wzzIfKN5m/krCz2LWIudFt0WXyztLFMt6ywfWSlZBVhttOqw+sPaxJprXWN9x4Zq42Ozzqbd5rWtqS3fdr/tfTuaXbDdFrtOu8/2DvYi+yb7MQc9h3iHvQ732HR2KLuEfdUR6+jhuM7xjOMHJ3snsdNJp9+dWc4pzg3OowsMF/AX1C0YctFx4bgccpEuZC6MX3hwodRV25XjWuv6zE3Xjed2xG3E3dg92f24+ysPSw+RR4vHlKeT5xrPC16Il69XkVevt5L3Yu9q76c+Oj6JPo0+E752vqt9L/hh/QL9dvrd89fw5/rX+08EOASsCegKpARGBFYHPgsyCRIFdQTDwQHBu4IfL9JfJFzUFgJC/EN2hTwJNQxdFfpzGC4sNKwm7Hm4VXh+eHcELWJFREPEu0iPyNLIR4uNFksWd0bJR8VF1UdNRXtFl0VLl1gsWbPkRoxajCCmPRYfGxV7JHZyqffS3UuH4+ziCuPuLjNclrPs2nK15anLz66QX8FZcSoeGx8d3xD/iRPCqeVMrvRfuXflBNeTu4f7kufGK+eN8V34ZfyRBJeEsoTRRJfEXYljSa5JFUnjAk9BteB1sl/ygeSplJCUoykzqdGpzWmEtPi000IlYYqwK10zPSe9L8M0ozBDuspp1e5VE6JA0ZFMKHNZZruYjv5M9UiMJJslg1kLs2qy3mdHZZ/KUcwR5vTkmuRuyx3J88n7fjVmNXd1Z752/ob8wTXuaw6thdauXNu5Tnddwbrh9b7rj20gbUjZ8MtGy41lG99uit7UUaBRsL5gaLPv5sZCuUJR4b0tzlsObMVsFWzt3WazrWrblyJe0fViy+KK4k8l3JLr31l9V/ndzPaE7b2l9qX7d+B2CHfc3em681iZYlle2dCu4F2t5czyovK3u1fsvlZhW3FgD2mPZI+0MqiyvUqvakfVp+qk6oEaj5rmvep7t+2d2sfb17/fbX/TAY0DxQc+HhQcvH/I91BrrUFtxWHc4azDz+ui6rq/Z39ff0TtSPGRz0eFR6XHwo911TvU1zeoN5Q2wo2SxrHjccdv/eD1Q3sTq+lQM6O5+AQ4ITnx4sf4H++eDDzZeYp9qukn/Z/2ttBailqh1tzWibakNml7THvf6YDTnR3OHS0/m/989Iz2mZqzymdLz5HOFZybOZ93fvJCxoXxi4kXhzpXdD66tOTSna6wrt7LgZevXvG5cqnbvfv8VZerZ645XTt9nX297Yb9jdYeu56WX+x+aem172296XCz/ZbjrY6+BX3n+l37L972un3ljv+dGwOLBvruLr57/17cPel93v3RB6kPXj/Mejj9aP1j7OOiJwpPKp6qP6391fjXZqm99Oyg12DPs4hnj4a4Qy//lfmvT8MFz6nPK0a0RupHrUfPjPmM3Xqx9MXwy4yX0+OFvyn+tveV0auffnf7vWdiycTwa9HrmT9K3qi+OfrW9m3nZOjk03dp76anit6rvj/2gf2h+2P0x5Hp7E/4T5WfjT93fAn88ngmbWbm3/eE8/syOll+AAAACXBIWXMAAAsTAAALEwEAmpwYAAA5YUlEQVR4Ae196ZMc53nf+779vn3OubO7wGJxEABvUuIlkqIk0qIl64itctmWXZbilF1OJZWqVKqUT0lV/gZXyp/9IRW7Uo4TuWQ7sq0okilCBw+TEkRQJAiAuLH3zj19H/k9b88CS4pwBCdVUc9uY9Ez09MzPd3Pr5/74E/8y4LtL/tX4IOugPigjfvb9q8AXYF9cOzj4LZXYB8ct700+2/sg2MfA7e9AvvguO2l2X9jHxz7GLjtFdgHx20vzf4b++DYx8Btr8A+OG57afbf2AfHPgZuewX2wXHbS7P/xj449jFw2yuwD47bXpr9N/bBsY+B214Bedt3KvJGrn8nMM53Ug9EwcqNxXuRP92B481cFDk+wLHWS8HxIPSmXZ8pBDYbucBuhUjwqQK70H8La7ZzOPoC7EdfS0sxQ7HMaoMDBNF0LWmSg26gMdY5J/LlQAmRLSU0MC6F5HhiZFE4ypPQMhnL4iyPTdOUpjUJU8ZVxsysYIX+Up5zmYl8nDY8M2HdwohznmdcufYRf4LDaHzQ9+MfDpxgDWRkzJr+JI2VSq+qDQ59p5bXH+QBAnCX00swj4xuctpEL+kpKzIwgSDyrwg2euzhe3ge9DbWlSlGo0GYZKZlptzMhQQk8BF8D/5UztM4daUhnbHZEAb2YXXLzl9+5WJn7j46lAYH4xFngCBeSc1CdrEfbK3sUnlwgDpYOEQA0YpYR8GJgxDzwB+9R7c4+IHIc8kGx5eG951Qv//POiZno97hw0ts7LM8Z4bFMnwX8MSZgUe9xncCZ3HKUkXf5jM29On7/uA/WleuXsyKRsGk5hPEM1hhaBDikDOyVB4coIOGxZQehVYpgA+gIQdlCTvAihBFVpCeEabhtQfvfmjOYTxjbtN3mbKcyOA8zGJ8SqsZwBBInUIvAUKEsEfCT/JRYnCVmo6YMyynv3VesgOMqZRbjJmAFlCCl4zWM8I2cOGqDQ7QQd+zdH9rtkE6JdhGISBVRM6hBhA6CqgRRLOM82x+sfPRjz6EjXHMarbb62+zLHEcx7QdSBKSQ0VmQOmgJ5BM2JHVcpEpOzOkEo5jOZOQebwdZrW8qHNuQQsBMjI6DO2MY84MOqoNDhBjNyVy8BCegrA5eAA3iHMUBnADqkEhNSSTRjHfaTRdFsRM8pzYAharLjSnAVnBLIi4RUaAyhP6ZJxwaKw5GIlVxDyK2auvxZurXeEuAAkkR7QU28GGZmOlqCOoVHupPDhw+XfECvEGIANsI4PRQAwD3N4gbQP7GIU0EksmTz7xAL0Hs4OluOPTIskKEaaxUg7YDjOgUQjgiiAC5pGLJAiVtBPwDW57tmXY7Mq11VZnbhjiaxI6NqwhfAgypZA7v6TamLj56ysPDi0JQFWQB3+0wMLAuhCS6fufNA6yIlIlQssInv1ITSZp0zagnMR+r+Ha2JlzEeYRaZf0nBs8EyyT0EAgiTybmeZ4Usg8CxnDTucuXYlzB+DKgUV9TMEBSXwNTOWdH4FX1V8qDw4GBkA6hQntA74toIJoBl3AUr1eYEsFghlgAckwzTc+/KGDTsKczE99X5qGtBSLwzSFWulIaJfQVCCPSHkgwwNrLkRii7WtNadhh1GsHHccse0gTkQDe2bAJKEhh40MpPDSesYV3RcrPw83RqlAgprg56RO0o2s72Ve9Ac9pZqOYgmpHpFnpQYbPAOZEhZcpsp1WJqyUcikKa1OzlWQsJgzcAyyhkn7ID5Auq3BZMORJoO2ATv2yjUWJPNR3o7zWgFXKWEJpi+sIVmUbIQw9fNwbf4f/Ibqcw4S+aAQXNpwVcqcpQQGeDc5dx0HWkGRMMMIgYym5588ySR2hM4KghZGwmvSsla32A9OX//q109FrElshb6KLgtEBedJkg65SAzb6A4mXvNoEHjdrteeO5alBB0oGwZ5VXBIqLGkv9KLWVmqDg7QAhoGblWtCxKF4MGipVFvwpMRjZmRpp4DR8TwiccO1zwmVBoUiYLxKVRuWfBprI3Zi69c7KfzEZtL8npWeDnAAVOGNNmoyLZdN4eXDF+kzCNb3dSrL4GLEMfQDCZjGYAGmHBoObO1VP18yLFBSkK50CPOCFZqgls58KM8MT1T2EYsi/HnPvURS+UT1hMWpAePFAuC1OJykLIBy0NhhQwedCfNbQarlQmE3IxCWKqRF1EcRkVhceEYMoay0u1mtZqRGzCCJlzAaQqPCBwsDj4In9jMIKTq4AAhIFamQp6EPTEPPIgwCIrMdE2ueBGOtpcP8GMH4AjfNCVsF/g08RmplBwM2buXzl+++LZqnjBZAP5gFDFsYIRs4ScxWNJ0eJbEcTiCitLrrgrRNBXz6oANOTggccgtD3cqWTowbvHFYDJTu6nqKKk+OEAMXsoUTQtYGEQikWfMVrZMWRL4PJ88+fgDsDazcFyrHSlikaeFbai6oqhKnSX3HfLWRtcTsWlzC1THFwgWGwU8qsbG6rhWn5vvtAvhbXa3XEum2ch161EEmxkQAvbAuKwsk0XmApocYm2K1apjo+Lu85JVwNM1JQexDKigpBsipC5MGKqZSPvzzegzv7RossK1moWfIUJPqkpEROy47HMfe/D5Zx6EmgHXBeQN3fZQbckXRuJqkpBSM/LZ6TPsz//qlbGfDEb91lydVFHsB50Fu9FikrWCn1J5SNw6gapzDsGVnQSsiJlSTJlRysbkGS+U03A3V9aW5w5kYtTo9KCTupAkeU3IIk39Ao4tW5877JOCTJTphSitWVAYrw0G89fEmrM4Yi99/5V4Yhii6dqtNCRg4b8ooJnQ80zAE6YF2o7+c+saV/ZZxcEBVzkcDLh1iVa46SNW4A8nJf1J6NUcLiaMd5977kHXJWd3jtCqFRkOT/N0EkGLVJZC5EQboORUB70zoW1jcIGUS4iVOIosyz5zZms0RNZHE941fIo4U7k7jokUIBy9RIb+pvIt/X61VxUHBxRQ2Aygo5YF5CqF3wGZfPCSJkWzWY/DFSmCZ589jmh6msECyfxsYisrR9TFZXGB5C74urI0CV0FekOAQM/gCQdARMpkwqyEeZApP3jpTH+YpDmcXWAXhIb3IYAOih9TYrTakLj166sODpGlpDZy5NwgpEosHXwAiT/QIAxsG/nrJ5dlp0Zkh+qohBhOogSGrmkVEu8bMUPAJBcqCVmKz5DWgLRR/SVa+3AMk718qnvhynaczXPlUMyXkkrpTe1NJVsawoUShbCAo+ALZgUiVQcHzA1KDRUyhj2pXZRQTuHCAo/gaRiYcvKRJ44hWmaC9kqyRHQah0C8BIYpkzHjQRZyAW9HHduMMvsDgX3kBxaIuylgAGkfL7z4VpTWuZoTvBFGwpBGmsHXBggQs9CgwOp9rGRnc5UfKw4OJF0gNceEcIgLpF/kwAl0AqR9Ia2HZUGwfNj62DPH8yRXJu5tKKR5NogyJIVZNhJDDQRFmAd/e4wASklnkJtSxog34ClU0bffYRcujg13gRstxl0wG8CBEgMQidWI0KZslSFw+99ecXDg5iVFEmYl0jaiPFMGmbXI6SHHKUKux5acI0vwecWQF2kWK0OmaW61mviEn7ABskdNBosXyaGUm4GvQqQV7gsd5RfgJAb7uxfXpbvsx0rAmQEmJcFU4BjFXtBbAI/pQp6WWZEmO+e0Y8HdfF25J9BBYUNCNBRI3yKJT8jIi8w2DEdGc02SMQrvAhwpjBPHqDWhkLxzKf7aN1986UfnQ25JsxUiQUOZxA6ALy6UMMjShRkjW2evx0vHH107dxkRWHi8hJQZIvSQITflSeUu2c/8gyvPOSAagA+dw0ECIQME4LYsMkdlNSv63S89otgIpSq42R27NvSj2LBga7x6dXDqnT5rP7LZQybIgllvwhLZ3lhfaLeR6ZPEgREX0ShqtRethrm2ETZahzMuk5zHcWwYhikNiCq6yO+zT2aLeVQeHHQTQxpAjyBvh0BaKHyWJtwTo7X7TyL/CwIkgP1J+gUYi2n2xhQCee3suUmueOZxVUtYe3M9dUw3zA+MYzdNEEszLCnGaT8e5qaw0kyhYglfwQ2IGiwUpMVhwaZgqdAGYIK8+PS8VERoY/WXWQAH2AZSiknzgIBBEihMCR7atdEnnvlww4KdYkHQSJSywbARvN4kNXPQvaGKwp90jcJwrYUUGRtZ7Dm2xXM/DW2Hm5KFIimygBtzSAYEHPBZ5JGi4gnabgF0lLAgkBAL0SpqCQxtDlcfGTiDioNDs/EcYTQ4HyS4hoDamcFsEZN2O3r8EfJXmHCLId2PGVGSSiv3YJ0y8fDJhpF317c2h6OhkQ+anBLCbNPKU1+JMdwh+B5PjA1zUdnLSW7A/4WwnQ65kBTDosuoqJJKCxbAghwelKNIx5yRpeLgAE1Q5ahJYggFGGRwcaXI/Rq320GrxaIwMJDWg/sdURGSOJA/KwiX/OvffnqtF7baS9Ac8hTxW5ZExARi4ErSnw+zRVFs5d/++24cu0kWwwoGAMg3KpDnQalApU5KPjCyaqnWBdxr6iCbCXhUHhzaSAHJLMFRAw0nKZXDwz/+4UeXEVkrktSAXxQxNAqZ4iaH6coGva25tu2JSY0BEaofDYtYNi0TiiisX9tykf4FrRNFLZe3wQ4QZCsgU6BVEJtAnA2+Ds2xwClIqOjnGgw7NQozgQycROXBoYvo4ZFCMMzIc+TpZKapGnXz6adPIidDoLQefgxCBU4WJUmohV62rOYoFKhuRH0LHCMN17KRnw5pYyQIvwiB2vvCFnbM2OuvX/SDNE0CfB66LsBB2g2SNrB7acpiXYKDFNKyQo74x2zAo/KnQSookyKX8JcbWWpSornf9rKDHVRIb6bJKMsmRR4wnsD8BAMZDyPPQcxdtBtzaZBHfqpyAAtBN0iU1BAhZ0giC0Hh7TH73g8uTSZFHOXIDYNKKwuFcif4v0q1AwgA2yDgaeyRH2y2lmpzDpCQCysJY5OLoN9faEohgrx35dnPP2VlTNkNG0olMkRxK6McjVkwaGtID03GLWSAJmlNWQViLPCPQoe1UEXfL4yAewtZ5gQF+8Gr7Oy7nrQPSlEjPoFIDNW1Ib5LjlRgAn9Y0BVEaxvgJRTkmRm2gVOrNjhALhgROfelMsy6UXMpuXxxqfHEEy50UI74GeIjOiEdgXh4QUA8ONGxjYQDucpdqBaSuKcq/Ii7ZpKPOYus+uLZK+zHZzeE6sD3NZUghARayCgpYYG19qrqzVBF8UVUqK9fzsKq2uAoeNyY59lwnBR+Ho82J7HKtg4u17xFNkSTHpGht4KOtlBqV5EpUA5WKqIwGYd6EaG6EU52BWMFMdmc1516UqBwAeE448ylN39y8V27fXziB3mOnPJbC1SPXUpouf2mb2N2kIETqzY4cAK90Ril0AbkiQUfVr1h1+sLzUHIUOmYFJ4hPH17a/1Rq4yOsgteR7a4bvJF25G+gWQyaS6CzUySuXWEbSV7463RjY3IqZOFoxuC3QIHRfp0Hw+tY2iXKeL7t96fnWe80jPe4JYKWKYc1BOweBSTHhH0imjz8JJd5FsGDwQPiXfkVpGbyA7nOXI6wPqTTI4zI0JkFZ7PAuWwqazZcI+xVqteGIbXOvD2xfVJ4ii3FSTQSsoF4MFSrsGAgAcwDOi4+MqbnEPvooWOflbtVeU5RxxRpRmKE7PcdCyzXfeK5FCIGkbmCYHCNNASGVtOCQ7QEkoHMoMKgMaIkZlOAdYCbX7gXLdDPxrnNuzRcCX347ayGv1eZLkoVgCz0JggNxct5D/XCEAOGL3WPKR8c4ZUjuqLlSY6rxjMD5GyFY8SgbQdC/nlSWGaqD8jy4IKWXInz8FL4PAoLBlzA5hA3TO8q7BMUQJNkfgI6ki9Nspy5HxEcWDXnDxLHRsqrXagEThglZQogXwiSEC4kNOD3kJaKRkqP6WL6N0qu6o25wCNgsnIdGzXNjpNE47wKIgROYUKgv4KqJ0nIwV1spmujYZ1AucmskcRTy3QPTLN0DwBbMAwuaEiP2k17MkgqKE1g+0qQwxGw9Zcw6fiJZIgUD44gjjAB7lKyWYhnkSeL+oIVi6kqxIcKwuH9/7waoMDrivXBmWGoFMcUhgMiVrYSIEzKrAnho9tOUffBQXZAV8WFA3c7ShVobc0LXU7D65MBRwYphNEuUQTsIy1vEYaMPjewQ+QchoRu0EdA9qM5iiPlFL38SmlCCEEQNHLrCADJ1NtcOAEwNkRqaf7mrCAFSiOLSAaMEEbcHPrNTZDtUTYxYVXNPTBNZC0Az7CiMpkylI4F62/qKsPYrApvoJLKbaGiP7blsMsm1QPalKIfXTHBzoeHUozEvKbljxjByX6qJVeVRscPEeOOBLHceOWi7ZWdYSNXpcqIjxfpBxMd9jubqKGtuY1UGeSxqikTePAL1RiWALBNmXVTYiiGFX38JfFQMH8nO3HSTDOlGVKBxEZYiRUllBiTgOSDgTNd3qI/ZB9eal/HtYU7dq5WSExqGaANlF7FlBrekPrhlDI4OKs2WyS8ztGCBb6Q+IYgEUsbDYY9023gZzhCFHYmINNKIWM5dhxamhSGlFILmOpmVLxEodfFQyqBIYWKIROra7il+wSMT8P1+f/4jdUm3NokmgaEZMgCsF1UYp/rYrqC0P4AEGxG1xfoCj6xaVGErum0XAhUuJJ1BsMhp7bMpVChD/2Y2T6ODXUPaVFOtraumg7TrPZBiBGEZQNoMIS0oN8mXIKOn6JCX24GVpVGxykaVCmBdWhTXUOwgdualALWqkmFD2HtkGOTSywQZDxVfMMVYwjfzPMe1yFrYaKCz+GmyNzLAs9PeA3QUP0dcF6R486QTgeTwYh6h5Ux3XbSSaCENEct/x6/a04BC0kvHZtLTdWd11tcOC6U9MEYulTHUC/wCY6L+IkeoFySg5v0k3ydqeD0BqLh3G47pm9Q0vqnvtOHDpy9NRL18+eH3V7rO4tWnaSxN1aa3z8WOujjz+4tTU++861Cxc3g6QnpYvsY/T52fnum4846E9vvPluJZ9U232OSw6+QDSZuqdKGpBXm4yWHWJp/OCuhnMUXg+RIGRvxo/eN/cLz6gPPcDQVi6M2Gaf/fevrr3yUtdx5r16YVnbT35s/gu/vAiOg/qVayvsW9+ZvPLqheHEVPYSqt989H3YoXiZkm4UqeYcJiF1JpbKcw6gQhMDBNIa6JRfEJk0JjSVSOgQLeHtDoOiXWvno+3BeveZxw5gwgq6/9QNdvggCz5irr92NUu37j908Pf/1YMGPCPozKHY2iY7cyZ/5+z54XBimAcQrPHhkeXU3Xa64Ku1o2zn9Yw8Vhwc+uad6hZTipSQ0CJFY0KLF2zEFnoLUZFwEtpMjPrDMz868PHHyQpB7ziUIjz1sHHuSWcw5F/5yr1IA2vX2TBlEDQvvND97vdPjyaiVltKeS2Kcti85FvVS8mfdpnT0+0z8FBxcPzDFCBVVOsieEKqItapMKIgnaC1V2/YP3Xqh/effHyhiUbo3Y3t80udu770e48y0URMpj/atJsLozH7y79894dvbm2sZ/X2AaU6yBoMosK2tSQpjz4VIgDLDl7+4V9VnXcrDg4i+Qde7Jv8YyeYroECYSMpMxANOYx4It8513v99e5nP4X2o7zTWeiFazUPgfu0O2HLRxdOffcdwOKFl4bKPr5w8AhidmAeKdAlbVg+JMtImpQ/QCOD3LK3bOkP/FnV2lhexGr95vf+WpDn5t9739nROnCON/9AVATfjLRAeO1AFB0+dWodHTiK/JDBjnAxD8f6+atXap48+w77+tcvnjq1JdXd0jwWx62tPp8EQtlNy7FQ44RDabzh6NotS9Jln3O8nwAVe41+1UqqMElcs4Z043MX3l7bZgcPsM1B0mkuIS3krqONF3/gf/3rb1284lrOA7FxcOija3ahTCScMtTjozqBkEEaqHaZU8oIbSH3CjESLcIqdlU++OdWXKx84Em9T9CAYDcXcn6jk4KKognCqiFqJHn+1mW/Oe9a9c44m4zjSZrV/upvX1/dWBDqnklUx9iehBeWKx2UQKFX4TBGZrLj2QUaGGK5KVkIF2Xmx82DVf5J9cUK3bV04/4MC/F/YEJR9QkisMUoYKZ76MK7wXiCwkk2HnsNZ+kP//DP1jeLIK0PIoXaJrcllIs6W9YdZFBFHVfVGnCxwi2LHEX8AR00s4HMZHK1zdTNVnknmObt4PqlVqERojkHXBTwgykT1bHocR4o6BhSTMKxXUcYzTcK7qm2iqx0EjviWsuObGZMJqvu3Agdfvz0aD9u1Dp3bQ5RdI38MVIsyEPPMcmF4v44DPEjeF31cXW1FOLDdHTovNrvQs+rvswS0kGzW4wQ4IjiBK0GLUu6HsLo8JjmtimjYVCr1ZSEt6Mfh2iOXpgyTVK/WWufPPHA8fu82kLtlTPj0+c2YbxEqL4Xdcoi1h5YQgb5TkpWAeZB+EAqCcLCGisaGVVHxK7fX31wTD1du85JP0WyIDEP1CeAgkWKcCrGINiq3hS1UW8SW9vtdqrmxo7Rf+RB7+Mfuffe5WZDd6RE68nz6930/I2MLyweure3gTInjTlEd8EzwI6mbAOPOznoJFN01O39v6Lar6sPDrr+7+EZtAFu7zi30VkBrVzyOMuiDDMzJEraeLzmzzuc22nN6T/x1IFffP7Rw9A0kw2br6OXnB/Gmbk430FWx8YwlH60YquaBgfliGjORDKFnpUVCVq8lFtmRpqUp4P1bIDj5unoJ8TiAQ406HEphTiPHVfazEI+VxptedxfUMaHnzr67GfuRqPBIEPK4HDeNWU2yOLIcZuFcJ596q5vfeeaHSx3xyh1Md9T4VgyqmlRE44EJ1vJV0hw0aKPrp9VfjWL4NBEgQaKbh1BMEG5U92sxUkyGvWKfPTxDy19/rljH3qKGhaPwqFnZXW3xiMfNS/MAaXdUYhGPqK7vpLIQ5gYaaJJw+5biFLXpxKkhEEJCQr06delWlp5XOgTmFVwIDYGAwPFB5EhUQcXDod921EfeeDwf/jK4WSwNej5MFsO2vBkORb6CRpmtLpu1TEwhdUd4Vus7Tq9hE8wDAH9rbGUENCXDBggXqGTSWkDYQKyZipu3oMkervCywyA4yZViGR0B2tSRXGEUjVUKIH4Ih2KePVD9x79518+HPqTTjNsMTFmvp+HlliENwvdewznIHO87ZXCk2w4Qa55R6SmknR9cAAtOaZknuJk5oTI9PR2PVQdHORWKE+nfMAaXlD4uKAVWI4XDCYtS4w2L59o9v7g3/0Cah0t32RJm6nQD0em3fTzOoqg+zFrLTRX19lGj914mx25jxn1+zdubHqNTgxnGflVP2AplQ39Rmm2fMA+ld5UdXDg4t8iXPmMkMELw1RJkiDOkSfR0UX3c5882aB9h47bSEN4x2IpPcHaUe69+P3i7LvrP3zzG3FehMHSYGydvO/Rdy6uTUKuPKSoo6ZSl8VUms7/qB9feXDsdNW5dfakMCLOASM2S2xTRcH2wSNzzz9/FHExiZnjcI1lsYncP9neivMfnr7619/cWl2PuLdkeTXF2hhMvbo5qSHc0jKpexgSfvbqsluYzsI1KMMchI8cBU/QNtHL2D+41HFclmRjzDRPoWJQe3TcFXaU2N/53k+urwZRNtcbtgaj1jBscPPAZjdKUwlPSa/Xm1qqs3Bt7vgcKs85Sg2UqtzJk00KqcYHqpuoeBH9a9HF5eGH5uIQicRZwsaWfQBFr+MYjeJqDU9duzYyrHvS4kCWNoboWZw4nYWGCAvTaeIFWsLQYJa9ulQcHOSSuqVzgIjghLpdKKPpGRgVnARt1zpxgiJwONUwmiBNUMqawvwVHRAR3IaDPeeW16yPAzQOTIMIWerKn8CtmqC7g5Czk01+pyCfNbFSnj/sWYzF0JFUMmImmAKIXAtggPMJXuTc5gpNAMFJnnnmcQFGwcLROERlAfpHARymctCAzjPrNRtzA/fuUm1wlEzjVlCDnBzlgra1yAZEHb0JZnDhIqInbJjElllrNucRPKPRG8EEQ4d/+4uH59twsq+HYR/1KV4NiMLgWQONwtDDIfF1SG3nS/faY7XB8T5qaW1DZ3RSbAU10B66KGz3xldvDAGg4QRaSC0JEINLQf2mY0R+iM49v/6FD2fJu3PNNIm2i2xs2+iSHaRhIrE7kjumbpT3HWpPvKw6OPD7d0JfJb3QnJyi6sgvl8OxL+1ao33wBy+/+frppNNa7vnI3YLJAtc3xovHFg89gx1aTB95qC2yHs/HwsBc4QB9sbED1NtdBQh7Ag3vO8mqg4Mcore826V+ijU94RgkG8fcsuevXBu++L2fbIfI2umghxM1W0nhH0sdEdssObYknvvYSUv46G1t8AnWmDtcYNYk0oNuyan3Xbc98bLa4MDNTe4u4GPqygYmMNpRUz9DC0rM7UrRA789f/Lchd5f/fUFy6JJPGjao3utYJwCRtFHcy575P75Zs2yBBzvcJOi+1NKDeV0K7g9gYLbnGS1wTGVKdTvkRqC0UI8g5L5cmAGEkfaKDZxaofDpPXCi29fXGER0oJptqPeGZpIhv6D2XyLzdXmLaMGr0acpcjjQbN8tKqlIcR7mHlUHRygMYmVHbURyIBMobk4cFCMg9SrQcFwt7pJYcwNJ/Z3X7oRAw/oew2S0+QUiSEcKfwZKKU3GqJwMfEJcgfvYqwXJrVgGM8URhpLe21VcScYkWsXvgkjJFNI48AbQqK3AgazhYmJAeY17+D6dgjOYWEyNaRLhpJYXWKQkt0ajliSWJy7ggZOMzQMRGswgbEK+5yj6vcESEh/O6cBvORxUndYfxNtrdli2w4mXYBkvu2qVE99Q44HUCR5psyEW+iDPgyGURoZApOq65hsHWfU1FSgQ8MeXnbddtW8CtBJ0aE6xnR59LpHgzdoDEjnyIqaqeD5nJO8jmSMyY2G3HjguPj8s0uNiNlDZuMfE12MjpUisPmpM8NufNWwh3CRRn0MU7Adw0MKWcrgW927wZXKgwOt/xhSPXM0ckvhMsdfw0KJWtFbudRQ4fJcbmUrFrv+xEP1555ZOnaQWWj9FPr97Q3bqUVcXR0MoXW+evqcVi/g28DQJ4fnlq5WgmILzgGZs0eXiuscdFtjRnBhI5JGCcUoVRphAtu4v3nXQjsLrqDX6Ill5xMff/yTz6uawza2zh2fOzreGrYOdgIMXEnsdrP2dy9PfvyjlULezXKor+hsXHYIouQu6Bs3RdUeBEjFwUFaJ8Y46vajcQynRdOKH3twOY2yE8udpfkjjz7EFufYcMCySaCc5Oh8m6Z2eWjRITZHYb1VXx2wr33t1Sw7ULB2ntdIDaFKNnSXI5un1Gv3ICzKU644OOCRKBrUjQXZXcmg7oyPHuK/85tmu3G447LJOK1bEpOYWhZcpUJmRYRxCjJmnn29N2i259Gk5Y//5ML1G0bnwAPdATRXG4wC4MB8J+i31OZ2L/ONGcij98PMVoal0HfaNAVmtQWYC4lwaxqv26JbJJiPAX+WaWOOrCFN7gUiDZndaHvXtthffn3lzbcGSh0bDDGTFtnH2uVFtqsGxbSmrfpq2T+W9VWbc8BTnvJxJm3DgMcC0oWP+5Ogz+JidGQRFScoOYE/I2UGmjnxIknCXMRWe2NE3fO/9vXL337hcnPuYZF6G73Yq9vkaMV+AAP0UPTxKAyMz6BJ53t1qTY44AlVHhyaiR/zzA+kKqTnzrWhONSRv4MuK5OxjxIF13OyVAYhk3X7+phtDdgf/dELaxvKrd+7spY25x0DVfekYMBBCt8XzU/RrEO3ti379exJfFQbHCCZtK0gCjH0cf5AZ+vihiPD199gTz6OoLuL2Ihda6e548c1atVkojKW/cmfnn33ur+y6qRZG/5QNOwZ+cypq5zHuUg4hz8M1iu0DlizxtRcIUGzF5dqg4MKVzGsoDAGY7QWrS0cOsb5tTfPbx47sXCw5Q2CMAp4vQZ/GNtYZ9/+u+F3Xj7jm63u2A6SljTahWgmCeCQYsq0NCOMM9eODeBgVwPavYiK6TlXGxywZKOwkIaHmrTBOPZaahgk566tfbG1cLmfL7Y68G1cvMK+88Lg71+70t1GtcLShEn4vkzZlKaLrA1MMIfVqmwEc5H1hYgbZhRDydjVG3sfHBW9AhRoy9BtRWJSXzzO/UhksXV1dXT2Krt8qb++snrpQndtLfEnLS7a3GsgyxwROEXODJnAQQZvKbwaBk1kiksvOSGDNNKbF2QvB96q3RMM+iNzxoPBoG4uoUu5Jw3J0tHwwl0nmpsbl1HXhLKVFNP/BCZoYBSXhd5vUWhGGZJ60CASIqnIMK9L5AijCAPoAFRIEzUylEBCG4WfQ+5lcFRbrGiNI3UkQywVyReTSWZbGMW1ePFyvz13Eu3JBTlBbC4VzdVJeuF427HmkQgEFJB7HGAqZJrGSZxbyBIDIyodHCXrmAZWZmcs1012+DM+qTY44NgoAmPOXcxCiaHlGM0VFElnwasZajga6VHCMglRCAn/KIrum402piYEXKUoZSNHKEVR4Cm3YO4SLMo/EinQRrT+AacH9aDdo66OaoODmH9u2dJbQW286c4vOqMxD2J0BwQavJxGzLvKYgrSAtTO8vEoQM8N9JKDQEENfhGjkzla9ygBJypsWIADyCDmIXW64R7FxE2+Um2dA6cxnWVBiuTOojMwSFcotUtdQDt9D4yCOMGtBUmBVGEL5kCY0MstZbTcc9c37+yyRx6rzjlwn2vi3aIoCKdPahexb5GXNt56RS/0brTpPd+A11jes2e5aU+t9/r57yli3+nJ7oPjTq/YHtp/Hxx7iNh3eqr74LjTK7aH9t8Hxx4i9p2e6j447vSK7aH998Gxh4h9p6e6D447vWJ7aP99cOwhYt/pqe6D406v2B7afx8ce4jYd3qq++C40yu2h/bfB8ceIvadnmrlo7L6hD8gH4eyuijQujtAv/tOKJvKTYPyZVcxRGj1hB28Re3kkJ6K/GXGQwrrp/W8QI21wiBqzIjMRYZoLnreUh4h0oVwFPpIOYYYu83GVS2j23eKqJ+j/fNcgIoFqtNAEuoHhkUH39HtDRnEZQsovE81S3gDmYEYRB35XKQGcgwzlDBxFFOK3FTcRGlU4o9F4de9zPVQ9NYP4pWQ35hvH3T4Q8NuYzgAOCSvobV+jLTUMMRuS2ihLQ1miHGve7bTns+iQ6yo699R+dUMYJzuYY0I3L7I6ttJ2wFSdBcovKuRoTM3OBuMxp12Lc2SKBxYaA6W+IHfb7hWGoTzDWtu2fQcNt827r374EMPnjx85AlAb73Hzr9ZnHvb39rk46jYmkxW+puStZFmiFa4w35gSraw6HU6mCxoZtFu/lRtfFQ+E4yat1BmHzgHamV3CEM8RP+hkcKU/0McADqi2WRn394CLI4cmsvisWAjD6M1wmtHls0nH11+5unDRxapN20cD1C6j0FxSCRkNHLUlDozfXWTff/vJy+fvnTxetzzPce9O07RCZmZSEYUCcbIoehyZhLWZwAcVFJAWVu7wIEaWugB0zk99DYY5DQPcDQaHTxQj/wgGG82vdyR47vvcj77qZMP3McaDrMFukb18nQInmJKiAsnYw2oHuiUjpxTAxXbqhnmaCDG/vN/7b702kZv1Kg3D8UxGwxwmNxrCI3SajOMm7++8mJlh1sQz7iFBmpyjV5gO4xEcxStdeTtVh6HV8E/avaaWWx//tOPf+EzBxyDYe4fahBEhpH0NWWiKh8DXOIoxHhIjBBEGVTCZBgnm2ncl2rB8dzf/eKco+TffPv8ZBCb7rLrKjTEThKM8rh5bSv/pPLgAMMgtjHVRWFBgIvQovUMPE7xUT6gvygaeLB0e7K19tRHjvzObz11V4fyzuuSWWXqac6gNKToQYr8cyEUmhwLEx0dMNYH7QUVetcqFNZOYmYfaIrPfrrRmxx95YfrUbplqDZ6gEzCBBMp9fFnYVVtcEDjLKUFMQnSQOkPSsYUEyRoSFUFMiBlkHcui1BEI8sIP/uZj3/x1xpNDIqMx2aB8V5ytD2pWy1pNg2oD+hfjNaE6MgAY6hI0PKY5S1DNKGKsGSCj/jF9RFrHD3Uuuu4deaCn/lWhKoZ4TKopqSxTBFZdYBUGxzl1SeIwClRTgwl4UKbCRb0APTkqIZDbwXOU1UMO57/y5/66Mc+xqFNZGHuychG1RuL223UNaUopkxS2MWmNC0ugBI9xgnWcmSwBFXWkglbOaJloVeMM2bsypUrm9tdr31AZpYfUS99Q+xoN/r4lV5VHBzvr4YnNxYhAjVraVpkuWubk8F2u2knYc+1OQuv/savPvZPfpE7FsNsv7k2QOUEo0GtbqXFCJKosMzC8mJqNAidVppS8bzrScznAPOQ+QRsSaU5DBcTRdj/6Y9Pn35jy6vdNZ5YueE5dTuJiLnMzFJxcPwUHaCT5rh7C0wKztpzzsol2KhzMh9Ylp+Em1/+tac//ZyJGSsYjjDnZQbMVIZWYfUI3QWlE2Z5nJqF0UBfhihnmOcFM3mxNjdIh7aM/dH2QnMhjlBfLbZ67G+/0z39RtwftlSjkzMnyWQessjPPTQmK5nWT/22ym2YJXDAdr11/U3TDMZRq+lk4XarmQXjjaefueszz5udGnr4XFF2DbCI4sJQrnIWehNgif/4zdH3X37nrXMrvSE6zzW9+mK9ln30seYvfWq5Uc94M3xn48LyIjpFsddOs298u3dlvc3sOaE6HPIo0x6VWdE2yutYcXAADVPdYmqkkPFCEBGoiJ0Mt44uNfvr1ye8/6H721/6jaPwZIyHK00Xn0kx7i/KpYWZCiP2xlvhf/vaS4ORMwndwnhEODSJerUX3tgYXL1ybjDOfv2LR9PUOLB475VB8c5F/tffvrzVR+uxhnRp2Bc6PaBtqRIOzBvUdt9CaMWfVRwcH3j1tVcjiaJmvTbYvt6sI1zW/5XPfXJ5DmZqbFsdDFIIozBIhel5q2P2rVPdl15Z7U7u6wf1ycRKmSQXiYqUxR3Xi3v1b78wuLb2w3/zlcd7jF1a5X/+N2fW+q2It1CdT9G5EMMEx4bBZIZG2aSO7FsrH0iW/08b6V4F5wA/0K5SMlVEkUWuK4fDsXT8L/zyJ44fxbTYwLUio7Az6hnoSs/Y8tm3vrv1jVOXtrr1gY8+pA0JJylsFIEmk8owfDTw8OqtSxcHdsP+0z/bvue+zjf/12vrfTeRdfRax8GohYfILYW4XWFQsxjYvjOjclQ+KvsBcIRvFFuhc0zG/WbDO3RAffqT85ixwvMNuC+DohtEaEh5FN2iXvrh+JvfPbfStc3akmE4MEVSQdOZsiSJ4z7n6FJoyqh25Nj9o/HaG29E3zn198r2xuAprsxttDB04UZFd21XNiCm0NBBCknh/Blxc1QfHCQCKO6KP7g2VBlhMYrcMvIk6VrW4LmPPZ5GrOWhhQvadWSusPpxIF2Ktb72xtbqNhpgH0a3SYVWpGgWB6UWzgowA0x8UybaBAlTRSnsmsbq5sSwDkcRpJGahCPbqTOE/CNkd5AfLo5yyCzTlpgaNzNLtU+FDFfqHJpnmL0FksIDgQftNi3S7YPN2FUrn/2FpzwFT+ikZh5g8JDybM6b9xP2P78x+NEbo4IdHvZZDXH6KKrl8KiiQa1IhJUYVpyn6BNkckw4z+JCZoaLpjAY2qGKVGJWYBYUWeagyX5hpGhEqExSQRD6naHxPdUGh75HKfpKJgLuWW25gJXAkeGoLAnXP/GJu8FPcJIcoIiEVLUsGxvC6m2jBWU3Y80gsWyvFiWxzUkaiMIktUULJoT4SYEo0OMa+oxFIVmK2qO91DCLQnQ95vCYFzlywnB00ncwkxRBWfK4z4hcmYHT0GkcO3E2ZO4RLXliqqzIo08+/zD1LmY5fJ0BuoFxhlldaAV26Xp2/vLFQhl+Ecua9Is0gX/cYBj3lhqwOqA5oKEx8nbSHOOfIorGoYU6ICC4QgMxhOR2Yijacp4eFPDCTrOzVJtzwCpBrA3SgDrNaguS1hRpgwrgz8/XlhYRHsmT1FdSIepBncEK3P/s7Xcu9Ceh2ZHMMNEjPZUq1lNkDfJioVctqR7ICaVJkgodxRCckUlM8Vv4VA0JZ7pD/fa1R2UHC8BguYVYz87Gaj9WGxy49mg6S11FBdQOnSZI4IDNEcXp4IH7j6LbpIW55P7Ekw0oFhlEhLCgFVy8smY5rRTTIS0YsUCIE0MXRX4Q0AYGgbhKgTgbFJDURFwFDY8NARd7hE7Y1BtdIEFQd6WknKJpe0qdXkRzfGZoqTzGaZ4SGSoUndfPYgEvhhHCEH344eODIXgKtFUQHkojEIRe2E6SssAvbKueZVwaaD5JqYDUs5RJCv0XAqNEYe+YOY1+Ckebkb+dQRXFRgNGDdbgJRAruHTT7DKNB5JeeqN+nIlV5cGBnC+YGLhv9ZkAJuAfuOkT1zaOn2AKrSjzsOaYcQy/Bgxe6BsM03ja3kIR8SLMJRyiAA2lqdMfqA2eIPPcyhM7S5wsODAnHMcvsm6S+GALiM4SkgiGOjcAhyPPGxat+pAqWvlLehPYM3EmO+EMyugBqdBqkmeOK1ttVq9BN8BAcg69A41IcdoAB9J3MLo+8/siGRt5VFeJSEIwCckC/JnFyGJDJx+4eddm208+sXzvSa9Vh04yyvMILAgpYchIJvNkmlhEF5NUFNRGFNS4cmaWyoMDg5T0H43s01opSEN3s+NY6+tkxCqd1el4Nbi7pUnJOK0ae+zho8cOWsnwXbdYm/eGRnSxmFwQ8WWLrcjieu5fcPnq0x/q/It/+szvfdlZXIjzfMV1JqbhwwhSsHY1/nZAgGsINgJYIFVgdtLAcHaVV0iJQlMtEHc1cXsKzFJtQdposHHMagovCxSqSFkvEhQlxaayji3zRx6aC5JwEF9De2uUIxxcmN/cWBtvD2umPH5s7sF7Dz/+2MKJe9mNbfal3z72g5fPOE59iAQhHM2EoDERbSMRtrOAYaBh8s2fsrO52o+VBweJFNIAysoljQxE3bgRJbnn0bwN8mXB0Y05XuD6GF2dbyvmnjje+hXr7k7HevXHb1/dvBCH4ZUeapPUgyfv+viTH376saVD8wS5ICtcJ/SU026y/mToWIvcMpFECqeZgbpIHBmHKhGCF6WlU208vOfXVx4cxNG1h5SoQ1op2pqjwMkMUZq2xY7OszBIPNzoxFbIvDAkrNG+wdwjh8zlLxz57GePkN9KgcyIjzBopvC110yyRiSbKJkJaZ++uP65X3ruv3z1NEzawoCWgmNSfcpU9wQ6cERKVtUqKh1mRhbiwJVegAzNNvT9S1oh7FAoBSoMMqTx4dTGPkYgGAjTI2YGjQPOTYlSV9TFTiLwlYakOaMKqcbBwBHhvMfqGhlFNkzT7YKNGAsdy/r08w2FiGuEWbUxMFRrNLVZAzxMRdr0GoI3zdBSbXBoH0c5cb70d4BaKHvH4HLc+fbbP7kwmDBlOqSJ2i7H7GpDrXcHIeOW8mqu5ZnMwlwFkVl5MO+YDXwoi9M4TOMJfKMS7lPKGMvuWW6t3GAYzYHqFttqoMIB3lKtrtHVg5ZTWrXQUhFqmSV4VBscZJjQWHGKvdEdW963BXKxMGFJ3VjdOH36er2GMaLIGlSmSYRrzR012Hyaq8mIjXssGSGYa9StepHmWZIZuVTCtmnmE821h2rhj6LVdfYXX30ziw2k/iB92JT10TAhUTJ1aeDQ9Ac86eQf+iGzsVRd5yA5QpQouTuJf3RbgCNUIaNnvctfev3Gsx8/vDkR8x5POYsTJHlZWZSBvbgO4w6RNYuCQiTSFCa3qSy2YAGYEQJsYj5V/NKN8Z/9xQvvXMhM575RyPv9yPIsiZIF6DZwmBA+iGnpHwBH7XulTMUxUv1CanAD3LPI5sQIUU0jUMgoMhPpw+GG4muffPbuL//WoTmP9UbDusmb3HOgeYCI2D0PkLxR8BDlapj+lTF7lEg/NEyPZhCfOx+9+uOVv3lhI8kOZQx5Yh4CNUAPKE4Gs4YBWSx4qtclEmYJHhXnHCVVyPNNaTY0+JMWkEyEsTp8+N7euv0/vvFmkoW/8esnDs1B+yRCwhuG0ZBZBmRENLeJO1Ab1oe+18CcQCQOsQvX2buX89Nnrv347Z6f3ZOwOfrWXUyBADKjgKAz3VlmhHPkPIVogEoIkvECygWiKxy180Y+cqyB63SlWH/88aXf/NXHOjY5/qAjFEUqoKNC5WCI4UIrYcMJu3Kdvfl2fvZ8d2UjHIxyP1a52Un5Hp0BWHHOsYNxBE+IJdy8ueGspJRSHmc2C6ktU5CG3/3e1bd+cr3T4keXO/fcc8+Ju+bbbYZ43I3rbGVleO7C6lY3XdtKB2MjjJ04czNWKyS0kD2KDFzaynOOEhM0YJZDewAXAEsweW5lMWvXWeyzUW+jWc8PLJh+sLq+duXI4eOooU2zEAl+yoBPi6MrSxiG8I4FIT6kHG/OdFpxJvwYLnKUy87PTAO4m7fSz/hkFsBBgEBWHxRSqKVQPiA3CgsPoc9sg2FieRxE/nitXhdLy4cuvLuKiZAS6X4GQ7UJTSlO4yieNFro4IOaSCQIF1FSBCnQRrYrSz20k/sZr+aM7VZ9sUJaBohCJiWQsUOeHJ4NqBEhmmuMma2sucVjGEJ94cqgvnAY6WFRmI78cTFBqimKl0B7d/XitlevOXUX+T/IPkVQTaPEsEhF2aNLxc98x1ohWJDaoeNgJFzSCKExw6jr/k3BhEUTtGMQptvaHAxM28LwctdsYH84SZBYisLZQ0dbWjMtwlGEfB7TsRDcRyx3x9O1F/FRcXDcIhnl2miHA6kd8HlAXkBBRQkSlBKJnk5MoHkTVBO7hjDLIEGUBR1FqZDAJDeaAfeG/q6Cm8rGs0K32TA4InJ6+55czQI4yEgh4QKZgmdAgy5jIaJqwxbbicEgRVS/r5VWBEG0PQvGAQc8YiO5oRMM8RXk4NJLafvcFFTTrXvpofLg2GW+gm4QLgQE4EMnawEeRFxkaekn5N7maQOImAKA3sBCYghSCWnrlGgIlZRmWmMjlBjUV6LscV8hpctUtQVEJjDcvN2pjAWUh02rTVxABK9JsmjuAiQYVMqgP7LzIeyAj1BQRUfOwDjKMK/+LMpXZqi8kc70TpbKcw6kFO9a9AudZEHFarveIM4BtgG/OgMIygV1i2AUQAp2LPc1dI90HcnDLoQpA8l/Uyzt/ra98bzy4CglgvZTlTC5lf+ta9hKslNNXCkdIHF2FA4iP55rJQOPwAB65SOnA9wI+Cn5DeSULnjcG2h431lWHRxg/nCMah2C5AXhAxQnPkF6KMXhdAkbThMv6dyxD2X0abUUlZTYnbbrvgt4Uxc1Icuw3FPLLHzlDquhrXtpqTo4QCsyT26RDHQlYmMNfNDZkXDYQQaeY6EVpX3QcwINIIJ9yu8gYOnNqE/Rj1SDu1eXqoNDCOo2jKWUKQSLW/bLzY14n+BCb93Ekd6t/BStS7uFvglLiY/y+R5eVx0cIN0OLP6PVNQ84Gei+x7mFruv4s98ZXd/aP/53rgC++DYG3T+R53l/wZDUnOJsUiwkQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.escelje.si</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.escelje.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>MIIF8zCCA9ugAwIBAgIGElFsgzi9MA0GCSqGSIb3DQEBBQUAMFsxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHEwVDZWxqZTE8MDoGA1UEAxMzRWtvbm9tc2thIHNvbGEgQ2VsamUsIHByaWphdm5pIHN0cmV6bmlrIHphIEFybmVzQUFJMB4XDTE0MDkyMjA4MzEzOVoXDTM0MDYwOTA4MzEzOVowWzELMAkGA1UEBhMCU0kxDjAMBgNVBAcTBUNlbGplMTwwOgYDVQQDEzNFa29ub21za2Egc29sYSBDZWxqZSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFAHCc1ZUPkf896U16riOzhofIDhNVzQOxL21Z1vxtpuHHXRWLVNDKX9CJ7oZo5Vi3EKufPemoaTHvQuk/p45SxyutnCbwP3F2glBytYSRHm5066vUEjNS7g57rFdqrYQqJFjn7HlvlD9sGKL7y/Mzqg5rwoShVmQl8DghNHhZYGLBFIzyMNeYNlp4s+FAQrx5HtX61XZHW5LTrHgFQRbYU6wd1uUnZopLR99j52Wnk8ITnyhnZFsmJyZZ7YasAEK+SyGFbC4kUp+PVjrChaEDMlyk6vsBHjNIRyiuHS0k3F8mVVjSrUetWEu65h8ucn2DOU8GSbFyaPlqjXUlKmfdywFfX7IH3J8UbPmFVvtOL6L+bDVBfTe7mwBkwqm69c3T4eFZXIKPo46skzAqOC4QbtP+2t1UFyKGqYJzcd87fob+h4mV8y/15KFq7zMssXJHp4cQPDDIl/k42I3oiDI4L9KUS+s8rvb6He3ei8GdsN/AZoji3qLR4cJg4+ddNc9bDZ/pKNSnDrDP6KqX4U6gcYpAfkms/6GETDVERyqMmvslDrRBGfr1scUR7tPZxPTPLnBq6PjsPPhDFaMxwAiDPwpg78+F7mJ1TrnXUss7nba0ccY6UDc4Iuc85JbmmZMpVZk+p0qQSEjKXKaxMOF3qOP6aCEuz5a3wQ4iExOlKwIDAQABo4G8MIG5MB0GA1UdDgQWBBSwV85pi9KUQZFUTuiWPaBTdagyjzCBiQYDVR0jBIGBMH+AFLBXzmmL0pRBkVRO6JY9oFN1qDKPoV+kXTBbMQswCQYDVQQGEwJTSTEOMAwGA1UEBxMFQ2VsamUxPDA6BgNVBAMTM0Vrb25vbXNrYSBzb2xhIENlbGplLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSYIGElFsgzi9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAK4ppXww9GOUB7beTHp+TE+XZJ1G07FXNArdY+6qf6+V59MN1iUkWdWd4KonOsu7CuQdepvS4sRHUncpgZ3+jhezby0TejYXlo0SXkkGuJNHkjnLDEds4fs38zZvfjbmfkFbmaLhFZ+JfsHZyFtos8UZkFqha02YIxs6hwIOhX3JX7DeHy59VWhQLceAxgJAUDEInxntYHtEf5IkxZTcZgBakp2S4vMBSsKZLIMd8Bx3gKmc/wHFLHJU2Jd60MtspljAqJELgOVi8bdJcFzjPacQ0kKEif/S1VjR/OofLXfDjxx7vABnYIvyWXZKX1bGKklsFa7vdv6HeySkbNxgHXk1UJNBnpAzc9GblXW+zUmeZlzsLMB/HtGmdONtwe4LOWhQ/YNZq26rrgW43cMoK3Z40EpGuBgPFW1hWJg0tubbD8W7lc+G+WFwTto5jfumsuCnoxRYgRTe/Hu/8ixCESVNNeZOJqvOrHj9JeTnN6z+vdh6+bpB9B3XModJi0ylWPFLmJ5pUfEC6K/1sXzBkYbdfo9XZckYhyY8NlFO8wtga3Ugrtxa4q4wlYxvYIrLJCJImcwpOwWuWg/lAi0hQSGg3GyyuWJSkCQoCSAZbvatCQRNmH4wFcJKUhfKeFeuuBpfIs7X9h4fIlZxssSXZxBvMDvHbCpoO5WsGQndgEBy</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIF8zCCA9ugAwIBAgIGElFsgzi9MA0GCSqGSIb3DQEBBQUAMFsxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHEwVDZWxqZTE8MDoGA1UEAxMzRWtvbm9tc2thIHNvbGEgQ2VsamUsIHByaWphdm5pIHN0cmV6bmlrIHphIEFybmVzQUFJMB4XDTE0MDkyMjA4MzEzOVoXDTM0MDYwOTA4MzEzOVowWzELMAkGA1UEBhMCU0kxDjAMBgNVBAcTBUNlbGplMTwwOgYDVQQDEzNFa29ub21za2Egc29sYSBDZWxqZSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFAHCc1ZUPkf896U16riOzhofIDhNVzQOxL21Z1vxtpuHHXRWLVNDKX9CJ7oZo5Vi3EKufPemoaTHvQuk/p45SxyutnCbwP3F2glBytYSRHm5066vUEjNS7g57rFdqrYQqJFjn7HlvlD9sGKL7y/Mzqg5rwoShVmQl8DghNHhZYGLBFIzyMNeYNlp4s+FAQrx5HtX61XZHW5LTrHgFQRbYU6wd1uUnZopLR99j52Wnk8ITnyhnZFsmJyZZ7YasAEK+SyGFbC4kUp+PVjrChaEDMlyk6vsBHjNIRyiuHS0k3F8mVVjSrUetWEu65h8ucn2DOU8GSbFyaPlqjXUlKmfdywFfX7IH3J8UbPmFVvtOL6L+bDVBfTe7mwBkwqm69c3T4eFZXIKPo46skzAqOC4QbtP+2t1UFyKGqYJzcd87fob+h4mV8y/15KFq7zMssXJHp4cQPDDIl/k42I3oiDI4L9KUS+s8rvb6He3ei8GdsN/AZoji3qLR4cJg4+ddNc9bDZ/pKNSnDrDP6KqX4U6gcYpAfkms/6GETDVERyqMmvslDrRBGfr1scUR7tPZxPTPLnBq6PjsPPhDFaMxwAiDPwpg78+F7mJ1TrnXUss7nba0ccY6UDc4Iuc85JbmmZMpVZk+p0qQSEjKXKaxMOF3qOP6aCEuz5a3wQ4iExOlKwIDAQABo4G8MIG5MB0GA1UdDgQWBBSwV85pi9KUQZFUTuiWPaBTdagyjzCBiQYDVR0jBIGBMH+AFLBXzmmL0pRBkVRO6JY9oFN1qDKPoV+kXTBbMQswCQYDVQQGEwJTSTEOMAwGA1UEBxMFQ2VsamUxPDA6BgNVBAMTM0Vrb25vbXNrYSBzb2xhIENlbGplLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSYIGElFsgzi9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAK4ppXww9GOUB7beTHp+TE+XZJ1G07FXNArdY+6qf6+V59MN1iUkWdWd4KonOsu7CuQdepvS4sRHUncpgZ3+jhezby0TejYXlo0SXkkGuJNHkjnLDEds4fs38zZvfjbmfkFbmaLhFZ+JfsHZyFtos8UZkFqha02YIxs6hwIOhX3JX7DeHy59VWhQLceAxgJAUDEInxntYHtEf5IkxZTcZgBakp2S4vMBSsKZLIMd8Bx3gKmc/wHFLHJU2Jd60MtspljAqJELgOVi8bdJcFzjPacQ0kKEif/S1VjR/OofLXfDjxx7vABnYIvyWXZKX1bGKklsFa7vdv6HeySkbNxgHXk1UJNBnpAzc9GblXW+zUmeZlzsLMB/HtGmdONtwe4LOWhQ/YNZq26rrgW43cMoK3Z40EpGuBgPFW1hWJg0tubbD8W7lc+G+WFwTto5jfumsuCnoxRYgRTe/Hu/8ixCESVNNeZOJqvOrHj9JeTnN6z+vdh6+bpB9B3XModJi0ylWPFLmJ5pUfEC6K/1sXzBkYbdfo9XZckYhyY8NlFO8wtga3Ugrtxa4q4wlYxvYIrLJCJImcwpOwWuWg/lAi0hQSGg3GyyuWJSkCQoCSAZbvatCQRNmH4wFcJKUhfKeFeuuBpfIs7X9h4fIlZxssSXZxBvMDvHbCpoO5WsGQndgEBy</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.escelje.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.escelje.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">EKONOMSKA ŠOLA CELJE</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">EKONOMSKA ŠOLA CELJE</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EKONOMSKA ŠOLA CELJE</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">EKONOMSKA ŠOLA CELJE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.escelje.si</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.escelje.si</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Maja</md:GivenName>
+    <md:SurName>Krajnc</md:SurName>
+    <md:EmailAddress>mailto:maja.krajnc@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@escelje.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Bernarda</md:GivenName>
+    <md:SurName>Marčeta</md:SurName>
+    <md:EmailAddress>mailto:bernarda.marceta@escelje.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ivan</md:GivenName>
+    <md:SurName>Kolenko</md:SurName>
+    <md:EmailAddress>mailto:ivan.kolenko@guest.arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ivan</md:GivenName>
+    <md:SurName>Kolenko</md:SurName>
+    <md:EmailAddress>mailto:ivan.kolenko@guest.arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ivan</md:GivenName>
+    <md:SurName>Kolenko</md:SurName>
+    <md:EmailAddress>mailto:ivan.kolenko@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: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
new file mode 100644
index 00000000..4c5caaae
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.esh.se-idp-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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>
+
+MIIDFDCCAfygAwIBAgIVALaN98IcoLX3UQ+fKlQVmqP23WvBMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5lc2guc2UwHhcNMTMwODA3MDkwOTU4WhcNMzMw
+ODA3MDkwOTU4WjAVMRMwEQYDVQQDEwppZHAuZXNoLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAn2ZQb1kuPTXtueUtR79lZa5hCV2fMlOlfFJFMyC3
++6qQR6CGGZ7GvntHtIKpbfFqIeCsWNGXLttNDmGroG6koge0CEKv6z6JVD5tHert
+UVRA7GpDZpZLR7qRYcrbZp1tLrk9gKL3/PaudZhwAKuWiMz5HNyqk9Ojh3YRWJUD
+1O3RX6l2tvc8MjT8JYE2D+TpqqiT5k1WgV7zgCv3QVnazfuANKZ2qjxiKVi3bh1w
+V/3VDJiN9DYhN1NvU412QBZR1AU1XJL36qkKmeTOi8qhhlxh6abl2oEpgyjR0lxn
+o1HwkDipkIJJiN/h7CKlUnEHpPidI5tMy/PezW78h2znfwIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuZXNoLnNlhiFodHRwczovL2lkcC5lc2guc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFDGWVB2qNc/D6uRZt2wqI4/SM3Y6MA0GCSqGSIb3DQEB
+BQUAA4IBAQCMaKhHwEwcXTM7/HO6RbavAsisMab0TsCmuYsrCtYFccdrFNEUs+R5
+qGwHre8J+0cMi0WgSIHXLnbhvjG3JPmBeLkZdSw/rOGtF6w6VSVpT2iGvfjNbsBq
+wFGkaEnsDKzhiBaIOcJyAJoh97PJygz7yriziwxDZrB7b0xnBHVs6u4HNuQjd/NA
+geGI3bNTbXj3Fgu9lanUQE7DbWETQEnrqI2QH+8tr4vVnhG7jaET+qP/ya+XXPJ1
++PUaqX2b8yCDIeHr7NkqtYf1nqphQ71OvdKe1R6Pzw9N19ny10FJcZypisRt/ghv
+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>
+
+MIIDFDCCAfygAwIBAgIVALaN98IcoLX3UQ+fKlQVmqP23WvBMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5lc2guc2UwHhcNMTMwODA3MDkwOTU4WhcNMzMw
+ODA3MDkwOTU4WjAVMRMwEQYDVQQDEwppZHAuZXNoLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAn2ZQb1kuPTXtueUtR79lZa5hCV2fMlOlfFJFMyC3
++6qQR6CGGZ7GvntHtIKpbfFqIeCsWNGXLttNDmGroG6koge0CEKv6z6JVD5tHert
+UVRA7GpDZpZLR7qRYcrbZp1tLrk9gKL3/PaudZhwAKuWiMz5HNyqk9Ojh3YRWJUD
+1O3RX6l2tvc8MjT8JYE2D+TpqqiT5k1WgV7zgCv3QVnazfuANKZ2qjxiKVi3bh1w
+V/3VDJiN9DYhN1NvU412QBZR1AU1XJL36qkKmeTOi8qhhlxh6abl2oEpgyjR0lxn
+o1HwkDipkIJJiN/h7CKlUnEHpPidI5tMy/PezW78h2znfwIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuZXNoLnNlhiFodHRwczovL2lkcC5lc2guc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFDGWVB2qNc/D6uRZt2wqI4/SM3Y6MA0GCSqGSIb3DQEB
+BQUAA4IBAQCMaKhHwEwcXTM7/HO6RbavAsisMab0TsCmuYsrCtYFccdrFNEUs+R5
+qGwHre8J+0cMi0WgSIHXLnbhvjG3JPmBeLkZdSw/rOGtF6w6VSVpT2iGvfjNbsBq
+wFGkaEnsDKzhiBaIOcJyAJoh97PJygz7yriziwxDZrB7b0xnBHVs6u4HNuQjd/NA
+geGI3bNTbXj3Fgu9lanUQE7DbWETQEnrqI2QH+8tr4vVnhG7jaET+qP/ya+XXPJ1
++PUaqX2b8yCDIeHr7NkqtYf1nqphQ71OvdKe1R6Pzw9N19ny10FJcZypisRt/ghv
+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>
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
new file mode 100644
index 00000000..21386656
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.esher.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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>
+						MIIDJzCCAg+gAwIBAgIUTqf68WmrG3w0sWAxe9mg3otFIZswDQYJKoZIhvcNAQEF
+						BQAwGjEYMBYGA1UEAwwPaWRwLmVzaGVyLmFjLnVrMB4XDTE0MTIxNzEyMTMzNVoX
+						DTM0MTIxNzEyMTMzNVowGjEYMBYGA1UEAwwPaWRwLmVzaGVyLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0HdpuV5htwYC8WF3zeFZTKJ2AYbP
+						WZ7SU/LvVYqrD9cfm68KNG7HBpECZ7eZ1JggqUZDiFQToRGfBGH4jhsxjjhDP0KV
+						Oo8mKB/vNkKwd+bBjg9IGko4k/LfT0hxyGIPMG0CJWBazhPwG7JHj2Dh8kuJwCJA
+						Cebu+zRQeKgOdwtM2C08GmqYKRksRTqyLCaYUvF8wRF9J1aIMjOvwhyzgzSlw12w
+						y7brj8XBHwoY5oNpZEM9Zu8cv7uQNTrI7Up6pNYcEEVIp1KFLk+biBg6zPFykBNQ
+						OaatiJscuqjjX29hfraT1gbEaMgTXzjrlzMPOns04HNx+mrE0kIUdQ8prQIDAQAB
+						o2UwYzAdBgNVHQ4EFgQUUHA9nhSU3TIZcNn44UKjCf5sIxMwQgYDVR0RBDswOYIP
+						aWRwLmVzaGVyLmFjLnVrhiZodHRwczovL2lkcC5lc2hlci5hYy51ay9pZHAvc2hp
+						YmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAGDEpLkm/u08qjo/CnqYyHB5Oh7LF
+						Koorx5Ag47xgR0l2rtnTe5KO88IhnkBLzU15RzPAH8yZacto0Yp06Eq/2EoMjfRd
+						1CeeAFrDPZsBuMLKqXYcGeFkIkCPZMrRkhN4EzYRiJzs6IzJdqNnNSOJ4yYu6iga
+						CqrktgZRjlFK/WRiGD7KfTOanA4PUw5EPovKKM5vcIsBO/5dSjmZSWbBK0hTWUCr
+						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>
+						MIIDJzCCAg+gAwIBAgIUTqf68WmrG3w0sWAxe9mg3otFIZswDQYJKoZIhvcNAQEF
+						BQAwGjEYMBYGA1UEAwwPaWRwLmVzaGVyLmFjLnVrMB4XDTE0MTIxNzEyMTMzNVoX
+						DTM0MTIxNzEyMTMzNVowGjEYMBYGA1UEAwwPaWRwLmVzaGVyLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0HdpuV5htwYC8WF3zeFZTKJ2AYbP
+						WZ7SU/LvVYqrD9cfm68KNG7HBpECZ7eZ1JggqUZDiFQToRGfBGH4jhsxjjhDP0KV
+						Oo8mKB/vNkKwd+bBjg9IGko4k/LfT0hxyGIPMG0CJWBazhPwG7JHj2Dh8kuJwCJA
+						Cebu+zRQeKgOdwtM2C08GmqYKRksRTqyLCaYUvF8wRF9J1aIMjOvwhyzgzSlw12w
+						y7brj8XBHwoY5oNpZEM9Zu8cv7uQNTrI7Up6pNYcEEVIp1KFLk+biBg6zPFykBNQ
+						OaatiJscuqjjX29hfraT1gbEaMgTXzjrlzMPOns04HNx+mrE0kIUdQ8prQIDAQAB
+						o2UwYzAdBgNVHQ4EFgQUUHA9nhSU3TIZcNn44UKjCf5sIxMwQgYDVR0RBDswOYIP
+						aWRwLmVzaGVyLmFjLnVrhiZodHRwczovL2lkcC5lc2hlci5hYy51ay9pZHAvc2hp
+						YmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAGDEpLkm/u08qjo/CnqYyHB5Oh7LF
+						Koorx5Ag47xgR0l2rtnTe5KO88IhnkBLzU15RzPAH8yZacto0Yp06Eq/2EoMjfRd
+						1CeeAFrDPZsBuMLKqXYcGeFkIkCPZMrRkhN4EzYRiJzs6IzJdqNnNSOJ4yYu6iga
+						CqrktgZRjlFK/WRiGD7KfTOanA4PUw5EPovKKM5vcIsBO/5dSjmZSWbBK0hTWUCr
+						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>
diff --git a/swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml
new file mode 100644
index 00000000..acdfccc6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml
@@ -0,0 +1,149 @@
+<?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>
+      <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
+BhMCREUxPjA8BgNVBAoTNUVTTyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3Ig
+QXN0cm9ub21pY2FsIFJlc2VhcmNoMQwwCgYDVQQLEwNURUMxFjAUBgNVBAMTDUVT
+TyBQS0kgLSBHMDIxIjAgBgkqhkiG9w0BCQEWE3RydXN0bWFzdGVyQGVzby5vcmcw
+HhcNMTQxMDE3MTIwNzA5WhcNMTkwNzA5MjM1OTAwWjCBqzELMAkGA1UEBhMCREUx
+DzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIR2FyY2hpbmcxPjA8BgNVBAoTNUVT
+TyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3IgQXN0cm9ub21pY2FsIFJlc2Vh
+cmNoMRQwEgYDVQQDEwtpZHAuZXNvLm9yZzEiMCAGCSqGSIb3DQEJARYTdHJ1c3Rt
+YXN0ZXJAZXNvLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/y
+weMbb9mXT+teqXFEevPWlvO48gTjIqNAcrGs9XvZtLCQB91hftXOkS21aNhpO1jD
+pJeU6WRjH7WEU3/oXGGqXztxV3I6giyMm8UB0qNLtDm2MuGhYT4CqIwunIzqYKJG
+nvvhi6NTAqhO2wP+XIK7dCnYhehRPhAivMKwLWabKKHF4SPV1X4R/AIMPbu2QFnK
+lM3grdo6lctuGWGcJ9n2UU/9ywQmiZmczQigimkjPp6K/1GFZI5TmIP5uO+Wv+sD
+JxETIOvsYQK5y+CmU5fl1kSPKUwpa+ssfKldRZIpTc2sukFlnU8XAmMpSmjyzsXL
+wEoojn5FmgPgdHLQrwUCAwEAAaOCApEwggKNME8GA1UdIARIMEYwEQYPKwYBBAGB
+rSGCLAEBBAMCMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0G
+CysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUSPnc6DulTXOTEQM+i/fbNpxx
+6OowHwYDVR0jBBgwFoAUsR53NN55AbLmThsm4pt3idg5vn0weAYDVR0RBHEwb4IR
+YXdlYjQwLmhxLmVzby5vcmeCD2lkcC5hZHMuZXNvLm9yZ4ILaWRwLmVzby5vcmeC
+DmlkcC5ocS5lc28ub3Jngg9zZHAuYWRzLmVzby5vcmeCC3NkcC5lc28ub3Jngg5z
+ZHAuaHEuZXNvLm9yZzB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL2Vzby1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAzhjFodHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL2Vzby1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHLBggr
+BgEFBQcBAQSBvjCBuzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5k
+ZS9PQ1NQLVNlcnZlci9PQ1NQMEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL2Vzby1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBBBggrBgEFBQcw
+AoY1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9lc28tY2EvcHViL2NhY2VydC9nX2Nh
+Y2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAL10jELuLO7BfdWD2GV/chZe20xt
+M8NthmUA4i6VG9/MRTIFzhR9qwnl0nBQPGCisGH07EU6DvKH6XVMBtW2XidOL2Xq
+vyw9Ztvs5H2ypRnV6FDUKRf1PdbdY6pqTInn5Yt8cw8Rv9h5FDNCXLoLjkRuBNQf
+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
+BhMCREUxPjA8BgNVBAoTNUVTTyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3Ig
+QXN0cm9ub21pY2FsIFJlc2VhcmNoMQwwCgYDVQQLEwNURUMxFjAUBgNVBAMTDUVT
+TyBQS0kgLSBHMDIxIjAgBgkqhkiG9w0BCQEWE3RydXN0bWFzdGVyQGVzby5vcmcw
+HhcNMTQxMDE3MTIwNzA5WhcNMTkwNzA5MjM1OTAwWjCBqzELMAkGA1UEBhMCREUx
+DzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIR2FyY2hpbmcxPjA8BgNVBAoTNUVT
+TyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3IgQXN0cm9ub21pY2FsIFJlc2Vh
+cmNoMRQwEgYDVQQDEwtpZHAuZXNvLm9yZzEiMCAGCSqGSIb3DQEJARYTdHJ1c3Rt
+YXN0ZXJAZXNvLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/y
+weMbb9mXT+teqXFEevPWlvO48gTjIqNAcrGs9XvZtLCQB91hftXOkS21aNhpO1jD
+pJeU6WRjH7WEU3/oXGGqXztxV3I6giyMm8UB0qNLtDm2MuGhYT4CqIwunIzqYKJG
+nvvhi6NTAqhO2wP+XIK7dCnYhehRPhAivMKwLWabKKHF4SPV1X4R/AIMPbu2QFnK
+lM3grdo6lctuGWGcJ9n2UU/9ywQmiZmczQigimkjPp6K/1GFZI5TmIP5uO+Wv+sD
+JxETIOvsYQK5y+CmU5fl1kSPKUwpa+ssfKldRZIpTc2sukFlnU8XAmMpSmjyzsXL
+wEoojn5FmgPgdHLQrwUCAwEAAaOCApEwggKNME8GA1UdIARIMEYwEQYPKwYBBAGB
+rSGCLAEBBAMCMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0G
+CysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUSPnc6DulTXOTEQM+i/fbNpxx
+6OowHwYDVR0jBBgwFoAUsR53NN55AbLmThsm4pt3idg5vn0weAYDVR0RBHEwb4IR
+YXdlYjQwLmhxLmVzby5vcmeCD2lkcC5hZHMuZXNvLm9yZ4ILaWRwLmVzby5vcmeC
+DmlkcC5ocS5lc28ub3Jngg9zZHAuYWRzLmVzby5vcmeCC3NkcC5lc28ub3Jngg5z
+ZHAuaHEuZXNvLm9yZzB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL2Vzby1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAzhjFodHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL2Vzby1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHLBggr
+BgEFBQcBAQSBvjCBuzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5k
+ZS9PQ1NQLVNlcnZlci9PQ1NQMEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL2Vzby1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBBBggrBgEFBQcw
+AoY1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9lc28tY2EvcHViL2NhY2VydC9nX2Nh
+Y2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAL10jELuLO7BfdWD2GV/chZe20xt
+M8NthmUA4i6VG9/MRTIFzhR9qwnl0nBQPGCisGH07EU6DvKH6XVMBtW2XidOL2Xq
+vyw9Ztvs5H2ypRnV6FDUKRf1PdbdY6pqTInn5Yt8cw8Rv9h5FDNCXLoLjkRuBNQf
+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>Michael</md:GivenName>
+    <md:SurName>Naumann</md:SurName>
+    <md:EmailAddress>mailto:mnaumann@eso.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Naumann</md:SurName>
+    <md:EmailAddress>mailto:mnaumann@eso.org</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
new file mode 100644
index 00000000..19bf5479
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.essingtoncc.co.uk-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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
+						A1UEAwwVaWRwLmVzc2luZ3RvbmNjLmNvLnVrMSIwIAYJKoZIhvcNAQkBFhNzdXBw
+						b3J0QGFnbTE5NjAuY29tMB4XDTE0MDUwMjEzNDk0N1oXDTI0MDQyOTEzNDk0N1ow
+						gaoxCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1TdGFmZm9yZHNoaXJlMRIwEAYDVQQH
+						DAlFc3Npbmd0b24xKzApBgNVBAoMIkVzc2luZ3RvbiBDb21wdXRlciBDb25zdWx0
+						YW5jeSBMdGQxHjAcBgNVBAMMFWlkcC5lc3Npbmd0b25jYy5jby51azEiMCAGCSqG
+						SIb3DQEJARYTc3VwcG9ydEBhZ20xOTYwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBAMsPBbmhQnhaUeaTfJcOioEIyFDMOEvnKf1bAiFqa3CRw8mX
+						QSFLhOofkLQppkdBgPN+i9kDqc+noa4QXw2gZxzePLiipjJ1oA50FNVhEUd86/cL
+						8gGfrY0Xt0l9JtU7XWGQPAjVv0oAa5FDbEyWBsGkWekD1wxNd3jGDyGDn6/0sxm6
+						jxVExyDp3mzX/v17xsAW+t9+hhvSh8yxSQj+IH9Un5AXq2sPOrya7JgSsHbJl6Ql
+						mnCO12+bHz59F/GTdGtAvz2lQQ/QqVRG8QGqL6Q5xyM1AYq4RxJVRBza1t+LD4u0
+						2yJSstGOWdC4O/T8yiNDQyQt3wOPTrMuBiGiDMcCAwEAATANBgkqhkiG9w0BAQUF
+						AAOCAQEAPsofQ9oo0zDYNV8Yxo+S2xyRV5LqfpamWqclIZs3Mu1Yt4RkopnoiCfv
+						RP/bb6h/hM+5LbCtcl/6HzYuPcJvs3kqKMbOXhVtqR6ad9PYH6gLr3wzaDDioYcC
+						0LMvvhhUUfPFqbkNV7cH1+qRq1SHi9GXWeBeUISrm+gHXsu7CuoY5Cynv5u2ugv1
+						Giv+wxW8FWn4kVV5g77tP/FphuHqeKEAesjOMS2b4MU8DB2ptzj5NfGEmcWpf3cU
+						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>
+						MIID0jCCAroCCQCGyNfhukfamTANBgkqhkiG9w0BAQUFADCBqjELMAkGA1UEBhMC
+						R0IxFjAUBgNVBAgMDVN0YWZmb3Jkc2hpcmUxEjAQBgNVBAcMCUVzc2luZ3RvbjEr
+						MCkGA1UECgwiRXNzaW5ndG9uIENvbXB1dGVyIENvbnN1bHRhbmN5IEx0ZDEeMBwG
+						A1UEAwwVaWRwLmVzc2luZ3RvbmNjLmNvLnVrMSIwIAYJKoZIhvcNAQkBFhNzdXBw
+						b3J0QGFnbTE5NjAuY29tMB4XDTE0MDUwMjEzNDk0N1oXDTI0MDQyOTEzNDk0N1ow
+						gaoxCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1TdGFmZm9yZHNoaXJlMRIwEAYDVQQH
+						DAlFc3Npbmd0b24xKzApBgNVBAoMIkVzc2luZ3RvbiBDb21wdXRlciBDb25zdWx0
+						YW5jeSBMdGQxHjAcBgNVBAMMFWlkcC5lc3Npbmd0b25jYy5jby51azEiMCAGCSqG
+						SIb3DQEJARYTc3VwcG9ydEBhZ20xOTYwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBAMsPBbmhQnhaUeaTfJcOioEIyFDMOEvnKf1bAiFqa3CRw8mX
+						QSFLhOofkLQppkdBgPN+i9kDqc+noa4QXw2gZxzePLiipjJ1oA50FNVhEUd86/cL
+						8gGfrY0Xt0l9JtU7XWGQPAjVv0oAa5FDbEyWBsGkWekD1wxNd3jGDyGDn6/0sxm6
+						jxVExyDp3mzX/v17xsAW+t9+hhvSh8yxSQj+IH9Un5AXq2sPOrya7JgSsHbJl6Ql
+						mnCO12+bHz59F/GTdGtAvz2lQQ/QqVRG8QGqL6Q5xyM1AYq4RxJVRBza1t+LD4u0
+						2yJSstGOWdC4O/T8yiNDQyQt3wOPTrMuBiGiDMcCAwEAATANBgkqhkiG9w0BAQUF
+						AAOCAQEAPsofQ9oo0zDYNV8Yxo+S2xyRV5LqfpamWqclIZs3Mu1Yt4RkopnoiCfv
+						RP/bb6h/hM+5LbCtcl/6HzYuPcJvs3kqKMbOXhVtqR6ad9PYH6gLr3wzaDDioYcC
+						0LMvvhhUUfPFqbkNV7cH1+qRq1SHi9GXWeBeUISrm+gHXsu7CuoY5Cynv5u2ugv1
+						Giv+wxW8FWn4kVV5g77tP/FphuHqeKEAesjOMS2b4MU8DB2ptzj5NfGEmcWpf3cU
+						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:agm@agm1960.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Morris</md:SurName>
+    <md:EmailAddress>mailto:agm@agm1960.com</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
new file mode 100644
index 00000000..b6bac4ed
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.eurecom.fr-idp-shibboleth.xml
@@ -0,0 +1,57 @@
+<?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>
+      <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: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>
+					      MIIDJDCCAgygAwIBAgIVAL0+FcNd+RBrqwXsGlutpKVVG5BzMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5ldXJlY29tLmZyMB4XDTEzMTIxMjA5NTcyN1oX
+DTMzMTIxMjA5NTcyN1owGTEXMBUGA1UEAxMOaWRwLmV1cmVjb20uZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGYpCW+8So7j9MDPjvSzK7ThwTHigN
+9XSgt3xydTOSJdZ2R/0JkZ7mSMoNhb21ZPnOlMntPTG7I5iWKh9O02rHj2/01JzU
+6PmD+hNHI2XWrA6yCarO+6/t38seOPAoBJZJ067UTWQ/Wup7v1aWZ3fgu3Meay0s
+6iwlfUZMVXfDH1DO1kvnhirlXxCBVXwhsXIksje2gsECayHpvPQ7ZyD9pIRGo74I
+NEqXPj5Z9F3XtXngMHdMvDJlWHo3oZ1p/WrQa2jHx0rynFYleEGzms9gtsBWQmtP
+G7JNlLntBsDa2WDmCYc4JoyeH29IVgRSCF8DqHTQpRnFUx1uokFfJjcnAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5ldXJlY29tLmZyhiVodHRwczovL2lkcC5ldXJl
+Y29tLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQXXN9yiNpwBniygQ4M8be1
+VW+n0jANBgkqhkiG9w0BAQUFAAOCAQEAb1oFFcqPKv/IGgsUQCHrHNB5dG3lWCMC
+RotaqTqIQORT0ittxS8JAv53j+tEo/C5BbdHqX2lwJb6qlqpzOb9IRHsJfAhKuXc
+uIgTN3Hp9gdSnT0sFqlffmdqL09u56nJYpgGXx78IcxZ7Q6uVXvjj9/r72i6cMbF
+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://unknown.site.com</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.farn-ct.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.farn-ct.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..70b990c7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.farn-ct.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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>
+      <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
+						CwwLSVQgU2VydmljZXMxGjAYBgNVBAMMEWlkcC5mYXJuLWN0LmFjLnVrMSYwJAYJ
+						KoZIhvcNAQkBFhd3LmhhbHNhbGxAZmFybi1jdC5hYy51azAeFw0xNDAzMDMxMjE4
+						MzhaFw0yNDAyMjkxMjE4MzhaMIG9MQswCQYDVQQGEwJHQjESMBAGA1UECAwJSGFt
+						cHNoaXJlMRQwEgYDVQQHDAtGYXJuYm9yb3VnaDEqMCgGA1UECgwhRmFybmJvcm91
+						Z2ggQ29sbGVnZSBvZiBUZWNobm9sb2d5MRQwEgYDVQQLDAtJVCBTZXJ2aWNlczEa
+						MBgGA1UEAwwRaWRwLmZhcm4tY3QuYWMudWsxJjAkBgkqhkiG9w0BCQEWF3cuaGFs
+						c2FsbEBmYXJuLWN0LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAw3S9I4W4QmKzx4xKCW/RRmBwyNJaUSe7idAWZvh/4g3pG4ZqfvjTiwHPH2QF
+						hHwl6+BH52jfpCMliKwYh+JyN0dStTdyvz96/G7fyBb4ZZouVuh1BOX0F8Uz8xKA
+						FqJ4iS4ld9YgBhT9F57W0uGLmS4Jy0W6BWv2lPmv1OMZaL3c2CQizLs2wV0GcVxx
+						KJgdVCoopE0nqi6PIBehlU2cSuluiclfojFmRLaEv8T/6C/b+MogfqR+s93RwMrn
+						7v3+G6xURcDaT+OMXP7sIT/0St28+MPR+rEwbZPNjkhTnoUnPhAWl6ZZTHM46nbN
+						hNr4vlJL+ZGqocmQI3seEyXboQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCW+V0X
+						iZ1t1PpdU0b7hgZAG0qh6R7UmUY5Baxtp4FIN1WebvnSr0keskwff59iIHeZ4/Km
+						u4Q7fkvghlteTti7r2LTS47CASwKi1UrtvmNMerSmdYeDYeymt94LXiTzK9dlXRW
+						ZYM5LPHeEIoHOFeRvwnXACKvJs0y4MwshxDGn4WIfLKj+z9y/FRsohRlxQihFx5y
+						qwjP8f2vXwGgZnM1WvcyH+Q/uhypmjdKmI1OkevgTclBZC8m6OJz0bwKqVnRD9AZ
+						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>
+						MIID+DCCAuACCQDiBNfRRk2CeTANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
+						R0IxEjAQBgNVBAgMCUhhbXBzaGlyZTEUMBIGA1UEBwwLRmFybmJvcm91Z2gxKjAo
+						BgNVBAoMIUZhcm5ib3JvdWdoIENvbGxlZ2Ugb2YgVGVjaG5vbG9neTEUMBIGA1UE
+						CwwLSVQgU2VydmljZXMxGjAYBgNVBAMMEWlkcC5mYXJuLWN0LmFjLnVrMSYwJAYJ
+						KoZIhvcNAQkBFhd3LmhhbHNhbGxAZmFybi1jdC5hYy51azAeFw0xNDAzMDMxMjE4
+						MzhaFw0yNDAyMjkxMjE4MzhaMIG9MQswCQYDVQQGEwJHQjESMBAGA1UECAwJSGFt
+						cHNoaXJlMRQwEgYDVQQHDAtGYXJuYm9yb3VnaDEqMCgGA1UECgwhRmFybmJvcm91
+						Z2ggQ29sbGVnZSBvZiBUZWNobm9sb2d5MRQwEgYDVQQLDAtJVCBTZXJ2aWNlczEa
+						MBgGA1UEAwwRaWRwLmZhcm4tY3QuYWMudWsxJjAkBgkqhkiG9w0BCQEWF3cuaGFs
+						c2FsbEBmYXJuLWN0LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAw3S9I4W4QmKzx4xKCW/RRmBwyNJaUSe7idAWZvh/4g3pG4ZqfvjTiwHPH2QF
+						hHwl6+BH52jfpCMliKwYh+JyN0dStTdyvz96/G7fyBb4ZZouVuh1BOX0F8Uz8xKA
+						FqJ4iS4ld9YgBhT9F57W0uGLmS4Jy0W6BWv2lPmv1OMZaL3c2CQizLs2wV0GcVxx
+						KJgdVCoopE0nqi6PIBehlU2cSuluiclfojFmRLaEv8T/6C/b+MogfqR+s93RwMrn
+						7v3+G6xURcDaT+OMXP7sIT/0St28+MPR+rEwbZPNjkhTnoUnPhAWl6ZZTHM46nbN
+						hNr4vlJL+ZGqocmQI3seEyXboQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCW+V0X
+						iZ1t1PpdU0b7hgZAG0qh6R7UmUY5Baxtp4FIN1WebvnSr0keskwff59iIHeZ4/Km
+						u4Q7fkvghlteTti7r2LTS47CASwKi1UrtvmNMerSmdYeDYeymt94LXiTzK9dlXRW
+						ZYM5LPHeEIoHOFeRvwnXACKvJs0y4MwshxDGn4WIfLKj+z9y/FRsohRlxQihFx5y
+						qwjP8f2vXwGgZnM1WvcyH+Q/uhypmjdKmI1OkevgTclBZC8m6OJz0bwKqVnRD9AZ
+						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>
diff --git a/swamid-interfederations-2.0/idp.farnborough.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.farnborough.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..e798d654
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.farnborough.ac.uk-shibboleth.xml
@@ -0,0 +1,57 @@
+<?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>
+      <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>
+						MIIDcDCCAligAwIBAgIIL2mEl0oUtHAwDQYJKoZIhvcNAQEFBQAwTzErMCkGA1UE
+						CgwiVGhlIFNpeHRoIEZvcm0gQ29sbGVnZSBGYXJuYm9yb3VnaDEgMB4GA1UEAwwX
+						bG9naW4uZmFybmJvcm91Z2guYWMudWswHhcNMTMwMjA4MTU0NDEwWhcNMjMwMjA4
+						MTU0NDEwWjBPMSswKQYDVQQKDCJUaGUgU2l4dGggRm9ybSBDb2xsZWdlIEZhcm5i
+						b3JvdWdoMSAwHgYDVQQDDBdsb2dpbi5mYXJuYm9yb3VnaC5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRVMpKY0pRwd8ia8sEN5DpxKvSIBmxq
+						BuK/7SOhA5zQvifhWPOezXNxBBEaSmnt7/5H/TRdVOcyO6drd+spmqlZ0RrciBOL
+						ASbaU42liQfwUq3MRreefgFxaoio8DDN3VPtb5M/U2WR0bTduCBV2EaoODHKHtuD
+						M2NJsEYs4qHUiTR5Hnzr4Yweg+TUACHnrYfL3V+C79cTdkYbvEESdx4kavVPDRIr
+						m1j6nH7iKWvJR2AECI19WeRyIbTFMqQIYvHqIcCjf1KC/U1sq3gOkxEULDoxo0iV
+						+cHgTj17D83ytp5bZMTv9CNznRvtQy3jR5A3kPeEHWT2QZRPnFrwnC0CAwEAAaNQ
+						ME4wHQYDVR0OBBYEFPfWxt/apKNnKbzYtLQ0V1yHWa+uMB8GA1UdIwQYMBaAFPfW
+						xt/apKNnKbzYtLQ0V1yHWa+uMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAH4/t3tZRL+l9A5KQPO4gvJNuDwzBOjcH6mAg2ShAjx3PQhC98zN1u5lzQGs
+						b01J4jMZoXM+k3zJU8TNKxm7fKK2/lVE2HtI5Bl7IrFJ/Tdl2n6pbCkRX78ZrDXo
+						nOkdd31uvbwIHurMBxe0mVEhyrZ+VXr5u8XBnnHgANOU6hzQrwTJsXEmHDLjytbw
+						hFQ66uuWGMtgbHjRhZ6r8xn04af3JCFY+WToDjTAgeGGU7D4qa59j0aGyy4D3raP
+						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>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index d1484c93..5f359738 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -1,404 +1,413 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.feide.no">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.feide.no">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">aal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">agdenes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">aho.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">alstahaug.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">alvdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">andebu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">aremark.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">arendal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">as-skole.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">asker.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">askim.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">askoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">askvoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">asnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">aure.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">austagderfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">austevoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">austrheim.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">averoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">baerum.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">balestrand.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">balsfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bamble.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bardu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bergensskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">berlevag.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">betanien.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bi.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bibsys.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bo.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">boe.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bokn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bomlo.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bremanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">diakonhjemmet.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">diakonova.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">dmmh.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">donna.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">dovreskulane.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">drammen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">dvm.iktsenteret.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">eid.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">eideskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">eidfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">eidsberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">eidskog.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">eidsvoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">elverum.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">enebakk.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">etne.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">etnedal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">evenes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fedje.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.afjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.ahk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.amot.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.farsund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.harstad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.kg.vgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.levanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.lund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.mosseskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.nesodden.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.nlm.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.oknett.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.osen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.osloskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.rade.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.ringerike.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.rissa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.roan.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.roros.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.rygge.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.sarpsborg.com</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.skedsmo.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.ski.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.stord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.stranda.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.trysil.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.verdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fet.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ffk.vgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fitjar.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fjaler.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fjell.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fjellhaug.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">flaa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">flatanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">flesberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">flora.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">folkeuniversitetet.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">folldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">forde.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">forsand.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fosnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">frana.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">frogn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">froland.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">frosta.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">froya.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fusa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gaular.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">giske.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gjemnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gjerdrum.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gjesdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gloppen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gol.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gran.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">grane.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">granvin.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">grimstad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">grong.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gs.alesund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gs.haram.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gs.skodje.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gs.sula.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gulen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ha.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hadsel.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">haldenskole.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">halsa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hamar.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hammerfest.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">haraldsplass.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hattfjelldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">haugesund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hbv.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hedmark.org</shibmd:Scope>
-      <shibmd:Scope regexp="false">hemne.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hemnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hemsedal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">heroy-no.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">heroy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hials.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hib.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hibu.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hig.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hih.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hihm.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hil.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">himolde.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hin.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hinesna.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hint.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hioa.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hiof.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hisf.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hist.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hit.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hitra.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hive.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hivolda.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hjartdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hjelmeland.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hobol.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hol.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">holeskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hornindal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">horten.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hoyanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hoylandet.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hsh.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hurdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hurum.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hyllestad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">iktsenteret.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">jolster.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">jondal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kafjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">karasjok.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">karlsoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">karmoyskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">khib.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">khio.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">klabu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">klepp.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kongsberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kongsvinger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kristiansand.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kristiansund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kvafjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kvam.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kvanangen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kvinnherad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kvn.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lardal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">larvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lavangen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ldh.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">leikanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">leirfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lenvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lesjaskulane.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lier.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lierne.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lillesand.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lindas.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lomskulane.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">loppa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">loten.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lunner.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">luster.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lybskole.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lyngdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lyngen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">malselv.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">malvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">marker.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">masfjorden.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">meland.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">melhus.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">meraker.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">met.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">mf.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">mhs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">midsund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">modalen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">mrfylke.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">namdalseid.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">namsos.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">namsskogan.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nannestad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">narvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">naustdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nb.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nedre-eiker.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nes-ak.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nes-bu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nesset.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nhh.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nih.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nissedal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nith.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nla.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nmbu.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nmh.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nome.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nordkapp.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nordreisa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">notodden.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">notteroy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ntfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ntnu.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nvh.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oddaskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oksnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oppdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oppland.org</shibmd:Scope>
-      <shibmd:Scope regexp="false">os-ho.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">osteroy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">overhalla.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ovgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oygarden.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">phs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">porsanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">radoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ralingen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rana.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">randaberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rauma.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">re.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rendalen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rennebu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rennesoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ringebu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ringsaker.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rogfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rollag.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">romskog.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">royken.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">royrvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">salangen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">saltdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">samfunnsforskning.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sami.vgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">samisk.vgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">samiskhs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">samnanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sande.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sandefjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sandnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sauda.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sauherad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">selbu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">selje.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">seljord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">selskolene.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sfj.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skanland.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skaun.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skiptvet.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skjaakskulane.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skjervoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skole.fredrikstad.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skole.svk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skoler.alta.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">smola.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">snasa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">snillfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sogndal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sola.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">solund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sonans.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">songdalen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sortland.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sorum.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">spusers.feide.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">spydeberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stange.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stavanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">steinkjer.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stjordal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stokke.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">storfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stpaul.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">strand.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stryn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">suldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sunndal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">surnadal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">svelvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">t-fk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">time.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tingvoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tinn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tjome.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tokke.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tolga.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tonsberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">torsken.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">trogstad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">troms.vgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tromso.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">trondheim.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tydal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tynset.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tysnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tysver.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uia.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uib.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uin.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uio.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uis.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uit.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ullensaker.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ullensvang.herad.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ulvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">umb.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uninett.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">utsira.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vaalerskolene.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vaf.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vaga.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vagan.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vagsoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vaksdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">valer-of.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vang.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vefsn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vestby.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vestvagoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vgsa.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vindafjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vinje.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">voss.kommune.no</shibmd:Scope>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
-      </saml:Attribute>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Feide</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">Feide</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="nn">Feide</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Feide is the login system for norwegian educational and research institusions.</mdui:Description>
+        <mdui:Description xml:lang="no">Feide er innloggingssiden for norske utdannings- og forskningsinstitusjoner.</mdui:Description>
+        <mdui:Description xml:lang="nn">Feide er innloggingssida for norske utdannings- og forskningsinstitusjonar.</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agdenes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aho.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alstahaug.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">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">bo.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">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">eid.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eideskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidsberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidskog.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidsvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elverum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enebakk.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etne.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etnedal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evenes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fedje.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.afjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ahk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.amot.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.farsund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.harstad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.kg.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.levanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.lund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.mosseskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nesodden.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nlm.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.oknett.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osloskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rade.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ringerike.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rissa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roan.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roros.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rygge.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.sarpsborg.com</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.skedsmo.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ski.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stranda.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.trysil.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.verdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fet.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffk.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fitjar.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjaler.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjell.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjellhaug.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flaa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flatanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flesberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flora.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">folkeuniversitetet.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">frana.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frogn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frosta.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froya.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fusa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gaular.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">giske.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjemnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjerdrum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjesdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gloppen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gol.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gran.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grane.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">granvin.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grimstad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grong.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.alesund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.haram.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.skodje.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.sula.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gulen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ha.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hadsel.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haldenskole.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halsa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hamar.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hammerfest.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haraldsplass.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hattfjelldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haugesund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hbv.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hedmark.org</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">hibu.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hih.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hihm.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hil.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">himolde.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hin.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hinesna.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hint.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hioa.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hiof.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hisf.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hist.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hit.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hitra.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hive.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hivolda.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjartdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjelmeland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hobol.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hol.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holeskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hornindal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">horten.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoyanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoylandet.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hurum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hyllestad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iktsenteret.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jolster.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jondal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">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">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">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">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">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">nesset.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nhh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nih.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nissedal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nith.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nla.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmbu.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">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">ntnu.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nvh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oddaskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oksnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppland.org</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ho.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osteroy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">overhalla.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oygarden.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">porsanger.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">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">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">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">sortland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sorum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spusers.feide.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spydeberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stange.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stavanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">steinkjer.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stjordal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stokke.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">storfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stpaul.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stryn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunndal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surnadal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svelvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">t-fk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">time.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tingvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tinn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tjome.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tokke.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">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">ulvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umb.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uninett.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsira.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaalerskolene.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaf.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaga.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagan.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagsoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaksdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">valer-of.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vang.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vefsn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestby.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestvagoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vgsa.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIDhjCCAm4CCQCZwrMQOJ3URzANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVW5pbmV0dCBBUzEOMAwGA1UECxMFRkVJREUxFTATBgNVBAMTDGlkcC5mZWlkZS5ubzElMCMGCSqGSIb3DQEJARYWbW9yaWEtZHJpZnRAdW5pbmV0dC5ubzAeFw0xNDA0MTEwOTM1MTBaFw0zNDA0MTEwOTM1MTBaMIGEMQswCQYDVQQGEwJOTzESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVbmluZXR0IEFTMQ4wDAYDVQQLEwVGRUlERTEVMBMGA1UEAxMMaWRwLmZlaWRlLm5vMSUwIwYJKoZIhvcNAQkBFhZtb3JpYS1kcmlmdEB1bmluZXR0Lm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3UtSny6D+DRQzdjWOdd+eQZxa9aKrx/v70Uo+yvnzgenLLS+MsUxbiSLkAPIbkWOO2kLdG9XSZ9sp9S5aGYMnsarxeGEXV1AS6olrpo5QJOZoQStFB0dYEXzBSJifTIsEmyXByd8mE64dkMcdzG90eBzfcFNwU6vKjln0vmoDocJrKZvUoF7d1egD+aUa9o3BneMDylcp8mkCe6XcnPlJ8QqxQ/RBmaly/Hl/zTZei8+pEu7ICRiorD2iHEDM/EhsclOrMKiRFBuZN8yB4sgknhdmAiWRyB/D4CEj74MQDQPp7Mr1B0Vxn7Y7ZeStt19HxEjzxyJGsdC9BMrn+tzwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwZmzNzTgbYAuQGikkRbKInog5OCMo3GhZO82+IrtasJC6rNPrz/+8KHfIOUB83wnfEMnKKygW7ELeSnvlbKUyve6DbNXrHjMJYzjqLG3cdgIKZaFyTfWaQiY8G82qP38Lc7rtgLoh/F7lpqCdunzPfSQBraGH2IAHyP6x3tjlsGGTj/LN8sT20iHRk8IXsBsMGv5DcZ4n+zB2E5hyfxH87sNYu6gaIrpcxcv5N0AK++fvpnrhlEmT0rW7b8wgBB4BmaPfCCb4DbDgHvIBPmG8QF7SNjUGuVPUFJRPTkvhighbeuRtoNpq0W1EVXKq0ZeBO8jJ6Si9LAdFvqwy70D0</ds:X509Certificate>
         </ds:X509Data>
@@ -408,10 +417,10 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Feide - Norwegian Educational and Research Institusions</md:OrganizationName>
-    <md:OrganizationName xml:lang="no">Feide - Norske utdannings og forsknings-institusjoner</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Feide - Norwegian Educational and Research Institusions</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="no">Feide - Norske utdannings og forsknings-institusjoner</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Feide</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">Feide</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Feide</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">Feide</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.feide.no/introducing-feide</md:OrganizationURL>
     <md:OrganizationURL xml:lang="no">http://www.feide.no/</md:OrganizationURL>
   </md:Organization>
@@ -419,8 +428,4 @@
     <md:GivenName>Feide Support</md:GivenName>
     <md:EmailAddress>support@feide.no</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Feide Support</md:GivenName>
-    <md:EmailAddress>support@feide.no</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fgu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fgu.cas.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..3ceb2573
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.fgu.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDIzCCAgugAwIBAgIUW8Fvk+9NuCdYJn9rrxSID4QcQWUwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLmZndS5jYXMuY3owHhcNMTQwNTE2MDcwMjEzWhcN
+MzQwNTE2MDcwMjEzWjAZMRcwFQYDVQQDEw5pZHAuZmd1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALqySf+1bTV+w3dZgWBv7N697eGABM+v
+ktmLnnyfLT9jlyGPH/kK/cGHdjVvAObBTP+igmarMWKuZM2TF9E0Onlgv9lwLOrF
+N5mltg3+PH/C1pawJWY80yx2OWB4F9a/6X69TUPPV+ZmYX8O6ivEsvlN6dTCnRma
+Ou4U1lUpVlLGvYMuyDlt6ES+GGW73D+v7TW+oz5FHdidCWIJ8L2hYyjkn21O+IEI
+mFMi9gMYh09tWcPzn6t3H8JBUDY6iovnNAfUtdTY/rcH86YCQ42Hv2snpsjUiDTl
+n2G1TgRMq09iX8OGQSxcY4YDUHx5DzzrYSZcIlERS6MXyFnE+knavisCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLmZndS5jYXMuY3qGJWh0dHBzOi8vaWRwLmZndS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCRKRKtvKnxOQZHYF1aSsGu9
+Ge2oMA0GCSqGSIb3DQEBBQUAA4IBAQCJ8ZeUl6jKt3ecQjX0gUsBEePJOREHlTtG
+AAb67oxhH9Mm/Z/5Qu5tvBoI7U+lncj/1gAf8FObQlUu4CSc02f5DeS0F80MAg3h
+/OAvZq85zFMJfhlbBQHdOtNqNROLwIu34JvIz+ukc2DG25weY/lgvU6ulUICkgd9
+9U1V77HhjdIIm5JYfTzKC3Iwss2/OT1WaY5esO+stlchg3D8kyKRlm2bG+WlWqAp
+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>
+MIIDIzCCAgugAwIBAgIUW8Fvk+9NuCdYJn9rrxSID4QcQWUwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLmZndS5jYXMuY3owHhcNMTQwNTE2MDcwMjEzWhcN
+MzQwNTE2MDcwMjEzWjAZMRcwFQYDVQQDEw5pZHAuZmd1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALqySf+1bTV+w3dZgWBv7N697eGABM+v
+ktmLnnyfLT9jlyGPH/kK/cGHdjVvAObBTP+igmarMWKuZM2TF9E0Onlgv9lwLOrF
+N5mltg3+PH/C1pawJWY80yx2OWB4F9a/6X69TUPPV+ZmYX8O6ivEsvlN6dTCnRma
+Ou4U1lUpVlLGvYMuyDlt6ES+GGW73D+v7TW+oz5FHdidCWIJ8L2hYyjkn21O+IEI
+mFMi9gMYh09tWcPzn6t3H8JBUDY6iovnNAfUtdTY/rcH86YCQ42Hv2snpsjUiDTl
+n2G1TgRMq09iX8OGQSxcY4YDUHx5DzzrYSZcIlERS6MXyFnE+knavisCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLmZndS5jYXMuY3qGJWh0dHBzOi8vaWRwLmZndS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCRKRKtvKnxOQZHYF1aSsGu9
+Ge2oMA0GCSqGSIb3DQEBBQUAA4IBAQCJ8ZeUl6jKt3ecQjX0gUsBEePJOREHlTtG
+AAb67oxhH9Mm/Z/5Qu5tvBoI7U+lncj/1gAf8FObQlUu4CSc02f5DeS0F80MAg3h
+/OAvZq85zFMJfhlbBQHdOtNqNROLwIu34JvIz+ukc2DG25weY/lgvU6ulUICkgd9
+9U1V77HhjdIIm5JYfTzKC3Iwss2/OT1WaY5esO+stlchg3D8kyKRlm2bG+WlWqAp
+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>
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
new file mode 100644
index 00000000..29b15047
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.fh-kaernten.at-idp-shibboleth.xml
@@ -0,0 +1,109 @@
+<?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:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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>
+      <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
+BQAwHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0MB4XDTEyMDIyNDE3MDU0
+MFoXDTMyMDIyNDE3MDU0MFowHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8n3/PizxIqujmwiw9+j2
+L4FvY33oS7zmH5fvav6ueKhloSe5R2S38ZB8lVhYphCefP/xMI1pHpBKfo3zU1Bh
+H4NdBLkwOjVDnzzz1n1R8HkAzLqP8J3WJsGT0THmFayLM/j9a+w7KGuFMy17hsVT
+uQOX+cjld3pygA/963/ot7pFu+VFg7B3SExB0x8HAMk9sNVUkiKFvLvWhJXNo8hG
+771E/qLA75V6nSXrGz0H0dkruetZgMOa26fLfI45uewpOf+HkO0C22QoSyPme8E7
+PacHgOpNfGZ7IOkP3zGpN/FsWOAz6AgzIi2HVB+zzzR1o4Ld+EPqHD6rPTt74iu2
+AQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuZmgta2Flcm50ZW4uYXSGKWh0dHBz
+Oi8vaWRwLmZoLWthZXJudGVuLmF0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTb
+iBO8Agzf1pKgqIki5BmdLEUXcTANBgkqhkiG9w0BAQUFAAOCAQEAyJQN13Zh7wRl
+msdIw8MJPhHEmdDr5zSrOnGiiXaNgaojdJClYaMHPFPqiVUkna8BGQvOYfqdOY7j
+EsrtrABQxdGExCdsumhUjQXvinZDz0Y/k/gZ+Fmpc7V95ny7CvkC8PA+LiAocJJH
+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: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://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
+L4FvY33oS7zmH5fvav6ueKhloSe5R2S38ZB8lVhYphCefP/xMI1pHpBKfo3zU1Bh
+H4NdBLkwOjVDnzzz1n1R8HkAzLqP8J3WJsGT0THmFayLM/j9a+w7KGuFMy17hsVT
+uQOX+cjld3pygA/963/ot7pFu+VFg7B3SExB0x8HAMk9sNVUkiKFvLvWhJXNo8hG
+771E/qLA75V6nSXrGz0H0dkruetZgMOa26fLfI45uewpOf+HkO0C22QoSyPme8E7
+PacHgOpNfGZ7IOkP3zGpN/FsWOAz6AgzIi2HVB+zzzR1o4Ld+EPqHD6rPTt74iu2
+AQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuZmgta2Flcm50ZW4uYXSGKWh0dHBz
+Oi8vaWRwLmZoLWthZXJudGVuLmF0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTb
+iBO8Agzf1pKgqIki5BmdLEUXcTANBgkqhkiG9w0BAQUFAAOCAQEAyJQN13Zh7wRl
+msdIw8MJPhHEmdDr5zSrOnGiiXaNgaojdJClYaMHPFPqiVUkna8BGQvOYfqdOY7j
+EsrtrABQxdGExCdsumhUjQXvinZDz0Y/k/gZ+Fmpc7V95ny7CvkC8PA+LiAocJJH
+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: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">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.html</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 9595</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
new file mode 100644
index 00000000..20f8d4e1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml
@@ -0,0 +1,226 @@
+<?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>
+      <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>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
+MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
+bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
+8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
+tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
+SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
+4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
+YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
+biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
+ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
+cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
+cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
+MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
+dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
+cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
+hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
+ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
+gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
+oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
+yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
+f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
+4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
+nflFJg==
+</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>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
+MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
+bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
+8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
+tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
+SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
+4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
+YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
+biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
+ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
+cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
+cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
+MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
+dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
+cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
+hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
+ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
+gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
+oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
+yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
+f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
+4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
+nflFJg==
+</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:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.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>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
+MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
+bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
+8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
+tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
+SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
+4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
+YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
+biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
+ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
+cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
+cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
+MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
+dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
+cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
+hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
+ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
+gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
+oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
+yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
+f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
+4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
+nflFJg==
+</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>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
+MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
+bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
+8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
+tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
+SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
+4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
+YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
+biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
+ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
+cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
+cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
+MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
+dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
+cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
+hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
+ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
+gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
+oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
+yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
+f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
+4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
+nflFJg==
+</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>
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
new file mode 100644
index 00000000..15a2c5f0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.fzu.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDJDCCAgygAwIBAgIVAMXPvsGlLRsX7hPpMRUVsTPL9MPjMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5menUuY2FzLmN6MB4XDTE0MDMxMjExMDc0NloX
+DTM0MDMxMjExMDc0NlowGTEXMBUGA1UEAxMOaWRwLmZ6dS5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmAUy5v5OguNKkfufBQPmszJ3GgMqf
+tFaLshqlu0D4IPwaHk76cXqMzp0l/tUMuhKyXxaQ1X/3cVPDJKkxqNCjE7etqnj1
+fz1FnRP/rJGpbacmAT2T3IqHKZpatJV6kbWxOOytOdJk4Uadmap4mAyHLISYyhpD
+sgWxcioFCsbtTPmM8GVKfj1IlnGYD19nKm7D9ocF5gCy9dbQZ/QyvOAd+jMDHGJ+
+n59nJD+GjwpdoDOB7agHhn7806Ui98lo8XK1SeSo47FFCMhwgeB59KjUzlySEEDv
+Zn8/HM3nJWQ54/ty/qknoWDnh2cNGLS2EdWCu9FNNGcfdJGg41ipvD0DAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5menUuY2FzLmN6hiVodHRwczovL2lkcC5menUu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQfOSvunhqNoO2v13uWFsFu
+qYqDUzANBgkqhkiG9w0BAQUFAAOCAQEAjTGlMBUwRmH8nt9WDJSKaZU6rRcqY9Yi
+h+GrzpduiAz8WQcMD6ijUcOZuBRNpXZ5vOWPNtIWCoG8W7xxqRBVwROsczGaBQbf
+lo5uEzDGMVBh9tkqhwnXev1YbGai/K/frBQP5Ck1z9OAWwrGvlZnc1OM54ChKFYs
+TvwRI12g6UcV7OCIOc6Iq3xXMtP6H2A71KexofWNosrwMi7GMErnL3p8vc58akrs
+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>
+MIIDJDCCAgygAwIBAgIVAMXPvsGlLRsX7hPpMRUVsTPL9MPjMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5menUuY2FzLmN6MB4XDTE0MDMxMjExMDc0NloX
+DTM0MDMxMjExMDc0NlowGTEXMBUGA1UEAxMOaWRwLmZ6dS5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmAUy5v5OguNKkfufBQPmszJ3GgMqf
+tFaLshqlu0D4IPwaHk76cXqMzp0l/tUMuhKyXxaQ1X/3cVPDJKkxqNCjE7etqnj1
+fz1FnRP/rJGpbacmAT2T3IqHKZpatJV6kbWxOOytOdJk4Uadmap4mAyHLISYyhpD
+sgWxcioFCsbtTPmM8GVKfj1IlnGYD19nKm7D9ocF5gCy9dbQZ/QyvOAd+jMDHGJ+
+n59nJD+GjwpdoDOB7agHhn7806Ui98lo8XK1SeSo47FFCMhwgeB59KjUzlySEEDv
+Zn8/HM3nJWQ54/ty/qknoWDnh2cNGLS2EdWCu9FNNGcfdJGg41ipvD0DAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5menUuY2FzLmN6hiVodHRwczovL2lkcC5menUu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQfOSvunhqNoO2v13uWFsFu
+qYqDUzANBgkqhkiG9w0BAQUFAAOCAQEAjTGlMBUwRmH8nt9WDJSKaZU6rRcqY9Yi
+h+GrzpduiAz8WQcMD6ijUcOZuBRNpXZ5vOWPNtIWCoG8W7xxqRBVwROsczGaBQbf
+lo5uEzDGMVBh9tkqhwnXev1YbGai/K/frBQP5Ck1z9OAWwrGvlZnc1OM54ChKFYs
+TvwRI12g6UcV7OCIOc6Iq3xXMtP6H2A71KexofWNosrwMi7GMErnL3p8vc58akrs
+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>
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
new file mode 100644
index 00000000..fd02b6f0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.gakunin.nii.ac.jp-idp-shibboleth.xml
@@ -0,0 +1,117 @@
+<?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>
+      <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
+BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxKjAoBgNVBAoTIU5hdGlvbmFsIEluc3Rp
+dHV0ZSBvZiBJbmZvcm1hdGljczEgMB4GA1UEAxMXTklJIE9wZW4gRG9tYWluIENB
+IC0gRzQwHhcNMTUwMjA0MDgwNzAzWhcNMTcwMzA2MDgwNzAzWjCBqTELMAkGA1UE
+BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxKjAoBgNVBAoTIU5hdGlvbmFsIEluc3Rp
+dHV0ZSBvZiBJbmZvcm1hdGljczE8MDoGA1UECxMzQ3liZXIgU2NpZW5jZSBJbmZy
+YXN0cnVjdHVyZSBEZXZlbG9wbWVudCBEZXBhcnRtZW50MR4wHAYDVQQDExVpZHAu
+Z2FrdW5pbi5uaWkuYWMuanAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDXXwFpWC18sK3XbwBgN5HCYCS79K85nL9v95nVJzQoWrihKuEEMgd6gzo0fjk6
+j6fb3/CZwihxnzMExyhadH6zC84Q92B7riSpv+gABvJW6no5js9gmDUqkyUG9qaS
+QSQtqNv/RKsuCRW79xeiYZnCMFvUEXiOQ4zFFAZX00ywz9jxWP7E56yAKHyLBgNl
+ZFGTKAFH0W35831dWlj3HsU0sbpoBiSrWSXvx7lJefifK5vqQc7tuDSx0kRa/aqT
+7fb6cq8EQURzdcuQnIFaUaKRggeV1VOBk7fMNuL6dSz0zFRtnS+bBZbJ+1GQJ/0+
+HatU3vCzfpuuLy/C9AHIUOQ9AgMBAAGjggF7MIIBdzAdBgNVHSUEFjAUBggrBgEF
+BQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUGQtvOR8xAzRf5NJAHzfmjediOXww
+SgYDVR0fBEMwQTA/oD2gO4Y5aHR0cDovL3JlcG8xLnNlY29tdHJ1c3QubmV0L3Nw
+cGNhL25paS9vZGNhMy9mdWxsY3JsZzQuY3JsMA4GA1UdDwEB/wQEAwIFoDAdBgNV
+HQ4EFgQUXtG5Fo87Sb3QyTZYKnEj9dGy1QwwWgYDVR0gBFMwUTBPBgwrBgEEAYH8
+CAMCAQEwPzA9BggrBgEFBQcCARYxaHR0cHM6Ly9yZXBvMS5zZWNvbXRydXN0Lm5l
+dC9zcGNwcC9jcHMvaW5kZXguaHRtbDA8BggrBgEFBQcBAQQwMC4wLAYIKwYBBQUH
+MAGGIGh0dHA6Ly9uaWlnNC5vY3NwLnNlY29tdHJ1c3QubmV0MCAGA1UdEQQZMBeC
+FWlkcC5nYWt1bmluLm5paS5hYy5qcDANBgkqhkiG9w0BAQsFAAOCAQEAIu3RKglN
+OD7MqWIlsOAMu+DuNRUgp7pb378ZWIAUjl8EkTrQxEPkkoLhq9DW5lgzL7ZnLEyf
+/abCfJrFtgkGEDg9y1iT0RsDa0vpnC6wzaGcC3U0dgOW+R3SHqrXtMl+Rj/bbOCW
+0BWHGatck3VuOAc88RcDREd56JCg/wSdUYjYFpmnlqHgg7a99v0AEVS4KK1vZE+u
+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
+BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxKjAoBgNVBAoTIU5hdGlvbmFsIEluc3Rp
+dHV0ZSBvZiBJbmZvcm1hdGljczEgMB4GA1UEAxMXTklJIE9wZW4gRG9tYWluIENB
+IC0gRzQwHhcNMTUwMjA0MDgwNzAzWhcNMTcwMzA2MDgwNzAzWjCBqTELMAkGA1UE
+BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxKjAoBgNVBAoTIU5hdGlvbmFsIEluc3Rp
+dHV0ZSBvZiBJbmZvcm1hdGljczE8MDoGA1UECxMzQ3liZXIgU2NpZW5jZSBJbmZy
+YXN0cnVjdHVyZSBEZXZlbG9wbWVudCBEZXBhcnRtZW50MR4wHAYDVQQDExVpZHAu
+Z2FrdW5pbi5uaWkuYWMuanAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDXXwFpWC18sK3XbwBgN5HCYCS79K85nL9v95nVJzQoWrihKuEEMgd6gzo0fjk6
+j6fb3/CZwihxnzMExyhadH6zC84Q92B7riSpv+gABvJW6no5js9gmDUqkyUG9qaS
+QSQtqNv/RKsuCRW79xeiYZnCMFvUEXiOQ4zFFAZX00ywz9jxWP7E56yAKHyLBgNl
+ZFGTKAFH0W35831dWlj3HsU0sbpoBiSrWSXvx7lJefifK5vqQc7tuDSx0kRa/aqT
+7fb6cq8EQURzdcuQnIFaUaKRggeV1VOBk7fMNuL6dSz0zFRtnS+bBZbJ+1GQJ/0+
+HatU3vCzfpuuLy/C9AHIUOQ9AgMBAAGjggF7MIIBdzAdBgNVHSUEFjAUBggrBgEF
+BQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUGQtvOR8xAzRf5NJAHzfmjediOXww
+SgYDVR0fBEMwQTA/oD2gO4Y5aHR0cDovL3JlcG8xLnNlY29tdHJ1c3QubmV0L3Nw
+cGNhL25paS9vZGNhMy9mdWxsY3JsZzQuY3JsMA4GA1UdDwEB/wQEAwIFoDAdBgNV
+HQ4EFgQUXtG5Fo87Sb3QyTZYKnEj9dGy1QwwWgYDVR0gBFMwUTBPBgwrBgEEAYH8
+CAMCAQEwPzA9BggrBgEFBQcCARYxaHR0cHM6Ly9yZXBvMS5zZWNvbXRydXN0Lm5l
+dC9zcGNwcC9jcHMvaW5kZXguaHRtbDA8BggrBgEFBQcBAQQwMC4wLAYIKwYBBQUH
+MAGGIGh0dHA6Ly9uaWlnNC5vY3NwLnNlY29tdHJ1c3QubmV0MCAGA1UdEQQZMBeC
+FWlkcC5nYWt1bmluLm5paS5hYy5qcDANBgkqhkiG9w0BAQsFAAOCAQEAIu3RKglN
+OD7MqWIlsOAMu+DuNRUgp7pb378ZWIAUjl8EkTrQxEPkkoLhq9DW5lgzL7ZnLEyf
+/abCfJrFtgkGEDg9y1iT0RsDa0vpnC6wzaGcC3U0dgOW+R3SHqrXtMl+Rj/bbOCW
+0BWHGatck3VuOAc88RcDREd56JCg/wSdUYjYFpmnlqHgg7a99v0AEVS4KK1vZE+u
+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>Hideaki</md:GivenName>
+    <md:SurName>NODA</md:SurName>
+    <md:EmailAddress>mailto:gakunin-help@nii.ac.jp</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
new file mode 100644
index 00000000..ee6807dd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.geo-zs.si-idp-20110325.xml
@@ -0,0 +1,75 @@
+<?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>
+      <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,iVBORw0KGgoAAAANSUhEUgAAAIEAAACWCAYAAAD5c+tzAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAEBUSURBVHhe7V0HgFXF1f7eFnrvTbqIIApIEwUVFBs27FEjavS3oCbWEKOYGHtvESsYrAhYAAuKiIqgiAUQRRARBQHpdWHL+893zsy79713l92FxYDZ7+7szJl275vvzJmZW2MNGjSI5+bmoqCgAGX430JGRgbKlSuHWK1ateIrV6500WX4X0Pt2rWRUWYB/rdB/jNcuAy/M+Tn5+OQQw7B22+/7WIKR6xGjRrx1atXO7EMvxfEYjEXAuLxuAulo2bNmmWW4PeIsAIUB2VK8DtDSRWAKFOC3xHCCtCwYUMXKhplSvA7QVgB/v3vf+Oyyy5zUtEoU4LfAcIKcOutt+Liiy/GkiVLXEzRKFOC3RxhBbjtttswePBgJxUfZUqwm4LLvrAC3H777fjrX//qpJKhTAl2Q1ABeN7f484778R1113npJKjTAl2M+hp3pAC3HXXXbjmmmuctH0oU4LdCFSAzMxMJwF33303rr76aidtP8qUYDcBrwWEFeCee+7BVVdd5aR0MH9xUaYEuwFIaFZWlpOA++67D1deeaWTolG1alUtU6FCBRdTOMouIO3iyMvLQ3Z2tpOA+++/H1dccYWTdhxlF5B2cfCOr7ACPPDAA6WqAB67jSXI3ZiPTz6ejplfzMa8ufPx048/Y/nS5Vi/dj1ytmzR8ZKmr1admqjfoB5atG6BvfbeE526dES7zm1cLbsPqAC89cvjwQcfLNGp4OKClmCXVYI5n8/FyOdG49WRY/HVz9OABjLO9QRqdwaqtQWqNwfKSVy5aqLJ5aWAzIMKcoAtK4BNvwDr5gNr5gArpkuDfsAaK+KIbv1wwinH4qzzzkCVWpUYuUti69atKF+eP8rw0EMPYdCgQU4qXexySvDBhI9x9z/vw9gpo5DRA9jzj0CL04X4mjHkIS6bEC2Ovr9NIvV2CZ5DCzuOd3ZeLYbFM+NYOBL46QmRllfCpWdfhGtuvBJNWzfWHLsCUhXgkUcewSWXXOKkAK2a1cf3Py5z0vZjl1CCvJwC/PmCa/DIs/eiwpFA5yFA8x4x6dhxdm4l3d8FaWQmo7B7ZsJ5fR4qBBdZdAWS45vn4ph1I5C9oDpu/8fNuPLG0je3JcEWGdbCs3leDeTFoFRUiEmnaHctqv5wJ1ZvKqwFiof/6sTwl0XLcWDbw5BdMRPvH3YvzpDfctybQEOxAJuEtq2Sh0rAn+gJZTjVKXwg5Pt0H0VQmXLFbVE/jr3OBE7/XvYbX4f7tlyu5+LPOuZ8FGwNl/ptkJOTk6QAjz76aKQClJNjrDfgbez7xzuQt9/9OKCjjIs7iN9cCTau3YyuzXujUfv6yHxuIs6U9t77HGkESSNBJIqkh0n0lDCeLlP+Z8qhZ8YzkRXPQhayxReX8GXTtEzNlyH5fVnC15knjvstEOmAWyDHEsPsc55GZvkMHN/rtGDHOxmbN29GxYoVnQQMHToUF110kZMCZIsC7HHq22jYuR/iq+No3f8KTFvcAX+/Nn24KAl+0+Hgj8deiBHjnkCvT4E9ulqPZG/35BDhdjfiZIuTRqOSlFqaL+VDLMmQ+TaDMDDsN0oFMQ42pD55fwRPybA/znkV+PxE4NKzrsTDI+7RtJ0BKkClSsEk9bHHHsOFF17opACZogB7/uEd1N/3MORsjCMvX4ZM6TGxqsCX12di+rRJ6NK9t8tdfPxmc4J3x07C4cf1wV6PAF0viWGzNH2Y/DARnvgM6cVGuZHvNxov853MoPTgdFitRjwJN8rDW4HG54tSWHr4ODhvqCCVT709jgWDgXEvv4VjTj7CEksJmzZtQuXKlZ0EPP7447jgggucFCBDFGCfc94VBegrCiC/Rhovt0AUIS8G8SAevr5NFH8bdxUXht9ECQ7pcBQmb3gLp/zAHlygJt9TFj5kxtF4x4T8gHhvAcyxMTz53LScUwC9ts4KKUpjWLQRawSHtjgtAVOMfCqBbhJvVsLAKuxkbQwvd4hjn1+7YdbSTzRmR7Fx40ZUqVLFScCTTz6J888/30kB+Ls6nzcRDTv2Qc56IVxYzy8QK6CKwFPKcvyZMfw692OU++BQ/LCU9rX42KkTw+WLf9UfsPKqt3DmDxx/C3QMVo6cI3gANqqXlzG8nIZ1bKcsLjtWTqRsmRAxjmHm8c7y0GXGxUmc+azLfMb5cuZki0m61JspLkPkTM4jZG5h6ayPVsiOkUrL5ekfZgGVR3yqv+md19+T2O1HqgI89dRThSpA9wvfQ/MufVCQw3sI4sjMkO4gPq8mZ8XEF5MVy4ujboeeWJjfD4/cf6srXXzsFEswcvgrOO3cAThuYwzlK8Ujez9lm7Zlien3Zj9LfrhM+DTs46gmEtJ5ATf6vgZvDwTeEiRgvT4c1n4vDecXnxYXbGYhbHiQ/xLOEz+wDLQKPLaX6hfgpH3OxKiJz1pCCbBhwwa9uOPx9NNP49xzz3VSACpA70smoVHHQ5CzQY5KenyeWABzopgi5+u8QFZSEschIi5zy5lDOCzw9xWvf+8US/DngdfitGsHyExb6BUF8L2f8I2p1LPXq2O/s16ZJb2dG3uu9WrLky0ukz1W0s0FvTthDZhP5bBjmtXNcqyfq4dsbyW0XmcdZPPWgZYhW1cXVg+Pl+Bv2SrKcdYyYPqBz6FirLbGFxfr169PUoBhw4YVqgB9r5iMll0PQXyztJfIGWIBsuQwMkSJ6WfSZYolkLQsWgZp5JisqxueMgUd2zRwNRUPpaoER3Y7EUN/uQtnL4/JWp89yUCfjjszc8+GF/I9oeIbgTTNJMGI96QwXk21xhuRRjJ9HyZZ5gfOpSupLCvDi+Zz8dyv7i8YNiye+5W4mByrU1IeNZWZv2ODuAP+CfT4YpUStuj7nyVm21i3bh2qVavmJGD48OEYOHCgkwKwvqOu+gBtuvZGvqxfeQsBTT99SUK2+lQEUQyRORzIlEDzyHQG9fbtia/m1cDUjya6GotGqQ0HPVofigV93ke/x2XME5kNRoR7PxvfjDwlITwRtpW/9D3xbQhgrE0SWZMNA9w4XFgewqcJdEcSoqATQ79nGn3bCuJUTO80xk0KxeRrGRp/NyRoyPyCuMxoXFq+DG5evTk85IvFeyWjAK+Ofh3HDzhW41NBBahevbqTgGeeeQZ//OMfnRSACnDcdR+iRaeDsEkmgfmyBtxakGGTQHH5cox59GU4yHVLxFw3LHCIsDyy9M7Jw7z7sjV/USi14eCgvQ/HwqPex+GFKAD7kvZUnryRXul7Fnud9UpnthmnvZYWwXoqLUF2rIKbzLHHWpmknkuZpp7Oh10685mTerUuTjYrWG9nWWclWI6Kacfk0rzMvDweDhGaZs3G4aGyKFHDa4G/XX2DxqVi7dq1SQrwn//8p1AFOOX6j9C220HI3SwTQGlE3kuY7SeB4tjzdRjghNANAd4KeD9DiC9fLQsFDU/Bc8MfdbVvGztsCU457Gy82+BZHCNzpFQFYJjNRsd1P8lhHzfTyqZkmp0PyBSzaz2dMd46+F5PZ5vmEcc1IBuOe9FOr2EHkc0SSO9mb5BwXKxAcD4gZAm0t8smvd0sg/V35s8XmilzXcM482kJmJYrqpuPdwYBrSYcio+/S18xrFmzRnuax4gRI3DWWWc5KQB/xx9umoJWnXpiwzr2dJlMS88u0B7Oni5zEU4IRevywtYgz1kDcUzTSaKkFUhenvn+5o6izx3ssCW4dfDdGLXmWfTfhgJoT+K4qj3PZPY4mwNQCdy4LD57py3RTA56o8VnQ3qwS9dezXGe9Wi5wAVzDJEljT6tCMtb/XRWv7cotBC+x7PejIRl4bEwjx2rTSgzUV3i3r2ECtCnWArw3HPPFaoAA//1Mdp164k8WgD2au3ZouqhJaGPJ2Hqi2JnOiuhcwP1pWuJwPOl2Tzt2fBkjHpxmO5nW9huSzDlvWk4qO8BOFvGxA3SMzy8Algjs3ezV7MxrddnaKMGc4BMLg9lApawCtLAbBjLY9bB7IBZALMQthkkpDv1skC0358sorOjs/7r+79ZAuv1JtP3ViHX4tUqiIWQJVdezM500FWQ3K9dvBIt3uuDKXPTJ2Bsz1q1ajkJeP7553HGGWc4KQB/54W3T0Pr/btjw1rr3eGTQLnSo3Vp6JeCtAxM5zyAvV+czg1cGbUUtCKanxelcrHs3+WwZkvh1mD7LYHslApwmhAWpQBKLgnkEJBQAMqmADok0Do4C2G9zSmCKAR7se99tlken0+HDi0vstYpPdfNI9RnPpdG2Wb4PA6zIuZ8HMOmsAnHYxIrwP0wLaarBLNg1UUFxl0kCjCpb6QCrFq1KkkBXnjhhUIVYNDd09C+e3fkihnVXi2Np+N/wo9D5sHa86njzGMWgdbBLADnB0yjZbB5gqRRFjbK18jG2ty9MHfOV26v0ZCqSo6KWXXQd65oHbXBwesaCWbjqq/m1DeuI5ANr0SJrwrgyKecIIhhOme6E8SSGPE5SfSEOtPvzb5OIF281q9mnibcK4bE0yUUguWDfSWOUetgfskh+WmtaqEixlz4M5p+IArw7bvuFwegAvBFUB4vvvgiTj/9dCcFoAJc9cCn6CAKsHWjI1ZJNkeCbTiweCU5FFZf6lGylXz6jnw6kbkPXo+vf8JjGHzNtu9Kkuwlw1/O+yuqX7YSddqoQVB4BbCpHomi2SZxnmBpTG4khr3SEWTpngiSYCE97ct47e1UKJN1XpAgW3KqAoTS1DHsZZIp/4V8Laf7JdFUCh4L03kcdgzcvylDSDGlHBWgNirhpQvmo+kUUYA56QrAN8CFFeCll17Caaed5qQAJGfwI9Oxb7eu2LJJejtP+OjYzvHcerVXBBJqs35RFPEtLSCdMsux1zMvZbUcZIRhGTbqdToYr7zxkdt7NEqkBMsXr8D9w+5AvwdjehlY9pMAR2wjm2M8G5W0W0MypPMCGR7YoKoommbNbjIlEsR8Rr6ZZUc440miI9nykjDLp/uRdPONVKarkrhy5qQm5lMn5bgfVQY6UwCfz447C3VQBc+ePwdNph6Kj75OV4AVK1agTp06TgJGjhyJU0891UkBqABDHp+Bfbt3MQUgiRKXsAASJuEk08g3a2AEMyx52eiJdOPAer6V54kkzetkmd4ATc7A+Nde4iFEokQTw0qxOjhk2SpUrGeTLR6AnwdowynJvgHpjGgNewsgYRsyGG9KwzAbmyH6Ni20FJsY2kTSpoPUfJskMsy965XE8MGIn1giypEmTwbpU+Ikz28yCXQnhBjWpaE4blVlv4+f9zEaTj8QH86KVoC6des6CRg1ahROOukkJwUgMbcMm4G9O3XGWk4C3eSOkz9eB+CJHr0ukJgIiswJH+OZrrKlc4LI8jpRlImg5bNJo15XkAminyhSB1YumIH9V16Cse+kXwEt0cTw6Yf+g8wTV6J6igIQRqgR6MO2OWVQBbAen6wA3Fwv1jQLW0+3/FQuxplkZt6P73btwfVihllOfcrcL2XL74cK2xdrs2GEIY0T5bXJpe2JcXVRDU8O/AQNP4tWgF9//TVJAUaPHl2oAtw94nPs17Wz3hDCc/1+cqc9WtLNElBmvJ/smYvJP+3dWpd0OE2nbMMA432YrGhZssOyQlbtdvtj3LufMjESxVaC8y8/B/3HpA8D1kelF+tSj43nlEEaUwkPDQGpCmAEUzYiPNX8nyWzcCOf8STSyCS5eo6AFoc+yeRkUCeEobC4RB76SrBXFg4lRrQNKW6T46cl4/HXlXXAv8+ZjAZf9MCHM9MVYPny5ahXr56TgDFjxmDAgAFOCkCyHnzxS3Ts3gk5m9x4ro6kmXn3CsBJHsd0M+tGeIJkNfMuTeuVsCqHhLWuIL/GMR9lKoNYCJTbDz8u+JaHlAbWXyRuuOJmNBvCunzfD6wAx/pAAcx0k1Q98+cUwRQgIDtQAG7eAlia74VBHnFSj58IJsjWeJ9Ocl1ZR7Y6Vz5QDiqNpZkVYDrptzDLU6qLmrj/7AmoN7MbPvgqXQGWLVuG+vXrOwl45ZVXcOKJJzopAIkYOuordOy2H3I2kGySLj1YCDULEBCoLqEMdIE1UMVgfS49Ec84v3lZAjxZxLDPSyWo0OFUvDpmpAjpKNacgBWfIeNujqPeK4D2efZQ7enWiElE0rRK4xvBdMzDzdKpIMGJJFMCGjmm076YFWEeszfq83SxhMwFmzUB4Y8xvNlJorheLPInhrjAdfMBDdvp4JpigW45ayTqzOmIyZ+/o3WFsXTp0qQ3g7366qs4/vjjnRSAbfb0qzPRvnMHrF1jYzSv+W/lGO5O8ebmZ+g4bqeFJY8M6LkFFmfzBJsb6LxAyjCPnRBiOvNLHOcQOpcocCeT3DwhN4ZcaYo8mRRwXrBq0Sx0XHY+xqcMC8WaE9x54/1oMlgqk6YLg01uRBptpChhBegrgSTbx5NsS6cLTiQxD+NohhlD3+L9rJ6xQW9nb6aJN8vgl37JcjhdnLMcOiTovugzjvWZTGtRX1TgtjPHoO63nYqlAK+99lqhCvDc+Fno1K0DNosFYI+kydflG3sqw+LrGt/pL31dDTgLkOS0TvocTlw6+XDpPGWqXUHC2vv1ukqQR3QbNVp0wAeTp4uQjiItAQ/2VKmU9+l7MGQUGkG+Z3vCzGesja9KgIvzeX086zEFYEw5OWbLQYmOKqZnBxknrad3GIlvlkFbQJyFeGC2UPAWwG/W5zml1ZDeS+hXB7YSqInK+PsZT6LW/PZ4f/oE1paEX375BY0aNXIS8Prrr+PYY9MvHbO9Rk2Yjfad2mPNGunNedYzebmXPdlfFs7N4+rArIFeAhbHiz/+BlJaDo1nr5eurFaA6ez52uMLsIWWROqxlYO3HLIfby1oKRiWtHjlGGbrXUcBj0SRlmDSmx+i/GG+UQ30rdlpmq2Xm7PxX53Ek3AjyvV8TbEhgEQb1aZKlssUxiSzBjqccGYvvTnLDTmJs4Xs1TpRpJN9qKJIPo0339JYI/ObIlJFE3U5a9RQZgE3nj4Mtb+PVgC+Di6sAGPHji1UAV5/72vs37W9WAA3WZMWtoleMA+wXs/85jRfwkkLh8Iq+rxs/UQarYav2+/f+GEe80RiWQnrHWex1li7Ov3RtW0qwfV/vgk9HxLtk7CrV2GEkiwLaW91fngct1yWTxWBvZgkhOM0h7cYlJ11IKlq2o1cWx14kn2aOX+PgPn+BJG7Z4B5qEysQx2VQVVB0xuJAlx36lDUWtgWkz5NV4DFixejcePgWcVx48ahf//+TgpAUt7+cI4oQDtsXE+zbwT5s4BM1zbU+KA9EwrgwpJdfEc+Y5nANHGUdZO05B7NlmceK2d5fX7zVTvqtce3c76WQDK2qQRTv3sPjdrqkKLwuyVxNu6QNB6A9XSN1/9eCbgxzTm9V8DCJETnDuJzfmAKQJIkjWSz92s6SSRxViZBeoJMcZJusvNJvG6cD1h+vX7AOGcZWG8TmQVcdcoDqPlTG7w3LV0Bfv75ZzRp0sRJwPjx43HMMcc4KQAJnjT1G3Tusjc2cg4grWo9VayBpkscncaTFHESoWEu5F0eOv7jiS6TpcVdPIc5K2iON5wkypAYF695GaRMUKBmyW4ya7bEokULLT6EQpXgxadHo86FMqZI2NdH2L6EbI7PspnJN1VQ4oVoTVeZxDqlcFYgUBCvEOKrMllYx38118xrRDMnzzZy0mfqQvKFXLEOXJ2YaTdl8D7jNZ1pmp+lqAwMZ4oCNMSgk+5EjSWt8d7U9G8C/PTTT9hjjz2cBLzxxhs4+uijnRSAZE+Z/i3279JWLIAbAuhcmm0mkxBNo6BMWfNTVpJVYG8O0cIy4qmTf94n1HNxVp4KZArH6qVB+WeJEpFdtSGWLf2FMUkoVAmefHg42l8uExMnexiJ/GH0jXzvMmRnJNIUwGg2mUqjVLp4R7jSYb6G1QKYAticwOYQdm6AymAzfSoH07xlUOsg8bYy4FBgcXp9gEOBsxRegfZAY/zfif9AjWUtMXFKtAI0bdrUScCbb76Jo446ykkBSPL0L+eKAuyldwQp4SRDHH0162xhxolPT6Hp3uSLU8Zc2DvmJ3kUXNy2QAaiclGfNFb2kVmhBtZxvZqCQpVg4hfj0Lh9+lCghMvBGdHeN2pJdCC7mb3E879XGh8fVgRTAJF0/GccCZZ4qY/kWm5ahWC1kSDcxdvFICPbxwUnidxqRCwDFeDcE65HjRXN8e5Hb7lfFWDRokVJCvDWW2/hyCOPdFIAKsCXs79D5/3aYL3MAdg+SRSo4GLSuVElUPiCTlRFsmAJ4Ut5ppLB2KzsCsjJ2WwRIUQqwU/zlwD7pFsBZjZC7b8nnAegZw3dFgwHgWzkemd1WIhKwI3Em29xRjzzkVivGJ7kYIJnZPux3+YPVA6mWbrlFQWINcbZx1+N6qv3wDsfpivAjz/+iGbNmjkJ+umYI45If/6QCjBrzjzs135PrJE5gKzqFAUk1oU5b9M1FQPsSS5ewSj2csIrgBNtISsI5y8CVoUv4JXBIWm/KWkOkUowdsx4NDvFjj25mGTn2O7mA0y1sZ5xVIpMzWMx/G/KYM7H8b9fPhrtnBiy13vyuZFAy0lFoEwrYUOASU4BdPyXsPc1znq9KYgpQzM0xenHXoZqa5vgncnpCrBw4UI0bx486z9hwgT069fPSQH4O2d+PR/77N0aqzeSTGl+aSglXRwVwhTAiI7TSSNSpiPo05ra01CWznbWeIY0XmRnLfjfW2SFRRskrHlDucLJFApc/fn5OShfPv2VdpFKMPHt99FYOkDSjgVKmFZopCrp0iiM97GpdFuMEe6VghtjOFFUWecLLpYKoRLjzCqQ9EAB6DzxRrCN/yScEz/x/RzCpTcXFTix/59QbUNDTHj/TfsxIfzwww9o0aKFk4B33nkHhx9+uJMCUAFmzPwebdu1wkqZBPJkD0/m8P7+fJIhbKoSJJTCLlxr2JmLhNXgP0mwfM5ZlJHIOqR1SB5BfdC6JcyyVjcDFucWGZqPdWg51kG+NIMs9TevQo3Qza8ekUrw8YfT0LC7O1AB6yD0kKRWEmeShf1JI4sz0r1FMNKDvCaZQqjkSPeKYgphlsLID5TBWwM9OSSK4G8MseHAer73dY4g6S1k63/02ai+uQHenhStAC1btnQS8O677+Kwww5zUgAqwCdfLkDb9i2xei3P19sZPJ7p06eEnUKQKCWLvsQr6ZTlF1Eh+OfT2V5KuoZFIUiaFtRsmuDz0nmCtRrK3J+IcmhKtlc+ZtAyEqeSCAznrV+GevXSH1GLVIKluQukGVlVAKtPCOQeBUY2w0ZvOI4bCdb8GrKNuYxwy2FlSTIlUQCnTJRIuJWlcpg18PMCI5+9PES+nxS6OQHDrWU7/KiTUXVrPbw18Q0eYhIWLFiQpAATJ05E3759nRSAv/nDGT+gTdsWWC2Taztt6y/W0CdZogjSYFQEEkClIIE2JBjxPkzLoT1ZfYmTfSR82ZcfIpiXoE+TLrlVYBppoAJousbzT9pU85nTvBqQaEnKXzUfzVu0sogQIpUAlawSqS8J1EQSYyQyHPiky8cEOSzG5/Ap/r+SLr8mkebmGiY7yyCO/00RKFEZ/JyAVsGcHyosLkuGgNY4+Ij+qJYvCvBuugJ8//33aNUqaJD33nsPffr0cVIAKsCkTxeKAjRXC8Bz97xyR1/P84ujJaBloFXgt0YtjmSbTKdEMix+QLy1symE+Rw2NI6+agLjGWFlqQFajnldmq/P/glMY+TP+/wd8u/Xb7Bnm7aaJYw0JVg0bzFiewf1eZAqboxnIRuvjE7bGGY+q9LHBSVtM9moNt8I96+k4Wa2IZBIuoUDBVDSdVgQWUy/nTK2U8eNY23Qq99hqIbaeHPCeD2eMObPn4/WrVs7CZg0aRIOPfRQJwWgAkyY+iNatWkmCkByQxbAOb2ti8TrsGBzA1UI8XV48GFHmimFswJSH4nVeO/kdyux9OUYlGz1w3HMp7eLuHRuUhcvlUv9OqHUPOarMihp81CjdjGGg6VLlqFSYy2bBKVQey2JJCF2QKTKz2I94fStapMpUWbeQKZP2cKW26fbkBD2bY82Q9AhQeYSOiRwTqDWwIaEujIJ7H1YL1TNqIU33k5XgHnz5mHPPfd0EvD+++/rl0STIc0mv3X8Rz+iZZumWCMKwGv36oRstQLqjHy7P8CUxK4OMo+QkiCcvjj6Qhp9jt8cHjTsfdmCNMb7MgxLqovTnPSZJq1iYcZ5xQjqlT8dNgpygWrBC1KTkKYEy5f9isr1tf4IUKdIGw/XaLUYiyVhlI3KgGbbWMJivILwz0qJLEOBL+/LWm5fB3NRKWxQ8BNIPSOok8ByqBFrgN59RQHK1cQbb0UrQJs2wStuJ0+ejIMPPthJDtKYHJbGTF6Epq2ayhzAm3zzlfSEJaBsw4IfImgFqBwk0oYEWgoj1w8Tphg2hwgrB4cVtQ5yGIwjud5ZnLV7WEkIKoifb6jTXPQFzCgNumbBTBxy6AEan4o0JcjZnIOM4G1qKfAkeZo9nY5UBXfNcEAnHSctLOXjNZZqqiFDULNR7sn3sqVYGW8ldJIoQwNNf+9De6FahRoY/8Y4qzCE7777LkkBPvjgA/Tunfy2Lz6EGsvIwMj3fkLTlntgzToSbKTqtX5en3dkq1PZ0u1av1kDrgp0SBAnhkGJtRWErSKUdOYjqRJmXm8hPLneeWtBZWG31nQJ+rwsZ/MExoosqWoBGM16JU76C1Z9Nx6H9Uu/9kGkKQFfq6pLgyJgZBi4e5MYYpXeN3h1IMx3ZOrw4uPMD2LMsaz5hFcNHzJFqIKa6H1IL1SvXBPjxo/VnGHMnTsXe+21l5OADz/8EL169XKSIV6Qj4yMTDz3zs9o3LwJ1skkUJ/7F+eJ1lvAXFidky3dSPbWwSsAbymjBWDeQAEynBVw1kAYUyvgyGM++kayHBt9+aWJcMK3fBZ26VIPGytIkxbNks791fMYcEr643BEmhKUL18OsZK9AKtYIHHJsJjC4sNIjfEy/WqogwN790TNarUwdtzrlhDCt99+i7ZtgxnxRx99hIMOOshJhoKCPGRkZmH4W4vRsFljrOMLIsKEOmXgXUIkm/fyecd4fXeQz0vyqRziTAHEiV8gaToMkHivEOoHhGm8BJRQxmuaS2d+YZfWKo/KIrJXmrAySMjKcTmgafIDyXLebDTeI315SKQpQcVKlfQByaLAnakvHskwifAhORIH9mMvuVIuhv+ZGsB+qoXoWDdzmu3QZkj82JpohB69uqFerQZ47fXXWCgJ33zzDfbeW5Y6DlOmTMGBBx7oJENBfh4yM7Px2LjFqL9HI2zgmUD2bNmpmnQhWMd66dZeKXw4PxxHwpmXykOiWYfE+3mCeEKyS5OwDhkaZ0rmlYE+fx/Js3wSJz4JtyGECmDp4pnPOLaOyydeIo/Mn7FiznSccFTy7w4jTQn4rYCNS4PelgytPrEpVOEsbKbcQgbLT+cVwUJWgv/tkA0+3ocsj5WibyogsqxG6qMJuh60PxrXaYpXXh2jpcKYM2cO2rVr5yTg448/Rs+ePZ1kyM/LRWZWNh5+bQnqN2mE9aIANO++9+pQIC3pe3YingS6fH5Y0KFC8opOOQUwZ+cOSLSVM9IlLD9On0KiL8TZfMEIVYugYfm1km7kSyuokkiLaRmTvcKY1TDZJooWL1MmLP3oTlw8qPDvJaUpQcPG9bF5cUBjMqxnSt3qy36VFhJjvifbclgsYf8ZY2FztpwNbyxheXyNRn3guDUWBeh84P5oXq8VRr8ySvIn4+uvv0b79u2dBEydOhUHHJA8M87L3Yqs7HK4b8wvqNeoITbwNXGyayVPl4LWw5UwUQbt5RLm+M/JoflGrA0JzCflpOU1nmWlPiWdeUiyxPHtI+JZuvhhwpVghhknaeqLU6Lph+LF0zJGdmAFvOWQZtK4DH44Zcko9Ds6/bkIjzQlaNSiATA7XQmMEqOY/7kf+ubsoIwoC3nfqOMxWZzPw1Tfty1H4AfEBy+V4H3CDO2BhtjvgB7Ys2E7vBzxMMXs2bOxzz77OAmYNm0aevTo4SRD7tYtyC5XHneOXIraDRtgvQx/Nq6z0dnzzbwr0VwBSLfV+/uVXOY1X0mXeDrm9QpkCiCOeWQSqCeUJEzy+CwA85MgHSaEeMZTSUi2lpOAEW7kMp0v3fJzAb6yxpTCrIYqiY/TsMkcCpbNeBennZB+JjSMNCVQyAEzQepKgGQE/+mMQP0vEVQGwudgvM9pcQHlFk/Jx4X/05cD0DSfhzeKx6X/N0CnHgejXZP98NKoFyVPMmbNmoUOHTo4Cfjkk0/QvXt3Jxlyt+agXPkKuPn5pajZsD42bSCpJJ7khHu1jwucKoTzEzLDJJ5O4nzPVushJNkQIr+CdVHWsA07pgDcj6Wb1bB4C7t4JdgsiFoL+R0WT7KdoohTxZE0OxMp66YKwPLX/oQ77vm3/vbCEKkETSruiU3ip1oDEmGkyt6UdtsYR6p8GmMst8kW745SY0y26+mUwoT7jZJ/YVS+DAH10KX7YdivWTe88PLzuocwZs6ciX333ddJwKeffopu3bo5ybB1CxWgIm54dhlqNKiPjTIE2Pl/I8dbACPLXh2npNAXpz3X+SQxIbuwWQY6UwAlWuolcZw30AKwPn0NjTrLrz2edbl4VQxpLiOavV/y0de80i4i2/yAPstJO7IOaTNVEqYJeTkrN6BBtR/RrGWwPI5CpBIcdHBP/DI5KpE7464IoylMqvctFI51zpFuFJt55/uAvEyTR+Itjz0WJs2hCtCj2zHo0vIgPPfSCN17GF999RX2228/JwHTp09H165dnWTYsmUzyleoiOuGL0f1uvWwSYYAP9lTky6NF7YCVA6SGTiJd71dTxM7X+Mlnc4sCWUqk5HEelm/KZnlt9UAZcmTUABzZhlMAbSXU3aKoBZDSRfHNHFSrcaZwggb9MXFxArMf/YkDHsufc6Uikgl6HvkofhpfJDox3zZlf5X8tQxVvyYyaok4ltKkMdCPmykB7JsSr4ohb4fwMLcqBgNeR6gywk4oPWhGPHCM7r/MKgAHTt2dJIpQJcuXZxk2JKzCRUqVMKVTy5HtTp1sWkTSZHGEqckyqF74vVVcSQpRKamubw6HEgePwfQ3i/lEkSLbMtKySPdmdcSWD/zK3lUFOmpmk/q4bkE3RfTpB6dQDLeyfT9seYLE1QK9n7mp0/ZKwvrVysg+fLEymWtnoAj+6c/Kp+KSCU47qT+WCKrrtRE0kPibPPK4Dej2sIk00JWyiZ4Fi9Hqv+58cUQlp5wYhn4cCjrqo9aOGT/09G77RF45vn0V7F9+eWXSQrw2WefpSlAzuaNqFCxMgY9tgJVRQFEH4wIbXAXlgb2hJJIP/u3nm3OlELy6/gvZb1VoOOjZpJHiRe3RZVG8jiyWDeJ1bqoALQkXgEkPVAACUu6Eu8UgZZEZY0X5xWA9TlZT0qJ7yeKsUrA3McOxtixRVsBIlIJ6jWpDXzPRI77AZRINelGJokycnlU/O/J9qk+n4WtdwekM2yyf0LYvy2kQAaAmjis8zno064/hj37lDuCAF988QU6derkJGDGjBnYf//9nWTI2bwBFStVwYWPrECV2rWxWRRATbAcrpFisvlm8n0P973bFMKUQs8SSlk18eLbWUNaBsujxLM+zSNOFYUKxH1Juu7LerqS7vbjJ6Z0/iwjP46tby/XeGklIYJlzEpIeZIvaazbVgaMl/RYDJt/WYY6BR8WywoQkUpAHNPzJCyaHgdvFPPw9JJwbowhZRqrPZphT7yZc6b5OIsn/TbuUykS1iDuJ4G5sgaoiSM7/glHdBiAp0Y8YTsP4fPPP0fnzp2dlC4Tm2XaX7FSVQx8YAUq1aICeHKMfDWvEtbxng1NIjxhjJfebcQ7QkkOidR5AAl3MtO9S+Sj435YV4h8Osmjvd+l+aGAZUwBjEw+oq6y7EP+JJ+0mJh9VRCnEPSFCqcQzBdDVlVgwWON8cWcea4likahSnDh5efh6/v5sIkhOBcgRLk5ADfZvYRNskmjCyuhDHtlMGcKwBAnfk4J1DdXDzVw9H6XoH/H0/HEM0O56ySk9vhUi0Bs3rQelSpXxZn3rlQF4BtCrKHleMT5RtcGFp/kqDKIbISFSNN4I9d6vfOd82lKKocFvb5gdasCeGtAkrRuUxbdPxVSHUm0MC1AYgiQPPKnSqMKIIIOAzxunQewDH+DhKkI2cDCtx/Dqcf3QpNmwU0zRWGbj6bzxgp+rYyXErwScIjgfX12Kxfv5zNHWV9Mzbt8nGxp5uudQKE4vSOI8bwhRB86KY9GogKn7ns9Tt5/IB4d9jAPIQkc88Ozfs4JwqsCYtPGdahcpTpOunM1atapgYJcez+Qf/Vb4vUwGme9wD80aq9/4ckv8/XOaucI85ygrWHQziH/vE9C/MWdxClcR6RaAsbRZ5zKQVgVQBXFiFYLIGHGh4cwsyoS731VCuDbu2yJWFwU+Wj64fsfix8/DawB4Xs6F61Bj7deHkzyvB84y8fN3gfAWuwtYTYI1EUVnLzPX3Fq1/MiFSB12Ze6LCQ2bTAFOPbW1ahYvYasAqxxtQeyEdlbxdcG1d7OxrWG18bVOMtvDe4shOvd5tjwdCZzXhCkWxmzLiTK9Xxfj4RJoMUxj7MGzCvHwboYx/q9AijBPF51dmx+/FeFYX3icxj49q7y+HLGNNcaxcc2leCW+27ClMv5ejoD+wB1TA5NCDd1MEeS+V/8pLV+mHjmswkg8/nhID+Wq+8JPK39EJxxwP/hkace1H2FkXriJ/XEELFxw1pUrlodR968GuVFATZvZmM5AthYJEQaTBtSwmbW2bASz6Wc5AnIMmISjuVIGOMlX9gp0S49uKpo+7WJY3JdnnxVMpbXY8rQfEqs5JFkrVePTfOYAtjxW4/X1YDWI7zIamDWM4Nw6Z9OxH6dk8+QFgfFeFNJBZwc3yoHZiaG/6k5vK1b7/935t/eTOpNvBh8Kae3fyWGAJcm/+0NpQxlyySwLs5rdy8GHnQFHnz8Xt1HGDz1Gz73z1PD4WsDxIb1a1C1Wk30GbIGVWpWR1wG2Syx+zTnNP9ZYso4tGXr52I4LGRompl7DhcWDsx/aDjQTSCy+inQVqHpd2Ez/5LTDQO0zMKnhYUw+jYsSLeRsJHshwIrQyXhjD9ZAUi4pEsarZcfDvKzYlj5zWTEJh6CJWukcAlRrHcWPXT7A/jo8rgQFkCOQXtxMEGkivgJH8OM8RM/Opv5c1PZvUW8FiphYNu7cV6vv0QqQOrFn9SLQ8SGdatVAQ76+zpkiyXIyZG9S8Ox12njSbtwcqa9X802Twe7nslGZB42rDg/0dM0rgL8SkDymYWgHLYYTtZ0cbQoEqf7cmn0dYihL8fl0xneIulMUwtBgqkUItNn2WQLIPHMq0rihgHR0i1r1mDpmO1TAI/tfnsZe4U9+GGTOvZ3swZuAqgTPoat93tr4GWeCLpkr+G4uM81uPfRO7XeMHj5N3z9n5eHw/cHEOvXrUK16rXR/a/rUKFGVcSENP1CiEz02Lv5BvDkN4LbZJCvjWO8vkVc4un0pVHyy7ysjjthGj0V0qEtIv/os2cnfO9EJqns6ZSFbyVXw55c2Yn2cnV+mLAyPEmkQwAVhRZEtECtBg9I6phzR0ws4WqZC9XgkZQYxX6j6c3X3oEPBydbA9m/6+U25lvIxn71xUpYz/eTv1wX2qpvC7+ozXBc2ve6YilA6g0ixNJflqgCdLxmAzJkOZi32RpVLYDvYb4nMc41qPVEcaIw7InW4yhbmvVMlrc6mFd7vFqFdBdcPzCndbMs96f7dk7CNj+Q/Ymsp5R9HvmnlkLSWJceD38LfYmz8wcSln2pAlAzZYijAsybO3u7FcCjWJaAoDU4TTRxq9JvSkAN8nMDvgmU1sAeA3fPDoo14GvsbM5AO5ClZwKv2nMs/nLEYNz5cPqHHHkHUPgWMN4iFr5H0OPoI/rgzalxHHDTJGyVw+fLonVsl8bhuM+vhWmv17ClsTOrVaCTsFoJtQY2f7C3jFq+sCUIfIZsCcmhjzHmWy/3PoM6/ovP8V/4VNn3frtp1BSTcdrjmV/DVEpJYzn6Ls0PAWoBqAC3xPD59Cno1CX5bqmSotiWgHjygeF44+S40Gk/ks0hx6Y93M74cZz3VoHjvvyPcbVAmdcC8lBNSv+l1VhcdeT1kQqQeg9g6k2iYbzx9nv464VtMfWqasgoLw0lv0THTjWX7HHWsxnWsVl6kfUwyed6FsdhG7vNgrC3c97gZ/V2McmTwHLM5/ObrPFSzuKtt/s69PV1cjy6+pC8equaNJ6vh8fCMtb7zUrwmIL9SZoLUzFyRUNpFagAX86YusMK4FFsS0Bkx2rgiNVrUV6sDxWBjmBf99aAVoA93q8W7CRRpiwDq+GGltMw+NgbcesD/3AlA/Au4PBt4LxNPPycQGEY//pI9D/+NLS/fDUq1qmB2FY3H2Avdz3b93jt5ZLmvyxCRVaf8XSycV6gJ43Et3jmEiR7+tvNDkiMawiuDBKWQP4J1wrhz3p8yKcCmGzDkfZ6poky0DLwhBKHM5Ku1qNcDJuXL8aCx5vgxx++Q9PmwVNUOwJaghIpwcLvFqHFXs1wlhz4Bvv5+oN5FlEnfnzMXN8NYAtAmwRmojaq4l8tvsLfjh+CW+6/SesKgw+ChJ8EKq4CeKxZ9Stq1q6HOn2HodXhA5G/kRaTpAupbnjQV8oJufT1rCAnh0xX2cilQjBAjz7jvPNyKvj7+Y++hiWXKgNl+eeJ92F1QjJbz5NNX4cNpwy8f4DE8zwAw7EqwJIpo7Dy7VOQl5uDzCwxfaWEEg0HRPM2TXHGEQMx7R4bFjzsdJEMB4lhgVNAGwb4vYB/Nf8Kfz/hH5EKkPooWOqTQsVBjVp1teH3XncbPrlelpAyg80TtnVmLfbXJmo0t2JS2cgSznfvFU4sC4UANdFe9k7i7axitNN0IVbL0zlT713CrCdkEswhyoYIzafHw+PikCFhDmksQyWtCsx68Dg0nP9/+htLUwE8SqQExPNvDcP8q2VmvdWeBPK9g/MBJZ9fEJN5AFVAFm24s9k83HjSzbj5vhtdzgCpD4OmPixaUnzw6VyMfv5afDYkhqVfvYNYJWlsOQY2rpHjxl1HgI7FJEXjQgqR4nRMTolLcm5OQMfyqiDiJymYKmEU+aybyil5ZQ5RwPkD4yvIknzdSsy8IYbbr2iPWfNXul9Z+ijRcODx4/yf0XzPPWRYyMBGIZ+QzqAKYecJslADFTC06WrcdOotGHL33zRPGHwcPPw+ACpA+HHxHUXXDnvgs9nlse+181FOelN8iwwRbl6g70TgXECOOjE38PFOq3XI0IClu2AgONDMq29eIIsZZ1j0T3swW4my3Rbu4kQW/tUy6BNGDPNMZwXg6xGXIXPew1i89GfUrR+8UbW0UeLhwKNZ6yb45zW3Y3T/Alnxyw8Sx7ahnyd9r5KEhu6xGv88/bZIBUh9IUTq+wJKA9Nn/YQP3/83Zt4ZwxfPXMTZKwqkge0agR8m5Hi1FztLICzo+t31VK4qvPUI9+aw87N6swTmqzXQ3u0skM/DfWlPt1UJHeP0OKh9VWL4dc5EzLoxhhtPycRWUZSdqQAe22UJPNrX64rs+z/DXn+QHyQyFaGK6NWIJgW4+cw78Pc7rtV8YfCVMOF3AvGNIeFXxuwM3HfXP3DltTehYscb0O6Ef+qB8gNR/gyhzB1tcrgtS+Dik+C1n0GGna8lJWDWwFYMtATs6XT+nIGuBGT+wptCV82dhcXPdUefni0wccosyb1d/bPEKPHqIAp8v3G/H2T8b8633IgCNCrALefchb/dJhOHFPClUOG3gvGdQeG3hu1s/GvI1bjhn/cgo9UFaHfio6hQPVNf3sBZuC4hJY8qQ8hnQH3HOJXDUugbmS6nEa4hi/fEM+yJt3hRDrFMsqLG0s/ewa+vn4BuHWrj9bc/Qv2GTa2C3wilogQy/0NMFt5nyK96oWkubj3rbgy+Nf25N74WLvxeQL41LPzewN8Sw594CFdcejnW5bZG/f73olHXY1UBZD6rZJFJkq19MaEMzk+BZNV/6jPIMC2Ai1TSmSiTjgIxOXw2cPPKzVj47hDkzbkLJx/bG48Pe0mWuOmvkfktsN1zgiTID/tp4c94IZaLOy6IVoDUF0P+NxWAGHjBZVi7NY4F817HkVUfxxeymphx14FYOO1FbBXLEONEJ1vGeyGOp29tPJd5gyhJquOYnuxLXlEkve1b5iD55UUhZJWyZvlizH3t75g1pCLyXqqNhy+uIwoSx8uvT/6vKYDHjlsCh5UrVqJ2neALoR58NWz43cB8dWz43cG7CmZ+8QmefuIRvPDss1i+Xrpu3WNQZc8jUb1pT1Rp0hkVqkgmZw3YuxXs6c48+Ciu7zevWo+1iz7B2h8mIm/uG6IdM9Gzcyucc95FuOCiyxDLLP21/vaidIaDbYAvhw6/HXxXVYAoTP1oIj6Y9C4+mTYFn8+YgR+X8cE8ooaY9nqyFhZzkSmDel6OkLxB4vkK+RxUENu6d5tG6NKtBw7sdYi+IqZx0+iXQ+wK2KlKwNfDh78PwLeHh78fsPsijrWrluvbwnNzc/VdwZWrVEGlKumvi90dsNOUgB+ICH8hhN8PCH9BpAy7DkpnYpiC1E/ElCnAro8ileCGG26Q5RLXx1ELpGSkfiQq9RtCZdg1UaQSVK5c2YW2jdTPxKV+RawMuy5KZTjghyKPO+44JyHtO4Jl2LWxw0qQ+qlYfkk0/CnZMuz62CEl4MeiTzjhBCdBvyXcoMF/9+xXGUqO7VaC1M/Fp35Ovgy7D7ZLCcaMGYMBAwY4yRSgXr16TirD7oYSK8Ho0aNx0knBGzCWL19epgC7OUqkBLwt/OSTT3YS8Ouvv6Ju3bpOKsPuihIpQfi5gBUrVqBOnTpOKsPujO2aE1ABatdOv2xcht0TRSpBHu+WCGHlypVlCvA7Q5FKEL4LeNWqVahVq5aTyvB7QbEuJfNlEXw/UMWKhX4cqQy7KXb6nUVl2PWxU+4nKMPuh/+KJeBn6nmpedOmTShXrpxONPm1suxsfqajDNuDjRs36lvdOG8rX7683s1dnKe6aAlAJdjZWLZsWXzQoEHx6tWr86bcbbrevXvHhw0b5kru/uBvElLiFSpUKJGTzqH+1KlTXU3pKCgoiP/pT39Ka8Owa9OmTfzpp592JdJB/neqEuTk5MS7dOkSeXDFccOHD3c17Z6YMGFC5O8qidt3331dbcl48sknI/MX5qpWrepKJoP877Q5wUsvvQTRZH0V7fZi4MCBepv67ootW3b8A5NRt/UNHToUYgGcVDysX7/ePnwagZ2iBPfccw9OP/10J+0Y+Caz3RWl8aBt6rJcrCsuvvhiJ6WDd3QVdjKPc7AolLoS8KHTq69OfxjV47TTTtOXU/CefbFG6jZs2KDvK7joootcrgDMt7uCr93jrXe0ii+//HKhjg/pXHDBBa5UMsJPbxHnnnuuCyXj0Ucf1bbkhJun9Rnm+Z3wKwCqVavmQiko7TmBVBnpmjVr5nIUDVGSeN26dbXc5MmTXezvG6nt5V0qovKIYrjUaCxZskQnkFEg/6W6RDzvvPMgM3snBeAnavhdgpKC7zLo27evk4oGexXffs5lEpeefOSNr8NJ/SBGScCXavH9yrx5lmN8lSpV0KpVK/3ievgTvDsCPqfBB3ZSwXs3wjfvEFFzBN7lFb7NryQo9SWi1BnpdiZWrlwZF5Ij9xt29913nytRPJx88smR9aS6m266yZXYPkjniKxXFMzlSEZU3htuuMGllhzkv9SU4D//+U/kAcp46HKUPl544YXIfRbmWrdu7UoWDpnTRJbdlsvKynKlS46o+uh4DiAKUXnpZC7gcpQMpaoERx99dOTB7Sxs7xpchgdXQzo4/4gqU1xXUlx++eWR9dx+++0uRzpkshlZhu66665zuYqPUlWCSpUqpR1Uv379XGrpI3VfdMcff3x8zZo1Lkc8fvfdd0fm++yzz1yOZETlpeMJr1tvvVWHlDPP5AeBovPxrGhxITP4yDoqV67sckTjtddeiywXdiU5DvJfahPDqAmLjJcYMmSIkwLwUzYPPvggRHFcTDq4NOTXTqKWjVdeeSWEECcZuPR88cX07yc/88wzetIpDE4WuSQNg0u0J5980kkBOClM/dwuUdizmdKuLrRt8NY83qCTCj6/WdTje5yQ8r3PRYHPhfLZkMxMvporGqU6MZT60lxh56ylUSPzR7nZs2e7UgGi8m0LxckflWdbk74FCxZElmFPLQrSASLLyurK5SgafgldHLetiWOpDgdRO+dkMQrbGtdS3bhx41wpw6JFi9Ly7LXXXi41Gj169EgrEx42ZsyYkZZOVxRq1aqVVubiiy92qYUjtYx3JcWf//znyHqi3EEHHeRKJYP879T7CQobZtQEFROppozvQk4Fn5zmY/HPP/98mmM8z0imInxNgucCUlGc5ynDT2F78HLutlDYOYuoYygKHBI5bJ5yyikupnDwcYHBgwc7KQU70xLIeO5Sk7Fw4cL4LbfcEr/33nsTjpePo+p48803XSmDzDEi85XUhS/RXnLJJWnphx9+uEstHDfffHNauZYtW7rUdIwfPz4tP12vXr1cjh3DNddcE1l/2KWiVIeDqNVBSU4VE6nl6VKVoCQmcFtu1qxZrsZ4/A9/+ENa+oABA1xq4bj//vvTyjVp0sSlpiM1r3eljW2tYB544AGXy1Cqw0H4beUeNLn87GtpIisr/CWmAMV5k4oHT/mGv6oWVefmzZtdqHDwil4qCnupR2Em+6mn0j8GvqN49tlndWUWhairsqWmBNKbXCgZqcuzHUXUZVKeX6eyiWIXy6XOK6IepeM7l4sCX8qZCrF+LhSAH/EYNSr9M/ZcCvJ6y85A1NKcWLt2rQsFKDUlEBPkQskYMWJEsda0xQXvRUwFL5nuCKIuBPHjG0Uh6qJP9+7pXyhN/ZKbR2m2SxT4EdBUVK9e3YUClOrqYNCgQS6UDDYyv2pWGgi/HteDV/h2BOGXbocRRbIHr1TyzWyp4EmrMK6//vrIIfG6667TK5IlAX9n6lXFwsBVQ9R+w1+cT6C0JoYeUmWh7owzztCrflEQ0xpZJnViSPAGzNR8HTp0cKnbhlgNF0pGan3eFQadVafklXmJSzXk8eMGKXnoGjRo4HKUDFxR+TquuuqqQi8yETJsJu3Tu/Xr17schlJdHXjMmzcvcudhx8biCZxjjjkm3rNnz8g83klvdDUHGDp0aGRe/nCesZNJncsZj//yyy/x0aNHx88666xEPpk4udQAhV1noOOydNKkSXFZy8fvuOOOyDx0L7/8sqvNcOWVV0bmEzMdGV+YozIRYlXS0rgC45lGnhX829/+pkvb1Dze9enTR+sJY6coAfHxxx9HHsT2uLFjx7pak1GzZs3I/MVxTzzxhKslGbx4E5W/OI5KnYrCrqyW1HlrGLYE2+OiQP5LdU7gccABB+jZwqpVq7qY7Uf4S2lhcEwubLlYFOSHu1Ayos4sFgedOnWKXHqV1vLY32d59tlnq789SH26PAk7wxKEQRPZqFGjSM3cljvnnHP03riicOmll0aWL8ydeOKJrmThOP/88yPLRjne/18YHnroocgyJXVff/21qzEelyWenmGMyhflrr32WlcyGuT/N3sMjfe8jxw5Ur+FzHUz74ildvJyMl97x0/hde3aFUccccR2Pf7OS6b8tgI/rs3X6LAX0hLxcSyer+e9ilGXhLcFnnThfY5cyrGNeB2D5xR4zyRn6TzpVBR4zyPvAN7W5dzCIBxpucJWL7ynkh8UmT17tlpGLgn5Bjk+Qc7rGuFvTRUGXscpeyr5fxxUgp0yJyjD7gWxIGV68L8M8h/jiYvCzi6V4fcNKkB2djb+HwZkMQQZmYmoAAAAAElFTkSuQmCC</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>
diff --git a/swamid-interfederations-2.0/idp.georgikon.hu-idp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.georgikon.hu-idp-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..f9340424
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.georgikon.hu-idp-saml2-idp-metadata.php.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.georgikon.hu/idp/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">georgikon.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.224.81.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:46.75190,17.2404</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">Pannon Egyetem Georgikon Kar</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Pannonia Georgikon Faculty</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Georgikon - Pannon Egyetem</mdui:Description>
+        <mdui:Description xml:lang="en">Georgikon - University of Pannonia</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVAPFqC/HfYvfScTLOiI/sKofsx6MWMA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEGlkcC5nZW9yZ2lrb24uaHUwHhcNMDkxMDAyMDgwMTA3
+WhcNMjkxMDAyMDgwMTA3WjAbMRkwFwYDVQQDExBpZHAuZ2Vvcmdpa29uLmh1MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgR/NrpE25snvbNy6ICQJHqjt
+GmFkHIXkVeQPso1xTGO/K0uyNSGuUMWObwm5zAhxINLd+8u52noWtXPcngiFQXp8
+x1+k1PPZKrhlw7Lsmt5/WYFDkPxdZ90PCpQkpRgRQwBvmnwSdlqGmp/ts7ADTzh6
+ih++pvHI0jgyy3mMyJg/w3psv6VwNF4YuYY8rUQuPhNYVS7EMrebWlPOttqetcuX
+yTgZrx9O8W4GpsepmIJHBTlqY85W0H4zFXfUk2+t7IeUkDuxE474JPU5IszmVIfm
+5suEh1rwDnwKP+wRi5htuxdrbs1ceDrRxkbpDinoLcudn5XGq6LvokUI9HwQHQID
+AQABo2cwZTBEBgNVHREEPTA7ghBpZHAuZ2Vvcmdpa29uLmh1hidodHRwczovL2lk
+cC5nZW9yZ2lrb24uaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEZzriItWOd2
+JgNAOtHivus73YOBMA0GCSqGSIb3DQEBBQUAA4IBAQBDovq/Xvd+cFB8KbgCF0Pr
+d3WqhQx+8StGsxZLr3vVwxZYJucnpIpvKXJHj/9kQx2MwunTxlq9zvuyPbHIdnAt
+46x1tbYVRlyBaQXJQYRfaXeKRBNoO1lm1matIaXT8zaeBncF13S4vL0GcjKAR5bb
+vCVvdjjrTh9AH1p2g70k58PoW5rbGMshlgZs5Ibcp8EH6BXg3uqOJcZe1kQ6gt3i
+o6iWRRKvaNNdcnqfBFpyP1OXwX64+APWbcGYw+RDMvzoDKi6rikDz6f67v3bI4H+
+X05T9d9Ijs2cKnI3l6aT1EgTD7EKbo7UkoRIe15g8kZ1Gq+ItOJsNOG820hN1UTJ
+                                            </ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.georgikon.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.georgikon.hu/idp/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>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.georgikon.hu/idp/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">Pannon Egyetem Georgikon Kar</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Pannonia Georgikon Faculty</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">Georgikon - Pannon Egyetem</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Georgikon - University of Pannonia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.georgikon.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.georgikon.hu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Héder Miklós</md:SurName>
+    <md:EmailAddress>mailto:heder@georgikon.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Héder Miklós</md:SurName>
+    <md:EmailAddress>mailto:heder@georgikon.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Héder Miklós</md:SurName>
+    <md:EmailAddress>mailto:heder@georgikon.hu</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
new file mode 100644
index 00000000..31fe7df2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.gla.ac.uk-shibboleth.xml
@@ -0,0 +1,122 @@
+<?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>
+      <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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEuTCCA6GgAwIBAgIQf6QTvWph3N1ntBtVc3FgYjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDgwNzAwMDAwMFoXDTE1MDgwNzIzNTk1OVowgYsxCzAJBgNV
+						BAYTAkdCMREwDwYDVQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dvdzEeMBwG
+						A1UEChMVVW5pdmVyc2l0eSBvZiBHbGFzZ293MRQwEgYDVQQLEwtJVCBTZXJ2aWNl
+						czEhMB8GA1UEAxMYbWlsbmdhdmllLmNlbnQuZ2xhLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo7EF1FhY9tVrv5tS/HNOdKSeyi8Of0LKr0/N
+						KkZ7Llmi256nmuFA0SYZeUyItfe6KfUUlhKOYmI7RGr2HaBdkOZxRwxnR5e3V7nq
+						/F+vCkuzaOtOMuTKaxEcfefC3a+CX0k2j16njTwrSzgMuqpy8talH8bU8j1mqmr3
+						lH0doOnasOh2wNTWw1ntlZYLusWHv7qmbW/HlN0Xdn60PGhCVn4gtRzvHGQdujLX
+						zOfLILi2mpu3CCUeqDcaPntm52qsw/fAwEDLTUmc1wN87wxyyQ9VlKKOlLsqpxbQ
+						0urWkuKbjnUovUII6fvRDQXhdFt9fn0sDRGItPXfFtANqLUnHwIDAQABo4IBazCC
+						AWcwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFMnj
+						I2WNS98sfinzx1Ew7oQmayQ7MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
+						MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysG
+						AQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
+						YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
+						AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
+						KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqC
+						GG1pbG5nYXZpZS5jZW50LmdsYS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAF3Gj
+						HKopp9Y3lDiOW9VY0H2yBH5483kuyDFkq21eFR1HcUsEE0Xe7fifZ8U6HXHrratZ
+						qwBj+kmq1qrGneuKJj1BmIKDnz2Qou+zYw4fpZPVaC/bT7UqMYpV3IlLYEQLYR7l
+						62yLQDWK9w8Wl2h/rHTtpW8RAuWWQ5rEfqY+lrwzk+edXZIJ0mSEdZpHBC25NBS1
+						ysIgaqaLjaSyKju0q5ilJaiDSxwDi84lYMAMH2eDxvOog2lVWBe011CQD+PWqiUJ
+						H/2xoBWLQ+/yyLmo2uU/FOvBu4LaD8viTEOr+ocl4+YjTXs0AdWVk70MV5CKVrcb
+						+GfitM++uUllfNx+cQ==
+					</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEuTCCA6GgAwIBAgIQf6QTvWph3N1ntBtVc3FgYjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDgwNzAwMDAwMFoXDTE1MDgwNzIzNTk1OVowgYsxCzAJBgNV
+						BAYTAkdCMREwDwYDVQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dvdzEeMBwG
+						A1UEChMVVW5pdmVyc2l0eSBvZiBHbGFzZ293MRQwEgYDVQQLEwtJVCBTZXJ2aWNl
+						czEhMB8GA1UEAxMYbWlsbmdhdmllLmNlbnQuZ2xhLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo7EF1FhY9tVrv5tS/HNOdKSeyi8Of0LKr0/N
+						KkZ7Llmi256nmuFA0SYZeUyItfe6KfUUlhKOYmI7RGr2HaBdkOZxRwxnR5e3V7nq
+						/F+vCkuzaOtOMuTKaxEcfefC3a+CX0k2j16njTwrSzgMuqpy8talH8bU8j1mqmr3
+						lH0doOnasOh2wNTWw1ntlZYLusWHv7qmbW/HlN0Xdn60PGhCVn4gtRzvHGQdujLX
+						zOfLILi2mpu3CCUeqDcaPntm52qsw/fAwEDLTUmc1wN87wxyyQ9VlKKOlLsqpxbQ
+						0urWkuKbjnUovUII6fvRDQXhdFt9fn0sDRGItPXfFtANqLUnHwIDAQABo4IBazCC
+						AWcwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFMnj
+						I2WNS98sfinzx1Ew7oQmayQ7MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
+						MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysG
+						AQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
+						YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
+						AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
+						KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqC
+						GG1pbG5nYXZpZS5jZW50LmdsYS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAF3Gj
+						HKopp9Y3lDiOW9VY0H2yBH5483kuyDFkq21eFR1HcUsEE0Xe7fifZ8U6HXHrratZ
+						qwBj+kmq1qrGneuKJj1BmIKDnz2Qou+zYw4fpZPVaC/bT7UqMYpV3IlLYEQLYR7l
+						62yLQDWK9w8Wl2h/rHTtpW8RAuWWQ5rEfqY+lrwzk+edXZIJ0mSEdZpHBC25NBS1
+						ysIgaqaLjaSyKju0q5ilJaiDSxwDi84lYMAMH2eDxvOog2lVWBe011CQD+PWqiUJ
+						H/2xoBWLQ+/yyLmo2uU/FOvBu4LaD8viTEOr+ocl4+YjTXs0AdWVk70MV5CKVrcb
+						+GfitM++uUllfNx+cQ==
+					</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>
diff --git a/swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml
new file mode 100644
index 00000000..d4351dee
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml
@@ -0,0 +1,85 @@
+<?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>
+      <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>
+						MIIDWDCCAkCgAwIBAgIIEcxlhYHW7FYwDQYJKoZIhvcNAQEFBQAwQzEfMB0GA1UE
+						CgwWR2xhc2dvdyBLZWx2aW4gQ29sbGVnZTEgMB4GA1UEAwwXaWRwLmdsYXNnb3dr
+						ZWx2aW4uYWMudWswHhcNMTQwODI5MTMyODUyWhcNMjQwODI5MTMyODUyWjBDMR8w
+						HQYDVQQKDBZHbGFzZ293IEtlbHZpbiBDb2xsZWdlMSAwHgYDVQQDDBdpZHAuZ2xh
+						c2dvd2tlbHZpbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AOxm3dLSX+UNx+aVR24NNhE03L/lpOpLPxU+COARq2kuD8AGv6OxUWt0tdDYskJp
+						SwMQRQmqP2R32ulYMQBeeD0e+Kale+b9uX/Zkut8PohQZeSkCMpV0lEmkK07ivOB
+						Mh6FiViWZ0XWAQ/6RfnSC/9L+PJcqpRkAwr0qkGo7k2eaE7ffIhZY7ImKVAiPS7r
+						YAgZPCiWHtC8eN6+h9kJJo7FyFacKMO82lid+rHdUq+X3335xHL7tFjOCzk/AcI8
+						9DSdgvrL3rB/bMmsko7+tz/DbEfrFwMqwpVuX1Cs7YWl88E7VB+FBJZsTLJH2XDQ
+						m9930Nq2iULafPahz+IHhgECAwEAAaNQME4wHQYDVR0OBBYEFGZmAoJCe7wdXY7f
+						/pFKFpXXbwZDMB8GA1UdIwQYMBaAFGZmAoJCe7wdXY7f/pFKFpXXbwZDMAwGA1Ud
+						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEPUdwYfF7ElyNcGzmGgCz0sqZAC
+						UaNoersFgCvSzrc2BWmeivgBUy0VVt5tU2YZKTAcIhvh/ZXNbJzoc+YH/KuLJ1hi
+						7b/jDBPH7QZZ4uv4U/WkSr4n/1tRpUnLrY505X/hCxpH11MOs2OHd5edwiIDuiUA
+						3hDuvyCQYLy386VhX3UZVBtew16Z5KUhPcbtW/k+RhYuH/j2Inq/4W1UpmsNR2Ug
+						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>
+						MIIDWDCCAkCgAwIBAgIIEcxlhYHW7FYwDQYJKoZIhvcNAQEFBQAwQzEfMB0GA1UE
+						CgwWR2xhc2dvdyBLZWx2aW4gQ29sbGVnZTEgMB4GA1UEAwwXaWRwLmdsYXNnb3dr
+						ZWx2aW4uYWMudWswHhcNMTQwODI5MTMyODUyWhcNMjQwODI5MTMyODUyWjBDMR8w
+						HQYDVQQKDBZHbGFzZ293IEtlbHZpbiBDb2xsZWdlMSAwHgYDVQQDDBdpZHAuZ2xh
+						c2dvd2tlbHZpbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AOxm3dLSX+UNx+aVR24NNhE03L/lpOpLPxU+COARq2kuD8AGv6OxUWt0tdDYskJp
+						SwMQRQmqP2R32ulYMQBeeD0e+Kale+b9uX/Zkut8PohQZeSkCMpV0lEmkK07ivOB
+						Mh6FiViWZ0XWAQ/6RfnSC/9L+PJcqpRkAwr0qkGo7k2eaE7ffIhZY7ImKVAiPS7r
+						YAgZPCiWHtC8eN6+h9kJJo7FyFacKMO82lid+rHdUq+X3335xHL7tFjOCzk/AcI8
+						9DSdgvrL3rB/bMmsko7+tz/DbEfrFwMqwpVuX1Cs7YWl88E7VB+FBJZsTLJH2XDQ
+						m9930Nq2iULafPahz+IHhgECAwEAAaNQME4wHQYDVR0OBBYEFGZmAoJCe7wdXY7f
+						/pFKFpXXbwZDMB8GA1UdIwQYMBaAFGZmAoJCe7wdXY7f/pFKFpXXbwZDMAwGA1Ud
+						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEPUdwYfF7ElyNcGzmGgCz0sqZAC
+						UaNoersFgCvSzrc2BWmeivgBUy0VVt5tU2YZKTAcIhvh/ZXNbJzoc+YH/KuLJ1hi
+						7b/jDBPH7QZZ4uv4U/WkSr4n/1tRpUnLrY505X/hCxpH11MOs2OHd5edwiIDuiUA
+						3hDuvyCQYLy386VhX3UZVBtew16Z5KUhPcbtW/k+RhYuH/j2Inq/4W1UpmsNR2Ug
+						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>
diff --git a/swamid-interfederations-2.0/idp.glazer.si-idp-20131113.xml b/swamid-interfederations-2.0/idp.glazer.si-idp-20131113.xml
new file mode 100644
index 00000000..457d974d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.glazer.si-idp-20131113.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.glazer.si/idp/20131113">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-12-16T12:12:07Z">
+      <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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glazer.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Primary school Janka Glazerja Ruše</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">OŠ Janka Glazerja Ruše</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for organization Primary school Janka Glazerja Ruše</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije OŠ Janka Glazerja Ruše</mdui:Description>
+        <mdui:Keywords xml:lang="en">Identity provider for organization Primary school Janka Glazerja Ruše</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije OŠ Janka Glazerja Ruše</mdui:Keywords>
+        <mdui:Logo height="100" width="85">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFUAAABkCAYAAAD303xSAAAnQElEQVR42uV9B3hU1douz3Pvff7/3nvOr0gNKdMnk8m0TKZPEiAJgVBDC2n0TkgCdj14lCJIx9AuiiLSBEIXDaErIBxEaqhy9KhHlGJIkCYw7/3W2ntaSEiAULw3D4u9Z8/sPbPf/X51fWutegA8T0XzeHz7njse/ldx5Yrnzu3bntvUrl27Ru0qf/867d++dcv3efb+7FmFntdefcVz9erVWnyf55HeSz1x54n8MRx//fVXEIb4+ecfcebUCdy5cwfHjh4GgYOB/frQ8Z9RtHI5tm7ZguyM7vy8yRPGY9mSRSI2wl/55TJ8tXuX98K4fv3aE7u1xwrqxfMXsHfPV3z/tVdexfFjpWjSoAHOE7B2sxH2WBMK352OXtmZmDhhArQqGYFzHaGNG2LU66+iZbwbt+/cRpRKDpUkAhXlFb5rx7vs/Ni6dWuw6OMPEd6sKVatWI6Kigp6/RF/WP9PgMrYk53ZA5OIWSS60ChkBIgSH3+0AG2Sk9C5XSpkYSH4as8e6KNUOHG8FLKIZnhv7hx0S+uIGF0USLQJrHDEOax0TktcunQJqa0S4bLE4vvvv/Mx3hgdhcnvjMfqVUUIDWmKGdOm0IOKwbffnkHDZ/6KK1eu8M+++HwBpk6eiFu3bv05QV254hO0b5NCLHJg5fJlCG3SCKPfeB37/7EXuUMHQSWNQLOG9fHp+vWwGHX46aefENLwWRw++A3UcgninTYOmNNqRnO3A6kpSVi9sggmvRZKAnrr5hL+PZcu/caBYmCXHjuKiKaNsX/fV9BrIvH5Z5/CRed7iKlf79uHZo0boMEzfyEGl/85QR0z+k0M7N+PbngSunfuiG/PnKYb1WDsmLcwY/pUTJvwNpo+9wzWrlnNRf/N119BgsvJWRTvdCJ32GB+HYNWgxXLlqI1sXtg3154/73/gwG0nTZlEr17B58sXoQhA/ohWinD+nVrYdRGYtzot9CjaxdMmzqZzunDrzOoX19qvRHWpKGoc/+EoO76cidaJyViduF0YmwyibgGWT26oW3rFCxfspiA6IuZBO7WrVvw/XdnMWnSJJy/8Cv/SUyXXvqtjF/n3//+iRuzGzdukIo4josXL+GPP27yJoj/bXyybDmWfLwIN+i8eFIVz/zlf2LPri/QKyeL6+DNJcVQhIeicf1nEGuIpnP/pOLP9GGndm0go5tZ8MF8Mki/YMUnS/HPs2e4dT9//nyN12DA/U6fZeJ65UoFrl2/SQDf2+j8cfMmLly4wG/t9KmT2LalhKuHIQP7k6pZCytJhcfj+XOCKtzgdZw9e/au48wqMyNS/NkGLP5oPiaMG00i3RudOnRASqvWiE9IhNUeD2OsG9oYN6JNcYimrd7sgtUWh4SElmhNn+vaKQ0j8nIxh6RhFenwr/ftxa/0sNgDDfxj1r+8/DKuksEsLS39s1p/TxBjfzl3jvuf00nHpXdOg1oZiZAINaTGZES27Atj2t9g6zcP9qHL4By+HK68VXAVrKO2QdwGtBHr4MxbDcewIriGLkFsz0Jo2xRA4eyKZsoYSKVKuO02vPLSi1i7eiU91DOi++Wp5jd6nnZQ/aLJdOCiBQvgjo1Gw+fqQ6KLQ0z6eAJuCQGzHu78NQTeagKRwBm+Eo7hq2hfaI7cFbRdyZurcsslwIfT+3nLhff5azo/l1r+argZ6PlrEdtnNrSthiAsTA1JSH2kp7XDFzt3svAt4Kbv1DmudQiqcBmm9+bOLkSS24VIgx3a1rmw9Z5LN/wJZ58zvwjO3FUiYARGrgCcPa/IB2LtWhFvjtwiOpcegng94dpFwj5jOz00F13bPmQxYjKnQNu8F7SGWKQmJ+D9eXMCGOx5ukBl1vcY+YcvFOTBYLRAFZ8FC7HEzYAiNjo4w1ZwAB0BoNjpGH+dKzBQYOX9grvCB7CwL77ODfwe9h3CZ1z0e5z0uyw506COy0K0wYqh5Pbt3L6N9P8fTwGoZEFLSU8y/y+M9KO+48v0g+kG8tb4WBQIgMDKooAbL6oESBWg+VhdFVODjzm8x72qI3elD1xXwOfsw0Vp4ZKzGqbuYxGmMqNVUhL5uWt80dcjBvVOJYV+h1yia0jrmIqQUDlie72LONJj9ryAG6YbC7wR132x73E1UYWQYXSSjncMWwa5uTXUFDr/Y+8e3+3erzm7D6beFnXmFbw8Mh9qVTRieowXGMZ12grRwHgBLHpKgVwZIB3i7ySJceWJx+hebAPmQxnTCt07tsdPP/7gh5T/89QhqPSp1UXEPocTmuTB9ENIH3IjsEoE1S/WDp8OE8Uy9ykGN0/Q4w6+pftgxo0ZOdK9BnLzDCYr5pHh9dzx1K34X7p4AXlDBkIS7eZP0T5kGWJJ0RvTx0Lf5XXoO78GQ7c3EZM1BfaBHxGgy7mu4r7kUwvmai5Z9iHk5/aaTffyDt3LaBi6vEn3Mo7uZSpsgz6CY+hiKO2dEO92Yu9Xux8OVI/436mTJ6Cl2NmU9jI3ROFKDeRN6qNThAbDFXaMimzJ2wiFG+kSLdRNGiJMIkNUy56w9HsPzgLB2roCmOsXt0CrvzLAYj+4SLsCpYN/xyfU2ANeIfi2zDcethz6tiMQoYpFeJMGaBXbCMO7SfBGHzlG91XipWwZspPDoZHUR0gzCbQt+sAy4EM0birD0oULeB6iukCnRqau37AW8ohmaCZVwSCVYVpUO3wZOxCHbcNxzJ6PUhs1ewFvx20j6HUujlkLsNcyBAv1XZEpM0MpkUBqbQNL70JyyjdyUWMGjTn3zL8UrLYIRm7Rg4PKpEN0n9w+V2uVcM2CtXAMXojIuF4Il2jQxhGOJW8acPITCy4Vu1BR4sSVEjeubHaiYrMbZZvp2Bba0ns/r7Pj08kmdEqIQCiRJjQkDC+NHBEMm6eWTF21ciXCQhujk1SPZfp0HLUV4AS1Ums+jlI7YsvDMbEdZSBbh/PjbP8oO27Pw0kC+h+WoXhfl4bushgoNGZEd3qR62PuzuR6mbUiwCV6sBao073XcuWvIod/IkVyLZAaJ8f7r2pwZpkNv29x4XcCr3yTE5c3uVBeImwv07acbflxt3BsEwOaQN/qwsEFVhSkq9CsUQNk98jggU5VgUOVoG7dvBmhFFbOITBOEgs5cNY8ASyrF8g8HCHgSsXjR2xeUPPpM/n886UiyOyc03SdreaB6CMzQRsZA2PXN8SQtEgUU2Ysih5S/EVm0nVie74LdUwSusRHYNtMM65tZUwk9jHASoiJHESXCBx77RYBZSC7OcBCEz77mwj89e1u7JtvhsPQFL1zMnm2rUadWlp6jAP6tWUYF2+BkfkioLmcsUdENnqbl7EMvCPeY/b84M/Y2TaXs3efdRi6SqIhUevI8H3IQWBxv0uM5R+45QmMVzk6wxnVGHvfi8XtHXEEjMMPmMjAMhGwch8jxRYAtL+xh2H3PYhyare/dCHZHIpxY8bcm6m3b99Cy+ZxWGXM8oHpBbQu2nGLADYDv5RebzL3hilUgqjE3txb8CZMmM4VkiTLfXrXGRQRrRD0MHfnhNDUnb8OMenjENosFMvHGASGbXZXAVAdNBH4CtK9Dl0I9u3bVz2ob08YhxEyN07QjXMAbPk+sa+LdiSA0d52kNj/vCoOcp0DNuaOiYkRR271uQDuR7JcghhuMt9S6UxHt0QZTn9iw9UtXr3o8unF4NcP3xjzKwjcL+fEoE1yctWg3rx+HXHRehywDg1i5xF73YHKAC0NPGYXgD1F+vY9fRo0EQrE9JwuuGBBUU/V+pNlthzDlkKhi8OoXnLSmYLRKa8MQImrTkFlBq5c1MHXtrkwsJMMB77e73MFfKBOmzYF41TJ5BrlcyB9urEOmeq9VjBbBTeMqYWvYgdDQ36uqfsYMc9adZLFLkY/tgEfQCpRkrjruCESwHPz5gWSGx2RWXUFakWxm+tp1pie3ft+DOJczX21BRxU1smmUEZgl2WQz7LXJZi11rnc7x2O+DAZOed5PHBwBWapuP4Uktq2PnMgk4ThwIdmrtseie6shQpg20ufOxEb2ZRX23BQWc3Sv/71PZJCVYJhegJgBjK5lHT5AfI80uRGRKcMEiIybz5BFH1LrxkwR6twYL6VO+nlm54MqN72O/2G2c9ryLcvEkAllno+mP8eCqM74DjpNsHXfHLAHmY6nH7DN5ZctCe3y9jhRZ9+ZVtr//nQqeXYPz+WAGVsITEsdj5RUNlD/X61BT26dBFA/enfP3pctlgcops4HODYPxGm8iBjONfnpdydy4M1pClM3UZzl8tK3kFY00Y4ssgiiHyJS3TQ3U8c1N8p4oqSNsSlSxdQb9nSxR7ts41wkjO0wBdmPonGgPzOTsFB7BAUajpguNyJXjILpCENoba2gSRchcLhaorXnbi1w80tfQVj6qYnDSr9DgLVHtUApceOod7LL4709A2PfTzABUjCsQBjWEqW/yBJyqvKFrBHa6BqoYO0nRHSLmZIu1ugSLdB3s0CeedYSNsYEZmgRVKCDIX5UQSwncfm/tDS65w/ZpVA3/lSjhzr1q5HvcwOHTzLjZmPxC+9i4nWACDFkPYE6fEPdF1g1msQ3tYAZbYDykw7ZFkEZAa1TAcUGXY65qB9OzU6lkXHaD80RQ+zU4Xlow24UuL1H8VQ8jGLfzmpo2VjtJg1czbqdYtv6dltGfjY3KjD9mBxnxTdFuEOFYFp52DxRoApCFBlhggiB1NoCt++jfadUOS40dQVheezNSj7XGBq2abHb7hYdLVjlhljRo8hpsa4PSe5Ls2lCCf/sRijY2LCZaO5DyTOSMizbRwsRbbAQBkDLIu2DFiRlYy1/DMEpDLDKQLOHoQAtKSDAd2TZbi9Mw7lxXGCKnicbCVQTy+3oCB3COr10rk8ZxwjxdTdo7X+voiKLDzToVqFhMCyi2AFM1ERxEr/a//7tkrvOSAhfft8uoK7Wsx4VYhpvsflcp3f6ES/nO6o1yfa5Tlrf96X7HjULC0VH9wH+m4IS9EFgfWwjbFW6tLg0EdWbryCs0rOR85U1rK7d2BMdROoI4N9xUdo/Y/yBMoIDIpycaPkFWtBRz4MqDZu4Jgubu2WUHzu8quAkscQrpaw3gQHMru2Rb2MmDjPabpJnud8XKEofZ9dEwlljuMu0X5glmYI11IRWxsbFTi0wCx0l5Q8Rg+AWlY3Ymp3ZwvPEdJxxx5XxES6+wgFGmZdpM8w1QmoAbpW2s2Kea9E85i8nBjLOvAeufiTDj+/0YG+Oemol56U4tkVO+Cu7pBH3czRxNRsZ50x1Wu4lIyxJAE5HZW8P4mxp+wuECrlXEucDxWVCeLvxrcr7SgYMhj1stLSPBtjch4LU72dhCfIP3VEabj41x1TbdwD4Ps97UhtpcLVrYL/yHpPrxJrf9/iFBPZfj1bViImZUrcvPPvgYGl6+6ZY8abf38D9Z7Pz/NM06TWaV9UTSqAGar0yFhy3J11av1lPNqi/SwnWiaqcHOnC6eWWbDkNSMKR2ox94VorJsYg/Prnbi2LZ4DzjoAy1jHYIn7wYMG0fKvfTsa06ZOQ72Z7073ZITo/T2n1kcJaD6P81n9wDsUSUlZPJ9dR8Yqyy6GtVYoe7qhNUgQa5FD3koHWadYyMTcgay9GYpELUzmcBQWaHF1u5MHC5ylD2HUrlCbMSIKH3+8CPXWrF7lcTQIoxsu8N14nXWXBOyf5LnaPGw09cK8qE54VdUCodHhiGhtgCzdSkZL8DN5rC/qR6+urA2oStE1k3WNhVUrgyoqnK5JkpBlC4rAuIrgbHYgPMWAxBZyHFwQy3MHZSWC/mXuWPl9sJbp1CvE9vQWTfDlF1+g3unTJz1RzULFypO8B05S+2oDfIUXfhdtpSELw6PiYIpWIcymQGgrLcLSYiGxK9BXIkEPhQxGowzSZD1kPVhoKkZLGdZasdjr40qJiQnyMBQb9Ih0a7gaEIxXNQaR3lf0sEKik2PXPAFY5i0wUfb5ubVk7xXS12ZlfZw+fRr1yi5f9rDhiofFSpIHNVhC8USu73ymTvZZhqKtVIeQeJXARCbqPjFlmScbJKpQFOm12BNjwtzISFjDwoi9OvqsyL4MSy1VgAN2VQRdR4+/00OStIvh2S0fO6txw1jAoCKDGSILx4kldl/xhK9zr7ZMJWOolYagrKwM9W5cv+F5/dVXsMGUfVdVyf0yVegdLeBVKNO07SAzK4h5Fq7n5F7LzEQ7gxkVQdTlTDz1MoxXqbDHbMJ2kx7TNcSy6AjI6CHIsmrnIUisSnyk1WCHyQBzeCgU6bVhuYM/WM5Y2u+SIsP1bQ/Q50WMZoVsnTu25UXB9e7cuePZsrUEb0UmcQPy4Po0X3SXCvByZHNEtIgWdJf44wPTdwLAQuO6joCTkfFIVklQqFETMHqsJPZaNRFQ9qhNNGVDhlqGXSYjlkRrIW2uFQxXFcmZ6hIzPD/rjsLGSSYxEnPXOiJjbtrWwhi8M/5tfxf1Dz/9iFbhai6yD6pLmQ5lgI4n9ywsIZKL+n1FQ+wB9HAgLF4Do1aKQZFyvKyQI1wRzuN5f17Vy0CrD7RQeiCzoiKxjVjKdGp14l5Tk6bb0LcTBQ3bnKKh8tYPVNX8uVvmAxeky3H48GFvMYXHw+r45aEhvAfzflyqQOPEegy2U2Qmt6mFSCmr9q6QIiAvylVCT5dgndvHQNqCmOdS8dfcymcJPQMMOJl4TkS0HJ8ZdBilVpIRNAbkXu+zEREciWru3wpFGEyvxlUJaEWxvyKQ1bga1Y3F8bAQQGWVFQmJ8dho7PXAHX8sWjJFSIlttipFrXZJESHbL7hIoovF0nkmFeQdY7hzr8pwiq6XEJIykFswtRGpRoRNMIheHfkgoCrdkfhptb3GXAGLwspFJn+73AqVUoM//vjDL/6s7qewcDomR6belwoItPRFpkxIW+l9jFNm3F8yxLef7XWlbH7r3d0KmUXJVYoswxHkSslJKiwRIdBa1YKfynoMsqwPnJSRJhtwdKFZjOcd9zRaTEWw6uvFb0Zh3NixlQvUPCgvu4w0pQmneP1pXo3uVWCvKCvXaa8wiCIq6D5Z1gOCynOijqAkCWOQ1KogcMX3s8QIqqsFMpcaUnukz6tg5yqDgofafz+7hixFj28+iOUsLLtnAoWpBQeubY1Dn3YK/OgbGsTKfgJKKZNaxGOHuX9w0a69+ujpmPj+7tjBpNckYvRif2Dx94u9jbtcnJV8n1ibaoLcHSlctwsx1xEJiZa+k4KI+3mA1RpJcV+WpMORj61cV96LpWU8+eLE2ZUONHc6qqlPpf8nT56A1xXNeXzOej2P1SIkZW2tIRvNEjXcItdFl4jX2gsdgA7OVDl5BlIFBQbyEEidUZAzlcCOP2TuQF5Jp8rJ+/i+yFZDF4wTZcVOrk+nFSgx5q1x1Rf9njt3DsmKaJxhdf41in++L7Z/T98F4R2MHAR/jG196Btl+lWWrIOUhbAk5jLyAuRdY3zA+yMmW91kunKcMDVXkUsVF1CUUYX4Fwv505vb3WjjkvO5DKoBVdgMHdwfnxgzeGRUmz4rpk+nRreFpItZdLiF/nj5A4MqRFmyFB1kRjkPCpTpIoO7kA41yQMy/Y466NsKZmpqkhJ/7BSsermvYLiS6It9X1tnmjB00MCaB1J8+eUXaNlEjpPWEeQmDa/Sb/X6pXx0Chm2GdHtIUkzc1H1JotrLZLcUjvEjjsGKIm1Tcl1pizHX5miZA8q2waJmoKB9OBkijxgez+diPLMYIMY0cGEsf0jeXnmXR2GJcE1qde3utHK3AS7d31ZM6jktaJtchL224bwzNWReyRQ+Hv0mYX67ggl8b/7x9bGMAX4lORfhpCoW0ObcsvOVUiWy68SWNapsxnSxCjxfKtQpZLp8Pm03PHPqh2Dhc8LBRrMIEpiFDhDPuflYtEPLa46omKBwc9rXGjXOtFvkGoaR7Vn7x6kNlNzFtbGV11vzBEyUWL23eu415Yt3vqoCIcK72mj0JbieKmYxWLX8VWjcBG1QxIlEUDn+dJgKy7PrL334c2U8XPJixjVX83L3L0haGCVS6AnwFKErZ1sQrH9tR9Gef3GDRhj9Cg29apRp7L391mGQEruje/Gs2oPqsAYG6RtDBipkGFfjBExBjlnG7f+mbYA9ov6mgBl3xdlZcZLQ2IbIzAuy14pwV2z/uYGj87RGSPw4xpHwMALh38QW+AwHwoIviY/1hJjxU3CyXM/A34PHzqIDLmZJ0kC9WpVYwJYLVaGwsxrnxT3q9eYDqXzEtQS7CZAP9FqyTjpfGBz0fZd1yE+MHoIKUbkyCVYGq3BS3IZ3MoIyJtrIU8X6rAUGbagruvgjFSA/mVpyFglvvnQwrNN/hGAgcMpnbxXgG1Zt3dWaymfl/D+h6ZT8JrSOglL9ek44sgPKrM8clcpTz62xfRDWLxaKHMkPSivolOuOlDD3GrM1URhu8mAVmFhkHW3BKiFagwM6VdmWJKaheMLsw57zXos1WlhCCU/lutjgemqLJYvsFOz+XoA1Jk2/zV0UuyfL1Rm82x/lQPRWLjanBx+Bz6bbEJqq7YBM3Z47m9o+rdnTiFRquG9n5XrSqtKqPSWWSDpZBIZFlz2WJ1IqnLcSIyUYrfJhPlaDSTENqXXgGQ5qtXDLL5nulbWJRYmdQRmazT4ymjEZpMOGTIpJKlGbnzYQ1FlCG6a1zNR9rQjnGL85DgZji+xiQVtVUdQ/mMOXN3mQopdhu+/+/YeA9PvyVRhM2rUaxilbOkrCzpWTfx/VGRsm0g9pB2NfqPhFcNq0nHhxLbxGhUWE6BKFuoGuGPye+hgRYbDL8o9yK9tHoUUUiHvqNUoNurRXSGBjPWeit04TBez12HxOrjiFZj/SjQufkZR0WYhxi8vqa7MXRgteJWM1tuDFLz+tKYZVe49iQKfRvMi7DodDvL+p/ygooiqQtdD1mHorDRBkqLnec+aDFaIVYnRKiUi9XIh9RYAliKran9XCCwqu00Oni8IowhMSddKUkVAogyDzq2CyalC6yQVhnZVoniKiUdM5ZsDhqKL2+qYygzXLxsccFsNKL98ucZ5rGo13ceXu3bB2SSCXKwRpFfzfUW7lcNWr8495RiBmVEdEUGxuiRVT2wRS8qzvV0rrDTHToyOhSS8KcLd3mK1uqlY4YlsCjmVFMd/t8qKO1+4cGtHPK5sia+5Iponpm2+Evcy3qcfB7umPnbv3l13c6iwufr69e2NuQTUCTE1WJU3wJtd6OrmwzEtuVhGIW8/lR1mlQJSEm81OdisyCEjVYGNU4xwx0Zw8fW7THVXqxpBD+2N3pGCaNe6RlVkbbEw/vQq+a0f/z0KAwcPwp3bd+oOVPZ37do1WPQ6fBbTS5wcoZr606DRJ0I1IRuV/bmpH1q7w3BxowO/0Q/+ncTv2lYnOsZF8Co9Bqgs42FrqSql9OhhxdvCcWN73H31kJZv8k+ycGihBVbS0deuX6317FT3NYXSjp3b0FamE8p3rJWKhK15dxmyI+IoafbeGn0OsttLSJc5A+qP3Bg/UE2MMvuTz3VZWU3qxkzW+tbOuFqXUpaLCRNhpAs99ATyTPis7HU8hVLgE3pn4ngMlti5eB+tNNGCr9THencyewWBOqibjE8AU+6bEcKOnYUmRLQw8ESzPKuO8qK+yM6BGKcCN7e7qi2VLK9qW+ziGf0R6VKMHTPed/+PYAY14e/mzRtI79YFC3Td+GgW79DHmkLZ5QTqkG5SMWpxCjlJugEmmjHxSm7IVBl1mMYT6wqsFglu7Iivmqm+8nVHsD6l42veMfDJZ7xTND/yCRTPnfsZBrUKm839qtevvokSBFVRpO+J3p0kAqglLt/8JayGtCBDAUlnFkXVZWmljY8WzEqR4fcSt+8h1jgxAv2+Y4ts0Ecr8cu5Xx7vrJTHjx+DWSLD3thB1dYKHLP6w9qNxj5o1zyclxyWB6XRnDi0gPWWqoIisbpo4a0NmP+S9q6ZfYJFX5jVh7tSpO//tcqO2OgwHC899sDTdT4wqOyk1SuXo02EtuaiNjJYe8yDoJA3EjrMvDcoFiRcp/BvVL9IHvHUXRbfDp1Lyev9y3lc76zWL+VjAkgFXCFwOyWE8ynyn+iktDPfnYG2zdQ4a38hINky3Ncdc9TqjbRy0ahhI1z41FvZ4fapAZYBurDBBYtR4i9kyxJGnAi9s45KVSx2UVU4fOGw3NdzIHQYhqeaMKa/Ble30Pd9HljQ6/aVpfv0LAF66ws3urcMwYzp05/8TL+sumX8uDHICNXjpLdw2Cr4qEEeAXkICQT+kcWWoEG5PLvOymjo9XcrrdAZpJB2DRxb5RQTK2JNgZgzDez04xGaOI6VJVFYxV/HRDkufi7McVIhJkR8rtymODHz5O0acWFA+zCMpbi+Lqaqr5Ppk1m5ywsvjMQwuZ0XqgXWCxwT2ctcsFnRXTHr+Whc2xJY5CV0W3j16/er7WibqCB9aBSqVcRxqrxP3leO6W/+MapCriCinQlJcRL8sMohWveAyj3R2pcFzpBGr1/JVmLkiBFPyfTJAfr19q3b6D+gD/LkDsFvtfv9WO9ME4zJzqhQPkafsaVCzK5fLnYHJIWFWR7GkY5VsPrWNIsQaWWLZeUBHgJP2GQL2Xt5F4rKHGoUdFPgxlZ/3xKXgmJhkITXMFWI4s985tdzlOjVs+dd6wI8NVPS3/bcwUsvvYiuzbQ4Y3/el3TxspUVabQPNWLtRANZ2oCKZTG7XiHqPGEirThesDD7BS2MUU3RWKdCSAstwtPIVepiQSjF9c2aR6MRqQuVKgJvD9Lg3HqHOPOPwz/mv8Q7+Je9ZoVncXyKuds73chu3QzP5+fzxWqe6nn+2RN/d8Y0tGwiI5EXioG9bGVh687YAWhjlaJii0MAtsTtc2u8aiAwucFmQ2Pj+M8ut+OLmSZsmGTGqglGbJhswo5ZJpxeZsOlz1z8c8E9n2JXSMBkicLDEvIObeyNMHXqlEeyhNIjW5Fi0ccLYQ9ToDimjy+kLbUM5ypgmCIOE3I1fLpNwa2qqiTcWWkGNHF2tM1Cb2ZFpUFmAsPdQbVOvhEmHFhhYFrpIgsc+hAsWrjwT7DMh8c/O7D379CBA7DotFis78Z16mFx2tBD1NwSOU4tt/kGhZVXcnn81SABo/M2BcyVEvBZ77DwoAfhDTn5MfJBt8Rh42QjHyHz9f5/3P1jn2amBuXEPUKuICm5BQZJbTjreJFYm8vVQLGpN5pGNBTUQLGQsWI5zMoTHpQFstTrFt2VHHFXPxKP2Ikv45DXVYrEhES+gtujXn+vDpnqwT/PfltlzpFN3Dpn9kwYGzXFRgLzlG0E17NzotPQLj4Cv30eOAjXn6Yr3+Qdz+Q3OAJjHWIsHzxRgpBh8s/td22bG7vnxcKkeA6zZ83yTSDLVtDYt2ePIE0HDyDGZMLP/z739IHKRro1rv9fvPj1Nin/qi566OA3aJuSiOEyBx9jddo+EqNUrdAtMYL7lb9vCZz7RByoUOL0T3McCF6QUXL43CXGaJat/361A/ndpUhtlYzDhw77fgNbK2XkiHysXrUSV66Uo3WrJGSmd8H69evw6y+/PHlQmdPPLP2RgwcR1qgB1qwuwgSKrvr36VlNZCIcm0WsdWp1mBqZygfFTde2h1MjwaYZRoGdW8TezZKAeVB8sbrT13dUHmDQmM9ZsYWNZ3Jh1gtRsJk0JB2zquxIZkwd0K8XlLIITJzwNpo0qI/wkMY4QLq2qumQHyuoR48cQttWiVBKwzF1yiT06JIGnSaST2HP1tBj+itI03qEAgSW7v3jxk1MnDgBTRs+i7+pWmC/dQhSw7SIUjXCZ1PNfJTzjW3eYePO4FDTl6G386zXjR0u/LLRgb/1VqDRs/Uxbdo0euA3/N/n8Tv2Gz/dgH1798Cki8LEt8fiwIH9KN74GQxRaijlUsydO/fJgsri/sLpU7F8KVt1sjXUSilaJrgxfcpkvPzii3x/EgG3x7tI7N2cwYUL57FixQq0T0qEo1EEBkns6CW3IU6hQAenBBOHabB+ogknl1nJuXfi10/d+BeJ9r73LfholA5j+ivgjG6ETm1TsGbValy8eJGueufubyPJmV1YiFVFK4iZz/FVKlu1iIcuUskXuWWLPE4gkOsisqoTnbp18ybkZGVg2KB+0KqV2FJSTIz5K157+UVER0Xiw/nvYfGihfyrqlsUljnhbPmlefPnoV9mBpJtdhjCpGhWny3J+QxCGjyD8CbPIqJpfagkoXBaLcjKzMb7783HieMnqnXi2ZJ3gwf0w4ypU/mCjWNHv4WUxAS88bfXObBsdUomaWxBsqfMUAmXmD5tCgE4H927piGtfSpiDVquc7t16oCxb75BLk0cL3xj4NWYDaKQ99y5f2Pfvq+wdWsJNm36HNu3bcHXX++v1YKL3h5gY7QW82YVEiPVfFFceUQYX7gxpNFz2LK5BLNmFuLsmdNPt5+6Y/s2dOrUCdMmvUPG6znuFbBVfNWkr+bMmo3XX3kJf/mP/4ailSsQOGt7lSDf5aBXv7wGM5qsP2nWzJncogsLGwDvz5tLHkASNCoFSo8ewti33oI8vBkaPvtf+Oc///nncP6ZTmIWtKioCHv37kW71klkvFTo2ysHZ06fhCXGgBidBseJrRwMCg4SmyfgtddeRvnl38j4Hbln8ZfX+Ny8cR2frl2Hkk2b+AMZ+9bf+WqWvXtmQxbaxGf52QqUEc2awBajJ2svwbvvTsMPP/wL5+vIfXqssb/3b+iQwXxt6Xatk0kU1cjs1plb3uskmqwUvn/fPnxBb0dsDFYTezt3aM+9A7a+qcWkw1e7dmFAn958BUtmFFslNkdyy+bI7N4FLd1OtGqZwIHdsGE9WsTHYd7c2fj7315DdKQKP4hrVW9Yt5bec+HkiRNBPuufFlTe+/rzz3Sjr5O1TUC/3jnomtaRfy0baBzWpBFf3XzqpIkoyBuGGdOn8HNyMnsQuwzYQXp09qx3+brVCz58H//1n/+DXKLdfHX1PjlZfLHbzz7dyAfbspV8161ZhSilDDF6LYYNGez7Dd+QLn6Ui3o/dlDZ3/Vr11FxuZwXeb0zfgI/xoCwmw3IGzoYzRMSkEQuGFuCk61WZiVA2QyPmz7fiLlzZiOVLPf3332H5/76v/AseQOzC2eg/v/+T25wfiGD9tILL/DzN31eDCXpzJs3rnH2Pom/xwZqcJrA43OjOnVIhUIqwe5dX/AV1DO6dsakd8bzuaclIY2wgdQAs+Bryb9kPuhf/uO/czaePXMKGoUERcuW8uXtmYpo7rbzNaxXLF3iG9H8/w2olf3Ty5fLuAewdNkSLFywAEMG9sMK2l/w4QIUTpsKt82CBJcdiz7+iC83n5LYknsVbNb3W7duc115i86/WYe+5sP8/V9blju43vWItgAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.glazer.si/eng/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.glazer.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>MIIGFTCCA/2gAwIBAgIGEkpMIjS9MA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAlNJMQ0wCwYDVQQHEwRSdXNlMUgwRgYDVQQDEz9Pc25vdm5hIHNvbGEgSmFua2EgR2xhemVyamEgUnVzZSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMTI1MTEyNzQ3WhcNMzQwODEyMTEyNzQ3WjBmMQswCQYDVQQGEwJTSTENMAsGA1UEBxMEUnVzZTFIMEYGA1UEAxM/T3Nub3ZuYSBzb2xhIEphbmthIEdsYXplcmphIFJ1c2UsIHByaWphdm5pIHN0cmV6bmlrIHphIEFybmVzQUFJMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtX68gI82zNKqBslH3oPJGuFLWle3znAvX4GZr0gHl97pDBT0u1tYt+yeMpixJ7fNskbmpqqz6yKYmYrjuhirgWA4heiil94zCaohWHfBTYjRE0HfdEiXTdFyucflma4Wd+m3RdRHyBLLt4d5HAL2jtgAOQHrjFkKeSG1lwGmJtcbZBJi4rpbcls4+3QSKZ/zqlKOs9Oer2JKAgq9BUqF531EqJd7pYe29HiKz4QEKmqE/lwRUKPZOvqRC3GibovxCBnV26aMQo5lpmaHp7JIhuhdPt3XP17IIS0xRX5d37pHlD3r2RHXw4WxKvFFH40rU/QZtknl5s5oIH7AaS6uOv+7L8bI8ycrvNKf3Lob5ctbJfij95K3NNWd1nbHjeTHtOoRx3RnNfMt+9gtsMXbrjTe7oe5BmFtr8D1Fcf4pWnnPz6YAB8F4qgogl5u0KzgjaWOiFgGP7/63S7/s+gBvL0oU/7viA2wfvIqW0E2dgMO4IAFG+FJi0RJioZey1a82rA53Y3qQ7eq1m+xIhDCqA5u/0IpULEsUCyX3RpXqiXbykyW4njcYKyiLi0C9/ZH/SEHqsnrx8RdcUqMoF/LaqzpOq7fcVr319ArfOaVtCEzhqcWcd1IdYHI+o9stL0687wr2GejZ6txG4o6L4xxf/HNL7DOxqVajX+jKe04Gm0CAwEAAaOByDCBxTAdBgNVHQ4EFgQUnKl+vr+rf+NBVIkRfIp3ls6T9SkwgZUGA1UdIwSBjTCBioAUnKl+vr+rf+NBVIkRfIp3ls6T9SmhaqRoMGYxCzAJBgNVBAYTAlNJMQ0wCwYDVQQHEwRSdXNlMUgwRgYDVQQDEz9Pc25vdm5hIHNvbGEgSmFua2EgR2xhemVyamEgUnVzZSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUmCBhJKTCI0vTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQCI4UOJWI2wVmnT0laJhod87zMaZURqNbYcT4DR8vHje/IKzQwJt33KP4i1RNrrMFii/7baauNb46ilBBS4Tcd6CDTSxiZIkICf1VBnGL99xImrRlotfmQv9KBuR//ePXR8FwPYIgtivNAzZGOgpIMhFzaxqCpxBXSnWmAIpgIg0f1JKNFqKG8G5VLjRh6aMiJ89b8ig1fTCAfignjm0fUCcRTMiOV3qflWX1data0BDdu7Evvm8mj4PGPc/qCovW/pBSJwjaWp8b63u6NMpmmciO3fCfQatwTgdaV0Ye6dxgHzD1OBK3qiLl3WlI8RgxaLMXj//dE4tcMFAWRscNjgElbbFQCgdPkF4uKVV+R99BfKnkIMmiA7UlbHun3L3PIVOuKyTx6CMoO8srSN4lhXrmCjhoNfoKUXITAx+6Zo1a34JJ/RQ+a0UTDcewLeZH/kv2NAEs8oRhHWfxBVSOTqOJpeoHPIUnvQx5JHVCPiURkHigFZD5kHIBPZKemuB01Nfqkbu1+mBHghJ3TCCEWvM3nnjNnbaLi8MqK8WGzBNG5Jh1kfVC7rqPiZi5emgjGxFV0wjmCCuxFwFB+KzJRxfD59B4QQxYkICFrbbUUfY8qtROUSpaCX0XnYLTMEefMVgAUzHYx/j95G1GdQkYdGQpdQyAbG9bm0AoSy8qFkhA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGFTCCA/2gAwIBAgIGEkpMIjS9MA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAlNJMQ0wCwYDVQQHEwRSdXNlMUgwRgYDVQQDEz9Pc25vdm5hIHNvbGEgSmFua2EgR2xhemVyamEgUnVzZSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMTI1MTEyNzQ3WhcNMzQwODEyMTEyNzQ3WjBmMQswCQYDVQQGEwJTSTENMAsGA1UEBxMEUnVzZTFIMEYGA1UEAxM/T3Nub3ZuYSBzb2xhIEphbmthIEdsYXplcmphIFJ1c2UsIHByaWphdm5pIHN0cmV6bmlrIHphIEFybmVzQUFJMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtX68gI82zNKqBslH3oPJGuFLWle3znAvX4GZr0gHl97pDBT0u1tYt+yeMpixJ7fNskbmpqqz6yKYmYrjuhirgWA4heiil94zCaohWHfBTYjRE0HfdEiXTdFyucflma4Wd+m3RdRHyBLLt4d5HAL2jtgAOQHrjFkKeSG1lwGmJtcbZBJi4rpbcls4+3QSKZ/zqlKOs9Oer2JKAgq9BUqF531EqJd7pYe29HiKz4QEKmqE/lwRUKPZOvqRC3GibovxCBnV26aMQo5lpmaHp7JIhuhdPt3XP17IIS0xRX5d37pHlD3r2RHXw4WxKvFFH40rU/QZtknl5s5oIH7AaS6uOv+7L8bI8ycrvNKf3Lob5ctbJfij95K3NNWd1nbHjeTHtOoRx3RnNfMt+9gtsMXbrjTe7oe5BmFtr8D1Fcf4pWnnPz6YAB8F4qgogl5u0KzgjaWOiFgGP7/63S7/s+gBvL0oU/7viA2wfvIqW0E2dgMO4IAFG+FJi0RJioZey1a82rA53Y3qQ7eq1m+xIhDCqA5u/0IpULEsUCyX3RpXqiXbykyW4njcYKyiLi0C9/ZH/SEHqsnrx8RdcUqMoF/LaqzpOq7fcVr319ArfOaVtCEzhqcWcd1IdYHI+o9stL0687wr2GejZ6txG4o6L4xxf/HNL7DOxqVajX+jKe04Gm0CAwEAAaOByDCBxTAdBgNVHQ4EFgQUnKl+vr+rf+NBVIkRfIp3ls6T9SkwgZUGA1UdIwSBjTCBioAUnKl+vr+rf+NBVIkRfIp3ls6T9SmhaqRoMGYxCzAJBgNVBAYTAlNJMQ0wCwYDVQQHEwRSdXNlMUgwRgYDVQQDEz9Pc25vdm5hIHNvbGEgSmFua2EgR2xhemVyamEgUnVzZSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUmCBhJKTCI0vTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQCI4UOJWI2wVmnT0laJhod87zMaZURqNbYcT4DR8vHje/IKzQwJt33KP4i1RNrrMFii/7baauNb46ilBBS4Tcd6CDTSxiZIkICf1VBnGL99xImrRlotfmQv9KBuR//ePXR8FwPYIgtivNAzZGOgpIMhFzaxqCpxBXSnWmAIpgIg0f1JKNFqKG8G5VLjRh6aMiJ89b8ig1fTCAfignjm0fUCcRTMiOV3qflWX1data0BDdu7Evvm8mj4PGPc/qCovW/pBSJwjaWp8b63u6NMpmmciO3fCfQatwTgdaV0Ye6dxgHzD1OBK3qiLl3WlI8RgxaLMXj//dE4tcMFAWRscNjgElbbFQCgdPkF4uKVV+R99BfKnkIMmiA7UlbHun3L3PIVOuKyTx6CMoO8srSN4lhXrmCjhoNfoKUXITAx+6Zo1a34JJ/RQ+a0UTDcewLeZH/kv2NAEs8oRhHWfxBVSOTqOJpeoHPIUnvQx5JHVCPiURkHigFZD5kHIBPZKemuB01Nfqkbu1+mBHghJ3TCCEWvM3nnjNnbaLi8MqK8WGzBNG5Jh1kfVC7rqPiZi5emgjGxFV0wjmCCuxFwFB+KzJRxfD59B4QQxYkICFrbbUUfY8qtROUSpaCX0XnYLTMEefMVgAUzHYx/j95G1GdQkYdGQpdQyAbG9bm0AoSy8qFkhA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.glazer.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.glazer.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OSNOVNA ŠOLA JANKA GLAZERJA RUŠE</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">OSNOVNA ŠOLA JANKA GLAZERJA RUŠE</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">OSNOVNA ŠOLA JANKA GLAZERJA RUŠE</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">OSNOVNA ŠOLA JANKA GLAZERJA RUŠE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.glazer.si/eng/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.glazer.si</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ladislav</md:GivenName>
+    <md:SurName>Pepelnik</md:SurName>
+    <md:EmailAddress>mailto:rav-osmbjg@guest.arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:franc.jakos@glazer.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Franc</md:GivenName>
+    <md:SurName>Jakoš</md:SurName>
+    <md:EmailAddress>mailto:franc.jakos@glazer.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Franc</md:GivenName>
+    <md:SurName>Jakoš</md:SurName>
+    <md:EmailAddress>mailto:franc.jakos@glazer.si</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
new file mode 100644
index 00000000..94d75255
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.gli.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDJDCCAgygAwIBAgIVAPMK1aN36mJ1EI8m5HvYF+VJwrIuMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5nbGkuY2FzLmN6MB4XDTE0MDMzMTEwMDk1NFoX
+DTM0MDMzMTEwMDk1NFowGTEXMBUGA1UEAxMOaWRwLmdsaS5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiBF7C/8rowWkiRLwXiapiZHyrQYPB
+Cynx/NqI9law0V6tRstdj70DbZwRbzD/FssxN2Ez5FS0TmXXSqXePPW4T4+dGbsH
+MdNHmZ4qmLc/tgsiUiGvSoJKpOw8ME5906LrKyfUuulo0NTgTJFQmV3WLJWIDlZx
+7nONy10/kL1cNesTVwTzq7XrC5IJdTgiHyFjuoyVFI1x+7k4vOHWBjLm4IeyR6fX
+h50G4o+ZxgHvfvaV4fkA29yizjGhAqayNdGZwGVEvB+DG4tppKK96M/tC3U1A92b
+IH1FDFAtWuqyIboV/G8KQyIsV1nEMAarSRsdsHqb8VSBsi5vykNnzI5pAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5nbGkuY2FzLmN6hiVodHRwczovL2lkcC5nbGku
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSgWOTsjiPAPp0kphbDPSR2
+1XYcQjANBgkqhkiG9w0BAQUFAAOCAQEAgy760HDnbRkAbbVNgmyuBu+1JIqKJ0Z8
+c0FHADn+b9OX7KyEI03AaxW/PDwAmhxcG7BjYB2vVfQy4UQQy+QICf52azo+9l28
+2YzkH7irI/IqcLFGLj5pQOZJSzjcMtqHUGS/7rXYdvAnurFimMCt7j5xzG+7dogB
+J8Vqj4Ls9PWUN9Vs3/FSbBI8we5AHa5Cjez+H4i+DeBMzztDZ6GWn0Lp+q6vTdRB
+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>
+MIIDJDCCAgygAwIBAgIVAPMK1aN36mJ1EI8m5HvYF+VJwrIuMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5nbGkuY2FzLmN6MB4XDTE0MDMzMTEwMDk1NFoX
+DTM0MDMzMTEwMDk1NFowGTEXMBUGA1UEAxMOaWRwLmdsaS5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiBF7C/8rowWkiRLwXiapiZHyrQYPB
+Cynx/NqI9law0V6tRstdj70DbZwRbzD/FssxN2Ez5FS0TmXXSqXePPW4T4+dGbsH
+MdNHmZ4qmLc/tgsiUiGvSoJKpOw8ME5906LrKyfUuulo0NTgTJFQmV3WLJWIDlZx
+7nONy10/kL1cNesTVwTzq7XrC5IJdTgiHyFjuoyVFI1x+7k4vOHWBjLm4IeyR6fX
+h50G4o+ZxgHvfvaV4fkA29yizjGhAqayNdGZwGVEvB+DG4tppKK96M/tC3U1A92b
+IH1FDFAtWuqyIboV/G8KQyIsV1nEMAarSRsdsHqb8VSBsi5vykNnzI5pAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5nbGkuY2FzLmN6hiVodHRwczovL2lkcC5nbGku
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSgWOTsjiPAPp0kphbDPSR2
+1XYcQjANBgkqhkiG9w0BAQUFAAOCAQEAgy760HDnbRkAbbVNgmyuBu+1JIqKJ0Z8
+c0FHADn+b9OX7KyEI03AaxW/PDwAmhxcG7BjYB2vVfQy4UQQy+QICf52azo+9l28
+2YzkH7irI/IqcLFGLj5pQOZJSzjcMtqHUGS/7rXYdvAnurFimMCt7j5xzG+7dogB
+J8Vqj4Ls9PWUN9Vs3/FSbBI8we5AHa5Cjez+H4i+DeBMzztDZ6GWn0Lp+q6vTdRB
+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>
diff --git a/swamid-interfederations-2.0/idp.gmit.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gmit.ie-idp-shibboleth.xml
new file mode 100644
index 00000000..de9a9a18
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.gmit.ie-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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.edugate.ie/welcome-edugate-federation/membership</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">gmit.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en-ie">Galway-Mayo Institute of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ga">Institúid Teicneolaíochta na Gaillimhe-Maigh Eo</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>
+MIIDGDCCAgCgAwIBAgIVAK1VqQ01fdIHdnIs7Fwl1MsmJPtwMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5nbWl0LmllMB4XDTEwMTExNjE2NTAwM1oXDTMw
+MTExNjE2NTAwM1owFjEUMBIGA1UEAxMLaWRwLmdtaXQuaWUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCgPVXvHQh3F+3gO0sfFAVRwENQ75ZDdvLraifP
+KX7cmP700PPyVl/lab3aoei080w4iZ++yDrgHVg0O6+CSqLylPKX4Pdv7Ps/UAPd
+AA/yteXGUe0sRxzmgOGmDA2uDt6FYORt2NHcIIuBtKFSi7HMkLe8pVs1NMGMx59X
+TaArq/vfQnPaSEW4N2CcVAArku1wohHOlC1TMf+6jRU/N456Zjq+ZRylefluTVdx
+3tBn2GZiiYJD3q4nbNJeDjnOS5dn4nvTjLTd7Y+5E8t8yCJyCyTE6U9d3m4+Mfh9
+jrtk7HO5HDO8WCoBA4OmsOTLquqQWZhnqMQY6wuWTLU9lf+lAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5nbWl0LmllhiJodHRwczovL2lkcC5nbWl0LmllL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQAy0oW5uPZ0SagPA9AU5m0PWSQEjANBgkqhkiG
+9w0BAQUFAAOCAQEAVZhK+rTfpxznv4ihlhBYvuibLTvWJWD6zqrc3CRVElaKpC2N
+HKCPxF5Yw783trr/DWgkHVpva6yGDrDVRd45qCqJmNGKRniR9+kgjsbvfBPEoDeQ
+we2aIVIPuAArSitpWyiZ+betcnUQSV6vq6SEZrlb9SG1hMd3ckBd9t5xj0cd61Cx
+2CR9ovcj7c97IVlWb4AN93uWsVV8hGpF0d/hJfkT0Wfr5oEfOn8P/1O18M3z000s
+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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gmit.ie/idp/profile/SAML2/Redirect/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
new file mode 100644
index 00000000..89bfe16d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.godalming.ac.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						MB4XDTEzMTEwNTEzNTk1NloXDTMzMTAzMTEzNTk1NlowbDELMAkGA1UEBhMCR0Ix
+						DzANBgNVBAgTBlN1cnJleTESMBAGA1UEBxMJR29kYWxtaW5nMRowGAYDVQQKExFH
+						b2RhbG1pbmcgQ29sbGVnZTEcMBoGA1UEAxMTaWRwLmdvZGFsbWluZy5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKXVhe3ogE/3heu0gX8lxWxf
+						9BEKJuvE3iNKpopu8xob4BjkExlapGP3WWcZ7bdDqdrkF6StEvAZeWkFtgdeDguA
+						Jbe/GgnYfjufgeiTGSKWwM7AOV3rz5txBcyKOrC88qorYl6gUdc7p2GPZFDZgcu7
+						cCGKIMTVqUcMIp3uIZv0M/u+Vn4CI+BeUTZENIAZfeUHNTUxkcH6Oqhb6hnCYwmi
+						sa+zu/701srcXEJV2ioPU9u765ssWKk3vrbw5Yl8sEDm/jyirhesyjh01YA/YMov
+						3XgSQabUIY7q1QHztqHXNwA/tDnxzShEHPpuIMsz7PSYsCP4EA63iWGDx0WqfS8C
+						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAojTGzBpaChl86wL81BcANWi+VhfXJTWu
+						TbY897lnhDaYjZQVEimRZjY17+NLepjySmjC7CJylZQrRvnSS5DnZZXqi+Vj6vJE
+						jvaouneVqCXJuj6aqtuqIhVYsyuLo2C2gUhb6wWJd0LNvNkTHEtSsWA7MR6oG3on
+						Mq/u7YNxv0+M0hBvbPF7UhFX5ZcpQx6+Oz/YDKUaJ2mkyeskMa45zM3KS89izU3a
+						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>
+						MIIDVDCCAjwCCQDYuaHlo6w4dTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJH
+						QjEPMA0GA1UECBMGU3VycmV5MRIwEAYDVQQHEwlHb2RhbG1pbmcxGjAYBgNVBAoT
+						EUdvZGFsbWluZyBDb2xsZWdlMRwwGgYDVQQDExNpZHAuZ29kYWxtaW5nLmFjLnVr
+						MB4XDTEzMTEwNTEzNTk1NloXDTMzMTAzMTEzNTk1NlowbDELMAkGA1UEBhMCR0Ix
+						DzANBgNVBAgTBlN1cnJleTESMBAGA1UEBxMJR29kYWxtaW5nMRowGAYDVQQKExFH
+						b2RhbG1pbmcgQ29sbGVnZTEcMBoGA1UEAxMTaWRwLmdvZGFsbWluZy5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKXVhe3ogE/3heu0gX8lxWxf
+						9BEKJuvE3iNKpopu8xob4BjkExlapGP3WWcZ7bdDqdrkF6StEvAZeWkFtgdeDguA
+						Jbe/GgnYfjufgeiTGSKWwM7AOV3rz5txBcyKOrC88qorYl6gUdc7p2GPZFDZgcu7
+						cCGKIMTVqUcMIp3uIZv0M/u+Vn4CI+BeUTZENIAZfeUHNTUxkcH6Oqhb6hnCYwmi
+						sa+zu/701srcXEJV2ioPU9u765ssWKk3vrbw5Yl8sEDm/jyirhesyjh01YA/YMov
+						3XgSQabUIY7q1QHztqHXNwA/tDnxzShEHPpuIMsz7PSYsCP4EA63iWGDx0WqfS8C
+						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAojTGzBpaChl86wL81BcANWi+VhfXJTWu
+						TbY897lnhDaYjZQVEimRZjY17+NLepjySmjC7CJylZQrRvnSS5DnZZXqi+Vj6vJE
+						jvaouneVqCXJuj6aqtuqIhVYsyuLo2C2gUhb6wWJd0LNvNkTHEtSsWA7MR6oG3on
+						Mq/u7YNxv0+M0hBvbPF7UhFX5ZcpQx6+Oz/YDKUaJ2mkyeskMa45zM3KS89izU3a
+						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>
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
new file mode 100644
index 00000000..827ed388
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,127 @@
+<?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>
+      <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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFrzCCBJegAwIBAgIQfHx94mojHl/68SiEwa+kHTANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDYyODAwMDAwMFoXDTE1MDYyODIzNTk1OVowgYUxCzAJBgNV
+						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEjAQBgNVBAcTCU5ldyBDcm9zczEcMBoG
+						A1UEChMTR29sZHNtaXRocycgQ29sbGVnZTEUMBIGA1UECxMLSVQgU2VydmljZXMx
+						HTAbBgNVBAMTFGlkcC5nb2xkc21pdGhzLmFjLnVrMIICIjANBgkqhkiG9w0BAQEF
+						AAOCAg8AMIICCgKCAgEAot8BZGs52fkqWL67J8MNbrqZwqYIMsJrzOUgsqjGtWI3
+						nERfnocoRKUzPpZqTgaeVbpzNNncex3bddCNwtYDWXppWnGooZ+e97SVEquOCv4c
+						OyT4n0yg8cchfW04dy4MmCKEAiTJSq3hK4HLPgKiRwKN7WvejCD92wc0+rWLISML
+						U3S8BNDOmOYHKw8k7Q8LNY5irvSreR7dGVuYg4fgZH0Ub1t/hU8JqKC9uKCfGVwV
+						JhpsToWuJzB1MAwzhkem6SzuwkKMxZk1pZ9pKocZF3EttdiSBxJKm+sGuNvrM5VX
+						2OFEsDrkiRxUIKWwKY4Oa669aRRkwnKWyzLfn3kO+5B6K4SF3hu9K11rBYSxqxpe
+						GexNe6f5nNKntQnQf7fFkLA0LT5du0yGP63I+RVPyKFVTqvmeFKFlpKZ49iqaLrt
+						GqmUG83ACF4/ntoup6UNfraXyYO3wxGMUG83dQhGZBhvJk+osnLSLwPxL/mqKFBI
+						23tQnXwebLi7tRKYSDZEz3bUYEqrxfv9rtcSsjRL1a/jhwkA4J3rvRcE66z+iQTM
+						y9AyH27pWx+igv3AEHXNLLgNyJNgPA5wsuH6faaPKEvbL2tm3yAqOrn3rJejnirP
+						wc0H9ybzdTJ8w0T0r3Ga/7ypxdxoICEU+8tvNBS23rz+BGeCjPe8xjNJcWRdKJkC
+						AwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0G
+						A1UdDgQWBBQudULPA4BUR/Wtj7MvpnX1q4RqEjAOBgNVHQ8BAf8EBAMCBaAwDAYD
+						VR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0g
+						BBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3Js
+						LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8w
+						NQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+						Q0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAf
+						BgNVHREEGDAWghRpZHAuZ29sZHNtaXRocy5hYy51azANBgkqhkiG9w0BAQUFAAOC
+						AQEAjoZstIwjOnKopO0Ab7L2cnlmeDUJDJgXIVR1bQyS6Bs4K0499aHpOiyvTAOY
+						ALgNoq1T6p59tKyypjGQMdqOC7v+u7m+rV+R/GNTjoz6s2t5g52OFvPb3l+5bKf6
+						yWrO3/jW5QsQ5vi2Ul3zhyRU7MPorRTMeh1V5wEbgyOBBHSLteYHKrvYvSU6wk+E
+						o1xrSRynxN2GYJ7DC/irbFIsRwwrdYD30tqAI7x5AjyAIVFYNsELVCUN7i1250V3
+						9D7YjT2NiIExUkQJkaqNvP+cd5tv52GbrSS6RlVqjvYJloDb2jTa9Zxd0nNpnYtl
+						NYwSTpJWaft6dHpT96Gj0W9t9Q==
+					</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFrzCCBJegAwIBAgIQfHx94mojHl/68SiEwa+kHTANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDYyODAwMDAwMFoXDTE1MDYyODIzNTk1OVowgYUxCzAJBgNV
+						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEjAQBgNVBAcTCU5ldyBDcm9zczEcMBoG
+						A1UEChMTR29sZHNtaXRocycgQ29sbGVnZTEUMBIGA1UECxMLSVQgU2VydmljZXMx
+						HTAbBgNVBAMTFGlkcC5nb2xkc21pdGhzLmFjLnVrMIICIjANBgkqhkiG9w0BAQEF
+						AAOCAg8AMIICCgKCAgEAot8BZGs52fkqWL67J8MNbrqZwqYIMsJrzOUgsqjGtWI3
+						nERfnocoRKUzPpZqTgaeVbpzNNncex3bddCNwtYDWXppWnGooZ+e97SVEquOCv4c
+						OyT4n0yg8cchfW04dy4MmCKEAiTJSq3hK4HLPgKiRwKN7WvejCD92wc0+rWLISML
+						U3S8BNDOmOYHKw8k7Q8LNY5irvSreR7dGVuYg4fgZH0Ub1t/hU8JqKC9uKCfGVwV
+						JhpsToWuJzB1MAwzhkem6SzuwkKMxZk1pZ9pKocZF3EttdiSBxJKm+sGuNvrM5VX
+						2OFEsDrkiRxUIKWwKY4Oa669aRRkwnKWyzLfn3kO+5B6K4SF3hu9K11rBYSxqxpe
+						GexNe6f5nNKntQnQf7fFkLA0LT5du0yGP63I+RVPyKFVTqvmeFKFlpKZ49iqaLrt
+						GqmUG83ACF4/ntoup6UNfraXyYO3wxGMUG83dQhGZBhvJk+osnLSLwPxL/mqKFBI
+						23tQnXwebLi7tRKYSDZEz3bUYEqrxfv9rtcSsjRL1a/jhwkA4J3rvRcE66z+iQTM
+						y9AyH27pWx+igv3AEHXNLLgNyJNgPA5wsuH6faaPKEvbL2tm3yAqOrn3rJejnirP
+						wc0H9ybzdTJ8w0T0r3Ga/7ypxdxoICEU+8tvNBS23rz+BGeCjPe8xjNJcWRdKJkC
+						AwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0G
+						A1UdDgQWBBQudULPA4BUR/Wtj7MvpnX1q4RqEjAOBgNVHQ8BAf8EBAMCBaAwDAYD
+						VR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0g
+						BBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3Js
+						LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8w
+						NQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+						Q0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAf
+						BgNVHREEGDAWghRpZHAuZ29sZHNtaXRocy5hYy51azANBgkqhkiG9w0BAQUFAAOC
+						AQEAjoZstIwjOnKopO0Ab7L2cnlmeDUJDJgXIVR1bQyS6Bs4K0499aHpOiyvTAOY
+						ALgNoq1T6p59tKyypjGQMdqOC7v+u7m+rV+R/GNTjoz6s2t5g52OFvPb3l+5bKf6
+						yWrO3/jW5QsQ5vi2Ul3zhyRU7MPorRTMeh1V5wEbgyOBBHSLteYHKrvYvSU6wk+E
+						o1xrSRynxN2GYJ7DC/irbFIsRwwrdYD30tqAI7x5AjyAIVFYNsELVCUN7i1250V3
+						9D7YjT2NiIExUkQJkaqNvP+cd5tv52GbrSS6RlVqjvYJloDb2jTa9Zxd0nNpnYtl
+						NYwSTpJWaft6dHpT96Gj0W9t9Q==
+					</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>Sally</md:GivenName>
+    <md:SurName>Houston</md:SurName>
+    <md:EmailAddress>mailto:s.houston@gold.ac.uk</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
new file mode 100644
index 00000000..5e6c5630
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.gowercollegeswansea.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						d2VyY29sbGVnZXN3YW5zZWEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQD7EU6nahXNJNscC+4O8qkavjfcOAnWVaBl7WyAmryYsudXcIitwlqv
+						zjJrfc4Ncs0q6pKawJWBrqjiNyRBS4SEZpfgD2UXq/+LjfGJQKSXz4QzVmicGji6
+						ezsXQ0fvf7Nq7QqmT50M4xUWAbq71s6uZPKApui1hHGtFlp6IbLErcpB3jmp7skg
+						Au7OoZ7lbWuRKkRea9mBuUq3+uMlONfghNb5rkX+MHvXbpbFfG+W4ERLQMPWPeAw
+						V7vMInXysu70CakNJzIcvf41V73dR6LhooZyr4sIOPJdUWXBRGEWrGuBD/eGFxwY
+						3c+XIeVs37RmKwxLFRjJPkT6lxPfpoUtAgMBAAGjgYEwfzBeBgNVHREEVzBVgh1p
+						ZHAuZ293ZXJjb2xsZWdlc3dhbnNlYS5hYy51a4Y0aHR0cHM6Ly9pZHAuZ293ZXJj
+						b2xsZWdlc3dhbnNlYS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUij+g
+						aDdeycJoti2x2hF12wErnSEwDQYJKoZIhvcNAQEFBQADggEBAEaiPWm87wZCFKlb
+						uM8BNEQccKBxVSYdYvb5W50EPPI0FIPWc09H4EDtd8ekJHlK6uML3AYdAI4GKniL
+						esApCmAdNP2jm752tp3FwTENcD/roYRWk/L+BCVSgrj+lwJNc+R+9HIqG6ZFiAG1
+						/Jr5t/XLTj4W+OO99dQLpNiXnGcn3AluRVpmO2oSmQAINAVkzOv+FRaVElRZ6NMH
+						58L5gnD0BmNPToS9XYiJbiJID1ViEjrkFPDfCUCC6XEEnPJ3hu/im0H8twKLb52Y
+						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>
+						MIIDYTCCAkmgAwIBAgIVAPaKVO7qjn5iTZ8Gic6gQPWYymlgMA0GCSqGSIb3DQEB
+						BQUAMCgxJjAkBgNVBAMTHWlkcC5nb3dlcmNvbGxlZ2Vzd2Fuc2VhLmFjLnVrMB4X
+						DTExMDgyNDEyNDQ1NloXDTMxMDgyNDEyNDQ1NlowKDEmMCQGA1UEAxMdaWRwLmdv
+						d2VyY29sbGVnZXN3YW5zZWEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQD7EU6nahXNJNscC+4O8qkavjfcOAnWVaBl7WyAmryYsudXcIitwlqv
+						zjJrfc4Ncs0q6pKawJWBrqjiNyRBS4SEZpfgD2UXq/+LjfGJQKSXz4QzVmicGji6
+						ezsXQ0fvf7Nq7QqmT50M4xUWAbq71s6uZPKApui1hHGtFlp6IbLErcpB3jmp7skg
+						Au7OoZ7lbWuRKkRea9mBuUq3+uMlONfghNb5rkX+MHvXbpbFfG+W4ERLQMPWPeAw
+						V7vMInXysu70CakNJzIcvf41V73dR6LhooZyr4sIOPJdUWXBRGEWrGuBD/eGFxwY
+						3c+XIeVs37RmKwxLFRjJPkT6lxPfpoUtAgMBAAGjgYEwfzBeBgNVHREEVzBVgh1p
+						ZHAuZ293ZXJjb2xsZWdlc3dhbnNlYS5hYy51a4Y0aHR0cHM6Ly9pZHAuZ293ZXJj
+						b2xsZWdlc3dhbnNlYS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUij+g
+						aDdeycJoti2x2hF12wErnSEwDQYJKoZIhvcNAQEFBQADggEBAEaiPWm87wZCFKlb
+						uM8BNEQccKBxVSYdYvb5W50EPPI0FIPWc09H4EDtd8ekJHlK6uML3AYdAI4GKniL
+						esApCmAdNP2jm752tp3FwTENcD/roYRWk/L+BCVSgrj+lwJNc+R+9HIqG6ZFiAG1
+						/Jr5t/XLTj4W+OO99dQLpNiXnGcn3AluRVpmO2oSmQAINAVkzOv+FRaVElRZ6NMH
+						58L5gnD0BmNPToS9XYiJbiJID1ViEjrkFPDfCUCC6XEEnPJ3hu/im0H8twKLb52Y
+						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>
diff --git a/swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml b/swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml
new file mode 100644
index 00000000..4601db57
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml
@@ -0,0 +1,71 @@
+<?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>
+      <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,iVBORw0KGgoAAAANSUhEUgAAASwAAAErCAIAAADrGimaAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wMICAsdI0myzwAAIABJREFUeNrsfXecXGd19jnve+v0me19V9u0KlavluUiG7dQHMgXQgKBYBs+IHwQSkIJAUILKQQSCDUQCDimY4wLtmW5yCqWtFZbdWlX2/vMTrvtfc/3x51d7aoYYUwsS3N+P1szd++9c9tzT3vOOfgfe0aIpJQSYVoQEGZ/8/87s+isJTMrn3dNwrkbTv8PYe6aOHudObuds/zsvc052nOPcNZyQrzgarN/adaR4Nm/fsFjxvOehX/6Z5/UuRdz1raz1yQ832pzPzCGBECS/IUEc4Qu8PnM13O2m/lE9Lzb0sxnOu/yCx7DnN3Shf90wV+ftXDW5s9ztBdxIuf9iTnHd+5REV1g+fMd9uwdIyIgBwCEd/4Kssn1dQmFMfitBOf8GALkHDHnCPD5t0aCFyKE8Hz3GfFijvl5f+Cc1eg37XZ653Tx+zz3gPDiLvfcRZ2HjzfU18QD5oV/+HnP9PnXpOc9nIu5f0Qv4A68gN3+lk/ueTdH+k27xRfvgBXGdnb3Q6QaiBRd43aafvGB6yOm+pJemZe/4P/2D6qc8dce+/c/W3bTwuqX4Hyv8Nv9u4muMnzTt0FXgKRSuJ0KagorXpqXo6ic6cV793KW4s0rSlGKICxKUYogLEpRilIEYVGKUgRhUYpSlCIIi1KUIgiLUpSiFEFYlKIUQViUohSlCMKiFKUIwqIUpShFEBalKEUQFqUoRSmCsChFKYKwKEUpShGERSlKEYRFKUpRiiAsSlGKICxKUV4CoSumZ1ERhEW5RAURiyAsSlGKUgRhUa4Am9M3O+kKbphZBGFRXnqbk+hMf3QpZdEnLEpR/vfU4Mzn/oGB/QcO5HL5M9MKrhifULmcTubeYdexyeH4+nIlqGLxKb/01aCPQyHl2Oho16FDCLBw4cKzdGMRhC8beXtn/ms9NtgEHD8X510bw6pafM4vbU0oBQAAMtdxBgYHHctKZ7I+LH18XiE4vEzM0Xd35r92wgqG+cDtsS+vDRxPi02d2eKwhJeBMmQcEXO5XDqV4qo6NZWyLcvHXjFF8bIRIeHOXbl/O2Z9fIGZ2RSuCuE7arXmmLK9390xIYpP+SWOQX+sjOt6BEBSVlZWKpxfaVfhZQ/Cfzhqf+uU/e/LAn+3wJhZ+Plm3XXp9udyxcf8EncK/dDM+MS4lBIQLctmijKTtLhCAqQvbxDumBAfOZj7P/P0d7bqs5f/YZ0KAOPj3nd63OKjfqmrQiJVVT3PNQyjsbEhOTXlup7vEBZ9wktdkhbdsj27sET97vLAeV6YBkMF33IwB0Wb9NJWhsPDI7uefbZ9fkdjY2PXgYPDQ0M0K39YBOElLASv3JXLOfKeJaaO55nPOT/ECABses9Rq/ioX7ouvZD9/X2242iaVlZWdqqn+9TJk/64WZIC6IpI3L9cQfj3J+2nh5w/bjUWx8/vx883C6f2426nOyOLj/ul+i6lVCoFQPFY3POEaRjBQCBvWQAAyJBxmM5YFEF4acl9/e7HOnN/WKt/d6FxoXVuKVdBEgD05+Sm3cUIzaUBubkKDRE913VdDwE1VamqrGxobIxEYxPjY0KIgkU6vdVlrAxffiB8csR79c5sa4T/25KzESgJXPKhB81xDhrzT/HkuFexJV3EwCXgAJ6t0KamptLpqXg8HolGAwHTddzu7lNExBmDad7MTNrwco2XvqxASPDJk/a1T2cMDb+4IlBtzjn4zrS8+emMdl/yj7Znvz/k3pjgd9WoIAgBAGFkQqx6MvP9ITftFFP4L7EmpBmRMhAIqLrOuaKqKgB4wnNdFwD8/wPJ2WUWeJnapS8b2tpPh72PH8jvT4olUX7vumB7cA4CbUHvOWR9fIFx7Yj421PWBMCfVqpfXhZoDvC/2ZcDFQFh15j3Z5Nes8H0MHtrmbo8zOsCrDlSpLD/7yEQZ31BxgTJAwcOjgwPt7W1ITJErKmpCYfCo6OjjPGmpkZkBYefpEB22d6plwcIN495r30mk1BxY5P2xNLAufq7z6YnR9xly83rS5SPduhLnskCgMrgrzv0GyuUP+nMDWZlRhIIOJGTkJXvG/R8j79AbSOAGC98ZgAM1bTQTfb3LcZ7mrUifl5EW1QKgYz5iMpmcr29pyPhcMA0GUMACAYCJ0+edG3bE7K6uoqk5IrCGTuDRpKIrAjCl0CemRL/uiJwZ5UWvAAn+4fdbofOtOk3LRK8bkf23tVBjrAiwY9uCh9Iil8lRd6SByZFnyWzc5OHAmBpiIdUqDSYGmQrDLw6rkT181s+jgRbULhYpfHClCFjPhpdz0un0wCUTqd13eCcA4BpBkZHhj3XS2cy/X29qqrW19WvWLkCccY/vAz14csDhB+dpz//Ch/us1fwM6j4txZ945b0/1Sof9pY0GOLYnxRjPsQciWJc7xNkyND4BeBrAFL/tNR+0tLTFaE4QtQhiRt1+vv7e187jkrl5MAFRWV1dXV/grhcLi9fb7niVgsNjU11d3TffT4McvKr1i1yjQMukzTFZcuCA9NyY6Ld9gmxW6T5SUEOADANRUKC7M/25k1OL62bo721Bhovxt6evP0+IQohndeiBpEtBxv3969x08cI0lN85rnz58fj8cQyA/a6Lq2avVqPu3+lZaVbt++XdUNhSsk5eXqFl6iZ/Xq3bl7e52LXHnriAcczmLNfHmhCQq+7tnspw7bv9VPPz0u/vywddcR664j1hu6rLn6EgDgrq58rQpFLfjCfMJ0On306BHbsuvr69evX5dIxBGRAAkK1YOcMV/jeZ7o6enRdd00dcYQEEhKACCCaX9+JmNBZ92ll1cm45ID4QMDrnl/6tCkePu8i42I/GzMA0Rw51z3tzdoq0sVQPjbrnz0sfTF1xYO5eV3D1jf7LK+2WXdsz8/5zEC+Opx+8iQ2x7iWEThC5JEPNbU1MQ4HxwaGhsbAyCSYsbZ8xMSiJhMTXV27unv71c1paa6lnMOEpD56lSAX5I/fQ+IoBBkmwZnwWQlIvkyIEu9xObokEUHc8KyafuY2DbpPZYSjQpeU6c9vMjEiy4r+/mkBwjg0llI27o+tOKpzL5Jbyol8GfJD7Tot9RqHSZWzUowTjnUbcnTNqXS8o56LaDA62pV5zWxtx21vn0w31o5x5TdMyHeuT8fjvC72/QiBl+QRSo558uXLR8ZGZ2cnNi//8DGjRsZ44XsBSIiOo7T19/fuXtPMpWsqa5etXptOBTyoQlEgADAiQhIEjD0FwIBFTTgDCyZrxMLW2ERhOeXjx+xv9ttn0oLQFxbpryhSv3IImNpiMc1vIjbCT/rc7864Wl5OTQuAOFcA1FR4JkNwc+fsD95yAJJ/3jM+sdTTquBNQGmc/A5Ucez0gZ8b4v+5zVqYPpiqAzGbAkM/3m+MWPiZARctysrPfru0sCiYDG7+AJtUiIyTWPFihVPPfVkd/ephsbGeU2N/s0bHR3rPnVyYGgol8lkc7mamto1a9bGEzEAIM8DAOQcJAHzLVsGiCQFIAIQEpFEYoDSQwBExWfFCfI4GkVNeEGz8xMH8iUh9uDV4VuqLuowPAJL0E9Oux/odUZHXWBzqydMdu77LqjiJ+Ybf9dm/EVn7r+GXNWlk3k6kZc+hkJh/qVW442N2uz9DFt049OZA2lxe436ygplxhD9XFc+nRIQ46+pUIpgeoEQ9HUWsvq6mle/+jX79+87dfJkIhHv7u6eSiZHx8ez2WwwGCwpLVtQUb5o4QKuqJZjDw4OVVdU6IZBUmQ8b0tfcsqBa2qD9UEDEAmIIQD62o4QIePxbQOTGce+tq4soTJACcCLIDyfGuy2dQWeWhPsiF3sBfrrA9a/+PQX5ZxkAsHrq9SIcmZhxqPOlLimRAEAxuA7KwLfARjMUueUlxGwMMTqAixyjso9kpbzt6TBIQD41hJz9p8+0+MAwE/nm0Us/S4o9F+c4xOTiBiORE51d+/Ytp0QHNvxPM/Q9ZUrVjY01BeCK0RjI6OPPvjo1devXdC+EAj/5WDPV7vHFE9r68t/a9WKxkgApAQgDyUDRIIssU/vPPSVkTGFxI2nR/917aKq4KXuOrxkIDQ9cAh+lBQfu2gQfrJDv6GEf+SkvXfUm/MHQVpC+eoScxYG4YYdua4xr71C2bkyyKfPsiqIVcEL9mAbs+TNWzPgEiBAiFXM5aZCToLJNhTV4O8gUlI+bw+PDO56dhdn3HHdgBnoHxioqa1Ztny5rmmGaYSCwUI2giQwnsvngEvhEgAkc7mHh5JRDmUmnUqJztHxxmig0KZGAiAi58dGxh+ZyrZpYVV4WyZHnx0Ze1Vj2SUey37JHik9xGgMtpx2PlCnmvyiLlJQwdur1durVf7zpJyOwSDCXfOMry0/o6D6MrLumQykJSDsGXBv3J796erAb/QzieBDh+2evCw0H5p7SJ3jAhisDLKiM/i7iJCys3N3/8CAqqogqX1+e3Nzy+me7vb2dk3Tpm8EFfodMg4AumoQSDuf8wlvCoGucUQSqKSlACBAAEFcUQhcItgyNJW2qMyErGQJZAmTwSVPsnnJju9f5umA8Pio+5mTDsDFZRAIvnDKad6clhLAI1Dw7gb95xtCMwi0PPjTvfm6h6dCHry+Vv3ofOO6UmXLkLNyc/rpMe/595306PunnTO+S15+8YSdnU57LIxxIDA4FjMTvxMIhchks0BUV1t36223Ll68OBoJL168WNO0mcxeAYHTm3DOGSogPEAmBClIHjDpMUD0VYhEJM6JiIFiebhlZJRzdIgsActKwgtj8Uv/srxkmnBRjD97fXjV5vSn9ueHXfr6gt8QwnrXQeuHPc6oLcGllkr1S836mnIlpiBD+Nhh+2uj7n0LzIGceG2J8vk23VQwzFFlkBeUk/D0sLdjzCvTsD3C37Ird9+wqyLMSyjfaDcWxjkBIMBPTjt5R55RgC69d1/+Q4esL3aYdzVrGgcgyAmSRabM7yCc8XA4MtDfV11daZomTBOySQpENtPtFxH9/B4iZnOWwpRESQIQVcYkkJTgazcqxMSJAUmQgMpzA2M7HLdON1GInJffVF0X15VLPkPxkqYoVsb45mvDb+/MfaMrfyIlPr/QqNdZkAMCElBWwIhHEzn52eP2gwMuEJWb7IZq7esLjOZwQYFbAtZtSe+fEr9YHVxTwqHkbPfS5GhyeHWtCqACwD8dtZ+a8BoCbNymbQPuotMOxDi9IgIAX+hzYS6djQAsl+5+LvudMe/hZSZE+J5JkfIgWPQKX7DdxRlnjCHbvaezpKTUMAwEBChYnnjGNaCZL7quOa47kUrOA0JE4qALImKCUAMAIEaSsBAov3+0T1qGNOyAxquEuTFRBiiAGEAxT3hhub6E79wY+ocT9mcP5FcOuQtCvEJHhiAJRmw6mBOQk6Dha6u1a6vUVyR4e2QOzJ6bEM+lxBPXhDaWXdSJvL9Nf3+bDgCuoFfuzD084M7YwV2WPJ/9C8DwmT5nWdIzACxJP+hx3t+uX2ngmW0r/o7OT0kiwTifmBjfvmPnxo3XIPmGyJwCpelfQQAgSVzlhhkAQEcI4REiAUlEcskBQEK/1hdPTWafGM8lUItKdTjjbkxEaiKaT2z7rQ+apKS5J/v7dERe+rd6VMPPdBhJgv84YnVlRFdm+vFXcHW5+q/N+vJSRUU4L+n6W6ftTaXKmsRvdxY/7XffsCvrEgDRV5unETUlQMELPTvHcxIAQMEPdOWvEBCSFL6C8skqfp6dANA373xYFgZGIM2AZtq9x1lRljNPMmONTfPGJyYGBwd7erpPHKtqbWudWd113eHh4VA44nluPB7nDAFA0RRd0/ydImcqclu6EVKAFdjcCEyA5IA7x6cmsxQ33Yw085DbVB3VVE0Kj/ELBBj8pqeAeCYigQTTqUwEmjWyhoSA6SKsyxCEACABki6BpLjJl0T4sjL+1nJ1Yfw3pC7SLvXY9Niw+83TzjubLpZomnTok4ctWwIQLK/R3taiF96UQQYW/eZ3JsGmHdnH1gQvfxROP3++HkSfugngM1QIyNddBZ1VcLwICjlzgrkTXaZ1Kaoqa21rSyWT2Wz6VE9PIBSamkql0+l8LpdOp4dHRnRdVxSlqrJy1apVgUCAIROel8lmgIiE4EAa45IYCQSUMM01zbti8+CghwCKkrXtCo1WlpSgFMgYkoQLciD9k6QZPYwzsJT+F1moJ2bM84SqKvB7KCy+JED42KB3T7fzxSWBG6vUBReXBPibg9bPB5wjKVkd4W3nbJJzIXCBdGBa0IRLALCwVHl8ZWDmMYobbNIS53ldSiq8NBGBASBsGXQfGPJuq7ycXUOiM89lIayBZ+w631KbfhZpxnIsaJIZZJ7TwHdm0Iuu6yWlZRPj4488/JAgwRhHwGg0WltTU15eHolEY9GI/8Tblu0KoSkqADHGBYCUTAHhMYnox0glAzqRzj+XdYOawTxhOfarasurwgpDlETnM6Lm2KjTbwoJPuEUEQklEhAwzsfGxvKWFTADzzzzzNp160pLEjNc8xdLMV4ST9JbDudfU6b833m6ejEAJMDNaUgK0PH7KwNvaJyjA/vz8hU7cl3jHij46fnG+9v0sxKEMQXrDOzNw980apFZ1fFvSihfnBRzNCFCe6nyoRqtNcQ7U95DSfHgqIsOeQS378zm/yBqsMsYgei6zsjYuMKVSDisqgpHBMZ8HQckC7DzcSgJmG/IiULqHGfsWJwZcialHJ+YPH7saM/p07Zt+w3wGxobiWjhosVSyng8bmgqzOqCQUSWZUlPuI4/MYYkIOOcCaGTYBIAQBApTOnqH+txqEllYNsu8vWVFRoTJJkHACQ4nuEWz1jXUkjGgJAB+X4mAZCfVCRJDAE4O3b8+N69e1VFueGGTS2tLcePHytNrAJ8kUlwlwQIVcSfDzifOql8oln/jQbh6zpzkBJ/Uqf996rAWe+4b3Y7d3XmQBIggqSP7Mt95Lh1zyLz9Q1ngBpWsSOhPDMpjs9tu3ZXk/7F49ZsH/7flgfeVV/YcH05fycAADw85P3XoPujbvs1u3IPrQ5cnnYogOPYTzz5lG07HFGQBJRBLVQ/r76xod6TTEcBiv9yI09KBiCFi4AMuSCUCArMygoQEVEul9u3b/+x48eklJwxXdNCoVBrW1trSwueW+hAhIz5CxFJIgjPJSKmcAKUkjKAICWRBCE5I88VD0zkqj1yNTGB+uKgdV2pAcxAJjTppzNwtqL2izAQSZBgQhVIApjKgAkx5sowR5Uz31A9evTohqs3jI2NpdPpluaW7du3WY5nGvzFnZ14SYDwyVWBm7dmPrk///1u54Zy5Z212pLE+V82IzYdGheA8LZGjSE8NuhOCrijRuUIH+2yPn3EAgIwGDCEjAAEcOjPO3MfP+V0xPl35ht+25hPtBjfOunsSc4xPmsD2BZVjmaEr2xbSpUZBM6WmyuVmyuVT7bqn7qMu+sj9vUPkJS33XqLEEII4TrOeDLVtW9vzAjEq6v6M/b3jnS1R0tWlsTrQiaoyICDIElSIGiAAMyPWPp7SyaTzzzzzPjoqKpqTNXmNc+b1zQvGo34bQ7prCLAGeYGIhHlLZshy1t56XkkCQBRSE1y4sxhHDgi4KGk83B6qkFVpaAU2JvKq0KBgJ97lEg4Y0+fFfVmyIG75DBgKgIjBMa+fuDAHTX17VVxkMQ4moaBiIlEbHx8rLKyYio99fuIlV4SIKwLsl+tD615In0iLU5MiW8ctUACGAx0XB/if1qubqpUagMY5BhRsC3EjubEdVszIAGIbq7UXl2tPj3uffqQBQjX12ubVwbSgjjBvb3uB49YY3l5ZNI7Mu419bud14caTFYTwE/N1/+n3815pDIcsmVMxaiKr6tVP3PYByHdFnk+k6MlxL6zPEBw2dbXjwyPVFZWMsYYYwpnhqaHIxGZt3v7hkqqq04l05uTE30i9LVjnaCri814SyjQEA+vTwQjpiI9yeY+VgpjVt4KRSJ1tXUdHR3hcAiASMoZe1VKUagqnDUe1P9qGDpH0FRlWiuiqnImwckJRaogBTD+s94uTeRtrgQVSgj3+ooSAOkbnZywEPIkRN/t8/OKBKeS2VNT1urSsK5zRiCZYKhKxeiaSnVUJYgBADQ1Ne7p3FNfV3/y1KnjJ05WVVUa2os///lSiS40hdiD60Mrt6QRgTgCBxAEWXomI58ZdOA5uLZOe3h10OBwz6rgD0fcL5+0dw67wPGuJk1FeNWOLCCApG+2GeuezGxPiuVh9u1lgdFbItdtyz4x6AKDybxcujkzeVsEED4y3xglSLp0Ii03PpJaWKFuXh98X7P+uRM2uUSAYxdRkH25ItD1RCqVqqur8xMVwBgRgJQpz41VxInkyVTmLxtaX9lSl3Uaxiw4nZnqmUp9+WDXYE35WxY0EmNyLh8ync1ZVs4wzIaGhnA4RL5LiWwmATCbLjNtkPqMGWbouhEMVlRWKqom83mNKCNcD7USw/zPvsFSQ0879i+GsxEeNtEdcvG6cHxBIghEDDlIIhBAbGbIGvo8GyFB4YNTY584MNhs6msrAq9vrI+YBoB3TWnVtsnTnie4gkTY1DRPeCKZmlrUsSASj5WVls5Ei19EXXgJxRZWxPlXlwRodgsl367hCAo+0euMWBIADAXeVK3uHBOREE+9MvraGnXvhJjKFXK2Uy6tKVPAkXsmxUe6LAC4caZKg0EyL06lC/D6l/lGpcFWlrBNddrBlLj2uVxCw6fWhMglYPCDfgeuVOGcEcnTp0/btoOMQ8HFFpnUpBkI5QWccrEpHANwdS6qg3BNdcn/aWlaU15THjWBkUd0VmWnJFlZWQUAyclJP+zht12D6f5rMNPlfqYbBRUMSNt18tncRDJJUjAED0mi5nJhcnXUhY/u7vpY1zGP6SpxoerhTK4hXvoPB7vf8uTB+05NulKSnM6dEAGREB4idKfTX9h7QNejt5Y2f2p5y/FcbtPmzv/Ze9rz2JoScyILOc9DZECCpGhpbV25ckVza3M8Ep1MpkBIf0DGi3jBL60A36uq1aYL2YEM37O/4IY9OuiBpKc3hPwCwiUlfOLVUd1gwOCVB3IfnqdvvTbit5yRAN/udWd0FnLcsCc77vg+ATAEk+N/rgiUGTiVkgCwvox/dKEJBODRew9coTPVkGjN2rXJVKqzs9PXVKdP927ftSczlYqHQ9KzdSdZElJAKpw0FThJmbe88dTYfCNCxDWFE80xJMpLS69asiQej+/ZsyeVTDHOz+TfpsfWz6Q6Cm1mGPMZpKmpjCeEP2BEIAJhAICkIjwZYshNs9SMBolCCgpXspLoL/pOfrv75EMT43+5e+dj/ZOMK4KISBIiAXDGyRNN8Zgn+LHRiRFryEXn8yuXfffqBb9Op/746a1bBlKSMOVlCtw5xlPJ1LPP7s5kcg//+uGHHvjV1u3bp5M3LxoOL61kV5WBK8uUU1nnvK+Lnw44QAFAeGDEBQ5CEADsTYovD7kBjp9rM/5qf65vXDQ+MhVVEDhcFeZHp+TJlDdDhSGAgQmx/snMLfXadUEGAI9nZG/SS3sUVGAwR1UB/NgCY29e/rLH+Y8T1uIg+4sm7TL2/S4UmInHYrfecrPjOIW22QQG1zvWrNY0TThun/R+3Zv88/lVfroegQZcp487teGgJMkk+Km5GQtT1/VQKGSagZyVHxwaisaiiIzIT//LQmauAEuEWe2eAAGQVK5U19Qg4wiuB2gTaYwhJyFRQZYlobvSRqmA6tkICivlRsThh5A/2Dt8S3VcURjBNMVHkABQgEo1JRIKyLQ1YUGD6XZEA99c39E1lr63b7hzasrzGmAaakePH4vHYmMjo+Fw+KabbnrksUdz2VwgGACiF+uxuOQyzuWBCytnCQ8NurdUqzEFwaWVm9O+qy0lrKzV/n6J+bddmCbKu5R3CRjeUqseTolzPbmjaXH0YP7f0beUplMXCGU6AoCKcN/KwB0EP++x37onN+nQ+64wsqiUdOLk8eGhoebmltLSkqmpTGNdbWNDvZQkJZnA7pzX/t69zz50smtRec3K8kRMEz852LUhXq8bKCTDAgN7DlcmYJq1dXVHjx7p7T0diUZj0WggYPqUAD9Dh2exywpsMQApE2UlnCEAMWQaQB6JpBBMU8GTjCmeK7liowiKjE5MCpMJz2MU8ayqUMJB1BBR+il7IiSFMZCyI17THoeuwfHOsfFlJXGXgAMtKIt+siI6lZO6ImDakFU4D0dCru3pmq7puq7pjusG4MVsIXXJgVCI54uEPJYSt1Srb27Qfj7s9to0ZkmQAJK+26pnBFQb7Ehe+pfm7hp1VZjxC5ftS/9FJkjT2fIY/94SU+Fn/JGfrQr8d7nyvsPW+/fmnsmKHywN6FdMOe9AX+/+ffva588/cPDAsmXLtm7devXVV5eVJhDJReQaLC0PP37TDbvG0vtGx7YOT2TybEFN653NteS6EjlyZAUVOfsBpaqqyvnzO7q6DoyOjl6zcWMgUIuIlmVZlp3P56fS6dM93fl8fvnyFbW1NX7oQ0jJuOLazuRksqa2gYRwkQiII3KyJDLhgMYUQcKU5HLFE5TldpBUR5VhohphHktmm+Mhg3lSMASQ6LehgdXVJgPrdQtrh3LaD08P25bnoGBciQlvUVVps2ESFpLQZjA4MDDouR4B9A8MptNp0zRmTIbLShM+NepdFeU6x+1D7vOstjknAaA+xL6xJHAsJ9tj7HNH7R+eslMetcXwofXB0y55BDqDNWGuMMgJAoOBR7PVKXjkz2kiCduuC2saLg3z2Xl//+OfNWhXlyuPDXr/97BV+8jUcxtCNVdGXb3refM7Fixc0JHNZoWQy5cty6SmykpLiYTOoD/l3Xe6OxIO10laFIkujOsaAnHR79g1AUMFSWc43oWu9QRAJBXOli5dWlZeHgoFE4lELm9JKfft25vOpEF5JE2OAAAgAElEQVRQX3+vqmq1tbV+Y4tCvBTAc9xUKun3M5yu9yWJQMAVQQjgguSESIRSAWQhj1BCyEXS1c+OdKcHD7+7sfk98+sVRADJGQdCQoHAADRDNf+96+n50ZJFofiUCzb3+j39pzt2fnDFisWJiJ++bGps7OzsdGxnxYrlI6OjGzZs0HX9xW3If6mA8H8mvSfGvO2T4rlJccFoEQK3CnB6z4H80yNuTYX6yGLzqWH31fvyw5vCdQFWJgkBGBbeY+cOI1xVpe5cF1QfnvJyEhDW78n1Xx26UF/8JpPdOU+7c542kqf8FdP5XtW01NSUlJJzXhKLHjs5GQjoQORjywEazmYn0sp2ymdlxnVgipGXmXz/sqU1QcMTHuc6FoL4s8d6IgBoKq+rqbZdb/fu3T09PYiYSad1Qw+YwZaWtoaG+sbGxsKrUghEQMY0TdENMx6LAjKSRIRETHjImRRc4R6hJIbgcs4luAAMQCoiJYVuyypu1mHwRycH3lBfUxNRhSAmJHAgyfwixl/3nlociX9wSTuwPKICAIBKucaOj40vjoeBMel5uqasXbPGt9IbGxoQsTBY6jJjzFgCesfEVwacAkl6duTprDN1C2E3gwFw7B/1FmxOAwOwxd0HreEp8fikWBHhz2XFmyvUSpPd2++AQ2dQLeHvGjRAiBtsNCcBgTJy3qPpv2rVb6tUr05c0HYtN/HKic4gUM/p0+l0JpmczOfztmWtWbMGAAgZATTFjI+vW5rK5QxF1TkHBFe6WakEOAdPMKaQEMjZGeKolEKInt4+ReFjY2NDg4O2bafTaSJSFKW1ra22ujqeSMRiMZiuLwIA9HmqUuYthyHkbQeAgKEEkECKiihBgnABOZAExiQSSB3JI2ACE4YuXS+NzCIZVDQgMcPgQWDIQBIhoCJkOAAOoAoqSIWkYFxGuJKRgUKbYUURntd16ODQ8LCm6YjY1NRYW1MLIAu1xHC5+IQTHv1yxAOOfm4AVAZBbNbYiZyEjAAFz1SqBQs4eTQjz8qwfONQ/unrwj9NKJwB/1nyX0/a58nCEC2KcCCYSHnTdxssSZ85bP3bCbsswK4qUd5bpW48p6Wa/3AM5Kg6cPlDsbKq6rprowzBkxKIAqahapqfQEApM678YGfntqTyjy2RG1ubwPMUjjHuAZELnIhUKQkB2XStIUJyaqqr66CTt0KRyMTkJBH5ZmdbW3tVZSXnhTtEUkwX6fqWHgrhTKVT5eXlnuO4jssAEAg5Bw88hgicgJBxAUSSFIYSQRIAkueldalpitbtWm+pLC8PmZIE+nlnSYDICAGBSAmIgOoJR+Eqeh6CChRGLycEIPmP3fDo6Nj4xJIlSzhjubz17LM7Y7FYKBAAfNHey5dGKdOAC64EBZcmlK8tNlfP6lIxZtEN27L7JwuY0flZcZVZ72+OG3ZkQUGw6DwqdFoawqxzQpw9LwQh7VF6SpxMiZ/7NO4Qe3eFel2ZcketCgApQa/blltXyv9+vnHZg1BR1Gg0IqVkjDmOAwCMcZIEjBDxyETO4LDr+g5UFRISFA6EDjEmhUpCcCZ5oXiokN6Q1NPTk81mGWOS5MIFC6LRWHPzvHNDi7MDpD6rBhE5oKbr7R0LkDOZtxRE1XMF14gh94RGYCFqRJIDELjC782tOSSJC0+whCff0lqmcib9jAKi/6/PJ4gHzEf6+yapSvMEMR1BZEjZmU61xU0E5ndeHBsdr62rLS8rA4ASgO6TJblsttCZ/0WicV8SIPxKvwMAt9do959Tl1Bq4K4NIf3+pK+P3hibPuDzlf6BTWDPAidHkFQwR/3nIsAB4BeT3tkgJNCCrAyh3yaQABZBSnwpJweB7qhV/+Go/aHjFrnwhSVXROdf27b37tuvKkpJSWLfvn1BM7Bk6ZJESQIkAqMU2Y1mGHRk5ABTAAhQ1VACY1JKJA9wTrtI1/OEJwKBQFNjU1t7mz7d2vCsHMZczlqhmlEI4XleX3//8GB/ZW299FUhUxBIAjEEwZARCYkIEjgyRGBk2JZtqB7Xu/PDH21vbo+GQcoZ5tp0sTJJKTfVxE5lcp/r7BPMMaRNYI7mvZqQXF1WB1h4kXPOU5NJ1/VUVZFSTqZSM7zzF2tU2yUBwu0ZCRy3DLmlD05BiBHAW2LKr7NiwCWwpLBpRvu9daZ6MC+hUEwzuzzzzD5vr9N+tDyQEzRh0a8H3c8PuKdH3L+pUwHgRPY8PdMSJjuxPmQjSQKgggn84WN27MGptCVJ0NeWBRZPN5g6kJQLY5ftjNDR0dGJ8bEbN23a8eyuNWvX2rY1MNCfKCkBlADQFAw9eLD7ZB1pLqaEOG1lhnO58XSupSRxR1MpMEWSN/uu6LpeVV11/NjRvr7eltaWQv5tds8LnJPZnw1IRVGqamoajeZgJAxAHJBLkACcQPVQIBFJIMY4IYGQxElwQlVnLkA242wqDf1FQxXOYg8ATsNfAgDqqC6LGxWGd1U8VhsKe4AKeYwrfqzcDyw1NjQ88eSTDz70AEPmul4sFo3GYgDA/BFul40m/K8248NHrAGXsrYEWwLBP4+e8dkKHwTFyhTffXhiyPM9PUPFpRVqNif3j3tn2Z8P9js/qFLfWqOWqNga1t/Zpj87LlaVcADwzu3phDA05pX/euodtWqFzhTER8bc+4ZdEOR7qmpMubu50AhjxKat497C2GU7y54hBoNBRVV1TSMC0wwMOkO+YQlEFUHeUB99+64nalhUV8wYh1JuqqoIaUBMopSMKWdq8Ekiskg4ohtGMpXK5/OmYcxuP3NW5cQZ5xAZInqu61hWb1+vwSkciQspJSPVk5yxPEMmOUeBCNyTNgMFuQSBxPJMauCqinN3Y3s0ZEoiNt2pA6nAjANERPbvXYcfPJm8qjz4g2NTd81vJczlQVsYDjRHgsAK+jkYCt500025fM6yLIYsUZLgOOPuXkY+4ZvmabdVq8+kRVpegCImacuA+57ppkxfH3KBAUh4ZENoQ4wDAP5wEuYOkZcS7tyRfbJN/69FBRvSR6AlYNSm88YEpyz5uWP2dAsjLHDHAQCgxCXXA1UBAPh/h62ggLsvX3NUN4zJycm+vr5sLktEPd3dhm74igQYmsje1d5+V8s8BqAy7pfb++ahRzaQ53qKocwZMc8ZaroOgBMTE/FYrAA58scK4uxBn+gPdsHC+EeuqplMOplMKqoKAAwZJ3SQceQaEQNPAjIAF0HjXJKUQCg9BryP8n9QEV5fmSASDKeLpHw3jqRPvklZ9NRk6ovXLGmJm73jU+/YdejmysiUIvYOpt6xqKkyXChZOn78+EB//5p166KRyEzvnLkG2OWSJyw18FXG8x3MK+JKyfRQwHt7HUCsjHIfgd8+5Zx/2DzCd4/ZORvuWWYq09b7lEuDFl0oNj/jCZytJy0ZfiD1ihr10TGRz4jvrLqcg6QlJSUdCxZs2769tra2rCQuhChJxACIgUTCjGD3Hz1xIpteWNZggB0NhOIaYwyaDA25hqiY6BEwnO4BQVKEwuF169Yd6up69tlnA4FAdVUVkZRSMs5n9aHBWb4FkSRkTArhCUmul0ml/NibBOIkVWKMSCBKiUikMG4DEXmmRA9ZznDDKfjT+gZTAZSCEJBx3xZFSRIQGQKKnrTTAXpNSAHyMhKbTHzLwjaDE0nkIHzc2rZzsKtryZIlvMChLRSIXIaNni5G3t+V78vITy81H+l3pUdAMJQSp7Iy6dC7DuYLjcDOJz8+ZZFLX7jKqAswAMhKGpsh0BAAQdjAdrPA5J905ZGsPO9rzhb0y24HEJgCMeNyps6QlK0tLS0tLf41qKwo94QgCcA5ACiSGmKREXC/crz3qpDu8X7Lk1Gb9zj2axtrX9dSKYHPnlnn96QJmGYoFFZVZfu27bfeeotpmpzPcQVxdj8MKRlnACCFJ4Sorq0rragAACkkAjJkLiIHqQtPcBWQS08ikKZpwhaS41jKvru+YkVpFNAl0GbHY/x+XSQkMGUwP15VEjMVBojPTYx3lFSYEhgQMU7AQArk3LKtaCTSUF/vH57fZhHnNpK7gkAY5Lh51NvwREa4BAgfbTM8otbH0qUccu7zclk4/qTf2Z7yPn2V+edV6hTBiL++gE2VyntbjMYQq9ORASDClEs7psS79+R7z9cLGBggQF2A31Zy2XfhpqlU+vCRw/FYPBAM7t6z+9abb9ZUlYB0Butq4uuqEp53+LrK+OLSFpTwvVP9jx07WR5WkUlbKDogkZxOjgMQ6Lq+aNGi5OTkkaNHtmx54pprrgmFgjCrL1s6k5kYn8jlspVVVfFYjKREhq4nhOeVlZWpXAUixpAQEYSC4BJyrjOSnvSIkYpMeI6rINhssWa+ubWBKygllyiVaf4HIhIjlISAhDiWTt/Td9LJZlbWzts+4L6mNcY0DkTCyyNXGeMAmMvlhoaHH3r44dJEIlFSEosnShJxuCzbW1yMvKtRu6fXyQh6XY32ozWFTMYH2o2rnsqAI35TqAH6c/LN27IP12pr4woI4ghfWhl4R+PZwZWggq8xGV8Kr9mRPe/YCSL41mJD5Zcz/pAxIcTmxzeXl5cdOXJk+bJlrfPm7dq9e/26dYUAo0RAXBQvP5pKLy4p+cKeo09Njfzquo0VQWm5YHguMA7IhASGBEiIjBEyBi2trZ4Qk8nJ++//5dp161RVO3b0iBQib1mjI6NM4bZlVVZW3PSKWwxdAwBPyEw2MzDQ1z6vHhAlASfpEFM8rjISgiQCA5BSAZKKzogw6Vnv72ivDxvSI2KE5EdGC7YNEgiUSIASbm+e117RsLvv9Pe69j4nrJGu07uHy5eWNF5XHUSQvpauqqy84447xsfG+/p6T506lTlw4LZbb9Ne7A4XLxsQLojyX64JluvYNqvqN6Fj9/Xh1z+b/Unf+dxCWWjhWvgTwj29zj2nbUD81dWhmy/cODRy3ooJCaUG/ueywKZKFS53yeWtUCh09fqr+wcGB/r7OhYsGnhmqz8lngRJQK6w+bHAZ/ad2jKQDETjP73hGgUFSDBULoHyQpoMkUgy5IgEgEgArLamuqSk9GDXgYGBgS2PP27ZVklJSWlJqeM41TU1nLOJiYlMNtvX19vSPA8AVYVXVlb39vZ0nz69tKwcASQwRFAUEhKQEYIkYowJF3hUeCnPWVBi3loXJULkwID5HQ39Xtu+BYkSgeNYTnzr0KGM5E3x+F83r6pWlb2pyd0T6ftGTi8sbatSGREiw7yVz+es8vLy6uoqAHA9oSov/gv45WRWbTjfwAmFw71rgm9T8Fvd9hwcIvx1u3lnk/bEiHfX/jz4JBm/Z7SKD497b++2/USjIGjX2RoTv50UGoJIin5n1vQlv/8vwzsbtU8uMKvMK4BBSmQahq5pqVQqGArn8/kDB/cJKXwmGkMkJCHEwz3jJ7P5jyxZem15EJAGUvDj072rSwNrqsoeOnny1oYmkyRIThwQqHDpEQMBY9GCBXV1dQcPHEgkSqqrq81AwHHscChk287mzY9xRZ0YHz/JWFNjo6qqtm1FotFERYXfIMYGQiImySWmAQpEkMiRdJDjnjJB6TvntcU1RoVOvgwK7TOmaWogbSITlQ/t6lxVlfiTsrL7e9J/svXpDfHIezvmr2yJOiyrgB/rpUw689TTTwshEKC6unrBgkWG/nvBy+Xg23CEf1lmPpAUg+lCw8LyADt0bThhIgC0NGlLw2zllvQMRNGjrxy3VEQEMDkAwA6CZwA0hJyvCRnEdGZwEDrWh/hHq9Vbqi9/7Tfr/YWKwhsaG5966inOlVwulyhNrF692g/a+CMZjvQN7Onr//aGNTVBXUrn8f7kBw/tWx81vz/s/LNY3Z/zMq5nGtxzJWOKAiQAGRSCGYZpGoZefv31jBWGogGGfMOlpaXlVHf34NDQ8PBwIlGiKTyTTlfX1JTEE4V7TdJD7qHCSXDyhOQuMl2SzdmonbqtpmxTZRmRKwk4IoFA4FBo74tAIAlNhT/R3ccVfFPDPJO771waeGO24gvHe1+5dfvXVi5fFg1JLj1JOsPu7p7amrpFixcODQ4dOLB/yxOPX3vttYamIuNFEJ7PgOR435rgqifS4FBNgB28PhzVz6isSpMDARIQwic6jKoIn6/5RfTYEmR0ju9HACaHsHZFDwQtKy2dN6+5rKw0Fo2pmupHTQE5SUGMNVSU/WNZWc6xv3Hw2OtbW3/dN/WRhsV/2FH5ZH/yP4+dvL2q7HsHeu5aXB/RNL9/fqFdVKFengAZ8xNuyADRZ2kamtrc3NzT02M5jm1Zg4MDdbU1EmQ6lR0fGwsGggwBkCvSBSJBYHGdSUdnrpBanuyKIPvA/PmmJoVQOWMAhMAL3iBKKYgh9wil5z4yNPyaukZT8wQBeBAJ4N8taVwcVh4bGFlaEkUCXeFCeBMTE6tXrWKI1dVV1dVVjzzyaDaTMUtLp80FutzqCX93WRlmwzdGKh5MfbBZn41AAEg6BAiEsPP68KoYh6L8BmuUENE0zQULOvyMwSyyNQFjCBBQ1KzjfXpfX3UQwobRGlZPjY8ClK0vD+4eNcIG+6OqRlsgASIBIYNZlO7Z9LQCcdQP/TOmadrSZcu7T508dPhQNpP1PBE0TEVTA4YGCALQZ/1KZAoAA3IZ04Q3oWhgiY9e1dwW1UhSoZvFNDmGEBkxREkgFc4nLDebh0XRCCCiKwDR9YSqqlJoUdVBEACEkpBxz/MOHT60bPlyBMjkcogYMH8v5OHLKt9VbmDvzZH157iOPx5yAPGfFplFBF6cNXoOlxqRpAC/9ZLfSU1KR+Rtgr9avAhI3lATe8RN9kxJJOFR4FjerQ+7CY07wgMEJEIgPAvoc3nb/leGWFNdVVNba+hmOjOVzWTzjhsOByRjAMgQQ1x6ntCErVA+7GRVV2QVDSem3ttc/aqGcvJcCYSzGOQIyEgKAodQEHEUh0ZzZWbkw/t2bxtK2owzLrkiPEnb+0+uLS9hUgpgxBCRVq5YkUyl7r///m3btz++eXN1VZUZ+L1M47rc8l21AVY7txLjaFb+00nbjPIZ1ltRXgAgz3QoRE5SAlJEDS6Lat85cvyuBa1NifDGcOLhvu5bq0ozztQfNNRsG3bWlJtMKkQSGfPpXjPIOJeZhL7KRSCSDfX14ws6uroO5nN5y7EtKx8MhgAAPJkCoQRUV5CCvF9iWrjzyP6r9S1/UFuB4DqMVCpU+cIMvZ9IAikSuKo8fKL3+wOpf13eumey9KtHe/LH+99YW/rKyurPHjgGIeyIhgkclWuW7XYdPrhk4eJrN16bz+fGJybqa2srq6pms9WuxGT9C5P9SXnV02mwaeSGEGdFTP0W5miBUDY9KtRxnKPHjk2lUouvWhIOBUmiwumVjWVv27rrmqpmBs6O1NQfBWrq4vH3LQ6+9anD62LuuoplyBn68/8K08guSHqeJuwCAQFANBrVND2byWmKphAzVAWAQGWOI0fslDT1WJ7Xq8qf1Ibf3NZSG1Ed6amoKgpHICz03gYEH/uogECOByetjxzs/s8NSxMav7rcurFqyY6B3m8fH/3bI93rFfnx9Ws1BoTq5Hiyr7/bykwhIuMsbzlVlRWappMULy5l9HIG4c5J0ZeXB5PiByPu4WFP0/Gna4NlJhbRdfHar1DiAACIwvOOHjt+6PChstJSRVF3bN+2ceNGTdNcT1aHQnd1LPp/Tz5TZ/A3NNT9cXvt3tHeL+0/tbFm3l8uqvWkQwIIkHFggIKEwpTpcaJnP8uFhjSFj9g8r7m8rGx8fCIUCJjhEDAFAGKG+vWli3tTw8FAoMSM1EUC1UEOQERSBQ5ArIB2KQi4j2YgKYkxSnniuycO14Vj3ztw8o0LG68qqbK89JrayjW1dWMZO27qnEuSRCSf3bOjv29gw4ZrXM/Vud7X23M0n1+7ehXjyovYa/QyB+F/Dbpf2ZcvnJmKP1oZvL1GLULrhVihRIisp/f08ePHNt1wQzQaBaJde/aMjI5kkpnTE6NXr1n6yrroitIVCucVuvqDY713P3f6r1uidzZX2NmMYmgK50AopfBzBgCiMNzvfJV402RuSVIi45FIJBwOz540ypHW1obW1oRmNvDpoAVCdeGYmSwMHQRLuCoDZApy7UfHT0SR37Oh7am+yb/Y/uy72xve1NLqz1crCWpCSAIEBIbKypWrysp6hoaHDh061N7e1tzSunPHdilpujVxEYQXIV9eYLyrWvvAMatMxa8vNtViLOZ3gSJJx3FaWluj0ajnCYbAGX9iy5OhRHT1smVB1XSlWx3gJNnnOo8/MDG+54bl73nu0LVPPlvrqahzy2Ovr4+/saMCJCeJs+F3vvG5heEwMLtdopTTOAQAJkHOgNfv0A0+O8avEZQSgDgBISK6JiKCFACHxyeqGH91R7vG2E1NFcsTJa96euuJEe99S5siuua3cJMSGCIBqIq25KqrGOPjE5P79u7t7Oxcu3adoqrgtwwvgvAipSPG7l8VKKLoBTuF05PnJSKrKC9/7rnO0pIS23aOHD1i2/aGDRvqG2oRULpSYToQu/fY8R3Z7AMbliRdqOf01VWLEoo55uWzlnQ8sXvUaonoEU0TfmsKkNPDJ+bGZnx2pz/EjAgZwlmjmgCImA8xOBPlwUKRrj9flwAZSkEMUQIQU7938MSzE/msIk9mrLctbCPhJSJs66arP3zgwN1bH/vsmo1NwWCeKIiAjO3atft0b09bW/vCjo6SRPz666/LZLOhYBBIkl8PVQRhUf53NOD0v4yIYrFoS0vrAw88UFZWvmTp0oryMkVRHMdWFRU5Q5SudF7d3HBHExq60pudYKTGDCOgiAYMYFT5Wc/Id/cd+Ma1qwkEAw5AhWmdUgLnMxPt/ZAMIswMMfORNfNXOFNqCNNDfP0KDcLp8RWFrxI8AoUYV/iHd+wlkp9a3cEZ/7td2x/t129rqnI9VBh+YtmivYP1IUWVjEKaAkijo2OZ9NRtt93OOZ/JYYaCQQASQnKFAWIRhEV5KSAJVF1Ts2HDhrq6Bk3j2Uxmx3P7h0dHGpsaliy+CoEpjHEgVCRIb2AKhGJHNMUTlgL4q97hD+4+8LN1S0oDhhCC0GUSBIEgoXANaTpsWuDT4Mxc6zNzmuboZwBEn344Wz8SAJEnhUTiqIBHpAJHEO97pkuR6ifWtOkckeGq0tYfD/W0xKqbI8xjDpN8ZW3CZ5b6P9p7+vTE5KTneoau+3Pa/EYyiMiV3yNSimH7ovwmtxAZZ9jc3KxpyvDwyC/u+2UyNfmKV9wkPHHo8BHGQHoCmW8fsiE3TZoCyBQlsHMs+eVDR++9evmiqlLPdpgE1/NOJF1BisqkIFmobfC7Wsxq1zU9We2snpZI0+lFJPKdxJk6XUCUDICIeaRI3pfNZRzhCMtCCxlDwJ0D6QeGexZFKz62Y//m/klV0QgZSJCEBAXz+6olV7XP73js8c0HDx4EAMY5vdilg0UQFuWFeYg+35Nyuey2Z7Zdd90NVdU1fb19S5csGRkekpK4qiAWJvlEOS7SFQA4OJ79y2f3vmNh67LyiPAcYFxw/usBa9Pmxz+z57mBKa4WHnHmM9ugME7SH500HcIpZBmmGafTYw+pYLoCol+5TyiZIhnXYdgV79tz4P1bn37bjm0fX35VSJrf3nd878TUu/cd/lB7x3sX1Lx/xbzPHth1bCytcDY9xZdNJqc6O59zbGfhgo4brru2t6/3Jz/5SSqVApKzOvkXQViUlwJ+5M9DkxIRhZCqrpckYh3z2/v6+vbt38+QkZRCyJ17dm1/Yhsw9orGuj9b0HoqmfurHXve0tb0BzUVIAhAQQa2a/+q98R/r924IB57+97Oh4/3SwlAYlachkuSgIKQiCQBAkFhdm8hF4FEBIVSwln9oQAkk8Twid7JN2/d1hEO/PCmm9dVzHtn57FPrJm3dyL75qe6frxm/qLSgGPL5SWx76xbVxIygYghAOLA0NDOHTuSqclHH3t0ZGQkHI7ccvMtHR0djDHE/8/eVwbYVV1tP2vvc67fcZckE5tkJj6ThCRE0UCRQimFl1IofDWovaX6Ui9UkKKFAi1WpMUKpZBAAgSJu2cyEhv3mevn7L2+H+fOZIJU0ATuQ0KuHd/PXmsvFZ9cSfg+9yN+h0O87esP7ijHoi5KQggpnQDrYDA4fvy4l195JRaPjx07JhQKVVVXS8NYu2ZNT2fPpJmT47GYHQ5lud37+nv+Z3TeV8aWaWVrDS1YSuPR+oO5bvO4It9nxw6/p2riks7+G3bUamU5TZtApNnS2tLKWeTBtq1Bi43WChpas9YKBGitlSLbBiAI/WFLgl5r6n+wft8fZk69fHyZbfDXR5e4WD9Y237tnMoxQe9Lbf2AcJsGCMMy07I8LghBhFg0umvn7qlTJy9csLB6+vRXX3u9oaEBQGVlZTAYPKyTf5B4n5eb3XG+tTb+02YLApJwdb7rZxXuyzdEvJIAjAqIPLdY1WknNL471j06IAC0RPgnu2MCODPf3NFv74syEW6b4gXwlY1RUyCu8fNxnkIfAXiwweq3+atjkllGr7Ta5+6Knp9uOBG7NuPLw1xL2u3GmFaM2ZlGdaa8oS7uEZCES4a5pmRKAA/sT6zpUrdP9Q6xPeD63bH6KDvtMHJMunKU22vg93vjrXG2GSdmG6bAc+22U1cxpviq0Z7y9OQUFrVxzZ5YuU98vswF4FBU/2JX3CUwJ0teMMy1u1ffUBfzCPJL+vE4t988hmN3Ro4YEY1En3322UWLTpg/bx4zli59QRrGCYtOSCQizz3/wqSJk0elBRcU5JNRqG1LSBNsC0rUddM/97b+cs54g8i2VX7A9aVRw+7csqMpWvjQ/uberv6p+flz8tPz0lzKZkjbgJAClo4bbFpkCxC0DdJSC5tAgiWJhM2r2rtX1Ne+0tM/MTdralrWJG/u8GtPIzoAACAASURBVEA6W2EiDwz5/fHl39jy2gkl3vvnTD7+tRWQxsUjcoQUsWhi+/bNaRlZo0eN7I+EAc5ITwdQVFg4b97c9evWFxUWuD3eoYbiY0YS7uhRJS/0PdBkvTbJ+2KFd65bPNucSGiM8Ivb9sb+3Ggdn2WUB8QzbfZde2M31CUbtvxoT+zuuthLfXauhzLd4u6DidtrY1/aHAUwMV3cti++V/FgPvvFG0JXbI8MNin7dUPcsNHnouFecVtd7MGDifHpMugXt9XF72lMeFwEYEdU3bY39mqfGu4TAFrj/NPdsT/UxdZ1HVGZZlyavK85cVtNbEqWvKUpkft0z0OHLI9P3LY3dn+LFXBThls83GLdVhObnCX/3q3GLel9qtl2tl3SaV+zJ3blrmSP+4BBjQl9e23ssk3R9V2qxE+KcVt9XHnp2GXgoAOgsrLiwgsuLC4qDIcjy5Yv8wf8J56wKBQKLXl+eWlZ8chRJcw2pNJaaSG1shVRQtO9e/ZPLSiuzM502tYxaGtLR1p6xnONXTXdbWeX5fdGItfu2njdut29VrwvEdvTH7eYGMppy8LgHkv0W1BCCoIg8dS+g19csXbl/pY5pcOfOnFhngyGQ+Ed/V3bu8JaBpQQiu3KHNepOcOXH4x63Xh06qRCVwKGbG5tXb58maW5vnbvhs2bsjOyTClXrloVCYcB9Pb0ZmZmCmm86cKPGRJevj0WiehVcwPH5xknFhjPTPdVZRkCuKTMDZM+nWdUZ8mqTLkox4CL7qyNxy10xvRTHTYkfaXENT1bXjTMNTtdwhT3NMSfbbK/Nso9xifuHOdx7GR31yVgEmz+S0OyqX2RSfdN9P6l0nNHhw2F1+YH3AauKDWlRJVfnp5njEsXl4xwQ9B5uWammwDUh3UHAEk370sMPflTC8zTMw0QLh/m+sJwN1z0RJ+6argLghYG5cIcY06OPG3gB2cXm3DRP7ttx16wts2Gh6KW/kuzBSDDpMtLXSIgoxafvDrsYrpipBtBcd3oYz2Ngx3PuJTU29v/4osvFhYUzJk9OxQKvbBsyZhxY6snTyOSBMkwmGAwWJCUclVLqDYR+eG0ETbbtmJBcn/IfqqjbXFWxvaull9OnTyjNP/yKaW/rZ7h8nqXHerd3myfvnT1ro6YS7qYWUKHbHzpjS1fW7sxoWyACVrZRq7PfVX1uBNKstMNdfbw3LgruGiY/+G9B2ytDWIiA7ArM3Iao70xW43Myjhp2LCD9QfWr1s7acqkWTNnzp8/r6Wxcf+B/ccfP9vj8b24fNmrr766t7Zm4sSJTreJD0cXfZ9JuLrXhl/keMhmhBWbgm6d7BUCTiKmMXAt9/XYi/JNEOZtCD/cYl+Qa0Dzli5la2jmbot3zAsy44xVocaonpBl6IFz/Pre2O8rvOl+eWlNUubcW+VbnG/cvDde35z48ijPpCE1oDSSZWVsAITBPkx3NcR/V+6RhM2d9tBS3HqISXxXmw1glk8MfqUBxY7xDvtCek2j5THp+pFuAHHGg132zWM8lsVbOpKyUWloF90zxdcd1e6X+pT6kBSbD04MOkWSBlzkpLRdWVkxYcKESDT28ssvjyuvnFAxPhyJ1Dc0RGMxIYSAdHKBwRyxVDTa9Upzh1BCaqU1P9nQXBlw5Wa4MymY5zbseEIp8hko9gVshV6Kz073v97SCy21IJLuLc19YQ4Xe9LiSgsSDFmdl6ZV5EB/D4SRILGzLd4SDp0zqrwmHlrd2CUEs8ampp47t2xZWJxrmiYJ0dnesfyVZTOrp5eWlCjb9vr80jCj0aiQxnHHzaiumuHxeE484eRAwPchr+Xf1zUhA3HNjJ196qzN0WzFbRor5vjfNPxI4cQsY39IrW2y2vr0+gWBO2piyUcM0oyKTHHrZO83t0ZLX+qfkWM6m7/WpeIxfW2T1asZMX6+zV6cZwDYFtI/3BNze8V3x7klYWuPmvTOmbtK4b79ief6lJK0I6S2h9TCN5XuEfTDnTEh8O1Kz8/eVnAJumxTZFuXfVm5J8NDADZ02I1d9jUAJN130PpphScgk6lsl4123d6c2NRuf35rBHwM22iGRlE7yMrMzMrM7O3re+Xll0tKh02cUNne1rZqzZrMrKzavXsnTJxUWJhPmiTBVuq0kpyRGdV/2rPn6YbGU4fnNIbV0+1Nz8yZ/EhtY366WxqwFaQU0Hp7V9upw0rqe1tmFhbv6mvd15c1IsOjE3pJ+6EzCgraIpZyTDGsCwJmjqvw0YbOjNaug12HYGZ8qXysCb5y/Ni7du7ZF89p7Els5+hPZoyvzs91atxk5WSXT5i4ZeeO+dnZpmmuXLnS7/ePHVvumIWKiwqKiwvBPDRS58PB+ykJz881oHDN7tikdLnqOP+GLnusW+SbycYChyu2hNWpuXJcnglgclBkuwgMF0EAUcVdFgO4cpR7Qr6BOK9ttZxTfHh/4tIS147Z/itHuUG4e3/CkVHf3hKNRvVT0/yj/OKR/YnLtkSdg0hAvuVWfmFHdFyWsf34wCvHBZDgu+oSQ20zJhE0/7rC89RM/41jD/chlAQBkCPMNS+fG5iYafypPn7j/gSAU7ZFv1Tu2TLbf+UId0e/WtmqAJgCUAxg+Uw/XFTTrWAf8x4LGsAgIaPhyLhx46umTQ2Hw6++9trYMWPnzplTVV1ds3t3JBx1Ir8EKA5rrM977bRpV1SO3tYXi/eE/jx9qsfw1YesydnpSMQFJDF3RFS71Tc26Orot8YFfdk+taS5FaDVnd3Q/srsrJAirxNCzewxPBMKfCsPHZzkzvjBlJm/qqocnuGKKGthjuvblZUh7T6tJP+uaRWTsoNOdUQAWusZ1dVer2/jho1vvPEGSMyeNcuQpJlZq0GHB33oOsv7ScKfTPAGg/InO2O31sZr+xQAxWwK+tu+BDTubrS2dasb98YZ+GJt/JclJgTOGe769pYoXHR3i7W80773kNWU0GetCtuMLccFMr0Cmg2BP+9L3HkgnmZQrknzAxKEp1qs+xuth/ZbyxsT8ImuGN+4O37hpujYbPn0IUsRVoeVs0JzlEyPoJXt9qMNcdtAmqQMN8ElHj2YuK8+ycPtIfVIqwWDfrUzZgoAUIw/1Scg8HyP/XS7vTes/9phQdJjBxKfL3fnuug7myLnrIuE+1S2SQUmVaRJSJyyMbymXd1wIIGwvnlvPNNFu44PQuCYloSHdR2tWCtK1hFEQWFBeflYpdSWLVsK8vPHjStnrYOBADOsmOW4OIjIbXhYCEE8KsPzg4mjvj6rYqTfZWqLNDeFE3HTJ4ggxCsdXZnszfO5QppcAicVFNe3h+KWemx/08xsM8EMYlMCrJ3o0+pMd44rvTgnkOGTAmQoeGBYQHWevGJ84ZSiTL8wDTJYMgNMJKUUzNOrqxpbGrt7embPOs40pNOobZClRKRs+0N+WO+nOlrhFzvmB55qs8MJvaLLvnmqrzQgTIEQ+OaZfjBe6rTTXXRTtT8W18PT5M3V/jOyjHBM3zzDD8VrQ1oqvrnKF0/wzj41KV3umB/8c1Oi0CUOxPTNVb5QjLvi7DVxU7UfzI0WByVumuUnGwcsRQLXT/Scm2cu6bBvqvKDuS6mAbg1w+LPFZtLOu0bqnyWjQNxvaLXvnmaFwa1RXVfgtNctD+kb5jkNUziqG6Lc4GHuhMcAd883c/Mu2M6AFw3wWsY1JHg75a5Pp1p/L3dYsKCQr+XWTHamG8+zg/Qi53WWfnGZ0pdMsFdCR6XIZbO8m+KfRxISCSc2BYn3d5xoTNzImFlZ2cBICE2bd5sus20rCBrxRDOPC+l0KyEZq01wKS1MMXl5aP+sKth88FDFfm52QH3E3t2XFoxCYDUnriwFuXn/3Vf5yN1bYk45hdkreqxDGFrGE6YKbQuzciU6U1vHGwqG1+mWRuARRDCzQzNELAhSZDrCCunEG7pPvWUxcuXLduxY0fF+PFCiGQ/mgEBKKXkD1cakvvbS+KdHT13npfu/bg13Dt9dXilxWU2ZqWL26d9PDOb6Jw7lvzirFMmFH1Epprki1Ao/NJLywsLCpVWzS0tp5662ON2OU51EgSNuNIelwFAK83Qwsm6ZY4DO7pj21r7DvV2Ty0JnlJaQkp/4Y31Z5aN+Ozwgvv31F25/sAfq8deWF78xL76lR3h30yeYBpgAKxJyFcb27WieSWZNJhYQYJZK1tLKUiIpsbGxuZDEyqneL3uwdg3ErKvr2/58peOP/743NwcvE+9Pv/rZ3fxvcgqAeuPbRZFTCHXoKI+PSPPuPWT0eb6wzfVDL4IBPyLF5+2fsP6aDR68sknez1u1hpCOO3N1qxb29XZlZGTXVFenpmeLkhatq2UcnsMlxZVub6q3AC4EESwLSY6p6holMcN1ouKir43om9hYTagfYryySWcDHqtQVJrnpeXCcMJuXGKqx+u7hSJhtev3wASUhorVry8YMECj8fj9GPTWqelpc2bP8/r9Tm8ZKVpoOPSh38zP7Yk9EjcV+3rTXC6K1Vd5oMSg4cdPFqbpjHruJmOTOGkb4KJqKOru7Oza+GCBd09vatWr51RNS03N6dm717DMMvHjgEpVgA5bUNAUmpNnx5VZIE12yVe8/uzJhvahq0WlgybW4xkl3hySlEwA5pZaRhS1tfWutxmfn5+OBLNyszcvGVrRkbm5MmT9+1rWLeuKRQKeTyeoUzLzspyLoZI0EdafuFjnk+YYuAHKgaHfOI03mVAQzgZsUm6ZmSkezyebdu2z5p1XCQUFoaruaV9w/oN5eXl4UTUaxhCGKw1gYiJpRBsQ7CpBQCLdUdHd14wwG5hAh6pnCb1RAIM21YkSJIQzETQ4LUbNroNV1FRUda0zLRgektLy+tvvKFsa/Hixe0d7T6Px+v3D51BkkU0DlfW+GhGy0cWwM1H37E4Ra/3YLBxor2RLE/q2CNpb83eN15//aQTT/T5vP/853N5+bnZWRlut7u4uCjg821csz7UH21qagpHoySEJifdXhAZJAVJAvOuzRt6oiEpDGlIkIuECSFBpFlLwwj1h+vq6uv274tGowTY8fiUKZOrqqaCUFxcePDA/qA/OH/+AtM0Nm/e3BsKvanR/ODb97EB/VEhCZc0Wt87mIhEtDcgLss3z8kyFmyPZpk0xaSJAXFrh/30GE9lliSgbFU4y6RTfWJ5WGtg1XSfBDZ22pfWxxn0g0LzwhITwPYu9Y8u+4cDrvNVHfYltXFoPi/L+Fm5Z/76iBIQjBcmeQMuevhA4ucNCUH4Vpnry6VJUxMBJW+EKnyi2eJMQT8rdi0qNADc1pB4oNPuV3zdcPenCgwCjtsQMQkhxSf55ffL3EGDKjaEs0waI+mKEtc3GuIMeAh/HOWekJnUYDRw7Z74t0a5Agbt6VWX7I2XuOnBcR6PSSt61BU1MZ+gX5a4TikwDob1OVujPSE1pcB8aLzX9fHSQgb7wjs5ts6clpmdtWdvzb59+ydMmNjW1tbS0pKZmdnY2JiRkVE5cYJSdjgU2bxl84yZxwUCgdbW1q7OrvLycsMQzc3N/f3h7Owsl8/rlgaAUDjU0tSasBM5mdl5Bbn9ob7169drxvBhw/bVNXR3d02fPr2vP9TY0lRcUphI2H6/f1pVVV1trdb2oaam8jFj8nNz/61efcxLQmZ8dkv0nN2xZRN9tYuC/5dnrmmzhwXFrwpcG5qtP0zynpproltN2BB2fv9ipXdjq/XtMe6bR7nXNSa+sj4CYFq2cXHQiHXZp+UlB+npW6K3701Ge9eE9ez1kc1VvpvGemr6tUG4pMBYsz/x0iRfwEWzVodvbLT2zA/cN977lXWRJR2HHeQrJvte3GddV+L+ar55wvrw2FdDAK4sc63rsCcxTs9PHmv5BO/rDYnLc8xNEV31Sn+Y+dHRnnX7E78a556eJXNiulrSj4pdE5f3NUaSCaZvtKuf7Yl1WwygPF2e4ReP18Tvb7MBzE+XwRhnAacUGM8eska/GnpionfvSWmPN1lXbYvyx00YvqnPhNBK5ebkzJs3v6G+7ulnniYhRo0ek0hYrS1N+Xn5zCylEYqEpTTTgkEAbc0t/aF+w5Dbt+9cs3ZNd1fHhvXr+vtCLq+vv7/v1RUvt7Y2R6KRVetWtba2Ccjujp4J4yeMHTN2WlV1b29fNBYbNXJUuC+kFW/etHnXrt3jx4+rqKywlVq4cGFFZSUJ8dZz5qPAf/t+knBll3rhkBU5IZjnJwY+O8J1dokJoM/WF+ebEsh20/QsAyH9u71xACUBcUaemW1QsV+MyTDu2ZdY1qkALMw1RucaGS4C8FyrXemluOawxQA6FUOxxZidLq8t9wCIK4zKNjwu3FIXr+lW62f5AczMlV8f4b63Nj54bl4TQQ/NLzAuKDWfneXf226/1mY7UnJkrjE4G9qEoEmfzjderPbtj+jNEa0YVekyzyDF6Fe4bLhrZo4ULrG3TwOAwrz1oXQ39Q2kZJR6xKh0+YsdMVsDBGXSAxXeuog+Y1Nk0yz/sIAAsH2W/9ZDCftjrf6y1kJKZk5PCy5cuGDhggXz5s1zmUZXd3coEvb6vBs2bOzt7Q319QWDAZfLpbXu7uvJy821bfvAgX1Tp0ydedxxU6uqpCFdhmxt6/D706dVV48qG+l1e5uamgPBYFpmRjQWBZCZmQFwLBrNyEiTkrbv2NHd0+12uwCMHDly+vTpAb9fazWYmP+v17fHNgnvqY9/dqCLLQECOL/QBLCqW41KE5KwP65HBuXvK71Onl59v87wEBGU4i8UGNOLzas2RwA81mSdnC4B2Iy/N1uPVfs64rytTwMY4xajDBrzUn9XjEenCWbU9qoLs6TN+OtB69oxh2PNRgVF85D47C2dem5aMkHl9BxDStzcZgFAWE8d0pf3hRYr30NFPrGlU2V7qMovHm1MjE+XfoOimnfG9PRs+b9bogGDZuUaAE7bHn16ov/4oOwbONYNLdbt473phF/sigHoszjPRy+12eMDsmIgqNUShI97NVRKNidLvsnMzHSZJoDsrMzS0mGvrFgRCvWnpaX1hyNZ2TkAYvFEJBwJBILxeMIwDK/XC8A0DJ/Hy4Db7e7u6d64YeO2bdtyc/NKhw0jQnpasLOjA4CU0nS5urq7AUyePNm27MmTp5SVlbHWrNWA2ine976CRyMJD8T0vDwJoDmiv7Qpeu7q8E174wAe6FU+nwAQVQiY+NZYdwvhLwcS23tUiVcAeL1DKY94tdq/pV8/1GKti+iFmQaA5pi++1Ci6I0wJHbFNYAcN62fH/RJWrgy1BFnBdT0q6mZRkRxXUSfP/xwBkp9SE8eklSxsdse6ReGOKw5nxSQu3q0EFiQfXhx9kqP6rD4cxujp60LP1jlTzPp6X7l8QgAYY0em7Nf6H+iydowL+CWaIlxR4d9cV3s2W77jfak6lsTUicXGGeNdv9yV3RDl8pxEYBV7fZYz+EZV9kDGRkfdybiLfqeaZpV06YuXnzagnnzAAoG/DU1e2rr6rdu3aKUzsjMZNa2rbQTmxqNadYABFFGevqcWcfNmzevsKiwu7sLQFZWVmdPdywWB1BcVOzc38zMrOrqqqLCgoHSiUfYXfioDB58P0mYZdCGTgWgwCsKfOLJZmtmjgEAEVXuFgDao7rAQwAem+S9alfsppbEmekSwM5eNc5NHhPXVXh+uDW2vNOenCUBnLoyvGSmv212oCLTaIlqADcdSGR4aMeCgMekfzRbGljeryszJTPcAhuHLAIfaLXOGFL9/oFOuyAgnOd064GEFrikxNwVUgYhb0ibigc77BkF5p8meBpPTVtcYABo6FGTgwKAUlzmFq0nBAu84re1cQC3749/frS7bob/mtGeZV22YxTUNpPEr8tceely3rrwTL8AkO8RByweNMD+9aD1tWKX8cnwnhyp7zluDPJ5PRAC4FGjR8+YPt22bY/HO2bsGJdpBAKBnNycLZu37Nm9e/v27Q4bs7IyE5a9Zv36LVu2rlu7Lh5PAMjPzy8tLSVBAEaNGlVWVpZspThEGtORNbPpqEwoez9JePEI1017Y1u7FBE8Al6BWZlyT4+GghMS/avauF8SgM8Um9UZclOrXeITAK49kMiQBOALw1xplGzk8Z3dsZibTsk13CYmucWuTgXg/+ribVHtM8kCSgOiN86JiHYJpJm0uMA8YSCFYuHaSGWmPDnvsIir6bTdbgLw+73xb+yMLZsZcBt0V5tlDHkqMRsc0tP90j/gXeyJMSxOkwTglpr4cBeRwEMzfPfUx++tTzzZYl9caGZ7KTdNLO22Afyj1Y6r5Lbb5gYjPSpNEIDpecamDnt7lybgnrrE3fvj3x/r/kR6MJOFf1mrZO8nID8/f1z52MmTJpWPHev8qLqqasq0qQyaMHHilKnThBAej2f+vHklJSWZWVnzF8yvrBjPWqelpVWMG2dKp7mFRjK09c32z2Pgpry/saM37k/8pT5uBYQ3zuMyja8WmP+7J+by0Hy3WNKv3IyWBNfMDxCwtMW+sS62dE7g5JVhy0Mc53/O8Pkl/bouvrRPfS3P/F2TlZHg2yd6+hP85V0xNuibBebBmH601RYunJhj/qDYtXBjuCAg9oV03dyA1jhrY2R/RCvC7Czj7srk+vBAWF+8LSosDtscBRWkibvLPcMD4s/7rD+2W17CCenyx2PcMcVXbovtZdYx/vU4z/GZsiGsL98W1W4qsjHML5b1Kga+nGf8v1Hu6/cl/rYvPjPDuHGSl4HF6yPaQEdYuw0KCsox6bFpXgDf3hr9/DDXtAwJ4Lu18WUHE7ZB5KZ1U/3u96lFzUcVO/q+uDTgtC5M1s1Iyi6ttTjSjDn4y8G0a3aqITKDhNOv4nBXtSFG2qPEA/GOz24gdvRjEsDNH1TDnKN+Ej1mSfjfMvYt/YPpbb86lp7dAAk/JnVHU8Fpn6yp58iol2P9clLFf1M4+tTUfykGP35IkTCFo1fKfWxkXYqEKaSQImEKKaSQImEKKaRImEIKKaRImEIKKRKmkEIKKRKmkEKKhCmkkEKKhCmkkCJhCimkkCJhCimkSJhCCimkSJhCCikSppBCCikSppBCioQppJAiYQoppJAiYQoppEiYQgoppEiYQgopEqaQQgofHQkZx3Tl3080mAMeI3Ubjs1nl/yX3N9eomL9dm/PJ+qyPz6TqM+l4xbUx+7CPvblnJnJ5+FAAVgbAGytq8qKJL2davrBlXykD+b2/+sTpg9yUNB72zO9iy1pTd2+8tKCdK/nvU1J/N42/wCmPf43I/gDmYz5A6Tcmz4wBK081Jp8DQAx6x/fWZjmNT+RM9IxPDGbUrjPv/O3500+saIwpXocWzqY32PQxfcOISHD55H+1NLi2Hy4HlP43TJ1J47hNUXqFqSQQoqEKaSQImEKKaSQImEKKaRImEIKKaRImEIKKRKmkEIKKRKmkEKKhCmkkEKKhCmkkCJhCimkkCJhCimkSJjCJwac/DsY6e/k3XASzhfMDE5+8Z9lEvHADhlD/zniJ86O+U2fJF8wD93PkDNk5+yOuIAjLsbZJx++lsEd8tC9OTvhN29+xNHf8dxTJPyPoTtgP5fi2b/iChMz0xA2MDTATvYWAQATmAAmAoNB/1liFw0kgJEz8N9mIyKAhqaAJg/BDHI+T84BzJowOB0kN2XW0DwwKSQpR853RGByTvYwcWnwzDU5p0Q0kIF6BM2YjjyrDziT7WNNQnsHInMQPR2xm1Jke2ey8OCIJId+EA5lKDmaHeIlRyUdIeiGirsjXh+WRQ4d31Z4MjOYBuQVD84HDhFZA0QMJqKBjHNiJkqKQSLBxMzscClJswHCM0AMThJI0xCR5sw5NHDODqkd6Td4jcnzZwaS9+eDk4cfXxKqnYidAK4BAOvbiHw9lWH6jiKLCKwAYgiww7vD+l5SiDnjHsysBqQc8RBxN/DWkRvkEOPfyBIakE1EzNqhOTEIxEQgAWgG02E+O6fKjghlZiIBEtDaoRAP6pzMRDwg6wbJpZmS58Y4ckpJHpgOX/YgsY+Q7R8IPqaJvNYziF0KdA3h5G2IdMN7JyiQot2RglBr1qxBQgmBzoQKRxOZfk/QFMyaGUQUtrmxL9raHl5b1/alhWODXsmsB1TFAZ4OiEpWGlIQgUGsk4ouCOSwmQhJ8pDzOTsqJUGzhtLSMHYc7Flb13b8uIIxBQEwQdDf1+2La3nOjBKTABLEmkGA1kzdIWVJSGVDSK0JpAWpXL8PAMOCRmuf/se6/WNLM+eWZwttaRIOj9nh8aD+OSAl2RG7glixFixsViApKCmXj2QvvR/1Xz6OJIx+E/bdQPQtsvEhhJfDswLG2BT3hqx/hGYSsIQw+2Nq7qUP2x6fCMrdt5xL0AybyPXTJzatuP/1fVk5/Yeaz6weEfSaIMFw/hsQG5xcd7FwNDgMUWg1Da7kkktKGtiKmVkIaFZgIQ2Kaj7nyw+1s8gZVljzx7NJ4E8v7PrJb55XSkeuPvPSk8YyMznCkkVzf/wz336oiwMwjQRpX6iPpSfuFRkuz6Wfnvy1hSMSin9905K7dndXJqw///4zk4b5oUkzayIjuejlpCyVxGBB0NDEpJVNQpLWJAUxaYJ05iRmkKCB2WRAGT7W1VGOg1vBh8AHwaH3ooBC70doLuxbDjOQoJVriFrUgmgl4n8C970XOQtuBx8CHwJ3fwy0XEmahADoB49u3J+gXhe17m5+bO1+kBAggE+bWlSyeEpEc9wXCMjk2BVEQkAKlgKCWAgSggRBCghBREyOTsosiEgIlgQSRBpgDXXYNiNIkYBwkZQAeQX5K0f6A74ZFenOTyaNyjbyC+3SkgnDMgYZr5m0bWX5XFd/83SVZrT0W6GEyJ00xl9WmIiIhs74lT975vHVzW5DesoKS4k9o3Lz0iUghYQ0hCEVBJEkFgRBkBJEgoSCIEgIKaQE5psz6wAAIABJREFUiCABIQUTmIUQQkBIEkTOzJLUut+rBfWjloT2asSvhV4KTgCAOA7G8ZDnw6z+b0ygfVCrYN8H63GQffjzIJ56+KzNO0d/76sP+TNbBp67jfjlsO6AeQ6McyHL/5sDdcL+B+xnoV4CdwOAKINxMdxXg45VnWJAJdMtfZGXXqnxpPu9EnZxwS8fXHfm1FKXIaH1orH5ZT7fyBdrhLJ9Htddz+7qImXAiFn2uExTG67azrghlbKp0C2G5wZW1raaAZ+t1Lyx+cePy32hpn3dzsYDh/oDfldZQfpXF4+TYIBfru/Y1xrZtK31jNkjNh/oOdDU9bVPTdAkb71ixqOv7Z85JgNAc3fUdvmuv2rmc5s6c3L9ztqNSQgGTNPD+rRJBbcXpjcdbOyT6uXvzQPQEbHyL3ogMDLvsj++dt5xnzvnxDG+dF88YXs9bhCtqO/YfShSU99ySnXZtvrOhvber3+qojw/7bWarte2N+1r6kzzBYaVBr984lg3AZLf2Ne1/VDftt2tn5pV3BaiTTVtLtaTRmf/z+wyrRWYSAh6byvGj3TocBeii5JSK7meWA1rNaw/IJ4L+T8wToNRBXqHen5qN+wNsO8DrwXHgfgR98GUP/vRV3bx2aMXVF74vfF/+r/7c0a+BmvQ+LUBiY1I/BrkhfgizDMgx0LkvgP3DsJaCfs28CZwHLCHnHADrF8AB+G55xitTMfQIAHQ86sbatoi371oYpobNz9fW9fVu3R765lTCpzlV1ckBlbacEmXfHJ17Ws1XaTY39Qy5rQZY9z6qWW1Oi/T7g/NGVdwwnFlP75/szfN42/tyPvxKa/vPHDbXes6lZq3cNKaNbWyO3bXC3u2/v4sAP/z2dvjJcUJv+fRl/dYobA7oXfWdtCeuh3kjSfE9jklFx038vbndjx+1/OthaPCXd1nzygty/InDapE0AwhASTiSpguk5Pz72Mr9/p8Xk9f4vhF5Vdcs/QfL+3uzska4eNLF44Iuo1zLrjNKCzrddP9S/fo/qht0YIs+aTLvPPm5S3wz59T9sq6lvTOrjue277r9+eGgbM/fw9lZSa86Q8v2+3p6I4nKFyUk9Hea/76tM/OKFOaRXIhOWjDomOKhJErhuqNQ+R5BLwf9rWwrgUAGgUaNuRrAa4BH3r72YcAQU2Hiv5w33cP5S48/pwJylIzvvWZi67N+NY5OSfOX2Z4+wdEIgMhcAjqt7B/6+hlELOBIZXLOApe844HGjQfWk/B9SOIUcesNqoV6I9Ltmqh50wrPNDcn4gmXKbv4VdqPzU5HwIAWyS8WkQNisZiZWOKXq/vnTw65ye/Oe2UMXk2eF9Cbd3blV6U9vCPT8wNuNbv73rmhS23/vZz58/IX3z9i4V+11cvmnbVGZMeWZn/jXs2t7T172oPj8/1/+x3l9zy/K7Wnr5Ahm9K6Yi+9t5rvjirI3Lclx9aHanp9riDAC5ZNCazIONn962xPH6XSzrrTMemAiHAGiSkkLaKpfuD5rn3S8XxhJUW9Bblu++/bNqu9kRNMLBpc5PlNkwyCfraGy694fHtHInnZxoVhaPj0Xj1nLF/enB7fjDrkgum/ejsCX/fcOjyP6yxatvrm7tHFgRvufGSW57YvLunN9PIuPvXZy0qy/R98a+dHm9jSz8AAcUskzbYd1ul9yMloXo06Qxm2d85Pq10O2wg8VabcB247m048NZPPIi0lv3hT/N3xj6XO3fylDHZVswC4MvwnvDD0/72wpilP5/42TPWzFq0FImkPDtybwr82r8/kAC8sNtGw2w3XL0AwN1Qm49REhIxSPx9bd3a3V2e9OBZP39BJGyPz+2RxuOv1193cVVpthcglhyTnJeXNfXKx9q6tPCL714w6ZQxeWDLIPOGS2dNv/yRRFr6fS/WXrBg2DPPbZ8+Y9T5M/IBPPyNEy71rd26vW3u3x9q0C6v29TRmAkB6C/MK330lZ2Hmu2pFWlPfGOuMxRAlCPM5kRCIgFgdGH6pRneH961Cpq14EFxw0nnhgCgNADRK+iWL0zOMalPujKy3SdVDEvzyJml7uOK0leurFdeF5MC6PMzi+94YmN71Dpt7ojffr7KuQlPfmvGV31iR03HgsserCe32+dGj2kYLpD8XHXusy/qmiaMGOFaVJYJQFqWYq3YAAAhByIAmN6tKvSRkvDwmta48Y6TXt32tSs+t/fcs++EiP7Xq1wBq7/kd9d97fl1ebMuX1hZUUREWunk7jVLQ0w4rZzE/91632s3/OnsX3xtecWMx2HjXRyoqWHOdfd85qVX5bN/eqp07MvQzqBIHLv2UYC+dtcmfzD44jWnjszzeVzymS2Nl/7qFZdHfvnetc9dtQBA0OMWcEXiifNnj7Qj/Oz2tit+/s/Ar84+cVwugGnFaRefN/HRv2//7Ytbbt/QrN3ysf+dDagIi+rP3tHC/skT8u/45emv13Vcfd+GoMsdcAuALK1NIgYpwyk8bbMGSYNMQ7P2eP3OYqAnwdoSgJaOHqoZAlBgsplYwHS5IJisWOKrZ05mEDGDSGvbUglTutnUgoRpelxCAsrSEsJMcJidPiycCNtiyvn3N0lXVWXhdVd/6lB3+Ct3rrOl8hnsMNzFhsuQSisASnNAeNplLM+vB2YNvDst9Cgh4STwVgBkxBfOX781esLzofl/+dEZVcV1cyc/kJHRmZeVyM1pMYJvYzLVofSOzuyefndHL7c2z31x80kHE4XDq/Iv/OqYRMjSSpMgK2aF2vsBDuQEXT63Vpo1z/rSwu6mab98aXr/ff9v4fg9M6fe6XMjN8vKSu/3Z7e8jbWY0dU4oqPH09Hjqm+Y/+rek9s4K224d9KEN0qnvoz+gWEsjzkxyKwViHoi6lePrO5v6iotDjQc6jxuZFY4buv+hOknl5QvvljzwOS0WVPKH3p+l4QO9fSfUJ6flZf2z42NvYb34p8+951zKy48aUxhZsadX5jy/IoDqoe6GvddetK43PQAWB9qi8RCSha6RhentTT3Pb10FyUQReLRl3ZdccbEB5fX1rdEYdPBPa3LtjSeOLkwYtmvrKxpae1xGa5de5qeX9+wuHqEYChKQAih1eDcrYkFU8KmV7fs29vYL0iYkf5bntx84qyyisIMx/loStfLm/ev2dioNfd09D+2ovYbZ024Z8n29vY+Yt6wtXFpRcEpU4ubOrpj4Zgr25/jR6g7et/TW+xorMfw3vtqwxdPKn9mTcOGpp5ozG5u01vq27cd6OqK95GUz6xuHlOSO2NsjqBkVNG77hlB7m8viXd29Nx53kfQmCnxBGKfSc4gLnzrf6/nuWeNnDGiu6kv2hOPNrVbTQ1GpMbkJhW3fJ6kFS+eEGQacVWgA6NdhaVmfqHpd/mzPIEsHzNYJ6VfpDu84pblvY3drNmb5p39lfmFFcXKVs6iggTZcbuvIxLtjlvdPfFD+w2rVYR2aCse8CrnQErDZgPSiIgqmVviHT7MDHjSCwIur/Hy71ff/8MvZOccSApSUQ3fclDaRzCPnXPHkl+cdcqEov9+U62VIiF2HOq78DfLA15fNBEH25tuPW9nc/8FP33BE/QoAbfgIOlT51b84W+rsguybGbdFV88f+Rz6/fDZ/oSaGloeeCaxbPHFzDTn5fvvO2ZPT6Tbv3m/GnDMlkpksYfX9p1zSPbD0askqD8zsljV9f2PbWjJWhZB+797PBLHh+V51UulxWOTxmZed9VCw919J/3w6Wc6QWYmIYHzUd/cvLBvviIS/+m4/HnbjhzcXkeO9EwzATRHo5/9pdLexIulzvB5O492H7lF6d/fdE42BZLSSQuveG1dbtbMzNcEW33dKq6e88ae+kzaRke8tjRjvjEcaWPXDUbwG1Ldv/+qU31IRR5jR+cWfFaTcszW5o8tlh9y6dO+umyPJPI7473xS6bN+wPyxqy0r0kzEhvb9XUgjv/31yTQCQ0Q/yXHKSL70VWCVh/pCSEhdAM8ObkOx9O/dxf53znJH+mb5Aqg47dt53KmZk1v906h/7506dad7Zkl+cFs/wHNx403eanf3++J+h52x8PRFn9+wORoL2v1J7s/cHZZz17OJbKdSPc3/polIn3QELWGklfnjhSO+V/50DmI0LSQKwskCQhBoUswVYsBSuSBiCUtqQwDz93mMyKSB6xK60ca+fgntfu7yr0u9w+T+EXHtGRxNLrPnVyRcHAEkNDKzLMt54SawUSWttCCCIxdPwMHHToVJQAhBAGAFaKpBwafPof6BOObZnfhTo6SMKP1llvwvWdw2cfwa1X3bjnmXXSlM7I10prW2tbvf0fpd+JgZHuyIG1+8ctrjzv9xecevWZI+eOTkTiTdsPve2NYmbWWqt/fyBpyrbadlr/+Jmnvzqku1w5XF85plaAA6tbYQCCITCYscQ8ENWsh+YuMZxw6uT/ByO0edDRKAwSQvNA4DUBMAUJCBdrAJBCOPtk57mDGYIHs4qYAc0kdDILSQO4/tnauSfdsvDrT17+m+e5N1qY4505Kvcw4QRBSmdqZOaBOE8GawhBgBTGwFTiXJwGK4Jg1o6ymsy9IJOIktE+Ugxe1UAUtzPC9EDWFZhtJMPcNbNm6GRU3ntoFfVRR8y4LoQ4e/DdmAlr5uY/uemJ9abHfC/2nlhfFMw5I/ISkYSyVUZBGmsetNO86932tfatvWv1rb+9Rpi9h4e098l39GQeldbQI14RUZI0PJBVxCCRDPJ0cok4GdsMHkyGcEa8PhzgTORExgAgEoCAk/xAmoQzsiUOB5hogETytWNH0QOqDw06vq88ZdQvrzkjd0ROM4xfXVy14rdnpLuTxvSB2GwCCXICPwEMRJYTOBnlORCoTezIdukoM46T0RkNgohIkjOVcNL/4QhzMIhEMsI1GfkNggQ7AQ6CQEQGKJkvRfQuB9hHHuch4HsIobSkx0Djy9/844oLRjdPHJ47KvttBd1/oCBwdllOoCBt5Z9X5I7OVbbeuXSn6THTcoPv5US1rTc8sumx638sjMRhceK+C3I8jmUwkXCmckdgkCA4I2wwoWKAKQCEcAYq4XAUtBOJ7QRkJwd/MiDTceXxQMaeIGdwJw8xmCEIzUIkf+RYNzWY3ZK/d171984bqrHEiLw8ELZJR0RtclLPTGZvvMl7zo5R1clWdHgo3qRUD6RQEAHJAIbkXEVOfADzwJol+T6ZOcUgJ7cD79JJcRTEjpIX3jcAf/JtCPdcd8eeJ9bHI+/e6K+VnvvVhZLk419/5OnvPx7uDFWeMblwQsm7ju8jQa27WxcN+2tm7u4hCt25cH3xmGYgHY6kJicXdmgE1mCCLEPTQJ6rIwwtdkQKM3hgwKvkoOcBtZSSipyTm0esNSfzgwfXks4XgqixK9bQER3IsRjIJFI2aw1ozTYIu5usmuYQEe3r7O8MWY7WGrNVa0+oM861HeGozQDq2sMHOqNO3hUlVcrDKvRA2LhOpnE4P0hm/zKzYn6Tv4EGkn8P520NTdQalOjv2jp6dOQTGjNg/iB5Mgxfev1F8+9v2dX+XnY5YubIk6/+lHRJbakzrjl38jnTlKXevdbsc22+9+kvXbiUDmtgafDdB/qENAYUyVS9AcXshKuf/fRvngcEaWjWIIKj1GknySAJQEAIYg04+YFq4I4RI55UBiEAPLKl9ZplOwdEmSBiAmsizYqZBBkAdcbU//78CYvVLa/ufrGmGSBoG5IuumvTp3+99NENjRO+9fjdLx24d23d7SvqMKh5JpMenGMlRZaTrkREWlk0kBYMgmABrZk/1BDEoybs2HM11GPQW513M6o2/vOBjaK65N0v5AiGJ9kC1fSa7yXfRBhi1/I9p8xs9+QdOJwg5V32yUlNdNaNyXITxMs2Nx03ufTZNxo2NnROK8vYdjD04JLdtp2YMrHkU5MLr/rL9kJDp2X4TplV9MA/a+ZMLz61ovBbd7x0ZlXZWfOGX/difX9tW9SD/zt/2u723kee355T4O3usIeXBucWZtlK//iZPYl9B9OGF/zvaRVBF1iACI+srHljdfuE6px4bo5JOt6Pqpw0R2v0kDy3eviTr267+pSxU0sCd96ybMY50+aNyNt4sPNvT2/PG1/s7utZOHPUnX/fYcVx3mmjqstyvvPQG7MrRu/c2OBx0S8vm9XcFfnxkzuC4fCM6SM+e1yJkGJA2f6QmHg0ZdZ7nhvU9IpH7JMdrztm0o9eCki59+X6r136Z8QGzbpXwpiOTw6SBgoGkVL4yxv7po7OXTgt/75ldYC88Dcvnjij9PufqyoMus/9xfLqMf5rLq+++W9rRFRThmvnod6gx6iuLN3Y0Bq26bUtDZOr89YdCte39hb6jX9sbjl96ogvnT7+wP6+B7cceGHFXiMe+sX/W9jcFr7+6S0QBpGxdHvnbx/Y8dPLqhaVFyRiGjAPtFpb6zsACBAAF7C7LXLtC3ue3dR03S8+vX510zPrm4pz0p7a3LZ4Ys65Cyof3NApPWbZyNxLbnkjzWWu39bSdKjlZ5fPevCprX3hyBduf+OiucN+8sXZ9/7plbr9fQPrvA/TLnL0QBZDXjA4906rjNevbhDGh36Gb4lAsuO2m+O+vOaBOcIH41x8onA4e5V3tobjtjpvSuGPzpzy8Cu1lhUvyEiLRO3CTB+EioN2NEUECb9mN2kp5WubOgEs39nSaxkvrT/Q0NRfPixX9Ybao1CABV1ZlD6uMGhCxXosEoi1R/wBU8TieelJM0F6pil7OzxusXtfyBuPApAUjsQ0QJo1gF09XSPSvT86ufwPF00dlx8kQ/ZFogKqqzsyPi8jL9375K1Pz6seFrWVHdMAAjGMyQz6TcqEHY2gSNh9PZbhFj3K9gT9gOD34G94NwPfmHWRikZ+8KlKz9EgdrgD6llncgh1jVpVN6VoQjG/SSMlSFMKKf7NH0O07Gret7KOGfmVhXlj8onoX28CUO3Lu1ff93r963uly8genuO4tfraIzld2044/u/J9AsqguuHR4ku+vO/rr9o4bjRecEP/MloDbZIyPte3lI0rGBmaZohkTBFUyTx2wun3b6iZsmejsrc9GsvqPzLhpbazv7X1jSet2jERcePfLmhbdm+7uNHpm9vDl2+aHhzgtu6+06ZPOyvOxpKfMGsbG9W0JPtd9eFrKJ09yWLy7f22o9vah1R7PnGKRVOhGhpujdYnPWbl2tK070hlzGmOL0hgpIs97iiABHCCXvL/u7hJWljcv0Bjxm1dLtCQbo0DOHNSfcbNDzXLwuy1h4IzRuTWVSQtr65v3Rkpkd6PAHdl54mTPGl0yrvWb3vhZ0dXz9vxtRhAVaKhKAPXhf9+VOb4U0D+KONmHkL7OcROQ0ECNRvW/T9f/507mVz7Lg9lIFW2Nq+dGu0J/yvb5Oy9aEN++M9MTCES5bNHfVvldt4OLF/ZT3bGsxkipN+uLh40jDW3N8ZjS75x2/+7+JkhocYC98mkO+o0BPffcTMfykKNWtmCUBqQCpNBCWE4ZgoAQFoQGilhaSW7vCnrn9j/pSi331mgiTtuA0dYyjRYDjOQLwRq0EjCrSGENA2hASzk61HIEgClGPCYO3UAXAq42gJgjCcWYJIgzUJE2DABiQ0WGsyaLA4VfJzIHksUPISmEFSawskhHOGHzAPByNmjrJ8cE4M1tHhtytwKaRYff/rda/UDKSP/CutctDeri1Vu3zPv/dP0ECsHAgajdsOlUwZwVrhkw6GU34Q0ESkhCYlmRjEWtusCSSgQAogFhK2Ksj0r7/mFMCCVgxJWjMRkR6wstqaIUnZbBCzkBKsBwJZGEpKCVY2QJJJC2ZmZbMkYrIEGaRtpQRJCA0QKQEom5wCiAqQpmJFLIQWSmhLa5dwsR1nMgWUDWGQBEErWwjSWkNrIoIQAEgpQcLxmQxWaPskWUcd6MbBl62dGd40z1tUc4JiJ6bUnxuQxjsKN610qLU/KRUtlVX271z/BDthh1tDJAiAStiZpdmD9TBjsSETAsfBfUeJJPyQVslEBHaCU0iTIKEJYE2ASZKhSYi9B3ryMj3pQT9L0loLQdBSQwl2LJwiFI3vrG2pqighkoIUk8sgx8nIikkSsZCkleN4ZDgkg4B0QgKShaWgWRpwFqiCJZGGEMJ2nCe2FF1d/Qda+6sriiAEa+0SJtiGMAVrFkJCEZlb69vKS7NdxCJZeU060wsTWCRLnxJ9eJaZo4yEatOgwWjj7vyMovTBrIihehEAw2vO/8aJafnvmLhAUmx8bN3u57ZrS02/eHb5SRVv2dVbXRFy1d2v7Hlpj7b1tPOqx8wrdxwk6fnBbV2BISTsh26GKPhEmWUECfBg2UKIpN/PMWRJAPc+u23VixuuufbC2eMLJUlAsZCSHb+ifOrVml/84YV8u++he76dFTQhpOM0JwiwFiJZoY1JCIDBQiLpnRhQVRmaCAwJQDqedQIxCzBIOsEBhqDXV+340e+Wzzl92o3fOCHd6wIzk0h6BSEsW199+/Lbn97U+9JVzJpAjt+SSILZmX8/TPodnSR8YnDy3d1gjD1vtB2zhtjJad+a+vpVtQRK9MV2L90x78pF7yTfSNC4Eyp2/WObVjx8ZpnL9x+teBd+Z/GJ3z/dEZ6Dzn1piO6oGwmJpGWmC3oFMPUTJQmTa6SkkXRIjNZA5fnvXTyr5MmVn7no+pFTxn7p9KnzjxtLBgshlq6su+e5jXtqO8YVj+iUVtyKkXQzc7K0tvOoBnZLyYizwajSgXIy0ETJCDg+cn2ZPBvNJImB9ii78/0vr9tfdcEdJ8wcceUF8zK9QoN7uiO3PrHqry9uDEb0t764AIBmlsTO4Q6XCR6sdPwJlYSJV8DdzpMNtReowAR9ZIyLMMTWpzc6uosw5K6l2xd880T1zms2rXRynPy7GFQnmoI1q4StEm9jGCypKvjrw18//+KbkrYZ63W4vnmMVnZ6d16bwxPhm0wWA/GT6X73mdUjttSlNbd1Xf3HF0J3LCdTuE3TS4bp4RHF/phq298R7+iJFeVmEmsMRosO1vFOMuCwyjFADKYhlpKhJDncUkIkhfSS17fFFNKDStj04tr9S1c/EFOJmBX1K2F6aHhRbm/YuuDkycwKrJ1qjIPJ8QOcBz5cYXg0+Qmt6wfvf82+bHf5nDeRhxkun3soc94nL43sOdRzaMvBWH/sbVURZamqT0968qVMmEMk9nuqXPqxYykxQ500c1jEigV93ozs9OF5gRHZ/oKAkZFmuJlsSylbZpvRH9z096S1TGuwhh5sNaPUYErVQK7GoCA+PLFqpbRiQGuGVgwNzdq2FJhAa2saV62qMV1mImInlJ3uQ0aACzPMstzsnKK0zDSfSTwuzczNTienv8VAVfyBThYEog9/bj1qSKi7oV8efFfXMN1TmM1HmmW0UpPPnOZJ94IhTDn5nKnvNTsJALD+r2se//pDz1391MOX37tvbb2Q4u0GGcyiiuZdEw+LhsSTKe4NnR8F0fCS4oRWpiHAWmudUFoxorEISQ1Iy0y4gllbt+z//s1/j0QtIQRIQCSN4KG46u8dnASZ395ZzgS2bd3a2S8EICSRJCGEYUqSO/a3nfrVP7tLcpltw8UQhmLF2lC2UErDAtP/Z+87w+wojrWruntmTj57NkftSrvKEUVAEkEgRDTZCWxfZ4wztvF1DhgcrgPO4AD2NSYZREaARBYoR5Sl1WZtDifPTIf6fpyVSMJXvsbGuv7m12if3Udn5vTbVV1v1fsK32fR0lgwII60jx75/G/h9S+TjqqVAPLIzvDkzksb3hF5fam8anrNwo+csuHOdSJozbxk7t+9f2O6N7X17o2MMR6xVdp/+sdPyI+fNvH0Ka/p9ta+rj/zpNWbSy6vP8yLyG+C8/7/D78jb5IAyxLBhJFKh7lQBogTMwZsHgRSgEa5ZAuM15X+5dE9a3Z0Tp9YP6m21LFZ35CbyqiWPfuTMvPE7z9fOADAqyfiX5H+iKfW77zuq7fOOndpedBKlEUCAejqH27rSq7cuLc66jDH8ZVEIyyOxjDGlCkkrIYh0LA0FTVlIccq1PfYm2opcbyD0IB+bBSECJnByZ252KRYwKjXnvcy/ekNt63N9KWB4K6r/3TJD94RrYr978YOC4fMrm3t2lWlk8sv+a93PnPjqpYXDuy8f9u4E8e/pl2OiMJl0c5dp2n1Iuc+AAC1g9oDYtL/R+Dh5EA7FrdR5YyypdSCgVLAOCOWR+31DFc0VCbT+aAdEuXuUCq74tldyxWihRYTVsBRAwNNDc4RqL1BTogA4AjWOjQ8tL0ll/el8pkCBgZCVkWoyASk9sAWzlA+7WgIxQKaEdfckCbtGmLGVSURUagXIAJw/Fc42P9rpKOUBPXk6H0AfnHrByYuGft6RsEKWk/f+ESoLLzk82ede8PFJfWlj3/vYf3Kfpq/dd0wNtDSRwRNCycC4oxLZglHpAfSffu6X//LdsjaOnJG3nvFG5O3/H/sHc5RgAgzeS830OfqVA60r6Vi5PupwaGO4faWT75r3rpbPt7b3kdGguK2CEZi4dIiuzTIEkGI2Zr57sL5Mw/Hpb/WNbZo7oR8ooj7XknALXdYPCLKI6zY4WgR93g+NfzuJVO33HJ1kFK9nV3eSDKjvbzysoyyyqPccH/vAAAAO9yV8S/gJfKvAUK1Fqj9cOYXWLUhUj+r5jXxjVt814rtmcHcks8sGzNvbMX4inO+foHv+nuf2X3UU9yxLh5EAOI2B6LSceWR6pjMyvxI/qj1G1ZW3Hnw1JffmXny73OwOf4PgkduCMiYqrL4tNnjUn19fZu29mza3Lt+c//+ngm10adu/eLECTPyeX3Bokn5/Ig06GkBfk7LvMeUr33fp7TSl582aTQXfZXZ9Ss8uok0GVvw8rIS15Oujx5zibyc9rViviKf+8m0u2xx01OrOx/901dC61i0AAAgAElEQVQ+d9k8mcv2bdnUt3VLasuO3v1tNaV8/vQxo9Ibh+0H8X+dSv2fSkflXaNJAYPnV55dd8rMI+dyLXWBQ+K22P7QtolLJ4USIS01AQnHWvSR0zffvm7sgiYraJEhZMg4O/aqKRmKVxQB4ODBvgJLESoJD+7ryyfzR8Mr1U4r++nt7/71vMdHpwrNPjD7gZ/wbwu/Ua2KwkgsA6XVLT/4RMjie1p7OfjEeFVlSSISWbWl+5H1Lbvae67+wBmrP/oDUeZojpJzIvCyeTsoLDQCyKPD876H5+sJCA4r1wACgOZUoN1tSVowYZTylAxbCaNSJCh1yL3i1LEVJaXXbdp5KK8//IFLr/3EO/e2doJ0jXEiYaeurqyzI+150rF4wRqVkL9pdfbjGITkgfrj4V5QtnJ1+YTLppAxqZ6Rjo3t+57cJbUOxgNOMJDpSSeqE17WC0QCgJhP5hiCm3NXff9REJgbztmOVTWtduq50yPHJidjtKmaVkPG9Db3Mc6IKF4ZayfIDmSOomFHUDGh7MWBSLa7LpzoAAKADKjn/x1BOOpGOGqIC4C9I7mDHanVuwe7uoZLy2MNJZFwxLYF7mgbbO1tQVc2lYX3tgzNqKOffO+jK+555sWOgZgVnzO2GEvL7l21mUccJxi+/rcrl//wA6NRFbCgZgMAQJqQIQEhR4Q9+zq7+3orKypdna2IF50/v3HbtgN7u/M1odjCt9V94oOXXXfTCzOqEpiVt/xlR6gkVlfsIDl5aQaS/Qcf2K9BLJ1bV1thT2ko5sgLfd+A5lUeJP92IPSXH1nuQwMV/Xj6+GggO5B59sZVQx3D865cUD9/HCDufXKX9OWW5RvX/3lt7ewxnLPWFw+GSoPBaLB2TsOE0ychQvNz+zYv39i24eDlP7/iWDR3yFBRXbEdD4wcHMwNZsNlkWRPCgASdcVH/Wvtq6ZTmm698+JPfOpno6y9fxs4n/p3CoGHvekJDABnCIC/uu+lkYw3vSFxzqy4nBobyObbDmWbu4a4RdFASDAjOHqI46ojdz+5d3xt/Oqr3/7NuKMF9zJy9fYDd7kKIjpYGt26fv9tK7dduXSmJmJaIx8VVSMDSEoj4wyzUl3zzdvKikptW3m+5SRTn3/3aa1L5tdWBPpGvANtuWu/+1hpdXkw6GgCsMD3Rg60sOG8KQny2qrwzFPr4yGRTue3bRm+98n2C5fWn1BfQkZJA2/hJN+/AAjVD4/cHuqNyIppADByaLi/ZeDMa85qPHWidCUiyow/86I5Y+bUb7p73e6HdwDDOe+a33TqxI6t7S0v7I9WRLWvZ146p2Rs2UNfWe6l3FBx+NhqM1jeWNazs3v3ypfmv/fk4ZZBbnEeOPpr0VJPv2DGmi+GPnGkZkQbwHQAq/v3oSIAwBhigJyx1r7ULx7cfe6sqiVzaw5HEgU+jEzJd3Rlnt/VO5z0o1FHaR+NsYKBxjE02O/9+K7tFZFIys2WhIIVpQqYxQ1ocO26+Fe//mcjvYtPnRkN21AYNiJjAIQQpKm9L/XRL/xu88hwPFamlBLGVia1rzP3nd+untBQlc1m85Iq66vCQSdgc9+AY6HRLKXdk6eGpjeWlxXFbKsw9wQnzoJkOvXrO/YfaBq6fMl48ZYShW91YUa3vFyS4bBu4xVFDUWFQ4cddxpPm1iwVVKezAyl/ax772fv8PPy3G9feP71Fw+1Dd57zR2DLf25ZK6wOLTU0apYsCg03Dl0jHk+46x+QSMT/MDzBwYO9MustCN2pPQNB3aVp6z6xbtfmvVyYube/G+XjBIQmpFs/k+P7/n0eU1L5o55amvbF37x7J7mbgCmOEYcZ3J90QXzG2IhNjQ0bAUsbgvGWDgQStQFplWXlIahJBIBwuqahJPPImdoLOZzpybx6e8/cvnHf3nz3S/2pvOcISATnK/edvCz1901/8of7x9wS0JVRAqAuTKvImGp/NLiolgQxiaiDXWRWMQOcq6RnABqQ12DqSUzShdOGVOeiHNGgOR6/o33rL3xzs1GW//5kWmeMsufO/DW8hRvNQjNaqDBwxQE3P3iCeWNxQDghG2V8l95eEv3pjbds2HpF85dcOXJRXXFscr4ie9f9LYbLmt+dl/y0MiRgV2jDFhQOaX62JtpSsaWWEHLHcptuH2NlioQDcarE2/4eZWuXDi7pfOV+8iNxz+/YICIjHqlXxyRJjJS+6DUq7rJiIABorj70eYL5lXXVZXc9fTOaDixeuv+63/7jKsMKu0r8hWLRu3TZ5YYFKmsb6HhhgAhiEHfZsTscBB7B7Kzp9azfDIrIcgciQ6iqK0qbXet79yycu709y5/ZA0izpj/wfde9ZMVL3VXFZcGYwEi1+EgeBB6Os5dOH1fa9IJoGGYdYBZToAYcM2BlKau4czipsTEuqiwhK+11ERobd7X/7OfrSwvCzyxrS2ThUtPHbuva2Ro2AUAMobIEJHRuiCHSqRpVMqRXvlmgLQxhrShNyOEvrUg1CBXjj4eh/0bLxClsUDEAYDShvLqmXWP3/CwE3W8jLv+trX5jPv2G6+IVsVkXg61Dw62DpAxgWjgsp+9W6C4/0t/0VJzi7etb62eUvM37WtVU2ujlXHpyrZ1bUaZ0kkVkdLIX+Gpggln9dZPm5cdBHyQa45nCBYiGxBA56C7csuh+59vXfdS71BSIoCFQhKS0TCqF2oK9cruVK5rKDtrYtXu1uSvf/fUMysfbNn6tIiUogLigAaQjCV4WdgaWxp1jTbATRAFRyBjGSIbkUghbNnU84MfXh3o6xrMZRwvIwmJZNBmATBjT5t2yXknAcB3vvdJX7qJoKM4GUKfAn5OyI6eCSee8JUPnv3Ui61Bh1ucC2Y5hIYjEw4xpqUJBVhVpW3ZNhpCQwiAZIzRrCTy8+//oHVvx+d+tDLo2AunlD2wpqNwNiloqDIGCAQM0AAiup7e15V8YHX7Iy92bm8dyroaEBHk/41IaEA/OnobgB/8/qQF75w52i/Gcc475nVs6dizatej33qQcVY9pVp5Uku98bY1j3zt/ke+dv+aW1cjY4FogNm8/oSxD3/zvs4tbS89sHnWJXP+pi54O2zXzakz2kDBocCY9k2tw51DwhF22OG2eE1mGy0N78+NZ5Y5XD+VoO88viudZBBg3fbep7b2b9rZ0z0iNzT3//mJA49t6ADGhGCvGG4oiOOzZzZ0T51UBMhvfmDzjl2rf/f7O8PlM2Y0FTkBVNogR2ZxXxnfQLEjfc/TgATMIDEBFjKDKIhVlInbHtkHnrPqnm+875Tp5eUJKbMGNRLFLLjnxmsAlCF625JZ137i8q6+fpsFXKWcgD+nMfrDr1/+xy+95yPff5wJXuTYjBgysACAMYNGMO4riiAEhXY9DzjjnCFDJdXYqqJQJObKxI0/u/7+F3YpV04ZV7q/NVn46gtnXiIGgMYY4Lx3yP3DigOPru3sGcrvaht+ZkfPk+s7UlkP0daFyurxDUL/8SO5qOytG6aKRE3RaOajTfmEypPev+jJ7z02/pSJJ1w+18u4AJAdzLRtbDW+RoZ7V+5iHMmQCIkZF59QM7X28eseaVoysXzi3zBua7TZeu+mg+sOMsGC5WHGWevzzY9/++EHPv+X31/6qzuu+sPmO9eme1OvLk5AtCH+wD1fAPtwKqK3HsesPREysae9u6XP37h55323Pbz/pZ2J4li01N58cOTPj+9DxIJ90hHRegBIZ+WEqiAA9Pd2F9XOthvOKi5LfOYdc4zhAc45J0YkXT/tqzBXBGQJ4AqBcc4YAjBCtERRIDK+MfLkuvaf/3nnx/5jyY+++rbksBekYNtI6qKLTywvimlTUFrU5585p9oyGnwj1fiK4jt+9NEkhL5705qEbdVWhJGBzyBAoC1ABA5IhogbGzRK8Dw0RiKCQMYtq6Y89unLpvVZNQ2zzlN+fjjvl4SdSIx39aaRIZApOFAAaMZ4c2fqxns3B4KiNGFZFqy4/+FH/rKi2zUr1+8DRM4YHPfpqH/DEY7+8een1iyer+XLZxJjaKh1IFQSGmwb9NLuqC+S4NziZEjnFTtsxGWUkXk5cmi4qDaR6Umr/P+QJ3BbZPrTe57Y+cB//uV3F/7ihV8/m25PAoHxNCAgx0A8wB2uPDXSMrzhv9fd9bE/PXH9w907u44QGxNPbbzt8YlwZKzKPAem+XjkGwrDfJ42GzanhnKZ7o5kebVo3t9cFLCED+OKwz3D/m2P78x58mV7FeQA4CoVFmEA+OpHzpnWNHbJyVNW3/IRREQwxJgB5mmfAIAUKDSoGQFjIDhDYsAMR1CCc84SwVBtVdj1pafMxVf9ujxRpLi2MsP11eWFPRIYALCqsnhpfSKVzxWFA2ue23Pvc1uMq4pLAiWJkGPbXAiOoBgQocWFxZjmDIDp0fxZ5T2joCCGT9qoD1644IefP7eyovaL7zu7LBEGIMcxSTcPwIgdaepm2/b33fn0niljqhjoAA9khkdymXxxpGj3hoNZN7yuuQ854qgw+XFKUegOoMNHKS0OtI+rXFJv1Gg1hQu+e9XOfU/vveSHl29/cMsT31uRGFMEAKHi8KxLZm+6d4NRZuGHTtVKc1ughseufyhYFDr3Wxc+8JV7u3cdqp5e+4YIFHzvUzu33rkx3Z8mRchZ6YQyN+l6KTc/lCtoJc68bE7l5GqZ8/v29hx4YX//nt6urZ09u7onLp2y4H0nA2IoHsiHSju2LahrWjeqNubfD8GZx2MqCoA7D/RiPNCyuSWWKPKyacY9RMgpnzTWlzpDvrnl8Z1T6iJTx40JBXFwJNPamU7l3IF0ponik6sjd//4MhuM0R6QVYiTKLUFgmROSzOU8xxua7QBlQOYZ4hCWIZIGS1QaO4zFnfklj3tmPLDYwOKjCHSvgIwDDkSEqLWmuc94MbwUGhMxXdufvK3X7xy7Y7u+liEadSIFmNoMU6GMSAEYVjQ4V7Oz+VEqEgHkSxCj/wgBrhhSul3nTXx0iUTbaGl9JUEo8z6A4NGm4qK4rDFWjsGd7YNdA2446tLMp72fOlYGLIZkA6VxJPesCfzu/b6CxrLgcHf3wL+1oFQvjyPN5yMbO8/f7LzMl3q5/3dK3ZOPmtyUV3JqZ9c+twvV7VtaPWyfsgWE86cMmnZNEA0UhNR394eL+OWT604/dPLZM5fcOXJ6/77hYt+8HY8+iAMbn9o6/o/vMCQ2RGnafH4eVee5Kbch768HACmnj+jZ3/P8P7+rfdsvPTGd9u1dvnEyhkXze4/0Pv8r58eaR/e8fC2sgkVTYsnKF/OvHTevY/N+MynDoNQ3QTwjeOkFjoKP4SC8gBLJbU04CKvqAge3Js5ad6kbNZHAOB60DVFQSZCRdsPpDfv3q5BcC4iITsRCTcPpmd6rjCWVEoiYwigJEdAQI9od0vPwR5XG7TLyibFGbg5qZjSIBBznAvpAxAaMByy6ZzyaCSbR+YYAi19ioRaOjoBFgBHQxqJdfePdLT32pVVRmnHEtI13GLpZM4vjdoCAcFShjgHwTghceRI4WAomIi1ZtWu3cl4LD23rqy6LKx9o0ABoVQMtOtK2+Z8b1d3UEQ8Tzy1qctVPZIIOZZHAmMr4gMZzyfFhMjmVUlJWSSasKxQNGaPZGVJUdiT0hHi76c33qJ0lDTo3x/Zjvt7G2VZ3Sul04baBkYODc15x4nKlzLvz3/PwnBx+LHvPrT9vi0y7xfO0NKVu57Y8eh1D4CFZ35+mZ/1iChRX5zuTR1VhY1bvH1z6/o/vmCkrl8w9oLrL1501enCsTbcsTY/nAuWhGZdNmfZF88LJILZvuwjX743O5RGxrTSpY3ll//sirr5DUi45pbnhSNIU/mE8peax7mpksNP1ANy/XES/UZLLIftBjHne76nSdGkiTVnn7tw+uypmbyvNWPoGKJ03s36sr4qOqG+uLEu1FAbjDosIqBvkA51ZshCpjWS1pKkJ42h9p7Ug6v3H+yX5ZWxpnGJ6pJo0FIKSAMaMkRGaDWqF8WQAHXODGTUopl1ST/v+lIRFIVDf77vqfaewdG5d8Q/3v1kF3GulCLIHOpfsnh8/1BGE5E0wBhD1IxpBDTaEIHWnKFFsrSY19UEJ9YXc7Sf3Nm5anunb0h55LlaS2XAZgwzyt/XnKWgCZKuLEmMr4lMrovNqIlEHXsw62vSHBky7huSnC68bMnCE6dGHMuTlJd6cNB9UwjGtwiEZh+Y3sPVSbh1+Udrp5W+Kky6CgQ6UWd04yZwosFl/3l+uj/54NeW71u1s29Pz/3X3t2+sWXxR0+PVxfJvD6yxjjnW+/dwO3XBnntqzU3Pw8aJp89/ZRPnhGvShDR3lU7m5/Z5+f8U64+I1gUCsaDZ/7nuU4sMHIo+eg3Hhxs6eO2MMZIT55w6RyjdX4gO6qJqHRw5rKWzqKX17Y8vgjD0cOMMjSY8lP5dENVaT6tS0pK0lnfk5JzAGYEB8YdX5rBpNuf1uk05IeVkUYxtC16dntXNp+3hK0lGkOOoNbO4cfWtZUnShtrI8Uhy9YgOACBIVAaXCm10aCIcQGccQDO0A5w3/MG+9UN11480tONDDhxaSXO/MjNO/a0Sk9//of3/va+1SWJUmMs1xuMlYR/8LFzVjx1MBoPI/cJTEF3zdEGDCmpfFVQJkXSZNkBh0NlVbixKtGd0o88t1MgIGNADJXmAvfs628dTNuCa8byOTk8ooZSfm9KpXypCBjjCAxIA+iRZD4QjHhSxWPxaEgMDWXS8s1hKd4iEOonAPpG7xVf11xWM/VVJU1hc5NT2+/fUpBbtkN2aUNp2/qDJ75/ccO8satveu7BL9879dyZZ3x2WXYwU1RVBACMM610qjuZHc7OunSe9tWrS5rYuq7ZS7vh0vC0C2cywQChbX3Lsz99ChHnvWdBzaw6owwRlY+vWPzJJXbITvek7v30nU//5LHBA/1DrQMbbl/LOI9UH54hJnCqytpa57y8F5pHwRw6Luoxo9sGMiIQDDRBb68bsC2tyZdgNCEzgBoMkUEDxJAhZwCaIRgE4AwZty0n6QUeee7goZG0L12tvFRWPbVzsGlcJFpEkUhYGRpx/d6hbN4jX/K056V8N+9ppQ0phca4pCTDuGMVhUOGsfMWTQ2VxEBJQNIBS+3f8pXv3vzcmp2P33pz0A7ZIZRauQo+cuHCjK+UY4WKAgFukQEFoBFcpXyNw56bzOdd6bnKjKRl32Am58swt2JxNqEykvSsjc29jLTnZXOkVm9teX5H2omHHIUcgIFhHAVyDcgQLFbweCNEg0BEjLTRStq2nXZ1/0AmHHDelG/kLToT+g8dCYO3/+Gqunm1r6yLAkDJ2LIJp09cffOzbRtaKiZXIcO+5r7koeGDa/ZXjK9a8sVljPPWNc2PXrfLHXLjdcUb71xnlBlsHmjf1DLh9MlGaXzdkKGb9YkoVBwpaywnTXtW7lx76wvCEVWzamZeOvcIaI0yjSePD0acTXds6Nresf/JfftW7i2cJ0VQLProafLwGHHJmNjy299x9vl3jzZzUw70C8Au/1fPR4944h42vgw5lE/qIZEJRoJBR3BmcxDIDDKGqBELPu8MkBEAYwyQBKDFGUuYVDaw4sWu6hIessxQCqJFTiQcJykHB3OZjJtTSko0BnxtPFcC0f6O7jF1lUGbNKFAgQYGTP6UuWO6k33v+tjtvDyBnGuQ45m+cfn3Zk1uAoCtO5743s/v+u39m+PVZcjtb/7p0U1btt3w5ffceNsOCHDgnCMYTdwSzQd648WO7QR8AUYzqXQur5VU0tNOQBhuxoxJ7O8aSiXzlmD9ST2cw1gxCbQdxj0gYRgiSiRGANqQYERoAMgwQIsIjDZ5rbIZN+dTPp+tLQvTYR/i4w2Eph/Mk6MBxILlq2KLf3DCawIXt/jJHz1twulTdqzY1t/ci4zFKqJ9e7ovvOHyQHzUIL56ao105UNfvzdRGx9q7ZeedsL2ud+6qGpy9Rtk6gQAyUPDz/5i1cihkd6XuklTdEx86bXnvmYsWHmyfFLV2d+4oHVN847Htw81Dxqpq2fXzn37iSVjS48Y1ISLQ62Z2FDLicV1a8EAgAT1GFgX/8upub4RFkdDIp0yv/GOh7aGi+oppY1jnKC2LIcBMmE4MsaIIZIhZGQIOSIaA5wJADTIHO6R6hghRjwQpDJue75USqmcn0fyFTBllK+U70tthNKDwxkRGBg/tlK5GsgIZEO9uQXnlV377V8Faovy5AatEt3e/aUffWDW5CZtPA4OovrKp96+bff+jf2cgSgvja19qWfrwa6SgJ3Nq0CUa+IMAYzZ09xxUmKicj1poyeNzREEJyBypaVNwOFM6WAg0JnME5FCwBA6xAWCYloYphlqUoyEAUMcQWtjEAGVImNIa9+TxvOk5/k9/em5k+rfrK/irVgu7vdfljbcNDc2+ZSjMi2IWD65cunM2kK3Rj6ZH+lJrr99zemfPFMrDQBWwGp5sTkciyx43yIrYBU2d6P0UbtGCahuZv3m4AYv5e56aAcgcJvXzh+z9AvnErxWbYsLfmhnZ9WUmsZTJkw4YwrjWIiQylevHMI22sx62+Qb//vib1+3FnIF+D4BlAEsOk4YitEiTWXMnjW9cfvu3pqqaAitCLMtQw5jqBkjQgnIgHMuNBBSHpTFEDX5DBAFE2QZSyMI1BYwH5TKSCmh0FlpNLmuHsnLrKt9P6eM0+tnnRHhgJDcoAaf3IyLHgATIKUUlsVAcsovmz8NwDCwDWgGDABnzZ739J2rSssqXOl6lHI49SlVJLSl0LcxZFg6L3u8fDLrRUM8m/UsxhmzQ2gzm/lacp/7LiMuGGjHEr4yNuOCWwa0D6ANQ2UMGUNAqAHAKCRDShEhoDG+kcrXGaUp6fdkZc9A7p1n1sNot9/fy1K8FWdC/dsjq+ClPRXVi2ZpdXQBXzKkXCldqTy19S8b579rQcua5qGOQSaYsEXPnkMv/OaZyedMRYZy9NfkG/ZtE8Qq40v/85zKqVXhqkj9goYzv3jOGdecTa8jWxFxpGt4w+1rhSOMMjLvexnPy3jSla/VQTVUO71qw4EEDVUeHkruBLXhuKPsAeCad01XDh7sSvb2p4dGvJznZVyZzvvDeTeZzaXS+WTSHU76I6lcJuunszrraj+nfOkPjLgHDg4ODA1zwQ2ynKuzOZNzdc6VGc+M5PRQ1k8mc5lc3vMp78qe/hGjuQHDtJGA3f3+nIllkxvibrQko7VFQiEy4pIMECLREW3e/nTWF8iBDNrAeHE88Z5lE9qH/LzncqMNGQMm7Xvtfb3SWMqHoeHMYDKfysl0Xrp5cH2TdpWb97Rm3BAwe/eBrkN9Q7m8yuWU56l83s/mvFTKT464I8PeSCozknVTuVw67abzKpuHVE4NDaRbRzLbDvZc/fYZJcVhY5QhOg55Qv9hgFGfFqWs9Xsujk4IHIvUDhnadPeGqUunPvy1+xZddTpn7LlfPFk5rarplEkF0uJ/xr7SZU0V53zzoiNz4UcPDwx3PLr9GIcwSJuaBTPuf2LRxRfdMzqM734DrKXHGWGvVDRs/9dVJ1/xhbuyQ8WpCrc4HbQDQQRj2ZZFBjkiMxoZGmQAFmOOZYkgCymrNBJpPngwEq02xBFIS6M1+dogci/vZz2ZzuVlXhFyQLt7sC/p5YIhBwBJe8pDB9kXPrhg0fuu298xFCkvtYxgRg4Fog+t2n7J0pnADBFnzLgK2vd3lRfFAbTNhC6qPOvyb65d/rV3nt348DNt5Q4LQEBYLBIIHGzvHltTw4jAQpP2SbNwiNlWwBKIXFrMsgUB4/m85wghXRJxkcnmXdf3feMrI41BxhlqIGIArgGpGSgtjZ8e9oezyX0tyQ9cOP68ReNBKVOos/7dKPyng1DfNsoXI2TTZR04dW5R8JhCNmcd69qaTp1Un3af/vHjRpr6k8adevUZ0vX/Nzv/G1/D7UOtqw+EKo7JA1RLPeWCWTtuL7lYc8BCPF8Dugt4zfGEQsGJzIQxxffd9N7rbnp+48auNovHYiIRDTNLODbjjCGQGR1jYtqAZdHY+kokfee9fzpt0Un1NeVSuppQacrnfV8q1zd5X2pfGUMSiXzJuNi2vyXmWA1jyjwjfUnDWb+yJGjQe2lta/WMcZ4WytaZ5Egw3fPcypXnnTbVEQYRgfiO3fv379jc7Qfr6scxIyPCYGX5j+7c9P1PnXP7fbtLQ4FkWCcCwYmVJat37W47NDC2qlIqnzgmc27eR8vOOU4wIEQgIDVwJuxQCBvHVP3+jnvnT5naML6xbyQzOJIkADQWB0AuGXIwzPW0p3NZVw8nvVzGryoO3vCZxW8/YyqBIQaCsTejLvNPBqHpA71t9N6C+x/9cGxsAtkxqV3xgLCC1ta7Niz90jnTLz6BDMWripDjmytY50ScF373TG4oVztvjDk2DS7S1AkX9w/cV1Z2mHTxfwLBHx5HsRABCBiQqU2Eb/rPsw90Dt5y34blT7fu39drWyIQC0UCAcZQKZ3N6bybLSt1KioqNu5YG2TuksWLm5rqpZScoVJKawOAWQ/dvAcSpCYllQAGlrNi/dqhXGrZifNK46HB4ZFshg71pj56ydRv3/RQsKqchOAG5VBybon10998vygasgUQCWOQcW/GpIZVD964Zd2W86/9Q8OUGRalrVj06Rf3hr588Ziq6KFMppRbUeacPGvirp7uF1/a5gSdukTcz+XBtnM+2gaML50ooQkQKdTgABLnV779ohWPrn56x6FIIBwrCu/f30cMAwEWdkKIzJcqlUnpnC84n9gY+/rHzlg4rTIeDRBpBEZMQGHA+XgD4SYwe0aDt4BbHxl30U/GHVPiRxAsCiLDVHdy8x0bTvnUGaP1zDcVgdziT//4sZ6XupGjHbKPsTEXGUJN41AyXFZ25DEfBLoe0DlOQMDVhbsAACAASURBVEgEo4JpBX+j8XUl3/3Usu9+Ctfv6tnT1rtjx0BrzwigKI7hhMaKaRPKTxhfWlYU/cavntrZpg72pCQfrE0I22KEljKQyuaVQYMiYzxtmC2cpOs+u/nF7Eh2SmPDrAn1g6lMNqd3dw+9bf7YA12dt976dLhxHJN55E6a/Bv/67P1VcU46hSDjBlNwhKsPBE/a9lpV69peWRrlxe0HZunM6mT3/Oj52761JXfXCnIcng6GAq+bfbsO9c+v2rdiydOndVQV0NEikj7aIdZWhJ5xMEOMO37esjLtLT3xauaJhf1X/fpMybUlGzY2XGgS27d1dHTN5jPYzwebBzbOLOpZt6U8tJECADAEBkFKAAJwRSmQY63SOj9YRSBHFavuLxyZh0T/BhPX7HyGOOMDDWv3m9HAyd/aPExhtBjrVAJtm35pn1P7eMW97Ne48KJr1HC/ytXeVP8pj9/5yffu+KwFGIX6PUgFh9HkfAVHCIjo4AAGZs/pXL+lEo45+hJ/beuXgIAu5uH//uRbY+vORQOhABRa/SV2t/WHCSXa1cpL+15A66sKa6aM2PGnLHVqXRaSugdyk+vSXzoHdOnX/JNPqbBUp7GQJAF66IJy7IByBCSAcY0AePIkDQBArDxjQ1yc1cEbS1VvKyot6/3tkdWf/Ujc7/9yxcCoSJNIhoLXDjnpLV7dq/Zvmb1Jq8q4AQt2wSCWW0XJyrqKqqAPBKU92SRY1+0eNJFS5tsMdp3Pm/qmHlT4V1nNR7tcfUriqAagNOb5x3zTwShGQR998v04MqyeVedqDx5bHs1VU6pYZxpqYUt9j+5O3Vo5MwvniMC4k0Jhk7UefrHj+9/al9hX7NiTnFDybEjvLSh+MWukHtoWqBkBxgAyIF6EMSi49M7DZGJVxv0FWISHk4NiMCQNigsAJzcmFh22viDfZnk4MhIVtlCCIETa2sc28lm8xwwEnbCsWg0GghZAak8VHY6NzKQ8n967Wkf/vItqUw+mAgiMJu4R5mOlvb+3qHa4gghcM4AGYIhImACAQzRhmdXaykFRA0CuioUr/jST+8dXLtw0dyx2/cdolLL4hAM2WfMnZ2aPCWTyaQyWddVTigERDlP9Q4NaI/ZjhcIlSyYXX3WojpbWEAESEYb5BzIAGlkNoABYEdyrVe6x8DfT0q8ZSD0fn3kgx9qHj8oTh9j8WNXgrFDdt1JDQdW7mWCkaHuHV3LP3/XGZ9bVjympCAZetSKw/9MWCOkDo088s2ne3d0c8EBgQyNPXHc36QHS9pMv2jGr2678Jov7AC3UPldAXA9gA3H6XUEgYdzVSINyLEwM0KMCTaS9jbt7X5m04AycMHCRhBWR9+INCrILF9z1/cMAQNmNGmtSCMnJMbTMtmXzp41r2lva+8dy5+snD4bwGi0XD8nenqWLZxWXZ0ABoUJJgQC4Ed8DBnQqReduvMXDzT35yorytBIlCIaiZz9wV/e/qOPffhbHSHPLQs7xLk2FA0HErGgZddobQCkY6MI2GgsT/tlsUhFRDf3+9/640vjqkMXLGqsKXYszsgU2BDrMALfdLi9tSAkF9RPjvzrQHNZybw5f5OxmfLV7Evm7n1iN+O8bvaYlhcO5PoyD39l+bhF46ecM716Wo105ZFxxMIyUoUuHASVl6Ojc684yFlBe6h1YPfKnc1P780n84xhvLYo3ZsmbcYuHP83pfpGm3EL6p+8v+KabBx4EgDA7AT/GbDPguP2GjXPHfUAJURecJMHBEl67fZD2w6mxtVEP3zh+FhE7O5KdnV7VWXxQiMOSi0p4Cvjun4u7+VyBgDISI/Qz/BUn7ngEw3vuvq6+PjxAWEATd9A/9SywHVf/viieZPAkDSuhc6rVn+hCmnwAxeccuGpJ/z69qd+/PsnSxobBINARemWDds27T0wdXz53oOHApYVEcSQmGCWYBGHBYOObcdsgRwRmfEpGLIgEI9cPiNS7NjN/ZmVG5qDdvjUGUV1FaWGNIDBghP3qJbHP/z6Z5H1ajVA9sjOsmrDf8RqYn/bmjAUrYxPPnMKd/jp15w1+ZzpRAQGDj63/9Gv3n/XJ//cuamNMYZ8dDIaEXY8up0xJizxwq3P2UF79OcMuS0yPalHvrb8vs/dveuh7V7GA4DE+LLzr7/EClpFYxI1M/5mHVHSVD533hPPzj08JwTgf/X4hd9rCzcAAAYJCCDv6zsf39sx4F52Wv1588cEgnZXRoetcF1FaFyVqK0IlEUZEZEBJbXWgMSZQGKomUjns1296cYavqO1o7ffi0WikkxPjk+08nf/4jML504kMsAMBwvYYSKrIDd82KFbab84GvnqVRd+/ysXy7ZmY5GQYI2b/Pub7/uPt03o7fFH0jnX18SQLALURCQVkFKgpCWoujoyrsqpL7er46GsgV7Pmz2u+IPnTKutEA+uPbR5TxdDjkfOeq8QWDtKqfD4i4T6LgCv8FZz6bJ1PRPPrS0iQ0AFjbljeiSjzOx3zR9o70eGi68+PTG2ZNeD29J9aSIaOTj46NcfsBOBminVY+aPi5bFXnp4a+fmdsYYchzc23/HVX+ceeFsJ+K0b2zt2NKW7k4LRzDGjDGBeHDiGZPmXnGSFbQAYc4VC6yQ9aqg+ldJtsLAGwE0nTlj58rKpaczxELOtgFML7CK4zAVxdckYQhkNDHO+ocz9z2zP1EWP2tOZVEw1DGcGU5nDAXSvq+lj9rhnFJ5rZSWwKU2vtRSa63I1+R7vpvjvYOD37vmoj/feZ+MJgIMIB9IdO+59f4byhKxwyknME5GE4LUaBV86xmAAc0Mcm4jEhF9+KLTn1i749m1nRXV1TGWW9cyBEwlqkRu0M1aAuwAc1HYlpKaMz9vWYwEuDrvmQhjeeKe70ZSlgnDjq7cxIrgaTMaYpHeNVu7U66/eEYtZ9wQkSFWaFl8XU46emR+k6zt/ykgpDzojiOht6ft5CI1sOKG54MJq3R8afnYRPXkcqOJtDHa/PUcNVQUPu0TSxHRaDP9/FljZtd3bm7fev+mTFeKO4Jc3b6xvW19GxExzo60ZTPB0l2p537+FBAhY8jRCljKUzzGZ543p+nUCfHqIqONn5NLvrCsakrNa7rJXw88LjhyxjjLj7jde3t7DgymOzMhS84tWaDUcss67CejdoFdcZzGw9FEtHBDwDjrHUjes6aroiS6eGZFUTAwnPF6+l1b2K70SPlgmGEmk/GzWUNMaF8rqbRSnlS+NkoZozGdHhlbVz6xPvKbVTvjxeVcQ19X1++/f1VTVbHWkgOHI2seDaCl838mf5UVuxWQQIFmxPHlbeLO71419dzv5H3X4oEsgxWPrf3a+xd94FtPzC4LB6Qiy1JKSgGoIaCE5oBkUkOZYHmUGR+A5SVZeSvPdHNvclJd8ayGhNLmpT2HUml2wcl1xArBmAoGNXi0ferNsrb/50RCMxoGAUDDuKkP3PXTB4BBunfa088tfe7R+vt/KkQ0WjpxTPWshopJVYXz8VFPZUQUrx5tj9a+ipRGJ501deq5M9o3tb708Jb+PX2o6agtaciQMw6jwwMUrYvPvGDW2IXjmWBAQIfFDsubKt4QgaMWKKA82byhpXdXZ6atLRYwc6dkPnrK+gkzHkXLfbVILLwsLn7cXocxQUrTnS90xIN8TlNpRdQBwL0dw8S4UcbXxmjSGjSZ/iEfEfK+8T1f+trXyhifNDNA2jf9WffKpU1bWrr8/hG7sspoNmdm7bkLpwERZxxAIVhEBoEZFDLzNePfBBhSw9MD8Y3IbGQaYbSVFElx5L+4/v1XXHNLRW04Hg7dsWrzx64814mC7ynjCBBaSe47LkmbGy445zbmXdmfdMviDvk+swMZiQL9Xlcl0m5FNDi7sWJo2NvfmdnW0j+rqZQYf5k+xX9gheafAkJ0gFWDeTUqDURLd7ztHTve9m4AATBYvHnrgh0H4h3bKKvnJvlkUz5OhJ1wWahkTJETsow2Rh9d2UorXTenfuxJjcpXPTsPDbT255I5dyCXH8mrwpgiQag4bIXtYCJYOrasYmJVpDSipdZSv1FuzzhDzshQqi8z3JXKj0g20u9kWovg8aDlnTVOzX5PZ93sNWAANEBBuvr1IZyffFwj8BXDcmz56j1GU2OFM7a6CMB0DLlp141FwoYUGQIChTAwmCMQ2niFURZFZBgQMAQyBl3lK49dfOaMt3326+GKIsty0in1oQ+caluCSBqDDC0CZMiNHlD5G5j3exRFjGtfZrzUfCv8c2GfMlqkISJkQDinqayptjgpJURia9atcZFPqawYSqfjwYBtIbOY0sQYJ0G+r2zGubCzWW1buiggjFQYchgYodm+zlTF5IBgbEZjyUg698iG7nGVxbEIJ4JRPeB/ZIXmnxMJBTjXg1oBMPzaw+2Rxk9naPaJK2afBIAgsytGUuFUBpJD017csuzZ+8aPeMEx86omLB4XToS0VK+n0Y0yvvIBoGJyVeWU6kKqIPN+YfaPAOygXehxK+j8+bmjd5wWyjakTevGjpb1nZnO5JQx2aVznm+a9Ug0IqNhGS/pGy20miON6EcPm2DfAGL88Q1Co4ExRGzvGdnflh5bXdQ4pqzwdId6R5Ax7YNBxYlcolRGSp8TSalRSSXz0iNJBgQxSYp87UoVDWnPvaNlhxuorgz4FhPenOmTAADBYhzQAJism/sZqnvIdJAId/fKx+9v/MDHW5TXT9n35t2TnMDnwJqLOGplloiFT5o1+cm1uz0WLC9t/N7vbjx/YeSX95X6Ksd1iBhHzQ1TOU86FBIMiDNLQybtBaxQgClUvrQEgUomc0MZtzgcrEqES4rDPWn90OqWK86eUCBJ8B9s5vvPKsywBogOgftLUL8A6AZSAN4rnQ9emchZTqqsLFVWBjCue/aClZ/gAD5f/pdPPnRj+UA2XjF3ZuPp05nFhCPwdeqrZOhIMsotfsTwiohI0RsWVwClp4w2wwf7Wp/dku86OGeS/8PLn2ia+9xro5z+K3VmC8AG5MDOAfvLIKYd56moORwGcfvBnopEoiTIE+EgKOUhy2U8K2RxAaS5r3TeM35OG2aM5lLllCRXa+QcjSYDRCilVhJm1u1+qfmxEH+HFVYyYEIYLIutk57FjJRqs+896OA2YAlFKusH920t+8yPv1R7YkPblz73sWu7Y4FckK2X2WUIQcPPYdb5xMo4z9fVZvs1JoK+X1z+wMrtZ17T5qqPK9fGCBIYTmg0aeTKaKV4ABmR1lrnsnk7HtLGcA1CMIux/rQujgAijCuL9g+47QNqKOUWR53RLgX8B3KG/9y2tcDHAT4Oph9MO5jdQLtANwP1gTkA1HmUB6TDmR7oS9594yXvBT1c+eL6qXvWWR3DF+7Lz442xMfNrYkUh14zbnuMF7c4Mta2pXOwNRMYaBkbeWRBfcvH3j/QMG0jEICE0VHdN4p1AMCmA6sHVgNsKuB4YOOBjQVkcNxfdKQ9RpHpS3LL0uGII5gGJrK+9ImFCQlHLVQ8VxpFAMooIX30pZaomLLIgCZDymgyyawfb3BXbpgkwzoEISElEnnu5ZbkRK5AFQvaORndenD8pu1j73x66vTpiz9x67SwRdue+d1/XN88q+rZuQsOnjZjW3W8X+t7/fxdmogspvLnMbNIGICAzA1PCId3B9mwAUt7AjkxYxEazZkvfYsz6SoW4IA855pQUHFEZRmmSQjMei5AyEiKRRxEExbYM5QrjjmHCzB4/EfCV8WMMmBlAHMAAEACSQAPTCeozaA3g/4jUPIoj+wD+MCdnsWn9Cw+Fbz88znXbNv4nl/euCQViJ90xdyS+uKCj9oxfQTOyNCOx3c1r9q3ZPqhz77zh/FYMhzOMa4AAPJ/FXtsKfDFIE4AsQDAAXAA7eOzQ+2v8xRoiBAxl5NGG8ZMNBrgnAMxIIUMgCEAai01oe8TcDCKlCZjSButCVFpMIYIfa21IuMmO+Qlm55+DIoYMe2C3edGfv3Qe6697B7OotsOnfC7e6a2NVcN58IjHp26sPqctzdkGKSlmbWwqmG8feN325/cM+Nmfma0duji+W1vP2NzkHfs7p1011MnJ2IEkjs25iH1uyc+Lw1JUtKQNGAjkWZAhizU2khDliFDRnDMuV7ADo3avzBmlAHgyJXjWMLGgKOGMnLUqmO0DEr/JyLhUS4L0AIIAU8Anw7wPoCfghkCtQb0Y2CeAMoCjbxM9B9OXB0n6zhw2rLfnHbRb/a8cM6v7pyzR09uumhJpCzsRJw3ioqF0mh6INe3rTW9aeVpM3t+e+9PCvA+oq342iQTEwBhYLOALQOxGMR0+Pe6UGkySjOHAnZB2hcYGc4BOANtGNM5D5QmDai1UEoprRUoAYzAIIDUqJTxPF/zmN/TnXSClgDLMEOsJJz7/X0zbrvvFI1gGyWK0LGVFc57g3tnL168ftvgHR+7jlnuwo++6/IPnFjfFOlu7ZHhku6uhh/e0fCt353ucxGVuWBxhumstritYViokUygMtA75JYEHaUkepwJ5BzBEBitlFbKIBoUgFIBAYBWIDghE5wDGELgjFlCcNT+KFf8f6Zt7W8LlcVgnwdwHgCAOQT6ANA6UJtBPwnU/6p3ogDSMOmEFT+bu6LrwIQ1G//y4KMfgjF18y6brrzXqlHYIbvzpUO7Hz8wJ/7sOxc+tviduyEycvTiCgHw04HPAj4H2CxgDYBh+He7Dgs3IABDhlwzxoxRHCzBbDCARIYIUGipAchooxVpo7UvCQwHrhE1AhlQ2mQ9nc/6l77zpjU/OscqBgIbQGpjlxd7ACOMF0QtNOQpncvXVNfWjB/7y/d/5v03fXxcU+VXlnx84TvmLVo05aYXt5UFA7bIWnE7HmegfUNKGfARuWZAgoeLY94dY2eU3v3sosoQN8o2hMhNIWr7Rgc0KWMszciQMdoYRcYpVFstNprnMNIWMs64gIIz4RGuDP+dQPgqQFYDqwY4BWwNYEBtAO+PYH7zao4CQEPNmH2Xjdl/4fkr73/4Q7/8xAmnfvbsotpiMubIinrhltVO+75brv11cdWm0ffqvf7/Ownsq8E+BzAOwN56E9W3NCEtFL0Y58iJcWZIM+QEaAtuW8xIA6iNYVp6jAoaSUSafGMIgLQGQt+QlFIr3/UhnfPi8WEPWIAASTJmK+ZKFeSYNsANafKExU1yZOSUZUsRfCcY3L2pTWstRBCEGDN1os0dlK7HBPOlYMzXIJgCIoe4AmBAAW7Fwlhc0sty0jOOLaVtLEXAUDNCg2CkAi3AQlAEgmlDZIzRXPsqEnRIEzAGSAZAkgZuFYBH/+BoeBwtMg5ggTgZwjdDlCDwPIjLACe9Zve27Ozl7/7pE7/63uB9v9r92EvIkHE20pNe+5Pl72z62R9u+lBJ7abXdQEUA5sL1n9BuAeiL4JzJWAJgPi3RuArDwwCbYsBMl8WXJnI4hAMCaUByWgNvlbaoAHQRFJpBFYoJpImMtpTWvk6m9eVsVw+H8hpAQaBWcb4aAJAyhjmK2KKWwDaIAc2c8H0kZR6548/9dK9T9x1za+v+Ok1AeUHA2LszKahEZ8MAvKc0Yh+jphUqA0xJGAWYzSUik2o6/YM5n3pG1LaQMHS0xAAeFppbaQmSSQNZj0NREQGEYqiXBMxAGn+X3vfGSBZcZ17TtVNnbunJ/TkHDbnDCw5iCQQGLCkh5WwLOsp2bKVbdmyZNmSeZKVEVZEgBAGkUGEhUXsLpvzbJidHHu6p3PfVHXej55dlmWXZKFlrTm/7kzXvbduVX11Qp0ACOSg4tHeSpPomcQJT7k0zgL1LJATIF4A535wf/bSUJmghbv/85+/et99o9/7+nXtZzWquzZ942NfaGwfnI4zOiZzYiNofwXKlcA6AJUZvJ1gHkUkBPTqiq5ICUquYElgKCUiVUaCieS44lUcYRNJiUxIdIVwpZQM2FEnCBIkiWxB2Vxu1ar2RKHLRJNLr2CSIweUEghIApELAII7ZINBNTHvoYTb1eFvv/CsTHxy/qKKkRzqXNQ3xbr39rqOQYwAUQBjUhKiZIhEkqREe3ACZrX9Rdq0XIs7HpOERgpDAmDAOSPkriAVpCBSkLtCEgPpCq9HC+i6kATkOo4ryRWWqAooR1cKIf3BnNTOaE540u5XgvpO8P4UfH3AbnhpTyFA5l57w21fv/GuqYcf+de/+3hjw+BxwicCcDB+DYE+0P8e+OwZBJ7KFFyKKC8PGpakYtG1bckYuIKqggZnwhXg2ugQk6VyL1RydyDkCAACSRAJW9iCsoXCkq7mRPI9mhSSE6AjWckHGgHZdMgsgTSptaOZhOAIKCUBVzhKQahQ0XHmnDVXOBIYEiJIVlI12NFbAVBlbCJV5vHeZLvjAkBKbgnXnQ6Kx9IpcqkmPQOGJG2HwBGmZVWXBxmiwhgBTOVsF7ljm2Vh33Se8rd6Ff8vWS68EXx3gbEB+AUAR0syubhkzU/u+vWnvP7UcU0rQfsm+B3Qrp9B2avrhDRdwok6GisSmULWcpI5C1AhAIZUEQlYlus4LickQldIISUAcESOSIgukXDJka4kSa7T3uhLF/I6swU4jFQUJMVRtzgCACQEG9z66tr+/UN2/8jhffH4/r74gXjfjlGzd2xs32goa5OHS5JEBDgdfENEkmwCJgmApOMIx3F8ui6kY1mWK6QgdIUABMY440hAUoAERgQkqSi4yqgqbBQdh4gIWf9ENpe166r9fq82fUIBQPi/7JzwLZRRl4L6OFg/A/sD0xUwXYDj61jjBeC9HVjjDMReG4MAOF0Lmeoq/VWalrfgUG+qKqIyYJbtxiK+vvGsJRwN0SFCQkAEJBIopSTkUpIjpC0cISQJNxTxWlkLeamsBQfmSiFJImcSEIEY56D6jcPP9vz+tgcYU4DQ8ISQq7d/+nZiJKRTGawPdPo5AiIhAXEGREKSBFQICEFKlK6URAHN67gghRAOkCDUeEn3o6O+TxIEIgeSeUvWRzQOIAQwjfeMpbIFM5V1Ll7ZDKXq9fiHqAP6JwTCkv1Gfz+wLjDXvILrvwN8D/2vO1V/60RRON40v3ZF02+fP2Jw98CA2tVQLh2bc65yJeNKzkCiAEJBJEFyZAIVRwhXCNeRrpQoCV1BgqQpgYQktxQnI0gQSeAciTNkSCQyuVmXd13+uXfKgiMMfPDTvy6Yzru+90mvqphCVge1f//nH3mCAUkAICVJEtISrsZ1UJh0JUhpgUVSmOQ4UkiGjnAcoTiSMeClyBwEImQgmFAEB9WxCuFQpWU7XkPNmda+IyN5S2so98WCHpLHxTD9gUIH/0RAWGKJq0H+DKybj0PgPPDeMYPAN2efQaK6Ck97rW+y6PQOZyMBb8RvmLZdVcYnE0IobNoygoSIEoikBIml2g6SSAIgAUMh0bJdxwPAuCAhCSxbuLaUDBUVdYMjEzIQDs1t8o0XqTEIe85qzcTjq2YH447GgCo1mS9aPr/PBUdI4bgOoiBSvQoj4oyh61q6BKKilExIKaXuCOlKIaSUkpVSKEogd7q4HWOEXEF/KccG4s6D48R8ViF78ZpmgJJWywGBSL6leS7+91rh9XdDYBwCoxAYhcAI+NafMXVa3jbiaEkznK4aIGnV/AYn60iu7esbt6XDQEb9HlVBYUsJTBwV96jkQ+o60iUq5SBBJO6xnTjx9QxVl4ADcCaK0i1kUoV02sylsna+4LqOcDPxbMbBhIV5B2xLSKKszaZMyjqYsBVhF00HiqaTNTP5fCKfSVlWriCBc0IAyUDhGZJbHccwVIVQcgIpUEohXSgdZUoAFMIVQIgF066riCA4AUM5NJjIWzQ5VZhdH6kI+wAEMgaspA8ywBkQvjm5FCsBY4AxwGrA0Ayu3jw7lCAQAwZeuLJ+cmrckerGnWMOOkCivTGYN4VwbbCFkACkuNK2JR4NGiMCQlRADwwMbwr7B2ypMaZIZMIie3y0QuY9mlNIDudSI/l00pS58f4hhTMNGAFIVmJbEghUJnOZom7ZBYjnUiMyPghFs1yXWmq4kCm4AkCiQpKjIayfg6ugYAwdKVGSQIESSLhuqWZwabcoWk4o4q0OEHBtd39yYCQVz9q1Qe/K+bUAkoDDS/mCZqyjM3TauSJHTkBC1JYHLlrSMTKeieesdVsn8ybVeFk0qOZNpeTgRSSF66CUAIwIGSJHBVEEPMb2w9vKI6oLxATYDk0mk3/92Q98/s5vtKhL/vzdHzm/aWVza6NX5tc/8rihopxOc1jKd8YBIWhov3/quanxXmPSOmvB4r//9CdqEuH3/d3ff/WH/9g5uyoXTzJkgmu67gHcrTCm6QxRU1RC4JIIhJQkXQlcMkFkS9u2aFY1c1HtHpja25scTslYSLtkTb2QAuiY1x6+XE2eAeEMnTbRFAkEICOS9ZX+cxbExsdybtHeeGBiUmgtjX7bKQgkJARAxgk5Y8C4whjnCifO0fDi1l1NFeU53dU4uGYi+Wd/c+M5S7s23rG9/aKF77h+wSVfuiE4FvzZf996y79/QpNC44wAlJIaB0QAtuNWd3R98zffbPdXGlpN+wUL0Ss23L9NK6v58CffXyCHyHIkNVSY8akKVBgDpqBApiqcMYbIGVN1JFmqYem6EA2wUCh8eCjb2zeVLGBQY2sXN5A4VRz9WxjXOwPCt5xyljOUzALAwbGk5Yoz8htIIgIwDoQgsb2+/PKzmgan8uk8f2broMLsyoA3VXQF5QgBycuZ5KpQGCATCugM0NDYnqGyoJEIoCQmyadkNk/c9qu9m9f3rZgfGk1TsFiA6uCt/7Zu6iD7xU9fFMkMZ+QgEAmXpAIwaVLXnIbK+iYlUt27aX/QUMLh9tTwVFGCgdbiJbOcQp4ka6iaOjIY1VXgDBRUOILCiKucMyApiABIuoS5rDm7KfrCvvGd/ZOJAlQH5I0Xd3IgYIxNkSZ+PQAAIABJREFUu8fgK3Tkt4d1dDSdu3/b4bztqowJkhzx7Pa6xU1/vIRiecu5d+vBeLY4t7b8krlNx/7vCvnb7YfrIoEVrdXHt989GN81FL9uWaeu8Ddumn8ZPband8/QpKEqH71g0Ws+JJ4t3L2p+6pFbQ3RoJDytud2xYI+r652xMq29o2tOzBERJ+6ZCk7bqYHE5kHdvTcsLyrPOB524EQcdqhG5EQiJyupvKbdParJ3s8qv/5LYkls2q6++I85COQOncdZIKQKQzRUrkGnFSl4HUgEPDozLUJSco15zaZAsK++S/ujW+/62F/U/Rd7z9r29MHV6+J9e8fuOfrv/3Sd64jQUigMEZIOmDGIoZu61nz+75922jKyWd7uxauFUK6CL6IYbnoKmiouf7RSs4kqlzlCieODBXGFUUyzhSmIGC6UFhUVzGezvcPmTYai5r9V6wpld1FKsXv/nGN6G+ME1aH/Mubqzf1jDSWBz918dJk3vy3xzbvGoz/0brr09UKv3fP8OQJ+1TWsv9726HNfWMntP/euh3bB+Km477mkzOm/f6fPPbNxzefavzPbq/riaeFfF35SJ/Y27d1YOLwRAoAgoa+vLmaK3jzmjkAsKQpFs8W4rkTA4fv2LR/51B8NJ17u9pKeSnSF0sH3sJtqg7/+cUdqWwx77Ce8dy8ueVu1lWJA1M4UxEACVTkHCQqjHHkmvL8i4s4dxkZwnFCsVAgbOx7ev/wzvGP3P3hRefPe+iu7ZYAisVmrWoLBsvQBQUlMkVK4sAkkAQwbWy5fLZ09PX/vb+QybWsneMKIOAMgQMI2zySmdPT36GpUueocAOYZAwJiYHKuIooXBJB3dPUZOw4mCuYor3Gc8WaRkkCjmX4+2Nj8I2fE+4fTSBifcRPRC0V4Z54+sBYcn59hZS0Z3hyqmDqqtIVi4S9xqYjo0XHLfMZCDBVsJqiQV3lh8dThsoXNVQxhgCQzJv7RxNCUtTvmVMTzZr29v4JAqiL+CdzRVvIhfUVe4cnhSSFs6ZosCrkG5zKEEFzeWg8kz88kVrWFJNEOwfinbGyKxe2HOunJOoeTc6tLa8IeEMefWPPiOmIyqBXSDlVsDqqIrHQSyGCRcddf2CoYLm6wrcPTCyor3CF3D08mTPtsFefVR3VFJ63nMlsoW52w/aBiYLlLGqs9GrqwfGp0VTeqylBjzaRKZQHPF2x6GSuoDDWFA2ubqsBgCPxVNRvVId9OwfjnbGIoSr9k5mzO+sQcedgPOLVG6LBoWQ2FvJxxK7qsre7ZApAxFyQnKCpKvShq1p/8uj+gwPxBR010fKiaTIHkEnJGQJIpjBF5Y5wFc5QF+v23iRrtjhpwZmKHB976HDb/NiVt6za+9iu+Yvr56ys/8VnH5o8NJj36KFKv6UhEpcgAUGCLKXjN6Xs0sXsqy7+3Td+6a+sX3FBQ2LSCuhSuhZjMjSVCnW9d8+zez1BjlIBJlRVQSQC4EiciIGicGysDW/tnspbzuq5lVeuaZFE09bQ00RvWCfsHkt6NKXM7wHEwWTWcsXixioA+OrDG+/ZcqArVnbvloPffXpHwXaChvbtJ7fdv+1wZdD76O4jX31441AyN5LKfe+ZnRt6RgBgNJX77G+eMx23MuC59YktT+ztCxjahp6R29fvfvbAYEtF6L/W7/7e09t74qmOWGQomd3SP05EybxFQO1Vke39E/uGJzWFG6oyns7vGoor7KXPYYim7b7YO5YpWgCgKfw/n95+37ZDlQHPo7t7v/bwxuM/ylCVrGk7QpzbWV8b8duu+PIDLzyzf6Aq6P3W77bds/kgAPRMTBEAZyxgaD/fsO+OjfsBoCrg/dGzO3/2wl5D4QPJzFce3Jgumgpje0cSRybThqqs6x649YmtmsKbykO/29uXLlh98bQgaigLIMC67gHbFaWVvX1gYiiVUzl/ewMQEJErjHMOgCRlXVXwPRd3cKkMjRY8Po9kQkOFUEohEYAhclVRFOQoPdyuaPQsXDzLnkoCgwe/v7F6SeO8FfWP/3rvDz79vbu+/bxfo/nXLdm/dew3X33kgg+ulMCBSWKMiFRigjCssaYoO5JyDcCK5kaN47dvuv2OLzy4+ZlDBdO2pLQ1bf7KFuJM4RyZUFSuKByAM5KukAQSuTQ0ViiYk0VnaWvkytXNAIBAjKmncVjfMAiHpnIBQwOiR3cd6R5NXL2wtbUy/N9bDx4cT53VXlcV8lUEPIcnUlN5K2vaAHDN4ragR2fIBNGSpipV4ZIobzsA8OUHXgh69BUtNTXhgK7wJ/b0AYAgYgzfubi9IuD9fzeet/HI6Him4Ap5TmfdWe21GdOeypsRr75jYKJgOx9au6DUq2S+6NXUiM/zcgnTQoDygBcAcqZNRNct6Qh4DI2zdNE5QdhKFopBj95SGakMeO96sXt4Kr+mrTbiNRwpk4UiABwYn/JoyiVzGoMejSEkssWSjsoZ64qVNZaHvKpadFxXSEQs2E7UZwDA7w8NFxx3MlfgDP/20mVVIV/3WFJTeMRr/PODG65c2NpWFSnptI4ry/2etzcXPObDBdPn1yhJUHNN5F3nNI2nMsJmCoEUZAsQAkUpGqokxTJE3ZeYiLfM68BcjjQ2ninQVBEZDwW9mkefHB4LqYyK0koWLB0LOReRABTuCgWZxZwq3R0cSX3luu9+6/Iv7Xny91ZemlkraWL6SM/d//yLoZ3jJsmKpkpvLpN3bURQFAZESAoAOFISoSRwpSTOJrJU7fG+68LOkicpIgOkMwaEY+k8AmgK3zkYR8QvXrXqPatmW644NJ6SRHNqogDQn8joKtcUdmh8yqMpNWG/7Yp4tjCnprz0BACoi/gPjU/lLLcm7NMVbrnuVMEKeDTTcVMFM2xoZT4DALyasry5ekvv+CfueuZ7T+/QFV6w3amCqSn89vW7D4y9lMX00ESqJuzjL69n1pfIMMZqQj4AODyR8qpKfTRQsJ2pglUT9p7waQdHp0pPKNpufyIDCIcmpn72wt5lTVVXL2wDgO7RZENZkDFWtN2pvNVSEQKA/mQGEUqSbU88FfHqXl01HTeRMztjZQCworUmaGg/WLfrb+5ad9eL+0uihK7wh3cdOTSeGkhkSm+fKph52+moipwhRxYIJLAkcDAgKefPqlq7uHI0MYXILHJtU5q2EK50hSQpSoKJK+XoYGJ2fVXW8OSS2dW3LCt0921+Yu/ii5o+8t1PfuI77znYl9nz2ItLr5z1F1+5/pmfv6AhCSBAJJBRjk/87Lnbr/1S86KaT/78M76amliT1xP1xKrdv/3NJ790z+dkwC06Vl15y559kwrnvFQAHFGA6wrXtiFvCcuSDJSiJcHN33xFJ4Ak5Md2lTMGhINTWQCoDfveubj9snnNpXVGRLYQRFRb5k/kigXbrQ76KgLeg+NTFX6vynnRdhI5s60yRADpgkUADWXBnGUzxKBHVzk7MDZVsJzL5jVninYyb3bEpvWiPcOTn7ho8Q9vvmhxQ9Xu4UnTcTNFK5k3L5nTfNXC1u0DE9v6x4+abfPVoRNBOJrKc8TqcAmEU9VhP0NmOm4yV+x8uepFROPZQnXIzxGzpm27koiuW9rxsQsXX72wvaS+9k9mqoJelbHhqawjZEl5G0hkOGL1UZxXh/2csXTRyph2ZyySKlitFaGvvevsz75jucLZpp5RAOiLp0Me/cPnLlA4Pt09mLMcAEjkTMsR7VVnjGPd0eVLJUcwILp4aXMw5Mk4juuQ6bokpBRUch8VUiIiQ7WQMinvtiyaraZyk/vH33HT4pxgv/rCY9hW8/sHu7dtG23oqvPUVtZojjllUsEVSALQYGL/3pF1P3z8I4/8619+4crnHto1dWTPOz522Yd+/NHdj+3/yWfvjFQY2ams4Vfk1tTmZw9wFRkyRJKuFNJBqTAHLVdYwraFmc4WbrqoPeDTjyYTJSB5el2K3wAIi7a7bzghpNQUXjiuwq6hKnNryzWF7xtOPLTzSJnPeO/qOQBwOJ4q8xmGynsm0o4QbZVlOdNO5k1JUuV8QX1lhd+TzJsDycyDO3reMb9lWVP1VMFM5Mxja/GeLQe39I8XbMeVcnVrTdDQD0+kHCHn1kaXNsfqIv7b1+82bffIREpIUl9+CJG3nEzRFiQNRQGAnni6MuhVOE5kCjnbjXiM4xuni5bCmMrZo7uPbOkb64xFOOK+kUQ8W7xj076oz9M3mRZEFQEPY3h4IiWk9BtqidkSQInbT+aKXlWRknomUkJKn67Fs4Xfbj88VTBNR6gKu2Zxe860i67QFNYQDd6wvLN7NLmxZ4SIBpMZV0qfdsYUFS0tX0RE5BwZAHBGV6+qSxTTtpAKAEgVFZczBQSRBGCkocU1/sSze29+/5V2IZdJpYpZu7y1umJR3S9v/t7BzYfmL63z+FRffGTzzjGrmACVqUTE0FD5lntevOjvr13ZqKx79MDGO+8/50PvjjSEPeB89NEv9G7e+8V3/dQ1MIKhosqYFxSmoSrJoZL3uUCSqlBd5EKkLaqN8vqaEElB034xCMjotA4mV1a9RxQLn7lijqG+hkkgkSsS0NKmWE3Yryk85NGP/dRRVdZRVZbImzVh/zWL26rDfiFlZdC3pDFWGfQSQkesbH59OUcW9XsWNVQiQsRnrGyt8epqMm+uaKm+aHYjZ0hEzRXhxY1VHk0BgLpIwHJFImfOrim/bF6zpnAGOLs6Ore23KMpdZFga1WEMwwYWnNFuCrkqw37GZuO/iKAqN+YV1fh0VS/rsZCvqXNsYqAlwA6Y2VBj1YV8vKjhhxDVVorQxpXNa5dMq+xM1bWUhkqWK4j5FUL2zya4gpqrggtrK8MenSV8wUNlZKgOuwPGNq8uoqu6jJXyPposKk8VB7w+HR1Tm05Z9gRKzM0ZSpvMsSL5zQtaKi0XVkT9i1uqIyFfK2VkVjIxxlrigZ1VZlfX4lHmerrpy/fveU953W1VQb++CaaUgDhsVqiJKEi4t+6Y3RooiAEAgcG4LpFRzjgcCkdS9oIam/f0LVXLXtq3SZVolrRuuexHRddPWf5+9euPKftN99YRxFjfELkc5lzr1sViBibN/RDPr/64tlPPrZHxNMHd4w98KPfrv3QdZe9d/lIWuZcWR0yFl+8WPEZGzduXrpySdui9u69/YGAqnFV0xUJmsosAzmiWiTXAjE2VPjw9UsqI8ZRSbR05AKn42ACvnzfDvAEAegNHFHEQr7YKZYIZzinNvry/7BzOuoIQEpqjAabosHSzC1tipW88gkg5NGWNcVKMmQpeX1FwHtu50vaWmd1GU3b5Ka92Nuqwi2VIUJAgOPfeE7AWyqsdGwgdYUvbYoda7C2c7ruZ03YXxP2v/ITFtRXJssc15UlTC5qeJkHQnnAc06grnQ9uyZ63F0VpQtN4ed0TDcIefSWimlmfnwfAMBvqKtaa44xk2O3HP/MM0AWPZYL8bgBB3AB1KvP6/jyD9ZFo2UTkznLcoMBP5JA5khUNNTIA7meRNxS2+tipiNXr6zo2V71u3VH/vqWyN4xmOyLf+gbV6UywpJkuaQwzlwhhDBteeX7L77jU9/vJXHTlz60YG3rcCqvky65MjyRdifNptU1yndTN165+Gu3PhbSDcZBVVwuFIUXi453Mm+ZVq68zKvaypxab2djiAgZUsk5FKG0aws4fWcUb3k84fEVh/G484PpC4Yvqfp0cpe9E87lT1XImv2P1eugR0GcCTh8fbIo0TE2WCqibUslmciEfJ7vfP4dKGTRlqPj/U+uv3vfkRWGX9NtDgqXaIXLog/e9btlqxf88v7nqGinRqY8XvVfvvB0tq/3xq/+WTLj5BxggIxY3jE5gFRYTmBFW8WnfvcVnQGZhZGC5GQUUbaF4YfffH7l6sa86YmF9IQRdOOO3hDUFZ0BMVXP274KT/clZ7EVc671hwzGpEDeO5KJBIxwQAdAIiilxkFgp9E0o7zVs3XCsj4RUa/46RWQO5WZ/CQvwze7r09zb8SZoN/XbZg5NlISge/pnRgZKVbXhaxiITlYKGachIPWVPKmy59XlMf/+rP/EG4Aj+N1FQiFQkP7hxYuW13MZFVdmzx0aPENa1fPLc/oi7wxf8FCBaGUvkJhCjGmCEBgWVNw28yQZIAaoIuyNsg3PnH40FPPXHHj3+wZGA5VhuO9k8Qtb4AZnKmKmp+ES8/96XUXbHhqx/ue3DlRGdQ9Hlke9IbCnpH+dL6QWrOgyacrJJDAJeDs9J3Qvt0duOXRokuS6C3cKab3ixkMvu59iyROJ1qCnYfHU5Z57tJKDxUSk9mJSXvChjIDg9UtX//Jv97762vbrpkX0FWmc5+mG17dSmbClVUR2+VeraK9/vlv373rSLq2oaxgM4ESSokrSpMuSeI0sy1FJkoAF8in8fiRsUe/fW+wqipSF03EJ2sWLOzZejAQCfuZ4dMMFE7j2vp4vOuL//Vvh/oubavy2Y47lZID8Uwqm5/XpHe11zy5daRoESIR4LGq2GcMJ7RdsX1gojEajL0+K8LOwXgiVwx6tBMUpNcz178/NFzu9zCGQ8nsebMa2JsVFw+MJUdSuZKmeiq07xmaDHn1xmhwBmUnTgQdy7ZC04FNpaglxO37RoQmK3T9V+v6i1nLdHnRdBmJOICXRHOzcrB7RVOnYy1o6N3SHfIEsj6LuJqdzGA0aHKtqiE46o898Y3f2MlLV//5KteFrAUkQZZODThXOC+5VksCztCrSK8fDq87cO+tD0oTA7FKb9QLLkUbKyd2J4JeXfGoXl03sdixsmnH7SvUCt3jc7cfTjIGNtmGqk+mxJ7DxbZqZUl75IUdh1bMa/V7NSkdxk4bQ3ozLz44PvXtJ7c9vqfvdeta2o/X79o58Ib9vBGgoSz4nae337Wpe2VrDfsfKGwBQ7tzU/dT+/pP1SBr2v/+2Ob7th76Aw7u0FT2i/c9f8+WA2e8EojH6/XTuQYBZd9oEjwAoP5+7zA3QSj60HD60KGekeGxvJXniu5RRKzL6N+yv6yzzg+8POz166rXoydG0+2zmjMFueDcxXZxpHHN0qd+8PAP/uoHB7cPV4S0xoAbNqDMYK7rFDJW1EMBVVT7qD6MySnrF3/7wK/+8adllVWuk1x82XLpUkUs4uhKJi9VXS8Lah6NV89vGts5bISLdeUcATk6k5Opnp7Jwz2JnCU0VfTF3fW7kx2dDS/uGpDk4mlNPPuG3y2kVDmbU1P+zsWtBJC3HEcIjXOVM0lkqIokyluOKyVD9OmqwpiUVLTFrJqynGkLooChMcS85diu4Ixxho6QusI9mlK0XcsVBKQr3KuptisiPuM/bjxPU7jpuJKIIZqOazouAHo0RVd41rSFJK+maAq3XWG5wm9oCFCwXdsVBGSoikdVdIWnC9aFsxsBYKpgAoGuckdIAPDrGiIUbXdBfcV1S0+srSsl5SxbEiCCR1U0hQPACX1whMhZDgJqCrNdyRD9hkpEvfH0wfGp1a21lit0hQspc5YjiVTOfZqCiKmCJYkMlQtJjpARr/62twyVkuEigSTJDg2mwwH/rgNjTAuYrtvTmwgya+V5C7btHhgftmMLBM+qHBhJrggoL49wjTyKrvuVeCa7bEF70nKqZ0drlpx92acv3Ngc3X33A7/+5PefbGjqunzenFVztj07PvDkTkD6r9u2Lb9i4fa9vXse2DO4aYMRMGrmL3v3d67/8Y3fOv+GuSMpMauu5VCyv9vNBv0VqmZEwZZlAXvM1LmHBFd9RmIiNZoxL1hSb0Nh265Rta0mEsBiQeza169y/0giV1fuP41Jz97wi3Omc/eL3ftHk0LScDLbO5keS+e7x5IqY9Vh381r5v5yw76eeGpFc/XDu3pXtVZfv6yreyzJGaYK1uN7+x7edeTaxe1XLGg9MJr86iOboj7juqUd45mCoSpN0eBzB4eqw/4Hdhw+r6v+lrULXjg8LIl2D02mizYBffyCxVnL/v4zOxc1VA4ms6mC9ZnLVzy8s+fBnUduWNZ51aK2ZM689Xdbvn792g2Hh1/sHa8IeH674/C1i9tvWN7Vn8jYQnbFIgXb/fojL/ZOpq9a0MoYPrq79/+snn1OR/2dm/Zv6R+/ZnHbCTLq7et39U5mVrXWZE1bU/h1SzsGk9kfrNuxoL5ieCqXzJufv2Jlumh/8b7nC7Z747LOkXTuhcMjf3vpsvpI4On9AwgoQe4empxfV/6j53bZjoiFfM8fGrpl7YKFDRV3bNz35L6BZU1V53bVf/eZHb/84Dve/kyRiIAEAM9bbs9YUY9bmqZKIeLZwuw67crzF/eMpBe2qnc+Vqz0BfvzSWZaiYzZt/7ZWKgqLy1C0pjKXHf52uXjhFNpce1XrrbT+cs/sGbVuZ1bnuk+/OKedd95ZN0371V1zRMIAPJtt9+38QcPgZCVbVVLb7h06Tmza5e3phOZa77+wdGkLSULtIdnjbsbnG2cKyjBiJSlRkbHDg1pRk0ZWYbujYQji+f0dTUvdyy6aIW87Tf7fYFqL8PElJt1UtGQUhcNnUnW0ZBX92mqpvAynyfkobqywKGxqQd29lT4PX932fJ7tx54pnvwxuVdl8xt2tw7tu7A4NrOpv0jyZBHP6ez3nTc9QeH799++IoFrbURv0dVmspDy5trvTrfP5L49lPbPnbBEs7xib19NSE/AKxpr1MYW39ouDeeuXF5Z9hnfP6+5yNe4/plnQ/vOnL7+t1j6dzSptgz3YP7x5JXAThCNEVDe4Ymf/z8ns9fvqJgOU/s7a8K+ko6ocpZc0VY5Szq84ym85fNa4nnCo/u7htIZDWFhz06Q6x6uZb78xf2vNAz+p6Vsy6Y3Zg17d1DcQD4+qObQoZ+/dKux/Ycue253cNTubqyQNCj6wq/YHbj7qHJp/YPTGQKc2vLgx7NoyqXz28FgO88tW3HYPzjFy6uDHjv2354/2hyYUNlYzSocHbRnKZlzbGFDZVnzAEJgURhO3IyWawL+2xu64o2FTevvbLzsY3D71wd2znYvGohHhxJmgW3Z9Sq8HV/9NLn73zya64wgRgxmNg/df9vBxoW1LR1+qUjsn5jNO34IqGz37360hsXpQownsiP7R6OD6esVLGss6KyOdrYVBY0ONf1pGDjqYLK9KoK5lHdeAY2PTKUHUsUXcVFcGTOkaEmn7Pm/F99884P+MuqeCLf0lbl1df6fOre8VQV88bCumWTFxwSqulCPC1LqYvPJMNMfzLTXB4CAM5wNJ3/l4c3Vga8X7lmjS3kvpEkAMyuKQOAiWyBI1YEtCOTqabyoK7wrGkVHUflDAAGkhlEbK0IhbyqkPTsgUEhaH59+dP7BwCgIRoEAJWzu17sPjyRuqCr4dJ5zfuGJ+PZ4qzq6J6hyXXdg2e11bZUhCezRUNTRqdyAPDTF/bevHr2nZu6FcSWivCDO3o4m/YdPTCWrA75VM6KtjtVML2qUuY3tg2MM4SIzwCAQxOp6pDv+GCovOUcHEspjM2ujZa0ytVttftHEvFssbOqbO/w5NP7B9e01bRWhoenspbjBg3Noyl9iZSm8JBXA4DeeLq5IgQAmaLVE0+rnDtC/vT3e9sqQitaYgDQn8ioDJc1xwDAq6lwhpBE5Axc4Uymsl5dDXhVKRUiGQkr2w+MxgeTQuGWK3PZwkQyv2nDyMf+auv6XX9WVek5MDBmSxukurD1ycvqP/vMA4seyCwN1DaHVqxuiBgsGhRSJqTGDKxv9HS0RRQOHMERzHLAFJh2AYSrcdWTzw5POQf2H0ru3xrEw2fPerxsRdnufe/XXadoaYaHElPeNSuT1tTB7bucWa0xM2cqUc/6XcOuECu7YprmAQAHWV66hVRmwock6TTWOH/DILRdMZrOL2mMAUA8W/jGY5sDhvbJi5d4NDVdtAq2SwB1kUDWtFMFa05N1HTcRK64oK6CM0zlrWTeunpha2n9cYbVYT8AWK47ksq3VYVL4CSCurIAADy6+8iDO3quWth6w/IuABhIZktOagXb+ctzFygMAaA8YGicFR3xyw37ZlWXlQe8E5lie1UEAHonU4xNO4L1TKTn1pVzxkzHTubNUrxCfyLDGKsN+0vvXVBfyY8DYcF2LFcgQoXfW0JULOQbTGYZshP6MFWwCra7qKESAA6Np3y6GvEapYFa3hIDgKm85YpS7SC6elGbofKKgLfUgabyMywXIyIxICLmOHCkP8kZ1laEmE7RiLfo2gf29D2fsWrKywBkOp0+uK/v47dc9mcX1N/9VIXrWOkcI+lO5N26qsw5FzvnXLpZWOsPdnu6++sHu5ue772QGpYtubyjJizHM3be4g4Skiw5IYYNrnp494bJvRt7W+COZXNHz2k6suCqyXAUyXUGEmB4c7YI2q6bSE62NzRv3fPlH3+j5V0ffHiof6ilsZ4hs1w2ePjgBV97r89QChItUybT+d7RVDRkAJ7Os7o3DMIj8bSU0FwREpJue3bXeKZw1YLWukjg0V1HLp3XXBXwjqbytise2nlEV/m7lnYMJXOcsbzlMMRHdh+pCHhuWNYJAH2JjMJY6ZCDIfPoipDSFfLQ+BRHKPMZGw6P3LnpQHXId15XQ6Zoj6ay8+vKHSE1hS1vqX7h8HDecprKQwBYFfTtHp48MJb8wpWrHFfoKhdSFmxnIJlVGQt69LF03pWyJuxTGBZtJ1kwSygdzxQ4Yl0kMJrKCUmxoE85Lg6jzGeEPFq6aCfyRU3hP3l+9z9dc9a8unJXSFVhy1uqN/aMpItWU3komS8WHbetMgwAY5mCT1OjPs94Ji8J6suCT+8fEFJ6NLVgOx2xMs7wP57Y8qmLl5ZAeH5Xw5l2XDF9VK8qzDTtiUnTwxRehkFdP9CTu+3LVyy//rvpnl1SSG9Z+Kc/es+y9ubv/2ZXNCB7hwalpeRdlabG586a74hesocQfW3cF35nAAANm0lEQVRd2NI1KEQPwNO7Nnu+/PfXeWddcvlHVpEgaaFArnMMekT3i4NP/mzjNQt/cvvHe71eG1FRUBD6nGJSor+ibE1LIDdoFUKWfyhLntHBSFnVi932i4/+3w9+7p4Nv1uvaL58IXXDey9ZOj/6i/vimsHSuWI8XhyYyJ2zQOJbXgj01egNOHCXaCCZcSUl88W2yvBkzrxsXnM8W9jSN3ZWR23Qoy+orwSAp/YPaAr7wNnzWirC/Ym0JGqMhp49OOjT1L86d0HAo0uigUQ25NXP6qjVFK5wVhv2j6bzg1PZgKFHfIZHVY7E0xfPbayLBH7fM5wpWkuaYmGf0V4V3jeS6B5NBgzt/NmNePQUiwCvX9pRGfRqCo+FfCOp/ES24NO0iE8v83ssV+Qsx3Ll/PqKVMGaypsXzG7wG9rQVM5vaAxBU3jBdi1XzKur0I5GYzDERQ2VjpCbe8fG0/mPnL+QIQYMraMq0j2S2D+a9OnqBbObEGE0lbdcecHsBoWxkVTOb2heTemsLrNdMTyV01X+jvkt8+rKc6a9tX98MJG9ec1cn66mi9ZgMruqraYu8ubdr//4DtzTRV9AeDTt+d0Dw/GsqnKNc8OnxONmNOr5yicvOvfcxX/54Us//N6LMmnngXWHIiH98HDKNJWcYw8NDHNpf+FTn/P6buHazcgqGGpAjsJMhlTXaL3v5o1lufWP/Gg4TY31zSGfT04entrw43taxL/c+qVfnndRSmEuQ4VhBeMLiJ+n+m5VPP+ie64ZSvkeffTFcCwa0jHvclVVFIVv7x7/6HvPuuWWiy8+f96nPnr1eSvn3P9Ur0DMmdZEOjeeyg4OT374z5ZWl/vh9Dlwo/7Jx6zEZOoH14c8GszQGXeCd+33H/unqy+ZW/NHOZw4bpmSBGQv7uy/4XP3LZpVWx2JRCq8sZBPJRW4VBUFSToobAlOrhCfymWKIi+gr29414bNd/zw45ee1XnsqQKB3FGQw8J+3jG/wZmjKHohbz+3senWO/+2ak57a/5r73vv+vpGZruKSmnBVqiejzPeyXgdltJSSAmMAdDCd37Fzrvzly0u83l0HaJ+bzikGpofEBln5AqHEFFMZeVUMjEUz+4fyHTEjLu+eT1JgeyP7baG/+cnUFYHJGeKY87QG8YhEZXKei5f0Hjj2o47n+9Z1OIIM2blcj6/P+rxuKorBRbypmPl08Iu2tyyWPzQYPfOp//y5usuPauTpr2nAZC4AMkqkVcxdanqucXN/4fr/peq4flrh2Z3fO7u37R87DO7OOrSJYU1cN9PuNKCBIwRAE778iCVUPS7X3x81jlf2Ltpw7xla4OgJcnOObaX2yGPV9eYpWAh52bzhVShkE06I4l0cmzsh//1NwAu0ek0TM+AcIbewN59VCJFAAmEhPS1v3tH3Hxo/bahVNTyJ5WaSiXtFxpnyMiVDKTHtHBifOLAvq19g4N/fu1V//CJK4hcAEZYimGTkgESgiQCAeBRAl9Q5C1u7pPSfa62tviZT++yLVUIXfP9J9MvAgBWqrxLgMgIEYGAmCSHSaoIBH7xnx/7v5+7fd0Td8yeu7q5sdnDwg5zim6egeK4Mm9jZiozNjERlxyL6fu/fUNI55KITmuOGeVttMHO0JmAwKNTxhAJJAHSDz9/2c8f3Pd333naO75jM6bLYs2eUKXH8JDj5DKZzFhPPpXz1cz6+Xf+8dJzWnUFCBWSErE084wBACMiQEmIEgiJVTD/Lyl3o2k9KYW0RD4Q2cx5pUSToXE0hhGnS2BPhwUqLrkqKJetbt3w4D989Mv3PnrvfXt1J1hbHy6L+fSQDZDLjmYTE4V0ShodZ6+d//VPv6e1OkAkkQRDOI3BDG8LEEpJJ6SHkURZ03YlHTO9GKri0/+oJ2m7h+JBj1bu927pG1vZWvP6c3j/aUimBEjIGAFyxt73znnXX9L5+W9teGHTzvxQd3x4OwhggB6fp6p12ZWXLPzM+1dwZgDJUnAaY8cC2o/jrqU6ZMAQJSAo/ruZZ7+UMswapeInEFwopEh8+XECIgJJRGRMAwABIhrQ7v6Pdz/3F+f9023PJHdvnTx4YEy6EkjlWiBS1bbmko/dvODyNR2lzR+BgKlE9CctjgpJ4hWZV10hnzsw9PMN++rC/gvnNP5ubx8ifvT8Ra2VrysV0roDg6mCdf6shqDx5q1NAUP70bO7DEW5bmnHDAJPlFxKrIMIseRXK/268q3PrB2NLxlMuJlMnsjxGJ5QUJvbHMHSviolMjwWuo0vq32LMA0IBJJADNGVgFyZpQIIcBnZQEwwyYifRGo6mqMCiRgxQpJSnDO/5sn/fPf4xLWDiXw6b7qODHi8gQh2NUbVUiYHkojsaFDy6aTTD0LOMFdwNY9y/OBqCq8O+zyq0h6LXD6/JaCr33l6x+N7ej9y/qLX88y7N3WHvMbFc/5HtembykNfvnqNJNJmEPhKwVQSsFKOmelKFaYsqqBUR73V5QQYBGAAEgBBSAASIJGpWCp5K4mOppynowmBXioFiAyApEQmBSoSpMJRkOAOOpwUZPgKllyqn4YwXSpDSnIU1EgIyTBazqsqo0cfL0ECSJIokCTD0rumC2j/qRtmDJXlLFdTuKIAAyzNb288jQgRrw4AmaJNAFG/BwB64+lfbdovJE3migvqyz9w9vw7Nuy7d9uh5vLQsqbYnuHJ0XROEiiWfesTW9+3Zq6m8p+/sDdTtPOWUxfx/9V5C587OPSj53aFPfq5nfV9ibRP1y6c1XDPlgMq58Op3Pld9dct7dzYM7Klb3w8k28oCxLAZXOb6mfiDI8nhqUi0scq+Rqg0TQrEwiMjgp7xAiRcckABCAHkCWYHS3/R8elTyAALBk9GWLp1IEQSKrIQQMdJL3SgIDTWTYkAEMgQKagJgkRBSdGoBCRJMGQI6AEAUAMFABGdKwO8WkObX9bRNbrKvMbisKnE32UNqX+ZIYz1hgNZYrWQ7uOlPs9F85unMoXv/n4ZkfIL121ak1bzbMHhtcfHLp6UZuu8DKfce2S9i9etep9Z81FhPl1FZ+/YmV12PeNxzYPT+X+8erV1yxu29o/cd+2Q+d3NQR0LeTRL5nb9LnLV86qjtz6u60Rr+fzV6zsipU9squ3ezTRUhH+6AWLWirC6w4MFm236g0mQftTYIfHFZFGQASFI3JERKZA6QIRkCFyAASGMJ2qFI/e8Ep7z7HKgKyUtBtARWSMM0QGyIDzk6YhQsRjK7n0UsYQmQqMI2OIjDOllBKOMYUxFRCBMWQMpyOz4E9dHD1ub31pKGwhskUbiO7deuC/t8KcmugNy7uifs+Te/vHM8XrlnYAQLpocYZ52+keSzLEBfXTzi450yGC+rIAAOwemjw8kfrzFV0AkDVtzjBVtAaSGQKoL/NH/R4imsgU85ZzdnsNAKQKJgCYrqgMerf0jT13cKi5PPTxixbNmG/ftB31Df76RpudBMZ/uK7+6YHweMoW7bztKJx99dqzdfWlTvZOpgmoIxYBgLF0AQA6Y2UvHhnVFF4KWQKA4akcETSWBwHg4HgSAErmnLF0wXTcxQ1Vg8ksETWUBUuqzWg6J4lKNSHGMgWfrtZHAkfiqe8+vaMxGvzSlatmEDhD//vF0VeS5Yq85QQN7XgEluBkuULjfCyd751Mr2mraS4PHZ6Y0hVe0hiFpGTBJKAyr3H/tsNza8tNx1UYc4XY3De2tKlqWXOsP1HihIGS6Fsd8rtC6grfNRhPF6zzZzUUbPfrj25WOfvg2fMYw33DkzMLZYb+tDhh32T6W09uIwJbyJ+/sPemFbNKIYgAcHZH3Vg6/88PbfJpyk3Luy6e2ySlLDoiYGjlfqNka51XF+1PZL6/bsd7Vs1uq4z89XmLbl+/R1PYuR1171raKYkypq0rvBQthYjXLG7Pms6n73kuaGh/ff7C1W21P3p25yVzmvKW871ndjRGgzet6JpZKDP0ForvMw7cZ/b8/fEcuGfoDz13Rx242cxYzNAMzeiEMzRDMyCcoRmaoRkQztAMzYBwhmZohmZAOEMzNAPCGZqhGZoB4QzN0J8qCD3aTMjcmUlEujrj2npmkwIAoPFP3Lb9ZMHjR6Ml38TagFd3ez5l2YXXLnmNxxXXPcmugq/265vOqfV6bnz1NviqP7z240/SgjEEr/qtJwZ+uyXzKvPwWvN06mb0Gvh/PXvEm95cXm0kJL3G8qBXH0o6+X/pVb+ZpoMd39SnnNgnQ1GAT78S3/mzXeSYebN4qpWAr/jhVBWsX0fL45rSyxu8zhuPu8KTduBkWMWTtj7V6/A1UHOynuCrIwZP8cer9gRfDk866V0eTbVdIaQ81ghfhiB8DXC9YtnR60QzvV7M0qvtAHSqdq+5F9MrbnjpEuHUj30ju81r3Esn/4lO9s9jS5Be6rxHVUAPAhHedyR7bLLxpdnHVy5wPE6ELTG60gWD6Qwf7Oj3s6OrAUtFVo9bC8dWFr58Pb0yxvMYr8SX9+QVLfEk976cweAruO8JH4Un42d4fAqUkyEHXwHCE3qCr+BzeCK0Tnzam/t8opNwNDr1mjhh+dDJ1hOdEiAvQy6dAtF0qnvp5ECiU694ellX4WR/vWpv6VUeS69A88u+h+BVHntyENIbH/D/D+F+GZ8ahAKbAAAAAElFTkSuQmCC</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>
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
new file mode 100644
index 00000000..5c4b161e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.gre.ac.uk-oala-metadata.xml
@@ -0,0 +1,80 @@
+<?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>
+      <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>
+						MIIDRjCCAi6gAwIBAgIIZQXHbuQMihkwDQYJKoZIhvcNAQEFBQAwOjEgMB4GA1UE
+						CgwXVW5pdmVyc2l0eSBvZiBHcmVlbndpY2gxFjAUBgNVBAMMDWlkcC5ncmUuYWMu
+						dWswHhcNMTMwNjA2MTIzMDE5WhcNMjMwNjA2MTIzMDE5WjA6MSAwHgYDVQQKDBdV
+						bml2ZXJzaXR5IG9mIEdyZWVud2ljaDEWMBQGA1UEAwwNaWRwLmdyZS5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIvRxjI34duzh2spZJCamd9E
+						8OwnYWdLNS9ZEdorE9x9ZXQA/ejG4x10O1Ljr0N6+0T9YEEa/1JiNp2tUvX3UT7b
+						34EKrE5WcYJVZxmPptfge6NakSRBgA5lptbP4mUa4nF52mcovhIWpuk/UYlBKIlJ
+						kyodxPGsC4t2cQpvmbSs0RksyIbw7LVBV4MQ6lJtUr1z8KSgyykl2nYfvtWVFmjM
+						smHYt5hXI0Wnmb7mzaRpum1jCWDOfM7frUeA/LR82Vht5QwLBofN1foBy+epycoQ
+						mWhalR5RO9O4fcKpdDivesBRr2Azv1yqYAWHFHSuWZIBVu0tJFIOENNAnfdG0PkC
+						AwEAAaNQME4wHQYDVR0OBBYEFHyc5wEg+klCOqiJqFE473Ty1/YnMB8GA1UdIwQY
+						MBaAFHyc5wEg+klCOqiJqFE473Ty1/YnMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
+						AQEFBQADggEBAC6aG56JBmxTiBDNatEhacitubAc+4g/4fKMY/dAVd9SR/Qc8BN4
+						YGaM5lR5hhjITyDD/HRI90EEhVXL/TrVmHECXL2SSXRaKJElUIWBtZggFDcyWBC+
+						jQPsf/QvfYTheFklroidGqhKUtATdsWtL5iYKjUSYySWQXeujpmNXNjUKJDXsPPX
+						iUSrx58Jl1ywPSdJfbDBb8jcb/8TTSq5xEl37TkXp86zvOUrmYFn+RexScPt+kHG
+						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>
+						MIIDRjCCAi6gAwIBAgIIZQXHbuQMihkwDQYJKoZIhvcNAQEFBQAwOjEgMB4GA1UE
+						CgwXVW5pdmVyc2l0eSBvZiBHcmVlbndpY2gxFjAUBgNVBAMMDWlkcC5ncmUuYWMu
+						dWswHhcNMTMwNjA2MTIzMDE5WhcNMjMwNjA2MTIzMDE5WjA6MSAwHgYDVQQKDBdV
+						bml2ZXJzaXR5IG9mIEdyZWVud2ljaDEWMBQGA1UEAwwNaWRwLmdyZS5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIvRxjI34duzh2spZJCamd9E
+						8OwnYWdLNS9ZEdorE9x9ZXQA/ejG4x10O1Ljr0N6+0T9YEEa/1JiNp2tUvX3UT7b
+						34EKrE5WcYJVZxmPptfge6NakSRBgA5lptbP4mUa4nF52mcovhIWpuk/UYlBKIlJ
+						kyodxPGsC4t2cQpvmbSs0RksyIbw7LVBV4MQ6lJtUr1z8KSgyykl2nYfvtWVFmjM
+						smHYt5hXI0Wnmb7mzaRpum1jCWDOfM7frUeA/LR82Vht5QwLBofN1foBy+epycoQ
+						mWhalR5RO9O4fcKpdDivesBRr2Azv1yqYAWHFHSuWZIBVu0tJFIOENNAnfdG0PkC
+						AwEAAaNQME4wHQYDVR0OBBYEFHyc5wEg+klCOqiJqFE473Ty1/YnMB8GA1UdIwQY
+						MBaAFHyc5wEg+klCOqiJqFE473Ty1/YnMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
+						AQEFBQADggEBAC6aG56JBmxTiBDNatEhacitubAc+4g/4fKMY/dAVd9SR/Qc8BN4
+						YGaM5lR5hhjITyDD/HRI90EEhVXL/TrVmHECXL2SSXRaKJElUIWBtZggFDcyWBC+
+						jQPsf/QvfYTheFklroidGqhKUtATdsWtL5iYKjUSYySWQXeujpmNXNjUKJDXsPPX
+						iUSrx58Jl1ywPSdJfbDBb8jcb/8TTSq5xEl37TkXp86zvOUrmYFn+RexScPt+kHG
+						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>
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
new file mode 100644
index 00000000..91febe63
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.grimsby.ac.uk-oala-metadata.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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>
+							MIIDhDCCAmygAwIBAgIIH70XfscAcqYwDQYJKoZIhvcNAQEFBQAwWTE7MDkGA1UE
+							CgwyR3JpbXNieSBJbnN0aXR1dGUgZm9yIEZ1cnRoZXIgYW5kIEhpZ2hlciBFZHVj
+							YXRpb24xGjAYBgNVBAMMEWlkcC5ncmltc2J5LmFjLnVrMB4XDTE0MDYwMzEzMjky
+							OVoXDTI0MDYwMzEzMjkyOVowWTE7MDkGA1UECgwyR3JpbXNieSBJbnN0aXR1dGUg
+							Zm9yIEZ1cnRoZXIgYW5kIEhpZ2hlciBFZHVjYXRpb24xGjAYBgNVBAMMEWlkcC5n
+							cmltc2J5LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh+gq
+							7zDrrAi7jZFx0cUlhbbcxUFDR1oTGlXf/jPDjKWavaIM/Gl1iQ9mrQVLmkH/W/IA
+							Vbk6sofrhnmzadRKq0OT4Vui4IjjeeYGYvTq5naNE+oh+W4au1oZOMQeglgIDhWd
+							ZGmimiq7k/t82K/84z6rD33/2Jt6wPZmynrhdNA0DWTGM6Ri0RQNT1SFbCousvhm
+							G4eGvfK/rlRbouRQjRoBFOW8tdJk2fIwczS5xJoDCPP+1awIIVUYHBM1rhORFtTS
+							sn/YWlvAp0ZahXuN/KUXtV6HQz70+LX7qPT1G3Pj2PJll+hMUD14OpMOVR0kB6MJ
+							vHxF37Ux4DsMQRh27wIDAQABo1AwTjAdBgNVHQ4EFgQUaZXT/v4e36tmutKwfdoU
+							M0KH9acwHwYDVR0jBBgwFoAUaZXT/v4e36tmutKwfdoUM0KH9acwDAYDVR0TBAUw
+							AwEB/zANBgkqhkiG9w0BAQUFAAOCAQEARhiT5E/0HuU6FcdPenL+PXlWODHxeISi
+							w5idnZGVCiWCR+KNz+OEzF+aiQdIFDO3hAb/MGFJ8CPFEogdApZJouRmHxz8i3Y6
+							0tuSDLJpI1t4hs2Be+PrXGHueK4+srZfpca2ns3s8Jp61r353iG+qLV1V8iQmxKy
+							D4IlEvMsstT1ICScNeItMIb4O515zxNix+hf2CdEK5yknZSvdeYfk3A/Dgh8o4FZ
+							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>
+							MIIDhDCCAmygAwIBAgIIH70XfscAcqYwDQYJKoZIhvcNAQEFBQAwWTE7MDkGA1UE
+							CgwyR3JpbXNieSBJbnN0aXR1dGUgZm9yIEZ1cnRoZXIgYW5kIEhpZ2hlciBFZHVj
+							YXRpb24xGjAYBgNVBAMMEWlkcC5ncmltc2J5LmFjLnVrMB4XDTE0MDYwMzEzMjky
+							OVoXDTI0MDYwMzEzMjkyOVowWTE7MDkGA1UECgwyR3JpbXNieSBJbnN0aXR1dGUg
+							Zm9yIEZ1cnRoZXIgYW5kIEhpZ2hlciBFZHVjYXRpb24xGjAYBgNVBAMMEWlkcC5n
+							cmltc2J5LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh+gq
+							7zDrrAi7jZFx0cUlhbbcxUFDR1oTGlXf/jPDjKWavaIM/Gl1iQ9mrQVLmkH/W/IA
+							Vbk6sofrhnmzadRKq0OT4Vui4IjjeeYGYvTq5naNE+oh+W4au1oZOMQeglgIDhWd
+							ZGmimiq7k/t82K/84z6rD33/2Jt6wPZmynrhdNA0DWTGM6Ri0RQNT1SFbCousvhm
+							G4eGvfK/rlRbouRQjRoBFOW8tdJk2fIwczS5xJoDCPP+1awIIVUYHBM1rhORFtTS
+							sn/YWlvAp0ZahXuN/KUXtV6HQz70+LX7qPT1G3Pj2PJll+hMUD14OpMOVR0kB6MJ
+							vHxF37Ux4DsMQRh27wIDAQABo1AwTjAdBgNVHQ4EFgQUaZXT/v4e36tmutKwfdoU
+							M0KH9acwHwYDVR0jBBgwFoAUaZXT/v4e36tmutKwfdoUM0KH9acwDAYDVR0TBAUw
+							AwEB/zANBgkqhkiG9w0BAQUFAAOCAQEARhiT5E/0HuU6FcdPenL+PXlWODHxeISi
+							w5idnZGVCiWCR+KNz+OEzF+aiQdIFDO3hAb/MGFJ8CPFEogdApZJouRmHxz8i3Y6
+							0tuSDLJpI1t4hs2Be+PrXGHueK4+srZfpca2ns3s8Jp61r353iG+qLV1V8iQmxKy
+							D4IlEvMsstT1ICScNeItMIb4O515zxNix+hf2CdEK5yknZSvdeYfk3A/Dgh8o4FZ
+							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>
diff --git a/swamid-interfederations-2.0/idp.gssk.si-idp-20141130.xml b/swamid-interfederations-2.0/idp.gssk.si-idp-20141130.xml
new file mode 100644
index 00000000..a854af7c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.gssk.si-idp-20141130.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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,iVBORw0KGgoAAAANSUhEUgAAAHgAAABzCAYAAABTo8YRAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAeoJJREFUeF7tvQV0Vle3BRqcUtpSqlCl7lShQClS3C0h7u6uWCAhgQRCEgjB3V2Ku7u7S90LxWW+OffJB4FC279X3h1vPMY4I8knR/ayueZaa1PCO3kd7P6r/1Dir8+Am3YlSpSwu/tjN4u+VbL4GyXuvB0AdiXsStqVKGl9WH8X/2fe57ltR/H3rd9tV/mrW7RObu7x7vPr3Hrtfs+o+7W9d9e9F7+izv3/yj+flPUofkjgdx93f+ZP30laD++/OHyT77xG8e976frJG8yhc9zvfu53D7pXj6S18ORP26G/zWspa+CRvJrPs8Yc+vteh+19n5S1dzy7zmfuj6/ff53W/Om9v1uv/8337f5q4WyC/rc39J9+X5/XtXy7bDCHfr//ObTo1nFLaBI2BeqZuKroWMGfPBL4GR4e8RQ4D7eENXBPXHvr8EpaDR02QRtlKBKuBOzVxXatuxXQev2+91ikuP92/f47vmdnHuB/6bj7hmXZlnXbFsqyhjsELM9QJHhL4JY16rAJxithFXR4xq+ER9wKuMUsg1vskqJjETz4tw7zerHDNZZ/xy3nsfTW4R6/Ah4JPI8URRZfzDMUv3/bPeqn7uVPVm4Trn7e5SX/k791/v9UPt66p6Lv2dn++N/6aVsYv5QN0GGE3EWWe9si9Rm/rhvhm7LRct/FFEBCtVmoBCEBuUcvNQLUT9fIxXAO/xLOofPhHDYXTqFz0Dl4+h2HQwj/Dp1x63CKXADHosMpaiFcYpbCJX45XBOoLIkrb1m6RxLDl8JIkfB0f+bg/d8+eO9dNlmvp2y2jiKPVFxx76csd39W6/B3srEpwL0+948EXNyq7r4Bm4bdffLiF/XhTerQZ+71ff/ua8wCWdaiz200AvbvupaLRetMWkzXugTuscvhGUNLjVoNt/BlcA1dCOeQObAPmoiOAePRzncMWnsNRyvPYWjlNRQtPArRzK0ATZzyi46BaOo8CM1dB6OF61A0dxmCZs6F/J3fcR/J745Ge9+JsA+cDqfgWXANm8frzIdD9Dw4x9ETJFKREhfxHhfCO4X3wvt1T6AAKXA/ClT3LHdujm6M3103wLMLvU5XKkaRRdkEq/Uxa1b03l8JsbgF3+tzfylg2+L/1U/d+F8duuhffd92U/rM3efx77bJACJ9xq/7Fvh220qXRLfE17xM/LRZ52K4RX5Ji5xNAUxFe59xaOs1yhzN3YajmeswNHEecuto6lKIpm4UoPtQCnwEWnoMRwv3Yebv5m5D+fnB/OwgNHLMxxed88xP29HYaSCauRSgpfsQtPEcCefgCXAMngr70Fmwj7SE7Zm0zNyfVywVMJEeiEK+JQgKWILz6WZ5p7+zwOLvFzeG/+R7d3/Wdh67fy/g9RSWddx9Dl8KTYftdZvLNW636L3iP727bOZnNxnLNeDGuGG6R8ZRp0i62uAv4RAwHe28R6Ol52A0d8/nMchYpwTZ0n0sWntPQMfAaXChADxiFsE9zrJ6r8RltK519AT0EimrKYgVPJYzbi6BdwIFFTef35mFzmFT0D5gHFp5j6QiDOF5C9DYMQ8N7XPQrFN/tHAcRGGPRkf/yZCLd4ycDbfoL8215MqlpDarvO2lLNf9dwbwT2Twbz9jJwu616IXf82/62boc3ceG/i37bj7vdt/G1d713dvKQA1XJpuARUi4ATGUwrGnRbiHjPfxMh2fhPR2kNWOhSNnelqXfIohGFc5KlwjVlowFUA3WFg9/UI6rEBgT02mcO/x5Zbh2/X7dDh130bX9vOYys/vxUB3TcjgIoV0H3jrUPnCOhGcJWwBI5hs831W3iMRlMneodO+RT2ALSghbdhKGgfNAkOEXPgGDUPrrJqKqXNBduUWlZs81p3C+l+r/9bYd7re3bmIf/VcXtR7vX9QC7w7df12dvXsQSueCz0yfQkaTl85fLiCXCiZpiY2sZ7lHGpTV3oTulW2/mPhXP0XFrkUvM9nUMu3Qgslefj4du9CD0y9nnLg/Cant0YFxUbhQH4mndXKwzo8OuyxTq67TDCtw69b51LihKUynMQC7jFL0ZnKlVbD7p5h3xa9gA0pIU3ci008V/vuUbNhWfsYgvNJ6w2Vu0h71EUmoqHquLh6u8M7G6P+J8owD8S8J3C+s8Vwq8HXTMXrLgly2XKXUq4Xgm0gOiZRrCtvUYaa9XRznecsVQvulR/WmlAKq0u1RKEhOdLJfLpbglD1/Dja/rbvNbD+l2C9enBa/VgTCw67r6fW4CHyuCtg97AgKSiQ0IO7EVL78lzUSFdohegvf8UtHArRJPOOUbYAm9SSglarlsK4ZpAIJi0sghhW8p3K2zd8mp3rsufPeX9vePffVaK9Y8EXNyFyRJtJ/6nli8BFHdVvslr4cv0w5NuzY0I1T5kAlr7jEJTAqWWnmNMLHUloJICBPe0BOaXKmul1dHCJEjjgmm1ElaQBE83K6+gnzY3re+G995GBbCEa352YzrGQwpjlIZHaC+eo+d6GDTPz/j1oFvld3X4ptL70I0rlgodS3GC0ncipBddPuO7a/hMho2hBGiDDFhrTqF3DKC3iZzOFI54IMEKIyZnF2FiwyFG4Xm/9DZ/9m4KG382pL8T6L3et5N12o67T3r7PSuuWYIuduFudMM6il67l6XrNWtRLUSp3Nc7ke6L4MQlfK7JT1v6jkAzz+Fo6zvBvB5EgQb3VLwsEigXOiCN95lOwaZaQpIgbt0PF0lASosVRqGHyKKTVlCJliOoy2pa/Y6i2Ks4XOx+aa2BOrquQlDXNYzLa3nO9ea8UiLfbkVHihWvgyhsxXoJPLD7dsb8bUa5pBxOUXMMaq/fMYuCzkYrj8FE+xR0+BRDrhgCRbSpDV3rHglQ/ZlG/VND+Tefs7NZgS2OFf9p3B4Pm0UUVwbrd8uCfHsyJsqaGM+C+dDB0nI+tLGUXptpfVsNK+TNOOuTRPcVNROdAiehted45qcjjSv2iP2S51t1a5Eta9xsBO2buhj+BGC+kePxeZuedOfTEdCL1+yyx3xGVubXk2iV8TW470YCtOn4uJYXnnvlPXzQwBsBsdMQn7kPzlxUr26rECzgk7mNsXUhGrRLwOetuiJIipW2Ge78TEAKP9OViLsbwRmf0y+dFth1N9wVVuhJfHouMteS2xb6N/fJZ1bY6Rw+hwh/BOp27IcvHHPRIWA0EfokOJF08Y5bQ4Xjd0xoWmYs2K/LtiLvU9wVW55ISmZwRpE7/1cCDugpq7BAig79XfzQazawYWIRH9i4xKLP3VKCXtbrlqWv50+CKC6WSZeSN1GDVxmE7BpFZOo7Ck0ITtpSsAImegAJUm7P/Oy5wxxBRLr+XBAtRL2WUXi/Zl28/H47oucFCOixlha0lsKiV+mxhwuxBOHpvC9a7SsftMcDFZ9DxUpVYFe+LD6oa49QAbm03UYoET13I6j3AaZg4/Ho8+/h6Wr14R08F2F9D8GzNy2TyhlMdx3Yc7tZ6JDuFAgF6p1Gi83aQwGTgCG4E0sVSnSuLMNaF64dXb4QeKegqWjsMhifdcg2z6oUzDliphV6yIfruYS4tU42T3RbkBaALS7gfyNcfcfuboHe62/duLn5YsIPpEBvKQcfUIIOUByjC9UiWsrAh0ii1jNP9IpT2jGTKcdI48o6hkwxbJAE5U8XqgUrnsIE0z2HEFAFUYN9uAidQ8egTbseaNs0ErXqeqOt3yiE9N6PEFqZO1mkwN4bkNj3AJq3640S5SuhTn13BIVPwAtvvUchl4a9ax7CMg+aewtMoRtPPwbP6LGo/MyTePGlDxBGDtsv/RDsGX8VCgK60bVzkWWZwV2WGXes2OzTdRHCeu7nTwqUXkMKprgqIStcBaduR3gaFZVexYVgq4X3WHzWPpP4Ip8gbIQJSW5RCwzSVngQj3136LsdDq0U898K9x8L+K+UQBYe2munZeVpFHIa0wtaoY1qVOrjnTCbGj3WEAhtfEebdMePqUdw2g4E995lwIyEqOtIAAbkyDp7bTDnDM7Yj9CeW9GyfS9UrlgVDz1cGTVbxxuF0GL69tkJ7167+Jnt+OjzTrArY4e2zgPQM+8HuuAU/l0Cder5IlQWmE5ww5gb2ec4OnkNQoVKZfF+9QaIkTvscxCuUgDef3AREAvsuZPWvg8hXZejnUMmqtd0gZPPSHoBPivDhF8Gn5fKbuXd9CBFuETXCuG9+3VZSWQ9EfU75aCBQw4JmWFwDJ1i8ny32EUGO1iA7zbYsoXE24IvnpLe6/f7ZzZ2urm7jz8LlBZi0oTbVmxZMDUsdQNdqwU0gtOtmGxYKRIXfkxvPGJmooMfqULPIWjvNxY+iYvpSiVI5puK4xRyWG8rZptDSiJP0IsHheHbax0XmAoQPIYu91FUfeMDtPEZSsviebjAsiQvXt+PR0yfPXjzky/A/gA0c8xC9IDDtPSRePDhx1Dttdom7gVn7kJA+mrE5hxDkw69UaqsHT6p5YFwPVtfhoXevKeULYgoWhefHvQuWfvg4l2Ipx55HiVL2fEarRFBCw8m9vAUGOQamFDG300aZ8gdKqdAGT1aaPcdpDQX4AunLHzeqZfhyTsGTmF4ms/c/0sq3GoL0VPJbNimOO6xZTF3Cv6veQib1dsFpVE4xY57CVzgQ4dxb0UPXvw1uWUJxVgfkaGp5SavMvHVxFumEXLPepAQWqvSF5tyCByFEIgZBsnEbkuRAhVP02md6bSEjF1o3yEfFcpVxmcNfRGdcQRR/ffQ+tfTTVvKFZS6GnEZR/HWx21Rij0WTdunISb3MBmmaXjsqZdQ7dUPSKYsYZw9Au/UNQjN3IO6zeJQktZet1k3RGTvYYxdjSAJTrGVFiiBhfbdC4/uk1GdQn3qoSfw5LOV8XKNxohiWInpTZBH3GFcNy3eStmscGYJw3qm4O57jKfxS1mIpu4DUbdDH5NOSeFdSZPqvnxTVt5K82x4yDqHBWbvd1hp4e1M6O7fKWBLeP/pEZzOGGQTOi1Sv+thJETxvAJTSnuauRFFEln6ceHCKLBQWqwWxQJ0FFCGpfkCWDoE1IJ7Wl7FpEbMY4Mzd5AvnoKKT76ARx99DE2aB8LebzTzy7WIYU4aQYsMpzuPSD+KWk0iUYZNNo2aJCCx/2mW/uYZAT/3/IeMuQRSffYS9W9BeOZ+fFLPG6VK26F++z4Iz90Pv7T1CGf6FUqFEzIPTuO5M9ajbnMvPPrsi6jX0AfV3vgUtVv60Vvsh3/KPt7rqqL7tp7fCNQosU0w9FQ8p0BjGMGdKmTt/EdTyBmGeu3gP8EIWVmEjMLw+0XZi1mjIuD6V0L+q/fuELABR8WELSHaBHm3Auh1WZ4exp/aLiJCLI9/yhKCi8l8iFGMN+PgGM4Up9dKWsxmWhtRqYAT46UWTwINpRD9GV+DZaly9VxYLbDib2DqWrpwLhrjYEif3fi0QwJKP1YJ5Wl1lR58BE9UfQ+dPAcikgoQyvAQTITbLkCWXgnvftAKUXxdrqrKc2/ihWfrwI9xLyJLYWE7IhhX36rRDuWJstt4D0JwDgXcaxsiuQb+PZkicR3isgm6gkai8uPV8P5nvmjnlosHnn4CbTr35zX3wJfALojWacAVldSy3A1mTQwolctVJkAixQiKuXMoBa00rb0fU76O2UylcpgvE2GHzzBZhtbQkEIU8n+LgO8WoE2oxX9KuOZzik+0VglDFqaHCKFgjVslQe+foqL7LMMbt2Q5TymBIR768uEyaJFcEF+6wQAKVmAshNYX1HsF/HsvRAjzUrn6kEzF9r1UtL0U2kbGa7FJtAqCsdD0pawq5ePzhlF49Y2aRMd2qFy1Ost4I5HYezfCsrioXZbjpec+wkMVy6OzXwHaew9AuYcewAc1nYi4F/H8irMHmOeuxIuvNyBoqwRHvzwkZx2lq9/He+OzUWDR3fYhhiTJqx/VR6Uqz7OQsAANWvVE5ccegjcJjJg++wwK9k+zCJegXjss1ovPZTCESf34LKRJ/ZlWGW6AaZEIlRBiDoWhTkHTUa9tFho4ZqMD69Bu4Qvgy/KoZ5el8FIamM5zKgfmuhi+wSBquWTFfOuwKcK9eAy9ZncvgRYXevHfJVwdskQdilMmVvEGVARwj5lr8r3mrNE60zXKCiN4k0LAQQQkwQROstLwjI1014yxAlA9DyC09xHSkXJ1PD+tNawvz0llEEUpfBCeuouUIxUikwpAlx5Gq4+gdX/8hS/sKtqhQZtExFIBgnvvRDSRcGvnDDzyVFWUqfg4yj72AB6p8io6ktuOZxokSw/JYl7O2Fz1lbooSRf97Mvv4v1PPVhbzqeykXVL24/47P1oaZ+EEmXK4qnHX0CNev6oRoWoWu1t03gQwJRLim6hfSv+WqFHi77ehCJlCb7Mp21FEQnVrycVQJ4rg6GH+bWD32TUYmrXmPVo+wACLwrZS/w1n89T4MvwE5aAlRdbnIRivQVw7ydY2+t2Aik6bIIu/vs9rZlWHJxhfd6ALmqTD/NE9/gFaBswgXnfaDjFzDbpSETfnRQMhcPcUIJWbhvbd7+xyvD0/YyHRTG210EKfKdRFqUWAWkrCLAUn3fzWorLdPFSJp0rex8i+x1H90Gn0NQ+GXYP2KFhiyTEZDEn5jkiM2T9m9HKtQfeq94Ib7xfF+28shHF+43jexFptIysrcQJq/B5syS88M5nePyZV/Hw4++hVrMIBGatRuTAU/Q+E/DoUy/jYaZl71T/GJWffk3NsXjnw2b0SNvhQU8jIOjflQddehCFprTNpFgSfBHDFkgvpDzfkyjZL4NsGwGelNovaRfC6C2k9Eod63XKIqs3EJ38Z7KixsoaMxCvrlwHKpAMyAa45DWtGG8J+m6i6m6B3xKwTdD3+ilru6UIFK5x1SZfZedCygoKV7XbaYaic4qaxXjLOEqXHJpBofKBlQYFk0UKy9iD6GxqcfJixq5FiO67hyhVQmbcorYrHkfRuoSOA9KYX/P7hg2jcPxJLkjIYakr0MljBGp87oOHn3gOVZ9/k50e02j1u5jabGIMpfXwvDG0kCii0xACsagsKiHBkjjuqJ67TFqlZ4jSonMh3SPnwpFgxyN6IUKz5JXWMN91RdkKT6CVQzLi+m9E/SbxKGdXDrU/9URUP9KnxguJ6bKyB/HdQT3oRZQqKX2kNxJIFLqOyOSz9CH5QQU1FkjAKXzgw5KlBzkEAcQ2viNRp12GKZF2DpltKla+XFs/Uqv3ErDNim2o/X4/7eQqdNgEeK+/i1u3SUsMeqarYXxRbukcPs20xTgET6GbXWssU98J703KUXlhz2VMQyhAAi2vpCl4vY4DnqteC25hYxDf+6iJi8G9N1LguwwjZO6HBIIEHs6Fk0v1YBoUmX0AYYyxr77THGUfqIwXX24IV3ZghDPGR2TyoEVosQzZQgWLIgES1fsgLe4IPPuQcuS9R/XaD3fiB1mTlCCcsTcs+wTimOuGMfYrBsf23QBn3yFo1TmduGIFIvJ+Qf3WPVFW+XXTGCQN2EcBEj/QJYdkktKUJdM7yQtpXZT6yQ0Hp+40sTqMXSNtPPItnp3PE6x0rBetk9fy4r1EMrRImI1dmEJ1TGeTwUjTmuQRo/RpRRE/b6VDFhchy7Xc9D8ScFimFRN0FP/99muWBdsUQScXwvUju6OWF9VBhQqDGUcj6LpEeOg8iqlRdM0RfTYw7jJu0pI7evcjOKoAu1KMbc+9jbb2GYjNohanKc7uMsqjWCoPEEXgFUXgE8mFCsumpWQTtfZehY6+A9DeZQD8ohYT6e4x9xbJ74Wn7yXo2Q6fdBIgtNiQbKJvlf1IafpQSYJ6r+E90Kr68DVale5RRIp3+kpefznCWFI0ZULii/DMvYihwoX3oWL224MmDonkrF9ER49ckiQHEMTc3AAyCZdAS8BJ1KW8lyw3qOceJGYx9BB41qnpjIeefB2NnHvRix2lcI6y6GF5wbAMKggFJ28gT1i/cx+yXhkGdDmFsNzIurJFhBQxXUUCtoGsuynku0kquzBq/r0Oy8Xywnw/vI9l4QYY0DIVF0TBecYtYFVoApmlsXR1SwlwBL6oDIxRYWKFqGGykkh+X2lRQr9D8I0ex3j2Bl5/pSY+/OQzlHqoCt75zBPh3ZYhqT/dOK3HT5iAjJNcUyQtJbobXXmv3SQiaM3Zu+kNNvFaPG+/3RTkWgP4RJQEMWcO7MtCAj1FgMJC+h6CMb7Xh5wxBaq0TPXhgIxVPBeFQeStRQ7twzWgsMIMLboVPvxdYSEgnd6IMVmKKs/hETnRcM+qjvkJECr/J3q2cIvSKwKuDObQBJURzLfDus3H2zVInZYuh2de+gSBcWPNM4b3oYIIfMqo1Dqk3J9xW0ag3rB6LFA07ZzPuvJEQ+uq+mRKrSrLqjiktKvIig1Sv6tAVPzvWwIuLtDiAjfCpVXKsmwAzAiYsUu5W0u3YWSLvkQUka/OESxhZlG7ucA6TyQXTPFHrFQEFz8xcy3aduyBx6jRHR0TUb9VNJHw46j6Tm3GnhGIy2W6Qnfu34ffV1zleSKYC4fRpWrxlasal04F8KeAfOmeg/lZ3WNolkVrCnlHEJyFUTkEroxguQhy96YYIKvMYJqTSmUh6FK8D0o/DP9MUaSyZqZkXEQBFqVrUoLwtIN8xmPmmSRweQtLMMQMvfYaBRZmkODD+x9k7FyBN2s7oETFsni9ZjsEhk9FQNgo1GnhhTrt4y0gqevSQxl2sCg7CWPaae87CfXaZZrGQjX3qXFQRQmTJtE76Hs6ijOL92Ig9ZqdUhJp8F8dWrwQLqJiqNyQyHrniLmGyFBLjW/PFYjMoTuk24okfRdFZYihqwpmWhPA3DS4LxkiEgOBvdchioSCctBnX6mDl9+shyQi5C/ahBuO90kSCl90SDKKIlcfRmEFcEH9+qw13zfEAl20d1/LvSql0WcDBXioCJESLBVAAvYXL87XZc0CcUH8XXFevwfwp0CWLD+cgonkM4ll8qDXcScgkzJGkoyJJhjz4f179mHM5HlEwGjRfOih/OlpQuQFVGihkoQzVxe3HjvgCEuBC/BWnbYoV6o0XnrsQzRqHoD3azij0pOvoVSpEnjuxY/gHTXZEDQyGp9erD9zjXyYPwtn+HJ9GzrlmCpUe58JcGDXiA89pjhuYRpVqsSICXSqyPGXTJYs9F7HHW6bSqDPiPNVUd4nZTF7kuia/ScaVx3LmwpKX0eWiDGTjFMMF0BxV4siC/Pga+J+w/vy76w1iM07BPeAAajwwMNoWM8ddRtF48EKVfHYw+VR/oESeP2j1nRvaxHXZxdiM+lyGU+j03kOam+0QgXPlUirkVtVISCAiqW4rVQsiq5O8TiSAo4m2IrlwqtOHEVhxXIx4kgURDOnFGNlUjI+k2Kp8Ti0CnkMk+czhsrCffm7hB/DhVU+LpcsVy4L8pU3EPBhHFcMjSCgCo6bQQTeghWssiatKvtgGTzyeFU8+eI7eO395mjaojs6u00zbtev12paJTlwtg3b+sID2ADoz2KH2pk+bd0bddv3NghbPdnqDDEjO+zeVBXKM7Fohop92erNvtdhZwl3hzlkFbbD5rL1U+9J01TiE7BSv5F6qJxZDYni4gopSvgWQON5uKACTNFZxxkvD1Hb+eDd6W5FxFPwAVmHzWJ+WLs1NboMOeYX0ZTo0cmnEG+/1xqvVm/Geulc4wFMIcIQ+BQsXVScuiFVbFdTHeOunxoD2KoTzAJHCHlc5Yd+tH7P/tvgmrMDjvQszgMOmMOJ3sOp/z649t8Lr2yWKQniFMvC2Y8dQEUNSWQlrMsOFvdJTpjeaZYVOcim7khNLgSzccE/nqlhHOlEjrHoNe+ELXDj6+r+cCTl+PZrn9EblcNLb9THh++1RcmKT6DK6++jNWvgbnErTW7rwfvtnLDODMH5xFBREuk5YojcI5cxBxZw5XPFb0LjzoPxUeMYtgD1JZAdwyxlDrn1xebwStzAVIpNFGwFco/jIF3R4RbL4bpiB/uii/c3W7/bGtpvNbbTmsxAVvwyVoWmGzjfynu40cKAbgQk7Oo3rTNqZWULig8XyoXdCw06ZJKpGW11PaQw/jEF8mU3g2fyTrj3OAJ7plUVKz2CSpUqcdFmIaDPGXTkXJF94GgKmJOAVCgntvro5p3Vx8WivA9HVzpzHskpnm0z4m7ZTCABu9OSWlGpavc7infyvsLLg37GCwN/x4t551Gl8Fs8Vfg9nhjyIyoP/c78/fLAr/BBv1OonXkcbegRXNWfHctCSRxDUCwFEbMcHSlE5/gtHFfZxmIHn5/Uqzu7NezZV+bE9zzjV8M5djN/38U+s634uI6fqWS99O4X8IsYixofNke5R6uy7Ted1n+KCnEaTmw9ciNgU7elmXzk8zhG8Pf4zVQkCp0dKWYSMoqtvryHOm17ok7rFNPB2d53MrtQ5sEpdimZwvVcD6aPceqUuS3gu3+3u/3Can7w3oem8DqHcUCLg1waE/m8Qz/WMyeZbg232HXUqM3UxnVsE11C7WPaEb0RTR26w65CBbJE1dCyY0+2qSwhk7WffOsmgrL1XFAi3qTNqP95GMqXLI2PvnCFC7sOPYkK/ZJJhsRsJa+9yQhWn9fYpx7ckS7KhR2KAfGyup1oQ4/xcc4pvJ37NaoM+hEVBv8OuyEXio4/YFfIY/hvsBt2jq+d5998j0fJIX+gzJDfUWHo76g09AJe7v8TPsg8hMb0Fm605oCkhfChIrWL20VrW2Ma2115L27JW4y1uUVt4nPzHmOogOzF8mI/dHMSFR/Xc4FD6GS4sbPysUcexpPVPiK/vBiBMWxKCCWgi6ObjdYUJM/F9XNJ3s7zriH7twVOcZvhyElHj2QO1fEaUraW7qPxcZNYNGQznyYrHEJmkkxij3akRmZIuVIZ/0bA6/kB23G3JlgCl+93Dp9nBrMadsoj2zKCi7/QNHe7xVObeTjHbuVBzadW+sZthIPXGLz6Xj2Ur1QGFR4si/dqtKY1TzQuUA1sDtRalea8A5fhuTdr4Z06beDNorhu1jWagEUzvRSqKwWq83pyIf1iN1LA69CZbrpR2lF82O8HPFPwFeyGUoBDKUAJbzCPQRRkwY987WvYjeD7Q75HycE/otzAn3j8glIDf+b7P/F1HiN/5c9rPG7w+BWVB57BqwOPolW/9UjsNhNxXachlBMUntG05hhSlHxWPwpTAnWL5npFcNyGhQhvhivfBLUHr+Vk4lK89JZAVkk0YF06uNt+eEVTMTjH5EFlcE8gCExiuZGDa/4MD6oF+6XsZq8ZlYnCl3V7UHgesVRsrn2t1t1Rs1kXtHYdZPJjY2zR9AQ8n855P8PU68UsuLgfX2W+bDtcI5bCMWSWGcj6wiEXnQNnmDjkGkMB03KdNPkXvwOusds4amkNV/sl7aGrW466LcNRpcrL3GehLB5//i181ioc/gQEQcl7jMvXOdpQ49sFjDANc35JvOHE9RwHWQ0HxprO7J+W5XjRJQXQanRue8b9ZwZ9R6u8bIRbUsIq/IUCoqALKWgKuHT+eZTL/8McElwJHYW/03JlybRyfW7wOZQezM8M/pmvf4cyhd+gDH+3G3ENj444h4aDWW4cNAs5WUMQn1QI35BRjJGcl+rKJoBkDslFU/lo4fIuvlLMBAqFnaVOEZPx+Ivv4fGnqzFczaGw9hiBuHL01IkKLq/UyWc4atcLwjsftEX1ej4kgPj8Gk3VZxiL5bW86eHUu9WC3TA1miWjMWvI7TmH5RDEITyOucqzSgn+RsB/dssCAzpcY1eYwzFkIdtuJlG4A9CSnYIqa/nQSj0TGGtpxS7m8yQCYncaV9OZBX+5Ute4PeR/97EcNxSvf9zZMFgPPFAOH9doCffwsYzdtIg4xjjm1VowN1quLFVxyT2a6Jt9xC50xc7aiiGKvdARm+giV8GF4OjZ/G8pyMsoz1hbmhYpC7Ub+gOF/h1KDvsepYZSUEWCLFFwDiUGUcAFVAYphFGK31A2/1c8kHcOpeja7Ybo83LpFHru97RwKsvoC3iN53EcugN9BhciKz2BFpuF9hwvDYxagRAqozNbbJ1obZ7yYIyvXnEEgWGrOMPUDS06pCJQU4d8Bil7JGNsS05AVPugASpWfhilS5ckCWKHUhUfRJWXP4e9ZwHDFr1gPIVGb+WZQAvmOcXv12ndFbWbJKKd8ygWJObCPny2wQPuMRxh/dsYzJNZyEuojAvIwK3DLWYlm9OXoLP/QsaCAtSz7012ZTpd6RaCDgqFVqybcSL48Yqj640kuuR5XKM5GchY4kvr9o5isaDrTvPgDTuks4vxFdMz9eGnHeAdQ/BEIXcgWPLmtQN4Pd2HA8FDCM/lkUhAQxDVmfPBLoxXHrHb4cKY78wOzdbZx1A5n1Zb8DPK5/1YJKSfaKk/4wFaYem8b1BqMN0vLdmugD91DKbQih+213kOOyqAXQEt23yOAi+kV9BnC/5A6cLf0HTSaeSPG4v83t0Q4B+LDh6p6MgihQcLGB1I0XqE7TBK7sOJSJ8o9ol13w/v+G1cQxoJ1yE8eQdqs4796JNVTPpU6alqzJU7o7lDP9Rp6Y2ybGL4qGYnCpWWTgwjly7P4Gzajdea8ddPmkWjAbON9j4z0Cl4HteCVhwlN611k8e1EHRxiy5y0etvvaGTujIVcCVC1M25hC1EJ99ZZqqvgUMWYzG7JHnjAlMmwCs2xvBvxihXNtS5sv9YmqzJeAEwVwpNN+mdzFw1hYDCN5954VMoXeFpOPux4T2eMZW1ZO9YIvhoxjD+lNt24biHuVHGJXui2ADeuBCjRjUDNBHBUuLTir0EUaWGfYuyhaCQLxsB2xXQdRdcpTXLUqUE9xCuTdDmPX2nSMB6XcItJmC7QVKMS2g87kcMm7MCwwb1QbCXL5q38UZ7tuP6JhFwMV3SunnEylUvM67VPZqN9Jr+pxV/0TQWD1Z8GBUffYikhwPakt5Vn3Zk/6/g6J7H5r+H8NJ7zeDInm9vrpNcr7CPDEZxX+CqVssUg6gFvNoHzjS7Emh9JSdjnLcsmcZBOd4Rg20f0IIblMubNfGGyFmT742cBpgpPwEfL0J6IVqdWC5C8cWdQMGT1J5X98OcqGOc4QMqhXDmZ51Jliu1UVz2DpvAvPcpWvJL8AodTzS8mxZJzWNa4BFpjZsolXJk24rctV534Wd8CGg8CC7k8jqyrvt64VcoR5BUdhCtbuhXdL/Xaa0XUHq4QJNQ9EUKiS5bx92We/ffit/mNcVlCfgXlBj8C90+Y/bg8ygxjNfI5ZEP1Bz3C0YsXofpEwbBy80VtWs1RYvOaUaIrvFE1QSBDqRu5QmFtD1Z8O8UMAqPPv4cnqLVNmeLjjxaaO/jzKE3Mf/PQdVn3kW5Bx9Hg7bdjHA9mVY6Mr9VeAykt1Q65EN5NOiUjRrNY9GIA29tfSZzpouzzfKWkgONQbKzDmuzmWICtsVhAa31xg1K4Nq7QtsZqGlbDWKdCLR8mCbIMq3NS1Rw4IMxB+xEAFK7RTj7lQhGlLzTYn1TKOyE7ehE4OXAeOGTSPTMaYZXPmiEeq1CCZxYLaHrdudDeMXupWJthCvLY3I7yvPMVg1kbJx4HX95CipVh/QDqFJAoY2WAH4kKLrK+EqBDr2IkoW/0pJ/pLB/4Gs/m7hrx9z3bwV8D4FLwKUoYB3lCr5GxcE8pxB6/wv4ZPRvGLLmEGZMGAon9854tcb7pilf2094pghormfYYZoTz8oWQ0sDh3SUqVAKtes4MXM4SgNYzzbifnjvo46oWK40StE9f1i7LQsxSynIPeZ5HWkwjjyPsIcLvZpv0ja09R5PNx2Deu27G6PrGDSfVszNZu4S8G0XvdaGov8sYJm+U9h8A64asITV1G2waVXxoityZuwUghNVJvfhG7kBDVrEsUWmNB6u/Cjeqt4KNRuHog0n8P2iF1HYmuaT0E/SK9AiOQOsWqe4VSfFEeaYyqWdqBjOZI4cia59eNNy9SYPZpoSypDQqv8hPDOEsTX/J5QnIi6XR9fKGFsqh1Y36BzKMlUqP5AAaRBdLN106YIrlov+Owu2vS9LZrzV5wXIJNwydN1ldD6Cr7L8/cGBTL1yL6POxIv4ctM2TB4/DM3bN8Trr76Bxk7ZzA7YrUFc4cC18Y4l85WkqYxZeOqZ5/FMlWdR4zN3vP5efTzwyCPMLMqZ1qLGzePhETGN04ocWyU7ZXYI4sYzLmSr1Igng/NkWFQ2U7tVN9RqFct9RgqIh2aTp15QtKvQnS7aEvI9BcwT02W6kEURsdGOWlPfvi8LC2PI1iju0spMjNZIJC2elhXAG3EMmoOazaNQ7f2mqPzsG3jw8Ufw1PNv4P2PHNC6QyJcA4cb8OXOST1PUo2ORNsKBQYJssPDhecUQPCkYimd8OV7nZUy0ZrDEregXc+DeEaxkoRF6ULGV7rLMgN+Rp1xh9Bs2n5ULFQcvWrSnFLDFFeVCkm4fxF/iwveCNcmYKJuIm+bgO2UO4swodsvI0umctnlnofj1K+wceNOjB1aiFr1a+GZVz+HAzeA0WiswKeexUObyjDdadwqHo89zcb5cswkGG+fe/YVfFjHEW04MusRTaqy6y7LUzEzUfqlWC5c4kMsojRRHs2X9KUymRrNItHInmjeZxrsuVGMKy1f3lQCtYFlW8i9Iw+2+W0DjKKXsdarcuAo+vxc5l7MfSlgV1qvXJB4VPN5Je9J2ynsnabnyjNiPto6ZKPW5y547c3PUOmxZ1G2XEU8wwrKO585sCmv0GKl+B0nAjPFDDe6acVab4Ir9wi10JA4CaKrpkIo/jhlHsFLtFC7IVdgN5DWRZdcjqRGy8mnsXDzXizeuwefTf7GWK1iZsnBSnPOUGB8TezVvZBzsddkrXLJ9xQwFaY8U6XSg/i+Ui9dXwJmnH+CShD95SmsX7sBXXr0wltvVyeAakgBTTVhR9s9OVFAoiD9aDStPIaw96o7JyrSCDCpCOxjC03eS7JoExyStsKBwFbZhiuf34sC9okiSCPGcWE2IaPzYbhr5zWRvWN00217mOnMjvQOwkqK1zartYR7hwUrWbZ2gtMbJveNXMQujalo4jiU+1Mw9yUPKwE7k6+1LJgHFUHN5+rtrV7XFx/Vao9PPnVCTfYQV//UCx9+5oHHqjEtKlGaR3nOAT2MVu3iEUlKzoc5r4H2dEU6l1foMkN0BLIYnzpgK7r1XYLUDHLN2evwfOFBs7BKWcRKPTToLLymHMb6Xftwbt8BfLeJxMPk3YyTP6FCPlmpXAnjV5QqoPvOK5Ya3UqL7kyblBNbAi4iTAi2SvBaxoLlNYjWS49gLC/4noDrAh7IZ+wfqJz5Il6c8AOmLV6DWRPYS+XYBK+/8RY6EBU7s0rkzDzWrYgnEDD16brHeC9PVos8uh8gNmF/GCtJfuT53enWte2Scn9XhjQbH+3GPmlHdnrIiuWmXUIW4DM2GdZtmUw3PRIdiK6duTfYbQEX5zXoomVBQmKGIqTA9NOFOajqvW3Itnxhz32lnMYbWlKpi1yztEmASGOQPtwF5+U3NQ/EpJ35XakSJfFc1Vfxztt12Yr6Bd5lsVs9WHJHNZtEkASgotDdCFWrc9BJbFYcaU9aajt2WjYYdRJZi7bj0OZ1WLx2Jz4ef5YLe4ELKoT7O8oOOI+YGUexc+dGHNm7Gpu37MTCGdOQnjcML7FsKdbKbtgvtDgpBH8nPSnLLENh2w37CSWZO5fLowUyhdJ5hZQr5DGtypcHIHqWEikvHn4FJUbeIMNFTzD8Wwr2hon9JQf9we9cMMxYhUE/oN6wLeiVPw5p3VPgEhyG1i49jbI60zU7xs0h37zdbOcgbtlspEalduA62yeyQsZ47cJJR3uO+DiHsZDADg6XMAqXnIKqVOK8PVk7d6OlC0hp1yBPgq7P2vZBjRZdTMzv4D+GkyPaKchKS21chuWuudGsSYsUK4p+yoc7RxDocIeZVl6FFHA+XcEEo1EuYljETfMmJWSlTN7Unhat0k3xXvlthYcex8uv1EDNOp3QtG08nBW7mTKF9KCVpeyEA4GatFIcs4gUVal8I+iKWEh/acBJlM29iA/HnEPMsuPwn38Gj2nRB15D2eHfo0zO7/Cb8S3Wbt+Jg0f2YuuWXZg/awr65WUjOjQU7yaMJ4tFYTFWlhpioWAJuaTcex4RsADZUFoiaUg7VpceGPaVcel2AxVXv8XT48/jDaLz18hhVy4gFZqrzxKsDb1CIHeT3/8WpYYrNTuPl0acgvuIZRiQlgcfXwfUqteSvWJDSTeyyZ/5rypBrmT0JFirpKeiCVE2w5JmjbX/R2duCVWzeQTe4sxz1Rc+xJNPv4JX3miJTxsnUcALDOjqyO2hnEI4NB9J6yUA8yZV28ixHwsQiean5pscGIeNgJlKmlhcRI4YAVvJsZVDSdAGPYcvN4m1WkZUXNAknCe3HHSla1XwF8FhmC7GYdGKAdRWPz5EZ2pTjfoxqPJSPZR99CmU4VTfY8++irdZ323pkkN3rnSJPb+kJhXL3ViKU4zRTTv0OYLKhYyxTHskiJJc9LJ0tWULz6JELtMiCujj4V9j5dbN+OngHmzftR/zlyzAiMFDkJjaBd6ObdgK447ymaetWM10qYyYKXHPBEaqHpUYSGEOpUUPpfs11yDdSbryCVqkw4zf0G/REeROZlxM64/3O/rjSbYWfcDWnkcp2Aq5TMfonksM/QYP0ZLDx57AhunTkJOZiBZtWuOtajUMPenDapRyfxFBwaQv3SLoMrXgXB9nslN+5Oz9WS1q7JCGp595i56vLMqXfdBMQD7yOMdyKpQxPVwf1HeDe+gIvFK9Nfu/8wi+9sKdhIrGWtqyVPtxgzjOVKWbblZ7dmCqluwWTeMrJmClvHcKWNxzkYA1oS72ShbcmcyRB+G+8jGVsLyK4rAb676K2x1ZWVGpSxuZBbIILt61M3fLqdUwBE+/9hoe5XjIMy99Dh/tmMOHd2H6YKoz8gJ0zUqjarE5QClKCVpWOYKYMqruDL5ON3naVH8epIvOWX8SZ/Zuw+7tW7B40SoMGTUCGRkcHAuNQIdOTVDv3TfxBKcq7EYxJx7OtMaQILJWKguRtaxa4Kg042fZfBIjdPefjfsGUzaexrad67B85hD0SklCvXp18dLzHHJr5MpKEmlC0qIv5tGiC8mUUXHsBn8D+4knsGnRIgwfmY+E6FA0b9QA7zdta+2dGbeXWIW16wh6PCqwFFvMoCpuwcm72Wvdh432L6FE6Qfx3MsfoE7DUO7W04819oHccC0FL772MYVcCQ2a+aLKmzXQuGMilWKtCWuqNGn7xk8bxaNWi8SiduVZLHAQSd8l4GIWbFWSTIFBAuaHOwRMNuxVE8cCg6jd6C5UtlMVSQhP1qfqiXJhg6pjuYcFf4pK1E/FVNVrvVPmcB/I/hzP6Em6kX2+LPYr3zX8qfa8EqnBVpjnaWXlR9LCVMIbxBKfiAoVB1gMsKOg2k08iV3H9+L4lh2Yu2wpJk0cjz7ZgxCTHINgz0AOh7dGrVeqoSrTNDv2Q9uNoMUaokNWzPSJKLisYqsYLhUS6L7fm/QTZqw7gEMbF2La2BHokZwGd2cnVH//RdSo25oFFbpGPktIyl60ZSPeYwN5Pp5XMf2JEd8jdf5GzJtWiH4ZSXDz6oi6n9c3DXPusjbWgMWfK430IlfvqvViuiS27u3qLTj0ZkfBerD0OION8Gz4S93DOvROcgMH4RIwDI8w+/iIHS+12ZT4ft0gs4OfGxvmnVUTD1pMoigJn7WMNfuI2QfPMDUDm4AV9m7F4DtaPYoqSI78cDv2OTfkbjHasFO+X4S5tFLxVBSiqwoOrJLoZM4kM0xHAmG8rFOWrLKeR8JuCn4fuy2oCIw5Zltf0Wisvrgw11MPkTfToo79DlhoddglAhqW+YZ+a0gMkQyq0z465FuMX3YA+/etxMbFMzF54iQUFPRHWlo2wmPC4Ofjjw6tHPDpxx/hhapP4nH/kYzZVvxVHC45jMiaFSNdQx7Cjh7h8cIzSF69F7s3LcacKSPRK70HgiKT2adtjw8+/QAtO3dlvxVBEIv6LgSGsQwt9fvSm4ywGgYeGXgD9pNPYNqMQmRm9EOIPwFW/dpo3DLCkDVqXpBAxav70CiMUnNHHZeIRXj+xU/w8CPlKKgxbEU6ylRqt2GkxD24swLnQfLn/QYeqNsigdUlcu8q+jDGKuUSUyagVa9NEj5pEs3NVIeTCp1iagTCNIZh1A65NpB1LwF3Dltkep1VXGjlPtwkz64sZotRkQV7sCgtdy3QoJ1j1FlgujAE9SloX2qrqDWlUCLNXSNZ1I6ziuWm9YXWrdzXOdwi4t8fdJRg51uUIZdcPp8pCoVQ0liyVQ1qOvVr7Nm8BWvWfon5Uydj1NCB6NsnHd26prPqFEyy3hltmrRH7dq18e7L1VDPJx8vjBBSZiWIAKukKR2KY7ZozFL0Ci3HHMPslcswc9p4ZPfvh/TUHggN9EPD5g3wUaOW5HrJwvGZ1F3hGj8PEVHcYpi5/rMDVZak4rCw8cmoHzF1+mJMGzIEMQk92R3aBPUbOBBksQKnAgHdu3qn/Bk7nUm7mr2y2BDxXk1HuuhX0JIASqmP4QC4jgGkZQ0nTzykHXs8xUOTWArgdTuHs/DD9ReTqCykQYce+LhRAjtncgzbKCBmVfEsASv1vOWidULLRS83eyXbM9cScyUGS7utqorjRljvwjgr5Kwqh2KK6W5gkq5UqR1narRhZ2tPDlG5ZqEj3YZKhl7krn1Y/pJr6pxMV5/CKUSyV6oji2eVRlYb/oOJu3YFwAN0zXas59oxhtrlX8EjTEXiFxzDlhWrMOvLaRg9ejr6D8lHn7QsJCbEsdc4DE6ejmjeuh0+fY9Tgu/WgEdoAT4WszXsIuOtCg+sDw9izBWNyThqN/AywmfuwdqZMzBi0Fhk9mT4CPThPh4N0YCtQ26+w4xbNW1ItEAnCtozioNltMgP88+gLMOJOkKeHPkdcmZsxryxhRxf7Y32nb7A541bwiWUmIXslFIgPyq4SqvaDM2Pz6w+rjZcnxoNA80Epg/xSyCNxZ2sXSdWktxZoFFzg2rsVtGG3lMbl5Mj8E5iWZdI2Y819Cads/BRwxTun5lqujwcg5kqsWGvuIANyDJ5MLVHjJQoL2d+qHPwArThhikN7DPRmlv22apLQtuKuYrTKnD7M5Fv65eNV16vjYcefRwl7cqgPHPhCmVK4mlC/vdrOZjczvCqfDh1Z8h1OxOoKTH35o07cQqxSsE37KpQd8ZlulRSjezWkEUrdj465CzGLF2C5YsXYM7E6SgYPhR98/sjNT2NXRbhCPQPIrHgjo4NW6D6a9Xw0aefw5euz4EzTy+RmCirbo+hZ6g4jJ1Mbx5hmvQ223h6TVqNWeP60QtkwSvQE5/Xq40P3m2EziQPvLvshT0V00G7A6lsKUImmqVONhvUZ4NeufzvWG++iAokRqIm7sHSyUOQ3qcv3F2aod7nX5A+pLtMPkSXyphqWpCES/jcnP11okBVhAhIIGdNA/EhB+DDFh8JVjSuWDxZucKYE3NiR27G1imFI6U0PP9IekNatYiQxi7ZFHAIGrbrZ0qPDqwPS3bCSRaLJVxUlAcXF7DaRdQS0ppdfBJwm4CphuQwoEg9SIYQ4QhmN7ajcvD6idc/YJfGE3j8qdfw1LMf4oXXP0aVF8lFP/I07Mo9gJfffpeU20yEs7riwUYxlb3UvSHFUq7YhuMblZjjlsulAOg6S9P9qeRnhMyOyPdGncWcFRuwdsFyzBszC0MKRiC7Xy6pwVR2VIRyq+EAdHZwReMmLfDaa8/jrZrN0J7bF2mXOrfuK9Go/2E8lc8cmt6gxOCLcJx2GmNnrsDoYWOQ1L0rQgK4HYRDG9T+rCYatfBkTk5KljhCrlENCb7hLABQwJ4UkmLrZ9wfpJxoUJ7Lbuh1eE44hqXTZyEzdyi8/VxRt35jdKI381NLKy3Sk601psWVQpS7F+6QG/aKJwDtQozCDWs82ImqEKZ2HW8KubP5PyT2IjqJm7fxHuy1CTmNSiVT4R5tG6ViQ40vItlEwb5p01JrCVjp698K2D5wPudrB98SsGKp2fg6Rvs6sbJBdsaTHY8fNQhk4f5J1G8RBi+2yWobe11cbZ0OgRO5B4YPSj/yID5qEcqGcMUPVkS4UI5Fhf1IuugO3CKp3LDTxsJKq44rulCsUwEBF4VSb8JZzF+5Gku+nIsZ4ydgOC04r19fpKckIz6G/V1+wXDp0BH1636KqlUrodqHrZi2reb2hFy0WI6FcpbokxxWgQZdwoejDqH/tFmYPSIHOX26IiIuCpEhFHCnDmwK/JSUbBR7r1ex3Mmx1Th2oSQzPrLnWQDTx/Q/ceg8Qz1bTJeohCWIExpP/h6Ll8xHZl4+XN08UPvzeiyu+NMTsIeqYxg6s3/cl0Iz/D7Xz53FBJ/EhRTIBFPT7RDMjeHCZpHQmISOjKXCKA6srrULnAwPbs4q96yqmq6tw5GewJOuv7XrKNT8Qrlw9/sK+J4uWhZcXMBtuTGoQJQEIwG7q5TXZRcR4FJOxtdD1cefR3u3XnDTbuhkVDqEc+t7tdwwR/YOmITKVd7hkHU9BEQQxrObUDmhM9ke8bSi7ZqxCb4867gl8klwsAFOpP4DeVfZNEeyIv9nuM0+gvUbVmH5gpmYMHkM8kYOR0Z2DlJSuiIsKhKuXgHkt9ui9icfsMntKbzyPpvmuTVCoJQpgrkoEXAtzu0+y3Jf12nbMG/6WOQOKkRKViZSEhLh5xmATvz+e582QmPXTDOzq+ZBZQ4upBhdOFSnGBog8MhJh49ymQ+PFP35I+P7D2g05isq3xyjdAlh8QgKCkFsZBg8fHy5O19z8gEFpndbXTAuMcqPWRZlo8OrDAcPVnqMQ+aPodLTz7AhoAqe5FYRz9ATPvPCS2zpeQHPPv8JGjkMtLYm5po60wuqhVc74rd1Hc04Ho+6bZL/uYAFniTgTgHzyDwVGAuWgFWgVi7syY4FBX+Vv1y592LVl99BGfZXPVrpaVR+9AU89NgjePSJx/EsS2HPVHkdr1WriQoVKqLay7XhS2Qu1yxiXYDNnu7IhbGmDXerqTz6JzxM11yRrTelyfsajrjwEgmObxE2g5Tk5mVYsmAaxkwcjZyhI0lu5KJrUiJCQv3h6NQRTZs3w6c1PyFF+gJeeYudmw0d0aBxNN1lEBrWbY9XXJLxxoCdKJi5BUsmjcbAgQXompGJqIhYuLu50L3XwDvvf8CtklpyjMYLDZu58yD9+HkH5qwdUKMmq2AdeqIZ07+q7KO2U9eIujWZn38+4iBmzpqEIfQK/QqHY8DY8Rg3NBeJiYlo6eDIwfJxhtWSgIx7VRM9220erfwaGSw7VHn6RTzE0ZYHH3wIJfn/clV+qAIqVX6Efz+BUiUroH7bRAt9U2FdCK4cGSK1BWIbZjeffBGLuq27/XsBa05VApZbUZFB/wGF2bpePcucQKjZwJfaVhuVn3qXmvgqnqxaBU889TgqV34cj1Ti/hgPP4rypN/e+szb+h9MGG886b7dw5gCkMnyVRsPhd6RJIJbr31w4pzR6wVHTc5qGCcCJN+pR7Fm6VosnD4Xk8aOxOD8PGQxpemWHMEcmF0hgV7wcHGFZ0dXuNu3QyeHZuhk35lu1wkOji3RzrE+PnXxQMtBSzB6AYHVZBITAzKQkhiDMF8/uHt2ZBWoHeMwv0tX3b5DJ7Tv2IFK0wh1Pq9J0uMtNHz3WdRqE4RnOedkN5bp1sgfUJFFjDIsWz425DI+GnkA7448hFeHnkLrCQcxeuo0dOmagA6dXdjsTp6YgjEcP12v5pC8ImbjkSefxYtvvg/3QPIA4UvxSV0vlH3oBTa4d0On8Emo0yyW/eQPkSoOteaRVHyg9Qs46X+qaeleyHQumoPpqXcI2AaylOH8rYuWgAWyDOigm9CXxT8bNosuzIMkhRtZL8+YL9nlp/+tZKqJvfZspnPwH4+WXnlE4dwmKJhuvqiHS4L2YQ6s5jrN2GhMxIMF/QAWOEKJ0BsWnGBBn5Qi3d8DTGv8pp/BktUbsWD+QkyfOgzjRuRiRE5vFGZ3QUH/bAzNykP+gCwMzuqHkYMGYNjAvny/P4ZnZ2NYfiYG5fVCVk4eeo9dhEnTJ2PiqH60tDx+P9t8bmBuXwztn4fB/bIxaEA/5PXPobsdyDSsLytESeiW5I/ALjF4LWslyrAtqIRhyH42LbdWQ98FUyApPZj//13eDdQcydx42gx0SQ6DvXuA4QxEyao5QjvuuicRnQeNQ8Wnn8TTrB/r2f3TT+HzliEoSWDawjOHw3bbmf6kc6egyqQkYw1NrBZaUcReNAw/hj912LzfmCCrba9bKFreVzKyerL+AwEHEfF68/8RMuwUXY0QnUCXR9IONnJzEIyJvDTTkxuDCep7d+WmIzHc9Es3T+tXMq8hKz+WvOxZ7xRvLearE6fftTOrXLZqmv4UeBNusFIhn2VB1WQ5W9R09Blkz1uDjEnLkMZCQNqUdciYugVps9agx/TN6D1pA3pP2Yi46auQMIuF96mrkTJ9CVKmbkC3KXvRdfoWJI/jYPZIDtaN4mdGLULMlLWIHcPx0cncKonvx09Yi6yZa7Bow2Zs37IYm1dMxayZU+huFyB64GK8PYRNferWZCGkLK3WFC2EF1iWtJoLCAh5r+rLrjfuBCYMG844HAWf8GyT1ij+egiFc2zFgYSRcuzGLWLRmB2ShszgOjmy40U1Xhcag9qN7T3H4tN6rvzfYcYY7KL82ZtbHovaFZH0BfvT320Ubhr1bGlScQGrZ90qNqi0ZdIAztsU8dD2geyD9hxEoqMHOnhyQ2u10rBG6UO6zo9Q3Jvf8ejGmiYpNd2gUwI77Sl4Vybiqu36sjhtBKv/40htuIxdaisVjSlPoDzP5IZq8KN2O9Ij+MaQixUG4Ajow0N+YJ7JBSRr9Mnor9B7PhvGJ2/EY8xhH2XrzNN031VJhDzBRa1EKrLysB9RifXdh1lMeJTc86MkOB5hWU8U55NcfH3mEbbuVOLflVkT1izSQyw+PDj8Rx5X8ABLg88xVasz+Ud0nP097GedRv0JR/Eq0f3jprhQ1KelyQh1WbKTQ/HXdF6KcSNWKMv+Lwm+xfgzmDA4G3EsgLhzeFsK7MDU0Im78bSnodirv0prQ2ZLqNiqrfN/b6GViq8WR2D4BnWUkr1S26yv5pSIptUTp95wTx6ikT9s6I9mbdPNLrZKkwQq5TGMpRMQq2ZgZ2KrBp5Mcsz/OYxkR+fghRwPpYAdUsx/QiELc+RIRgfO4GgSwSv8oBkMUwlM2igLdSIPbU8Q4UaKUqSABC/eurP/JFM9UYXJNNIzH1SXg5gw9VC7sDrSmTmgzqcNO/16HMUzhUSqozUvdB7P8fcpKw5jPpmsmDGLUZ1TgSX7q9mOLlFdjuSu7QbRRdJlVsghI6bSoor96rjggpspBtWD1QCv3ipTJuS5VR/m33YDmc+S2bLLv0QBscpE/voBsmeGzKAnKTOQ6J5uWN0kJQrVDqTjtnBLD+P1CBAl4AeoZA7jtzBMpCEqtpfh3l3plWSRHqQ6vVVh0sQiBSBXrbkuuV613EjZlX4qhRTSVh6sPFkUsYr9jmxSVGuyG129DO7zDjmo0TQOjVgy1PZVKvorpdIAoGsS5cj1FbVpZ6PFDHdpqErVgpdRwCNQz6EHxxbZ/2vKgxQw+59N0V99QkqbKFSrzZPCIcsSqp6qaP5PZHLnXfaZIeb3Gzuj6nPvk/5jqZBIUNUQUZ4iEkyDXRTbYll40OHFokVQ0m68xZYcO9Ze7dga80g/WvDSo9i3ZhFWfTkLhZO/hNfQmXh5hOaIuLgaW1EDPKtEagwoQ4BWYugJq6VW+fQodkEOp0KYWSS6UTOtQGEyL7amGTgVoUKHSouG7aIgaaGKr4q15jOmGc9qhldrrunhUksPW3aUu6sJwC7ngvEiISPnILdvD4TEFdKlEmuwudBRnorP56eeZU4GqktUo6NqzNOUiMqIahXWLndBGgKIYqwmNapukI7cvkGuXQN+jrR8CVie9HNa7vsN2SPNNKq930zKjD3s9JgiY5xIqKgbVZ7RTt16TtIamrQIcdFjDgFr2Xc7lS66P9tCCoxVq24rBsvJtLPysxyo0ghjp2D9H0bTmbyTZvOZhE8+asaWWQ84d+Hej11Pol2HFA5Bl+DgVG/mb/wOXbUeWFSl2kOlWD4siuvcAm56yA/yDqOCLGvUb3hgwBW4TfwBW1Yvw7rFq7Fg2gRMHD0QXQq5QUnWfLw0cC8t6KZhqcpTSOqLlkDL0KofFDvGhoGSQyksWp8a2yUgWaGKBaVomZZwKUR+V+046rVSHdlq+RE/bptatBrizWE+b3VrapitJNt9SuZeQbVR59Fj+CSk9erDDozJtEbmvJrcoOE40ptJAGoAiOjG3YCYLnkRvziTtPDvzoF0UqMCYtqOQZgmgOsbRFfsS7frHsUBN/5uH0HMwnP4sCHj82a9Uf2zSG7WMoj7XvN/ZmNXq1y0adtRUce076xRwZ9WR/SqXMv0/NCVuhC2d/Cfxv2NOa7Cjko14PkTHClh139aJZQWyFkbe5blnn23HqrXdzWbsISQBar+4RfsAX6N3ZVz2SC2CO99zNpnuZKcu3FFmNpzeFF/PrRGTE3HZNHNdDSjqETTVLS2fY6iQj+g7CiW9+hyHxpxFrPXrcXWVUswfd50zKaQpw4lWs5OR3IPbqnUayKqcnrfuGuNg7LIX6KADQMCP4Pp0tmHJcBmmuFZqTIlQ1ksBazeqjJs1jOxVMqh8MDDfE7ASucyylEkYJtCFM0xqcOyBGN46SGX8PbQk+iZU4jULkPZK85Gf3oqF2OBGhml1zLc83JTKGjYPpEF+0C819AN1ev4cNsHf3z8WRgb6iLwSYsgvF4/EJ+zCUD7SWsKUx5AAtN/NuIaOhU1miTh0+ZdOfE5Co6s3btxvNe06dIzKp1y4UyYqnV2W5cXYNOyAmxdXohNi/OwcVEuVs/ph/kTUzEyLxS5Gb5YOi0Pu9eMwZblw7B51RD+zMf+dYVYOjMN9Wq8ijdfrIZJY7IwtLAXPq1Vlwl6JTzPIbMnKz2L8qWeMsNmTVrXxZLlo7F53XBsXjYAWxcOxK5lw7BzaQF2LB2BbSuGYOuyXOz5Mh/rVw9DzclnOOV3igvMhWYhInzW12y0W491tOQvp87E7HEsPIwei0HZ/dCjWyotoj/q9JiKx3IOU3i06KHsmx5OAasLQ7GYLrckK0wlNIGouWF1d6jXmcSF2oMs4VvjpRKomUg0jQF0x7eEz+G2IvdspimkIMIBoy4ZQNhi0HLMntAH2xblYwOfaceqEdi8chh2cb128zn3rJiAeUz1Xnv9JZYLH+c2iQ/hjeefw+OPlke5MuVRuuRDbFysyA5U7iPGoo2vU2NsXZyLnRuHmPNtXT0C29cMxKyxPRAb4IDUBHcMHxiBBZPTsWJuX6znZzctG4itKwdhy5p8HgNhd+NIb+BYGnCiD3CYPw+n4vLeZHy7LhJbp/pgYWFnHF8VC5ztjWsnu+Hamd64cjIL+LYvfj2Vjgj/uqjIMcga1Sno155AOY5D2tmVx4Mcsvrooyrw6vwRBsS7YfWEGNw81Rc4lYTrxxJw83QKz9kNN492xbUTPYGTPXD1TDfgeC/gq1T0X7sUj/aXgDWScglVyHKN3bAPR3ftwJJVKzB33kKMG8vCP3uyMvr3RlZsKBKDvNExIgUfsfnuKW7+UpqNA0bApEHVGmsa7ASY1AyvmKzSoYbGTSuPWm0pYMZVdU2aIXJ9RrsDaGbJxGhZq2K0Fadl4UZhBl/DE9w6qd+40fh+A9fzdAafoQfXNAE4lMrn6ourp7sC32XiwLo0fPJuVTNh+DiH4106fID+GR1RmOWAkVkdkZPcGH1jWqB3WCOsnxLINdK5eJ4jlM8RurVTGdg5LwiDkr/AjAEO2L8wAj9t64VLB9Ipx0zgKK9/nOvJdcZJ7uV542hPXKFgrx/rg6sHKcTDPXF+fwrObkpiU1kUZhX6Y+uXobxZXuhQF+Bgd1w/JEH1xs1v0jA22wVly3JkpeIjqPPJqwjxrY2Bve2xeEIwDi6PwQ/bU3HlNBXidH/cOMCL8vzXj+ThMm/myrFuPFd/3tQA3NiXbJTn0lFe50gqzu3PQf1JtGI+k4a5S7G1tc00ThLs3YkTW/Zi6dLlmDt/CiZPmoChw3MxIDMdXVLiERXMipCLO+qEDkKlAWwkGENGjCi6tFw1c1ZZs5k7ImASoaKYrf5pK6ZaVqy/TatQPsdX+Lvpw9KOAWbGWESHQBqtV9ZMIZflPdYp3I1da3OAAym4erQHzp1Ix9Xj3XHtUAafMRs3DlHgR5Nx5WBXbJoVhuSQFvj43ZfxNMdJG9eohh6hLbFicgR+pSBv/JSHS2f70ZD64joV/srxZNw4nI6bh3icyMKsoS7ol9IcM4e6YdeCUJzdHI1f96XwWr1xfV82bh7M5hpm4MbRNNhdOUyLpICv8oXLEjBv6MKeVHyzuSt2L4rD9EIXLBzjhwsHUynU7rjEk/xxMAPXjqXS+jJwenUaRvalQMeHYfuGeHy3j1Z5NhM3vqZGnc3B1bO0UGrTja+s126eTcZFCvePU6k4f1gKo+sm80F64OZOaumZPrjE32dtnITXJn5tFSHU4cHpvqe5wHFfHsL+veyJ3rYVq9ZyNmjhXIxiy80QDmjnpw1Daq+eiIt0ZttvJh7n7j52I2iZw9jzrIOCKknBlGFKVIaN9CpsWK21snRZtVC1LJKCVlxW04B6ujSuovsgWLPL/QmvFZxC3dEHUYFEh13ORZNS5S2ej4t7u1Mo3fD7IXrC/X1xeVemWaMLNIrLR9Jw6Qif9wwF/VUGftubgfUzu6BrcHO893ZVlLYrjbdeegFOHV6hNXfC/lW0/JNcMwr86jEa4T56tqN9aXzZGJLeDv27tcDiid44sDgGX29Jwi97uuPiAX7nYC9cP5xh5CnZ3ilgaoi04PzeHvhua1fsX5aE+SO9MXeoK37YKpPvhYuHeLFj/XGZn9WJzu+lW/iKbuEMLfE7as4JWvcRuqTDtNA91D5eCGdH4w+6lyWj/XBqdSYteABvlsLnzegmcIDu/ijPdyALX+8sQOayRag+jtajVhvFQw2ZSVBsenuKYKn3mm9w5shOHN66FavXbcXyuaQh5wwhuh6AUf16oU9KNDp1KcBj+ScIoG4apGxZoRAzrVPN60qDDKj6hYidlasR6o0m8UHkLeHakRTRIFtp1qUrsqpVvr+Yqqt4hY3445ZMxL5duchatQ51xpxFwPi1OHMwBTeOxeDiwQKuYRoF3YNeqg8uHEgz3uqy3OZX9GLH++Ka3O1ZrsHXfXHxRBo2LA5BWmIH1PrwHbNLTyXuQp8S3A6/7qfnO55j1hzH+lLYvXFidQpyu7ZEQe8OWDnNH8dWJeC77V1wbm8qLh3saa4t4d4l4N6WBVNosuYL+3vg5x3dcHxNV6yeEoJp+R1xaEkULTjLaOONE/1xiReXxd84SRdEy5aGyXXfoAe4uD8TvzMm3DhOj3B8IH45lIP0Ll/go7efR+9oJ/PAOJZn3I+ue4Eu+dJh/d4L/VavJENFlykiI/dnzgD/ivLMcU3Hh7ZYoLt9jULJXHoA+/avxVd79mDvyi1YtGAqRowZjYABbBbMnoc3+u8i+hYpwaZ5Wq1Je0x6Y6VLAk4mfgpAKfbyvNrOQU3tJQusVh+TR0ux1OVJ11w271v4sz0Hx7pTQF3wx4H+2LapEAe387XT2bi6NxHXGG5uHu+Pq4fo7Y5xDYRpiDMuHu6DI4vT8O2mTHq/bLN2N+W1FJK+ysK1r/OwfV0qevZoiwZ1XkX3iDb4Xa72hD7L9Treh+65D9ZO8kdWXBOMH+CCDbOCcGZdCn7c1R1/7O9F+fW6Q8CSp7FgLfK1o5lFkqeVHuiO33Z3x5kNXbF1bjRm5DtiwxQ/c2NXaGnXGMivUJAK7Pr7t2MEECcHmBh+8Xg88Gs2rn9P7TuXhZ8PZCIhuCnLhiVRscKDGJJhzweilhF8XD6WRIWy3M8lAq0bJ7tj2sY53M+KoycD5BqJdgVwWJp7UHtxUBDlNLHQj1smEXRFLTmK7Xv34sLefciesw218tiknvc1yrPhrpQAkhSCTe5lyVQZNsvksdYmLEbA5qDQRVQIRBk2Sxu48Pc8WvUgNrsLSI0Bm97Z7uNBUqFZPWyeGoXfTnHRTyby4LOfYLw8modrfNYrh7O52LQ4xlzhGmGcGydSsWVaFzh+9imGpnXEZX5XVnztMIHlYXq8g2m4eYTf+S4H13kcWJuAExtTjBe4TqW/Spxymet1jeB2Sk4n9E9oidnDvLH9yxB8vakLft3Tk57CEq7Ngi9TrrcELFcrAcudyoouHepGk++BbzZ1x77F8Zg/1APzhjrjp13UNoKlS4e6Ekh04890Wjsf6GASrh4QaiRIOtsD21fGY8bwQCybHonhfb3xMOeWPn3nScyku7/G+HPtIF2UQB2vc/k449WhLPxORblJbT9PtJmyZDXK9Fdao7ZZWTPz1mFnTON6ifzLJm+V4B4gmeEy8wymrjyGBtOoDAYokcBgCc8029G1qqNSLtkMl8nlq54rARfFWCHmcobdsvqlJfRS5KpLsQvTjKKSECkz8hre4n6ZNWo1QzVO6sfHd+Cz0gWf7oUf+RzyPtgTT0Fm0+Vm4sK+OFov4yGzk6tH++CPo1noEtoMFbl3Zd+MDrj+C1EZkbWwx0UKFwdo/bvoDRmicIwhS2HuJIV6oCstnOvE96/zvN9s646BXZuioEd7LBvvj0PLovHjVsmKMuN5rJDH8CBvfKeAifgUlI8wVggMHOyBP/Z1x/ebu+DYinisGheAKbkdsW8p4/AZauqRrvxcsnWSg4wlR+RK+hMh5mBMvi9qf/AWqj5YCa8+z+L/U8+g1ptVsXdZPJFlJoYMcEKQW1McXNrF3PzFY1QqPtR1ghKh7CvfdMfhfUPRefpeq6uDpTj1SUsgBsFSIKImy8jyNDs04Du8xELBoyOJiAmGFDPtOFqi6YUHNCg+mLSnoRulFIqtRVQjKU3F4VIUbIk89oDlc56JeXEJxmKzK0ARg1WajYCv9ZkHB2/uXlD3C3To2AAzZ7gRQ/QwAOgyXaMsEXu4sPtTcfEkw83JdLPg1xjqcDyT6WQ/JEY1Nrltm/YfY9XCWFw5xXX7noKmwVgg1wpXlw935096SWKW60TOwkTGIL4diFX0ollxjTAu2xEbpwcxHseZUHp+X897CJge1uaijRuwCZjWLF9+kSb/0/au+GpdErbNCca0QU5YPiGIoEp5c0/rM4wrsnylOjcI37fPicbbr1ZBWc7WdG71PgL9GuLtt6uh7vuvY0phGNo1egcl2aVQ7oGymDYswMqLjzGW76FnoGu7Kpe3h67+dBp27h+ChlM4LZir2PkzHtHEPYeuZdWG+yU58aDZf0OcsZW3lmRaU57CNOCMhyEvhIqV3qgnmtZp9t3QucRZm/fpxnkNg5g5uGa2bBhwgkryC8PCL6iVy/9wq0tvhHVqB183X8ybwnv8lrGV931dGYBSl8NZVNRcXNnbzYCqP473MykNJBgCpEtn07B1CTcWff8NlKWQP3z7GaTGtMHmBdF8j8bxHV3x14yj/M5Vfvcy3fX5ffSKx7pYIJTe7cKRLIzIbMs8uTXmDvfEbqau32xIwW87uxHzEMgZgEwlK7JgZTu3BKx8yRIw3QaFppPqC/qyrHj/slDMHemDGYPdcHYtYyxdyNVDA3CB+d2Voyl8QMajr7Mwb4g7/18DO7jY18MVIupveWP+nWvgAf7nkCXIZpXllgWNar+HzG5f4PAGgQ+Clf25PE8mU6MuJh6dP9INNxjLQQXasW0Cakw+YijHktwqSdsjiZgw5TqzYdkNE19LcOpQFluC1mY2N2P6YuW6tE5uoGLttUF3aw5tyyAh0yPI1ZP0MMIV6cFypNp1H+aOOq9xvy3XIQuQ13cQuieGIzgqGPNGdcG1s7RYerCrh3LNff5BgCmQeJH552WCoJsnkhiLiUW4PnLRVw5RyETK148OxObZnFTwqMH/xeVBEh0Ponb1N9EztjH2Lknm+vU3Ci9rFVC9znMqn75ymNkJv39kZTSyExujIM0BK6cG4fDSaPy8lSGNoVRYyFi6QdDERZTlRR0Hi0CWDWjdRtIWiLqwLx2/7kglmo7BqolBmJbjho3TQnmSfkYhREqcpxD/oAfAmX7YND0Mr7z8KDp518P0GTHw7NQITzzBXqNyD6FRg5fQJ7UDjm+gBXzHB/+akP4ElYUg649jiUZJztMlXWVuLNeveHyDsH/lngmoM3U/SuawUmSmBS+gAtmox1lE+IhbDlYdyuFwDq2VHHATZXNYkzWMFYVI6zM74JlRkyu0dhUefiQip3LQ+tUML1dsSA72T5dWrFfBgd/5cOxp9J+zHnPHjcTwvAHcnrgnZo7l/THGgaTNH1RELb4EKcD5O90quLBSUMVBMMRdZZ5/8yt9PpefZVyWJf6Qhl+Y7swY6QeXjtVR5THSuMx/a1R/DFldnbF7mUgS5r5EzzcP8Hv76QWYiZw70Z3G5YLs+NYYn+NowNWptXH4aWd3nCf4UjiwMiBxGnceBkUXf/PW7ybd4c3vSsVXBFt7F0Vh9mB7zC5wwlfrRYX1p5bSJVHTTGJPJPnzzt4ID2hNLrUMKnEj0gdpzfU+fpF5aRsqCdOsH5j7nBlIF0yX/KOsngDiK7I/X/UliqSm7uLvjGvnj/ai0BmXD5OdOZ6BvTvmoC07OSpwi4ZSuSoinEPNgh3Iz52I/PFDEbFwLVpNPoxnNIWvwgCb0kv2YzlPm7Nowl9plgbBKVAJXyMtJTQjTNddcgDBFRvsVUEqlUOrZ6r0+ejjGL/wS6yYMxLZQ8Zi9pR++GGn0C7DEcmEK0coQLrF60TKF4mSr/Pva0TOQsznDlLITCd/JvAal+uBHQuo0Gf53BSslEGZCL7P4/s9MWVIIDo2ro2HuZfnA1yrweluuK5cmahbWYZiME7k4OiGOPRPrIeC7iSUxgWRIYwmEUX3vJtrz4zHJjNb7ltcyPcVsLFQasZ5slrfb+2FE+tjGINdMGVAZ2yhdV5lzBUzc+Uo3QTdNE4KGeZg4aQQvPva46jx7vPoFdscB9ZQi38YYqhOofUbhxmf6Ip2LYrE5EwvDEx3xiHSbTcpbBM39ioNI0AhcDH0HhfsyqkUnCRYSVu8GS+oEkRUHTNyJjZPJ2rdHsfFy8DRnYMwdu1shCzk3A43ZXl7zPeoMpzTB3LBjM12uWSrmFqVylfcFs+sQgEb50bxfBzwVjWpFAsbGoArRxfdnD3UI+cuJokyEqe3iWFTTGU8pVJfJ2i6QuR/9VgyLpBONAtKV3z9QByZujzgm3GMlS05NlsedT95CeumxdBrUcinyQZS0JcOUMG/5Xr9koOvSQbl55Be7VQX62YSvJJMEsWptOg6XbPIkjnD3dArtDYm53lh05xw466Fng2reICZSJH13lfANhd9W/JWsBYzIjT9+54e5DvjsG1+OGYN8sbMgU74djsRNelHK8Ui+7WDN30yHxeoocunRmDN/ARc/Y7DRtTe62K/lDMrHh3Pwv4lCWjb6D1UtFPV5EF8XuNNLJsSgGvfiwIVgEtlakEXR6LgygF6i720HsbkS4cHYPaWOQidtQrbl+s1LvTpBPMdHKGbpDu7ypTk0P7+mLtjMgauX4Puy1Zzo5RNpjpVinPDpSk8O04eqmpUhuCqLFMpO1WdmO+WNJurqSX2Bh7J+wlpX27A91vyCaCUZXDhmRqKZr18ZKBB0OLtL1JhDcVLwd08zvf5fBNzOLVfpTK7S1UlKotPCDRnjwqyqNpTRemlcAfDEE5TiX/sSxwy0Fjrpf0s7DD0yd1fO90XR9fFIiepBQq6tcOSMUE0jHCcpkX/Qvd8ndSlFK54iL2ni/7zB4qCNR9AKdNve5INdXl0ZTesnBiGCf3aYuvsIFw/mUMB0D0fJBNDly4Nuk5rwteDKHy6YsUTLsTNfcqxu9L99DBJuVf7moaSa1LvZU4mtOf/DloVNd+qwjIblea0hEQ+l8L6Q3kktfnKQWo7KUzly6pCndfPw6w8UbDXGbsvksI7L4VkuiZ27MYxhoMTIiEymIpR8MxZs1euQSUWDMpnkdXSMDd/N0BsyNdkqDggTkGX6k8yg4b29vhLcJzLJnmCvBvEITeIkpUC3TzJazA2nt9Da6Y7BtNCkRs3mKZc2U/C4yeW9lYk4r0Xn8K7rzyHEQNdEM1M4omHy+LNZypjaKYDzqm4cpopEu/7xl7mvYe7GrIHxwZYaRVZL4UpZScXKUBxEBlRzTA1zxtrpwYz1MXhV3LeFnOldExAzCKr/tKC75S8JWBprS5+jkT2rzvTTCzevTgKc4a4YGa+O86sp/uli5J13SD6FfC4wVz6GulMsFKkOKIbuEH3qrhynbF295pUPPUk/1OrKo/g+Lpo3PwxB4WpnfHKCw9ibI6fERLI196kwvxm8sIMnDuVTAKE59xHoLK3C11XF5w/wXvbLxJAtCdjIO9T4OzSMQvlGpDGGHaRC4jTyei1epUpGtgNIKulTUzFVFGYyn/L5FxH1VG/4KPxJxA+YwdWbZiK36hkOMtrEsVe2dfPYomoUEKnF3he0Y+GyGBaIx5A1ORlllT3kBiK8ayHkQM9yOgV4JfT+Zx/asNNzyuaIYHuce3xI+/blBPJxys1usSU6wJpXqU7MhCt+Y0zGTi8MhYDSEvmd2uLRaMCWCuPItWZiN/3kvpk+DTkhpHTvYV7R7HhbtO2vmjFQ8HuC/sy8MMWWvGqKKyeGoAJWY5YPT6QD5plBChLukwtv0ZrEzi4cog1zON8cDEzTKFuHONCnMjFjiUpeL7a03j5pedxcg0X8Zue+G1Hf/Y0u+Moixs3uVjXDufQKnhdxu3LBBE3CfZ+kyUfjjbg5sahPIYCWg2VSdZ1ntywPMk1hoGLvF/ljNcO8BxKN8j3Xibx0H/JejxOYuNhttZUYY5cbdRPeJ9bIDWZdAwhs7dj/KbpOMIy5k2VRUni3DgSb0AkiJQvkF++xGe8LHBFK75MyvAXCvjX4wm8NnEAGSjdqxQavPZNCvUiWT2ByQNru8PNuToee5QTlxwMKF2yDBvuv8BBFm9+J2X5B+u7fxBviPky68zrqYr0CxG0yKXMqLqYxJC4YVYoTq1Jwk9bk/HbrhTeGy1XtLGqTcUEfDeavlVNMgnyHRD7thUrVggYnNudRv+fgH3LYk2yPbl/e+xfFM04aKMfmcsajlklLuaCe6mhdCWLpkRixcxogooC/E4r/PQjdjFUfgy7Z9H6GWtU97z6NV0wF+/mwS4WMpXlMSf/na5Klol9pDMJ5H4jGyZBXjnIxd+XbyzrF1r0FRY/buwls6SsQByw4iKpPi2cFHDjpinIWL0GOWuWY9y6WZi7fgJ27B7KWE/gRyICRxMpVJ6HnkEU6jUK6g/DAffCOQr+Ar2EctPrzFOFJS4zhKhoIg8ijKE4fYNeztTLT/HeT9Grkd2b0Msdr/E/HUlLbIdp48PxyXvPMzyVRsvGb2PvGpZJCapE8ghQmnov3fJ1xvH108KRFtYAhRntsWSKL/YujTHExnkWFiQrCVhrfImxvLhrvhtw3RNF60PFtUJu9iqT5ouk434kNXZ4TTTWzQ7A9IEOmJrjzKK+3CAfmsK7yXgo4kRc9o1veuP09njUb/ocPnv3aexa3IutJcF48YVSnF2qgJ2rGMtYhTnH3NdoIl3eZeZ8ur74WeWZF46rLMn74fUFZuSyZbnSdmmwwogBPopDzEGv8ZBr1nf02h+8HxEqVyQgWrMKGuA15NZvEsjdoFVKYNbBc9qOYsou+tCQ/Sqo01Pp0O/meqZgQNqVxAeOKn8lqqUhqFp2laW+/QuTMDqvI34Ucv5hAAr6Opjct/qLVfgeS4yn+9HdSkHVUcP4TI762PoE5Ka0wICkdizX+mH73BAcJ7//M7noP1gEUt1XlLKNb75X/mt77R8J2NSA6QIv7qU75QW+3UF2i/Fh8RgvTO7ngCXDXantfKiTZHNosaIfVQ++wZh0jgvdJ64DnnuIo538b9KrVauCSmXLIcK5MYWXj0uMrzdoNfIQvzOXvMTUwGglLfY6BaqYZJA6F9SACdWZb5HpItn5nSIrt5XLbIyOFkAEgyi7240NLGtSKW7xvDpvccHeS8DySrRkKx0qUoJbjRI63wAyWRQUa7KmKkTApJLpFebz109RUVlguflVP2yf1wMNPnofrzxbhag6xJRaRUsa/p8VNYWnX3anY0x2c65ZfUzOd8UaZhfqjFHh5zxTKq2vuRcqt1Fy3c89CI77Ctj2xh0WbLNoWtEf+1JN98CZTV2xfX4UvhzmibGZ9tg8M8DipklMGPKE+asW/yaF/juRZ243T7z1chW89nJlRHo1xNHVtHQKE0wbrhKBKkaLGZPLEpgR0BBwuklywaRYKpwX1auLA4s7kWMRF2vCTbGQU9w6bYtxS6j3t9ziC3d3bDPWI4Wjm9TPGyf57AwHF9mSY2IpO2AUs6+px4x0JtjCMzHHH++98gxZq3bMg0lN8jnFCxgUfYoekNnB4lHe6BleB4MzWmHFJF/sWxBJcNuNgrf6ruTJzLNJwDaF/zsB308DbEKWW1RtU8VpASmh6m+3dMGp9d3Ir4ZjeoEbJmR3wqHl6qui9SmXpYs17BRj1SWmNmKmTm/ojv3L48g3M6Yyh77Kxbgpizcwvx/OscBh6qdkgbQ4YoyuEdwpLgmdG56VDycNtg6BudvWbRZdrqvIfem5bJZvCfxex5/pvT+tRzErsZ1fJUJdz3iTA6RXdShXl+smSFIHh0KO/r5OkHiDiPfM1gysXUTwpuK97nEfn4sCvnqYsfh0JjbMDWNDRH2i5vZYMNqfrjkMp9d2ZVjsweKDyoEKC0VrUFxR/62AbfmViXvSUgrGVCxoTaIwf9iRhgOsSa6eHoLJOU6YXeiMs1uYf7IVRZ9Xs9l1fl7I9Opx9XQx7zvF3JnxWR2cKhcaF0pLv6hcU0QI49h14974INR6MVtK6E3VSuhc6VCRy7xbwLdcdzG3bAm4uGAt73BLEbjQf+XibrnlokUsLmC5fmO9DC/Kh1VVu8Cyp+5D3RwmRFBpxemrn0oM3qVT8kzEAwRrKuwotVS+fnhFErK7NEcGSY1Zhb7YPC3ElGq/3dbVeMwLdOFad0vAltewPf/fuui/+oCxYsY95VxW3VJuwqIUfydpcWZjPA4wuV8y1hsT+rfE3GGOpjCtPM5YkIgACs8Q8bRSpRRyx7o5CfcCXfofTAmuGeTdhRZMLyAPQAv4g2TG9WM5RQm9VdCWgknQBnjdI/+zuc47nuleMZavSXFlYX8r4HtYiM2LaE3kcW4QN4h5E0kjd610x3R2sFNUcViFg6tk5azP0isxXxegvHqyN75Zm4pRafboGdMKY3LdSG0Gkr6NwHebk/AjGwl0Hqugb1WNrLrxnTWE+z1DUZpkffheFQmdTO7R1H+Jjs2JiZav7KdgFI/ZQ316QxL2LIwmV+2BkeltsXCUF35lDLrJRjy5duWThlZTDKGrNuU1WvR5kgPKH0XAm5Ll8SQWzKmt4nq5KH+wS0TKYHPNlnBvgy6LybEIjvs9oHnvPgK+F2K+93mKx/MixRXxIUKCIeXiMVaBiJhxlvw8G++EupXL617VlWEsz7B6lrtWxiCi5DpZu2/Jc4/r44j00C8wuq8Tlo73wr4lYfiKLTsq5iumm6xGwrWVBQUq5eKLerD+kQXfLWDb30bA6r+SG+UNCrFeOqAYkk3kx/7f/Uy+t6fg9LpuhqueM9QXY/p2okU7U/h0X6fEABFwECwZZM0FUXuPckewcf6SOhjoEa4QoauZYM3saIzN9SdfLddMBdFCimwR6DI1TwnY4sBtZMzdMdcWd2/HZMsl3ysGS0h/Z8FCulbst1I13YOuIWsUXfo9PcvB5dn4enNfUpEpVnej6FWSQGoKEFlymUyeUjUc7ccWJ+bp7OT4bWcmsYsDuofXxyjSmMvHeOLgsjAWduLwA1t4fmOLlMn5hVEoYJE85qcs2Cbgv7n/W2nS/az3XvymhZIpbDFHvOjPTJtUNz61MhnbZ8ezMdsPQzNIr433wM8EB+r2UMP2ZQpRDJUIDD24BG6K/XRXODyEsaYPt2N4D09z89LBSV/gws5cXGIVRxb/hxC1Pichk7M9v1+5LYkI5rgXiVRF+V1g7FaKJder+KbiuVKt80Y5rDhpa0uSgilnv6gebyqZaSIU8qfQrDivNMQqCOhaptwnt87r6b6FE67zezdZQVu9IB6dGn5Mjv1THGDIUnhSjBXdKnLkMkONOHlDrYrtImX7DatBY/u0Q8/QOhjaty2WTPDHjnmhpg3n+21qg+1lWnFMWmhAqEVH3n38nXLectF/9UGbNf8pVShy61pMVTdUozy2ugu2zI3FzEJ3jOnTEnMK7U3rjxZLDI3tZo2V0XVJAFISHMnF6Y1dWE+uhc+qv46pue1xaQ95YOV61HyFiYt7LEJESiHGSUBGLt4IhdUkU30ysZULwhCg14ybJJI3noBhQ+VN/W3zBPq+2pNM9YZCFHGi+H6TlSqBRFmjpjiusP/7+gFiCDJsEvpV9nKbggBbdUb388PLzPMbvP0i9iznPWq0R/w0w5iAl2KvasY3T1JgRNhnN6VibN826BVeC0N7d8KXY3yxg31ax1cnmqKOqnfqxtBhE/DfCfJvY/A/EfDdObLNusVTi5L8jS777KYEzjIlY/e8OMwZ7IrhvVth7hAHnN5MNohUoxZXMVkLqdafy9RUlRuvcuF/p6s7tjUdWxaQMeNDykVb75GWJMKWSzxPd3dJDX6sQWvRrhN1i69WtUcMlilwiHkiSDOulWhciikQpDKclMW8zvOJXDHFCV2D2EDEhO7DECwEg+ZQKCDS1UjI9b1kqyhsKY88mFD+BQKqA6t7sJznzK6LQJzZxsZBMWRy33pWcef6nS2wok0PrkjBwG6t0CuirpkIWTg+FNsXxODE2i5GuGpgN83yxgvdxkb38rD3w03FZfmPLPhu4dtin+2nAJcs7TcCgl9Y7fmRRYmTfJAdc2OwYIw3hvTtiLEDOpDDZvWIxId6jJQqiCFTTL9Gwv0Sq1FKBcCGO7CV9jqt8RJbVyQMLZTIDlmoLNi4LqZY53ay0LCDuaSqT8y55RbFUmmBhRdEvJi8dB/dNdMXNeZbNKw4X6v3TPdtVXAsMKbXb6F0Cv0Gm+IuqNZMOvQGv6/c3FJQYhPii/NE/goRF9QFSVApxRLjd4VA1LhjzXCpy5LPuXVeDHK7tEZWYmuM4rDZ0kmB2PZltLHcb7ewREqeWd7EtOAoAxHeMdnLv0P6+t6/EPCfwYpxt3xg9SzJrfyxixZIUkM3vmV+EHuQAjCOk3AjezfBpmksCVJw6iFW2e0CBaJcUaQA2DwOulENosmKrh1mp6JyWApevUdihQT4ft3ZE+PIgUd7NSXqTGR8JoATuUBUaaMyRcZfp+BFuKigYZSDvLapWQvsUQGs9lQKX/GZAlLd2RAnBE4ahDvFRd/0ZTLOsJnhHPli0y7MeKqU7rJq3HK9vIaJr1RAKZcZ0mNWYIAg71eTk7/zvItGcCIhtgWyklqaKcJV04KZeUSy5MpUiPFYwjUhy+T6IkiUclnP9D8u4D+7h2I5MRfJMDjSNMZJJfUXSKvp53d0VyfXR5kOjuXj/DGR7T4FqS1MfP5qMx9GtVRap2Gy2DwvdyggYusQlDCtth3GOi6WeGqh0EtHc+Hu+LEZwYwKbIrv9yWYyQi5WAEkFUfU6aBRDyF0LfoVWtIFeopr9CAmL5cCyXvY0h0KygJamrDIMBMZA7t3Qp03qqFPdEcqI4v0pBMtC1YHiSphVp4vZTSdpWpA3J3AsEElkHBZSDi5PhnjslzQM6QB8rq0xIwhztg4J9D0uJ2mAfzIwbFzu3m/9ErCCbb8XvXe/zMC1oJYg0/WhKLc4jlq9y87WZgna/UtOwCPsMS4jpMO0wZ7Y1hGJ0zqb4+ds8NImIi9Uie/gFJXegFrWEtuVghU45ZKM5SDC0mDyPnMxkSMzHdDmCx4ajzJEqs5T0jdpGHKrw1NqXQmDb/xXhaND8KYHA+2ALNhgMLU4glUaUEVHpTKmVSM8Vhh5OvtvZAcUA9VypZEjHsDpoP5JgwoHJhSnRSEBISqV1Io0bhSTHMPFOxv9BwrJ4YjlxabHtkAw3q3N8WZ7Zzt3bsgmP3mCawO8Xm5PgpNpoGe5xKZIy+jOGwA5p/KuP+Zu/5nLvqeFYvbVqwHVoySJpsUilZ5gQKRFp4jgv6NefI3JEOOMI3aPCeO46iBGE83NapnC8wf5MpCtuZfWaBXrkh0rGK+HlCu/A/GRLWwGDaNYMVMQxBUXeCCfs1hLdP6QgW7uI9jqnKTmpBQ2ymVRm4TrFgdYqG8Y/3qqFbxMQxMtrdQNGO9ujMMyma+atIndU0yzsqyL9PqN8wPxUgyS5sXxXD+lorGz10maJKLVkOBQJgpTZqpSwJBUrHqCdu/NAojM9sgI/oL9E9qhckD7bFkoocR7vFlCfhxcyrDDIfX2O9mwlPRfVhlURVbqESiJP+3BPx3aE3c8C0a00Yfyt2ZPJkJO9G16shfb0omwo7m3HEgVk/zJup0x5C0zhjUuyUWTfDB2Y1WvqgpdT2sBKApAcU9ww6psVupAw8zv8OmNMVLoWbLPVt0plUXFpKlAtCtH94bgxDvL1D343cxY0wYZ5ataQHlyULRVunQGtzSOYzrFnVaNK91zRAyVnFD6ZpVb1bcpsA5OalQcJmh4wTbiVV46Rvb0IyYjO7dEQuG+WPt9EDs5CT+8bUEU9tSDLd8niygANVfMXD3pF3/Q8D1jyz4XhC9+I0V52VvJeVK0G0um5b8x14VKDisxST+LAfFD62IYgtoGBaNDcRE7hIwolc7Jv7tsXJSEE5tottSs54ACzsjVGeVSzQuUtUX5qDqpDCCkDKQrFC8FitljqI2I6Hoi0yjlFodX98d25fE43sOXmuCQ+MmBpGrl0pjH+pZNlRsUcsqBWyKHGoo1HtG8foZASt06L5whl6GTQQH1yVi7igX5HRpiDRVg1LbYkqBO8kLX6LkCLJTcYzFKZzjtZoO5dls9Or9iCTjCYuO/3GQ9XcXKK4AxVtGbKyLRWpYlSH1WSs2GwDGOLRvSaQZx/yS45AjMjsit0crjOjbwRQvTq5IILlBazvF/JPjqWbBTVeFrIdWQ5cqxREDJbJFyNNw00XlRDPeynxXNWVZMs4QyBSRITa8YIoZZiEt9usq22eMUItYMFmrya/N5B6/rzEUlvZ+o6veQ+HNL3BEVpfG6B3fEP27NjfofsmEUGyeG4G9iyNwbC2L9Vt6cAqhlxGurRvyFvV5n4kE25r/Fc/+d3L5l2nSn4P8/XqCbEUCQ7KbrgxaDxddRYrf6aZ+pKC/2pjA7sE40wi/fmYIvhzlw30/OrKLvyVGpXfgbDLnYFlzVkenlTMzh+XY5nVO8YmU0DXkZm2Fdz2UriVUK4JBdVfFV8Vw03ROQGRLlxRPb1I5BJwMvysMoQZ2w3VTsARsKsprisNMclDBzmztTpcbhLFZ9siLb4vs8A7ITW6P8dm0WPYtb+Yz7FsQhpNsTv9+U4rxWqq6qWJmGxK7xR/8h+72nwj07s/8Ixf9tyem4O52NcWL81axQINYVouJic3Kl8V+sQXoeyLWMxu64OjyWGMVG1gumzPMgxSgPQalt0d+lxastLTnVhLO2DDTFyc3xDK3ZEMAmSSwwUBFC5BMkDCFRG+V1NQKQ+GrL0tu2SBgonLFU3HWJp4eYIO+qFKlayJZ1J6rmaKvOFjHfPYXEv5Hlqdg7cRgjCfy1/YJGXFN0SehOQrTOmBKvhdWjA7lgHc09pOROrUqhgN78fh1WzKJGI527iQzVayWayt3Wutjccx/u77/BUX47xHwn27A1jhvlbS0oIa1kguli5VwbcUKPfz5XRxiZi6o+HxqfSLbeRKwnzXmjXRzC8d7YwobyEdzY5LBjG2Du7elZXfCNM4ZLx9NDndOBE4w9fluI5G3EDQJFJzhwSExkR/XmLuCO9aYeM6/zXuccb7CWSq9fl17Z7CdVyVLdU18tTnZNDFsmBHCoXcv0x48MLk5chKboF9CEwzs0YbbJ7jxvwXw5ubibEaf7YMDS8NJNcYTWySaQsGvfJ7fdpOZI9Az4IyKbIHD21P4VqnTYqn+q274rxTkv0XA9yJCbrshy0Wah7Bt/1BEC9oKDqrmXNrPCsoeUp0cqPqBTJUQtTjtwxwc38nW3HUzgk0by/RBXhiV4UTutwMGdW2Lwh7tSJ50YFrigEm5ndlV4ohFo52xZpInts4JMITCwWUEOmxcU2PCvuVJ2L0klgWRQGzkHhcrJ/th8Wh3zGQsHccy57BeHekx2qFfPFmnhMbISWmGwT1bMrZ24LYJjkx3vNijHMKhskgCxVicJnj6ZmMsdz+w7v13Ksk5umN5J+t5rdFcqyOlaD5LXaFFPPOt4v1/wUr/xwV85wXuZLks16x2HKt+K5CjmGwOxTkz0GXRcuZhuTDaxuncbhIlRJ3fsbnvzNqeOLYyxfRjb18YjrVzgrBsaiCRqy/G5zphFPvBhnFrhPzurTAghQfneAZ0b8+thsj7dm2FvNTWyElth2xaX1a3psjp1oSsUgtaJd9jA1xWchNSiE2591Rr5PXogMLeDhjV3xGTuQ/VnHHeWDHdFxvmBfDaISbHPbmqq8nBf2BV6NwOeg52QgrsCUBa3LY1+W+a9FnQuNXbZoa09ez3FvD/hCX/t1jwvTWoOGd9G5jdq6Z5rzKkckSBMTE9v9I6ft6Rgh82J+IbuvBTq8SMxZhd3nazyWDjrAisZQ/T8gkBBqTNpmudVuCBibmuGNdP7p08eJ9OBqXrp9z9mGx7M2s7Kc+F9KEr5ozwxIKxPljGXWwEojaTZdv1ZST3KIk2w9YnuF2RuizUbKg+cI1uqvKj/m+1DJvUp6jzwlSjTGNA8aa//4yB+u+Ky/+DAi7e7HZv5H3fZoKiOrNilAStWKb2HQlbpLxqzyLotcPM2fWM26ujaOFRdOfhOLgkHPsWRRiwtmtehOlM3DYzHFumEwjx2DqDf3OnOR1C57vmRfEII30YaTYVO0ygpybzsyIlyL79wJj8w5bu+Hk7iwZsaLcK8RpCK2rE572aOaGie7YJ9f+CcP/b0qS/1rZ/X+6yWbspHqhliB39ErjSDZUMlX78uotC3yE6tAt+4dyOBKL0RMKRkM6sSbj10/a77fUznNTTlhQaCfl2I7/H7Sp+3MJeKHUyanOxneSKd5FSpPsVI2frYLGlOzaGzyZci/++02r/J9zuf2Ld/8MW/O/d0i2SxMTmombvYg3tWlxj3ST81XBgmg54qK/rHDd1+X13bzMl8DNLlz/v6kmiIdX8VAO5juKvneM4qL6nuSkBJDFfQvoW6r+dztg8zt8xe8VJiv9fwP8APVqUpG2jttugxeSRam2RVUvY9zkkNNsh4dkO22tqcdWh101vF89ratWqNKkdSDy3uj1M14e1+ZvtuJ8AbTTj/0cE/O/d8F+5m1u9YBo6sx3FqD1b2iHWymKuLFrRVjj4+5+WO7XNKlm1WGug7Ravzc4TsxufaZa/s2HeIkzuvfnJ/xUB/z+GXCusDKXFYQAAAABJRU5ErkJggg==</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>MIIGITCCBAmgAwIBAgIGElF46Qy9MA0GCSqGSIb3DQEBBQUAMGoxCzAJBgNVBAYTAlNJMRAwDgYDVQQHEwdLb2NldmplMUkwRwYDVQQDE0BHaW1uYXppamEgaW4gc3JlZG5qYSBzb2xhIEtvY2V2amUsIHByaWphdm5pIHN0cmV6bmlrIHphIEFybmVzQUFJMB4XDTE0MTIwMTE4MjMyOFoXDTM0MDgxODE4MjMyOFowajELMAkGA1UEBhMCU0kxEDAOBgNVBAcTB0tvY2V2amUxSTBHBgNVBAMTQEdpbW5hemlqYSBpbiBzcmVkbmphIHNvbGEgS29jZXZqZSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDnQYBeqd0azjyUpq8gyE0k7RAFlQQ+9bblnYiGwho4+WzyI8y3dHzeU/c0gAm7aXKw79ZwZmUmpvFk9uW53yzYkDzbEoEHiUACtHMcWFbXEzEQXYWWitkRq49wu+JZ98q0cb4UHm/ikztpcf5Lwgwf21aBrg/zA3qIRf/NN6C91fL2LDHxh7JAOkDhKpmH4FOgC6eH6H0IrQloNvpPHwW1Nfql1CbP7nSlT525U3Cs9Nmy6oD11VE5i+zVaY+IBn4tfClCKb5rOw4W5PJtIUOSYjD2gh8e2JxbB3M+6HrhY4bloez8+dSkWzu4o9p0YMfqq0qIYeULEdY8mxfSjFqRS9t4+1KP3llzwqh/i6xpvo8BGcAhRF3F3VU82UKvYM9L0kOB5C4hC3L169NVN9irq6ZIkfJXP9V0Kiks903tBvsTFiNp0I4JH+S9zCJjo2GXM/UX5eAp2AwUUqKrlgUhrKfQuYkxko7eqd/y5rlw3+v3HA96+gK5TAgBhqEhIdweiyBm+cgj4XKT1oBrow6rOmA9TZ83ehgqLRMNnSkKSymPRJonLbKSe8+sxFuMJM4sLkRwFCZf7KWIm5I9e2U5qeVtOj45Oi8KbX/9VdukWCuHSJ+M9cGWOCmIf82hdd8vU6/HXEscIPxx8p5kWTaO2Jav0L9hR5OM4iBbQQU8DQIDAQABo4HMMIHJMB0GA1UdDgQWBBQimOg/Fg20mhxWe81O4C62wtshnzCBmQYDVR0jBIGRMIGOgBQimOg/Fg20mhxWe81O4C62wtshn6FupGwwajELMAkGA1UEBhMCU0kxEDAOBgNVBAcTB0tvY2V2amUxSTBHBgNVBAMTQEdpbW5hemlqYSBpbiBzcmVkbmphIHNvbGEgS29jZXZqZSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUmCBhJReOkMvTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQC3F+fFSFgkpczSTSpLHxnsPO0ZmO6+dRRduryaybNQNHxwDcKANkjmZIH5YzoCfjx+1frUUGXnKo2EmmJjf2pV9PeB+34iv7HbtQpm7y3b/UUaAzKB970nkvYf+Ki+prysOtCLKWeRTtM7OAoXXPdhTTHD2fEbSnPKz86ngwcR28MTiC4VScUQVKwVNalcaFsw5wJhEjqSedE88axuFwg0GlzamAl/Dcj7w5T6CshgvSWL555vdXBrrVTg9SkR1vIehP9oH3Lo4hswvn9RqZY53ZltZX6vqgkWVajxQ7Ou+O3Iq1XSqjCqlGJLTD2iy0qwoghl6Gud2TzBwNE+tGv/1S87hBRLjw1xjLER2y03hbpgnUQW+iN2LnPtCjDYZDkkYnhrxLSOrHsBEwtqNrtuqcmFUyIwXfsY0FpkikwTK77Un4d13IN3Iae/xEf9cy+iXWXxRh816UEsZAu8lLBKJfQoKr0wxRcyKG7tIcFnyJGbIbt9wWyFzyhwYCELaYCvgITqSYePTg/jYl++ymc4F2Wd74JkHyAH/vKWYKZCe199ACuAuwdm8DrdGKZW+lR3AIQMTU2ia7ej3eL6+kSPqGLy7Vk5ZFh9+LfLfWAwaSHNhy5m/VMv7nnuvyLlfnRX3nBfuFZc/tRaPOgjkg03WXA8UE65fI1yN5I+Xu7nOQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGITCCBAmgAwIBAgIGElF46Qy9MA0GCSqGSIb3DQEBBQUAMGoxCzAJBgNVBAYTAlNJMRAwDgYDVQQHEwdLb2NldmplMUkwRwYDVQQDE0BHaW1uYXppamEgaW4gc3JlZG5qYSBzb2xhIEtvY2V2amUsIHByaWphdm5pIHN0cmV6bmlrIHphIEFybmVzQUFJMB4XDTE0MTIwMTE4MjMyOFoXDTM0MDgxODE4MjMyOFowajELMAkGA1UEBhMCU0kxEDAOBgNVBAcTB0tvY2V2amUxSTBHBgNVBAMTQEdpbW5hemlqYSBpbiBzcmVkbmphIHNvbGEgS29jZXZqZSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDnQYBeqd0azjyUpq8gyE0k7RAFlQQ+9bblnYiGwho4+WzyI8y3dHzeU/c0gAm7aXKw79ZwZmUmpvFk9uW53yzYkDzbEoEHiUACtHMcWFbXEzEQXYWWitkRq49wu+JZ98q0cb4UHm/ikztpcf5Lwgwf21aBrg/zA3qIRf/NN6C91fL2LDHxh7JAOkDhKpmH4FOgC6eH6H0IrQloNvpPHwW1Nfql1CbP7nSlT525U3Cs9Nmy6oD11VE5i+zVaY+IBn4tfClCKb5rOw4W5PJtIUOSYjD2gh8e2JxbB3M+6HrhY4bloez8+dSkWzu4o9p0YMfqq0qIYeULEdY8mxfSjFqRS9t4+1KP3llzwqh/i6xpvo8BGcAhRF3F3VU82UKvYM9L0kOB5C4hC3L169NVN9irq6ZIkfJXP9V0Kiks903tBvsTFiNp0I4JH+S9zCJjo2GXM/UX5eAp2AwUUqKrlgUhrKfQuYkxko7eqd/y5rlw3+v3HA96+gK5TAgBhqEhIdweiyBm+cgj4XKT1oBrow6rOmA9TZ83ehgqLRMNnSkKSymPRJonLbKSe8+sxFuMJM4sLkRwFCZf7KWIm5I9e2U5qeVtOj45Oi8KbX/9VdukWCuHSJ+M9cGWOCmIf82hdd8vU6/HXEscIPxx8p5kWTaO2Jav0L9hR5OM4iBbQQU8DQIDAQABo4HMMIHJMB0GA1UdDgQWBBQimOg/Fg20mhxWe81O4C62wtshnzCBmQYDVR0jBIGRMIGOgBQimOg/Fg20mhxWe81O4C62wtshn6FupGwwajELMAkGA1UEBhMCU0kxEDAOBgNVBAcTB0tvY2V2amUxSTBHBgNVBAMTQEdpbW5hemlqYSBpbiBzcmVkbmphIHNvbGEgS29jZXZqZSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUmCBhJReOkMvTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQC3F+fFSFgkpczSTSpLHxnsPO0ZmO6+dRRduryaybNQNHxwDcKANkjmZIH5YzoCfjx+1frUUGXnKo2EmmJjf2pV9PeB+34iv7HbtQpm7y3b/UUaAzKB970nkvYf+Ki+prysOtCLKWeRTtM7OAoXXPdhTTHD2fEbSnPKz86ngwcR28MTiC4VScUQVKwVNalcaFsw5wJhEjqSedE88axuFwg0GlzamAl/Dcj7w5T6CshgvSWL555vdXBrrVTg9SkR1vIehP9oH3Lo4hswvn9RqZY53ZltZX6vqgkWVajxQ7Ou+O3Iq1XSqjCqlGJLTD2iy0qwoghl6Gud2TzBwNE+tGv/1S87hBRLjw1xjLER2y03hbpgnUQW+iN2LnPtCjDYZDkkYnhrxLSOrHsBEwtqNrtuqcmFUyIwXfsY0FpkikwTK77Un4d13IN3Iae/xEf9cy+iXWXxRh816UEsZAu8lLBKJfQoKr0wxRcyKG7tIcFnyJGbIbt9wWyFzyhwYCELaYCvgITqSYePTg/jYl++ymc4F2Wd74JkHyAH/vKWYKZCe199ACuAuwdm8DrdGKZW+lR3AIQMTU2ia7ej3eL6+kSPqGLy7Vk5ZFh9+LfLfWAwaSHNhy5m/VMv7nnuvyLlfnRX3nBfuFZc/tRaPOgjkg03WXA8UE65fI1yN5I+Xu7nOQ==</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.hadlow.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hadlow.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..ed2d2434
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hadlow.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQaykOHXOVF0pQE7TXZnKVRhY0
+						+JJeP3kvp64iwEL9NeyYP133uHLZC+NjUkbTpUehkMJP1se48RF9zxTElCsCZD0C
+						PU53UcSawLVB0LdthbndIoXpJspSldbXYsFCSgJ0y4ET488L+DXrdXs+URLrtwlJ
+						u1/VyCDabGiKbwMhie44kjmraPh5Saw2Q8zmI/BLlePkDbxgUjS9VVdlDcntLxVv
+						wmgOwe7UyJ8GoXQTea4n2gozK/1joIQT+QS1UDoq71fSzbU9wVLLAp17ayS0vdZ2
+						vszXsoNMJ82dpyh/SxGscdsN0ES+yxmRxoCC80ZO9WhZr4yKNALXgwjisuN5AgMB
+						AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC5oYWRsb3cuYWMudWuGJ2h0dHBzOi8vaWRw
+						LmhhZGxvdy5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU0wtjFNb5tSCT
+						jngzlq6ZqphRzh0wDQYJKoZIhvcNAQEFBQADggEBAI693mT576C3fcOKTsEW8yoQ
+						E6g3O73nq4tNlk5JIXrTLELjqj6rJJWHFS81MNlXPBWa2wOEZuFxufHJdsMQuKq4
+						5RZw0e/pSvH/IdyoHwq0lI5tBFVme/KezBkFIrfsRg7U6+1bkEHC6RnHq7Z99QIH
+						rEHDp4jdvsKe93mv2iGFY/9Og/LTDSJHMS/qAdQ6wBrl8z5slZgjMBocRm5P3jHg
+						+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>
+						MIIDKzCCAhOgAwIBAgIUUn7bQ0XDWcr3Co/oK0CMHoqS5fowDQYJKoZIhvcNAQEF
+						BQAwGzEZMBcGA1UEAxMQaWRwLmhhZGxvdy5hYy51azAeFw0xMzA4MTkwODU3MTBa
+						Fw0zMzA4MTkwODU3MTBaMBsxGTAXBgNVBAMTEGlkcC5oYWRsb3cuYWMudWswggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQaykOHXOVF0pQE7TXZnKVRhY0
+						+JJeP3kvp64iwEL9NeyYP133uHLZC+NjUkbTpUehkMJP1se48RF9zxTElCsCZD0C
+						PU53UcSawLVB0LdthbndIoXpJspSldbXYsFCSgJ0y4ET488L+DXrdXs+URLrtwlJ
+						u1/VyCDabGiKbwMhie44kjmraPh5Saw2Q8zmI/BLlePkDbxgUjS9VVdlDcntLxVv
+						wmgOwe7UyJ8GoXQTea4n2gozK/1joIQT+QS1UDoq71fSzbU9wVLLAp17ayS0vdZ2
+						vszXsoNMJ82dpyh/SxGscdsN0ES+yxmRxoCC80ZO9WhZr4yKNALXgwjisuN5AgMB
+						AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC5oYWRsb3cuYWMudWuGJ2h0dHBzOi8vaWRw
+						LmhhZGxvdy5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU0wtjFNb5tSCT
+						jngzlq6ZqphRzh0wDQYJKoZIhvcNAQEFBQADggEBAI693mT576C3fcOKTsEW8yoQ
+						E6g3O73nq4tNlk5JIXrTLELjqj6rJJWHFS81MNlXPBWa2wOEZuFxufHJdsMQuKq4
+						5RZw0e/pSvH/IdyoHwq0lI5tBFVme/KezBkFIrfsRg7U6+1bkEHC6RnHq7Z99QIH
+						rEHDp4jdvsKe93mv2iGFY/9Og/LTDSJHMS/qAdQ6wBrl8z5slZgjMBocRm5P3jHg
+						+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>
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
new file mode 100644
index 00000000..55d2a1f7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-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.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:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hainaut-promsoc.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEejCCA2KgAwIBAgIRAOJDreYdfwftYXxuTiaSgikwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MTcwMDAwMDBaFw0xNzA1MTYyMzU5NTlaMEQxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEfMB0GA1UEAxMWaWRwLmhhaW5h
+dXQtcHJvbXNvYy5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALaj
+3QToxwLfTZdKn1LyscWG0WEFxqm4szedeTdv+Z0GN7vzAFkCJ5uIN0TMsS0pI7Bk
+DpgweMIgIjyAic13ibFgdPDK97duAhfqAGMlgxRvYeil42X6kCNC5OaUPszuXU8t
+HBLW2ZTpptKpqud5X0hNijbAghLZDmn7Eb+rQT8+4zQdZJwV4ApYjNT65oTWTmHX
+xj+LI65fYOyTPGW30rYtX9m7TJUoR1GNsaOzhTlulE0wFiXQMct8qWpRA43tnnPJ
+h+LSBtS5tqZeEd7NP0V2FM1FMkpghrDewy1Truj0+WniTcBZJTtnYUbzsImNZIg6
+OCNqkxNKtIkzLLX9h7kCAwEAAaOCAXMwggFvMB8GA1UdIwQYMBaAFAy9k2gM896r
+o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTsFp6mcbFldk8J8qcZ6VgvqL4y0DAOBgNV
+HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
+VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
+U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
+LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
+cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIQYDVR0RBBowGIIWaWRwLmhhaW5hdXQt
+cHJvbXNvYy5iZTANBgkqhkiG9w0BAQUFAAOCAQEAqWXIoIBh/n3Qd92KOkrtLD0O
+MCPdoOlIe+WfzPfEFEre1QcGNIiywbTH5zR7n0GttMvopttilSIEH4JePV9uiX5m
+DdcGukEMCCtMTaahMeXTSiS9v1RE2FGe9tx1zblHOkpI9V43pWLb9zk3hitGWqN4
+Zce+zsOUf6D8xfDHAReHt5RaWtfSmlHENVix51e5kQ8Q5WAkABvSSVEvOtB1Lqlp
+Ce+uSCFKDpGchEC4Wmfb3W3ka1Vi5Q5ARUNvsjPO02XSbXYJ0bTGFUnJcOKytFBp
+HQh46e9lb2vBUoh87RleCYdNpkZRu92tzeY/iD7AHvyiap1fKXUg2tle+ahF2A==
+</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: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:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hainaut-promsoc.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEejCCA2KgAwIBAgIRAOJDreYdfwftYXxuTiaSgikwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MTcwMDAwMDBaFw0xNzA1MTYyMzU5NTlaMEQxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEfMB0GA1UEAxMWaWRwLmhhaW5h
+dXQtcHJvbXNvYy5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALaj
+3QToxwLfTZdKn1LyscWG0WEFxqm4szedeTdv+Z0GN7vzAFkCJ5uIN0TMsS0pI7Bk
+DpgweMIgIjyAic13ibFgdPDK97duAhfqAGMlgxRvYeil42X6kCNC5OaUPszuXU8t
+HBLW2ZTpptKpqud5X0hNijbAghLZDmn7Eb+rQT8+4zQdZJwV4ApYjNT65oTWTmHX
+xj+LI65fYOyTPGW30rYtX9m7TJUoR1GNsaOzhTlulE0wFiXQMct8qWpRA43tnnPJ
+h+LSBtS5tqZeEd7NP0V2FM1FMkpghrDewy1Truj0+WniTcBZJTtnYUbzsImNZIg6
+OCNqkxNKtIkzLLX9h7kCAwEAAaOCAXMwggFvMB8GA1UdIwQYMBaAFAy9k2gM896r
+o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTsFp6mcbFldk8J8qcZ6VgvqL4y0DAOBgNV
+HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
+VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
+U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
+LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
+cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIQYDVR0RBBowGIIWaWRwLmhhaW5hdXQt
+cHJvbXNvYy5iZTANBgkqhkiG9w0BAQUFAAOCAQEAqWXIoIBh/n3Qd92KOkrtLD0O
+MCPdoOlIe+WfzPfEFEre1QcGNIiywbTH5zR7n0GttMvopttilSIEH4JePV9uiX5m
+DdcGukEMCCtMTaahMeXTSiS9v1RE2FGe9tx1zblHOkpI9V43pWLb9zk3hitGWqN4
+Zce+zsOUf6D8xfDHAReHt5RaWtfSmlHENVix51e5kQ8Q5WAkABvSSVEvOtB1Lqlp
+Ce+uSCFKDpGchEC4Wmfb3W3ka1Vi5Q5ARUNvsjPO02XSbXYJ0bTGFUnJcOKytFBp
+HQh46e9lb2vBUoh87RleCYdNpkZRu92tzeY/iD7AHvyiap1fKXUg2tle+ahF2A==
+</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: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
new file mode 100644
index 00000000..e7e0d3f4
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.harrow.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlmctLybnvCCmJ/okx0YFhn03
+						b/2PuyksfVZ0LI986BrnNSvYYlm69Z0Y+wO8FLzN7fW2ztz5Xyag3eakCiyKAfP0
+						23OLkdjG42bVlpjhYzW9OyamNtd9MbvkF5vNU8QA5eyRm+jhuqgmRiwhdfbwDvdw
+						eW6SmDHChmGr6YGfHMfvBjQNAO/x+VPdqcz7TREb4AtGLch8+pRMSslTaMZibdYe
+						zKmOMKqywQBRYiUxP6Msys1kTkEAUQbN/ZQ5Eny1ys/cXiqCwraOfqrLeaCM3qaX
+						D84w1/2OQCWlpzsmG5kBOg8EpuVLfUTMSRdYwPfV67J9r90r+8XNkyKAGzYb4wID
+						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAuaGFycm93LmFjLnVrhidodHRwczovL2lk
+						cC5oYXJyb3cuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEE/B4YVPRZs
+						hx5Gp1R7uhe+AMnTMA0GCSqGSIb3DQEBBQUAA4IBAQAep4beNMViVZQ7+v1Qu9WA
+						LAzsaiBDj/jkcj+iQaCzxrfzi9tkA/eP87iuMVc9y8MXbmclSZoDl91x2EZ7ohmd
+						lmuA6fTdWuZ3gTFVoVD1fssqnQ5yZusGlLRtoZDqIowhiy04IVwvCopNHwu111M4
+						m74wYHqOLXRK/3w/0WA/KVItqlhUBpv3ClOZWnG//zTRkmyienu7sksiRZy79H40
+						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>
+						MIIDLDCCAhSgAwIBAgIVAIAV6r9T9UOFBwHmuFZHQ/Zrx7aPMA0GCSqGSIb3DQEB
+						BQUAMBsxGTAXBgNVBAMTEGlkcC5oYXJyb3cuYWMudWswHhcNMTIwMjA4MDk0MjIw
+						WhcNMzIwMjA4MDk0MjIwWjAbMRkwFwYDVQQDExBpZHAuaGFycm93LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlmctLybnvCCmJ/okx0YFhn03
+						b/2PuyksfVZ0LI986BrnNSvYYlm69Z0Y+wO8FLzN7fW2ztz5Xyag3eakCiyKAfP0
+						23OLkdjG42bVlpjhYzW9OyamNtd9MbvkF5vNU8QA5eyRm+jhuqgmRiwhdfbwDvdw
+						eW6SmDHChmGr6YGfHMfvBjQNAO/x+VPdqcz7TREb4AtGLch8+pRMSslTaMZibdYe
+						zKmOMKqywQBRYiUxP6Msys1kTkEAUQbN/ZQ5Eny1ys/cXiqCwraOfqrLeaCM3qaX
+						D84w1/2OQCWlpzsmG5kBOg8EpuVLfUTMSRdYwPfV67J9r90r+8XNkyKAGzYb4wID
+						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAuaGFycm93LmFjLnVrhidodHRwczovL2lk
+						cC5oYXJyb3cuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEE/B4YVPRZs
+						hx5Gp1R7uhe+AMnTMA0GCSqGSIb3DQEBBQUAA4IBAQAep4beNMViVZQ7+v1Qu9WA
+						LAzsaiBDj/jkcj+iQaCzxrfzi9tkA/eP87iuMVc9y8MXbmclSZoDl91x2EZ7ohmd
+						lmuA6fTdWuZ3gTFVoVD1fssqnQ5yZusGlLRtoZDqIowhiy04IVwvCopNHwu111M4
+						m74wYHqOLXRK/3w/0WA/KVItqlhUBpv3ClOZWnG//zTRkmyienu7sksiRZy79H40
+						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>
diff --git a/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml
new file mode 100644
index 00000000..cc9f8181
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml
@@ -0,0 +1,70 @@
+<?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-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.edugate.ie/welcome-edugate-federation/membership</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">heanet.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">HEAnet Limited.</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.heanet.ie</mdui:InformationURL>
+        <mdui:Logo height="82" width="200">https://edugate.heanet.ie/rr3/logos/heanet.png</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>
+MIIDHzCCAgegAwIBAgIUGqvc4DxR6ZObzP+9tjmx/JHShXIwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLmhlYW5ldC5pZTAeFw0xMDA0MzAxMDU0MzZaFw0z
+MDA0MzAxMDU0MzZaMBgxFjAUBgNVBAMTDWlkcC5oZWFuZXQuaWUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzASQpsLEEYKVuaK9JiA66mzcCkx1X50SO
+uEtaPBejFzRZ3i5j7rgE7m+2ku+kjt8JJg9JUOrdnKJ0S/9aVggpKQvDAo9rNvjO
+/dyNge4OfUliuSUHw+LOiyxH0ELMW7DTVknLimzZNlHewmunUD/c/uI54Zb8XGYd
+MpmmfPq7LBeurCxBDZ101ujdj94lvtGTPY2WcnBj3ILoyAd1CquGU4o66ws333Ht
+7vA/NTLIO40qQSvEsMR9Lyb/ZQR+XmcssoJ8TqC6lWf2FfAt4phX904FBB9CHapZ
+dtHRRl6r1AifH9NZ/uh24+ct736MY5eqLyy5C5Wp0GmGac33+Iq5AgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5oZWFuZXQuaWWGJGh0dHBzOi8vaWRwLmhlYW5ldC5p
+ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhEdkRl4cvkY8kAeuxgl0TK1i61Mw
+DQYJKoZIhvcNAQEFBQADggEBAKk1EPv3OYkfuvz8js6xl7fI31jPJhDao2yExaeZ
+8P3joqz4YwGmI/Ahm+HNGtqYEXvP8MUpO8yPkkiuJl7L9pHu0Wk2v026XO1B2fZX
+z/4PHuTzo+cpPkcJewzDMKQuNMINzx0gOTpXH2WsSVaHEFBXm0g2OUkk8p4vnY5o
+O1D15tXmi7abFTXObJbvnNrQZJ4+wZAk+wGIfjEd5uKGIMgxET35RJLoUcgQnVxe
+Z0nveWuA2Iu/d6B+48I2J+I0vto6XneJrsVIt8MovKtbjFRs0fAZoD+UtthT+ZVz
+rbgeIIersVLLyLj9SIJrC+FVbLzD3jRnEI4r+mqAxzVNprk=
+</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-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:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HEAnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">HEAnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://idp.heanet.ie/support.htm</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
new file mode 100644
index 00000000..03af8fb6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hebis.de-uni-frankfurt.xml
@@ -0,0 +1,147 @@
+<?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>
+      <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
+BhMCREUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1h
+aW4xLDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0
+MRMwEQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJh
+bmtmdXJ0LmRlMB4XDTE0MTAxNDEwMjUyNVoXDTE5MDcwOTIzNTkwMFowgb0xCzAJ
+BgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBh
+bSBNYWluMT4wPAYDVQQKEzVKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNp
+dGFldCBGcmFua2Z1cnQgYW0gTWFpbjEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVu
+emVudHJ1bTEgMB4GA1UEAxMXaWRwLnViLnVuaS1mcmFua2Z1cnQuZGUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsALjc6bzE8TAoxd+kKkFWraG2H0Bl
+xWDmfi5ByQbQ3XZrF0PsCZhZn6C1WBIWqaMgFmnlpK7/zJt/V2m9pJ1a3jNuYdKi
+JjD17U1xXLcV2hpq1LsIuIRjukS2bZB6baH6gc2QuSQ3e8UlRYjoJrZI6YLTaRh1
+eYqAsHORfjNXk5wrq1KRepH/akKp4hwB5Gy7lN9U9+klk2z+GN6BXndCGL2Y+fiT
+X2HE26HCZ8N7O9GyDSoX1KTr0ErD1bQblMnYh9E+7BnYk4FFeUH7MWUT3CF/rWZB
+qcmZpUZ7MSwH7kHjqrRLthaeJUITBs8JSLrsOweD2NSt41NEG+9E4w+pAgMBAAGj
+ggJUMIICUDBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEEAYGt
+IYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNVHRME
+AjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU
+5aI383EINa1iBCqan/ibbpmKNkYwHwYDVR0jBBgwFoAUY1l3sUZv4earr8LHk/9f
+cQ1P4P8wIgYDVR0RBBswGYIXaWRwLnViLnVuaS1mcmFua2Z1cnQuZGUwgY0GA1Ud
+HwSBhTCBgjA/oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJhbmtm
+dXJ0LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5jcmwwgdsGCCsG
+AQUFBwEBBIHOMIHLMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
+L09DU1AtU2VydmVyL09DU1AwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSQYI
+KwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1j
+YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBACH5yde6
+vRx/6F/xAdh6P8Ns0+j4nAkmx6c/NsK972ieieZ6MMCz5WjuDafhg1oDRq7GHYaN
+61N3zfNmYj8wtLrCgsrv8HCGNGFJmdKcga7IUssiRjAUA91VUU5qerQJ1w3qrxCS
+B4NMolDbixNUnNu6UmquzSPYCXFfSbUIzuygmo/i9DLaBfC/QsJHiKk8k4bfOMA6
+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: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
+bmtmdXJ0LmRlMB4XDTE0MTAxNDEwMjUyNVoXDTE5MDcwOTIzNTkwMFowgb0xCzAJ
+BgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBh
+bSBNYWluMT4wPAYDVQQKEzVKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNp
+dGFldCBGcmFua2Z1cnQgYW0gTWFpbjEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVu
+emVudHJ1bTEgMB4GA1UEAxMXaWRwLnViLnVuaS1mcmFua2Z1cnQuZGUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsALjc6bzE8TAoxd+kKkFWraG2H0Bl
+xWDmfi5ByQbQ3XZrF0PsCZhZn6C1WBIWqaMgFmnlpK7/zJt/V2m9pJ1a3jNuYdKi
+JjD17U1xXLcV2hpq1LsIuIRjukS2bZB6baH6gc2QuSQ3e8UlRYjoJrZI6YLTaRh1
+eYqAsHORfjNXk5wrq1KRepH/akKp4hwB5Gy7lN9U9+klk2z+GN6BXndCGL2Y+fiT
+X2HE26HCZ8N7O9GyDSoX1KTr0ErD1bQblMnYh9E+7BnYk4FFeUH7MWUT3CF/rWZB
+qcmZpUZ7MSwH7kHjqrRLthaeJUITBs8JSLrsOweD2NSt41NEG+9E4w+pAgMBAAGj
+ggJUMIICUDBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEEAYGt
+IYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNVHRME
+AjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU
+5aI383EINa1iBCqan/ibbpmKNkYwHwYDVR0jBBgwFoAUY1l3sUZv4earr8LHk/9f
+cQ1P4P8wIgYDVR0RBBswGYIXaWRwLnViLnVuaS1mcmFua2Z1cnQuZGUwgY0GA1Ud
+HwSBhTCBgjA/oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJhbmtm
+dXJ0LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5jcmwwgdsGCCsG
+AQUFBwEBBIHOMIHLMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
+L09DU1AtU2VydmVyL09DU1AwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSQYI
+KwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1j
+YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBACH5yde6
+vRx/6F/xAdh6P8Ns0+j4nAkmx6c/NsK972ieieZ6MMCz5WjuDafhg1oDRq7GHYaN
+61N3zfNmYj8wtLrCgsrv8HCGNGFJmdKcga7IUssiRjAUA91VUU5qerQJ1w3qrxCS
+B4NMolDbixNUnNu6UmquzSPYCXFfSbUIzuygmo/i9DLaBfC/QsJHiKk8k4bfOMA6
+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>
diff --git a/swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.xml
new file mode 100644
index 00000000..453fcbaa
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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="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>
+					      MIIDGzCCAgOgAwIBAgIUcOyBUfV1JWYkzdfbAaltfBkAukQwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLmhlc2FtLmV1MB4XDTEzMDQwNTE2MDMzNloXDTMz
+MDQwNTE2MDMzNlowFzEVMBMGA1UEAxMMaWRwLmhlc2FtLmV1MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhQP48nRAAh9b78ybhUcTpuXHSXmC2m1hHwqF
+B2jJjgVlHTZTjLa2s95aIgeAt4lwJhlJ7RxZDxj+udG9840FkRAwbvuiufgRmR05
+q+VX2+eejxe1fyP+5XsNA7dUcvCp3wMurRK3f0Z/x3sMEIlh/Nh0pB9fVqwi6TtD
+gyRayTuCFu6wnH1oGhhu6Edrihn4OTJBvUR0vqrg98SY3S1FsYB9OhV03U7vbwfV
+J9sVPu8vbYkbofXuDPpaKdIMYzFWMNIZnnkZvSBY1C6fa/f4pCmwcVBpOjlEW2fA
+1Zj9cxnu8MIhYY6CVV3d0IVrmvXeK9IprM7ixfME59XVnsy4jQIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAuaGVzYW0uZXWGI2h0dHBzOi8vaWRwLmhlc2FtLmV1L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRLm+HxjRffot5ojMgT+q8252oBfDANBgkq
+hkiG9w0BAQUFAAOCAQEAg9CezjS15qvJOTpkIEzGHkk2LfKKqbExgWshU8yYPHlo
+Wefs+Gdj4NEtJy28RYM59KgPG+KvC6xog3l0ZL1CVIx8Xch1rZDSeNUvgUAvbrPu
+UWNzsjEbT22QkvcbyW1vi3/ZgSJg909nvH2GBqASWokEIT7VC30Un+mrEsffqFuZ
+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>
+					      MIIDGzCCAgOgAwIBAgIUcOyBUfV1JWYkzdfbAaltfBkAukQwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLmhlc2FtLmV1MB4XDTEzMDQwNTE2MDMzNloXDTMz
+MDQwNTE2MDMzNlowFzEVMBMGA1UEAxMMaWRwLmhlc2FtLmV1MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhQP48nRAAh9b78ybhUcTpuXHSXmC2m1hHwqF
+B2jJjgVlHTZTjLa2s95aIgeAt4lwJhlJ7RxZDxj+udG9840FkRAwbvuiufgRmR05
+q+VX2+eejxe1fyP+5XsNA7dUcvCp3wMurRK3f0Z/x3sMEIlh/Nh0pB9fVqwi6TtD
+gyRayTuCFu6wnH1oGhhu6Edrihn4OTJBvUR0vqrg98SY3S1FsYB9OhV03U7vbwfV
+J9sVPu8vbYkbofXuDPpaKdIMYzFWMNIZnnkZvSBY1C6fa/f4pCmwcVBpOjlEW2fA
+1Zj9cxnu8MIhYY6CVV3d0IVrmvXeK9IprM7ixfME59XVnsy4jQIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAuaGVzYW0uZXWGI2h0dHBzOi8vaWRwLmhlc2FtLmV1L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRLm+HxjRffot5ojMgT+q8252oBfDANBgkq
+hkiG9w0BAQUFAAOCAQEAg9CezjS15qvJOTpkIEzGHkk2LfKKqbExgWshU8yYPHlo
+Wefs+Gdj4NEtJy28RYM59KgPG+KvC6xog3l0ZL1CVIx8Xch1rZDSeNUvgUAvbrPu
+UWNzsjEbT22QkvcbyW1vi3/ZgSJg909nvH2GBqASWokEIT7VC30Un+mrEsffqFuZ
+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://unknown.site.com</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.hgo.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hgo.se-idp-shibboleth.xml
new file mode 100644
index 00000000..2982afca
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hgo.se-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hgo.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hgo.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDWDCCAkCgAwIBAgIES4+8uzANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJT
+RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
+MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
+c2UwHhcNMTAwMzA0MTM1OTIzWhcNMjAwMzAxMTM1OTIzWjBuMQswCQYDVQQGEwJT
+RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
+MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
+c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZMqgS3wqDLOKVwYHG
+5FRrM13gk+lP+Alm45T0pK192Cl3OWildw4qNiMv10oocbZUoE9PFn6PESSwF6Nt
+2nm3um4ePSbzowYwGOuRLQJfXj4FK3Dj2PO1OLD7oK4VXgka+kG93/oyEaeSfe3t
+93eFgp8bb58b42ED/CAcxvGzcHHyG0WzFTtO3hSuscy/6BKEekVefQJfpPnCuuMN
+2NothDvL+IHO7+DXMeHfH56L1P4fLz+jSMCL2hXGuZxc1f/+l9b4VpegUQx9IGk2
+Rspt3CtOHDI7hhUu5xlbxad0uyAu34dMOz/6jB3UDHYTOEoCjBGhf8RE9zeWFT5D
+VXhtAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIZdx0R84klmPoZq7uMPh1pPJ76X
+2xpmzCoxhRqjq2Uy9HKfiu9pwo21H9w+PvXhUtdsTInAAhPl1khupPzV/uJeCybl
+mbgtQgNr5UnLtfNz7GQD0EXe0UuC+bP+Qrl6NrCke73MCOLITajJ4ggdfdF3C55e
+G1kXEv3DPMpB8tRlcf4W3fT9ZKR+6zzSOkvuMzLIzv1UBTxUas19DYYNzE3+u/9Q
+8IHjPqr0JsKZiNBRofXwLZ6y2xztQqBVDmV4yNoOLNUDDOFHYwiuR1aAJ2rNoOF7
+UTU+mTp7woVtJsWWGJRG1iDB7UxpIHdPwDBDPEfxlw11kdJ+HIyaYCrQL4A=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hgo.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hgo.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.hgo.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hgo.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hgo.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hgo.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">hgo.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDWDCCAkCgAwIBAgIES4+8uzANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJT
+RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
+MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
+c2UwHhcNMTAwMzA0MTM1OTIzWhcNMjAwMzAxMTM1OTIzWjBuMQswCQYDVQQGEwJT
+RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
+MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
+c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZMqgS3wqDLOKVwYHG
+5FRrM13gk+lP+Alm45T0pK192Cl3OWildw4qNiMv10oocbZUoE9PFn6PESSwF6Nt
+2nm3um4ePSbzowYwGOuRLQJfXj4FK3Dj2PO1OLD7oK4VXgka+kG93/oyEaeSfe3t
+93eFgp8bb58b42ED/CAcxvGzcHHyG0WzFTtO3hSuscy/6BKEekVefQJfpPnCuuMN
+2NothDvL+IHO7+DXMeHfH56L1P4fLz+jSMCL2hXGuZxc1f/+l9b4VpegUQx9IGk2
+Rspt3CtOHDI7hhUu5xlbxad0uyAu34dMOz/6jB3UDHYTOEoCjBGhf8RE9zeWFT5D
+VXhtAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIZdx0R84klmPoZq7uMPh1pPJ76X
+2xpmzCoxhRqjq2Uy9HKfiu9pwo21H9w+PvXhUtdsTInAAhPl1khupPzV/uJeCybl
+mbgtQgNr5UnLtfNz7GQD0EXe0UuC+bP+Qrl6NrCke73MCOLITajJ4ggdfdF3C55e
+G1kXEv3DPMpB8tRlcf4W3fT9ZKR+6zzSOkvuMzLIzv1UBTxUas19DYYNzE3+u/9Q
+8IHjPqr0JsKZiNBRofXwLZ6y2xztQqBVDmV4yNoOLNUDDOFHYwiuR1aAJ2rNoOF7
+UTU+mTp7woVtJsWWGJRG1iDB7UxpIHdPwDBDPEfxlw11kdJ+HIyaYCrQL4A=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hgo.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hgo.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">HGO</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan på Gotland</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Högskolan på Gotland</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hgo.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Joacim</md:GivenName>
+    <md:SurName>Breiler</md:SurName>
+    <md:EmailAddress>joacim.breiler@hgo.se</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
new file mode 100644
index 00000000..b3ce6900
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml
@@ -0,0 +1,125 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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 height="94" width="83" xml:lang="sv">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
+        <mdui:Logo height="94" width="83" xml:lang="en">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">gävle gavle hig</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">gävle gavle hig</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>hig.se</mdui:DomainHint>
+        <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>
+MIIDFDCCAfygAwIBAgIVAKDMK5kO5prtSxBh3prGd9azJDLHMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMTEwOTE5MTAxMzEzWhcNMzEw
+OTE5MTAxMzEzWjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAlS0UltW/Niciy2s+KZOXcxBUBhRIwIltiARUzK8l
+/HHgfhDVadKCF6jFS8kYvWSTPGJbPQVtk14WXapOOlSFiUcDAI7JxN4G7wLJZjPc
+VUBIfedZYwzsTGc3XlHYOn6nBGBYIqG/OPHDA39khu/DiMVBoC4iXX7dnKIyLHXX
+ucuhlB3XpBajgzgkPTjp8kJbI0EeTtHn2JenpogOy8+I8mnEveL0p8WWuXr2Ij63
+/+ePtc49AQgEXMgTusGfhQZNqR016I9P32ycF49t4S0Ur2hkv7gm9qL8RwWFN8jH
+YonG4K5Xc7O4T6Q60e+/PDdyf5Po25O3im+aTPMzkEIqwwIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuaGlnLnNlhiFodHRwczovL2lkcC5oaWcuc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFNkNbupRD08lWx3ys8A/KEqKGJtDMA0GCSqGSIb3DQEB
+BQUAA4IBAQBLzzCPKLm+PSGXcyFoM13yGUzhaATV3x1aABalp73Ps22j2BZay5Xq
+exByQFZFJoU279mh6CLTDch679S9WyI0WxQM41jV5mYOv5mllRLEiKMTG3slyyQN
+8P7rBL5OM2DusxFHCCturTlDjnafpybukqOd/YlaRoGeZuhQnzmxx0si07C9pwN4
+SdzIT7rVQJAvwjSNWMoepX0tboWAHFTdbvxEstnlFyi6Vibw5oTy34UxXVP2EmA8
+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>
+MIIDFDCCAfygAwIBAgIVAKDMK5kO5prtSxBh3prGd9azJDLHMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMTEwOTE5MTAxMzEzWhcNMzEw
+OTE5MTAxMzEzWjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAlS0UltW/Niciy2s+KZOXcxBUBhRIwIltiARUzK8l
+/HHgfhDVadKCF6jFS8kYvWSTPGJbPQVtk14WXapOOlSFiUcDAI7JxN4G7wLJZjPc
+VUBIfedZYwzsTGc3XlHYOn6nBGBYIqG/OPHDA39khu/DiMVBoC4iXX7dnKIyLHXX
+ucuhlB3XpBajgzgkPTjp8kJbI0EeTtHn2JenpogOy8+I8mnEveL0p8WWuXr2Ij63
+/+ePtc49AQgEXMgTusGfhQZNqR016I9P32ycF49t4S0Ur2hkv7gm9qL8RwWFN8jH
+YonG4K5Xc7O4T6Q60e+/PDdyf5Po25O3im+aTPMzkEIqwwIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuaGlnLnNlhiFodHRwczovL2lkcC5oaWcuc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFNkNbupRD08lWx3ys8A/KEqKGJtDMA0GCSqGSIb3DQEB
+BQUAA4IBAQBLzzCPKLm+PSGXcyFoM13yGUzhaATV3x1aABalp73Ps22j2BZay5Xq
+exByQFZFJoU279mh6CLTDch679S9WyI0WxQM41jV5mYOv5mllRLEiKMTG3slyyQN
+8P7rBL5OM2DusxFHCCturTlDjnafpybukqOd/YlaRoGeZuhQnzmxx0si07C9pwN4
+SdzIT7rVQJAvwjSNWMoepX0tboWAHFTdbvxEstnlFyi6Vibw5oTy34UxXVP2EmA8
+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>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>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>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
new file mode 100644
index 00000000..a89a1c5a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.highbury.ac.uk-entity.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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
+						Mi5oaWdoYnVyeS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AIGsz5d+S+Z7C3YQjZXV0cDX4KzZw/AdpgMtdCKAq/KAv4FcXqWUgmm8UNqSUpaZ
+						j+yai6rtwWfDxa6PO1nz6X827qmc+ZNzSSwn8P5vRjEune7M+dp2Azf1iZTEdEvo
+						WxeHBadrsK35IVv8gpenI+/oECfw1TJgbZ50b+lC1GYa42BSu9oT0c9ngcmd9MIg
+						mZtah4vnTG9GavQh7JiKRJEAy/oKLVZ+QxHwqNvoPjmHXNH31P4yG0uSkQMXIncF
+						b02LrVM6N5zQHNj3BxT5OiC9XMJTJIE3qezgp4jVeHgchk8bbQbAd4LrPMl8UmGW
+						2N4+EJs9AOKWcqME7sIN1HkCAwEAAaN7MHkwWAYDVR0RBFEwT4Iac2hpYmJvbGV0
+						aDIuaGlnaGJ1cnkuYWMudWuGMWh0dHBzOi8vc2hpYmJvbGV0aDIuaGlnaGJ1cnku
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNXlKPvM2RUd6FsHoFbZSI9T
+						vK4QMA0GCSqGSIb3DQEBBQUAA4IBAQA4+wfuBit/wjBIgqDiR45MkZGITZHX3lZc
+						0KW7qSCxsJvmBnlluHUzMpvYEfa0PFgNHTcdCVPOAShSjq4GvZIEloDDw/rIU9X0
+						TdluFnW38P3KZ+e8+veBkmEQpHBJr8j2+mHGURjS5uFIYpbRRDl7Zhbjx/aCNECD
+						kfGgRUQOcrFOLZC7yZVKLPhen6FrglCpMHxTAOEVudICBM8qix8Sa9RSF/Wa+koC
+						++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>
+						MIIDUzCCAjugAwIBAgIUQBVfv1Tnt7N17RL6y6sE8mngYOYwDQYJKoZIhvcNAQEF
+						BQAwJTEjMCEGA1UEAxMac2hpYmJvbGV0aDIuaGlnaGJ1cnkuYWMudWswHhcNMTQx
+						MjE3MDk0NDEzWhcNMjQxMjE3MDk0NDEzWjAlMSMwIQYDVQQDExpzaGliYm9sZXRo
+						Mi5oaWdoYnVyeS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AIGsz5d+S+Z7C3YQjZXV0cDX4KzZw/AdpgMtdCKAq/KAv4FcXqWUgmm8UNqSUpaZ
+						j+yai6rtwWfDxa6PO1nz6X827qmc+ZNzSSwn8P5vRjEune7M+dp2Azf1iZTEdEvo
+						WxeHBadrsK35IVv8gpenI+/oECfw1TJgbZ50b+lC1GYa42BSu9oT0c9ngcmd9MIg
+						mZtah4vnTG9GavQh7JiKRJEAy/oKLVZ+QxHwqNvoPjmHXNH31P4yG0uSkQMXIncF
+						b02LrVM6N5zQHNj3BxT5OiC9XMJTJIE3qezgp4jVeHgchk8bbQbAd4LrPMl8UmGW
+						2N4+EJs9AOKWcqME7sIN1HkCAwEAAaN7MHkwWAYDVR0RBFEwT4Iac2hpYmJvbGV0
+						aDIuaGlnaGJ1cnkuYWMudWuGMWh0dHBzOi8vc2hpYmJvbGV0aDIuaGlnaGJ1cnku
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNXlKPvM2RUd6FsHoFbZSI9T
+						vK4QMA0GCSqGSIb3DQEBBQUAA4IBAQA4+wfuBit/wjBIgqDiR45MkZGITZHX3lZc
+						0KW7qSCxsJvmBnlluHUzMpvYEfa0PFgNHTcdCVPOAShSjq4GvZIEloDDw/rIU9X0
+						TdluFnW38P3KZ+e8+veBkmEQpHBJr8j2+mHGURjS5uFIYpbRRDl7Zhbjx/aCNECD
+						kfGgRUQOcrFOLZC7yZVKLPhen6FrglCpMHxTAOEVudICBM8qix8Sa9RSF/Wa+koC
+						++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>Jon</md:GivenName>
+    <md:SurName>Kennedy</md:SurName>
+    <md:EmailAddress>mailto:Jon.Kennedy@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
new file mode 100644
index 00000000..93820b3a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml
@@ -0,0 +1,129 @@
+<?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>
+      <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 height="196" width="206" xml:lang="sv">https://idp.his.se/his_se_rubin.png</mdui:Logo>
+        <mdui:Logo height="196" width="193" xml:lang="en">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>
+MIIDFDCCAfygAwIBAgIVAOlJBVpaMgEd+tU+i5F9QK3R5+6IMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5oaXMuc2UwHhcNMTAwNDE0MTIxNTI0WhcNMzAw
+NDE0MTIxNTI0WjAVMRMwEQYDVQQDEwppZHAuaGlzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAm+RktUz4LD4GyD5AIBsAfy40Z7mZvYdKdCaTWAmd
+WucpWyu/0H2J3SFtXgOGedzgWjm7nbTmrnZHB87zc/yVuGdtpebq4Ye0XdBLg2A4
+H43lyPdknzQDxD035wzfcyi6/+PRzTK0jucR9KGtEPkNhPg0ziAbHggROKQ1ylNd
+RAul/8b2wDOA4yzBvO4FYFQj+H9bgge869M65P5f/AdBZAWtXy0Ox4G+2ysZfOSi
+7rGMyiX1/s+hgLO2AdosfAnQkKUOax3YsyRzyqbCu8PHEuDciwI2y968Kuq7kv7J
+7vMbZmPLcO4mLjsRnxrfyKlGG+Jpg0BGxRlMlmKn79kdEwIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuaGlzLnNlhiFodHRwczovL2lkcC5oaXMuc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFE1bH9W+VqwoZnGTvPca0DNTcLL3MA0GCSqGSIb3DQEB
+BQUAA4IBAQBUX+vjv7eCQRljAwrRjH8jNoJyUwMIjQsyStbHM7A5y7+MIdOjBELv
+eNYBKGHHEMOiPiB0uPPFrgdN82q8l3PCcYMAYO6aWcwBJsHTpcEBx0lVa4OmW0/r
+Bc4RC+rrqNNf8XkYQnD80Px3ncb0OfXmNwSLnLDIKOoQq7hh4DGY73K66vi0sSor
+9e7hji23KpjhR2vPqmiNAvJuEMzDolB3hn2oz+rWfwynb85vFAghd4gJxTMPzsUj
+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>
+MIIDFDCCAfygAwIBAgIVAOlJBVpaMgEd+tU+i5F9QK3R5+6IMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5oaXMuc2UwHhcNMTAwNDE0MTIxNTI0WhcNMzAw
+NDE0MTIxNTI0WjAVMRMwEQYDVQQDEwppZHAuaGlzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAm+RktUz4LD4GyD5AIBsAfy40Z7mZvYdKdCaTWAmd
+WucpWyu/0H2J3SFtXgOGedzgWjm7nbTmrnZHB87zc/yVuGdtpebq4Ye0XdBLg2A4
+H43lyPdknzQDxD035wzfcyi6/+PRzTK0jucR9KGtEPkNhPg0ziAbHggROKQ1ylNd
+RAul/8b2wDOA4yzBvO4FYFQj+H9bgge869M65P5f/AdBZAWtXy0Ox4G+2ysZfOSi
+7rGMyiX1/s+hgLO2AdosfAnQkKUOax3YsyRzyqbCu8PHEuDciwI2y968Kuq7kv7J
+7vMbZmPLcO4mLjsRnxrfyKlGG+Jpg0BGxRlMlmKn79kdEwIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuaGlzLnNlhiFodHRwczovL2lkcC5oaXMuc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFE1bH9W+VqwoZnGTvPca0DNTcLL3MA0GCSqGSIb3DQEB
+BQUAA4IBAQBUX+vjv7eCQRljAwrRjH8jNoJyUwMIjQsyStbHM7A5y7+MIdOjBELv
+eNYBKGHHEMOiPiB0uPPFrgdN82q8l3PCcYMAYO6aWcwBJsHTpcEBx0lVa4OmW0/r
+Bc4RC+rrqNNf8XkYQnD80Px3ncb0OfXmNwSLnLDIKOoQq7hh4DGY73K66vi0sSor
+9e7hji23KpjhR2vPqmiNAvJuEMzDolB3hn2oz+rWfwynb85vFAghd4gJxTMPzsUj
+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>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>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>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
new file mode 100644
index 00000000..238adf4b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hiu.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDJDCCAgygAwIBAgIVAI8MkDWeW/BNLq24Uo6mRe3luCklMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5oaXUuY2FzLmN6MB4XDTE0MDgxNDA2MjM1OFoX
+DTM0MDgxNDA2MjM1OFowGTEXMBUGA1UEAxMOaWRwLmhpdS5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDEcc4ZXcQ0TjPrmWaiSqowRV0gC2J
+0AEg5vdr9g/IAaiSkL4/pCuA5JkCkVLZ3sICR/lVEoznIKIIy8HODWzOPqk4lms0
+MCmpVybV/KuVbzv0zLoR41tgipMKwcYNc0yya7rqSOf1go/JSbaNvNqsAYwgz645
+pqtA0zx1hj8OXHijdpTTszA/QYdL/XquoqYTwrnYQqqnfZSSrW1bw7Q5Ay5mIBKc
+cHfgsiXJ3DR0qoPEI8tylEANxdGtAyAX/Ee1CJDgezaLE3KgxKSOB25t8Qr4ykUK
+6JA7n8+L9sBbg+5yeka1sHVNmBfDzWDMIdx6Vq6DyaVUslv6kU8suXK/AgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5oaXUuY2FzLmN6hiVodHRwczovL2lkcC5oaXUu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS2DVKyehrtvGJR51jA6tCk
+v2zM6zANBgkqhkiG9w0BAQUFAAOCAQEASHg7C6a1JzNmeuEgsZuAeJ0DhtkyNdk9
+zKrMrDwr9vDVhjec5sPk6nYxyWm28sh37WfdvU29z14OGpmOoiV8c5CDxg0e71ay
+G0yWQt10zhLs9gcYCktnwOdx7cxhzGvAXAHpxRAqXLwgKdttK1Nzxc3KIIdUu0R4
+DGmTEE/ebAYi1pQegaFhlVENHtmGGs+WU05qygclhp3XGJou+5chOIZu5lBwEqUh
+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>
+MIIDJDCCAgygAwIBAgIVAI8MkDWeW/BNLq24Uo6mRe3luCklMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5oaXUuY2FzLmN6MB4XDTE0MDgxNDA2MjM1OFoX
+DTM0MDgxNDA2MjM1OFowGTEXMBUGA1UEAxMOaWRwLmhpdS5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDEcc4ZXcQ0TjPrmWaiSqowRV0gC2J
+0AEg5vdr9g/IAaiSkL4/pCuA5JkCkVLZ3sICR/lVEoznIKIIy8HODWzOPqk4lms0
+MCmpVybV/KuVbzv0zLoR41tgipMKwcYNc0yya7rqSOf1go/JSbaNvNqsAYwgz645
+pqtA0zx1hj8OXHijdpTTszA/QYdL/XquoqYTwrnYQqqnfZSSrW1bw7Q5Ay5mIBKc
+cHfgsiXJ3DR0qoPEI8tylEANxdGtAyAX/Ee1CJDgezaLE3KgxKSOB25t8Qr4ykUK
+6JA7n8+L9sBbg+5yeka1sHVNmBfDzWDMIdx6Vq6DyaVUslv6kU8suXK/AgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5oaXUuY2FzLmN6hiVodHRwczovL2lkcC5oaXUu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS2DVKyehrtvGJR51jA6tCk
+v2zM6zANBgkqhkiG9w0BAQUFAAOCAQEASHg7C6a1JzNmeuEgsZuAeJ0DhtkyNdk9
+zKrMrDwr9vDVhjec5sPk6nYxyWm28sh37WfdvU29z14OGpmOoiV8c5CDxg0e71ay
+G0yWQt10zhLs9gcYCktnwOdx7cxhzGvAXAHpxRAqXLwgKdttK1Nzxc3KIIdUu0R4
+DGmTEE/ebAYi1pQegaFhlVENHtmGGs+WU05qygclhp3XGJou+5chOIZu5lBwEqUh
+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>
diff --git a/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml
new file mode 100644
index 00000000..7d959347
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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
+MjEwMTExMDM2WjAVMRMwEQYDVQQDEwppZHAuaGtyLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAmLMMJQyBS/1Caas2d1zoAj1jlxYs9axLJPDujiP0
+fJ8F3gjMxtl/A7Y+eVFqnRFzHNuaEKaqZ8S+XGnRi8kw3AdPbPJZB4g+LTRPI8WB
+xDo49uubfZbpyi8zZUqoqOSLeNxMKFqgkq9bd0Yeh4bI7r/bjuvcx4tioOP3UnT4
+CBfTL6uxyCWFW8mP9TbmnQ4lZN5O4elIKrea+8XiumRa2q5qpXVtdqF5h9YI+jYK
+6zj9pMzUlPPvIyOzGFLxLSN0KRM7EgV3FRD65y9hCnTzuQtFrqwktBOVs5fwavyr
+bKht5KrIaVrozMBscr8STgQ8SKEDMCDqxu/hS0IqoweTyQIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuaGtyLnNlhiFodHRwczovL2lkcC5oa3Iuc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFLIjYPKZGp/Bncfc+KnH8Pdf7FukMA0GCSqGSIb3DQEB
+BQUAA4IBAQCQ3m4eN6leAlXf9v8xcZjrzQhHCg4ceDnixMUINTsFfXktfYsSSonr
+Cdh/mhttMxnk/34Tu1XMfYn8ABPVxvvcaBZ9Brl21BBsvk3MOdbDNO6cB05GXdms
+exr3aJFvRwY6Vy0AWtUgDFXdYPiIVPUrpC7NA+X78fq3IVmPn0WFlQ9KpM8hXNz0
+HwlY06myFNjI7dvt8xjAqJy+ICilu06RTs7oCynE45nkrLaZjpploIn3xcYt0ceK
+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>
+
+MIIDFDCCAfygAwIBAgIVAJFwJo5KjpvOv/slniklC/Nf19gKMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5oa3Iuc2UwHhcNMTAxMjEwMTExMDM2WhcNMzAx
+MjEwMTExMDM2WjAVMRMwEQYDVQQDEwppZHAuaGtyLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAmLMMJQyBS/1Caas2d1zoAj1jlxYs9axLJPDujiP0
+fJ8F3gjMxtl/A7Y+eVFqnRFzHNuaEKaqZ8S+XGnRi8kw3AdPbPJZB4g+LTRPI8WB
+xDo49uubfZbpyi8zZUqoqOSLeNxMKFqgkq9bd0Yeh4bI7r/bjuvcx4tioOP3UnT4
+CBfTL6uxyCWFW8mP9TbmnQ4lZN5O4elIKrea+8XiumRa2q5qpXVtdqF5h9YI+jYK
+6zj9pMzUlPPvIyOzGFLxLSN0KRM7EgV3FRD65y9hCnTzuQtFrqwktBOVs5fwavyr
+bKht5KrIaVrozMBscr8STgQ8SKEDMCDqxu/hS0IqoweTyQIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuaGtyLnNlhiFodHRwczovL2lkcC5oa3Iuc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFLIjYPKZGp/Bncfc+KnH8Pdf7FukMA0GCSqGSIb3DQEB
+BQUAA4IBAQCQ3m4eN6leAlXf9v8xcZjrzQhHCg4ceDnixMUINTsFfXktfYsSSonr
+Cdh/mhttMxnk/34Tu1XMfYn8ABPVxvvcaBZ9Brl21BBsvk3MOdbDNO6cB05GXdms
+exr3aJFvRwY6Vy0AWtUgDFXdYPiIVPUrpC7NA+X78fq3IVmPn0WFlQ9KpM8hXNz0
+HwlY06myFNjI7dvt8xjAqJy+ICilu06RTs7oCynE45nkrLaZjpploIn3xcYt0ceK
+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">Högskolan Kristianstad</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hkr.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Högskolan Kristianstad</md:Company>
+    <md:EmailAddress>roland.svedman@hkr.se</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
new file mode 100644
index 00000000..67f75565
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.holycross.ac.uk-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						MB4XDTE0MDYyMDEyMDgzOVoXDTM0MDYxNTEyMDgzOVowbDELMAkGA1UEBhMCR0Ix
+						EzARBgNVBAgTCkxhbmNhc2hpcmUxDTALBgNVBAcTBEJ1cnkxGzAZBgNVBAoTEkhv
+						bHkgQ3Jvc3MgQ29sbGVnZTEcMBoGA1UEAxMTaWRwLmhvbHljcm9zcy5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALkf9BA2MoTWP1Et24UtZ4ZE
+						6XsAQ+ykCv3jhfVULoxzTjgSEDepcS1uweBQo0Mua4uB2iAmTe4GCXh2xfdCVNK8
+						3Sm1fusNjjZFyIEOV1Kf+pmqR5IJFtDfVZpfiYiohiBkGm5WX1Ir1BLKUWxZjT0e
+						lW21AdK8vPl5Ag38vAZynNUmKIxCSED9MiZoh373dgtu5Wl01Yjj6NH46JGA7G7/
+						FOId7Ip/jhPYTldVWpGDv/5SHjpP+nMnRmUEw0hSQ/fpNS5fpnnGcoUjFDUHhlZN
+						c8wgfpL1SeG5rdVkMioLvRMCnyyrKQeKyZNhg97WDiKuHag41tf5MQ/LSznH0fsC
+						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAnPfzR48PVuYBh+xA5vAUU+habal3VAoD
+						mEEOU4Zvn2KonwB8JTyNqaNdFHqwmuR8fctB6XV1ZWQeOTDqJp+sc/SZRAFVCG36
+						ZadN0NNByFp0jZblXYI3XQs2MYPzOsqKJgqFUPfDPSfJ2W3aIbD3vDG7UbOfDKkx
+						LtaM9+LmqqBASGV8qwIJhdLG4znAeaeeDdes84gLFcSuxGq9EqvOIO4q+Q+m2JwX
+						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>
+						MIIDVDCCAjwCCQDPBZyVuDlkujANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJH
+						QjETMBEGA1UECBMKTGFuY2FzaGlyZTENMAsGA1UEBxMEQnVyeTEbMBkGA1UEChMS
+						SG9seSBDcm9zcyBDb2xsZWdlMRwwGgYDVQQDExNpZHAuaG9seWNyb3NzLmFjLnVr
+						MB4XDTE0MDYyMDEyMDgzOVoXDTM0MDYxNTEyMDgzOVowbDELMAkGA1UEBhMCR0Ix
+						EzARBgNVBAgTCkxhbmNhc2hpcmUxDTALBgNVBAcTBEJ1cnkxGzAZBgNVBAoTEkhv
+						bHkgQ3Jvc3MgQ29sbGVnZTEcMBoGA1UEAxMTaWRwLmhvbHljcm9zcy5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALkf9BA2MoTWP1Et24UtZ4ZE
+						6XsAQ+ykCv3jhfVULoxzTjgSEDepcS1uweBQo0Mua4uB2iAmTe4GCXh2xfdCVNK8
+						3Sm1fusNjjZFyIEOV1Kf+pmqR5IJFtDfVZpfiYiohiBkGm5WX1Ir1BLKUWxZjT0e
+						lW21AdK8vPl5Ag38vAZynNUmKIxCSED9MiZoh373dgtu5Wl01Yjj6NH46JGA7G7/
+						FOId7Ip/jhPYTldVWpGDv/5SHjpP+nMnRmUEw0hSQ/fpNS5fpnnGcoUjFDUHhlZN
+						c8wgfpL1SeG5rdVkMioLvRMCnyyrKQeKyZNhg97WDiKuHag41tf5MQ/LSznH0fsC
+						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAnPfzR48PVuYBh+xA5vAUU+habal3VAoD
+						mEEOU4Zvn2KonwB8JTyNqaNdFHqwmuR8fctB6XV1ZWQeOTDqJp+sc/SZRAFVCG36
+						ZadN0NNByFp0jZblXYI3XQs2MYPzOsqKJgqFUPfDPSfJ2W3aIbD3vDG7UbOfDKkx
+						LtaM9+LmqqBASGV8qwIJhdLG4znAeaeeDdes84gLFcSuxGq9EqvOIO4q+Q+m2JwX
+						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>
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
new file mode 100644
index 00000000..de8b991d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hs-esslingen.de-idp-shibboleth.xml
@@ -0,0 +1,149 @@
+<?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>
+      <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
+EwJERTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJl
+Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTE0MTExMjIwMTgy
+M1oXDTE3MTExMTIwMTgyM1owgZMxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
+bi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUVzc2xpbmdlbjEdMBsGA1UEChMUSG9j
+aHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNV
+BAMTE2lkcC5ocy1lc3NsaW5nZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCspCw3S2FO3CMSrUY5r2SSxB+3lcvQmqQPc2b59fitJewh+aU+W9ja
+XJfHEn84Hp1iNovLtTE3EpKW4/zxSAhhIjUSTVMtHp69Y2EdcQ3u27vYHdCesX1F
+9/GAl7hEqzuYdJ6Bn4lbOamVH/DbfjpOS1RwpQts4eSrSGHtY09ZDr0/4P0C81SO
+uKgb7YFhMNmbgmHKGGghVxZauqpXmkoRBkT5SPRovqqqw3C7/GR5vg+XX5j1SgYi
+1nNBRldUlHHw7SlnPRuVtNs6WDODtbnkhK0rbshWtPNao6mUeC1YORUTiaox/sLK
+B3tiZMny8ncZHRZVzLfreKAmJuIcI/vtAgMBAAGjggKQMIICjDBPBgNVHSAESDBG
+MBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGB
+rSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DA0
+BgNVHSUELTArBggrBgEFBQcDAgYIKwYBBQUHAwEGCisGAQQBgjcKAwMGCWCGSAGG
++EIEATAdBgNVHQ4EFgQUXy+EB0suzEWuWgR1+jcHV4KnusowHwYDVR0jBBgwFoAU
+41sXvNYsMmUyQN1NF8A33jpNX1wwOQYDVR0RBDIwMIITaWRwLmhzLWVzc2xpbmdl
+bi5kZYEZYWFpLWFkbWluQGhzLWVzc2xpbmdlbi5kZTCBjwYDVR0fBIGHMIGEMECg
+PqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIv
+Y3JsL2dfY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hz
+LWVzc2xpbmdlbi1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHdBggrBgEFBQcBAQSB
+0DCBzTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNl
+cnZlci9PQ1NQMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hz
+LWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBKBggrBgEFBQcw
+AoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2Nh
+Y2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBABWsGkFFnlgD/EBe
+NyK5n+RVXXctij9I2XWx/ixLWALPbCzGEoH8Ccxk+Qy0trDwhlWH8ByYHaiuEtFc
+8bnhzdHYWllxdrzrabhxHcRBXeqTZmPkMtWESK/Cn2cQp0c0m7xrWaCoAAdKXtEb
+ZLbNnfLMknNI7k32hXbY19V7pOlqRWeTPX5r5Loe1xSoDM2a/xSbqoBjYNwABul/
+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: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
+bi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUVzc2xpbmdlbjEdMBsGA1UEChMUSG9j
+aHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNV
+BAMTE2lkcC5ocy1lc3NsaW5nZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCspCw3S2FO3CMSrUY5r2SSxB+3lcvQmqQPc2b59fitJewh+aU+W9ja
+XJfHEn84Hp1iNovLtTE3EpKW4/zxSAhhIjUSTVMtHp69Y2EdcQ3u27vYHdCesX1F
+9/GAl7hEqzuYdJ6Bn4lbOamVH/DbfjpOS1RwpQts4eSrSGHtY09ZDr0/4P0C81SO
+uKgb7YFhMNmbgmHKGGghVxZauqpXmkoRBkT5SPRovqqqw3C7/GR5vg+XX5j1SgYi
+1nNBRldUlHHw7SlnPRuVtNs6WDODtbnkhK0rbshWtPNao6mUeC1YORUTiaox/sLK
+B3tiZMny8ncZHRZVzLfreKAmJuIcI/vtAgMBAAGjggKQMIICjDBPBgNVHSAESDBG
+MBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGB
+rSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DA0
+BgNVHSUELTArBggrBgEFBQcDAgYIKwYBBQUHAwEGCisGAQQBgjcKAwMGCWCGSAGG
++EIEATAdBgNVHQ4EFgQUXy+EB0suzEWuWgR1+jcHV4KnusowHwYDVR0jBBgwFoAU
+41sXvNYsMmUyQN1NF8A33jpNX1wwOQYDVR0RBDIwMIITaWRwLmhzLWVzc2xpbmdl
+bi5kZYEZYWFpLWFkbWluQGhzLWVzc2xpbmdlbi5kZTCBjwYDVR0fBIGHMIGEMECg
+PqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIv
+Y3JsL2dfY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hz
+LWVzc2xpbmdlbi1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHdBggrBgEFBQcBAQSB
+0DCBzTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNl
+cnZlci9PQ1NQMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hz
+LWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBKBggrBgEFBQcw
+AoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2Nh
+Y2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBABWsGkFFnlgD/EBe
+NyK5n+RVXXctij9I2XWx/ixLWALPbCzGEoH8Ccxk+Qy0trDwhlWH8ByYHaiuEtFc
+8bnhzdHYWllxdrzrabhxHcRBXeqTZmPkMtWESK/Cn2cQp0c0m7xrWaCoAAdKXtEb
+ZLbNnfLMknNI7k32hXbY19V7pOlqRWeTPX5r5Loe1xSoDM2a/xSbqoBjYNwABul/
+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: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.hslu.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..cc035811
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml
@@ -0,0 +1,160 @@
+<?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="2015-01-30T12:51:01Z">
+      <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>
+      <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/E2tbXyCHGAR8UkxyelxqZmegWHM4hN4yqQ0jbY0LEalTJIelVTWsF8u3oHjExM5hcXpOZrQmITQGBXnv9CAm9vaH0THV9c3RCempefkl1RUA7K0siYpM4cDaWnv5BCa2zr4TEjL4uSZwmmDJEtTiJ5WXlNH6+zuzS0s6ezpjU3OgCyMZFMSM9Rl1bV1TS0ZufnFFdVsx4zMf7YDXlTU1HM1Fhrwggm0HxhauPN8Uh4Bfvjw4ZOPcTPT09NzNXzV6yXN8Ogo9/D3W8ArxKt/1oCnLo8A+yuUEA92tXV06fX6nr5+fBIHkl9Sho/pGxicmJgcG5+IS8mAwDx1838AY3HRHd09dHiEq9fp9XxCV6xv6+zS6XQGpU520WJZBrd2dDGGZXEZo2PjPPINi6qored6MxF/MTY+zqynvguzgDHC5s694Ki4tBwNTghHhS/hE/ebkJ6lSs++6xuMBhflFxbFbcSsiPhk/BwDcOOpag0XEm/EgMDIWDDgwHDO+HAmKuKSvILDCQHtnd08EisHRcbGyV7NK1jBauzpDRfPEGUCFx4b7j9Q4NU4g8mpqWcCmHewqfgtv/DoSHCqUgIUMVgfm5KuysjGMnf/kKKyivDYRMY0tLRNTelyCorvP4jAxNrG5pTsPEV8EnMLS8tzCrUZeQXo8XwS/ogYzp9HODwAM90/XCnFp9p6toz9CoiI0en0OL+M3AJ2PCw2sbuvXyzrERiKF3wmgAdlRwIMQk5xRRVfeXFf/wAXDPrB8K6evsHhEWJVa0ennms8PU0Mg3U8hYFiDI/ILiYnp7gXnAzM5xMlVx2XLm5+Z3cPrIbDvIsmJTy9fegFqxkPEaAxB84wcqFnRWmDsNl88hIu3tN9059Entdc+vmRJcCLXWYB77K0+ubKLdwm/fLqul2W3xgqGGLP1kMntluc3Gp2/IKNIwmW0OcXl+0+ZvWpuaR38PQVRaK1nfOtu15iADH24OkLeF36eN1T1je2HjrOeBYnbgn3i5c+8d011ucRA8hhUBKrLc5YC79NLNhtaUXgoE/o2nfiXKdcxg4MDn1x6rwqQ02fRAD7iXMGVNkF2m3mJ/YeP7vj8FdYLtpjgF9eYbRujznBhD4R/6/vrwMPfeLhqys3sRc2Lp5XHe++tX671VVbYce7xrt2fXna5o7neRuHf6/dRhmIfueRU+ZnLok1PQND0ZNLEbHMTl9csWXvDWcPxpsePb3d4iuSDYLQ5yfPfbht33Vnj+s/urMgG8dEp/v+b2/YKXaK6uJvK4zIEWbkgvS1lZuoSegTzP65eou/XEhTrmJ/nrbUAJjT2nfi7OsfG1+yc8Zy0R4D/NrHxpv2HxUnzExAiqL3ku2Pq0zNDAtdvOlktMecDknCKx+sp5oVepIEEWY586Pffv8TNRRvb9xJmkm4Xm5sClShn56WMsoZuWB6e8MO6mGhpyYTIF18At8z2U3Mp08thd0U5DNyQfqvNVsJ74Ia7D5ZHf3C0grs18gnZBBo8pbRdgMf51P6zVUmb63fse3QCSi3ft/hNz7ZTM6E/vvbd9buNtf99EvFJVvnjZ8fkdlVxGZT681b7sCp88vW72CRTy1Orty+f8XWvaBiH6H9G5+YrPrsINw7e82etBnGksm8a2xKTj5vkbt+wa9+tIkprMMx8KLMvMJfC5iU7h8fbTQ5eGzzAcsLN53mA35jlcn7W/Zc+9Gdczh12eb1OYDX7bHQ/5SEXLZzmQu4tKp2nq37T55bs8uMRWjQlYMSh0nOREJOfsq7Pzt6+qX31lJvw2oAewSGzAfsGwxdrzjcZZEz1+xeW2k8FzBVx4zkFPqXbfh/gMlSOTZrexdABUQ8+gnpEaWNv/hS9LXllQZKW9u5rNi6b3hEYhpu5ivrG0Z7LGTAhS+/vy5TI9nBVSQrHhiSftCC0scuXBXrUGZAaQAzMTU7r6OrW+jJyblyZO8AXrZhh8HJJWflCk8Jpdl9cb/qGlsMlKbkeOXDDZR09OubJH2A/FuCAJwvG2wQihO49ouU/svytWtMzYTTwv28+O4ajewD6C/bsHO1qRnsMjlgybquvsHyBg/sOHwKPOiN9lq8/vFm4TNgMv5JrMl5vrnaRC4Gx7eYHf/vxs8kqpuffGeTKV9F6ceGwiauEgT++wfr7/gEMdHxnt9/jD4dHJJ2ubSy9qXla9NzNDPyJWe7l2/exSJclk92HqBum5HjBV4WpysZedDy5KXrKClaXnxnNXwWL6U9BvjmnXueQWGCulwSuETSLx6x3DUnN4hx1dE1PC7RsFUk97c9fH9wckOfptYIJW4TbyH6edoSvC5oxZq2rveldZzc7N29RfiZkTN2n9AoVqAxV2TyWflFTl7+E3Kco1rCNoKCGM86t1y9eCkW1jU2CyUkhyaEAGGke4B0R4hk153daShFewzw8yNLgH+rPHxCntbKT1dmAV/zj3NTZurn/F43ODpuE5SgrW0RX/0Sc4NTpHSnqbP3so/ye58Y2hXfmKt+seVNUmB0iUy74idprL2jL3lHX/FV9g2NNnf1XfGJsQmMR894a29ltLpEvKWho5e5rtEZXGM0zhGpGSU1CwfY7JbvRa+ouUU/5h62D8gonjXCJij+dmgSnZ7B4dD0wrD0QkVmUWCyhom5FVIsideUf+kQeCtYFZGlpUVmF4+MT/YMjjgrUi3s/HxVOWEZRd4JanM7P01VI+PLG9uZe/Cmj7ZO2lMrt7DIbO3CAT5s78/2zwNs6RiUWTKbWtg+UDmFp8ydOanTKTK1X9h4F9ZI3pJTsnINi80tnXlciutaj94OGJIrgSm9/rhTsCq/gn5FU8cxp6DznhGOYcnMPeehiFYXPzOYj+S3AMbuVG018I47BUWpiyfkDGF8cupbj4iv74RC6e/uRzV2zv74xnZY2Ps7hCa7KzMdwpKP3A4orW8TgAV4Fqlu7bp4L/JPATirtE58tQtJFIDbewd/8I9lvHe8unvg0X8IAD7rrmBfIrOKoXSvnDYIwAzmOlg6Bh51CMitnK06AczJt3T3c8PdlBkXvQBcstCAp3T6h/IveAIwBsXllT2U/hzQ43XgHvrkoqpDtn7cQDHR4IsB/M3PUbqgupl1BkbG1OX1vCWrrE5MATCn3dU/lFfZyOWnKXPmz30WMgv4iH0A1OLocNeXvZXJhVXcK6+4bI4FDSzltPOrpf/QUoqqzG39UIqG7y1raBeAz7gpoLTkkH1jfvCLFeefXy2dcGe/lGkHp+bjtDxiMgVgqN7a3T+p08Pn/TfuK9ULCJhbh5f+1jOCJh1UnlR56PTTvok5Vm7h5zwVebJrRXIqGs56KMRImpVreJEcurDbMy7TLkRFsw1R3Q5L6h2Uk+GGNlbukftcfq6G8Pa1bd0X7kW290m1VGxu2dd3Q1OK5hebzxDw8yNLgBe7LAFe7LIEeLHLEuDFLkuAF7ssAV7s8j8AAAD//wMAz8BziTNWkGsAAAAASUVORK5CYII=</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>
+MIIDDDCCAfSgAwIBAgIJAOIyvPYAinGuMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC2lkcC5oc2x1LmNoMB4XDTE0MDQxMTA4MTM1MVoXDTE3MDQxMDA4MTM1MVow
+FjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCwhrP8yk/+IifeO8mUL2SPCX2Jwze6fiyBxaLFsq9PRUKwu/m6CMk9
+87SAvBV541a0pWRpizrAa/jSRNPXQYQLK9h93/5bTc4VBbf1PfqnluOIAq7y23bG
+RQEkcd7NqOkTMOl404LIys0lsk6yQz/GILg6howVh77wGG07AL8DlBFhyjMaOHTt
+aNHh5Chkk8mEB7EP92uJpB6vISJV/Adj2Y95ZefwWo09vGWlUP1usJr0Rhn2HpYy
+68Q0tKY5vXQYIf2IDyoCmPVXW+Q5GWL/WWc/ZUfmi5Srrueh/DRNzoT4/6tqt39r
+RfiVjjhml9p2w4NPwchEYKkec5/ThxIzAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
+cC5oc2x1LmNohiJodHRwczovL2lkcC5oc2x1LmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRclnGUQ4woRbzyaXdRPmu0afzYDDANBgkqhkiG9w0BAQUFAAOCAQEA
+lxSpDW+8n4O9+VGRxrqir42UFerXSYKlr5TiCzU2vpgUOuecK05hrskCeCrn1Zr+
+s4zkISefcaXayNOVhCOfUEfc/eA3VlefzSTfXk84pGkhIDJ4DTDMlkP1MCQNDYcx
+eMTbruMyKU4AYHbQgvhAqXUuMD6dXqtmkKatWTyWw9jNYjsNi18CCPN0UIq2lqoM
+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:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.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.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
+ggEKAoIBAQCwhrP8yk/+IifeO8mUL2SPCX2Jwze6fiyBxaLFsq9PRUKwu/m6CMk9
+87SAvBV541a0pWRpizrAa/jSRNPXQYQLK9h93/5bTc4VBbf1PfqnluOIAq7y23bG
+RQEkcd7NqOkTMOl404LIys0lsk6yQz/GILg6howVh77wGG07AL8DlBFhyjMaOHTt
+aNHh5Chkk8mEB7EP92uJpB6vISJV/Adj2Y95ZefwWo09vGWlUP1usJr0Rhn2HpYy
+68Q0tKY5vXQYIf2IDyoCmPVXW+Q5GWL/WWc/ZUfmi5Srrueh/DRNzoT4/6tqt39r
+RfiVjjhml9p2w4NPwchEYKkec5/ThxIzAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
+cC5oc2x1LmNohiJodHRwczovL2lkcC5oc2x1LmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRclnGUQ4woRbzyaXdRPmu0afzYDDANBgkqhkiG9w0BAQUFAAOCAQEA
+lxSpDW+8n4O9+VGRxrqir42UFerXSYKlr5TiCzU2vpgUOuecK05hrskCeCrn1Zr+
+s4zkISefcaXayNOVhCOfUEfc/eA3VlefzSTfXk84pGkhIDJ4DTDMlkP1MCQNDYcx
+eMTbruMyKU4AYHbQgvhAqXUuMD6dXqtmkKatWTyWw9jNYjsNi18CCPN0UIq2lqoM
+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:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.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">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.hughbaird.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.hughbaird.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..dfefbf0b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hughbaird.ac.uk-oala-metadata.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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>
+						MIIDSDCCAjCgAwIBAgIIX17eEDuOAj8wDQYJKoZIhvcNAQEFBQAwOzEbMBkGA1UE
+						CgwSSHVnaCBCYWlyZCBDb2xsZWdlMRwwGgYDVQQDDBNpZHAuaHVnaGJhaXJkLmFj
+						LnVrMB4XDTEzMDgwODExMTEwMloXDTIzMDgwODExMTEwMlowOzEbMBkGA1UECgwS
+						SHVnaCBCYWlyZCBDb2xsZWdlMRwwGgYDVQQDDBNpZHAuaHVnaGJhaXJkLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsuUznKj9CgzG9HW/AY+K
+						hCfi5qxt1ttqKDe5geSym5DSi6oIFbNyEfYSxvpGKIFUweYKAbWYbWAa+dxJ5iHf
+						ahZr1odOtyBh2XZCHZ4q4LLPeIpfpk3vNPH7GDdWjI2LXEet+/7J8x4jzXrFvJ1O
+						7AX/T5lswOyeEKVIzgXK5Z5wK6K4U9NnMEBGfDtTgOzOYcRsJDlJScEnrdMaSO3E
+						fU54JKVq56ozyzZ/LGGCmtylFuz1vX9ZoL5rP5zErYMND6m7xka0U9XKVLTz1rbA
+						5zDrV+eMI2QYJ7zIPPJA1QDZY5/DUo495l93GWm0nov/cIflF5Q0V8Jdb6zvv92q
+						UwIDAQABo1AwTjAdBgNVHQ4EFgQUVN73EI9lBXn223EfNEMOX/UmSikwHwYDVR0j
+						BBgwFoAUVN73EI9lBXn223EfNEMOX/UmSikwDAYDVR0TBAUwAwEB/zANBgkqhkiG
+						9w0BAQUFAAOCAQEAqzbMViMYly/u3VNWF3xVfadZFpPuea3AsjD8P/ibJ+AK2rJE
+						40KhEFuBpkTdCAmBuXMLqHl1Wpkm1dA1JFyZFYKD2Llt2mn6aTY6XmTuZfp4xJdt
+						iz6Hi+mzKB5oClIeY7Ba0m3KVQCwuoYvIgsJ7Phs9QzdtGDDJMpx/oc9DGbGzcmx
+						M9A6/TMn/ECbGDZX9AAWY1Q06bGQtqOJOUEJcEj51jFMpuN2EJdfkr6tEYYTIjsd
+						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>
+						MIIDSDCCAjCgAwIBAgIIX17eEDuOAj8wDQYJKoZIhvcNAQEFBQAwOzEbMBkGA1UE
+						CgwSSHVnaCBCYWlyZCBDb2xsZWdlMRwwGgYDVQQDDBNpZHAuaHVnaGJhaXJkLmFj
+						LnVrMB4XDTEzMDgwODExMTEwMloXDTIzMDgwODExMTEwMlowOzEbMBkGA1UECgwS
+						SHVnaCBCYWlyZCBDb2xsZWdlMRwwGgYDVQQDDBNpZHAuaHVnaGJhaXJkLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsuUznKj9CgzG9HW/AY+K
+						hCfi5qxt1ttqKDe5geSym5DSi6oIFbNyEfYSxvpGKIFUweYKAbWYbWAa+dxJ5iHf
+						ahZr1odOtyBh2XZCHZ4q4LLPeIpfpk3vNPH7GDdWjI2LXEet+/7J8x4jzXrFvJ1O
+						7AX/T5lswOyeEKVIzgXK5Z5wK6K4U9NnMEBGfDtTgOzOYcRsJDlJScEnrdMaSO3E
+						fU54JKVq56ozyzZ/LGGCmtylFuz1vX9ZoL5rP5zErYMND6m7xka0U9XKVLTz1rbA
+						5zDrV+eMI2QYJ7zIPPJA1QDZY5/DUo495l93GWm0nov/cIflF5Q0V8Jdb6zvv92q
+						UwIDAQABo1AwTjAdBgNVHQ4EFgQUVN73EI9lBXn223EfNEMOX/UmSikwHwYDVR0j
+						BBgwFoAUVN73EI9lBXn223EfNEMOX/UmSikwDAYDVR0TBAUwAwEB/zANBgkqhkiG
+						9w0BAQUFAAOCAQEAqzbMViMYly/u3VNWF3xVfadZFpPuea3AsjD8P/ibJ+AK2rJE
+						40KhEFuBpkTdCAmBuXMLqHl1Wpkm1dA1JFyZFYKD2Llt2mn6aTY6XmTuZfp4xJdt
+						iz6Hi+mzKB5oClIeY7Ba0m3KVQCwuoYvIgsJ7Phs9QzdtGDDJMpx/oc9DGbGzcmx
+						M9A6/TMn/ECbGDZX9AAWY1Q06bGQtqOJOUEJcEj51jFMpuN2EJdfkr6tEYYTIjsd
+						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>
diff --git a/swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml
new file mode 100644
index 00000000..eafbd706
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml
@@ -0,0 +1,70 @@
+<?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">
+    <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 Institite 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>
+MIIDGDCCAgCgAwIBAgIVALmq0aeEnY2koINV+tGCDu0kV09pMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5pYWR0LmllMB4XDTA5MDQwODE0NDAyMFoXDTI5
+MDQwODE0NDAyMFowFjEUMBIGA1UEAxMLaWRwLmlhZHQuaWUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCPkswyC6jeXgUJzMGhx7QlixYHq4Rqh4KBPlxH
+Ipv4bd3/GfkoZs2avpxD75ksEzNsAbTlq7QyiqVaPB4MXo85NqV5e2xt2NexCmxn
+lEYjtqTkgU83lOPSmu4dQDKhXfoK5ZSoSd9d8BgfmRKQNgr3UdIs0pcVTcRbG+Yz
+JPLyTgewKNdRD1BvimaxbDvjBXxTpGo3KEtv4tEWuVqlo+yqQkFawF11xnNtmLzH
+hub9/GxMdLEySuJIsvfLmawpsoV7Kp6mr9onMPSl/k9x+7dG2b2FSc8blPN6NiPO
+IMs5Dig4OXW6O9N5WsOXNVa7MtpK02t69FlKOm1BjZo6ytIvAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5pYWR0LmllhiJodHRwczovL2lkcC5pYWR0LmllL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBS1GPf9ZZNOFL9/cO4deMgQC/hoXTANBgkqhkiG
+9w0BAQUFAAOCAQEAZEfSyT4N9goj8oSV8NL0B8pXIKyVBZBoE6id+B47VVv7u1vC
+aDHKArulvZPR43lzFx2q6lHclHj2PeNzUgx10ZUrrsXxOd+2FUG8ExaKiMv/F3/w
+ApcMs8kQehlArgcwqVTzGqqZ1+FtMfVDyGS5AX/tZHo4frzFJlcqyKYgnrKTueEi
+2Ytjlo3VTd3RMwTBG2D2PmhoO/Q461J3WYD5IuFZ8a83HZOIXE5mXYx3vBJCxD5s
+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: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:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Dun Laoghaire Institite of Art Design and Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Dun Laoghaire Institite 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
new file mode 100644
index 00000000..04683a66
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.iamtest.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKKPxDvVvBDa7oue
+						bcUFyrrd/gLxKTWVR9wObbumUQpi0T5nVa0t8KbpdKdusP1Ymj2bdMw+KPNfZrc4
+						MEAMSD7BJYw9fNwvILS0hBNmn/mBW76zG+HrJjPF5UDHcy+G/PL2h0xdXLSdf/2i
+						uHD5ln6jHyLqRK9K1db+yXXTv9cu5ZFWlh2DF9ByYHb8xMx4df5UWLICT09Vos3a
+						MlkL3Y+MDAKznfjyGLrbac6UwxV2ZIh9F0G2wpgiAJB6zmDmNZeF7dgkvJXng1gi
+						W5qb9qhP67YwlHEir9LDu+YQdEgL2o3J1bzylOX6mt3n9GU04zhkNHKWkUHtmSj2
+						2LntNZMCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLmlhbXRlc3Qub3guYWMudWuG
+						K2h0dHBzOi8vaWRwLmlhbXRlc3Qub3guYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
+						VR0OBBYEFONo0MnnlYDFHNi9JJ5MYNAFd3WxMA0GCSqGSIb3DQEBBQUAA4IBAQAZ
+						CC8MLlPAXI+CAK33h7LjLYGgzT6xlPL/8qsFuP8bO/WBVg8bjuZpaC3KTi5W2HW6
+						AQ7I0pXAZn7VJuH0KPyiLubgAvjLo1NM8lxkct7x4Y+jZXD2X8t3kS3Abyv69D+P
+						NX3Ubvo6pYHmghQ/fcFvm0stZOo/nIMGwCZIc9wZBaOQ0mLkFQpfdLh/ncN3aaSJ
+						Tu79JDfGxHDvDwMMODuc7mToxakh8wH0v377RdFQ4ARrhVsLxJJhC0NgzKtw0sZd
+						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>
+						MIIDOzCCAiOgAwIBAgIUa38GMB38Bw/fc8DRnws12ed2TT8wDQYJKoZIhvcNAQEF
+						BQAwHzEdMBsGA1UEAxMUaWRwLmlhbXRlc3Qub3guYWMudWswHhcNMTMwMzA3MTIx
+						OTU5WhcNMzMwMzA3MTIxOTU5WjAfMR0wGwYDVQQDExRpZHAuaWFtdGVzdC5veC5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKKPxDvVvBDa7oue
+						bcUFyrrd/gLxKTWVR9wObbumUQpi0T5nVa0t8KbpdKdusP1Ymj2bdMw+KPNfZrc4
+						MEAMSD7BJYw9fNwvILS0hBNmn/mBW76zG+HrJjPF5UDHcy+G/PL2h0xdXLSdf/2i
+						uHD5ln6jHyLqRK9K1db+yXXTv9cu5ZFWlh2DF9ByYHb8xMx4df5UWLICT09Vos3a
+						MlkL3Y+MDAKznfjyGLrbac6UwxV2ZIh9F0G2wpgiAJB6zmDmNZeF7dgkvJXng1gi
+						W5qb9qhP67YwlHEir9LDu+YQdEgL2o3J1bzylOX6mt3n9GU04zhkNHKWkUHtmSj2
+						2LntNZMCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLmlhbXRlc3Qub3guYWMudWuG
+						K2h0dHBzOi8vaWRwLmlhbXRlc3Qub3guYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
+						VR0OBBYEFONo0MnnlYDFHNi9JJ5MYNAFd3WxMA0GCSqGSIb3DQEBBQUAA4IBAQAZ
+						CC8MLlPAXI+CAK33h7LjLYGgzT6xlPL/8qsFuP8bO/WBVg8bjuZpaC3KTi5W2HW6
+						AQ7I0pXAZn7VJuH0KPyiLubgAvjLo1NM8lxkct7x4Y+jZXD2X8t3kS3Abyv69D+P
+						NX3Ubvo6pYHmghQ/fcFvm0stZOo/nIMGwCZIc9wZBaOQ0mLkFQpfdLh/ncN3aaSJ
+						Tu79JDfGxHDvDwMMODuc7mToxakh8wH0v377RdFQ4ARrhVsLxJJhC0NgzKtw0sZd
+						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>
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
new file mode 100644
index 00000000..f97aa433
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ibot.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDKDCCAhCgAwIBAgIVAMxsLpF35rXDQbU29hCvQ9ID+RqhMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkcC5pYm90LmNhcy5jejAeFw0xNDEyMTUwOTM3MDha
+Fw0zNDEyMTUwOTM3MDhaMBoxGDAWBgNVBAMTD2lkcC5pYm90LmNhcy5jejCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZdXo8BHNDZSJzRLQkKNyg8YnqR
+0MXjl0gFyZXl3FM5MLIZsyBogGpcFf7H0cnOzplcCSxpk5M3yRGKMfX6cjZvoWu1
+A/E9z6NXKte5efB2i/jKYzv6fxujZgRmxuvIilXZMrkXmLEOGCbhmpWy021OD4Vk
+KmtZ+zc1YXDXczPG5ssskhLwP9iVD9jdlL6PBE0+u3f0r+aVnOghDKJj2EnlIua0
+jMDQjDAnIcXWYrSPxF2kmOnOYzI8RWvQkIhXLfNLTl//mjKp78WONO30x6A9jbCe
+wb0dsBAsm8JcB3cAHY4wm/DfFW8ns/SpYVc+SDi5BiVlsctsj2AxJXYz/6MCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRwLmlib3QuY2FzLmN6hiZodHRwczovL2lkcC5p
+Ym90LmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUNB2G4Wu/pmGzpULg
+qY4Gut3/lYcwDQYJKoZIhvcNAQEFBQADggEBAHWmscEAOQ5tG96tRVZC8VCDUQmI
+8bnnnjbF4llfmJfMOSdkfmSE1A+0sMNbE3zT8jY2TXmBMU3YdyzNDyEG0YGRvghW
+3KpaMEzUJsbkOhWnDTaL6VJqATD/YAJlTgOdkeXbu3V2KJnNB5lj7Tb0QPq/krWU
+/by0EpeS+7FueQ22MAI++DSUBv91SXFGMW/TMnb+/+dE50bV+GV4aCKPew4w8OH0
+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>
+MIIDKDCCAhCgAwIBAgIVAMxsLpF35rXDQbU29hCvQ9ID+RqhMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkcC5pYm90LmNhcy5jejAeFw0xNDEyMTUwOTM3MDha
+Fw0zNDEyMTUwOTM3MDhaMBoxGDAWBgNVBAMTD2lkcC5pYm90LmNhcy5jejCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZdXo8BHNDZSJzRLQkKNyg8YnqR
+0MXjl0gFyZXl3FM5MLIZsyBogGpcFf7H0cnOzplcCSxpk5M3yRGKMfX6cjZvoWu1
+A/E9z6NXKte5efB2i/jKYzv6fxujZgRmxuvIilXZMrkXmLEOGCbhmpWy021OD4Vk
+KmtZ+zc1YXDXczPG5ssskhLwP9iVD9jdlL6PBE0+u3f0r+aVnOghDKJj2EnlIua0
+jMDQjDAnIcXWYrSPxF2kmOnOYzI8RWvQkIhXLfNLTl//mjKp78WONO30x6A9jbCe
+wb0dsBAsm8JcB3cAHY4wm/DfFW8ns/SpYVc+SDi5BiVlsctsj2AxJXYz/6MCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRwLmlib3QuY2FzLmN6hiZodHRwczovL2lkcC5p
+Ym90LmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUNB2G4Wu/pmGzpULg
+qY4Gut3/lYcwDQYJKoZIhvcNAQEFBQADggEBAHWmscEAOQ5tG96tRVZC8VCDUQmI
+8bnnnjbF4llfmJfMOSdkfmSE1A+0sMNbE3zT8jY2TXmBMU3YdyzNDyEG0YGRvghW
+3KpaMEzUJsbkOhWnDTaL6VJqATD/YAJlTgOdkeXbu3V2KJnNB5lj7Tb0QPq/krWU
+/by0EpeS+7FueQ22MAI++DSUBv91SXFGMW/TMnb+/+dE50bV+GV4aCKPew4w8OH0
+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>
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
new file mode 100644
index 00000000..4f3de643
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ibp.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDJDCCAgygAwIBAgIVAKW2EZM9liIS9zxSJj2keamQoSWxMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5pYnAuY2FzLmN6MB4XDTE0MDcyNDA5NDU1MFoX
+DTM0MDcyNDA5NDU1MFowGTEXMBUGA1UEAxMOaWRwLmlicC5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCcjIT8YIRLlcj3VCCeqa2qSwK2Ugb
+ohvyVmx4dldYsP2NpqFM8Hvzmor0Sq+h0CTDAnvsDhpnHTSNC+bWh4nCKahiBZ0b
+GqMMiatHYsq6DawZCRRzI7bKiGmGIxsG5YaqmqBTjvHhsePzkedn5qIp5PEYi+MG
+aL/oQ1UVBsVW0dZGzMpockzxJAbut+kNlC99OsSWoQ/MyDVcPqu36QUaebahQUzF
+hDAB5ZvS+6PylulTmbWHPG5RRtgwNyfGxqpJupbeckt8BN3k5t9ydxNZsI4zyjbn
+ySbdYYhka/8/qOSvGoyg7RAvoqqR2PK417kHc2Ien96u7Q+lMwGKmKOpAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5pYnAuY2FzLmN6hiVodHRwczovL2lkcC5pYnAu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRtafM3sXw4M6AoCL8uynsW
+7CQJQzANBgkqhkiG9w0BAQUFAAOCAQEAlujcijW6c8cVu5QpYIxE2g2AiM9MEf7q
+gBHtO2oSuseSHv6h1ZWNA/9qGg2LPWc1T+QWBQZbT16VyGig5Moxb1J8VPxfv+A0
+eQHoLsBTLVP06npY3NztVm3xogPnpwUcjUagECmar/HKkQ8hMeVatK/o3MR05XRC
+ssOxXuhGNkdEqrBAYJ+ABQSCw0yK9qkA0URqksCGHN4jpmflwa4e+PY/DBlHzn1w
+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>
+MIIDJDCCAgygAwIBAgIVAKW2EZM9liIS9zxSJj2keamQoSWxMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5pYnAuY2FzLmN6MB4XDTE0MDcyNDA5NDU1MFoX
+DTM0MDcyNDA5NDU1MFowGTEXMBUGA1UEAxMOaWRwLmlicC5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCcjIT8YIRLlcj3VCCeqa2qSwK2Ugb
+ohvyVmx4dldYsP2NpqFM8Hvzmor0Sq+h0CTDAnvsDhpnHTSNC+bWh4nCKahiBZ0b
+GqMMiatHYsq6DawZCRRzI7bKiGmGIxsG5YaqmqBTjvHhsePzkedn5qIp5PEYi+MG
+aL/oQ1UVBsVW0dZGzMpockzxJAbut+kNlC99OsSWoQ/MyDVcPqu36QUaebahQUzF
+hDAB5ZvS+6PylulTmbWHPG5RRtgwNyfGxqpJupbeckt8BN3k5t9ydxNZsI4zyjbn
+ySbdYYhka/8/qOSvGoyg7RAvoqqR2PK417kHc2Ien96u7Q+lMwGKmKOpAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5pYnAuY2FzLmN6hiVodHRwczovL2lkcC5pYnAu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRtafM3sXw4M6AoCL8uynsW
+7CQJQzANBgkqhkiG9w0BAQUFAAOCAQEAlujcijW6c8cVu5QpYIxE2g2AiM9MEf7q
+gBHtO2oSuseSHv6h1ZWNA/9qGg2LPWc1T+QWBQZbT16VyGig5Moxb1J8VPxfv+A0
+eQHoLsBTLVP06npY3NztVm3xogPnpwUcjUagECmar/HKkQ8hMeVatK/o3MR05XRC
+ssOxXuhGNkdEqrBAYJ+ABQSCw0yK9qkA0URqksCGHN4jpmflwa4e+PY/DBlHzn1w
+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>
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
new file mode 100644
index 00000000..0c426a89
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.icpf.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDJzCCAg+gAwIBAgIULC7Xy9WFiq6Eyaj6NRjS1Y9Jt88wDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MB4XDTE0MDMxMDA5NDkwMVoX
+DTM0MDMxMDA5NDkwMVowGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRPjpQTPympllXjrRtBYcrmWxIv+
+vUhf1o/CQTvfDfuSqVvPgudJSv74aUiTrF7T6PrUFqPsJTciWEQgMpxhkudh1GzI
+ALGrlRNAJ6CybJRfWwAgHtKEzNT2YcUSqwkLSTvUj6RKWaSxxtFWnhUHCrKEMyRU
+/XeHUmEu/eiy31dA14UReen3zbvGPcecSJ331HaT3hCvhzHUUvj21NxyHGmHu990
+w+JOnmuAmVMy7wp39qOaCT8baf5jqXHz6RiB7MHNB+lYoeeq6FsH0+Kx7/ITCNV5
+Rgu+i0e9xYHQeoDcoj+9M+KKKtc0kTaEAgrQShvC3s7RNmiT3IAmF5dvzwIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAuaWNwZi5jYXMuY3qGJmh0dHBzOi8vaWRwLmlj
+cGYuY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRL04il4DX4yVt2YRKw
+yn0RE+jvTjANBgkqhkiG9w0BAQUFAAOCAQEAU8gysmTVfqkh0LLJwGUaYxUN4UZM
+6X9YFsZ0scuhgx6lIbSuqA5Q/cmWlgkk1nnIQEEf5krQ7B/c/LW9SJVvJ2qI3+oy
+Do0R2kOsZJGbYQ86RePMWi/ZrTZ23YWWCEAd3d16t1vyoyPe7pUpUDcH5yMR+ox2
+wmaJjLwBh44Tq/Net8+VU5x1X1Odcm0gKxaUL3wMGkWcmu3TTFVGTW6dQqmk+9vH
+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>
+MIIDJzCCAg+gAwIBAgIULC7Xy9WFiq6Eyaj6NRjS1Y9Jt88wDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MB4XDTE0MDMxMDA5NDkwMVoX
+DTM0MDMxMDA5NDkwMVowGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRPjpQTPympllXjrRtBYcrmWxIv+
+vUhf1o/CQTvfDfuSqVvPgudJSv74aUiTrF7T6PrUFqPsJTciWEQgMpxhkudh1GzI
+ALGrlRNAJ6CybJRfWwAgHtKEzNT2YcUSqwkLSTvUj6RKWaSxxtFWnhUHCrKEMyRU
+/XeHUmEu/eiy31dA14UReen3zbvGPcecSJ331HaT3hCvhzHUUvj21NxyHGmHu990
+w+JOnmuAmVMy7wp39qOaCT8baf5jqXHz6RiB7MHNB+lYoeeq6FsH0+Kx7/ITCNV5
+Rgu+i0e9xYHQeoDcoj+9M+KKKtc0kTaEAgrQShvC3s7RNmiT3IAmF5dvzwIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAuaWNwZi5jYXMuY3qGJmh0dHBzOi8vaWRwLmlj
+cGYuY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRL04il4DX4yVt2YRKw
+yn0RE+jvTjANBgkqhkiG9w0BAQUFAAOCAQEAU8gysmTVfqkh0LLJwGUaYxUN4UZM
+6X9YFsZ0scuhgx6lIbSuqA5Q/cmWlgkk1nnIQEEf5krQ7B/c/LW9SJVvJ2qI3+oy
+Do0R2kOsZJGbYQ86RePMWi/ZrTZ23YWWCEAd3d16t1vyoyPe7pUpUDcH5yMR+ox2
+wmaJjLwBh44Tq/Net8+VU5x1X1Odcm0gKxaUL3wMGkWcmu3TTFVGTW6dQqmk+9vH
+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>
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
new file mode 100644
index 00000000..d1240077
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ids-mannheim.de-idp-shibboleth.xml
@@ -0,0 +1,148 @@
+<?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>
+      <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
+BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFu
+bmhlaW0xJzAlBgNVBAoTHkluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNoZTEV
+MBMGA1UEAxMMSURTLUNBIC0gRzAxMSEwHwYJKoZIhvcNAQkBFhJjYUBpZHMtbWFu
+bmhlaW0uZGUwHhcNMTQxMDMwMTI0ODEzWhcNMTkwNzA5MjM1OTAwWjCBqDELMAkG
+A1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMI
+TWFubmhlaW0xJzAlBgNVBAoTHkluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNo
+ZTEcMBoGA1UEAxMTaWRwLmlkcy1tYW5uaGVpbS5kZTEiMCAGCSqGSIb3DQEJARYT
+YWFpQGlkcy1tYW5uaGVpbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMEpjcJqElfR/q7nXOeozPXG5oT5rzHekYQj/I0ct//VV+9eSO6E4hrFINfz
+16tBu0fBjoKK2nkkbTjsUUvyaGCUmwVwi5dQBdSOUFdWyGb2GaXCL5iilen1qv5W
+NS8ZRER/opCL0UxYfH0D4x4QXZxm7SV9DX6p8nce9DX1cPjZa5Fdjhnm6k6CrHPZ
+IT/UjzpogdSKkqyRQ+MKsGm7W5byJYRVzLeF430Wyt8WdFaCFKxABQ6+m7kurr8k
+T6PDdVejJun1f4JPlR7VxKSLgRcVd5DoZZiBKGG8WPVYbNP/BjipICZNcSGudEka
+XF0XELr2jhLVBuamju1hcQ10QrsCAwEAAaOCAlYwggJSMAkGA1UdEwQCMAAwCwYD
+VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
+FgQUEdZJyOrynFzaW702/kSO4hIlTvcwHwYDVR0jBBgwFoAUVrqWhZ2xhKhzkeH2
+OZ+hhjBEDs4wHgYDVR0RBBcwFYITaWRwLmlkcy1tYW5uaGVpbS5kZTCBiwYDVR0f
+BIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2lkcy1tYW5uaGVp
+bS1jYS9wdWIvY3JsL2NhY3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRm
+bi5kZS9pZHMtbWFubmhlaW0tY2EvcHViL2NybC9jYWNybC5jcmwwgdkGCCsGAQUF
+BwEBBIHMMIHJMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09D
+U1AtU2VydmVyL09DU1AwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAxLnBjYS5kZm4u
+ZGUvaWRzLW1hbm5oZWltLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBIBggrBgEF
+BQcwAoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS9pZHMtbWFubmhlaW0tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0ME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMC
+MBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0h
+giweMA0GCSqGSIb3DQEBCwUAA4IBAQBew4lONOMqaB2fAdWnI7rQF3X6r8WQCxYs
+0BaFT0dY5hR9z1LT5WsSx55B4K0IJoXJjrpdYqh4wLg+pcwwnfFSs4tFO0iqh58X
+Qa2ZTPt4Js8DSDYQPi5Y4SWp6jdUoLuCKn7pOwSEIZTty4N2BvzuO3bmdBPDSpa7
+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
+BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFu
+bmhlaW0xJzAlBgNVBAoTHkluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNoZTEV
+MBMGA1UEAxMMSURTLUNBIC0gRzAxMSEwHwYJKoZIhvcNAQkBFhJjYUBpZHMtbWFu
+bmhlaW0uZGUwHhcNMTQxMDMwMTI0ODEzWhcNMTkwNzA5MjM1OTAwWjCBqDELMAkG
+A1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMI
+TWFubmhlaW0xJzAlBgNVBAoTHkluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNo
+ZTEcMBoGA1UEAxMTaWRwLmlkcy1tYW5uaGVpbS5kZTEiMCAGCSqGSIb3DQEJARYT
+YWFpQGlkcy1tYW5uaGVpbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMEpjcJqElfR/q7nXOeozPXG5oT5rzHekYQj/I0ct//VV+9eSO6E4hrFINfz
+16tBu0fBjoKK2nkkbTjsUUvyaGCUmwVwi5dQBdSOUFdWyGb2GaXCL5iilen1qv5W
+NS8ZRER/opCL0UxYfH0D4x4QXZxm7SV9DX6p8nce9DX1cPjZa5Fdjhnm6k6CrHPZ
+IT/UjzpogdSKkqyRQ+MKsGm7W5byJYRVzLeF430Wyt8WdFaCFKxABQ6+m7kurr8k
+T6PDdVejJun1f4JPlR7VxKSLgRcVd5DoZZiBKGG8WPVYbNP/BjipICZNcSGudEka
+XF0XELr2jhLVBuamju1hcQ10QrsCAwEAAaOCAlYwggJSMAkGA1UdEwQCMAAwCwYD
+VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
+FgQUEdZJyOrynFzaW702/kSO4hIlTvcwHwYDVR0jBBgwFoAUVrqWhZ2xhKhzkeH2
+OZ+hhjBEDs4wHgYDVR0RBBcwFYITaWRwLmlkcy1tYW5uaGVpbS5kZTCBiwYDVR0f
+BIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2lkcy1tYW5uaGVp
+bS1jYS9wdWIvY3JsL2NhY3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRm
+bi5kZS9pZHMtbWFubmhlaW0tY2EvcHViL2NybC9jYWNybC5jcmwwgdkGCCsGAQUF
+BwEBBIHMMIHJMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09D
+U1AtU2VydmVyL09DU1AwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAxLnBjYS5kZm4u
+ZGUvaWRzLW1hbm5oZWltLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBIBggrBgEF
+BQcwAoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS9pZHMtbWFubmhlaW0tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0ME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMC
+MBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0h
+giweMA0GCSqGSIb3DQEBCwUAA4IBAQBew4lONOMqaB2fAdWnI7rQF3X6r8WQCxYs
+0BaFT0dY5hR9z1LT5WsSx55B4K0IJoXJjrpdYqh4wLg+pcwwnfFSs4tFO0iqh58X
+Qa2ZTPt4Js8DSDYQPi5Y4SWp6jdUoLuCKn7pOwSEIZTty4N2BvzuO3bmdBPDSpa7
+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>
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
new file mode 100644
index 00000000..78b392ed
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifal.edu.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia 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>
+    MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExLDAqBgNVBAoTI0lGQUwgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkZSBBbGFnb2FzMTYwNAYDVQQLFC1EVEkgLSBEaXJl
+dG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xHjAcBgkqhkiG9w0B
+CQEWD2R0aUBpZmFsLmVkdS5icjEQMA4GA1UEBxQHTWFjZWnDszEQMA4GA1UECBMH
+QWxhZ29hczELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZmFsLmVkdS5icjAe
+Fw0xNDA0MDkxNzUwMDdaFw0xOTA0MDgxNzUwMDdaMIHRMSwwKgYDVQQKEyNJRkFM
+IC0gSW5zdGl0dXRvIEZlZGVyYWwgZGUgQWxhZ29hczE2MDQGA1UECxQtRFRJIC0g
+RGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMR4wHAYJKoZI
+hvcNAQkBFg9kdGlAaWZhbC5lZHUuYnIxEDAOBgNVBAcUB01hY2Vpw7MxEDAOBgNV
+BAgTB0FsYWdvYXMxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAuaWZhbC5lZHUu
+YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMYSN7ZQVR03UfNJEG
+xcyGLGW4iWbmGMuhnua6t+X6HMhU2YFmCB/nVKmPaLZrGdtopkFxO9vvCr9kHRPl
+5xRVT20yWIiSiQVsFZYc76FOS3jTwgYAE0+lwt/4N+6lsSSSD1JByI8PDR/E3v4U
+FEDmJ/SpPQo93OWYlUNyo9LsFGFYJ88U4EX8Tg+LmPpvjP7AKwuOpUtyV8Mdv97x
+HxVvQ6eh2hhibiaS3h/YPhyqBPn7rviM//zUx5/rcjABdlcLRmnguuXF/FCnWWHz
+JNvxikEjpADZw4I9zA+aMr/cJEkfnryEGzRrLRzfMdFa4bP3/MEQYmIdhDIej9+K
+7mZZAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADYaFXfiCJtLtww2Qwwanyg4qUT2
+B2oYluc4YiHrGNT+ZAsr9g94gumyDyZ+XbZWHhWrrLCfw9qe3h0CrRUDo8imO+sE
+TYGq7XpOcAJWyKQVgcDICWiL6zQENRX/EeOfmOpbkjea/MEaqK0nyRQlaA4pIXYL
+vSvRPNaw93HsFLdGrJOQ0iZIp3wXB/th8NcGeLYC2DVXWfyL+3dTsCusEatFrkWO
+GYTYC2CuhPvNQnW6zntOBvF5+m8u3UE5S7b1ewJNR+bmnyRc5Jn3c+hDby241MxP
+9absP8SAHft1nylCyQlyRb7eDLMdi+iNITGXEKHAyXu20TXapcllySccxOk=
+            </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>
+      
+MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExLDAqBgNVBAoTI0lGQUwgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkZSBBbGFnb2FzMTYwNAYDVQQLFC1EVEkgLSBEaXJl
+dG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xHjAcBgkqhkiG9w0B
+CQEWD2R0aUBpZmFsLmVkdS5icjEQMA4GA1UEBxQHTWFjZWnDszEQMA4GA1UECBMH
+QWxhZ29hczELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZmFsLmVkdS5icjAe
+Fw0xNDA0MDkxNzUwMDdaFw0xOTA0MDgxNzUwMDdaMIHRMSwwKgYDVQQKEyNJRkFM
+IC0gSW5zdGl0dXRvIEZlZGVyYWwgZGUgQWxhZ29hczE2MDQGA1UECxQtRFRJIC0g
+RGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMR4wHAYJKoZI
+hvcNAQkBFg9kdGlAaWZhbC5lZHUuYnIxEDAOBgNVBAcUB01hY2Vpw7MxEDAOBgNV
+BAgTB0FsYWdvYXMxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAuaWZhbC5lZHUu
+YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMYSN7ZQVR03UfNJEG
+xcyGLGW4iWbmGMuhnua6t+X6HMhU2YFmCB/nVKmPaLZrGdtopkFxO9vvCr9kHRPl
+5xRVT20yWIiSiQVsFZYc76FOS3jTwgYAE0+lwt/4N+6lsSSSD1JByI8PDR/E3v4U
+FEDmJ/SpPQo93OWYlUNyo9LsFGFYJ88U4EX8Tg+LmPpvjP7AKwuOpUtyV8Mdv97x
+HxVvQ6eh2hhibiaS3h/YPhyqBPn7rviM//zUx5/rcjABdlcLRmnguuXF/FCnWWHz
+JNvxikEjpADZw4I9zA+aMr/cJEkfnryEGzRrLRzfMdFa4bP3/MEQYmIdhDIej9+K
+7mZZAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADYaFXfiCJtLtww2Qwwanyg4qUT2
+B2oYluc4YiHrGNT+ZAsr9g94gumyDyZ+XbZWHhWrrLCfw9qe3h0CrRUDo8imO+sE
+TYGq7XpOcAJWyKQVgcDICWiL6zQENRX/EeOfmOpbkjea/MEaqK0nyRQlaA4pIXYL
+vSvRPNaw93HsFLdGrJOQ0iZIp3wXB/th8NcGeLYC2DVXWfyL+3dTsCusEatFrkWO
+GYTYC2CuhPvNQnW6zntOBvF5+m8u3UE5S7b1ewJNR+bmnyRc5Jn3c+hDby241MxP
+9absP8SAHft1nylCyQlyRb7eDLMdi+iNITGXEKHAyXu20TXapcllySccxOk=
+                    
+            </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 Educacao, Ciencia e Tecnologia de Alagoas</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia 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
new file mode 100644
index 00000000..c0b9a7c8
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifap.edu.br-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDRFRJMQswCQYD
+VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQxMDE2MTEyOFoXDTE5MDQwOTE2
+MTEyOFowKTEMMAoGA1UECxMDRFRJMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6lU1vl2shAmZ5lk9mqgL
+W0fGHYgMHSqS2gQqaTW2KfAoe6wvyEjkmFa2KTTa7gmTjBQBGahHpKjrTpMd1FEq
+MC1Eu9lLlStVvUjqp23DLdwIKzNcR+SnvPKbPWI6168jZlE5ymytgF7wUsJj9PB7
+7i9FpJ8kZgky9iZhHCsBp9AdQVFznpEGn/pwmPwtXEzQBFdwSqXdkUpISlHPe5dB
+ItnNx6Z8YCEcBA+IzOL38By8MG8LMbziCPQpQ7TgXiEE5vLsocJw/UF5DiWqSZ+n
+Z/GLwXx5rkbaB8wQZen2v0q+bghS7nmp3hKAsYKNTlw0jPxji/nitm5nZSReDv1D
+gwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQDJ9GGFu1uP2xSjX0bEPb/jhKOKU9VD
+LH2vSu9V0zbkH9/uxgGLfOHuP+83QyDLfxEJKa1Ga4Hw+y6o7vyn3mW0RXBBloF/
+GTeDI2aFAmuPNomYl+ijCxk37ur/iQ3ugo0PbvVSZV9hxic8FJbBjGg7ZvyMXwuZ
+1nQfeXL+1qESFEwm5ClCR9G/WNmhaxr1bYanl9uvCS4tmpKJ1zZthDpnCRYLoIdx
+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>
+      
+MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xKzApBgNVBAoUIklGQVAgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBBbWFww6ExDDAKBgNVBAsTA0RUSTEoMCYGCSqG
+SIb3DQEJARYZbWFyY28ucGFudG9qYUBpZmFwLmVkdS5icjEQMA4GA1UEBxQHTWFj
+YXDDoTEPMA0GA1UECBQGQW1hcMOhMQswCQYDVQQGEwJCUjEYMBYGA1UEAxMPaWRw
+LmlmYXAuZWR1LmJyMB4XDTEzMTIxOTE4MDIwM1oXDTE2MTIxODE4MDIwM1owga8x
+KzApBgNVBAoUIklGQVAgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBBbWFww6ExDDAK
+BgNVBAsTA0RUSTEoMCYGCSqGSIb3DQEJARYZbWFyY28ucGFudG9qYUBpZmFwLmVk
+dS5icjEQMA4GA1UEBxQHTWFjYXDDoTEPMA0GA1UECBQGQW1hcMOhMQswCQYDVQQG
+EwJCUjEYMBYGA1UEAxMPaWRwLmlmYXAuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA6lU1vl2shAmZ5lk9mqgLW0fGHYgMHSqS2gQqaTW2KfAo
+e6wvyEjkmFa2KTTa7gmTjBQBGahHpKjrTpMd1FEqMC1Eu9lLlStVvUjqp23DLdwI
+KzNcR+SnvPKbPWI6168jZlE5ymytgF7wUsJj9PB77i9FpJ8kZgky9iZhHCsBp9Ad
+QVFznpEGn/pwmPwtXEzQBFdwSqXdkUpISlHPe5dBItnNx6Z8YCEcBA+IzOL38By8
+MG8LMbziCPQpQ7TgXiEE5vLsocJw/UF5DiWqSZ+nZ/GLwXx5rkbaB8wQZen2v0q+
+bghS7nmp3hKAsYKNTlw0jPxji/nitm5nZSReDv1DgwIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQCj9QDb4QEUtzeU527JnQqF8DGTV275Px5iJWm3+pyv1ScYcJ903JyQ
+PNxPh+WdRkAxBcCMbd1vH4toAVZX6EDMlJv/H9x/nmnWTl+GigzLz4vAOREaab15
+tQPwipCRXVnakkVxYk+1QWrmXyzZPaw3dOLVOg/SSTVk87vnhuX1nvu2r7ZVNDZv
+34WrTP8bVJd5c8yIMuvCMBPp30p4A8NGm1PkZP+OIH5CVO25cNSVq66/OeCSr3Se
+IckFRapAp4rc+PDyWiwSM6Xy8kM9pdraxGWoW0697si+Ji4MsIdah9I7+C6B6XB2
+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>
diff --git a/swamid-interfederations-2.0/idp.ifc.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifc.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..8be498be
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifc.edu.br-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-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.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDRFRJMQswCQYD
+VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQwOTE3MzAyN1oXDTE5MDQwODE3
+MzAyN1owKTEMMAoGA1UECxMDRFRJMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAweLZ9PCMIFyNRZxpJraU
+tsB76JjKzQtx6QfkHSiDx5uwHTgiTQilQBJFCAlz2NQGlFH46zHGTemNS3S5J2GA
+zcBTuJskMbFFXOnfi33F8jBJTodaCq2V9pGwdjTs3ebPKekDYCeHRPYwhBszPWqj
+eXOCrAzZEfBwdsxallOhle6mqr4mw2tFwx5k67X8kdwVpkFaNjGtUDMfltjhVy6u
+0NiRhgaT9E9WMj/wKrDVzs0rYkxthF6qh+FcoLIIwB9SenqtmiK9uAWhRje7LH3Y
+lsu8G7kTdGyS0/CyABr9+FL8XxJ2VKwIABWEvl6UoinY122zAy/uDxzk4qkq0ge7
+ywIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCwZr/7KyPjp03yXWWifSpXVOZMWb0k
+RoJyA5upb4YWilPJGH/B5frSuXnzaAY7vSFEGKqjzk2JcpH5hv2M0wLWBYXZgp3c
+X6t16xJB7M0Ob5mOFz7Z0toxyuNHm8egrKjdhUS9od67QempObje5TRgwk8szHhv
+REBeVYn9VTnMBpHvTzVXUqWzvVaULHwo9207emUQPljqP8whQkpMzjp49OsD75ua
+3ejIxW0axzH47H9klC86IALnAXv+Ad5sh41ZHuBX6zz7N/Cenu/W9SFDJ5x1IIsw
+xLSEYO4XtQH/sy1ouM4VkghXlqRSeKDOgynu35E6pd2ZtyqDIjWQlpxk
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.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://idp.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://idp.ifc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifc.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifc.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.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>
+      
+MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDRFRJMQswCQYD
+VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQwOTE3MzAyN1oXDTE5MDQwODE3
+MzAyN1owKTEMMAoGA1UECxMDRFRJMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAweLZ9PCMIFyNRZxpJraU
+tsB76JjKzQtx6QfkHSiDx5uwHTgiTQilQBJFCAlz2NQGlFH46zHGTemNS3S5J2GA
+zcBTuJskMbFFXOnfi33F8jBJTodaCq2V9pGwdjTs3ebPKekDYCeHRPYwhBszPWqj
+eXOCrAzZEfBwdsxallOhle6mqr4mw2tFwx5k67X8kdwVpkFaNjGtUDMfltjhVy6u
+0NiRhgaT9E9WMj/wKrDVzs0rYkxthF6qh+FcoLIIwB9SenqtmiK9uAWhRje7LH3Y
+lsu8G7kTdGyS0/CyABr9+FL8XxJ2VKwIABWEvl6UoinY122zAy/uDxzk4qkq0ge7
+ywIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCwZr/7KyPjp03yXWWifSpXVOZMWb0k
+RoJyA5upb4YWilPJGH/B5frSuXnzaAY7vSFEGKqjzk2JcpH5hv2M0wLWBYXZgp3c
+X6t16xJB7M0Ob5mOFz7Z0toxyuNHm8egrKjdhUS9od67QempObje5TRgwk8szHhv
+REBeVYn9VTnMBpHvTzVXUqWzvVaULHwo9207emUQPljqP8whQkpMzjp49OsD75ua
+3ejIxW0axzH47H9klC86IALnAXv+Ad5sh41ZHuBX6zz7N/Cenu/W9SFDJ5x1IIsw
+xLSEYO4XtQH/sy1ouM4VkghXlqRSeKDOgynu35E6pd2ZtyqDIjWQlpxk
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.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>Renato de Souza Muniz</md:SurName>
+    <md:EmailAddress>infra@ifc.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
new file mode 100644
index 00000000..8ef45b05
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxLDAqBgNVBAoTI0lGUEIgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhaWJhMQwwCgYDVQQLEwNEVEkxKjAoBgkq
+hkiG9w0BCQEWG2pvc2UuY2F2YWxjYW50aUBpZnBiLmVkdS5icjEUMBIGA1UEBxML
+Sm9hbyBQZXNzb2ExEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYD
+VQQDEw9pZHAuaWZwYi5lZHUuYnIwHhcNMTQwNDIzMjAzMzE0WhcNMTkwNDIyMjAz
+MzE0WjCBtzEsMCoGA1UEChMjSUZQQiAtIEluc3RpdHV0byBGZWRlcmFsIGRhIFBh
+cmFpYmExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbam9zZS5jYXZhbGNh
+bnRpQGlmcGIuZWR1LmJyMRQwEgYDVQQHEwtKb2FvIFBlc3NvYTEQMA4GA1UECBMH
+UGFyYWliYTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZ5IlaQxWRUtbccktlNZQQB
+AWQi/f86zxT/f8ilpR8Lmss8W3TG3/U5L4MoscHCEQfOfBgAoQqxHsj8V1VDoL8B
+NfR6XAFqeWfKf8B8wcbX8CnNY9FZbgs2g1z2xsNQuAbFYunxUe3Y5A1xwH0aD04g
+8E4ubcEnLisB3an5zK/dWbGdBjUSuNADzgqbhftpFjZFPDi8DYezjYYxHUX5MNv6
+lb5/uQ7JjTWT3QssD0qG6pgNNANpQA8Jl2IWGb1qnNtjb9UbUPwYF2R6k4oXBFo+
+I2XW2cMUFvowftOpiNP/IrAAKIX0BGWuEtjL4VHoKvOtNwnikGw1DQYtUUvxNvkC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAZhN6yFJijeBhyIU+td6IXlEQ9hNJ4CJd
+GXb/jpnyYj5DOYSBKE/0mQd4zPoME7Xc9+Zz8FErWxephrvNVm8sSNmWjKqGJpCt
+vAjhJhL48QkjqgGWQJq0kVyHEfuwFbva3mH22I1oRrsnw44paMVHOrNtcEkf2NL2
+aDYQL1qLooSFjrvndyvfEIlxa+QJP8D9pgD3GLtiyPt4WWcUb4SmXrVc1RpFZSyU
+tVN4EFbgvRCPqHc+GX/5vjxJwTl7tFO9Jqa0C5i/4mRhqW5wRqd7I35KTJTimc/b
+kCPbbyEGhzyWdtZGIWPGqY+fZw8Z6WcAOOr25/JEw/veCHLskaV6GA==
+            </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>
+      
+MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxLDAqBgNVBAoTI0lGUEIgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhaWJhMQwwCgYDVQQLEwNEVEkxKjAoBgkq
+hkiG9w0BCQEWG2pvc2UuY2F2YWxjYW50aUBpZnBiLmVkdS5icjEUMBIGA1UEBxML
+Sm9hbyBQZXNzb2ExEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYD
+VQQDEw9pZHAuaWZwYi5lZHUuYnIwHhcNMTQwNDIzMjAzMzE0WhcNMTkwNDIyMjAz
+MzE0WjCBtzEsMCoGA1UEChMjSUZQQiAtIEluc3RpdHV0byBGZWRlcmFsIGRhIFBh
+cmFpYmExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbam9zZS5jYXZhbGNh
+bnRpQGlmcGIuZWR1LmJyMRQwEgYDVQQHEwtKb2FvIFBlc3NvYTEQMA4GA1UECBMH
+UGFyYWliYTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZ5IlaQxWRUtbccktlNZQQB
+AWQi/f86zxT/f8ilpR8Lmss8W3TG3/U5L4MoscHCEQfOfBgAoQqxHsj8V1VDoL8B
+NfR6XAFqeWfKf8B8wcbX8CnNY9FZbgs2g1z2xsNQuAbFYunxUe3Y5A1xwH0aD04g
+8E4ubcEnLisB3an5zK/dWbGdBjUSuNADzgqbhftpFjZFPDi8DYezjYYxHUX5MNv6
+lb5/uQ7JjTWT3QssD0qG6pgNNANpQA8Jl2IWGb1qnNtjb9UbUPwYF2R6k4oXBFo+
+I2XW2cMUFvowftOpiNP/IrAAKIX0BGWuEtjL4VHoKvOtNwnikGw1DQYtUUvxNvkC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAZhN6yFJijeBhyIU+td6IXlEQ9hNJ4CJd
+GXb/jpnyYj5DOYSBKE/0mQd4zPoME7Xc9+Zz8FErWxephrvNVm8sSNmWjKqGJpCt
+vAjhJhL48QkjqgGWQJq0kVyHEfuwFbva3mH22I1oRrsnw44paMVHOrNtcEkf2NL2
+aDYQL1qLooSFjrvndyvfEIlxa+QJP8D9pgD3GLtiyPt4WWcUb4SmXrVc1RpFZSyU
+tVN4EFbgvRCPqHc+GX/5vjxJwTl7tFO9Jqa0C5i/4mRhqW5wRqd7I35KTJTimc/b
+kCPbbyEGhzyWdtZGIWPGqY+fZw8Z6WcAOOr25/JEw/veCHLskaV6GA==
+                    
+            </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>Jose Hermano Cavalcanti Filho</md:SurName>
+    <md:EmailAddress>jose.cavalcanti@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
new file mode 100644
index 00000000..81506232
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifremer.fr-idp-shibboleth.xml
@@ -0,0 +1,92 @@
+<?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>
+      <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="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>
+					      MIIEijCCA3KgAwIBAgIQMyTXXlW9hy8Y6QcUc2/LXzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMDMxMzAwMDAwMFoXDTE1MDMxMzIzNTk1OVowZzELMAkGA1UE
+BhMCRlIxLTArBgNVBAoTJElOU1QgRlIgUkVDSEVSQ0hFIFBPVVIgTCBFWFBMT0lU
+IE1FUjEQMA4GA1UECxMHSWZyZW1lcjEXMBUGA1UEAxMOaWRwLmlmcmVtZXIuZnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClaKJ3xIXrmlhK6UQmXeUw
+NQI0MCoL8n7ZiamNxs2UajZWwWipFo7bQ9288t/z30re8ngS4M1S0OECMJryDE3N
+fOKuKN4LxzAgExZ4KEGzcOkkuSs+CqGN/l8TG3GrCEQkVb73D7WcnKrQm9cJn1j8
+dxiQjGg+VFaf7PVOSpYlm2QEefevnoium7eyouNLsmQs4uM5zjmxZx1OC42Fam4s
+DMdiDYSZvSgrje7YSPQlc40CT/a1GUeKtrG6EWoyEhL/apg28XDvqTBdzMEqBwvW
+b32r5ZaQOAC0INCUGNArEl+z/rVUEkgzajtEt1eDkFD/3ADGvo/d1gU74SGbv8hL
+AgMBAAGjggFhMIIBXTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
+BgNVHQ4EFgQUcBgRxOMX8JDcwteMb85Dnf5zOf4wDgYDVR0PAQH/BAQDAgWgMAwG
+A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1Ud
+IAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2Ny
+bC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBf
+MDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcw
+GQYDVR0RBBIwEIIOaWRwLmlmcmVtZXIuZnIwDQYJKoZIhvcNAQEFBQADggEBADWG
+GYNO+95n4uytgs+sIEuzElrSJzDe5Kw1opSo5vTYaSkBYKlTQRGpleab+4kbdeLg
+n4qvMzMPwjCBwcAGdeJHXKk7MeG1bH3uyxSaLFJIzlibDIfolwh+SFOMzlWBt9Z3
+MtreBz7EfY3aa6fBySCmcPEDyeye2V2IsD8QXlI3GuBFkv9c8xYGmI3krHoOAy2g
+hZ2ugMoPK71mFFJPxshrqoIztjyQYSkDfiO2T6rj0rjO8LzOiFjXcK7hOIBYvCrg
+zXV+QCUbY/ybM1SrZ1UoRiD3zdYc12j2G+bNJXA/F/PzcGVm5FCodlgwUs9RH6Xn
+epzgatQFKE2hNWcrgIY=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDJDCCAgygAwIBAgIVAJ8uLw0iofdd05rXMIJ1IiWOUhA7MA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5pZnJlbWVyLmZyMB4XDTEzMDcwNDEzMDExOFoX
+DTMzMDcwNDEzMDExOFowGTEXMBUGA1UEAxMOaWRwLmlmcmVtZXIuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1ClLLTrrWqphf2yvm96RoikBLDouy
+RcC5YGYobGfjjQHl6YwzLIgD/pDFQXWqJkbs1x1gFiaKwAro1Yw6b+nHVhOleyDB
+5C6Lys7RwQUuevJAogsrwSBUZ2b2utRf5Y0Ul9sg+WJcRMBz0VbTsLRFqxGjZ4qQ
+H43WtoRohpzjJtlMkKQlWUoNlhqWZhmUzAWy5yEBp3eXMUZVwbfGp5UljMBuL42j
+kWbkL8cJevSDuU+uGLvMRn/GQY0Sm6Oqo+QKiMLDyxniTfTdXLqj1WZ5q/Md5bEL
+ZRbmh1gqKd2RUBg2ZJPe7t/HLqkfkHCG+ka03veNDV15uS76DSdIJyXrAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5pZnJlbWVyLmZyhiVodHRwczovL2lkcC5pZnJl
+bWVyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRnJM2lEdm9x7XDHxYqGbKW
+XAn0lzANBgkqhkiG9w0BAQUFAAOCAQEADpZMeXoBV0lIfYJ6vLPzp6rdROZybxi5
+4S+zIN/bXg1H3FiAhQzR1pnGa6RCvTK1o9qLOZIgiR+GK+vrXz7/TXSMHp6nb0WK
+58OYQEA03qb41lZyubC5ZK2cNl9wS2HWsg7yGWGaaNw0VRcn1rPFmW4V6cDGgta1
+qmsJBwn2iDN/HllrlhPy0hDx356HqywmGqPMwbSlfon11vFqXS08thu9OFGFHYAw
+7v1J1BIO3JCc53qYhVy7WJ5STt6Y9JyB+jIqwRx7VYqxVHxsMmIIq6s8pMxpFwar
+e60xwMlwpLu7RawIAY2W1ThaahfsuUOQovLiv4AwqJYqndeRwqRGgQ==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc: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://unknown.site.com</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.ifsudestemg.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..4f23d9d6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIID3jCCAsYCAQIwDQYJKoZIhvcNAQEFBQAwgbQxFjAUBgNVBAoTDUlGIFN1ZGVz
+dGUgTUcxFzAVBgNVBAsTDlBST0RJL0RHVEkvQ1JJMSUwIwYJKoZIhvcNAQkBFhZj
+cmlAaWZzdWRlc3RlbWcuZWR1LmJyMRUwEwYDVQQHEwxKdWl6IGRlIEZvcmExFTAT
+BgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFmlkcC5p
+ZnN1ZGVzdGVtZy5lZHUuYnIwHhcNMTQwNTI2MTkzNjM4WhcNMTcwNTI1MTkzNjM4
+WjCBtDEWMBQGA1UEChMNSUYgU3VkZXN0ZSBNRzEXMBUGA1UECxMOUFJPREkvREdU
+SS9DUkkxJTAjBgkqhkiG9w0BCQEWFmNyaUBpZnN1ZGVzdGVtZy5lZHUuYnIxFTAT
+BgNVBAcTDEp1aXogZGUgRm9yYTEVMBMGA1UECBMMTWluYXMgR2VyYWlzMQswCQYD
+VQQGEwJCUjEfMB0GA1UEAxMWaWRwLmlmc3VkZXN0ZW1nLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEoOjQZlyUQUe1L4itiQULFj/VW1LhW
+nUTS1MuWbER1HiWpuT6UJFMY+0q0d/tQ0RPXQakkvpWPC1yxR7iknXgg9oxjSb9T
+9WjLPbdvQCMPFCVe/aBgwUZ9RdLsETcuHagJ+ebD7QB1NnVhco9/rE398YHT+5X7
+OZkFuqOSKaEw7+79Jt5Vc4w6Tc6fPzrCAaT7G7YuXKRq0I8WV3xJClz0OwHZymz8
+eEBB7F/E0kr61/XRQjf3i4+F6pad8UT6FkmWbEvfFr54OtvqaPKL9tZWPnncrg4r
+Shw2qieG3AqcXO2jIGC3Iyk/TSS6lQQHYv1v5ELst87SQ8tSwuO8Yp8CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAXmh5aRLYZn3vwyFcDKhR2i1SmaDMlJnN73ubJ8Pk
+3gwuyPcj/XdpLSFsCSKNeM2BAljp5D8i93+j9RjR/GvKA4pchq4DdVrw/45gcW57
+bnC1Dux/0kfBgZLy8GUg612ZdWm0F2kttOI/kDWmlWOFERcqmja0LM4cwzs+byj8
+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>
+      
+MIID3jCCAsYCAQIwDQYJKoZIhvcNAQEFBQAwgbQxFjAUBgNVBAoTDUlGIFN1ZGVz
+dGUgTUcxFzAVBgNVBAsTDlBST0RJL0RHVEkvQ1JJMSUwIwYJKoZIhvcNAQkBFhZj
+cmlAaWZzdWRlc3RlbWcuZWR1LmJyMRUwEwYDVQQHEwxKdWl6IGRlIEZvcmExFTAT
+BgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFmlkcC5p
+ZnN1ZGVzdGVtZy5lZHUuYnIwHhcNMTQwNTI2MTkzNjM4WhcNMTcwNTI1MTkzNjM4
+WjCBtDEWMBQGA1UEChMNSUYgU3VkZXN0ZSBNRzEXMBUGA1UECxMOUFJPREkvREdU
+SS9DUkkxJTAjBgkqhkiG9w0BCQEWFmNyaUBpZnN1ZGVzdGVtZy5lZHUuYnIxFTAT
+BgNVBAcTDEp1aXogZGUgRm9yYTEVMBMGA1UECBMMTWluYXMgR2VyYWlzMQswCQYD
+VQQGEwJCUjEfMB0GA1UEAxMWaWRwLmlmc3VkZXN0ZW1nLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEoOjQZlyUQUe1L4itiQULFj/VW1LhW
+nUTS1MuWbER1HiWpuT6UJFMY+0q0d/tQ0RPXQakkvpWPC1yxR7iknXgg9oxjSb9T
+9WjLPbdvQCMPFCVe/aBgwUZ9RdLsETcuHagJ+ebD7QB1NnVhco9/rE398YHT+5X7
+OZkFuqOSKaEw7+79Jt5Vc4w6Tc6fPzrCAaT7G7YuXKRq0I8WV3xJClz0OwHZymz8
+eEBB7F/E0kr61/XRQjf3i4+F6pad8UT6FkmWbEvfFr54OtvqaPKL9tZWPnncrg4r
+Shw2qieG3AqcXO2jIGC3Iyk/TSS6lQQHYv1v5ELst87SQ8tSwuO8Yp8CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAXmh5aRLYZn3vwyFcDKhR2i1SmaDMlJnN73ubJ8Pk
+3gwuyPcj/XdpLSFsCSKNeM2BAljp5D8i93+j9RjR/GvKA4pchq4DdVrw/45gcW57
+bnC1Dux/0kfBgZLy8GUg612ZdWm0F2kttOI/kDWmlWOFERcqmja0LM4cwzs+byj8
+Wum6NyNsy/5XSVhTMA7xUcypbrU/d7S9I2ik9Kope2e4Oihu5GX1YvtapIOzZ2EQ
+0yyvP5Y629IcqIzAMqR5tcYK9dMl2fmFQBhwdGciJKxQaAdyQkKvrXfSkuV/mi0V
+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>
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
new file mode 100644
index 00000000..0c346ca8
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFTO-Instituto Federal do Educacao do Tocantins</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFTO-Instituto Federal do Educacao do Tocantins</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFTO-Instituto Federal do Educacao 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>
+    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQxMDEyMDkxM1oXDTE5MDQwOTEy
+MDkxM1owKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTw62MPvGqETh9JqxpDT
+SEk3yr0pgXrgqsueDBe1fw1+A/xsdd12PL6L+Js5Fmwzr2bi/CwQgS8sus11FfKb
+zNyxeMnK5emZHOVDbw8E2MRk2RwHy1dzt99G/tgRUh2fqQYoKDFiVHvbmKOCtmtY
+GB7teGLk+eXw5dwdrcy0h8pNajTIOoNEoDhYwlIHvreQLGrLP5zEtDRX9QkWqU6o
+Gl4fltzgjFGvh+DNGNVcbZC3dF/kklTLTlK2irSoC4ODYe/8riJkOPHq2/J6LILc
+EPNXpiETPk+eRriDu87GFCyayqKV3dx1OIeTj7p1ZnBu13W0j1YdoPzT8+qc1lb2
+KwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBixVogGPehJzerTgHq/OYdxdrB99If
+lVlB8/+hjbDLrSulsX6zKdUdladNg+RuaCl11SrbqoLmCigoCNXcshcg2xgKfRhz
+5Wsuuzr8VZHoPbfEF3rTS0uS+jUTB2BdeXWqek2kjWxpFs54FqFNSQgBoEoLhTvm
+RWwFISF/Zg4HP+PZDzEsK7Q+3Wvif0qhVsrBCGG9n9V0opTDLVtt6fDNX/JxQt6t
+Xsa6qY7j1iHlZ30Ff7sRrhr2jTC47Zgw8cDb3ydsQwoU6rtma0M9eONgIetjuGfn
+t5gva52zrXfpmczFDORrRV/XxIxyGrLbPXyVX99ovMbVvGQPuZDY4cSy
+            </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>
+      
+MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQxMDEyMDkxM1oXDTE5MDQwOTEy
+MDkxM1owKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTw62MPvGqETh9JqxpDT
+SEk3yr0pgXrgqsueDBe1fw1+A/xsdd12PL6L+Js5Fmwzr2bi/CwQgS8sus11FfKb
+zNyxeMnK5emZHOVDbw8E2MRk2RwHy1dzt99G/tgRUh2fqQYoKDFiVHvbmKOCtmtY
+GB7teGLk+eXw5dwdrcy0h8pNajTIOoNEoDhYwlIHvreQLGrLP5zEtDRX9QkWqU6o
+Gl4fltzgjFGvh+DNGNVcbZC3dF/kklTLTlK2irSoC4ODYe/8riJkOPHq2/J6LILc
+EPNXpiETPk+eRriDu87GFCyayqKV3dx1OIeTj7p1ZnBu13W0j1YdoPzT8+qc1lb2
+KwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBixVogGPehJzerTgHq/OYdxdrB99If
+lVlB8/+hjbDLrSulsX6zKdUdladNg+RuaCl11SrbqoLmCigoCNXcshcg2xgKfRhz
+5Wsuuzr8VZHoPbfEF3rTS0uS+jUTB2BdeXWqek2kjWxpFs54FqFNSQgBoEoLhTvm
+RWwFISF/Zg4HP+PZDzEsK7Q+3Wvif0qhVsrBCGG9n9V0opTDLVtt6fDNX/JxQt6t
+Xsa6qY7j1iHlZ30Ff7sRrhr2jTC47Zgw8cDb3ydsQwoU6rtma0M9eONgIetjuGfn
+t5gva52zrXfpmczFDORrRV/XxIxyGrLbPXyVX99ovMbVvGQPuZDY4cSy
+                    
+            </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 Educacao do Tocantins</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFTO-Instituto Federal do Educacao do Tocantins</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFTO-Instituto Federal do Educacao 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 Vasconcelos Parente</md:SurName>
+    <md:EmailAddress>parente@ifto.edu.br</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
new file mode 100644
index 00000000..d10b827e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDJDCCAgygAwIBAgIVANNctxDOg6xktyigLZGJNgH/9KDGMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5paXQuY25yLml0MB4XDTA5MDMwMjEwMDQ1OFoX
+DTI5MDMwMjEwMDQ1OFowGTEXMBUGA1UEAxMOaWRwLmlpdC5jbnIuaXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUU9hTCDxUfrFa+IsB4gTIYZCyDRau
+tXeow0NhSDYZrDBwYrc2CiuM26zz9N1TKx6Ap+8CXwQA0PXou+WdFCz1RTMJX+Uq
+kOCjAKN2HmoiDIrI5P2MsHKl+DPLd9Lvnob1dTCDYrWMnPNYBm0iuRDvU59RZWPE
+V9hiqKcKAmT3KB4Gt2SqbFoD3ML/VpZOzolak4/7qvV3/YmuBl82ekz1+w3Adbwy
+gNQsyILyw020F1lL2FDWji5LaUuMPqYzPKykZDWT6wnDw2fZ9j0XxmUCWHDKsUqR
+rbPei38Gy+jtToJ2kNQp7qwFW1C9pvP4PBqhq3gGu6QF1qOT8qTEYs8nAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5paXQuY25yLml0hiVodHRwczovL2lkcC5paXQu
+Y25yLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSkgwUVx8ERu+P2jzA6x8r6
+e9wUzTANBgkqhkiG9w0BAQUFAAOCAQEAVoMKYN2nyFAF9dsAV21/r9Gse2s4d/zJ
+4lVNUCJGrKvWkiUD9GKInX8TdqrQOW5bjjTB4ldkzrHKqVfi2sPDTfvscQ/4OM7w
+E6dsFiiTz71NrDQ2bYIplDqrpWNzRTs5hxXCKkXmGwCtWd9MWlb181qCFuKq+3u0
+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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn: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
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUU9hTCDxUfrFa+IsB4gTIYZCyDRau
+tXeow0NhSDYZrDBwYrc2CiuM26zz9N1TKx6Ap+8CXwQA0PXou+WdFCz1RTMJX+Uq
+kOCjAKN2HmoiDIrI5P2MsHKl+DPLd9Lvnob1dTCDYrWMnPNYBm0iuRDvU59RZWPE
+V9hiqKcKAmT3KB4Gt2SqbFoD3ML/VpZOzolak4/7qvV3/YmuBl82ekz1+w3Adbwy
+gNQsyILyw020F1lL2FDWji5LaUuMPqYzPKykZDWT6wnDw2fZ9j0XxmUCWHDKsUqR
+rbPei38Gy+jtToJ2kNQp7qwFW1C9pvP4PBqhq3gGu6QF1qOT8qTEYs8nAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5paXQuY25yLml0hiVodHRwczovL2lkcC5paXQu
+Y25yLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSkgwUVx8ERu+P2jzA6x8r6
+e9wUzTANBgkqhkiG9w0BAQUFAAOCAQEAVoMKYN2nyFAF9dsAV21/r9Gse2s4d/zJ
+4lVNUCJGrKvWkiUD9GKInX8TdqrQOW5bjjTB4ldkzrHKqVfi2sPDTfvscQ/4OM7w
+E6dsFiiTz71NrDQ2bYIplDqrpWNzRTs5hxXCKkXmGwCtWd9MWlb181qCFuKq+3u0
+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:GivenName>Pasquale</md:GivenName>
+    <md:SurName>Lazzareschi</md:SurName>
+    <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
new file mode 100644
index 00000000..6b554814
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDEzCCAfugAwIBAgIUHIWbRP4lLaQqLeAOPCDTBpfKvFAwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLmlpdC5pdDAeFw0xMzA1MzExNjAxMTRaFw0zMzA1
+MzExNjAxMTRaMBUxEzARBgNVBAMTCmlkcC5paXQuaXQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCXtz7N8Q8s8RgmfsMD0oKFSU3Tka0uiSLLb32v1GGU
+BUa/0PJ2JHtGflLSUqat5eY57tgapbmuZ4wcL69dNEysmulLcaXBEJW6N+gZgOEp
+jefydM9yur6LyQFGPJEo8xtjhLgje835g69lRejx5I6uR/xB/ZpsFFezZB0bEiLT
+o++j3feGk41B/9sHtHF1hsXZB1XxACtoF7PSSCXHVzlWaL3Dqqy/7/LHSYRbRM7V
+M7nEbT3rnGIYy7w4127q8EYyO70ehC2x06kNAt7cpEPyT6I86Q9g39KCztAmpAXt
+ar3oBkWq3OTR2til0WqsnAI28PlULIcthqVAn53bp/pLAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5paXQuaXSGIWh0dHBzOi8vaWRwLmlpdC5pdC9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUlm9TS1DW0CQjQP3dOgSB1L9zICkwDQYJKoZIhvcNAQEF
+BQADggEBAAhirHsW76gKfQPyNc1tAUQOu+wt9wlb+lkkthT7sRcBfInpB7JAEABY
+EEL+vARREM0JGlIVjDolnQcfX08+XVkIgmIzte5/8hDKtN8FalpD5FhvdKfOxh+6
+LIzpG+nsuhX+Zg7xlfy1acqfqjT3LutHTDc1+GKnQo/pUoZbTvjzZLtEd1pXibZy
+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>
+MIIDEzCCAfugAwIBAgIUHIWbRP4lLaQqLeAOPCDTBpfKvFAwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLmlpdC5pdDAeFw0xMzA1MzExNjAxMTRaFw0zMzA1
+MzExNjAxMTRaMBUxEzARBgNVBAMTCmlkcC5paXQuaXQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCXtz7N8Q8s8RgmfsMD0oKFSU3Tka0uiSLLb32v1GGU
+BUa/0PJ2JHtGflLSUqat5eY57tgapbmuZ4wcL69dNEysmulLcaXBEJW6N+gZgOEp
+jefydM9yur6LyQFGPJEo8xtjhLgje835g69lRejx5I6uR/xB/ZpsFFezZB0bEiLT
+o++j3feGk41B/9sHtHF1hsXZB1XxACtoF7PSSCXHVzlWaL3Dqqy/7/LHSYRbRM7V
+M7nEbT3rnGIYy7w4127q8EYyO70ehC2x06kNAt7cpEPyT6I86Q9g39KCztAmpAXt
+ar3oBkWq3OTR2til0WqsnAI28PlULIcthqVAn53bp/pLAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5paXQuaXSGIWh0dHBzOi8vaWRwLmlpdC5pdC9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUlm9TS1DW0CQjQP3dOgSB1L9zICkwDQYJKoZIhvcNAQEF
+BQADggEBAAhirHsW76gKfQPyNc1tAUQOu+wt9wlb+lkkthT7sRcBfInpB7JAEABY
+EEL+vARREM0JGlIVjDolnQcfX08+XVkIgmIzte5/8hDKtN8FalpD5FhvdKfOxh+6
+LIzpG+nsuhX+Zg7xlfy1acqfqjT3LutHTDc1+GKnQo/pUoZbTvjzZLtEd1pXibZy
+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>
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
new file mode 100644
index 00000000..37e6770e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ijs.si-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,75 @@
+<?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>
+      <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,iVBORw0KGgoAAAANSUhEUgAAASwAAAEsCAQAAADTdEb+AAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAALiMAAC4jAXilP3YAAAAHdElNRQfeDBcNNSkEhZxRAAAfzElEQVR42u2deVyU57XHf88Mw44sAoKCgLjGPYlErSZ6NSZtYjXcprfXLO29qW2SNm2SJtYkmuRmca0xN81iFts0i200GFxyXeO+4q64gLIpKLINKMgivOf+MSwDDIvwvs87vHO+7+dDZgbDe+ac35xnmec5D8AwDMMwDMMwDMMwDMMwDMMwDMMwDMMwDMMwDMMwjNMi2AUtU4juAIoXFd2w4gZKQQAAggcCYUEPjx4vAUARgjS2o+4OOW/dqL6O6yitD5sX/OCNYLfQOSysLsA+jAWQ4z/z5uLZF+fup9PiJK6g1O5f9EUAxtEwEWct+4lHygirVpYcxp0AzgZUjfX77ET497iMNGSjzC58seiJOzAGQ+lk75jiuFKgAMEsLGclZUHiHdmTj+MErjVxFzV5Phh3wW9zvGX8TJF2DCNVtCEfIQBO7fvHtfL7diAF1a3YAVgwBEPLog7+4uzg33P8nBDyPJvwEf2EvAkEAgkStY9szxp+NlwmGk5zafOFyslqWXEeAHmk7lxAYxRQ80sQyPHrE2gJ7X+J+nAknYY0ABfjXirtSeYmIRQOgiqaBbcbPUDbngM2d9qSdAEUrn7iemC9JcKhDU2lbvtppjCaReTOEXUSit/enBdH7tR6hhAO5Vb3OIaW0Nl5tozT0QEDkDYsgQaTW7P7ihYzVdMsZlbG0N/2F83iqOpO7tKX7DKVqL1abnbspdX4X0xQUpM6asVqEC49+VQ75YMW5F13vUbH4zmyupEvgI1rprQSzFu9etLre2j82VseGK0HsCpztIqW3EeJK4HzPETTp7v+Q95gFYMJAvnQB3Rl1K3Z8ZUAvsoMVdSzQhCoP+0gjrF0zgiyLKsJcthJ7+z1Ol0dlXxLueKLqkCVBQ4ChdALLwKXONgyqbprBQUq7RnI33qucKPFZJ3WPjvWCeD1E/4KSIsrknZSVUgBN4hy+AbAnxb6qC4q+7+2lLJ7t23JZgBrqmwCF6rev+7ypS1bgLc46HLYlDBQE0k1/E0PWt5mD+cCgJWZQaRNtqp7Z73pkzc44lI4PDeuxXkpFXs4SkIicLa15ticlhmhUSNo/67G0iaefNCa/wMwU0M52V/jKD2jZUs2iPXuEzS3wXb9isp4ylRb8jz/YXVXZMgKBJpdfj6yZVveIYsiR1hu9NoBII078dqxOvo2DXtXTS9venkakOfQku0L+0iyQhCor5JVydHXkHkajQRbuh4gmtncimMC+F21PCsEgWZVnx3O8deEi9g6b6giV1ighFN55ua2HKJgRaYVIA/6+s+sAQ3IB/C/0sLYcP2YPnLPbtK7yRj/olQbBIFMNIe/4tGo4348TrKoBIGClaQmAc0Sfx7VWwdLIujyQ6wCDdhXDB0yltlBptjcaEmhrMudllJBoNZeNrmarNImr/aXfU8BoAbbcHVGw2s5AFZCsfsXsqjCagRbczS+pZurCStZ+UH6PW2pKh1/62vbUAYAvXDtcDiRcLQxQmsyKZV6aSwsF8tYuWJ3+TnpW5Ns98tF1p3d7V49WlQmbLKTLa18sV/ze7iYsMLovn3V0jME1YrLcyqQW6vqjMAT9wICoj6jyaMCaSwstdlV36+Rma9sOek85VeG1aoon44DIJAuWzuzWVhqkyNdWA35KE3k3ah7XIgzzX4vcQiDw2+xsFQlA/rND+bjeu0jK65RuY5esCKzmoWlcsaSPbx31IsKRFSYnsIq0LyX5XLCqpHeXW7oRRWisP7V0HM3dPRCGQpYWGrnD/ndZarPkVX1rym6ekH7D5bLCUuPCcmGUJLT+ICF1eU+q63h6TSWEAtLbYfqEVDbRGgAAupfyYzxlT6MaCAUA1lY6jJUh1CKWjlb0LDW71qxh8SGqSm+CGVhqe1S6NJ5B4BedhnLB74Oxo2yCEYfFpa63A6Tbr2bMARcbWiMRjXq1MuVVk8M/oCFpSr9c/R7yyPQY2DdXp0QMVLHQcUAiHwWlqqk/VKftyxgQuV3qO/bRFgH7Narh+WDWJ5uUJvBNFYHUQGEnuh/ssju1TFfxug07RCOge+AUZei8Xrs0QGB7ie6v8EOK4BnyCRpC1rjopaT6XQAZyyVCdr9I6uXDk2QG8ZAbGx4HgggeLaQlLPI7r+e+PnVqEoWlurE7LhXh55ND0xrVvK2/5GROrz/CDy23LccjLrkAJi+EBK32Nvu8Awd8z/RzJpFxXL3FILMtJSAFO68q00vAPOrJki8IwEw06+K+1U2L5owtVt/kmkHEAZz3LdiAGcYbfiY3EhmMY4/EnDCYfacJ3kI8QXdGM/x14zkh+6R2Bj2pXVPOLbjHFLnDVK0bwDr3uN4KpjO0deyWbBsTHdXhBxhKcuoYljLtqwkbQrsimYVC/3pO6ttooPRkEW1s0ha1/78BVW2emBSSszjmmTP5oUw5xJwhQOvLSvFkTHTJPRp+ikHjrdly8Xpo1vMMuqIWxDoAcrk+XY5ZKYP0jBjCQL509+r2mPJ9sU9WzhATp0676D+dCiBIy6FMwDWJsYq2skKtIzI64s252ILQZ4bKETRrt58T3p/NrCJgy6P9UkxmtUofups+fz2WbFfACuKtTpEIJq+2lIxkmMtke8AHE3yv6XjcdvbAL1ZWdm3/VUS9gHYRH6aHNI0bwlHWjoHAWxMvJ3Ukpbt/+mh/M+BslssIrtfAJusg1QQt/01nhKXkIXjrBNXMyaXm1XLV7fRuqqOWHESwOH5k8lM6PCCGvv/w0L/Vpa6mqOrG+kA9gZ8Tj2UzucKQa/QmXRgfYeWTxQCODbqfbspU9FhYfVQPqNKX+AAB1hP9gtg07ZnyKvF6cX2dNfvoXe35MTWlR7pGMmi5mf/3PUzEp2oAO9DT9DGfcBWPt7EOdjsfaTq7g5OQETRBlJztchBGtrBhjBO2ZS0MQDYywF1FpIFULBg5cJnaCT5tru89QD6d1pF+S8Be1XLEJcFiZw5q/b/J/Ujz3Za4kuxyi9pDxXOA7ZwMJ2Tk3GLin9aPoR6kXeLlduDqR+NrX7BemIZAKRr1OwcWv2qdUzxYAom9xYtCaWhNPb6IuulSqBzDbFacBvcChR5dLCyPs+cjVxcqS0JW4MwhMGEgQhCJDA7bqPHCaAIQRrZsB0Tbbn0z8UL8pGLyyhEIXKhoAa90ANuGAofRKP8RxNOiDIgS0Q5RUkbFlY7Kfu4MjzHh1CD7iLkgHLT5zW9LCn/i/XOwhqCgmAl/CvTbpEOALkijM/IMcTMl073zWPXMwzDMAzTSY41HnbzQKML4YTBOoI76h+nrs6baCtG6xMwUth3YUMlW0XuR0sqKggC1WLklG5JLJ0uIqxchAGonrFrwGnF9LuMkDPIRBHKcLMusBQkTIhAH4xCj+Sab8d7xcwGLoueGgyy0xAL4OKsw96nvAJmncIp5KAaxfXV0brBgu6IxWD4ruhxfghGbnTjb3qdl5yk/bSQRra4dMX+mRc9rqylCwQAy1W14hSAUv8zB7fSkxTaxq4X26z3vfQpJVPeCI6gE3Lg4cd23UMera4uah7UGCW+7Iu9AJCiYubdsO/3NKiNRX+i2SrNGfTyNo6jE0F+ma+8S2PbtdPE0RWu/IYOkHUicKnTtpQNS/zz8xSltCUlxztpvJVp9NHKXN7Arj/bBLBy3aBOH7ntRU/RjU5vbiLLX8m3EytHBYFM9AgdGWVrUBldSBHAmdffpABV1ncLGkaLFl67a1+HmsR1Ati+44HapXWdvXrT13klr3CEdWEtgDNVP1aalzHs+OVJn1JiB7YNvABgdVWIivsLLfQq5S4FdnOg5bIZwMrMAeqX5FAeoxXRsDu8rX08k+mpgi2NS4xMpWTeeSyXXQL4LrO3ok0ZoZ/T5T/QLTSIF+JfIDdFjca46SsTae9cIJUDLo8dVWGkZiPYeLQ2gf7p/mG7pfWsarv4mr+b4VTCWUsOGQJIOBGhqLXv2KG4lN/S2WEH2pTWWgH88YSbipmz+V94kNK5woscMqsGa1zBThDoLWpr9+8FAGurTJraAjLRH8i2b5HRkK0iedS9Uko0+iorytqyJik9VEI9P0/6vBi4yCsztOMjAEsllZMFDaStc1urX0cx92kmK9Gk9Foqr0bXlhUJYZpU23Qc3CfoemJLllzyn1M73y80u3/D4/+mI/xFj3bkvvMTibICgTZczPN0bMu2JVHNZp7U7ec1Ls7x8SognyWgDd84WL2g7TWZvvZ3vKjmD5rKu7lghxO9wQrQhD0zpko/b8uflh90NOWx8KVwqXYIAn1xI8uXVaABr36tx1Fu44iC8ptNMyyULCtBoLvpO88feGyoLoUAfqXLGYEhtONcs457xkgdLAmmTZWuFHM3GTfpjryVfXSS9O5m5xEdDzymgyUFWOPuSsKScvrXzdgN00oByN+7oeAIqFFAT0/e6C/Xhrr3vA+pb7OwVOVU9Ae1wZU/U3iUdpfYPz+prJFsQd3mnhx8eZOFpSLJ4kTFSd3e4EVxutFpotWjZJfVqMtY+TjZj4WlIkOo9x5Fx7d4PrDcft57gWxbGrJ06AzgIgtLPU5DH2EJCABXcN5upcM5HWypk1YKZSu9WVjqkV4fTKFDQLNxppHICXptAM8X10q4KVSR7HphkQ65IhdpjSYgSLoddTLORTH3sVT9pNo1TPI7zqWNwpmrQ76qGxdWoZqFpYVjSbqsCICp0Zuk2lflitt2x7Jb3j/EwmpHk0TSsxa1KDbobAULy3BOJhe+uwGbQr1c2zw/6jmj5o4AFpaa+Osw1WDfBNuLKUi6DQ3v2w9eLCw1iaztwOozexSJwXbPonQYE9bJywvuLCw1iYAJQodus40AhNk9C9Fl0sP23iPR3cLCUpEBMIF0kZUA0Bej7FYVDJM9XoEA1Wbr3gj8hIWlIkGzzTqOwsKt3e3qCQUsNelgg+3nIPg/n8/CUg+3Q6G6vUEfDLBr+6zIW+uhU+fdDSfnASEsLPXoZf4J9Prity8N9W54FogRpnE6uToGj1VZwajK0ZtQWi4Lq+X1WwJO22n6WuTyctkbKURt5RkazUpQu5/hO0LKDuhmlYzpq2ZjhvRibx1k5Unvu9R3O1KaQitE6X3J9l/HyqIn/Xh+ZpPX/O99VHLnXQDoidHxLCyVCUQhohPCpE84uCFedH85usmr3Q9Z5lkkSwt4DH47uOXShDc0qeDX2hVJ70c7yp/5bz8ouVH2UzL5WCet2LUktsWiGdr0bN4qPObt2JY15K3I7GW9T3yogGZU+75e5taoBKzQVFa3Uf53ji1JFlvcp0vpstuuQfTe2DNct0HDvkbMNM0boLq/70FzZgPnWrCk0pyS2U2RY4lFWUvkzdHXdj4rPVROP0uZRVeHtWxHOoCP0iwa1/Sz/eVf5QObOF9pyXkAO6ssEjLFdLrQxgqVb5A2+QUJ/as4ynr7Hxx6zTvwAviAfDQO5hDl/PH2WHPx2Uc0bpoH0vYlHHUpXEXFc4trPFU9l6LxF0XRtKOqfbbsxaFnJ6t+MkXDo3BaXWb155hL4/o971SZVc0VDRMYYcq2TFtmbB8r4/9do+qj4TRnNsda9vjwv/5K3hpMOoym3ZnA0VuyJeuNh8mk2oBC1OfNDVQzjCMtlTwA5P1llafK3fhxlFkF7L8lW/YC2B//i07LqvGk7wBaveQaN4J6sEIAa07crpq0vJU/UMXkjh4uUvzsXylYUaeXZ1YepyNLOcK6kl75SLW3Co3PMPqwjCwbOjxblAUgsXJMTeebwN70JlE4R1ZfWQkge8C3Jye1WYJftBJOD+U1OvhSZ21JFMCyfssptEPHx9Vds+iFseQDFHFw9aZAAGmJf784jnwcBEy0Gk43CqQnaOMOilPHlhRR02fXlj9RGLm3OqHRfKrERP70CK3ZdelnSTzH7iwcA3DZc1ngP09NJndya9fZpYLcKJj+SJkH1wQAULWKy/7Az6LfpWiy2I0VW5uzMlGA8jh9/NDqQI5lA071+aKQAzNPv70TF3AZBXB04KAJAQij/mIA4tKnLPNbDGQjQhtbAncU7cAxpFO+yHdY8aEbQtAHffEjjPsw+ncsJScWFpCK/gAurT438RzSkYubfuW1WxIt8CjyMMUiGncGDBYAUKRpHYYsRAEg93MlpyuSkYFKlHYjE0FAQWCpubon+uA2MWRKIC/g6wrCahCXjZvDL3W37ST2sYRtqnv1jLhNh40Jl++s7EYQqEbfg6KMpcMwDMNoDs8FOaKrVDEVzue47gBIlPunVHd/uOxvVbVmKghKyxrdp6ZnqbjpenI6hpEAbvplm/dV37GpcqxthybBF6ZJOBZzQ1SysNoe6D/4zYtbLPljKlGMQtTUV2sJhB/8YEoZcWWq5a5xAJCHUMNL6hwGAgB2Ja0rzR5ntVxHCa7Xh80LgegGU8aQS/fWTJ4p0gArAllYDVwR4ZQ1PDW4ZOtGJOEqrGh5rZ4fAqivmIpJacqvRySJG8Zt9LqjNDK1741Pv489gFQqbmUo6oNAxOB+DPjd0PMDtnCHwY6CyjnVoWRpsWxI028PzeRJd9MPN8nA1Rdp6ga6g9xb+Aag+TepZvKkKbTTWjPqHVf/YqkIAAWvfP3XBxoWrdzSmihlPL2zP2MWcMFArjwjgMwZL309jqB0ZGn0VHrhxcK3XVhWOwCUjvoHDe7UshkLPUqHDFTJZQWAwzSzkz55kg68U9bNZaW1P+lBVRYEhyqvGGisOL84RAWvxNAyhaJWuV6jWDB+waoI1VaQmpT/pLTZt7ow2bnYByBp7m/JTVFjrxDIm16ls/2AAtcR1UlRMGpZ7RIZodr+mDg6kd61/XIhYWgnNpiIRj9tw6AHqGi+C2WrkmnzVd50ZXPjEFqe2HW9krB0aKc/as3Xrk2gA68Ama7QJJ6LedNuWkGtLWC2vxisrEomkdDFPLIewJalQzrtEdHkp+3R3ZRZBRi8sG6asE57U9Nt7VG0pguukdqXMFJDn9xBSQ8YPFtVjHpX03oJgkD9lP2JwJUu4pEcAFvmDtW4Cs+PyRplYFlRr+8rzBqXXRM2N2Z0Ha+UJ9wvocphPJ2xbDVqT2v9t36aV/OzXb8pXxeQ2wXceFSQaZ6Uuqxm5QOiAQYV1jRpxW09aGcXmY3fRYGSiv5G0qeLbE2vgbgigLk3TYq8QwRiKacLnLV1esbdqpZ0an28+DMqXm24bJVCfSRWKgaBltL5IGf2yAUAM782S8rhtr//5XXyMZiwFks+wQbUlya6r3TqftbFjAlSD14BDaCvxmYYpwufIb56PVaRLSyL8qZT97Mo8vNyWbKqm5A20b+MsxKkAMBH0vOV7Rv+ooVOPEb+t8lSj4oStVXEjDR/NT1OF2H50UqnXU6zSUy5w0vSKFnYCctb2Vx+3Sj9rDPlkDgetL9+76SHjeQBeLd+0bGQmrNmUFo3rTfXSTn9K3v8vzxt2zZI+u6NA0jJGOqEwgoFzf8cSq0/ZLROBFF7nxOwjAkygrAuWb62e3tyOY9zAU46oLnzuGR/1N0rFxkbYQRhZfpd1i18JUh1SlnlBR6brNe9rTgBQwjLO7FaxxDm+JUNdz5h5ZJ+i6gVnDeGsNIcFi6T1uSYj3Z3PmFZkaLj3S9R/iIDCCu1vpOqx9brEuQ5YVNYiCwd754udmu8g9xNztCaAAgdxoQAkCmhR3GrXBHhJYN1vL+CKo3vICVj5dePSQjyp32rUOF0wgqnLKVYz6GD5g2xFGHp9Z2ngIBTFtQBNM8YrVOB6xrfwU1ekOumR+XlLNJZ2M74YZN1fxOkhll2U8jV/PXCJE9SDY2TscXcPszQ0ywLPI0gLH8HzZNMcSlOJ6tcMcmjm47pNNSu5HkXFlZ4fabS40MaBec7jzKM/uLtpuP93YyRsfrCpGPe94UzHnITAD3PnovGGGEAYcXIHCM0YxDGmZ1PWIHQc4tfBCJeM4Cweq4y147Q5HYrbHcLtwY6YbnXMHFXvZXyO1u9DTIqXObfaGwoc0zojVinnHMIt96+1SYrkv6B88cQYwgryvKoLsETAGJpmJMu9BuUEg59JkTCEBkPY7C1FKTPNZOAc06Ys/IBvNbKUZtaXtMoNcAQGQuYdPttuoTPG5MADHTCGdIQAHnTzTr0rzwRL+FEDynCskKkPqbP2IuGLXbePD62fLAO0zC98Xh8QDGMQTbmvxwgPeWb6Wkn35y5pEi+T/5ipA2rwPWQ56TWKACBetLah5zbK6coSpG1s9B2h160+08wFrtP9ZL86ZxDR5z6ZPlkAcy9IaRVmhEEer+6cLjBhFUU9FuplQp8lAsHnN8rR+cPl/hRu4PyKmE8Mh+6S5oLTfTJFTJ3Ba98Q56S6vB0o89320rgGY715CGpLzGVto7pCkd9JIsP3R+RVL3heap5BkbkoCC39yqllFxTTnWZsQ+Zc7+8TeXDFBxdk2hPPIxL9dNPaTQKauig+tO3xUBXqVuXD2BXRqjqshJNqhvuW2RgWeUD2L90kqZVobxpGQEnu5BXTgNYWeWmaOMVQSBP2nkGxidp6QSNHAjyVN4vBr7qYh3UlQJ494SPok2PM1BZR6XB+a6ws+RQwnhNkr4vfUrA5i7qlY+r/DUotNadVhGQ7AKqwhYAO+bGqzy9ALIon1GB23dd9JP5iQC+yOymctaKoud/ei3iNFyIqwmvkJeKLuxDm61AYhdO+JsA7Mzsr1ouN9MEOrj5ho8rqQqpAMj0BfXu4Cin6QEnU2hxdL7n/i7ulSMAciofqj17tq33Llr9vbvyJO2NhyvynQAOrptJ7o1q+6LJIZltF2sdRp9R5TRj+CRXADR8BY3o8AfN9nqc8ulxuC55AAri/madSuZGnz/hQD6OCkyDYunl8lMZxjqa9rIA9qyefb1fCzISDp7bPxtMcwuzK8EAu8Zup0fb3fDVXRHKR/T+NIoEDhnMH5sAkM/ssR9Qz3Yf1Vvnk8/ovYkAcIkLVwBXBXBtwfEt79E9FEl+ZG7FmZ4UQDH0OK3PyzlobK9kiooHc39YUfoLiqUAxb3VPmYQRdOv6V+HLycBO5xAUk6j6ixEAUjxPySqA3wztuICLuIGgArYCuN6wg1AKCJwD0ajJMZcck+l5w3AikCDf+hyfI+5PXhjb+VGpCAZpahBFWzHbXjADaAQEYaxmFD1tv+LXpNKhJKOPmBhtQKNPnd/Tc2VybhboAYByz2yfS19X3HNjJ4mYgkAyC/3uTzKGyHigRr47fbb5uY9aJbt3xwQowlM+yhiF7BPGIZhGIZhGOcfFToLFV6lHuWoRsNUtgUesMCn2reUvcPCukUuiUgCgNNLkmcUhZ1BLrLrfxeMGPRAv9LYpNt/I9KAk2IYD/RZWO0hY/gu3/571mETMlGBatxsUiDXBDPcYUYExmMqTsdN9Rm0U9AlRLLrGMecR9Hzp61vVkeTe22RIdHqEhUTWSicnqJDJXmr2XuMAw4DoJAXXn6avB1ISbSxTAU0nWYuPDIa2M6tAGMPicNJz1GAw5PfW1pT0FhubvQQba2s8gbS2J0MAGwUwHun+re4wqk1gTV+HEx/JHqDPcqgCFX+iWOfI4ty60uiHW/riKPF065FnGTXujJ5AI4+O17l3XyhtI6A/exeV+WQANaejdNgP7a78jFd9t/GHXlXJBfAduqhUREOH/o7T5u6IlkC2FQc1o6NVB2umKD8701gA2ctF5te8E6mIEUrUdkuL2U5UVAhO9uVJhj+NfYODWve1P3dXrR+LXvblfKV37MO9zGqf02k48+xv12CZJD5g1SLpAKNoDl0ZXIKu90VOH1woMRaxd3ohwvsc1doBkOel1pvXtBEohj2u8HJx3tzoqQfv7KeCv3Z9wYmQwCvKlB9iqGtazxB7OEZLSNzqXKQAukZK5A2u9Q8vMn1hHWu9KwOmcOKBLCwDMz5+74Pkn9XAeAAnVrEwjIsu29+occ4FECW+PBaAQvLqEQ/WaZLvgKKETIrmIVl2Kbw4Rrpe94IAgLAZT9yZ2EZtesORYdzmAkE4CxdLGFhGZQs6DfqzxXFFSwsFpaqPSzblMMN7mMZFasuI0IbJSwsfsNaZK0alLCfGbVlJeBKNVjcXC3IpNM9BcilPsfcFErKWQTAF0HsZ6PSS8c86QYzC8uoBNXOgutBOPxZWEZlCEw69LNsUg6hbn4sLIMySJd8RRAABomISBaWQbk6XXY/R9T3spIWiitFLCxj0vN6lC4ddyAUPzfBZcaFLieskTd/qtOdY/DLAjDG5WCR7B06tuv3vJnC2ITvGNOoSy2HMExPYmEZmFT0jveWuqnBJt4R8JryAzcXxmb1gn6K5IZQ2W7N9WTPG57FrR5nrnblBkGPEnDMpTzsostmJsYPb9JUaTndEIB7ZwMj+fNsfIp81930UmQ1houoaDj73GWYU3sIU2cOC2jP9R9UPIW97TJ8Ik6PeVDTuSxbAcoIZe3rfPK8i3EhfbjGjWAwfV/FfnYxTgH4IXGwliWNlOVEXlzn3SU5kDRCgx6WIJAvfUh0J3vYJdkNIClphKK+tLory6lgGsDfO7soewGcT4xXWVYDlNUn2LcMio8urOjW5givpakJ0eS4zP+ovlDJPmVwFcD5yFnTRrXjdJy2rl6UQF9HAee5y87UQW+8S4PITemoqHrSs5SVAFxiUTEN5ADIDHrafQHdTp7tlJaoP2Z8gPI0pdFoE3CYXck0J0EAF9/+5OJvaFA781QEPUzLaM88ALjCuaoWdoTDPlcPXIu7uPkCHTef8UtCNgg1dr83Q8CMCPTDYOtdIgrRb/Z45xIi2XEsrHb3utwP/sl7XjZuIr9eWhZ0hw9CUTVzSIrnbvYR0wH4bFSGYRiGYRiGYRiGYRiGYRiGYRiGYRiGYRhj8v+87/ZIJoH5YQAAAABJRU5ErkJggg==</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>
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
new file mode 100644
index 00000000..e3239906
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.img.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,117 @@
+<?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>
+      <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>
+MIIDJDCCAgygAwIBAgIVAOD0HnToPYposQvSZOwdUVtqwictMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5pbWcuY2FzLmN6MB4XDTE0MDUyOTA2MjgxOVoX
+DTM0MDUyOTA2MjgxOVowGTEXMBUGA1UEAxMOaWRwLmltZy5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaG1eJjjOGWyA26l3zWvg7oxWlyxO4
+Xka8cJYUupiV80Swq+oo2PlUqbL8ciHP7g0Vjdw4wTq1/R9i1sA1i1JLj3TRFoy6
+cvCFH4m8aeQKnSjcpUJiQXkGE/rM4Hf1qegyrjKqnbk83azOODv1IbndJMXMdf/9
+7Nl/1+3UDy8LsVsNKkN/8fplSHC2exAOZlPVX/uwlgwXDo5AsM4VvZjhB3fDNeLr
+wcfXmvohMhp3u5KJhQS4oPCpX5ULjo1EPRuRhKsOBCQHX6fH4Ac1E2b8as3HvzJ2
+fgqG1QETTyZZAhlovWHEVRncu8k8jMwbCIq3UgQMP+WK8fGP/sPRbpPnAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5pbWcuY2FzLmN6hiVodHRwczovL2lkcC5pbWcu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRU+/iETTc1Nh9rJ+L2sBT4
+y68xFjANBgkqhkiG9w0BAQUFAAOCAQEAvFtxSjURNIGODMraRKn9En4YjARqtyN1
+3uoXTbgc3GE6O/PgWwu1I1VndTTnIBoOC6bviKSu1sVpe7yhHjkoilR3EuZDuZGl
+0YBnlrmWcwXQOH08zfdiqtApDO761LRtYEaXJnyCTmLFRquMUxQy/Z0NXMCNEOps
+eCR5zkOYQadY9TLPoyrKWidxar0mjW96yK1uWiVKWqt1bU/zWhFxLYPN8bLNB2JU
+RTuMCTO4d4Zdp5uhCbnM4F+Zlipu2ojbhJiHHqJ0SOrsfXWHsdpp8S2nJcPlERgd
+N9KAr6lHQsSuYiw6Lt0HG1Q4TAFYTaPnA40uN+zzOomz27Chnsg/Sw==
+
+                    </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
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaG1eJjjOGWyA26l3zWvg7oxWlyxO4
+Xka8cJYUupiV80Swq+oo2PlUqbL8ciHP7g0Vjdw4wTq1/R9i1sA1i1JLj3TRFoy6
+cvCFH4m8aeQKnSjcpUJiQXkGE/rM4Hf1qegyrjKqnbk83azOODv1IbndJMXMdf/9
+7Nl/1+3UDy8LsVsNKkN/8fplSHC2exAOZlPVX/uwlgwXDo5AsM4VvZjhB3fDNeLr
+wcfXmvohMhp3u5KJhQS4oPCpX5ULjo1EPRuRhKsOBCQHX6fH4Ac1E2b8as3HvzJ2
+fgqG1QETTyZZAhlovWHEVRncu8k8jMwbCIq3UgQMP+WK8fGP/sPRbpPnAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5pbWcuY2FzLmN6hiVodHRwczovL2lkcC5pbWcu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRU+/iETTc1Nh9rJ+L2sBT4
+y68xFjANBgkqhkiG9w0BAQUFAAOCAQEAvFtxSjURNIGODMraRKn9En4YjARqtyN1
+3uoXTbgc3GE6O/PgWwu1I1VndTTnIBoOC6bviKSu1sVpe7yhHjkoilR3EuZDuZGl
+0YBnlrmWcwXQOH08zfdiqtApDO761LRtYEaXJnyCTmLFRquMUxQy/Z0NXMCNEOps
+eCR5zkOYQadY9TLPoyrKWidxar0mjW96yK1uWiVKWqt1bU/zWhFxLYPN8bLNB2JU
+RTuMCTO4d4Zdp5uhCbnM4F+Zlipu2ojbhJiHHqJ0SOrsfXWHsdpp8S2nJcPlERgd
+N9KAr6lHQsSuYiw6Lt0HG1Q4TAFYTaPnA40uN+zzOomz27Chnsg/Sw==
+
+                    </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>
diff --git a/swamid-interfederations-2.0/idp.inalco.fr-idp.xml b/swamid-interfederations-2.0/idp.inalco.fr-idp.xml
new file mode 100644
index 00000000..1d855f70
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.inalco.fr-idp.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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="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>
+					      MIIDJzCCAg+gAwIBAgIUXBzPfYV+3ru5apFeK1Xo5W/wdlowDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPbWxkYXAuaW5hbGNvLmZyMB4XDTEwMDkyODE0NTYxOFoX
+DTMwMDkyODE0NTYxOFowGjEYMBYGA1UEAxMPbWxkYXAuaW5hbGNvLmZyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjXFdyCRby1D4CFQW7ynaRKzJCyzz
+nRsnF2qPnGuMExCzuWUM5gBqVAjdI+AZXutcXcxkJq71TC22erYIlAob5A8nWTT5
+rR/dUtVRwawP/4jv9CqKiRC86zeNRFuUgYd0+Wkrn/RADV0wyfeSaT0KHoqwOu4d
+iRlks9CMns7/eFLmGsYQcEMHlw9nGTYpx94IClua3/prJjkc45iCYuoWXnGCLq2j
+MoJDcw3I5u3tSUfzCbp81lWn06oYBIVuzzcZuLRsd0smB41pabVYcS+bbG0yWA4b
+xIn4ZPQ1vja6YpIix6YZmpcCD6hs02xYfm6sWq/BnNS1vtMD1RjmSJhx4QIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9tbGRhcC5pbmFsY28uZnKGJmh0dHBzOi8vbWxkYXAu
+aW5hbGNvLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSVnWnWMca1OUkx11t9
+LRaeLMgTWzANBgkqhkiG9w0BAQUFAAOCAQEAfmv+9vLBGqsioIPqwy7pTT54CsbR
+jdvs5Ud7EhkLYDa+EelzwrgmE4z92mmmTFKUixlj070ncHZJjwjdfbDGwcQ/aKT2
+cd597hjiVBd85/biLQ3yTBkzJx2UiXm/Wj2qfyHoJDH9UfcLZOorR8R0b1ObSbHY
+2EsElJHCh/SrRniERFdJdQ1fzTukaSPa6zu/lLO40gYHu13qenRjMgMn9W85g7V8
+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://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Le Pendeven</md:SurName>
+    <md:EmailAddress>laurent.le_pendeven@inria.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Casasnovas</md:SurName>
+    <md:EmailAddress>fabrice.casasnovas@inalco.fr</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
new file mode 100644
index 00000000..87ab32f1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.infn.it-saml2-idp-metadata.php.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Institute for Nuclear Physics (INFN)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Istituto Nazionale di Fisica Nucleare (INFN)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for National Institute for Nuclear Physics (INFN) users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Istituto Nazionale di Fisica Nucleare (INFN)</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://idp.infn.it/utils/info.php?l=en</mdui:InformationURL>
+      </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>
+MIIDtTCCAp2gAwIBAgIJAOU29OWoolW3MA0GCSqGSIb3DQEBBQUAMEUxFDASBgNV
+BAMTC2lkcC5pbmZuLml0MREwDwYDVQQLEwhJTkZOLUFBSTENMAsGA1UEChMESU5G
+TjELMAkGA1UEBhMCSVQwHhcNMTQwNDE0MTQ1NzI2WhcNNDEwODI5MTQ1NzI2WjBF
+MRQwEgYDVQQDEwtpZHAuaW5mbi5pdDERMA8GA1UECxMISU5GTi1BQUkxDTALBgNV
+BAoTBElORk4xCzAJBgNVBAYTAklUMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAxTXQ7OFlyqDxcDkdUgPXtKrHw2vUkKuGkEMpQrrK/PU/emzT13Jualti
+38jV4NTSBSIXc7P3PTTUsfnk3o+IAej1JKNlQ2klqFDvPiwl9sKFh4Pd66K0g6eb
+GunsRZtR5LJLMJrrqOhRiLZdAcJzB4RxZsqSYxz0EDw6S5r6w6Sgm4xiupviC9gI
+NAzpTkjFR78dbJ7fDzvvVUXxPz1T4awL01RCt0s/05fHeWM1I4cPjoVSB0t6wzv0
+CfaWWlid3I6yyFWiFYeVGvn7eeqhvRckthumYOayL18Ri+S2vxYkDqDcY6b6y2OW
+YhFZ1VTosUoUBPhwXyCYYJ2wAmi2VwIDAQABo4GnMIGkMB0GA1UdDgQWBBROEkiq
+rjIVFsHZKsnYbh+xPNmilDB1BgNVHSMEbjBsgBROEkiqrjIVFsHZKsnYbh+xPNmi
+lKFJpEcwRTEUMBIGA1UEAxMLaWRwLmluZm4uaXQxETAPBgNVBAsTCElORk4tQUFJ
+MQ0wCwYDVQQKEwRJTkZOMQswCQYDVQQGEwJJVIIJAOU29OWoolW3MAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALVVWVWP9nrWlmU37KbTE3kuqJWptGma
+DS2uuOg5RN5lGevQvVu4cac23qaZZ+TN+b6WDXuhEfmVJzBYczxByVeGEvew0fHg
+RRMZLqST6j2gyb89qzNNFyTcyRZ/5Z7jXWjrnDp3pOLNvrr9BhVojoC2F7EYjSdd
+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>
+MIIDtTCCAp2gAwIBAgIJAOU29OWoolW3MA0GCSqGSIb3DQEBBQUAMEUxFDASBgNV
+BAMTC2lkcC5pbmZuLml0MREwDwYDVQQLEwhJTkZOLUFBSTENMAsGA1UEChMESU5G
+TjELMAkGA1UEBhMCSVQwHhcNMTQwNDE0MTQ1NzI2WhcNNDEwODI5MTQ1NzI2WjBF
+MRQwEgYDVQQDEwtpZHAuaW5mbi5pdDERMA8GA1UECxMISU5GTi1BQUkxDTALBgNV
+BAoTBElORk4xCzAJBgNVBAYTAklUMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAxTXQ7OFlyqDxcDkdUgPXtKrHw2vUkKuGkEMpQrrK/PU/emzT13Jualti
+38jV4NTSBSIXc7P3PTTUsfnk3o+IAej1JKNlQ2klqFDvPiwl9sKFh4Pd66K0g6eb
+GunsRZtR5LJLMJrrqOhRiLZdAcJzB4RxZsqSYxz0EDw6S5r6w6Sgm4xiupviC9gI
+NAzpTkjFR78dbJ7fDzvvVUXxPz1T4awL01RCt0s/05fHeWM1I4cPjoVSB0t6wzv0
+CfaWWlid3I6yyFWiFYeVGvn7eeqhvRckthumYOayL18Ri+S2vxYkDqDcY6b6y2OW
+YhFZ1VTosUoUBPhwXyCYYJ2wAmi2VwIDAQABo4GnMIGkMB0GA1UdDgQWBBROEkiq
+rjIVFsHZKsnYbh+xPNmilDB1BgNVHSMEbjBsgBROEkiqrjIVFsHZKsnYbh+xPNmi
+lKFJpEcwRTEUMBIGA1UEAxMLaWRwLmluZm4uaXQxETAPBgNVBAsTCElORk4tQUFJ
+MQ0wCwYDVQQKEwRJTkZOMQswCQYDVQQGEwJJVIIJAOU29OWoolW3MAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALVVWVWP9nrWlmU37KbTE3kuqJWptGma
+DS2uuOg5RN5lGevQvVu4cac23qaZZ+TN+b6WDXuhEfmVJzBYczxByVeGEvew0fHg
+RRMZLqST6j2gyb89qzNNFyTcyRZ/5Z7jXWjrnDp3pOLNvrr9BhVojoC2F7EYjSdd
+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>
+MIICDTCCAXYCCQDW+hvAcF9P3TANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJJ
+VDEOMAwGA1UECBMFSXRhbHkxDjAMBgNVBAcTBUl0YWx5MQ0wCwYDVQQKEwRJTkZO
+MQ0wCwYDVQQLEwRJTkZOMB4XDTA4MDYyNjE1MTY1MFoXDTE4MDYyNDE1MTY1MFow
+SzELMAkGA1UEBhMCSVQxDjAMBgNVBAgTBUl0YWx5MQ4wDAYDVQQHEwVJdGFseTEN
+MAsGA1UEChMESU5GTjENMAsGA1UECxMESU5GTjCBnzANBgkqhkiG9w0BAQEFAAOB
+jQAwgYkCgYEAyRF1jn8iY+0/dUIQcBBl5je6V8JZ9irYCpXNsuRpvjn0ZR1IYTGY
+JEtDUxaMEApSswC/+BN/nyDoGSboEIlAOpCkGUrAtKYtVti1Xxohwoa80E3zMa0Q
+W+ZtOFAyBzIrac1z3vwlu1sK5XfQAs9KCduhw2FLcfwUIumnjyizut8CAwEAATAN
+BgkqhkiG9w0BAQUFAAOBgQBQpTSLXBuf6MeQknJdFhGPlbbGg3nYZlI2qPA694+U
+9bFYI2qziy/cPgZraaAdFu9xhfgLgwGzwE8eLJK8SRopE2Xle4RQeuOsXhnp7/99
+Bu99Niqt1xIbh/2ia+bY2wjyaYtDR+jbiu9tSciZJgiFeW3baJzvFhBKjw2LULZ7
++w==
+</ds:X509Certificate>
+        </ds: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
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UEAxMLaWRwLmluZm4u
+aXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEhXjZzNhibw+wWO18
+a1xsZv+SwEKvfLeDcS+wmkkjt537rJmVJH3NMGRQHxlADQ4VIJHXi5rC7R3tQjHi
+gcxoitPryb02DsrpTz8wNbqF6cY5I02xV2gDjvVZIjBUFEzH2Qq2AvZDlSv2pINk
+AW8NALfk5M8j6yukd35Wxm+EugwlAEaYnGyE7dHpM3AyFJlK+yp0guh1YwGVz4LT
+xI23eHNsdxiJmDSq2ac57D6tmQgUuzj/s5PJOP9n8wDK3YXc48RW8UwQXDxP/o8U
+Wo+ZkcAeNYVpeaSyme2Do/us36Vtk44mL13Sh5MjAplSC2rJdSD2V62eomgTZxsr
+X62BAgMBAAGjggFoMIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO5
+7TAdBgNVHQ4EFgQUvAzDM5m+wp/rK4ScoCezlzF27i8wDgYDVR0PAQH/BAQDAgWg
+MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
+A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
+oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
+CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
+Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
+cy50ZXJlbmEub3JnMBYGA1UdEQQPMA2CC2lkcC5pbmZuLml0MA0GCSqGSIb3DQEB
+BQUAA4IBAQBclu01pFdY9/QUnNh89d5BuYj/4Rd9JG8cjTnzjU1+Zb+QHSmUNlk0
+15vebyx30FjbnnCH8NBpiPMG63osofR3Bp098yqV1+W9MGekflromp9mF5w098xL
+313ysJX+29u9uDIWYiQhEYASOxbsubAwX0EZaPL1mwFJVsXzYVTKbrFBHpRthU1c
+6njn9Aks4jqeE30Md3nA720jkc3gjcYU4t0eI/m2dVsTwfnwTJh7SjXS2GrzsNU1
+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>
+MIIDtTCCAp2gAwIBAgIJAOU29OWoolW3MA0GCSqGSIb3DQEBBQUAMEUxFDASBgNV
+BAMTC2lkcC5pbmZuLml0MREwDwYDVQQLEwhJTkZOLUFBSTENMAsGA1UEChMESU5G
+TjELMAkGA1UEBhMCSVQwHhcNMTQwNDE0MTQ1NzI2WhcNNDEwODI5MTQ1NzI2WjBF
+MRQwEgYDVQQDEwtpZHAuaW5mbi5pdDERMA8GA1UECxMISU5GTi1BQUkxDTALBgNV
+BAoTBElORk4xCzAJBgNVBAYTAklUMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAxTXQ7OFlyqDxcDkdUgPXtKrHw2vUkKuGkEMpQrrK/PU/emzT13Jualti
+38jV4NTSBSIXc7P3PTTUsfnk3o+IAej1JKNlQ2klqFDvPiwl9sKFh4Pd66K0g6eb
+GunsRZtR5LJLMJrrqOhRiLZdAcJzB4RxZsqSYxz0EDw6S5r6w6Sgm4xiupviC9gI
+NAzpTkjFR78dbJ7fDzvvVUXxPz1T4awL01RCt0s/05fHeWM1I4cPjoVSB0t6wzv0
+CfaWWlid3I6yyFWiFYeVGvn7eeqhvRckthumYOayL18Ri+S2vxYkDqDcY6b6y2OW
+YhFZ1VTosUoUBPhwXyCYYJ2wAmi2VwIDAQABo4GnMIGkMB0GA1UdDgQWBBROEkiq
+rjIVFsHZKsnYbh+xPNmilDB1BgNVHSMEbjBsgBROEkiqrjIVFsHZKsnYbh+xPNmi
+lKFJpEcwRTEUMBIGA1UEAxMLaWRwLmluZm4uaXQxETAPBgNVBAsTCElORk4tQUFJ
+MQ0wCwYDVQQKEwRJTkZOMQswCQYDVQQGEwJJVIIJAOU29OWoolW3MAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALVVWVWP9nrWlmU37KbTE3kuqJWptGma
+DS2uuOg5RN5lGevQvVu4cac23qaZZ+TN+b6WDXuhEfmVJzBYczxByVeGEvew0fHg
+RRMZLqST6j2gyb89qzNNFyTcyRZ/5Z7jXWjrnDp3pOLNvrr9BhVojoC2F7EYjSdd
+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>
+MIICDTCCAXYCCQDW+hvAcF9P3TANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJJ
+VDEOMAwGA1UECBMFSXRhbHkxDjAMBgNVBAcTBUl0YWx5MQ0wCwYDVQQKEwRJTkZO
+MQ0wCwYDVQQLEwRJTkZOMB4XDTA4MDYyNjE1MTY1MFoXDTE4MDYyNDE1MTY1MFow
+SzELMAkGA1UEBhMCSVQxDjAMBgNVBAgTBUl0YWx5MQ4wDAYDVQQHEwVJdGFseTEN
+MAsGA1UEChMESU5GTjENMAsGA1UECxMESU5GTjCBnzANBgkqhkiG9w0BAQEFAAOB
+jQAwgYkCgYEAyRF1jn8iY+0/dUIQcBBl5je6V8JZ9irYCpXNsuRpvjn0ZR1IYTGY
+JEtDUxaMEApSswC/+BN/nyDoGSboEIlAOpCkGUrAtKYtVti1Xxohwoa80E3zMa0Q
+W+ZtOFAyBzIrac1z3vwlu1sK5XfQAs9KCduhw2FLcfwUIumnjyizut8CAwEAATAN
+BgkqhkiG9w0BAQUFAAOBgQBQpTSLXBuf6MeQknJdFhGPlbbGg3nYZlI2qPA694+U
+9bFYI2qziy/cPgZraaAdFu9xhfgLgwGzwE8eLJK8SRopE2Xle4RQeuOsXhnp7/99
+Bu99Niqt1xIbh/2ia+bY2wjyaYtDR+jbiu9tSciZJgiFeW3baJzvFhBKjw2LULZ7
++w==
+</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">Istituto Nazionale di Fisica Nucleare (INFN)</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">National Institute for Nuclear Physics (INFN)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Istituto Nazionale di Fisica Nucleare (INFN)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">National Institute for Nuclear Physics (INFN)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.infn.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.infn.it/index.php?option=com_content&amp;view=article&amp;id=2&amp;Itemid=108&amp;lang=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>mailto:aai-support@lists.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
new file mode 100644
index 00000000..ee485cf8
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.inha.fr-idp-shibboleth.xml
@@ -0,0 +1,54 @@
+<?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>
+      <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="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>
+					      MIIDGDCCAgCgAwIBAgIVAO4pV7sAz3uXoZSchrwj2d0PI981MA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5pbmhhLmZyMB4XDTEzMDUyNzEzMjk0OVoXDTMz
+MDUyNzEzMjk0OVowFjEUMBIGA1UEAxMLaWRwLmluaGEuZnIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDa2e5fujqS/ViLxvdM+Enmgf5YlLTbv42SVoZ/
+eRbfyjEN50ykyYGrf3TD2a/qzFjOtTWnJFIEkf6jAQj79+axkYST5DxcE6G9q51k
+XmBUbxAOo3qP9an19B1sPuDz9gGZE33Iwu2qcOw8Z0dH69DWF4wNdu1mHZFeXS66
+WyJeww00xeARXo+flW8RvSTLCoU+TcFjYRP0OyGs+5YwMFw+wHQOJuR5hQakp9Lm
+M56083ADhpEXeQvyZUOxyd1QFhVFlUX6e6l6ww7svLStHCB1r5AVZff2qMIHe7v8
+kmfOYWbNgfajUWML3uI0gV84Ye5eHvhAgH/K75UYiL5A759rAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5pbmhhLmZyhiJodHRwczovL2lkcC5pbmhhLmZyL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBT6ICU4qeViyJcpEbrb0Zafyr/q3TANBgkqhkiG
+9w0BAQUFAAOCAQEADTAcGw7sH3vRJyCfv7kdWEzefxYx9nQPmeAY1z7/nL0qV865
+izTHDW7x9CMcQBnbapyuNB+uQbmJzovNW/eLjxNzFoqy4DVCYf2oFq4DX3RpPZj8
+a0Qsmll/OC6LZ1OnsSTg2F38fN+WwhHP9AEPdktsIxt1D0v7qr3gPzipdj1Bz3Z7
+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://unknown.site.com</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
new file mode 100644
index 00000000..4ea19ada
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.inp-toulouse.fr-idp-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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="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>
+					      MIIDNzCCAh+gAwIBAgIUT/ZV7f3Lusa+9lbOZVbS0YCpfgwwDQYJKoZIhvcNAQEF
+BQAwHjEcMBoGA1UEAxMTaWRwLmlucC10b3Vsb3VzZS5mcjAeFw0xMzA5MjcwOTA1
+MzJaFw0zMzA5MjcwOTA1MzJaMB4xHDAaBgNVBAMTE2lkcC5pbnAtdG91bG91c2Uu
+ZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCjHZkvuctwIDMU/L1
+5Ob1BjzGWbbGwan/PZ3bilttwf37Ve/ZsFHBfI7YF6tFw8guYRRl1dmAkHxxZCIB
+zo4PGcFQFUkb8K1+hi1ev6f71LP2BOEJWsQ9NsO4HDbpTzqGrCrXgG7LlTGpBhOT
+CRevT5z7hd9qTk6pW+nbG3mY2NnKTm2WpjFaycYZiF07yFJGBWIh5ndkhfyBF21R
+N2D7sHRqByVLBzU4vZfRuo8cG6Ufx76whxZGRqZq8kmTWuU1sBPhore83Y1NuYIs
+cM/BhndXVwdN0GSE3eeJpIHJ3txhPtk8HbU8jz6y7qOHPMgLmnxkpFdMn47hmGCF
+t+lvAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkcC5pbnAtdG91bG91c2UuZnKGKmh0
+dHBzOi8vaWRwLmlucC10b3Vsb3VzZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
+FgQUTWqwiYs7axsJyzXQr+TFjSLuKLEwDQYJKoZIhvcNAQEFBQADggEBAB3fpoVO
+bwmHRurLoU76J1fK/eoaNGL6+TRUW6DlV8nw1qDI+staKmlmbiKlzHCYCXGw8+hX
+NnaHlYPj/89d9A9XnA9UgsTio3p2SxaL+Z2XQg7mmrG4zNGrSDByNRsmG43H0W3U
+I/1OI5Pc27jS97gnIrbgdh7c9W0EuzBMYB1X2n+FXC4IJVRbRap4w5okGxztKYdv
+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>
+					      MIIEczCCA1ugAwIBAgIQUvXDGTom14VWyQKZ9c5IAjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDkyNzAwMDAwMFoXDTE2MDkyNjIzNTk1OVowQTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNpZHAuaW5wLXRv
+dWxvdXNlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7A4XoLiZ
+KxOT2emX//nkJR8xl1027xOPLZrzxafUvNxSvIiAknbYdq7fqBE2VONDG9/IwRyW
+w76e/jHbYpd+fZppURwGHPXh47gX8DvMOHf3EYFC1WdiaKWT9ZnO3QDKgVUm+uqV
+4aZtQG/NLjfW2lQNjLR59YDCFeLG7KJKXo49yRpSlE9+xG/aw/XYk+GepUiwUkyY
+hF5OfMzvJobYfW2FZFARkfl8hSsumasyTPTNPL2JR0SvjkNdneh8aYDV+o3E8gQM
+hw1aX6xcuAArW576MEtgYHOK+u9jsC24MxNYws5P7Xr8HhwBFdHlcbwv6nTUPhoi
+/HLjV++A91qkOQIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFP8muWtxJiygf1agWB042qtYx8P3MA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNpZHAuaW5wLXRvdWxvdXNl
+LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQDBuKUisPU8fheH+AhEa2g+FBZM77HHMJr6
+LvRgxynTPLStnsMLJ5AvRB5A5lp01OYxVWMUY1MvuJN3qbTbemfYqPrjl/iT6sQW
+SfqE3lvWtl+yqUtFJ5LSU0506dsuQTRoifxnkUKLWLmwnOiSMbO6FMrr8DCirVND
+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://unknown.site.com</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
new file mode 100644
index 00000000..a47454cb
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.inpa.gov.br-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDTk9DMQswCQYD
+VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDgxNTE5NDYwMFoXDTE5MDgxNDE5
+NDYwMFowKTEMMAoGA1UECxMDTk9DMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmFjhQdUJQNQl5+DE1ad
+963h0KuRMRcDjxpGUZpmQOUySdMG8E5NwVY/rTJHvDKPU8+/l2S1vOholz6KR1Lt
+9sAjJSDUJvIeL8T8enkQ+m8TNLWsO5gh+1Bpqy7vAHiUwADwMBXPnM/18tVZ5GFN
+ep5pvHUcNhl2JE1gIg1B1+727ESjdhsuNr7yKdGNnytItcUJmmSYGctv8FyTr7t5
+mtlIfxXVIlL3cn6xGUFr0DqTGyZ9/3iANzqtaHiDEeYCTK0MklxYHZqK5bAakg54
+4+Xt/EPjKKV0ZQrxc8HaGn23b8HVfSY900VPxhS3shuY6egViMYNdB1HnFeZUuEH
+bwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCCvZP2uemjlVCQvdFM8COTBI897wuc
+kaKwEj6FLjJAOQ3N3jiKPmcJAK7Ok9NrS5o+OAP2uVONy79rtTyiO6CxYYih5wps
+K8G+dDdYP7WRY6mOsbYU50lTj5kWLs1mGeSaxHR81Flb5G8gNArRiXstIkMhGFrm
+Qa8XtmimqZEmX9iciwjb6vgYzhGKuvxPTsUmX85/lggF8iot3I8OICsUJKtQgyPL
+8/JGoy5GXB3Lx5F69PqY6Z0VRbQ0lK/IVFBlfbovtCdj7RlpDnql3gSeZOLofVa0
+g0fW/6Q/Do6teontpCMnf0O2NOTc3335DHolEG1xpntjeUP8QipEGJeN
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
+NDYwMFowKTEMMAoGA1UECxMDTk9DMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmFjhQdUJQNQl5+DE1ad
+963h0KuRMRcDjxpGUZpmQOUySdMG8E5NwVY/rTJHvDKPU8+/l2S1vOholz6KR1Lt
+9sAjJSDUJvIeL8T8enkQ+m8TNLWsO5gh+1Bpqy7vAHiUwADwMBXPnM/18tVZ5GFN
+ep5pvHUcNhl2JE1gIg1B1+727ESjdhsuNr7yKdGNnytItcUJmmSYGctv8FyTr7t5
+mtlIfxXVIlL3cn6xGUFr0DqTGyZ9/3iANzqtaHiDEeYCTK0MklxYHZqK5bAakg54
+4+Xt/EPjKKV0ZQrxc8HaGn23b8HVfSY900VPxhS3shuY6egViMYNdB1HnFeZUuEH
+bwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCCvZP2uemjlVCQvdFM8COTBI897wuc
+kaKwEj6FLjJAOQ3N3jiKPmcJAK7Ok9NrS5o+OAP2uVONy79rtTyiO6CxYYih5wps
+K8G+dDdYP7WRY6mOsbYU50lTj5kWLs1mGeSaxHR81Flb5G8gNArRiXstIkMhGFrm
+Qa8XtmimqZEmX9iciwjb6vgYzhGKuvxPTsUmX85/lggF8iot3I8OICsUJKtQgyPL
+8/JGoy5GXB3Lx5F69PqY6Z0VRbQ0lK/IVFBlfbovtCdj7RlpDnql3gSeZOLofVa0
+g0fW/6Q/Do6teontpCMnf0O2NOTc3335DHolEG1xpntjeUP8QipEGJeN
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..f7d2986c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.inra.fr-idp-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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="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>
+					      MIIEJDCCAwygAwIBAgIJAOpqYvYKPY5EMA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNV
+BAYTAkZSMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ0wCwYDVQQKEwRJTlJBMRQwEgYD
+VQQDEwtpZHAuaW5yYS5mcjEgMB4GCSqGSIb3DQEJARYRaXJpc0Bqb3V5LmlucmEu
+ZnIwHhcNMTIxMTEzMTQ0MDM2WhcNMzcwNzMwMTQ0MDM2WjBpMQswCQYDVQQGEwJG
+UjETMBEGA1UECBMKU29tZS1TdGF0ZTENMAsGA1UEChMESU5SQTEUMBIGA1UEAxML
+aWRwLmlucmEuZnIxIDAeBgkqhkiG9w0BCQEWEWlyaXNAam91eS5pbnJhLmZyMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1JTdk4XTqBi1r68i3u0qYR8P
+4NynVg2F7SoCLDf9ZXrpxMiyik135988ch/8mqyJK451klfCoLTgZfu1YfPQtU4x
+b463LyxSDX0SCnK4XQIBD7W6E+MysAa/hghTs1xamoNZOxZVXGSeRS6iLIZgaMfa
+O4+T/rWciwFJonESjtY2cw6HSx0OSR5lE/Lv/JDnfDMfpyF0dY4hNT8EWFzwwqMv
+q9TyeareTYMI4kd6+rw1bbX1HOWURNTFH3j+bnUx/uH3UMhywueuQTgYdR1wA/+X
+1lGsPy9k9uBQNMhJICL63O8wOLdDxuGWGjKUUF3eOv2W53zm0vA9vPkcnSqayQID
+AQABo4HOMIHLMB0GA1UdDgQWBBQuFYdp2C5bNykoCJKU6Zvck9npFjCBmwYDVR0j
+BIGTMIGQgBQuFYdp2C5bNykoCJKU6Zvck9npFqFtpGswaTELMAkGA1UEBhMCRlIx
+EzARBgNVBAgTClNvbWUtU3RhdGUxDTALBgNVBAoTBElOUkExFDASBgNVBAMTC2lk
+cC5pbnJhLmZyMSAwHgYJKoZIhvcNAQkBFhFpcmlzQGpvdXkuaW5yYS5mcoIJAOpq
+YvYKPY5EMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACVWt4h6qZXm
+gGA+rFStbfxgVX+S749r9CuN+iwKObnwxI93SiiwNnb2PKO9OStTc8urvfNsgy8O
+vWGAZclkl2aeesV3r5oZxj26Jui2csSAh9SN0qozuTGStVxi7mCw4g+eT757IZs2
+FE2UnVn3QV2keLIsfk6excx9DcdomHhhaZXnqF/o8w8WUWRR8+RgoT8b2S1NjM63
+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>
+					      MIIEJDCCAwygAwIBAgIJAOpqYvYKPY5EMA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNV
+BAYTAkZSMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ0wCwYDVQQKEwRJTlJBMRQwEgYD
+VQQDEwtpZHAuaW5yYS5mcjEgMB4GCSqGSIb3DQEJARYRaXJpc0Bqb3V5LmlucmEu
+ZnIwHhcNMTIxMTEzMTQ0MDM2WhcNMzcwNzMwMTQ0MDM2WjBpMQswCQYDVQQGEwJG
+UjETMBEGA1UECBMKU29tZS1TdGF0ZTENMAsGA1UEChMESU5SQTEUMBIGA1UEAxML
+aWRwLmlucmEuZnIxIDAeBgkqhkiG9w0BCQEWEWlyaXNAam91eS5pbnJhLmZyMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1JTdk4XTqBi1r68i3u0qYR8P
+4NynVg2F7SoCLDf9ZXrpxMiyik135988ch/8mqyJK451klfCoLTgZfu1YfPQtU4x
+b463LyxSDX0SCnK4XQIBD7W6E+MysAa/hghTs1xamoNZOxZVXGSeRS6iLIZgaMfa
+O4+T/rWciwFJonESjtY2cw6HSx0OSR5lE/Lv/JDnfDMfpyF0dY4hNT8EWFzwwqMv
+q9TyeareTYMI4kd6+rw1bbX1HOWURNTFH3j+bnUx/uH3UMhywueuQTgYdR1wA/+X
+1lGsPy9k9uBQNMhJICL63O8wOLdDxuGWGjKUUF3eOv2W53zm0vA9vPkcnSqayQID
+AQABo4HOMIHLMB0GA1UdDgQWBBQuFYdp2C5bNykoCJKU6Zvck9npFjCBmwYDVR0j
+BIGTMIGQgBQuFYdp2C5bNykoCJKU6Zvck9npFqFtpGswaTELMAkGA1UEBhMCRlIx
+EzARBgNVBAgTClNvbWUtU3RhdGUxDTALBgNVBAoTBElOUkExFDASBgNVBAMTC2lk
+cC5pbnJhLmZyMSAwHgYJKoZIhvcNAQkBFhFpcmlzQGpvdXkuaW5yYS5mcoIJAOpq
+YvYKPY5EMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACVWt4h6qZXm
+gGA+rFStbfxgVX+S749r9CuN+iwKObnwxI93SiiwNnb2PKO9OStTc8urvfNsgy8O
+vWGAZclkl2aeesV3r5oZxj26Jui2csSAh9SN0qozuTGStVxi7mCw4g+eT757IZs2
+FE2UnVn3QV2keLIsfk6excx9DcdomHhhaZXnqF/o8w8WUWRR8+RgoT8b2S1NjM63
+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://unknown.site.com</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
new file mode 100644
index 00000000..3c14c427
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.insa-rennes.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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="fr">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>
+					      MIIDNDCCAhygAwIBAgIVAJHTEvJ6v+nlYzV+wkUtFZ6HzcHCMA0GCSqGSIb3DQEB
+BQUAMB0xGzAZBgNVBAMTEmlkcC5pbnNhLXJlbm5lcy5mcjAeFw0xMTExMTgwOTU4
+MzZaFw0zMTExMTgwOTU4MzZaMB0xGzAZBgNVBAMTEmlkcC5pbnNhLXJlbm5lcy5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJYlYtRP3NDZSmNJI7aK
+/m/7Mr2Hxk6D7zPWCkgTB+TjG4ZRmHxBQnpWPiceF3FApyRVwERozwzIqQwneJNv
+5l6OyDnzzRrS66gGMoRl3wtUfMwEYQ2C7Ra+9YVQ9jk5KnYtz23eL+aKEuunzGcP
+Q30cQjCp7Ul24A3SxpaEh833HXF99wUOUY2m0eGWbrtrNlfFKccdFC4aP0BJBKwW
+O3jSaYI9+8Li1X6bkYtxckzJXpnT+mFd+YtdheBHervp5LV/UaXLu0gkba2QpPxh
+K1sSF2c9rxHHtsFmz8MLybRhUav+geOptiwdao4x+RADBYqqadBExIfwincN32oj
+DpsCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmluc2EtcmVubmVzLmZyhilodHRw
+czovL2lkcC5pbnNhLXJlbm5lcy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+naVqEfHdJ6MDDzgXACj6bY0JkPQwDQYJKoZIhvcNAQEFBQADggEBAEhzs1y7DS7z
+KOwwwe/r04humZpdbH8a1MSimx1eCEUEKaO1JrQKQFJF7Uirm0AOX6VE0KlWc4rO
+tIJEPylxZcEopP1fbyCh7qk20MQQzlFuDWr14M+UU8jAtLodDafQRG2Vevsyj/hI
+Ru43dYNwSJWuAsKkIgJfrtGFsLzJFGqabyWvaRRxuz04RWMdxdrcMAKsnREo4EZ7
+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">INSA de Rennes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INSA de Rennes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</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.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.inserm.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..acc1c0c6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.inserm.fr-idp-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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="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>
+					      MIIDHzCCAgegAwIBAgIUPRg4DDJsvsJXUOi8j5yeUXXX7vwwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLmluc2VybS5mcjAeFw0xMDA5MjcxMjQwMzVaFw0z
+MDA5MjcxMjQwMzVaMBgxFjAUBgNVBAMTDWlkcC5pbnNlcm0uZnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZMeilvtmNQnYydiIIwt449Et+Hpk5lqUg
+6WSjV5CHD7Lz784CjJwXJ3gZ2c2oC6ejVOFxr0RUuxdxmawVY211MZPuyjY8G34i
+sqbxBLYseqBw9SGUQqWKgoPTimcHryL+qj18mzOgevSFYKvVJ/q/nqxDor3/c20V
+KpjVBIL6lMWNqnBrZX63D1O6/clt8RHFDVjOaCHn47IQVBccRfE4AMr9tRCs+q91
+CzvGYMyxSy4hlqyPK/WW+LDY5Hmn3Kp8LZWSKekyBZB8nK1j4qSxOET1zFucd3FU
+MB7pQdtgzs15wbR8JTK1YYO6OJ3ffrY9srenSlcLYdZ3Iud+6pbXAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5pbnNlcm0uZnKGJGh0dHBzOi8vaWRwLmluc2VybS5m
+ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8fCrONu36laDi9nBzT+NIIKejZQw
+DQYJKoZIhvcNAQEFBQADggEBADDcCgGRVAub909ulzl/iYhzl3QhR9XjKxzWV4JH
+4HI7Hb3DAPOcffdbSdG2lLv4qw+Ds9Y08tI9Gof7bDVWE08ye9xFN2BwBTn2KKJz
+lq6FPbfW5Swi289Q0UvCI7J5LbYTAiU+2CYSSgxg0cGer8ho1+hSsKIoLaqXMjz2
+3TMmJK+QuPbnW2jKS3xcdHOUhtZXYKQE+veaHNlNt/8vqF9C7IzCRfSCeT880cHw
+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>
+					      MIIDHzCCAgegAwIBAgIUPRg4DDJsvsJXUOi8j5yeUXXX7vwwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLmluc2VybS5mcjAeFw0xMDA5MjcxMjQwMzVaFw0z
+MDA5MjcxMjQwMzVaMBgxFjAUBgNVBAMTDWlkcC5pbnNlcm0uZnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZMeilvtmNQnYydiIIwt449Et+Hpk5lqUg
+6WSjV5CHD7Lz784CjJwXJ3gZ2c2oC6ejVOFxr0RUuxdxmawVY211MZPuyjY8G34i
+sqbxBLYseqBw9SGUQqWKgoPTimcHryL+qj18mzOgevSFYKvVJ/q/nqxDor3/c20V
+KpjVBIL6lMWNqnBrZX63D1O6/clt8RHFDVjOaCHn47IQVBccRfE4AMr9tRCs+q91
+CzvGYMyxSy4hlqyPK/WW+LDY5Hmn3Kp8LZWSKekyBZB8nK1j4qSxOET1zFucd3FU
+MB7pQdtgzs15wbR8JTK1YYO6OJ3ffrY9srenSlcLYdZ3Iud+6pbXAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5pbnNlcm0uZnKGJGh0dHBzOi8vaWRwLmluc2VybS5m
+ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8fCrONu36laDi9nBzT+NIIKejZQw
+DQYJKoZIhvcNAQEFBQADggEBADDcCgGRVAub909ulzl/iYhzl3QhR9XjKxzWV4JH
+4HI7Hb3DAPOcffdbSdG2lLv4qw+Ds9Y08tI9Gof7bDVWE08ye9xFN2BwBTn2KKJz
+lq6FPbfW5Swi289Q0UvCI7J5LbYTAiU+2CYSSgxg0cGer8ho1+hSsKIoLaqXMjz2
+3TMmJK+QuPbnW2jKS3xcdHOUhtZXYKQE+veaHNlNt/8vqF9C7IzCRfSCeT880cHw
+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://unknown.site.com</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.ipa.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ipa.ie-idp-shibboleth.xml
new file mode 100644
index 00000000..964069b6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ipa.ie-idp-shibboleth.xml
@@ -0,0 +1,65 @@
+<?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>
+      <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>
+MIIDFDCCAfygAwIBAgIVAI3sMWxFvjpe4FwTUUSZvm2vGfvVMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5pcGEuaWUwHhcNMTExMTI1MTczNTQxWhcNMzEx
+MTI1MTczNTQxWjAVMRMwEQYDVQQDEwppZHAuaXBhLmllMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtRddMdHqEdiL5NPjnqqt4VZZtuNNq1xslTEzOoKW
+4fJ7uKbxw0TOnUVgeqoBJEIVhxDvilQXkonb+jDCFZCbyrNsh/ENr0bbqtOwvMYP
+Q4ODxnxK4D+Qjbf/Ld0ki0jjUvZ8v9J6aO2AKk6IPVlvwXi1GoEGy2Ds46DVq3Gl
+V54v/cu6A8vatOpRgF3keOkL1nLW37mjiy9Xu7+8/C5uK+UBzjb/bX5qzjbHbVOG
+hnamqwgRN0QyzQPU1OyNK4b88DIw+gqUi0qo2tlcc+Hn6He3O56uSsTprNwoNKrr
+MvlkEL1pY0lfgAcadJGGrQ9FEi0Ty+GeeyoT0agvHlq0jwIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuaXBhLmllhiFodHRwczovL2lkcC5pcGEuaWUvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFJhKeTQ7ebYvmIRcYtOY8b9L1zhaMA0GCSqGSIb3DQEB
+BQUAA4IBAQANi1lNeUhqvdVK7q7dotF3EPg6C2PJLYUXjInHfHKLHbDDfYGEVf19
+nz2pasKmdfo0bv9kssbuwVfn7tUro8Igdt661gq/0/eriKaMg83qeo5MOoJa0I5t
+94y8/mZAhz3SUReGR3zEhbZIXEx+zdbbz992k6FjMCi4MQpfoN1LD6uqIHqjAu0P
+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>
diff --git a/swamid-interfederations-2.0/idp.ipb.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ipb.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..b6da604e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ipb.fr-idp-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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>
+      <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="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>
+					      MIIEYjCCA0qgAwIBAgIRALgbEIwRuh3U84klcQg/9UAwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MjgwMDAwMDBaFw0xNzA1MjcyMzU5NTlaMDgxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLmlwYi5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK4nVfui+Zt1Trzesy1o
+2T60W4uaIWixKu80BtFxgCW8wacQ9wOwFYWm4LfKRILmNI0p8OnXD+9wHaBOnx44
+wof+tuWZJjXVqvdgq9WIZ+3VSEJkI/wvA7KgHdPaVSPWX6OHDU0K1gm74OjEdHb+
+hFPBiyZ3VW8GALHDUWWjYjDJGUoqOKf/Y0nymNWREKN7y18BqcFhW3JMTHRoepse
+fu5uRqhYU/0YHaZD97oW7fo25N3EF3Ca59uWPYG/1Twhd/OwlIBpTzAbPt903YNk
+RtchHYflp1oJKqkz/dW1h7ueGPKz6QZj4ebM7pwF4fL0TwDtsre67jL8KjtFodvj
+vEcCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
+MB0GA1UdDgQWBBTnzkMBxq38x6wZ8nj2FKqHYXDW6DAOBgNVHQ8BAf8EBAMCBaAw
+DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
+VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
+K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
+KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
+LnRlcmVuYS5vcmcwFQYDVR0RBA4wDIIKaWRwLmlwYi5mcjANBgkqhkiG9w0BAQUF
+AAOCAQEAe8v3WPdLO5+RWtLXf40JeFjGPbFgf9pdsJwpnHCkD7up8PapvqwxENzD
+Pj6laE+YWc6GXI1IeCX7Niye/09BBtn4SW4KVIp8u9qLiDQsrmb9c56xosPQP2/l
+9fC8VzlwnAQ/hrQjyXOA6WaEGRMK5LeWDXZfkos+afU0m/gVl4i57rRNM/B1AgO2
+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">http://unknown.site.com</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
new file mode 100644
index 00000000..d07aa14f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ipm.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDIzCCAgugAwIBAgIUHoc4WAOOS8FXFJOqANPx0dZofskwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLmlwbS5jYXMuY3owHhcNMTQwMzMxMTEzNjMwWhcN
+MzQwMzMxMTEzNjMwWjAZMRcwFQYDVQQDEw5pZHAuaXBtLmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtVmqQC+tS6991zGEb00Rpy9QTbyaqb
+/ImfelKGHYprdU+8gF7WQSldgVncAMSY+z2agvh4ojTqcGnDcMFp4MqLrK2+e2jF
++9rNCGnj3NZoklOJbXDw3YAbqRgpAEeGqv7nribQEN0lkvwQHvSlU05oXmpqe2m+
+qgdMPznUxESq9hymiGfnINn3YRb57fYArbp1FaUvJ+S5sSjcREsvxvzmCrUfAcBZ
+xwK3gqrVrirVPAMFklKNLvIqHTOsnOqm+spc9OcdoyXDCGEpwOQ8868AY7Dat7SO
+gkrM0+zf1Ut9Fe/oRkMQ34Ozt07KsaV6P0rLXoT7elG5HoPAO8sWJRUCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLmlwbS5jYXMuY3qGJWh0dHBzOi8vaWRwLmlwbS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNmaGF8aU8MkTc6UkiWbbnad
+065mMA0GCSqGSIb3DQEBBQUAA4IBAQBQE0fUf6bV/7fscYI7zqh2nFV8qKcjP0jd
+dAKy17PaVFSkCGHgTX39K3kuacWA4a1SZBfN39KmQ9sj1GDF7Zci0V+tS/tbckbv
+1ME/Z+MyQTQTodGorOTdDsJKKdHbIIOVPOvO9IhX77ej4gFRX5+POQVSqtA/1Syp
+3oTa1zV9s/UD+WifYFmlUlF50Kw1hE9XXf/Mg4Aj664moUWKWk/ZoiEoa3fS4gyI
+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>
+MIIDIzCCAgugAwIBAgIUHoc4WAOOS8FXFJOqANPx0dZofskwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLmlwbS5jYXMuY3owHhcNMTQwMzMxMTEzNjMwWhcN
+MzQwMzMxMTEzNjMwWjAZMRcwFQYDVQQDEw5pZHAuaXBtLmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtVmqQC+tS6991zGEb00Rpy9QTbyaqb
+/ImfelKGHYprdU+8gF7WQSldgVncAMSY+z2agvh4ojTqcGnDcMFp4MqLrK2+e2jF
++9rNCGnj3NZoklOJbXDw3YAbqRgpAEeGqv7nribQEN0lkvwQHvSlU05oXmpqe2m+
+qgdMPznUxESq9hymiGfnINn3YRb57fYArbp1FaUvJ+S5sSjcREsvxvzmCrUfAcBZ
+xwK3gqrVrirVPAMFklKNLvIqHTOsnOqm+spc9OcdoyXDCGEpwOQ8868AY7Dat7SO
+gkrM0+zf1Ut9Fe/oRkMQ34Ozt07KsaV6P0rLXoT7elG5HoPAO8sWJRUCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLmlwbS5jYXMuY3qGJWh0dHBzOi8vaWRwLmlwbS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNmaGF8aU8MkTc6UkiWbbnad
+065mMA0GCSqGSIb3DQEBBQUAA4IBAQBQE0fUf6bV/7fscYI7zqh2nFV8qKcjP0jd
+dAKy17PaVFSkCGHgTX39K3kuacWA4a1SZBfN39KmQ9sj1GDF7Zci0V+tS/tbckbv
+1ME/Z+MyQTQTodGorOTdDsJKKdHbIIOVPOvO9IhX77ej4gFRX5+POQVSqtA/1Syp
+3oTa1zV9s/UD+WifYFmlUlF50Kw1hE9XXf/Mg4Aj664moUWKWk/ZoiEoa3fS4gyI
+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>
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
new file mode 100644
index 00000000..cddaea1a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ipp.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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: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>
+      <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>
+MIIDJDCCAgygAwIBAgIVANNKPXr0zaDp+SLe9bDmbfYURJlsMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5pcHAuY2FzLmN6MB4XDTE0MTEyNDA4MDkyOFoX
+DTM0MTEyNDA4MDkyOFowGTEXMBUGA1UEAxMOaWRwLmlwcC5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0TdQMt7WnWV3EHS99mypGeymSl8eO
+irfeH/mCY89lkISlzPzgf720FaeKF3laKqwn8JMTHJZEPyq6xlEc/ZVElcbDB6nI
+Q+UjIKBPNcAjUySEbmQH8sWsCOwjRMqFwELl/WXndlsGg7EChwvlz/dKVXqgnSc7
+KH/laYPBLIzigaimWaA7PIpx/YKu9s4jTpKeKSSX8ZaWv1/M+seRaEtGnt8m8WHY
+Jpt6uCk4mcwQG19GkNcS/cvkZ0SqKC0HFvYziaVpzCcHomtWPpo2RXWxBDbaGLAF
+bzLWM1jFrT69grMA8tHa5aOpDInWysQt8WI1annD4I3ejmRtGW6ZPdEvAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5pcHAuY2FzLmN6hiVodHRwczovL2lkcC5pcHAu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSB/tJDVhkvn91f9684yT7f
+lrHksTANBgkqhkiG9w0BAQUFAAOCAQEAcZaOUorzs7jRbPxjHHP4MgUGKbejoAIU
+ddkZ3/XYx/uk3pD3WhsN3eBvMT8rRHAe7Us5IGn9YOj1ThlHvejxZDCBtG6liOMM
+xqt8K+B93hmlOoTBEH9Gw0lUX8hT4stq2RM3MQ3Dxmadj5vGvTergGuymiQqg2SI
+php0bSMHfJrOXSBGf//sMBj+qoGzM+dYCGu7VRRnt4CqJXi4WEqRQP0cpS0Izn1W
+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>
+MIIDJDCCAgygAwIBAgIVANNKPXr0zaDp+SLe9bDmbfYURJlsMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5pcHAuY2FzLmN6MB4XDTE0MTEyNDA4MDkyOFoX
+DTM0MTEyNDA4MDkyOFowGTEXMBUGA1UEAxMOaWRwLmlwcC5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0TdQMt7WnWV3EHS99mypGeymSl8eO
+irfeH/mCY89lkISlzPzgf720FaeKF3laKqwn8JMTHJZEPyq6xlEc/ZVElcbDB6nI
+Q+UjIKBPNcAjUySEbmQH8sWsCOwjRMqFwELl/WXndlsGg7EChwvlz/dKVXqgnSc7
+KH/laYPBLIzigaimWaA7PIpx/YKu9s4jTpKeKSSX8ZaWv1/M+seRaEtGnt8m8WHY
+Jpt6uCk4mcwQG19GkNcS/cvkZ0SqKC0HFvYziaVpzCcHomtWPpo2RXWxBDbaGLAF
+bzLWM1jFrT69grMA8tHa5aOpDInWysQt8WI1annD4I3ejmRtGW6ZPdEvAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5pcHAuY2FzLmN6hiVodHRwczovL2lkcC5pcHAu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSB/tJDVhkvn91f9684yT7f
+lrHksTANBgkqhkiG9w0BAQUFAAOCAQEAcZaOUorzs7jRbPxjHHP4MgUGKbejoAIU
+ddkZ3/XYx/uk3pD3WhsN3eBvMT8rRHAe7Us5IGn9YOj1ThlHvejxZDCBtG6liOMM
+xqt8K+B93hmlOoTBEH9Gw0lUX8hT4stq2RM3MQ3Dxmadj5vGvTergGuymiQqg2SI
+php0bSMHfJrOXSBGf//sMBj+qoGzM+dYCGu7VRRnt4CqJXi4WEqRQP0cpS0Izn1W
+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>
diff --git a/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml
new file mode 100644
index 00000000..3f46ccdf
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.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:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <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 height="145" width="144" xml:lang="sv">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
+        <mdui:Logo height="145" width="144" xml:lang="en">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://documents.irf.se/get_document.php?group=Computer&amp;docid=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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDCDCCAfCgAwIBAgIJAOTXvdZcGqcaMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+BAMTCnd3dy5pcmYuc2UwHhcNMTQwNDExMTIyMzI4WhcNMTcwNDEwMTIyMzI4WjAV
+MRMwEQYDVQQDEwp3d3cuaXJmLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA5j6+1LkPONXRnBX/hijB9EDb8+jg1NpNDEq4kPpxIo+2zPgR8GVqWwND
+NXZZNZWvgb52cCm4ofyOK8p2eOIi5CXJoEhCU1k3LVfaAms+1j02/JpQkKatr8RC
+ONxIvbs45H440KbuK+nmhQI1hRcZ8bB8FadX9EInEWjrxGZNyMlsMnfRLS/BGmc3
+htF8BSNd01XiCy5R6X5OufIlyKHoo/fAcDv1zJlLb4r07PlzbCtfKFIrE7w/KBB8
+fKLkMKI1KRO7FgLET3xf5GH7ZY2N8Y4+fwBf70rHzsh1Grsjk/ZJUOu+2jcxMW1R
+L5/pp229zplUBywYgz2HTxceQNZF4QIDAQABo1swWTA4BgNVHREEMTAvggp3d3cu
+aXJmLnNlhiFodHRwczovL3d3dy5pcmYuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFNIFWvl057NJOMck/J+lUMXn5jKfMA0GCSqGSIb3DQEBBQUAA4IBAQDdA72P
+RuVvpMliAJYK/qTSy9HJH1rptUQcON5SRGY8H9nlJ268FSxf06Hp+2qqqglE/nmA
+fb7Viy/3o2WbnQVLznXoG3mjrRHWMXXniqLryFPcC9/yH4Mz2HBmeDzZyftUgUk2
+PEewRy7hbFCLpItGerJQlaFcyoLG8qR4d+v1ruOSSK/p1Bobk5AhxfSh05TmAKko
+bezn0NFgAFP5ezEjK9uZ2N+vmQbbirVqYslNn/9kK6G+pXQQsBegliIcqNKj7iST
+WKAfSLfPK6//KWPOPnZrpaAuyIMxrM/2/adK6Ko0mjM8D6sIUhT3zcfbq4M/m8vv
+XCYbfP8E3cs4MB+K
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.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://idp.irf.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.irf.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.irf.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.irf.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">irf.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDCDCCAfCgAwIBAgIJAOTXvdZcGqcaMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+BAMTCnd3dy5pcmYuc2UwHhcNMTQwNDExMTIyMzI4WhcNMTcwNDEwMTIyMzI4WjAV
+MRMwEQYDVQQDEwp3d3cuaXJmLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA5j6+1LkPONXRnBX/hijB9EDb8+jg1NpNDEq4kPpxIo+2zPgR8GVqWwND
+NXZZNZWvgb52cCm4ofyOK8p2eOIi5CXJoEhCU1k3LVfaAms+1j02/JpQkKatr8RC
+ONxIvbs45H440KbuK+nmhQI1hRcZ8bB8FadX9EInEWjrxGZNyMlsMnfRLS/BGmc3
+htF8BSNd01XiCy5R6X5OufIlyKHoo/fAcDv1zJlLb4r07PlzbCtfKFIrE7w/KBB8
+fKLkMKI1KRO7FgLET3xf5GH7ZY2N8Y4+fwBf70rHzsh1Grsjk/ZJUOu+2jcxMW1R
+L5/pp229zplUBywYgz2HTxceQNZF4QIDAQABo1swWTA4BgNVHREEMTAvggp3d3cu
+aXJmLnNlhiFodHRwczovL3d3dy5pcmYuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFNIFWvl057NJOMck/J+lUMXn5jKfMA0GCSqGSIb3DQEBBQUAA4IBAQDdA72P
+RuVvpMliAJYK/qTSy9HJH1rptUQcON5SRGY8H9nlJ268FSxf06Hp+2qqqglE/nmA
+fb7Viy/3o2WbnQVLznXoG3mjrRHWMXXniqLryFPcC9/yH4Mz2HBmeDzZyftUgUk2
+PEewRy7hbFCLpItGerJQlaFcyoLG8qR4d+v1ruOSSK/p1Bobk5AhxfSh05TmAKko
+bezn0NFgAFP5ezEjK9uZ2N+vmQbbirVqYslNn/9kK6G+pXQQsBegliIcqNKj7iST
+WKAfSLfPK6//KWPOPnZrpaAuyIMxrM/2/adK6Ko0mjM8D6sIUhT3zcfbq4M/m8vv
+XCYbfP8E3cs4MB+K
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.irf.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.irf.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">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>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>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>matsl@irf.se</md:EmailAddress>
+    <md:TelephoneNumber>+4698079022</md:TelephoneNumber>
+  </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
new file mode 100644
index 00000000..9cdc1f9c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.irstea.fr-idp-shibboleth.xml
@@ -0,0 +1,54 @@
+<?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>
+      <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="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>
+					      MIIDIDCCAgigAwIBAgIVAINKG8UKonnXc9QRha4KV5urgO0WMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcC5pcnN0ZWEuZnIwHhcNMTMwNDExMDkxMDE3WhcN
+MzMwNDExMDkxMDE3WjAYMRYwFAYDVQQDEw1pZHAuaXJzdGVhLmZyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjoVm6ET1G+LU/Bs+d24QZXmBDqxgmcmb
+j4TtylC1j9nsS6eo3hiiMewADQqRCeilde/NB2lO4WNtEwSopYDVN+qQBJXLeyIH
+nxMSDhjofcuYOLrvKEC68r5wksj4ASgdNZH26w682vmyCQK1BXM+BnDgK+8JVQYM
+fxaEhUZVqK+mKeFlKuIloGX8vqMYSR+9933ZaBgg6tRy7x1f8HXGKlJOHqfyonni
+NFLrODFiQ7iYzCO3Re+tMW7fGYT0vWBvI3ONlPWZOCcLD1T1+uVk6s4gyAm1loPS
+kUCQ4U8AyR7ai3BiQ2FJo9nL0M1dk4wa3ww/mq7M9z5A9YD32dS18QIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHAuaXJzdGVhLmZyhiRodHRwczovL2lkcC5pcnN0ZWEu
+ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMZx2MPfMr2fV2uFJRTLZdgetgkN
+MA0GCSqGSIb3DQEBBQUAA4IBAQAmUhJ+9NVBiJS/bTle1Kbq3FU2JgpaCiTMu/Hi
+M1tKHcXGleAryzUX/yHazsFYGtGQ0XyWWdbbkc0J194/6tDxHqm6nEblm2kdGEoc
+5owRFCbVwCaTMt7NflbYQJC1EPdsMycyEw39WMx/Pk9bEAxItQaogAA9y+V0n/Mp
+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://unknown.site.com</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
new file mode 100644
index 00000000..b13b5c91
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.isibrno.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,120 @@
+<?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>
+      <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>
+MIIDNDCCAhygAwIBAgIVAN6/dlQMJzTi2IACxc9aB2vEh51LMA0GCSqGSIb3DQEB
+BQUAMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5jejAeFw0xNDA2MTcxMTI0
+MjdaFw0zNDA2MTcxMTI0MjdaMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5j
+ejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRKrMNqsBK9lmn6mspW
+Ckqe4oN79quQnbIO8oALicbusGp8fNDB+TKoqWvSYnGm7PpMRAzEXEHUDuRGmu/i
+sO932HYgT03IAJ2Hod0QX6FmASRSFzFzA1XOBmvH7owojKb7RsmMgy41ZWpJr1TZ
+yUzYue5oY046L5LNrRA/gwFMFy03Xx5Dg1KR6Q6+iXK59hbJ68myITGRd4hLjEQ2
+EEztzKlgJbjIwuYR/nTLxzMm7eFmGovsuEw5P2m9+/33V1qegfkQ2hKSWjYTmYhO
+v6ebjThZirBV0+vj4tvz3EBPsBCmukeoJ1D8RG4MOnCCXC6Ez8pOg8G43W7hfMJP
+V2UCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmlzaWJybm8uY2FzLmN6hilodHRw
+czovL2lkcC5pc2licm5vLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+iklO2sw6SHSChxpzcIXV4qssHbQwDQYJKoZIhvcNAQEFBQADggEBALAS8YLsozYH
+OtqA0t3RtJGaBr5M5NOjxvNgofWyTY87UekbzSLoCeGopxPbF1SX4rt3Ys/FX296
+cQaWR7XpGj3Amyw5nLqKxh8jqWBHgzqujSZ+bHPgwvrPZl7FwOzCgr8utIQMGfxO
+vZBbs86W8wZILHNwmlMnZeWEvfrWOL4cJZPNwLp8PnacVszM5aXtr7xtP0lbjBEX
+XWVV2/B9cP9lAuouGum+k7CjvXJEL/Rtzl9lKJgumhwSuaNZkR1LqaNsWAxlWasg
+0LYAs3q2iyLbcWXFezedoHcpzyQzOA42LhjKoy1+OtSOv7BwwdvyxGBozM1WK8nf
+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>
+MIIDNDCCAhygAwIBAgIVAN6/dlQMJzTi2IACxc9aB2vEh51LMA0GCSqGSIb3DQEB
+BQUAMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5jejAeFw0xNDA2MTcxMTI0
+MjdaFw0zNDA2MTcxMTI0MjdaMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5j
+ejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRKrMNqsBK9lmn6mspW
+Ckqe4oN79quQnbIO8oALicbusGp8fNDB+TKoqWvSYnGm7PpMRAzEXEHUDuRGmu/i
+sO932HYgT03IAJ2Hod0QX6FmASRSFzFzA1XOBmvH7owojKb7RsmMgy41ZWpJr1TZ
+yUzYue5oY046L5LNrRA/gwFMFy03Xx5Dg1KR6Q6+iXK59hbJ68myITGRd4hLjEQ2
+EEztzKlgJbjIwuYR/nTLxzMm7eFmGovsuEw5P2m9+/33V1qegfkQ2hKSWjYTmYhO
+v6ebjThZirBV0+vj4tvz3EBPsBCmukeoJ1D8RG4MOnCCXC6Ez8pOg8G43W7hfMJP
+V2UCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmlzaWJybm8uY2FzLmN6hilodHRw
+czovL2lkcC5pc2licm5vLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+iklO2sw6SHSChxpzcIXV4qssHbQwDQYJKoZIhvcNAQEFBQADggEBALAS8YLsozYH
+OtqA0t3RtJGaBr5M5NOjxvNgofWyTY87UekbzSLoCeGopxPbF1SX4rt3Ys/FX296
+cQaWR7XpGj3Amyw5nLqKxh8jqWBHgzqujSZ+bHPgwvrPZl7FwOzCgr8utIQMGfxO
+vZBbs86W8wZILHNwmlMnZeWEvfrWOL4cJZPNwLp8PnacVszM5aXtr7xtP0lbjBEX
+XWVV2/B9cP9lAuouGum+k7CjvXJEL/Rtzl9lKJgumhwSuaNZkR1LqaNsWAxlWasg
+0LYAs3q2iyLbcWXFezedoHcpzyQzOA42LhjKoy1+OtSOv7BwwdvyxGBozM1WK8nf
+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>
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
new file mode 100644
index 00000000..80c363a1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.it-tallaght.ie-idp-shibboleth.xml
@@ -0,0 +1,64 @@
+<?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">
+    <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>
+MIIDMzCCAhugAwIBAgIUYPVjSYp7op9s7Ie2DtEL+5ZzoCIwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLml0LXRhbGxhZ2h0LmllMB4XDTExMDcyODEyMTQz
+OVoXDTMxMDcyODEyMTQzOVowHTEbMBkGA1UEAxMSaWRwLml0LXRhbGxhZ2h0Lmll
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmSmY3owkK4unuAmRmEZT
+EaRtCmksLa2Okjl9ulhhboHYNubqTfLt/12Jxd95Md9lUi7+KdyakU60kwgImj2w
+CBtFQAhP2MNXdvFB+wSbETyFfYacKdeyPRF6BONAnkn1QUZxmQQOGO0xjxjPccJm
+SPVknQW5xE6B7ZGuvQfnM3HxAE5tXCd5L2ZDBS6MkEX+KZnDmyhltlzJpvpeb23/
+j0sYHNPeBgIhByp7bTK6blVJO0UNMK+Ts9Fi118r7fJlP6VEGPFKPtyRnrACBamx
+NfRF2ncBOBfxla8mIx9XwNJkvaX2UMCrUrcN1WBoUTfKeQae55lTisaps7auln/5
+mwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuaXQtdGFsbGFnaHQuaWWGKWh0dHBz
+Oi8vaWRwLml0LXRhbGxhZ2h0LmllL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTo
+un8552N5PrTaJaM2AOMIuyJykTANBgkqhkiG9w0BAQUFAAOCAQEARXS+XY144D9N
+K1uz60zUXXF4Ij90+ljigGxOjcce0EMRI+Zqhfiq0mYGRr3z/yyir9/WDv8/U1bo
+ivvfNqimHVEl821GC1Jnjw3sLwCCvwBaq91Y2Pqfu13nv9dpGOVIxsCeNGGFM4mv
+MORRBvK+bkMmhm5rNZb1zEDkCkSKGgdQLzd4sQO7M/f46XJmqffhNjQ6FysjZYyO
+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: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: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
new file mode 100644
index 00000000..7dfe0e20
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml
@@ -0,0 +1,117 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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 height="50" width="344" xml:lang="sv">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
+        <mdui:Logo height="50" width="376" xml:lang="en">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:GeolocationHint>geo:57.6986,11.9712</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUGLU4YqWFYHboh+F+iLNYkBw8XNAwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMB4XDTA5MDgyNDExMzA1OFoXDTI5
+MDgyNDExMzA1OFowFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEApOVkzaHuTCe+7lf79UnQ5iQ/8OLbJpwOxPTF
+wEPIHbMMU/aCVnxoZnwNApblqvpP2uOsQvh8d0uDv2iVC5BMN0ff9M+9rN7D/gAo
+L+w8CmWiHRudKyZLu8Gu89SGxyQ59AVCbJzGaEE9h/CmMYHCj/ONJ8mtjG9uw6u+
+Vj+L8PHXsPHQsLvcl3/D7duIYH/xHRbPzXS0imux+r/OcSCR3aCPCx3uuAfVPxGS
+9Y/ifynV586V3szIM7O15SeXKenFMKjQhzA23ZPcHhDSxWnVGUDWFDRDNAXfD7BF
+KRBCaUlWZvczqsV3eGtW8XgOmuW/7yJT5REfrrSLOKprAK8yoQIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAuaXQuZ3Uuc2WGI2h0dHBzOi8vaWRwLml0Lmd1LnNlL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSpKDUl7ZRxhQ1/HRmVbFd+NbwxmzANBgkq
+hkiG9w0BAQUFAAOCAQEAXfaYlHQj4KRaJmMbWFV0XyNUlHNio8010vLv3t6WztlZ
+jZFL/hTQIFhmYEA04Davdk+1/1JvcRePSpg2VCxT/QwHyOR3eimmQ6FKXWls/zO/
+V01sJrlLdf/53pzXYsVSOf50UK+GtrSB3hhzrFmeaBALOysGqk2h2/UdYISXxa/e
+MyQ/aOI5u+0Wlq2RdIXF8MrtnwBTRhNXLcXYzz4fPsdjd4TmmJLQLXLmFLE/IA+/
+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>
+MIIDGzCCAgOgAwIBAgIUGLU4YqWFYHboh+F+iLNYkBw8XNAwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMB4XDTA5MDgyNDExMzA1OFoXDTI5
+MDgyNDExMzA1OFowFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEApOVkzaHuTCe+7lf79UnQ5iQ/8OLbJpwOxPTF
+wEPIHbMMU/aCVnxoZnwNApblqvpP2uOsQvh8d0uDv2iVC5BMN0ff9M+9rN7D/gAo
+L+w8CmWiHRudKyZLu8Gu89SGxyQ59AVCbJzGaEE9h/CmMYHCj/ONJ8mtjG9uw6u+
+Vj+L8PHXsPHQsLvcl3/D7duIYH/xHRbPzXS0imux+r/OcSCR3aCPCx3uuAfVPxGS
+9Y/ifynV586V3szIM7O15SeXKenFMKjQhzA23ZPcHhDSxWnVGUDWFDRDNAXfD7BF
+KRBCaUlWZvczqsV3eGtW8XgOmuW/7yJT5REfrrSLOKprAK8yoQIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAuaXQuZ3Uuc2WGI2h0dHBzOi8vaWRwLml0Lmd1LnNlL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSpKDUl7ZRxhQ1/HRmVbFd+NbwxmzANBgkq
+hkiG9w0BAQUFAAOCAQEAXfaYlHQj4KRaJmMbWFV0XyNUlHNio8010vLv3t6WztlZ
+jZFL/hTQIFhmYEA04Davdk+1/1JvcRePSpg2VCxT/QwHyOR3eimmQ6FKXWls/zO/
+V01sJrlLdf/53pzXYsVSOf50UK+GtrSB3hhzrFmeaBALOysGqk2h2/UdYISXxa/e
+MyQ/aOI5u+0Wlq2RdIXF8MrtnwBTRhNXLcXYzz4fPsdjd4TmmJLQLXLmFLE/IA+/
+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>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>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>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
new file mode 100644
index 00000000..ec5e8cf3
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?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>
+      <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 height="110" width="127" xml:lang="sv">https://idp.it.su.se/idp/img/su-logo-sv_OLD.gif</mdui:Logo>
+        <mdui:Logo height="110" width="127" xml:lang="en">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
+BAMTDGlkcC5pdC5zdS5zZTAeFw0xMDExMDkwODIyMDFaFw0yMDExMDYwODIyMDFa
+MBcxFTATBgNVBAMTDGlkcC5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALy4tcsCvWZi8mo07/AwkbbokGh9VLf9Nae6t8AXX+ul9AOfW6nT
+OJS4UsSafJ/fLhNJTjtMr1lXyl2Ah2zhhrhCsFpe0T7iYaX+rKlcZ8/V/BkgVbKm
+5obDh/CGW32dPGS6quDSTw2876X5sOl72IE4h038Z6t9XJCdQwDK9YNPgb5Zu+XH
+PHLJZD/kx+VwAPfx34YoKCpB2C/3U2Nj+KsojMtRcNTLeb+PJ5t0B9vEsGOcOlko
+7VT9EjEuSkyxRPEmssaekotHDlkKB9R3d/LS/OvWdHd4UjgQGJO8YIebTjIYQDk+
+HPs9HhL4mJBUqTYK7aKE/gelBwEKgm9myzkCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+aWRwLml0LnN1LnNlMB0GA1UdDgQWBBQ3SkZT5Th4yF7H6i2+x0beJnXTEzANBgkq
+hkiG9w0BAQUFAAOCAQEAiatjbM0+PvK1enL0CCoVHoPSBwT45eq5e4YGVabqX2Vt
+kuuZpg3O/POnPI4VUENEPZqrsRQJwjvfVlptgU/0C1IdBdKZbQPdci2kTcNHPtj9
++AjFPs8D/rRAHufDCO/yUV7v6rDaLwVDlGA+Tof/2OISRubHA+qzWtsmkCij8epu
+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
+BAMTDGlkcC5pdC5zdS5zZTAeFw0xMDExMDkwODIyMDFaFw0yMDExMDYwODIyMDFa
+MBcxFTATBgNVBAMTDGlkcC5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALy4tcsCvWZi8mo07/AwkbbokGh9VLf9Nae6t8AXX+ul9AOfW6nT
+OJS4UsSafJ/fLhNJTjtMr1lXyl2Ah2zhhrhCsFpe0T7iYaX+rKlcZ8/V/BkgVbKm
+5obDh/CGW32dPGS6quDSTw2876X5sOl72IE4h038Z6t9XJCdQwDK9YNPgb5Zu+XH
+PHLJZD/kx+VwAPfx34YoKCpB2C/3U2Nj+KsojMtRcNTLeb+PJ5t0B9vEsGOcOlko
+7VT9EjEuSkyxRPEmssaekotHDlkKB9R3d/LS/OvWdHd4UjgQGJO8YIebTjIYQDk+
+HPs9HhL4mJBUqTYK7aKE/gelBwEKgm9myzkCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+aWRwLml0LnN1LnNlMB0GA1UdDgQWBBQ3SkZT5Th4yF7H6i2+x0beJnXTEzANBgkq
+hkiG9w0BAQUFAAOCAQEAiatjbM0+PvK1enL0CCoVHoPSBwT45eq5e4YGVabqX2Vt
+kuuZpg3O/POnPI4VUENEPZqrsRQJwjvfVlptgU/0C1IdBdKZbQPdci2kTcNHPtj9
++AjFPs8D/rRAHufDCO/yUV7v6rDaLwVDlGA+Tof/2OISRubHA+qzWtsmkCij8epu
+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>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>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>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
new file mode 100644
index 00000000..483ba6fd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.itam.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDJzCCAg+gAwIBAgIUEsBKg0xdOetjiFaXL+mfQFs6ERcwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MB4XDTE0MTAyMjA3MDMxOFoX
+DTM0MTAyMjA3MDMxOFowGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxAvwUCh/S8mxj1tvJq+Q+wssQ91g
+V83jKtGHeZnM+ADZ2iFNglHPE+BBBYb1bj9pqsP2BRwWIPWHeJ8bz1sLVeC90t23
+xLOudYs1ACIskNK7gvcKF1QBGGopHlUXmAgxibLTT+4+ZcBbzOdCMakBlxQd4wr5
+gSB35AD8SR7Qe5t3PoE5SQ3PK224l6DALOW9YdZ5bI0VfUJAqQjiDp9/hfmBXaod
+Kzx2N+G12Jyay7VTnq7HCqUCwkWmMk2ZPmRUFwJ5abxOQtO3ClfDRoGHgVQSlR9O
+Lwe0Ee3wFxvcCvGlTFdJ6WHgV5mhIB4PHxGyHADIW1BGG3Vd8WgX3w/2oQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAuaXRhbS5jYXMuY3qGJmh0dHBzOi8vaWRwLml0
+YW0uY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ34hoPcWC9wTBNpEun
+P6HH6dsWFDANBgkqhkiG9w0BAQUFAAOCAQEAJ0emvpLRJ3uJgfwgdXNI56Gi7zw/
+VtqXMmeuioY4Hqn3il10yOxvyM9FJCbgsGmCSpyUiIQzvMbZhJXjG/XSM17G3OdB
+t0gXjqSZ8XUzQ76xxGi4pBVlqTr50XpC6tlbOxZ8GflFX5DCGNTOSW/QKZUjnqB/
+ttna9+UdDjmShQa2JBMmJ+mRM6m8RFEy2WQZplChLZkoZqLIWD48YY3GjGtOQ6FP
+2qO9lehSxJNgnAqM7raKBHwJIsZqYuTMaDU1Xm7JVg0eD9ht2Lvzmax69VjL1soY
+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>
+MIIDJzCCAg+gAwIBAgIUEsBKg0xdOetjiFaXL+mfQFs6ERcwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MB4XDTE0MTAyMjA3MDMxOFoX
+DTM0MTAyMjA3MDMxOFowGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxAvwUCh/S8mxj1tvJq+Q+wssQ91g
+V83jKtGHeZnM+ADZ2iFNglHPE+BBBYb1bj9pqsP2BRwWIPWHeJ8bz1sLVeC90t23
+xLOudYs1ACIskNK7gvcKF1QBGGopHlUXmAgxibLTT+4+ZcBbzOdCMakBlxQd4wr5
+gSB35AD8SR7Qe5t3PoE5SQ3PK224l6DALOW9YdZ5bI0VfUJAqQjiDp9/hfmBXaod
+Kzx2N+G12Jyay7VTnq7HCqUCwkWmMk2ZPmRUFwJ5abxOQtO3ClfDRoGHgVQSlR9O
+Lwe0Ee3wFxvcCvGlTFdJ6WHgV5mhIB4PHxGyHADIW1BGG3Vd8WgX3w/2oQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAuaXRhbS5jYXMuY3qGJmh0dHBzOi8vaWRwLml0
+YW0uY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ34hoPcWC9wTBNpEun
+P6HH6dsWFDANBgkqhkiG9w0BAQUFAAOCAQEAJ0emvpLRJ3uJgfwgdXNI56Gi7zw/
+VtqXMmeuioY4Hqn3il10yOxvyM9FJCbgsGmCSpyUiIQzvMbZhJXjG/XSM17G3OdB
+t0gXjqSZ8XUzQ76xxGi4pBVlqTr50XpC6tlbOxZ8GflFX5DCGNTOSW/QKZUjnqB/
+ttna9+UdDjmShQa2JBMmJ+mRM6m8RFEy2WQZplChLZkoZqLIWD48YY3GjGtOQ6FP
+2qO9lehSxJNgnAqM7raKBHwJIsZqYuTMaDU1Xm7JVg0eD9ht2Lvzmax69VjL1soY
+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>
diff --git a/swamid-interfederations-2.0/idp.itep.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.itep.br-idp-shibboleth.xml
new file mode 100644
index 00000000..76961ff0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.itep.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xLjAsBgNVBAoTJUluc3RpdHV0
+byBkZSBUZWNub2xvZ2lhIGRlIFBlcm5hbWJ1Y28xDTALBgNVBAsTBFVUSUMxIzAh
+BgkqhkiG9w0BCQEWFHBsYW50YW8tdXRpY0BpdGVwLmJyMQ8wDQYDVQQHEwZSZWNp
+ZmUxEzARBgNVBAgTClBlcm5hbWJ1Y28xCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtp
+ZHAuaXRlcC5icjAeFw0xNTAxMzAxNDE2MjFaFw0xODAxMjkxNDE2MjFaMIGtMS4w
+LAYDVQQKEyVJbnN0aXR1dG8gZGUgVGVjbm9sb2dpYSBkZSBQZXJuYW1idWNvMQ0w
+CwYDVQQLEwRVVElDMSMwIQYJKoZIhvcNAQkBFhRwbGFudGFvLXV0aWNAaXRlcC5i
+cjEPMA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQG
+EwJCUjEUMBIGA1UEAxMLaWRwLml0ZXAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQD5QoDb/jNA1TiFRbbXcsZhhLj0XbKR2Z2u9PgA+ahtnvCDDvc+
+7oHCYs9t0P/UDIP7t8k1eLgKGb/1Zuw56HK1Ans3MWWr89XqxWo8LZVqlHcVTFL5
+eGtcH5Ew83jBGoaMPkKAPN68DvYVot8AiMrN7m4ZzTrKaW8F+gpyPqX9NdJ1NF3o
+6g6G2187weaHaEcRqBfJ0+9jK61RD+ufcQypZkOi120d/nHWG4gL/MWlYc2GsnHW
+XuAo6G55HNG7N/ihDyNwGGg2P81HLyQ352lom6fdtH9/wPjXHFvhDf9AiD6RK43D
+Q5HKK1jrmGpmgjCnnnU2i/VixR8gR9dutfWFAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAB9RY1YQJqlaJb3mpPdv0tSiG84jvKEcpKT/aNInCJ+E4w823GW5cNYhZDlk
+ZkTeHadbJSLuJrP3T7EGB7Xyvc5h/qMmLhCG3HxGnCgD6qC1xl2EdeMeOGFJy2na
+7HgEF/Z8VVN5q7Bv/dLrtT0R8ASf8pidmTunbJY4wQxdKOJR8tMS7u0kjbjv0rcM
+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>
+      
+MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xLjAsBgNVBAoTJUluc3RpdHV0
+byBkZSBUZWNub2xvZ2lhIGRlIFBlcm5hbWJ1Y28xDTALBgNVBAsTBFVUSUMxIzAh
+BgkqhkiG9w0BCQEWFHBsYW50YW8tdXRpY0BpdGVwLmJyMQ8wDQYDVQQHEwZSZWNp
+ZmUxEzARBgNVBAgTClBlcm5hbWJ1Y28xCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtp
+ZHAuaXRlcC5icjAeFw0xNTAxMzAxNDE2MjFaFw0xODAxMjkxNDE2MjFaMIGtMS4w
+LAYDVQQKEyVJbnN0aXR1dG8gZGUgVGVjbm9sb2dpYSBkZSBQZXJuYW1idWNvMQ0w
+CwYDVQQLEwRVVElDMSMwIQYJKoZIhvcNAQkBFhRwbGFudGFvLXV0aWNAaXRlcC5i
+cjEPMA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQG
+EwJCUjEUMBIGA1UEAxMLaWRwLml0ZXAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQD5QoDb/jNA1TiFRbbXcsZhhLj0XbKR2Z2u9PgA+ahtnvCDDvc+
+7oHCYs9t0P/UDIP7t8k1eLgKGb/1Zuw56HK1Ans3MWWr89XqxWo8LZVqlHcVTFL5
+eGtcH5Ew83jBGoaMPkKAPN68DvYVot8AiMrN7m4ZzTrKaW8F+gpyPqX9NdJ1NF3o
+6g6G2187weaHaEcRqBfJ0+9jK61RD+ufcQypZkOi120d/nHWG4gL/MWlYc2GsnHW
+XuAo6G55HNG7N/ihDyNwGGg2P81HLyQ352lom6fdtH9/wPjXHFvhDf9AiD6RK43D
+Q5HKK1jrmGpmgjCnnnU2i/VixR8gR9dutfWFAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAB9RY1YQJqlaJb3mpPdv0tSiG84jvKEcpKT/aNInCJ+E4w823GW5cNYhZDlk
+ZkTeHadbJSLuJrP3T7EGB7Xyvc5h/qMmLhCG3HxGnCgD6qC1xl2EdeMeOGFJy2na
+7HgEF/Z8VVN5q7Bv/dLrtT0R8ASf8pidmTunbJY4wQxdKOJR8tMS7u0kjbjv0rcM
+g15xNx4qO4znwZXq6b/YtHgXSPXH0YXDbDL1V6hzH02OhwnVQvTuqs1U/isTt7un
+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>
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
new file mode 100644
index 00000000..094f7d42
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml
@@ -0,0 +1,144 @@
+<?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>
+      <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: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
+BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
+MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
+KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MTAxMzA5NDQyMVoXDTE5
+MDcwOTIzNTkwMFowga4xCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
+V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
+emVudHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGlj
+aC5kZTEmMCQGCSqGSIb3DQEJARYXd2VibWFzdGVyQGZ6LWp1ZWxpY2guZGUwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5t9fIu0COttZeG5Xo6y/zqMfv
+vIwH5FNJaX0kelKKx49rxcxUxbt2gOEcrAemc+KMsTI4xmOSEzJIkInQUoXXkAkR
+qI7KaUZ/ZzZFLiIdVT7DdTx1cQkzj6Q/yDZA9vv/yHTocq66ujPJZngtemu7PWWo
+nqxd11bkMuCbFOsWUhZ8tTCwiDAOdpXCZH+mqLZCSNu2cr55zO+bHdHlQegOrPeF
+8/GDyMtPVk9ByPcW9msCAhiKsGGYU85Q650/IO6IIDZddCwr1zHNu+QeO/4U52Kg
+A2PWoxBsr2VTqfJPDQBupxm1nuxjL89UnRYqmI4WxcTCtP7abFlsGSEjMrkJAgMB
+AAGjggIvMIICKzBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEE
+AYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
+FgQUNlyp1PKKm1tbM/BJ6zblU9W9IocwHwYDVR0jBBgwFoAUIL1xiaXJKjMvEeAf
+5ZQmVg8RAiUwIAYDVR0RBBkwF4IVaWRwLml0cy5mei1qdWVsaWNoLmRlMHsGA1Ud
+HwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9j
+cmwvZ19jYWNybC5jcmwwN6A1oDOGMWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnpq
+LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgcsGCCsGAQUFBwEBBIG+MIG7MDMGCCsG
+AQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1Aw
+QQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9j
+YWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL2Z6ai1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
+AQsFAAOCAQEAjQatrjj9D0sreu0Dj3GsN3NLBiBxwTxyRAApzAiZuGu1960JhtvL
+DsnGukFCe++xd6qco82ZIrwCWrbjK2SQoAexiQqH4TXWqQaPcIr8zDwj0WKv63mN
+LhzmBIePWsND5pIb6qS3a4RvRK9u9BViQllWSQYUlkBNoA8HtulmqNkgVCgt7De9
+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
+BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
+MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
+KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MTAxMzA5NDQyMVoXDTE5
+MDcwOTIzNTkwMFowga4xCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
+V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
+emVudHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGlj
+aC5kZTEmMCQGCSqGSIb3DQEJARYXd2VibWFzdGVyQGZ6LWp1ZWxpY2guZGUwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5t9fIu0COttZeG5Xo6y/zqMfv
+vIwH5FNJaX0kelKKx49rxcxUxbt2gOEcrAemc+KMsTI4xmOSEzJIkInQUoXXkAkR
+qI7KaUZ/ZzZFLiIdVT7DdTx1cQkzj6Q/yDZA9vv/yHTocq66ujPJZngtemu7PWWo
+nqxd11bkMuCbFOsWUhZ8tTCwiDAOdpXCZH+mqLZCSNu2cr55zO+bHdHlQegOrPeF
+8/GDyMtPVk9ByPcW9msCAhiKsGGYU85Q650/IO6IIDZddCwr1zHNu+QeO/4U52Kg
+A2PWoxBsr2VTqfJPDQBupxm1nuxjL89UnRYqmI4WxcTCtP7abFlsGSEjMrkJAgMB
+AAGjggIvMIICKzBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEE
+AYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
+FgQUNlyp1PKKm1tbM/BJ6zblU9W9IocwHwYDVR0jBBgwFoAUIL1xiaXJKjMvEeAf
+5ZQmVg8RAiUwIAYDVR0RBBkwF4IVaWRwLml0cy5mei1qdWVsaWNoLmRlMHsGA1Ud
+HwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9j
+cmwvZ19jYWNybC5jcmwwN6A1oDOGMWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnpq
+LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgcsGCCsGAQUFBwEBBIG+MIG7MDMGCCsG
+AQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1Aw
+QQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9j
+YWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL2Z6ai1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
+AQsFAAOCAQEAjQatrjj9D0sreu0Dj3GsN3NLBiBxwTxyRAApzAiZuGu1960JhtvL
+DsnGukFCe++xd6qco82ZIrwCWrbjK2SQoAexiQqH4TXWqQaPcIr8zDwj0WKv63mN
+LhzmBIePWsND5pIb6qS3a4RvRK9u9BViQllWSQYUlkBNoA8HtulmqNkgVCgt7De9
+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>
diff --git a/swamid-interfederations-2.0/idp.itsligo.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.itsligo.ie-idp-shibboleth.xml
new file mode 100644
index 00000000..cc20a7bd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.itsligo.ie-idp-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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">
+    <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>
+MIIDJDCCAgygAwIBAgIVAM0cwxuTuo+doAYLQTZ+F9Kh2xiQMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5pdHNsaWdvLmllMB4XDTExMDcyNjA3NTc0NVoX
+DTMxMDcyNjA3NTc0NVowGTEXMBUGA1UEAxMOaWRwLml0c2xpZ28uaWUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQz7PoJrvZxLSnvg6ZaRmqMStCmR5w
+6i3JklsDuILt/HaYtlKpbZtjb5j86rgDcyp2CK6YNm3k7xn/9nfScn/LnGKSW87r
+lwiSXePGAJ2OgCbVks+bQQIO4ALm3EKNao07x5EsyFrlbSzyw6/l0d3Vmd6HtRRQ
+F9+nA9uqvOSofbhYexl7KB2Ahebmp+d6SxuEU7gUkZScJ7Re9jd1z2cWBuSwRvkT
+WUcCa8i7YfiDvTq7BvVE+rHSkQAC2tUpH5kGHFr25P8J6f6Mr+flO44eNgo+pbJ8
+3KGETRjM/Fug7wAkDWu5JP+pJk7LOHVuuxg0NW/7jny6H6Bzkmc2ypMlAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5pdHNsaWdvLmllhiVodHRwczovL2lkcC5pdHNs
+aWdvLmllL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSqqAIq1XMY1iF8IG8Nrqws
+BTWwrDANBgkqhkiG9w0BAQUFAAOCAQEAgu0p4z0DPoFXijkpdX0OqB7CVQMqjIqY
+CTlQqZ56bKGKdQP7NpUHD5tiRHh4pB1LNLSh2xqKOgudqFo2lAHGQKf8nMtCi++K
+jy7Q+vVmTnTXvQrYm32l9Rz94LI87vJTUATa8/4sCpUCw2xxT3EfhQpdssprrygj
+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: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: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
new file mode 100644
index 00000000..acd88ea8
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ittralee.ie-idp.xml
@@ -0,0 +1,91 @@
+<?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">
+    <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>
+MIIHHjCCBgagAwIBAgIRAICl/N1E7wMHQx0BHxXzfIcwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMjA2MTUwMDAwMDBaFw0xNTA2MTUyMzU5NTlaMGwxCzAJBgNV
+BAYTAklFMScwJQYDVQQKEx5JbnN0aXR1dGUgb2YgVGVjaG5vbG9neSBUcmFsZWUx
+GjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMRgwFgYDVQQDEw9pZHAuaXR0cmFs
+ZWUuaWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxKUs5pMtPd67K
+ZMFt/99ej/P5VoPJbUbOXFiszLIPkrFQ85+D+mVHmw/jwjSsAcfVNRySyoV3j73n
+mNAS6LsQz/sWiphhe2xIgf5dlqS9zzUKmM4ClCZFq43cszbVx+1Jskqa5jGktNR7
+ZwETDmxOkb2LgbxVLANTwxQS0LrkhH0kzHRSho3zw/OeVJ2aBWWfSmQ/8J4s8oDn
+isSkYDo2J0jCOfxL6bKjA/tAwMIE4KELWfTMojeu5apwwdQ7is2sxj5HD4krrlzX
+n06EtBBural5RW8KJKuy/ck4vp4YEh3V79T5wpmcE/y2Lnux6bdBl8bZwhZOPhTe
+naEC7crfAgMBAAGjggPvMIID6zAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQUekxTs3jqasbfKOoDk/nBK6pIDCswDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0
+cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUH
+AQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RF
+UkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVu
+YS5vcmcwggKlBgNVHREEggKcMIICmIIPaWRwLml0dHJhbGVlLmllghNlZHVnYXRl
+Lml0dHJhbGVlLmllghllZHVnYXRlLnN0YWZmLml0dHJhbGVlLmllghxlZHVnYXRl
+LnN0dWRlbnRzLml0dHJhbGVlLmllghhlZHVnYXRlLnRlY2guaXR0cmFsZWUuaWWC
+E2VkdXJvYW0uaXR0cmFsZWUuaWWCGWVkdXJvYW0uc3RhZmYuaXR0cmFsZWUuaWWC
+HGVkdXJvYW0uc3R1ZGVudHMuaXR0cmFsZWUuaWWCGGVkdXJvYW0udGVjaC5pdHRy
+YWxlZS5pZYIVaWRwLnN0YWZmLml0dHJhbGVlLmllghhpZHAuc3R1ZGVudHMuaXR0
+cmFsZWUuaWWCFGlkcC50ZWNoLml0dHJhbGVlLmllghlpdHQtZWR1Z2F0ZS0xLml0
+dHJhbGVlLmllgh9pdHQtZWR1Z2F0ZS0xLnN0YWZmLml0dHJhbGVlLmllgiJpdHQt
+ZWR1Z2F0ZS0xLnN0dWRlbnRzLml0dHJhbGVlLmllgh5pdHQtZWR1Z2F0ZS0xLnRl
+Y2guaXR0cmFsZWUuaWWCGWl0dC1lZHVyb2FtLTEuaXR0cmFsZWUuaWWCH2l0dC1l
+ZHVyb2FtLTEuc3RhZmYuaXR0cmFsZWUuaWWCIml0dC1lZHVyb2FtLTEuc3R1ZGVu
+dHMuaXR0cmFsZWUuaWWCHml0dC1lZHVyb2FtLTEudGVjaC5pdHRyYWxlZS5pZYIV
+aXR0LWlkcC0xLml0dHJhbGVlLmllghtpdHQtaWRwLTEuc3RhZmYuaXR0cmFsZWUu
+aWWCHml0dC1pZHAtMS5zdHVkZW50cy5pdHRyYWxlZS5pZYIaaXR0LWlkcC0xLnRl
+Y2guaXR0cmFsZWUuaWUwDQYJKoZIhvcNAQEFBQADggEBAHjXLPk9KPTqPI80e5zR
+qz4gwcjPCrQqryNpQGmytbbfCL4QW7c0PTy/c43ju3gq4MbAttEf1ge77Nl3Yfrq
+CsjKmNYc964eEEYYO7iYix7JyAQLmeu5bkoRFFFUQKnkzl7c3tIf3fDS6d7Sx6D7
+C12B9qDv2qG/nShGhJ2VvpOy+4xynYIjDiwDzpwPbzkXMxrLi0ijaxh6HHcKzhq4
+ZVgVNZ07Tys+K3tmsfmfooBSu5eK68j203D3QHTHI9qbuaYq5E/yWp5+a1NcVRNF
+l8LhNdF4JciKYZNIq8wIAaLgToUhXbzAbMKZhq+FXAxncLCA3bbd+7LrMQW5lAmF
+TVY=
+</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.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: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
new file mode 100644
index 00000000..b423cad5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.iuav.it-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDGDCCAgCgAwIBAgIVAOjXzyapswcd6xsf69yjpd4te2HWMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5pdWF2Lml0MB4XDTA5MTEzMDAwMTg0OVoXDTI5
+MTEzMDAwMTg0OVowFjEUMBIGA1UEAxMLaWRwLml1YXYuaXQwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCYSifc+LKcPDkWNaSMzsNea55hJnc78G3p0p4I
+iaN79ZcmSMbYDigT7uCN0jqJQhhPu42Bs3zJnwVJhVR8Ag0qIojNMHfsD9p5kZzp
+j2TZ+bcREYQGIsqXy8XfP5UVrw8sV1KN+Xc+2iwNZ3fC7N1JMpDwUTphhHGw1mF3
+k18DjNlO18AiXMvog0FbrvfsqYw9D5vsMfyVnQDw+OX9tMoOLZExZTbEt+bGzjv6
+gStOQADpRKlELSMRWsu09aup+YPDrYTvmIY2LaVtbQidi7fA/tJwr94EKrsdDp+7
+OjsPK45SBRjGdwhdEnnR3pSN3k8jX+7UngY7BPtzEmEblInzAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5pdWF2Lml0hiJodHRwczovL2lkcC5pdWF2Lml0L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQYUwByp5fGRll5VxLUjI76AmM8sjANBgkqhkiG
+9w0BAQUFAAOCAQEAW71PMrdGAbPyJowc6isgMKRAaOesZAn0PiZBG4zB1xZzeJ9S
+WqtCGAunE7Eas7YLFIiAHg+ddonZQUyJHUQPKB9ml7XfAgLUVeT+gPJs2TuL00aj
+cLzbQ/PAYKLAUbZBmDuaSsuV/CyTivBakD6I2p6MxN84GLEmBf/27LYDGbtTOS+i
+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>
+MIIDGDCCAgCgAwIBAgIVAOjXzyapswcd6xsf69yjpd4te2HWMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5pdWF2Lml0MB4XDTA5MTEzMDAwMTg0OVoXDTI5
+MTEzMDAwMTg0OVowFjEUMBIGA1UEAxMLaWRwLml1YXYuaXQwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCYSifc+LKcPDkWNaSMzsNea55hJnc78G3p0p4I
+iaN79ZcmSMbYDigT7uCN0jqJQhhPu42Bs3zJnwVJhVR8Ag0qIojNMHfsD9p5kZzp
+j2TZ+bcREYQGIsqXy8XfP5UVrw8sV1KN+Xc+2iwNZ3fC7N1JMpDwUTphhHGw1mF3
+k18DjNlO18AiXMvog0FbrvfsqYw9D5vsMfyVnQDw+OX9tMoOLZExZTbEt+bGzjv6
+gStOQADpRKlELSMRWsu09aup+YPDrYTvmIY2LaVtbQidi7fA/tJwr94EKrsdDp+7
+OjsPK45SBRjGdwhdEnnR3pSN3k8jX+7UngY7BPtzEmEblInzAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5pdWF2Lml0hiJodHRwczovL2lkcC5pdWF2Lml0L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQYUwByp5fGRll5VxLUjI76AmM8sjANBgkqhkiG
+9w0BAQUFAAOCAQEAW71PMrdGAbPyJowc6isgMKRAaOesZAn0PiZBG4zB1xZzeJ9S
+WqtCGAunE7Eas7YLFIiAHg+ddonZQUyJHUQPKB9ml7XfAgLUVeT+gPJs2TuL00aj
+cLzbQ/PAYKLAUbZBmDuaSsuV/CyTivBakD6I2p6MxN84GLEmBf/27LYDGbtTOS+i
+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>
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
new file mode 100644
index 00000000..f4109471
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ivb.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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: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>
+      <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>
+MIIDJDCCAgygAwIBAgIVAKTPOMQGB+LGGdHAwNPUS60Nl+MzMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5pdmIuY2FzLmN6MB4XDTE1MDEyMzA5NTYwM1oX
+DTM1MDEyMzA5NTYwM1owGTEXMBUGA1UEAxMOaWRwLml2Yi5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCJqw1u6dlRca0eVr3o6b9l8WGpVcx
+znPTdRAcKS+YL2hj17JWaDz8NwVN0aI7ZCHZYzc4XfwyBJU+lT/eFO6IhE0wrE1l
+fQBfnzJYrGo/z+iOq3SPB2Ig8TEDhnSlRBslNAlbj/Xji9rs5V+6zxMvm5PoJT0F
+69vzskzhccTv7OeqgdMObe1DVizoOI5SxpVkkq/mZm9/u8CaXMy+1tlx9ppUS8X7
+cVkQ7fEUrFViGKTaBlbO09BDc+8mpLNHNrCdxhOtctnKtl/QCH/m+xLzLZjEbqWm
+1an2hObpKzNor/+ffAYs3vUncMBW8QRof2N6/xHXhCuMx7aXcc0ezbYDAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5pdmIuY2FzLmN6hiVodHRwczovL2lkcC5pdmIu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRUnpwHrzxgeEohuMfhmUzm
+T97NejANBgkqhkiG9w0BAQUFAAOCAQEAX/mQ4XvMGEvQqFK2WCp4JiKBXPy16HWK
+bAs6VYUf1oinqyHMUr4jGHL4yQYtchj/L8sNnyiCtRJ3SbgvXh6TX0tqf6hJt1KG
+gR/6F6bFn3CQTHilYwlNWUjsEv3/bQeDahskTpJSA8+gRMzEH5UTc/YWILAjpEj1
+Iu5IkEoYKM1JiY/NvfOue/bAdKSJlY8IoHxj0Vgf6dxptoayENBEMxriLYqTZC9z
+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>
+MIIDJDCCAgygAwIBAgIVAKTPOMQGB+LGGdHAwNPUS60Nl+MzMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5pdmIuY2FzLmN6MB4XDTE1MDEyMzA5NTYwM1oX
+DTM1MDEyMzA5NTYwM1owGTEXMBUGA1UEAxMOaWRwLml2Yi5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCJqw1u6dlRca0eVr3o6b9l8WGpVcx
+znPTdRAcKS+YL2hj17JWaDz8NwVN0aI7ZCHZYzc4XfwyBJU+lT/eFO6IhE0wrE1l
+fQBfnzJYrGo/z+iOq3SPB2Ig8TEDhnSlRBslNAlbj/Xji9rs5V+6zxMvm5PoJT0F
+69vzskzhccTv7OeqgdMObe1DVizoOI5SxpVkkq/mZm9/u8CaXMy+1tlx9ppUS8X7
+cVkQ7fEUrFViGKTaBlbO09BDc+8mpLNHNrCdxhOtctnKtl/QCH/m+xLzLZjEbqWm
+1an2hObpKzNor/+ffAYs3vUncMBW8QRof2N6/xHXhCuMx7aXcc0ezbYDAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5pdmIuY2FzLmN6hiVodHRwczovL2lkcC5pdmIu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRUnpwHrzxgeEohuMfhmUzm
+T97NejANBgkqhkiG9w0BAQUFAAOCAQEAX/mQ4XvMGEvQqFK2WCp4JiKBXPy16HWK
+bAs6VYUf1oinqyHMUr4jGHL4yQYtchj/L8sNnyiCtRJ3SbgvXh6TX0tqf6hJt1KG
+gR/6F6bFn3CQTHilYwlNWUjsEv3/bQeDahskTpJSA8+gRMzEH5UTc/YWILAjpEj1
+Iu5IkEoYKM1JiY/NvfOue/bAdKSJlY8IoHxj0Vgf6dxptoayENBEMxriLYqTZC9z
+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>
diff --git a/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml
new file mode 100644
index 00000000..52b6e8ca
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDEzCCAfugAwIBAgIUZ8t3b8eAjLbPx7nCcmtLRNfMP/wwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLml6cy5pdDAeFw0xNDAzMjQxMjI2NTBaFw0zNDAz
+MjQxMjI2NTBaMBUxEzARBgNVBAMTCmlkcC5penMuaXQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCEZQogi++nPZ4OO1lklIcyCvA0W9NCyKLvVybJh1XM
+RT7jCoYa/rcsTS0mXt8sQIhRgC/mYAjIUMAophRaxewLjXiUBzFEdgc2ssP/ooYm
+O90nK5u3huiOav0KjNyS2Noei06yO57Iqx3L7ZJfWj2ligNrdN2HvIv+zMLe6m+d
+5g0tNWeP1Fya2kC9rY4O2yOR826vkJ/B4CLg8nQcOIWFnYWxBfNGWalShUR0K5+o
+RS3FWEda1ngg5ZxuLRKHVbGPU3eF513ZLGBS77aw9/L2dkFuaa8P+s/OQgTGI2Lp
+1CDAysIcxAZldY61BTxUfChYA99zgeQltvLmQMVr4YoPAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5penMuaXSGIWh0dHBzOi8vaWRwLml6cy5pdC9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUgQniglbaB0PJ8a6mBBEG7QB+Z80wDQYJKoZIhvcNAQEF
+BQADggEBACey/uQv50Tla66zVhm4C9Rj6zVJp/QMMNwO0j7BeihE3h4YRVqBrL79
+VhChAhnV8CTuP2g4iSx8ssk/ypw9/vIt54hnEgk16/gc+Fe/5IUk8Sd0ACtrX83u
+wHBi/QTBY+ja7HHUqG1OOItHTOdSkaEA3wMrRICIAem+tc6riyqt7Rdq+TyPVukg
+55oCYkYmDX6wPU/0yWOuR6ZbDthggmsKATteRrT//mM5qLhW0Ddiv5wWqCIlt3Oo
+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>
+MIIDEzCCAfugAwIBAgIUZ8t3b8eAjLbPx7nCcmtLRNfMP/wwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLml6cy5pdDAeFw0xNDAzMjQxMjI2NTBaFw0zNDAz
+MjQxMjI2NTBaMBUxEzARBgNVBAMTCmlkcC5penMuaXQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCEZQogi++nPZ4OO1lklIcyCvA0W9NCyKLvVybJh1XM
+RT7jCoYa/rcsTS0mXt8sQIhRgC/mYAjIUMAophRaxewLjXiUBzFEdgc2ssP/ooYm
+O90nK5u3huiOav0KjNyS2Noei06yO57Iqx3L7ZJfWj2ligNrdN2HvIv+zMLe6m+d
+5g0tNWeP1Fya2kC9rY4O2yOR826vkJ/B4CLg8nQcOIWFnYWxBfNGWalShUR0K5+o
+RS3FWEda1ngg5ZxuLRKHVbGPU3eF513ZLGBS77aw9/L2dkFuaa8P+s/OQgTGI2Lp
+1CDAysIcxAZldY61BTxUfChYA99zgeQltvLmQMVr4YoPAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5penMuaXSGIWh0dHBzOi8vaWRwLml6cy5pdC9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUgQniglbaB0PJ8a6mBBEG7QB+Z80wDQYJKoZIhvcNAQEF
+BQADggEBACey/uQv50Tla66zVhm4C9Rj6zVJp/QMMNwO0j7BeihE3h4YRVqBrL79
+VhChAhnV8CTuP2g4iSx8ssk/ypw9/vIt54hnEgk16/gc+Fe/5IUk8Sd0ACtrX83u
+wHBi/QTBY+ja7HHUqG1OOItHTOdSkaEA3wMrRICIAem+tc6riyqt7Rdq+TyPVukg
+55oCYkYmDX6wPU/0yWOuR6ZbDthggmsKATteRrT//mM5qLhW0Ddiv5wWqCIlt3Oo
+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>
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
new file mode 100644
index 00000000..698e3e01
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.jisc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-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-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>
+      <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
+						MzQwMzA4MTAzMzE0WjBZMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHQnJpc3RvbDEQ
+						MA4GA1UEBxMHQnJpc3RvbDENMAsGA1UEChMESklTQzEXMBUGA1UEAxMOaWRwLmpp
+						c2MuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCds/3E0LCX
+						CKEsKlPjxzFBrktliW7ldFZupqcIdVyXhPYP7u9dKcf5bU3h/1R2Q0AUP1EqCuX/
+						Py8lpJKAO59+YQgM70FWUS0oVr9QxvJiSn5fmCa7vhAIDQtwMekl3523ByfRgynN
+						QRS01OjHPE0oaJAb1dDgt1KK5WCHnW7udrWbdOyRWuvvgDgyqecK253BG8kungcz
+						JvJ+zhI57sEM2+DTCuuzKgVnzqn7WvezswOmWAJvxGXW8iEkJYydrxItCF1aYrU2
+						MgRQZHeyUogJaiLU7PZ0Rq9Pw1McPaZZ4qoo4j09w3AIu9+tUwdhpBmpE9PrVgwo
+						UprGqV4ITCUtAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAA12gtk7woOH+ILs1Ynf
+						L4BBT/skUhrKn8XHEynizu4qlcbHVIS5vH7zHp/Fmj2v9Yy9PKrynFCXQvVi0HsH
+						ySBQuNMT40gOFlkQp/CH1fiTZGykl3BsaQEsS5JLmIOfg/LO6rtnEqeHXtBOuDb+
+						aXdMpXwcO7nsHvTE1HWtrIxfBOKpKVa0O7A07iTs+OYaFBCxo3btFpZ/QoZgnyx3
+						Duqj4fvKfPlVB+aysYQV9dQFwaOofRgxAtiivGncenCqmNaF44KacrINzfWY22om
+						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>
+						MIIDLjCCAhYCCQCv1Jl+hrmSWjANBgkqhkiG9w0BAQUFADBZMQswCQYDVQQGEwJH
+						QjEQMA4GA1UECBMHQnJpc3RvbDEQMA4GA1UEBxMHQnJpc3RvbDENMAsGA1UEChME
+						SklTQzEXMBUGA1UEAxMOaWRwLmppc2MuYWMudWswHhcNMTQwMzEzMTAzMzE0WhcN
+						MzQwMzA4MTAzMzE0WjBZMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHQnJpc3RvbDEQ
+						MA4GA1UEBxMHQnJpc3RvbDENMAsGA1UEChMESklTQzEXMBUGA1UEAxMOaWRwLmpp
+						c2MuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCds/3E0LCX
+						CKEsKlPjxzFBrktliW7ldFZupqcIdVyXhPYP7u9dKcf5bU3h/1R2Q0AUP1EqCuX/
+						Py8lpJKAO59+YQgM70FWUS0oVr9QxvJiSn5fmCa7vhAIDQtwMekl3523ByfRgynN
+						QRS01OjHPE0oaJAb1dDgt1KK5WCHnW7udrWbdOyRWuvvgDgyqecK253BG8kungcz
+						JvJ+zhI57sEM2+DTCuuzKgVnzqn7WvezswOmWAJvxGXW8iEkJYydrxItCF1aYrU2
+						MgRQZHeyUogJaiLU7PZ0Rq9Pw1McPaZZ4qoo4j09w3AIu9+tUwdhpBmpE9PrVgwo
+						UprGqV4ITCUtAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAA12gtk7woOH+ILs1Ynf
+						L4BBT/skUhrKn8XHEynizu4qlcbHVIS5vH7zHp/Fmj2v9Yy9PKrynFCXQvVi0HsH
+						ySBQuNMT40gOFlkQp/CH1fiTZGykl3BsaQEsS5JLmIOfg/LO6rtnEqeHXtBOuDb+
+						aXdMpXwcO7nsHvTE1HWtrIxfBOKpKVa0O7A07iTs+OYaFBCxo3btFpZ/QoZgnyx3
+						Duqj4fvKfPlVB+aysYQV9dQFwaOofRgxAtiivGncenCqmNaF44KacrINzfWY22om
+						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>
diff --git a/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml
new file mode 100644
index 00000000..65336274
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml
@@ -0,0 +1,119 @@
+<?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:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <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 National Library of Sweden.</mdui:Description>
+        <mdui:Logo height="100" width="86">https://idp.kb.se/idp/images/kb-logo.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">Kungliga+biblioteket national+library+of+sweden </mdui:Keywords>
+        <mdui:Keywords xml:lang="en">Kungliga+biblioteket national+library+of+sweden </mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>kb.se</mdui:DomainHint>
+        <mdui:IPHint>193.10.249.131/32</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.33822,18.0722617</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIVANtF15ZO6H7sUe14fLarTWN68i+6MA0GCSqGSIb3DQEB
+BQUAMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTAeFw0xMjA1MTUwODE2MTZaFw0xMzA1
+MTUwODE2MTZaMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAI5hTWyo9FvDJLFCHChRYSL1wZ7AsiL+RkBl+ath46EZ
+X4tcmMLg9T5qkveFqR5HQF8BK2+i3XcBmnXYqqCyYCUXc7oiKm83xrssgcP4xlAd
+L2H6rNBOaIG5sUqaU1nNb9BmL0Z8fJaamyX9+rqQSGj5JCGdwwR2CMi14bbJvz2W
+fQsGI8HHqTrAp/1RwG3dHsDXjQUHlaOAF3WWX+P/fYJepJPtHPVaurSllD00GQXf
+fswG4IBz+sdv/rId6ydAHMWc8M+oBVkVLzeOjcNOxrm6xpMjXhlsgJkQVcEVgP99
+MLY4FZ0RNVfzrSNB7WUbOnANFOyYEFdaZOAP6Ff6NS8CAwEAAaNZMFcwNgYDVR0R
+BC8wLYIJaWRwLmtiLnNlhiBodHRwczovL2lkcC5rYi5zZS9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUXOR57Uvaf5MNiogvbh+Pr2X35FUwDQYJKoZIhvcNAQEFBQAD
+ggEBABf3IMAt91LKUJoNU2VoSaHa+JYfjUkJp29lO1+GacoPrsbMkt4f09ALaqUB
+D3uTAP8IYWyxboESqHNXmk+rFKIYS4j1n6nx+Nomqs4bcY5qUcXOjTEUSKj67D3A
+eqmzb8ICVXHuejQqf1qA0nxSmDqO4ci13W7pF8Sy15J6WY+gi/qvwQLuCE7zD3qM
+FgBz0aBdSFpgIPo6Y7PLEyfutclknp+AE4S/Mzkxyrl72hoyWoct6fPuRVfROFxN
+eXhXEiHIleIlDkOMy3mgyjg2l2azS/K4Um12iEbCxONc8UvQipy2nzJ6XT8qp483
+HoPbenzIMS3KvKqUl64+5qwAZhM=
+
+                    </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:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.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.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 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kb.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIVANtF15ZO6H7sUe14fLarTWN68i+6MA0GCSqGSIb3DQEB
+BQUAMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTAeFw0xMjA1MTUwODE2MTZaFw0xMzA1
+MTUwODE2MTZaMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAI5hTWyo9FvDJLFCHChRYSL1wZ7AsiL+RkBl+ath46EZ
+X4tcmMLg9T5qkveFqR5HQF8BK2+i3XcBmnXYqqCyYCUXc7oiKm83xrssgcP4xlAd
+L2H6rNBOaIG5sUqaU1nNb9BmL0Z8fJaamyX9+rqQSGj5JCGdwwR2CMi14bbJvz2W
+fQsGI8HHqTrAp/1RwG3dHsDXjQUHlaOAF3WWX+P/fYJepJPtHPVaurSllD00GQXf
+fswG4IBz+sdv/rId6ydAHMWc8M+oBVkVLzeOjcNOxrm6xpMjXhlsgJkQVcEVgP99
+MLY4FZ0RNVfzrSNB7WUbOnANFOyYEFdaZOAP6Ff6NS8CAwEAAaNZMFcwNgYDVR0R
+BC8wLYIJaWRwLmtiLnNlhiBodHRwczovL2lkcC5rYi5zZS9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUXOR57Uvaf5MNiogvbh+Pr2X35FUwDQYJKoZIhvcNAQEFBQAD
+ggEBABf3IMAt91LKUJoNU2VoSaHa+JYfjUkJp29lO1+GacoPrsbMkt4f09ALaqUB
+D3uTAP8IYWyxboESqHNXmk+rFKIYS4j1n6nx+Nomqs4bcY5qUcXOjTEUSKj67D3A
+eqmzb8ICVXHuejQqf1qA0nxSmDqO4ci13W7pF8Sy15J6WY+gi/qvwQLuCE7zD3qM
+FgBz0aBdSFpgIPo6Y7PLEyfutclknp+AE4S/Mzkxyrl72hoyWoct6fPuRVfROFxN
+eXhXEiHIleIlDkOMy3mgyjg2l2azS/K4Um12iEbCxONc8UvQipy2nzJ6XT8qp483
+HoPbenzIMS3KvKqUl64+5qwAZhM=
+
+                    </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:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.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">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://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>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>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>swamid@kb.se</md:EmailAddress>
+  </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
new file mode 100644
index 00000000..b4bccaf5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.kdg.be-idp-shibboleth.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-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>
+      <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,
+R0lGODdhSwBLAOYAAAAAAAAAdgAAfAEAiQMAhgoChwsFiQ4IiQwMghMPhxISihQUghkXhxsahh0ciCAfhyIiiSUlhicohioqhi0tiS4ueTExiTIyejIyhzQ0kTk5izo8eD09kUNDkkxMllVVm1tbnV5eoVxhcWJinmVlo2trnGxspm9vq2xxbXNzqXR0pnt7rH19sXh/X3h/ZHmBXIWFrIWFs4OLVYyMuI6OtJKSspSUu42WWJiYtZqavJ2dwpukSKSkxZylR56oQaCpQaqqybOzzrOz0ay3OrC7ML291bXBNsLC1rfDPrjEPsTE2rrGK7vHN77KH77KJr7KKcrK3s3N4cLPHtLS3cbTGtPT5MjVE8nXD9nZ583bANzc6tHfAOPj7ebm8evr9PHx9vb2+v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkKAGIAIf8LSUNDUkdCRzEwMTL/AAAMSExpbm8CEAAAbW50clJHQiBYWVogB84AAgAJAAYAMQAAYWNzcE1TRlQAAAAASUVDIHNSR0IAAAAAAAAAAAAAAAAAAPbWAAEAAAAA0y1IUCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARY3BydAAAAVAAAAAzZGVzYwAAAYQAAABsd3RwdAAAAfAAAAAUYmtwdAAAAgQAAAAUclhZWgAAAhgAAAAUZ1hZWgAAAiwAAAAUYlhZWgAAAkAAAAAUZG1uZAAAAlQAAABwZG1kZAAAAsQAAACIdnVlZAAAA0wAAACGdmll/3cAAAPUAAAAJGx1bWkAAAP4AAAAFG1lYXMAAAQMAAAAJHRlY2gAAAQwAAAADHJUUkMAAAQ8AAAIDGdUUkMAAAQ8AAAIDGJUUkMAAAQ8AAAIDHRleHQAAAAAQ29weXJpZ2h0IChjKSAxOTk4IEhld2xldHQtUGFja2FyZCBDb21wYW55AABkZXNjAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA81EAAf8AAAABFsxYWVogAAAAAAAAAAAAAAAAAAAAAFhZWiAAAAAAAABvogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAAGNpYWVogAAAAAAAAJKAAAA+EAAC2z2Rlc2MAAAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAAAAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkZXNjAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFjZSAtIHNSR0L/AAAAAAAAAAAAAAAuSUVDIDYxOTY2LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRlc2MAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAACxSZWZlcmVuY2UgVmlld2luZyBDb25kaXRpb24gaW4gSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB2aWV3AAAAAAATpP4AFF8uABDPFAAD7cwABBMLAANcngAAAAFYWVog/wAAAAAATAlWAFAAAABXH+dtZWFzAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAACjwAAAAJzaWcgAAAAAENSVCBjdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAv8UAh0CJgIvAjgCQQJLAlQCXQJnAnECegKEAo4CmAKiAqwCtgLBAssC1QLgAusC9QMAAwsDFgMhAy0DOANDA08DWgNmA3IDfgOKA5YDogOuA7oDxwPTA+AD7AP5BAYEEwQgBC0EOwRIBFUEYwRxBH4EjASaBKgEtgTEBNME4QTwBP4FDQUcBSsFOgVJBVgFZwV3BYYFlgWmBbUFxQXVBeUF9gYGBhYGJwY3BkgGWQZqBnsGjAadBq8GwAbRBuMG9QcHBxkHKwc9B08HYQd0B4YHmQesB78H0gflB/gICwgfCDIIRghaCG4IggiWCKoIvgjSCOcI+wkQCSUJOglPCWT/CXkJjwmkCboJzwnlCfsKEQonCj0KVApqCoEKmAquCsUK3ArzCwsLIgs5C1ELaQuAC5gLsAvIC+EL+QwSDCoMQwxcDHUMjgynDMAM2QzzDQ0NJg1ADVoNdA2ODakNww3eDfgOEw4uDkkOZA5/DpsOtg7SDu4PCQ8lD0EPXg96D5YPsw/PD+wQCRAmEEMQYRB+EJsQuRDXEPURExExEU8RbRGMEaoRyRHoEgcSJhJFEmQShBKjEsMS4xMDEyMTQxNjE4MTpBPFE+UUBhQnFEkUahSLFK0UzhTwFRIVNBVWFXgVmxW9FeAWAxYmFkkWbBaPFrIW1hb6Fx0XQRdlF4kX/64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4f8uFi5MLoIuty7uLyQvWi+RL8cv/jA1MGwwpDDbMRIxSjGCMbox8jIqMmMymzLUMw0zRjN/M7gz8TQrNGU0njTYNRM1TTWHNcI1/TY3NnI2rjbpNyQ3YDecN9c4FDhQOIw4yDkFOUI5fzm8Ofk6Njp0OrI67zstO2s7qjvoPCc8ZTykPOM9Ij1hPaE94D4gPmA+oD7gPyE/YT+iP+JAI0BkQKZA50EpQWpBrEHuQjBCckK1QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXeRiJGZ0arRvBHNUd7R8BIBUhLSJFI10kdSWNJqUnwSjdKfUrESwxLU0uaS+JMKkxyTLpNAk3/Sk2TTdxOJU5uTrdPAE9JT5NP3VAnUHFQu1EGUVBRm1HmUjFSfFLHUxNTX1OqU/ZUQlSPVNtVKFV1VcJWD1ZcVqlW91dEV5JX4FgvWH1Yy1kaWWlZuFoHWlZaplr1W0VblVvlXDVchlzWXSddeF3JXhpebF69Xw9fYV+zYAVgV2CqYPxhT2GiYfViSWKcYvBjQ2OXY+tkQGSUZOllPWWSZedmPWaSZuhnPWeTZ+loP2iWaOxpQ2maafFqSGqfavdrT2una/9sV2yvbQhtYG25bhJua27Ebx5veG/RcCtwhnDgcTpxlXHwcktypnMBc11zuHQUdHB0zHUodYV14XY+/3abdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqv8cqo+rAqt1q+msXKzQrUStuK4trqGvFq+LsACwdbDqsWCx1rJLssKzOLOutCW0nLUTtYq2AbZ5tvC3aLfguFm40blKucK6O7q1uy67p7whvJu9Fb2Pvgq+hL7/v3q/9cBwwOzBZ8Hjwl/C28NYw9TEUcTOxUvFyMZGxsPHQce/yD3IvMk6ybnKOMq3yzbLtsw1zLXNNc21zjbOts83z7jQOdC60TzRvtI/0sHTRNPG1EnUy9VO1dHWVdbY11zX4Nhk2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i3ynfr+A24L3hROHM4lPi2+Nj4+vkc+T85YTmDeaW5x/nqegy6LxU6Ubp0Opb6uXrcOv77IbtEe2c7ijutO9A78zwWPDl8XLx//KM8xnzp/Q09ML1UPXe9m32+/eK+Bn4qPk4+cf6V/rn+3f8B/yY/Sn9uv5L/tz/bf//ACwAAAAASwBLAAAH/4ARgoOEhYaHiImKi4yNjo+QkZKTlJWWl5iZmpuchROfnaGNBgMDoqeIDSIuKKiuhAU9WUYNr64SBDtZSbW2p7iySL2+ocC7w8ScxrzJxQSyzM3Kz8eNoL4UFhSDExbehsvIiQQE4qcCAQKCEwvo6oXhjBYgIRzmnRQrOCoNEwgdNGrUsIAsXqIJBEh4CTNDgIVTExpk4BKmigKESsKEUSLO4KFuCcGEseEQokQtYaJAEABEIxQCCyYQ8khIJjkBJL6MLCkqYgaUUQTQ0KiFwoJtM6lFq0kAAYkTFD7oJPmw58mNK0Ry+SAAaVJo4hCCwCLyS5GpPEP5RMlloRcVaf+/VuPWwALKMFq6aNxZVe3VvTwCaEBEk4KAGBqLDMhQRSNVkz/DiMTLAYFXuUsjWBBQRCMJAYcdx+W0NmXnMC8jyISnFJmFAFM0liAwIcTCx1YjQxmARWMQAasxu+ascQTorHwhAyUAYmGYHF1ZgyVkeIZGIAIIHBHdt1NplYdFgkkRfRBNdh2cK4GyF7dfxhsVYBDAg2iHmOZbexKwwnnF26PhA4IJHwxCAQkkmGCPcIZMIIAHMcyQAgQDdnBPJwRkR0iGAnSkX4MIgNZhhhd6d806J+Y33UcUUPBJiplIIOOMNEZAowSC3CjBJ7FUM4GOM9qII5A1QuLAkUgmqeT/kkpCMIAuSRzA5JRUIgnJBlhmqeWWXHJZwQ+7XNDlmGRm6QgEFwzhxBJstunmm3C+KYUVVMRp551sOjHEBRAwgmYTW2Qh6KCEFmpooVdQYcWhjDYq6BZN8GnNCzJUaumlmGaaKRFZPKHpp6Ba+kJwjJBj6qmopqrqk1kgMYCqsMZqKiQv1mrrrbh+kgA0quXqq6/S2NhjZsEeNEGLyJKa44fFJrINhyISAA6zzTaYHQkxABGEDix4MO2K1e43AhST7RVFLcHRFG4EhpngnBdFBFGEF0pIy+C660QwQGNhFNGBqR14K91c+G6GWEUZIgDttwSv62B9YdAggAYfgADC0AggXGYjteEiJEQYXoQgwE9geOFFFx/QpmLDHRPwccgja/GFTmGAoPKy4DrMkkY5CJbBACxIZnO6HFdrsEZYDCDAfCkIffPGOXccgQO9oRYCAQEEDcbQKxMbrmEkUBTGF1y0pdHVREe9rmEfFCG2Rl5E4QF+OLOMr1ECcLBCDTTAAMIAHqqNbzcNiAjaIeriy4033mhct9eKO5J45I1MTvkill+eSOaaI55LqyV2/u0WTIQueiEMtODDDQ+c/kgCpbhOq7Ky12777bjnrnvngQAAOw==
+</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>
+
+MIIDFDCCAfygAwIBAgIVAPGgGOPxkWRQN27VjuZmpvCjmnizMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMMCmlkcC5rZGcuYmUwHhcNMTQwODI1MDkwMzMxWhcNMzQw
+ODI1MDkwMzMxWjAVMRMwEQYDVQQDDAppZHAua2RnLmJlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAlmhFinjjac992YuR8BS07MxfWNReYJe+lmhRozRo
+mtptX2VcrTUHKEMhQES1XRsT8EBA/Ib0NkkD8Liw1MvmbZ8GXhBnZ/2wV/KBv8yN
+6YmMb5+1Ss+WwrKQcgarF5RjS7fD7TxjQcxvDrBo43z93aZeImqB/ZRjDb/JZ30y
+DliyUAjEpVt+9BIwTLPmvJkL4kVUBMcqCSO3dFns4Blov7Dm8nURo5C/F3g3CSmw
+6hOi2KdW3EamPcV9ZJ0D5BMBM40Bo3Ko2HGOcxvhKZap6MSIP4lKlWE8RNGXehGY
+P1SOTUQIBekv7rbjRAftcQcSFIeJVX5UUDfHAzDEly5iEQIDAQABo1swWTAdBgNV
+HQ4EFgQUpZDuzFNVGzknO9+UHMTlPr9V/I0wOAYDVR0RBDEwL4IKaWRwLmtkZy5i
+ZYYhaHR0cHM6Ly9pZHAua2RnLmJlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+BQUAA4IBAQBHT0WU2xpqxQlrM5pzEA+6ddq+7M/84eGyzj3L7WRs/RNmtwrxKlv2
+afRgZsMTMBA60AUQz5sBwK5GkIvg+ZYwBl8mGTQYY6/Um3EUqB3SzsHFgIE85NHG
+lR4h7WT9Yb2qPgUWCBkz/UfrphGhje7NUzrCJGJoKPsm6uSNyl804Q1KrWwV1WFM
+eEswby9HNRf2RuAKiVAtSDP1MvLO6wEMTQAgwyBjSb9C8iYdUHUk7ARNz9vBIx55
+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>
+
+MIIDFDCCAfygAwIBAgIVAPGgGOPxkWRQN27VjuZmpvCjmnizMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMMCmlkcC5rZGcuYmUwHhcNMTQwODI1MDkwMzMxWhcNMzQw
+ODI1MDkwMzMxWjAVMRMwEQYDVQQDDAppZHAua2RnLmJlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAlmhFinjjac992YuR8BS07MxfWNReYJe+lmhRozRo
+mtptX2VcrTUHKEMhQES1XRsT8EBA/Ib0NkkD8Liw1MvmbZ8GXhBnZ/2wV/KBv8yN
+6YmMb5+1Ss+WwrKQcgarF5RjS7fD7TxjQcxvDrBo43z93aZeImqB/ZRjDb/JZ30y
+DliyUAjEpVt+9BIwTLPmvJkL4kVUBMcqCSO3dFns4Blov7Dm8nURo5C/F3g3CSmw
+6hOi2KdW3EamPcV9ZJ0D5BMBM40Bo3Ko2HGOcxvhKZap6MSIP4lKlWE8RNGXehGY
+P1SOTUQIBekv7rbjRAftcQcSFIeJVX5UUDfHAzDEly5iEQIDAQABo1swWTAdBgNV
+HQ4EFgQUpZDuzFNVGzknO9+UHMTlPr9V/I0wOAYDVR0RBDEwL4IKaWRwLmtkZy5i
+ZYYhaHR0cHM6Ly9pZHAua2RnLmJlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+BQUAA4IBAQBHT0WU2xpqxQlrM5pzEA+6ddq+7M/84eGyzj3L7WRs/RNmtwrxKlv2
+afRgZsMTMBA60AUQz5sBwK5GkIvg+ZYwBl8mGTQYY6/Um3EUqB3SzsHFgIE85NHG
+lR4h7WT9Yb2qPgUWCBkz/UfrphGhje7NUzrCJGJoKPsm6uSNyl804Q1KrWwV1WFM
+eEswby9HNRf2RuAKiVAtSDP1MvLO6wEMTQAgwyBjSb9C8iYdUHUk7ARNz9vBIx55
+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">
+KdG
+</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">
+Karel de Grote-Hogeschool
+</md:OrganizationDisplayName>
+    <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>
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
new file mode 100644
index 00000000..7506d873
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.kidderminster.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						cC5raWRkZXJtaW5zdGVyLmFjLnVrMB4XDTE0MDUyMjEzMTkzNloXDTM0MDUxNzEz
+						MTkzNlowgYAxCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5Xb3JjZXN0ZXJzaGlyZTEW
+						MBQGA1UEBwwNS2lkZGVybWluc3RlcjEeMBwGA1UECgwVS2lkZGVybWluc3RlciBD
+						b2xsZWdlMSAwHgYDVQQDDBdpZHAua2lkZGVybWluc3Rlci5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBANRe5zKGcnY7gv70p75rc68Wrj+q5Zkl
+						k12zx44THBleZAnLqwGRPh8cI1+zEHCJkFYZ+Jb6JUhLMTA4qalwr/Xsnba3e4vF
+						CaSL5IaXT6L08pVj56z3JbOuJSEe1G9seJWpXi6EV7NFWMKV+oBofs7pbvy9TzA1
+						fBGnJ6IAicdaFtlZALeYyGnF1w/QazoxYP0jg/3+l8DT4hQ8+xnyKIiw7F9lvD0z
+						Q+pm0vZavGHT7QXdgLzPFrgS8o07hoQlw5a0uLv0n46MHwZQh5LWj9LCXrspjZ7I
+						SLSOz5XUREIysOTkc+n4HwFDg6oU66eSG7i0+4sMGhufUwwuLpUtp6ECAwEAATAN
+						BgkqhkiG9w0BAQUFAAOCAQEATtVSFphRCI0ZcS+bbndukADAg2wWXZr1XK9ZeAQY
+						Ov2mCxPxeTq1xUW+y2XvTyKzpO5pEmSgcPgLWWAI7DitZZdSjHQF2Tp+611GclqP
+						4RCmSiR6oLFMppbKAoIlt9rM/9YVBUMmg/1UkHfRRl5B3fCEGP6a6gjkFyY3tREr
+						zlRZAqczHRN6KlO+XGd4V2GLEr+5afKgOQ7v6PY8SY2A9aPkb7VXayF9ce6Cp8fM
+						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>
+						MIIDfjCCAmYCCQC1lEqsdKl1pjANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMC
+						R0IxFzAVBgNVBAgMDldvcmNlc3RlcnNoaXJlMRYwFAYDVQQHDA1LaWRkZXJtaW5z
+						dGVyMR4wHAYDVQQKDBVLaWRkZXJtaW5zdGVyIENvbGxlZ2UxIDAeBgNVBAMMF2lk
+						cC5raWRkZXJtaW5zdGVyLmFjLnVrMB4XDTE0MDUyMjEzMTkzNloXDTM0MDUxNzEz
+						MTkzNlowgYAxCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5Xb3JjZXN0ZXJzaGlyZTEW
+						MBQGA1UEBwwNS2lkZGVybWluc3RlcjEeMBwGA1UECgwVS2lkZGVybWluc3RlciBD
+						b2xsZWdlMSAwHgYDVQQDDBdpZHAua2lkZGVybWluc3Rlci5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBANRe5zKGcnY7gv70p75rc68Wrj+q5Zkl
+						k12zx44THBleZAnLqwGRPh8cI1+zEHCJkFYZ+Jb6JUhLMTA4qalwr/Xsnba3e4vF
+						CaSL5IaXT6L08pVj56z3JbOuJSEe1G9seJWpXi6EV7NFWMKV+oBofs7pbvy9TzA1
+						fBGnJ6IAicdaFtlZALeYyGnF1w/QazoxYP0jg/3+l8DT4hQ8+xnyKIiw7F9lvD0z
+						Q+pm0vZavGHT7QXdgLzPFrgS8o07hoQlw5a0uLv0n46MHwZQh5LWj9LCXrspjZ7I
+						SLSOz5XUREIysOTkc+n4HwFDg6oU66eSG7i0+4sMGhufUwwuLpUtp6ECAwEAATAN
+						BgkqhkiG9w0BAQUFAAOCAQEATtVSFphRCI0ZcS+bbndukADAg2wWXZr1XK9ZeAQY
+						Ov2mCxPxeTq1xUW+y2XvTyKzpO5pEmSgcPgLWWAI7DitZZdSjHQF2Tp+611GclqP
+						4RCmSiR6oLFMppbKAoIlt9rM/9YVBUMmg/1UkHfRRl5B3fCEGP6a6gjkFyY3tREr
+						zlRZAqczHRN6KlO+XGd4V2GLEr+5afKgOQ7v6PY8SY2A9aPkb7VXayF9ce6Cp8fM
+						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>Ian</md:GivenName>
+    <md:SurName>Hatton</md:SurName>
+    <md:EmailAddress>mailto:ihatto@kidderminster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Hatton</md:SurName>
+    <md:EmailAddress>mailto:ihatto@kidderminster.ac.uk</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
new file mode 100644
index 00000000..6a61eb73
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.kingston-college.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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
+						dG9uLWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCmDI0iBMmMG2bc5ALSjviEDGlHjgr3taE907rW6ArPCH5xUMBFw9Nwge0mNS3D
+						naqk9WhKANREU5kppNAoWtp65P7jqStN1dgsUpK9ruIpYp2VymgMNnXtqv+EEE12
+						iZW0bZBVhmFVlJBXHIt879+jRXiR3ALSqRuE8MasJIJhwgqMU18qr9lgm3jhwDTt
+						MJdc+N255WStJdWD2Q6OGJUVF2bcoFQcQ8cgxEsGjQIQ3qQ232/Cp8clHzcEBc8V
+						pKtTU4jkmu+OQMsbImeY0OguIpVG1QYsgG8Vz7L9GIwx8ed52QuoJMXW4QaeNenk
+						oEJP2Rq3WTym/Pys1pGcXpynAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC5raW5n
+						c3Rvbi1jb2xsZWdlLmFjLnVrhjFodHRwczovL2lkcC5raW5nc3Rvbi1jb2xsZWdl
+						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRp8Hn8YhPsXqx9UpL1LtVm
+						4c6hVTANBgkqhkiG9w0BAQUFAAOCAQEAHRjHFTvBHVK1NJXYoKAgunVmG4c/pqbv
+						99OrLj2TNrUK/LD4395qpXoBtXAkw+76ZqbF5aBs+3IYLha5MyRZqFfa6KBXEwwj
+						Zej8Bdx809xIBfbkl25uUWGzg+77oaMMog1AzpCAcV0L6wHNnrLBJ6xxOzq/3wNE
+						XwYLU2H+KZ6oA5nV2x7/OVH5uxkrVJpNpTpM/D2TzDvfaO3m4rotmCaKYDWqU+/v
+						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>
+						MIIDVDCCAjygAwIBAgIVAMdUWtt4ktwl67ApElUJmzacgr80MA0GCSqGSIb3DQEB
+						BQUAMCUxIzAhBgNVBAMTGmlkcC5raW5nc3Rvbi1jb2xsZWdlLmFjLnVrMB4XDTEz
+						MDQxNzE1MDg0NFoXDTMzMDQxNzE1MDg0NFowJTEjMCEGA1UEAxMaaWRwLmtpbmdz
+						dG9uLWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCmDI0iBMmMG2bc5ALSjviEDGlHjgr3taE907rW6ArPCH5xUMBFw9Nwge0mNS3D
+						naqk9WhKANREU5kppNAoWtp65P7jqStN1dgsUpK9ruIpYp2VymgMNnXtqv+EEE12
+						iZW0bZBVhmFVlJBXHIt879+jRXiR3ALSqRuE8MasJIJhwgqMU18qr9lgm3jhwDTt
+						MJdc+N255WStJdWD2Q6OGJUVF2bcoFQcQ8cgxEsGjQIQ3qQ232/Cp8clHzcEBc8V
+						pKtTU4jkmu+OQMsbImeY0OguIpVG1QYsgG8Vz7L9GIwx8ed52QuoJMXW4QaeNenk
+						oEJP2Rq3WTym/Pys1pGcXpynAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC5raW5n
+						c3Rvbi1jb2xsZWdlLmFjLnVrhjFodHRwczovL2lkcC5raW5nc3Rvbi1jb2xsZWdl
+						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRp8Hn8YhPsXqx9UpL1LtVm
+						4c6hVTANBgkqhkiG9w0BAQUFAAOCAQEAHRjHFTvBHVK1NJXYoKAgunVmG4c/pqbv
+						99OrLj2TNrUK/LD4395qpXoBtXAkw+76ZqbF5aBs+3IYLha5MyRZqFfa6KBXEwwj
+						Zej8Bdx809xIBfbkl25uUWGzg+77oaMMog1AzpCAcV0L6wHNnrLBJ6xxOzq/3wNE
+						XwYLU2H+KZ6oA5nV2x7/OVH5uxkrVJpNpTpM/D2TzDvfaO3m4rotmCaKYDWqU+/v
+						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>
diff --git a/swamid-interfederations-2.0/idp.kingston.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.kingston.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..1c627a81
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.kingston.ac.uk-shibboleth.xml
@@ -0,0 +1,102 @@
+<?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>
+      <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>
+						MIIDMzCCAhugAwIBAgIUQjxnHZMeQMvjHxSoR20dG8MKz1AwDQYJKoZIhvcNAQEF
+						BQAwHTEbMBkGA1UEAxMSaWRwLmtpbmdzdG9uLmFjLnVrMB4XDTEzMDcwMTA5MDkx
+						MloXDTMzMDcwMTA5MDkxMlowHTEbMBkGA1UEAxMSaWRwLmtpbmdzdG9uLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn6CD799xP1TB7SWC+MsZ
+						qGZMmQz9HcavX1oJ2CpIknSzIX95LyPONkSjb331W9ShXl+eKPEH2Mk5bdyaHoSn
+						dXZvwflSxfLKC3UnZNUizA9CCWmGlNbvwkJM+dE/EonpHpfLLCu+F+Q+ojRRyjPc
+						oWfuXl0hdqd2yWo102z1YEsN4PgCkrgwCpVIG0Y5/oYGmnsC4/q8/DOIRLjxEbkg
+						ltnReG6HP+1zuI+ZHq2vqYPT8KngdvLk0wK/f1SdaZxbqNwmOGLm0E/Eo2SUuRIs
+						T3o6jFrh9A4yO+XJN3NqIVuafUX2FMkOKqnj8zg47HOWvqTfBP0S0c/N0aDnwfHB
+						mQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAua2luZ3N0b24uYWMudWuGKWh0dHBz
+						Oi8vaWRwLmtpbmdzdG9uLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSy
+						/YogRZ0oDBUzuNiLdMRngE+ZVTANBgkqhkiG9w0BAQUFAAOCAQEAD4mJs6Bk4UlH
+						KQ4OU2tjaPs9X8olgNvnA1znumIqNBSZKr0fWBp8fjSCmLuF3hnNuhU13N1+BnBt
+						w5wQTyVTaFf7T2WWQyp67vvIKgCXLUsIwQtKasIQ7LHQQvCKym6veIma1Bb1FlrG
+						ZtIo7Px6GKLDQnnahabtPfCdE+6H6oijxucVLda9rxJvQ6M86S6UmnxRgZdL7urm
+						UIozCY3Xlv0VfrHf5HTk6P4DtYV/A8RdlaVw6EQai9IWIujw9bmAFv9OgMNCD9SW
+						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>
+						MIIDMzCCAhugAwIBAgIUQjxnHZMeQMvjHxSoR20dG8MKz1AwDQYJKoZIhvcNAQEF
+						BQAwHTEbMBkGA1UEAxMSaWRwLmtpbmdzdG9uLmFjLnVrMB4XDTEzMDcwMTA5MDkx
+						MloXDTMzMDcwMTA5MDkxMlowHTEbMBkGA1UEAxMSaWRwLmtpbmdzdG9uLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn6CD799xP1TB7SWC+MsZ
+						qGZMmQz9HcavX1oJ2CpIknSzIX95LyPONkSjb331W9ShXl+eKPEH2Mk5bdyaHoSn
+						dXZvwflSxfLKC3UnZNUizA9CCWmGlNbvwkJM+dE/EonpHpfLLCu+F+Q+ojRRyjPc
+						oWfuXl0hdqd2yWo102z1YEsN4PgCkrgwCpVIG0Y5/oYGmnsC4/q8/DOIRLjxEbkg
+						ltnReG6HP+1zuI+ZHq2vqYPT8KngdvLk0wK/f1SdaZxbqNwmOGLm0E/Eo2SUuRIs
+						T3o6jFrh9A4yO+XJN3NqIVuafUX2FMkOKqnj8zg47HOWvqTfBP0S0c/N0aDnwfHB
+						mQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAua2luZ3N0b24uYWMudWuGKWh0dHBz
+						Oi8vaWRwLmtpbmdzdG9uLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSy
+						/YogRZ0oDBUzuNiLdMRngE+ZVTANBgkqhkiG9w0BAQUFAAOCAQEAD4mJs6Bk4UlH
+						KQ4OU2tjaPs9X8olgNvnA1znumIqNBSZKr0fWBp8fjSCmLuF3hnNuhU13N1+BnBt
+						w5wQTyVTaFf7T2WWQyp67vvIKgCXLUsIwQtKasIQ7LHQQvCKym6veIma1Bb1FlrG
+						ZtIo7Px6GKLDQnnahabtPfCdE+6H6oijxucVLda9rxJvQ6M86S6UmnxRgZdL7urm
+						UIozCY3Xlv0VfrHf5HTk6P4DtYV/A8RdlaVw6EQai9IWIujw9bmAFv9OgMNCD9SW
+						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>
diff --git a/swamid-interfederations-2.0/idp.kirkleescollege.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.kirkleescollege.ac.uk-entity.xml
new file mode 100644
index 00000000..3ce38f31
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.kirkleescollege.ac.uk-entity.xml
@@ -0,0 +1,109 @@
+<?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"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kirkleescollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEgDCCA2igAwIBAgIRALyJOa+uq/oIUbNaLn2KXiwwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA0MDMwMDAwMDBaFw0xNjA0MDIyMzU5NTlaMEcxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZaWRwLmtpcmts
+						ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						ALLhXXGAlGzAXjTroZwzaMOxuBK/OhDokwfsjhn7ZI4MGUIdWvstZeHbkGtLiwuP
+						jWQ/usuTbiDwHWBvIBBLse+3q7k0QmKAtVSXZK6EsK9rPQsQH0eURmD4ja2qC15/
+						LefzP8yPNBhAjMRRrb9bBXry6TtQItIFUvgLUXbdmjWYY2AB41qhSx3ZBPIvVCYF
+						RTwVLykiZ+W8OaviB4N5kKkyNa4eSANcF+g8DC3WozFm6g+He4qtXNvc6iERdvlF
+						TlPcsWfEJoz9JSku2/u9+DNxwN041bLTfJq3Hwy/8lkQE2YbLdmv/IQz1ErYA1qE
+						Ad2faNnHeNjlKfRePnBf8W0CAwEAAaOCAXYwggFyMB8GA1UdIwQYMBaAFAy9k2gM
+						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSCqCPYjgeb90vOUQbpnXkrucpgoDAO
+						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYDVR0RBB0wG4IZaWRwLmtpcmts
+						ZWVzY29sbGVnZS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAQyOuUyGYf8IPri1z
+						Y2yk+b3cpXUmJp1cqAkyrlvGdYzxWwLNTiFmnfqXl2F5NwY1spcoYcoQAVF1NFdr
+						xnEXnt5abNqSQysVoO8x6bhNilzELp25LIQNMhVtgPmm3mOwiYvHTixi0DCf8fy/
+						XsyKGxghAMpcIFwPbB6n+60Z9rKt2IR5eXdBFeP/zlA4rpHkHZKv/4J9XhDUI0Jz
+						756Te1Pz3yg1tf+7sj0pXJVvYMJev2AdBbSpAbjYzM2Ql2yBXMYA+z5zL/if1cUL
+						ogmKl5PdPZpZJfPazJwj6yT/FWPxI0FcA7QtM+TQ6SDrcnPckQHmXAFaI6mbbyzg
+						JtfZCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.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://idp.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://idp.kirkleescollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kirkleescollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kirkleescollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kirkleescollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kirkleescollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEgDCCA2igAwIBAgIRALyJOa+uq/oIUbNaLn2KXiwwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA0MDMwMDAwMDBaFw0xNjA0MDIyMzU5NTlaMEcxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZaWRwLmtpcmts
+						ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						ALLhXXGAlGzAXjTroZwzaMOxuBK/OhDokwfsjhn7ZI4MGUIdWvstZeHbkGtLiwuP
+						jWQ/usuTbiDwHWBvIBBLse+3q7k0QmKAtVSXZK6EsK9rPQsQH0eURmD4ja2qC15/
+						LefzP8yPNBhAjMRRrb9bBXry6TtQItIFUvgLUXbdmjWYY2AB41qhSx3ZBPIvVCYF
+						RTwVLykiZ+W8OaviB4N5kKkyNa4eSANcF+g8DC3WozFm6g+He4qtXNvc6iERdvlF
+						TlPcsWfEJoz9JSku2/u9+DNxwN041bLTfJq3Hwy/8lkQE2YbLdmv/IQz1ErYA1qE
+						Ad2faNnHeNjlKfRePnBf8W0CAwEAAaOCAXYwggFyMB8GA1UdIwQYMBaAFAy9k2gM
+						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSCqCPYjgeb90vOUQbpnXkrucpgoDAO
+						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYDVR0RBB0wG4IZaWRwLmtpcmts
+						ZWVzY29sbGVnZS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAQyOuUyGYf8IPri1z
+						Y2yk+b3cpXUmJp1cqAkyrlvGdYzxWwLNTiFmnfqXl2F5NwY1spcoYcoQAVF1NFdr
+						xnEXnt5abNqSQysVoO8x6bhNilzELp25LIQNMhVtgPmm3mOwiYvHTixi0DCf8fy/
+						XsyKGxghAMpcIFwPbB6n+60Z9rKt2IR5eXdBFeP/zlA4rpHkHZKv/4J9XhDUI0Jz
+						756Te1Pz3yg1tf+7sj0pXJVvYMJev2AdBbSpAbjYzM2Ql2yBXMYA+z5zL/if1cUL
+						ogmKl5PdPZpZJfPazJwj6yT/FWPxI0FcA7QtM+TQ6SDrcnPckQHmXAFaI6mbbyzg
+						JtfZCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kirkleescollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kirkleescollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </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.kmh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml
new file mode 100644
index 00000000..21543558
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml
@@ -0,0 +1,117 @@
+<?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>
+      <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 height="141" width="313" xml:lang="sv">https://idp.kmh.se/idp/images/logo.jpg</mdui:Logo>
+        <mdui:Logo height="141" width="313" xml:lang="en">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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAOU5HVg2XQ7x9zifEpWAwx5/tzMwMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5rbWguc2UwHhcNMTIxMTA2MDkxMTQyWhcNMTUx
+MTA2MDkxMTQyWjAVMRMwEQYDVQQDEwppZHAua21oLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAg7J4scEL6Ptwh2NGEUkfSc08ZlC8I1l5uRL0L3EO
+eRjAFqjwsBuEhgGNvZdevH4vMsMU4XrXA+4J0XzeARZx+8B6EQKpiT5od5Jfw5oN
+8PsbL6bSw0ivEipqRfjMRxxhqntS6unsCyrPG8IFr2l4koGyE2aoixWJ2je2gbGg
+ka/6tC5xpsI+rlO24HJd83tXWPJ+oZ2rI6Ac7TXq2KYjxj8M7fcQS6X9pqhgl1oZ
+04I4HMHMFRMnO62Cb1ryS0A7V5P/PS9d0QU/MrxuSootYQ1vYRtQQnWSulBH945g
+tkubfMV/pkr3wsNxh+tEXaGTh3+vbZ45pYKglZ99amHO3QIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAua21oLnNlhiFodHRwczovL2lkcC5rbWguc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFN9PHZwomaeOxq04aXJbnPdgxdlpMA0GCSqGSIb3DQEB
+BQUAA4IBAQBxRPXYVh5a6RiXOucpuOW44fWdzqyevWeQKdk6YOgLCe153TDSJRcB
+qbmg5vPht/Pl+YckIGN5XHjXhx7SkaTaYvCAPX4/E4nVKYqUPoM1P+HDJFvqWtPN
+wGCDbVOeyeBWLLapkmVUFxS3zOL4uCqK+HV20g4cZQQdaDV5bX3WzUbLuXT3h+V4
+mAXptRcQXKX+zbvg1G5bp3NtSFZnXnrou+g9I1u9l4odS9F5kcHjnIAlxiBpl4xd
+qdIb2Ub9Cyim+BBcDduP8P0RaSYzYkj+joxU5SqHKvPCmvQOmMf4bBphtbNJeGBj
+Qz1btpwpzorDI58f7uezMy6zg2+3aLxJ</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: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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAOU5HVg2XQ7x9zifEpWAwx5/tzMwMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5rbWguc2UwHhcNMTIxMTA2MDkxMTQyWhcNMTUx
+MTA2MDkxMTQyWjAVMRMwEQYDVQQDEwppZHAua21oLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAg7J4scEL6Ptwh2NGEUkfSc08ZlC8I1l5uRL0L3EO
+eRjAFqjwsBuEhgGNvZdevH4vMsMU4XrXA+4J0XzeARZx+8B6EQKpiT5od5Jfw5oN
+8PsbL6bSw0ivEipqRfjMRxxhqntS6unsCyrPG8IFr2l4koGyE2aoixWJ2je2gbGg
+ka/6tC5xpsI+rlO24HJd83tXWPJ+oZ2rI6Ac7TXq2KYjxj8M7fcQS6X9pqhgl1oZ
+04I4HMHMFRMnO62Cb1ryS0A7V5P/PS9d0QU/MrxuSootYQ1vYRtQQnWSulBH945g
+tkubfMV/pkr3wsNxh+tEXaGTh3+vbZ45pYKglZ99amHO3QIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAua21oLnNlhiFodHRwczovL2lkcC5rbWguc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFN9PHZwomaeOxq04aXJbnPdgxdlpMA0GCSqGSIb3DQEB
+BQUAA4IBAQBxRPXYVh5a6RiXOucpuOW44fWdzqyevWeQKdk6YOgLCe153TDSJRcB
+qbmg5vPht/Pl+YckIGN5XHjXhx7SkaTaYvCAPX4/E4nVKYqUPoM1P+HDJFvqWtPN
+wGCDbVOeyeBWLLapkmVUFxS3zOL4uCqK+HV20g4cZQQdaDV5bX3WzUbLuXT3h+V4
+mAXptRcQXKX+zbvg1G5bp3NtSFZnXnrou+g9I1u9l4odS9F5kcHjnIAlxiBpl4xd
+qdIb2Ub9Cyim+BBcDduP8P0RaSYzYkj+joxU5SqHKvPCmvQOmMf4bBphtbNJeGBj
+Qz1btpwpzorDI58f7uezMy6zg2+3aLxJ</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>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>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>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
new file mode 100644
index 00000000..038aa656
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.knowsleycollege.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,111 @@
+<?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>
+      <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
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZaWRwLmtub3dz
+						bGV5Y29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AKRJddwlsUcpb0Wx0i00fAhJCsUmCTfTtmT49JRyCoTYchZlSp7ZS2OAQssFDYiD
+						RHLClkSw+iUgIFCbal1bDSDDFJosZJv4JD4U0FD4q8twDw48bfS3k1+JBPR/M0eU
+						+wd4A0siZf0WcTItiU3MmzLv4I9mOW5IZ8akjZiLCdnkR1zjAbAAoX18mYsld9xA
+						LOSO4NydM08pRLOtWJFtVKlLnQ0tn+cG0NoYELpMueVopSUM7+K5fLaEOqqd5smO
+						eb11WyHbZuxuR1C40Xpb6OsWiNQYoyF7m1G+x3F8GiUvaqiejhSmXm0VkNv1QbHj
+						ko0ygft+w/V2dTQNYdrwqckCAwEAAaOCAXYwggFyMB8GA1UdIwQYMBaAFAy9k2gM
+						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSx+f3A3ueD76o4IG5ZlByOeLnGmjAO
+						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYDVR0RBB0wG4IZaWRwLmtub3dz
+						bGV5Y29sbGVnZS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAaizqm9abK5mC4yKi
+						kAVp7Y2DBzjXB1PUtguSOCx0EbfIX8/OK6PrRa3o45eMSEo5eecwpFJwCSDqg+V0
+						kCJp6lbIz37iP3WaJjaeYCqkBedphtFBSh1QKcrrKjQXvHlezgiNhVie+qcvEyT2
+						F28YSP2Bb3Yyb/LRNX3g8Om9EYUeg1TKy/ECyOwS7Bbqk7I37A8S2c1G0YnbdiFT
+						hkA+eu7b2/C1cZr3ETLYuR5ZQ83pLNmAJRIM89lMukuSeIYrYELOm+o97rw4wqrD
+						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>
+						MIIEgDCCA2igAwIBAgIRAJp6NZY3oZd2UzczIfqpV5UwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xNDAxMDkwMDAwMDBaFw0xNzAxMDgyMzU5NTlaMEcxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZaWRwLmtub3dz
+						bGV5Y29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AKRJddwlsUcpb0Wx0i00fAhJCsUmCTfTtmT49JRyCoTYchZlSp7ZS2OAQssFDYiD
+						RHLClkSw+iUgIFCbal1bDSDDFJosZJv4JD4U0FD4q8twDw48bfS3k1+JBPR/M0eU
+						+wd4A0siZf0WcTItiU3MmzLv4I9mOW5IZ8akjZiLCdnkR1zjAbAAoX18mYsld9xA
+						LOSO4NydM08pRLOtWJFtVKlLnQ0tn+cG0NoYELpMueVopSUM7+K5fLaEOqqd5smO
+						eb11WyHbZuxuR1C40Xpb6OsWiNQYoyF7m1G+x3F8GiUvaqiejhSmXm0VkNv1QbHj
+						ko0ygft+w/V2dTQNYdrwqckCAwEAAaOCAXYwggFyMB8GA1UdIwQYMBaAFAy9k2gM
+						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSx+f3A3ueD76o4IG5ZlByOeLnGmjAO
+						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYDVR0RBB0wG4IZaWRwLmtub3dz
+						bGV5Y29sbGVnZS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAaizqm9abK5mC4yKi
+						kAVp7Y2DBzjXB1PUtguSOCx0EbfIX8/OK6PrRa3o45eMSEo5eecwpFJwCSDqg+V0
+						kCJp6lbIz37iP3WaJjaeYCqkBedphtFBSh1QKcrrKjQXvHlezgiNhVie+qcvEyT2
+						F28YSP2Bb3Yyb/LRNX3g8Om9EYUeg1TKy/ECyOwS7Bbqk7I37A8S2c1G0YnbdiFT
+						hkA+eu7b2/C1cZr3ETLYuR5ZQ83pLNmAJRIM89lMukuSeIYrYELOm+o97rw4wqrD
+						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>
diff --git a/swamid-interfederations-2.0/idp.konstfack.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.konstfack.se-idp-shibboleth.xml
new file mode 100644
index 00000000..3c717a9c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.konstfack.se-idp-shibboleth.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.konstfack.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>
+      <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">http://www.konstfack.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.konstfack.se/en</mdui:InformationURL>
+        <mdui:Logo height="142" width="142">https://idp.konstfack.se/idp/images/logo.jpg</mdui:Logo>
+        <mdui:Logo height="142" width="142" xml:lang="sv">https://idp.konstfack.se/idp/images/logo.jpg</mdui:Logo>
+        <mdui:Logo height="142" width="142" xml:lang="en">https://idp.konstfack.se/idp/images/logo.jpg</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">konstfack</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">konstfack</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>konstfack.se</mdui:DomainHint>
+        <mdui:IPHint>130.242.16.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.299772,17.994303</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPA2v/jvONxWV73+wdqELeA5iFTMMA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEGlkcC5rb25zdGZhY2suc2UwHhcNMTMwMTIzMDkwMjIy
+WhcNMTYwMTIzMDkwMjIyWjAbMRkwFwYDVQQDExBpZHAua29uc3RmYWNrLnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuKqHMcnTbkHRUUPt5SYVWnrz
+vzPsKTo9treYMIVyNsJRqlaTMZxx5Y9AbyWjGq9c1MMP/7oVtu9ABLSzkEu61y8R
+cN0YfKeby8JgLpQ8Wx6tJdHJ2sgBPD7swlf0tIBUR0fEg9/XXzSrlCG92cEphDqF
+7JEs+WjnIGOVZFZ46pc6i0P5UR4zwLI0MnLH18UcztavnK2tqOny7JzO0fyPXpft
+bR5rO6CINXsjwSNhngKsZoQt5rxGO0jOfowtv6CWa0STZKYg+oQFlttmV3TqK5S0
+AZWOjsb5wLbjOxEjJ9imjwYRaLNAIiHf/kPy3510grJ38opoOoyio++Lb2nhQQID
+AQABo2cwZTBEBgNVHREEPTA7ghBpZHAua29uc3RmYWNrLnNlhidodHRwczovL2lk
+cC5rb25zdGZhY2suc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFQ5EaKkR2w+
+gZn3p2frzQRUOyazMA0GCSqGSIb3DQEBBQUAA4IBAQBYOq5A0EQe9lEfg432gl9S
+4/nnAH1V8OHReiFL6Inz9r3LZi9UUMhOS3P+9zuuRfBuhjRD8Wb7y7OD+ecS2ZMR
+gbzxwpfI8BICrrxTSnBQv1wXQnDvX7XuTH+UqPfc5ZWKInX2kE1VNRb/5mwODPt3
+i+hJa2eQhpQGsv4I8cL1Pu1uIuA1+5y+JLINPrwvqu0BwKdHDApQ7JrGCf0+CbLm
+vw3ZJUolwiBzmSW487sdzsI85Nnp/NFbjZPfVNfwK++e24meft9lZY8oqhPp+B88
+SHHQuQC8v/yTq6ZVFlRvTNkZ+W/vPYOeE6x49Dygeu65WDf/H2NUy6dggcmH+LpS</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.konstfack.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.konstfack.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.konstfack.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.konstfack.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.konstfack.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.konstfack.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">konstfack.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPA2v/jvONxWV73+wdqELeA5iFTMMA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEGlkcC5rb25zdGZhY2suc2UwHhcNMTMwMTIzMDkwMjIy
+WhcNMTYwMTIzMDkwMjIyWjAbMRkwFwYDVQQDExBpZHAua29uc3RmYWNrLnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuKqHMcnTbkHRUUPt5SYVWnrz
+vzPsKTo9treYMIVyNsJRqlaTMZxx5Y9AbyWjGq9c1MMP/7oVtu9ABLSzkEu61y8R
+cN0YfKeby8JgLpQ8Wx6tJdHJ2sgBPD7swlf0tIBUR0fEg9/XXzSrlCG92cEphDqF
+7JEs+WjnIGOVZFZ46pc6i0P5UR4zwLI0MnLH18UcztavnK2tqOny7JzO0fyPXpft
+bR5rO6CINXsjwSNhngKsZoQt5rxGO0jOfowtv6CWa0STZKYg+oQFlttmV3TqK5S0
+AZWOjsb5wLbjOxEjJ9imjwYRaLNAIiHf/kPy3510grJ38opoOoyio++Lb2nhQQID
+AQABo2cwZTBEBgNVHREEPTA7ghBpZHAua29uc3RmYWNrLnNlhidodHRwczovL2lk
+cC5rb25zdGZhY2suc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFQ5EaKkR2w+
+gZn3p2frzQRUOyazMA0GCSqGSIb3DQEBBQUAA4IBAQBYOq5A0EQe9lEfg432gl9S
+4/nnAH1V8OHReiFL6Inz9r3LZi9UUMhOS3P+9zuuRfBuhjRD8Wb7y7OD+ecS2ZMR
+gbzxwpfI8BICrrxTSnBQv1wXQnDvX7XuTH+UqPfc5ZWKInX2kE1VNRb/5mwODPt3
+i+hJa2eQhpQGsv4I8cL1Pu1uIuA1+5y+JLINPrwvqu0BwKdHDApQ7JrGCf0+CbLm
+vw3ZJUolwiBzmSW487sdzsI85Nnp/NFbjZPfVNfwK++e24meft9lZY8oqhPp+B88
+SHHQuQC8v/yTq6ZVFlRvTNkZ+W/vPYOeE6x49Dygeu65WDf/H2NUy6dggcmH+LpS</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.konstfack.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.konstfack.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">Konstfack</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Konstfack</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Konstfack</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.konstfack.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Konstfack</md:Company>
+    <md:SurName>Håkan Pettersson</md:SurName>
+    <md:EmailAddress>hakan.pettersson@konstfack.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 4504396</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Konstfack</md:Company>
+    <md:SurName>Håkan Pettersson</md:SurName>
+    <md:EmailAddress>hakan.pettersson@konstfack.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 4504396</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Konstfack</md:Company>
+    <md:SurName>Helpdesk IT Konstfack</md:SurName>
+    <md:EmailAddress>helpdesk@konstfack.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 450 4399</md:TelephoneNumber>
+  </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
new file mode 100644
index 00000000..76310494
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.kva.se-idp-shibboleth.xml
@@ -0,0 +1,119 @@
+<?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>
+      <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>
+
+MIIDFDCCAfygAwIBAgIVAIEMcH8g/qilWjlQSS0EYqY8O3hnMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5rdmEuc2UwHhcNMTMwNjExMTIwMzU2WhcNMzMw
+NjExMTIwMzU2WjAVMRMwEQYDVQQDEwppZHAua3ZhLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAhbLQb03KVvHFPZlmohpzwmr6tY7dZCKSRTdfoSpu
+fT6BykDryqo0vg8pSBWghkiFZQr1V36qdK0XUFNAtFEGTtlXyI+PDvtGLTzg2Swb
+9nxpwsXAxRUD1v/2SNUTxQW7O0t4jdZKxGcOEIDO8YHOpV0imw2v+tqzyr8MgwfE
+SSBV3ESUtHmDFvhanEp/TNsT6K8Y1IFqQzHCvNKV1WGW2vEKCjnwmMNd5N55cQrO
+foWCeC7BJhm7dKrzk0WzSZLrX1PtitHB7Ms705x7XRWw1Inbp5jd56ONJ7sZXqpi
+4eb9wVovrZMqcBc/h4GPZN9WTACvfHUKvQ0N0lfzhUuKdQIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAua3ZhLnNlhiFodHRwczovL2lkcC5rdmEuc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFKpM1lN1+VbR8w+sZ1O3g4Lc0SIxMA0GCSqGSIb3DQEB
+BQUAA4IBAQB+22vGRTKJyRGh5lHVyk0NXWjc8aRAdntepCR+Yy17HB1P4lBSlewS
+bHuDhu7hHp9ItJWJryhkO4F1c+RjELnGf++WvM3Fv05AIV3x0lh/Kxs9X2f4KYBI
+Sa4XUUgl3lbrTI9H0Mse59OK4jz5LRF35OWihdoCNiRaKVjrRmMTZKrxBTJ5gSvf
+ULOTA8+dCegP7Q4xnGmN2M8PfO6Lp6BQh2LaaBt4qDGUytMnclKUhDXpasr/oUfB
+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>
+
+MIIDFDCCAfygAwIBAgIVAIEMcH8g/qilWjlQSS0EYqY8O3hnMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5rdmEuc2UwHhcNMTMwNjExMTIwMzU2WhcNMzMw
+NjExMTIwMzU2WjAVMRMwEQYDVQQDEwppZHAua3ZhLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAhbLQb03KVvHFPZlmohpzwmr6tY7dZCKSRTdfoSpu
+fT6BykDryqo0vg8pSBWghkiFZQr1V36qdK0XUFNAtFEGTtlXyI+PDvtGLTzg2Swb
+9nxpwsXAxRUD1v/2SNUTxQW7O0t4jdZKxGcOEIDO8YHOpV0imw2v+tqzyr8MgwfE
+SSBV3ESUtHmDFvhanEp/TNsT6K8Y1IFqQzHCvNKV1WGW2vEKCjnwmMNd5N55cQrO
+foWCeC7BJhm7dKrzk0WzSZLrX1PtitHB7Ms705x7XRWw1Inbp5jd56ONJ7sZXqpi
+4eb9wVovrZMqcBc/h4GPZN9WTACvfHUKvQ0N0lfzhUuKdQIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAua3ZhLnNlhiFodHRwczovL2lkcC5rdmEuc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFKpM1lN1+VbR8w+sZ1O3g4Lc0SIxMA0GCSqGSIb3DQEB
+BQUAA4IBAQB+22vGRTKJyRGh5lHVyk0NXWjc8aRAdntepCR+Yy17HB1P4lBSlewS
+bHuDhu7hHp9ItJWJryhkO4F1c+RjELnGf++WvM3Fv05AIV3x0lh/Kxs9X2f4KYBI
+Sa4XUUgl3lbrTI9H0Mse59OK4jz5LRF35OWihdoCNiRaKVjrRmMTZKrxBTJ5gSvf
+ULOTA8+dCegP7Q4xnGmN2M8PfO6Lp6BQh2LaaBt4qDGUytMnclKUhDXpasr/oUfB
+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>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>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>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
new file mode 100644
index 00000000..4278fc38
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lambeth.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmoA8TlAc9wQSYDGtLSn8E
+						DQZ9d72tC4lH45Na9OenSspeZ6l4Oekgv6xGeZcImOUFn9mQ3PZIiHJMYgmo/ouy
+						7sGE+bW7lulmAWQYo6khkRKnu5HqRv2QLZmiS/z2aaqqrWqSd4JlLdVdE9u9Ki7T
+						MCIp2p4HQ0cLg77b8KjRnh/y4/qj2AvDFJPFIfplIh+5mt1M6ka1Ydg5AcfvdT6d
+						EZu9Ams2nJPRPax2s7qq7OETgTODyN5E/7XQTwqjGOxirTS2LHMoVqYHtjmpYq4I
+						resVAqKkkSJLS/dy2hEkpqyLS91IeZF4rODfMkVg0nglPVTt7NHml36DHSkEMcbp
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC5sYW1iZXRoLmFjLnVrhihodHRwczov
+						L2lkcC5sYW1iZXRoLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSrBHTL
+						v5ig79YvnYvc1QwZqEORqTANBgkqhkiG9w0BAQUFAAOCAQEAv3AqTafVQD9uWHJh
+						pT6tp4YpFaLNvbj+jRoelUsPDLyLHWXPWqvsuxv1fCpX1UZPs0S9X/jSjCECLmFe
+						51KmsDoKC3nj2KZTjcmkMo34fBxTqRCM2CX+kBPEnXqbtUVhzZ2PRrxPuzeIBmzo
+						vZ1CGq+WaNFuG6dMP4nRZAhJI4pC87l8AlVCHMShcihD1YA6FFEgkPvXTHMv4/hY
+						t+B8dRMudDbFxCbayT0HRBySZrCY8E3mX3FCkLDE0wtTPxxIWq8lyJrGotB5HKXY
+						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>
+						MIIDMDCCAhigAwIBAgIVAOew5SzBfog/X45WRCY3nAQXwA63MA0GCSqGSIb3DQEB
+						BQUAMBwxGjAYBgNVBAMTEWlkcC5sYW1iZXRoLmFjLnVrMB4XDTE0MDIxOTA4MTI1
+						NloXDTM0MDIxOTA4MTI1NlowHDEaMBgGA1UEAxMRaWRwLmxhbWJldGguYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmoA8TlAc9wQSYDGtLSn8E
+						DQZ9d72tC4lH45Na9OenSspeZ6l4Oekgv6xGeZcImOUFn9mQ3PZIiHJMYgmo/ouy
+						7sGE+bW7lulmAWQYo6khkRKnu5HqRv2QLZmiS/z2aaqqrWqSd4JlLdVdE9u9Ki7T
+						MCIp2p4HQ0cLg77b8KjRnh/y4/qj2AvDFJPFIfplIh+5mt1M6ka1Ydg5AcfvdT6d
+						EZu9Ams2nJPRPax2s7qq7OETgTODyN5E/7XQTwqjGOxirTS2LHMoVqYHtjmpYq4I
+						resVAqKkkSJLS/dy2hEkpqyLS91IeZF4rODfMkVg0nglPVTt7NHml36DHSkEMcbp
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC5sYW1iZXRoLmFjLnVrhihodHRwczov
+						L2lkcC5sYW1iZXRoLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSrBHTL
+						v5ig79YvnYvc1QwZqEORqTANBgkqhkiG9w0BAQUFAAOCAQEAv3AqTafVQD9uWHJh
+						pT6tp4YpFaLNvbj+jRoelUsPDLyLHWXPWqvsuxv1fCpX1UZPs0S9X/jSjCECLmFe
+						51KmsDoKC3nj2KZTjcmkMo34fBxTqRCM2CX+kBPEnXqbtUVhzZ2PRrxPuzeIBmzo
+						vZ1CGq+WaNFuG6dMP4nRZAhJI4pC87l8AlVCHMShcihD1YA6FFEgkPvXTHMv4/hY
+						t+B8dRMudDbFxCbayT0HRBySZrCY8E3mX3FCkLDE0wtTPxxIWq8lyJrGotB5HKXY
+						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>
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
new file mode 100644
index 00000000..ff5edcd1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lancs.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,103 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-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-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>
+      <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 (New IdP)</mdui:DisplayName>
+        <mdui:Logo height="50" width="80">https://idp-test.lancs.ac.uk/test-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>
+						MIIDJjCCAg6gAwIBAgITE/T96ytOqT8HI/CQq7WILI+KmjANBgkqhkiG9w0BAQUF
+						ADAaMRgwFgYDVQQDEw9pZHAubGFuY3MuYWMudWswHhcNMTMwMjE4MTUwNzQyWhcN
+						MzMwMjE4MTUwNzQyWjAaMRgwFgYDVQQDEw9pZHAubGFuY3MuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsu+5TFlPyDOccJHktBu8NSnY+Vdwq
+						TzwPkSdCGlLzGrqQB0m5vDDIMxBC30i05tknFZP6KBvgPJj5pk0MSmOCXIGU0IG3
+						kWUgpOF4Y7fd9NRuD53EF12pZfj88m3w/pVtPTrQOvi/agKgjZGbTDsEfRe0bIkf
+						c3z4lzohXGIX+YcOGz0IC6b+XEiioAPMRodtTW8O53p3ttnLJ7Zv5Qs4zul8NQKY
+						YmN2/sn2zkJEsE5gz61hY39FFlzAoJ8lGpeF5JgSeJ//2nyFAZ2ik8L8JnvqTwml
+						r1UU7cd7tRxG+xy31gKxzqlNaI1PaafjPVdlXcyHROz7ACfznlrZxntZAgMBAAGj
+						ZTBjMEIGA1UdEQQ7MDmCD2lkcC5sYW5jcy5hYy51a4YmaHR0cHM6Ly9pZHAubGFu
+						Y3MuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLuSKcwtlxU2Ivaq/A7T
+						5g8LjqVRMA0GCSqGSIb3DQEBBQUAA4IBAQCjrOUZv0J2s8E7MWlO0qAlBeRwRI9/
+						/UjuEM1uqgdKqTtFkKkug6BayVXIKErwYVnvhFFkwRqkewPjEeQxIZrnvPYWfqCl
+						KV6zaykfU9VCYmP6/yK89A5nTY93IZQ4Rm63mF20LxqZeRxDNLGAd7Fm6y1pdoq7
+						DuhJoqENTcQ2ludpmptKESInGhn4r/Pzk6x/SQvRF5/jZLLMy8flrB8KPKUJ3sN0
+						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>
+						MIIDJjCCAg6gAwIBAgITE/T96ytOqT8HI/CQq7WILI+KmjANBgkqhkiG9w0BAQUF
+						ADAaMRgwFgYDVQQDEw9pZHAubGFuY3MuYWMudWswHhcNMTMwMjE4MTUwNzQyWhcN
+						MzMwMjE4MTUwNzQyWjAaMRgwFgYDVQQDEw9pZHAubGFuY3MuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsu+5TFlPyDOccJHktBu8NSnY+Vdwq
+						TzwPkSdCGlLzGrqQB0m5vDDIMxBC30i05tknFZP6KBvgPJj5pk0MSmOCXIGU0IG3
+						kWUgpOF4Y7fd9NRuD53EF12pZfj88m3w/pVtPTrQOvi/agKgjZGbTDsEfRe0bIkf
+						c3z4lzohXGIX+YcOGz0IC6b+XEiioAPMRodtTW8O53p3ttnLJ7Zv5Qs4zul8NQKY
+						YmN2/sn2zkJEsE5gz61hY39FFlzAoJ8lGpeF5JgSeJ//2nyFAZ2ik8L8JnvqTwml
+						r1UU7cd7tRxG+xy31gKxzqlNaI1PaafjPVdlXcyHROz7ACfznlrZxntZAgMBAAGj
+						ZTBjMEIGA1UdEQQ7MDmCD2lkcC5sYW5jcy5hYy51a4YmaHR0cHM6Ly9pZHAubGFu
+						Y3MuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLuSKcwtlxU2Ivaq/A7T
+						5g8LjqVRMA0GCSqGSIb3DQEBBQUAA4IBAQCjrOUZv0J2s8E7MWlO0qAlBeRwRI9/
+						/UjuEM1uqgdKqTtFkKkug6BayVXIKErwYVnvhFFkwRqkewPjEeQxIZrnvPYWfqCl
+						KV6zaykfU9VCYmP6/yK89A5nTY93IZQ4Rm63mF20LxqZeRxDNLGAd7Fm6y1pdoq7
+						DuhJoqENTcQ2ludpmptKESInGhn4r/Pzk6x/SQvRF5/jZLLMy8flrB8KPKUJ3sN0
+						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 (New 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.lboro.ac.uk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.lboro.ac.uk-simplesaml-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..14550bfb
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lboro.ac.uk-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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>
+						MIID8zCCAtugAwIBAgIJAJC1ySyy8NnHMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
+						VQQGEwJHQjEXMBUGA1UECAwOTGVpY2VzdGVyc2hpcmUxFTATBgNVBAcMDExvdWdo
+						Ym9yb3VnaDEgMB4GA1UECgwXTG91Z2hib3JvdWdoIFVuaXZlcnNpdHkxFDASBgNV
+						BAsMC0lUIFNlcnZpY2VzMRgwFgYDVQQDDA9pZHAubGJvcm8uYWMudWswHhcNMTQw
+						NjI2MTQ0NTMzWhcNMzQwNjI2MTQ0NTMzWjCBjzELMAkGA1UEBhMCR0IxFzAVBgNV
+						BAgMDkxlaWNlc3RlcnNoaXJlMRUwEwYDVQQHDAxMb3VnaGJvcm91Z2gxIDAeBgNV
+						BAoMF0xvdWdoYm9yb3VnaCBVbml2ZXJzaXR5MRQwEgYDVQQLDAtJVCBTZXJ2aWNl
+						czEYMBYGA1UEAwwPaWRwLmxib3JvLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA3bzqGATB5A3Ve1tYdKK33TzyiojOKh32KKxQSsULl4HAY+tW
+						K6ecQB56Meq7vxkQ0eIau/uyfk7Q87qhH4gX/tTpfsbvrPaaB/X0/AU0uNnaCVK0
+						Vh7AZYzZF+nTgzFxCq+aOiVPCR7f5LLBY3BFj6QdBzKalAShozuwHiLtnL3nYpVt
+						yEwEbbBS1BuKmsGSKAncrMiWKdmzMTMyCZtu0u1dmtpnwbfppFoPlj/zM8KDjBdr
+						Aehg5Rflrj8lifnkJSEpIHT+BTlx6zyvbCPSWdk9VTzXpPM3JlQwIs0dlJzPMh6w
+						CAw66N393Awd9ilkpoGrkdG/hFzPD2D/0RNX7wIDAQABo1AwTjAdBgNVHQ4EFgQU
+						18Vf/8a7klrMfl3UMChCt8tzOG8wHwYDVR0jBBgwFoAU18Vf/8a7klrMfl3UMChC
+						t8tzOG8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAtlrSXUAKW4tV
+						0I7JkmVUvKhrlFlZJMqR8WNwxG5l6+5BFvXLb0DoGH1YdynAWn9MtdvWTm/hGOZ5
+						Vr/FYBbHHjZN4HK6DMceZSq9YAMdEUtpIPMd1sGdplVKofHqYUEbKL+VJnBYSYnr
+						J1VQhScUX0PjM5rAwlXxdh2kBNlyeC1ZsjNvLPH95T+Ev8i6BFVrSbe09I40mBiQ
+						JThq5JpngMmPGZg5r/H3PnAJdN5OwUyLPLj4D/raVOAk7tiySTPWzWRyPxzbRXr0
+						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>
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
new file mode 100644
index 00000000..3ddcca03
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.le.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?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>
+      <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
+						C0lUIFNlcnZpY2VzMRUwEwYDVQQDEwxpZHAubGUuYWMudWswHhcNMTMwMzIyMTY0
+						MTI1WhcNMjMwMzIwMTY0MTI1WjCBiTELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDkxl
+						aWNlc3RlcnNoaXJlMRIwEAYDVQQHEwlMZWljZXN0ZXIxIDAeBgNVBAoTF1VuaXZl
+						cnNpdHkgb2YgTGVpY2VzdGVyMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEVMBMGA1UE
+						AxMMaWRwLmxlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						v48+1bJDraA824vOonzXfO8qI4tshOPN9ZfbQgSVQcC60FwZnpFYKxXSRsHNXS+g
+						6XAmqTFHmZ3XNcnEubHlHhMIWa+h6Y9TGNbE9rYVmsWAsBU9sr8AjRWHVAdNSBOh
+						p+TefRp8Ye5v03c3UlZjyIbx5Spm9QAYhYMUb0vpojyA66/z9wO/HB8aLBXHSG4y
+						AS7L7eU4xLi+dHfKZNXvg+Wg/vQK751vdfCyQixrZ8avNs9XZuHfj1PLR08yeiHt
+						y/U7Ucb1lPFS73qPC20bIYKVibA+Eq6lKLaM1pvZWXe6e8bEBr0pMopLijd0wY1E
+						N5dykwNxRUSMfiYtJTTAlQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
+						DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU/2Jr
+						YbAhODGffju6YFik2FQGaYowHwYDVR0jBBgwFoAU/2JrYbAhODGffju6YFik2FQG
+						aYowDQYJKoZIhvcNAQEFBQADggEBACVXwHUVWxnN2S12pCKs6AskooTV6cOa7K8n
+						LkJBPv3DG2hR6Na5rHfWepEJOFvW91KwWYonpxdwvyypDi1oiq8V3n+CO77Ub2zZ
+						5CaZnxM2hRiLTU5HgsUtYoAYxoFLvKAdDsziGfPboF98fWNnuKQprxQJp42pFOuZ
+						K/F3Kc+mrEHx768iQ+flVFeEV7zbzswJQzSQGVdT4PMggd201HHPB2QWAYUUD7r2
+						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>
+						MIIEEjCCAvqgAwIBAgIJAKikJalhNqxJMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
+						VQQGEwJHQjEXMBUGA1UECBMOTGVpY2VzdGVyc2hpcmUxEjAQBgNVBAcTCUxlaWNl
+						c3RlcjEgMB4GA1UEChMXVW5pdmVyc2l0eSBvZiBMZWljZXN0ZXIxFDASBgNVBAsT
+						C0lUIFNlcnZpY2VzMRUwEwYDVQQDEwxpZHAubGUuYWMudWswHhcNMTMwMzIyMTY0
+						MTI1WhcNMjMwMzIwMTY0MTI1WjCBiTELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDkxl
+						aWNlc3RlcnNoaXJlMRIwEAYDVQQHEwlMZWljZXN0ZXIxIDAeBgNVBAoTF1VuaXZl
+						cnNpdHkgb2YgTGVpY2VzdGVyMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEVMBMGA1UE
+						AxMMaWRwLmxlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						v48+1bJDraA824vOonzXfO8qI4tshOPN9ZfbQgSVQcC60FwZnpFYKxXSRsHNXS+g
+						6XAmqTFHmZ3XNcnEubHlHhMIWa+h6Y9TGNbE9rYVmsWAsBU9sr8AjRWHVAdNSBOh
+						p+TefRp8Ye5v03c3UlZjyIbx5Spm9QAYhYMUb0vpojyA66/z9wO/HB8aLBXHSG4y
+						AS7L7eU4xLi+dHfKZNXvg+Wg/vQK751vdfCyQixrZ8avNs9XZuHfj1PLR08yeiHt
+						y/U7Ucb1lPFS73qPC20bIYKVibA+Eq6lKLaM1pvZWXe6e8bEBr0pMopLijd0wY1E
+						N5dykwNxRUSMfiYtJTTAlQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
+						DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU/2Jr
+						YbAhODGffju6YFik2FQGaYowHwYDVR0jBBgwFoAU/2JrYbAhODGffju6YFik2FQG
+						aYowDQYJKoZIhvcNAQEFBQADggEBACVXwHUVWxnN2S12pCKs6AskooTV6cOa7K8n
+						LkJBPv3DG2hR6Na5rHfWepEJOFvW91KwWYonpxdwvyypDi1oiq8V3n+CO77Ub2zZ
+						5CaZnxM2hRiLTU5HgsUtYoAYxoFLvKAdDsziGfPboF98fWNnuKQprxQJp42pFOuZ
+						K/F3Kc+mrEHx768iQ+flVFeEV7zbzswJQzSQGVdT4PMggd201HHPB2QWAYUUD7r2
+						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>
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
new file mode 100644
index 00000000..439c1517
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lec.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnnerdYQQxQIZU5eVNTKYtAKY3LaWLGFJ
+						h20xeYu8DYnc79EbitOROhHYrg/ORw9Ns63bvaLsXPwj6MC+zo31AF67SvmvKI7C
+						5QqlXBaZVYPvgNEGIPYtqfMdEYBfnCea3Wfrc+R06IcLbC+NLJetv1M1BpzkfmSa
+						xwUA//pZ6iEYkta1StPwX7JwILQHXqNVDYH9QUldvOxyMsM+DpqY0pCnrBxoAvVO
+						15e6aLkLIs3OHzhkREomiu3N3K8Wt4ePkBy8PruVpODWf2Yl1qAbXHczo2jeR9S+
+						jgY8TRdblPn2WcKoZ6Xs0hQldlGzTcoPYREB3J671iI/0Qd4bBky9QIDAQABo2Ew
+						XzA+BgNVHREENzA1gg1pZHAubGVjLmFjLnVrhiRodHRwczovL2lkcC5sZWMuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNq8a16FuYh4F4H642sLTgWlIr5o
+						MA0GCSqGSIb3DQEBBQUAA4IBAQAgoPBw1rcnYM2LrNO4GjATEBUt9mX/OGXCR6ar
+						HrY/tEYn3kDIOukO3mjpVJXuxuRJEZZuG5+iCqb9/icgh7UPRZZ1pQS92JdtSvZk
+						CLZfaEih3jP3khZEzxPSnscMkMYyMxdMxcFIzrq/vt36gzCU5X2F5gO89jn++z2t
+						Ei8LRmUPKJ/czStcMTf8uS6Xy1jrIPoEUcqv8z9TFir+SWynz2NqLlRq8f/q3qNb
+						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>
+						MIIDIDCCAgigAwIBAgIVAOhCOyKOXTcMdnvggD4B9+FnzBWtMA0GCSqGSIb3DQEB
+						BQUAMBgxFjAUBgNVBAMTDWlkcC5sZWMuYWMudWswHhcNMTQwNjE5MTUyODQxWhcN
+						MzQwNjE5MTUyODQxWjAYMRYwFAYDVQQDEw1pZHAubGVjLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnnerdYQQxQIZU5eVNTKYtAKY3LaWLGFJ
+						h20xeYu8DYnc79EbitOROhHYrg/ORw9Ns63bvaLsXPwj6MC+zo31AF67SvmvKI7C
+						5QqlXBaZVYPvgNEGIPYtqfMdEYBfnCea3Wfrc+R06IcLbC+NLJetv1M1BpzkfmSa
+						xwUA//pZ6iEYkta1StPwX7JwILQHXqNVDYH9QUldvOxyMsM+DpqY0pCnrBxoAvVO
+						15e6aLkLIs3OHzhkREomiu3N3K8Wt4ePkBy8PruVpODWf2Yl1qAbXHczo2jeR9S+
+						jgY8TRdblPn2WcKoZ6Xs0hQldlGzTcoPYREB3J671iI/0Qd4bBky9QIDAQABo2Ew
+						XzA+BgNVHREENzA1gg1pZHAubGVjLmFjLnVrhiRodHRwczovL2lkcC5sZWMuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNq8a16FuYh4F4H642sLTgWlIr5o
+						MA0GCSqGSIb3DQEBBQUAA4IBAQAgoPBw1rcnYM2LrNO4GjATEBUt9mX/OGXCR6ar
+						HrY/tEYn3kDIOukO3mjpVJXuxuRJEZZuG5+iCqb9/icgh7UPRZZ1pQS92JdtSvZk
+						CLZfaEih3jP3khZEzxPSnscMkMYyMxdMxcFIzrq/vt36gzCU5X2F5gO89jn++z2t
+						Ei8LRmUPKJ/czStcMTf8uS6Xy1jrIPoEUcqv8z9TFir+SWynz2NqLlRq8f/q3qNb
+						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>
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
new file mode 100644
index 00000000..02533549
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.leedscitycollege.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,109 @@
+<?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>
+      <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>
+						MIIEgjCCA2qgAwIBAgIRALCBQlGXGrcD9c9LdG6adR0wDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzAzMTQwMDAwMDBaFw0xNjAzMTMyMzU5NTlaMEgxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEjMCEGA1UEAxMaaWRwLmxlZWRz
+						Y2l0eWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDAcpLEpdhaHKIAQ0gV+frjeHDaRPrZhXmb1u96oKsRwYqpyr6413IEYdRtkpYw
+						P65xLjyLn538zGAk1N9Z5gW7zjRQ+hFeI4jfyk19FIb+PNVhcCj+gwHQ5UbY+1Iw
+						rrRn8ODaIV0oA6c/XTYcdecJy1XRVKsOT2y/zAV+IsMXWD5fUWcJ6wqNYr7tU6fh
+						ltnrkY+jnsku7ACawXfJjKxcXnKe6mTGEKwYbKnOAGtngMu6lWJJ3pHGRsvnPyDK
+						a73kgwpTnwNFr1tZtconuHgEN2BQYjInvJYChNKBpGXEj5iSHSUgZgxmNxy/IuID
+						/p7S5/xZfNAH9rQV8zxq5QgjAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
+						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUU3P+wtUYFchRKsv6Q4LmIgFLpEcw
+						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCUGA1UdEQQeMByCGmlkcC5sZWVk
+						c2NpdHljb2xsZWdlLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQAZrvDhT0tAcl8+
+						WuPuV3YV9rSyzLakdOMu4LrTSXeXMbqjasyoX6ROcOYX9l2/Tgtc7kerFF5XTzkr
+						nrZoB3JsckEkljtxhrQhFLlZhHO55M8gli21jtczeZxoUCWwuoh8pKmOgXHoOi4f
+						eM4JIVwgyn0ZqelN4SlJwyb1Iw59qSSzLvwHnawHq0wGXwk3bWTaxQL0RdZoOGPN
+						noPr1FoKBvyZ9WDwZcjQ0gB2jfEzg6xEyQXYomxtEVPX06VItORVhuO4yGI7uHqO
+						rq6Bbi0IALgCSKEdElu6sVbcszLHW99ZrXp8YFbfOA0qCWaBhCYGqaauw90fKW1Z
+						wY23or2j
+					</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>
+						MIIEgjCCA2qgAwIBAgIRALCBQlGXGrcD9c9LdG6adR0wDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzAzMTQwMDAwMDBaFw0xNjAzMTMyMzU5NTlaMEgxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEjMCEGA1UEAxMaaWRwLmxlZWRz
+						Y2l0eWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDAcpLEpdhaHKIAQ0gV+frjeHDaRPrZhXmb1u96oKsRwYqpyr6413IEYdRtkpYw
+						P65xLjyLn538zGAk1N9Z5gW7zjRQ+hFeI4jfyk19FIb+PNVhcCj+gwHQ5UbY+1Iw
+						rrRn8ODaIV0oA6c/XTYcdecJy1XRVKsOT2y/zAV+IsMXWD5fUWcJ6wqNYr7tU6fh
+						ltnrkY+jnsku7ACawXfJjKxcXnKe6mTGEKwYbKnOAGtngMu6lWJJ3pHGRsvnPyDK
+						a73kgwpTnwNFr1tZtconuHgEN2BQYjInvJYChNKBpGXEj5iSHSUgZgxmNxy/IuID
+						/p7S5/xZfNAH9rQV8zxq5QgjAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
+						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUU3P+wtUYFchRKsv6Q4LmIgFLpEcw
+						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCUGA1UdEQQeMByCGmlkcC5sZWVk
+						c2NpdHljb2xsZWdlLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQAZrvDhT0tAcl8+
+						WuPuV3YV9rSyzLakdOMu4LrTSXeXMbqjasyoX6ROcOYX9l2/Tgtc7kerFF5XTzkr
+						nrZoB3JsckEkljtxhrQhFLlZhHO55M8gli21jtczeZxoUCWwuoh8pKmOgXHoOi4f
+						eM4JIVwgyn0ZqelN4SlJwyb1Iw59qSSzLvwHnawHq0wGXwk3bWTaxQL0RdZoOGPN
+						noPr1FoKBvyZ9WDwZcjQ0gB2jfEzg6xEyQXYomxtEVPX06VItORVhuO4yGI7uHqO
+						rq6Bbi0IALgCSKEdElu6sVbcszLHW99ZrXp8YFbfOA0qCWaBhCYGqaauw90fKW1Z
+						wY23or2j
+					</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>
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
new file mode 100644
index 00000000..6d57ae0a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lib.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,129 @@
+<?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>
+      <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>
+MIIEajCCA1KgAwIBAgIRANDI+WBJrLja3Za/spT310swDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzExMDYwMDAwMDBaFw0xNjExMDUyMzU5NTlaMDwxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOaWRwLmxpYi5j
+YXMuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2UiWcB63g2umI
+piuSQxJCqI1o14aO+Mw8olLBRIzlXILWvNLERmiGpoJLi/St+mtSBIGkfCglX2EB
+a3BSRu8y39Az8ZRjZIuG/VTnuAMKD9wJZceL8TVFnfX1zlj1SgLWvwnAyp2SFSh5
+y27JjbgBp8ClksUClyOUylzJZXybgaYHkDeCyZn7pAlxZyEeVFZwiC4hjoFXJ2gm
+OujJsC0X447F8Kvc6ke5c0UgoFILkXQoms658pgDBu2qHXuUh4A5lW6ODrylKibk
+ZChPVjRWBOSt7gehbgbAWV5zazX3+7uZ3afmAUer7FSQdreuOGIaWy/8U73KEe58
+LtwxyiO7AgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQUMY5I3fB9tUmaTSXXXh11pvaZPUswDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmlkcC5saWIuY2FzLmN6MA0GCSqG
+SIb3DQEBBQUAA4IBAQA+Vri4AZx75skYb+IXgYCSE1STg5WzXh8F8yNlU4I2bNc0
+dB+0yKtsx2NUOi5nQfri4D+2m6t8rH8XfB2EPZw8cgYBwtCG9WiZbWPOoq9rJA0y
+L25v25ABvthARggMuToDzEwGmyiAxYC+eBp/FxgluZ4XHCDYz867+t/LkrlzgIH8
+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>
+MIIEajCCA1KgAwIBAgIRANDI+WBJrLja3Za/spT310swDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzExMDYwMDAwMDBaFw0xNjExMDUyMzU5NTlaMDwxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOaWRwLmxpYi5j
+YXMuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2UiWcB63g2umI
+piuSQxJCqI1o14aO+Mw8olLBRIzlXILWvNLERmiGpoJLi/St+mtSBIGkfCglX2EB
+a3BSRu8y39Az8ZRjZIuG/VTnuAMKD9wJZceL8TVFnfX1zlj1SgLWvwnAyp2SFSh5
+y27JjbgBp8ClksUClyOUylzJZXybgaYHkDeCyZn7pAlxZyEeVFZwiC4hjoFXJ2gm
+OujJsC0X447F8Kvc6ke5c0UgoFILkXQoms658pgDBu2qHXuUh4A5lW6ODrylKibk
+ZChPVjRWBOSt7gehbgbAWV5zazX3+7uZ3afmAUer7FSQdreuOGIaWy/8U73KEe58
+LtwxyiO7AgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQUMY5I3fB9tUmaTSXXXh11pvaZPUswDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmlkcC5saWIuY2FzLmN6MA0GCSqG
+SIb3DQEBBQUAA4IBAQA+Vri4AZx75skYb+IXgYCSE1STg5WzXh8F8yNlU4I2bNc0
+dB+0yKtsx2NUOi5nQfri4D+2m6t8rH8XfB2EPZw8cgYBwtCG9WiZbWPOoq9rJA0y
+L25v25ABvthARggMuToDzEwGmyiAxYC+eBp/FxgluZ4XHCDYz867+t/LkrlzgIH8
+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>
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
new file mode 100644
index 00000000..b7bdbc2c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lincoln.ac.uk-oala-metadata.xml
@@ -0,0 +1,80 @@
+<?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>
+      <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>
+						MIIDSjCCAjKgAwIBAgIIc6UBcBsQyJgwDQYJKoZIhvcNAQEFBQAwPDEeMBwGA1UE
+						CgwVVW5pdmVyc2l0eSBvZiBMaW5jb2xuMRowGAYDVQQDDBFpZHAubGluY29sbi5h
+						Yy51azAeFw0xMzAxMjkxMDQ5MTFaFw0yMzAxMjkxMDQ5MTFaMDwxHjAcBgNVBAoM
+						FVVuaXZlcnNpdHkgb2YgTGluY29sbjEaMBgGA1UEAwwRaWRwLmxpbmNvbG4uYWMu
+						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmBWA3X5TBChNdRKB7
+						mFrqf85x00gTT72GwVFqsV7BEMZ2UvMqauSS0oWHsCmKr7Q34DcJ1ExFdEI5jfQW
+						InbW2b7AcmnE+oKJEbIhqKBEYeu5Hc/Dw03SyDPH+iSh9bx6EJaH5eugzF9U08tk
+						XME2DEduj3AUIWvUPK9Dv8JXv9VJODB0VtbydHqLNO5mFFarlmXiDeS1nfIP/EaG
+						cgpgeodbYQNksRwlCr+42CDmKEeL9xBPSHffl067Dhdn/BerjGfhhRPIcKGyqqW1
+						dIeIxf4dE7mSjU+Vgi9rAkYYiYmS6VZ+xqUOENBiwmB15U16Zn6RwWRfC+ws1QYl
+						ndEFAgMBAAGjUDBOMB0GA1UdDgQWBBTsQIaEu965VZKaGcma7WN0SOeXAjAfBgNV
+						HSMEGDAWgBTsQIaEu965VZKaGcma7WN0SOeXAjAMBgNVHRMEBTADAQH/MA0GCSqG
+						SIb3DQEBBQUAA4IBAQBOdgr9ODArnjsqvC2pl/UlyStM2J98FrkuliC5N8LXnKPV
+						GnJq8oBk3gt5y0q+79Om3jyN+olZl2htdSx2YWN742ft40532abT/B4/aItMqInZ
+						eZju9+41GQzhRVXwmJTsVIeJi7J4cHj8sVg+AppdfhM9gWfBcBaG+pHjrJPVAzwq
+						KKhlaB5h3oGZW8A6OWJda/+y8JhoAXQMNwP7TriiNxyHeDBhoHZDOwTGw5qMexeA
+						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>
+						MIIDSjCCAjKgAwIBAgIIc6UBcBsQyJgwDQYJKoZIhvcNAQEFBQAwPDEeMBwGA1UE
+						CgwVVW5pdmVyc2l0eSBvZiBMaW5jb2xuMRowGAYDVQQDDBFpZHAubGluY29sbi5h
+						Yy51azAeFw0xMzAxMjkxMDQ5MTFaFw0yMzAxMjkxMDQ5MTFaMDwxHjAcBgNVBAoM
+						FVVuaXZlcnNpdHkgb2YgTGluY29sbjEaMBgGA1UEAwwRaWRwLmxpbmNvbG4uYWMu
+						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmBWA3X5TBChNdRKB7
+						mFrqf85x00gTT72GwVFqsV7BEMZ2UvMqauSS0oWHsCmKr7Q34DcJ1ExFdEI5jfQW
+						InbW2b7AcmnE+oKJEbIhqKBEYeu5Hc/Dw03SyDPH+iSh9bx6EJaH5eugzF9U08tk
+						XME2DEduj3AUIWvUPK9Dv8JXv9VJODB0VtbydHqLNO5mFFarlmXiDeS1nfIP/EaG
+						cgpgeodbYQNksRwlCr+42CDmKEeL9xBPSHffl067Dhdn/BerjGfhhRPIcKGyqqW1
+						dIeIxf4dE7mSjU+Vgi9rAkYYiYmS6VZ+xqUOENBiwmB15U16Zn6RwWRfC+ws1QYl
+						ndEFAgMBAAGjUDBOMB0GA1UdDgQWBBTsQIaEu965VZKaGcma7WN0SOeXAjAfBgNV
+						HSMEGDAWgBTsQIaEu965VZKaGcma7WN0SOeXAjAMBgNVHRMEBTADAQH/MA0GCSqG
+						SIb3DQEBBQUAA4IBAQBOdgr9ODArnjsqvC2pl/UlyStM2J98FrkuliC5N8LXnKPV
+						GnJq8oBk3gt5y0q+79Om3jyN+olZl2htdSx2YWN742ft40532abT/B4/aItMqInZ
+						eZju9+41GQzhRVXwmJTsVIeJi7J4cHj8sVg+AppdfhM9gWfBcBaG+pHjrJPVAzwq
+						KKhlaB5h3oGZW8A6OWJda/+y8JhoAXQMNwP7TriiNxyHeDBhoHZDOwTGw5qMexeA
+						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>
diff --git a/swamid-interfederations-2.0/idp.lit.ie-saml2.xml b/swamid-interfederations-2.0/idp.lit.ie-saml2.xml
new file mode 100644
index 00000000..695791bd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lit.ie-saml2.xml
@@ -0,0 +1,70 @@
+<?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.edugate.ie/welcome-edugate-federation/membership</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">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>
+MIIDFDCCAfygAwIBAgIVAK59k/q1uMH3/ug2R0Sas9bw35KeMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5saXQuaWUwHhcNMTAwMjA0MTEyOTQxWhcNMzAw
+MjA0MTEyOTQxWjAVMRMwEQYDVQQDEwppZHAubGl0LmllMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA495mH78CGgvQeZvKrOJ4woldl2dp7Ci4QbHLGgTp
+KKfjO76MZHmgHkModQoSBefWldbJlVfWACYl9VbY068M7G1lzK6Zm53YYjOd8Ofx
+ZvQGJKdNwovc3mJj3JIUbKgFYGJB5RelSBiit8THDuIUVbiOjNdEKY5j88FRE7bq
+eOs38te8Mb4M7CmodPNY49L17bKdj9HTDMMy+Eb7K8cXm0tI13u662dv6Eo25gHh
+yOfW+D7yN6M9QpxYiwdGsdyEI1L+3RC2wyeXyD+BPehGFIIS6E98FPrm8aEb5VYF
+LSv6HM7Svh/OYD5SUg0vVaWRq3Zk0Qnh4h3/CjN8IA/BxQIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAubGl0LmllhiFodHRwczovL2lkcC5saXQuaWUvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFHxvq0yuTJFQfC4suTA1dPy6/UlwMA0GCSqGSIb3DQEB
+BQUAA4IBAQASBDPS14vXHejZhfmJEXVmnV23Zxm0Log8KQz23JKlTETQenL2kmPJ
+FRT2sqYb96vJO+p1oK3NuVHIrqb3/c9GsvieODItogGjMSbZxIE+NEzw6unBUkmu
+ytleOJgoRQpzmV1RYSRUEFC9fqM+a6g/2OEj44k48xyxgsrf2inNGm5h8J3xg92z
+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: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: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
new file mode 100644
index 00000000..fca45bdb
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ljmu.ac.uk-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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: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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEiDCCA3CgAwIBAgIQOBNA+hb81eyfqXol6z3klDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDcwNjAwMDAwMFoXDTE1MDcwNjIzNTk1OVowXjELMAkGA1UE
+						BhMCR0IxDjAMBgNVBAgTBUJBTkVTMQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdF
+						ZHVzZXJ2MR4wHAYDVQQDExVnYXRld2F5LmF0aGVuc2Ftcy5uZXQwggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbB17KWAYcAxwqBJLKiCNrX18NQpeYoJBv
+						6/ilSgtEYJxmcvS+dDFWoFoLCKJt+nfuoegPOZHTeNxyxmg4fMXw0PulVWgQxW0s
+						0zggonUc7VQ98Ny4rkBY0IpOcMzJv1leKk7w0mXfCGZwMacZ9uy5BpM84raTyOTz
+						P0MI28PjWTVAohhVK34CeUm0vUwVzemN0INctgyIdzEHlb6nteKCYKCnjsi2KTO8
+						spumdA3rcU/u+0rUR5auJ0ZsDtUMg7BQw0W6MAkcXEHuC5uGJuLSyhO3h1G1D5L4
+						5Xq5rKvV5FqyRP++hrEoiA2z3lMXtjxEaT4CELiiHbxdukaqw2aZAgMBAAGjggFo
+						MIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+						f4VPXF2nfnxOVFGmLcxxPaq5y+wwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+						MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+						KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIAYDVR0RBBkw
+						F4IVZ2F0ZXdheS5hdGhlbnNhbXMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQBDDpET
+						eseuUBypZlPJMfm2eg3jFIgJOTdxvMNU88EuLXTiSSgRWQAjy7QPHprkFiXUyOu5
+						EdBbXhuTcecRESOqM5pHxZulnWtrggXc9IGy7TzjxsrxFXb881qiVwGu7kiYPv1F
+						IwK6IQfbdbUXiTLNxrLogMYI4T7YwYkkKdA4nCy3aUuucz5uuIovLvLVrtZ9YN66
+						XWcW/d0prifYI70Cwo4ydOJgm0WbqllJRVnP5jI9+pDa1cX6tku8raFkDUZxJfU9
+						IlvryvkiiZTpoo7QOu6aJVAwU33BXcTQyEeCyp5PAvaeNJWCFpQ85gNSxJdVPIqm
+						6pd2Nd0SphPSYavr
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ljmu.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEiDCCA3CgAwIBAgIQOBNA+hb81eyfqXol6z3klDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDcwNjAwMDAwMFoXDTE1MDcwNjIzNTk1OVowXjELMAkGA1UE
+						BhMCR0IxDjAMBgNVBAgTBUJBTkVTMQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdF
+						ZHVzZXJ2MR4wHAYDVQQDExVnYXRld2F5LmF0aGVuc2Ftcy5uZXQwggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbB17KWAYcAxwqBJLKiCNrX18NQpeYoJBv
+						6/ilSgtEYJxmcvS+dDFWoFoLCKJt+nfuoegPOZHTeNxyxmg4fMXw0PulVWgQxW0s
+						0zggonUc7VQ98Ny4rkBY0IpOcMzJv1leKk7w0mXfCGZwMacZ9uy5BpM84raTyOTz
+						P0MI28PjWTVAohhVK34CeUm0vUwVzemN0INctgyIdzEHlb6nteKCYKCnjsi2KTO8
+						spumdA3rcU/u+0rUR5auJ0ZsDtUMg7BQw0W6MAkcXEHuC5uGJuLSyhO3h1G1D5L4
+						5Xq5rKvV5FqyRP++hrEoiA2z3lMXtjxEaT4CELiiHbxdukaqw2aZAgMBAAGjggFo
+						MIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+						f4VPXF2nfnxOVFGmLcxxPaq5y+wwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+						MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+						KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIAYDVR0RBBkw
+						F4IVZ2F0ZXdheS5hdGhlbnNhbXMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQBDDpET
+						eseuUBypZlPJMfm2eg3jFIgJOTdxvMNU88EuLXTiSSgRWQAjy7QPHprkFiXUyOu5
+						EdBbXhuTcecRESOqM5pHxZulnWtrggXc9IGy7TzjxsrxFXb881qiVwGu7kiYPv1F
+						IwK6IQfbdbUXiTLNxrLogMYI4T7YwYkkKdA4nCy3aUuucz5uuIovLvLVrtZ9YN66
+						XWcW/d0prifYI70Cwo4ydOJgm0WbqllJRVnP5jI9+pDa1cX6tku8raFkDUZxJfU9
+						IlvryvkiiZTpoo7QOu6aJVAwU33BXcTQyEeCyp5PAvaeNJWCFpQ85gNSxJdVPIqm
+						6pd2Nd0SphPSYavr
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <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.llgc.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.llgc.org.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..3a817cac
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.llgc.org.uk-idp-shibboleth.xml
@@ -0,0 +1,119 @@
+<?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"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFkDCCBHigAwIBAgIRAJAbJyWhTa7FroVXUgzOENkwDQYJKoZIhvcNAQEFBQAw
+						gYkxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+						BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMS8wLQYD
+						VQQDEyZDT01PRE8gSGlnaC1Bc3N1cmFuY2UgU2VjdXJlIFNlcnZlciBDQTAeFw0x
+						MDA2MDEwMDAwMDBaFw0xNTA2MDEyMzU5NTlaMIGqMQswCQYDVQQGEwJHQjERMA8G
+						A1UEERMIU3kyMyAzQlUxDjAMBgNVBAgTBUR5ZmVkMRQwEgYDVQQHEwtBYmVyeXN0
+						d3l0aDERMA8GA1UECRMIUGVuZ2xhaXMxIjAgBgNVBAoTGU5hdGlvbmFsIExpYnJh
+						cnkgb2YgV2FsZXMxETAPBgNVBAsTCEVsaXRlU1NMMRgwFgYDVQQDEw9pZHAubGxn
+						Yy5vcmcudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFhjhuGRw5
+						qenD29NXXk94tn+ko8FmfUKmgICU/vYrv28qQYzpCjXNBNM+7YLb0b9rbfpsYAlu
+						14augKCePL6/SDsADytEg+LGk6vUu1fx2Ai7OemNG/Qh4i0m64dVJV462K3gGFDZ
+						ndH6fYaFCsTTu98mplzwAo2gEXD8LJ77h5WQJUag1tdn4kX0oxKHx1yYhmd/Ez5+
+						kOqCcKeyQYfrBX9IjN7Aa8S76Hcq78hdPr3Iddk+tNXoQkc3UT+C+vGXiH0Fqb3P
+						kJFg5MGZ7SMICl0+xP4ab+czzPNZM2MV1G9rAOeaxYJgGWHfo2JqFcCbt3qPzGnl
+						GwY64hTKG6PJAgMBAAGjggHOMIIByjAfBgNVHSMEGDAWgBQ/1bXQ1kR5UEoXo5uM
+						Sty4sCJkazAdBgNVHQ4EFgQUgw25C/E0u56NvXHIhwDxizw+mTgwDgYDVR0PAQH/
+						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+						BwMCMEYGA1UdIAQ/MD0wOwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0
+						dHBzOi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTME8GA1UdHwRIMEYwRKBCoECGPmh0
+						dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
+						U2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0dHA6
+						Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2Vy
+						dmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20w
+						LwYDVR0RBCgwJoIPaWRwLmxsZ2Mub3JnLnVrghN3d3cuaWRwLmxsZ2Mub3JnLnVr
+						MA0GCSqGSIb3DQEBBQUAA4IBAQAWHF/OZHnIAEYvfyBMGEjGfPq9o7curQZ2dC4Y
+						M/KIXxOMO5K+vfIgzeaT/29UTChSr3JV4sEoiR9CU1/HBt8MclFIBeY8XN3n+gHF
+						yxE/mUsIHzE1xBoOrbm57k8XxyUxfFJCMrGPJ6Lu3K/c+WIGdnSnuCkaxuaMXpmQ
+						Fg4yG2iZ3bPR8y0TmAyA6hElym+sckkUEQaS4kzFnejqZL5YfC/pldVlaPRkdhpx
+						MICR8uZCPWtHedEqP/sXTaKO8DduRNirIIoliv0EkL1SBBrQ76vPSiuyKESWb9oN
+						iqBhvkH93dTGIvQBNM/fO1bCxn1UiK9qAf/4z5950Hj+/QEr
+					</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFkDCCBHigAwIBAgIRAJAbJyWhTa7FroVXUgzOENkwDQYJKoZIhvcNAQEFBQAw
+						gYkxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+						BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMS8wLQYD
+						VQQDEyZDT01PRE8gSGlnaC1Bc3N1cmFuY2UgU2VjdXJlIFNlcnZlciBDQTAeFw0x
+						MDA2MDEwMDAwMDBaFw0xNTA2MDEyMzU5NTlaMIGqMQswCQYDVQQGEwJHQjERMA8G
+						A1UEERMIU3kyMyAzQlUxDjAMBgNVBAgTBUR5ZmVkMRQwEgYDVQQHEwtBYmVyeXN0
+						d3l0aDERMA8GA1UECRMIUGVuZ2xhaXMxIjAgBgNVBAoTGU5hdGlvbmFsIExpYnJh
+						cnkgb2YgV2FsZXMxETAPBgNVBAsTCEVsaXRlU1NMMRgwFgYDVQQDEw9pZHAubGxn
+						Yy5vcmcudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFhjhuGRw5
+						qenD29NXXk94tn+ko8FmfUKmgICU/vYrv28qQYzpCjXNBNM+7YLb0b9rbfpsYAlu
+						14augKCePL6/SDsADytEg+LGk6vUu1fx2Ai7OemNG/Qh4i0m64dVJV462K3gGFDZ
+						ndH6fYaFCsTTu98mplzwAo2gEXD8LJ77h5WQJUag1tdn4kX0oxKHx1yYhmd/Ez5+
+						kOqCcKeyQYfrBX9IjN7Aa8S76Hcq78hdPr3Iddk+tNXoQkc3UT+C+vGXiH0Fqb3P
+						kJFg5MGZ7SMICl0+xP4ab+czzPNZM2MV1G9rAOeaxYJgGWHfo2JqFcCbt3qPzGnl
+						GwY64hTKG6PJAgMBAAGjggHOMIIByjAfBgNVHSMEGDAWgBQ/1bXQ1kR5UEoXo5uM
+						Sty4sCJkazAdBgNVHQ4EFgQUgw25C/E0u56NvXHIhwDxizw+mTgwDgYDVR0PAQH/
+						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+						BwMCMEYGA1UdIAQ/MD0wOwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0
+						dHBzOi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTME8GA1UdHwRIMEYwRKBCoECGPmh0
+						dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
+						U2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0dHA6
+						Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2Vy
+						dmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20w
+						LwYDVR0RBCgwJoIPaWRwLmxsZ2Mub3JnLnVrghN3d3cuaWRwLmxsZ2Mub3JnLnVr
+						MA0GCSqGSIb3DQEBBQUAA4IBAQAWHF/OZHnIAEYvfyBMGEjGfPq9o7curQZ2dC4Y
+						M/KIXxOMO5K+vfIgzeaT/29UTChSr3JV4sEoiR9CU1/HBt8MclFIBeY8XN3n+gHF
+						yxE/mUsIHzE1xBoOrbm57k8XxyUxfFJCMrGPJ6Lu3K/c+WIGdnSnuCkaxuaMXpmQ
+						Fg4yG2iZ3bPR8y0TmAyA6hElym+sckkUEQaS4kzFnejqZL5YfC/pldVlaPRkdhpx
+						MICR8uZCPWtHedEqP/sXTaKO8DduRNirIIoliv0EkL1SBBrQ76vPSiuyKESWb9oN
+						iqBhvkH93dTGIvQBNM/fO1bCxn1UiK9qAf/4z5950Hj+/QEr
+					</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: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
new file mode 100644
index 00000000..0780bb48
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lmc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?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>
+      <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
+						BAYTAkdCMRMwEQYDVQQIEwpMYW5jYXNoaXJlMRIwEAYDVQQHEwlMYW5jYXN0ZXIx
+						KDAmBgNVBAoTH0xhbmNhc3RlciBhbmQgTW9yZWNhbWJlIENvbGxlZ2UxFjAUBgNV
+						BAMTDWlkcC5sbWMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCluLZDgGWwGcgMVxaUrk6Sndi0cTm0e6pEfPMA4I+87qOhWIW8AXGwqqvR3e4g
+						+mq+iG5xSPfuUfY5/ydrfoHXJGkLPp6ahhvOeIzbnMUfCT4UDdjFkjwcFkBuO5rR
+						ggG09cK1XrIRK3RlYM/r2yyp/c8PjJvM6aIslqYCuuQkh5257IOfU8DUg4u9nUxJ
+						2PrPoMStJNDF6Z35wYbSAwpk8NkqkeYYcJFM/bSg034q3bv4f7wN+x3MTmw0i0dP
+						Aee4NWlEpj4O3bZHud3cl/pgStgYjcwk3LHGDlVFx6dRJXAhNHOtQR8i8nsmAwA7
+						h9xEepy066ZcXFeKPxdHCSxDAgMBAAGjggFqMIIBZjAfBgNVHSMEGDAWgBQMvZNo
+						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU1Ehkp2hbUZ/Lk8faPtBptPizvcUw
+						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIC
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDWlkcC5sbWMu
+						YWMudWswDQYJKoZIhvcNAQEFBQADggEBABsF25GfLllyt4c1UAjQWdR0nPerYNlV
+						EJ9xzPMJ5euw4U1CMjNBgmcFMSmiFO86QMjDCiFGO087LgHnSFqMSuI34FJUqWmL
+						eU/Nyks3DR/+IZ9NHeQmQxP7ttRVZLqBwWm5k31d+Ch/rgPrmsmL4X2L2o0pSQJ5
+						pJHYb3Q4TsFbreKBs8Bq7zeGKtMAoiZrjhP9QkXveWV590I9Hj6Z6Wpk9mcBN1Xx
+						EFiUYc67MpmwjkobQXpBBHhdZDq85pddff4kqd/rgjNbAWaBMZ3Db22msPvZkEcw
+						YplNVj4iVlAZp/HFmJURCXZDpHI10D7HTYsUQxZq3Ow+kCXXn2MCu9g=
+					</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
+						BAYTAkdCMRMwEQYDVQQIEwpMYW5jYXNoaXJlMRIwEAYDVQQHEwlMYW5jYXN0ZXIx
+						KDAmBgNVBAoTH0xhbmNhc3RlciBhbmQgTW9yZWNhbWJlIENvbGxlZ2UxFjAUBgNV
+						BAMTDWlkcC5sbWMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCluLZDgGWwGcgMVxaUrk6Sndi0cTm0e6pEfPMA4I+87qOhWIW8AXGwqqvR3e4g
+						+mq+iG5xSPfuUfY5/ydrfoHXJGkLPp6ahhvOeIzbnMUfCT4UDdjFkjwcFkBuO5rR
+						ggG09cK1XrIRK3RlYM/r2yyp/c8PjJvM6aIslqYCuuQkh5257IOfU8DUg4u9nUxJ
+						2PrPoMStJNDF6Z35wYbSAwpk8NkqkeYYcJFM/bSg034q3bv4f7wN+x3MTmw0i0dP
+						Aee4NWlEpj4O3bZHud3cl/pgStgYjcwk3LHGDlVFx6dRJXAhNHOtQR8i8nsmAwA7
+						h9xEepy066ZcXFeKPxdHCSxDAgMBAAGjggFqMIIBZjAfBgNVHSMEGDAWgBQMvZNo
+						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU1Ehkp2hbUZ/Lk8faPtBptPizvcUw
+						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIC
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDWlkcC5sbWMu
+						YWMudWswDQYJKoZIhvcNAQEFBQADggEBABsF25GfLllyt4c1UAjQWdR0nPerYNlV
+						EJ9xzPMJ5euw4U1CMjNBgmcFMSmiFO86QMjDCiFGO087LgHnSFqMSuI34FJUqWmL
+						eU/Nyks3DR/+IZ9NHeQmQxP7ttRVZLqBwWm5k31d+Ch/rgPrmsmL4X2L2o0pSQJ5
+						pJHYb3Q4TsFbreKBs8Bq7zeGKtMAoiZrjhP9QkXveWV590I9Hj6Z6Wpk9mcBN1Xx
+						EFiUYc67MpmwjkobQXpBBHhdZDq85pddff4kqd/rgjNbAWaBMZ3Db22msPvZkEcw
+						YplNVj4iVlAZp/HFmJURCXZDpHI10D7HTYsUQxZq3Ow+kCXXn2MCu9g=
+					</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>
diff --git a/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml
new file mode 100644
index 00000000..34d305e4
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml
@@ -0,0 +1,126 @@
+<?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>
+      <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">Linnæus 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 Linnæus University Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://lnu.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://lnu.se/?l=en</mdui:InformationURL>
+        <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>
+MIIEmzCCA4OgAwIBAgILAQAAAAABJCUIvfswDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
+bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5
+MTAwNTEzMzEwNVoXDTEyMTAwNTEzMzEwNVowTDELMAkGA1UEBhMCU0UxGzAZBgNV
+BAoTEkhvZ3Nrb2xhbiBpIEthbG1hcjELMAkGA1UECxMCSVQxEzARBgNVBAMTCmlk
+cC5sbnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRORVY50+Y
+2rmvFJS4HSE3EZKXb0UpVj2CfW9D4Vlww78CiqV0KV8HW53XHYlOUK7S+I94adaG
+XoXq19HjqjRi8979qfqzKwICRlkVFBnWkY7N5vo//pStClwdTNv+OihlDY+IA9HN
+QXrWjWTzHCbRguYBEmR0gp7l4tlqILkOCCx1yT5uia4EiJvrSFoIV/iYTQBLaGkc
+ZdO109GqUx5UJB5XxgUoT0k0rOgg1OHsOvkNGOV4/HzkwWUGIaJy462LlLBcmlXg
+IHfDCMH6lg9pBLig4nDlM2W0KzvMID7zagxFJG+K3eMjdkoK1mK12TTz24bifDpf
+XPnbSRKpkLYpAgMBAAGjggFpMIIBZTBQBgNVHSAESTBHMEUGByqGSLE+AQAwOjA4
+BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5
+L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVloz3XOxGjCgcl
+N8lCSlt2d1DhMB0GA1UdDgQWBBQCNc1rrFMLNldAEde83Hr98intIzA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2VkdWNhdGlvbmFs
+LmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6Ly9zZWN1cmUu
+Z2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAdBgNVHSUEFjAU
+BggrBgEFBQcDAQYIKwYBBQUHAwIwFQYDVR0RBA4wDIIKaWRwLmxudS5zZTANBgkq
+hkiG9w0BAQUFAAOCAQEAkvJr6ePi1/sSyKtaf1xdOGwde1AteooA0Z9CxG6Ddz2v
+fPbpffm08gnhXr8T2zFnjZN6r1ac3kBFSKQRWOfJiLWwjmJ6wbRYCVDjeTN++Tdf
+IZVsj7l5uyGfM2FjKwRd79Qy33KOb4KtcwgkUs6yqScb0Eeew9q+flkJItaEloaL
+nsANXWIYSHmsKeMX/1M+TqMOmUCOExgqTr4yHou54m2SdxcMGJgJp2jcmdF6gbjo
+091ewSnuK+fccVratYgDd4EX3J6uZQnICjIAJ9e44Ab1WhBPQ0Aa+W/52qjbT4yK
+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>
+MIIEmzCCA4OgAwIBAgILAQAAAAABJCUIvfswDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
+bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5
+MTAwNTEzMzEwNVoXDTEyMTAwNTEzMzEwNVowTDELMAkGA1UEBhMCU0UxGzAZBgNV
+BAoTEkhvZ3Nrb2xhbiBpIEthbG1hcjELMAkGA1UECxMCSVQxEzARBgNVBAMTCmlk
+cC5sbnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRORVY50+Y
+2rmvFJS4HSE3EZKXb0UpVj2CfW9D4Vlww78CiqV0KV8HW53XHYlOUK7S+I94adaG
+XoXq19HjqjRi8979qfqzKwICRlkVFBnWkY7N5vo//pStClwdTNv+OihlDY+IA9HN
+QXrWjWTzHCbRguYBEmR0gp7l4tlqILkOCCx1yT5uia4EiJvrSFoIV/iYTQBLaGkc
+ZdO109GqUx5UJB5XxgUoT0k0rOgg1OHsOvkNGOV4/HzkwWUGIaJy462LlLBcmlXg
+IHfDCMH6lg9pBLig4nDlM2W0KzvMID7zagxFJG+K3eMjdkoK1mK12TTz24bifDpf
+XPnbSRKpkLYpAgMBAAGjggFpMIIBZTBQBgNVHSAESTBHMEUGByqGSLE+AQAwOjA4
+BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5
+L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVloz3XOxGjCgcl
+N8lCSlt2d1DhMB0GA1UdDgQWBBQCNc1rrFMLNldAEde83Hr98intIzA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2VkdWNhdGlvbmFs
+LmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6Ly9zZWN1cmUu
+Z2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAdBgNVHSUEFjAU
+BggrBgEFBQcDAQYIKwYBBQUHAwIwFQYDVR0RBA4wDIIKaWRwLmxudS5zZTANBgkq
+hkiG9w0BAQUFAAOCAQEAkvJr6ePi1/sSyKtaf1xdOGwde1AteooA0Z9CxG6Ddz2v
+fPbpffm08gnhXr8T2zFnjZN6r1ac3kBFSKQRWOfJiLWwjmJ6wbRYCVDjeTN++Tdf
+IZVsj7l5uyGfM2FjKwRd79Qy33KOb4KtcwgkUs6yqScb0Eeew9q+flkJItaEloaL
+nsANXWIYSHmsKeMX/1M+TqMOmUCOExgqTr4yHou54m2SdxcMGJgJp2jcmdF6gbjo
+091ewSnuK+fccVratYgDd4EX3J6uZQnICjIAJ9e44Ab1WhBPQ0Aa+W/52qjbT4yK
+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">Linnæus 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>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
new file mode 100644
index 00000000..fab4032a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.london.ac.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAJCgNzs/ToqPMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEGlkcC5sb25kb24uYWMudWswHhcNMTIwNjIxMTMyODU4WhcNMjIwNjE5MTMy
+						ODU4WjAbMRkwFwYDVQQDExBpZHAubG9uZG9uLmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEA1LZ7Lmg5HanDG+ZqOnVenp96NaSrrj6ZFWMy9Vlj
+						1E37wy5ooUifd0ICIecUc6FDM7btoMuhRn4YWec7n2purs2O8p9LD11SthO+lwZO
+						qD6F2VzRYuV9KaaaganyoIgbJAt+UowXepcyZJy+wdmLu4neoBuoIfnigoCLnb+9
+						NkArvT91kJvFmKMWXEW9L9rO8vnsJRMcl9WU7VftLXUY4pXLm4C4QdpocFv8J2O1
+						2PIigtSKb4uUulaZpUZ3HfkzMqmkBB7RH1XZVR3l4NmmVs/82knDGv9BOr3hNWeq
+						/2HjRB8z2r2S/oDJ/20Ka8W+jkqCAbkFhxva6F/fDoB/BwIDAQABoz4wPDAbBgNV
+						HREEFDASghBpZHAubG9uZG9uLmFjLnVrMB0GA1UdDgQWBBS8mlo8ov/oCSegN5ZL
+						E7HMjHcdNzANBgkqhkiG9w0BAQUFAAOCAQEAP4E7FG9dDRTYo/w+s4qziV7Vh3IH
+						RYHPfTogu8x2ORmAuSlE6VlFSL5HgTUQcT/JQgAdVYErdGxj7BKTIu+JgwzWJI6W
+						Zh/tb3u2/4kNMGC84UuplJ1XCkltdaKn3Z3rYbowBM8lXrEckfvucE56e+MKNdjx
+						SX9iUs1YEIWsSFoZzjRfEoZi7+bVZ45o5dZWWyJc3wFzke3AjuIBmccAvbA8g6/S
+						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>
+						MIIC9zCCAd+gAwIBAgIJAJCgNzs/ToqPMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEGlkcC5sb25kb24uYWMudWswHhcNMTIwNjIxMTMyODU4WhcNMjIwNjE5MTMy
+						ODU4WjAbMRkwFwYDVQQDExBpZHAubG9uZG9uLmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEA1LZ7Lmg5HanDG+ZqOnVenp96NaSrrj6ZFWMy9Vlj
+						1E37wy5ooUifd0ICIecUc6FDM7btoMuhRn4YWec7n2purs2O8p9LD11SthO+lwZO
+						qD6F2VzRYuV9KaaaganyoIgbJAt+UowXepcyZJy+wdmLu4neoBuoIfnigoCLnb+9
+						NkArvT91kJvFmKMWXEW9L9rO8vnsJRMcl9WU7VftLXUY4pXLm4C4QdpocFv8J2O1
+						2PIigtSKb4uUulaZpUZ3HfkzMqmkBB7RH1XZVR3l4NmmVs/82knDGv9BOr3hNWeq
+						/2HjRB8z2r2S/oDJ/20Ka8W+jkqCAbkFhxva6F/fDoB/BwIDAQABoz4wPDAbBgNV
+						HREEFDASghBpZHAubG9uZG9uLmFjLnVrMB0GA1UdDgQWBBS8mlo8ov/oCSegN5ZL
+						E7HMjHcdNzANBgkqhkiG9w0BAQUFAAOCAQEAP4E7FG9dDRTYo/w+s4qziV7Vh3IH
+						RYHPfTogu8x2ORmAuSlE6VlFSL5HgTUQcT/JQgAdVYErdGxj7BKTIu+JgwzWJI6W
+						Zh/tb3u2/4kNMGC84UuplJ1XCkltdaKn3Z3rYbowBM8lXrEckfvucE56e+MKNdjx
+						SX9iUs1YEIWsSFoZzjRfEoZi7+bVZ45o5dZWWyJc3wFzke3AjuIBmccAvbA8g6/S
+						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>
diff --git a/swamid-interfederations-2.0/idp.londonmet.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.londonmet.ac.uk-entity.xml
new file mode 100644
index 00000000..7250e131
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.londonmet.ac.uk-entity.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCR+B1vhlwrPAclk8E8
+						caI6LAji53lGsQxavp7cQoBl7zmZq8V7vH+MkgT+uapudGHd18RBAeUETvsYnD7V
+						+hzefC6B77OfzFuO1WRWsKrUQg+V21Q1kgxPZZTFoJEEjogCOhkmGFy+hpyTljmD
+						ykP9wxq8nT6Oow0aQy987spH1+E1dd4F6GCLphhs0UrwGzAAkC/k5rX9dfMQ8TS0
+						uyj7bxG8cT3wvjbDtpQ1sjd70wm3qNSgF/Hsj+GpXP8L7J/mBdOUsqIFW8TSfFxT
+						4zIBkDyAp1k2zDu/iIN5K+luD5KKB7ReYuEDLYxBbjgaMqqb2G3J1A3Bfhx140O7
+						q59hAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkcC5sb25kb25tZXQuYWMudWuGKmh0
+						dHBzOi8vaWRwLmxvbmRvbm1ldC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
+						FgQUVZtYAu6CRSMuMvOOlHw1d6h0MrAwDQYJKoZIhvcNAQEFBQADggEBAGc6MFMQ
+						Q2A8YhaN13qv5pb3BP580s3mmw0kLgbwM9/tirmmIIjazYjHVUcz7IJugVy13siE
+						MFDc0dxKK/9ExXHYS1qvGJPEoMsmzliUBOV6yIesRHw39hK9vUbKV5sb8ahok9Qc
+						DMo2Oi6eF88nwgd3Gee6F973E5g2UEcJGDfN/KTK/b5kmxXtaR/+QGjz1Vzmtm+t
+						nTG9ggzmeCJvWcmldZSYOKchXZPTvYi6n0coTblLIYzo30miElRLEajmiMLxR9xg
+						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>
+						MIIDNzCCAh+gAwIBAgIUDHdfCxkdKbK8wHhVtq9PRTUWSm0wDQYJKoZIhvcNAQEF
+						BQAwHjEcMBoGA1UEAxMTaWRwLmxvbmRvbm1ldC5hYy51azAeFw0xMDA4MjYxNTA3
+						NDZaFw0zMDA4MjYxNTA3NDZaMB4xHDAaBgNVBAMTE2lkcC5sb25kb25tZXQuYWMu
+						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCR+B1vhlwrPAclk8E8
+						caI6LAji53lGsQxavp7cQoBl7zmZq8V7vH+MkgT+uapudGHd18RBAeUETvsYnD7V
+						+hzefC6B77OfzFuO1WRWsKrUQg+V21Q1kgxPZZTFoJEEjogCOhkmGFy+hpyTljmD
+						ykP9wxq8nT6Oow0aQy987spH1+E1dd4F6GCLphhs0UrwGzAAkC/k5rX9dfMQ8TS0
+						uyj7bxG8cT3wvjbDtpQ1sjd70wm3qNSgF/Hsj+GpXP8L7J/mBdOUsqIFW8TSfFxT
+						4zIBkDyAp1k2zDu/iIN5K+luD5KKB7ReYuEDLYxBbjgaMqqb2G3J1A3Bfhx140O7
+						q59hAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkcC5sb25kb25tZXQuYWMudWuGKmh0
+						dHBzOi8vaWRwLmxvbmRvbm1ldC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
+						FgQUVZtYAu6CRSMuMvOOlHw1d6h0MrAwDQYJKoZIhvcNAQEFBQADggEBAGc6MFMQ
+						Q2A8YhaN13qv5pb3BP580s3mmw0kLgbwM9/tirmmIIjazYjHVUcz7IJugVy13siE
+						MFDc0dxKK/9ExXHYS1qvGJPEoMsmzliUBOV6yIesRHw39hK9vUbKV5sb8ahok9Qc
+						DMo2Oi6eF88nwgd3Gee6F973E5g2UEcJGDfN/KTK/b5kmxXtaR/+QGjz1Vzmtm+t
+						nTG9ggzmeCJvWcmldZSYOKchXZPTvYi6n0coTblLIYzo30miElRLEajmiMLxR9xg
+						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>
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
new file mode 100644
index 00000000..49ad4e1f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.longroad.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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>
+						MIIDMzCCAhugAwIBAgIUCy8kggY2RBllD2ewV21UpOU1mlkwDQYJKoZIhvcNAQEF
+						BQAwHTEbMBkGA1UEAxMSaWRwLmxvbmdyb2FkLmFjLnVrMB4XDTExMDUxMzA4MTI0
+						M1oXDTMxMDUxMzA4MTI0M1owHTEbMBkGA1UEAxMSaWRwLmxvbmdyb2FkLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgcmsqS7ONbUBSlCFn4+5
+						ndvJvVgknMjZVZZulScLs3K1R7cJifMh/njFVDxdZ2fFBFwstUmUljjiM/GgBPGj
+						GMVEysJRzOiuTVaON3t/hE918o6DDZpkIcAC7JRuo9OL21K70WsJV9J1dqmx9t5n
+						e+rj/s/w0HB3GOR/3J2B9xbkX16B7wXBBZILhRcFy4nd1wFOCmurSC20o6iUwBsH
+						9lEVQlx/Es4o9sa8+U+5qtnQGDEiy2l9R7Em1lrpAnFpqM6n7C9kh4sMsIdGRFy5
+						0Q/4hSMRGNWyExP29Ipa0A6r8bfSlnN4lMo1QZMjBXS1NNHnVEpnafmO+CwyWL20
+						bwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAubG9uZ3JvYWQuYWMudWuGKWh0dHBz
+						Oi8vaWRwLmxvbmdyb2FkLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQe
+						dOgyl13wsMnik57R8aImPj76cjANBgkqhkiG9w0BAQUFAAOCAQEAEz5uJOOUmPsn
+						7Mq0h2FY8mDrwmVFTNismazFxmCEykDZON1baS6wnKjQC22w/MWJ8gq0NEwY/If2
+						fg3ZL7L6eEKWPHf10HNi1HdlgdQ6JWf5I/CLnccrQdwAfeeJ4O/1qtscXpylqp5y
+						AesJcymZxwcqQ+rWxFvxXKhk4RNabImkitFqxngqOfEaML+hL0OMlsO9GJbUgUPn
+						KrvGzcxIUT2L7hWBAIkM3rhBUkcEXLJzVcLPXW122Wcjr5gk6/il9cyveqANRbiB
+						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>
+						MIIDMzCCAhugAwIBAgIUCy8kggY2RBllD2ewV21UpOU1mlkwDQYJKoZIhvcNAQEF
+						BQAwHTEbMBkGA1UEAxMSaWRwLmxvbmdyb2FkLmFjLnVrMB4XDTExMDUxMzA4MTI0
+						M1oXDTMxMDUxMzA4MTI0M1owHTEbMBkGA1UEAxMSaWRwLmxvbmdyb2FkLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgcmsqS7ONbUBSlCFn4+5
+						ndvJvVgknMjZVZZulScLs3K1R7cJifMh/njFVDxdZ2fFBFwstUmUljjiM/GgBPGj
+						GMVEysJRzOiuTVaON3t/hE918o6DDZpkIcAC7JRuo9OL21K70WsJV9J1dqmx9t5n
+						e+rj/s/w0HB3GOR/3J2B9xbkX16B7wXBBZILhRcFy4nd1wFOCmurSC20o6iUwBsH
+						9lEVQlx/Es4o9sa8+U+5qtnQGDEiy2l9R7Em1lrpAnFpqM6n7C9kh4sMsIdGRFy5
+						0Q/4hSMRGNWyExP29Ipa0A6r8bfSlnN4lMo1QZMjBXS1NNHnVEpnafmO+CwyWL20
+						bwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAubG9uZ3JvYWQuYWMudWuGKWh0dHBz
+						Oi8vaWRwLmxvbmdyb2FkLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQe
+						dOgyl13wsMnik57R8aImPj76cjANBgkqhkiG9w0BAQUFAAOCAQEAEz5uJOOUmPsn
+						7Mq0h2FY8mDrwmVFTNismazFxmCEykDZON1baS6wnKjQC22w/MWJ8gq0NEwY/If2
+						fg3ZL7L6eEKWPHf10HNi1HdlgdQ6JWf5I/CLnccrQdwAfeeJ4O/1qtscXpylqp5y
+						AesJcymZxwcqQ+rWxFvxXKhk4RNabImkitFqxngqOfEaML+hL0OMlsO9GJbUgUPn
+						KrvGzcxIUT2L7hWBAIkM3rhBUkcEXLJzVcLPXW122Wcjr5gk6/il9cyveqANRbiB
+						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>
diff --git a/swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml
new file mode 100644
index 00000000..fe68c6fd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml
@@ -0,0 +1,236 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDE4WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DWxyemlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx
+t8+GWafraqMospDHenrOrAISX5HeJurj9I5SVF5gwJVrcgHy6/AOyU/MbrCBL/2O
+tlJCDsg4s8eBZQwx6a1nBbRHzxSmthMr6JDA0+y0FwGzOgUhF/XjEvHMHlIR49HR
+3f5LkO/ZBGWhWulJwD3ERQN0/1BcZMXvRceyqgqpwsLzNBwLwp2YUjoZwRnDMWdu
+Uzy5e0l41lXPhLu+99lO0XnYO5bMai1px2u//w8wtVYxkYRqJ6g1EvrpWJXVTGq2
+E5ezNX80ErAt2ttPP2YAchLxHOax/FOlor8q5Wwo60jkQxIIBTbY9W5ab19WHU52
+32z126AigkiXCMEkcz15AgMBAAGjggKHMIICgzBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFL7jMwPY5/3ueZLsMMbBt+vZ
+IbKwMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MHYGA1UdEQRvMG2C
+CmlkcC5scnouZGWCC2lkcDEubHJ6LmRlggtpZHAyLmxyei5kZYINbHJ6aWRwLmxy
+ei5kZYIObHJ6aWRwMS5scnouZGWCDmxyemlkcDIubHJ6LmRlgRZ6YnZ3LWNlcnQt
+YWRtaW5AbHJ6LmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2Rw
+Mi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUH
+AQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
+UC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS9scnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQELBQADggEBADrPD4GN7XpZSyxGBvHy+7fMrJNxyWybTsHkyiAI
+XGUF/jn9m7Bnvucb60PzyzJ5aD63AsaeSxSXDyYpNzne93O1aEtXyveTeFhbRyx1
+Wcf5G1KbRbljULRatUJSOggUWO4HerToAobx4xXyFrD7aPQkGGFVnqemjOnE4A4e
+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
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDE4WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DWxyemlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx
+t8+GWafraqMospDHenrOrAISX5HeJurj9I5SVF5gwJVrcgHy6/AOyU/MbrCBL/2O
+tlJCDsg4s8eBZQwx6a1nBbRHzxSmthMr6JDA0+y0FwGzOgUhF/XjEvHMHlIR49HR
+3f5LkO/ZBGWhWulJwD3ERQN0/1BcZMXvRceyqgqpwsLzNBwLwp2YUjoZwRnDMWdu
+Uzy5e0l41lXPhLu+99lO0XnYO5bMai1px2u//w8wtVYxkYRqJ6g1EvrpWJXVTGq2
+E5ezNX80ErAt2ttPP2YAchLxHOax/FOlor8q5Wwo60jkQxIIBTbY9W5ab19WHU52
+32z126AigkiXCMEkcz15AgMBAAGjggKHMIICgzBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFL7jMwPY5/3ueZLsMMbBt+vZ
+IbKwMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MHYGA1UdEQRvMG2C
+CmlkcC5scnouZGWCC2lkcDEubHJ6LmRlggtpZHAyLmxyei5kZYINbHJ6aWRwLmxy
+ei5kZYIObHJ6aWRwMS5scnouZGWCDmxyemlkcDIubHJ6LmRlgRZ6YnZ3LWNlcnQt
+YWRtaW5AbHJ6LmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2Rw
+Mi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUH
+AQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
+UC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS9scnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQELBQADggEBADrPD4GN7XpZSyxGBvHy+7fMrJNxyWybTsHkyiAI
+XGUF/jn9m7Bnvucb60PzyzJ5aD63AsaeSxSXDyYpNzne93O1aEtXyveTeFhbRyx1
+Wcf5G1KbRbljULRatUJSOggUWO4HerToAobx4xXyFrD7aPQkGGFVnqemjOnE4A4e
+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:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.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
+ZW4uZGUwHhcNMTQwOTI0MTMwNDE4WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DWxyemlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx
+t8+GWafraqMospDHenrOrAISX5HeJurj9I5SVF5gwJVrcgHy6/AOyU/MbrCBL/2O
+tlJCDsg4s8eBZQwx6a1nBbRHzxSmthMr6JDA0+y0FwGzOgUhF/XjEvHMHlIR49HR
+3f5LkO/ZBGWhWulJwD3ERQN0/1BcZMXvRceyqgqpwsLzNBwLwp2YUjoZwRnDMWdu
+Uzy5e0l41lXPhLu+99lO0XnYO5bMai1px2u//w8wtVYxkYRqJ6g1EvrpWJXVTGq2
+E5ezNX80ErAt2ttPP2YAchLxHOax/FOlor8q5Wwo60jkQxIIBTbY9W5ab19WHU52
+32z126AigkiXCMEkcz15AgMBAAGjggKHMIICgzBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFL7jMwPY5/3ueZLsMMbBt+vZ
+IbKwMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MHYGA1UdEQRvMG2C
+CmlkcC5scnouZGWCC2lkcDEubHJ6LmRlggtpZHAyLmxyei5kZYINbHJ6aWRwLmxy
+ei5kZYIObHJ6aWRwMS5scnouZGWCDmxyemlkcDIubHJ6LmRlgRZ6YnZ3LWNlcnQt
+YWRtaW5AbHJ6LmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2Rw
+Mi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUH
+AQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
+UC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS9scnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQELBQADggEBADrPD4GN7XpZSyxGBvHy+7fMrJNxyWybTsHkyiAI
+XGUF/jn9m7Bnvucb60PzyzJ5aD63AsaeSxSXDyYpNzne93O1aEtXyveTeFhbRyx1
+Wcf5G1KbRbljULRatUJSOggUWO4HerToAobx4xXyFrD7aPQkGGFVnqemjOnE4A4e
+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
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDE4WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DWxyemlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx
+t8+GWafraqMospDHenrOrAISX5HeJurj9I5SVF5gwJVrcgHy6/AOyU/MbrCBL/2O
+tlJCDsg4s8eBZQwx6a1nBbRHzxSmthMr6JDA0+y0FwGzOgUhF/XjEvHMHlIR49HR
+3f5LkO/ZBGWhWulJwD3ERQN0/1BcZMXvRceyqgqpwsLzNBwLwp2YUjoZwRnDMWdu
+Uzy5e0l41lXPhLu+99lO0XnYO5bMai1px2u//w8wtVYxkYRqJ6g1EvrpWJXVTGq2
+E5ezNX80ErAt2ttPP2YAchLxHOax/FOlor8q5Wwo60jkQxIIBTbY9W5ab19WHU52
+32z126AigkiXCMEkcz15AgMBAAGjggKHMIICgzBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFL7jMwPY5/3ueZLsMMbBt+vZ
+IbKwMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MHYGA1UdEQRvMG2C
+CmlkcC5scnouZGWCC2lkcDEubHJ6LmRlggtpZHAyLmxyei5kZYINbHJ6aWRwLmxy
+ei5kZYIObHJ6aWRwMS5scnouZGWCDmxyemlkcDIubHJ6LmRlgRZ6YnZ3LWNlcnQt
+YWRtaW5AbHJ6LmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2Rw
+Mi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUH
+AQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
+UC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS9scnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQELBQADggEBADrPD4GN7XpZSyxGBvHy+7fMrJNxyWybTsHkyiAI
+XGUF/jn9m7Bnvucb60PzyzJ5aD63AsaeSxSXDyYpNzne93O1aEtXyveTeFhbRyx1
+Wcf5G1KbRbljULRatUJSOggUWO4HerToAobx4xXyFrD7aPQkGGFVnqemjOnE4A4e
+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>
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
new file mode 100644
index 00000000..9eb67567
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lse.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlEbVYJtb1MiMtwXEx9Yd1M1s7/Nbqq+f
+						kbVrYD3FG/zmlEIfL3rLtt2f6xua8UdbG9FucQrogdxNLVmmSQKEulFmJXO7RorK
+						R0+btAil7XVP06YF0wgOZi2jHZkuatoM8H45Q8WaXfijmcTqBPyIPB3FrscFE/Ax
+						JRWMNWuJ172jImtyWxb438XrLn6aOVowHh2m+12T3wvYmPy0BP5sOtyK0jVPNGww
+						OopeQBvAUH/35rpOY57wdUZOTtGHw9+kbhNmoPJnFcHUYzd2ceIE6ABsowmi1CvV
+						dekaT50917AVQ+eEJ03HhEEuDOEsUPE+a9PXNe984ksY6spErmYiPQIDAQABo2Ew
+						XzA+BgNVHREENzA1gg1pZHAubHNlLmFjLnVrhiRodHRwczovL2lkcC5sc2UuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNPKiYRcER1YftSyU3ApwXhpGiY0
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCGcS5ACz6Hx/2QSMHu0RjHievcqfW86iZ26+PX
+						/XrS9MEl7FTUffx4kNril2hUl3c60QcaJVW0YO/axfD8404RntxUzcXFkCNNb/8J
+						oUKxcXtadsn6fgr+uRorkZdmVpmn5ZdEkENEr/4r61gf60JD+zqOr5+M2/95UwpQ
+						VA9B2QyUbBz7Gv6jTSsT0GPwlOnnSLkLrqu/pSewfJh7CJMJfJC3Op3aTX/MLNS4
+						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>
+						MIIDIDCCAgigAwIBAgIVAMcU7xA7jz0MTrgM81ujFT/gZtT/MA0GCSqGSIb3DQEB
+						BQUAMBgxFjAUBgNVBAMTDWlkcC5sc2UuYWMudWswHhcNMTEwMTI3MTAyMjI5WhcN
+						MzEwMTI3MTAyMjI5WjAYMRYwFAYDVQQDEw1pZHAubHNlLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlEbVYJtb1MiMtwXEx9Yd1M1s7/Nbqq+f
+						kbVrYD3FG/zmlEIfL3rLtt2f6xua8UdbG9FucQrogdxNLVmmSQKEulFmJXO7RorK
+						R0+btAil7XVP06YF0wgOZi2jHZkuatoM8H45Q8WaXfijmcTqBPyIPB3FrscFE/Ax
+						JRWMNWuJ172jImtyWxb438XrLn6aOVowHh2m+12T3wvYmPy0BP5sOtyK0jVPNGww
+						OopeQBvAUH/35rpOY57wdUZOTtGHw9+kbhNmoPJnFcHUYzd2ceIE6ABsowmi1CvV
+						dekaT50917AVQ+eEJ03HhEEuDOEsUPE+a9PXNe984ksY6spErmYiPQIDAQABo2Ew
+						XzA+BgNVHREENzA1gg1pZHAubHNlLmFjLnVrhiRodHRwczovL2lkcC5sc2UuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNPKiYRcER1YftSyU3ApwXhpGiY0
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCGcS5ACz6Hx/2QSMHu0RjHievcqfW86iZ26+PX
+						/XrS9MEl7FTUffx4kNril2hUl3c60QcaJVW0YO/axfD8404RntxUzcXFkCNNb/8J
+						oUKxcXtadsn6fgr+uRorkZdmVpmn5ZdEkENEr/4r61gf60JD+zqOr5+M2/95UwpQ
+						VA9B2QyUbBz7Gv6jTSsT0GPwlOnnSLkLrqu/pSewfJh7CJMJfJC3Op3aTX/MLNS4
+						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>
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
new file mode 100644
index 00000000..12eee269
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth-xfr.xml
@@ -0,0 +1,132 @@
+<?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>
+      <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
+						bmUxFDASBgNVBAsTC0lUIFNlcnZpY2VzMRkwFwYDVQQDExBpZHAyLmxzaHRtLmFj
+						LnVrMB4XDTEyMTEyMTEwMDQ0N1oXDTIyMTExOTEwMDQ0N1owgZkxCzAJBgNVBAYT
+						AkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjE3MDUGA1UEChMu
+						TG9uZG9uIFNjaG9vbCBvZiBIeWdpZW5lIGFuZCBUcm9waWNhbCBNZWRpY2luZTEU
+						MBIGA1UECxMLSVQgU2VydmljZXMxGTAXBgNVBAMTEGlkcDIubHNodG0uYWMudWsw
+						ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC5wsziZNYSjQ6zZruTNpCa
+						Tg/mA8we3vEAMzb8oNoqfoevqwMop2biprlaJk7E9kVmu1ZO2t6vTPucBfb/Oqyo
+						GzRnKlyVGxfCe/yrQ557z3y99xS5jGzu7kOoInpAp9q6tqrqns1A3OEeJSuJ1MJ8
+						ED053xEiSeL0+jSzkXkZVMCXu2p6kJsW5nT3qhqVrXiaGiB02TAOQMs0mmA8aS1h
+						j0bU5gFxKxazt1WYpFW82bSlSd2fz9pOmGklmW5JZxb4Zw8MFbiRfQ1LPwFgZH6E
+						+WJqdPb5fehXkklll9o4xO64bXlGfaRl0+5QGtbnqpix37QaDuQRi+NLUkA2wR2L
+						/rFJvo6uKsAdTuixfU/gNs0CCqVGi2C0/sQaTsE2Ct8H7BYEmrhqHs4VDzvcDq1L
+						2LqMvc4KEEd/Cp6EavaRKI7Edtu4OFUgAgECfbv0C7oouqSHR6X4ciDFfSWk7i92
+						3h5tMHX3wfUHJR/YI/mvguDo61wjnpbwgeAV4rNLsdBUOs5AQTCPUDAuyMepm81t
+						IQRT/XsNuKv4f9y4ORSpBZ/KspE9P5TklIMDuSvZKS8FZQ5ve4UQeUoer7Bn55ot
+						vFTxRrioFUBsmR/5yAsZLJnSU7z09wv3SG1Lj6O79Q9HoJ5M7rKap3+yFkfFqxSP
+						KH7JJd9yDiYVaA0f1R1VfQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
+						DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUJTj9
+						QFp335nQW77uAnSfAmeytCowHwYDVR0jBBgwFoAUJTj9QFp335nQW77uAnSfAmey
+						tCowDQYJKoZIhvcNAQEFBQADggIBALR0fEhYAGrXCqw9r2IjsXG0h4Kqv298t7Wd
+						fV5Qal71yD2vqVgZBjyoUt6FwQ0GPKhMc/q7Ooy8lfo8NSvZV983MSyWe519xTJ4
+						vtPJtKHd2WKYacrdRFPZJYjtTR4CwMXtwxsB2xJrpaJa/sSyRHvE4+PuUBYOj42t
+						k6MOk3t1GKfaoYOmJBd2teVym9K5bRqGk6WgnKg+jzPDXJy3+kKvZMZKsv7aYafu
+						m2PFoRJu1Nm+6jjTy33SVH3ZS4oydL+uZWfwKvQEqbLOGdRJTZYlDJR2mz6zISbf
+						1+LjnK1aqDETq+loatD4gntbpwoMTBMceoDVyRmlPkuFDF31lzkwyAlE5yFmhC9q
+						mUNMvsbtYJe546ftf+fyRW/PnZaBRqY1Hkk5lBU4BIgt+gk9jqiAae+DvQ4dikLP
+						DWDef3bPLitQA/e/F5YmYq61L7TeIdIiDtD42y5qUW7x+pMTd042EpmoWL9XbdMe
+						tvHx33GTkXDFqg88t/lPD8nN9evHWcPvUL1YS3AvJJ9u1Ttiq+agvGDxClgqa2i/
+						VZd/+nl8pnTI4n7VsiMMSFnBra1FQFoTwvaAHBotttYutz+jPAo/jQRaD+AqAqj3
+						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>
+						MIIGMjCCBBqgAwIBAgIJAMDPoGjJOgX6MA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
+						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xNzA1BgNV
+						BAoTLkxvbmRvbiBTY2hvb2wgb2YgSHlnaWVuZSBhbmQgVHJvcGljYWwgTWVkaWNp
+						bmUxFDASBgNVBAsTC0lUIFNlcnZpY2VzMRkwFwYDVQQDExBpZHAyLmxzaHRtLmFj
+						LnVrMB4XDTEyMTEyMTEwMDQ0N1oXDTIyMTExOTEwMDQ0N1owgZkxCzAJBgNVBAYT
+						AkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjE3MDUGA1UEChMu
+						TG9uZG9uIFNjaG9vbCBvZiBIeWdpZW5lIGFuZCBUcm9waWNhbCBNZWRpY2luZTEU
+						MBIGA1UECxMLSVQgU2VydmljZXMxGTAXBgNVBAMTEGlkcDIubHNodG0uYWMudWsw
+						ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC5wsziZNYSjQ6zZruTNpCa
+						Tg/mA8we3vEAMzb8oNoqfoevqwMop2biprlaJk7E9kVmu1ZO2t6vTPucBfb/Oqyo
+						GzRnKlyVGxfCe/yrQ557z3y99xS5jGzu7kOoInpAp9q6tqrqns1A3OEeJSuJ1MJ8
+						ED053xEiSeL0+jSzkXkZVMCXu2p6kJsW5nT3qhqVrXiaGiB02TAOQMs0mmA8aS1h
+						j0bU5gFxKxazt1WYpFW82bSlSd2fz9pOmGklmW5JZxb4Zw8MFbiRfQ1LPwFgZH6E
+						+WJqdPb5fehXkklll9o4xO64bXlGfaRl0+5QGtbnqpix37QaDuQRi+NLUkA2wR2L
+						/rFJvo6uKsAdTuixfU/gNs0CCqVGi2C0/sQaTsE2Ct8H7BYEmrhqHs4VDzvcDq1L
+						2LqMvc4KEEd/Cp6EavaRKI7Edtu4OFUgAgECfbv0C7oouqSHR6X4ciDFfSWk7i92
+						3h5tMHX3wfUHJR/YI/mvguDo61wjnpbwgeAV4rNLsdBUOs5AQTCPUDAuyMepm81t
+						IQRT/XsNuKv4f9y4ORSpBZ/KspE9P5TklIMDuSvZKS8FZQ5ve4UQeUoer7Bn55ot
+						vFTxRrioFUBsmR/5yAsZLJnSU7z09wv3SG1Lj6O79Q9HoJ5M7rKap3+yFkfFqxSP
+						KH7JJd9yDiYVaA0f1R1VfQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
+						DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUJTj9
+						QFp335nQW77uAnSfAmeytCowHwYDVR0jBBgwFoAUJTj9QFp335nQW77uAnSfAmey
+						tCowDQYJKoZIhvcNAQEFBQADggIBALR0fEhYAGrXCqw9r2IjsXG0h4Kqv298t7Wd
+						fV5Qal71yD2vqVgZBjyoUt6FwQ0GPKhMc/q7Ooy8lfo8NSvZV983MSyWe519xTJ4
+						vtPJtKHd2WKYacrdRFPZJYjtTR4CwMXtwxsB2xJrpaJa/sSyRHvE4+PuUBYOj42t
+						k6MOk3t1GKfaoYOmJBd2teVym9K5bRqGk6WgnKg+jzPDXJy3+kKvZMZKsv7aYafu
+						m2PFoRJu1Nm+6jjTy33SVH3ZS4oydL+uZWfwKvQEqbLOGdRJTZYlDJR2mz6zISbf
+						1+LjnK1aqDETq+loatD4gntbpwoMTBMceoDVyRmlPkuFDF31lzkwyAlE5yFmhC9q
+						mUNMvsbtYJe546ftf+fyRW/PnZaBRqY1Hkk5lBU4BIgt+gk9jqiAae+DvQ4dikLP
+						DWDef3bPLitQA/e/F5YmYq61L7TeIdIiDtD42y5qUW7x+pMTd042EpmoWL9XbdMe
+						tvHx33GTkXDFqg88t/lPD8nN9evHWcPvUL1YS3AvJJ9u1Ttiq+agvGDxClgqa2i/
+						VZd/+nl8pnTI4n7VsiMMSFnBra1FQFoTwvaAHBotttYutz+jPAo/jQRaD+AqAqj3
+						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>
diff --git a/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..cefe0786
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth.xml
@@ -0,0 +1,127 @@
+<?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>
+      <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
+						bmUxFDASBgNVBAsTC0lUIFNlcnZpY2VzMRgwFgYDVQQDEw9pZHAubHNodG0uYWMu
+						dWswHhcNMTIxMTIxMTAwMjI4WhcNMjIxMTE5MTAwMjI4WjCBmDELMAkGA1UEBhMC
+						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMTcwNQYDVQQKEy5M
+						b25kb24gU2Nob29sIG9mIEh5Z2llbmUgYW5kIFRyb3BpY2FsIE1lZGljaW5lMRQw
+						EgYDVQQLEwtJVCBTZXJ2aWNlczEYMBYGA1UEAxMPaWRwLmxzaHRtLmFjLnVrMIIC
+						IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuTPyCuj1pH4dZ7MqyEruIQ69
+						eHqslz6CkseYXZypQGILVKF7i/QCdfE82mklM0GF5a8KaBvp6F1TNBpOVfe5Wx8y
+						/CqIwfoLqTHtTOwIoBSQTCbcqje8lUR+oP7gA4a+uF7AVurnZOrNFvYJaMvDuYcb
+						RmChofGrsUYUVPYVEC7cT+T4lEZkO7ntQ9SN7If0INa/E2uiHOAmrYTQ9+l6u/nN
+						ri9Lpc+N6Pg5BDwvgztDmQMiDhtMjHVZ4MxHqRlUiSY6m+IPot7YjSJ3XDOrXhrg
+						0zIhmSj0Zm/0htH5jq3yGwbNiVgvf/9r2hM4LC+VyqwCXnk3cUWC1zQZeV6lCy9c
+						ihPen6r9qkShVRzIk788rJfCMDPggPIJXXVs7TosSH+lPgOIcSw18nMPCOb5/iUj
+						nyqGTVrAKEft5o16HpYyivhkJTFoz2msPem1GUztLt+ueZmUir4RCk5Hu1sodoo5
+						UDzRHtsjzBVZ7W3a3y5dYtyxtYkDWKLM46Zew8/qp34wT785zId1WkqYoj+RMFp/
+						3p+zvJK9ykS/I1mW5/6yjZ5rLebw6vhfJzQq3aN40clFkXGAij/VLepgPY8T3F+G
+						fa9UPPI+7s/3GLAGw20bHF3TLhbTPScUt/8uCfZsoHdrFFR9jIu47+RhF08phF2+
+						S90ucfkr77Mka+ZVD4kCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0E
+						HxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFEpDJ6JR
+						dIQLh7IAXnC3xWabzxvcMB8GA1UdIwQYMBaAFEpDJ6JRdIQLh7IAXnC3xWabzxvc
+						MA0GCSqGSIb3DQEBBQUAA4ICAQBpoHHOOMfP6RopKhCLcLDIAfy2VRjv2xcPbyd+
+						pvdti1mIlhdEhNeH7Nn2OekU8Ruh2eKfv9K+6T+zBdrRkYMsGelbtNFZXKkV/OZ3
+						G9lV6KMy1YmvMOEfgf7S7CmIIBaPQ5XDlNI8lyT6If3MaG2p6Z/GsskPGWHMnQWS
+						eTs3dzFLCLCfYzXFBO5oOYJvqLtiXvkDGBj0hVCF3cbQIqICzcT2q3VVF2/EXdtY
+						bClJsI0PXDbmuKqaVxSVBy2BfnkK9iB1QDw3SKvpUNd2ZFeNDRC0ggOwuHXu+fyp
+						ZKdiZ/0LkwtAhnYyYTSip/5d+4Plu6ymqr1ENTyRS8ij5zq8J5rF5DJ+AieBm9uk
+						DSwjsWlCgKwsDdccuSNvapok2As29jGzYbT950jAbkNi4wHjhHDMbbWv5W4EPncU
+						22QW7z+Z+wbR7DtCcoBhoVhHCtYFDzBrFv/emwSLMtdTV/CcCrT6yU7Ds8ogulmw
+						a9gqoEHyBVMKxO2OdzPUtLKvGgr6CdTDJCVnb0b6N900lEJuNQaCMTiqH/C/yj4b
+						fh6K0G6HKsASieVW3J4GUBjwzkcbbAGsJmJG08O6pgxvPPZdUOyF9Omna9aSblwb
+						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>
+						MIIGMDCCBBigAwIBAgIJAIUFHfw4Gj9WMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
+						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xNzA1BgNV
+						BAoTLkxvbmRvbiBTY2hvb2wgb2YgSHlnaWVuZSBhbmQgVHJvcGljYWwgTWVkaWNp
+						bmUxFDASBgNVBAsTC0lUIFNlcnZpY2VzMRgwFgYDVQQDEw9pZHAubHNodG0uYWMu
+						dWswHhcNMTIxMTIxMTAwMjI4WhcNMjIxMTE5MTAwMjI4WjCBmDELMAkGA1UEBhMC
+						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMTcwNQYDVQQKEy5M
+						b25kb24gU2Nob29sIG9mIEh5Z2llbmUgYW5kIFRyb3BpY2FsIE1lZGljaW5lMRQw
+						EgYDVQQLEwtJVCBTZXJ2aWNlczEYMBYGA1UEAxMPaWRwLmxzaHRtLmFjLnVrMIIC
+						IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuTPyCuj1pH4dZ7MqyEruIQ69
+						eHqslz6CkseYXZypQGILVKF7i/QCdfE82mklM0GF5a8KaBvp6F1TNBpOVfe5Wx8y
+						/CqIwfoLqTHtTOwIoBSQTCbcqje8lUR+oP7gA4a+uF7AVurnZOrNFvYJaMvDuYcb
+						RmChofGrsUYUVPYVEC7cT+T4lEZkO7ntQ9SN7If0INa/E2uiHOAmrYTQ9+l6u/nN
+						ri9Lpc+N6Pg5BDwvgztDmQMiDhtMjHVZ4MxHqRlUiSY6m+IPot7YjSJ3XDOrXhrg
+						0zIhmSj0Zm/0htH5jq3yGwbNiVgvf/9r2hM4LC+VyqwCXnk3cUWC1zQZeV6lCy9c
+						ihPen6r9qkShVRzIk788rJfCMDPggPIJXXVs7TosSH+lPgOIcSw18nMPCOb5/iUj
+						nyqGTVrAKEft5o16HpYyivhkJTFoz2msPem1GUztLt+ueZmUir4RCk5Hu1sodoo5
+						UDzRHtsjzBVZ7W3a3y5dYtyxtYkDWKLM46Zew8/qp34wT785zId1WkqYoj+RMFp/
+						3p+zvJK9ykS/I1mW5/6yjZ5rLebw6vhfJzQq3aN40clFkXGAij/VLepgPY8T3F+G
+						fa9UPPI+7s/3GLAGw20bHF3TLhbTPScUt/8uCfZsoHdrFFR9jIu47+RhF08phF2+
+						S90ucfkr77Mka+ZVD4kCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0E
+						HxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFEpDJ6JR
+						dIQLh7IAXnC3xWabzxvcMB8GA1UdIwQYMBaAFEpDJ6JRdIQLh7IAXnC3xWabzxvc
+						MA0GCSqGSIb3DQEBBQUAA4ICAQBpoHHOOMfP6RopKhCLcLDIAfy2VRjv2xcPbyd+
+						pvdti1mIlhdEhNeH7Nn2OekU8Ruh2eKfv9K+6T+zBdrRkYMsGelbtNFZXKkV/OZ3
+						G9lV6KMy1YmvMOEfgf7S7CmIIBaPQ5XDlNI8lyT6If3MaG2p6Z/GsskPGWHMnQWS
+						eTs3dzFLCLCfYzXFBO5oOYJvqLtiXvkDGBj0hVCF3cbQIqICzcT2q3VVF2/EXdtY
+						bClJsI0PXDbmuKqaVxSVBy2BfnkK9iB1QDw3SKvpUNd2ZFeNDRC0ggOwuHXu+fyp
+						ZKdiZ/0LkwtAhnYyYTSip/5d+4Plu6ymqr1ENTyRS8ij5zq8J5rF5DJ+AieBm9uk
+						DSwjsWlCgKwsDdccuSNvapok2As29jGzYbT950jAbkNi4wHjhHDMbbWv5W4EPncU
+						22QW7z+Z+wbR7DtCcoBhoVhHCtYFDzBrFv/emwSLMtdTV/CcCrT6yU7Ds8ogulmw
+						a9gqoEHyBVMKxO2OdzPUtLKvGgr6CdTDJCVnb0b6N900lEJuNQaCMTiqH/C/yj4b
+						fh6K0G6HKsASieVW3J4GUBjwzkcbbAGsJmJG08O6pgxvPPZdUOyF9Omna9aSblwb
+						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>
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
new file mode 100644
index 00000000..17f8b2c2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lstonline.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+    <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>
+      <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
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk7ao0zPOg1uysBKB
+						GF4fCHFBuREEWFmSzvqWzQZfyL2TepKrRHxcVEkDZLPvqQMz5Bhelk6u6XFabTWD
+						ywFho2LCk5xHax03ZT/tdkK8GgmopqgyLMSfrKBm0QLFrFne14x3fPUUriiEUAAI
+						5j1AyIusiwBeOJjSz4qh2wQIshL1XsacTpNQtyYb72Ov88gAIsqogc5G24P1xq5d
+						DfOS4tjLgcdZsVUzuCI4nKjrHcVYY0fRTYx8VilH3vYYOZKs8jQ3m79v7KEYBll5
+						DBH7/PoALisut/Bi6jA2nqnrhGT/E7HqeCg8yvoDu7PXz1/Hzs6xiCCCMxRlfCMx
+						/rW/zQIDAQABo20wazAdBgNVHQ4EFgQUlxTFQwycWjBKkLREWm0D6sqE61UwSgYD
+						VR0RBEMwQYITaWRwLmxzdG9ubGluZS5hYy51a4YqaHR0cHM6Ly9pZHAubHN0b25s
+						aW5lLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQBXemp0
+						xzsyQQtxp0BPTGZoPvrV+0mb6q6gWKe6A/zus00SIUSxioMUjS2oiGEsyzWlsP8Q
+						9nmbseTtzz4Bw1cpynOjqCvvJ8/eTdvMCGFEGzknth5ww+dJN/r/9sVDycrTPxyl
+						/z1b8ikFMqNrrkv/Er7r4ldUeoF/skojOBQ5BcHu1D4WRVYpjNlX39nAyjw8pgFc
+						D9r34nfY53dQOgrGUneQtqTLueqQfdonEE/I0IiouehnZ8EjBNMWI2sRHJYsim5a
+						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>
+						MIIDODCCAiCgAwIBAgIVAMFlYrF0zZoa942kcmsKFS6POLrtMA0GCSqGSIb3DQEB
+						BQUAMB4xHDAaBgNVBAMME2lkcC5sc3RvbmxpbmUuYWMudWswHhcNMTQwODE4MDk1
+						NjM3WhcNMzQwODE4MDk1NjM3WjAeMRwwGgYDVQQDDBNpZHAubHN0b25saW5lLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk7ao0zPOg1uysBKB
+						GF4fCHFBuREEWFmSzvqWzQZfyL2TepKrRHxcVEkDZLPvqQMz5Bhelk6u6XFabTWD
+						ywFho2LCk5xHax03ZT/tdkK8GgmopqgyLMSfrKBm0QLFrFne14x3fPUUriiEUAAI
+						5j1AyIusiwBeOJjSz4qh2wQIshL1XsacTpNQtyYb72Ov88gAIsqogc5G24P1xq5d
+						DfOS4tjLgcdZsVUzuCI4nKjrHcVYY0fRTYx8VilH3vYYOZKs8jQ3m79v7KEYBll5
+						DBH7/PoALisut/Bi6jA2nqnrhGT/E7HqeCg8yvoDu7PXz1/Hzs6xiCCCMxRlfCMx
+						/rW/zQIDAQABo20wazAdBgNVHQ4EFgQUlxTFQwycWjBKkLREWm0D6sqE61UwSgYD
+						VR0RBEMwQYITaWRwLmxzdG9ubGluZS5hYy51a4YqaHR0cHM6Ly9pZHAubHN0b25s
+						aW5lLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQBXemp0
+						xzsyQQtxp0BPTGZoPvrV+0mb6q6gWKe6A/zus00SIUSxioMUjS2oiGEsyzWlsP8Q
+						9nmbseTtzz4Bw1cpynOjqCvvJ8/eTdvMCGFEGzknth5ww+dJN/r/9sVDycrTPxyl
+						/z1b8ikFMqNrrkv/Er7r4ldUeoF/skojOBQ5BcHu1D4WRVYpjNlX39nAyjw8pgFc
+						D9r34nfY53dQOgrGUneQtqTLueqQfdonEE/I0IiouehnZ8EjBNMWI2sRHJYsim5a
+						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</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.lu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lu.se-idp-shibboleth.xml
new file mode 100644
index 00000000..e137cdac
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lu.se-idp-shibboleth.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <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:Logo height="78" width="450" xml:lang="sv">http://www2.ldc.lu.se/images/LU_swe_logo_450px.jpg</mdui:Logo>
+        <mdui:Logo height="78" width="382" xml:lang="en">http://www2.ldc.lu.se/images/LU_eng_logo_382px.jpg</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">lu lth</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">lu lth</mdui:Keywords>
+      </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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIVAPx05QNy/rJ5REDxNwYau5tDh3VUMA0GCSqGSIb3DQEB
+BQUAMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTAeFw0xNDA5MTEwNjAwNDhaFw0zNDA5
+MTEwNjAwNDhaMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKpuswtBZvLMD+yzqjQKm/qVOb43dhPlUorjNDA1Vg5N
+f6x+E0HBZfrhK5O2lXevCbK5yE1dAi8Se/3AH/hJYkz+OaQT1QfryvQsbqD6hgN3
+9oXCC8e66vI6PGa1lRrPKK+1xLkWFfnFJtDEGUyGsyZ/1upkyjiaxfegN7gYNOFj
+QBtIQUHwbkITLGbWJBEMGbgaYd77M8zOBDwHh1TNC/9elCVTaU2UMYOLqBmdR1Hl
+o+q3nHjpOlJ4Q85FMhdcOlrzTi43TWDuc1nxgIeGG94+o3ekDBUi7jMIaIgwwBpr
+ExtI/Im319D2l2L9xPrX6Qe+yyPYs+SB7zr0Qxm4YO8CAwEAAaNZMFcwNgYDVR0R
+BC8wLYIJaWRwLmx1LnNlhiBodHRwczovL2lkcC5sdS5zZS9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUQWUHLXRD0hRwmWtwxFuwf6Kfbd4wDQYJKoZIhvcNAQEFBQAD
+ggEBAB6WOo99LL70V31BADdWiag7Tnq8e+T/cLhb8z4vJk9tD3OJBuNMf1u0yUms
+JJ0gHTM7ctaF/i4XvvCQOgzfZ28yV5QtHpQe38DicVYxWuRRjQ/DYv4no0p4LMat
+CVDEnkB0AHo0XyPi2w/tqup96cbROdgsWo6I/2aatRwrgdG+7T9pL5V+AWeb4Htc
+g+KO8Z/ICMfvzv9w/cP7c9oErCABjLd1y/wUh/YbY4yCgJbZLftm0gjDwGhioj6x
+jofk6rzliDsjfc7aVImQ98eiwlA4GQW2MOnbbQM7PtW3BFax+SJlpJUDcqa379Ol
+u5Q6EI4vlsIGVG1PKyXIIIpgDyQ=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.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://idp.lu.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lu.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.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://idp.lu.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lu.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">lu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIVAPx05QNy/rJ5REDxNwYau5tDh3VUMA0GCSqGSIb3DQEB
+BQUAMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTAeFw0xNDA5MTEwNjAwNDhaFw0zNDA5
+MTEwNjAwNDhaMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKpuswtBZvLMD+yzqjQKm/qVOb43dhPlUorjNDA1Vg5N
+f6x+E0HBZfrhK5O2lXevCbK5yE1dAi8Se/3AH/hJYkz+OaQT1QfryvQsbqD6hgN3
+9oXCC8e66vI6PGa1lRrPKK+1xLkWFfnFJtDEGUyGsyZ/1upkyjiaxfegN7gYNOFj
+QBtIQUHwbkITLGbWJBEMGbgaYd77M8zOBDwHh1TNC/9elCVTaU2UMYOLqBmdR1Hl
+o+q3nHjpOlJ4Q85FMhdcOlrzTi43TWDuc1nxgIeGG94+o3ekDBUi7jMIaIgwwBpr
+ExtI/Im319D2l2L9xPrX6Qe+yyPYs+SB7zr0Qxm4YO8CAwEAAaNZMFcwNgYDVR0R
+BC8wLYIJaWRwLmx1LnNlhiBodHRwczovL2lkcC5sdS5zZS9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUQWUHLXRD0hRwmWtwxFuwf6Kfbd4wDQYJKoZIhvcNAQEFBQAD
+ggEBAB6WOo99LL70V31BADdWiag7Tnq8e+T/cLhb8z4vJk9tD3OJBuNMf1u0yUms
+JJ0gHTM7ctaF/i4XvvCQOgzfZ28yV5QtHpQe38DicVYxWuRRjQ/DYv4no0p4LMat
+CVDEnkB0AHo0XyPi2w/tqup96cbROdgsWo6I/2aatRwrgdG+7T9pL5V+AWeb4Htc
+g+KO8Z/ICMfvzv9w/cP7c9oErCABjLd1y/wUh/YbY4yCgJbZLftm0gjDwGhioj6x
+jofk6rzliDsjfc7aVImQ98eiwlA4GQW2MOnbbQM7PtW3BFax+SJlpJUDcqa379Ol
+u5Q6EI4vlsIGVG1PKyXIIIpgDyQ=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lu.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">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="technical">
+    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:servicedesk@lu.se</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
new file mode 100644
index 00000000..6fdf49b0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.macclesfield.ac.uk-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						c2ZpZWxkLmFjLnVrMB4XDTEzMDIwNzExMjYwOFoXDTMzMDIwMjExMjYwOFoweDEL
+						MAkGA1UEBhMCR0IxETAPBgNVBAgTCENoZXNoaXJlMRUwEwYDVQQHEwxNYWNjbGVz
+						ZmllbGQxHTAbBgNVBAoTFE1hY2NsZXNmaWVsZCBDb2xsZWdlMSAwHgYDVQQDExdp
+						ZHAyLm1hY2NsZXNmaWVsZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAMDM05odoeteSlOjg3QAARLG25Ze052B7oef9N8SJe9qktTJsCp8lrzo
+						QXR/CN/8XCRGiysNEtD5+dts4Vt16EU5eB3oknVjFwJ2tm14fAsOJkhYxEeL89oQ
+						mGBS0DR5H+O8JFHwTVgYWaMK8Biei81MISIWo0QFgY/lhM4msVbJLmNfbWKvp2bU
+						RQBOIv+zUYiLvESt1ZlXOiFZdJHvXJBhN5xV834x28KJMhsPtuGNI/NcHOpJ7gfy
+						QIS2aDn03hws2UmfFSaNo5Fbv69FmF1b1RNzdl/E91aj2xrwq/kCslBd0qvGVBQS
+						B3zaZvXN+zkvmfm6oqvrzo+ohdozk1kCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						Cbl1ic6Me2HZNOyy42mLGWip6BRF3AmyRlAjYEnGOWjrbjnljF40C2ggFNFnpZZt
+						TiRd7Ovzvbm+xJJiA3TiHiEZcmTH00DG6mEiqpan71wxkMvDrGD3c1KTVk4ALXwb
+						aSPz1JNIrw9XlX+JD6rXr9rH6aUPx7ckWi5nrodY6fW89WDiEtx7WOkDc1Zj77Gq
+						JDpIl002iw2tQp+TRHDUD4Kc73JKc8IuJBDhxSedztn/jyZFfciIHBNMjaBQsd3n
+						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>
+						MIIDbDCCAlQCCQD/7vODco0h7zANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
+						QjERMA8GA1UECBMIQ2hlc2hpcmUxFTATBgNVBAcTDE1hY2NsZXNmaWVsZDEdMBsG
+						A1UEChMUTWFjY2xlc2ZpZWxkIENvbGxlZ2UxIDAeBgNVBAMTF2lkcDIubWFjY2xl
+						c2ZpZWxkLmFjLnVrMB4XDTEzMDIwNzExMjYwOFoXDTMzMDIwMjExMjYwOFoweDEL
+						MAkGA1UEBhMCR0IxETAPBgNVBAgTCENoZXNoaXJlMRUwEwYDVQQHEwxNYWNjbGVz
+						ZmllbGQxHTAbBgNVBAoTFE1hY2NsZXNmaWVsZCBDb2xsZWdlMSAwHgYDVQQDExdp
+						ZHAyLm1hY2NsZXNmaWVsZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAMDM05odoeteSlOjg3QAARLG25Ze052B7oef9N8SJe9qktTJsCp8lrzo
+						QXR/CN/8XCRGiysNEtD5+dts4Vt16EU5eB3oknVjFwJ2tm14fAsOJkhYxEeL89oQ
+						mGBS0DR5H+O8JFHwTVgYWaMK8Biei81MISIWo0QFgY/lhM4msVbJLmNfbWKvp2bU
+						RQBOIv+zUYiLvESt1ZlXOiFZdJHvXJBhN5xV834x28KJMhsPtuGNI/NcHOpJ7gfy
+						QIS2aDn03hws2UmfFSaNo5Fbv69FmF1b1RNzdl/E91aj2xrwq/kCslBd0qvGVBQS
+						B3zaZvXN+zkvmfm6oqvrzo+ohdozk1kCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						Cbl1ic6Me2HZNOyy42mLGWip6BRF3AmyRlAjYEnGOWjrbjnljF40C2ggFNFnpZZt
+						TiRd7Ovzvbm+xJJiA3TiHiEZcmTH00DG6mEiqpan71wxkMvDrGD3c1KTVk4ALXwb
+						aSPz1JNIrw9XlX+JD6rXr9rH6aUPx7ckWi5nrodY6fW89WDiEtx7WOkDc1Zj77Gq
+						JDpIl002iw2tQp+TRHDUD4Kc73JKc8IuJBDhxSedztn/jyZFfciIHBNMjaBQsd3n
+						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>
diff --git a/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml
new file mode 100644
index 00000000..538ea2a5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml
@@ -0,0 +1,124 @@
+<?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:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <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">http://cdn.mah.se/images/header/en/logo_en.jpg</mdui:Logo>
+        <mdui:Logo height="195" width="132" xml:lang="sv">http://cdn.mah.se/images/header/sv/logo_sv.jpg</mdui:Logo>
+        <mdui:Logo height="195" width="132" xml:lang="en">http://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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAPnyQUYFvhTnodaw9FJqcA/57Yh5MA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5tYWguc2UwHhcNMTAwOTI5MDczODU0WhcNMzAw
+OTI5MDczODU0WjAVMRMwEQYDVQQDEwppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAgaMWnEn2Fhn7xNG/PFpKOkACs3I9Rd2AspSE0NPD
+q3EuNx50kXrfeRxFsSntWy1PTQ8XYI1FONZx3l21CSmwsNSYa4coAsHC8U4yBN9b
+c1f/Q+7KQod+Q08cWJ75aiw0zvRl547bWfh0n5v1L21G+0fFUvY/6t5gN/HgHJZA
+9jZNZwVSzteivEmgooiJqXaUM7njWs15Ee1pTO6ib4w8eYj3AJuhWe58W3+Rc6xk
+5u5H/3LZiPMHiTnrqG2Ux+gFJStc5PXWO6NxiCOWtDufmJ6OcPrGkVMJ8LoZvQ1J
+OThRimq3OmaATe03wGqTRP3xHXqRSQPlXEIb86sSPnDU5wIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAubWFoLnNlhiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFHwHbhAp4egiLmh0CawPk430y+D8MA0GCSqGSIb3DQEB
+BQUAA4IBAQA0Hxjvk2Muuzwgyv8Nhvmeb43+qwvqIa+rCSJxZpEpR5xGyMLTApLL
+oRYlPGQIQUj8u8HFtcdRVmc/OWG0NhyBe9OiwFjcGlsdINZiyYm+4whwRrbt6/dn
+ykhKvjQMhX2x/0SjyrA/LjifpZB3VMN6qdRrGY082I7X5tZmmqyoWk/rED4WxL3u
++j+6GUcWJOdPBAO4uBqUGzw9tvjXHE2nm5eQlKkk+138vFHkeb1fDrDthXuN9f03
+Ttm2GRc6B4kC8/rlYS5Li9yd8QY1yGPnbgLlW5lxOZbJQxdwiUcGCRDoUB1BC9NY
+dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
+
+                    </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-POST-SimpleSign" Location="https://idp.mah.se/idp/profile/SAML2/POST-SimpleSign/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 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mah.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAPnyQUYFvhTnodaw9FJqcA/57Yh5MA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5tYWguc2UwHhcNMTAwOTI5MDczODU0WhcNMzAw
+OTI5MDczODU0WjAVMRMwEQYDVQQDEwppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAgaMWnEn2Fhn7xNG/PFpKOkACs3I9Rd2AspSE0NPD
+q3EuNx50kXrfeRxFsSntWy1PTQ8XYI1FONZx3l21CSmwsNSYa4coAsHC8U4yBN9b
+c1f/Q+7KQod+Q08cWJ75aiw0zvRl547bWfh0n5v1L21G+0fFUvY/6t5gN/HgHJZA
+9jZNZwVSzteivEmgooiJqXaUM7njWs15Ee1pTO6ib4w8eYj3AJuhWe58W3+Rc6xk
+5u5H/3LZiPMHiTnrqG2Ux+gFJStc5PXWO6NxiCOWtDufmJ6OcPrGkVMJ8LoZvQ1J
+OThRimq3OmaATe03wGqTRP3xHXqRSQPlXEIb86sSPnDU5wIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAubWFoLnNlhiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFHwHbhAp4egiLmh0CawPk430y+D8MA0GCSqGSIb3DQEB
+BQUAA4IBAQA0Hxjvk2Muuzwgyv8Nhvmeb43+qwvqIa+rCSJxZpEpR5xGyMLTApLL
+oRYlPGQIQUj8u8HFtcdRVmc/OWG0NhyBe9OiwFjcGlsdINZiyYm+4whwRrbt6/dn
+ykhKvjQMhX2x/0SjyrA/LjifpZB3VMN6qdRrGY082I7X5tZmmqyoWk/rED4WxL3u
++j+6GUcWJOdPBAO4uBqUGzw9tvjXHE2nm5eQlKkk+138vFHkeb1fDrDthXuN9f03
+Ttm2GRc6B4kC8/rlYS5Li9yd8QY1yGPnbgLlW5lxOZbJQxdwiUcGCRDoUB1BC9NY
+dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
+
+                    </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:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mah.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">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>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>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>support@mah.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 40 6657555</md:TelephoneNumber>
+  </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
new file mode 100644
index 00000000..bb394cd7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.marjon.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0PtE8uiR4ycRaBYiZctWLqlj
+						n/ZzMDNhasd+hn1xOEi4b+jLK9crBbE2b/u92SK+HF8j2VUuWW6SVxeMNh2r4dn4
+						U7tjj928sv3QevNKTT7luJTsLBvRjah6XXO5TF5cFIOdUgqPb2KxbqBF+pQauEms
+						eYfB6p8uJRssXmaqOQGvkRE5fv1cX/qUkEjSb3zJrsqnIwlU2BHXYMnl3H42z9fz
+						JJd0tijaj2lCB2iRBl053l0wYQ5MLlztrwMOZyy2T3Yz0h1j4CiQ46UNF6djSSio
+						JhvgtfXfe/raEvfQiuq5NwLc28vXlpPBIPkOrwsYig5l6+Y8DHroF/55qyH9HwID
+						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAubWFyam9uLmFjLnVrhidodHRwczovL2lk
+						cC5tYXJqb24uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBJxA6jp2sTF
+						oIUUD6OP+Xysl4C+MA0GCSqGSIb3DQEBBQUAA4IBAQC/1l3Tn2q/rNUjSMsOcHIw
+						lhhR47e23Wgr/u5r2jusqK4dx6oSrjWaG+pN6jd2xOC/gG6lm7FiPdQugLdft30c
+						18Ca+HSs6LPWZblYiYkKyQ/UHkXIsu0d81oIn+3vgEThyCmsTbChM68VY7AjVVae
+						AteayWpOCsXmCKWfPPHfuY9q5Oe5PeYv1PK9lS39+qiyp8+ZOsu7PHse3vQZIKup
+						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>
+						MIIDLDCCAhSgAwIBAgIVAM3DEG1v9vAV1/UxUuMR5BwJefeEMA0GCSqGSIb3DQEB
+						BQUAMBsxGTAXBgNVBAMTEGlkcC5tYXJqb24uYWMudWswHhcNMDkwMTI2MTUwODIy
+						WhcNMjkwMTI2MTUwODIyWjAbMRkwFwYDVQQDExBpZHAubWFyam9uLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0PtE8uiR4ycRaBYiZctWLqlj
+						n/ZzMDNhasd+hn1xOEi4b+jLK9crBbE2b/u92SK+HF8j2VUuWW6SVxeMNh2r4dn4
+						U7tjj928sv3QevNKTT7luJTsLBvRjah6XXO5TF5cFIOdUgqPb2KxbqBF+pQauEms
+						eYfB6p8uJRssXmaqOQGvkRE5fv1cX/qUkEjSb3zJrsqnIwlU2BHXYMnl3H42z9fz
+						JJd0tijaj2lCB2iRBl053l0wYQ5MLlztrwMOZyy2T3Yz0h1j4CiQ46UNF6djSSio
+						JhvgtfXfe/raEvfQiuq5NwLc28vXlpPBIPkOrwsYig5l6+Y8DHroF/55qyH9HwID
+						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAubWFyam9uLmFjLnVrhidodHRwczovL2lk
+						cC5tYXJqb24uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBJxA6jp2sTF
+						oIUUD6OP+Xysl4C+MA0GCSqGSIb3DQEBBQUAA4IBAQC/1l3Tn2q/rNUjSMsOcHIw
+						lhhR47e23Wgr/u5r2jusqK4dx6oSrjWaG+pN6jd2xOC/gG6lm7FiPdQugLdft30c
+						18Ca+HSs6LPWZblYiYkKyQ/UHkXIsu0d81oIn+3vgEThyCmsTbChM68VY7AjVVae
+						AteayWpOCsXmCKWfPPHfuY9q5Oe5PeYv1PK9lS39+qiyp8+ZOsu7PHse3vQZIKup
+						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>
diff --git a/swamid-interfederations-2.0/idp.mast.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mast.br-idp-shibboleth.xml
new file mode 100644
index 00000000..32b2742d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.mast.br-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcwMTE2MzUwNFoXDTE5MDYzMDE2
+MzUwNFowKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAur8m2rnBlm6u6jFL3Eeq
+srFLXzgEHspopsbiAN6szuLp+PP0WoeI56fPNw9/HxArf+PHXfwZ4uH5XvEiEpua
+QAKg5q6BVcX22RrkPwJPTRtZBveSBUTij8IQ1T7QtdNgPVWoj4Q9CG3A61sCkxyq
+A2mXXV6tOJyiujYRRJs3C+Tt6+cfbwjY5HkzIK9zdUqZBg95tJltmnskOFME9v8S
+HndIkLSQette8ACFUTInhE1qHtoPksQ3TMSwKe4GjzZdLGvJ3lD2aNjEXxx3lsYo
+4ox4/KV7cQxR9KDcT/xWKO6BIs3deZqvL1A2mckSkr829CXytEpXgfxJCKuJHfyc
+iwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAT3ZKzQhDdBFgu7VLJ0GiQ6kEf0kdR
+SNg7hYWpyKG+DdPVsR7xKNSeNaLmFhXqKwRxIyLtmGDlSMOVcCvo2ekKxzNwgjwg
+Rji211WOOyaqCKYwm6uStfrnt3QFoMaeORAspXElQv53CQU7HFvREEi2Zo6fJ5Fc
+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>
+      
+MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcwMTE2MzUwNFoXDTE5MDYzMDE2
+MzUwNFowKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAur8m2rnBlm6u6jFL3Eeq
+srFLXzgEHspopsbiAN6szuLp+PP0WoeI56fPNw9/HxArf+PHXfwZ4uH5XvEiEpua
+QAKg5q6BVcX22RrkPwJPTRtZBveSBUTij8IQ1T7QtdNgPVWoj4Q9CG3A61sCkxyq
+A2mXXV6tOJyiujYRRJs3C+Tt6+cfbwjY5HkzIK9zdUqZBg95tJltmnskOFME9v8S
+HndIkLSQette8ACFUTInhE1qHtoPksQ3TMSwKe4GjzZdLGvJ3lD2aNjEXxx3lsYo
+4ox4/KV7cQxR9KDcT/xWKO6BIs3deZqvL1A2mckSkr829CXytEpXgfxJCKuJHfyc
+iwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAT3ZKzQhDdBFgu7VLJ0GiQ6kEf0kdR
+SNg7hYWpyKG+DdPVsR7xKNSeNaLmFhXqKwRxIyLtmGDlSMOVcCvo2ekKxzNwgjwg
+Rji211WOOyaqCKYwm6uStfrnt3QFoMaeORAspXElQv53CQU7HFvREEi2Zo6fJ5Fc
+qKtjaM50D240z40M9X+0p8U6Tpfx55DXntfVKPbhDu5AbrewaViSNq4PNdTno1tD
+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>
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
new file mode 100644
index 00000000..085b65dd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.math.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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: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>
+      <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>
+MIIDKDCCAhCgAwIBAgIVAMI6h1I2Ucbuc9TH2mQ3pJfm1qhGMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkcC5tYXRoLmNhcy5jejAeFw0xNDExMDcwOTE0MzRa
+Fw0zNDExMDcwOTE0MzRaMBoxGDAWBgNVBAMTD2lkcC5tYXRoLmNhcy5jejCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL162cnXK9D8343uG82KuAbzVz1p
+sVYb++2LmIjoTV/zyG08zV+uFwcoZbRogE4FUTqCnQjRM0CVmQ83JGuuKy1WoVJ0
+frmAdAPKK2JhF/K6BRVYDMbxl7hfA2UWN1j7lwBivxywaG4yG1yvinevWz/vkLKo
+y3V1k3xMDk41103KYjnZ7zJzREgtpBY9zfiw7MhbeM+I3HHVSo76dQPjdcfJALco
+y3vG7OlsCaS4qovEPu5JbmStjscmNNCCOv89hPah3DZsxGLfZ3olikCGO+rGXPwe
+kzAGKoKVVuxRGCSCf1ppZYVPD5c6I82aFCVuRLDM8O4qQ6Fab6mJ6/rY6ksCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRwLm1hdGguY2FzLmN6hiZodHRwczovL2lkcC5t
+YXRoLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8puHnxuPvVxmZuQq
+3xOdeo0vxjgwDQYJKoZIhvcNAQEFBQADggEBAJmSwgJ/MOxvBI9NK65zMHYp2tHi
+CyCxtPnGxL3+9A/2Lx0AuxLCYVKDgU0GNaDkIERIQeMm5DyModRgrkhyEplo1Yxw
+aVw3qypUgmWyFx1gZb4zmp79E4AYGhCwWaRpczQsQMgs7w8QLHi9h+LZNo6hCR8w
+CP0e18qET2/sk6jb5d8xNV/KForfL7xWVDFhr4CGYZSfsaBtfmNDYf92XkAbxUrv
+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>
+MIIDKDCCAhCgAwIBAgIVAMI6h1I2Ucbuc9TH2mQ3pJfm1qhGMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkcC5tYXRoLmNhcy5jejAeFw0xNDExMDcwOTE0MzRa
+Fw0zNDExMDcwOTE0MzRaMBoxGDAWBgNVBAMTD2lkcC5tYXRoLmNhcy5jejCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL162cnXK9D8343uG82KuAbzVz1p
+sVYb++2LmIjoTV/zyG08zV+uFwcoZbRogE4FUTqCnQjRM0CVmQ83JGuuKy1WoVJ0
+frmAdAPKK2JhF/K6BRVYDMbxl7hfA2UWN1j7lwBivxywaG4yG1yvinevWz/vkLKo
+y3V1k3xMDk41103KYjnZ7zJzREgtpBY9zfiw7MhbeM+I3HHVSo76dQPjdcfJALco
+y3vG7OlsCaS4qovEPu5JbmStjscmNNCCOv89hPah3DZsxGLfZ3olikCGO+rGXPwe
+kzAGKoKVVuxRGCSCf1ppZYVPD5c6I82aFCVuRLDM8O4qQ6Fab6mJ6/rY6ksCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRwLm1hdGguY2FzLmN6hiZodHRwczovL2lkcC5t
+YXRoLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8puHnxuPvVxmZuQq
+3xOdeo0vxjgwDQYJKoZIhvcNAQEFBQADggEBAJmSwgJ/MOxvBI9NK65zMHYp2tHi
+CyCxtPnGxL3+9A/2Lx0AuxLCYVKDgU0GNaDkIERIQeMm5DyModRgrkhyEplo1Yxw
+aVw3qypUgmWyFx1gZb4zmp79E4AYGhCwWaRpczQsQMgs7w8QLHi9h+LZNo6hCR8w
+CP0e18qET2/sk6jb5d8xNV/KForfL7xWVDFhr4CGYZSfsaBtfmNDYf92XkAbxUrv
+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>
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
new file mode 100644
index 00000000..16e61d9d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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>
+						MIIDeDCCAmACCQC//ypb/YRuTTANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJH
+						QjEOMAwGA1UECAwFRGV2b24xETAPBgNVBAcMCFBseW1vdXRoMTQwMgYDVQQKDCtU
+						aGUgTWFyaW5lIEJpb2xvZ2ljYWwgQXNzb2NpYXRpb24gb2YgdGhlIFVLMRYwFAYD
+						VQQDDA1pZHAubWJhLmFjLnVrMB4XDTE0MDcxNDEwNTg1MloXDTM0MDcwOTEwNTg1
+						MlowfjELMAkGA1UEBhMCR0IxDjAMBgNVBAgMBURldm9uMREwDwYDVQQHDAhQbHlt
+						b3V0aDE0MDIGA1UECgwrVGhlIE1hcmluZSBCaW9sb2dpY2FsIEFzc29jaWF0aW9u
+						IG9mIHRoZSBVSzEWMBQGA1UEAwwNaWRwLm1iYS5hYy51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBAMrLs4qNhaeMVehDUdMdHKNkzu6FdEIv7+I+fK1N
+						xQEY7/xH4ei0+3szIy9AYFnFq6jQD/gvWg2tQmrzksuUcZPluWv+p1Oa8uAXf/8v
+						o4Nl1kbrw8lPf+QfFdtkRbgNwWQGPb9B46l8WctyyE7gIZMG/3kL13FKMkx2B51c
+						1t1VTdiOEP6+v/TuhQuzk+uczWtQb9JvpSplo25BtLiIobm/aKUtr48vD+yNhEm8
+						KFw9/HENeeCMqrs7+UNSbwyxQA289rVLo0X2mQYKllOt9GSB7TA9QqbogI6aFQg9
+						YcGgLu1r+VUV4tSJDTyWObs/o0FRWj+OAszT7UnhAU2I/D0CAwEAATANBgkqhkiG
+						9w0BAQUFAAOCAQEANkSL3XK8hSm3z0HVikjTUXTKtv3VLPJqhhMddR9iyxVDoHff
+						nbiO1UlJV2QXxlVbRODZ3cwgjj4SHQFRpX3/2K5dK4WONGhxE37SNNtFrpdW37uv
+						MsaxlRzd8U7RgHyQQW1SlYgjDJt10S8Wh4Ztx3tlpMm/aXZyoRKryuUXK16VbEA6
+						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>
+						MIIDeDCCAmACCQC//ypb/YRuTTANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJH
+						QjEOMAwGA1UECAwFRGV2b24xETAPBgNVBAcMCFBseW1vdXRoMTQwMgYDVQQKDCtU
+						aGUgTWFyaW5lIEJpb2xvZ2ljYWwgQXNzb2NpYXRpb24gb2YgdGhlIFVLMRYwFAYD
+						VQQDDA1pZHAubWJhLmFjLnVrMB4XDTE0MDcxNDEwNTg1MloXDTM0MDcwOTEwNTg1
+						MlowfjELMAkGA1UEBhMCR0IxDjAMBgNVBAgMBURldm9uMREwDwYDVQQHDAhQbHlt
+						b3V0aDE0MDIGA1UECgwrVGhlIE1hcmluZSBCaW9sb2dpY2FsIEFzc29jaWF0aW9u
+						IG9mIHRoZSBVSzEWMBQGA1UEAwwNaWRwLm1iYS5hYy51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBAMrLs4qNhaeMVehDUdMdHKNkzu6FdEIv7+I+fK1N
+						xQEY7/xH4ei0+3szIy9AYFnFq6jQD/gvWg2tQmrzksuUcZPluWv+p1Oa8uAXf/8v
+						o4Nl1kbrw8lPf+QfFdtkRbgNwWQGPb9B46l8WctyyE7gIZMG/3kL13FKMkx2B51c
+						1t1VTdiOEP6+v/TuhQuzk+uczWtQb9JvpSplo25BtLiIobm/aKUtr48vD+yNhEm8
+						KFw9/HENeeCMqrs7+UNSbwyxQA289rVLo0X2mQYKllOt9GSB7TA9QqbogI6aFQg9
+						YcGgLu1r+VUV4tSJDTyWObs/o0FRWj+OAszT7UnhAU2I/D0CAwEAATANBgkqhkiG
+						9w0BAQUFAAOCAQEANkSL3XK8hSm3z0HVikjTUXTKtv3VLPJqhhMddR9iyxVDoHff
+						nbiO1UlJV2QXxlVbRODZ3cwgjj4SHQFRpX3/2K5dK4WONGhxE37SNNtFrpdW37uv
+						MsaxlRzd8U7RgHyQQW1SlYgjDJt10S8Wh4Ztx3tlpMm/aXZyoRKryuUXK16VbEA6
+						UBYyypbXGq9dHlR/Hln5yEchjXlQe62dG/19UdqC5nC60eFtnSgmMWiLnJO3DjwD
+						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>
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
new file mode 100644
index 00000000..187ef96a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.mbu.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDIzCCAgugAwIBAgIUYdcHhLDHNl2QZ3A36tC8tB4N+0YwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLm1idS5jYXMuY3owHhcNMTQwNTA5MDk0ODE3WhcN
+MzQwNTA5MDk0ODE3WjAZMRcwFQYDVQQDEw5pZHAubWJ1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKvELL+7e19R7w9WNnuLbvd9MI9Y6emS
+0o4NDUddY65/SqZeeNaTqsdCQO8htLIIvzwm2vh9geeNEVwpRejz1N1kzcVLIpxa
+9udowrfSKKAuavwFiSYyrznKAtD2/G00U+Ity4Mi6IjxpdNocIQgSfaD/cVOvg3k
+Qw2B0jOSYdEAu0nG8I6LlUp9T6aSI7jqUDcAIAB6CMOxGL6/+GwEuPYMNBxGrAAZ
+pWPGUO4mBaK0eVrMyq++fImM5yab6B42nfe4RvA9C2Lt50OgvOia8LKRjtVGaATI
+DUOOiX2B5sWVYAHFfsXCFuS9CjjYMxMMT5t5A1guNOhd86rPCayVfJ0CAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLm1idS5jYXMuY3qGJWh0dHBzOi8vaWRwLm1idS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFA/LgQ/gox/xI5+K8hQ6Nrq5
+y0R3MA0GCSqGSIb3DQEBBQUAA4IBAQAxf9HYNhASVDz1dbW/OMXd7mtFoxk7v5bP
+JgXz3W7kW8HyERpcssEbJhB1mmrWTnM/5qiPf6OuBQ7Loa3Wtthx7tei2bXXBwKb
+RE5DK04UiRufSq8G6yioadxyMG4lpt+mSSkyYDdP+4DnBgJcrPLORCpkcZaFvZWy
+rgr4jGpkpj7QnuJR5O/mUpLZSxEqspE7TWOgFFWhWfddhKRiThLI/KLysYWaFBOp
+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>
+MIIDIzCCAgugAwIBAgIUYdcHhLDHNl2QZ3A36tC8tB4N+0YwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLm1idS5jYXMuY3owHhcNMTQwNTA5MDk0ODE3WhcN
+MzQwNTA5MDk0ODE3WjAZMRcwFQYDVQQDEw5pZHAubWJ1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKvELL+7e19R7w9WNnuLbvd9MI9Y6emS
+0o4NDUddY65/SqZeeNaTqsdCQO8htLIIvzwm2vh9geeNEVwpRejz1N1kzcVLIpxa
+9udowrfSKKAuavwFiSYyrznKAtD2/G00U+Ity4Mi6IjxpdNocIQgSfaD/cVOvg3k
+Qw2B0jOSYdEAu0nG8I6LlUp9T6aSI7jqUDcAIAB6CMOxGL6/+GwEuPYMNBxGrAAZ
+pWPGUO4mBaK0eVrMyq++fImM5yab6B42nfe4RvA9C2Lt50OgvOia8LKRjtVGaATI
+DUOOiX2B5sWVYAHFfsXCFuS9CjjYMxMMT5t5A1guNOhd86rPCayVfJ0CAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLm1idS5jYXMuY3qGJWh0dHBzOi8vaWRwLm1idS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFA/LgQ/gox/xI5+K8hQ6Nrq5
+y0R3MA0GCSqGSIb3DQEBBQUAA4IBAQAxf9HYNhASVDz1dbW/OMXd7mtFoxk7v5bP
+JgXz3W7kW8HyERpcssEbJhB1mmrWTnM/5qiPf6OuBQ7Loa3Wtthx7tei2bXXBwKb
+RE5DK04UiRufSq8G6yioadxyMG4lpt+mSSkyYDdP+4DnBgJcrPLORCpkcZaFvZWy
+rgr4jGpkpj7QnuJR5O/mUpLZSxEqspE7TWOgFFWhWfddhKRiThLI/KLysYWaFBOp
+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>
diff --git a/swamid-interfederations-2.0/idp.mci4me.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mci4me.at-idp-shibboleth.xml
new file mode 100644
index 00000000..af7a4f7d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.mci4me.at-idp-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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>
+MIIDHzCCAgegAwIBAgIUHNJty3oyEoy9tOTNEmmE7qV74C8wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLm1jaTRtZS5hdDAeFw0wOTA5MDcwODIzMDVaFw0y
+OTA5MDcwODIzMDVaMBgxFjAUBgNVBAMTDWlkcC5tY2k0bWUuYXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3S9fUpbeg9WH5JftrPezNOvW2YkH8/MgG
+HV9RrmZbcoKwLTzwPrZPaumhFJQArvLmrk3dtVCaih1RMAIVFi8HoYac7fDUurwx
+RbVQx7nskAb3iZx1O8JEX8TgoqKt+uUdzUIGBz9rHytawAUnIiArMtINNumyvFhV
+QJqKRi9Hwo/aGs7B7FAwrJZSV9hQSXJq8xhPMTQARJSBACCZwEyPRQ15o/MWOpjd
+0D2PAnAtBVNfY+4B/Imt5JTQ+XYp+Q4WVY1WeuMzjC4ucw/y5aYZTL+xMGzg0HmG
+0/Owi2SF3vmgXAROFTcxfmJqyYsxI75pQDAfH3NEKvE8fmmJ4DAbAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5tY2k0bWUuYXSGJGh0dHBzOi8vaWRwLm1jaTRtZS5h
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUl+LCOAVAc0ZekJaOO94O2tbedggw
+DQYJKoZIhvcNAQEFBQADggEBADkTysuQZsgEXD9k3dqUgQLAl/FWTwbhwzpkWtf6
+FAkJkBOmpV9Bxufiyt0t2jMPAxHQ7ijRof+YVsL4pSPB0EuB6yDGbaaKOP0S0xUp
+llwQbIGwW5EX/wq8S5xpJbyl2qyK2c/3xiBA37q42/7TTDp8CsrzkiZ5wV6Quu4W
+5i3Ncd3DlSCWC+KQiNUERUnol8zG7LnX+TDm+CmJDBGZTe2rP2VBHufwx99NWJqa
+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>
+MIIDHzCCAgegAwIBAgIUHNJty3oyEoy9tOTNEmmE7qV74C8wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLm1jaTRtZS5hdDAeFw0wOTA5MDcwODIzMDVaFw0y
+OTA5MDcwODIzMDVaMBgxFjAUBgNVBAMTDWlkcC5tY2k0bWUuYXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3S9fUpbeg9WH5JftrPezNOvW2YkH8/MgG
+HV9RrmZbcoKwLTzwPrZPaumhFJQArvLmrk3dtVCaih1RMAIVFi8HoYac7fDUurwx
+RbVQx7nskAb3iZx1O8JEX8TgoqKt+uUdzUIGBz9rHytawAUnIiArMtINNumyvFhV
+QJqKRi9Hwo/aGs7B7FAwrJZSV9hQSXJq8xhPMTQARJSBACCZwEyPRQ15o/MWOpjd
+0D2PAnAtBVNfY+4B/Imt5JTQ+XYp+Q4WVY1WeuMzjC4ucw/y5aYZTL+xMGzg0HmG
+0/Owi2SF3vmgXAROFTcxfmJqyYsxI75pQDAfH3NEKvE8fmmJ4DAbAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5tY2k0bWUuYXSGJGh0dHBzOi8vaWRwLm1jaTRtZS5h
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUl+LCOAVAc0ZekJaOO94O2tbedggw
+DQYJKoZIhvcNAQEFBQADggEBADkTysuQZsgEXD9k3dqUgQLAl/FWTwbhwzpkWtf6
+FAkJkBOmpV9Bxufiyt0t2jMPAxHQ7ijRof+YVsL4pSPB0EuB6yDGbaaKOP0S0xUp
+llwQbIGwW5EX/wq8S5xpJbyl2qyK2c/3xiBA37q42/7TTDp8CsrzkiZ5wV6Quu4W
+5i3Ncd3DlSCWC+KQiNUERUnol8zG7LnX+TDm+CmJDBGZTe2rP2VBHufwx99NWJqa
+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>
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
new file mode 100644
index 00000000..3bebe33e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?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>
+      <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="en">Medical University of Vienna</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="de">Medizinische Universität Wien</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>
+MIIDOzCCAiOgAwIBAgIULLvePur8kLbXZX40PB9OXf5KCxwwDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUaWRwLm1lZHVuaXdpZW4uYWMuYXQwHhcNMDgwODIxMDMz
+MTE3WhcNMjgwODIxMDMzMTE3WjAfMR0wGwYDVQQDExRpZHAubWVkdW5pd2llbi5h
+Yy5hdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKHIbWnRpzxgF785
+09wKk/EY2jf54pPrmFNdkD5a4ZDDZG9amhY945W3BACuGa929DdfcERcVkngRLoy
+SXjMxMTQDZjTvuJV0Pxyb71rihKhdZ+waJ223fip9ZotThmhkrGa40SIFldBaJs9
+Rup1VK6R7G46opQARTPQdpwKYBqBeOE5pPmrczYT6mM6nnMgpStth+DImHN+Cwxl
+DIjqiCwHjeWq3FGUR828H6JzQ5Hdb4nDWoGfne8jaL/n0GWALes1rFibnZfI812I
+JV0KDiomfFvdPntOrZ64Eq/52BXwzKc94oi2s1YJ1wr2pFlXh7Q2F8AZpnLfhwk6
+4OFfsiUCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLm1lZHVuaXdpZW4uYWMuYXSG
+K2h0dHBzOi8vaWRwLm1lZHVuaXdpZW4uYWMuYXQvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFLNFilq1Hc56vgAhtuFB6wxI4ZqYMA0GCSqGSIb3DQEBBQUAA4IBAQAN
+5F9raRlQBYLorrPWPlYIiljnznJAFLDw62LFYRh/ovPY7FiJrcZ0rEKpyIYgNjpd
+5CcIf/gvFoDP6P4dsCQ2kDF1nUMd9eC4LVBHVw9iTQboiH94SegSfiuFP6r0jQyp
+9JyxE9Qwb7QJepmyubRewHy2srKTO2W6BIbwQaqHSYT3R42vmKLteZKN5kKVxYZj
+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: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.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
+Yy5hdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKHIbWnRpzxgF785
+09wKk/EY2jf54pPrmFNdkD5a4ZDDZG9amhY945W3BACuGa929DdfcERcVkngRLoy
+SXjMxMTQDZjTvuJV0Pxyb71rihKhdZ+waJ223fip9ZotThmhkrGa40SIFldBaJs9
+Rup1VK6R7G46opQARTPQdpwKYBqBeOE5pPmrczYT6mM6nnMgpStth+DImHN+Cwxl
+DIjqiCwHjeWq3FGUR828H6JzQ5Hdb4nDWoGfne8jaL/n0GWALes1rFibnZfI812I
+JV0KDiomfFvdPntOrZ64Eq/52BXwzKc94oi2s1YJ1wr2pFlXh7Q2F8AZpnLfhwk6
+4OFfsiUCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLm1lZHVuaXdpZW4uYWMuYXSG
+K2h0dHBzOi8vaWRwLm1lZHVuaXdpZW4uYWMuYXQvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFLNFilq1Hc56vgAhtuFB6wxI4ZqYMA0GCSqGSIb3DQEBBQUAA4IBAQAN
+5F9raRlQBYLorrPWPlYIiljnznJAFLDw62LFYRh/ovPY7FiJrcZ0rEKpyIYgNjpd
+5CcIf/gvFoDP6P4dsCQ2kDF1nUMd9eC4LVBHVw9iTQboiH94SegSfiuFP6r0jQyp
+9JyxE9Qwb7QJepmyubRewHy2srKTO2W6BIbwQaqHSYT3R42vmKLteZKN5kKVxYZj
+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: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="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.merthyr.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.merthyr.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..ba3728d6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.merthyr.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJFAsCItsP8+n3dD74AGDmML
+						LHA+qOSCF9QzNbyG6eUUmbbtq2YL03KomYlI0wV21lK9TDcUIVDwionhN+J5gzp/
+						j0XQ6/aTWIPeT5Igyw6rpYQJHR0F4hSMkZPHgoEIf+pJ4KsOxcS8v45Hs5G5jobz
+						KtksWzWz2saCt4Y0Dkbz1AhZuHeWRYkwx5HT231AdCgEOaCOieYqJizq+LGTNM9r
+						iakEZEoQ1iBwzwOEeeWTCLAdq74nLg1IqvldRE9qrzMD383wp8QDcnFrpRG0FpAP
+						zYDLciyZ6IehEB/197cVjAFhMBcR0g5LdWZRmchLYCIM5IRVeboxSOLJMzeRKUsC
+						AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLm1lcnRoeXIuYWMudWuGKGh0dHBzOi8v
+						aWRwLm1lcnRoeXIuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCnF7X1W
+						OJhryeXx3KqcXqwmzOMAMA0GCSqGSIb3DQEBBQUAA4IBAQBE9l2CvybnLgrucYfg
+						XucF8nJ6iXP2co2/L4YnA9psqMNvHlFGmtqsRGcByS+XlYX1cKGCJ2UHj/0Zti0W
+						RkjM0MT2NS/hBUv321UfMxJ6h7e/Xlrv4CTTxRO6kh5/9nXk8lfT6pcYFSGtC9b6
+						KHr+IQ726FM2L2VCsoH/3htHDM5L89KhzVg8iQmyxpQBNcj3MgURzr9AtBlWRvK0
+						aMsJOAqGAm5SC+E7ckFz57KHdVRYNl+PzG2tsQa491vYhpNAxGb4zHc6xITNZ315
+						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>
+						MIIDLzCCAhegAwIBAgIURCB/tUHtc3A/ovYJbLippy5MADIwDQYJKoZIhvcNAQEF
+						BQAwHDEaMBgGA1UEAxMRaWRwLm1lcnRoeXIuYWMudWswHhcNMTEwNzA1MTExMjMx
+						WhcNMzEwNzA1MTExMjMxWjAcMRowGAYDVQQDExFpZHAubWVydGh5ci5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJFAsCItsP8+n3dD74AGDmML
+						LHA+qOSCF9QzNbyG6eUUmbbtq2YL03KomYlI0wV21lK9TDcUIVDwionhN+J5gzp/
+						j0XQ6/aTWIPeT5Igyw6rpYQJHR0F4hSMkZPHgoEIf+pJ4KsOxcS8v45Hs5G5jobz
+						KtksWzWz2saCt4Y0Dkbz1AhZuHeWRYkwx5HT231AdCgEOaCOieYqJizq+LGTNM9r
+						iakEZEoQ1iBwzwOEeeWTCLAdq74nLg1IqvldRE9qrzMD383wp8QDcnFrpRG0FpAP
+						zYDLciyZ6IehEB/197cVjAFhMBcR0g5LdWZRmchLYCIM5IRVeboxSOLJMzeRKUsC
+						AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLm1lcnRoeXIuYWMudWuGKGh0dHBzOi8v
+						aWRwLm1lcnRoeXIuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCnF7X1W
+						OJhryeXx3KqcXqwmzOMAMA0GCSqGSIb3DQEBBQUAA4IBAQBE9l2CvybnLgrucYfg
+						XucF8nJ6iXP2co2/L4YnA9psqMNvHlFGmtqsRGcByS+XlYX1cKGCJ2UHj/0Zti0W
+						RkjM0MT2NS/hBUv321UfMxJ6h7e/Xlrv4CTTxRO6kh5/9nXk8lfT6pcYFSGtC9b6
+						KHr+IQ726FM2L2VCsoH/3htHDM5L89KhzVg8iQmyxpQBNcj3MgURzr9AtBlWRvK0
+						aMsJOAqGAm5SC+E7ckFz57KHdVRYNl+PzG2tsQa491vYhpNAxGb4zHc6xITNZ315
+						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>
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
new file mode 100644
index 00000000..cb80c6c3
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.mf.uni-lj.si-idp-20111101.xml
@@ -0,0 +1,85 @@
+<?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:06Z">
+      <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>
+      <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,iVBORw0KGgoAAAANSUhEUgAAAL0AAAEfCAIAAACbFlA2AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAABIAAAASABGyWs+AACAAElEQVR42u1ddXwUx9ufWTn3izsRJGhwd22BGqVCXan8KlSo0JaWlrpQb98aLbRQqkChuHuwAAkh7noue3u7O/P+seG4XELuEoI23w/tJ7nc7c3OfueZZx6FGGPQgQ60EsTFHkAHLkt08KYDbQF1sQdwQcFx2GLh6+p4k4l3uRDPY4oCcjlhNNIREVRYGEWS8GKP8fLAf4I3bjfKPsHs3uPMzHTl57F19byHQRyHEQIEASgKymREeDiV0Vdx882GYcNUHewJCnhl68WlpeymjY41a62HDrrNZkEQMEFACAEAAJ7mhjgBGAOEcFQU/fEnCZMnay/2wC91XLG8KSvz/vG7edly86lclufP0KVlIAS6dpUNGKCgaSjOC4SQIqFUCpUqQqUijAYqPIIKD6cjI2mDgZRI/qMK4hXIG5db+PtPy+df1GWf8Ig7UauAEEDIb04gEPkGIQAAEgSQyaBcToSHU8kp0u7d5QMHqvpkyMPD6It93xcUVxpvCgo8b79dtWqlze1G50lN8d/XIARKFdmli3TqVN011+hSU2UXewIuEK4o3uzf53zhhYoDB1wh7krtApFABAGTk6W33KK/dZYxJkZysWfivOPK4c2RI+7Zs0tyspmLdRoS98Q+GYrHH4+YMkUnkVzJh7IrhDduN5o9u/ivP60UdZGfliBgjYacdZvxiScio6KuWKXnCjkOmEz8sWNugrj4S5wkodOJvvqybvYDJUePuC/2cM4XrhDehIdTw4erMb4kpCeEAEKwZav9wdklmzfbL/ZwzgvI+fPnX+wxtAMoCvburTCZ+Lw8luNwGwQPxiCAc+eoWRMErK3l9u5xdkqWpqTILpiefmFwheg3IpxOYcUK83ff1mdne0K39WEMCAIYjRRNQYQBQpjnsdeLvV7M8xghIAgYAAAhaMMxTRBwQoLko0Xx48ZdUTboK4o3IioqvGvWWP9ZbTt6lLFaz/gW/B+5KF0wxhDCiHDqppsNM2caZDIoICAImGWR243cbmS1CpUV3rJyrqrKW1HBVVVyFgvv9WIIYejmREHAnbvIvvgisX9/5cWem3bDFcgbEU6ncOIEs3ev68ABV36ep97EOx2I5zHGgCShQkHodGSnTpJBg1QTJmh691G0fBBjWeRyoYoKb3Y2s3eva99eV34+y7KhmhYFAQ8fofr666TY2CvEtHPF8sYHrxdbLHx1NWeq5x0OwcthlZI0hlGRkXR4OKVQtPpkgDGoquK2b3P8/LNp716X14sIAgAAg37q3vuMb7wRJ5VeCWeRK5835w8WC//bb5bPPqspLvIG1cQxBioV8emnCddcq7/YA28HdPDmXHHokOuVlyt37HQQwXRmQcADByqX/pwcEXHZ2wOvBJl5cdG3r/LTzxImTdKgYAuQJOHhw+4//7Be7CG3Azp40w5ITJS+/Xb80CFKFIw7HIeXLzfX1XEXe8jnig7etA+SkqSvzI+Ji5Mg1NLbSBJmn2B27nRe7PGeKzp4024YOFB13/1hJBnkbW4GbdxgF22Jly86eNNugBDcfLOxZ095y5wgCHjwoKu25vLeqjp4056IiqKvv17fsjEQQlBRwRUVeS/2YM8JHbxpZ4wdp46IoFowbkAI3G5UWOi52CM9J3Twpp3RqZOsS1dZywcrnsdVVR37VAf8oFAQ6d3kQY2pDodwsUd6TujgTTsDQhCfIAnq7/SwHeepDjSGXk8GPY1f7t7Ny3v0lyYoKnh4l1x+ecf/dfCm/eFmUMtWYwihTnd5V3To4E37o76Ob9n0R9MwIqKDNx3wA0K4pJhtQd5gDGQyGBN9eYdSdPCmnWF3oJwcTwv6DcbAYKBiLvOA0Q7etDNO5TIFBWwL4X8Y44QEOjysY5/qwGlgDDZssJvNfMvnqd59FAplsJP6pY0O3rQnKiq8/6y2tvwemYwYOFB5uafhdfCm3YAx+PVX88ncljYphEBCgiQj47JPpOrgTbvh2DH34sUm1KLfCWM8dKgqJubyPkyBDt60F6w2/r33qkuK2RbyODEGajU5dZr2CqhX2sGbdoDXiz/7tGbNGlvLWVQI4f79FYMGqS72eNsBHbw5VwgCXvxD3Ref1wt8kHfKZMTNtxg0msv7JCWigzfnBI7D339X/8YbVU4navmIJAh44EDFpElXSFWKy9v6dHHhdqPPP6v56KMapxO3XJ4CY6BSkffdH67XXyETfoXcxoVHVRX3wfvVP/1kYlkctKYJxnjaNO3EiVeIsAEdvGkb9u93vr6gaudOJ8bBy3IhBJKTpf97LFIuv3K0gg7etA4WC//LL6YvPq8rLfWSZPD4LIyBRAIffjgiPV1+scfenujgTajgebx3r/PjRbVbttg5DoRog0EYT7lKN/Mmw+XuWAhAB29CwsmTzPff1//xu6W2lifJUIu0IQF0S5c/91zUlXH29kcHb4KgqIj9/Tfzzz+bCwtZCGGIYgYDjDHQ6sjnn4vq1u2K2qFEdPDmrCgs9Pzxh3XFr+a8PBYh0MratpAkwH33hV91te5i38d5QQdvAsHzOCeb+eMPy6pV1sJCr9h1obXNiDDCU6bqHnk0gqavLL3mNDp4cwYOh3DggOvPPyybNtkrK3kA2sIYAIAg4J495fNeijYYrtjpvWJvLHRgDMpKvZu32Ff+bc3MdNlsQqvKEwcAIRARQb/8SkzXrlegWuPDf5o3Lhc6csS1epVt40Z7UVFDgf5zCXLAGEil8IknI8ePv3JMw83iv8gbjEFZGbtls2PVKmtmptti4UUB0y5hMTfdrL/rrrA2i6vLBf+tOrQuFzpyxP3PauuGjbaiQq8oYNrLIocQGDpM+d13na7gtlM+XPnyxuEQqqu5khJv9gn3jh3OA5lui7k9BYwPkAAch5cuNXVOkyUlS+Niaa2WvBRaYp0PXJnyxuEQSkrYE8eZQ4fcx44xpaVek4n3eLDYCPP8mfwRAgBgiYTQ6sj4eLp7d3nv3opevRSpqVK9nrqSXA1XDm8QAtXV3hPHmT17nPv2u/LyWLOZ57xiC6C2n4/aBrFZK8aAoqBGSyZ3kmb0VQwZouzXVxkXL7kCjDqXPW8wBpWV3oOZri1bHXv3uEpKWJcLAdCWXlHnb4Ri2TaplIiJofv1U4wapR4yVNWpk/SidwNtMy5j3lit/KFD7nXrbNu2OoqKvB4PghBAeKnQpVkgBDDCtATGxEiGDlVNmqwZPFgVfRnWGLj8eIMQKCz0rPvXtnq17fhxxm4/JzPdRbwLjLFMRqSlSSdN1k69WpveXSGVXsKUb4zLiTcsiw4dcv/+u2XjBntpqdfXyO6yhljxJCKcGjZCNfNGw7BhKo32Mgi6uDx443Kh3bscy5aZt2511Nfzl6OAaRmiDqRSkf0HKG6aaZg4SRt2aResuNR543ahHTscixfX79jhtNuFK0DAtACRPVIp0bevYtZtxilTLl32XLq88Xrxrl2Ob7+t37bVccUzJgCCgKVSom8/xT33hE2erL0EwwUvRd5gDI4ccX/3Xd3qVTazmT+vjBHvXuzt6/sVNNc83P9PvlPbeaWyIGCFghgxUv3A/eEjR6klkkto3VxyvKms9C5ebFryk6m83NvujPG1fxbzVygKymSEXA61WlKtIZVKQq0iNVpSJoUUDSUSgqIAQoDzYi+HWBY77MjhEFwuweFANpvgdiOPB3EcRugMmdp9wAhhnY669lrtAw9GdO9+qcRmXEK88XjQmjW2zz6tPXzYLUbZtQt8pluCgEoloTeQMdGSpCRJaqosLp6OjKIjI2idjpTLCZkMSiSEL7ulab9xhDDHYY8HMQxyOFBdLVddzVVUegvy2aIitqKCq6/nnU7E87htTepbuAWMcVIn6b33hs2aZbwUwsEuFd6cOuX5+OOaP/+wOp1Cu7gbEQIIYYKEGjURnyDp2kXWq7eiRw95p04So5FWq4l29DhiDNxuwWzmy8q47BPM0aPu7GymuNhrsQg8jwmifU5/CAGKAqNHq5+cEzVkiOrinigvPm88DPrjT8uiRTW5J9lzl/MiXSQSGBVFd+8uHzxYOWCgsnNnmcFAXTCjPsbAauWLi9jMg+69e51ZR5myMi/DoHYxHwgCjoqi77sv/N77wi6i4LnIvCkpYT/8oObXXy1uNzqXORU3EYqC0dF0v/6KcWM1g4eoEhIkMtlFtvOILYMOHXJt2uTYu8dZXOxlWXSOWxhCgCTBuHGauc9F9et3cUq+XTTeIAQ2bbK/ubDq8CE3OAcxIxrsdToyo6/i6qt1I0eqO3WSnuPRQ2ShKLpEDVp80qEk9p59nLiigtu31/nPP9bdu121tTxC+Fx2ZEHAiUnSOXMib77ZcOGXx8XhjcuFvvuu7uNFNWL6Y9suIvoZEpMkkyZqpk7TZfRRqNSts3MwDHI4BLNZqK/namu4ujreahWsVt5uRyyLOR5zHBIEQJKApgiKBnIZodGQOj2p01EREVREOG0MowwGSq0mQn9yLItOnvT8+6/tn9W2nBzG6227twQhoFAQs24zzHkqMjrqghbSvgi8KSvzvvVW1W8rLKFUAGkWgoBpGnbrJrvuOv206bqUFFmI1/F4UG0tX1jgOZXH5ud5CgvZ8nKvzYYcTsHDIFHABJTIhwAETJCo5xIEkMsJlZrU6cj4OElysjStszQtTZacLA0Lo0KhUVUVt369bcUK88FMt9vdxs0LYwAgGDlS9er82D4ZivZ6RkFxoXlz9Ihr3ryKHTtcbVOBBQFTFOjZU3HbbcarrtbGxARfZByHq6u5EyeYAwdcx7KY/HxPTQ3PMEjgMTg3Cx7GAGCAAUAIi7uYQkFERtFpqdJeveQDBirT0+WRkXTL+rjVKmzdav9xsWnPHqfbjdomfQUBd+4se/XVmMlTtBcmMvXC8QZjsH697eWXKk6e9LRhdkSLTnq6bNZthmuu0QdljJfFhUWePbtdO3Y4srKYigqv240AOC/WOf97FHUjggAKBREXL+ndWzFihGrIEFVSkrSFMD+bTdiwwfbjYtPevS6WbQt7EAJh4eQzz0TddVfYBWiKdoF4w/P411/Nr71aWVXFtXZSxCcRHy+ZdZth1qywhISWGIMQKC1lt213bNpgP3jQXV3NiUkLF8HagQHCDUaB6Gh6wADl+AmaESPUcXGSs7HWYuH//sv6zTd1J054MG615RMhoFDAhx+JeOKJKJXq/N7wheANy6Jv/q/unXerbdZWH7YFAWs05PRrtA/cH9Grt6IFOeF0CgcOuP75x7Zls6OkhOU4HKK9xN/5AE5vWM3qGv4+rFY5FsQwP4mUSE6WjBunuepqbd++SoWi+cGVlHh//LFu6VJTVSVPEKBVWo8Y0Xz7HYYXX4wxGs+jdee884Zh0Ecf1Xz8cQ3jbp0WLI4rI0P++BORkydrW5C9dXXc5s32X3+17N/vsoeQpevveZBKoVJJaDRkWBhlNFJ6PaXTETo9pVQSNAVpCaRIKAjYy2Evi10uZLXxVotgsQqmer6+nnc4BKcTeb1YVHGC6rai1UCvJ4cMVc2caRg1St2s7Q4hfOCA68MPqzdttHNc60phiIaDG2boX389NjLyfEWgnl/euFzovfeqPv+szuvFrVIpBAEbjNQdtxvvfyA8Lu6sG1N1DbdqpXX5MvOxY4zH09KRxBccLpFAg4FKTJSkpcnSOktTUmTx8RKjkVKpCKWSpOmQSq9xHHa6BKdDqK/ny0q5/AJPXp4nP48tKfFarbzXi0GLgfHiYORyIiNDccuthquu0oaFNfOAbTZh2S+mL76oKypi27C5T5+uXfhmXOz5aXR1HnnjcqG33qz86qt6jmsFacQto08fxdznoidO1Jxtvurq+FWrLEuXmI4eZTjurAY08QmRJNTrydRU6YAByr59FV27ymNjJRot2Y7aMULAZuPLy7iTJ5mDB12ZB90F+azVKrScsSXG2WT0ld9xR9hVV2mbrVJ7+JDr7berN260C0Lr1HmEwFVXad9977xQ53zxhmHQe+9Vf/JxbatIgxCQy+GMG/Vz5kR16iRt9j1uN1q/3vbVl3WZmS6vt3nG+OgSHk716aMYPUY9aJAqJUWqvVChuxYLn5/P7t3j3LLVnpXFmOp5sfJSs1MhCFgmI4YMUT44O3zMWI2syY5sNvPfflP35Vd19XWtM5MiBK65RvvOu/HtvmGdF96wLF60qPqD92tYthWkEQQcHU3PeSrqttuMzeqMGIMDB1xfflG7bp39bG5zUYHQaMheveVTpuhGjVSlpslaVQBWQNjLYpmMEEfOcdhmEwwGqm0nMpdLOHXKs3Wr499/bcePeZxOoQX2aLTk1Kt1s2eH9+4TaMFDCK9fZ1uwoOrECaa16s6NN+oWvhnfviGn7c8bnsdffFH75sIqhmmdpOnVSz7/1ZgxYzTNfqqujvvhh/rvvq2vrOSanXrRzhsbR0+YoJk+TdevvzJE6ZKV5T5+jOnRU96rl8LtRh98UJ2QILn1VqNor1u3zvbBB9Uff5zYpYus6WcxBl4vCsVeYrHw+/e5/l5p3bzJXl3dUJSp6dUQwomJkgceCL+1uTib7GxmwWuV69fbxUix0HHbbYYFr8e1o7gl58+f317XEu98+XLzgtcqg5ae9/8IAGDKFM2HHyX0769slhBbt9rnzi1f9ovFbkdNnYviJKalSe+5J+yll2NmzTKmpMjOZumvrPRu3erYt9elUBLiSfWbb+qef64iJVU6aJDq1+WmDRtsDz4QIf6J5/GHH1b/s9qekioZMKCZPi4ulzD/lYoNG+zVNZzHgyQSqFA0rzbJ5URqqmziJO3o0Wqthqyr4ywWIaBstngis1rR9u2OrCwmPl4SYOwJD6dHj9awHnz8OMPzoVIHY3DiBIMEPHiIqr2CSdqZNxs32p5/rry+XgidNBQFZ91mWLgwLjGxGYXGYuE//6x2/iuVOdmeprmYCGEAYGqqdPZD4a+8Ejv9Gn1EBB0gxv2tMvv3u959p1oQwMlcBiHQu7cCAFBYyK5bZxs6VBURQX/2Wc0zz0T37NWwTeTnsz/9VO92IYdTmDZN11SuVFRwr86vys31GIzUpo2OokJ22DC1uIE2W0qdJGBUFD16tGbceI1WQ1ZWcRYLH2AtghBgDAoK2C2bHQDgrt3k/t+rUBBDh6nkcuLwYZfHE5JEhxAgBI4edWs0ZN++inZxRLQnbw4dcs15sqy42BtqsVYM5HL42P8iXngxplkzxrEs93PPl/+42OR0BpreRZEeG0c/cH/4awtip07VNXsYQQj89FO9yykkJEg5Ds97sTw2VvLK/NiJE7WdkqQyOQEAqKjwrlppi4mld+92jhqlmX6N3vfx334zx8VKoqLorVucw4ermjL7+HFm8WLTxEnaDz9MmDhR26ePQq0mIQQsiz75pKa6mmu2CC2EwGigRoxQjx2rkcmIkmLW4RACVgVBQIcD7dzpLChgu3WV+2snNA37D1BGR9EHD7ocDhQadTDHgUOH3AmJ0nap3N5u1uiKCu/LL1Xm5obqe0IIKFXE3Oein342St0k/kEQ8MqVlnvvLV7zj61prLEgYJWKuOVW/ZIlyfNeiklJkZ7tWyAEFgv/519WhDDP43oTv2WL4/ffLaWlXtlpZTnMSEulcM0a219/WqurOdH6AgCw2YQD+10TJ2knTtKyLPrnH6toAfJHbq7H40EJ8RKPB6vVZEQELUqLX34xv7mweutWewvaI4SgSxfZq6/G/PhTpxtu0MvlhCA0ejdBAI7Df/xhufe+og0bbP6Xoih4y63Gd9+Lj4ujAj51tm8jCGCxCK+9Wrlvn/PcH3f7yBuXC82fX/HPaluIMhAhoNUS8+bFPPBAuEQSyF2nS/jis9pXX62qKPc2FTMAgH79FK8tiH300cj4eGnAajty2L1mrVUhJ41GSnQCGI3Ub79ZBg9WhYXRFjP/55+WlSutq1dZd+1y6vVkp04ym11Y8avZoKf0OmrTJntkJN2rlwJCsGOH45dfzCYTn53tLipiq6v5yZO1Oh3lfxeiAUkigTt3OI8fc/fprZBKiZ07HR99WFNXxyd3kk6dqvPNicnE8xyWNla8CALGxUkmTNSmpEiLi9naWh74OedFjae6mtu2zSmhYfcecp9zVKRdaprsYKbbYhFC3LAsFr6gwDNqlOYcdeR24I0g4K++qvvyi7oQDVMIAa2WnD8/5q67w5q6iOvquAWvVX7+WZ3bhQJYKAhYr6fufyD8jdfjBgxoRsXDGCz+of7llyvXr7fX1HKREbTRSBuN1KGDLodd6NtX2aOHPCVFihCuquYPHXRnZTGTp2gpCv663BIdLXn6mcht25zbtju6pcsSE6WfflIzYYL2+hv0AwepeB5v2eRMTpb6x2U6HMKnn9byPP7wo4SBg5QaDZWaKisp9X68qHrGDMPx44xSSVx/g0GkviDgNxdWffVVXWqarKkzn6Zh9+7ysWM1GOFTpzweD/LftAgCOp1o506ny4n69lP6q/wpKbKuXWX797vM5pCoQxCwrIyz24RRo9RNV+wF5c2mTfaXX6pwOELyWWIM1GrixXnRd90d3vTBFxWxc58tX7HCEkBB0fXYp49i4Zux99wTHrDo8/M9S5bUR4TTBgOl0ZLr19lMZn77Nue6dfbKKm9kJBUVRa9dYxs7XqNSkj16KqZN00+erKVpsGOHc/wEbWQkvewXs9eLn50bHR5GrV5tO3TITVFw/37nU3OiUlJkERG0TEb88YfFahWmTtX5Hlt+PvvF57XJybJHHolITJSmpsqsduHFF8p79lLccIPh1+VmgoAzZxrEtZGf73n1tarqam7mTcboaFoQsNuNA+JZdTpq9ChNcor01Cm2ro4PUJZ5Hhw65Cov9/btp/DP4ExKkqakyvbucVltIVEHAHDypEerJfsPULXZYn6uvCkpYZ9+uiw/PyQHCsZALifmPhf1wAPNFBLPyWGeeKJs00Z7gIaIEJBK4U03Gd55N37gQFWAEPJ60fz5FR8vqo2IpIcMURmNVH6+Z8gQ1eDBypwcz4YN9rVrbW4XOpnr6dFdnpAgLS1lZTIiKoqmKLhrp/P228PUanLbNodCQUyapB0yRCWXE2FGiiTB6FGaAQOV4lB0WkqlImLj6O7pcvXpZ7Zhg/3X5Zax49TTp+shBAyD3n23qqzUy3nxgQOuw4cZqZS44Qa9QkFgDL75pu6ff6wP3B9xw/X6I0fdH31Us2qVpUsXeYDXmiRht27yESPUZhOfl+fxt9OImtPx455TuZ7+A5T+54DkZGliomTPbpc9BDVZpGB2NpORoUhIlII24Zx4wzDo9der1q6xhUgaigKPPRbx2GORTSXk0SPuJ54o27vHGXAphIDRSD7zTOSzc6P9jeU2m3DwoIskoV5PSSRw3Tp7aal34iSNwUBBCLOOMq+9Fjdpskavp/Lz2O3bndVVvEZLjhunXb7c/NNP9eVl3n9WW6dN00+cqJHLibFjNddfbwgPpyUSYsgQ1YSJ2qHD1Onpch9/ZTJi8BDViBFqtd9C53lsMFLDh6u7dpVxHP7889qcHOaTTxPHjNXK5cSePU43g2bMMGi1ZGkp++r8SgzAuHGav/+y/vuvrVOSZMYMY2qqjKZh07KmYWHU6DFqiYTIOsZ4GptPIQQFBeyJbE+/fgp/b2hqmiwyktq50xGKuRVCYLcLJSXeseM06lYGZbcDb5YvN3/0YU2IBigIwW23GZ9/IVqhCBzooUOuxx8rPXTIHUAaQcBdusjeeSfu1llGnw0DIbB5s/2zz2q2bHYQJOzVS5GQICkq9m7e7AgLp4cMUYWH03/+ZUlOlvbqrRg5Uj1+gsZgpKqq+MpKbvJkrcFA1dRwSgVx7XX6qVN1FAUJAqpUpELR6ky86GjJ6NGazp1lEAK3G2Wf8NxyqzE5WaZUEomJ0o0b7cVF3htn6sPD6W+/qf97pZUi4d69rrHjNM/NjZ40WRcbKxFJ89FH1UePMF27yfztNDIZMXiwKilJknWUEZPk/WYSlpSwx7KYfv2U4eG0b3q7dpVJpHDPbmcoT0RUdBDGI0ao2xBe2Hbe5OYyc58tq6kJycSHEJ48Rbvwzbimdppjx5gnHy89coRpKmkGDVJ++FHCqFEa32LEGKxYYf53rfXee8Pvuis8LU0mlxNi2tS6f+25Jz3jxmliYyWlpWx2tmfESDWEwGCghg9Xj5+gGTJYmZwii4+XjBih7tdfGRMjaRcLmDg0qZQYMEDpk4iCANavt5/KZa+9Vi/weN68CoWcGD5Cffy45+abDf4txNessb38UmV2tmfCRI2PBL5Hm54u79VLfuKEp7qa85dIEMKyMm9OtmfgQKVvpyMI2KuXgnGjzExXiN6jU7me7umytDRZSO/2Qxt54/Gg1xdUbd3qCGXqBQH36aP48MOEhITA3TQ3l3ni8dLMTHfT8/bkyZoPPozv3r2Rh+/ECffbb1XOfS4mI0MplRJyeYP3MSKCrqryrltnl8vhqFFqpZJc8pNpxAi177RpMFAJidILVsiTIGC3bvIuXWVJnaRLlphWr7bdeWfYiOHqVats3brJRoxU+27/qTllNhuaPz9m9Gh1s5MZnyAdPFgppqAHHLLKyrhTpzyDB6t8ug5FwT4ZiqIib06OJ5TdimFQWZl3/ARta3erNp7E1vxj/fNPc4in7uhoev78mLTOgaQuK/c++2z5vn2upnLy2ut0H3wYn5IS+JF16+xOJ05KCuQfScJZt4XFxdHLl1kOHHB16SK75hrdRcxEFY0rd94ZlpoqNRioAQOUM2bo4xMkNA0LC1nRUme18QvfqMrNZR95NGLmTQbfJJhMvFgS1Ydu3eSLFiVMnqwNuCOCANu2OV58oby2hvO9qNdRL82LyciQh2IPJEmYmen+5pu60IyHfl/dhkkpL/MuWlTrdOKgsXGiJ+HpZ6JGj9YE/Mls5ue/Ur5tq6MJafCNM3Vvvx3nb+TwVakpL/fW1nDl5WzA1Xged+kimzZdZ7MJe3Y7pVLi3vvCW45gvzCQSonHHo9c+ktyj54KrZZUKoniYq/bjTAGP/1oWr3adu21uocfPnO6tNuE5+aW/f67OeA6iUnS9z+Inz69KXXgv//aX3+9yuEQfC+mpErnvxobE0M3NXA3+4x+XGzau7d1RuRW71MI4U8/q/vzT2soOxTG4NZZhjlzoujGhgqGQW8urFq61NyUeTNmGBYujPft9AjhvXtdv60w9+6tkEhg9glmzRqbTAZHjWoUCrhypQVjMKC/athw5bXXtT3v1eUSTCbe40Fy+ZkTDs/j+nqeomDbnMkQArWKJEkoqmL1Jn70aI3dLjw3t8JgoD74MMEXj4cQ+Prruqxj7tkPRjR1t2k05JAhquJi9tQpNsC4lZ3NAAgGD1b55iQxUUpSYMd2Z1BjLITA6RTsdjRxkiZ0S2Cr5zfrKPPzUlMoW4Ag4IwM+VNzogLCphACP/1k+v77+oDMSIzBtGm6Ba/H+vvwamq4V16pWLiwevEP9QjhiZM0CQmSHxebly6t5/mGQRw96t60ya5Sk527yKZN05+LBT0ri7lpZsGsWwvz8s6ItD17nI88XFJdxbX5siJUKvLJOVGLPko0GKi6Wq6+nrvlFoN/WM/2bfbVq60vvRTTKVnqdArffFNbWOjxv0JUFP3Wm3HjJ6j9p060x3z5Rd1vK8z+RcFuuz1s2nRdKPFVBAE3bbKv+ccW+r20Tt54POiNN6p27XIGPblhDPQG6s234vr3DyyYsHmTfd6LFTZbI/syQnjcOM1778VHN7bBy+UETcEdO5x79jhTUmTDh6vVanLrVvvGjY6aGs7pRJs22tevt99xR1iABt02KBTEn39Y9+1zpaVJxZEjBL76so4gwMyZxnYpzKPWkDQNJVJi925nly6ygafPVqdOeV5+uWLWbcarrtKJsW/zX6msqeHHjWskBjRacsAAZVaWq7TE6xP5EAKWxVlZ7owMRXx8wwRKJUTXrvJdO50BpuemgBB4vbiqips0URtijn3reLN1q/29d6s5LiSDzQMPhN99d1jAdpaf75nzZFlBQSP7siCAvn0VH3wYn5wcqAgTBEzvLlepyPUbbAf2O/v0UU6eok1Lk9bXcwcz3dnZTEQk9eCDET16tE9qtEJBWCzCli0OAMG0aTqahrW13Jdf1t13f1hq6w+rLX9RYpJ09SqrQkno9VRBgefV+RW9eilmPxRBknD5MtOC16oMBuqxxyK7dZMHzKFeT/XsKd+/311by/tbk61WIb/AM2aMxueFCAuj1Cpy82Z70EdGELCmhgsPpwYOCsn50AreuFxowYLKY1nB41sFAffrp3z9jVh/R5J4hfmvVGzaZPcnDUKgU7Lko48S+vQ5I5lsNj4nhzGZBIWCkMmInj0VCOG1a+3HstyDh6iGD1dPm6afcaPhllsNkyc3H3nTZuh05L//2ktLvWPGqGNiJJs22QuL2NmzI87FC9gsEhIkKamyf/+1rlxpXbvW1q+f8vEnIhUKcu1a63PPVdA0fO/9eJ87XeCx/7RHRUmSU6TbtzscdsGnhxEErCjnvCwaOUrtU8WSk6VFxezx40zQQwxCoKrKO3GiJuCpNYtW8GbTJtsnH9cFtUViDDQacsHrsQE7FMZg8eL6zz+r8/e5YAw0WuL112MnTTrTWHDXLsecOeUfL6pdtsy8d68rMpJOTpZmZCjq6vh1/9pF70xUFK1Wk60KOA8RWi118qRnzx5XXKxk4CDV55/Xjh6jHtBfde5XborISHr4cHX//sqrrtJNnKiVyYitW+1z5pQxbvzmW3HXXqsXJ6q2lvvww+rEBKnOb4UkJUlVKnLHDmdAxkhuLpuQIOnZs0EA0zRMSZFu2eII6jCHEJhMgtFIDRkSXOSEyhunU3jt1ars7ODCBmE880bDww9HBpw+Dh92Pf9cudncyL5MkuCxxyPuuSfcJ4F273Ys+qimTx/FiBFqm1XYscOxbbszJUXSvbsiI0OZk+PZvt0ZFUUPHqw8T9VpSRKSJPznHxvjRkmdJJs2OR5+KOL8VRAmSajRkGo1iTHYts3x1Jyymhr+5fnRs2YZ/dQXuG+va/MWx7BhKp8vAkLQrZvcZuczM92+q4mayqlcz4gR6vDwBpKFhdEIgW3bHEFVZIRAVRU3frxGH6wCXKi82bjJ/tmntUGFDUIgIV7SNE3Q4RBefqli/35XY7UGXz1V98orMUplw1PJy/P88L1p9kMRt95qFNulYAS2b3Pk5rITJ2lioiVdu8ri4ug77wxTqs5jJpReT23b6sjJ8RQWsBkZimnT9Beg5LbbLbz1ZtXu3c4nnoh85NFI2m/V0TSMjqY//bTGbhMG+R22KQr26iU/fsxdUMD668gmE8+40dhxGtEsBCHo1Em6/4CrxE+VbhYQArNZCAunhg4NInJC4o3Hg956q/LoUSbogQJC8PDDEdddZwgwMPy81PzVV412KIRAWpr0vffjfc6Hmhru+efKIyLpW29tWGpKJTl4iKqujt+yxTF0mCotVRYVRQ8Zovbx7DxBLieqq7lNm+wOB5r7bHRC4oWwH9I00b27vLaWi42R9Oun9HeJ5OYyL75YcWC/u6CQ1eupnj3P1FdQKsnkFOnWrQ6bzT+CAhYWsskpUl+9Y4WC0GiIDRscQROuMQZmEz95SpAi7SHpB4cPuXdsdwUlDUKge7ps1m3GAE9nQYHniy9q/XPwMAZKJfHU01H+56DMTNfOnc4fF5sWfVTjPm1oVyiIO+406vQEzzW8cgGWPoRgwkSNwUj26SPv1fsCFbGCEKSlyd5+O76klF2woNJn/921y/HgA8UbNziuv17/wQcJf/5pWbvW6v/B/v1Vjz0eIZVCf+ON0yl88klNWZnX97bx47UTJmiCWpAJAuTmev79N4gtJ7i84Xm86KOaXbucQTUbkgRPPhk5dqwm4OPvv1+z7l+7P5kwxjfO1D/+eJT/qkpIkCQmSPcfcK1dY7PaBF+lD6cT7dntvP32MOMFbHKh11Nx8ZLJU7Spqe15/A4KlYrs31/JenCXLnIIwfLl5mefLS8r5R79X8TLr8T26CEPC6MIAvh77iAEnTvLck+xJ3POaJ8EAWtreLWaHDZMLa40moYGA7XuX3vQ7Bmexw4HuvpqbQvHjuC8yTvFvvlmVdB8C0EAffrIX5wXo2qseezd61r4RqV/MBFCIDVV9vY7cdHRDfI/O5vhOKzXU917yDMyFNknmNWr7YVFbO/eCoOB+me11Wikpk7TXZgKZCIoCvbooWjqwL8AUCrJ7j3kdpvw7jtVb71dBTB8+eXoRx+NFCc2OVmakiKz2wVBAL5VJ5USiYnSLZvt/rsVwqC4mB0+XOXrSx0VRZ865Tl2jAmm5cD6er53hqJL57OumeD71PoNtspKLkhFGYBpGt92myGgdTbDoP/7us7fPAUAkEjgQw+Fd+3asPVWVXHzX6nIyWHEX4cMUX31ddJVV2lXr7I+NLv4669rT2S7mw1GvrJRWen980+rQU9/9FHCvfdF+Id0HT/mnj27+Kuvav29DX36KO69L4z0W7MEAcrLvd9+U+fL7JFKiTvuDDMaqZYPVmIY2qqVVo476/uC8MZqFdassQV1siMBdO0mv+pqXcDrO3c6Nm2y+7Eb8wIaNkx5w4yG3DZBwD/+WN+1m3zECA3GYMcOR3m5NzVV9tGi+DvvCsvMdC9fZrnrrvDLsQPlOaJHT8Wbb8V++lnC9Gt0vkXLMGjpkvo77ixc849tyRJTZuYZJzZBgFtvMfbvr/B/WAQB16yxZWa6fK/0768YM0YdVMuBEO7c4cg75TnbG4LwRqzBGVyzIeD11+mjGpfQdbnQ99/X2/yC7DGGeh310MMRPovk7t3On5eaEhMlEILcXObdd6pqazkAQEQEvXBh3AsvRL+2ILbZlMcrHgQBpk7V+8efnMxh5jxZ+tRT5U4Hnjcv+qHZ4Z9/Vltfd8bbGhFJz54doVSS/gpyfT2/eHE9yzaIJqmUmHmTQTQXtfztVVX8+vVn1Y5b4g1CeO0aq8MhBLXZJCZJpl+jC3jbzh2O7dsaBQQihKdM0Y4apfb9umePo6aGf+WVyrlzyxZ9VDPlKm1GhhIAUFDgOZXLzHkqctiw82KovbxgsQg/fF83a1bh8uUWuYJ44MGwp56Ovu32MI2WXL/B7v/OiZO0Y8c2EicEAdevsx84cEbkDB2qGjhQEVTkIIT/XWezWvlm/9oSb6qquF27nCEEZ+GJkzTJyY1USJZFy5eb/LVpjEF4OHWnX5VUgoCzZ0d+/kVi1y7S776tW7nSCgBwuQRBwJ98UrN1q+M/1OHu7GBZ9PbblU8/XWazCc+/ELVoUUJmprugwCOTES++GDNxgtb/zUolcdfdYVptI5FjNvPLl1v408qKWk1ef70+aCsCgoDZ2Z7jx5nm/9rCJzMPuIqLvUFrLOp01NSrAw87hw+7t251Bgqbq3QBfSg0GvL66/U/LUme+1y0SkW+/FLlIw+XfP55rdnM3zLL2EEbAIBEQgwdqo6Jlbz3fvzTT0dPnarr2VO2aaMdABAZSXM83rzJ7q/TDBumGjeukZ0GQrhxgy075wwDRo/RJCdLA+KfAgAhsNuELVua906clRSCgDdusns8LV4bAIRwRl95QIV3QcC//WY2mXh/YRMWRs2aZRBpjhAoKmRNpgYZGB0tee65mO9/6DR6tHrVKtuij2ruuis86rzVwry8ACGYMkV73XX6kyc9HIcJAjz2WNTMmwziXy1m/pNPqouKzkSZyeXEbbcbNX4ihyBAVRX3558W3ysxMfT4CeqgIV0Yg+3bHFZLM1vVWXlTVcXt3esKulNQFJx6tS4gGr64mN24we7/WYTwqNHqjNP0Mpv5R/9XcsP1+fPmlW/YYKuu5gAAQ4eqvvm20wsvRt11d9iIEeoQpxUhgDDwnwGMga+VCzjdkSpgbSHUUJ8LYyAIWBAwz+OALR+hhvzixlfGviv73uZyIv/riwNodqhnu3LLoGl47z3h+/c7d+92AADUatIXOtItXd4tXSFu8T4MHqwcMkTZ+Hbgv//aqqoazMcEAa++SqfXU8G0Y5ib6zl+opmt6qx2v927nD/9aGpZlCEEYmLoZ+dGB9SO+/03yx9/WP2FjUpFvvBCdJfTNhuSBGWl3r//tu7b61q50rZ+nf3ECcblQlotOWaMZvhwVYjBLvX1/NtvV/31lyU6SuI7q+ecZF57rXLzZnt6ulytJr/4oub/vq7zctjnrBEE/H//V3fsmDsjQ3nihHv+/Mq1a+zbt9tXrbIdOeI2GKiICNrlRB+8X7X8V7NSSfjSJ8rKvAteq1y92pacLPVFQGdluefMKYmPl/oC7Q4fdr3+epXLKXTzy/isrPQuWlSdmiqTSokPP6z++WczxrhLl1CPilod2aOnIjFB6m9WLa/wLvnJ9Ptvltxcxt+jJJEQEIIN6+3C6Vh1CIHVitLTZb74Cq2O2r7dWVLCtnBYhhB4PDg5WTJsWOAyPuvj2bPXKTY0aAEY4/79FZ0aZ6U4HMLqf6y+4F8AAEK4T4Zi8NAzJyMxyv+224wZfRXXXKPzsOjHH03331d844z8o0fcobcX8HrRmn9sS34ym81nZKnVwv+2wrJqpc3lEiAEhw66lywx+8cLiy8eOewGADgc6I/frbt2Oa66SpeaKv14Uc0TT5TW1HAQgo0b7T8uNlVUnDnoOp3C339bf1thsduF0zMA/lltXbPG/tefFt/6rqvjly8zP/98xd9/ndka7Ha0eZPD5UIY461bHd99W19QwILWoHu63JfXV1TEfvxxzU03Fsx7scLhEEgK/v231f/No0dr0tNl/nqPl0WrV1t9iodGQ44Zowrl0LNvr4thApnQ/BNyOAT/k9vZQNNw3HiNRNrou48fZ44eaWTyIUk4dapW29i/qlaTL7wY3aWzbOxY9V9/pX39f4nXX69L6yxLTW2FaV8iIRQKQiqFcr/6o1IpQVFAJoNSCQEhUChIiQRqtWfeQBBQpSbEj8hkBE1DrY7q3195221hiUnSkzlMdTVHS6BYBtu/0QFNQ6kUSqTQly9Rb+I3b3HQNNyyxVFe3sAwpZKQSom6Ov6llyo3b7af/lIgkxMNacVKgqZhG7z6PI8PH3a/Or9yxoyCl1+qtFiE2Q+FLf815cMPEzZssPlrOUYjNaVxbxiCgAf2u0/5mfJGjdYYDGQw2zHMzvaUlnoDXm+eN0WFbN4pT8vmPoRAZCQ9eHCgfWXrFrvVyvt7o+Lj6fHjNU2vEBlJP/Fk5D//2GpquBtuMHzxZdJnnyWGhbdCHSYIQJCAICDl9wjEnrwEAQkSAABIEkAIpI03PoqContf7CQFRVW9iLVZhf79VXGxErHwIIQgIA6GogiSOFP/a88ep9FIjhunKShgd2x3NIwKwtRUyYgRqtJS73Nzy8X6VlD8IgggBATZ0D0v9DsVwXrwu+9UvfNOFeNGjz4a8euKlDfeiOvTR9Grl+KqKVqfPwEAACGYNFkbGUn5H8jr6vjtpwcJAOjaVZaeLmvZkEMQoK6OO3LEHfh6s+8+foIJGlaIMe7eXe7b1EVYrcLWxnFlGONhw1Q+FcFi4fPyPLm5npwc5sgRt9ksxMVKXnm5oqDAQ9NQLJLVOt40dBHzF2+AJM+8CAkAACAbu9JJEoqqG4SAJEFtLff6goo3Xq8cMVL1xsJYYxiFMSZIACEgqYAri98IAQA8hzdvtF9/veH2240QgtX/WBvkOQRRUfRbb8WNGKk6edLzzDPlJ064afJ01wgISAJACMjWx7gqVcT11+sffiR8+a/JC16P7dGjIWRdIoH33R8RUCm3SxfZgAGNtGOE8ObNDtdp9UOtJgcOCt6e0+vFhw4FJpw3E5mAMThyxM3zQbo/QggHD1YGuNqzs5mTOY0ElVRKjBuvEb2SSMAfflj9888WAgKex14vFgQsCIBh0IsvVHz6WWLbazP7V1SEjeoB+la5Pzgv9neUyuXE0KFqiZRYudIqkdS+9lpss/nSEEL/W8vL9+Se8tx+h5EgYWwsvXeP69gxZuBApVi/My1N9u678Y88XJyZ6X722fLHH48UK+hCfHq0bbJOXXud/vob9E23gqbrTSolxo9Xr1lj8zuQw2PHmIJ8T6/TBVMHD1YplXUeT5Cj3YnjjMsl+KvkzTwnl1M4cYJp+UIYA42GaMrWA/tddjvy36QSEyUDB57eyyCcMEGblcXs2ulMTpZ2SpYq5IRMRkikUKMm3W6h2fG0AN952381QAJCAoqF0wEAMimBEPCy/ssOuNxC9GnXPcJApSLHT9CMGavesd257BfzxImaq6/WIQEAALCfRihWqRFP0QCAtWts1dXcx4tqIAQUBc1m/u+/zeISxxgLAk5Pl7/3XsIjj5Ts3OG0mHmpjIAQYACQADAGSAh+g01BUbC4mN261SGTESoVoVKRtATSJJBICJKCCgWRmCjxLYmhQ9UxMXRZWUM4gxhCmpnp8vGme3d5XJzk1Cm2BesuhLCoyFtVxaWltcibqiquuJBtWdPGGMTGSgLqX7As2rvXKQhnljLGuP8Ahe+ETBBgxAh1j+7yX5aZDux3Tp2mnzRJqzqHSGHRDBNgUIEQEBAgjMVTaEyMBGNQWnbmWORyCRXlnGgiQghgBMTHLJUSMhkUBOB2Y4wBL2CMgdDI8AogIX4drq/nt2y1z38lpn9/JYAg84Dr4YdL1/1rf/ghL8ZQEBq6cvbrr3zrnbj/PVqaleVJTZOKUyegwCu3Fnl5Ho7D5eXeulq+X3+lx4P27nGWl3Ndusp++qmTL7U+IVHap4+ipORMUjbP4T27XXfcESY+o4gIOj1ddvJkS7osQYB6E5+b6/F/3M3wpqCANZmDVLVBCHftKg0oZlNezgV0D6AoOLRJjW69gXr44cijw9RLl5p273befLMxI0PRtvAajsOMGzEM3rnTUVvLORxC375KAAAvYDkkxH12zBh15y7Sv/+yDBumyshQuNxo2S8mmQyOGaMBAHi9yOvFTifKy/McP85kZzPp3WUDBig4DrucyOvF+/a6AAB2m5CeLg+PoARBVMPhhvU2jMDoMQ2FORUKoksX2YEDrrX/2hITJB72jCVw9CjN66/HznmyzMtiJACEsMuFOA4HNXOcDUlJ0jfeiAMAnDjBfPll7bPPRP290vLXX2a5nLjjDqN/ES6pFA4eoly9+oxbmyDg0aPumhpOTBygadirt+Kvv6wtfyPrQdnZzNSpuiC88XiCVMknCNirtyKgnMzJk0xtLe/7IMYgPILqe5bG6L17K9LSZKtXW99+u+q66/SzZhnbMIMkCYYOU3XvLs/PZ/NOedxuFBlJR0bSnBdrtaRaTQAAuqXLv/wy6Ycf6r/8otYYRpEEjImlF74ZJ0pBmYyYPEWDAfj5F7PNyt95V9hNNxlSU2VOpzBgoCI2lq6t41avtjqdSCojDAbKyyKNlpTJiXoTf+NMgy8XXaejbp1lCAsn7TZerpAOHqwi/LTDadP0bjfasd0hkUIIQb9+Co2ajIk5V0dK584ymQzOeap000ZHRAT9xsLYSZMCoxIGDFDpdKTVKvjaz1ZWcvn5rC/hpGdPuUJBtKziIATy8jyCcEblDeQNxiAvjxG7JrVwIYUC9mySWpuV5WaYM4XNEcJpabLEsycDKBTEzJmG/v2VQb1gZ0N4OP3uu/Gi2uvrTPbnnxaPB4+f0CAJIARi2ymHXWA8WC4ntH6dp3r0UPzf/3XCGIvVtX0mR6WSfO21OH9FDQC8fbvDYhZumKGPiaEffDDC/4wGIbj77rA77jACAEkSDBqk9pegBAFuucV4ww0GsS/aSy/FtqF9ZlOYTHxFBff339YhQ1RvNZeKDwBITZUmJUl8NfAgBC4XOn6c8UWzpKbKwsOpkhKuRRUHlBR7nU7kWyeBvHG7UVGRN2jAjV5PJSU1IgTL4qyjTMBprUcPeVDrVkAARqsAIfCPB2BZ8Msv9evX2x57LOKhhyMCbI86PaVrcgWCEK8AW76yIOA//rCsWmW77Q7D//4X2axFW0zYO/1zM6P1XbBdyn6dPMk8N7d82zbnxAnat9+J63yWWGCtluzeXX7w4BkDjCDgI0fcPuERHk7Fx0uKi70tHPAghJWVnMnEn5U3VitfXu4NphTjqCg6wEBnNvH+2V/i7PTpI7+QsRA0DSdO1F51lS48nG7f7yUIOGKEZsQITUQEdSHD41tARQV34IBr6jTtwoVxAVY0f5Ak7N1b7i/8IAR5pzw2q2AwUgAAhYJM6iTdvr2lukkQAptNKC9nfYs8kDf1Jr5xBlczwBgkJUkCOg1XVnn962VgDLQ60hd8fmFAECCUTvRtAIQgIOT+oqNPH8ULL0bPmGEI2suuW7pcqSSczobHShCwqoqrreNF3hAESEuTBc3jdLtRddUZJ2CgvK2t5d3uIIYFggDJKdKAE1BxMet0+ocSg4hw+txVvw6cDUYj9fDDkaE0QExIkATkMNjtQmnJGWdWSrI0aPifIICKyjNeqkB5U1vNBc3LIgjYVDAWFLD+3S4RwgkJkqa5ogiBlrIjIAA45IxM2KLFFfr+d5a/AQCA707hWd93SWxKZ7mN0MZmMFCxcXRREdtwQxB4PLiw8AxvIqNopZLwnbmaBcbYPzQgkDcVFd6ghymJBAYkpmAMSorZAONbcrI0oMWoGPiyfYeTpgAAEGMg+iMFBAgCEBCIhxrRJgsJQECAMQAQEISYxNpQidLvMIJJAoqXgrCBdgACSACMAQSAgACDBi5CwvfXhlfFu8QANFSzbaAtgKDB6SjaFUUfJEkChBtKVEJ4+qtgw9MT/xMnoMEqDM+QEgIASYAxhgASEIo/NLxLHC3A4gdFCyYJIYAAYwAJACHACAIozgYWfR3iyZEkIMINfcvx6YFpNOSMGw3+5fsVCiIpSbrDT4NBCBeXnBEe4eGUSkW03FQGY1BdxXEcFpX6wH2qppZrOVYLY6BSEQH9rlkWVdc0iiYkCJiQIAlYrAgBnsdOhzBxolYmAxSFx0/QRERSTqcwbpwmNU1WVeUdPkLdu4+ypNTbv79y8GBVSSnbOU02fLiqptobEU4PH65yOnmKAkOGKMPCqPJyvn9/lVpNVlR6+/VXdO4szTnp7txFlpQkyclmunaR9eotLyz0qNVk794KmoIlpd4ePeRxsXRWljspSdotXVFXx9vtqEtXeZeu8ooK1u4QunaRJSdLGQb9/oflx59Mx465d+92fPNN7Z49Do0aJiVJEhIkOScZu0OIjqb37XNBAkRH01YrfyyLiYqkZVK4Y7tdrSbCw+iso0xNDW80UiYzv3+fy6CnKyu8Bw+5tFqSE9D6jVaJBHhYtH69jSahlIYbN9qtFkEuI3fuchYWshIpPHLYffiwm5LgggLP1q12goTV1d5//rEgjO0O4c+/LE4XYhj055+W2lquro7/4w9rbR1vsTR5FvGSxnnWoKrK6xP8Gg1pMFAth42K8e2+QJxG8gYjYLUGUW4wBgolaTQ22oCcTlTfuIgcRYGmyg1NQ5qCN9ygnzXLmJPNTJqsHTFCXVfLZWQob7rJsOJXs1yuvfvusF07ndXV3tmzIwoKPEePuh/9XyTLon17HY/+LyI8nD561H3HHWG9eyt++L4+MVFyz71hX31Z272H7I47wg4fdlVWcI8/Frlzp8NmFf73WKTdLmQdZR79X0RsrOSbb+p69lLcdVfYoUOu+nr+8ccjCQJWlHsnTNAOH6ESBFxQwFx/vZ6iiBUrzMePM6NGqm+caRgxXOVwCn/9aV250nroEDPzJsOUKVqlioAQ3nlnmMMpDBqkmjBBm5PD/N//1T38cARC2GIWZtyoT02VRUfTdfXco49GFhZ6Pvqo+qGHwvPz2e+/q3vs8Uiex06ncOONhrh4ydy5ZTffYkxOlspkRGyc5MYbDQmJdHU19/jjUTt2ONats819NiYvz/PpJzVPPBHpdqOXX6q4995wo5F6bm7ZTTcZevaUkyQYPFg1cpT62WfKRLtlwMzHxjUqDg8hqK3l3G4kum/lciIsPKhnEDocgi9Uo5G88XLIvwzu2aBSEgE9FlwuwWzm/avhy+UwoonK5nKhEyeYgQOVZWVes4Xv0V1utwt5pzz9+yl4HmdmugYNVAIAdu129M1QQAj27HGlpckUCuLQIbfBQEdG0rm5DMfh1FQZy+KsY27RZngim+nbVwEA2L/f1bWbDEKwf7+zVy85AODkSUYuJyIiaI7DublMjx5yAMCRI+7UFClBQJOJr6/nU1KlAIBTpzwHD7o/eL/mySdLPR688M24RR8nxETTv/5qtlqFhx6O+GFxpwkTNN99W3f77YV797rEAKhu3eTHjjEAgLg4ideLS0pYqZSIi6OPHnUDAHr0kOfleRgGxcZKKIrIyWGSk6VeDuXne2QyIi1VtmevUy4nUlKke/c4AQADByozD7h4Hvfrpzx1irXbhe7d5WYTX1LCJiZKSQoeO8bo9VR0DL1/v5OmYXp3+a5dDgBA/wHK3budUimR1lm2Z08zJ+qoKFoqacQbU73gcjYID4kEajVBA7iAw4l8+XuNeMOyOGj9AIyxWk0EqN8OB2KYRh9UKim9PlApzjvloWnYubMsM9OV3EmqN1DZ2YxKTXRKlpWVed1uoWcvhc0mlJSwAwepBAFnZbmGDlMBAPbvdw4arCIIuH+/q3t3uVJJlJWxPA/S0+WFBSxJwM6dZRyHT53yDByoZBhUXOzt108FAMjKYrqly2ga1tVxDIPT0mQYg7xTHrFBd0kxq1QSSMBLfjI9+0y5y4l69lJ89VXS66/H8jx+bm7Z//5XsmKF5cEHS555pqys3Hv/A+FLlqZMm6rLz2PX/Wv74ft6g4EqLfVyHFarycREyckcDwCgTx9lTo4HAJCSKoUAVFR4pVKiZw/5oUNuhYJIS5OJrBo8VHX8OIMxGDpUnZXlRgj06q1wu1F5uTclRaZWkzk5jMFAJSdLDx1ySySwX1/Fgf1OCMHQoSrRjjd0qOrkScbL4gEDlLV1vMnEjxiuPn7M3TSvW68n5QrCjxnQ6US+TYckoSZY8V4IgYdBvkLujaST14tdzuDyRqMhAyyedjvv9RsrxkAqhU0d3Xv2OkgKHjnC/PuvrUcP+cFM18qVVomEOHzItX2HAyF48qQnJ8djtQoVFVxWlruokLXbhe3bHYcPudPTFQf2u7ZucYwarcnMdG3f7kAInzjOrN9ghxBkZTHV1VxpqddsEnJzrXV1fHUVZzbxu3c5h49QZWa6so663W6Um+tx2IWCAtZmQ0cOuzdssGdmuu67rxhAMH2adtp0vUpFbN/uWPhGVVmpd8gw5YcfJaSlybKy3MuWmZ94vLRHD/kttxhvu914/fX6VautK361OBw8w6CPF9VoNETeKc/hQ+7yCraqitu9y6VRVxMULCj0fvJpbec0aX4ee+qUh2FQTrZn8yZHbS3vsKF9e51vv1UlCHj3Htdbb1Up5ER+Pvveu9WpqbKCfM+nn9Ts2uXIyfHs2OEsKmRLS73Hj7tdbmS18tu3O6VSKCCcmel+7bUKlZrMPsEsWFCp05E7dzn//NN840yj/xNSqUmZjMD4jJeKZZHD71nrdGTQ05nXi52nt6NGfedrqrlp0/JajsbgeXz9Dfpvvknyt9+sW2e9685i3wEeIdC9u2zlqjR/rZ5h0OOPlVA0gQR8NMs9bJia4/DePc5Bg1UyKdy509G9uzwsnN67xxkdQ3dKkh456qZI2L27PL+AtZj5/v2VNTVcXp5nyFAVwGDXLme3dJleR+3c5ejVS2E0UMdPMBiDXr3khw66FAqiS1e52cRnZTFDh6poCTyw3xkeTicnSwuL2MpKTqUkTpzw0DTs3Ud+00zD2HEansdr19r+/MPidAkTJ2qvu06flibzTSXP46xj7hW/mnftdCYkSG6+xThqtJrn8D//WH9eaj540O3xoLAwCiEcGUnTNKyp4eVyqNFSHgaZTHxMjAQSoKrSq9GSKiVZXuE1GkmFgrSYeY7DkZG0xSKwLIqKknBeVFnFiW3Dy8q80dG0RALLyzmDgVSpiMoqTiaFRiNVV8cLAoiKou12wWYT4uMlDINqarjERKnZzI8cpVq0KNGfBxWV3qlX5xUVNmRRil0Hf1mW7EtU+OCD6tderWrhuYsRV78sSxk6VBUobwQE+BD6O0hoGBAK6HIhnvcvp4VVKiJAJuXleWRy4q234teutSUmSp95Nmr/PhdFgdffiKso9zoc/OtvxAMAXnqxbM7T0XFxkhdfLL/hBsPAgcp33qnq0kV+7bW6xYvr+/ZVPPRwRGmp1+7gX3893mziXW7hjTfilEpy/vyK8eM1w4apnn+u/OZbDP36Kf/91xYTQz//QgzLonkvlt9/f0RCouS996pzshmeJyZN0tx8i2HAAGVdHb94cf3atTapFF4zXXfV1bqA4oQAAIqCfTOUGX2Up055/vjD8sEH1d99WzfjRsNVU3RTp+o3rLf99JOpuJgFEL/8SsygQarFP9RJpcTNtxirqrgPPqh+/vlog4H64ouamGjJNdfq33+vKqOvcvwEze5dzk2b7PPmxRzY71r7r/WlebFisd9HH4mIjZcsWFAxbaqu/wDVxx/XJCdLpl+j/+Vnk8MhzJ4dsXmzfddO57x5MTk5zPc/1C9YEGuzobferHxxXkxpqfevvywc16gJo0xKKBSNSMHz2L97iFQaPKlaPA6LPwdUwMc8F5w3YsC2PzgOC42P71IpEUDefXudPXrI5XLi8CHXoMFKioKZma6MDKVcRhw+7E5OkRmN1MmTjFpLJiVJy8u9rAf17Cm324WyMu+AAUpBACdOMIOHqEgSHj/OxMdLwsKoI0fcKSkyvZ4ym3irhe/VS15ZybFe3KWLnCThieOMGOxRV8dbLEJmpmv2g8WbN9qnXKX75JPEDz9KCAuj3n6r+u67ivbvcz34YPiPPybf/0BEU9L4IHZ5ef756MWLk8eN1/y42DRrVuGyX0zDhqt+WpL8yvzYlGT5e+9WL1liCo+gq6o5o5Hq2lUWHkZZrYLRSA0bpi4uYY1GatBgVWEhq9dRgwYpPR7k9eJBg5WcF7sZISFR0rmLLK+ADQujBgxQ5uR4dDpyxHBV7kmPWkWOGKEuLfWSJBw8WOVwCC436tVbIZUQ1dV8crI0JlaSn+/p10/JsqikpFGSDUkAqeTM3gIhEBDwV4NoOrh3Xuyl3QxvBAEIIQQv0k1s0jwHMGr0Ikk1CsX1eFB2jmf4cHVNDWe1Cn37Kt1ulJfvGTJEiTE4fMg9dKgaALB/n2tAf5VIqc5dZGo1eey422ikEhIkxcUszzfkzh0+7BJbfx096h48WAkAOJHNREbSYWH0kSPu5E5SrZZ0u1F5hbdnT3lFhXfpEtPOnc6flpgyMpQ//Jj80rwYtxs9+0zZQw+V1NRyL70U8+13STNmGPzD0GpruaVLTF98UfvFF7Vff1135Ijb/7gRHy955JHIn5Yk3zrLuG6d7fbbCr/8srZPH/kPizs9/njkrp2ODz+o2b7NeeIEgxBITpEePOgSj4G1NXxFhTc9XV5czNbXc2o1GR5OZWa6lEoyOkZyYL94mFJkZjpZFvXtqzx5krFahW7p8rp6rrSUTUyUEhBkZzMGAxURSWdmumgadukq273biRDu21exZ49TJoMpKbL9+50BsbMBfiHsJzwAABI6iLwRjbE+sdJ4nxJC6QLRTJAAx4mWTD9u0Y3iSzZtth875t6xw1FaypaXs3/9ba6t4U/lejZvtv/7r23/AVdUNJWby6xfbxs+QrV4cd3KldaUFOmPP9Zt2eKgKPjjj3VHjrirq7lfV5hYD96506lQEnl57P79rohIKr/As3WLUyIBi3+sW7vGHhVNLVlaX1vD5Z70fPtN3b79LpWKfOWVmEmTtXIZsX27Y/4r5cXF7JChqg8/TBDbzDS9x19+Me3c4RJJWVXFbd5s//rrpAC3SXg4dfvtxunTdVu32n/91fzPauuIkeqbbjJ89XXS7t3OJUtMDz9UHB0jMZt4i1XYudPJ8+D4MdfDDxXL5MSJ454HHyhWKImiQu+WzY7fVliKith/19pWrrK5XMLJk56KSg4jcPSIe/bsYrmMOHLE/eQTZQYjefwYk5vLxsXT+Xns1i2OlSutlZXeulr+YKbTYhHy89nyMq6szGux8jwP7rgj7LQvE1CN1QaEMO/XqIQIIVgXYyCc3lQCmsk2ZI20DIEP/p4AHMp0pabISBIeOugeMFCJBLB/v6tbNzlJwkOHXHGxtFJJnjjOyOVkVJSkpMTrcuKUFFl9vVBa4r3mWr3bhY8dY8aM0fAcOH6c0WlJvY7av98VGUmpVKTFLJSWeqdN09bW8GYTP2igcvtWx7//2kkShkfQTz4RNXKUmmXx2rXWP363OBxo/ATNi/NiO3eWtaAG1tfzo0apH/1fBAAgJ4d58cVylkUANDO7Wi15zTX6CRO0+/Y6ly03P/xwSd8MxS23GD/9NDEz0/XD9/XHT7gZNzboqW7dpAShKCxkBw1SellcU8Nn9FX07Enu2+dCCKeny/btd3lZFB5BW61CWak3vbs8JVVaVMhmZCi7dJHl5nqMRmXXrvJDh1wREVRyivRgpstq5aOj6doavqKCi4qmlSoiL8+T1ElaUcFVV3GNREhTiQDPvCTwwQWGmDPUHG8oSIbAO//8LhE03VTjOZNG7/Egi0V4+JGI6Gj60CHX449HKZXE0SPuhx+J6NxZVlTonTBRM3Kk+uOPawYMVN58s/G338xqNfnggxG7dztM9dz//hdZWMhm5zDiB99/v3r0aPX11xuqqrwDBugnTdIeOeKurOCeeCJq2zbHli2O48eZwkL2hhn6mTMNffooamu577+rW/OPjaLhtOm6qVfr4uKDx1pACHyZR4IQ3LmpUBBjxmqGj1AfOeJavtz8zLOlaamyW241frQo4cQJ5qef6vPzWK2OGjtOs3at9Y034vLz2cU/1C98M46i4CuvVEycqBkxQv3GG5V9M5RXXa3bus2+fr1twYK4vFOezz+refOtOJcbzX+l4sUXYwwG6oUXyu+8M6xXL/nrCyoHDlJOmqT9+qs6WgLvvjts1SrriePMc89Hf/hhtb+ihhrvSgAAovHO5eUAbtGjjDEgCOg76zRacSQB6RDiw3k+sLwDTcOAtctzZ8o7FBayHI87d5bt2+eMiaGNBurEcYaiYVKStLTUazLxPXrIHQ7hVK6nf3+lIOADB1xi6syuXc6MvkoIwZ49jtRUmVJJ2GxCYSHbt6+yvp6vrODEfI7MTJfeQC77xbzwjUpTPZ+YKPn0s8S33opTq8m33qy6846iXbud994X/uNPybNnR4RCmjaDpuGAAap33on/6qtOnTrJFi6s+t+jJRaz8Prrca8tiC0v8765sGrnDufeva7UVClCoLzcS9OwXz+FGMc5ZIjq0GEXQYC+GUqHXaip5rp0kcnlRH6+JyqSTkiQZGW5lUqid2/5wYMuioJDhqoOHXSTJBw2XJWTw2AMBg9SVVVxTicaMUKdddTtVwEDBxgDCaJRKioXwnmIIICPatTZ/tACWC8SBBwQ2kcQjXRq1tsQ0I8Q2L3b2amTFCGwZ49r0EAl40E7dzk6d5YJAt671xkVRclkRGami6RARDidl+exWITkTtLqai4vj73qap3DLhw86L7mGh3jRsey3DQFjAZq9x6nRkNqNGRBAbt6lbWggE1IkFxzrX76dF1YGHXwoOuZp2sPH3Z36Sp74cXooUNVrc22EZeX+DNJti6agiBg9+7y7t3lt99h/Psv65df1f7wA3H9Dbp582LKyr1Ll5rmv1IxYoTS5RLWrrW63RqCgJkHXHv3OnkBnDjObNtmV6lIJIC//rIMGaKiJcTff1kQAjIZsXaNLTKCpki4ebOtRw85y+IjR92bNtkhBCUl3pUrLZGRtM0u/PabOT5OcuqUZ80a65AhKqORQgiwXuTvCCKIRucbjwfhYBEs/iKqkd3PZOKvvy7/yBF3C5magoDHjdcsWZLsbw9Yv852551F/na/9HTZqlVpxjAqL88z+8HiiAharyczM119+ijkcmL/fldamsxopA4ddoeHkYmJ0hMnGAhBerq8uNhrMvF9+yrq6ri8fHbQQKXbjY4eZfr1U8jlxMmTDMagZw/FocMumw3FxdFmsxAZSc240TB+vIam4Y4djmXLzEVF7KCByhtnGjIylEEjkprFggWVtTX8jBv1AICCAvbvvy3ff9/JEKzbRbOoruLWrLX++afVw6Crp2onTdKa6vlflpk2b7JbrYJcTkhlhNuFZDKCoqHdLogVERgP4rxYrSbFjBmNhkQIOxyCWk1CCO12XqEgKJpwOgSahlIZFCvMi5kJPI+VSsLlQlIp/OKLxAkTtRUV3qlX5xUVNbL7LVuWMvR0+cSXXqr4eFFNC88dY2AwkL//nirWyGo0ERIJFHNHWobDLgSINbWGlEigfy6F243cDDICwLhRQqL0mWeitm61K1TE7Acjjh51u9zo6aejq6u8tbXc089EAQDee7f6/gfCo6Lod9+tvnWWoXdvxVdf1g0dpp4wQfP77+a4OMms24xuF3rv/aobbzTUVPOr/7F6PLh3L8Ujj0YOGapk3HjNGtvvv5ttVmHceM3zz0V36So/l4SBa6/R/fBD/S8/m8SVcOsthja3X4yKpu+5J/y66/SbNtlX/Gr+6y/ruLGae+8Jv21W2PJfzf+stmnUZJcusvh46S23GDIzXYcPu++5J5xh0Fdf1dx8szEqiv7667qRI9U9ust//sUUFycZM0azdo3V6RZummncv9956KD7wdkRxYXsH39ZHnsswulE//d13ezZEZVV3IYNtoy+SgCA0yl42EYORIkEqjVnJshq5TDGLchVjIFEQvjSnxvxRiolVMEqlEII7Q7B6210uNBoSJomADjTQsHDIqdTAABkZTH9+inS0+UrVpgnTNCmpso2b7IPH6bq2lWWn8f07CnPyFAezHTFxEpGjFBXVnAyGTF+vJYkgceDJk/WJiZKzWbh+uv1qamyrKPuslLv4h9M9Sb+2mv1M27U9+ihqKnmvv2m/p/VVoKA06brpk7VtUsb3569FO++lyCqaG2rHREAvZ6aMcMwZYp2107nsmXmxx8vHTxENWOGfuZMw19/Wtatt7ldiKLg9Om6vDxPjx4yvZ7KPOiQy4kRI9QF+ayXQ0OGquwOYf9+18CBSpmMWPxDXZ/eithYyYkTTEqKtEcP+Y5djrAwevBg2batDokUXnONbu8eh5jd53Ai1hPgQCR8ezfPY4c9eCqSXAEViub0YpqGmhDkjcuFnM5GX6NWEQoF9Cecy4UsFoHz4oMHXX36KMrKvBXl3i6dZRYLn5XF9OypcLvRnj3OXr0UHg/ascPRtYuU4/Cu3Q7RI3PwoJumYVgYlZvL2KyCSkV+803dM8+W8zwYOEj5zTdJry2IlcuId96uuvvuot27nPfdH/7zL8kPPxzRjr2fRW3PV/GkXaBUkhMnab/+v6T33k8QBDzvxYqlS03jJ2g++yyxbz/FU0+VLlxYWVLMHj3iAgAMHKDev8+FEO4/QHn8OON2o969FZWV3upqb2qqlOdxTi4TGUkZjdShQy65nEjrLN292wkhyOir2LXLqVKT8QlSsY6R2cS73Y3kjVpN+GpCsCy22oSgSSxqFSk5HcDZSN5ACHR6Kqjd0OVCJhPfqdOZvCelijQYqZISry+ClXGj+nou95Rn2zZHfj7LcaiszDtnThnnxfn5nrIyL0mCkyc9hw4z331XfyrPEx5Grf3XXlzslUrg0SPuqiqO8aB77i4ym4Xqam9urkerJW+6yTBlikanow4fdn/ySe26f221tfygwcqePeU11dySn0yn6+ZhAADGZ4KIsc92cboPOTr9Kzz98hnS44a3nVkZfnULGi4OznzA90Wnry3+19heAk+/CM5EvsqkhEZDLPvF/Pdf1pEjVTfMMEycqF2/3rpnt/Ott6pXrrLZbELWUbfFyiME9u51PvFEqUJBHD7kfuaZ8ogI6sgR9/xXKpOSJNnZzP797rVrbSUl3tpa7uhRd309n3vSU1XNFReya9fa3G4BCY2sJxhjYxilPJ2RwjCorpYP6qBSq0mptLnzFAAgOiqIwRlC4HahutpGtj+ViggPaxQxLwigspILj6Dr6vj8fFaMgS0vtwMACAJWVjrEH8RQZ4KApSVnTM6+ZpB5p1iZjBg6VDnjRsPo0WqDgWIYtGqVdds2h8nEZ/RViHVuck56xMDhhph20ZyFG4YLAYTQRxBfYDD2Ba6fORdCCE/zAcKGqHcIG4gCG/7u4wgGUKyQciaKuOE7G0KNT6fzQeALfQbgzAgJCDt1kqYkyzAACIHMA87BQ1RPPRU9bZr+/ferv/u2HiFAEjA31wQAIEmYd4oV5yonxyMe9zBmfOe+3buc4mCOHGbEH3JyPAQBeR4nJdrT0mSCgMjTJXfEbBPFaXljtfKhxHmGhVE+ERXIm5hYCUkGKXXJcbiqcTNtiYQISC9CCJcUe3v2UoDT5T/EH8S/Nv2h8QPwHYAhTQOzRfh5qWnJTyZRlvA8IAgAfCVtgtodYNMXRE5gMXYdQogbAsNh0M+e+Yv/tzcdSQg7mx9dG0TiwYPM55/VESSw2QSahjzfMAm+2QiYH/8V3vRtvsReJIDSUq+fAAYQgphY2vfO+nreP4fpbPcbHUOfNT88IoKSyQm3q6WoP0HAJaVswEWTkqQB55fCItbLIo2GhPAcCp9jUFTA+j8R0dIglxGMB0EIfKX2QgQEgOMxwyCagjI54fVilkUSCSGVtmKIGAO3G2EMRGOEqDooFEQbbhMJwM0gmQxCABgPVigIMaMjIBK3zRAELCBcXMz6j40gYFLiGTWjqooL0H6amTcIY/0CxpvhjUIB3S3WhMQYFBayXm+jCI+UVIlE0rBExK8pLmbj4iRLlySH4mMPGfijj2qqa7mX58W8tqAyPJx+ak5kq6xyEIJt2+yvv1E1YqRq3osxK1aYP/u8bsYN+vvuDw8uuk7DbOGeeabMbkcffhAvCOCpp8sMBvKdt+ND6aAcMJhTeZ5XXql48slICMHbb1e//XZ8SrI09NLGocyYzSY88WRZ4+hvwj8tX6ym03LyE0U1yoUNvE+jkTboqbralqSWWJ3A4RD8w/mSkqQqNWkxn4lErKvlfQVp2hERERTDon4DlFotERFB9RvQ6uuXV3oBAAYj2W+Acu9+J8Y4Oobu178V/RDrTZxMTjAM7tVbwQuYoqBcQWb0U7TBMCiRQYkUdukqIyCkadizp7xrt3busLdzp8NsbpRtotWS8acPnoKA8/M8Yuba2SD2tYxuQd5otWR8vCQnp+UCTLCmhqut4fx5ExUliYigzKYzvLHZhJxsT2t543IhX16PTEoEFLkFuKE6uhjycbaKVV4v9tVGIUmoVAaGp4HT+m/Dz00uJAhY3InEe1EqCP96Ng0l1jAQEG4ordWkRjrGwOVCPiedXEbQzVmuxdpbCDVozk2TWTkO+wLICQIolcEDgQNw7BjjcvkXz8PRMbSvS7TTiYpLglQgwRjo9VRs7Nl5I5cTnZKlQVUkq1UoKGS7pZ8pG2AwUKmpsuwTZwjH8/jIUfetrWnPsXKl5fvvTDyHAQQYgZhY+oUXo5OSWlfopKLCu3BhZUkRJyZokhS4dZbxxhsNZxlGM0VM3G700YfVu3e7fMrvyFGq/z0WGbouhRBYtsy0fJkZCUC8l+QUyQsvxrS2OEFdHbdwYVVeLiveCyTAjBn62243hl4TQxDw0SPuxsXzQJfOUp/5u6aGKy8LXoEkLk7iL02bkaudg1UnAACwLMrKcvsX7pJIYO9eitWrrP5vO36ccTiEEJu28xxe9ou5UyfJuHEaAAAv4I8X1e7Y4Wgtb/buc504zjz2WJSo6u7a5Vi2zDRtmq6FLqMBKC3x/rPadtfdRnFHLy3zLl1quv4GvX831JbBMOiXX0x9+igHD1ICABgPWrSo5sAB17RpuhCvIOLIYfe+fa4nnohUKggAwKFD7mXLzNdcqw/d6WGxCNk5jD8rSBL27qPwPeJTpxiTSQja9ScxSeJfyqgZ3qSkShUKomUFGyFwLIthWeRfQahnL7lcTvi8mwQB8/PY4iI2xFbKCGOOwwMGKK8+Tcfff7O2oRSXx4MiIulp03TiviAgfPw4E7RNlz+8XiSTwYmTtImJUgBAXr5nxQpzKJEGfvODEQJDh6mmTNYCAFgW/fyzyeNp9QGBZbHBQE2dqhMPbgolsWuXM5QYKx/y8jwlxWfazYtp2mL+oYisowzLopYlBUHALl1kjU5kTd+UnCwNCwveKSQvj62ra2T969pVFhlJB3TMOngweL3+xjPe8APP45CiVpsAAgDwmcQMAYFWH48hxOCMqtHm8yA6fQVe1IHaZo3wvxfBd4ehYv9+p39lYIxBXJzElwjsYVHWMSZoRQCFAqY31tab4U1kJJ2SKg2aZV5ZyYnpiT7ExEh69JT7r2yOw7t2O1u1UjvQjvB40J49roCS6X0y5D6luKqSy8kJ0j8VYxAeQaemBeONXN5IjjULCIHLJezZ2ygVWSKBQ4YoCbJRc8eDB90VFV7QgYuBwiL26BGXv5ijaThkiMpn9s3KcldX8UGUG4RTU6QBBZqa/0Sf3vJQwp3273M5G+cFDxyo1OvPVMQgCFBe5t271xn0UmcGdHpEFNlGM7PoMDhjbidCt+edAWxksG/DKMR7OXOFhro9bQBsMpKQL7Nrp7OmRvBXbsLDKV+rSozBnj3O4BokBD16ygNOFc3bqdK7y8PD6ZbbzYvN0AoLWV/RdgBAly7y9HT5zh1O31x7vXjTRrtYgjXI8CAkCHDypGfvXifGQBBAbS0XSj5YACQ0NJuE3budYg7iiRMM0UpPB0UCD4sP7HdVVnEAgOKiRqXEQgFBQAjA8eOMXk9iDBgPsliEEJuxNRoJDW02fs9up1JJQAiystwA4FByVgAADIM2bbT7Fx1GCPfurfBZii0W/sD+4NqnTEb06xd4smmeNwkJ0m7dpOXlLHF24oi9qXfudPrzRqMhx4zR7Nrp8nsb3LPHVVDAdu0a5BBLUXD6NboffjDt2u2EACAMwsLIIUNa3Qe6f3/l39GWBQsqidMO6ltuMbTKjRWfIBk2TPX5F3Wi/1hAYNQoTasqTspkcNo03YoVlvXrbAAAhEF8vERscd0q9OwpT0uVvflmlSgyEAbXXatrtudIU+TkMJkHXQHFeMeO0/gkx7HjzKlTLBGsW1R0NN2rZ2i8USiIQYNUmzY5QIsQBLx5s/2uu8L8Y41HjVJ//lmtr+gXQYDKSm7DentQ3kAIbrklbOJEHXemYzER4hz5o1Mn6ZdfJtlPB7BRFDAaqVbFjKrV5IIFsRZrQ+4yQQC9nmqV45Mk4X33h193vd7nsNNoiDZ0ooiNlXzyaaLdLohbHEUBg4EKRfJhDNautdXX8Wc2KQSioqkRw1W+N2zZbLfbhZavhhDu2VMe0zRh/mwfGDRYpVKRrhYd4wQBjx5hTp3y9Olzho/p6fK+/RQb1tt9AxIE/M8/1ttuNzatiNPkgiA8eOGn4FCpyHNpFwIAkMqIqKhzKmhOkjAioh3KqSqVRICfJBTU1nLr/rU36h+L8aDBypTT7QTNZn77NkfQ65AkHDxE1VTZPeuA0rvJOiVLWjaXiVuVrxWg7z6nTtX5azMEAbOy3Dt32sFlAoRAdTV3/Jg786Dr4EFXTg7ja1l9uWDzJvvJkx5/WSKTEdOm6Xx22oMHXbm5bNATuN5ADmqut9lZF3dYOD18uCrraJBGVAjhtWttd90V5u+8GDNGnZQkzc9nfW2PXC60fLll/Hht6Mb+i4WTJz3ffVe3ZbPDbOZ5AUMAaJqIiqanTdPdfrsxoJDqpQm7Q1j+q5llkb/I795dPnx4Q7UbnserV1mdzuCbVI8e8mYVjLPyBkIwdqzmx8Umtxu3vFWdOM7s2+ecMkXnezE+XjpxoiYvr9Zn2iQIuHOHM/OAa8TIUBuDXxRs3Gh74fkKk4kfMVLVpYtcrKPrcApHj7g/+bhm2zb7O+/E+/pJX7LYvdNxYH8jjZgg4FVXa3z7ZlERu22bM+gZkyDgmDHqZnf8llZ/Rh9laqo06FblcqGVf1v9jcIEAW64QR8R0cjnYLHwS5aYfIUFzyswBiyLxX98yN6cw4fdTz9dptGQYjmS5GSJWk1oNGSfPoqFb8Z98mlCWSn7zDNl1VVcKNUXAAAch33DuAB3LcLlQj/9ZPJV1QcAIARiY+lrr9X7XtmwwVZWxgb1ZRqMpK9tTABaUkKNYdSoUeojR4JsVQQBt2xxZGczvf38lz17KcaOVS9bZvZJQoKA69fb9+11jRx1fkVOVZV30Uc1vq42cjlx513G0aM1LX0GApZFixbVkAR8/Y3YHTscq1ZZjUZKpaQwxmYLz3H40UcjFr4Z/79HSxf/WH/33WEtjwEh8Ndf5j9+P9NHvXdv+SOPRAYtv3ju2LbNvm2b01/YYIwnT9b6GsbUm/g//7T423XOcgu4T29FQK9XH1qiHIRgyhSdwUAFy8QD1dX8H79b/N1jEgm8+WaDTkcGuDm//76eaWuftxCxZYtjzx7nhAmaKZN1U6boKAp+/72paQ0Nf5AEzMn27NzhvOOOsJ07HJs2Od54I27p0pTFP3Za/GOnpUtTbr/d+N671SQBrrpa+/df1upqruVYYodD+L+v62NjJFOm6KZM1o0cqf7rL2vTbsrtDodD+P67eoejUaOM8Ah65k0GH0u2bLZnHfWQwdoJUxS86mrt2dpABflwr96K/v0VoQQhrFplLS5u5OYcPEQ1dpzG/7MEATdssG/ceH4PVi4HSkqS3nNv2J13G++8yzh2rNrDoKC77eHDLooCEZHU2rX2l16OGTFCLYaIkyTU68k77gibOdOwZIlp8CBlTQ2Xn8+2vFVxPOZ5PG269s67jHfebbzr7jBjGOlfT+88YfVq644djYQNQviqKZqMjIatwOkUli83BfUtiA11x449q5AOwhulkpg6TRfURUAQoLjY+8cfFn/JJJcTd91p1OsbtT53OIQvv6ytr+fA+QMEGAOfwU1AwQMPEAaVlV6tjszLYxMS6YHNxSxPn64zmQQvhykK1tRwwU1v8EwkBs9jgFsX/9AGVFZ4v/6qzr+QNMYgMpK+444w3xPcscOxd487aFwexnjsWE0Lya/BFbwxYzSdkqUo2FJBCCxbZikqapQfM3iIavLkRiKHJOG+fa5ly8ztGrJ/rsAYeDyAIkFtLRcfJ212nYSF0woFYTYLBAnbEIF1vkmDEP7xJ9PRo4y/1oIxnj5d18dP2Pzwg8l/FzvbbGi15NRpuhYUoOC8iYuTXH21NqgTliBAQT67fLnJn2FSKXH//eExMbT/izwP/u/r+qys877Z++YhNA8yxBhyPKLPYqCBEJBUSPWFzjqK84n9+10/fF/vP88IAXG/9kUWb95s37HdEVTYIIQHD1YNaDFRJDhvxEN1dLQkqMjBGPy63JKX10jL6ZOhuPkWY+OkL1BczC76qMYZQm32tgH6xWO0NhkOt/FvzU7d6bOkWHnpvMlYq1X48IPqqqpG8QskCe6409itW4O1yWYTfvi+vmXHkQiZnJh5k75l50ZIhohu3eQTJqqDRm0SBCgq8n77bZ3/oiRJeNddxvTuMv8MD4KAa9bYfv31vOxWJAmsNuFkjic3lz11ii0v9zbOiL0QEHtpFRWxp3LZ3Fw2N4d1uxDZph7pQYEQ/unH+s2bHf6ZOoKA+/ZV3HrrmRX711+WXbtcQYWNIODeveVjx2hafltITkSKgjNnGlautNisKGjVgd9/s0ybphsx4oyRJjFR+uijEXOeLPOFrIst1z76sLZ3L0W//u2cmNevv2LFCvPDD5eIc8Rx6PY7jG2I4zkXqNXkyBGqL7+s++47EwBAEHBkFH2euo3u3u387LNajgP+ndu1WvKxxyN9aTelpez//V8dy+KgcQE0DW+8UW8wBiFGqM7nAQOUEydqly+ztBz8Jno6v/i8tk8fhX8IxDXX6LdscSxvZAYEJSXsm29WfflVUlhYO/jAfejVS7l4cbLV1rAJSiQwNlZy7s26WwWahs/Ojb79jjCf3S8sjGpbmbeWUVnpXfhGZVWV198egzGYcaN+0iSt+Ksg4MWL608cZ0IRNr16K6ZN0wf93lCnUyol7rozLGieAwCAIOCmTY7ffrP4v6hQEI8/HikW0fSBJOGWLY6PPqpuXzM8hCAiku7cWSb+S0qStku/7tZCzMH2DeN8kMbtRu++U71nj9ufNIKAu3eXPfJIpC/4Yd8+15KfzKGc6GgJvP12YyjJga1Yhv0HqKZM0Qa1AUIIWBZ/9mntyZONHBTdu8ufnBMVUJYLIfD9d6Zly0yX1LH8sgBC+Icf6n/5xez/orhDPfNsVErKmWDQDz+orq7mgmp4goD79FGEmBnYCt5IJPDOO8Mio+gQRA7Iz/d8/HGtL7FZxIwZ+ptu0vvr16Jb9O23qrduuWyicy4RrF1r++CDmoDmyxCCO+8Ku/pqnfgrxmDpUtPWrY5QQgRlMuKuO40hxpq1btvP6Ku48UZ9KLIBQvjXn9bff2+0GmQy4sk5UQMGKhufrUBlhfeFFyrELnAXD62SeO278aHWHvH37nW+NK+ivq5RCosg4JEjVY8+GuHbl/fvd37xeR0XgnFeEPCIEapQNBsRreMNRcF77gnv0iW4+VjscP/++zUBbEhIkM6fHxMf38gaRJAwO5t5/rly/6bWLV28odrZOT09eHqcwC+XEp6dEQ3fCP0/LJYJa2gC3baj/ulKbq2wFOTkMM8/V15Q0CgQAiGQmip9ZX6sL9GptpZbuLCqvNwb9EyAMdDpydkPhWt1obrrW62spaRI77k3bN4LFUIw6hAEKCxg33qz6vPPE/V+WuHQoernno9+bm65vw2KJOHu3a65z5Z/8GF8fIul8MVcmZderjh1iq2s4Oc+W9aq8UMICgpYjMHRo565c8uyjrpJEm7dahcQqKnhDh3Cp3K9LldZU5nK8zg312M283Y7/+9aW3U1x7jRu+9UIwxcLqG6Crz2aoVcTrRKUROPnzYr+u6bOgAgx2MuWLRQQYHnmadLDx9uVJscIaDTEfNeivH5LzkOf/5ZzY7tIe1QCOFrputGjtAEfeeZkbchB9ts4u+5p2jLlpDGRBDgiScj586N9j/UeL34nXeqFn1Uw/ONlinG4KqrtO++F9+0h/Tpd4C5c8u+/r86AkKCABiAoJKvmSFBQBANXXHEn8WLiCM5S1kdDAEUPwUJgFGD+BEL4RBkQ/2btiX4ESQQK6HqdeSvv6X0O3vFoJIS75NPlG7ebG8cXgMkEjj3uajHHov0uRRWrDA/NacsaJdd0OCOkCxdmtw9WJKuP9pyODQYqSeejDp2jDGbhRC0dPDVV3VpabKbbjL4XpRI4GOPRdZUc0uWNFKAIARr1tgIArz5VlxcXHNSB4Lb7zCOHKW+wPbfCwAMAE3BlOSzFm0pLPQ8+0x5AGkAAAQB7r47bPbsCB9pMjOdC9+osttRKFYrmgazHwpPb2Xwa1vkDQCA5/HrCyoXLaoN5fkhhBMTpV//X1JAZHxNDffE4yVr1wZOBMZgwgT12+/E+5dI/o8jN5d55uny7dudAVRAGNxwve7d9+J99qHycu+DDxTv3OkMZTcQBDxlivarrxK1raxMSM6fP78Nt0EQMK2zbN8+V3m5N6gVEkJosfC5uZ6hQ1X+5i+ViuzXX3kyx1Nc7A04TObne7NPML16K9olBelyx+FDrjlzSnfvdgeSBoHJUzRvvxUXcVoXtlr5efMq1v1rD6UgF0IgOoZ+6+04X1mT0NFG3gAANBoyIpLestnBMDio1BFLXJeUekeMaBQfr9dR/fspjx9nSksb8Q9CUFLCHtjv6pwmS0j870odjMHGjbY5c8oCAmsAAAiBsWPV778fHxffMD8eBr31VtWPP5qCdgQSQVFgzpzI66/Xt8Hr23beAACSkqQMg0MsNwEhKMhnLRZ++HC1f7a20Uj166s4fsJTXsY1ljqwuprbtdtlNFJdugQvHXflgWXx0qWmF1+oKCryNiXN6NGq999PSDq9lXMc/urLuo8/ruW4kEgjCPjqqboXX4xpW0bbOfGGIGB6d/nxE0x+Phvic83OZtwuYfAQlX9xhvBwetBAZW5u4IZFENBqFbZtc7As6tlL3toS15c16uv5d96pev+9GrNZaEqaSZPU73+Q0Om0Ei0I+IfFdW8urG452c3vCjits/T99xPi29r975x4AwBQKIiUFOn27U6LJXhjCLGX8NGjDOfFgwap/E/mxjBq8GBVUZGnoMAL/Cqaid6ufftcBQVsly6y8PD/hLpz5Ij7+efKfl1u8XobRT6IG9D06dp33olPSGggDUL4559Nr86vtNlCOkBhDNRq8rXXYscEC7JpAefKGwBATIzEYKC2bXOwbHCyi9Q5fNiNBNx/gNKfOno9NWy4qr6eP3nSg1Aj6mAMTp5kd+x0aLVkaqoslGaOlykYBv3yi/m5ueUHDrgDqvZgDGga3nGHccHrsVHRDXICIbx8ufnllyst5lBJQxD44Uci77sv/Fz6I7UDbwAAnbvIWA/at88VmusKCAI4eNDtYVD/AUr/iqRqNTlihJoXcNZRd8A+LZpWt2xxVFdxqWnS8xGWcNGRk8MsWFD56Se1dXXN7E0qFfH4E5Fzn4vR6xvunefxkp9Mr7xSGbSQrA8Y42nTdK/MjznHeh3twxuShL16yYuKvDk5nlD2V5E6hw657XZ+wEClv+IikxFDhqjCjFRWlttuFxofsqDXiw8fdu/c4ZTJieRkaRsqWF2asNuEpUvNLzxfvm2bs6HhjR8EASckSF59Nfb++8J9aizH4W+/rVvwWoXFIoSoXAoCzshQvPd+fGzsuXZ3ax/eAABkMqJPb8XRo+6AE/XZ4NN1Kqu4vn0bBQdSFMzoq+zeXZ570lNdzflHB4t+xNpafstme3a2JyKCiomRXNZHLY7DW7c6Xnm54ttv6+vqBF/PJREYA4zBoMHK999PuPrqM4kpTqfw8cc1771b7XCgEG8fIZCYKH3//fg2lP1qijbai8+GI0dcs2eX5GR7Qtw7xS8fN079+huxTcNv8/I877xTvfJva9PAWIwBQjg8nLr+ev0dd4alp59TF9aLAkHAR48yi3+oX7nSajbzAYwBACAE5HJ4442Gp56OTPQzYtXXcwsXVi35yRTikVu8lNFIvvd+/HXXhRop0TLamTcAgM2b7Y8+WlpZwYX+IBHCGRmKBa/H+gq0+OB0CkuXmD7+uLa83NuUi+JyjIujr7tOf8uthq5dLw8zj8Dj4yeYpUtMK1daq6q4powRV0WnTtIn50TOnGnwN7Hk5XlefbVyzT+2EI174tXkCuKV+dH33XtOurA/2p83GIPffzc/N7e8vj5UZQ0AIAg4Pl7y7Nyom24yNq2kt3+/84P3azZvdgScS0WI3uz4eHrKFO2MGw29e8v9de1LCgyDDh1yr/jVvH6dvbLKCwBs9nZkUjhpsvbJJyN9qZbixG7dan91fuWRI0zoEyt6y594MnLOnKhWlShsGe3PG3DaovDSvEqLpRXUQQgolcTd9xgfeyyyqVvKauWXLzN/+WVdYaGHIJpJpkMIYIzDw6mRI9XTr9ENHaq6pHxbVVXczh2OlSutO3c6zWZeLLobAFF8du4ifeThiBtu0Kv8dD63Gy1davrg/erKSi50mSEe3R96OHzu3Gj/2p3njvPCGyBaMH+of3V+ZYjefN99QghGjlI+/3zMwEGqptNz/Djzf1/X/v23zWJpRiEApyW8XE507SqbMFEzdqwmPV3e5pbx5w6rlT92jNm00b5xo/1UHst6UAvDDgujbpihv+++cF+tGhGFhewH71f//ruFYYInQPlfkyTB/feHvzgv+hxP3U1xvngDAOB5/M03daEHgpy+WYAEEB8v+d9jEbfeamxah9brxTt2OL78snbnDqfbjZpffBgICEMIdDoqPV02cpR66FBV166ysDDqAihAAsJ1tXxODrN7l3P7dkdOjkcsJNvsUEXGqFTkmDHqB2eHDxmi8rdqchzesN729tvVR4+KXXpDHYNImrvuNr70Uuz5WDbnkTcAAJ7HP/5Yv+C1qlZtWAAAhIBUCidP0T7+eESzHfPsdmHDBtvixaZ9e12esyxicPqpQAjVaiIxUZLRV9G3r7J7d1liotRgoNoxr8rrxWYzX1TEnjjBHDrkPnLYXVrqdToRxrjlsSkUxNBhqrvuChs7RuNr6C2ipIT98svaX362WCx8q/RZcXu6//6wuc9Fh9j8q7U4v7wBAAgCXrbMPP+Vyro6vlXUEac1IUFy/wPhs2YZjc1lnlos/Pr1tl9+Nh844HY6hbM9Id/VMAYUBTUaMiaWTu4kSU2VpaZJExOlERG0VkuKfdUJArYwToQAQtjjQQ4HstmEmhqupITNz2Pz8z2FRWxVJedwIJ5v4ErLg9FoyMGDlbfeahw3XhPwdBkGrfnH+vHHtVlZDGhl/yGMgVQKH3oo/Olnos5WLevccd55I871yr8tL79cUVLibe05ECFA0WDoENWDD4WPG6tp1iVutwu7djp//dW8Y4ejvl7AOEjlOh+HIAQUBeVyQqkkDAbSYKA0WlKnI7VaSqkkJBJI05AkoSBgzou9Xux0CTabYLMKNptgNvNms+B2I4ZBPI/F/u9BtxJBwJCAkRHU6NHqG2fqBw9WBWgeCOGDB91ffVW7do09aJ3YZqdLoyHmzIl6cHb4eS35eyF4I2L7Nsfzz5cfP860wYQgCFijIa+6WvvA/eF9MhTNXoFl0bFjzNq1tvXrbKdOsR4PavbM0hTiBIhN7X2NWFt+MxQTV2CQN/sgnvUUCqJrV/mkyZrJU7Td0+VNd8mCAs+PP5qWLzM3a9QJZZYiI+l5L0XfcovxfKc2XzjeAACyjrlfeL585w5Xq1Q8EaKQiI6mp1+jmzXL2LOn/GwabnU1t3ePY8NGx969rrJSr1j5tg2P4RwhDhgAIJMRSUmSIUOU48drBg1WN9tIoKSY/e03y7Ll5vw8FmPQBtu3IODOnWWvvhYzZYruAtzpBeUNAKCszPvmwsoVv1l5LqQIowAgBADAMbGSa6/VzZyp795dcbaFJQi4vMKbud+1c6fz0CF3URHrcCBBwBACgjhf9XB8OyBJQo2WTO4k6ddfMWK4ul9/ZUwM3ZToGIOiInbl35blyy25uUGaeLfwpRiA4cNUCxbEZvRtRRf0c8GF5g0AwOEQvvqq7tNPaiyWVu/fIkT2REbR48dpbpypHzBA1UJxKISAycSfymUOHnIfPerOPempqPA6HIjjGlQcccdpA5FEM524u0EC0BTUaMi4OLprV3nvPop+/RRpaTKDgWr2yhyHT5xg/vzTsnq1tajQ2zbGiHcnlcAbbtQ//3x0m4P32oCLwBsg9gdYbX3zzarck542G1TExa3TkYMGqaZN044arYmPl7T8+HkeWyx8aYk3v5DNO+UpLGBLSrxmM2+3Cy4X4nmMUENH+7POFwQkCQkCUBRUqQiNhjQaqYRESUqqNC1VnpIiSUiQ6nVkC6W16uv5vXucq1ZZt21ziN7+NntkRYXmscci7ro7rN0tey3j4vBGRHY28/ZbVWvW2DmuFWbQAIjsoWmYnCwdO04zYYKmTx+FMVi5KBEch91uZLPxZjNfV8fX1/NWq2Cz8ja7wHoAx2GOQ4IAKApQFKRpQiaHWg2p1ZE6HRUeTomlkLRaUqEggoYgOhxCTg6zZbNj/Xp7djbjdqNzUblEIde3n+LFF2PGjNFc+FiAi8kbAIDNJnz7bd1XX9ZVV7fC7dIsxDOLSk107iwbOVI9erQ6PV0eHk6fIyMb9jICtk0sWix8Xp5n507X1i3248cZs1lowRIY+p0qVfDmm/WPPRaVeJGShC4yb8RZ2LPH8d57Vdu3OQWh7UJbhO8Uo1aTCYmSvn0VQ4aoevWSx8VJtNrWdb1rM5xOoaqKy8lm9ux1ZR5w5eezVquA0LnSBZw2FnTrJn9yTuQ11+guotv/4vNGhMnEf/99/bff1lVWtMV00RQYA4wAwlgigXoDlZhAp6fLe/VSdO4si4uThIVTSiXRLsEoCAGPB5nq+aoqLj/fk3XMfeK4p7CIra/jxXL27WUCEASs1ZIzZugffjgioJv3hcelwhsAAMYgM9P12ac169bZz+qwbOuVfU4GhYLQ68noGDopURofL4mOoaOj6ahIWqUh5TJCLidkMkjTkICwoaQNFqteYEHAHg9mGORhkNOF6uq46iqusoorL/MWF3srK7n6et7lEsQavCGaHEMEQoAkQf/+yv/9L2LiJG0oLbrPNy4h3ohwuYTVq61ffFGXdZRp8+m0BTQ6PENAklAigVIpIZdDhZJQKkiFAtI0QVGApiFJQSRgjsc8BzgeMwxyu5DLhRgGeVjkZbHoYTiXw3wIo8VJnaR33Wm85VZjQPP3i4hLjjciKiq8y5aZf15qEtPwzrde4u9q8P0agNNeBej38/kdEkI4IoK+5hrtPfeGp6dfWk32LlHeiDiV6/npp/o//rBUVJyTnePygsgYg4GaPFlz511h/fsrL8E8w0uaNwAAhPDx48zy5eaVK61lpRw4/7Lnot4swBgbw6jx4zSzZhkHD1G1Y0Rw++JS540IjEFODvPbCvOqVbbCQtYX4HLFQAytj46mJkzQ3HyLsV8/5SXLGBGXB298KC5m162z/fWn9cgRt8uFWo6xuvQhbkkSCUxNk029Wjttui49XX4J7kpNcZnxRoTFwu/e7Vy92rprp7OigrvsxI8vejUsjBowUHH11doxYzTnnnt7IXFZ8kYEz+PCQnbLFvv6dfasLMZk4gXhkibQaboAjZbs2lU2Zoxm4gRNenf5eQ3MO0+4jHnjg8uF8vI8O3c6t221HzvG1NfzXq8YZ3PxOSSaixDCFAV1erJzmnT4cPXoMeru3eW+shKXI64E3vjgdqPiYvbwYffevc7Dh92lJV6nE/H8heaQzzxNEFCpJKKj6fR02ZAhqoGDlKmpsouYzNWOuKJ44wNCuL6eL8hnj59gsrLcOdmesjKvzSawLBZD/nzWoHYhk3h+Fg3HEgmh0RDRMXRKiqxPb3mfPorUNFlkJH0pOAfaEVcmb/yBELbbhaoqrqTEm5/vyc9jC4vYujreauHtdsHrxTzfIB4AAG2TTFFRdFInSUKCJClJmpomTUuRxcTSOl175mddarjyeRMAjIHHg+x2wWLh6+q56irOZBIsFjGvhS8r8+bnsWazAEI2MCIEnno6cs6cKJkMtqMv9hLHZayatQ0QArmckMuJyEi6K2jk9OF57HKh3Fxmy2bHqlWW7BwPCiEeCCFcXMRKpf8h0oD/oLwJEeXl3uXLzT98X19aGiRXECHQtav0r7/SoqIvFWf1BcDlZzm4MIiLkzz1VNR333caO1bd8jshBBUVXH6+J7QLXyHo4E1LGDBA+fkXSTfMaCmTDULgdKKjR5lWXPfyRwdvgiA6mn7rrfhrrtW1sJ8LAs7OYYJ2rL2S0MGb4DAaqXnzYtK7y87GDAhBYQHrdre+hdpliw7ehITkZOnNNxvOdraCEFosgsPRwZsONEH//kqFgjzbbuV2C6qEfY4AAARkSURBVAFNr69sdPAmVJyPsPPLFx28CRX79jldLuEsFdewVkudp4polyY6eBMSiorYX5dbztY7GGPQtatMF3Lz7SsAHbwJDrtdePedquzs5ktnYAzkcmLSZM1lEd/ZXujgTRDY7cJbb1WtWGE92xsQwsOHq8aNa3sPsMsR/zm/ZqtQU8O9/nrlsl8sYvBXUyABJCRInn4m6rIO3msD/lt32yoUFLDz5lWs+/esHTSQgCMiqVdfjR08WHWxB3uh0bFPNY9dOx0PPlC8do0NnCUmUBBwUrL0vffjr73uQtRhvNTQEUcRCK8X//ab+c2FVWeLoBCrQ4wYoXpxXsyAAe3QA+xyRAdvGsFuFz7+uOarL+scDnS2hkWdOknuvMt4663GS6rfzAVGB2/OoLLSu+C1yt9+s/B84N4k9hdOTJRMv0Z3yy2Gbt0ureoQFx4dvGlAQSH7/HNlG9Y7QGOFRqzBk5oqve463fU3GDp3lv0HtZmm6OANAADk53uefLJsx3an/96EEIYE6NpFdsutxunTdUlJF6cC46WJDt6A0lL2scdKt25x+MzBDVWukqS3ztLfNNOY2MGYJviv229sNmHBgkp/0ohddK+9Tv/oo5Hdu//X9Ziz4T/NG4TA99/X/fmH1ZdphxCIiCCfeSZ61m3G9m1IeYXhP82bw4ddX39Vz/MNKXYIgago6q134q6Zru9QflvGf3dJcRxevLi+osIrkgZjoFQSL7wY3UGaUPDf5c3Jk8yG9Xa/HQpPnaqdOdPQQZpQ8N/lza5dzupq3idsdDpy1m3GZvswdqAp/qPTJAj46FG3IDTYIBDCKamynj07Tk+h4j/KG47DFeVe368Yg8QEummv8g6cDf9R3ggCZtlGoVgKJXlZlya9wPiPThVJQrmc8JnKIQBWq8DzF3tYlw/+o7yhaRgVdSYKAhKwoIA1mTqIEyr+o7whSdijp9wXlkUQoLiI3bXLcbHHddngP8obAMDQoaow45m8XYZB335bX13NXexxXR747/Kme7p83HiNr8QEScJ9e13vvFPlcAgXe2iXAf67vJHKiNkPRXTqJPFZcTAGP/1onv9KZU1Nh9QJAnL+/PkXewwXDZGRdHg4tXuXU2wRAiFACBw54s7KcsfESOLiJG3ubX7F4z/NGwhB167yuDg6K8ttMQtir0MAQFEhu3Gjo7TUqzeQYWHUfyqBN0R0xPsBAMDBg65Fi2o2bXQ4HQIkIEEAjAHCODyMHjZMOXmyduAgZWyspMN75UMHbxrgcqFt2+y/rbDs3eusqeE5rsGajDGQSGF0FN0tXT6gv7JPH0VCoiQ8nFKpSLEc+n/Tf97Bm0bwenF+vudgpjsz05WX56mu5mw2gWEwxyGxwbNCQRiNVHyCJC1VmpIq7d1HkdFH+Z+qfCOigzfNA2PgcAgOh1BXx5tMPMMglkU8B0gS0BKoUpJaHWk0Uno9qdFQ/0HHVgdvOtAW/PdWSgfaAx286UBb0MGbDrQF/w9GcVjvyzp41AAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNC0wOC0wMVQxMTo0Mzo0NiswMjowMNf1Q+IAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMTItMDZUMTU6MTc6NTErMDE6MDCrFyOJAAAAAElFTkSuQmCC</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:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDezCCAmOgAwIBAgIFLt8WEPgwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTEzMDEGA1UEAwwqVW5pdmVyemEgdiBManVibGphbmksIE1lZGljaW5za2EgZmFrdWx0ZXRhMB4XDTEzMTEyNjA4MjcxMloXDTE1MTExNjA4MjcxMlowVjELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTEzMDEGA1UEAwwqVW5pdmVyemEgdiBManVibGphbmksIE1lZGljaW5za2EgZmFrdWx0ZXRhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvuIhlHGsp4L0wv7dXjHO85oBTcem25GHraf4Gv4nX9N98ijqCv2S/KwUVJ2M/mYnxteBHRpeLl67c4it2PtJDJBP21HkbJt4fhGhLUyn/IGc3IM3CFg1elqSuQHad2tqmILFosavrCv+Ka9ADjXkbkoKkuPrRm4jNO3emCo5RlqPxhOpEDQS/PuqyPoqN6G0GFpuRilAxSQIBW9ccIt1aYE2ImlFivI1uPBND9EQJ9KAgYFhwfXXrNP6nRPcD013oKB0RhOu5curJH/uh9UWxEaDHP/9YWeObRX0DME7+oYZPJvDRn7xpoI23Rb73lRouCFhF6SYy2yvPuwqE2geEQIDAQABo1AwTjAdBgNVHQ4EFgQU1yofWR7pZ+mgKZ2FFr8/mpj15FAwHwYDVR0jBBgwFoAU1yofWR7pZ+mgKZ2FFr8/mpj15FAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEACI8Aec2jDOVcpd9mjjVcxsmDCZP2fNG86pxt3fivOOJkBZIZhcDHRybl6sI4dDSEDyFMwIlZhmM2jnAHA2heQ/k5zAMox27YqQ6krR3MavAUDPSxHpDIqirjDWCPd7FJI4jPkFGdaxBgEZsYuxHwLv7nicU9EDtpvUklGeCu+PcfZwOZrWMeIEJ/sz767Bg4f90/DfuW8KRx0s/qC3CmGJCISANm6zqxypouZTCd6FXV2+6mWYBNwyla1at5vYwYACimnbKjbq1XGfq+63O6K60GCPSJJ98gejbgFbpEmxwvq3N26mpNRWCz0pos/CDJPYKIHTGt32z6m9Yx+sLXgQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDezCCAmOgAwIBAgIFLt8WEPgwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTEzMDEGA1UEAwwqVW5pdmVyemEgdiBManVibGphbmksIE1lZGljaW5za2EgZmFrdWx0ZXRhMB4XDTEzMTEyNjA4MjcxMloXDTE1MTExNjA4MjcxMlowVjELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTEzMDEGA1UEAwwqVW5pdmVyemEgdiBManVibGphbmksIE1lZGljaW5za2EgZmFrdWx0ZXRhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvuIhlHGsp4L0wv7dXjHO85oBTcem25GHraf4Gv4nX9N98ijqCv2S/KwUVJ2M/mYnxteBHRpeLl67c4it2PtJDJBP21HkbJt4fhGhLUyn/IGc3IM3CFg1elqSuQHad2tqmILFosavrCv+Ka9ADjXkbkoKkuPrRm4jNO3emCo5RlqPxhOpEDQS/PuqyPoqN6G0GFpuRilAxSQIBW9ccIt1aYE2ImlFivI1uPBND9EQJ9KAgYFhwfXXrNP6nRPcD013oKB0RhOu5curJH/uh9UWxEaDHP/9YWeObRX0DME7+oYZPJvDRn7xpoI23Rb73lRouCFhF6SYy2yvPuwqE2geEQIDAQABo1AwTjAdBgNVHQ4EFgQU1yofWR7pZ+mgKZ2FFr8/mpj15FAwHwYDVR0jBBgwFoAU1yofWR7pZ+mgKZ2FFr8/mpj15FAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEACI8Aec2jDOVcpd9mjjVcxsmDCZP2fNG86pxt3fivOOJkBZIZhcDHRybl6sI4dDSEDyFMwIlZhmM2jnAHA2heQ/k5zAMox27YqQ6krR3MavAUDPSxHpDIqirjDWCPd7FJI4jPkFGdaxBgEZsYuxHwLv7nicU9EDtpvUklGeCu+PcfZwOZrWMeIEJ/sz767Bg4f90/DfuW8KRx0s/qC3CmGJCISANm6zqxypouZTCd6FXV2+6mWYBNwyla1at5vYwYACimnbKjbq1XGfq+63O6K60GCPSJJ98gejbgFbpEmxwvq3N26mpNRWCz0pos/CDJPYKIHTGt32z6m9Yx+sLXgQ==</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="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="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="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="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>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>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>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
new file mode 100644
index 00000000..177a6e7d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.mic.ul.ie-idp-shibboleth.xml
@@ -0,0 +1,70 @@
+<?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>
+      <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://idp.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>
+MIIDIDCCAgigAwIBAgIVAIm8XfsrXL+n3FjD8+FCAsrpZwqYMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcC5taWMudWwuaWUwHhcNMTIwNjI1MTM0OTMxWhcN
+MzIwNjI1MTM0OTMxWjAYMRYwFAYDVQQDEw1pZHAubWljLnVsLmllMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArd7puHeojmsokdqd6L8dYDagg59Rxp/W
++Mgs+D4gm23qDfExzpWaMDtevrmCdspAU0V7sUYF5xnuromTfOgrPB9kFFhRamMz
+gA9VyXxyCYoMaingzRqI1uw0hJ2Qy3BtjIHRVPpKs8R3Dh54UEzAFuFcgOvxNg7a
+y7+yZ7eCNoPaZZqD6+5b/WuXljq+AsIsemVOtKyVCj5rvQSZRw7QTp2s9mN6xnFU
+9aIBY3HJ0uFzKWViGiVEUu7XQKncJqcGuW4V0C6bAfOKqMGtK2ywx1I5Ov8ZGAb5
+o7UjnW1tr8q0KfhTsfUzuGZg2dVEzF/uJOeMNZCnK7rKTnBe3cFEjwIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHAubWljLnVsLmllhiRodHRwczovL2lkcC5taWMudWwu
+aWUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCMx/V213MoR8FSMT8NB2pSJJDkP
+MA0GCSqGSIb3DQEBBQUAA4IBAQBcPiduSlzgNM8GaczyCr5S2Lz6X3NXZgnExQV7
+EYB74Fh7A7isTv3u3AIaP/rq7YC7JpSOudh0nAQmsjguwBL4H+U4yQ1G8EJW57xX
+Ll/284h2Hz9jIkmeENc8ETBVuBe1QMlhOJ6yRBnV6TDdisPLD2fE+dz/J+zW93dq
+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://idp.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
new file mode 100644
index 00000000..27c64ee6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.midchesh.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						Yy51azAeFw0xNDA1MTQwODU2MjVaFw0zNDA1MDkwODU2MjVaMHAxCzAJBgNVBAYT
+						AkdCMREwDwYDVQQIEwhDaGVzaGlyZTESMBAGA1UEBxMJTm9ydGh3aWNoMR0wGwYD
+						VQQKExRNaWQgQ2hlc2hpcmUgQ29sbGVnZTEbMBkGA1UEAxMSaWRwLm1pZGNoZXNo
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqbxJrYoAOBdU
+						+iG+bIRN1EmtO8tg2omFBwPiiKVCocKYf3uxTsO9kr+875s0ZJZvoVaR16D9lgEF
+						691uxz6N9W7hFexw13oE75JedD+bQH88ZKlheW1azplTEJNlAvMvDeOVKmI3wCcq
+						7jOtsHhiWJ1RN+/3KPRxQ14iJ7wiifANCagqwYGmeC1eVtPPE1g7cpjYzjIpYqZg
+						CBbZvIi11eIBIw0ufnL79suIcrPn/7luCu2fFq4ZbIh6SjVd5JK/N2AFiIWmu4D/
+						YXh/plKwR6jdv5F+P07hYjyEIJMJ27yGD32MLH1mMGEqy65k8dexsfyYgezaYaRy
+						A3inGW0MxwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAi5kjMMZzt42rjO82CmxXs
+						e8wlOz0ScY8eHgO8SKPYxg2CAxoTuOPCqX95V0zioLAqXyrVJxo+Z2FcFFdtWU8V
+						2NC6uoHaN7zLP3sYS1ledVY6PXcJrzb6bNJskL6vXHKuV1Hbj7h6eRYgx14wcADD
+						Cn5HknNl7VgMwQ0XKPBJEbGQNLeNCoUdWgmb71yDHDcmnsEhl726eUE2rKYldxD3
+						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>
+						MIIDXDCCAkQCCQCXDevqC5AIhDANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
+						QjERMA8GA1UECBMIQ2hlc2hpcmUxEjAQBgNVBAcTCU5vcnRod2ljaDEdMBsGA1UE
+						ChMUTWlkIENoZXNoaXJlIENvbGxlZ2UxGzAZBgNVBAMTEmlkcC5taWRjaGVzaC5h
+						Yy51azAeFw0xNDA1MTQwODU2MjVaFw0zNDA1MDkwODU2MjVaMHAxCzAJBgNVBAYT
+						AkdCMREwDwYDVQQIEwhDaGVzaGlyZTESMBAGA1UEBxMJTm9ydGh3aWNoMR0wGwYD
+						VQQKExRNaWQgQ2hlc2hpcmUgQ29sbGVnZTEbMBkGA1UEAxMSaWRwLm1pZGNoZXNo
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqbxJrYoAOBdU
+						+iG+bIRN1EmtO8tg2omFBwPiiKVCocKYf3uxTsO9kr+875s0ZJZvoVaR16D9lgEF
+						691uxz6N9W7hFexw13oE75JedD+bQH88ZKlheW1azplTEJNlAvMvDeOVKmI3wCcq
+						7jOtsHhiWJ1RN+/3KPRxQ14iJ7wiifANCagqwYGmeC1eVtPPE1g7cpjYzjIpYqZg
+						CBbZvIi11eIBIw0ufnL79suIcrPn/7luCu2fFq4ZbIh6SjVd5JK/N2AFiIWmu4D/
+						YXh/plKwR6jdv5F+P07hYjyEIJMJ27yGD32MLH1mMGEqy65k8dexsfyYgezaYaRy
+						A3inGW0MxwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAi5kjMMZzt42rjO82CmxXs
+						e8wlOz0ScY8eHgO8SKPYxg2CAxoTuOPCqX95V0zioLAqXyrVJxo+Z2FcFFdtWU8V
+						2NC6uoHaN7zLP3sYS1ledVY6PXcJrzb6bNJskL6vXHKuV1Hbj7h6eRYgx14wcADD
+						Cn5HknNl7VgMwQ0XKPBJEbGQNLeNCoUdWgmb71yDHDcmnsEhl726eUE2rKYldxD3
+						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>
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
new file mode 100644
index 00000000..4ccb4e0b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.mimas.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,92 @@
+<?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>
+      <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
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4w7U5gd6/ifZvu0vwr4rK9zY08DO
+						uxfZDkOAoXnfL6w31loHJQaM1ezLKs9RxVgHk++2vzFUn5Y70Bj7vOEOtaevjsKU
+						VrnJZGpj7pwRtRZinpVUjlT/a8sQUhjDjnag1RceLYthPG8BTd5whlWGLl0+aQHD
+						QbwdPcRqEml+6TZG8sxTZIukWqtdTCzVMl+EYfdclCqDKUFMXm3Uz15OzUje53Bv
+						WIaX2ThmUyqiDPHPGCfknwtcsKYcc3ztyokCamTH7U5FuxJMkTlzrieXJvHGTRjZ
+						uDHQhN6ulvr7/5Zt1v9OngZxptFc5ICUe8YqLelBgpWfeekXwLgP2AOzVQIDAQAB
+						o2UwYzBCBgNVHREEOzA5gg9pZHAubWltYXMuYWMudWuGJmh0dHBzOi8vaWRwLm1p
+						bWFzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRoLGk6jr37RIvGJJ9m
+						Nu2cx/xIRDANBgkqhkiG9w0BAQUFAAOCAQEAxv3qV8i0hLx/UCzgEerrDs0mrMQi
+						2ZZYQQAAfrZmMSAryZu2yBc87Ibku5dbKps89fA47KYG+Fro/ixdx1DTrkod2Gwz
+						28MMRa3WTp3KxOq7NMCSrsk7OEEwyeYo3Ozw1Evmm4LRh3i0MpMNo9SunlU9Xfjk
+						UO2RBp6YWrNL3uOWrdskey+qbXzhnQNGnLqpsL1MDI/tmrWxsyxcjnEyG4F7FSku
+						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>
+						MIIDJzCCAg+gAwIBAgIUExVE+BsgxiwDLoOHU9bL+UpPdVEwDQYJKoZIhvcNAQEF
+						BQAwGjEYMBYGA1UEAxMPaWRwLm1pbWFzLmFjLnVrMB4XDTEwMTAwNDE3MDczOFoX
+						DTMwMTAwNDE3MDczOFowGjEYMBYGA1UEAxMPaWRwLm1pbWFzLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4w7U5gd6/ifZvu0vwr4rK9zY08DO
+						uxfZDkOAoXnfL6w31loHJQaM1ezLKs9RxVgHk++2vzFUn5Y70Bj7vOEOtaevjsKU
+						VrnJZGpj7pwRtRZinpVUjlT/a8sQUhjDjnag1RceLYthPG8BTd5whlWGLl0+aQHD
+						QbwdPcRqEml+6TZG8sxTZIukWqtdTCzVMl+EYfdclCqDKUFMXm3Uz15OzUje53Bv
+						WIaX2ThmUyqiDPHPGCfknwtcsKYcc3ztyokCamTH7U5FuxJMkTlzrieXJvHGTRjZ
+						uDHQhN6ulvr7/5Zt1v9OngZxptFc5ICUe8YqLelBgpWfeekXwLgP2AOzVQIDAQAB
+						o2UwYzBCBgNVHREEOzA5gg9pZHAubWltYXMuYWMudWuGJmh0dHBzOi8vaWRwLm1p
+						bWFzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRoLGk6jr37RIvGJJ9m
+						Nu2cx/xIRDANBgkqhkiG9w0BAQUFAAOCAQEAxv3qV8i0hLx/UCzgEerrDs0mrMQi
+						2ZZYQQAAfrZmMSAryZu2yBc87Ibku5dbKps89fA47KYG+Fro/ixdx1DTrkod2Gwz
+						28MMRa3WTp3KxOq7NMCSrsk7OEEwyeYo3Ozw1Evmm4LRh3i0MpMNo9SunlU9Xfjk
+						UO2RBp6YWrNL3uOWrdskey+qbXzhnQNGnLqpsL1MDI/tmrWxsyxcjnEyG4F7FSku
+						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>
diff --git a/swamid-interfederations-2.0/idp.mmu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.mmu.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c43e7a30
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.mmu.ac.uk-shibboleth.xml
@@ -0,0 +1,123 @@
+<?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>
+      <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
+						TVQxLUNBMB4XDTE0MDYxMDA5NDY0MloXDTIzMDYwODA5NDY0MlowgY8xCzAJBgNV
+						BAYTAkdCMRAwDgYDVQQIEwdFbmdsYW5kMRswGQYDVQQHExJHcmVhdGVyIE1hbmNo
+						ZXN0ZXIxKzApBgNVBAoTIk1hbmNoZXN0ZXIgTWV0cm9wb2xpdGFuIFVuaXZlcnNp
+						dHkxDDAKBgNVBAsTA0lUUzEWMBQGA1UEAxMNaWRwLm1tdS5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2aUJf4/gCMBJ9blo9YjL9nNvw1H61B
+						Pj0B4g3CDLXuAUocLLokpDJgvAqoPou7BXA3q/zeaF1m6mSue/bgg7obCUY/Pjyk
+						PnsSp8YbAoMv5/AeQLb+RGrsZ6Vvnv1/mUglpt6I7/8KuDlq89+x/lXshx09elrI
+						uiUf4vbWIbJjklaW8kLBsGkZ3k4I+sfu/oGRDAo5id5vI8/sWvxwXizJMb5+sC1z
+						AcofB9ux8vlIH8osZK4Jon976j+F+89+lP5R6x5YcXc0XI54X3LkpmKTxxhF0Vg7
+						wymvSihurHOwtAkSsWFZ/rJ/Gn8Zo7HTRopVPTdOiLS6ZNo92aYmiQUCAwEAAaOC
+						Am0wggJpMB0GA1UdDgQWBBSwEMs3Qept/2PCAEj9gGidV4+aYTAfBgNVHSMEGDAW
+						gBTuEDNk61YXy8+cyWM7HuKODmd0zTCB2wYDVR0fBIHTMIHQMIHNoIHKoIHHhoHE
+						bGRhcDovLy9DTj1hZC1KREVBRE1HTVQxLUNBKDUpLENOPUpERUFETUdNVDEsQ049
+						Q0RQLENOPVB1YmxpYyUyMEtleSUyMFNlcnZpY2VzLENOPVNlcnZpY2VzLENOPUNv
+						bmZpZ3VyYXRpb24sREM9YWQsREM9bW11LERDPWFjLERDPXVrP2NlcnRpZmljYXRl
+						UmV2b2NhdGlvbkxpc3Q/YmFzZT9vYmplY3RDbGFzcz1jUkxEaXN0cmlidXRpb25Q
+						b2ludDCByQYIKwYBBQUHAQEEgbwwgbkwgbYGCCsGAQUFBzAChoGpbGRhcDovLy9D
+						Tj1hZC1KREVBRE1HTVQxLUNBLENOPUFJQSxDTj1QdWJsaWMlMjBLZXklMjBTZXJ2
+						aWNlcyxDTj1TZXJ2aWNlcyxDTj1Db25maWd1cmF0aW9uLERDPWFkLERDPW1tdSxE
+						Qz1hYyxEQz11az9jQUNlcnRpZmljYXRlP2Jhc2U/b2JqZWN0Q2xhc3M9Y2VydGlm
+						aWNhdGlvbkF1dGhvcml0eTAOBgNVHQ8BAf8EBAMCBaAwOwYJKwYBBAGCNxUHBC4w
+						LAYkKwYBBAGCNxUIhbWgdYPgngWZjTPfs06EztIPgXexhHaD/MAYAgFkAgEGMBMG
+						A1UdJQQMMAoGCCsGAQUFBwMBMBsGCSsGAQQBgjcVCgQOMAwwCgYIKwYBBQUHAwEw
+						DQYJKoZIhvcNAQEFBQADggEBAJWqoyrhg8HA0WFS/egaof7pmRJaGddx7hOij8As
+						I/aeLxFJoOYz5ahVhFEGUfJYGLQMvTJ0jAU9oMVnOzkw0qeAgjtKUOTq0msOrSWw
+						YgEYtXSyTnr84swBtF5aPsQmn/DTc4PceCKY0AOljsmjxnf51z70CvAQqCbYdAJ+
+						O+pFeLNMCKZSdC4kkLILN4wvfd2FlphLJG2C67yLoo8c7/cDCJxPdLGkJMkCzjRO
+						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>
+						MIIF7zCCBNegAwIBAgIKEQ8ZqQAFAAGwijANBgkqhkiG9w0BAQUFADBsMRIwEAYK
+						CZImiZPyLGQBGRYCdWsxEjAQBgoJkiaJk/IsZAEZFgJhYzETMBEGCgmSJomT8ixk
+						ARkWA21tdTESMBAGCgmSJomT8ixkARkWAmFkMRkwFwYDVQQDExBhZC1KREVBRE1H
+						TVQxLUNBMB4XDTE0MDYxMDA5NDY0MloXDTIzMDYwODA5NDY0MlowgY8xCzAJBgNV
+						BAYTAkdCMRAwDgYDVQQIEwdFbmdsYW5kMRswGQYDVQQHExJHcmVhdGVyIE1hbmNo
+						ZXN0ZXIxKzApBgNVBAoTIk1hbmNoZXN0ZXIgTWV0cm9wb2xpdGFuIFVuaXZlcnNp
+						dHkxDDAKBgNVBAsTA0lUUzEWMBQGA1UEAxMNaWRwLm1tdS5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2aUJf4/gCMBJ9blo9YjL9nNvw1H61B
+						Pj0B4g3CDLXuAUocLLokpDJgvAqoPou7BXA3q/zeaF1m6mSue/bgg7obCUY/Pjyk
+						PnsSp8YbAoMv5/AeQLb+RGrsZ6Vvnv1/mUglpt6I7/8KuDlq89+x/lXshx09elrI
+						uiUf4vbWIbJjklaW8kLBsGkZ3k4I+sfu/oGRDAo5id5vI8/sWvxwXizJMb5+sC1z
+						AcofB9ux8vlIH8osZK4Jon976j+F+89+lP5R6x5YcXc0XI54X3LkpmKTxxhF0Vg7
+						wymvSihurHOwtAkSsWFZ/rJ/Gn8Zo7HTRopVPTdOiLS6ZNo92aYmiQUCAwEAAaOC
+						Am0wggJpMB0GA1UdDgQWBBSwEMs3Qept/2PCAEj9gGidV4+aYTAfBgNVHSMEGDAW
+						gBTuEDNk61YXy8+cyWM7HuKODmd0zTCB2wYDVR0fBIHTMIHQMIHNoIHKoIHHhoHE
+						bGRhcDovLy9DTj1hZC1KREVBRE1HTVQxLUNBKDUpLENOPUpERUFETUdNVDEsQ049
+						Q0RQLENOPVB1YmxpYyUyMEtleSUyMFNlcnZpY2VzLENOPVNlcnZpY2VzLENOPUNv
+						bmZpZ3VyYXRpb24sREM9YWQsREM9bW11LERDPWFjLERDPXVrP2NlcnRpZmljYXRl
+						UmV2b2NhdGlvbkxpc3Q/YmFzZT9vYmplY3RDbGFzcz1jUkxEaXN0cmlidXRpb25Q
+						b2ludDCByQYIKwYBBQUHAQEEgbwwgbkwgbYGCCsGAQUFBzAChoGpbGRhcDovLy9D
+						Tj1hZC1KREVBRE1HTVQxLUNBLENOPUFJQSxDTj1QdWJsaWMlMjBLZXklMjBTZXJ2
+						aWNlcyxDTj1TZXJ2aWNlcyxDTj1Db25maWd1cmF0aW9uLERDPWFkLERDPW1tdSxE
+						Qz1hYyxEQz11az9jQUNlcnRpZmljYXRlP2Jhc2U/b2JqZWN0Q2xhc3M9Y2VydGlm
+						aWNhdGlvbkF1dGhvcml0eTAOBgNVHQ8BAf8EBAMCBaAwOwYJKwYBBAGCNxUHBC4w
+						LAYkKwYBBAGCNxUIhbWgdYPgngWZjTPfs06EztIPgXexhHaD/MAYAgFkAgEGMBMG
+						A1UdJQQMMAoGCCsGAQUFBwMBMBsGCSsGAQQBgjcVCgQOMAwwCgYIKwYBBQUHAwEw
+						DQYJKoZIhvcNAQEFBQADggEBAJWqoyrhg8HA0WFS/egaof7pmRJaGddx7hOij8As
+						I/aeLxFJoOYz5ahVhFEGUfJYGLQMvTJ0jAU9oMVnOzkw0qeAgjtKUOTq0msOrSWw
+						YgEYtXSyTnr84swBtF5aPsQmn/DTc4PceCKY0AOljsmjxnf51z70CvAQqCbYdAJ+
+						O+pFeLNMCKZSdC4kkLILN4wvfd2FlphLJG2C67yLoo8c7/cDCJxPdLGkJMkCzjRO
+						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>
diff --git a/swamid-interfederations-2.0/idp.motherwell.co.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.motherwell.co.uk-shibboleth.xml
new file mode 100644
index 00000000..4061487e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.motherwell.co.uk-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						ZXJ3ZWxsLmNvLnVrMB4XDTE0MDUwNzEzMjUwN1oXDTM0MDUwMjEzMjUwN1oweDEL
+						MAkGA1UEBhMCR0IxEzARBgNVBAgTCk1vdGhlcndlbGwxEzARBgNVBAcTCk1vdGhl
+						cndlbGwxIDAeBgNVBAoTF05ldyBDb2xsZWdlIExhbmFya3NoaXJlMR0wGwYDVQQD
+						ExRpZHAubW90aGVyd2VsbC5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAOigdZo6jqFEwLsAI0rsABIfdOcGaOplDLGe58NaeY3Rhz0Yb9jlqy0X
+						lWtcHYMkSMqaCG8HyX9I/HO4BNLcBG2WieAQwWda0ZDO6e1EpuMgZOZv1EMgCUTZ
+						btxqNIDjAK2DhuHQd+hqWmMORm5w24C2yZa4GHi0DatKUEOufEH6nXArRtRI5AAt
+						OXkDUwnGwLMjkrxLWhPWBHQwoNlHLjIorNixYizvd5uaAA4RtOk9iYmnq2bf2/42
+						MzeuqSf1S3gtpmooQrCDCJr2NOXrrCwtnekdbo77f/BT7KXhhICXF6qw2RM30/Im
+						oJmIaRKuPpZuZ4wi/b49QgM9xiXxFjMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						BXmDILeWGVL4u+dT06/PdDsxSF40ojSWLNS2/gbKIStMUv2Ndj9VayfXR5pjPD0Z
+						p6lwOtnTQ0WDMi3rFn2s2KXzD6JtWnSO42DTZELnfJhE790kO4u7tdNT4VMltjVK
+						DvZcBFufCIU19hc7iAefKvZMFgS9vBhpo8VwoC9B3E8dgD+0BytsjQggdCvN4xwk
+						bsY7NWo0A1FehMIKVHCPqjFfobfg2KYc3ARB6VDTSX8bxiLeR7nmwVI8OPCvbLhY
+						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>
+						MIIDbDCCAlQCCQCYnW4c5CPhFjANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
+						QjETMBEGA1UECBMKTW90aGVyd2VsbDETMBEGA1UEBxMKTW90aGVyd2VsbDEgMB4G
+						A1UEChMXTmV3IENvbGxlZ2UgTGFuYXJrc2hpcmUxHTAbBgNVBAMTFGlkcC5tb3Ro
+						ZXJ3ZWxsLmNvLnVrMB4XDTE0MDUwNzEzMjUwN1oXDTM0MDUwMjEzMjUwN1oweDEL
+						MAkGA1UEBhMCR0IxEzARBgNVBAgTCk1vdGhlcndlbGwxEzARBgNVBAcTCk1vdGhl
+						cndlbGwxIDAeBgNVBAoTF05ldyBDb2xsZWdlIExhbmFya3NoaXJlMR0wGwYDVQQD
+						ExRpZHAubW90aGVyd2VsbC5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAOigdZo6jqFEwLsAI0rsABIfdOcGaOplDLGe58NaeY3Rhz0Yb9jlqy0X
+						lWtcHYMkSMqaCG8HyX9I/HO4BNLcBG2WieAQwWda0ZDO6e1EpuMgZOZv1EMgCUTZ
+						btxqNIDjAK2DhuHQd+hqWmMORm5w24C2yZa4GHi0DatKUEOufEH6nXArRtRI5AAt
+						OXkDUwnGwLMjkrxLWhPWBHQwoNlHLjIorNixYizvd5uaAA4RtOk9iYmnq2bf2/42
+						MzeuqSf1S3gtpmooQrCDCJr2NOXrrCwtnekdbo77f/BT7KXhhICXF6qw2RM30/Im
+						oJmIaRKuPpZuZ4wi/b49QgM9xiXxFjMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						BXmDILeWGVL4u+dT06/PdDsxSF40ojSWLNS2/gbKIStMUv2Ndj9VayfXR5pjPD0Z
+						p6lwOtnTQ0WDMi3rFn2s2KXzD6JtWnSO42DTZELnfJhE790kO4u7tdNT4VMltjVK
+						DvZcBFufCIU19hc7iAefKvZMFgS9vBhpo8VwoC9B3E8dgD+0BytsjQggdCvN4xwk
+						bsY7NWo0A1FehMIKVHCPqjFfobfg2KYc3ARB6VDTSX8bxiLeR7nmwVI8OPCvbLhY
+						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>
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
new file mode 100644
index 00000000..3d8d162a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.moulton.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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
+						Yy51azAeFw0xMzA3MTAwODA2NDZaFw0zMzA3MDUwODA2NDZaMHAxCzAJBgNVBAYT
+						AkdCMRkwFwYDVQQIExBOb3J0aGFtcHRvbnNoaXJlMRAwDgYDVQQHEwdNb3VsdG9u
+						MRgwFgYDVQQKEw9Nb3VsdG9uIENvbGxlZ2UxGjAYBgNVBAMTEWlkcC5tb3VsdG9u
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtOUUz3boGH86
+						Tvg4mW4AYjne2//WqhAjIoSWSTGc+A0r3WSPHzEMh9Y5UMLgcJjsUZhE2MxtCKe0
+						AAlnRGg71sO3h/h6oEV0dZrN6KGut4E43ynfoaqDkRhUR4wJq45y7/6v1GKi0eqk
+						CbTW9fBHjoDBmXuQGmSCTnglZIf7LUdzTevCUhOvxnV+lt9oV9FSV3e7/pnwmBWw
+						a9aVkuXNdeny3nuUgqUpt2/phrKwtNtQrnBRw/gRwsPhak5zb/TI8F2D153SowjC
+						liOb0SL163Sc92XbmNdeVAs42fY+zMs3eAIhlTUh1MHi/9hFUQP8Cjm0eF8Qe2f2
+						eYoFrMNTtQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBAti3u2KuXz0CMGDlW1yXY
+						ktvVMyJR/b3xnESTJm6vj59Sk321SEhrc1vuYEbBZSc2XUGRC1YwsW7X7/wxYKAl
+						LzB72n980lTkBG/S9i012lmhIBJzOFiNeMyHeIxzCqSyiJF/UkmgVGElTB8ByKDK
+						ATobFtFqj5aKvkxaUCXa3ftV+hRF4DPvQFmvRTU1rrGqMvh0mr9XQhYIW1vJ5HCo
+						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>
+						MIIDXDCCAkQCCQDjRj86cKfsGTANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
+						QjEZMBcGA1UECBMQTm9ydGhhbXB0b25zaGlyZTEQMA4GA1UEBxMHTW91bHRvbjEY
+						MBYGA1UEChMPTW91bHRvbiBDb2xsZWdlMRowGAYDVQQDExFpZHAubW91bHRvbi5h
+						Yy51azAeFw0xMzA3MTAwODA2NDZaFw0zMzA3MDUwODA2NDZaMHAxCzAJBgNVBAYT
+						AkdCMRkwFwYDVQQIExBOb3J0aGFtcHRvbnNoaXJlMRAwDgYDVQQHEwdNb3VsdG9u
+						MRgwFgYDVQQKEw9Nb3VsdG9uIENvbGxlZ2UxGjAYBgNVBAMTEWlkcC5tb3VsdG9u
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtOUUz3boGH86
+						Tvg4mW4AYjne2//WqhAjIoSWSTGc+A0r3WSPHzEMh9Y5UMLgcJjsUZhE2MxtCKe0
+						AAlnRGg71sO3h/h6oEV0dZrN6KGut4E43ynfoaqDkRhUR4wJq45y7/6v1GKi0eqk
+						CbTW9fBHjoDBmXuQGmSCTnglZIf7LUdzTevCUhOvxnV+lt9oV9FSV3e7/pnwmBWw
+						a9aVkuXNdeny3nuUgqUpt2/phrKwtNtQrnBRw/gRwsPhak5zb/TI8F2D153SowjC
+						liOb0SL163Sc92XbmNdeVAs42fY+zMs3eAIhlTUh1MHi/9hFUQP8Cjm0eF8Qe2f2
+						eYoFrMNTtQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBAti3u2KuXz0CMGDlW1yXY
+						ktvVMyJR/b3xnESTJm6vj59Sk321SEhrc1vuYEbBZSc2XUGRC1YwsW7X7/wxYKAl
+						LzB72n980lTkBG/S9i012lmhIBJzOFiNeMyHeIxzCqSyiJF/UkmgVGElTB8ByKDK
+						ATobFtFqj5aKvkxaUCXa3ftV+hRF4DPvQFmvRTU1rrGqMvh0mr9XQhYIW1vJ5HCo
+						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>
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
new file mode 100644
index 00000000..1a1a28ad
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml
@@ -0,0 +1,74 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">titkarsag.mta.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">MTA Titkárság</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">MTA Titkárság</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">MTA Akadémiai Adattár (AAT)</mdui:Description>
+        <mdui:Description xml:lang="en">MTA Akadémiai Adattár (AAT)</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEEjCCAvqgAwIBAgIJAM4B1jSKcSpIMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNV
+BAYTAkhVMQowCAYDVQQIEwEgMREwDwYDVQQHEwhCdWRhcGVzdDEMMAoGA1UEChMD
+TVRBMRIwEAYDVQQLEwlUaXRrYXJzYWcxEzARBgNVBAMTCmlkcC5tdGEuaHUwHhcN
+MTQwMjE4MDgxODQ4WhcNMzMwNDE5MDgxODQ4WjBjMQswCQYDVQQGEwJIVTEKMAgG
+A1UECBMBIDERMA8GA1UEBxMIQnVkYXBlc3QxDDAKBgNVBAoTA01UQTESMBAGA1UE
+CxMJVGl0a2Fyc2FnMRMwEQYDVQQDEwppZHAubXRhLmh1MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEArXgM7QbY9DMXbKVA2N0pYeN2pOpvCjfchMWdCLwc
+cd4n02NSff/+K2gyvQutMaxsYtCY8JjY2FIeU+IMig2LjuMCMHXIpntGhULa2+T6
+xcyclt5sp7hp7+NdD/L6dt2GRAEFJto3ostW4PV3eX5D3r0P7NjaC3LrtcDM+iwp
+p6HqFsUYZXPT0EiH5tJnZDo+EhlfPm3j5fMvQOiSe0hp5hjtoSgn/etcve9WlEH7
+pqF8AlDk7SkSvTUgbMUtGPmvdNxk6H1ENJRsad2vf7CxxtXfKvKKi1tYEmPQsY4A
+/9X9FCmprWxJ4bMvGdjST/mEvRwtpKihJ7PiU1qrMU7prwIDAQABo4HIMIHFMB0G
+A1UdDgQWBBTHn9gU0vszSRWaAnv7wekfRqUqkzCBlQYDVR0jBIGNMIGKgBTHn9gU
+0vszSRWaAnv7wekfRqUqk6FnpGUwYzELMAkGA1UEBhMCSFUxCjAIBgNVBAgTASAx
+ETAPBgNVBAcTCEJ1ZGFwZXN0MQwwCgYDVQQKEwNNVEExEjAQBgNVBAsTCVRpdGth
+cnNhZzETMBEGA1UEAxMKaWRwLm10YS5odYIJAM4B1jSKcSpIMAwGA1UdEwQFMAMB
+Af8wDQYJKoZIhvcNAQEFBQADggEBABU1PdlMVAXcFlAbKRjy6Oo1Y4TkmGihKcfU
+ooTdSU45em1ZpichtPtOM4UocQwC95HXgEk28FJqJasVAlRoGoOmtBY9+D8bitVz
+/xVPcHgt9U7XY8+Q0O07iCdsKFeUCO7iH9kezfIvHPL9jVm0NJMUFZzME3mFcm2+
+5Qq8ZmYSGTXnkdEamR9EFL2CgC8QnuMxNK3VHbmU2Wc/QjOW0Mp9DdSIBZNXc5i2
+ANiyHDVl2iIK6U06r4Dr3zafoaLuQrbP15bZgoSda958GYYKnCV58cj5HdXM7ugT
+18L4KCG+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">MTA Titkárság</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">MTA Akadémiai Adattár (AAT)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">MTA Akadémiai Adattár (AAT)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://aat.mta.hu/aat</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://aat.mta.hu/aat</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.nbi.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nbi.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..5ee4cb0b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.nbi.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHOt3m/M81BDIw0lEc0SUUyTASbRsYEw
+						Nd7h6F1zL/kdr5b8pZswPinFm5nVQQ5CI9MdtrTs5ACPjqdbqFUPAMrkLq9A4qsI
+						Y6eWkQwiR8t5plmfAxw+WvEkJ89gE9FZ6MSIXDlg1NxWzn9En47tl0T7Q3CeWNde
+						sjnQZN81AC0SLo/wcnxzE8dHftLIqPR1LLuAfuTc3w5GLZS/RZgDTrlhzrXFieho
+						A2WHWfdPa6+RrxHyfWeqXn8ZE04ILIZu78h/BfkKmzLfRqV3ED7nWUujnOSb20Vr
+						PiB0BaHb4iOglArkx4RsybZ/NyADpjNLXtjIWOllruxyznQqLGs3fwIDAQABo2Ew
+						XzA+BgNVHREENzA1gg1pZHAubmJpLmFjLnVrhiRodHRwczovL2lkcC5uYmkuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOpCrmGHgYRnUdKyrHB0VPmKFpbs
+						MA0GCSqGSIb3DQEBBQUAA4IBAQAmcCqvZSGO2hUl5gxzXKaihOeHJCNe9KuC6Dnu
+						cj/ujX//256AnC4TBzrmUgl3RULQE8zs6XGvW9UXEk/3wcKuIJFAt/L2/tS2vhj3
+						x9Dpw3jtm7u2Npl1DUsy73PmlGcJDYepgyZdScl64KuZbfcqJeXEZsWiki2gNZc/
+						44CQn7q7xAfpvyxmW+4MJ+YKAXCauhtR9A0XaSqDek59GREsFR49ELza8bfgNbP6
+						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>
+						MIIDIDCCAgigAwIBAgIVAP8HG8Tqa3oYPeErtZhxjc1ROFKaMA0GCSqGSIb3DQEB
+						BQUAMBgxFjAUBgNVBAMTDWlkcC5uYmkuYWMudWswHhcNMTMwNzA5MTY0MDUwWhcN
+						MzMwNzA5MTY0MDUwWjAYMRYwFAYDVQQDEw1pZHAubmJpLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHOt3m/M81BDIw0lEc0SUUyTASbRsYEw
+						Nd7h6F1zL/kdr5b8pZswPinFm5nVQQ5CI9MdtrTs5ACPjqdbqFUPAMrkLq9A4qsI
+						Y6eWkQwiR8t5plmfAxw+WvEkJ89gE9FZ6MSIXDlg1NxWzn9En47tl0T7Q3CeWNde
+						sjnQZN81AC0SLo/wcnxzE8dHftLIqPR1LLuAfuTc3w5GLZS/RZgDTrlhzrXFieho
+						A2WHWfdPa6+RrxHyfWeqXn8ZE04ILIZu78h/BfkKmzLfRqV3ED7nWUujnOSb20Vr
+						PiB0BaHb4iOglArkx4RsybZ/NyADpjNLXtjIWOllruxyznQqLGs3fwIDAQABo2Ew
+						XzA+BgNVHREENzA1gg1pZHAubmJpLmFjLnVrhiRodHRwczovL2lkcC5uYmkuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOpCrmGHgYRnUdKyrHB0VPmKFpbs
+						MA0GCSqGSIb3DQEBBQUAA4IBAQAmcCqvZSGO2hUl5gxzXKaihOeHJCNe9KuC6Dnu
+						cj/ujX//256AnC4TBzrmUgl3RULQE8zs6XGvW9UXEk/3wcKuIJFAt/L2/tS2vhj3
+						x9Dpw3jtm7u2Npl1DUsy73PmlGcJDYepgyZdScl64KuZbfcqJeXEZsWiki2gNZc/
+						44CQn7q7xAfpvyxmW+4MJ+YKAXCauhtR9A0XaSqDek59GREsFR49ELza8bfgNbP6
+						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>
diff --git a/swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml
new file mode 100644
index 00000000..abe3f854
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml
@@ -0,0 +1,74 @@
+<?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.edugate.ie/welcome-edugate-federation/membership</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">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:PrivacyStatementURL xml:lang="en">http://www.ncirl.ie/Legal/Privacy.aspx</mdui:PrivacyStatementURL>
+        <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:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUDymT+0qnFpj+1wBK67kpD4GOwBQwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLm5jaXJsLmllMB4XDTE0MDExNTEzNTQ0NloXDTM0
+MDExNTEzNTQ0NlowFzEVMBMGA1UEAxMMaWRwLm5jaXJsLmllMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypTiVM40mgEF79m5GylKgp+UZRRghVs6iPOc
+dClQNg52UCyORYQ/N5PPOJzJRUR97zeqlmNeH9su0tAgfZgbncw/vXklXJIAxIcL
+nwGyaZdTGyj/VDBtnxj5u8hLm5/5WwqEw2Jo6Jma5qfBmNFpSAOTfkSvtMxWCtqe
+o8h1ni0AN4jKHaijAjrzLMutrlwHpgZDN+21s/9InCTdrWGlfUp3Mbl0yCxizPax
+IH3gGsO6nFt55/CNsA4ZTXVK1NzYWpuAubWzeuqM4DMLw0lMCOxCZ0/TTKNKft3p
+2gftS6oJriXVcd05tLVG0Th2bAQicl1mZ+OXkFc/a13kcR368wIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAubmNpcmwuaWWGI2h0dHBzOi8vaWRwLm5jaXJsLmllL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ1LNq1zEuMDzz7DnnOZ6nDSsxoVTANBgkq
+hkiG9w0BAQUFAAOCAQEAxaOejgfPiAEhBHErNLiWdvmzaxtjRp6zKfrIFVcFKEQx
+eex6fyCNQ0XQMfPeber7EtAuk2AdidMxlYAgBMNp57oZnBuvYipO8LVn6qPpotoQ
+uqMQX4MYtEcIHnDdwZErO3CzKWG76PC5C5CM2G9eh7sahmP2F7EZshX+Wz45il1j
+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: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: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.ne-worcs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ne-worcs.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..1d6394e0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ne-worcs.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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>
+      <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
+						VQQLDApJVCBTdXBwb3J0MRswGQYDVQQDDBJpZHAubmUtd29yY3MuYWMudWswHhcN
+						MTMwMTI1MTAwMzQzWhcNMzMwMTIwMTAwMzQzWjCBlzELMAkGA1UEBhMCR0IxFzAV
+						BgNVBAgMDldvcmNlc3RlcnNoaXJlMREwDwYDVQQHDAhSZWRkaXRjaDEqMCgGA1UE
+						CgwhTm9ydGggRWFzdCBXb3JjZXN0ZXJzaGlyZSBDb2xsZWdlMRMwEQYDVQQLDApJ
+						VCBTdXBwb3J0MRswGQYDVQQDDBJpZHAubmUtd29yY3MuYWMudWswggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCVcflAUC6XOzv8yhdkX9Zf83iZoUpiKVh
+						Pj0ATct/aPsWsLDQndOzo4sM0FXmrDChA0jvUGlJ5q0R/Sfl/qjNBNBnvvnXsmjj
+						fAzZcMCX7YfKfXgzF0uIdujjGkx1Y6fvD2azVXxf1fAa3IyhM0o+ObfIyErerhNU
+						vxJ4uP1dUrBxIry9qsNwMM51TEOtF6Atvcy1toGdC7dOYHk7+sB+WW8m2QWch2TT
+						4/Q3hNBjXBRQkyY/QIqJLMCGdi6B8bNF2RViiC7yJqqYCnzZQ4YUHMxIJqm3krX5
+						AkEKVXiFZ6TalR3BRyVOyylGQpz8X2Ykzog2E3Lz0erUEjbm7zJfAgMBAAEwDQYJ
+						KoZIhvcNAQEFBQADggEBAI94qHrZZvoCZdgGlQg6vl2A+GwvQuQ2ZIr+CWtq6DzS
+						4IDYqY8GPBBk1zuDx3StGeYfqO7s6jrgup0/gKJD7l4oV8Dq/VUHXdWt11+aMdlb
+						W185fYQw++jcYaEZyr2LzDqOHO7dgbgyrCypjiFtU279lrf+Uz0XDf3FFQm+wg9+
+						HXoRWAAYwZQaMOMADo/70fUHKEe7IH5u81m0Sh1REjX/erBmWoBNXrMBLNa+vhPT
+						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>
+						MIIDrDCCApQCCQCVGi7e0Pph5TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
+						R0IxFzAVBgNVBAgMDldvcmNlc3RlcnNoaXJlMREwDwYDVQQHDAhSZWRkaXRjaDEq
+						MCgGA1UECgwhTm9ydGggRWFzdCBXb3JjZXN0ZXJzaGlyZSBDb2xsZWdlMRMwEQYD
+						VQQLDApJVCBTdXBwb3J0MRswGQYDVQQDDBJpZHAubmUtd29yY3MuYWMudWswHhcN
+						MTMwMTI1MTAwMzQzWhcNMzMwMTIwMTAwMzQzWjCBlzELMAkGA1UEBhMCR0IxFzAV
+						BgNVBAgMDldvcmNlc3RlcnNoaXJlMREwDwYDVQQHDAhSZWRkaXRjaDEqMCgGA1UE
+						CgwhTm9ydGggRWFzdCBXb3JjZXN0ZXJzaGlyZSBDb2xsZWdlMRMwEQYDVQQLDApJ
+						VCBTdXBwb3J0MRswGQYDVQQDDBJpZHAubmUtd29yY3MuYWMudWswggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCVcflAUC6XOzv8yhdkX9Zf83iZoUpiKVh
+						Pj0ATct/aPsWsLDQndOzo4sM0FXmrDChA0jvUGlJ5q0R/Sfl/qjNBNBnvvnXsmjj
+						fAzZcMCX7YfKfXgzF0uIdujjGkx1Y6fvD2azVXxf1fAa3IyhM0o+ObfIyErerhNU
+						vxJ4uP1dUrBxIry9qsNwMM51TEOtF6Atvcy1toGdC7dOYHk7+sB+WW8m2QWch2TT
+						4/Q3hNBjXBRQkyY/QIqJLMCGdi6B8bNF2RViiC7yJqqYCnzZQ4YUHMxIJqm3krX5
+						AkEKVXiFZ6TalR3BRyVOyylGQpz8X2Ykzog2E3Lz0erUEjbm7zJfAgMBAAEwDQYJ
+						KoZIhvcNAQEFBQADggEBAI94qHrZZvoCZdgGlQg6vl2A+GwvQuQ2ZIr+CWtq6DzS
+						4IDYqY8GPBBk1zuDx3StGeYfqO7s6jrgup0/gKJD7l4oV8Dq/VUHXdWt11+aMdlb
+						W185fYQw++jcYaEZyr2LzDqOHO7dgbgyrCypjiFtU279lrf+Uz0XDf3FFQm+wg9+
+						HXoRWAAYwZQaMOMADo/70fUHKEe7IH5u81m0Sh1REjX/erBmWoBNXrMBLNa+vhPT
+						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>Eric</md:GivenName>
+    <md:SurName>MacFarlane</md:SurName>
+    <md:EmailAddress>mailto:emacfarlane@ne-worcs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eric</md:GivenName>
+    <md:SurName>MacFarlane</md:SurName>
+    <md:EmailAddress>mailto:emacfarlane@ne-worcs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..ba52bbfd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nesc.gla.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-29T14:17: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nesc.gla.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National e-Science Centre Hub (Glasgow)</mdui:DisplayName>
+        <mdui:Logo height="168" width="198">https://idp.nesc.gla.ac.uk:8444/nescgla.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDNDCCAhygAwIBAgIVAPq1QpqioWHeh0ScXnahkNLcLb9SMA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51azAeFw0xMDAxMjgxMjQ2
+						MzZaFw0zMDAxMjgxMjQ2MzZaMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIzMo/jm/4YdOcraBypo
+						44Pt5VVSsq362JfQUcuONHVVncUV4WD/60FMjJRIeEzFfFpzbAne6pUnixb9Z1B6
+						fcSpTVN6YhO81LqwnYNumOOlYmYPwDYPObyvpIhcUI4fB/qUbSyURXisbIXlgjow
+						vNbrjxT94otpChHh/MDDf/av1Js96tHUW9qHeE6hCtjKsBOgQRc4F7O4jAwkstlX
+						An0p6uImBE29Dp28XPl2pvGmCX3nXFOxWFNA8/hLaP2WwLwj1We4x9sKrQ36nHXx
+						Vs96YJBQ57UaaXBPciLX0OLi789yuXGBFQVfze1bB+nwg6jyBBYNVRfowcf52tDe
+						ZCUCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLm5lc2MuZ2xhLmFjLnVrhilodHRw
+						czovL2lkcC5uZXNjLmdsYS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						Bp6Cv9b7k/vjHWMzMz9WVf7A/FUwDQYJKoZIhvcNAQEFBQADggEBAHrb5/goxXFy
+						YTItKSfhHvqYKdLMBYrGDn8c0mXOm3vy1rC4osncx9TjPbjLAJg+i6rZxdfCzgN3
+						Cjlg1FyMEpsRkscPRSQlg9gge2Ecd/iWSoq8Md25feH1Xm7AA91Q3S81mheSXqx/
+						As0WUNFBp9tvIYHCBUMujQzw/O0s3qI8COnjAFpj4K1Hp+0zrjjE860ezhKuGs3c
+						v+9IVxUpfm8spl6EnuWbPGY0+J8N4DqL14G1SuOsMJNMB+qw9JFikzNy0YfHD9YK
+						Gcw5OSlSkClxFLW1fQ3aMDYjRi65tmArCZ4p3utYdqEWy4qzitl/helnRtPojX0b
+						XuZK6AuQhAE=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nesc.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://idp.nesc.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://idp.nesc.gla.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nesc.gla.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nesc.gla.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nesc.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">nesc.gla.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDNDCCAhygAwIBAgIVAPq1QpqioWHeh0ScXnahkNLcLb9SMA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51azAeFw0xMDAxMjgxMjQ2
+						MzZaFw0zMDAxMjgxMjQ2MzZaMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIzMo/jm/4YdOcraBypo
+						44Pt5VVSsq362JfQUcuONHVVncUV4WD/60FMjJRIeEzFfFpzbAne6pUnixb9Z1B6
+						fcSpTVN6YhO81LqwnYNumOOlYmYPwDYPObyvpIhcUI4fB/qUbSyURXisbIXlgjow
+						vNbrjxT94otpChHh/MDDf/av1Js96tHUW9qHeE6hCtjKsBOgQRc4F7O4jAwkstlX
+						An0p6uImBE29Dp28XPl2pvGmCX3nXFOxWFNA8/hLaP2WwLwj1We4x9sKrQ36nHXx
+						Vs96YJBQ57UaaXBPciLX0OLi789yuXGBFQVfze1bB+nwg6jyBBYNVRfowcf52tDe
+						ZCUCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLm5lc2MuZ2xhLmFjLnVrhilodHRw
+						czovL2lkcC5uZXNjLmdsYS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						Bp6Cv9b7k/vjHWMzMz9WVf7A/FUwDQYJKoZIhvcNAQEFBQADggEBAHrb5/goxXFy
+						YTItKSfhHvqYKdLMBYrGDn8c0mXOm3vy1rC4osncx9TjPbjLAJg+i6rZxdfCzgN3
+						Cjlg1FyMEpsRkscPRSQlg9gge2Ecd/iWSoq8Md25feH1Xm7AA91Q3S81mheSXqx/
+						As0WUNFBp9tvIYHCBUMujQzw/O0s3qI8COnjAFpj4K1Hp+0zrjjE860ezhKuGs3c
+						v+9IVxUpfm8spl6EnuWbPGY0+J8N4DqL14G1SuOsMJNMB+qw9JFikzNy0YfHD9YK
+						Gcw5OSlSkClxFLW1fQ3aMDYjRi65tmArCZ4p3utYdqEWy4qzitl/helnRtPojX0b
+						XuZK6AuQhAE=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nesc.gla.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nesc.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">National e-Science Centre Hub (Glasgow)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nesc.ac.uk/hub/</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/idp.newcollege.ac.uk-athensla.xml b/swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml
new file mode 100644
index 00000000..bb1c1ac7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIDYDCCAkigAwIBAgIIDMoTE+e8SLkwDQYJKoZIhvcNAQEFBQAwRzEcMBoGA1UE
+						CgwTTmV3IENvbGxlZ2UgU3dpbmRvbjEnMCUGA1UEAwweYXRoZW5zcnVudGltZS5u
+						ZXdjb2xsZWdlLmFjLnVrMB4XDTE0MDkwOTEzMjk0N1oXDTI0MDkwOTEzMjk0N1ow
+						RzEcMBoGA1UECgwTTmV3IENvbGxlZ2UgU3dpbmRvbjEnMCUGA1UEAwweYXRoZW5z
+						cnVudGltZS5uZXdjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEA0Ez45eYCSrflOrisYZeEFa67TskdS51M4kAIuscDLu7Kff9H6dBO
+						yYKPBDsYitiyI1z5fY7+cYt4kb+77ke/2AU+JnT3RUePm/9G3xzGFY5Fu4KTXnXj
+						6Bui5zXSna35ry4eLagL0buNRpx/saSyg6+8MFdRBqVb668XYq19xxngRI6DlN2n
+						nM9NiA5AV+NGIsC7/RC0tYXQ2G3VJePi65Iejan+77leUeTp1hufJD5OwfudoXFc
+						58/hdz4PFHC3NUd8UMhL1WyibbvYwhfBta5V6H/Im0BL0e1qQJjdb/vg3P7w0SOI
+						H2qsAPzqa3DZPCTPf4uLorZ87t73q9J+XQIDAQABo1AwTjAdBgNVHQ4EFgQU0HGl
+						6yLJboYAwDMCD8QfzF5odXcwHwYDVR0jBBgwFoAU0HGl6yLJboYAwDMCD8QfzF5o
+						dXcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAoXzQtdDC4MIhfHWZ
+						dydDbdxXdTus14w6betasZ1XdOEAXK+L+yAJ0FWjNsvXAZCKqkOZoQDpfCpTaIkV
+						EQtzHeHO8/xHkobTHrNeuJnPTBbIl5ZWMedaoY5bu2n4+MWW5G08sSfxpZzcTeNw
+						dQJl1Q+eHlcn1zFsZglZvyYF7crg1n0OVH6Ws+yJs772BrNopFqmaMpdPeLpd8Pk
+						eOFLI4LOL8mVNH2lDvt2LYxkOhW2U9XpGc3j2u8kbHEVPXVVrSaaNtwzeSa3W4sY
+						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>
+						MIIDYDCCAkigAwIBAgIIDMoTE+e8SLkwDQYJKoZIhvcNAQEFBQAwRzEcMBoGA1UE
+						CgwTTmV3IENvbGxlZ2UgU3dpbmRvbjEnMCUGA1UEAwweYXRoZW5zcnVudGltZS5u
+						ZXdjb2xsZWdlLmFjLnVrMB4XDTE0MDkwOTEzMjk0N1oXDTI0MDkwOTEzMjk0N1ow
+						RzEcMBoGA1UECgwTTmV3IENvbGxlZ2UgU3dpbmRvbjEnMCUGA1UEAwweYXRoZW5z
+						cnVudGltZS5uZXdjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEA0Ez45eYCSrflOrisYZeEFa67TskdS51M4kAIuscDLu7Kff9H6dBO
+						yYKPBDsYitiyI1z5fY7+cYt4kb+77ke/2AU+JnT3RUePm/9G3xzGFY5Fu4KTXnXj
+						6Bui5zXSna35ry4eLagL0buNRpx/saSyg6+8MFdRBqVb668XYq19xxngRI6DlN2n
+						nM9NiA5AV+NGIsC7/RC0tYXQ2G3VJePi65Iejan+77leUeTp1hufJD5OwfudoXFc
+						58/hdz4PFHC3NUd8UMhL1WyibbvYwhfBta5V6H/Im0BL0e1qQJjdb/vg3P7w0SOI
+						H2qsAPzqa3DZPCTPf4uLorZ87t73q9J+XQIDAQABo1AwTjAdBgNVHQ4EFgQU0HGl
+						6yLJboYAwDMCD8QfzF5odXcwHwYDVR0jBBgwFoAU0HGl6yLJboYAwDMCD8QfzF5o
+						dXcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAoXzQtdDC4MIhfHWZ
+						dydDbdxXdTus14w6betasZ1XdOEAXK+L+yAJ0FWjNsvXAZCKqkOZoQDpfCpTaIkV
+						EQtzHeHO8/xHkobTHrNeuJnPTBbIl5ZWMedaoY5bu2n4+MWW5G08sSfxpZzcTeNw
+						dQJl1Q+eHlcn1zFsZglZvyYF7crg1n0OVH6Ws+yJs772BrNopFqmaMpdPeLpd8Pk
+						eOFLI4LOL8mVNH2lDvt2LYxkOhW2U9XpGc3j2u8kbHEVPXVVrSaaNtwzeSa3W4sY
+						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>Jason</md:GivenName>
+    <md:SurName>Hull</md:SurName>
+    <md:EmailAddress>mailto:jason.hull@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.newvic.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..2e746489
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCIgYP2Zg400N4Z1zX9txCaEtQt
+						+42Tc6dKndjl44UctLUg1UNNRMkoEAY+6HqwdE3DgVqd0YMN1wVBkv8EYCqz/TAU
+						WqSIfAEjZDeMJalVoKu1pfdW7mB3aciH8rddMQ1LYQHmEPeNrzC2MjJEJgQ9hOXD
+						ow+hyE+cWhlr4kjJB4gYhfGCiAMkVCi5h6MJvDVARDz/eX75J5yBOsBXYAnEeyG1
+						WArxEwPgfGf0dv0IJxI/gacJg2aeltyhPoTsi074C4L4w2e0S6DGpSDPr2wQO0T2
+						GKrrBfplb/f2z3NqA0FQixn9U9igN59TB3SVcWHmVCGvXJ8MAfMBIKe3K6f7AgMB
+						AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC5uZXd2aWMuYWMudWuGJ2h0dHBzOi8vaWRw
+						Lm5ld3ZpYy5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVc2r4NVHJPsT
+						HhMYmvd+VlvxnwcwDQYJKoZIhvcNAQEFBQADggEBAAv+49iJGalruBtUdV2g6lFY
+						XpZcFIAAbS5AmBigEalNZJqp1BiWNHitdq+6G0JJzSzMlLlsvRjWRP59E2veuqm6
+						CJchy6WsFPg4aGT77Q28WEbVFSOABF7TLHYeqTBuLUACKlpIdkM/pQxPyPlUg1IV
+						iIeWjqCxVj9glgmPHDpK9gkKXyOhd1b8NhxeBJ/xVId3OosQCIPh++Nc00LRpHqu
+						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>
+						MIIDKzCCAhOgAwIBAgIUc68eei2OkuHHobEIjasrgMJSBp4wDQYJKoZIhvcNAQEF
+						BQAwGzEZMBcGA1UEAxMQaWRwLm5ld3ZpYy5hYy51azAeFw0xNDAzMDcwOTMyMTJa
+						Fw0zNDAzMDcwOTMyMTJaMBsxGTAXBgNVBAMTEGlkcC5uZXd2aWMuYWMudWswggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCIgYP2Zg400N4Z1zX9txCaEtQt
+						+42Tc6dKndjl44UctLUg1UNNRMkoEAY+6HqwdE3DgVqd0YMN1wVBkv8EYCqz/TAU
+						WqSIfAEjZDeMJalVoKu1pfdW7mB3aciH8rddMQ1LYQHmEPeNrzC2MjJEJgQ9hOXD
+						ow+hyE+cWhlr4kjJB4gYhfGCiAMkVCi5h6MJvDVARDz/eX75J5yBOsBXYAnEeyG1
+						WArxEwPgfGf0dv0IJxI/gacJg2aeltyhPoTsi074C4L4w2e0S6DGpSDPr2wQO0T2
+						GKrrBfplb/f2z3NqA0FQixn9U9igN59TB3SVcWHmVCGvXJ8MAfMBIKe3K6f7AgMB
+						AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC5uZXd2aWMuYWMudWuGJ2h0dHBzOi8vaWRw
+						Lm5ld3ZpYy5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVc2r4NVHJPsT
+						HhMYmvd+VlvxnwcwDQYJKoZIhvcNAQEFBQADggEBAAv+49iJGalruBtUdV2g6lFY
+						XpZcFIAAbS5AmBigEalNZJqp1BiWNHitdq+6G0JJzSzMlLlsvRjWRP59E2veuqm6
+						CJchy6WsFPg4aGT77Q28WEbVFSOABF7TLHYeqTBuLUACKlpIdkM/pQxPyPlUg1IV
+						iIeWjqCxVj9glgmPHDpK9gkKXyOhd1b8NhxeBJ/xVId3OosQCIPh++Nc00LRpHqu
+						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">Newman 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
new file mode 100644
index 00000000..9de50906
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.nhc.ac.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVAxTlV/bVEVPw+4l3mVPRI/D9qbra1yQ7
+						3vPIJ7Zhn4l4YLRoJsFbRWdEGVfvy1Ie2NutU45AgAnHDmzW2fCKoIaS5KqkJjD7
+						fQHwBxDTrqweQhkrddZ5HuXj/DHlY23q+1/tw1k19fZTuEo6VWZu8orWdo7IOWtk
+						QvCRACAXQcDTKRA5Uhnub8Z08QmdeBlac1wQ6ALcpFHmWA7vqouUGgYnjJNU+Soi
+						XxiUDv7FipkmPWeQpJlHv/5fVkp/PW+bv48cL6DkTis486/8thdIJETySvTEu/oA
+						/MlCKfOnvWm/nJk52Uq7Qot/s4hSGL5mQZTaL52x85HFuh4JgahlAgMBAAGjYTBf
+						MD4GA1UdEQQ3MDWCDWlkcC5uaGMuYWMudWuGJGh0dHBzOi8vaWRwLm5oYy5hYy51
+						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdnHc1Y7HF5N9zJhFS1ifKZuSrmcw
+						DQYJKoZIhvcNAQEFBQADggEBAL4RnY4z2aISPmdAiYOXurpzJZvZ3HAJS6UxNyuG
+						ZlAg5CtUM4dLpHjN8ajx9oYpMxK9uG47I/NFKvjxdGScWyTEYR6Myp2eGuz404Un
+						+SMjYxnJ2MQg4TfkX+WdMTp65Zw+6d3hKdcaAgBjske+3C4Shj6rzohXMXav6TMo
+						6kCN7IEhkpk5OQy3iMAhfNy+2rDpnJEHrUrdAIV74V55k60UX3Pg2M72Pexh1FVp
+						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>
+						MIIDHzCCAgegAwIBAgIUNuc5nh8nE6/6dgrZJmkSDgYUjPowDQYJKoZIhvcNAQEF
+						BQAwGDEWMBQGA1UEAxMNaWRwLm5oYy5hYy51azAeFw0xMzA5MTcxNDAyNTdaFw0z
+						MzA5MTcxNDAyNTdaMBgxFjAUBgNVBAMTDWlkcC5uaGMuYWMudWswggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVAxTlV/bVEVPw+4l3mVPRI/D9qbra1yQ7
+						3vPIJ7Zhn4l4YLRoJsFbRWdEGVfvy1Ie2NutU45AgAnHDmzW2fCKoIaS5KqkJjD7
+						fQHwBxDTrqweQhkrddZ5HuXj/DHlY23q+1/tw1k19fZTuEo6VWZu8orWdo7IOWtk
+						QvCRACAXQcDTKRA5Uhnub8Z08QmdeBlac1wQ6ALcpFHmWA7vqouUGgYnjJNU+Soi
+						XxiUDv7FipkmPWeQpJlHv/5fVkp/PW+bv48cL6DkTis486/8thdIJETySvTEu/oA
+						/MlCKfOnvWm/nJk52Uq7Qot/s4hSGL5mQZTaL52x85HFuh4JgahlAgMBAAGjYTBf
+						MD4GA1UdEQQ3MDWCDWlkcC5uaGMuYWMudWuGJGh0dHBzOi8vaWRwLm5oYy5hYy51
+						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdnHc1Y7HF5N9zJhFS1ifKZuSrmcw
+						DQYJKoZIhvcNAQEFBQADggEBAL4RnY4z2aISPmdAiYOXurpzJZvZ3HAJS6UxNyuG
+						ZlAg5CtUM4dLpHjN8ajx9oYpMxK9uG47I/NFKvjxdGScWyTEYR6Myp2eGuz404Un
+						+SMjYxnJ2MQg4TfkX+WdMTp65Zw+6d3hKdcaAgBjske+3C4Shj6rzohXMXav6TMo
+						6kCN7IEhkpk5OQy3iMAhfNy+2rDpnJEHrUrdAIV74V55k60UX3Pg2M72Pexh1FVp
+						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>
diff --git a/swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml
new file mode 100644
index 00000000..086277ff
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml
@@ -0,0 +1,78 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">niif.hu</shibmd:Scope>
+      <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 - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">NIIF Intézet</mdui:Description>
+        <mdui:Description xml:lang="en">NIIF Institute</mdui:Description>
+        <mdui:Logo height="86" width="150">https://idp.niif.hu/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>
+MIID3zCCAsegAwIBAgIJAPlKCyW+F3hqMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYD
+VQQGEwJIVTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UEBwwIQnVkYXBlc3Qx
+DjAMBgNVBAoMBU5JSUZJMQwwCgYDVQQLDANBQUkxFDASBgNVBAMMC2lkcC5uaWlm
+Lmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTAeFw0xNDA0MTAwNzA4NDVa
+Fw0zMzA2MDkwNzA4NDVaMIGFMQswCQYDVQQGEwJIVTETMBEGA1UECAwKU29tZS1T
+dGF0ZTERMA8GA1UEBwwIQnVkYXBlc3QxDjAMBgNVBAoMBU5JSUZJMQwwCgYDVQQL
+DANBQUkxFDASBgNVBAMMC2lkcC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlA
+bmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALa3pkANdEGm
+J/CXbDCeH+UKbqvMmpSga+dUpaJ8X0KpIbb+gZBUgj3IqLZTtlf3A2CEUI9LLcAE
+bQln8rB5KMAMzsyyX6JUJzGsSkpKuu0Oticw3oXooNd4a9FYsdZON8iiSFrquzSi
+uov9Q1qslwafOxGhkwJr15HqChRfxcXI61Sid0FEAfSocrgMkdxoCq2YIWug17eg
+IqA6gzKbThOmtAJe5Cw4gAVY2QBDut9e/F6q4kM9ukfEQwwnlC1ghP+5T6kMq7uK
+Ad98yZv6/s95Eqiy7C7T2BiAmCqJy6Ef/I9tRKD3lvpcm32tlhprfpetBHq4OLG1
+4Ieqhj8rZaMCAwEAAaNQME4wHQYDVR0OBBYEFDkbK3v2IgzSeNCN1LrKR75aStlY
+MB8GA1UdIwQYMBaAFDkbK3v2IgzSeNCN1LrKR75aStlYMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBABPM/c1QSk2ZHHUkgM60+yvrDVtMtKIdxGgpulks
+HUDRoCiP/1wxjCS0EFS4t/4rYogokaEfCo8Wi9VuoJS8xVlBFKe8XD3LrqKy5lbK
+Zp10rb2e4PiCb7WlAL04kLdtogrNJfYfH13yHwYGuxOJN95SLaXw8hj7fhf6Ntoc
+I7zTAIoMeizsQ6KjhKSNiYfokAhYzsrLydmeNnVZmYL06YOS289Z6pFmarOuhDyc
+AuZDBV7AND592hCKqwh3KyTxhlzzxVAQZXb/s9kwVqaNWZ7ChO23REDrHfbpi14t
+ty1WFi42/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 Intézet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">NIIF Institute</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.niif.hu</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.nordu.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml
new file mode 100644
index 00000000..ccde6921
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?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>
+      <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 height="46" width="203" xml:lang="sv">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
+        <mdui:Logo height="46" width="203" xml:lang="en">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>
+MIIDHzCCAgegAwIBAgIUbYzFMX2BKRKmZwRSWg0HZ3/MQQwwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLm5vcmR1Lm5ldDAeFw0wOTA5MDMxOTI4NDlaFw0y
+OTA5MDMxOTI4NDlaMBgxFjAUBgNVBAMTDWlkcC5ub3JkdS5uZXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSypIpdblxznunPXiwKCqwOYmj99u5S9f7
+RTR+s8EDs01uwJ8buJs0MId+s96mD8MIkobE4iwn/B6xlafbMr3/BF+XxxH8Q5WX
+Bf3aQV3ohBqur6+mRQ2C+EenzPMGHmV/FCz0cbmTsIAQHZ9Vy16H+x5uWOBVd44i
+CMLM+fgjKyYcpcEUJP9Jkn/+d36L3mdXbyqAQS2UPN+S1g37xrgR2kWW+s1lMEiR
+M/f5L+PuA3l5DxIBmK0tFo+ZPLxbr6OBWOdH6EUbfdkvfciFCVNbWBGRW5MC2aru
+ATCdtf/Vev3OngUYBGSR/94eTgMcs3Oww/ppxRS6dzntGnnCT1sPAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5ub3JkdS5uZXSGJGh0dHBzOi8vaWRwLm5vcmR1Lm5l
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwPXuksUpm5OdopeWHdoRcs6wCu0w
+DQYJKoZIhvcNAQEFBQADggEBAHiPOKmhiLnx8ecuQHmwmh4DUZvarhZXNtgxyasU
+bZAfPoZn8YiELiqYQoA/j+hoAfWcCEafMgjm8nkQO9aad1cwpGY66SIRKPAKBgsW
+nOugnrREWwYl1tXG3VWYzpgygycziYzkmwc4ysHQATKjCYdulA1tZ09YiAnZOIzY
+Q93/gA7X177nVKnAbmSkY1Nap4/rbkHIvQqk8RPSYs5AwasThkEFVk4OQpPtoTOn
+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>
+MIIDHzCCAgegAwIBAgIUbYzFMX2BKRKmZwRSWg0HZ3/MQQwwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLm5vcmR1Lm5ldDAeFw0wOTA5MDMxOTI4NDlaFw0y
+OTA5MDMxOTI4NDlaMBgxFjAUBgNVBAMTDWlkcC5ub3JkdS5uZXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSypIpdblxznunPXiwKCqwOYmj99u5S9f7
+RTR+s8EDs01uwJ8buJs0MId+s96mD8MIkobE4iwn/B6xlafbMr3/BF+XxxH8Q5WX
+Bf3aQV3ohBqur6+mRQ2C+EenzPMGHmV/FCz0cbmTsIAQHZ9Vy16H+x5uWOBVd44i
+CMLM+fgjKyYcpcEUJP9Jkn/+d36L3mdXbyqAQS2UPN+S1g37xrgR2kWW+s1lMEiR
+M/f5L+PuA3l5DxIBmK0tFo+ZPLxbr6OBWOdH6EUbfdkvfciFCVNbWBGRW5MC2aru
+ATCdtf/Vev3OngUYBGSR/94eTgMcs3Oww/ppxRS6dzntGnnCT1sPAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5ub3JkdS5uZXSGJGh0dHBzOi8vaWRwLm5vcmR1Lm5l
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwPXuksUpm5OdopeWHdoRcs6wCu0w
+DQYJKoZIhvcNAQEFBQADggEBAHiPOKmhiLnx8ecuQHmwmh4DUZvarhZXNtgxyasU
+bZAfPoZn8YiELiqYQoA/j+hoAfWcCEafMgjm8nkQO9aad1cwpGY66SIRKPAKBgsW
+nOugnrREWwYl1tXG3VWYzpgygycziYzkmwc4ysHQATKjCYdulA1tZ09YiAnZOIzY
+Q93/gA7X177nVKnAbmSkY1Nap4/rbkHIvQqk8RPSYs5AwasThkEFVk4OQpPtoTOn
+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>noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet</md:Company>
+    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>NORDUnet</md:Company>
+    <md:SurName>NUNOC</md:SurName>
+    <md:EmailAddress>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
new file mode 100644
index 00000000..3abbc94a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.normandie-univ.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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="fr">Normandie Université</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDLzCCAhegAwIBAgIUfjtraZCnuk4ayIJfZ7jOPQ0/p80wDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRaWRwcHAudW5yLXJ1bm4uZnIwHhcNMTMwMjIxMTQwODMw
+WhcNMzMwMjIxMTQwODMwWjAcMRowGAYDVQQDExFpZHBwcC51bnItcnVubi5mcjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2HpbBKeZVmYAS0cQ+9Sv6R
+0EqFnIcPr1gk3F3TSlOwKfptwg/YcC5i0sgQYeNCsVKeOclPPIS60eerF5RdiUbs
+WLKsrkHWja7virusalMVQZJA6o+A5zu3+y7BuZRi8/cEnpUjz3S5N1TarB9lYSsD
+/dxPB1bboefJbLfEQFAQc+SOobBineniffnGahR03jAoaJni9DUERtF8fSo4+s4m
+5I6MeiBV6GNfkGHamCtEdNQ/u0HjQYYv8+BB9SbYpEY4FvYq2oelE5ET01vxogQr
+ZYkAcuOfZVWqNX2mH5aBZewDcaE0DTfMDd5WR9Wjvv7MRF3uTOIF1jLxks/5eIkC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwcHAudW5yLXJ1bm4uZnKGKGh0dHBzOi8v
+aWRwcHAudW5yLXJ1bm4uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFP25fp7f
+nTtS3FfVhWpKfZa6X3BoMA0GCSqGSIb3DQEBBQUAA4IBAQBhqb/05bggrq/L5c1e
+LNnETROqzlxr47ECX/6vcOEov37EV2PCvIjMj1TOuEVSyy3LfOzYswy6d2fzG7Om
+NIXxg7m8CjccJ3F4H2Kp4pZDdqoI+O4oqGHLuqBAxF+B0qHlnGzL7OF6eIv3yCkR
+6uIuKyRiYpH1jAPbE1RHEzYHbB521IkdlCuoA3D41OmQzhVH48UEK+KUmqqTguEW
+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://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Gallot Jérôme</md:SurName>
+    <md:EmailAddress>jerome.gallot@normandie-univ.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Houdelette Arnaud</md:SurName>
+    <md:EmailAddress>arnaud.houdelette@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
new file mode 100644
index 00000000..515589e1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.northampton.ac.uk-oala-metadata.xml
@@ -0,0 +1,86 @@
+<?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>
+      <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>
+						MIIDvjCCAqagAwIBAgIJAO2YHtS7tStwMA0GCSqGSIb3DQEBBQUAMEgxJjAkBgNV
+						BAoTHVRoZSBVbml2ZXJzaXR5IG9mIE5vcnRoYW1wdG9uMR4wHAYDVQQDExVpZHAu
+						bm9ydGhhbXB0b24uYWMudWswHhcNMTEwNzAxMDkzMTA2WhcNMjEwNjI4MDkzMTA2
+						WjBIMSYwJAYDVQQKEx1UaGUgVW5pdmVyc2l0eSBvZiBOb3J0aGFtcHRvbjEeMBwG
+						A1UEAxMVaWRwLm5vcnRoYW1wdG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAnXNIFiDdMKiB0epr5mrHoxdU9agPeWH+KMyutW6bz/58uYE1
+						yQGCivZPOoYl2rLrkvz/CboDst49EfaphkC2wro4AlZWj3if/g7DBWDOfdFQ+uxQ
+						Zs53Bcx5htjbOAbIgnVM5qUXj0hY48VE4iUhIfXg2sS2rAtZ0mFBfbscxtiGReMy
+						c+RK+d4FVe2FilXuhDsrSTbrzdRD+y/dJgyueh6wtQNK19y5VmrbUQv4eL7zu0Hj
+						FiPBNH/fnAQG9vZJusj2GSGLqUdFwJ5WeBykmSCM0y+zCV7Lg5cgbzaDqw7GkFQ8
+						nGaSChoZeOiZLGYyAJW8SWr4BItMCIzKYu39ZwIDAQABo4GqMIGnMB0GA1UdDgQW
+						BBRubSh5GRDx+a/9clMJCs+uSzUUHjB4BgNVHSMEcTBvgBRubSh5GRDx+a/9clMJ
+						Cs+uSzUUHqFMpEowSDEmMCQGA1UEChMdVGhlIFVuaXZlcnNpdHkgb2YgTm9ydGhh
+						bXB0b24xHjAcBgNVBAMTFWlkcC5ub3J0aGFtcHRvbi5hYy51a4IJAO2YHtS7tStw
+						MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJStfpsWeslB4rGZfXcf
+						5L+TQ+01ukSjEVTCPk76BC/xyy8hgzVeHsoO1H1cBeQwiq5metEJvNP6Lws13An5
+						jIDYCUbw79XqfIF8R8ElEX9yDQjQlvE1gnowcu06lnBMrKbSPKigSdfVgZnp5lm1
+						nkOjNCIFua99k4/29oPYjY4N9j1RLfpsQj9I+b89yoRCcTzqdssL28bF5Yj2M9vn
+						i4k/FGuhoklMy5g/PzA0oB9NOY30HJ90V6vcWCXZBx1etmURUhAzm4Ibz7eeoxVj
+						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>
+						MIIDvjCCAqagAwIBAgIJAO2YHtS7tStwMA0GCSqGSIb3DQEBBQUAMEgxJjAkBgNV
+						BAoTHVRoZSBVbml2ZXJzaXR5IG9mIE5vcnRoYW1wdG9uMR4wHAYDVQQDExVpZHAu
+						bm9ydGhhbXB0b24uYWMudWswHhcNMTEwNzAxMDkzMTA2WhcNMjEwNjI4MDkzMTA2
+						WjBIMSYwJAYDVQQKEx1UaGUgVW5pdmVyc2l0eSBvZiBOb3J0aGFtcHRvbjEeMBwG
+						A1UEAxMVaWRwLm5vcnRoYW1wdG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAnXNIFiDdMKiB0epr5mrHoxdU9agPeWH+KMyutW6bz/58uYE1
+						yQGCivZPOoYl2rLrkvz/CboDst49EfaphkC2wro4AlZWj3if/g7DBWDOfdFQ+uxQ
+						Zs53Bcx5htjbOAbIgnVM5qUXj0hY48VE4iUhIfXg2sS2rAtZ0mFBfbscxtiGReMy
+						c+RK+d4FVe2FilXuhDsrSTbrzdRD+y/dJgyueh6wtQNK19y5VmrbUQv4eL7zu0Hj
+						FiPBNH/fnAQG9vZJusj2GSGLqUdFwJ5WeBykmSCM0y+zCV7Lg5cgbzaDqw7GkFQ8
+						nGaSChoZeOiZLGYyAJW8SWr4BItMCIzKYu39ZwIDAQABo4GqMIGnMB0GA1UdDgQW
+						BBRubSh5GRDx+a/9clMJCs+uSzUUHjB4BgNVHSMEcTBvgBRubSh5GRDx+a/9clMJ
+						Cs+uSzUUHqFMpEowSDEmMCQGA1UEChMdVGhlIFVuaXZlcnNpdHkgb2YgTm9ydGhh
+						bXB0b24xHjAcBgNVBAMTFWlkcC5ub3J0aGFtcHRvbi5hYy51a4IJAO2YHtS7tStw
+						MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJStfpsWeslB4rGZfXcf
+						5L+TQ+01ukSjEVTCPk76BC/xyy8hgzVeHsoO1H1cBeQwiq5metEJvNP6Lws13An5
+						jIDYCUbw79XqfIF8R8ElEX9yDQjQlvE1gnowcu06lnBMrKbSPKigSdfVgZnp5lm1
+						nkOjNCIFua99k4/29oPYjY4N9j1RLfpsQj9I+b89yoRCcTzqdssL28bF5Yj2M9vn
+						i4k/FGuhoklMy5g/PzA0oB9NOY30HJ90V6vcWCXZBx1etmURUhAzm4Ibz7eeoxVj
+						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>
diff --git a/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..83cd20ea
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml
@@ -0,0 +1,108 @@
+<?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>
+      <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>
+						MIIEdTCCA12gAwIBAgIQe1M3iT3f/2KTNQrtPxJO9zANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDQxMTAwMDAwMFoXDTE2MDQxMDIzNTk1OVowQjEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDExRpZHAubm90dGlu
+						Z2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPCJKaG8
+						8WhWnpx1nIaiU+QJnQONYwqLyA8mpBThyXDGBZum2/u7rJeaqAicbtOSO+Wlwfz0
+						nPPxgv7g103BOCELqo5vc2agVJZTTGBHAPbJsSpnqZTcxZVqCooemLFeh+7YS5C/
+						vk1XZmk0O63JAqmTJSFOi4OpdcbI1uojACA5mhpYVb1PllMwbOMOBDPT79DZSUDi
+						8nu3xzEYOkSOw33Fk8wmXMU4/vjn3ZHBv9SbUyA0FyRiMIk3XujXRIUaVrJBKvkQ
+						MFF6r84N6oRQH/UCsvzBYYBIh0f0Vl+irwpzj7e/p/8FV1QQmVMB9D4DG1zcqTiK
+						nEC0YIAnf9ec1JUCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
+						KzdXR+qQ47ntMB0GA1UdDgQWBBTQtQfjFYFrVoVdyhsPVSEgFgwwgTAOBgNVHQ8B
+						Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
+						BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
+						BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+						QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+						cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+						L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRwLm5vdHRpbmdoYW0u
+						YWMudWswDQYJKoZIhvcNAQEFBQADggEBAHpnljGSmsagTtG4QQXuYT9riYNyw4lX
+						w3P96GIFPKPH4q1B5IUbIWqvXm5/YWG1t5GK3sdNl/H0I2Araej3h3Ep1VKyU1IS
+						MtmyAMVFbEFK7qpLqGadOCJojIOKkgSNv9B601iJ9MLc3HETBK3/plotP1SBMiBH
+						ErIC3PM2XB6gZ53u7GdsBt58gL0KamrLWRfBymXMB30EdBZyncAUse5EuCmP0+zy
+						YrWrdQpwZFzid6O8ClK4matKCpg4i2XG0mw+5sH7aPN/j+whNj4xzvKbv1T9Yke+
+						mA0w+oSnr4UMSWEb2bb985BmqcNfixmz0EtzfqnKkLL0h1oS9WLoFKs=
+					</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>
+						MIIEdTCCA12gAwIBAgIQe1M3iT3f/2KTNQrtPxJO9zANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDQxMTAwMDAwMFoXDTE2MDQxMDIzNTk1OVowQjEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDExRpZHAubm90dGlu
+						Z2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPCJKaG8
+						8WhWnpx1nIaiU+QJnQONYwqLyA8mpBThyXDGBZum2/u7rJeaqAicbtOSO+Wlwfz0
+						nPPxgv7g103BOCELqo5vc2agVJZTTGBHAPbJsSpnqZTcxZVqCooemLFeh+7YS5C/
+						vk1XZmk0O63JAqmTJSFOi4OpdcbI1uojACA5mhpYVb1PllMwbOMOBDPT79DZSUDi
+						8nu3xzEYOkSOw33Fk8wmXMU4/vjn3ZHBv9SbUyA0FyRiMIk3XujXRIUaVrJBKvkQ
+						MFF6r84N6oRQH/UCsvzBYYBIh0f0Vl+irwpzj7e/p/8FV1QQmVMB9D4DG1zcqTiK
+						nEC0YIAnf9ec1JUCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
+						KzdXR+qQ47ntMB0GA1UdDgQWBBTQtQfjFYFrVoVdyhsPVSEgFgwwgTAOBgNVHQ8B
+						Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
+						BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
+						BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+						QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+						cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+						L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRwLm5vdHRpbmdoYW0u
+						YWMudWswDQYJKoZIhvcNAQEFBQADggEBAHpnljGSmsagTtG4QQXuYT9riYNyw4lX
+						w3P96GIFPKPH4q1B5IUbIWqvXm5/YWG1t5GK3sdNl/H0I2Araej3h3Ep1VKyU1IS
+						MtmyAMVFbEFK7qpLqGadOCJojIOKkgSNv9B601iJ9MLc3HETBK3/plotP1SBMiBH
+						ErIC3PM2XB6gZ53u7GdsBt58gL0KamrLWRfBymXMB30EdBZyncAUse5EuCmP0+zy
+						YrWrdQpwZFzid6O8ClK4matKCpg4i2XG0mw+5sH7aPN/j+whNj4xzvKbv1T9Yke+
+						mA0w+oSnr4UMSWEb2bb985BmqcNfixmz0EtzfqnKkLL0h1oS9WLoFKs=
+					</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>
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
new file mode 100644
index 00000000..0b04c622
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.nottingham.edu.cn-idp-shibboleth.xml
@@ -0,0 +1,103 @@
+<?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>
+      <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
+						ExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEeMBwGA1UEAxMVaWRwLm5vdHRpbmdoYW0u
+						ZWR1LmNuMSwwKgYJKoZIhvcNAQkBFh1pdC1zZXJ2aWNlc0Bub3R0aW5naGFtLmVk
+						dS5jbjAeFw0xMTA1MTkwODM0NTVaFw0zMTA1MTQwODM0NTVaMIHPMQswCQYDVQQG
+						EwJDTjERMA8GA1UECBMIWmhlamlhbmcxDzANBgNVBAcTBk5pbmdibzEvMC0GA1UE
+						ChMmVW5pdmVyc2l0eSBvZiBOb3R0aW5naGFtIE5pbmdibywgQ2hpbmExHTAbBgNV
+						BAsTFEluZm9ybWF0aW9uIFNlcnZpY2VzMR4wHAYDVQQDExVpZHAubm90dGluZ2hh
+						bS5lZHUuY24xLDAqBgkqhkiG9w0BCQEWHWl0LXNlcnZpY2VzQG5vdHRpbmdoYW0u
+						ZWR1LmNuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtRiXnUTiNrTR
+						/qHVEWqV50864Thqs3JI1frOi1sjQbaDCkh73hSsNdzxzg5FUdjdZfVrLeh7MVUf
+						Yjp0wWCMvrJDvaZwWgl2mMb2/pvZTkEvTmIwDL/n+G4oyWoUkEjXIrtui4Ie9bAT
+						/tBBN2I+U3c0QTM4DUP21EqjhxwcV3D6gsbGAcay3k5ukpwOgrz30MFqb0b30baj
+						ErqpvWJMVjjV4n8koW4Xa8nt60uwHSbIzr6Fs+cqKgELxjwQ73jI0UfhbkMiu4T+
+						41qg80xlxaXOo1UuAhSxGzinL9sPcQzrKYdBEsw+vYPt8SvbT0kdXjr6Bp997HqL
+						pHMmuBrSjQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCX8yxPXzLmOpULOrxk9gOb
+						uvUNnmaqugXeJU50AwNSvm1foJopXUke/h8wJBfQ3f/WNgW65Q9AStaT3UDdmDX/
+						46g4PneVj7FCsdTMBg79e6uQoraSUb3ngO6hAo0ZBn1xi6Y0a2IBo+H7ln3a10eN
+						prXFgovDfO86hcltDlYDOCTdSG/bWPeqLU0wBaB4oCPm/VsZTx4gg066UAa9HJkp
+						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>
+						MIIEHDCCAwQCCQDij8AO1ZyMHzANBgkqhkiG9w0BAQUFADCBzzELMAkGA1UEBhMC
+						Q04xETAPBgNVBAgTCFpoZWppYW5nMQ8wDQYDVQQHEwZOaW5nYm8xLzAtBgNVBAoT
+						JlVuaXZlcnNpdHkgb2YgTm90dGluZ2hhbSBOaW5nYm8sIENoaW5hMR0wGwYDVQQL
+						ExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEeMBwGA1UEAxMVaWRwLm5vdHRpbmdoYW0u
+						ZWR1LmNuMSwwKgYJKoZIhvcNAQkBFh1pdC1zZXJ2aWNlc0Bub3R0aW5naGFtLmVk
+						dS5jbjAeFw0xMTA1MTkwODM0NTVaFw0zMTA1MTQwODM0NTVaMIHPMQswCQYDVQQG
+						EwJDTjERMA8GA1UECBMIWmhlamlhbmcxDzANBgNVBAcTBk5pbmdibzEvMC0GA1UE
+						ChMmVW5pdmVyc2l0eSBvZiBOb3R0aW5naGFtIE5pbmdibywgQ2hpbmExHTAbBgNV
+						BAsTFEluZm9ybWF0aW9uIFNlcnZpY2VzMR4wHAYDVQQDExVpZHAubm90dGluZ2hh
+						bS5lZHUuY24xLDAqBgkqhkiG9w0BCQEWHWl0LXNlcnZpY2VzQG5vdHRpbmdoYW0u
+						ZWR1LmNuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtRiXnUTiNrTR
+						/qHVEWqV50864Thqs3JI1frOi1sjQbaDCkh73hSsNdzxzg5FUdjdZfVrLeh7MVUf
+						Yjp0wWCMvrJDvaZwWgl2mMb2/pvZTkEvTmIwDL/n+G4oyWoUkEjXIrtui4Ie9bAT
+						/tBBN2I+U3c0QTM4DUP21EqjhxwcV3D6gsbGAcay3k5ukpwOgrz30MFqb0b30baj
+						ErqpvWJMVjjV4n8koW4Xa8nt60uwHSbIzr6Fs+cqKgELxjwQ73jI0UfhbkMiu4T+
+						41qg80xlxaXOo1UuAhSxGzinL9sPcQzrKYdBEsw+vYPt8SvbT0kdXjr6Bp997HqL
+						pHMmuBrSjQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCX8yxPXzLmOpULOrxk9gOb
+						uvUNnmaqugXeJU50AwNSvm1foJopXUke/h8wJBfQ3f/WNgW65Q9AStaT3UDdmDX/
+						46g4PneVj7FCsdTMBg79e6uQoraSUb3ngO6hAo0ZBn1xi6Y0a2IBo+H7ln3a10eN
+						prXFgovDfO86hcltDlYDOCTdSG/bWPeqLU0wBaB4oCPm/VsZTx4gg066UAa9HJkp
+						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>
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
new file mode 100644
index 00000000..1491cbdd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.nottingham.edu.my-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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
+						MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEeMBwGA1UEAxMVaWRwLm5v
+						dHRpbmdoYW0uZWR1Lm15MB4XDTEyMDMyMzE0MDIzMVoXDTIyMDMyMTE0MDIzMVow
+						gaoxCzAJBgNVBAYTAm15MREwDwYDVQQIEwhTZWxhbmdvcjERMA8GA1UEBxMIU2Vt
+						ZW55aWgxNjA0BgNVBAoTLVRoZSBVbml2ZXJzaXR5IE9mIE5vdHRpbmdoYW0gTWFs
+						YXlzaWEgQ2FtcHVzIDEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMxHjAc
+						BgNVBAMTFWlkcC5ub3R0aW5naGFtLmVkdS5teTCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBANt9uwt87a0uDUwXnCynAFOhpydrO0MzTlQiAxic8o4TY4yG
+						IjBb50cMlOkyseJY5I3qN6fFKmWYiAEQtNeiH0PB2h/tgF8M65aHirnW1Z7zjZYK
+						YHUTntVrL9WCJNg7UJoE2alh7Tn0irWPL4JS5BSbxqLYgTLA05uk6+2XCKY+zYnM
+						rHet/LoNkv2Hge74ES1dU99PSSDCUwDGn27t+iPIYPth1hD1hu7/c3NCY2NmU6VF
+						mg3X3TcNoLtAyzZZn1Fc3+TGIU5LUryF/33+5168JT6J2RznMI5FkQvp+YVroEQ/
+						V5THBheiGsd5CNCwDdqcjj6V8auKXb/QsNYMFQMCAwEAATANBgkqhkiG9w0BAQUF
+						AAOCAQEAFUUJk2E+KDSDBSGE6dU5Tq1cvTmIn2TNMUA5uBC/K1v7WzeZjZiid9CP
+						nri9DbU3SrvAaGqE4+Sxt1AwnLJuq2izqWuouUvywRYhq7fyJpJTl7ydaL00n/fH
+						VOXec31++JNdvqIBERONkv92NC9vBggAK8eFQ3rbqSOAR/Q3r6KcILKbp2gGoAqt
+						a3TO/dtiUzllJqAvg3pWnczxGnK5qE7MSQihSWDcFhzSMLiX1NjR3/hM/Vu/hJi/
+						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>
+						MIID0jCCAroCCQCeoFvQJDQiEjANBgkqhkiG9w0BAQUFADCBqjELMAkGA1UEBhMC
+						bXkxETAPBgNVBAgTCFNlbGFuZ29yMREwDwYDVQQHEwhTZW1lbnlpaDE2MDQGA1UE
+						ChMtVGhlIFVuaXZlcnNpdHkgT2YgTm90dGluZ2hhbSBNYWxheXNpYSBDYW1wdXMg
+						MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEeMBwGA1UEAxMVaWRwLm5v
+						dHRpbmdoYW0uZWR1Lm15MB4XDTEyMDMyMzE0MDIzMVoXDTIyMDMyMTE0MDIzMVow
+						gaoxCzAJBgNVBAYTAm15MREwDwYDVQQIEwhTZWxhbmdvcjERMA8GA1UEBxMIU2Vt
+						ZW55aWgxNjA0BgNVBAoTLVRoZSBVbml2ZXJzaXR5IE9mIE5vdHRpbmdoYW0gTWFs
+						YXlzaWEgQ2FtcHVzIDEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMxHjAc
+						BgNVBAMTFWlkcC5ub3R0aW5naGFtLmVkdS5teTCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBANt9uwt87a0uDUwXnCynAFOhpydrO0MzTlQiAxic8o4TY4yG
+						IjBb50cMlOkyseJY5I3qN6fFKmWYiAEQtNeiH0PB2h/tgF8M65aHirnW1Z7zjZYK
+						YHUTntVrL9WCJNg7UJoE2alh7Tn0irWPL4JS5BSbxqLYgTLA05uk6+2XCKY+zYnM
+						rHet/LoNkv2Hge74ES1dU99PSSDCUwDGn27t+iPIYPth1hD1hu7/c3NCY2NmU6VF
+						mg3X3TcNoLtAyzZZn1Fc3+TGIU5LUryF/33+5168JT6J2RznMI5FkQvp+YVroEQ/
+						V5THBheiGsd5CNCwDdqcjj6V8auKXb/QsNYMFQMCAwEAATANBgkqhkiG9w0BAQUF
+						AAOCAQEAFUUJk2E+KDSDBSGE6dU5Tq1cvTmIn2TNMUA5uBC/K1v7WzeZjZiid9CP
+						nri9DbU3SrvAaGqE4+Sxt1AwnLJuq2izqWuouUvywRYhq7fyJpJTl7ydaL00n/fH
+						VOXec31++JNdvqIBERONkv92NC9vBggAK8eFQ3rbqSOAR/Q3r6KcILKbp2gGoAqt
+						a3TO/dtiUzllJqAvg3pWnczxGnK5qE7MSQihSWDcFhzSMLiX1NjR3/hM/Vu/hJi/
+						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>
diff --git a/swamid-interfederations-2.0/idp.nrc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nrc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..eff0d778
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.nrc.ac.uk-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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
+						Ew1pZHAubnJjLmFjLnVrMB4XDTE0MDYxODEzMjQzM1oXDTM0MDYxMzEzMjQzM1ow
+						ezELMAkGA1UEBhMCR0IxGTAXBgNVBAgTEE5vcnRoZXJuIElyZWxhbmQxFTATBgNV
+						BAcTDE5ld3Rvd25hYmJleTEiMCAGA1UEChMZTm9ydGhlcm4gUmVnaW9uYWwgQ29s
+						bGVnZTEWMBQGA1UEAxMNaWRwLm5yYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBAPVbAHe9mFv4n0AFnhR7uN3oetmnyGocFxSVR/3uZVNQWaqx
+						KRZpNawsVdiAQqMP6x9+ymD6e0EKO2YKZSXWvbPxxwG4dwVpJcAy6jYoe71G7Qq1
+						MQxohxtLPMk5hZ4DVTt1xSMc+ZRVr1cE6vlHhC9r6LBmyaoxj+wc+U4/i6dyKs+o
+						wQufX7iIN1G3vDXsBA9sqlxUCdlfUdhbmri/Vf4U6tzYyF3l0txyZejlsmbHDZA0
+						oSrc+3VxosQeJ4irf5yNePeHzCWp0v75tEfLERg/1vIxfEO8nh9Rr3r4tHEKK77G
+						Yl9oU0N7rgQvOGwfuQerFKzSHWv7ZOPXMT77iwkCAwEAATANBgkqhkiG9w0BAQUF
+						AAOCAQEAblCurjRGhUqdFuDlW1TEYNiCLADfS3uuWV+KhUDiQ7zLBdMxD5DpN++v
+						agA4nHoUz+EsYXrD4VPzD1RuPaRuEjSL9hS0UxiRrOR1hIvnAC63H9pi2waZ53hp
+						uMiDVtG0WomR/pJW3puaZs5N/bFL2ZWBvqqaRU0zc9nz4S0odmN+pfSqsrr/Y+JL
+						4s89ev740ocq4FAq6zMwMDjeYvXDx7OibZ0Omq8S1/zPz3yXIM9/mvCm/iOBKxrO
+						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>
+						MIIDcjCCAloCCQDyu2TVCpnwTjANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJH
+						QjEZMBcGA1UECBMQTm9ydGhlcm4gSXJlbGFuZDEVMBMGA1UEBxMMTmV3dG93bmFi
+						YmV5MSIwIAYDVQQKExlOb3J0aGVybiBSZWdpb25hbCBDb2xsZWdlMRYwFAYDVQQD
+						Ew1pZHAubnJjLmFjLnVrMB4XDTE0MDYxODEzMjQzM1oXDTM0MDYxMzEzMjQzM1ow
+						ezELMAkGA1UEBhMCR0IxGTAXBgNVBAgTEE5vcnRoZXJuIElyZWxhbmQxFTATBgNV
+						BAcTDE5ld3Rvd25hYmJleTEiMCAGA1UEChMZTm9ydGhlcm4gUmVnaW9uYWwgQ29s
+						bGVnZTEWMBQGA1UEAxMNaWRwLm5yYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBAPVbAHe9mFv4n0AFnhR7uN3oetmnyGocFxSVR/3uZVNQWaqx
+						KRZpNawsVdiAQqMP6x9+ymD6e0EKO2YKZSXWvbPxxwG4dwVpJcAy6jYoe71G7Qq1
+						MQxohxtLPMk5hZ4DVTt1xSMc+ZRVr1cE6vlHhC9r6LBmyaoxj+wc+U4/i6dyKs+o
+						wQufX7iIN1G3vDXsBA9sqlxUCdlfUdhbmri/Vf4U6tzYyF3l0txyZejlsmbHDZA0
+						oSrc+3VxosQeJ4irf5yNePeHzCWp0v75tEfLERg/1vIxfEO8nh9Rr3r4tHEKK77G
+						Yl9oU0N7rgQvOGwfuQerFKzSHWv7ZOPXMT77iwkCAwEAATANBgkqhkiG9w0BAQUF
+						AAOCAQEAblCurjRGhUqdFuDlW1TEYNiCLADfS3uuWV+KhUDiQ7zLBdMxD5DpN++v
+						agA4nHoUz+EsYXrD4VPzD1RuPaRuEjSL9hS0UxiRrOR1hIvnAC63H9pi2waZ53hp
+						uMiDVtG0WomR/pJW3puaZs5N/bFL2ZWBvqqaRU0zc9nz4S0odmN+pfSqsrr/Y+JL
+						4s89ev740ocq4FAq6zMwMDjeYvXDx7OibZ0Omq8S1/zPz3yXIM9/mvCm/iOBKxrO
+						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>
diff --git a/swamid-interfederations-2.0/idp.nuigalway.ie-shibboleth.xml b/swamid-interfederations-2.0/idp.nuigalway.ie-shibboleth.xml
new file mode 100644
index 00000000..0a97794d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.nuigalway.ie-shibboleth.xml
@@ -0,0 +1,66 @@
+<?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">
+    <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>
+MIIDKzCCAhOgAwIBAgIUaZj83WML6Ro0NOTyru/oCY9DaWcwDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQaWRwLm51aWdhbHdheS5pZTAeFw0xMDA4MzAxNDUyMjJa
+Fw0zMDA4MzAxNDUyMjJaMBsxGTAXBgNVBAMTEGlkcC5udWlnYWx3YXkuaWUwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVTQr39i7dOPz//U7kaSk61ADv
+8zczZ4deMcSfUXGtBXwm1G913PqpjDkphmI5A5ehg7tOLjc1I/QXQI/MOi5EW5p8
+9mlrjtjuikIEZ1QJFnM0sGP2wNXUmFnfD3SX78lZbd6pqTDh/EyyO21q/6/7nIH3
+8Ds/R51LWZ4SHLXiVUj+xoLh9PaIWb1j2X9AS6t7FoUTfkQDTrNc78HNpTRy/RPN
+RKfzVUWsqmCbgCrVgz2k8ie5j9YDJ0IpFfGbdBOGUqaZuu53gyMzRTJ2KCmKIirH
+hMtk4fkx3lh9qaWMvpep9Ys9fcvv7h9ODKBDycRxoVJhfvKpRct3OmU38DFnAgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC5udWlnYWx3YXkuaWWGJ2h0dHBzOi8vaWRw
+Lm51aWdhbHdheS5pZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUoSgXUY0R/R/L
+Weanf9/oteOvIL4wDQYJKoZIhvcNAQEFBQADggEBACenzaISa4sjW40cKZAdYMYp
+Aj/83wlM5r5jNvK4XML3DuQdgvVfgDhU7DLbeQTPvcySE2Mfn87PHT7wdCXZoOu0
+COH3D94Tc3/G3bu1uLg/VV6TGsNDHL7WqoUNnmHniZVOi6khONlufFLj4TbR3a8u
+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: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: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.nwhc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nwhc.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..4613afd9
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.nwhc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?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>
+      <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>
+						MIIDJDCCAgygAwIBAgIVAKUnamKmXgk/Lnzrnwf+feRMH4ddMA0GCSqGSIb3DQEB
+						BQUAMBkxFzAVBgNVBAMTDmlkcC5ud2hjLmFjLnVrMB4XDTEzMDgwNTEwMDExOVoX
+						DTMzMDgwNTEwMDExOVowGTEXMBUGA1UEAxMOaWRwLm53aGMuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiXdo51PeQig41pAibbuK8eFwjkmWH
+						wwlJXw7EKABKtCmOpL00UEYy7qpKg8oHdX2VN9UssKX7PtFnDCMEcS1J7V5lbTCm
+						xOsTc26qIqoPyPY3z5qKETdv9jkl6UezHanB+kG6OOZxYNsZQVmElLsTIbxiW6gT
+						caGp6LotUxxNurn+kbX+EQas4B74IRrGtIhzG66xYFhQaBHqcsghcs4wQnxAz1hY
+						aLJ+dns79/BE/MLV+rOcuqKQuRWp4qBEDEbuVA8mQVhtBZmTbxrUCv81cl0tKCGZ
+						xlc1E3v6jAHGq6sVHJu342NRkW7FCICsKww3RqMUY90G/c1XaUfUAYsTAgMBAAGj
+						YzBhMEAGA1UdEQQ5MDeCDmlkcC5ud2hjLmFjLnVrhiVodHRwczovL2lkcC5ud2hj
+						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSa5qcFRjhigspQsL6d5yEN
+						3Q9YEjANBgkqhkiG9w0BAQUFAAOCAQEAhQxixhw6sfaHJtRPtYZ9hfhQSi/p0O3h
+						PllwONLp9zTaUDvPyu5XQ+Oh0//hT8xAiyEDEYBp04/a1HAPFNYMr3uAaYSiXi0P
+						26zIPlALtOTtF8wpdd88zX4LS567vKihExhZgnJjyLhOlisw4q6PH0FTq1ope8oN
+						SyWYSxSOjXt4S2+vEJMztj7NNicN1Doa1DA5hqrqIhdP5vrcNgWdRztruJ8YBbsC
+						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>
+						MIIDJDCCAgygAwIBAgIVAKUnamKmXgk/Lnzrnwf+feRMH4ddMA0GCSqGSIb3DQEB
+						BQUAMBkxFzAVBgNVBAMTDmlkcC5ud2hjLmFjLnVrMB4XDTEzMDgwNTEwMDExOVoX
+						DTMzMDgwNTEwMDExOVowGTEXMBUGA1UEAxMOaWRwLm53aGMuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiXdo51PeQig41pAibbuK8eFwjkmWH
+						wwlJXw7EKABKtCmOpL00UEYy7qpKg8oHdX2VN9UssKX7PtFnDCMEcS1J7V5lbTCm
+						xOsTc26qIqoPyPY3z5qKETdv9jkl6UezHanB+kG6OOZxYNsZQVmElLsTIbxiW6gT
+						caGp6LotUxxNurn+kbX+EQas4B74IRrGtIhzG66xYFhQaBHqcsghcs4wQnxAz1hY
+						aLJ+dns79/BE/MLV+rOcuqKQuRWp4qBEDEbuVA8mQVhtBZmTbxrUCv81cl0tKCGZ
+						xlc1E3v6jAHGq6sVHJu342NRkW7FCICsKww3RqMUY90G/c1XaUfUAYsTAgMBAAGj
+						YzBhMEAGA1UdEQQ5MDeCDmlkcC5ud2hjLmFjLnVrhiVodHRwczovL2lkcC5ud2hj
+						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSa5qcFRjhigspQsL6d5yEN
+						3Q9YEjANBgkqhkiG9w0BAQUFAAOCAQEAhQxixhw6sfaHJtRPtYZ9hfhQSi/p0O3h
+						PllwONLp9zTaUDvPyu5XQ+Oh0//hT8xAiyEDEYBp04/a1HAPFNYMr3uAaYSiXi0P
+						26zIPlALtOTtF8wpdd88zX4LS567vKihExhZgnJjyLhOlisw4q6PH0FTq1ope8oN
+						SyWYSxSOjXt4S2+vEJMztj7NNicN1Doa1DA5hqrqIhdP5vrcNgWdRztruJ8YBbsC
+						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>
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
new file mode 100644
index 00000000..522150f2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.nwkcollege.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						NVoXDTIyMTIwOTExNDgxNVowXTELMAkGA1UEBhMCR0IxDTALBgNVBAgTBEtlbnQx
+						IDAeBgNVBAoTF05vcnRoIFdlc3QgS2VudCBDb2xsZWdlMR0wGwYDVQQDExRpZHAu
+						bndrY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						APSswRYhQiGvi0f6QdjpgZq89Y68roiF8SxRL+MQWCTfoyuKff7cgy35BeXi6NrK
+						zVAEWd96DACayN85bzMnby4Si1ntiCpyrRGDFxAoCLQFle2kiAn+n3RLnn/kiuw8
+						MDIplFabdcJf83IQy+TKZgTScqKwfwEaZgsOyMkp006BztmkzYKs0XdLZZW6FAWb
+						+9MWMMNVNwtDZkqJoUTgOlItJYzeukXA5TSNJG/oX3vGpldI+/2GwJEPZQS36qXn
+						t6C+G9TRMHbqO6F2jHdG7xPNeqU5sjlpcd0NJ3TRRYPdMd5iiSBvBdQ4TZxybekE
+						iALOike2BHXM21D85pWkr9UCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAYMRQDoWE
+						B/h1NI6oa1FOoY3051eaULcGqPGNm846pdxEU17z6N3YqRWpjh8kEcYxZwPu78Vg
+						DkUKBmV9CZMxNtpjyOKWm7aXUlpcaqyuc+2QpDZYff/y0r2wMnmCQz/GEzUpCehT
+						7DJBgdVLO1d7d2Yl90VoOPxKnhIUY/ZdkHue1NYczwzBoei2id8k3id97mist8yU
+						T8+gGlFBbA9YRd4tbmmyTxQZkm2dFECh4/PdSy9Yd9mmgGUt1f7fUlJdz+mNGPJu
+						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>
+						MIIDNjCCAh4CCQCyyXWzJHWtUDANBgkqhkiG9w0BAQUFADBdMQswCQYDVQQGEwJH
+						QjENMAsGA1UECBMES2VudDEgMB4GA1UEChMXTm9ydGggV2VzdCBLZW50IENvbGxl
+						Z2UxHTAbBgNVBAMTFGlkcC5ud2tjb2xsZWdlLmFjLnVrMB4XDTEyMTIxMTExNDgx
+						NVoXDTIyMTIwOTExNDgxNVowXTELMAkGA1UEBhMCR0IxDTALBgNVBAgTBEtlbnQx
+						IDAeBgNVBAoTF05vcnRoIFdlc3QgS2VudCBDb2xsZWdlMR0wGwYDVQQDExRpZHAu
+						bndrY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						APSswRYhQiGvi0f6QdjpgZq89Y68roiF8SxRL+MQWCTfoyuKff7cgy35BeXi6NrK
+						zVAEWd96DACayN85bzMnby4Si1ntiCpyrRGDFxAoCLQFle2kiAn+n3RLnn/kiuw8
+						MDIplFabdcJf83IQy+TKZgTScqKwfwEaZgsOyMkp006BztmkzYKs0XdLZZW6FAWb
+						+9MWMMNVNwtDZkqJoUTgOlItJYzeukXA5TSNJG/oX3vGpldI+/2GwJEPZQS36qXn
+						t6C+G9TRMHbqO6F2jHdG7xPNeqU5sjlpcd0NJ3TRRYPdMd5iiSBvBdQ4TZxybekE
+						iALOike2BHXM21D85pWkr9UCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAYMRQDoWE
+						B/h1NI6oa1FOoY3051eaULcGqPGNm846pdxEU17z6N3YqRWpjh8kEcYxZwPu78Vg
+						DkUKBmV9CZMxNtpjyOKWm7aXUlpcaqyuc+2QpDZYff/y0r2wMnmCQz/GEzUpCehT
+						7DJBgdVLO1d7d2Yl90VoOPxKnhIUY/ZdkHue1NYczwzBoei2id8k3id97mist8yU
+						T8+gGlFBbA9YRd4tbmmyTxQZkm2dFECh4/PdSy9Yd9mmgGUt1f7fUlJdz+mNGPJu
+						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>
diff --git a/swamid-interfederations-2.0/idp.nwrc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nwrc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c14d62b2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.nwrc.ac.uk-shibboleth.xml
@@ -0,0 +1,117 @@
+<?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>
+      <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>
+						MIIFGzCCBAOgAwIBAgILAQAAAAABL9rLG80wDQYJKoZIhvcNAQEFBQAwajEjMCEG
+						A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
+						bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
+						b24gQ0EwHhcNMTEwNTEwMTYzMTM4WhcNMTYwNTA5MTYzMTM1WjCBmDELMAkGA1UE
+						BhMCR0IxGTAXBgNVBAgTEE5vcnRoZXJuIElyZWxhbmQxFDASBgNVBAcTC0xvbmRv
+						bmRlcnJ5MRkwFwYDVQQLExBOZXR3b3JrIFNlcnZpY2VzMSQwIgYDVQQKExtOb3J0
+						aCBXZXN0IFJlZ2lvbmFsIENvbGxlZ2UxFzAVBgNVBAMTDmlkcC5ud3JjLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArvwghNOYMcckEQp4ILvW
+						N1VfwOcqSwUC5Wnri1NYkuq/6z/QRNMFxxhDuhjokbAgFkHIL8s4D4uXHwwyZ1bw
+						Wj8+XbWtVKc6/E5wmcjt0yH7BiNJd03nwiXSeNV6H8SzmLG/5V5Jp/YyPMa5kThn
+						wgZzWWr+IxS2tsfhK4iulUhZR0CYQaA+EDV2uXuKLvG8c8Ql83mfaVGQjf5Vg/po
+						7yyZq475RB5Lhye0hq0VoYB7KYHNagv4Wt/Sa0OfVQh4BaPpNebl0TPL2sGkubbk
+						JaQeFEVQsEVnjF78Ah8zQxLjrFeeQxDnUJGWJfk33N4k3Ts9zZ3LbndeVaKjReut
+						DQIDAQABo4IBkTCCAY0wHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCPxFkLmh8w
+						SQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJlLmdsb2Jh
+						bHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKgMIYuaHR0
+						cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNybDAdBgNV
+						HQ4EFgQUwz1GLmN01kUehYiAvfORDDC9X9AwCQYDVR0TBAIwADAOBgNVHQ8BAf8E
+						BAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMD
+						MEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93
+						d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgbA
+						MBkGA1UdEQQSMBCCDmlkcC5ud3JjLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBk
+						HuZ6MGRLm6BlF7ZkyJurH2RtWoa+SPSRXXs+Zbb4pJLCG/tqlWaVsDu+39FGYaC5
+						EQg7cYWz9nPwAzQJUnRJTyDCM7h4cTTqtBRvECTczyyd+kUZ8mgNJwDanT3kfy4F
+						3PEEtoGi62alZsZNGZMKQf3gECv4MdP9cpzWxxravCxrff6N/lEi5TiU6V0tiZkD
+						3+1ZqEyh2XjCwJwK3wdWjcz47QBD2kqgKbbP4sjSpvhIXcSL0/juxhE54VpLWVuS
+						qE4X2h8DoUZ6A0wm1bBCNUAog0FzvPMNsQdxSPaSepkTta2BLmUxJDBG5KfkUbuh
+						LNx//xA71+LpMsQH4pIk
+					</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>
+						MIIFGzCCBAOgAwIBAgILAQAAAAABL9rLG80wDQYJKoZIhvcNAQEFBQAwajEjMCEG
+						A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
+						bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
+						b24gQ0EwHhcNMTEwNTEwMTYzMTM4WhcNMTYwNTA5MTYzMTM1WjCBmDELMAkGA1UE
+						BhMCR0IxGTAXBgNVBAgTEE5vcnRoZXJuIElyZWxhbmQxFDASBgNVBAcTC0xvbmRv
+						bmRlcnJ5MRkwFwYDVQQLExBOZXR3b3JrIFNlcnZpY2VzMSQwIgYDVQQKExtOb3J0
+						aCBXZXN0IFJlZ2lvbmFsIENvbGxlZ2UxFzAVBgNVBAMTDmlkcC5ud3JjLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArvwghNOYMcckEQp4ILvW
+						N1VfwOcqSwUC5Wnri1NYkuq/6z/QRNMFxxhDuhjokbAgFkHIL8s4D4uXHwwyZ1bw
+						Wj8+XbWtVKc6/E5wmcjt0yH7BiNJd03nwiXSeNV6H8SzmLG/5V5Jp/YyPMa5kThn
+						wgZzWWr+IxS2tsfhK4iulUhZR0CYQaA+EDV2uXuKLvG8c8Ql83mfaVGQjf5Vg/po
+						7yyZq475RB5Lhye0hq0VoYB7KYHNagv4Wt/Sa0OfVQh4BaPpNebl0TPL2sGkubbk
+						JaQeFEVQsEVnjF78Ah8zQxLjrFeeQxDnUJGWJfk33N4k3Ts9zZ3LbndeVaKjReut
+						DQIDAQABo4IBkTCCAY0wHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCPxFkLmh8w
+						SQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJlLmdsb2Jh
+						bHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKgMIYuaHR0
+						cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNybDAdBgNV
+						HQ4EFgQUwz1GLmN01kUehYiAvfORDDC9X9AwCQYDVR0TBAIwADAOBgNVHQ8BAf8E
+						BAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMD
+						MEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93
+						d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgbA
+						MBkGA1UdEQQSMBCCDmlkcC5ud3JjLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBk
+						HuZ6MGRLm6BlF7ZkyJurH2RtWoa+SPSRXXs+Zbb4pJLCG/tqlWaVsDu+39FGYaC5
+						EQg7cYWz9nPwAzQJUnRJTyDCM7h4cTTqtBRvECTczyyd+kUZ8mgNJwDanT3kfy4F
+						3PEEtoGi62alZsZNGZMKQf3gECv4MdP9cpzWxxravCxrff6N/lEi5TiU6V0tiZkD
+						3+1ZqEyh2XjCwJwK3wdWjcz47QBD2kqgKbbP4sjSpvhIXcSL0/juxhE54VpLWVuS
+						qE4X2h8DoUZ6A0wm1bBCNUAog0FzvPMNsQdxSPaSepkTta2BLmUxJDBG5KfkUbuh
+						LNx//xA71+LpMsQH4pIk
+					</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>
diff --git a/swamid-interfederations-2.0/idp.oaklands.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.oaklands.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..b6596d79
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.oaklands.ac.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAucodVkDYoamAHb1pnAwj
+						hTGDUfEYfRWZ9DZJ6ugjqXmvh2/B7jEdX99jZUbEtPIA7YSx91DCNN09g+/AUgLr
+						j7A3zQkBhSo5iBQzDHDPoWFgeIZ/LBqsZoXQ2hPD2vLXXAEuqj+MxhfzJQGV68AR
+						L+/B8/EHPDUAuQvvZquL2KG1lRYmYXlZkXJcbh9i+2vtR3PKz0ISZyiaE2I5g37P
+						jt68wAWsHLs+xq6w1zmxmGBUf0iKdJCRKsz6U20eqmA0VBLXJQ94NwdX0tZbjPVy
+						zKgCDaMnLfkQydstKjWVPO7/t7KaGaaTq70p2B3ALk9Ev5jSSio7ar6TDKC0JXUW
+						dQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAub2FrbGFuZHMuYWMudWuGKWh0dHBz
+						Oi8vaWRwLm9ha2xhbmRzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQv
+						NciBvrHpP7NwqqSQA1bdWXPAjTANBgkqhkiG9w0BAQUFAAOCAQEARz63lm6iYeYx
+						W7FD8/S6f8uYGk2mEcLeFzRKi46K2UbDTXhmr9/aJrMgxOLg0zFFeskAuIOOX5d2
+						QV29w8EsbtwnxRvoXqB2zxTETjpSbrz/qRI2wNIoAP7hb57PHJFb/MmKoBQuLqit
+						Qf7s8JQAtu0h7U599O9a1ElArIaYRuVkHqGgQuqKumPO4aFklscTq8B93ae24NqW
+						31spO4LBxtFv7klRIlqSKRzYv+kGb/VyRfQsLrqaLMLgaXzPIVAMJODi3uanRxxi
+						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>
+						MIIDMzCCAhugAwIBAgIUdO1bzlupfVEClo0yb0fopDjfnGMwDQYJKoZIhvcNAQEF
+						BQAwHTEbMBkGA1UEAxMSaWRwLm9ha2xhbmRzLmFjLnVrMB4XDTEzMDYyNDE1MTE0
+						NloXDTMzMDYyNDE1MTE0NlowHTEbMBkGA1UEAxMSaWRwLm9ha2xhbmRzLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAucodVkDYoamAHb1pnAwj
+						hTGDUfEYfRWZ9DZJ6ugjqXmvh2/B7jEdX99jZUbEtPIA7YSx91DCNN09g+/AUgLr
+						j7A3zQkBhSo5iBQzDHDPoWFgeIZ/LBqsZoXQ2hPD2vLXXAEuqj+MxhfzJQGV68AR
+						L+/B8/EHPDUAuQvvZquL2KG1lRYmYXlZkXJcbh9i+2vtR3PKz0ISZyiaE2I5g37P
+						jt68wAWsHLs+xq6w1zmxmGBUf0iKdJCRKsz6U20eqmA0VBLXJQ94NwdX0tZbjPVy
+						zKgCDaMnLfkQydstKjWVPO7/t7KaGaaTq70p2B3ALk9Ev5jSSio7ar6TDKC0JXUW
+						dQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAub2FrbGFuZHMuYWMudWuGKWh0dHBz
+						Oi8vaWRwLm9ha2xhbmRzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQv
+						NciBvrHpP7NwqqSQA1bdWXPAjTANBgkqhkiG9w0BAQUFAAOCAQEARz63lm6iYeYx
+						W7FD8/S6f8uYGk2mEcLeFzRKi46K2UbDTXhmr9/aJrMgxOLg0zFFeskAuIOOX5d2
+						QV29w8EsbtwnxRvoXqB2zxTETjpSbrz/qRI2wNIoAP7hb57PHJFb/MmKoBQuLqit
+						Qf7s8JQAtu0h7U599O9a1ElArIaYRuVkHqGgQuqKumPO4aFklscTq8B93ae24NqW
+						31spO4LBxtFv7klRIlqSKRzYv+kGb/VyRfQsLrqaLMLgaXzPIVAMJODi3uanRxxi
+						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>
diff --git a/swamid-interfederations-2.0/idp.ocvc.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.ocvc.ac.uk-entity.xml
new file mode 100644
index 00000000..6e41b474
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ocvc.ac.uk-entity.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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>
+						MIIDaDCCAlCgAwIBAgIIJK53AJuGOYowDQYJKoZIhvcNAQEFBQAwSzEpMCcGA1UE
+						CgwgT3hmb3JkICYgQ2hlcndlbGwgVmFsbGV5IENvbGxlZ2UxHjAcBgNVBAMMFW9w
+						ZW5hdGhlbnMub2N2Yy5hYy51azAeFw0xMzEwMjgxNDM5NTVaFw0yMzEwMjgxMzM5
+						NTVaMEsxKTAnBgNVBAoMIE94Zm9yZCAmIENoZXJ3ZWxsIFZhbGxleSBDb2xsZWdl
+						MR4wHAYDVQQDDBVvcGVuYXRoZW5zLm9jdmMuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCNnm5Z9gl6f4YR2HJAHY8ne53sVj4L+PL4orRT/cG/
+						CcnldjJRFOEdeJhK53/Gxdgoxt0gtZulIfTofGOPskBu+rr1OWJWW2VeAP2elp2r
+						+Tl/aNjFiMhBriKhAZJJpm1kcZkjO7sYrVvMbreVS0/9y1GuoKKfO7MjIZ5Yxtnq
+						XyimprbRsgNFxxE/B+BWFEsLwsJjhxM6puGOBl3x+3oyfBLDP4qPThG+isa1j/fj
+						8Z3vG2XFfcYj+KvlSYm6IEI/M7V8Eq7tOCPk+4y1fuEMFB1f/M9FgmX4McwhSFMa
+						sjcRrGeXZdPawGqcGv4rgvPcj0frRbMVqWl1JZtqc1Z3AgMBAAGjUDBOMB0GA1Ud
+						DgQWBBSMitszDAvNeoGk0O7s/xrD8Eys9DAfBgNVHSMEGDAWgBSMitszDAvNeoGk
+						0O7s/xrD8Eys9DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA0WOY/
+						phQvI6UKEiIkjS2B9lDB29bR8LFB1AiotU9y3a1ynTzXWDwxHtEpR+kuSC1qgpOI
+						HMqNSsUTvAKs36pPk4/esCCUzdbG2i+6oIEyIykpULBX0zR+XzXPhng8HQCStcGQ
+						U5IsgVzitMO4UlmdF4GiVGb+OCd/pydtBpb2oRK53/x+dW5p49XPN8HjoqpF1tMV
+						uQBLmqpPooVlHC3LZnFRJ9bo1seEpZwBzVdTWaGLRXQu3Hsa8vGZTtefRRPWlPdA
+						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>
diff --git a/swamid-interfederations-2.0/idp.os-selnica.si-idp-20131118.xml b/swamid-interfederations-2.0/idp.os-selnica.si-idp-20131118.xml
new file mode 100644
index 00000000..8dec7f39
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.os-selnica.si-idp-20131118.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.os-selnica.si/idp/20131118">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-12-16T12:12: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-selnica.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Primary school Selnica ob Dravi</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">OŠ Selnica ob Dravi</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for organization Primary school Selnica ob Dravi</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije OŠ Selnica ob Dravi</mdui:Description>
+        <mdui:Keywords xml:lang="en">Identity provider for organization Primary school Selnica ob Dravi</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije OŠ Selnica ob Dravi</mdui:Keywords>
+        <mdui:Logo height="74" width="300">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAABKCAYAAAABp2mGAAAtl0lEQVR42u2dCXwTZfr4B5SrbUKBXjnaZCZHBfFEzh6gKNCmXruL6291/7KLy891ZX/igUBzeK8KAk3xYJXTCys0LWfTilWO0kwCiHghckkP2qQtZ+9k/s+bArbJzGQmRw/N8/m8n2iZmUzemfnO8zzvc2BYWMISlrCESBIL7hLjJo0OL9CUw7hImDT7ZQWZj2JrpgwOz05YwhKW3iPbMwbJ8zNewAuyGonCLOrKQP8vN2UapHkTh4QnKSxhCUuvENnGGbNBq2ruDKtfoaVplxdkLgjPUljCEpaeFzD58EJNPR2sOkHr+/BEhSUsYelxkeTNmMgGK/co0LRhM7FrwrPVh2Xcq5+PmLik7LoUY/mEiTnk1EnLybGTjDZF8ut7BOHZ6VtCYVh/6nf6QMrzMxf4BBYM6cYZN4bvlD4oE17fNzI1h1yeZrR+m24kf0nPtdbCOJu+wlqTtoI8mZ5rO5RqJF8a+/JXieHZ6pBz86TDndkqrVOvfJWaJ+01Dlxq7nBhe7byr06deodTqzK365V/peYn/65eOLhJs4MLsOT5mkfCd3JfEYPh2rFL91yflkNumLzC2jx5hY3yNQBirrRccm2q8cBN2My83606nYdh1zj1qg8pvdpF6ZNbnVrlaz2tzVBzRBFtC/F7nHr1acqQTHUd6hqnTvlWm1ZxB5UtlSDtq0dvPfj++mHE0NpYeUJDglxeH4ffWCXC0+oSkkbVxsZGBXJstPqHF2gquQErMycMgj4CKwCVDgB0mguoukBrhc0FGtcvoInljH2DTPg9Tl/7QuWfEKiuAkGvbnTqVIupKdi1PWT+9QNo/gudhzesfh0uvarRpVd/DZrhmrZFyru7G7J12HBhrQR/wCEhVjukyi8dEoUNxo8w7DDa4W+VdrGiyCGW31uK+TeXsnzNSLwwq54LsABsu36/EMiDi5/X+30GY98oTQDYHOQLKnqNi7SMfRPMRIOhf2/9vZUxMckOMbG6Jk56Y5Dg0B/gZKEDQrtO+RSCR7cDy4BdC1rUe26NjwVYXgDTqesovfJ5aoFcTj0THxmKc0fHbIiWRzvE+Fy7hLhYJ1VSPodE2eYQ4Yv8gZasYEYmAOsSJ2AVak6JNo+J+N2xSrrlDgmen7FYtiljEdYDNyxXSVluTU43WncFA1adoFWVllP+IG9o5ZUMjdxWdkNEUVlWVJHlMcEOy+zBxeRkbEuZJFi/tyE6QQ4PSRV6COAN/tOpoUnDAj1my8KkUaCl1NJrMOqjzc8mKnpE69MpH4VzaOMDrF/PO/kipVPvBLPxBSpbPiFY4ILjDKxNkM+Ca3CwTqJwcoLV5QHXq9Euwv/BG1imjCcAWO3cgJV1Rpo3Xflb4RDnBxAvyPwML8hywqcVW9o7I2hvW74nOS2XrEUmXVCBBcdLy7VYxhvLhZxOZKVtQITZohUU2xqFJbYWYYm1TVhsc8J/t8NohdEsLLaeiDBbZ2OlpQGlUNgTCAM8KK6rD0EC/q+AH0K9IsNlSL5A+/CDhuPUq/J64vqemIUNdmlV+/wBVifgulwG9YV2reJ/g3FOtSJiOcx/Kx9QeUDrLEBvAA9C9pMXaJZygdVlk/BsYsH0tD5PKpmpI0oWz8/8KnHTjLFM28WvnxYp35S5vBOxDwnzpg/vbb9n/PLyeNCsSO5ak7U1fYW1nQe0WlON5J1cziXSbHsIgNQ6tMRG+RqCYmuloJh8J2q75Q6Moni99c/Ex8fBw3K4ywMgJnbZY2IEgQFL9TdXZ/8VvWn4cE9c57q5mBDM1U1wjo0BgsvRvEDqt+ZRKRLFOMSKT/wFVedxNi6J4PzFK8cMgOd2Cw9gNeGmzAf6vomHwvoLNS73QFpTHjbQ23GN9U/Kz3wWfnRrpwn4ASVc9rbfk5pjuT8919bEDh5rM0Dn00nG/bMmLi27YWJu2Q2gOd2XmkuauUArLYcs53IuUWbLRi6wujJA43IB4OoFZsv2qK37RnIHlnw8AKu9q29Ecao+PnF0IHPp1KkX+fQV6VUHG7MVPRICQhlio9oWKTLgPH8IBFoAvhf9PQeAVS7Md2ugsIIXjJWPH0uOItwLND9yBhY833JTxpN9Hljx+dPi5AWZBVd/nClzpyR/6ojO2yRunDEdJqf+ckKlEzdpfpLlz/hD7/NhGfqnGa0lzNqR9Wx6LrluzJKy6+h3R/vvnwVa1wlf5uRtS3cTHID1Mh9gdYEXgCuyqPyZiE27RL6+pyZONpHGxDiJls4DcSADjN7moKG0oFionrzq1PwYAYW0LX+ApVc3g1l4nx+aVYRdLH8+YM1KonDapcSu0yOkvPyZUrBuAELNXIHlDm0oyFzam/3OnCWucGq83JRp+vWHZay8sqIgz8+YDLA6c/XfTJnbRfl3juyNvwNFrCOTjcH0a5y0nHxYaTw6yMft3y/NSE6G7atZTcOc/T7V64Fb944Wllhr/IZWidUlMFvLIovYTVBHAj7O+2FQHD0X67+pQ4FWDTD6hOMKnCUY1691gXy8U6t6GwAyF/mp+GmDSj2rFqVVb4Dz/L6zxgi/r9mpVy/J4xnygGLT7GL8GXgpNAesWUmIDyqGS6R850q+KXMGH1i5n91CzSZkLf0mvO7RpinR8gJNUYdpqGlP2pjxf6BpqZGvyq1OFmguyvIz38OMykG98xe4QbOVwQS8MIGj3+mq4/4/uwk43s/pK/Y76YFlfdm3n2HlgKhi6wpk6vkLLTe4zOSnbF9TJUq8jWa5/IeqaJEsEGCBqfQRV00FtKyZAWlzWiILgNLcofUkt6KwCT7HaNepHmM/P/UTKJzBma1cAN/zI4Dx4zatcopf/jPQaAFWl/zVqOBlUgeg+rxWhKf77XsuyHyDL7AIU9Z+LG/mbycIOm7jVALA9NVVJ12hxgLAcqo2ZtZPeO+uf/dmOqe+aVGjNBu6lb1Uo2WV3MB/FW7ikrJb0nNtH4GZ+SN8tnTS1k4jbY6TH6tk/0hhse1sIMASmMn3WVeoYmW30GhYh+0xMlFAEDGo1/CIc/qGWuBfKEVbNp7u0qnOdPUrqX+g5nBfNWvXEn/w4afSXtn26FzM75dubaxUZUfmNj9IuWCf8w6JshxAl20XEbfB/AYEDrlJs58vsFBVB+Ss/80A60y89Aakot6dM/VqbEf6e3dRP4y+zj3xKMakRoT/9QSG9boqhum5ltl05iACFnKsB3r8m5eVRqcstdyWspS8HjOU8gvyyysbDtBZDJrSBf80LMsydh8WfpO3qaE8eF4kigkEWACN97j7g9SXKL3iXt7fA1AC0+wA/Qqk6t/cNUJ1Kjuw1G8Geg+cwOSD7RLlRq6gAkidgGdmaXWCfPJRDAuaZSJamRXBW7u6PCQbpqr7NKRsGDYAJnRKnYT4zCHtsMmtY0ZS9y69nXpiYSr17Q3X0VwIos4hJj62xyfdHcwL4b+v3dAftJ5cOtMNtKsfek10euEeQURR+b1CZCaayf3CEmsTF2BFlVif9/WiodGwyLrhw4WBAIuL071LXJZOlUPx1MIb50ukLJBxcD5fLaHy4cN6P9DLV5OA/z/QkFgi2BWtDrFiP4zFVbGJaYFqUUyCwo/8BRaOyib3ZamNJ54E+NR1eTvD+FmtpipwFauaCxfvQo1YcQDe8HdRPbj6MGalbUBaLllKC6wc8v963aTn5V2D5X8+YsgOy8RIMPcAYOfZY7RsT7M63UfIRtKsEpadxrAhAQHLoH6LZ3jAEb7VHFp0+E0sK5CVnM/3uWFD2YGq3BjIJUMLGPCirmdJsblgFxOPnxMKh+dhoU1bk5syZ/kNLJPmgz4Jqo6cJ+V/HDzTCBiidM84eC7LBlMmzisbkp5L1tIBa9Iyy8RefzGKwGTcYZ091EyW0mpYZnIO2+6VMeJkr2siVewK5A3PCix34rGaNjWmbYFiBi//lT5pKguw9vE5Fmx/iRmmyp2BzEWtBF/HDCuirkbEPzTCb2AVaPQBAOtkaM9uSmnQs+JRyQuHGF/sK+ANbPBGgNF5TtASEQt76nmftGKvLD3XRruaNz6nXNVXXiIRn5NjUcqON7CsD/pwBCtpXiIlgZwLG7CcWuXzAIA36fL5XHoVL8i06/AHWEzCT/kciy2A1KVT2fydi8rh4kSYz6MML+vmOpF8TnfeJ7gp879+A6tQ4xJ9PCUmeGeTR12Dra6OxdaemYqtrdqMratqhvEVjGxsbU0Ktq4yCVtzIhqbSV3j741YnSB7nEmzQjY6wOwtxwjRde5Kjhh2rT1GOsUuwvMcLBnodhHxTY9pWMYDk5nipUa/Uh7fV4AV9Xn5KDAP6zyBFVFk0bDtdzZehntej1qxoiBUwGpbhN9FPS2KcepVB2kBoSNu4A4s4jEWE3MxP2Apd7Ac62d/58Iuxu9GJh9ThDqqddVtN4kxYxBRqNnkC0yKzRrGf5PlzwiS1ZFXGwWgehnGAWxddSu2/gzVZaw70w5/r8DWVu+GsRpbe/ohbEXFCF4+q1ipikmzAlh9gy4OXRJmGSYd4oiT34eWy+n3VbadGjp0WE886JOWkbOYgDXRSE7uK8AaVEISoGEd6xrxbnNG7bBO8QmsTonPHdcDXx8yYGnxaW7YaJX/pF3d0yrncYeMSsucp6h+ghewtKp3g+HA9wYW8YLn/F4ZNSJiWXcWCZSbpkTjBZov2GA1cksmNf2LycwBpKbMWYGfyaqKm0CLqvaClM9R3YCtrXwBm2PjFF/hECueoJv4eomiCt4UN/vaH1VMhG1PeV1AlGIQESPqiQc9xWh5gglYKTnluj5jEhbsEYOGddAj2r1JsG1fCtt+ZzqA1SWXsFZEvB0qYLXr1fejbc4/LYiBbZw0+YV5386kyUmlB9YyJsi0aZX38NOwFFrWsAs/i/iBZbGZ2bLAuzUtSbZpugiAdZANWLPLx1GLvr6RDVivBnYWa8/cA5rTcf6w6qx9VRVja6rl7DehfHCdhMijWfE75kiQjuP8xolJGgMX6hUwA/PqxMQeVDmxJkH+z5560FOWkQ8xJiobLTv7CrCwrbuHCYptXR3vxdbzwiLrOL7AqhHjb4QMWJ1yBwE4u2jgcIjKVnNahHHpleuZINO6yPcLtIt5qVX8gxVYj/tXktguUfzCBKxAotX9kaSNGgKAdZINWNurRNTa4zilZDAL5SbNx/4HkK49MxtgdSEgWHWYi04wE/PZvqpOLE50SLs6D1G5VlR4zM+beiAqYVKJiXq0kuGEZfsyGIGVa2uZ9M6huD4BrM22CKGZ3NoVWOQ5YVHZOPYXiETtqfHWShS6EALr8V99UKpnaFb3mloXyW7lpBXplduZIIOaX/A5Z6SRscSJNVILE2L5zsNxLDKerSDfL3HdW8QwafPd1xMmzTkmWI3amkG1uvpRX9bEUqO3zWAqNVOKTEs/YFU9nwlW135wmpq4fQv1/NdPUR8fv49698jD1O3mz6iIj46zaVkXsKWnhzC/iaU3wOQ3eix/H7OL8WSsD8sk414FU00rd2pOjrX71PaVmyMiSqy3RBRZsiKLbdMiduwdi5nNkdx8mGVDhMVkgYeGdVFYUj6BFVg0uYRgEj4ZMmBpVc9e3W6hciIA6jxN3BOnVWOmEswoMZnvObfq5ONZNKymxueIJL7HrI0R3cq2On5aKOzWmnCyz6ZNQit9TMB6cM9EiqIw6sTFSGpc0V1MwDoi2ZTBM+F6TdVjoBVdogPPNesrqBe/nkfVNI5wf/mVUd8spHZUTKGiPv6ZGVprTjM6aGsT8D/RmIN7TkRHR/dlYKE8wTQjWcFcJZRcO8rw7cCQn8j2XbGgIW0QltgqhcW2FgDOJfisFhZb90aYbfdhpT5CVLZvHyQotm7i78NKmup1XcX47FABq3P9KCpbkejUq7/x3iZ5PzeTUH2MoYlENd9zbnpaJGMDVvN8/i/m6vikLJb4QxeFdW9vA1SEj80cfP2769ysQFrWNAbHO16YdR4vmMFjLt7/ZTRoVg00DnQqcaOV2ls7pguoPMfKnx6iBn14kglYjMXIaiX4KzTLsmZepVl7oYyZYxsAwPqcrRb7pGV7Nb5LywQmArN1MVNlBrTaJygitw0o3nszlpdHD8/d3wwDYH3pURerTVC0n7W0rUMku987rEH+55ABK1t1NbcR5QIy1aJqWiCXcwDWWYZkat7t1SkwIVF9Lqa6V62LVDfzPaZdJJ/DEjBa3933OqrjzgSr67ZkUlsqxFc5sejrGxjBhmrccZxVqh+Ygi8AXNo9YdNvfRW1+ugDVLurPyuwzrVEUn/6ciU9sNZW7nTHctEBS4zn0Lwltudhfb5rbj/Qol4EbcrJUrzvYnqOZeVNS3eGJiLfYOgvNFu/812Yj7RHFZEfoJxCzHyoi6ko2GZRDy2xVnhWIY0qPsAamuFIkD/iBawEWWboNCz1e12c3TrVv/0Jb0CrdgASJwNg9vA+Z4M8GpU8ZtCyWlp1St7xR3YxYWBcIRQTP3a7NWHKNDBBCJmA358TXuVEUVUCW2PV17h943oqErSrn+hg9Y+yN1hB1XmYTk1nCnP4EVt3mvahdIjlr9EAq/RMfHxkHwdWR/G+XOt5n+WNc60/j19SPgpVJw06sIrIYzyrijaA5rU9yky+JCiyLAIN7b90Glrk59a7WP0sYsVcbx9WYlrIgKVVb+i8bctC+XV0pZRROgxbMjTq3Mxiwm3hDyylEM7jJBOwUHNV3sCSKFayhDR0e68/vFCTywShO3dOoZqdvyo759uuZQwglRdoDnL1XT1FZwpm7lxPtbRfyxlYDc0CSvjxEbrVwl/cJift2wJ/liZp83sUTNrXgZXy+h5ButFygGPjibMwnkclY4J2AqA5C81kUSB1r5hGhJm8m9WHJcK1nte1IVZ+c+iApdrqqeE6dapvaRznP1Na5lW0S/MTxSx5hOv5Ays2itKrDtNrbMmtlJbgrXXWillisCTExu6+zwmT5hMmYOkOjfbihObLNCbHe3ts3hQfEfoouHNN1TlPyERvOEJ9XpXKGVZXxiN7ltEAq7oGTE7aZfC6ePkEr5Qc1IVWQvyIVhD7PLRybLdz75Zja0vLIU9OWhG85OhIs+UR0Jqagw2sqGLbTHazBX/DS8MKoDyyL2C5dKovvbbXK5/z2g61CNMmMyZDNy+UqFlSaXL4A0sUgXIZGY7Z1r4Q/5MfGtZWlvzZt7v7HgfQlDABa3dtjBcj9N+MZjQLk3x20VldOYnOjJts3khdbBvMG1gfHb+PDlgN2KrTt9N9fb2ISAJgHaO3xxXn7CLiqb5uHqbnWDfw6UeYvsJan5prMYw3lksD/vLt5cKoIos52MAS7mAPy4Dr9q5XykgkHh8qYAFMvFYA3WahQd3EVunTU1oXKW9lBJZe/Tzfcz49TzoEzqGEEVh+NMsADWsNiw/r+e6+v+WmTNoo95u3T6danN6+b9NpCbNZaMp8h9UxjK2tnE8HrOLKdN6wcjvVKibTAesSaFgahptwALyN32OpcdUE4NoTSLeVHvdlLS1TpueSfDs+t8M++ycttwQetbyNTBCU2LYGE1iCHZZHfTiGP/a8lpUYFhFCYP3kuX3Dk/Jop151gMZ8LGLWiFTpjMUAtSredcwog3yw06DewXDMdhQJzx9Y+OuMUe5ifG63a1imzF/o4PMYSR9ZcKA+2g0zBrOwLN48jUFBWVkZg62p/MwTMOlFJr9ghUZZza10Pqw2bE31TOYVJXycXaI876OszC8o0TmQAnA9DK0haUby7cm5trP8WtFbz6as2P+AFPYPTNM6EIt6EtKVivFLwyqyPsFuthDbPEJV2gN2ybGZhDSF9VB4A2hF73s63+FvjtIp9P322vSEhqGdfFu7Tvl33uc8C4ClU29jBJZexbvLM7I6mJ3u8v/t1ht7e8Yg3KRppIPPmmM41dTev2M4+1/975/OR1FTd05hAtZx5nisVZWp2PrqA53hgmKp8k9N9xtY3zWo6FYKXaBlPcL61oiXP+jwiHinWT28hNRhf1oQ9QYZZcgbmJJDPpC+gqzhA600o7UpNZdcrpwbYMxWXtnwqO3WB4Vm8m1BMXkExWH5rWEVW5/zoWHt9nAGnw0lsABC5+n2cXeuATB45QTqZLR+Qipb8WfGNBo9/y481FzlINDyNjMCC86PN7Di8IdZNKzZ3XU/xxSmCOSmjGV4Ib15d+9XqdTfysd5jYfLJlA3MWtYF5MKpjN0k+rIGewSLHrzlhKq4lK838A6dUHMAKwzf/F1MzpE8gW+oHVZ2zpWEY3f1J0lNIIpSmO5EAC0CznZ+WlbZNmNhr1By0EcWEReLzBb3gD4HBtqJi8g7Ytr+y+B2caaXQ/X8ZBHLaxfQqxhuRh9Uu5qpJ6AU9AmYlNa5WyG45+ntPwql14BlkunNjEBi/IDWDVxidMYgSXxLweXr0jzJg5BTVBRByt/C/exVCBlMGvXVi50Jyh3gssd5s+oc62RfgPrcH0ynQ+rFVtd4XM1BDWfQB1wHGLFKZ/VRKWKs3axYj6fVtq9ScYsscWkGq3PpeVaK3hBy2j9MuW13UlBPZm8vIERm/fdKii2PCoosrwbVWKzCXw0oxAWk2/5WMmq9dCwDocSWGgczfBuPkIZsIFOFMrgvar4PV1pl/Zs5ZMMx69r0ylS+PuwsIGUXrUxqMCKltzE9FzUhLq0jGHKtfimjD8RBZrP2fIHAxkAwg30X76+eoUnXO75Yi3V5rzGb2B9eWY8HbAaYWRxnZOKWPnNdVLiuO/easo2FJMSqDO3Z31b+5VpRrKc+wqizQnb7+bd1ovzDWnoj20/OmjwtgMyANh8gZn8TlhsddE0Uv2I7cVDU5tsb6iBVTeXviOPU6t8hUZjOtekleFe22YzFe9T17Qswm/0B1hgEuYxO92VvEsgofud2Ycl+0uo7lVZ3jQcd/cI1bSGAlSdzMLT9GewrnqjJ1z+ujvHb1ihselkBh2wzoM2N43P5NQPEyXZxfh/HRLCwVRZsZNv64uaOOmNfRVaowylUelGi3ZyrvUk1/CHdKNt1ZiVttCDGgAWtYP8A00j1a2ML5zhEilNiMqOUAOLqVRL83xxsleDCr26uU2v9Ap+hb//hwEuFRQN4HwJKhoIGt4njBqWXulXzTawQuy0JmECPjMksCqYkQka1fFQgqrzENM63tdV7/OEy78srwQErJVH/kKXmlOPra6e7McNOgBl/TtEip99tdpGfq2abq4DFGwwjF9efiOA6wdO2lau9WJqrmVmt5zb1t3DvIFl2c1oDsYkjaHxO34acmAZmBdjQMvxiHpXO1GLeO/tlCsYotJPoprxvM8ZJWLrVR8GHVgS4hC9SSj7Y7Avf9xHU1GBvtruglVHAGnGfDpgnfSEy9NWfUDAyj4wn87pXoOtPj3e72cZw/qjFB7QpL5HZiBzlK/CijQzrA+L1B3+YDXRdYymiYzf313n5VkmeaiZZGzwgZKcaTSs90INrOYFCiUzsNReIHIaVB90bj3v7iytV62mh4vqJ8qPdvKXQyvWM68Sqh/3U8PaQd+AQn5vsK+9LF/zB7wbYXW5uWo5ljfTw8e4ruqiJ1zm7Hs9IGA9uOttuiJ+J7B1FQG3o25IkMvtCfjTAC47g6bV3hO5VMGWca9aRqQZyQ85AKvlhv/s7pYmG5Hm8lc9StOcYgRWPPF3mpSRN0MNrJZFiaMZ99Wp/uJV5kWXvJ+aHyPo5G+6ljKoPmIITD3g1znDMQGMa5id7v4Bq05MvN9dTvekjzTD5KZMM2hZ3QeswqwGWf6dIz01rO884fLH0v9STpf/wBq/bStd4OghdxuwIMmZePmEWglRxejbSuCfn9XrZIrh2vRc6y6m3oZXY7SWW//YHaczuKQ8tXPIAwCLMa4K9YP01rDkhpCbhIuUjCWQW3XKW2DfSg/He+PFZ39th4Wi0gEgmxiAtc2vc0Yalo4eggEBS4S/yGBlrA/F9ZevmTJYXqB5jgDTEGByKeQaV4GmVbYp429dz2Jt1SeecEnbUUDVNQ/1G1gxn35LUw+rugguXVDbxttjFGNYGkn+3K192UIkKcutyem5JKtPKy2HXN0tJ2MqjUaF+zqVoWl3ryjSXRsJsdzruoiIeaEGVmu2YhLjvo/HRrn0Kpt3LXjFnztvQzFEpTt1Sr9M2o7AUXUBC7Ae9RNYj3o2+bh879tDWfxSkj91hHxT5gxUu8rHSt/3MD4H8OxFHXVg/IgXak4Rpiw7Cg7FC3zHb6HmrF3NwrVV87D11a7OcBF/dpA63JDsF6x+Oid3l6WhWSV8IxSTh5oa0BXjd0iVLYFWt+wtkrq8/CUftbQqu+VECvcIAFItnc1CBDFaYImJT4JdHpkLsHzVlrrcGdpTc/rk6vGfI4Y6deqdDOVrXvTPJJQPdulUzMnPfkTPd/iwiDvrpIqzNG4RV0Os7JZQ3w5J+TMeYYONrEBzP4rZwkphoG44aOSNGggAGojSeZDGBkDa6gt6os1ZnVbCV1fcAebasc5w6b++knrnyMO8YeV09aO0B59lqjj6P1e+EsXo1EbGJpwAKyPQSauPk97okCqa6C6aHVRmdIOH9KrNzLsmDRXpe2u/ITXXmj0JzLMxhuCGGqCKDWAa2lnisi6Nf71U2i3A8ggmHWz+CqeByjWoxZrnNalOwB8IvUmoyGDdP1s2iSYeq4Fa1FFFAuCSANrQ1/QNVPkHeHYc011epoypHhbqWO3Pcc/GJSpAmzrJUMRvSUjrutvGDJCbNDY2cy4hL81nNyDclDGNKNS0MQMry5m48a7bft1j/ZlIMNfyPAET++lhqupSDC9gHT0vo9Sm3fTAeu/kyA7fhnwhah8Pb4cTYDZ87ZAQb9XGcGu9RCcIeoztuqWKj7/FsJA2eUgx7vtDeq6tAcVOuUeutTHNSG4es2xXUJu3wne8xRLe0DTpLfLm0AOrPN4z93BAke1Wb1M9RgBzv8vbGSyfHnJgaRX3se4/E7sGAHXaW3vq6KbTmk3cRleO5rLpeK9/wEIF/NSHGIDV3LqAGOvPcdG97RAr9jO0qv8BLVCF6lZI3Jh5G2g/l1hSazhVPU3Iy4iF4xz2EfXu4fJYVfUQHWTu+2I1ZW+K5gQre9Mw6r7SVfQ5hGur9iNN5CJoVQwVEuvgjfCwP9oQ6j0Ib/MKeg2LeDfU3UMAUNXeALG1peZYngrm96TlWB9kWylMXUreGWpeoRZhXmWSd5BTvRdE4uPqxAqr1zWJk00MNbDatYoHfR5Dr3qbph68hXpGEefUqxYz+sd0/oGFmp8sAA3rZ8auOVrC78q6DpF3P4QrcYkArddgvkLS4AQvyHyWzQcFkPk3pwOBuUiYMt9hNwuzWrpWIV1lF4CW9Q1dD8KsneuoWoARazmZ2lupKebPYJ8q+nCGVVW3dYLLOYYJboA38LJKEffmpzY4niMBzwW1uJnmmK3dkQSabiRbmWq0j31jb9C0nlvd9bToVwtRvBacBx9/nV9mssAjrMFddbTIe4WyGt7scD2/83yA6uMVo0MOrGz1I76O0QZmo8uzeoNe3eTUqt8HsNQwHbtxvn8VQpBfDLUHY6oAccGPRqpX53pE4ljmXFvkxyVeC4brpctqYal7tXAbC2RaJBumcg5hkm3S3O/LAS/P9wTgquM3uYvs0WhaIzZ8R31y/B7q9MV46lLbYKrd1Y862xJFHTknp147/DgV+dExpn6EraBddYnirRXjixk71iKtSKz4tCoal7F1zHGrwiPk14E5Wc6cT6X4piFaHt0NwNrL7BC3toN5qEdJzgE+pv1SjOUTQJtrYv4eC6doaZQfKDSTRwRmskpQTH4RVUy+E1lU/mRkETlj0Lbd6iFbyiQRxXvEEUU2UWQpmTBk59eSAUWWmyKLyVloPy5F/OoSkq6Hl8gpj5Wr5iqRbGToNSzftaUo0GicKGqdMVqeFixOf5PsqQVJw2iburrLNasv2OYEtqIHz8x3bBkgoGmV1A1PGFUpEMUghYDC5INPY9IhR4cPF54TSoej1fQ6iURaJcJlqPrv2aFJw9isHdmm6SIw484ya1dZ3/Lp4ByzKkUAwGrw4Xwv6lrUD7XgWlu1jK7NV8eooqSf7afuLV1NPV7+KjXZvIka6m42Uc3UJacBW1PxLLaS6nIxUEdauHkPsOcFEqfqJPJltQkyTYVAMOJKCZmz8TK8RiS7v1ZEfGBnChx12++KbwOtHc5Vxi6xpCOTjMVcc6blkra0HMuj/uT9wT4DUnKts0Fjc7CBMTWHnOPrWAOL9lwvLLFaGasvlFjbhGarQ1hMVl1u63UK/uagS3y+ahKayWe9gNVRo7/O45qcs8cQ7rcuKsBYFS2SIY0L/a1uuDixbjh90jJvH5ZO5dMUQQnSoPEU8wEWbF/h7z1y/mlRDF09rsvHPRXwSjlNzBvNM9WIyv3A5xb43ATXIx9g9jl6FmGcgNEAownVm4O/W1AbMaYXPjIHfUSob8CMGbxMUVl+xss+gFWTtHH69V336nDA2xi7N3Md66qbsDWVf2GZ4FQ7Cvr0VYmhc54g3UogffzVL/XxiaOxbhK0Ipi+wvoVx1pWu9KMu3ip/wC6x9iAeMUkTDOW+wyUBQ1pbbDruoOW9qr3cjt+FzLJvc0ThdUhUVYyadjwEvrGLsFfPBkRI/IXWE6daj6XeXXqVW/wARYcd4u/90jzAvhxTMc1qBgrWNSDKYk0xnYfuYYNYtkttOENgQyJO5XqEy9Lh8L6AZBqmKPTNS48X5PNe5LW3xgJUGphNQtNWTTXFpVMRquG66qb/QAVmIBn9mCrq322LULlMewJxOMALouvSgzcQKW8AMf6rL4HuuykGvfdCaafg2O545o0o3XR+DfKWR2t6TnkpFSj9V3Yvo1DuZnGCcv2sZtb2/bKQFu6GAJgeTUMQAsogT0silb09j8jIh46g3VtPuITWFqVjpOmplVO4wUsluNS86RDnDplIZh93zOMY8zHVW5w/6b5iWIUQ0bpiMdRSWcA6iFXp2auAMyvmMIfqPj4yDq494MKrMuKgld9+NIp1+ImzTnW6PSCGX41ywVgFfjQso7Q77kYNK31VU+DidjMA1b18DkbW9PA2XZFFwrZy2fEsr87pIpq/2FFnALzMSPYzkXOYjD0n7jckpVutLZxrGfVilYXYft3J+TuS8HmbnerzyIwGccvL08FoG2Gf69PX7HfybF88l6miPMrMsRsGx+K3oTCHaRXoTWHBM8OzkOjaKwVE4U1cXHxPEzClzndewAZAMIljv6r9rZFhIbpWO061Ry6hq2cTE2digQYlboM6tNwjLOUXtXO1AADRl3rAsUYWqslNjEt6MDqsFiaUJhK19ipTDPLil4j8nH58xgl5Wf8A/ZvZwmVqGI/wnsVUmxt5VIAkRVbd6YGPp2dcgOdAKkK0MZ2A9hewpYfDqh904X4+LgaseJZUEP3+qx/Bf/mTn6WKPbWivBFoVq65R16kEsuZHaMs2pdl8Dsq4ZPlx/7Vo17dTeXFZl+wiLSLCyxtQW1NyEc03upXfHfYD40dhGxzR4jE3HSsPTKJVyvF2g3hRyBVcOUo4gCTgF8pD+w8mcA3I5QCyUjaJ3vIuKjUEDLLkq8rcsqoSlzIYM56JCZMp729/mRFmTeAFpUFYv2tofDq4jqB4CKw9ZV3gLwugcgNRdg9RqYfg9ha07fgH1YJwzmQ39OKByOJqg2QTELJXGiRgYAp59QojN87nOIiY/sYvl8xwh83NmhQ4dhvUhQl+cUo/UJpB3xBY+foyFt+b6HOZ/gzq8lAjO5LqgmYZGF9F61IoqD/qYXEyaA1RDfPixlLmdgLVLpOEFCn3y48TmCtmQRmHBjXfrk+u4CFoW+iyEerBItXkgUh4MOLDHepZBeYv600QCWJg/tp05eqHkwoAdo5ZgBoL0Vs5iE67GwBF8mLdkrSzVatqGo91CACmlx6Ubyp8k5ttv9Ob/IIvJpYbH146HF1lVCM/mWoKh8SZS5/CVBCbkwcoflqagiy2MCs+WRqJL9DwiKyXsizda7BDtsqRHm8jFopXHQ1t0EVrRLhJkORmNG4yBvk5D4Mfj+FOUFR7z8Xt/AUq/kGmeG4rG4gUJdgkxIumMgEw00LHv3AUtdQRkIxnpvdSJ8Wh2yUIIFK4niO4NnoxeUB2jSrO1IYNacxQsy9yGIBePZkZky/8iUqgOa3fNhuoRIblx8KHLC0n0PpOVarVx9UVza2AOsvkozkrNGLy+P742/2935SExcCoVpAg/ict8moWp13kxu2Q2X5kklLiafUZeVPDVjsw1US4vSMdS6Cj6sWtqzFf/2Nf81IsX9dVKiPtD5Rqu69SJcRvc9qGIDmH8Z8vyMybF5U6KC5w92O/WNnoGkuDu+K+PPYbKEWEQGW0RqrvX59Fzyoq+6VkwNJ+CzLdVIVgAA7w52iZ5gC10t9+D5UhTbfZdI7lpBlPXhRikzOtUZX6Bo1xGszVNRpx4wRa0d5Y79c777AJULtLgL7TrFE1yvAyriZxcrzvNegZco3EG+AKvFXGPjgi0ovxCVpPEwBx1JBRmjwkTpJpmwbJ8czEQtaFwlAK96Lt2e04zWLwFUSyYus9wnnVfWJ7pdO+Jld4RGu1K0g7nzkhtYNKWOOz3cG7iWMUZVFCia+ljew3enHGomNrA9m3jIpVPvoPTJNlTJ1KlXHwS4onHIpU/+Bo51GMDzLZzjd7DdD7Ddjy5D8hH4/Am2OQrjGPz7cZdBfQK2OemEv8Mxdjl1qmWozpeBRw9ONE+1oqTUWjFeCHN3kcOKbDOYf2W1EoW2Nlaq6un7CAWJAqRKrrQRA62rYPiHGcIwSXrAVBz7JpmYZrT9A4CUC59b03PIb8DMs6XlkHmpueR/YPxt0pIDslGGb6N6u0bl9WZPkD9G77glTqCSM/AAGWsTFDpUkdSOVoVRuWuR/FWHGP8KHpgmZqc7XlYbG+tOgG3Xqp5FDSQYfFifoLZa3ICFDQQYFLKvyqkvcjUx3cecg0Wg3MGGJ+XRlKFjnF2QNIzqNM7Nkw6nDB3j/ELJCKrTcEfFG9QdA/3t72ByBtAsGPYd7IiXjrd3RLhf8oqzkih+gWvzoT1BPhml6oS8HBMPGb49Qyg3ZfxTbsp8J+GTGfIwPcISdKmPJ7LgwdA6EuSP2BNkt9cMTVRwLfGDtquJw2+CB+h/7CL5nDqRfB4KXLSLksZ0fpAonSIFHugGBg2Lc1gDKjXDbl66A0aLfivXphaLjXKXFk8gMlE2wukRUklvAlRYwvKbFGTygSm3ld7fpORVH53SKRe5WPxOXFN9whKWsISFUZqeFsk8S8EAeJpbFsqv43Ocdp1qFuzbwhDO4Gydr5wQnu2whCUsAUublshy6lWnL8Oq1alV8u7KA5raXQCmS/SVFNQ1lxbJROGZDktYwhIUufBMfByYdS+0LcTv8Wf/Fl3S9e4cPvrSL/uQAz08y2EJS1h6haC2Xu78PBpzELSvl1AT1PAshSUsYek10p6t/Kt3FQV1zfl/0ScZhyUsYQlLT0o/SqcuuVzCxYWqgFLZeHp4WsISlrD0SmmZLxvp0qm+BPPw67aFipTwjPRO+f8C2kkCqcIvWAAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.os-selnica.si/eng/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.os-selnica.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>MIIGMDCCBBigAwIBAgIGEkpMIjS9MA0GCSqGSIb3DQEBBQUAMG8xCzAJBgNVBAYTAlNJMRkwFwYDVQQHExBTZWxuaWNhIG9iIERyYXZpMUUwQwYDVQQDEzxPc25vdm5hIHNvbGEgU2VsbmljYSBvYiBEcmF2aSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMjA0MTEzMjA0WhcNMzQwODIxMTEzMjA0WjBvMQswCQYDVQQGEwJTSTEZMBcGA1UEBxMQU2VsbmljYSBvYiBEcmF2aTFFMEMGA1UEAxM8T3Nub3ZuYSBzb2xhIFNlbG5pY2Egb2IgRHJhdmksIHByaWphdm5pIHN0cmV6bmlrIHphIEFybmVzQUFJMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA2RbW7aReyk8VM1MDhjsStq6upnee4wCpHVZwpnMOpdHRmbS11KDu2VG5u+tivv7j2X9yKvp6ZeK76EqEpazleQO7n/zGMDZj+lrKLVI//xQg/nYUtLLxpoy3ZAkOoCgIpQTDWJkggf4n6HtX/rzS5+VZV6tzlXTywm0SDIS0Ha+f69CTYX5hJM8u2AfYokTtsUhXM3mAzZsxhij3goWwV7o1H2Yr0caxbQYrRyO0LbwfigkH8NF9B6mZlXBIDX2GRI194PccAK5uh1sS/StvGP/RwFu951vTSRxGTB+1jf+VhFwOji6sCxkrWNJYTlxv73Bk35/GnSgrE+ZJwIJsQlohkrL83MspX8TV2KgtNLcGK1ywnLDm5gsRY1GOntIfrWTEp050b9VB+BV0vyzKCdC//28OUKszh3KX5oUAzoTWUCCxTSy9dxaylIxpenzZ8+ugKPhk9a3O+SAwEiTUGL+MpHMeFp617Dkp1/nbUA/jDLcCkN5fJxarWEbXlllMwl6hBMalys2R8bKIMqcd2fypzcMRzH2yLvH+dP/HRNpFpBxONwvMPBtPAbNzq9/ESKIUhM30ZuL6rUuUw2dfu5MvlH7ZDtiapfzX6RHJnvQPW7yF6GAN9jmE5evTf5kKV0Ltp78qE7IKQBN8nv37pWBz7GcX0EjKODPvwCEZUJcCAwEAAaOB0TCBzjAdBgNVHQ4EFgQUWS2N8HdYUr9Ff75m+M4CzCsLzEMwgZ4GA1UdIwSBljCBk4AUWS2N8HdYUr9Ff75m+M4CzCsLzEOhc6RxMG8xCzAJBgNVBAYTAlNJMRkwFwYDVQQHExBTZWxuaWNhIG9iIERyYXZpMUUwQwYDVQQDEzxPc25vdm5hIHNvbGEgU2VsbmljYSBvYiBEcmF2aSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUmCBhJKTCI0vTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQAFKib66UymyPTVLAprQUak7aXzfYkE8IEFv1OTIoLxF57quZYBAFIf+wymSTnGGUQouCzUjUE98vF3bi6XsU8A8s4KSGfB/vkjnQ1tG5miYmLsrLV7XYfVQseIoK/Rz1tIlsg4+g6SNap7d/zVxp3rww46zwq4LK5vUf2YoZfABSRTc4Q8MNeKnX3O3qgI0TYhg4cI6Y/sIr/j1fexINXpHpMsWcCbyYu59OpkceVb1NLA8em2ME03Xbub8C+jykFpCpGWBDGxGCUOd1AumITJncEJ4JkVzex+3I8vwwvNt/tT13v3+mVdMGvZcxYWIW9bgXcGEf6X5TwXXUiZMjwI/rNYz+ijwIAdUj1KKFr7cZNqL4Hwdmbr0zs/HbwH64PonfF1bseI0NFziSE+kLtMAEHuY3nX6jMQoV9Uv0bFnbhQkdFjKzH7qImmLST2gSNvk5B96Lb3V9rzbPKGk9qTC56VKBrSF1zQG/W+r6fiRIpldmp1dQw1AXoS5sBzSBa+gG/QnZkqocm1uyH4miyKzHM4IZpwcMaCkAxpQjOy7OgzaDIVg/EHFy6YhCBi9HObH4W4EtM+/jUCgpu/8PfQcBspJb07/zWCQfQRrb/DAbkuymwc1pfWpxctDc0Z1fvyVEUhMbY0iYxpXONyT/g7VtBwzbCoRKgr9tCk1DrWUw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGMDCCBBigAwIBAgIGEkpMIjS9MA0GCSqGSIb3DQEBBQUAMG8xCzAJBgNVBAYTAlNJMRkwFwYDVQQHExBTZWxuaWNhIG9iIERyYXZpMUUwQwYDVQQDEzxPc25vdm5hIHNvbGEgU2VsbmljYSBvYiBEcmF2aSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMjA0MTEzMjA0WhcNMzQwODIxMTEzMjA0WjBvMQswCQYDVQQGEwJTSTEZMBcGA1UEBxMQU2VsbmljYSBvYiBEcmF2aTFFMEMGA1UEAxM8T3Nub3ZuYSBzb2xhIFNlbG5pY2Egb2IgRHJhdmksIHByaWphdm5pIHN0cmV6bmlrIHphIEFybmVzQUFJMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA2RbW7aReyk8VM1MDhjsStq6upnee4wCpHVZwpnMOpdHRmbS11KDu2VG5u+tivv7j2X9yKvp6ZeK76EqEpazleQO7n/zGMDZj+lrKLVI//xQg/nYUtLLxpoy3ZAkOoCgIpQTDWJkggf4n6HtX/rzS5+VZV6tzlXTywm0SDIS0Ha+f69CTYX5hJM8u2AfYokTtsUhXM3mAzZsxhij3goWwV7o1H2Yr0caxbQYrRyO0LbwfigkH8NF9B6mZlXBIDX2GRI194PccAK5uh1sS/StvGP/RwFu951vTSRxGTB+1jf+VhFwOji6sCxkrWNJYTlxv73Bk35/GnSgrE+ZJwIJsQlohkrL83MspX8TV2KgtNLcGK1ywnLDm5gsRY1GOntIfrWTEp050b9VB+BV0vyzKCdC//28OUKszh3KX5oUAzoTWUCCxTSy9dxaylIxpenzZ8+ugKPhk9a3O+SAwEiTUGL+MpHMeFp617Dkp1/nbUA/jDLcCkN5fJxarWEbXlllMwl6hBMalys2R8bKIMqcd2fypzcMRzH2yLvH+dP/HRNpFpBxONwvMPBtPAbNzq9/ESKIUhM30ZuL6rUuUw2dfu5MvlH7ZDtiapfzX6RHJnvQPW7yF6GAN9jmE5evTf5kKV0Ltp78qE7IKQBN8nv37pWBz7GcX0EjKODPvwCEZUJcCAwEAAaOB0TCBzjAdBgNVHQ4EFgQUWS2N8HdYUr9Ff75m+M4CzCsLzEMwgZ4GA1UdIwSBljCBk4AUWS2N8HdYUr9Ff75m+M4CzCsLzEOhc6RxMG8xCzAJBgNVBAYTAlNJMRkwFwYDVQQHExBTZWxuaWNhIG9iIERyYXZpMUUwQwYDVQQDEzxPc25vdm5hIHNvbGEgU2VsbmljYSBvYiBEcmF2aSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUmCBhJKTCI0vTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQAFKib66UymyPTVLAprQUak7aXzfYkE8IEFv1OTIoLxF57quZYBAFIf+wymSTnGGUQouCzUjUE98vF3bi6XsU8A8s4KSGfB/vkjnQ1tG5miYmLsrLV7XYfVQseIoK/Rz1tIlsg4+g6SNap7d/zVxp3rww46zwq4LK5vUf2YoZfABSRTc4Q8MNeKnX3O3qgI0TYhg4cI6Y/sIr/j1fexINXpHpMsWcCbyYu59OpkceVb1NLA8em2ME03Xbub8C+jykFpCpGWBDGxGCUOd1AumITJncEJ4JkVzex+3I8vwwvNt/tT13v3+mVdMGvZcxYWIW9bgXcGEf6X5TwXXUiZMjwI/rNYz+ijwIAdUj1KKFr7cZNqL4Hwdmbr0zs/HbwH64PonfF1bseI0NFziSE+kLtMAEHuY3nX6jMQoV9Uv0bFnbhQkdFjKzH7qImmLST2gSNvk5B96Lb3V9rzbPKGk9qTC56VKBrSF1zQG/W+r6fiRIpldmp1dQw1AXoS5sBzSBa+gG/QnZkqocm1uyH4miyKzHM4IZpwcMaCkAxpQjOy7OgzaDIVg/EHFy6YhCBi9HObH4W4EtM+/jUCgpu/8PfQcBspJb07/zWCQfQRrb/DAbkuymwc1pfWpxctDc0Z1fvyVEUhMbY0iYxpXONyT/g7VtBwzbCoRKgr9tCk1DrWUw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.os-selnica.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.os-selnica.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OSNOVNA ŠOLA SELNICA OB DRAVI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">OSNOVNA ŠOLA SELNICA OB DRAVI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">OSNOVNA ŠOLA SELNICA OB DRAVI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">OSNOVNA ŠOLA SELNICA OB DRAVI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.os-selnica.si/eng/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.os-selnica.si</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jožica</md:GivenName>
+    <md:SurName>Ozmec</md:SurName>
+    <md:EmailAddress>mailto:jozica.ozmec@gmail.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:franc.jakos@glazer.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Franc</md:GivenName>
+    <md:SurName>Jakoš</md:SurName>
+    <md:EmailAddress>mailto:franc.jakos@glazer.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Franc</md:GivenName>
+    <md:SurName>Jakoš</md:SurName>
+    <md:EmailAddress>mailto:franc.jakos@glazer.si</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
new file mode 100644
index 00000000..dcf0d48a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.osfc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,109 @@
+<?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>
+      <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
+						BAsTC0lUIFNlcnZpY2VzMRcwFQYDVQQDEw5pZHAub3NmYy5hYy51azEkMCIGCSqG
+						SIb3DQEJARYVcG9zdG1hc3RlckBvc2ZjLmFjLnVrMB4XDTEzMDUwNzEwNTkyM1oX
+						DTMzMDUwMjEwNTkyM1owgbQxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVy
+						IE1hbmNoZXN0ZXIxDzANBgNVBAcTBk9sZGhhbTEiMCAGA1UEChMZT2xkaGFtIFNp
+						eHRoIEZvcm0gQ29sbGVnZTEUMBIGA1UECxMLSVQgU2VydmljZXMxFzAVBgNVBAMT
+						DmlkcC5vc2ZjLmFjLnVrMSQwIgYJKoZIhvcNAQkBFhVwb3N0bWFzdGVyQG9zZmMu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHw1xtdxKY8QAa
+						tUJWNuHBz8iqOByRx/I3fmSQxvRKaoB6c0UYoPikbq1WDKfjivk+PjJ4p1md8WWp
+						1TGF6xyd3zSe36LWJHI1D6SNMmk8z88FDbZrAG2O5H8KzRC1xQpin8k3WXHLzIvy
+						qpsiiCOWphTAAXTsPzNS3BOfAeghvApzWrM2vXLxlxHsSKZS5J6wP4rIuK2P1X51
+						okIJv8p7AUXQdv3Lyoyba7b0CuuEwEplmXEIv2cB2++eb1Eu7IUnOq0OIjMdAQo1
+						YwXAtAwKs8u53FQ++T+ZSe0SM9VbZsUljUVV3QAtGN3yq54ntaBI1d4mC0NT+iPe
+						TVOlUHIDAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
+						U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSWogXD4Ld0Dzl6YokJ
+						DP1PO/PRWTAfBgNVHSMEGDAWgBSWogXD4Ld0Dzl6YokJDP1PO/PRWTANBgkqhkiG
+						9w0BAQUFAAOCAQEAZvquJlijNbVU7OnKoJ/UgpyXh31VfKQAKJ7LP+TWDCCUwgyJ
+						klumKlUh7c0JG7D3RRXim7mOxXEvkf4F1njUXWgv8mJmxRPzMkivhEFfnR0MFkjd
+						KFNHuarG3a8pAzFV8aeJSmIVfr7VwGO+pcdQrD7ScLi0ssNi4tf6wz1JaOSz/SUO
+						8llqRWB1ZyEQ1+d28Uzi90R2qu7MVn1Y2RdWfsFNwhcuBh44+a62kexUiYQIv7jb
+						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>
+						MIIEaDCCA1CgAwIBAgIJAO0V7MENsS9VMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
+						VQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMQ8wDQYDVQQHEwZP
+						bGRoYW0xIjAgBgNVBAoTGU9sZGhhbSBTaXh0aCBGb3JtIENvbGxlZ2UxFDASBgNV
+						BAsTC0lUIFNlcnZpY2VzMRcwFQYDVQQDEw5pZHAub3NmYy5hYy51azEkMCIGCSqG
+						SIb3DQEJARYVcG9zdG1hc3RlckBvc2ZjLmFjLnVrMB4XDTEzMDUwNzEwNTkyM1oX
+						DTMzMDUwMjEwNTkyM1owgbQxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVy
+						IE1hbmNoZXN0ZXIxDzANBgNVBAcTBk9sZGhhbTEiMCAGA1UEChMZT2xkaGFtIFNp
+						eHRoIEZvcm0gQ29sbGVnZTEUMBIGA1UECxMLSVQgU2VydmljZXMxFzAVBgNVBAMT
+						DmlkcC5vc2ZjLmFjLnVrMSQwIgYJKoZIhvcNAQkBFhVwb3N0bWFzdGVyQG9zZmMu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHw1xtdxKY8QAa
+						tUJWNuHBz8iqOByRx/I3fmSQxvRKaoB6c0UYoPikbq1WDKfjivk+PjJ4p1md8WWp
+						1TGF6xyd3zSe36LWJHI1D6SNMmk8z88FDbZrAG2O5H8KzRC1xQpin8k3WXHLzIvy
+						qpsiiCOWphTAAXTsPzNS3BOfAeghvApzWrM2vXLxlxHsSKZS5J6wP4rIuK2P1X51
+						okIJv8p7AUXQdv3Lyoyba7b0CuuEwEplmXEIv2cB2++eb1Eu7IUnOq0OIjMdAQo1
+						YwXAtAwKs8u53FQ++T+ZSe0SM9VbZsUljUVV3QAtGN3yq54ntaBI1d4mC0NT+iPe
+						TVOlUHIDAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
+						U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSWogXD4Ld0Dzl6YokJ
+						DP1PO/PRWTAfBgNVHSMEGDAWgBSWogXD4Ld0Dzl6YokJDP1PO/PRWTANBgkqhkiG
+						9w0BAQUFAAOCAQEAZvquJlijNbVU7OnKoJ/UgpyXh31VfKQAKJ7LP+TWDCCUwgyJ
+						klumKlUh7c0JG7D3RRXim7mOxXEvkf4F1njUXWgv8mJmxRPzMkivhEFfnR0MFkjd
+						KFNHuarG3a8pAzFV8aeJSmIVfr7VwGO+pcdQrD7ScLi0ssNi4tf6wz1JaOSz/SUO
+						8llqRWB1ZyEQ1+d28Uzi90R2qu7MVn1Y2RdWfsFNwhcuBh44+a62kexUiYQIv7jb
+						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>
diff --git a/swamid-interfederations-2.0/idp.overtsoftware.com-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.overtsoftware.com-idp-shibboleth.xml
new file mode 100644
index 00000000..b0e063f0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.overtsoftware.com-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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
+						VQQDExVpZHAub3ZlcnRzb2Z0d2FyZS5jb20wHhcNMTIwNTI0MTYwMzQzWhcNMzIw
+						NTE5MTYwMzQzWjCBhTELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDldvcmNlc3RlcnNo
+						aXJlMRYwFAYDVQQHEw1LaWRkZXJtaW5zdGVyMSUwIwYDVQQKExxPdmVydCBTb2Z0
+						d2FyZSBTb2x1dGlvbnMgTHRkMR4wHAYDVQQDExVpZHAub3ZlcnRzb2Z0d2FyZS5j
+						b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6aE+W0BP9ibXUGpPZ
+						dRcSNO7frD1wgMjPhtpJfeiI69Yc3gkJGaWKrtkmCuFydQ+rO5fbuKyrZzIQssN5
+						cLHxu8ABHtGMqtk0puKa3ymFvfjgp8IAh/tYgBw8/WLX4VuGA9NOKqXcOME5icCc
+						BaCxseQCwEy/5YT+UAhP7BzUbRg1OEnb8IYGJKAWRoO5hE6CiGugOoplpGv9ovmJ
+						i16CAuSBqbsHKkT9ADJp9DMZpYa/izn9j+/ONW5DcVWasosw6wDewiIp+ttW+Ice
+						EFJ6KbWJHNjRlkdp7FXjvDdVks5sc/ZfSvzF4G9mm2lv//aJu774kZzijkF+Bio4
+						IIxBAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEd9OhZ0ZAB7Cpr+YwzWY+4S8c/w
+						19dwjLqufSlmMqq7fw00mcWxmx2n3ovzqplTRvOxbFiNc00hF85Lf3TRs+ieENWp
+						THQ7KNev/peJ3kggXArmlKBzZmM7xVimwm1d0ehp8359gAH08oGxZFqc1F1VuPyM
+						iXEieN+YvMjmfUs4/O1cDWLcOlrEzb+wDRSgF7osUlqjGxlZ6tfaayMeWcDfJ2hy
+						+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>
+						MIIDiDCCAnACCQDi5A+IRiQjlDANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
+						R0IxFzAVBgNVBAgTDldvcmNlc3RlcnNoaXJlMRYwFAYDVQQHEw1LaWRkZXJtaW5z
+						dGVyMSUwIwYDVQQKExxPdmVydCBTb2Z0d2FyZSBTb2x1dGlvbnMgTHRkMR4wHAYD
+						VQQDExVpZHAub3ZlcnRzb2Z0d2FyZS5jb20wHhcNMTIwNTI0MTYwMzQzWhcNMzIw
+						NTE5MTYwMzQzWjCBhTELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDldvcmNlc3RlcnNo
+						aXJlMRYwFAYDVQQHEw1LaWRkZXJtaW5zdGVyMSUwIwYDVQQKExxPdmVydCBTb2Z0
+						d2FyZSBTb2x1dGlvbnMgTHRkMR4wHAYDVQQDExVpZHAub3ZlcnRzb2Z0d2FyZS5j
+						b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6aE+W0BP9ibXUGpPZ
+						dRcSNO7frD1wgMjPhtpJfeiI69Yc3gkJGaWKrtkmCuFydQ+rO5fbuKyrZzIQssN5
+						cLHxu8ABHtGMqtk0puKa3ymFvfjgp8IAh/tYgBw8/WLX4VuGA9NOKqXcOME5icCc
+						BaCxseQCwEy/5YT+UAhP7BzUbRg1OEnb8IYGJKAWRoO5hE6CiGugOoplpGv9ovmJ
+						i16CAuSBqbsHKkT9ADJp9DMZpYa/izn9j+/ONW5DcVWasosw6wDewiIp+ttW+Ice
+						EFJ6KbWJHNjRlkdp7FXjvDdVks5sc/ZfSvzF4G9mm2lv//aJu774kZzijkF+Bio4
+						IIxBAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEd9OhZ0ZAB7Cpr+YwzWY+4S8c/w
+						19dwjLqufSlmMqq7fw00mcWxmx2n3ovzqplTRvOxbFiNc00hF85Lf3TRs+ieENWp
+						THQ7KNev/peJ3kggXArmlKBzZmM7xVimwm1d0ehp8359gAH08oGxZFqc1F1VuPyM
+						iXEieN+YvMjmfUs4/O1cDWLcOlrEzb+wDRSgF7osUlqjGxlZ6tfaayMeWcDfJ2hy
+						+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>
diff --git a/swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..6a95dcf0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+      <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="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>
+					      MIIDPzCCAiegAwIBAgIUCeX+1RyxljYfEToWmdNXc2pDXeEwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVaWRwLnBhcmlzZGVzY2FydGVzLmZyMB4XDTExMDcxODA5
+NDAxN1oXDTMxMDcxODA5NDAxN1owIDEeMBwGA1UEAxMVaWRwLnBhcmlzZGVzY2Fy
+dGVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApzgVP4bVQvl3
+hlaeglS/rp6q1fosBpoKU/jKxkQICkcK4HchoSD0RVwToWNdM8f8JojRjJmp3TeN
+7Kmdsu2xJEZMfsGa65AoVdhAvcgsNzMfhJ7DU8XkRjxL28bwa7lPOb6oBmWqUvnb
+Qbbdy2H3nSjnVTy/9EldAyWETvUfkwsRuC7i7mB2efJmomCLByq3mUrk99qrTgH1
+xucnBhbinTknGsjFgbHokkvwxom4+OQdG+zKZweSN/idCzRPw5zBDffocZ13+z33
+CPkiTPhG/AcDlfya2/P7/VS1Q+C3+H2S/l+gSmLojWPkiTRWNZ/C3WOJPkMNpGM7
+aQ8tqXfS3wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAucGFyaXNkZXNjYXJ0ZXMu
+ZnKGLGh0dHBzOi8vaWRwLnBhcmlzZGVzY2FydGVzLmZyL2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBQXUqz0RpnQqx46u1clGA9UWxcPlDANBgkqhkiG9w0BAQUFAAOC
+AQEAYo3b9PwJ6jwuAQPliMg0MSdgmb71MVDmPp3OatPxwWGbOqHUgo3G3x8trtRn
+agcy/HgFnOO47EkdLmNzBjISH1LX9JucHrhEeYKHloviYB3xvq7h0v7hDNZMBWJG
+ojtsnvw3I3/6jj6JRcNsp3Qlbi7lsrYlqIPtuzdNR3YcDu+XpBfhl3geqTrCjS2O
+4j7fvgpptJEtZPWF29JmHMc4rLS6NM/2BqRSNkFE1HO8hE0WGg68ffk5+8qb+qGr
+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://unknown.site.com</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.pembrokeshire.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pembrokeshire.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..848e9a8f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.pembrokeshire.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,96 @@
+<?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>
+      <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
+						cGVtYnJva2VzaGlyZS5hYy51azAeFw0xMjEyMTMxMTEwNDhaFw0zMjEyMDgxMTEw
+						NDhaMH8xCzAJBgNVBAYTAkdCMRYwFAYDVQQIEw1QZW1icm9rZXNoaXJlMRYwFAYD
+						VQQHEw1IYXZlcmZvcmR3ZXN0MR4wHAYDVQQKExVQZW1icm9rZXNoaXJlIENvbGxl
+						Z2UxIDAeBgNVBAMTF2lkcC5wZW1icm9rZXNoaXJlLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo43iMdoX7wISei44zg0pzYm/oDHX3EOTqILe
+						XT91H+u9UIa8mqCpQneXmiE6Oo/rvADRHm9+iRHcUf6GDGq4x16DRc+KPR6Dqy2N
+						sGuL1sg3vmTc8njS2AUoVK0PSFb/4AVooN303PWvz0S8nHXGvDmkk7aYtBzpb2K3
+						qKx+BvyTDuJQF/TcEZAKHme3FVGd29tJSLVNtFs86Dtnu15uj6f6EtenaZQ9aF6Z
+						r9f1TH5cAN10k6epmK0PGxXHvv9ymEVhJMW1p1wiKDfakqOiytlpG1Ltjuz+nl6J
+						hMlWZASCK1lBSFRa78Vb+PqHARZvs0nvrjriaPGfA4JIttXTSQIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQAgVzb1cy/TwNSZh3yLMaeBQlMlvZATKqIk3KRYmXo3qAJw
+						ZvK1t38aPzStE7CB8zq+xdp7oUet1/Arus9RAQb/1MUaWyvHnXzstO/aBctwu7QR
+						uqfDg4n13Rhoy5Id370cjLlUKPkkYjvtz3mqaaG2D5xGM88lYznPXBAwjitRYb6F
+						/llj4EdobocZoTO/p3Q1jneiw9q8Sz0Xo0YO5G/G5PqsRk6dzabdbgHhr32fL9H2
+						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>
+						MIIDejCCAmICCQDRXJmAKdWRAzANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
+						QjEWMBQGA1UECBMNUGVtYnJva2VzaGlyZTEWMBQGA1UEBxMNSGF2ZXJmb3Jkd2Vz
+						dDEeMBwGA1UEChMVUGVtYnJva2VzaGlyZSBDb2xsZWdlMSAwHgYDVQQDExdpZHAu
+						cGVtYnJva2VzaGlyZS5hYy51azAeFw0xMjEyMTMxMTEwNDhaFw0zMjEyMDgxMTEw
+						NDhaMH8xCzAJBgNVBAYTAkdCMRYwFAYDVQQIEw1QZW1icm9rZXNoaXJlMRYwFAYD
+						VQQHEw1IYXZlcmZvcmR3ZXN0MR4wHAYDVQQKExVQZW1icm9rZXNoaXJlIENvbGxl
+						Z2UxIDAeBgNVBAMTF2lkcC5wZW1icm9rZXNoaXJlLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo43iMdoX7wISei44zg0pzYm/oDHX3EOTqILe
+						XT91H+u9UIa8mqCpQneXmiE6Oo/rvADRHm9+iRHcUf6GDGq4x16DRc+KPR6Dqy2N
+						sGuL1sg3vmTc8njS2AUoVK0PSFb/4AVooN303PWvz0S8nHXGvDmkk7aYtBzpb2K3
+						qKx+BvyTDuJQF/TcEZAKHme3FVGd29tJSLVNtFs86Dtnu15uj6f6EtenaZQ9aF6Z
+						r9f1TH5cAN10k6epmK0PGxXHvv9ymEVhJMW1p1wiKDfakqOiytlpG1Ltjuz+nl6J
+						hMlWZASCK1lBSFRa78Vb+PqHARZvs0nvrjriaPGfA4JIttXTSQIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQAgVzb1cy/TwNSZh3yLMaeBQlMlvZATKqIk3KRYmXo3qAJw
+						ZvK1t38aPzStE7CB8zq+xdp7oUet1/Arus9RAQb/1MUaWyvHnXzstO/aBctwu7QR
+						uqfDg4n13Rhoy5Id370cjLlUKPkkYjvtz3mqaaG2D5xGM88lYznPXBAwjitRYb6F
+						/llj4EdobocZoTO/p3Q1jneiw9q8Sz0Xo0YO5G/G5PqsRk6dzabdbgHhr32fL9H2
+						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>
diff --git a/swamid-interfederations-2.0/idp.phlu.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.phlu.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..be3c9ab2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.phlu.ch-idp-shibboleth.xml
@@ -0,0 +1,117 @@
+<?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="2015-01-30T14:17:20Z">
+      <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>
+      <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/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAbUlEQVQ4EZ3USwqAMAwE0NS7eSR3IqjgxbyYk0XFTz+TCYS0i3lklXRu425mM1qqAakDvUpphFIOYhNHlvxn5w14QEFegIL8gChSBCJIFWCRJsAgXaCHUEALoYEaEgJKSBj4IhLwQCZ/y+Wn4AK9hCaamo4ByQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="41" width="100">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAApCAYAAADDJIzmAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEgAACxIB0t1+/AAAAJd0RVh0Q29tbWVudABjSFJNIGNodW5rbGVuIDMyIGlnbm9yZWQ6DUFTQ0lJOiAuLnolLi7CgMKDLi7DucO/Li7CgMOpLi51MC4uw6pgLi46wpguLi5vDUhFWDogMDAwMDdBMjUwMDAwODA4MzAwMDBGOUZGMDAwMDgwRTkwMDAwNzUzMDAwMDBFQTYwMDAwMDNBOTgwMDAwMTc2RkYZnnwAACmTSURBVHictHoJXI559/6xj+yMZbwIYWgsQ2NnbGMf29hmDCI7g+yGEFmyZc0SFUK0antan1JPaaGFFi0oKZSisiSM+39dd8zrfX/v/Gbm/3//Pp/vJz33/Xzv7znXOee6zrmT+g3quWBpPq5atWtqmjVr6j17tvHPe/fvEeNZMyvg97OfVa+sqVuvjiY4WNtmzlwTwb8OvF9P7zNNC/3mTr6+mhrp6Wmya9dO+bprFxk67DsxMuq6sE6d2hrcqzGZM9u4uLhIDh48IEbfGMmw4UOrtm7dyqG6XjVNvQZ1NUuWLO555Mhh+fnnaeNr1tLT1Kipp+lg2N7s+zHf123WvJkrz/XpORt8Xl9TtVpl325GX6/FaqZXQ+9frnNVqlxBM2LEsGXLly+r3LhJI6dP9+C5vmjaWNPl686mO3Zsrzhy5HD5rHrVXvXq11Wv1a5TS2NnZ9tqi7mZNGrc8Phn1av50Y5vB/TfkZh4U/z8fP/y8g0IEE8/rVxz3CevsuIkK/SiXD/5i4Tv/1kiD876lyU4nNIAiz9xIKVmTT2lTt3aChyiWGzfNuKo9VFp2LABrlVWAIgScjW437z5cwnIEH4HgCgARAEgDf4DIM4wTsG9CgA5/W+A1AAgCgBRAIgCQKZ9AMQCgKjPN/zKMHrosKEt+FzuUe2zyko9/B9gKPXq11EqV62kLFu+dM6gwQNaVa1WSbWD13kff+d3+vbtfW3p0l+qNPmisVK7dk31HtoJANV7ae/UqZOtVq1aKQBhKp9FuypWEmXS5B9O305JkfkL5u3lXlwAJP1vAeKvEU1whAReOCSx1vPk+cP0PwWk5IOR77sZdU1v3LhhMQ6mVKgoiqFh+6xFixfU0ddvcYuA0Lk4TPtfli4hIJ0/AeQZAKn7HwA5/AkgO/4NkOoAJPcTQMZ8AMT0IyDt2rX1nDPHpG6//n1vfNm+XVqXLp3jEOmv6bRKlSsqnbt0enzy5HFp0LB+Z56ZgdSw0edl3bsbxffs2T22bTuDRFPTZRvNzDbqwb5nNWvVUEFo36HdXdj0qHadmjh/daXpP75QJk2aWAvZ0a3eB0AIFDJKwf7NcnKyBVmYTTsGDPzW7+8AogkIlEBtiMQcXyg3DhnL87y7fw4IDUTEvF+wcL4cP35MnxFYp57qyPf6rfTbwvBIAvKPZk0Vs80bexi0aV0ZxvX7/w1IC/1m1zZv2SRnzthX2rt3b5Vt27a2bPJFo9d0llQQZf36dfPNzTcLnDqw7odoR3nNwucCEGTNmtVV8V1ZtHhh088bNnhZ7bNKBEyxstrXwGK7hTTXb1bI56MkKQDcEPYYABTlY9Xgufv07e2cnJIsK1YsH8Xf+/Xro/2rgARgeQWFSbTmgiRYz5Hoowvk+aM7fw5IA9Wx1d+3aqVfy3zr5v4sUYw4pPYbw686tPyqo2E0HYTsYdQ80dOr9hAGFvxdQEpKigXOQLR1leEjhv0pIIjwyNGjR8naNWvkyJEjMnTokANVq1VUswPXHsfHx1ccPnwos3XAx3KFc71u2Vr/KjLgapu2BpHfDR3Sc9DgQZX1W7Z4WV2vqlrutm+3GAqQBjZu0vAlKwHuV2abGNeBPV0JLPeqVbuGosfyjd9XrDBtt3mTmQCsp127drmXlJT4p2B4+/jIFR9kiK+PpLhbSdyxhQBk/l8D5ENE/AaDihllBINOHD16ZOCePZasv2lquiN6PtZStWbDOKb8XwFktsmsHS9evBAbm5Pq9SHfDa7e2qD1/wqIoaHhNZQrWbxkkcCJXzRs1ED9HGStQGysPH/eQUDMUr16tW8bfIhqnpE2cF/ea2TUbf7IUSOkhX6LlyxBH0BTyxvvw7Ofjhg5fO3GjRsE10cREN4DAMuzBJn4TXcjP3s7O8F9s7r3MLoTG3v9jwncz0802jAJDQmWUF24XPeylXTnrRIDAP4uIL+TOQ/a4PMGuZu2mBnsstwpyIxsfs7DgldSUUe1vXr3TObBGXV/BZCFixZsy83NFTp96o9TpGfvHnqI4jxmGJ+/evWq7+jguXPmzCcgXHDKDUS4HDhgJcOHDztVAUTL+8EBD3ft3Flh/a/rBOVUQOIDfgekXp1XCCgfELhPnTq1fLsafd0XGfKZfkv9lyR1Ala5akWFAUZy79ylY2JUVKQMHDSAmTaWZ+F1CIGTvfv0iubZq+OZ+632Gp13cBDw51Iozer/AwhfkLdfAEqUTrROJ+Rp8lV5V5wvWYGn5NbFzSoAfxkQOpbOhnEOcMD+aT//NHX096PrMrJQWqq0NmiV9ZHUzzmc7aIoilhYbOtaFSqHn/8VQJYvX7ohIiJcIDHllI2NmMwxqdy8RTM1Q/jsHyZOmLhypamMHz9uA8Gnszp2MowAUAIe+Rx1/jd+zjVq9MiFKCOyH+XPx8dbUP8H6umVBwzsucPng6METgUnHqd0b4nvvyKYTZo2fjV27Bi7Jk0av/oYZGvXrfl+0OCB5KKx9evXUwXNokULpm7Y8Guvj2oNQiHJy9NT3N3dJDxcVxlqU8qXVoLDwtWsCAjwU6Vt1J7JAEQrb18Uyr0gOwCy5W8CgqhhmYKD6sw0ngFD9woAkb79egsAqtKmbWsVEALn6+vb8fjJYwJjjFgC/gqH0HD0FMlw5MmBg749N3782FNarbZSv/59/GksMxPqKQnlZwVW3kcQp0ydvCcoKEgGDRpwjDL0Yya3aq0f2anzV369e/dyRMYNGTNmdEfeT+eCtEtx7Wr3Ht/4Dxky+AKyayoyvRa+W0xSR/l9Z21tXc/om26OzARK5I6dvopDEAqEzVA+gyCMGDHcKjAwQDp37pSilmh8d9KkH2ba2p4WB4czgh5FXbZ29mJz4ojc1PlIbpSLxEPahu/5UQpSw6Ws+MnfB6RiZVFrMhce3AWRJPOhtgYM7C8wSnr36V21UePPSz9yh06n6zVs5AiVSD9GDwEFIPUzM+/K1q3mArIWlDQB8Z4r55uKv3PPx6XReFf9fsxodpgqD7FM8iedxLPAca9MV5g2WrlyRVs6jfd9cs7f16BBg2x79PjG4ON1Rven1xEUYQsXLKjMvoO/M/Og9Bps3Wbe7+M9/M7ChfPbA+guHz9D/+JErjh85NCwj59VrlZBOXbMukVoaIi4urqoy0UTKj4Hl8s9161ScMtfYo4tUR1dkKL7vwMENTQGKwUrGasNskG+GzZUphnPlh9nGIvx/EWVUYT99Vu3SjE07JAcGBxiuHHjr5CMLb/u1LljCpyeglobCUBq3UxMlMMn7eT78ePFGJk2Zuzo9fhOCiI2+cP+yaj/ydD0yZcuOTbw9Loiw0cOO/NF0yZFjZs0VpAdCnilsHOXzl7DRwztQDJHp70e/Ugmyunve3xckN+3Z80ynj9hwrjmbdq0Tvn36yi1tydPnrhl/a/rq/To+U0E7rmNsyRZWu5qzvICSRva7su2KS1b6afOnm28fOKkCe2wZwrvQxabsceJjolmcLpxL9iaM2fO7BXbLbbKerNNsmj5SrFzOC/ZXpaSCuJ+FA9ATvzy/waILiJSwqOiJTwSP2MSJDjiumiDAiU9MVpS48MlJcpf7ty+KTdv4lp4tER42MpvuXH4LFG04TESERkhurAQdKPh4hWglXDNJUm5nSKJd7IlLj6O9VYiwsPxs3yRR6hAAkMjK2Xml4izq5ssN132j25G3frAQT3NzTd9sWqVqfTo219OXXQXbUhoDZ0uTCKiYsrP+mG/CPxMRABY7rWSw9bHJOHmTdgQVf4MXONPylPyDJ2WdidTPatWGyQr12+qsMfqkITrQiUqKkoio6+Ll4+mRmBgYEUS/K2b8WKJ6xvNLcTR8aLs3ndQGGyROLubq0vtc47OYm9/WgJcbOVpboakOVtIotO2/w4gPKBWGyhBIWES5O0ssR7HJCPARnJD7bHOSobbziq3bBZOyAk717m48ImkOG3rmGy/ckbhDZfPYrRXxDMgWDSBwaL1cpQwm9USvWeSXD+1XBLDNRJ1M128AVIQAA4ODlKfpfH1Ex/cH+LpINc8TsnpMw6yYKmpoAuXPn16yYYN62Xs5Gkyakgv0TrsEx2cpg0OlmCeEftQyQQEBIh/sE7Com6IjfUh8XC5KOFwljYoAECHiz8Ilv+PQJDt3rNHzpyzB2AJwlLj6e0jR3asE9vjh+XyFR/srZUQng17B8IHPN/V6AQ5uGeHXHU6KgnhfhAiFhKGYPANDBJvv0AER5TEnl0nWR47hQLn1oUtkvTfAiTBaYeE7p8p4da/iG7XZEm2Wy4ZPgflbtBpybx6DhvatnIYV1+5um1MovK6SEK3j9ee/b6eorMY++3VTcNE53JMMtOT5frBmXJtxziJtJohOosxkuGyXdIiNRIeeEV8YKSbp7e4e3lJWFiY3EuOkxtH50jUjjGS5n1I1q1eJgaGnaVN+w6y8Jel4nj+rETBsNDlXeSW2355lpcpWosJkogGi9EbEKSVQC8nSdDYSrzdKinJ0El2glZiTplKgreNaH1c5YoGwAWHqoERc3qFRNuYSsGDFLlz7YrcOPCjxF7YKn4+VyQrJV7tEWJxT7jXOQmPjgVBayTAbITk+FlJ6aM0CcKz47xOylUdMizQV+6F2EvSqcWS7LRd3r9/K4kXzf97gKQ4mUuE5USJgUMjdk+VJJddchfa+UGUmzy45oSHbfks+sjcBUku2zulelrhwRbNk112zcsKd6qV4X9SXt2Jktc5SRJ9eC42NJHoI1AZe3/GHrZy399a8qMuS3ZShETptJKB0veu6JH89jRLrp9YgnvnStqFNZJgZyrbl/wgkyeMlqsBnqK8uiMZTpvEY3FXued3BFH4TrTrB8o9BMq7Z/el4E6cZHgflHuelpJ4bo2UPEiUlzmJkmC7QtJdtkpm4EnJTLspBTl3pTQzRhJslsh16/mivCmRZ6lXJeqgsSSdXysPAo/Lu8IciTkyWxJOLZOUS9vk5cN0yY+8LAGr+8g9rZ28fflMIiy+hy1HpTA9SvIStZIT5iDx9msl3euQmiEpbnsk1X235AOE6wA+8tBsKbwdAUAKJDPYAeVsu8TZrlRB4CwrW+ek/s77CNKnS+LPrZsXZDZ8l9Zs+Cn/dQMdIg4YW8DhBoUZMXh4sKR6HpC8pGBmTGuPBZ2sEs6bDSjOTobDT6sHYBTkJ4fV1e2eulm7aYRV4K9D7IM2DD0Ve8p0abLrnhb5yaHy6kG8vMq8LsUpV6UQv2PfqhH7Z2wM3vr9jgRH83qZmsOS72cpL1ICRCnLl8J7sTxXba+lRjv91vSPC9s16bb73A4BCQ4bjZ8/vA3nJ8OoCwieHc1DLMYd8l8/+DZX8Laxh285muvnQH6+K7gjb589lKLMm4jaJQP91n7rErZzYlrghu/S/NcPOn391LJ2d/2PS0lOWjWcfWuElfGPqa675G1JgWSHO1XRrOyzxXd1v1tBZsPueC7u6pTmfbhr0b3r8jQjUjJDHaCmFs/E2UJRMe76LO9xDeedmRlyTqKOzP8uZPv4XbDx89KiPMnwOy5x9mvofGNkxJaS3LQK94LsJeqQyVicfad20/DTeIYtftpj7ZOw3VMVN5MvleBtYx6Gbp/w4Mr8jor7PMM3qR5Wo59mJkhurLfk3PBGqZoQcvGHRgoO+TzN61CFVPd98vhWIFIwnfe081z8teK7orcStmtyJoB56za7reI+1/BNup/1qKKsOHkU64OMc0Eqh0ua58EBTj/rK84zWiuxNstM0n2OSpqXFZqpYHkKMHJjPBtrTHum8lzazSMz/Fb31wSaDX0CBzzLS9JWY7AgIAwQIPlus9spcMA9Lt5/BZ9lhV1sWXQ/UYruJ8EZq2e7GBsoPsu7K76r+gbC+FDYoCCLdz+K00hBemR9n2W4trJ3WKLjVnmcEFg5ZNuYcASAEmIx/o5u94+xnou6KPEO63e8LLgvTzPjJNp6wZ5LU/+BPXu8Dd05MRYg54Xu+EEXh5IZbD7yKM6lPIh2+7oU1YBdOgJBEOw3fVf1Vooy46sku1oKbPH3WtyV/soFMDkh28bmhWwbF0tOUDQrej3P1l0CmieQcsu+5AH81nybg9SqCOMkzedwIx/THu+CNg1XPBZ2VlAzByKKUDN9peRhGgDxMSCQsaeWb827Gcx0rBa0adgPnku6Koiu19i3arbOkZkkzx9mSOSBWSfgcAVRrQSuH+yHMiiIfsnwPyFZOAeMO3cZgCVd3jbu8a0gyYm5Aq45KFGH5xigTldhSQ02H+3uPKOVkq6xnlhWUihvX5UA6APTL//UXEHEn+fZEJ0Nr8wzpLOzEeGNuf/jhABmfd2caPdmxQAtL/lqPc2KngB+lCtruO+a/iMIMgJwVUFqhFqSYG+t7HDHJkVZCSDwTe0ZTFctxgcDvErv3pSpgYbAqpMMPtaaDdvrAf/lxmm+evkkSxIvb0Wj+JP4rx8YCBAU7FGFJc5/7bd+8OWbW+c3S3aYI8qjPey3EcHGiJx+z+5pzwqjPifSjRtE0fGRB4zr0hnx59av9FjYSYGRfRFlz0N3THDN0l2UzLALcHA5ILw/1mb5BgIVB6KNPb2cJHXMHVELB/R5FB/woQYHV3Of074syXnHDhxsg9ustgoAaYyMFGYKzlENkVeGcpZCYsyOdIHBzsKo4iK33Q2y02N0Iqsz1H3vxKrlM937sPit7vcEGfDiZX6WpLjuHs+sTnHbPaboXrwwuMgLqR771YwtyUn5AEgvBRHqorOcKgBjGgGJOjx3LgJCaGcSHJ2D5xLQqMMm5s7TWylZVx06056S3HRhqUIJFgSkBG/5fh9KrZKXdLXuo1hflUtTPQ5I4K/fefiu7vs7ICjt/qgir6LAu9nhznI34LRkXT1fDgjS6Wm65jgcaIx6u1h8V/cv8lvbvxCHr4woQLoNykAZuvfuTalEWM1w80A2JLvtrsJa+jwv43dArp9cak6D6VgeMuHs+rmMljDLyfNI4nQwDvO90/SWChzYCHs3dJ7ZWok5tugXqDnWVQFf6AMwBZl69nn+PXkUR6NOV0j3O1HxQZR7hbvYP3zvdIMP9zgVZd2URzgjwUAplDDLKRGeS7opjNr4s+vMrsz7Som3X/MlFSOchNJ4qHKG5njFzJCzwgwBx6mAIHpdkkC+j2K964FvCj6UrAMILiMGAu+lDZqVvVx8V/ZRUK7rPwWnPM+DakL2I0iZwfy50wvPR5XYeuvC5umJjuYmyS6WM/zWDkhBoJR9BAT+dfVa1v0dJLMJgJ913Wb5PJypm+j2/FjmsbDLW5QuOwBjDwdlofYrEQdmzMkKv0RnNGEUJ7vunvP8UQZScFs/F+O2CohqRDauF91PYOn6JyCQeTBaVRcJ5379hZ+jbi+C84TOC983zQPGF7EcAEik8qAH+P0Wy5DOcrLg2V+TW+LPrj3DcghnNtBZTsoN2ji0EPU6Kfa0aVNkXnU3k/ZKrO2Ky2/fvAQgAcwGYdlFzdfBHiUJzRoEym6vpd8o6T7WzUpyb0Ou2v0EPvoNz0uLsV54ogT8l58SVksFZO1AF/CNyonYq7vX0m43rgAUciHK1/m8m9oaKIVyeVrzQM2qPgrUVlOKG+6bhLJEnqBKQvCZExCXmQYKy7jXsm/UMk9+C9w4NO+TDLH3XNRVYTahrCuXp7VAgC09BS084wVTFCXgNRz3HA+PxYOnxkKWPUC5irNfu9jFuI2CzJkVdWh272jrhVO4ARx7OhuyuDAjmnX5AyDLzNlUEhCmKqThPPIRSGtOVuh5AJJUCQT6GyLvNoixV9SROb3BBYEUBChbn7OGIyi+dEEAJDj8aveqIJt8UxfXT7nMaJ3AZ+h2T+kYCYnuPqeDAnAc6VRmcSqMVDNk95RwOoEZh7PugGOVuNMrDSgWMvyPD3ac3MSVgCPjnzADAYgeAcHvLnR4ivseoZxn+cIZBiNjA8kZuH6Oagn3OvmA/wpSwz9/9TQHQeWlAoEsh5IyEYiL3QAdAbVmDADpAFs6oOJ8iSCIhG3vPgHEC8CVQQB8if0Nz4ysbQQl9g+mmIINSkCqNRFxrM/qq8Z0zVG1LuNA/nQQkWSqUqEwnfGA+3B+FaqZxwn+BoxKfG9zLhRZJggKBEu5uc8VEQbC6vEyP5OlbCD3IqAkOPARVZEaPbGnls1I9znCDKzPZwHwIJYY6nU4QdxN2g9G0CgxJ5d0gnITOhrlKZ6EzlKD6FJ7BJDnQ5D4y1JI3lT3/QsuTWnK8tE754YnCVm05qNQkvtlg6PyWW4ASA0CAge5cA+KCgAhIVvH4CwWUH1x9FE8QWBGg1e3kk9TvQ+1zom+wowHELNU3kQ5FwTfPoqZovs3ISKOi+eir0EFswWiwQv89k8O2TDUD4lQirPIrfMbVUDJUSqHAJBn9xDRVAR0JEnvMYy7F3K2ocf8Tr8Fbx3jgvo4FA8fE7F/+rCgTSNOEhT0Gt8VpEXAEUFt+DsMWUtVwo411mbpQDoQUfIY5ahSMQg0fM+0y8yYmOMLx+L/o1GiRsFZY6HgEIHDdSTanBgvSsLk8oz7pRFKqhqtiNBxlIngmf50BLI5jqW08M71Thxd0NnIguGMZjjFheAgY7oyG3D2y5nIUGS/oKYLSkc+vv+MJfgjIOxT0ATD5nONQc61sYeE7vwBXfUFlqMUBgA5EH1Ob3IgzmOTBrLmfXF2awhIrfB9P/EZuwGCknvD86u3r0tELZ0AKvDXwQGfqiz43B/BWArfqUpOUd5L2fMnQvZXSJB3A2z1MjQnEMXWYHwbKJILRH8/VQoc3w0RTIksGSBsyNeGlJcwJIpNI6SpAQ/phciAQovV7fvpPusn0vEd1NTA7EhnKol6lKlwfGSy807h4ensR7Eawf2RFyc2IaCtHkM1IZNGMJNwrvdoMq0hj20QocXsF2Bc3yTn7VR+g1lqGa0oE2fQr5znM6/MNSyFqjLMLe8xWNNdnKbpI7P7XwvaOGwfMsGbWYlATHyJkghSr8UMRSMYQefi2nwGkmZlbwc0zIeQzZk8N+w3p5RO9dzP4NAReJSgaNhzEHuHo3qkBW8eyVJ0hNceRLl8TQcnIPpxjyCYkj0WdETmJFZhUMA3wQwolMkkKLybVJVYgZBqyw6CGy4CiCrsQ5Ict/EzKKS16DrnHkB0eeQiIqHDIe2mc3QimVcd4Myf7KOOzHPiixgYVSPysIkrUvsaoi8ZDwrSbh69E5HQIk/tzK9Sq3dE/Q8ESY9ghGBvdQrA2c7dgFODEY3+EVbTB1L9vC19QUEwEcGSANJXcNCX+BkMzvgZEfcZeYrdPLJiAupwKByDkjP4t+DNo9wREN1SvQ4Km0eWG4iJihAEllRO+Mm+5wGcvx/7f1meIbpqKDneyNQNLH3IwFaQrlfQHBZxXwTDvaij85ZkhthLVvA5yYXqexDpWgulywp7FmE/Btkd8MdqqkvYNxNNpw/A+4KiJCPgpDrrun5yyXbYfAVZXIE24ly/ICA14NB0Nr/B5qPSsILVKHoJckNUIZ23CcvBqyeZaPjShQfmH3YVoTulmiCyUSQwG0hYlCo2YyU5t6XwbjSupwlJrjg3RRBhqLWzVTnIbr44O0XtVxgxlKPsOZAVal/AdH1T9ESVj4WQkSVQLq/QEfO7OZHu4JAVtUDQlZJddqrBkHjZHE3iYXUmRKkbZ2sqyc47aiS77qrKgArb8YMkIoMK0iJhWxTOu0CVo+neh7hX7TTwVPC2sQi8rfIyL0sKMqLUM7958QzSFp396ZVshIWNLMi6dhaaNpI8RUI2znsfQoY+yk8MVj9DWa3JUkvHl2EP1SfwhdpzJV9V7X79LF9ePrmvPodl7+XDO7AxR22qqeo+XWi0XNWOOw1RxYhlE8bumCWL9Y1amx0qaynJnmkduOE79QDlgGWooBbCARwr8F5Eolr3ryPTSHa5N7yktCAXvBSo9iePwTF38X3yFY1j94xario2EjnHNVRqqW77SKLqRJj8xr04hSaolNwJ59apvVM85CrB4ndIshzikYAphyP2/4yon03QVOLnfaEAjWKB8zg+kwFFEZCfFKoORvk8qsKIAzNVnzBzyKuMbO7L5hmdvnp+gs19OCJhqS/KjFeDF6SuruIHSQiy22q2PknVqa92i7MScV9C+e8I7E8XmyeUj3nqA7IBTjYAYXdMZRCLaCG5E22mIyQo66eAKAUKCddNBU2WmgWUlQXp0er36RBITwEPqMbH265SD01Zm4iDvysrVaOTnTCfEbZrojo5ffOiUHV2zLHF+N5E7NFdwBGq8+LsVuKsa+QNVBXHM9dtfoFEHoC+pQOU02gVRKrChHPrVQDQREpWuBNk7D4121iGeV51wgBnsy/i+JvBRydRBECVqYCw42Y1UEfiB8rH4iRm+okAsYmmP6hKORbh1JbgkWPRyatqiUHOtoAN5asnuQLx8dcASXAw47BMOGh7EOMpDwBMLjaLVaN7tap6mHp0KKUZO1I0ZeK/dgB4ZKqqbhitzLTHyCge+Doc6rPUCL1Ce9XweKiQeIeNaidOQ98UFwhHGXQAGk6V3NO9Dsv7t2+E4waICCibSeIByYhOu3x0DScxGjlBzUsMVd8/EBD0SKqUZT9SlJOM85ip04YcZCVtocMfI+uYrajvQk57Aqcw27iYRRz3JF3aoWYC34tE7C1/T0F7+Toh+ug8tddgtkJM4Mx70DzuUQFh70E+VMfn8GOE1UwVVH7GP3bgnq9QHdhEPkkN+3NAYqwX7UevcQxRVJVkDdmnRjmQP4KHWXB2z5L0AFmjs5xCiaq79GOzx5B2qSAjM6R3FZX0EYWFSMt0jXV9ZNFB9A2ZvA8E6RFjvUCfkRuybdxplA0zlgfWeH6GZqsxhMAFlJQZpc8eqSUMWfsFJOJJODvXeXqrHEhJV3TgHQjIu9KXwi4fpWk19H4S+ow8qL1riY5bRuQgoLD/ashUW2TCZ/+0x4X3H4STd6rveSJd6bi9iPp9fB6nBGiA8dy1TVFqL0JEjEXzyiavDaLeGWs8o5+9CbM/4fwm9A6bKqJcmqM8Q40N84Mv/GB3MH1CVcWyjc8FTa367oSzNQbCnwICllcoJ9N9jutx/JDsbCkZvjYsSWyWXkABqV9EJqy5/GMzDiJfI0pcwCV3KXVDd04MZn0FqUq63/HaUCbq53DAjTj71W5ofF6FWU76mdGGngYSdUI+SZslhuMG3NeOoxhEsMerp7koBUfqQkJmcwaF0qW9fmKJL4LgPZrA5eiL1GEeMirg4sTGCrjsDhpaFzjhsdvstnbMOMjIlA/jktrl9uxECTnFZpCKqYyZTpv81g5g76Hw3QRnVeFW01nCOrEnubKg4246Eqs/pwhYVp6Lu/D8QqBYEqEq2S+Vsa/C3vdx5gdYT2C/DTkWvlMXS3vghiFqppJf/xQQRB878CI0UdVJZFQ+6d5HOMIo0ZoNT1XJy+ewHmc6aAjv50S5VWN0P0CawwDbixMbsX8YTUWDiDrE/gTp+yPJ+3lepkqyIOJqt86bVYQO/43dNRXVU9RUkjJKYGt3OB972JLYkYWrCGjSpe3TSiAY2Pkj6qs9SY2oxZ4HwE7kM9BYHufLH6oXljRwU63cmPL3NpoVvZVUjwM1f7cH9R6yuRB9xV2OuTlvQ6ecA8c94syNPEMeQAa1Z/OGzNtApYjVgz0J1maf5d0FEpuTi9/LE3jyDVqBZPKSmjnkL2QxRzAUE1y0HwGpTpfJJ38OiMU4NnhP84AgZWnZiwL1S4ieYhhwhySL7BjBeVbChc1LcqI91fLFXgLk11IdBNqvOUypB2OK/dcNesg5FiORUcHeJRmSGgeuxBc34funR78teyGlxfnqs1I9rSq6zGytwBh7AhK2e+oGNqqowVM5PcjUnlXrNstU8YNEllJnToihdGrngt/IAXRQIgQCf0cEh7Hz53yL9ryhPQggBNgTgHD/vwkIyvZ79E43KN358qqsOE/NfJI6FRmX+jz0MB9VZDkgSX8MSNiuyW88FnYuQx+yLF1zZDaywQROWui1tNsbRHNsioslldUSjjLg5MEcgZDA6YAUt331GY0gQUe+bXM34XsEEz9q78I7MeoIhcqEagafV0L6PkUaP0IfYZLivmcu9jOGDN3IjICKOl7GP73U2jX3Wmr0zhmfgdj5yrgzHcgegZyA+p4Mp73mO4YklCP2CUmQtMkuu1T1BK7REHiUUNN0zdFZ6D9gz4EFiObXwVvG3PxvAgJ7HgPofLQAi8BDi8GnS6D0WjJrKX0/XawgBIMgFIFr/xCQcKuZxRxBqGOHeYYf1lfqwA+qIpAvrdDaz+N1GDyUUU1VleqpTnQbMBojD8w8m4LGzU0FZI5faVGu2lByfBFxYAZUyzT2MJVAcsncnxlwZf5XHHMofF/CiAeh7ucbNgoIgNQHPJDI8QmvQXqeRHNZ4cE1V86E+E78BcFhJJI3+HKH5StTe45KyPGf9nz1++Jnul1TtH8ICDgBoPwpIDrIXILBBfJO5t4sofTX5anNlFSvA1PIkf/u6H9ZsPHpndj/eI19wnsc4CW4whAIfoHU+gckcCufFT1LQbpJyc67qBiWcP4DJwwqQ6khr/CVK6KyvmYlMmT/dMdEyF+XWW1Qaub58J7n+Zlqs8mu+MNfVHD0Xgpw0xEZTaHTm4PkGmeG2H/rNF2fL5tOMeULkNYcgTMSUSoHgIjDzo//XIEDdvIPJsBrKQCklEBw5F4uVU3VppDORsYHcZqMLO5YkPbBnnjfljjnc+2mkWkqICingb9+9xDqLodvSgkISil7jXaQ85xGb/yfgPTgPIpT23IpDEDwWSm+kwpf6CHIarjNalsvK+x8VeX9O+F0+w8XAKPSZCP971miTntRdp7y5U5xTvkLF76uhAopgnpJZ4eOfmQip7noIYzZZHE8TW5BuWjNwR34YTdrNg+IqLlLGclRTCx6EDZtJDlkTiVOa3X7fo7hy38ejDU1znZFHQ7Z0PfYvXn5TP1bMGp43e4p6utWdvm+q/s/hcFv2GjBEZcZ7ThjVWYIpwdhu6ZIIjrwbJArhEUo35GzlBXnJJXbA2lLDgnaOCyrHBBb8f91CH4f+oScyD9v0oF8oRzbEAD3uYbmAEU0pj0/AmKmArLMCFnSVW0Gr59cAhXW9S2kbwI5hMNSZLPaU8EmtYf5o8Ueh0NH2l+q/mVMvMoxn6isvkVpXoer3/W3ES5Vlawb9BzRmEaHpHrur09SR3QnoKarEYl+Q+JOrzhNKRxzcskwjhRgkCfvg3IarI4rUMaQZVVQGpqDZyry5RR4KYFg8OHMHMjm1lfmdVQgke1Y5lI9rBoBkOrRxxdS63M8UTFw/aAycEB+BoCOPDzHhNNUPNOc56BhEftnMkO+YAaBY0I0K/soaZ6HatIW/uEAz4pMe4qMuMdSR/kJx4XwrR7KrwFlMDko2nrhCn6G7JwO8Ojwj4CsLAfkG7XhZcNHQMB1b8GNN/kqW73+oRkGJwIcgz9e01uJ04xWanNNLuaIhXMtgiKcVvIPEVCH9TjfT0EpuBd0VkjiGtNerykdOWuKObHE+vJPLfBZj1zU2jOopzEO4xookKkhnD9RBSGbOjJq1Ddym0d6UhbjkKVQceZ8t0BHBm4c9rSs+BH4xYc9kARbjG1//odG7EO8OS0AYJZ8n4Du2w1gXsRez0nw6HV+YrcLGVwTzsrks8E/OmTeadTvLHTT7iyT4IBUt1ntYM+p2uX27EOmnWPXr3gv7/GexM+MgQgZwj9WINdEHTI5AyDVYILoyOAfYnBSgGd8Sw7Deo+VDifedZ7R6hECdULE/mnCHoTZDbvSL01tdgfff4z7jjNT/vdlIC7GBuI4qYmcGVGLmch3+RAuN4Vvq1ZAx1ui96jM8QUyRT6MkbeiY16NSFNJiIoJqboUZHgbEfgMDs9Gxliw8XpX9kpKn+Sof6kHxI2CNgz1o+6HcQUgch9kSwe1G7ZddQiKyJQDN44w1D9M8DrUAA2gNcrTxA+qrDs64itweh77o2DzUdfwnXGlhQ/VQebbVy/IYQ2RhTYoOY/BDUVQgTGpHvuG88+MUF7nx9qu3At7qpbbc0h9xwN7tkA+r+X/aSMjExk6DvtEQJgU4ax5sMku3f9Ek0LUdja7uK4fe3qFNdYFLG9kpLrAX99ykJjouGUdAuEUssUbKhHXVvhgreX45S8t2/LFMseySb/8HwAAAP//AwBp5/TWdzfcVAAAAABJRU5ErkJggg==</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>
+MIIDDDCCAfSgAwIBAgIJAMz6yMoxs++OMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC2lkcC5waGx1LmNoMB4XDTE0MDQxMTA4MjMwMloXDTE3MDQxMDA4MjMwMlow
+FjEUMBIGA1UEAxMLaWRwLnBobHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDN8Hd2rr6FkYwObqy/Hech8EU5TAiPdel9S4aV4G8cTFpF6dCQyKs8
+tvQPMIz5rsQrtN7Hkf+Oeyy12hZsPDDBk7Y+UCGt4kFhqE1H9ZAlMRi1Ja1Gywdf
+cmZNLVgKgR+njH0AT3gFTjGae1X3Eg1wpbfg5ooJ3Ch8PHxCJsDNP4WgcX4AU+Ss
+1T/ZEzUqfmmqDpq10UPluFDgXujGlRwWqiC8oQGc2Z3PgpJnt8lxWMOhdPGgxEFv
+4TJxUAMyYve3lpkBGk8IN/LWkcsWa8cuks5LzQXralxRofbDFMm6IWdpnaxJ6iZm
+XxlgoU9Qaw+Vd7R0AZ9WsAy2rjkBuWNjAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
+cC5waGx1LmNohiJodHRwczovL2lkcC5waGx1LmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBSkYIdFzSjghnTX5XR6eSSUqOdeTTANBgkqhkiG9w0BAQUFAAOCAQEA
+B1dxA2mQJ6A4Pm5YJdWETk0TCbXKD10r1ymx8Hzj4Bn0NV56Mh6WwVRqdU0CQB+h
+O/hDRztPNkO3HAlMSUlRbYtoRJsAdR0GqQAjXmi6uBuTvi4I/XSwc/MZ+o92HY2c
+coea/JiP9MbEBiuLjlzrNEamEdKLUkr7K6zSXjQJefN+7Gn4JwUf7ppMqtrSW+PI
+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>
+MIIDDDCCAfSgAwIBAgIJAMz6yMoxs++OMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC2lkcC5waGx1LmNoMB4XDTE0MDQxMTA4MjMwMloXDTE3MDQxMDA4MjMwMlow
+FjEUMBIGA1UEAxMLaWRwLnBobHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDN8Hd2rr6FkYwObqy/Hech8EU5TAiPdel9S4aV4G8cTFpF6dCQyKs8
+tvQPMIz5rsQrtN7Hkf+Oeyy12hZsPDDBk7Y+UCGt4kFhqE1H9ZAlMRi1Ja1Gywdf
+cmZNLVgKgR+njH0AT3gFTjGae1X3Eg1wpbfg5ooJ3Ch8PHxCJsDNP4WgcX4AU+Ss
+1T/ZEzUqfmmqDpq10UPluFDgXujGlRwWqiC8oQGc2Z3PgpJnt8lxWMOhdPGgxEFv
+4TJxUAMyYve3lpkBGk8IN/LWkcsWa8cuks5LzQXralxRofbDFMm6IWdpnaxJ6iZm
+XxlgoU9Qaw+Vd7R0AZ9WsAy2rjkBuWNjAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
+cC5waGx1LmNohiJodHRwczovL2lkcC5waGx1LmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBSkYIdFzSjghnTX5XR6eSSUqOdeTTANBgkqhkiG9w0BAQUFAAOCAQEA
+B1dxA2mQJ6A4Pm5YJdWETk0TCbXKD10r1ymx8Hzj4Bn0NV56Mh6WwVRqdU0CQB+h
+O/hDRztPNkO3HAlMSUlRbYtoRJsAdR0GqQAjXmi6uBuTvi4I/XSwc/MZ+o92HY2c
+coea/JiP9MbEBiuLjlzrNEamEdKLUkr7K6zSXjQJefN+7Gn4JwUf7ppMqtrSW+PI
+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:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.phlu.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">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.plymouthart.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.plymouthart.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c2190b4a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.plymouthart.ac.uk-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						LmFjLnVrMB4XDTEyMDcwNjA5Mzg1MVoXDTMyMDcwMTA5Mzg1MVowcjELMAkGA1UE
+						BhMCR0IxDjAMBgNVBAgTBURldm9uMREwDwYDVQQHEwhQbHltb3V0aDEgMB4GA1UE
+						ChMXUGx5bW91dGggQ29sbGVnZSBvZiBBcnQxHjAcBgNVBAMTFWlkcC5wbHltb3V0
+						aGFydC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMuIFsdU
+						c+y05uTuTyjK5jSvxJvPlF9ZSqmKnGstje0V6GfqTME3qc5YlUzMnX/00EE6Uj3f
+						27/1CcK4OLtjpztKVr4qd1vCxZu/5ckFSeK6QXoedjoqHKrF2dx6lMbrBVKWroRb
+						DjyHoZoABZQWhFfwxy9GBrP0i8vY1RDtEv0WJtwd+XBvt0X3Ab6C6qesEhksOkgW
+						muKQenmFiooGtE6twwAAWsjTmvkcUM4nfu28sJxK/UAzbWr7ylzHstz9OfsV1kO9
+						JYYOnq1ohZNsqvd8xg863qpvbxpTRFhn1uwsG2m8Ig1+EJOEgVfWRQDRUAgQSFF3
+						DR7byOg+8aP7xU0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAt3NYYkRNcMHka5WD
+						OWMn3/l8diGWK7MLKi1YhnWaBBnXSTRWMaqJfNvVfE6+kMYOPZxJc18lbC2lfFBS
+						Sa92TG4RpqDZJ+luVcXPZT+2Y68Xp2IgtB4437xBxzw9DI5vYDDXNYIlid0FQx+J
+						IBxUEOK3w1/4uDx/NR/twduiwhsPzyU9Q+ySHW1rOq/XmDl7gL/0qQGZcu0E/KOt
+						WLYmkw40IuvpMB25QnoSiaNzaQpa+niEYb0klHpAE4LE1LVy5ODbRT9JF3p9X9xu
+						+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>
+						MIIDYDCCAkgCCQDH/h0V1jAUjzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
+						QjEOMAwGA1UECBMFRGV2b24xETAPBgNVBAcTCFBseW1vdXRoMSAwHgYDVQQKExdQ
+						bHltb3V0aCBDb2xsZWdlIG9mIEFydDEeMBwGA1UEAxMVaWRwLnBseW1vdXRoYXJ0
+						LmFjLnVrMB4XDTEyMDcwNjA5Mzg1MVoXDTMyMDcwMTA5Mzg1MVowcjELMAkGA1UE
+						BhMCR0IxDjAMBgNVBAgTBURldm9uMREwDwYDVQQHEwhQbHltb3V0aDEgMB4GA1UE
+						ChMXUGx5bW91dGggQ29sbGVnZSBvZiBBcnQxHjAcBgNVBAMTFWlkcC5wbHltb3V0
+						aGFydC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMuIFsdU
+						c+y05uTuTyjK5jSvxJvPlF9ZSqmKnGstje0V6GfqTME3qc5YlUzMnX/00EE6Uj3f
+						27/1CcK4OLtjpztKVr4qd1vCxZu/5ckFSeK6QXoedjoqHKrF2dx6lMbrBVKWroRb
+						DjyHoZoABZQWhFfwxy9GBrP0i8vY1RDtEv0WJtwd+XBvt0X3Ab6C6qesEhksOkgW
+						muKQenmFiooGtE6twwAAWsjTmvkcUM4nfu28sJxK/UAzbWr7ylzHstz9OfsV1kO9
+						JYYOnq1ohZNsqvd8xg863qpvbxpTRFhn1uwsG2m8Ig1+EJOEgVfWRQDRUAgQSFF3
+						DR7byOg+8aP7xU0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAt3NYYkRNcMHka5WD
+						OWMn3/l8diGWK7MLKi1YhnWaBBnXSTRWMaqJfNvVfE6+kMYOPZxJc18lbC2lfFBS
+						Sa92TG4RpqDZJ+luVcXPZT+2Y68Xp2IgtB4437xBxzw9DI5vYDDXNYIlid0FQx+J
+						IBxUEOK3w1/4uDx/NR/twduiwhsPzyU9Q+ySHW1rOq/XmDl7gL/0qQGZcu0E/KOt
+						WLYmkw40IuvpMB25QnoSiaNzaQpa+niEYb0klHpAE4LE1LVy5ODbRT9JF3p9X9xu
+						+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>
diff --git a/swamid-interfederations-2.0/idp.polytechnique.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.polytechnique.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..2b4619a1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.polytechnique.fr-idp-shibboleth.xml
@@ -0,0 +1,58 @@
+<?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>
+      <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: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>
+					      MIIDOzCCAiOgAwIBAgIUenAlQJGY5nvpRbOTuDq3P/4fTVYwDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAwwUaWRwLnBvbHl0ZWNobmlxdWUuZnIwHhcNMTUwMTI5MTUy
+MzQwWhcNMzUwMTI5MTUyMzQwWjAfMR0wGwYDVQQDDBRpZHAucG9seXRlY2huaXF1
+ZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwd3SB1Lwii2xUU
+yoq487drsFL4bpi4zVj/iwV6mYXBfV/bVQrW6PMxfr8T5OIHCRNe3CvAIS0LIlKb
+jLoqaorF4D9daJSR+S/v5qSm7nFmjp0O4SxommuOjHgn1Y/gwUOQrMsrREo71CeR
+7WqXsdvxAs35OO0fit0cTavQjyuiYT45uvvInMHNw3iClh0omueHvP02HYZBFW4M
+LzKLtC6mmz+4PbFXvXrkexwMz2+U0+k+ctP9ubBHIcLJrMULeemEOpbMlY9JAXAf
+7JqV9dOI97DeZec3kE+O3YgaTxZ3a5a0CVdR9Bwjozx8FvPp3FCloVER3OOOkJc5
+2aQYR1sCAwEAAaNvMG0wHQYDVR0OBBYEFK85QKHZCd+M/76TQtYrhl5Kk6+TMEwG
+A1UdEQRFMEOCFGlkcC5wb2x5dGVjaG5pcXVlLmZyhitodHRwczovL2lkcC5wb2x5
+dGVjaG5pcXVlLmZyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQAl
+bSG2vkSOBwry4bM0iju7l7mTV0+xWjEA9hFWBc7cFweQWwKVuw6KseQnGm1iVS1K
+LIH8lpiWW6XD/GPhqNia3iyG4OLuX91bnT1a5onOIt+bLise5bc+Q5oSe+vF3HBb
+6rlumrLdMDn8QFgXhQyVMIbj7br12vn7/0bCyYedqDgDsmr4Vjk9D6oV9ZBjofnV
+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>
diff --git a/swamid-interfederations-2.0/idp.port.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.port.ac.uk-entity.xml
new file mode 100644
index 00000000..f0c37d70
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.port.ac.uk-entity.xml
@@ -0,0 +1,104 @@
+<?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>
+      <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
+						Zm9ybWF0aW9uIFNlcnZpY2VzMRcwFQYDVQQDEw5pZHAucG9ydC5hYy51azAeFw0x
+						MjA0MDQxMzIyMTZaFw0yMjA0MDIxMzIyMTZaMIGRMQswCQYDVQQGEwJHQjESMBAG
+						A1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpQb3J0c21vdXRoMSEwHwYDVQQKExhV
+						bml2ZXJzaXR5IG9mIFBvcnRzbW91dGgxHTAbBgNVBAsTFEluZm9ybWF0aW9uIFNl
+						cnZpY2VzMRcwFQYDVQQDEw5pZHAucG9ydC5hYy51azCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAOVFjymX7M8xWKzGhKlZ5/3aDsDeWjQ2oeooO1MSaFbT
+						j/pMtOC3Qrsa7P3Hhwshh5m0nAYTqpdl4NvFFOiMv0WMmKiNDKR3DvrF8p5HP21Z
+						NFFE1EI2K+ciRUpFgFg/+Aiy/J8hiiFvNgY/K1Bu7YzmJHakrrnQRn/1J+vDq7GJ
+						E/9GUz5rqVBjh1Ny+346Pls5SYUf5aj0H5KmD83TRZsjfAQecl4hxsbZTmZQmn/1
+						OTtqBp0yDy3DZYTWoeJ9ab2Smm+KRhP67rNG568S6hRvAPwdOxxQOnLZtZVbZJvl
+						0zjT4no3JBBoJ+25Xdb5LiQKBLh4Q1e0Y0cDW4gPd+ECAwEAAaN7MHkwCQYDVR0T
+						BAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNh
+						dGUwHQYDVR0OBBYEFGfthAjlQZ/cBPBgNARSaZC1cAfVMB8GA1UdIwQYMBaAFGft
+						hAjlQZ/cBPBgNARSaZC1cAfVMA0GCSqGSIb3DQEBBQUAA4IBAQCqBvYpE7bPdaOa
+						OLoDnDySj0FdExCJCQpRGE1nFQ1eT4GrDjlPO2QE1jE2tStS6Wv4ZuW1qJyuEJDe
+						fMJn7xtilLSDpzvocxhDGoF/SgDdDA5wpHt5iz/4e1wfDHHbUwxDiCXSYSPTn55u
+						2ElvtdyQiiagoPkaIMoco3XKIyIG6LGoZPeFp0FS6GV541T6yJOzE71nCwJZ+RWA
+						iAdkoJsFOs+PgXPPlN9hdEmspKrAKnp9G7JeIjc6at+YijvkSoCmRCdqNFj3jwDR
+						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>
+						MIIEIjCCAwqgAwIBAgIJALf8bLjT1bnmMA0GCSqGSIb3DQEBBQUAMIGRMQswCQYD
+						VQQGEwJHQjESMBAGA1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpQb3J0c21vdXRo
+						MSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFBvcnRzbW91dGgxHTAbBgNVBAsTFElu
+						Zm9ybWF0aW9uIFNlcnZpY2VzMRcwFQYDVQQDEw5pZHAucG9ydC5hYy51azAeFw0x
+						MjA0MDQxMzIyMTZaFw0yMjA0MDIxMzIyMTZaMIGRMQswCQYDVQQGEwJHQjESMBAG
+						A1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpQb3J0c21vdXRoMSEwHwYDVQQKExhV
+						bml2ZXJzaXR5IG9mIFBvcnRzbW91dGgxHTAbBgNVBAsTFEluZm9ybWF0aW9uIFNl
+						cnZpY2VzMRcwFQYDVQQDEw5pZHAucG9ydC5hYy51azCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAOVFjymX7M8xWKzGhKlZ5/3aDsDeWjQ2oeooO1MSaFbT
+						j/pMtOC3Qrsa7P3Hhwshh5m0nAYTqpdl4NvFFOiMv0WMmKiNDKR3DvrF8p5HP21Z
+						NFFE1EI2K+ciRUpFgFg/+Aiy/J8hiiFvNgY/K1Bu7YzmJHakrrnQRn/1J+vDq7GJ
+						E/9GUz5rqVBjh1Ny+346Pls5SYUf5aj0H5KmD83TRZsjfAQecl4hxsbZTmZQmn/1
+						OTtqBp0yDy3DZYTWoeJ9ab2Smm+KRhP67rNG568S6hRvAPwdOxxQOnLZtZVbZJvl
+						0zjT4no3JBBoJ+25Xdb5LiQKBLh4Q1e0Y0cDW4gPd+ECAwEAAaN7MHkwCQYDVR0T
+						BAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNh
+						dGUwHQYDVR0OBBYEFGfthAjlQZ/cBPBgNARSaZC1cAfVMB8GA1UdIwQYMBaAFGft
+						hAjlQZ/cBPBgNARSaZC1cAfVMA0GCSqGSIb3DQEBBQUAA4IBAQCqBvYpE7bPdaOa
+						OLoDnDySj0FdExCJCQpRGE1nFQ1eT4GrDjlPO2QE1jE2tStS6Wv4ZuW1qJyuEJDe
+						fMJn7xtilLSDpzvocxhDGoF/SgDdDA5wpHt5iz/4e1wfDHHbUwxDiCXSYSPTn55u
+						2ElvtdyQiiagoPkaIMoco3XKIyIG6LGoZPeFp0FS6GV541T6yJOzE71nCwJZ+RWA
+						iAdkoJsFOs+PgXPPlN9hdEmspKrAKnp9G7JeIjc6at+YijvkSoCmRCdqNFj3jwDR
+						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>
diff --git a/swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml
new file mode 100644
index 00000000..800f6a7b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">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>
+      <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>
+      <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">Pázmány Péter Katolikus Egyetem</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Pazmany Peter Catholic University</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">PPKE - Pázmány Péter Katolikus Egyetem</mdui:Description>
+        <mdui:Description xml:lang="en">PPKE - Pázmány Péter Catholic University</mdui:Description>
+        <mdui:Logo height="86" width="86">https://idp.ppke.hu/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>
+MIIDGDCCAgCgAwIBAgIVALqsFrR4I9Bs0KO2BfLx5BkiO3BEMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5wcGtlLmh1MB4XDTA5MDkyNDA4NTEyMloXDTI5
+MDkyNDA4NTEyMlowFjEUMBIGA1UEAxMLaWRwLnBwa2UuaHUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC2OUIJ85ChB9LqQ+KHBXLtCODAr4phVIYGiTp3
+qDMHOOtGBNUKoyq9AMyVb8nk+coIA0+v5yHOdWHB2ZLz7T7BE2XqWYP/LjW4o6Im
+BcPnZO3CMYH+EWaxgqvpoS12DlEd9dCJqGqNmL7NYFM/+gX4FeHOCIIKN86ol8Kq
+up/OVvF9KpzNVaPiVB5UitWO7FG3ZStIGa7kXM3VZW6DpN1Hfs4eQxNPzl0L9em1
+SMh1KybUde8w0eDaTJHWDvC8W+jwz+3Qc0HHX2BO0SX7LjrJ0/sjU6fEWEP/Q6tA
+pcb4pKxtcWPBC5cdRawyXx5eixirnHafNmWXZf3vqCbd4u67AgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5wcGtlLmh1hiJodHRwczovL2lkcC5wcGtlLmh1L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQVA2Fh1jDMY7aRgf+BHStRAVdNkjANBgkqhkiG
+9w0BAQUFAAOCAQEAQkTajo9mUk/O/yyDv19cb3e9du0FH8TSY5YYYUEsW8xQf5tj
+7JKavI82FK0ixQnBW9E9I2GEtefMzk11g7DGHujhEyPR8OYoCpCH5UpsxHR06+ZH
+5kf7bVRxj3FahhgFYCjKQJ8gkmuem8wVd8BkEvnFjt4aP61+Afe+mcNjTm3IYN5i
+BZPMn/4xpHqDvH7tong+nXD58mMBtDv+JlwVfn7uq9C+OoPMaHWKgt+Y3Rp15/pd
+TmVzZFjzHxc2OKGM6TRP1woQ6CEx3M3qiCXtP57nApLg0XNLtrMM3jUpEECXyrM4
+vr6mdBVJqDJAHkr0Ej85ZP84waSs/Ojj5U5etQ==
+                                            </ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.ppke.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ppke.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution"/>
+    <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:Organization>
+    <md:OrganizationName xml:lang="hu">Pázmány Péter Katolikus Egyetem</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Pazmany Peter Catholic University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">PPKE - Pázmány Péter Katolikus Egyetem</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">PPKE - Pázmány Péter Catholic University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">https://info.ppke.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://info.ppke.hu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Csillag Tamás</md:SurName>
+    <md:EmailAddress>mailto:cstamas@digitus.itk.ppke.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Csillag Tamás</md:SurName>
+    <md:EmailAddress>mailto:cstamas@digitus.itk.ppke.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Csillag Tamás</md:SurName>
+    <md:EmailAddress>mailto:cstamas@digitus.itk.ppke.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.primarylogon.co.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.primarylogon.co.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..e462fa6b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.primarylogon.co.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.primarylogon.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">primarylogon.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>
+						MIIDQzCCAiugAwIBAgIUQ20GO37EJbue7ZaBBSMki0eG82cwDQYJKoZIhvcNAQEF
+						BQAwITEfMB0GA1UEAxMWaWRwLnByaW1hcnlsb2dvbi5jby51azAeFw0wOTEwMjIx
+						NTU4NDVaFw0yOTEwMjIxNTU4NDVaMCExHzAdBgNVBAMTFmlkcC5wcmltYXJ5bG9n
+						b24uY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHJq+LMWRR
+						EN3RrE7Azt7yhROagAU9o+LqtbnbsAOOisiNWbbrLcsO4BzgSFZ3Zvge9YbBb1VC
+						axUOAr5ZzqId4vl/OAO6rIWZ+bGbB9RRTnTI5Rd8C0s5tePvBiiDZZh1AIH9PrIe
+						E61txemyE9tVB/PiAhB9ozll1PN9e1tZdaMd6f/51ulAU0HTq0RS2DUwhkuD10un
+						accS7y+ew8WrnTSlU2x5wkEJUS/ZLGkKB9q03ahqQuzJL0R0yaxRUv9inr6Wj09D
+						wJOJWlDDmclQ4lgKZ2gHSPWUWvKhXggUJrGKnSJqAxRxbn/lxowBl1ErMRoG8LNi
+						cmMl2GmYZgZNAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcC5wcmltYXJ5bG9nb24u
+						Y28udWuGLWh0dHBzOi8vaWRwLnByaW1hcnlsb2dvbi5jby51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQUMkwl5JK1XdA5VVLrjQ3e2mYUX8wwDQYJKoZIhvcNAQEF
+						BQADggEBADiFXuTUWkokd4aKWZcZfBAJboPnFiQu/LlfSuVaAjESDRgKMlOMfXdt
+						OKLHm0bYtODsDjibIfGZJo7kmJaeJdax2lMrU2jFD6TXZpKmUpYfBi/oiDfEfiBt
+						OLkHmpVbD0g9i/dSb2xiMTCsLiyZe18D9dKskIKlcO4p3X8TrpWRYQ7CqO5izyr6
+						yFjqUtWwlxtWbYmA5PJHZpJAOgG98vb7nrptPbb32axj72eB5dL4F7frICwxernU
+						/0T6Ly1eo1rVrkAdRm2QIJyQZYe7jvPoEsIsq639OXrXDqED+7oKUf6GZYbjIu2Y
+						zRa5RaATgOB2sVdg2eOTs4eqQd1dU6s=                        
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.primarylogon.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.primarylogon.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.primarylogon.co.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.primarylogon.co.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.primarylogon.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.primarylogon.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">primarylogon.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>
+						MIIDQzCCAiugAwIBAgIUQ20GO37EJbue7ZaBBSMki0eG82cwDQYJKoZIhvcNAQEF
+						BQAwITEfMB0GA1UEAxMWaWRwLnByaW1hcnlsb2dvbi5jby51azAeFw0wOTEwMjIx
+						NTU4NDVaFw0yOTEwMjIxNTU4NDVaMCExHzAdBgNVBAMTFmlkcC5wcmltYXJ5bG9n
+						b24uY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHJq+LMWRR
+						EN3RrE7Azt7yhROagAU9o+LqtbnbsAOOisiNWbbrLcsO4BzgSFZ3Zvge9YbBb1VC
+						axUOAr5ZzqId4vl/OAO6rIWZ+bGbB9RRTnTI5Rd8C0s5tePvBiiDZZh1AIH9PrIe
+						E61txemyE9tVB/PiAhB9ozll1PN9e1tZdaMd6f/51ulAU0HTq0RS2DUwhkuD10un
+						accS7y+ew8WrnTSlU2x5wkEJUS/ZLGkKB9q03ahqQuzJL0R0yaxRUv9inr6Wj09D
+						wJOJWlDDmclQ4lgKZ2gHSPWUWvKhXggUJrGKnSJqAxRxbn/lxowBl1ErMRoG8LNi
+						cmMl2GmYZgZNAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcC5wcmltYXJ5bG9nb24u
+						Y28udWuGLWh0dHBzOi8vaWRwLnByaW1hcnlsb2dvbi5jby51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQUMkwl5JK1XdA5VVLrjQ3e2mYUX8wwDQYJKoZIhvcNAQEF
+						BQADggEBADiFXuTUWkokd4aKWZcZfBAJboPnFiQu/LlfSuVaAjESDRgKMlOMfXdt
+						OKLHm0bYtODsDjibIfGZJo7kmJaeJdax2lMrU2jFD6TXZpKmUpYfBi/oiDfEfiBt
+						OLkHmpVbD0g9i/dSb2xiMTCsLiyZe18D9dKskIKlcO4p3X8TrpWRYQ7CqO5izyr6
+						yFjqUtWwlxtWbYmA5PJHZpJAOgG98vb7nrptPbb32axj72eB5dL4F7frICwxernU
+						/0T6Ly1eo1rVrkAdRm2QIJyQZYe7jvPoEsIsq639OXrXDqED+7oKUf6GZYbjIu2Y
+						zRa5RaATgOB2sVdg2eOTs4eqQd1dU6s=                        
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.primarylogon.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.primarylogon.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">Primary Technology Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Primary Technology: Primary Logon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://primaryt.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>McLear</md:SurName>
+    <md:EmailAddress>mailto:John@McLear.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>McLear</md:SurName>
+    <md:EmailAddress>mailto:John@McLear.co.uk</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
new file mode 100644
index 00000000..0f0aa10c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.protectnetwork.org-protectnetwork-idp.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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>
+						MIIEMDCCAxigAwIBAgIJALJxC01MGf/hMA0GCSqGSIb3DQEBBQUAMG0xCzAJBgNV
+						BAYTAlVTMQ4wDAYDVQQIEwVUZXhhczEPMA0GA1UEBxMGQXVzdGluMRcwFQYDVQQK
+						Ew5Qcm90ZWN0TmV0d29yazEkMCIGA1UEAxMbdGNhcy1pZHAucHJvdGVjdG5ldHdv
+						cmsub3JnMB4XDTExMDcyMTE2MzMxN1oXDTIxMDcxODE2MzMxN1owbTELMAkGA1UE
+						BhMCVVMxDjAMBgNVBAgTBVRleGFzMQ8wDQYDVQQHEwZBdXN0aW4xFzAVBgNVBAoT
+						DlByb3RlY3ROZXR3b3JrMSQwIgYDVQQDExt0Y2FzLWlkcC5wcm90ZWN0bmV0d29y
+						ay5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWh2R4Tus8Thwl
+						4Fnlmz6QrwL/imYN5di4q0gmWMJ03oBfIGireuZKfiI1FXeBsAq2p5XKZRQvWyKX
+						J1z2Z+FbG1Og5s6bZSzIjq7bGac0FPtJ+0vgIy74RKJZDZNR2rzzlW2WCIe1zHUh
+						bF0K1RVJZz8nbMDQ+H2Zf74Gi4dXwgQnLCkkPV9ocinv3bq6Iq0H/ySgHGdmazzv
+						vSW8C1Ny2WDfEqCWUkR9AKnTjyww3/f0PgHKuuvSKs6KArC00rD+v2hE+PT4M0oa
+						TqSIbM5uu6f+Xfu10EQVG7O7Wmj2aAN0/D8/+Eeeh/8Se6XX81S7h/dNRrQh7yKM
+						6WIp2pPPAgMBAAGjgdIwgc8wHQYDVR0OBBYEFKWOH8Lch5mEhcxZR+E1w8nvx6Hl
+						MIGfBgNVHSMEgZcwgZSAFKWOH8Lch5mEhcxZR+E1w8nvx6HloXGkbzBtMQswCQYD
+						VQQGEwJVUzEOMAwGA1UECBMFVGV4YXMxDzANBgNVBAcTBkF1c3RpbjEXMBUGA1UE
+						ChMOUHJvdGVjdE5ldHdvcmsxJDAiBgNVBAMTG3RjYXMtaWRwLnByb3RlY3RuZXR3
+						b3JrLm9yZ4IJALJxC01MGf/hMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAACHlDYkgEzbaCatnF1IYcvy5j/T7dpOlvww+vJSK9Al3BlOmESHrEIS46XO
+						9vfk/PgNUM3oYG5prW+azSUJVDfJspSzH0d8IFCI95UlItC9Ivmxpuo1ZcH60fpI
+						M4Kb8fLeOfmsbpVZsxj8tSRByARlK4tzHf2+rLOn7jZRTsPcoxrxYIyesbbshhDy
+						v2ZE+NoOehZXaAYgZkB3PE0s6Ph+pUYIRSZ7bud1YNlx9QkUoYuwgR+hX895l19Z
+						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>
diff --git a/swamid-interfederations-2.0/idp.psc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.psc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..29779195
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.psc.ac.uk-shibboleth.xml
@@ -0,0 +1,109 @@
+<?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>
+      <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
+						ZXJ2aWNlczEWMBQGA1UEAxMNaWRwLnBzYy5hYy51azAeFw0xMzAzMDUxMTU3MjBa
+						Fw0yMzAzMDMxMTU3MjBaMIGFMQswCQYDVQQGEwJHQjESMBAGA1UECBMJSGFtcHNo
+						aXJlMRMwEQYDVQQHEwpXaW5jaGVzdGVyMR4wHAYDVQQKExVQZXRlciBTeW1vbmRz
+						IENvbGxlZ2UxFTATBgNVBAsTDFdlYiBTZXJ2aWNlczEWMBQGA1UEAxMNaWRwLnBz
+						Yy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/BkETQQVg0
+						gd1gkDIzHKITmUxRJULIYtvl9w5gYI8tiYgkVnr0k3cyw2Q2Fa/hbxUa/H/teqD6
+						/vG360Qj511IA2dfsrqveE5EOuB4eMtraoJ8700UG4qOoDbnRd3wG1MpQVxwqdHB
+						Ttaxf7CzU6hdr82Vqx7RPAhyaXuGSu3iDN6OEBTAZVYe9ZoMwbM9qmcMisY4OXjw
+						KIeDCOTDbwi1TBR3PNhdwwwnQWIR7RR0wnCxSgN3zEFzeXLAWPlHqgnWGVuxTZvN
+						qvnsCLGV6/7uqaxuDjWB/GDlqPyNLlBF7uWOWF5faIKzNKcX08xVLZ9Ldf3gdXYG
+						wRN4hOw0VgkCAwEAAaOB7TCB6jAdBgNVHQ4EFgQUhh3B2sIwzqHYTeONgzD0dly+
+						GcwwgboGA1UdIwSBsjCBr4AUhh3B2sIwzqHYTeONgzD0dly+GcyhgYukgYgwgYUx
+						CzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlIYW1wc2hpcmUxEzARBgNVBAcTCldpbmNo
+						ZXN0ZXIxHjAcBgNVBAoTFVBldGVyIFN5bW9uZHMgQ29sbGVnZTEVMBMGA1UECxMM
+						V2ViIFNlcnZpY2VzMRYwFAYDVQQDEw1pZHAucHNjLmFjLnVrggkAlMZbJTXkOpww
+						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAKu6fVTU68s0G1ypB95ve
+						EAw2je8JM0Dw7WbkC+jgZDwF/Ce0Nh7zu8/4siFA858tMR8aIs8F14CLVZ1XHgam
+						Kc/698wBcZJXBH4CaxgLjwyUJSvHUtAYj3u6mqfwxpDyfbt7coHTF9kS/rD9OhFt
+						ZkNMMMQIjye7CAE5X2TCHkzo0CjuC6bs+7Wgagl3iQDBWGfIO+QHEl1hslFgnKqV
+						alC1bW4zWk0stCkR5BH6BfW9UUJUifB43O4nYfQ5/+nI1j/4EoIIXhyNewyImz6G
+						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>
+						MIIEfTCCA2WgAwIBAgIJAJTGWyU15DqcMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYD
+						VQQGEwJHQjESMBAGA1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpXaW5jaGVzdGVy
+						MR4wHAYDVQQKExVQZXRlciBTeW1vbmRzIENvbGxlZ2UxFTATBgNVBAsTDFdlYiBT
+						ZXJ2aWNlczEWMBQGA1UEAxMNaWRwLnBzYy5hYy51azAeFw0xMzAzMDUxMTU3MjBa
+						Fw0yMzAzMDMxMTU3MjBaMIGFMQswCQYDVQQGEwJHQjESMBAGA1UECBMJSGFtcHNo
+						aXJlMRMwEQYDVQQHEwpXaW5jaGVzdGVyMR4wHAYDVQQKExVQZXRlciBTeW1vbmRz
+						IENvbGxlZ2UxFTATBgNVBAsTDFdlYiBTZXJ2aWNlczEWMBQGA1UEAxMNaWRwLnBz
+						Yy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/BkETQQVg0
+						gd1gkDIzHKITmUxRJULIYtvl9w5gYI8tiYgkVnr0k3cyw2Q2Fa/hbxUa/H/teqD6
+						/vG360Qj511IA2dfsrqveE5EOuB4eMtraoJ8700UG4qOoDbnRd3wG1MpQVxwqdHB
+						Ttaxf7CzU6hdr82Vqx7RPAhyaXuGSu3iDN6OEBTAZVYe9ZoMwbM9qmcMisY4OXjw
+						KIeDCOTDbwi1TBR3PNhdwwwnQWIR7RR0wnCxSgN3zEFzeXLAWPlHqgnWGVuxTZvN
+						qvnsCLGV6/7uqaxuDjWB/GDlqPyNLlBF7uWOWF5faIKzNKcX08xVLZ9Ldf3gdXYG
+						wRN4hOw0VgkCAwEAAaOB7TCB6jAdBgNVHQ4EFgQUhh3B2sIwzqHYTeONgzD0dly+
+						GcwwgboGA1UdIwSBsjCBr4AUhh3B2sIwzqHYTeONgzD0dly+GcyhgYukgYgwgYUx
+						CzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlIYW1wc2hpcmUxEzARBgNVBAcTCldpbmNo
+						ZXN0ZXIxHjAcBgNVBAoTFVBldGVyIFN5bW9uZHMgQ29sbGVnZTEVMBMGA1UECxMM
+						V2ViIFNlcnZpY2VzMRYwFAYDVQQDEw1pZHAucHNjLmFjLnVrggkAlMZbJTXkOpww
+						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAKu6fVTU68s0G1ypB95ve
+						EAw2je8JM0Dw7WbkC+jgZDwF/Ce0Nh7zu8/4siFA858tMR8aIs8F14CLVZ1XHgam
+						Kc/698wBcZJXBH4CaxgLjwyUJSvHUtAYj3u6mqfwxpDyfbt7coHTF9kS/rD9OhFt
+						ZkNMMMQIjye7CAE5X2TCHkzo0CjuC6bs+7Wgagl3iQDBWGfIO+QHEl1hslFgnKqV
+						alC1bW4zWk0stCkR5BH6BfW9UUJUifB43O4nYfQ5/+nI1j/4EoIIXhyNewyImz6G
+						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>
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
new file mode 100644
index 00000000..ad9945ab
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.psu.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDIzCCAgugAwIBAgIUJGJLo8LBNXH49TIdHVPulwy9J78wDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLnBzdS5jYXMuY3owHhcNMTQwNzIzMTAwNDMwWhcN
+MzQwNzIzMTAwNDMwWjAZMRcwFQYDVQQDEw5pZHAucHN1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL2AIx+TNI7QvJF1A6csMa/+bCQRPmGL
+ZjJ9YGzaByJwp65HsVh4wmHdPVFenJVtwUuPT0R7WN401XPGNGPtE+D/gf7LQ32g
+xAfwEIBJ8L5ascYnjnhfj4pfK11z+ZQVriLZeF+88FoTtCTUz/L/dqN4w7tcD1JJ
+iY23LggwPGffurHurleuqXMYkctQ3PKMiH0XiA96SsHVqaVi21ukw3i3I6gTctuD
+Per1Sl0psU8UVu9TOyrzNN5hcFxs97U2mUdJXu2CswnWEKOJI7M0tWwaD0es3ouj
+RklNEuzYPahlJYCvaeAoGyIOXoPVCsiJdwOv7hA8D2aCBFNZBEp7MisCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLnBzdS5jYXMuY3qGJWh0dHBzOi8vaWRwLnBzdS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNju9u5qEk5CMlhp6s/bAYgs
+N7EwMA0GCSqGSIb3DQEBBQUAA4IBAQB5BMqqwq6+5hXdwidcN14ZSrDwrk2xCRPB
+Xz22tBS/OzKn0QYSWbkuTR1bo2pb84HDRDC8ZMA08R8ymdtf/MZvP79v5SNoCmrh
+TBWW4bNGxDiytE7v9ebKE0pySrWs9fGvYCkUEpZ2U8uPayNazaBmbXRfxbwWx9af
+qRVSx7QU0HO9BlqrIqJeNIGvKuzFaSSzEuprRFTqwTwZE8u/1ysuY/yOARMfyNNU
+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>
+MIIDIzCCAgugAwIBAgIUJGJLo8LBNXH49TIdHVPulwy9J78wDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLnBzdS5jYXMuY3owHhcNMTQwNzIzMTAwNDMwWhcN
+MzQwNzIzMTAwNDMwWjAZMRcwFQYDVQQDEw5pZHAucHN1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL2AIx+TNI7QvJF1A6csMa/+bCQRPmGL
+ZjJ9YGzaByJwp65HsVh4wmHdPVFenJVtwUuPT0R7WN401XPGNGPtE+D/gf7LQ32g
+xAfwEIBJ8L5ascYnjnhfj4pfK11z+ZQVriLZeF+88FoTtCTUz/L/dqN4w7tcD1JJ
+iY23LggwPGffurHurleuqXMYkctQ3PKMiH0XiA96SsHVqaVi21ukw3i3I6gTctuD
+Per1Sl0psU8UVu9TOyrzNN5hcFxs97U2mUdJXu2CswnWEKOJI7M0tWwaD0es3ouj
+RklNEuzYPahlJYCvaeAoGyIOXoPVCsiJdwOv7hA8D2aCBFNZBEp7MisCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLnBzdS5jYXMuY3qGJWh0dHBzOi8vaWRwLnBzdS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNju9u5qEk5CMlhp6s/bAYgs
+N7EwMA0GCSqGSIb3DQEBBQUAA4IBAQB5BMqqwq6+5hXdwidcN14ZSrDwrk2xCRPB
+Xz22tBS/OzKn0QYSWbkuTR1bo2pb84HDRDC8ZMA08R8ymdtf/MZvP79v5SNoCmrh
+TBWW4bNGxDiytE7v9ebKE0pySrWs9fGvYCkUEpZ2U8uPayNazaBmbXRfxbwWx9af
+qRVSx7QU0HO9BlqrIqJeNIGvKuzFaSSzEuprRFTqwTwZE8u/1ysuY/yOARMfyNNU
+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>
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
new file mode 100644
index 00000000..9e2011bf
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIIEFDCCAvwCAQAwDQYJKoZIhvcNAQEFBQAwgc8xPDA6BgNVBAoTM1BVQ0MgLSBQ
+T05USUZJQ0lBIFVOSVZFUlNJREFERSBDQVRPTElDQSBERSBDQU1QSU5BUzENMAsG
+A1UECxMETlRJQzEqMCgGCSqGSIb3DQEJARYbdGVsZWNvbUBwdWMtY2FtcGluYXMu
+ZWR1LmJyMREwDwYDVQQHEwhDQU1QSU5BUzESMBAGA1UECBMJU0FPIFBBVUxPMQsw
+CQYDVQQGEwJCUjEgMB4GA1UEAxMXaWRwLnB1Yy1jYW1waW5hcy5lZHUuYnIwHhcN
+MTQwNjA1MTQyOTE1WhcNMTkwNjA0MTQyOTE1WjCBzzE8MDoGA1UEChMzUFVDQyAt
+IFBPTlRJRklDSUEgVU5JVkVSU0lEQURFIENBVE9MSUNBIERFIENBTVBJTkFTMQ0w
+CwYDVQQLEwROVElDMSowKAYJKoZIhvcNAQkBFht0ZWxlY29tQHB1Yy1jYW1waW5h
+cy5lZHUuYnIxETAPBgNVBAcTCENBTVBJTkFTMRIwEAYDVQQIEwlTQU8gUEFVTE8x
+CzAJBgNVBAYTAkJSMSAwHgYDVQQDExdpZHAucHVjLWNhbXBpbmFzLmVkdS5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALNo4ffCB7RXNl8+27biVdUU
+i8DdBAOm2d1yem94W/Bz29deIgpdXAtm+F9sugoPaHXdgKTqaoz8XOPLOkLH18hk
+5SlN96Qghp9VjW3Spx+kVU+SI1V0kw/L5Q7TBc1yq/bx29MKtIVCdaFdPqk99Xfx
+bSqX+bmXlUPVI6CTKf9cseQEmKop8aHKad8wKL6b6AH9IO2kfXbKIO7U0AEtnX4J
+knqIl4LHhykFA72Bkv9s5zaNVa4J9PykQKOHW3oIqZqYGyZVQOz7rV8wWxvBcHi5
+KdLal6phc3ecGZ5uBzRXhNY9iGgOch7IJihGvUKUT7MhU8EajCY7fxvglesV2rkC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAiUQvx+gr71M1aU8WOW+vn91QDmWfU6yf
+VS/w4sRDpOyagvK59B42w9nMlCjPv9RQ07o0SFSAwELAd/PUIDh7cT7LUmPVqaWZ
+BZQArltphjHtpGOlPjSLIwbbCzToMRCpksnsM3w7Hu+yMI9AR8XCqw36PVKJSkOY
+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>
+      
+MIIEFDCCAvwCAQAwDQYJKoZIhvcNAQEFBQAwgc8xPDA6BgNVBAoTM1BVQ0MgLSBQ
+T05USUZJQ0lBIFVOSVZFUlNJREFERSBDQVRPTElDQSBERSBDQU1QSU5BUzENMAsG
+A1UECxMETlRJQzEqMCgGCSqGSIb3DQEJARYbdGVsZWNvbUBwdWMtY2FtcGluYXMu
+ZWR1LmJyMREwDwYDVQQHEwhDQU1QSU5BUzESMBAGA1UECBMJU0FPIFBBVUxPMQsw
+CQYDVQQGEwJCUjEgMB4GA1UEAxMXaWRwLnB1Yy1jYW1waW5hcy5lZHUuYnIwHhcN
+MTQwNjA1MTQyOTE1WhcNMTkwNjA0MTQyOTE1WjCBzzE8MDoGA1UEChMzUFVDQyAt
+IFBPTlRJRklDSUEgVU5JVkVSU0lEQURFIENBVE9MSUNBIERFIENBTVBJTkFTMQ0w
+CwYDVQQLEwROVElDMSowKAYJKoZIhvcNAQkBFht0ZWxlY29tQHB1Yy1jYW1waW5h
+cy5lZHUuYnIxETAPBgNVBAcTCENBTVBJTkFTMRIwEAYDVQQIEwlTQU8gUEFVTE8x
+CzAJBgNVBAYTAkJSMSAwHgYDVQQDExdpZHAucHVjLWNhbXBpbmFzLmVkdS5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALNo4ffCB7RXNl8+27biVdUU
+i8DdBAOm2d1yem94W/Bz29deIgpdXAtm+F9sugoPaHXdgKTqaoz8XOPLOkLH18hk
+5SlN96Qghp9VjW3Spx+kVU+SI1V0kw/L5Q7TBc1yq/bx29MKtIVCdaFdPqk99Xfx
+bSqX+bmXlUPVI6CTKf9cseQEmKop8aHKad8wKL6b6AH9IO2kfXbKIO7U0AEtnX4J
+knqIl4LHhykFA72Bkv9s5zaNVa4J9PykQKOHW3oIqZqYGyZVQOz7rV8wWxvBcHi5
+KdLal6phc3ecGZ5uBzRXhNY9iGgOch7IJihGvUKUT7MhU8EajCY7fxvglesV2rkC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAiUQvx+gr71M1aU8WOW+vn91QDmWfU6yf
+VS/w4sRDpOyagvK59B42w9nMlCjPv9RQ07o0SFSAwELAd/PUIDh7cT7LUmPVqaWZ
+BZQArltphjHtpGOlPjSLIwbbCzToMRCpksnsM3w7Hu+yMI9AR8XCqw36PVKJSkOY
+RAac9Nwp2wbumAbKlymXLN1W7UUpMtp1Af7GhbO/aryiMktlOKUg3K15fOevZqsm
+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>
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
new file mode 100644
index 00000000..82ad7f9e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.rac.ac.uk-oala-metadata.xml
@@ -0,0 +1,80 @@
+<?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>
+      <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>
+						MIIDTDCCAjSgAwIBAgIIYso0tsUAlx0wDQYJKoZIhvcNAQEFBQAwPTEjMCEGA1UE
+						CgwaUm95YWwgQWdyaWN1bHR1cmFsIENvbGxlZ2UxFjAUBgNVBAMMDWlkcC5yYWMu
+						YWMudWswHhcNMTIwNzE4MTEyMDI1WhcNMjIwNzE4MTEyMDI1WjA9MSMwIQYDVQQK
+						DBpSb3lhbCBBZ3JpY3VsdHVyYWwgQ29sbGVnZTEWMBQGA1UEAwwNaWRwLnJhYy5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIgWwNErQdrW7Jge
+						wRcdxffYA3ownBclhJdzCmx6k6SgtSd4LawXlvF/zYU3uq6VT87odI+lFYMGzIhg
+						jpYzpEcYOz+fe6BCo21Ghq6BeMCJwGdkB4gZq+mgz/GYXhjAX+zlw8Ryl0JcaUfS
+						uPcCcccjVSV0ZOIuVc+IQHJWsyWyAz7QbVjQN0C+rCK76JMbprU/B88fE6ZX+j8/
+						9Epqs8YEEDBCxjO7pKcgtGmcVTlmWASmaO4+vndg1uCxb+Twc+ve3OqVF5VQdRQa
+						t4pSgxywFY4qHT2vS9zojmpclPi8CKwASpHVKpYic4vjMggoVXc9Uz1lQmV+8ncn
+						e/1o5+0CAwEAAaNQME4wHQYDVR0OBBYEFD+j5I3TjaVsz/fztmw/pnq6FQIRMB8G
+						A1UdIwQYMBaAFD+j5I3TjaVsz/fztmw/pnq6FQIRMAwGA1UdEwQFMAMBAf8wDQYJ
+						KoZIhvcNAQEFBQADggEBAEw7zYoB5vOTdMWiSaSBKUr91UP8lCH8veVNCVDRwujq
+						pjli3+bwqiWcvXQdObzW5r/EGLRDM2d3u3GsmIoWP/JAxwfaaURSz0tGPr+NOhXI
+						55l2WOX6QfQWOpeQHQs+EJCDg0S2X6jsuILLAZWG4EP+94Fgqbpe2qb5n7aYLAHW
+						9VupAZuqO3LgWjA7qXF0xe8D9E86yGAoqICTQy5IOT0Pbe9Us9QL3CHmTMvCwvpf
+						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>
+						MIIDTDCCAjSgAwIBAgIIYso0tsUAlx0wDQYJKoZIhvcNAQEFBQAwPTEjMCEGA1UE
+						CgwaUm95YWwgQWdyaWN1bHR1cmFsIENvbGxlZ2UxFjAUBgNVBAMMDWlkcC5yYWMu
+						YWMudWswHhcNMTIwNzE4MTEyMDI1WhcNMjIwNzE4MTEyMDI1WjA9MSMwIQYDVQQK
+						DBpSb3lhbCBBZ3JpY3VsdHVyYWwgQ29sbGVnZTEWMBQGA1UEAwwNaWRwLnJhYy5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIgWwNErQdrW7Jge
+						wRcdxffYA3ownBclhJdzCmx6k6SgtSd4LawXlvF/zYU3uq6VT87odI+lFYMGzIhg
+						jpYzpEcYOz+fe6BCo21Ghq6BeMCJwGdkB4gZq+mgz/GYXhjAX+zlw8Ryl0JcaUfS
+						uPcCcccjVSV0ZOIuVc+IQHJWsyWyAz7QbVjQN0C+rCK76JMbprU/B88fE6ZX+j8/
+						9Epqs8YEEDBCxjO7pKcgtGmcVTlmWASmaO4+vndg1uCxb+Twc+ve3OqVF5VQdRQa
+						t4pSgxywFY4qHT2vS9zojmpclPi8CKwASpHVKpYic4vjMggoVXc9Uz1lQmV+8ncn
+						e/1o5+0CAwEAAaNQME4wHQYDVR0OBBYEFD+j5I3TjaVsz/fztmw/pnq6FQIRMB8G
+						A1UdIwQYMBaAFD+j5I3TjaVsz/fztmw/pnq6FQIRMAwGA1UdEwQFMAMBAf8wDQYJ
+						KoZIhvcNAQEFBQADggEBAEw7zYoB5vOTdMWiSaSBKUr91UP8lCH8veVNCVDRwujq
+						pjli3+bwqiWcvXQdObzW5r/EGLRDM2d3u3GsmIoWP/JAxwfaaURSz0tGPr+NOhXI
+						55l2WOX6QfQWOpeQHQs+EJCDg0S2X6jsuILLAZWG4EP+94Fgqbpe2qb5n7aYLAHW
+						9VupAZuqO3LgWjA7qXF0xe8D9E86yGAoqICTQy5IOT0Pbe9Us9QL3CHmTMvCwvpf
+						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>
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
new file mode 100644
index 00000000..d3644d49
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.racc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,103 @@
+<?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>
+      <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>
+						MIIDIzCCAgugAwIBAgIUf8EAs09RQNjeRsweRhhhdo0gIh4wDQYJKoZIhvcNAQEF
+						BQAwGTEXMBUGA1UEAxMOaWRwLnJhY2MuYWMudWswHhcNMTQwODEyMTUzMzExWhcN
+						MzQwODEyMTUzMzExWjAZMRcwFQYDVQQDEw5pZHAucmFjYy5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ2gWjs0nqPuueSEDuCJHThpcFI7Y0XA
+						u1LbM4nRfXAEOjx9TKQ6H+70I4GZf2ljmbwINbPyVmtpcZgLuXzf7nxTIkIaqSK3
+						o4aDQj72VVQhVSJ2HAYvhkrtOznPDCWY6FyeBjqhuPghvEbgJtW/o+4VClUdkwMX
+						/7PH7gQNqskjkiSdjVOLGD99F0syRFwtxYNoZxMt5gSltz7CmyOPqZDJWfIpJt/1
+						Soj0dAaOrIxz79I9pdmkh/VAb8RyasFRSEE290BtUdAw7BLzlwvEre5k9Yafzg0g
+						RXXYXidZ+Gkt9zz8TYb/p12J+ktMfbJCAtC0KUYkhpY4ZjYE0G/3RRMCAwEAAaNj
+						MGEwQAYDVR0RBDkwN4IOaWRwLnJhY2MuYWMudWuGJWh0dHBzOi8vaWRwLnJhY2Mu
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLcKRq3/gCr9G2rw89xbfpI3
+						RHHTMA0GCSqGSIb3DQEBBQUAA4IBAQAdAW7tZBzJOS+ULQ54b20VL2Cmvj0bZuVO
+						nEDW3vnAJdbi3Q6RNDl6ru0KHiGqQxz3SPN6UpKYbydZy/rgBu67tFS2nDPdfv83
+						D0Cozu/u12G7X/9u0HR4QwW51XPUgPjZBOY54ZbnVL7inTYCVwjABA4zNZ9KHgsu
+						iddLoyAZP4t9/hobm3qxeEAItYYz45aQei8f+ztAqhUq789Ble1ll1nw6SOwcujT
+						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>
+						MIIDIzCCAgugAwIBAgIUf8EAs09RQNjeRsweRhhhdo0gIh4wDQYJKoZIhvcNAQEF
+						BQAwGTEXMBUGA1UEAxMOaWRwLnJhY2MuYWMudWswHhcNMTQwODEyMTUzMzExWhcN
+						MzQwODEyMTUzMzExWjAZMRcwFQYDVQQDEw5pZHAucmFjYy5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ2gWjs0nqPuueSEDuCJHThpcFI7Y0XA
+						u1LbM4nRfXAEOjx9TKQ6H+70I4GZf2ljmbwINbPyVmtpcZgLuXzf7nxTIkIaqSK3
+						o4aDQj72VVQhVSJ2HAYvhkrtOznPDCWY6FyeBjqhuPghvEbgJtW/o+4VClUdkwMX
+						/7PH7gQNqskjkiSdjVOLGD99F0syRFwtxYNoZxMt5gSltz7CmyOPqZDJWfIpJt/1
+						Soj0dAaOrIxz79I9pdmkh/VAb8RyasFRSEE290BtUdAw7BLzlwvEre5k9Yafzg0g
+						RXXYXidZ+Gkt9zz8TYb/p12J+ktMfbJCAtC0KUYkhpY4ZjYE0G/3RRMCAwEAAaNj
+						MGEwQAYDVR0RBDkwN4IOaWRwLnJhY2MuYWMudWuGJWh0dHBzOi8vaWRwLnJhY2Mu
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLcKRq3/gCr9G2rw89xbfpI3
+						RHHTMA0GCSqGSIb3DQEBBQUAA4IBAQAdAW7tZBzJOS+ULQ54b20VL2Cmvj0bZuVO
+						nEDW3vnAJdbi3Q6RNDl6ru0KHiGqQxz3SPN6UpKYbydZy/rgBu67tFS2nDPdfv83
+						D0Cozu/u12G7X/9u0HR4QwW51XPUgPjZBOY54ZbnVL7inTYCVwjABA4zNZ9KHgsu
+						iddLoyAZP4t9/hobm3qxeEAItYYz45aQei8f+ztAqhUq789Ble1ll1nw6SOwcujT
+						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>
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
new file mode 100644
index 00000000..a02ecf80
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.rca.ac.uk-oala-metadata.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIDQDCCAiigAwIBAgIIZiSQ6tfQBJIwDQYJKoZIhvcNAQEFBQAwNzEdMBsGA1UE
+						CgwUUm95YWwgQ29sbGVnZSBvZiBBcnQxFjAUBgNVBAMMDWlkcC5yY2EuYWMudWsw
+						HhcNMTIwNjI3MTUxOTA4WhcNMjIwNjI3MTUxOTA4WjA3MR0wGwYDVQQKDBRSb3lh
+						bCBDb2xsZWdlIG9mIEFydDEWMBQGA1UEAwwNaWRwLnJjYS5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKTLIImMHtfEOzSFGDWmWaj0Q4PODBKv
+						U5HxSgjRnoxHWuqhHW9LIEA9tSz0iTAZIEkRu/MniPsTuh+GNmDLh9lupzlGlcpv
+						w1JxsMFwJDTT7LtPUWEXcor6MFiJ4hJiaEZzuYh06MNPBeV4Eyl8X3eqxzvjwZ5u
+						38pg/sr6KlSfCDXbiENvithI433CeRzzqWgD2dmAPirn9r2VKpc4K6kzS005cyN2
+						q2AeT67YXZq35nXfZ7fHl4w93b6/cQWEL/JzmmSKfKxGaoHU/6Kzqw3O81CJZUvq
+						8o7okTQINBSWJ35Ap7g6eRVwAWAvqi7l67CjbaF/tl7feQOc07ZVkPMCAwEAAaNQ
+						ME4wHQYDVR0OBBYEFC4++el5Fh1Mm9aTCqz05dVjGlQ8MB8GA1UdIwQYMBaAFC4+
+						+el5Fh1Mm9aTCqz05dVjGlQ8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAJU83TKzvFGDVDTsvbGMOIXiaSeoD1RibFWwjUXdQXyc9y46IAVXbzWEWqw5
+						1EdHu4Ky5BMNHAxN363L38tgI70eXLxHU91pFxS2ccJnSPZBBLPA6GpXWdkoHWP6
+						r8szBgvpAP7bgcXjjjZ5e9vkQiy8Jx2nCNVD8wo3TGiFGBtoEX6J0ZEdSAKyFYh/
+						ncGuI7VOvhaXZqHX2qnXn1+Xnm0UI3wAXcWIvWCOnKXfG1cglrQL0cCsnucUMaWd
+						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>
+						MIIDQDCCAiigAwIBAgIIZiSQ6tfQBJIwDQYJKoZIhvcNAQEFBQAwNzEdMBsGA1UE
+						CgwUUm95YWwgQ29sbGVnZSBvZiBBcnQxFjAUBgNVBAMMDWlkcC5yY2EuYWMudWsw
+						HhcNMTIwNjI3MTUxOTA4WhcNMjIwNjI3MTUxOTA4WjA3MR0wGwYDVQQKDBRSb3lh
+						bCBDb2xsZWdlIG9mIEFydDEWMBQGA1UEAwwNaWRwLnJjYS5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKTLIImMHtfEOzSFGDWmWaj0Q4PODBKv
+						U5HxSgjRnoxHWuqhHW9LIEA9tSz0iTAZIEkRu/MniPsTuh+GNmDLh9lupzlGlcpv
+						w1JxsMFwJDTT7LtPUWEXcor6MFiJ4hJiaEZzuYh06MNPBeV4Eyl8X3eqxzvjwZ5u
+						38pg/sr6KlSfCDXbiENvithI433CeRzzqWgD2dmAPirn9r2VKpc4K6kzS005cyN2
+						q2AeT67YXZq35nXfZ7fHl4w93b6/cQWEL/JzmmSKfKxGaoHU/6Kzqw3O81CJZUvq
+						8o7okTQINBSWJ35Ap7g6eRVwAWAvqi7l67CjbaF/tl7feQOc07ZVkPMCAwEAAaNQ
+						ME4wHQYDVR0OBBYEFC4++el5Fh1Mm9aTCqz05dVjGlQ8MB8GA1UdIwQYMBaAFC4+
+						+el5Fh1Mm9aTCqz05dVjGlQ8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAJU83TKzvFGDVDTsvbGMOIXiaSeoD1RibFWwjUXdQXyc9y46IAVXbzWEWqw5
+						1EdHu4Ky5BMNHAxN363L38tgI70eXLxHU91pFxS2ccJnSPZBBLPA6GpXWdkoHWP6
+						r8szBgvpAP7bgcXjjjZ5e9vkQiy8Jx2nCNVD8wo3TGiFGBtoEX6J0ZEdSAKyFYh/
+						ncGuI7VOvhaXZqHX2qnXn1+Xnm0UI3wAXcWIvWCOnKXfG1cglrQL0cCsnucUMaWd
+						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>
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
new file mode 100644
index 00000000..79ecf1ee
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.rcpch.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-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-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>
+      <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>
+						MIIDJzCCAg+gAwIBAgIUJdj239A2eY7O8uJt78R/EdkY8fwwDQYJKoZIhvcNAQEF
+						BQAwGjEYMBYGA1UEAwwPaWRwLnJjcGNoLmFjLnVrMB4XDTE0MTEyNTEwMTcxNloX
+						DTM0MTEyNTEwMTcxNlowGjEYMBYGA1UEAwwPaWRwLnJjcGNoLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgoJ0GABGGYuw7iPiNmz6l9BMW72h
+						AxzjzadeAAo/7ggPeBMnMtksqK5XQ0LhiEVBC+A3vvfqFC1L/cjPX633o5VTViJx
+						2Mt2Wd0q2pF53+iLP8ii2WT1OoVY1HC4nryXAncBYAH7iszGUv/W/EIDt+4vrV0w
+						Av8tOO9HXW8nSk3BV6n2BOlLJLverYTq+jqkAyMFm0Nd7iwnEoCh/9rIL9cmCtNk
+						o/or9T+1c4gb7d1s/r0Lsl8HH6PMzTkBKjoqnmKq8RArclzKTDcYpYokVxcYhyju
+						Cb+viq2gEX9Gs/RHMQrwKeId7/da9YCwtFXwS3xXB7a5s7QCimNlRkS9rQIDAQAB
+						o2UwYzAdBgNVHQ4EFgQUo9jZYx7yrwhezyDWPPXj011eI1gwQgYDVR0RBDswOYIP
+						aWRwLnJjcGNoLmFjLnVrhiZodHRwczovL2lkcC5yY3BjaC5hYy51ay9pZHAvc2hp
+						YmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAWGCG4+am620zp3knjynttbaB41rd
+						4HCuHTqvCYDRkztJu/XxNtymxs2JPCT0+hqH5iHeNIQuufEVMrawJVrdNw45/LbQ
+						RLSyRaOPyQ0kJygZEeomBEX/4ZadKewHm9ZNgyjRj9qD8cLflkrVqfnDoicxKKtS
+						3ew+NPv3tX0raDfZMfq0MWQrFz9eP2qaeibtNO1xGh+Rp/seeG0MZRtCmtEpXGxf
+						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>
+						MIIDJzCCAg+gAwIBAgIUJdj239A2eY7O8uJt78R/EdkY8fwwDQYJKoZIhvcNAQEF
+						BQAwGjEYMBYGA1UEAwwPaWRwLnJjcGNoLmFjLnVrMB4XDTE0MTEyNTEwMTcxNloX
+						DTM0MTEyNTEwMTcxNlowGjEYMBYGA1UEAwwPaWRwLnJjcGNoLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgoJ0GABGGYuw7iPiNmz6l9BMW72h
+						AxzjzadeAAo/7ggPeBMnMtksqK5XQ0LhiEVBC+A3vvfqFC1L/cjPX633o5VTViJx
+						2Mt2Wd0q2pF53+iLP8ii2WT1OoVY1HC4nryXAncBYAH7iszGUv/W/EIDt+4vrV0w
+						Av8tOO9HXW8nSk3BV6n2BOlLJLverYTq+jqkAyMFm0Nd7iwnEoCh/9rIL9cmCtNk
+						o/or9T+1c4gb7d1s/r0Lsl8HH6PMzTkBKjoqnmKq8RArclzKTDcYpYokVxcYhyju
+						Cb+viq2gEX9Gs/RHMQrwKeId7/da9YCwtFXwS3xXB7a5s7QCimNlRkS9rQIDAQAB
+						o2UwYzAdBgNVHQ4EFgQUo9jZYx7yrwhezyDWPPXj011eI1gwQgYDVR0RBDswOYIP
+						aWRwLnJjcGNoLmFjLnVrhiZodHRwczovL2lkcC5yY3BjaC5hYy51ay9pZHAvc2hp
+						YmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAWGCG4+am620zp3knjynttbaB41rd
+						4HCuHTqvCYDRkztJu/XxNtymxs2JPCT0+hqH5iHeNIQuufEVMrawJVrdNw45/LbQ
+						RLSyRaOPyQ0kJygZEeomBEX/4ZadKewHm9ZNgyjRj9qD8cLflkrVqfnDoicxKKtS
+						3ew+NPv3tX0raDfZMfq0MWQrFz9eP2qaeibtNO1xGh+Rp/seeG0MZRtCmtEpXGxf
+						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>
diff --git a/swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..c62d566c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml
@@ -0,0 +1,54 @@
+<?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>
+      <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="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>
+					      MIIDJDCCAgygAwIBAgIVAOKBqJWqJFq6T2dHTEfrhVJRssecMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5yZW5hdGVyLmZyMB4XDTEzMDMwMTEwMjUwNVoX
+DTMzMDMwMTEwMjUwNVowGTEXMBUGA1UEAxMOaWRwLnJlbmF0ZXIuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCo6i0pn7lTyN4PkneU7/zJAG4k0P/W
+vBzSmAnTQuNtq9z4GsZztrXofycWCF/ekQcWPOK17NNx1zcE28Fhun3/lNWjE+X+
+tDqoB14T5M2lOGdlk5JIuE6N240cuaZGQmvIvCgvup9ESEEDjdyx6V7KR1s5rz3n
+diaTygk2FU51vknOqoMvHWOZjp2tbYo7KVHrauxKxbXbVewmKcN8LKeRL+qZs5wQ
+5Yrd1/juM99r37kF+1QVVGa3/OQicHal1qJG+UNlH3FuUHu3TCmLxWP4WW1WtKCi
+BP+RIm/WHaWD7bPPDH/XTYLFfJqJ0ZbXLA92jlo1dZ7qhiehl7ubk2KRAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5yZW5hdGVyLmZyhiVodHRwczovL2lkcC5yZW5h
+dGVyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQYy83Ve884R0jR3BqE159U
+zbFhDzANBgkqhkiG9w0BAQUFAAOCAQEAOxYs5vfum4LbmsePdGng6mKi8PFcpGKh
+dcFvxOxggLD1YX+R4C1MooN69a3Nf+YY1GzYZO8rUKd+3YL/BhJb0ouE31CzxwLP
+uXCctT3re8BW6GKy3JGju9H3sJ8AJUog3rHCegIJrA7PYarIAQUokEgCzaE5M/sT
+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>
diff --git a/swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml
new file mode 100644
index 00000000..9c1c5fd8
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-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">
+http://cofre.reuna.cl/index.php/es/reglas-federacion
+</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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>
+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>
+urn: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>
+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>
+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>
diff --git a/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml b/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml
new file mode 100644
index 00000000..3ec18623
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml
@@ -0,0 +1,86 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-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-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>
+      <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>
+						MIIDYDCCAkigAwIBAgIIS43HU8EXmhwwDQYJKoZIhvcNAQEFBQAwRzEsMCoGA1UE
+						CgwjUm95YWwgSG9sbG93YXkgVW5pdmVyc2l0eSBvZiBMb25kb24xFzAVBgNVBAMM
+						DmlkcC5yaHVsLmFjLnVrMB4XDTEyMTIxMjEyMjAyM1oXDTIyMTIxMjEyMjAyM1ow
+						RzEsMCoGA1UECgwjUm95YWwgSG9sbG93YXkgVW5pdmVyc2l0eSBvZiBMb25kb24x
+						FzAVBgNVBAMMDmlkcC5yaHVsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEAg4Ij2g/JR+6L9D1i5KQ6tXIEIylJ4npmYfYnAOSkwIpePucRZxQv
+						Cmvn7/sX+zt/11/YF/mqio+tWwkytevh3Ou0FY0ZjDTqlFM+BldrQQ0bWM7SKnMn
+						XMp0AREzc4yhrKVbr5+a2Es3INJbK9Rt+r7fHIK+IfojwQCv8/myAQ+diaO1H62e
+						1KhXgKP1GDHg4NQwlPLq3xtJZJz90I1v6IJVnhw2jyq1gyyTjduMbQZkbzpF8vF1
+						OxZYR45DpW6kTXisIupvZelvFwsa2rDwNz5QKoDfUwnLFTOUIbQc0BLdP8nQZvG7
+						U7Lhqc6azsO2XxZksi6HqfjH0i0kHD3AowIDAQABo1AwTjAdBgNVHQ4EFgQUMFIh
+						i+huyWXzQnJrE+LUc9NSiXswHwYDVR0jBBgwFoAUMFIhi+huyWXzQnJrE+LUc9NS
+						iXswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaf1YLiNdZY2hBK8w
+						xTfO1sR3XOc8y1fCIsQGCHX6uFm8tbWDX5N45mp7jDzMRwZndOXemkIl1ms35RRH
+						OBkTpsrsmD4DyLmPLVGkmQUMVXhmPsFFt+ePaTC8H1Gj5hcCXVWqRWxtGdfjHLsJ
+						psRHDoKZecU5yURn23K1BG6xfjy1evh7GBYu0sl8tbYuiF0/2w/uWR33sYyN4EpR
+						RZzA301WyNKyppCyHwdIX+8kx9gUy5pt4TWUezwtdVsG+hgFFwhg1GAj3iTnbDRI
+						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>
+						MIIDYDCCAkigAwIBAgIIS43HU8EXmhwwDQYJKoZIhvcNAQEFBQAwRzEsMCoGA1UE
+						CgwjUm95YWwgSG9sbG93YXkgVW5pdmVyc2l0eSBvZiBMb25kb24xFzAVBgNVBAMM
+						DmlkcC5yaHVsLmFjLnVrMB4XDTEyMTIxMjEyMjAyM1oXDTIyMTIxMjEyMjAyM1ow
+						RzEsMCoGA1UECgwjUm95YWwgSG9sbG93YXkgVW5pdmVyc2l0eSBvZiBMb25kb24x
+						FzAVBgNVBAMMDmlkcC5yaHVsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEAg4Ij2g/JR+6L9D1i5KQ6tXIEIylJ4npmYfYnAOSkwIpePucRZxQv
+						Cmvn7/sX+zt/11/YF/mqio+tWwkytevh3Ou0FY0ZjDTqlFM+BldrQQ0bWM7SKnMn
+						XMp0AREzc4yhrKVbr5+a2Es3INJbK9Rt+r7fHIK+IfojwQCv8/myAQ+diaO1H62e
+						1KhXgKP1GDHg4NQwlPLq3xtJZJz90I1v6IJVnhw2jyq1gyyTjduMbQZkbzpF8vF1
+						OxZYR45DpW6kTXisIupvZelvFwsa2rDwNz5QKoDfUwnLFTOUIbQc0BLdP8nQZvG7
+						U7Lhqc6azsO2XxZksi6HqfjH0i0kHD3AowIDAQABo1AwTjAdBgNVHQ4EFgQUMFIh
+						i+huyWXzQnJrE+LUc9NSiXswHwYDVR0jBBgwFoAUMFIhi+huyWXzQnJrE+LUc9NS
+						iXswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaf1YLiNdZY2hBK8w
+						xTfO1sR3XOc8y1fCIsQGCHX6uFm8tbWDX5N45mp7jDzMRwZndOXemkIl1ms35RRH
+						OBkTpsrsmD4DyLmPLVGkmQUMVXhmPsFFt+ePaTC8H1Gj5hcCXVWqRWxtGdfjHLsJ
+						psRHDoKZecU5yURn23K1BG6xfjy1evh7GBYu0sl8tbYuiF0/2w/uWR33sYyN4EpR
+						RZzA301WyNKyppCyHwdIX+8kx9gUy5pt4TWUezwtdVsG+hgFFwhg1GAj3iTnbDRI
+						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 OALA</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.richardtaunton.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.richardtaunton.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..d8e0d291
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.richardtaunton.ac.uk-oala-metadata.xml
@@ -0,0 +1,84 @@
+<?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>
+      <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>
+						MIIDcjCCAlqgAwIBAgIIP9vOoGDWheQwDQYJKoZIhvcNAQEFBQAwUDErMCkGA1UE
+						CgwiUmljaGFyZCBUYXVudG9uIFNpeHRoIEZvcm0gQ29sbGVnZTEhMB8GA1UEAwwY
+						aWRwLnJpY2hhcmR0YXVudG9uLmFjLnVrMB4XDTE0MDIxMzE0MzI0MVoXDTI0MDIx
+						MzE0MzI0MVowUDErMCkGA1UECgwiUmljaGFyZCBUYXVudG9uIFNpeHRoIEZvcm0g
+						Q29sbGVnZTEhMB8GA1UEAwwYaWRwLnJpY2hhcmR0YXVudG9uLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArrQrUbrEso92Y0nGePC9ddn0ZpZ+
+						pYV39mnbr51NSHQlano4Arn8uBlMi9ALaLON4G6A9Q+S2B6OIorTgMTHyDbrOTya
+						Dw7d9gvlbvKWEnJMBstk+Wpm1G4OKmpm2VrTNzbuPpCTpHVFVqHa8j0XKqnXl4Da
+						U7AU3jfIbpM8TYMZnVOcOTXlRhLKyX75bncjbYjFzbtX1ZsToSPmdLHL2Rl1MCgK
+						sZhgEbx20wZuFatoOZ5MoxmUo8LSAW5HGrKsE9ms/pN+KT6uej4ygOtq1GBq9Lrv
+						W3nKWrRzU/2gBKJKudP7avxS3n0t55ITaS8Emx/lj2uwOSSf7U8pnNBOKwIDAQAB
+						o1AwTjAdBgNVHQ4EFgQUSetuFJXmHRSav/PWbq+q7pA/BTwwHwYDVR0jBBgwFoAU
+						SetuFJXmHRSav/PWbq+q7pA/BTwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
+						AAOCAQEAl+DLXiM0SPpko0CalHgKey1WKm7kuM8yr0/SdybnM6SJ42oOoW90pJla
+						GVkFcHsZx4T17MesjXrJyYoH7eTga6HkXCWd6t1Iv9XNL2ugx4BaZKM08n8wNvw1
+						e/rBVAVQQ+ChFQNqRI9W5hXxMcqjpZQQ1soNjQHs12SEzsHqrdL4w+J6YDdpXNzK
+						IwSNoEAPg+maVh3q9qpm059erPkxPR48bp1gdZ75tjo/xiUF4r0aZ8lgFXBsJehF
+						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>
+						MIIDcjCCAlqgAwIBAgIIP9vOoGDWheQwDQYJKoZIhvcNAQEFBQAwUDErMCkGA1UE
+						CgwiUmljaGFyZCBUYXVudG9uIFNpeHRoIEZvcm0gQ29sbGVnZTEhMB8GA1UEAwwY
+						aWRwLnJpY2hhcmR0YXVudG9uLmFjLnVrMB4XDTE0MDIxMzE0MzI0MVoXDTI0MDIx
+						MzE0MzI0MVowUDErMCkGA1UECgwiUmljaGFyZCBUYXVudG9uIFNpeHRoIEZvcm0g
+						Q29sbGVnZTEhMB8GA1UEAwwYaWRwLnJpY2hhcmR0YXVudG9uLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArrQrUbrEso92Y0nGePC9ddn0ZpZ+
+						pYV39mnbr51NSHQlano4Arn8uBlMi9ALaLON4G6A9Q+S2B6OIorTgMTHyDbrOTya
+						Dw7d9gvlbvKWEnJMBstk+Wpm1G4OKmpm2VrTNzbuPpCTpHVFVqHa8j0XKqnXl4Da
+						U7AU3jfIbpM8TYMZnVOcOTXlRhLKyX75bncjbYjFzbtX1ZsToSPmdLHL2Rl1MCgK
+						sZhgEbx20wZuFatoOZ5MoxmUo8LSAW5HGrKsE9ms/pN+KT6uej4ygOtq1GBq9Lrv
+						W3nKWrRzU/2gBKJKudP7avxS3n0t55ITaS8Emx/lj2uwOSSf7U8pnNBOKwIDAQAB
+						o1AwTjAdBgNVHQ4EFgQUSetuFJXmHRSav/PWbq+q7pA/BTwwHwYDVR0jBBgwFoAU
+						SetuFJXmHRSav/PWbq+q7pA/BTwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
+						AAOCAQEAl+DLXiM0SPpko0CalHgKey1WKm7kuM8yr0/SdybnM6SJ42oOoW90pJla
+						GVkFcHsZx4T17MesjXrJyYoH7eTga6HkXCWd6t1Iv9XNL2ugx4BaZKM08n8wNvw1
+						e/rBVAVQQ+ChFQNqRI9W5hXxMcqjpZQQ1soNjQHs12SEzsHqrdL4w+J6YDdpXNzK
+						IwSNoEAPg+maVh3q9qpm059erPkxPR48bp1gdZ75tjo/xiUF4r0aZ8lgFXBsJehF
+						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>
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
new file mode 100644
index 00000000..f59656e1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,109 @@
+<?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>
+      <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>
+						MIIEcTCCA1mgAwIBAgIQOK05z/jgLpm7t1J1gbk9JzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDQxMjAwMDAwMFoXDTE2MDQxMTIzNTk1OVowQDEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAucmljaHVp
+						c2guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc/+JhPJ6P
+						2RjvN7s7WlFfifcFU/bh9md3XhKI4TqBNPQc3xPaB1m9hJ09pPJqwW58yJTu0F8w
+						eh+0GDq/AEDPPMbWNSGC8hq9Ih4LdB2RdSg81Fl8clFqjNlO4lZjMTXuOVkFwOtm
+						e8gXIsNryCWL5gcuaHzD6AWkTOMVN66HwCuZ/JgFC1KE8b+28pbE0dVmQAD6k4RJ
+						F2RF/GUVV+RyNBiKGQj0STCJmz6wVEZpBw1hq2XxFfyBatk9ASYAAY7oLDNQNDpK
+						4CUSwevosmHPJV4tNvoGsACqMmUxZH/P/WSk20JCUWIiHCy3pdQMxfr1mrH0u1V8
+						KOvmYDdUK49xAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+						V0fqkOO57TAdBgNVHQ4EFgQUDot17IlAyyEIRz0G/r4/UTFoGb0wDgYDVR0PAQH/
+						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+						BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+						Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+						Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5yaWNodWlzaC5hYy51
+						azANBgkqhkiG9w0BAQUFAAOCAQEAMDv9hIY0OHIXmIEhM40KM0I6LgJ4MQWLO+zH
+						GqiCVokJaAgVN6I7YYmXoZNdVT8ydDXBy3O++c2I79RuGHA3odevop+92VjY25yo
+						lCAhL+aIWy6AD1nzVYTT99qZdkgxCf3d1ryB/A8xhVpkUgSChwlviq09R17+ihYM
+						ZXeFk70BGXMnvbwuEi6fyB5xG1Ki+21ktQBRIaOhlXkPrDsAuUZeVnGZ1AhFvt/K
+						dPPwiuxkdI9aAXORj37yj0HZBCuO4SGnM0hwx5DzgiIzTv6BI7UKkr3rhbGUDPHB
+						0g92pSiGsoE2FzexcNmU7B4J5QH/+CQWTt5zLb6/X0jjC++7Kw==
+					</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>
+						MIIEcTCCA1mgAwIBAgIQOK05z/jgLpm7t1J1gbk9JzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDQxMjAwMDAwMFoXDTE2MDQxMTIzNTk1OVowQDEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAucmljaHVp
+						c2guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc/+JhPJ6P
+						2RjvN7s7WlFfifcFU/bh9md3XhKI4TqBNPQc3xPaB1m9hJ09pPJqwW58yJTu0F8w
+						eh+0GDq/AEDPPMbWNSGC8hq9Ih4LdB2RdSg81Fl8clFqjNlO4lZjMTXuOVkFwOtm
+						e8gXIsNryCWL5gcuaHzD6AWkTOMVN66HwCuZ/JgFC1KE8b+28pbE0dVmQAD6k4RJ
+						F2RF/GUVV+RyNBiKGQj0STCJmz6wVEZpBw1hq2XxFfyBatk9ASYAAY7oLDNQNDpK
+						4CUSwevosmHPJV4tNvoGsACqMmUxZH/P/WSk20JCUWIiHCy3pdQMxfr1mrH0u1V8
+						KOvmYDdUK49xAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+						V0fqkOO57TAdBgNVHQ4EFgQUDot17IlAyyEIRz0G/r4/UTFoGb0wDgYDVR0PAQH/
+						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+						BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+						Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+						Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5yaWNodWlzaC5hYy51
+						azANBgkqhkiG9w0BAQUFAAOCAQEAMDv9hIY0OHIXmIEhM40KM0I6LgJ4MQWLO+zH
+						GqiCVokJaAgVN6I7YYmXoZNdVT8ydDXBy3O++c2I79RuGHA3odevop+92VjY25yo
+						lCAhL+aIWy6AD1nzVYTT99qZdkgxCf3d1ryB/A8xhVpkUgSChwlviq09R17+ihYM
+						ZXeFk70BGXMnvbwuEi6fyB5xG1Ki+21ktQBRIaOhlXkPrDsAuUZeVnGZ1AhFvt/K
+						dPPwiuxkdI9aAXORj37yj0HZBCuO4SGnM0hwx5DzgiIzTv6BI7UKkr3rhbGUDPHB
+						0g92pSiGsoE2FzexcNmU7B4J5QH/+CQWTt5zLb6/X0jjC++7Kw==
+					</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>Roz</md:GivenName>
+    <md:SurName>Abbott</md:SurName>
+    <md:EmailAddress>mailto:roza@richuish.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Roz</md:GivenName>
+    <md:SurName>Abbott</md:SurName>
+    <md:EmailAddress>mailto:roza@richuish.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.riversidecollege.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.riversidecollege.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..03d3b89f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.riversidecollege.ac.uk-shibboleth.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.riversidecollege.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: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">riversidecollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIE5zCCA8+gAwIBAgIRAN9KqPCKq/Fq62pyegYW9yswDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xNDAzMTgwMDAwMDBaFw0xNzAzMTcyMzU5NTlaMIGsMQswCQYD
+						VQQGEwJHQjEQMA4GA1UEERMHV0E4IDdRUTERMA8GA1UECBMIQ2hlc2hpcmUxDzAN
+						BgNVBAcTBldJRE5FUzERMA8GA1UECRMIS2luZ3N3YXkxITAfBgNVBAoTGFJpdmVy
+						c2lkZSBDb2xsZWdlIEhhbHRvbjEMMAoGA1UECxMDQ1NVMSMwIQYDVQQDExppZHAu
+						cml2ZXJzaWRlY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAKsyf+cIJmtmhDgdlzcB62jXuYBtXmDk3ZOv3jq9jMQU3fAppqrMQUHD
+						KyCJzw/iiMkrrXyiZEKSBczn5v2OBGsrUERqpXArO+CbFyfR1fSrgjYoq5yKM46u
+						wnlwRpBYqxkJ8v9XPIv8kcmY0D5BjRLMb63A8Iv48PGt+v0ApPuTAoSjcIcnq06q
+						PquOEpowLlJ0ViN7pIyqR0kXOunEHYdz76hgCYNl41cCURfT0V+90podIB0L688x
+						VWnPWGPq9oD/jMsHbsVOl9KvC4gMuNMyfulZe02XcjeZ/QrPsXsBeQZR97GiWhni
+						le027Jt4b2iOSlDZSbbOpYHyWVxcGLsCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaA
+						FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTnEZ72dGGX2SmqtdFup2nH
+						VHoOwDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
+						BgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZn
+						gQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+						Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+						dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+						BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaaWRw
+						LnJpdmVyc2lkZWNvbGxlZ2UuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAFj5SVF7
+						Mz4BykrmoByiWVz/em90XJnaDp/PXqM9kayqS9+dEMDxXAaI67DVToDRLc+aO0YO
+						HBlAee4hc0j/b3rqKHaF1TxuAIT5rJ2f1aWwZ9Uo/UKUp7ZCO/qkh7soSs32eaea
+						+AZ4OwNinXR0rXtzeXD70z6W7JfacsgFQkZEB00+YUnOz4ZVcVj2wwphy3rG1GeF
+						zfW4wuzBStRgI2e+VrBu1/C6JES+NN+DlB8L0RQcR78Qp+SBpPdfihGHBhowMfte
+						FHr7DKIT1YxcTM+OuGX+b42j1HiHGKItFWqcgthiNwAJSkcJi442wHUzR0a5nvFx
+						zMKQseHBHBcMOJc=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.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://idp.riversidecollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.riversidecollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.riversidecollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.riversidecollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIE5zCCA8+gAwIBAgIRAN9KqPCKq/Fq62pyegYW9yswDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xNDAzMTgwMDAwMDBaFw0xNzAzMTcyMzU5NTlaMIGsMQswCQYD
+						VQQGEwJHQjEQMA4GA1UEERMHV0E4IDdRUTERMA8GA1UECBMIQ2hlc2hpcmUxDzAN
+						BgNVBAcTBldJRE5FUzERMA8GA1UECRMIS2luZ3N3YXkxITAfBgNVBAoTGFJpdmVy
+						c2lkZSBDb2xsZWdlIEhhbHRvbjEMMAoGA1UECxMDQ1NVMSMwIQYDVQQDExppZHAu
+						cml2ZXJzaWRlY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAKsyf+cIJmtmhDgdlzcB62jXuYBtXmDk3ZOv3jq9jMQU3fAppqrMQUHD
+						KyCJzw/iiMkrrXyiZEKSBczn5v2OBGsrUERqpXArO+CbFyfR1fSrgjYoq5yKM46u
+						wnlwRpBYqxkJ8v9XPIv8kcmY0D5BjRLMb63A8Iv48PGt+v0ApPuTAoSjcIcnq06q
+						PquOEpowLlJ0ViN7pIyqR0kXOunEHYdz76hgCYNl41cCURfT0V+90podIB0L688x
+						VWnPWGPq9oD/jMsHbsVOl9KvC4gMuNMyfulZe02XcjeZ/QrPsXsBeQZR97GiWhni
+						le027Jt4b2iOSlDZSbbOpYHyWVxcGLsCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaA
+						FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTnEZ72dGGX2SmqtdFup2nH
+						VHoOwDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
+						BgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZn
+						gQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+						Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+						dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+						BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaaWRw
+						LnJpdmVyc2lkZWNvbGxlZ2UuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAFj5SVF7
+						Mz4BykrmoByiWVz/em90XJnaDp/PXqM9kayqS9+dEMDxXAaI67DVToDRLc+aO0YO
+						HBlAee4hc0j/b3rqKHaF1TxuAIT5rJ2f1aWwZ9Uo/UKUp7ZCO/qkh7soSs32eaea
+						+AZ4OwNinXR0rXtzeXD70z6W7JfacsgFQkZEB00+YUnOz4ZVcVj2wwphy3rG1GeF
+						zfW4wuzBStRgI2e+VrBu1/C6JES+NN+DlB8L0RQcR78Qp+SBpPdfihGHBhowMfte
+						FHr7DKIT1YxcTM+OuGX+b42j1HiHGKItFWqcgthiNwAJSkcJi442wHUzR0a5nvFx
+						zMKQseHBHBcMOJc=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.riversidecollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.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 Halton</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.riversidecollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Doyle</md:SurName>
+    <md:EmailAddress>mailto:ian.doyle@riversidecollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Doyle</md:SurName>
+    <md:EmailAddress>mailto:ian.doyle@riversidecollege.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
new file mode 100644
index 00000000..4f989ed4
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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 height="90" width="165" xml:lang="sv">http://www.rkh.se/images/logo.png</mdui:Logo>
+        <mdui:Logo height="90" width="165" xml:lang="en">http://www.rkh.se/images/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</mdui:IPHint>
+      </mdui:DiscoHints>
+    </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
+4t+G7MMYHvIKKxpD5s1wFbir4e84mn2eGgiMZ5BqlS4xl3wjBnY3syUpEfGA5QcT
+Ar0uS9ToncrxqbAp4ZzgtF6YrP53cWL9lbHZjImESd5NfIt515mDWFfuxJyCTYxf
+zvtEJLxdTfjj0U8sWFxQ0sW5z4Ib49RvpIEaf+/STAjaqP6l8gfDaLp7chRyLPPN
+4Hywk7ZgK/hGX2pRjXogAkbMDBECaPPtn0XUruHdC8hqshpC33xoHaCvfFE6OYfq
+uZX0I2pCiOKRFy/qO1YoIEE8f0EaQy35wptpiVAGoTmvAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5ya2guc2WGIWh0dHBzOi8vaWRwLnJraC5zZS9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUnN5WyGgWFoUD8kRlz0xaculYHQMwDQYJKoZIhvcNAQEF
+BQADggEBABbsy0PiV0PF8zc83scwz29zVf15Bhk7FUgv0mhNd94g/OO7D5hcKlvM
+wEPDvFrmaYxiPDKN+PxIB70fQfjwqoMZHOIhMwqzbKbbzxf3lRlgihtnrbwLw4vp
+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
+BQAwFTETMBEGA1UEAxMKaWRwLnJraC5zZTAeFw0xMjExMTIxMzQ4MzZaFw0zMjEx
+MTIxMzQ4MzZaMBUxEzARBgNVBAMTCmlkcC5ya2guc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCF9AP/NqQC4kdNom3wMY/3DF38Tdgy9bY5qyy/RlOo
+4t+G7MMYHvIKKxpD5s1wFbir4e84mn2eGgiMZ5BqlS4xl3wjBnY3syUpEfGA5QcT
+Ar0uS9ToncrxqbAp4ZzgtF6YrP53cWL9lbHZjImESd5NfIt515mDWFfuxJyCTYxf
+zvtEJLxdTfjj0U8sWFxQ0sW5z4Ib49RvpIEaf+/STAjaqP6l8gfDaLp7chRyLPPN
+4Hywk7ZgK/hGX2pRjXogAkbMDBECaPPtn0XUruHdC8hqshpC33xoHaCvfFE6OYfq
+uZX0I2pCiOKRFy/qO1YoIEE8f0EaQy35wptpiVAGoTmvAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5ya2guc2WGIWh0dHBzOi8vaWRwLnJraC5zZS9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUnN5WyGgWFoUD8kRlz0xaculYHQMwDQYJKoZIhvcNAQEF
+BQADggEBABbsy0PiV0PF8zc83scwz29zVf15Bhk7FUgv0mhNd94g/OO7D5hcKlvM
+wEPDvFrmaYxiPDKN+PxIB70fQfjwqoMZHOIhMwqzbKbbzxf3lRlgihtnrbwLw4vp
+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>itsupport@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>itsupport@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>itsupport@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
new file mode 100644
index 00000000..d28d070b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIC1DCCAbwCAQAwDQYJKoZIhvcNAQEFBQAwMDEMMAoGA1UECxMDR1RJMQswCQYD
+VQQGEwJCUjETMBEGA1UEAxMKaWRwLnJucC5icjAeFw0xMzEyMDYxODQzMzVaFw0x
+NjEyMDUxODQzMzVaMDAxDDAKBgNVBAsTA0dUSTELMAkGA1UEBhMCQlIxEzARBgNV
+BAMTCmlkcC5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCp
+wcuNgUWHb0fw6PeIrPUaOtMTIEQ5qeOJPvOYAAzwmcu8pwb6sdvLJC/NtKK8NGkv
+zT4JL/ZHoNNK1bYtYT4temrGaUmJ4QsP7eZjISLljX/NwSQH4D4Gf8iKG+yGpbpM
+eSAMGMQjlZYQasJorFijzc92N5nyW/yVNrbviASeRBgQJubEvbOg3pp2wiib3kLG
+LyZCMPCGRGBZoa7+Da55D846zyr2Ck4srIA/oTgRSujQn5of7ocSFchewrYUtMPk
+lUtW9XJgwE5RcfVXSmZiAK20miqiBlvBHqnrh1EGNduwKirg5hCI172kv7pfyUrx
+ayzJpuluiwd+HEVm1SDLAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC73q9t8XD44
+EFN4Zvw/K6ffWlEShuT1Q6cQArv0sn7Z0m10bgjW2EyO3nM/iF/X7RhToyeov3Q4
+r+3en+9JMRnwFuA1ReqQR/2jjInkfvOV1a6YOn2hsqLXpskjCg+wQEyOhyOg/bUN
+l/J1fBDwIDL9ym+4vG7ujnE5vE8vbQqWIjlQV+xXvk/vQBmmmxEG6bHFwxHW5AP3
+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>
+      
+MIIC1DCCAbwCAQAwDQYJKoZIhvcNAQEFBQAwMDEMMAoGA1UECxMDR1RJMQswCQYD
+VQQGEwJCUjETMBEGA1UEAxMKaWRwLnJucC5icjAeFw0xMzEyMDYxODQzMzVaFw0x
+NjEyMDUxODQzMzVaMDAxDDAKBgNVBAsTA0dUSTELMAkGA1UEBhMCQlIxEzARBgNV
+BAMTCmlkcC5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCp
+wcuNgUWHb0fw6PeIrPUaOtMTIEQ5qeOJPvOYAAzwmcu8pwb6sdvLJC/NtKK8NGkv
+zT4JL/ZHoNNK1bYtYT4temrGaUmJ4QsP7eZjISLljX/NwSQH4D4Gf8iKG+yGpbpM
+eSAMGMQjlZYQasJorFijzc92N5nyW/yVNrbviASeRBgQJubEvbOg3pp2wiib3kLG
+LyZCMPCGRGBZoa7+Da55D846zyr2Ck4srIA/oTgRSujQn5of7ocSFchewrYUtMPk
+lUtW9XJgwE5RcfVXSmZiAK20miqiBlvBHqnrh1EGNduwKirg5hCI172kv7pfyUrx
+ayzJpuluiwd+HEVm1SDLAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC73q9t8XD44
+EFN4Zvw/K6ffWlEShuT1Q6cQArv0sn7Z0m10bgjW2EyO3nM/iF/X7RhToyeov3Q4
+r+3en+9JMRnwFuA1ReqQR/2jjInkfvOV1a6YOn2hsqLXpskjCg+wQEyOhyOg/bUN
+l/J1fBDwIDL9ym+4vG7ujnE5vE8vbQqWIjlQV+xXvk/vQBmmmxEG6bHFwxHW5AP3
+kkjlVbW5hU4Mwj9Ac1259yulrX3viPzOkW5+Kf823GNI16LbOLNIjw98gZ6didxX
+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>
diff --git a/swamid-interfederations-2.0/idp.ruskin.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ruskin.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..eef91a55
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ruskin.ac.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						MTIwNzEwMDk1MzQ0WhcNMzIwNzA1MDk1MzQ0WjBoMQswCQYDVQQGEwJHQjEUMBIG
+						A1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEXMBUGA1UEChMOUnVz
+						a2luIENvbGxlZ2UxGTAXBgNVBAMTEGlkcC5ydXNraW4uYWMudWswggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6+fdNYJiZH+zIfW6xLXXv5JNd/uJP8JQh
+						yfrPx2PmggxywfTrMKJdRPpKtAUqPXlSB7acLAjD0U3XErjzYttjt+qXJEU2YUks
+						gvwd7lJiIQXW5cf3LU14YySLpCbh/8dNQ1cmmwjQpAYA+vpYjckdOtL0qkt/7qMV
+						59crl8ZpMpXusWIq2aZLlHU+Gf21Ez18O+aCkSj4vpcjyFc75YPZFNvDkRdccTtg
+						nHxMB3k2ddm8IGbK4VlWymZZWxyl+fNilP0Yqs0OFdCOO6Uo15N60CXw+LcfGhKh
+						hntFJ9+9Z4MEAxKQanezzF2C9VtSHuni1Q5CiQWLXMEgzshgkSO3AgMBAAEwDQYJ
+						KoZIhvcNAQEFBQADggEBAC/xMtV84acTdAf98Pw7W2IGdi3dUXErdQkkmGMPxC/v
+						WJcHbF5+WMozmWSdvci6XhipnxiHWbepsTrpqX4hp83fBb/H7F2NxKHD9VQXLb9m
+						xn4sLVWIE/+JLYYGEMupR71JoPwqNEig2Of8H2Oe8/CNYS6IT0w+18ZbLKRfGEFV
+						TUk4x96tPFm4+ARUZ8ZWeX2p8eCCicfm8UaShK8DQI3jELAkaSJvd1Pq5ZWrQxbj
+						+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>
+						MIIDTDCCAjQCCQCeO7iggJ8z5DANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJH
+						QjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEXMBUGA1UE
+						ChMOUnVza2luIENvbGxlZ2UxGTAXBgNVBAMTEGlkcC5ydXNraW4uYWMudWswHhcN
+						MTIwNzEwMDk1MzQ0WhcNMzIwNzA1MDk1MzQ0WjBoMQswCQYDVQQGEwJHQjEUMBIG
+						A1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEXMBUGA1UEChMOUnVz
+						a2luIENvbGxlZ2UxGTAXBgNVBAMTEGlkcC5ydXNraW4uYWMudWswggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6+fdNYJiZH+zIfW6xLXXv5JNd/uJP8JQh
+						yfrPx2PmggxywfTrMKJdRPpKtAUqPXlSB7acLAjD0U3XErjzYttjt+qXJEU2YUks
+						gvwd7lJiIQXW5cf3LU14YySLpCbh/8dNQ1cmmwjQpAYA+vpYjckdOtL0qkt/7qMV
+						59crl8ZpMpXusWIq2aZLlHU+Gf21Ez18O+aCkSj4vpcjyFc75YPZFNvDkRdccTtg
+						nHxMB3k2ddm8IGbK4VlWymZZWxyl+fNilP0Yqs0OFdCOO6Uo15N60CXw+LcfGhKh
+						hntFJ9+9Z4MEAxKQanezzF2C9VtSHuni1Q5CiQWLXMEgzshgkSO3AgMBAAEwDQYJ
+						KoZIhvcNAQEFBQADggEBAC/xMtV84acTdAf98Pw7W2IGdi3dUXErdQkkmGMPxC/v
+						WJcHbF5+WMozmWSdvci6XhipnxiHWbepsTrpqX4hp83fBb/H7F2NxKHD9VQXLb9m
+						xn4sLVWIE/+JLYYGEMupR71JoPwqNEig2Of8H2Oe8/CNYS6IT0w+18ZbLKRfGEFV
+						TUk4x96tPFm4+ARUZ8ZWeX2p8eCCicfm8UaShK8DQI3jELAkaSJvd1Pq5ZWrQxbj
+						+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>
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
new file mode 100644
index 00000000..548b0bb2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.rvc.ac.uk-oala-metadata.xml
@@ -0,0 +1,80 @@
+<?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>
+      <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>
+						MIIDSDCCAjCgAwIBAgIIBIqWvTgzVRkwDQYJKoZIhvcNAQEFBQAwOzEhMB8GA1UE
+						CgwYUm95YWwgVmV0ZXJpbmFyeSBDb2xsZWdlMRYwFAYDVQQDDA1pZHAucnZjLmFj
+						LnVrMB4XDTEyMDgxMzE0MzUyNloXDTIyMDgxMzE0MzUyNlowOzEhMB8GA1UECgwY
+						Um95YWwgVmV0ZXJpbmFyeSBDb2xsZWdlMRYwFAYDVQQDDA1pZHAucnZjLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiKaZ4qU3nGrCoSb9sRkt
+						k/X+131piJUW54UzIR1KPYpQNJgzImdApDSiS4AS60riPIC63PgE/DQg/F2jJRW+
+						S5Sey9Ov20zHIDvKnLJGNC562o+AJ9ycvstXK4fWxRDQTTcUxs0bBiLxgbA1rjNe
+						nw0/yP0EBEc59EhEszgV1B7lQ99AbxXaW3v7cpdsHd3m1+RAaNbnF34XI/SBs4dE
+						bqMH6+5vaBj7d25Qh+O56g/nFK+Za/GrywK8OYJETCCmKTJaDX2KrSWr8GhhCvpH
+						+nxY9AgN8wBF2nC35/0UvHLISvPjHXpCplEqHQ0xHHDsRsv7IVP92a4nimfidNK2
+						8QIDAQABo1AwTjAdBgNVHQ4EFgQUE+HRdHMYPXdEVqlkV13ulYgAJDUwHwYDVR0j
+						BBgwFoAUE+HRdHMYPXdEVqlkV13ulYgAJDUwDAYDVR0TBAUwAwEB/zANBgkqhkiG
+						9w0BAQUFAAOCAQEAD1RaAUKsoucwIWhuX/fXoKvn989YfmBONOGxXJJMLtG9S0/F
+						TRYEPKT0BaKmQvha1NH1Foeo0Qr5PsCyWWA3hUWeNHOwvcBRedzqicf6aYHXRNCB
+						97YK7WEgUNmbzwxiURun+hBNuBKGQgIfJ960HCHt1JneI8rz8I2d0KN9Y5NrUrBB
+						C9E7CL5PvOVAk5ryPt9nnqUH8+lpiWGBftZv45dh0UjsCIkJa4e0eUUQzJo57agJ
+						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>
+						MIIDSDCCAjCgAwIBAgIIBIqWvTgzVRkwDQYJKoZIhvcNAQEFBQAwOzEhMB8GA1UE
+						CgwYUm95YWwgVmV0ZXJpbmFyeSBDb2xsZWdlMRYwFAYDVQQDDA1pZHAucnZjLmFj
+						LnVrMB4XDTEyMDgxMzE0MzUyNloXDTIyMDgxMzE0MzUyNlowOzEhMB8GA1UECgwY
+						Um95YWwgVmV0ZXJpbmFyeSBDb2xsZWdlMRYwFAYDVQQDDA1pZHAucnZjLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiKaZ4qU3nGrCoSb9sRkt
+						k/X+131piJUW54UzIR1KPYpQNJgzImdApDSiS4AS60riPIC63PgE/DQg/F2jJRW+
+						S5Sey9Ov20zHIDvKnLJGNC562o+AJ9ycvstXK4fWxRDQTTcUxs0bBiLxgbA1rjNe
+						nw0/yP0EBEc59EhEszgV1B7lQ99AbxXaW3v7cpdsHd3m1+RAaNbnF34XI/SBs4dE
+						bqMH6+5vaBj7d25Qh+O56g/nFK+Za/GrywK8OYJETCCmKTJaDX2KrSWr8GhhCvpH
+						+nxY9AgN8wBF2nC35/0UvHLISvPjHXpCplEqHQ0xHHDsRsv7IVP92a4nimfidNK2
+						8QIDAQABo1AwTjAdBgNVHQ4EFgQUE+HRdHMYPXdEVqlkV13ulYgAJDUwHwYDVR0j
+						BBgwFoAUE+HRdHMYPXdEVqlkV13ulYgAJDUwDAYDVR0TBAUwAwEB/zANBgkqhkiG
+						9w0BAQUFAAOCAQEAD1RaAUKsoucwIWhuX/fXoKvn989YfmBONOGxXJJMLtG9S0/F
+						TRYEPKT0BaKmQvha1NH1Foeo0Qr5PsCyWWA3hUWeNHOwvcBRedzqicf6aYHXRNCB
+						97YK7WEgUNmbzwxiURun+hBNuBKGQgIfJ960HCHt1JneI8rz8I2d0KN9Y5NrUrBB
+						C9E7CL5PvOVAk5ryPt9nnqUH8+lpiWGBftZv45dh0UjsCIkJa4e0eUUQzJo57agJ
+						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>
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
new file mode 100644
index 00000000..5d071f29
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sandwell.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIAfYb8Pu2uYwPgeHKrf
+						lPAMO1suHci3KBE5i22esUbqgDb7THIbKO8Hbd+z9tdphWZc6PhmEFeOwD0BE/qO
+						hDlRj9NwqggXezX5ecLWIR4/oYku5O8AD2B6DeksDdUX/zbaDeyDa/guxMbMLzJj
+						PNzS0QR2/wId7sZOnMGhAzyUnMokziGb5H3w0qv121bywNxCBncJpY83RwSy5D14
+						0bsDxkWWwaHTFy3bl9Nl28WfcC294UOIMO/5y2BW6oWGfPo9Bkl4+/Co8Agidk2Q
+						MRWVzp6vtYBWVYASGYmNDw4uiyJ+A+sV3YNCTDwqiuqesPR2saqzIrxjYfYcapJg
+						+gcCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnNhbmR3ZWxsLmFjLnVrhilodHRw
+						czovL2lkcC5zYW5kd2VsbC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						hFHU5vFeYLlzBNR6FTzu937oV18wDQYJKoZIhvcNAQEFBQADggEBADx5fmZ91UY0
+						UljRC24uNiX0nHOmAwVZDDUdO7UUkTboKh2u+AmiLEAh/3hX4S3GnYKW8p0Q0QNS
+						32eDTMKf/7SWfflBVIhEUWo8DN4rZF4iL7Qoc7DiLt9QtQAPLlRGdenASN6WHpab
+						nH6mBdrLtGZ+EKS6H9DE1+9JVib+CUnLYbzfiWfCXrzHQa2/1GPi8H3vLsC0+s/y
+						xt4afWbbFiZgb0Jkj51pYOzvBJXeHuea8BvlfRb+2KalvimeFsCb2Vd+cmoewYMo
+						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>
+						MIIDNDCCAhygAwIBAgIVAPG65DBJJFPh5Jipeuryxop1mT/zMA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEmlkcC5zYW5kd2VsbC5hYy51azAeFw0xMjExMjgxMjQ3
+						MDFaFw0zMjExMjgxMjQ3MDFaMB0xGzAZBgNVBAMTEmlkcC5zYW5kd2VsbC5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIAfYb8Pu2uYwPgeHKrf
+						lPAMO1suHci3KBE5i22esUbqgDb7THIbKO8Hbd+z9tdphWZc6PhmEFeOwD0BE/qO
+						hDlRj9NwqggXezX5ecLWIR4/oYku5O8AD2B6DeksDdUX/zbaDeyDa/guxMbMLzJj
+						PNzS0QR2/wId7sZOnMGhAzyUnMokziGb5H3w0qv121bywNxCBncJpY83RwSy5D14
+						0bsDxkWWwaHTFy3bl9Nl28WfcC294UOIMO/5y2BW6oWGfPo9Bkl4+/Co8Agidk2Q
+						MRWVzp6vtYBWVYASGYmNDw4uiyJ+A+sV3YNCTDwqiuqesPR2saqzIrxjYfYcapJg
+						+gcCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnNhbmR3ZWxsLmFjLnVrhilodHRw
+						czovL2lkcC5zYW5kd2VsbC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						hFHU5vFeYLlzBNR6FTzu937oV18wDQYJKoZIhvcNAQEFBQADggEBADx5fmZ91UY0
+						UljRC24uNiX0nHOmAwVZDDUdO7UUkTboKh2u+AmiLEAh/3hX4S3GnYKW8p0Q0QNS
+						32eDTMKf/7SWfflBVIhEUWo8DN4rZF4iL7Qoc7DiLt9QtQAPLlRGdenASN6WHpab
+						nH6mBdrLtGZ+EKS6H9DE1+9JVib+CUnLYbzfiWfCXrzHQa2/1GPi8H3vLsC0+s/y
+						xt4afWbbFiZgb0Jkj51pYOzvBJXeHuea8BvlfRb+2KalvimeFsCb2Vd+cmoewYMo
+						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>
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
new file mode 100644
index 00000000..93d948fd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sanger.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsoZnFVTzScX4KleGsZ0R2/5d
+						E/ab+OrE9bttogijThDmtzzV/2hgkrOspcBHB/g1FzZfaCV5yMBG52W7mGurS6kR
+						F+q7uPhB3UJSoXwUz8tN7w1ZK6MHC8Cwy/nJfsbOhA4kTtk9r+6KFORBh8ek3KPq
+						RkNyDhhEYcIgK5HokuweVGjPWjmGFa7JKRhpnU9V1RnJY7coprT/3IxcJUfvpRam
+						bvYwZfP1VTMj4ia0kFrE6drOArfhq2MZupwN+YxmxXmv75vL2Xblxfrmk0BwHYs5
+						q5hcG75VSCZVeKlDEooPbb5IKjRM9J+ymKlfFyqZbUlkUJyBzHRz+hctqifrZwID
+						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAuc2FuZ2VyLmFjLnVrhidodHRwczovL2lk
+						cC5zYW5nZXIuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAl/k8y3QBmG
+						QV6XLFD9CSGFEOC7MA0GCSqGSIb3DQEBBQUAA4IBAQAEn6x7S/SeKxMLZUDkFXuV
+						f9Wv7z5UJ/2Xi4FyQDG+l0QCb+tVeMid1IU1EIuPQWsoWcpl/w9rXpHY2yHxBafA
+						VcHurzix2tquXbfQdrg/gBkwaDVAh/xmr6qhpz9vVyxH4JzUuMg5KFOOKI2UewE8
+						7aPjhhuWkozRDbcDd76EtyJIaknSjRlw6uncnY2JJLITzWnndFxCgZgiyWew6HGp
+						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>
+						MIIDLDCCAhSgAwIBAgIVAKQYJxHECH4G5xoOCxtCz43WOfkYMA0GCSqGSIb3DQEB
+						BQUAMBsxGTAXBgNVBAMTEGlkcC5zYW5nZXIuYWMudWswHhcNMTQwMzI3MTMyMDM0
+						WhcNMzQwMzI3MTIyMDM0WjAbMRkwFwYDVQQDExBpZHAuc2FuZ2VyLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsoZnFVTzScX4KleGsZ0R2/5d
+						E/ab+OrE9bttogijThDmtzzV/2hgkrOspcBHB/g1FzZfaCV5yMBG52W7mGurS6kR
+						F+q7uPhB3UJSoXwUz8tN7w1ZK6MHC8Cwy/nJfsbOhA4kTtk9r+6KFORBh8ek3KPq
+						RkNyDhhEYcIgK5HokuweVGjPWjmGFa7JKRhpnU9V1RnJY7coprT/3IxcJUfvpRam
+						bvYwZfP1VTMj4ia0kFrE6drOArfhq2MZupwN+YxmxXmv75vL2Xblxfrmk0BwHYs5
+						q5hcG75VSCZVeKlDEooPbb5IKjRM9J+ymKlfFyqZbUlkUJyBzHRz+hctqifrZwID
+						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAuc2FuZ2VyLmFjLnVrhidodHRwczovL2lk
+						cC5zYW5nZXIuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAl/k8y3QBmG
+						QV6XLFD9CSGFEOC7MA0GCSqGSIb3DQEBBQUAA4IBAQAEn6x7S/SeKxMLZUDkFXuV
+						f9Wv7z5UJ/2Xi4FyQDG+l0QCb+tVeMid1IU1EIuPQWsoWcpl/w9rXpHY2yHxBafA
+						VcHurzix2tquXbfQdrg/gBkwaDVAh/xmr6qhpz9vVyxH4JzUuMg5KFOOKI2UewE8
+						7aPjhhuWkozRDbcDd76EtyJIaknSjRlw6uncnY2JJLITzWnndFxCgZgiyWew6HGp
+						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>
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
new file mode 100644
index 00000000..2433b8e8
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml
@@ -0,0 +1,158 @@
+<?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>
+      <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>MIIF0zCCBLugAwIBAgIHFEQ62Bgd/zANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
+BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
+bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
+Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
+A1UEAxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTEyMDgx
+MDA3NTAzM1oXDTE1MDgxMDA3NTAzM1owgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQI
+ExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UE
+ChMhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9p
+ZHAuc2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD
+HcGGowpLtsHCqYcecx7WpHHnzd0RLJgUK74CkF5o18ZR6qe6Y/Ok0byxAYtwLLig
+PZqZvSctPGmBB+xIptl59ROz0y/iX1rJ8YojPxUZPw8O78vEuVy+auiwkxHs84mn
+mdAxObiCrePfysL9fOBYsY07Byvn/zxZfWFrFe+Ijl6kbLDpfL7Bl1/h6oL17ywF
+MlDa6PvZvLbq1JlOdrXoq3lPvF40+D15KBI61xooauMtkJhapDi842Dk6EVQuy+M
+fiEe3hwMy6k1N4KEkOmRsuFg3McpoTRrS6cScwaLZxrWPgG32gpvfM5WJsLfSnHq
+MT6UKugmWNSM/w+HEdwrAgMBAAGjggILMIICBzAvBgNVHSAEKDAmMBEGDysGAQQB
+ga0hgiwBAQQCAzARBg8rBgEEAYGtIYIsAgEEAgMwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSJ
+mWca+U0inH4Ylhqt3Txayi6rmzAfBgNVHSMEGDAWgBQfdGX0mh169jHp32EbcysN
+bdAzSTAaBgNVHREEEzARgg9pZHAuc2NjLmtpdC5lZHUwdwYDVR0fBHAwbjA1oDOg
+MYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9raXQtY2EvcHViL2NybC9jYWNybC5j
+cmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMIHHBggrBgEFBQcBAQSBujCBtzAzBggrBgEFBQcwAYYnaHR0cDov
+L29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD8GCCsGAQUFBzAChjNo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2tpdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAFngSGNNctEwO
+JEE88p/7h80qo7dcB7Xu4xAQMvBj3YzuwuT/h/ufgMheWxYxArwP87NWmquMYyhw
+yFO0dOlk94r991S7BGpwr5ULo4nltQkWOVkuFK/tooHgTfcAMW3Jg9GDjyYXQOQr
+kGlg4rrkKm6hyRlSxeDBrkjZOFgNL/nExWwW1bhM4wziNVppNhesvHgnvZOtf26x
+ixMFJ/A/tuJKo1upH0VuEK8iMbYkZusbevLABorQS02C2c/j5JD5Z0M8peykc4xz
+ArKnesWTUvcbcwMLgZhl8GnJZGr8UWkSpPH/IeTn3PTDjkf4M6+Sw6yopkcM4Ci8
+zea6MPIosg==
+</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: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>MIIF0zCCBLugAwIBAgIHFEQ62Bgd/zANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
+BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
+bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
+Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
+A1UEAxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTEyMDgx
+MDA3NTAzM1oXDTE1MDgxMDA3NTAzM1owgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQI
+ExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UE
+ChMhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9p
+ZHAuc2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD
+HcGGowpLtsHCqYcecx7WpHHnzd0RLJgUK74CkF5o18ZR6qe6Y/Ok0byxAYtwLLig
+PZqZvSctPGmBB+xIptl59ROz0y/iX1rJ8YojPxUZPw8O78vEuVy+auiwkxHs84mn
+mdAxObiCrePfysL9fOBYsY07Byvn/zxZfWFrFe+Ijl6kbLDpfL7Bl1/h6oL17ywF
+MlDa6PvZvLbq1JlOdrXoq3lPvF40+D15KBI61xooauMtkJhapDi842Dk6EVQuy+M
+fiEe3hwMy6k1N4KEkOmRsuFg3McpoTRrS6cScwaLZxrWPgG32gpvfM5WJsLfSnHq
+MT6UKugmWNSM/w+HEdwrAgMBAAGjggILMIICBzAvBgNVHSAEKDAmMBEGDysGAQQB
+ga0hgiwBAQQCAzARBg8rBgEEAYGtIYIsAgEEAgMwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSJ
+mWca+U0inH4Ylhqt3Txayi6rmzAfBgNVHSMEGDAWgBQfdGX0mh169jHp32EbcysN
+bdAzSTAaBgNVHREEEzARgg9pZHAuc2NjLmtpdC5lZHUwdwYDVR0fBHAwbjA1oDOg
+MYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9raXQtY2EvcHViL2NybC9jYWNybC5j
+cmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMIHHBggrBgEFBQcBAQSBujCBtzAzBggrBgEFBQcwAYYnaHR0cDov
+L29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD8GCCsGAQUFBzAChjNo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2tpdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAFngSGNNctEwO
+JEE88p/7h80qo7dcB7Xu4xAQMvBj3YzuwuT/h/ufgMheWxYxArwP87NWmquMYyhw
+yFO0dOlk94r991S7BGpwr5ULo4nltQkWOVkuFK/tooHgTfcAMW3Jg9GDjyYXQOQr
+kGlg4rrkKm6hyRlSxeDBrkjZOFgNL/nExWwW1bhM4wziNVppNhesvHgnvZOtf26x
+ixMFJ/A/tuJKo1upH0VuEK8iMbYkZusbevLABorQS02C2c/j5JD5Z0M8peykc4xz
+ArKnesWTUvcbcwMLgZhl8GnJZGr8UWkSpPH/IeTn3PTDjkf4M6+Sw6yopkcM4Ci8
+zea6MPIosg==
+</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>
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
new file mode 100644
index 00000000..4efa07dc
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sccb.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?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>
+      <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
+						A1UECwwLSVQgU2VydmljZXMxFzAVBgNVBAMMDmlkcC5zY2NiLmFjLnVrMSUwIwYJ
+						KoZIhvcNAQkBFhZkYXZpZC5iaXJrc0BzY2NiLmFjLnVrMB4XDTEzMTIwNTEwMjUx
+						NloXDTIzMTIwMzEwMjUxNlowgbwxCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1XZXN0
+						IE1pZGxhbmRzMRMwEQYDVQQHDApCaXJtaW5naGFtMSowKAYDVQQKDCFTb3V0aCBh
+						bmQgQ2l0eSBDb2xsZWdlIEJpcm1pbmdoYW0xFDASBgNVBAsMC0lUIFNlcnZpY2Vz
+						MRcwFQYDVQQDDA5pZHAuc2NjYi5hYy51azElMCMGCSqGSIb3DQEJARYWZGF2aWQu
+						Ymlya3NAc2NjYi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						ALqU8mPPY95/fMmsQFvqq1uBmB2jn8MFB8g0q2ZCVsAe2TX9wf/8+lz8H41+7ruR
+						Rk1j/oNg6XXRxhUjnOvHyXR2orF7CdiuLK+hqEuBYsMWE+jNWfHGzZegVlcbG2fg
+						GZnIyYJxxxiFkDwX7wxZo8wceljyzKGaEZVFA61eWLhFV9Xz8mjPGOL4zyes+w1N
+						TqGtCeTTeNYe98U5BCFMuf4LkypvZRhCrZJyqlId2vd8p8/iZojrqmR8jlqkQ04t
+						MV7JbmjNsOb0vudRqYHHlDzzi2Z3QczALkd0rSgij++tTKbPHyztyQ6OULNwi2tn
+						s6pFWvSnRpRVnAaMtgsRzMsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEANqsRmxFL
+						k0WvECnB+qPTmjyptPBaJCCDjvz/ZugIa322VefWwcufaV7YREAUjFvLepU6+RvJ
+						6lSkxIYNzx6B7f8F8EcaaebXGr4iOM4YDIoVfswAk3JsjZ3qYHZJkFMNeYg9QUjG
+						Mt35g8aroA9PHDeqIfE2le+15OWcMArivAMs0LM5sp7+H7LQDI8X/MKyCSlU5z+F
+						6rnLCkQDGHq9COUjrZW9fce+ekwK0eWzIWd4QQG0c+cMbp+toSItnYjuW5mkzjCI
+						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>
+						MIID9jCCAt4CCQCXolHXaIzX9DANBgkqhkiG9w0BAQUFADCBvDELMAkGA1UEBhMC
+						R0IxFjAUBgNVBAgMDVdlc3QgTWlkbGFuZHMxEzARBgNVBAcMCkJpcm1pbmdoYW0x
+						KjAoBgNVBAoMIVNvdXRoIGFuZCBDaXR5IENvbGxlZ2UgQmlybWluZ2hhbTEUMBIG
+						A1UECwwLSVQgU2VydmljZXMxFzAVBgNVBAMMDmlkcC5zY2NiLmFjLnVrMSUwIwYJ
+						KoZIhvcNAQkBFhZkYXZpZC5iaXJrc0BzY2NiLmFjLnVrMB4XDTEzMTIwNTEwMjUx
+						NloXDTIzMTIwMzEwMjUxNlowgbwxCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1XZXN0
+						IE1pZGxhbmRzMRMwEQYDVQQHDApCaXJtaW5naGFtMSowKAYDVQQKDCFTb3V0aCBh
+						bmQgQ2l0eSBDb2xsZWdlIEJpcm1pbmdoYW0xFDASBgNVBAsMC0lUIFNlcnZpY2Vz
+						MRcwFQYDVQQDDA5pZHAuc2NjYi5hYy51azElMCMGCSqGSIb3DQEJARYWZGF2aWQu
+						Ymlya3NAc2NjYi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						ALqU8mPPY95/fMmsQFvqq1uBmB2jn8MFB8g0q2ZCVsAe2TX9wf/8+lz8H41+7ruR
+						Rk1j/oNg6XXRxhUjnOvHyXR2orF7CdiuLK+hqEuBYsMWE+jNWfHGzZegVlcbG2fg
+						GZnIyYJxxxiFkDwX7wxZo8wceljyzKGaEZVFA61eWLhFV9Xz8mjPGOL4zyes+w1N
+						TqGtCeTTeNYe98U5BCFMuf4LkypvZRhCrZJyqlId2vd8p8/iZojrqmR8jlqkQ04t
+						MV7JbmjNsOb0vudRqYHHlDzzi2Z3QczALkd0rSgij++tTKbPHyztyQ6OULNwi2tn
+						s6pFWvSnRpRVnAaMtgsRzMsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEANqsRmxFL
+						k0WvECnB+qPTmjyptPBaJCCDjvz/ZugIa322VefWwcufaV7YREAUjFvLepU6+RvJ
+						6lSkxIYNzx6B7f8F8EcaaebXGr4iOM4YDIoVfswAk3JsjZ3qYHZJkFMNeYg9QUjG
+						Mt35g8aroA9PHDeqIfE2le+15OWcMArivAMs0LM5sp7+H7LQDI8X/MKyCSlU5z+F
+						6rnLCkQDGHq9COUjrZW9fce+ekwK0eWzIWd4QQG0c+cMbp+toSItnYjuW5mkzjCI
+						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>
diff --git a/swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..aa366fe6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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="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>
+					      MIIEuzCCA6OgAwIBAgIRAJ6cVoL9srwAECkklTq3u2gwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAxMDkwMDAwMDBaFw0xNzAxMDgyMzU5NTlaMEcxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZaWRwLnNjaWVu
+Y2VzcG9ib3JkZWF1eC5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AP3E230Ei838R9qQO32a5tkzyJemr9fmhArIZKTQsQpr9TwEPoIyaDYTQELhcuMG
+bKEojJ716N+8hRNhghNFKGLMO0lGE0TZyxBC28MmttMmad6TLtOEZFv9Py/TTFrq
+pgOy5v0Vb3v/81JwMYT1U9gTU256OSOZg9NSZUxsNbEbyibq0icxtzDceOotn7Bz
+pBTjUtOxZ00igLSoWS7SLPZUyjX2jfgefrDOtZ0/hxrLo3Klx7YC2uJlrrCVZA0s
+87rMSCt0Ra7ECME4JGdNxs5l9EpjGvqvi7zqV9Sg9RtsWKc/Y+me7r7B+SVz3QoY
+pSrgKTSG316/JcEYf6GeFkUCAwEAAaOCAbEwggGtMB8GA1UdIwQYMBaAFAy9k2gM
+896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT0hWtM6+5tMUzDBzmPbfKO5mK3DzAO
+BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwXwYDVR0RBFgwVoIZaWRwLnNjaWVu
+Y2VzcG9ib3JkZWF1eC5mcoIbbGRhcDIuc2NpZW5jZXNwb2JvcmRlYXV4LmZyghxz
+cnZpZHAuc2NpZW5jZXNwb2JvcmRlYXV4LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQCU
+ORaZfIPKIh9EZsSb+jKw2rZaU8E0l1j9RhtphhaxcXJND0CgjYdplldUDghacRk9
+aYG3rlC6KLcGsUThOx70QbBZrX3MCYkhjNzRnxwm07aj/nV/GB5jYlgK7aMAT7PB
+qiZBvL/hVr86AIxZvzIzphIpy9Qq4GEnItVFhGOycQklELgKWE0nkfAqPfVEa6et
+6/0VcjuF7/2icJmG8FguWm8Bhjc7++RNdCN+XW0GMSNb7cJNIdrhV9pDPg9YUUuW
+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>
+					      MIIEkDCCA3igAwIBAgIRAJzjTT6bg4+QhDI8IGescp8wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMTAyMDgwMDAwMDBaFw0xNDAyMDcyMzU5NTlaMGExCzAJBgNV
+BAYTAkZSMQ8wDQYDVQQHEwZQZXNzYWMxHTAbBgNVBAoTFFNjaWVuY2VzIFBvIEJv
+cmRlYXV4MSIwIAYDVQQDExlpZHAuc2NpZW5jZXNwb2JvcmRlYXV4LmZyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0y1w1SapxrGmZ0kcubJtxA+a+DH/
+nv0R2Qg4WdacENkzIyNVOdzrwYzHyo4Qux1M+mpWF+0A34ILNTtZyD09uRoYnj5F
+7JmY6Rdd3sjliL+b8V0+gr68Hu6g6c/KD+VtYuW8OiapKLWcP6dHHSkLPt7Aipb+
+BaYAeV7zsKergliVKn9vdcTN4qFSYbZLsFCCq+TLWcb5Zt24soRf0Aig4ATEMO5X
+z8qZAHShZ/83yR5Ql5ChhnaH95ldUhyfVcbC2lcOUGol4UKIr9Ndl3WA2LRE4Y+Y
+slyGbVOt9v6hk3cAsJgw7T3K5E+AIi6SuL7k6p3x/yuiHquRUZjT8Owj3wIDAQAB
+o4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0O
+BBYEFLJC1NFm9gAudgj7xxJCW095Qwl1MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMB
+Af8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAP
+MA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1Bggr
+BgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCQGA1Ud
+EQQdMBuCGWlkcC5zY2llbmNlc3BvYm9yZGVhdXguZnIwDQYJKoZIhvcNAQEFBQAD
+ggEBABM5crkQbXiRohcjJgae3y9MPJZcWT5EKLKVc751iA8KXo3wVF8rdwVhESQ8
+cmd2BV7qYQBh19mPfWA9A3nNRhc92ElackeBhF9nOQAoeiWCtTwyqQFlY+Sy9t7/
+o+wpprhtqiBgLIVTduiDGGnlKasbWG9Gu5dX9SZ99YSRrYKN8bJAnyKgnhhPLpcz
+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://unknown.site.com</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.scptuj.si-idp-20111102.xml b/swamid-interfederations-2.0/idp.scptuj.si-idp-20111102.xml
new file mode 100644
index 00000000..780af699
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.scptuj.si-idp-20111102.xml
@@ -0,0 +1,75 @@
+<?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>
+      <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,iVBORw0KGgoAAAANSUhEUgAAASoAAABGCAYAAAB7e9m6AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wEMEwwc/t6cOAAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAACAASURBVHja7L15kGXZXd/5+Z1z733v5Xu515K1V3VV9b5J3RICLWgXCDAjtvEYs40Mlpgh7GA8xmMgPGaCMGYcM54hZmLCYRsvMAaPBhBCwCAhkARCSE2rW2p1VXd1d1VX15ZL5f7yvXfvPec3f5zzlszKzMrqrhaCzhPR0VV1393OPed3fr/v7/v7Hkk/+P8qr1LzgMT/dttu22277eW2pCzL23axrsWTl3VW/8yXd53dttt2219bQ5Vl2W31oBSwt2Sk/MDfbe86AGb3++y23bbbXi2PSl/WWSBo/JuiyDoTttt22257DRsqY74+/BYFjILiB2K+XZ9qt+223QZJlthXcHoXKtdb8KPMQKC4WVv/PBqNlujux9ptu+01a6jyPH/ZJurWw7ybXTQaLzW7hmq37bbdNuBRVZKvfZiniohsaQJFDYiPiJWym//bbbvtNW6obh9GtXODIus8MV0XQgogKqiYHrS+23bbbnuNGypfupdnlrYLyYwEr2mHdkZVoofVxa0cSDRhu7Zqt+22XUP1snlUG0Eq4UamZnSWNHpJgz83Pf+p71Mpfp1PphIygcCub7Xbdttr2VA55175VSQYFdmQ/DNdE6OBFWVwgGKiUVPASwj7VAyoQZH438DlFdwuTLXbdttr11BZexu5StL3kIyC8ZCqp0JJJmukNBHfxmgO6nGANyneVClliA51Cq3gJMMbxYuPoZ9id7/Vbtttr11DlSS3J+snCoJgtcT6NjXTppo0cStXmLn4JFdnn6GaLHPi6AQHpsYZqqWUTrm+ssb5i9dZaBrGD9zPvqn78ZW9rPk6uQ7hbAUlBTX4Xa9qt+2212ST0R//LQUwKqgQM20hNuuGcwKggopiNKJJAojH+OCRGVVSX9CgTdq8RDH/Rdzyn3H/qQ7v+eZDvO/d93PyyBieFaCFUiBYICNlnKsrLT77hRf4oz+5xNnzVWbz07jGozTNATp2jFJt9KsiUC8x5gR8RNyNhpCx/5y395ioIBuOdX/7tT62ESQ0KtGQh2NGb/OzIIi+OsdUNHrh2x8bfL/Bd9/4voOA6fprdjPKm93v5R37Wt/v1TrWnd8b+3Nn1wx243Yc22iLusdk6u//3jqcumucuoZIEGTAlREB1XBMVbEIFe/I8kXs2vPk1x9jTM7y9jcO8dM/+V7G6tOg51A3B6ygtBFT9geZJuAzkCGwY3g5jONOfv/zc/zrXzvDot7FfHGcIjtFSybxmuIw4Tleo6tLbymRG7OifnBx+Xp/j4Hn9wOJk+2al/BuJo7RLswweM2uh7/d/W7nO2x1v9vRL1+Ldxi89sb+/HoZH3Lg739cB3NvKtxIier+OFqp7sexqlR8SXV1mrUX/4R96Z/zPe+v8eG/exf17CWcu4TICoYCpYwzKADqvTVRATWIGBSLaoKjSmL2UnKMTz/m+ZWPLnDm+kMsmwfIs4N0dAiVCLjra7B0eZNv0/33dZ9Ov36ff3AQKrcw2QcMg26WeWaTvtki2SMbJiib/GbH3yHer+dbbTBguoNLKWxd8jH4bfXVG1Ov6j1uZXxs+B4y9fc+poN0Sx2o3ZMefWCgnk+CS269MkyOu/ZVVi78Jh94l+VDP3CUB+5tou4pMDNI1zi9zKf1OoyR08w0j/PRT3X4T7+3ypX8TTDyEKu+gY8kh/WU0Zt88NeiAfs6ftZNDc5OJvQWf79p32zISt8wXl5h3xn6gpF6C8Owe962L/Vqj+mvpzmz4XvIsX/4/8V1wAw8ZbfL7EB3+2jGhESVYS1ZfeHP4Mrv8uEfaPAjf3uI0ZHzqL+EmA7gbvmtVUFk8JMZVC2q44i5k08/0eCXf6fBZ8/uo3HkXbRcHY9FJUjC2Djo/V+lCbvb/vIng97ma+rX8LzXSEvKotjmcHGDa5t6YcgUrJ3/AsXlX+d//R/v5lve5UjTp1A/i5h8nc8djM/AV9hGvjMA5IOhnEdEEebx/iu86cETHNx/J//8X5/hU2c6VA+8nVUdC/d5Wabxa48tbfHqu2237bbtDFWlUtkwlTyC6U3+QbzDes8o0Lz4ONef/o/8/E/dyXe+v4P3X0LMEiK3Q4RP1i8vETQzZpmKnuOOfU3+8YcfRf7NLI9fPoutPUIuQzjZZVrttt3219ZQZT3CZz9i18gWD/CSB7GI99SMpzp/lfNPfIR/8GNj/OgHR3HuT7BmsS/RMmBwFBmwdLKNOyH9UA8JqUsFxQQWO11BvRwrVzm+5ww/9C1jzP7qY8wwRdMcI5chROwA6iC9kPVGRGKrYz7++XYee7nPsnvs1o7B+u1EbuexjSjSX+Vj3T58NY69et86yfPOFtBe/2FEoeoN0p7n7Of+Pe96/Ro/9Q++EV/8ATZZAHGoGqAKJKAWSAnkBYNiIt6VIGrDn8XG39lwP28oveC9wTuLK8F58F7wriTNPI2RFnAJ487z1ofu5fnLKf/h9z5Np/ou2hzBi4mZwN34arfttr9WHtVQtXrTHxlVRkvl8pcfY2/2GP/yF78Pl/8JJp0LHphWERkHP0aZ13A+Q10F51JKJ+S50G4reUfIO0qnDXlu6HSUdjuh7FgKp6y1ClotR2tNaa2VtFtKc60k77SY2CM8+sY9vPPdFptepHDn+OH3v4uvPPVlvjR/F5IcpjApXoNXJX3Qa7fttt32V7zJPT/zSe16TTcclMBQreAxVy9w4bP/il/8mWG+//tykuyrYBZQ30DkAT73xyV/8YUl2q0RXGEpncU7Syf3NJslq80OzWZOu+VZXc1Za5Y0WyWrTaXdElQEMTbQH6iAsQgZQoo1IH6JtHKNf/TTx/jhvzuO+idwjDPffgvv/ZGnGTv9Eyywn5Ih2N0WYrfttr9eHpURw0bnYzA7ZdWT5h1mX3yM+483eedbpkiSp0GaqFYQs5/PfAL+yU+/yOVLkzjfQCVBfTfkM7H0xSImwatEYqfgsUE9oWJwGmB8r4o1CSa1JFlKNa3QWVmlbgWrT/Nrv/IU7/2W/Rw8ZrF6hYmhF/nQf3U3v/rJL1KZeC9OGxGLX68iuhmHVV6FY5shb7d6jC3ucQt8yE2j363+7Wb3u51Z/M2utdN/e6X32erYdvdnh/1yK9fcyXdgh+e/0u+3035+ufd7pcd6hqqaZn3CXfeEgaeuOaWcu8K15z/FP/6ZuzlwaBXMIkiJ6DizV2t85CMvcP7SYXJzmrI6CmmGsQlYi0kSxCa9/9s0I8sqpGlKkmXYLCNJK6RZBZMKNktJTYo3IYBLEJJmmyc//glGGAatcH2uw8FjFpES7y7xgfc9yL/99U8yeeQ9+E6CGg1Md9V179Qj9mm/BOV2H7thkN2GYzst09jqvHV9sMW31m3up1s858tpm73Lpv+2Tf+83PtsdWy7Z9qs7zY771auuW7csPl53U6QLZ77lT7LTvppp322jkV+m4/1DNXg5g4b64gEqBQ5xdw0950wPPxwSZLOgClCeKUpy0uey1cKSpni/m9+P3bPXnIDGMHF4kJP0J3S6LqpBKUFH8F+xVCI4glekKqiUSI5dcKeygg5DqVDVulw4vhe4CsAWFmhkTzLN79hiE9f+DIy+k3kGDTSFV5RXZT4sNHEZjP8FibMzkpDNmxscZvcmM3u3/u33vt5FPOXVjrxl7KBx8C7D24mslXfbcXH1HVFvTt7h+6n9XJrNYmb9tMmG6K8amN0q2fp1rmouc3jok82TypZsuXEsArVssP0pef45ocyjhxeAp3rYUBKm8aoZ99USm3UkOxp0BqpkdtuLNktwVGQfiZRux1ruqJ6MfyM4ZqRWGXtYchbZp57EauOam2Jb3xrjcZkC/UdxIDQIpWL/J0ffDe/+oOf5Z63vJFVP0SJjVXa23f09hOkSzvoO6Pbb0yxxfUH+lVVMWa9t9e/FyFUlhvP28mA2ey8TQdhV7hQuu8X/t8/b+stzW67UZH+Xfrfa11xy7bnvny56vXvvvGaNxsb/b7WgWkjm3tQtxp3bbCKuq4OT6Jabrd/BlP6N25f1x1nm43ZWxlnG88bJBXEgt1eP3adjVcyJnRdEOhJZKNUhYSXtqKBH9Be5dr5Jzj+bYY9+9uorvT1N6XD/gMJ3/mB0/zhnz7BwsxTNEbeQidJKQyIH7y2bPg6g70UpVuMiY/me1vD103C8y++QDVbpT68wA/8wOvBP4OIQxWMKUn1OqO1ee47XifVFdakgiXZJNjtd2gIcYIwn4hB6Hp0JvT7uoqtgaEoZpOAaxMuiPQnm6j0QEDp/X/wQ6yP2AUTnm0n3BPx4Zo+VmaKBxUMEoQHe8+y4ZmjlEp/1dKB+21EDfy6+4Ujm3GQbmYYNhrBcJ4VHw2OAQlZ5jAZbsJ5uuFZdna/G6vxBvtzg4ESv4kBGBg/60K09Qty6F9BVOMFzebjZp0R8Tf+W2+q+A29rJvMK13/nAN7EQzCIf2v7Aecis24Uhut6eC7D1ZKy8C5Pj7+Rv6V38Ia38jNkigrI0GqZYMU8cDkUYW09KwtzTBW63DsUAVYBO0MdFwH9S/xvvcc5UMf3Mf/8sv/D6cah0kOHiU3Ngw2lTi5yw1W1m3x5/A3ETDe0FpYoD19mWG5yr6pZQ6f9KifQcTFxy3BLGN0lnuPT3F2aRafjeElCd6bboXmyMB9Xa/a0eFuXFxkIFTQnUo3b/277orTNVo3rj4u6kJ1deO7K5SLXn4c/OtOs0h0wVV1kx693cj4K5GwVjbPzLqbXHn78wb7N/TDK33Onb97v1vdbe8zWefFSAyxdMOiNWCkJGrJ+a3vZ2NPau9PfvvnlAEvVHfaN5v8uXsdtdF4b3bNG++fVNfxqLS3pluFqilZbC1w9FCFe+/aC1xGBsVqxCOsoear/NiPPsyffeFxvvgX/5l7936IpD5Fbj1eJK7Um79dVwRP1umkK0ahQcKLz3yFSrmC8Wf58R9/G/ACKitxxQpLn2pJZtc4OpXwxKUrDB2+j45WNiivs6V/3TUaotrD0daHeXqTfJ1sW8en/Zdd54LfrA5Vt7xjX9li0A9btwnZliHqxlXza91erqXc7rztev9rJwnwatcV99/yRk+/773srKZ0q3Fza6Nx+9/363y3us7Or5k4t8kKJYrxgPM0l2Y5PakcOTIG5BsmA6G+z1ymMVLlF/7p2/jA93+MZz93gAfe/UGulx5vLGEr0a0Tr4IgAn7ALTUKmuc05xfBrTGxv8U73ncKV/45JvHrnsEIWMmZHHYszp1n4lCJdlcT1R4C47d0m4N8TRfvWOcWbzoU47MbH5c6c9MccFeMRnQQ94ge0C18/J6Z6oG4XUPp2D65vVVo9DWHzncwOHXbRWFdKN4DXU3MFn09blp7u8vRB95PXIxm7cBwi5pxKjdGuNsSbvomz9/0XbjxfhtFrXRj+LjVdW5uKJPUbn6JBMiMpWit0tjnGRlJUQ3KnLIB9xEp8f4KJ++8yC/+/Bv5Wz/6UZ4fOcIdb/tW5gtdlwzwUSHUxu0alJgdREhjpk61oG4t8xdeZHWtAJvwhve/g2vtefY2/KYbPVhR6hWlWFumYhJK7fPDQnbF9+oGu8bRdbOMsaRHxPZz8Sj4kq68zTpZ5t4TyI7HnsegJgUxfVVLdYg6LNqTgd1MXbEnW6M27NYjac9IKR5USSgHkhxseN5Xf+rsGMKOg2c7FclQeqU3eLLr5XtMRG3AmjSGD3EV0BLFY1Rv+f187JRbVbnc/ryNdaA3ntf75S2Jaw2MRTsQHItBxCLYXjY32IyiOxK3jAG6Cp/+JkPb97C8sL8UIohJgghm16PHoeoxcQ7dqikeHMNbbu5gnFJRoczbpKkQfqY9KeIAZA+e0UT1Sd777rfwP/3Dd/Nzv/T7jB89xfDxe2nJjbiPREOiCqnNmLk2y+ylOUaHhzl15zHSTsm1C9cY33uAyTHh7MVfx6WPIsZvwCOi4Qu8UawrGak2MHkF7x3Oe1RcqC0U7cX6KkGhVE0wVK3VnObiSjCgqqh17Dk4iWiBEn5nbsCFdh4+iRgWltborBYkzuKMkjRSRkdrWPyAXvRmg8JHXMtQ5ob52UXS+JyFeMYmGySVBLwDIzuabJvydr4mhurmE1L0xuzbur6I4LZq0Cu7fm0pYN4Kahz1iSGGakkEYm8t7H25crw7O89sed6tGaqbPIcYmqttWksFxtkwdhJHY7JOliUY77cdExuzgpt54l5ML0vrjaXVKmgurGBdsJjOemojFer1CkbLWw6KN/ZnkuftTQdT6iAvwBXFDTcRubGMzhgPNHGdc/zQ3/4e/u1/+jOef+xzPDJ1J87kOOmnScUrRm3MLlqsKkcnDrL6whLtK03mzTx7x0do1CfQXGm2zvKed00wWptDtB0GsfafQaKbWxZCoilVUpQs8CtseJ+yLMh9QcfneF8GhQjxlAhKglvJWXluDptHbatRGJsYQSVHxd00Bb49EiJYk6Gryvwz09RdSsc4KodGGa5lODo7+pBGEtwKrF5cRFZLjCqtmmNi+DQFnWCQXxE6c/OQaaf0jNvXNhTIxwxV9HOxPmPt8hLlYkGiimsYqpUKpRVU8x4uqLfw7USEUv/yVc1Eu3te3kqYLqgkJGXC4rNXSHKDQdFRw9BojY6W2C0SQi+HVqAIahMoLUvPzpB1Urx6yrpSvecAZZqD5q8YvdugRzVwwEMmSpLWyHNLpwNJ3WwNGWoCOkxiDzA3U5IxArni2h1qo7UYqUalKytUbIY1FtFAB0hMjQN79nH1wlUWLs+hSx0oFNU5Jvcs8EN/62Gs/yRGOgzg3b1WqmGtBZXqOOIFo9JjuBrAmJTUJtTNEA5HXuQ4LSlFUZOgOKouJXMJDkcbz1A2hBO5wQC8HEOVUqWjORWfMlRWsLYkSypU02pIJu7kQ6rFpkJFExJnMKqUriSxlqQyhEr+6sLIr4T4+rINnGwSNkkvFLRlQuosmQrGCaVXUptRydKBlAO3ZKi+XtrLNVQiKZ1WSeYThnyCquJVqCQZUkmwWkZY9hXynbqhpslwhVL1CbUyxYvScZ7UWKqVjNth85OtYtXuTjTVoTEWFoSrV1c5PZltAnIIaAqM48u7eOIvJvn5n/skFy/uZ/jUIUZHxlgVxZiEJMbLvZ1t/ACR0hccODbF9bk5dKlkublEYjuofJXv/sAk+8fOUpXLGDqbvkjpEmbmlay+j9y5HkTdU7rSqHPlFUNCalM8jlwLchGEdgjxvA8gOaDeYSJstdPOXt+f0pvY3e29vA+79/hII9gOuOzRGLB4rxgxeFG8epx6jASvwhiDwUX22Y0AtNwuJEr7tIpbHeQbjdTOz9+M+Nl/L4PB4HHqELXhu8uN2JTsAKCX7UyZyiaaa6+6pUJ2kJS7MS8d0v5KGTxP9agmvdCyFx3sEMPb9ltpF0z3qHicFngjPY7Z7SIGJ977TQ2VUyi8Z2hkP5fOlJw9O8vp+xugcyhlb+KpryLmFKsLJ/m1X5nl3/zyn3P+8nFGDj/KPa9/M8ZUqIgPmFR3VVUGNo7o3ZGsUuHYicO8+NQ5MmsRneHUsUu8882HSfU5EtPcYhClOD/Ehatt6uMHabuSxOgAMB73I+sBgL39wMhMBREliZ5d2AYsZPO8BtKrqt9+RV7naGyYEPGAEx8MiRBNSuQ7uRIfGS3buCO9b1KqsmYLJHUkCB1TkmsZ+F3qb5Ipuz2ez3YGZtPzY5ze34/xlT9T11R5Fw20gmpYoLz6sCB0kwvrzl+fbdo8hb7jhNcO0hTbhdM33n+n+UqNfSob7xt5iyG73O0XxWsAtr33A0zyV55WURTvBK+eps3JK0GEwCXBCahqclt2ikqybPPQzyqkFkYmD/DlGeHM2UW+QxsoaWSOJ+BGEHuKc09P8Ev/+9N84hMJ88uPcuqRd3L0/tczNLWfjnPUjAEjlL67oWR/s0MdAJu8LxmfHGZhrMrFF54kM0/x3/zYGFN7LiC2g9Na/DglQhFWDk3AN3C6ly8/e5Xjb7ibxSigp67LuN7wMaUbXQvGQyKW1KZx5TGoCZmCLMtQS9jq6wbrZNZdTjf5gIPbkKWSItbgIlXBq8dYyCpZL/Trr1yyhcExiDHsP32IpAyhbZGU2FpClnWFCG/LUs7WPBe//Xky6H5uMC7qBibl5mz27mHVzb2p/p6GgfVtizTWkyrdKoskSUK/qrnpM3dJlLqp5zlQirLO75ItAHHFqB8IwdatMzvCBAdB6s05R6x7JtMbM3EeqcFIirNtVEJm24iCgSRNsBUJGJVu7Bez4Xn8ln218Tm8CaTRg/ccwzgbes06aiNV0iyIZ77S+C8py803d/AK3sPQ+B5yGebCxevMTtfZu284rFRuAniET3ws4Rd+4YtcuHSINTnJm7/zexk7dhKqGXiYyCosTE+TdzocOHqEhTKnlD7HWExkyIqCVXxRcvYrT7C2+FW+49vGedObjkLyJdqcoCNTGApS5kmYwdIBEpybYHauynOXcg6+aZTcGUyakiRJKH5Wj3Meo25gIA0wfrvOlroY5jmcV8qywLk2YrRnQMQIrrv/4U2oQKKKqA9JdBXUh9QwOBSH846yLPGmWDcoPQYVw8A+ZjFNW6DGMDJZx0r4+CFbWFAU5ZYp4O3UD4x2U9px8iNBnkekP3h7pSoSMkbqBxT1tae0rxIzTIPnDfDSpJuyjvn0kNDY3DZod19s7wcWG+1t5OZNSL0nrsuBc5EzZylVaXuCZ0ykpkQAed1+kqabWrfrDF0/pIljQmOZEjY6yBtWqF7Nocd61+cBdsf1ph7LugrH8E7xm/fHYx+fExHUE8NaD/E+siHbpxrKwUqEUj2JOkQV55XcK6ZURF00cC5+RxPlxyPhw4PB9SgiokSsVmKxfyhxwTuM96hxiLE09jaiom/oC6SgKHLMbeDsbU1PiJOj0hjl6J2v48yzH+fqpTuYmEhwuojV+/jnv/BF/t0vr9J2r2N4/+t567vfTzI6QmkTrCtwy4v8wac+ysK1szjXoTF5iPd874cgG6Ywkc0hgjGW0nnayx1aC0vsndhDNnaSu+88xrPPL/PMCw2EKmiOyhLH9xU8dBKMXkW0hvfH+Hf/9xfZd+TdOB2hbBfMTM/QXG6C81SGaoyPjdGoVzHWhoG3caVW3yNmhtI8IUkTRFLAgQhJ3CC10y5wzlOq7yUIbnDLbajXyypCYhNS0uhs6LrY31qDMbYfloqhLIT2WoGJBtGJ4CgwxlOr1sjXOgFvA0o8adVEo3zrhipgcZBGvbCi8BSFC1hdDE+7npAXcMZRGUqw0WNQDVXzYlJcKXTaOd75yPT30egE2lOuBcMjNbwqnVYJLhBxt8QxrCGr1jBGcVr2DGbphU7HI86TejBeCYG1YJxCy6NZiY90FI+j0aigvkC6OKk3JKZCu51TOh+qEga+TXf7eGcc9XqNIs8pc9ej1fSM/AC9IE0TKrUq3hVhEluJYb1s4pWagajY4BVULWWr7G+62as7DaU5Eik2NklI0wwvni4vQwXKUmi3ShLAFEpCoNQoYLxg26BFgDHalFRqGTaBzloOZYxqcEhiqA2lveygiRhdq+OgcKEOTxQ1nno9gOVFXkKpaEEcKw6bCVkliYv1KzRUxiYbwMb1xipp1Dhy9wN84WO/xZmnDnHq5OtYXlnlx/7Or/PVs8OU9mGm7vpGHnjzO9FqFQ8kRcHa9CX++Ld/hUbyFI/evcIjr7+L3/mDT/CJjxR86/f/DyxQUCSBqDf90jRzL12judgkKT2VZBxDxkc/fp3f+b1ZxGRAGsDFpOD7v7vBgyfHUVnE+wbt8h5+5/cf5853vJVzX73K9EtXoYDEZNgIKV5CaUyOcOKuO2iM1oN3ta5op89GD5PTI4klkUBfEBLy1ZLZC5e5fmkO1yn7/dbFYOKkU4HCKNlYyoNvegBjlcQkvcHqxOM1bAVmrUWtHRi0KWvXl3j2sWfINHg2TVvQODDGw2+8n+ZCk+ceewZWCwywljkeeeujJJmJu1DfYpAnBnWGsgXzV64zd2ma1vLaOgPSXeHXyjYn33gP1eEGJhI7FIOUCbMvzjF3aZbWUhNK39Vi6IF4uZbU9jW4/y2vo3QFC5fnuPT0C9RNtVeEHjLAfYuqBuoTI4xOjTF1fD/eOIyE3z175lnWri4x5FNSb8kwGKBollx5/Dk8ihdHnihH7z3G+PgIpQPrA/fKF8rFF15i/sp1ylYH09Nckd4u3EXqOHzvMcbH91C2POefOEux2CFRWYdLdg2cqaWMH93HiTuP4pLgidvN6cnr8U1AjcW2hSc/+zhJYUhEonSMDnwHh1eoNIbYc3g/E4cmSYcSsKEqoSwcL37lPPl8k5q3VMlCf3nFL+c8/8dfQaxSGker4nnd296AMZblmTkuPnmeisnoSMHp19/F8PAkRouey1gh45nHv0rr6hIWwWWW4w+cYHxshBJF2sqZz32ZtB286aIqnHz0NMP1KvhyW82xnQDuA/v6bf5r6wxuaJh0/CF+9p9+mj/+9DE+/ZnPs9Z5kMrYg9xx/xu5543fwHKRk2Jwa4s89+TnOfuF3+DQxCX+5n+5j5/4e++kOgLf9V0H+b4f/BRP/Ml/5vg3vR9Pg4uXrnDl2UskHaVC2it1cdoAM4TqYcRpJGGuIP4lOnqZkiXU10jMEf7wT9u09CEuXWhy7UqTGmlYOWNVicXigebsEl9eeZK77r+LyX3jG+D8mE3z4ClxJJRliVKAGPK1ghe+9DzlYpuaTzFk6/a/VpVe/O414AKppJSlQ3DQrVwXj/dhNfLeh9DPFfGDJbh2h2svXKXmEiqk5FLSqA9x952nabfbqPOhn6I34rRES6Uo8ljSs3MYKhSMJ5SrBRfPXGTp6gJDUqVBBePBmJBQ6JZHePXghaIMoavxSt7MuXDmImszK1Q0oy5Zr2ayX7WhWEmpUKEoC1zpsWqpaYWGy/rETOkJlAU4RdRurQAAIABJREFUQD3FXJNL15dYmF/gjntPYisBe0xIyXxK1SUhOHLhYxsj1CSElSUWTTxWDWVeUniHemHh8iwXzr5IVhgSZ6hotT+hJRTkewGjDvWGIi8oS09FUzKvJBokut26yFXI1xxXz10mzVKmTkxQlPkOtciEQj2mTKhpSsUnYYHs0WviEhovVq54rpy9yKWLL3H36+6mMpKB9bjSk6hFfULF24DdRBck9eFbi4NCbUjolEKZO4wThnxGVSohM++hzAuEvqEyajHeMESVVKGjBuuCJ1XgEK/UfErmgndovUIJRVEGRvwWkqeDpE7dPvTbHoBVAyPHjnDqkW/l4hcn+a3fvU6t/m0MHzvJw29+O42DU6wUOSmOlcsX+fJnPs71S5/l0YeX+fCH9/HtHxjD62/jyhYPP/oQH/qvp/hn/+e/p3HoOMMHHmHhpVmSDgxpGjGGApUCpwXgYsFyV7eqhWoT1Q5g8LqXpbVj/NTPfZL9h3+Ca5fWqNtRUKXEoQa88yQYLEJVUop2yfNnnqNae4Dh4UqPpd7zphDUhH+wRhCbIj7h2uUruMUOQ2UaQzLFqV9HXehOSjWBMChYbGKxiSGRBBFwAz8WEZIkRU2gKyQ+48UXXmRteom6qVLiKa3nzgfvotJIgBIxth8aRADemBD6IeUN4eV2zF/U4HLL+aefJ7+6wpipIT6klsM7hOwk0Xtw6hAjJEmCFYNpea6cu0g+3WSYatCjiNk236tECoYuF4/FkyYpUGJEuhuq0RP20VhKpNJFysi8wZoKzaurzA3Pcey+o3Q6DidKaUpyhcSFENprmMyhgMbjhPCNUJIkwahl6eoiV569xFAnIdFuuOMpuwXpA+FcqaE/0ySlMKESAK9R9FEpNFIhFBIMmRjqmrF0dY6DJ/ZikhSrN+cWeCR43CYYZ9NzsxRFYwKmi1MG1dsGGflayTOPn+X+Nz1EZaxCadu4uMzmQCa2dx0nSh5VCQr15N4F2MGCMaaH5UGJNZbEpkGAIEIiRk3Ek+OirIqVMO5UJCSgdMBNFMWKkNqguLstpVcHw+0tDNWgzMsgX6JLlCy8YE3CiYfewPjYIVqLqyRpypE7TyGVjLJU0rzk4lOPc+YLv41b/Rwf+rEjfOd3Huf13wC+/ALGLoGUuNLwkz/5Hp4+P8NH/ug/ctejGdr0ZGrxzoP1VKsrNOovkWUzSLIa5Fx8qGkTyVGZZnSowHCQqv0Gfv6XvsDE1PuYvV4htUOoKrnPSRpVhhp1RKBod1idX6ZqKyRY1lY7XHz+Anc/eDcm6dcTefV4Y4IXASGVi6dc69BcWsP4yFrG0TGO2tgwJLJe/UE93oS/VYZT8rKgIoKXAsXFlHkSDZxSeoeqw0jC9avzXH9plpqpoHhy69h/+jCVkYyibGMMOOcityrqSfVoDgUYNyjVsDXaL0FIw2KYuzDNyrUFxqSG+DCYOxSQWrIssvu7p/mUQgqcK1GFxSvXWbm2RJUUUaVDidYslXoVawczgIIRj22klK7ElaFoXGMywBmFzFCK72FDWjooPDVJMapU1bIwfZ39J6co8AyNVrA6Ql0zWtebuFYIxbViqY43IBWceFLjoWIovcOvOeYuzkKrJPEZTpS25mQjNZJKgol7XPrYfcY6vHE4XxDmSZRQUaVIPONHplCrtJeadOZXsS5kkTsra6y1cmw1cPG2ZT9I8Fq9kV7k3i3O16rFZ2Hh8KJo4Sg6Jak3pBr+y9dKXjp3kTsePoUXGJqskVUThjRj9cpCxAENrmqo7x3D4cgoSROP0xzVZB0eiUgsPSuDR9mzBxESIcgdqSheFeccDhfpIDqQeAicROddXyBgC/KX3wH7IzHGbFm4YFSwIlhJcVnCxJ2nsAJ4T+EgweOWFnny07/P9HOf4djUS/zEz76ev/HdSn34Gby7hknavUcxdoGy/DQ/9d+/jgszMzz/wufJhh+JksUl9eGUhbnH+MbXLfAjP3w/neJ80LLqpV8Nwh72jKxQY5jf/qNFPvYJ8NUDeD8EKrS1TX3vCCfuOkmtUQc8Radk+qWrXHr+RYZMRiYJM5enOXLyKI2xeqhZlO5q3vVUNO6Kk+LKNmU7BxWcOlYl58T9pxneN4ra9aRKHeCYi1FsrJft7T4dV3jtppPFYG1Ke7ngwjMXSMtw/7YvqB8cZ8+xvZDEgmoBMcE4eTR4EFH9wloT6uB6WItuSQFQFCMW33Jce+ESDSqoeto4zHCVg0cPko3UyLIE4v26/qapClZC+DV9eSaoUqO0yKlPjbP/5EHSWgbJekMZcp0hZEyiAVP1ODxrFBw5eZLqeK3HfTJemLsyx+rl69giYMZlO2d1bY2h0SEOHtuPHhWqPuXZPz9D0c7D2K9Ypu6Yoj5ex4kbELcTVuZXWJ1dInUGJyXLZZsTD56mvncYm1lMlybTm0zxfHUY0yVOehxKYZU9dx3EVi2dxRYvPXmOcr4VoItI6jU2CQXAcrMilFjU2w071VPiqQzXOHTXEUwaQ3Dv6TQ7zL80S2t2mYyEihqWpq/TWj1ENlrj8KkjGAzFcs7izHWsCqUrMbUqU/cdRZJA79FIWeiKf3gCbuqjBxXGrPQE8EwP/Nf42zB+jTFIVK3tq53GbKsxgdM1aGN0INOu6yNCsy0zfRPGcNcdsx4ySUl9Ahri6DK8H1Y9+eI8n/mNX6Gz8Ie87RvX+OmfeZS7710kyc7h/RzGlDDAlxY62GSGw4dn+In/9hQ//c/O0fan8TKCaAfLItL5PD/5o2/kjmN/jmdmHcwtMftgOcBXnxF+/l88zuihH+bK9EjUZS8x9YSp04cZ2zuC8aEzK5UEc/wgS4sLtK6vkJiEBLj44kvcN3lftPgaB2IofO0aEhWhdB6XF4iGHE5Sz5g8vA+pBEdbZEOuerB0Q/sfTQmhiFdHGO7BGCYm4cWnz6ErHYSEtpaYsQpHTh8irQ7iSSaENQKCw0vQczcmbm2GCQNM4u4/upVDZcAkzM9fp1zrUJUQZrohw/EHTjCyp9EzwOEZ+/GtjxnQ1ZU2a8urNIylwOGrlqP3HCEbq4S+Mxt48ipBOUFAbJCh9hIwuxxHUq8ytncYHzlrRiz1kRpnFpZwyzmW0Aeu9FgjpJnBi2AclLjoIYZJRKrYSlDU6C673itrK2u4jiPFUGjJxPF9TJ0+hEqOJ6bs13Hgkt6c6HrMGrX9FUWtx1tLpZFhskBxMEKgoYSPgjFyU7BQRPDWgukuQcFwOOOojNZIKwJxgRvZM0x9bIjn/+Is+VLAhU2pTF+e5o6JOwKlw1hy4yM3PS4x4pEUkiyE1AEeMZH3HKgKatKQo5RIGu1xq0x4f42M9x6NwmOswXil1AANJCo4oaeoYIygfRwANaZH3+BGEdOdMNM3NAeZybDehItqX1lSFFIVfv/jv4FdPscHv/8U/90/2sfI6OPY5DxKCzHuRlqbOIQWxl7lgYeP8s53H+Y3f3ceKw3EeIx1PPKGhzl+7E5yP4/IPkQ8UKC6hmib1FdZae7jX/4fX4LqOyjSuyj9cgjxjKcxOUZ9zzAOF6IW9Rgx1BoZB44d5PnFc2G1E2G12Qxck0FIXXwI0TTB+TK43b3wLLxH0clxeU6Sdsl5AzlDCSyWQUk91ViELYGDFEp0FPWKVcNLz79Ia2GZVJPgKVWUvcf2k41Ucb5gnfaSBgxIYspa0bCCuyg9rNvH+j2PWTKuT18nxaA+eAjjByeoTlQpTB7xiv5YWIdtOaXdbOPyEsFQ+pLhyb2YahJwnQEhTh3wTlxPQim8p4rGkiDw4vC+wEkeE/oGEgPVBNfMewmVsiiix1LEkqQ4rY1HnMSQxKGahzS6CxtXdHKludrERg/HKzRGR0IG1keu0YB2kg4AKCo+GMBopEycC86VQazSe0qjFKlHPTgTS5y84Jy/6T64gV3mAiUo4oOqijeK1xIXIYiAoJZkoxljBya53pqGPNAzlpeX0dJHdn64TkgJJVHs0uN8EZIk3sXFzgcl3DgfQgpSY9LEB6qCupAZjrMkhHcuYsT90K+7IAfXP34TdfhY2UHPYN6Y/evhVAMlSjqAYG4I/fpOmNHg0mURhtau7pKG1RxfUrTaXJ9+jvc81ODDH3qIkbE/wJgrIO1oXPoqmWbdnoEeZQ1bmacxPIFIE9U2DsNCy3LH5Hv4mX91DWvuBClAS+rVgjtPVXjjAwfxK6v8i//5s/zxEyd4+L3fy2NfmQnsW8JESIcqJJlFnY9eRfBuEoGhWjXsIdgqsAittTXyPA+/p4welcZyl5LEJnhRktQiicGRY9SQlPDck+fYf3wKb2I2LIrZpVlKbbQWXGyJWjyqJKbvYXkNYLAYQ9HMmX7+MtJxKEJulOG9Yxw5fRinnV5hatcTCvykEEIR9bCtEawoxgR9di+yvRifGiwJrbVWmLQ4TCKMjtdJKyH8MN1MygDIKSJ4BWNTOs01bMwMqvdUkoyyE5VmYtmGmH4opWJw4qnVs3UlNaHg20VSY7duERCLSS3GhpAxldDPXW9FfAyX4u4vdMMRDeCwMUE2Wky4N8aTdzp9AyxQr9XorHQGtK+Cd9OlpDqCF1Ibsv3dkXAxM2iw8T6SQJF61hIfUvcmJB1sNzSSjSRPc2PwZ4J37FCSGGJqTF5056iNeFZqDdV6BWd8PyPoHN4r1pqI20Q4Q/uYJkYwNhgk072vRF0v7/AUlJQYYzEGUo3VGyJdEeyI2wY4JpHY1+ojeTbw3ZwQiKciGJNEQ7UhuJN+aVOYI5AOLBIu3jP6fyQbM0QmrvTio/vn6dPzu78xlrRapVod4dr0NT73+fN8+4EDVCvLYdCZVZBynRTL+vByjdHqMgf3T2DMciTi1Sk6KZ/502uIXQpa6AKoRbRNJbvA/okLHNk3yac/V+Ob3vdh8soUzfwKSTczZYS0koUYubeJgiJakhnDUFVIUkOxFgp68yKoKAw36iAeJz7iFPHja/CukjQlqVVoLa2RqJAINKfnOTs7h1+vxocaJallTB3Zz7ETB0mMJ0sgNWDpr64SSM9cePY8fq2kolCIIxmtceLeO3C+g9fyBlkzVe3xs4OMeklFYCiC1wWG3HUDiBuLS70PJNUyz3FOSUUC4GkstcxSzyx56SlK7S9M2gd5vQh4T7u5FrJ8zpEay+xLV7hy+TLeDGybJP2nKEWpjw/z8Dc9HFfg4Pl4HxYD1f5/XdlWH0PZULsXddDoh6ReB7zMyEtDutfVdeJ73kWgt8t6N/Dsl56m7BagSz+Z1AWVXaIcves4R08e66KCfXC5CzT7MDmPnTqCnAi4rheNiY1B7XbWA82Dmvn037uHATFgzFUHyLeKF4/JUrw1qAa8yeeeMs+RalBd6J0jPhpn33uWwYRZ1yA69bg4/43LqahnvFZh/55JnFraPuXp5Bk6IfjHa0w6RbikGxauQ8l7x3XTbLTgMV5JvVJLhKOHj2ATgxfLYqvFldk58jJ4dEn34wQqfF9KNEksUoY4XyMRryv5qmJwRnnLe76LL3781/nZf/IlzpwZ5/v+5lHuvm8UuIj66yBlr4MGK7sTOtSY4+D+fQyPtFhanEH0AAahwgj4Edbv9+TRPOfytZy51Rqv+5YfJJk6yPJqTqmulwIWa6hUomBaPM+oI02Uu08eZnWt4CtfOUseXV7vS7Is4dDRAyzOLeDVxYyGj+5tIC6mWULWqLBqwiAShUyERKPYFdpnfgsUec6V5kvUVHnkDfdweO8o4yMTLEx/PmANkXO1NL8I7Q6m9GEFMZ4DR6aojTYo8tWo+zVQuS6D63LkfbmC44cOcPLYJM12kyvzS1ydX6Asyhtq17pbdXULrr0rcXgSCZ7uieNHOHrnQa7OXOely1cGwuEb+S9lXmAjKG41fOpkYID2RQcCL65AqfjAC3cbaRISFxQZLPjrG6QQIprgXQ5U/EtPnEJ7GadBXfogdmhj4kGDAkW8qvVQ9YMVbQPAf8z8liqRVySxqL1fo4qRiOV4MguV0Vq8io1GzN9Q3xZ2Roo1neu2CVu/b9W6gqH12tihigHBxs1Tukbee0dZOLJqMpD8CGFvgB4GqhUHxpTpKrCb8A1Qz5AVTk7t5fTBvZRFznyrw8LsCkXZCTbCh/v63s5M9DS/umFemD/9SKxPlevjncZ7RqoV9g3VOHn0IFYMq60WlxeWuTY7R8crYoJMTdI72XRBQ3pb/ujApCBKZ0jsGGdg38lTPPLe7+HCU3v43/6vP+Cxxw3f8f5J3vb2+7nrwSr4syjXgGbQVu99sA7KNK+75zDf8+0Zv/GxzzM7fxBlBK8NROJ/1FAJA8XSQAWWm56LV5rcsZcoMRo+ZMiKOPBgxWI0Uv+94/DhQ4w06swtzARjFL0lDCw1V3nq3DkWV1fAmDhMYvgTd88xmWXq6BTtlSZLM/MBtI5uMQOyGakYUi9kCJTCzKVp7Dc8SFId4srMHM219sDeIYpNDKQJ3nQQr4hXlq5fxxUHY6bE9waAdEsZRHu1b9IjCyoXr0wzuzDLQrONZClWzOby7TGzVKsNRUwiDGaM4drcAvNulVarTWICaVIGCoX7NW1hvETkBhOF5pzRPkwwwPf3CIWECoEe0LfOS3S9TTVMnMTaxffw/Qks4ZtLVG7sUmx9XLUHpbKsMZHSIusysh6PxeBiYkMlTCLfTasOlNJ0IgrYy45Fz81IwPVCpo6BL0oPDDfSN0LdPhHfL1bWDXWHXaPrvcdpwL008vSkt32WDNR9a88bUqKsNQFr8kIvieVFe7sTSfd54z4DPZX9mABQCbDEyHCdwwcPcm1umrmFea4trdChEjmAuq7m3MSt5sI11u9x2LMZAyIE3WBOVEmtZWxkhFqtyuW5efKyYPb6IkutDppmmGiMBemHfhodP6MmcIG8xI84eMP+alkGt4sD9z/AnoOHePGr9/HYFz/BU0+d57c+do23v2OI93/bIe574A4wS6AzqLYQStASI5ap0WU++H13c+RAnSfOjrLcHMXpFGtrDZ5/YZHlZaXlYjlDOw/egCtZXVqitdamklawxlBqThK5WGW7g/WxSME7UgtF3ubSpavMzCzSbhfRG3GBiJZaNEkC1uQ9XsH5kEPyZWDnKgXDjYxT959k/vokRe4pOnkEYcOGqRZhdX6R9sIqqYbCiU6z4Oyz51kr2qyuNOnE+kCvgvOesfFhqsZyeWUZI2GFWb62yMVnz3P0riM4DcCtjaAwvmQoTSNW4KLksOHSzAyZdRQu6MtrGcMUWT+g8PTwNG/KyDwPK796YW5xhdHhCcQmuMHat4FNAYKh8ySVNHCTNAz4pD6ETUIaoWvuNQ7gsBAKdigLE707wdSFRAXRYMZKAEXxYkNI4R3qC7y3Qb7MhxDHuiLSSbJorDQWPfv+JO9OrIi0mmicIsLH0ESDQsuQTXVBttoh2DTQMqo2cPu6hcnda2oEm13eDt6EC76LWok1l0AZPNZQlRNmjxtgDGnglGBMEu2jH6jI1l7tae/Xg0RhC2WRo5FTh4RKiMQo4kqMF4zXWFwfXyHSG0LZhwMfiJ3Bs3HxHW2c+57nzr/I/PwsbV+iSSXwrdB4T9PDoPpha8DEyhiZhX05hdQYNCZcUA+lo7vpcWot8wuLTM85nBIxLkWz6rphp2iUbYJQFR1/bAyU3pEN2v0NgJNEsKvjPenEBCfe+GZOPvAgT37+D3ns3J9y5oVpPvqxKwzX5nj7W0/yN77jPRw8bKnVW2SVAiOOKkPsSaZ4/6NHedNdh/nKmYKP/OaX+Oyfnif3o/jKMG94+zuojY3x2Bf+grITJIHLvKBYy2mM16nVarSWO0EF0Sllu0XVgvEliSmx3jE/O02ZZMzOL1B0ipDqFo+pZKSVWMIRK9O77rbFs69Rp5YMIaIUhWPVCEO1SRw2ri5BTcCoo4rh8L438LnPfJEXz18KYjiqzC0sUR9vBP6ZaECanUdwpOI5dfoOFq9doj2/isGSFI65i1fZe2Afw+NDlEUbKUtSlDsOHaHd9DzmypAlQ1ALrXYHWxUS9VREGKoNBW8zCWFX6ZWVxSXqWUp9qIHHYGojWCu4sJkhrijptDshHdYjRut6WZaeIoRSr9e5qiUYIXcle/cd5HUP30tWoVeZj7U4Y+g4z9zSYljdO2sYB1bDwoANnvBQknDH3j0YKaI6QkpJwgX7LGsasobGKePVjHsPTiFFCEPK0vKUd7HwShHvaGQZiQiFdyExhGc4TagkhtWIsZSU3HXfgzz08L34TiuqWKT4JOXq3BxLq8soDmuULM9xGiZeGRd1A5w+cICxsRqmLNHE0MwLLl2+DM4zWqtxeP/R3kYKPa8p4n5OYGGtxczCEp1euBQDexmUu+lrSvVwHq/4vAgGhpAwaFQy7r/jDuoZYBPOvfASxpUIScSwYwavdAxbw4nDR8myjDW1PDGzzHnv0GDRKPKC8dEJRkcaNPM2Fy9fwWDju8TsZyzP8b67xZzipSQxJsAjCHvHRjlw4ABXLl3E5gWJwMlDB6nVaqgRVvOCl67N0PFlVOwweHMTwufGlLaIUPoSk2ShIj1mJm4ozzCx8LqSQWWCh971X/DQm9/LC09/maef+DO0dY1nLq7wHz7yKaqVBWqVFdJKpxe1lS6lXQzTbI3Syvez0p6kOnySt731fYwdOEi7kkElY2LfHqYvXQnlK6XDOE8tTRkbHaY9sxAHKeRrLcYaI+wZHcL4MlTWW6GZw7PPXw6rsSQonlolpV7JUNcJnoqPcKI4Emc4MDlJRXOMhq4v9yU8d+ky7ajMaQIxionhYQ5M7KFma9xx9ymee+4FUlvB4ylKx8TYOPv3TLC02I5JggSPo1ZJOXnyKInmfOr3Po2WgQjeWWnzwplz3PPQPSQJHJiYYM/YGBmGorka8Y9IpYi7Iu+f3MPkcC2qMRi8emauz7HcbOKd58jkHibHRkNmyVguTM8zsWecq9OLZJLhS8/y9UX2HdmPZEnMWPZpESFKVNSX1CtVRsbqoXo/FvG2Oy3GJocZrple/tkD11dWWFpdopoE7Gd0ZIRapc7ClYXeoBfxZIlhrFFHfBGTAsLV64uBBS9hB2sjnsxYhms1rA3XywsJm3TEELIsPCP1OkP1Gkur4fufPHocXyjXzr7Iss6FsiWvLK0uUqtneFsgJqXZLrgye4Wy6DBcs4xPTDA8NIRJq1y7ep1nxeMleNEWITFQiVm96ZlZlppNMlWOHj5MLbGkcds526WsxJhWRSiMjZ5libFJMAMmhJpWAzVA1cfMYswvKGRpxkh9lGfnn8a1cyyGUj311DBWryLtVTAG64KwIqLRwwze+ZGpA+wfGiLzJeo9qVcq1vbwCwVWVlsYm3L58mVWV5cYHmowse8wZ554ho7VoPMWd3bKrO2Fq0TPsmt0V1YWSa44tNPm0J49TI6MkEkIU2fmlpleXqIwBrFpz/s3W5bQRGiz51nR3dfLENa2DqlNMV56pSWDF9QojSI26FVTtWhliMNvfhNHvukRlq/PMH/lAstz0yzOXeHi/DV8WcbwwJJmQ4xO7Gfs5AGOHTjB5L4jNMb20yodbYTSCt6VrK2tolqGFKwKEyN1Th47hG+ucOWZ50PcjWHm6jTPnnuexsP3kki0/mq5vrjEM2eexWqQRsl9wR37Jzi+f5IssZxrPo/TMuJTcaeNskR9GfAMDB2NHJ6g8kdFEg5O7WOokiEelturzM7OolbwPmTsRuoNJoeHydRgXAB1S18EwiOOTmeN4yf+/9LOrMmy6kzPzxr2cMacax5UoAkQgpaE1HJ3hH3hCP8T/yL/BUfYF7633Q61HdGyjYUbIRBCiIaigKrKrJzPsIc1+WKtfc4+WYnUEb6hIMms3GcPa3/r+973eR9w59F9Hn/6JYUXaODy6RFn+zv89OdvsVPmBGuZuZbHR8/xMgkvkxXr9s0DDranWFNzOrtktphTVzVKCsaDAbdu7JPnOc4Hzhcznp2e0ijNzo1dHn/4GVrF6d/R108Zbk+49937OBURITK95GM/YcR0WJLnBYN8yO+KDFO3KATHL15w+OIUcW8PFcDYlqOzE+q6YVgOOZhOGY1iw9mYiNnxRD1UFIMEKhO3ecum5fjsPKbuOE/w0aLhFDTeMjcG2SQjtywJmUrb5IBpHc+PXnCgDyBIdrenzM7O2RlPuLG/w2d8gfSxd/X1V8/5/OtDhDS0xrCYL+P5OrjBqBxEnVHwOOcw1ibldtROOa9Z1A3m3DI7PcEbw+72NnvTaVxored0PqdtGrQI7E+nKBlbDK0PHB6fclYtU8shEFa6Q5/oDR0oLBC8RAbB9mTK7nSbj377MSfPjtAiSmksju2DbS7mM0bBJcpn7CM6EzVivm1p5kuWlxUz45gUJV5Di8CpOLns+rdffnPIB3/4EzoL3Lhxl8lwjPHRBeGcQyTApPAOYQxbgxw30igBPti0C9S0TUshFQ/v3aPUGd4Fztuap6fHVMbhtVwJQUTYFG9czQvS16lCO8GYl5LGWxCCTGrwafKyQdRhpTkJKmBwOOFogkNJgdy/yY0bt7hPRi40hdCYxkTZAYqqqnAu0PgW4z0vWs/zo+OVzB4pOXlxzOnhc4q8wIfAoMiZDAvq+QU3DvbIhxn1siFLAs//++5vqJYzDg72ETJQVQ3vv/chtjFkUkUVtoI33ngN4wx1vWBZVyShd2KDg/cROFYby+HZJefzBcu2iXmAUjDe2ePw6RESqKqay8sFH//+U3TiSAUFSgtm8znnzQmLapm+LnDBM18u+fKbbxDC8+CHr/D14SH2fIFGoLzg8z/+E6+++oh8Z8JifsHZbL66jB0RFAJVXfPk2ZLF4iJmMirFIC/YnkzZmo7xxnExn3Myu+RyuSRksd8w3pmwc+eA2fMzSiHIheSrTz9nsZixe2sfLWL/LdcZW8Mhp8sz6lHJaDomKMlkb8Ll1ydkSiOLgm1RAAAYeUlEQVSs5+//7lc8fPUhxaBAKInOM4ajEcbCixfnnJyeMRgOmC9qFlUVe22peb6ol/zpyWOEsyilGIxGTMbb5HnUMEWBqOCyWvDZl0/QpiETcOvWA/KywHFOLuPW9LPff4p1luEop7pYcP/ObdCKcmuMnhTYypB5OH1xyq/+7lfcf+UhOldsjae0beDk8IwX4YS6qWmxFIOSxaKNRnMhovpCwuHJCWWhGGea/f19BlmOcZaqbTk5P6c2lnFZMt3ZxipN4z113fD84pzKOtCd0TT6WHwyGak00Q3Gcnl0htSC7dGI08sj3v1v/8DJ85MEyogAQbTk4OYBZ6cnDLe3cC4wGA1j/7VtUSKKlL/+05fslUOyrRHn85psVHC6mHNRV4gyx7toNL44OeOD937H/Qe3mR1fgnO4IKlmi7XSSQS0FBxsbzOcjDl8/mJdlSVi7XQy4c7N22Bq5lXF+XzOyWIGuV7dg38JhNw1n7QMckV4fInNlLxldbC44FFSkwWdpl3Jo+TjFsSJgBOWOpjVw2hTDWgIVKFB+AbhY+yTzgu+evyE93/zXlz8Unffb0hPYxNfIxloncbp8SIUWc7l6TneO9766dv8+tf/C2GjuFQ4+O0/fogqcpRStFVFJjKUlHgCjXB854evIgrFV0eHOB+4aBtsUuYKH0NTjY+6qhezBf/11+9GJbfUidiZFLydNEEkQoPKUfFdjMpz8jxnXlVxCpdAaj5EoqITEtOR66TgzZ+8yXv//X/GNmTw1IuGX//Du7zzi7cZj0ru3rvP2fk8NtJFbAh7KTiZzRgPFFJpCi2YFiW7422kECznFXNjeXF5gVeCkOcrtKmUghsP73F6cooyDoWA1nP8+dc8+/zJqpHZ3RFt2/Dm3/48bg+D4P53H/HB4SnKRxmHqVr+8MEfMMiEnPZJ7xS3gfs39/hX//pf4nSGVGrFjLI+EifQGcNBwTgvmU63aY0nuMTuCgFPtM2oLGeYZexPpwwGA7b3t3ny5Am5zNAB7MWc37/7PnIQK5jLH73OT37yYxgWTG/scvLl03itZMbs8Jz3n0U9nOvEWl28Vi55/a03eP2Nu7T2NCJ60qxMBCiLnL3tCbtlSfCeWbXkbLHksl6ilGY4HjIZTqito3aO89mMWV3jsywtUqLr+mzILHwSSc9OTvngxVGkb7rYNy2kRou43XQisGgbXv/h69ze32d3NMA6R+0MsiwZTIacVRXKCZSDs6eH/P2zI0SusIXinb/5BcVYM9rdYrC3zfzolAGSzMLlsyM+ePY8DVtihZZJFXuvIvbJiixjbzLhvFpSNTU2uCQyBSUkSkiqtmW+mHN6eYmT4POspytJU9sr2Yb+Ghi07vQc3xa63Anh2hCQwURFtY8NU5XQJT54HBaLiw97d6G7iWqaHCqfTM5SgdIIJckyHakEawj0evwe1jHoLrgo2deCOw/usDUeEoyNK/fWNscnx3z4248odYaMzTdCa5KNQCJ8wAnH0lv27t3k1qO7HF+exwVa6yRiC8kuE21CTfDMFwvO5kuUzslVBLQpOkhdFgfY6TNGNnS8lY0IHGyPePXhPUZlgdaaL796FqdYEBEqPuJzFYIyV9z9zj2Ov/sKn338RwZaoaXk6Okzvvr6Jm/97C3Oq5qTy4u4FfUupj2HWHFoIRmXBZOyZFDkNNYxryoulgvqQPKSbZhxCMGzf3efm6d3+ObTzymDjohAETnyoa+9ECImoimNVxkqeCa7U+5//xGPP/mMPF3bTMYtQOg/8AiMDGgh2d89oK4blFY4b+J02VsUkp3RhMkgQyvNvKmZLVsa7yLvKE3scqHYGU+YZnG6djafsX/nJnysaFtLlhAxuQDbWKyIRNCnJyfY4HjwykOWFxfMjs/JpUYChcriva47tEp8eLyMEVN7u3uYqiUQsMEiQ0TtTKdbjMYjlsuKebVgVleYEAhZhkWytI7q9DRep0Qb8JmOSvmXcmO6V4JN/baYczxIAblCB0RQq4QZi2DR1hzcucVfvf0mk2FJ6x1ta7iollTGcvPubZ4/fYaUGcLHSi0AtnE0BFDx60VecOv2Df54/ILa+3iPCx81YSJqwyKSOPZqfZrKmhA4XSx4cX7GvFpifUR9h3TvzI3h2dkZdb2I4lQp1iz8K/E6gj8fNq/9S2kw375gRSaRRUjQKNqQHOsyqmXjyiivh9A7yJUiCzE6PaK3Yy6dcm69UAmxCl5YjXE7W4OS3H/0iPuP7uOdRQYf7ToB3n7rDYKU/O79D8giunSttBeBxlusgt37t/juj35AlpJ0ZYi2k1wrjDerBTHgODo7R3tLVhY4b7HWoLFroVt3U6VqUKSpqZegy5I3fvQa46JAGBMZ595hvKXyBidiH6vUmukgZ6gzlFS88eYbHD0/ZH56EplNSvCbf3wftTVid2+PC9PSiOjbcsSYsEIp9re2KJOl43y+YFbX1N5hZRwhdW/ttWM9/VN6XvneQ5QPPP3iK0xTr/U2fZ2xiH0nElZWhdiX/M6rD9ECHn/6T7R1HYcMQq6vXVhjZXy6kfEOH+K5aLzEuxatJdPhiOBaThczZm2LCWBwmBBH28FJyixnMhhiqgWz5ZKFtQgFb771Yz743/8H42WcsBJwAZyUOB8rcR88B/vb7PztX/PJR5/w5edf4K2PNIergQUiSj9EcCznC2azOa01NM4gsUiv8SFwdnlJtVjQeo+XamXBj8r7JM1IBAKv+qA4seFz6wwgIdmEfLLLRK+g3RDtBqANnoevPuSdd95hOCqpm4bLxZzW2rTtHfGjN1/n9PiYJ58/jjKXpOpyCLxVSO/IvWJ7MuXWj3cQzvHJHz7BtE28vuk6ymCTFix2FoOMk+TKtbw4OwetGQyHaYCSDP1o5qYldxaU6omGBddZkcO3wInCqke1wQa93jG4Yi2J9bjUsMk+ujbsoNvSJaSEB0xiJnlAjDTTezdXeI3VOLwjRPa+nuWKnZ0dHty9w7yaIxrNuCyjTMJbdJHz6PuPyIYlR88OOXx2yHKxjNqWPGfv3gEHN/e5ffsmWZERrEcHwWQ4Js9zmss5W7f3UVITXISKjfKcUT7ifLFgsDWGXMXtUTom1RMSdu5yqSTDsuTBg3uMx0NcG32FBvBas3v/DjrZOfZ2t9kejih0fEudnp8ikPz0nbf53YcfIZQiKEktAl88+wZfZGSDgsmNPcRkC5U0QYM8hqs21nB2cUHrXdxiSrHaUoieuG91iX2ELI/Lkvs//xmL117j8ZMnnMwvaa3F+bXVIwCFN6BEYmAHtA/sTCbc+6u3efN73+NPT55wfHGBtTZp0dYqZCckapDz9PQY07QYBfsP7pFpxdBbnAxc1EuWiwVNsDgZiQeDyZgdocjS9sAIz8liRjW7xPs4Jt8ajLj9g+9xc2uLzx9/ybyusd7j00Taq4D2nklesFUOUOWI3V++w+37d/n62XNa00ZqqfNIGfuHQUYYXI3j7OIcZ1u293coJgOCjN7Pw4tTyiKLD69iQ9TYjwVbR1JsXgPSJC/4wCgfUI5zQmpvBA/l9pTxeLLiF0CgzDOGZcmde3e5desGUisOz04w3hKMo5QZO+NtiqS3++tf/ozd2wd8c3iItVEQLQKMvGeS59wcj8nT5O21H7zKdH+Lw6Nj6rqN6JwQVqDIaGuK5yduHgI7gzEyzzgzZ3F7HrqCxcWwFhEIsl++/DOgjtcJlf/Nv3vvpa/3WdnfCqcI6zf01e976f/FgBmC82mVjvYGi4ofykdtThf9I/rS3tQnESEai3UIjPOCYZ5HgqEILF3LvKoxzjEaTchURr2sMdZSO0ttWrJhGYmdzqClZFSUDPIiWgikYlZXXJgGZz2lzhkVBaWWZAHm1nDWNnEC1Q9n6E5/SIzKpJAvtWJSFoyUJkvCuIVpOK4rTICBzhkOBuQiTtvatmbeLPFesD2coLTGhGgA9kpwsphhMClIIpYno3zAMMsj80oGbFWxaKoYmtElL199AVy5vsrDWGVslaPYV0sVyHlbMa8rfBArW1WsqOMGJROgbWB3NGIk81gRCMFJVbGwZuVT82KtzHYp3SeXHulgMBiR6wIhoA2WZT1HGLs+Zh/QOmNYDFAyJ0iP9Y75cray0WgE08GQocrTmD4wd47jxSxKZmJpReY9e8MBE52hXAIOWcuFaTFSxmo9iJREE++92rTJ2+vZHo4plcaGSEmYLWsaZ1IiTFi9aF9igotrwkF7/yF8IEcyKoaovMA1Lf/pP/6HiE3xnp27d/nZv/glRV6QpxCWTGskHmMamrrGhLhYSwnDrGCaD6MzIsQwiPO24twbrIifWRERR1vlkKHWDDsyQwgsrKUR4IRa3Td5liGRBBVY1hVVa2JgSpYzKQsGaSv77OiI//Gf/wvCOqwANRry47/5BZOtSTyW/99wB3FNOGC3+jm/eYNHJlKS4idTqLzm+2SK2+r+XCnqdT9pKKCJxuXMS4blABX8moPTwd96yvgAlDpPyGLP3LUs6oo29Xom5YCR0kjnGOU5FAOa4Fg2DV4GtJIUgyFaKGyIUVUuWJZVg3GOTAp2ywmFViAE1hou6wpjDLlU7JQlmVozioJPY+DOrJrc5F1V6H1gbmuWTYVznlxpdgaDOKpNacen1RzrLEIocqUopEa46KD3SrJoKrRvEAKUC5QqYzwYkGfxTV5bw/lsHt9cqtNWbcL8xEa4XCQORKimYqucIF0K6wwB6Rw7OmN7mtPFpvuUdjOrFzTOInxgbzSlFDKqslO5vVuWbFPgQowVCzJuYWpr4sQzOEoytqZjgo+j7GXTsDQ1Hht7nilTclQMGGYFAoEJlnkdF3OVFh8tNLvliByJsF1SDgyk4Pb2lJmpqdoaPEzykrEuwKwplJmU7A6Gqd/SbU8DbfBcLmYMPORaszWYxjmr89S25rJaxtCP1RAlbHj6ZPLFxoi1zYRl76MuSvj4fQOVM8oHkaTrfHJGJPy2AOEdgzxjnMXhiguCpp5TtTUuha1KESeHI10wKYYoF/u5cVdiKbOcKZLzakEhApiavckWAyFQzmF9SjQW8XiKTvqe9E6BQOsbFosl1jkGUjEexvsPIajbhoUxfPH06xjyEKJbQRGiXzh4xLcFkH4btaC/0IeePOFqxOEK/9btUbvCtfN+rQyNnT9T8OdiM/t/p08XTSYUbqFyhoMCFUS071wNwEz8cpsYTI01tM5QmyZWHFLgZdRQZTrDW5dWx+TTkzAos1i5JfRv6y2taamtiddECgqdMSyG6BDTdxtnWDZ1DCItC0ZF2WGkVhlTArm6CCFVAS5pvYyz1G2NlwEhFMVgwCDPkR6sib2ORdvgVSBoEeH4wzi16SKOnPe0bRMd7UJQ5iWjokQ4hzENy7pKFgeZelBiXcn68NLLx/c53T6QZzltqhxEL2DSOx8TopE4ETDWsjAVTgSkjHWdw9Nav9r++j63Korv8SJQtU2sTqRkPBiRSYUxFu89VVvTpJ6nTNFQmdQM8ggYsi6+TBZthZUky4dHScUwL7ERH7GRtN5az2JZU2Mi1iTdvXXbIhPyp1u4o00sbd6loG5balODCAyHIwqpcdbSek/d1rQh4nCC8LG32QUw9DA4orMZ4TaCHwRxmCCcJBOSMi/Isxxv4wDKekEbUoZ2Im164WhNw9IZbGtiHqaIPdDOm+gD5Eqj8pzGtOkllJ4bKZjXSyrXnYuA1JLgHQZSIHAiOvQS07sMRC8CbWOomhqlNINiQJFlUV1pDbP5gkUd74sXz58SnEXIeN+oQpOlxUz2XO1rrdTa0ymvSToMvepTxoVKXruohJ7L2l9h57zMOhL0B9nXOe6vhkh7INc5Uija1vT29WI9ZQodAydCzYyPal0bfDTt9tzmPsCsbSikjpTDVOV4F/fJ1jtMiv/uNDmo+BlzpZFSU5kWfHwwWxxCxymWkIplY1bdhvhx/WrrF5I73HqHI0o1vA8J+ypjCrMQLJs2PkymxeHxWTqXId7Ey7ZFuLX/1LlAm+gVOnnC5k1N8B7jLE5Ef9nK6tk7wTFbTWw2a3s3hFKSWb2kEopMqbXAsPfKCiJOF6N/S9Kfd5xXUe/V8YxEz/1PF7IQfLQaaYlUiqptqdIVsy7m7qHWk8FuMV00dcSlhIANDq/6seexYrlsKlRaIVa9QhHiwy4iz8qnKnfWVlRCIFAr2VJ334QE33Ih2YnTQKJqG5ahSbuCRCNNlNbQM2jT70WFsGJZdccZdZcS4QKZUGRCUuQFBEHbWhrb0uKwQmNMHVFDPg5snPDMTI3RGqHFmjrbS2L2RBGsqeYrcqZIB+ZF9OQKJVKqjsQFOGuWyVq0Nil3wSQigYf77YIsLyl0HtFIztF4x0Xb8NHHH3H8zTcEa3BtTRYCTgis0oy2pmRFGcW6q1TxHk5SsPJ4+pf4XC9HtWpSjqlI0zHRW8l8EKvRO4keycaFiqXt1Xy87iL2e/NrrCkrB3ttLI03iQSxuX1cA+XTG0pEkWVU7abeViq9IydcUDlLY210dCdDqhNduono3Vxi9SdAbS11fx8tY89FpJugsfal+URIrOsNwZoU68+tVKKFgneW1ti1r1wm1EmvErWIFFHUG050ok4l4nH4Xqh2OhfdhEp27KiN9N1ugiU3+mik3ydUrGJab9ZJ0CJKOVLjKepiEvHAp0w9hMelqkr0ZqBxzBWQQSYiZqzyhIiMLNGbAqPkhtyvQwiZtI1PJ4ogVSKXRia8Ct1MOE6CBdB2D1mIkLzoF4vXPIT4u0zy0a3vsbBqIoUOx5sWaR/d2+vvld3vjMdAOgekXAFWP5fkuGFtBJc+7hxyKclkHntyzmG8Ty+2gJHgZUjSni5huqNFCLySVxj4YkWO7YJhQ6/66N503f3Q/RlE91lkAkSK1RRYBsikQhMDcbskaSkjINA4h3UG4y0tkZ7ig8HOzhEqSilC8jAGNLcfPEAk1f2KG5bqW9/tynrSh6s2Ptlz1Hvh0UGo9V5QXOFcd5CvHmLi5UpKJhRH+PPRTL039eoBDzKC1hC92O6NJ78TcqXbR6xvsG4qKPz6rSyJI+l+ASn6uqGXt8QhJP2M7721k2hthdhQa2ib6Hm0pZAbELIV27y38AZErAjkZic1BLn2e3fH2C3+PeCc6NkqRJJchOvkI+lhF70m7pq2olJ4hdjAcISVnMStulldqnF3Dl5qIQiBT5UJKwbR+g0fZQFihYgJ3fep9QkXQlzTbGBtHekzZdbAo4QL6R1nj6UfwpWJGutzsaaNih54j5XLoqeNSdftyoutR0YNYo1cEemYr0pxVutsAKU0eZDRd4egcRaDx+AIukPAdAty1+/sCoWEMuqQPaEzfCeEjVxTKrrdiOvwQ6LHctuQmYhVRqMQAuFJVb8iFxKV9IBCCkyI1XTjXIxuS8fsuwdNBLrwzFVXxAcevvZ99m/eJDi3QvKsq07RG775dXz9lRZR6DG6AgK9qJoV+6d7k3eMdL9qnItVaXh97o3vTaLFP6/DL1Yqp/QB3Ea6bl+e0N0xQWyixrqtYTct7O7UdXW2zqTrpoeymzqmOHYhZcRfdBPH7sZG9BbwdXksrhzbJr1wHfAeErurN7rcSIERCUr0cqhVfFsH0SUV978pHeMVnGtE8spEc/zLpz5s/LxEdEktPTnBJuu+o4OG1ZuR7uEPvUW1B0VjJTNZn7XQe4PTq7BXF3PjOvZqh/59JzbmAhsBln/284rNZOKNY6UPZgprg9jGwtm9OP1LP3LdPF0IQZnliTTgCN5T2WalMvK9HUcE4EmstTAYE7yNl70csKgtRqVqMPTO6zWT9s1ncO3avWpT8d1zkJ6TQpf44GIvy4dV2pLzJmGt47a6s46FIOMWW+bxeJVEZjnD8ZC7d+6zd3CLRVXHyvyaUV1YHXC4lp9+FY0eBIiDf/vvQ1/x8XJ7Kz58ISWziNQLWReiKYQTjySm1YQ+w1Gswy77uivZS4LtmmrqynQg3gOJ2Y7/1o/SfVKR8sZC2iqIcP1Pdet/EOkN5cM1M09eqmr+YprIanPDansgRI96uCpS5QqTvH4I5cYCQrfFCOsOoBQ9aNn6q99+XvqdwX5EUUjl/5Xf17t31ot9d/38eoFZsyH9lbAjf81TK9aLLyFuHV86t2GjLxbSv6iuWu/dk+GatUGsmhfdMhrW8L3wcg9WpDpkHTzve3dG6MWMX8+eFxv3grjy2dd9yyiyXHvjYgRrqthYFz3xJzXIGJQaK9xo2jcmsq9UguH1dzsuiZW7yXM30eVbzk93Heh6qOkFJ0JME++YWF230KU+UEjXOqTP5wgEoVC5RKcCwjqLc3EAp7vkpV6Y67p9qRISZl0QrcqR4FfJT4T17gIC/w+ZoLI/2ue+GAAAAABJRU5ErkJggg==</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>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: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.sfpkr.si-idp-20141210.xml b/swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml
new file mode 100644
index 00000000..bb8d7115
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sfpkr.si/idp/20141210">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-12-12T10:12:07Z">
+      <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>
+      <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">ucenec.sfpkr.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Elementary school France Preseren Kranj</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">Osnovna šola Franceta Prešerna Kranj</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for elementary schoole France Preseren Kranj</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet osnovne sole Franceta Prešerna Kranj</mdui:Description>
+        <mdui:Keywords xml:lang="en">identity provider elementary schoole France Preseren Kranj idp identity</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">ponudnik identitet osnovna sola Franceta Preserna Kranj idp identiteta</mdui:Keywords>
+        <mdui:Logo height="111" width="111">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAHpNJREFUeF7tXSt0FNsS5bkrr7z2SiQSi0QisUgkEotEIrEx963IyNjIyEgsMhI5r/auqtPnU+fTk0kmvPdYaxbJTKen+9SpXbu+/a9//vn34cX///2eK3C4uzz8lq8fct0/r/i6fffxcPHi9eH+6tvhgPftdX/57XD38dPh180F38PveP2W9xvI6YXeiNxc+vCZ/wzByLVCID++fD78/P71cPfp8+H7i5f8H8KEgK5evaNAL168ogCv33yQY14drl+/j+/Vzvs7rYcJ7zcRILRHtOvq5bvD5Ys3FAwEeH/1XYX04dNBfqFAb95+sGNeHy7/fHO4kheOuX3/UTUTm9W1FD/fyqbFK733zDexXPPz17yfBo+24Ndv3lMI0CoI5RcWXG7kUn6/hfAMSn98+0pNu5Hjf91eiubp3/28+LoJSP4WwrwWLaWA/3p7uHn3YRPiM0clEd4z3mGyuIBCwJ7DOhb6RiDw7tMnaiBtGTXvNbWQwpN7wmcQ1v3l98NPgVF8niBTjvklf3P191vCLd7/8fXL4cK08xrnFYGXtvH5rdPzhU0Ritqpl2mBIShoxt3nz0ljICzApBKW7yK8S9EuCEvsmwganwNCoYUQEARyf62Cc3uoUKsCxntJ+4aad35T8zxhU4REgfyhUOhaBKEdfqhmQVsUNlWgSatMwBTWty+E1cu/1N5BYNgQeFG4Rl5+CsReyndd/vFGBZzbwq4Az6+Jzww2bUEgANGWC7FB1CzTJCy+Ew0sPO0eNEgWni4A7KMsNmCWECqCBmRCKFd/vzvc8n2BR9pMecn5L+WFn7ER9BzYHLlWdYT0DIjN84HNardfvxabJYtOQiJCuIKmibD090tqJCA1QV9O9XkuE4IcTziFQOBGyM8gLzfiG95wAyj5uRXtpZ9Y+FOV4LLvAPGB3Tyni3V+2AREimYByn6JLXIar5pldurXNe0cFvlgDjeESA1zmGuc2Gzh06KbK4Bjxc5BC7EhoJnQQIXRXGCmgb4ZyGwvZA8oQcqh+hxCPL/m3YtghDlCi8gesXgZCdH3RNOEdSbYdEEB4kLnOoK6WijGJkUg1GZzOZIQXGDyPzYVNBMCxgsQnGxm8XdPawfPqnmIksDO3Iiv5XaIu9kg1IkK/C862PDjci0KIa63gE79/fOOMM1hxzXdfRCHXn7Hz9hcN2/NpSArlRdIzp/iGwoMl8J/GiGej7AYK6TQBLZAJhKlF7KBeCVsEhaGNgmREY+KNKG8AOqmx3SovlwXHPwLIIERJBcew2+4brkmXA82H1gxjm/h9vFdifPApkdLzK7B7sDuAb7U/3pNv+xW4JTsz+xcnwVG7DDSrJ7WZe/D6Zdr+Q6bJowX10TmC2de/vcIDmxm+rlBg5H2n04rz6N5ZmNA87EgEBYCyWCIgFF3lkEouECFXVvd0TOYHMAntE+IEGwbXAi6GojCiN/IQLigBCD8h5ColMkYEaZHCrM9keZt/huoOuwEFgfOMcmI2xRAowgLi4MFo99Fwc00pifQHpwuvO8bRrQe8HgnUI7r9o2lNk+cf3nB7VgLM65uvDXtfCLCsmlBipYAEsUFAPwAmhDKos/GtI5F+cNcYyTIFZhaEFijIeobqpui/iCQApvK/U2gg5IZgdRlhDiNEJ8WNmUHa+xQNQwQdCuMjqzT0jqEz4KYjNjhClHJA8wzDa4/V7cFSEABIeNgWQsGxK+x6dQf7eYJI79xFAjYkVd9XNj0qEn2PxYAcUQPb6l/J2EvOOsiTLzaHbxqv1bgcwWSyvMQGRDhEYj02KgihRIroAmjOMH9xq7NHvToX+/jwaY5t7BrFAhICsJTabeKAOWmyeRkUQiXYHCN0/0YmrcKW1uEBQKEnYazDsExNSU/027jmnHtcPjhPkjoDHCKl2Y65LNQo+pNuXpduiaPA5sW8sJOVQMvbFKYJdjZL8YY5WVEADcNGKUft3yTI7g8lfYFroZDJv4nY9a6GAgJ8K9BbnPgmcqSgDc3ptTR1BGckIStoMJ2zIlhU0/86waMUtMwjBtSiK8UYkSIjGEiz4YAMcoV5FjcoCdS210aLOSum8/tXvTzCuHZtAQEhqEygX+/L2Y4AKtiA+nEw5WAAy/ayoQvojBd7Vu13eV1nhg25QZThOI1NQo7DlCJKIVSbRMgShDkc9wY/D064l1D3nMXOoueZxVcyNB2vF/EMmc7vf0csIiwmKaR3hIxIExWqDnRwve4lporBKE28dMhmZld28lgM7NLYGdIoEIghQEXl0Bu8Paj0m4QAAiWkZUwgrLq35lQkAKyfJ5+j1SMyYLxJbse1wQtx3WlLAKIhpRJ+N+1lWORTdIIDKvTRNPU5qm7w/vwe8n90+Xg+T4beCLYzBYadZSC/4hOpJya+0+mEcgQaH1JnvwcGeuNOHBD5AlTLJpoNpxoQBXioZ5gdd+s/V8gzkoeIEwKEMJfXWRqsJRpGONU+NxeqLFpiUp9fzNBzcnLiWFTdh5gUxaSBUFfZVeaNuSpFpAWZAqSQ76UudaiIScHWCCwVQ9f5ZEP5uiqF21S9tLfzS6LzYXgt4jOxDUxQqbwKWRMNszt+0+027gnuBPYQJvbE0HgPjsb2csTsk27YTqvkqzEjQFWBGK2+ORmFwA7G8Mc2DtzOWgzE3u1MgYTRi4Y/3kTjgpJBafs138v/04jKFonE2lJ67KAjLBkUIQHu477xgbwgij6r8suwn6WfALYDPywPKQkQsRudIYJ1wA3CsEy8BxC1bYRWL/idSYGTS4Ihb5No2KBOUTWx/nvLlA7l3xXSev7pAhw7ZXZfi0bAshmEMH2idgezYsFewLY7GMznFi/GTIzgSbCCo29FA1lZQ/NDoUGi+CcocaCyrQILkkjSNX+QtjZ7zWUuh2ETe77nBt6wBl3Nwj/w0UAEQPLJkHyAt6jsgpzhn1C2Kygz5imp1bUH9IaTNameLonsncWKnOY7C1+LdAxLEaap4J1Afv/sMd5PU23f4GQrqEz2niPtlRV3vvqW1aIjR5zAs2bGGNjhp4Hw4704tceNUctJkv64EsFdq0vtBoiKxtXa2GgqX5u1s50oyKZo++bVGxlEt4wt7cKl4E5qjT4RJq3cEG545oYaPB3chyi+Il4dGEvJyCZVnVgMSI1PRKj0ZIa1uvFrJBmmjSeU/+95OYEhGXkr4zCWnmYqjxOc34tzK0KoNTMvvb13Qeh/0W/wmr4am6nuhAc5RInIcBHgs1IMAu+DkgKMu2oykpMsk84Wvh09rmRl/EmKG3eBtGSFKZNHt3H7H5G7sbEj2zCZvG5TqR5sxtZgFWLC8I25kIp/bY56Sj+toHQaiMUjvvmMsDBBhEZa8mxMNizZSt+XnnME2peBCnVjaDDR6IyHmrKnevIPm3sMrZ5NdmJN0Lp56UAcuF/PlRQkWnpQewuttnTir3v74WCwI5IfNFDa72Fj9lnpjUVO93j50G4qeg3tEGPIcQVVIqPOS1sDnfrgjFnXBRdPLHNiyIoJenIhdjavVbzApuHqIi4KuOc4sqCz2ze6jn6WnsaV0HSIAgSrwdiOzvYcoHrNq+OWZZ+3ibYknHGsc3tb5eaV5ZzcQ/V1j7TPYnmIRaIhUIqKAwr5Xm9UajIIysTprlBYRnbzKMlUfxzrnk2dKC4jxlxeagbMdPQoeat7oyBmltJH3vHUYhTCYhVYRI6upf/vd6xzJrbNVi4qdaMnn9XZAh6sc0si1ATnMjPY0OLpHfakoyRPzsTwMjfXYHPrs3bS0yC49E6jG4ZFJ6ywMgFqDcMEuAxzaJ1OCIFOJf1Kwxjmias2ObFLkEv61BrMn28ZL9nmpfbx1XSNtLWXWzzBJoH55rtw1olxmIiLwcQTUSODPk4JiktAfqzaYrcbkgLWfupnDYbULLN8G8rzWyyFGkz1K1kEXmR90bCzQpzW4TpnK9rToY271jNq3YkaH7y0aSoyPrWkAYiVEoTpSc5OSQANS4p8FteYCovyBOnYVC5dhFqYlLGP2PNq/J5+E70p6d0Va15+jtYsc9tQTIWZR8owfB6GZiQO2xQbOI8wO32vyA8M02MYfkBhCXQWDjZYte8BNwbJqmNPgMMM1Dk5rFAcXW0l5C3mtfP6QXEZSEb0dNgvM+S/Mb1Ma2xUg/WZf4px7LTSTPxdeqLSIMKcWHj6LNnX19TiDtzo4Z+3rHaF+yILAXE0gWDSZb4yc9e0whBlMLLYbMKTDukVf/X+buSbbalD7NMRU2M1PbBfgd2D5MmRLM4LkQ2ozeB3ljC2eedURut0szXAsJkIW5RNTeKuJxc83qqbu9Dw0hkpLhHhIid7INruGNFeG0LlxEca94YugRFXDLPmG9a2LLUONveC3BzGkWT7c8E6RVnKOMXQUADWbOD7id5wV9MJM56EvE5zAaurcwZTtYzqIU5QWyzw47gs9kMFNqPpJEy+YGD32wsR35RcBVkEVgRFtSmRJqVC3iWiehqXmhbbWJgKkjqaIaVa7CC7ONH2kIgivfbE4K9lN/tnQgWdaU6qRBuyYyldjXvhJBZ2whUS2MnJiMtFyHsE+3KPjesYGNZ4VIoqE7muxVarH0jm9ljn6zmLsJl1UIb03Z753Ye52OBr/UvFFn2rG0MAq9dq7X27TT1b6+70Aoc8EIblsrLxVZ4iQC7ZbzLVWo2ZZdyvGJePOu5PPY4RDWWbeleaPMqpzzfBKlWJXTc2zgnr6OAzph54j49+0+bh85eYduOHtoGlpcB+rxQ0VKfQtitXe2TmSNhsxI2IJJN+NpYAiONUBnxXz7jxCFvxrfftWZzY28cJlBk0Ps1lv0kbC+2mbPRcaK2yFqgPBGFwwWiRNESFQauP2/AZDm/DXO9h5Bqu1WUThxl8x4Cm5kQQZ/FPtBNEDYFQbKpRG4I/hB9J2gfiIxQ5dTXhhsSWNJ5mKXGtemfNsCcB5+X2eZI8wh3EmRf7aEw2MQwVq92Qy0nbBlDgqnp0qNOHe09XvP2wmZsQL0ymg34GKsIhpl61iRy4b5TbgMtk1CngWbpnz609rVv1ebhmuPW6g45s85ZH0CHa/NwoENvW0o/WvM1t+EI2BxEAyAUQAGC0zYsgENnbN4lmkHK5hM9Xu3FrMyvtklrv+d2sdwQccFua+dqJhgsLLRPbD4bKW1sMocCoZ/CmlEIp01IrSfAFQhl3eZe2IxuBtCHgd1fKAiQEYx+wu9st5KfsRO38VO5r4R5mTqdvYa9ImvQJTFrMdA6gN3azYwoCdlI/XYr68PQ4BdOiqA5wAaWzQubh5Y2ji1x1h32LkR2NAgMtHWbo50VqW+wK+TisePcznm3qP6uOxyZBfo0tTthmunhpajMIbdruUBbttlJutYRmmIjtEHtcrLDyAeztbBgBN0DhsH0XrEBYMtLt2gUx5wJrFS0HbA5w2gbcAqnFFXRsgO93WmbkCfnqKEDgi9gc63O8uE2L3ZJ6FSjBTmEuGCjWzBC/TxHAW3hzlu6p0013cx8XyuPgM3OzvHoiDim8OPShASwS0RN/sKkoHrQjJzL3AyfLhQXGGULM2gcWWOb40wEBNBqXqQR2zrAx8V34+/QAeUQWpAw1sbMbNmjaV5kG7P34KchouA7UOwGbsZ7tvksBFn49gaUtGi3bFk0WzeAtCGzuG2rZK7j7ESrwTLkp/fgjF7OzSJDcIdY/8IUmE7V9Rmd/f6M2G9cGdm1U/N65Ebh0AOuDhdYbLV76AzS+v+GCJjmxTHKWjg9Py9unkzlFKHNiyuxqXkFbM44gT6oAybCh6j6PDJApSag5b5H7WxN1mKmoWrCdubzJtRWBAEHFfRYp0B8501xXIeNuWgmPlgPu7sK/TrLqJEy1rycSca20dyMZKO8n1ztVMkMRwQDqCGhMbZxy9/ioRoQFjt41e75q9wQI3Y5IkjlZzsIy0DrnP5CYJJJuBbqj4yC+3yERPhAgJSgQ0iTmf3GktZl6GtazUb7sc2yNlSjIvJsoobSDxxmj91KCC09p8gmIWlYTOOceGnc1xe/d86jbN4xEZb2AhwidA6z2DwMlEEyEpPajUa3s5wxPUKd9EKAg166h8U2M6HRqVZfNBVONSwzco3ERNhkXhZYWSYdGoeMCac8QYjNQNWZcGbCLeV0pOYFYSLLCnDAqEXjnYAkSPTcVr5AFp1Qe1E76nV5w8NsXqGF8l1poMHQLQhsnvl1zMdJGBCOuV87B+GhfgdzyfJ0mEefGid9QgQHkzJ2Epa5zctzdxyihmfYCRwx2yA3FEYuzM2I4bPXhtVLG61kFnRTpDHIIYvsaYmugQ4SkAdLieAwrotERzQQwXlsRA9QAH18eB76MEhcjuqcbYW8g7DMbJ5+jroOLAoj6pIGQTIWL+/bbouO7LwQYIIgzWLnjm+ecC1s4MTva/rUs3pP2uCFdE9D28GQTduYZLXyRjriNrlQC7FUwJeSy9PMubghfAScQOqQYY7WettUO2BzHkT1mpV84T2zrIJQgfSH1ajPh4cyId6JXcuUks16jkjNKJzWO943RdxbMSMTFiWS6+TYRhnX305PwjEiIDMlnE3GijlMxMjymMv9DjEKnAg2zS7A1/NQlzisOlgUU/A+pDH7ZUNKZ0PkKSODGIyY2tJLDplzGxgHuxU2sUnGldExbeeYYqCMPawqbUbaNd2AhfkQGwnmye/0iREh8wy4xCBstgM2Fxmp5eeYHkHxjlVNFRPxllMj2Xc6IbIUyzGxzZrNzqc3BP4YIkmIHlllAIanAhno10pEBZsXroE/q8gJHB81gF6OIUyvwOW2Jouw2Ttp/D4uMs3btJFRXl2stYrA/FnkIlg4u3HYUE8jRe7FSkMlCUv2sMT5xD9ct1XEWeSIhbReAQBbahUE+bwZXp/NE20HpkYQPQoKlOu9CJvrWqdzt9S2QWCcCMTCUy2PAO7/lELV/g5ciD4YrKoQdczxLJ65CVmPZTdQowmT6AYKba1n3p/f5zWo7h4xlmtP24QPmTqjquabfh51fVOfFjYN2rhQKCUAZDpMgE2iXMAc2lQSOE12DqDEfCfaw3r8R2eYwCZkfYpzUcEWdS3l70HzIDwPsN+KjUci2cJhODdNhTvo4czsGfHraV77/iJsLmqeQaHPHEsT//C+p37kRotHzUzhc2En2gbxwPiIZSo79SZK2KCcts80T10ElgNa5oDPhRBbp1Pr9bweZis7oRYQZdh80kLsAmzusXeqaZq/0xAZ4cFhDs9qNerPZothKCqixyN74G6GLK4VPW2CyupVsmB0+SCLmI7X/hjdITSOoOTBHyWADYiSdzxEWAgVH19jAfr98czdmjfSrH1at1VdaRQCbMvtnsY5dXh2flx8g64F++gzRwaz/GDr3CljoZvNK/N20ffFpAnNJZvfmsGvbVJ/pFxcTjFDktnn2zUdCZsT3LYIhMOI36gbddZ6iGC1pjGKNkQsbCbEbKEdRqU9uSYquVPPmSvDWGMHRhlI+MqKATztaxuwquYh9ejnhcWExBGazDS/XfMF2NyjlXYscnRSgw/bBlLAgdogFFZ4yyGjKJfwMf1d32cFsgfXJ+f1MvTQDjqp6sYaB3bKtKyh//Bz8cx1ESpG87c9fvt8uZFLNWGbe7/IjjdWRl/Khgz4c+jg8/ijXWjci/jibPet+0B5UEAD40Ey14nH3mrlhvZXwQSJwLQjH3dee0jkSkSawOYOqKrDOKjrkEXj88p9MKq8x+GpRigAW/G02x5srtuDwo/i9/pU2rJvIZWjTxOl9t0MdYk74EQsci+glZ2W7bU62Zk7odeyCJsjIUbauWmgxjoFQjyaYXE/xDsZpPUbzX3C5TK4maZm1212ivU1GeNsg9NjqPRHkCYHP/Njvec+HiLwaJq3h1HO/JXqc0Ql8MRHD8iKkPShFVolzaoytkNpFrrPPEcQvkJw5O9NA/NUkz/UYkrpM1PgBIyPB0e4D26C2LcyW7KysY5ddz33ADYnPtVSPkrO4cxPBAOY9K5XX0AnEhAiIx4N3KzY3dVdrWxQswHmUBdzNUdaBzOgKIKwl1eK+WAEoAiD1QX56rDVMJKzIuxyLQawGdmXvcxTzwFKndeowObxQUmwQ+hZZ5hKjs2bLbspk9XdOhAEINQe6kufs35wR0Tp3f1B8ay5A+m+GLNVIjZ3PQZmZilNtP19wDZXdsDKAm7n8dEecA0YMssKdLS2MS8v900zI0sr1xDBacmIMd9z2r2TYqjyjAcRFCIzGGLOJ5FZkwx7EXe5Hj20WH8/gM292rUCa+Jv4bmrqN2koCQKIqEyME/vZ2AtCCBzNDx8Sp9n116hiflqMzuLolqyUpQ7kEHjGerSgIln51msE+khQP82W62nBHs3XbSZC5s3o+AzLZhAge1cCIyZddmtW2GqVlN7Cqkcl7hqd1dsywxR+puQfmn2rAUgiTZPahctC3VRpzrdXL3vWFGAdi0ez88LHF/uUg4M0MpkLAJ716UcATCkRUpakbU/47xH0DNB2mYw8oFaFWpbJkBWgae6HMsNFs77ynesCK2vqZnNm0HOKqPrXLQshAdsNRFqD1yyaLw/785bg8OGlGHBzgrB2umvmlvDDAnjmBhX5YN1rpSkAEVgy4tQ2IrdWhHuGGKfyOZtN4ObdCPP6jAU22YDCLxJZW0xVuByRaiBBljXk89SgT/n7dmwb3zoPeASttDylW0pxQpMrviosRCfTvNca6CB6QFRW+EsHF7YOxADhMzSXC6zl/oYT/XT+rZlZpsXyYK5AvlDnpRMSblfMSROqsH4iLn8mvYg2MCdWbCfj2TzRlguzFOcXbd9bEiEsXchOQOkkKzPXeziHWpDkKHwY5MQHw4/aTPYObG5OCtNGkI9sYsUlld7u20GYpQV0A+xYStmqTzmBJq3csHVAiOHJzsZ7c+srELdR27sZRGhfVqXss1zAXFgURPCUpjp0qRyHqB50DaBRro0XkCFZ8paXzl6DPmcW4NIsGaOJplew4pQjvFtw6d47VH7kYsxuWjXsLyu06CV04T8KV6cy2ntYtaB6osLYa5n5KvrqVuM5Xpco1jh5i1ZEKptJJar5yGwEML32rmz2rwebA2iG+Fu3ej55lJoHJFjMaAVlqFw/wr/p5GIMxuRRf/hdBfVbdZXmALOyLDnDrwgBZHANpT6ooIes2qzYQwzQokZcpQb44Q2b3UHDbQ138mZRiLbkJdUMJ9ms09YiRYGhLMblfPCzoIMsflftJnDDWRx6a/J7xyxBeHYuEg63XmJhpEYaGd/PvaKCekh2yq8bsed0OaNmFOtnTE1T3WeTl5scXO7R4Jg9ZA+HljHKnYWDgFlG2pHAbEQWOBWZl7DvnkrFrQOZAhalbpca1JUwGTPBdljdvawzVa4J/DzjtlJ1Y2jGBe93E5ekK2WhfXnnSsz1VEZsH+IwGh1mIbVNFAMKm+uRAaRToTy8zH9ZOdnbBU5RWGWbj+1hB2PYcuJ1IpmrByzyhPmyvAMNE8XnDWPxi7djeDwHREStAraA4KSD6ZJSVWE2kyw0Bxqp/wNGh0xRgvkA6wRMy/5N8gMWJGsnxeZfXdXOEcM2XY8vdJdk6OKg/fYsFkwYUnzRrtnFRLGfl5p6O1Y97EyJzhNWM99P4SsqJmSSsJI/GyqoMMrIjfezOnhNv7O6jWZUIFZYNZzwJycCB+1mMyII0Agx8AZZ/UbxxSDnKzYs5VjjkGq+Lxn1rxqo5iQWO1FDemN75cFsIX2mhQ0eODlj+aGUMBaVdPM2aaQNOjtD6JX7RZ2abU10G6ch/OxTdhxVGeFZZ9S81qhn9nmdRiqOelgiNCirY+9vAEsOtkmiltt8oLbQmiXJ4E5+zOfOIFydKudgXA1jiqhLzkfUz8WCuuSoCGE/tf7eb1dW9J7akNUQifERJ+zh6SoLTa0Fn0EPhnetI2aZtEbQKHXb3rmW31GjB3RaI4+4H4l4nEOzSs3+/Py82aOdubcJ4fZc3/m9zlMsi7Gyy3yoMAtfD4NgbFoyHKI1GDUszQx0xE7rD97bJtXmpkz27wRAer4hghjES5f6iNjPCaK0BlL7GUoK2AUk3YtsE2IRHk9YpVoPRahwTVAApgjtjBLJSxNH9msZ6l5q4yyBy0LkDil3ZGPY98n0MjKs/oxaazQ1nEZjKC81bpQltwjAE5WqkFuEiEfiZ9nM6aav+LH/c/YvCM0Dwvsub06RgrBil2jq4D+OPHdmG8TMsO5KPaULQpuWrIw24Tn0LxyYzxDmzcLGUU7uyI6LtQiuGyam7+3K3C8Ys9Wjvmv8fP2aN7KTQ/gtslkrEDgSiir/U7AN0Z88Nl5+F4ggthnJJT3DRLouFK26c7s5z3EPqza3A7xmdq3mYPd30zsP0RxEhpIMcISZf4IfBdzxyYI0hRbtYL8/dhmUFK4llfbQ8RGWjk7j36uj2HVp5xAcOW8zVV7Oda8/wB8dLEsMaPX+QAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.sfpkr.si</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.sfpkr.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>MIIFlDCCA3ygAwIBAgIGElF9nn59MA0GCSqGSIb3DQEBBQUAMGIxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHDAVLcmFuajFDMEEGA1UEAww6T3Nub3ZuYSBzb2xhIEZyYW5jZXRhIFByZXNlcm5hIEtyYW5qLCBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDEyMTAyMjQ1MTRaFw0zNDA4MjcyMjQ1MTRaMGIxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHDAVLcmFuajFDMEEGA1UEAww6T3Nub3ZuYSBzb2xhIEZyYW5jZXRhIFByZXNlcm5hIEtyYW5qLCBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANQTok7kg+1o8RWpRTx91zPwoDoPWPcH9FxeVD1QiMcgB18Ox6exSL11AASI1pAj5evBwX7Wp74M5heQToC++u106HmKPERpIEfPwzY4GKoNwRGXcVzZt+jrCPIH39UYY3XgClM1bq1YUbeM9fheVNIBo0tp08nQEVll127PlKngXDSlAZ5A7qp8amrB8xnZRV9WYZIA6irULJY+DkJvQVuQWvABWVUAkZLVLJQS8aWtY0viHL7Ro4YSYii9yN2+w9TOmvQhto4tYj6eC6AeC7uZhKJGyy3GEaanWIFtqzpVCDEzv7oN9ckErHuwKtnyI68Fb+eHY3jjoKIt/egV3VSqKqkliZ4C6uszKpZPqSJCFoXDd8xZnlOTL2M+OlQExW3r7WBchAb2In/wgM/iUj+79sr1JPN+fRER38MQiUGI4QTP8aR0ifdJKodrTyyLNdmJAxQLhnTBYMLeunXat/SR0SfS5+aTDzMnAIuYcXXS0x3n/uz0d3QHvi13T1BCoBMPt6cFMGSiRQAzfgIZoCXe9O20T7gmJ16kqyq7WtDx5IfzpU7BMGHnQH64sa8dmKN6MXNu3WEu6d50urzojq56d74KZwi/JiZnxW3v3ufc8ajpHB65XN9fswyfLPSnRbZn1VG+8AHgvJexSxxfbeCh+fTFnNFBH9LWay1r1+6LAgMBAAGjUDBOMB0GA1UdDgQWBBRBteojY53LcdnWq8z0FAY/yvVWFjAfBgNVHSMEGDAWgBRBteojY53LcdnWq8z0FAY/yvVWFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQAKRqU5Et1ynwkVPqxA4MqLlf4/5BR5iy3r3DvSDwWKgpq4uE8yzwndBo+P9pedTHR86OQo0jo+N1fKgq2e2JNjwIg9551LxLvHdX7M2abpP7cpjwNK0Vj/BD6CKmkfYK32voIPtVbL/1hNuTukceuCFhrRPGP97kXnOm/gF3DH8bV3igiEfIrXbGP5Qb4dwMG3MsvGpm2ruCHN4b/tWbCD8rR58IAG1fg0tq2jy0xK/3kFfcObYYihaPPxw4G2rzPpEo8KwFOyGGnJM2g2WlQOyCSwPvOsl58s/pHOKMb3ca+Mfz6fo7fFvv/J5XWvLwvffnNZ+691js473CQTiiFONIqcmvA2FdLSrtN5c2KBrNtMwNbHInQJUOKCQDhSpFIbx/xyzSNj3HbZf9r3hvTLCEgOpIGkBJILSVx2H+7XUkljLcHv/wU6HBP7BkhpfNVml+d/slUGJjpmkj52ZRTgNv1swJ3QE3quguH29EbgK3y2wPNek4VsIMG+xlA46upsnrOEqVej9apysA4XYMtwqDQ7Ei8OdoHJUIpU/OrXVApb3cGbHxofnf8BfsvEm+QGAZDxtH3kCqmfbQVUULltef11ma0ntXM4rDgR+LPnB0gme2sdug/2KK0iRf0CtbzsHq+JVw0Gz4HCRgWY7m6+9Q3qyiMspCLT+FdmLd7Smg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFlDCCA3ygAwIBAgIGElF9nn59MA0GCSqGSIb3DQEBBQUAMGIxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHDAVLcmFuajFDMEEGA1UEAww6T3Nub3ZuYSBzb2xhIEZyYW5jZXRhIFByZXNlcm5hIEtyYW5qLCBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDEyMTAyMjQ1MTRaFw0zNDA4MjcyMjQ1MTRaMGIxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHDAVLcmFuajFDMEEGA1UEAww6T3Nub3ZuYSBzb2xhIEZyYW5jZXRhIFByZXNlcm5hIEtyYW5qLCBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANQTok7kg+1o8RWpRTx91zPwoDoPWPcH9FxeVD1QiMcgB18Ox6exSL11AASI1pAj5evBwX7Wp74M5heQToC++u106HmKPERpIEfPwzY4GKoNwRGXcVzZt+jrCPIH39UYY3XgClM1bq1YUbeM9fheVNIBo0tp08nQEVll127PlKngXDSlAZ5A7qp8amrB8xnZRV9WYZIA6irULJY+DkJvQVuQWvABWVUAkZLVLJQS8aWtY0viHL7Ro4YSYii9yN2+w9TOmvQhto4tYj6eC6AeC7uZhKJGyy3GEaanWIFtqzpVCDEzv7oN9ckErHuwKtnyI68Fb+eHY3jjoKIt/egV3VSqKqkliZ4C6uszKpZPqSJCFoXDd8xZnlOTL2M+OlQExW3r7WBchAb2In/wgM/iUj+79sr1JPN+fRER38MQiUGI4QTP8aR0ifdJKodrTyyLNdmJAxQLhnTBYMLeunXat/SR0SfS5+aTDzMnAIuYcXXS0x3n/uz0d3QHvi13T1BCoBMPt6cFMGSiRQAzfgIZoCXe9O20T7gmJ16kqyq7WtDx5IfzpU7BMGHnQH64sa8dmKN6MXNu3WEu6d50urzojq56d74KZwi/JiZnxW3v3ufc8ajpHB65XN9fswyfLPSnRbZn1VG+8AHgvJexSxxfbeCh+fTFnNFBH9LWay1r1+6LAgMBAAGjUDBOMB0GA1UdDgQWBBRBteojY53LcdnWq8z0FAY/yvVWFjAfBgNVHSMEGDAWgBRBteojY53LcdnWq8z0FAY/yvVWFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQAKRqU5Et1ynwkVPqxA4MqLlf4/5BR5iy3r3DvSDwWKgpq4uE8yzwndBo+P9pedTHR86OQo0jo+N1fKgq2e2JNjwIg9551LxLvHdX7M2abpP7cpjwNK0Vj/BD6CKmkfYK32voIPtVbL/1hNuTukceuCFhrRPGP97kXnOm/gF3DH8bV3igiEfIrXbGP5Qb4dwMG3MsvGpm2ruCHN4b/tWbCD8rR58IAG1fg0tq2jy0xK/3kFfcObYYihaPPxw4G2rzPpEo8KwFOyGGnJM2g2WlQOyCSwPvOsl58s/pHOKMb3ca+Mfz6fo7fFvv/J5XWvLwvffnNZ+691js473CQTiiFONIqcmvA2FdLSrtN5c2KBrNtMwNbHInQJUOKCQDhSpFIbx/xyzSNj3HbZf9r3hvTLCEgOpIGkBJILSVx2H+7XUkljLcHv/wU6HBP7BkhpfNVml+d/slUGJjpmkj52ZRTgNv1swJ3QE3quguH29EbgK3y2wPNek4VsIMG+xlA46upsnrOEqVej9apysA4XYMtwqDQ7Ei8OdoHJUIpU/OrXVApb3cGbHxofnf8BfsvEm+QGAZDxtH3kCqmfbQVUULltef11ma0ntXM4rDgR+LPnB0gme2sdug/2KK0iRf0CtbzsHq+JVw0Gz4HCRgWY7m6+9Q3qyiMspCLT+FdmLd7Smg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sfpkr.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.sfpkr.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OSNOVNA ŠOLA FRANCETA PREŠERNA KRANJ</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">OSNOVNA ŠOLA FRANCETA PREŠERNA KRANJ</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">OSNOVNA ŠOLA FRANCETA PREŠERNA KRANJ</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">OSNOVNA ŠOLA FRANCETA PREŠERNA KRANJ</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sfpkr.si</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.sfpkr.si</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Aleš</md:GivenName>
+    <md:SurName>Žitnik</md:SurName>
+    <md:EmailAddress>mailto:ales.zitnik@sfpkr.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:info@sfpkr.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: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
new file mode 100644
index 00000000..e08a9e9d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxETAPBgNVBAoTCENFRkVULU1H
+MQ4wDAYDVQQLEwVESVRJQzEhMB8GCSqGSIb3DQEJARYSZHJpQGRyaS5jZWZldG1n
+LmJyMRcwFQYDVQQHEw5CZWxvIEhvcml6b250ZTEVMBMGA1UECBMMTWluYXMgR2Vy
+YWlzMQswCQYDVQQGEwJCUjEnMCUGA1UEAxMedm0taWRwLTAxLmRpdGljLnNnaS5j
+ZWZldG1nLmJyMB4XDTE0MDMyNTIzNDk0N1oXDTE3MDMyNDIzNDk0N1owgawxETAP
+BgNVBAoTCENFRkVULU1HMQ4wDAYDVQQLEwVESVRJQzEhMB8GCSqGSIb3DQEJARYS
+ZHJpQGRyaS5jZWZldG1nLmJyMRcwFQYDVQQHEw5CZWxvIEhvcml6b250ZTEVMBMG
+A1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEnMCUGA1UEAxMedm0taWRw
+LTAxLmRpdGljLnNnaS5jZWZldG1nLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAtjvu8RATCClfOz5ybFBuDzvJsg8O5duGMG19Iabw50a8CkDHfY9A
+fxks+v7f0pZdu+vQ65NsWtOaesFxIX6XXKnfjn/rLBtwoZ9j1EL3sbHxHJbKPydn
+alC12MEzOaaqWcSV2GmV3541oo03MiscRJtrdIrceIjUmVBw6nputht/XSwXUPHP
+j2vQncW5ora9WSwCSW2Ey4IRNxEsQ8JcW3YM8+ISuhIaRjyLzeHSBZ6OtjcD91+m
+/PKpuQL7eXwAmQ8QxzIdKoY+UnL7SEvofzvPSNTn3N2+39ZHu9Wb09o+Y/JhZwC/
+QoO8awGk11AcF4dbo5ReHHtPvQR+LwXfWwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQB5IP7x25abYH9B0dJaQ6O2+EqavE+GMCjESrNTYgjboe4fPssr21EPe0Ye0O8F
+kbSVlULVwIU8jYpYSb6atr8J/eFeJCbVOeSjRSPByxLbuxgTgWuqhVEFgxeHbL6n
+hcmxB+ghnILB19VvRA2f2qGT3WVdL25D0lZW+APn0XmooTqUaxJHstr9uxgfMUmA
+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>
+      
+MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxETAPBgNVBAoTCENFRkVULU1H
+MQ4wDAYDVQQLEwVESVRJQzEhMB8GCSqGSIb3DQEJARYSZHJpQGRyaS5jZWZldG1n
+LmJyMRcwFQYDVQQHEw5CZWxvIEhvcml6b250ZTEVMBMGA1UECBMMTWluYXMgR2Vy
+YWlzMQswCQYDVQQGEwJCUjEnMCUGA1UEAxMedm0taWRwLTAxLmRpdGljLnNnaS5j
+ZWZldG1nLmJyMB4XDTE0MDMyNTIzNDk0N1oXDTE3MDMyNDIzNDk0N1owgawxETAP
+BgNVBAoTCENFRkVULU1HMQ4wDAYDVQQLEwVESVRJQzEhMB8GCSqGSIb3DQEJARYS
+ZHJpQGRyaS5jZWZldG1nLmJyMRcwFQYDVQQHEw5CZWxvIEhvcml6b250ZTEVMBMG
+A1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEnMCUGA1UEAxMedm0taWRw
+LTAxLmRpdGljLnNnaS5jZWZldG1nLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAtjvu8RATCClfOz5ybFBuDzvJsg8O5duGMG19Iabw50a8CkDHfY9A
+fxks+v7f0pZdu+vQ65NsWtOaesFxIX6XXKnfjn/rLBtwoZ9j1EL3sbHxHJbKPydn
+alC12MEzOaaqWcSV2GmV3541oo03MiscRJtrdIrceIjUmVBw6nputht/XSwXUPHP
+j2vQncW5ora9WSwCSW2Ey4IRNxEsQ8JcW3YM8+ISuhIaRjyLzeHSBZ6OtjcD91+m
+/PKpuQL7eXwAmQ8QxzIdKoY+UnL7SEvofzvPSNTn3N2+39ZHu9Wb09o+Y/JhZwC/
+QoO8awGk11AcF4dbo5ReHHtPvQR+LwXfWwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQB5IP7x25abYH9B0dJaQ6O2+EqavE+GMCjESrNTYgjboe4fPssr21EPe0Ye0O8F
+kbSVlULVwIU8jYpYSb6atr8J/eFeJCbVOeSjRSPByxLbuxgTgWuqhVEFgxeHbL6n
+hcmxB+ghnILB19VvRA2f2qGT3WVdL25D0lZW+APn0XmooTqUaxJHstr9uxgfMUmA
+YCq8RxeRlzv+nC8jsKRLX0f/MkoViUs8SqSUVwbFd/9m2aWfwm083pQCjHMxPJ6R
+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>
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
new file mode 100644
index 00000000..a90637ef
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sgscol.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						ZTEZMBcGA1UEAwwQaWRwLnNnc2NvbC5hYy51azAeFw0xMjEwMDQxMTQyMDlaFw0z
+						MjA5MjkxMTQyMDlaMIGHMQswCQYDVQQGEwJHQjEYMBYGA1UECAwPR2xvdWNlc3Rl
+						cnNoaXJlMRAwDgYDVQQHDAdCcmlzdG9sMTEwLwYDVQQKDChTb3V0aCBHbG91Y2Vz
+						dGVyc2hpcmUgYW5kIFN0cm91ZCBDb2xsZWdlMRkwFwYDVQQDDBBpZHAuc2dzY29s
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkcliHfq7FNJl
+						TaYElbi8ecmQhZMBQSpvT3AAgXjAL3vCVmhyhXgz189L4CvjagLFL2pu8BimFETi
+						55ll9uoQcBALwesvt9VYxmKuYrSkYqU1+ux+FCnNrEtV+SFX3tb7OcnZZm8GpT8I
+						ql87BKMiTV0rnGUDvFWEblVju+eGFnCRpDIuYBtGjDPdGLSr3X7Xlmaz8R0GhYtp
+						Y2p+ZIOGUh/tAXxTw0BGm94c6bHgIa/OA5IwmDUocS0OH4sKFAFoGttCVlmW+5kP
+						WwsYJEUVqn4wIIl62+LyvrOozicJjQEflOFVqmZPPlCiocTqrkLR32TSq1lLd78a
+						Pvn+ZT8wqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQABZcCusCu8ogYNTg4RJBr7
+						AYsK2iwNM/UhSlMiu56u8CHgZ9mjT0S+P1nOB8R6kNX862hnq+hdxX3K08IOEPca
+						2LavSv3kOjhFxN6lRVvRaTQo0Q2R/jzxYU9y/aXV1410uGk4q7np4cBGAknkh5W8
+						4yaN/1+1r3TJyig+2Rq/mQvIBtsih2deVpPl4CQT3NA5X1aL44exnv9HNs1CeOqk
+						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>
+						MIIDjDCCAnQCCQDoMDHwmgfPnzANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
+						R0IxGDAWBgNVBAgMD0dsb3VjZXN0ZXJzaGlyZTEQMA4GA1UEBwwHQnJpc3RvbDEx
+						MC8GA1UECgwoU291dGggR2xvdWNlc3RlcnNoaXJlIGFuZCBTdHJvdWQgQ29sbGVn
+						ZTEZMBcGA1UEAwwQaWRwLnNnc2NvbC5hYy51azAeFw0xMjEwMDQxMTQyMDlaFw0z
+						MjA5MjkxMTQyMDlaMIGHMQswCQYDVQQGEwJHQjEYMBYGA1UECAwPR2xvdWNlc3Rl
+						cnNoaXJlMRAwDgYDVQQHDAdCcmlzdG9sMTEwLwYDVQQKDChTb3V0aCBHbG91Y2Vz
+						dGVyc2hpcmUgYW5kIFN0cm91ZCBDb2xsZWdlMRkwFwYDVQQDDBBpZHAuc2dzY29s
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkcliHfq7FNJl
+						TaYElbi8ecmQhZMBQSpvT3AAgXjAL3vCVmhyhXgz189L4CvjagLFL2pu8BimFETi
+						55ll9uoQcBALwesvt9VYxmKuYrSkYqU1+ux+FCnNrEtV+SFX3tb7OcnZZm8GpT8I
+						ql87BKMiTV0rnGUDvFWEblVju+eGFnCRpDIuYBtGjDPdGLSr3X7Xlmaz8R0GhYtp
+						Y2p+ZIOGUh/tAXxTw0BGm94c6bHgIa/OA5IwmDUocS0OH4sKFAFoGttCVlmW+5kP
+						WwsYJEUVqn4wIIl62+LyvrOozicJjQEflOFVqmZPPlCiocTqrkLR32TSq1lLd78a
+						Pvn+ZT8wqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQABZcCusCu8ogYNTg4RJBr7
+						AYsK2iwNM/UhSlMiu56u8CHgZ9mjT0S+P1nOB8R6kNX862hnq+hdxX3K08IOEPca
+						2LavSv3kOjhFxN6lRVvRaTQo0Q2R/jzxYU9y/aXV1410uGk4q7np4cBGAknkh5W8
+						4yaN/1+1r3TJyig+2Rq/mQvIBtsih2deVpPl4CQT3NA5X1aL44exnv9HNs1CeOqk
+						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>
diff --git a/swamid-interfederations-2.0/idp.shef.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.shef.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..091e0cf4
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.shef.ac.uk-shibboleth.xml
@@ -0,0 +1,109 @@
+<?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>
+      <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>
+						MIIEajCCA1KgAwIBAgIRAPS6MGNqr12OxPRxE0wftqswDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA1MDcwMDAwMDBaFw0xNjA1MDYyMzU5NTlaMDwxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOaWRwLnNoZWYu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtvXTQLO2l59pl
+						EFXfI/CecppuNNfWWSEO4PEbvfAPGX0seM4pUU0YKVtLvsP9132Mx8imnrhnQk8x
+						KjxVmfBcPyQHBZTClH+V1H3rygYYnDQACG35/WWshvrfpuDSeOey4MW9Xqv/1ACH
+						PZEhFsZwnaW/ZDotPenOzY9/N0URdSr/hoFIB/mmCqE/6pZu+pLWjeRRQU5sro2X
+						HPQY+GaoFV3gqGbGR1B1nOWctrqxmGPEn2OAf4/R3bwkDMlQNAn7vd8D8CIk9z/e
+						Ntodram+7XFhnAPFMw0EOYk3un+QjdrNke9VYGAL3gqN8uRdPpKl1E84n+jviZCJ
+						c8Uu34odAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+						kOO57TAdBgNVHQ4EFgQUFkISCwlOsYEScVfguhI/NJkkdkkwDgYDVR0PAQH/BAQD
+						AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+						MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+						L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+						MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+						LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmlkcC5zaGVmLmFjLnVrMA0GCSqG
+						SIb3DQEBBQUAA4IBAQBFQpg8CdAxF+fazlT/4DR43XEtbv+SzLg9H2ST1kKrJSb+
+						KHNS6XFli0JcWP1BNFCA0TV/xyH0KWc/ZwYA5h052QHS5kOK88IjUNwW4wluqajT
+						c1jByBc/bV1nVQBrKd7uLeqlEGlYySnx2kwu043nEGsP0/TDCAvdTQ9jqXCSuepg
+						+IS/jkPCQF+/BvmXNOwLei4mUI2EqVnzIqDq3tA8CLxhRKv4qq1bQqicPMwwP0GV
+						crp7O+zg6I/K55qVp75ePh7jHf32AfqRKN0BhQlYoogsT5noMUDNwhRpqv9/h2MH
+						PyWz043AlJssKremO7+1g998b2MkkVpiHa74usy0
+					</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>
+						MIIEajCCA1KgAwIBAgIRAPS6MGNqr12OxPRxE0wftqswDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA1MDcwMDAwMDBaFw0xNjA1MDYyMzU5NTlaMDwxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOaWRwLnNoZWYu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtvXTQLO2l59pl
+						EFXfI/CecppuNNfWWSEO4PEbvfAPGX0seM4pUU0YKVtLvsP9132Mx8imnrhnQk8x
+						KjxVmfBcPyQHBZTClH+V1H3rygYYnDQACG35/WWshvrfpuDSeOey4MW9Xqv/1ACH
+						PZEhFsZwnaW/ZDotPenOzY9/N0URdSr/hoFIB/mmCqE/6pZu+pLWjeRRQU5sro2X
+						HPQY+GaoFV3gqGbGR1B1nOWctrqxmGPEn2OAf4/R3bwkDMlQNAn7vd8D8CIk9z/e
+						Ntodram+7XFhnAPFMw0EOYk3un+QjdrNke9VYGAL3gqN8uRdPpKl1E84n+jviZCJ
+						c8Uu34odAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+						kOO57TAdBgNVHQ4EFgQUFkISCwlOsYEScVfguhI/NJkkdkkwDgYDVR0PAQH/BAQD
+						AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+						MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+						L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+						MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+						LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmlkcC5zaGVmLmFjLnVrMA0GCSqG
+						SIb3DQEBBQUAA4IBAQBFQpg8CdAxF+fazlT/4DR43XEtbv+SzLg9H2ST1kKrJSb+
+						KHNS6XFli0JcWP1BNFCA0TV/xyH0KWc/ZwYA5h052QHS5kOK88IjUNwW4wluqajT
+						c1jByBc/bV1nVQBrKd7uLeqlEGlYySnx2kwu043nEGsP0/TDCAvdTQ9jqXCSuepg
+						+IS/jkPCQF+/BvmXNOwLei4mUI2EqVnzIqDq3tA8CLxhRKv4qq1bQqicPMwwP0GV
+						crp7O+zg6I/K55qVp75ePh7jHf32AfqRKN0BhQlYoogsT5noMUDNwhRpqv9/h2MH
+						PyWz043AlJssKremO7+1g998b2MkkVpiHa74usy0
+					</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>
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
new file mode 100644
index 00000000..0b5a2638
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sheffcol.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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>
+      <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
+						cnZpY2VzMRswGQYDVQQDExJpZHAuc2hlZmZjb2wuYWMudWsxKTAnBgkqhkiG9w0B
+						CQEWGlJvYmluLkNvb2tlQHNoZWZmY29sLmFjLnVrMB4XDTE0MDIyNDE1NDAyOVoX
+						DTI0MDIyMjE1NDAyOVowgbkxCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9Tb3V0aCBZ
+						b3Jrc2hpcmUxEjAQBgNVBAcTCVNoZWZmaWVsZDEeMBwGA1UEChMVVGhlIFNoZWZm
+						aWVsZCBDb2xsZWdlMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEbMBkGA1UEAxMSaWRw
+						LnNoZWZmY29sLmFjLnVrMSkwJwYJKoZIhvcNAQkBFhpSb2Jpbi5Db29rZUBzaGVm
+						ZmNvbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK42vD+O
+						5/NBZV9XPPzgFWaxthadM9TWqQ4FB/IkubIk4fTXehlHW05kkMH70Md15HCKA810
+						MfEowgPFZZIytOc1xREIeDf+d/9FTt1/+htgIuCFoeVviyNK/nNkPogYvoIDNaqW
+						GIMCGteHF29vzJI572/yTvKukMBUO4GpWmIDrLM7kdg6BdoyMaiH3m53BB6NAnXE
+						bPobrt4lcnOfBE3pqZ1wBmkXoBkDryO2ZEAPIsHQbzmbMjQlnzRfugzDE4N6RnH3
+						JWaKll+sLBo3sKIQ205v6jfYbS9txbGAtBbucunHcqXRuwkxK3MQPVF+/C1MSlXN
+						h1sNGRbKT81WHssCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAO+8MDZoiDNJY/Hvp
+						jdm8xGSAiGkTdE4rk09HEfYJ7jH8Uoa9Ka3Fiur9YqSBayw6qkkWgD5iO3NlKVqt
+						0ZEgxy5duc5JG3VjnkUX9M3jFZYRCd5Ow7qgK7Z+AXr1D8SDDWfFG9mSSYBAtkX4
+						jRYaWGlcGAcB3ATBE4jM+7GxP7cwyBqQIG3pZkCAYjEEUm11TLnEVgE8u/u2ioT0
+						qOqAFHs6u5F5SzOvpYSaYAwi2Z2z0YlAocZt2Gs6GWSydWpT39G/Jbyfm/1TSZqo
+						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>
+						MIID8DCCAtgCCQD+MvDrUqcVKDANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UEBhMC
+						R0IxGDAWBgNVBAgTD1NvdXRoIFlvcmtzaGlyZTESMBAGA1UEBxMJU2hlZmZpZWxk
+						MR4wHAYDVQQKExVUaGUgU2hlZmZpZWxkIENvbGxlZ2UxFDASBgNVBAsTC0lUIFNl
+						cnZpY2VzMRswGQYDVQQDExJpZHAuc2hlZmZjb2wuYWMudWsxKTAnBgkqhkiG9w0B
+						CQEWGlJvYmluLkNvb2tlQHNoZWZmY29sLmFjLnVrMB4XDTE0MDIyNDE1NDAyOVoX
+						DTI0MDIyMjE1NDAyOVowgbkxCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9Tb3V0aCBZ
+						b3Jrc2hpcmUxEjAQBgNVBAcTCVNoZWZmaWVsZDEeMBwGA1UEChMVVGhlIFNoZWZm
+						aWVsZCBDb2xsZWdlMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEbMBkGA1UEAxMSaWRw
+						LnNoZWZmY29sLmFjLnVrMSkwJwYJKoZIhvcNAQkBFhpSb2Jpbi5Db29rZUBzaGVm
+						ZmNvbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK42vD+O
+						5/NBZV9XPPzgFWaxthadM9TWqQ4FB/IkubIk4fTXehlHW05kkMH70Md15HCKA810
+						MfEowgPFZZIytOc1xREIeDf+d/9FTt1/+htgIuCFoeVviyNK/nNkPogYvoIDNaqW
+						GIMCGteHF29vzJI572/yTvKukMBUO4GpWmIDrLM7kdg6BdoyMaiH3m53BB6NAnXE
+						bPobrt4lcnOfBE3pqZ1wBmkXoBkDryO2ZEAPIsHQbzmbMjQlnzRfugzDE4N6RnH3
+						JWaKll+sLBo3sKIQ205v6jfYbS9txbGAtBbucunHcqXRuwkxK3MQPVF+/C1MSlXN
+						h1sNGRbKT81WHssCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAO+8MDZoiDNJY/Hvp
+						jdm8xGSAiGkTdE4rk09HEfYJ7jH8Uoa9Ka3Fiur9YqSBayw6qkkWgD5iO3NlKVqt
+						0ZEgxy5duc5JG3VjnkUX9M3jFZYRCd5Ow7qgK7Z+AXr1D8SDDWfFG9mSSYBAtkX4
+						jRYaWGlcGAcB3ATBE4jM+7GxP7cwyBqQIG3pZkCAYjEEUm11TLnEVgE8u/u2ioT0
+						qOqAFHs6u5F5SzOvpYSaYAwi2Z2z0YlAocZt2Gs6GWSydWpT39G/Jbyfm/1TSZqo
+						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>
diff --git a/swamid-interfederations-2.0/idp.shibboleth.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.shibboleth.net-idp-shibboleth.xml
new file mode 100644
index 00000000..ae1a9fbe
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.shibboleth.net-idp-shibboleth.xml
@@ -0,0 +1,81 @@
+<?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>
+      <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>
+						MIIDNDCCAhygAwIBAgIVAKyBWnv1/h1U11C7kHvV33FIrEsJMA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5ldDAeFw0xMDEyMjkwMDA5
+						MTlaFw0zMDEyMjkwMDA5MTlaMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5l
+						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjWAdpUx/82FUzrRMfA
+						M63PkZZYCm3RnT3eiL+DeJcbGdcEJx/o+32vgHXJgJOBt14YdVam5GErIYgk4SGq
+						5Z5RYl0PpQn6HQG/9prGnYCu6p5zfb0557o51Eh8TcVehS6Y2ruyCjAF0jgVMwh5
+						/0Oh8EE9wG93pSpm70DAiiaTVCb8WoT1aZYtxbBmmuH10bU+wge/NMmaHuVAe599
+						pyezFIL4FoI2g+1Q6nG4Yl1Z07I81tTApXKVMWRt/4/M3m2D7PUMOQ9qsxthp2L/
+						LovIeNo0bTyeW290T2Y/JRZhKOgeDqkhuu82DPri2Vm5G/unB69KfRB7CF9QWIc3
+						y80CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnNoaWJib2xldGgubmV0hilodHRw
+						czovL2lkcC5zaGliYm9sZXRoLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						3uZ32tKXJBzPCTp2dtHSLV0FvGgwDQYJKoZIhvcNAQEFBQADggEBAAYXYuzp0UTj
+						3yLRvUCbEtaw9b80+weOELkVv3WFY3QAG8pIKEblrMMtzrzLFWZwYwwMZDab/HnH
+						egmgjZBthrOedEmoJ+OHRmIiS8zdZxVGEadJhTUaeIkO6kwK7Ht3nQePoiXV7TI5
+						+A9SpmZGoukC85Za4wGDw4xWGs5t5l6tBuuV+1s0oC6T8ih5n/NyThfpbihSW0d7
+						iBfSUickgpoM2BLM3FCnbO8HOsX1rGV4ypG9ZGDDvr2jrzalXXmc05gSlL2qd9ce
+						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 Collections and Janet 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
new file mode 100644
index 00000000..aa96602e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,151 @@
+<?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>
+      <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>
+						MIIHnTCCBoWgAwIBAgIQYq4ht/OC7BIxhYZg2e2WcDANBgkqhkiG9w0BAQsFADCB
+						kjELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxODA2BgNV
+						BAMTL0NPTU9ETyBSU0EgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVy
+						IENBMB4XDTE1MDIxMzAwMDAwMFoXDTE3MDIxMjIzNTk1OVowggEoMREwDwYDVQQF
+						EwhSQzAwMDcxMDETMBEGCysGAQQBgjc8AgEDEwJHQjEdMBsGA1UEDxMUUHJpdmF0
+						ZSBPcmdhbml6YXRpb24xCzAJBgNVBAYTAkdCMQ8wDQYDVQQREwZFMSA0TlMxDzAN
+						BgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRYwFAYDVQQJEw1NaWxlIEVu
+						ZCBSb2FkMSgwJgYDVQQKEx9RdWVlbiBNYXJ5IFVuaXZlcnNpdHkgT2YgTG9uZG9u
+						MRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEjMCEGA1UECxMaQ09NT0RPIEVWIE11bHRp
+						LURvbWFpbiBTU0wxIjAgBgNVBAMTGWlkcC5zaGliYm9sZXRoLnFtdWwuYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDh5MiNTEObfWslVrafeqmP
+						1UD+0U4uUYuDMpX2OFiWRvPVdoIhNJK8InLjRGzM16rArF1VHTvw9L2hg+Mjksql
+						1yaG0FuECmTUk9Jn1rgMo1RVmc036lp5eLAZAxOzj5T3pyiRKqs+QSMHWgwfg6HD
+						U8YaldlqQM9bWtluzSQmx6df1m8DyolCnOBUTR35YwaVuQp9gnafy7i9smvSWhMM
+						9j46BEEYGYJjm0REghRO/3WNRiKaIwiFn4utCGT9/oCu3Nl7yab8HQsAId39UuG9
+						RE2FRJBTe7MuiQ13XllUwJGjCNrqgNldE4UrXHy0hjmFMlhYjY7cH2lCafYfuYTb
+						AgMBAAGjggNUMIIDUDAfBgNVHSMEGDAWgBQ52v/KKBSKqHQTCLnkDqnS+n6daTAd
+						BgNVHQ4EFgQUAlQbTUGQ8qFvPEcR9GoS6dzwfXswDgYDVR0PAQH/BAQDAgWgMAwG
+						A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMEYGA1Ud
+						IAQ/MD0wOwYMKwYBBAGyMQECAQUBMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2Vj
+						dXJlLmNvbW9kby5jb20vQ1BTMFYGA1UdHwRPME0wS6BJoEeGRWh0dHA6Ly9jcmwu
+						Y29tb2RvY2EuY29tL0NPTU9ET1JTQUV4dGVuZGVkVmFsaWRhdGlvblNlY3VyZVNl
+						cnZlckNBLmNybDCBhwYIKwYBBQUHAQEEezB5MFEGCCsGAQUFBzAChkVodHRwOi8v
+						Y3J0LmNvbW9kb2NhLmNvbS9DT01PRE9SU0FFeHRlbmRlZFZhbGlkYXRpb25TZWN1
+						cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2Nh
+						LmNvbTAkBgNVHREEHTAbghlpZHAuc2hpYmJvbGV0aC5xbXVsLmFjLnVrMIIBfwYK
+						KwYBBAHWeQIEAgSCAW8EggFrAWkAdgBo9pj4H2SCvjqM7rkoHUz8cVFdZ5PURNEK
+						Z6y7T0/7xAAAAUuDfKLAAAAEAwBHMEUCIAagnCAKc1skTr2wfGwSOzezQJViqYmn
+						gN5+n6ek/kftAiEAhtqDNmjQM9DZWAxkkOpgHjX4vsM8Cah1O26zwqLbXNQAdwCk
+						uQmQtBhYFIe7E6LMZ3AKPDWYBPkb37jjd80OyA3cEAAAAUuDfKLHAAAEAwBIMEYC
+						IQCJANeMiBQF69/wczNISERwZ/4FVTHON1fD4BKgv/AGEwIhAI7zhnDGVs8p1Ccu
+						Ocq8ovoSLnF5KdVJ2n+Jf1PtTLrOAHYAVhQGmi/XwuzT9eG9RLI+x0Z2ubyZEVzA
+						75SYVdaJ0N0AAAFLg3yhXgAABAMARzBFAiA66Y6PGzOrXZfGz56TSNaANr7yO/c7
+						3r778k2gFOtwAAIhAJqdTx8fzxsbvpUvriFZCGVksMhdcIE8XqmoYz9dzTVSMA0G
+						CSqGSIb3DQEBCwUAA4IBAQBAMXgE6G4STF5JNF+hZi/aDHNDR0BSCGiAJ17wyOQI
+						rP2n5QmYU7q63eWAL4nM6IFjm9lekq9iPZxhC5K3XVgtDz4uEh4CVsPKLnkJlthm
+						6uJcAWlpx6XO/JxcgvLkGLVxt3Ew6YASY9kp1lAps+r4Roy4JbpPY2PQ+G6gmdBN
+						XbXYbayAgPnevhUWxVo4/DgWX9xv3UzF7RWbEEgiS5vRr4hb7pLxlbPHfoQI5KUP
+						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>
+						MIIHnTCCBoWgAwIBAgIQYq4ht/OC7BIxhYZg2e2WcDANBgkqhkiG9w0BAQsFADCB
+						kjELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxODA2BgNV
+						BAMTL0NPTU9ETyBSU0EgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVy
+						IENBMB4XDTE1MDIxMzAwMDAwMFoXDTE3MDIxMjIzNTk1OVowggEoMREwDwYDVQQF
+						EwhSQzAwMDcxMDETMBEGCysGAQQBgjc8AgEDEwJHQjEdMBsGA1UEDxMUUHJpdmF0
+						ZSBPcmdhbml6YXRpb24xCzAJBgNVBAYTAkdCMQ8wDQYDVQQREwZFMSA0TlMxDzAN
+						BgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRYwFAYDVQQJEw1NaWxlIEVu
+						ZCBSb2FkMSgwJgYDVQQKEx9RdWVlbiBNYXJ5IFVuaXZlcnNpdHkgT2YgTG9uZG9u
+						MRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEjMCEGA1UECxMaQ09NT0RPIEVWIE11bHRp
+						LURvbWFpbiBTU0wxIjAgBgNVBAMTGWlkcC5zaGliYm9sZXRoLnFtdWwuYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDh5MiNTEObfWslVrafeqmP
+						1UD+0U4uUYuDMpX2OFiWRvPVdoIhNJK8InLjRGzM16rArF1VHTvw9L2hg+Mjksql
+						1yaG0FuECmTUk9Jn1rgMo1RVmc036lp5eLAZAxOzj5T3pyiRKqs+QSMHWgwfg6HD
+						U8YaldlqQM9bWtluzSQmx6df1m8DyolCnOBUTR35YwaVuQp9gnafy7i9smvSWhMM
+						9j46BEEYGYJjm0REghRO/3WNRiKaIwiFn4utCGT9/oCu3Nl7yab8HQsAId39UuG9
+						RE2FRJBTe7MuiQ13XllUwJGjCNrqgNldE4UrXHy0hjmFMlhYjY7cH2lCafYfuYTb
+						AgMBAAGjggNUMIIDUDAfBgNVHSMEGDAWgBQ52v/KKBSKqHQTCLnkDqnS+n6daTAd
+						BgNVHQ4EFgQUAlQbTUGQ8qFvPEcR9GoS6dzwfXswDgYDVR0PAQH/BAQDAgWgMAwG
+						A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMEYGA1Ud
+						IAQ/MD0wOwYMKwYBBAGyMQECAQUBMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2Vj
+						dXJlLmNvbW9kby5jb20vQ1BTMFYGA1UdHwRPME0wS6BJoEeGRWh0dHA6Ly9jcmwu
+						Y29tb2RvY2EuY29tL0NPTU9ET1JTQUV4dGVuZGVkVmFsaWRhdGlvblNlY3VyZVNl
+						cnZlckNBLmNybDCBhwYIKwYBBQUHAQEEezB5MFEGCCsGAQUFBzAChkVodHRwOi8v
+						Y3J0LmNvbW9kb2NhLmNvbS9DT01PRE9SU0FFeHRlbmRlZFZhbGlkYXRpb25TZWN1
+						cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2Nh
+						LmNvbTAkBgNVHREEHTAbghlpZHAuc2hpYmJvbGV0aC5xbXVsLmFjLnVrMIIBfwYK
+						KwYBBAHWeQIEAgSCAW8EggFrAWkAdgBo9pj4H2SCvjqM7rkoHUz8cVFdZ5PURNEK
+						Z6y7T0/7xAAAAUuDfKLAAAAEAwBHMEUCIAagnCAKc1skTr2wfGwSOzezQJViqYmn
+						gN5+n6ek/kftAiEAhtqDNmjQM9DZWAxkkOpgHjX4vsM8Cah1O26zwqLbXNQAdwCk
+						uQmQtBhYFIe7E6LMZ3AKPDWYBPkb37jjd80OyA3cEAAAAUuDfKLHAAAEAwBIMEYC
+						IQCJANeMiBQF69/wczNISERwZ/4FVTHON1fD4BKgv/AGEwIhAI7zhnDGVs8p1Ccu
+						Ocq8ovoSLnF5KdVJ2n+Jf1PtTLrOAHYAVhQGmi/XwuzT9eG9RLI+x0Z2ubyZEVzA
+						75SYVdaJ0N0AAAFLg3yhXgAABAMARzBFAiA66Y6PGzOrXZfGz56TSNaANr7yO/c7
+						3r778k2gFOtwAAIhAJqdTx8fzxsbvpUvriFZCGVksMhdcIE8XqmoYz9dzTVSMA0G
+						CSqGSIb3DQEBCwUAA4IBAQBAMXgE6G4STF5JNF+hZi/aDHNDR0BSCGiAJ17wyOQI
+						rP2n5QmYU7q63eWAL4nM6IFjm9lekq9iPZxhC5K3XVgtDz4uEh4CVsPKLnkJlthm
+						6uJcAWlpx6XO/JxcgvLkGLVxt3Ew6YASY9kp1lAps+r4Roy4JbpPY2PQ+G6gmdBN
+						XbXYbayAgPnevhUWxVo4/DgWX9xv3UzF7RWbEEgiS5vRr4hb7pLxlbPHfoQI5KUP
+						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>Kieran</md:GivenName>
+    <md:SurName>Whitbread</md:SurName>
+    <md:EmailAddress>mailto:k.j.whitbread@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
new file mode 100644
index 00000000..c4d1a1e9
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+						MIIFdzCCBF+gAwIBAgIQQvec2MkxvhhLg7rQH2/vRTANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDQxNjAwMDAwMFoXDTE2MDQxNTIzNTk1OVowQzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliYm9sZXRo
+						LnN0aXIuYWMudWswggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDGn6g9
+						4n1tC+fn1Hd3a/88lcMS4WDp7DJFjT5U6EFBqMXf1PGnVs4CvOButyXIIU/TXnkG
+						nRAEFhoWqDxf2c1bJRbg2rykmfqTvXIFECU8irz8aNigh8mB/YCmm3LBc+8NNbXC
+						NCfsEfZAtBqAhdhuDVzJzIrQItuCWTsBj/L/RSNF5FQGYwQoMlpzVK43X58aGkdS
+						iSdwMCzEkzwI0ungdTu4mKk+JAyEcJ/QYAaF+sBVAPe/6uTQjbfg/Vmu2nqYBgiS
+						gmrZezi38Z8phcQSzGcVFIFlnUvYo+dQd3WsKG66D1HfWsXJjB5b/aOzC//SS3VA
+						sz5XjTVQFXPzUubmg6Zr6uOI4VxEsTPT8+THD3XRfiKFx8wT//HavMu6Q+V4qu1T
+						OelMe+iQtD4I6qOiG5u4Q/mJKBXL2jaPRubgwmCLvBcUPy9qcMhj3cNhq3L2MdbV
+						pxNC7n6U+1H1VuJwkEgrHo0LMN2TJ1bWw7Ka+Gx5opAIbzxU1781HSOQomEyjZ7l
+						A+5QZakT5oCK/T7s6tOiyyeHFfynzjLt12vX5QAjcg4+DfV8tIBMPzhcsXdNhYXO
+						0NrwwaPobyc3n8GK6kWo6/JFIbNug3QsHh2B2UFaSKTFB+BAyFp/X3CHqvqkBomR
+						klrTWhvJO20Ua+1FihxLRnaRM9hw1Ytm5eKwowIDAQABo4IBcjCCAW4wHwYDVR0j
+						BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFF8S3EXPgDW49jHO
+						kJ7QbDlNY5gHMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
+						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgId
+						MAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+						bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+						MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+						CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAX
+						ghVzaGliYm9sZXRoLnN0aXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAKoUdUXu
+						KipklEzb71oC7zQLTxrAT73eYsG841zn/uCBKAjDDnBgtpXXAKphRZD+CMyBlbAB
+						ZtY6orxoLMObKr3Lwhd6+dxOjyQplF70/dOQalkoErVp3iuz2ahgs4PKAgWm/8lW
+						mvIYFXIEVznxDSF9WTuZjiXB+tRYv9K7MftLKgHkD9jtdrzTwL7ZeTilJalN5KZR
+						OvGyZ76NXtrh/uMBaCIg45uxWQsXFSPwNz8H8emPeH1nT0wguRZh+S/ofr53xUlJ
+						U+wjeuZgmnQ2RAp9+zNrV0h7wagFs+L7XIcOuYu2HWi8Rl24BXT3j3WIdBe1IP79
+						4jGYQXK/vvWeCfE=
+					</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>
+						MIIFdzCCBF+gAwIBAgIQQvec2MkxvhhLg7rQH2/vRTANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDQxNjAwMDAwMFoXDTE2MDQxNTIzNTk1OVowQzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliYm9sZXRo
+						LnN0aXIuYWMudWswggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDGn6g9
+						4n1tC+fn1Hd3a/88lcMS4WDp7DJFjT5U6EFBqMXf1PGnVs4CvOButyXIIU/TXnkG
+						nRAEFhoWqDxf2c1bJRbg2rykmfqTvXIFECU8irz8aNigh8mB/YCmm3LBc+8NNbXC
+						NCfsEfZAtBqAhdhuDVzJzIrQItuCWTsBj/L/RSNF5FQGYwQoMlpzVK43X58aGkdS
+						iSdwMCzEkzwI0ungdTu4mKk+JAyEcJ/QYAaF+sBVAPe/6uTQjbfg/Vmu2nqYBgiS
+						gmrZezi38Z8phcQSzGcVFIFlnUvYo+dQd3WsKG66D1HfWsXJjB5b/aOzC//SS3VA
+						sz5XjTVQFXPzUubmg6Zr6uOI4VxEsTPT8+THD3XRfiKFx8wT//HavMu6Q+V4qu1T
+						OelMe+iQtD4I6qOiG5u4Q/mJKBXL2jaPRubgwmCLvBcUPy9qcMhj3cNhq3L2MdbV
+						pxNC7n6U+1H1VuJwkEgrHo0LMN2TJ1bWw7Ka+Gx5opAIbzxU1781HSOQomEyjZ7l
+						A+5QZakT5oCK/T7s6tOiyyeHFfynzjLt12vX5QAjcg4+DfV8tIBMPzhcsXdNhYXO
+						0NrwwaPobyc3n8GK6kWo6/JFIbNug3QsHh2B2UFaSKTFB+BAyFp/X3CHqvqkBomR
+						klrTWhvJO20Ua+1FihxLRnaRM9hw1Ytm5eKwowIDAQABo4IBcjCCAW4wHwYDVR0j
+						BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFF8S3EXPgDW49jHO
+						kJ7QbDlNY5gHMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
+						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgId
+						MAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+						bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+						MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+						CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAX
+						ghVzaGliYm9sZXRoLnN0aXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAKoUdUXu
+						KipklEzb71oC7zQLTxrAT73eYsG841zn/uCBKAjDDnBgtpXXAKphRZD+CMyBlbAB
+						ZtY6orxoLMObKr3Lwhd6+dxOjyQplF70/dOQalkoErVp3iuz2ahgs4PKAgWm/8lW
+						mvIYFXIEVznxDSF9WTuZjiXB+tRYv9K7MftLKgHkD9jtdrzTwL7ZeTilJalN5KZR
+						OvGyZ76NXtrh/uMBaCIg45uxWQsXFSPwNz8H8emPeH1nT0wguRZh+S/ofr53xUlJ
+						U+wjeuZgmnQ2RAp9+zNrV0h7wagFs+L7XIcOuYu2HWi8Rl24BXT3j3WIdBe1IP79
+						4jGYQXK/vvWeCfE=
+					</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>
diff --git a/swamid-interfederations-2.0/idp.shu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.shu.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c1dd582a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.shu.ac.uk-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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>
+      <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>
+						MIIEPjCCAyagAwIBAgIJANXnLNjnFdG5MA0GCSqGSIb3DQEBBQUAMIGfMQswCQYD
+						VQQGEwJHQjEYMBYGA1UECBMPU291dGggWW9ya3NoaXJlMRIwEAYDVQQHEwlTaGVm
+						ZmllbGQxJDAiBgNVBAoTG1NoZWZmaWVsZCBIYWxsYW0gVW5pdmVyc2l0eTEkMCIG
+						A1UECxQbU3R1ZGVudCAmIExlYXJuaW5nIFNlcnZpY2VzMRYwFAYDVQQDEw1pZHAu
+						c2h1LmFjLnVrMB4XDTEzMDQxNzEyMjgyMloXDTIzMDQxNTEyMjgyMlowgZ8xCzAJ
+						BgNVBAYTAkdCMRgwFgYDVQQIEw9Tb3V0aCBZb3Jrc2hpcmUxEjAQBgNVBAcTCVNo
+						ZWZmaWVsZDEkMCIGA1UEChMbU2hlZmZpZWxkIEhhbGxhbSBVbml2ZXJzaXR5MSQw
+						IgYDVQQLFBtTdHVkZW50ICYgTGVhcm5pbmcgU2VydmljZXMxFjAUBgNVBAMTDWlk
+						cC5zaHUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuW416
+						Pl4npHeAmyrW3n2vFClbxTr9V2U78FNTSG3ZcI5L4Yq/6RiiU90o8gzgHKWljfio
+						Ekx361zSrch84AuE5WFDc+tjXY7LfcrnVS4Vq/uk1UBAip/rvnSjkvG7eQxwo+uw
+						Hbl1nsZd1g2+e3EIWOenVk+/1F4CaQi7oyx9lmVU1OqX1P8FjS9YE0KWh0cppzll
+						aYN67fm1ahVHL0DSAiW0/tsZqUTcMK6SuaiGyijYC1RSH/sJxlaR5wNvoKSfowr+
+						YMKcD/IpYxDpyqXldPuNjZNkWEjffAPnphRZc27G0THOtdIxmQ75uveBUJHILivY
+						Av2nZK57RHe5kLF3AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
+						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQ8AKwYB1Wj
+						Ww1YwE0CmgD64hNpaTAfBgNVHSMEGDAWgBQ8AKwYB1WjWw1YwE0CmgD64hNpaTAN
+						BgkqhkiG9w0BAQUFAAOCAQEAROO+SyHXrArH+14peCMWvIi2rf6FrKhbATmMNh3z
+						ff1pCCCdhCAAjDPgyLJkJRye4qwUZ0UswSfolowqbT1b6qyV3eka2y3inmVrWR65
+						o0B12LDsD2Xw1dlepsB87a/2AaXoMlWPr9ka3fH3bL//BiCleUbP9C+RMIlKmfw+
+						HyCSmwmzwOGUe5LsfT9DNJ+0XnYmGIjsTVvhngrhUVwnqC6r7KaQYXbYnaeG05Zv
+						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>
+						MIIEPjCCAyagAwIBAgIJANXnLNjnFdG5MA0GCSqGSIb3DQEBBQUAMIGfMQswCQYD
+						VQQGEwJHQjEYMBYGA1UECBMPU291dGggWW9ya3NoaXJlMRIwEAYDVQQHEwlTaGVm
+						ZmllbGQxJDAiBgNVBAoTG1NoZWZmaWVsZCBIYWxsYW0gVW5pdmVyc2l0eTEkMCIG
+						A1UECxQbU3R1ZGVudCAmIExlYXJuaW5nIFNlcnZpY2VzMRYwFAYDVQQDEw1pZHAu
+						c2h1LmFjLnVrMB4XDTEzMDQxNzEyMjgyMloXDTIzMDQxNTEyMjgyMlowgZ8xCzAJ
+						BgNVBAYTAkdCMRgwFgYDVQQIEw9Tb3V0aCBZb3Jrc2hpcmUxEjAQBgNVBAcTCVNo
+						ZWZmaWVsZDEkMCIGA1UEChMbU2hlZmZpZWxkIEhhbGxhbSBVbml2ZXJzaXR5MSQw
+						IgYDVQQLFBtTdHVkZW50ICYgTGVhcm5pbmcgU2VydmljZXMxFjAUBgNVBAMTDWlk
+						cC5zaHUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuW416
+						Pl4npHeAmyrW3n2vFClbxTr9V2U78FNTSG3ZcI5L4Yq/6RiiU90o8gzgHKWljfio
+						Ekx361zSrch84AuE5WFDc+tjXY7LfcrnVS4Vq/uk1UBAip/rvnSjkvG7eQxwo+uw
+						Hbl1nsZd1g2+e3EIWOenVk+/1F4CaQi7oyx9lmVU1OqX1P8FjS9YE0KWh0cppzll
+						aYN67fm1ahVHL0DSAiW0/tsZqUTcMK6SuaiGyijYC1RSH/sJxlaR5wNvoKSfowr+
+						YMKcD/IpYxDpyqXldPuNjZNkWEjffAPnphRZc27G0THOtdIxmQ75uveBUJHILivY
+						Av2nZK57RHe5kLF3AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
+						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQ8AKwYB1Wj
+						Ww1YwE0CmgD64hNpaTAfBgNVHSMEGDAWgBQ8AKwYB1WjWw1YwE0CmgD64hNpaTAN
+						BgkqhkiG9w0BAQUFAAOCAQEAROO+SyHXrArH+14peCMWvIi2rf6FrKhbATmMNh3z
+						ff1pCCCdhCAAjDPgyLJkJRye4qwUZ0UswSfolowqbT1b6qyV3eka2y3inmVrWR65
+						o0B12LDsD2Xw1dlepsB87a/2AaXoMlWPr9ka3fH3bL//BiCleUbP9C+RMIlKmfw+
+						HyCSmwmzwOGUe5LsfT9DNJ+0XnYmGIjsTVvhngrhUVwnqC6r7KaQYXbYnaeG05Zv
+						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>
diff --git a/swamid-interfederations-2.0/idp.sics.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sics.se-idp-shibboleth.xml
new file mode 100644
index 00000000..bcc8c1a3
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sics.se-idp-shibboleth.xml
@@ -0,0 +1,130 @@
+<?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>
+      <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>
+MIIFKzCCBBOgAwIBAgIQDFPDqRLGthue9PVUlHMf7DANBgkqhkiG9w0BAQUFADBm
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBDQS0zMB4XDTEzMDExMDAwMDAwMFoXDTE2MDMxNTEyMDAwMFowaDELMAkGA1UE
+BhMCU0UxFzAVBgNVBAgTDlN0b2NraG9sbXMgTGFuMQ4wDAYDVQQHEwVLaXN0YTEc
+MBoGA1UEChMTU0lDUyBTd2VkaXNoIElDVCBBQjESMBAGA1UEAwwJKi5zaWNzLnNl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsbJY78glP+QcpN/1pTDl
+x658C3OYBSAKMDPy9CeHcFtvhoGa+s+vS49L4a2LPPqQkEJINRI+OhFUeLu034dA
+9TKZ6ptsOEJkjYjJ+BcCkCw/zi0crOJWgXWWc+Rdqg9nasHWMFO0Js67JnACv2OJ
+mrnj3BBN5hMaeOTu7YTs4T7qwz5LSpttenGUicLiot2m/ZekEgCHYgLaPhNV3waX
+5WYkUlQIWCR7PFlrZDxedmS4R6NGeQdtihcM2IvzlfB2MajrGf/+62jEoYqZrcb8
+zYEDuFJjQl/BM2Os6HelcRZxi+OD+ZOHDsM1C9taeG7wQp0opvNdZQrf4DO53reY
+TQIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUUOpzidsp+xCPnuUBINTeeZlIg/cw
+HQYDVR0OBBYEFBJBAFefeNXl1kFec1rnaA62ttNhMCoGA1UdEQQjMCGCCSouc2lj
+cy5zZYIHc2ljcy5zZYILaWRwLnNpY3Muc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBhBgNVHR8EWjBYMCqgKKAmhiRodHRw
+Oi8vY3JsMy5kaWdpY2VydC5jb20vY2EzLWcyOC5jcmwwKqAooCaGJGh0dHA6Ly9j
+cmw0LmRpZ2ljZXJ0LmNvbS9jYTMtZzI4LmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG
+/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT
+MHsGCCsGAQUFBwEBBG8wbTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNl
+cnQuY29tMEUGCCsGAQUFBzAChjlodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20v
+RGlnaUNlcnRIaWdoQXNzdXJhbmNlQ0EtMy5jcnQwDAYDVR0TAQH/BAIwADANBgkq
+hkiG9w0BAQUFAAOCAQEAPwtD1Bv5RBu9+KMT/JyVrTrAH66jS1pFqDHQAYoFDvdV
+ebxTYVH/HQjRhKlykH+EUGpfYXWOhzlI0mqhCkfcqZK2CFxOf+lWxQ2V5vBFM8kF
+lhRU+z3mEG8SvZ4tmybjutbmBhjcOo22cqpNsqL0hIOqt+zoxMI/nZTeClQj3SlT
+/bgk9BXnvISi5P+zHMXuVYFmzWeKlr8oKFbIzAPTaJkm0c40+zBar/siKNOmHgio
+XnX1bzCBFJxjpRM6ZDPIos7p3UMsWRKu5BJndINmR5oxYVMOxX+BV3zR04p4WR1N
+SAjl7oNIQRzT56t4Npa0p4GNvEUKkevkVfF3AChSdg==
+          </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>
+MIIFKzCCBBOgAwIBAgIQDFPDqRLGthue9PVUlHMf7DANBgkqhkiG9w0BAQUFADBm
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBDQS0zMB4XDTEzMDExMDAwMDAwMFoXDTE2MDMxNTEyMDAwMFowaDELMAkGA1UE
+BhMCU0UxFzAVBgNVBAgTDlN0b2NraG9sbXMgTGFuMQ4wDAYDVQQHEwVLaXN0YTEc
+MBoGA1UEChMTU0lDUyBTd2VkaXNoIElDVCBBQjESMBAGA1UEAwwJKi5zaWNzLnNl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsbJY78glP+QcpN/1pTDl
+x658C3OYBSAKMDPy9CeHcFtvhoGa+s+vS49L4a2LPPqQkEJINRI+OhFUeLu034dA
+9TKZ6ptsOEJkjYjJ+BcCkCw/zi0crOJWgXWWc+Rdqg9nasHWMFO0Js67JnACv2OJ
+mrnj3BBN5hMaeOTu7YTs4T7qwz5LSpttenGUicLiot2m/ZekEgCHYgLaPhNV3waX
+5WYkUlQIWCR7PFlrZDxedmS4R6NGeQdtihcM2IvzlfB2MajrGf/+62jEoYqZrcb8
+zYEDuFJjQl/BM2Os6HelcRZxi+OD+ZOHDsM1C9taeG7wQp0opvNdZQrf4DO53reY
+TQIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUUOpzidsp+xCPnuUBINTeeZlIg/cw
+HQYDVR0OBBYEFBJBAFefeNXl1kFec1rnaA62ttNhMCoGA1UdEQQjMCGCCSouc2lj
+cy5zZYIHc2ljcy5zZYILaWRwLnNpY3Muc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBhBgNVHR8EWjBYMCqgKKAmhiRodHRw
+Oi8vY3JsMy5kaWdpY2VydC5jb20vY2EzLWcyOC5jcmwwKqAooCaGJGh0dHA6Ly9j
+cmw0LmRpZ2ljZXJ0LmNvbS9jYTMtZzI4LmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG
+/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT
+MHsGCCsGAQUFBwEBBG8wbTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNl
+cnQuY29tMEUGCCsGAQUFBzAChjlodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20v
+RGlnaUNlcnRIaWdoQXNzdXJhbmNlQ0EtMy5jcnQwDAYDVR0TAQH/BAIwADANBgkq
+hkiG9w0BAQUFAAOCAQEAPwtD1Bv5RBu9+KMT/JyVrTrAH66jS1pFqDHQAYoFDvdV
+ebxTYVH/HQjRhKlykH+EUGpfYXWOhzlI0mqhCkfcqZK2CFxOf+lWxQ2V5vBFM8kF
+lhRU+z3mEG8SvZ4tmybjutbmBhjcOo22cqpNsqL0hIOqt+zoxMI/nZTeClQj3SlT
+/bgk9BXnvISi5P+zHMXuVYFmzWeKlr8oKFbIzAPTaJkm0c40+zBar/siKNOmHgio
+XnX1bzCBFJxjpRM6ZDPIos7p3UMsWRKu5BJndINmR5oxYVMOxX+BV3zR04p4WR1N
+SAjl7oNIQRzT56t4Npa0p4GNvEUKkevkVfF3AChSdg==
+          </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>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
new file mode 100644
index 00000000..007078ce
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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">
+                    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>
+      <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>
+MIIDGzCCAgOgAwIBAgIUBDNUKHsGJPdh6XQWcjVI7QsO2fUwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MB4XDTEwMTExMTEyMTAyNVoXDTMw
+MTExMTEyMTAyNVowFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAijIA8AmcGKkBom6g4javpNcollJH9oq+13Fd
+wvNPUJTXPNDRrmNO9jhgY7Jcx2+I8jkOryP7ifpKtlmEt3k3W0o08Om/jKbdayKx
+I8phZMe2/fKiUVtUJz1zQ9cE02Cmd0vTb8421Y7JnmKcf7uwNLQnU4elT079Clak
+3gwk2VJJja+yzrB9DMLhHs+rRZp4cqgJaH1LqcLtrp435xcFEr+NL15Ei2dFWtym
+pGgf/wLASEgqws2RSdvEu2Kz+m2vDIox6N9mZN/FW2chyjSJ/scv9pkYXeZAyaOB
+PtmGF50A7HOZDFUnQQ62EEQ74QmE/mhgSyPSGUjs/i+utY96PQIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAuc2lzc2EuaXSGI2h0dHBzOi8vaWRwLnNpc3NhLml0L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRVL7DD1CdWBVf38sDt3Plq+UeOzzANBgkq
+hkiG9w0BAQUFAAOCAQEADshw70QDPxPI3c9iJReHPp9xpkTrCV4i+oqK2ChSp3UT
+P2guauh6zdXbOMCBD1Zs+rMP5/LinkJpT7P9dM0jQgmD8uXbi6livyB4Brf49P0r
+jtKgeiplWeXSXzKnAwELHEDa5ixsvMT/WfBWVCNfrnTE/fR0YjGw35SqYgYiUfpE
+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>
+MIIDGzCCAgOgAwIBAgIUBDNUKHsGJPdh6XQWcjVI7QsO2fUwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MB4XDTEwMTExMTEyMTAyNVoXDTMw
+MTExMTEyMTAyNVowFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAijIA8AmcGKkBom6g4javpNcollJH9oq+13Fd
+wvNPUJTXPNDRrmNO9jhgY7Jcx2+I8jkOryP7ifpKtlmEt3k3W0o08Om/jKbdayKx
+I8phZMe2/fKiUVtUJz1zQ9cE02Cmd0vTb8421Y7JnmKcf7uwNLQnU4elT079Clak
+3gwk2VJJja+yzrB9DMLhHs+rRZp4cqgJaH1LqcLtrp435xcFEr+NL15Ei2dFWtym
+pGgf/wLASEgqws2RSdvEu2Kz+m2vDIox6N9mZN/FW2chyjSJ/scv9pkYXeZAyaOB
+PtmGF50A7HOZDFUnQQ62EEQ74QmE/mhgSyPSGUjs/i+utY96PQIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAuc2lzc2EuaXSGI2h0dHBzOi8vaWRwLnNpc3NhLml0L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRVL7DD1CdWBVf38sDt3Plq+UeOzzANBgkq
+hkiG9w0BAQUFAAOCAQEADshw70QDPxPI3c9iJReHPp9xpkTrCV4i+oqK2ChSp3UT
+P2guauh6zdXbOMCBD1Zs+rMP5/LinkJpT7P9dM0jQgmD8uXbi6livyB4Brf49P0r
+jtKgeiplWeXSXzKnAwELHEDa5ixsvMT/WfBWVCNfrnTE/fR0YjGw35SqYgYiUfpE
+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>
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
new file mode 100644
index 00000000..e6ad2a38
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.slcollege.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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>
+      <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>
+						MIIDODCCAiCgAwIBAgIVAL6tdh1Q1lgaE74wTineZn7NGaKtMA0GCSqGSIb3DQEB
+						BQUAMB4xHDAaBgNVBAMTE2lkcC5zbGNvbGxlZ2UuYWMudWswHhcNMTQwNDAxMTA1
+						NDIxWhcNMzQwNDAxMTA1NDIxWjAeMRwwGgYDVQQDExNpZHAuc2xjb2xsZWdlLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz5xw2zn0ZCNoGTF0
+						IzSScZwrds6DeeibqHIPU/zOo4RCc1xz60BHSDsHyWCE5PNjnzB15yZXN0cqRTbN
+						5i8xRWgC0RJj6IguR5ntRhqMA8i+j0rU8J3w8wagV8bueDdp8o2iEBUgw8+VQA+Q
+						k7JP4sWi9yhU6ekSLeGeEl8dWLOS9Jn2siB9KTg8pqp1PwXKR+KVW+gsInoFms+L
+						ODiNsZ+HKEV2OVM0OarV2cND2gxH5VKxlA/KD9YQi0jc7oYWebMuwi0St6YzlgTL
+						872Y071YoUdZorsiIq9SFA/YpJIom8jz011y8xxzxR19IaOQoP8sGX12m+WP5gZn
+						ASNciwIDAQABo20wazBKBgNVHREEQzBBghNpZHAuc2xjb2xsZWdlLmFjLnVrhipo
+						dHRwczovL2lkcC5zbGNvbGxlZ2UuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
+						BBYEFPoignDUHhoa37ZM0Tx243itVTW2MA0GCSqGSIb3DQEBBQUAA4IBAQBxj1L0
+						HCYdoJo/fjTVOkUck2y9g9RfKryJOIPt3is6CfBzonqVFIOTsMeMMrtr1axl5E0h
+						Te3ZIOmDvb63wEOBziqsvemzVwFSOsuTiT9dniNZ4Udg5DhORFPhLrxmdYBI2sl1
+						GDpEUrr3RKPnj7zfgBZxwIE9BxeZnDFxl/O7582Lis1ClEmFnb9TxrtzcLIH7TCY
+						Q0IhONFmkgClsAB/Wn35x/yNcLxGhiWd/G3gzbLxjmWdc0e8GAVMzRHD6NjHvLKc
+						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>
+						MIIDODCCAiCgAwIBAgIVAL6tdh1Q1lgaE74wTineZn7NGaKtMA0GCSqGSIb3DQEB
+						BQUAMB4xHDAaBgNVBAMTE2lkcC5zbGNvbGxlZ2UuYWMudWswHhcNMTQwNDAxMTA1
+						NDIxWhcNMzQwNDAxMTA1NDIxWjAeMRwwGgYDVQQDExNpZHAuc2xjb2xsZWdlLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz5xw2zn0ZCNoGTF0
+						IzSScZwrds6DeeibqHIPU/zOo4RCc1xz60BHSDsHyWCE5PNjnzB15yZXN0cqRTbN
+						5i8xRWgC0RJj6IguR5ntRhqMA8i+j0rU8J3w8wagV8bueDdp8o2iEBUgw8+VQA+Q
+						k7JP4sWi9yhU6ekSLeGeEl8dWLOS9Jn2siB9KTg8pqp1PwXKR+KVW+gsInoFms+L
+						ODiNsZ+HKEV2OVM0OarV2cND2gxH5VKxlA/KD9YQi0jc7oYWebMuwi0St6YzlgTL
+						872Y071YoUdZorsiIq9SFA/YpJIom8jz011y8xxzxR19IaOQoP8sGX12m+WP5gZn
+						ASNciwIDAQABo20wazBKBgNVHREEQzBBghNpZHAuc2xjb2xsZWdlLmFjLnVrhipo
+						dHRwczovL2lkcC5zbGNvbGxlZ2UuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
+						BBYEFPoignDUHhoa37ZM0Tx243itVTW2MA0GCSqGSIb3DQEBBQUAA4IBAQBxj1L0
+						HCYdoJo/fjTVOkUck2y9g9RfKryJOIPt3is6CfBzonqVFIOTsMeMMrtr1axl5E0h
+						Te3ZIOmDvb63wEOBziqsvemzVwFSOsuTiT9dniNZ4Udg5DhORFPhLrxmdYBI2sl1
+						GDpEUrr3RKPnj7zfgBZxwIE9BxeZnDFxl/O7582Lis1ClEmFnb9TxrtzcLIH7TCY
+						Q0IhONFmkgClsAB/Wn35x/yNcLxGhiWd/G3gzbLxjmWdc0e8GAVMzRHD6NjHvLKc
+						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>
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
new file mode 100644
index 00000000..87ffa164
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqey/f0AHmuYflfyRldet5x7ft9mN5GU5
+						MAFLmVDlTKAVAlAZgD+knrt7Vr+NE8YhNL7t5N7rMMxLsoJ7gW5qo4Fl4ihZSdC8
+						0c8lPPjAzG4ol2P60vmL4bsON1NPFFnEDTfPWmSdIGnZ1Yu4LdsPbxupm7iRU3qQ
+						+NZBrCXjdTNkApY7VqhNW693ulLSS/ERjYrbwuhe4R1EQN8UJByWokocpEZg+PHr
+						/f32B2mAd5M40kifSxzeq7Yh/473ZqyYiMRMJ2S/rYcXOJjJXIJggG/0o8RzW3iz
+						NckUMLLlIn6czkGR7goW9/PFrH+npAnqCtvpY02361Y00JIspKiegwIDAQABo2Ew
+						XzA+BgNVHREENzA1gg1pZHAuc25jLmFjLnVrhiRodHRwczovL2lkcC5zbmMuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHYJ9wHah0MigR+hhOovfPwsk+J2
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCBlYR/bb8P28PLzbfeDHF6LmK+wllNCUaMsbRq
+						8cMzNDh9qf/86HEZf2RnkpjR87u9q22m2aI5DufDpB9G8fowVZff4aY9eiu8XcH+
+						oLp7qxk/TNFJEP/OvzmTGJgNKxiWmYqYawe/6K3TTk3j1XSUpT5do5LAxjAIrZHq
+						z+6OMn63/26rIyKDi3yMgiaagge7tBzzPgGBHAwmijQNybso009X0Tv0g29oyq9Z
+						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>
+						MIIDIDCCAgigAwIBAgIVAILTn2HBBdNo1ahq8UPWTUXgGC1eMA0GCSqGSIb3DQEB
+						BQUAMBgxFjAUBgNVBAMTDWlkcC5zbmMuYWMudWswHhcNMTIwMjEwMTE0NDQzWhcN
+						MzIwMjEwMTE0NDQzWjAYMRYwFAYDVQQDEw1pZHAuc25jLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqey/f0AHmuYflfyRldet5x7ft9mN5GU5
+						MAFLmVDlTKAVAlAZgD+knrt7Vr+NE8YhNL7t5N7rMMxLsoJ7gW5qo4Fl4ihZSdC8
+						0c8lPPjAzG4ol2P60vmL4bsON1NPFFnEDTfPWmSdIGnZ1Yu4LdsPbxupm7iRU3qQ
+						+NZBrCXjdTNkApY7VqhNW693ulLSS/ERjYrbwuhe4R1EQN8UJByWokocpEZg+PHr
+						/f32B2mAd5M40kifSxzeq7Yh/473ZqyYiMRMJ2S/rYcXOJjJXIJggG/0o8RzW3iz
+						NckUMLLlIn6czkGR7goW9/PFrH+npAnqCtvpY02361Y00JIspKiegwIDAQABo2Ew
+						XzA+BgNVHREENzA1gg1pZHAuc25jLmFjLnVrhiRodHRwczovL2lkcC5zbmMuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHYJ9wHah0MigR+hhOovfPwsk+J2
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCBlYR/bb8P28PLzbfeDHF6LmK+wllNCUaMsbRq
+						8cMzNDh9qf/86HEZf2RnkpjR87u9q22m2aI5DufDpB9G8fowVZff4aY9eiu8XcH+
+						oLp7qxk/TNFJEP/OvzmTGJgNKxiWmYqYawe/6K3TTk3j1XSUpT5do5LAxjAIrZHq
+						z+6OMn63/26rIyKDi3yMgiaagge7tBzzPgGBHAwmijQNybso009X0Tv0g29oyq9Z
+						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>
diff --git a/swamid-interfederations-2.0/idp.soas.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.soas.ac.uk-entity.xml
new file mode 100644
index 00000000..af4f9136
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.soas.ac.uk-entity.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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>
+						MIIDIzCCAgugAwIBAgIUHu+w7DSrNlupuFhKVEzWgnZN6howDQYJKoZIhvcNAQEF
+						BQAwGTEXMBUGA1UEAxMOaWRwLnNvYXMuYWMudWswHhcNMTQwNDA4MjIxNzAxWhcN
+						MzQwNDA4MjIxNzAxWjAZMRcwFQYDVQQDEw5pZHAuc29hcy5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIuU7ElZ1vCWXXzk6p8OeidLIuxiuTLS
+						QCok7JQ12DsN0sMkR3nB6Fc/p8JtF5Wi2AYYdiiLSnG9aL1X4IC/c13oLjpnaROF
+						AmoUvphSM3KOxJbHRcgDyLPgUom3lrz06eVu+CaGd9ZcuTyLWDhcEb2OMM9/uYEX
+						k7aEIGvz6srSf3mMMt0dfqtSgMNzz7TFnWa87slCC/9r+ZpWUkL/sBvmzx5O72qm
+						7Z8mpi6REZpm40wqMUAxHjjjW8aJXmXiyVCOc7egpZ2AYMnotBVp+90YmQBUhJAb
+						1FOChrciUjQkCyfK9tjTtCg6QSjJY8BwDGkt8KiCBZ1Ek+aXylC5FN0CAwEAAaNj
+						MGEwQAYDVR0RBDkwN4IOaWRwLnNvYXMuYWMudWuGJWh0dHBzOi8vaWRwLnNvYXMu
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMVRZjXXKBbdahgAxd9112xb
+						VrldMA0GCSqGSIb3DQEBBQUAA4IBAQB9WO18k3FgZfqXpeQ5VpEagA6GjUAQ1L5h
+						dHX9qWZuhdUWmYfsZ76E7E48PMok6wikWGo52T5DAINMmoHeSI7I4TPncoKkhF/t
+						xjBcdyV4aIv2vRyVJzhk8Nlhxa49OVcyx197cF7wZ6VTYfatmCgXz4SIY8+DJ0PN
+						G/lX9hVVrfFS/vu88SbBTFUwTDEDsW42OjQjHxMgX1fq2Crxwo0xmthQLXju5o24
+						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>
+						MIIDIzCCAgugAwIBAgIUHu+w7DSrNlupuFhKVEzWgnZN6howDQYJKoZIhvcNAQEF
+						BQAwGTEXMBUGA1UEAxMOaWRwLnNvYXMuYWMudWswHhcNMTQwNDA4MjIxNzAxWhcN
+						MzQwNDA4MjIxNzAxWjAZMRcwFQYDVQQDEw5pZHAuc29hcy5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIuU7ElZ1vCWXXzk6p8OeidLIuxiuTLS
+						QCok7JQ12DsN0sMkR3nB6Fc/p8JtF5Wi2AYYdiiLSnG9aL1X4IC/c13oLjpnaROF
+						AmoUvphSM3KOxJbHRcgDyLPgUom3lrz06eVu+CaGd9ZcuTyLWDhcEb2OMM9/uYEX
+						k7aEIGvz6srSf3mMMt0dfqtSgMNzz7TFnWa87slCC/9r+ZpWUkL/sBvmzx5O72qm
+						7Z8mpi6REZpm40wqMUAxHjjjW8aJXmXiyVCOc7egpZ2AYMnotBVp+90YmQBUhJAb
+						1FOChrciUjQkCyfK9tjTtCg6QSjJY8BwDGkt8KiCBZ1Ek+aXylC5FN0CAwEAAaNj
+						MGEwQAYDVR0RBDkwN4IOaWRwLnNvYXMuYWMudWuGJWh0dHBzOi8vaWRwLnNvYXMu
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMVRZjXXKBbdahgAxd9112xb
+						VrldMA0GCSqGSIb3DQEBBQUAA4IBAQB9WO18k3FgZfqXpeQ5VpEagA6GjUAQ1L5h
+						dHX9qWZuhdUWmYfsZ76E7E48PMok6wikWGo52T5DAINMmoHeSI7I4TPncoKkhF/t
+						xjBcdyV4aIv2vRyVJzhk8Nlhxa49OVcyx197cF7wZ6VTYfatmCgXz4SIY8+DJ0PN
+						G/lX9hVVrfFS/vu88SbBTFUwTDEDsW42OjQjHxMgX1fq2Crxwo0xmthQLXju5o24
+						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>
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
new file mode 100644
index 00000000..490ae240
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.soc.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDJDCCAgygAwIBAgIVALbz3ZMe+jLBrE4lIU9+JcxfX6G1MA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5zb2MuY2FzLmN6MB4XDTE0MDYwNDA3NTk0N1oX
+DTM0MDYwNDA3NTk0N1owGTEXMBUGA1UEAxMOaWRwLnNvYy5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb17jsUD7gY8vMDwIgjf3Gc8HIGatp
+dVo0qPKs2kIwbOpNxtfiK3QFGoj6zFNcCbDXwcRJM/2AqrMRAj+WgnHQrjctYB5o
+400kvDKluqce92qZI0luJzxBZR1UVeC5gSy8JUd6rorDYqNDcXyl8Mb1iutbxids
+87Pb+SOpSurSC5LE0hy24WFQnkAf2rZneZD4iH6E6kNTDJIf9rTyavwjeIGpSNd+
+8BjD8Qj4bcxm6VPGrB++LVYNgn4Ml7dU4KoLf51tfeeP8u0Z8xfSXkus+LKlaVTc
+J4GZJ2Ey6Lk14yV69ymgGtJPc59xINg7GkE4BudWhqAROnt+P3olyTA/AgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5zb2MuY2FzLmN6hiVodHRwczovL2lkcC5zb2Mu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTA+sWvwXfF656DdVRMXO8T
+QkaZQjANBgkqhkiG9w0BAQUFAAOCAQEAYYB87sKunI6qPwmASoXHNGDyUhqiGOs6
+jZBxKmcJdoeQMWvjBuQ4kRUo/F8MedGeEYnLkmmN4tMBtQH5FK6dAHDuhkLNXR5Q
+G3DrhuVv4F8kBTkee/6Buhd0mF/+XMcWaY7GIvnDH6bNIdTfO8EbjvuHRlr+ggVc
+xET2sHeYcwo+slmPebr/5fOYzpaE3ypqNyyTfiz44HQOAsOz7SL6t3wBTexdDlB3
+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>
+MIIDJDCCAgygAwIBAgIVALbz3ZMe+jLBrE4lIU9+JcxfX6G1MA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5zb2MuY2FzLmN6MB4XDTE0MDYwNDA3NTk0N1oX
+DTM0MDYwNDA3NTk0N1owGTEXMBUGA1UEAxMOaWRwLnNvYy5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb17jsUD7gY8vMDwIgjf3Gc8HIGatp
+dVo0qPKs2kIwbOpNxtfiK3QFGoj6zFNcCbDXwcRJM/2AqrMRAj+WgnHQrjctYB5o
+400kvDKluqce92qZI0luJzxBZR1UVeC5gSy8JUd6rorDYqNDcXyl8Mb1iutbxids
+87Pb+SOpSurSC5LE0hy24WFQnkAf2rZneZD4iH6E6kNTDJIf9rTyavwjeIGpSNd+
+8BjD8Qj4bcxm6VPGrB++LVYNgn4Ml7dU4KoLf51tfeeP8u0Z8xfSXkus+LKlaVTc
+J4GZJ2Ey6Lk14yV69ymgGtJPc59xINg7GkE4BudWhqAROnt+P3olyTA/AgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5zb2MuY2FzLmN6hiVodHRwczovL2lkcC5zb2Mu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTA+sWvwXfF656DdVRMXO8T
+QkaZQjANBgkqhkiG9w0BAQUFAAOCAQEAYYB87sKunI6qPwmASoXHNGDyUhqiGOs6
+jZBxKmcJdoeQMWvjBuQ4kRUo/F8MedGeEYnLkmmN4tMBtQH5FK6dAHDuhkLNXR5Q
+G3DrhuVv4F8kBTkee/6Buhd0mF/+XMcWaY7GIvnDH6bNIdTfO8EbjvuHRlr+ggVc
+xET2sHeYcwo+slmPebr/5fOYzpaE3ypqNyyTfiz44HQOAsOz7SL6t3wBTexdDlB3
+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>
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
new file mode 100644
index 00000000..bf4ba120
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.solihull.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,103 @@
+<?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>
+      <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
+						dWxsLmFjLnVrMB4XDTEzMTAxNjA5MTQwMVoXDTIzMTAxNDA5MTQwMVowcDELMAkG
+						A1UEBhMCR0IxFjAUBgNVBAgTDVdlc3QgTWlkbGFuZHMxETAPBgNVBAcTCFNvbGlo
+						dWxsMRkwFwYDVQQKExBTb2xpaHVsbCBDb2xsZWdlMRswGQYDVQQDExJpZHAuc29s
+						aWh1bGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC47smk
+						B99t094xtfCf+qH4QtyW2PcThLbj+Kco0Fb/beVYidk/dunhQEO1I59uVfIlXOb6
+						Pcx6HmlV6kSN73xn0sruLBNOpQta1C5dpqaKkgJViezo7O6QbbJUgl1u2HJk9kiw
+						tkOXh5pZKCgQqEI/Q3K9OKbv5RZHxatWouqGKAUeu8wPGnNeh9KkVbFqqc8DA1sl
+						aC4o4x4+3bgy9Jznbcbo7/jbnhLEvQgdZG0B1RdYL/R+B9cxPnz4ZcBPBkK81RG4
+						9niQvrcaN5iUPk1DPxRj7qzaVl6OfWhyoh8coEH0JWgXiuEei0Pkm/Fm2oNp/Yea
+						czrgbLyA3GaRtPsxAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
+						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQe665e7YLT
+						F8ETkmhxSKGabAUIIzAfBgNVHSMEGDAWgBQe665e7YLTF8ETkmhxSKGabAUIIzAN
+						BgkqhkiG9w0BAQUFAAOCAQEAFOHMzUyPPADOrALVV5CAnIOpb0W02YMl8ZwLaftH
+						7aUtbL4aYSek3lO55aR6+QcEiBl9wSXHl0uPLaiC8Dmq1KJmlf5LUEj965bUE/Cu
+						s5R6g3El1/SV3J8NUMsMJMq3H/6uDeZBAEXicFSKGwvt9MCv9PohWNB1JRzuGlIA
+						Y5878PvOuNY886Yz6McIIlAlYLtSh8nDPv0ULf/U/P5H3R3vYD8hn9sYFO8h5OrA
+						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>
+						MIID3jCCAsagAwIBAgIJAM+AyetIYqR6MA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
+						BAYTAkdCMRYwFAYDVQQIEw1XZXN0IE1pZGxhbmRzMREwDwYDVQQHEwhTb2xpaHVs
+						bDEZMBcGA1UEChMQU29saWh1bGwgQ29sbGVnZTEbMBkGA1UEAxMSaWRwLnNvbGlo
+						dWxsLmFjLnVrMB4XDTEzMTAxNjA5MTQwMVoXDTIzMTAxNDA5MTQwMVowcDELMAkG
+						A1UEBhMCR0IxFjAUBgNVBAgTDVdlc3QgTWlkbGFuZHMxETAPBgNVBAcTCFNvbGlo
+						dWxsMRkwFwYDVQQKExBTb2xpaHVsbCBDb2xsZWdlMRswGQYDVQQDExJpZHAuc29s
+						aWh1bGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC47smk
+						B99t094xtfCf+qH4QtyW2PcThLbj+Kco0Fb/beVYidk/dunhQEO1I59uVfIlXOb6
+						Pcx6HmlV6kSN73xn0sruLBNOpQta1C5dpqaKkgJViezo7O6QbbJUgl1u2HJk9kiw
+						tkOXh5pZKCgQqEI/Q3K9OKbv5RZHxatWouqGKAUeu8wPGnNeh9KkVbFqqc8DA1sl
+						aC4o4x4+3bgy9Jznbcbo7/jbnhLEvQgdZG0B1RdYL/R+B9cxPnz4ZcBPBkK81RG4
+						9niQvrcaN5iUPk1DPxRj7qzaVl6OfWhyoh8coEH0JWgXiuEei0Pkm/Fm2oNp/Yea
+						czrgbLyA3GaRtPsxAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
+						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQe665e7YLT
+						F8ETkmhxSKGabAUIIzAfBgNVHSMEGDAWgBQe665e7YLTF8ETkmhxSKGabAUIIzAN
+						BgkqhkiG9w0BAQUFAAOCAQEAFOHMzUyPPADOrALVV5CAnIOpb0W02YMl8ZwLaftH
+						7aUtbL4aYSek3lO55aR6+QcEiBl9wSXHl0uPLaiC8Dmq1KJmlf5LUEj965bUE/Cu
+						s5R6g3El1/SV3J8NUMsMJMq3H/6uDeZBAEXicFSKGwvt9MCv9PohWNB1JRzuGlIA
+						Y5878PvOuNY886Yz6McIIlAlYLtSh8nDPv0ULf/U/P5H3R3vYD8hn9sYFO8h5OrA
+						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>
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
new file mode 100644
index 00000000..1a8bb3a3
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.south-thames.ac.uk-entity.xml
@@ -0,0 +1,111 @@
+<?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>
+      <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
+						VFMxHzAdBgNVBAMTFmlkcC5zb3V0aC10aGFtZXMuYWMudWswHhcNMTQwMTE2MTgx
+						MTQ1WhcNMjQwMTE0MTgxMTQ1WjCBiTELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDkdy
+						ZWF0ZXIgTG9uZG9uMRMwEQYDVQQHEwpXYW5kc3dvcnRoMR0wGwYDVQQKExRTb3V0
+						aCBUaGFtZXMgQ29sbGVnZTEMMAoGA1UECxMDSVRTMR8wHQYDVQQDExZpZHAuc291
+						dGgtdGhhbWVzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						wq/O1hQdWI9i9SbWCJarlpp8SEsa6xWPVHwzvJjnA20KpboQPWoaHotOuC5fKoNV
+						VbVrvk83iPwVdhjvzkFZaLcxDzRl/SixB7C2JUeKOJCybUJWQ/l+IUIR3n7zTfft
+						l82eBGSEi1o7rOmASq+4CEVvdzwwiJc11VqNPdKIladwD/AASXOb/VDejaVgq6nX
+						O8JxN9Ni6bFRBb9cKO24wscABi69mjGVNf974Qpdi4pg6SKcAUhdUzznDVFvNTLv
+						vpV5kFGbEAvqZIiI6hwSMA/dJDvnPZbyI2SvKD52VwASDo5q4l7SbM+F9TOVpi+m
+						Nv44QddqL489EZ846JFX9QIDAQABo4IBHTCCARkwCQYDVR0TBAIwADAsBglghkgB
+						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
+						FMzvNh0ltK1kt/W3x7+poY8vbU33MIG+BgNVHSMEgbYwgbOAFMzvNh0ltK1kt/W3
+						x7+poY8vbU33oYGPpIGMMIGJMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOR3JlYXRl
+						ciBMb25kb24xEzARBgNVBAcTCldhbmRzd29ydGgxHTAbBgNVBAoTFFNvdXRoIFRo
+						YW1lcyBDb2xsZWdlMQwwCgYDVQQLEwNJVFMxHzAdBgNVBAMTFmlkcC5zb3V0aC10
+						aGFtZXMuYWMudWuCCQDHQaRCr9DymzANBgkqhkiG9w0BAQUFAAOCAQEAUBaKuDYR
+						+AHJ4K+XzyiPqXcags3AbKn5rMVbMbHAOqpUqDnP6CfTSu50RKRi9OroLxFfDrgB
+						GP64mKsC76Rs8f7Wyf62q97HnKdDGTUxZaxGco5Md+nRhn3pbskLyy4gTGxYsqLP
+						qbWlDlezpp2AkMlLBOWmL7Avmc2Oa9hg4VisM8LV70vEq3lCh88UxrqxXY/WAgOI
+						ElV9rxoEqBY6S/ceOC8FGgTjgqC+BLAIbPKvGB2LQzvHEiunyZKadWlcyoJqS6U4
+						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>
+						MIIEtjCCA56gAwIBAgIJAMdBpEKv0PKbMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
+						VQQGEwJHQjEXMBUGA1UECBMOR3JlYXRlciBMb25kb24xEzARBgNVBAcTCldhbmRz
+						d29ydGgxHTAbBgNVBAoTFFNvdXRoIFRoYW1lcyBDb2xsZWdlMQwwCgYDVQQLEwNJ
+						VFMxHzAdBgNVBAMTFmlkcC5zb3V0aC10aGFtZXMuYWMudWswHhcNMTQwMTE2MTgx
+						MTQ1WhcNMjQwMTE0MTgxMTQ1WjCBiTELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDkdy
+						ZWF0ZXIgTG9uZG9uMRMwEQYDVQQHEwpXYW5kc3dvcnRoMR0wGwYDVQQKExRTb3V0
+						aCBUaGFtZXMgQ29sbGVnZTEMMAoGA1UECxMDSVRTMR8wHQYDVQQDExZpZHAuc291
+						dGgtdGhhbWVzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						wq/O1hQdWI9i9SbWCJarlpp8SEsa6xWPVHwzvJjnA20KpboQPWoaHotOuC5fKoNV
+						VbVrvk83iPwVdhjvzkFZaLcxDzRl/SixB7C2JUeKOJCybUJWQ/l+IUIR3n7zTfft
+						l82eBGSEi1o7rOmASq+4CEVvdzwwiJc11VqNPdKIladwD/AASXOb/VDejaVgq6nX
+						O8JxN9Ni6bFRBb9cKO24wscABi69mjGVNf974Qpdi4pg6SKcAUhdUzznDVFvNTLv
+						vpV5kFGbEAvqZIiI6hwSMA/dJDvnPZbyI2SvKD52VwASDo5q4l7SbM+F9TOVpi+m
+						Nv44QddqL489EZ846JFX9QIDAQABo4IBHTCCARkwCQYDVR0TBAIwADAsBglghkgB
+						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
+						FMzvNh0ltK1kt/W3x7+poY8vbU33MIG+BgNVHSMEgbYwgbOAFMzvNh0ltK1kt/W3
+						x7+poY8vbU33oYGPpIGMMIGJMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOR3JlYXRl
+						ciBMb25kb24xEzARBgNVBAcTCldhbmRzd29ydGgxHTAbBgNVBAoTFFNvdXRoIFRo
+						YW1lcyBDb2xsZWdlMQwwCgYDVQQLEwNJVFMxHzAdBgNVBAMTFmlkcC5zb3V0aC10
+						aGFtZXMuYWMudWuCCQDHQaRCr9DymzANBgkqhkiG9w0BAQUFAAOCAQEAUBaKuDYR
+						+AHJ4K+XzyiPqXcags3AbKn5rMVbMbHAOqpUqDnP6CfTSu50RKRi9OroLxFfDrgB
+						GP64mKsC76Rs8f7Wyf62q97HnKdDGTUxZaxGco5Md+nRhn3pbskLyy4gTGxYsqLP
+						qbWlDlezpp2AkMlLBOWmL7Avmc2Oa9hg4VisM8LV70vEq3lCh88UxrqxXY/WAgOI
+						ElV9rxoEqBY6S/ceOC8FGgTjgqC+BLAIbPKvGB2LQzvHEiunyZKadWlcyoJqS6U4
+						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>Tony</md:GivenName>
+    <md:SurName>Cameron</md:SurName>
+    <md:EmailAddress>mailto:Tony.cameron@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
new file mode 100644
index 00000000..0bb51d20
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.southampton-city.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,96 @@
+<?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>
+      <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
+						dGhhbXB0b24tY2l0eS5hYy51azAeFw0xMzA3MDExMDQ4MTRaFw0zMzA2MjYxMDQ4
+						MTRaMH8xCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlIYW1wc2hpcmUxFDASBgNVBAcT
+						C1NvdXRoYW1wdG9uMSEwHwYDVQQKExhTb3V0aGFtcHRvbiBDaXR5IENvbGxlZ2Ux
+						IzAhBgNVBAMTGmlkcC5zb3V0aGFtcHRvbi1jaXR5LmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyP/VZGZNQxIfAoNeX890YmxgzThAbmq9dRYw
+						s6jBy1zXA5ZLnltasPSvtJer8Ipm+iScCXOW0Bf5owG0bGkQ+qTr3f7vT1qCdBPD
+						U60eBnEYg4wU3L9W9zQyUztb/4XzKhw3LbLAcPj3VRfvyJA3C2U58jQwSv1L7n9R
+						ultsPrN8sqT6ull84lPH9RSuTAXcI/8JK79saF7h4tBkH4FZq3VTr78gaqV8Qg0e
+						jaE+p1osgaHm1ZHOuKndihiEqv+4SIGthPN0iaO2wiZfz1DtyNOA1kynx7pkuuoG
+						72irLIM42aa4NbcmrWs9slrg1IIEPbO/K7ZJd+ErlIFWem6dgQIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQBgrMGWhGWaPpAIsEgQ8LOAPRtPMuW1ZCqIBzKZjNdjUYgf
+						KZnHiL6h7/jvtHFa5NG9ocKOjuY6fy2KRepr73gqH5SUa5IjAERc3WpcXR7D64uw
+						H7uTQHK0pAg25xpujlYtzOOMrbJebarUl3daydmMenw8Cn474txJNtlUd29EhinD
+						QBJbjJrqOBzq4mGuwHyIIGQkPKQQnYWQzAca0OLPYckJmqpx0eanZ1Owlf9DPP72
+						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>
+						MIIDejCCAmICCQCGmA+P9dNGWjANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
+						QjESMBAGA1UECBMJSGFtcHNoaXJlMRQwEgYDVQQHEwtTb3V0aGFtcHRvbjEhMB8G
+						A1UEChMYU291dGhhbXB0b24gQ2l0eSBDb2xsZWdlMSMwIQYDVQQDExppZHAuc291
+						dGhhbXB0b24tY2l0eS5hYy51azAeFw0xMzA3MDExMDQ4MTRaFw0zMzA2MjYxMDQ4
+						MTRaMH8xCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlIYW1wc2hpcmUxFDASBgNVBAcT
+						C1NvdXRoYW1wdG9uMSEwHwYDVQQKExhTb3V0aGFtcHRvbiBDaXR5IENvbGxlZ2Ux
+						IzAhBgNVBAMTGmlkcC5zb3V0aGFtcHRvbi1jaXR5LmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyP/VZGZNQxIfAoNeX890YmxgzThAbmq9dRYw
+						s6jBy1zXA5ZLnltasPSvtJer8Ipm+iScCXOW0Bf5owG0bGkQ+qTr3f7vT1qCdBPD
+						U60eBnEYg4wU3L9W9zQyUztb/4XzKhw3LbLAcPj3VRfvyJA3C2U58jQwSv1L7n9R
+						ultsPrN8sqT6ull84lPH9RSuTAXcI/8JK79saF7h4tBkH4FZq3VTr78gaqV8Qg0e
+						jaE+p1osgaHm1ZHOuKndihiEqv+4SIGthPN0iaO2wiZfz1DtyNOA1kynx7pkuuoG
+						72irLIM42aa4NbcmrWs9slrg1IIEPbO/K7ZJd+ErlIFWem6dgQIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQBgrMGWhGWaPpAIsEgQ8LOAPRtPMuW1ZCqIBzKZjNdjUYgf
+						KZnHiL6h7/jvtHFa5NG9ocKOjuY6fy2KRepr73gqH5SUa5IjAERc3WpcXR7D64uw
+						H7uTQHK0pAg25xpujlYtzOOMrbJebarUl3daydmMenw8Cn474txJNtlUd29EhinD
+						QBJbjJrqOBzq4mGuwHyIIGQkPKQQnYWQzAca0OLPYckJmqpx0eanZ1Owlf9DPP72
+						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>
diff --git a/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..b3afdcfa
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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>
+      <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>
+						MIIE5DCCA8ygAwIBAgIRANGrqwrzcv/wwtm5h/u2MFkwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA1MTYwMDAwMDBaFw0xNjA1MTUyMzU5NTlaMIGvMQswCQYD
+						VQQGEwJHQjEQMA4GA1UEERMHVFE0IDdFSjEOMAwGA1UECBMFRGV2b24xETAPBgNV
+						BAcTCFBBSUdOVE9OMRIwEAYDVQQJEwlMb25nIFJvYWQxHDAaBgNVBAoTE1NvdXRo
+						IERldm9uIENvbGxlZ2UxGjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMR0wGwYD
+						VQQDExRpZHAuc291dGhkZXZvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAM7bII/xHAr1oS3qU/Y+fjfA5zzvRSgLS1pEveCyck9Z1w30Tt8v
+						C0NTuLUw6KnjrytWVjWdQJJoRCMI3sjpwFqDC+6js4azlee2AABynMdGzOuJ6GqA
+						A8pzDxes/BSio8CxHG/Sp2rglvpDphQLKgzTACTUeooWQ2qhEm9liS5HercXHZnx
+						AIZCGpw9ChqhiXAofAENjdBl3kuqHl1gn80j4uN7jtTXKb7Rz6DwsXlc3tl/rT7c
+						Ar8z0mTllMy09m21rLXae4CaQB/3x7j6HFWeSEcHh6o5iBjWnlmQmQnsXsybIeuz
+						xqdLKwDhOIqz2hW3MiQX8wCqE5YwGaZtEaMCAwEAAaOCAXEwggFtMB8GA1UdIwQY
+						MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRxOiCSLnFHA2VGV1OX
+						hbf81QvVgTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
+						BggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAI
+						BgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5h
+						Lm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAC
+						hilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggr
+						BgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIU
+						aWRwLnNvdXRoZGV2b24uYWMudWswDQYJKoZIhvcNAQEFBQADggEBAKjRYUyCVxuA
+						VlPnjOLvXIby4ohy2rqZKc7Co2U6TNDkPMlC+7j48hBsDjGQzpW7l3B6Qktq9Iox
+						0i3cS5NQVXL0aeL+4ixSnlX62EeqdAElo7mvUP/VdALPI7FUi0fKXW6JmK+5FH2b
+						+5o3pw18AjHX+TylwE0rIwofwNb+TwAPXyv/Iu4fqYL4ZEfwAfIHh9sqmmZdTQfL
+						AfbAiyFUkePPuF5fo05C70iZR6GIkmt09g2V8MmQZPwWyl+ar+UK0Xg8uqB5uBC0
+						/+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>
+						MIIE5DCCA8ygAwIBAgIRANGrqwrzcv/wwtm5h/u2MFkwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA1MTYwMDAwMDBaFw0xNjA1MTUyMzU5NTlaMIGvMQswCQYD
+						VQQGEwJHQjEQMA4GA1UEERMHVFE0IDdFSjEOMAwGA1UECBMFRGV2b24xETAPBgNV
+						BAcTCFBBSUdOVE9OMRIwEAYDVQQJEwlMb25nIFJvYWQxHDAaBgNVBAoTE1NvdXRo
+						IERldm9uIENvbGxlZ2UxGjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMR0wGwYD
+						VQQDExRpZHAuc291dGhkZXZvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAM7bII/xHAr1oS3qU/Y+fjfA5zzvRSgLS1pEveCyck9Z1w30Tt8v
+						C0NTuLUw6KnjrytWVjWdQJJoRCMI3sjpwFqDC+6js4azlee2AABynMdGzOuJ6GqA
+						A8pzDxes/BSio8CxHG/Sp2rglvpDphQLKgzTACTUeooWQ2qhEm9liS5HercXHZnx
+						AIZCGpw9ChqhiXAofAENjdBl3kuqHl1gn80j4uN7jtTXKb7Rz6DwsXlc3tl/rT7c
+						Ar8z0mTllMy09m21rLXae4CaQB/3x7j6HFWeSEcHh6o5iBjWnlmQmQnsXsybIeuz
+						xqdLKwDhOIqz2hW3MiQX8wCqE5YwGaZtEaMCAwEAAaOCAXEwggFtMB8GA1UdIwQY
+						MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRxOiCSLnFHA2VGV1OX
+						hbf81QvVgTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
+						BggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAI
+						BgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5h
+						Lm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAC
+						hilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggr
+						BgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIU
+						aWRwLnNvdXRoZGV2b24uYWMudWswDQYJKoZIhvcNAQEFBQADggEBAKjRYUyCVxuA
+						VlPnjOLvXIby4ohy2rqZKc7Co2U6TNDkPMlC+7j48hBsDjGQzpW7l3B6Qktq9Iox
+						0i3cS5NQVXL0aeL+4ixSnlX62EeqdAElo7mvUP/VdALPI7FUi0fKXW6JmK+5FH2b
+						+5o3pw18AjHX+TylwE0rIwofwNb+TwAPXyv/Iu4fqYL4ZEfwAfIHh9sqmmZdTQfL
+						AfbAiyFUkePPuF5fo05C70iZR6GIkmt09g2V8MmQZPwWyl+ar+UK0Xg8uqB5uBC0
+						/+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>
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
new file mode 100644
index 00000000..dcb2909f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.southport-college.ac.uk-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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>
+      <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
+						VQQGEwJHQjETMBEGA1UECBMKTWVyc2V5c2lkZTESMBAGA1UEBxMJU291dGhwb3J0
+						MRowGAYDVQQKExFTb3V0aHBvcnQgQ29sbGVnZTETMBEGA1UECxMKSVQgU3VwcG9y
+						dDEdMBsGA1UEAxMUaWRwMi5zb3V0aHBvcnQuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCjVvXeYyW/r8x7GC684h0RWFm+98keDBHHCP8zWLEr
+						Rv9B0694XtcK0Cp9BPxbyuRRujsH3/udNCMrDjWLiWlMXQfXAGqhxsRbuyau84Mv
+						W3imOw7Z/Xr4pBuJYSXMeLMt0uwxR4g4Bibwz9iJ9Oha3GiZrHw8Xi3HdGZQhycb
+						s78EHvf1Hc/8K3rIaRHDqafEU6Qsr7cZYFVZcg+eJeMk/UFxVjud1Mcg7IvUbd3A
+						kplU7Vy04toa8qG4CBzDXKL3BLyP9aCaYqKMmv3w7gcl/OiRl54b6XvW06RgHBR9
+						7eEdHuLu9l390Drxbvs9gDreUpp+6Zh/+mwntjKe6K3lAgMBAAGjggFnMIIBYzAf
+						BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUYg8eec5X
+						YEoXxBLSSDAqd7IzU90wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
+						VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
+						MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+						Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+						dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+						BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRw
+						Mi5zb3V0aHBvcnQuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAL7KMOZXF9gAu2S/
+						KTVwDfY/JJz6JO/Cn1KbK3kjvSXvhx0sajtUnurIPFMudOZC22EDxhMAHuoSDSiS
+						d+pIKVVDaoIt49DWr5jqd511o/f0NV531TIelMJ4mk1pvdysP89rShanZTbJxiwt
+						oYSYpO5GuAcx/1oG0AvuSdAN+0T8ypMKu1JmVIapiyEFn/JW3mDhlK/huEiPMZ+V
+						K4rJBIWPgMbIQMH/7Xau2XOAjpPp3iPJJtz8y13Kdbd3QRqDVEefLsJ0UlHI5tpz
+						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>
+						MIIEsTCCA5mgAwIBAgIRAM4+u1j8tHGyZ3CJGu2RVKAwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjAzMDgwMDAwMDBaFw0xNTAzMDgyMzU5NTlaMIGGMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKTWVyc2V5c2lkZTESMBAGA1UEBxMJU291dGhwb3J0
+						MRowGAYDVQQKExFTb3V0aHBvcnQgQ29sbGVnZTETMBEGA1UECxMKSVQgU3VwcG9y
+						dDEdMBsGA1UEAxMUaWRwMi5zb3V0aHBvcnQuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCjVvXeYyW/r8x7GC684h0RWFm+98keDBHHCP8zWLEr
+						Rv9B0694XtcK0Cp9BPxbyuRRujsH3/udNCMrDjWLiWlMXQfXAGqhxsRbuyau84Mv
+						W3imOw7Z/Xr4pBuJYSXMeLMt0uwxR4g4Bibwz9iJ9Oha3GiZrHw8Xi3HdGZQhycb
+						s78EHvf1Hc/8K3rIaRHDqafEU6Qsr7cZYFVZcg+eJeMk/UFxVjud1Mcg7IvUbd3A
+						kplU7Vy04toa8qG4CBzDXKL3BLyP9aCaYqKMmv3w7gcl/OiRl54b6XvW06RgHBR9
+						7eEdHuLu9l390Drxbvs9gDreUpp+6Zh/+mwntjKe6K3lAgMBAAGjggFnMIIBYzAf
+						BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUYg8eec5X
+						YEoXxBLSSDAqd7IzU90wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
+						VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
+						MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+						Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+						dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+						BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRw
+						Mi5zb3V0aHBvcnQuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAL7KMOZXF9gAu2S/
+						KTVwDfY/JJz6JO/Cn1KbK3kjvSXvhx0sajtUnurIPFMudOZC22EDxhMAHuoSDSiS
+						d+pIKVVDaoIt49DWr5jqd511o/f0NV531TIelMJ4mk1pvdysP89rShanZTbJxiwt
+						oYSYpO5GuAcx/1oG0AvuSdAN+0T8ypMKu1JmVIapiyEFn/JW3mDhlK/huEiPMZ+V
+						K4rJBIWPgMbIQMH/7Xau2XOAjpPp3iPJJtz8y13Kdbd3QRqDVEefLsJ0UlHI5tpz
+						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>
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
new file mode 100644
index 00000000..da6a3b5c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.southstaffs.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,111 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southstaffs.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEwDCCA6igAwIBAgIRALJKliPNbteUqAijkUFzQTQwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjEwMDgwMDAwMDBaFw0xNTEwMDgyMzU5NTlaMIGUMQswCQYD
+						VQQGEwJHQjEWMBQGA1UECBMNU3RhZmZvcmRzaGlyZTERMA8GA1UEBxMIVGFtd29y
+						dGgxJDAiBgNVBAoTG1NvdXRoIFN0YWZmb3Jkc2hpcmUgQ29sbGVnZTEUMBIGA1UE
+						CxMLSVQgU2VydmljZXMxHjAcBgNVBAMTFWlkcC5zb3V0aHN0YWZmcy5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKJP+IBzBZb3TiiORL3lHNl/
+						6JRlz/xlVvu6ueE4lE7xdyDs4SxwNduQCiET8iWd9RqOVYD08A++Rv4X75X+K6Tn
+						IM7oobGiqkVQ2S7PbpvJJlrt/2DSgucSW3JjSbbquZEZcLbogVfPrSU3BAJ2LPeG
+						kf4OvbEulR/+FefEXkBFjL/AfSqd/5aoQ/3Pq3q+WXbL0LdBMIuls46XfP5wXEBB
+						mP88DdMU8pXXAkmhLCrq9ozjBI+R/CjNi8GY4ToqM5RW8LkeUCKzCwTqtK059q1T
+						Rh+VLZ0K6SV3D+gNNNicUscHlkUE1bMqtq83u7g+GHqBc+Ji3CqTGB87BFZ6Px0C
+						AwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0G
+						A1UdDgQWBBSH1TMwXDntlWfyEgPjDvnMkM6p4zAOBgNVHQ8BAf8EBAMCBaAwDAYD
+						VR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0g
+						BBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3Js
+						LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8w
+						NQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+						Q0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAg
+						BgNVHREEGTAXghVpZHAuc291dGhzdGFmZnMuYWMudWswDQYJKoZIhvcNAQEFBQAD
+						ggEBAAjrXuZkhZQMctshF4uSoyIrMzGTEdaemSFJV4Gf/vpRcLY55yEH/tE/hHA0
+						gbBB6qV8rBiDH2bLgEroYsN4VhDtqTkD7Wn1aX1HPSoYTyCH/oOVl4xmQu6Bf0i8
+						RjUlIru/8feG7i1VNp8/Icd4GMx+Pcxeavsufsey6QJclcNS+PPhp+xEazwCTfEf
+						QajKK2Jn2Jrj3KuZfxM0+gukA3GdHGuMYEl0KG3pVjUEHcpXSyQgtJD52Zazoytb
+						7Y52LTWOx3dAaWBu+k6bSZxN7hTo69YVYPWQxNJsQKVZhEKrbDD3Awm/0R8QgawB
+						8N28sIuGTGSYwFgY/vA7ccsef3A=
+					</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEwDCCA6igAwIBAgIRALJKliPNbteUqAijkUFzQTQwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjEwMDgwMDAwMDBaFw0xNTEwMDgyMzU5NTlaMIGUMQswCQYD
+						VQQGEwJHQjEWMBQGA1UECBMNU3RhZmZvcmRzaGlyZTERMA8GA1UEBxMIVGFtd29y
+						dGgxJDAiBgNVBAoTG1NvdXRoIFN0YWZmb3Jkc2hpcmUgQ29sbGVnZTEUMBIGA1UE
+						CxMLSVQgU2VydmljZXMxHjAcBgNVBAMTFWlkcC5zb3V0aHN0YWZmcy5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKJP+IBzBZb3TiiORL3lHNl/
+						6JRlz/xlVvu6ueE4lE7xdyDs4SxwNduQCiET8iWd9RqOVYD08A++Rv4X75X+K6Tn
+						IM7oobGiqkVQ2S7PbpvJJlrt/2DSgucSW3JjSbbquZEZcLbogVfPrSU3BAJ2LPeG
+						kf4OvbEulR/+FefEXkBFjL/AfSqd/5aoQ/3Pq3q+WXbL0LdBMIuls46XfP5wXEBB
+						mP88DdMU8pXXAkmhLCrq9ozjBI+R/CjNi8GY4ToqM5RW8LkeUCKzCwTqtK059q1T
+						Rh+VLZ0K6SV3D+gNNNicUscHlkUE1bMqtq83u7g+GHqBc+Ji3CqTGB87BFZ6Px0C
+						AwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0G
+						A1UdDgQWBBSH1TMwXDntlWfyEgPjDvnMkM6p4zAOBgNVHQ8BAf8EBAMCBaAwDAYD
+						VR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0g
+						BBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3Js
+						LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8w
+						NQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+						Q0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAg
+						BgNVHREEGTAXghVpZHAuc291dGhzdGFmZnMuYWMudWswDQYJKoZIhvcNAQEFBQAD
+						ggEBAAjrXuZkhZQMctshF4uSoyIrMzGTEdaemSFJV4Gf/vpRcLY55yEH/tE/hHA0
+						gbBB6qV8rBiDH2bLgEroYsN4VhDtqTkD7Wn1aX1HPSoYTyCH/oOVl4xmQu6Bf0i8
+						RjUlIru/8feG7i1VNp8/Icd4GMx+Pcxeavsufsey6QJclcNS+PPhp+xEazwCTfEf
+						QajKK2Jn2Jrj3KuZfxM0+gukA3GdHGuMYEl0KG3pVjUEHcpXSyQgtJD52Zazoytb
+						7Y52LTWOx3dAaWBu+k6bSZxN7hTo69YVYPWQxNJsQKVZhEKrbDD3Awm/0R8QgawB
+						8N28sIuGTGSYwFgY/vA7ccsef3A=
+					</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>
diff --git a/swamid-interfederations-2.0/idp.src.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.src.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..02223dea
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.src.ac.uk-shibboleth.xml
@@ -0,0 +1,109 @@
+<?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>
+      <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
+						ZHAuc3JjLmFjLnVrMB4XDTE0MDkxMDExMDIzMFoXDTM0MDkwNTExMDIzMFoweDEL
+						MAkGA1UEBhMCR0IxGTAXBgNVBAgTEE5vcnRoZXJuIElyZWxhbmQxEjAQBgNVBAcT
+						CVBvcnRhZG93bjEiMCAGA1UEChMZU291dGhlcm4gUmVnaW9uYWwgQ29sbGVnZTEW
+						MBQGA1UEAxMNaWRwLnNyYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAOTHbpykc5COQnnxrJLFexezdUga4EoB8mdakirFuwIG97l3AjMJBuAP
+						Biu1FU8HbINhprwJvpWFBsmN+x4GCkLVdBGqSa0jiPopvKfOH3cgHZISxpsrAzan
+						AXK1jTwRl7OpqnaN4u2lxltlfxyMy9UJnoroxF1VUDN87ewRVC6dxC+plOM8oC/A
+						7U9KFySYKKXbZJlKjwPzWImWe8kueRotr0H4k23DChphMXkzSu+m96F7VYzQu2tB
+						N+OHNfIs1ZwOxqLByFE2TZDLyaTCHV3MxrmNF9sLlmKz7ZAq0XlD8+swnBglYJ3F
+						vit11nDDCtOZNINOSCTFZrGWoy1qkkcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						hz9L58a6+yQg4CInU/6LwccJ19vAZAej0oKyqguO6aU5dWICo4fhMKvExFrOVFPt
+						wnwH/K/SAEbxfy/uDA/Tb13mAtYKHKYaCxujRrhQB/5mEoXQKN0Iqg4bBMXyjhyv
+						HoFmqjXdk7l5ATbJwd4fZBX4/eXnpp2MJkgC4xw2WxwTewRnKTNfUPvF7t0WIUZj
+						oivnlWGoK16H0kyZhnf+2MOtUV1FjEsDV8knoOrG20XyHUJiaThAnZibnWj+3eqz
+						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>
+						MIIDbDCCAlQCCQCKPT5imLa/BjANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
+						QjEZMBcGA1UECBMQTm9ydGhlcm4gSXJlbGFuZDESMBAGA1UEBxMJUG9ydGFkb3du
+						MSIwIAYDVQQKExlTb3V0aGVybiBSZWdpb25hbCBDb2xsZWdlMRYwFAYDVQQDEw1p
+						ZHAuc3JjLmFjLnVrMB4XDTE0MDkxMDExMDIzMFoXDTM0MDkwNTExMDIzMFoweDEL
+						MAkGA1UEBhMCR0IxGTAXBgNVBAgTEE5vcnRoZXJuIElyZWxhbmQxEjAQBgNVBAcT
+						CVBvcnRhZG93bjEiMCAGA1UEChMZU291dGhlcm4gUmVnaW9uYWwgQ29sbGVnZTEW
+						MBQGA1UEAxMNaWRwLnNyYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAOTHbpykc5COQnnxrJLFexezdUga4EoB8mdakirFuwIG97l3AjMJBuAP
+						Biu1FU8HbINhprwJvpWFBsmN+x4GCkLVdBGqSa0jiPopvKfOH3cgHZISxpsrAzan
+						AXK1jTwRl7OpqnaN4u2lxltlfxyMy9UJnoroxF1VUDN87ewRVC6dxC+plOM8oC/A
+						7U9KFySYKKXbZJlKjwPzWImWe8kueRotr0H4k23DChphMXkzSu+m96F7VYzQu2tB
+						N+OHNfIs1ZwOxqLByFE2TZDLyaTCHV3MxrmNF9sLlmKz7ZAq0XlD8+swnBglYJ3F
+						vit11nDDCtOZNINOSCTFZrGWoy1qkkcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						hz9L58a6+yQg4CInU/6LwccJ19vAZAej0oKyqguO6aU5dWICo4fhMKvExFrOVFPt
+						wnwH/K/SAEbxfy/uDA/Tb13mAtYKHKYaCxujRrhQB/5mEoXQKN0Iqg4bBMXyjhyv
+						HoFmqjXdk7l5ATbJwd4fZBX4/eXnpp2MJkgC4xw2WxwTewRnKTNfUPvF7t0WIUZj
+						oivnlWGoK16H0kyZhnf+2MOtUV1FjEsDV8knoOrG20XyHUJiaThAnZibnWj+3eqz
+						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>
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
new file mode 100644
index 00000000..32e3f9c0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sruc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChYhV93CUW69tAVZOYdhzRX14Gtm8l
+						Ca8W4/EWAEqeVvoMT70fMMwCTPxHbSCkoEpk8RAwChzwGSTGJt8/dtyZWr6vmrHs
+						8TzCIKRPo1wJymIPtONtojdZnERwbEr0brAzIw82QIOidzYueWHpbrYSaxwmaQNR
+						LKwDIjf/0M7Zkm6t50vxu2XRttrxJ92x31U0P/mQa22DLlQs6gmJFoxO7jPc0gUj
+						svDsMTZXS6J4oXmnpqLHfGpGtiyGocunHRykIGX1cyxyJngRXVb6VCfnIb06nELH
+						9s27b9t6/IhWgmH9rCxS522xTuQDe0DKD0YpmMIQK3fHAhF8RaMGcT+PAgMBAAGj
+						YzBhMEAGA1UdEQQ5MDeCDmlkcC5zcnVjLmFjLnVrhiVodHRwczovL2lkcC5zcnVj
+						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTj1x9pT421ZN33j8y2qyC2
+						z7tEnDANBgkqhkiG9w0BAQUFAAOCAQEAbRG6KPM1cS83t1nTr68n4o+SAawN6IBS
+						yt0oSw7jL2eWsFZA3xgR3pePSiKdHXYLW3YEpJ+O3nS1Hs6Hz1lM3zwguJRSnJBk
+						tS/2Mvk/LiS3TecJqawwvZ5M+MHPckzKP/2cZwJum6dZps9U3KuuLEwU3aDt6Ri+
+						74AWwDm1DVM0AfuSOk+Gjjkh0mgoMCfMS1jFTRwJXxfH13/jq2ODCD7HlvlJ5eGD
+						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>
+						MIIDJDCCAgygAwIBAgIVAMisBG8/pYaTN/dKjE96UJTj0pHnMA0GCSqGSIb3DQEB
+						BQUAMBkxFzAVBgNVBAMTDmlkcC5zcnVjLmFjLnVrMB4XDTEzMDgxNTE4MzUyMVoX
+						DTMzMDgxNTE4MzUyMVowGTEXMBUGA1UEAxMOaWRwLnNydWMuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChYhV93CUW69tAVZOYdhzRX14Gtm8l
+						Ca8W4/EWAEqeVvoMT70fMMwCTPxHbSCkoEpk8RAwChzwGSTGJt8/dtyZWr6vmrHs
+						8TzCIKRPo1wJymIPtONtojdZnERwbEr0brAzIw82QIOidzYueWHpbrYSaxwmaQNR
+						LKwDIjf/0M7Zkm6t50vxu2XRttrxJ92x31U0P/mQa22DLlQs6gmJFoxO7jPc0gUj
+						svDsMTZXS6J4oXmnpqLHfGpGtiyGocunHRykIGX1cyxyJngRXVb6VCfnIb06nELH
+						9s27b9t6/IhWgmH9rCxS522xTuQDe0DKD0YpmMIQK3fHAhF8RaMGcT+PAgMBAAGj
+						YzBhMEAGA1UdEQQ5MDeCDmlkcC5zcnVjLmFjLnVrhiVodHRwczovL2lkcC5zcnVj
+						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTj1x9pT421ZN33j8y2qyC2
+						z7tEnDANBgkqhkiG9w0BAQUFAAOCAQEAbRG6KPM1cS83t1nTr68n4o+SAawN6IBS
+						yt0oSw7jL2eWsFZA3xgR3pePSiKdHXYLW3YEpJ+O3nS1Hs6Hz1lM3zwguJRSnJBk
+						tS/2Mvk/LiS3TecJqawwvZ5M+MHPckzKP/2cZwJum6dZps9U3KuuLEwU3aDt6Ri+
+						74AWwDm1DVM0AfuSOk+Gjjkh0mgoMCfMS1jFTRwJXxfH13/jq2ODCD7HlvlJ5eGD
+						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>
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
new file mode 100644
index 00000000..35b58632
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ssc.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDJDCCAgygAwIBAgIVAM17FMyMTScGvy0JdedneKzQSTuJMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5zc2MuY2FzLmN6MB4XDTE0MDEyMTEzNDgxN1oX
+DTM0MDEyMTEzNDgxN1owGTEXMBUGA1UEAxMOaWRwLnNzYy5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCO9p492zRmGFmhH7Qq7l1Vy3OBRyZc
+tIyaocn/FLBJ9TkGUqYdR29wHCmKnGOwXFF6VIBdfsmVmuFczjQcpAqPQ4zcS+kl
++Y6yDMINQv0eAZvRvIDK4jfF5GVZAXwbUuPLr8Cl0L0ZbzNPT7ewi7sHO+8upqv7
+7bhwyG8ZMYgMSPeM4jWuThv+6x5DRlnMqjq+qBev95MRK0bZRSJ3XKyDa+Nso8Df
+R7rYnFHF+Al4AujMgQzN+hDRjxyD2Wp1xYK9BguctIFyHiS0aXr0CB3PcCnRfdRk
+GTH2SX3pNIJ1olEODLyHfNF9uJt120bfaFgaGau/iRCXwuj7Ap5PLiURAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5zc2MuY2FzLmN6hiVodHRwczovL2lkcC5zc2Mu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRWD+N0hIllSytm0SBw/34M
+IGBstDANBgkqhkiG9w0BAQUFAAOCAQEAXqvCIxGFBSBtfecHgvx3j5kYiG0rutzh
+XhdFJZrPWARnMdL0VLfK064Y+OWsv1sbovS31HWxvCWqfBTmIu2e658IGnCYUBGX
+/e8/NG7u9SeS6ie7U6B1kFQIYrgSKHH4jookel03sIF0n36C3XMG95h7TNgZQ5Vf
+JQwAd/6FCX9a+NzhTJZWMXPCIEjGICjwbddAPsX6aSAUgIyif0EkIDSvcckkeLT0
+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>
+MIIDJDCCAgygAwIBAgIVAM17FMyMTScGvy0JdedneKzQSTuJMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5zc2MuY2FzLmN6MB4XDTE0MDEyMTEzNDgxN1oX
+DTM0MDEyMTEzNDgxN1owGTEXMBUGA1UEAxMOaWRwLnNzYy5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCO9p492zRmGFmhH7Qq7l1Vy3OBRyZc
+tIyaocn/FLBJ9TkGUqYdR29wHCmKnGOwXFF6VIBdfsmVmuFczjQcpAqPQ4zcS+kl
++Y6yDMINQv0eAZvRvIDK4jfF5GVZAXwbUuPLr8Cl0L0ZbzNPT7ewi7sHO+8upqv7
+7bhwyG8ZMYgMSPeM4jWuThv+6x5DRlnMqjq+qBev95MRK0bZRSJ3XKyDa+Nso8Df
+R7rYnFHF+Al4AujMgQzN+hDRjxyD2Wp1xYK9BguctIFyHiS0aXr0CB3PcCnRfdRk
+GTH2SX3pNIJ1olEODLyHfNF9uJt120bfaFgaGau/iRCXwuj7Ap5PLiURAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5zc2MuY2FzLmN6hiVodHRwczovL2lkcC5zc2Mu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRWD+N0hIllSytm0SBw/34M
+IGBstDANBgkqhkiG9w0BAQUFAAOCAQEAXqvCIxGFBSBtfecHgvx3j5kYiG0rutzh
+XhdFJZrPWARnMdL0VLfK064Y+OWsv1sbovS31HWxvCWqfBTmIu2e658IGnCYUBGX
+/e8/NG7u9SeS6ie7U6B1kFQIYrgSKHH4jookel03sIF0n36C3XMG95h7TNgZQ5Vf
+JQwAd/6FCX9a+NzhTJZWMXPCIEjGICjwbddAPsX6aSAUgIyif0EkIDSvcckkeLT0
+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>
diff --git a/swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml
new file mode 100644
index 00000000..aee81cd0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDGzCCAgOgAwIBAgIUZ0H4Pz2dfwqiTQgEDudEffWgc8gwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MB4XDTEwMDUxMTExMzAyMFoXDTMw
+MDUxMTExMzAyMFowFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmtnry6/PMlG+TnohAUy1szeBK2LtInYyhAV
+62GVLtgRj91lu+Ylv1DoVM/W+/F5qqDivYFepFH/ROaBxYnGIQPN9hbIQWW6y+2u
+a4SN8MsC2NF5TGt4hOa558TDXy8AvrN1XWYavVxyZnCFbUG7xnvaksHgn8r+EqXa
+33t3g27DCqr8gZ2mKL4DdqMEqYaWYFvQcsSGFI7R7k2FlpwrkN0XV0J6sJziw7NX
+xMMyPEzSA+hWf9MNPqfSPq+IXyRwJLChGGbKAnVHmNFP0uAi30rNoTWaniHoeHrj
+/QxNpIE+bFarIxmSm03CTCtPUhOUHScz3WHWNp5RF6Af3GnWcwIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAuc3NzdXAuaXSGI2h0dHBzOi8vaWRwLnNzc3VwLml0L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQBxI1S8NHoUaJu90/HWsDurxXT6zANBgkq
+hkiG9w0BAQUFAAOCAQEAUaTYopotKd4yJbt9MzZJwBS0NBQRrNkADwWSZ6ztfRTf
+Pbf5ZaDncxgw5GKdJZVY2VXkdSubhgBd0OPH37ah8iqeMftj7W6R+MVrd8v+Snv6
+Rfw6VfKlWgbHOchBj9qVJeXYMlxME7fKrhLcgzEV3xcsv/o5Li3GGBd4H+ybQMI7
+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>
+MIIDGzCCAgOgAwIBAgIUZ0H4Pz2dfwqiTQgEDudEffWgc8gwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MB4XDTEwMDUxMTExMzAyMFoXDTMw
+MDUxMTExMzAyMFowFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmtnry6/PMlG+TnohAUy1szeBK2LtInYyhAV
+62GVLtgRj91lu+Ylv1DoVM/W+/F5qqDivYFepFH/ROaBxYnGIQPN9hbIQWW6y+2u
+a4SN8MsC2NF5TGt4hOa558TDXy8AvrN1XWYavVxyZnCFbUG7xnvaksHgn8r+EqXa
+33t3g27DCqr8gZ2mKL4DdqMEqYaWYFvQcsSGFI7R7k2FlpwrkN0XV0J6sJziw7NX
+xMMyPEzSA+hWf9MNPqfSPq+IXyRwJLChGGbKAnVHmNFP0uAi30rNoTWaniHoeHrj
+/QxNpIE+bFarIxmSm03CTCtPUhOUHScz3WHWNp5RF6Af3GnWcwIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAuc3NzdXAuaXSGI2h0dHBzOi8vaWRwLnNzc3VwLml0L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQBxI1S8NHoUaJu90/HWsDurxXT6zANBgkq
+hkiG9w0BAQUFAAOCAQEAUaTYopotKd4yJbt9MzZJwBS0NBQRrNkADwWSZ6ztfRTf
+Pbf5ZaDncxgw5GKdJZVY2VXkdSubhgBd0OPH37ah8iqeMftj7W6R+MVrd8v+Snv6
+Rfw6VfKlWgbHOchBj9qVJeXYMlxME7fKrhLcgzEV3xcsv/o5Li3GGBd4H+ybQMI7
+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>
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
new file mode 100644
index 00000000..26dffa33
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.st-andrews.ac.uk-shibboleth.xml
@@ -0,0 +1,119 @@
+<?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>
+      <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
+						IzAhBgNVBAMTGk1hc3RlciBTaWduaW5nIENlcnRpZmljYXRlMSgwJgYJKoZIhvcN
+						AQkBFhloZWxwZGVza0BzdC1hbmRyZXdzLmFjLnVrMB4XDTE0MDUyODEwMjI0OVoX
+						DTM0MDUyMzEwMjI0OVowgYsxCzAJBgNVBAYTAkdCMQ0wCwYDVQQIEwRGaWZlMRMw
+						EQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFN0IEFu
+						ZHJld3MxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR8wHQYDVQQDExZsb2dpbi5zdC1h
+						bmRyZXdzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtrVW
+						AoC2c9E11GatKp3M8sFYhgsnPX1rdZ8bToP6y9uzQlKn7CSbzgY/MFTT1ol/dIpw
+						QFXqGBdNomQtaE3S2v81k30E2/nR294xEeT/PjP9GcPxYJjBq/ngoTzmBC6TJtsj
+						DWYWQEPUoMhgQ1Rqlhm2+rEJWY/AbdzZWjZiCS1P6W6uxw9/lPLLSAkSQSLGiavu
+						uyRmogqgH/HOzVFlF/DwKFZJDZ/bWGv1WHc6rii8nl8K9I1zZoM0sIPBnfrdWZzN
+						SAhX9zMSv1EXTJ0VFD3nrElU/Xx8WO4ZosnDwL7R+w6TZ1b+yOmc/A4ZsKQECxd/
+						LYcLPfbhgK2hhrApPQIDAQABo4IBhjCCAYIwCQYDVR0TBAIwADAsBglghkgBhvhC
+						AQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFIKd
+						mF6wLnFmysL7I3lf1Z5UI+KIMIHwBgNVHSMEgegwgeWAFEVZKa2Kkeq6fIItSmOm
+						9juqqJOToYHBpIG+MIG7MQswCQYDVQQGEwJVSzENMAsGA1UECBMERmlmZTETMBEG
+						A1UEBxMKU3QgQW5kcmV3czEhMB8GA1UEChMYVW5pdmVyc2l0eSBvZiBTdCBBbmRy
+						ZXdzMRYwFAYDVQQLEw1JLlQuIFNlcnZpY2VzMSMwIQYDVQQDExpNYXN0ZXIgU2ln
+						bmluZyBDZXJ0aWZpY2F0ZTEoMCYGCSqGSIb3DQEJARYZaGVscGRlc2tAc3QtYW5k
+						cmV3cy5hYy51a4IJALjpP8s3OebbMDUGCWCGSAGG+EIBBAQoFiZodHRwOi8vd3d3
+						LnN0LWFuZHJld3MuYWMudWsvY2EtY3JsLnBlbTANBgkqhkiG9w0BAQUFAAOCAQEA
+						j9HmQMvf9ZWP0RSRvxvPG9esUh/D3QpsVw4Q0NmH0iH3CO+KEAuskwRi4Oy0P7kG
+						gYIdgRp9upn2lqn70mNU6B040YG7gB8cCckNFcTguwBjgiwahzXuF8xbpHCbDQRh
+						/Npkb4niRx8bk0HrR4qH0E9xNNcts0mIwwvPZeSyfgh28y2b5lE1O7pr417xevjN
+						px1V63hOos/k1jZwLjGX7mf4uNqY2X27muoWxncx5bdljRrI+7KueS6vIaGvvy+O
+						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>
+						MIIFTDCCBDSgAwIBAgICEKgwDQYJKoZIhvcNAQEFBQAwgbsxCzAJBgNVBAYTAlVL
+						MQ0wCwYDVQQIEwRGaWZlMRMwEQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhV
+						bml2ZXJzaXR5IG9mIFN0IEFuZHJld3MxFjAUBgNVBAsTDUkuVC4gU2VydmljZXMx
+						IzAhBgNVBAMTGk1hc3RlciBTaWduaW5nIENlcnRpZmljYXRlMSgwJgYJKoZIhvcN
+						AQkBFhloZWxwZGVza0BzdC1hbmRyZXdzLmFjLnVrMB4XDTE0MDUyODEwMjI0OVoX
+						DTM0MDUyMzEwMjI0OVowgYsxCzAJBgNVBAYTAkdCMQ0wCwYDVQQIEwRGaWZlMRMw
+						EQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFN0IEFu
+						ZHJld3MxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR8wHQYDVQQDExZsb2dpbi5zdC1h
+						bmRyZXdzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtrVW
+						AoC2c9E11GatKp3M8sFYhgsnPX1rdZ8bToP6y9uzQlKn7CSbzgY/MFTT1ol/dIpw
+						QFXqGBdNomQtaE3S2v81k30E2/nR294xEeT/PjP9GcPxYJjBq/ngoTzmBC6TJtsj
+						DWYWQEPUoMhgQ1Rqlhm2+rEJWY/AbdzZWjZiCS1P6W6uxw9/lPLLSAkSQSLGiavu
+						uyRmogqgH/HOzVFlF/DwKFZJDZ/bWGv1WHc6rii8nl8K9I1zZoM0sIPBnfrdWZzN
+						SAhX9zMSv1EXTJ0VFD3nrElU/Xx8WO4ZosnDwL7R+w6TZ1b+yOmc/A4ZsKQECxd/
+						LYcLPfbhgK2hhrApPQIDAQABo4IBhjCCAYIwCQYDVR0TBAIwADAsBglghkgBhvhC
+						AQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFIKd
+						mF6wLnFmysL7I3lf1Z5UI+KIMIHwBgNVHSMEgegwgeWAFEVZKa2Kkeq6fIItSmOm
+						9juqqJOToYHBpIG+MIG7MQswCQYDVQQGEwJVSzENMAsGA1UECBMERmlmZTETMBEG
+						A1UEBxMKU3QgQW5kcmV3czEhMB8GA1UEChMYVW5pdmVyc2l0eSBvZiBTdCBBbmRy
+						ZXdzMRYwFAYDVQQLEw1JLlQuIFNlcnZpY2VzMSMwIQYDVQQDExpNYXN0ZXIgU2ln
+						bmluZyBDZXJ0aWZpY2F0ZTEoMCYGCSqGSIb3DQEJARYZaGVscGRlc2tAc3QtYW5k
+						cmV3cy5hYy51a4IJALjpP8s3OebbMDUGCWCGSAGG+EIBBAQoFiZodHRwOi8vd3d3
+						LnN0LWFuZHJld3MuYWMudWsvY2EtY3JsLnBlbTANBgkqhkiG9w0BAQUFAAOCAQEA
+						j9HmQMvf9ZWP0RSRvxvPG9esUh/D3QpsVw4Q0NmH0iH3CO+KEAuskwRi4Oy0P7kG
+						gYIdgRp9upn2lqn70mNU6B040YG7gB8cCckNFcTguwBjgiwahzXuF8xbpHCbDQRh
+						/Npkb4niRx8bk0HrR4qH0E9xNNcts0mIwwvPZeSyfgh28y2b5lE1O7pr417xevjN
+						px1V63hOos/k1jZwLjGX7mf4uNqY2X27muoWxncx5bdljRrI+7KueS6vIaGvvy+O
+						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>
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
new file mode 100644
index 00000000..03c7b7bc
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.st-davids-coll.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						LWNvbGwuYWMudWswHhcNMTIwMzIzMTY0NzEwWhcNMzIwMzE4MTY0NzEwWjB3MQsw
+						CQYDVQQGEwJHQjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRpZmYxIzAh
+						BgNVBAoTGlN0IERhdmlkcyBDYXRob2xpYyBDb2xsZWdlMSEwHwYDVQQDExhpZHAu
+						c3QtZGF2aWRzLWNvbGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+						AoIBAQDhWg9tcwBj95jVLLEgOP8z6tGRNbmSExldo8+hA740TNTFkJPrNlYBgSCa
+						Du+eyeADmK9qSNDcTUEvU0WA9pVkywALqeW1+DVCPY7MhhD1duv1zcQIeqdQ9luY
+						V7pQq0cFLuN3vgzuh+MLWOcmz45jcSbIa4EGhgQn0nWKzMzi1HG4kDWAeGzpdG0q
+						e1UV3a/IqvwYR3+OLSJYHMcGXmhpi5AEadpJtE/w7fZymmIHaWsn7WrBxhXE7xXy
+						olIr7FEx9af1nR5fEXWnUdW/QSn8o9GNijLq8ZIpr1dh33QiFy+lB4OicTZdC8fj
+						Un8ySwdIscH7kQM63URZxSsB7YNjAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACDS
+						MdkGKQhJ1E0Wmz7ZdUmJugpBoxKEGzr4GpvRc5TZVUf7BkzGNCC2NxvaILuxK26e
+						deR03Q8QOpw10Wk09PFH59EsZyKWR+RgWPNaeTYsCUnPptMgrcYEOjuf8yt95XLL
+						OAoOa6VzuvG5z2cFuiY5jgqCr1WtiQeJ5HW2YN8I/3aFuw+tV55C321lYby5RuUc
+						BVI9kTZqCOvCiF32WBLlyf0dD6NqFAYwe1/sXgF2MS7E+toNUqh+j7LEeDBZhraV
+						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>
+						MIIDajCCAlICCQCTJJAxaWzfAzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJH
+						QjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRpZmYxIzAhBgNVBAoTGlN0
+						IERhdmlkcyBDYXRob2xpYyBDb2xsZWdlMSEwHwYDVQQDExhpZHAuc3QtZGF2aWRz
+						LWNvbGwuYWMudWswHhcNMTIwMzIzMTY0NzEwWhcNMzIwMzE4MTY0NzEwWjB3MQsw
+						CQYDVQQGEwJHQjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRpZmYxIzAh
+						BgNVBAoTGlN0IERhdmlkcyBDYXRob2xpYyBDb2xsZWdlMSEwHwYDVQQDExhpZHAu
+						c3QtZGF2aWRzLWNvbGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+						AoIBAQDhWg9tcwBj95jVLLEgOP8z6tGRNbmSExldo8+hA740TNTFkJPrNlYBgSCa
+						Du+eyeADmK9qSNDcTUEvU0WA9pVkywALqeW1+DVCPY7MhhD1duv1zcQIeqdQ9luY
+						V7pQq0cFLuN3vgzuh+MLWOcmz45jcSbIa4EGhgQn0nWKzMzi1HG4kDWAeGzpdG0q
+						e1UV3a/IqvwYR3+OLSJYHMcGXmhpi5AEadpJtE/w7fZymmIHaWsn7WrBxhXE7xXy
+						olIr7FEx9af1nR5fEXWnUdW/QSn8o9GNijLq8ZIpr1dh33QiFy+lB4OicTZdC8fj
+						Un8ySwdIscH7kQM63URZxSsB7YNjAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACDS
+						MdkGKQhJ1E0Wmz7ZdUmJugpBoxKEGzr4GpvRc5TZVUf7BkzGNCC2NxvaILuxK26e
+						deR03Q8QOpw10Wk09PFH59EsZyKWR+RgWPNaeTYsCUnPptMgrcYEOjuf8yt95XLL
+						OAoOa6VzuvG5z2cFuiY5jgqCr1WtiQeJ5HW2YN8I/3aFuw+tV55C321lYby5RuUc
+						BVI9kTZqCOvCiF32WBLlyf0dD6NqFAYwe1/sXgF2MS7E+toNUqh+j7LEeDBZhraV
+						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>Mark</md:GivenName>
+    <md:SurName>Puttick</md:SurName>
+    <md:EmailAddress>mailto:mputtick@st-davids-coll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Puttick</md:SurName>
+    <md:EmailAddress>mailto:mputtick@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
new file mode 100644
index 00000000..44858238
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.staffordcoll.ac.uk-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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>
+      <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
+						FmlkcC5zdGFmZm9yZGNvbGwuYWMudWsxLDAqBgkqhkiG9w0BCQEWHXIubmljaG9s
+						bHNAc3RhZmZvcmRjb2xsLmFjLnVrMB4XDTE0MDQxNDE2MDQzM1oXDTI0MDQxMTE2
+						MDQzM1owgbAxCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1TdGFmZm9yZHNoaXJlMREw
+						DwYDVQQHDAhTdGFmZm9yZDEZMBcGA1UECgwQU3RhZmZvcmQgQ29sbGVnZTEMMAoG
+						A1UECwwDSVRVMR8wHQYDVQQDDBZpZHAuc3RhZmZvcmRjb2xsLmFjLnVrMSwwKgYJ
+						KoZIhvcNAQkBFh1yLm5pY2hvbGxzQHN0YWZmb3JkY29sbC5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALACtr71g3kiPdLfVC9EDCkmWrwkFgpq
+						jY3tJSFR4+HFp1uSTI4selAUoa2JkDCXXV6Raqdl5rPb70NxpkpgUqnEJB2NfihV
+						rLaLiX03o95ZrO7KDVMbAvoa34arqipgZZPu7jxgNmlWpdM1FBmY7yRq2CvGHvRa
+						VikoFqmEojYFWGmmnqArYx4QibTuNjxwmfVU0BTOVS7Nos9K5l4USKDrBxIuE9Qm
+						8noW74ZtZzCCq2PSdZ/tj9K9EA6kEc+pI+UG7DcIFyEpmaDOXFDcOOKlAYT3MfL3
+						wSqg8/YPGPF9vkzk0lBv2M5YyLS9kZIaTzqkK6KLfMIR6QMYRCOrCIMCAwEAATAN
+						BgkqhkiG9w0BAQUFAAOCAQEACU0fU6QuYxlfW6hh6iekYfgMiVgS6oCORQR/L/to
+						FJpQk0I7TDG6Gktlc5aEpsqMYQOwC99Lb8fGFQAt1g6wRyzZA8DIXnG6dQO5cTGW
+						UJqX4GZUga3OsPIO+09Kso9SEmW4J3zRucsmUYFVZcJ34tCeeBt3bC1pIClbEtUZ
+						1M4nHnsucufmaoO4P3k/M1pOadX8XRmpeXKILebjJx/TqzORkDeS6FFZhllv13Qw
+						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>
+						MIID3jCCAsYCCQDD9aF4VF27mzANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
+						R0IxFjAUBgNVBAgMDVN0YWZmb3Jkc2hpcmUxETAPBgNVBAcMCFN0YWZmb3JkMRkw
+						FwYDVQQKDBBTdGFmZm9yZCBDb2xsZWdlMQwwCgYDVQQLDANJVFUxHzAdBgNVBAMM
+						FmlkcC5zdGFmZm9yZGNvbGwuYWMudWsxLDAqBgkqhkiG9w0BCQEWHXIubmljaG9s
+						bHNAc3RhZmZvcmRjb2xsLmFjLnVrMB4XDTE0MDQxNDE2MDQzM1oXDTI0MDQxMTE2
+						MDQzM1owgbAxCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1TdGFmZm9yZHNoaXJlMREw
+						DwYDVQQHDAhTdGFmZm9yZDEZMBcGA1UECgwQU3RhZmZvcmQgQ29sbGVnZTEMMAoG
+						A1UECwwDSVRVMR8wHQYDVQQDDBZpZHAuc3RhZmZvcmRjb2xsLmFjLnVrMSwwKgYJ
+						KoZIhvcNAQkBFh1yLm5pY2hvbGxzQHN0YWZmb3JkY29sbC5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALACtr71g3kiPdLfVC9EDCkmWrwkFgpq
+						jY3tJSFR4+HFp1uSTI4selAUoa2JkDCXXV6Raqdl5rPb70NxpkpgUqnEJB2NfihV
+						rLaLiX03o95ZrO7KDVMbAvoa34arqipgZZPu7jxgNmlWpdM1FBmY7yRq2CvGHvRa
+						VikoFqmEojYFWGmmnqArYx4QibTuNjxwmfVU0BTOVS7Nos9K5l4USKDrBxIuE9Qm
+						8noW74ZtZzCCq2PSdZ/tj9K9EA6kEc+pI+UG7DcIFyEpmaDOXFDcOOKlAYT3MfL3
+						wSqg8/YPGPF9vkzk0lBv2M5YyLS9kZIaTzqkK6KLfMIR6QMYRCOrCIMCAwEAATAN
+						BgkqhkiG9w0BAQUFAAOCAQEACU0fU6QuYxlfW6hh6iekYfgMiVgS6oCORQR/L/to
+						FJpQk0I7TDG6Gktlc5aEpsqMYQOwC99Lb8fGFQAt1g6wRyzZA8DIXnG6dQO5cTGW
+						UJqX4GZUga3OsPIO+09Kso9SEmW4J3zRucsmUYFVZcJ34tCeeBt3bC1pIClbEtUZ
+						1M4nHnsucufmaoO4P3k/M1pOadX8XRmpeXKILebjJx/TqzORkDeS6FFZhllv13Qw
+						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>
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
new file mode 100644
index 00000000..ec3a7ce9
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.stbrn.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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>
+						MIIDJzCCAg+gAwIBAgIUDq8zPYO8IuaH20QyJWXiNuoDZnEwDQYJKoZIhvcNAQEF
+						BQAwGjEYMBYGA1UEAxMPaWRwLnN0YnJuLmFjLnVrMB4XDTEzMDYxMjA5MDM1MFoX
+						DTMzMDYxMjA5MDM1MFowGjEYMBYGA1UEAxMPaWRwLnN0YnJuLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0hG758FNWggGZXQrGW5K46J6ZgRJ
+						4M/qJrJAgzkgLgzw8IYJtd3BIphYJEh2zTIYfvvn0fHMbsVGi6CwEg/SR+HrPAFy
+						gYoi0HuRCMLVyMMzTG6RkgJVKJUBynRfTA5RR+qxz4pW16GEYFZRiSslvDCcRYyl
+						+QHr7sYEF8ALdJARRjXX2gfBLK63HGcgFLLx9e6yrbG/tlsbpRe15fuQUGmDJv42
+						WQTf/ywp8bfjbrYdVZ/eMh6XxDz3TiY5PVlsR5E+PwNDTpCmkyqCx4F/+UbbNFmQ
+						geUfl2Bv5yUzfvxJr93EmgCtt7uSEGX7LnzsFjtEKoEYjPwdv88nhubqxQIDAQAB
+						o2UwYzBCBgNVHREEOzA5gg9pZHAuc3Ricm4uYWMudWuGJmh0dHBzOi8vaWRwLnN0
+						YnJuLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTiWJQKJJ+0NSnfKVDm
+						tnhph6lIeTANBgkqhkiG9w0BAQUFAAOCAQEABPdfTtlHNNjckC+lOsdXSbgNNr3Y
+						vTS+WgPEmB9q2//RIymZTfkO6t7BumGB9XAilvcDbJ23ZJwlYHsnTUAVIchVwpE5
+						N8HzRagcBQDAApSmQqIg28dUiYmAyGyjgXWYt6OcFcrV+YWQ9dZp/1cg2nf7fnXI
+						SGMjH/+TJeXNjFpx6iOdsom/9xYwkS31kXm4httjWtNyf/WlNbhcodP4/eLmW0Wr
+						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>
+						MIIDJzCCAg+gAwIBAgIUDq8zPYO8IuaH20QyJWXiNuoDZnEwDQYJKoZIhvcNAQEF
+						BQAwGjEYMBYGA1UEAxMPaWRwLnN0YnJuLmFjLnVrMB4XDTEzMDYxMjA5MDM1MFoX
+						DTMzMDYxMjA5MDM1MFowGjEYMBYGA1UEAxMPaWRwLnN0YnJuLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0hG758FNWggGZXQrGW5K46J6ZgRJ
+						4M/qJrJAgzkgLgzw8IYJtd3BIphYJEh2zTIYfvvn0fHMbsVGi6CwEg/SR+HrPAFy
+						gYoi0HuRCMLVyMMzTG6RkgJVKJUBynRfTA5RR+qxz4pW16GEYFZRiSslvDCcRYyl
+						+QHr7sYEF8ALdJARRjXX2gfBLK63HGcgFLLx9e6yrbG/tlsbpRe15fuQUGmDJv42
+						WQTf/ywp8bfjbrYdVZ/eMh6XxDz3TiY5PVlsR5E+PwNDTpCmkyqCx4F/+UbbNFmQ
+						geUfl2Bv5yUzfvxJr93EmgCtt7uSEGX7LnzsFjtEKoEYjPwdv88nhubqxQIDAQAB
+						o2UwYzBCBgNVHREEOzA5gg9pZHAuc3Ricm4uYWMudWuGJmh0dHBzOi8vaWRwLnN0
+						YnJuLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTiWJQKJJ+0NSnfKVDm
+						tnhph6lIeTANBgkqhkiG9w0BAQUFAAOCAQEABPdfTtlHNNjckC+lOsdXSbgNNr3Y
+						vTS+WgPEmB9q2//RIymZTfkO6t7BumGB9XAilvcDbJ23ZJwlYHsnTUAVIchVwpE5
+						N8HzRagcBQDAApSmQqIg28dUiYmAyGyjgXWYt6OcFcrV+YWQ9dZp/1cg2nf7fnXI
+						SGMjH/+TJeXNjFpx6iOdsom/9xYwkS31kXm4httjWtNyf/WlNbhcodP4/eLmW0Wr
+						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>
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
new file mode 100644
index 00000000..ee8b0793
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,122 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFsDCCBJigAwIBAgIQXu8JCm8fuup6gdylhWdWFDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDgxMDAwMDAwMFoXDTE1MDgxMDIzNTk1OVowgY0xCzAJBgNV
+						BAYTAkdCMRYwFAYDVQQIEw1UeW5lIEFuZCBXZWFyMRYwFAYDVQQHEw1Tb3V0aCBT
+						aGllbGRzMR8wHQYDVQQKExZTb3V0aCBUeW5lc2lkZSBDb2xsZWdlMRUwEwYDVQQL
+						EwxJQ1QgU2VydmljZXMxFjAUBgNVBAMTDWlkcC5zdGMuYWMudWswggIiMA0GCSqG
+						SIb3DQEBAQUAA4ICDwAwggIKAoICAQC2QlogZqPu+Z+g/fH48fbj6ftQrRICRWGq
+						fWJkiDaqVEdbMHgaiYeiexHwTSflThrH+MtOdrxtNpjXp1v9jl62fhHUbxKE2X4K
+						uWHTZcGg3XvuzIcv7rQMfMtTOCvyFyEoxsRcSaSFvRPo4Vc6uGXFUJGDICOR5DjO
+						fgh8XlE0G3WD3xKAMF6h1I+XB6a1I0bN8vTdg1Ug38XCovOrN7Dhu7QVh+WjvLlx
+						du1xJaMh90wIhHyGwIZAZazgljo5jKwcCR1b0Izdj904ao5DGkrYpOEhb9hBSTtB
+						Jco0VjfiKNj0cnT95+F7+RGsQv5xtV62Vg10YoXQGhF+TmmXmOW+5p6uJrhNQJ6z
+						Nx4WjWjlGrW/QfAsZii5refcg4EyEWXJ1GTVrMvQFHwlT6RXokw6dO2Us79v43DK
+						ikb0fehn+3t9yzWhhyHU/756OH96os6iWA3oALqANiXHGQJBdT+oOL4Q7if+tKvu
+						exMi6LKrbt3QigZORAWq27G6nAx3jcRn+pzGpLt19XXOhKyokw4HeBCoZSoMR5JF
+						xNfH4KIvE41mZ7U3tro2x1NrCnmATFQXBV5HBecpHJPFzI+yNcw+Ek1dRkGztG/g
+						0frtiX8QVgzDdJpmAkO8BKi4cqMQg8RXnNnvnadDR4YgceyUfVqnzRuVP4lSI9Lr
+						5dsaeWfgdwIDAQABo4IBYDCCAVwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+						6pDjue0wHQYDVR0OBBYEFMO0dzzS4yDzx1HflQE8b+bjHpzPMA4GA1UdDwEB/wQE
+						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+						AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
+						dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
+						BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
+						RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
+						bmEub3JnMBgGA1UdEQQRMA+CDWlkcC5zdGMuYWMudWswDQYJKoZIhvcNAQEFBQAD
+						ggEBAFMVDYePuVrK9grWcvMbr96/WPdaRKywCzN9mjRxwhTyINqqMIaGShaKF01l
+						rknCZJ8qcyl3Kp/4Xkc419W8ZMBnjtwtCaGJMss2lk9lbLU3s2aAULg/DJ2kqakS
+						yO3Eya3tyb0vwqYmAbPbj2nJBHwCTo4e9wCXyXSugJXtb/MxnP4DvI0ZWct+h5p4
+						STKILRVEltuP/BGnvDudPhzPg75fGliy4EDA4BPj93uQnbkkDprcRQFIiit13YLg
+						JlZQysM+JuuivWbK1cEl3rJloysn1G5cX53BoFSqwj9hsZp0vXRYvZ+TzOS7NFYy
+						Idc6Eao+Yumry94nrhXQv0brzfQ=
+					</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFsDCCBJigAwIBAgIQXu8JCm8fuup6gdylhWdWFDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDgxMDAwMDAwMFoXDTE1MDgxMDIzNTk1OVowgY0xCzAJBgNV
+						BAYTAkdCMRYwFAYDVQQIEw1UeW5lIEFuZCBXZWFyMRYwFAYDVQQHEw1Tb3V0aCBT
+						aGllbGRzMR8wHQYDVQQKExZTb3V0aCBUeW5lc2lkZSBDb2xsZWdlMRUwEwYDVQQL
+						EwxJQ1QgU2VydmljZXMxFjAUBgNVBAMTDWlkcC5zdGMuYWMudWswggIiMA0GCSqG
+						SIb3DQEBAQUAA4ICDwAwggIKAoICAQC2QlogZqPu+Z+g/fH48fbj6ftQrRICRWGq
+						fWJkiDaqVEdbMHgaiYeiexHwTSflThrH+MtOdrxtNpjXp1v9jl62fhHUbxKE2X4K
+						uWHTZcGg3XvuzIcv7rQMfMtTOCvyFyEoxsRcSaSFvRPo4Vc6uGXFUJGDICOR5DjO
+						fgh8XlE0G3WD3xKAMF6h1I+XB6a1I0bN8vTdg1Ug38XCovOrN7Dhu7QVh+WjvLlx
+						du1xJaMh90wIhHyGwIZAZazgljo5jKwcCR1b0Izdj904ao5DGkrYpOEhb9hBSTtB
+						Jco0VjfiKNj0cnT95+F7+RGsQv5xtV62Vg10YoXQGhF+TmmXmOW+5p6uJrhNQJ6z
+						Nx4WjWjlGrW/QfAsZii5refcg4EyEWXJ1GTVrMvQFHwlT6RXokw6dO2Us79v43DK
+						ikb0fehn+3t9yzWhhyHU/756OH96os6iWA3oALqANiXHGQJBdT+oOL4Q7if+tKvu
+						exMi6LKrbt3QigZORAWq27G6nAx3jcRn+pzGpLt19XXOhKyokw4HeBCoZSoMR5JF
+						xNfH4KIvE41mZ7U3tro2x1NrCnmATFQXBV5HBecpHJPFzI+yNcw+Ek1dRkGztG/g
+						0frtiX8QVgzDdJpmAkO8BKi4cqMQg8RXnNnvnadDR4YgceyUfVqnzRuVP4lSI9Lr
+						5dsaeWfgdwIDAQABo4IBYDCCAVwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+						6pDjue0wHQYDVR0OBBYEFMO0dzzS4yDzx1HflQE8b+bjHpzPMA4GA1UdDwEB/wQE
+						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+						AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
+						dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
+						BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
+						RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
+						bmEub3JnMBgGA1UdEQQRMA+CDWlkcC5zdGMuYWMudWswDQYJKoZIhvcNAQEFBQAD
+						ggEBAFMVDYePuVrK9grWcvMbr96/WPdaRKywCzN9mjRxwhTyINqqMIaGShaKF01l
+						rknCZJ8qcyl3Kp/4Xkc419W8ZMBnjtwtCaGJMss2lk9lbLU3s2aAULg/DJ2kqakS
+						yO3Eya3tyb0vwqYmAbPbj2nJBHwCTo4e9wCXyXSugJXtb/MxnP4DvI0ZWct+h5p4
+						STKILRVEltuP/BGnvDudPhzPg75fGliy4EDA4BPj93uQnbkkDprcRQFIiit13YLg
+						JlZQysM+JuuivWbK1cEl3rJloysn1G5cX53BoFSqwj9hsZp0vXRYvZ+TzOS7NFYy
+						Idc6Eao+Yumry94nrhXQv0brzfQ=
+					</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>
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
new file mode 100644
index 00000000..d323cd43
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.stephensoncoll.ac.uk-oala-metadata.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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>
+						MIIDUjCCAjqgAwIBAgIIfT3WdIwbJEkwDQYJKoZIhvcNAQEFBQAwQDEbMBkGA1UE
+						CgwSU3RlcGhlbnNvbiBDb2xsZWdlMSEwHwYDVQQDDBhpZHAuc3RlcGhlbnNvbmNv
+						bGwuYWMudWswHhcNMTMxMTA1MTcyMzMyWhcNMjMxMTA1MTcyMzMyWjBAMRswGQYD
+						VQQKDBJTdGVwaGVuc29uIENvbGxlZ2UxITAfBgNVBAMMGGlkcC5zdGVwaGVuc29u
+						Y29sbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIO4Ktpx
+						Xh8JZ+nQ7NjRa9l1aJgmixDwwEeQXfYU8TGDFIy6L96RmVSzyZ8OHYooPknpwFYU
+						OEgMBEy9NE4y5zhwmpEKIQpaRMMUw82nkv4jwzcyoCk0wbfuyv7UliX0+42xxsYm
+						STxBS5Td24F6piq4Sk7kD4uj2h/5GS8uskJ3tC7D67dNQrn0+xGtYZbT7h6bwqwO
+						6dKaYUzsvxJpzqrHD+eI3xQOrD+QvFOGidUFhFLfoboyAtt5JEmAeMqgXeIYcfgg
+						ZnpoT/kh0erowh9DEJyNYmHtiTaJGLRqnEzIAV6bkfIF9k9xe6CjlCKG3qWSkZ3n
+						xhtd3Y6wME1NcJUCAwEAAaNQME4wHQYDVR0OBBYEFObgAHIlxiAG3In5EQoUwdKV
+						txojMB8GA1UdIwQYMBaAFObgAHIlxiAG3In5EQoUwdKVtxojMAwGA1UdEwQFMAMB
+						Af8wDQYJKoZIhvcNAQEFBQADggEBADuhtxyErNqg72q0VFUOjLuzTQB9uvIR3KSJ
+						s3C53FojjVc09TT4uWwZb2fr8IZ/1WmgynPcR2rivRuVpOTs6uRkwDScLR8I7Rdd
+						7lrbO1jvQHAU0s9kTy0AP434DOv3jTiLe8doYnX+pKZgqVoQJ+Ey58Ew+DRdVY90
+						QNu1y4EsCQWEUFETwdAideLi1B6xq3xVbyX+UVe23Y2r4tdKnzeZpEgrrldHTy24
+						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>
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
new file mode 100644
index 00000000..8c8b9bac
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.stmarysblackburn.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?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>
+      <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>
+						MIIDgDCCAmgCCQC1ZXdEMSkHoTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UEBhMC
+						R0IxEzARBgNVBAgMCkxhbmNhc2hpcmUxEjAQBgNVBAcMCUJsYWNrYnVybjEkMCIG
+						A1UECgwbU3QgTWFyeSdzIENvbGxlZ2UgQmxhY2tidXJuMSMwIQYDVQQDDBppZHAu
+						c3RtYXJ5c2JsYWNrYnVybi5hYy51azAeFw0xMzAzMjAxNDEyNDVaFw0zMzAzMTUx
+						NDEyNDVaMIGBMQswCQYDVQQGEwJHQjETMBEGA1UECAwKTGFuY2FzaGlyZTESMBAG
+						A1UEBwwJQmxhY2tidXJuMSQwIgYDVQQKDBtTdCBNYXJ5J3MgQ29sbGVnZSBCbGFj
+						a2J1cm4xIzAhBgNVBAMMGmlkcC5zdG1hcnlzYmxhY2tidXJuLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAso24AO1L+cxS493DDBKKkNoyjm+I
+						1W022qP63HDSRvGa+QvKObXH9aj0jxwklj/wG4dr46Ok3cLciXZdBpzOUFlkBWkN
+						36T3WWkkNrpmWU4lB+t3MB3qU+VPzzBLOJ7pHEb4bOOG8ymxLayA9TaCFeR0XXFg
+						QqmCIdG/vPHAMxDZGbbDE5pUy2SupofDKDYdgNMfM1Z/REokXFVYHpIbzSf4jHKj
+						30Gl/Cjdt54Yy7HVhHNBIZDOxP6FPDoYt3hfzzUQKSwas0g6DIZY/IoZaakcZe0D
+						UXNqoqF4sPOH1lGI47lLYSsmuJCIp6cpfQzweH7vkQ0XgECTSTvc4HMPKwIDAQAB
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBBW2P4fTo8YMSzw4BJUjVmuEVYwz8r25BxvuX9
+						E43c436ZG2P3PlC3GrVFk7aF8saYheAG83CbY/zzD0qXHEHaVMTCOa26v6Ogs2Yo
+						dM1TAz4fPra46Tt00NqvOD/HemosWu/XfvHgdsNNhNmiFkHYljNLL1ZKUJliZykW
+						PY1+RYcg69jvR/QkbapO0QYSktgZLl81pZsnC1pfGewDtk3a8fQ8Iye1LBJhXGSo
+						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>
+						MIIDgDCCAmgCCQC1ZXdEMSkHoTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UEBhMC
+						R0IxEzARBgNVBAgMCkxhbmNhc2hpcmUxEjAQBgNVBAcMCUJsYWNrYnVybjEkMCIG
+						A1UECgwbU3QgTWFyeSdzIENvbGxlZ2UgQmxhY2tidXJuMSMwIQYDVQQDDBppZHAu
+						c3RtYXJ5c2JsYWNrYnVybi5hYy51azAeFw0xMzAzMjAxNDEyNDVaFw0zMzAzMTUx
+						NDEyNDVaMIGBMQswCQYDVQQGEwJHQjETMBEGA1UECAwKTGFuY2FzaGlyZTESMBAG
+						A1UEBwwJQmxhY2tidXJuMSQwIgYDVQQKDBtTdCBNYXJ5J3MgQ29sbGVnZSBCbGFj
+						a2J1cm4xIzAhBgNVBAMMGmlkcC5zdG1hcnlzYmxhY2tidXJuLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAso24AO1L+cxS493DDBKKkNoyjm+I
+						1W022qP63HDSRvGa+QvKObXH9aj0jxwklj/wG4dr46Ok3cLciXZdBpzOUFlkBWkN
+						36T3WWkkNrpmWU4lB+t3MB3qU+VPzzBLOJ7pHEb4bOOG8ymxLayA9TaCFeR0XXFg
+						QqmCIdG/vPHAMxDZGbbDE5pUy2SupofDKDYdgNMfM1Z/REokXFVYHpIbzSf4jHKj
+						30Gl/Cjdt54Yy7HVhHNBIZDOxP6FPDoYt3hfzzUQKSwas0g6DIZY/IoZaakcZe0D
+						UXNqoqF4sPOH1lGI47lLYSsmuJCIp6cpfQzweH7vkQ0XgECTSTvc4HMPKwIDAQAB
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBBW2P4fTo8YMSzw4BJUjVmuEVYwz8r25BxvuX9
+						E43c436ZG2P3PlC3GrVFk7aF8saYheAG83CbY/zzD0qXHEHaVMTCOa26v6Ogs2Yo
+						dM1TAz4fPra46Tt00NqvOD/HemosWu/XfvHgdsNNhNmiFkHYljNLL1ZKUJliZykW
+						PY1+RYcg69jvR/QkbapO0QYSktgZLl81pZsnC1pfGewDtk3a8fQ8Iye1LBJhXGSo
+						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>
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
new file mode 100644
index 00000000..60e6f52c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.stokecoll.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?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>
+      <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>
+						MIIEvzCCA6egAwIBAgIRANDh4NBaUlUPQG3Mnm19TagwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjExMjAwMDAwMDBaFw0xNTExMjAyMzU5NTlaMIGLMQswCQYD
+						VQQGEwJHQjEWMBQGA1UECBMNU3RhZmZvcmRzaGlyZTEXMBUGA1UEBxMOU3Rva2Ug
+						b24gVHJlbnQxHzAdBgNVBAoTFlN0b2tlLW9uLVRyZW50IENvbGxlZ2UxDDAKBgNV
+						BAsTA0NTVDEcMBoGA1UEAxMTaWRwLnN0b2tlY29sbC5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAMRaECmQMak69ZpErEdzkrg2IxPpFsupXASw
+						f2/3v/SevSYTWKjnzAq6SkNnfCxgVlm5TbsFZAAYKoednwqQ2L+u/S12bFPO+mc1
+						WLkoAHUkU6WAgksHsyHZbq/Lq/fEqJSqb4xBt1pN2wflz/dowPx9HquAFMfDczWm
+						ilrnaEV8V45ZGpSWFRWr5NGIhrnuap9wntVXRWsgLm0SPvRwvYXRkS3w0N14yttE
+						8TBJQUmmq7E9s3APdrQq11LKLy5SdK9I5S/BwMwBAhV66YLWqlFt4LESJ3KTlQVe
+						2SW0N0sPim7V+hM81NpIV73lksTZi+Ne7MT50V47YMnwk0i55l0CAwEAAaOCAXAw
+						ggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQj
+						0wSwI/Ftj8R+DjpdsbDwo+EgmzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+						ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsr
+						BgEEAbIxAQICHTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2Ny
+						bC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBf
+						MDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+						TENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcw
+						HgYDVR0RBBcwFYITaWRwLnN0b2tlY29sbC5hYy51azANBgkqhkiG9w0BAQUFAAOC
+						AQEAMEsG+tjHyVtpdIvfCU9YBCLlFskPWGkyvL07Q+fwQ+viN+y2zL/UiCBvy0aU
+						d3/EYoj3MLuzl9PdmqeihueHT6ym7Tq4fTrAKEFsntGtChEZQm00xcDBJZWSAwAP
+						hNeQYbFKODh6kcRMMu0TTARl8AVHFzLzFT4EHKEIlN8VnVJChOre1P9EzGQ20HH5
+						PvulQd2vLzbkFAyQefgLxSc9jUefuK9pW1z68iw9kgXZkzaHLHWFjIDSqNnYmQt3
+						p0GPZCsdTp9XV9YdKrEVg70EZgNxXMy9sSiwEPVqiEoyyjIMX0F9b/cPB3wlf9pz
+						sy93q4qkiKSfLJkJzcs0CXy01w==
+					</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>
+						MIIEvzCCA6egAwIBAgIRANDh4NBaUlUPQG3Mnm19TagwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjExMjAwMDAwMDBaFw0xNTExMjAyMzU5NTlaMIGLMQswCQYD
+						VQQGEwJHQjEWMBQGA1UECBMNU3RhZmZvcmRzaGlyZTEXMBUGA1UEBxMOU3Rva2Ug
+						b24gVHJlbnQxHzAdBgNVBAoTFlN0b2tlLW9uLVRyZW50IENvbGxlZ2UxDDAKBgNV
+						BAsTA0NTVDEcMBoGA1UEAxMTaWRwLnN0b2tlY29sbC5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAMRaECmQMak69ZpErEdzkrg2IxPpFsupXASw
+						f2/3v/SevSYTWKjnzAq6SkNnfCxgVlm5TbsFZAAYKoednwqQ2L+u/S12bFPO+mc1
+						WLkoAHUkU6WAgksHsyHZbq/Lq/fEqJSqb4xBt1pN2wflz/dowPx9HquAFMfDczWm
+						ilrnaEV8V45ZGpSWFRWr5NGIhrnuap9wntVXRWsgLm0SPvRwvYXRkS3w0N14yttE
+						8TBJQUmmq7E9s3APdrQq11LKLy5SdK9I5S/BwMwBAhV66YLWqlFt4LESJ3KTlQVe
+						2SW0N0sPim7V+hM81NpIV73lksTZi+Ne7MT50V47YMnwk0i55l0CAwEAAaOCAXAw
+						ggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQj
+						0wSwI/Ftj8R+DjpdsbDwo+EgmzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+						ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsr
+						BgEEAbIxAQICHTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2Ny
+						bC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBf
+						MDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+						TENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcw
+						HgYDVR0RBBcwFYITaWRwLnN0b2tlY29sbC5hYy51azANBgkqhkiG9w0BAQUFAAOC
+						AQEAMEsG+tjHyVtpdIvfCU9YBCLlFskPWGkyvL07Q+fwQ+viN+y2zL/UiCBvy0aU
+						d3/EYoj3MLuzl9PdmqeihueHT6ym7Tq4fTrAKEFsntGtChEZQm00xcDBJZWSAwAP
+						hNeQYbFKODh6kcRMMu0TTARl8AVHFzLzFT4EHKEIlN8VnVJChOre1P9EzGQ20HH5
+						PvulQd2vLzbkFAyQefgLxSc9jUefuK9pW1z68iw9kgXZkzaHLHWFjIDSqNnYmQt3
+						p0GPZCsdTp9XV9YdKrEVg70EZgNxXMy9sSiwEPVqiEoyyjIMX0F9b/cPB3wlf9pz
+						sy93q4qkiKSfLJkJzcs0CXy01w==
+					</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>
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
new file mode 100644
index 00000000..3e10c11d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.stokesfc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,103 @@
+<?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>
+      <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
+						Q29sbGVnZTEUMBIGA1UECxMLSVQgU2VydmljZXMxGzAZBgNVBAMTEmlkcC5zdG9r
+						ZXNmYy5hYy51azEoMCYGCSqGSIb3DQEJARYZaXRzZXJ2aWNlc0BzdG9rZXNmYy5h
+						Yy51azAeFw0xMzA4MDYwODU0MjZaFw0yMzA4MDQwODU0MjZaMIHPMQswCQYDVQQG
+						EwJHQjEWMBQGA1UECBMNU3RhZmZvcmRzaGlyZTEXMBUGA1UEBxMOU3Rva2Utb24t
+						VHJlbnQxMjAwBgNVBAoTKUNpdHkgb2YgU3Rva2Utb24tVHJlbnQgU2l4dGggRm9y
+						bSBDb2xsZWdlMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEbMBkGA1UEAxMSaWRwLnN0
+						b2tlc2ZjLmFjLnVrMSgwJgYJKoZIhvcNAQkBFhlpdHNlcnZpY2VzQHN0b2tlc2Zj
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlMxh8mLoF9Y8
+						6Ar6UWgf/kxtn3/mnVldeGWXcEm6RhYz7gjJIiISV/+/Dv73Ru1PUpFxpxsmr5XT
+						W6sRm6XV75NEW434wWTMhJI0nOMHhu1+GBR8IR8B26J92ogB0CQHohoXJmDcDH6J
+						i2aVeupW6DF1v2m9xneNMDdri5y5uSGbWUfgJbQzcjk3/SYQbgltCywvEIyaJkK1
+						xCpCwV+PQp52BNXhYKrEzL95zHmqhYxfLbS4aUF+vVpnooA4JXxMH8M0LvUBtzEb
+						S6n/zUciZ/cqBdnKV4N/eyDcH7k+Y7dXZlglo6lQGW53A/s29T76iRORHrAlHG81
+						AvtLXrGiLwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB/D2Mtb31QkqnYfJS3xFaQ
+						FkcRJrYfMtx7pe5633OV/IUcc2iAZLIc9GJ4Si+dg+sFOakZmqVaMEvS9GJS3p2s
+						rlrxqw03jqJq7OnkUd4C3rUJpR09UVLfwRkHl6Kv4gG+MxWnYRKd+ajeQIhEDHNs
+						H9f1fFPRqcEHKIL/PLIva+VmF7hdewX5G5/k2+wdOe2S8ekOqhxH6yBFf4G2R65L
+						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>
+						MIIEHDCCAwQCCQCpm5jjooFexjANBgkqhkiG9w0BAQUFADCBzzELMAkGA1UEBhMC
+						R0IxFjAUBgNVBAgTDVN0YWZmb3Jkc2hpcmUxFzAVBgNVBAcTDlN0b2tlLW9uLVRy
+						ZW50MTIwMAYDVQQKEylDaXR5IG9mIFN0b2tlLW9uLVRyZW50IFNpeHRoIEZvcm0g
+						Q29sbGVnZTEUMBIGA1UECxMLSVQgU2VydmljZXMxGzAZBgNVBAMTEmlkcC5zdG9r
+						ZXNmYy5hYy51azEoMCYGCSqGSIb3DQEJARYZaXRzZXJ2aWNlc0BzdG9rZXNmYy5h
+						Yy51azAeFw0xMzA4MDYwODU0MjZaFw0yMzA4MDQwODU0MjZaMIHPMQswCQYDVQQG
+						EwJHQjEWMBQGA1UECBMNU3RhZmZvcmRzaGlyZTEXMBUGA1UEBxMOU3Rva2Utb24t
+						VHJlbnQxMjAwBgNVBAoTKUNpdHkgb2YgU3Rva2Utb24tVHJlbnQgU2l4dGggRm9y
+						bSBDb2xsZWdlMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEbMBkGA1UEAxMSaWRwLnN0
+						b2tlc2ZjLmFjLnVrMSgwJgYJKoZIhvcNAQkBFhlpdHNlcnZpY2VzQHN0b2tlc2Zj
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlMxh8mLoF9Y8
+						6Ar6UWgf/kxtn3/mnVldeGWXcEm6RhYz7gjJIiISV/+/Dv73Ru1PUpFxpxsmr5XT
+						W6sRm6XV75NEW434wWTMhJI0nOMHhu1+GBR8IR8B26J92ogB0CQHohoXJmDcDH6J
+						i2aVeupW6DF1v2m9xneNMDdri5y5uSGbWUfgJbQzcjk3/SYQbgltCywvEIyaJkK1
+						xCpCwV+PQp52BNXhYKrEzL95zHmqhYxfLbS4aUF+vVpnooA4JXxMH8M0LvUBtzEb
+						S6n/zUciZ/cqBdnKV4N/eyDcH7k+Y7dXZlglo6lQGW53A/s29T76iRORHrAlHG81
+						AvtLXrGiLwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB/D2Mtb31QkqnYfJS3xFaQ
+						FkcRJrYfMtx7pe5633OV/IUcc2iAZLIc9GJ4Si+dg+sFOakZmqVaMEvS9GJS3p2s
+						rlrxqw03jqJq7OnkUd4C3rUJpR09UVLfwRkHl6Kv4gG+MxWnYRKd+ajeQIhEDHNs
+						H9f1fFPRqcEHKIL/PLIva+VmF7hdewX5G5/k2+wdOe2S8ekOqhxH6yBFf4G2R65L
+						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>
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
new file mode 100644
index 00000000..97db7e74
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.stourbridge.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,117 @@
+<?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>
+      <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>
+						MIIEuzCCA6OgAwIBAgIRAJM3bbt+OVuVVDiHzCVYDr8wDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjAxMDkwMDAwMDBaFw0xNTAxMDgyMzU5NTlaMIGPMQswCQYD
+						VQQGEwJHQjEWMBQGA1UECBMNV2VzdCBNaWRsYW5kczEUMBIGA1UEBxMLU3RvdXJi
+						cmlkZ2UxHDAaBgNVBAoTE1N0b3VyYnJpZGdlIENvbGxlZ2UxFDASBgNVBAsTC0lU
+						IFNlcnZpY2VzMR4wHAYDVQQDExVpZHAuc3RvdXJicmlkZ2UuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDwKog/r/r0zrlFPGe5cVQxkJp0fsHV
+						0j1YfoQj/RsI29T9Cb66tz/iTUC/2digSpi+udzSNQuDD7vmGOmwTyFpvC9ROeYm
+						oryi9kY4ZQi9R3/0yajs0b9W6tIIKpmdiHUTft6aj6f4cWPykybt7jL2zMW0B8Vc
+						+q8ATF4XA3SWl0vLE9qd/R+UULaVThFW4UMPjNhnR8oi0LdjnIcvvoaJSEurxC7t
+						UKFZybfde7pyLxzolXmbiqZKbbLI7bFI4q7GIGHBGinSyNyQAJUs3yQkiwX0xWS6
+						HwDruqJ3KX+Hj310y29KCpp/HtWzb5AJ8m1/pFXED3s5qItf5DcHI2jZAgMBAAGj
+						ggFoMIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
+						FgQUFnIQa/OS7s2P4xXSjuoKNlickZUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
+						/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
+						DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
+						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
+						AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIAYDVR0R
+						BBkwF4IVaWRwLnN0b3VyYnJpZGdlLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQB2
+						rk4ke+j5hauBaX86S0JU4wFbjjX+Q84OqWxFkHCF4TucpT3y5oA2gyKgZ3jKmCr3
+						u5eWmRDeGPD1Bjdchb3EDe7pEZuJn7caxYkZyuClNHb4fZKCqJsM2hLeeFZh/lig
+						+uoOphs+6d5GBBUGLzQSo2ekgmsXnfJG1KQ0bN+a0qFtdkomB+w4ZubJLcRI698o
+						BWpjcuFMGrDskjx8n1WDyQ5mUNp7nYzpEHFodQXo4d9XziyMdyp8vTqfiwImZ+gg
+						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>
+						MIIEuzCCA6OgAwIBAgIRAJM3bbt+OVuVVDiHzCVYDr8wDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjAxMDkwMDAwMDBaFw0xNTAxMDgyMzU5NTlaMIGPMQswCQYD
+						VQQGEwJHQjEWMBQGA1UECBMNV2VzdCBNaWRsYW5kczEUMBIGA1UEBxMLU3RvdXJi
+						cmlkZ2UxHDAaBgNVBAoTE1N0b3VyYnJpZGdlIENvbGxlZ2UxFDASBgNVBAsTC0lU
+						IFNlcnZpY2VzMR4wHAYDVQQDExVpZHAuc3RvdXJicmlkZ2UuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDwKog/r/r0zrlFPGe5cVQxkJp0fsHV
+						0j1YfoQj/RsI29T9Cb66tz/iTUC/2digSpi+udzSNQuDD7vmGOmwTyFpvC9ROeYm
+						oryi9kY4ZQi9R3/0yajs0b9W6tIIKpmdiHUTft6aj6f4cWPykybt7jL2zMW0B8Vc
+						+q8ATF4XA3SWl0vLE9qd/R+UULaVThFW4UMPjNhnR8oi0LdjnIcvvoaJSEurxC7t
+						UKFZybfde7pyLxzolXmbiqZKbbLI7bFI4q7GIGHBGinSyNyQAJUs3yQkiwX0xWS6
+						HwDruqJ3KX+Hj310y29KCpp/HtWzb5AJ8m1/pFXED3s5qItf5DcHI2jZAgMBAAGj
+						ggFoMIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
+						FgQUFnIQa/OS7s2P4xXSjuoKNlickZUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
+						/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
+						DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
+						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
+						AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIAYDVR0R
+						BBkwF4IVaWRwLnN0b3VyYnJpZGdlLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQB2
+						rk4ke+j5hauBaX86S0JU4wFbjjX+Q84OqWxFkHCF4TucpT3y5oA2gyKgZ3jKmCr3
+						u5eWmRDeGPD1Bjdchb3EDe7pEZuJn7caxYkZyuClNHb4fZKCqJsM2hLeeFZh/lig
+						+uoOphs+6d5GBBUGLzQSo2ekgmsXnfJG1KQ0bN+a0qFtdkomB+w4ZubJLcRI698o
+						BWpjcuFMGrDskjx8n1WDyQ5mUNp7nYzpEHFodQXo4d9XziyMdyp8vTqfiwImZ+gg
+						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>
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
new file mode 100644
index 00000000..502bc708
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.strasbourg.archi.fr-idp-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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>
+      <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: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>
+					      MIIEezCCA2OgAwIBAgIQFl8uHwbutP9D8H8eK6oUajANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxNzAwMDAwMFoXDTE3MDQxNjIzNTk1OVowRTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSAwHgYDVQQDExdpZHAuc3RyYXNi
+b3VyZy5hcmNoaS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEW
+0E5QGJCSB3Ba7fVLIk1yCGEqE26Toca9CPHo6wio489qJYKcvvpcZZmONMEU1uL5
+Z5gCONsRfISTnlZu8R0RJLA4+nFiK3pnl5Qxb8GumPfo4Zy09qq1ldqQZ0aQ5p9l
+eekm9cjui6trtn23gYADfL3lgcdXbkkENvxQiSPC4Wy+TnQHKZzscbTfvPn2YAnD
+zTURuz0egxuJts1IPgfhGpyNL2nXMRJtEAUGAh6hEztZClJU1CZcP+gwfOYc0tdp
+95+rjQ9nl9+ECw+dPA7n4JP9+R3gRmh0hsf1Kwra5UHB97lBoTj6k4DnOJaHKYcW
+thOStNfuJHAy/uzBTr0CAwEAAaOCAXQwggFwMB8GA1UdIwQYMBaAFAy9k2gM896r
+o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQORU9i5o45EyY7F8g9y3s3qyy+jTAOBgNV
+HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
+VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
+U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
+LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
+cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIXaWRwLnN0cmFzYm91
+cmcuYXJjaGkuZnIwDQYJKoZIhvcNAQEFBQADggEBADcUZO7J6TsDIcHiWvf8Uoyz
+N0XZHA5XAN/AJAphS/Vz7HTLFjXfXrx0Khcg2OLlQyBC4c8h1ns1YZoFa1dvF89H
+neK+NGkypljJSB7V8V4jIH38Y40YRsHo4rh0labd+mQ0vwRXrVdHzSVU//gngaeD
+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://unknown.site.com</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
new file mode 100644
index 00000000..c8adab06
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.stratford.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCv6gdMgmB2bhP5Tqbp
+						3XC7EkL7NXTsg+bMwg8G7GjNfNsVPv7MO773+zRXrvUYdBvPSQLOcKw9JvpYvrAh
+						zOuZLME8rxoTD6ejNRC9IFsOI02eQ87qJ1jCOqFjPjn9N7V1QDKjRfx/6F1XNuZ8
+						v8L0hwc4/6moj4mIr7RhxgUt4fj/KHZbaxnGw1ix3GTUpa1UNZvF5HsbXVknogyQ
+						SFeWYPEMhUaSmUcD5KLCuovvXU1s5JB79V4+BRJIsxRt+tD6BcM6cQnLux+N3rXQ
+						Rx4IFUKRWv3KRzXEo6s8LapGk8Pr4/lTgFSjd+oIzOpqZSHgNmnhHvAKl/HG+jsD
+						v/KPAgMBAAGjbTBrMB0GA1UdDgQWBBSTmgz2ydW2bFqPFjRPfX/MeU0kcDBKBgNV
+						HREEQzBBghNpZHAuc3RyYXRmb3JkLmFjLnVrhipodHRwczovL2lkcC5zdHJhdGZv
+						cmQuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBABDOMGaU
+						4H1UYggkzWnhqlIk1gd/wWWS86W6uzPKmaXfhym7bAZf8Y6aL6n0XrM3zp+zclCR
+						M9qG8+Kzg7InCs8WEH3xlCsIi1HAjjfCUN29RsJ9yCnRpV5h2b0pIYEUT02Kw8N2
+						kH/FMfEgOmKsUmKmYamCu5lBHU2inYFEJXkiisCoLQjXnws3wpCJLfKMN567rJlu
+						OjJYfYtmKTXwc/VqRkUFGQWu5GP9hgGPC0wcWHr6Vspqa8eMZDF4CY5EAD9kTWB7
+						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>
+						MIIDNzCCAh+gAwIBAgIUHUDFCEinVS2/oqpWRjzbVISrlKIwDQYJKoZIhvcNAQEF
+						BQAwHjEcMBoGA1UEAwwTaWRwLnN0cmF0Zm9yZC5hYy51azAeFw0xNDA4MTkxNDM2
+						MzFaFw0zNDA4MTkxNDM2MzFaMB4xHDAaBgNVBAMME2lkcC5zdHJhdGZvcmQuYWMu
+						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCv6gdMgmB2bhP5Tqbp
+						3XC7EkL7NXTsg+bMwg8G7GjNfNsVPv7MO773+zRXrvUYdBvPSQLOcKw9JvpYvrAh
+						zOuZLME8rxoTD6ejNRC9IFsOI02eQ87qJ1jCOqFjPjn9N7V1QDKjRfx/6F1XNuZ8
+						v8L0hwc4/6moj4mIr7RhxgUt4fj/KHZbaxnGw1ix3GTUpa1UNZvF5HsbXVknogyQ
+						SFeWYPEMhUaSmUcD5KLCuovvXU1s5JB79V4+BRJIsxRt+tD6BcM6cQnLux+N3rXQ
+						Rx4IFUKRWv3KRzXEo6s8LapGk8Pr4/lTgFSjd+oIzOpqZSHgNmnhHvAKl/HG+jsD
+						v/KPAgMBAAGjbTBrMB0GA1UdDgQWBBSTmgz2ydW2bFqPFjRPfX/MeU0kcDBKBgNV
+						HREEQzBBghNpZHAuc3RyYXRmb3JkLmFjLnVrhipodHRwczovL2lkcC5zdHJhdGZv
+						cmQuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBABDOMGaU
+						4H1UYggkzWnhqlIk1gd/wWWS86W6uzPKmaXfhym7bAZf8Y6aL6n0XrM3zp+zclCR
+						M9qG8+Kzg7InCs8WEH3xlCsIi1HAjjfCUN29RsJ9yCnRpV5h2b0pIYEUT02Kw8N2
+						kH/FMfEgOmKsUmKmYamCu5lBHU2inYFEJXkiisCoLQjXnws3wpCJLfKMN567rJlu
+						OjJYfYtmKTXwc/VqRkUFGQWu5GP9hgGPC0wcWHr6Vspqa8eMZDF4CY5EAD9kTWB7
+						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>
diff --git a/swamid-interfederations-2.0/idp.strodes.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.strodes.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..bd931807
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.strodes.ac.uk-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						MzExNTE2MzVaFw0zMzEwMjYxNTE2MzVaMGQxCzAJBgNVBAYTAkdCMQ8wDQYDVQQI
+						EwZTdXJyZXkxDjAMBgNVBAcTBUVnaGFtMRgwFgYDVQQKEw9TdHJvZGVzIENvbGxl
+						Z2UxGjAYBgNVBAMTEWlkcC5zdHJvZGVzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEF
+						AAOCAQ8AMIIBCgKCAQEA3jJkDFSXCd1vT7ockIBT/j/ZNcRgrdhdstZVN7cycLDg
+						zUijTZgqHZYmq7/PgDKRuH4/zgiFAZt4LZKxaro0fLK0CpZBal0pVpheqaCGtuCr
+						FNtsP826Ks1dk2pMPSqqFrYdTO/UMofeUuxrNr836CL7x5ATCdVU9F/pljTeRr/V
+						qCs1IQhdiE1o5mHYXJutpwnabHN/eYQB/xgM8awyr93lHOge2uu6ioKcfDASmL9+
+						VKNak/4mYQEA3UW4BjhC6QHzXvRu2KbhVjcrH9qBgCJM73u+hkSEWPazXAcvmgFS
+						QoCDgqelecT4Y0iCPTytn/ffIHKZR/lpWfbgmGTERQIDAQABMA0GCSqGSIb3DQEB
+						BQUAA4IBAQBXSwhT6WnbbLhQ432uwqOgM8xAH27q4ARxNLzTj7D9XNSbh1qxwc0o
+						2z1pgHA05H/r6JFVoOd1hP03k34wv3Mt9B/kEiEP7x2iGukw5sQ8xk9JFIVNdjC0
+						yiJFl9znjtl/UZZkYG6WgvOFr+HzK42Tvf3cBwcjn3amZbjTsIU7VbH0GvCqnB5B
+						Ec9fbn6h3RN9awbrMC6BqbRflyA4k8rAuZ4yxKUm/GTkhjaGoM8yNVJbmxOGonkV
+						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>
+						MIIDRDCCAiwCCQDcWa6x9ZbwJjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJH
+						QjEPMA0GA1UECBMGU3VycmV5MQ4wDAYDVQQHEwVFZ2hhbTEYMBYGA1UEChMPU3Ry
+						b2RlcyBDb2xsZWdlMRowGAYDVQQDExFpZHAuc3Ryb2Rlcy5hYy51azAeFw0xMzEw
+						MzExNTE2MzVaFw0zMzEwMjYxNTE2MzVaMGQxCzAJBgNVBAYTAkdCMQ8wDQYDVQQI
+						EwZTdXJyZXkxDjAMBgNVBAcTBUVnaGFtMRgwFgYDVQQKEw9TdHJvZGVzIENvbGxl
+						Z2UxGjAYBgNVBAMTEWlkcC5zdHJvZGVzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEF
+						AAOCAQ8AMIIBCgKCAQEA3jJkDFSXCd1vT7ockIBT/j/ZNcRgrdhdstZVN7cycLDg
+						zUijTZgqHZYmq7/PgDKRuH4/zgiFAZt4LZKxaro0fLK0CpZBal0pVpheqaCGtuCr
+						FNtsP826Ks1dk2pMPSqqFrYdTO/UMofeUuxrNr836CL7x5ATCdVU9F/pljTeRr/V
+						qCs1IQhdiE1o5mHYXJutpwnabHN/eYQB/xgM8awyr93lHOge2uu6ioKcfDASmL9+
+						VKNak/4mYQEA3UW4BjhC6QHzXvRu2KbhVjcrH9qBgCJM73u+hkSEWPazXAcvmgFS
+						QoCDgqelecT4Y0iCPTytn/ffIHKZR/lpWfbgmGTERQIDAQABMA0GCSqGSIb3DQEB
+						BQUAA4IBAQBXSwhT6WnbbLhQ432uwqOgM8xAH27q4ARxNLzTj7D9XNSbh1qxwc0o
+						2z1pgHA05H/r6JFVoOd1hP03k34wv3Mt9B/kEiEP7x2iGukw5sQ8xk9JFIVNdjC0
+						yiJFl9znjtl/UZZkYG6WgvOFr+HzK42Tvf3cBwcjn3amZbjTsIU7VbH0GvCqnB5B
+						Ec9fbn6h3RN9awbrMC6BqbRflyA4k8rAuZ4yxKUm/GTkhjaGoM8yNVJbmxOGonkV
+						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>
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
new file mode 100644
index 00000000..46af488d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Students</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola för studenter</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for students</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
+        <mdui:Keywords xml:lang="sv">Blekinge+Tekniska+Högskola BTH</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">Blekinge+Tekniska+Högskola BTH</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>bth.se</mdui:DomainHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNlMB4XDTEwMDgyNTIwMDU0
+OFoXDTMwMDgyNTIwMDU0OFowHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsO+nW3r0Rzu0ojoCY0Jm
+R/GuN73dy9gDYOtvgwtFJkVdQBuEGDvVYgD4WUzCnSSy5b4EGFwAaBLIfZ4UAL2c
+fWIWJknPrfSxFqR9dLJJo9hkHMX8VBumjhzYHVZqYSm/JVGh4GYewhQmRO0iSG9a
+it5fe6ZyVG67TduhnwzFC8azRSfIgnEjaRGP2qVEiUIbfuiRRr2J88rwxyxrYCa5
+ZVMLjR9wSBRqG8P+00UDolT3Q0lvawF3pj+kEbZ2p+Y6UxZHghHi5EKMkvy1OfKy
+RYkfxXbGk2JEXGcgb3MyRLmdZoqrH0BedH2udrwzOEGUdb/cElqmpFMOyZBdwEVO
+/QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuc3R1ZGVudC5idGguc2WGKWh0dHBz
+Oi8vaWRwLnN0dWRlbnQuYnRoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRA
+vpCow9+jy11YKdmATEMN1KY1dTANBgkqhkiG9w0BAQUFAAOCAQEALbZz8voHJMiE
+Tjc7RYskFIOAx7k1fmPsF4kSdPyDK8RkyHBfGHa5uJ9wBh4w5BPCp9Wy7SY5+q/y
+E9tDiISVD0NEU8KQX8u8pC1d4OdfT2x6tn+w3Ww5cNaQ3CUsD+VqefiX6Acr3ssX
+0ahszKKVCL8v7ifCqxr1q2dbABB6GV9iwKHB+vfXLIp2Upt6+y3i5+iC1C8uXul0
+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
+BQAwHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNlMB4XDTEwMDgyNTIwMDU0
+OFoXDTMwMDgyNTIwMDU0OFowHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsO+nW3r0Rzu0ojoCY0Jm
+R/GuN73dy9gDYOtvgwtFJkVdQBuEGDvVYgD4WUzCnSSy5b4EGFwAaBLIfZ4UAL2c
+fWIWJknPrfSxFqR9dLJJo9hkHMX8VBumjhzYHVZqYSm/JVGh4GYewhQmRO0iSG9a
+it5fe6ZyVG67TduhnwzFC8azRSfIgnEjaRGP2qVEiUIbfuiRRr2J88rwxyxrYCa5
+ZVMLjR9wSBRqG8P+00UDolT3Q0lvawF3pj+kEbZ2p+Y6UxZHghHi5EKMkvy1OfKy
+RYkfxXbGk2JEXGcgb3MyRLmdZoqrH0BedH2udrwzOEGUdb/cElqmpFMOyZBdwEVO
+/QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuc3R1ZGVudC5idGguc2WGKWh0dHBz
+Oi8vaWRwLnN0dWRlbnQuYnRoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRA
+vpCow9+jy11YKdmATEMN1KY1dTANBgkqhkiG9w0BAQUFAAOCAQEALbZz8voHJMiE
+Tjc7RYskFIOAx7k1fmPsF4kSdPyDK8RkyHBfGHa5uJ9wBh4w5BPCp9Wy7SY5+q/y
+E9tDiISVD0NEU8KQX8u8pC1d4OdfT2x6tn+w3Ww5cNaQ3CUsD+VqefiX6Acr3ssX
+0ahszKKVCL8v7ifCqxr1q2dbABB6GV9iwKHB+vfXLIp2Upt6+y3i5+iC1C8uXul0
+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</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology - Students</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>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>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>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.suni.se-adfs-services-trust.xml b/swamid-interfederations-2.0/idp.suni.se-adfs-services-trust.xml
new file mode 100644
index 00000000..299c670d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.suni.se-adfs-services-trust.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.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:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suni.se</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">suni.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIQZHPOuyVURJge5wdOa1kfEzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDMxMTAwMDAwMFoXDTE3MDQzMDIzNTk1OVowOTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAuc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMB0RS/jwsLGyG8DB8mIqgzTcEwb5P/7y9beizxgvlJc3dbauQogUIwZtsUn2q7qbV5h66c68bl8fi+JhtJYWXXu/rA9d6i4cQSdKXJPTMAss2ZobcRmnVSDrj0ZTJ5+JBe+fuYI3cDaLy5rGz9PcgxqINcjM4wW01pKjnZzrVqbJ1dsSfWzU5AkMwVS+10UjQYLSeHg/2PAgfDRovqTqTfMpF16DXwx+OcqnJY2yN0JcpVggQNOE9a4y9L6qe0SYbbTlqbrlrz/X+0e4gQ8sjif4PdB4AXVb0dP9D3pjfLXim8leVarNN2knOPZmmFYWKEBNS5KHlkSnHFIyNFof3UCAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT3yAYidugFyhjhPMuNGIu6pA6hfzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILaWRwLnN1bmkuc2UwDQYJKoZIhvcNAQEFBQADggEBAAdzCLw9BLbfTeYy0fLEWT4nrH5oBJ7G1Si/vdf8dvQlUF8gbtizKI/c7871smaPHge5DdwUwY9vqRkRrzeiM/mGUSgUCkN56Y17eTzmbvRQ6EPjpiZ/dlTBycedq2TmnxLM1VbO9Xx3rK07YdSdDn+y+n4GNJlL4NCED/rVDdsEBoy+nmztLLolGztRZPv8xLbCdE2vompEA7sbDsBv4hNCjsuVSCt8FlX3rz3uqaaNcG3r5tQ8VHtrQ7xCCRScSfoYoI0sgwE5BtThwDAi1arLp/tHN5Ow500zq4m8LZEdmGBZ56M3kIHEn1n8UOUlCMWYtYw1rIhX9FYyT8Dn2bY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIQZHPOuyVURJge5wdOa1kfEzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDMxMTAwMDAwMFoXDTE3MDQzMDIzNTk1OVowOTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAuc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMB0RS/jwsLGyG8DB8mIqgzTcEwb5P/7y9beizxgvlJc3dbauQogUIwZtsUn2q7qbV5h66c68bl8fi+JhtJYWXXu/rA9d6i4cQSdKXJPTMAss2ZobcRmnVSDrj0ZTJ5+JBe+fuYI3cDaLy5rGz9PcgxqINcjM4wW01pKjnZzrVqbJ1dsSfWzU5AkMwVS+10UjQYLSeHg/2PAgfDRovqTqTfMpF16DXwx+OcqnJY2yN0JcpVggQNOE9a4y9L6qe0SYbbTlqbrlrz/X+0e4gQ8sjif4PdB4AXVb0dP9D3pjfLXim8leVarNN2knOPZmmFYWKEBNS5KHlkSnHFIyNFof3UCAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT3yAYidugFyhjhPMuNGIu6pA6hfzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILaWRwLnN1bmkuc2UwDQYJKoZIhvcNAQEFBQADggEBAAdzCLw9BLbfTeYy0fLEWT4nrH5oBJ7G1Si/vdf8dvQlUF8gbtizKI/c7871smaPHge5DdwUwY9vqRkRrzeiM/mGUSgUCkN56Y17eTzmbvRQ6EPjpiZ/dlTBycedq2TmnxLM1VbO9Xx3rK07YdSdDn+y+n4GNJlL4NCED/rVDdsEBoy+nmztLLolGztRZPv8xLbCdE2vompEA7sbDsBv4hNCjsuVSCt8FlX3rz3uqaaNcG3r5tQ8VHtrQ7xCCRScSfoYoI0sgwE5BtThwDAi1arLp/tHN5Ow500zq4m8LZEdmGBZ56M3kIHEn1n8UOUlCMWYtYw1rIhX9FYyT8Dn2bY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.suni.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.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.suni.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.suni.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.suni.se/adfs/ls/"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="eduPersonEntitlement" Name="http://schemas.xmlsoap.org/claims/eduPersonEntitlement" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Display Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Initials" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/initials" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="norEduPersonNIN" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/norEduPersonNIN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="socialSecurityNumber" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/socialSecurityNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="socialSecurityNumberNotOld" Name="http://schemas.xmlsoap.org/claims/socialSecurityNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="E-Mail Address" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Given Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="UPN" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Common Name" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x E-Mail Address" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x UPN" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Role" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Surname" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="norEduPersonNINOld" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name ID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication time stamp" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication method" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only group SID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Windows account name" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="eduPersonScopedAffiliation" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv-SE">Södertörns högskola</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv-SE">Södertörns högskola</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv-SE">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)86084000</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.surfnet.nl.xml b/swamid-interfederations-2.0/idp.surfnet.nl.xml
new file mode 100644
index 00000000..4febb589
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.surfnet.nl.xml
@@ -0,0 +1,49 @@
+<?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>
+  </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/media/idp/surfnet.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">SURFnet bv SURF konijn powered by</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">SURFnet bv SURF konijn surf surfnet 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: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
new file mode 100644
index 00000000..5f8b176e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sussex.ac.uk-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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>
+						MIIDKDCCAhCgAwIBAgIVAL/cBrEESZ0ZPT7d+5iLH4sqVPESMA0GCSqGSIb3DQEB
+						BQUAMBsxGTAXBgNVBAMTEGlkcC5zdXNzZXguYWMudWswHhcNMTMwODAxMTQ0NzE2
+						WhcNMzMwODAxMTQ0NzE2WjAbMRkwFwYDVQQDExBpZHAuc3Vzc2V4LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAofHugvoV3CedXGuTc3l8gbwJ
+						MU0hCP2TetJq7VXqKOXfedqQ5wDagYUvHhi+PqzakJhVridhguoywOiQQHSuGRhc
+						4YhYo0kZe6w9PU4NGJztKwIoc90pMGfP9F0MlnyFL4UFEtdMVKhMWl0uPJJec3EH
+						MnzTAeakGSENoVAasX3m+vaDoldAeIy7agcQ38K/MaVAskiF4QzP2k+uVFfjC91w
+						rVKDi6xyDGbFiBkgIlkpXhnjkoIyWSdaKKxAR+3V39pMFkrhznptHBk+Nm6lc5Rs
+						IsQFxeoWp8YpFDWjatkTJAid6GCVxIMn7iA04fe7WNknFERgTcVe76mFa5895QID
+						AQABo2MwYTBABgNVHREEOTA3ghBpZHAuc3Vzc2V4LmFjLnVrhiNodHRwczovL2lk
+						cC5zdXNzZXguYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUW2CGoKuq5ytmpRKk
+						vK0UKWA0PZIwDQYJKoZIhvcNAQEFBQADggEBABYQwDDUPodVsJLXP1+4RYXzcALB
+						GD+URWmXudUbkmvVyPBFlG61W7aritNYPswnsMkeTsWGceygRZDduiDhImMk3psM
+						tfjPPZsCNYNPj+E5kXrxj5S4y0wBPCUA5li9avuUwyiv7Cj41x0R/MBsTOzZymM1
+						WAdfk2BWiiO76mGt0T5JtkEvyMR2oOguM3rHyQvSprZwixI5iC51Jgz8hi9/g6uB
+						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>
+						MIIDKDCCAhCgAwIBAgIVAL/cBrEESZ0ZPT7d+5iLH4sqVPESMA0GCSqGSIb3DQEB
+						BQUAMBsxGTAXBgNVBAMTEGlkcC5zdXNzZXguYWMudWswHhcNMTMwODAxMTQ0NzE2
+						WhcNMzMwODAxMTQ0NzE2WjAbMRkwFwYDVQQDExBpZHAuc3Vzc2V4LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAofHugvoV3CedXGuTc3l8gbwJ
+						MU0hCP2TetJq7VXqKOXfedqQ5wDagYUvHhi+PqzakJhVridhguoywOiQQHSuGRhc
+						4YhYo0kZe6w9PU4NGJztKwIoc90pMGfP9F0MlnyFL4UFEtdMVKhMWl0uPJJec3EH
+						MnzTAeakGSENoVAasX3m+vaDoldAeIy7agcQ38K/MaVAskiF4QzP2k+uVFfjC91w
+						rVKDi6xyDGbFiBkgIlkpXhnjkoIyWSdaKKxAR+3V39pMFkrhznptHBk+Nm6lc5Rs
+						IsQFxeoWp8YpFDWjatkTJAid6GCVxIMn7iA04fe7WNknFERgTcVe76mFa5895QID
+						AQABo2MwYTBABgNVHREEOTA3ghBpZHAuc3Vzc2V4LmFjLnVrhiNodHRwczovL2lk
+						cC5zdXNzZXguYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUW2CGoKuq5ytmpRKk
+						vK0UKWA0PZIwDQYJKoZIhvcNAQEFBQADggEBABYQwDDUPodVsJLXP1+4RYXzcALB
+						GD+URWmXudUbkmvVyPBFlG61W7aritNYPswnsMkeTsWGceygRZDduiDhImMk3psM
+						tfjPPZsCNYNPj+E5kXrxj5S4y0wBPCUA5li9avuUwyiv7Cj41x0R/MBsTOzZymM1
+						WAdfk2BWiiO76mGt0T5JtkEvyMR2oOguM3rHyQvSprZwixI5iC51Jgz8hi9/g6uB
+						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>
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
new file mode 100644
index 00000000..c6b6bf2f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sussexcoast.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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
+						dC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJUCHJLmCjKw
+						9qA1Ih2Dxlv6egks+noCR51m17eZiGvFX0yMgwAxaKtR3YifvbB+Is6OUmajhBpI
+						CzLnXvl+JGLRdfUnfI6UkKJzbWqA6YHvJ+wpUNi/3zKsVtWKQJkNwfutETZ0lRac
+						Nqg4GV+LYZTrSMpYCeWYElRGl6FXqO/RGDTlGFsyz3zW1aQ0glcGXAXMjUEaqllx
+						HJh1CTPqpvBSyjszE1cqOb1SOa5mjRNWpjvHqZG9MiFNkdK42o59DDutkKDrzy23
+						W+LfLXpTf34Azg6OiBMUoiR8/L9sMJzQgBNpAqf8jmudVfI99dbRiE5IETXLic6D
+						wXEWpY9QHisCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLnN1c3NleGNvYXN0LmFj
+						LnVrhixodHRwczovL2lkcC5zdXNzZXhjb2FzdC5hYy51ay9pZHAvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUGOChlS1FUiNl0WdWrVoquoZlZN0wDQYJKoZIhvcNAQEFBQAD
+						ggEBAH/g5HazCvM36U9zfkj3FrlSRVhg3f1czmqx1qE6SfnhF3R6X68u9WRtpJ+D
+						Tvwv05UhhnSzAk+ijxQL2/1bwkWpS2d+a6d6+kjRABUVjx1mQOAuJLfFcGqBnXEs
+						tRj+Gc4eqYQm/BxxCwakyRo4jy13a4Mn3GOArZmiObKaBbWEgqqdLUEASBJJzjiE
+						VZpoq6DGegpSPiff212TQiVNZ63eITPS927MhNkZ8bCI5yK/iqbn4BKwM8Lg7rRX
+						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>
+						MIIDQDCCAiigAwIBAgIVAPawddu40r8UEYXiRI2PCN7NZhVUMA0GCSqGSIb3DQEB
+						BQUAMCAxHjAcBgNVBAMTFWlkcC5zdXNzZXhjb2FzdC5hYy51azAeFw0xMzA4MTUx
+						NTM2MjRaFw0zMzA4MTUxNTM2MjRaMCAxHjAcBgNVBAMTFWlkcC5zdXNzZXhjb2Fz
+						dC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJUCHJLmCjKw
+						9qA1Ih2Dxlv6egks+noCR51m17eZiGvFX0yMgwAxaKtR3YifvbB+Is6OUmajhBpI
+						CzLnXvl+JGLRdfUnfI6UkKJzbWqA6YHvJ+wpUNi/3zKsVtWKQJkNwfutETZ0lRac
+						Nqg4GV+LYZTrSMpYCeWYElRGl6FXqO/RGDTlGFsyz3zW1aQ0glcGXAXMjUEaqllx
+						HJh1CTPqpvBSyjszE1cqOb1SOa5mjRNWpjvHqZG9MiFNkdK42o59DDutkKDrzy23
+						W+LfLXpTf34Azg6OiBMUoiR8/L9sMJzQgBNpAqf8jmudVfI99dbRiE5IETXLic6D
+						wXEWpY9QHisCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLnN1c3NleGNvYXN0LmFj
+						LnVrhixodHRwczovL2lkcC5zdXNzZXhjb2FzdC5hYy51ay9pZHAvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUGOChlS1FUiNl0WdWrVoquoZlZN0wDQYJKoZIhvcNAQEFBQAD
+						ggEBAH/g5HazCvM36U9zfkj3FrlSRVhg3f1czmqx1qE6SfnhF3R6X68u9WRtpJ+D
+						Tvwv05UhhnSzAk+ijxQL2/1bwkWpS2d+a6d6+kjRABUVjx1mQOAuJLfFcGqBnXEs
+						tRj+Gc4eqYQm/BxxCwakyRo4jy13a4Mn3GOArZmiObKaBbWEgqqdLUEASBJJzjiE
+						VZpoq6DGegpSPiff212TQiVNZ63eITPS927MhNkZ8bCI5yK/iqbn4BKwM8Lg7rRX
+						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>
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
new file mode 100644
index 00000000..a3bb593e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sussexdowns.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussexdowns.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEwjCCA6qgAwIBAgIQTrh+jfRf1aCGSyqnZqrgqTANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDEyMjAwMDAwMFoXDTE2MDEyMjIzNTk1OVowgY0xCzAJBgNV
+						BAYTAkdCMRQwEgYDVQQIEwtFYXN0IFN1c3NleDEOMAwGA1UEBxMFTGV3ZXMxHTAb
+						BgNVBAoTFFN1c3NleCBEb3ducyBDb2xsZWdlMRkwFwYDVQQLExBOZXR3b3JrIFNl
+						cnZpY2VzMR4wHAYDVQQDExVpZHAuc3Vzc2V4ZG93bnMuYWMudWswggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzasViv6sqpPwhpSx5LMRX+IIZX/Us0+T6
+						Umeqz/zzATJ2oAq/Vc3K6vbkWHOqBRSHu81YTtubITgCVamjjeMRw2upCWP52z45
+						X4NG6uueNOxsHArEsI34nKumCJPpGi7g/yEI2t55MlXRKCjYx0SGXQ+HQVbS5+ck
+						7Xfg14J3ykCrVP20tg03VCWABX8HpFGs2jBXdaTMzJNPQDgUspBoahdaVdSAzPJH
+						rE+r6OzM39siItlYUuw6HROqUCNsPPBx5+weO/zzbaj1sfAxfuM7qq5E3v1uDXcC
+						sm9ci3Ai7sigirORZYWcbD1y1HeUgZFlUt9vW3lUyCrze3FKhkNvAgMBAAGjggFy
+						MIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+						stJtWpehWtVLmajr+G8NZ33QgaowDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+						MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYL
+						KwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9j
+						cmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEw
+						XzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
+						U0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3Jn
+						MCAGA1UdEQQZMBeCFWlkcC5zdXNzZXhkb3ducy5hYy51azANBgkqhkiG9w0BAQUF
+						AAOCAQEAX6a8z1WqpzNGKYLE3plawtzyMa8cwkvZnNvkAdyl0PSFF4ylEHBjF85n
+						0ZXE6FqIpLUZJxlKKfqj3CeIxFqX1noxKndZzu7QsxcspXU3ubPWVJBoJZ4XO4jr
+						G9Gw+R+kR5e3QfNDrCZKmU247vuvJIqnbF9NT+gm7IHBvFLnx+r3zxUpX4Ca8D8+
+						IkrhWCUQ9kS2brLwJ/nJhY9P00IaeYFQiC2UEYqf71UskUw8i0BNw/33/q1lUYy6
+						VsyB6e6DKfCbunbrHgMyk4/qvOy2JfvGh+41qEJENYKaOqu00MDk0R7yzrMWXEIH
+						3TlWjRfFNTVhbVx6Di+CwcDEcXpQ2g==
+					</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 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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEwjCCA6qgAwIBAgIQTrh+jfRf1aCGSyqnZqrgqTANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDEyMjAwMDAwMFoXDTE2MDEyMjIzNTk1OVowgY0xCzAJBgNV
+						BAYTAkdCMRQwEgYDVQQIEwtFYXN0IFN1c3NleDEOMAwGA1UEBxMFTGV3ZXMxHTAb
+						BgNVBAoTFFN1c3NleCBEb3ducyBDb2xsZWdlMRkwFwYDVQQLExBOZXR3b3JrIFNl
+						cnZpY2VzMR4wHAYDVQQDExVpZHAuc3Vzc2V4ZG93bnMuYWMudWswggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzasViv6sqpPwhpSx5LMRX+IIZX/Us0+T6
+						Umeqz/zzATJ2oAq/Vc3K6vbkWHOqBRSHu81YTtubITgCVamjjeMRw2upCWP52z45
+						X4NG6uueNOxsHArEsI34nKumCJPpGi7g/yEI2t55MlXRKCjYx0SGXQ+HQVbS5+ck
+						7Xfg14J3ykCrVP20tg03VCWABX8HpFGs2jBXdaTMzJNPQDgUspBoahdaVdSAzPJH
+						rE+r6OzM39siItlYUuw6HROqUCNsPPBx5+weO/zzbaj1sfAxfuM7qq5E3v1uDXcC
+						sm9ci3Ai7sigirORZYWcbD1y1HeUgZFlUt9vW3lUyCrze3FKhkNvAgMBAAGjggFy
+						MIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+						stJtWpehWtVLmajr+G8NZ33QgaowDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+						MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYL
+						KwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9j
+						cmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEw
+						XzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
+						U0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3Jn
+						MCAGA1UdEQQZMBeCFWlkcC5zdXNzZXhkb3ducy5hYy51azANBgkqhkiG9w0BAQUF
+						AAOCAQEAX6a8z1WqpzNGKYLE3plawtzyMa8cwkvZnNvkAdyl0PSFF4ylEHBjF85n
+						0ZXE6FqIpLUZJxlKKfqj3CeIxFqX1noxKndZzu7QsxcspXU3ubPWVJBoJZ4XO4jr
+						G9Gw+R+kR5e3QfNDrCZKmU247vuvJIqnbF9NT+gm7IHBvFLnx+r3zxUpX4Ca8D8+
+						IkrhWCUQ9kS2brLwJ/nJhY9P00IaeYFQiC2UEYqf71UskUw8i0BNw/33/q1lUYy6
+						VsyB6e6DKfCbunbrHgMyk4/qvOy2JfvGh+41qEJENYKaOqu00MDk0R7yzrMWXEIH
+						3TlWjRfFNTVhbVx6Di+CwcDEcXpQ2g==
+					</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:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussexdowns.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md: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
new file mode 100644
index 00000000..c1ee9e26
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.swc.ac.uk-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						MTMwNjE4WhcNMzQwODI0MTMwNjE4WjBiMQswCQYDVQQGEwJHQjEOMAwGA1UECBMF
+						T21hZ2gxDjAMBgNVBAcTBU9tYWdoMRswGQYDVQQKExJTb3V0aCBXZXN0IENvbGxl
+						Z2UxFjAUBgNVBAMTDWlkcC5zd2MuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
+						DwAwggEKAoIBAQDfRdI+1tvJLEucskwIxU8aZ4GpSgS12PHYyaA6YKI6PI+BzyF9
+						zxDzTHC4pEmgbDy4OsuuWBKXutpqYP//R7BQVTDUwy+rqScHutNscaDModHdBqZG
+						WIn5U3WoXnbJRIVdf3nGqYg/Tde7aZtXijEzVIEncY4tzpZcNoLmNxxUJ5sqjYgD
+						ThU+yrm7yCD7WAPzY5BG5rPbqQKTNqokUpMQO0Bp90afq4YuYTlL34cepME+9JZb
+						By8HIWbLTPnVlV+Iy5eYRwE46towR+7CJWqAHUQlfouD5BkRypZ/dcsAJQjV2uaN
+						HCskJknk1jEbvQCN+k01ZaK+sWkr3V0/jFoTAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+						ggEBAMSwbpk+Q7HKvS5IsvFyU+zycSRCwfLcSLxheCd+ECXLXyrR/sXgI6FzdQ8G
+						nPYnR7Yhn4VzPGeB2lXRjeDYEu4hTFg5uMLoYaEBrDnZPqhJc7VInEjxVjuA1iGw
+						9agSL/K94P1FEC1xaLq2Jws+PyDnbsJuMzktVB2vRrh2/VV16vaKwl+7xH0gddHq
+						yrovo5mL2GAWed6UO8W0Yb3KKGJHkXRYMPHOSxE5DJ9cttZBVmwqhu242EDPQq+X
+						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>
+						MIIDQDCCAigCCQCSYynTzFCVFjANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJH
+						QjEOMAwGA1UECBMFT21hZ2gxDjAMBgNVBAcTBU9tYWdoMRswGQYDVQQKExJTb3V0
+						aCBXZXN0IENvbGxlZ2UxFjAUBgNVBAMTDWlkcC5zd2MuYWMudWswHhcNMTQwODI5
+						MTMwNjE4WhcNMzQwODI0MTMwNjE4WjBiMQswCQYDVQQGEwJHQjEOMAwGA1UECBMF
+						T21hZ2gxDjAMBgNVBAcTBU9tYWdoMRswGQYDVQQKExJTb3V0aCBXZXN0IENvbGxl
+						Z2UxFjAUBgNVBAMTDWlkcC5zd2MuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
+						DwAwggEKAoIBAQDfRdI+1tvJLEucskwIxU8aZ4GpSgS12PHYyaA6YKI6PI+BzyF9
+						zxDzTHC4pEmgbDy4OsuuWBKXutpqYP//R7BQVTDUwy+rqScHutNscaDModHdBqZG
+						WIn5U3WoXnbJRIVdf3nGqYg/Tde7aZtXijEzVIEncY4tzpZcNoLmNxxUJ5sqjYgD
+						ThU+yrm7yCD7WAPzY5BG5rPbqQKTNqokUpMQO0Bp90afq4YuYTlL34cepME+9JZb
+						By8HIWbLTPnVlV+Iy5eYRwE46towR+7CJWqAHUQlfouD5BkRypZ/dcsAJQjV2uaN
+						HCskJknk1jEbvQCN+k01ZaK+sWkr3V0/jFoTAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+						ggEBAMSwbpk+Q7HKvS5IsvFyU+zycSRCwfLcSLxheCd+ECXLXyrR/sXgI6FzdQ8G
+						nPYnR7Yhn4VzPGeB2lXRjeDYEu4hTFg5uMLoYaEBrDnZPqhJc7VInEjxVjuA1iGw
+						9agSL/K94P1FEC1xaLq2Jws+PyDnbsJuMzktVB2vRrh2/VV16vaKwl+7xH0gddHq
+						yrovo5mL2GAWed6UO8W0Yb3KKGJHkXRYMPHOSxE5DJ9cttZBVmwqhu242EDPQq+X
+						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>
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
new file mode 100644
index 00000000..d3798488
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.swindon-college.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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
+						bi1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						pLADxySQUYQAqTPNDee8t0Nxr4LUjG89PJO/3z22vTT+LW9P2Q1RvA31GVuYYcDz
+						VXwhHP/u7ySSASfZ1HyohubyJnx0VNriEh9gCZUXndCCUifFLqGng3Zs4KtITHSx
+						NpWv1JQ5GCLRXorN5qkVsnB5hXZ4RMLVA8bPierzzYZxHXtMEieDxIfWyUDGjVbA
+						qrfZg05SWFagA/+NvMrozUXj5q3IUbxi3NdVMSuaAkMmkLK5gXDdsDY0lTpTL7P0
+						xtbO4pYKrfMavPfnj/yS9KQ30XZFoZeKvWnzUEZb9nFw1oiUN9UrHBiBVU4s0mgu
+						GNjAf7RB20658r7cKRVITwIDAQABo3kwdzBWBgNVHREETzBNghlpZHAuc3dpbmRv
+						bi1jb2xsZWdlLmFjLnVrhjBodHRwczovL2lkcC5zd2luZG9uLWNvbGxlZ2UuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFP6Yp/0hH7uIYFCI3vZIoxKQpgxe
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBxK5J1DbN+OFP49i1Bhh6iLe/Lipa/UMv8BRI2
+						lQ7AGzUjI/7FR4CYz7m/jcO9GsZyFeTgtoUmtsCj6YQohEgm4lgYFD5MhGOuAOLp
+						FRgsbEMl5mzNd9TIPaAxUy+2prml7bKc/gMMAxxLBswPpvEkZa0FOLsRW4a/cdEm
+						ao5hW+LPBpQlLQZgyzYytj/jB6ljfLV7QXbeGACBJKeZL7Ang/yl6ZCtQW1EbofU
+						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>
+						MIIDUDCCAjigAwIBAgIVALJupNJrLD9f0qZUHM/Xl8rlpql8MA0GCSqGSIb3DQEB
+						BQUAMCQxIjAgBgNVBAMTGWlkcC5zd2luZG9uLWNvbGxlZ2UuYWMudWswHhcNMTIw
+						MzEzMDk0NTM3WhcNMzIwMzEzMDk0NTM3WjAkMSIwIAYDVQQDExlpZHAuc3dpbmRv
+						bi1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						pLADxySQUYQAqTPNDee8t0Nxr4LUjG89PJO/3z22vTT+LW9P2Q1RvA31GVuYYcDz
+						VXwhHP/u7ySSASfZ1HyohubyJnx0VNriEh9gCZUXndCCUifFLqGng3Zs4KtITHSx
+						NpWv1JQ5GCLRXorN5qkVsnB5hXZ4RMLVA8bPierzzYZxHXtMEieDxIfWyUDGjVbA
+						qrfZg05SWFagA/+NvMrozUXj5q3IUbxi3NdVMSuaAkMmkLK5gXDdsDY0lTpTL7P0
+						xtbO4pYKrfMavPfnj/yS9KQ30XZFoZeKvWnzUEZb9nFw1oiUN9UrHBiBVU4s0mgu
+						GNjAf7RB20658r7cKRVITwIDAQABo3kwdzBWBgNVHREETzBNghlpZHAuc3dpbmRv
+						bi1jb2xsZWdlLmFjLnVrhjBodHRwczovL2lkcC5zd2luZG9uLWNvbGxlZ2UuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFP6Yp/0hH7uIYFCI3vZIoxKQpgxe
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBxK5J1DbN+OFP49i1Bhh6iLe/Lipa/UMv8BRI2
+						lQ7AGzUjI/7FR4CYz7m/jcO9GsZyFeTgtoUmtsCj6YQohEgm4lgYFD5MhGOuAOLp
+						FRgsbEMl5mzNd9TIPaAxUy+2prml7bKc/gMMAxxLBswPpvEkZa0FOLsRW4a/cdEm
+						ao5hW+LPBpQlLQZgyzYytj/jB6ljfLV7QXbeGACBJKeZL7Ang/yl6ZCtQW1EbofU
+						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:computerservices@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
new file mode 100644
index 00000000..554e7c1b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sworcs.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,204 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-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-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>
+      <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 (Testing)</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>
+						MIIDLDCCAhSgAwIBAgIVAMBmzKWXYajA+5lcrW5Mg1lfTNGuMA0GCSqGSIb3DQEB
+						CwUAMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswHhcNMTUwMjA1MDkzNDEz
+						WhcNMzUwMjA1MDkzNDEzWjAbMRkwFwYDVQQDDBBpZHAuc3dvcmNzLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArEvWNYJ7gVZpZmulfiZv/Jnr
+						m/4Oqh2+JEWW0mw4wvw9GbgVVgOL2ppzt22QdCiF9Ry6BRoYTVGeuW2Poncp5jHT
+						qvmHXl6d0m6c+w/oTX8C5zwOs2c8kYHPDLwnqMoleuZTR7kK7GMs+DQoAn6+FXoH
+						9qanFHx1pL3BYvFGUDmwNh91XLvDuBLFsdN0LPDNA6fcE8TKkV8KGf049pyqDi55
+						pOo7IC1AcwZtm+HCH4s2lgFlQfRAmAK8u7+sBFzzHKb9Ey+DWlQSUKRbMhgeNXpZ
+						QfhX8+kn0ytuUojYjGtlkFCWOan/Sr1s8n0tVzWGwJIYN+mNnjZt/NHdcnGVvwID
+						AQABo2cwZTAdBgNVHQ4EFgQUHLtdodDvur7nmtVtQmi4QX51nQYwRAYDVR0RBD0w
+						O4IQaWRwLnN3b3Jjcy5hYy51a4YnaHR0cHM6Ly9pZHAuc3dvcmNzLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCbQ+3/saWmn1SDsIuL+Lj+
+						QaZd0iJDzC9h2Itgcfj3IU9rqQTU9mOiSJb9dJokLWJBRc9zCQgMXtlK7Qx9PVJM
+						CkR0VXU7+0JbNhcROY0dXVam6MZbI/zkmDjtALLayWk7XbTwCrli75BnqANPdMB4
+						NNP+l0tyYjoJB5BZ1jpUVOJjDliQ2iDJIBHo+TeklaLDTyTqep5zXD8gYtmbGxeF
+						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>
+						MIIDLDCCAhSgAwIBAgIVALRHbvHVOp59HaRxJ3BO3VYBu6htMA0GCSqGSIb3DQEB
+						CwUAMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswHhcNMTUwMjA1MDkzMzU0
+						WhcNMzUwMjA1MDkzMzU0WjAbMRkwFwYDVQQDDBBpZHAuc3dvcmNzLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmKOzw9xaYI3e4NtFEc8L+xls
+						zHjKwKLMEIDi84hDgIbChj80niWrgiYde2qJB+YlvsOKMMahmhTty88FaQQd8jAL
+						tBC/kp1Ki/uyD0bEdAZ2H6bC0ybfslf5JjwYZM3v6/Ycp2juSvi4FEbqSsjO3s6y
+						9X6mE8uINSHnVIcmrOMfHXmQZVega2KO/COQrn6WjYSoPrkRYqGieX0Se+LEHfrA
+						6TgG/k8l2tz6ldb64LOJX62ydGhPL4k+SjlrNX6CdEvKz6CPYKDm/HGL8g7hrjO3
+						bafMnOZCRYOaV/OaOtH0+Ia0ZgtZVhlu+DreODcrKIUBy1Z5PWX2YcHVDrIj4QID
+						AQABo2cwZTAdBgNVHQ4EFgQUDHIUiGmDeB+koqGpa3wsSGlmRi8wRAYDVR0RBD0w
+						O4IQaWRwLnN3b3Jjcy5hYy51a4YnaHR0cHM6Ly9pZHAuc3dvcmNzLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQB3bZTeetJmBbRWFXk7zfyI
+						t2zvL4k9V6aaH0SgUj4m1YbToGAedIsGXhCkbYAsgFFpylnQbG6u02RJTDHJ7lyN
+						VhAhv/1FCLW/MVINSL93ciejFPOjBbZiU1iYNaI/5Cmk7yNytIJAVYn+HLWKc2GJ
+						FvS3dsCkf7Td+Gnri398qnSObI3WOQhWwj1o/SIUJ5NqoJk9XHJj/6pkvkbQzzdU
+						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>
+						MIIDKzCCAhOgAwIBAgIUR2mkXU3i/AK0KOIvY/W7Q557Ig8wDQYJKoZIhvcNAQEL
+						BQAwGzEZMBcGA1UEAwwQaWRwLnN3b3Jjcy5hYy51azAeFw0xNTAyMDUwOTM0MTJa
+						Fw0zNTAyMDUwOTM0MTJaMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqKUhOBtt5q7ETDkUjbD/KENaE
+						rKtUaexbH5DzSolqsIOC4Ca1t6NVA92jDrl7iSy3CxoOS6KtOAfvjrlQ9oMOjQgS
+						vwsvIeeFzyRnVwaQgR410Zoe/xDI6kS13dLKnKjgaz6j8bCtLvT1VKb27X8wtocF
+						ZqIasmQLh5kpEP9h5NpXrPIPeE/VfG5h5b6KcaNXjxI0x9lhkQY+t+R9+CM+Pxho
+						RIOZ5yzGVYxpd8iwSTg+VEI/nQ09pdvGRNC/EcFocLMT/VT8+CPVwWuoUhXopl6s
+						IpTuiVJk3+oi0DGKqoK7NxSFcxmeBSWFa4oUbP/j/Cqa6rG5rz9jOetJsWklAgMB
+						AAGjZzBlMB0GA1UdDgQWBBQMt9lBmt9Tpm4HNoBLsmj7oYIoXDBEBgNVHREEPTA7
+						ghBpZHAuc3dvcmNzLmFjLnVrhidodHRwczovL2lkcC5zd29yY3MuYWMudWsvaWRw
+						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGTTeBRCg+PawgdgFHEe46VQ
+						rBXhVm+h5LfaNXTlhKf3MD7AKTddVDOyNfhWX67aAQKO6C4r5sEKrCbzIi8w7y8H
+						i3bSt17awmx58GPcSPICWGdlty8gkvaB+85QCLl3rURn9BwHyBs83mus3qiF1XfR
+						0I1Sf1iOiBIn6YxOq6CpNLkPBVoo6kCZEgSs6pCAHRY51uZkiGrO9oGcGdS8W8Ql
+						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>
+						MIIDLDCCAhSgAwIBAgIVAMBmzKWXYajA+5lcrW5Mg1lfTNGuMA0GCSqGSIb3DQEB
+						CwUAMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswHhcNMTUwMjA1MDkzNDEz
+						WhcNMzUwMjA1MDkzNDEzWjAbMRkwFwYDVQQDDBBpZHAuc3dvcmNzLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArEvWNYJ7gVZpZmulfiZv/Jnr
+						m/4Oqh2+JEWW0mw4wvw9GbgVVgOL2ppzt22QdCiF9Ry6BRoYTVGeuW2Poncp5jHT
+						qvmHXl6d0m6c+w/oTX8C5zwOs2c8kYHPDLwnqMoleuZTR7kK7GMs+DQoAn6+FXoH
+						9qanFHx1pL3BYvFGUDmwNh91XLvDuBLFsdN0LPDNA6fcE8TKkV8KGf049pyqDi55
+						pOo7IC1AcwZtm+HCH4s2lgFlQfRAmAK8u7+sBFzzHKb9Ey+DWlQSUKRbMhgeNXpZ
+						QfhX8+kn0ytuUojYjGtlkFCWOan/Sr1s8n0tVzWGwJIYN+mNnjZt/NHdcnGVvwID
+						AQABo2cwZTAdBgNVHQ4EFgQUHLtdodDvur7nmtVtQmi4QX51nQYwRAYDVR0RBD0w
+						O4IQaWRwLnN3b3Jjcy5hYy51a4YnaHR0cHM6Ly9pZHAuc3dvcmNzLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCbQ+3/saWmn1SDsIuL+Lj+
+						QaZd0iJDzC9h2Itgcfj3IU9rqQTU9mOiSJb9dJokLWJBRc9zCQgMXtlK7Qx9PVJM
+						CkR0VXU7+0JbNhcROY0dXVam6MZbI/zkmDjtALLayWk7XbTwCrli75BnqANPdMB4
+						NNP+l0tyYjoJB5BZ1jpUVOJjDliQ2iDJIBHo+TeklaLDTyTqep5zXD8gYtmbGxeF
+						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>
+						MIIDLDCCAhSgAwIBAgIVALRHbvHVOp59HaRxJ3BO3VYBu6htMA0GCSqGSIb3DQEB
+						CwUAMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswHhcNMTUwMjA1MDkzMzU0
+						WhcNMzUwMjA1MDkzMzU0WjAbMRkwFwYDVQQDDBBpZHAuc3dvcmNzLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmKOzw9xaYI3e4NtFEc8L+xls
+						zHjKwKLMEIDi84hDgIbChj80niWrgiYde2qJB+YlvsOKMMahmhTty88FaQQd8jAL
+						tBC/kp1Ki/uyD0bEdAZ2H6bC0ybfslf5JjwYZM3v6/Ycp2juSvi4FEbqSsjO3s6y
+						9X6mE8uINSHnVIcmrOMfHXmQZVega2KO/COQrn6WjYSoPrkRYqGieX0Se+LEHfrA
+						6TgG/k8l2tz6ldb64LOJX62ydGhPL4k+SjlrNX6CdEvKz6CPYKDm/HGL8g7hrjO3
+						bafMnOZCRYOaV/OaOtH0+Ia0ZgtZVhlu+DreODcrKIUBy1Z5PWX2YcHVDrIj4QID
+						AQABo2cwZTAdBgNVHQ4EFgQUDHIUiGmDeB+koqGpa3wsSGlmRi8wRAYDVR0RBD0w
+						O4IQaWRwLnN3b3Jjcy5hYy51a4YnaHR0cHM6Ly9pZHAuc3dvcmNzLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQB3bZTeetJmBbRWFXk7zfyI
+						t2zvL4k9V6aaH0SgUj4m1YbToGAedIsGXhCkbYAsgFFpylnQbG6u02RJTDHJ7lyN
+						VhAhv/1FCLW/MVINSL93ciejFPOjBbZiU1iYNaI/5Cmk7yNytIJAVYn+HLWKc2GJ
+						FvS3dsCkf7Td+Gnri398qnSObI3WOQhWwj1o/SIUJ5NqoJk9XHJj/6pkvkbQzzdU
+						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>
+						MIIDKzCCAhOgAwIBAgIUR2mkXU3i/AK0KOIvY/W7Q557Ig8wDQYJKoZIhvcNAQEL
+						BQAwGzEZMBcGA1UEAwwQaWRwLnN3b3Jjcy5hYy51azAeFw0xNTAyMDUwOTM0MTJa
+						Fw0zNTAyMDUwOTM0MTJaMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqKUhOBtt5q7ETDkUjbD/KENaE
+						rKtUaexbH5DzSolqsIOC4Ca1t6NVA92jDrl7iSy3CxoOS6KtOAfvjrlQ9oMOjQgS
+						vwsvIeeFzyRnVwaQgR410Zoe/xDI6kS13dLKnKjgaz6j8bCtLvT1VKb27X8wtocF
+						ZqIasmQLh5kpEP9h5NpXrPIPeE/VfG5h5b6KcaNXjxI0x9lhkQY+t+R9+CM+Pxho
+						RIOZ5yzGVYxpd8iwSTg+VEI/nQ09pdvGRNC/EcFocLMT/VT8+CPVwWuoUhXopl6s
+						IpTuiVJk3+oi0DGKqoK7NxSFcxmeBSWFa4oUbP/j/Cqa6rG5rz9jOetJsWklAgMB
+						AAGjZzBlMB0GA1UdDgQWBBQMt9lBmt9Tpm4HNoBLsmj7oYIoXDBEBgNVHREEPTA7
+						ghBpZHAuc3dvcmNzLmFjLnVrhidodHRwczovL2lkcC5zd29yY3MuYWMudWsvaWRw
+						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGTTeBRCg+PawgdgFHEe46VQ
+						rBXhVm+h5LfaNXTlhKf3MD7AKTddVDOyNfhWX67aAQKO6C4r5sEKrCbzIi8w7y8H
+						i3bSt17awmx58GPcSPICWGdlty8gkvaB+85QCLl3rURn9BwHyBs83mus3qiF1XfR
+						0I1Sf1iOiBIn6YxOq6CpNLkPBVoo6kCZEgSs6pCAHRY51uZkiGrO9oGcGdS8W8Ql
+						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 (Testing)</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.sze.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.xml
new file mode 100644
index 00000000..ce225309
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sze.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"/>
+      <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>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAOdmgiuOmsyG0E988guPIMBUjJtTMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5zemUuaHUwHhcNMTEwNTA1MDg0ODAxWhcNMzEw
+NTA1MDg0ODAxWjAVMRMwEQYDVQQDEwppZHAuc3plLmh1MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEApcyXIVSgRNHxWV+T1wJwWoGT5tIcb90UUX+US7PT
+8pT9OjTj8Ihx1UW6nVWwf2VhSwYoRGrDkzPKwSd6mDbmQr1fmlxPRByxJw1jJWY3
+Qz4lVEazNK7WDlNswqxQdDNjS/iQOMYAj9s4SerZGnNLuhIQM7DSh2dxpyidGyjJ
+ouhqq3cqpzUk/5WEcoUblXhJlX22iCBeSjay7MzVoIHfSSaWCeQCD4hEScQDDfJX
+SDOF9edhOCogA51eMZR/j/HzvP+G0E7E4v25HUKl1r2a+/wSRziv5v4b79B0pwwE
+QzQ7Riq8kCyxJRRF2BRj0eGNaoC2aM8nh+u7UxqVqlP8nQIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuc3plLmh1hiFodHRwczovL2lkcC5zemUuaHUvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFLEnpKVtW3BAbuNKj5XjDx4dgkpCMA0GCSqGSIb3DQEB
+BQUAA4IBAQAwn6lCoBZp10wWRdbxDffHh19pPhdV21WqA2PmdfHcoQMVKQyZJEUs
+jYr6CDdf/IvTAnm4rS9pLPJYR/OH+5Qbmaxh3fnrloC31V5m4grHjtC3vpdopzXK
+q0ybme0lyT/nx/bgjrWg+TEEc5BRNr0maOARkbhd3pmY6Cf5xY0IgdoNmmXyL74V
+/ZRa7RtjFMyDJvDXdrpv4ltJEh6x+Obn9AHspTBfOOGLVeNOmP+jxQARDoqbuRLr
+OSuW+Ic/02Yf5OzC2P/EXX4ZgKla1bfKGxI3tL/aEzSL4TUXsy/FLdnWt3YnUqjG
+5yWCQ9QnXtlAO1oCYYabYMKqmVcBQAYg
+                                            </ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.sze.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sze.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution"/>
+    <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:Extensions>
+      <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>
+MIIDFDCCAfygAwIBAgIVAOdmgiuOmsyG0E988guPIMBUjJtTMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5zemUuaHUwHhcNMTEwNTA1MDg0ODAxWhcNMzEw
+NTA1MDg0ODAxWjAVMRMwEQYDVQQDEwppZHAuc3plLmh1MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEApcyXIVSgRNHxWV+T1wJwWoGT5tIcb90UUX+US7PT
+8pT9OjTj8Ihx1UW6nVWwf2VhSwYoRGrDkzPKwSd6mDbmQr1fmlxPRByxJw1jJWY3
+Qz4lVEazNK7WDlNswqxQdDNjS/iQOMYAj9s4SerZGnNLuhIQM7DSh2dxpyidGyjJ
+ouhqq3cqpzUk/5WEcoUblXhJlX22iCBeSjay7MzVoIHfSSaWCeQCD4hEScQDDfJX
+SDOF9edhOCogA51eMZR/j/HzvP+G0E7E4v25HUKl1r2a+/wSRziv5v4b79B0pwwE
+QzQ7Riq8kCyxJRRF2BRj0eGNaoC2aM8nh+u7UxqVqlP8nQIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuc3plLmh1hiFodHRwczovL2lkcC5zemUuaHUvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFLEnpKVtW3BAbuNKj5XjDx4dgkpCMA0GCSqGSIb3DQEB
+BQUAA4IBAQAwn6lCoBZp10wWRdbxDffHh19pPhdV21WqA2PmdfHcoQMVKQyZJEUs
+jYr6CDdf/IvTAnm4rS9pLPJYR/OH+5Qbmaxh3fnrloC31V5m4grHjtC3vpdopzXK
+q0ybme0lyT/nx/bgjrWg+TEEc5BRNr0maOARkbhd3pmY6Cf5xY0IgdoNmmXyL74V
+/ZRa7RtjFMyDJvDXdrpv4ltJEh6x+Obn9AHspTBfOOGLVeNOmP+jxQARDoqbuRLr
+OSuW+Ic/02Yf5OzC2P/EXX4ZgKla1bfKGxI3tL/aEzSL4TUXsy/FLdnWt3YnUqjG
+5yWCQ9QnXtlAO1oCYYabYMKqmVcBQAYg
+						</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 University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">Széchenyi István Egyetem</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Széchenyi István University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.sze.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.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
new file mode 100644
index 00000000..56e9ee7c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml
@@ -0,0 +1,75 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szie.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">Szent István Egyetem</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Szent István University</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Szent István Egyetem</mdui:Description>
+        <mdui:Description xml:lang="en">Szent István University</mdui:Description>
+        <mdui:Logo height="78" width="111">https://idp.szie.hu/idp/szie-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>
+MIIDFzCCAf+gAwIBAgIUSscIknb+7vqGVUw6Kl9kxz2bcWAwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwLnN6aWUuaHUwHhcNMTAxMTA4MTExOTEzWhcNMzAx
+MTA4MTExOTEzWjAWMRQwEgYDVQQDEwtpZHAuc3ppZS5odTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJ3NmFZGZxB5neVKIfq5+RTZO1apk0MNGinQYVD8
+T9PXXm4g4d8ZkNAdY/eUW8z3IdkStf0I/7imKjnnC4Px5ImUJ4tOblJ1n1DDYmqY
+f7ivNuM89gpt8yE+ffGa/EZeGizeVLJLDT0X3+k22otLEZt3s/gDgCRBal80VtiE
+0IPT9y2L9XOyzzawRAWlfnjCxBrQiJb35OlUnctOHGc4004Jp+3O9xCr9lOqO/Ua
+QPKpTUFQvK9NIBaV8VqCA62+SQsiSjWtg8Rc/AcdBjrmVcMrU8mia26VyRwtZ0vZ
+pIlpiUhKnuwmWuFMJvAymXI74OwrmYkudzqGgvbk+N10snMCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwLnN6aWUuaHWGImh0dHBzOi8vaWRwLnN6aWUuaHUvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFJ/ZbxqsxhPifPOOGn+OHtet0wYvMA0GCSqGSIb3
+DQEBBQUAA4IBAQBHjf0B9D8VtyZu2zstLmGw9Mw+f/dRxOBhzXLJVMxHa3XDykxX
+1MeG70nKFlSz/UsFy/2jH1zU8E/2WLQDGPu6kZtjuxD1xihyJ5bPTHWfn5IlNHjy
+dMoOt4CnC1xTYB9ObhKqATdVFJMXdRegCpasOV4gLfdFGIneU9YhSB9WFCISjvE7
+6iUJbwsitPtRcDfIqsTFnrwDWbeZhEtlmHp0W71JSkrmCOP9tbiyfH7ujW/DLHuH
+Ra1rxiZYGDKvI3sfwjqRnHkBOTWvs/h7xIQxDUJWwkX0JyVSIp4YuhfSTxVq+cWm
+tLHfaisY7nSEECcM4m6U2T5YmnogM2Rw8Vqc
+                                            </ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.szie.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.szie.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.szie.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.szie.hu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.szie.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/idp/profile/SAML2/Redirect/SSO"/>
+  </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.ta.belnet.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ta.belnet.be-idp-shibboleth.xml
new file mode 100644
index 00000000..ffe2a48e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ta.belnet.be-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-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.ta.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ta.belnet.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Belnet Technical Advisors</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Technical Advisors test infra for customers workshops</mdui:Description>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.191.128.64/26</mdui:IPHint>
+        <mdui:IPHint>2001:6a8:e80:0::/48</mdui:IPHint>
+        <mdui:DomainHint>ta.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>
+
+MIIDKzCCAhOgAwIBAgIUEUEZDGqjNfKukFfppYWY6Nuvmd0wDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQaWRwLnRhLmJlbG5ldC5iZTAeFw0xNTAyMTYxNTA5NDBa
+Fw0zNTAyMTYxNTA5NDBaMBsxGTAXBgNVBAMTEGlkcC50YS5iZWxuZXQuYmUwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe+K+stoVDx1upw+KpAeFMGvmh
+427wXk1etEQ4Aym2abP42RypkE4oMy9MJ6EVLP4+hwj9YvLL0CWLi0v+9Jg9ixbR
+1RH5RY3aJoUWHASoV0iyoFs2MB+5XkRt/VA7EGRNFbT1BLuWKjWKZS8knE5GcJw0
+3ER7PGdaP+FFhXyfNoA88xybjI7Xq/N/4f1Dg5bJ0yFZV6nW3hXRx7h5hD2sbz6J
+Olh5XaepbWrI93+TQ5dZJ/EQWPz+Gv5evRA42ZrZMB6d1FZwii4eZUPPreOOGrhI
+1+ANwmXCX6bnzu34c4hH/bsXOzc99aSLXQoYsX4vr0UnI21ZOJVUGRAg0rVzAgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC50YS5iZWxuZXQuYmWGJ2h0dHBzOi8vaWRw
+LnRhLmJlbG5ldC5iZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjfpKnrtzekXc
+imJB5lS/NNpSshUwDQYJKoZIhvcNAQEFBQADggEBAB2PAXlLZNK/lWTytZb+A0RR
+0PvjSRtRMGyhv7A6w+3wthMk2eEyvPGSBDS9VPKCHgy4bSGcToM+MdNGuk5wO7Ve
+2+3Z3gDTTyHbVeXHTFNTbCJ567oRnXdJtEPTUwgmLgcXzp2TeU9jhklAmLLMfVYt
+vEapHf2YT2sTLfMVLSpWu8khcTvcEGY7MueTmJ2xLOKo34eIAntiJhoZZb9Z4kx2
+kfgaqkCPwGS+CTeTjyPx79d40qT4CnyWjBeQlZbXheU5Edt/dWU/Z0GPfR2gweej
+/twrx9GPlAFErvOmqrUdsAldbeIkJXb0rVvyjvp8kpw7ZURp5XQNPpFaDJElRn8=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ta.belnet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ta.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:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ta.belnet.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ta.belnet.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ta.belnet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ta.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">ta.belnet.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+
+MIIDKzCCAhOgAwIBAgIUEUEZDGqjNfKukFfppYWY6Nuvmd0wDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQaWRwLnRhLmJlbG5ldC5iZTAeFw0xNTAyMTYxNTA5NDBa
+Fw0zNTAyMTYxNTA5NDBaMBsxGTAXBgNVBAMTEGlkcC50YS5iZWxuZXQuYmUwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe+K+stoVDx1upw+KpAeFMGvmh
+427wXk1etEQ4Aym2abP42RypkE4oMy9MJ6EVLP4+hwj9YvLL0CWLi0v+9Jg9ixbR
+1RH5RY3aJoUWHASoV0iyoFs2MB+5XkRt/VA7EGRNFbT1BLuWKjWKZS8knE5GcJw0
+3ER7PGdaP+FFhXyfNoA88xybjI7Xq/N/4f1Dg5bJ0yFZV6nW3hXRx7h5hD2sbz6J
+Olh5XaepbWrI93+TQ5dZJ/EQWPz+Gv5evRA42ZrZMB6d1FZwii4eZUPPreOOGrhI
+1+ANwmXCX6bnzu34c4hH/bsXOzc99aSLXQoYsX4vr0UnI21ZOJVUGRAg0rVzAgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC50YS5iZWxuZXQuYmWGJ2h0dHBzOi8vaWRw
+LnRhLmJlbG5ldC5iZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjfpKnrtzekXc
+imJB5lS/NNpSshUwDQYJKoZIhvcNAQEFBQADggEBAB2PAXlLZNK/lWTytZb+A0RR
+0PvjSRtRMGyhv7A6w+3wthMk2eEyvPGSBDS9VPKCHgy4bSGcToM+MdNGuk5wO7Ve
+2+3Z3gDTTyHbVeXHTFNTbCJ567oRnXdJtEPTUwgmLgcXzp2TeU9jhklAmLLMfVYt
+vEapHf2YT2sTLfMVLSpWu8khcTvcEGY7MueTmJ2xLOKo34eIAntiJhoZZb9Z4kx2
+kfgaqkCPwGS+CTeTjyPx79d40qT4CnyWjBeQlZbXheU5Edt/dWU/Z0GPfR2gweej
+/twrx9GPlAFErvOmqrUdsAldbeIkJXb0rVvyjvp8kpw7ZURp5XQNPpFaDJElRn8=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ta.belnet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ta.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:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">
+		Belnet TA Lab
+	</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">
+		Belnet TA Lab
+	</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">
+		http://www.ta.belnet.be/drupal
+	</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nicolas Loriau</md:GivenName>
+    <md:SurName>Nicolas Loriau</md:SurName>
+    <md:EmailAddress>nicolas@belnet.be</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
new file mode 100644
index 00000000..e2a29097
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.tavistockandportman.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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
+						BAMMHWlkcC50YXZpc3RvY2thbmRwb3J0bWFuLmFjLnVrMB4XDTEyMDYyMjA4NDcw
+						MFoXDTMyMDYxNzA4NDcwMFowgYwxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIDAZMb25k
+						b24xDzANBgNVBAcMBkxvbmRvbjEzMDEGA1UECgwqVGF2aXN0b2NrIGFuZCBQb3J0
+						bWFuIE5IUyBGb3VuZGF0aW9uIFRydXN0MSYwJAYDVQQDDB1pZHAudGF2aXN0b2Nr
+						YW5kcG9ydG1hbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						ALaORMj2PIj4Nccnr5Qtz0aeSgHMOff3ExVO/4gX+hDpGampkME22nOfYB6uFT7V
+						koU5pQn1kEenWPdFx6pyDimK9iK7i7Vl5di7L8DYZbPtnRfO7J1ZQI/NpR7ivZdW
+						78EkIvx+mweAg0DTSNKbP6FVrTI7b95qwmfaabPECorDwUq8urP5keITNIo+Amcm
+						xwVECLUYUYtivommlQsY8zfUpuKWRnBnINKL29IWWbRdNLOsR0MMTneOtGlRBOgl
+						HeVsd6NRnMNayUrYrVGcxCZCA+G4KLEY7RUy23Xw0zfgGgBg5q9lWuB4eOboHd9b
+						LoVSYHQP9syEzbhyV/CXZgsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAi8ISBQ1z
+						HpD7czu+OrPV3379rSOWTAeASEcgY2ugJW1oEOq6sQlH1wD2vpWRp5TY8XvLhmwD
+						md7iBNR+X2wY5VPQsyWbp8DJsG9mKwAkM6XBY2/E56wvo6eobIXmCFtPPEgERyRf
+						jILYvxnwb5yNkzabPrBM287pWMt40EZV+HZBNqf95M863bgRl7SDoMzO+SFkkIwJ
+						RcJykK333j5BFRLgRgwAUuISKxxKbgvMg8T4nh4jIM+YlYahegLF/GHCw3ZWG2Dk
+						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>
+						MIIDljCCAn4CCQC25DQCsFybpjANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
+						R0IxDzANBgNVBAgMBkxvbmRvbjEPMA0GA1UEBwwGTG9uZG9uMTMwMQYDVQQKDCpU
+						YXZpc3RvY2sgYW5kIFBvcnRtYW4gTkhTIEZvdW5kYXRpb24gVHJ1c3QxJjAkBgNV
+						BAMMHWlkcC50YXZpc3RvY2thbmRwb3J0bWFuLmFjLnVrMB4XDTEyMDYyMjA4NDcw
+						MFoXDTMyMDYxNzA4NDcwMFowgYwxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIDAZMb25k
+						b24xDzANBgNVBAcMBkxvbmRvbjEzMDEGA1UECgwqVGF2aXN0b2NrIGFuZCBQb3J0
+						bWFuIE5IUyBGb3VuZGF0aW9uIFRydXN0MSYwJAYDVQQDDB1pZHAudGF2aXN0b2Nr
+						YW5kcG9ydG1hbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						ALaORMj2PIj4Nccnr5Qtz0aeSgHMOff3ExVO/4gX+hDpGampkME22nOfYB6uFT7V
+						koU5pQn1kEenWPdFx6pyDimK9iK7i7Vl5di7L8DYZbPtnRfO7J1ZQI/NpR7ivZdW
+						78EkIvx+mweAg0DTSNKbP6FVrTI7b95qwmfaabPECorDwUq8urP5keITNIo+Amcm
+						xwVECLUYUYtivommlQsY8zfUpuKWRnBnINKL29IWWbRdNLOsR0MMTneOtGlRBOgl
+						HeVsd6NRnMNayUrYrVGcxCZCA+G4KLEY7RUy23Xw0zfgGgBg5q9lWuB4eOboHd9b
+						LoVSYHQP9syEzbhyV/CXZgsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAi8ISBQ1z
+						HpD7czu+OrPV3379rSOWTAeASEcgY2ugJW1oEOq6sQlH1wD2vpWRp5TY8XvLhmwD
+						md7iBNR+X2wY5VPQsyWbp8DJsG9mKwAkM6XBY2/E56wvo6eobIXmCFtPPEgERyRf
+						jILYvxnwb5yNkzabPrBM287pWMt40EZV+HZBNqf95M863bgRl7SDoMzO+SFkkIwJ
+						RcJykK333j5BFRLgRgwAUuISKxxKbgvMg8T4nh4jIM+YlYahegLF/GHCw3ZWG2Dk
+						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>
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
new file mode 100644
index 00000000..1d969cd2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.tcat.ac.uk-oala-metadata.xml
@@ -0,0 +1,84 @@
+<?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>
+      <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>
+						MIIDaDCCAlCgAwIBAgIIWpJECkilqdowDQYJKoZIhvcNAQEFBQAwSzEvMC0GA1UE
+						CgwmVGVsZm9yZCBDb2xsZWdlIG9mIEFydHMgYW5kIFRlY2hub2xvZ3kxGDAWBgNV
+						BAMMD2lkcDIudGNhdC5hYy51azAeFw0xMzA4MjAxMTI0MzBaFw0yMzA4MjAxMTI0
+						MzBaMEsxLzAtBgNVBAoMJlRlbGZvcmQgQ29sbGVnZSBvZiBBcnRzIGFuZCBUZWNo
+						bm9sb2d5MRgwFgYDVQQDDA9pZHAyLnRjYXQuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCM6yXyJFdoHtZY/JvyoKUBBRpn6+9ciHnrgfSRvxk1
+						IrR2yEI/2uKOQXj7XPbRooV5zDSmVNgi5PCqX2mGrsK7TvGm7ErDiPzTo3wZ+d6M
+						gK6eFyPF+zCFdN+bq6EUnJbNVxJx03m7bmEa9tj732wCQiRnFYYvY0SCgmCcQE4p
+						/Pv/fWn2lsht+grH+bYQapvhHZKM47LH9CwGnNsIoEiWN5Xe7WExePoWauYjZPHI
+						3bNh7TKAnUEqDU5bTslo8+TSGXAV4PbjV3pMrpHWX4Q6PyqVL0QqbnyPdhnw5CQO
+						3rSunhabwfrvmonKqm75ncxgR8hj4T4V+7ThOv6TPiJTAgMBAAGjUDBOMB0GA1Ud
+						DgQWBBTsqWb0IynqtvhffnZEQcX9kyo0tzAfBgNVHSMEGDAWgBTsqWb0Iynqtvhf
+						fnZEQcX9kyo0tzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAbBH4t
+						ioCdwNeszwXFNJmALyEM/yNt1hcz7QB0uJ8vNKSIMAUnj9mbVNSeQ8Xinud7ddfV
+						rZIsmGroOQU1mCJOTz0bILevkqcuKF3UVlORGDebwmhZLYFeTJoF398MjmPbEHDI
+						hc8rggLnfS++ynld8+UleByLNsoBd0wJf/SChKVMIcVFwp9t+HU2RPi+teT6J5Jy
+						AHwJeql0aDMWoj/8OoSWqgLmHpKa2WxxPAeHvfRUu6rx5Dz6zC6BY1tKtOLhkNDK
+						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>
+						MIIDaDCCAlCgAwIBAgIIWpJECkilqdowDQYJKoZIhvcNAQEFBQAwSzEvMC0GA1UE
+						CgwmVGVsZm9yZCBDb2xsZWdlIG9mIEFydHMgYW5kIFRlY2hub2xvZ3kxGDAWBgNV
+						BAMMD2lkcDIudGNhdC5hYy51azAeFw0xMzA4MjAxMTI0MzBaFw0yMzA4MjAxMTI0
+						MzBaMEsxLzAtBgNVBAoMJlRlbGZvcmQgQ29sbGVnZSBvZiBBcnRzIGFuZCBUZWNo
+						bm9sb2d5MRgwFgYDVQQDDA9pZHAyLnRjYXQuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCM6yXyJFdoHtZY/JvyoKUBBRpn6+9ciHnrgfSRvxk1
+						IrR2yEI/2uKOQXj7XPbRooV5zDSmVNgi5PCqX2mGrsK7TvGm7ErDiPzTo3wZ+d6M
+						gK6eFyPF+zCFdN+bq6EUnJbNVxJx03m7bmEa9tj732wCQiRnFYYvY0SCgmCcQE4p
+						/Pv/fWn2lsht+grH+bYQapvhHZKM47LH9CwGnNsIoEiWN5Xe7WExePoWauYjZPHI
+						3bNh7TKAnUEqDU5bTslo8+TSGXAV4PbjV3pMrpHWX4Q6PyqVL0QqbnyPdhnw5CQO
+						3rSunhabwfrvmonKqm75ncxgR8hj4T4V+7ThOv6TPiJTAgMBAAGjUDBOMB0GA1Ud
+						DgQWBBTsqWb0IynqtvhffnZEQcX9kyo0tzAfBgNVHSMEGDAWgBTsqWb0Iynqtvhf
+						fnZEQcX9kyo0tzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAbBH4t
+						ioCdwNeszwXFNJmALyEM/yNt1hcz7QB0uJ8vNKSIMAUnj9mbVNSeQ8Xinud7ddfV
+						rZIsmGroOQU1mCJOTz0bILevkqcuKF3UVlORGDebwmhZLYFeTJoF398MjmPbEHDI
+						hc8rggLnfS++ynld8+UleByLNsoBd0wJf/SChKVMIcVFwp9t+HU2RPi+teT6J5Jy
+						AHwJeql0aDMWoj/8OoSWqgLmHpKa2WxxPAeHvfRUu6rx5Dz6zC6BY1tKtOLhkNDK
+						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>
diff --git a/swamid-interfederations-2.0/idp.tcat.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.tcat.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..a637ea70
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.tcat.ac.uk-shibboleth.xml
@@ -0,0 +1,110 @@
+<?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/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-09-05T15: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tcat.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEADCCAugCCQCwjoaBYKCfJzANBgkqhkiG9w0BAQUFADCBwTELMAkGA1UEBhMC
+						R0IxEzARBgNVBAgTClNocm9wc2hpcmUxEDAOBgNVBAcTB1RlbGZvcmQxLTArBgNV
+						BAoMJFRlbGZvcmQgQ29sbGVnZSBvZiBBcnRzICYgVGVjaG5vbG9neTEaMBgGA1UE
+						CxMRQ29tcHV0ZXIgU2VydmljZXMxFzAVBgNVBAMTDmlkcC50Y2F0LmFjLnVrMScw
+						JQYJKoZIhvcNAQkBFhhwYXVsLmZsYW5kZXJzQHRjYXQuYWMudWswHhcNMTQwNzE1
+						MTUxMzE1WhcNMjQwNzEyMTUxMzE1WjCBwTELMAkGA1UEBhMCR0IxEzARBgNVBAgT
+						ClNocm9wc2hpcmUxEDAOBgNVBAcTB1RlbGZvcmQxLTArBgNVBAoMJFRlbGZvcmQg
+						Q29sbGVnZSBvZiBBcnRzICYgVGVjaG5vbG9neTEaMBgGA1UECxMRQ29tcHV0ZXIg
+						U2VydmljZXMxFzAVBgNVBAMTDmlkcC50Y2F0LmFjLnVrMScwJQYJKoZIhvcNAQkB
+						FhhwYXVsLmZsYW5kZXJzQHRjYXQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
+						DwAwggEKAoIBAQDwEPad4kYnJdollfR+J9PakClAmKbQKKHQt5gTIotM/5YWnQKv
+						MuNgZmBlgP4u5j7HcI2x3GHt6SD8PDrhACRnHUlVAOsH7AtkHpzX0k5Lawes8DBV
+						JmCMwUOSoboO3Kf4Niu0fzMJ2ou+Cwz7JXrV6KjJP4GgkakZIgG6ntpRsY7X3zPU
+						b5GaSsC2boxY3snewwnFQ/yg5EleBo3hvAr0WzN+pu2UsG0kRd1GdMIPf32XWl8o
+						V9+ZzDqxVjzJNHGfaelo6+1oOVubEg4TFUVLC0QyMhMx94tz2Yi7sKItonzrzrVq
+						HcHtKA41ZpCYlgV5wxXJ7QVVgGene/ietIbVAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+						ggEBAAHHT1eun1pip4eal05s9EaRBXrSAhE9+qrUNpw26FwTqMdVuwHzadYD1OAy
+						NIj9Kvzb0Beg5cDbvKZwVZGJq2ggEN2OBe8jEfOpDdAySaPFPGqtjpK+prpN5Tos
+						y5FK+4RzszXAi4gw4Nt/q90FN3tjWOkCzqGohCY2MSfSoLWig6kpJg0Hew7OAIKP
+						ncwOyF72tR6YpC2b0ME1yCVQfZ8u/lYtK+CiYQJmtVews1EVylbh6tAJukMyaaCv
+						SmmiXVquChnW/ZIR4PTlFYkt+rJ7DklXcka6iAj9JimdVhvtejcsnLufxA3tcvwN
+						SpAzJUepxnhluW2OGgk/PxNhR+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.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://idp.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://idp.tcat.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tcat.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tcat.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tcat.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tcat.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEADCCAugCCQCwjoaBYKCfJzANBgkqhkiG9w0BAQUFADCBwTELMAkGA1UEBhMC
+						R0IxEzARBgNVBAgTClNocm9wc2hpcmUxEDAOBgNVBAcTB1RlbGZvcmQxLTArBgNV
+						BAoMJFRlbGZvcmQgQ29sbGVnZSBvZiBBcnRzICYgVGVjaG5vbG9neTEaMBgGA1UE
+						CxMRQ29tcHV0ZXIgU2VydmljZXMxFzAVBgNVBAMTDmlkcC50Y2F0LmFjLnVrMScw
+						JQYJKoZIhvcNAQkBFhhwYXVsLmZsYW5kZXJzQHRjYXQuYWMudWswHhcNMTQwNzE1
+						MTUxMzE1WhcNMjQwNzEyMTUxMzE1WjCBwTELMAkGA1UEBhMCR0IxEzARBgNVBAgT
+						ClNocm9wc2hpcmUxEDAOBgNVBAcTB1RlbGZvcmQxLTArBgNVBAoMJFRlbGZvcmQg
+						Q29sbGVnZSBvZiBBcnRzICYgVGVjaG5vbG9neTEaMBgGA1UECxMRQ29tcHV0ZXIg
+						U2VydmljZXMxFzAVBgNVBAMTDmlkcC50Y2F0LmFjLnVrMScwJQYJKoZIhvcNAQkB
+						FhhwYXVsLmZsYW5kZXJzQHRjYXQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
+						DwAwggEKAoIBAQDwEPad4kYnJdollfR+J9PakClAmKbQKKHQt5gTIotM/5YWnQKv
+						MuNgZmBlgP4u5j7HcI2x3GHt6SD8PDrhACRnHUlVAOsH7AtkHpzX0k5Lawes8DBV
+						JmCMwUOSoboO3Kf4Niu0fzMJ2ou+Cwz7JXrV6KjJP4GgkakZIgG6ntpRsY7X3zPU
+						b5GaSsC2boxY3snewwnFQ/yg5EleBo3hvAr0WzN+pu2UsG0kRd1GdMIPf32XWl8o
+						V9+ZzDqxVjzJNHGfaelo6+1oOVubEg4TFUVLC0QyMhMx94tz2Yi7sKItonzrzrVq
+						HcHtKA41ZpCYlgV5wxXJ7QVVgGene/ietIbVAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+						ggEBAAHHT1eun1pip4eal05s9EaRBXrSAhE9+qrUNpw26FwTqMdVuwHzadYD1OAy
+						NIj9Kvzb0Beg5cDbvKZwVZGJq2ggEN2OBe8jEfOpDdAySaPFPGqtjpK+prpN5Tos
+						y5FK+4RzszXAi4gw4Nt/q90FN3tjWOkCzqGohCY2MSfSoLWig6kpJg0Hew7OAIKP
+						ncwOyF72tR6YpC2b0ME1yCVQfZ8u/lYtK+CiYQJmtVews1EVylbh6tAJukMyaaCv
+						SmmiXVquChnW/ZIR4PTlFYkt+rJ7DklXcka6iAj9JimdVhvtejcsnLufxA3tcvwN
+						SpAzJUepxnhluW2OGgk/PxNhR+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.tcat.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tcat.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </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 (old)</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/idp.teicrete.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teicrete.gr-idp-shibboleth.xml
new file mode 100644
index 00000000..a8a9a7b2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.teicrete.gr-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?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>
+      <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
+                            BQADggEPADCCAQoCggEBAL+XJx6luxBMILP1Fhne5BNBkBDtRCXKbWMbZ23Y9RQU
+                            AiaKYudm0Iv1BYLhl/S+tNQzqNJuMhgrQohsA60y2zfZ1yfsIUQkzynZ5PicyY9J
+                            f24GbIXQbzzM7axr/485VoMsQ4CXoMHdl6/1k/96ZmmHkd7iihjL7tAP7Dr7Ir8z
+                            IIUdkJbCcDPBwC/Vt+s6r6ut9f5Tt/ZvzByoJlmt5JFW/NQ8qlLx3JTalf5aQQIX
+                            ARIf+c78WSqYrLga+4V7g9oiwojOsl8p3fmPqnIvWn8erCQFnd1ygscaiPbkTzYl
+                            n/haRW3/ALiF/uy8PHwbdYCkRww9tidlb/jZ2e23sqcCAwEAAaNlMGMwQgYDVR0R
+                            BDswOYIPaWRwLnRlaWNyZXRlLmdyhiZodHRwczovL2lkcC50ZWljcmV0ZS5nci9p
+                            ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUH4T1XBWWqDwvXJkpM1ocnGJJp+QwDQYJ
+                            KoZIhvcNAQEFBQADggEBAIsKG1Zto879oq2g0+QhUGuPi2JeB6CesyI+Ey/yxflm
+                            WvLndZVTd7NGzLBskyIZhaHcxGlWsxWzqMRGUzKctqHfjp0q16gBs8svuGlrpy2l
+                            FIZ+prAhPR9R0xLRGevFOd9WbaSXX41u1o8KWCsUVKLWfR8bc+Mz61Ujd+8X6meg
+                            LVMCOFMBp7YVze8y53lYYDhwh4iGNAOZ1KNgdFxbB4vLDCdCvdmRDnlg0uzAsAv5
+                            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>
+                            MIIDHDCCAgSgAwIBAgIJAIL7nMA9vRODMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+                            BAMTD2lkcC50ZWljcmV0ZS5ncjAeFw0xNDA0MTAxNTQ2NDlaFw0xOTEwMDExNTQ2
+                            NDlaMBoxGDAWBgNVBAMTD2lkcC50ZWljcmV0ZS5ncjCCASIwDQYJKoZIhvcNAQEB
+                            BQADggEPADCCAQoCggEBAL+XJx6luxBMILP1Fhne5BNBkBDtRCXKbWMbZ23Y9RQU
+                            AiaKYudm0Iv1BYLhl/S+tNQzqNJuMhgrQohsA60y2zfZ1yfsIUQkzynZ5PicyY9J
+                            f24GbIXQbzzM7axr/485VoMsQ4CXoMHdl6/1k/96ZmmHkd7iihjL7tAP7Dr7Ir8z
+                            IIUdkJbCcDPBwC/Vt+s6r6ut9f5Tt/ZvzByoJlmt5JFW/NQ8qlLx3JTalf5aQQIX
+                            ARIf+c78WSqYrLga+4V7g9oiwojOsl8p3fmPqnIvWn8erCQFnd1ygscaiPbkTzYl
+                            n/haRW3/ALiF/uy8PHwbdYCkRww9tidlb/jZ2e23sqcCAwEAAaNlMGMwQgYDVR0R
+                            BDswOYIPaWRwLnRlaWNyZXRlLmdyhiZodHRwczovL2lkcC50ZWljcmV0ZS5nci9p
+                            ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUH4T1XBWWqDwvXJkpM1ocnGJJp+QwDQYJ
+                            KoZIhvcNAQEFBQADggEBAIsKG1Zto879oq2g0+QhUGuPi2JeB6CesyI+Ey/yxflm
+                            WvLndZVTd7NGzLBskyIZhaHcxGlWsxWzqMRGUzKctqHfjp0q16gBs8svuGlrpy2l
+                            FIZ+prAhPR9R0xLRGevFOd9WbaSXX41u1o8KWCsUVKLWfR8bc+Mz61Ujd+8X6meg
+                            LVMCOFMBp7YVze8y53lYYDhwh4iGNAOZ1KNgdFxbB4vLDCdCvdmRDnlg0uzAsAv5
+                            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>
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
new file mode 100644
index 00000000..c94a83fd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.telecom-bretagne.eu-idp-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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="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>
+					      MIIDSDCCAjCgAwIBAgIVAMDsjMGGzs74lgEgGP3m2lZR6SMhMA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMTF2lkcC50ZWxlY29tLWJyZXRhZ25lLmV1MB4XDTEwMDIx
+MDA5NTgyNFoXDTMwMDIxMDA5NTgyNFowIjEgMB4GA1UEAxMXaWRwLnRlbGVjb20t
+YnJldGFnbmUuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDyA3F
+PUpmxBhBziOEouQX8lgfErTEM0EFV5Fg0lNc8NPn/nWmBtyQxbY1yqkmf34Te5ef
+SdNp39QQ9X6W+y3/p+9k+x6GgVwtvDcGB6fPPtncPHBVMo5V+EeoIE20vUN6TW4H
+g/RJHoqpZEn1x/G01bprZWCBdadbr2BaZcE5jabTB11wu1zu/7mBXVUtBPMTdHh7
+n4M872F8vTeTPVce4WcoDm5ac7qJOnE55t1RyYj7rryDrwThT//NY3sg2IguJn4B
++SGImQDS3C688SsdM42OiOD2xnmwgWU+dkLuPLz1w/fZmK5l5Vb2YWdyyHKshU4+
+FcIQFwgXpnKgTREJAgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC50ZWxlY29tLWJy
+ZXRhZ25lLmV1hi5odHRwczovL2lkcC50ZWxlY29tLWJyZXRhZ25lLmV1L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBSzMnv76CtVAByMD9L8/3CVVLT2WjANBgkqhkiG
+9w0BAQUFAAOCAQEAa5ho6vHycEIXOcmcfgpj60G6tS9vNKWLJ+H5zdXf+BcsLuky
+W5xQkgM519BghwJ72xDo4YVyEdp4kEGVKMo6+Vu0bz4AREb4SmMm+N2FCamhK6D8
++9YLDw76+x5xlUVaV0bVGkDAG9IlOzg6gPhoRiJrwg3pzgAiFiysBTTZSPLorTgU
+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>
+					      MIIDSDCCAjCgAwIBAgIVAMDsjMGGzs74lgEgGP3m2lZR6SMhMA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMTF2lkcC50ZWxlY29tLWJyZXRhZ25lLmV1MB4XDTEwMDIx
+MDA5NTgyNFoXDTMwMDIxMDA5NTgyNFowIjEgMB4GA1UEAxMXaWRwLnRlbGVjb20t
+YnJldGFnbmUuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDyA3F
+PUpmxBhBziOEouQX8lgfErTEM0EFV5Fg0lNc8NPn/nWmBtyQxbY1yqkmf34Te5ef
+SdNp39QQ9X6W+y3/p+9k+x6GgVwtvDcGB6fPPtncPHBVMo5V+EeoIE20vUN6TW4H
+g/RJHoqpZEn1x/G01bprZWCBdadbr2BaZcE5jabTB11wu1zu/7mBXVUtBPMTdHh7
+n4M872F8vTeTPVce4WcoDm5ac7qJOnE55t1RyYj7rryDrwThT//NY3sg2IguJn4B
++SGImQDS3C688SsdM42OiOD2xnmwgWU+dkLuPLz1w/fZmK5l5Vb2YWdyyHKshU4+
+FcIQFwgXpnKgTREJAgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC50ZWxlY29tLWJy
+ZXRhZ25lLmV1hi5odHRwczovL2lkcC50ZWxlY29tLWJyZXRhZ25lLmV1L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBSzMnv76CtVAByMD9L8/3CVVLT2WjANBgkqhkiG
+9w0BAQUFAAOCAQEAa5ho6vHycEIXOcmcfgpj60G6tS9vNKWLJ+H5zdXf+BcsLuky
+W5xQkgM519BghwJ72xDo4YVyEdp4kEGVKMo6+Vu0bz4AREb4SmMm+N2FCamhK6D8
++9YLDw76+x5xlUVaV0bVGkDAG9IlOzg6gPhoRiJrwg3pzgAiFiysBTTZSPLorTgU
+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://unknown.site.com</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
new file mode 100644
index 00000000..5adcedf9
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.telecom-lille1.eu-idp-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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="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>
+					      MIIDPzCCAiegAwIBAgIUJLHfF/BYKnVTAfbCyG7p6neXmikwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVaWRwLnRlbGVjb20tbGlsbGUxLmV1MB4XDTA5MTAxMzEy
+NTE1NVoXDTI5MTAxMzEyNTE1NVowIDEeMBwGA1UEAxMVaWRwLnRlbGVjb20tbGls
+bGUxLmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAke9f/k5yNntZ
+mKHJse2R1dALp2yQ431GM7WgcwLz61E10KQFp4QvHcRnOA28aQ2ftOdDYXF8Ce/g
+l/f/gzmfLI3UkV33VQnu7wTUcG7qnA4ixmSz1wXshiBNiCqy+DlvzxxFa1rrrhTK
+DCGNxJEsNcT42xnnoL739jJt7hhwOzNTR6jd+PtnkBBJkULj0JNU3lgVVLaic61Z
+2sqqbp976AE81I5Peu/uNwBEQEze3JZFq4lPMftIT1qCrpZueUzZJe/IaB8gckur
+U+ts8Qk7X6LaWA9rHLz3M1cS5I/nFgxX5BzNTpJac8YEFl4rN0j8VVNKMuQ8NPoz
+lMSlVexERQIDAQABo3EwbzBOBgNVHREERzBFghVpZHAudGVsZWNvbS1saWxsZTEu
+ZXWGLGh0dHBzOi8vaWRwLnRlbGVjb20tbGlsbGUxLmV1L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRIcbHtrFzmqsjXU8/WEtUyCjUm+DANBgkqhkiG9w0BAQUFAAOC
+AQEAfeUGRk0BupcoO20DeNRmBokqCZn0N7n5mmco4eJWjl4CD0dvxcNmTHmO9nYS
+FPVBNASEjmnaU12RSAIM0mVnLwo6kXAQsbKa2xKGL6l3jkmsvcEj8F1Dg5e0QGBe
+eSdYLGI2mGbAoIQWeK3majTQXZ+UyzVXKjzJ2JCk96MvEwKODd4HGX+Z8eMRE/0A
+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>
+					      MIIDPzCCAiegAwIBAgIUJLHfF/BYKnVTAfbCyG7p6neXmikwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVaWRwLnRlbGVjb20tbGlsbGUxLmV1MB4XDTA5MTAxMzEy
+NTE1NVoXDTI5MTAxMzEyNTE1NVowIDEeMBwGA1UEAxMVaWRwLnRlbGVjb20tbGls
+bGUxLmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAke9f/k5yNntZ
+mKHJse2R1dALp2yQ431GM7WgcwLz61E10KQFp4QvHcRnOA28aQ2ftOdDYXF8Ce/g
+l/f/gzmfLI3UkV33VQnu7wTUcG7qnA4ixmSz1wXshiBNiCqy+DlvzxxFa1rrrhTK
+DCGNxJEsNcT42xnnoL739jJt7hhwOzNTR6jd+PtnkBBJkULj0JNU3lgVVLaic61Z
+2sqqbp976AE81I5Peu/uNwBEQEze3JZFq4lPMftIT1qCrpZueUzZJe/IaB8gckur
+U+ts8Qk7X6LaWA9rHLz3M1cS5I/nFgxX5BzNTpJac8YEFl4rN0j8VVNKMuQ8NPoz
+lMSlVexERQIDAQABo3EwbzBOBgNVHREERzBFghVpZHAudGVsZWNvbS1saWxsZTEu
+ZXWGLGh0dHBzOi8vaWRwLnRlbGVjb20tbGlsbGUxLmV1L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRIcbHtrFzmqsjXU8/WEtUyCjUm+DANBgkqhkiG9w0BAQUFAAOC
+AQEAfeUGRk0BupcoO20DeNRmBokqCZn0N7n5mmco4eJWjl4CD0dvxcNmTHmO9nYS
+FPVBNASEjmnaU12RSAIM0mVnLwo6kXAQsbKa2xKGL6l3jkmsvcEj8F1Dg5e0QGBe
+eSdYLGI2mGbAoIQWeK3majTQXZ+UyzVXKjzJ2JCk96MvEwKODd4HGX+Z8eMRE/0A
+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://unknown.site.com</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
new file mode 100644
index 00000000..68da3990
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-paristech.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-telecom.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <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>
+					      MIIDSzCCAjOgAwIBAgIUOdyX2dtbQ38bYSsIYvHC27pbOf4wDQYJKoZIhvcNAQEF
+BQAwIzEhMB8GA1UEAxMYaWRwLnRlbGVjb20tcGFyaXN0ZWNoLmZyMB4XDTEwMDEy
+ODE3MDA0MVoXDTMwMDEyODE3MDA0MVowIzEhMB8GA1UEAxMYaWRwLnRlbGVjb20t
+cGFyaXN0ZWNoLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiVSP
+MWN9NGSu79LJ5CEhhDAWfKTaaXQRrk26/3axPDtaDJVO9KhJ9oie3SZjlogVvmuE
+UHiONGqWhO4H1eKXfPKQIpq5e+JpR9Nxr8WMsjhXnToCcMZsSes6E44S3YXWVblv
+EmWKE3JFUYWO/cpVGZWjdnWierXziUPo8UcRI8BPBqoCgMQzDkVtJngqNPWim0/M
+S7LbyZmrYbDlwqM74CNFFRK+cknv221xr36sSTVAf9QdbL+zfvxCOxR4vmUxSTG5
+FKD89Js9ELMZoadpJYWEkdIJuvZ0R12dtlXn+rYKpqpOuP/X/kjtJM40WpchSWn7
+o2z0KwtUVkkugtUN/QIDAQABo3cwdTBUBgNVHREETTBLghhpZHAudGVsZWNvbS1w
+YXJpc3RlY2guZnKGL2h0dHBzOi8vaWRwLnRlbGVjb20tcGFyaXN0ZWNoLmZyL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSzcODCJpeqAD7OPTNA7Uf6rJ/73DANBgkq
+hkiG9w0BAQUFAAOCAQEAPkpw2TRt9SQdGPslqaoEq+/Y+3qdoPAFEipXUxEsexVU
+RZiHCQm90wLhAV4+IGmk5XuVVKN5M+3kQVDq/iql3W9IoShV71mQhDEqNQJkztGK
+1XPWYZu2Qgzui0YessRn7F8/Ts3cRm6L43oAKWJvSR0Zad9L4Eeli/ymCZ+3VO86
+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">telecom-paristech.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-telecom.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
+cGFyaXN0ZWNoLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiVSP
+MWN9NGSu79LJ5CEhhDAWfKTaaXQRrk26/3axPDtaDJVO9KhJ9oie3SZjlogVvmuE
+UHiONGqWhO4H1eKXfPKQIpq5e+JpR9Nxr8WMsjhXnToCcMZsSes6E44S3YXWVblv
+EmWKE3JFUYWO/cpVGZWjdnWierXziUPo8UcRI8BPBqoCgMQzDkVtJngqNPWim0/M
+S7LbyZmrYbDlwqM74CNFFRK+cknv221xr36sSTVAf9QdbL+zfvxCOxR4vmUxSTG5
+FKD89Js9ELMZoadpJYWEkdIJuvZ0R12dtlXn+rYKpqpOuP/X/kjtJM40WpchSWn7
+o2z0KwtUVkkugtUN/QIDAQABo3cwdTBUBgNVHREETTBLghhpZHAudGVsZWNvbS1w
+YXJpc3RlY2guZnKGL2h0dHBzOi8vaWRwLnRlbGVjb20tcGFyaXN0ZWNoLmZyL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSzcODCJpeqAD7OPTNA7Uf6rJ/73DANBgkq
+hkiG9w0BAQUFAAOCAQEAPkpw2TRt9SQdGPslqaoEq+/Y+3qdoPAFEipXUxEsexVU
+RZiHCQm90wLhAV4+IGmk5XuVVKN5M+3kQVDq/iql3W9IoShV71mQhDEqNQJkztGK
+1XPWYZu2Qgzui0YessRn7F8/Ts3cRm6L43oAKWJvSR0Zad9L4Eeli/ymCZ+3VO86
+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://unknown.site.com</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
new file mode 100644
index 00000000..0a59659f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.test.semantico.net-shibboleth2.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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
+						bnRpY28ubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApqXUhIix
+						l94UCWt56LwlvrqQBi2qQhOaEjxRYnbqg9SNBlaeCVNN2vxKqHpgxLKdLMtmCQmJ
+						novNH9qwFfJTzmRPgsLElsJzlObP9fHlh9u21+ZToIuI5ghGXG52Fhf1gdIeN7cH
+						PzFN1E4Pb0Dh3DOxnzLMXDimOwmwRKOAWa2E7UgD42vLRPzz4IeFx0w+EPkNmv/C
+						bTpTDR0kJGNBxoQVS6KQlU95b9dl+as7swAGIQhU7R7Tn9jVXzJJLdZ84I/dl9ju
+						ZNpNaki0f9egOEHraJp731AHzgFoVKfS11OXVx2FiM1MTgU7tv7XjhALnZf3tbAr
+						YEgIe6ww/hFDLQIDAQABo3MwcTBQBgNVHREESTBHghZpZHAudGVzdC5zZW1hbnRp
+						Y28ubmV0hi1odHRwczovL2lkcC50ZXN0LnNlbWFudGljby5uZXQvaWRwL3NoaWJi
+						b2xldGgwHQYDVR0OBBYEFBtPXbpEivzVVqYPddt3JNbHfq/gMA0GCSqGSIb3DQEB
+						BQUAA4IBAQB8/Fu1WxCyj/zaqWfJe1fjU/qwyG8YcECR/F6h55EbvlrKFAauD5mA
+						1N/ssSvcnC73mtFhgjYkaUf+ztpGAzI8pT7o/h/YSER3My6xfNssJPRtl3lDnByq
+						QhoY+/pYb9AE5TOcSFE/tiW8cjf+HEOLj6ggwpwACbgdIZhB6tkPPEYwGLM7iztZ
+						RZ5dyGsxLqMUNkAQe31ODYum1CmZSvca3dQ36v3Uh9JPY7NpPKtPajTWa3EOnolD
+						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>
+						MIIDRDCCAiygAwIBAgIVAIyYxXXjcwpmMCFZpfaDBhgqPRVKMA0GCSqGSIb3DQEB
+						BQUAMCExHzAdBgNVBAMTFmlkcC50ZXN0LnNlbWFudGljby5uZXQwHhcNMTIxMjE3
+						MTIxMzA0WhcNMzIxMjE3MTIxMzA0WjAhMR8wHQYDVQQDExZpZHAudGVzdC5zZW1h
+						bnRpY28ubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApqXUhIix
+						l94UCWt56LwlvrqQBi2qQhOaEjxRYnbqg9SNBlaeCVNN2vxKqHpgxLKdLMtmCQmJ
+						novNH9qwFfJTzmRPgsLElsJzlObP9fHlh9u21+ZToIuI5ghGXG52Fhf1gdIeN7cH
+						PzFN1E4Pb0Dh3DOxnzLMXDimOwmwRKOAWa2E7UgD42vLRPzz4IeFx0w+EPkNmv/C
+						bTpTDR0kJGNBxoQVS6KQlU95b9dl+as7swAGIQhU7R7Tn9jVXzJJLdZ84I/dl9ju
+						ZNpNaki0f9egOEHraJp731AHzgFoVKfS11OXVx2FiM1MTgU7tv7XjhALnZf3tbAr
+						YEgIe6ww/hFDLQIDAQABo3MwcTBQBgNVHREESTBHghZpZHAudGVzdC5zZW1hbnRp
+						Y28ubmV0hi1odHRwczovL2lkcC50ZXN0LnNlbWFudGljby5uZXQvaWRwL3NoaWJi
+						b2xldGgwHQYDVR0OBBYEFBtPXbpEivzVVqYPddt3JNbHfq/gMA0GCSqGSIb3DQEB
+						BQUAA4IBAQB8/Fu1WxCyj/zaqWfJe1fjU/qwyG8YcECR/F6h55EbvlrKFAauD5mA
+						1N/ssSvcnC73mtFhgjYkaUf+ztpGAzI8pT7o/h/YSER3My6xfNssJPRtl3lDnByq
+						QhoY+/pYb9AE5TOcSFE/tiW8cjf+HEOLj6ggwpwACbgdIZhB6tkPPEYwGLM7iztZ
+						RZ5dyGsxLqMUNkAQe31ODYum1CmZSvca3dQ36v3Uh9JPY7NpPKtPajTWa3EOnolD
+						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 Internet2 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.totton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.totton.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..824c11be
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.totton.ac.uk-shibboleth.xml
@@ -0,0 +1,123 @@
+<?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>
+      <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
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBpZHAudG90dG9u
+						LmFjLnVrMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqYhekQdpjMhc
+						tcgY3MT17ejtn8XMfd9tj/g+tYFu3l+T2VvGIP9Hi+p9wLQcejeGxeA6b3i3QAft
+						hsqsMV8X9AEqNgxzUsaWmIrMSWjSI1X+vNkjxl/Gr7nEyc5897JT8C2kZF/rCMme
+						SdDQBw2TTSMsDXLw1CVyVyCrBaMpTVWAxRZv3cj6YlaMi/0bGa9sNPvwCf2PyqAo
+						YMhZvPUTeu7WYE05Myi+QlOsGL9Y2JoG8qND0g/b6KThd3Vkc+LbtVUIF4pFWZPy
+						vzKagO7oOAxMK2CCGsnEDOxXaGVY/RwPCPGSRDHal9aPLBWbtIZs5f79M14O5Wdn
+						YxMS+cGH+1001TWshCfKEbNhuA0SxbE4N6zdQRBgJFUViE7gRo/aPzRqjzm/x9r5
+						nsYQN7FjHeJ8PSEYVyO1o09+Z7NDTedNMEgKJoc3e0+RL2RXKAmZw9tRbLFlPNxZ
+						hN9mFT6XEUH6ZhC8ld6PKp9qD58OzWozHmITf7mrq970yzuf7Nqi1iVUZIIYD5eD
+						TkMOURoy9GvHuPAA6hDAbKnz5Abzx0lDCV+U3w1FxTdANCDGxxJJqhcaJbM7BWqx
+						z89O5KHMzYB4BQVfS/Kbm1GwKPisMZbAk8+zKueuEh6naP54LXJnYFH6Nz5LcoBr
+						RUF/3+9UAyOITVpLbYOgO5Spav5vyDUCAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaA
+						FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBS0srg73DCKIsJa07a37uBZ
+						9tJt8DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
+						BgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZn
+						gQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+						Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+						dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+						BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQaWRw
+						LnRvdHRvbi5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEANILKb7qX7KrvAJv7rf0t
+						z9Bpo/glzvslIq1tF7v9sAQxDNzn+Y2XYa8AT1q2uzVkQc2AjxKUSMbYUAGnus2g
+						wFG7LgvMgKoenq+vOHmcB9Qu0JEEg9oZ32g87ZqsPCgc36F4Gq/ja6TZEIgZjmFy
+						PnAbGscBk4RUfPZzxacKBsYUglpwLGc7Uxm37CxaXKzYERKWG+J7XR3nBouecCOd
+						Ur51EZt0BIPQ+91eza3r392o4VvyFVE4tg2YCOSKccBQ4VlgPt2H3dzF73+R69Rq
+						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>
+						MIIFbTCCBFWgAwIBAgIQcYa5PMnn8T0HjxfLbT0gKjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDQyNDAwMDAwMFoXDTE2MDQyMzIzNTk1OVowPjEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBpZHAudG90dG9u
+						LmFjLnVrMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqYhekQdpjMhc
+						tcgY3MT17ejtn8XMfd9tj/g+tYFu3l+T2VvGIP9Hi+p9wLQcejeGxeA6b3i3QAft
+						hsqsMV8X9AEqNgxzUsaWmIrMSWjSI1X+vNkjxl/Gr7nEyc5897JT8C2kZF/rCMme
+						SdDQBw2TTSMsDXLw1CVyVyCrBaMpTVWAxRZv3cj6YlaMi/0bGa9sNPvwCf2PyqAo
+						YMhZvPUTeu7WYE05Myi+QlOsGL9Y2JoG8qND0g/b6KThd3Vkc+LbtVUIF4pFWZPy
+						vzKagO7oOAxMK2CCGsnEDOxXaGVY/RwPCPGSRDHal9aPLBWbtIZs5f79M14O5Wdn
+						YxMS+cGH+1001TWshCfKEbNhuA0SxbE4N6zdQRBgJFUViE7gRo/aPzRqjzm/x9r5
+						nsYQN7FjHeJ8PSEYVyO1o09+Z7NDTedNMEgKJoc3e0+RL2RXKAmZw9tRbLFlPNxZ
+						hN9mFT6XEUH6ZhC8ld6PKp9qD58OzWozHmITf7mrq970yzuf7Nqi1iVUZIIYD5eD
+						TkMOURoy9GvHuPAA6hDAbKnz5Abzx0lDCV+U3w1FxTdANCDGxxJJqhcaJbM7BWqx
+						z89O5KHMzYB4BQVfS/Kbm1GwKPisMZbAk8+zKueuEh6naP54LXJnYFH6Nz5LcoBr
+						RUF/3+9UAyOITVpLbYOgO5Spav5vyDUCAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaA
+						FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBS0srg73DCKIsJa07a37uBZ
+						9tJt8DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
+						BgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZn
+						gQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+						Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+						dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+						BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQaWRw
+						LnRvdHRvbi5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEANILKb7qX7KrvAJv7rf0t
+						z9Bpo/glzvslIq1tF7v9sAQxDNzn+Y2XYa8AT1q2uzVkQc2AjxKUSMbYUAGnus2g
+						wFG7LgvMgKoenq+vOHmcB9Qu0JEEg9oZ32g87ZqsPCgc36F4Gq/ja6TZEIgZjmFy
+						PnAbGscBk4RUfPZzxacKBsYUglpwLGc7Uxm37CxaXKzYERKWG+J7XR3nBouecCOd
+						Ur51EZt0BIPQ+91eza3r392o4VvyFVE4tg2YCOSKccBQ4VlgPt2H3dzF73+R69Rq
+						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>
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
new file mode 100644
index 00000000..4bea07bc
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.treloar.org.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						MDIxMjA4MzcyNFoXDTMzMDIwNzA4MzcyNFowZjELMAkGA1UEBhMCR0IxEjAQBgNV
+						BAgMCUhhbXBzaGlyZTEOMAwGA1UEBwwFQWx0b24xFjAUBgNVBAoMDVRyZWxvYXIg
+						VHJ1c3QxGzAZBgNVBAMMEmlkcC50cmVsb2FyLm9yZy51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBALqJjfQAve2KE7DDgIOPkvSo8sNdrb3njZx1K2pk
+						NQCoeo9rWaLMQMpzXBCUiSb3De5bDTgob5PL8HlNWNg3bDoD1s27MTaX7PVuy7gi
+						uqrybbLftyaQSnCWuR7WNBQ4LuTMQ8ZaeS3bF1T5Gm3Pi969w2cmEhZOtxVzFELV
+						NauQggXYZnZ8o15XvG0xCsim9S7U6wt9/1sndhATdkZ+H4KXfYsrWnYtiluMVO9T
+						mzJUh7ZjLJqwaaWFaKJZE35tCgDEuNWdfOlw+2QbxCyGHBxH9mxEN1hEQej3ik/X
+						mP0j9a1q0OZQCwaB5FpNp4wbOV48s7dOzRDVAU1uHLvxvh8CAwEAATANBgkqhkiG
+						9w0BAQUFAAOCAQEATC0F3HDRn0eYLwJHJfJIx7nU6VM7Ve+kkffRYR4LTB9JAZBb
+						fMPjWhI2sHJRfgkLHthcO8rcfe3p5Zd3xIg6DZtQHm97rr5+iBAakzvhkQHD9s+A
+						lUboeBwa9eEKu9UnpW4MAouDBy7XggaXNDj8n43s8RNW2awutCD57x8uyXlh+QnM
+						wr0C6lZjSkH22zeM1qgnYwxojYmFhuTyDDjTk9ue6wtp6pQO0M7/fRZyLAqD1JYY
+						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>
+						MIIDSDCCAjACCQCcvr4PTH7CrzANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
+						QjESMBAGA1UECAwJSGFtcHNoaXJlMQ4wDAYDVQQHDAVBbHRvbjEWMBQGA1UECgwN
+						VHJlbG9hciBUcnVzdDEbMBkGA1UEAwwSaWRwLnRyZWxvYXIub3JnLnVrMB4XDTEz
+						MDIxMjA4MzcyNFoXDTMzMDIwNzA4MzcyNFowZjELMAkGA1UEBhMCR0IxEjAQBgNV
+						BAgMCUhhbXBzaGlyZTEOMAwGA1UEBwwFQWx0b24xFjAUBgNVBAoMDVRyZWxvYXIg
+						VHJ1c3QxGzAZBgNVBAMMEmlkcC50cmVsb2FyLm9yZy51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBALqJjfQAve2KE7DDgIOPkvSo8sNdrb3njZx1K2pk
+						NQCoeo9rWaLMQMpzXBCUiSb3De5bDTgob5PL8HlNWNg3bDoD1s27MTaX7PVuy7gi
+						uqrybbLftyaQSnCWuR7WNBQ4LuTMQ8ZaeS3bF1T5Gm3Pi969w2cmEhZOtxVzFELV
+						NauQggXYZnZ8o15XvG0xCsim9S7U6wt9/1sndhATdkZ+H4KXfYsrWnYtiluMVO9T
+						mzJUh7ZjLJqwaaWFaKJZE35tCgDEuNWdfOlw+2QbxCyGHBxH9mxEN1hEQej3ik/X
+						mP0j9a1q0OZQCwaB5FpNp4wbOV48s7dOzRDVAU1uHLvxvh8CAwEAATANBgkqhkiG
+						9w0BAQUFAAOCAQEATC0F3HDRn0eYLwJHJfJIx7nU6VM7Ve+kkffRYR4LTB9JAZBb
+						fMPjWhI2sHJRfgkLHthcO8rcfe3p5Zd3xIg6DZtQHm97rr5+iBAakzvhkQHD9s+A
+						lUboeBwa9eEKu9UnpW4MAouDBy7XggaXNDj8n43s8RNW2awutCD57x8uyXlh+QnM
+						wr0C6lZjSkH22zeM1qgnYwxojYmFhuTyDDjTk9ue6wtp6pQO0M7/fRZyLAqD1JYY
+						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>
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
new file mode 100644
index 00000000..0e494a63
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.tresham.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?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>
+      <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
+						ciBFZHVjYXRpb24xGjAYBgNVBAMMEWlkcC50cmVzaGFtLmFjLnVrMB4XDTEzMDUx
+						NzA3NDIxOVoXDTMzMDUxMjA3NDIxOVowgZIxCzAJBgNVBAYTAkdCMRkwFwYDVQQI
+						DBBOb3J0aGFtcHRvbnNoaXJlMRIwEAYDVQQHDAlLZXR0ZXJpbmcxODA2BgNVBAoM
+						L1RyZXNoYW0gQ29sbGVnZSBvZiBGdXJ0aGVyIGFuZCBIaWdoZXIgRWR1Y2F0aW9u
+						MRowGAYDVQQDDBFpZHAudHJlc2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBAMDNPjJPLfGBvb57Jln2kd2w6QLzt//vhZudjZZrKhQirlVD
+						8GAgVU7XYrZeHQLzLXQF1j2fZnLrzkRPFL15Ru9qkFeftSabMn1TeegKibLbUrFk
+						pMcUfFCs4j6ybNFt6ZCfIk426xTRFXVuLKSegPoQYj+dsTvlPIGt8SsRC/ydqP9C
+						IzwGwE6CjZPIiAa7Q9MyNs8G5tqZ9C7YPWy8ArG+SZ9Xt1iyXV4lerwmf2D147oR
+						Y03saO6fNSCknSBjAA6UP3xAE5HimHKwjvl5MXF1H0puVG5P3b+xfCT2yCMhbsRj
+						YJK4HSzYdCnRR91cxB8EISYRcbtVo2lKrsLw+LcCAwEAATANBgkqhkiG9w0BAQUF
+						AAOCAQEALJNw1SaVhAsHqu2ENnh9KNWDuaUA/b9k2M9nNSx4LWa9Lpkw1+qdjZQ+
+						tfVRIb2E2AJp9+7RuWKN9Xa6l0VenbumDeOpwhp8LooiZR+Qt9pIg28Be9bYics7
+						4qnQDA2b0HiLEMcM+xW0HCp5j0q9+RZPF7rtqdu/Yw6qtIkmWe/L6OqRUfVfTy70
+						ekbD3d5N/xvhGGKETyV3Yp0Ayw8aGjG1a4WCUn+r/IY3JuKjOq+QOMb5lkl0I4ol
+						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>
+						MIIDojCCAooCCQC38OS+e7lEUzANBgkqhkiG9w0BAQUFADCBkjELMAkGA1UEBhMC
+						R0IxGTAXBgNVBAgMEE5vcnRoYW1wdG9uc2hpcmUxEjAQBgNVBAcMCUtldHRlcmlu
+						ZzE4MDYGA1UECgwvVHJlc2hhbSBDb2xsZWdlIG9mIEZ1cnRoZXIgYW5kIEhpZ2hl
+						ciBFZHVjYXRpb24xGjAYBgNVBAMMEWlkcC50cmVzaGFtLmFjLnVrMB4XDTEzMDUx
+						NzA3NDIxOVoXDTMzMDUxMjA3NDIxOVowgZIxCzAJBgNVBAYTAkdCMRkwFwYDVQQI
+						DBBOb3J0aGFtcHRvbnNoaXJlMRIwEAYDVQQHDAlLZXR0ZXJpbmcxODA2BgNVBAoM
+						L1RyZXNoYW0gQ29sbGVnZSBvZiBGdXJ0aGVyIGFuZCBIaWdoZXIgRWR1Y2F0aW9u
+						MRowGAYDVQQDDBFpZHAudHJlc2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBAMDNPjJPLfGBvb57Jln2kd2w6QLzt//vhZudjZZrKhQirlVD
+						8GAgVU7XYrZeHQLzLXQF1j2fZnLrzkRPFL15Ru9qkFeftSabMn1TeegKibLbUrFk
+						pMcUfFCs4j6ybNFt6ZCfIk426xTRFXVuLKSegPoQYj+dsTvlPIGt8SsRC/ydqP9C
+						IzwGwE6CjZPIiAa7Q9MyNs8G5tqZ9C7YPWy8ArG+SZ9Xt1iyXV4lerwmf2D147oR
+						Y03saO6fNSCknSBjAA6UP3xAE5HimHKwjvl5MXF1H0puVG5P3b+xfCT2yCMhbsRj
+						YJK4HSzYdCnRR91cxB8EISYRcbtVo2lKrsLw+LcCAwEAATANBgkqhkiG9w0BAQUF
+						AAOCAQEALJNw1SaVhAsHqu2ENnh9KNWDuaUA/b9k2M9nNSx4LWa9Lpkw1+qdjZQ+
+						tfVRIb2E2AJp9+7RuWKN9Xa6l0VenbumDeOpwhp8LooiZR+Qt9pIg28Be9bYics7
+						4qnQDA2b0HiLEMcM+xW0HCp5j0q9+RZPF7rtqdu/Yw6qtIkmWe/L6OqRUfVfTy70
+						ekbD3d5N/xvhGGKETyV3Yp0Ayw8aGjG1a4WCUn+r/IY3JuKjOq+QOMb5lkl0I4ol
+						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>Karen</md:GivenName>
+    <md:SurName>Etty</md:SurName>
+    <md:EmailAddress>mailto:ketty@tresham.ac.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
new file mode 100644
index 00000000..3ea51c6f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ttk.mta.hu-idp-shibboleth.xml
@@ -0,0 +1,73 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttk.mta.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"/>
+      <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:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAPuZvgXHs4goqCUIgI0GlxMmT88RMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC50dGsubXRhLmh1MB4XDTEyMDQxMzEzMDkzOVoX
+DTMyMDQxMzEzMDkzOVowGTEXMBUGA1UEAxMOaWRwLnR0ay5tdGEuaHUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvyY+F3sZWJ0RhGrCoIL2lCRIEEXJH
+zuoOHmemvyK5D9dtY5+38dwEIhIjgtOXGIVhKlAzxHyeZMWwBj8nH20qRK/da/JI
+l9P2eQMxf4BK40N/vA9VsT3KvA6mGKlUkqfPsDC1yYcaQkYZugVAmWcPL4gOMOaT
+fxpJGRYh5qknX0+bJsh8/aKLqTh6XbrqZv/Q9gWefamh5aGt1iornQy2JbtuFB3z
+TDa8X0q6UBZ41G/0h39IP08YY2wV49HwjQi//eHOPY2yuDrgo3o1iMiAxT1ffzOw
+4V1kxhPCsocojthf+PYirkkBc62x587fTtdDsX+zFx58VQCCroVyQtHJAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC50dGsubXRhLmh1hiVodHRwczovL2lkcC50dGsu
+bXRhLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTz4rTZcnlkrQGjs5CRN+3b
+4GUNnzANBgkqhkiG9w0BAQUFAAOCAQEAiePPbghl172ENP6zQfA4Wxk1vm0ePemu
+3tZf7H7B2TDXC6c7KSigHwm96SLclqR6jgQi8htDpeYlC/YIWvO9CU7sb9Xk/JGn
+SUHvboV4TJqCDBuJPMIdTbyPwN6Tfh0QlPFydMgaJbjmOpyfKBNJG6p/d10tDVBD
+LCf7+ru9yrKR/OtpV9GkWoxZlzLKGJGNRiYtrrqDFtH/vz5tywE3X4jXS0Oaa6Q4
+vEGvybhfMQNhBanLwNrdkoQu3uaAhXhmQAx2RUksK1o9Brq6NzBILhRAzra0amCA
+hOXlrbEjYjYScbZ2gH6B5Nf0TQb+GwKVvEFBBGtzwRDzdyOb3Q7BVA==
+                                            </ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.ttk.mta.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ttk.mta.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution"/>
+    <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: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">http://www.it.ttk.mta.hu/aai</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.it.ttk.mta.hu/aai</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.tut.fi-shibboleth2.xml b/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
index b61bcb7f..d2b25736 100644
--- a/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
+++ b/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.tut.fi/shibboleth2">
+<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>
-      <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
-      <mdui:UIInfo>
+      <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>
@@ -15,7 +25,7 @@
         <mdui:Keywords xml:lang="en">TUT</mdui:Keywords>
         <mdui:Keywords xml:lang="fi">TTY TTKK</mdui:Keywords>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:IPHint>2001:708:310::/48</mdui:IPHint>
         <mdui:IPHint>130.230.0.0/16</mdui:IPHint>
         <mdui:IPHint>193.166.164.0/22</mdui:IPHint>
@@ -23,13 +33,9 @@
         <mdui:DomainHint>tut.fi</mdui:DomainHint>
         <mdui:GeolocationHint>geo:61.450227,23.861063</mdui:GeolocationHint>
       </mdui:DiscoHints>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -65,10 +71,10 @@ ov0reXszINweUWTYJchavcG3Dfyx</ds:X509Certificate>
   </md:IDPSSODescriptor>
   <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tut.fi</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
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
new file mode 100644
index 00000000..238f82ef
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr-idp-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+      <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="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>
+					      MIIDVzCCAj+gAwIBAgIUHPBrysVhtt7R/gvuIk4VwxtbXfUwDQYJKoZIhvcNAQEF
+BQAwJjEkMCIGA1UEAxMbaWRwLnUtYm9yZGVhdXgtbW9udGFpZ25lLmZyMB4XDTE0
+MDQwNzE0MzczMVoXDTM0MDQwNzE0MzczMVowJjEkMCIGA1UEAxMbaWRwLnUtYm9y
+ZGVhdXgtbW9udGFpZ25lLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAzoBNnucktebQfAKs+CzNFw3DJjZqiBl63mrILfJ54L/5x99825pcWwpBoXIR
+/9hrEAvgM6bKVnICQSb8ES0D0kV8aCQBltm4Bw/JmvmQDuCfmRombFAYKA+KLx+4
+6VuuXKOWH9EqrQIFsc4418Ln8zqTIvNunT9rxFN0D7uWPtElxuID2tz9CnvkWw5w
+rvQPKEqpCEJlMugBQISlvm70Q6TCeWMeeZ317jAtpXi9ELx7mTokJ1qENDzTUPkb
+uJN5aH8JZ/LjKIkXqmj658/gnTyuWWMw1bCiwDtJVvsAOJOa7QVma4Ph55O84biN
+s9Zwj/g8GmDnkoRYQxQO8w/krwIDAQABo30wezBaBgNVHREEUzBRghtpZHAudS1i
+b3JkZWF1eC1tb250YWlnbmUuZnKGMmh0dHBzOi8vaWRwLnUtYm9yZGVhdXgtbW9u
+dGFpZ25lLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRd5DOByJ5+rahWNtvg
+/Wsz2LJy/jANBgkqhkiG9w0BAQUFAAOCAQEAC1PLClY7gYSkCJebDPsplSGUcJiw
+X8gEe7G8tsmNnE0bNuCWvnmJuHEuHWkFb7VQSbC4nLVaapnmP2d+IgPRRBwXzeAA
+8bG9Mh6rGbWvi61NExqw7PWZ+HLVbFv400q/C4NZENCAM2nleI97G+Zcn6iNmVXO
+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://unknown.site.com</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
new file mode 100644
index 00000000..e1a7a470
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.u-bordeaux.fr-idp_ubx-shibboleth.xml
@@ -0,0 +1,81 @@
+<?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>
+      <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="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>
+					      MIIDSDCCAjCgAwIBAgIJAPEVvQl9sqJ0MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+BAMTGXYtaWRwMDEuc3J2LnUtYm9yZGVhdXguZnIwHhcNMTQwNDE0MDc1NjE5WhcN
+MjQwNDExMDc1NjE5WjAkMSIwIAYDVQQDExl2LWlkcDAxLnNydi51LWJvcmRlYXV4
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1AStm5TtjTJEnbVB
+Kxe+Qjkh9z7V1Td2uUiWbswYVIfFlw2mDhj9Gq3clTRiyPhebB4qTeRzJKNnxVBw
+lzk+JmRnJd+JPwIyX3ctN+XZRaeFjbspP1Xl9sjsa5LBFVZ43LrXPlQH2o8Z3jZJ
+g9WaTj++SbUa4xKnqJ6bJm4voykhCG4cAyQ9jpV3Qivofwa9VHC5KauXR9JeHMr4
+gjOZBxfh8e9iTRSt1fUHDrHpgx00zvVIXBi5d9DRENPjyCNzSHR/32UUxnJOomEY
+eyf1Ux8yr3xiucqY8ht90n/LtvxBGl33uGZZPu2oBuJGj8F48VqJwKyKdZi72Lqo
+sauYUQIDAQABo30wezBaBgNVHREEUzBRghl2LWlkcDAxLnNydi51LWJvcmRlYXV4
+LmZyhjRodHRwczovL3YtaWRwMDEuc3J2LnUtYm9yZGVhdXguZnIvaWRwX3VieC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBS2KmA2aaKd0lRemau76adcI936lzANBgkqhkiG
+9w0BAQUFAAOCAQEAXoRdSclj17K5pHqZC+MYjFQgRpZ9Gq7Sdk/kEXyH10SJuc5r
+eApBAWYFIJvWAXKBhtvPxnkgoDkQ84Rrho/jR4RzkqCEEiUHjLzObVuHtcHE1dAV
+X5iaAObzXlNr5aDAPPPjaZXQpZOvNDwrhVQrZWoeupQogoP1VYEJtCag2tgLD7ZW
+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>
+					      MIIDTzCCAjegAwIBAgIUE1/WgEZpWyPYXsF/fURZlGXutGUwDQYJKoZIhvcNAQEF
+BQAwJDEiMCAGA1UEAxMZdi1pZHAwMS5zcnYudS1ib3JkZWF1eC5mcjAeFw0xMzEy
+MTAwODA5NDFaFw0xNjEyMTAwODA5NDFaMCQxIjAgBgNVBAMTGXYtaWRwMDEuc3J2
+LnUtYm9yZGVhdXguZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd
+Wezh53yFD4rbJyj74HT7VOJpNorPhQGoqEAMZOQWuT182+2XRq373xcOZ6suy0NS
+YbOoxKdFQn+o/bIQwpvnN708YVU7rcVUcxzpYwyPdIwMgm9xqC5hBE902mErUHNP
+VOqkgmnIf5YDm92fSzIEoE/klpQwCSsG88qlfTxwmB+sWh/2UcG8RZXyjowP4zHh
+hjhC3weBXQltSktL92Xg92F3nnBiTY6YKZ+8UQx34WGzTC+DjAXbE7d84LTufMkA
+pckM01O9LY3S6QHxsZ8AdZmWIe8/yxF7mDTstEZR44IXCAff3p4r7BeI8t6G5pDj
+8TxLlKEdRzF8jtPJ1rm5AgMBAAGjeTB3MFYGA1UdEQRPME2CGXYtaWRwMDEuc3J2
+LnUtYm9yZGVhdXguZnKGMGh0dHBzOi8vdi1pZHAwMS5zcnYudS1ib3JkZWF1eC5m
+ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUKnhNaI/fipTjD6bWLF0lcbs6rMsw
+DQYJKoZIhvcNAQEFBQADggEBAF0Dd1Fvi1mSzozQ1zF+ynVD+Vno7QyhIIQG+yKe
+0W5/ZLrF8ddiAvHku+lXJakRi+7zI45+O85YN1ZmrL8LHtkmoz39YSGBXtQL92PR
+6jLOaQ4AAXG/Co3ONAmT7Qtr8wUBdCdLI1PiHKUoWg5U6CFTROE/1x5TwoALbO1H
+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">http://unknown.site.com</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-bordeaux1.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-bordeaux1.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..82122433
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.u-bordeaux1.fr-idp-shibboleth.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux1.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-11-10T09:27: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bordeaux1.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Bordeaux 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>
+					      MIIDMzCCAhugAwIBAgIUYibTz+Dskx28GtVQ2//RrkKDqr8wDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgxLmZyMB4XDTA5MTEwOTA4NDcx
+M1oXDTI5MTEwOTA4NDcxM1owHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgxLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzOR5TePy0ieJG9TAQBKb
+HxfHdPm7Js3sfkvHdCcM0YKVO2S9XmCgR3SLs8Cu6/MZPosaDmz9qE6xD3RdHA+h
+OZck8PDUOkmlZmJP56XR5LJ5GWkfNFj5spYc330kkmd/pHc1Gvkpg/UTUZHxQ2oC
+S4a86CvRRLxYV2DJw9Xs6xTQdmq3htBjD1UZt1DdEAfKAB+pAym201O09HtVUKEi
+f6rF2/V1aPzBiOLkUI/qjFd0Nxv1AmrfzR6iikCwQow0RixV0JSe4fd3L8OsRl4+
+Og+HvxMgT1gGtS0l0IxskwBadNORi0izo/+QI72KjQuhwlo4qpHz+5IZQxGG7ZBF
+fwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudS1ib3JkZWF1eDEuZnKGKWh0dHBz
+Oi8vaWRwLnUtYm9yZGVhdXgxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR8
+ZWiS0Xn8gBy8RcQS0rxq2mv18DANBgkqhkiG9w0BAQUFAAOCAQEAfBUQ2pwfnv8r
+DT1XgVFPYNqDHwAg34D4iiFiD/LxSBxVucCUGNTvBD6G3r/Q7aKpHmQdxhqZgqKF
+mij0A7JKugv/mXFdjmyA9/GiqPabfQJdDi3QIMgfBb5Vpvcoth+yxRnJ2MzpKAxH
+BeaIdvQ7FXzDhW7vTFDfbpkC1mLEI5/febpi7CAvMkE6AFa9YpnCNvN2MiW9n/jP
+bxoITGkd9gp938GswozJ4c8CLWVPt85EOPdpOqNCVXtL661myHQdSYltGFvT+jgd
+yaUfAtl8hB0qTx/dI2xOtYJa5ROvs2OVSp0mi8otLv2fgDnkRDISwt8QpRTqsMaP
+PuVhZrOujQ==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc: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-bordeaux1.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux1.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux1.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-bordeaux1.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDMzCCAhugAwIBAgIUYibTz+Dskx28GtVQ2//RrkKDqr8wDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgxLmZyMB4XDTA5MTEwOTA4NDcx
+M1oXDTI5MTEwOTA4NDcxM1owHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgxLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzOR5TePy0ieJG9TAQBKb
+HxfHdPm7Js3sfkvHdCcM0YKVO2S9XmCgR3SLs8Cu6/MZPosaDmz9qE6xD3RdHA+h
+OZck8PDUOkmlZmJP56XR5LJ5GWkfNFj5spYc330kkmd/pHc1Gvkpg/UTUZHxQ2oC
+S4a86CvRRLxYV2DJw9Xs6xTQdmq3htBjD1UZt1DdEAfKAB+pAym201O09HtVUKEi
+f6rF2/V1aPzBiOLkUI/qjFd0Nxv1AmrfzR6iikCwQow0RixV0JSe4fd3L8OsRl4+
+Og+HvxMgT1gGtS0l0IxskwBadNORi0izo/+QI72KjQuhwlo4qpHz+5IZQxGG7ZBF
+fwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudS1ib3JkZWF1eDEuZnKGKWh0dHBz
+Oi8vaWRwLnUtYm9yZGVhdXgxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR8
+ZWiS0Xn8gBy8RcQS0rxq2mv18DANBgkqhkiG9w0BAQUFAAOCAQEAfBUQ2pwfnv8r
+DT1XgVFPYNqDHwAg34D4iiFiD/LxSBxVucCUGNTvBD6G3r/Q7aKpHmQdxhqZgqKF
+mij0A7JKugv/mXFdjmyA9/GiqPabfQJdDi3QIMgfBb5Vpvcoth+yxRnJ2MzpKAxH
+BeaIdvQ7FXzDhW7vTFDfbpkC1mLEI5/febpi7CAvMkE6AFa9YpnCNvN2MiW9n/jP
+bxoITGkd9gp938GswozJ4c8CLWVPt85EOPdpOqNCVXtL661myHQdSYltGFvT+jgd
+yaUfAtl8hB0qTx/dI2xOtYJa5ROvs2OVSp0mi8otLv2fgDnkRDISwt8QpRTqsMaP
+PuVhZrOujQ==
+					    </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-bordeaux1.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 Bordeaux 1</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Bordeaux 1</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>RAYNAL Karen</md:SurName>
+    <md:EmailAddress>karen.raynal@u-bordeaux1.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>BONNET Pascal</md:SurName>
+    <md:EmailAddress>pascal.bonnet@u-bordeaux1.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..09d4e870
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux2.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-22T13:59: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bordeaux2.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Bordeaux 2 - Victor Segalen</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDMzCCAhugAwIBAgIUc4KqBCpHPbcVzlUyb7nDoJn4CK0wDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgyLmZyMB4XDTA5MDYyMzA5MTUy
+MVoXDTI5MDYyMzA5MTUyMVowHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgyLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAktJPvpXPKI/6Nl1dysLc
+oZZCrvCg9QhUW+ELfNLGBR4p8FmkXC/1RT7osvEt6MsFVhjtOO/3idpbQkqXhlMD
+ORfcm4hSPDCoEM1OmlwlfHBqeVVb+rfLzEswAQt/v+/IGo3cY9ISa+zUbIEOy5Nu
++LXG1qYd8/tadV7kgsv+kgvCpkspwdqQArParmjboeGYnGD2E1AL3XgU42R/G3Vn
++kNDevHVc1dk6ZKz+7ZqJy5V1pkco5+g9ydAgoTRH6si+AZc975mrzJhAfiwQsoh
+qwpm546ZLaaPXjzJim7S+jA1clc8R/ljGTBZFaWhVIUqJupj5ynAngeOW4OxECGZ
+fwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudS1ib3JkZWF1eDIuZnKGKWh0dHBz
+Oi8vaWRwLnUtYm9yZGVhdXgyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3
+TXyR0d3UvTuQcCnpnWw/mqJyzjANBgkqhkiG9w0BAQUFAAOCAQEAWYtEQih5OA9S
+Apst2Etm8TTDUAttPVxTPkTf263R/An4g8GLngITxCBE4zySoux8KbqPAhQDoFmT
+opRajsYbdzHdQJhNXegBeFbjdr3xaPgVq10mAGk0ZHzsdjivyW2XhSDnzXXn79Xa
+etxfQrJS7o3K992BFAeje6QvjLD3428BBLS6zxMapBPQi07Qufc7Jy7cSLI8xjAj
+xnCcpD6NEdTmHoD7i4krgmzByDoFLNCnAWQAvwze60yOwOaTZy1ccnKheRE/MGuZ
+CDJF+BVT5M2AwByRtc/852lumMNLljK4Jmg9SMPqvjKJUrg6xov89NVIF5I+vOBn
+fNrBEZFRlQ==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc: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-bordeaux2.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux2.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux2.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Bordeaux 2 - Victor Segalen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Bordeaux 2 - Victor Segalen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Laurent LAVAUD</md:SurName>
+    <md:EmailAddress>laurent.lavaud@u-bordeaux2.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Doris CHAUVET</md:SurName>
+    <md:EmailAddress>doris.chauvet@u-bordeaux2.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux4.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-bordeaux4.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..53166256
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.u-bordeaux4.fr-idp-shibboleth.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux4.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-19T16:44: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bordeaux4.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Bordeaux IV - Montesquieu</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEcTCCA1mgAwIBAgIQe/xNXBd/8nI5WdMYC8tEVTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDEyNzAwMDAwMFoXDTE3MDIwMTIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAudS1ib3Jk
+ZWF1eDQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUm20TitE1
+eSHNsQsX3IIxBv3MO1wSuM5m6EZR47cQcXBw8G67R5aMb3VPpISDUhGrwIEChBA3
+TuzLIQg8krOO3O2q8Ci42EvR39yLd7RL4bySff6kqXjthY9ZrNMTidhaesrWYM1X
+LjpRfp6cYzxDm3tUnh1BOmzhTOpkTFWVKm7I/5H31G9Jsk4GoJLrQABYmXWKUkgE
+qDZFpmL1PaWBCfc0nI8yJTBJaNoDTvg8hyuYp2eqzYxeSYvUmiR1qB0XWSBcsGxI
+qj8Nwf8ZhG/svARsl8NHHtUUkouzRNceMizOW+4fYNWIAfN1usbILJhRH5x1W92G
+oYeft0ajN571AgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQU/ItUXC+Ogoq75dzOPDlSQzTrJ5swDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC51LWJvcmRlYXV4NC5m
+cjANBgkqhkiG9w0BAQUFAAOCAQEAqNFLvqI7svZtmwNEM2d6z4aRgLeNYYPUqwF4
+2DFOqEN6k4fwhfnM8S8qVvOawcufDp9Im0VAz+Km0Z26vz8wxknx5S47wABjQlJW
+XwIqwNROkistKPhifvb0y1dZCRC39X3ccRhrKpKeSxSCZIu9kJNyKlzmC4u8DcjL
+QHYdg931OMJTkXoWWNbHRJ5vVtk3kHnYCvv9sZrGpU1DQV6uVKpIKA5ELPGy/1Gj
+xxG5U3bUoJZkhqQTOeSBhoEDjxVDtn0d5cK8XkI3D4w5rHIhOaX5zGb6RBiMEKWN
+p3uNJNwuPeKlsQM3XwQJZVa6oIGNXHNpbTnKBA19nLCIhVIkzg==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIELDCCAxSgAwIBAgILAQAAAAABGgGKLagwDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
+bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
+MDUxOTE0MTY0MFoXDTExMDUxOTE0MTY0MFowUzELMAkGA1UEBhMCRlIxITAfBgNV
+BAoTGFVuaXZlcnNpdGUgZGUgQm9yZGVhdXggSTEhMB8GA1UEAxMYZmVkZXJhdGlv
+bi51LWJvcmRlYXV4LmZyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBXbfu
+j9ECYz1i9mB1ngG+owir54YduGNtw7+H5N8zXJ0eGnBJ46ckksm5fKk7Mbqw7fpy
+HxIkIcse78NBDPby+7szRy6to+LrEWLEQ4HZsuhBvN+k3WMbTsOysnWiYqhok4HT
+0gD5aGmW4f+vGHp8dIzP/zy8A+Kh3VST3giAHQIDAQABo4IBdzCCAXMwUAYDVR0g
+BEkwRzBFBgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFs
+c2lnbi5uZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNV
+HSMEGDAWgBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUzUMWQ1mtrjc1
+slM6B/4/w0r3aWswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxz
+aWduLm5ldC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUF
+BzAChjNodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRp
+b25hbC5jcnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCMGA1UdEQQc
+MBqCGGZlZGVyYXRpb24udS1ib3JkZWF1eC5mcjANBgkqhkiG9w0BAQUFAAOCAQEA
+PE0zsF/dzWiL+cDDZYKUpOh/hQjXx0pO6Aqpi3vW2N6S+FR5bm+jKI6C7fAYylOJ
+Rd4ZEMRjbCj6ttLlh0JHfr0fL+T4UhM8A2wJxIglMotc/bExITkGSbggtH6q8K2R
+tspC1yMPGzSdBCNMdAStJpvY9F8m9qcGioONc4aIcDOhr9WLGt9qlqXki2Faz+Yk
+qfeKlgSHRs/2w95X2X5ZYewPGZQRbrozPO6E8sYyD8PDHPRvYdemWBchBAg5vXHx
+BLp1hVyPYOp2E2ciIAxni5cb4RwWUEmud+VI8a8V6Q+HQNPFIEfcNO7azovMdh/K
+DwR9zqqffVjNz5LbLeGi7g==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc: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-bordeaux4.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux4.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux4.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-bordeaux4.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEcTCCA1mgAwIBAgIQe/xNXBd/8nI5WdMYC8tEVTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDEyNzAwMDAwMFoXDTE3MDIwMTIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAudS1ib3Jk
+ZWF1eDQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUm20TitE1
+eSHNsQsX3IIxBv3MO1wSuM5m6EZR47cQcXBw8G67R5aMb3VPpISDUhGrwIEChBA3
+TuzLIQg8krOO3O2q8Ci42EvR39yLd7RL4bySff6kqXjthY9ZrNMTidhaesrWYM1X
+LjpRfp6cYzxDm3tUnh1BOmzhTOpkTFWVKm7I/5H31G9Jsk4GoJLrQABYmXWKUkgE
+qDZFpmL1PaWBCfc0nI8yJTBJaNoDTvg8hyuYp2eqzYxeSYvUmiR1qB0XWSBcsGxI
+qj8Nwf8ZhG/svARsl8NHHtUUkouzRNceMizOW+4fYNWIAfN1usbILJhRH5x1W92G
+oYeft0ajN571AgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQU/ItUXC+Ogoq75dzOPDlSQzTrJ5swDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC51LWJvcmRlYXV4NC5m
+cjANBgkqhkiG9w0BAQUFAAOCAQEAqNFLvqI7svZtmwNEM2d6z4aRgLeNYYPUqwF4
+2DFOqEN6k4fwhfnM8S8qVvOawcufDp9Im0VAz+Km0Z26vz8wxknx5S47wABjQlJW
+XwIqwNROkistKPhifvb0y1dZCRC39X3ccRhrKpKeSxSCZIu9kJNyKlzmC4u8DcjL
+QHYdg931OMJTkXoWWNbHRJ5vVtk3kHnYCvv9sZrGpU1DQV6uVKpIKA5ELPGy/1Gj
+xxG5U3bUoJZkhqQTOeSBhoEDjxVDtn0d5cK8XkI3D4w5rHIhOaX5zGb6RBiMEKWN
+p3uNJNwuPeKlsQM3XwQJZVa6oIGNXHNpbTnKBA19nLCIhVIkzg==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIELDCCAxSgAwIBAgILAQAAAAABGgGKLagwDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
+bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
+MDUxOTE0MTY0MFoXDTExMDUxOTE0MTY0MFowUzELMAkGA1UEBhMCRlIxITAfBgNV
+BAoTGFVuaXZlcnNpdGUgZGUgQm9yZGVhdXggSTEhMB8GA1UEAxMYZmVkZXJhdGlv
+bi51LWJvcmRlYXV4LmZyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBXbfu
+j9ECYz1i9mB1ngG+owir54YduGNtw7+H5N8zXJ0eGnBJ46ckksm5fKk7Mbqw7fpy
+HxIkIcse78NBDPby+7szRy6to+LrEWLEQ4HZsuhBvN+k3WMbTsOysnWiYqhok4HT
+0gD5aGmW4f+vGHp8dIzP/zy8A+Kh3VST3giAHQIDAQABo4IBdzCCAXMwUAYDVR0g
+BEkwRzBFBgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFs
+c2lnbi5uZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNV
+HSMEGDAWgBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUzUMWQ1mtrjc1
+slM6B/4/w0r3aWswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxz
+aWduLm5ldC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUF
+BzAChjNodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRp
+b25hbC5jcnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCMGA1UdEQQc
+MBqCGGZlZGVyYXRpb24udS1ib3JkZWF1eC5mcjANBgkqhkiG9w0BAQUFAAOCAQEA
+PE0zsF/dzWiL+cDDZYKUpOh/hQjXx0pO6Aqpi3vW2N6S+FR5bm+jKI6C7fAYylOJ
+Rd4ZEMRjbCj6ttLlh0JHfr0fL+T4UhM8A2wJxIglMotc/bExITkGSbggtH6q8K2R
+tspC1yMPGzSdBCNMdAStJpvY9F8m9qcGioONc4aIcDOhr9WLGt9qlqXki2Faz+Yk
+qfeKlgSHRs/2w95X2X5ZYewPGZQRbrozPO6E8sYyD8PDHPRvYdemWBchBAg5vXHx
+BLp1hVyPYOp2E2ciIAxni5cb4RwWUEmud+VI8a8V6Q+HQNPFIEfcNO7azovMdh/K
+DwR9zqqffVjNz5LbLeGi7g==
+					    </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-bordeaux4.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 Bordeaux IV - Montesquieu</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Bordeaux IV - Montesquieu</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Coussy</md:SurName>
+    <md:EmailAddress>helene.coussy@u-bordeaux4.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
new file mode 100644
index 00000000..892bc239
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.u-cergy.fr-idp-shibboleth.xml
@@ -0,0 +1,54 @@
+<?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>
+      <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="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>
+					      MIIDJDCCAgygAwIBAgIVAL5VX/FyJxE+QaVPYflgTRs+IqDyMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC51LWNlcmd5LmZyMB4XDTA5MTEyMDE1MTIyNVoX
+DTI5MTEyMDE1MTIyNVowGTEXMBUGA1UEAxMOaWRwLnUtY2VyZ3kuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7KhqnXYp0okpZLWhOZfE0/a6hGLOB
+08hVe7wynrKu5rBBXl290/67ral6I2o2Vb2moNpJ+/4Jfoq/dS6pJqGsAQAIIiuJ
+B7Cg1OI0xFSBCNlOw7Pl8790IeX+hDxwlmFCiedz8yU4QaqDypmr8minfUIrcLjE
+Q18eRsHCkRI9yHm6CzZ9qyX9I3pHvkYYwjrOcZ3MR4aWzG+c5IT73Th8SL0Wy6xF
+8BKsR5QFb2Lu4lbcIr3PQCmUTetj/4BbOucZG3s1T9T16I5jqLhfraAxkl6rlV5o
+dRN32vJqMIHWTHBt01SK1h0ox1vfClR86QGFsJDerIy3TRd9AvNwBLkFAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC51LWNlcmd5LmZyhiVodHRwczovL2lkcC51LWNl
+cmd5LmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSRFHgF1B3bXQf6voF95osf
+xbAbhDANBgkqhkiG9w0BAQUFAAOCAQEAtiS/TRfjM8+Ush2VSL/y73Qk6FSExEjQ
+ZEFb5YmXCwpnAmrzKTlTVDhaDyYPB5vMQf0PWN8MB1fOy9J7fnN1ENr0oUVwpgkZ
+88THCKybJbsY2NHhxSGVRIkxuIAKh1ofvR3A/9vwteGkzCZYTVloqUR85CBD2qWq
+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://unknown.site.com</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
new file mode 100644
index 00000000..b192cf4e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.u-clermont1.fr-idp-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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="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>
+					      MIIDMzCCAhugAwIBAgIUNwZDNaZ3tdkFE1H1v5fQOZ0h7xIwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnUtY2xlcm1vbnQxLmZyMB4XDTA4MTEyNjA4MjQy
+OFoXDTI4MTEyNjA4MjQyOFowHTEbMBkGA1UEAxMSaWRwLnUtY2xlcm1vbnQxLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoz9+2ei+Cj+D9fmqSgXV
+iDUF2Fv9KCEoRmxpIVmQJExVgGpBPzAToKzPu6vP0UXnJTItEGq0cQiOZvdkiwjb
+i9lYCJTzp6NA8kSjfI0F7/U3DMAOaqBMIv5NaLkZTH+6YPAqMOBQOb1oBs4YsjW+
+elFvesreBaPmbSotHWCYgfnb29OLAg37CgAmqDjL7ymPAsE0tPgr9USyjtUhWXsI
+kz2A2OPd3Qy+EizPJevne5gNu/2nfa0RwxTUG7p9Q2FXhJj1Jg3Ijs0PwWpqSM/q
+qrmKActd9uzeHenor13kprK47Ep+K+xIV3CC0gFlRxbZohFrpqvXUun4Gyk3dOuq
+/QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudS1jbGVybW9udDEuZnKGKWh0dHBz
+Oi8vaWRwLnUtY2xlcm1vbnQxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTP
+x7ipW2IlVbBux4f/glTdrZcq8zANBgkqhkiG9w0BAQUFAAOCAQEAAUqxVk6Dm5ZS
+jQl1fY+x4Qcc7kSE7vksmWNlhO5WC7NMftDOSzJaoyOlPlP15ONoSPaH/0R2rBRE
+FTvvQNQ7Mpckur1lnTFvLpkAaZ9YSe+wiksHeXQhxN8vb6PYT4Td1CS98efueae4
+1bFIzour2gi4h4e86Zgv18YAr5eBmp38mYYOghxwk67uVdwU2trVIi2EjSbE4AWL
++tu/H6jCK1dMSPCt0UZnv0jSOGU+eCtDPOhD2P/338GEPw2NfwpB85TlGIOf5u0a
+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>
+					      MIIDMzCCAhugAwIBAgIUNwZDNaZ3tdkFE1H1v5fQOZ0h7xIwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnUtY2xlcm1vbnQxLmZyMB4XDTA4MTEyNjA4MjQy
+OFoXDTI4MTEyNjA4MjQyOFowHTEbMBkGA1UEAxMSaWRwLnUtY2xlcm1vbnQxLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoz9+2ei+Cj+D9fmqSgXV
+iDUF2Fv9KCEoRmxpIVmQJExVgGpBPzAToKzPu6vP0UXnJTItEGq0cQiOZvdkiwjb
+i9lYCJTzp6NA8kSjfI0F7/U3DMAOaqBMIv5NaLkZTH+6YPAqMOBQOb1oBs4YsjW+
+elFvesreBaPmbSotHWCYgfnb29OLAg37CgAmqDjL7ymPAsE0tPgr9USyjtUhWXsI
+kz2A2OPd3Qy+EizPJevne5gNu/2nfa0RwxTUG7p9Q2FXhJj1Jg3Ijs0PwWpqSM/q
+qrmKActd9uzeHenor13kprK47Ep+K+xIV3CC0gFlRxbZohFrpqvXUun4Gyk3dOuq
+/QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudS1jbGVybW9udDEuZnKGKWh0dHBz
+Oi8vaWRwLnUtY2xlcm1vbnQxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTP
+x7ipW2IlVbBux4f/glTdrZcq8zANBgkqhkiG9w0BAQUFAAOCAQEAAUqxVk6Dm5ZS
+jQl1fY+x4Qcc7kSE7vksmWNlhO5WC7NMftDOSzJaoyOlPlP15ONoSPaH/0R2rBRE
+FTvvQNQ7Mpckur1lnTFvLpkAaZ9YSe+wiksHeXQhxN8vb6PYT4Td1CS98efueae4
+1bFIzour2gi4h4e86Zgv18YAr5eBmp38mYYOghxwk67uVdwU2trVIi2EjSbE4AWL
++tu/H6jCK1dMSPCt0UZnv0jSOGU+eCtDPOhD2P/338GEPw2NfwpB85TlGIOf5u0a
+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://unknown.site.com</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
new file mode 100644
index 00000000..f6df5ac3
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.u-paris2.fr-idp-shibboleth.xml
@@ -0,0 +1,54 @@
+<?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>
+      <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="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>
+					      MIIDKDCCAhCgAwIBAgIVAINFA2whEjq7dIPf8YLpG746hePRMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkcC51LXBhcmlzMi5mcjAeFw0xNDA0MjkwNzQ4MjJa
+Fw0zNDA0MjkwNzQ4MjJaMBoxGDAWBgNVBAMTD2lkcC51LXBhcmlzMi5mcjCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANXXoMeffbh8zBylAJsvJYWVAvsl
+1i1KpJ4xVDftwXJAAc2rpzSH2vWZ4qXKm677GYWyrD6U5SC7tFrYKhnCIuTKyzyg
+Wa93DyjDngc92+ci6ESR3DbpTkLtu5QqCzp+MNy1X7ggo24YagZHwYSpu+ftIZtr
+bZhK0xou+sEXg7kap+QTCYI1WHs/S84p53FRzKdDENg3JwLY8bVSwHK/Ikdanq0S
+4HpCVS7nIxh/Pxj0dL7X7GqclJS5CQZWTvNgGfeI5pbtuN9EvUyYzIn7DL/ADhRh
+60Q8RAmFx6i7touVzWuLAaIOYKrQhf2BKZnRrRj27mxHfee9vWPryla0UBUCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRwLnUtcGFyaXMyLmZyhiZodHRwczovL2lkcC51
+LXBhcmlzMi5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU0UgDCtUMhwUc/VRK
+AG2CRoL4NpMwDQYJKoZIhvcNAQEFBQADggEBALyLQEriutI0U1ObNVQPGIT7qien
+9mvExaFkO4B0a4lIEpK19Mv2nVLxuJgd3Ov32GACN8kF8M+rldrlNEVNd6l3kW2I
+XhHLjOr4MHhWp9bzAOYZ6Nr28iOwcylDloHAcEUo+8iBwgiCrfcMAeF5EhRbyTIw
+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://unknown.site.com</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
new file mode 100644
index 00000000..fda80f09
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.u-picardie.fr-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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="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>
+					      MIIDLzCCAhegAwIBAgIUc8NfuYdK4dyRrkHm6/tLQySUqJIwDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAwwRaWRwLnUtcGljYXJkaWUuZnIwHhcNMTQxMDE2MDcwNzMz
+WhcNMzQxMDE2MDcwNzMzWjAcMRowGAYDVQQDDBFpZHAudS1waWNhcmRpZS5mcjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIXETB/OTBKk7/ZYdhwaXv/C
+aOZF3gT6kl41CEjA7l5cqbL92LV6FSxW0QnvoRogXqGsNoO54HfepaFWWAg9bTJR
+Jdb7SRGQGOhWcuYFag3Q6i5s6/GJaaeapAX5o0Rzld3/2/uPyeTQBtkfYYU//vgZ
+tE8Lf3HDYMJD1B9HuerE8glmEDLB0N/bxAAZI7T2BRmg8+PXnJOZ4SIk77eHMnP1
+Ae5JfKWeqfF8AgLxnP4JD7zHuQT8lB2JbfmAyf1bOSa7ivCEeDOh48rNnBV78uw5
+1N1cMRsIoc+bbd+jkElU8jCu4pbvRfU17pMePbfUnD7I8g0P8r7VJiUIxG7DIvMC
+AwEAAaNpMGcwHQYDVR0OBBYEFNIgDO/aawjPE0CQ0GfmqjVnE6GRMEYGA1UdEQQ/
+MD2CEWlkcC51LXBpY2FyZGllLmZyhihodHRwczovL2lkcC51LXBpY2FyZGllLmZy
+L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQADjxTKGUIdJMklNUpE
+LiNIGAjS1VDb6B5HEzm6up7LejLhoHlyuioAUN44fxvCL1ohHxdIRw0x8KhGjdy1
+2U8GF3nFdW54Mq4UqAXeCcJ2l2zKhAwScsTvN/8M1tAD1u7nm/0gb8H82NPxsF3V
+M7WZ6QFH8UhZZ9a+oZOsLDokNV6RnkvSINxmNYzDFhe9QtYP07xjkOAYIwwS6nYz
+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>
+					      MIIDajCCAlKgAwIBAgIVANKhuMi11QAW10TrFPegvTUOqn3bMA0GCSqGSIb3DQEB
+BQUAMCoxKDAmBgNVBAMTH3NoaWJib2xldGgtMDEud2ViLnUtcGljYXJkaWUuZnIw
+HhcNMTEwNjE2MTE0MzAyWhcNMzEwNjE2MTE0MzAyWjAqMSgwJgYDVQQDEx9zaGli
+Ym9sZXRoLTAxLndlYi51LXBpY2FyZGllLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAqE10/hCWipQR0b5yUl7RBSKmdCR7FaKoKlItTYH6cUg+4VtL
+ch6TfC3a5sKWxUpvaiIxhGFY9tJLAOZBIPhCmxDL9qVhEWrDSDSVZlrRDk0gcz6s
+1seesw5PfBV5NFrSdAcm5kXq06w7Q4zU+Zp3SMxpO1NwacYxqGSJkbB+PzuB0HXK
+VDTxRpLCuBIW/YVPSQLGasX/eyfz0w+ZL5h4aH3iQ4KGX+hfWAWLTOqFoTrtnUvc
+0g39O8X4F1hvT5sa+EHH6zcKgFGsAdTJ9DJ8EP7vrC0hpaoZ+v44+nQVDu3U21gU
+of0STgejsbENg90Ry5ETJ8FFeJjD8aYBL4hQnwIDAQABo4GGMIGDMGIGA1UdEQRb
+MFmCH3NoaWJib2xldGgtMDEud2ViLnUtcGljYXJkaWUuZnKGNmh0dHBzOi8vc2hp
+YmJvbGV0aC0wMS53ZWIudS1waWNhcmRpZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNV
+HQ4EFgQUlFARoLe/bZx6V/mwyt/kNXyC1CgwDQYJKoZIhvcNAQEFBQADggEBAAHn
+NetmyI9pEXPUOCLCBuZqddqeNpZi1vE5QUH7N0C+W1ntw8aM4G0lT0CKCUfMMcqY
+lWeP/+dHv2pFi3imv1VosjP8K0eeUAoi4PWJd2kcTJ5SnTL+Qw6ZXLWstgGcWtKZ
+cj7epGci4G2/mw/9k7FR51Yt9FrFZJDc84jwAbO5W+EJNO88hbkm+bRJNiM9Z/3m
+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://unknown.site.com</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
new file mode 100644
index 00000000..f2ce3b16
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.u-psud.fr-idp.xml
@@ -0,0 +1,62 @@
+<?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>
+      <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: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>
+					      MIIDHzCCAgegAwIBAgIUEQSMail62qHLjxXRxQKl6EGDTg0wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAwwNaWRwLnUtcHN1ZC5mcjAeFw0xNDExMjExNDE1MzJaFw0z
+NDExMjExNDE1MzJaMBgxFjAUBgNVBAMMDWlkcC51LXBzdWQuZnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbhNREXZe3xC/XLkzwaj4c2ezFQFfK20BF
+HiK3MNX5Lk9Z/g596q/Ehaa/eJqNHUJOT+Fk3PW667BxsSzHWX9L0HwKC8FR/Zqf
+Iq8r4SZu+JPY3DGDfONsEKHxH9JA2kgQJo3Xi05IOy6x61zmPVEfDyizpKDdKgup
+08dH5ZSfayJwy5tBhULmr9lzFaNHRIPkwq1+mPu/F4UZp/jgmceuWM1a3RuPoJNd
+xAJ5/Y0AnRJcUDYlkIiqT1uB15kzupv/54lJIMRGubEFq3DhvS5C2H1XdxvwSg+Y
+b6d3+6i7AEvnwbfMMAtHC37ZliSqYl6RQ3+JbkADrK1HYyJxB20zAgMBAAGjYTBf
+MB0GA1UdDgQWBBQbAbl3tovFK/edPOK97uBQRnhKPzA+BgNVHREENzA1gg1pZHAu
+dS1wc3VkLmZyhiRodHRwczovL2lkcC51LXBzdWQuZnIvaWRwL3NoaWJib2xldGgw
+DQYJKoZIhvcNAQEFBQADggEBAHi9F3kzIyShgaeVsMeMZbiPA8HXxdeBMBi6YiuN
+DsIFB0AEMBLkB3RHlIgm1ja9FO66k8XJ1MUkjPMFHE19aKw08NiHyHPLnKXqPbiM
+dNAnGOsPEGSGra3yZ/gdn0MBqnM+nvEfZTo396OkA0VlbZL4OxxvTEcDof7eObgw
+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://unknown.site.com</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.ucreative.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.ucreative.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..d8a56413
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ucreative.ac.uk-oala-metadata.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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>
+						MIIDYjCCAkqgAwIBAgIIJo1biNwPrSgwDQYJKoZIhvcNAQEFBQAwSDEoMCYGA1UE
+						CgwfVW5pdmVyc2l0eSBvZiB0aGUgQ3JlYXRpdmUgQXJ0czEcMBoGA1UEAwwTaWRw
+						LnVjcmVhdGl2ZS5hYy51azAeFw0xNDA2MTgwOTU4MDRaFw0yNDA2MTgwOTU4MDRa
+						MEgxKDAmBgNVBAoMH1VuaXZlcnNpdHkgb2YgdGhlIENyZWF0aXZlIEFydHMxHDAa
+						BgNVBAMME2lkcC51Y3JlYXRpdmUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
+						DwAwggEKAoIBAQDDWJ5V75TP17ft7xWNE1OLty4PKX6Ntd+4HurvVjZ8UU9T3zII
+						YgYbccWNaakLxM8cbrJFJuyTPKryfT/KQQlXaMj1f3dKYEWHZwoMrcNL+RRyoSFJ
+						rOuMFvC7xH7RF/ZoXZM1IQrHuYmlHW8YzQ7Gq/266/lDLCLEAt5zw2icTBeeSXzX
+						PSvywT6WnSPBKACLvJ/n2HbDDj6wi+pPHvkDeBVPVt7jH0KaDNpQtcoVbXBeRv3S
+						wwOfr7lDWB5ydebEDgZjCfB+7P0EOQyGmylT4+TxGKyEOZMNaZ6X4sgSCUOHq//4
+						nrZw23XxPrPgbJ4anXKKjI4CuJQv8oH1eV5VAgMBAAGjUDBOMB0GA1UdDgQWBBQF
+						0udRgqvg95A7Qo+xph4DcxCsnzAfBgNVHSMEGDAWgBQF0udRgqvg95A7Qo+xph4D
+						cxCsnzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPT/cxiwyp9PeO
+						8Y9oo/VlxzvwwElBDfs7Z0t+jLIB9xnybKv/6+SBlaHLJjekuF2Or1M0GODTZM6E
+						BhlKYkPnR458hEVH4Tvfxvxz8szkM10f2qttwW1fJ521SrUDpjkbzAhvQWWDHuKG
+						T6/P5OqeESsgRHQxP15jOBIR9dUrw23fKdRqCQKnFrv5th67uiOTzQohI8j5Tm96
+						zbQVayzUvXTkXa+WFk69R/wu5UJqvsSV/5aMvGFxtS0PHTvJvbbw7ZGllRiaTVP8
+						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>
+						MIIDYjCCAkqgAwIBAgIIJo1biNwPrSgwDQYJKoZIhvcNAQEFBQAwSDEoMCYGA1UE
+						CgwfVW5pdmVyc2l0eSBvZiB0aGUgQ3JlYXRpdmUgQXJ0czEcMBoGA1UEAwwTaWRw
+						LnVjcmVhdGl2ZS5hYy51azAeFw0xNDA2MTgwOTU4MDRaFw0yNDA2MTgwOTU4MDRa
+						MEgxKDAmBgNVBAoMH1VuaXZlcnNpdHkgb2YgdGhlIENyZWF0aXZlIEFydHMxHDAa
+						BgNVBAMME2lkcC51Y3JlYXRpdmUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
+						DwAwggEKAoIBAQDDWJ5V75TP17ft7xWNE1OLty4PKX6Ntd+4HurvVjZ8UU9T3zII
+						YgYbccWNaakLxM8cbrJFJuyTPKryfT/KQQlXaMj1f3dKYEWHZwoMrcNL+RRyoSFJ
+						rOuMFvC7xH7RF/ZoXZM1IQrHuYmlHW8YzQ7Gq/266/lDLCLEAt5zw2icTBeeSXzX
+						PSvywT6WnSPBKACLvJ/n2HbDDj6wi+pPHvkDeBVPVt7jH0KaDNpQtcoVbXBeRv3S
+						wwOfr7lDWB5ydebEDgZjCfB+7P0EOQyGmylT4+TxGKyEOZMNaZ6X4sgSCUOHq//4
+						nrZw23XxPrPgbJ4anXKKjI4CuJQv8oH1eV5VAgMBAAGjUDBOMB0GA1UdDgQWBBQF
+						0udRgqvg95A7Qo+xph4DcxCsnzAfBgNVHSMEGDAWgBQF0udRgqvg95A7Qo+xph4D
+						cxCsnzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPT/cxiwyp9PeO
+						8Y9oo/VlxzvwwElBDfs7Z0t+jLIB9xnybKv/6+SBlaHLJjekuF2Or1M0GODTZM6E
+						BhlKYkPnR458hEVH4Tvfxvxz8szkM10f2qttwW1fJ521SrUDpjkbzAhvQWWDHuKG
+						T6/P5OqeESsgRHQxP15jOBIR9dUrw23fKdRqCQKnFrv5th67uiOTzQohI8j5Tm96
+						zbQVayzUvXTkXa+WFk69R/wu5UJqvsSV/5aMvGFxtS0PHTvJvbbw7ZGllRiaTVP8
+						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>
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
new file mode 100644
index 00000000..dee6eee7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ucs.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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>
+						MIIDHzCCAgegAwIBAgIUHNOHSlpAfJGT9rl3zRDmwa3SDhMwDQYJKoZIhvcNAQEF
+						BQAwGDEWMBQGA1UEAxMNaWRwLnVjcy5hYy51azAeFw0xNDA0MTYxNDI4MDNaFw0z
+						NDA0MTYxNDI4MDNaMBgxFjAUBgNVBAMTDWlkcC51Y3MuYWMudWswggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCxdBx+Yitont8++RjBk3LRjqNAvHMPUdy
+						J6hSQFmQ5EPN3YQDzJ/2m9tGH+TO8uKCiiOd0zMzA4zzkOtGTyNNqjk0+ENR4PJa
+						0XOOk7PXJTuXbo5frqZ7a3wi1oVtm+SuOi7cg35ya0+w70xQ6iVE449cdGi6zi7p
+						O5/BXVQGDPusH13EswEC2JeTX7dGDCvM9wYbJvIbVvrCX4R4YB+fJg5h7/JyveXc
+						VtZbmGaQ0Xuu6fAXn0G2Y9/72NGpvOcM3LUPyHy1iBUzaClV9TRoBCJIvdojPQ8k
+						4O+/dz3Qq2NkpSSOUsTOldzeZuRXhzrJVCmDJH0RxawJ1czDLtgxAgMBAAGjYTBf
+						MD4GA1UdEQQ3MDWCDWlkcC51Y3MuYWMudWuGJGh0dHBzOi8vaWRwLnVjcy5hYy51
+						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUOU13V/q7ER53eftMiDzdpx/ur6Mw
+						DQYJKoZIhvcNAQEFBQADggEBAGrR1rz3rBUkNLDk0a7KMP+AKRP+ei+YOy1DkTt1
+						nF0/QrIVulgk5/82uw5rtp07xPJLveTM71/cjC/NXhV0lDPtGe+7jDwBjsaSKf8d
+						k8sRow8dIcViLwcyvS8yaC5PLdc6aTALKNYrhzKuLq9zbKXpxB6ZW3x/S16/cH+U
+						jGFtEu7tGSF9K8Y8pNu7cCuDylk3iz8v7spPeAembJyNAX8x6Stwseq4L5HJuHsm
+						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>
+						MIIDHzCCAgegAwIBAgIUHNOHSlpAfJGT9rl3zRDmwa3SDhMwDQYJKoZIhvcNAQEF
+						BQAwGDEWMBQGA1UEAxMNaWRwLnVjcy5hYy51azAeFw0xNDA0MTYxNDI4MDNaFw0z
+						NDA0MTYxNDI4MDNaMBgxFjAUBgNVBAMTDWlkcC51Y3MuYWMudWswggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCxdBx+Yitont8++RjBk3LRjqNAvHMPUdy
+						J6hSQFmQ5EPN3YQDzJ/2m9tGH+TO8uKCiiOd0zMzA4zzkOtGTyNNqjk0+ENR4PJa
+						0XOOk7PXJTuXbo5frqZ7a3wi1oVtm+SuOi7cg35ya0+w70xQ6iVE449cdGi6zi7p
+						O5/BXVQGDPusH13EswEC2JeTX7dGDCvM9wYbJvIbVvrCX4R4YB+fJg5h7/JyveXc
+						VtZbmGaQ0Xuu6fAXn0G2Y9/72NGpvOcM3LUPyHy1iBUzaClV9TRoBCJIvdojPQ8k
+						4O+/dz3Qq2NkpSSOUsTOldzeZuRXhzrJVCmDJH0RxawJ1czDLtgxAgMBAAGjYTBf
+						MD4GA1UdEQQ3MDWCDWlkcC51Y3MuYWMudWuGJGh0dHBzOi8vaWRwLnVjcy5hYy51
+						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUOU13V/q7ER53eftMiDzdpx/ur6Mw
+						DQYJKoZIhvcNAQEFBQADggEBAGrR1rz3rBUkNLDk0a7KMP+AKRP+ei+YOy1DkTt1
+						nF0/QrIVulgk5/82uw5rtp07xPJLveTM71/cjC/NXhV0lDPtGe+7jDwBjsaSKf8d
+						k8sRow8dIcViLwcyvS8yaC5PLdc6aTALKNYrhzKuLq9zbKXpxB6ZW3x/S16/cH+U
+						jGFtEu7tGSF9K8Y8pNu7cCuDylk3iz8v7spPeAembJyNAX8x6Stwseq4L5HJuHsm
+						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>
diff --git a/swamid-interfederations-2.0/idp.ucuenca.edu.ec-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ucuenca.edu.ec-idp-shibboleth.xml
new file mode 100644
index 00000000..35e1d142
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ucuenca.edu.ec-idp-shibboleth.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-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.ucuenca.edu.ec/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://minga.cedia.org.ec" registrationInstant="2014-10-17T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
+                                http://www.cedia.org.ec/minga
+                        </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucuenca.edu.ec</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UCUENCA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">UCUENCA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                                UCUENCA - University of Cuenca
+                        </mdui:Description>
+        <mdui:Description xml:lang="es">
+                                UCUENCA - Universidad de Cuenca
+                        </mdui:Description>
+        <mdui:InformationURL xml:lang="en">
+                                http://www.ucuenca.edu.ec
+                        </mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">
+                                http://www.ucuenca.edu.ec
+                        </mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIHfzCCBWegAwIBAgIBCzANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMCRUMx
+DjAMBgNVBAgTBUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElB
+MUYwRAYDVQQLEz1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJv
+bGxvIGRlIEludGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVj
+MR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE0MDYyNjIyNDcz
+MloXDTE5MDYyNTIyNDczMlowgaAxCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVh
+eTEPMA0GA1UEBxMGQ3VlbmNhMRAwDgYDVQQKEwdVY3VlbmNhMR4wHAYDVQQLExVV
+bml2ZXJzaWRhZCBkZSBDdWVuY2ExGzAZBgNVBAMTEmlkcC51Y3VlbmNhLmVkdS5l
+YzEhMB8GCSqGSIb3DQEJARYSbm9jQHVjdWVuY2EuZWR1LmVjMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEArwRQTiod9Z5u4YrlHPdCewpOVYyY194eam5W
+rlJElPDMmGwhwZiU2wj+gidLlzZl8Dg6/Yuz181aScrz44eZLMiHJEXHo/4Re3Gl
+YybeMbAHX6Tjxhr4Nn6iAFFnre6292ZoiKoG6yqEV08AEY5Tcs5dZClEYX+J5+uG
+czIImWWCb0SE/6pGpK7wH9QJqVgWxxcoQKbHmMYyoRvJuEs6Bm0JFOZjBo62UPsF
+6+GFvlNE8JmlJFEAojq/OYZmZh44vu6iFWOc4CoGviScMFQMlL5VhltGNkjGz8EG
+iTqh6rvWB647lLif+W3lc3qIxh5FT+6A2Du0baZFK1oFyZpL7QOw0G9VNmbr168x
+KRpwLyBXSP6rIAuLe9ZSk1sRF3xt2ADL2Z4gaAY20TkFlCz3+wlE2XZaKK5mQOI1
+ZTvLHXiIFqZEXahrH8gJBLUPdjK6nsZbnETqcgiSXtzURX6Uga2/fqsdoFEOFv4s
+M+HvFbwbAtNRZ94i/AidlMGDjfDH3PUDX/Tf1k1IYoL4ElFrUUrC5V82Otoi6leV
+jk86diRPDF0CMZZ75g1A14KQNef/NE+OfVr3ffedJ8HwNfiCx8OXxzkuEehlH2wg
+Hkw3bybRgfQwUAjmRhLzljMYyjyEy1A97C1T7on/L5KjucwELjBsxEOGS2Jbs4aF
+uo4XNqUCAwEAAaOCAaEwggGdMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZA
+MCsGCWCGSAGG+EIBDQQeFhxUaW55Q0EgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0G
+A1UdDgQWBBSoZLhY9p44fdwsaDeKAdjBTM8wgTCB9AYDVR0jBIHsMIHpgBRevkS8
+4mqdx4w4RVDNcpgsX1z+M6GBxaSBwjCBvzELMAkGA1UEBhMCRUMxDjAMBgNVBAgT
+BUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElBMUYwRAYDVQQL
+Ez1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJvbGxvIGRlIElu
+dGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVjMR8wHQYJKoZI
+hvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjggkA1DdxFsaoCnowGwYDVR0SBBQwEoEQ
+bmVnQGNlZGlhLm9yZy5lYzAdBgNVHREEFjAUgRJub2NAdWN1ZW5jYS5lZHUuZWMw
+DQYJKoZIhvcNAQEFBQADggIBABOPR7fu8jE4sX0G1INTL18vKTxP7TqEy+jBFYJU
+HG2IKUaJ3t8txI7vZWXQ8WHK+OiAE6wcSnw9qF/TYcImP8G9ZRw4exFqEOb6pWEC
+Dfy9yAh/MQb2YnJP86M7yTYjziDluACNr4Jtu5Y4ZjSMYXwLC7y2B2CfiSfx8lPH
+MYgLhHanEPaV+rYjlNylsYg9yZdM+OdB31FUWZ9n6oSlbCDHjjLciwg4dwK5TOlE
+KcftZjprpmuZVYniT8X36v4cp9nZdaNYbWKHRZ/Ks/uFp8STU60DWYqWtXSpXSK3
+94dDRbeWrCL8LoggTpUEt/H8sKcr2kia/QNSobXHTMOTj0Qh8PaaNmstXaE/DL+C
+PDf3y0MN6e9YWbeW6oMiKzXe+CeSj/XWGGrtYU/rftVUgKs4M6D+mTHpmnD+q1FT
+tTUixXd8UNu35L2Lm7VOmXdxBmrE5KGDUfAjlOULmfeAdis4Bid/zcIy7EassngZ
+Hn7KvhbATaUdIx6lqsNVyxUz7U2TFlIk70cm2iSkdvGlop0AgNEVry8MBgBw9AvT
+vALkOpAYlJFMYczcSNKSzPjh3cY7cUE0pIRqU4yCK4g69CEQVVnxnctxdhSh2w3W
+ho3ZWwDxAtglwPXJcZeQ9QXi7hzhFOcPg1HBpdKEmI9/9NoBciSkNgLwjwFKE5ri
+W8yj
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ucuenca.edu.ec/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.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.ec</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+
+MIIHfzCCBWegAwIBAgIBCzANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMCRUMx
+DjAMBgNVBAgTBUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElB
+MUYwRAYDVQQLEz1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJv
+bGxvIGRlIEludGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVj
+MR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE0MDYyNjIyNDcz
+MloXDTE5MDYyNTIyNDczMlowgaAxCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVh
+eTEPMA0GA1UEBxMGQ3VlbmNhMRAwDgYDVQQKEwdVY3VlbmNhMR4wHAYDVQQLExVV
+bml2ZXJzaWRhZCBkZSBDdWVuY2ExGzAZBgNVBAMTEmlkcC51Y3VlbmNhLmVkdS5l
+YzEhMB8GCSqGSIb3DQEJARYSbm9jQHVjdWVuY2EuZWR1LmVjMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEArwRQTiod9Z5u4YrlHPdCewpOVYyY194eam5W
+rlJElPDMmGwhwZiU2wj+gidLlzZl8Dg6/Yuz181aScrz44eZLMiHJEXHo/4Re3Gl
+YybeMbAHX6Tjxhr4Nn6iAFFnre6292ZoiKoG6yqEV08AEY5Tcs5dZClEYX+J5+uG
+czIImWWCb0SE/6pGpK7wH9QJqVgWxxcoQKbHmMYyoRvJuEs6Bm0JFOZjBo62UPsF
+6+GFvlNE8JmlJFEAojq/OYZmZh44vu6iFWOc4CoGviScMFQMlL5VhltGNkjGz8EG
+iTqh6rvWB647lLif+W3lc3qIxh5FT+6A2Du0baZFK1oFyZpL7QOw0G9VNmbr168x
+KRpwLyBXSP6rIAuLe9ZSk1sRF3xt2ADL2Z4gaAY20TkFlCz3+wlE2XZaKK5mQOI1
+ZTvLHXiIFqZEXahrH8gJBLUPdjK6nsZbnETqcgiSXtzURX6Uga2/fqsdoFEOFv4s
+M+HvFbwbAtNRZ94i/AidlMGDjfDH3PUDX/Tf1k1IYoL4ElFrUUrC5V82Otoi6leV
+jk86diRPDF0CMZZ75g1A14KQNef/NE+OfVr3ffedJ8HwNfiCx8OXxzkuEehlH2wg
+Hkw3bybRgfQwUAjmRhLzljMYyjyEy1A97C1T7on/L5KjucwELjBsxEOGS2Jbs4aF
+uo4XNqUCAwEAAaOCAaEwggGdMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZA
+MCsGCWCGSAGG+EIBDQQeFhxUaW55Q0EgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0G
+A1UdDgQWBBSoZLhY9p44fdwsaDeKAdjBTM8wgTCB9AYDVR0jBIHsMIHpgBRevkS8
+4mqdx4w4RVDNcpgsX1z+M6GBxaSBwjCBvzELMAkGA1UEBhMCRUMxDjAMBgNVBAgT
+BUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElBMUYwRAYDVQQL
+Ez1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJvbGxvIGRlIElu
+dGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVjMR8wHQYJKoZI
+hvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjggkA1DdxFsaoCnowGwYDVR0SBBQwEoEQ
+bmVnQGNlZGlhLm9yZy5lYzAdBgNVHREEFjAUgRJub2NAdWN1ZW5jYS5lZHUuZWMw
+DQYJKoZIhvcNAQEFBQADggIBABOPR7fu8jE4sX0G1INTL18vKTxP7TqEy+jBFYJU
+HG2IKUaJ3t8txI7vZWXQ8WHK+OiAE6wcSnw9qF/TYcImP8G9ZRw4exFqEOb6pWEC
+Dfy9yAh/MQb2YnJP86M7yTYjziDluACNr4Jtu5Y4ZjSMYXwLC7y2B2CfiSfx8lPH
+MYgLhHanEPaV+rYjlNylsYg9yZdM+OdB31FUWZ9n6oSlbCDHjjLciwg4dwK5TOlE
+KcftZjprpmuZVYniT8X36v4cp9nZdaNYbWKHRZ/Ks/uFp8STU60DWYqWtXSpXSK3
+94dDRbeWrCL8LoggTpUEt/H8sKcr2kia/QNSobXHTMOTj0Qh8PaaNmstXaE/DL+C
+PDf3y0MN6e9YWbeW6oMiKzXe+CeSj/XWGGrtYU/rftVUgKs4M6D+mTHpmnD+q1FT
+tTUixXd8UNu35L2Lm7VOmXdxBmrE5KGDUfAjlOULmfeAdis4Bid/zcIy7EassngZ
+Hn7KvhbATaUdIx6lqsNVyxUz7U2TFlIk70cm2iSkdvGlop0AgNEVry8MBgBw9AvT
+vALkOpAYlJFMYczcSNKSzPjh3cY7cUE0pIRqU4yCK4g69CEQVVnxnctxdhSh2w3W
+ho3ZWwDxAtglwPXJcZeQ9QXi7hzhFOcPg1HBpdKEmI9/9NoBciSkNgLwjwFKE5ri
+W8yj
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UCUENCA - Universidad de Cuenca</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ucuenca - Universidad de Cuenca</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucuenca.edu.ec.ec/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Claudio Chacon A</md:SurName>
+    <md:EmailAddress>noc@ucuenca.edu.ec</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
new file mode 100644
index 00000000..8ff2905c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDIzCCAgugAwIBAgIUHyGwRd1qr1kyh3xpoh7NDGHcOCEwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLnVlYi5jYXMuY3owHhcNMTQwMzMxMDgwNDMxWhcN
+MzQwMzMxMDgwNDMxWjAZMRcwFQYDVQQDEw5pZHAudWViLmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAI/mgzyHJjo9tvPdwC/oCHl50NDMEj6d
+JeT6waZ8s39B3CjNvtuKZOng7C/LWD/PSafukUVzWSR7f1C2p2Cv1lcu6BzOfWRA
+1WEQ5G0CeEJinFRdDJhCwhvyZpXY7NKcN1hl64m7K/WnvjZzEXEcko9k9JF1qKTS
+bXa7p/miBDGLOOBpPcc7e1TQ6yyYpcjTVw6jGCaN8ELL9rXuB59nypLydNbmS1qL
+oxJJ306cl5uyt+p09lWu4AnUYjcJDpzng+qjMyac96fPqjWLTwfl2GQmWfA2zehd
+uKad6sO9pGgkulnccPrBo6tIPS2XQ0s4lBrKhbFY0C8UxndtFbwAIEsCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLnVlYi5jYXMuY3qGJWh0dHBzOi8vaWRwLnVlYi5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOcJV+6pYxQ7C0fQVs0eMtdd
+6f9AMA0GCSqGSIb3DQEBBQUAA4IBAQA8fi7T3V7TQJX7DLQqSsbw9c+ANvRCi/rm
+5GCPdphUBoRZl0p9a2X/waP0aAqJY1IwyAhzzzzaTlXKg6Jj0HkrLZJLECZMPvpM
+iTV7Le/b6sPURJSPUe9A4QExG8CAZhNIZPj+9Q/pS4qX0M9QtL3OoKE30UicL+6+
+AkhT2im4Zc1lmacedEQVFzMPL2dObjDFaYRlTsN2pXElZhrovJGyhIha2nApLR4v
+3JQTA6oUyYFCR2WbQrj00tGndynKeS2Mv0b5Wy8ZMka8DO66u7SMMe8BQ0o2pqXZ
+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>
+MIIDIzCCAgugAwIBAgIUHyGwRd1qr1kyh3xpoh7NDGHcOCEwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLnVlYi5jYXMuY3owHhcNMTQwMzMxMDgwNDMxWhcN
+MzQwMzMxMDgwNDMxWjAZMRcwFQYDVQQDEw5pZHAudWViLmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAI/mgzyHJjo9tvPdwC/oCHl50NDMEj6d
+JeT6waZ8s39B3CjNvtuKZOng7C/LWD/PSafukUVzWSR7f1C2p2Cv1lcu6BzOfWRA
+1WEQ5G0CeEJinFRdDJhCwhvyZpXY7NKcN1hl64m7K/WnvjZzEXEcko9k9JF1qKTS
+bXa7p/miBDGLOOBpPcc7e1TQ6yyYpcjTVw6jGCaN8ELL9rXuB59nypLydNbmS1qL
+oxJJ306cl5uyt+p09lWu4AnUYjcJDpzng+qjMyac96fPqjWLTwfl2GQmWfA2zehd
+uKad6sO9pGgkulnccPrBo6tIPS2XQ0s4lBrKhbFY0C8UxndtFbwAIEsCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLnVlYi5jYXMuY3qGJWh0dHBzOi8vaWRwLnVlYi5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOcJV+6pYxQ7C0fQVs0eMtdd
+6f9AMA0GCSqGSIb3DQEBBQUAA4IBAQA8fi7T3V7TQJX7DLQqSsbw9c+ANvRCi/rm
+5GCPdphUBoRZl0p9a2X/waP0aAqJY1IwyAhzzzzaTlXKg6Jj0HkrLZJLECZMPvpM
+iTV7Le/b6sPURJSPUe9A4QExG8CAZhNIZPj+9Q/pS4qX0M9QtL3OoKE30UicL+6+
+AkhT2im4Zc1lmacedEQVFzMPL2dObjDFaYRlTsN2pXElZhrovJGyhIha2nApLR4v
+3JQTA6oUyYFCR2WbQrj00tGndynKeS2Mv0b5Wy8ZMka8DO66u7SMMe8BQ0o2pqXZ
+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>
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
new file mode 100644
index 00000000..4ad91e83
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ufe.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDIzCCAgugAwIBAgIUcKS5gFpqf8X/ZLLjYuIQpzjjeXkwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLnVmZS5jYXMuY3owHhcNMTQwNTI3MTIxMDE5WhcN
+MzQwNTI3MTIxMDE5WjAZMRcwFQYDVQQDEw5pZHAudWZlLmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5cOnmanq68cqOF7oxg6U5BGUKlj5Wo
+sVPtKUjmSy57yzhLnrIZ9UMKESIuPuBuSKbyTnt7JbjounGkMiwhCIf61hJiOs8b
+JlptSG7WXnLbHcOhMWjiCmbWawWVTLyPNWTlUvUaq3JB5zGNQXOlILfn/UkHnbMl
+Ija8zQ5yhAYvHZ/maGHsnkx92ds87Kcxtz6CjIDlcbo/XAVoLizNWAedeji1FUbc
+EdOdDiJZN+OOnfVxPbDYcRc2uls3YloLsZtbyXO8lKViCiUSlPGPEelx8NxinDDY
+IwZ8hPpiu94Uv5lCkvo9XdAG7RBZsmqiodz0oXGIEsFscS6PKTa3MEUCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLnVmZS5jYXMuY3qGJWh0dHBzOi8vaWRwLnVmZS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFPVVqO7eJSBY4afM8pfpuTFT
+3rfqMA0GCSqGSIb3DQEBBQUAA4IBAQAg2FJw4TFDfXuCmJP3iPqVLlf+e5ViqQdo
+hum8X97d5zxkPtUShw6U5SLy4Styi36BdaIKsWiGodF+pmqse7QPeJyxRqDtUBUB
+9X4eWbxuhghrbROsP75/QmpqFJVBQiNYd+AyDNSmROseXxqMVqeZ+EzLtHPki0Yj
+3Os7z22eK8t8BBMnOrUskvKYEfFDHyf7rCirwK1vL53LHyPh1gSF7vPwvJ6Zvojh
+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>
+MIIDIzCCAgugAwIBAgIUcKS5gFpqf8X/ZLLjYuIQpzjjeXkwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLnVmZS5jYXMuY3owHhcNMTQwNTI3MTIxMDE5WhcN
+MzQwNTI3MTIxMDE5WjAZMRcwFQYDVQQDEw5pZHAudWZlLmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5cOnmanq68cqOF7oxg6U5BGUKlj5Wo
+sVPtKUjmSy57yzhLnrIZ9UMKESIuPuBuSKbyTnt7JbjounGkMiwhCIf61hJiOs8b
+JlptSG7WXnLbHcOhMWjiCmbWawWVTLyPNWTlUvUaq3JB5zGNQXOlILfn/UkHnbMl
+Ija8zQ5yhAYvHZ/maGHsnkx92ds87Kcxtz6CjIDlcbo/XAVoLizNWAedeji1FUbc
+EdOdDiJZN+OOnfVxPbDYcRc2uls3YloLsZtbyXO8lKViCiUSlPGPEelx8NxinDDY
+IwZ8hPpiu94Uv5lCkvo9XdAG7RBZsmqiodz0oXGIEsFscS6PKTa3MEUCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLnVmZS5jYXMuY3qGJWh0dHBzOi8vaWRwLnVmZS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFPVVqO7eJSBY4afM8pfpuTFT
+3rfqMA0GCSqGSIb3DQEBBQUAA4IBAQAg2FJw4TFDfXuCmJP3iPqVLlf+e5ViqQdo
+hum8X97d5zxkPtUShw6U5SLy4Styi36BdaIKsWiGodF+pmqse7QPeJyxRqDtUBUB
+9X4eWbxuhghrbROsP75/QmpqFJVBQiNYd+AyDNSmROseXxqMVqeZ+EzLtHPki0Yj
+3Os7z22eK8t8BBMnOrUskvKYEfFDHyf7rCirwK1vL53LHyPh1gSF7vPwvJ6Zvojh
+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>
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
new file mode 100644
index 00000000..d6035c84
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ufgd.edu.br-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIIDtDCCApwCAQAwDQYJKoZIhvcNAQEFBQAwgZ8xNzA1BgNVBAoTLlVGR0QgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkYSBHcmFuZGUgRG91cmFkb3MxDTALBgNVBAsT
+BENPSU4xETAPBgNVBAcTCERvdXJhZG9zMRswGQYDVQQIExJNYXRvIEdyb3NzbyBk
+byBTdWwxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAudWZnZC5lZHUuYnIwHhcN
+MTQwNjA1MTIwOTMwWhcNMTkwNjA0MTIwOTMwWjCBnzE3MDUGA1UEChMuVUZHRCAt
+IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRhIEdyYW5kZSBEb3VyYWRvczENMAsGA1UE
+CxMEQ09JTjERMA8GA1UEBxMIRG91cmFkb3MxGzAZBgNVBAgTEk1hdG8gR3Jvc3Nv
+IGRvIFN1bDELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC51ZmdkLmVkdS5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqNLCdmjAeN7pKaJ68gXkdj
+NE/hAudGd/f5o1omQTsYsBtpBs5M8awzqVkWonX2HZt+OrozxYfueACKECmzuA78
+5EGoRjl5Zj4UiOLqNYjzKOgUg3BtO2+W+8xEQ6S//zUNeqnEEyDllLy1JoSPbID1
+68sAiypFqQ/DN4MNdTQ8Tv8O5X1QDp5NWrqcCjYyMmmUk+dQyPaTXTzBpB5uO7EZ
+MMMXsfl8FUmo/iO0GZa/VrvTKd/92SZh7TQGttv6ju2DVQbo2CWofRavs8kesRKR
+HGwhBlVX+Q4XD07cyh1+RZVy5Wn895vVmstyPgA91AHBiOKFK2jg0+Cut7VKDPEC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAmJkwUFwtyBI7Z9/mJpGkhNWNlGSS3l/0
+hi1NBYUn3vP16egcj+Xc6TVhayPB+D1E4nQvHI4CZ1tQFmjXIEtFIi9gUZFKC42y
+QOWyylrMMEy+wPYbdHsSkzKSzJE0+nN0KFzJCJkU61lTLPjiiq+mSiJny4u4XtUK
+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>
+      
+MIIDtDCCApwCAQAwDQYJKoZIhvcNAQEFBQAwgZ8xNzA1BgNVBAoTLlVGR0QgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkYSBHcmFuZGUgRG91cmFkb3MxDTALBgNVBAsT
+BENPSU4xETAPBgNVBAcTCERvdXJhZG9zMRswGQYDVQQIExJNYXRvIEdyb3NzbyBk
+byBTdWwxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAudWZnZC5lZHUuYnIwHhcN
+MTQwNjA1MTIwOTMwWhcNMTkwNjA0MTIwOTMwWjCBnzE3MDUGA1UEChMuVUZHRCAt
+IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRhIEdyYW5kZSBEb3VyYWRvczENMAsGA1UE
+CxMEQ09JTjERMA8GA1UEBxMIRG91cmFkb3MxGzAZBgNVBAgTEk1hdG8gR3Jvc3Nv
+IGRvIFN1bDELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC51ZmdkLmVkdS5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqNLCdmjAeN7pKaJ68gXkdj
+NE/hAudGd/f5o1omQTsYsBtpBs5M8awzqVkWonX2HZt+OrozxYfueACKECmzuA78
+5EGoRjl5Zj4UiOLqNYjzKOgUg3BtO2+W+8xEQ6S//zUNeqnEEyDllLy1JoSPbID1
+68sAiypFqQ/DN4MNdTQ8Tv8O5X1QDp5NWrqcCjYyMmmUk+dQyPaTXTzBpB5uO7EZ
+MMMXsfl8FUmo/iO0GZa/VrvTKd/92SZh7TQGttv6ju2DVQbo2CWofRavs8kesRKR
+HGwhBlVX+Q4XD07cyh1+RZVy5Wn895vVmstyPgA91AHBiOKFK2jg0+Cut7VKDPEC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAmJkwUFwtyBI7Z9/mJpGkhNWNlGSS3l/0
+hi1NBYUn3vP16egcj+Xc6TVhayPB+D1E4nQvHI4CZ1tQFmjXIEtFIi9gUZFKC42y
+QOWyylrMMEy+wPYbdHsSkzKSzJE0+nN0KFzJCJkU61lTLPjiiq+mSiJny4u4XtUK
+Q97JwAlBXwmtN3HtQpcoK5DI4xa8RCuyU+fyV3skMNaS0JMm4iZHGB/IDuiv6AXy
+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>
diff --git a/swamid-interfederations-2.0/idp.ufmg.br-shibboleth.xml b/swamid-interfederations-2.0/idp.ufmg.br-shibboleth.xml
new file mode 100644
index 00000000..76db90f9
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ufmg.br-shibboleth.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIDaTCCAlECCQCkRIPOgAyxBDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJC
+UjEVMBMGA1UECBMMTWluYXMgR2VyYWlzMRcwFQYDVQQHEw5CZWxvIEhvcml6b250
+ZTENMAsGA1UEChMEVUZNRzEMMAoGA1UECxMDTENDMRowGAYDVQQDExFDQSBkbyBw
+b3J0YWwgVUZNRzAeFw0xMTEwMTcxMTM1MDRaFw0yMTEwMTQxMTM1MDRaMHcxCzAJ
+BgNVBAYTAkJSMRUwEwYDVQQIDAxNaW5hcyBHZXJhaXMxFzAVBgNVBAcMDkJlbG8g
+SG9yaXpvbnRlMQ0wCwYDVQQKDARVRk1HMQ4wDAYDVQQLDAVDRUNPTTEZMBcGA1UE
+AwwQc2lzdGVtYXMudWZtZy5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAPIWVxfD/hP4xeS+V2PEAWxlBm7+oM5KnUWojPucNO+FDcpc1ZBI1BSvhxuO
+7KnacD3j31Lf1MUq5rb8jS5ojj927W+1dYiVsI4WsV3e/SHKPJwhzA3/8D+9b1//
+6sgYFeaki33+zyoiMXluWYOuHEhdnnZMITBS0BICiM0+Wx4y42ddt8SlojTFZ9/G
+YJCZr3N3FoTISKnDw9htCpiaWRsm/tElikW5PLjQRwuNfk5TUaxysoOMTKU1OHzG
+eWFWT1eC4cM+5PdZJLC9SMwhSBz34o0aJXz6Rl0EmkSLpEUlkjWd8qGgAbA6I+Rj
+ab1lgvK6Gn+DvZSvoYuENypjClcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAoUhF
+/mtHoskFkWtN7feCf0qaAJi582w1DHUqohbnYRs9ru6XO35saVAW/sn1pzkM4CT8
+W4CCQGknUv4iM5XCdqFzQrmvc6NBekEsdXkJPyV3/L3s+vgpnEJMG44EKP6VkpRM
+mXv14qPfzV+qd5evzDM8oLi6m+Xhi433omqj7FYw49DfCyEWpOsAwE5SdjUaJ+rY
+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>
+      
+MIIDaTCCAlECCQCkRIPOgAyxBDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJC
+UjEVMBMGA1UECBMMTWluYXMgR2VyYWlzMRcwFQYDVQQHEw5CZWxvIEhvcml6b250
+ZTENMAsGA1UEChMEVUZNRzEMMAoGA1UECxMDTENDMRowGAYDVQQDExFDQSBkbyBw
+b3J0YWwgVUZNRzAeFw0xMTEwMTcxMTM1MDRaFw0yMTEwMTQxMTM1MDRaMHcxCzAJ
+BgNVBAYTAkJSMRUwEwYDVQQIDAxNaW5hcyBHZXJhaXMxFzAVBgNVBAcMDkJlbG8g
+SG9yaXpvbnRlMQ0wCwYDVQQKDARVRk1HMQ4wDAYDVQQLDAVDRUNPTTEZMBcGA1UE
+AwwQc2lzdGVtYXMudWZtZy5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAPIWVxfD/hP4xeS+V2PEAWxlBm7+oM5KnUWojPucNO+FDcpc1ZBI1BSvhxuO
+7KnacD3j31Lf1MUq5rb8jS5ojj927W+1dYiVsI4WsV3e/SHKPJwhzA3/8D+9b1//
+6sgYFeaki33+zyoiMXluWYOuHEhdnnZMITBS0BICiM0+Wx4y42ddt8SlojTFZ9/G
+YJCZr3N3FoTISKnDw9htCpiaWRsm/tElikW5PLjQRwuNfk5TUaxysoOMTKU1OHzG
+eWFWT1eC4cM+5PdZJLC9SMwhSBz34o0aJXz6Rl0EmkSLpEUlkjWd8qGgAbA6I+Rj
+ab1lgvK6Gn+DvZSvoYuENypjClcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAoUhF
+/mtHoskFkWtN7feCf0qaAJi582w1DHUqohbnYRs9ru6XO35saVAW/sn1pzkM4CT8
+W4CCQGknUv4iM5XCdqFzQrmvc6NBekEsdXkJPyV3/L3s+vgpnEJMG44EKP6VkpRM
+mXv14qPfzV+qd5evzDM8oLi6m+Xhi433omqj7FYw49DfCyEWpOsAwE5SdjUaJ+rY
+XhsRQJXlHnagEo7RwekebDBnFS9po0Yz2XgnsZ3QwRnMcAtIVQ1TxA9gUj4IY0MT
+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>
diff --git a/swamid-interfederations-2.0/idp.ufpr.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ufpr.br-idp-shibboleth.xml
new file mode 100644
index 00000000..274dd3b3
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ufpr.br-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxLzAtBgNVBAoUJlVGUFIgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBQYXJhbsOhMSswKQYDVQQLFCJDZW50cm8g
+ZGUgQ29tcHV0YcOnw6NvIEVsZXRyw7RuaWNhMRowGAYJKoZIhvcNAQkBFgtjY2VA
+dWZwci5icjERMA8GA1UEBxMIQ3VyaXRpYmExEDAOBgNVBAgUB1BhcmFuw6ExCzAJ
+BgNVBAYTAkJSMRQwEgYDVQQDEwtpZHAudWZwci5icjAeFw0xMjA4MjAyMDIzMzZa
+Fw0xNTA4MjAyMDIzMzZaMIHCMS8wLQYDVQQKFCZVRlBSIC0gVW5pdmVyc2lkYWRl
+IEZlZGVyYWwgZG8gUGFyYW7DoTErMCkGA1UECxQiQ2VudHJvIGRlIENvbXB1dGHD
+p8OjbyBFbGV0csO0bmljYTEaMBgGCSqGSIb3DQEJARYLY2NlQHVmcHIuYnIxETAP
+BgNVBAcTCEN1cml0aWJhMRAwDgYDVQQIFAdQYXJhbsOhMQswCQYDVQQGEwJCUjEU
+MBIGA1UEAxMLaWRwLnVmcHIuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDhSIFAyy4DlsvFhaSd1r3CiUjp//kkxFlfeZmtj5gLGupTk+fQF18j71Go
+K4OwvL82UI/KYE5Me2tlueEJvBExd79by4fBME6SADdHc9Su1w1lctn4s6Mko9ux
+j9WcbrBfncbdj80T6W88EDH+V74oiCEElxBLfBOeXJCuMjc9uSaasbIMWMK+7ExV
+lz7d8ll7umv5AX84tpq8WDkc+7fcP9+p5GMtcTrdPKvL2CvSFmrnz+efKb6cNOT0
+B058D+uHPb0PasA6+xHpO3V3pSbSdcf8IqlvJKvoK8dch4qQ6uZD+Rz8ruxaPpBH
+cJdZk6hk0gc+7axjEWo/89CJauJzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJ70
+kkZit+4D85Xi5Ms8+EYCjCo0GfUUp83ASZyPRml/D0VnOHLuj+dbPdQM0znnb5Sg
+7hIbSs/ERqrzKFJMJikpFXm1RQZNNRdf0d0V4nTrliXjGQcPCqXexdXRE6oBMeAi
+apbG2X8rFstwVVghWlbqkUjtko8MgUiD/RyjbAqVBWxqNjRGB3JOVt1g2SJ1tW7x
+pL1kcSedKTjYji+gJ9NLqumL9LTdtlqPzdBlChK4SfIIK/BE3GtD1S6rHn2wX+MC
++anyEs7LQkZJPiqDeo2VM3XLIHdw5VTf8HnFiLJMiDkuIUOj5g77gFFE5HGKPuur
+k+Eyx9965LHHOvpH3Zo=
+            </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>
+      
+MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxLzAtBgNVBAoUJlVGUFIgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBQYXJhbsOhMSswKQYDVQQLFCJDZW50cm8g
+ZGUgQ29tcHV0YcOnw6NvIEVsZXRyw7RuaWNhMRowGAYJKoZIhvcNAQkBFgtjY2VA
+dWZwci5icjERMA8GA1UEBxMIQ3VyaXRpYmExEDAOBgNVBAgUB1BhcmFuw6ExCzAJ
+BgNVBAYTAkJSMRQwEgYDVQQDEwtpZHAudWZwci5icjAeFw0xMjA4MjAyMDIzMzZa
+Fw0xNTA4MjAyMDIzMzZaMIHCMS8wLQYDVQQKFCZVRlBSIC0gVW5pdmVyc2lkYWRl
+IEZlZGVyYWwgZG8gUGFyYW7DoTErMCkGA1UECxQiQ2VudHJvIGRlIENvbXB1dGHD
+p8OjbyBFbGV0csO0bmljYTEaMBgGCSqGSIb3DQEJARYLY2NlQHVmcHIuYnIxETAP
+BgNVBAcTCEN1cml0aWJhMRAwDgYDVQQIFAdQYXJhbsOhMQswCQYDVQQGEwJCUjEU
+MBIGA1UEAxMLaWRwLnVmcHIuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDhSIFAyy4DlsvFhaSd1r3CiUjp//kkxFlfeZmtj5gLGupTk+fQF18j71Go
+K4OwvL82UI/KYE5Me2tlueEJvBExd79by4fBME6SADdHc9Su1w1lctn4s6Mko9ux
+j9WcbrBfncbdj80T6W88EDH+V74oiCEElxBLfBOeXJCuMjc9uSaasbIMWMK+7ExV
+lz7d8ll7umv5AX84tpq8WDkc+7fcP9+p5GMtcTrdPKvL2CvSFmrnz+efKb6cNOT0
+B058D+uHPb0PasA6+xHpO3V3pSbSdcf8IqlvJKvoK8dch4qQ6uZD+Rz8ruxaPpBH
+cJdZk6hk0gc+7axjEWo/89CJauJzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJ70
+kkZit+4D85Xi5Ms8+EYCjCo0GfUUp83ASZyPRml/D0VnOHLuj+dbPdQM0znnb5Sg
+7hIbSs/ERqrzKFJMJikpFXm1RQZNNRdf0d0V4nTrliXjGQcPCqXexdXRE6oBMeAi
+apbG2X8rFstwVVghWlbqkUjtko8MgUiD/RyjbAqVBWxqNjRGB3JOVt1g2SJ1tW7x
+pL1kcSedKTjYji+gJ9NLqumL9LTdtlqPzdBlChK4SfIIK/BE3GtD1S6rHn2wX+MC
++anyEs7LQkZJPiqDeo2VM3XLIHdw5VTf8HnFiLJMiDkuIUOj5g77gFFE5HGKPuur
+k+Eyx9965LHHOvpH3Zo=
+
+                    
+            </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>
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
new file mode 100644
index 00000000..b3fccac6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ufrb.edu.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIIEAjCCAuoCAQAwDQYJKoZIhvcNAQEFBQAwgcYxOjA4BgNVBAoTMVVGUkIgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBSZWNvbmNhdm8gZGEgQmFoaWExDjAMBgNV
+BAsTBUNPVEVDMSgwJgYJKoZIhvcNAQkBFhljb3RlY0Bwcm9wbGFuLnVmcmIuZWR1
+LmJyMRcwFQYDVQQHEw5DcnV6IGRhcyBBbG1hczEOMAwGA1UECBMFQmFoaWExCzAJ
+BgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAudWZyYi5lZHUuYnIwHhcNMTQxMjEzMDU0
+NzA3WhcNMTcxMjEyMDU0NzA3WjCBxjE6MDgGA1UEChMxVUZSQiAtIFVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRvIFJlY29uY2F2byBkYSBCYWhpYTEOMAwGA1UECxMFQ09U
+RUMxKDAmBgkqhkiG9w0BCQEWGWNvdGVjQHByb3BsYW4udWZyYi5lZHUuYnIxFzAV
+BgNVBAcTDkNydXogZGFzIEFsbWFzMQ4wDAYDVQQIEwVCYWhpYTELMAkGA1UEBhMC
+QlIxGDAWBgNVBAMTD2lkcC51ZnJiLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALV2LAx8VdH5wtvvjaYjhD3Mz41PVxj2XpKSetDPlMktll17
+2cdu0tghyOWXCsfWoE3j0G1uKcxw3c6s07RsV0IQNb5pcZ8RIftRz6FEJ+WLc/vc
+wv7O189b2B8gj7Q4ciTAQ2IX28eV0kIfRUzDRGd6LAe4LkQbNZjIC+RJJh3mJpZO
+qOxR43SX82ub7cfCxIdriBnkrADgbpbqmSGci79FPWqCxN7gFpStc6xsSruyJGyq
+nq557NsaXVaAEVEdW/5nDMipTKFmMSjroyYGzuNQQ8Ob8G6EOxlVub/b2abw0hUI
+ZzpEU8ap8a4qWNUmgAakXbbDIY4mb+F6pp7eUTUCAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEAAmgaLH2G1dzR7vJ+FwYJyB4wg6USlFD6iPaF5F0LpabpUGNw5Twlu66v
+1jutrGMM3/rB0cy/vqCYKtdzwk2OqXT5xCAitgtVr3/iJtUq7FfQkdi7ck3Bm/4p
+cdCuK6i9mF0TGQzIRHK5SliZSt/vrmF6e44psIgdV6ZY6bjqY40d5lk0biXk4gei
+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>
+      
+MIIEAjCCAuoCAQAwDQYJKoZIhvcNAQEFBQAwgcYxOjA4BgNVBAoTMVVGUkIgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBSZWNvbmNhdm8gZGEgQmFoaWExDjAMBgNV
+BAsTBUNPVEVDMSgwJgYJKoZIhvcNAQkBFhljb3RlY0Bwcm9wbGFuLnVmcmIuZWR1
+LmJyMRcwFQYDVQQHEw5DcnV6IGRhcyBBbG1hczEOMAwGA1UECBMFQmFoaWExCzAJ
+BgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAudWZyYi5lZHUuYnIwHhcNMTQxMjEzMDU0
+NzA3WhcNMTcxMjEyMDU0NzA3WjCBxjE6MDgGA1UEChMxVUZSQiAtIFVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRvIFJlY29uY2F2byBkYSBCYWhpYTEOMAwGA1UECxMFQ09U
+RUMxKDAmBgkqhkiG9w0BCQEWGWNvdGVjQHByb3BsYW4udWZyYi5lZHUuYnIxFzAV
+BgNVBAcTDkNydXogZGFzIEFsbWFzMQ4wDAYDVQQIEwVCYWhpYTELMAkGA1UEBhMC
+QlIxGDAWBgNVBAMTD2lkcC51ZnJiLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALV2LAx8VdH5wtvvjaYjhD3Mz41PVxj2XpKSetDPlMktll17
+2cdu0tghyOWXCsfWoE3j0G1uKcxw3c6s07RsV0IQNb5pcZ8RIftRz6FEJ+WLc/vc
+wv7O189b2B8gj7Q4ciTAQ2IX28eV0kIfRUzDRGd6LAe4LkQbNZjIC+RJJh3mJpZO
+qOxR43SX82ub7cfCxIdriBnkrADgbpbqmSGci79FPWqCxN7gFpStc6xsSruyJGyq
+nq557NsaXVaAEVEdW/5nDMipTKFmMSjroyYGzuNQQ8Ob8G6EOxlVub/b2abw0hUI
+ZzpEU8ap8a4qWNUmgAakXbbDIY4mb+F6pp7eUTUCAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEAAmgaLH2G1dzR7vJ+FwYJyB4wg6USlFD6iPaF5F0LpabpUGNw5Twlu66v
+1jutrGMM3/rB0cy/vqCYKtdzwk2OqXT5xCAitgtVr3/iJtUq7FfQkdi7ck3Bm/4p
+cdCuK6i9mF0TGQzIRHK5SliZSt/vrmF6e44psIgdV6ZY6bjqY40d5lk0biXk4gei
+NUQS7h3jSQc8/tEZ8ri/ZYvL1H51ifaIF3UgsxkaygobrrjWMMHqd+BpLFI25dhT
+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>
diff --git a/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml
new file mode 100644
index 00000000..c3154650
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xLDAqBgNVBAoTI1VuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRlIFNhbnRhIE1hcmlhMQwwCgYDVQQLEwNDUEQxGjAYBgkq
+hkiG9w0BCQEWC2NwZEB1ZnNtLmJyMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgG
+A1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtp
+ZHAudWZzbS5icjAeFw0xMjEwMDUxNDA1MzVaFw0xNTEwMDUxNDA1MzVaMIGtMSww
+KgYDVQQKEyNVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBTYW50YSBNYXJpYTEMMAoG
+A1UECxMDQ1BEMRowGAYJKoZIhvcNAQkBFgtjcGRAdWZzbS5icjEUMBIGA1UEBxML
+U2FudGEgTWFyaWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQG
+EwJCUjEUMBIGA1UEAxMLaWRwLnVmc20uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDWBJ1zOYMt8oRHINxfgHCz/YAWxSb2vSxeOu50Jdr+EzKQYMj4
+5eeXhCNYGlWtqPI+rMZj4i3p8P+xbaK+RzXJavEF0gyv3qcamJWBd5GseyO/Q5gd
+u4DpJ5lpA5P1zm2Q646p1swNAlENjS756Ux5MfWFPfRYc3u04Y9W8EDfKMPMYSs2
+H+bFi0Ucn4DaEkUiDc2noJuJMM08m3Nl5GTUEwZSRJAlV9OT2tUbXAfeqdXyteS4
+VaFzc4vt0KqUwATvxhIygOqX+9I7nitBg3wfXbHsmYBo14AUsPxJvVFUV2bLUd4l
+d/xr71cxlkFHk4mzRe5C2kDLYcvYaIqv/jyjAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAKiirihev0E7qiHKcDQjWPxP1RTalsGly1pAWYUp1ikY7R2n+VzsSTVu6xh4
+ITgI1YIsHOdQ9eepAQCiEcuPim7CnzcKb1Ru6vgiXxgO9hJg0iNmcycPFQR8t5rk
+2fFUgF2GjL+lpOEnCgKn7WPEsAAHnLHsJjCbNcbX7B12awaVu6Q2nuiBcX2EC/PD
+Vvgi6N7sh/ViG8whuT4y7vN0Zdnc8FdbRFVkgl6FInPQa27MNQL7ZukyxmU+A9AF
++jDBH/uGNUgpWLHqS/d+TMq0SPcrLoedtMjcadIQIpMgyIk14QvJGo/YB9sgtvHM
+dwJYMximHcBNMJ0UieklpL0lmx0=
+            </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>
+      
+MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xLDAqBgNVBAoTI1VuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRlIFNhbnRhIE1hcmlhMQwwCgYDVQQLEwNDUEQxGjAYBgkq
+hkiG9w0BCQEWC2NwZEB1ZnNtLmJyMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgG
+A1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtp
+ZHAudWZzbS5icjAeFw0xMjEwMDUxNDA1MzVaFw0xNTEwMDUxNDA1MzVaMIGtMSww
+KgYDVQQKEyNVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBTYW50YSBNYXJpYTEMMAoG
+A1UECxMDQ1BEMRowGAYJKoZIhvcNAQkBFgtjcGRAdWZzbS5icjEUMBIGA1UEBxML
+U2FudGEgTWFyaWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQG
+EwJCUjEUMBIGA1UEAxMLaWRwLnVmc20uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDWBJ1zOYMt8oRHINxfgHCz/YAWxSb2vSxeOu50Jdr+EzKQYMj4
+5eeXhCNYGlWtqPI+rMZj4i3p8P+xbaK+RzXJavEF0gyv3qcamJWBd5GseyO/Q5gd
+u4DpJ5lpA5P1zm2Q646p1swNAlENjS756Ux5MfWFPfRYc3u04Y9W8EDfKMPMYSs2
+H+bFi0Ucn4DaEkUiDc2noJuJMM08m3Nl5GTUEwZSRJAlV9OT2tUbXAfeqdXyteS4
+VaFzc4vt0KqUwATvxhIygOqX+9I7nitBg3wfXbHsmYBo14AUsPxJvVFUV2bLUd4l
+d/xr71cxlkFHk4mzRe5C2kDLYcvYaIqv/jyjAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAKiirihev0E7qiHKcDQjWPxP1RTalsGly1pAWYUp1ikY7R2n+VzsSTVu6xh4
+ITgI1YIsHOdQ9eepAQCiEcuPim7CnzcKb1Ru6vgiXxgO9hJg0iNmcycPFQR8t5rk
+2fFUgF2GjL+lpOEnCgKn7WPEsAAHnLHsJjCbNcbX7B12awaVu6Q2nuiBcX2EC/PD
+Vvgi6N7sh/ViG8whuT4y7vN0Zdnc8FdbRFVkgl6FInPQa27MNQL7ZukyxmU+A9AF
++jDBH/uGNUgpWLHqS/d+TMq0SPcrLoedtMjcadIQIpMgyIk14QvJGo/YB9sgtvHM
+dwJYMximHcBNMJ0UieklpL0lmx0=
+                    
+            </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>
diff --git a/swamid-interfederations-2.0/idp.uha.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uha.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..0d311f23
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uha.fr-idp-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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="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>
+					      MIIDFDCCAfygAwIBAgIVAMQwDj/V7c3f7N91SfzvRR6357FcMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC51aGEuZnIwHhcNMDkwNDA5MTQwOTAxWhcNMjkw
+NDA5MTQwOTAxWjAVMRMwEQYDVQQDEwppZHAudWhhLmZyMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAjwqTRagPEGunfC32fyNnNVRYuJPDM65kHC6DnjRv
+KcGMMKBP9zN1AIXqDSbjw27e/kQ+FXrWECy0EZfk4FT/wYe5nNnZO3ZJmHWxPKLY
+sa8DrGHG3a6xMUErtEEH6ZMTJMnEWBKcT/M7IBBpZfsyzBYmESmhM91Fo0yI6ihY
+pjvv19K7qsl+JXSC0J9Ng6L67I0tKbQ9f/Vke+hN/jxCnVL9uvlEo732XUFsQ97K
+PHxjSfRUDKuO2zRksnAmybHhK+MOf7VhrYiDm+rY1fN9GOyuha89lQUxqr2RakNN
+mtLaEHw7kKGGJJMdhQJXq9uQErDJMppQnbVM4xT41w9VAQIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAudWhhLmZyhiFodHRwczovL2lkcC51aGEuZnIvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFBpULgO2pp5BBWWveaICAaeGdhWLMA0GCSqGSIb3DQEB
+BQUAA4IBAQBs5JFe8dPlHV3+GU7RIl/r8LZo6W0zeOHmWiLvAwbuH64qA6ZgWGm5
+M4tKtWi4htYdgl4MjVpwgv3FMi8/hXTfQbVOjqGZiqKCTDjPtHYJOfZvAxL/ufg5
+bSJJlH3DOgLPpMacR1/SynTnplrNptvAYjUseje/cg5me6Myn/8UK7SrJIfOBC6w
+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>
+					      MIIDFDCCAfygAwIBAgIVAMQwDj/V7c3f7N91SfzvRR6357FcMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC51aGEuZnIwHhcNMDkwNDA5MTQwOTAxWhcNMjkw
+NDA5MTQwOTAxWjAVMRMwEQYDVQQDEwppZHAudWhhLmZyMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAjwqTRagPEGunfC32fyNnNVRYuJPDM65kHC6DnjRv
+KcGMMKBP9zN1AIXqDSbjw27e/kQ+FXrWECy0EZfk4FT/wYe5nNnZO3ZJmHWxPKLY
+sa8DrGHG3a6xMUErtEEH6ZMTJMnEWBKcT/M7IBBpZfsyzBYmESmhM91Fo0yI6ihY
+pjvv19K7qsl+JXSC0J9Ng6L67I0tKbQ9f/Vke+hN/jxCnVL9uvlEo732XUFsQ97K
+PHxjSfRUDKuO2zRksnAmybHhK+MOf7VhrYiDm+rY1fN9GOyuha89lQUxqr2RakNN
+mtLaEHw7kKGGJJMdhQJXq9uQErDJMppQnbVM4xT41w9VAQIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAudWhhLmZyhiFodHRwczovL2lkcC51aGEuZnIvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFBpULgO2pp5BBWWveaICAaeGdhWLMA0GCSqGSIb3DQEB
+BQUAA4IBAQBs5JFe8dPlHV3+GU7RIl/r8LZo6W0zeOHmWiLvAwbuH64qA6ZgWGm5
+M4tKtWi4htYdgl4MjVpwgv3FMi8/hXTfQbVOjqGZiqKCTDjPtHYJOfZvAxL/ufg5
+bSJJlH3DOgLPpMacR1/SynTnplrNptvAYjUseje/cg5me6Myn/8UK7SrJIfOBC6w
+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://unknown.site.com</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.uhk.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uhk.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..e6d61d9c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uhk.cz-idp-shibboleth.xml
@@ -0,0 +1,131 @@
+<?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>
+      <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-us/Pages/default.aspx</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>
+MIIEgjCCA2qgAwIBAgIQMky1q3HrRxPo56VN/NmU0DANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMDkxMTAwMDAwMFoXDTE1MDkxMTIzNTk1OVowSTELMAkGA1UE
+BhMCQ1oxJTAjBgNVBAoTHFVuaXZlcnNpdHkgb2YgSHJhZGVjIEtyYWxvdmUxEzAR
+BgNVBAMTCmlkcC51aGsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDrU/S+ixb9ntWiK6bR0xSfKh0mUBUAn8JqIHHTQ3rtUr+kQteHHg23M8iPTcia
+DR9U7oMCrAMeVdI66Ld3tMe2OrmZVIuY654Yj55Vcw64Ew7kKmtflOY4VRtaPzZo
+v2cUVa7aTyJ+740LY7mBS4B1FOoDsxmk0CW64luYoi71cLLC3oxZwa0RXiJEQCX/
+k1H4TwnuZZA3J57TEQWwZ0WBr9jHUhDUNy0UxLnnpgla3Eo/TC8+s0qm1xge/NBV
+US2kT//puh234zpU2t8nSkw5uPKjxnIJCd7o/8/d738kQQtc2nCKdilFRKST+E7Q
+3vuzjEYHYe5oLZrg22u7AFrLAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
+DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUUBJ3Z32TA3bLvPrqbqT4dXZ6O0cw
+DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwLwYDVR0RBCgwJoIKaWRwLnVoay5jeoILaWRwMS51
+aGsuY3qCC2lkcDIudWhrLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQAYaJ0RPwGFOXz9
+vCDdQ8rFUicwvoSzL8RrOgtsayyVvtysYJJykVpfmT4ytzgLXI7ilqpCQ3wic/OR
+aQMVyyhhXV8yoUOdxugs5IPCFDDJOaPH2jtwkY8DWOapCEzSNwK0AvxZ5jCCA3rF
+/01BkC2pDt4yOoBTYhCOWigvWcDY7UNCubK3SCzjNGlhoWq0Y3glao0yx4HItwbQ
+sBMIvj9fFFvn0bpREgour8PC18anj/QK2t0jLGu0D6KOHrRmY2043ylhl7Uk/CWH
+2DYpexi2dfcGYko0lfaQ3i8W2GT3jAuSSy8FzY3QKBw9B6MvG4OJfleh+QC5V1ff
+PZ/kn4a7
+                    </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>
+MIIEgjCCA2qgAwIBAgIQMky1q3HrRxPo56VN/NmU0DANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMDkxMTAwMDAwMFoXDTE1MDkxMTIzNTk1OVowSTELMAkGA1UE
+BhMCQ1oxJTAjBgNVBAoTHFVuaXZlcnNpdHkgb2YgSHJhZGVjIEtyYWxvdmUxEzAR
+BgNVBAMTCmlkcC51aGsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDrU/S+ixb9ntWiK6bR0xSfKh0mUBUAn8JqIHHTQ3rtUr+kQteHHg23M8iPTcia
+DR9U7oMCrAMeVdI66Ld3tMe2OrmZVIuY654Yj55Vcw64Ew7kKmtflOY4VRtaPzZo
+v2cUVa7aTyJ+740LY7mBS4B1FOoDsxmk0CW64luYoi71cLLC3oxZwa0RXiJEQCX/
+k1H4TwnuZZA3J57TEQWwZ0WBr9jHUhDUNy0UxLnnpgla3Eo/TC8+s0qm1xge/NBV
+US2kT//puh234zpU2t8nSkw5uPKjxnIJCd7o/8/d738kQQtc2nCKdilFRKST+E7Q
+3vuzjEYHYe5oLZrg22u7AFrLAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
+DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUUBJ3Z32TA3bLvPrqbqT4dXZ6O0cw
+DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwLwYDVR0RBCgwJoIKaWRwLnVoay5jeoILaWRwMS51
+aGsuY3qCC2lkcDIudWhrLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQAYaJ0RPwGFOXz9
+vCDdQ8rFUicwvoSzL8RrOgtsayyVvtysYJJykVpfmT4ytzgLXI7ilqpCQ3wic/OR
+aQMVyyhhXV8yoUOdxugs5IPCFDDJOaPH2jtwkY8DWOapCEzSNwK0AvxZ5jCCA3rF
+/01BkC2pDt4yOoBTYhCOWigvWcDY7UNCubK3SCzjNGlhoWq0Y3glao0yx4HItwbQ
+sBMIvj9fFFvn0bpREgour8PC18anj/QK2t0jLGu0D6KOHrRmY2043ylhl7Uk/CWH
+2DYpexi2dfcGYko0lfaQ3i8W2GT3jAuSSy8FzY3QKBw9B6MvG4OJfleh+QC5V1ff
+PZ/kn4a7
+                    </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-us/Pages/default.aspx</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: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
new file mode 100644
index 00000000..d9301019
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ujep.cz-idp-shibboleth.xml
@@ -0,0 +1,126 @@
+<?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>
+      <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>
+MIIELjCCAxYCCQD8WhkthREzrjANBgkqhkiG9w0BAQUFADCB2DELMAkGA1UEBhMC
+Q1oxFzAVBgNVBAgTDkN6ZWNoIFJlcHVibGljMRcwFQYDVQQHEw5Vc3RpIG5hZCBM
+YWJlbTE9MDsGA1UEChM0SmFuIEV2YW5nZWxpc3RhIFB1cmt5bmUgVW5pdmVyc2l0
+eSBpbiBVc3RpIG5hZCBMYWJlbTEcMBoGA1UECxMTQ2VudHJ1bSBJbmZvcm1hdGlr
+eTEUMBIGA1UEAxMLaWRwLnVqZXAuY3oxJDAiBgkqhkiG9w0BCQEWFXBhdmVsLnBv
+bGFjZWtAdWplcC5jejAeFw0xMzAyMTEwODEzNTJaFw0yMzAyMDkwODEzNTJaMIHY
+MQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxFzAVBgNVBAcT
+DlVzdGkgbmFkIExhYmVtMT0wOwYDVQQKEzRKYW4gRXZhbmdlbGlzdGEgUHVya3lu
+ZSBVbml2ZXJzaXR5IGluIFVzdGkgbmFkIExhYmVtMRwwGgYDVQQLExNDZW50cnVt
+IEluZm9ybWF0aWt5MRQwEgYDVQQDEwtpZHAudWplcC5jejEkMCIGCSqGSIb3DQEJ
+ARYVcGF2ZWwucG9sYWNla0B1amVwLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvJIxOavTd0EX9/IM/cpWc/RlFw1wsDiZuN96yFRACjMeY0jxyF80
+KQJbSSUhgnBIXfeLcgOFBYMivtkxpKRw/dqIB7Pq0Reh9sdHvV0Kec7pphHhwiGv
+f5jz9OiqtP8ZfkK8dgZwJfjBhqjt6V5cHI5lGSMek0pH0KcrCo+yAhwtZecuDhTe
+xPHfBJ5UsQ9t/ynCQn6/NckOQrYIkeP9u+wS/XsF8Z5aB35Pjq6RCZCUqrWYomfg
+LpZKAjSikFyA/Er6UiZCXHysYkq1O4kE87ndhkN5ngtH6FBSJQO5QfG8BgrxiOCm
+chPtodxO++n1ZBhMVt4kHAC5txaEhhl9ZwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQAdNqOKtWjjw2L1YZ7hOxLNyZlAmboyDKeirErCXVK64QVCQvWZTl3BLDmvJzP7
+YbW0NeKq9STOfnxlJOV23NRPLjlaDwMn4B9wF6elNi+FeBplKt8NbXwXPfSSIHN7
+ytJJMwPrEBrrXhSKedT/rpGx28Ld4UuC4aKCjhCVor0fGh3B8BPQZoAY3iO+lXJg
+5jSx2xyJS9xVGE4sjeHrPTYNApQUKHboj4d2aswEQg+JvQYqdEU+SCBveo3Qou3Y
+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>
+MIIELjCCAxYCCQD8WhkthREzrjANBgkqhkiG9w0BAQUFADCB2DELMAkGA1UEBhMC
+Q1oxFzAVBgNVBAgTDkN6ZWNoIFJlcHVibGljMRcwFQYDVQQHEw5Vc3RpIG5hZCBM
+YWJlbTE9MDsGA1UEChM0SmFuIEV2YW5nZWxpc3RhIFB1cmt5bmUgVW5pdmVyc2l0
+eSBpbiBVc3RpIG5hZCBMYWJlbTEcMBoGA1UECxMTQ2VudHJ1bSBJbmZvcm1hdGlr
+eTEUMBIGA1UEAxMLaWRwLnVqZXAuY3oxJDAiBgkqhkiG9w0BCQEWFXBhdmVsLnBv
+bGFjZWtAdWplcC5jejAeFw0xMzAyMTEwODEzNTJaFw0yMzAyMDkwODEzNTJaMIHY
+MQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxFzAVBgNVBAcT
+DlVzdGkgbmFkIExhYmVtMT0wOwYDVQQKEzRKYW4gRXZhbmdlbGlzdGEgUHVya3lu
+ZSBVbml2ZXJzaXR5IGluIFVzdGkgbmFkIExhYmVtMRwwGgYDVQQLExNDZW50cnVt
+IEluZm9ybWF0aWt5MRQwEgYDVQQDEwtpZHAudWplcC5jejEkMCIGCSqGSIb3DQEJ
+ARYVcGF2ZWwucG9sYWNla0B1amVwLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvJIxOavTd0EX9/IM/cpWc/RlFw1wsDiZuN96yFRACjMeY0jxyF80
+KQJbSSUhgnBIXfeLcgOFBYMivtkxpKRw/dqIB7Pq0Reh9sdHvV0Kec7pphHhwiGv
+f5jz9OiqtP8ZfkK8dgZwJfjBhqjt6V5cHI5lGSMek0pH0KcrCo+yAhwtZecuDhTe
+xPHfBJ5UsQ9t/ynCQn6/NckOQrYIkeP9u+wS/XsF8Z5aB35Pjq6RCZCUqrWYomfg
+LpZKAjSikFyA/Er6UiZCXHysYkq1O4kE87ndhkN5ngtH6FBSJQO5QfG8BgrxiOCm
+chPtodxO++n1ZBhMVt4kHAC5txaEhhl9ZwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQAdNqOKtWjjw2L1YZ7hOxLNyZlAmboyDKeirErCXVK64QVCQvWZTl3BLDmvJzP7
+YbW0NeKq9STOfnxlJOV23NRPLjlaDwMn4B9wF6elNi+FeBplKt8NbXwXPfSSIHN7
+ytJJMwPrEBrrXhSKedT/rpGx28Ld4UuC4aKCjhCVor0fGh3B8BPQZoAY3iO+lXJg
+5jSx2xyJS9xVGE4sjeHrPTYNApQUKHboj4d2aswEQg+JvQYqdEU+SCBveo3Qou3Y
+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>
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
new file mode 100644
index 00000000..6c44b88e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ujf.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+MIIDJDCCAgygAwIBAgIVAOD7Yz6jYE8fRkrwh1ZXoCmNIVU6MA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC51amYuY2FzLmN6MB4XDTE0MDQwMTExMDUyOVoX
+DTM0MDQwMTExMDUyOVowGTEXMBUGA1UEAxMOaWRwLnVqZi5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCk6sa+XtQhFGDXscfnTX1UUzCmoDh5
+Kz4uFhU7NlFIK7uAjTp3QivxHKiCEP71zGnOcHC/sxBcEa7mt5qcp8eRuN9yxQRQ
+hB82z2WGHmzhB5qn6DCf1gMHMdlF1xSjm5tttmYyyTRqeKFDj4G7kkbvZoLC88UA
+8b5mqLubMNfGbDARjEQdAFjHbi6KZPvxHEg9EHxfSQHPwOon1GBpy565iacaZyKq
+N1c6rBQ1Dk7wM7ggbzye663O/BE3iL3i6j3trKD5oNp+73UHHDov1uevf6a+ytJd
+g7ls87pFGYEnkjMLOQz1ClsbOGmqcpLIaVxL5A0MqLaA1W/a8EyXXSFHAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC51amYuY2FzLmN6hiVodHRwczovL2lkcC51amYu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQTmbv/Y1doqdDwVhaTZm6
+/cTQSjANBgkqhkiG9w0BAQUFAAOCAQEAAymJ3004P1+g69w44c50ARFmSwmNkRig
+/NYhXIBOHCMmHDpzCNBmlLYlxHqf/eoOcC2aEnJsjHt442tmw33Wz4BE4k8X7S7Q
+VskudwRhmCqSglM4OI7hDlNqL7RqFFph6TgeNXHlJgC7ZPZT8///0AlDXI0Zlo1i
+qmRTjFNJq948mACt8uENgTAANFT76+OJMAPfd/9ILn+2EX6rf/yg/DjWzGqcoDkS
+5/h7LWagG5taDgrHmTzYp5+PumgVB2l8avie+ABirn//quP3ppZbSP5xD3ODhx77
+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>
+MIIDJDCCAgygAwIBAgIVAOD7Yz6jYE8fRkrwh1ZXoCmNIVU6MA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC51amYuY2FzLmN6MB4XDTE0MDQwMTExMDUyOVoX
+DTM0MDQwMTExMDUyOVowGTEXMBUGA1UEAxMOaWRwLnVqZi5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCk6sa+XtQhFGDXscfnTX1UUzCmoDh5
+Kz4uFhU7NlFIK7uAjTp3QivxHKiCEP71zGnOcHC/sxBcEa7mt5qcp8eRuN9yxQRQ
+hB82z2WGHmzhB5qn6DCf1gMHMdlF1xSjm5tttmYyyTRqeKFDj4G7kkbvZoLC88UA
+8b5mqLubMNfGbDARjEQdAFjHbi6KZPvxHEg9EHxfSQHPwOon1GBpy565iacaZyKq
+N1c6rBQ1Dk7wM7ggbzye663O/BE3iL3i6j3trKD5oNp+73UHHDov1uevf6a+ytJd
+g7ls87pFGYEnkjMLOQz1ClsbOGmqcpLIaVxL5A0MqLaA1W/a8EyXXSFHAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC51amYuY2FzLmN6hiVodHRwczovL2lkcC51amYu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQTmbv/Y1doqdDwVhaTZm6
+/cTQSjANBgkqhkiG9w0BAQUFAAOCAQEAAymJ3004P1+g69w44c50ARFmSwmNkRig
+/NYhXIBOHCMmHDpzCNBmlLYlxHqf/eoOcC2aEnJsjHt442tmw33Wz4BE4k8X7S7Q
+VskudwRhmCqSglM4OI7hDlNqL7RqFFph6TgeNXHlJgC7ZPZT8///0AlDXI0Zlo1i
+qmRTjFNJq948mACt8uENgTAANFT76+OJMAPfd/9ILn+2EX6rf/yg/DjWzGqcoDkS
+5/h7LWagG5taDgrHmTzYp5+PumgVB2l8avie+ABirn//quP3ppZbSP5xD3ODhx77
+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>
diff --git a/swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml
new file mode 100644
index 00000000..ee8cb10a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml
@@ -0,0 +1,69 @@
+<?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">
+    <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>
+MIIDEDCCAfigAwIBAgIVAJxKI/0KxawomkWiBThPEUHGaeWBMA0GCSqGSIb3DQEB
+BQUAMBQxEjAQBgNVBAMTCWlkcC51bC5pZTAeFw0wOTA2MDMxMzQ1MzVaFw0yOTA2
+MDMxMzQ1MzVaMBQxEjAQBgNVBAMTCWlkcC51bC5pZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKLSkjj4e2mBQDJq0KHnOW9Hja+ppghnQ3M1uPy7KihO
+Fj066YioJ/L+diFDPFI+RMwg7mtOmALM/v1JgVXwjI/j5mXLcnwipqOw9JqzSlXi
+DLXgZ1OlYBfFzjJo3H80eVutTgQDeHGDZvk+RhstcYd7CBhXFEbusahw0Wt8ii4i
+xL+w22TAFCm34ybpQ29ekFDp+ytqQP4sWZUaB5U+FYksBNNn4hgRO0sg/B8WYIdv
+FT0s/h34BBpP5fQeKfduZ05Qd5ourLI4hMPNDYZ/+dhq1ufnV5ggkuMGuzlEtmtZ
+I4gX73kM/0UVTCdPsu7Q7IagUU8oZcT1DtCaOacn3M8CAwEAAaNZMFcwNgYDVR0R
+BC8wLYIJaWRwLnVsLmllhiBodHRwczovL2lkcC51bC5pZS9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUO9U1lJbD0Bspt87Hjdjj0rZgBb4wDQYJKoZIhvcNAQEFBQAD
+ggEBAIDL+WS+pD5R1fJdL4sXWEgiE7Qv39aNl8NSBWbV1v/7CBrcb737/dLmJi5F
+H8AwVisWUtmrFxea+OJvwLhrmLt9HXJmsnl8zwyvVEeu2oU4QskbLqDWuewz317g
+orDzkFTm6NcvAUiPYiGpjO9o6HreXSn3mMinVu2waH56e0T7zxkEYMJ1o7A7fJO6
+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: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: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.umk.pl-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.umk.pl-simplesaml-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..ba49a9dc
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.umk.pl-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.umk.pl/simplesaml/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>
+      <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">uni.torun.pl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Nicolaus Copernicus University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+            Nicolaus Copernicus University Identity Provider
+         </mdui:Description>
+        <mdui:Logo height="168" width="150" xml:lang="en">https://www.umk.pl/grafika/logoumk64.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>MIIDejCCAmICCQC6YrVExu7BUTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJQTDExMC8GA1UEChMoVW5pd2Vyc3l0ZXQgTWlrb2xhamEgS29wZXJuaWthIHcgVG9ydW5pdTEoMCYGA1UECxMfVWN6ZW5pYW5lIENlbnRydW0gSW5mb3JtYXR5Y3puZTETMBEGA1UEAxMKaWRwLnVtay5wbDAeFw0xMzA0MjIwODUwMzVaFw0yMzA0MjIwODUwMzVaMH8xCzAJBgNVBAYTAlBMMTEwLwYDVQQKEyhVbml3ZXJzeXRldCBNaWtvbGFqYSBLb3Blcm5pa2EgdyBUb3J1bml1MSgwJgYDVQQLEx9VY3plbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMRMwEQYDVQQDEwppZHAudW1rLnBsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArq1rEn9i3haxBrIM/h/8V20Ap+LeLeG9SNand3N5k6wTqfQMPHnhDoTSKg4iI1+Wlnlr91HCaUGTqGmuWZpSTmlLIgneKSkB3BZir7Yrz44mjD5b0OOBLKxoQQQrZiVE0Rz2Ek14WDLQ9reI6uBTFV39PRM2JSLCSbzlEO70+vJ1d6oxWwinzcL+wG8NApc2mt3VJgRwF15P2H7PKU1le03CdatY7GyHGqBllQuQ3aa8a3jbqZRlQ7BDw+HiuJGsWRoNKAQkci8SCLz7/RJX3XuWWRdM+DBGw7jALY/4WW00DUWaKv76nfsTqRwG8pySab4EQPoUsYGO196jTC9DVQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBu6pNnNvtILCiCgjsBjp7T2tWQLPLrgjpMD4yTBgg0IgQjP+wpLhwBB8huX6FfhySaedz9YXEphUIPN9ZuJyfonp+w1ITHtEguY9V7K06IkTpXJV4/LXjzV7iGVZ3tgvtlYz+uBT2kTdqJcCWBj860JMWP7BHJ3orQsGUka9QentVEtKMqvmdOfOXCd48NZYFvCg4iQlr2lHxPTANTKVf8+d7Js3+MFBqTSPLsRsDAknL9tZWTM+1U6toECw+p4dTk3u3Osn8Fkmbwg/AnUyNP9cfWW9YSHEbLzq0kFWP6SoViqzc2WYPPusaLELoZBZlqFp0dLtEcgQPasj2dJE+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>MIIDejCCAmICCQC6YrVExu7BUTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJQTDExMC8GA1UEChMoVW5pd2Vyc3l0ZXQgTWlrb2xhamEgS29wZXJuaWthIHcgVG9ydW5pdTEoMCYGA1UECxMfVWN6ZW5pYW5lIENlbnRydW0gSW5mb3JtYXR5Y3puZTETMBEGA1UEAxMKaWRwLnVtay5wbDAeFw0xMzA0MjIwODUwMzVaFw0yMzA0MjIwODUwMzVaMH8xCzAJBgNVBAYTAlBMMTEwLwYDVQQKEyhVbml3ZXJzeXRldCBNaWtvbGFqYSBLb3Blcm5pa2EgdyBUb3J1bml1MSgwJgYDVQQLEx9VY3plbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMRMwEQYDVQQDEwppZHAudW1rLnBsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArq1rEn9i3haxBrIM/h/8V20Ap+LeLeG9SNand3N5k6wTqfQMPHnhDoTSKg4iI1+Wlnlr91HCaUGTqGmuWZpSTmlLIgneKSkB3BZir7Yrz44mjD5b0OOBLKxoQQQrZiVE0Rz2Ek14WDLQ9reI6uBTFV39PRM2JSLCSbzlEO70+vJ1d6oxWwinzcL+wG8NApc2mt3VJgRwF15P2H7PKU1le03CdatY7GyHGqBllQuQ3aa8a3jbqZRlQ7BDw+HiuJGsWRoNKAQkci8SCLz7/RJX3XuWWRdM+DBGw7jALY/4WW00DUWaKv76nfsTqRwG8pySab4EQPoUsYGO196jTC9DVQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBu6pNnNvtILCiCgjsBjp7T2tWQLPLrgjpMD4yTBgg0IgQjP+wpLhwBB8huX6FfhySaedz9YXEphUIPN9ZuJyfonp+w1ITHtEguY9V7K06IkTpXJV4/LXjzV7iGVZ3tgvtlYz+uBT2kTdqJcCWBj860JMWP7BHJ3orQsGUka9QentVEtKMqvmdOfOXCd48NZYFvCg4iQlr2lHxPTANTKVf8+d7Js3+MFBqTSPLsRsDAknL9tZWTM+1U6toECw+p4dTk3u3Osn8Fkmbwg/AnUyNP9cfWW9YSHEbLzq0kFWP6SoViqzc2WYPPusaLELoZBZlqFp0dLtEcgQPasj2dJE+a</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umk.pl/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.umk.pl/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <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/idp.umu.se-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..f26ae2ce
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml
@@ -0,0 +1,74 @@
+<?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>
+  </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 height="63" width="358" xml:lang="sv">https://www.umu.se/static/images/umu_logo.jpg</mdui:Logo>
+        <mdui:Logo height="63" width="350" xml:lang="en">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>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>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>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.uni-lj.si-idp-20100525.xml b/swamid-interfederations-2.0/idp.uni-lj.si-idp-20100525.xml
new file mode 100644
index 00000000..3dac7d1f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uni-lj.si-idp-20100525.xml
@@ -0,0 +1,108 @@
+<?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-06T19:11:07Z">
+      <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>
+      <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">fsp.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,iVBORw0KGgoAAAANSUhEUgAAAPAAAADvCAYAAADM1VncAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAABXUSURBVHhe7Z3dkRS5toWLeZo3GAPOASwALAAsoLEAsAB4Ow8nArBgwIIBD8CCgbhxnwcsGLBgmvcb0Te/JBezW0hZmVWZ1b171hchulKp3y0tKaVUFZdOOjbGJOL+/fub4+PjzcePH/u/L1++3Dx+/Hi42+br1699WHj79m0fn7/37t3r/TJy6fXr1yefP38eLk9z7dq1zYMHD4arv3nx4sXw6TTPnj0bPu0ORr5582afN8a9fPnycMecBa22hjt37mxu3749XP3Ily9fNl3/2jx58mTRdvz06VPfN54/f95f03+vXr3afx5D5ZF4gQGgVrZXr171ffC8ils2oEInnSFOusIyE/euE1Dvx70a3Osa5eTKlSt9eD53I9twdz9IR+V4//794GvOCtqD9lWb4B4+fNj3gU4EQ6g66lOEXRr6JmnTV+ei+hwdHQ0+p1HauPOKtPe9hIhFhZ4qHAzRjcLD1TLQKSgDBexG1sHXnCXdLPW9byDeqShOayLYB8RH2vTBuWhgGZuguE+48wi6kG1/6v7ZGR51l+bGjRsMKpu//vpr0mORWZ/+UW2gE87waTusN3G1Zdi+qEzdgNL/nQqPnloysgSoQR07EZ+q93kCXWDXbgDqJDywywxMuKVn4Cx0jZvuCWHbI28LZl36BU9F5wFsT3l2mSG1RNvl0XsKaGJXO+/CXjNwC0a5uPnx5s2bfufw7t27m0ePHm0+fPgw3KnDRhbh9JnwNRchz/I+ccW7d+/6MlEG3NOnT3u/GsTjvqD8xI15do9uvSvzLF0JaZMe9aMc2IUNk1jWXSGdW7du9emWUB+emFp1HkMz0dTZlzxa5cAm1Pn69evNOhP/l19+6cPVUHniDMoGFTYlXxy2qNHPWh21mVtpULZtduK+2pDwlJVrykS/KIlpl2XDDvgpLcK1oO+csu0g5MVmYNYVjNT4MxIx0pHm90X34FrrD9JUHGD9xZpEfjg+lxsjpMd6iPvkxX3ikh4jNeVh5AZmTq1z8CeciPnjH/PFETfOANrQkdPaDFfahvsqG+ngFL4MOwfKSXyt7XAl3Md/7ppRdcW12iyi2VouQvx4r9XPlEarrOpLak/1OdoqtpfuC+yke+UsyXXso7RRDfUnwjKbq+/EupVxy7RjW3NP/Sj2ndI25FOz7WICJoPYgWIlRVmI8hFUnUwuQlj5tzqSGkiNI6OSZw0MHe9HA+KoA+XXYxf1UR1wfC5RGoSNnUT1Lhs32n0XKAOdlrqqvpS7REJs2aKFBkVcrb4R2UVxKJegbFzHdizbH8hDnb0UIGBTxQfSJXwMq34UhQIt+0hEMe1a3uovqkck1iu2O/5KW/FVLuUb9aY0Sg2SJ7Yt01hMwKDOrXQwWA0Kzf2yM4PEgiuROGLHiJCeOqgMKtHViHVWg8T8Y/kwttJp2SfGjXVXx6mVJZZhFygj+QJ2IZ2aXQG7t+61UFth+zEQrWyvdtIMqk5M3WWLVhtGW9XQ4EAehCVcFAxQR8LgImW5IApsrC3Uryl3rT8pT9KKEF7lU/6ElXhj2TXIlnWPtlUbq80XFTC0ChEhDmFqnWnMiEobVzYakKfKLoOTF37RUXnyVufEKR6M5dGCsIonYws6Go1XS498FW8XlGZMR4NRCfd2rZM6TAvNWHRuxVFe1F+f1Ylb6alNShsKdWA6dU280BKw/GJbYyulEQeHSBxUavlRZ+4RphwciCti/qV4QbYp616zrdp4cQErndI/IgPPFTC0GhhDxTwVjgYnn20udvqx/Gtg2JhfbYRuQUeem18NDVhl5xPYlTLOAbuobK1BoWRsAK91wEi0Rez4gji6j1PHLpEtYn8YK5dQG8a8yVPibA06Eh6uVSblTx6EL9OKtmnpTwNJbMd0AlZcjBqFQqViuZVGrSNsYyz/GrEBayN0DdlOnWZOfiWx8cc6dc3eY2i24+9UJJ5ygAUJtJYedZBQcLFtRRR4nOlKlE4MM1YuiINDzFttG0UTkTBxY4OD8idMTRuqWysfUFlivdIJOHZWiRMjlhVXmLmdFhR3CrFTlaNqDcpKB8Y+1HVbfaewrfEZVLhXE0WL2KHn2FDiqQ0kGhBqdqJzqoPytwY24z55tOqiWQoXB1OVqzWgy4ZxcIk2qMXjPnZVuVqDAyh/HPFKxmwjFD/Way8BU6lDCxg0mqnDkldpYBkkNshUtuUvMKTCtjqdoMNRTsoc7TulvtsgTeK3hIYNWjNzi5YQxoj2KIliKDsw5WZWKTsxNlPeceAeG1Bki9gesVwSflmGmoDUT2M8wTVxsJPyVB8s047518oe7ytumYZmegYCQZiqgEsxtJDhI4cQcAxDGhJyhHIpDOHnoHhj0IBqOP6WDQyyYwxbNsyU+o5Ra/wIg93YzNBCs2HNtoI2jraVzWuDWW2GA2yEX98Zi3qQnmwoO43NvsqfMNEWZbnoM1GopKe8NWAA9cOv7MuEp8ykWw4OlLMMH8tVK3tZPqUfw2rSUlsSB9uc6jWa5qc0OInTuOXILkOvKWCgggpXe+ygAVUfylnr3AJjxPtT8lcHx8VGF9hHaajz1mwS09mFljCAdiw7whRUdhy2qaF2imlrkKpNABJDbHPKrvL1nbG7r3pwHe2l/GqDAyg+bV62h/oKYUiHcsZyK245WKnMsRzEI70oJIUh31r+skutv0O0m9Lnc0Rh0Bv3ZKdTvUYVwdVEIejssRKRljEixCNMLX4UcDRyifJpjWoQ60M4rmNYjFHWg7opTkv0Eg2uZSfVETRg4TTgkTadUZ1E90gPG0xFaatBgToq7TEbtoj1KwdowI7YM+a5zW4xPdUdp/LJXqRJnfgby85n7tf6jMpLn6sNpsqb/Gph8Od+OVipbagr5abexI9loJyE4a/6WGSbXeJ91XssDcoa+/wPwz4Fldr5S6VIWE4J8DmCUQjLPWWGAWIHJ201lBzX+FMg0lTeOD6X+QjC18pRohE35ilHfJVvLH8ZC6IxcdSxdNEGoJE5xot5E0f+fI75bYO0FZfGVyfdZpcaxI1lUZqqFy7WI7atRET4GoqDi3UXMV/KUbMBHZv7xKVd6TcqE32vZTeli11qAledSC/CteLiCFfaNd4r44PsQp1qxPbDleKFOKlh31iH5k/q8OWALuD3r16JLoH+wHb5KwYcyCZ8SVex/iuCwIHuMj3oDNt/Rap2+B9av/rAgfJaWWoQNpaPPDujnoo7Jf9WPWuUde8ap/9c5k2a3KMuCj8Hyt01cv+5Vq+ptOrfItqFA/bYpevg1V9mkf1b5VMdsMGUX/kQrf4Y0ZcHusnih3CUi/LQVnyFtUTl5j7hyq+4jqUN6i+Us1VG0ugGnz6N1ldo+TINZSjz8W9imb2hk9K5gM66yyB0VvDNHwYEhPHbb78NvnlY5euE5p9F9+jY/2V2zSRe0JMLs2tGLGCzNxIwj8+Z0K9zMPBk/WVKC9jMgjUhXybnr2AWY423xk/nLAlfuo8/EqC19Mvhp2ZTwhrYmKmwC0u36da8/Y48u7/sjPL5PNOtzb/v5FIHrqlDJ+IhRE68iWVmwWMnj8rsmgJrx9YO7HmDndy4W0+5x3a8M2ABG5MYr4GNSYwFbExiLGBjEmMBG5MYC9iYxFjAxiTGAjYmMRawMYmxgI1JjAVsTGIsYGMSYwEbkxgL2JjEWMDGJMYCNiYxFrAxibGAjUmMBWxMYixgYxJjARuTGAvYmMRYwMYkxgI2JjEWsDGJsYCNSYwFbExiLGBjEmMBG5MYC9iYxFjAxiTGAjYmMRawMYmxgI1JjAVsTGIsYGMSYwEbkxgL2JjEWMDGJMYCNiYxFrAxibGAjUmMBWxMYixgYxJjARuTGAvYmMRYwMYkxgI2JjEWsDGJsYCNSYwFbExiLGBjEmMB/wO4e/fu8MlcNCxgYxJjARuTGAvYmMRYwMYkxgI2JjEWsDGJsYCNSYwFbExiLGBjEmMBG5MYC9iYxFjAxiTGAjYmMZdOOobP5oLy6dOnzY0bN4Yrc5HwDHzBefHixebJkyeb69ev90I2FwsL+ALz9evXzZ07dza///57L+LXr18Pd8xFwQJeEQR0lnz+/Hnz8ePHfhY+Pj7eXLlyZfPly5fh7uE5a3tcRCzgFXn+/Pnw6Wxg3fv48ePNw4cP+5mYGRhRnwU8vr99+3a4MkthAa8IojkPXL16dXP79u3NtWvXBp/D4020dbCAV4TH17N8ZD1vYA+zLBbwity8efNcPTbyKH2WszB4J3xZ/B54JfglyPfv3/ci/uOPPwbfw/Lhw4d+80oznza1GFR4rD4kly5d6v+yL/Ds2bP+s9kfC3glmGkQMLPe5cuXB9+z582bN/0rJUTMuvhQvHv3rv977969/q9ZBj9CrwSvbIBH1vP0+uTBgwf9wHJ0dLR59erV4Lsu1F/LiUePHg2+Zgk8A68Mj9I8Nh5ytpsCouJxGmEd6gmBPBnY3OWWwwJemUMJmEd21rsCccbriO6xJuYR/5BrUtbC7nLLYQGvzHmYgVl/8k66nGnxf/nyZX/U8lBYwMviNfA/GETNetjkxQJeGdaY2tA6bzAjUz5eNx2K83I67aLgR+iV4YsEa1KuX8vHZTaO2P1lvRvD8jqJHemnT5/2Awz3tLE1Bunsep6awcKvkZbFAl4IjkyWhyMQE+Jho2gtyrU1s2n0o1x8iYHXWQhWKNxa62DyjULnM3sBf/755+DzLQyDx3l6T54OBGz2p5u5Trr15HD1jU64J13HHa7qdJ365OjoaLj6m5b/NihHJ9jh6uTk+Pi4L0c3kAw+3yAMZeP+1G7QCb1aJtLuBojhqg1hoo3IuyyXmYfXwAvBt22YbSPMOtuOLPLoWnvd0/IXzJw1OGWlmY8wzHo4Ho3v37/fz3q8cmJWxq9cB7fSBb6aWCsTj8VTzlhzeIR8BXmXNjPzsIAXRMIBRDL10bkVbiw+4mPNWsKjMPG0tv311197kSAexM1fdp4Jp/Vo3I2mDrV0xS5lFYQpBTs2SJntWMALQmdkhgOJpkXc+dXaFNHjBP6IKfoJZs3a7EVYxI1wmRXZROOvhCt369atIcZpASP6Mt1YrnIdLWIdWgMATymUpZzla/UzExkepc0edJ2/X0fitP5kvdiCtSdr3BLidOIZrr5B2mVY5deJcvCpw3pYdIPL9zWo4gvucd1Kt1Yu4nQz+g9rfMLGfEu0jlZeuJotzDQs4AWgM0sYdGgcn1twn04cN5uAON0MOFx9AzEgvDFRTAWh4CSeqdTKRZ1JqxQ7Qqe8Lag7ectGOD6b3fAj9ALoNUjXob9v0owdnWRji0fgruMOPt8gTieM4eobeuyM/jxy8q0ejmkuCemy0VWmWysXdebRu/RnXV3WK0Ldu37X/+VxPdrMzMcCXgg6uU4Zbdt53hdEPWXTaC6ky0bXoSA/2czshgX8D4JXU/E0lsmPBXxGtMTE42UJr3zGHslbsEvMLrQcxyfZJSetWj5j1MKTTu0E19y0ze5YwElh/cg6uga/tIFgCaOBAsdamjUna1y97ioZS9ecP3wWekEkirXXwGMgXtbHY+eL2aw6Ojrqz0Aj2AgiP2T5z4PNMmMBL0z5jR52aeN1C3Zux3ZvBeKMhylKyH9MvILH6/fD4Q39hTJ9BBbLFcPWoK7lzvQYDCJsZpndsIAXQl/PWxsEiqCmdnoNKMy0U+IgbB6zl/52kigHOMqF8wy8G14DL8Sh3mXS+ae+6kEszHDMmjwycz76rOHpgM0vOY5t+j3w7ljAK6Gd33KziJka/3iOGOb6C0TayguxaAMLIdce5bel37rPeWb8uR9p+RO/5m/2wwJeCUTDzFeua/WYXa4l5/oLibSWV6TcrBLb0m/d58QVhzDK2bPlz2xb8zf7YQEbkxgL2JjEWMDGZIbXSGZ/uvXd8GldurXoqnmtnX4JX0nEmd3wDGxMYizgC45e33DEkldO5mJhAa8Ewqn9952cQ66Jaa5/hHevtfervBfm3S+HOHh9UzsAQhgE3kqf/Gv3W/HkX76Tbvmb/bCAV4L3rpwyqh2Q4J1q7X3oXH9BXhx/LPPieCI/BcsRSg5ytNLg7DL3W/B+uXW/5V8bLFROsxwW8Eq0fm0Cf76uVx74n+sf4ZAE3yLaBUTODN2C/GtpE69WP/mX5cWfeowdNjHzsYCNSYwFbExiLGBjMjO8DzZ78rHyu83deq///eQS/HElU/xJr5YXfrW8BPc4pFGDe0qfv6+L36uO+UdivEirjDV/H+TYD3+h35wpvFoCvlFl5mMBLwzvRbtZZrj6Btfd7DNcteF10Tb0kze8T+1mv96Pv/pcY0q6Qunz/ldlHkufMGV9p8IrKOXBTrqZjwW8EPzS41o/QxNhgEBMvN5ZgjgQgL43vET6tcEsEl9P8ZrJ7AACNvtzqC8AsI6dk1cnzup/TtZibvr74jXwfngXeiU4FcX/M8SjaIRr/l+j8ujjXH/BLEdetSOK+HH6Sieg4n8pKki/dlpMjJWL9Wv5O1stf8pS8zf7YQGvBGs61nfl2lcnm8o15Vx/gTB5TOWUUyliHkvZHGJNy7FOwkWxcoYaP449toQ1Vi5OXJWPyC1/ndAq/c1+WMDJ4T/y5rwzm09j56URUFxzAr9fJXGPnYU25xcL+IKgzacxSgELbyDlxQJeEWbFmmh4lMSVzPU/FK38qRt1LJnrb3bHAl4RHk9rsxvr49p7z7n+h6KVP3WjjiVz/c3uWMDGJMYCNiYxFvBK8N70+vXrP7xj5ZpTWzoDLOb6H4pW/no/zL1Iy59XXDV/sx8W8Eqw1qttYLGWrG0IzfU/FK38ed9b25Bq+bP+9QbW8ljAxiTGAl4RZhy/Rvobv0ZaHn8baSFY7x6icyIkHmvLNanyHjuNxbFK1rTl1wsRFo/8rNv5XEt/LSgLdfL3gXfDM/BCeGbZjdbsbqbhGdiYxFjAC/F///s/wyczl5/+fXXz07/+PVyZOVjAC3F85efhk5nLz//5b+/MfLwGNiYxFrAxibGAjUmMBWxMYixgYxJjARuTGAvYmMRYwMYkxgI2JjEWsDGJsYCNSYwFbExiLGBjEmMBG5MYC9iYxFjAxiTGAjYmMRawMYmxgI1JjAVsTGIsYGMSYwEbkxgL2JjEWMDGJMYCNiYxFrAxibGAjUmMBWxMYixgYxJjARuTGAvYmMRYwMYkxgI2JjEWsDGJsYCNSYwFbExiLGBjEmMBG5MYC9iYxFjAxiTGAjYmMRawMYmxgI1JjAVsTGIsYGMSYwEbkxgL2JjEWMDGJMYCNiYxFrAxibGAjUmMBWxMYixgYxJjARuTGAvYmMRYwMYkxgI2JjEWsDGJsYCNSYwFbExiLGBjEmMBG5MYC9iYxFjAxiTGAjYmMRawMYmxgI1JjAVsTGIsYGMSYwEbkxgL2JjEWMDGJMYCNiYxFrAxibGAjUmMBWxMYixgYxJjARuTls3m/wEXGCSIc8PVHgAAAABJRU5ErkJggg==</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: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">Univerza v Ljubljani</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">Univerza v Ljubljani</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Univerza v Ljubljani</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="administrative">
+    <md:GivenName>Radovan Stanislav</md:GivenName>
+    <md:SurName>Pejovnik</md:SurName>
+    <md:EmailAddress>mailto:rektor@uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <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="technical">
+    <md:GivenName>Anton</md:GivenName>
+    <md:SurName>Jagodic</md:SurName>
+    <md:EmailAddress>mailto:anton.jagodic@uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Anton</md:GivenName>
+    <md:SurName>Jagodic</md:SurName>
+    <md:EmailAddress>mailto:anton.jagodic@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:ContactPerson contactType="technical">
+    <md:GivenName>Jure</md:GivenName>
+    <md:SurName>Lenče</md:SurName>
+    <md:EmailAddress>mailto:jure.lence@uni-lj.si</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
new file mode 100644
index 00000000..5a9b6896
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDZzCCAk+gAwIBAgIJAO63/giuk/ngMA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNV
+BAYTAklUMRMwEQYDVQQIDApTb21lLVN0YXRlMQ8wDQYDVQQKDAZDSU5FQ0ExFTAT
+BgNVBAMMDGlkcC51bmliZy5pdDAeFw0xNDA0MTQxMzA1MTRaFw0yNDA0MTMxMzA1
+MTRaMEoxCzAJBgNVBAYTAklUMRMwEQYDVQQIDApTb21lLVN0YXRlMQ8wDQYDVQQK
+DAZDSU5FQ0ExFTATBgNVBAMMDGlkcC51bmliZy5pdDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKpOSuOvQeVjjWlpxbpDz+35Ag9lt4TxUk2ljeTggV2C
+jSrp9HfDwdn3i5+LvFhFeXN+U/iDY9q1ljUsyuG6sPEgkTOUunJOjWXUMQPfNUZ9
+AP6Rn6/AXhpaTv5e6t3tZxac3zhRe+ptPASsabv/GtMkK+Oyfn39+1FP/mnWRM+p
+vIR4MTkOIiNoN4xT/AqshNkMN5zJMrEGiq9oQT4wObjHPjOYanihde0auFMLAXGR
+xYpiq+vsiezitnc2JXNbWVfwieK5FIFGGh94EV4mrui/YGVj+mjF25fqTU7B5YBW
+WENnNtbfiT4qfOGRX2JvV70y5zPbilypbS+nYnn8m8sCAwEAAaNQME4wHQYDVR0O
+BBYEFN2Dnm5ywy81VJkNqIDC/URi/BOkMB8GA1UdIwQYMBaAFN2Dnm5ywy81VJkN
+qIDC/URi/BOkMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADc2os6T
+j9GRr+YXVWu4mP3sYgynhVEMq+7akx22HEmOLbQkhlJc2igNolmQiknG6Dm6KUlY
+MbHTAx1YMF5iW2GFrjXBQa+Ro5aALKf7Q7YW9qsNLlTjNj7ZB4GSPh/J+DR4vZUR
+797WlcR3uIg+696zSTaY5xJVcKdTNOCZ/BLmyo/g1OC/EwQFxU1jCqH+J3FMd0G6
+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>
+MIIDZzCCAk+gAwIBAgIJAO63/giuk/ngMA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNV
+BAYTAklUMRMwEQYDVQQIDApTb21lLVN0YXRlMQ8wDQYDVQQKDAZDSU5FQ0ExFTAT
+BgNVBAMMDGlkcC51bmliZy5pdDAeFw0xNDA0MTQxMzA1MTRaFw0yNDA0MTMxMzA1
+MTRaMEoxCzAJBgNVBAYTAklUMRMwEQYDVQQIDApTb21lLVN0YXRlMQ8wDQYDVQQK
+DAZDSU5FQ0ExFTATBgNVBAMMDGlkcC51bmliZy5pdDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKpOSuOvQeVjjWlpxbpDz+35Ag9lt4TxUk2ljeTggV2C
+jSrp9HfDwdn3i5+LvFhFeXN+U/iDY9q1ljUsyuG6sPEgkTOUunJOjWXUMQPfNUZ9
+AP6Rn6/AXhpaTv5e6t3tZxac3zhRe+ptPASsabv/GtMkK+Oyfn39+1FP/mnWRM+p
+vIR4MTkOIiNoN4xT/AqshNkMN5zJMrEGiq9oQT4wObjHPjOYanihde0auFMLAXGR
+xYpiq+vsiezitnc2JXNbWVfwieK5FIFGGh94EV4mrui/YGVj+mjF25fqTU7B5YBW
+WENnNtbfiT4qfOGRX2JvV70y5zPbilypbS+nYnn8m8sCAwEAAaNQME4wHQYDVR0O
+BBYEFN2Dnm5ywy81VJkNqIDC/URi/BOkMB8GA1UdIwQYMBaAFN2Dnm5ywy81VJkN
+qIDC/URi/BOkMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADc2os6T
+j9GRr+YXVWu4mP3sYgynhVEMq+7akx22HEmOLbQkhlJc2igNolmQiknG6Dm6KUlY
+MbHTAx1YMF5iW2GFrjXBQa+Ro5aALKf7Q7YW9qsNLlTjNj7ZB4GSPh/J+DR4vZUR
+797WlcR3uIg+696zSTaY5xJVcKdTNOCZ/BLmyo/g1OC/EwQFxU1jCqH+J3FMd0G6
+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>
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
new file mode 100644
index 00000000..5e972733
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDMDCCAhigAwIBAgIVAIwE2/JkvYoJZcBwpAXXselfihnEMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWlkcC51bmlib2Njb25pLml0MB4XDTEwMDIxNzEzMjAx
+NloXDTMwMDIxNzEzMjAxNlowHDEaMBgGA1UEAxMRaWRwLnVuaWJvY2NvbmkuaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCccPuV4oaBTT+Pg8czitby
+if616ZGLNOcdn58FvjPTx7/bgqy1KoFEnkQyzskglkxQTeVzo0cw3vhydJmnu0/4
+jAmS4AleN5k8RqK/JVDseUYPev6LOgtaghlmaiVBwozRf7iGuiMfwj9ZC4iavaOh
+dbqzGyvbx2SREifRNYGgWrUOwrFdAdbwbT5fmEfxnRm81RdYFFmjYARSKgQdbXTG
+iLa4+117OU19ybxVvdWU0nnz+b0YfcE7F/JtbaMwt27JKx2X67+N7z/6Hjg/kQme
+ktt+pXdqYNKk1km8sMa21Tfb9mBufLwgbgVTUXN/ZoaDWHCV8QiX1ydiaekrX1Q/
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bmlib2Njb25pLml0hihodHRwczov
+L2lkcC51bmlib2Njb25pLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSo5rDb
+l8qPk/l/4PTC/gsy6kVagzANBgkqhkiG9w0BAQUFAAOCAQEAb0iBvtK+sxUDPRsh
+7mkuz7da4Cbd6YqX3CB5eQ3quBqo7/EjVbyu3o+BwOHBQwjv3PcTd0xv5axZ4jft
+BCyUTpp6lEHTRQw5e3AC46tOBM/pnioN3qVz7AuKZK9GOCNK4LwlRKck8QtvrDc9
+uPLi1pZq4lUAe9cGV5cBKinnpcMl4acTzqOWJ1ddEIR6KFiPiYE+uwxm6Jfrvydp
+9lYG4I0gNd31pe3fVIsHCpD7NDVYFmk7AJ7GIyXxjbzPFkcY7xqHMb8RlZutzQa2
+uo9UEg+bZsGyqWbheDSr5LT8Dc6JLI7PzMH0Q5O/ejDBq+gEuXcQxAKl/esAeLLp
+K93oKA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unibocconi.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unibocconi.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope 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
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCccPuV4oaBTT+Pg8czitby
+if616ZGLNOcdn58FvjPTx7/bgqy1KoFEnkQyzskglkxQTeVzo0cw3vhydJmnu0/4
+jAmS4AleN5k8RqK/JVDseUYPev6LOgtaghlmaiVBwozRf7iGuiMfwj9ZC4iavaOh
+dbqzGyvbx2SREifRNYGgWrUOwrFdAdbwbT5fmEfxnRm81RdYFFmjYARSKgQdbXTG
+iLa4+117OU19ybxVvdWU0nnz+b0YfcE7F/JtbaMwt27JKx2X67+N7z/6Hjg/kQme
+ktt+pXdqYNKk1km8sMa21Tfb9mBufLwgbgVTUXN/ZoaDWHCV8QiX1ydiaekrX1Q/
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bmlib2Njb25pLml0hihodHRwczov
+L2lkcC51bmlib2Njb25pLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSo5rDb
+l8qPk/l/4PTC/gsy6kVagzANBgkqhkiG9w0BAQUFAAOCAQEAb0iBvtK+sxUDPRsh
+7mkuz7da4Cbd6YqX3CB5eQ3quBqo7/EjVbyu3o+BwOHBQwjv3PcTd0xv5axZ4jft
+BCyUTpp6lEHTRQw5e3AC46tOBM/pnioN3qVz7AuKZK9GOCNK4LwlRKck8QtvrDc9
+uPLi1pZq4lUAe9cGV5cBKinnpcMl4acTzqOWJ1ddEIR6KFiPiYE+uwxm6Jfrvydp
+9lYG4I0gNd31pe3fVIsHCpD7NDVYFmk7AJ7GIyXxjbzPFkcY7xqHMb8RlZutzQa2
+uo9UEg+bZsGyqWbheDSr5LT8Dc6JLI7PzMH0Q5O/ejDBq+gEuXcQxAKl/esAeLLp
+K93oKA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bocconi University</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Universita' Bocconi</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bocconi University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Universita' Bocconi</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unibocconi.eu/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unibocconi.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>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
new file mode 100644
index 00000000..62124f47
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0y
+OTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAOMXRHdthMpVg/OZq0FjVMjInXCzJg0wMiC5
+iajyy2o7I8xlLHkuWLaTa8nOMx3sPoSRiNvyC/F6tpq1fyL1xM6rHC0jm/src17C
+OKB+Vk7TiTdbLugWcKmiUIl9hXjQBuNQHjJpPvoMNmynpiKzJGqr21VNEnfdItin
+Gub+PLT0OU3zBVfO9gbMs1i8iE60Yhks9zowT2mXqlZYvLiYANZJpqTKVk1N9zH1
+E6DrGuTKo434sh9nHFcQcNPgobJqOGawwWxLXJ/1GgwwLeGXTjFxN43mdNKMz6J/
+Wb0aXL343rgxjnaNMN0W0cDraXllAbKcyxFwHSrzGiUN7rRFHIECAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLnVuaWNhLml0hiNodHRwczovL2lkcC51bmljYS5pdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPaAgHz1jAomoOLcOZ0U+2gHYRiswDQYJ
+KoZIhvcNAQEFBQADggEBALAcfYQamaCFcd1PSLh/twRlywMMlLgXLklNVIVEbgaJ
+p6MmW/jPU21SDkWnQUSlFmgsnL8ONvuX4SGPLKg3XCYKa0c2rP6Q6v8M2xjl0vSD
+0XLwrb5EklZKdPKS5JeBt12dIKscRixRwLoXX8cm1tkQbs/0sNa3GceqvdaorsrB
+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>
+MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0y
+OTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAOMXRHdthMpVg/OZq0FjVMjInXCzJg0wMiC5
+iajyy2o7I8xlLHkuWLaTa8nOMx3sPoSRiNvyC/F6tpq1fyL1xM6rHC0jm/src17C
+OKB+Vk7TiTdbLugWcKmiUIl9hXjQBuNQHjJpPvoMNmynpiKzJGqr21VNEnfdItin
+Gub+PLT0OU3zBVfO9gbMs1i8iE60Yhks9zowT2mXqlZYvLiYANZJpqTKVk1N9zH1
+E6DrGuTKo434sh9nHFcQcNPgobJqOGawwWxLXJ/1GgwwLeGXTjFxN43mdNKMz6J/
+Wb0aXL343rgxjnaNMN0W0cDraXllAbKcyxFwHSrzGiUN7rRFHIECAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLnVuaWNhLml0hiNodHRwczovL2lkcC51bmljYS5pdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPaAgHz1jAomoOLcOZ0U+2gHYRiswDQYJ
+KoZIhvcNAQEFBQADggEBALAcfYQamaCFcd1PSLh/twRlywMMlLgXLklNVIVEbgaJ
+p6MmW/jPU21SDkWnQUSlFmgsnL8ONvuX4SGPLKg3XCYKa0c2rP6Q6v8M2xjl0vSD
+0XLwrb5EklZKdPKS5JeBt12dIKscRixRwLoXX8cm1tkQbs/0sNa3GceqvdaorsrB
+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>
diff --git a/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..182c53fa
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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="fr">Université de Caen - Basse 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>
+					      MIIDJDCCAgygAwIBAgIVALLJNRifsaDgq9SZsGgf6vqdEpntMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC51bmljYWVuLmZyMB4XDTA5MDcyNzEzNDMxMFoX
+DTI5MDcyNzEzNDMxMFowGTEXMBUGA1UEAxMOaWRwLnVuaWNhZW4uZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCE/YcYohNvzICcNO78kljWYODlicgW
+xGoXBtCNtVN3z2E0S58zQdfGDelCvCgmRECKjeHEUJPCj0Ruarg9q9eqcOz44/9D
+CBZo2uLuNPURnaUeEPt502EPhSXPercAJVjmks7CeqbrA9192EnGWYe8hv5ZqY7d
+oanvW63YYzwIUtyYShUND7TgZFL6GD08o9prPZrBltL+fuodwXI+aFT5XIX25Su1
+FC67/8WU9jbWb4WiIZZnHD6cQDpkhfMTUAmVtZ7sj+qqueCixP0yMTbLpQCisAIP
+p2mqjC3j5i4ZHm++lrjhtfKOE8emD8V41e7z++Hb/ho95hNl5qOD7MP1AgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC51bmljYWVuLmZyhiVodHRwczovL2lkcC51bmlj
+YWVuLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTBGIdWisheOftwSUFEzpIO
+Sm4I9jANBgkqhkiG9w0BAQUFAAOCAQEADIDOox8I0gRyY3uetAbe1n2Kfy/pxsQZ
+Nr4Tn90NUMG8i2mp7KVoMuBhmJS5/BHJPdHNMprB6PjzlTDiriNxdl3NPSASUq7D
+E5oMcyemphYHMxcKvXDXif/uRX/dOmRZy77Wt3yjkQjy/Md/fmOYrxd8yKptnhpp
+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 - Basse Normandie</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Caen - Basse Normandie</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</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.unige.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..ad2fda15
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml
@@ -0,0 +1,187 @@
+<?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="2015-02-24T18:37:38Z">
+      <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>
+      <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+dHYzRUYdAIOrt7ReLpZFI5Fpg5Ut50j9+EhsPZ9cKbk8LewLi+zZzaK9YCjuoya2nRXe9T135Yp7syZ3uQRWbljR6lo0Z7Ijwrvf1G085LvA4tCTZohzZMzvslUyfwkzQlsv+tEO8MIt3y1qf2OhsE3EXrFI8v5dMKvCw1J5eOZu2fLRTqlx6SLJwK5eWLH1sG5lyzMPTEbSVkge3KJ7dpV5THA1FZgG220cQvRKJTCaVc7l8g8F48eKloUF2N6MXwEajsb9vUCaTDw2xBwaGgsHgDGDV6wXyZ3bHxqacetE9HwBY+vA2/vwU4d3vh91+c0695L7N1JWvFcj+vAu7jhdSv3GUcn6PnJiT4uPrHY1c7rxVQas7to5XYOBen+rjaDBD0N4YqR4wbKnh37Iu5BybDKUuKXF9qoero7zFVHLnpfokwxj75NipFMdZzoyXvALsdru7u3t9Ph/iGTEsFkvgXrvdriLVep0e32JeLlcAVaczGI0mDCKRq0rZrMBAIt8s5N+41pjTYPm06Qrw07swMH5Yx7/1XbhXn1ElfiATRRIO585ZSb50gFya7+qR+xVm3txVxqwz2rdL+XekjaltjgtcYu4K8YObqUANhd0M2RQwxgD2CvQxYN4P1sj/kKNaVmDYdX4mMKpxf/+gTqd3Ol1wrEqlHhxgFRWVNze1cgleMBhAeCvkSiSwSCQeGRlFLIiEYqT3VcCv5cuf3TMJvKNBdHcGgEW/3GQ62DLhlrfUqcclD2VNB/Yi8Oak2GtZ4vszjdm1mBmtY3HnvKl5u1SbedJNaHxyE3/BWswIbl3vExljizvbxcoleQRtmTGn3jNAfinwDauViw9ot5wyFXfNBDbojXy+kBoYjGw2gajGn1gkgRsrK+mIXgR57ZmG2jP1+I9o93q9SOPenj5U8ivAyUekv8mOjXXplZIHtkQCYdG9G1F1QiMepDR/Qars0ezpwNFwRPr4dsnD/+b/6B0voaWAa1nceatDI94vQlrPQ3RsP8u7aa3l88vT91f6+48VT+1EdSTmzg5MhfQ5YvaQRqECBuoTh81FutZU19VU18KTPC6/qrIawHBvcVE5i8URCuHhEY1Gy+cLerqZarVmai1bFRNppko6pH2njHvT6uE9FzApuDPdsP0s5fP9Fzm0lyX3Z2JMvpgnWZQTuwvbwaa9JH38I8Dj48jpIRQt+V/2yF/ZZz89gPfm0JJBYtxex6EtR5VyMaTk0gJ18mFifqrlSLunT8mmJXs41Ga5OiS4GFFDAUtNBG2F5NFtilfzNOknYotPAo8FAoODLLlMAR7EcEc7A5DlZVXI4coTdPqp0zHgkuKKpgstl1rbfV6fVqtHRMjl1AZNASMv7Kf6VMmfk0sP2Sp6qE4QjRp3n3dcFuHbsGdMn11rymvG2FrRYzraHrtrTGPTbqwcbZxcxys0aDdWadMqNO+WOJr5oVGvLpM+pjRH/EH91mprzYCHoyaT8vEUO51qgWMqqzaTHjA6Jsdb6AETNQ7a3Pqtp3XpJ7Qbyoy5DVcBOxwOJDB6LMIY5K2tbfVnzwP4eGFZWWkl/dQZKqRlira2zp4eJnYBhQ05TJIqpPpA/xA4x/9/jAK22ezwLcoSgBUKksnsb7l4Gc4EDFwND0NaonShjE3dhj1CT+awCTSqWXvyN2vRcfORNmer4H8QvBQwFAWAeTwBnBwOh/AfgdrHHIBXS4pPIJmR24jtsrKqqYzFHkmlclyA0PhOPIzKL3hok7ND/N/eSAEHAoH+/iG4N1aQLBaryWTq6GBUlJ+Eq4Ha3tZ5ET5vaoG6xO7gFr3OgD0iCB7B4U2t5epTWo+3W/JbbWXdPpEhNunskljLGdZihqW4M6AfmfF4KCfLkTbTjnPWMkbQ7ITMhLq0lnZbijpHGijNMNoqsFb2hp0+jFG6rZXMkN3jV9tsNf2GnY3G/U3uQdJDaG2n+mLqdXyiCtjo/chhW/VAbCl77dBVOQxjswg0HjQk6A2UpXPnms41XECLEvBFSOOenr6py9CosUGIfEgu1hAbaTz19uSbxyADpb/7SPjzDO78FCgNTCpf2Medu1LyyDbRwiwIiem0xh3nuDemCu/JQDPj3bHe0czzy1CT34D8FD+8hUw+jMiRLPoYtV2fWYPrPWwNCwW5n7Se6GXT/iH5dZb4kUzz/uaROhaL9ndn26S3FX/dK/ntdp/SSlyfIrozXfxIlvLlg5FA6CpgsCE4wYDMbKhvRHGCftRodCerapDSQqEIHaibwQQnAhg9qb9vAFvD7O33+/1TAKqUQumDlK4IewPadSXEdcshFVSLD8if3HltaKEsc2hL0WzCvgB1iycQCYbRQiGAnReuRI3syVz+3JW8BWsQC1gNKsU7qIKfefNWhSyTx5iQwye4bQN64fhEzefesMpa2BkwOYk5qaP0gVlCGgaRODjI5vH40I/QW/iPGtbc3Apvgwpl+fLlDnxEfdJqdBAk+BaqA0pz+lqTwBN6E94gaMm28h5N0uein75n+OCkfiM9ONEwYqZecVR4exqazcTjo2NGB7YpppyxR/oPKi0lDHwjgbp4Yb/wznRoJg9fD1EFYFtVH+Snbm2JLuOEYyKNsb/CO97DlkGccBesQXbg/MSdv4Z8fh+WMh9pnwk8PqGlcfQlSTUI4XCtRgvVAT9futTucrlxihoeNqGeoYBJJTJkL3J4Rn2eDuzl66ETKOClh4W3rVcnH1GtPDY9hxHq4ns3xQoe0pL/s3+aC9v9Sit3bqr8iVxV8iHjRMeWPL5dv77cWtQFIanLruP9cN0k8HUryCWfkckFI42UlpqQHMsdFwWIJnLxAcz4SStvwVr5ohx0bEPuNVo6ZuiuaLM4/SFLMYarAQYFhpDGcQJKAwOITalUhiI3y2kJwA9tjY2NH52F6kIcwl2Kp3ePX2OGzGrEvKubyuqIL8C/aZ05vwVviZB2TQiVmAFYm3ochzvpYx/yb14DeewdioX06rD7iqpFxRL/KlP6RC7v5reg1WLACGlHHWvGc2eeh91uD86DqF5Wqw3OBDB8Dj8DHo0K2NgRoUA8a+8lVxzl37jasJmuXJyHA40+6zTlyec+Ffz4bX1ahfbd0qnSPT6hioS/yMARF9GoW19O0JbiBI/TP8qe8rm9urRS055GeF+8cKtm2WFc77wk4tKWE7Qk74AKQg0Dzcpj2g0lI/TJnxwM22pR3oQ/SUdKU8DUUiuVT+/UpZXhjDH7eXjKEL1gBiGTOYAB0jV2BkZJQ5We9RaYubhL+Wqe4m+fqtccdzRNFp7hvIvKpHzUSfmSvKmfLCaZ1TZ9Jl3+VK78qZ2atDKvyBAYdqLUk6/lK5bkaf91CsC67DPoW7HrUdWVywrGSKuTqcBA+cpn8iX7LF9IVJ/MpEjONx26FPsYsLjI1UXk69RSmg0V0WD4q4BjhqB1Op1wNcIbGf4dKKpvwBI/08a7JYDj3RLA8W4J4Hi3BHC8WwI43i0BHO+WAI53SwDHu33vgP8DAAD//wMAmPzaFwi0tJsAAAAASUVORK5CYII=</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>
+MIIDEDCCAfigAwIBAgIJAIleT3fCBgaqMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDGlkcC51bmlnZS5jaDAeFw0xMzA0MjUxNDIyMDRaFw0xNjA0MjQxNDIyMDRa
+MBcxFTATBgNVBAMTDGlkcC51bmlnZS5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAPF7M0J8B+gcEDuQO7A2ceuPTkOOZwQnaITnXSQaobxUOflcTPxX
+MgPmrZNr7zvIcF2j0iUWZwj4WfnmytIrETtRV5I9wdM/bg4v95NHwVBHu3pZQFX8
+12ChY2BP2DOGLLuPFRrwNaYZg7p5d9yAx53TseeVj1akcLGlkVq8ObMfUg1Sol/U
+PmbBQiY7cWEB212MtJ16FyDnIZQQ4Fs0TuIjXqOUZITxM+dhWyj7/BSaPLvpvZx7
++FrrOJndseydTcOj0+gOvydO/w1T6L1l2WNb0l3o8bVxvllb/HNtF6N5kBrTRxt1
+mhQ4Rl6ZZnHUlkeOh6L9tFCQ2bcePq72dHsCAwEAAaNfMF0wPAYDVR0RBDUwM4IM
+aWRwLnVuaWdlLmNohiNodHRwczovL2lkcC51bmlnZS5jaC9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUuEqhSlGiqI+C/MrmoLrlgjYXgOkwDQYJKoZIhvcNAQEFBQAD
+ggEBAKTjMAC0B6u/ltE3IEeEV2/8v25yLXZWG1HR6kIB4xN9RmxSJgALX81FTrd5
+joRvCbQRxXjhcRklOKCp8cSVvC4fSRhHkxm02b6h3wrHZmpyXPdZnBz5Kra4/nOI
+lk/ZGTrUATT9uPAwDL+VNdY3n40g8sGy5Re2h+unfXQkyXpL6OST7I6ZAZq1vQOz
+dmHxLQ4YVBXYJUgfxn8/C0XnAIzy/Dqzp9FCHNwCKBZtDD5+gC4bCcP7Ykh6tXUY
+u83NsDjdL0oW1ov9rsQH4iQsQs7TOkf1KEwbmc2Kv8M2D3RhR5A7pcDf3EbG1U47
+mvLUHB+HLHvU53517kDxazwQx2g=
+						</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/profile/SAML1/SOAP/ArtifactResolution" 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>
+MIIDEDCCAfigAwIBAgIJAIleT3fCBgaqMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDGlkcC51bmlnZS5jaDAeFw0xMzA0MjUxNDIyMDRaFw0xNjA0MjQxNDIyMDRa
+MBcxFTATBgNVBAMTDGlkcC51bmlnZS5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAPF7M0J8B+gcEDuQO7A2ceuPTkOOZwQnaITnXSQaobxUOflcTPxX
+MgPmrZNr7zvIcF2j0iUWZwj4WfnmytIrETtRV5I9wdM/bg4v95NHwVBHu3pZQFX8
+12ChY2BP2DOGLLuPFRrwNaYZg7p5d9yAx53TseeVj1akcLGlkVq8ObMfUg1Sol/U
+PmbBQiY7cWEB212MtJ16FyDnIZQQ4Fs0TuIjXqOUZITxM+dhWyj7/BSaPLvpvZx7
++FrrOJndseydTcOj0+gOvydO/w1T6L1l2WNb0l3o8bVxvllb/HNtF6N5kBrTRxt1
+mhQ4Rl6ZZnHUlkeOh6L9tFCQ2bcePq72dHsCAwEAAaNfMF0wPAYDVR0RBDUwM4IM
+aWRwLnVuaWdlLmNohiNodHRwczovL2lkcC51bmlnZS5jaC9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUuEqhSlGiqI+C/MrmoLrlgjYXgOkwDQYJKoZIhvcNAQEFBQAD
+ggEBAKTjMAC0B6u/ltE3IEeEV2/8v25yLXZWG1HR6kIB4xN9RmxSJgALX81FTrd5
+joRvCbQRxXjhcRklOKCp8cSVvC4fSRhHkxm02b6h3wrHZmpyXPdZnBz5Kra4/nOI
+lk/ZGTrUATT9uPAwDL+VNdY3n40g8sGy5Re2h+unfXQkyXpL6OST7I6ZAZq1vQOz
+dmHxLQ4YVBXYJUgfxn8/C0XnAIzy/Dqzp9FCHNwCKBZtDD5+gC4bCcP7Ykh6tXUY
+u83NsDjdL0oW1ov9rsQH4iQsQs7TOkf1KEwbmc2Kv8M2D3RhR5A7pcDf3EbG1U47
+mvLUHB+HLHvU53517kDxazwQx2g=
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFJzCCBA+gAwIBAgIUCcPzyiPVq7P+xeWBdn7n0zsZXoQwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDMyNjEyMzAx
+MFoXDTE2MDMyNjEyMzAwN1owgasxEzARBgsrBgEEAYI3PAIBAxMCQ0gxGjAYBgNV
+BA8TEUdvdmVybm1lbnQgRW50aXR5MRMwEQYDVQQFEwoxODcyLTEwLTE5MQswCQYD
+VQQGEwJDSDEPMA0GA1UECBMGR2VuZXZlMQ8wDQYDVQQHEwZHZW5ldmUxHTAbBgNV
+BAoTFFVuaXZlcnNpdGUgZGUgR2VuZXZlMRUwEwYDVQQDEwxpZHAudW5pZ2UuY2gw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBOFQzYSeY/CFS17FiCq2v
+Hq/bDd+LwRWKEAM3V7Q+TAeOrWfpHJrrmubvM4bEtbeBjg5jDUv44RNs0dPv1YNp
+bKOqlL7yFeUm/ppH16g/0NTre7+XGNFhiUpV+6qjBWIItlmaJjhvN68cNey4tEHS
+L6DXTd1YW09L12Gmi+c6vtpoXUCMGJ71xAcqbas6PRLL/Ouj92huqSkEzmEflkyk
+OsMf2gkXv0xdT3mcr/5o3CXopnv7vlCf1ss8uMNEtgiMqDCZMOmhxHop++Qw8Llq
+tZSIciQBvjpjQj5b89r7Z7QpaXNQN7dGTnus18Sps4Fu0aBpV6Va5x8flSAJcjUZ
+AgMBAAGjggGeMIIBmjBzBggrBgEFBQcBAQRnMGUwKgYIKwYBBQUHMAGGHmh0dHA6
+Ly9vY3NwLnF1b3ZhZGlzZ2xvYmFsLmNvbTA3BggrBgEFBQcwAoYraHR0cDovL3Ry
+dXN0LnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNydDBRBgNVHSAESjBIMEYG
+DCsGAQQBvlgAAmQBAjA2MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnF1b3ZhZGlz
+Z2xvYmFsLmNvbS9yZXBvc2l0b3J5MCgGA1UdEQQhMB+CDGlkcC51bmlnZS5jaIIP
+aWRwLWFhLnVuaWdlLmNoMAsGA1UdDwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
+AQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsXpzD78N45JbG9jLm4UScwOgYD
+VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZz
+c2xnMi5jcmwwHQYDVR0OBBYEFJbgIfaj++dmflc/IuxWc453fKs0MA0GCSqGSIb3
+DQEBCwUAA4IBAQDfGMD7sKSmKspDqfYkJ5peWICICMpGQ49Rir8PqYzHkZiF07dQ
+g/Yd90bjfoLguQcOuXyfBGlz6oG5heeek4qTTQ3H0MM5GAsWFbKWqEy4+1L2f//c
+ibHwTBWA+HrPIyGcFAD2VTBl3jxFz9/0kRYZpEbtabk9mWftAjTiv25voOUioget
+hhLP6b/dsRMdj/0XcHCKZN1Lfhk9fPXBnxNrvmHkdp2efCnyNYleKYPSqCJeX5eK
+kUkeKDUBGt0wUMVDLmp19ypRxXtDJzU2DEaJ4BDEgtQ05ZJEVjhAz9ZzRZIfWSzd
+M4BZ2IY2Ts91B58Noy+uhlISbxOaSeV1iuJu
+						</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/profile/SAML1/SOAP/AttributeQuery"/>
+    <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
new file mode 100644
index 00000000..7e915d57
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unijui.edu.br-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIEQDCCAygCAQAwDQYJKoZIhvcNAQEFBQAwgeUxQjBABgNVBAoTOVVOSVYuIFJF
+R0lPTkFMIERPIE5PUk9FU1RFIERPIEVTVEFETyBETyBSSU8gR1JBTkRFIERPIFNV
+TDEmMCQGA1UECxQdQ29vcmRlbmFkb3JpYSBkZSBJbmZvcm3DoXRpY2ExIjAgBgkq
+hkiG9w0BCQEWE3JlZGVzQHVuaWp1aS5lZHUuYnIxDjAMBgNVBAcUBUlqdcNpMRow
+GAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIxGjAYBgNVBAMT
+EWlkcC51bmlqdWkuZWR1LmJyMB4XDTE0MDYyNTE4MTYwN1oXDTE5MDYyNDE4MTYw
+N1owgeUxQjBABgNVBAoTOVVOSVYuIFJFR0lPTkFMIERPIE5PUk9FU1RFIERPIEVT
+VEFETyBETyBSSU8gR1JBTkRFIERPIFNVTDEmMCQGA1UECxQdQ29vcmRlbmFkb3Jp
+YSBkZSBJbmZvcm3DoXRpY2ExIjAgBgkqhkiG9w0BCQEWE3JlZGVzQHVuaWp1aS5l
+ZHUuYnIxDjAMBgNVBAcUBUlqdcNpMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1
+bDELMAkGA1UEBhMCQlIxGjAYBgNVBAMTEWlkcC51bmlqdWkuZWR1LmJyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvhkzANwm2LBDtoTnXGcG3QyxTmpF
+2KWjbLVEt9ESPrsrY71p23ZPhn4wsI8OWMlrPNL9fmIWIvSybaIWsei+SRdVVFH7
+tPrVZ0p8WEGCJaoG4sk0Gxwc9GtctISb5lMb9GE4DTbw8daKUVeMqlig0liJ+wvU
+04r2f6VLjf4juVqb13rEpC2qRmOyB5jgTTv9scEGPBjC+oL4d1VlDqgmHPeIU1/f
+IwcO21PjkfJH2kDxlaCDIzsx6S0D7h+WJBl3S8RQpUnJSSE4qcsr4Ek8bVTvu1+C
+bsnsVoo0IwmDkx4QM3sfrWkUpXhIqwumQ34O/gQDslGWvmB7HwcTe4yqBQIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4IBAQAoiHDje/oo+aJi4yNj09LxSDtbpDDavqeeCKTX
+XPjmgPaYt/6t8nfZXK8o1jPT3so+3f0t7dNcJbxlbIiSUUp/y1ent8JqZpkLXYBv
+YgRjxIu4IjVY7YS61di8Svnrm/5osUd3smoZ0qSGh8h3aiCK7YkuB5O6l51hsU++
+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>
+      
+MIIEQDCCAygCAQAwDQYJKoZIhvcNAQEFBQAwgeUxQjBABgNVBAoTOVVOSVYuIFJF
+R0lPTkFMIERPIE5PUk9FU1RFIERPIEVTVEFETyBETyBSSU8gR1JBTkRFIERPIFNV
+TDEmMCQGA1UECxQdQ29vcmRlbmFkb3JpYSBkZSBJbmZvcm3DoXRpY2ExIjAgBgkq
+hkiG9w0BCQEWE3JlZGVzQHVuaWp1aS5lZHUuYnIxDjAMBgNVBAcUBUlqdcNpMRow
+GAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIxGjAYBgNVBAMT
+EWlkcC51bmlqdWkuZWR1LmJyMB4XDTE0MDYyNTE4MTYwN1oXDTE5MDYyNDE4MTYw
+N1owgeUxQjBABgNVBAoTOVVOSVYuIFJFR0lPTkFMIERPIE5PUk9FU1RFIERPIEVT
+VEFETyBETyBSSU8gR1JBTkRFIERPIFNVTDEmMCQGA1UECxQdQ29vcmRlbmFkb3Jp
+YSBkZSBJbmZvcm3DoXRpY2ExIjAgBgkqhkiG9w0BCQEWE3JlZGVzQHVuaWp1aS5l
+ZHUuYnIxDjAMBgNVBAcUBUlqdcNpMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1
+bDELMAkGA1UEBhMCQlIxGjAYBgNVBAMTEWlkcC51bmlqdWkuZWR1LmJyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvhkzANwm2LBDtoTnXGcG3QyxTmpF
+2KWjbLVEt9ESPrsrY71p23ZPhn4wsI8OWMlrPNL9fmIWIvSybaIWsei+SRdVVFH7
+tPrVZ0p8WEGCJaoG4sk0Gxwc9GtctISb5lMb9GE4DTbw8daKUVeMqlig0liJ+wvU
+04r2f6VLjf4juVqb13rEpC2qRmOyB5jgTTv9scEGPBjC+oL4d1VlDqgmHPeIU1/f
+IwcO21PjkfJH2kDxlaCDIzsx6S0D7h+WJBl3S8RQpUnJSSE4qcsr4Ek8bVTvu1+C
+bsnsVoo0IwmDkx4QM3sfrWkUpXhIqwumQ34O/gQDslGWvmB7HwcTe4yqBQIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4IBAQAoiHDje/oo+aJi4yNj09LxSDtbpDDavqeeCKTX
+XPjmgPaYt/6t8nfZXK8o1jPT3so+3f0t7dNcJbxlbIiSUUp/y1ent8JqZpkLXYBv
+YgRjxIu4IjVY7YS61di8Svnrm/5osUd3smoZ0qSGh8h3aiCK7YkuB5O6l51hsU++
+vVcB15SPOBycWmx5nSRKHLAYa6uBX7auu2fLuHaNRHh3DbH98K/2hAOr2+vqtN/f
+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>
diff --git a/swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml
new file mode 100644
index 00000000..2e9570f9
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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">
+                    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>
+      <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>
+MIIDHDCCAgSgAwIBAgIVAIEgUNZ2kbCrw2zNqYwgIJCvedDSMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDAeFw0xMzA0MDExNjAxNDZaFw0z
+MzA0MDExNjAxNDZaMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJtks8bJInpYW8j049YMBTWfGRfkMgTPQ2fI
+T1TLbkZ+zSTvm+hgBdeyY0g0EkpC7MmkrcigKc+BWdXaaeBHWh1extz08cVtcNEH
+52vTw9asy2cXh/EFd0Br1zc9j0dEXLhnCVNHI6Vi7F7oTlsAb2Xt7/iQuWjT/cKM
+Eiqt+qVSgdtRsRCD6RJLlINGeunjFDizUymDxtt1ZB5mU1DlpC4cynImG0jI3DsK
+h0MhjeYSWLn9giA7j7hOTSqJuZddv/Y+YOWrMScV1jfiu1uMN2DllOjapt7DUsxi
+bgtrc7Vig5o/ZVqLd4zI8lHsrqKUCDQBO9EviQq98bMbqqTCq/MCAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLnVuaW1jLml0hiNodHRwczovL2lkcC51bmltYy5pdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1nYOH/vCkNVmfvhCYkLSRhlGZR0wDQYJ
+KoZIhvcNAQEFBQADggEBAFmIBImjvlX9VF4e/qYv/rvTILMUskF6rC8BTSYzIdLk
+wX4H6k+AUkTWkdEBkvJyvcIAg8eZqc2TH7CSu4PjYu/p+A8Uum841EY0GngIeQg/
+zeF//LRySr7iMMGcB5JmjYdeOa50DtbWAdns7BR8UNBUFYv9CR9iknmcEbtkZylK
+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>
+MIIDHDCCAgSgAwIBAgIVAIEgUNZ2kbCrw2zNqYwgIJCvedDSMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDAeFw0xMzA0MDExNjAxNDZaFw0z
+MzA0MDExNjAxNDZaMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJtks8bJInpYW8j049YMBTWfGRfkMgTPQ2fI
+T1TLbkZ+zSTvm+hgBdeyY0g0EkpC7MmkrcigKc+BWdXaaeBHWh1extz08cVtcNEH
+52vTw9asy2cXh/EFd0Br1zc9j0dEXLhnCVNHI6Vi7F7oTlsAb2Xt7/iQuWjT/cKM
+Eiqt+qVSgdtRsRCD6RJLlINGeunjFDizUymDxtt1ZB5mU1DlpC4cynImG0jI3DsK
+h0MhjeYSWLn9giA7j7hOTSqJuZddv/Y+YOWrMScV1jfiu1uMN2DllOjapt7DUsxi
+bgtrc7Vig5o/ZVqLd4zI8lHsrqKUCDQBO9EviQq98bMbqqTCq/MCAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLnVuaW1jLml0hiNodHRwczovL2lkcC51bmltYy5pdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1nYOH/vCkNVmfvhCYkLSRhlGZR0wDQYJ
+KoZIhvcNAQEFBQADggEBAFmIBImjvlX9VF4e/qYv/rvTILMUskF6rC8BTSYzIdLk
+wX4H6k+AUkTWkdEBkvJyvcIAg8eZqc2TH7CSu4PjYu/p+A8Uum841EY0GngIeQg/
+zeF//LRySr7iMMGcB5JmjYdeOa50DtbWAdns7BR8UNBUFYv9CR9iknmcEbtkZylK
+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>
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
new file mode 100644
index 00000000..ec032ee7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unimedizin-mainz.de-idp-shibboleth.xml
@@ -0,0 +1,245 @@
+<?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>
+      <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
+BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
+RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
+bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
+bWVkaXppbi4gTWFpbnogLSBDQSAtIEcwMTElMCMGCSqGSIb3DQEJARYWY2FAdW5p
+bWVkaXppbi1tYWluei5kZTAeFw0xNDEwMDYxMjExNDdaFw0xOTA3MDYwMDAwMDBa
+MIGiMQswCQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYD
+VQQHEwVNYWluejFHMEUGA1UEChM+VW5pdmVyc2l0YWV0c21lZGl6aW4gZGVyIEpv
+aGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnoxIDAeBgNVBAMTF2lk
+cC51bmltZWRpemluLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApf3XPkCctjw5x/tK0fVGr5/M0ZeJ8iPjES2XNyxMMBT0CirU96+r20YW
+aS1rpnWRNwWrr+iWiwK7mYQ5glT5RkwtBB3zdEHYRC/MZHRIrDVlVtEqGVEdN5Fn
+ZEixsxDatWdWBwCcTMO2rp7Uf6zsCxCJn63JwCtZVLyDdcEg4m+2Q32nwQZY29V4
+0t3mVfUZ/r55V9W8V2zhRpRrGarqmCGAv48XXwgVHLhN/Rb0/grsBRJZqEU9CvA0
+ujJwFuk9Lh8S1H3jNbqAv2M2Yf88rQDbGgy8yhOve7aWmHjIxaGm0IOVHSGLHm5g
+9eH/Dd68StfdnxsrubW7Qjl/vTgT7wIDAQABo4ICnjCCApowCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBS27g1OcWdymQjf/ek1vvVRKOtGjDAfBgNVHSMEGDAWgBSkOU4ibcYqBiBu
+2uhoUVylgQ52PTBWBgNVHREETzBNghdpZHAudW5pbWVkaXppbi1tYWluei5kZYIY
+aWRwMS51bmltZWRpemluLW1haW56LmRlghhpZHAyLnVuaW1lZGl6aW4tbWFpbnou
+ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmltZWRpemluLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEKgQKA+hjxodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaW1lZGl6aW4tbWFpbnotY2EvcHViL2NybC9j
+YWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsGAQUFBzABhidodHRwOi8v
+b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwTAYIKwYBBQUHMAKGQGh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2Fj
+ZXJ0L2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTwYD
+VR0gBEgwRjAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDQYJKoZIhvcNAQELBQADggEB
+AEzbmDhzM5OGsMX1WJbj2tTAvVjlyEm3ioEE58dDV2I5QTi2TovCSxolslWnu6m6
+K0W2XZONTXSlbpr63Mk37KpThaMmt50tGhaQzmhDlcJINxpP4kKsDcYFHaem2wKW
+jHbL3pV2VIrYJwOhbVDFlhxJTRJ3wSrKCn52XT1U2/seD/iFBmfZtjDjnKT81r2F
+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
+BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
+RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
+bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
+bWVkaXppbi4gTWFpbnogLSBDQSAtIEcwMTElMCMGCSqGSIb3DQEJARYWY2FAdW5p
+bWVkaXppbi1tYWluei5kZTAeFw0xNDEwMDYxMjExNDdaFw0xOTA3MDYwMDAwMDBa
+MIGiMQswCQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYD
+VQQHEwVNYWluejFHMEUGA1UEChM+VW5pdmVyc2l0YWV0c21lZGl6aW4gZGVyIEpv
+aGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnoxIDAeBgNVBAMTF2lk
+cC51bmltZWRpemluLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApf3XPkCctjw5x/tK0fVGr5/M0ZeJ8iPjES2XNyxMMBT0CirU96+r20YW
+aS1rpnWRNwWrr+iWiwK7mYQ5glT5RkwtBB3zdEHYRC/MZHRIrDVlVtEqGVEdN5Fn
+ZEixsxDatWdWBwCcTMO2rp7Uf6zsCxCJn63JwCtZVLyDdcEg4m+2Q32nwQZY29V4
+0t3mVfUZ/r55V9W8V2zhRpRrGarqmCGAv48XXwgVHLhN/Rb0/grsBRJZqEU9CvA0
+ujJwFuk9Lh8S1H3jNbqAv2M2Yf88rQDbGgy8yhOve7aWmHjIxaGm0IOVHSGLHm5g
+9eH/Dd68StfdnxsrubW7Qjl/vTgT7wIDAQABo4ICnjCCApowCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBS27g1OcWdymQjf/ek1vvVRKOtGjDAfBgNVHSMEGDAWgBSkOU4ibcYqBiBu
+2uhoUVylgQ52PTBWBgNVHREETzBNghdpZHAudW5pbWVkaXppbi1tYWluei5kZYIY
+aWRwMS51bmltZWRpemluLW1haW56LmRlghhpZHAyLnVuaW1lZGl6aW4tbWFpbnou
+ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmltZWRpemluLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEKgQKA+hjxodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaW1lZGl6aW4tbWFpbnotY2EvcHViL2NybC9j
+YWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsGAQUFBzABhidodHRwOi8v
+b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwTAYIKwYBBQUHMAKGQGh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2Fj
+ZXJ0L2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTwYD
+VR0gBEgwRjAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDQYJKoZIhvcNAQELBQADggEB
+AEzbmDhzM5OGsMX1WJbj2tTAvVjlyEm3ioEE58dDV2I5QTi2TovCSxolslWnu6m6
+K0W2XZONTXSlbpr63Mk37KpThaMmt50tGhaQzmhDlcJINxpP4kKsDcYFHaem2wKW
+jHbL3pV2VIrYJwOhbVDFlhxJTRJ3wSrKCn52XT1U2/seD/iFBmfZtjDjnKT81r2F
+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
+BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
+RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
+bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
+bWVkaXppbi4gTWFpbnogLSBDQSAtIEcwMTElMCMGCSqGSIb3DQEJARYWY2FAdW5p
+bWVkaXppbi1tYWluei5kZTAeFw0xNDEwMDYxMjExNDdaFw0xOTA3MDYwMDAwMDBa
+MIGiMQswCQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYD
+VQQHEwVNYWluejFHMEUGA1UEChM+VW5pdmVyc2l0YWV0c21lZGl6aW4gZGVyIEpv
+aGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnoxIDAeBgNVBAMTF2lk
+cC51bmltZWRpemluLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApf3XPkCctjw5x/tK0fVGr5/M0ZeJ8iPjES2XNyxMMBT0CirU96+r20YW
+aS1rpnWRNwWrr+iWiwK7mYQ5glT5RkwtBB3zdEHYRC/MZHRIrDVlVtEqGVEdN5Fn
+ZEixsxDatWdWBwCcTMO2rp7Uf6zsCxCJn63JwCtZVLyDdcEg4m+2Q32nwQZY29V4
+0t3mVfUZ/r55V9W8V2zhRpRrGarqmCGAv48XXwgVHLhN/Rb0/grsBRJZqEU9CvA0
+ujJwFuk9Lh8S1H3jNbqAv2M2Yf88rQDbGgy8yhOve7aWmHjIxaGm0IOVHSGLHm5g
+9eH/Dd68StfdnxsrubW7Qjl/vTgT7wIDAQABo4ICnjCCApowCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBS27g1OcWdymQjf/ek1vvVRKOtGjDAfBgNVHSMEGDAWgBSkOU4ibcYqBiBu
+2uhoUVylgQ52PTBWBgNVHREETzBNghdpZHAudW5pbWVkaXppbi1tYWluei5kZYIY
+aWRwMS51bmltZWRpemluLW1haW56LmRlghhpZHAyLnVuaW1lZGl6aW4tbWFpbnou
+ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmltZWRpemluLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEKgQKA+hjxodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaW1lZGl6aW4tbWFpbnotY2EvcHViL2NybC9j
+YWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsGAQUFBzABhidodHRwOi8v
+b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwTAYIKwYBBQUHMAKGQGh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2Fj
+ZXJ0L2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTwYD
+VR0gBEgwRjAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDQYJKoZIhvcNAQELBQADggEB
+AEzbmDhzM5OGsMX1WJbj2tTAvVjlyEm3ioEE58dDV2I5QTi2TovCSxolslWnu6m6
+K0W2XZONTXSlbpr63Mk37KpThaMmt50tGhaQzmhDlcJINxpP4kKsDcYFHaem2wKW
+jHbL3pV2VIrYJwOhbVDFlhxJTRJ3wSrKCn52XT1U2/seD/iFBmfZtjDjnKT81r2F
+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
+BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
+RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
+bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
+bWVkaXppbi4gTWFpbnogLSBDQSAtIEcwMTElMCMGCSqGSIb3DQEJARYWY2FAdW5p
+bWVkaXppbi1tYWluei5kZTAeFw0xNDEwMDYxMjExNDdaFw0xOTA3MDYwMDAwMDBa
+MIGiMQswCQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYD
+VQQHEwVNYWluejFHMEUGA1UEChM+VW5pdmVyc2l0YWV0c21lZGl6aW4gZGVyIEpv
+aGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnoxIDAeBgNVBAMTF2lk
+cC51bmltZWRpemluLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApf3XPkCctjw5x/tK0fVGr5/M0ZeJ8iPjES2XNyxMMBT0CirU96+r20YW
+aS1rpnWRNwWrr+iWiwK7mYQ5glT5RkwtBB3zdEHYRC/MZHRIrDVlVtEqGVEdN5Fn
+ZEixsxDatWdWBwCcTMO2rp7Uf6zsCxCJn63JwCtZVLyDdcEg4m+2Q32nwQZY29V4
+0t3mVfUZ/r55V9W8V2zhRpRrGarqmCGAv48XXwgVHLhN/Rb0/grsBRJZqEU9CvA0
+ujJwFuk9Lh8S1H3jNbqAv2M2Yf88rQDbGgy8yhOve7aWmHjIxaGm0IOVHSGLHm5g
+9eH/Dd68StfdnxsrubW7Qjl/vTgT7wIDAQABo4ICnjCCApowCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBS27g1OcWdymQjf/ek1vvVRKOtGjDAfBgNVHSMEGDAWgBSkOU4ibcYqBiBu
+2uhoUVylgQ52PTBWBgNVHREETzBNghdpZHAudW5pbWVkaXppbi1tYWluei5kZYIY
+aWRwMS51bmltZWRpemluLW1haW56LmRlghhpZHAyLnVuaW1lZGl6aW4tbWFpbnou
+ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmltZWRpemluLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEKgQKA+hjxodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaW1lZGl6aW4tbWFpbnotY2EvcHViL2NybC9j
+YWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsGAQUFBzABhidodHRwOi8v
+b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwTAYIKwYBBQUHMAKGQGh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2Fj
+ZXJ0L2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTwYD
+VR0gBEgwRjAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDQYJKoZIhvcNAQELBQADggEB
+AEzbmDhzM5OGsMX1WJbj2tTAvVjlyEm3ioEE58dDV2I5QTi2TovCSxolslWnu6m6
+K0W2XZONTXSlbpr63Mk37KpThaMmt50tGhaQzmhDlcJINxpP4kKsDcYFHaem2wKW
+jHbL3pV2VIrYJwOhbVDFlhxJTRJ3wSrKCn52XT1U2/seD/iFBmfZtjDjnKT81r2F
+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>
diff --git a/swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml
new file mode 100644
index 00000000..700c95e6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIID8jCCAtoCCQDRtfiml6XVzDANBgkqhkiG9w0BAQUFADCBujELMAkGA1UEBhMC
+SVQxDzANBgNVBAgMBk1pbGFubzEPMA0GA1UEBwwGTWlsYW5vMTQwMgYDVQQKDCtV
+bml2ZXJzaXTDg8KgIGRlZ2xpIFN0dWRpIGRpIE1pbGFuby1CaWNvY2NhMRwwGgYD
+VQQLDBNTaXN0ZW1pIEluZm9ybWF0aXZpMRYwFAYDVQQDDA1pZHAudW5pbWliLml0
+MR0wGwYJKoZIhvcNAQkBFg5pZGVtQHVuaW1pYi5pdDAeFw0xMzA4MjgxMzA0Mjla
+Fw0yMzA4MjYxMzA0MjlaMIG6MQswCQYDVQQGEwJJVDEPMA0GA1UECAwGTWlsYW5v
+MQ8wDQYDVQQHDAZNaWxhbm8xNDAyBgNVBAoMK1VuaXZlcnNpdMODwqAgZGVnbGkg
+U3R1ZGkgZGkgTWlsYW5vLUJpY29jY2ExHDAaBgNVBAsME1Npc3RlbWkgSW5mb3Jt
+YXRpdmkxFjAUBgNVBAMMDWlkcC51bmltaWIuaXQxHTAbBgkqhkiG9w0BCQEWDmlk
+ZW1AdW5pbWliLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzb96
+/j8SpXJ/QCu3HVZcdcSPUZTXkc3YJniHnPEm+J+R0YJaUui3sq3m7rG7HeOr0QMe
++dSJQcAiUNWDLXlOq91rZvTmiXYreS3TqEpsEpNJOLbLdzfbD7NLwy9YNYqYXx+t
+ITIhEhccMzGcYEBNuxKPRasvOC7QOKJWaed2IPP8ptBdFQ9XyggBL0Q+9ADDzGHl
+m+HYAocXZjQvN8demGDXALBx2SANliVftQQvouv/93q34u8gOJCCCfMA/PacrvtX
+gn29U3q5izvMmwLZmMNyJ5Lckpl/LcgStCT488bJJbLZrpGxMDSPTQamy/j3hQs/
+mz114w1omnc0OfmaqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAQIxQMg9qVYHGu
+fapH4AiFzwnqSNpjqewrdr/kOQv1RsnzNY5Xu8iyioe3jMIH2Nc1YYcUzfKYr9mV
+7S0DUhpu2GBSC3z9mhRlULkOmJvU+4GAaFCr4jt5fjRMl440toXDJLgGYpoWQmG8
+cvvl3Ysg9sYGbzmWXLFjZyrImJ6F5ZboiGZoTkG3HcXOAUExZA5gRzFk5Gdy65SQ
+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>
diff --git a/swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml
new file mode 100644
index 00000000..1c5d3725
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDJDCCAgygAwIBAgIVAJBITnJoX92EsdoWjSdjb3G2d4VwMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC51bmltb3JlLml0MB4XDTEwMDEyNjEzMzg0MloX
+DTMwMDEyNjEzMzg0MlowGTEXMBUGA1UEAxMOaWRwLnVuaW1vcmUuaXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAKvIYSyrl0QfPfFE+SlhVJ5RW7nJ7
+sDkRzEZS2q2W3Nm3PtzidHNNxH3yzely2oyOXd6PVsx/ky5KndOY9GfSm1jFdmAX
+7fwFhXwFdlPLrvSL4iFMPR966z6R7OF+Oa/kpUdGPXuAVau61KOX7wqPsuZ7f7PX
+DaGRdqKyHEBNm9XehmYukjmwmLJSfd9R1+HUfP88khxYZD7CYHX4wU2Qp5KE7OIb
+g6ZGsqRYaCkGSYqQnsJjXGvyAU1BgPBFPdsn2X/Gxz2U06JvhnvCJv1JlzIrWlsj
+3M8/HF+celfuG7+qr1vTALoNeXypHFq+y4xypu+r7lWflcadx8KSPlfzAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC51bmltb3JlLml0hiVodHRwczovL2lkcC51bmlt
+b3JlLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBT/4cn1m4OFDg3Iv8CDfULK
+1s8JljANBgkqhkiG9w0BAQUFAAOCAQEAq37LOUh+3GFcqxwZKBiHbbudxRFRb7Hr
+uvXTpGuuV+eb/5lE7gCzNsXGV07OM6s+of45Hd2c9rVD8+xnSZvPkUGy30USVn/s
+D/mWS08gIL09LHfrgvM3kRGxuE6kyVdTuwTdtkcSXjYtm+RZztp95w9LV8n3Jve1
+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>
+MIIDJDCCAgygAwIBAgIVAJBITnJoX92EsdoWjSdjb3G2d4VwMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC51bmltb3JlLml0MB4XDTEwMDEyNjEzMzg0MloX
+DTMwMDEyNjEzMzg0MlowGTEXMBUGA1UEAxMOaWRwLnVuaW1vcmUuaXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAKvIYSyrl0QfPfFE+SlhVJ5RW7nJ7
+sDkRzEZS2q2W3Nm3PtzidHNNxH3yzely2oyOXd6PVsx/ky5KndOY9GfSm1jFdmAX
+7fwFhXwFdlPLrvSL4iFMPR966z6R7OF+Oa/kpUdGPXuAVau61KOX7wqPsuZ7f7PX
+DaGRdqKyHEBNm9XehmYukjmwmLJSfd9R1+HUfP88khxYZD7CYHX4wU2Qp5KE7OIb
+g6ZGsqRYaCkGSYqQnsJjXGvyAU1BgPBFPdsn2X/Gxz2U06JvhnvCJv1JlzIrWlsj
+3M8/HF+celfuG7+qr1vTALoNeXypHFq+y4xypu+r7lWflcadx8KSPlfzAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC51bmltb3JlLml0hiVodHRwczovL2lkcC51bmlt
+b3JlLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBT/4cn1m4OFDg3Iv8CDfULK
+1s8JljANBgkqhkiG9w0BAQUFAAOCAQEAq37LOUh+3GFcqxwZKBiHbbudxRFRb7Hr
+uvXTpGuuV+eb/5lE7gCzNsXGV07OM6s+of45Hd2c9rVD8+xnSZvPkUGy30USVn/s
+D/mWS08gIL09LHfrgvM3kRGxuE6kyVdTuwTdtkcSXjYtm+RZztp95w9LV8n3Jve1
+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>
diff --git a/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml
new file mode 100644
index 00000000..3c214a97
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDOzCCAiOgAwIBAgIUaE6MYuJWXmKRLkOaoYJ7v4C0fFowDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXBhcnRoZW5vcGUuaXQwHhcNMTAxMDExMTA1
+OTU2WhcNMzAxMDExMTA1OTU2WjAfMR0wGwYDVQQDExRpZHAudW5pcGFydGhlbm9w
+ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkPb9xxWtT2CoJL
+teZJDfYsGC3ieLYzf3iE+Yb8tv/4YpEFfUlUK07FH+SBDC0gpmGyd6EhUnaQP9Lz
+Hc8iIaiSCNwGy3iZyVQkbYHhiGCcgMvoIbnK2B4/DST1vRjNweCQiZsmk03O05dQ
++JjcgEkFi+8EeSEpOu3IrACRix/FViPy8l0JOr1ftLiONl/7WdyNJorLfTym6+cY
+kwSJIOzu5+U0UTx1vQJa1RN67dydGPy68Hq9JiKrYZ9zm+n0w7rbkCe+F4oP4Pp/
+lXJhGdenDusAZpohA72CXqFMGpMoKf4ktnm1vg6o2awl6pUQTRFqjhIXdy8v6f7O
+n0W9s/sCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXBhcnRoZW5vcGUuaXSG
+K2h0dHBzOi8vaWRwLnVuaXBhcnRoZW5vcGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFBbCXm5gWz4H5pWLzyTs/P1rDgveMA0GCSqGSIb3DQEBBQUAA4IBAQBR
+4eYlPyqz4G+EwI5vRbPA+1MZ3C4NNowmgkzvZVYhyuHNvYXqk0AvfyCTbi9fpPjk
+K87fkCo6qmaQAHlUE0ZxPzCbR1tRGoOVGAszMesh1whopFxHlfh9/zIFHocE2VDz
+Q3X5Orpt5M7J0Q56cXquYh3EuIFmYByXzK9hTOAiDq55n1QQ2nvQHItC4Jkp7GeO
+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>
+MIIDOzCCAiOgAwIBAgIUaE6MYuJWXmKRLkOaoYJ7v4C0fFowDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXBhcnRoZW5vcGUuaXQwHhcNMTAxMDExMTA1
+OTU2WhcNMzAxMDExMTA1OTU2WjAfMR0wGwYDVQQDExRpZHAudW5pcGFydGhlbm9w
+ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkPb9xxWtT2CoJL
+teZJDfYsGC3ieLYzf3iE+Yb8tv/4YpEFfUlUK07FH+SBDC0gpmGyd6EhUnaQP9Lz
+Hc8iIaiSCNwGy3iZyVQkbYHhiGCcgMvoIbnK2B4/DST1vRjNweCQiZsmk03O05dQ
++JjcgEkFi+8EeSEpOu3IrACRix/FViPy8l0JOr1ftLiONl/7WdyNJorLfTym6+cY
+kwSJIOzu5+U0UTx1vQJa1RN67dydGPy68Hq9JiKrYZ9zm+n0w7rbkCe+F4oP4Pp/
+lXJhGdenDusAZpohA72CXqFMGpMoKf4ktnm1vg6o2awl6pUQTRFqjhIXdy8v6f7O
+n0W9s/sCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXBhcnRoZW5vcGUuaXSG
+K2h0dHBzOi8vaWRwLnVuaXBhcnRoZW5vcGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFBbCXm5gWz4H5pWLzyTs/P1rDgveMA0GCSqGSIb3DQEBBQUAA4IBAQBR
+4eYlPyqz4G+EwI5vRbPA+1MZ3C4NNowmgkzvZVYhyuHNvYXqk0AvfyCTbi9fpPjk
+K87fkCo6qmaQAHlUE0ZxPzCbR1tRGoOVGAszMesh1whopFxHlfh9/zIFHocE2VDz
+Q3X5Orpt5M7J0Q56cXquYh3EuIFmYByXzK9hTOAiDq55n1QQ2nvQHItC4Jkp7GeO
+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>
diff --git a/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml
new file mode 100644
index 00000000..d01f0f16
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDGzCCAgOgAwIBAgIUbtCA5KDFFzAdtSTGPwrF8RKSWf8wDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MB4XDTEzMTEyOTEwNDgyN1oXDTMz
+MTEyOTEwNDgyN1owFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEArcWMYBTfLliKg2yiUOuJphQVPDuzFh8iAzmB
+N5rs+B9Y841AvxgC2K12IogTLt2oeX5qv2hvyoip2q3XBY8aHo4xwjTW0UmgZ4Td
+dTA1ImOUq61mUYucYemfng+wO2rKpDOaOuwjOOJ4ZwYly0f4MenKDkGxmv/X5vFQ
+mNc5EeC4Zllkvoss95OuE8oQ/xxA+3xsAT6zhjadsHlTrxHfkWBDTbeNhupAbqD0
+JB84CfVNaOrmD/haNzn5lfktKb+aDwac+wSpl/P2wxa2F5ZkTLJeRF6WK0z4S6Wb
+IaaLbrwIXCWnZnQoWY6mFKBaK2hAB8P3emlpsve6cl5QC7TnqwIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAudW5pcGcuaXSGI2h0dHBzOi8vaWRwLnVuaXBnLml0L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRlnQD+3BGocWcSXr2HfL3Pm+HSjTANBgkq
+hkiG9w0BAQUFAAOCAQEAF8seek5DbzQnVsPhRzkzsl367Q6gnCiUWJR4x+KwgDLb
+yC/1F9x62DxiM1HqN21K2IhhJuiBEgEH2vfBBL9XS4U12gCnjOeOrVq4Sn1n0y0n
+Mtr1n/F38kdTww7elicK1c5VfJzNW92SPZ0WDeqx6dsHtCLr0cEbe2m37ObmbP7m
+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>
+MIIDGzCCAgOgAwIBAgIUbtCA5KDFFzAdtSTGPwrF8RKSWf8wDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MB4XDTEzMTEyOTEwNDgyN1oXDTMz
+MTEyOTEwNDgyN1owFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEArcWMYBTfLliKg2yiUOuJphQVPDuzFh8iAzmB
+N5rs+B9Y841AvxgC2K12IogTLt2oeX5qv2hvyoip2q3XBY8aHo4xwjTW0UmgZ4Td
+dTA1ImOUq61mUYucYemfng+wO2rKpDOaOuwjOOJ4ZwYly0f4MenKDkGxmv/X5vFQ
+mNc5EeC4Zllkvoss95OuE8oQ/xxA+3xsAT6zhjadsHlTrxHfkWBDTbeNhupAbqD0
+JB84CfVNaOrmD/haNzn5lfktKb+aDwac+wSpl/P2wxa2F5ZkTLJeRF6WK0z4S6Wb
+IaaLbrwIXCWnZnQoWY6mFKBaK2hAB8P3emlpsve6cl5QC7TnqwIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAudW5pcGcuaXSGI2h0dHBzOi8vaWRwLnVuaXBnLml0L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRlnQD+3BGocWcSXr2HfL3Pm+HSjTANBgkq
+hkiG9w0BAQUFAAOCAQEAF8seek5DbzQnVsPhRzkzsl367Q6gnCiUWJR4x+KwgDLb
+yC/1F9x62DxiM1HqN21K2IhhJuiBEgEH2vfBBL9XS4U12gCnjOeOrVq4Sn1n0y0n
+Mtr1n/F38kdTww7elicK1c5VfJzNW92SPZ0WDeqx6dsHtCLr0cEbe2m37ObmbP7m
+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>
diff --git a/swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml
new file mode 100644
index 00000000..59280410
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDHDCCAgSgAwIBAgIVANpHH4cWOn6yEYz2lRJ3vuZn9emLMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDAeFw0xMTAzMTAxMzM4MjRaFw0z
+MTAzMTAxMzM4MjRaMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAIxD1yQuyQ1P7wVjslFUKXVAtWQ2Oe9h7vVO
+zGVo+08dZ1RFoS9e4wtMj3UOme7VwxKdvlkzp3B0sSJS5FqZ7oMf3Wi0SZKbldew
+zvO/ToeJLjCq4oQBXmi7RePwHZ2GEmyzk7JTujtnBrY6vjfIB+AwviT3y13OHCqB
+T1XCi8bNsAoviDjyN/TKG/AU1pJFc5NWFLRy1YKC+5FlJCh/Kr+uC/KVdUhn40Wm
+cAjLfTATK+Y1RbVb4eHF6vJOOBsTQqvat4heBmpBnuyY06ngU/dZp6Te3BCPMSm2
+6PQnYF8uf9Ftf5U++J32DJIRKimN8N3y0sVK8xsaIUbmAfkT6gMCAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLnVuaXBpLml0hiNodHRwczovL2lkcC51bmlwaS5pdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUuVwagCJNNlDEGjXsYBV07TH67W4wDQYJ
+KoZIhvcNAQEFBQADggEBACVqW+MNuwIyvc4ut3mhAt/TBD5HOFO7kPaylsaTwIe6
+hBgb6H9cEMHQAmgNFITHjzLjDiM5dag9dWqdDvHLoINgKEKgBSN8/tEJoh7qI60m
+Pv7PNEN3Jolwm8YeB0dite8aPioPvw4kReGAQnmkvDX4q809p3SRBOI9SCM4Rgwu
+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>
+MIIDHDCCAgSgAwIBAgIVANpHH4cWOn6yEYz2lRJ3vuZn9emLMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDAeFw0xMTAzMTAxMzM4MjRaFw0z
+MTAzMTAxMzM4MjRaMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAIxD1yQuyQ1P7wVjslFUKXVAtWQ2Oe9h7vVO
+zGVo+08dZ1RFoS9e4wtMj3UOme7VwxKdvlkzp3B0sSJS5FqZ7oMf3Wi0SZKbldew
+zvO/ToeJLjCq4oQBXmi7RePwHZ2GEmyzk7JTujtnBrY6vjfIB+AwviT3y13OHCqB
+T1XCi8bNsAoviDjyN/TKG/AU1pJFc5NWFLRy1YKC+5FlJCh/Kr+uC/KVdUhn40Wm
+cAjLfTATK+Y1RbVb4eHF6vJOOBsTQqvat4heBmpBnuyY06ngU/dZp6Te3BCPMSm2
+6PQnYF8uf9Ftf5U++J32DJIRKimN8N3y0sVK8xsaIUbmAfkT6gMCAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLnVuaXBpLml0hiNodHRwczovL2lkcC51bmlwaS5pdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUuVwagCJNNlDEGjXsYBV07TH67W4wDQYJ
+KoZIhvcNAQEFBQADggEBACVqW+MNuwIyvc4ut3mhAt/TBD5HOFO7kPaylsaTwIe6
+hBgb6H9cEMHQAmgNFITHjzLjDiM5dag9dWqdDvHLoINgKEKgBSN8/tEJoh7qI60m
+Pv7PNEN3Jolwm8YeB0dite8aPioPvw4kReGAQnmkvDX4q809p3SRBOI9SCM4Rgwu
+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>
diff --git a/swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml
new file mode 100644
index 00000000..6fd42a6e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIEkzCCA3ugAwIBAgIQNvPCzFi8IyzAo2pvCeu9pzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDExMDAwMDAwMFoXDTE2MDEyNDIzNTk1OVowcjELMAkGA1UE
+BhMCSVQxKTAnBgNVBAoMIFVuaXZlcnNpdMOgIGRlZ2xpIFN0dWRpIGRpIFBhdmlh
+MSEwHwYDVQQLExhBcmVhIFNpc3RlbWkgSW5mb3JtYXRpdmkxFTATBgNVBAMTDGlk
+cC51bmlwdi5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqVD8w8
+39tNXsgx1Dc0x+z2rzeOj82rY9DtWNoagNxjXq2R8sqyA+vOEe2JWxL+9/ivZItP
+JeHJ+1Fike3XiSIrXb4z1XEuNyUeFKKKR3XtPREs6i04OT8HdNb3wPYStfoaXX+J
+nR8Xb+OJq9L0TaHd7s/ZoRyTJwjAggNR2AfubnTUuNC27i6OWf9NausitdKsLwTx
+JSgbbU4USEARO0LHWkSmnFYSQFkD/KVPO5FjxsX7d6xCA1MtRMKV8Ymm3GE8diEH
+cg0fMqF3a5vgwUBAtu2jKkkTmkqIreJYNGfGy3Viq5tFkMLPR/cojz8G3hkr/DWz
+YxfJRhiuUAOIfvUCAwEAAaOCAV8wggFbMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
+KzdXR+qQ47ntMB0GA1UdDgQWBBSeFx/Z+x1pQeagD84hECdg7SSFnzAOBgNVHQ8B
+Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
+BQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaAr
+hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
+BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
+cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
+dGVyZW5hLm9yZzAXBgNVHREEEDAOggxpZHAudW5pcHYuaXQwDQYJKoZIhvcNAQEF
+BQADggEBABY2r3TyyLLVUJgZQqAhjTHzJtoUS/bB26syOEATM6EcxL0W9N99QmcG
+6i+0+RwxWEiQhlarGDmCzcvLXKEVAeVLDaieS62v0fikXIFsg0FnYy706ZFSrIa1
+38yo4580o9KzdhBaww6VPrfiJtnW4nnkA56rLn2z0Ik1fYhh0Gii6JL7OXIosYQo
+lH7BOJURy0HD1PRxzG2TYILMelupUQcBGD9bSKOyCQZJyQUvxzzBVxL5LUFFoDvT
+j1F/HmOxSbqOCroLpPLh62GRM+IqOKmfzt7vWuwiz1hlO7vxMgUvU1xaqazPoOn7
+gT5hXQtlyBN8Kt8GOtqwkY9tP6sGe1I=
+</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>
+MIIEkzCCA3ugAwIBAgIQNvPCzFi8IyzAo2pvCeu9pzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDExMDAwMDAwMFoXDTE2MDEyNDIzNTk1OVowcjELMAkGA1UE
+BhMCSVQxKTAnBgNVBAoMIFVuaXZlcnNpdMOgIGRlZ2xpIFN0dWRpIGRpIFBhdmlh
+MSEwHwYDVQQLExhBcmVhIFNpc3RlbWkgSW5mb3JtYXRpdmkxFTATBgNVBAMTDGlk
+cC51bmlwdi5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqVD8w8
+39tNXsgx1Dc0x+z2rzeOj82rY9DtWNoagNxjXq2R8sqyA+vOEe2JWxL+9/ivZItP
+JeHJ+1Fike3XiSIrXb4z1XEuNyUeFKKKR3XtPREs6i04OT8HdNb3wPYStfoaXX+J
+nR8Xb+OJq9L0TaHd7s/ZoRyTJwjAggNR2AfubnTUuNC27i6OWf9NausitdKsLwTx
+JSgbbU4USEARO0LHWkSmnFYSQFkD/KVPO5FjxsX7d6xCA1MtRMKV8Ymm3GE8diEH
+cg0fMqF3a5vgwUBAtu2jKkkTmkqIreJYNGfGy3Viq5tFkMLPR/cojz8G3hkr/DWz
+YxfJRhiuUAOIfvUCAwEAAaOCAV8wggFbMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
+KzdXR+qQ47ntMB0GA1UdDgQWBBSeFx/Z+x1pQeagD84hECdg7SSFnzAOBgNVHQ8B
+Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
+BQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaAr
+hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
+BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
+cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
+dGVyZW5hLm9yZzAXBgNVHREEEDAOggxpZHAudW5pcHYuaXQwDQYJKoZIhvcNAQEF
+BQADggEBABY2r3TyyLLVUJgZQqAhjTHzJtoUS/bB26syOEATM6EcxL0W9N99QmcG
+6i+0+RwxWEiQhlarGDmCzcvLXKEVAeVLDaieS62v0fikXIFsg0FnYy706ZFSrIa1
+38yo4580o9KzdhBaww6VPrfiJtnW4nnkA56rLn2z0Ik1fYhh0Gii6JL7OXIosYQo
+lH7BOJURy0HD1PRxzG2TYILMelupUQcBGD9bSKOyCQZJyQUvxzzBVxL5LUFFoDvT
+j1F/HmOxSbqOCroLpPLh62GRM+IqOKmfzt7vWuwiz1hlO7vxMgUvU1xaqazPoOn7
+gT5hXQtlyBN8Kt8GOtqwkY9tP6sGe1I=
+</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>
diff --git a/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml
new file mode 100644
index 00000000..c37f4f0d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIEhDCCA2ygAwIBAgIRAJJ4jZUD61jOwDV9E8upZlQwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAyMjgwMDAwMDBaFw0xNjAyMjgyMzU5NTlaMD0xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLnVuaXJv
+bWEzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4yxN30NCjUmA
+TmyysmUMGSKilVFkTAPXxVod1FC1hZONeLGsZBNJ0I14IO5xf4L/W5+UW3qyb/f2
+8kJP908QSrMAvdEH5yl4nHTz/MLuZEIBrpTcYKs3sPPkvDlyFWmcdP0hPziETbSB
+CtOggV7FrRyo0r6rK1IOCm1lDRLwLliCea/XNJC4RktQGMywyn5W0TjootD/90wc
+k+cMKA1i4ldoyHRBcfOfrvxjPdCGZy++WIVVYkyMzOVulB9sNKfE/t81H1LZcaAN
+SINPbYPxAM8zlUOUuozUBDVX8XlKE7mbiouq6iAvCNKvE/zh7067Das9i0sydRtN
+x+isE34u/wIDAQABo4IBhDCCAYAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+6pDjue0wHQYDVR0OBBYEFN7YUQ+ImDerq41pkHNNAD1GWoH7MA4GA1UdDwEB/wQE
+AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+cC50Y3MudGVyZW5hLm9yZzAyBgNVHREEKzApgg9pZHAudW5pcm9tYTMuaXSCFnNo
+aWJib2xldGgudW5pcm9tYTMuaXQwDQYJKoZIhvcNAQEFBQADggEBACYMhQCWzVsh
+G6hbEbDKUvYLRAtc6OUZijZuj3aFtqqYyJOEBSjuSXJ6QMkLgL5wbcI4mI9FLLUM
+Ae7kAd49N7g9r++YnZz0EhTgdCJGfd+3ZmM9XjD1LUQgn3qJqW8qWRGjclHx/oAb
+bRwFd614gGCsWC6s0xtZmesaytSBdzcm5RjnofxPtEHWjQbFhUGxbtFHS6MHmjzT
+WgJ2RWgB09FrRjx/SB7UtFR93WaYSKgNq3CxtKnK5CTxUkd/WidcH6h07anBz66R
+wv+Hdi7+aibTF9pRMYHhYxatMrnPZpIfbX0vxRiaL3NLfopA7UUKpTwDM7Z3DM/B
+cTXFyKPFTrE=
+</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>
+MIIEhDCCA2ygAwIBAgIRAJJ4jZUD61jOwDV9E8upZlQwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAyMjgwMDAwMDBaFw0xNjAyMjgyMzU5NTlaMD0xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLnVuaXJv
+bWEzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4yxN30NCjUmA
+TmyysmUMGSKilVFkTAPXxVod1FC1hZONeLGsZBNJ0I14IO5xf4L/W5+UW3qyb/f2
+8kJP908QSrMAvdEH5yl4nHTz/MLuZEIBrpTcYKs3sPPkvDlyFWmcdP0hPziETbSB
+CtOggV7FrRyo0r6rK1IOCm1lDRLwLliCea/XNJC4RktQGMywyn5W0TjootD/90wc
+k+cMKA1i4ldoyHRBcfOfrvxjPdCGZy++WIVVYkyMzOVulB9sNKfE/t81H1LZcaAN
+SINPbYPxAM8zlUOUuozUBDVX8XlKE7mbiouq6iAvCNKvE/zh7067Das9i0sydRtN
+x+isE34u/wIDAQABo4IBhDCCAYAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+6pDjue0wHQYDVR0OBBYEFN7YUQ+ImDerq41pkHNNAD1GWoH7MA4GA1UdDwEB/wQE
+AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+cC50Y3MudGVyZW5hLm9yZzAyBgNVHREEKzApgg9pZHAudW5pcm9tYTMuaXSCFnNo
+aWJib2xldGgudW5pcm9tYTMuaXQwDQYJKoZIhvcNAQEFBQADggEBACYMhQCWzVsh
+G6hbEbDKUvYLRAtc6OUZijZuj3aFtqqYyJOEBSjuSXJ6QMkLgL5wbcI4mI9FLLUM
+Ae7kAd49N7g9r++YnZz0EhTgdCJGfd+3ZmM9XjD1LUQgn3qJqW8qWRGjclHx/oAb
+bRwFd614gGCsWC6s0xtZmesaytSBdzcm5RjnofxPtEHWjQbFhUGxbtFHS6MHmjzT
+WgJ2RWgB09FrRjx/SB7UtFR93WaYSKgNq3CxtKnK5CTxUkd/WidcH6h07anBz66R
+wv+Hdi7+aibTF9pRMYHhYxatMrnPZpIfbX0vxRiaL3NLfopA7UUKpTwDM7Z3DM/B
+cTXFyKPFTrE=
+</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>
diff --git a/swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..9a6b06ae
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unistra.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-strasbg.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <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>
+					      MIIDJDCCAgygAwIBAgIVAJL1uSgdsDY7/9L6gFGKRCNK7RlQMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC51bmlzdHJhLmZyMB4XDTEwMTEzMDAxMDc0NFoX
+DTMwMTEzMDAxMDc0NFowGTEXMBUGA1UEAxMOaWRwLnVuaXN0cmEuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfZvr54LdhidtcpIinb+VVc0nvNi7G
+RzVhLGmaWBEe2l/imU0NK+p8Sci4O06Dl17fSfEYh/ymT/X8fzs0ZBL67kmRjKW/
+4LrdaKPISuuBdAQu1ecMw6o5nHvPm8lChQs7+FPuKyHEOdGXU6YJdYcGVZWHGvm3
+YK0qZ5HocND7LYGhcTob083wQPtUm8TVisZSBBw/aY4uxQ3aPHqp20vLVlIWpyQH
+GBVusUsL30y4phRpvGMOhbBUjowba3Ig6cLGxhjmx2z42FoG95nF6NDRyPImp6cP
+dY3MFGFGOHb7o0eTkp2VpaCNwLDKUZq7IxxEg51BjAISYr4RlclDRlC1AgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC51bmlzdHJhLmZyhiVodHRwczovL2lkcC51bmlz
+dHJhLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTwSTX+NtpwVFWBJtPaXA23
+OEBp1jANBgkqhkiG9w0BAQUFAAOCAQEAhb+7SoxpdMH42J5nFMEXwNAxpPWKVjPq
+W5zgM3a3W3NSrL6R4j149IMn8YC+WrrfUnWiPYMO0+tEzTxvmL/SQRnV2kQumXN9
+Q32B6gTG1pinL1lcxrkO0FI1zcj/adE+2LkrTy3krQu2hkpO2CRYqE+ddzRNWdXd
+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://unknown.site.com</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>Eric Decornod</md:SurName>
+    <md:EmailAddress>decornod@unistra.fr</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
new file mode 100644
index 00000000..165d3ce1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unitn.it-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDHDCCAgSgAwIBAgIVAIG9TtUKx11xGhvJVWJiQdJGaFAlMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC51bml0bi5pdDAeFw0wOTA1MTkxMDM1MDJaFw0y
+OTA1MTkxMDM1MDJaMBcxFTATBgNVBAMTDGlkcC51bml0bi5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAISBCBJSMVJi1WHKET8aBYZIrlhp8ikT4hz5
+rbPXRLX1l2TPwzLlHq8K4b2XcBbmhT8nOO8XCDQSwzdPPDWXjzSq3/8NWvZjDhEA
+O8AB03VG+WVQrD6VeGhG0byfxpJghdO/y4lr188Ejb2ynPVduTVc7UcvuneVhKPP
+nn07Mzw0W09yG3Y7ygPJrv7t+Xitxp0skQZ0k/XaTEGxCp9uJgg8ngrPByclb2jY
+EGxuw2fNXM/psB6abxyeK+v/sCp/6RDXMC6oUk2DlKY7opjihhAhtW8wAivqZd9g
+YWFXgPa95SfGLORYKp3c9kEoU+eY/v4ZZGI4SVaPiMvSSDko7DcCAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLnVuaXRuLml0hiNodHRwczovL2lkcC51bml0bi5pdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTb1c/d9fvaXr1BBjRQhoMLCywfgwDQYJ
+KoZIhvcNAQEFBQADggEBAA3ZvXWRl+dnlwRAPkoBGjmJHzjwkjRAszHzd1fOr/2y
+vN+8d2gLjnF7F6Ge/z3xrmZAUuiI6iN7RWP6bXc4dce8cUhXE+U2yKJxEnlDIuMd
+u82HYWJ/uM4fVnenQaf1L9g7Y5TMTK/LGhapxZVReL6JROYWhntXgkEw6ccBQvge
+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>
+MIIDHDCCAgSgAwIBAgIVAIG9TtUKx11xGhvJVWJiQdJGaFAlMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC51bml0bi5pdDAeFw0wOTA1MTkxMDM1MDJaFw0y
+OTA1MTkxMDM1MDJaMBcxFTATBgNVBAMTDGlkcC51bml0bi5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAISBCBJSMVJi1WHKET8aBYZIrlhp8ikT4hz5
+rbPXRLX1l2TPwzLlHq8K4b2XcBbmhT8nOO8XCDQSwzdPPDWXjzSq3/8NWvZjDhEA
+O8AB03VG+WVQrD6VeGhG0byfxpJghdO/y4lr188Ejb2ynPVduTVc7UcvuneVhKPP
+nn07Mzw0W09yG3Y7ygPJrv7t+Xitxp0skQZ0k/XaTEGxCp9uJgg8ngrPByclb2jY
+EGxuw2fNXM/psB6abxyeK+v/sCp/6RDXMC6oUk2DlKY7opjihhAhtW8wAivqZd9g
+YWFXgPa95SfGLORYKp3c9kEoU+eY/v4ZZGI4SVaPiMvSSDko7DcCAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLnVuaXRuLml0hiNodHRwczovL2lkcC51bml0bi5pdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTb1c/d9fvaXr1BBjRQhoMLCywfgwDQYJ
+KoZIhvcNAQEFBQADggEBAA3ZvXWRl+dnlwRAPkoBGjmJHzjwkjRAszHzd1fOr/2y
+vN+8d2gLjnF7F6Ge/z3xrmZAUuiI6iN7RWP6bXc4dce8cUhXE+U2yKJxEnlDIuMd
+u82HYWJ/uM4fVnenQaf1L9g7Y5TMTK/LGhapxZVReL6JROYWhntXgkEw6ccBQvge
+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>
diff --git a/swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml
new file mode 100644
index 00000000..64f6dccc
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDIDCCAgigAwIBAgIVAPfr8HNJ+ZnHsOZPOHT6/ExkMj/TMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcC51bml1cmIuaXQwHhcNMDkxMTA0MTIwNjM4WhcN
+MjkxMTA0MTIwNjM4WjAYMRYwFAYDVQQDEw1pZHAudW5pdXJiLml0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArCLO1a/dUZ8kXUwmWnFFQIZhqooWQS9E
+jL+MBLChM79Rjh0Ucga+iWKfrldYst6GyUsucTc409cd0k1WuSrcWhqbGsNUklux
+TF2RJOWdtc9o748/eybGFrymycmXnnGOinwmqvaRDQGQQ0oxi1CxhhJ/kkZRBiyH
+kJ0w5NjY+8KUPlTiPU6X71HGPhrrOgBteGcegt5gIycMdWAZhl/30yLNxIo8XdRH
+VmuHzifQqLxmsYRlHTQKVeKkQ39NcoKYpmmq84SQNximYDFy1l0QJErZ9din7q0T
+9tJG56/1C7Cd3cswdA7E7rg8/E1SEQTq63WUuIssA9cgvVYy0zEJ1QIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHAudW5pdXJiLml0hiRodHRwczovL2lkcC51bml1cmIu
+aXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEdlfuYSnAcQl8FMtl+bhsdev9SS
+MA0GCSqGSIb3DQEBBQUAA4IBAQBYopjNhRz1N1QjNZDClXH0UgTBHIyzYs1kkfid
+kySla/EpsunfgdhYyxewc0RmFkRbZsMbji5Sbu7ezVuTt+JO1DJvWvqGMUsvz3rP
+Fj/hx4kxR+D2fM+27LoyK3L7jvAq8FcBR7b/vV+6vEF2vI4cKNXQ8GEv0Aem0Ow2
+5l6w4DgJLa0/3BpfaktCHHtV9YMB8OdcmGi1LZLE89uDlBrh2wS7myGMU+3h6/GL
+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>
+MIIDIDCCAgigAwIBAgIVAPfr8HNJ+ZnHsOZPOHT6/ExkMj/TMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcC51bml1cmIuaXQwHhcNMDkxMTA0MTIwNjM4WhcN
+MjkxMTA0MTIwNjM4WjAYMRYwFAYDVQQDEw1pZHAudW5pdXJiLml0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArCLO1a/dUZ8kXUwmWnFFQIZhqooWQS9E
+jL+MBLChM79Rjh0Ucga+iWKfrldYst6GyUsucTc409cd0k1WuSrcWhqbGsNUklux
+TF2RJOWdtc9o748/eybGFrymycmXnnGOinwmqvaRDQGQQ0oxi1CxhhJ/kkZRBiyH
+kJ0w5NjY+8KUPlTiPU6X71HGPhrrOgBteGcegt5gIycMdWAZhl/30yLNxIo8XdRH
+VmuHzifQqLxmsYRlHTQKVeKkQ39NcoKYpmmq84SQNximYDFy1l0QJErZ9din7q0T
+9tJG56/1C7Cd3cswdA7E7rg8/E1SEQTq63WUuIssA9cgvVYy0zEJ1QIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHAudW5pdXJiLml0hiRodHRwczovL2lkcC51bml1cmIu
+aXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEdlfuYSnAcQl8FMtl+bhsdev9SS
+MA0GCSqGSIb3DQEBBQUAA4IBAQBYopjNhRz1N1QjNZDClXH0UgTBHIyzYs1kkfid
+kySla/EpsunfgdhYyxewc0RmFkRbZsMbji5Sbu7ezVuTt+JO1DJvWvqGMUsvz3rP
+Fj/hx4kxR+D2fM+27LoyK3L7jvAq8FcBR7b/vV+6vEF2vI4cKNXQ8GEv0Aem0Ow2
+5l6w4DgJLa0/3BpfaktCHHtV9YMB8OdcmGi1LZLE89uDlBrh2wS7myGMU+3h6/GL
+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>
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
new file mode 100644
index 00000000..e30570a0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univ-ag.fr-idp-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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="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>
+					      MIIDJDCCAgygAwIBAgIVAPFkF2BmO6RVikcivryW27wULvteMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC51bml2LWFnLmZyMB4XDTEyMTAyMzE3MzIxMFoX
+DTMyMTAyMzE3MzIxMFowGTEXMBUGA1UEAxMOaWRwLnVuaXYtYWcuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyyPP8wKSxUpAuUcbFtn+p3mDRnybq
++qU1qFwxF8J3v2RW63VhgFX+6eKUsULLv5hgDoqY5tsJbUZ0wVGDX+2w6CeurITl
+5amBB0oFuO6Ml7uiYD56w1WQOAYD8L9Nu7kA0XcOb8O4BXngVk19k1lUKlTVHxrQ
+4dRzMPfYuqLYxk1/g8/6Q4ULcBZvqqAlupcgJPmZMh5XPK4PJZYOVHVJhutLY5m9
+TDuo4Sor+BCOLew0aM38rUDTPGydculwZja1R4K8+BHLATq1SFCi4a6ETIpWhy5x
+SAOvoM+W1KyyXSk99QbfmaZVVUlkBTDlupctvegv2sXR42+copiHxcJtAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC51bml2LWFnLmZyhiVodHRwczovL2lkcC51bml2
+LWFnLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTyUENeLeP0xMWsvdAWL29A
+S6V69jANBgkqhkiG9w0BAQUFAAOCAQEAcpTVb3RoQCDVNshZVyM1F0+3Jd4u2gAF
+Ey2DVRfgXcWETmUy2dOO5ZZ+YJtwOi+txpwr1yCbPMrdNCdJxLvVkkFwf5rLVesL
+TIm7h5PeO2fs5rurRWXarWSQCinkV7xE1a3xOMPDooCkmBHSICwY5At5fwwUA74X
+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://unknown.site.com</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
new file mode 100644
index 00000000..27c42f35
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univ-amu.fr-idp-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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="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>
+					      MIIDJzCCAg+gAwIBAgIULCzb5nQYuu/jKvNfhCenMAkGKm8wDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLnVuaXYtYW11LmZyMB4XDTEyMDQxMzE1MTIzM1oX
+DTMyMDQxMzE1MTIzM1owGjEYMBYGA1UEAxMPaWRwLnVuaXYtYW11LmZyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnIH5qfsDRJQDkVQ70lGQbkcAoT2g
+wCu7QruDZGG/Bk6qzCx8vNJh9rfAmrQ33GmsKOVQOxWIfImgdYgmZWsV52CPobHy
+rPsiE64INWyM/W/TEJP79GAQzGsiZ7xID6CfMbhVG83hNpWg3SxXyoh+B0/SVr/8
+IBNUtcVTe0d4Jjiv7ztHFwZXT2UBYxRJKU45V6y9Wss5RH7aAz9QVPK0K4f3r5pi
++Y+dxiw7dEWHO5QEZqx/9gQayfatac5lzX03QBZr1me5EePFwQJ3eM9raUuS1cbi
+dUxFptkQHJWoUGImaFcTHsuny2G438sM4s+ao6CkE/8WIQYTEBu0jwfIZwIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAudW5pdi1hbXUuZnKGJmh0dHBzOi8vaWRwLnVu
+aXYtYW11LmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQP7J5/7grId0BA/iS3
+EQAuh8HTUzANBgkqhkiG9w0BAQUFAAOCAQEAZT28dZUnmtUIuiob36b/jNzT/3dY
+iBZDHu3z1HMzFc6efhPhBuJ20SpLfH9oMBVDCUCktH9tv4VO5LJv0N02FL+r9uuo
+fbeNry2w9g78LM/z/0IWGtcdfEHnHA+6nYad1PEf0vv+K5v82l+atRSDoOR/s9dk
+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://unknown.site.com</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
new file mode 100644
index 00000000..e0e177b2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univ-artois.fr-idp-shibboleth.xml
@@ -0,0 +1,141 @@
+<?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>
+      <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="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>
+					      MIIDMzCCAhugAwIBAgIUYze6+LHtf+jMXzwG8QReI+Kp9ZcwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZyMB4XDTEyMTExMzE2NTk1
+N1oXDTMyMTExMzE2NTk1N1owHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkpHVwf2i1KtXPTZF/Qnr
+i0DtHLb6czJ/NmtUeYfWo8OM6P7Hkv58A9wXYX2eOX7RgFF4fyEbIn5rvFx3wdMG
+TwE2Cyq414V2HqCSXUtoAmWzhtuhQ5YuqvUkQ4QgUaSQMCAMxLmcAtY+XddfBuAg
+TtSzkh2JUaXUlIYHn8LKJw1r+Wp2X6gxZQyk8TAFzciOcwosVwOT8c2xAmK2ZYhL
+1CavsrTTRvXoHQobo2tmn2XrSHeSyjhMiTOJiDoCDu/XhOt781UdS9p0XFrHIru/
+dIzkv0Kk5uIqaz2idf2xX383qLZA0RfBXue4/yNu4X9aVxUT76JAB/fk+HegEAj8
+GwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1hcnRvaXMuZnKGKWh0dHBz
+Oi8vaWRwLnVuaXYtYXJ0b2lzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRm
+g9Y0eqV3krWHdZkro9hJUiyqazANBgkqhkiG9w0BAQUFAAOCAQEAfv8qHbEOTIl2
+c1CNwZb4TfarrTY04ZHytU0tHNJWBL7c21yTO2a+vY1Xb2k3UYhWqPiujx6tY012
+U8mQmjAhk6geFaYgUsNfRxpviAAm9BaxdeMqo09sEE0IY6+Vl3m8gvSq1vuN0jGh
+6R1Jbqhj84FBJeSuRUF/VH+JiRxZA+FK3rP5Oo8DUKkAa3O59v1zzJjcw/gP2WaE
+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>
+					      MIIDMzCCAhugAwIBAgIUSQ9eV+7UI3qVsdHcI6lx3hTPYsEwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZyMB4XDTA5MDUwNzA4NTky
+M1oXDTI5MDUwNzA4NTkyM1owHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2UT2ctOv7Fz//FWQEyA2
+CEJWoCVCqiAKRMIVJTqnO+asQFnsCya4DHWEWzTRo9DgXBluIelrVbM7JgsG6eAT
+cfVZpRr2HejrhhvZ7j5FPCuy0oLNmMCtcmcqmkMzyDx2rCefJAoScwcBYoz1I8qO
+SAr8DUPcVTZdabL5+val+GdzheeHtUsSKX1Z8pRgL1NwWwR46DXty09Z/gsszY6b
+WJLZ3gs7oaQpdtUmAiMf95/F5mMb9AZZKj878fdztdVt4Vig4QTmAYaqF7GQ9oj6
+8A1gNL4iVHc8gIpGfKDFSFhWmpnLLLJoblREribjP5AWsJBSMkI5Nuu0J7ITDgXW
+vwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1hcnRvaXMuZnKGKWh0dHBz
+Oi8vaWRwLnVuaXYtYXJ0b2lzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRy
+4kbAag+Wu/+JCxlZnf8v+nuV4DANBgkqhkiG9w0BAQUFAAOCAQEA1Z63uSJNJKme
+d/xq1BaFdQ6cAJQGxpCi9uDSD+GNcGK/auvUkmtxuCF6DAaY5mxSwJ9cx2KKEqiw
+XuJ3Vs7y3g7ez+0CvkoYZrq8pMRzhKZ+Lk1T8YJ/dNMnbqZjIAwYod1PtoJsYqjW
+iEi2GWmBGh2jwbKI+zJJMquPH+aKIEA425xAse+E6Q+JtudVqzZoG0ktigtBpMlo
+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>
+					      MIIDMzCCAhugAwIBAgIUYze6+LHtf+jMXzwG8QReI+Kp9ZcwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZyMB4XDTEyMTExMzE2NTk1
+N1oXDTMyMTExMzE2NTk1N1owHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkpHVwf2i1KtXPTZF/Qnr
+i0DtHLb6czJ/NmtUeYfWo8OM6P7Hkv58A9wXYX2eOX7RgFF4fyEbIn5rvFx3wdMG
+TwE2Cyq414V2HqCSXUtoAmWzhtuhQ5YuqvUkQ4QgUaSQMCAMxLmcAtY+XddfBuAg
+TtSzkh2JUaXUlIYHn8LKJw1r+Wp2X6gxZQyk8TAFzciOcwosVwOT8c2xAmK2ZYhL
+1CavsrTTRvXoHQobo2tmn2XrSHeSyjhMiTOJiDoCDu/XhOt781UdS9p0XFrHIru/
+dIzkv0Kk5uIqaz2idf2xX383qLZA0RfBXue4/yNu4X9aVxUT76JAB/fk+HegEAj8
+GwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1hcnRvaXMuZnKGKWh0dHBz
+Oi8vaWRwLnVuaXYtYXJ0b2lzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRm
+g9Y0eqV3krWHdZkro9hJUiyqazANBgkqhkiG9w0BAQUFAAOCAQEAfv8qHbEOTIl2
+c1CNwZb4TfarrTY04ZHytU0tHNJWBL7c21yTO2a+vY1Xb2k3UYhWqPiujx6tY012
+U8mQmjAhk6geFaYgUsNfRxpviAAm9BaxdeMqo09sEE0IY6+Vl3m8gvSq1vuN0jGh
+6R1Jbqhj84FBJeSuRUF/VH+JiRxZA+FK3rP5Oo8DUKkAa3O59v1zzJjcw/gP2WaE
+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>
+					      MIIDMzCCAhugAwIBAgIUSQ9eV+7UI3qVsdHcI6lx3hTPYsEwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZyMB4XDTA5MDUwNzA4NTky
+M1oXDTI5MDUwNzA4NTkyM1owHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2UT2ctOv7Fz//FWQEyA2
+CEJWoCVCqiAKRMIVJTqnO+asQFnsCya4DHWEWzTRo9DgXBluIelrVbM7JgsG6eAT
+cfVZpRr2HejrhhvZ7j5FPCuy0oLNmMCtcmcqmkMzyDx2rCefJAoScwcBYoz1I8qO
+SAr8DUPcVTZdabL5+val+GdzheeHtUsSKX1Z8pRgL1NwWwR46DXty09Z/gsszY6b
+WJLZ3gs7oaQpdtUmAiMf95/F5mMb9AZZKj878fdztdVt4Vig4QTmAYaqF7GQ9oj6
+8A1gNL4iVHc8gIpGfKDFSFhWmpnLLLJoblREribjP5AWsJBSMkI5Nuu0J7ITDgXW
+vwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1hcnRvaXMuZnKGKWh0dHBz
+Oi8vaWRwLnVuaXYtYXJ0b2lzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRy
+4kbAag+Wu/+JCxlZnf8v+nuV4DANBgkqhkiG9w0BAQUFAAOCAQEA1Z63uSJNJKme
+d/xq1BaFdQ6cAJQGxpCi9uDSD+GNcGK/auvUkmtxuCF6DAaY5mxSwJ9cx2KKEqiw
+XuJ3Vs7y3g7ez+0CvkoYZrq8pMRzhKZ+Lk1T8YJ/dNMnbqZjIAwYod1PtoJsYqjW
+iEi2GWmBGh2jwbKI+zJJMquPH+aKIEA425xAse+E6Q+JtudVqzZoG0ktigtBpMlo
+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://unknown.site.com</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
new file mode 100644
index 00000000..78a2344d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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="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>
+					      MIIDODCCAiCgAwIBAgIVAKFKpfPrDnkBOhfhK+OqWshuX1PZMA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LWF2aWdub24uZnIwHhcNMTIwNzE4MTMx
+NTQxWhcNMTUwNzE4MTMxNTQxWjAeMRwwGgYDVQQDExNpZHAudW5pdi1hdmlnbm9u
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg6G5VXHh5/DoXYDQ
+RQetIRXBzAfe3kh1Illtllq8aWLH+MUw+4EOg4Iks67eoU4/1qRJ8EsTUxFq/MHd
+qVvgaLdGv30e1QmaJbn3U+ASYOcmnEowsLw0KjUVXJwnzDDtkSmM6xtA5RzyIPSs
+JbEI5YC1dN4tr4vm8SbPtQGguGkZK09B0ZC92dWg36ZsMfDuaF09aBykpolTvZ/I
+m7lVCl0qzaa3VQTmLECsKlM3iEUlGzuADJEGTAuGxdyb9sy4hRxMCSs5xnUCYhqr
+G7ZOGowkc4HtQIBGdIfR2GbK9aDJVWepJxvzPXKP/7uWjiIqBmtZcYqY4joRDArR
+vLVtOwIDAQABo20wazBKBgNVHREEQzBBghNpZHAudW5pdi1hdmlnbm9uLmZyhipo
+dHRwczovL2lkcC51bml2LWF2aWdub24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFCcAdmasz9t4KP5u18D0XUU0rxqZMA0GCSqGSIb3DQEBBQUAA4IBAQAP78Pb
+fBUINRSLrm6aNcpdjt6cjXnfyfa9plgR7WkagfhrM5uiodZOouudsTJhEwUH0chb
+ktxfsLvGDbsrf8dcAyeKxLvtmIRlU/0YURZMZaj1q+tpkw5qsyNzkmftSZvFlL4M
+Rin03XAzDZCVlli7U35vcUIT1vY/UPffkdhVpfWBjQOTRziUA5pV2EU0gv7EaRAl
+3mG4gjWO1o6cVzdW3puPiyUlT2v7d1feHU5EGzFXr/KYK8pfGule7DKKwHPEOmxV
+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://unknown.site.com</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
new file mode 100644
index 00000000..d3a6508a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univ-bpclermont.fr-idp-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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="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>
+					      MIIDQzCCAiugAwIBAgIUf8Tye3TWDTMkKybmr2WCtI8Rg7gwDQYJKoZIhvcNAQEF
+BQAwITEfMB0GA1UEAxMWaWRwLnVuaXYtYnBjbGVybW9udC5mcjAeFw0wODExMjUx
+MzE4MDlaFw0yODExMjUxMzE4MDlaMCExHzAdBgNVBAMTFmlkcC51bml2LWJwY2xl
+cm1vbnQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgq4L+M8Cr
+xnSB7fZmGR8wgCnDx6DxFJqAwk45muj/RFAijOjAM9i2iUmjBhpAQjatnybBaGk4
+xjLD/TbzQzpXZMzqLpRYgmvqLQ7RG6PabpLDWz+s/oneLFWtvCzFmyRQXe72Kum5
+FCeG5Jz9uDniAwdv2u5dG82mr+nO7wP+95GwlcYzs9bVfJZ3L0vBZ0wu4bqAIHAQ
++PMX0FVX/2bmqBWjP1XaJjqIk0UnQJ7//Ccg3y888MRyIcg2d8P4OiG4VvhUl7bL
+QygrvTr0yqrw2XFHdhMAwV7P39Y84+/rAFPg94iiSesPOzZmgv4YvGcsvLjIWwa8
+Pi5gOMtJQXqFAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcC51bml2LWJwY2xlcm1v
+bnQuZnKGLWh0dHBzOi8vaWRwLnVuaXYtYnBjbGVybW9udC5mci9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQU9VjTe9bu+B0flgm74MpOhm2yVJYwDQYJKoZIhvcNAQEF
+BQADggEBADRoaAXNoIfymTDg2CETOFI/fhK8Sok1vAQo7PJjjeq2Pue965wgWT4Q
+sJxY9lQdPKlZRonso2ABtY0vNvlB2oQK5Trz8QckUp8MEXQhSDK2EyTc8/jXLae9
+4jU4qjGrD4f6h177SSimK2tmesTRJ57EUZd/Mpoy/cpWMKfp9tx6Pe6w5MYVOSpk
+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>
+					      MIIDQzCCAiugAwIBAgIUf8Tye3TWDTMkKybmr2WCtI8Rg7gwDQYJKoZIhvcNAQEF
+BQAwITEfMB0GA1UEAxMWaWRwLnVuaXYtYnBjbGVybW9udC5mcjAeFw0wODExMjUx
+MzE4MDlaFw0yODExMjUxMzE4MDlaMCExHzAdBgNVBAMTFmlkcC51bml2LWJwY2xl
+cm1vbnQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgq4L+M8Cr
+xnSB7fZmGR8wgCnDx6DxFJqAwk45muj/RFAijOjAM9i2iUmjBhpAQjatnybBaGk4
+xjLD/TbzQzpXZMzqLpRYgmvqLQ7RG6PabpLDWz+s/oneLFWtvCzFmyRQXe72Kum5
+FCeG5Jz9uDniAwdv2u5dG82mr+nO7wP+95GwlcYzs9bVfJZ3L0vBZ0wu4bqAIHAQ
++PMX0FVX/2bmqBWjP1XaJjqIk0UnQJ7//Ccg3y888MRyIcg2d8P4OiG4VvhUl7bL
+QygrvTr0yqrw2XFHdhMAwV7P39Y84+/rAFPg94iiSesPOzZmgv4YvGcsvLjIWwa8
+Pi5gOMtJQXqFAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcC51bml2LWJwY2xlcm1v
+bnQuZnKGLWh0dHBzOi8vaWRwLnVuaXYtYnBjbGVybW9udC5mci9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQU9VjTe9bu+B0flgm74MpOhm2yVJYwDQYJKoZIhvcNAQEF
+BQADggEBADRoaAXNoIfymTDg2CETOFI/fhK8Sok1vAQo7PJjjeq2Pue965wgWT4Q
+sJxY9lQdPKlZRonso2ABtY0vNvlB2oQK5Trz8QckUp8MEXQhSDK2EyTc8/jXLae9
+4jU4qjGrD4f6h177SSimK2tmesTRJ57EUZd/Mpoy/cpWMKfp9tx6Pe6w5MYVOSpk
+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://unknown.site.com</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
new file mode 100644
index 00000000..74432666
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univ-fcomte.fr-idp-shibboleth.xml
@@ -0,0 +1,141 @@
+<?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>
+      <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="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>
+					      MIIDMzCCAhugAwIBAgIUW6mVllZscKchJexSqcEND0YtS8AwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtZmNvbXRlLmZyMB4XDTA5MDkyMjA5MjY0
+OFoXDTI5MDkyMjA5MjY0OFowHTEbMBkGA1UEAxMSaWRwLnVuaXYtZmNvbXRlLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo5IZG9vjS65fZl4V7Rj0
+7m98ICKvOdEKifDECnogADu3DKKwTgNRFdluGjA97M/vLYGyDPIxp6WH5/Xn402n
+dBKoR7x4cCPxcbreXqstbObb6DKLQ9wno2kZGHhCGnSbP04GruIKoLjtZJ0HjkYY
+805ZEB+yR543hZoAKvYoL7yNfkbhw4pqiHocd7lDjeW30airDj26endmgxKMDdma
+QZc+SZQih2c4pwvFeY478VxvMC34U9r+bnljREDXNk6j342vIKTqSEhf2UgMcd6/
+ox+ozGhstsDwRPecDyLm9t4VtcL7jAwC2mF/zhAkziDQ1ZSqszLOpM94kPW8rdvC
+7QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1mY29tdGUuZnKGKWh0dHBz
+Oi8vaWRwLnVuaXYtZmNvbXRlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTr
+IVfDPghF09R0vhBjtKCIU7ibzjANBgkqhkiG9w0BAQUFAAOCAQEAjuMuu1Jhi1x6
+6ePM1bMbdyGTRAiWeQIBQsHkz6xbHOzAL86/bgIw2hgQqcjq1Tzy3OTFFsduAW1N
+wIfDITbZ1Bg2FecmYpdxzpwzzTgnPzpaztN013WlCkXURlbf4LP2OBpGe0gC488N
+v720Gk3YrUSZ4Qvfrr15kRsb92unQ87qT7JWGnp8+3/e8Cuw93bNZZY+rgAjLm8z
+XqW8svXuUo4q0dQH93j8YzV7Ehhri1crpeix9jNFHU9Nv1UNT4a1kFgbvtqvbJEK
+nN/RMfsKrrdgX8j3c+CoTxWr/whb+1TSruMB/J1PgNArpPGxNDJEoZloNEMAowoU
+IVPuFCeDJg==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDQDCCAiigAwIBAgIVAO/8T+HZ1meHZeUYYGYKknaNCO9jMA0GCSqGSIb3DQEB
+BQUAMCAxHjAcBgNVBAMTFXVmYzExMy51bml2LWZjb210ZS5mcjAeFw0wOTA2MjUx
+MTQ3MzJaFw0xMjA2MjUxMTQ3MzJaMCAxHjAcBgNVBAMTFXVmYzExMy51bml2LWZj
+b210ZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtQ/+GORbpD
+E5V4drXcwRL9W+hW5IH4hfeJ9garnrJXVDHz2+2NujNZLFudKsWLmzEtdsV9I80H
+xuvQPeXjwUTu3eA1aPBhG3ffijmAF30+fe72zrWT1lxtwkPPlvAl9NuB3GgRPD4j
++ZCie2/pZ96zrjxP4OFtzWe29pn1cSNtoRppoVlejHLSx8xLMWygEVKHo48yvSxO
+r1CD0XuI9N4xcHfT9PqMwvcHNk4GJ7K+KbmQaLT5LcbOHHInrij77FjyjMyA53+H
+P1bFHJsXkpTqctjDpWECiqhZq7vT5UmU2BxtKf5DJGvZ1bXu+lZGwvw/umH1bzDo
+8v0IbqJM2MUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVdWZjMTEzLnVuaXYtZmNvbXRl
+LmZyhixodHRwczovL3VmYzExMy51bml2LWZjb210ZS5mci9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQU7ZjX/QJkTHhPUK5jJ1VnXRORswswDQYJKoZIhvcNAQEFBQAD
+ggEBAFl/1/GkovqnPpz0B58Tzug3Hhak1K4sSPTE2QfT0oKF6ffpMj10rUIGnGcj
+5hS84epevQOIs1KqIQoU+1FHk80u7QQ6SjeUwOEaRwipBpJJTJ8/8dXYI0AfavuS
+N6dZU+zaXvYQm3gesWDi//33j8mZ33uCrfGw+hg3VlG6eZddAivDSXMDTodksf4W
+3wkXzErY365XtwnOvKJmnhR3WB7kQuHsAInMmm0AIBtv1cNFprAGDMMyLrIIXwQG
+Yd9szbOmM5Uq2s8WY9fuOWBLbcvTlgwdr+kT9XG5Z81h96q13zi8+a5/aoSEDCyv
+miWCUgajCZNCnjKwKj7taWSFWuw=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc: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>
+					      MIIDMzCCAhugAwIBAgIUW6mVllZscKchJexSqcEND0YtS8AwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtZmNvbXRlLmZyMB4XDTA5MDkyMjA5MjY0
+OFoXDTI5MDkyMjA5MjY0OFowHTEbMBkGA1UEAxMSaWRwLnVuaXYtZmNvbXRlLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo5IZG9vjS65fZl4V7Rj0
+7m98ICKvOdEKifDECnogADu3DKKwTgNRFdluGjA97M/vLYGyDPIxp6WH5/Xn402n
+dBKoR7x4cCPxcbreXqstbObb6DKLQ9wno2kZGHhCGnSbP04GruIKoLjtZJ0HjkYY
+805ZEB+yR543hZoAKvYoL7yNfkbhw4pqiHocd7lDjeW30airDj26endmgxKMDdma
+QZc+SZQih2c4pwvFeY478VxvMC34U9r+bnljREDXNk6j342vIKTqSEhf2UgMcd6/
+ox+ozGhstsDwRPecDyLm9t4VtcL7jAwC2mF/zhAkziDQ1ZSqszLOpM94kPW8rdvC
+7QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1mY29tdGUuZnKGKWh0dHBz
+Oi8vaWRwLnVuaXYtZmNvbXRlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTr
+IVfDPghF09R0vhBjtKCIU7ibzjANBgkqhkiG9w0BAQUFAAOCAQEAjuMuu1Jhi1x6
+6ePM1bMbdyGTRAiWeQIBQsHkz6xbHOzAL86/bgIw2hgQqcjq1Tzy3OTFFsduAW1N
+wIfDITbZ1Bg2FecmYpdxzpwzzTgnPzpaztN013WlCkXURlbf4LP2OBpGe0gC488N
+v720Gk3YrUSZ4Qvfrr15kRsb92unQ87qT7JWGnp8+3/e8Cuw93bNZZY+rgAjLm8z
+XqW8svXuUo4q0dQH93j8YzV7Ehhri1crpeix9jNFHU9Nv1UNT4a1kFgbvtqvbJEK
+nN/RMfsKrrdgX8j3c+CoTxWr/whb+1TSruMB/J1PgNArpPGxNDJEoZloNEMAowoU
+IVPuFCeDJg==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDQDCCAiigAwIBAgIVAO/8T+HZ1meHZeUYYGYKknaNCO9jMA0GCSqGSIb3DQEB
+BQUAMCAxHjAcBgNVBAMTFXVmYzExMy51bml2LWZjb210ZS5mcjAeFw0wOTA2MjUx
+MTQ3MzJaFw0xMjA2MjUxMTQ3MzJaMCAxHjAcBgNVBAMTFXVmYzExMy51bml2LWZj
+b210ZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtQ/+GORbpD
+E5V4drXcwRL9W+hW5IH4hfeJ9garnrJXVDHz2+2NujNZLFudKsWLmzEtdsV9I80H
+xuvQPeXjwUTu3eA1aPBhG3ffijmAF30+fe72zrWT1lxtwkPPlvAl9NuB3GgRPD4j
++ZCie2/pZ96zrjxP4OFtzWe29pn1cSNtoRppoVlejHLSx8xLMWygEVKHo48yvSxO
+r1CD0XuI9N4xcHfT9PqMwvcHNk4GJ7K+KbmQaLT5LcbOHHInrij77FjyjMyA53+H
+P1bFHJsXkpTqctjDpWECiqhZq7vT5UmU2BxtKf5DJGvZ1bXu+lZGwvw/umH1bzDo
+8v0IbqJM2MUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVdWZjMTEzLnVuaXYtZmNvbXRl
+LmZyhixodHRwczovL3VmYzExMy51bml2LWZjb210ZS5mci9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQU7ZjX/QJkTHhPUK5jJ1VnXRORswswDQYJKoZIhvcNAQEFBQAD
+ggEBAFl/1/GkovqnPpz0B58Tzug3Hhak1K4sSPTE2QfT0oKF6ffpMj10rUIGnGcj
+5hS84epevQOIs1KqIQoU+1FHk80u7QQ6SjeUwOEaRwipBpJJTJ8/8dXYI0AfavuS
+N6dZU+zaXvYQm3gesWDi//33j8mZ33uCrfGw+hg3VlG6eZddAivDSXMDTodksf4W
+3wkXzErY365XtwnOvKJmnhR3WB7kQuHsAInMmm0AIBtv1cNFprAGDMMyLrIIXwQG
+Yd9szbOmM5Uq2s8WY9fuOWBLbcvTlgwdr+kT9XG5Z81h96q13zi8+a5/aoSEDCyv
+miWCUgajCZNCnjKwKj7taWSFWuw=
+					    </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://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>ghislain.pruniaux@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
new file mode 100644
index 00000000..c1394a4f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univ-lehavre.fr-idp-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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="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>
+					      MIIDODCCAiCgAwIBAgIVAKVZEzNuUG9OyP1vnILb2oaJys+2MA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LWxlaGF2cmUuZnIwHhcNMTAwMjAxMDc0
+MTAyWhcNMzAwMjAxMDc0MTAyWjAeMRwwGgYDVQQDExNpZHAudW5pdi1sZWhhdnJl
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhJ6/Nn9ySl33BpPd
+S6L9nanWg1w/xaTcjsv0XSZXmLToc2iP0tpNg0VYok5SrFzl+Hw+4QtDvHVTmWLu
+wssMqg0mUHqnObwJE+/KKIN0Olchhpod2YfKbhko6w0QRSA57BkkUa4IPzlnJY58
+Nhz6ZdKn8tiA5NibD7K8JSaP3eurVgO2GKSpz62oQBFLAZNP7WPNC2kRIT6X8D9J
+NgreBINUGhAAsPzv7TmUK5L6lOipeLY3nQMwyOKCYUNViKonkZKE0lxNHWTPMIR0
+8DvVBbFMxn9IjAc+RRuCT24WrJrUhVGI1D+n+aDOgnSdxfFOVjb+grrLbsRRI/lj
+9hRezQIDAQABo20wazBKBgNVHREEQzBBghNpZHAudW5pdi1sZWhhdnJlLmZyhipo
+dHRwczovL2lkcC51bml2LWxlaGF2cmUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFG9bkcW0TdTyz6LDBdJArcI+NflfMA0GCSqGSIb3DQEBBQUAA4IBAQBHfdlt
+GfykSuvsXF1U3BZHLuZb8rsSBNXjkYJ/cAa8owWXMeQ0Z/YFiylsVzuexflm8Zeh
+mvHVJK1IKyUGlNq8XEDxKW+Z9qdaFrXkASExQACMsrITYiYjS51mr14AUsbpJ9VX
+bzqXS0On3K9tjgVXUV4CxkHbb1Ce+9x6lEjtna3Tw4WsNleuz2tWVvB2SecmeCJk
+9rl3+lSEotK7cepJY/AzW9wVBDfFI03j1u7GxY2hlD8r3jEII78lLNQzxUBTYUEf
+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>
+					      MIIDODCCAiCgAwIBAgIVAKVZEzNuUG9OyP1vnILb2oaJys+2MA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LWxlaGF2cmUuZnIwHhcNMTAwMjAxMDc0
+MTAyWhcNMzAwMjAxMDc0MTAyWjAeMRwwGgYDVQQDExNpZHAudW5pdi1sZWhhdnJl
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhJ6/Nn9ySl33BpPd
+S6L9nanWg1w/xaTcjsv0XSZXmLToc2iP0tpNg0VYok5SrFzl+Hw+4QtDvHVTmWLu
+wssMqg0mUHqnObwJE+/KKIN0Olchhpod2YfKbhko6w0QRSA57BkkUa4IPzlnJY58
+Nhz6ZdKn8tiA5NibD7K8JSaP3eurVgO2GKSpz62oQBFLAZNP7WPNC2kRIT6X8D9J
+NgreBINUGhAAsPzv7TmUK5L6lOipeLY3nQMwyOKCYUNViKonkZKE0lxNHWTPMIR0
+8DvVBbFMxn9IjAc+RRuCT24WrJrUhVGI1D+n+aDOgnSdxfFOVjb+grrLbsRRI/lj
+9hRezQIDAQABo20wazBKBgNVHREEQzBBghNpZHAudW5pdi1sZWhhdnJlLmZyhipo
+dHRwczovL2lkcC51bml2LWxlaGF2cmUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFG9bkcW0TdTyz6LDBdJArcI+NflfMA0GCSqGSIb3DQEBBQUAA4IBAQBHfdlt
+GfykSuvsXF1U3BZHLuZb8rsSBNXjkYJ/cAa8owWXMeQ0Z/YFiylsVzuexflm8Zeh
+mvHVJK1IKyUGlNq8XEDxKW+Z9qdaFrXkASExQACMsrITYiYjS51mr14AUsbpJ9VX
+bzqXS0On3K9tjgVXUV4CxkHbb1Ce+9x6lEjtna3Tw4WsNleuz2tWVvB2SecmeCJk
+9rl3+lSEotK7cepJY/AzW9wVBDfFI03j1u7GxY2hlD8r3jEII78lLNQzxUBTYUEf
+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://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>AUGER Géraldine</md:SurName>
+    <md:EmailAddress>geraldine.auger@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
new file mode 100644
index 00000000..a6fefb92
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univ-lille3.fr-idp.xml
@@ -0,0 +1,167 @@
+<?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>
+      <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="fr">Université 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>
+					      MIIDMzCCAhugAwIBAgIUaI3sGoGDqxSkkKP8neZP2ayfQGswDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUzLmZyMB4XDTEwMDEyNzA5NDI0
+MloXDTMwMDEyNzA5NDI0MlowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUzLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhK0OBRmXzCdohEH0oLX6
+BwU47DqR8Ui+LPhE+2AxFY5pXC7rbF94YYoL5WJ2oJdVUjLhsiZZT43YbxvkNfqZ
+u7PK5s5TbvPxpx5khG5ezh0zwu6HmIPL9/TktRTMRZsnUO4BN0wA7YYbjWAwz0FB
+/uA1sbzBquo0+0LP0UXFa2Qr8HLH1qn8B80furUiWAqmPJ/PR4HlqG5p02DD6xl6
+mBsKZ+LCOAlpQg+Mpj8XwTEoSKIJQWECzrWvJ27N537n/4jci1h6Q6d4XPGrxE/R
+S/OYFQb9DSITJQ3XiQxG7FEmoR46eYvabngonp+LtlOsg44eOU4jCZ9xUl6NCe1d
+lQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1saWxsZTMuZnKGKWh0dHBz
+Oi8vaWRwLnVuaXYtbGlsbGUzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS/
+SXbo4Ptin4k8pT8SxemNo3o5CzANBgkqhkiG9w0BAQUFAAOCAQEAB0/3gtFmXex0
+Slx5kV0oJBz0y1RFN+uRTic8C2uJodV7Jo72scJu7H2ZgTdnt6QqMUyM0plh1njw
+J/+YsNpGt53iZ/8N7uf6gxqr58a76Zxln26V/VjVPsGzcDztp9FpNuoMfTwv0c66
+/dpOhb9GefyQEi+X7aAKBPtYmR8B/fE9cdpTaOg6CZA48RKb58CvT/zDI3cdjq70
+Ga4ev2RgDwKOZdcApBozTd1OteRkamdHqjsGGUMOjpa5nDbKBHnuLsszJgxhIIxM
+Zo56PsDM63rAF3vZF0uNsoql0sThageHMHnHIFoAUSpONzzEsQ991uG/bjioCY3T
+TVs+0tBLJA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIFvTCCBKWgAwIBAgIQRAUZO7HUWDyhwIniHCjSrzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIyMTAwMDAwMFoXDTE2MDEyNTIzNTk1OVowgZUxCzAJBgNV
+BAYTAkZSMTkwNwYDVQQKEzBVbml2ZXJzaXRlIExpbGxlIDMgU2NpZW5jZXMgSHVt
+YWluZXMgZXQgU29jaWFsZXMxLjAsBgNVBAsTJURpcmVjdGlvbiBkZXMgU3lzdGVt
+ZXMgZCdJbmZvcm1hdGlvbnMxGzAZBgNVBAMTEmlkcC51bml2LWxpbGxlMy5mcjCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKJBlXCU6eHp/JgG+GVNXhC6
+KYCNfwArzTRGutyhWOZbYxBk4VWI9C6RMtysunPq8DqRu8RZ3N/oCZUQ7uJO8/g2
+KqlzVd/PUYajeDe46jNzglXMne8xHQ4cm8ziNmdlN5PLAlB3SElv7IcEbYgKy55U
+poF8gqYla/aCgj0OT+NqzMd7WQvDIrH51616SpmdGMG+Gu28p01AgHj4SZgHDaLY
+TNxiih6hLXG6Sqf9KGrEIx72Vq5P9bX7T8w8EzteFL5tbJOfjL4PsvcJBJ0FbPCY
+TdPPJMiFqi760/QLESl42OaYyIcD9qzzlOeObdX6ympj4P9X6VN2A0JRyx5rxt1e
+/LCW/Mz4O3p0hrdlq1BXVfps97fC11vtMbjHXMmVfNdQUuzNI+FewRpPlRoB4qy4
+W9WoHD2Bl9ZT3nm4aNE4J6dLIMvBRHirkvukEDWjVJ11pP0AAgkHmyLb4MKRAkvd
+pmZbYjynanL8Ih9GZWIcIJWvnrjn9SpceQ6RordZ+G5k1115KM26J/eH1YubWPFs
+wVAwfig9xDax6TA9ff1xhViSmnFO8fJOLvNq61ajILz2BFtvrnQdHp4eJHIdS9FM
+zIpCad0iztAZj9Kh+pSb1R+g35ZRJ6mDUyDDA0ja5j/OEc/m9o9+kxDn0hbXU4qr
+oXZ09G3q+DU2pKBhVdwhAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPe
+q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUW7h7laZgkKdIp8RVCADRQh+a2OwwDgYD
+VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+CCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAv
+oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
+bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
+bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
+dGNzLnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwLnVuaXYtbGlsbGUzLmZyMA0G
+CSqGSIb3DQEBBQUAA4IBAQA4Vn31FsJwo8S0yhg1GbW8XK+wBkic3E/DfZ7Fk2UC
+87RKVY2s+mj1GljXCzUTz9TRrv9oqyWn1T2LyjJB51Hq8QwOmauz8aY9/M+l8w0e
+f/dOy9TWBleXkbNV6EVKmL5yXC/9tBcvz+ROAMoP/SuZKfB1+t/dtflwOUrfa/Rg
+8Hcf4DDa8kGEW3h0D1Mm9+NXPIL7XsWKYmKAqT3hljLoHsKId0f4cCDs1sVw/GbN
+VUkaXSsU3z1l3pbQ0ag0DCBEct0kI6h7npi8y8M+NtE+SDmu5r6+k4T/35sabheC
+mR/dAiU9Lbx17eGNeLgWiVw6qSW4Y6Ty/Hp2QENstkyH
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc: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
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhK0OBRmXzCdohEH0oLX6
+BwU47DqR8Ui+LPhE+2AxFY5pXC7rbF94YYoL5WJ2oJdVUjLhsiZZT43YbxvkNfqZ
+u7PK5s5TbvPxpx5khG5ezh0zwu6HmIPL9/TktRTMRZsnUO4BN0wA7YYbjWAwz0FB
+/uA1sbzBquo0+0LP0UXFa2Qr8HLH1qn8B80furUiWAqmPJ/PR4HlqG5p02DD6xl6
+mBsKZ+LCOAlpQg+Mpj8XwTEoSKIJQWECzrWvJ27N537n/4jci1h6Q6d4XPGrxE/R
+S/OYFQb9DSITJQ3XiQxG7FEmoR46eYvabngonp+LtlOsg44eOU4jCZ9xUl6NCe1d
+lQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1saWxsZTMuZnKGKWh0dHBz
+Oi8vaWRwLnVuaXYtbGlsbGUzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS/
+SXbo4Ptin4k8pT8SxemNo3o5CzANBgkqhkiG9w0BAQUFAAOCAQEAB0/3gtFmXex0
+Slx5kV0oJBz0y1RFN+uRTic8C2uJodV7Jo72scJu7H2ZgTdnt6QqMUyM0plh1njw
+J/+YsNpGt53iZ/8N7uf6gxqr58a76Zxln26V/VjVPsGzcDztp9FpNuoMfTwv0c66
+/dpOhb9GefyQEi+X7aAKBPtYmR8B/fE9cdpTaOg6CZA48RKb58CvT/zDI3cdjq70
+Ga4ev2RgDwKOZdcApBozTd1OteRkamdHqjsGGUMOjpa5nDbKBHnuLsszJgxhIIxM
+Zo56PsDM63rAF3vZF0uNsoql0sThageHMHnHIFoAUSpONzzEsQ991uG/bjioCY3T
+TVs+0tBLJA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIFvTCCBKWgAwIBAgIQRAUZO7HUWDyhwIniHCjSrzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIyMTAwMDAwMFoXDTE2MDEyNTIzNTk1OVowgZUxCzAJBgNV
+BAYTAkZSMTkwNwYDVQQKEzBVbml2ZXJzaXRlIExpbGxlIDMgU2NpZW5jZXMgSHVt
+YWluZXMgZXQgU29jaWFsZXMxLjAsBgNVBAsTJURpcmVjdGlvbiBkZXMgU3lzdGVt
+ZXMgZCdJbmZvcm1hdGlvbnMxGzAZBgNVBAMTEmlkcC51bml2LWxpbGxlMy5mcjCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKJBlXCU6eHp/JgG+GVNXhC6
+KYCNfwArzTRGutyhWOZbYxBk4VWI9C6RMtysunPq8DqRu8RZ3N/oCZUQ7uJO8/g2
+KqlzVd/PUYajeDe46jNzglXMne8xHQ4cm8ziNmdlN5PLAlB3SElv7IcEbYgKy55U
+poF8gqYla/aCgj0OT+NqzMd7WQvDIrH51616SpmdGMG+Gu28p01AgHj4SZgHDaLY
+TNxiih6hLXG6Sqf9KGrEIx72Vq5P9bX7T8w8EzteFL5tbJOfjL4PsvcJBJ0FbPCY
+TdPPJMiFqi760/QLESl42OaYyIcD9qzzlOeObdX6ympj4P9X6VN2A0JRyx5rxt1e
+/LCW/Mz4O3p0hrdlq1BXVfps97fC11vtMbjHXMmVfNdQUuzNI+FewRpPlRoB4qy4
+W9WoHD2Bl9ZT3nm4aNE4J6dLIMvBRHirkvukEDWjVJ11pP0AAgkHmyLb4MKRAkvd
+pmZbYjynanL8Ih9GZWIcIJWvnrjn9SpceQ6RordZ+G5k1115KM26J/eH1YubWPFs
+wVAwfig9xDax6TA9ff1xhViSmnFO8fJOLvNq61ajILz2BFtvrnQdHp4eJHIdS9FM
+zIpCad0iztAZj9Kh+pSb1R+g35ZRJ6mDUyDDA0ja5j/OEc/m9o9+kxDn0hbXU4qr
+oXZ09G3q+DU2pKBhVdwhAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPe
+q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUW7h7laZgkKdIp8RVCADRQh+a2OwwDgYD
+VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+CCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAv
+oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
+bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
+bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
+dGNzLnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwLnVuaXYtbGlsbGUzLmZyMA0G
+CSqGSIb3DQEBBQUAA4IBAQA4Vn31FsJwo8S0yhg1GbW8XK+wBkic3E/DfZ7Fk2UC
+87RKVY2s+mj1GljXCzUTz9TRrv9oqyWn1T2LyjJB51Hq8QwOmauz8aY9/M+l8w0e
+f/dOy9TWBleXkbNV6EVKmL5yXC/9tBcvz+ROAMoP/SuZKfB1+t/dtflwOUrfa/Rg
+8Hcf4DDa8kGEW3h0D1Mm9+NXPIL7XsWKYmKAqT3hljLoHsKId0f4cCDs1sVw/GbN
+VUkaXSsU3z1l3pbQ0ag0DCBEct0kI6h7npi8y8M+NtE+SDmu5r6+k4T/35sabheC
+mR/dAiU9Lbx17eGNeLgWiVw6qSW4Y6Ty/Hp2QENstkyH
+					    </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é Lille 3</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université Lille 3</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</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
new file mode 100644
index 00000000..0b00d8fa
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univ-lorraine.fr-idp-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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="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>
+					      MIIDOzCCAiOgAwIBAgIUKECx4WbVaZxB033wZc1aysZ4KF8wDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXYtbG9ycmFpbmUuZnIwHhcNMTExMTAzMTMz
+NDU1WhcNMzExMTAzMTMzNDU1WjAfMR0wGwYDVQQDExRpZHAudW5pdi1sb3JyYWlu
+ZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMrph7wDMIFx+XJv
+hG6wZxyLPmZAUqk5GTmFytV+H2Owl9M4F8hhSrislYDvTkRrfAWmey4j3McCCSMc
+HG6ZmM/7LW5GTes77Ny1odhyUIjhd/6Om0V6Or94wxOfFT/vkCLmA825U06GO+kG
+hcrfBg+D0vNRMIKcALMJbwO1paiBb/qfwVH0UixXemG8S/IsLmyx7KpucG3oc1mB
+dl91xr2Qe2f//Be70dOwCtGITdp9Swmw9VHy0oz1ovQI3oVxTLel4BG7zT56yEq3
+ZRRzHQAg72xntWDbbB6IEQoIuQMNvAQWpYo8AAJc3xmt7YSMTx80xZI80bYlvsWD
+BKeW7xsCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXYtbG9ycmFpbmUuZnKG
+K2h0dHBzOi8vaWRwLnVuaXYtbG9ycmFpbmUuZnIvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFOfm17yNg5q3qgKf0PmIVteYVOsFMA0GCSqGSIb3DQEBBQUAA4IBAQCU
+uuDEabKp1hCNmMaKF/4DFdwnLoa9nEVIvoTe5Rq0MpQP3eQfKs54yFxNzoteQKVn
+TY1cfVHO2POUgv6h+AWPEbxbgWYLoWjneKwIK/CsWcMAQcrL/YUcUos/i8xx5h2U
+K2dKLUx4XQzbaG6BV8SmsmhtS8CNMx91MUuqn2YilbijsTKSsIR8DnK6rOVQzLJE
+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>
+					      MIIDOzCCAiOgAwIBAgIUKECx4WbVaZxB033wZc1aysZ4KF8wDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXYtbG9ycmFpbmUuZnIwHhcNMTExMTAzMTMz
+NDU1WhcNMzExMTAzMTMzNDU1WjAfMR0wGwYDVQQDExRpZHAudW5pdi1sb3JyYWlu
+ZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMrph7wDMIFx+XJv
+hG6wZxyLPmZAUqk5GTmFytV+H2Owl9M4F8hhSrislYDvTkRrfAWmey4j3McCCSMc
+HG6ZmM/7LW5GTes77Ny1odhyUIjhd/6Om0V6Or94wxOfFT/vkCLmA825U06GO+kG
+hcrfBg+D0vNRMIKcALMJbwO1paiBb/qfwVH0UixXemG8S/IsLmyx7KpucG3oc1mB
+dl91xr2Qe2f//Be70dOwCtGITdp9Swmw9VHy0oz1ovQI3oVxTLel4BG7zT56yEq3
+ZRRzHQAg72xntWDbbB6IEQoIuQMNvAQWpYo8AAJc3xmt7YSMTx80xZI80bYlvsWD
+BKeW7xsCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXYtbG9ycmFpbmUuZnKG
+K2h0dHBzOi8vaWRwLnVuaXYtbG9ycmFpbmUuZnIvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFOfm17yNg5q3qgKf0PmIVteYVOsFMA0GCSqGSIb3DQEBBQUAA4IBAQCU
+uuDEabKp1hCNmMaKF/4DFdwnLoa9nEVIvoTe5Rq0MpQP3eQfKs54yFxNzoteQKVn
+TY1cfVHO2POUgv6h+AWPEbxbgWYLoWjneKwIK/CsWcMAQcrL/YUcUos/i8xx5h2U
+K2dKLUx4XQzbaG6BV8SmsmhtS8CNMx91MUuqn2YilbijsTKSsIR8DnK6rOVQzLJE
+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://unknown.site.com</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
new file mode 100644
index 00000000..5ec5b249
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml
@@ -0,0 +1,68 @@
+<?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>
+      <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="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>
+					      MIIE2TCCA8GgAwIBAgIQQx9CsvgcOG0a1Tvla0G65TANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMDkxMjAwMDAwMFoXDTE1MDkxMjIzNTk1OVowdzELMAkGA1UE
+BhMCRlIxIzAhBgNVBAoMGlVuaXZlcnNpdMOpIEx1bWllcmUtTHlvbiAyMScwJQYD
+VQQLDB5EU0kgVW5pdmVyc2l0w6kgTHVtaWVyZSBMeW9uIDIxGjAYBgNVBAMTEWlk
+cC51bml2LWx5b24yLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+4NRYOErWGGkM3nVhXJZdaILItB3ZS9fwHLPQvsbLy3sbm1IZq0vDaOjXXK+8RFFn
+q6ogmuwI+LvHO7ru+wcEuplCoVsNNVjWaD8109O9Vu160xxsyNgw1w7ly+0ToByI
+WzDpksBVoIkNK4XO4/b5gauiPTVm+T8UBvVQ4K2iT/G1AzcBgKKBeU0icy83mC5q
+7qP+X4CDptjCcDwbr4woZ/ckY+7G1tB1EnPE24Y7kPPFwgUU6kAIXvlmnsvmY22b
+SKNYL6LCYX3ugkc4uH5jAy4usmACtATKeC/ecgHhKfG1a+ID9TD5vDKxl6ICLi2h
+sMJFR/cNnKcc2kJYHYZNUQIDAQABo4IBoDCCAZwwHwYDVR0jBBgwFoAUDL2TaAzz
+3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNGHb+t8B/nZLRDgGVzpSZFoqXTBMA4G
+A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+BggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEw
+L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+LnRjcy50ZXJlbmEub3JnMFgGA1UdEQRRME+CEWlkcC51bml2LWx5b24yLmZyghJp
+ZHAxLnVuaXYtbHlvbjIuZnKCEmlkcDIudW5pdi1seW9uMi5mcoISaWRwMy51bml2
+LWx5b24yLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAJFkuPz9WIxbSCgK07Zdu5RBsV
+jVCvn6uu1NXznSfROTMQOMuGaOhS+OOLf6mdU/zN9NzFuX0Y9cCX+NqBPzqLjpS1
+Odv2QX1N3EcXJoXOQgmHLDV1wD/8EUR3enc679sOyaSy22i70JLRbgpgHlnGJLIW
+fuYW5lB1Y+iuhUtS4I/ScySNds0DwfC/kHymI8IYpcNFfvEGgYF976e/c6DgNwyQ
+hP96svqli3SO5rx+kUDaJROEZS4d9TA671A/40DKbJN0EuuDmr9Y4zzUVBUeyADY
+MVymo1FuDKpu6laIg6mbezvSwGbqQyQMMg5RA7zWiUJUaBXnBbgUR4Y0+xA8
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc: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://unknown.site.com</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
new file mode 100644
index 00000000..ff1ab46f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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="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>
+					      MIIDMDCCAhigAwIBAgIVALk8mZ+AAF53uwidDGYBnH0PYWxbMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWlkcC51bml2LWx5b24zLmZyMB4XDTEwMTAxMjEzMzk1
+NVoXDTMwMTAxMjEzMzk1NVowHDEaMBgGA1UEAxMRaWRwLnVuaXYtbHlvbjMuZnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnHRL8McVU1CwfcgOZzodc
+G9yjFNUlE5+tKEwGlkDNpOW+dIK3nZ4o3LxeOZVCA6sBJ6zGvPKLrbwaQ1ec7wUw
+Zd2/VGlpT6puPc6hPuqa8ghTKgAsYAaLgnnXMTsXgOi2ieu+KpOhBWUChZU8UgjT
+PFa7KjRzQ7xLoHd4+ZdkXIcb4VUMR8nEBNVQ2C18c4CNgGN6aYPpP++kFHJJi85F
+2jmD07ccl0DES2sPfDLpniZDin+eD8ij8UXviy9e8v4ssrXi/qNvP8eHSsDTUkT8
+zkMEs6ovVCGMZf/aie0RVaZ0h8G4n9UF2xk/+ASAxVcAl5Kwfy6g4/sno0BDWul7
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bml2LWx5b24zLmZyhihodHRwczov
+L2lkcC51bml2LWx5b24zLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQRoWeg
+Qi5urVmZRbLmZzQW2w0DkjANBgkqhkiG9w0BAQUFAAOCAQEAYA43hVTg4DIEtI5l
+1I2MMrZhXAkpihNEC8G2HTtpUAq2GeAKTzUzUyQ133V3JgY8XDkpCM8XhPqI6wAH
+5k9pOwKeePRjDWkycJYsBeCl5x1wspNqNGfbWEMfCALXeP8YI5annKFUBnit2VrX
+eXB9i4dKcDeYCVzKW1hd7meBbw6Iijwnxt7ZESzVzibWVYi/gB3zT2OLHjFhONj4
+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://unknown.site.com</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
new file mode 100644
index 00000000..f5079ba2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univ-orleans.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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="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>
+					      MIIDPDCCAiSgAwIBAgIVANWZeCtKF/UQd4fR6YuwUFezr4HpMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMTFHNoaWIudW5pdi1vcmxlYW5zLmZyMB4XDTExMDQxMTEy
+MDgzMFoXDTMxMDQxMTEyMDgzMFowHzEdMBsGA1UEAxMUc2hpYi51bml2LW9ybGVh
+bnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCTIQZAwSNXNbF
+4QOav/RSjyjZjSxLsQtUazKnrbz4NfBb2ne7rz6vCLsWL5ROCo6SxVvs3pXKNSUD
+vURq6o98KadI0MIn9b4NM5K/4pczaSlF1R6hw0IPYh5eYefIt4hOc92JXHUPn/AP
+fQc2xTiMT1ym5mEsPeAefwr0nkbdv/X7joxldaRNqmTgwqrtKacWVY/soMwtRB+m
+bFHd8bAQmnLTVGl/ZP26or3XaTspPkqnY6F2lg/0Zajrj2suV0zhxJ7h+yvEuQju
+GTDsB1+y7WUqV6e3ZYwAEirjX3gjK3cdehNYLukk1v9HVP3nFeiMjfHeAuLqWwoP
+oRwCxs9dAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWIudW5pdi1vcmxlYW5zLmZy
+hitodHRwczovL3NoaWIudW5pdi1vcmxlYW5zLmZyL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBS2+qObLJGIfmja7fzCOw56RXQlpzANBgkqhkiG9w0BAQUFAAOCAQEA
+RZ+y3gkKx9sZ+RCNCfcsqW5J13+vJw5tAog7tiNaeR92/gkPduQnV77R3O1Dc9m1
+97EMCsYfY6LReQOEHTy3yl3oJm/VPDlyaHS6pufnfLtf/PYoQEWhJDCNhA4ebJ8R
+fbi97IoQA3hHQPYwo1qBfZkCy10k2EzHz6hz9EZtEXEjMCcgFGFNhfDkNBWrmDln
+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://unknown.site.com</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
new file mode 100644
index 00000000..e57044fd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univ-paris3.fr-idp-shibboleth.xml
@@ -0,0 +1,58 @@
+<?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>
+      <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: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>
+					      MIIDNDCCAhygAwIBAgIVAMSFD1SXsksxsNe7dgs+bu0/1u4hMA0GCSqGSIb3DQEB
+BQUAMB0xGzAZBgNVBAMTEmlkcC51bml2LXBhcmlzMy5mcjAeFw0xMTEyMTUxNzE1
+MTZaFw0zMTEyMTUxNzE1MTZaMB0xGzAZBgNVBAMTEmlkcC51bml2LXBhcmlzMy5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJjhxfTL8BVpjd1mzrxA
+7zmEcJk8ekFMaUfPm6HL1ScUyiun5Fm9JJQBHEuCSH/VEPrKLNrxz4lctcWWvCyI
+mDk63MLPCBlEZMV8hiFxZt2/VEo1OsQL5eKVDPNBRIwBK8d8CYw/xOWEaiYOvlZa
+7e5fvjQNti0pwWsdGi5jo029tCFkApIeSidl9p/L6C0NIIR58T6cZvShCIIV1rHi
+4MSEdw2iR7w2YE84ljfooVcRhUDSpxMA+ym7FlH6IJD24w4tRrB/oDyQqLQTzEXB
+yb6RhwrLKUFb3KVBKwrq9uTRpEZWIEpWkgbH4KSsPWEGBGXc6CtKhXtcjRFMNuu4
+hXcCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnVuaXYtcGFyaXMzLmZyhilodHRw
+czovL2lkcC51bml2LXBhcmlzMy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+J54xxsuDg3aueO3Q3HHJvMzmqUUwDQYJKoZIhvcNAQEFBQADggEBAI+TkGwGCEWZ
+uthkU8kUaUwop79gqH2yBzSw0OOkRZ3Q3OPg8Qv/s7zD+46gv1b5/YbbzYfvViEq
+S9TthYeos4lqSZJTMPIMnbcF8TX0dCtJ/IKy9JNxEetKzSHWdWgkkm/93onk1gPo
+K0JNyD1AlCipNrHSnNmYkDYUjNzuC2ltXFmqrzBYD4NxkZzXhcnrqd5zxKdI6tQy
+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://unknown.site.com</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
new file mode 100644
index 00000000..8219b2cf
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris4.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">paris-sorbonne.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <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>
+					      MIIEfjCCA2agAwIBAgIQDoytgyQXDrxQwdffQSgBNTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDIxOTAwMDAwMFoXDTEzMDIxODIzNTk1OVowVzELMAkGA1UE
+BhMCRlIxDjAMBgNVBAcTBVBBUklTMRswGQYDVQQKExJVTklWRVJTSVRFIFBBUklT
+IDQxGzAZBgNVBAMTEmlkcC51bml2LXBhcmlzNC5mcjCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKqttSIJz1BQxcIHy3dNdnJd+0iaQlWU31Y2zsGckNjR
+YbW4lwMq5xcnqHwrgUp8PiaFBy6/jioXDpHs5ByrrLLE052hfeEB0W5AO5mN7Yqd
+URorS4LHo9JsUFrULl0haEF6FFoDD6ABR7djwerDccIebVoICvj9W1ypN8vPmo/P
+qaXZ0QKcJJjmbuxYxt+JnYQyQhqxZXgbGfelyclhfrCNZsjFmoLL2hvpIINAv3Al
+7xFBv1DlKpRImWAjHkqZtWzyGHNU3EryVBrjeoxlRQfVjCMqTnZ5O57bTZc7TK5Y
+eMlvB0syEnzC68HJ02baPgf1T94S2gD3nvFjfcNcJu8CAwEAAaOCAWUwggFhMB8G
+A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQ+ho3P8U/1
+4zqg7ukFkfl9eCelZDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
+AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAu
+dW5pdi1wYXJpczQuZnIwDQYJKoZIhvcNAQEFBQADggEBAHwUYz+yFi2FBkcFN3Km
+2qfIfiBsLFWB6IfkmQ67R1grVxUSlRIIyJ7L4IWrnzlSfua51Z8UJPvcu69n9eBX
+qZziEXS4ZAlDKF7w3eLV8lIy3PX35/k6MQeju9XutriZXn/d6j7tN3sn7hYp+2i3
++FffOhUyk30j9dUG3P17NpJBQ8vWjily3GNDwcjkZhWnoNLy23BssXqN7vkrc/8k
+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">univ-paris4.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">paris-sorbonne.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
+BhMCRlIxDjAMBgNVBAcTBVBBUklTMRswGQYDVQQKExJVTklWRVJTSVRFIFBBUklT
+IDQxGzAZBgNVBAMTEmlkcC51bml2LXBhcmlzNC5mcjCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKqttSIJz1BQxcIHy3dNdnJd+0iaQlWU31Y2zsGckNjR
+YbW4lwMq5xcnqHwrgUp8PiaFBy6/jioXDpHs5ByrrLLE052hfeEB0W5AO5mN7Yqd
+URorS4LHo9JsUFrULl0haEF6FFoDD6ABR7djwerDccIebVoICvj9W1ypN8vPmo/P
+qaXZ0QKcJJjmbuxYxt+JnYQyQhqxZXgbGfelyclhfrCNZsjFmoLL2hvpIINAv3Al
+7xFBv1DlKpRImWAjHkqZtWzyGHNU3EryVBrjeoxlRQfVjCMqTnZ5O57bTZc7TK5Y
+eMlvB0syEnzC68HJ02baPgf1T94S2gD3nvFjfcNcJu8CAwEAAaOCAWUwggFhMB8G
+A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQ+ho3P8U/1
+4zqg7ukFkfl9eCelZDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
+AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAu
+dW5pdi1wYXJpczQuZnIwDQYJKoZIhvcNAQEFBQADggEBAHwUYz+yFi2FBkcFN3Km
+2qfIfiBsLFWB6IfkmQ67R1grVxUSlRIIyJ7L4IWrnzlSfua51Z8UJPvcu69n9eBX
+qZziEXS4ZAlDKF7w3eLV8lIy3PX35/k6MQeju9XutriZXn/d6j7tN3sn7hYp+2i3
++FffOhUyk30j9dUG3P17NpJBQ8vWjily3GNDwcjkZhWnoNLy23BssXqN7vkrc/8k
+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://unknown.site.com</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
new file mode 100644
index 00000000..53a5279f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univ-paris8.fr-idp-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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="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>
+					      MIIEcTCCA1mgAwIBAgIQU6fzKCJW2smEB7nD2+nWADANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDYyNzAwMDAwMFoXDTE2MDYyNjIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAudW5pdi1w
+YXJpczguZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmo0SkZ0JM
+lY6h/s/GZ06X+OKLv3pvhob3myRVfK+dHO+PomnDiydgHo5lS5ihZCuUIGqjLMrm
+MB1oOrpMHFxYlVCAhqrt/4/EnY6niTSsnm38ngkzsONG5Rx4UPchpSRYm9TOKcuQ
+g/yDdi6iSrwqmMWJpuxOIt2HCfXFBTULCc6n18v2mg5Ah4FTssi81R8qBk5F1RzP
+l32jPA+X6G8gIJ4iGuNF+LgiHeNRcEHAuy9XLd7/4FH9DJdAjTwiA9D3E3tK4fx4
+wZC0sOacx775Um5C+UxMNftuObZcSLAMT1rsHzfJMdWxuxbzaub/AzwyYjl/tKSx
+vPMk3ez04E+5AgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUMArZEB/NP0dHX30H+1w0TzyO7uQwDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC51bml2LXBhcmlzOC5m
+cjANBgkqhkiG9w0BAQUFAAOCAQEAILdNZYfosh/VDwYL/imyGlgxmXvVr5qQZpEq
+8g/4KOwUkpbDi/rym3gffbNE/NsU8cl+REMrIPBcNe37E0ZpIav/+PVjfvxLpEH6
+6pBMFkpQEjJfBy1FuW6qiKSCeLmFVK9GkAFVDETtwR3+papXIcLiQpFiJvnCXRH4
+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://unknown.site.com</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-tours.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-tours.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..b9ec2131
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.univ-tours.fr-idp-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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="fr">Université de Tours</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDLzCCAhegAwIBAgIUVH5OPXLEAtiW4UVmoDzKej0fR7wwDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRaWRwLnVuaXYtdG91cnMuZnIwHhcNMDkwNjA5MTI0NTIx
+WhcNMjkwNjA5MTI0NTIxWjAcMRowGAYDVQQDExFpZHAudW5pdi10b3Vycy5mcjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJV+FLOks9NmLB17N7XlmI+E
+r7NgQKavtPYd75TgOu5ubqe2YYD7DoLrQQzalOs7dw7Q2b1Pd+DSbqKjthjdD/wm
+IrvbA3bddVtU0hurW+wOfcP/aqvODxOL2PjYgRucGu82UfocIxbjDQyKvAhS1wsR
+tz2p0rLdCGKevDJqeJsSC7JAGolSYmnpZHRRY/86qKuvO/5XxBFUxqAuplOD2Cyk
++SgMsyd1eRNgfNf18peOPuK/s7midkIoSNfmffQri/gqlxXrZujj7sYQawU1bAt6
+IGxxDfKsyzinTxSj/8wXUfO1YaaSZpoOzQI6s42CvqZf5fnLBAu5G7QmGVPSQL8C
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnVuaXYtdG91cnMuZnKGKGh0dHBzOi8v
+aWRwLnVuaXYtdG91cnMuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCJdjIn0
+Y6lWGricZa673uc04sZuMA0GCSqGSIb3DQEBBQUAA4IBAQAGMS23ntdqT1WC7zXy
+KvER9CkWn8VHr3/j8FgHxJ/Ny5+eAAp348PPgk4FIl5W3JAyg5ZwqZYUET34xXBd
+C66AZjpoQvuyXEtWWlhama0FFW4UMRKjYxGSFf8BJFmyMk4fRtwolbm9s+MWD4bz
+ZpQtX9RZhBibLqx6BROOvyVFDsXxT/SbR7sHIlZE4Vd9bis6QE2SAefj6qyehYPL
+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>
+					      MIIDLzCCAhegAwIBAgIUVH5OPXLEAtiW4UVmoDzKej0fR7wwDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRaWRwLnVuaXYtdG91cnMuZnIwHhcNMDkwNjA5MTI0NTIx
+WhcNMjkwNjA5MTI0NTIxWjAcMRowGAYDVQQDExFpZHAudW5pdi10b3Vycy5mcjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJV+FLOks9NmLB17N7XlmI+E
+r7NgQKavtPYd75TgOu5ubqe2YYD7DoLrQQzalOs7dw7Q2b1Pd+DSbqKjthjdD/wm
+IrvbA3bddVtU0hurW+wOfcP/aqvODxOL2PjYgRucGu82UfocIxbjDQyKvAhS1wsR
+tz2p0rLdCGKevDJqeJsSC7JAGolSYmnpZHRRY/86qKuvO/5XxBFUxqAuplOD2Cyk
++SgMsyd1eRNgfNf18peOPuK/s7midkIoSNfmffQri/gqlxXrZujj7sYQawU1bAt6
+IGxxDfKsyzinTxSj/8wXUfO1YaaSZpoOzQI6s42CvqZf5fnLBAu5G7QmGVPSQL8C
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnVuaXYtdG91cnMuZnKGKGh0dHBzOi8v
+aWRwLnVuaXYtdG91cnMuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCJdjIn0
+Y6lWGricZa673uc04sZuMA0GCSqGSIb3DQEBBQUAA4IBAQAGMS23ntdqT1WC7zXy
+KvER9CkWn8VHr3/j8FgHxJ/Ny5+eAAp348PPgk4FIl5W3JAyg5ZwqZYUET34xXBd
+C66AZjpoQvuyXEtWWlhama0FFW4UMRKjYxGSFf8BJFmyMk4fRtwolbm9s+MWD4bz
+ZpQtX9RZhBibLqx6BROOvyVFDsXxT/SbR7sHIlZE4Vd9bis6QE2SAefj6qyehYPL
+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://unknown.site.com</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
new file mode 100644
index 00000000..6ffbb1f7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unive.it-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDGzCCAgOgAwIBAgIUYUFQBvFR3QHBbGwgFllRXJ3//CowDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLnVuaXZlLml0MB4XDTEwMDcwNTA4MzU0NloXDTMw
+MDcwNTA4MzU0NlowFzEVMBMGA1UEAxMMaWRwLnVuaXZlLml0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAj58HXAaf1REMuIBm1+jfWiePJsBOs7IirZpI
+PSy98vHRKgDYiFEogp8+b5kF3tfF64dp+Fml5wXJEXsSwuN6wX0H6+1JHmvm80qp
+VyNhkwa/4baLuw4lmvxhs7+0kK+OXEAl0MJUUt01fS5zwZWEH+UxZocYeEU3H7Bb
+nvop27mdMybeWAkrdDfkMYEKXEkMLXmsKZpVwg5MvHV7PxzXRUvSAEHb9D3+lWDV
+hjClbSk6D820qVHJ9ub6myh3tU9npPu0xVVCi8j7+L78GsvB8if4wFmHD/gUK8Pg
+E2O59pjOqkct1Cc2EdrEBCYhaDsGFIEjAqVcUgVoJ7mtTROCzQIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAudW5pdmUuaXSGI2h0dHBzOi8vaWRwLnVuaXZlLml0L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSoLXPmrgrjGbVeAfR/XskwyDlmfzANBgkq
+hkiG9w0BAQUFAAOCAQEACGZHx1OQPjJWmafRP9kV4Z85ewvQdvPkD7rZTZLn+J4k
+PDVO28Mef7TL2AOfN9VUWurQPqCPU7+IUcR42vKH7eQPIEshwyYft5uD3CMrPNHi
+nJet2s+yXFCBS3jR+HbYpveq5uS3cRcgNCiIawe9dFfUfGALZ4wZ54xu2W0J6jPa
+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>
+MIIDGzCCAgOgAwIBAgIUYUFQBvFR3QHBbGwgFllRXJ3//CowDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLnVuaXZlLml0MB4XDTEwMDcwNTA4MzU0NloXDTMw
+MDcwNTA4MzU0NlowFzEVMBMGA1UEAxMMaWRwLnVuaXZlLml0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAj58HXAaf1REMuIBm1+jfWiePJsBOs7IirZpI
+PSy98vHRKgDYiFEogp8+b5kF3tfF64dp+Fml5wXJEXsSwuN6wX0H6+1JHmvm80qp
+VyNhkwa/4baLuw4lmvxhs7+0kK+OXEAl0MJUUt01fS5zwZWEH+UxZocYeEU3H7Bb
+nvop27mdMybeWAkrdDfkMYEKXEkMLXmsKZpVwg5MvHV7PxzXRUvSAEHb9D3+lWDV
+hjClbSk6D820qVHJ9ub6myh3tU9npPu0xVVCi8j7+L78GsvB8if4wFmHD/gUK8Pg
+E2O59pjOqkct1Cc2EdrEBCYhaDsGFIEjAqVcUgVoJ7mtTROCzQIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAudW5pdmUuaXSGI2h0dHBzOi8vaWRwLnVuaXZlLml0L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSoLXPmrgrjGbVeAfR/XskwyDlmfzANBgkq
+hkiG9w0BAQUFAAOCAQEACGZHx1OQPjJWmafRP9kV4Z85ewvQdvPkD7rZTZLn+J4k
+PDVO28Mef7TL2AOfN9VUWurQPqCPU7+IUcR42vKH7eQPIEshwyYft5uD3CMrPNHi
+nJet2s+yXFCBS3jR+HbYpveq5uS3cRcgNCiIawe9dFfUfGALZ4wZ54xu2W0J6jPa
+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>
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
new file mode 100644
index 00000000..a311975d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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="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>
+					      MIIDRDCCAiygAwIBAgIVAP2sGfoeCE9dQRA0FpVdm+UCBHNFMA0GCSqGSIb3DQEB
+BQUAMCExHzAdBgNVBAMTFmlkcC51bml2ZXJzaXRlLWx5b24uZnIwHhcNMTEwMzEw
+MTEyMzIxWhcNMzEwMzEwMTEyMzIxWjAhMR8wHQYDVQQDExZpZHAudW5pdmVyc2l0
+ZS1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu36fHWJ2
+j8l174LhbbLmqLR9Mc6O0RmAZGkpt+Wga7mGICSY+bk9TPK64vHBBfUdsx0HkVi3
+1EPVf2AK/lJqcd12YJIKy0yisQrxRGYCynF1nhyuVgrgl1kKo6LGjgxb9IRJU2BG
+xL168MWGzov867Ttdmty53ZmdfjTRGAoK7MmDrBInpWOtR6HcI7tKAGQlThsgbo6
+kfXobR6ntp0t90RNPaTUgm+oNlXXsEcMWsLbdeR+d6IxWx9xAPx4D7S+JmA+vAGI
+P/d/DNUXnvZA9o9ysqhMF4TmD9rNgBL9658h4hwS3OAOlbM9YViQPKmVsc9qBp5w
+y9y+qk73cTB+ZwIDAQABo3MwcTBQBgNVHREESTBHghZpZHAudW5pdmVyc2l0ZS1s
+eW9uLmZyhi1odHRwczovL2lkcC51bml2ZXJzaXRlLWx5b24uZnIvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFEanTWpekMShUedKb9mgslNYb/gGMA0GCSqGSIb3DQEB
+BQUAA4IBAQAU0hITe/utTwqDfRm70ZkGC1gVwPj7cVvQOrWT41dS158IsYuPZlQr
+p2398RDEob6XcfbuHVERXfL2WZTvg7CD7Ui1g4tM1AffUFauu0AjYW91LP88epsm
+opoZD5iGwCE8Xwyx36MfgQ2VsuxP64LM8r0H8kTBHbGsuvCjbvKNB6XmXoBHM9S1
+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://unknown.site.com</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.unoesc.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..91170d5b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIDMDCCAhigAwIBAgIVAKF0Ji/vZztY4mCNEZ7pPefws602MA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWlkcC51bm9lc2MuZWR1LmJyMB4XDTEzMDgyMDE0MDU0
+NFoXDTMzMDgyMDE0MDU0NFowHDEaMBgGA1UEAxMRaWRwLnVub2VzYy5lZHUuYnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrzalfKRn2m+07ik20IeYC
+ZRH0VTEHLlWsJpPqWjhcUv6cztdeE5yfHzzmqKpPUj+VROgS8N0WO7ET8v66naDv
+D8XwcJpUsWNTjObGT4ZtsuRe223I/mN9GAlDFW9EyRudEJ9JPkAu94ZWzcv/kX4b
+3m5OQKYPI3nqVnsXObowJhjJeOOPNFAq/uVa2mSSVNcpWgdGbMPcISWoW8mIk+e7
+j6R350cHy+jVmEJLkYorIIgUFAq4v5BXk6tcDUw7Zw+BmoKkSCqTXL6Mne7siSzt
+e4kFRDbrtYgC7xYoqUrbj/LAQE29iHvcci1E6x1hpeX1YssgrkXHSa4sS6bJD+nt
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bm9lc2MuZWR1LmJyhihodHRwczov
+L2lkcC51bm9lc2MuZWR1LmJyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSEKtwq
+Me8m63UoHRkKdnyxHXMbfjANBgkqhkiG9w0BAQUFAAOCAQEAQeayBPOHksOEXqL6
+9dMRRhsaJOsmEQV8FLQbED5fkIi+WmBvHZ+OUCzYgnYH391/1iL+/KqmIq2kRXFQ
+L5VjytIJrjGyE+PLuycinRAdWgfzCnV47vXZ5agYjsuPBRFH9EI2j7xcZm/Bao6Q
+EOJQJ1edlst14UuaTuPOFql+3mgcKNoTt7tXJggkehJqkCAV1fl1LC7q3Tnkj/rT
+tOPnCI2V0hFiMzPkuhtDDWd8r3/B/SCuBf/gDkQKTjIMemKKBIsrqGg13A9Br23f
+veKi8jp2UG9e1Ws1DXaGXlkGklegRePCGIKEBaggZ6Y59ZJBOoHGBnq8nodIcqo4
+gjfpFw==
+            </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>
+      
+MIIDMDCCAhigAwIBAgIVAKF0Ji/vZztY4mCNEZ7pPefws602MA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWlkcC51bm9lc2MuZWR1LmJyMB4XDTEzMDgyMDE0MDU0
+NFoXDTMzMDgyMDE0MDU0NFowHDEaMBgGA1UEAxMRaWRwLnVub2VzYy5lZHUuYnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrzalfKRn2m+07ik20IeYC
+ZRH0VTEHLlWsJpPqWjhcUv6cztdeE5yfHzzmqKpPUj+VROgS8N0WO7ET8v66naDv
+D8XwcJpUsWNTjObGT4ZtsuRe223I/mN9GAlDFW9EyRudEJ9JPkAu94ZWzcv/kX4b
+3m5OQKYPI3nqVnsXObowJhjJeOOPNFAq/uVa2mSSVNcpWgdGbMPcISWoW8mIk+e7
+j6R350cHy+jVmEJLkYorIIgUFAq4v5BXk6tcDUw7Zw+BmoKkSCqTXL6Mne7siSzt
+e4kFRDbrtYgC7xYoqUrbj/LAQE29iHvcci1E6x1hpeX1YssgrkXHSa4sS6bJD+nt
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bm9lc2MuZWR1LmJyhihodHRwczov
+L2lkcC51bm9lc2MuZWR1LmJyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSEKtwq
+Me8m63UoHRkKdnyxHXMbfjANBgkqhkiG9w0BAQUFAAOCAQEAQeayBPOHksOEXqL6
+9dMRRhsaJOsmEQV8FLQbED5fkIi+WmBvHZ+OUCzYgnYH391/1iL+/KqmIq2kRXFQ
+L5VjytIJrjGyE+PLuycinRAdWgfzCnV47vXZ5agYjsuPBRFH9EI2j7xcZm/Bao6Q
+EOJQJ1edlst14UuaTuPOFql+3mgcKNoTt7tXJggkehJqkCAV1fl1LC7q3Tnkj/rT
+tOPnCI2V0hFiMzPkuhtDDWd8r3/B/SCuBf/gDkQKTjIMemKKBIsrqGg13A9Br23f
+veKi8jp2UG9e1Ws1DXaGXlkGklegRePCGIKEBaggZ6Y59ZJBOoHGBnq8nodIcqo4
+gjfpFw==
+                    
+            </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>
diff --git a/swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.xml
new file mode 100644
index 00000000..54e37d41
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.xml
@@ -0,0 +1,119 @@
+<?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>
+      <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
+                            YW5kIEthcG9kaXN0cmlhbiBVbml2ZXJzaXR5IG9mIEF0aGVucyBDQSBSMTAeFw0x
+                            NDA1MjcwMDAwMDBaFw0xNjA1MjYxMDUzNDlaMGAxCzAJBgNVBAYTAkdSMTcwNQYD
+                            VQQKEy5OYXRpb25hbCBhbmQgS2Fwb2Rpc3RyaWFuIFVuaXZlcnNpdHkgb2YgQXRo
+                            ZW5zMRgwFgYDVQQDEw9VT0EgaWRwIHNlcnZpY2UwggEiMA0GCSqGSIb3DQEBAQUA
+                            A4IBDwAwggEKAoIBAQCpFnIjMy+Hp7ZBii7LIm+FqVlRiL9tGew8L2gmevWvDTkH
+                            yTnIvAfOr4hmaZ075R44FqEDL03tiZMsMyFbsDL1uYuJA1bJY4cM66I88+aIWwaL
+                            MKuI1voOvClbx08y4c+gI5+epurxju0NaVcVqgUJuLzAcnbIHmaSiC9NEuvlYo9Z
+                            tkFX8g1nFoUatPEoZseJfukdyufqyb59hGsNtlw9cHnY+gy+69Y4ZmxU7uXmm7oE
+                            0IRoQDBeCp7hiGJePYcQeJHNxWZiO3/SgP6p9G3qO9oSHu892DZ8uPP3CrvwgpW0
+                            6uVGR+7i8IGjjMOdFiTTWtlvfFJmJ/ETKYe3511JAgMBAAGjggGKMIIBhjALBgNV
+                            HQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
+                            BBSt7IktXk4pgSt+ECuSqC4RSNQG1zAfBgNVHSMEGDAWgBTWQ2tZXkiPvrW/wHtw
+                            u/Sr8SNBizBrBggrBgEFBQcBAQRfMF0wIQYIKwYBBQUHMAGGFWh0dHA6Ly9vY3Nw
+                            LmhhcmljYS5ncjA4BggrBgEFBQcwAoYsaHR0cDovL3d3dy5oYXJpY2EuZ3IvY2Vy
+                            dHMvSGFyaWNhVW9hQ0FSMS5wZW0wQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2Ny
+                            bHYxLmhhcmljYS5nci9IYXJpY2FVb2FDQVIxL2NybHYxLmRlci5jcmwwTwYDVR0g
+                            BEgwRjBEBgwrBgEEAYHPEQEAAgcwNDAyBggrBgEFBQcCARYmaHR0cDovL3d3dy5o
+                            YXJpY2EuZ3IvZG9jdW1lbnRzL0NQUy5waHAwFQYDVR0RBA4wDIIKaWRwLnVvYS5n
+                            cjANBgkqhkiG9w0BAQUFAAOCAQEAaSENditQfkHEUNah+TqAhJziq/UC6UMh11PR
+                            1MIHmmQ7rTEiusr1E2sKkYqJA3UPD9aWhre6aNVNqCuViEfTvbc3YwytTu0vPqMt
+                            h23lNL4RQQHLpPpeUUDoN0vV/PlFUNeHnh/o7JtrCOTcdS7mQgkJvxq6kWwdDuQx
+                            0ZLgZQfyCHUlUToinr5oNCG7FAy2LRjXrzyOKGurX3WSY2FPAvWe1KSqdUS8/ZgI
+                            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>
+                            MIIFATCCA+mgAwIBAgIIEms+5gN0OgUwDQYJKoZIhvcNAQEFBQAwgZIxCzAJBgNV
+                            BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
+                            SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE9MDsGA1UEAxM0TmF0aW9uYWwg
+                            YW5kIEthcG9kaXN0cmlhbiBVbml2ZXJzaXR5IG9mIEF0aGVucyBDQSBSMTAeFw0x
+                            NDA1MjcwMDAwMDBaFw0xNjA1MjYxMDUzNDlaMGAxCzAJBgNVBAYTAkdSMTcwNQYD
+                            VQQKEy5OYXRpb25hbCBhbmQgS2Fwb2Rpc3RyaWFuIFVuaXZlcnNpdHkgb2YgQXRo
+                            ZW5zMRgwFgYDVQQDEw9VT0EgaWRwIHNlcnZpY2UwggEiMA0GCSqGSIb3DQEBAQUA
+                            A4IBDwAwggEKAoIBAQCpFnIjMy+Hp7ZBii7LIm+FqVlRiL9tGew8L2gmevWvDTkH
+                            yTnIvAfOr4hmaZ075R44FqEDL03tiZMsMyFbsDL1uYuJA1bJY4cM66I88+aIWwaL
+                            MKuI1voOvClbx08y4c+gI5+epurxju0NaVcVqgUJuLzAcnbIHmaSiC9NEuvlYo9Z
+                            tkFX8g1nFoUatPEoZseJfukdyufqyb59hGsNtlw9cHnY+gy+69Y4ZmxU7uXmm7oE
+                            0IRoQDBeCp7hiGJePYcQeJHNxWZiO3/SgP6p9G3qO9oSHu892DZ8uPP3CrvwgpW0
+                            6uVGR+7i8IGjjMOdFiTTWtlvfFJmJ/ETKYe3511JAgMBAAGjggGKMIIBhjALBgNV
+                            HQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
+                            BBSt7IktXk4pgSt+ECuSqC4RSNQG1zAfBgNVHSMEGDAWgBTWQ2tZXkiPvrW/wHtw
+                            u/Sr8SNBizBrBggrBgEFBQcBAQRfMF0wIQYIKwYBBQUHMAGGFWh0dHA6Ly9vY3Nw
+                            LmhhcmljYS5ncjA4BggrBgEFBQcwAoYsaHR0cDovL3d3dy5oYXJpY2EuZ3IvY2Vy
+                            dHMvSGFyaWNhVW9hQ0FSMS5wZW0wQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2Ny
+                            bHYxLmhhcmljYS5nci9IYXJpY2FVb2FDQVIxL2NybHYxLmRlci5jcmwwTwYDVR0g
+                            BEgwRjBEBgwrBgEEAYHPEQEAAgcwNDAyBggrBgEFBQcCARYmaHR0cDovL3d3dy5o
+                            YXJpY2EuZ3IvZG9jdW1lbnRzL0NQUy5waHAwFQYDVR0RBA4wDIIKaWRwLnVvYS5n
+                            cjANBgkqhkiG9w0BAQUFAAOCAQEAaSENditQfkHEUNah+TqAhJziq/UC6UMh11PR
+                            1MIHmmQ7rTEiusr1E2sKkYqJA3UPD9aWhre6aNVNqCuViEfTvbc3YwytTu0vPqMt
+                            h23lNL4RQQHLpPpeUUDoN0vV/PlFUNeHnh/o7JtrCOTcdS7mQgkJvxq6kWwdDuQx
+                            0ZLgZQfyCHUlUToinr5oNCG7FAy2LRjXrzyOKGurX3WSY2FPAvWe1KSqdUS8/ZgI
+                            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>
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
new file mode 100644
index 00000000..24893142
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uolia.london.ac.uk-shibboleth.xml
@@ -0,0 +1,107 @@
+<?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>
+      <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
+						LnVvbGlhLmxvbmRvbi5hYy51azAeFw0xMjAyMTYxNDQ4MDhaFw0yMjAyMTUxNDQ4
+						MDhaMIGBMQswCQYDVQQGEwJHQjEPMA0GA1UEBxMGTG9uZG9uMR0wGwYDVQQKExRV
+						bml2ZXJzaXR5IG9mIExvbmRvbjEhMB8GA1UECxMYSW50ZXJuYXRpb25hbCBQcm9n
+						cmFtbWVzMR8wHQYDVQQDExZpZHAudW9saWEubG9uZG9uLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn5qfRa40+d5zS+HjcdhMRsk2upuvwyZE
+						lycpoQCDzoZDuibi4gqhG4BK2eiHlBJcGjKSnwXatm0PGQcqao4NaE+mq0amh9yp
+						+MdVAgXiZx0VgofBF5oexfd73YAEDUS71uja4n39CfQHBZZldy7afj+ycKntEaw5
+						8J8e+zrIpEXIxssVf5Mn8zdM1N6YmL7OpR3obQ/CacdsL9OVS2zVT4zYdFEuLiTo
+						cz8deEoeA4MoHbS0QbEqcY8J8efkasIGxJ4hlrQr3dvKNIa+VB+I61jxTxyP0SsD
+						q06VhHShAlNVwv7GAeTkMFSO7qnLFTQ4kGhqOZVH1NdUQf2NMfrnYwIDAQABo4Hh
+						MIHeMB0GA1UdDgQWBBQsPgm9wW+1E/XPmWY90pp4oU6cqjCBrgYDVR0jBIGmMIGj
+						gBQsPgm9wW+1E/XPmWY90pp4oU6cqqGBh6SBhDCBgTELMAkGA1UEBhMCR0IxDzAN
+						BgNVBAcTBkxvbmRvbjEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBMb25kb24xITAf
+						BgNVBAsTGEludGVybmF0aW9uYWwgUHJvZ3JhbW1lczEfMB0GA1UEAxMWaWRwLnVv
+						bGlhLmxvbmRvbi5hYy51a4IBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUA
+						A4IBAQBToW390/2NKxG7JN+6aW6BMxSLTZOYtF1GwRA3Sc0I0i2mpYx9rpHOBm0K
+						Dlc1gH9+u1uTS/ZaSDCjXZXW30P4qAWL0cIkcLLbcmxCVlahIPQ2ooM5UPMARy63
+						hIAoYKJKzpKz9gDboaw2kGiDCaWyObwApygAtfchYjQ5FPrMoRADdXf4ePUfCPBY
+						Gk5gc/76YD31gApIdoI0RprtU2rOv85PrkyFLmJzirv7RUuG4b55e7RC9bGBMqU5
+						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>
+						MIIEYTCCA0mgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBgTELMAkGA1UEBhMCR0Ix
+						DzANBgNVBAcTBkxvbmRvbjEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBMb25kb24x
+						ITAfBgNVBAsTGEludGVybmF0aW9uYWwgUHJvZ3JhbW1lczEfMB0GA1UEAxMWaWRw
+						LnVvbGlhLmxvbmRvbi5hYy51azAeFw0xMjAyMTYxNDQ4MDhaFw0yMjAyMTUxNDQ4
+						MDhaMIGBMQswCQYDVQQGEwJHQjEPMA0GA1UEBxMGTG9uZG9uMR0wGwYDVQQKExRV
+						bml2ZXJzaXR5IG9mIExvbmRvbjEhMB8GA1UECxMYSW50ZXJuYXRpb25hbCBQcm9n
+						cmFtbWVzMR8wHQYDVQQDExZpZHAudW9saWEubG9uZG9uLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn5qfRa40+d5zS+HjcdhMRsk2upuvwyZE
+						lycpoQCDzoZDuibi4gqhG4BK2eiHlBJcGjKSnwXatm0PGQcqao4NaE+mq0amh9yp
+						+MdVAgXiZx0VgofBF5oexfd73YAEDUS71uja4n39CfQHBZZldy7afj+ycKntEaw5
+						8J8e+zrIpEXIxssVf5Mn8zdM1N6YmL7OpR3obQ/CacdsL9OVS2zVT4zYdFEuLiTo
+						cz8deEoeA4MoHbS0QbEqcY8J8efkasIGxJ4hlrQr3dvKNIa+VB+I61jxTxyP0SsD
+						q06VhHShAlNVwv7GAeTkMFSO7qnLFTQ4kGhqOZVH1NdUQf2NMfrnYwIDAQABo4Hh
+						MIHeMB0GA1UdDgQWBBQsPgm9wW+1E/XPmWY90pp4oU6cqjCBrgYDVR0jBIGmMIGj
+						gBQsPgm9wW+1E/XPmWY90pp4oU6cqqGBh6SBhDCBgTELMAkGA1UEBhMCR0IxDzAN
+						BgNVBAcTBkxvbmRvbjEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBMb25kb24xITAf
+						BgNVBAsTGEludGVybmF0aW9uYWwgUHJvZ3JhbW1lczEfMB0GA1UEAxMWaWRwLnVv
+						bGlhLmxvbmRvbi5hYy51a4IBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUA
+						A4IBAQBToW390/2NKxG7JN+6aW6BMxSLTZOYtF1GwRA3Sc0I0i2mpYx9rpHOBm0K
+						Dlc1gH9+u1uTS/ZaSDCjXZXW30P4qAWL0cIkcLLbcmxCVlahIPQ2ooM5UPMARy63
+						hIAoYKJKzpKz9gDboaw2kGiDCaWyObwApygAtfchYjQ5FPrMoRADdXf4ePUfCPBY
+						Gk5gc/76YD31gApIdoI0RprtU2rOv85PrkyFLmJzirv7RUuG4b55e7RC9bGBMqU5
+						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>
diff --git a/swamid-interfederations-2.0/idp.upce.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.upce.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..9b56a7fe
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.upce.cz-idp-shibboleth.xml
@@ -0,0 +1,143 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc: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>
+    <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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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>
+MIIEfzCCA2egAwIBAgIRANdGQbGBCwgib2T1mhEqCcMwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMDkxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UEAxMLY2FzLnVwY2Uu
+Y3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCldaLlEiSu8v6fIKmO
+w77MSNAC5Dbdy+rOcn1aNIqacXNOMOy+Nrky4mW8lm99WSd32JS4NuKVzRz6CFdJ
+1Xw5S8zw7wx0v2Shs6TkLdaj+vtiW4L3VEzrjv7EbpBGeVTwZ2QoqAkb6FxVPo66
+IItHvMJhL9FvzcSAlVNHBY4wwRkVRNr3e+sF++dbDG0n0IfwhV1BKxZkrS+tDcsu
+ye0Q3nFyRegRXJL5DKOtyvn8m2m3FLr4j2YwfIyV3jP010i5LmfiH94h7luOi4iw
+NekD8S6ypSXW8Unbb6mF+s82d6ekiuRExmoyNA1JLhiZnkvgB9IRQNIxetAoOJhi
+3yxNAgMBAAGjggGDMIIBfzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO5
+7TAdBgNVHQ4EFgQUg+mGzfsymEgLzFJxq0ZNXjNrCggwDgYDVR0PAQH/BAQDAgWg
+MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
+A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
+oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
+CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
+Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
+cy50ZXJlbmEub3JnMDEGA1UdEQQqMCiCC2Nhcy51cGNlLmN6ggtpZHAudXBjZS5j
+eoIMaWRwMi51cGNlLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQB0ON3JmGudQFnSxWvu
+HkRy7kq6+sV/WaV3TGYyRc6K7qpmjSP2OeT9fn86P28+jFpkA3GyXjjonBM8tn18
+hUc5UWW+8kYIrOmrZBvC4vemPLJX1azn8MYk29szd2BP+lpuzbDoDXVKf4g0pBZd
+KIGZ73yLT+O2bHOlpJGR+igW0nrpFAqPmlDyjsusiiXo1ynEkskpIMQyGFRkUfEz
+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>
+MIIEfzCCA2egAwIBAgIRANdGQbGBCwgib2T1mhEqCcMwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMDkxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UEAxMLY2FzLnVwY2Uu
+Y3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCldaLlEiSu8v6fIKmO
+w77MSNAC5Dbdy+rOcn1aNIqacXNOMOy+Nrky4mW8lm99WSd32JS4NuKVzRz6CFdJ
+1Xw5S8zw7wx0v2Shs6TkLdaj+vtiW4L3VEzrjv7EbpBGeVTwZ2QoqAkb6FxVPo66
+IItHvMJhL9FvzcSAlVNHBY4wwRkVRNr3e+sF++dbDG0n0IfwhV1BKxZkrS+tDcsu
+ye0Q3nFyRegRXJL5DKOtyvn8m2m3FLr4j2YwfIyV3jP010i5LmfiH94h7luOi4iw
+NekD8S6ypSXW8Unbb6mF+s82d6ekiuRExmoyNA1JLhiZnkvgB9IRQNIxetAoOJhi
+3yxNAgMBAAGjggGDMIIBfzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO5
+7TAdBgNVHQ4EFgQUg+mGzfsymEgLzFJxq0ZNXjNrCggwDgYDVR0PAQH/BAQDAgWg
+MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
+A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
+oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
+CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
+Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
+cy50ZXJlbmEub3JnMDEGA1UdEQQqMCiCC2Nhcy51cGNlLmN6ggtpZHAudXBjZS5j
+eoIMaWRwMi51cGNlLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQB0ON3JmGudQFnSxWvu
+HkRy7kq6+sV/WaV3TGYyRc6K7qpmjSP2OeT9fn86P28+jFpkA3GyXjjonBM8tn18
+hUc5UWW+8kYIrOmrZBvC4vemPLJX1azn8MYk29szd2BP+lpuzbDoDXVKf4g0pBZd
+KIGZ73yLT+O2bHOlpJGR+igW0nrpFAqPmlDyjsusiiXo1ynEkskpIMQyGFRkUfEz
+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>
diff --git a/swamid-interfederations-2.0/idp.upmc.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.upmc.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..af84e084
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.upmc.fr-idp-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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="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>
+					      MIIDGDCCAgCgAwIBAgIVAN1AZOqK88JKnAIFyCt2qtu7oPjcMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC51cG1jLmZyMB4XDTA5MTIyOTEyMDUwN1oXDTI5
+MTIyOTEyMDUwN1owFjEUMBIGA1UEAxMLaWRwLnVwbWMuZnIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCoXzLI2AobGhWJRoofrUz1FYBOgAk68Q5TIZ+h
+GvBAJj7/23JkOyaz6vaGqls+iqycDPHx3grJ6KsDbIoCPcgbyb3vyAJOkxT49fzp
+C0RGJVKGPZoNaCV2KXSO49Il5yWb7zIwXBKBn5QSRSOE7S2YINHzzlGVj2SWCaCJ
+LY3K7R+O5TMaiqqKXcO20tmme7FDckHc/fPw8H+R8r9TgLvoPbCIqjnvCHsj+192
+WNtzs99sMwZ21xaMo0QS9VsX6JMmsJViQwNyAgE6gxbG1SEWD2G1ja7bW/o9LuUG
+JvDjfDmzNj316AeYMWnzY+275B2fr/JcawcmmF3aK6xPjqRZAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC51cG1jLmZyhiJodHRwczovL2lkcC51cG1jLmZyL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQHbFPNG0miSxq1PVDJGqFQbHEdtjANBgkqhkiG
+9w0BAQUFAAOCAQEAiznIMyBVikg8EfABaENTvB0ND8rZN1cVNIU/LoiBHL6DF7bQ
+hGd7JManqhNH5TdHXmfK5CsIZMBGbYIMhyTDxsW3ASNR5Ip2Lpq+9YgTSi+k4FzM
+VYCRAJw9mjTrDfCVVG2ZdN0FaWLezJhGG0iJDlmpzhDDpBsAt88Aj6uqXJrKGp3Z
+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>
+					      MIIDGDCCAgCgAwIBAgIVAN1AZOqK88JKnAIFyCt2qtu7oPjcMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC51cG1jLmZyMB4XDTA5MTIyOTEyMDUwN1oXDTI5
+MTIyOTEyMDUwN1owFjEUMBIGA1UEAxMLaWRwLnVwbWMuZnIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCoXzLI2AobGhWJRoofrUz1FYBOgAk68Q5TIZ+h
+GvBAJj7/23JkOyaz6vaGqls+iqycDPHx3grJ6KsDbIoCPcgbyb3vyAJOkxT49fzp
+C0RGJVKGPZoNaCV2KXSO49Il5yWb7zIwXBKBn5QSRSOE7S2YINHzzlGVj2SWCaCJ
+LY3K7R+O5TMaiqqKXcO20tmme7FDckHc/fPw8H+R8r9TgLvoPbCIqjnvCHsj+192
+WNtzs99sMwZ21xaMo0QS9VsX6JMmsJViQwNyAgE6gxbG1SEWD2G1ja7bW/o9LuUG
+JvDjfDmzNj316AeYMWnzY+275B2fr/JcawcmmF3aK6xPjqRZAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC51cG1jLmZyhiJodHRwczovL2lkcC51cG1jLmZyL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQHbFPNG0miSxq1PVDJGqFQbHEdtjANBgkqhkiG
+9w0BAQUFAAOCAQEAiznIMyBVikg8EfABaENTvB0ND8rZN1cVNIU/LoiBHL6DF7bQ
+hGd7JManqhNH5TdHXmfK5CsIZMBGbYIMhyTDxsW3ASNR5Ip2Lpq+9YgTSi+k4FzM
+VYCRAJw9mjTrDfCVVG2ZdN0FaWLezJhGG0iJDlmpzhDDpBsAt88Aj6uqXJrKGp3Z
+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://unknown.site.com</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
new file mode 100644
index 00000000..e10d066c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uqam.ca-idp-shibboleth.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-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>
+      <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>
+MIIDFzCCAf+gAwIBAgIUWJxXbZuGIlRqAdUeM+MQM60cBjIwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwLnVxYW0uY2EwHhcNMDkwNjAzMTUxNDI3WhcNMjkw
+NjAzMTUxNDI3WjAWMRQwEgYDVQQDEwtpZHAudXFhbS5jYTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALTvLffPT+7KOUB1E4/VfYGDMTj8qyRceKedTLxG
+5y1gVngrl1wi3s3qF7aDV8P0SJmJJTtOplxnNNUCTPFyEtKD8TtUAL00Uk2xqB7c
+zgXjXpa5LB0obAz4tkOrrpD/WAffCfjaxiUY7JngPozOsvjCfCp/Yh77Q7wfa1Zx
+Dx65/vQCcgFUaXxcb7vq6ilohDcjQPzMJJvfFjJK2Rg+uNPoEbms15ebQzHfQ4Ci
+UbE+vQ5LxkruxNnOiq0d/C4hizKn5uC7oPxNjpEFe4y5cv5BG78KHkr9sKcWSVwg
+0k9ZtvXS2zGkQPM24f8g9WaF389JJlExaqKms+NPZyNpBqkCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwLnVxYW0uY2GGImh0dHBzOi8vaWRwLnVxYW0uY2EvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFDVR7RoTZA/UsE/TttH8CaUzxeQ/MA0GCSqGSIb3
+DQEBBQUAA4IBAQBoEgpeo8w8SCBHmi/ShGkcMB9A2JFCpUfspkNOQQ7GSAsl2ix1
+/nY0120ooY4V7OWaRyRMkxtL9ycKwMMbJBREj6qiZCeDh4fy5KtyWJePI0+piKUG
+NMl4+fKSXD27kO0aClaPkYiSZeSWfoZEFWq+99FJ8A9uyr9lTyjjkXil87LfoYdg
+iJPe/MZXHYtLYGJcpD8eaIBshbjWWetxlfus6fDAkmu2cVZGwYiMhT/v0CTzhl3C
+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>
+MIIDFzCCAf+gAwIBAgIUWJxXbZuGIlRqAdUeM+MQM60cBjIwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwLnVxYW0uY2EwHhcNMDkwNjAzMTUxNDI3WhcNMjkw
+NjAzMTUxNDI3WjAWMRQwEgYDVQQDEwtpZHAudXFhbS5jYTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALTvLffPT+7KOUB1E4/VfYGDMTj8qyRceKedTLxG
+5y1gVngrl1wi3s3qF7aDV8P0SJmJJTtOplxnNNUCTPFyEtKD8TtUAL00Uk2xqB7c
+zgXjXpa5LB0obAz4tkOrrpD/WAffCfjaxiUY7JngPozOsvjCfCp/Yh77Q7wfa1Zx
+Dx65/vQCcgFUaXxcb7vq6ilohDcjQPzMJJvfFjJK2Rg+uNPoEbms15ebQzHfQ4Ci
+UbE+vQ5LxkruxNnOiq0d/C4hizKn5uC7oPxNjpEFe4y5cv5BG78KHkr9sKcWSVwg
+0k9ZtvXS2zGkQPM24f8g9WaF389JJlExaqKms+NPZyNpBqkCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwLnVxYW0uY2GGImh0dHBzOi8vaWRwLnVxYW0uY2EvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFDVR7RoTZA/UsE/TttH8CaUzxeQ/MA0GCSqGSIb3
+DQEBBQUAA4IBAQBoEgpeo8w8SCBHmi/ShGkcMB9A2JFCpUfspkNOQQ7GSAsl2ix1
+/nY0120ooY4V7OWaRyRMkxtL9ycKwMMbJBREj6qiZCeDh4fy5KtyWJePI0+piKUG
+NMl4+fKSXD27kO0aClaPkYiSZeSWfoZEFWq+99FJ8A9uyr9lTyjjkXil87LfoYdg
+iJPe/MZXHYtLYGJcpD8eaIBshbjWWetxlfus6fDAkmu2cVZGwYiMhT/v0CTzhl3C
+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>
diff --git a/swamid-interfederations-2.0/idp.urca.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.urca.br-idp-shibboleth.xml
new file mode 100644
index 00000000..d6fbea33
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.urca.br-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIC5DCCAcwCAQAwDQYJKoZIhvcNAQEFBQAwODENMAsGA1UEChMEVVJDQTEMMAoG
+A1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcyMzE0
+NDMwNVoXDTE3MDcyMjE0NDMwNVowODENMAsGA1UEChMEVVJDQTEMMAoGA1UECxMD
+Q1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA587p9iqaMIWfFLDlFeSo4dp9k0p3Mdc45vL7+hSiTjCT
+L/GqgQNSRyLvDzwVttKglapDi2GrPSifMlT1lrP6xJIg22NzhV5CmlDis2FF0DZB
+jCnxhfXVpbMGGqwg2B8quc6FItanXjUbRD+leyI8+/jUUfb++XpYo5q6cQSc+jP2
+yzIxh1nRPd7r89S6C36b5LMxGOT178VD7jI9AI78p/v8sbIDi8qE5xvg65HrGgyQ
+7LamfWhHfKzzAecxkJA+BgIW1H+f9srfPXtTL2EUem4p1sSI+XgrhkWXkYc4fZ/L
+qGFt3o7PmBaPmctNe126ljxzwXq17fWdqvzCVCbHbQIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQCrtCCtbhDkpx6uvImEuQ91Bl8YXTxJLOxO4G/cRSvPdQ5pE7umbyLm
+OhFEXa79Ssf3jmDHf/J23X2SJHsqKR/5NbeSyPjPBiDuSDy/Pav0oKMcPvkEXXsp
+oDwJV6Tx1q6ngm10GvU62R5shb7uG1SOUO8A9/pElqiekGziCbsyEqrgl4lfEDRQ
+DWRRPsto+fYtJ3u4acVvDRODzIS/eJBbDyRIGby8WojHR1GQ8zteK8QZbSlCP9YP
+nI8CCcU5SWNtrokzTBcf0Vb71RV+JaxGLod48itA1dStZHDr4N8tcLO6c2xYEwGo
+xJ+47QxRYCpCLQW0WKXIYNcPqobfLQsA
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
+NDMwNVoXDTE3MDcyMjE0NDMwNVowODENMAsGA1UEChMEVVJDQTEMMAoGA1UECxMD
+Q1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA587p9iqaMIWfFLDlFeSo4dp9k0p3Mdc45vL7+hSiTjCT
+L/GqgQNSRyLvDzwVttKglapDi2GrPSifMlT1lrP6xJIg22NzhV5CmlDis2FF0DZB
+jCnxhfXVpbMGGqwg2B8quc6FItanXjUbRD+leyI8+/jUUfb++XpYo5q6cQSc+jP2
+yzIxh1nRPd7r89S6C36b5LMxGOT178VD7jI9AI78p/v8sbIDi8qE5xvg65HrGgyQ
+7LamfWhHfKzzAecxkJA+BgIW1H+f9srfPXtTL2EUem4p1sSI+XgrhkWXkYc4fZ/L
+qGFt3o7PmBaPmctNe126ljxzwXq17fWdqvzCVCbHbQIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQCrtCCtbhDkpx6uvImEuQ91Bl8YXTxJLOxO4G/cRSvPdQ5pE7umbyLm
+OhFEXa79Ssf3jmDHf/J23X2SJHsqKR/5NbeSyPjPBiDuSDy/Pav0oKMcPvkEXXsp
+oDwJV6Tx1q6ngm10GvU62R5shb7uG1SOUO8A9/pElqiekGziCbsyEqrgl4lfEDRQ
+DWRRPsto+fYtJ3u4acVvDRODzIS/eJBbDyRIGby8WojHR1GQ8zteK8QZbSlCP9YP
+nI8CCcU5SWNtrokzTBcf0Vb71RV+JaxGLod48itA1dStZHDr4N8tcLO6c2xYEwGo
+xJ+47QxRYCpCLQW0WKXIYNcPqobfLQsA
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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.ut-capitole.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..f03b3108
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ut-capitole.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse1.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <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>
+					      MIIDNDCCAhygAwIBAgIVALxLFXefFrTC9DNxwQJ5rG/49hVDMA0GCSqGSIb3DQEB
+BQUAMB0xGzAZBgNVBAMTEmlkcC51dC1jYXBpdG9sZS5mcjAeFw0xMjA2MDcxNDUz
+NTBaFw0zMjA2MDcxNDUzNTBaMB0xGzAZBgNVBAMTEmlkcC51dC1jYXBpdG9sZS5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwkRsoTpYYbJf4f+0Vz
+z7ZaAZrsQeDWLgtpyjwOcBtdaRvZzpFNHfp2P/zQhPTdvE0HMU4gaVV5wkCDsKRH
+LolPH3UcgGpZgJ8A3aSm9InPNTMnkFWWASuUssivJvxK30lE/w3JcIzyZwNAwZbP
+syvpXN+mZxY0r1J2wD+cMhubSVVTM7aiGKm8nKZpRP/9GEr9TlKiaq39VA9YXdZt
+q7g1sWgU51eRRmuBCg3SuLaqNabWxrE9u+b04QfPs2LnMduLcykIhOhgs2V3TnLA
+UUGZYnkv9heRngdqbGtR0dK5XgzF9eRHrG9feW5swumQ47fehGO6F+wz8+C6JZ1s
+3s0CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnV0LWNhcGl0b2xlLmZyhilodHRw
+czovL2lkcC51dC1jYXBpdG9sZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+pQc7jVB0iT0c/A1SJwl6+dQRHl0wDQYJKoZIhvcNAQEFBQADggEBAIY0wIOPgk0d
+w3jg69RkQO+RShp5gO1IMozCDrO/A/oYWo8jQUO6tVXQP9SVhQmRxLIXHIt6uhEn
+3Y5lVdrySy2CzdQbcXi4E4COkJPCWhfy6O5yVFlYXDAl1KDic5CMRaH9fJ6kjAMN
+8TTSUvH0tO/ZAbLMeveuSUQG0uVZ+8hA3hciH0CoRrk3XoJhlM+rrIaWQc3W23rd
+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://unknown.site.com</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.utia.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.utia.cas.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..73596151
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.utia.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <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://jiftach.cas.cz/loga/logo-utia-44.png</mdui:Logo>
+        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-utia-411.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAPWAIIDpvyOIAKgxvS8uAGvErbFIMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkcC51dGlhLmNhcy5jejAeFw0xNDAxMjExMzQ5MzFa
+Fw0zNDAxMjExMzQ5MzFaMBoxGDAWBgNVBAMTD2lkcC51dGlhLmNhcy5jejCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIMlroofDB1hzFwO3vg/GyYuWHzq
+ltlkURfEPJOAnKG/W2ax+ljT+4OvFochFR3Tn2z9k9BzjK2TNbK4SSHnojSn/7ml
+UEe5GcSqUzWRz7N6IPWqq95bpHAjttP9GChbwn9TWbiim+rom7azfJ5GMNpECE6x
+J6hnZLLqe9tH3MRjHq/g1EgoYwkRN4p+GH50zpPfZmqdChoxN4+ipiwodGHUGLbK
+qjrCkusd3nx9hjkZNsB9Xwcws4HJhnfKmUaRXccBeXI+93rOVTVgRdzC4AoV18xZ
+DT4mZJHi0rAr+S8k/qHpYapp4BJX8FlGxzfUM/KtJft6aupc2KkacFeJzXkCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRwLnV0aWEuY2FzLmN6hiZodHRwczovL2lkcC51
+dGlhLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQULF0CAFze9Eoavjce
+J1fkA5ZwtzEwDQYJKoZIhvcNAQEFBQADggEBAEdPs/pVXrBbxB8Gs7V3a9gGn7Va
+4svNZ7mosAAWvlXPLGKzdmp8GdqH1UNjNZouxSXJDVC4sbOKcFiyu7gr+Bc+SbhH
+vd5/D4EzzaF5LrfCcy4z0z/Z2GmoejJUkysYTnvfDJwUk57JKfeF7JP0WTxtGwBX
+us9wwyhp00Lvq91NAddg0YCHgYkNNJ+nEqinRTUHtF1/NM0kOxj5Bldl+Ea5ofMi
+4xHhOx6IKjHfhU+xSBtA5JalGefjXT8reS2EPc8NY8YQE7fxytldlc3C4nkLilwp
+p6lZaMAngitaUamaZdgJTVokp6H6D9o6qommaXW6BFw0RskMVAO4QKWnanc=
+
+                    </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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utia.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utia.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utia.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.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 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utia.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAPWAIIDpvyOIAKgxvS8uAGvErbFIMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkcC51dGlhLmNhcy5jejAeFw0xNDAxMjExMzQ5MzFa
+Fw0zNDAxMjExMzQ5MzFaMBoxGDAWBgNVBAMTD2lkcC51dGlhLmNhcy5jejCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIMlroofDB1hzFwO3vg/GyYuWHzq
+ltlkURfEPJOAnKG/W2ax+ljT+4OvFochFR3Tn2z9k9BzjK2TNbK4SSHnojSn/7ml
+UEe5GcSqUzWRz7N6IPWqq95bpHAjttP9GChbwn9TWbiim+rom7azfJ5GMNpECE6x
+J6hnZLLqe9tH3MRjHq/g1EgoYwkRN4p+GH50zpPfZmqdChoxN4+ipiwodGHUGLbK
+qjrCkusd3nx9hjkZNsB9Xwcws4HJhnfKmUaRXccBeXI+93rOVTVgRdzC4AoV18xZ
+DT4mZJHi0rAr+S8k/qHpYapp4BJX8FlGxzfUM/KtJft6aupc2KkacFeJzXkCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRwLnV0aWEuY2FzLmN6hiZodHRwczovL2lkcC51
+dGlhLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQULF0CAFze9Eoavjce
+J1fkA5ZwtzEwDQYJKoZIhvcNAQEFBQADggEBAEdPs/pVXrBbxB8Gs7V3a9gGn7Va
+4svNZ7mosAAWvlXPLGKzdmp8GdqH1UNjNZouxSXJDVC4sbOKcFiyu7gr+Bc+SbhH
+vd5/D4EzzaF5LrfCcy4z0z/Z2GmoejJUkysYTnvfDJwUk57JKfeF7JP0WTxtGwBX
+us9wwyhp00Lvq91NAddg0YCHgYkNNJ+nEqinRTUHtF1/NM0kOxj5Bldl+Ea5ofMi
+4xHhOx6IKjHfhU+xSBtA5JalGefjXT8reS2EPc8NY8YQE7fxytldlc3C4nkLilwp
+p6lZaMAngitaUamaZdgJTVokp6H6D9o6qommaXW6BFw0RskMVAO4QKWnanc=
+
+                    </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:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utia.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 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.utorauth.utoronto.ca-shibboleth.xml b/swamid-interfederations-2.0/idp.utorauth.utoronto.ca-shibboleth.xml
new file mode 100644
index 00000000..bb8afb71
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.utorauth.utoronto.ca-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-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.utorauth.utoronto.ca/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2013-05-23T00: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>
+      <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/about-uoft.htm</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>utoronto.ca</mdui:DomainHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDTDCCAjSgAwIBAgIVAKBtctYdDHOwvkS2Cae5mn6+SG12MA0GCSqGSIb3DQEB
+BQUAMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0aC51dG9yb250by5jYTAeFw0xMDAy
+MTcwNDM2MzZaFw0zMDAyMTcwNDM2MzZaMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0
+aC51dG9yb250by5jYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANsi
+lyIZHSDZPNT7GJAnB6sydHDoezYsO5k6OqQaY1iVJnx8dFkY+mdI5zwmUgDV3LKY
+M+vh/1v1tDx/5G6eVPckZPn6WobTd+GQgwUsXFRGZ5svkHSxQhAzBuc4ltFAFXPI
+JnbgD29oukIE3S6YCo7pQBORbbizsoHbwZ2pzk1u6iEbf7DuiPy8i8+CjdHHs3BS
+wXJ9cG7Yah9ouXK8g44Jy6KqoFKhPckKbZfJ2reojSAQEZm4hu6Rn38PRSAIFJFb
+HFZlqDpvFnLwQXkrB1bcoWoePPRjwkUPWqPjOkqBmTgSRlitKNUpnrQMjzckTaVX
+70r73+hA2L0YbWp2Xt0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLnV0b3JhdXRo
+LnV0b3JvbnRvLmNhhi9odHRwczovL2lkcC51dG9yYXV0aC51dG9yb250by5jYS9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUrp0AR4X36F4QukpWTPrl7SpIVLUwDQYJ
+KoZIhvcNAQEFBQADggEBAJl0Wi8qk8D02AaPu0XdqoQekjvmZFyi6rcoCKDzCKWd
+jyuF+gqEPWIWg+Ee8zqVvx0XNXx6YqqU5WyXjp1vvcNTE33+kq8eCMGWHrpW+mwn
+FwMXexviS6z/TLsSMwTbbTb7G900iMl81B7++v9KkRzg5KSx3UILKr3t39hmf/nP
+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:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0: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
+aC51dG9yb250by5jYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANsi
+lyIZHSDZPNT7GJAnB6sydHDoezYsO5k6OqQaY1iVJnx8dFkY+mdI5zwmUgDV3LKY
+M+vh/1v1tDx/5G6eVPckZPn6WobTd+GQgwUsXFRGZ5svkHSxQhAzBuc4ltFAFXPI
+JnbgD29oukIE3S6YCo7pQBORbbizsoHbwZ2pzk1u6iEbf7DuiPy8i8+CjdHHs3BS
+wXJ9cG7Yah9ouXK8g44Jy6KqoFKhPckKbZfJ2reojSAQEZm4hu6Rn38PRSAIFJFb
+HFZlqDpvFnLwQXkrB1bcoWoePPRjwkUPWqPjOkqBmTgSRlitKNUpnrQMjzckTaVX
+70r73+hA2L0YbWp2Xt0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLnV0b3JhdXRo
+LnV0b3JvbnRvLmNhhi9odHRwczovL2lkcC51dG9yYXV0aC51dG9yb250by5jYS9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUrp0AR4X36F4QukpWTPrl7SpIVLUwDQYJ
+KoZIhvcNAQEFBQADggEBAJl0Wi8qk8D02AaPu0XdqoQekjvmZFyi6rcoCKDzCKWd
+jyuF+gqEPWIWg+Ee8zqVvx0XNXx6YqqU5WyXjp1vvcNTE33+kq8eCMGWHrpW+mwn
+FwMXexviS6z/TLsSMwTbbTb7G900iMl81B7++v9KkRzg5KSx3UILKr3t39hmf/nP
+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>mike.wiseman@utoronto.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uwic.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uwic.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..376ca5dd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uwic.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uwic.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwic.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cardiff Metropolitan University - Legacy</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://idplogos.uwic.ac.uk/uwic-logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idplogos.uwic.ac.uk/icon1.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIETjCCAzagAwIBAgIJAOKMQIaI+YwZMA0GCSqGSIb3DQEBBQUAMIGnMQswCQYD
+						VQQGEwJHQjEYMBYGA1UECBMPU291dGggR2xhbW9yZ2FuMRAwDgYDVQQHEwdDYXJk
+						aWZmMSgwJgYDVQQKEx9DYXJkaWZmIE1ldHJvcG9saXRhbiBVbml2ZXJzaXR5MSkw
+						JwYDVQQLEyBMaWJyYXJ5IGFuZCBJbmZvcm1hdGlvbiBTZXJ2aWNlczEXMBUGA1UE
+						AxMOaWRwLnV3aWMuYWMudWswHhcNMTMwMzEzMTEzMjMxWhcNMjMwMzExMTEzMjMx
+						WjCBpzELMAkGA1UEBhMCR0IxGDAWBgNVBAgTD1NvdXRoIEdsYW1vcmdhbjEQMA4G
+						A1UEBxMHQ2FyZGlmZjEoMCYGA1UEChMfQ2FyZGlmZiBNZXRyb3BvbGl0YW4gVW5p
+						dmVyc2l0eTEpMCcGA1UECxMgTGlicmFyeSBhbmQgSW5mb3JtYXRpb24gU2Vydmlj
+						ZXMxFzAVBgNVBAMTDmlkcC51d2ljLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA0lIdNY81HsvrJSjLbnbyFJFGZ++JKTC4Xowt0lsxRTRcjo7u
+						Jm06LkkZdVMpbU/ILkfup83H+P+uBXLQCLE7QyYrE5r6HC4B4cVRi8NdCbA/IzAn
+						djlvtu9jQ8y/zvLZ7ipsRT4yluN8taxdQ6YfPjJ7xFFcIpecjWaEjJTpACxUg0wp
+						b73CykEmgrJ9KEYmp5CndF1WxlEBBoH+ZakmQaG7EtD+0jMOc0oMn1z001aTcLe0
+						ArWKnv+ig/b3r24EVA8qecW6lEDwM5HDiWl4DrwCCeOeg0UvSZPuySkRerI6QAYP
+						6E7DXmoc9obOfu6/iA5Q5Wdbk4Mjne9uaPf1pwIDAQABo3sweTAJBgNVHRMEAjAA
+						MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
+						BgNVHQ4EFgQUBc6fEv98zv3jMeehNHHh5UhAriQwHwYDVR0jBBgwFoAUBc6fEv98
+						zv3jMeehNHHh5UhAriQwDQYJKoZIhvcNAQEFBQADggEBAAmdsLMlPUMY6QFglDkG
+						1wzwf6Be9vuY90/CR4JK2CfnXVOVxEEuAGS2plhvCe/+yq4IGOpLUo2Jf9ev4H5p
+						zT0hbTjM5WJVOWr9i0WSRdc3hLAF0ObrSPG7bk6toXDdyRa+KqVefW14cuuqbphd
+						YgsYLEshlegwM91bwEl9MVFeRU/ofGbEznPAyKuEeLdevIr4pPMwsUZ8PEwj2VhG
+						+8CsO5d/kwKQy/A31pr4fEO/gCXQ45kHnxajkh2+kA8e1n0iJ90vrS/PCM5UgmtT
+						zvZdBEn8RzielQU2UWjysX1qqiXpbkUnY1ji/piMZMRYCQFLcV7G0yPV6/7GF+EU
+						FWI=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uwic.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uwic.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uwic.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwic.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uwic.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uwic.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwic.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIETjCCAzagAwIBAgIJAOKMQIaI+YwZMA0GCSqGSIb3DQEBBQUAMIGnMQswCQYD
+						VQQGEwJHQjEYMBYGA1UECBMPU291dGggR2xhbW9yZ2FuMRAwDgYDVQQHEwdDYXJk
+						aWZmMSgwJgYDVQQKEx9DYXJkaWZmIE1ldHJvcG9saXRhbiBVbml2ZXJzaXR5MSkw
+						JwYDVQQLEyBMaWJyYXJ5IGFuZCBJbmZvcm1hdGlvbiBTZXJ2aWNlczEXMBUGA1UE
+						AxMOaWRwLnV3aWMuYWMudWswHhcNMTMwMzEzMTEzMjMxWhcNMjMwMzExMTEzMjMx
+						WjCBpzELMAkGA1UEBhMCR0IxGDAWBgNVBAgTD1NvdXRoIEdsYW1vcmdhbjEQMA4G
+						A1UEBxMHQ2FyZGlmZjEoMCYGA1UEChMfQ2FyZGlmZiBNZXRyb3BvbGl0YW4gVW5p
+						dmVyc2l0eTEpMCcGA1UECxMgTGlicmFyeSBhbmQgSW5mb3JtYXRpb24gU2Vydmlj
+						ZXMxFzAVBgNVBAMTDmlkcC51d2ljLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA0lIdNY81HsvrJSjLbnbyFJFGZ++JKTC4Xowt0lsxRTRcjo7u
+						Jm06LkkZdVMpbU/ILkfup83H+P+uBXLQCLE7QyYrE5r6HC4B4cVRi8NdCbA/IzAn
+						djlvtu9jQ8y/zvLZ7ipsRT4yluN8taxdQ6YfPjJ7xFFcIpecjWaEjJTpACxUg0wp
+						b73CykEmgrJ9KEYmp5CndF1WxlEBBoH+ZakmQaG7EtD+0jMOc0oMn1z001aTcLe0
+						ArWKnv+ig/b3r24EVA8qecW6lEDwM5HDiWl4DrwCCeOeg0UvSZPuySkRerI6QAYP
+						6E7DXmoc9obOfu6/iA5Q5Wdbk4Mjne9uaPf1pwIDAQABo3sweTAJBgNVHRMEAjAA
+						MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
+						BgNVHQ4EFgQUBc6fEv98zv3jMeehNHHh5UhAriQwHwYDVR0jBBgwFoAUBc6fEv98
+						zv3jMeehNHHh5UhAriQwDQYJKoZIhvcNAQEFBQADggEBAAmdsLMlPUMY6QFglDkG
+						1wzwf6Be9vuY90/CR4JK2CfnXVOVxEEuAGS2plhvCe/+yq4IGOpLUo2Jf9ev4H5p
+						zT0hbTjM5WJVOWr9i0WSRdc3hLAF0ObrSPG7bk6toXDdyRa+KqVefW14cuuqbphd
+						YgsYLEshlegwM91bwEl9MVFeRU/ofGbEznPAyKuEeLdevIr4pPMwsUZ8PEwj2VhG
+						+8CsO5d/kwKQy/A31pr4fEO/gCXQ45kHnxajkh2+kA8e1n0iJ90vrS/PCM5UgmtT
+						zvZdBEn8RzielQU2UWjysX1qqiXpbkUnY1ji/piMZMRYCQFLcV7G0yPV6/7GF+EU
+						FWI=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uwic.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uwic.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md: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 - Legacy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwic.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.uwl.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uwl.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..7af27063
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uwl.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkFVbsCDSQPh7lQRG/+MSvuXLRmP0fouZ
+						EHLD6q6WT/9/5VA0dGeBP0/jdQWUOgtRVsWszgKkQL9k7MQERK6qkJJFXxrTEvXZ
+						Thk4ATeCkx/X865yr4oA/149sVkL7g0ll3soccxPn64yyLg/RKzDBjurt6TogqRh
+						5ig9V5Xi4R1eGIyVDBQpsmRO5i3n8wy84iMXfFc1vZ1/4ghA/gDD9zA959OGMxTL
+						XXXo3HUMINWCbZm5uJC7sxDd2tDnCRm/zk+euO69RO9s7bwNSlJnqxQah7Ii3g3Y
+						4YuDeCTfHMBDmXelvQw1aPoDq3j/u/FCER2ZlSHSnPs2UNadXV5IGQIDAQABo2Ew
+						XzA+BgNVHREENzA1gg1pZHAudXdsLmFjLnVrhiRodHRwczovL2lkcC51d2wuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHXq/u7Qc+QH1JehKu4iPcxj3WkD
+						MA0GCSqGSIb3DQEBBQUAA4IBAQA/eNXfq/Qk9kWzb/40xD2rOUneppySpdgbt0Wr
+						jL6OsJTRASxbWFZl2WYthnDCN9SV7tkDlZNp+k1JXdyYL/UzDZu3q2vo0JissFKY
+						3adVBMZ351y/CcONpX9khXqosN+txwkGvTX30x/nZ4Qg3vP18NrVbcXW8+Q4c5iz
+						mJxz70gW6HwoHf0M+Ee1H+HJywnUUfy1Yf6urYmvHXXbCzeeHeBf83a6rdSteY+Y
+						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>
+						MIIDIDCCAgigAwIBAgIVAJusaLWH0l8DLgcyT2qPjzTl3AF9MA0GCSqGSIb3DQEB
+						BQUAMBgxFjAUBgNVBAMTDWlkcC51d2wuYWMudWswHhcNMTQwNTE0MDg1MjM1WhcN
+						MzQwNTE0MDg1MjM1WjAYMRYwFAYDVQQDEw1pZHAudXdsLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkFVbsCDSQPh7lQRG/+MSvuXLRmP0fouZ
+						EHLD6q6WT/9/5VA0dGeBP0/jdQWUOgtRVsWszgKkQL9k7MQERK6qkJJFXxrTEvXZ
+						Thk4ATeCkx/X865yr4oA/149sVkL7g0ll3soccxPn64yyLg/RKzDBjurt6TogqRh
+						5ig9V5Xi4R1eGIyVDBQpsmRO5i3n8wy84iMXfFc1vZ1/4ghA/gDD9zA959OGMxTL
+						XXXo3HUMINWCbZm5uJC7sxDd2tDnCRm/zk+euO69RO9s7bwNSlJnqxQah7Ii3g3Y
+						4YuDeCTfHMBDmXelvQw1aPoDq3j/u/FCER2ZlSHSnPs2UNadXV5IGQIDAQABo2Ew
+						XzA+BgNVHREENzA1gg1pZHAudXdsLmFjLnVrhiRodHRwczovL2lkcC51d2wuYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHXq/u7Qc+QH1JehKu4iPcxj3WkD
+						MA0GCSqGSIb3DQEBBQUAA4IBAQA/eNXfq/Qk9kWzb/40xD2rOUneppySpdgbt0Wr
+						jL6OsJTRASxbWFZl2WYthnDCN9SV7tkDlZNp+k1JXdyYL/UzDZu3q2vo0JissFKY
+						3adVBMZ351y/CcONpX9khXqosN+txwkGvTX30x/nZ4Qg3vP18NrVbcXW8+Q4c5iz
+						mJxz70gW6HwoHf0M+Ee1H+HJywnUUfy1Yf6urYmvHXXbCzeeHeBf83a6rdSteY+Y
+						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>
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
new file mode 100644
index 00000000..af327a92
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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>
+						MIIDaDCCAlCgAwIBAgIIYbFoeRooWYAwDQYJKoZIhvcNAQEFBQAwSzExMC8GA1UE
+						CgwoVW5pdmVyc2l0eSBvZiB0aGUgV2VzdCBvZiBTY290bGFuZCAoVVdTKTEWMBQG
+						A1UEAwwNaWRwLnV3cy5hYy51azAeFw0xMzAyMTUxNDEyNTlaFw0yMzAyMTUxNDEy
+						NTlaMEsxMTAvBgNVBAoMKFVuaXZlcnNpdHkgb2YgdGhlIFdlc3Qgb2YgU2NvdGxh
+						bmQgKFVXUykxFjAUBgNVBAMMDWlkcC51d3MuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCwkKLmB8Bmhsi8GGv6r72hYbHGkMbgQ/J3AwxM7B6B
+						lc4QcGTRY8ziyZ1zcP9tmcSnVb5yWrYdPt49TEaH0qWJ7Uw6UDy5xSMVIAmSowYK
+						uXkuIJVX+zIOAeQ6VfTF/jAfU7W3fTHGL8fyeFXScQXnDWltAmBDO59cnFwb6eur
+						GRPeoixry+rtPyJTSXPEespZr/DTA35a3ydb0FNOR6aAgIQsYxiLLRGDFhy8lF+Y
+						7PwC4y9uVf8gA2f3CTAFpxr78M68WDQNkN2XOgZyrdVf1/3iWhCtsfg2W16nyfAy
+						1RWCPsgb9IOgsazZMK4SctNZFcBg0kgnj79cvQuKMRXdAgMBAAGjUDBOMB0GA1Ud
+						DgQWBBTxj3GMfJYQ+SHcCJ/NPmkVh7WNvzAfBgNVHSMEGDAWgBTxj3GMfJYQ+SHc
+						CJ/NPmkVh7WNvzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBB1boI
+						lcTo5EIRUKvFbYlmiXSEGJmh26lsUT3kUzJZm3EKH9kr4+jUciG2SJGnF2Z278f+
+						Cfl495RuGRxuBZcnMOsF7DxiPUPexD5tgUc1R/mY0qIADopPt5xHAro8DtLsk0Ha
+						ThBZmY5mpajnMiP8uPhjMLImy4nmq9PizV6YRo6z989ZrimkXWcTaMlM0zws0Qvm
+						aiDs9JdN9vWNYv0E003ekVuKYCuyItCQgNbxY6kY5H6gDybnUUY8lhS4tFwnYRph
+						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>
+						MIIDaDCCAlCgAwIBAgIIYbFoeRooWYAwDQYJKoZIhvcNAQEFBQAwSzExMC8GA1UE
+						CgwoVW5pdmVyc2l0eSBvZiB0aGUgV2VzdCBvZiBTY290bGFuZCAoVVdTKTEWMBQG
+						A1UEAwwNaWRwLnV3cy5hYy51azAeFw0xMzAyMTUxNDEyNTlaFw0yMzAyMTUxNDEy
+						NTlaMEsxMTAvBgNVBAoMKFVuaXZlcnNpdHkgb2YgdGhlIFdlc3Qgb2YgU2NvdGxh
+						bmQgKFVXUykxFjAUBgNVBAMMDWlkcC51d3MuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCwkKLmB8Bmhsi8GGv6r72hYbHGkMbgQ/J3AwxM7B6B
+						lc4QcGTRY8ziyZ1zcP9tmcSnVb5yWrYdPt49TEaH0qWJ7Uw6UDy5xSMVIAmSowYK
+						uXkuIJVX+zIOAeQ6VfTF/jAfU7W3fTHGL8fyeFXScQXnDWltAmBDO59cnFwb6eur
+						GRPeoixry+rtPyJTSXPEespZr/DTA35a3ydb0FNOR6aAgIQsYxiLLRGDFhy8lF+Y
+						7PwC4y9uVf8gA2f3CTAFpxr78M68WDQNkN2XOgZyrdVf1/3iWhCtsfg2W16nyfAy
+						1RWCPsgb9IOgsazZMK4SctNZFcBg0kgnj79cvQuKMRXdAgMBAAGjUDBOMB0GA1Ud
+						DgQWBBTxj3GMfJYQ+SHcCJ/NPmkVh7WNvzAfBgNVHSMEGDAWgBTxj3GMfJYQ+SHc
+						CJ/NPmkVh7WNvzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBB1boI
+						lcTo5EIRUKvFbYlmiXSEGJmh26lsUT3kUzJZm3EKH9kr4+jUciG2SJGnF2Z278f+
+						Cfl495RuGRxuBZcnMOsF7DxiPUPexD5tgUc1R/mY0qIADopPt5xHAro8DtLsk0Ha
+						ThBZmY5mpajnMiP8uPhjMLImy4nmq9PizV6YRo6z989ZrimkXWcTaMlM0zws0Qvm
+						aiDs9JdN9vWNYv0E003ekVuKYCuyItCQgNbxY6kY5H6gDybnUUY8lhS4tFwnYRph
+						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>
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
new file mode 100644
index 00000000..ed8ef90f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uxbridge.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,96 @@
+<?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>
+      <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
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnsE3nHinfWPqK7JfCUdq
+						q4o5aiqFt6lXkXVsFQLbSHfIz3Cf2kgndwqULQnSyBlyELbUVktdFQuHfve+qKJb
+						hnYGFMbOpIqAHnlvc2LfhsZ1+H/C/B9gnzhjRVdgSEsG71R6GtidFmuRQeFvqTkg
+						x+rtlgva2Iz2ZFE2n3dN9Fw+gNaqHfL3GEFewIECHuTdhbn/dJTXnogBZR+RQ/u1
+						xTyuOM2IYyULmwiDb5X6koX0O/5yC/Pgj/vQ+7A4ZSKmpFYtF1d3PXLJ5x5pPlm1
+						tw6MNivuAe8V+6IZeEOdZsM3NosiBLFiA0YsFdqXzPNFqVt7hFURH3KbqciMur5T
+						+QIDAQABo2swaTAdBgNVHQ4EFgQUiUoY92tgFoq4JqVfu9gSJmdlXS4wSAYDVR0R
+						BEEwP4ISaWRwLnV4YnJpZGdlLmFjLnVrhilodHRwczovL2lkcC51eGJyaWRnZS5h
+						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAA7+wTS76kWJq
+						XgjsoyeCqrxQrSIwx6eL4QKQvgAVv8QuvXbAf4LeX+70pMY5iZ67ZEN8U/Hukq/J
+						gya6DSiAFPViTJnACZMXFRogS1EkC+kLG1dcPPmqY2tweg6SDsMTwHOB9WbaAt+Q
+						iNwQfBjlaEFHfPE6lo+C3rWEScABiHn0V6FWODuUxTqPaFwPIvM2insjUAWGM62U
+						Aa488QsFI+qKCnntrvZcoEAyWmG/d5i/jK8MohytrC1khQ56VlYVFlXG2/05m3Bq
+						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>
+						MIIDMzCCAhugAwIBAgIUZwOkMlPz3cSvnZG/flZHZc+acwkwDQYJKoZIhvcNAQEF
+						BQAwHTEbMBkGA1UEAwwSaWRwLnV4YnJpZGdlLmFjLnVrMB4XDTE1MDEyNjA5MTYw
+						OVoXDTM1MDEyNjA5MTYwOVowHTEbMBkGA1UEAwwSaWRwLnV4YnJpZGdlLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnsE3nHinfWPqK7JfCUdq
+						q4o5aiqFt6lXkXVsFQLbSHfIz3Cf2kgndwqULQnSyBlyELbUVktdFQuHfve+qKJb
+						hnYGFMbOpIqAHnlvc2LfhsZ1+H/C/B9gnzhjRVdgSEsG71R6GtidFmuRQeFvqTkg
+						x+rtlgva2Iz2ZFE2n3dN9Fw+gNaqHfL3GEFewIECHuTdhbn/dJTXnogBZR+RQ/u1
+						xTyuOM2IYyULmwiDb5X6koX0O/5yC/Pgj/vQ+7A4ZSKmpFYtF1d3PXLJ5x5pPlm1
+						tw6MNivuAe8V+6IZeEOdZsM3NosiBLFiA0YsFdqXzPNFqVt7hFURH3KbqciMur5T
+						+QIDAQABo2swaTAdBgNVHQ4EFgQUiUoY92tgFoq4JqVfu9gSJmdlXS4wSAYDVR0R
+						BEEwP4ISaWRwLnV4YnJpZGdlLmFjLnVrhilodHRwczovL2lkcC51eGJyaWRnZS5h
+						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAA7+wTS76kWJq
+						XgjsoyeCqrxQrSIwx6eL4QKQvgAVv8QuvXbAf4LeX+70pMY5iZ67ZEN8U/Hukq/J
+						gya6DSiAFPViTJnACZMXFRogS1EkC+kLG1dcPPmqY2tweg6SDsMTwHOB9WbaAt+Q
+						iNwQfBjlaEFHfPE6lo+C3rWEScABiHn0V6FWODuUxTqPaFwPIvM2insjUAWGM62U
+						Aa488QsFI+qKCnntrvZcoEAyWmG/d5i/jK8MohytrC1khQ56VlYVFlXG2/05m3Bq
+						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>
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
new file mode 100644
index 00000000..392aae48
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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: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>
+					      MIIDMDCCAhigAwIBAgIVAO3N41irRpARAo+XP9yzoR89gA0sMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWlkcC52ZXQtYWxmb3J0LmZyMB4XDTE0MDYwNjA4NDcz
+NVoXDTM0MDYwNjA4NDczNVowHDEaMBgGA1UEAxMRaWRwLnZldC1hbGZvcnQuZnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDMy3shCyhtNVjXK6/6gSc
+seewwAOZRAPaOppoj+iGJ+261cOu/JthyfDkRnxXvuDkbwatFyqzGBAjZUWrjj9F
+vpLA8AhKFn555ZdFaEz613xB1Ixt2erYh0/B7n54jMKX/R6puVfBPqviYagJBBav
+Ge2tNJu2Q2/qjkWBf9tIE0ZrKAXQJWYwAiaWIFa4nECbmlEq2Y5iyA/Um6xLRwLZ
+jPPr0CNDE86h8z4HTppc5q6Vam7mN4wHlKUWlf6Ie4zPy7WnW6Bp1gxqkx1zGeeA
+pqHYd3H3Mw6Nxpa3W1CUsIXdIYSKpo/ahfpipK8ci5DExUgfjG+IUMnGcoACdX2X
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC52ZXQtYWxmb3J0LmZyhihodHRwczov
+L2lkcC52ZXQtYWxmb3J0LmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQdpcAH
+JJCWpA6ERBlywLRbThojDTANBgkqhkiG9w0BAQUFAAOCAQEAeVSp+V5olBI0kcyV
+02igfUKwnrCD116/yABfvo8lpLCVhTI0Hydfyywq9duJNZnpmtlNdgRN+d+OUnx3
+hlDvg1BAh1jPObwa0e9i4KtAr6fZHVxs3TczaUW2V+qdzQCPDj2y+qkEeFyCFEoP
+tAv7a/xGeAqQ4dupq2j6RlqfB62GdZGhfvzLJIUCz4MkH+X2SSRoAwrTUwPkeeqa
+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://unknown.site.com</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.vib.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml
new file mode 100644
index 00000000..da7afd8c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-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>
+      <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,/9j/4QQ5RXhpZgAATU0AKgAAAAgADAEAAAMAAAABA2IAAAEBAAMAAAABA+gAAAECAAMAAAADAAAAngEGAAMAAAABAAIAAAESAAMAAAABAAEAAAEVAAMAAAABAAMAAAEaAAUAAAABAAAApAEbAAUAAAABAAAArAEoAAMAAAABAAIAAAExAAIAAAAeAAAAtAEyAAIAAAAUAAAA0odpAAQAAAABAAAA6AAAASAACAAIAAgALcbAAAAnEAAtxsAAACcQQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykAMjAxNDowNToxOSAxNTo1NTo0OAAAAAAEkAAABwAAAAQwMjIxoAEAAwAAAAH//wAAoAIABAAAAAEAAAAQoAMABAAAAAEAAAAQAAAAAAAAAAYBAwADAAAAAQAGAAABGgAFAAAAAQAAAW4BGwAFAAAAAQAAAXYBKAADAAAAAQACAAACAQAEAAAAAQAAAX4CAgAEAAAAAQAAArMAAAAAAAAASAAAAAEAAABIAAAAAf/Y/+0ADEFkb2JlX0NNAAL/7gAOQWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMVExMYEQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4OFBEMDAwMDBERDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAAQABADASIAAhEBAxEB/90ABAAB/8QBPwAAAQUBAQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAABAAIDBAUGBwgJCgsQAAEEAQMCBAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0coLRQwclklPw4fFjczUWorKDJkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZmdoaWprbG1ub2N0dXZ3eHl6e3x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRShsUIjwVLR8DMkYuFygpJDUxVjczTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwDVuovsvv8A1y/1BbYHAVWxo53uY6l9jP7C0KsLJPS8e7IvqNeK5925jH1WXN/mf1qvdW6rIrtc39Jvt/m0VmE3Jy8uq5jm34z7H5ILjsFZDrMSyn977T/4F6dyqvuppwcMMqBqsxauo2NrJNhHrVOsrL/p3MZZlOyPo2fzX8yny5rNOQjKHDGGsZjIDf2YsWSP/PaeHlPbEzQJyCqr9k8k4P8A/9n/7QwUUGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAA8cAVoAAxslRxwCAAACAAIAOEJJTQQlAAAAAAAQ/OEfici3yXgvNGI0B1h36zhCSU0EOgAAAAABGQAAABAAAAABAAAAAAALcHJpbnRPdXRwdXQAAAAFAAAAAFBzdFNib29sAQAAAABJbnRlZW51bQAAAABJbnRlAAAAAENscm0AAAAPcHJpbnRTaXh0ZWVuQml0Ym9vbAAAAAALcHJpbnRlck5hbWVURVhUAAAAGwBcAFwAdABvAHQAbwBcAEMAYQBuAG8AbgAgAEYAbABvAG8AcgAgADEAIABDAG8AbABvAHIAAAAAAA9wcmludFByb29mU2V0dXBPYmpjAAAADABQAHIAbwBvAGYAIABTAGUAdAB1AHAAAAAAAApwcm9vZlNldHVwAAAAAQAAAABCbHRuZW51bQAAAAxidWlsdGluUHJvb2YAAAAJcHJvb2ZDTVlLADhCSU0EOwAAAAACLQAAABAAAAABAAAAAAAScHJpbnRPdXRwdXRPcHRpb25zAAAAFwAAAABDcHRuYm9vbAAAAAAAQ2xicmJvb2wAAAAAAFJnc01ib29sAAAAAABDcm5DYm9vbAAAAAAAQ250Q2Jvb2wAAAAAAExibHNib29sAAAAAABOZ3R2Ym9vbAAAAAAARW1sRGJvb2wAAAAAAEludHJib29sAAAAAABCY2tnT2JqYwAAAAEAAAAAAABSR0JDAAAAAwAAAABSZCAgZG91YkBv4AAAAAAAAAAAAEdybiBkb3ViQG/gAAAAAAAAAAAAQmwgIGRvdWJAb+AAAAAAAAAAAABCcmRUVW50RiNSbHQAAAAAAAAAAAAAAABCbGQgVW50RiNSbHQAAAAAAAAAAAAAAABSc2x0VW50RiNQeGxAcsAAAAAAAAAAAAp2ZWN0b3JEYXRhYm9vbAEAAAAAUGdQc2VudW0AAAAAUGdQcwAAAABQZ1BDAAAAAExlZnRVbnRGI1JsdAAAAAAAAAAAAAAAAFRvcCBVbnRGI1JsdAAAAAAAAAAAAAAAAFNjbCBVbnRGI1ByY0BZAAAAAAAAAAAAEGNyb3BXaGVuUHJpbnRpbmdib29sAAAAAA5jcm9wUmVjdEJvdHRvbWxvbmcAAAAAAAAADGNyb3BSZWN0TGVmdGxvbmcAAAAAAAAADWNyb3BSZWN0UmlnaHRsb25nAAAAAAAAAAtjcm9wUmVjdFRvcGxvbmcAAAAAADhCSU0D7QAAAAAAEAEsAAAAAQACASwAAAABAAI4QklNBCYAAAAAAA4AAAAAAAAAAAAAP4AAADhCSU0EDQAAAAAABAAAAB44QklNBBkAAAAAAAQAAAAeOEJJTQPzAAAAAAAJAAAAAAAAAAABADhCSU0ECgAAAAAAAQAAOEJJTScQAAAAAAAKAAEAAAAAAAAAAjhCSU0D9QAAAAAASAAvZmYAAQBsZmYABgAAAAAAAQAvZmYAAQChmZoABgAAAAAAAQAyAAAAAQBaAAAABgAAAAAAAQA1AAAAAQAtAAAABgAAAAAAAThCSU0D+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,/9j/4SH/RXhpZgAATU0AKgAAAAgADAEAAAMAAAABA2IAAAEBAAMAAAABA+gAAAECAAMAAAADAAAAngEGAAMAAAABAAIAAAESAAMAAAABAAEAAAEVAAMAAAABAAMAAAEaAAUAAAABAAAApAEbAAUAAAABAAAArAEoAAMAAAABAAIAAAExAAIAAAAeAAAAtAEyAAIAAAAUAAAA0odpAAQAAAABAAAA6AAAASAACAAIAAgALcbAAAAnEAAtxsAAACcQQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykAMjAxNDowNToxOSAxNjoxMDowMwAAAAAEkAAABwAAAAQwMjIxoAEAAwAAAAH//wAAoAIABAAAAAEAAACYoAMABAAAAAEAAACYAAAAAAAAAAYBAwADAAAAAQAGAAABGgAFAAAAAQAAAW4BGwAFAAAAAQAAAXYBKAADAAAAAQACAAACAQAEAAAAAQAAAX4CAgAEAAAAAQAAIHkAAAAAAAAASAAAAAEAAABIAAAAAf/Y/+0ADEFkb2JlX0NNAAL/7gAOQWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMVExMYEQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4OFBEMDAwMDBERDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCACYAJgDASIAAhEBAxEB/90ABAAK/8QBPwAAAQUBAQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAABAAIDBAUGBwgJCgsQAAEEAQMCBAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0coLRQwclklPw4fFjczUWorKDJkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZmdoaWprbG1ub2N0dXZ3eHl6e3x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRShsUIjwVLR8DMkYuFygpJDUxVjczTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwD1G+0U0WXESK2ueQOTtG5c6PrzhkT9mt+9v963uof8n5P/ABNn/UuXmLeB8Fe5Ll8eWMzMXRFa05XxTnc3LyxjEQOIG7HE9j/z4w/+41v3t/8AJJf8+MP/ALjW/e3/AMkuOSVz7hy/7p/xi5v+l+c/ej/ixex/58Yf/ca372/+SS/58Yf/AHGt+9v/AJJcckl9w5f90/4xV/pfnP3o/wCLF7H/AJ8Yf/ca372/+SS/58Yf/ca372/+SXHJJfcOX/dP+MVf6X5z96P+LF7H/nxh/wDca372/wDkkv8Anxh/9xrfvb/5JcchWfbbMzDwcNlYfm2GoX37jXW6N1YsZR+l/TfQZ+YmT5PloRM5RPDHfWRX4viXPZckccJRMpmhYhH/AKT23/PjD/7jW/e3/wAksb61fWCzrfTqel4ONfGVk0sywwjccfd+na0Vu3v3/Re39xQb9SPrTZkNpsysPHxtd+XS177CI9oZiZH6Jn6T/h0TA+qHXD1S7Dz3huFUwOp6pjxW95P5rMdzrvQyK3e71f5tVj9xIIHFE1pL1bt+J+KgxlIQlHiqUPTxcP7zHrHR+h4ee7pn1aws8dXAZbczpuS/FpY15/R/bch7349DbGCz02V0+stfE6L9dGY7Aet1Yzqz7Mf0Tlt26+2/NzHszL37nfzv6Ja/RuhYXR23/Z3W23ZT/VycnIebLbHABjfUtd+41vsZ9BaKouq83d1X62dIqdb1PAo6pQ3/AAvTXFl20DvgZe71bP8Awvlf9aQ6fr/03IpZfRRZZVYJY8Fuv4+1zfz2rZ610jF6z063ByPbu91Nzfp1Wt/mcmh30mXUv9zF5PZe/pWc6nqgrw7nk1Z1LBoMqsB1OdXTWPZT1XEO/wDR72WZdV382p+W9oz4co9Mv0r4eEtXnjzEcRny59cNTDh4+OP9X+s+hf8APjD/AO41v3t/8kl/z4w/+41v3t/8kuCPWOmtBLrXBrdHPNVoaCRuDXu9L2vc33ItHUMDJdsoyK3v/wBHO1//AG1Zss/6K0I8rycjUSCewnbjz5/4lAXOMojvLFwj8YvpHR+v0dWstrqqfUagHEvjWSR+b8Eli/UcEZWWDodjNPm5JVvu+P737Veitr/qcTd++5v9HfeLHuXvWn85w/K//9D03qH/ACfk/wDE2f8AUuXmLeB8Fp/Wj/GU+rJzOm9Kw/UxsV4xuodUubY6ikvPo2fosdvqO2O9n8577Gfo67Fz/TepV5pvpD67LMVwa62jcaXtcJrtpNobY3d/o7PetH4bkiOKBPqlrH/BcX43hnIQygXCHpkf3eL5W6kkktNwlJJJJKUkkkkpSazqdnSan9RqsFNmONzHuBLd30Wsexpa57bPobE6odcwbs/pz6KI9Vrm2MaTDXFn+Dd/WTMt+3OhxHhNR7smDh97HxS4I8cbl+7ru9J0b/Gi626jH60zCwXEhmQ77Q/c0x/O+iKLqa2f8FZmexdT0P61dI65fkYuG9zcvE/pGPY2HN9zmBwsYbKLWO2/TousXjXTautYbczDo6e26h3vfVkgNO50bWb2nblN2j+b/wDPau9JzOv/AFU6n9pwzjVUdWfWy91zS+uuw73Cl3puZe2ut73+9n5ixZ8tKMOMCRr5vSY8P+F+k9Rj57HPL7ZMBf8ANkZIzOTTi+T9B9wSXM/Uz6x9X60/qdHVcWrGv6beMd3oEuYXwfWr9Qus3WVOb79v766ZQNtS8s67i5v1h+uXWG4jmYOV0pmIzCvucGVm2uxuSz1/pvfbbvt+zO2fzbP0i9ReHFpDTtcQYdEwfGF4D1zpRo66Om9Zstf1A3Opysx5J9Vth3YOfW632tbtPpPq3/4NECyAOui2chGJkdogyNeD7ziuvZhVOzXNF7amnIcIDd4aPWd+7t3KlldI+r3XsKb8bHzcbJG9tzQ07pG31qsir379v+FqsXimGPrN1PI/5udPzc7P6XjuLcgUA6Vuhl7Nj7WVPq9n6Gq+/wBFe1/VqzGd0bHqxcXIwqcZv2dlGWz07QKv0cvaNzHbtv8AOM+mkQQSD0TGQlESG0hYscO/hJ5Z9Lv8X3U68hgvy/q5nbaLXPcLH4lu79E7c7a5+Lbu/sf1/TrtSvfXPM6b9YOiWdC6ZkVZ2Xm3UUt+zuFoqPqix+Re6rd6ddNePdv/AO2/8IklxSu7N7XaPbhVcMaviqtOLfif/9Hruk/U+zpd+Rg+uzqH1fzd912JmMa+1uQ5zXtsbcGfrDH7ff6/6St9dXprg2dE6l9VftGN1Dp9rcZ9rrKM3FacitzNAyu59f6avZ/g/XrrXsF1oppfa4EitpcQOYaNyw+k/Xj6t9VsdRVlDHyWO2nHyv0NhMw3Y23+c3f8GpMWSeKXuR/u67MHMYMfMQOGZOtS9JqWnV84b9YejGw1uyPReORcx7P+qaot+snQnNLhltAbyC14Jj90bPcvX8jC6fntrOTRVktrc22o2Na8Nc3Wuxm7d7m/muUnYGC9wc7Hqc5p3NcWNJB/eGitf6Sy/uw/53/fNA/A+X/fyfbD/vHx7/nH0cxttssDhMsqeR8D7R7kWjrfR74FeXWHExssJrdPh+k2r2IAAAAQBoAFndU+rnQur1vr6jg05HqCDY5gFg7bmXti5jv6j0h8Sy3rGJH1VL4Hy9emeQHueGX/AHL54QRodEy0X/4tuu9PPo9F6pVbhyS2rOrJcz+Q22nd6n/gSfE/xc/WS+2eqdbbTQP8Hg1w4/8AXbGs9P8AzLFY/wBI4uEHhlfb+1pf6E5jiIEocPSVy1/weFzU/YngDUk6ADzK6H/xs8dpBq611IEcb7K3j+011PuVcf4sHZNmO3q/VHZuNj2Fz6m1mn1mEfzV/o3fTa/6N7P8GgfiWOjUJX0HT7Vw+B5uIA5IcPUji4h/g/8AoTy131g6PS4sdkh5aJd6TXWBv9Z1YLFV6k7D6r9ifiX4+WKLRccGyz0/WGk1fm2Vv02L2HpfQ+kdIpNHTMSrFrfG8Vt1dtG1vqPPvs/trzn66/4u/rR1nrLs7ErwW1EuFYoHou2gufXZlFw/TZNk/pLNyrz5+U4yhOA4Jfukxl/jN3H8IhilHJjyyGSGtzEZw/xPT/03Rwv8ZlvTHHH+svT7GZOTYXYpwWNexzDtaKvfa177mO9v8tdB9ZPrlg9G6Gcxx9LPyKicLCuj1TYfa31aqy/ayt/89/239Nclif4mG3YrbOpdTuGY9jSWNa17a3Efpmbnud6/u/m3t9FbHTP8Un1cx3+r1N9vU7OzXn0amnn9HRjbNv8AU9TYqcuGzwgiPQHUuljExEDIRKf6RiOGP+L6mt9RMv629e6C94z/ALHW2yxrc62v7RfbaXNte+tt+3Grw2bn0NrYz/tv01qdU6J0n684dWfiZVmLbX6uJbc1kPNe415eHbRd/NOc9vtd/OMXU4+PRi0V42NW2qiloZXWwQ1rRo1rWrnPqvj/ALM6/wDWDpjiP0+Q3qVAEAenkhzHw3811d2O9j/+toLni6afrj/i2wsos+x29Muy2sqfa1z3vc/RtsY7q7a/0NXvZa/6f80u+6l1rP6Z9VsrqvU8Jpy8Wt3qY1T/AFK3kO9JljHlrX/Z7Z9b9JX6tVX01r5OJi5bGsyamXMre21jXgOAew7q7IP5zHfRU7ba6an22uDK62l73HQBrRuc4pKfOf8AFli5Wdn2daz4ps9FopxqgK2bSX1MttqYG/zdH6DEq/wVH/CJLc+pmTiZednZeEXHFyGtsoLhtOxznlstKSt+zj97g14ODi/rfzfHxOf95zfdvd09z3eCv0K972uD/wBCf//S9N6j/wAn5P8AxNn/AFLl5bdj4+VWGZNTL2gaCxodH9Un3N/sr1LqH/J+T/xNn/UuXmLeB8Fp/DQDDIDrqHC+OEjJhINECWoaNPSjgvF3RszI6XcO9VjnMdpH6Smx3vWxh/Wz68YLWstfhdWrbJcbA6i537rd7NtH/gSqpKxPk8E/0OH+56fw+VpYvifN49Bk4x2yfrP+d8//ADnep/xnsY9repdFzcVrh/OU7choP50mv0/0f8v/AKCJd/jS6WLCzE6b1HKgwHtoDGH4G17X/wCfWueBI4MJFzjySVD/AKNx3pOVfRtD45mrXFC+9yr/ABXqOnfX+vJss+2dNyMGoAGp73Me55/ODqWO3VbVbs+u3Tm/zVNz/GQ1v/fnLi0k+Pw/AN+KXmf+9YpfGeaN1wR8o/8AfcTtu/xi9YZe5p6AbKd0Msryq5LJ+l6b62+/b+ZuS6z9eMXLwqPs+dlfVzLbYX7r8Q3tc1gLTXc2j16/Ss3b2v3/AODWInDiJAMA8psvhuI/LKQ86kGSHxzOK44Ql5cUJf8Ad/8ARdKr67/WmnFqznDpfUsRwJrbRZbTk5LWu9M20Y9zXOp2fSu9Sldx0rqDOp9Ox+oV12U15VYtZXaAHgO1bvDS9q8yu9c02DHLW3lp9MvnYHR7S/b+a1dd/izzszO+qGJZlwX1OspZYDO9jHFrH/8Aor/rapc1ywwcNSMuK+lDR0uQ54817hMBAQ4aAPFL1cW71SSSSrN9SxLMH0/rnT1EWx6/T34zqS06+nay9ljLfob2+s/9H+4ttYL3G7671V/Z2OZidNfZ9qJJcx91za20tbu2M9SvHtfu2b0lO8uQ/wAZr73dGxMFljqaOoZlePk2MOprLbbPRj/hnVrr1xn+Mm0OZ0fBA912Z6+8CS1uOxz37Xfmb/UZX/UT8QvJAVdyiK+rHnlw4ckgeHhhKXF+7Ud2X1Fa1uRlMYNrW11ta0cAAua0JJ/qP/Ssv+oz8rklo/8Alw+n/qNxf/LP/hf+pX//0/Teof8AJ+T/AMTZ/wBS5eYt4HwXp3UATgZIGpNT9P7JXDYH1Y6vmNa70xj1kfTu9p/7bE2LR+H5IQhkM5CIsbuL8Yw5MuTFHHAzPDL5Q5SUwusZ9Vej4g3dRzdxGpbubWPu91n/AEkZmT9T8L+ZqZa4dwx1h/z7Nydm+Lcrj0M7PmIf9Jq4/g+c65JQx+BPFL/mvIV1XWmKq3Wf1Gl3/Uq5X0LrNv0cO0T+8Nv/AJ82rpn/AFuwqxtoxrHAcD2sH5XID/rjef5vFaP6zyf+pYqU/wDjDgHy1/z5/wDRi2Y/BsI+fNKX92PD/wB+5LPqn1x/NLGf1nt/75vRm/Uvq55fS34ucfyMVp31u6keKqW/Jx/78hO+tPWDw6pvwZ/e5QS/4xjp+EP++kyj4VyY/wA5LzKh9SOod8ikfAOP8E//ADHzv+5NX+a5QP1m61/pWD/rYTf85etf6Zv/AG21M/5Rn+t/iQ/75d/o3kv3Jf4y9v1Dzban0uyqw2xpY4tDg4Bw2y0/vKH+LV7Ok4h+redXZjdRYbLmCx++u6sPcx1mJD7K6n1f9qcb2f6b/SKQ+svWv9Mz/ttq5d/WrLPrr0+52UGsf1GrfUQGj1DU3Dyr6/8ACU12M9Gn/RZNn6RAfFRzcxEiVgaHhA/6La5XBhwcQxAjjq7PF8r68kkuR+uP1v6Di139Ct6p+z82+oizIrrN/otO3fW9lZ3MyL6XP9D/AEf89/o1K2npcHqGJ1Cg5GI82VB7695a5oLq3Guzb6gbubvb9P6Cyvqy23JyeqdYvpbS/MyXU0wHNc7HxScfHsua923e93rPbsb/ADT1zPTKbrLOhZdbceinqOG/pmH0u99ps+xCMmzKZkUN9mY7Er/T/wCD/mP0v6Vd9iYmPhYtWHisFWPjsbXVWJIa1o2tb7vckpMuF+vthd13pVXtIrx8qzj3Dcaapa7+Uu2vvox6X35FjaaawXWWWENa1o5c97va1q826rV1vr314yr8PG9TAwKXYjL2xsd6ey3Iayx21vr/AGm9rNjf9GpeWIGbGSaAkN2vzsZS5XNGIJkYEADd3fqN/Scv+oz8rklP6l1W05uZVcx1VjWMljwWnl3YpK9Y+/3enDv/ANTcrhP+iOGjxcVV1/nX/9T1DJsdVjW2tjcxjnNniQJXDX9Y6plibsl4Dhqxnsb/ANBdvnf0LI/4p/8A1JXnbHDY3UcBZfxScomERIgEGwDVsWUmwvAmeT4nlOm3DxCW4eIWUxLpJtw8QluHiElLpJtw8QluHiElLpJtw8QluHiElLkgNc5xhrQXOJ7ADc53+auI6/1bN6t1DGwsSj7NZQ71mWFwNwgeqLbrGf0dlFbfX9P/AAX01s/W/qZwsHHZXa+q269p31mHBlfus/6TmLuPq59S/qvXXlW1YGQyy3fiXvynu33VkstdZ7H7PSyvZ9H6df6Gz/CLU+G8sD+vlruIf9EyZcUf0vseh6JmOzuk4mW+d9tTS8lrmy6Ie9rbGsf6b3e+p2z31rmvrR9Sfqrb1X/nT1m77Pj47Wuy6oAqtLDFbrdrfVe5/sr2M/nvoLsa666q21VNDK2ANYxoAaGgQ1rWj6LWrn/rn0mvruPhdEtbkNqysgWW30172MZSDY9mTZvr9D12/o6bP0n6b/BrVZWp9U3X/WDqF31symOrxodi9Fx3CNmPI9bLd/wuW9n9itnprrUPHoqxqK8ehuymlja62Ds1o2Mbr+60LG+t+H1HO6acTHyasPBuBZ1HJe812V1HafVx7P5r2/8Aaiq7+eo/R+rUkp5L65fXOnqnqdN6W8X4NTxXcWs3HKyw7dj9Op3uY12HuZ6vULtmz0f0df8AO/pW6R9q6TSxtOQ/7Rq7IuH59j3Ouudsd7dnqvf7VzbPq1lfVfquPk5os/ZjMy/HoyXAbCX1s+xXt2u/7UM+lb/NM9P+Q9dMSAYJEhZXxPNOM4QiTGIHHY04pfL/AM1iyk2A9Z9XOrZXULLq8oMc6prSLWja4gk+135vZJUvqcQcrKj9xn5XJJ3vZPuHHxnjuuK/VXucO6rPt3etv//V9RyXsrx7bLG72MY5zm8yAJc3VcsPrL9XoEdN/wDA6/711V9TbqbKXEhtjSwkcw4bVz4+pHTQI9e/72/+QU+GPKkH342f0dGnzg5y4/duGqPFx8P/AHTV/wCcv1f/APK3/wADr/vS/wCcv1f/APK3/wADr/vVv/mR03/T3/e3/wAgl/zI6b/p7/vb/wCQUvt/Df3D9jUr4r/q/wDmKw+p9Dy63PZ09rQ07YdXX8eyjkdX6HRaandODiADIrrjVXcP6tYeJW5ldtjg47juLfh2aoZH1Wwr7TY620EgCAWxp/ZWFzGPnPveX2I4/uv+SsQ4/wBHf/nOrAH7tj4wPvP+U/daP7d6D/5W/wDgdf8AeiY/Vuh5Fvpt6cGmCZNdcaI3/NDA/wBNd97f/IIuP9V8Kiz1G22kwRBLY1/sqOeLn+E8McfFWmkN0YweOPGBw36v7qDJ6h0TGY1zuntcHGNK6/Ce6r/t3oP/AJW/+B1/3rSyfq5iZLWtfZYA0yII+H7qr/8ANDA/0133t/8AIIY8XxHh/WRxcXgMa7MBxn2h6OltF3UPqxlX0m7pFdljHD0XvqqcWEmdzCfoe791bF3X8emp1hqeQwSQIn/qlXZ9UsFj2vF10tIIkt7f2FZu6Di3VOrdZYA8QSCJ/wCpSmPiolEY/bEP0vkX4uHgn7nz/wCTpp/88MP/ALj3f9H/AMml/wA8MP8A7j3f9H/yaf8A5oYH+mu+9v8A5BL/AJoYH+mu+9v/AJBS/wDCP9X/AJrD+s8G3V13HtrbYK3gPAIBjv8ANZOd9Z+iZLhTmYDsgUWb2CxrHgPbLW2Na930lr1dCxqq21iywhgABJHb+yqD/qX0573PN1wLiSYLe/8AYVr4X7/Hl/0hXBQ9n2/P1cXAt5/3vbx/c64/8rx+XTia2V9a+i5lBx8vAdkUEgmq1tb2y07mHY9xb7XKH/OX6vnU9N/6Ff8Aerf/ADI6b/p7/vb/AOQS/wCZHTf9Pf8Ae3/yC1DH4cd4k+dufXxb/V/8xs9B6p03OtubhYv2ZzGtL3bWtkEmB+jSRukdAxek2WWUWWPNoDXB5B4M6bWt8UlDw8r7tcP6jtXWv+/bVc591r0/eb/q8Hzf94//1u36z9UqOq3W5Leo9QwciwAB2LkvYwFo2t/V5NX9favGvrJlfXP6vdWu6XmdXzXOqh1dgyLQ2ys/zdrP0n53/QevoNcP/jV+qv7Z6L+0sZm7P6aC8ADV9PN1X8r0/wCer/65/pElN36k9L6dd0/C65jZ+fmuuq1GVlPtaHEbLq306U7qrA5n0V1a8d/xPfWn7JnP+r2U+KMwmzEJ4bcB76/+v1t/7dZ/wq9iSUpYP1m6N07Jpt6nm52bgMxaSX2YmS+kBjN1m702n0nWa/uLeXnX+MXqOX13quJ9RukO/S5Dm2dRsGoYwfpGMtj8ytn61b/1hJTzn1F6b9aPrVmW22dZ6jj9Hx3Q+0ZFnqPJ1ZRW4uNfqbPda/b7P+uL1XpHQMbpL7H05GXkOtaGuOVkWX8d2ttc5rHf1Ubo3SMPovTKOm4TdtGO0NB7ud+fa/8A4Sx/verqSnP6v0XH6sytl92RR6RLmnGufQSSI95pc3evKv8AGRidX+quZiHp3Wuouxs1ryGW5Nji11ZZu2va5ns22sXsq8p/x5/S6N8Mn/3WSUj/AMW3SupfWfHys/qnWepGmiwVV01ZVjdztu97rHbnO/PZ9DYvTuldLo6XjHGosuuYXF5fkWvufJj/AAlxc7b7forhv8SX/iezv/Dh/wDPVK9FSUpc11T6l2Z+Rfk1de6tiWXEubVVkxQwnhrMcMb+ib+56q6VJJT83ZnW/rNjZ92FZ1fMc+i11LnfaLYJY41k/wA55L2Wv/F7iNrDX9Z6u98av+2OBn4NbtXifXP/ABR9Q/8ADt3/AJ9evpdJTw3UvqH9Ysep1v1f+svUBczVtGZc6xjj+76jdrWf2qLFyfSf8a31m6NnuwfrFV9sZS815DS1teQwg7XbHV7KbNn/AAjP0n+nXsj3srY6yxwYxgLnOcYAA1LnEr57+tTj9ZfrrnO6JU7L+02htAqE79jGUutH/BudX6nqfuJKfoDDy8fNxKczFeLKMhjbKnju1w3NSVH6sdKs6P8AV/A6Zc4PtxqQ2xw43n3vDf5LXu2pJKf/1/VU3OhTpJKfAv8AGB9W7fqt9YxfhA1YmQ77Tg2N09NzXbn0tP72PZt2f8H6S9h+pv1lp+snQqM9sDIb+iy6x+ba0e/+xZ/O1/yHof13+rLPrJ0G7CaB9rr/AEuG86Ra0aM3fuXN/RPXkn+Lr6z2fVr6w/ZswmvCzHDHy2P0Fbwdtd7gfo+i/wBln/Beokp9k+tX1hx/q50TI6ndDnsGzHqP59rv5qv/AL8//g1g/wCLb6uZGJiXfWHqsv6v1k+q9zx7mVPPqNZ/Jdd/PWf9ar/waynH/n/9dhWPf9XPq+6XHll90/5r22PZ/wCw1X/dhelJKUkkkkpS8p/x5/S6N8Mn/wB1l6svKf8AHn9Lo3wyf/dZJTo/4kv/ABPZ3/hw/wDnqleirzr/ABJf+J7O/wDDh/8APVK9FSUpJJJJT8zdeBP1h6iAYJzLoP8A1169vZ9V/rV6QbZ9asguAAluNQB/35//AE14h1z/AMUfUP8Aw7d/59evpgcJKfN/rD/i0+tfU6iD9ZH5w5GPkh9dc/Cl91f/AIAudxPrV9Z/qDezpmb0jErYGtBLaxW+5rdPW+20Fzb3/wAt7bV7WuM/xtYWNkfU6/ItA9bDsqsoeeQXPZQ9oP8ALrsSU6v1T+uXSvrTiutwyasmmPtGLZG9k/nAj+cqd+bZ/wBQkvJP8UzskfXXFFE7HVXDI8PT2OPu/wCvilJJT//Q9VSXyqkkp+ql4x/jb+qz8XrlHVMGour6s7Y9jRP6yNNB/wB2W+7/AIz1V54kkp+jvqb9XKvq30Gjp7QDkEerl2D865w/Sf2a/wCar/kVrcXyqkkp+qkl8qpJKfprq/XMLo9db8sXO9YltbaKbLnEgbjpQx+3+2vKP8ZfUOofWjMwx03pWf8AZsJjx6lmNY0udYWbtrNrvY1tTPpLzxJJT6f/AItOtZf1axsvA6r0vPZVfYLqrq8axwB2+nY2xu3f+YzZtXp3SurYnVsU5WILBWHFhF1b6nBzY3fo72sd+cvmJJJT9VLC6x9b+n9JyLMV2NmZWTW0ONeNj2WA7huY0XbRT/4IvnJJJTr53RvrFmZuRmO6VltORa+0t9C0wXuNkT6f8pesdB/xivb0+mnrnSuoY+ZUwMstZjPfW8tG31Bo2xjn/nM9NeIJJKfoF/1/wi2cXpXVctx4bVhv/wCqs9Ncx9YsD6//AF5dXifs8dG6QxweG5NgD3uGjX3hm672/mUto2f8YvJUklP0L9TPqN076qY7zU85OdeAMjKcI0GvpUs19Or/AM+f9t7EvnpJJT//2f/tKdpQaG90b3Nob3AgMy4wADhCSU0EBAAAAAAADxwBWgADGyVHHAIAAAIAAgA4QklNBCUAAAAAABD84R+JyLfJeC80YjQHWHfrOEJJTQQ6AAAAAAEZAAAAEAAAAAEAAAAAAAtwcmludE91dHB1dAAAAAUAAAAAUHN0U2Jvb2wBAAAAAEludGVlbnVtAAAAAEludGUAAAAAQ2xybQAAAA9wcmludFNpeHRlZW5CaXRib29sAAAAAAtwcmludGVyTmFtZVRFWFQAAAAbAFwAXAB0AG8AdABvAFwAQwBhAG4AbwBuACAARgBsAG8AbwByACAAMQAgAEMAbwBsAG8AcgAAAAAAD3ByaW50UHJvb2ZTZXR1cE9iamMAAAAMAFAAcgBvAG8AZgAgAFMAZQB0AHUAcAAAAAAACnByb29mU2V0dXAAAAABAAAAAEJsdG5lbnVtAAAADGJ1aWx0aW5Qcm9vZgAAAAlwcm9vZkNNWUsAOEJJTQQ7AAAAAAItAAAAEAAAAAEAAAAAABJwcmludE91dHB1dE9wdGlvbnMAAAAXAAAAAENwdG5ib29sAAAAAABDbGJyYm9vbAAAAAAAUmdzTWJvb2wAAAAAAENybkNib29sAAAAAABDbnRDYm9vbAAAAAAATGJsc2Jvb2wAAAAAAE5ndHZib29sAAAAAABFbWxEYm9vbAAAAAAASW50cmJvb2wAAAAAAEJja2dPYmpjAAAAAQAAAAAAAFJHQkMAAAADAAAAAFJkICBkb3ViQG/gAAAAAAAAAAAAR3JuIGRvdWJAb+AAAAAAAAAAAABCbCAgZG91YkBv4AAAAAAAAAAAAEJyZFRVbnRGI1JsdAAAAAAAAAAAAAAAAEJsZCBVbnRGI1JsdAAAAAAAAAAAAAAAAFJzbHRVbnRGI1B4bEBywAAAAAAAAAAACnZlY3RvckRhdGFib29sAQAAAABQZ1BzZW51bQAAAABQZ1BzAAAAAFBnUEMAAAAATGVmdFVudEYjUmx0AAAAAAAAAAAAAAAAVG9wIFVudEYjUmx0AAAAAAAAAAAAAAAAU2NsIFVudEYjUHJjQFkAAAAAAAAAAAAQY3JvcFdoZW5QcmludGluZ2Jvb2wAAAAADmNyb3BSZWN0Qm90dG9tbG9uZwAAAAAAAAAMY3JvcFJlY3RMZWZ0bG9uZwAAAAAAAAANY3JvcFJlY3RSaWdodGxvbmcAAAAAAAAAC2Nyb3BSZWN0VG9wbG9uZwAAAAAAOEJJTQPtAAAAAAAQASwAAAABAAIBLAAAAAEAAjhCSU0EJgAAAAAADgAAAAAAAAAAAAA/gAAAOEJJTQQNAAAAAAAEAAAAHjhCSU0EGQAAAAAABAAAAB44QklNA/MAAAAAAAkAAAAAAAAAAAEAOEJJTQQKAAAAAAABAAA4QklNJxAAAAAAAAoAAQAAAAAAAAACOEJJTQP1AAAAAABIAC9mZgABAGxmZgAGAAAAAAABAC9mZgABAKGZmgAGAAAAAAABADIAAAABAFoAAAAGAAAAAAABADUAAAABAC0AAAAGAAAAAAABOEJJTQP4AAAAAABwAAD/////////////////////////////A+gAAAAA/////////////////////////////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAADhCSU0ECAAAAAAAEAAAAAEAAAJAAAACQAAAAAA4QklNBB4AAAAAAAQAAAAAOEJJTQQaAAAAAANLAAAABgAAAAAAAAAAAAAAmAAAAJgAAAALAFYASQBCAF8AcgBnAGIAXwBwAG8AcwAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAmAAAAJgAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAQAAAAAAAG51bGwAAAACAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRsb25nAAAAAAAAAABCdG9tbG9uZwAAAJgAAAAAUmdodGxvbmcAAACYAAAABnNsaWNlc1ZsTHMAAAABT2JqYwAAAAEAAAAAAAVzbGljZQAAABIAAAAHc2xpY2VJRGxvbmcAAAAAAAAAB2dyb3VwSURsb25nAAAAAAAAAAZvcmlnaW5lbnVtAAAADEVTbGljZU9yaWdpbgAAAA1hdXRvR2VuZXJhdGVkAAAAAFR5cGVlbnVtAAAACkVTbGljZVR5cGUAAAAASW1nIAAAAAZib3VuZHNPYmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAAAFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRvbWxvbmcAAACYAAAAAFJnaHRsb25nAAAAmAAAAAN1cmxURVhUAAAAAQAAAAAAAG51bGxURVhUAAAAAQAAAAAAAE1zZ2VURVhUAAAAAQAAAAAABmFsdFRhZ1RFWFQAAAABAAAAAAAOY2VsbFRleHRJc0hUTUxib29sAQAAAAhjZWxsVGV4dFRFWFQAAAABAAAAAAAJaG9yekFsaWduZW51bQAAAA9FU2xpY2VIb3J6QWxpZ24AAAAHZGVmYXVsdAAAAAl2ZXJ0QWxpZ25lbnVtAAAAD0VTbGljZVZlcnRBbGlnbgAAAAdkZWZhdWx0AAAAC2JnQ29sb3JUeXBlZW51bQAAABFFU2xpY2VCR0NvbG9yVHlwZQAAAABOb25lAAAACXRvcE91dHNldGxvbmcAAAAAAAAACmxlZnRPdXRzZXRsb25nAAAAAAAAAAxib3R0b21PdXRzZXRsb25nAAAAAAAAAAtyaWdodE91dHNldGxvbmcAAAAAADhCSU0EKAAAAAAADAAAAAI/8AAAAAAAADhCSU0EEQAAAAAAAQEAOEJJTQQUAAAAAAAEAAAAAThCSU0EDAAAAAAglQAAAAEAAACYAAAAmAAAAcgAAQ7AAAAgeQAYAAH/2P/tAAxBZG9iZV9DTQAC/+4ADkFkb2JlAGSAAAAAAf/bAIQADAgICAkIDAkJDBELCgsRFQ8MDA8VGBMTFRMTGBEMDAwMDAwRDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAENCwsNDg0QDg4QFA4ODhQUDg4ODhQRDAwMDAwREQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM/8AAEQgAmACYAwEiAAIRAQMRAf/dAAQACv/EAT8AAAEFAQEBAQEBAAAAAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAAAQACAwQFBgcICQoLEAABBAEDAgQCBQcGCAUDDDMBAAIRAwQhEjEFQVFhEyJxgTIGFJGhsUIjJBVSwWIzNHKC0UMHJZJT8OHxY3M1FqKygyZEk1RkRcKjdDYX0lXiZfKzhMPTdePzRieUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm9jdHV2d3h5ent8fX5/cRAAICAQIEBAMEBQYHBwYFNQEAAhEDITESBEFRYXEiEwUygZEUobFCI8FS0fAzJGLhcoKSQ1MVY3M08SUGFqKygwcmNcLSRJNUoxdkRVU2dGXi8rOEw9N14/NGlKSFtJXE1OT0pbXF1eX1VmZ2hpamtsbW5vYnN0dXZ3eHl6e3x//aAAwDAQACEQMRAD8A9RvtFNFlxEitrnkDk7RuXOj684ZE/Zrfvb/et7qH/J+T/wATZ/1Ll5i3gfBXuS5fHljMzF0RWtOV8U53Ny8sYxEDiBuxxPY/8+MP/uNb97f/ACSX/PjD/wC41v3t/wDJLjklc+4cv+6f8Yub/pfnP3o/4sXsf+fGH/3Gt+9v/kkv+fGH/wBxrfvb/wCSXHJJfcOX/dP+MVf6X5z96P8Aixex/wCfGH/3Gt+9v/kkv+fGH/3Gt+9v/klxySX3Dl/3T/jFX+l+c/ej/ixex/58Yf8A3Gt+9v8A5JL/AJ8Yf/ca372/+SXHIVn22zMw8HDZWH5thqF9+411ujdWLGUfpf030GfmJk+T5aETOUTwx31kV+L4lz2XJHHCUTKZoWIR/wCk9t/z4w/+41v3t/8AJLG+tX1gs6306npeDjXxlZNLMsMI3HH3fp2tFbt79/0Xt/cUG/Uj602ZDabMrDx8bXfl0te+wiPaGYmR+iZ+k/4dEwPqh1w9Uuw894bhVMDqeqY8VveT+azHc670Mit3u9X+bVY/cSCBxRNaS9W7fifioMZSEJR4qlD08XD+8x6x0foeHnu6Z9WsLPHVwGW3M6bkvxaWNef0f23Ie9+PQ2xgs9NldPrLXxOi/XRmOwHrdWM6s+zH9E5bduvtvzcx7My9+5387+iWv0boWF0dt/2d1tt2U/1cnJyHmy2xwAY31LXfuNb7GfQWiqLqvN3dV+tnSKnW9TwKOqUN/wAL01xZdtA74GXu9Wz/AML5X/WkOn6/9NyKWX0UWWVWCWPBbr+Ptc389q2etdIxes9Otwcj27vdTc36dVrf5nJod9Jl1L/cxeT2Xv6VnOp6oK8O55NWdSwaDKrAdTnV01j2U9VxDv8A0e9lmXVd/NqflvaM+HKPTL9K+HhLV548xHEZ8ufXDUw4ePjj/V/rPoX/AD4w/wDuNb97f/JJf8+MP/uNb97f/JLgj1jprQS61wa3RzzVaGgkbg17vS9r3N9yLR1DAyXbKMit7/8ARztf/wBtWbLP+itCPK8nI1EgnsJ248+f+JQFzjKI7yxcI/GL6R0fr9HVrLa6qn1GoBxL41kkfm/BJYv1HBGVlg6HYzT5uSVb7vj+9+1Xora/6nE3fvub/R33ix7l71p/OcPyv//Q9N6h/wAn5P8AxNn/AFLl5i3gfBaf1o/xlPqyczpvSsP1MbFeMbqHVLm2OopLz6Nn6LHb6jtjvZ/Oe+xn6Ouxc/03qVeab6Q+uyzFcGuto3Gl7XCa7aTaG2N3f6Oz3rR+G5IjigT6pax/wXF+N4ZyEMoFwh6ZH93i+VupJJLTcJSSSSSlJJJJKUms6nZ0mp/UarBTZjjcx7gS3d9FrHsaWue2z6GxOqHXMG7P6c+iiPVa5tjGkw1xZ/g3f1kzLftzocR4TUe7Jg4fex8UuCPHG5fu67vSdG/xoutuox+tMwsFxIZkO+0P3NMfzvoii6mtn/BWZnsXU9D+tXSOuX5GLhvc3LxP6Rj2Nhzfc5gcLGGyi1jtv06LrF4102rrWG3Mw6Ontuod731ZIDTudG1m9p25Tdo/m/8Az2rvSczr/wBVOp/acM41VHVn1svdc0vrrsO9wpd6bmXtrre9/vZ+YsWfLSjDjAka+b0mPD/hfpPUY+exzy+2TAX/ADZGSMzk04vk/QfcElzP1M+sfV+tP6nR1XFqxr+m3jHd6BLmF8H1q/ULrN1lTm+/b++umUDbUvLOu4ub9Yfrl1huI5mDldKZiMwr7nBlZtrsbks9f6b32277fsztn82z9IvUXhxaQ07XEGHRMHxheA9c6UaOujpvWbLX9QNzqcrMeSfVbYd2Dn1ut9rW7T6T6t/+DRAsgDrotnIRiZHaIMjXg+84rr2YVTs1zRe2ppyHCA3eGj1nfu7dypZXSPq917Cm/Gx83GyRvbc0NO6Rt9arIq9+/b/harF4phj6zdTyP+bnT83Oz+l47i3IFAOlboZezY+1lT6vZ+hqvv8ARXtf1asxndGx6sXFyMKnGb9nZRls9O0Cr9HL2jcx27b/ADjPppEEEg9ExkJREhtIWLHDv4SeWfS7/F91OvIYL8v6uZ22i1z3Cx+Jbu/RO3O2ufi27v7H9f067Ur31zzOm/WDolnQumZFWdl5t1FLfs7haKj6osfkXuq3enXTXj3b/wDtv/CJJcUruze12j24VXDGr4qrTi34n//R67pP1Ps6XfkYPrs6h9X83fddiZjGvtbkOc17bG3Bn6wx+33+v+krfXV6a4NnROpfVX7RjdQ6fa3Gfa6yjNxWnIrczQMrufX+mr2f4P16617BdaKaX2uBIraXEDmGjcsPpP14+rfVbHUVZQx8ljtpx8r9DYTMN2Nt/nN3/BqTFknil7kf7uuzBzGDHzEDhmTrUvSalp1fOG/WHoxsNbsj0XjkXMez/qmqLfrJ0JzS4ZbQG8gteCY/dGz3L1/Iwun57azk0VZLa3NtqNjWvDXN1rsZu3e5v5rlJ2BgvcHOx6nOadzXFjSQf3horX+ksv7sP+d/3zQPwPl/38n2w/7x8e/5x9HMbbbLA4TLKnkfA+0e5Fo630e+BXl1hxMbLCa3T4fpNq9iAAAAEAaABZ3VPq50Lq9b6+o4NOR6gg2OYBYO25l7YuY7+o9IfEst6xiR9VS+B8vXpnkB7nhl/wBy+eEEaHRMtF/+LbrvTz6PReqVW4cktqzqyXM/kNtp3ep/4EnxP8XP1kvtnqnW200D/B4NcOP/AF2xrPT/AMyxWP8ASOLhB4ZX2/taX+hOY4iBKHD0lctf8Hhc1P2J4A1JOgA8yuh/8bPHaQautdSBHG+yt4/tNdT7lXH+LB2TZjt6v1R2bjY9hc+ptZp9ZhH81f6N302v+jez/BoH4ljo1CV9B0+1cPgebiAOSHD1I4uIf4P/AKE8td9YOj0uLHZIeWiXek11gb/WdWCxVepOw+q/Yn4l+Plii0XHBss9P1hpNX5tlb9Ni9h6X0PpHSKTR0zEqxa3xvFbdXbRtb6jz77P7a85+uv+Lv60dZ6y7OxK8FtRLhWKB6LtoLn12ZRcP02TZP6Szcq8+flOMoTgOCX7pMZf4zdx/CIYpRyY8shkhrcxGcP8T0/9N0cL/GZb0xxx/rL0+xmTk2F2KcFjXscw7Wir32te+5jvb/LXQfWT65YPRuhnMcfSz8ionCwro9U2H2t9Wqsv2srf/Pf9t/TXJYn+Jht2K2zqXU7hmPY0ljWte2txH6Zm57nev7v5t7fRWx0z/FJ9XMd/q9Tfb1Ozs159Gpp5/R0Y2zb/AFPU2KnLhs8IIj0B1LpYxMRAyESn+kYjhj/i+prfUTL+tvXugveM/wCx1tssa3Otr+0X22lzbXvrbftxq8Nm59Da2M/7b9NanVOidJ+vOHVn4mVZi21+riW3NZDzXuNeXh20XfzTnPb7XfzjF1OPj0YtFeNjVtqopaGV1sENa0aNa1q5z6r4/wCzOv8A1g6Y4j9PkN6lQBAHp5Icx8N/NdXdjvY//raC54umn64/4tsLKLPsdvTLstrKn2tc973P0bbGO6u2v9DV72Wv+n/NLvupdaz+mfVbK6r1PCacvFrd6mNU/wBSt5DvSZYx5a1/2e2fW/SV+rVV9Na+TiYuWxrMmplzK3ttY14DgHsO6uyD+cx30VO22ump9trgyutpe9x0Aa0bnOKSnzn/ABZYuVnZ9nWs+KbPRaKcaoCtm0l9TLbamBv83R+gxKv8FR/wiS3PqZk4mXnZ2XhFxxchrbKC4bTsc55bLSkrfs4/e4NeDg4v6383x8Tn/ec33b3dPc93gr9Cve9rg/8AQn//0vTeo/8AJ+T/AMTZ/wBS5eW3Y+PlVhmTUy9oGgsaHR/VJ9zf7K9S6h/yfk/8TZ/1Ll5i3gfBafw0AwyA66hwvjhIyYSDRAlqGjT0o4Lxd0bMyOl3DvVY5zHaR+kpsd71sYf1s+vGC1rLX4XVq2yXGwOoud+63ezbR/4EqqSsT5PBP9Dh/uen8PlaWL4nzePQZOMdsn6z/nfP/wA53qf8Z7GPa3qXRc3Fa4fzlO3IaD+dJr9P9H/L/wCgiXf40uliwsxOm9RyoMB7aAxh+Bte1/8An1rngSODCRc48klQ/wCjcd6TlX0bQ+OZq1xQvvcq/wAV6jp31/rybLPtnTcjBqABqe9zHuefzg6ljt1W1W7Prt05v81Tc/xkNb/35y4tJPj8PwDfil5n/vWKXxnmjdcEfKP/AH3E7bv8YvWGXuaegGyndDLK8quSyfpem+tvv2/mbkus/XjFy8Kj7PnZX1cy22F+6/EN7XNYC013No9ev0rN29r9/wDg1iJw4iQDAPKbL4biPyykPOpBkh8cziuOEJeXFCX/AHf/AEXSq+u/1ppxas5w6X1LEcCa20WW05OS1rvTNtGPc1zqdn0rvUpXcdK6gzqfTsfqFddlNeVWLWV2gB4DtW7w0vavMrvXNNgxy1t5afTL52B0e0v2/mtXXf4s87MzvqhiWZcF9TrKWWAzvYxxax//AKK/62qXNcsMHDUjLivpQ0dLkOePNe4TAQEOGgDxS9XFu9UkkkqzfUsSzB9P6509RFsev09+M6ktOvp2svZYy36G9vrP/R/uLbWC9xu+u9Vf2djmYnTX2faiSXMfdc2ttLW7tjPUrx7X7tm9JTvLkP8AGa+93RsTBZY6mjqGZXj5NjDqay22z0Y/4Z1a69cZ/jJtDmdHwQPddmevvAktbjsc9+135m/1GV/1E/ELyQFXcoivqx55cOHJIHh4YSlxfu1Hdl9RWtbkZTGDa1tdbWtHAALmtCSf6j/0rL/qM/K5JaP/AJcPp/6jcX/yz/4X/qV//9P03qH/ACfk/wDE2f8AUuXmLeB8F6d1AE4GSBqTU/T+yVw2B9WOr5jWu9MY9ZH07vaf+2xNi0fh+SEIZDOQiLG7i/GMOTLkxRxwMzwy+UOUlMLrGfVXo+IN3Uc3cRqW7m1j7vdZ/wBJGZk/U/C/mamWuHcMdYf8+zcnZvi3K49DOz5iH/SauP4PnOuSUMfgTxS/5ryFdV1piqt1n9Rpd/1KuV9C6zb9HDtE/vDb/wCfNq6Z/wBbsKsbaMaxwHA9rB+VyA/643n+bxWj+s8n/qWKlP8A4w4B8tf8+f8A0YtmPwbCPnzSl/djw/8AfuSz6p9cfzSxn9Z7f++b0Zv1L6ueX0t+LnH8jFad9bupHiqlvycf+/ITvrT1g8Oqb8Gf3uUEv+MY6fhD/vpMo+FcmP8AOS8yofUjqHfIpHwDj/BP/wAx87/uTV/muUD9Zutf6Vg/62E3/OXrX+mb/wBttTP+UZ/rf4kP++Xf6N5L9yX+Mvb9Q822p9LsqsNsaWOLQ4OAcNstP7yh/i1ezpOIfq3nV2Y3UWGy5gsfvrurD3MdZiQ+yup9X/anG9n+m/0ikPrL1r/TM/7bauXf1qyz669PudlBrH9Rq31EBo9Q1Nw8q+v/AAlNdjPRp/0WTZ+kQHxUc3MRIlYGh4QP+i2uVwYcHEMQI46uzxfK+vJJLkfrj9b+g4td/Qreqfs/NvqIsyK6zf6LTt31vZWdzMi+lz/Q/wBH/Pf6NStp6XB6hidQoORiPNlQe+veWuaC6txrs2+oG7m72/T+gsr6sttycnqnWL6W0vzMl1NMBzXOx8UnHx7Lmvdt3vd6z27G/wA09cz0ym6yzoWXW3Hop6jhv6Zh9LvfabPsQjJsymZFDfZmOxK/0/8Ag/5j9L+lXfYmJj4WLVh4rBVj47G11ViSGtaNrW+73JKTLhfr7YXdd6VV7SK8fKs49w3GmqWu/lLtr76Mel9+RY2mmsF1llhDWtaOXPe72tavNuq1db699eMq/DxvUwMCl2Iy9sbHenstyGssdtb6/wBpvazY3/RqXliBmxkmgJDdr87GUuVzRiCZGBAA3d36jf0nL/qM/K5JT+pdVtObmVXMdVY1jJY8Fp5d2KSvWPv93pw7/wDU3K4T/ojho8XFVdf51//U9QybHVY1trY3MY5zZ4kCVw1/WOqZYm7JeA4asZ7G/wDQXb539CyP+Kf/ANSV52xw2N1HAWX8UnKJhESIBBsA1bFlJsLwJnk+J5Tptw8QluHiFlMS6SbcPEJbh4hJS6SbcPEJbh4hJS6SbcPEJbh4hJS5IDXOcYa0FziewA3Od/mriOv9WzerdQxsLEo+zWUO9ZlhcDcIHqi26xn9HZRW31/T/wAF9NbP1v6mcLBx2V2vqtuvad9ZhwZX7rP+k5i7j6ufUv6r115VtWBkMst34l78p7t91ZLLXWex+z0sr2fR+nX+hs/wi1PhvLA/r5a7iH/RMmXFH9L7HoeiZjs7pOJlvnfbU0vJa5suiHva2xrH+m93vqds99a5r60fUn6q29V/509Zu+z4+O1rsuqAKrSwxW63a31Xuf7K9jP576C7GuuuqttVTQytgDWMaAGhoENa1o+i1q5/659Jr67j4XRLW5DasrIFlt9Ne9jGUg2PZk2b6/Q9dv6Omz9J+m/wa1WVqfVN1/1g6hd9bMpjq8aHYvRcdwjZjyPWy3f8LlvZ/YrZ6a61Dx6KsaivHobsppY2utg7NaNjG6/utCxvrfh9RzumnEx8mrDwbgWdRyXvNdldR2n1cez+a9v/AGoqu/nqP0fq1JKeS+uX1zp6p6nTelvF+DU8V3FrNxyssO3Y/Tqd7mNdh7mer1C7Zs9H9HX/ADv6Vukfauk0sbTkP+0auyLh+fY9zrrnbHe3Z6r3+1c2z6tZX1X6rj5OaLP2YzMvx6MlwGwl9bPsV7drv+1DPpW/zTPT/kPXTEgGCRIWV8TzTjOEIkxiBx2NOKXy/wDNYspNgPWfVzq2V1Cy6vKDHOqa0i1o2uIJPtd+b2SVL6nEHKyo/cZ+VySd72T7hx8Z47riv1V7nDuqz7d3rb//1fUcl7K8e2yxu9jGOc5vMgCXN1XLD6y/V6BHTf8AwOv+9dVfU26mylxIbY0sJHMOG1c+PqR00CPXv+9v/kFPhjypB9+Nn9HRp84OcuP3bhqjxcfD/wB01f8AnL9X/wDyt/8AA6/70v8AnL9X/wDyt/8AA6/71b/5kdN/09/3t/8AIJf8yOm/6e/72/8AkFL7fw39w/Y1K+K/6v8A5isPqfQ8utz2dPa0NO2HV1/Hso5HV+h0Wmp3Tg4gAyK641V3D+rWHiVuZXbY4OO47i34dmqGR9VsK+02OttBIAgFsaf2Vhcxj5z73l9iOP7r/krEOP8AR3/5zqwB+7Y+MD7z/lP3Wj+3eg/+Vv8A4HX/AHomP1boeRb6benBpgmTXXGiN/zQwP8ATXfe3/yCLj/VfCos9RttpMEQS2Nf7Kjni5/hPDHHxVppDdGMHjjxgcN+r+6gyeodExmNc7p7XBxjSuvwnuq/7d6D/wCVv/gdf960sn6uYmS1rX2WANMiCPh+6q//ADQwP9Nd97f/ACCGPF8R4f1kcXF4DGuzAcZ9oejpbRd1D6sZV9Ju6RXZYxw9F76qnFhJncwn6Hu/dWxd1/HpqdYankMEkCJ/6pV2fVLBY9rxddLSCJLe39hWbug4t1Tq3WWAPEEgif8AqUpj4qJRGP2xD9L5F+Lh4J+58/8Ak6af/PDD/wC493/R/wDJpf8APDD/AO493/R/8mn/AOaGB/prvvb/AOQS/wCaGB/prvvb/wCQUv8Awj/V/wCaw/rPBt1ddx7a22Ct4DwCAY7/ADWTnfWfomS4U5mA7IFFm9gsax4D2y1tjWvd9Ja9XQsaqttYssIYAASR2/sqg/6l9Oe9zzdcC4kmC3v/AGFa+F+/x5f9IVwUPZ9vz9XFwLef9728f3OuP/K8fl04mtlfWvouZQcfLwHZFBIJqtbW9stO5h2PcW+1yh/zl+r51PTf+hX/AHq3/wAyOm/6e/72/wDkEv8AmR03/T3/AHt/8gtQx+HHeJPnbn18W/1f/MbPQeqdNzrbm4WL9mcxrS921rZBJgfo0kbpHQMXpNlllFljzaA1weQeDOm1rfFJQ8PK+7XD+o7V1r/v21XOfda9P3m/6vB83/eP/9bt+s/VKjqt1uS3qPUMHIsAAdi5L2MBaNrf1eTV/X2rxr6yZX1z+r3Vrul5nV81zqodXYMi0NsrP83az9J+d/0Hr6DXD/41fqr+2ei/tLGZuz+mgvAA1fTzdV/K9P8Anq/+uf6RJTd+pPS+nXdPwuuY2fn5rrqtRlZT7WhxGy6t9OlO6qwOZ9FdWvHf8T31p+yZz/q9lPijMJsxCeG3Ae+v/r9bf+3Wf8KvYklKWD9ZujdOyabep5udm4DMWkl9mJkvpAYzdZu9Np9J1mv7i3l51/jF6jl9d6rifUbpDv0uQ5tnUbBqGMH6RjLY/MrZ+tW/9YSU859Rem/Wj61ZlttnWeo4/R8d0PtGRZ6jydWUVuLjX6mz3Wv2+z/ri9V6R0DG6S+x9ORl5DrWhrjlZFl/HdrbXOax39VG6N0jD6L0yjpuE3bRjtDQe7nfn2v/AOEsf73q6kpz+r9Fx+rMrZfdkUekS5pxrn0EkiPeaXN3ryr/ABkYnV/qrmYh6d1rqLsbNa8hluTY4tdWWbtr2uZ7NtrF7KvKf8ef0ujfDJ/91klI/wDFt0rqX1nx8rP6p1nqRposFVdNWVY3c7bve6x25zvz2fQ2L07pXS6Ol4xxqLLrmFxeX5Fr7nyY/wAJcXO2+36K4b/El/4ns7/w4f8Az1SvRUlKXNdU+pdmfkX5NXXurYllxLm1VZMUMJ4azHDG/om/uequlSSU/N2Z1v6zY2fdhWdXzHPotdS532i2CWONZP8AOeS9lr/xe4jaw1/WervfGr/tjgZ+DW7V4n1z/wAUfUP/AA7d/wCfXr6XSU8N1L6h/WLHqdb9X/rL1AXM1bRmXOsY4/u+o3a1n9qixcn0n/Gt9ZujZ7sH6xVfbGUvNeQ0tbXkMIO12x1eymzZ/wAIz9J/p17I97K2OsscGMYC5znGAANS5xK+e/rU4/WX665zuiVOy/tNobQKhO/YxlLrR/wbnV+p6n7iSn6Aw8vHzcSnMxXiyjIY2yp47tcNzUlR+rHSrOj/AFfwOmXOD7cakNscON597w3+S17tqSSn/9f1VNzoU6SSnwL/ABgfVu36rfWMX4QNWJkO+04NjdPTc1259LT+9j2bdn/B+kvYfqb9ZafrJ0KjPbAyG/osusfm2tHv/sWfztf8h6H9d/qyz6ydBuwmgfa6/wBLhvOkWtGjN37lzf0T15J/i6+s9n1a+sP2bMJrwsxwx8tj9BW8HbXe4H6Pov8AZZ/wXqJKfZPrV9Ycf6udEyOp3Q57Bsx6j+fa7+ar/wC/P/4NYP8Ai2+rmRiYl31h6rL+r9ZPqvc8e5lTz6jWfyXXfz1n/Wq/8Gspx/5//XYVj3/Vz6vulx5ZfdP+a9tj2f8AsNV/3YXpSSlJJJJKUvKf8ef0ujfDJ/8AdZerLyn/AB5/S6N8Mn/3WSU6P+JL/wAT2d/4cP8A56pXoq86/wASX/iezv8Aw4f/AD1SvRUlKSSSSU/M3XgT9YeogGCcy6D/ANdevb2fVf61ekG2fWrILgAJbjUAf9+f/wBNeIdc/wDFH1D/AMO3f+fXr6YHCSnzf6w/4tPrX1Oog/WR+cORj5IfXXPwpfdX/wCALncT61fWf6g3s6Zm9IxK2BrQS2sVvua3T1vttBc29/8ALe21e1rjP8bWFjZH1OvyLQPWw7KrKHnkFz2UPaD/AC67ElOr9U/rl0r604rrcMmrJpj7Ri2RvZP5wI/nKnfm2f8AUJLyT/FM7JH11xRROx1VwyPD09jj7v8Ar4pSSU//0PVUl8qpJKfqpeMf42/qs/F65R1TBqLq+rO2PY0T+sjTQf8Adlvu/wCM9VeeJJKfo76m/Vyr6t9Bo6e0A5BHq5dg/OucP0n9mv8Amq/5Fa3F8qpJKfqpJfKqSSn6a6v1zC6PXW/LFzvWJbW2imy5xIG46UMft/tryj/GX1DqH1ozMMdN6Vn/AGbCY8epZjWNLnWFm7aza72NbUz6S88SSU+n/wCLTrWX9WsbLwOq9Lz2VX2C6q6vGscAdvp2Nsbt3/mM2bV6d0rq2J1bFOViCwVhxYRdW+pwc2N36O9rHfnL5iSSU/VSwusfW/p/ScizFdjZmVk1tDjXjY9lgO4bmNF20U/+CL5ySSU6+d0b6xZmbkZjulZbTkWvtLfQtMF7jZE+n/KXrHQf8Yr29Ppp650rqGPmVMDLLWYz31vLRt9QaNsY5/5zPTXiCSSn6Bf9f8ItnF6V1XLceG1Yb/8AqrPTXMfWLA+v/wBeXV4n7PHRukMcHhuTYA97ho194Zuu9v5lLaNn/GLyVJJT9C/Uz6jdO+qmO81POTnXgDIynCNBr6VLNfTq/wDPn/bexL56SSU//9kAOEJJTQQhAAAAAABVAAAAAQEAAAAPAEEAZABvAGIAZQAgAFAAaABvAHQAbwBzAGgAbwBwAAAAEwBBAGQAbwBiAGUAIABQAGgAbwB0AG8AcwBoAG8AcAAgAEMAUwA2AAAAAQA4QklNBAYAAAAAAAcACAAAAAEBAP/hDwdodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIiB4bWxuczp4bXBSaWdodHM9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9yaWdodHMvIiBwaG90b3Nob3A6TGVnYWN5SVBUQ0RpZ2VzdD0iNDYwQ0YyODkyNkI4NTZEQUIwOUMwMUExQjBBNzkwNzciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTIE1hY2ludG9zaCIgeG1wOkNyZWF0ZURhdGU9IjIwMDctMDItMjhUMTY6MzQ6MTcrMDE6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiB4bXBNTTpEb2N1bWVudElEPSJ1dWlkOjU4N0M3RTRFQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjdDRDA4RDQ1NUZERkUzMTE5MjY4OTU0MTZFNzMyQzc1IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InV1aWQ6NTg3QzdFNEVDOEQ0MTFEQjk2RTNBMEI2OTA3Q0JDMDAiIGRjOmZvcm1hdD0iaW1hZ2UvanBlZyIgeG1wUmlnaHRzOk1hcmtlZD0iRmFsc2UiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0idXVpZDo1ODdDN0U0REM4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIgc3RSZWY6ZG9jdW1lbnRJRD0idXVpZDo1ODdDN0U0Q0M4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIvPiA8eG1wTU06SGlzdG9yeT4gPHJkZjpTZXE+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo3QkQwOEQ0NTVGREZFMzExOTI2ODk1NDE2RTczMkM3NSIgc3RFdnQ6d2hlbj0iMjAxNC0wNS0xOVQxNjoxMDowMyswMjowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjdDRDA4RDQ1NUZERkUzMTE5MjY4OTU0MTZFNzMyQzc1IiBzdEV2dDp3aGVuPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPD94cGFja2V0IGVuZD0idyI/Pv/uAA5BZG9iZQBkQAAAAAH/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECAgICAgICAgICAgMDAwMDAwMDAwMBAQEBAQEBAQEBAQICAQICAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA//AABEIAJgAmAMBEQACEQEDEQH/3QAEABP/xAGiAAAABgIDAQAAAAAAAAAAAAAHCAYFBAkDCgIBAAsBAAAGAwEBAQAAAAAAAAAAAAYFBAMHAggBCQAKCxAAAgEDBAEDAwIDAwMCBgl1AQIDBBEFEgYhBxMiAAgxFEEyIxUJUUIWYSQzF1JxgRhikSVDobHwJjRyChnB0TUn4VM2gvGSokRUc0VGN0djKFVWVxqywtLi8mSDdJOEZaOzw9PjKThm83UqOTpISUpYWVpnaGlqdnd4eXqFhoeIiYqUlZaXmJmapKWmp6ipqrS1tre4ubrExcbHyMnK1NXW19jZ2uTl5ufo6er09fb3+Pn6EQACAQMCBAQDBQQEBAYGBW0BAgMRBCESBTEGACITQVEHMmEUcQhCgSORFVKhYhYzCbEkwdFDcvAX4YI0JZJTGGNE8aKyJjUZVDZFZCcKc4OTRnTC0uLyVWV1VjeEhaOzw9Pj8ykalKS0xNTk9JWltcXV5fUoR1dmOHaGlqa2xtbm9md3h5ent8fX5/dIWGh4iJiouMjY6Pg5SVlpeYmZqbnJ2en5KjpKWmp6ipqqusra6vr/2gAMAwEAAhEDEQA/AN8/fO6qbYuyd4b3raWorqPZ21twbqq6GkaJausptvYmry89LTNOyQrUVEVGUQuwUMRcgezLZdsk3reNp2aGVUmu7mKFWaulTK6oGNM0BappmnDok5m3yDljlvmDmW6haS226xnuXRaamWCJ5WVa41MEIFcVOeqaYf543Tc0MUv+g3tlfLGkmn+JbKOnWoa1/wCNC9r+8t2+5lzcrMv9ctrwf4Z/+gOueLf3mHtqjMjcgbxqBoaSQUqPTIx+Q6yf8PhdOf8APju2P/Pjsr/69e9f8Bpzd/02O1/7zP8A9a+tf8nMvbT/AKYDef8Ae7f/AKC69/w+F05/z47tj/z47K/+vXv3/Aac3f8ATY7X/vM//Wvr3/JzL20/6YDef97t/wDoLr3/AA+F05/z47tj/wA+Oyv/AK9e/f8AAac3f9Njtf8AvM//AFr69/ycy9tP+mA3n/e7f/oLr3/D4XTn/Pju2P8Az47K/wDr179/wGnN3/TY7X/vM/8A1r69/wAnMvbT/pgN5/3u3/6C69/w+F05/wA+O7Y/8+Oyv/r179/wGnN3/TY7X/vM/wD1r69/ycy9tP8ApgN5/wB7t/8AoLr3/D4XTn/Pju2P/Pjsr/69e/f8Bpzd/wBNjtf+8z/9a+vf8nMvbT/pgN5/3u3/AOguvf8AD4XTn/Pju2P/AD47K/8Ar179/wABpzd/02O1/wC8z/8AWvr3/JzL20/6YDef97t/+guvf8PhdOf8+O7Y/wDPjsr/AOvXv3/Aac3f9Njtf+8z/wDWvr3/ACcy9tP+mA3n/e7f/oLr3/D4XTn/AD47tj/z47K/+vXv3/Aac3f9Njtf+8z/APWvr3/JzL20/wCmA3n/AHu3/wCguq2f5p38wHP/AD2+PfXPxK+P/SPfslP3X8ofj/tL5A0Gzc7j6fdeU+Msu9aep7YwmGoNn59dx7hj3FRQwUNfRQAxHGS1D1H7Ak9gn3B+7HznyFyve81fvO03CytSGnSASCSKLNZtLqutFbSrBNTjVqK6QxEnez/36/a/3a572zkEbVe7RuV+NFrJdNH4M9wWAW21oSsUkiljG0pRHZfDDeIyKWz5h/D74PdLd9Zf4r/ytvjJ8+qT5yUuI2V2T2Htn+XV8wO0fiH0j1vtXeWTrodqQfKHuDc28s/1F1NiN2YDH5aoxONw2263cVXQ0pjpo6SKann9429ZudWNdUfC7+c9hev9s0tZ/M+6x6byO0qp49vdRwfH/K/NLblRtc02XmXCdqfJr5Ib42r8ju190NlMlB/ueSTBGCGiCmkqEl8cXuvdKnd/yq/mv/C7amZ3b8qfib0f83etsPUNN/pA/l8bu3H1/wB3UuBocNHPOK/4k/ICsyp39uyvyMU3gpdn78r6qojUsmNjAKreIRGRBM7LETkqAxA9QpZa0/0w6anNwIZTaRo9yFOlXYopNMAuqSFQeFQjfZ0kNl/z9fjf2PtDbfYGwuruy907L3djlym3s9j8ls5YaunEj01XSVdLPmIqzFZvD18UlLkKCpSOroauJ4ZkVl95X7F90/eOZtm27mDYfcDaLrZ7uIPFKi3BVgeIzGCrKaq6MAyOCrAMCOue/NP94VyvyPzNvvJnOPtNzBt3NW2XBhubaVrcPG4ypBDFZIpUIkgmjLRTRMskbEHpS/8AD4XTn/Pju2P/AD47K/8Ar17Nv+A05u/6bHa/95n/AOtfRF/ycy9tP+mA3n/e7f8A6C69/wAPhdOf8+O7Y/8APjsr/wCvXv3/AAGnN3/TY7X/ALzP/wBa+vf8nMvbT/pgN5/3u3/6C6OJ8O/n3sj5j7h3zt7aewN47Nm2LhsJmayp3PVYKohr4s3W5CiigpFxFdWOkkD48sxewIYW+h9xN7sex28+0tjst9um92l2l7LJGohEgKmNVYltarg6qCnp1kR93z70vK/3htx5j2/l7ly9sW22GORzO0baxIzKAoQmlNNcnNf2/wD/0N5n5Cf8yC7w/wDEQdl/+8XmvYr5D/5Xjkz/AKW1p/2kR9R77uf9Op9zv/Fe3H/tDm60VKP/AIB0n/UNB/1qX32pk/tH+0/4evl4uP7ef/Tn/CepPuvTXXvfuvde9+691737r3Xvfuvde9+691737r3QfZ1+6tzdxfG7oXpLA9bwbi+SfYWV6zpe2e4n33W9XdX7ngwjZramP3XtzrCiq97V8vYtTTy43H1atT46lrdAqpY0ZpI4N99/dPmL2n5d2retg5Yhv1uLgxSSzu6wW7UUxrIsdHYz1cIwdVVk0mpYDrK77ov3fuSPvFc77/yxzlz9ebQbC0S4jtrOKJru+jPiCZoZrhZII1tSsbSp4byMkmsaUVj1Z9j/AOSR/NG3J2Jidj7m7y+G/U3UsVRkZNy/Ijqra3YG/wDtTK0i7beqw1Btn489uUFbsLbksu63SkrKqq3XkHWkQzwx3PgfE/d/vge4m4bRFa7Zsu27dvWsl7hA06FfJY4ZqhD5sWaSuAKUNeh3Lv8AdoeyG0c1XG5cwc1cw77yjoAisZpY7KRX/E0t3YpFJKvkiKIgMltR06VV0L/KG+b1T8oux+kPkLuKhwnx92PtXD7k66+enQMuE6w7B7Gy2WipYafA7Z6iy+5OypOq+29m5IT1j5srVYSlko43hpJxUwpGYL97vmC/5N3/AGTfuWLV+Y7i1aCK5hOiECRTG7zW8niVcKSwCt4bN2sgXiVr/dv8lbH7n8rc28o897gnJFpfR3M233YE048J/FSK3vIvCcxMyiJ/HBmRSJUlZwVOwf8ADv4L9L/CbGdpf6Ncp2dvzffeW+afsbunufvLsHLdqdydpbsoNv47a+Iq9274zSRVE2NwGDxiQY7HU0VNjsekkv28EXlfVh/nzNT+X+Sg/YKddJzSuBQelSafKpJJ/Mk+pPRy/futdFU+aXxE6y+cHx53v0D2Yk+MGbgTN9ddjYZGh330h29gYqip637v6wzVNU0GT252J1ruGRK7H1VLU07yKslLKzUtTURSe69189fcW+sx8Q+8sts35Y0HXHx93vuCq3B1r8peu9rUMsVDQ/LjrXF4jKdd/KPaXXW0MZV/3d60+fXQGQpMlJUYSHJ4vMdiYLLyxjHvIKJMp/uze8NjyFuW9ct837uLfk66hM8buGK290mkMajCpNCCGqGOuOPTQkg89vv5fdo3f3b2LlXn72x5Ul3H3U2+6jspoIHiSS8224ZqdsrIjy2dyVkQ+ImmCW4w1RQQKr5f/HOhiyFXXb43RQ4nDy0tLnNxVvSPfdHtrAZKuopspj8Fn8xVdYQx4bPZPDUstfTU1QkfnoIZJ1cqh95fD7yHscZlhHuLZ1IqG0T+H/pS/hUD+YU0JGRjrnC33H/vcLDJMfYvctSsB4f1O3GUgiviKgvSGjHwlg2oOQNFM9LnYffvRPaFcmI6+7j683JuBgb7TbPxbd3tG+pk8Mmxt3x7e3gtTdL+P7EyBSpIs6Fh3y17ichc4iH+rHOG33ssnwxpMolPGn6T6ZM0NO3/AAisRc8+zHvF7ZNc/wCuD7Wb7tUELaXmltXktlNAe66t/GtlFCMtKBxFaq1NiT+R/DNTdofIeCohlp549kbBEkM8bxSxk53cZAeOQK6Eg35H094w/fOxy/yJX/lMuf8Aq3F1n5/dgSxzcxe6MsMivE1ha0KkEH9V+BGD1//R3mfkJ/zILvD/AMRB2X/7xea9ivkP/leOTP8ApbWn/aRH1Hvu5/06n3O/8V7cf+0ObrRUo/8AgHSf9Q0H/WpffamT+0f7T/h6+Xi4/t5/9Of8J6k+69Nde9+691737r3Xvfuvde9+691737r3XvfuvdNmf+S24fhztrcnyc2nvXEdf7m6iw9TuDbm4dx0OVy+2qjcM9sXg9s7i29g6/FZfdOH3ZkK9MfNjYKqmkqknP7sQUyLHnuz+4R7Z87f1mlhTaDYuC0qu6CZqC3OiMq7OJtBjCMrawDqAB6mX7ux5s/19faockWdxccxDd42VIGiSXwFDG8YSTK8UUYtPGEzyI6+CzppYuFNg/w1/wCFQ9fu7ePU/Xfzt2r8KfjRkq+toNo9w5o/J/sKn3VtvMVNEtTFv6m62x3RPY/Xm1Nt11TVUcEuDzPZaV+LNTJLU1irS1Eacb/hoo1svDVpP7WKjStfmQPTr6bQrSLJKVjSmSusY86IGOtwPKgJpxz1fj8I/wCaj8SPnzvjuDqTpXcW6cZ3X0BUSQ9xdRb524uO3Fs+I7ozu1qDKUW6tt5DdfVO/wDAZmfBirpcjtfcWbonoK+jleVDUKg2QRhlIPoQQf2HPTQZWFUdWX1BBB+wgkH8j1Y5791vr3v3Xuve/de60HPnP1n3Z/Mn/nG/zJsZ07mNifGjuT4J7K+Du1/jP2r2vvDbfXvWWW7Z6y7e273htmr7PIp9wbm3D2Dvsbiz7bHraXGVtLDicXBR1/2wqEdfde63k+saze2D6X69yHeuWwUHY2H6v2nWdx52nbH4rbMO9sftSgn7Cy0DxTDFY3BR52GsmUrJ9vDTgWbQL+/de6LN2l8RP5ef8w7piWo390x8dPkp1D3HTf3zxfYe38ZtbNf3klzGMhxcPYew+4tiy0+5cduGoxFNHTwbhweYp8gtPGEjqQgt7roTxFl0jxV4N5j7DxHAdOCaURPB4h8BuK1qppWlV4GlTSo8+qFcvtDI/wDCbr5MbQ7Hw8HfXfv8qX5PRbS6V3vlt17rxfYfYHwT7gn3PNFsDJ0mYztRjM9uLobezZl6eamndDi5YHcVVRWmhoMqKN05y5o3zZtv2Det8uLva7SVngWZjIYiyhWVHar6CqqAhYqukaQtWrH2we13t7ypzTvPOfKvKNltnMO5QLHeSWsYhF1obWsk8aUieYGo8bQJCpKsxFAP/9I6/wDM/wD+FKOa2f2V8jviz8Rvjod4dT9Ib2xfx6+XXzw7V252vub4/dA5nfOeqest2LW7F6kwP978xBt3Oz1mOpayXLUMuVy+Nmgx1BkInpqicw2jc59l3XbN5tY0e6tLiOZFeuhmidXVW0kNpJUBqEGlaGvRPzDsVlzRy/vvLO5TSx7fuNnNayvFpEqx3EbRO0esMmtVclNSsuoDUCKjqoD42fI3Ad41Xaey6bcPXW8N2dJZ7EYXN746Xn3hkOlux9s7jonrdob/AOuq7fWIw27MXTZanglhrMNlYhk8fVQOJABdU6reyHvCnu/se6XN3ti2fMVhIguI49ZgZZdRjkiZ6kVKsrRs7uNOqulsfPh97D7tk/3cecdntrDfpNy5L3lJnspp/CW7R4SnjwXKRBVbSJI3S4SOONg3hldaEsZ/3NnWLHXvfuvde9+691737r3Xvfuvde9+691737r3RTvm90buz5EfHPcXXuwpaJt7Y7c+0t/7awuXyf8ACcDu+t2dU1k020MzVO8NKFy9FXSGkNTJDTrWxRa5YgfIsU+9PJG6c/8AIN9seyGM7vHcQ3MUcjaY7hoWJMDtULSRWOkOQniBNTKO4T/92D3T2H2c95dm5x5pSUcty2N1Y3E8Mfi3Fml2qBbuFQC9YXjXxfDV5DCz6UcjQ1bnxv2r80uk8X8lOluv/iFtrsLrvNLHvDcGwPkRjNubfqv70brpMccXtePc+NzNFg+98NJjMe84xMFY9PDEiyNJQVErwy428g7N7s8oQ8/8pcu+10N7sU36sltuSRJpnkWiQiRXNvfx6FasasFUBQ0kLv4b5n+9PMH3bPdDcPZj3N5w+8RfbTznbsbSDcNglubhTbWryeLdNbSwvPsc4lkCG7kiWR3JQJdwoskZmPid3J8+f5PPyZbs7pWs+Mmw+ufnnu3qLZ/aub7W2ln+wuquo+zcs+7Mxj+t8rT7Q3PgO1sHtDae49yZCP8AiGKaSlfGiMs1Q9IqmF/e/wBoubOTboc6bht8MezbnIjuIXDR2t3OryyWYBYyFIyr+E9CvhhVLahnLP7qP3l/bz3TsZfa/ad2vH5q2GKWOI3cTLNuO2WkiW8G6F0TwfEuFeJp4iyzCZmcxqrCm75/Jp/mMfLj525f5v7B+YHQ3WHS/Y3w570wnReUl6ay+U3P1/lN5w4bLSdh7SXdlZurduOzO6+v83iolyKUU4ipIslTRvqk1OcfeszerwffuvdQMpBX1OMyNNiq+PF5SooKuDG5OaiXIw46vlp5I6Ovlx7T0q18dJUMsjQmWMShdOpb3HuvdfIO+bnxXqOvvnZQ/GD5w7v7Q3D8nq3uneXU3e3yT3nnNw5mo7f2z2HmKLN/Fj5YbRzG/wCujxmMws+DyLYPIbffIy0lNRYQxCpWoLCkF/Ie17NvvNuy7DvsrRWF9KLfxQwUwyS9kUuahlSQqXUjuTUBmnUWe9fMvNvJXtdzjzryRZRXe/7NaNfC2kSRlu4rb9W4tv0leVHmhV1ikjR2SXQdDrVS69QR/wAy75U7/b+WB8bvk589PlN8POpdxZDb/cVP0hjM8YcF11u2qxG2+z9uVeA3L2xtrZO49grU7YqIts4Tdm6sdtmsr1nqKVKP7urkdvnfYto5Z5o3bYdk307lZ2kpiM5hMAeRCVkCoZJKqrgqr6qOBqGCKrfabm7mbn3kDlznHmzk9di3TcYBOtmLoXbRwSjXbtJKIYAsskRR5ItFYWJjLMyk9fUA/lsbi64ynw16a2l1N0X8h/jjsHpfbtL0Lt/qj5SdbwdYdyYSl6fpabZX3u5MLjq7K4HNNmjjPuv4xjKuqoMpNLJNHIWLhQp1I3VW385bt/43fzIvhLvb+X98U+2+svkx3j8ku6Pjp1Fh4ujt1YHuDGdJ1f8Aptxu8Nz9tdpZbYVbncdsranWe0OpNw1OTNZUUszyQxUBMctfBr917r//09iT4n/yg9x/Eze3cHQr9p7S+Vf8r35FHsftPsj46/K7ZO198dvbS+Su5d8bV3Rjd4YXsSj2REO29sZ+lxsjZB92VBy2IyWIxlZQSyVD1Uw917rU4wnwq+SH8ohu4urvkb8QO0MZ1Hne3d4756v+TPxr2jmfkx1luXYc82ModvbV7J3NtKiXsfaOT2xHWCHESbsxWIqMh5Kwx01lM8uYn3dPfDkb295f3Tlvmu3ktZpLozC6ih8QSrpCiObR+pqjOoxmjJpdh2Efqcx/vs/dP94feTnnYefvbe+t9ys4tvW0fbrm6+nNs6ySSG5tC6mDTcAotypMcmuKJg0i9qJDHfzCfhtW5+q2vlO4ajYGdoo5JKmi7V6+7A6+8fid45IjNltvSRx1KyRsPHIY2JUgXYW95R7Z94v2Y3aQw2/OiRSgV/XhngU/Y7por8iQfSvWA/MH3LfvSctWq3d57Ty3UZYDTZXdndSCvmYhMj6f6QBA86DPUGi/mP8AwZr8dkspF8h8HTw4uGpnno8htHsOgy9WtL5NaYjGz7UEmTnqPEfCiMGk1L+m/Dsf3hfZeWCa4TnqIJGCSGguVc0r8CNCC5NO0LUnHr0zc/c0+9HaXlnYye0F08k7KqvHd7e8KFqUMsi3VIlWveWFFo3GmeP/AA4v8QpWx/8ACt79g7opslQw18WR2l0p2ZmMdSioCtHj6+abB4+ZcqiNqkjp4qmFALeUtYEpuPvO+ycEsca82PKpWpaO2nYIT+B6oCslMlQDp4E1x0ILb7h/3r7mGWVvbSC2KuVVZ9xs0eUCv6sOiSVWhYiiO7xs3HwwM9LrZPza+IXYLU0G3vkN15QZOrqhQxbf3xV1/XWfjrjLJD9jVUW9aHC00FUJYipHnZbkDVqYD2LNk96vafmERfu3nywV5KaUnY2zkngNM4TJpQUJBxQ5HUd81/dg+8VyU90N+9nN5a3gUs81nGl/CFFCWDWbzOQK5rGGFDVaAno0k0E1NJ4qiJ4ZNEcoSRSpaKZRJDMl+JIZ4yGR1urqQVJBB9yh1A8UscyeJE4ZKkVHkQaEH0ZThgcg4IB6xgE8AX/1vfur8OPXZVhe6kWNjcEWP9D/AI+/UI8uvAg8D13oIgq6uRooKPHwNV5CuqpoqTH46kS+usyVfUvFR4+jjt6pZnSNfyw90kdIo3lldViUEliQAAASSSaAAAEkk8B1rVWW3t0VmuZnCRooLySOeCRxqC8jnyRFZj5Dooe8vn78P9k5GqweV7vodyVOEpqmqyrdb7c3Z2dhdt06zRLUPl89tDE5LAUKyVMwUmKolXyghyrAXiPfPf8A9neX7sbfuPPMElwCR/iyS3SKcVBkhR461NKKzGoNaU6yQ5S+5595fnPb5N62T2ju4LNtJrfS2+3yyChCssNzIk+kAcZEjwRpqD0AvyNyPUHzAX4x5jqDtb4997QdY9t4/tXI/FvevbNL1k3yDwtPU4aOu2PV1tXLi957K3BVUuOmxxpKynx870mRmkhkSVY/JFPvhbbH738r8r2/t77g7RcbhFcSSpZtcpHJda1WNdMb0ljnjNQI5UQFZGYstBWffut7nzT90fn7n7d/ez2T5ps9kubSG0m3OHb57qHb/BkeVtb2wkhns5tQZ7i1knMbwopUqWKbCHSv/CmPdfxWrcj1t/NP+HvYm2e3e3uyc3uToyr+FWw9n7z2Fu3Z+XG38Xj9kVNPujtjBbk3H2btjOuaCqq4RPNkjUUqCniKq8+D3PvtrzZ7bX1pYc02SRtOmqN45FljegXUAynDJqXUpoaMrCqsrHqx7JfeF9qfvCbPu28+1/MX1kVhOIrmJ42ingZwzRGSN8hJkVnicVDKCMMrKtwP8x/+cf0l8HvhFV93ZLIU+yPk12z1hna74w/F7tVKJO4M92XVU1Zi8LSb36/2blt01GD2/srcSh9yVE9ZBQULU0lBNW09dJHF7AfU19VMfyKu1/5tH8xD4H7kz9F8s6j4/bTxvYnZ+Gw3yr7L61Pyb+RHdvbNVvDbW+dybp2fhe1J8J0ftH43bamyuT2pQ4TG42vemSCejpKnHz0AmX3Xuj6/J34T/E/+f71DsH5DdMd+9j9Kbt2xJ2/8XewOxNubINHvyt6ri3RldofIP409g9UdjzxDYmYye4sQlZRV1XTHK4uNop41qKSsKS+69w4da5+ztpfzi/8AhLf0t3zWYdPhzvr4e79+Wez9p9f7o7I2nunem9d9Z3e1NLRY3sIUHUe4Np742njB13sLRk8duDIV0NDkYzBiaeWSrNVUeJJNTx68AAAAMdbeHyN+aXfPxV/lcd9fLn5T/GDa03dnS2wd4R7u6P6z3y3ZHVvYtdS7r/0fbe3nt3c1ft/FbjoOm9/0mRpdyVlJmsRDntv4CoqKaup5aqldpdEgAknHWwCxCqCWPWvf/wAJmesuzvkD3vvT51/IUUXXu7E6V2nQdZdK9XYmi626+lwdXWbx2Rtrf299k7cxOCx5h2j1cI9q9fYI/cY/B7VU1TibIVS1SyVzH7Zb1ypyNyrznvbCI7xNIIICrB0gjVSssmocZi2qMDAjCsSS9Egvkn335a9xPdr3A9suVITPb8s28QvLzWpikvJXo1tbha6ltlGi4kYj/GCYlX9NmP8A/9TfV3juWl2ZtHdO8K6nqKui2ptzN7lrKSjMIq6mkwWMqspUU9KamWCn+5mhpWWPyOiaiNTAXIM9l2ubfN42nZbeRUuLy5igVmrpVpXWNS1ATpBYE0BNOAJx0Rc0b/a8qcs8xc03sMkllttjcXUiRgF2S3ieZ1QMVBcqhCgkAkipAz1Vp8TP54n8tv5gbhzuwdod+Yzqbtrb2f8A7u1nTXySpk6I7KyFZPXGgxku18PvmrocfvSPLzAGGHEVddWRBk+4ggZ0Ut71tl5y/ut7s27QNBfwTNGyurISVYrUK4VqNTUtVDaSKqDjpRy3vO382bFt3MewXMd1tVzbpKrxOkyqHVWIZ4WkjqhbQxV2TUCFdhk2FdhdL9A/ISh2bW9o9X9Udz47am5Ntdj7Brd67R2rv2k2/urb0suR2nvTatVl6HJxY7MYqWqkloq6lZZI/KxR7O10HRr1PyHRPR+XyGNy2V6b6qyeVw2TkzWIyeQ682jW5DFZmVGjly2NrKnDyVNDk5I2KtPEyykEgt7917oTqampqKngpKOngpKSlhjp6alpoo4KenghQRxQQQxKkcMMSKFVVAVQLAe/de6Jp8ov5dHwa+aG3dybe+THxa6X7Tk3TQ1FDXbuy+xcHR9l49p6U0YyW2+0cRSY/sLa2apqeyw1uPyVNUxgWD6bg+691rPZb/hN186/jnVLsz4LfO7qPe3QRyOUyWC6/wDmn1jmcnu7reGadHptv4XsDrekyc+68ZkUYmpf7TAR0zwqYKYmSVvc3cj/AHhfcvkHa4tl2vcLe62qNtUcV1H4ojr8Sq4ZZAjGh0ayq07AtW1Yn+7P3K/Yf3i5jl5t5g2e92/mSaMJNcbdcNamfT8DzRUe3kkQVAkMWtgaSFwFCyuq/wDhOf8AzHt+7rlqPlv/ADQsD1517B9tbaHwu6wp8FuHO6IplkP9+N44DbJ2lIsk/rP8NzaVSRrrSNgGVzefvIe8e81Q84SWtvg6LaOKAVFc6kTxM1z30NBjA6Y5Y+4z92DlhVP+tnDuVyCf1NwmuL1qHTjTNI0VF09v6dVq2kgEjo33/QM5sLEzU9XtL+Z1/MwoaqghWLHjdvZnT2/Matop9X8TxOT6YoqLNRtUtG4WdSQiMmolgyEVr75e8FnLDND7ibo0kfDxJTKv2skmpX/24PQy3L7pn3Zt2hure69juXUimarGG1S3cH+hJDoki/5tsvQQQf8ACYTI9qZ/qTH/ADO+du5fkj1J1V2LWbh3B19gOo6/oxO/uvsri5jNsjtqs677hgqKLdGE3BT0f2W58ZKKpsSKqmNLHPPHV0zHOXvF7hc/bXtu0cz7601rblydA8LxmfT3TohEcjIqhUOgUGo5Z2JU+1/3Y/ZX2b5h5g5l9vuUVtdw3Dwv7Vzc/SrEhUx2Tzh5raKVmMksaS6GfSQAFA62I/i/8IPiN8LNmZLYHxX+PXV/SO184mJXctNsrbdNTZLd0mCoP4Ziarem46373cm9MhRUbOFqcrV1lQXlldnMksjNGPU+daWv86r/AITt/wA0D5yfMbN9/dM7R+CGN2TWVu8aDaOP6Ux6dDbmG3KTcWa3HtDdveuRz2LbI9jd37sgyCU2Wy0FbVUUE8EP26U9OZCvkJjfxI+2SoNRg1HA1GajyPXpf1ovAm74dJXS2VoeIocUNTUcD0uepv8AhGJjt8dWYrcfyh+c3b1H3nntpbPqajbWE2ltTfW0urNyVeBpI+xdsVed3PnsnVdo00eXeoTE5Si/uwaSMRs0NQ6CRlt7uW47k4k3G/nuJBwMjs5H5sSeiva9j2XY4mg2XZ7WzhY1KwRRxKT8xGqg9WL/ABo/4SSfy6utsqu7flRuLs35qbsSGlFFht0Vi9GdM7cq4an+IVVTtPqnpCu21PjKXIZKSSSXH1eayGLdXIemd2lkkRdGnWzf1315sXqTYm0OsOsdp4HYfXmwdu4raey9mbXxtNiNvbZ23g6OKgxOGw+NpEjp6OhoaSFURVH0Fzckk+691S7/ACvuvG+LHz4/nAfFXKZGmC9k/ITZ38xTrDHY+XF0uGqOuflpi9wbe3GMfgqSKKsxma2l2X1BX4zKtJeGogOOqI/VPL7917q5LsjqbrHuHF4LB9q7C2p2Jhdsbz2t2JgMRvHCUGfxmK3zsfJx5vZ+66ShyUNRSx5vbOYhSqop9JenqEWRCGUEe690ptz7mwGy9tbh3juvLUOB2vtPB5bc25M5k546XG4XAYKgqMpmMtkKqUrFTUOOx1LJNLIxCpGhJ4HvRIAJPDrYBJAAyeqA/wCTR2N1X3J3p8pu4ei581VdL9rYLbHYXVs+4sNV7ezTbM3Ru/duSxaV2ErwK3HLTmV44EkF3pUjcXVwfeZHv9uu4b57L+xW8bqrDcLi3LOWrViIIV1n1LhQ9QSDqwSKdc2PuibFsnK/3lfvVct8vOp2qxvzGgQAIgN1K4iSgHbEHEeQGBUhwHDAf//V3mfkJz0F3gDyD1B2Xcf+SXmvYr5E/wCV45N/6Wtp/wBpEfUfe7f/AE6r3N/8V7cf+0ObrQn3j19132vgcdh+1evdjdm4ympYhSUu/NrYfcsmP10ogLYnI5Glly2Fl8TFRJR1FPIo+jD32R5g5d5f5niNnzHsVnf2y6gq3EKS6a1qULqSjejKQQcg9fMvy3zdzhyDul3uPIfN+6bJeu51tY3U1sJKNq/VjjYRTCorpmjkU+YPQC7N+Kk/QGYg3l8Hvkf8j/hJv6ldpXresezN07u2BuPTRtj6Si3p1tvHOzY7P4+gpG8UEctTJBDGq2p2ZEZcd+avum+2O9Q/8hs3Oy3ta1R3uYmJJqXjncvjGnw5U86g4pmTyB/eJe/3K94P66jbuadoIUaJoksLmMLj9K4tIvCNRxWW1epyJEFR1ZD1D/Ni/nh9C0OBw27dz/Cf527awsWUqM1kd9YHd/x77v3KrRf7jMNR7m2rHjep6OankAKVNRg5C41LPKSyzLAm9fc65+tEeXYuYdrvlUElWaS3kanBUDq0ZLeRaVQDxxnrL3lX+829oNyKxc4cjcxbPIzqodEgvoVB4yO0Eon0r5qluzkZUE1HR99of8KdcVgMrjaH5S/yx/mz0ri8jR0scm7eqqfZvya2tjM2J0TMDIV21avZ1Y21cdTuJYclTU9TU1g4ShXgmE969l/djl403PkHcTQkEwxm5QU4nXB4i6fQkgN5V6yp5U+9L93LnZpV5e95tiLqAdFzcCyl7uA8K78GTX6rpqpFGoelXvH/AIVG/F+HOVuA6c+EX8yHvE0uTbHU+5sL8dcfsrZmVUgmCroMhvfe+K3HSxVCjUqZDE0MoWxZV+gKrH2x9ydykEdl7f7y+aV+kmCg+hYoAMZyQKefQi3f369jdht3uN294+WIVClqHcrUuVHEhBIWYVxgE18uha+PX8/vb3Z+d3kO7fhL8hfjNsnHUOIqOvdwbp3H1tvLde+Kypnq0zVBmeusBmqPLbEGJplp5Yaiaoraes8sqaopIQssmbB9173g3uKW4uNlt9ugAGj6udUeQmtQscayuukUJMgQGtFqQQIJ5q+/192nl2a1tdr5rut9uWdhIdtt/FhgVR2s9xcSW0Mms1UJA0zrQM6qhDdD3uP+dp8dqHxLtbrLuPcrs1pnr8dtTbVPEuoDUjzbnyVVMQtzYQj6W/Psbbb9znn2dv8AdrzHtNtH/RaeY/sEKD/jXUab5/eVe0VmhGw8nb7eT6SR4otbdCfIa1nuGFfMmMU+fVbNd/wop+X2F3zmsVP/ACj6zeHX0e56ilwG8tjfNvqp8zWbNjyc8NNnKzaO4evcW8OfrMT4qgY16ynVJS0TzqB5PYK3f7rnvPY31xBtnLMd/YrIwSaO5tk1qGor+G8wdS60bSwqtaHh1JnLn3/PuvbttVpd73z7NtW6NEhkt5bDcHMUhUGSPxktfDkEbVQSIdL0qKVA64fMn+eB1Z3N0t1gOuPlF8rv5QfdmO7Lyu7Hzfd/wQz/AMhdubj21svC5jC5LZfYmK6wTtPaibI3fkc5FkKDJ0mRnljXE+aop44nRxGe/e2XuDywscm/cnX9vG+ujGIsv6fxklNQAHEE0DKNS1XPU6cm+/Hsv7hPPHyX7n7LuEsZiDLHcoGBmFY10uUJY4DIKsjkI4V6r0EG1v52v80vZPVnX/fmTg/lS/Mvo3J4fP1mz8N0p2d3r0j8svlntfa25TtPI9g9YdP9k4TKZLrmvwHiNbuKlzO2I8fF4ppKVoaWSlLFmzcl848w3G3Wuy8q7hcSXau0JEEio6xCruJHVY9C4BbVQllArUdCDmX3Q9s+TLTe77mr3B2eyg22SCO6DXULyQyXLBII3hjdpBJKSdCFQe1tWnSabUnxY+QWD+V3xz6Z+SW2dmb86+233ZsHA9ibe2h2di8Xht9YfB7jpRW4kZ/G4XM7gxdPNXUDx1MJhrJlkppo3upYqoZ8yPMEg/Ig0IPoQcEeR6HPkpqCCAQRkEEVBBGCCCCCMEEEY6H337r3Xvfuvde9+691VzuLpM7f/nLdZ/Jql7Bp6Edm/wAuzsj455vrHJ7ZzdPBnj1b8gtm9sbb3btve8NM23K/cuHHYuTp6jCVMyVq42WSsp45YkqXg917q0b37r3WuV/wpky2+st8Nvj10FgN5bi6769+V/zQ6t6D7t3btTIyU+ZreuMrsXtLes/XgxtJLSV9fjOw8zsmlpKx1nSnhgiZapJqaWWMjT255dsOb+feU+Vtyu2hsr+8WJmUEse1m0Cnwl9OnWahK6iDShiv3z543n2z9mfc33E5f2qO83fZdoluY4pJBElVKr4jsQ2pYtYkMajVIF0KQWqIP8iyhx+L353niMRQ0+Lw+G606wwuHxdICtLjMPh8hnMbisdTBmdhBQ0FLHEuosxC3JJuTmR98a3t7Tlf27s7SER2kNxPHGg4IiQwqij5KoAH2dc1f7s26u77nD3g3DcLp59xubeGaaV/ikmmuJZJZGpQankZmNABU4AGOv/W3mfkJ/zIPvD/AMRB2X/7xma9ivkP/leOTf8Apa2n/aRH1Hvu3/06n3N/8V7cf+0ObrRUo/8AgHSf9Q0H/WpffamT+0f7T/h6+Xi4/t5/9Of8J6k+69Nde9+691mhqJ6ZtdPPNA/HrhkeJuPp6kZTxf3ZXdK6GIr6GnTckMUy6ZoldfQgEfz6yzV1dUf8CKyqnsCo81RNL6SblfW7cE/j3sySMKGRiPtPTcdraw/2NtGmfJQP8A6ie6dKOve/de697917qTBW1dMk0VPVTww1KmOphjldIaqNkMbxVMIYRVELxsVZHDKykqQQSPejlSpyp8jwP2jgemJba3naKSaBGkQ1UkAsprUFTxUggEEEEEAg1HSb3Yu+KjaG76brOv2ziOwqvbddBsrJbx/iMOysVuCnoTBh8huNcDG2SpsPgqdWeJqeNhStFG2gwoyEu3r99nZN0h5bubeHevp3+nacN9OkgXtMoQFgiipqqnTQGlAejrl/+q0XMPL0/O1pe3HKEd6jXsdn4ZvZbdnrNHb+OfDaadiFYSMDKGcahIysNir/AITO959ud9/yhPj9uDuNaWvzWydx9qdUbY3jTZSDJNv/AGN19vvL4fAbkqo6eGFMdPjpBPhBGdRqIcQlXcCpCrxFudZubppZQ8zSuzMDUMzMWZgfPUxLV869fVjYCFNv26K2tzDax20UccZXSY4441SOPT+Hw0VU0+Wmnl1fl7Z6Vde9+691737r3VUGayU+9f522xNrydP7QzOC6F/lq733+e9K2uzNfu/ZO+++vkbtnZmC63wmI/vDBtvb9LuvZfUWdr6uu/hVVkqyOljg+6padDFWe691a/7917rWa/4UjbsgymJ/lu9AQULpmOw/ma/ch3TTYSqr8ptXavxr6y3PuPcrYrN089Mu15Ny1W8sfiaypZyZMXWVceiRWdDL3sDtMu9e83t/aRTzReFeG5Zo61CWyNKwYggiN6CNzUABshgdJxu++FzHByr92H3k3K4tLaf6jbPoUjn06TLfyLbRsgYMGmiLmaJApLNHQFD3qrP5Hja+zvkO9gNWydhtZQAo1Z/chsAOABf3lL98812DkU043lz/ANW4usCv7sIaeZPdJa8LC1/6uv1//9feZ+Qn/Mg+8P8AxEHZf/vGZr2K+Q/+V45N/wClraf9pEfUe+7f/Tqfc3/xXtx/7Q5utFSj/wCAdJ/1DQf9al99qZP7R/tP+Hr5eLj+3n/05/wnqT7r011weSOJdUkiRqP7TsqL/t2IHvwBOAKnraqznSikt6DPSi27tTdm8JfDtDae6t2y61jKbX23m9wkSMLqjHEUNYFdgeAbE+y/cN12raV17ruttapStZpY4sevey9H2zcq8zcxO8Wwcv3l7KpoVgheVgfQqisa/KlejHbc+C3zH3U8KYr439oQCdQ8c24cPTbRg0lQwaSXdddhhFcH6NY+4/3D3r9pdsDm69wNtbTxEUhnP7IFkr+XUx7N91X7w2+hDY+028JqFR48DWn87rwVH5kdDhhP5Tvzhy5Q1XXW1Nto6B9ef7I2qxW9vS8W36rPzK/+Gn2DLz70Ps1aV8Lfrm4IPCK0n/kZViHUnbT9wX7yO4hTd8rWtiCK1mvbM/kRBPMwP5dCXjv5Mfy3rCn3u4ukcQGI1fc7t3XWMgP1JWg2NMGI/wAD7Dtx97z2tiB8Lb95lPyghH/HrkdDK0/u3vfidl8feOXIUPHXdXJI/KOykB/b0tqf+SL8gXVTVdx9OQMR6lp6LetWqn8hXkxVEWA/rpHsmk++RyMCfC5T3Zh82t1/wSN0K4P7sz3LZR9Tz7sSt/RN0w/nap1N/wCGQe7/APn9/VX/AJ4N3H/ebi/tj/gyuT/+mN3L/nJB0r/5Nlc/f+FE2f8A3m5/609J/dX8iLufd+2N0bNyPenXVHiN47bzu08rkcHS7zxOfx+N3FjKrEVldhK6Omm+1ylLT1bPCSdJYaW9LH2l3L73XIu77Vuu0XfKe8JBd20sLNFLAsiiVGQsj1qrCtQ1D8wRjpZtH93H7ocub5sfMe1c8cuz7ht17BdRR3KXLQSSW8qyokyfTtqiZkAccQDUZA6Sf/CbHOYj4e9S1f8AK+762b2R0z8rMBmO2O2trUm/d/vvHrD5EdeY7s7c+2c7u3oCKj3xvLafX25uvqmhgpd77HpBjcjSVcqZiWnnarrnpOfz6Nb+ESYqmlQAaVxUAkA04gEivn12GiMrRRGdFWcqNQViyhqDUFYqhZQa0JVSRQlQcdbUXuvTnXvfuvdA10d3/wBU/I7ZNf2N09uKq3Rsmg3nvrYTbgqtt7o2vSVu4et9z5LZ27v4RHu3DYOqzOEodxYipggylLHLja9YjLSzzQlZD7r3Vf8A/LPxm6e0Oxfnh82N/wDXWF69z/yF+Tm5eput/ssVvnbm6t1fGj4i12Z6a6a3X2Vg9y5qfCSbn3Jl4tyZWgq6CggE2CyVG/nmjkjip/de6tl9+691qkfz7M7UZH52fALZ5OCqaPa3x4+ZO/8AwzUVTHuXFTZ/IdJ7IbIYzKimFJNjMmxipqqj8xk9CzeO0YcZO/dEtRce7004QFrfZrpjU0oHaGOoHm1SBTyBJ8usCv7yS/e0+7Vb2XilUveadtSgFdbQieejH8KhVZwfN1VfPI+fyOf+Zl/IT/wx9g/+77cfuZfvnf8AKv8AIn/PZc/9W4uscP7sT/lZvdP/AJ4bX/q6/X//0N5zv+KWfofuyGCKWeebqPsiKGCCKSeeaWTZuZSOKGGJXlmlkcgKqgsxNgCfYp5GZU525Pd2CoN1tCSSAABPHUknAA8ycDoA+60Uk3td7kwwoWlfYNwVQBUkm0mAAHmScAdaq3Q/8sT5c9047E5R9k0nVG16ykp5Ytw9sVVRt+qmgMEUgko9nUdLkN3yGWJwYjU0lHDIf92AXYdM+dfvIe1nKE1zbLu77nuSMQYrJRKAakUadmWAUOG0u7D+EnHXDT26+5B77+47R7jJsMey7HK2oT7i5gLKTXsgVJLokr3IzQLE9RSUCpFh+F/lY/D7pmD+I/Jz5Mtla6jigq6vCruTbHVWFsVHlgOPkrczvHIQtIbI0NbTyMBfSL2GHHuL/eAQ7AtwiXew7DCo43lyktxStAVR2iSp/h8GTOBXj1m1yf8A3dHtNy4sVz7i893m53SULRxeFZQH1VwxuJ3A8mjlgJ46RWgE7D9kfyg+igDsjY+yt55Kmg8Yr8V1xuXtPJyOpuSm5d5UOSpfupGW5dKtQAbXC8e8Jed/7x7l+8eaK+94t0viKkx7fFcJH/pawxwQH5AsR6mvWSPLfsr92XkeOJdj9uNrmljWivNA9/IPmJLzxyrH1VhjAoMdKXK/zcek9vU0OP6+6U7HydBTr44IJ4tm7Jx8EaqAiw0seXyckScWsIBYD/Ye8aN6+/hybJLJNtvJ+930xyXnaCAt+Zlmcn7V6lqPnLZtugjtdq2Z0tUFFRVjiRR6BQaAfYOgjzP84fe0rP8A3c6B23Rob+I5/sTI1kij+z5Uxm06VCR+QH/2P59x1e/ft3+Rm/dntpaxJ5eNeu5/MR26D9jdJ5efro18Da0H+mkJ/wACdBxXfzbvkhVKVothdM4m97OaPeeUkF/pcy7koY2t/wAEF/YTufvu+7E1Rbct7BCPXRdSH+dwg/l0kbnrd2+G1t1/Jz/z8OkLkP5ony9rJC1Jl+sMQnNoqPr2epA/x15Hc1WxI9h64++L73zkmO82mEeiWZP/AFcmc9JX5y39j2SwKPlHX/C3TFJ/Mt+Zsn6ewdnQ/wCEXWeAP/W6aY8ey1/vb+/LfDzNZL9ljB/lr00eb+Yj/wAS4x/zbX/OesB/mTfM8m/+kzbA/wAB1ntO3+8wMef9f2yfvZe/tf8AlbrT/sgtv+gevf1u5h/5TE/5xr1li/mUfNAuqjsTaMzMwVVk6020AzMQFW6PCBc/1I/1/bg+9t78pVn5psiB62Fv/kHXv638w/8AKZH/AM416oUzfzT3Dub+dT8Ot8ZTvTDY7Cbg/mQ9NJn9iZahxu0sbH2Pl+hsH8dO9e0dqvVrDvbr3ZO69sT7d21JRyNHt/eeZoJ65DJFCZ3zs+7z7ie5HOu02kfPtlBLPJaSXZuoY/DRElnEdnanwy0DzNCks8yo3iQK0KTqsjlQPeW9y3S+iQbiisShfWooBVqIuCVJ0gswGVwGoTTr6NXvJboU9a8H84j+b18EOo8H21/L23X89D8VO/8AszqvMUe7u3thdS5n5C1HQW26+p26dw7T3Bt7ZmUpcrt3uPtbrXK5Km2vEhaswzzw5eoFMv8ADjWe691Xv8atmbz3PuH+VN3DtnEfH7q3Yny8+GXZP8un44/BLu3sju/OdmzfAzH1eI7v3f3ttvtrq3BLV7e+ReY+O20lO6ZJ6enw1JUR4SlpMrRVOTkSL3XutuXqXqnr3orq/r3pfqbbNHszrHqvZ23dgbB2nQTV1VSbe2ltTF02GwWJiq8nVV2Urfs8dSRo09VPPUzsDJLI8jMx917p63tvjZXWm0dxdgdjbv2vsDYez8TWZ/du9t65/FbV2ltfBY6Jp8hmtxbkztXQYfCYmhgUvNU1M0UMSAlmA59+691pJfKbanzZ/mIfzwe+N+dKdL1G8fjR8X+lt2/FjbPZ2HOMqdl7mHXI2d2B23g9t72ytdiMPWdsN3N2hQ4ufH0TVNRFR4mopeTT1rCf/u4c67DyF7g/vXmK+Frt11aSW7zNG8iqrdyrVCTHrlVNUmhgERw1BkYf/fd9qObvd/2YTYeTtpkv95sNzgvIbdJo4Wd11RSSMJNKzJFbvMRB4gdpWjaJHkSnVvX8mPae6ti91fJHau99sbg2bufHbH2B9/t7dOHr8FmaUNn9yBJJMfkoKeoMElvRKoaJxyrEc+50+91uu173yj7fbns25QXe3SXlzplhkWSM/pxYDISKjzHEeYHWK/8Adzcs8w8pc9e7eycz7Jdbfu8Vja64biJ4ZV/VempJFVhUZFQKihGD1//R3wuy9wZDafXO/wDdOJFM2V21sndW4MYK2J56M5DDYKvyNEKuGOWCSamNTTL5FV0ZluAwPPsPc27ndbJypzNvNkE+ttNvuZo9QJXXFC7pqAIJXUoqAQSMVHHpNeSvBZ3c8dPESNmFeFQpIr8utUzfPzA+TvcNGku9u5t2xUGSoqdqjbuy6ldhbcCyKk4iFHtcUGQqUjduDU1VQ7ADUT74x8z++3u5zypfe+er5LOQA+BbMLWHSchWW3EZenq5Ynz9OoRuN+3rcEU3W4vpZRVU/TX14LQ/tY9F4NLTtUPWSRLNWyMWlrqi9RXTOb6nmrZzJVTO1+WZyT7igxRmQysuqYkks3cxJ4ksasSfUmvRXpXVqp3+vn+3j1I9udW697917r3v3Xuve/de697917r3v3Xuve/de6xVM9LRUWSyWQqYqLF4bE5XO5jIVF/tsZhMHj6jK5nKVbfSOjxuNpJZpXYqiRoSxABItGks01vbwRl7maVI41HF5JGCRovqzuwVQKkk0AJx14AkqqirEgAepJoB9pOOtXL59fLTuz5jfITpHorpjqZ+m919YZxO2Nrbyym6MLWd14pcJt9t8Y7e/Y+7NrLLF1FtnqjZuFq90S4pKqrfA0rTV1VO0iBYuqX3VvZiz9v9v3fmr+tr7nfX48ErDHLDYRGJz4rWyy0a5Z5AI3vCkYkEWmNAoJaWOU9kTb45rv6vxXk7aKCIxQ9xWvxEnBegrSgFOP1W/hV3JX/IL4m/HvuLLrkTnd9dU7Qyu4qzIbf3JtmPM7jixMFBn9yYLGbuwW2dxTbN3Tl6SbJYGuqcfRnJ4WrpaxIkjnQDLzoY9Ue/zQf5J/8AKy3h8p2/m6fN3sWXqXqrqXb+0c38gthyUWCxfVHcGc2fkpMftLPb+nxmFqt7Z/Obklr8VhKrF48VNbuOOio6GFfLK6ze690Iv8p/Ib3/AJknyC7G/nG9ubbzmzup4sdvD40/yxun9yYdcVNsb41xZfFydj/IHJUjRtBJv/5B7jwFPTCeAn+G4nFzUEVRWUUkEvv3Xuthz37r3Wkb/OR/nLbM+WUe7/i/8Tdx0PZfxy2LvPCbD7DqMNsKqz+Y+aHzLxO74sn1J8MetoN0bl2ti818cqDN7bXN9vblXG5DHVm2YaegoamSLKwLky/dt22vYNr3HfN7vo7bZ7OF5ppXNFSONSzMTQngMAAkngD03NNFbxSzzyBYUUlieAA49NvxLHanw82bt/GbG7f3X/pQlTLZ/tvsakqEaLsfsfe+7M32R2Jk6nbeWpKrBUm3a3sDdOQmpqBKOJERgzDWze+NnMX3hfdDd+eeYOdNh5u3Ha7W7udUNqkoaCOGMCOBXgYNBI/hqGkbw6M7N5U6hW55h3Wa/uL63vZYVd6hAaqFGFBU1UmmWNMknrYu/l1/LPtT5Gbi7E272tRbMyWW2PtfbNbj974PBNgdwZSlzWVzME+LzNLFUVONaCCXHLMjUq0set2vF9D7zh+6z78c9+6svM/LnOcltMduhgmSWKMws5lZ4yZIw5hLdmGjjjoMENXAy5T3a43a9u2vreBruOFQJlQLIVLMdDHPaCNQAIFSTp8+v//S3p+8CB0r2+SQAOruwCSTYADaeWJJJ4AA9g73EIHt/wA9E8P3Ne/9o0vSLc/+SbuH/NCT/jp600MTWUn8Kxn+VU//ABb6L/d8X/KtH/tXvgpbzRLbwK0qhgiggkVBoOsfomXwo+4fCP8AB04feUn/ACtU3/U+L/o72948H+/k/aOnKj1HXvvKT/lapv8AqfF/0d7948H+/k/aOvVHqOvfeUn/ACtU3/U+L/o737x4P9/J+0deqPUde+8pP+Vqm/6nxf8AR3v3jwf7+T9o69Ueo6995Sf8rVN/1Pi/6O9+8eD/AH8n7R16o9R177yk/wCVqm/6nxf9He/ePB/v5P2jr1R6jr33lJ/ytU3/AFPi/wCjvfvHg/38n7R16o9R177yk/5Wqb/qfF/0d7948H+/k/aOvVHqOqpP5vHyVqOiejun8Jtffe7di7t7I712xk5Nzde5GKi3ThdhdX+PNbqq6OUMrVMk+WzeL8FMzxwVEtMVmLxgocrPuhcg7Tz77hcwXe/bZbX3Le3bU6SxTKJI3lvT4cY01oGWKOc6uK6hpoTUCvk/b4dw3G4a4iV7aOEggioJfAx9gbPzx1tMfy5v5L38sHbu3O/N37T+KHyD25uTfcfZPxf7S3N8m+xt7Sb1756uym4Np75zu9KeHbG8KTbY2J3nRpQGqegpsdJkcQ9VichTrDNkKOXrJbW8Fnb29pawrHaxIqIiiiqigKqgDgAAAB6DqXVVUVUQUUCgHoB1sObf2/gdp4HCbW2thMRtrbG2sRjcBtzbmAxtHhsDgMDhqOHHYjCYTEY6Gmx+KxGKx9NHBTU0EccMEMaoiqqgB7q3VP385f4mbf8A5hOwvjF8EN4Yn5B47ZPdXyOwW/N8dq9Q9XUu+evthbO6J2/mN6bk233Tu+q3vtFOpqTtjFVcuF21mRT5oruFoP8AIJ9Ohvde6tr2DsXafV+xdl9Z7Dw0O3djdd7S25sXZm36eerqafBbT2lh6PAbdw0FTkKirr6iHGYfHwwK88sszqgLuzEk+691Wn/N06i+Q3fXxsrenOuO6Op/jx8dOx6PPbX+Zfdu7t9bh6y7T6p6fqjhKyDfnUG9Iqyn6/aixE9BVQbwwe5DSU25Nr1dRQU+Sxk0pqffuvdaFOL/AJa3af8AKW+VPUvZ3eVH2RL8RNu/NT5L9FdTd1Z/E7fm2HX5LsHqraUXxi7XxtPgs6mQo6rt3bY+5r9wRLWYHHHFPRKwq6KuiSBPvN8vb/zR7J85bTy3AZb7TDK8esJ4lvBMk1wlCreITEjaY6qXIChqkdB7mm2uLrY72G2FXoCRWlVUhmHzwDjz4V6vDnlhpZpaaeenjmp5Xglj88J0SRMY3S4ex0spHHHvjEl3bSokqXCFGAINRkHIPHqFQykAhhQ9W8/yd5oZezO+fFLFJbY2wL+ORXtfPbp+ukm3vO37iTK/NXuMyMCv7vtOGeE09f8ACP2joechEG+3Oh/0JP8Ajzdf/9PfH7FzeH2z19vrcm4cX/HMBt/Z2583nMKIKWqOYw+KwldX5PF/bVrLRVH8Qoqd4tExET67OdJPtZt+yJzLf2PLkiRMm4TJbESDVGROwiIkWh1IdXeKGq1FDw6I+Z96teW+WuYeYb6BpbKwsZ7mRFoWdIInldVDEKSyqQKkCpyadUJ038yf+XwaeAx/CJ4ozDEY4l6y6UCxoUUpGoXKBQEXgW49zl/ybY2GP9Ndg5KCrgf4gowMcPpOudTf3ivslGzRn2y3aqmmI7KmMY/WGPyHWb/hyb+X5/3hLJ/6LPpb/wCunv3/ACba2P8A6MPJf/ZCv/bJ1X/k4x7I/wDhMt3/AOcVl/1u69/w5N/L8/7wlk/9Fn0t/wDXT37/AJNtbH/0YeS/+yFf+2Tr3/Jxj2R/8Jlu/wDzisv+t3Rh+nvkz8I+5sFlc/hPiJgsTTYnLDESw5frXqfzyzGjhrPLGKOapj8WiYDlgbj6e+X/AN/Hmv2F+4F7g8je3fuP7O7fvW5b9sX70il22wsfCji+ruLPw5PqlgbxNds79qldLLmtQM+vuk7jy597/k3mbnXknZotssNs3T6F0vY08R5PAhn1r4AlXRpmC5YGoOKU6Y9//LX4Pde7nn2tkPhxjsjVQY/H5FqvHda9PfaNHkVmaONfu6+mn8kfhOq6W5FifeO/J33uPuw86bDFzBt33eGS0eaSMB7DadVY9NTiQih1CnQk9xtq2n225sueUdz2qC4vIreGYyQxp4ZWbXpA1hGqNBr20yKE9I3/AGer4I/94VR/+i16V/8Art7E/wDwR33b/wD2X0f9kG1f9bOgR/WTln/pnR/zjh/z9LXr75ZfB/sTcqbZx3w5xuNqnxtfkhVZLrXp/wC1EVAacSRH7SuqZvLJ9wNPo08G5HsK85/e7+7DyTsTb/uX3eGe1E8cVEsNp1apNVDmQCg0mvQ79ttm2r3M5qj5T2va7e2vGtpZ9c0aaNMRQFf0w7aj4gp20wakdK7sv5B/CrrHFYzLZP4i4HKQ5TKHFxQ4vrXqfzRSrRz1nll+9qKSPxaICvpYtqI4tz7DnIn34Puqc/7hf7dtX3c5Y5be38Vi9htFCutUoKSnNWHQ091fa+D2m2na933i3sbqG7uvAVYI+5W8N5NTeIiDTRCMEmpGKdA5/s9XwR/7wqj/APRa9K//AF29yb/wR33b/wD2X0f9kG1f9bOoQ/rJyz/0zo/5xw/5+krkvkD/ACye3N89bVe8/wCXdsHdW69s7gx0XXu5t4dHdAZ7I7EytVmaHI0+V23kq6auyG36iDMUNPVGaiMcwmgRwdSLY0tvvn+y3t7s3MG57B7Q3+32iQtPOtrBt8Bl8FCRq8OdNbKtQuqtKmlKno/5X3ra913/AGXl3bNsNvcbleQ24bSioHlcIrPoJYqpNTQE0rQHqx3eXz16+2XtjOborNj76rqXBUbVk9JRDbv3dQizRw6IPuc3BBrvID6nUWH19gXlj+9Z9nuad+2rl+x9ueZUu7uXQpb6LSDQnNLqvl1kTz17P71yHylv3N+4braT2W3w+I8cXieIw1BaLrRVrnzYDovH/DwHTn/Pou3v/XG/+y33NP8AwdPIf/TD77/2af8AbT1jT/X3b/8AlAuP+Mf9B9eP84HpwAn/AERdvcf+GN/9lvvw+/TyGTT+o++/9mn/AG09ePPu3/8AKBcf8Y/6D6Mhtf517A3Vt7A7ipdk73pKfP42jyVPTVY2/wDcU8dYgdIqjwZmaLypezaGYf0J9wdzB/ew+zvL28bvsl17b8ytdWc7xMR9FpLIaGn+NVoT8usoOUvZXfeb+WNh5ps94s4rS/tY50STxdarIoYK2mNl1AGhoxFeB6r77w/mc/CrtSsotm93/FHcXbtD1n2Gm6NuY/fm0urt44PDb72nJk8Vit34fG7iztXS0+ZxqVlR9pU+ITQeUlSrc++8vIP3ZOa/cLkDkH3C2zmHbYNs5h2Lb90hjl8bxY4dxtIbyKOXREyeIiTKr6WZdQOliKHrk9zr/eEe2fI/OfN3JW48nb1Nf7Pul3YySR/TeG8lpPJbu6aplbQzRll1KDQioB6idn/zWvhX3bsubrjuT4nbl7W69qK3C5KfY3Y2zOpt6bRlyO3MjS5fb1fJt3cecyOIaswWVooamjlMOumniR4yrKCBVJ9zLnSVHil5o2do2BBB+oIIOCCDBQgjBB6DB/vL/aZgQeRd/IPytP8Ato6Tsn8yv4ASyPLL8KZ5JZHZ5JJOtul3d3clmd2bKlmZmNyTyT7j1f7tjYVAVeX+Sgo4AWC/9snRb/ycX9kB/wCCx3f/AJxWX/W7o9HwS+UXxu+QW6exsX0Z0Ken8ptrAbdr9xZJtq7E282doMhkMpT46hM20KupqKoUFRTyyBZ7IvlJXkn2COd/uubd9323sN2stt2KCTc3aJjt9uIXYQgOBKRDFqUGQ6RU0JJoK9ZG/d4+8tyH79bjzJY8n8q3m3S7fBFJI06wLrEjMoA8F3OCK59cdf/U30t6bWot8bO3ZsrJVFVS47eG2c9tavqqFokrqai3Bi6rE1VRRvPFPAtVDBVs0ZdHQOBdSOPZjs+5TbNu217xborXFpcxzKGrpLROrqGoQdJKgGhBpwI6JeZNjtuZ+Xd+5bvZXSz3CyntpGSgdUniaJmTUGXUFcldSkVpUEY6qJi/kifHCKKOIdpd4kRxpGCcrsa5CKFBNtjWuQPeVJ++R7gkk/1b2bJ/guf+2nrAF/7tP2ed2duduZNRJOHsfP8A6guuf/DJHxx/5+j3h/59djf/AGDe9f8ABj+4P/TN7N/vFz/209V/5Noezv8A023Mv/OSx/7Yuvf8MkfHH/n6PeH/AJ9djf8A2De/f8GP7g/9M3s3+8XP/bT17/k2h7O/9NtzL/zksf8Ati6MH1D/AC1On+msHlMDt/e/ZmTpcrlhl55c1XbYlqI5xRw0Yjiai2xRRiHxwg8qTc/X3zK+/T93rlT7/XP/ACR7h+6O8bhtG67Fsf7rhj2owpFJD9XcXniSi7hu3MviXLrVHVNAXt1Ak55/dP5VsvuhcncyclchTy7jt257n9dI9/paRZPAig0obdbddGmFT3Kzaie6lAGXfv8AK46W7B3LPujKb+7Woq2egx+PanxuS2tHSCLHLMsTqk+1aiXyuJjqOog2FgPeP3J393f7UclbBFy9tvOXMclok0kgaSWz1Vk01HZZqtBpFO2vqT0JfcNR7kc1XHNu7kwX8tvFCUhxGFh16SA+tqnWa91MCgHSO/4aF6G/5+R3J/59to//AGH+xR/wDXtt/wBNZv3/ADktv+2XoFf1E2z/AJS7j9qf9AdLTYP8rvpfrzcabmxW/e1a2sTHV2NEGSyW15KXw15gMshSn2tTyeVPtxpOqwubg+wpzn/d2+0/O+xNsG5c58xx2pnjl1Ry2erVHqoO+zdaHUa4rwoR0OPbon215oj5r2f9e+W2lh0TZj0ylCxomhtQ0CndTJqD0q+yP5dXU3ZuLxuKzG9OyMfBi8mcpDJiq/bkU0kzUk9GY5TU7cqUMPjnJsADqA5/HsOcif3Y/s1yBuF/uO1c88zyzXFv4TCWWxoF1q9RosUNaqBkkUrivQy90ud9y919q2vaN8tYLeC1uvHU24YMW8N46N4jSDTRycAGoGaY6CD/AIaF6G/5+R3J/wCfbaP/ANh/uTv+Aa9tv+ms37/nJbf9svUK/wBRNs/5S7j9qf8AQHTnhP5TPRmCzeGztN2J2/NU4XKUWVp4ajKbTanlnoZ1njjnVNpI7QuyWYKykj6Eey/dvuE+2G8bTumz3HN3MC293byQsVktdQWRSpK1tSKgHFQR6g9Guw8tWfL+/bHzBazyvdWF3FcIrlSjPE4dVcBQdJIoaEGnAjobd4fA7rHee2s3tfIbt39S0WdpGo6mooazAR1cMbSxzFqd5sBNGr6owLsrC3uJeWP7qn2Q5V37auYbHn7mt7u0l1ory2GkmhFG02CtTPkQep653939+575U33lDc9ts4rC/h8N3iWQSKKhqoXkda481I+XRf8A/hoXob/n5Hcn/n22j/8AYf7mr/gGvbb/AKazfv8AnJbf9svWOH9RNs/5S7j9qf8AQHXj/KE6GIt/pJ7k5/6u20P/ALD/AH4fca9tgQf6179/zktv+2Xr39RNs/5S7j9qf9AdGJ2z8F+tNrYDB7eot178qKXA46kxtLPV1mBepmho0CRyVDRYGKNpWA9RVVH+A9wdv/8AdQ+x3MO87vvd1z/zWl1eTvKwWXb9IZzUhdVgWoPKrE/PrJjlT3o5i5R5a2Plew2yyksrC1jgR5FkLssahQXKyKpYgZooFeAHRUs5/Jd+PGezWYzlV2b3XDU5nKZDK1EVPlNkrBFPkauWrljhWTZMkgiR5iF1MxsOSffdXkP7zPOXt9yFyH7e7Vse2TbVy/sdhtcEkqzmWSHb7SGziklKTohleOFWkKIiFydKqtAOVPOn93x7Vc8c482867lzfzBFuO8bndX0qRPZiNJLueSd1jD2bsEVpCE1MzaQKsTnpr/4ZI+OP/P0e8P/AD67G/8AsG9ir/gx/cH/AKZvZv8AeLn/ALaeg1/ybQ9nf+m25l/5yWP/AGxde/4ZI+OP/P0e8P8Az67G/wDsG9+/4Mf3B/6ZvZv94uf+2nr3/JtD2d/6bbmX/nJY/wDbF0bX4lfAvrD4e57eu4Ngbt39uSq3ziMNh8lDvKs2/U09LT4Wsrq2nloRhsBhpEmlkr2DmRpBpUWAN/cWe6XvdzJ7sWWz2O+7XY28dlLI6GBZQWMiqpDeJLIKAKKUA6yC9hPuuclfd6v+Ydw5U33dLyXcYY45BdtbsFEbFgU8GCE1JOdRI9Ov/9XaV+Zn8pXZXy73hvns7FfMr+Yb8Yezd443C00GW+Nfy87N2HsXCVu28BS4HDzUvUcmQyGwYcdUpQxS5Ono6Wgmr5TNKtRBUzyVB917r5nv8xztH+cr/LW+WHZHxJ7r/mIfNjKZXZk1Fl9n7zxfyl78pNv9l9b5wS1Oy+wMDBN2BUS0tLmaKFo6qkM0zY7J09VRPJJJTO5917r6FH8lL4xfHjeXQPxn+f8A1X8ufn/8i8t2J1TUT1lN8nPmR2F27t/DbszFG+3eyNo7k66p63G9dTZ7YW7qCvx0eugkNNUUwmRnkWOYe691f77917r3v3Xuqnv5lvw2+PPZu0N/fKrvX5WfNr4uYPpXpPO1G593/F/5a9ldGYjCbM2X/eDeNZnl2TichVbBzO8ya+aGKepxlRUV5WmpmEvjgVfde60h/wCRf8a/5oX83jt/sLdu5P5lX8yPqn4G9R7kqsTuLftH8rO207M3vmqstkNudW7JylbubJbUh3jRbfqqev3BlDQ1tHiopoFFK711Pp917rf1+I/wG60+HOX3bntldw/LTtfLb0wmGweYqfkr8oO2+/oIIMLU1NXFW4TF9g7gyWH2/la2aqb7ieip4GkQBBpT0n3XulV8tvhl178yMJszB7/7I+RvW0excvlMziMj8dPkF2Z0DmK2qy1BFj6iHcOR63zmFm3DRQQwhqeKr8q08hdo9PkcN7r3Xz/f+FH3VXy6/lC9v/Haf4y/zOf5k2W6o+Rm1eya6HbXZfzB7g3Fm9l7r61zG1Is5R4rcmJz23RXbYyWJ35jTSwVdPNXQTU05kqp1kQRe690Yz/hNx8Vvkl/Nb6/74+Qfy4/mY/zL59i9W9k4Tq3Z/XnXHzO7i2jT7j3B/dWm3TunJ70z1TuDN5mbGUuN3DjI6Omxr42UTGV5KiRbRe/de63oPi18YNlfEnrWp6u2Jvbuzf2Gq905bd02e787l373lvj+JZmlxlJVUcO8exMvmc1S4KGPFRvDQRSJSwzSTSqnkmlZvde6Mh7917qkL5RfyXdw/Ibf/bPaW1P5tX83zoTcvY+Xy+4sFsTrP5e1GP+PnXGVr6RIaDGbW6iodo4atp9kYyohWQYuLPU0jq0iiqjZ9a+6918vbt35q/zMOse9eyejtzfzEPmflM71r21vDqjM5eH5R98PR1eW2ZvDI7QyGSpKao38JVppqzGvLGjMGCkAkHn37r3X0wNu/8ACezqnG4Ckocz/Mn/AJxm486KSAVm6Jvnvu/F1k1f4waqso8fjNsQYyjimlLFInjnMaEKXdgXPuvdFQ+SH8hz+Yd1xtnJbu/lv/zt/wCYRQ78wcEmVw/U3y57+3P2dsreGQp9UkeIXeWIjw2M2skkV0hFdtfNU80ulJ3iRmnT3Xutez4n/wDCrP8AmY/B3vTL/H/+ZpsOD5C7e693vkth9u43K7V2z1p8mOtshg8m2HzUWAzW0ocB13vGfAOk032WXxzPmjHEkebo4pPuT7r3X0gen+2ev++equuu6+qdxUe7ete1tl7c7A2NuShJ+3zG2N1YqlzOHrPG4Wamnejq1EsEgWanlDRyKrqyj3Xuv//W3+Pfuvdar/8Awqp/lYD5vfCw/J/qrbj5H5JfDTF5zdtLTYmhkqcz2H0RUeOv7N2T4aOJqvJ5HaaUq7kxCt5TF9pkKaCPy5Jj7917qgr/AIR7/wA0dem+790fy2e3Nw/b9cfIfJ12+vj5WZKdvtdt9747EwDcOyoqioqEp6DHdp7Swwkpk/Sc5ioYYkM+Scn3XuvpK+/de697917rTB/4UT/Ijtf+YD8pfj3/AMJ//hfmkl3j2tujam//AJk7toFq67D9d7Mx4pt3bZ25vgUYQxbf2lgIk3zm6fWs1Q0OCpqdzPUPA/uvdbUHw1+JHTvwX+NPU/xa6JwMWE696p2xSYWmnaKFMturPSA1e6d9bonhVVrt1713BNUZLISgBPuKhkiWOFI40917oz3v3Xuve/de6+fv/wALlf8Agf8Ay0f+oP5cf9bvjd7917o6v/CJr/t3x8pv/Fycp/75LqD37r3W5n7917r3v3Xuve/de6+G983/APt4z8vf/F1+/v8A3+m7Pfuvdfcej/zaf8EX/oUe/de6g5jMYjbuIyu4NwZXG4LA4LG12YzebzFdTYzEYfEYymlrcllcrkq2WCjx+Nx9HA8088zpFFEjMzBQT7917r45381LKVf80r+dX8pcj8C9j7j77TubtfA7a6tx/WmDrMxJvpNhbA2X1vmt+UPhiSCj2dmMrtSqy8mYq2pqCnxk33tVLDCJJB7r3X1Vv5Y3xX3H8JPgD8UfivvLN0u4N59OdQ4Hb+88nj2MmM/vhXyVe4t1Y/DzsS9ZhMNn81UUVFOwRqilp45CkZYovuvdf//X3+PfuvdcJI45o3ilRJYpUaOSORVeOSN1KujowKujqSCCLEe/de6+Rb/woB/lu7q/lGfzG6PsDoaDL7G6N7d3J/swvxW3Vt6Oegg6z3XgNy0ma3F1rgckZZ3gy3Tu7ZaKpx3qLxYWvxbMzy+Uj3XuvpDfycP5km0f5pHwY6x+ReOlxtB2fjYR138g9m0Mqatn9zbXoqJdyCKlVUNNgN30lVTZ7EKNYjxuTihZ2nhmC+690vv5qH8wXYf8sj4TdufKveSY3KZ3b2PG2OoNk5Keogj7H7o3LS10ewdllqMrWDHz1dJLX5SSEiWmwtBWTrdogD7r3VTP/Cbb+XR2F0x1R2N/Mn+X33u4fnP/ADD6yq7S3NltzUbw7o2B1DvDLDeOE2vURzkyYnL9i5KSDcOVpEWBaWmXFY94IZcbIp917rZ39+691737r3XvfuvdfP3/AOFyv/Fw/lo/9Qfy4/63fG737r3R1f8AhE1/274+U/8A4uTk/wD3yXUHv3XutzP37r3Xvfuvde9+6918NH54wT1X8wj5mUtLN9tU1PzK+REFPUBnTwTzd3bwjhm1xXkTxSMGuvqFuOffuvdfU/w38sL+an/dbH4vcX8/n5D1eYgxdFRyZDA/ED4wYej8tPSRQF7VNDlM/VktHczTZBqmY3eRy7Mx917qob+YL/wmo/mq/KzbFdSVH86zfHybpX01UPUPyOwO/uqurZaymtNDMcf1pvfsnZ0dYZoY9Eo2ojIwuX49+691TJ1T/NS/mbf8Jzd97c+KXfP8uv4k7OwlHtjb9FkqzCdVY/rnevyC2ztsx0UXYtJ8m+rMvlMN2nuLIwlY6zKZSiz01FUt4aqjpqpJIB7r3W8z/Ke/nIfFb+bj1Zl919KTZbY3a+woMYO3ugt7z0Lb32HNk/JDSZnG11Awx+9dhZSsppY6LMUixElVSspqGpcUw917r//Q3+Pfuvde9+691UP/ADuv5aGE/mkfAzsjoyhosXH3dtBZO0fjduSvlhoRiO3ds4+tXHYGsy0kbmh232Hi6mpwWSL6oYY62OsKNLSQlfde6+dt/wAJ1f5m24/5WP8AMHXq7uqsyG0fj58gtx0HRnyK2/umefC0vV2+MbnqjD7N7SzNDWiFMTX9a7nqqnH5pp9AgweQyDOrSwQBfde62UclV/8AQRz/ADsKfb9JJ/eX+VJ/KkzTZDLTxPLXbF+SHeTZQU6RGSCWbC7gw+8ty7eeKlf/ACmml2PgKmSN4Hz4De691u3gAAAAAAAAAWAA4AAHAAHv3Xuu/fuvde9+691737r3Xz9/+Fyv/A/+Wj/1B/Lj/rd8bvfuvdHV/wCETX/bvj5Tf+Lk5T/3yXUHv3XutzP37r3Xvfuvde9+6918Nz5xMqfzF/l+7sqInzV+QDO7EBVVe9N2lmYngKoFyffuvdfcfhZXhidGDI0aMrKbqysoKspHBBB49+691k9+691rM/8ACtPpTrTsn+Tr212TvDH4kb4+P/YfTu+OqM/U08X8WoM3u3s7afV25cJj64J94tDuHaO86pqmlVhBNNR000ilqaJk917rS5/4Sb13ZNJ/Oo6Lg2G1WNv5PrHvuh7eWAzikfrZOr87kaZcp4SAaRezsftpohJeP71YL82I917r/9Hf49+691737r3XvfuvdfM0/wCFbP8AK4ynU/zf6t+WPQuxq/I7a+d+bp9mbl23tqikq5n+V9LNS0P22PoIHLfxHubBVVJWU9PFGXq8zQ5SdiXmA9+691vBfyc/5cm1P5X/AMEup/jjj6XHT9mVlGvYnyC3ZQpEz7v7s3ZQ0Mu65fvInkWtw+06elpsBiZBpD4vFQSMolklLe691aT7917r3v3Xuve/de6KD8u/m90p8J8DszO9x43uPNDsHMZPA7Tw/TPRXbPeOdyGSxFBHk6+Krx3Vu0tznBxJRyho5K9qVJ7MIi5jk0+6918/L/hSr3539/No7e+OFF8W/5f/wDMDbqr45bS7Gpn3jvz4kdwbZrN5bs7Sym0J8tJg9u0+3svXU228PithUCRVNd9nV1FVPUKaZIoopZ/de6Mb/wmm+Z3a/8AK063+QPx8+YHwJ/mDbf2V2V2Hh+3Nk9j7K+H/c278fis2NrUe0d14Pd+Fh2zRZ+jgqaDb2MmoKmip69XdalJ1gCxtJ7r3W9X8Vvlb1R8xusZ+2enqfsij2zR7py+zK+h7U6l7I6Z3XQ7iwVNjavJUku0+z9tbXztRSQw5aELWU8M1FJL5IkmaWGZI/de6Mn7917qqn5hfzePj/8AD3fu8Oo8r0z8yu8u2tn7exeen2X8d/ij2/2TQ5B8/h0zOAxtB2FDt7Hdaz1FfTTIsjx5aSKklLxTFJopIl917r5OveHw6/mId390dwd11/wD+YWGrO3e0Owe0a7FQfG3u6vp8TVb93Zl911WOir22DSmshx8+VaISmKMyBNRVb2HuvdfQj+B/wDwoqy+P6C652P8/wD4C/zDupO99kbQwO2N3742t8Suyt59a9i1eCx9LiP75Y8U2Nxe7dt5ncf233lbjJcTJR0k0pWCsnUhU917o7Wb/n89NT43z9SfAP8Am1995ioKxY/C9bfAPtKA1E7t4w1TlN6TbUx1JRwv/npQ8rRrchGtb37r3VFf8xTon+f1/wAKAa7aXT0fxDw38un4Obb3NRbwp8P8hez8TS7w3ruSkp6uixe6e1cftqkyvZFXNhMdVzy43b1HtilxtDV1TGrq66eKkqqX3Xur/P5Mv8jn48/yfuv9x1G1s/X9xfJHs/F4/G9td8Z/FU+Eapw+PqFr6bYfXG2IqnI/3J2BBkUSqqIZKytr8tXRxz1lS8cFDS0Xuvdf/9k=</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>
+
+MIIDFDCCAfygAwIBAgIVAJDe4t8YsctH2JGBPfdMqwdkUTh3MA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC52aWIuYmUwHhcNMTMwOTEwMTI0NzU5WhcNMzMw
+OTEwMTI0NzU5WjAVMRMwEQYDVQQDEwppZHAudmliLmJlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAjX9kGhK6nYxWvuNeuNdGuU2xyEsUyTEE7a3+vWG1
+//IcBPi6b0KXBYOKysqTekzYsoNiSxi9sup5Yx6lgS+nqHoM+ULqyKH5t78HctvB
+g5R4WGNQ5QW01uw3eLZ5OaCnyb/XXwYhUdZJraaFL/R5sSzkwHRkJ5XN1kUjj3M9
+IIr9Kquc6/gbvZj0P4dRHB8WTkboKoC71yF0lJQtiawK5mmH6kmnnR6hNe7+PPY3
+SSysNjOWscyBKXvLQiyC3/5a7ILzWTo9xAwoDvl87JnlgrZaNTbcVpugDufOI496
+FIq7kMHqMJVxcBht64HXHQ+jdiAL1Fga/zmd2nNbi+1a3QIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAudmliLmJlhiFodHRwczovL2lkcC52aWIuYmUvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFCvlrzRYM0OZ/HvA0ZUxTRM3tRUPMA0GCSqGSIb3DQEB
+BQUAA4IBAQAhQdI6woZQyn6p9LAr9IEjc+6CvYLq/SRLK651E/D1j1C3NznmPf3T
+Wc8cMRy5g6EGmuIUk7BIo55eAIH95AgXNbvC2/OEkmwDtMV1nDV/rP3XWp0WzOhL
+SkG9fvuA/Mm6v6UtLW6HDRu6GzZPNPegDdSbJ01xpuOaF+O011U2ThaXZFHv+3fw
+81HKd3ZJ1cImeP4gijREmG7Go+Vq2ROM8/+3f/VhYSOgJU9g6ylkxKLKcxAeyg5J
+0BNkUbCgjbqiU1mg5oV7QYFyYKhOO0vJPFfv5DeLIfCdKFo7Hw/HzI3Y+Afjy0+L
+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>
+
+MIIDFDCCAfygAwIBAgIVAJDe4t8YsctH2JGBPfdMqwdkUTh3MA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC52aWIuYmUwHhcNMTMwOTEwMTI0NzU5WhcNMzMw
+OTEwMTI0NzU5WjAVMRMwEQYDVQQDEwppZHAudmliLmJlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAjX9kGhK6nYxWvuNeuNdGuU2xyEsUyTEE7a3+vWG1
+//IcBPi6b0KXBYOKysqTekzYsoNiSxi9sup5Yx6lgS+nqHoM+ULqyKH5t78HctvB
+g5R4WGNQ5QW01uw3eLZ5OaCnyb/XXwYhUdZJraaFL/R5sSzkwHRkJ5XN1kUjj3M9
+IIr9Kquc6/gbvZj0P4dRHB8WTkboKoC71yF0lJQtiawK5mmH6kmnnR6hNe7+PPY3
+SSysNjOWscyBKXvLQiyC3/5a7ILzWTo9xAwoDvl87JnlgrZaNTbcVpugDufOI496
+FIq7kMHqMJVxcBht64HXHQ+jdiAL1Fga/zmd2nNbi+1a3QIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAudmliLmJlhiFodHRwczovL2lkcC52aWIuYmUvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFCvlrzRYM0OZ/HvA0ZUxTRM3tRUPMA0GCSqGSIb3DQEB
+BQUAA4IBAQAhQdI6woZQyn6p9LAr9IEjc+6CvYLq/SRLK651E/D1j1C3NznmPf3T
+Wc8cMRy5g6EGmuIUk7BIo55eAIH95AgXNbvC2/OEkmwDtMV1nDV/rP3XWp0WzOhL
+SkG9fvuA/Mm6v6UtLW6HDRu6GzZPNPegDdSbJ01xpuOaF+O011U2ThaXZFHv+3fw
+81HKd3ZJ1cImeP4gijREmG7Go+Vq2ROM8/+3f/VhYSOgJU9g6ylkxKLKcxAeyg5J
+0BNkUbCgjbqiU1mg5oV7QYFyYKhOO0vJPFfv5DeLIfCdKFo7Hw/HzI3Y+Afjy0+L
+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">
+VIB
+</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">
+VIB - Vlaams Instituut voor Biotechnologie
+</md:OrganizationDisplayName>
+    <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>
diff --git a/swamid-interfederations-2.0/idp.vito.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vito.be-idp-shibboleth.xml
new file mode 100644
index 00000000..fc88ba88
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.vito.be-idp-shibboleth.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-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.vito.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vito.be</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">[SMALL DESCRIPTION OF YOUR INSTITUTION]</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAC4jAAAuIwF4pT92AAAB
+b0lEQVR4nJVSTUsCURR97zk5zmikOCNl9LFwISFEUIsgolxHi35BhLRr17ba+gsKImjRolWLwkW5
+CUzd1KIvMrAQQi2RmXB0Gp1x3m2hiBCmnuXhnHu551wMAKgfkL7UvRqgVkYIejMAmJmk+XzRznSG
+rhqJA+1whf7ILY5BhoYYFuG2VUBBV7X3ZPru6kMqofmdYcXmt9BBK0EI4Xrq0szEMS9gh4gwBlUq
+yNJpaTyKApLF3RrCMXh5zB4KuDAABVUyn87N16hRfDtjl45c6yrheZJzkDRHsiyWLUgjxOr3BCfc
+i7jVQ7mq7yXy8YIiMjGP5WZyiJvxLviEaYEfYQhT0ZVPJePkxKZBrprbsS9i3iNtX+DY1anQ7GjQ
+ytj+xoYBQNFp+La45mMjj1vcgH1jble0ezsGbZj05OVb1uoP+Xj4elOpyp1CbgBly7pmUAo0kjou
+VnL/qwGgeQMgUGslB+vsUnzjhq6idvT9rb+cgAcUH/saGQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJkAAABLCAIAAADsyLLJAAAACXBIWXMAAC4jAAAuIwF4pT92AAAT
+6UlEQVR4nO2ceXBUx5nAv6/7HXNoZqTRjG50ggAhCQQCYQ4BtrGxHVze2JitzR+7TlJxKltbSbzZ
+zSa1tdlc9ia7qVze3dokTrx27FQSXynjCwz44rDBSAKBQRJIAgkdo5HmnnlHd+8fg8ZjIZBQSJBn
+51f6Y15Pz3s97/e6+3vf6xEKISBLRkBudAOyXDeyLjOHrMvMIesyc8i6zByyLjOHrMvMIesyc8i6
+zByyLjOHrMvMIesyc8i6zByyLjMH6UY34Opw4AIQAAkA3ujGzHfmbb8UwE0wEiIeBCMBgt/o9swW
+0zRDodANOfS87JdCgGBCi4iIT/i6sKie5JbM/645Ojra3tbW3tbm9RY88JlP//kbMA9dChCm0CJi
+vN88/RpSSSpquNFNuhpCiI72jl0vvvjuu4fHfGOBiYk77rzzhrRkvrlkYOoiFuBjPWbb78RYj7Tu
+QVBtAgjO107JOf/tb37z7DPPcH6DJ4L541KA4GAkRHSMXTzBTu7i596mdXeRglpUbEDm7bwOAMAF
+nw/LpuaJSyE4AyMhQoP8/FHW+Qc+cBzdFXThJmL3gKTM85lynjAfXApgBmgRERpiPftZx3NiYgCA
+06XbsGAxqA5AOoed+v1+/5g/vaSiskJV1Wkra5o2OjIaj8dTJcUlxQ6HgzE2MjISCUdS5W632+P1
+AIDP5wtMBIQQjLFQ8COBaygU6jrTlXyNiEXFRQ6H4/KD6rre09XV1tbW29sXDoclScrPz6+rW7pq
+9Wqv1zuHr4w3dHAQwBkYcREd46NnWNde1vkimLoglNZslDZ9kbirULXPzeWuF198+Nvf8fs/1Pnd
+f3vkvh07pq186OChr331q0MXLyY3vQUF//Pzny2rrx/3+//1X77x2quvpmp+/m+/8OWHHgKA7//b
+9554/HHDMACA84+MsYhIJicFVVW/9+/fv+Ouuz78zkL4/f7Xd+95/Fe/6u3t5YyltwQR7Xb7xk2t
+f/WpTy1fscJqtc7+K9+4fikYMENoETFxnp1/j3e9zi92gqkDElJQS5fdTVwlqFjnJhIAGhoby8rL
+R0dHUyWvvfLqJ++9l1w29RqGcepk58XBwVTwsqq5ubCwCAAEAOecpZ1uwS85E4IzxthHTUy+JVLl
+7KOaTdPsPHHiFz/7+b69e3Vdn/az4XD45V0vHT546LMPfu6+HTvcbvcsv/KfP6YQIDiYmoiHeGCQ
+XThmHnnCPPIEG2gXpi4A0FlI6+6kJfVocQCZ+6VWVla2fHmjLMupklMnT54/f/7ympFI5PChwymR
+Nputubk5Ny93zoe+EkKIk52d33v4kdf37JlWZDrj4+P/9dNHH//lLycmJma5/8tPVvIi+tPEGoID
+Z8JMiNi4CAzy/ndZ1x7u7xWmJgABEZUcXHI7Vm0QjkIgCgDOuR2U0i033/zcM88Gg8FkSTgcPvD2
+O5WVlVNqjvvH3z96NLW5oLy8vqFBkma4jGqqa1o3tTLGhBBnznQNDw2l3iooLKyrW5p8Lcuyt6Ag
++ToSifzwP35w7Nix9N6cm5vbunlzVVVVLBZrb2trO3bMNM1U/aeferqouHjH/fenX5RX4qMtFiZw
+DoIDksk//KO9imQeB5gu9BiPjYuJC+Zgh979lj7ep3ESQ3dMsWqoGkQRVRtoyVZqFssBalMMm0Ss
+ErFIqBCkBAhem9qWtWsXLlr4/tH3k5vxePytN9+85y/usefkpFd7/fU9qawbpbShsbFuWd2MO7/3
+/h2f3HEfADDG/vlrX3/u2WdTY2lLS8sPfvTDVM1kq4UQTz3x5IEDB1LVVFXdetttX3roy+UVFak6
++/bu/e63v3NhcvwITEz86rHHGhoaGhobZ2xSuksBjImYXyRCqOaApAJVkCpAJQACiNfiNelPADBg
+hjA0oUdFdMwcO6eNdMeGunxjQ4OQP2K71Uc9I1JBgOZGiE2jFiaK8KyF0rhCNYdC8lTqsUpFNqnM
+IZfmSPlWapeJTHCWiQNK6Z2f2J5yKYTo6+v74IPTzaubU3UYY/te35vadDgc6zesv1K4mw4ipgRM
+aU167JPCPzb2wvPPp0QSQlY1r/riQ1+urKpK/+DmLVui0egj3314zOdLFvb19r2xb19dXR2daahI
+fxuBIACI4EVz+CTa8omnCq15INtQsQJVgMqAFAkBmNarAAHJJxtCmMAMMHVhxCAeZJERY/RsbLjL
+F5g4G7ecprXdzm2jsjdAcqPUbqa3QQPQBICZKiAIdpl4rLTILtW4lEaPusRtyVOJhSIlMwttbW3N
+y8tLTTlDFy92njjRtLKJ0kshVW9vb1dXV6q+t6Bg7dqbZtztHDjy3pH0QEy1WO6+556qNJFJJEla
+v359y9q1L+/alRQvhNi9e/dnH3zQei0uAZCiNY94FwE32IkXjPd/jbnlpHAxKVgM1jxU7CBbQVaB
+yEAoIAVAwOQMKwA4cCaYAaYGekzoERH1c1+XMXwmEhgdNaR3yeLDlnUXnAsiNCeOlll2cS4grPOw
+zvuCRvtoYk8/qXNbWstsjV5LgZXaJLz6uFtQWHDTunUvv/RScjMWix0/3hGYmMj3eJIlb7/5lpZI
+pOqvX78+eft43Tl+/Hg87UB2u33zli3T1nTn5y9f3rh/375YNJos6enuGR8fLy0tvfohproESYUc
+L1FWoaOQnTvAPnjZ6H0HmYG2fHQWgqMIHYVoywPFhlQBQiEpk3NgOhhxHp8Q4VERGuahYSMWDIC1
+R6k+Yl13wLH2olwsYO7POgRA3BRxk43EogeGYrW58m2VjpZCS3GObJUIvcJerVbrtjvv2Ld3b2Ly
+PB49crS/vz/pMhKJvLF/f/IeEQBkWb53x33XOCnPCl3XL5w/b04eCADKyso8nukvGkJIeUWF0+lM
+uTQM49zZs9foEgCQIFVAdUGeJNW5SOES1v2m6D/EA4M8NIzYkTwcUAmogkQCRCEEcAZMB24IwQHA
+BBqmOX1yzUFbyyFbywWljAG9jrGxzsQJv3YuaHQU2zYtsK3wWrxWSaHTSCCELKqtXbJ0aXtbW7Jk
+eGio88SJxuXLJUk6dfLkwMBAag5raGysqq6+Xo1MR9O0eDyefqOZk2O/Sn1VtUwJpGdzZzLdEIwE
+KEGLAyQLUR3oKhNlK9jA+3ywQ/h6hKkjcDB1MPXLM0YCUUNlUC5517r6HfvaM2qthpYZG3HpsMAR
+DQoJghoBg4COwBA4gABAQMkiOWXJyYSsMZIwMcHEG4PRroC2sdT2iWpHpUNR6TSdqrSkpGll04nj
+x5N3ApzzN/e/cd+OHYSQ4x0dvsk5DBG33XHHbEL/OSCEmLzZu4SmXe3+0jSNKfmg2aTnrjydIgWZ
+IpVRsQurGwuX8Or1Yvg06z0Io11Cj3y0bSAAOCERtJ9Ra59zbu+wNISpQ1wxFyEAEEEQjKk4pqBf
+JX4ZAzKEKGoENIIGgoli0iWiACpTW4lz8SLPGlX2CrRHDWk4xoairMOX8MXNzzW4KxyydJlMq83W
+tHLlSy/uSoUeR48eHRsbs9vtJzs7UznY4uLilatWpWKi64uqqlNiY5/Pxzm/PNxNEgwGNU1LL3E6
+XTMeZabECqFArCipaHWhqwyKltNFW0RoSAyfZIMdwt8PRlSYOmdGAqRBqfiAbe3zzrv9Uv7UOD25
+MzAoJijErGTQRi5YyaACfgkjFBMEDEQGwBEEQupB4KXrZTLAwvFgZ49xaHlJ6yJPk8e+QJFcXMgJ
+hiYX0w2xAACIuGZNy8JFi3w+X/Lqjkajr7z88spVzR3tHckSRFy3fn1FZcWM52tuqKpaUloqy3Jq
+bg5MTJw7d27hwoWXV2Ym6zvXm77QhFJaXT014r2c2SXJkICkIJVAsYItF3MXQGEdqb1NREZFoN8M
+DMWC/hNh+VVed8jSHCVTZwIEJmPYiqM2HLCR81Y6KMEExQQBHZEBCACBiDJRFGpTqEKJTIlEkACA
+4IIJZgrdYMk/zR8bOND3wlCoZ0XJxsXelQ4lz22xIEoEgFxBp8frWb1m9dEjR1KZsz2v7ZYkeXBw
+MLmZ43CsbF7lcs187c+GVOImnYbG5RbLMymXiUTizf37a2pqLp8VhoaHOjs7jbRAqbK6OpU8ugrX
+kvBEAkhQkUC2gMWJOV7hLjeL6iPRxOHh2O/7RVfcoouPDBoEdBsO5pB+O+m3kX4FJwgmEE0AhiAA
+QKZKrtWTZy1wqR6HmmtXXRbJpkoWmSgEJUTgnJnc1Mx4wozFzWhEDwXjvmBifDB0diI+EtYmmkpa
+86xelVrJVZO3t27d+sTj/5tyefr06WgslsqlVVZWNDQ2XmnEmxFKKOKHT5wuXrwohJgiqWVti8fj
+CYfDyU1N03a/9lrrpk2LamvTqxmG8c7bb7e1HUuVIOLWrVsVRZmxGXNIXiMgBUqByiazjJm2fYHI
+by/gYJynT88ENTv259E2O+m1kDEKEYJGavAkSPPtReWuxSWuKo+t2GnJs8tORbIpRCYoEUIITmYk
+BOdCCMGYYCY3dabFjVBUC0X0YCAx5o8NHx3Y11x2i9degmK6yGeSZDR76ODB5GYikejp7k6+ppQu
+Wbq0pqbm2k/FpY+7cnMppansfE93d3t7e1NTU3Iz6bWwsPCuu7c/+uOfpApPnOj8yY9+/NBX/r6y
+qiqVQtqze/d/P/qfwUAwtf+yBQtuufWWGfPDMOdnXgJAZ3A2aP7hbPi1vkhIv/Q1EEwZQzmkyy0d
+s5F+BYKIBpmMRSUi56i5Zc6aZYUtxa5Kh5JnlXNUapGITAlFIIDJ7ANMsZLKgAgQXDAmTJMbhmmY
+wuDCmM1TWEmSduy8//ChQ6maqRdOp3Pr7bfP5sK/EvUNDTkOx8T4eHIzEol84XMPbtqyOdeVOzAw
+sHjx4r/70hcR8YEHHnjv8OGjR44mreua9uorr7zzzjvr1q2rqKiIxWMd7R2nTp1iaUO00+X66wce
+WFZfP5tmzMWlANBM0RPQnj4TemswFjM4ACBwmUzY8Zxbej8Hz8okTEDHyeCFoJRvL67KW1LrbSpx
+VLssbotsl4lCiYSAyezmVY6YfDdZhQKVhKJQISTOBRcgCCLFywPYqaxZs6a0tHRgYGBKeWlpaXNz
+87QfmSVrWtbU1NQcnXQJAD6f75nf/R4AKKXegkuLBJwu11f+4R8fefjh4x0dyeFdCBEOhdKfdadj
+t9t3/uXO7Xdvn+V1ds0uBUDc5N0B/anTwbcGYjoTAEIlPF/pUcXBHOxWyXi6RQDIUXNr3A11hasr
+8hY7VbdVsstUIUgR5zY/ISa7LxIKIEAgwGwSEU6Xq3XTpqefempK+eabtzidzjm15BJer/fBzz94
+tqfn8jt6IYSW0FLtblyx/J++/rXHfv6L/fv3G1d9hOl2u//mM5++f+fO/Pz8WTbjml0mTN49oT95
+OnBgMK4zgQClOdiUPzo6sYuZZwloCCx1ZgliqaumqWRTtbuhwF5qUxwykQm5njmg2a+1tFqs6zdu
+/MMLL0Qnc2MAIElS+gKOObOhtfWb3/7Woz99tLura8qAn36nKElS08qV3/jWNzfs2fjrJ5/o6e65
+fCWmw+HYtHnzjp33N61cabPZZt+Ga1jvk8yIdozFnzwVPDISFxy8Nrq+RFrlDXWPPHNqeC8CT0lC
+RJvsWFGycVXZzV5bSY7iUqiFkBu89lzX9YnxifR7BkppYVHhlUZ4znlgIpC+psvpdDqc0yzEShKN
+Rjva29vb2ny+MYLocDrKy8tXNTdXXPYAXAhhGEZfb9/xjo7+/v5IJEwlKd/tXrxkaVNTU25e7hzS
+wrN1KQASpvhgPPFYZ+DISIIgLHUr26vsS/ISo6FjL53+WUQbT3mihBbkLFhZuqW+sCXfVmSV7RSl
+uY6oWWbLbMdYzeTngvpvzoSODMftCtlQavtEVU61U4QTI91j78WNcNq4Sqrcy1aX3VrjbnDbClTJ
+QnA+rNzMfGZ1lg0uLkTM33WFDl6MeWzSPTWOLQvspXais8BI+OxAsIvxD0etWm/Thort5Xm1TjVP
+phaS7Y5/LmZ2aXLoCxlPnwm+MRCtyVU+U5/b6LE4ZcJAH4uNd411jMcu5awVybKsoGVj1fYSZ7Vd
+cVAiz9sfgVydgYGBsrKyG92Ka2YGl0zAWMJ8uS/87lBsZYF1Z62r3qPaJESAhKH5IoMDwR6TGwCg
+Stb6wrVry7eVOKvtilMi0sf3hwMfR5FwdZfJ9RkHL8beuBBrKbLeXe2sdV8SybiZMKJDoT5fdBAA
+KJGWeJvXlN9W5lqYozjpx1nkx5erudQY/8CvPd8Tbi213VnlqHDKlktrMQTjZlgPng906WYcACpy
+l95UcfuCSyL/JI9zs8zIFV1qpugOGLt6Q7eW27ZVOvItVJpc9yaE0FliPDbcHzgNiAtcC29ZdF9l
+7lK76qJ/xErzLH8k0596LsCvmcfH4iu8lg2l9nwrTU93csE1lhiJXIhoAa+97KbybQtci2wf8zky
+A5jGpQDQGR+IGIU2qcFj8VgkCdPfFUyYuhm/EOi2KY5VZZsWeZY71TyJyFmRN5bp+yUT4JDpQpfi
+VKk0RZAAzpnO9JHohfrCtfUFa/OshbJk+ZjefmQS07hEAAvFhS6FEpxuabjgQoS08WJHxaaaT3qs
+RRbJRubv/5b5f8QV87HiCiOmEFxnibP+k6pkKbCXWeUciWanyXnBHH4XLRhncTNCUZKpSlH6Uyz0
+zjIH5vYbd8EnlyJmp8n5w439fwVZrifZmCVzyLrMHLIuM4esy8wh6zJzyLrMHLIuM4esy8wh6zJz
+yLrMHLIuM4esy8wh6zJzyLrMHLIuM4f/AxPa4gI7m69oAAAAAElFTkSuQmCC</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+
+MIIDGDCCAgCgAwIBAgIVAPcAbjxvbituoR/pksHB50TO8mgGMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMMC2lkcC52aXRvLmJlMB4XDTE0MTIwODE0NTk1N1oXDTM0
+MTIwODE0NTk1N1owFjEUMBIGA1UEAwwLaWRwLnZpdG8uYmUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCQObxHOp9/8uv8w1qlzft0+5Au35eGrkWoBqBi
+bCkDevAEqZmpBhJVsZnPzQcPuPHoqQV90qWEPBdbXLsnyJ/F73lJQMiErAhHDyhT
+RcsULne84KUZVBLOJ8jxzkJ8FEqyhsjKpZFbRsIWohTr7BW4x8OUdTbU4FiuHWox
+m2sPOqIxaDGtw+lvTufZgdEKTbPFMMRRGN4GrJQudyb+tZx0bhDQump3KIGD3tCH
+Eggm6GRupwp0OYzmWnrR6PWe8t9PmLAVWtmaCz0C4hrZk4pyez5PBy0iQvL3sE36
+qCQmN74ClYzHZF3vAYXMzSXFxyVrWZFaCOCK+nQbiii5viZdAgMBAAGjXTBbMB0G
+A1UdDgQWBBRzyZHzj//7B4eoVyUGHCF8MpaA+TA6BgNVHREEMzAxggtpZHAudml0
+by5iZYYiaHR0cHM6Ly9pZHAudml0by5iZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQUFAAOCAQEAbEKs6CR4WwPzGrs/dgkdzo/r0L7XucXbo6GmwpbMqJjaADBL
+sNDIDugYHFfrtW4pSIC54YUyjfG9+stWNfkkGMgQMKAkcFmomXsnoDysmuA+odOi
+jt6gdBUMg40vy2R60qE8gsmL2mRvKMrMoSkkX2wUBJY8xnFtiuBNtZmSaFrAwk6b
+aA+QK09yxepTufp8rmQtaxuxpKRM0mgwDr9yXO3VG5UH/iT8rHzmHI1v4TY87sIF
+IFatdC4+iVVunMDubg5tra85zZo0fq+mOBS1N5/6BosdFOsSLF9abBgcTMSs5z8Y
+j2r+snJdC6uPHnJrUv6zauFWOCVUn0sFylcnOw==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vito.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vito.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.vito.be/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vito.be/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vito.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.vito.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vito.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vito.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vito.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">vito.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+
+MIIDGDCCAgCgAwIBAgIVAPcAbjxvbituoR/pksHB50TO8mgGMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMMC2lkcC52aXRvLmJlMB4XDTE0MTIwODE0NTk1N1oXDTM0
+MTIwODE0NTk1N1owFjEUMBIGA1UEAwwLaWRwLnZpdG8uYmUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCQObxHOp9/8uv8w1qlzft0+5Au35eGrkWoBqBi
+bCkDevAEqZmpBhJVsZnPzQcPuPHoqQV90qWEPBdbXLsnyJ/F73lJQMiErAhHDyhT
+RcsULne84KUZVBLOJ8jxzkJ8FEqyhsjKpZFbRsIWohTr7BW4x8OUdTbU4FiuHWox
+m2sPOqIxaDGtw+lvTufZgdEKTbPFMMRRGN4GrJQudyb+tZx0bhDQump3KIGD3tCH
+Eggm6GRupwp0OYzmWnrR6PWe8t9PmLAVWtmaCz0C4hrZk4pyez5PBy0iQvL3sE36
+qCQmN74ClYzHZF3vAYXMzSXFxyVrWZFaCOCK+nQbiii5viZdAgMBAAGjXTBbMB0G
+A1UdDgQWBBRzyZHzj//7B4eoVyUGHCF8MpaA+TA6BgNVHREEMzAxggtpZHAudml0
+by5iZYYiaHR0cHM6Ly9pZHAudml0by5iZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+9w0BAQUFAAOCAQEAbEKs6CR4WwPzGrs/dgkdzo/r0L7XucXbo6GmwpbMqJjaADBL
+sNDIDugYHFfrtW4pSIC54YUyjfG9+stWNfkkGMgQMKAkcFmomXsnoDysmuA+odOi
+jt6gdBUMg40vy2R60qE8gsmL2mRvKMrMoSkkX2wUBJY8xnFtiuBNtZmSaFrAwk6b
+aA+QK09yxepTufp8rmQtaxuxpKRM0mgwDr9yXO3VG5UH/iT8rHzmHI1v4TY87sIF
+IFatdC4+iVVunMDubg5tra85zZo0fq+mOBS1N5/6BosdFOsSLF9abBgcTMSs5z8Y
+j2r+snJdC6uPHnJrUv6zauFWOCVUn0sFylcnOw==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vito.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vito.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">Vlaamse Instelling voor Technologisch Onderzoek</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:GivenName>Gert</md:GivenName>
+    <md:SurName>Vankrunkelsven</md:SurName>
+    <md:EmailAddress>gert.vankrunkelsven@vito.be</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
new file mode 100644
index 00000000..a72596a0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?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>
+      <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="en">http://www.vetmeduni.ac.at/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">http://www.vetmeduni.ac.at/</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>
+MIIDLzCCAhegAwIBAgIUArxd4kLebWsQSo73wqw//qDah+UwDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRaWRwLnZ1LXdpZW4uYWMuYXQwHhcNMDgxMTIxMDkyNzQy
+WhcNMjgxMTIxMDkyNzQyWjAcMRowGAYDVQQDExFpZHAudnUtd2llbi5hYy5hdDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJP9YiA5hoGWj3EQVMD/FzTa
+GxKmYW7yrE2IEcytXZs80z7g00WDfkvgXxPW8p8/djs2EW6Qb0Mjt3Q3U0pXSWkb
+xSsYXZyBzRpyFxeJEIMKgqAkYG2Ka9War/XJTzOZ9VjEspxgm4ROD1L8tA/6rS5o
+MwmwgKW/xowmNC+M+jnCxjZ664XqhoqZowxOSMSGJJQ8RFizmoI1Zn7XIcXQXxjF
+hsMyvpid0uYbyh5kKF+f/DyyPisvsSgeDXZgkaooCcuR70y1lOSQe9XIGsg8LRBE
+niumfn3H7CbzDfAyPar1SkuSGOR79io5ZBSSNLw05rYLWLZED0BkMl5vCQOlAeEC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnZ1LXdpZW4uYWMuYXSGKGh0dHBzOi8v
+aWRwLnZ1LXdpZW4uYWMuYXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFO0XxOhl
+z8mFCvsOavIhT5M47VckMA0GCSqGSIb3DQEBBQUAA4IBAQBAbvWWzPpHX9WvPdH/
+kxg72syav82qGs94YvRugz7xQrKe9+qn/0hT8/ln0ROstr3q/1Ah9b5XDQr3cb37
+DQOuMjSu8BW0RrvZbuoHWzS3J4Ay2iAIA54fo/g9sq8xlhkDN/N+ySnhWjcJi1ag
+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>
+MIIDLzCCAhegAwIBAgIUArxd4kLebWsQSo73wqw//qDah+UwDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRaWRwLnZ1LXdpZW4uYWMuYXQwHhcNMDgxMTIxMDkyNzQy
+WhcNMjgxMTIxMDkyNzQyWjAcMRowGAYDVQQDExFpZHAudnUtd2llbi5hYy5hdDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJP9YiA5hoGWj3EQVMD/FzTa
+GxKmYW7yrE2IEcytXZs80z7g00WDfkvgXxPW8p8/djs2EW6Qb0Mjt3Q3U0pXSWkb
+xSsYXZyBzRpyFxeJEIMKgqAkYG2Ka9War/XJTzOZ9VjEspxgm4ROD1L8tA/6rS5o
+MwmwgKW/xowmNC+M+jnCxjZ664XqhoqZowxOSMSGJJQ8RFizmoI1Zn7XIcXQXxjF
+hsMyvpid0uYbyh5kKF+f/DyyPisvsSgeDXZgkaooCcuR70y1lOSQe9XIGsg8LRBE
+niumfn3H7CbzDfAyPar1SkuSGOR79io5ZBSSNLw05rYLWLZED0BkMl5vCQOlAeEC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnZ1LXdpZW4uYWMuYXSGKGh0dHBzOi8v
+aWRwLnZ1LXdpZW4uYWMuYXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFO0XxOhl
+z8mFCvsOavIhT5M47VckMA0GCSqGSIb3DQEBBQUAA4IBAQBAbvWWzPpHX9WvPdH/
+kxg72syav82qGs94YvRugz7xQrKe9+qn/0hT8/ln0ROstr3q/1Ah9b5XDQr3cb37
+DQOuMjSu8BW0RrvZbuoHWzS3J4Ay2iAIA54fo/g9sq8xlhkDN/N+ySnhWjcJi1ag
+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.vu-wien.ac.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.vu-wien.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.warkscol.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.warkscol.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c68414e7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.warkscol.ac.uk-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						LmFjLnVrMB4XDTE0MDUwMTEzMTMxMFoXDTM0MDQyNjEzMTMxMFowcjELMAkGA1UE
+						BhMCR0IxFTATBgNVBAgTDFdhcndpY2tzaGlyZTEQMA4GA1UEBxMHV2Fyd2ljazEd
+						MBsGA1UEChMUV2Fyd2lja3NoaXJlIENvbGxlZ2UxGzAZBgNVBAMTEmlkcC53YXJr
+						c2NvbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALhK7iVu
+						A691GNEVeV8hM4gdlUNDpZzGQUgUsekgjc+75zkpUMrkCPuSlJeIoegK524HMDGl
+						/J4tHGS8NtQwnaG/bigbWu3BOXR7bKwHOHpMhIek1V8BXOhBadfnp7IS234e4h/L
+						yreSdxsJdaPKiT8+Orxlu5nmOUN8cLhR7FWZm6TZjN8uEObKTd/QxW0y9PiZFuyY
+						VO/P2yv5QmHTuC81eKI3bRIQeLo/Lb/ixKdsihsJ/AqfjCpTUo0OdV9yawIPfEpu
+						cOoWvaWGWAi2P8sM/0VfyIM1Hv2OReMef8sCS/MmSxV7LbEGk2GWSWXl2XwiJXov
+						Kcr/t3HI+s1OGi0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEArSIfclS/osh3HZT8
+						Y9pU4rTBpY+5xmYdLZjGaTk4DYJJFOU79IF/CdRMVwjSkspNiQT5lBvps9zB7/NQ
+						w2gZHlixBj9dKRNUwYEjSCX03LXb4lBF4T81DSL9PcdbGfvgDVfk9TcZNX9KA0Bd
+						2GhMub8+MRrSsrvX4wLyUeNqlA4Hb7RT4Y584iO58+hOL9qwDPskqUPSp1wXeBsJ
+						oPn7U2TcWMwsP66fOo2fO7Xdt8iyeeZyDLBvFul2e3NXMjNlr5v3nyUze3iLer1m
+						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>
+						MIIDYDCCAkgCCQD/4wYFNpyojzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
+						QjEVMBMGA1UECBMMV2Fyd2lja3NoaXJlMRAwDgYDVQQHEwdXYXJ3aWNrMR0wGwYD
+						VQQKExRXYXJ3aWNrc2hpcmUgQ29sbGVnZTEbMBkGA1UEAxMSaWRwLndhcmtzY29s
+						LmFjLnVrMB4XDTE0MDUwMTEzMTMxMFoXDTM0MDQyNjEzMTMxMFowcjELMAkGA1UE
+						BhMCR0IxFTATBgNVBAgTDFdhcndpY2tzaGlyZTEQMA4GA1UEBxMHV2Fyd2ljazEd
+						MBsGA1UEChMUV2Fyd2lja3NoaXJlIENvbGxlZ2UxGzAZBgNVBAMTEmlkcC53YXJr
+						c2NvbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALhK7iVu
+						A691GNEVeV8hM4gdlUNDpZzGQUgUsekgjc+75zkpUMrkCPuSlJeIoegK524HMDGl
+						/J4tHGS8NtQwnaG/bigbWu3BOXR7bKwHOHpMhIek1V8BXOhBadfnp7IS234e4h/L
+						yreSdxsJdaPKiT8+Orxlu5nmOUN8cLhR7FWZm6TZjN8uEObKTd/QxW0y9PiZFuyY
+						VO/P2yv5QmHTuC81eKI3bRIQeLo/Lb/ixKdsihsJ/AqfjCpTUo0OdV9yawIPfEpu
+						cOoWvaWGWAi2P8sM/0VfyIM1Hv2OReMef8sCS/MmSxV7LbEGk2GWSWXl2XwiJXov
+						Kcr/t3HI+s1OGi0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEArSIfclS/osh3HZT8
+						Y9pU4rTBpY+5xmYdLZjGaTk4DYJJFOU79IF/CdRMVwjSkspNiQT5lBvps9zB7/NQ
+						w2gZHlixBj9dKRNUwYEjSCX03LXb4lBF4T81DSL9PcdbGfvgDVfk9TcZNX9KA0Bd
+						2GhMub8+MRrSsrvX4wLyUeNqlA4Hb7RT4Y584iO58+hOL9qwDPskqUPSp1wXeBsJ
+						oPn7U2TcWMwsP66fOo2fO7Xdt8iyeeZyDLBvFul2e3NXMjNlr5v3nyUze3iLer1m
+						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>
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
new file mode 100644
index 00000000..a3529d56
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.warrington.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?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>
+      <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
+						BAYTAkdCMRAwDgYDVQQREwdXQTIgOFFBMREwDwYDVQQIEwhDaGVzaGlyZTETMBEG
+						A1UEBxMKV0FSUklOR1RPTjEQMA4GA1UECRMHV2lud2ljazEVMBMGA1UECRMMV2lu
+						d2ljayBSb2FkMRwwGgYDVQQJExNXaW53aWNrIFJvYWQgQ2FtcHVzMR4wHAYDVQQK
+						ExVXYXJyaW5ndG9uIENvbGxlZ2lhdGUxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR0w
+						GwYDVQQDExRpZHAud2FycmluZ3Rvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBAKyqFQr4F107oAM805XCaRDWpXFlGkT2l6HRRxn/cGht/Wgn
+						Bu3wgxxdH+DZnqEUNs2fkrIvRRPxN1QcJ2Bg9dyi1aqM2ZPKUgVLSBoJo1YT29gv
+						Rp95RtHccpRHjeKNCN7Y0fDYQaGzOhfQ1MJ1arguQBvKgDpiRoQ/SQR3QWicWYqJ
+						N+vltT+IPOmvT4PuyWIVvWs3Us4ESRFvGn3V8u7Sm+A4tjSOZq3ZJjZVI0ixWVPa
+						SBcb418sxQNnMaydJokgoM+UnL21H70YnKHmgvHJu4L4HzX3AHWf4CZLVmS1AT7j
+						OfSqvh20bBwVfwaDiIAzUHeWAeLPjfmb64RZbRcCAwEAAaOCAXEwggFtMB8GA1Ud
+						IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTLdHJeiw7kogwc
+						sVR6BNc9JC0urzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
+						FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQIC
+						HTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgw
+						FoIUaWRwLndhcnJpbmd0b24uYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAGRcCuf
+						CXbp7sAivclytw0cMO1xrGmMEi4wVjpjkyPtttmkngZRYa21gLeExdxr+fs1P/5G
+						LAaFhLCtosj7W6iUtehMDwMNQPs1Lin5MDqhOQLSnEtT8WVDWjf25cRxdbpxf1ti
+						dAmU9mX4HT93FMWn/RGgfEoi6wc0VPW37j1kRruqHTU9Wxyujjyw6RZQ9CWx8y8g
+						ntmhLWOveV9P5ID6Sh3QWzMcE005NKjiHdO8RfBrhg5FfTj9dOsee9Kbx6GH6gVj
+						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>
+						MIIFFzCCA/+gAwIBAgIQMjinXVJxXZDuVUOslVHWJzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMTEwNjAwMDAwMFoXDTE2MTEwNTIzNTk1OVowgeMxCzAJBgNV
+						BAYTAkdCMRAwDgYDVQQREwdXQTIgOFFBMREwDwYDVQQIEwhDaGVzaGlyZTETMBEG
+						A1UEBxMKV0FSUklOR1RPTjEQMA4GA1UECRMHV2lud2ljazEVMBMGA1UECRMMV2lu
+						d2ljayBSb2FkMRwwGgYDVQQJExNXaW53aWNrIFJvYWQgQ2FtcHVzMR4wHAYDVQQK
+						ExVXYXJyaW5ndG9uIENvbGxlZ2lhdGUxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR0w
+						GwYDVQQDExRpZHAud2FycmluZ3Rvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBAKyqFQr4F107oAM805XCaRDWpXFlGkT2l6HRRxn/cGht/Wgn
+						Bu3wgxxdH+DZnqEUNs2fkrIvRRPxN1QcJ2Bg9dyi1aqM2ZPKUgVLSBoJo1YT29gv
+						Rp95RtHccpRHjeKNCN7Y0fDYQaGzOhfQ1MJ1arguQBvKgDpiRoQ/SQR3QWicWYqJ
+						N+vltT+IPOmvT4PuyWIVvWs3Us4ESRFvGn3V8u7Sm+A4tjSOZq3ZJjZVI0ixWVPa
+						SBcb418sxQNnMaydJokgoM+UnL21H70YnKHmgvHJu4L4HzX3AHWf4CZLVmS1AT7j
+						OfSqvh20bBwVfwaDiIAzUHeWAeLPjfmb64RZbRcCAwEAAaOCAXEwggFtMB8GA1Ud
+						IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTLdHJeiw7kogwc
+						sVR6BNc9JC0urzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
+						FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQIC
+						HTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgw
+						FoIUaWRwLndhcnJpbmd0b24uYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAGRcCuf
+						CXbp7sAivclytw0cMO1xrGmMEi4wVjpjkyPtttmkngZRYa21gLeExdxr+fs1P/5G
+						LAaFhLCtosj7W6iUtehMDwMNQPs1Lin5MDqhOQLSnEtT8WVDWjf25cRxdbpxf1ti
+						dAmU9mX4HT93FMWn/RGgfEoi6wc0VPW37j1kRruqHTU9Wxyujjyw6RZQ9CWx8y8g
+						ntmhLWOveV9P5ID6Sh3QWzMcE005NKjiHdO8RfBrhg5FfTj9dOsee9Kbx6GH6gVj
+						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>
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
new file mode 100644
index 00000000..61ccff2d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.warwick.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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>
+						MIIDMDCCAhigAwIBAgIVAMUgGil9ReUGOng/Gws9DutReU1TMA0GCSqGSIb3DQEB
+						BQUAMBwxGjAYBgNVBAMTEWlkcC53YXJ3aWNrLmFjLnVrMB4XDTE0MDcwOTE0MDk0
+						OFoXDTM0MDcwOTE0MDk0OFowHDEaMBgGA1UEAxMRaWRwLndhcndpY2suYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCebNiWX5f4B7Xgg1ukG04P
+						GvuNRynjJnrGzFqrqpOhFSvljVhU8QBkkVj6+QNh4llB3wSSlNTBiPze9zd45/1l
+						rcPwzXQ5GsB2a//2Z8pS7B5s1qJKZH/zjLp+UIKCqXGjftYHHwPstAO8pMMSuk4M
+						ERYCWLKt892PmrgjOnvXS0VWY9ltqAvAAl/d9Mae0UXkIYKk3VJNfClAk8U3zOej
+						Ni25fAyEYwaGEfGcbBUHbxvMJlI1WaneOaoAPk20IjqrOfhK5OH9lRbR7vxR2/w5
+						gya37LLhDRqADpp/dc8Qa35AzlOmgvzE3teQFwnpSHKL1BRIAotp4KTbu8xLDJEN
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC53YXJ3aWNrLmFjLnVrhihodHRwczov
+						L2lkcC53YXJ3aWNrLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ8q27h
+						eoQoKE9yxN7Jt/YS7RIYOjANBgkqhkiG9w0BAQUFAAOCAQEAUCzlCcG5TVL1P+IR
+						523VOgKUq8YRzwCqERqXNRD4x0WQy8EYCYCKbYWhl5FrJNpG992nlRS2fXfGe0el
+						td7Npy8vfBaroIgrOclREjYO+YBRC72ubIZKWGcU+Nq9C+RJZ2QjK+yMb76C1yUc
+						TQEfw/lF/hSUofqgUSRketoCj80AOGrrG0wGV7oWuqW2MnvTIxnlosclSJgIpxW/
+						RWShrJhBzCBHU5Nbz7+JEhFX3mSuBUMtSV1qsZbtwtdHVm977pOYrm5Nd35KBKNf
+						+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>
+						MIIDMDCCAhigAwIBAgIVAMUgGil9ReUGOng/Gws9DutReU1TMA0GCSqGSIb3DQEB
+						BQUAMBwxGjAYBgNVBAMTEWlkcC53YXJ3aWNrLmFjLnVrMB4XDTE0MDcwOTE0MDk0
+						OFoXDTM0MDcwOTE0MDk0OFowHDEaMBgGA1UEAxMRaWRwLndhcndpY2suYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCebNiWX5f4B7Xgg1ukG04P
+						GvuNRynjJnrGzFqrqpOhFSvljVhU8QBkkVj6+QNh4llB3wSSlNTBiPze9zd45/1l
+						rcPwzXQ5GsB2a//2Z8pS7B5s1qJKZH/zjLp+UIKCqXGjftYHHwPstAO8pMMSuk4M
+						ERYCWLKt892PmrgjOnvXS0VWY9ltqAvAAl/d9Mae0UXkIYKk3VJNfClAk8U3zOej
+						Ni25fAyEYwaGEfGcbBUHbxvMJlI1WaneOaoAPk20IjqrOfhK5OH9lRbR7vxR2/w5
+						gya37LLhDRqADpp/dc8Qa35AzlOmgvzE3teQFwnpSHKL1BRIAotp4KTbu8xLDJEN
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC53YXJ3aWNrLmFjLnVrhihodHRwczov
+						L2lkcC53YXJ3aWNrLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ8q27h
+						eoQoKE9yxN7Jt/YS7RIYOjANBgkqhkiG9w0BAQUFAAOCAQEAUCzlCcG5TVL1P+IR
+						523VOgKUq8YRzwCqERqXNRD4x0WQy8EYCYCKbYWhl5FrJNpG992nlRS2fXfGe0el
+						td7Npy8vfBaroIgrOclREjYO+YBRC72ubIZKWGcU+Nq9C+RJZ2QjK+yMb76C1yUc
+						TQEfw/lF/hSUofqgUSRketoCj80AOGrrG0wGV7oWuqW2MnvTIxnlosclSJgIpxW/
+						RWShrJhBzCBHU5Nbz7+JEhFX3mSuBUMtSV1qsZbtwtdHVm977pOYrm5Nd35KBKNf
+						+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>
diff --git a/swamid-interfederations-2.0/idp.we-learn.com-shibboleth.xml b/swamid-interfederations-2.0/idp.we-learn.com-shibboleth.xml
new file mode 100644
index 00000000..3da521d1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.we-learn.com-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">we-learn.com</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIErTCCA5WgAwIBAgIQPfNF+vhuBDz3tc7vBY3ePzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDUxNDAwMDAwMFoXDTE1MDUxNDIzNTk1OVowgYcxCzAJBgNV
+						BAYTAkdCMRUwEwYDVQQIEwxXYXJ3aWNrc2hpcmUxEDAOBgNVBAcTB1dhcndpY2sx
+						JDAiBgNVBAoTG1dhcndpY2tzaGlyZSBDb3VudHkgQ291bmNpbDEOMAwGA1UECxMF
+						SUNURFMxGTAXBgNVBAMTEGlkcC53ZS1sZWFybi5jb20wggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQDBg+F2y3Re0AFf+p9H/+sLvIiezAHp5QOUUk9EnEiG
+						uj0zXCgNPMAgEBaAYx+hkvEaNAK5ZkTAQ0uIjWxD1ZAtCeAMkMQjT+ZzG2hzdpT+
+						4dzDWafGgPxUuPQvWcGdH2+FNWJoe8XEOuDd0Q1wf+VcEXwz48FAxGtMZKISl7CR
+						i0224S4k+KJKxYoly5W3uhgIH3ZfQFTCVJWX2VeOhZKrKxvIAS0gUOpHXn8Ed1fW
+						9CHAER7GQC81AiklSl+keu0Ov1LBQcH/0VByx4+Ch4UrTcBZ7O+fvi3rcEVwW/NG
+						lwTJvQE8+HHB+DsfIswmnGN+r1mGK4HUQM5Acf6XpUN/AgMBAAGjggFjMIIBXzAf
+						BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUsnrSL2/v
+						6oll+wlyNf5jeMl3cj4wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
+						VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
+						MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+						Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+						dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+						BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQaWRw
+						LndlLWxlYXJuLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAvIKAIexo574j5vf8AGxJ
+						hP0yHCLZ/km5IPdbik7nrLl4pRefcHzLyPGOFG6s8Jts0uxAWp564BZ0PU1IdII3
+						Y/u+Xbaj5WigfOOwijmGQK6vlhe8Nr09mKTrw1hfG+KGztRVrPb7csHDyjlhfZ/9
+						EpI0E8MIs///tWYpbFSti6tfP6hGxAZRH34kmN3F2Gx16gdq8yk8/JRt7rPfWZVo
+						8iElsad0A0mPtTrQfVAnZy/g3A0nGKSXZWoMp1GpRW0Ag7ySjSDHKs88BvoL25ZD
+						UOmr1OQRBFPIxb/r1PrEqdauCy1AuSNvaWLro7UvCWNYC4WBVlOIJ3Js218Y1ufb
+						EA==
+					</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIErTCCA5WgAwIBAgIQPfNF+vhuBDz3tc7vBY3ePzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDUxNDAwMDAwMFoXDTE1MDUxNDIzNTk1OVowgYcxCzAJBgNV
+						BAYTAkdCMRUwEwYDVQQIEwxXYXJ3aWNrc2hpcmUxEDAOBgNVBAcTB1dhcndpY2sx
+						JDAiBgNVBAoTG1dhcndpY2tzaGlyZSBDb3VudHkgQ291bmNpbDEOMAwGA1UECxMF
+						SUNURFMxGTAXBgNVBAMTEGlkcC53ZS1sZWFybi5jb20wggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQDBg+F2y3Re0AFf+p9H/+sLvIiezAHp5QOUUk9EnEiG
+						uj0zXCgNPMAgEBaAYx+hkvEaNAK5ZkTAQ0uIjWxD1ZAtCeAMkMQjT+ZzG2hzdpT+
+						4dzDWafGgPxUuPQvWcGdH2+FNWJoe8XEOuDd0Q1wf+VcEXwz48FAxGtMZKISl7CR
+						i0224S4k+KJKxYoly5W3uhgIH3ZfQFTCVJWX2VeOhZKrKxvIAS0gUOpHXn8Ed1fW
+						9CHAER7GQC81AiklSl+keu0Ov1LBQcH/0VByx4+Ch4UrTcBZ7O+fvi3rcEVwW/NG
+						lwTJvQE8+HHB+DsfIswmnGN+r1mGK4HUQM5Acf6XpUN/AgMBAAGjggFjMIIBXzAf
+						BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUsnrSL2/v
+						6oll+wlyNf5jeMl3cj4wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
+						VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
+						MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+						Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+						dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+						BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQaWRw
+						LndlLWxlYXJuLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAvIKAIexo574j5vf8AGxJ
+						hP0yHCLZ/km5IPdbik7nrLl4pRefcHzLyPGOFG6s8Jts0uxAWp564BZ0PU1IdII3
+						Y/u+Xbaj5WigfOOwijmGQK6vlhe8Nr09mKTrw1hfG+KGztRVrPb7csHDyjlhfZ/9
+						EpI0E8MIs///tWYpbFSti6tfP6hGxAZRH34kmN3F2Gx16gdq8yk8/JRt7rPfWZVo
+						8iElsad0A0mPtTrQfVAnZy/g3A0nGKSXZWoMp1GpRW0Ag7ySjSDHKs88BvoL25ZD
+						UOmr1OQRBFPIxb/r1PrEqdauCy1AuSNvaWLro7UvCWNYC4WBVlOIJ3Js218Y1ufb
+						EA==
+					</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>Muhammad</md:GivenName>
+    <md:SurName>Sikander</md:SurName>
+    <md:EmailAddress>mailto:Sikander.m@we-learn.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Muhammad</md:GivenName>
+    <md:SurName>Sikander</md:SurName>
+    <md:EmailAddress>mailto:Sikander.m@we-learn.com</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
new file mode 100644
index 00000000..f9c63cc0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.wellcome.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						GzAZBgNVBAMTEmlkcC53ZWxsY29tZS5hYy51azAeFw0xMzA2MTkwODQ1MzVaFw0z
+						MzA2MTQwODQ1MzVaMIGHMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHRW5nbGFuZDEP
+						MA0GA1UEBxMGTG9uZG9uMRswGQYDVQQKExJUaGUgV2VsbGNvbWUgVHJ1c3QxGzAZ
+						BgNVBAsTElNoaWJib2xldGggUHJvamVjdDEbMBkGA1UEAxMSaWRwLndlbGxjb21l
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6MfUt+kgNykR
+						8E2o8xQg67Td9sUz3Xh/4q8jDZTlbblsWn0xCHnpoglT0+dMX2roLWoU1wj2WhyR
+						0aV/gIc1HsFePGvg0/AzKhAFniWUygPTU8lRICZYr6L09gjk1cioiG/b6JQbkhup
+						q68Os3mAWcmndLw64TuY90BdxjCSd+lgAFpPmHhhtQSrhTCWwQFmzGkERTLMRchY
+						WZRGNc66TuCzYfGoiaEfdZzxxm+/VDVJked1vUH4x91fcVEFAuEl2nEpu5pq3gjT
+						u2TVkVZ4tvokZdcGQ4rXjU6Sam/o7Xbj+nz8UsjyyrlYjB8YokgPR87pONi+KmFk
+						0vu6NLuOCwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBX91XErSfqgmH8RVxMtZQu
+						0KWQZB/US90cJhlUa/1CyrCaMVOLDD5tphz588Gkq12cDaoZ9gBSAf92XsDuQqlM
+						DsU2p1OwqAiQ/Qt7eRUnealBsG/FT+ZDPd0Ieec0l42cltp45FaqpZqniaqMNhW6
+						jeZBsl3D8nPC0YLFMdnT81GX+BKxoX4h5BcJzYzpYB/GtcSSbUTZBEfb46K216wo
+						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>
+						MIIDjDCCAnQCCQDSxQ0pkFszHTANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
+						R0IxEDAOBgNVBAgTB0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEbMBkGA1UEChMS
+						VGhlIFdlbGxjb21lIFRydXN0MRswGQYDVQQLExJTaGliYm9sZXRoIFByb2plY3Qx
+						GzAZBgNVBAMTEmlkcC53ZWxsY29tZS5hYy51azAeFw0xMzA2MTkwODQ1MzVaFw0z
+						MzA2MTQwODQ1MzVaMIGHMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHRW5nbGFuZDEP
+						MA0GA1UEBxMGTG9uZG9uMRswGQYDVQQKExJUaGUgV2VsbGNvbWUgVHJ1c3QxGzAZ
+						BgNVBAsTElNoaWJib2xldGggUHJvamVjdDEbMBkGA1UEAxMSaWRwLndlbGxjb21l
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6MfUt+kgNykR
+						8E2o8xQg67Td9sUz3Xh/4q8jDZTlbblsWn0xCHnpoglT0+dMX2roLWoU1wj2WhyR
+						0aV/gIc1HsFePGvg0/AzKhAFniWUygPTU8lRICZYr6L09gjk1cioiG/b6JQbkhup
+						q68Os3mAWcmndLw64TuY90BdxjCSd+lgAFpPmHhhtQSrhTCWwQFmzGkERTLMRchY
+						WZRGNc66TuCzYfGoiaEfdZzxxm+/VDVJked1vUH4x91fcVEFAuEl2nEpu5pq3gjT
+						u2TVkVZ4tvokZdcGQ4rXjU6Sam/o7Xbj+nz8UsjyyrlYjB8YokgPR87pONi+KmFk
+						0vu6NLuOCwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBX91XErSfqgmH8RVxMtZQu
+						0KWQZB/US90cJhlUa/1CyrCaMVOLDD5tphz588Gkq12cDaoZ9gBSAf92XsDuQqlM
+						DsU2p1OwqAiQ/Qt7eRUnealBsG/FT+ZDPd0Ieec0l42cltp45FaqpZqniaqMNhW6
+						jeZBsl3D8nPC0YLFMdnT81GX+BKxoX4h5BcJzYzpYB/GtcSSbUTZBEfb46K216wo
+						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>
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
new file mode 100644
index 00000000..8b67f348
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.westherts.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,96 @@
+<?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>
+      <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
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw1GVlx3OHs9vz
+						PNI4XgpqaTckETUbvNuYzSHHO8Cd42rWqbW38ukmWmZn6a0emWQ/AcoQvISc8SK4
+						W+U6XM43w+FsCioKesE+JFmUZEs4vbiQw/F5MiAOwaDwjDtGuXy36aCR2MlUleAC
+						a1nFUolcsJmd3J1FsRMcs07naGZYwPVGnwNMABTjQWMHgkoWhKgaCO/YuJR1/dkC
+						rFt5tTw+a2NBjaL26Yo/+3Aw3SoE+7CmIAmh1vP48m8rCdCbahPWmhbzESBdb52c
+						7Aui1S4Z4QuagudLGFt7QwR7sEUQ2+qvrpb+oluMnDUq5UiYyh2hCzH6a6ssg4rM
+						1fXp6SN/AgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcDIud2VzdGhlcnRzLmFjLnVr
+						hitodHRwczovL2lkcDIud2VzdGhlcnRzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBQWp8mzB9AC+Od9M1CfhkXVEbhP9DANBgkqhkiG9w0BAQUFAAOCAQEA
+						GvX+Jixu4yzpXQysV3BrHkLaU6QiwYgoDnVh1269NfiGpCp2J3dz5+1uU4WGwwXY
+						aqr1679DjW9w8EujJHQRibwODnXM8kAJNd7GlJvrVXz1ZM4CXHpR/gAiI58MG4Vr
+						tQ7sB0fyZzWlwcjNxbRqrX00v8Xz467YtYtJb4eDpZq2WHP/1lL1U9gm3FyqYxzn
+						mrBVgIjdvI7Z/Y8DR/vRAwWS/qAiTzu+3tTbn8FalwF0ybn7Do9yVPP7DTm+B2rJ
+						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>
+						MIIDPDCCAiSgAwIBAgIVAJ9cooaHnMILJdvfcwbpOMFGaY3KMA0GCSqGSIb3DQEB
+						BQUAMB8xHTAbBgNVBAMTFGlkcDIud2VzdGhlcnRzLmFjLnVrMB4XDTE0MDUwNjE0
+						NTc0MVoXDTM0MDUwNjE0NTc0MVowHzEdMBsGA1UEAxMUaWRwMi53ZXN0aGVydHMu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw1GVlx3OHs9vz
+						PNI4XgpqaTckETUbvNuYzSHHO8Cd42rWqbW38ukmWmZn6a0emWQ/AcoQvISc8SK4
+						W+U6XM43w+FsCioKesE+JFmUZEs4vbiQw/F5MiAOwaDwjDtGuXy36aCR2MlUleAC
+						a1nFUolcsJmd3J1FsRMcs07naGZYwPVGnwNMABTjQWMHgkoWhKgaCO/YuJR1/dkC
+						rFt5tTw+a2NBjaL26Yo/+3Aw3SoE+7CmIAmh1vP48m8rCdCbahPWmhbzESBdb52c
+						7Aui1S4Z4QuagudLGFt7QwR7sEUQ2+qvrpb+oluMnDUq5UiYyh2hCzH6a6ssg4rM
+						1fXp6SN/AgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcDIud2VzdGhlcnRzLmFjLnVr
+						hitodHRwczovL2lkcDIud2VzdGhlcnRzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBQWp8mzB9AC+Od9M1CfhkXVEbhP9DANBgkqhkiG9w0BAQUFAAOCAQEA
+						GvX+Jixu4yzpXQysV3BrHkLaU6QiwYgoDnVh1269NfiGpCp2J3dz5+1uU4WGwwXY
+						aqr1679DjW9w8EujJHQRibwODnXM8kAJNd7GlJvrVXz1ZM4CXHpR/gAiI58MG4Vr
+						tQ7sB0fyZzWlwcjNxbRqrX00v8Xz467YtYtJb4eDpZq2WHP/1lL1U9gm3FyqYxzn
+						mrBVgIjdvI7Z/Y8DR/vRAwWS/qAiTzu+3tTbn8FalwF0ybn7Do9yVPP7DTm+B2rJ
+						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>
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
new file mode 100644
index 00000000..532d89f5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.weston.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,92 @@
+<?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>
+      <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
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqznc6D9m1YX+EyNAeRfFBVD9
+						Ayf15/t1kpP4A05WfmENLz+FdM1Kk2bnCrRsjcsO3n++ua/vKouHThHYa8IdFady
+						nyC9M/PYDA5hkEwtWG+D32U0+NCwq0ZfDx3sd/BdfBkJHTyebM/yqy4EJRn764Wi
+						D9ORI4V6e2q5WbS/u+ujwkfDGOuThsKAAxlnW/fUk+EXjCDoYs8N+ar4GYhKD+w0
+						h6FVl7NPQ1T1loxstFB47wVCxNloTmBZc8w/6zPPiIaFKVA+/ROQAmDcWbvbA5u6
+						4iZhTieGXw8DRim+iqKlrrWpq7CE3IbtC14YXPRQsg8EdT912QOVCkoI+ETd+wID
+						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAud2VzdG9uLmFjLnVrhidodHRwczovL2lk
+						cC53ZXN0b24uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOCbusYezUEQ
+						N+uyvBFAD7q+sQtKMA0GCSqGSIb3DQEBBQUAA4IBAQBRLQicI1ilCyx9sQODb0nj
+						sd3Za1CHPTweNw1iIWflTEZl3s6qP1caJqmWu38gSqSsJFG9pdGhOOxjPTX9qp/H
+						5oqjKIzGmvow5e8rIGUkH1Wy9Xku4U0fcIl8jCH41SumJiBskxNBwrGOQ7ek/pqQ
+						7zi0xyckQPto/EzHVKNgLjtOMCzoQTCSc6VuydsvpseiS8PhVz7mE1wObvoXmYzI
+						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>
+						MIIDLDCCAhSgAwIBAgIVAPcnzcVGLzEqHB1pMsO1kGPh7IV9MA0GCSqGSIb3DQEB
+						BQUAMBsxGTAXBgNVBAMTEGlkcC53ZXN0b24uYWMudWswHhcNMTMwMTE2MTcxMzUy
+						WhcNMzMwMTE2MTcxMzUyWjAbMRkwFwYDVQQDExBpZHAud2VzdG9uLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqznc6D9m1YX+EyNAeRfFBVD9
+						Ayf15/t1kpP4A05WfmENLz+FdM1Kk2bnCrRsjcsO3n++ua/vKouHThHYa8IdFady
+						nyC9M/PYDA5hkEwtWG+D32U0+NCwq0ZfDx3sd/BdfBkJHTyebM/yqy4EJRn764Wi
+						D9ORI4V6e2q5WbS/u+ujwkfDGOuThsKAAxlnW/fUk+EXjCDoYs8N+ar4GYhKD+w0
+						h6FVl7NPQ1T1loxstFB47wVCxNloTmBZc8w/6zPPiIaFKVA+/ROQAmDcWbvbA5u6
+						4iZhTieGXw8DRim+iqKlrrWpq7CE3IbtC14YXPRQsg8EdT912QOVCkoI+ETd+wID
+						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAud2VzdG9uLmFjLnVrhidodHRwczovL2lk
+						cC53ZXN0b24uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOCbusYezUEQ
+						N+uyvBFAD7q+sQtKMA0GCSqGSIb3DQEBBQUAA4IBAQBRLQicI1ilCyx9sQODb0nj
+						sd3Za1CHPTweNw1iIWflTEZl3s6qP1caJqmWu38gSqSsJFG9pdGhOOxjPTX9qp/H
+						5oqjKIzGmvow5e8rIGUkH1Wy9Xku4U0fcIl8jCH41SumJiBskxNBwrGOQ7ek/pqQ
+						7zi0xyckQPto/EzHVKNgLjtOMCzoQTCSc6VuydsvpseiS8PhVz7mE1wObvoXmYzI
+						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>David</md:GivenName>
+    <md:SurName>Stocks</md:SurName>
+    <md:EmailAddress>mailto:david.stocks@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
new file mode 100644
index 00000000..6bbf82d6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.weymouth.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,111 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">weymouth.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEnzCCA4egAwIBAgIRAKgEpGJyvtxK8KS8qY6a+HkwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjA1MTYwMDAwMDBaFw0xNTA1MTYyMzU5NTlaMHcxCzAJBgNV
+						BAYTAkdCMREwDwYDVQQIEwhXZXltb3V0aDEPMA0GA1UEBxMGRG9yc2V0MRkwFwYD
+						VQQKExBXZXltb3V0aCBDb2xsZWdlMQwwCgYDVQQLEwNJQ1MxGzAZBgNVBAMTEmlk
+						cC53ZXltb3V0aC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						ANg0Urh0aGmUsOiAuVpCOIPC/LJOnZafR5Y83vPxSqxtwkQFfa9oSmgdVhbC25SD
+						Xxy1c+hel2ISZaF4Cl+DvEF5DMi2LpuF3j6rVppq2GKvzEi5kzSBl/ZgGle+144I
+						Db/YJoWmsFBuUaleaKsx2Cb5fh9+8HBqwqsSklGCJvvB/DpX0JV+DcsC2Nmugr55
+						TlUTbeuEz0i3xuTxDjaDYr/oqqy9S/6LY9Q4p8pPGQ5XaTmPG0tsEbAS85t5h3ku
+						qkjnFwhXy+C0opeYEXPpXT6EeX5Lb6W2PBUVDHoQGsbngDBZZgOM4tgsS0BO1fSb
+						O4OnmyvVBfUFb2viQCi1PHMCAwEAAaOCAWUwggFhMB8GA1UdIwQYMBaAFAy9k2gM
+						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSIfxgtmwnBVXmiEoE1rD9rS9dGwDAO
+						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+						AQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAx
+						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+						cC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAud2V5bW91dGguYWMudWsw
+						DQYJKoZIhvcNAQEFBQADggEBAF9xUKxVPiQoqpiyhQn14qE0mHBx2HX73A9qsn8x
+						mb2Kacfcer51fSp77LM1vyiM9L4cB/wSQm8MPBPik2D9s9dOJUCJUbGNVyXRnIxC
+						nOm3AJHMEoIPNCG7Yf9wR/tj9k9XOFhIjJXC72i9/Ft7xkZJdsCW+VTDgtsh11z6
+						88l8Qp+pUyqjKQHFmq/nhIGPF4EzutnP/pAoxaJkmTlDqsAeXXNid9fJL8XpsCzn
+						DR0yU34qjRrwqm9g3AZKw1yrZ5yCe3zmh1fEfg0wHFXRg4vfUbOhZrpABVWg5nZs
+						Qwa/HoPxDuzPzuLRmGqzWwbwXWt61FnMB6/cCtxF6BxI7Bc=
+					</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEnzCCA4egAwIBAgIRAKgEpGJyvtxK8KS8qY6a+HkwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjA1MTYwMDAwMDBaFw0xNTA1MTYyMzU5NTlaMHcxCzAJBgNV
+						BAYTAkdCMREwDwYDVQQIEwhXZXltb3V0aDEPMA0GA1UEBxMGRG9yc2V0MRkwFwYD
+						VQQKExBXZXltb3V0aCBDb2xsZWdlMQwwCgYDVQQLEwNJQ1MxGzAZBgNVBAMTEmlk
+						cC53ZXltb3V0aC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						ANg0Urh0aGmUsOiAuVpCOIPC/LJOnZafR5Y83vPxSqxtwkQFfa9oSmgdVhbC25SD
+						Xxy1c+hel2ISZaF4Cl+DvEF5DMi2LpuF3j6rVppq2GKvzEi5kzSBl/ZgGle+144I
+						Db/YJoWmsFBuUaleaKsx2Cb5fh9+8HBqwqsSklGCJvvB/DpX0JV+DcsC2Nmugr55
+						TlUTbeuEz0i3xuTxDjaDYr/oqqy9S/6LY9Q4p8pPGQ5XaTmPG0tsEbAS85t5h3ku
+						qkjnFwhXy+C0opeYEXPpXT6EeX5Lb6W2PBUVDHoQGsbngDBZZgOM4tgsS0BO1fSb
+						O4OnmyvVBfUFb2viQCi1PHMCAwEAAaOCAWUwggFhMB8GA1UdIwQYMBaAFAy9k2gM
+						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSIfxgtmwnBVXmiEoE1rD9rS9dGwDAO
+						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+						AQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAx
+						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+						cC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAud2V5bW91dGguYWMudWsw
+						DQYJKoZIhvcNAQEFBQADggEBAF9xUKxVPiQoqpiyhQn14qE0mHBx2HX73A9qsn8x
+						mb2Kacfcer51fSp77LM1vyiM9L4cB/wSQm8MPBPik2D9s9dOJUCJUbGNVyXRnIxC
+						nOm3AJHMEoIPNCG7Yf9wR/tj9k9XOFhIjJXC72i9/Ft7xkZJdsCW+VTDgtsh11z6
+						88l8Qp+pUyqjKQHFmq/nhIGPF4EzutnP/pAoxaJkmTlDqsAeXXNid9fJL8XpsCzn
+						DR0yU34qjRrwqm9g3AZKw1yrZ5yCe3zmh1fEfg0wHFXRg4vfUbOhZrpABVWg5nZs
+						Qwa/HoPxDuzPzuLRmGqzWwbwXWt61FnMB6/cCtxF6BxI7Bc=
+					</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>
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
new file mode 100644
index 00000000..2145bcb4
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.wiltshire.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?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>
+      <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
+						IENBIDIwHhcNMTUwMjI0MDAwMDAwWhcNMTgwMjIzMjM1OTU5WjBBMSEwHwYDVQQL
+						ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC53aWx0c2hp
+						cmUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8WXQAsa7l
+						jeJ86YSF0jAyrqyaSeIjwQgFnUXFCPw/k/H9vzNDF/cZM8faRfx+14b9HMlXLdLD
+						bKcl/4dPQY6oxqt+3IGTLPATva2aMbssTbICswVz7VOVjHMPnssha9HYDFgoUVTV
+						7C0f8nKGzzQiT6FIspIjWALBU7DAOonvz0MernDWpVQ5vpW/TSMbd1wBHgMmdTmu
+						h/XgffOYolhgBS5asilC3O6BCqxbYdH76MEeZcVcXCf0y4lQ41pUNagAtLdCNOZu
+						A5IUbqrao6BACiKFzv/mpguYNXEtZHSGyCLrC2qu2nnQ2udqfnmBYtgsX8FWAUQt
+						z2LNvW0OSrwHAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb
+						4YYosP22vTAdBgNVHQ4EFgQUWT26a/YMEDwjsLN+InUujXgi+PEwDgYDVR0PAQH/
+						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+						BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIu
+						Y3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2Vy
+						dHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9v
+						Y3NwLnVzZXJ0cnVzdC5jb20wHgYDVR0RBBcwFYITaWRwLndpbHRzaGlyZS5hYy51
+						azANBgkqhkiG9w0BAQsFAAOCAQEAjrPlaXZ/IvJnllBGlHgfkiCtEDgmT5X9vWhK
+						MkCs5n1N22WAiP232Yk1TffU+jTBhoKgP8uxb9LPu7c2AwVXiuJ1EJGJpYkvwQvm
+						agbyy/B/4O36SwjhG+arqD6B3sDWB4tAQJuoFQ3OP/eOccZ6yG8HGVbqCf39kjpK
+						hv8PqQ8vCp/jLuK4LX1zPdB0NoESOm9KmW4CsQA/4QJCaJrnRI/Lm0/9T/1yT62d
+						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>
+						MIIEoTCCA4mgAwIBAgIRAOiGbysj0iOdFzhBHusteqMwDQYJKoZIhvcNAQELBQAw
+						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
+						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
+						IENBIDIwHhcNMTUwMjI0MDAwMDAwWhcNMTgwMjIzMjM1OTU5WjBBMSEwHwYDVQQL
+						ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC53aWx0c2hp
+						cmUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8WXQAsa7l
+						jeJ86YSF0jAyrqyaSeIjwQgFnUXFCPw/k/H9vzNDF/cZM8faRfx+14b9HMlXLdLD
+						bKcl/4dPQY6oxqt+3IGTLPATva2aMbssTbICswVz7VOVjHMPnssha9HYDFgoUVTV
+						7C0f8nKGzzQiT6FIspIjWALBU7DAOonvz0MernDWpVQ5vpW/TSMbd1wBHgMmdTmu
+						h/XgffOYolhgBS5asilC3O6BCqxbYdH76MEeZcVcXCf0y4lQ41pUNagAtLdCNOZu
+						A5IUbqrao6BACiKFzv/mpguYNXEtZHSGyCLrC2qu2nnQ2udqfnmBYtgsX8FWAUQt
+						z2LNvW0OSrwHAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb
+						4YYosP22vTAdBgNVHQ4EFgQUWT26a/YMEDwjsLN+InUujXgi+PEwDgYDVR0PAQH/
+						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+						BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIu
+						Y3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2Vy
+						dHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9v
+						Y3NwLnVzZXJ0cnVzdC5jb20wHgYDVR0RBBcwFYITaWRwLndpbHRzaGlyZS5hYy51
+						azANBgkqhkiG9w0BAQsFAAOCAQEAjrPlaXZ/IvJnllBGlHgfkiCtEDgmT5X9vWhK
+						MkCs5n1N22WAiP232Yk1TffU+jTBhoKgP8uxb9LPu7c2AwVXiuJ1EJGJpYkvwQvm
+						agbyy/B/4O36SwjhG+arqD6B3sDWB4tAQJuoFQ3OP/eOccZ6yG8HGVbqCf39kjpK
+						hv8PqQ8vCp/jLuK4LX1zPdB0NoESOm9KmW4CsQA/4QJCaJrnRI/Lm0/9T/1yT62d
+						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>
diff --git a/swamid-interfederations-2.0/idp.wlu.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wlu.ca-idp-shibboleth.xml
new file mode 100644
index 00000000..e6f9e396
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.wlu.ca-idp-shibboleth.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-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">
+            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>
+      <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>
+   MIIDFDCCAfygAwIBAgIVAIo8nwS0vH0WHPEf+uRwLXdgoY/+MA0GCSqGSIb3DQEB
+   BQUAMBUxEzARBgNVBAMTCmlkcC53bHUuY2EwHhcNMTMxMDA0MTU0MTIyWhcNMzMx
+   MDA0MTU0MTIyWjAVMRMwEQYDVQQDEwppZHAud2x1LmNhMIIBIjANBgkqhkiG9w0B
+   AQEFAAOCAQ8AMIIBCgKCAQEAtQgjJxxRj9IwzB9hd4f11LC4bcKuNeqM5pl4q5b4
+   L/E/7kCBsdq6h9mver17epTKT93X+/YxZcpOvRAmi9hDtsT8DDNwHNkskhU6e6CT
+   X9guZxgHOoT9/Dzaad69KhtBkotNoti2T3vISg67DnCu75AJXq5rS4LWGEob92/e
+   ivsG/7inGyb6JIyA07+Xoegp6HJvscK6N3jibNT19RN3qZrGYvF8DMnnUzoo/opu
+   MES11AyzjvzaarzHYjJzRyPBluWjaIJg79TmP5qo/4Ddn0jLcA/p7JDMVyfVyXvy
+   2Wm9hZWcgawtos8qcb6nCKLaPxwWf5B/xErGT/RYyP6N5wIDAQABo1swWTA4BgNV
+   HREEMTAvggppZHAud2x1LmNhhiFodHRwczovL2lkcC53bHUuY2EvaWRwL3NoaWJi
+   b2xldGgwHQYDVR0OBBYEFN76fX1Yg1tR5jjpQb+koIhPkjLCMA0GCSqGSIb3DQEB
+   BQUAA4IBAQAl7cQxxj90eUlbmh/OtN+cLc7vqaATJ5cpeOKBOSlf/NoLoYEpkb/F
+   fxS8n/0rJ1H3+qwb3Pr3DUV6hatCckUcv0uFTHtB5AJveWPM5oaiTrb9FeyQ7ruT
+   2G5iv5YCZnQMPfsYr9XA5ZwSkYMCgGQVf7rVF5UJgEN1zL1PYGIeKuIoCFJ0KIkk
+   MZmsvkl88HHkSRk9ezwBwDuDwAs86mWdncjp75suLliXsSNc2ZKLDkZ6eI61txBa
+   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>
+   MIIDFDCCAfygAwIBAgIVAIo8nwS0vH0WHPEf+uRwLXdgoY/+MA0GCSqGSIb3DQEB
+   BQUAMBUxEzARBgNVBAMTCmlkcC53bHUuY2EwHhcNMTMxMDA0MTU0MTIyWhcNMzMx
+   MDA0MTU0MTIyWjAVMRMwEQYDVQQDEwppZHAud2x1LmNhMIIBIjANBgkqhkiG9w0B
+   AQEFAAOCAQ8AMIIBCgKCAQEAtQgjJxxRj9IwzB9hd4f11LC4bcKuNeqM5pl4q5b4
+   L/E/7kCBsdq6h9mver17epTKT93X+/YxZcpOvRAmi9hDtsT8DDNwHNkskhU6e6CT
+   X9guZxgHOoT9/Dzaad69KhtBkotNoti2T3vISg67DnCu75AJXq5rS4LWGEob92/e
+   ivsG/7inGyb6JIyA07+Xoegp6HJvscK6N3jibNT19RN3qZrGYvF8DMnnUzoo/opu
+   MES11AyzjvzaarzHYjJzRyPBluWjaIJg79TmP5qo/4Ddn0jLcA/p7JDMVyfVyXvy
+   2Wm9hZWcgawtos8qcb6nCKLaPxwWf5B/xErGT/RYyP6N5wIDAQABo1swWTA4BgNV
+   HREEMTAvggppZHAud2x1LmNhhiFodHRwczovL2lkcC53bHUuY2EvaWRwL3NoaWJi
+   b2xldGgwHQYDVR0OBBYEFN76fX1Yg1tR5jjpQb+koIhPkjLCMA0GCSqGSIb3DQEB
+   BQUAA4IBAQAl7cQxxj90eUlbmh/OtN+cLc7vqaATJ5cpeOKBOSlf/NoLoYEpkb/F
+   fxS8n/0rJ1H3+qwb3Pr3DUV6hatCckUcv0uFTHtB5AJveWPM5oaiTrb9FeyQ7ruT
+   2G5iv5YCZnQMPfsYr9XA5ZwSkYMCgGQVf7rVF5UJgEN1zL1PYGIeKuIoCFJ0KIkk
+   MZmsvkl88HHkSRk9ezwBwDuDwAs86mWdncjp75suLliXsSNc2ZKLDkZ6eI61txBa
+   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>
diff --git a/swamid-interfederations-2.0/idp.wmin.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.wmin.ac.uk-entity.xml
new file mode 100644
index 00000000..667fc791
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.wmin.ac.uk-entity.xml
@@ -0,0 +1,102 @@
+<?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>
+      <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
+						BAMMDmlkcC53bWluLmFjLnVrMB4XDTE1MDEwODE2MDUwOVoXDTI1MDEwNTE2MDUw
+						OVoweTELMAkGA1UEBhMCR0IxDzANBgNVBAgMBkxvbmRvbjEPMA0GA1UEBwwGTG9u
+						ZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IG9mIFdlc3RtaW5zdGVyMQswCQYDVQQL
+						DAJJUzEXMBUGA1UEAwwOaWRwLndtaW4uYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQCYvgnD7J51erwpxIAgeDt1L0WAQ3V9Mft1HCB8ebimah+M
+						ET2RsgJtMWLvUCs+TOnl9ESgyR/jgh4Nui1mCUloooNnTKmiVagj+o+xHObPmA3j
+						6Dk1Zhun/kcCgXPZq0gxdr+PtA0zfh0NeU7hiUWIFu/XXRrdCTlOrOXYmGTHx+bv
+						aJllG5632hhJAMVB6saH2OQp70AapusaXsYnY+eYInmIlEs9VKcdLlYVXdS9iMmQ
+						QgxgMTzKsb5uaZxTpzR6ZhGCIpE9gkfqD0TT1juH6adT5JFQ8K/xqjT4TonA6sXs
+						WoeWSjLLg/J/81B2fyrtz4M5bVmtCKH9pdXywKNpAgMBAAGjUDBOMB0GA1UdDgQW
+						BBSpJvZ2yI13jz9K7Bje0+nKQFinvTAfBgNVHSMEGDAWgBSpJvZ2yI13jz9K7Bje
+						0+nKQFinvTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB807x92SUY
+						E+BToJCZrf3rvKFvczshq+sVXurkPA/pIo9p0MQVEmHnnRugW5ybhkmdb38PP7xH
+						w9FbjppTttAwJVKszX/0ZHyFLZmlE/6Zp90BuK7ikvJFpWrLXQv4tvcEjKzpqUjA
+						AIsT3BGhF33rMGp8cA915264YwmjkHMhUo/+hCPRaQ8PfHVDvLHC8FXQB9+kt2bI
+						bF++uJUXXusfXJ6WSDLE8bTPftQpgTu/lSDnQi3tV4xmdI0Wgvr4nl4SaVHat8wY
+						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>
+						MIIDxTCCAq2gAwIBAgIJAKJTZR5Gg4aEMA0GCSqGSIb3DQEBCwUAMHkxCzAJBgNV
+						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEiMCAGA1UE
+						CgwZVW5pdmVyc2l0eSBvZiBXZXN0bWluc3RlcjELMAkGA1UECwwCSVMxFzAVBgNV
+						BAMMDmlkcC53bWluLmFjLnVrMB4XDTE1MDEwODE2MDUwOVoXDTI1MDEwNTE2MDUw
+						OVoweTELMAkGA1UEBhMCR0IxDzANBgNVBAgMBkxvbmRvbjEPMA0GA1UEBwwGTG9u
+						ZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IG9mIFdlc3RtaW5zdGVyMQswCQYDVQQL
+						DAJJUzEXMBUGA1UEAwwOaWRwLndtaW4uYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQCYvgnD7J51erwpxIAgeDt1L0WAQ3V9Mft1HCB8ebimah+M
+						ET2RsgJtMWLvUCs+TOnl9ESgyR/jgh4Nui1mCUloooNnTKmiVagj+o+xHObPmA3j
+						6Dk1Zhun/kcCgXPZq0gxdr+PtA0zfh0NeU7hiUWIFu/XXRrdCTlOrOXYmGTHx+bv
+						aJllG5632hhJAMVB6saH2OQp70AapusaXsYnY+eYInmIlEs9VKcdLlYVXdS9iMmQ
+						QgxgMTzKsb5uaZxTpzR6ZhGCIpE9gkfqD0TT1juH6adT5JFQ8K/xqjT4TonA6sXs
+						WoeWSjLLg/J/81B2fyrtz4M5bVmtCKH9pdXywKNpAgMBAAGjUDBOMB0GA1UdDgQW
+						BBSpJvZ2yI13jz9K7Bje0+nKQFinvTAfBgNVHSMEGDAWgBSpJvZ2yI13jz9K7Bje
+						0+nKQFinvTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB807x92SUY
+						E+BToJCZrf3rvKFvczshq+sVXurkPA/pIo9p0MQVEmHnnRugW5ybhkmdb38PP7xH
+						w9FbjppTttAwJVKszX/0ZHyFLZmlE/6Zp90BuK7ikvJFpWrLXQv4tvcEjKzpqUjA
+						AIsT3BGhF33rMGp8cA915264YwmjkHMhUo/+hCPRaQ8PfHVDvLHC8FXQB9+kt2bI
+						bF++uJUXXusfXJ6WSDLE8bTPftQpgTu/lSDnQi3tV4xmdI0Wgvr4nl4SaVHat8wY
+						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>
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
new file mode 100644
index 00000000..92619119
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.wnsc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnzh2UdAXkRxXPxRbyeMOVyqE5nXWU
+						1NUltK+mPi0lx9ph/GbDXVBeX7QgjV5VucVWsTaOCoFr3pQbBM9LdEugxRAbz3TF
+						B2wI2qyiQZ/u/4PnnGtto3/w4JgqdCQhK5kl2e4eEcRSAH5mlb8hLnbzNnhmXve6
+						n60UF+ex6kM6geZLRVH2fgv9BvHGnxBxtxgwaOuiE2GWKEWC7wEdmMwmgR3lh4Mk
+						K/CxnvESe5+ta7MX2Pp4CQqoqXDQNLEyk005Eil+Kol+eiYv+DPrlETakpn0TP2u
+						6IjzY+I/Nh58WWoR077pvMB6ZyfrXu8+FPWjzFZfnnmRhGsZ+3FsODmrAgMBAAGj
+						YzBhMB0GA1UdDgQWBBShbynC+ykKQkGKp6aQyyC/P3vm3TBABgNVHREEOTA3gg5p
+						ZHAud25zYy5hYy51a4YlaHR0cHM6Ly9pZHAud25zYy5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDANBgkqhkiG9w0BAQUFAAOCAQEABCQXO1KpDZgPC6yfN879Ah6hHtRu0RTn
+						iEjPuEJMIYXd0SXcSmfOZIsVausP2tTE/22X7HMfd3GDET5YZ1DArJ5gsgn315dT
+						/moP05m5FX7ce9rpFKDseJhBfz8dFIC2IGoMVqwHeGvF/GskedV67wTPKG2s2Uhx
+						fH1R60XUqd0IRdSqrB9XDiMQMlV4zFZSH2VWX2jPZHjLlYGn4OCWOskKATCexTWv
+						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>
+						MIIDJDCCAgygAwIBAgIVAIMpdh+Ow4gohZ3+1Dc6yZ7rSiohMA0GCSqGSIb3DQEB
+						BQUAMBkxFzAVBgNVBAMMDmlkcC53bnNjLmFjLnVrMB4XDTE0MTIwMzE0NTc0OFoX
+						DTE3MTIwMzE0NTc0OFowGTEXMBUGA1UEAwwOaWRwLnduc2MuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnzh2UdAXkRxXPxRbyeMOVyqE5nXWU
+						1NUltK+mPi0lx9ph/GbDXVBeX7QgjV5VucVWsTaOCoFr3pQbBM9LdEugxRAbz3TF
+						B2wI2qyiQZ/u/4PnnGtto3/w4JgqdCQhK5kl2e4eEcRSAH5mlb8hLnbzNnhmXve6
+						n60UF+ex6kM6geZLRVH2fgv9BvHGnxBxtxgwaOuiE2GWKEWC7wEdmMwmgR3lh4Mk
+						K/CxnvESe5+ta7MX2Pp4CQqoqXDQNLEyk005Eil+Kol+eiYv+DPrlETakpn0TP2u
+						6IjzY+I/Nh58WWoR077pvMB6ZyfrXu8+FPWjzFZfnnmRhGsZ+3FsODmrAgMBAAGj
+						YzBhMB0GA1UdDgQWBBShbynC+ykKQkGKp6aQyyC/P3vm3TBABgNVHREEOTA3gg5p
+						ZHAud25zYy5hYy51a4YlaHR0cHM6Ly9pZHAud25zYy5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDANBgkqhkiG9w0BAQUFAAOCAQEABCQXO1KpDZgPC6yfN879Ah6hHtRu0RTn
+						iEjPuEJMIYXd0SXcSmfOZIsVausP2tTE/22X7HMfd3GDET5YZ1DArJ5gsgn315dT
+						/moP05m5FX7ce9rpFKDseJhBfz8dFIC2IGoMVqwHeGvF/GskedV67wTPKG2s2Uhx
+						fH1R60XUqd0IRdSqrB9XDiMQMlV4zFZSH2VWX2jPZHjLlYGn4OCWOskKATCexTWv
+						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>
diff --git a/swamid-interfederations-2.0/idp.woking.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.woking.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..d7acb561
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.woking.ac.uk-shibboleth.xml
@@ -0,0 +1,96 @@
+<?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>
+      <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
+						NTE0MTQxMVoXDTMzMTAzMTE0MTQxMVowYzELMAkGA1UEBhMCR0IxDzANBgNVBAgT
+						BlN1cnJleTEPMA0GA1UEBxMGV29raW5nMRcwFQYDVQQKEw5Xb2tpbmcgQ29sbGVn
+						ZTEZMBcGA1UEAxMQaWRwLndva2luZy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBAL4LR5bglyzayUHgWbAeGXwr7o2bav61X7rLiopGKRe23KwK
+						IPnXkFx5XQ7AL9+2ZuINUXx6qMYAJg0bLMINokYH0Qlm6LsK1M8rT58+f4s8U5Mk
+						6CHidaGhHHelH6dmRBkdqbIJ3/f201fMfprNxVJfovkFSwsByBTo7BEpKQmSajSG
+						Wdq+KSRgZhzzNp9s5dEaBZQFRqejGqj1jSZdz34bRtRZ8Vy17GALIoFtZE2P+zaa
+						rogI7MlPmDyoDUouQ9RsSVgj1+8zGDWmnjJcnQQIR8jvAaZeavcQfmnRXAtkPKiJ
+						ppwVjtxAlEuuSnWL+ROlXRqIun3uUEsKSr6PQ3kCAwEAATANBgkqhkiG9w0BAQUF
+						AAOCAQEAvH9FxNrQp5F+GBC1D4PyiubJmA4e1CalqE7ra9m7pgBUhd8mvDJl2vfo
+						xAe5IVVfeSYpbJQ4cg9zd3Vnh3tRVW4lsjDzvHjBAnRHAO1yzjFfUwulBl+YCCjX
+						N6cY7UMBPEWZ3mvwHc6B4pDDWPXx0Cq/p4da6KAT6ztlrjSUkcFVjtDexXbNmS04
+						B/Q3pZUzdQs3EzTOrQiFQMNw56Kpy/sMEPEwXJ+xeaSNttiM5TgqIjENwFZbLSmt
+						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>
+						MIIDQjCCAioCCQDzQLFc3l5fVDANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJH
+						QjEPMA0GA1UECBMGU3VycmV5MQ8wDQYDVQQHEwZXb2tpbmcxFzAVBgNVBAoTDldv
+						a2luZyBDb2xsZWdlMRkwFwYDVQQDExBpZHAud29raW5nLmFjLnVrMB4XDTEzMTEw
+						NTE0MTQxMVoXDTMzMTAzMTE0MTQxMVowYzELMAkGA1UEBhMCR0IxDzANBgNVBAgT
+						BlN1cnJleTEPMA0GA1UEBxMGV29raW5nMRcwFQYDVQQKEw5Xb2tpbmcgQ29sbGVn
+						ZTEZMBcGA1UEAxMQaWRwLndva2luZy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBAL4LR5bglyzayUHgWbAeGXwr7o2bav61X7rLiopGKRe23KwK
+						IPnXkFx5XQ7AL9+2ZuINUXx6qMYAJg0bLMINokYH0Qlm6LsK1M8rT58+f4s8U5Mk
+						6CHidaGhHHelH6dmRBkdqbIJ3/f201fMfprNxVJfovkFSwsByBTo7BEpKQmSajSG
+						Wdq+KSRgZhzzNp9s5dEaBZQFRqejGqj1jSZdz34bRtRZ8Vy17GALIoFtZE2P+zaa
+						rogI7MlPmDyoDUouQ9RsSVgj1+8zGDWmnjJcnQQIR8jvAaZeavcQfmnRXAtkPKiJ
+						ppwVjtxAlEuuSnWL+ROlXRqIun3uUEsKSr6PQ3kCAwEAATANBgkqhkiG9w0BAQUF
+						AAOCAQEAvH9FxNrQp5F+GBC1D4PyiubJmA4e1CalqE7ra9m7pgBUhd8mvDJl2vfo
+						xAe5IVVfeSYpbJQ4cg9zd3Vnh3tRVW4lsjDzvHjBAnRHAO1yzjFfUwulBl+YCCjX
+						N6cY7UMBPEWZ3mvwHc6B4pDDWPXx0Cq/p4da6KAT6ztlrjSUkcFVjtDexXbNmS04
+						B/Q3pZUzdQs3EzTOrQiFQMNw56Kpy/sMEPEwXJ+xeaSNttiM5TgqIjENwFZbLSmt
+						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>
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
new file mode 100644
index 00000000..69f5f3a1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.worc.ac.uk-oala-metadata.xml
@@ -0,0 +1,86 @@
+<?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>
+      <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>
+						MIIDlzCCAn+gAwIBAgIJAM9gbhSqyROWMA0GCSqGSIb3DQEBBQUAMDsxIDAeBgNV
+						BAoTF1VuaXZlcnNpdHkgb2YgV29yY2VzdGVyMRcwFQYDVQQDEw5pZHAud29yYy5h
+						Yy51azAeFw0xMTA3MDYxMDQ4MTdaFw0yMTA3MDMxMDQ4MTdaMDsxIDAeBgNVBAoT
+						F1VuaXZlcnNpdHkgb2YgV29yY2VzdGVyMRcwFQYDVQQDEw5pZHAud29yYy5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZDA7qffg7TU6jYsSUq
+						3rdyqGyXqCvENST8ytpZeo5GXpZwu+BB3d5s8+mjD055tl60AGvJ14DYix2hzJ/d
+						HrcGTSeeqfl4aXGZZ3BAUAPy9kiRQqG72EeY1t4QgzOoJlHD/rnWKrHDGZgo2/S2
+						OKUudCkz/Ep0Z4sUg9N0KdoIlcbMc7b1vUE/ACsasQCsSjU63rb/fyYxW/UQZWXh
+						xmGvGmmk9G0cNUwipv+s04Rqh6gq3s7ukbCtSd64FrSKG/RkwNTRRg1+S2N+9Vbm
+						+feCYnJvGEkNN+m+9Lcq77vu3+uiQRKZFkBkR/rU42/WsqXDQAspiOwoO6GVibAD
+						BcsCAwEAAaOBnTCBmjAdBgNVHQ4EFgQUC/NgmG4G9V4HMA3TWbPetEyLnL0wawYD
+						VR0jBGQwYoAUC/NgmG4G9V4HMA3TWbPetEyLnL2hP6Q9MDsxIDAeBgNVBAoTF1Vu
+						aXZlcnNpdHkgb2YgV29yY2VzdGVyMRcwFQYDVQQDEw5pZHAud29yYy5hYy51a4IJ
+						AM9gbhSqyROWMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIBKZ9GG
+						REabLBEsXHsBrvSZhYA+tUv+NI7dzgy7ZpDlu11hY7ZvW0fUxhdOKjgBi8d4JULT
+						trMafGP1PuYNCD4Mq9crfXCX9nqM+QBAPiWHQmHeWqVB+ibSKRHd1LoCgNqnyb9z
+						/f1CC2RGHNdXANO4DGeYqf2dxEVHtlxo2mTlQj6OtrJ02T4auqztM7QBbxKfesxe
+						odciW+HA2B/fA+G23KSazb74AIKrXT5YZSDgWvcyMS25shYbuwbj1KIqU7IsBQQw
+						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>
+						MIIDlzCCAn+gAwIBAgIJAM9gbhSqyROWMA0GCSqGSIb3DQEBBQUAMDsxIDAeBgNV
+						BAoTF1VuaXZlcnNpdHkgb2YgV29yY2VzdGVyMRcwFQYDVQQDEw5pZHAud29yYy5h
+						Yy51azAeFw0xMTA3MDYxMDQ4MTdaFw0yMTA3MDMxMDQ4MTdaMDsxIDAeBgNVBAoT
+						F1VuaXZlcnNpdHkgb2YgV29yY2VzdGVyMRcwFQYDVQQDEw5pZHAud29yYy5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZDA7qffg7TU6jYsSUq
+						3rdyqGyXqCvENST8ytpZeo5GXpZwu+BB3d5s8+mjD055tl60AGvJ14DYix2hzJ/d
+						HrcGTSeeqfl4aXGZZ3BAUAPy9kiRQqG72EeY1t4QgzOoJlHD/rnWKrHDGZgo2/S2
+						OKUudCkz/Ep0Z4sUg9N0KdoIlcbMc7b1vUE/ACsasQCsSjU63rb/fyYxW/UQZWXh
+						xmGvGmmk9G0cNUwipv+s04Rqh6gq3s7ukbCtSd64FrSKG/RkwNTRRg1+S2N+9Vbm
+						+feCYnJvGEkNN+m+9Lcq77vu3+uiQRKZFkBkR/rU42/WsqXDQAspiOwoO6GVibAD
+						BcsCAwEAAaOBnTCBmjAdBgNVHQ4EFgQUC/NgmG4G9V4HMA3TWbPetEyLnL0wawYD
+						VR0jBGQwYoAUC/NgmG4G9V4HMA3TWbPetEyLnL2hP6Q9MDsxIDAeBgNVBAoTF1Vu
+						aXZlcnNpdHkgb2YgV29yY2VzdGVyMRcwFQYDVQQDEw5pZHAud29yYy5hYy51a4IJ
+						AM9gbhSqyROWMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIBKZ9GG
+						REabLBEsXHsBrvSZhYA+tUv+NI7dzgy7ZpDlu11hY7ZvW0fUxhdOKjgBi8d4JULT
+						trMafGP1PuYNCD4Mq9crfXCX9nqM+QBAPiWHQmHeWqVB+ibSKRHd1LoCgNqnyb9z
+						/f1CC2RGHNdXANO4DGeYqf2dxEVHtlxo2mTlQj6OtrJ02T4auqztM7QBbxKfesxe
+						odciW+HA2B/fA+G23KSazb74AIKrXT5YZSDgWvcyMS25shYbuwbj1KIqU7IsBQQw
+						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>
diff --git a/swamid-interfederations-2.0/idp.wortech.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.wortech.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..95d36ae2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.wortech.ac.uk-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAunWkrcL+hnjQ09UdnKBA
+						BAw7lRBB3QYvOggtNnok7DzwWGpHcrXhx4KfzOfEJ3maUJYBdzRsT1dgt8F2vBkv
+						2D7z8ysuV28CB3WTOYescJS67mZ3JuvIIWOOs20wpTwrKQxqA0Jl17by6VBrD0mg
+						+h2Uo+DN18KFfOPchT7r8MrIzvGBZKyy5PSsHDteW2FcVeMKA01HGgtcKOhqAWGS
+						2eAmRH4JpTAHW5GtuBpQucXBGF//+WWVCoJ9tR05IhuPZTYYvPE+wYN6m6530ZVt
+						VjuQWq8bbK1vk4xLyTjkHv1ZB+8cU/h8zZjGyQYxYdEf2FvoujXBDZE0FezZ1y56
+						FQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAyLndvcnRlY2guYWMudWuGKWh0dHBz
+						Oi8vaWRwMi53b3J0ZWNoLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQr
+						3EpVDeHCnuNCrrLjnA2+sOs8NjANBgkqhkiG9w0BAQUFAAOCAQEACM1zfxfzXQ07
+						xIkBUtBRtzZGelYWvraMP1DHPt56zR0PSmqjIlA6dSZX48YQzSBBDbj3FvKxRp9F
+						C7KrFook4NezTl5qifHGecDQoUF3i12YQJLpwWIfFoTeQWwgWlRkk5elSYuiqkTv
+						JE5UzTJbRQP19dxNcOPFFNOdq2LRPgAYumiUf5jNggjT4EQWOxhcaeA+TE8mcAuo
+						eKDV+Q789bIiGbvRHpVekbME32dIf4PUuGeLSpTmMDPNkGUYK1xaIOe5lcjRNZeS
+						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>
+						MIIDMzCCAhugAwIBAgIUVyuETbzgv93czUmf4A085Hv5gp0wDQYJKoZIhvcNAQEF
+						BQAwHTEbMBkGA1UEAxMSaWRwMi53b3J0ZWNoLmFjLnVrMB4XDTEyMDMyMzE0NDU1
+						M1oXDTMyMDMyMzE0NDU1M1owHTEbMBkGA1UEAxMSaWRwMi53b3J0ZWNoLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAunWkrcL+hnjQ09UdnKBA
+						BAw7lRBB3QYvOggtNnok7DzwWGpHcrXhx4KfzOfEJ3maUJYBdzRsT1dgt8F2vBkv
+						2D7z8ysuV28CB3WTOYescJS67mZ3JuvIIWOOs20wpTwrKQxqA0Jl17by6VBrD0mg
+						+h2Uo+DN18KFfOPchT7r8MrIzvGBZKyy5PSsHDteW2FcVeMKA01HGgtcKOhqAWGS
+						2eAmRH4JpTAHW5GtuBpQucXBGF//+WWVCoJ9tR05IhuPZTYYvPE+wYN6m6530ZVt
+						VjuQWq8bbK1vk4xLyTjkHv1ZB+8cU/h8zZjGyQYxYdEf2FvoujXBDZE0FezZ1y56
+						FQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAyLndvcnRlY2guYWMudWuGKWh0dHBz
+						Oi8vaWRwMi53b3J0ZWNoLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQr
+						3EpVDeHCnuNCrrLjnA2+sOs8NjANBgkqhkiG9w0BAQUFAAOCAQEACM1zfxfzXQ07
+						xIkBUtBRtzZGelYWvraMP1DHPt56zR0PSmqjIlA6dSZX48YQzSBBDbj3FvKxRp9F
+						C7KrFook4NezTl5qifHGecDQoUF3i12YQJLpwWIfFoTeQWwgWlRkk5elSYuiqkTv
+						JE5UzTJbRQP19dxNcOPFFNOdq2LRPgAYumiUf5jNggjT4EQWOxhcaeA+TE8mcAuo
+						eKDV+Q789bIiGbvRHpVekbME32dIf4PUuGeLSpTmMDPNkGUYK1xaIOe5lcjRNZeS
+						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>
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
new file mode 100644
index 00000000..d3656a71
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.wsc.ac.uk-oala-metadata.xml
@@ -0,0 +1,81 @@
+<?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>
+      <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>
+						MIIDQDCCAiigAwIBAgIIT/U/+SViUwMwDQYJKoZIhvcNAQEFBQAwNzEdMBsGA1UE
+						CgwUV2VzdCBTdWZmb2xrIENvbGxlZ2UxFjAUBgNVBAMMDWlkcC53c2MuYWMudWsw
+						HhcNMTQwNjAzMTA1NzU5WhcNMjQwNjAzMTA1NzU5WjA3MR0wGwYDVQQKDBRXZXN0
+						IFN1ZmZvbGsgQ29sbGVnZTEWMBQGA1UEAwwNaWRwLndzYy5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgKTfW/toD3mWZjcD65VNniLA4NV1Du
+						wE3c5iOiuyw6fXGXbRCEO3w3IADsy+9RfXIivtonMFmrdcUMCZH6VQUfpXT4gRZN
+						zGlaoMFsQJKIgicbor0MNpAKFnoTKmkHmOZHfvxb/ftDTlouGKAwJDRstJahdkLa
+						WlTb1cOLSVInUb6llF6D/EwJCiRmZbxPiHczxF/YFPzfbC+mzp3O1U1gf+OJAjaY
+						JGQCoAl07PeKuJVfzO6YzYWjdqyipqeXfgAbXvz7bvBQE16dYpLoKcntRvrZ+fur
+						ymvb6SVJMoFhkDSB4dxVhlVv5Qm7aKzhq4CF64XB46Q0Cz3OkuMJlHUCAwEAAaNQ
+						ME4wHQYDVR0OBBYEFInyiMvSbiRrYcNBGP9m3lpVzpHdMB8GA1UdIwQYMBaAFIny
+						iMvSbiRrYcNBGP9m3lpVzpHdMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAKGDepCXE7pK/LPMFm74rfVd7GVLMY7ATtzImUlSHx5WUnAE1R8tac5M5UCG
+						nS78tv9JmEmNANkfKoE+/k7ZJxRMegFynBzcCCsOIrjrraY4bo9lbBPT/TAQ3Z9k
+						rTtwg5O447D0H7Wd66voWyf4tYRL+YKmN8HZ7weiYvE5jYwlznl58yaVcXJWjJEE
+						OLqpZRu2UqHfNwwo4j2xjdulfVAwWUY38cqXYUAlb/DZ1x7xjbhOlZIaTlCoxB0d
+						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>
+						MIIDQDCCAiigAwIBAgIIT/U/+SViUwMwDQYJKoZIhvcNAQEFBQAwNzEdMBsGA1UE
+						CgwUV2VzdCBTdWZmb2xrIENvbGxlZ2UxFjAUBgNVBAMMDWlkcC53c2MuYWMudWsw
+						HhcNMTQwNjAzMTA1NzU5WhcNMjQwNjAzMTA1NzU5WjA3MR0wGwYDVQQKDBRXZXN0
+						IFN1ZmZvbGsgQ29sbGVnZTEWMBQGA1UEAwwNaWRwLndzYy5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgKTfW/toD3mWZjcD65VNniLA4NV1Du
+						wE3c5iOiuyw6fXGXbRCEO3w3IADsy+9RfXIivtonMFmrdcUMCZH6VQUfpXT4gRZN
+						zGlaoMFsQJKIgicbor0MNpAKFnoTKmkHmOZHfvxb/ftDTlouGKAwJDRstJahdkLa
+						WlTb1cOLSVInUb6llF6D/EwJCiRmZbxPiHczxF/YFPzfbC+mzp3O1U1gf+OJAjaY
+						JGQCoAl07PeKuJVfzO6YzYWjdqyipqeXfgAbXvz7bvBQE16dYpLoKcntRvrZ+fur
+						ymvb6SVJMoFhkDSB4dxVhlVv5Qm7aKzhq4CF64XB46Q0Cz3OkuMJlHUCAwEAAaNQ
+						ME4wHQYDVR0OBBYEFInyiMvSbiRrYcNBGP9m3lpVzpHdMB8GA1UdIwQYMBaAFIny
+						iMvSbiRrYcNBGP9m3lpVzpHdMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAKGDepCXE7pK/LPMFm74rfVd7GVLMY7ATtzImUlSHx5WUnAE1R8tac5M5UCG
+						nS78tv9JmEmNANkfKoE+/k7ZJxRMegFynBzcCCsOIrjrraY4bo9lbBPT/TAQ3Z9k
+						rTtwg5O447D0H7Wd66voWyf4tYRL+YKmN8HZ7weiYvE5jYwlznl58yaVcXJWjJEE
+						OLqpZRu2UqHfNwwo4j2xjdulfVAwWUY38cqXYUAlb/DZ1x7xjbhOlZIaTlCoxB0d
+						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>
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
new file mode 100644
index 00000000..f24f5ff4
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.yeovil.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxEEpNwNxfUmo9qh7EXLPAw
+						RgYA86Ml4ZxwB2l2NnDL0VE/dts87f3wKPuECWDH1cZz/z8CSKZTktU0ANDGrNnC
+						yZz15BN51mSFiwKR0xOrpRe5EJrEGrzUyjxmMwEhEup0eiRH1c8VAbjyB3/2BPrI
+						s/eq9/bCa9K3WRPK+DihZqPEaH7DbWUDGCmyMNLY3hR7lXuhnWgQYUS42YYuPZsb
+						uKf1fzMdC2zRA3Z00fHfUBxPqCcWMdLsCGoJUh8zc+IYSEax8hdu1zf85LZqhXi4
+						/gsTGcWeAT3cq42Zb6hzIDgLHEanG/MWLxgDB0JBf2GZMPy13WrXQT0/Vc1iHqEC
+						AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMi55ZW92aWwuYWMudWuGKGh0dHBzOi8v
+						aWRwMi55ZW92aWwuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJ2w10W1
+						abGXJEftfLDwfLzYWieSMA0GCSqGSIb3DQEBBQUAA4IBAQCq8ksSrdQPwyg9QfzK
+						pUdTOoRRaGlY4zDVD1LBKWntpL+O1KGCn61ePiyoMQeONgtFBJDOP2rAiZXWZ6qN
+						seHfry/67Ssd2C4DbiG5QunQ19EzoZAGBUZD7yK7wcaJpBM7AWnwDnovEElNklyV
+						EkO9UVdYiFrq2gSN/p0K2OjW1FyNkvScbSoesI0AgUk0Wc7oaqWuz8IYmoFMQbkN
+						mDkeTy+Rlhf60bYRaLyxcHryq47BInhFWsuQ5S1MaxmS9m4bnYpUeo+ejqOkvIIX
+						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>
+						MIIDLzCCAhegAwIBAgIUc+MFJHCvsiXTJD9AbAGFOho/nyQwDQYJKoZIhvcNAQEF
+						BQAwHDEaMBgGA1UEAxMRaWRwMi55ZW92aWwuYWMudWswHhcNMTIxMDA0MTYxNTQy
+						WhcNMzIxMDA0MTYxNTQyWjAcMRowGAYDVQQDExFpZHAyLnllb3ZpbC5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxEEpNwNxfUmo9qh7EXLPAw
+						RgYA86Ml4ZxwB2l2NnDL0VE/dts87f3wKPuECWDH1cZz/z8CSKZTktU0ANDGrNnC
+						yZz15BN51mSFiwKR0xOrpRe5EJrEGrzUyjxmMwEhEup0eiRH1c8VAbjyB3/2BPrI
+						s/eq9/bCa9K3WRPK+DihZqPEaH7DbWUDGCmyMNLY3hR7lXuhnWgQYUS42YYuPZsb
+						uKf1fzMdC2zRA3Z00fHfUBxPqCcWMdLsCGoJUh8zc+IYSEax8hdu1zf85LZqhXi4
+						/gsTGcWeAT3cq42Zb6hzIDgLHEanG/MWLxgDB0JBf2GZMPy13WrXQT0/Vc1iHqEC
+						AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMi55ZW92aWwuYWMudWuGKGh0dHBzOi8v
+						aWRwMi55ZW92aWwuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJ2w10W1
+						abGXJEftfLDwfLzYWieSMA0GCSqGSIb3DQEBBQUAA4IBAQCq8ksSrdQPwyg9QfzK
+						pUdTOoRRaGlY4zDVD1LBKWntpL+O1KGCn61ePiyoMQeONgtFBJDOP2rAiZXWZ6qN
+						seHfry/67Ssd2C4DbiG5QunQ19EzoZAGBUZD7yK7wcaJpBM7AWnwDnovEElNklyV
+						EkO9UVdYiFrq2gSN/p0K2OjW1FyNkvScbSoesI0AgUk0Wc7oaqWuz8IYmoFMQbkN
+						mDkeTy+Rlhf60bYRaLyxcHryq47BInhFWsuQ5S1MaxmS9m4bnYpUeo+ejqOkvIIX
+						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>Stephen</md:GivenName>
+    <md:SurName>Weaver</md:SurName>
+    <md:EmailAddress>mailto:Stephen.Weaver@yeovil.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stephen</md:GivenName>
+    <md:SurName>Weaver</md:SurName>
+    <md:EmailAddress>mailto:Stephen.Weaver@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
new file mode 100644
index 00000000..df6fa10f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.yorkcollege.ac.uk-entity.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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
+						ZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKyCyLcm8cm/
+						4wDpVwulDJF1aG3tUj6h/vsHjLGDrzvgYByEPa1vBMUwQYJKTWcgk+Ap/YUCMPIv
+						ByctJI3zW6I8P5KjgppkkTA5YuRNEFRApoa8XGufuX/LdZ8pZtD0NvlWgiXooazy
+						u/nKaQC5A1KKKG23dXVojX4SOEbOJBk3BeS5STd0BTBGBEyBQbGIAn9KspvkyFFm
+						Bn5EqnNE2l0H1d6IpEDiwSQ4PxtR3zZ3vjzrxToSAKKAsu/uQGZ30xQq/Qpcgpu5
+						D2vk71cvhTqaJgYNhnjNfcMhLgkwkdFbvS+E2jVBHiIt5uKq5YydUP7NvCItKdI0
+						IDiO9Qoc3AsCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLnlvcmtjb2xsZWdlLmFj
+						LnVrhixodHRwczovL2lkcC55b3JrY29sbGVnZS5hYy51ay9pZHAvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUxrFZaYCOWnFDHol052uaf+yiXrswDQYJKoZIhvcNAQEFBQAD
+						ggEBAKOWPrRWqDYsTi7VQ+AKih6nUV7iNeD8f5WFNuc2xCII9ggSgvTVAzkaYDqH
+						X4M/2Z2vhHRpiVcNKpsW+v6Fzhgy7yhDv3PrDfxgvDm2bQ3X4KH0X1hrWmxaUgxg
+						ProTJFt6kDIaesBYHt93RhZv/gCBCyVxDfXMvgqq7/4+Lr2Q0Be8+RQ69asVA5S/
+						0PZS97qMeLD5HveS6DkV1D1K7YWVXiPEawLkKN9fywU6GA9QrUyUxI2z+YngAskU
+						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>
+						MIIDQDCCAiigAwIBAgIVANXRdn2uq2aNgUyIN3af5+JhI22qMA0GCSqGSIb3DQEB
+						BQUAMCAxHjAcBgNVBAMTFWlkcC55b3JrY29sbGVnZS5hYy51azAeFw0xNDA3MjIx
+						MjU3MDVaFw0zNDA3MjIxMjU3MDVaMCAxHjAcBgNVBAMTFWlkcC55b3JrY29sbGVn
+						ZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKyCyLcm8cm/
+						4wDpVwulDJF1aG3tUj6h/vsHjLGDrzvgYByEPa1vBMUwQYJKTWcgk+Ap/YUCMPIv
+						ByctJI3zW6I8P5KjgppkkTA5YuRNEFRApoa8XGufuX/LdZ8pZtD0NvlWgiXooazy
+						u/nKaQC5A1KKKG23dXVojX4SOEbOJBk3BeS5STd0BTBGBEyBQbGIAn9KspvkyFFm
+						Bn5EqnNE2l0H1d6IpEDiwSQ4PxtR3zZ3vjzrxToSAKKAsu/uQGZ30xQq/Qpcgpu5
+						D2vk71cvhTqaJgYNhnjNfcMhLgkwkdFbvS+E2jVBHiIt5uKq5YydUP7NvCItKdI0
+						IDiO9Qoc3AsCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLnlvcmtjb2xsZWdlLmFj
+						LnVrhixodHRwczovL2lkcC55b3JrY29sbGVnZS5hYy51ay9pZHAvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUxrFZaYCOWnFDHol052uaf+yiXrswDQYJKoZIhvcNAQEFBQAD
+						ggEBAKOWPrRWqDYsTi7VQ+AKih6nUV7iNeD8f5WFNuc2xCII9ggSgvTVAzkaYDqH
+						X4M/2Z2vhHRpiVcNKpsW+v6Fzhgy7yhDv3PrDfxgvDm2bQ3X4KH0X1hrWmxaUgxg
+						ProTJFt6kDIaesBYHt93RhZv/gCBCyVxDfXMvgqq7/4+Lr2Q0Be8+RQ69asVA5S/
+						0PZS97qMeLD5HveS6DkV1D1K7YWVXiPEawLkKN9fywU6GA9QrUyUxI2z+YngAskU
+						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>
diff --git a/swamid-interfederations-2.0/idp.yorksj.ac.uk-oala.xml b/swamid-interfederations-2.0/idp.yorksj.ac.uk-oala.xml
new file mode 100644
index 00000000..b89ec109
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.yorksj.ac.uk-oala.xml
@@ -0,0 +1,87 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-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-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>
+      <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>
+						MIIDTDCCAjSgAwIBAgIIC/BGdv33SfYwDQYJKoZIhvcNAQEFBQAwPTEgMB4GA1UE
+						CgwXWW9yayBTdCBKb2huIFVuaXZlcnNpdHkxGTAXBgNVBAMMEGlkcC55b3Jrc2ou
+						YWMudWswHhcNMTQwNTA3MTEyMzUyWhcNMjQwNTA3MTEyMzUyWjA9MSAwHgYDVQQK
+						DBdZb3JrIFN0IEpvaG4gVW5pdmVyc2l0eTEZMBcGA1UEAwwQaWRwLnlvcmtzai5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI9vhp37rXZQ6N3J
+						jMVnA5XL4e8R6BpZf8y9xKCDoxI2xBB5YlwLuXe0jDLQtLHkcQk1sOcQPlz5Ssi2
+						5BaYCFnifo2yaf/TzqmaG6/+IODNySYbGT6AHTeRjagYLmv9ZEzfuoA1rDQ/AvLO
+						zckx0qyR4UVwrlxo9QAXILlCzKiE/+2KN7FSzRW/pPm4iWcwpCR+MMtS6CGdb/cZ
+						L8Eo91uQ1ErGKfD30PDCnDybCayqk6v8I+AHOoxHqcowGoUu4k8mcXS9wClrg9At
+						U7jLzIpQCcq4Jjfne+vjy9uoUduD+X9IUTpWEU8XdSWHSRXyk4ujXLfcXkfIuat5
+						DswQWfECAwEAAaNQME4wHQYDVR0OBBYEFLIOF+KbcmkO27fWS5ZicSri4/O7MB8G
+						A1UdIwQYMBaAFLIOF+KbcmkO27fWS5ZicSri4/O7MAwGA1UdEwQFMAMBAf8wDQYJ
+						KoZIhvcNAQEFBQADggEBAHEWHwnlsn47Vb8rfNZokD5DHDCiqWN5vx1A0Ed90bMJ
+						P5rScA9fuhldvLSq1wxCMwStcLcm6ymUdRHmb0wvtG1j0vphDsiFKLJtlTZzEz42
+						pG2u4LOQPW6TElrAQ+9xFaloFiNAsKNhEWz7YuQHm5zV8wi/7m5L1G9IlrBoIfjX
+						x98jpfQS4yKUF7Koof9h8iWYz/T4Ma3pCfHzHGxstfMOcix+gPxuXaR6qtdxMtNg
+						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>
+						MIIDTDCCAjSgAwIBAgIIC/BGdv33SfYwDQYJKoZIhvcNAQEFBQAwPTEgMB4GA1UE
+						CgwXWW9yayBTdCBKb2huIFVuaXZlcnNpdHkxGTAXBgNVBAMMEGlkcC55b3Jrc2ou
+						YWMudWswHhcNMTQwNTA3MTEyMzUyWhcNMjQwNTA3MTEyMzUyWjA9MSAwHgYDVQQK
+						DBdZb3JrIFN0IEpvaG4gVW5pdmVyc2l0eTEZMBcGA1UEAwwQaWRwLnlvcmtzai5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI9vhp37rXZQ6N3J
+						jMVnA5XL4e8R6BpZf8y9xKCDoxI2xBB5YlwLuXe0jDLQtLHkcQk1sOcQPlz5Ssi2
+						5BaYCFnifo2yaf/TzqmaG6/+IODNySYbGT6AHTeRjagYLmv9ZEzfuoA1rDQ/AvLO
+						zckx0qyR4UVwrlxo9QAXILlCzKiE/+2KN7FSzRW/pPm4iWcwpCR+MMtS6CGdb/cZ
+						L8Eo91uQ1ErGKfD30PDCnDybCayqk6v8I+AHOoxHqcowGoUu4k8mcXS9wClrg9At
+						U7jLzIpQCcq4Jjfne+vjy9uoUduD+X9IUTpWEU8XdSWHSRXyk4ujXLfcXkfIuat5
+						DswQWfECAwEAAaNQME4wHQYDVR0OBBYEFLIOF+KbcmkO27fWS5ZicSri4/O7MB8G
+						A1UdIwQYMBaAFLIOF+KbcmkO27fWS5ZicSri4/O7MAwGA1UdEwQFMAMBAf8wDQYJ
+						KoZIhvcNAQEFBQADggEBAHEWHwnlsn47Vb8rfNZokD5DHDCiqWN5vx1A0Ed90bMJ
+						P5rScA9fuhldvLSq1wxCMwStcLcm6ymUdRHmb0wvtG1j0vphDsiFKLJtlTZzEz42
+						pG2u4LOQPW6TElrAQ+9xFaloFiNAsKNhEWz7YuQHm5zV8wi/7m5L1G9IlrBoIfjX
+						x98jpfQS4yKUF7Koof9h8iWYz/T4Ma3pCfHzHGxstfMOcix+gPxuXaR6qtdxMtNg
+						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 (New)</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.youngepilepsy.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.youngepilepsy.org.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..d680dac2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.youngepilepsy.org.uk-idp-shibboleth.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.youngepilepsy.org.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-18T10:56: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">youngepilepsy.org.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIE1zCCA7+gAwIBAgIRAIrwNxflMTquvXfq6pK7gn8wDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjA2MTIwMDAwMDBaFw0xNTA2MTIyMzU5NTlaMIGoMQswCQYD
+						VQQGEwJHQjEPMA0GA1UECBMGU3VycmV5MRIwEAYDVQQHEwlMaW5nZmllbGQxOzA5
+						BgNVBAoTMlRoZSBOYXRpb25hbCBDZW50cmUgZm9yIFlvdW5nIFBlb3BsZSB3aXRo
+						IEVwaWxlcHN5MRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEhMB8GA1UEAxMYaWRwLnlv
+						dW5nZXBpbGVwc3kub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAvplNMCWV3HnGWGuAt/VF0SMVmyE5fJCix71f0PUsdUMx7UiBTVAY6YPk+xfd
+						ikArI5zcLUOxuf3WMol5cpb34xrBsPzyyQF/+MbCTHBhm/Z6BWqZzZLtR8HSCF7Y
+						nEOB7QhDrgMs2hGD/F4NZdVbgF9veblDYEsChfLYWssNe1/dNAEh3EF5XBO633tF
+						94A9o+Av2JEzRH3R1Vq81rhVBI2pPRFsyfrLug6AcN9ONMpkByLRy0n+JR+npQ0n
+						d2vMo6x3L+hUEpVOgzjftKyeB53I2daXDQABRhBn/WC/RrkaBlaXJ108/FUkOHAG
+						WT4Sb4/Wt/tdn8yL0SuVsf+b3QIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUDL2T
+						aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFPNOHJ0GourmWopHAyS1yeYTt2mT
+						MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
+						BwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQz
+						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+						Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+						Y3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGGlkcC55b3VuZ2VwaWxlcHN5
+						Lm9yZy51azANBgkqhkiG9w0BAQUFAAOCAQEAH86tOvqiEgvcXJ8xtCdYjJQIcH76
+						jHZeUG34kBK4CUxRKApPv+y5EA6qO/HtStQBWfTqngFhQfDUMD8FV/UABwFBvC19
+						7WJ6NW7U8zhnz1pM0v46oDRFMhlQnLT0kvVqauGibZ6fma6ZkRyKsejCwfStnzxq
+						HZhOcaFLT7t6D5jV1e2BykrjUObZ+8bRBSvBnWAnZ+AMYLpTV+1lnjMXdhqBJmli
+						hZvJeOeLHgAgM7E8YrTBmrIMRPpZ5+wsn/vx1zLPTB1Rj5LL6AHRiplTxUNrtXWv
+						d+xYnzbHJUA9ufb2nG1b+EqbvE/XBCq0l6EuQ6QxOukQcrYB/cEK4yuNKg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.youngepilepsy.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.youngepilepsy.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.youngepilepsy.org.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.youngepilepsy.org.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.youngepilepsy.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.youngepilepsy.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">youngepilepsy.org.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIE1zCCA7+gAwIBAgIRAIrwNxflMTquvXfq6pK7gn8wDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjA2MTIwMDAwMDBaFw0xNTA2MTIyMzU5NTlaMIGoMQswCQYD
+						VQQGEwJHQjEPMA0GA1UECBMGU3VycmV5MRIwEAYDVQQHEwlMaW5nZmllbGQxOzA5
+						BgNVBAoTMlRoZSBOYXRpb25hbCBDZW50cmUgZm9yIFlvdW5nIFBlb3BsZSB3aXRo
+						IEVwaWxlcHN5MRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEhMB8GA1UEAxMYaWRwLnlv
+						dW5nZXBpbGVwc3kub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAvplNMCWV3HnGWGuAt/VF0SMVmyE5fJCix71f0PUsdUMx7UiBTVAY6YPk+xfd
+						ikArI5zcLUOxuf3WMol5cpb34xrBsPzyyQF/+MbCTHBhm/Z6BWqZzZLtR8HSCF7Y
+						nEOB7QhDrgMs2hGD/F4NZdVbgF9veblDYEsChfLYWssNe1/dNAEh3EF5XBO633tF
+						94A9o+Av2JEzRH3R1Vq81rhVBI2pPRFsyfrLug6AcN9ONMpkByLRy0n+JR+npQ0n
+						d2vMo6x3L+hUEpVOgzjftKyeB53I2daXDQABRhBn/WC/RrkaBlaXJ108/FUkOHAG
+						WT4Sb4/Wt/tdn8yL0SuVsf+b3QIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUDL2T
+						aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFPNOHJ0GourmWopHAyS1yeYTt2mT
+						MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
+						BwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQz
+						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+						Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+						Y3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGGlkcC55b3VuZ2VwaWxlcHN5
+						Lm9yZy51azANBgkqhkiG9w0BAQUFAAOCAQEAH86tOvqiEgvcXJ8xtCdYjJQIcH76
+						jHZeUG34kBK4CUxRKApPv+y5EA6qO/HtStQBWfTqngFhQfDUMD8FV/UABwFBvC19
+						7WJ6NW7U8zhnz1pM0v46oDRFMhlQnLT0kvVqauGibZ6fma6ZkRyKsejCwfStnzxq
+						HZhOcaFLT7t6D5jV1e2BykrjUObZ+8bRBSvBnWAnZ+AMYLpTV+1lnjMXdhqBJmli
+						hZvJeOeLHgAgM7E8YrTBmrIMRPpZ5+wsn/vx1zLPTB1Rj5LL6AHRiplTxUNrtXWv
+						d+xYnzbHJUA9ufb2nG1b+EqbvE/XBCq0l6EuQ6QxOukQcrYB/cEK4yuNKg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.youngepilepsy.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.youngepilepsy.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">The National Centre for Young People with Epilepsy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Young Epilepsy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://youngepilepsy.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tyrone</md:GivenName>
+    <md:SurName>da Silva</md:SurName>
+    <md:EmailAddress>mailto:tdasilva@youngepilepsy.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Seager</md:SurName>
+    <md:EmailAddress>mailto:cseager@youngepilepsy.org.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
new file mode 100644
index 00000000..ede41428
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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>
diff --git a/swamid-interfederations-2.0/idp0.abertay.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp0.abertay.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..8df66b92
--- /dev/null
+++ b/swamid-interfederations-2.0/idp0.abertay.ac.uk-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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>
+      <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>
+						MIIDMzCCAhugAwIBAgIUc7OjIBg0Vhfh00MlmEXTDJVaD5kwDQYJKoZIhvcNAQEF
+						BQAwHTEbMBkGA1UEAxMSaWRwMS5hYmVydGF5LmFjLnVrMB4XDTE0MDYyNzEwNTQz
+						M1oXDTM0MDYyNzEwNTQzM1owHTEbMBkGA1UEAxMSaWRwMS5hYmVydGF5LmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhy85D7Rk1W5IrIatuD01
+						bZaUq5/6fagpzqXeprRh8NafBqASLj9+Rzda5lJfMrFmvV9Q5JcyXKXdvnL9vaQi
+						o61t2sAwKTHrmOT8nIHCVLJGIx8wclEUQZifdDzQNIj9MiLL40nN6tD0WQIXcO/e
+						4nmBA4havm437GGuFOdP7ZkY2Xuex1AufaJq144mqNHhk4rYplbkpVS+M+NLbRLX
+						vooF2zl+CxGwHF1pYiKdbb8+Kf+v9uFX5wMGNZMfpymMprLf6m7dBLxVur2g1pcF
+						vvzRddBlKCshg6a3zh6RXgRf8ZmfU//HpBCPQdQ1d09gqUt0hJ8Mf89S65+fTB+Y
+						wQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAxLmFiZXJ0YXkuYWMudWuGKWh0dHBz
+						Oi8vaWRwMS5hYmVydGF5LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRe
+						nf9RmkNw8n4n58D1CDsey26VnTANBgkqhkiG9w0BAQUFAAOCAQEAIG2zPbZsoZxE
+						aj2ZH6TxNRkR+l8N86WXWn0AdITwU1PX2+5w38sSOuNb0FNA1MesY643dZOUM0TK
+						/JpPlGT8GPFAq+Pq3XKCMyLnPJd3WXqEzpbjRUsFmn9Pylsc3uQ27+kuYQ+SCPnS
+						tcU8ObI0Zcdk/ZfAn0P3R0DjmzypCt7qC/vqQbskGtniDGPlo9uqYTKxKZW5Xj5z
+						QaP8CP68+ECeTyyJs2E9IyjwU3r8e1ruNmLgXlIrZvLcyoc5TcnKgmuj+VhDho9s
+						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>
+						MIIDMzCCAhugAwIBAgIUc7OjIBg0Vhfh00MlmEXTDJVaD5kwDQYJKoZIhvcNAQEF
+						BQAwHTEbMBkGA1UEAxMSaWRwMS5hYmVydGF5LmFjLnVrMB4XDTE0MDYyNzEwNTQz
+						M1oXDTM0MDYyNzEwNTQzM1owHTEbMBkGA1UEAxMSaWRwMS5hYmVydGF5LmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhy85D7Rk1W5IrIatuD01
+						bZaUq5/6fagpzqXeprRh8NafBqASLj9+Rzda5lJfMrFmvV9Q5JcyXKXdvnL9vaQi
+						o61t2sAwKTHrmOT8nIHCVLJGIx8wclEUQZifdDzQNIj9MiLL40nN6tD0WQIXcO/e
+						4nmBA4havm437GGuFOdP7ZkY2Xuex1AufaJq144mqNHhk4rYplbkpVS+M+NLbRLX
+						vooF2zl+CxGwHF1pYiKdbb8+Kf+v9uFX5wMGNZMfpymMprLf6m7dBLxVur2g1pcF
+						vvzRddBlKCshg6a3zh6RXgRf8ZmfU//HpBCPQdQ1d09gqUt0hJ8Mf89S65+fTB+Y
+						wQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAxLmFiZXJ0YXkuYWMudWuGKWh0dHBz
+						Oi8vaWRwMS5hYmVydGF5LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRe
+						nf9RmkNw8n4n58D1CDsey26VnTANBgkqhkiG9w0BAQUFAAOCAQEAIG2zPbZsoZxE
+						aj2ZH6TxNRkR+l8N86WXWn0AdITwU1PX2+5w38sSOuNb0FNA1MesY643dZOUM0TK
+						/JpPlGT8GPFAq+Pq3XKCMyLnPJd3WXqEzpbjRUsFmn9Pylsc3uQ27+kuYQ+SCPnS
+						tcU8ObI0Zcdk/ZfAn0P3R0DjmzypCt7qC/vqQbskGtniDGPlo9uqYTKxKZW5Xj5z
+						QaP8CP68+ECeTyyJs2E9IyjwU3r8e1ruNmLgXlIrZvLcyoc5TcnKgmuj+VhDho9s
+						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>
diff --git a/swamid-interfederations-2.0/idp0.essex.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp0.essex.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..3187b546
--- /dev/null
+++ b/swamid-interfederations-2.0/idp0.essex.ac.uk-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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
+						IFN5c3RlbXMgU2VydmljZXMxGTAXBgNVBAMTEGlkcDEuZXNzZXguYWMudWsxHzAd
+						BgkqhkiG9w0BCQEWEHNhbWlAZXNzZXguYWMudWswHhcNMTMwNjA2MTMwODM0WhcN
+						MjMwNjA0MTMwODM0WjCBszELMAkGA1UEBhMCR0IxDjAMBgNVBAgTBUVzc2V4MRMw
+						EQYDVQQHEwpDb2xjaGVzdGVyMRwwGgYDVQQKExNVbml2ZXJzaXR5IG9mIEVzc2V4
+						MSUwIwYDVQQLExxJbmZvcm1hdGlvbiBTeXN0ZW1zIFNlcnZpY2VzMRkwFwYDVQQD
+						ExBpZHAxLmVzc2V4LmFjLnVrMR8wHQYJKoZIhvcNAQkBFhBzYW1pQGVzc2V4LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtkqXuVUogstt2A/6
+						cQ2hQxac8XIUhMRtWF7Rp8hoYawRFsD1QD/ppyutOHQTmdTes1THp9RFOxv/frFX
+						loVZSCgnk74wY98h9dJVT/aZGtbGBEi8CDeJOyMgopt8xhmt8GGuzLXZz65vdb1z
+						vXyYD5YjB94ECCLOkBXovkln4qSLOaDeOpwGADjQ+hEtsEYQ8Cob04cbZNhRJYBT
+						lTeGTcQhSQToPiiVHG1jupDkawkAg0wJyqjxGjdcFWAn5jdK5Qixc1EOhrwcVnEp
+						FEBJT8JFOS/Mek9YWc29//8BpVByeubbd/hv9fr9N2M9Z+AEJsIkNNYkrp2KybIW
+						rB7jhwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
+						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQURnWjhBTuD3SjqSu9ob68
+						DpVgGOIwHwYDVR0jBBgwFoAURnWjhBTuD3SjqSu9ob68DpVgGOIwDQYJKoZIhvcN
+						AQEFBQADggEBAAkvvTQ6RacwMk6ru/Kjd7tS8O+pCnXkJeAc+Q5/ELEfqwct5hE/
+						N6FhudmH/SrISQmJdWsJvUh5bkpT0tby/V2+9vKB+Bz/q8MaYdAB6p8wrrCl3qL6
+						I9pX1wL0QeuDemObq7DDySo59A/UD/4hv/hiM6XbORFyAPjCkvHmmgr9VkoUPcwv
+						EKqT60bX7dI9Nxr9/pAYexrSBSwyuk92JNJTpKqRmaBcV9AqPSA28JNJlZZJ4PRd
+						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>
+						MIIEZjCCA06gAwIBAgIJAITsUwOrZ0UiMA0GCSqGSIb3DQEBBQUAMIGzMQswCQYD
+						VQQGEwJHQjEOMAwGA1UECBMFRXNzZXgxEzARBgNVBAcTCkNvbGNoZXN0ZXIxHDAa
+						BgNVBAoTE1VuaXZlcnNpdHkgb2YgRXNzZXgxJTAjBgNVBAsTHEluZm9ybWF0aW9u
+						IFN5c3RlbXMgU2VydmljZXMxGTAXBgNVBAMTEGlkcDEuZXNzZXguYWMudWsxHzAd
+						BgkqhkiG9w0BCQEWEHNhbWlAZXNzZXguYWMudWswHhcNMTMwNjA2MTMwODM0WhcN
+						MjMwNjA0MTMwODM0WjCBszELMAkGA1UEBhMCR0IxDjAMBgNVBAgTBUVzc2V4MRMw
+						EQYDVQQHEwpDb2xjaGVzdGVyMRwwGgYDVQQKExNVbml2ZXJzaXR5IG9mIEVzc2V4
+						MSUwIwYDVQQLExxJbmZvcm1hdGlvbiBTeXN0ZW1zIFNlcnZpY2VzMRkwFwYDVQQD
+						ExBpZHAxLmVzc2V4LmFjLnVrMR8wHQYJKoZIhvcNAQkBFhBzYW1pQGVzc2V4LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtkqXuVUogstt2A/6
+						cQ2hQxac8XIUhMRtWF7Rp8hoYawRFsD1QD/ppyutOHQTmdTes1THp9RFOxv/frFX
+						loVZSCgnk74wY98h9dJVT/aZGtbGBEi8CDeJOyMgopt8xhmt8GGuzLXZz65vdb1z
+						vXyYD5YjB94ECCLOkBXovkln4qSLOaDeOpwGADjQ+hEtsEYQ8Cob04cbZNhRJYBT
+						lTeGTcQhSQToPiiVHG1jupDkawkAg0wJyqjxGjdcFWAn5jdK5Qixc1EOhrwcVnEp
+						FEBJT8JFOS/Mek9YWc29//8BpVByeubbd/hv9fr9N2M9Z+AEJsIkNNYkrp2KybIW
+						rB7jhwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
+						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQURnWjhBTuD3SjqSu9ob68
+						DpVgGOIwHwYDVR0jBBgwFoAURnWjhBTuD3SjqSu9ob68DpVgGOIwDQYJKoZIhvcN
+						AQEFBQADggEBAAkvvTQ6RacwMk6ru/Kjd7tS8O+pCnXkJeAc+Q5/ELEfqwct5hE/
+						N6FhudmH/SrISQmJdWsJvUh5bkpT0tby/V2+9vKB+Bz/q8MaYdAB6p8wrrCl3qL6
+						I9pX1wL0QeuDemObq7DDySo59A/UD/4hv/hiM6XbORFyAPjCkvHmmgr9VkoUPcwv
+						EKqT60bX7dI9Nxr9/pAYexrSBSwyuk92JNJTpKqRmaBcV9AqPSA28JNJlZZJ4PRd
+						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>Sami</md:GivenName>
+    <md:SurName>Khan</md:SurName>
+    <md:EmailAddress>mailto:sami@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
new file mode 100644
index 00000000..bcaa099e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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">
+                    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>
+      <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>
+MIIDOzCCAiOgAwIBAgIUWOUmLa4FhkqSqR1HxQX3JeEdVy4wDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUaWRwMDEub2dzLnRyaWVzdGUuaXQwHhcNMTQwNjI0MTE0
+MDA2WhcNMzQwNjI0MTE0MDA2WjAfMR0wGwYDVQQDExRpZHAwMS5vZ3MudHJpZXN0
+ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMgIgZhhFV7QPbWz
+1duF55NhnNoUPiSKzWYC+aj/MA9vg3Nyi+iy3hiSN4c2AVHTwS2vBUjovE85ac2c
+KODrPJTSaKrk0HgQFtp/D2SMvx1eO15gjiMHbf3KQ8TTSzx4VMtbzIX6w3wd3Utv
+oznA+XqD5bWJhS0zXDAa1st+LrjQbjKShDIbwOpvQVe93A95EuwP258rxs9GSjVD
+mq0T4jKn7IIgTk0P32ak/4xCRHhHQRvJ2ZLERRR1cEdhcI65wsW6csXZ+4SpNR9E
+vo1GvdoIRnufsFvat+WTkYQFSmIpfUffm5Ijxr4EsjOy4fHeA2AjauVV9TASqj3h
+t8SMyy8CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwMDEub2dzLnRyaWVzdGUuaXSG
+K2h0dHBzOi8vaWRwMDEub2dzLnRyaWVzdGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFAEcqKk0bzXfdE72LQ+3BUcv5CHDMA0GCSqGSIb3DQEBBQUAA4IBAQCC
+T6c9VpgBD5GeM1tsXYkG+n047bAv4g9G9+E/80HdqwpU314Nw697I/wN7pqiOE7j
+WkTTH+4bGK5ErGKOHuJCWCILHDQG8qk94Ni9rgXkhUM4ChfZ6nROLQsD9+r2X7/8
+naPDewMZqE3c/dn3yG8gkP6oSrmY0a49pQVKaP8/aHHVE89s9hEGKuf6AeX7CUuA
+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>
+MIIDOzCCAiOgAwIBAgIUWOUmLa4FhkqSqR1HxQX3JeEdVy4wDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUaWRwMDEub2dzLnRyaWVzdGUuaXQwHhcNMTQwNjI0MTE0
+MDA2WhcNMzQwNjI0MTE0MDA2WjAfMR0wGwYDVQQDExRpZHAwMS5vZ3MudHJpZXN0
+ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMgIgZhhFV7QPbWz
+1duF55NhnNoUPiSKzWYC+aj/MA9vg3Nyi+iy3hiSN4c2AVHTwS2vBUjovE85ac2c
+KODrPJTSaKrk0HgQFtp/D2SMvx1eO15gjiMHbf3KQ8TTSzx4VMtbzIX6w3wd3Utv
+oznA+XqD5bWJhS0zXDAa1st+LrjQbjKShDIbwOpvQVe93A95EuwP258rxs9GSjVD
+mq0T4jKn7IIgTk0P32ak/4xCRHhHQRvJ2ZLERRR1cEdhcI65wsW6csXZ+4SpNR9E
+vo1GvdoIRnufsFvat+WTkYQFSmIpfUffm5Ijxr4EsjOy4fHeA2AjauVV9TASqj3h
+t8SMyy8CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwMDEub2dzLnRyaWVzdGUuaXSG
+K2h0dHBzOi8vaWRwMDEub2dzLnRyaWVzdGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFAEcqKk0bzXfdE72LQ+3BUcv5CHDMA0GCSqGSIb3DQEBBQUAA4IBAQCC
+T6c9VpgBD5GeM1tsXYkG+n047bAv4g9G9+E/80HdqwpU314Nw697I/wN7pqiOE7j
+WkTTH+4bGK5ErGKOHuJCWCILHDQG8qk94Ni9rgXkhUM4ChfZ6nROLQsD9+r2X7/8
+naPDewMZqE3c/dn3yG8gkP6oSrmY0a49pQVKaP8/aHHVE89s9hEGKuf6AeX7CUuA
+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>
diff --git a/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..1500b0e8
--- /dev/null
+++ b/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml
@@ -0,0 +1,108 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIRAMB2hFT3mLr5ROiokXWKNqowDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA0MjYwMDAwMDBaFw0xNjA0MjUyMzU5NTlaMEUxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXc2hpYmJvbGV0
+						aDAxLnN0ZmMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr
+						800yIcKiJ5DIXV867iBoSkIB2Yu1cKDG64+1vjIQDmrpQLk3S78OPrWyoIoxra+9
+						dFoXz3oQQFgzQK61oPzJKjaL+p7dAmQkcofanxlmYMOABxe8zJZQ/u7rYScY+8qS
+						fy5HL5qGxBLbggpgWCGBwCaBnyscBLXpS2zB/TYRlPeRgAG/BJVVuuOgsZ0daBix
+						r7nydWrg11+HTIIH5BWV3rRN77a0idEi8AKLilfnEu4v0gM8ZkyOVLDEnTmfQnwh
+						7FltTCdwIxufO/mrZ1mlikNPuK7wmux0Esq2nbS7WBzm2KSOC4sxZGQPDrTzW3bo
+						O/XX9wxwx/YKo2n/xROJAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
+						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUs17bYNl/kS6pde+m388Jbcdy4jwwDgYD
+						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
+						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF3NoaWJib2xldGgw
+						MS5zdGZjLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBpkunQq6a1o3faoVYa3zlU
+						dviUnxQ0XmF3iaB7emPGWxhMKvTJlWBixo89J/k4aRhVVh1aSJ9I6EUiR/Uxyuri
+						a9J41yWKm9YqvCG/aiikWWckZI1kDb1Ocmk8++e4ZOtRsL6zf4tO6J/Ae89HTzIk
+						k3E5p5OSTaobJJfj3FuX1KGi31d3OLV95pN5oI9ekqZE6B4vhRhVffvkaZBP18XA
+						TE3/kQQWR6ps+9Jb28ntbBvjkk0ilVHjCNSHGWp4tY3gPNIsYm/TZbrLLV1k5aOd
+						SFqspItD7lnFbcVq/j/WsY5g9hN1Dq8+B9KFZeuYn06qFbtOPnQ5qwTmfWvoN2/8
+					</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>
+						MIIEfDCCA2SgAwIBAgIRAMB2hFT3mLr5ROiokXWKNqowDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA0MjYwMDAwMDBaFw0xNjA0MjUyMzU5NTlaMEUxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXc2hpYmJvbGV0
+						aDAxLnN0ZmMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr
+						800yIcKiJ5DIXV867iBoSkIB2Yu1cKDG64+1vjIQDmrpQLk3S78OPrWyoIoxra+9
+						dFoXz3oQQFgzQK61oPzJKjaL+p7dAmQkcofanxlmYMOABxe8zJZQ/u7rYScY+8qS
+						fy5HL5qGxBLbggpgWCGBwCaBnyscBLXpS2zB/TYRlPeRgAG/BJVVuuOgsZ0daBix
+						r7nydWrg11+HTIIH5BWV3rRN77a0idEi8AKLilfnEu4v0gM8ZkyOVLDEnTmfQnwh
+						7FltTCdwIxufO/mrZ1mlikNPuK7wmux0Esq2nbS7WBzm2KSOC4sxZGQPDrTzW3bo
+						O/XX9wxwx/YKo2n/xROJAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
+						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUs17bYNl/kS6pde+m388Jbcdy4jwwDgYD
+						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
+						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF3NoaWJib2xldGgw
+						MS5zdGZjLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBpkunQq6a1o3faoVYa3zlU
+						dviUnxQ0XmF3iaB7emPGWxhMKvTJlWBixo89J/k4aRhVVh1aSJ9I6EUiR/Uxyuri
+						a9J41yWKm9YqvCG/aiikWWckZI1kDb1Ocmk8++e4ZOtRsL6zf4tO6J/Ae89HTzIk
+						k3E5p5OSTaobJJfj3FuX1KGi31d3OLV95pN5oI9ekqZE6B4vhRhVffvkaZBP18XA
+						TE3/kQQWR6ps+9Jb28ntbBvjkk0ilVHjCNSHGWp4tY3gPNIsYm/TZbrLLV1k5aOd
+						SFqspItD7lnFbcVq/j/WsY5g9hN1Dq8+B9KFZeuYn06qFbtOPnQ5qwTmfWvoN2/8
+					</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>
diff --git a/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..a92a4681
--- /dev/null
+++ b/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml
@@ -0,0 +1,108 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIRAN6xh7bD0R7q1gDhMLxcIlYwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA0MjUwMDAwMDBaFw0xNjA0MjQyMzU5NTlaMEUxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXc2hpYmJvbGV0
+						aDAyLnN0ZmMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDT
+						WeVBatPe3EDc7RRhp3BVzhFBNYnHBAvE2ljHzw/D4Hz2I3sYk5Hlfh+VXqLf5Hkc
+						WzmxSnmAynFZwLyrrPXRfjnwBkRF3aJuM0SwnvqNWdmcgmfbd5xEVN+tH5bBQOxu
+						SY5Auz9dJzbguRBrRFFdwIPJTlAM1PHz51i65Tdm/dNLD00fOdkTw1iMl4L1Vwsi
+						e9D+aF4yHniyNIASvNaJoiJ1xe984QhtzDvupeJvzds9wSLordSugKDAB68rd8/E
+						BcIjW/ytel6/d5pGbMzit+i1V5IbZBvTomZnyQ1htHTfS/OIOYkAzr59Jx4gACOY
+						FV4EiKxApiUd4S7GVZYVAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
+						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQU8GrcLM9v5v84R07FK/hJrRcI+qYwDgYD
+						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
+						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF3NoaWJib2xldGgw
+						Mi5zdGZjLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQCZc15apbPz3pUGZ3oZSCm4
+						kD6wPjti31jgf3PrM2ivcFxZpblCoMWKPkUaKLZKDisijqgLe+M/E4wJdrQrZqPs
+						O8BdV3zvlJwjNXq5+PQ9lNxDb+TnCAXqaO2scXIvzDrNgsj1em02KbpCer3yaEdk
+						8U5MuTiT2/vG+51EGncgOU7jPaRVGol3mEjb+6NYT6EYF7m91Lm6I3TOFCljXQsO
+						12IuSq7E+X8aiweCuMNoT2pUGkTHAEIOybgnRBq0ZkEEC7PgwCjJdFFzZc0uynnu
+						gLABpiHA/T1LSEnntS51pxSjVFt2tn18LeFrLJMV3ZPNOC41kUPN+wb2MPZFfsET
+					</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>
+						MIIEfDCCA2SgAwIBAgIRAN6xh7bD0R7q1gDhMLxcIlYwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA0MjUwMDAwMDBaFw0xNjA0MjQyMzU5NTlaMEUxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXc2hpYmJvbGV0
+						aDAyLnN0ZmMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDT
+						WeVBatPe3EDc7RRhp3BVzhFBNYnHBAvE2ljHzw/D4Hz2I3sYk5Hlfh+VXqLf5Hkc
+						WzmxSnmAynFZwLyrrPXRfjnwBkRF3aJuM0SwnvqNWdmcgmfbd5xEVN+tH5bBQOxu
+						SY5Auz9dJzbguRBrRFFdwIPJTlAM1PHz51i65Tdm/dNLD00fOdkTw1iMl4L1Vwsi
+						e9D+aF4yHniyNIASvNaJoiJ1xe984QhtzDvupeJvzds9wSLordSugKDAB68rd8/E
+						BcIjW/ytel6/d5pGbMzit+i1V5IbZBvTomZnyQ1htHTfS/OIOYkAzr59Jx4gACOY
+						FV4EiKxApiUd4S7GVZYVAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
+						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQU8GrcLM9v5v84R07FK/hJrRcI+qYwDgYD
+						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
+						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF3NoaWJib2xldGgw
+						Mi5zdGZjLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQCZc15apbPz3pUGZ3oZSCm4
+						kD6wPjti31jgf3PrM2ivcFxZpblCoMWKPkUaKLZKDisijqgLe+M/E4wJdrQrZqPs
+						O8BdV3zvlJwjNXq5+PQ9lNxDb+TnCAXqaO2scXIvzDrNgsj1em02KbpCer3yaEdk
+						8U5MuTiT2/vG+51EGncgOU7jPaRVGol3mEjb+6NYT6EYF7m91Lm6I3TOFCljXQsO
+						12IuSq7E+X8aiweCuMNoT2pUGkTHAEIOybgnRBq0ZkEEC7PgwCjJdFFzZc0uynnu
+						gLABpiHA/T1LSEnntS51pxSjVFt2tn18LeFrLJMV3ZPNOC41kUPN+wb2MPZFfsET
+					</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>
diff --git a/swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.xml b/swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.xml
new file mode 100644
index 00000000..c7759c5f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+      <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="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>
+					      MIIDPzCCAiegAwIBAgIUKhgZTCdgvmRXJo0273XOyJSmkg8wDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVaWRwMS5hZ3JvcGFyaXN0ZWNoLmZyMB4XDTEzMDgzMDEz
+NDkyN1oXDTMzMDgzMDEzNDkyN1owIDEeMBwGA1UEAxMVaWRwMS5hZ3JvcGFyaXN0
+ZWNoLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk24oo7/ubsFy
+CeCuWUTIh+FjK9IL9+k482e09iA4JKwmYKgvNyrWvAZ7hLjp1ucnbEDNLV530LDd
+ByNBVNitEFenZMFOXx4TUAwii08XHpf44TMcidd4R3s+11bfL2fZTWHIX2Wg0DHx
+xz0p/aJ/KTpqF6zW8hWODOyg2Z9KizGWAmJPLIObIBUa/miaLaqLG3EQtvO2VlN9
+Qo8/Eu5CoWJDEUKSUwTACMqs71VSSVOW13LqpRq+gyP//qo0RmrRyB33ANY5N2J0
+QPK+U7KWeyuXuoocJwtO8e7KM6RdFCD7WdEPDv5twID+xwpTSrdPAS78QIfRvVCl
+oCBu0yxQ/QIDAQABo3EwbzBOBgNVHREERzBFghVpZHAxLmFncm9wYXJpc3RlY2gu
+ZnKGLGh0dHBzOi8vaWRwMS5hZ3JvcGFyaXN0ZWNoLmZyL2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBQlFX3fOQedLM0MV538MJPU9i4okzANBgkqhkiG9w0BAQUFAAOC
+AQEAWph8JugfgFwnDI9KulR298qdXFrLhhbDpsVrlE4Uez/DjZpvwFucAoPOaHS6
+MIZaq+BPlOtH86hVyEFVyDtpptq5gpKpW3KTIFpg87gKOhmKH+JMaBJvZ1wOkQHj
+XJ041jMKaqY/J5wRPX8crb0W++gdjIxq6gt6dba9X/NEqnwaJbuhGyhDlmosm6pT
+5aBNL/h89RaDAzS6yeKYoaFcCKjYt/SW85Q5nxqPt9c/pkDm0M7S+IFcjhC9FaeI
+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://unknown.site.com</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.crous-aix-marseille.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..a6f1c6bd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-aix.net</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-aix-marseille.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <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>
+					      MIIEgTCCA2mgAwIBAgIQMbkj1D0MR48qNrGSMyNhRzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDEyNTAwMDAwMFoXDTE2MDEyNTIzNTk1OVowUTELMAkGA1UE
+BhMCRlIxHDAaBgNVBAoTE0NST1VTIEFJWC1NQVJTRUlMTEUxJDAiBgNVBAMTG2lk
+cDEuY3JvdXMtYWl4LW1hcnNlaWxsZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALxxt1r6j1fniB75UijZellhzzPfNZ7WDuHyaSDavJ7cWieuntpN
+LKGdo5Xp+0z89AcOZUSOvuIOZTL11NCE/Dl1Vd2teUL13MFdrOPsrcpaipE6cS2R
+CY+XU4hNSqiBG800YLtyexZ/a3s6qjBOA7pEt9Tu3+xza6i5SGVgiZOrI2Z48JgU
+3N3igIkDGhqsy36McnS5Qf9tpvcBIbacRH/DAw+JroswJwiy4AuSsXQuOdtSPA/d
+G40Jp1pjPb6EZ/u1Wjngc2C7Q9AqM0FirTudcOAhjFfvVKNcOobFsBsw02I2B1CS
+sgtAbC6wn47yKhsjtpCr6sdC4qXoXZ/1HucCAwEAAaOCAW4wggFqMB8GA1UdIwQY
+MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSvDV2R28Nsq8xjoG+t
+DfdIlnmd8zAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
+BggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6
+BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
+QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
+cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
+dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdghtpZHAxLmNyb3Vz
+LWFpeC1tYXJzZWlsbGUuZnIwDQYJKoZIhvcNAQEFBQADggEBAIbtiLL2mvNNc4E8
+8eCNtgwC7uK9WZMS6qm4e2VqUnqoZn/8zxElo8vzbFQ+iIrYN50jO4Wn4HcbLF+B
+9TzWpEjmp7gxYcOG5D/GsugiN8Ha2sC4YfBqRQVFGP6TwSZPQPpI54JtlNvq3Mia
+i0XGkCE5e2h2PunU+SPlgEMhMV+o5mIiobxziZOjaW8avAlu377DXn/HpLysGSjZ
+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://unknown.site.com</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
new file mode 100644
index 00000000..0f110b35
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.crous-toulouse.fr-idp-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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>
+      <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="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>
+					      MIIDLDCCAhSgAwIBAgIVANP/syULUNCGiJ6jMUcqvbTYvZ74MA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEFNSVmlEUC5jcm91cy5sYW4wHhcNMTExMDI4MTQwMDAx
+WhcNMzExMDI4MTUwMDAxWjAbMRkwFwYDVQQDExBTUlZpRFAuY3JvdXMubGFuMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkYnPcZx0e0Ce2gh7d7wyIkME
+ovrrzv0vlruzvby4oU2L0ebZwMb9cxQQBYu7jEgnvITkoAqzzAjnNW0aiPbTDnX0
+Ma1OC1H7yG2HjdjMUmu9Dn7o8nhluFzXk7my3v6Cblt4SrMmsjh8aDFbixEIVLhp
+NdS80dAvUzhxlYd6JzJSdwcqB4pt9Syb4ahJxRh6BuzIQzqM4j+7ChIKkMP8BVYU
+Zl3R0hkTcgB24Ha6GlWBeW15/mKSKnbXmQOy74Jhkhyh/jJ/0u03STQUx9mKnC5R
+OPyQNhIA7eBBQ1soxAXe59UURfcvMHj1u4Zw1jj09sHNLMaQDtf9f13H5bwo8wID
+AQABo2cwZTBEBgNVHREEPTA7ghBTUlZpRFAuY3JvdXMubGFuhidodHRwczovL1NS
+VmlEUC5jcm91cy5sYW4vaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAawx20ceqtg
+Jga00U1mDWS7Y0uJMA0GCSqGSIb3DQEBBQUAA4IBAQByK4s5e6Mx/3Kfiph8sbOV
+Jlnm3mL8MrnOchYVGZ+qF/9Od66OH7wDv45gZ53EcuLBIFyPO8d1UjXGaMmjx5Un
+pqjvYXU/lWWx1wSa5NzVXHNk/JMbSjvG5eqB4/HNy8PIhK/eviNX31N+tK40iTAP
+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>
+					      MIIEWzCCA0OgAwIBAgIBBDANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJmcjEO
+MAwGA1UECBMFRmFuY2UxETAPBgNVBAcTCFRvdWxvdXNlMQ4wDAYDVQQKEwVDcm91
+czEmMCQGCSqGSIb3DQEJARYXY3JvdXMtc2lAYWMtdG91bG91c2UuZnIxFDASBgNV
+BAMTC2ludGVybmFsLWNhMB4XDTExMTAyNzE0MjQxOFoXDTIxMTAyNDE0MjQxOFow
+gYMxCzAJBgNVBAYTAmZyMQ4wDAYDVQQIEwVGYW5jZTERMA8GA1UEBxMIVG91bG91
+c2UxDjAMBgNVBAoTBUNyb3VzMSYwJAYJKoZIhvcNAQkBFhdjcm91cy1zaUBhYy10
+b3Vsb3VzZS5mcjEZMBcGA1UEAxMQU1JWaURQLmNyb3VzLmxhbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMgpkRfNo/rn5xeuCDLvQPoaFrMwq3tjCcCM
+O00rQSCNy81KOtPQOqTtbw+0CiOgHr0oC2jhUqV+IIkXP5rzBcBQw9IkGrHCQLPm
+Yg0Yik1eQPGf8UYZKb5ulvArG2t0HuEfD+npSbsPhJPBmNhr5OkP9aZx+ey3+wQ7
+3RLhR3aDzTyFqwFjkkJcUANLQLmz2CbxnZ3c84OA//SVdDPe/iSqkBwPNOyi/ZsA
+sPSMYGf1OngY2lJJSllKssPIOkYNZPP7EIZxMv9jd7deMtTjEcAnoVJUOb0yb2HE
++TBXShU4dSE46PBu8K9+/W90woEM11kwkHETwLDHuxzmfde5mrkCAwEAAaOB3TCB
+2jAdBgNVHQ4EFgQU7/P8O36Gwrq+uyg6sDWqG8jN3d4wgaoGA1UdIwSBojCBn4AU
+trBU7BEx8lPtHYx+4HWHX6l5gguhgYOkgYAwfjELMAkGA1UEBhMCZnIxDjAMBgNV
+BAgTBUZhbmNlMREwDwYDVQQHEwhUb3Vsb3VzZTEOMAwGA1UEChMFQ3JvdXMxJjAk
+BgkqhkiG9w0BCQEWF2Nyb3VzLXNpQGFjLXRvdWxvdXNlLmZyMRQwEgYDVQQDEwtp
+bnRlcm5hbC1jYYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV
+UtC7q5CB5NpDeJLsh7Caq5yTBD0Aq6QBp9fgjirq4U6wHxlriGTFqhGtc90t0lxQ
+8x/Xd+sXKT/65+yHj8BlfjGgT/1jTuUuLZNO67eIh04aMv/VGqCifo+6+B41ot77
+/XYb8OCrLhZdTrMyo3k+/tlXC4cZqY8e3q4EhQZm4YCA4/HIwd+VyBN1pjaYT7j/
+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://unknown.site.com</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
new file mode 100644
index 00000000..854e63eb
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.ens-cachan.fr-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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: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>
+					      MIIEsTCCA5mgAwIBAgIQNTxRAJU4zPU+440yj8e5sjANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDExMTAwMDAwMDBaFw0xNzExMDkyMzU5NTlaMEAxITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSaWRwMS5lbnMtY2Fj
+aGFuLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvmhCphNDH1MG
+c8rZR5n4SjB/91cjSBrgwNNpU9bSggVJlSX5U0cWqrNCmeRdr7l1CTDi0Kg0CW/i
+zc4uVtrSp0LGxL5BYajg+EmdIV4WfnMtqXGddAYmSTxOg94Q7QZgG8RNnigoKhLC
+qMtHvZWegalCYzrm0j7n/d7bfDykhVYSlDrsBby5hOWWuWnqBw/FaaXqyOtAVLYB
+o55wi8pbaVMFoVax8NTSyCg2TpT/wv6iGG8UCQ8CxiJXKEx9Os5pbg9BN9P2XUB/
+tYfTpaFKJDANqaMrvtobF4Ke18+cVkEEoSiaiCLuPy5fwUPsM+BjgDFQHSZuKR6W
+wtMEo+0ZCQIDAQABo4IBgTCCAX0wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GG
+KLD9tr0wHQYDVR0OBBYEFGe/fR0FHypFMVv9qNaq+7nZQ0SIMA4GA1UdDwEB/wQE
+AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+MC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNy
+bDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRy
+dXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2Nz
+cC51c2VydHJ1c3QuY29tMDAGA1UdEQQpMCeCEmlkcDEuZW5zLWNhY2hhbi5mcoIR
+aWRwLmVucy1jYWNoYW4uZnIwDQYJKoZIhvcNAQELBQADggEBAE6ELUQpNOyQ1tX6
+1ZA3BaJTBk1G0X4hRUCzDdda77l/AA92aCkKB/GuEshOxJy+iN1vDbpwppcP0/Hb
+3kNobrbmWzf0EJPTulVuiSb61rCkpLGNEZVATMVA1FXDFYlSfikzcBPWAfg3h6zy
+Ginp7PrBbTm7WKPnh1yumqksDelkDBmPaAbxYwOYAm5+qRoYLywIpjrAtVUwp9vg
+6VebdVAyhQ9QT2RZwrWa9jKyXqhhy38a0EcmJuvS17FFPQOJXtTjvyHS/zPWogAP
+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>
+					      MIIEsjCCA5qgAwIBAgIRAMT2IqUsyYtK9vnPpZsCD/MwDQYJKoZIhvcNAQELBQAw
+ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
+CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
+IENBIDIwHhcNMTQxMTEwMDAwMDAwWhcNMTcxMTA5MjM1OTU5WjBAMSEwHwYDVQQL
+ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxGzAZBgNVBAMTEmlkcDEuZW5zLWNh
+Y2hhbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJhoUFdfl8vc
+VHaOjiXs89V1D+wV8exvuGuMp7xkB0e1zPxvnU3ZV1zbXsdjSLoWb1+zpcJzDt4M
+73VfIBtgLR9I0m7rIR67kHapozr4kSTThLE+aOjBBYjzsCcOiuOq7RgiH0ueV1DJ
+WM8NF5RRX20RxyrzvHWDkSdgXb0xL9Bn/IOUKKYXIdP4WgvS/LZKo5ZC1/9k+S98
+1cnTiq+IJBtKW9IgSo5ToKNMkSjCYdrGEynspxz2RZuBX2y0ospyJmH7FV0q2K3w
+ipyODxoZTolmIF9e6Tf9atM3/4owl7LLHKHZiSePilWNDvRuMMG+pcSjNHIwcHfr
+3BxCWx0CEb0CAwEAAaOCAYEwggF9MB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvh
+hiiw/ba9MB0GA1UdDgQWBBQO9YeMqTUduvvc7MIAaxhgw2ImNjAOBgNVHQ8BAf8E
+BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5j
+cmwwbAYIKwYBBQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0
+cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29j
+c3AudXNlcnRydXN0LmNvbTAwBgNVHREEKTAnghJpZHAxLmVucy1jYWNoYW4uZnKC
+EWlkcC5lbnMtY2FjaGFuLmZyMA0GCSqGSIb3DQEBCwUAA4IBAQB0w3eC+MfK1D95
+Ie+CbwiJQXugCOnqeNlbBC8rNRRTU2+179IGdBEZ21D1/ltljNv4fLEDQYeFsCqW
+pdJQVg0SFYbMMpzhhEXSaLHEcK9PztItH/t/xTRJH38z2PaztyN4yj6oNuDM8Own
+tJwMlX9KuE4Zmiaqc2IrgB3jAFmUOlHa3gOu6lNMliM0CU8s6XlH+0wDVan9ZNX/
+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://unknown.site.com</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
new file mode 100644
index 00000000..36554b03
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.glos.ac.uk-entity.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhlNvzpLXrExyTGgdo924dAhh+8T+
+						DDyFnfMBX74lgFvk9/Os73dq7ooAudnJW21c8vpD+24bMcgI8NPZchHvTKZNEciI
+						3xkwyWvR0zV3pdQimojUmiX1fPfa7IOhZZ6qGFHGrucXs883wUoc/rLK3Xm7blV2
+						jeHM7GiKYHs/WO2a3ITWkJqgeh7gXL/kRNNHGrLbgFloNOCT74KT01SNBgzWxiq9
+						QBjqZR+tnaiu6dzeCMbB+wWmLLP3VOUDFxS9uNQGb8ZgOv3/n7Az7umt9xE5FfLu
+						vOwEqpkoOxTsEootS2b6+tzbX0ZVaPAVjaKMWyXuPBU2wlPPbVU5r8cxEQIDAQAB
+						o2UwYzBCBgNVHREEOzA5gg9pZHAxLmdsb3MuYWMudWuGJmh0dHBzOi8vaWRwMS5n
+						bG9zLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR+Xmt33O3jaMudgIUV
+						OLYp7RYNIzANBgkqhkiG9w0BAQUFAAOCAQEAZhozuufgK2Jm2NDfyWti7ANRfe3I
+						Bo++sDx8LwdL7obTwDKn4+Yco3vOrigILfoawl2heoG16mhfUWFZgwu21Surt6uL
+						c7V7f3v4ZzEIkb/DYFmk8wPx22htqAcO9sj0duHVP45pFW4Orchc6umt+ZCFgwWB
+						WByMENe+1csz9xMqRT1QlkBleOjo3/nEcv24kzpOCmCVe2CMSnxekGc8Jp38GBEi
+						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>
+						MIIDJzCCAg+gAwIBAgIUCsJYB48Mz3bcb/dTeJJEcFS9NPQwDQYJKoZIhvcNAQEF
+						BQAwGjEYMBYGA1UEAxMPaWRwMS5nbG9zLmFjLnVrMB4XDTE0MDUyNzE1NDkxMVoX
+						DTM0MDUyNzE1NDkxMVowGjEYMBYGA1UEAxMPaWRwMS5nbG9zLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhlNvzpLXrExyTGgdo924dAhh+8T+
+						DDyFnfMBX74lgFvk9/Os73dq7ooAudnJW21c8vpD+24bMcgI8NPZchHvTKZNEciI
+						3xkwyWvR0zV3pdQimojUmiX1fPfa7IOhZZ6qGFHGrucXs883wUoc/rLK3Xm7blV2
+						jeHM7GiKYHs/WO2a3ITWkJqgeh7gXL/kRNNHGrLbgFloNOCT74KT01SNBgzWxiq9
+						QBjqZR+tnaiu6dzeCMbB+wWmLLP3VOUDFxS9uNQGb8ZgOv3/n7Az7umt9xE5FfLu
+						vOwEqpkoOxTsEootS2b6+tzbX0ZVaPAVjaKMWyXuPBU2wlPPbVU5r8cxEQIDAQAB
+						o2UwYzBCBgNVHREEOzA5gg9pZHAxLmdsb3MuYWMudWuGJmh0dHBzOi8vaWRwMS5n
+						bG9zLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR+Xmt33O3jaMudgIUV
+						OLYp7RYNIzANBgkqhkiG9w0BAQUFAAOCAQEAZhozuufgK2Jm2NDfyWti7ANRfe3I
+						Bo++sDx8LwdL7obTwDKn4+Yco3vOrigILfoawl2heoG16mhfUWFZgwu21Surt6uL
+						c7V7f3v4ZzEIkb/DYFmk8wPx22htqAcO9sj0duHVP45pFW4Orchc6umt+ZCFgwWB
+						WByMENe+1csz9xMqRT1QlkBleOjo3/nEcv24kzpOCmCVe2CMSnxekGc8Jp38GBEi
+						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>
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
new file mode 100644
index 00000000..15ad6743
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.glyndwr.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs107XEU+w72wOCggvYWv
+						HnvIjLwochbb1TQEjD76H+OXZQFFE5if39WkfeIgM+NumYc1SCZhHO7ssT2ArxpT
+						x3pwNYoj3mMtarXj5uF8In5nybRtNKFcug2nLaBsa+Svj77n73681Gx/VVx+tTkF
+						ySeQ4AHxkDncG4gUp0GKXWuCVSsQdXGOoljxp/aWkTlaZKJQfvDiURD8ysLBc8XF
+						4s0YE4GtrWMM/SbSysad1Wk0sI7afL+1iCf+UdiuRa8HrRI0kuc/Z7ajCBBaWn4w
+						11zac9qrLztQ4bKTp+5z025F9HGM9iXAe39AxeGHdurTPr8Voz8/rGlelNnYh7JR
+						rwIDAQABo2swaTAdBgNVHQ4EFgQU1g7hguqPgn9Za9hlSXqXv3TVbpkwSAYDVR0R
+						BEEwP4ISaWRwMS5nbHluZHdyLmFjLnVrhilodHRwczovL2lkcDEuZ2x5bmR3ci5h
+						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAKl23zJe5fEkR
+						3wCSeBWSWXeSLNxB6nTL3I89uJ+1M3RNyR2t56Zqhx5g/7Iac4tbJs50FaUnGQ7x
+						I0WXrKJ8jit0gKWMjDY36SlfXkIWtH2VtW4WvxChLxCVur7y4zcKDtXxCDJvYAVl
+						W5Pe2l+xXc9nl2Pn17OA+idxL+asZ5tGuI3egcxNEfp4AuPYGnt9RhrhrOCo8Wv1
+						lg4GojfVyaGPZ9bi0dTsCl5PyU5tmUMsUOpi8/SxrD+KMB4gU+4fottmPKnowz/o
+						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>
+						MIIDMzCCAhugAwIBAgIUW2tXeH8370JdIqiuEuyPXsvnn1IwDQYJKoZIhvcNAQEF
+						BQAwHTEbMBkGA1UEAwwSaWRwMS5nbHluZHdyLmFjLnVrMB4XDTE0MTEwMzExNDUy
+						NVoXDTM0MTEwMzExNDUyNVowHTEbMBkGA1UEAwwSaWRwMS5nbHluZHdyLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs107XEU+w72wOCggvYWv
+						HnvIjLwochbb1TQEjD76H+OXZQFFE5if39WkfeIgM+NumYc1SCZhHO7ssT2ArxpT
+						x3pwNYoj3mMtarXj5uF8In5nybRtNKFcug2nLaBsa+Svj77n73681Gx/VVx+tTkF
+						ySeQ4AHxkDncG4gUp0GKXWuCVSsQdXGOoljxp/aWkTlaZKJQfvDiURD8ysLBc8XF
+						4s0YE4GtrWMM/SbSysad1Wk0sI7afL+1iCf+UdiuRa8HrRI0kuc/Z7ajCBBaWn4w
+						11zac9qrLztQ4bKTp+5z025F9HGM9iXAe39AxeGHdurTPr8Voz8/rGlelNnYh7JR
+						rwIDAQABo2swaTAdBgNVHQ4EFgQU1g7hguqPgn9Za9hlSXqXv3TVbpkwSAYDVR0R
+						BEEwP4ISaWRwMS5nbHluZHdyLmFjLnVrhilodHRwczovL2lkcDEuZ2x5bmR3ci5h
+						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAKl23zJe5fEkR
+						3wCSeBWSWXeSLNxB6nTL3I89uJ+1M3RNyR2t56Zqhx5g/7Iac4tbJs50FaUnGQ7x
+						I0WXrKJ8jit0gKWMjDY36SlfXkIWtH2VtW4WvxChLxCVur7y4zcKDtXxCDJvYAVl
+						W5Pe2l+xXc9nl2Pn17OA+idxL+asZ5tGuI3egcxNEfp4AuPYGnt9RhrhrOCo8Wv1
+						lg4GojfVyaGPZ9bi0dTsCl5PyU5tmUMsUOpi8/SxrD+KMB4gU+4fottmPKnowz/o
+						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>
diff --git a/swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.xml
new file mode 100644
index 00000000..4b81a4ad
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-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>
+      <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,iVBORw0KGgoAAAANSUhEUgAAAEsAAABSCAYAAAAclym5AAAABGdBTUEAALGPC/xhBQAACkFpQ0NQSUNDIFByb2ZpbGUAAEgNnZZ3VFPZFofPvTe90BIiICX0GnoJINI7SBUEUYlJgFAChoQmdkQFRhQRKVZkVMABR4ciY0UUC4OCYtcJ8hBQxsFRREXl3YxrCe+tNfPemv3HWd/Z57fX2Wfvfde6AFD8ggTCdFgBgDShWBTu68FcEhPLxPcCGBABDlgBwOFmZgRH+EQC1Py9PZmZqEjGs/buLoBku9ssv1Amc9b/f5EiN0MkBgAKRdU2PH4mF+UClFOzxRky/wTK9JUpMoYxMhahCaKsIuPEr2z2p+Yru8mYlybkoRpZzhm8NJ6Mu1DemiXho4wEoVyYJeBno3wHZb1USZoA5fco09P4nEwAMBSZX8znJqFsiTJFFBnuifICAAiUxDm8cg6L+TlongB4pmfkigSJSWKmEdeYaeXoyGb68bNT+WIxK5TDTeGIeEzP9LQMjjAXgK9vlkUBJVltmWiR7a0c7e1Z1uZo+b/Z3x5+U/09yHr7VfEm7M+eQYyeWd9s7KwvvRYA9iRamx2zvpVVALRtBkDl4axP7yAA8gUAtN6c8x6GbF6SxOIMJwuL7OxscwGfay4r6Df7n4Jvyr+GOfeZy+77VjumFz+BI0kVM2VF5aanpktEzMwMDpfPZP33EP/jwDlpzcnDLJyfwBfxhehVUeiUCYSJaLuFPIFYkC5kCoR/1eF/GDYnBxl+nWsUaHVfAH2FOVC4SQfIbz0AQyMDJG4/egJ961sQMQrIvrxorZGvc48yev7n+h8LXIpu4UxBIlPm9gyPZHIloiwZo9+EbMECEpAHdKAKNIEuMAIsYA0cgDNwA94gAISASBADlgMuSAJpQASyQT7YAApBMdgBdoNqcADUgXrQBE6CNnAGXARXwA1wCwyAR0AKhsFLMAHegWkIgvAQFaJBqpAWpA+ZQtYQG1oIeUNBUDgUA8VDiZAQkkD50CaoGCqDqqFDUD30I3Qaughdg/qgB9AgNAb9AX2EEZgC02EN2AC2gNmwOxwIR8LL4ER4FZwHF8Db4Uq4Fj4Ot8IX4RvwACyFX8KTCEDICAPRRlgIG/FEQpBYJAERIWuRIqQCqUWakA6kG7mNSJFx5AMGh6FhmBgWxhnjh1mM4WJWYdZiSjDVmGOYVkwX5jZmEDOB+YKlYtWxplgnrD92CTYRm40txFZgj2BbsJexA9hh7DscDsfAGeIccH64GFwybjWuBLcP14y7gOvDDeEm8Xi8Kt4U74IPwXPwYnwhvgp/HH8e348fxr8nkAlaBGuCDyGWICRsJFQQGgjnCP2EEcI0UYGoT3QihhB5xFxiKbGO2EG8SRwmTpMUSYYkF1IkKZm0gVRJaiJdJj0mvSGTyTpkR3IYWUBeT64knyBfJQ+SP1CUKCYUT0ocRULZTjlKuUB5QHlDpVINqG7UWKqYup1aT71EfUp9L0eTM5fzl+PJrZOrkWuV65d7JU+U15d3l18unydfIX9K/qb8uAJRwUDBU4GjsFahRuG0wj2FSUWaopViiGKaYolig+I1xVElvJKBkrcST6lA6bDSJaUhGkLTpXnSuLRNtDraZdowHUc3pPvTk+nF9B/ovfQJZSVlW+Uo5RzlGuWzylIGwjBg+DNSGaWMk4y7jI/zNOa5z+PP2zavaV7/vCmV+SpuKnyVIpVmlQGVj6pMVW/VFNWdqm2qT9QwaiZqYWrZavvVLquNz6fPd57PnV80/+T8h+qwuol6uPpq9cPqPeqTGpoavhoZGlUalzTGNRmabprJmuWa5zTHtGhaC7UEWuVa57VeMJWZ7sxUZiWzizmhra7tpy3RPqTdqz2tY6izWGejTrPOE12SLls3Qbdct1N3Qk9LL1gvX69R76E+UZ+tn6S/R79bf8rA0CDaYItBm8GooYqhv2GeYaPhYyOqkavRKqNaozvGOGO2cYrxPuNbJrCJnUmSSY3JTVPY1N5UYLrPtM8Ma+ZoJjSrNbvHorDcWVmsRtagOcM8yHyjeZv5Kws9i1iLnRbdFl8s7SxTLessH1kpWQVYbbTqsPrD2sSaa11jfceGauNjs86m3ea1rakt33a/7X07ml2w3Ra7TrvP9g72Ivsm+zEHPYd4h70O99h0dii7hH3VEevo4bjO8YzjByd7J7HTSaffnVnOKc4NzqMLDBfwF9QtGHLRceG4HHKRLmQujF94cKHUVduV41rr+sxN143ndsRtxN3YPdn9uPsrD0sPkUeLx5Snk+cazwteiJevV5FXr7eS92Lvau+nPjo+iT6NPhO+dr6rfS/4Yf0C/Xb63fPX8Of61/tPBDgErAnoCqQERgRWBz4LMgkSBXUEw8EBwbuCHy/SXyRc1BYCQvxDdoU8CTUMXRX6cxguLDSsJux5uFV4fnh3BC1iRURDxLtIj8jSyEeLjRZLFndGyUfFRdVHTUV7RZdFS5dYLFmz5EaMWowgpj0WHxsVeyR2cqn30t1Lh+Ps4grj7i4zXJaz7NpyteWpy8+ukF/BWXEqHhsfHd8Q/4kTwqnlTK70X7l35QTXk7uH+5LnxivnjfFd+GX8kQSXhLKE0USXxF2JY0muSRVJ4wJPQbXgdbJf8oHkqZSQlKMpM6nRqc1phLT4tNNCJWGKsCtdMz0nvS/DNKMwQ7rKadXuVROiQNGRTChzWWa7mI7+TPVIjCSbJYNZC7Nqst5nR2WfylHMEeb05JrkbssdyfPJ+341ZjV3dWe+dv6G/ME17msOrYXWrlzbuU53XcG64fW+649tIG1I2fDLRsuNZRvfbore1FGgUbC+YGiz7+bGQrlCUeG9Lc5bDmzFbBVs7d1ms61q25ciXtH1YsviiuJPJdyS699ZfVf53cz2hO29pfal+3fgdgh33N3puvNYmWJZXtnQruBdreXM8qLyt7tX7L5WYVtxYA9pj2SPtDKosr1Kr2pH1afqpOqBGo+a5r3qe7ftndrH29e/321/0wGNA8UHPh4UHLx/yPdQa61BbcVh3OGsw8/rouq6v2d/X39E7Ujxkc9HhUelx8KPddU71Nc3qDeUNsKNksax43HHb/3g9UN7E6vpUDOjufgEOCE58eLH+B/vngw82XmKfarpJ/2f9rbQWopaodbc1om2pDZpe0x73+mA050dzh0tP5v/fPSM9pmas8pnS8+RzhWcmzmfd37yQsaF8YuJF4c6V3Q+urTk0p2usK7ey4GXr17xuXKp2737/FWXq2euOV07fZ19ve2G/Y3WHruell/sfmnpte9tvelws/2W462OvgV95/pd+y/e9rp95Y7/nRsDiwb67i6+e/9e3D3pfd790QepD14/zHo4/Wj9Y+zjoicKTyqeqj+t/dX412apvfTsoNdgz7OIZ4+GuEMv/5X5r0/DBc+pzytGtEbqR61Hz4z5jN16sfTF8MuMl9Pjhb8p/rb3ldGrn353+71nYsnE8GvR65k/St6ovjn61vZt52To5NN3ae+mp4req74/9oH9oftj9MeR6exP+E+Vn40/d3wJ/PJ4Jm1m5t/3hPP7MjpZfgAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAi9pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx4bXA6Q3JlYXRvclRvb2w+QWRvYmUgSW1hZ2VSZWFkeTwveG1wOkNyZWF0b3JUb29sPgogICAgICAgICA8dGlmZjpZUmVzb2x1dGlvbj4zMDA8L3RpZmY6WVJlc29sdXRpb24+CiAgICAgICAgIDx0aWZmOk9yaWVudGF0aW9uPjE8L3RpZmY6T3JpZW50YXRpb24+CiAgICAgICAgIDx0aWZmOlhSZXNvbHV0aW9uPjMwMDwvdGlmZjpYUmVzb2x1dGlvbj4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CrAWjfkAABEMSURBVHgB7ZwJkJ1FEYA3m2NDwiEhCYkQgkKhKJcgyCUmRLQQpZRT8YCCUlQUCxWkULBAOQSqQFAKRUSEWIBBQAqIECwBEeQu7iOCEI5oSEggEEg2G79v3vTL7HOP9/bI3VX9uv+enp7unp755//f2x3Q1H/QjGmxtWaIsQMHDtx+yZIlOw4YMGAr2sbDj4Ifl/VVn43sP8hegX8KfIA+9y5cuPAx+MVgwECYJWBbCPqTDugn44Oxu6iwPZpg9+X6YHA3cK3cNo+kvEJSZnI9C3wTtO8IcDRtY2kbC5/85Prp5ubm65FdsWjRovuQB9hu0lYqsJIGFR5vSZLOA+eDS8C54J8I+Fvo7AyOAruasOG0b0Gf/QYNGnQO/R7NdrR1O/g52iPxXdlBbcWCMkljCOwsgpmXg7sN+iXcHd2NywbcVdDNgwcP3hlbTsDr2macEwqbXfUt1JYv69JJQACHEMAsA8nB/CTaCqq+aIKtxkhSSZW7J6mjrnwVhgwZsk0e4/KqsGKruOxbVod6Cwbj/rQWzl8MnQzOZF85BSq4Hwkt4BDQhKgvuvm7Obvf1KJyN3N11JXX32FgE5v9DMjr4DteLwvobbJMlMFsQjXdCT0cnNzW1rY111PghbUrJAW8EL43G7EJjOSsC2/yexsDJuoDg+0pRKK2JDF/pZLGcLf6Bom6UINQ72iCyQywqnqTLO1oQ9Bub20lQ/V+9DRZKVEtLS1btLa2/p3BTMynSdANUPeXWDawqw70pISjokaTqJtJxQiqaq/FixebKO2124hXnVQ1vt5NRFpWbOZXwI8HDyBp06C2uSzKEzaXqw40sgzdK9JjBXvUqfAT2aNOYOldDW9FmSgx9hTYVQsaWYapcjhJ78Gy8yA4lUSdntOhnZTIVSs97aOpN1nqufwGkKDzoIvYo47Kprx9p6WZr1dZUu8yTJXD8vsaVbUty+8HZORZ0P6enVYLqKeyYlP35Hw8OCNXlwlyj1ptoJ7KMqGLufsdBN2Uqjoa+jZo39Vi+RFngu4qy6rygCkcAc6jqnz2E1arqjLg7pIV7duiuzt4JTgHFNYkq5KH6mecqz6phM09Ho6tuFX+qFDNQmaicmrlXpuQdBr3cQZ+Nif1e20AVtmDZyW8jj+7SlYkxIfk7cF7wLnZzGq3BI27q2SlvPAa9z0wI7gL3pcElapa7ZagsXd7dODut5mKLMUnpYDLs5EjQ0xI7HNWZVSt9hoB+8b4YbeeKne80He86FP6oazLIugsWRpJHamocSTKZM1wlB5AvNmMI0gPTLTrEvYWIDXAMuB2ivnCdvV6/Taks2Q5TmR/pBc86rwmBbpzrqK19HO9zG4AdQLqCXBp7/acfX256N7pN0VWWfgJ2yHY7vt/v1YLXWMQo5LkPWi/BXYKnSWraoiKcpDFfEGgsUbAsl9I/x9z+veh2yD7Cgw6kuAXsx1BNSGM/yUULgDfAJXPZ8W04pvv8bWzAfzPudt/F15QJxKbBH50lqyqAoxBh3OlvDvePoNw4hkcewA+vgz9Pye6M1TTrj8uae3tA1pdHYHjGLRbyEv4MA3WxLrffgKZlX49OB8cwd78FLRHELPSxPurs5kZB35/ttRdhfjKxn6724/la1X1B6yHfb/pvqQwXm7iIU4JiwspfaaAL8PWttVel93a3SHaNYQhMh5nK0u2JzA0dzKQLp2p03isBr9i6yg5tWaikssK3BAlbxAx8dEWurU20nUMXNtop+QI5eoMOBsb8sJPtkuDKtRAJChoTXPDl2EnaL0GjMcAWliSY4jrv/ANvYvramaSMxh9Tm8YYHMp4B2kEUcjudK+Qv0Iu/KNwEhiejcdni061WWr22Rxh9Cod7XtsvFGk1X4tPxZ9tLN8GIYk/9w9sYc9DpZYeAFDD9Jsj6C0VjbjVRW9mm5EyfZb8p3knLjuVcKGEvEmgSdfXRVWa7vZIhE3UbC3sf1ltnQypYsJzltuMTycfi5rJiHGo2lq2SZ7bgBTNUws7F3HmBlW4oR5zj8nwjeCsZLzFRxOa4uSRjpTCmVJ3fB2ynUF1HyJCysTMlyFaSqYrI/A+858CpQsBj6LFmedi3h+TxKT6aEt2GDnMS10F2iK1rL/1M/IyFHwr/C5KeV0qhr9QScdFrbWi/ROHvX9/IgJnJl2LuSj5wT93Wy8f9X+P06aFyp4qB1QT3JiqT47HQRuDfVtWe2HntaXYMtByXj038n+WTIG9wNjUFwxdR1F0zafNSTLA1quInyPR3SysBneg34QJva0tWK95HiY6/6OlW1HX6fhos+keizvjcE9SRLg7F3PceAP+J6Bxw4Lo9kma+Iy9HnPv0eT6LOxe8nqapzss89IvUmS+OpZBnQqrobB37mz6zhdSgeSGFXCHB7SJXDXvVb+BarC+pbVn1taK9CP0EjyfKOohNLWI6HQltJnL/N8gneB1JvyUJD+0ClS599xpbhBPqa6CzInlTViRxCb4M33tQGbRgaSZbGHcj1/jS4P/huZs4XaMNAE+asLc8lWa0aKuk7JOn7+DOFSf0pVNC3Hk9mo8lyQAcbQHX9GWd8sbcjCfPcMhy09GNJ9tgpbDQCMY7jOmE+aRzlPgV7J35+WRngqujR8ku9e/FRvQPi2DEkyzeiD2Jvo7DJEpiQ5XEuc2L6ouoMWtgI+2+Bv0tX+QM/TnRc8C5E8cIy+pSqy5SvJgzHvpodnA1Nz49s/jsow3mXgtAfyVrAGBdXzDf5mvlKxwRvRBZ/rBCVntV6TnqyDGM0SzoljFK/iLL/JNfO4I0miH3Cjb8EdfuissJnqTedNqp4F8Z8BP4g/DgHfz4F7xcRJqrh8xR9+g10OgLYmFmdmmf3NSlB+DwWoJ5JC/S6swQqF8s+pf762J8Bvu044BvggegHLPelF47UUoOqOofTR4AvgiZrOvQw2mP/gG0HkQz7B5rMMjHtOrDEd8JmLDkT5VlqTKFU9aWQrXBs6eQIEvVDcKZJA18Ffw1+uiaweoJYyz0QW8fT/z5Qe+KUfDAOG5HkuO5T2tkS6M0gURFxm96AIA9kL/kyRnfNht+CPgo+wvHjGdp8XpsHXci1/YdDR9PP37B+gOttwbjTvoTe1RwyL0X2ABhgomLMkPUp7Y9khYM6L5QBbEUCJhDsx0jCh6Cb0N7d3epVdJ5A9x/QW0mSRwI37wCr2THivBXyPqf9maxwNpZG7V2pBYWx3MnGWkXw/oDERyYDf5PkzCaxM/mNhVX3GlhC2PSJot+TFAMvi2TFWC4vgzS4njyf2d8q8rjQk/506x0sy2SVnhq4GONHdUhDFlSZWC5nLtfAmgysycCaDKzJwJoM9FEGvOPEXUeTcVfqyHzodaXTUb/uZNqtvTN6POjrcbrzY4Vv99wUk1A6a/LiCaCUr1B8R47XK2s0kDIZ8p7g16kxUurUNC2zy2r8A3ikOIlhh0On8dx1C7yNsQR01sPgeNq/Al2bx5NLeQR5HL7U47IhsHJcav43pEN5tJnEI894rv25tV+GXM8LvMlQv7oKH2CXKcQblKVPC8XrjvOzK+X+4bOaXylNKvQOyXoGUc16ltVDUrX4TopElf8PK167BL0OY+tng6lPPcb7SSfFaWJS5pjRjn58HxXmQ7C/7hXSNygVtt2ntmqxNpnxhmATK4cxP0hFTQe/BT8R3As8DTtW1L5M0IVQbVjd2i5BeXfjqR964UtcR9+Qh+0YZ3Mm8wR8+AIN5qHZXyH7989LqB6/aRbKzun1CW17oPOOemC8uo3ZVj/4ZKD4CIcUVe1i4xfawpmnkG9R6CeWti/aLjL2xNxevsrRbtVe0V9ZBFuIq6x+1vYrfaz2Zewbsw/nRe/ybhRGNGgmRXmrqmoEPqCS7creEw+5vnbxLx+sPl/wuS8J2nYsbW0Kfhb0Lx+sIvcox4kx/J8Rk0mkv1F4gX30n7QJsXeoG+Mpj9fV/owo/NaWYzuusoDop1xf3wbDR/uUuskuVT8PeYLYxPxhahgKp1SIJVfKKj2XJjL9NQVGDwd3I8CRKLikHwR/T+B+xR+JtZK353oj8FXaboEKOm8ipf6RAe60mciASFDQoSTT/zHxeRQ2B+33L8a/in6/gnd8K3ER4+0HPZK2O2i7lEo9GuovAJ2s6ZCr8eMyqDFitvkU5BPgtSscgg1/qT1Q59tAl8QZqamDDwbYDZ1YhgdkFR3X+jftn3ER14/B+749ybj29wZV4Pq43PY3hDFZzqoBdwWhuzb9ry3sP4rN8kbxJ4zEX3U4kWdm3TnoPZN5/4wlfJb+MgaGvzW3pe2p1CuTZZAXg5cVOBn+N+BfwOh8cBjGkUnIU7Khl/P/tN5Hm+Xte/fTkYVDh0Uf5Gdn+RUhg6bEQ4dxl9wO3BHcAfu7yCOPpWbwZ+T+L0H9QtfxWuD3A1MSGONoZAngT8r6FoR93AL8JsifHVwTbdidWOnR9N78/wTvyW0XDx06dDyyrUyWAUUiIriu6BezUfv+Ife/G1l8AxzNtt+Q2+9CmCqH6wuy7JKqYq4EE0Ob3/85/pugy2gOgeyZdf1e8hXQ9uqkhZ0ikVORpUokQSdnfWPcJ3Qz3QJZ+o+X6B1TtiGfZj/7h1yDsZ/czrq+lms36NjonPH5rOEtoUeAUQGwTeNAZ92fILov+SVC3LG0uwD5VPr67fDWoHc9736xoVoRATHeIvrMoo/7p5uv32qvjyzpkoyt4K2KNui7uN4V6j874z7Q+gbypIdM33yv/zKYJgnZdPaqO7gWnFj9nYX8VfpbubHMpcYZsQyDF1pCwYDdAM+pyNt/MuMfpu0wpBoxkCZko5DpuBvlC1LAtkiGcp0VhhPYGAJ6inHmIldmIsJeuoHwX20fRbYTaHW5Cf8RfAf91E5fEyA0I7uQ63QhRd8Y0jVtG8NEkGkwrr07J9+hToTg30NGe0VS2egdLyYw+iysJotyG0LwdohbqMpDQL/L8+dEAWFcPVEIWeVq6We0KzExwowKSX+/OAp+JhiO6aRffRm4/ypY1o9a+wuQXUb7HKg+2r8Z/9+Ehg3bhAi29CXs2S/4pJw/SlmVryar6FRt7ESW7FEFrnUd8o+GNknCSkJ0ysS4pDwr2TSPyZglQ0AP08+g/CHc7ty2p8AbsDNlPxNhVe4vBZSHT5GAVvqdhPw/KtTAOK6177lLsL9gYmJSkiB/dCQr24MfbGChHFTjotcxUFBEVf1/w7tsDMwlk841UHUtc5dKbKgP8fD9JDLhHvDOxDU1HQsdCarvmS4lisQeCf9RUKj6SIK0YcLWQScdbOEjkR5jvFO+AF6OPPacsqIQ1w2RD89/wkINRZlGQhy86oBaGSxvIahGfp8k/FMf9qSz4A1cOyNx+FzoBFC4AFTfDdjxbBP8gccU8ED2QI8KuxGwh0L3zgjS8cLH6fDXgE7QsehPkBfgfa40ybY9AUmJh4a/YUOVEkIe8Udb2jawtRO+7YxwnBtjHBN+kbV0MpLl8tCRSYXeIVkvEdpOK9qeh/eWOyNktJ9c6EcCrIJvh06mLmuPCuHPX+H9L98+H+5V2HD53lfo3Q0vRr+b0F039Ol7am57DlnsvSkurkfRNsd2/Dkx90lbE7Lzc79kl/YHB/KxOUr/Bm9ij0nLCj5K0KSxzbT50+j14J+HXsf1S/Aate1WZI/D+zplO/C9oHeim8FjWToXQgUT5exJGWqJh7474D1tjwXtb9v9tJ2J3WOZ1QUiAftIMps2g5xL+7XI34EfDXXMjZH5Y7bz6Hc81Oc5l2Eb7SZufeg0fYWPSjLGZnzYAPoa7f5G9hlloEeT+5ENBBfDewef8T+nCE3wlp7+gAAAAABJRU5ErkJggg==</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>
+MIIDJDCCAgygAwIBAgIVAKN8lW+W0bwU2Fgdizh1Fc78eC1cMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcDEuaG9nZW50LmJlMB4XDTEzMTAwNzE0MzI1M1oX
+DTMzMTAwNzE0MzI1M1owGTEXMBUGA1UEAxMOaWRwMS5ob2dlbnQuYmUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpFqqWVjzACwe3pHH4Z+zxtqD0UjIF
+upRkh8638dhdPTsEAS/dIdoG9vI5Bo0o/3Mds/2Vcasih1aEtLpOZA5szGjbQyF3
+Bif6ExfNRc07D9o4o1wEzkkOEaNV6edkBJAENNnuFBZVES13FIhvyW673sdFMU26
+q/PTgXt+DVejhpdgkMtqTLaAbD3G4aViVeNIstuJcrIXwZv3YgD4lgU/fXNjjLDE
+Hk8DuL+aGVmalg37cnxNtq+i7O6lW3/yrLxExCOiFkdvcQq2lCfwECU41ira4M2o
+YuB0CDsYqK8rk3Btk4VueIDJsnivARPrJiRNSN7z1WhDjNe7M5pkC4E9AgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcDEuaG9nZW50LmJlhiVodHRwczovL2lkcDEuaG9n
+ZW50LmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQC4xxZFlWHXKtFqS2uu3pI
+8k+42jANBgkqhkiG9w0BAQUFAAOCAQEAXFNa7quzgSZt+SBCYhjI/5L5EF5ZkZv1
+VSViW5l/vIyFNfMZiXKKsZXZ55WfGePMbrnWh7l0GPlLzgRpFnLuBRS2+VwzWpzA
+H5KAS7a7R0rgvKd7/21l7XrRcBr6z/TNewOb8mpySJTH5M3in2PejUd5+Ae6PsU9
+PY4KiNwdLjzlzJPo/IBFLxiu70X5hTxip+OxTp7bxMleEG7PnlTzQIWMmBehHnDa
+YCtYQpTwBizo6WlwrYOpE/KWQRYL5BB/Q3aW2KeUy87jEpbgU/SojjBrp5y8wRsp
+4rV7/SlPD5jEYnPfqLEiiXz/yXbN2dNfvlO47aV2d/GdWvKDGnijBw==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpFqqWVjzACwe3pHH4Z+zxtqD0UjIF
+upRkh8638dhdPTsEAS/dIdoG9vI5Bo0o/3Mds/2Vcasih1aEtLpOZA5szGjbQyF3
+Bif6ExfNRc07D9o4o1wEzkkOEaNV6edkBJAENNnuFBZVES13FIhvyW673sdFMU26
+q/PTgXt+DVejhpdgkMtqTLaAbD3G4aViVeNIstuJcrIXwZv3YgD4lgU/fXNjjLDE
+Hk8DuL+aGVmalg37cnxNtq+i7O6lW3/yrLxExCOiFkdvcQq2lCfwECU41ira4M2o
+YuB0CDsYqK8rk3Btk4VueIDJsnivARPrJiRNSN7z1WhDjNe7M5pkC4E9AgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcDEuaG9nZW50LmJlhiVodHRwczovL2lkcDEuaG9n
+ZW50LmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQC4xxZFlWHXKtFqS2uu3pI
+8k+42jANBgkqhkiG9w0BAQUFAAOCAQEAXFNa7quzgSZt+SBCYhjI/5L5EF5ZkZv1
+VSViW5l/vIyFNfMZiXKKsZXZ55WfGePMbrnWh7l0GPlLzgRpFnLuBRS2+VwzWpzA
+H5KAS7a7R0rgvKd7/21l7XrRcBr6z/TNewOb8mpySJTH5M3in2PejUd5+Ae6PsU9
+PY4KiNwdLjzlzJPo/IBFLxiu70X5hTxip+OxTp7bxMleEG7PnlTzQIWMmBehHnDa
+YCtYQpTwBizo6WlwrYOpE/KWQRYL5BB/Q3aW2KeUy87jEpbgU/SojjBrp5y8wRsp
+4rV7/SlPD5jEYnPfqLEiiXz/yXbN2dNfvlO47aV2d/GdWvKDGnijBw==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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">
+    Hogeschool Gent
+    </md:OrganizationDisplayName>
+    <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>
diff --git a/swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..aa8e3359
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml
@@ -0,0 +1,84 @@
+<?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>
+      <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="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>
+					      MIIDGzCCAgOgAwIBAgIURV2xPGuF9dQa7PmIF3FCjmDqotcwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLmlucmlhLmZyMB4XDTEzMDEwMjEyMDgwNVoXDTMz
+MDEwMjEyMDgwNVowFzEVMBMGA1UEAxMMaWRwLmlucmlhLmZyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh/Lk4H48LdeM8wIMNRx00gWGRpoQTmcJe7T1
+3eJmrJqNDEEdyXTcPF/JBJl/bvFhpQ9Z8ghoVvZh8To4mouhXca2S3p4rN3PNN/C
++3Mg6ZH6VRH+/2rcVJGadS8ufwmt0JQ3dKdx9miitZ18bYkVTFENQxAO2WKf7lcb
+/gWvIGAQS3WjlnRq4Ph2NCfrGdJv0/dEJd6CmcwjBrMW8K6pqewb3A8a29PNzg7j
+VqbM1lsUzKaHbNFpqjk9f9Mw2yXRxHVadcfJT4t68VtW36swQxy7JoIbUXq2SbRS
+7SjnpweA8Wa5DlPtnBkCWBq8XJVVL1qKRxjaqXEpa5DntGKJYwIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAuaW5yaWEuZnKGI2h0dHBzOi8vaWRwLmlucmlhLmZyL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ01t65p+DndQh2JA0x/QtU8z3glDANBgkq
+hkiG9w0BAQUFAAOCAQEAg6KQHU2mU6TYO47bhaKdRPmXaKS61rUYWi761wg3DtZS
+jrquH6YxroUNbQIBwjx2HZOY+rMcBxXhvm1O3rtjDU5cjA0USs7/xmAmtUOGT4sj
+n4d2iWIp/lvoi1JeqU2Gq4cqBYA3yk+nIKx6BIYVS79HsB5l59Gp2dBneB+iSjTP
+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>
+					      MIIDIDCCAgigAwIBAgIVAMvLhIH/kO4Uk4hR9sz1+w7AbaK+MA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcDEuaW5yaWEuZnIwHhcNMDkwMzI0MTcyNjQ1WhcN
+MjkwMzI0MTcyNjQ1WjAYMRYwFAYDVQQDEw1pZHAxLmlucmlhLmZyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApyhY2Zv7OX6n0tXylUfpgQ6TTekJ1qvH
+sCzxArvcDSIbkmasOeR+tWD96A3/NAAzoT9qUVQGW9jhViWXOHbWnCpy+oGyR558
+CwLKyW3s64eLpmCPcQEeJRZ5qrRnwFJf3NaitBrgTnZgP33f+5Rqj9nubSF6kWvO
+P3V8yYSWhOTZHSfQ2ABPDXlHjbeIdgQlCtJm5wBNl9G3359U7Nbd2LFSOZI/fc5N
+Ohgv+QxShMRMnSHdZ5aovS1YwY6Gpu7d5gF30NBW/nZJLv3Bl7RzK6RBcCEomKfC
+Za7mrsZsvLHkgaTvgnSJK6Cvvj7lwKVtThOJ/s2Qot+WifQGZlpoCQIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHAxLmlucmlhLmZyhiRodHRwczovL2lkcDEuaW5yaWEu
+ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFET2ENke8iQOFpTy3U4iYfalAyhv
+MA0GCSqGSIb3DQEBBQUAA4IBAQBNFi0mEBlSLzyUGNlZrqwjNe5mELigcT+FUuvS
+bLwPj+SY2L3iJ55R8rGXzfYDXk93JrvosPZsBJadOkcLmELb9N/xcYqj9J89Riee
+lrh4lR5aj2HC041cwoiT8X8Dof0Js6eeu6rKY/R3zONDPhhLBYvfw8NiMwufbKwF
+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://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Guillaume Rousse</md:SurName>
+    <md:EmailAddress>guillaume.rousse@inria.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <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
new file mode 100644
index 00000000..6f5bb184
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.ioe.ac.uk-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN37KVPn30CW2BIleDIha2CleSXGY0a6
+						1OA/eOLI+lsBvug487BAw/Rcf9Y7ooF3D8JIOxixwX1USXFyNCl0sf7/718UVpe0
+						GxtcPYw/NwhtyVpQH+OqE/vh56pKw1o3WPnrFSHmj6/vSg0Pj1R0OFdvn+hoV+JC
+						5POvdSBVkhS8KrRqse9Cr/CdYSmoQ55J1YCgiWngimPtes1zY4s2omZS9kEIi2Px
+						Shhgne1ZG3zR/4b6OXoEOr8K0LfAaPqsKYhwOzXXez6mYKak0rImeVqTdpk0Slyh
+						NNYx7OsA++h2CmAgPOnevOjFNy7sbJ1GT1dAeRE3O+uDcURIgdZokf8CAwEAAaNj
+						MGEwQAYDVR0RBDkwN4IOaWRwMi5pb2UuYWMudWuGJWh0dHBzOi8vaWRwMi5pb2Uu
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOLtRIRYnBMYIo5SxgAJChkg
+						ZhbtMA0GCSqGSIb3DQEBBQUAA4IBAQCze9F7kn4uxmMTTyIel3fByZZNSmFj/blC
+						UIOvCuuKWes5c7gMXCWP0INVj1ndi02zhdFxu6SoCDESy0kpGsYupcWNXMdUuNSA
+						WnqbU+OfQ8byNGcnFf0p8TuHwANOaPWCK3Irthu2JXvm9mBe35Ghzf1uNOKkKP2i
+						skDYHKQbL5LBKXJoDqtQeFtZSUHR1pwrcN8o25QPQzfRpgWhqA9pp9DscbLhzgSu
+						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>
+						MIIDIzCCAgugAwIBAgIUMNyG7wrtkwxFGRAstVzy1ROpxGgwDQYJKoZIhvcNAQEF
+						BQAwGTEXMBUGA1UEAxMOaWRwMi5pb2UuYWMudWswHhcNMTIwMjA4MTUzMjM3WhcN
+						MzIwMjA4MTUzMjM3WjAZMRcwFQYDVQQDEw5pZHAyLmlvZS5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN37KVPn30CW2BIleDIha2CleSXGY0a6
+						1OA/eOLI+lsBvug487BAw/Rcf9Y7ooF3D8JIOxixwX1USXFyNCl0sf7/718UVpe0
+						GxtcPYw/NwhtyVpQH+OqE/vh56pKw1o3WPnrFSHmj6/vSg0Pj1R0OFdvn+hoV+JC
+						5POvdSBVkhS8KrRqse9Cr/CdYSmoQ55J1YCgiWngimPtes1zY4s2omZS9kEIi2Px
+						Shhgne1ZG3zR/4b6OXoEOr8K0LfAaPqsKYhwOzXXez6mYKak0rImeVqTdpk0Slyh
+						NNYx7OsA++h2CmAgPOnevOjFNy7sbJ1GT1dAeRE3O+uDcURIgdZokf8CAwEAAaNj
+						MGEwQAYDVR0RBDkwN4IOaWRwMi5pb2UuYWMudWuGJWh0dHBzOi8vaWRwMi5pb2Uu
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOLtRIRYnBMYIo5SxgAJChkg
+						ZhbtMA0GCSqGSIb3DQEBBQUAA4IBAQCze9F7kn4uxmMTTyIel3fByZZNSmFj/blC
+						UIOvCuuKWes5c7gMXCWP0INVj1ndi02zhdFxu6SoCDESy0kpGsYupcWNXMdUuNSA
+						WnqbU+OfQ8byNGcnFf0p8TuHwANOaPWCK3Irthu2JXvm9mBe35Ghzf1uNOKkKP2i
+						skDYHKQbL5LBKXJoDqtQeFtZSUHR1pwrcN8o25QPQzfRpgWhqA9pp9DscbLhzgSu
+						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>
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
new file mode 100644
index 00000000..15ee57a2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.proofidcloud.co.uk-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?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>
+      <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>
+						MIIDSDCCAjCgAwIBAgIVAO42NKVQT3aOFGBFVBQbZ5n2yNhCMA0GCSqGSIb3DQEB
+						BQUAMCIxIDAeBgNVBAMTF2lkcDEucHJvb2ZpZGNsb3VkLmNvLnVrMB4XDTE0MDcy
+						OTA5MjU0MVoXDTM0MDcyOTA5MjU0MVowIjEgMB4GA1UEAxMXaWRwMS5wcm9vZmlk
+						Y2xvdWQuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCygPFc
+						+Y88TUGNchadaZmOW1iHZdenETJvkgYAbAa3jKaKkUXzN36EAmwTw2xMZEhjRofI
+						vfxdK8L1Pq12ohcDErK26/tTXPLeECsKXv1L4DOClQYCmi3pSHSoXuznWwKQdifq
+						hbU0Qu2+Sf/fGaEt3h2+/hwgwKuS+IRv39/XwHab6i+VfU76BpkKfL8z1YBftha7
+						gguvXYYMq+OcNR5Js4V4vZNsNTLdrWg2SrWG9aoyChHeQBE0D0piBbKH7qftAkN9
+						98ABxnZMYbRQK7jXBybRlRl/fKjdXXZOl2pP3J6yco8+LAzAokWB/vCCh5W2FKW4
+						1h0aej05wepq/5KRAgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcDEucHJvb2ZpZGNs
+						b3VkLmNvLnVrhi5odHRwczovL2lkcDEucHJvb2ZpZGNsb3VkLmNvLnVrL2lkcC9z
+						aGliYm9sZXRoMB0GA1UdDgQWBBTpX6QnFh6Olp5+tHJlBUytNeIhezANBgkqhkiG
+						9w0BAQUFAAOCAQEAJ8sa6jPg5IZ/00j/G1IJl15hCgMumyef27HNBA1yMpQhYwxE
+						vNiHPXenv98nPYe9y7YcC52E2ZmmTF91sAPKomfg029/iO6oJiSVVmVb9z8qu2Df
+						AtJxixzs++rAvosd/0lV3EXUgrwdmq3Gp3HnbRuwodu59oPtOlOb3yqa8x1BHYD3
+						kHvJhFKX+LrKTZiw6kNl9wQyNSaQ/MpFNcweLU+Se40qchjKpUDZtYKg/UxZToux
+						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>
+						MIIDSDCCAjCgAwIBAgIVAO42NKVQT3aOFGBFVBQbZ5n2yNhCMA0GCSqGSIb3DQEB
+						BQUAMCIxIDAeBgNVBAMTF2lkcDEucHJvb2ZpZGNsb3VkLmNvLnVrMB4XDTE0MDcy
+						OTA5MjU0MVoXDTM0MDcyOTA5MjU0MVowIjEgMB4GA1UEAxMXaWRwMS5wcm9vZmlk
+						Y2xvdWQuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCygPFc
+						+Y88TUGNchadaZmOW1iHZdenETJvkgYAbAa3jKaKkUXzN36EAmwTw2xMZEhjRofI
+						vfxdK8L1Pq12ohcDErK26/tTXPLeECsKXv1L4DOClQYCmi3pSHSoXuznWwKQdifq
+						hbU0Qu2+Sf/fGaEt3h2+/hwgwKuS+IRv39/XwHab6i+VfU76BpkKfL8z1YBftha7
+						gguvXYYMq+OcNR5Js4V4vZNsNTLdrWg2SrWG9aoyChHeQBE0D0piBbKH7qftAkN9
+						98ABxnZMYbRQK7jXBybRlRl/fKjdXXZOl2pP3J6yco8+LAzAokWB/vCCh5W2FKW4
+						1h0aej05wepq/5KRAgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcDEucHJvb2ZpZGNs
+						b3VkLmNvLnVrhi5odHRwczovL2lkcDEucHJvb2ZpZGNsb3VkLmNvLnVrL2lkcC9z
+						aGliYm9sZXRoMB0GA1UdDgQWBBTpX6QnFh6Olp5+tHJlBUytNeIhezANBgkqhkiG
+						9w0BAQUFAAOCAQEAJ8sa6jPg5IZ/00j/G1IJl15hCgMumyef27HNBA1yMpQhYwxE
+						vNiHPXenv98nPYe9y7YcC52E2ZmmTF91sAPKomfg029/iO6oJiSVVmVb9z8qu2Df
+						AtJxixzs++rAvosd/0lV3EXUgrwdmq3Gp3HnbRuwodu59oPtOlOb3yqa8x1BHYD3
+						kHvJhFKX+LrKTZiw6kNl9wQyNSaQ/MpFNcweLU+Se40qchjKpUDZtYKg/UxZToux
+						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>
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
new file mode 100644
index 00000000..aa4e5d1d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.smuc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?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>
+      <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>
+						MIIEszCCA5ugAwIBAgIQOQbZ/hVy3cngzU8TZi5nbjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDQyNzAwMDAwMFoXDTE1MDQyNzIzNTk1OVowgY4xCzAJBgNV
+						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEzARBgNVBAcTClR3aWNrZW5oYW0xMTAv
+						BgNVBAoTKFN0IE1hcnkncyBVbml2ZXJzaXR5IENvbGxlZ2UsIFR3aWNrZW5oYW0x
+						DDAKBgNVBAsTA0lTQTEYMBYGA1UEAxMPaWRwMS5zbXVjLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmSHDm6l+m6vsX3qM8y4ygIG6YeAqRVe+
+						nYtG02luF0HXYoU8V+4tiXGV3XKjbJkNijF98PEsKdZuCQGqXkI46ZQp3DDbvPCw
+						+NnCRxqaAQiZPZijPL7kMqonmZmE/eLusvjI7Z11erN/X6GNum6hKwL+A2dFSUoI
+						/ZperSbM+eUyvhWGdLH7gPnjpS4eolKyqzngHnbO/mACwnVvtoCQt8gXNzbU+oHE
+						66+r5xFBqwQCRHIOo/Z5tDac92lmxN2iFJcPYmMmi+j2oHb6+VQ3iyzfMvxGc/pS
+						vyBiGREwE+9b3ErQW8jRLJRPyrkcO6h0ntZgz6yq3bUzBIPzKSUj2wIDAQABo4IB
+						YjCCAV4wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
+						FPSb9suL+QcK2oV9qNg5b8wEuqx6MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
+						AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
+						CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
+						BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
+						JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBoGA1UdEQQT
+						MBGCD2lkcDEuc211Yy5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEApVqOuRKi/EFJ
+						+msTvEzchsiFykp7K/VF5epkpl1ZnZx27/QYPtZmOACZBqcSkJ+n+XCMOle366vZ
+						2PygsEaqYpXGSuiXa/z2ITMCM0kZQDhYRxx1hESLzveYnLnDWvtIZs96PrktXUjJ
+						OwHGgoSNJBmkR5BG2HVQM7JBHF4bqrPxLvcJ63PKzHR9sDTVMlJwZ2/+pFhhfmnm
+						FI3TD9LxcjxmD8Xyfe+cUj0XznGKWWfQVPdpyrDYVPy6DLBL92xVXWYrG7/yiRlE
+						1jImVbZ61MANXa3joFrPpaM8Cpv+PKe/69ykr+Kz04q0crw9VVegu6/EP17/pZ4T
+						q+tjLFzgNQ==
+					</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>
+						MIIEszCCA5ugAwIBAgIQOQbZ/hVy3cngzU8TZi5nbjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDQyNzAwMDAwMFoXDTE1MDQyNzIzNTk1OVowgY4xCzAJBgNV
+						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEzARBgNVBAcTClR3aWNrZW5oYW0xMTAv
+						BgNVBAoTKFN0IE1hcnkncyBVbml2ZXJzaXR5IENvbGxlZ2UsIFR3aWNrZW5oYW0x
+						DDAKBgNVBAsTA0lTQTEYMBYGA1UEAxMPaWRwMS5zbXVjLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmSHDm6l+m6vsX3qM8y4ygIG6YeAqRVe+
+						nYtG02luF0HXYoU8V+4tiXGV3XKjbJkNijF98PEsKdZuCQGqXkI46ZQp3DDbvPCw
+						+NnCRxqaAQiZPZijPL7kMqonmZmE/eLusvjI7Z11erN/X6GNum6hKwL+A2dFSUoI
+						/ZperSbM+eUyvhWGdLH7gPnjpS4eolKyqzngHnbO/mACwnVvtoCQt8gXNzbU+oHE
+						66+r5xFBqwQCRHIOo/Z5tDac92lmxN2iFJcPYmMmi+j2oHb6+VQ3iyzfMvxGc/pS
+						vyBiGREwE+9b3ErQW8jRLJRPyrkcO6h0ntZgz6yq3bUzBIPzKSUj2wIDAQABo4IB
+						YjCCAV4wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
+						FPSb9suL+QcK2oV9qNg5b8wEuqx6MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
+						AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
+						CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
+						BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
+						JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBoGA1UdEQQT
+						MBGCD2lkcDEuc211Yy5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEApVqOuRKi/EFJ
+						+msTvEzchsiFykp7K/VF5epkpl1ZnZx27/QYPtZmOACZBqcSkJ+n+XCMOle366vZ
+						2PygsEaqYpXGSuiXa/z2ITMCM0kZQDhYRxx1hESLzveYnLnDWvtIZs96PrktXUjJ
+						OwHGgoSNJBmkR5BG2HVQM7JBHF4bqrPxLvcJ63PKzHR9sDTVMlJwZ2/+pFhhfmnm
+						FI3TD9LxcjxmD8Xyfe+cUj0XznGKWWfQVPdpyrDYVPy6DLBL92xVXWYrG7/yiRlE
+						1jImVbZ61MANXa3joFrPpaM8Cpv+PKe/69ykr+Kz04q0crw9VVegu6/EP17/pZ4T
+						q+tjLFzgNQ==
+					</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@smuc.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@smuc.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
new file mode 100644
index 00000000..1d3608e4
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.solent.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCF1dDGPEUijwsKsLzmVVbu
+						W4amy2HYiaCRRM9HOs1NIn4sYjG0aj5tnH1HUvbF8x2MfEGvsGidm1NLZoxIEjv8
+						/gxR5aswHfQjZp8ju1bffeCNzEftrFRMCvUiWxf7ThxQDsrDY9WcocOlr7BHEtVn
+						4NDqlaxjBKhRxgqZUrE+S2dvZfFYsR23AzwohJ2HLR+/3bxBhCBs+A/kQrgLMNvw
+						7Z7fPiu7OiUuS2Qjqz+4HHPm6k6RtqOtayKWfToHXS/b+Yxv8DEF3xQW+if6zZA0
+						zdjYIZ0hVa2ew2882rqRIlBKZpUcl6kdIWH7XjXvbzu8xkXG0ZRdXyVaRIPaY7fb
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcDEuc29sZW50LmFjLnVrhihodHRwczov
+						L2lkcDEuc29sZW50LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSPY2tD
+						4c7/NhioEVdldj0S9Y2EADANBgkqhkiG9w0BAQUFAAOCAQEABI2dIOAflt1WkYEJ
+						YUo+pk9+3xYoh6EPU8HF0a4aruul5jBLWpyZfrXWffjZtbGj1dYb5UNj/x7zzWOm
+						fIn7Tig2UjjkWL/81TSPLIPHG5QpR+UxRB8eUpsr8NslOwqP0brIRqgIyzNNQz82
+						IRtFzpE5SdI5Ds1lhhV5gQqSBSfuDimqrrmMMD2BQ/aAZgtnt6HfzCzDTv9o9K1a
+						ruMAOxdwGzOWgas6VmibPb/m2j/tibs37OMzpBtwUldqDjB2/WYmIhu4zXHrMj+6
+						/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>
+						MIIDMDCCAhigAwIBAgIVAMEcRei0mVIxnctKElMp/O387gtBMA0GCSqGSIb3DQEB
+						BQUAMBwxGjAYBgNVBAMTEWlkcDEuc29sZW50LmFjLnVrMB4XDTE1MDIxNzEwMzQx
+						NFoXDTI1MDIxNzEwMzQxNFowHDEaMBgGA1UEAxMRaWRwMS5zb2xlbnQuYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCF1dDGPEUijwsKsLzmVVbu
+						W4amy2HYiaCRRM9HOs1NIn4sYjG0aj5tnH1HUvbF8x2MfEGvsGidm1NLZoxIEjv8
+						/gxR5aswHfQjZp8ju1bffeCNzEftrFRMCvUiWxf7ThxQDsrDY9WcocOlr7BHEtVn
+						4NDqlaxjBKhRxgqZUrE+S2dvZfFYsR23AzwohJ2HLR+/3bxBhCBs+A/kQrgLMNvw
+						7Z7fPiu7OiUuS2Qjqz+4HHPm6k6RtqOtayKWfToHXS/b+Yxv8DEF3xQW+if6zZA0
+						zdjYIZ0hVa2ew2882rqRIlBKZpUcl6kdIWH7XjXvbzu8xkXG0ZRdXyVaRIPaY7fb
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcDEuc29sZW50LmFjLnVrhihodHRwczov
+						L2lkcDEuc29sZW50LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSPY2tD
+						4c7/NhioEVdldj0S9Y2EADANBgkqhkiG9w0BAQUFAAOCAQEABI2dIOAflt1WkYEJ
+						YUo+pk9+3xYoh6EPU8HF0a4aruul5jBLWpyZfrXWffjZtbGj1dYb5UNj/x7zzWOm
+						fIn7Tig2UjjkWL/81TSPLIPHG5QpR+UxRB8eUpsr8NslOwqP0brIRqgIyzNNQz82
+						IRtFzpE5SdI5Ds1lhhV5gQqSBSfuDimqrrmMMD2BQ/aAZgtnt6HfzCzDTv9o9K1a
+						ruMAOxdwGzOWgas6VmibPb/m2j/tibs37OMzpBtwUldqDjB2/WYmIhu4zXHrMj+6
+						/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>
diff --git a/swamid-interfederations-2.0/idp1.tees.ac.uk-entity.xml b/swamid-interfederations-2.0/idp1.tees.ac.uk-entity.xml
new file mode 100644
index 00000000..e6d1dd14
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.tees.ac.uk-entity.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						LmFjLnVrMB4XDTE0MTEwNzE0NDcyNFoXDTM0MTEwMjE0NDcyNFowcjELMAkGA1UE
+						BhMCR0IxFDASBgNVBAgTC1RlZXMgVmFsbGV5MRYwFAYDVQQHEw1NaWRkbGVzYnJv
+						dWdoMRswGQYDVQQKExJUZWVzaWRlIFVuaXZlcnNpdHkxGDAWBgNVBAMTD2lkcDEu
+						dGVlcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALYtu8Hd
+						0ebl2wTZoJD4DXAbzS9tsaInJFSen0GNIBmkf86Prolu2ZBL4q7hh2EGWNCeRn0l
+						O/rJY3jHEheh7Eqf3dIAxxQfYmqXF7Y7bFF4XBiX78MVFOQWG8L3SnZmo+oPehUM
+						RvPoO7/O70IEi//VSwuTXabOc9rCOYJh76eKCADG2NwqBC8GCXFaDUd/yFKwvsbn
+						VuuQM5dxldPS3GxSstYOtboBXOZjq3KUnq/xWUBec9CGmpl+pjh0cNiBeUrCl4ZD
+						uEU2tVMtYvLsw3HCH+bA2iySc8TsG9coGALPXdgK+YrLn/uT1qOR/4jU+0juysC6
+						e0ZFQv09zEbjvh8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAFmHTe0SznUBkYIpX
+						S8mKPbXQdzlwkh5xwA4PUvw8l8jBMUbB1V+BKY8Jj3yooYeRq9WMNSS6OaumMNHB
+						3/5snnFilOObbg2K4DgIaLFqTsfPX8qgJs7+YdYKSUpqfEYlQPBhS2rGQTcXCwZz
+						axeyFlce6yekzUlFQu5UUPP9/xb0S/p/UeULdiJ1gMHd3AlMUsIZ5elakM8IrQcs
+						59K1dFHJj/qUvkz7VGfKuDkHoW8hmDadDuTH9nl7Rlb1psKGeQTge0CDCMSTQlw5
+						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>
+						MIIDYDCCAkgCCQD+KLySSf4wXDANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJH
+						QjEUMBIGA1UECBMLVGVlcyBWYWxsZXkxFjAUBgNVBAcTDU1pZGRsZXNicm91Z2gx
+						GzAZBgNVBAoTElRlZXNpZGUgVW5pdmVyc2l0eTEYMBYGA1UEAxMPaWRwMS50ZWVz
+						LmFjLnVrMB4XDTE0MTEwNzE0NDcyNFoXDTM0MTEwMjE0NDcyNFowcjELMAkGA1UE
+						BhMCR0IxFDASBgNVBAgTC1RlZXMgVmFsbGV5MRYwFAYDVQQHEw1NaWRkbGVzYnJv
+						dWdoMRswGQYDVQQKExJUZWVzaWRlIFVuaXZlcnNpdHkxGDAWBgNVBAMTD2lkcDEu
+						dGVlcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALYtu8Hd
+						0ebl2wTZoJD4DXAbzS9tsaInJFSen0GNIBmkf86Prolu2ZBL4q7hh2EGWNCeRn0l
+						O/rJY3jHEheh7Eqf3dIAxxQfYmqXF7Y7bFF4XBiX78MVFOQWG8L3SnZmo+oPehUM
+						RvPoO7/O70IEi//VSwuTXabOc9rCOYJh76eKCADG2NwqBC8GCXFaDUd/yFKwvsbn
+						VuuQM5dxldPS3GxSstYOtboBXOZjq3KUnq/xWUBec9CGmpl+pjh0cNiBeUrCl4ZD
+						uEU2tVMtYvLsw3HCH+bA2iySc8TsG9coGALPXdgK+YrLn/uT1qOR/4jU+0juysC6
+						e0ZFQv09zEbjvh8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAFmHTe0SznUBkYIpX
+						S8mKPbXQdzlwkh5xwA4PUvw8l8jBMUbB1V+BKY8Jj3yooYeRq9WMNSS6OaumMNHB
+						3/5snnFilOObbg2K4DgIaLFqTsfPX8qgJs7+YdYKSUpqfEYlQPBhS2rGQTcXCwZz
+						axeyFlce6yekzUlFQu5UUPP9/xb0S/p/UeULdiJ1gMHd3AlMUsIZ5elakM8IrQcs
+						59K1dFHJj/qUvkz7VGfKuDkHoW8hmDadDuTH9nl7Rlb1psKGeQTge0CDCMSTQlw5
+						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>
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
new file mode 100644
index 00000000..8c77a3ad
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.themanchestercollege.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						LnRoZW1hbmNoZXN0ZXJjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAzVU6xLjziCjRY0eLzVtrjsHcpLtQdh8UJGyje3+Gm+bibxDW
+						z+NZm3VDSinORPUXIpZyXqPC8r7jHl5zpXCeCCONABfT2biKYraqXe6zj9UYEOfq
+						H3avpzgUvVx/+t9sUfqZq6IP2a+rPbN3ifc7zydBWkaKyymPm922EABECik1onEp
+						59gcFf+PkozaAE51Jid8Lp9YXjQq+OVp9NjfqSXUGYjSRnxH23zws98180CDCBj4
+						nWlLaFDlpPcs9AcVo30WDm2qIC93BOCThmSh/az2+80fpxVPGf3wpcPuZ11XflST
+						FcvbRhADY05pwLXOgztbYNOhtS3qZkIFEce32QIDAQABo4GGMIGDMGIGA1UdEQRb
+						MFmCH2lkcDEudGhlbWFuY2hlc3RlcmNvbGxlZ2UuYWMudWuGNmh0dHBzOi8vaWRw
+						MS50aGVtYW5jaGVzdGVyY29sbGVnZS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNV
+						HQ4EFgQUWXjSvL0zVIJ4O/L6c+kNL3oyemgwDQYJKoZIhvcNAQEFBQADggEBAJGR
+						wXOT7JS6jYsWFDbUgEOUKu8qHBafTZMb3lHKqEF+i9VOxSSyquc5Z3pzJjBjlpaY
+						514MqXswU4oZvCrKJDqfj47ApBSbLvZm4A0cjx7xQqwRSYfmszi0B/W46Xrt32Sc
+						wxcVAoj3upfUigH4SfeixJvOOuk0XibWWz27Gu+B1YCRRfenE/mpGwwaRn5ccOKe
+						uV+M/JapELbKFiAzi/qTuUHV08+i/2Teqv9+0el+zTyT7dXPhtBRZR3iN/yiunX4
+						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>
+						MIIDajCCAlKgAwIBAgIVANqzJLQBsPCEFgsQ4b4IALk9qGiiMA0GCSqGSIb3DQEB
+						BQUAMCoxKDAmBgNVBAMTH2lkcDEudGhlbWFuY2hlc3RlcmNvbGxlZ2UuYWMudWsw
+						HhcNMTMwMTIyMTUzNjE5WhcNMzMwMTIyMTUzNjE5WjAqMSgwJgYDVQQDEx9pZHAx
+						LnRoZW1hbmNoZXN0ZXJjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAzVU6xLjziCjRY0eLzVtrjsHcpLtQdh8UJGyje3+Gm+bibxDW
+						z+NZm3VDSinORPUXIpZyXqPC8r7jHl5zpXCeCCONABfT2biKYraqXe6zj9UYEOfq
+						H3avpzgUvVx/+t9sUfqZq6IP2a+rPbN3ifc7zydBWkaKyymPm922EABECik1onEp
+						59gcFf+PkozaAE51Jid8Lp9YXjQq+OVp9NjfqSXUGYjSRnxH23zws98180CDCBj4
+						nWlLaFDlpPcs9AcVo30WDm2qIC93BOCThmSh/az2+80fpxVPGf3wpcPuZ11XflST
+						FcvbRhADY05pwLXOgztbYNOhtS3qZkIFEce32QIDAQABo4GGMIGDMGIGA1UdEQRb
+						MFmCH2lkcDEudGhlbWFuY2hlc3RlcmNvbGxlZ2UuYWMudWuGNmh0dHBzOi8vaWRw
+						MS50aGVtYW5jaGVzdGVyY29sbGVnZS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNV
+						HQ4EFgQUWXjSvL0zVIJ4O/L6c+kNL3oyemgwDQYJKoZIhvcNAQEFBQADggEBAJGR
+						wXOT7JS6jYsWFDbUgEOUKu8qHBafTZMb3lHKqEF+i9VOxSSyquc5Z3pzJjBjlpaY
+						514MqXswU4oZvCrKJDqfj47ApBSbLvZm4A0cjx7xQqwRSYfmszi0B/W46Xrt32Sc
+						wxcVAoj3upfUigH4SfeixJvOOuk0XibWWz27Gu+B1YCRRfenE/mpGwwaRn5ccOKe
+						uV+M/JapELbKFiAzi/qTuUHV08+i/2Teqv9+0el+zTyT7dXPhtBRZR3iN/yiunX4
+						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>
diff --git a/swamid-interfederations-2.0/idp1.uwaterloo.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.uwaterloo.ca-idp-shibboleth.xml
new file mode 100644
index 00000000..f44197a2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.uwaterloo.ca-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-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>
+      <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
+0jPSIy18S8yVyOEhGaa2MT6kd3ik1tZ3O3iFNm59oNU/IU7km+O8Lq364GME0lCD
+KEobEaH2Tcs55Hk2a9rSmpZ/9+MAW9W/UJVb7Y/T1+jpQxVB4KTVULGqleO4wwJZ
+nhRbzNFuQgSW12msKV4d0ClKct5ui2UlkCXLrC6MFOEsKoGawpm5StKSnbTzLD4K
+3B6LdSc3WQWzX8zSHwSbe0PLbH2MD1Ns37YNNFv5uDhiYeh7E9zYfqd1LmUufmK2
+3daof43rjDRi+3Ybzx44GDMp1bMp7c7Q9W2HmnrZDY0fiyeLTXURDPGbsUgENFMC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMS51d2F0ZXJsb28uY2GGKGh0dHBzOi8v
+aWRwMS51d2F0ZXJsb28uY2EvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHQQAyUs
+uhk9N8P6qen7W7J4k4itMA0GCSqGSIb3DQEBBQUAA4IBAQCMwr7R/xOhdI8OQlc8
+tp6gnIsUSBD6uwcXGVfjg07i/NTtfWTRG3cn8SvV5KcmxqNTQxkkhXyE92RMw88O
+OQM220jmY4fQx63af0OjtXTUYxIOK0Cg0FXMylloHdRyVqp2wbJqbclYL3IWoNRN
+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
+BQAwHDEaMBgGA1UEAxMRaWRwMS51d2F0ZXJsb28uY2EwHhcNMTQwNjE4MTMxMTQ5
+WhcNMzQwNjE4MTMxMTQ5WjAcMRowGAYDVQQDExFpZHAxLnV3YXRlcmxvby5jYTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLtTKyNTqUzgIoJaZs1s3UJ
+0jPSIy18S8yVyOEhGaa2MT6kd3ik1tZ3O3iFNm59oNU/IU7km+O8Lq364GME0lCD
+KEobEaH2Tcs55Hk2a9rSmpZ/9+MAW9W/UJVb7Y/T1+jpQxVB4KTVULGqleO4wwJZ
+nhRbzNFuQgSW12msKV4d0ClKct5ui2UlkCXLrC6MFOEsKoGawpm5StKSnbTzLD4K
+3B6LdSc3WQWzX8zSHwSbe0PLbH2MD1Ns37YNNFv5uDhiYeh7E9zYfqd1LmUufmK2
+3daof43rjDRi+3Ybzx44GDMp1bMp7c7Q9W2HmnrZDY0fiyeLTXURDPGbsUgENFMC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMS51d2F0ZXJsb28uY2GGKGh0dHBzOi8v
+aWRwMS51d2F0ZXJsb28uY2EvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHQQAyUs
+uhk9N8P6qen7W7J4k4itMA0GCSqGSIb3DQEBBQUAA4IBAQCMwr7R/xOhdI8OQlc8
+tp6gnIsUSBD6uwcXGVfjg07i/NTtfWTRG3cn8SvV5KcmxqNTQxkkhXyE92RMw88O
+OQM220jmY4fQx63af0OjtXTUYxIOK0Cg0FXMylloHdRyVqp2wbJqbclYL3IWoNRN
+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>
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
new file mode 100644
index 00000000..c6535327
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2-1.slu.se-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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
+BQAwETEPMA0GA1UEAxMGaWRwMi0xMB4XDTEzMDMxNDA3NTU0OVoXDTMzMDMxNDA3
+NTU0OVowETEPMA0GA1UEAxMGaWRwMi0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA1L9PRiIOUnTbMQoU0LwTtlSeQLwvXbu87PfFMTTpQgdUBrMCPDWL
+mrT6Wko9WmGoAGkYft7bMjFDEkA03Cj5qTbFtemN6Jp/ZqieDnh09wxBdfzOAkSv
+jSdHQK08ITpH91PYtubd9Id6sEI5M6oZ2gSqim/BitjEOh2X1pd5wlLRCtX+YKPE
+UhOdHOuxFfiZALpWoQDWSID0g+yOc9qPj9BvO4gE+YsHbVw+T4f+7IdMEQj+WX1e
+x6EDWSJ8yjRc8RyCXw3AtGWEaCU6NkL5ksTV7DfkozWDjfF6srFck6ksDKN+EEZ4
+wBC+ZCRevaqO/BRfQmsn3JxWRUU9ddTP8QIDAQABo1MwUTAwBgNVHREEKTAnggZp
+ZHAyLTGGHWh0dHBzOi8vaWRwMi0xL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTs
+FaVVn2xyoTYbOGdkDDdtFV8ErzANBgkqhkiG9w0BAQUFAAOCAQEAVETKawYhusol
+wIP2n2bnvKoTD8wJPZNUpxvxBeY72Ux9tzILAdnaDY3lPAwaslqGN7Q3MEVIPbA7
+ebTyR6KPprv3/ijN78HA2FpuIumCiMwgcKTntA1ti8TkCknc/p25yuSJm8kk1YYT
+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
+BQAwETEPMA0GA1UEAxMGaWRwMi0xMB4XDTEzMDMxNDA3NTU0OVoXDTMzMDMxNDA3
+NTU0OVowETEPMA0GA1UEAxMGaWRwMi0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA1L9PRiIOUnTbMQoU0LwTtlSeQLwvXbu87PfFMTTpQgdUBrMCPDWL
+mrT6Wko9WmGoAGkYft7bMjFDEkA03Cj5qTbFtemN6Jp/ZqieDnh09wxBdfzOAkSv
+jSdHQK08ITpH91PYtubd9Id6sEI5M6oZ2gSqim/BitjEOh2X1pd5wlLRCtX+YKPE
+UhOdHOuxFfiZALpWoQDWSID0g+yOc9qPj9BvO4gE+YsHbVw+T4f+7IdMEQj+WX1e
+x6EDWSJ8yjRc8RyCXw3AtGWEaCU6NkL5ksTV7DfkozWDjfF6srFck6ksDKN+EEZ4
+wBC+ZCRevaqO/BRfQmsn3JxWRUU9ddTP8QIDAQABo1MwUTAwBgNVHREEKTAnggZp
+ZHAyLTGGHWh0dHBzOi8vaWRwMi0xL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTs
+FaVVn2xyoTYbOGdkDDdtFV8ErzANBgkqhkiG9w0BAQUFAAOCAQEAVETKawYhusol
+wIP2n2bnvKoTD8wJPZNUpxvxBeY72Ux9tzILAdnaDY3lPAwaslqGN7Q3MEVIPbA7
+ebTyR6KPprv3/ijN78HA2FpuIumCiMwgcKTntA1ti8TkCknc/p25yuSJm8kk1YYT
+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>
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
new file mode 100644
index 00000000..11f44a67
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml
@@ -0,0 +1,129 @@
+<?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>
+      <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>
+			    MIIEfTCCA2WgAwIBAgIRALXH4vfn8/gr0Iw5Iowy/gEwDQYJKoZIhvcNAQEFBQAw
+			    NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+			    IFNTTCBDQTAeFw0xMjExMjEwMDAwMDBaFw0xNTExMjEyMzU5NTlaMFcxCzAJBgNV
+			    BAYTAkNaMS0wKwYDVQQKEyRDemVjaCBUZWNobmljYWwgVW5pdmVyc2l0eSBpbiBQ
+			    cmFndWUxGTAXBgNVBAMTEGlkcDIuY2l2LmN2dXQuY3owggEiMA0GCSqGSIb3DQEB
+			    AQUAA4IBDwAwggEKAoIBAQDIAANNkRJrnWIbXPvPd1g/2Dlj8SObKDs4aLG90fkl
+			    7XvId+XJ71GJ8aEjJ9lGAEqs2a9sgm2WpcLQ/B+Y9veRyRtnaK0Ywd8+iSThsA58
+			    oTN5H3V3m/M0oMTd9UPkQSHCLUn+Dp1w04DJ6J8ECWoI2rvIblGHGzxfzF4cb2KH
+			    aMvWDGSuiQh6GeKkwHDTVTr9pZK8Evcw7RT/4KlChf5hfFD3ZwGsrWCjI25NrR+6
+			    753XeaVIOOCKZladSF/93t8kAM4Z+n/ijQDytg3v4poSt0LM5X4+8b7AYTDSjkUq
+			    Nh36JZ+OZY4jRrBsrM0S4RXWuPB9DEc8hLe/CIRZWGIzAgMBAAGjggFjMIIBXzAf
+			    BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUWkdTT+6T
+			    qjlT9i5aI+IBxfKpCm4wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
+			    VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
+			    MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+			    Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+			    dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+			    BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQaWRw
+			    Mi5jaXYuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAvV4rEv6A07BXcUMTF6+z
+			    Da8v2shV1S+f0SGfIdL1DzvaUFf7VAWuKOlwny8OfpzXVCs3yg+KSDWUWi8HWR6y
+			    dKWsuHljnD2DxAAPQNZeuESbPSyeZK/EJdSu4Ii+OH0exDRjZjZ3v3VsoueQ41tt
+			    1/Fji03+9bZCQi9dOQpQji/q2SrnKRpPsoCemY+bo8E7SanrUd7jwX1ef6HaOnTP
+			    l8oHphtTzvbg+i3qaTH9bDQXdXbcFZPklU7+5k80wHe56+1sECQ5g1lB+ZFzx1Oi
+			    i5rCf/Zx3bkYkE+xPXAOcCGEWs35at7QpIXuoG9FDU8UKW2cMgEq9GEOddx/wVqB
+			    6w==
+		    </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>
+			    MIIEfTCCA2WgAwIBAgIRALXH4vfn8/gr0Iw5Iowy/gEwDQYJKoZIhvcNAQEFBQAw
+			    NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+			    IFNTTCBDQTAeFw0xMjExMjEwMDAwMDBaFw0xNTExMjEyMzU5NTlaMFcxCzAJBgNV
+			    BAYTAkNaMS0wKwYDVQQKEyRDemVjaCBUZWNobmljYWwgVW5pdmVyc2l0eSBpbiBQ
+			    cmFndWUxGTAXBgNVBAMTEGlkcDIuY2l2LmN2dXQuY3owggEiMA0GCSqGSIb3DQEB
+			    AQUAA4IBDwAwggEKAoIBAQDIAANNkRJrnWIbXPvPd1g/2Dlj8SObKDs4aLG90fkl
+			    7XvId+XJ71GJ8aEjJ9lGAEqs2a9sgm2WpcLQ/B+Y9veRyRtnaK0Ywd8+iSThsA58
+			    oTN5H3V3m/M0oMTd9UPkQSHCLUn+Dp1w04DJ6J8ECWoI2rvIblGHGzxfzF4cb2KH
+			    aMvWDGSuiQh6GeKkwHDTVTr9pZK8Evcw7RT/4KlChf5hfFD3ZwGsrWCjI25NrR+6
+			    753XeaVIOOCKZladSF/93t8kAM4Z+n/ijQDytg3v4poSt0LM5X4+8b7AYTDSjkUq
+			    Nh36JZ+OZY4jRrBsrM0S4RXWuPB9DEc8hLe/CIRZWGIzAgMBAAGjggFjMIIBXzAf
+			    BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUWkdTT+6T
+			    qjlT9i5aI+IBxfKpCm4wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
+			    VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
+			    MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+			    Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+			    dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+			    BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQaWRw
+			    Mi5jaXYuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAvV4rEv6A07BXcUMTF6+z
+			    Da8v2shV1S+f0SGfIdL1DzvaUFf7VAWuKOlwny8OfpzXVCs3yg+KSDWUWi8HWR6y
+			    dKWsuHljnD2DxAAPQNZeuESbPSyeZK/EJdSu4Ii+OH0exDRjZjZ3v3VsoueQ41tt
+			    1/Fji03+9bZCQi9dOQpQji/q2SrnKRpPsoCemY+bo8E7SanrUd7jwX1ef6HaOnTP
+			    l8oHphtTzvbg+i3qaTH9bDQXdXbcFZPklU7+5k80wHe56+1sECQ5g1lB+ZFzx1Oi
+			    i5rCf/Zx3bkYkE+xPXAOcCGEWs35at7QpIXuoG9FDU8UKW2cMgEq9GEOddx/wVqB
+			    6w==
+		    </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>
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
new file mode 100644
index 00000000..0721d26b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.crous-toulouse.fr-idp-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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>
+      <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="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>
+					      MIIEjzCCA3egAwIBAgIRAME/UgvFzamIAmhGwIYeY9owDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMTEwMDAwMDBaFw0xNjAxMTEyMzU5NTlaMGMxCzAJBgNV
+BAYTAkZSMRcwFQYDVQQKEw5DUk9VUyBUT1VMT1VTRTEaMBgGA1UECxMRU0kgQ1JP
+VVMgVE9VTE9VU0UxHzAdBgNVBAMTFmlkcDIuY3JvdXMtdG91bG91c2UuZnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzyRImYAKxZMm+oUs477vjb2xO
+nv22DLLO05BVPaprrr35zJ7Tksqvz0Oml4Sq4q8GjXuABsmoelldMNII47CTm1Bs
+LjDHULCXSo0PUTlBVUAqNV5DS25V3SbnOIcC7V5xVXpkC1GjSQuv4zCZhZpagD+p
+nnD4m7gEwmr36VbfFEDS82TM6n4twFIkLjRdhTL/gDeckkCtWTg2pAY047kwL4H6
+2nI1JFvA+dG2zAdhTpqiynaqBZAl0mimXax7M9Y5FKRRgeDkGZK5pg1RMLIzwZiE
+zocEwot6T4GCNOfhfQlLp2kw0UZNNshchYXbezuoTJDjWqHWY65F+kEimSNrAgMB
+AAGjggFpMIIBZTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV
+HQ4EFgQUwBQGVXMkSlvmojcHP99+u4MleawwDgYDVR0PAQH/BAQDAgWgMAwGA1Ud
+EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR
+MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50
+Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG
+CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIQYD
+VR0RBBowGIIWaWRwMi5jcm91cy10b3Vsb3VzZS5mcjANBgkqhkiG9w0BAQUFAAOC
+AQEAbCnMDjHKtr41LGUi4wzZ2ML4uMu7glEZGfPqwZbUbdYJPJ8ewZZQQRbzNRHs
+hPnZLPJDY44rD6/aJGVA5sBGbscho/wx1gBV904YNeLYXe/XQNW5M0Eqk2vL+ASx
+bTL8uHo0NLoMoF7MNHtBVTUgSwXUb1NdLz4bCafgc1th08gk1C+PoPbpbKxPEcgo
+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://unknown.site.com</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
new file mode 100644
index 00000000..a46c331c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.dcu.ie-idp-profile-Metadata-SAML.xml
@@ -0,0 +1,71 @@
+<?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-06T23:00:00Z"/>
+  </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">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/iss/contact.shtml</mdui:InformationURL>
+        <mdui:Logo height="102" width="150">https://edugate.heanet.ie/rr3/logos/dcu.png</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.1/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>
+MIIDEzCCAfugAwIBAgIUOQ3lfJ+Ec4wFEuvh3raF7kmMtUQwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLmRjdS5pZTAeFw0wOTA3MTcxMTQwNDZaFw0yOTA3
+MTcxMTQwNDZaMBUxEzARBgNVBAMTCmlkcC5kY3UuaWUwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCADZFUTMBENyEv2jwnRDh9gSOYZfHUfndWcFHasU3S
+DqH5j/jA6jL4hqJNnzokDcMRr6veGwKLQ93fXbOHfHvNYGM/6b3V/wpZUqH4OPUY
+zmjJdP2EgJ2bq6Tx0uLQ/trbKqweGgXkzTcRNBtC3qItUddv8eXi1IrXHsAOFX+8
+b3IXXh1VrcHvrt8+WaAwnGDMmTGxUkOPYnmPef3rKA5gYQglVH8f8fKuPIDsKAUS
+XXTqniiU4TUcguCTQ/RrGvJgFyjtNK8loL8LcpLq9FoCjaQ/5iEt0xHPc2fHzJmc
+9VOEcH+RVazhCy9yx3uCI8ID4ZB3mQsce5F75POyVzGhAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5kY3UuaWWGIWh0dHBzOi8vaWRwLmRjdS5pZS9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQU++/qpuKky0Mag89lImDpPqFodkgwDQYJKoZIhvcNAQEF
+BQADggEBAG9D2HEMKqoKl/g+i0TrATEGkTf0bJuy1oWUxSNzFdzWqeGkZrZS9bmg
+fDsBhb5ETAnYfxwDHMGytK1a25wKL0nLHcQkGY/Rq3Epi/4FO2j8HzfavhkL4e81
+sbH1fWkpuYR0gxIcNQ4O8MCRT8KOd1RlEfPfGaG3aUuuG/6CmTT6kP32a6Wo4wQA
+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: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: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.hig.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml
new file mode 100644
index 00000000..16b4acd5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?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>
+      <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 height="94" width="83" xml:lang="sv">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
+        <mdui:Logo height="94" width="83" xml:lang="en">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
+      </mdui:UIInfo>
+    </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
+AQEBBQADggEPADCCAQoCggEBAJ4NMnKvGahwhiZDXxwLfT0oeF/rB72jAVBF9Um9
+ExFcSJ/8yb6o0knwpY/uQgFppiUgAvcDKeKN9rBZRq+//jL+8CowII7eOFuR5h+s
+yzAn6YIcPcSx8QBK3lDb+dIwJ7aEnXlgt5tEZneTL0IILXu2zquGRm3rH7YhCHIM
+9v51sjnjd8MXujpG0yIFre3DovnBs4i68ZhoDg7QtvxUz3w/2GTZN+AUB3BA0u12
+FNtJ1n2f/fZwxnJnBCPm2sENAYYKB7/43TJtZazf5ZYA80J9wdQWrdWyve5S+FSZ
+AdLdcdrMZB5c8g6lwPWBRluFjEAbMZMj3AlYpLf2Ybn9yKUCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwMi5oaWcuc2WGImh0dHBzOi8vaWRwMi5oaWcuc2UvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFCrv7yyvoIy+UhKGYDIB1kTI5T1eMA0GCSqGSIb3
+DQEBBQUAA4IBAQBEXm+ozOM0JC9Fx2QLbYwFbZ5gsBUm2liprjQ1cj65Z+z3w2fs
+hxouOOEyTGuP61J5O29nDDChcWNXMlUyv+HG1nndJ4vsPmhUEYsMNAZwZZ+JoD5g
+oEekdgF8avmF0KNfZc+qMOGUz4qrrmMZ6w4F21xba2fFdfSQrubk1F2D/U0ZKw6A
+NYTerCYAEcAVG7c8Eh/5fQXjpf1pZDV1mtPQPnIlF/R6jXgINXDmFOMd0Ei4/C2H
+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>
+MIIDFzCCAf+gAwIBAgIUaqsj1o+jLwRHcAiw/jp5mMglxLUwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwMi5oaWcuc2UwHhcNMTEwMjA4MTUxOTIyWhcNMzEw
+MjA4MTUxOTIyWjAWMRQwEgYDVQQDEwtpZHAyLmhpZy5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJ4NMnKvGahwhiZDXxwLfT0oeF/rB72jAVBF9Um9
+ExFcSJ/8yb6o0knwpY/uQgFppiUgAvcDKeKN9rBZRq+//jL+8CowII7eOFuR5h+s
+yzAn6YIcPcSx8QBK3lDb+dIwJ7aEnXlgt5tEZneTL0IILXu2zquGRm3rH7YhCHIM
+9v51sjnjd8MXujpG0yIFre3DovnBs4i68ZhoDg7QtvxUz3w/2GTZN+AUB3BA0u12
+FNtJ1n2f/fZwxnJnBCPm2sENAYYKB7/43TJtZazf5ZYA80J9wdQWrdWyve5S+FSZ
+AdLdcdrMZB5c8g6lwPWBRluFjEAbMZMj3AlYpLf2Ybn9yKUCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwMi5oaWcuc2WGImh0dHBzOi8vaWRwMi5oaWcuc2UvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFCrv7yyvoIy+UhKGYDIB1kTI5T1eMA0GCSqGSIb3
+DQEBBQUAA4IBAQBEXm+ozOM0JC9Fx2QLbYwFbZ5gsBUm2liprjQ1cj65Z+z3w2fs
+hxouOOEyTGuP61J5O29nDDChcWNXMlUyv+HG1nndJ4vsPmhUEYsMNAZwZZ+JoD5g
+oEekdgF8avmF0KNfZc+qMOGUz4qrrmMZ6w4F21xba2fFdfSQrubk1F2D/U0ZKw6A
+NYTerCYAEcAVG7c8Eh/5fQXjpf1pZDV1mtPQPnIlF/R6jXgINXDmFOMd0Ei4/C2H
+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>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>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>itsupport@hig.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
+  </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
new file mode 100644
index 00000000..adf1e532
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml
@@ -0,0 +1,130 @@
+<?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>
+      <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 height="103" width="200" xml:lang="sv">http://www.hv.se/Media/Get/17595/svensk-logotyp-200x103</mdui:Logo>
+        <mdui:Logo height="103" width="200" xml:lang="en">http://www.hv.se/Media/Get/17597/3.-engelsk-logga.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/22</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>
+MIIDPDCCAiSgAwIBAgIVALAAqmf9+n0EkV7vMRq5ZDh3UVEHMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMTFGxzYW1sMDMuc2VydmVyLmh2LnNlMB4XDTEyMTEyNjA5
+NTgyNloXDTMyMTEyNjA5NTgyNlowHzEdMBsGA1UEAxMUbHNhbWwwMy5zZXJ2ZXIu
+aHYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAwm0DgWJkMIvo
+ooXb2NlHLLPl59NDgh5MXYPBCETWU20T2voM+g2M7d5c/Jb1iMVC/kP3FYuK8Nmy
+l6o3VLSaRIENTcZTOLEjHPO301NCu6dRIgM+iwkZnZ0luUgfxEf9aBnmwA0V7vKp
+RliOzNDYmZ7FL6z6ZDh6ULjnPV6KeGd4bQIrW2ywTOirz+BGGn0UXChuOanDnEvo
+fv3Vrr1wh1bbGmr0G6w5JlSLPPKtoKG5DGRjzkq3mfiP97N6ZgI4F0e815Sbb3B7
+VLCZ/JZMRxOj9bP5Q7LhpDn0+LpmK/DS/YAs8rivg1WgKkuJgiYTOAlewyZTZT6v
+1m9x3LexAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGxzYW1sMDMuc2VydmVyLmh2LnNl
+hitodHRwczovL2xzYW1sMDMuc2VydmVyLmh2LnNlL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBR9Gm8Z5H9QjIJK2yvAM0y2i1hkpzANBgkqhkiG9w0BAQUFAAOCAQEA
+KXF5jmIhYbIVM425IZMSH9vb6Gm5R3rk0s6h4BGyeMPpLQ/ECjnwitsQFTZG2dci
+vvi4JbU8mryOVDt9NlNUtdgzbiaP3VcrkWHq7at+DsW+ipD5ioMIWZa6/hIqMU7U
+eQLX7YM4sjy3b4aa6rdTh+r2yp2GcFmpbJNhSncXA3lgH5I+BBKUgKIrLHdsdkGj
+IebD+y3AIEczoLLKVQ7W5d81Ifrh1JLJ8IVOt4S+9LUsgGJmu04NQaeQyaQcodTs
+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>
+MIIDPDCCAiSgAwIBAgIVALAAqmf9+n0EkV7vMRq5ZDh3UVEHMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMTFGxzYW1sMDMuc2VydmVyLmh2LnNlMB4XDTEyMTEyNjA5
+NTgyNloXDTMyMTEyNjA5NTgyNlowHzEdMBsGA1UEAxMUbHNhbWwwMy5zZXJ2ZXIu
+aHYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAwm0DgWJkMIvo
+ooXb2NlHLLPl59NDgh5MXYPBCETWU20T2voM+g2M7d5c/Jb1iMVC/kP3FYuK8Nmy
+l6o3VLSaRIENTcZTOLEjHPO301NCu6dRIgM+iwkZnZ0luUgfxEf9aBnmwA0V7vKp
+RliOzNDYmZ7FL6z6ZDh6ULjnPV6KeGd4bQIrW2ywTOirz+BGGn0UXChuOanDnEvo
+fv3Vrr1wh1bbGmr0G6w5JlSLPPKtoKG5DGRjzkq3mfiP97N6ZgI4F0e815Sbb3B7
+VLCZ/JZMRxOj9bP5Q7LhpDn0+LpmK/DS/YAs8rivg1WgKkuJgiYTOAlewyZTZT6v
+1m9x3LexAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGxzYW1sMDMuc2VydmVyLmh2LnNl
+hitodHRwczovL2xzYW1sMDMuc2VydmVyLmh2LnNlL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBR9Gm8Z5H9QjIJK2yvAM0y2i1hkpzANBgkqhkiG9w0BAQUFAAOCAQEA
+KXF5jmIhYbIVM425IZMSH9vb6Gm5R3rk0s6h4BGyeMPpLQ/ECjnwitsQFTZG2dci
+vvi4JbU8mryOVDt9NlNUtdgzbiaP3VcrkWHq7at+DsW+ipD5ioMIWZa6/hIqMU7U
+eQLX7YM4sjy3b4aa6rdTh+r2yp2GcFmpbJNhSncXA3lgH5I+BBKUgKIrLHdsdkGj
+IebD+y3AIEczoLLKVQ7W5d81Ifrh1JLJ8IVOt4S+9LUsgGJmu04NQaeQyaQcodTs
+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>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>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>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
new file mode 100644
index 00000000..239d2c8b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml
@@ -0,0 +1,109 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor 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">SDSS (Fountainhall)</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>
+						MIIDSTCCAjGgAwIBAgIhAMSPOSGN+3UUTXSKV+2EBOuF3x/pwPX/TD9GfyEkzLp+
+						MA0GCSqGSIb3DQEBBQUAMFgxGDAWBgNVBAMMD2lkcDIuaWF5Lm9yZy51azETMBEG
+						CgmSJomT8ixkARkWA2lheTETMBEGCgmSJomT8ixkARkWA29yZzESMBAGCgmSJomT
+						8ixkARkWAnVrMB4XDTA4MDIyNTEwMzAxNFoXDTI4MDIyNTEwMzAxNFowWDEYMBYG
+						A1UEAwwPaWRwMi5pYXkub3JnLnVrMRMwEQYKCZImiZPyLGQBGRYDaWF5MRMwEQYK
+						CZImiZPyLGQBGRYDb3JnMRIwEAYKCZImiZPyLGQBGRYCdWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCb6ts48g10XHTnpy+23huzR184aahkrG0AoeUl
+						FVlomPjoFDk6czq0S3Qyd+ceF7tMRu3XzS7cMmtVH53O9d+wCs8aPQcPXxHQ5gLk
+						L7Gu6eJ+3N3jXhpt7/DDPhnzFPNW3EVMueHJ/0IzyspTvq2LPbNWXJ86NKJ+gesZ
+						QftskwXScOjpoJEIP0EA890QYd4WdYtQPqVV+LPKtnYBoGOnuRhSAM1D/EhCbeb0
+						lCmRGcdGbDFBchiPO4VLGl85sLa0EhjxMIPAOKXcj8bBlO9Ww9kkG06kQp6eLHwm
+						Jmt7VNKveCGhyF2QH/CvmdUaPv3gcp1UjrlqFN9LBVSaTIL/AgMBAAEwDQYJKoZI
+						hvcNAQEFBQADggEBAG+jDBAtlKoHaEBB+l6PpW5zuiDjyHG4zZZYqX77mZ9xP/xe
+						Kn0yJ18ZLjS3b9WztGLYyC4SJHSF2okq1K02bqsCv9YeP+UWpw2uRR8jt96lLWxZ
+						jTjoko2v8jBtzDk8LZsqw58m4vZ0AGNZjKeGIywKhxnepwREguyj3bjBpZAGgl0M
+						HQuXoO/BDC9yKyZslE5CpWp5xP4XzY2/LrorrkwOJLnFuk1sox4/gvkDQukUx/jr
+						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>
+						MIIDSTCCAjGgAwIBAgIhAMSPOSGN+3UUTXSKV+2EBOuF3x/pwPX/TD9GfyEkzLp+
+						MA0GCSqGSIb3DQEBBQUAMFgxGDAWBgNVBAMMD2lkcDIuaWF5Lm9yZy51azETMBEG
+						CgmSJomT8ixkARkWA2lheTETMBEGCgmSJomT8ixkARkWA29yZzESMBAGCgmSJomT
+						8ixkARkWAnVrMB4XDTA4MDIyNTEwMzAxNFoXDTI4MDIyNTEwMzAxNFowWDEYMBYG
+						A1UEAwwPaWRwMi5pYXkub3JnLnVrMRMwEQYKCZImiZPyLGQBGRYDaWF5MRMwEQYK
+						CZImiZPyLGQBGRYDb3JnMRIwEAYKCZImiZPyLGQBGRYCdWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCb6ts48g10XHTnpy+23huzR184aahkrG0AoeUl
+						FVlomPjoFDk6czq0S3Qyd+ceF7tMRu3XzS7cMmtVH53O9d+wCs8aPQcPXxHQ5gLk
+						L7Gu6eJ+3N3jXhpt7/DDPhnzFPNW3EVMueHJ/0IzyspTvq2LPbNWXJ86NKJ+gesZ
+						QftskwXScOjpoJEIP0EA890QYd4WdYtQPqVV+LPKtnYBoGOnuRhSAM1D/EhCbeb0
+						lCmRGcdGbDFBchiPO4VLGl85sLa0EhjxMIPAOKXcj8bBlO9Ww9kkG06kQp6eLHwm
+						Jmt7VNKveCGhyF2QH/CvmdUaPv3gcp1UjrlqFN9LBVSaTIL/AgMBAAEwDQYJKoZI
+						hvcNAQEFBQADggEBAG+jDBAtlKoHaEBB+l6PpW5zuiDjyHG4zZZYqX77mZ9xP/xe
+						Kn0yJ18ZLjS3b9WztGLYyC4SJHSF2okq1K02bqsCv9YeP+UWpw2uRR8jt96lLWxZ
+						jTjoko2v8jBtzDk8LZsqw58m4vZ0AGNZjKeGIywKhxnepwREguyj3bjBpZAGgl0M
+						HQuXoO/BDC9yKyZslE5CpWp5xP4XzY2/LrorrkwOJLnFuk1sox4/gvkDQukUx/jr
+						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">SDSS (Fountainhall)</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
new file mode 100644
index 00000000..d029f6bb
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml
@@ -0,0 +1,135 @@
+<?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>
+      <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>
+MIIEajCCA1KgAwIBAgIQEi8JxmnGiL6xNZ8O2MTYZDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIxNzAwMDAwMFoXDTE1MTIxNzIzNTk1OVowRTELMAkGA1UE
+BhMCQ1oxGzAZBgNVBAoTEk1hc2FyeWsgVW5pdmVyc2l0eTEZMBcGA1UEAxMQaWRw
+Mi5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQd
+LDOtSIbIrXUepE/6tvHPC8Ly7TjX7qfkaY/1qd+9QMgXNniLApfu9kCl/ZubelQJ
+nJbx5GJaxuS1RRl0Nuq5zf52OnOQxFrWtmrzticEMu5P1rDKcuQh4uk1Nztla599
+0xWUwVM3oZUQl4+O477j9bN5yvIVB4gsIp5Fj9rplt9lc8qud7nA6qxzM1UjE5eH
+s/NCsnTh5Ce6ocP1zEhVZBcG0yXOenWGo3LzclMk9Ffy8wnJ4fLaoTGVON1n31Dk
+zg3YJ6hxSo92X+iwdfYLoHVTPe6rQDxT7V8vO8zRdDqzvwRn39nSXrtGOp6bCXbk
+IrEo3UH1e490sCkkRVMCAwEAAaOCAWMwggFfMB8GA1UdIwQYMBaAFAy9k2gM896r
+o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRBJryty03ccYy/kmP60rnahOoGVTAOBgNV
+HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
+BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
+YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
+Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAyLmljcy5tdW5pLmN6MA0GCSqG
+SIb3DQEBBQUAA4IBAQBSfzF1XO5gVygzYna/TZwXE1DUJfiTTiK8YYeU+bDKffkf
+O2+4F/N5Jij4C3s82EHP8otVXA4uXGWVvqbLCN+dSkN5zAeE7Hq48m1u/nYVyCKf
+pgLCkrg64JqIPIm8yF+bu9cvU0MbkzZTFCvbxnfqBQCKKfQ4Q6j3MiW12pfifIGe
+r+OsRrA4ZCo+6qGhA3bRfozFYUHCdJA+MxJhZzfcMae1MxK24wGMTSEabFlu6evm
+SJdlV4XPhmyysjuIHh3SnsS2NHpv0l04pT/JJV4shfZFHwqQS06ggNtpqysl3Y6O
+11KVcl/v2z6hhhjdrelepkLFCGKUVgpSOlcImQNb
+            </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>
+MIIEajCCA1KgAwIBAgIQEi8JxmnGiL6xNZ8O2MTYZDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIxNzAwMDAwMFoXDTE1MTIxNzIzNTk1OVowRTELMAkGA1UE
+BhMCQ1oxGzAZBgNVBAoTEk1hc2FyeWsgVW5pdmVyc2l0eTEZMBcGA1UEAxMQaWRw
+Mi5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQd
+LDOtSIbIrXUepE/6tvHPC8Ly7TjX7qfkaY/1qd+9QMgXNniLApfu9kCl/ZubelQJ
+nJbx5GJaxuS1RRl0Nuq5zf52OnOQxFrWtmrzticEMu5P1rDKcuQh4uk1Nztla599
+0xWUwVM3oZUQl4+O477j9bN5yvIVB4gsIp5Fj9rplt9lc8qud7nA6qxzM1UjE5eH
+s/NCsnTh5Ce6ocP1zEhVZBcG0yXOenWGo3LzclMk9Ffy8wnJ4fLaoTGVON1n31Dk
+zg3YJ6hxSo92X+iwdfYLoHVTPe6rQDxT7V8vO8zRdDqzvwRn39nSXrtGOp6bCXbk
+IrEo3UH1e490sCkkRVMCAwEAAaOCAWMwggFfMB8GA1UdIwQYMBaAFAy9k2gM896r
+o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRBJryty03ccYy/kmP60rnahOoGVTAOBgNV
+HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
+BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
+YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
+Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAyLmljcy5tdW5pLmN6MA0GCSqG
+SIb3DQEBBQUAA4IBAQBSfzF1XO5gVygzYna/TZwXE1DUJfiTTiK8YYeU+bDKffkf
+O2+4F/N5Jij4C3s82EHP8otVXA4uXGWVvqbLCN+dSkN5zAeE7Hq48m1u/nYVyCKf
+pgLCkrg64JqIPIm8yF+bu9cvU0MbkzZTFCvbxnfqBQCKKfQ4Q6j3MiW12pfifIGe
+r+OsRrA4ZCo+6qGhA3bRfozFYUHCdJA+MxJhZzfcMae1MxK24wGMTSEabFlu6evm
+SJdlV4XPhmyysjuIHh3SnsS2NHpv0l04pT/JJV4shfZFHwqQS06ggNtpqysl3Y6O
+11KVcl/v2z6hhhjdrelepkLFCGKUVgpSOlcImQNb
+            </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>
diff --git a/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml
new file mode 100644
index 00000000..864c6ed7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml
@@ -0,0 +1,133 @@
+<?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>
+      <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 height="112" width="112" xml:lang="sv">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:Logo height="112" width="112" xml:lang="en">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>kau.se</mdui:DomainHint>
+        <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>
+MIIDFzCCAf+gAwIBAgIUUONxidNrozH1GiZ1VI/uwwgWM8cwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwMi5rYXUuc2UwHhcNMTAxMDEzMTM1MjM0WhcNMzAx
+MDEzMTM1MjM0WjAWMRQwEgYDVQQDEwtpZHAyLmthdS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAILFxLkJloiLact4UjsWKH98lOkzm6VE2t9GQtUe
+DRYCY5prnaDRmsumqmMYLMZXT6DCT99oNLeeBeBfB+8JwqraYhDanGiRAENTrlbs
+jUTx4p5BYTBuo0rGpVZ8MBi++f8ainvxPI4LGVc02upuG7lhWnjaui2qpKQf9hFB
+mqnjgL2ohS/Jhzo7q5XiEtsTtoD4ssUMabbzK9Zc5x6/txxJVAaicOHhqgXhFkkD
+AfC86PbWim6S8BpX0f8ERcYYKAm58ES/tpgZeImVmIIyHAIHPukjUKXNzuDKh9qa
+3LXp5moCeQKI385mw1BnkwTTqdwZ0Y5QHdYIMfB59VuUPm0CAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwMi5rYXUuc2WGImh0dHBzOi8vaWRwMi5rYXUuc2UvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFLywmXKV+OaPFHmRtKgA7vepw1CtMA0GCSqGSIb3
+DQEBBQUAA4IBAQBRG+Zr9oXM/S7WHGRlTuwcXLEqy1jETAre9e2JUJLCYeEQdUor
+W5fETZtgs1DwGvfuquLRFxvIGtnIgELy1Q9eDGszursIl+cY6kv72pl+wP+QvI0U
+GWysjsYepf78eRQ4sNKn/m+2p7ZBfLFixNdTn1nvIGSaPX+8SnOrYfrqLYXZVZuF
+HntH8R43Oh0amq0BYWSJOhhmT4nxpvwwQCETd+RTqyB0SDtXnjYKv7j505JEBltt
+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>
+MIIDFzCCAf+gAwIBAgIUUONxidNrozH1GiZ1VI/uwwgWM8cwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwMi5rYXUuc2UwHhcNMTAxMDEzMTM1MjM0WhcNMzAx
+MDEzMTM1MjM0WjAWMRQwEgYDVQQDEwtpZHAyLmthdS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAILFxLkJloiLact4UjsWKH98lOkzm6VE2t9GQtUe
+DRYCY5prnaDRmsumqmMYLMZXT6DCT99oNLeeBeBfB+8JwqraYhDanGiRAENTrlbs
+jUTx4p5BYTBuo0rGpVZ8MBi++f8ainvxPI4LGVc02upuG7lhWnjaui2qpKQf9hFB
+mqnjgL2ohS/Jhzo7q5XiEtsTtoD4ssUMabbzK9Zc5x6/txxJVAaicOHhqgXhFkkD
+AfC86PbWim6S8BpX0f8ERcYYKAm58ES/tpgZeImVmIIyHAIHPukjUKXNzuDKh9qa
+3LXp5moCeQKI385mw1BnkwTTqdwZ0Y5QHdYIMfB59VuUPm0CAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwMi5rYXUuc2WGImh0dHBzOi8vaWRwMi5rYXUuc2UvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFLywmXKV+OaPFHmRtKgA7vepw1CtMA0GCSqGSIb3
+DQEBBQUAA4IBAQBRG+Zr9oXM/S7WHGRlTuwcXLEqy1jETAre9e2JUJLCYeEQdUor
+W5fETZtgs1DwGvfuquLRFxvIGtnIgELy1Q9eDGszursIl+cY6kv72pl+wP+QvI0U
+GWysjsYepf78eRQ4sNKn/m+2p7ZBfLFixNdTn1nvIGSaPX+8SnOrYfrqLYXZVZuF
+HntH8R43Oh0amq0BYWSJOhhmT4nxpvwwQCETd+RTqyB0SDtXnjYKv7j505JEBltt
+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>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>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>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
new file mode 100644
index 00000000..9a85f144
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.kingston.ac.uk-shibboleth.xml
@@ -0,0 +1,110 @@
+<?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>
+      <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>
+						MIIDODCCAiCgAwIBAgIVAMevtLbVmUP/KFFW/3IcXK9nAywnMA0GCSqGSIb3DQEB
+						BQUAMB4xHDAaBgNVBAMTE2lkcDIua2luZ3N0b24uYWMudWswHhcNMTMxMDA0MTM0
+						OTM3WhcNMzMxMDA0MTM0OTM3WjAeMRwwGgYDVQQDExNpZHAyLmtpbmdzdG9uLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs8keaoCHkhFKCrkW
+						43asq9uFNsO9WW15Q4sMFYmAcFnD0VPJbSHrLLxWndapJeGrZhAYl9902GcV0X6Z
+						s8pChhLQOf+k4B9YgJHb7xDi0n8h2aXoy5L9wu/ZdRbVgSIbeHIXfxLqJWDLEZGS
+						9cIlvO3DYPaTo73GuINf+QVodRSgBSQez/hHJkVyJJWPNgMwHIwKOtNQygEdI/Pu
+						PIxNfVwr4HNzb6GU9VlTqGaECeThjTINj189xj/kpEU1ehAl3zYa7jkBOp6FTerP
+						KxJm0DLfmLWubtxDNpmQZt0b55riH6GfLHuoXbeJ4x7CriLEZPPNgyCRoKks4pxw
+						ck9PTQIDAQABo20wazBKBgNVHREEQzBBghNpZHAyLmtpbmdzdG9uLmFjLnVrhipo
+						dHRwczovL2lkcDIua2luZ3N0b24uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
+						BBYEFDV+wl3i5Jhj1v3GOPpUHyBivPkpMA0GCSqGSIb3DQEBBQUAA4IBAQB5S/6O
+						fH0pqKhL80xc8eVdW2uo40WZVb8Za7tkM/DDsHsfgNGk/Xl/cGLzmo2uaURLic3T
+						X7FRDCBVWMKZQTyX6VkwFcOGz/emg/xCRGF45i2fRIgRixyrVhPgjT8Ku4Qk8vrE
+						vgBQCV5+6dJgZ3oEGT8QFMyEEakKdXEAfAjPrFHpkfox72nvCX4yiuZfGhYHFts1
+						J48JAKw3tFfsTlSBXKsN50tyJSSWEb2JYOKXCiVuPLHF0h5sYEO12dWQIP9dOsJn
+						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>
+						MIIDODCCAiCgAwIBAgIVAMevtLbVmUP/KFFW/3IcXK9nAywnMA0GCSqGSIb3DQEB
+						BQUAMB4xHDAaBgNVBAMTE2lkcDIua2luZ3N0b24uYWMudWswHhcNMTMxMDA0MTM0
+						OTM3WhcNMzMxMDA0MTM0OTM3WjAeMRwwGgYDVQQDExNpZHAyLmtpbmdzdG9uLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs8keaoCHkhFKCrkW
+						43asq9uFNsO9WW15Q4sMFYmAcFnD0VPJbSHrLLxWndapJeGrZhAYl9902GcV0X6Z
+						s8pChhLQOf+k4B9YgJHb7xDi0n8h2aXoy5L9wu/ZdRbVgSIbeHIXfxLqJWDLEZGS
+						9cIlvO3DYPaTo73GuINf+QVodRSgBSQez/hHJkVyJJWPNgMwHIwKOtNQygEdI/Pu
+						PIxNfVwr4HNzb6GU9VlTqGaECeThjTINj189xj/kpEU1ehAl3zYa7jkBOp6FTerP
+						KxJm0DLfmLWubtxDNpmQZt0b55riH6GfLHuoXbeJ4x7CriLEZPPNgyCRoKks4pxw
+						ck9PTQIDAQABo20wazBKBgNVHREEQzBBghNpZHAyLmtpbmdzdG9uLmFjLnVrhipo
+						dHRwczovL2lkcDIua2luZ3N0b24uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
+						BBYEFDV+wl3i5Jhj1v3GOPpUHyBivPkpMA0GCSqGSIb3DQEBBQUAA4IBAQB5S/6O
+						fH0pqKhL80xc8eVdW2uo40WZVb8Za7tkM/DDsHsfgNGk/Xl/cGLzmo2uaURLic3T
+						X7FRDCBVWMKZQTyX6VkwFcOGz/emg/xCRGF45i2fRIgRixyrVhPgjT8Ku4Qk8vrE
+						vgBQCV5+6dJgZ3oEGT8QFMyEEakKdXEAfAjPrFHpkfox72nvCX4yiuZfGhYHFts1
+						J48JAKw3tFfsTlSBXKsN50tyJSSWEb2JYOKXCiVuPLHF0h5sYEO12dWQIP9dOsJn
+						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>
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
new file mode 100644
index 00000000..9e5792b6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.londonlibrary.co.uk-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+    <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>
+      <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>
+						MIID4zCCAsugAwIBAgIQG8nxIvuKxXyztHTfjSVepjANBgkqhkiG9w0BAQUFADA8
+						MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
+						aGF3dGUgU1NMIENBMB4XDTEyMDQyODAwMDAwMFoXDTE1MDYwNDIzNTk1OVowfDEL
+						MAkGA1UEBhMCR0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxQGTG9uZG9uMRsw
+						GQYDVQQKFBJUaGUgTG9uZG9uIExpYnJhcnkxCzAJBgNVBAsUAklUMSEwHwYDVQQD
+						FBhpZHAyLmxvbmRvbmxpYnJhcnkuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
+						DwAwggEKAoIBAQCv+8/P1qUVuZp/ZdIC9WN9+xiUJWmUynBYtQK3i1CQwTIOA8UL
+						5dwQjoSL57qs+CtTidKRHtbVjjh79Cn0J78eMPvhDZvz0eUuXDE+yje4dgzQiAgf
+						lgXC93GKbVDL0McjdMB0CigzHNHeMND+iW23NPjF/3uKfJ5kE2PSbT0NX6aQThIz
+						wkK+EVxi1JkK8/Kp0vJtIsjtOVQ38F/orX0v5Ma7PrjGCrMy0JTBrPYgN7MaHIIh
+						LHIKQ1cPewrXzEsuE3wjrpmEDUUkIR8ukibGARZU+zboHJII1Ay8Ug9gsJmEYlMx
+						AmLyMygjQEjgR6lFOC24EdkutgAIVmNkpQnnAgMBAAGjgaAwgZ0wDAYDVR0TAQH/
+						BAIwADA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vc3ZyLW92LWNybC50aGF3dGUu
+						Y29tL1RoYXd0ZU9WLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+						MgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZodHRwOi8vb2NzcC50aGF3dGUu
+						Y29tMA0GCSqGSIb3DQEBBQUAA4IBAQAUhOnO2siR+2vwEs/ayu2pznMNNTx++izD
+						L/0uxkCZVz2pJ0+amHrOdKTT2kxh/qE80QImdF4kncIQm1rNIy+exV9akY7j57er
+						OJt2Mriawe/vSwGDHA7j2rbBY+an/9GO3uKa5tshw1DCGgd5SKqqKrMJ8N9skB6R
+						xVsS0Rv7iOHM59cjLbXT9gW/MWeFcyN1OwhGfYZkyZ8rCKLmnZdc2TdIlFKYpCOw
+						Eya/cRt7jDIbirOzzJUOFlBg2jE3/+MSyeCQFcR4iv1FzjTj3DpVWPRwEz3fYAuf
+						hEQrOAW36sXQOEdmYgyivReyetd4+GSQT2HToCThGg9ttO+q7C7J
+					</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID4zCCAsugAwIBAgIQG8nxIvuKxXyztHTfjSVepjANBgkqhkiG9w0BAQUFADA8
+						MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
+						aGF3dGUgU1NMIENBMB4XDTEyMDQyODAwMDAwMFoXDTE1MDYwNDIzNTk1OVowfDEL
+						MAkGA1UEBhMCR0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxQGTG9uZG9uMRsw
+						GQYDVQQKFBJUaGUgTG9uZG9uIExpYnJhcnkxCzAJBgNVBAsUAklUMSEwHwYDVQQD
+						FBhpZHAyLmxvbmRvbmxpYnJhcnkuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
+						DwAwggEKAoIBAQCv+8/P1qUVuZp/ZdIC9WN9+xiUJWmUynBYtQK3i1CQwTIOA8UL
+						5dwQjoSL57qs+CtTidKRHtbVjjh79Cn0J78eMPvhDZvz0eUuXDE+yje4dgzQiAgf
+						lgXC93GKbVDL0McjdMB0CigzHNHeMND+iW23NPjF/3uKfJ5kE2PSbT0NX6aQThIz
+						wkK+EVxi1JkK8/Kp0vJtIsjtOVQ38F/orX0v5Ma7PrjGCrMy0JTBrPYgN7MaHIIh
+						LHIKQ1cPewrXzEsuE3wjrpmEDUUkIR8ukibGARZU+zboHJII1Ay8Ug9gsJmEYlMx
+						AmLyMygjQEjgR6lFOC24EdkutgAIVmNkpQnnAgMBAAGjgaAwgZ0wDAYDVR0TAQH/
+						BAIwADA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vc3ZyLW92LWNybC50aGF3dGUu
+						Y29tL1RoYXd0ZU9WLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+						MgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZodHRwOi8vb2NzcC50aGF3dGUu
+						Y29tMA0GCSqGSIb3DQEBBQUAA4IBAQAUhOnO2siR+2vwEs/ayu2pznMNNTx++izD
+						L/0uxkCZVz2pJ0+amHrOdKTT2kxh/qE80QImdF4kncIQm1rNIy+exV9akY7j57er
+						OJt2Mriawe/vSwGDHA7j2rbBY+an/9GO3uKa5tshw1DCGgd5SKqqKrMJ8N9skB6R
+						xVsS0Rv7iOHM59cjLbXT9gW/MWeFcyN1OwhGfYZkyZ8rCKLmnZdc2TdIlFKYpCOw
+						Eya/cRt7jDIbirOzzJUOFlBg2jE3/+MSyeCQFcR4iv1FzjTj3DpVWPRwEz3fYAuf
+						hEQrOAW36sXQOEdmYgyivReyetd4+GSQT2HToCThGg9ttO+q7C7J
+					</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</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
new file mode 100644
index 00000000..b2b6aa4f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.port.ac.uk-entity.xml
@@ -0,0 +1,81 @@
+<?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>
+      <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>
+						MIIDTjCCAjagAwIBAgIIftqCJVvJwqUwDQYJKoZIhvcNAQEFBQAwPjEhMB8GA1UE
+						CgwYVW5pdmVyc2l0eSBvZiBQb3J0c21vdXRoMRkwFwYDVQQDDBBsb2dpbi5wb3J0
+						LmFjLnVrMB4XDTE0MTAyODExNTcxMloXDTI0MTAyODExNTcxMlowPjEhMB8GA1UE
+						CgwYVW5pdmVyc2l0eSBvZiBQb3J0c21vdXRoMRkwFwYDVQQDDBBsb2dpbi5wb3J0
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk31FOVIiRM7z
+						dB5k57jOpNV8XtPX9xHkG7QGfIgeQ1GXwmh6rRrvV9efqFHIpYJakQmN7D1txhj2
+						KWgDCMF3tI47U/gcHs4q72V2ZMfxeAbcFdlsAuElScHENzgIRPqaNh2vg69Q3OOz
+						HcFJ9jm0kHk0OMXmg2m9a8+Hm/3Vg4IxamOPgwdFarSYPq1jkSG7TatF/RaniQzw
+						bBx7R0qc7DzPypf7PxqN+PHJ2NT7Fsva/NX5xpjzdbgrA+WaMdxLo3RM+nOhf/ZR
+						k9sYARRU3lMdaZJFXkkzXbFoEysyjH0qntyFAgDNF1UOdQCKRhUZCdwJCZ/txg0A
+						Vf1L6Q41YQIDAQABo1AwTjAdBgNVHQ4EFgQUGwjLRWjwjSNmYX7Q0R4d83V+Hu0w
+						HwYDVR0jBBgwFoAUGwjLRWjwjSNmYX7Q0R4d83V+Hu0wDAYDVR0TBAUwAwEB/zAN
+						BgkqhkiG9w0BAQUFAAOCAQEAXHzPNejZlDRxS6S9WqhPYMA5j7WHyHnRmBfSerO4
+						rnHRqJrXiHdGdp5ARuX54UxvNFjkVgMyCeE1Esyun6eUtqedqwzq+BEHr4m6t3ex
+						g/VroisodnXdOzgM13bwkiNsVJGRF9d4aDYLC6y+tyxY98k20vSyELEgHtiderYE
+						G2GsiaSRvDIVRyXcESOkQl1NEgE6v/i/qZk/C/Fp87abpjiEHqVSGTt46E7g2QvW
+						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>
+						MIIDTjCCAjagAwIBAgIIftqCJVvJwqUwDQYJKoZIhvcNAQEFBQAwPjEhMB8GA1UE
+						CgwYVW5pdmVyc2l0eSBvZiBQb3J0c21vdXRoMRkwFwYDVQQDDBBsb2dpbi5wb3J0
+						LmFjLnVrMB4XDTE0MTAyODExNTcxMloXDTI0MTAyODExNTcxMlowPjEhMB8GA1UE
+						CgwYVW5pdmVyc2l0eSBvZiBQb3J0c21vdXRoMRkwFwYDVQQDDBBsb2dpbi5wb3J0
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk31FOVIiRM7z
+						dB5k57jOpNV8XtPX9xHkG7QGfIgeQ1GXwmh6rRrvV9efqFHIpYJakQmN7D1txhj2
+						KWgDCMF3tI47U/gcHs4q72V2ZMfxeAbcFdlsAuElScHENzgIRPqaNh2vg69Q3OOz
+						HcFJ9jm0kHk0OMXmg2m9a8+Hm/3Vg4IxamOPgwdFarSYPq1jkSG7TatF/RaniQzw
+						bBx7R0qc7DzPypf7PxqN+PHJ2NT7Fsva/NX5xpjzdbgrA+WaMdxLo3RM+nOhf/ZR
+						k9sYARRU3lMdaZJFXkkzXbFoEysyjH0qntyFAgDNF1UOdQCKRhUZCdwJCZ/txg0A
+						Vf1L6Q41YQIDAQABo1AwTjAdBgNVHQ4EFgQUGwjLRWjwjSNmYX7Q0R4d83V+Hu0w
+						HwYDVR0jBBgwFoAUGwjLRWjwjSNmYX7Q0R4d83V+Hu0wDAYDVR0TBAUwAwEB/zAN
+						BgkqhkiG9w0BAQUFAAOCAQEAXHzPNejZlDRxS6S9WqhPYMA5j7WHyHnRmBfSerO4
+						rnHRqJrXiHdGdp5ARuX54UxvNFjkVgMyCeE1Esyun6eUtqedqwzq+BEHr4m6t3ex
+						g/VroisodnXdOzgM13bwkiNsVJGRF9d4aDYLC6y+tyxY98k20vSyELEgHtiderYE
+						G2GsiaSRvDIVRyXcESOkQl1NEgE6v/i/qZk/C/Fp87abpjiEHqVSGTt46E7g2QvW
+						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>
diff --git a/swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml
new file mode 100644
index 00000000..f08ebc06
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-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">
+http://cofre.reuna.cl/index.php/es/reglas-federacion
+</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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>
+MIIGXDCCBUSgAwIBAgIDEE36MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTA1MDk0MTU4
+WhcNMTUwNTA1MTYzNjQyWjBsMRkwFwYDVQQNExBIRkVrbXIzMEliM2VrYzgyMQsw
+CQYDVQQGEwJVWTEaMBgGA1UEAxMRaWRwMi5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG
+9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA789b8ZQhtUF0MlgLSW1ARfe8RIm2OmXBlMc9gdjrPF4Y
+rKySIm/wDmzwzVG0AhL9/OwRleXs+RrEPyo6/k5z1RxNIHs5y8CcnNFRAxFMWIFZ
+qrkDYfMo/GJcM1BHJ1HoTNKcXviVXvzag5Ca1h3Nogp8Sdp8K+vdIozT5URWmkbU
+JGnRdr82MqvqT4IpFSJ5bUPe1G50cV82h0zQvDVTlk2mo4GFS/B+g1t6yA3dlQn6
+O7gCz+LU/3rDiS/XnI2Qk50k/oNEBGq5VLRv68dv5JnAl17AWWi18dGDKSTY0Zds
+ER9Kn6eFH+4PSnB9IyVxAmjeG85d79PqQBpO4qzu3wIDAQABo4IC5DCCAuAwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFO43JOeGzab8H3c9zLqeuFlaDcOKMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr
+CPfMZC7vDixFMCoGA1UdEQQjMCGCEWlkcDIucmVkY2xhcmEubmV0ggxyZWRjbGFy
+YS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwEC
+AzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
+eS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNj
+b3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9m
+IHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBp
+bnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFy
+dHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3Rh
+cnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEF
+BQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVy
+L2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9z
+dWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5z
+dGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAi6p7SBeDWUNY52CEwi/Cy
+aDobEkEhR2afn6U1Aa7GEYnQ3fLHdmINfXA6n7JIApWsgD9PML6czu7H1X+DsLAK
+quKoDM/9IGe6yhLlKfH2tBxwGcFo8guaKNZd9HztOONj7dkNvGwX9uzMVAXarCw/
++P5NwH3C2Ay5ZJs5oLIh4y6yCS3/I1exOQqIBlZPdIQxqVt2B4Fm0mWXENfpA9N3
+RWQrN7vxHeMorebLpkx6Z8+tw3Svi9Z2oP1vPbnUJpFragDqNoZw6K9Crf/JTqD9
+HtCRp1bLRxJ4Ysu5HdV+kAcTelR3MyDYe/gAGAb5Wu7hmNn3NAwwrFn0TygkPzvl
+</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>
+MIIGXDCCBUSgAwIBAgIDEE36MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTA1MDk0MTU4
+WhcNMTUwNTA1MTYzNjQyWjBsMRkwFwYDVQQNExBIRkVrbXIzMEliM2VrYzgyMQsw
+CQYDVQQGEwJVWTEaMBgGA1UEAxMRaWRwMi5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG
+9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA789b8ZQhtUF0MlgLSW1ARfe8RIm2OmXBlMc9gdjrPF4Y
+rKySIm/wDmzwzVG0AhL9/OwRleXs+RrEPyo6/k5z1RxNIHs5y8CcnNFRAxFMWIFZ
+qrkDYfMo/GJcM1BHJ1HoTNKcXviVXvzag5Ca1h3Nogp8Sdp8K+vdIozT5URWmkbU
+JGnRdr82MqvqT4IpFSJ5bUPe1G50cV82h0zQvDVTlk2mo4GFS/B+g1t6yA3dlQn6
+O7gCz+LU/3rDiS/XnI2Qk50k/oNEBGq5VLRv68dv5JnAl17AWWi18dGDKSTY0Zds
+ER9Kn6eFH+4PSnB9IyVxAmjeG85d79PqQBpO4qzu3wIDAQABo4IC5DCCAuAwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFO43JOeGzab8H3c9zLqeuFlaDcOKMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr
+CPfMZC7vDixFMCoGA1UdEQQjMCGCEWlkcDIucmVkY2xhcmEubmV0ggxyZWRjbGFy
+YS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwEC
+AzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
+eS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNj
+b3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9m
+IHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBp
+bnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFy
+dHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3Rh
+cnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEF
+BQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVy
+L2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9z
+dWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5z
+dGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAi6p7SBeDWUNY52CEwi/Cy
+aDobEkEhR2afn6U1Aa7GEYnQ3fLHdmINfXA6n7JIApWsgD9PML6czu7H1X+DsLAK
+quKoDM/9IGe6yhLlKfH2tBxwGcFo8guaKNZd9HztOONj7dkNvGwX9uzMVAXarCw/
++P5NwH3C2Ay5ZJs5oLIh4y6yCS3/I1exOQqIBlZPdIQxqVt2B4Fm0mWXENfpA9N3
+RWQrN7vxHeMorebLpkx6Z8+tw3Svi9Z2oP1vPbnUJpFragDqNoZw6K9Crf/JTqD9
+HtCRp1bLRxJ4Ysu5HdV+kAcTelR3MyDYe/gAGAb5Wu7hmNn3NAwwrFn0TygkPzvl
+</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">http://www.redclara.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Carlos Gonzalez</md:SurName>
+    <md:EmailAddress>carlos.gonzalez@redclara.net</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
new file mode 100644
index 00000000..89c175bc
--- /dev/null
+++ b/swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,111 @@
+<?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"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEbTCCA1WgAwIBAgIQD37jMrv/ilUrfisl2656RjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDQwNDAwMDAwMFoXDTE2MDQwMzIzNTk1OVowPjEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBpZHAzLmJ1Y2tz
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7mQCL3VNnsub
+						KOIwNicoFGR7eXPwqyXu/GI3B+88ZlWfKqyrgbjgHvI1TQGuOA30eZa+BQ8oE6ba
+						eugWOQfAXGVKFWV84Zn+BUheq0lJOr6iLqk34rSg2WXAB70AqiF8t8rTkGFwcaXd
+						/E+Ur1o4yicFAVkiC5Knnuxi9RUR/YUjN4X3/JmKrbZL6UGCQdgtAcZHNhRVr+4U
+						Awbkt7auBk1+47NNuS+z5+QNxw+FOeeWaWWfogNuYT4oVdvmVe2xqvKwZsT0lJfa
+						cD9CDd5zMUBrj95OeNGqAs3UtBZyJ8+WeCCnISmSLvfIx33j0wOf/gRkDGo4My8c
+						XFSXDITeCQIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+						6pDjue0wHQYDVR0OBBYEFEaX2Ffnub92Gu5nd0efBgpPl26LMA4GA1UdDwEB/wQE
+						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+						cC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAzLmJ1Y2tzLmFjLnVrMA0G
+						CSqGSIb3DQEBBQUAA4IBAQBwutInsCS1qellB/wBmWl4+p+AQCHlDTy3Y7Gjf0cq
+						YBxX+WIMK9SImrghfyup5oeNW48ZyoYCFPrvVi5TnD0ePLEmq2OlwS5QPze5Mcj1
+						nc6ZN1AZ/NoGjruL5VPXnqqpBtZhdiqJTVhz4e3Cu7aMNdvrmp1N9OmErTjzUgPM
+						cguZEpCIsvjpOFM3DFJipy2cgw+pm8D5UWFJSnh9tabIl3JlSzqKs4/8fg/Bt+rm
+						j/vHB25TABxWABlqgiECCNu769HoO1GyA2D5ndq1TpitlxwRKomochfdj/dzBnUb
+						h5Z+5jD6KctmouJkUll6AJeuyu7XmvyP37oXnKxI0SPh
+					</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 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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEbTCCA1WgAwIBAgIQD37jMrv/ilUrfisl2656RjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDQwNDAwMDAwMFoXDTE2MDQwMzIzNTk1OVowPjEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBpZHAzLmJ1Y2tz
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7mQCL3VNnsub
+						KOIwNicoFGR7eXPwqyXu/GI3B+88ZlWfKqyrgbjgHvI1TQGuOA30eZa+BQ8oE6ba
+						eugWOQfAXGVKFWV84Zn+BUheq0lJOr6iLqk34rSg2WXAB70AqiF8t8rTkGFwcaXd
+						/E+Ur1o4yicFAVkiC5Knnuxi9RUR/YUjN4X3/JmKrbZL6UGCQdgtAcZHNhRVr+4U
+						Awbkt7auBk1+47NNuS+z5+QNxw+FOeeWaWWfogNuYT4oVdvmVe2xqvKwZsT0lJfa
+						cD9CDd5zMUBrj95OeNGqAs3UtBZyJ8+WeCCnISmSLvfIx33j0wOf/gRkDGo4My8c
+						XFSXDITeCQIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+						6pDjue0wHQYDVR0OBBYEFEaX2Ffnub92Gu5nd0efBgpPl26LMA4GA1UdDwEB/wQE
+						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+						cC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAzLmJ1Y2tzLmFjLnVrMA0G
+						CSqGSIb3DQEBBQUAA4IBAQBwutInsCS1qellB/wBmWl4+p+AQCHlDTy3Y7Gjf0cq
+						YBxX+WIMK9SImrghfyup5oeNW48ZyoYCFPrvVi5TnD0ePLEmq2OlwS5QPze5Mcj1
+						nc6ZN1AZ/NoGjruL5VPXnqqpBtZhdiqJTVhz4e3Cu7aMNdvrmp1N9OmErTjzUgPM
+						cguZEpCIsvjpOFM3DFJipy2cgw+pm8D5UWFJSnh9tabIl3JlSzqKs4/8fg/Bt+rm
+						j/vHB25TABxWABlqgiECCNu769HoO1GyA2D5ndq1TpitlxwRKomochfdj/dzBnUb
+						h5Z+5jD6KctmouJkUll6AJeuyu7XmvyP37oXnKxI0SPh
+					</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:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.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 (Test Only)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bucks.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ITHelpdesk</md:GivenName>
+    <md:EmailAddress>mailto:it@bucks.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Thompson</md:SurName>
+    <md:EmailAddress>mailto:Michael.Thompson@bucks.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
new file mode 100644
index 00000000..49b0a7f0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp4.halesowen.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ2STl9SssEcCIdJ
+						TOOLkqRtw7yeG3rQMdqUS7cKflWKfxoXwxLlSs0RJTPO2HubTUuzENfE2XF96gE+
+						VfZSDN+R2hKJvTUFlt49YN7Wfu8bUDeVAiLbv1eVs9syHtMQEa7CtFXssrXuQxJ6
+						iGA7eeL9llbnN4WoGsDNUIYrkKrKo25hPkiFgkxXGFr4IcnJAO4Ftjvu0m/v0YQL
+						JGbHeCSwOL3/giBUHQsTQLxzPibc1rfVZv7r3ZdF4QMivb93nxKjO1WNtAH/9YRZ
+						BbGknDfG5QeFCNFqIRPSeO98U0/WSwK/+Rz05xSEdHp8rWIEpwNuUpPQjUYg+QDm
+						CrlEAPUCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwNC5oYWxlc293ZW4uYWMudWuG
+						K2h0dHBzOi8vaWRwNC5oYWxlc293ZW4uYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
+						VR0OBBYEFHJgh1AYz5+Z2R0MUD13TjbR55T1MA0GCSqGSIb3DQEBBQUAA4IBAQAz
+						+5Fks4TIm7jqC4pEP7rjaugHhh6eZfvpcpOcyu3W0LdSrJIKCEn+3qRJZ+g/7OFX
+						HLwytVyzttZlLqkErt0YqD/T721wn6Jl2DNzzX/v0a9ZOsoc31VyF5/QSX7uemK7
+						nMNDB9tIa5f8vFQfhm1NV+ylIklSs2grP7V4bwggOQLiHfHIYW+E+Jza8QonqLjO
+						fUPwUBv6HaTHNbY7emeX8d6vb9mURX5kiPlel75zRuSDe3j2XaBNdzJ6djtWPMqa
+						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>
+						MIIDOzCCAiOgAwIBAgIUK9oe82/zsqUqklJuya/xb+7Fj7swDQYJKoZIhvcNAQEF
+						BQAwHzEdMBsGA1UEAxMUaWRwNC5oYWxlc293ZW4uYWMudWswHhcNMTIwNjA2MDky
+						NjQ4WhcNMzIwNjA2MDkyNjQ4WjAfMR0wGwYDVQQDExRpZHA0LmhhbGVzb3dlbi5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ2STl9SssEcCIdJ
+						TOOLkqRtw7yeG3rQMdqUS7cKflWKfxoXwxLlSs0RJTPO2HubTUuzENfE2XF96gE+
+						VfZSDN+R2hKJvTUFlt49YN7Wfu8bUDeVAiLbv1eVs9syHtMQEa7CtFXssrXuQxJ6
+						iGA7eeL9llbnN4WoGsDNUIYrkKrKo25hPkiFgkxXGFr4IcnJAO4Ftjvu0m/v0YQL
+						JGbHeCSwOL3/giBUHQsTQLxzPibc1rfVZv7r3ZdF4QMivb93nxKjO1WNtAH/9YRZ
+						BbGknDfG5QeFCNFqIRPSeO98U0/WSwK/+Rz05xSEdHp8rWIEpwNuUpPQjUYg+QDm
+						CrlEAPUCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwNC5oYWxlc293ZW4uYWMudWuG
+						K2h0dHBzOi8vaWRwNC5oYWxlc293ZW4uYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
+						VR0OBBYEFHJgh1AYz5+Z2R0MUD13TjbR55T1MA0GCSqGSIb3DQEBBQUAA4IBAQAz
+						+5Fks4TIm7jqC4pEP7rjaugHhh6eZfvpcpOcyu3W0LdSrJIKCEn+3qRJZ+g/7OFX
+						HLwytVyzttZlLqkErt0YqD/T721wn6Jl2DNzzX/v0a9ZOsoc31VyF5/QSX7uemK7
+						nMNDB9tIa5f8vFQfhm1NV+ylIklSs2grP7V4bwggOQLiHfHIYW+E+Jza8QonqLjO
+						fUPwUBv6HaTHNbY7emeX8d6vb9mURX5kiPlel75zRuSDe3j2XaBNdzJ6djtWPMqa
+						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>
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
new file mode 100644
index 00000000..fa954951
--- /dev/null
+++ b/swamid-interfederations-2.0/idpcafe.ifsc.edu.br-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIDqDCCApACAQAwDQYJKoZIhvcNAQEFBQAwgZkxLDAqBgNVBAoTI0luc3RpdHV0
+byBGZWRlcmFsIGRlIFNhbnRhIENhdGFyaW5hMQ0wCwYDVQQLEwREVElDMRYwFAYD
+VQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkG
+A1UEBhMCQlIxHDAaBgNVBAMTE2lkcGNhZmUuaWZzYy5lZHUuYnIwHhcNMTQwNDEx
+MTg1ODA4WhcNMTcwNDEwMTg1ODA4WjCBmTEsMCoGA1UEChMjSW5zdGl0dXRvIEZl
+ZGVyYWwgZGUgU2FudGEgQ2F0YXJpbmExDTALBgNVBAsTBERUSUMxFjAUBgNVBAcT
+DUZsb3JpYW5vcG9saXMxFzAVBgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQG
+EwJCUjEcMBoGA1UEAxMTaWRwY2FmZS5pZnNjLmVkdS5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAN9zndckjBha7MXIXo7pc8deKLY8l4j2LLmbN/PE
+DDirotT2nuxdk0zGBKCpB3ZxHTN83MjBSGLQ205com7jbuFxzAgTFyB8GKJU3E4L
+7htHjpbNhbI7j9VLjbHcEZJeilEj+jViGUjgH1G7QO1GIpIPEakOzSOMWfvsl54E
+VgjK0PEBB4CUqGKHl1Rxu8D9jKLzD3TiciAWqSdwRFpyhfed7xqj4AHA49Sljpbr
+TOttEQ7RxmNEXApvMzTTyVJSeBae9+jcNKypp7VTB5YZcI4YI9HkE599xiNjK19q
+XrHrTu9RAg/21yTrmGOJRPdJtjRbc6skG1+cDMhbSezCInkCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAc/Sgpg8yWTUBY45Yp1Rs4yY3r3kLlK771TdEIVK6uQbLIwzo
+/cidWUp9F7HoJSlT478Z1kpGVDw/nqX9HVKXVcwaGdpae2zq6SBVSmGuwx6WkI0+
+fHw5DsGkY5CuMXIDRGW3G8uhO2dVIqSUaju1W8UCCrZbcWCWQJHPtDe7zGRgtuQV
++uFs8FxtcQnLGOe0GmT48n9jW0ylQYrG5nbQ7jd0XQSGFMvuWj0tvM+i4q4XefHW
+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>
+      
+MIIDqDCCApACAQAwDQYJKoZIhvcNAQEFBQAwgZkxLDAqBgNVBAoTI0luc3RpdHV0
+byBGZWRlcmFsIGRlIFNhbnRhIENhdGFyaW5hMQ0wCwYDVQQLEwREVElDMRYwFAYD
+VQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkG
+A1UEBhMCQlIxHDAaBgNVBAMTE2lkcGNhZmUuaWZzYy5lZHUuYnIwHhcNMTQwNDEx
+MTg1ODA4WhcNMTcwNDEwMTg1ODA4WjCBmTEsMCoGA1UEChMjSW5zdGl0dXRvIEZl
+ZGVyYWwgZGUgU2FudGEgQ2F0YXJpbmExDTALBgNVBAsTBERUSUMxFjAUBgNVBAcT
+DUZsb3JpYW5vcG9saXMxFzAVBgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQG
+EwJCUjEcMBoGA1UEAxMTaWRwY2FmZS5pZnNjLmVkdS5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAN9zndckjBha7MXIXo7pc8deKLY8l4j2LLmbN/PE
+DDirotT2nuxdk0zGBKCpB3ZxHTN83MjBSGLQ205com7jbuFxzAgTFyB8GKJU3E4L
+7htHjpbNhbI7j9VLjbHcEZJeilEj+jViGUjgH1G7QO1GIpIPEakOzSOMWfvsl54E
+VgjK0PEBB4CUqGKHl1Rxu8D9jKLzD3TiciAWqSdwRFpyhfed7xqj4AHA49Sljpbr
+TOttEQ7RxmNEXApvMzTTyVJSeBae9+jcNKypp7VTB5YZcI4YI9HkE599xiNjK19q
+XrHrTu9RAg/21yTrmGOJRPdJtjRbc6skG1+cDMhbSezCInkCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAc/Sgpg8yWTUBY45Yp1Rs4yY3r3kLlK771TdEIVK6uQbLIwzo
+/cidWUp9F7HoJSlT478Z1kpGVDw/nqX9HVKXVcwaGdpae2zq6SBVSmGuwx6WkI0+
+fHw5DsGkY5CuMXIDRGW3G8uhO2dVIqSUaju1W8UCCrZbcWCWQJHPtDe7zGRgtuQV
++uFs8FxtcQnLGOe0GmT48n9jW0ylQYrG5nbQ7jd0XQSGFMvuWj0tvM+i4q4XefHW
+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>
diff --git a/swamid-interfederations-2.0/idpcafe.ufjf.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idpcafe.ufjf.br-idp-shibboleth.xml
new file mode 100644
index 00000000..d34ff7ab
--- /dev/null
+++ b/swamid-interfederations-2.0/idpcafe.ufjf.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxNDAyBgNVBAoTK1VGSkYgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBKdWl6IGRlIEZvcmExDTALBgNVBAsTBENH
+Q08xJzAlBgkqhkiG9w0BCQEWGGVuZ2VuaGFyaWEucmVkZXNAdWZqZi5icjEVMBMG
+A1UEBxMMSnVpeiBkZSBGb3JhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNV
+BAYTAkJSMRgwFgYDVQQDEw9pZHBjYWZlLnVmamYuYnIwHhcNMTQwNTE1MTI1NDA4
+WhcNMTcwNTE0MTI1NDA4WjCBwzE0MDIGA1UEChMrVUZKRiAtIFVuaXZlcnNpZGFk
+ZSBGZWRlcmFsIGRlIEp1aXogZGUgRm9yYTENMAsGA1UECxMEQ0dDTzEnMCUGCSqG
+SIb3DQEJARYYZW5nZW5oYXJpYS5yZWRlc0B1ZmpmLmJyMRUwEwYDVQQHEwxKdWl6
+IGRlIEZvcmExFTATBgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxGDAW
+BgNVBAMTD2lkcGNhZmUudWZqZi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALchDbtE8aCMl4QLHxwYXSd6XUKkGLr8MUTeRqanArp6GjbPdmRCVXXD
+1jQxYKOreu3FAe6HA5N+miqKs6/lYFspfiYv3hhv7kYjvch8HDde2Y4dBb6R/tDv
+RronbnX/7yHnlYvVgJsgG8vAvvk8G2i8DkFxXm2voBgd1oZKFCxZ91u5VspOZBll
+9IpRo92eV4s2r4gA29Y5PTt+9QhKcYbwqbY0H/qOsrDUUw3N6eHkbMCmTbTwF9QQ
+9kdGNE9kqsCpVe2pvdDRufAGM2lhW9FRQ7TtQVM2W05gAKqM/gtqmFTHcXOW61s9
+1UNQHy950x3+6XV5uPSJ5goWVH/IBq8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ZvdlVROsCPu31t4NMLcJffMJ3UczKuQz/hnpqFopzHx/ZzAvA2qh7EyyDSKZYcVb
+u1Ot25INLgEMywDAE54zD5kzPiWqe7L1ozoXoO5KB3wLPn6E61JVq4T4OJDdKyJy
++laNFVPumFJ1OoOJimQW5s8LhuW7cwIojE5r0Mi5M8lxuazQIxMUMsOy+cjvEJ1l
+4xAqcBQPPzN8BS9nh21wZ0yrpxDTk7WhASv+OmjFhod5fyYdWrATt/7ayoP3lNv9
+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>
+      
+MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxNDAyBgNVBAoTK1VGSkYgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBKdWl6IGRlIEZvcmExDTALBgNVBAsTBENH
+Q08xJzAlBgkqhkiG9w0BCQEWGGVuZ2VuaGFyaWEucmVkZXNAdWZqZi5icjEVMBMG
+A1UEBxMMSnVpeiBkZSBGb3JhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNV
+BAYTAkJSMRgwFgYDVQQDEw9pZHBjYWZlLnVmamYuYnIwHhcNMTQwNTE1MTI1NDA4
+WhcNMTcwNTE0MTI1NDA4WjCBwzE0MDIGA1UEChMrVUZKRiAtIFVuaXZlcnNpZGFk
+ZSBGZWRlcmFsIGRlIEp1aXogZGUgRm9yYTENMAsGA1UECxMEQ0dDTzEnMCUGCSqG
+SIb3DQEJARYYZW5nZW5oYXJpYS5yZWRlc0B1ZmpmLmJyMRUwEwYDVQQHEwxKdWl6
+IGRlIEZvcmExFTATBgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxGDAW
+BgNVBAMTD2lkcGNhZmUudWZqZi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALchDbtE8aCMl4QLHxwYXSd6XUKkGLr8MUTeRqanArp6GjbPdmRCVXXD
+1jQxYKOreu3FAe6HA5N+miqKs6/lYFspfiYv3hhv7kYjvch8HDde2Y4dBb6R/tDv
+RronbnX/7yHnlYvVgJsgG8vAvvk8G2i8DkFxXm2voBgd1oZKFCxZ91u5VspOZBll
+9IpRo92eV4s2r4gA29Y5PTt+9QhKcYbwqbY0H/qOsrDUUw3N6eHkbMCmTbTwF9QQ
+9kdGNE9kqsCpVe2pvdDRufAGM2lhW9FRQ7TtQVM2W05gAKqM/gtqmFTHcXOW61s9
+1UNQHy950x3+6XV5uPSJ5goWVH/IBq8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ZvdlVROsCPu31t4NMLcJffMJ3UczKuQz/hnpqFopzHx/ZzAvA2qh7EyyDSKZYcVb
+u1Ot25INLgEMywDAE54zD5kzPiWqe7L1ozoXoO5KB3wLPn6E61JVq4T4OJDdKyJy
++laNFVPumFJ1OoOJimQW5s8LhuW7cwIojE5r0Mi5M8lxuazQIxMUMsOy+cjvEJ1l
+4xAqcBQPPzN8BS9nh21wZ0yrpxDTk7WhASv+OmjFhod5fyYdWrATt/7ayoP3lNv9
+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>
diff --git a/swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml
new file mode 100644
index 00000000..a32b9195
--- /dev/null
+++ b/swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIEADCCAugCAQAwDQYJKoZIhvcNAQELBQAwgcUxIjAgBgNVBAoTGVVOSVZFUlNJ
+REFERSBERSBTQU8gUEFVTE8xNTAzBgNVBAsTLFNVUEVSSU5URU5ERU5DSUEgREUg
+VEVDTk9MT0dJQSBEQSBJTkZPUk1BQ0FPMRowGAYJKoZIhvcNAQkBFgtzY252QHVz
+cC5icjESMBAGA1UEBxMJU0FPIFBBVUxPMRIwEAYDVQQIEwlTQU8gUEFVTE8xCzAJ
+BgNVBAYTAkJSMRcwFQYDVQQDEw5pZHBjYWZlLnVzcC5icjAeFw0xNDExMDQyMzU5
+MDNaFw0xOTExMDMyMzU5MDNaMIHFMSIwIAYDVQQKExlVTklWRVJTSURBREUgREUg
+U0FPIFBBVUxPMTUwMwYDVQQLEyxTVVBFUklOVEVOREVOQ0lBIERFIFRFQ05PTE9H
+SUEgREEgSU5GT1JNQUNBTzEaMBgGCSqGSIb3DQEJARYLc2NudkB1c3AuYnIxEjAQ
+BgNVBAcTCVNBTyBQQVVMTzESMBAGA1UECBMJU0FPIFBBVUxPMQswCQYDVQQGEwJC
+UjEXMBUGA1UEAxMOaWRwY2FmZS51c3AuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC2k4nQeMwb/eT3VPbza4lVzks+rAnc9t5rc2YmWOYYk+wMBEU7
+itfeBxaXpetPRMubgW3SrQO7DLwBEfoQQ0nj0gy9zusJdeYZU/BlKwyCgs2ScGqn
+Mki+TJOieVhOumPSOULNOE+xEzAqjS1V55H6DkXklte8F6UjNyIyd9x5id58prJK
+ZpClqQMorVrhxF3A99jQK4Pupcqhy+mQOoA51Cge4ZubdlXIrzk0SFwwS9XB8//S
+xeHyN3dTiXLafJ+WfDx6uBKYQbzRKT2QC/KWbL03Rxd2wmoldNHJXDlseq++UFYY
+kRA9vE92sg40zwjqnO/5V7AdpJ38CNKAEZ41AgMBAAEwDQYJKoZIhvcNAQELBQAD
+ggEBAAAd8mF0jClrCZ46eYceZ95KA+XfkY0ViAyHW/13wc07M7gGgurLQgYHdMNZ
+MYJoyB1HrwdliS/ZpfEspWhtvnmMRNLYOnghDlFE5pSRo53/qtQ2VqwvZv6xtcnx
+uMdDVtbXn8txZi6T3n6nNn/JwYA3ANUJKHfo0eE+E5E+Xdl7APBeOZLYdjhQykzM
+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>
+      
+MIIEADCCAugCAQAwDQYJKoZIhvcNAQELBQAwgcUxIjAgBgNVBAoTGVVOSVZFUlNJ
+REFERSBERSBTQU8gUEFVTE8xNTAzBgNVBAsTLFNVUEVSSU5URU5ERU5DSUEgREUg
+VEVDTk9MT0dJQSBEQSBJTkZPUk1BQ0FPMRowGAYJKoZIhvcNAQkBFgtzY252QHVz
+cC5icjESMBAGA1UEBxMJU0FPIFBBVUxPMRIwEAYDVQQIEwlTQU8gUEFVTE8xCzAJ
+BgNVBAYTAkJSMRcwFQYDVQQDEw5pZHBjYWZlLnVzcC5icjAeFw0xNDExMDQyMzU5
+MDNaFw0xOTExMDMyMzU5MDNaMIHFMSIwIAYDVQQKExlVTklWRVJTSURBREUgREUg
+U0FPIFBBVUxPMTUwMwYDVQQLEyxTVVBFUklOVEVOREVOQ0lBIERFIFRFQ05PTE9H
+SUEgREEgSU5GT1JNQUNBTzEaMBgGCSqGSIb3DQEJARYLc2NudkB1c3AuYnIxEjAQ
+BgNVBAcTCVNBTyBQQVVMTzESMBAGA1UECBMJU0FPIFBBVUxPMQswCQYDVQQGEwJC
+UjEXMBUGA1UEAxMOaWRwY2FmZS51c3AuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC2k4nQeMwb/eT3VPbza4lVzks+rAnc9t5rc2YmWOYYk+wMBEU7
+itfeBxaXpetPRMubgW3SrQO7DLwBEfoQQ0nj0gy9zusJdeYZU/BlKwyCgs2ScGqn
+Mki+TJOieVhOumPSOULNOE+xEzAqjS1V55H6DkXklte8F6UjNyIyd9x5id58prJK
+ZpClqQMorVrhxF3A99jQK4Pupcqhy+mQOoA51Cge4ZubdlXIrzk0SFwwS9XB8//S
+xeHyN3dTiXLafJ+WfDx6uBKYQbzRKT2QC/KWbL03Rxd2wmoldNHJXDlseq++UFYY
+kRA9vE92sg40zwjqnO/5V7AdpJ38CNKAEZ41AgMBAAEwDQYJKoZIhvcNAQELBQAD
+ggEBAAAd8mF0jClrCZ46eYceZ95KA+XfkY0ViAyHW/13wc07M7gGgurLQgYHdMNZ
+MYJoyB1HrwdliS/ZpfEspWhtvnmMRNLYOnghDlFE5pSRo53/qtQ2VqwvZv6xtcnx
+uMdDVtbXn8txZi6T3n6nNn/JwYA3ANUJKHfo0eE+E5E+Xdl7APBeOZLYdjhQykzM
+utKY4CRyqBVaJhpmf1A8QzmAR+iXoI2Zh4U2xO8sWUUuxOEP1fsv1rs2VorQHrBw
+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>
diff --git a/swamid-interfederations-2.0/idpcnous.cnous.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idpcnous.cnous.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..25f98285
--- /dev/null
+++ b/swamid-interfederations-2.0/idpcnous.cnous.fr-idp-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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>
+      <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="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>
+					      MIIEgzCCA2ugAwIBAgIRAN+fTxO99oLKFyV67Q3f9oUwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMzAwMDAwMDBaFw0xNjAxMzAyMzU5NTlaMFwxCzAJBgNV
+BAYTAkZSMTEwLwYDVQQKEyhDRU5UIE5BVElPTkFMIERFUyBPRVVWUkVTIFVOSVZF
+UlNJVEFJUkVTMRowGAYDVQQDExFpZHBjbm91cy5jbm91cy5mcjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKmDZI9ioaT/upYky/FUoSsDM+ro/CmIlUQx
+878APgpaDBjBE9fDmQ2CYUcrOza6RSSfQPLxI6C6M0bRMSI73qFfipZyaBASRJlU
+K/Ksi2zE99N3+9/C44RoC5GecIw06Dh/XJAmMzMBmZC8DozWzyGqxxUvqjzmS5/X
+NPYUCIio0lATxdxn69AVMAmq13w5FTnQ5szxOs/32NHdhjC1e47i63fiuD0nfbzO
+MjPDGAP3fovPs5WCz6fboVIMvsBQmpJgAYN56OyihdcoDHjN99PeB9m4W8cbt278
++Vy8FPJai04ewnk9ZV41d7FBQcmJjiLSo1N4Bv6gbwPSuP7dKFECAwEAAaOCAWQw
+ggFgMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSi
+79FoH7qArry8MfcXBjuww+bjoTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
+BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAcBgNVHREEFTAT
+ghFpZHBjbm91cy5jbm91cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAUuPcmzXpxblf
+R0qTWKRTxfQQuH8NxLhQkpsHoARXU3DUKcpNrLkAgio1RAqJpm6S/qLssBxdFPqQ
+UFtI/C45HwIpk+X9gKFYfms5j/cX04y9+6zGJNX/rbQeLuDBmy8Ezak6ANQh0pFc
+4y8Om1X8GZuUdGxc5kN/lTiR87rRtD9Z+JX27C/dCtcvmM240w12EqNP9SsSzd4c
+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://unknown.site.com</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
new file mode 100644
index 00000000..5c0954f8
--- /dev/null
+++ b/swamid-interfederations-2.0/idpcove.trafford.ac.uk-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						ZmZvcmQuYWMudWswHhcNMTQxMjA5MTU1NTM0WhcNMzQxMjA0MTU1NTM0WjB3MQsw
+						CQYDVQQGEwJHQjETMBEGA1UECAwKQWx0cmluY2hhbTEXMBUGA1UEBwwOV2VzdCBU
+						aW1wZXJsZXkxGTAXBgNVBAoMEFRyYWZmb3JkIENvbGxlZ2UxHzAdBgNVBAMMFmlk
+						cGNvdmUudHJhZmZvcmQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+						AoIBAQD7sJfsHDjKt7dMslxllHKBiHTHBeOBLs1KDY5Kg25Sjkp02ait4oq4sQCX
+						3UDiaxMBhhmJEgw+W7wBuwClB3WCZi6aP2sat/tW9szyitzPyFC/2LZOjlNMiahF
+						8xRGXyA7tjTuZXCoY1wYhMUu4Hg6qtqHK2ttkGZ8+3zotGx43x+d3LvO5iPfJb9b
+						XPVqaEqNbwhlUoM8L9CP4o+QQGNgVfLZb24L2st0m40RJEkOZ/Z3gx7/CofZMwWX
+						B9rm2Qe7zqmXTgXvU9HJzVNHm9+TIpgWx70ShlvW23QNMhh7eVB7RCzkV8kdIzbg
+						GnIICbv71ZQCo0TlsWX2kMamS3IhAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAp+
+						Jmdx1q13B+nUfMjhccBOK4+AVqCn9+HIa7cJhaMn1sOjSzlA1DlXYPc5yUMWqybC
+						97zM0rdpEWs3Agd0N48tpRWW3g2qXksRCqIqt7c+pYzWwTzhVSx4cLqNxSkvQzye
+						nkh6J5FNsJLtf3vSLSpJMoCtA5RX2XmtzfiXT3qCX2MREhp0QsOsuJs+wrEGk5lI
+						qmdaNl77S0srnYHly4ARx00938Uh3aaj2B7/sVO9DL+4A+jrp3MPkvU4V+0kRRGM
+						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>
+						MIIDajCCAlICCQCVc3XLOQv9+zANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJH
+						QjETMBEGA1UECAwKQWx0cmluY2hhbTEXMBUGA1UEBwwOV2VzdCBUaW1wZXJsZXkx
+						GTAXBgNVBAoMEFRyYWZmb3JkIENvbGxlZ2UxHzAdBgNVBAMMFmlkcGNvdmUudHJh
+						ZmZvcmQuYWMudWswHhcNMTQxMjA5MTU1NTM0WhcNMzQxMjA0MTU1NTM0WjB3MQsw
+						CQYDVQQGEwJHQjETMBEGA1UECAwKQWx0cmluY2hhbTEXMBUGA1UEBwwOV2VzdCBU
+						aW1wZXJsZXkxGTAXBgNVBAoMEFRyYWZmb3JkIENvbGxlZ2UxHzAdBgNVBAMMFmlk
+						cGNvdmUudHJhZmZvcmQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+						AoIBAQD7sJfsHDjKt7dMslxllHKBiHTHBeOBLs1KDY5Kg25Sjkp02ait4oq4sQCX
+						3UDiaxMBhhmJEgw+W7wBuwClB3WCZi6aP2sat/tW9szyitzPyFC/2LZOjlNMiahF
+						8xRGXyA7tjTuZXCoY1wYhMUu4Hg6qtqHK2ttkGZ8+3zotGx43x+d3LvO5iPfJb9b
+						XPVqaEqNbwhlUoM8L9CP4o+QQGNgVfLZb24L2st0m40RJEkOZ/Z3gx7/CofZMwWX
+						B9rm2Qe7zqmXTgXvU9HJzVNHm9+TIpgWx70ShlvW23QNMhh7eVB7RCzkV8kdIzbg
+						GnIICbv71ZQCo0TlsWX2kMamS3IhAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAp+
+						Jmdx1q13B+nUfMjhccBOK4+AVqCn9+HIa7cJhaMn1sOjSzlA1DlXYPc5yUMWqybC
+						97zM0rdpEWs3Agd0N48tpRWW3g2qXksRCqIqt7c+pYzWwTzhVSx4cLqNxSkvQzye
+						nkh6J5FNsJLtf3vSLSpJMoCtA5RX2XmtzfiXT3qCX2MREhp0QsOsuJs+wrEGk5lI
+						qmdaNl77S0srnYHly4ARx00938Uh3aaj2B7/sVO9DL+4A+jrp3MPkvU4V+0kRRGM
+						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>
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
new file mode 100644
index 00000000..ff2e6491
--- /dev/null
+++ b/swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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 (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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDMDCCAhigAwIBAgIVAIYsx+VotYdyVTmVfMXJU4jl5M1bMA0GCSqGSIb3DQEB
+						BQUAMBwxGjAYBgNVBAMTEWlkcGRldi5iaGFtLmFjLnVrMB4XDTEzMTAyMzA3MTM0
+						MFoXDTMzMTAyMzA3MTM0MFowHDEaMBgGA1UEAxMRaWRwZGV2LmJoYW0uYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCY1FzTRZgi3cA4QNBcz4xV
+						ZFi8+EqBjDqQ2fef/4ckTS6W/nrV0qsAx7Hlthl4O1XlzGC2bk2+ZdLFFCQ4nV64
+						0/ec4Wx2UxEZXpxQjibnv0MqYbyk/J/wiAKp+xGA0NT3EOP8pCamp2QXWgZWBysR
+						kb4Rpp3NcTRUTuDMk4nevte93t0D5tExns8/INhpPrDcshTJvcqe8ceYuu8qXYC3
+						OhBfpG4xYMdosIaATTYouAFHAu3Y9x7+uhkmdkY6HxAgbHrFCQLw0NdStHjZnEMo
+						FhqUPvQ/mM7hAeLgv+ivO2onTG16pEMT3xBolhwMmUumPE6W42L0zCtCGmaIRrTb
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcGRldi5iaGFtLmFjLnVrhihodHRwczov
+						L2lkcGRldi5iaGFtLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQzLn0z
+						tT3JpTytvqqhKNA5jtDrBTANBgkqhkiG9w0BAQUFAAOCAQEAbewlCu0UQk1sQRRK
+						ZRkARC7tHeeShJtm5xiA3tPARCJuUU5g635kdn0HDZRqynQHuOGyQK/5pif77kE/
+						TvbgqYEydFkU6NpM9Ne78CD10IjCpz+P/zjTVXcxIDa2jJiJqFcqNp0YIkoVdMzn
+						T3zHRhWrJJ+yBglhscYdfNMpfPXTTQyR2mtgtB1gFDSWyMNIktRiUcSvltCol+pl
+						mMEHtar6zXK5BR8uawb21eNUiYbCLPi6X87G4HidymZk157RPBW7l+qPYNMUyt5E
+						c32vcTICvbiBLWmnqG8k6evZ9Ztpd+rlDpGO+iynDGglTmnOA6HbmT9P9DBEEwso
+						1YEpyA==
+					</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 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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDMDCCAhigAwIBAgIVAIYsx+VotYdyVTmVfMXJU4jl5M1bMA0GCSqGSIb3DQEB
+						BQUAMBwxGjAYBgNVBAMTEWlkcGRldi5iaGFtLmFjLnVrMB4XDTEzMTAyMzA3MTM0
+						MFoXDTMzMTAyMzA3MTM0MFowHDEaMBgGA1UEAxMRaWRwZGV2LmJoYW0uYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCY1FzTRZgi3cA4QNBcz4xV
+						ZFi8+EqBjDqQ2fef/4ckTS6W/nrV0qsAx7Hlthl4O1XlzGC2bk2+ZdLFFCQ4nV64
+						0/ec4Wx2UxEZXpxQjibnv0MqYbyk/J/wiAKp+xGA0NT3EOP8pCamp2QXWgZWBysR
+						kb4Rpp3NcTRUTuDMk4nevte93t0D5tExns8/INhpPrDcshTJvcqe8ceYuu8qXYC3
+						OhBfpG4xYMdosIaATTYouAFHAu3Y9x7+uhkmdkY6HxAgbHrFCQLw0NdStHjZnEMo
+						FhqUPvQ/mM7hAeLgv+ivO2onTG16pEMT3xBolhwMmUumPE6W42L0zCtCGmaIRrTb
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcGRldi5iaGFtLmFjLnVrhihodHRwczov
+						L2lkcGRldi5iaGFtLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQzLn0z
+						tT3JpTytvqqhKNA5jtDrBTANBgkqhkiG9w0BAQUFAAOCAQEAbewlCu0UQk1sQRRK
+						ZRkARC7tHeeShJtm5xiA3tPARCJuUU5g635kdn0HDZRqynQHuOGyQK/5pif77kE/
+						TvbgqYEydFkU6NpM9Ne78CD10IjCpz+P/zjTVXcxIDa2jJiJqFcqNp0YIkoVdMzn
+						T3zHRhWrJJ+yBglhscYdfNMpfPXTTQyR2mtgtB1gFDSWyMNIktRiUcSvltCol+pl
+						mMEHtar6zXK5BR8uawb21eNUiYbCLPi6X87G4HidymZk157RPBW7l+qPYNMUyt5E
+						c32vcTICvbiBLWmnqG8k6evZ9Ztpd+rlDpGO+iynDGglTmnOA6HbmT9P9DBEEwso
+						1YEpyA==
+					</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:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpdev.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 (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/idpr.tem-tsp.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml
new file mode 100644
index 00000000..04636ca3
--- /dev/null
+++ b/swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml
@@ -0,0 +1,150 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tem-tsp.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">it-sudparis.eu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">int-evry.fr</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: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>
+					      MIIDJzCCAg+gAwIBAgIUDJP/m/P4o+WqTNaBH+2OVPzIENUwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwci50ZW0tdHNwLmV1MB4XDTE0MDUxNDA4MzEzNVoX
+DTM0MDUxNDA4MzEzNVowGjEYMBYGA1UEAxMPaWRwci50ZW0tdHNwLmV1MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjLvgF4BoRYbMI6NurGUHCG7sR5po
+XoKijYZaS3RQLV+TsdSXcwOFLrdlpEQHlniiI09Jdhstm4rCuXyD5XK9ov7mUBVM
+NGPBIMEdu97DDkmymRQp6duNlfcFpjdeGUPtQmXyG9vvleUrLr/09mr9pDzA+/H8
+yHw4f6TnbnGuJ3bjoo/D1bXsSmVlDJE1Fr37kSORcD4PCumbqcIzwrrv7FamoR++
+BhxHcBMeyM8lft2shYwdXt/PD/HB1sks/JRcxcjd+JjXRgHVkyoSXMQJEkbdUdIR
+ZIRk5Rc/mABlwXIzbQZPQbW7+kxcc9wFeXqZWNQviHIP54TFFSDPrbkFuQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHByLnRlbS10c3AuZXWGJmh0dHBzOi8vaWRwci50
+ZW0tdHNwLmV1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSu7Oapkp9YZQ/+RMAq
+6lHe0V5SwDANBgkqhkiG9w0BAQUFAAOCAQEAAKsatorEb5X1Kip2lxjHMg31km9n
+8ARKM0sfr7hvnl8TidzcTXW5xYvTy/YsOrYSpc+IJgSP+UNvS1a96fcNNswDNGOv
+MfBtVkxXOSWDGJbh2xC8NymyRAzZXWym+kLABAkTWYjaXdypM+lL7femxFuxHtEs
+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>
+					      MIIDSDCCAjCgAwIBAgIVAJv2l61sKf1VgzgHPgGRdmvIdBeGMA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMTF3NoaWJpZHAxLml0LXN1ZHBhcmlzLmV1MB4XDTA4MTIw
+NDA4MjIwNFoXDTI4MTIwNDA4MjIwNFowIjEgMB4GA1UEAxMXc2hpYmlkcDEuaXQt
+c3VkcGFyaXMuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI6RH6
+/i1p4Fwnp+SxINDTFESSAByc3/a7gL4uIjufRKaraJIIuUfQ/8PQud6mTnKmTSY1
++174E9r78IAThKTbdX0Y86JxcAlPXkaPFj3G2aMZEy7YkjxHg7bEqKmrtEmEi5ls
+69NQXJae1/v3ReBfNmsmb4lpfLqnspHzN0kM2x9ieuCUTuw6Umwc65Za9GK9J0n/
+8G370vVn9MUWcObx4qeqmeKvXK61KpAQQ5VPSrobB0NafFHq2OHb4Eq6NJmjb3xH
+Q0jNrga28YNDxKSjLF8hUolTr4bdBroqFKqqRK2DOukXsgkYgy6mTwxMbHlbzTX/
+URM7K655kFIcojcpAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJpZHAxLml0LXN1
+ZHBhcmlzLmV1hi5odHRwczovL3NoaWJpZHAxLml0LXN1ZHBhcmlzLmV1L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBS6EIElOxCx56mi697wUipVtEHCsjANBgkqhkiG
+9w0BAQUFAAOCAQEAxSHKlhfZ3cHud+7KJHl0seAdQpwOC11jLz9eOsIzjPSVnPJQ
+W8rUAUA2kWKiMrmQS6t6nEpPKnx5BcySXMLi5wuvcQ40IWUnPtebALmh26KSheiE
+7rmFxq4bKZhG+ZoOqYphlDhqPoDLVpMny5jgePyq5gvLFO03a7e3DsLeH1Shf6sk
+17+1tixG41PVxw5Lfl8ODvBF2wmY/josVaZfJ3CbJoQhByUDAGH/Cf327CcefloP
+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">tem-tsp.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">it-sudparis.eu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">int-evry.fr</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
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjLvgF4BoRYbMI6NurGUHCG7sR5po
+XoKijYZaS3RQLV+TsdSXcwOFLrdlpEQHlniiI09Jdhstm4rCuXyD5XK9ov7mUBVM
+NGPBIMEdu97DDkmymRQp6duNlfcFpjdeGUPtQmXyG9vvleUrLr/09mr9pDzA+/H8
+yHw4f6TnbnGuJ3bjoo/D1bXsSmVlDJE1Fr37kSORcD4PCumbqcIzwrrv7FamoR++
+BhxHcBMeyM8lft2shYwdXt/PD/HB1sks/JRcxcjd+JjXRgHVkyoSXMQJEkbdUdIR
+ZIRk5Rc/mABlwXIzbQZPQbW7+kxcc9wFeXqZWNQviHIP54TFFSDPrbkFuQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHByLnRlbS10c3AuZXWGJmh0dHBzOi8vaWRwci50
+ZW0tdHNwLmV1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSu7Oapkp9YZQ/+RMAq
+6lHe0V5SwDANBgkqhkiG9w0BAQUFAAOCAQEAAKsatorEb5X1Kip2lxjHMg31km9n
+8ARKM0sfr7hvnl8TidzcTXW5xYvTy/YsOrYSpc+IJgSP+UNvS1a96fcNNswDNGOv
+MfBtVkxXOSWDGJbh2xC8NymyRAzZXWym+kLABAkTWYjaXdypM+lL7femxFuxHtEs
+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>
+					      MIIDSDCCAjCgAwIBAgIVAJv2l61sKf1VgzgHPgGRdmvIdBeGMA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMTF3NoaWJpZHAxLml0LXN1ZHBhcmlzLmV1MB4XDTA4MTIw
+NDA4MjIwNFoXDTI4MTIwNDA4MjIwNFowIjEgMB4GA1UEAxMXc2hpYmlkcDEuaXQt
+c3VkcGFyaXMuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI6RH6
+/i1p4Fwnp+SxINDTFESSAByc3/a7gL4uIjufRKaraJIIuUfQ/8PQud6mTnKmTSY1
++174E9r78IAThKTbdX0Y86JxcAlPXkaPFj3G2aMZEy7YkjxHg7bEqKmrtEmEi5ls
+69NQXJae1/v3ReBfNmsmb4lpfLqnspHzN0kM2x9ieuCUTuw6Umwc65Za9GK9J0n/
+8G370vVn9MUWcObx4qeqmeKvXK61KpAQQ5VPSrobB0NafFHq2OHb4Eq6NJmjb3xH
+Q0jNrga28YNDxKSjLF8hUolTr4bdBroqFKqqRK2DOukXsgkYgy6mTwxMbHlbzTX/
+URM7K655kFIcojcpAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJpZHAxLml0LXN1
+ZHBhcmlzLmV1hi5odHRwczovL3NoaWJpZHAxLml0LXN1ZHBhcmlzLmV1L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBS6EIElOxCx56mi697wUipVtEHCsjANBgkqhkiG
+9w0BAQUFAAOCAQEAxSHKlhfZ3cHud+7KJHl0seAdQpwOC11jLz9eOsIzjPSVnPJQ
+W8rUAUA2kWKiMrmQS6t6nEpPKnx5BcySXMLi5wuvcQ40IWUnPtebALmh26KSheiE
+7rmFxq4bKZhG+ZoOqYphlDhqPoDLVpMny5jgePyq5gvLFO03a7e3DsLeH1Shf6sk
+17+1tixG41PVxw5Lfl8ODvBF2wmY/josVaZfJ3CbJoQhByUDAGH/Cf327CcefloP
+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://unknown.site.com</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/idpshib01.ifma.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idpshib01.ifma.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..ebb22759
--- /dev/null
+++ b/swamid-interfederations-2.0/idpshib01.ifma.fr-idp-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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="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>
+					      MIIEcDCCA1igAwIBAgIQeWTtozL+4yMlqLCyZXkkqjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMTIyMDAwMDAwMFoXDTEzMDEwODIzNTk1OVowUjELMAkGA1UE
+BhMCRlIxLzAtBgNVBAoTJkluc3RpdHV0IEZyYW5jYWlzIGRlIE1lY2FuaXF1ZSBB
+dmFuY2VlMRIwEAYDVQQDFAkqLmlmbWEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDT0T6oBcfYbOMw1YVxmnJSN4p4OHVERMf0c9fX8euMywkzeC7E
+53ijhMu2qLR9dXpyqz3ZBr9aL+/XeyjiF/FAbq8y3ebUywfA9IN0F3wYtjhD8KEa
+YxEvt//JDgg20KGX23WEdr3SZjvMTZgHClfwwRNBvmZtslgsUPChxn+buphf4ZrO
+BdI4gwW4yW4cOM5gBDnj7cpxXL/5ClfvE+Gf9YOJhI9Ou90oySma441KewXyzCvz
+aiffk0Paxcrh8nzP7s531366gm6T5D6syFPmOKrT49r8eyYOKHiwO/0iX250AN+3
+U6xb90aM/q2iAU6kSVznC4LsUkdK7b0aWxgtAgMBAAGjggFcMIIBWDAfBgNVHSME
+GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUmcSMqeTuutpp0yVl
+Guv4BnmpyUQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
+FAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0w
+OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFAYDVR0RBA0wC4IJKi5pZm1hLmZy
+MA0GCSqGSIb3DQEBBQUAA4IBAQA4WLst0L7sOZ95kiql+s0F759dOaAX3Cl7ZmHZ
+zSG5JVd7yiEbW1vYSweXgBvoX9r/CAhbD8jnbPYdst6c25ux8gMlSLIbfELKsvfK
+siwJ96dtRbGaZW5/pupYJEQlnZR91oFgv+iZqefxVQw44TD7MbDqkYzVVMamT+ZM
+l4Qpi4VdqnK4Tt47CqosYm5Y/NwMsE20yw4IbQSFJyhWthhVJ62lyekh+SnRRUNn
+s50/E8fZWkQetEbw3KpZy2H/eL7loEb6/mJdDFmXd1onNu+4U366Rw3501o7NGbF
+1disNesj8I3wk+psj7WYU56fxmDDdj/F/XB66PmkewkLZL5p
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEizCCA3OgAwIBAgIQLEf5g3ZzwyyqC0OTVDv9IDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMDEwNDAwMDAwMFoXDTEyMDExMDIzNTk1OVowZDELMAkGA1UE
+BhMCRlIxEDAOBgNVBAcTB0FVQklFUkUxLzAtBgNVBAoTJkluc3RpdHV0IEZyYW5j
+YWlzIGRlIE1lY2FuaXF1ZSBBdmFuY2VlMRIwEAYDVQQDFAkqLmlmbWEuZnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTubF0AC1JSefOfgsFnhZ9xQRh
+TrPenpaPberQU90k56eZAdpPv4LNs8UfF4Pc3LSI84+Y+qNcjyMdLXkl4ao7P5li
+ewWVRFGy+tsQh0DDZuejXwSV8+VToa4zUO1FFscg8AjfFua+tKAezlXYX9BLvGYJ
+EZ1OzrK1Wf/FNhak5WNPukrGRrkTUyPbvA4EgaE0GgJoooSuDpnroEAOU2CYV+Ak
+FjE1JAeTiZbTRaSix9YH1XaLu9jF0K69VP7m8gVFMdOAlMyPKfGiy/SVOAFbZlIV
+aYekIb4sQkiZMPuRkSKBbmNQt+ep7sZvv3+r5yuqdi2LwspBuUvBu3wUswktAgMB
+AAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV
+HQ4EFgQUGWxA3csb7HJBW2EjErKBTZWKuwUwDgYDVR0PAQH/BAQDAgWgMAwGA1Ud
+EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR
+MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50
+Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG
+CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHQYD
+VR0RBBYwFIIJKi5pZm1hLmZyggdpZm1hLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBO
+b1eGtVUy3poSFOKP+8/BvDLo3zMK3MKt3f79Lz7ksc15vzvazzgYZdoSsHGvGEvh
+B547OOjJ5cY8I64BUH8dBkqEJeJdhFkPD3w2aruHbK6o4jLFfvN7bWVga9zb5hUp
+QjJGfMJnTF18fWmQyHH4ls5WV5vxiSkxZ9NndkIcJifIQtExOraKtKEAlqEZhfEs
+iM1pw6S3F4ntyFWHen/2vMGrasgRv4fXVe8upcrCcVzCQbRM+WaGVExOzCt7t6DW
+uSPJk5uXJUYd4cze+6H0Sbm3WrrzNutRVSiWDIsjGSRpjA7P8OfjNq7r+G4KVqCy
+1wDmC7ZqG8IpwAXFiRYi
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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://unknown.site.com</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/idpstaff.belnet.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idpstaff.belnet.be-idp-shibboleth.xml
new file mode 100644
index 00000000..2d2d58c2
--- /dev/null
+++ b/swamid-interfederations-2.0/idpstaff.belnet.be-idp-shibboleth.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-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>
+      <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>
+MIIHBjCCBO6gAwIBAgIJAKNh2zINnSimMA0GCSqGSIb3DQEBCwUAMIGyMQswCQYD
+VQQGEwJCRTERMA8GA1UECBMIQnJ1c3NlbHMxETAPBgNVBAcTCEJydXNzZWxzMTQw
+MgYDVQQKEytMZSByZXNlYXUgdGVsZW1hdGlxdWUgYmVsZ2UgZGUgbGEgcmVjaGVy
+Y2hlMREwDwYDVQQLEwhTZXJ2aWNlczERMA8GA1UEAxMIU2VydmljZXMxITAfBgkq
+hkiG9w0BCQEWEnNlcnZpY2VzQGJlbG5ldC5iZTAeFw0xNTAyMDIxNTQ2MDhaFw0y
+NTAxMzAxNTQ2MDhaMIGyMQswCQYDVQQGEwJCRTERMA8GA1UECBMIQnJ1c3NlbHMx
+ETAPBgNVBAcTCEJydXNzZWxzMTQwMgYDVQQKEytMZSByZXNlYXUgdGVsZW1hdGlx
+dWUgYmVsZ2UgZGUgbGEgcmVjaGVyY2hlMREwDwYDVQQLEwhTZXJ2aWNlczERMA8G
+A1UEAxMIU2VydmljZXMxITAfBgkqhkiG9w0BCQEWEnNlcnZpY2VzQGJlbG5ldC5i
+ZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALjN9PlIt8fAtCMYG8/3
+zZBNy1g15mjP/pBuROg+5IMOf9zo9f9e12v2tHKk8x21rIm1kzxtvBUI/YAP7Mbi
+2Ovlw3zjGruQeSAJ21u87zg3lvdZzhM/yfUP5GNmx+hKUbKfT+JpbDy6mVhzgNEr
+4HJVRv6TO9NeopMzRNQfW4a2S6348HrYM1lubU0zv9Vx7CLVdWpxhyfZ6Uwvnxsh
+RF/lhJWyIHaC75mwthwhIZjwdX24NGVhPvniZEgPSTYERGYgtKCHyJhM5kJdg8rt
+J5ndB4RJ68/hGjgvkoFaIMk9rQNBQXaFjR1qeQ34Gue/QHar/S2GT4/AwRblF4l/
+GwHWyPKJv3vPvifZkx1RaEC3CxouunLhSCpziZ+unAE+ivbMFayvIsqaBRb5yZUJ
+5u9OQkLE6wAiYg1bniqc2rlOC0KT6naZDqA3IvjOKMSWA7nWKsiRRhoeeAXdUhj8
+X3AYEcwvgNJzvnlEPEVkfaHOJW22TNLPFSh4AEdb92bOQnpNoy63dafgZ0IVLWjw
+3fHMc8TsLKv2B/Fy+/PktllsOCggm3tMugabQqs239zqaXKFRcYoVRvrl3j6+pjD
+k6ligbXcQTOBBoaQjFtCswPoAKQdj61CflFu8/rgS1Kfg37tB79tt42XEQ9im9xT
+CdYmn73qg1OBhkOwR3RQAS5vAgMBAAGjggEbMIIBFzAdBgNVHQ4EFgQUAPUNEqb0
+FDonKiLZLEgIxSMUmjUwgecGA1UdIwSB3zCB3IAUAPUNEqb0FDonKiLZLEgIxSMU
+mjWhgbikgbUwgbIxCzAJBgNVBAYTAkJFMREwDwYDVQQIEwhCcnVzc2VsczERMA8G
+A1UEBxMIQnJ1c3NlbHMxNDAyBgNVBAoTK0xlIHJlc2VhdSB0ZWxlbWF0aXF1ZSBi
+ZWxnZSBkZSBsYSByZWNoZXJjaGUxETAPBgNVBAsTCFNlcnZpY2VzMREwDwYDVQQD
+EwhTZXJ2aWNlczEhMB8GCSqGSIb3DQEJARYSc2VydmljZXNAYmVsbmV0LmJlggkA
+o2HbMg2dKKYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAYMg+7mF0
+WX03EOmcHMmK7ZAeIVtMQ1nl/H9OmF0EroeSNO2rC0QrC/OTl6PpVBRLDs4B5Q62
+S3P9FpuPUi8ZIP2xh2AdDy8c3ZvmwTRy64S3cRuE5nTRMV4FoVgyCWENEzOEGuOc
+mmy0wLPQvmNCDDfGC1kzidZuInKgzXjDkepagcKf0LSOtB2OS9WAvWy6N3joK3Tx
+yXt1Xc+GNRX1eIUYAbruh9YGDeC0gcucbNpkCuDZ+ngX3/oeHvYsvEka2vn/bNcf
+VEd5MrozkqfvBpynxveXheHKbEZLEUZ85/ANqIKBwQwiKCHHJL+lGHBuK2MH5oDz
+7zX0L70JiSWvOBH9Vh15f13SpWCZnV7xLgB0Z8lh3v9KtKUsucv+54KxjqW4uShg
+TNyqBqZguGYPIdBjyTfiXiflTov3ppbe0Xk9msj1qo+6JTlGLPWy3WSLtRYfoM1q
+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>
+MIIHBjCCBO6gAwIBAgIJAKNh2zINnSimMA0GCSqGSIb3DQEBCwUAMIGyMQswCQYD
+VQQGEwJCRTERMA8GA1UECBMIQnJ1c3NlbHMxETAPBgNVBAcTCEJydXNzZWxzMTQw
+MgYDVQQKEytMZSByZXNlYXUgdGVsZW1hdGlxdWUgYmVsZ2UgZGUgbGEgcmVjaGVy
+Y2hlMREwDwYDVQQLEwhTZXJ2aWNlczERMA8GA1UEAxMIU2VydmljZXMxITAfBgkq
+hkiG9w0BCQEWEnNlcnZpY2VzQGJlbG5ldC5iZTAeFw0xNTAyMDIxNTQ2MDhaFw0y
+NTAxMzAxNTQ2MDhaMIGyMQswCQYDVQQGEwJCRTERMA8GA1UECBMIQnJ1c3NlbHMx
+ETAPBgNVBAcTCEJydXNzZWxzMTQwMgYDVQQKEytMZSByZXNlYXUgdGVsZW1hdGlx
+dWUgYmVsZ2UgZGUgbGEgcmVjaGVyY2hlMREwDwYDVQQLEwhTZXJ2aWNlczERMA8G
+A1UEAxMIU2VydmljZXMxITAfBgkqhkiG9w0BCQEWEnNlcnZpY2VzQGJlbG5ldC5i
+ZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALjN9PlIt8fAtCMYG8/3
+zZBNy1g15mjP/pBuROg+5IMOf9zo9f9e12v2tHKk8x21rIm1kzxtvBUI/YAP7Mbi
+2Ovlw3zjGruQeSAJ21u87zg3lvdZzhM/yfUP5GNmx+hKUbKfT+JpbDy6mVhzgNEr
+4HJVRv6TO9NeopMzRNQfW4a2S6348HrYM1lubU0zv9Vx7CLVdWpxhyfZ6Uwvnxsh
+RF/lhJWyIHaC75mwthwhIZjwdX24NGVhPvniZEgPSTYERGYgtKCHyJhM5kJdg8rt
+J5ndB4RJ68/hGjgvkoFaIMk9rQNBQXaFjR1qeQ34Gue/QHar/S2GT4/AwRblF4l/
+GwHWyPKJv3vPvifZkx1RaEC3CxouunLhSCpziZ+unAE+ivbMFayvIsqaBRb5yZUJ
+5u9OQkLE6wAiYg1bniqc2rlOC0KT6naZDqA3IvjOKMSWA7nWKsiRRhoeeAXdUhj8
+X3AYEcwvgNJzvnlEPEVkfaHOJW22TNLPFSh4AEdb92bOQnpNoy63dafgZ0IVLWjw
+3fHMc8TsLKv2B/Fy+/PktllsOCggm3tMugabQqs239zqaXKFRcYoVRvrl3j6+pjD
+k6ligbXcQTOBBoaQjFtCswPoAKQdj61CflFu8/rgS1Kfg37tB79tt42XEQ9im9xT
+CdYmn73qg1OBhkOwR3RQAS5vAgMBAAGjggEbMIIBFzAdBgNVHQ4EFgQUAPUNEqb0
+FDonKiLZLEgIxSMUmjUwgecGA1UdIwSB3zCB3IAUAPUNEqb0FDonKiLZLEgIxSMU
+mjWhgbikgbUwgbIxCzAJBgNVBAYTAkJFMREwDwYDVQQIEwhCcnVzc2VsczERMA8G
+A1UEBxMIQnJ1c3NlbHMxNDAyBgNVBAoTK0xlIHJlc2VhdSB0ZWxlbWF0aXF1ZSBi
+ZWxnZSBkZSBsYSByZWNoZXJjaGUxETAPBgNVBAsTCFNlcnZpY2VzMREwDwYDVQQD
+EwhTZXJ2aWNlczEhMB8GCSqGSIb3DQEJARYSc2VydmljZXNAYmVsbmV0LmJlggkA
+o2HbMg2dKKYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAYMg+7mF0
+WX03EOmcHMmK7ZAeIVtMQ1nl/H9OmF0EroeSNO2rC0QrC/OTl6PpVBRLDs4B5Q62
+S3P9FpuPUi8ZIP2xh2AdDy8c3ZvmwTRy64S3cRuE5nTRMV4FoVgyCWENEzOEGuOc
+mmy0wLPQvmNCDDfGC1kzidZuInKgzXjDkepagcKf0LSOtB2OS9WAvWy6N3joK3Tx
+yXt1Xc+GNRX1eIUYAbruh9YGDeC0gcucbNpkCuDZ+ngX3/oeHvYsvEka2vn/bNcf
+VEd5MrozkqfvBpynxveXheHKbEZLEUZ85/ANqIKBwQwiKCHHJL+lGHBuK2MH5oDz
+7zX0L70JiSWvOBH9Vh15f13SpWCZnV7xLgB0Z8lh3v9KtKUsucv+54KxjqW4uShg
+TNyqBqZguGYPIdBjyTfiXiflTov3ppbe0Xk9msj1qo+6JTlGLPWy3WSLtRYfoM1q
+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>
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
new file mode 100644
index 00000000..f0b97865
--- /dev/null
+++ b/swamid-interfederations-2.0/idptest.arts.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?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>
+      <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
+						VQQLDAtJVCBTZXJ2aWNlczEbMBkGA1UEAwwSaWRwdGVzdC5hcnRzLmFjLnVrMSIw
+						IAYJKoZIhvcNAQkBFhNzc2xhZG1pbkBhcnRzLmFjLnVrMB4XDTE0MDUyMzEzNTAx
+						NFoXDTM0MDYwNzEzNTAxNFowgbcxCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5HcmVh
+						dGVyIExvbmRvbjEPMA0GA1UEBwwGTG9uZG9uMScwJQYDVQQKDB5Vbml2ZXJzaXR5
+						IG9mIHRoZSBBcnRzLCBMb25kb24xFDASBgNVBAsMC0lUIFNlcnZpY2VzMRswGQYD
+						VQQDDBJpZHB0ZXN0LmFydHMuYWMudWsxIjAgBgkqhkiG9w0BCQEWE3NzbGFkbWlu
+						QGFydHMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTpA1p
+						ywFyL2PyQc3aBiEha1Ie3hBkNUwOmmptUPLT0+g/MrJXlkx0QXgLtbaEp97YGzO6
+						wEbY27djJwzGaq0VDocqt6yZ1aRzg2xN3haSUHQDI3cNhGtjd/K/g9+ZUcI6nXfs
+						g+sE43dBal5lRiziNDjKV8SaEjKwe39+alnbFRdR6GD3ROMP+SiY4CNCq42ivNOJ
+						yaW2x83qdhNo0Bn8JTm6wU9l7ann1/76LtKO8Z3l5cKcxpVr7b0vdAf81IetQM8S
+						sDZ0kTWpYRF3sOpxXiO43D10GdYA7gywPhBlpEWZy67qowQatD6M4Za0/WK7r6sk
+						CB//HU/HqpuQRgp5AgMBAAGjUDBOMB0GA1UdDgQWBBRU0koaCOcSqDZ5OK9mbTVe
+						y0nIHDAfBgNVHSMEGDAWgBRU0koaCOcSqDZ5OK9mbTVey0nIHDAMBgNVHRMEBTAD
+						AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCDAZRXEf7m2IFQfeKiDvjDnW39uCuTRbVS
+						V9gb+sww+fKJMY0p9uVXgtt5xEJG3MKlW6ytxSRMtS5eM6pD0/R0/knDRoWdQYwi
+						OfFvToZUcu9LEmdFnYV99WxquCVjCD0rnl9nVOPRJ7HW3IwZqDO3fleawh2xHrc+
+						NbeWEv2yfDRDehYtTsI/fMBX8tp9u/80mYt8JRvVpmgMs5AaE88/MYZihnFEe31o
+						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>
+						MIIEQzCCAyugAwIBAgIJAPSUoUxlNXOCMA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
+						VQQGEwJHQjEXMBUGA1UECAwOR3JlYXRlciBMb25kb24xDzANBgNVBAcMBkxvbmRv
+						bjEnMCUGA1UECgweVW5pdmVyc2l0eSBvZiB0aGUgQXJ0cywgTG9uZG9uMRQwEgYD
+						VQQLDAtJVCBTZXJ2aWNlczEbMBkGA1UEAwwSaWRwdGVzdC5hcnRzLmFjLnVrMSIw
+						IAYJKoZIhvcNAQkBFhNzc2xhZG1pbkBhcnRzLmFjLnVrMB4XDTE0MDUyMzEzNTAx
+						NFoXDTM0MDYwNzEzNTAxNFowgbcxCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5HcmVh
+						dGVyIExvbmRvbjEPMA0GA1UEBwwGTG9uZG9uMScwJQYDVQQKDB5Vbml2ZXJzaXR5
+						IG9mIHRoZSBBcnRzLCBMb25kb24xFDASBgNVBAsMC0lUIFNlcnZpY2VzMRswGQYD
+						VQQDDBJpZHB0ZXN0LmFydHMuYWMudWsxIjAgBgkqhkiG9w0BCQEWE3NzbGFkbWlu
+						QGFydHMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTpA1p
+						ywFyL2PyQc3aBiEha1Ie3hBkNUwOmmptUPLT0+g/MrJXlkx0QXgLtbaEp97YGzO6
+						wEbY27djJwzGaq0VDocqt6yZ1aRzg2xN3haSUHQDI3cNhGtjd/K/g9+ZUcI6nXfs
+						g+sE43dBal5lRiziNDjKV8SaEjKwe39+alnbFRdR6GD3ROMP+SiY4CNCq42ivNOJ
+						yaW2x83qdhNo0Bn8JTm6wU9l7ann1/76LtKO8Z3l5cKcxpVr7b0vdAf81IetQM8S
+						sDZ0kTWpYRF3sOpxXiO43D10GdYA7gywPhBlpEWZy67qowQatD6M4Za0/WK7r6sk
+						CB//HU/HqpuQRgp5AgMBAAGjUDBOMB0GA1UdDgQWBBRU0koaCOcSqDZ5OK9mbTVe
+						y0nIHDAfBgNVHSMEGDAWgBRU0koaCOcSqDZ5OK9mbTVey0nIHDAMBgNVHRMEBTAD
+						AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCDAZRXEf7m2IFQfeKiDvjDnW39uCuTRbVS
+						V9gb+sww+fKJMY0p9uVXgtt5xEJG3MKlW6ytxSRMtS5eM6pD0/R0/knDRoWdQYwi
+						OfFvToZUcu9LEmdFnYV99WxquCVjCD0rnl9nVOPRJ7HW3IwZqDO3fleawh2xHrc+
+						NbeWEv2yfDRDehYtTsI/fMBX8tp9u/80mYt8JRvVpmgMs5AaE88/MYZihnFEe31o
+						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>
diff --git a/swamid-interfederations-2.0/idptest.brunel.ac.uk-entity.xml b/swamid-interfederations-2.0/idptest.brunel.ac.uk-entity.xml
new file mode 100644
index 00000000..b0e7260f
--- /dev/null
+++ b/swamid-interfederations-2.0/idptest.brunel.ac.uk-entity.xml
@@ -0,0 +1,107 @@
+<?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>
+      <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>
+						MIIDNDCCAhygAwIBAgIVANgJSDgjyA0miJmS6WdosLWR8bo3MA0GCSqGSIb3DQEB
+						BQUAMB8xHTAbBgNVBAMTFGlkcHRlc3QuYnJ1bmVsLmFjLnVrMB4XDTEzMDUxMzA4
+						NDEyM1oXDTMzMDUxMzA4NDEyM1owHzEdMBsGA1UEAxMUaWRwdGVzdC5icnVuZWwu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9CGamVclmceIU
+						IoWVlbz5FN6NBXoVLscwFQBBKH4E3vm6RLOtD7YP6yteWiPM0N7olXtHNg9OdpS5
+						wiRbDIH7W+sbQ4hw7uvwOZooL0XGyOhMtbUKwtJ/N2ziXDgRAW+r08o5fiiMzcxO
+						YOvSggeea3relXuwRLMPhccKiUAcYX7fx7wdlFG2py5XJc4sQqnGgv6/7TsUhL1I
+						WwqE/WX+gjF6Jj5Biwft2NAIdQXaC67NkhOO8tL2WtAfCWe6qYRQXSTPExj6QffB
+						E57VQbcWcTPtTdI+eSAj5Ow1OO6HwRsTOR5Ur/zdxheMxe4FWlkX/TxawU95t+rC
+						7My4IferAgMBAAGjZzBlMEQGA1UdEQQ9MDuCFGlkcHRlc3QuYnJ1bmVsLmFjLnVr
+						hiNodHRwczovL2lkcHRlc3QuYnJ1bmVsLmFjLnVrL2VudGl0eTAdBgNVHQ4EFgQU
+						iLv8778GItQ8Ac1IH0WDtGQk3VswDQYJKoZIhvcNAQEFBQADggEBAE6S3UPN9N+e
+						sp3BUOsJZ0wGXJak9UTAStjeVOOSPYjPGGrwHxhOWFXNtQfTWrNaPXtTnxxSl2QZ
+						1LfgeGVhsEDKvL4x4cSqi+PkyLTiDf+BoTxThoFhA0FSdL4R06/L8qBdZGjUQyQy
+						Mkv6tJmG+JKLnS92lsz85icowAjvZYj3auwqTWlVIy+4GnNG83eaC64GZoR5ivj2
+						h+VvNQOmjY+C94nTzu1K+rlVIWPphqWSA93s3a10ryKWUngnIPDuxv1i/CHyerbu
+						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>
+						MIIDNDCCAhygAwIBAgIVANgJSDgjyA0miJmS6WdosLWR8bo3MA0GCSqGSIb3DQEB
+						BQUAMB8xHTAbBgNVBAMTFGlkcHRlc3QuYnJ1bmVsLmFjLnVrMB4XDTEzMDUxMzA4
+						NDEyM1oXDTMzMDUxMzA4NDEyM1owHzEdMBsGA1UEAxMUaWRwdGVzdC5icnVuZWwu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9CGamVclmceIU
+						IoWVlbz5FN6NBXoVLscwFQBBKH4E3vm6RLOtD7YP6yteWiPM0N7olXtHNg9OdpS5
+						wiRbDIH7W+sbQ4hw7uvwOZooL0XGyOhMtbUKwtJ/N2ziXDgRAW+r08o5fiiMzcxO
+						YOvSggeea3relXuwRLMPhccKiUAcYX7fx7wdlFG2py5XJc4sQqnGgv6/7TsUhL1I
+						WwqE/WX+gjF6Jj5Biwft2NAIdQXaC67NkhOO8tL2WtAfCWe6qYRQXSTPExj6QffB
+						E57VQbcWcTPtTdI+eSAj5Ow1OO6HwRsTOR5Ur/zdxheMxe4FWlkX/TxawU95t+rC
+						7My4IferAgMBAAGjZzBlMEQGA1UdEQQ9MDuCFGlkcHRlc3QuYnJ1bmVsLmFjLnVr
+						hiNodHRwczovL2lkcHRlc3QuYnJ1bmVsLmFjLnVrL2VudGl0eTAdBgNVHQ4EFgQU
+						iLv8778GItQ8Ac1IH0WDtGQk3VswDQYJKoZIhvcNAQEFBQADggEBAE6S3UPN9N+e
+						sp3BUOsJZ0wGXJak9UTAStjeVOOSPYjPGGrwHxhOWFXNtQfTWrNaPXtTnxxSl2QZ
+						1LfgeGVhsEDKvL4x4cSqi+PkyLTiDf+BoTxThoFhA0FSdL4R06/L8qBdZGjUQyQy
+						Mkv6tJmG+JKLnS92lsz85icowAjvZYj3auwqTWlVIy+4GnNG83eaC64GZoR5ivj2
+						h+VvNQOmjY+C94nTzu1K+rlVIWPphqWSA93s3a10ryKWUngnIPDuxv1i/CHyerbu
+						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>
diff --git a/swamid-interfederations-2.0/idptest.coventry.ac.uk-idp.xml b/swamid-interfederations-2.0/idptest.coventry.ac.uk-idp.xml
new file mode 100644
index 00000000..4f3bf3ff
--- /dev/null
+++ b/swamid-interfederations-2.0/idptest.coventry.ac.uk-idp.xml
@@ -0,0 +1,102 @@
+<?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>
+      <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
+						cnkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCc5dKjYAYy
+						ngY0n46F3l2pFpNquvp0DER9p7M9MEE8bWq9BYTMnKzZCsGcjg2DV4BaY3rlTnjK
+						QU/KUCz1UY7gBSPcsttNVEXv015kvH0AICZt1n/2XEGGcBkf4lytwC/o/qkbOSSY
+						7ttIAyt1gFds79eyPR7PS1/eIAuRt9EfzG6l2XIq2juzoKt7uEEdZ0SBPzRCgFv1
+						G3QgUBiBEKexd5b2rCaamdnTkJJwCKpqOW2RfPjScOA/X6aERg5pXujPe2Gf39Ge
+						V2ZjtTfB9EHFR7LQQUQX0R8Z+3vrwxWJHYFc3sKGziHyfvbTmhlzV2yP64SsXdud
+						qUE3dFY2xePhAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcHRlc3QuY292ZW50cnku
+						YWMudWuGLWh0dHBzOi8vaWRwdGVzdC5jb3ZlbnRyeS5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQU3teQB8jn8bLf5zQNsivLJ6bZ8vQwDQYJKoZIhvcNAQEF
+						BQADggEBAEF/bieO50sJY8xJ2hcTXDU9F4rTzNGVpkc7Sowt0cQGJRAjB8/fjcMS
+						h6NKHvwFrrocVK93HSE5NLBDb++dn1Rk1l8iTkze2MkguAmHn2/JdCJVcDj7ajts
+						VUFFq/GrE2yVB8OtmUM2MCaX0WPNangBP7Ebdi8FXnAZmMbZZiaNYfJKKb5zXuNQ
+						7Bn8mht2zWHrebMAzs68nlVlslo1w5BY3N2rMnyghREhgNpRBG52oEskY71w3D5I
+						+/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>
+						MIIDQzCCAiugAwIBAgIUQz1y+3PpqxFtSJF1dmrHYsxzNNcwDQYJKoZIhvcNAQEF
+						BQAwITEfMB0GA1UEAxMWaWRwdGVzdC5jb3ZlbnRyeS5hYy51azAeFw0xMzA1MTMw
+						ODA1NTJaFw0zMzA1MTMwODA1NTJaMCExHzAdBgNVBAMTFmlkcHRlc3QuY292ZW50
+						cnkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCc5dKjYAYy
+						ngY0n46F3l2pFpNquvp0DER9p7M9MEE8bWq9BYTMnKzZCsGcjg2DV4BaY3rlTnjK
+						QU/KUCz1UY7gBSPcsttNVEXv015kvH0AICZt1n/2XEGGcBkf4lytwC/o/qkbOSSY
+						7ttIAyt1gFds79eyPR7PS1/eIAuRt9EfzG6l2XIq2juzoKt7uEEdZ0SBPzRCgFv1
+						G3QgUBiBEKexd5b2rCaamdnTkJJwCKpqOW2RfPjScOA/X6aERg5pXujPe2Gf39Ge
+						V2ZjtTfB9EHFR7LQQUQX0R8Z+3vrwxWJHYFc3sKGziHyfvbTmhlzV2yP64SsXdud
+						qUE3dFY2xePhAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcHRlc3QuY292ZW50cnku
+						YWMudWuGLWh0dHBzOi8vaWRwdGVzdC5jb3ZlbnRyeS5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQU3teQB8jn8bLf5zQNsivLJ6bZ8vQwDQYJKoZIhvcNAQEF
+						BQADggEBAEF/bieO50sJY8xJ2hcTXDU9F4rTzNGVpkc7Sowt0cQGJRAjB8/fjcMS
+						h6NKHvwFrrocVK93HSE5NLBDb++dn1Rk1l8iTkze2MkguAmHn2/JdCJVcDj7ajts
+						VUFFq/GrE2yVB8OtmUM2MCaX0WPNangBP7Ebdi8FXnAZmMbZZiaNYfJKKb5zXuNQ
+						7Bn8mht2zWHrebMAzs68nlVlslo1w5BY3N2rMnyghREhgNpRBG52oEskY71w3D5I
+						+/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>
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
new file mode 100644
index 00000000..d9729633
--- /dev/null
+++ b/swamid-interfederations-2.0/idptest.dundee.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?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>
+      <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
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUaWRwdGVzdC5k
+						dW5kZWUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd5C/u
+						oV8EOVQXJjWhRzvtmXVjQrxCZLuSWvCOQhugZMmWW6gQvNI+GhjEs0bqfF5nklzl
+						KLDOAz9MskmL6v+jgkdUaUXoudrXWm7vuOEv7njEmf7Un5OKgUQHK2KGyOX7f+7r
+						lnd1HoBec52R5bj/b3EvI/Cm7nBcS5AC89929xGkuHOgCboCYXeeki0OGH4+K3hH
+						CToqFLiF9pkp5PW9LUVdywGaYgRDuUP0Fl4C4tclgA5PpDSikrDrBB6s0D7KfWYf
+						29fr2rR7jtFmPwtyZhWn3Tv0Uwe1hQMu/XnRmylmqfzgzlpYUqkh1UQcgZ3RIv7R
+						BPYhkHgBi/aA+l7/AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+						ays3V0fqkOO57TAdBgNVHQ4EFgQUAf5DUFJR2d0dGXQRxP9CdFzHNXgwDgYDVR0P
+						AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+						AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcHRlc3QuZHVuZGVl
+						LmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBX2vouq3+oxWufgfglYteEL9rr5oap
+						TAobkNaYqSrg4kToRP6enrfDgQ0nzVGib1pUd1WBZVij3b9/tmy3akQvp12Onx0B
+						RxyTsKpTsz2mZSKyMQohdrNHeexT9LDvUOZg+geaCWeTmnyXbJfPDK+JZ9Fafes6
+						Dz/VhBjgTSfzVrWcZbhINxJ/MFf7KxW8LO57gNd3BH0eky4XnS8y2YE9rAH+vwOi
+						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>
+						MIIEdjCCA16gAwIBAgIRALhrcSNiz3jY22Uy2UdbVDQwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA1MTQwMDAwMDBaFw0xNjA1MTMyMzU5NTlaMEIxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUaWRwdGVzdC5k
+						dW5kZWUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd5C/u
+						oV8EOVQXJjWhRzvtmXVjQrxCZLuSWvCOQhugZMmWW6gQvNI+GhjEs0bqfF5nklzl
+						KLDOAz9MskmL6v+jgkdUaUXoudrXWm7vuOEv7njEmf7Un5OKgUQHK2KGyOX7f+7r
+						lnd1HoBec52R5bj/b3EvI/Cm7nBcS5AC89929xGkuHOgCboCYXeeki0OGH4+K3hH
+						CToqFLiF9pkp5PW9LUVdywGaYgRDuUP0Fl4C4tclgA5PpDSikrDrBB6s0D7KfWYf
+						29fr2rR7jtFmPwtyZhWn3Tv0Uwe1hQMu/XnRmylmqfzgzlpYUqkh1UQcgZ3RIv7R
+						BPYhkHgBi/aA+l7/AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+						ays3V0fqkOO57TAdBgNVHQ4EFgQUAf5DUFJR2d0dGXQRxP9CdFzHNXgwDgYDVR0P
+						AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+						AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcHRlc3QuZHVuZGVl
+						LmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBX2vouq3+oxWufgfglYteEL9rr5oap
+						TAobkNaYqSrg4kToRP6enrfDgQ0nzVGib1pUd1WBZVij3b9/tmy3akQvp12Onx0B
+						RxyTsKpTsz2mZSKyMQohdrNHeexT9LDvUOZg+geaCWeTmnyXbJfPDK+JZ9Fafes6
+						Dz/VhBjgTSfzVrWcZbhINxJ/MFf7KxW8LO57gNd3BH0eky4XnS8y2YE9rAH+vwOi
+						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>
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
new file mode 100644
index 00000000..3e746f71
--- /dev/null
+++ b/swamid-interfederations-2.0/idptest.gla.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,109 @@
+<?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>
+      <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>
+						MIIDMDCCAhigAwIBAgIJAMpwaiffXLvnMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+						BAMTDmlkcDIuZ2xhLmFjLnVrMB4XDTEzMDczMTA5NTIxM1oXDTIzMDcyOTA5NTIx
+						M1owGTEXMBUGA1UEAxMOaWRwMi5nbGEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQD0RzBDqhDBJzPa0J3/n4WBPOpdr2/czEvRbJnQyNKoM2zz
+						xNwB2Rig51I5rLNE+7m6vd19UyJg39w88POF7rTqiXCtaVEjOdkpDZEXxFyUXqau
+						7qGFKctcCuNYzkQ9GzmMpOXHV6Dlx3Kzy7JlnnSHSaj05g6PfUjXUblYcbvRZsdB
+						bgPQ9arnSBt0hvzBockIzxW6ZmOXkt0EZJxqAO94m2Uz1ii+NrB3IO1+HurVA087
+						vXzsHNbmscT25LPsexVXf8k9AwgQOVN3Qv2mZHE/ZHl17bIFjC6LR73PrwmXJ3Xq
+						pq88E5WrdvfTOvq8zfDnXMrMAre0AWqdBE90U5KHAgMBAAGjezB5MAkGA1UdEwQC
+						MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
+						MB0GA1UdDgQWBBSARlmmJllZl4mMWFsE5OuyOq0NNzAfBgNVHSMEGDAWgBSARlmm
+						JllZl4mMWFsE5OuyOq0NNzANBgkqhkiG9w0BAQUFAAOCAQEAq4QZ28h4xbnGneQA
+						3o5uqmiYIPI5Zl6duDh6Ybv6EuugRAnhyOvMBi/Ws2ZUSUCysUbBNvnbVOFhnJPI
+						GnAlT0B5a0lxUo+P2eCKWBlz7Mgjr/pRC9zaBPYIuT8z4K1OFUgxO3priwo7UdfP
+						Db4rm84ukg7HfBl42JhgnrJWz7R9HBEhZlZUK0v6UfORdlvuUxSqcyOgg6/LKMHz
+						LRpUlQOq3+XNwKzN7/SBVWwGhIplHLSNiq1hxw/gUIAd9egQXbbqZJwVO6klqLc8
+						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>
+						MIIDMDCCAhigAwIBAgIJAMpwaiffXLvnMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+						BAMTDmlkcDIuZ2xhLmFjLnVrMB4XDTEzMDczMTA5NTIxM1oXDTIzMDcyOTA5NTIx
+						M1owGTEXMBUGA1UEAxMOaWRwMi5nbGEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQD0RzBDqhDBJzPa0J3/n4WBPOpdr2/czEvRbJnQyNKoM2zz
+						xNwB2Rig51I5rLNE+7m6vd19UyJg39w88POF7rTqiXCtaVEjOdkpDZEXxFyUXqau
+						7qGFKctcCuNYzkQ9GzmMpOXHV6Dlx3Kzy7JlnnSHSaj05g6PfUjXUblYcbvRZsdB
+						bgPQ9arnSBt0hvzBockIzxW6ZmOXkt0EZJxqAO94m2Uz1ii+NrB3IO1+HurVA087
+						vXzsHNbmscT25LPsexVXf8k9AwgQOVN3Qv2mZHE/ZHl17bIFjC6LR73PrwmXJ3Xq
+						pq88E5WrdvfTOvq8zfDnXMrMAre0AWqdBE90U5KHAgMBAAGjezB5MAkGA1UdEwQC
+						MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
+						MB0GA1UdDgQWBBSARlmmJllZl4mMWFsE5OuyOq0NNzAfBgNVHSMEGDAWgBSARlmm
+						JllZl4mMWFsE5OuyOq0NNzANBgkqhkiG9w0BAQUFAAOCAQEAq4QZ28h4xbnGneQA
+						3o5uqmiYIPI5Zl6duDh6Ybv6EuugRAnhyOvMBi/Ws2ZUSUCysUbBNvnbVOFhnJPI
+						GnAlT0B5a0lxUo+P2eCKWBlz7Mgjr/pRC9zaBPYIuT8z4K1OFUgxO3priwo7UdfP
+						Db4rm84ukg7HfBl42JhgnrJWz7R9HBEhZlZUK0v6UfORdlvuUxSqcyOgg6/LKMHz
+						LRpUlQOq3+XNwKzN7/SBVWwGhIplHLSNiq1hxw/gUIAd9egQXbbqZJwVO6klqLc8
+						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>
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
new file mode 100644
index 00000000..66a1e6c5
--- /dev/null
+++ b/swamid-interfederations-2.0/idptest.northumbria.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?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>
+      <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
+						YSBhdCBOZXdjYXN0bGUxFDASBgNVBAsMC0lUIFNlcnZpY2VzMSIwIAYDVQQDDBlp
+						ZHB0ZXN0Lm5vcnRodW1icmlhLmFjLnVrMB4XDTEzMDMxMzEyMzM0MFoXDTIzMDMx
+						MTEyMzM0MFowga4xCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1UeW5lIGFuZCBXZWFy
+						MRwwGgYDVQQHDBNOZXdjYXN0bGUgdXBvbiBUeW5lMS8wLQYDVQQKDCZVbml2ZXJz
+						aXR5IG9mIE5vcnRodW1icmlhIGF0IE5ld2Nhc3RsZTEUMBIGA1UECwwLSVQgU2Vy
+						dmljZXMxIjAgBgNVBAMMGWlkcHRlc3Qubm9ydGh1bWJyaWEuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFR74+CbRx31V0Yx5wSzjdW9oUreHg
+						HqwCOTU7yp0N6urfRvihThZ/P4IObudxC6O95AcbGiZQ0c5y8qsdQMiCyZQMe78j
+						75ab5yZ4QMhI+/4pJDl1NpQ8XwK8zqzAR3Vc2iX4ZmJ4PYJdp/V4+tMv2X9+gDWF
+						xBB4IAG/1KcZx2q9im7JMDeXGGLdTsWMyZc/Ox3XVKJd35BgDUlJeSRrb8p8FO//
+						kBOEGI9tKV5GVdX/ro7JC+d4u5qQg4EA8Da+H1uH6cjZcGxNX1djBUdH6g5rXNm/
+						ItDZkFPVRVnhB0bwdqhalMkLsfsBic7eh6H3J1piU4PuLYE9ldn1gMx3AgMBAAGj
+						ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
+						IENlcnRpZmljYXRlMB0GA1UdDgQWBBSNdQP3eDz1Sq3/s5X52TwxLGIAsTAfBgNV
+						HSMEGDAWgBSNdQP3eDz1Sq3/s5X52TwxLGIAsTANBgkqhkiG9w0BAQUFAAOCAQEA
+						T/yHhsWLV9NO5ek8j/eOo0kNyJKnY1m3Gm2Jh36PO+2tjvoD774URs/a9bTR8lOY
+						ADlZ6BFET9AqAR7F2Ddd2A4MsJA29Kwl/v2BZoFnkNkMoA5j9vH4zcaSbpdxXkLa
+						4lDOIvLzhBlZ4CuTvBLMmPhyyecERwlZ/du7RgNBRwFrnRIJfb7/CqyHWFfBGu9m
+						5XTCI2K7lhb9ngUNDpifqRUJAWlRv1zcIeIul7Q4YZ/FUkfWxQaxSZwln+Oh9jcl
+						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>
+						MIIEXDCCA0SgAwIBAgIJAN+n/8ddfvukMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
+						VQQGEwJHQjEWMBQGA1UECAwNVHluZSBhbmQgV2VhcjEcMBoGA1UEBwwTTmV3Y2Fz
+						dGxlIHVwb24gVHluZTEvMC0GA1UECgwmVW5pdmVyc2l0eSBvZiBOb3J0aHVtYnJp
+						YSBhdCBOZXdjYXN0bGUxFDASBgNVBAsMC0lUIFNlcnZpY2VzMSIwIAYDVQQDDBlp
+						ZHB0ZXN0Lm5vcnRodW1icmlhLmFjLnVrMB4XDTEzMDMxMzEyMzM0MFoXDTIzMDMx
+						MTEyMzM0MFowga4xCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1UeW5lIGFuZCBXZWFy
+						MRwwGgYDVQQHDBNOZXdjYXN0bGUgdXBvbiBUeW5lMS8wLQYDVQQKDCZVbml2ZXJz
+						aXR5IG9mIE5vcnRodW1icmlhIGF0IE5ld2Nhc3RsZTEUMBIGA1UECwwLSVQgU2Vy
+						dmljZXMxIjAgBgNVBAMMGWlkcHRlc3Qubm9ydGh1bWJyaWEuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFR74+CbRx31V0Yx5wSzjdW9oUreHg
+						HqwCOTU7yp0N6urfRvihThZ/P4IObudxC6O95AcbGiZQ0c5y8qsdQMiCyZQMe78j
+						75ab5yZ4QMhI+/4pJDl1NpQ8XwK8zqzAR3Vc2iX4ZmJ4PYJdp/V4+tMv2X9+gDWF
+						xBB4IAG/1KcZx2q9im7JMDeXGGLdTsWMyZc/Ox3XVKJd35BgDUlJeSRrb8p8FO//
+						kBOEGI9tKV5GVdX/ro7JC+d4u5qQg4EA8Da+H1uH6cjZcGxNX1djBUdH6g5rXNm/
+						ItDZkFPVRVnhB0bwdqhalMkLsfsBic7eh6H3J1piU4PuLYE9ldn1gMx3AgMBAAGj
+						ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
+						IENlcnRpZmljYXRlMB0GA1UdDgQWBBSNdQP3eDz1Sq3/s5X52TwxLGIAsTAfBgNV
+						HSMEGDAWgBSNdQP3eDz1Sq3/s5X52TwxLGIAsTANBgkqhkiG9w0BAQUFAAOCAQEA
+						T/yHhsWLV9NO5ek8j/eOo0kNyJKnY1m3Gm2Jh36PO+2tjvoD774URs/a9bTR8lOY
+						ADlZ6BFET9AqAR7F2Ddd2A4MsJA29Kwl/v2BZoFnkNkMoA5j9vH4zcaSbpdxXkLa
+						4lDOIvLzhBlZ4CuTvBLMmPhyyecERwlZ/du7RgNBRwFrnRIJfb7/CqyHWFfBGu9m
+						5XTCI2K7lhb9ngUNDpifqRUJAWlRv1zcIeIul7Q4YZ/FUkfWxQaxSZwln+Oh9jcl
+						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>
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
new file mode 100644
index 00000000..e3456eab
--- /dev/null
+++ b/swamid-interfederations-2.0/idptl.telecom-lille.fr-idp-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+      <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: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>
+					      MIIDQzCCAiugAwIBAgIUdOTTpXbEHWneZrmj++dQu587hqYwDQYJKoZIhvcNAQEF
+BQAwITEfMB0GA1UEAxMWaWRwdGwudGVsZWNvbS1saWxsZS5mcjAeFw0xNDAyMjcw
+ODMwMDJaFw0zNDAyMjcwODMwMDJaMCExHzAdBgNVBAMTFmlkcHRsLnRlbGVjb20t
+bGlsbGUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCreLILg3MJ
+V8fODgvBqTtrkWJjc50DdyouRaBAxTojOPpydqeVP1QATqE+Wf0LenegWcmQGuui
+oJU7VJ/Mn70qBzkTS17qKeAFxp+No7+7ehk65g4lUBxsWtOKWOysg2gJmdQsbz7l
+AF/Hn1+SprxyRe2BJ2s9o8n37sdie6N8zoHCS3e82PDi00yoFuXQ95PxbPpad5Cs
+9EOvAzlI3Aq3t7YU8RBvKePSj3I2sLrkMJZPc4VFMao06QnDP6Pa2GXQl2hZ76KE
+sEN4eGqtSkCbWY/k/QDX9NN8XU7sZSCFpYBzwnm+cCYrhB992+qciE/GKmzsM6tr
+RUKGaeupSS2/AgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcHRsLnRlbGVjb20tbGls
+bGUuZnKGLWh0dHBzOi8vaWRwdGwudGVsZWNvbS1saWxsZS5mci9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUt9JZDztpt1bjXPn0mJUj2aErjFowDQYJKoZIhvcNAQEF
+BQADggEBAH8xFBva7Sb5R8vIOyBlNQ57tcEXnsKClZEcYuiL5k3eu79BTH/xRqmx
+5WwQVOAKFiBUjFrcpEJTHGsAHcL1JWaxMIq0G/DW+GufAicNOUezx86ceewRIxJG
+RLzYX4oPKG10r+bUx6/K4CbzojgxysnoZNn9JKqaCH0BBg2Ddk9+0a3k7kML3tD/
+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://unknown.site.com</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
new file mode 100644
index 00000000..41e50988
--- /dev/null
+++ b/swamid-interfederations-2.0/idptoo.osu.cz-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,68 @@
+<?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>
+      <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>
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
new file mode 100644
index 00000000..d5074297
--- /dev/null
+++ b/swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIID7TCCAtWgAwIBAgIJANj5CumEPPiKMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
+VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBEJhcmkxDjAMBgNVBAoM
+BVVuaUJhMRMwEQYDVQQLDApDU0ktQ2FtcHVzMRowGAYDVQQDDBFpZHB1bmliYS51
+bmliYS5pdDEdMBsGCSqGSIb3DQEJARYOc3RhZmZAdW5pYmEuaXQwHhcNMTQwNDAz
+MTQzMjQwWhcNNDQwMzI2MTQzMjQwWjCBjDELMAkGA1UEBhMCSVQxDjAMBgNVBAgM
+BUl0YWx5MQ0wCwYDVQQHDARCYXJpMQ4wDAYDVQQKDAVVbmlCYTETMBEGA1UECwwK
+Q1NJLUNhbXB1czEaMBgGA1UEAwwRaWRwdW5pYmEudW5pYmEuaXQxHTAbBgkqhkiG
+9w0BCQEWDnN0YWZmQHVuaWJhLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2ybitm1sRZ5QF6IXsrh1V1EnuRT5fp3MZdev4WVv5hE/5q/XbRSGSY/v
+eKuQCv2a1yNGd6fwK5lkG0kD8tFoSxfMTz9farfWPpNywhTgvXeMp8nRvzXIJKrw
+T/z34a8CgcXRU19pv6Sd4YgD7Wc/2MP7Uaxp7CCtzYHQ3SOdcWj486spHHdwbMo4
+Ojw9bdZTxkB4XyBVcZ3y5S5P+j/4lsOSSAzKisSCoXm16T+YqZDSZFhwQMdtZTEx
+r2q26MKIqpPzLJMkt0cl/4pHu5olwQ3eTw7ZN/QkpuoXdIRSY5EeeQJyxq67A2ga
+P4KT3ksUKNHobBrPOkaODpnKtiSnJwIDAQABo1AwTjAdBgNVHQ4EFgQU1kgTrmPx
+aF3ULu8QcLg8kF82PXAwHwYDVR0jBBgwFoAU1kgTrmPxaF3ULu8QcLg8kF82PXAw
+DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAcDLZs+MHK89MVM7964gc
+mK1Rr/7CiKc/ZQ7Swr8+j0kxASSTDO4kJ/+p1VfXx2f2SymbPsJgRnJSE8OxRlbn
+VwD2vciIZhyxYyUGVE17drPvUFBJriNCYvS1Rj+wjO3TvHRrDuSm+ss/ygj0L9FG
+2lDz549x+WGCw3DAEiQHyGMf9i/zksTv5BPlxA/7UqQZIa/BFlqEp/EW3YgVu0+W
+9RBoub2eFvPOcllFQoB28Z5gPQRPBWZhA+Zc1UEvfwcXCo6g61WJgiqAGUYT1ov4
+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>
+MIID7TCCAtWgAwIBAgIJANj5CumEPPiKMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
+VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBEJhcmkxDjAMBgNVBAoM
+BVVuaUJhMRMwEQYDVQQLDApDU0ktQ2FtcHVzMRowGAYDVQQDDBFpZHB1bmliYS51
+bmliYS5pdDEdMBsGCSqGSIb3DQEJARYOc3RhZmZAdW5pYmEuaXQwHhcNMTQwNDAz
+MTQzMjQwWhcNNDQwMzI2MTQzMjQwWjCBjDELMAkGA1UEBhMCSVQxDjAMBgNVBAgM
+BUl0YWx5MQ0wCwYDVQQHDARCYXJpMQ4wDAYDVQQKDAVVbmlCYTETMBEGA1UECwwK
+Q1NJLUNhbXB1czEaMBgGA1UEAwwRaWRwdW5pYmEudW5pYmEuaXQxHTAbBgkqhkiG
+9w0BCQEWDnN0YWZmQHVuaWJhLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2ybitm1sRZ5QF6IXsrh1V1EnuRT5fp3MZdev4WVv5hE/5q/XbRSGSY/v
+eKuQCv2a1yNGd6fwK5lkG0kD8tFoSxfMTz9farfWPpNywhTgvXeMp8nRvzXIJKrw
+T/z34a8CgcXRU19pv6Sd4YgD7Wc/2MP7Uaxp7CCtzYHQ3SOdcWj486spHHdwbMo4
+Ojw9bdZTxkB4XyBVcZ3y5S5P+j/4lsOSSAzKisSCoXm16T+YqZDSZFhwQMdtZTEx
+r2q26MKIqpPzLJMkt0cl/4pHu5olwQ3eTw7ZN/QkpuoXdIRSY5EeeQJyxq67A2ga
+P4KT3ksUKNHobBrPOkaODpnKtiSnJwIDAQABo1AwTjAdBgNVHQ4EFgQU1kgTrmPx
+aF3ULu8QcLg8kF82PXAwHwYDVR0jBBgwFoAU1kgTrmPxaF3ULu8QcLg8kF82PXAw
+DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAcDLZs+MHK89MVM7964gc
+mK1Rr/7CiKc/ZQ7Swr8+j0kxASSTDO4kJ/+p1VfXx2f2SymbPsJgRnJSE8OxRlbn
+VwD2vciIZhyxYyUGVE17drPvUFBJriNCYvS1Rj+wjO3TvHRrDuSm+ss/ygj0L9FG
+2lDz549x+WGCw3DAEiQHyGMf9i/zksTv5BPlxA/7UqQZIa/BFlqEp/EW3YgVu0+W
+9RBoub2eFvPOcllFQoB28Z5gPQRPBWZhA+Zc1UEvfwcXCo6g61WJgiqAGUYT1ov4
+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>
diff --git a/swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml
new file mode 100644
index 00000000..bc8ebc06
--- /dev/null
+++ b/swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDMDCCAhigAwIBAgIVAN3muNVpnUKhVVYLS4LTiTLhtjaeMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWlkcHVuaWN0LnVuaWN0Lml0MB4XDTEzMDYxMjA4Mzgx
+MFoXDTMzMDYxMjA4MzgxMFowHDEaMBgGA1UEAxMRaWRwdW5pY3QudW5pY3QuaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRcO4zsz2CKoLSYLkq2aNx
+L/jolby6jN7FfDfNZ0W/tfMot029Hnz7Euj73+4+4i5XzuVwIFBEDA9VYGYbI0mr
+E0NhPWnE1AQa90Vr2P2mFql30I3Dcl7J6S8saLuhOzD74hKXI5IbS6FqziiQwyXj
+ieeySXDlbpuAX4Tcfw7onVam5MN9RKpROi9AVT37UPZLMKX7SEK3DJ7/4ERoQp3q
+f2FEQyoy/Q92ssUQgbQ96/7d91qw36wEu9Y8hSP8FRchVTCRHGnEv4IBhU+PnAPz
+w3k2ragDFtwACmgoWliOi0HpI0rSHkxX8jIboWuSHdUQNMEEi1cywPMvfNrEe5Cd
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcHVuaWN0LnVuaWN0Lml0hihodHRwczov
+L2lkcHVuaWN0LnVuaWN0Lml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQGpdyP
+so1uajvYMo3tDLyvhbL3kDANBgkqhkiG9w0BAQUFAAOCAQEAq4v0tIwHi/N5dGVt
+ew6eRGofDAdj6F8QEwQsMwBruYO3lnteVBFNTeZ5igR6PuHTzOnOIM7v98/9T0oS
+aoCED1LzHKCQaRu0WCpHGjOceJ5YtmCg9R8WCoBG5A2ND3vMllJvEGQTLLcTS7ve
+gI+pG7Fb79xuhASYkARXZ7nU5Xep2dc+a+rtSX5MTvRwczx7HdqxERQUDn7+qKWv
+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>
+MIIDMDCCAhigAwIBAgIVAN3muNVpnUKhVVYLS4LTiTLhtjaeMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWlkcHVuaWN0LnVuaWN0Lml0MB4XDTEzMDYxMjA4Mzgx
+MFoXDTMzMDYxMjA4MzgxMFowHDEaMBgGA1UEAxMRaWRwdW5pY3QudW5pY3QuaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRcO4zsz2CKoLSYLkq2aNx
+L/jolby6jN7FfDfNZ0W/tfMot029Hnz7Euj73+4+4i5XzuVwIFBEDA9VYGYbI0mr
+E0NhPWnE1AQa90Vr2P2mFql30I3Dcl7J6S8saLuhOzD74hKXI5IbS6FqziiQwyXj
+ieeySXDlbpuAX4Tcfw7onVam5MN9RKpROi9AVT37UPZLMKX7SEK3DJ7/4ERoQp3q
+f2FEQyoy/Q92ssUQgbQ96/7d91qw36wEu9Y8hSP8FRchVTCRHGnEv4IBhU+PnAPz
+w3k2ragDFtwACmgoWliOi0HpI0rSHkxX8jIboWuSHdUQNMEEi1cywPMvfNrEe5Cd
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcHVuaWN0LnVuaWN0Lml0hihodHRwczov
+L2lkcHVuaWN0LnVuaWN0Lml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQGpdyP
+so1uajvYMo3tDLyvhbL3kDANBgkqhkiG9w0BAQUFAAOCAQEAq4v0tIwHi/N5dGVt
+ew6eRGofDAdj6F8QEwQsMwBruYO3lnteVBFNTeZ5igR6PuHTzOnOIM7v98/9T0oS
+aoCED1LzHKCQaRu0WCpHGjOceJ5YtmCg9R8WCoBG5A2ND3vMllJvEGQTLLcTS7ve
+gI+pG7Fb79xuhASYkARXZ7nU5Xep2dc+a+rtSX5MTvRwczx7HdqxERQUDn7+qKWv
+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>
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
new file mode 100644
index 00000000..ca71b1ae
--- /dev/null
+++ b/swamid-interfederations-2.0/idpx.ua.ac.be-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-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>
+      <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>
+MIIDIDCCAgigAwIBAgIVAN35bNDF/CV2nOx1eMcNH1z01yvsMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcHgudWEuYWMuYmUwHhcNMTMwMzIxMDgxNzMwWhcN
+MzMwMzIxMDgxNzMwWjAYMRYwFAYDVQQDEw1pZHB4LnVhLmFjLmJlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApyXIh2Np1E1Qki0uEcCUhHjmAPRCxhxg
+CWv6AQkR7jbs0o4PYTE9wXRtOze9811RyQtPgj9zUjEibD1CCv76XpBO/mN6y1No
+QtfS8Nbn4djWRgJWZfIHiXNs9ffL4BnbzpBDuUr/PHO8gBIwKfdpWklFjvnO9Vrs
+gS1qDHh7rJ+Zk0rRi3ZrRRGg0JdTSUYJx7EgVo9C9Ajwv1RpRWG8ZJAct90AxQ5+
+D4EeVuuouSOj5WsqUgA4htmjEYTiPNCF7k1RfZlzJVMFTawgo7jjMkjX23zUK56s
++rc7EAlUhLtq8Pqj0+uJDQfxGDaTfVY0dIaHq/5IFDn7BRRUB9+dQQIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHB4LnVhLmFjLmJlhiRodHRwczovL2lkcHgudWEuYWMu
+YmUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEeqIRV/QsxJ3bc7RrO2RABUu1Lf
+MA0GCSqGSIb3DQEBBQUAA4IBAQCVGsA3oBYrhjRaJiwlSNBrP+Peaq0823RWnGXc
+/jv17Sl99jbd3DyhIsuQ0zt2WpcG8kRt8L3DvNDeWnKu1xxFZ8Ntzqpz4oFAnMBq
+fMFfZf4s0xt8L+RrmeH6MM8q/eOcmGl1E/lmDA2eoqm5vvDAXhaCLfWuYHXfNpMj
+p5U39b+mNsQXGPTpuahnCbuctNW7Mc3chwFsbxjXPyinY4yxcBzqh1e97himRJaY
+5vK/rwetVB79srpcogHy2H1BBrZk+9w0Vwi+ygZehm5pPE+33TouniaRO/CRhAFh
+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>
+MIIDIDCCAgigAwIBAgIVAN35bNDF/CV2nOx1eMcNH1z01yvsMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDWlkcHgudWEuYWMuYmUwHhcNMTMwMzIxMDgxNzMwWhcN
+MzMwMzIxMDgxNzMwWjAYMRYwFAYDVQQDEw1pZHB4LnVhLmFjLmJlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApyXIh2Np1E1Qki0uEcCUhHjmAPRCxhxg
+CWv6AQkR7jbs0o4PYTE9wXRtOze9811RyQtPgj9zUjEibD1CCv76XpBO/mN6y1No
+QtfS8Nbn4djWRgJWZfIHiXNs9ffL4BnbzpBDuUr/PHO8gBIwKfdpWklFjvnO9Vrs
+gS1qDHh7rJ+Zk0rRi3ZrRRGg0JdTSUYJx7EgVo9C9Ajwv1RpRWG8ZJAct90AxQ5+
+D4EeVuuouSOj5WsqUgA4htmjEYTiPNCF7k1RfZlzJVMFTawgo7jjMkjX23zUK56s
++rc7EAlUhLtq8Pqj0+uJDQfxGDaTfVY0dIaHq/5IFDn7BRRUB9+dQQIDAQABo2Ew
+XzA+BgNVHREENzA1gg1pZHB4LnVhLmFjLmJlhiRodHRwczovL2lkcHgudWEuYWMu
+YmUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEeqIRV/QsxJ3bc7RrO2RABUu1Lf
+MA0GCSqGSIb3DQEBBQUAA4IBAQCVGsA3oBYrhjRaJiwlSNBrP+Peaq0823RWnGXc
+/jv17Sl99jbd3DyhIsuQ0zt2WpcG8kRt8L3DvNDeWnKu1xxFZ8Ntzqpz4oFAnMBq
+fMFfZf4s0xt8L+RrmeH6MM8q/eOcmGl1E/lmDA2eoqm5vvDAXhaCLfWuYHXfNpMj
+p5U39b+mNsQXGPTpuahnCbuctNW7Mc3chwFsbxjXPyinY4yxcBzqh1e97himRJaY
+5vK/rwetVB79srpcogHy2H1BBrZk+9w0Vwi+ygZehm5pPE+33TouniaRO/CRhAFh
+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>
diff --git a/swamid-interfederations-2.0/ieeexplore.ieee.org-shibboleth-sp.xml b/swamid-interfederations-2.0/ieeexplore.ieee.org-shibboleth-sp.xml
new file mode 100644
index 00000000..a680ffc7
--- /dev/null
+++ b/swamid-interfederations-2.0/ieeexplore.ieee.org-shibboleth-sp.xml
@@ -0,0 +1,48 @@
+<?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>
+						MIICuDCCAaCgAwIBAgIEUdwYxzANBgkqhkiG9w0BAQUFADAeMRwwGgYDVQQDExNpZWVleHBsb3Jl
+						LmllZWUub3JnMB4XDTEzMDcwOTE0MDU1OVoXDTE2MDcwODE0MDU1OVowHjEcMBoGA1UEAxMTaWVl
+						ZXhwbG9yZS5pZWVlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOA75zEbFib1
+						oKwcgYsUgZh/RGIYQKeVLG96sghJd0VvxeMKq0hgF7/jWjXPUqcHCTjNg50joOH4nAjlvRZ81Iw0
+						cKyMmnaucv8scBnBfUwQjfkVOyUW3IxizoH66RLVXJvq8knRbB+d25kLDcA0Wsby/RIMGkF5TJK5
+						Py6GBXF5VqH+E41ZvJNagkd2LiOc+oW9m/1df8MhcS02m1foWeJeax8GA4lyeGGTXCk3G3KO1PCz
+						wc3UZqsaM3l2golNWx3eRqWKVjEj59+IkChkHm7MHnerKoWq+1EG/VbNnkTNn1AzRmqtcmMuSte6
+						6aEyGsZ6UTPjOKNIDnBnKT1PRmUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAD1f85Q5nzBzUOUIl
+						nftTsixhHhQOm6KNUxP6O2VGfbnkjikn972e3ypMtBxkloQTOyEti/qWw3tIvnadgKpQazkDGSMh
+						1RR6yJc2MWkuaah4rMET34XshUg7oQBRFThYrtX9g0yU3Sbriy2mRayz5+C51XF5U/lUKvepeBAQ
+						8T/5jnXGN2Acfi2r/QYSK8uPnnzuwPYlhTicyN2khwhBjokYXy/HEW1OjFe2VPmcKROPEwMkeNHD
+						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>
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
new file mode 100644
index 00000000..3736eaa8
--- /dev/null
+++ b/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIIEajCCA1ICAQAwDQYJKoZIhvcNAQEFBQAwgfoxNDAyBgNVBAoTK0lGU3VsIC0g
+SW5zdGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRU
+SUMgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29t
+dW5pY2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYD
+VQQHEwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UE
+BhMCQlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMB4XDTEzMDkx
+MDE0MDUxOFoXDTE2MDkwOTE0MDUxOFowgfoxNDAyBgNVBAoTK0lGU3VsIC0gSW5z
+dGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRUSUMg
+LSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29tdW5p
+Y2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYDVQQH
+EwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMC
+QlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuz4oD/NvC0Hwk0WhnCSYP29C98DOVwJ8sjOT
+1tfcOSkYq2DfXvI9macZLWi6PY8moeOGRlUCquo+w3Y1PJpwj0Hck0+HNN3JchyA
+iKr5LqnS/Ukx5M/CSvrwaeu7uA2Mpqv5PtfnUaU4ytDGBtWX/w1TgxbOTLFQ47UN
+69+359uqqHTvUFiRSPYGE7xGrpu6lq5A5Q/E6mkCMtypRAHH9Ld6fFH7AAWiExJH
+SGJq5rRoml2GTzm786NeM4rc4hIBkE9GuUyTtix6VJumm9PkF3HctGQZRYT/Iwi+
+PyISeGuDy2JWQy+VYgLBuyGsXo3O9LVMVe/sTUPr+2gU52AD1QIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQB1yTZ5bnXiK5+4mMT6NSQvkxnBn6KAu5hau+MREI3WM3CL
++3udcHBNFkxSEL1BVJjfrg40IzSic5rVQ8pK9EWyhey4AcD9BBkrdem0P7Z+0+PJ
+pV6SV+n0MoAGf7VJxxXaX4JcJmrwQOXhj0v+YhOoBmmm3ccCrmzWvWpKPO/NgUYR
+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>
+      
+MIIEajCCA1ICAQAwDQYJKoZIhvcNAQEFBQAwgfoxNDAyBgNVBAoTK0lGU3VsIC0g
+SW5zdGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRU
+SUMgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29t
+dW5pY2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYD
+VQQHEwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UE
+BhMCQlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMB4XDTEzMDkx
+MDE0MDUxOFoXDTE2MDkwOTE0MDUxOFowgfoxNDAyBgNVBAoTK0lGU3VsIC0gSW5z
+dGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRUSUMg
+LSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29tdW5p
+Y2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYDVQQH
+EwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMC
+QlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuz4oD/NvC0Hwk0WhnCSYP29C98DOVwJ8sjOT
+1tfcOSkYq2DfXvI9macZLWi6PY8moeOGRlUCquo+w3Y1PJpwj0Hck0+HNN3JchyA
+iKr5LqnS/Ukx5M/CSvrwaeu7uA2Mpqv5PtfnUaU4ytDGBtWX/w1TgxbOTLFQ47UN
+69+359uqqHTvUFiRSPYGE7xGrpu6lq5A5Q/E6mkCMtypRAHH9Ld6fFH7AAWiExJH
+SGJq5rRoml2GTzm786NeM4rc4hIBkE9GuUyTtix6VJumm9PkF3HctGQZRYT/Iwi+
+PyISeGuDy2JWQy+VYgLBuyGsXo3O9LVMVe/sTUPr+2gU52AD1QIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQB1yTZ5bnXiK5+4mMT6NSQvkxnBn6KAu5hau+MREI3WM3CL
++3udcHBNFkxSEL1BVJjfrg40IzSic5rVQ8pK9EWyhey4AcD9BBkrdem0P7Z+0+PJ
+pV6SV+n0MoAGf7VJxxXaX4JcJmrwQOXhj0v+YhOoBmmm3ccCrmzWvWpKPO/NgUYR
+mXkx/UZzoIc8si4G4f0tdrteQMtpq3p31STZAX7kIr7Ih2GwQXWRqvyRmd0CtAwE
+0YO4sFwtY/JBMQIwBDQNYFv6H/+6wo24inxILDSj/jHX60t/tSKPBRdkN0JXnv1A
+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>
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
new file mode 100644
index 00000000..59b4031a
--- /dev/null
+++ b/swamid-interfederations-2.0/iif.iucc.ac.il-idp-saml2-idp-metadata.php.xml
@@ -0,0 +1,36 @@
+<?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: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">Inter University Computational Center</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Inter University Computational Center</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/iif.iucc.ac.il-sp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/iif.iucc.ac.il-sp-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..eb560dcd
--- /dev/null
+++ b/swamid-interfederations-2.0/iif.iucc.ac.il-sp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,42 @@
+<?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/sp/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: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/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://iif.iucc.ac.il/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://iif.iucc.ac.il/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://iif.iucc.ac.il/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://iif.iucc.ac.il/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Inter University Computational Center</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Inter University Computational Center</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/ilearn.totton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ilearn.totton.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..e9285f36
--- /dev/null
+++ b/swamid-interfederations-2.0/ilearn.totton.ac.uk-shibboleth.xml
@@ -0,0 +1,67 @@
+<?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>
+      <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>
+						MIIDADCCAeigAwIBAgIJAKZfsG5cBfubMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE3NoaWJzcC50b3R0b24uYWMudWswHhcNMTQwNjI0MTIyODU1WhcNMjQwNjIx
+						MTIyODU1WjAeMRwwGgYDVQQDExNzaGlic3AudG90dG9uLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4r2sMGbQOo1P+H+R+IRVJtyP81kg4jv2
+						4md08AELOr0UFsgzwQ0Ejod5MY70oz1XLiujGfvQ+1yk/OQ/Rz+o5Ar2/VmpWOS3
+						a/P05oZRH18yfqpCGxXTtvvN2aVbMnYwZcolRY0aSGqcqrhVLulIk9HTf8kqmOXk
+						4JSw8kabjRd5odtmv8Szo+eZWloqicmfRV/JBOPXdqOwSSuDxDC4ZjqkYNLJiWMh
+						zZClrfLIk0W0Rm/FEw9RmB8+7WjjsoYxzqYxn+77IepTz0lkmbpBmB5wv7Fp3RLz
+						Pows0/Wo0DEjS7kGy5pujzUfsoiNA6ejhQKqByn68s1vXIREkoejZwIDAQABo0Ew
+						PzAeBgNVHREEFzAVghNzaGlic3AudG90dG9uLmFjLnVrMB0GA1UdDgQWBBTgyST3
+						tKkSHSntzkqR9Iign/WxOTANBgkqhkiG9w0BAQUFAAOCAQEAIoqUB14Nq9Hdw0pp
+						FK2l+iYeUaubP2+Bnm2EOSrwjPYZeHaM6bjyq2IRwLQwaO4i67udbYRx6uraZyDG
+						ulR+N9+l5as0z75gzpqjUkHxVEt+8iZzAkRhjfBOe0n88scgxi1do4N7EDeM+umZ
+						clbVLUcDZ6+cEaHyWYIm4ejvZ/Mc51gUoNxVwSBEz7uTkmzXTy3tg2E0HT+LGffK
+						SOPe3ZVNxH82t0GT9eVPwABja8T2aWcFkZufeD9skb4vu+7QsfSlGFfS95q/Pa3m
+						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>
diff --git a/swamid-interfederations-2.0/in-one-ear.oucs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/in-one-ear.oucs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..05bac4b6
--- /dev/null
+++ b/swamid-interfederations-2.0/in-one-ear.oucs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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://in-one-ear.oucs.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://in-one-ear.oucs.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>
+						MIIDDzCCAfegAwIBAgIJANo1yZ5Bvvm3MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGGluLW9uZS1lYXIub3Vjcy5veC5hYy51azAeFw0xMDA5MDMxMTI0NTlaFw0y
+						MDA4MzExMTI0NTlaMCMxITAfBgNVBAMTGGluLW9uZS1lYXIub3Vjcy5veC5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOin6mg0I1WsGLAzgMac
+						htBUaH8QKtmnHgZfkrOmMl8bDBR40PnKcHNdP9szrUn2O5yk68JNbbgvGPT3+RFo
+						Y8Dy27MUIG/xuP1fDUUpvmOJkKq6GLs00tTWVeHgk3cMP6kwUF0C7isz6g/qF9l5
+						OkfUiOudCS3iw1SLKyAR+eR/ezVEvpgB3T1VSY6Smrl/0QR+aSXtXTKSJYmpk6q/
+						MoxVnKSzuo/B74GPhQnQeEx4fA2mUOsgwjMx6xh91Dr1jLZr8M22d+NYMp8LxnfV
+						slfUB75xPHxuk2JOVdDeBUPjM4DFt6SH6Mmw0g11z9tuhd7/bfLks1j5wjwQ37hM
+						gJcCAwEAAaNGMEQwIwYDVR0RBBwwGoIYaW4tb25lLWVhci5vdWNzLm94LmFjLnVr
+						MB0GA1UdDgQWBBSw/IthEiVYSu2UxqhN5IB8p5dceDANBgkqhkiG9w0BAQUFAAOC
+						AQEA48hDABp6eyTjqkvKroQCAQ+UEc5mHweQN1sLLoZijgRm8SZ14qJGa7KS8Rxm
+						QMPaUC6n/WN7IOPju1p7RxH1MWnLiPo4Um8LUeIBhl6PQV+4MshBCfhyD7iFdVXm
+						3jOhIhjv1R1wOhgUOrhK0iljF0CWZy8moceNSeHIOSOqx1UYTMCy42lwE7vYRWJJ
+						PDdzNqfTI/HcsTQjSS2oktg9NL4Rqv9i5GDeX8zlm8vY1HBdO8Fl7wpJi3cu83US
+						YW2Gm7mZZRExf4FI4TtiBtXKr3C64ZAWCIcF0Gjp0ckOM6zoU/KWlhRN43wFHmpz
+						RWKs9nPy5aZ19wn+/+Qpx//xnA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDzCCAfegAwIBAgIJANo1yZ5Bvvm3MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGGluLW9uZS1lYXIub3Vjcy5veC5hYy51azAeFw0xMDA5MDMxMTI0NTlaFw0y
+						MDA4MzExMTI0NTlaMCMxITAfBgNVBAMTGGluLW9uZS1lYXIub3Vjcy5veC5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOin6mg0I1WsGLAzgMac
+						htBUaH8QKtmnHgZfkrOmMl8bDBR40PnKcHNdP9szrUn2O5yk68JNbbgvGPT3+RFo
+						Y8Dy27MUIG/xuP1fDUUpvmOJkKq6GLs00tTWVeHgk3cMP6kwUF0C7isz6g/qF9l5
+						OkfUiOudCS3iw1SLKyAR+eR/ezVEvpgB3T1VSY6Smrl/0QR+aSXtXTKSJYmpk6q/
+						MoxVnKSzuo/B74GPhQnQeEx4fA2mUOsgwjMx6xh91Dr1jLZr8M22d+NYMp8LxnfV
+						slfUB75xPHxuk2JOVdDeBUPjM4DFt6SH6Mmw0g11z9tuhd7/bfLks1j5wjwQ37hM
+						gJcCAwEAAaNGMEQwIwYDVR0RBBwwGoIYaW4tb25lLWVhci5vdWNzLm94LmFjLnVr
+						MB0GA1UdDgQWBBSw/IthEiVYSu2UxqhN5IB8p5dceDANBgkqhkiG9w0BAQUFAAOC
+						AQEA48hDABp6eyTjqkvKroQCAQ+UEc5mHweQN1sLLoZijgRm8SZ14qJGa7KS8Rxm
+						QMPaUC6n/WN7IOPju1p7RxH1MWnLiPo4Um8LUeIBhl6PQV+4MshBCfhyD7iFdVXm
+						3jOhIhjv1R1wOhgUOrhK0iljF0CWZy8moceNSeHIOSOqx1UYTMCy42lwE7vYRWJJ
+						PDdzNqfTI/HcsTQjSS2oktg9NL4Rqv9i5GDeX8zlm8vY1HBdO8Fl7wpJi3cu83US
+						YW2Gm7mZZRExf4FI4TtiBtXKr3C64ZAWCIcF0Gjp0ckOM6zoU/KWlhRN43wFHmpz
+						RWKs9nPy5aZ19wn+/+Qpx//xnA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://in-one-ear.oucs.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://in-one-ear.oucs.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://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://in-one-ear.oucs.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: Trying out Windows</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nigel</md:GivenName>
+    <md:SurName>Brown</md:SurName>
+    <md:EmailAddress>mailto:nigel.brown@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nigel</md:GivenName>
+    <md:SurName>Brown</md:SurName>
+    <md:EmailAddress>mailto:nigel.brown@it.ox.ac.uk</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
new file mode 100644
index 00000000..ffd0f77f
--- /dev/null
+++ b/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis: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">
+                        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>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
+dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
+uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
+3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
+TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
+7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
+F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
+BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
+LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
+cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
+bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
+Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
+aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
+bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
+BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
+VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
+nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
+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
+                    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>
diff --git a/swamid-interfederations-2.0/indiid.net-idp-shibboleth.xml b/swamid-interfederations-2.0/indiid.net-idp-shibboleth.xml
new file mode 100644
index 00000000..bec8135f
--- /dev/null
+++ b/swamid-interfederations-2.0/indiid.net-idp-shibboleth.xml
@@ -0,0 +1,103 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-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-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>
+      <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>
+						MIIDEzCCAfugAwIBAgIUT6jU1lE/HRPejPdsm8epM0vUa7EwDQYJKoZIhvcNAQEF
+						BQAwFTETMBEGA1UEAxMKaW5kaWlkLm5ldDAeFw0xNDExMTAxMjM3MzVaFw0zNDEx
+						MTAxMjM3MzVaMBUxEzARBgNVBAMTCmluZGlpZC5uZXQwggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCoEvnN/TSYW1WcwzIT0VDek73vOEF+P/ruM3VXsn50
+						u1yGJO/I2u7mj4uB6z4/c2GlnG/bk1lPm2udxgQvsfQLefSudhUXE6I1+5z2BeKh
+						ItywlU7axKJ3yDkttnF91zoLdcWlb1G25bQG1KCeU5MOEJIwEi6AgNemEWcGyUDN
+						JhL5mu6deaMchpHpZcg/ANi8xoqcTAIMhZUQwwLWeocz7Wcp63dO6fXy0lY05udD
+						lldxFpPgnZFJC2Ip1PETDch3peze6UJPDypsnSMuq4d05OU8Ys2bXe5nnTxUFUMf
+						uUPWDSFLn0kIpYO4n710AUJ/IXYBp7ilWnNRu8MlOLfTAgMBAAGjWzBZMDgGA1Ud
+						EQQxMC+CCmluZGlpZC5uZXSGIWh0dHBzOi8vaW5kaWlkLm5ldC9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQUVeUalccl0Ln3ZVxeQvuTCxr5v8swDQYJKoZIhvcNAQEF
+						BQADggEBAE4Ge6J/gCDnFxv32olly4khj+O4ubmdWHggfwIhQmlizGzTgVhN/0hD
+						/KttRlKIcJRvt/aGg/r3Ykyv4P9x34t5cxztPutjiQefe8QC7Lnxo+OW1Tu+1xKq
+						pbsZDh1R/gdDjSzpAtEoXZWUFM4hrYAzGuRc/8AelXVRS1kFfyi61ZsfduaimShu
+						KWGyy5xzC8UqFyDtOLUnJicnPOfmZWzGEjnWYZWCYseTmdxPAZRDIlB+z+ZXQu41
+						+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>
+						MIIDEzCCAfugAwIBAgIUT6jU1lE/HRPejPdsm8epM0vUa7EwDQYJKoZIhvcNAQEF
+						BQAwFTETMBEGA1UEAxMKaW5kaWlkLm5ldDAeFw0xNDExMTAxMjM3MzVaFw0zNDEx
+						MTAxMjM3MzVaMBUxEzARBgNVBAMTCmluZGlpZC5uZXQwggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCoEvnN/TSYW1WcwzIT0VDek73vOEF+P/ruM3VXsn50
+						u1yGJO/I2u7mj4uB6z4/c2GlnG/bk1lPm2udxgQvsfQLefSudhUXE6I1+5z2BeKh
+						ItywlU7axKJ3yDkttnF91zoLdcWlb1G25bQG1KCeU5MOEJIwEi6AgNemEWcGyUDN
+						JhL5mu6deaMchpHpZcg/ANi8xoqcTAIMhZUQwwLWeocz7Wcp63dO6fXy0lY05udD
+						lldxFpPgnZFJC2Ip1PETDch3peze6UJPDypsnSMuq4d05OU8Ys2bXe5nnTxUFUMf
+						uUPWDSFLn0kIpYO4n710AUJ/IXYBp7ilWnNRu8MlOLfTAgMBAAGjWzBZMDgGA1Ud
+						EQQxMC+CCmluZGlpZC5uZXSGIWh0dHBzOi8vaW5kaWlkLm5ldC9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQUVeUalccl0Ln3ZVxeQvuTCxr5v8swDQYJKoZIhvcNAQEF
+						BQADggEBAE4Ge6J/gCDnFxv32olly4khj+O4ubmdWHggfwIhQmlizGzTgVhN/0hD
+						/KttRlKIcJRvt/aGg/r3Ykyv4P9x34t5cxztPutjiQefe8QC7Lnxo+OW1Tu+1xKq
+						pbsZDh1R/gdDjSzpAtEoXZWUFM4hrYAzGuRc/8AelXVRS1kFfyi61ZsfduaimShu
+						KWGyy5xzC8UqFyDtOLUnJicnPOfmZWzGEjnWYZWCYseTmdxPAZRDIlB+z+ZXQu41
+						+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>
diff --git a/swamid-interfederations-2.0/infodev-d7-dev.nsms.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/infodev-d7-dev.nsms.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..1e2107aa
--- /dev/null
+++ b/swamid-interfederations-2.0/infodev-d7-dev.nsms.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://infodev-d7-dev.nsms.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-09T15:11: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">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDGzCCAgOgAwIBAgIJAMLR/aNeyl8BMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+						BAMTHGluZm9kZXYtZDctZGV2Lm5zbXMub3guYWMudWswHhcNMTQxMjA0MTUxNDMz
+						WhcNMjQxMjAxMTUxNDMzWjAnMSUwIwYDVQQDExxpbmZvZGV2LWQ3LWRldi5uc21z
+						Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtrcUBiNR
+						en0REq0ls1dy4X7FFXjopOi88A/uLA7Dw6neTkl+HZ88gSgg5L3qsv+qZnqrzzLm
+						ju8a5kfJPz9zvwAQFLA+ArD4wwrw8LLZf8hMbfF+pZEhCQMIGKC+cUbD+6YzQqvu
+						geSFjhdl5X723IibxRPhmx14C4j+ERAW2tUQE09XQcZ6paIksRayzTObThK6GXf4
+						BK9vtnXNDMvOOteHikyB8RqjZ0YezDlz8zIYQJeVP0d3tgp+cEHTyZmt1VgH2pe4
+						jSA+PNX+uudU1z1AnZ/Asa0o0paRLmv6bnG2/XF2sRSkhEurddTq7QSN6xqIYWk7
+						qZpH/reIrBSZRwIDAQABo0owSDAnBgNVHREEIDAeghxpbmZvZGV2LWQ3LWRldi5u
+						c21zLm94LmFjLnVrMB0GA1UdDgQWBBS1Xk+0N4mnps4yNcemQMTTVWhw5TANBgkq
+						hkiG9w0BAQUFAAOCAQEAHyhijXXcuc0YFMF0FmC5W4839/pyBORBU0/Nt/oX9/5v
+						6vByLWOaljvc/Vsf3+jhPK5FLassvHVKSZ2v4gJEjvkGMWlZTcpLlj0+yOHEvGlW
+						t5HWAaypypQa9L6h2MsWIPO5mKuHMlLLgR4zXEL35MWQk6iuvsJKaCM6Uv8jyuQz
+						LQVEEIK0Cf4SIHRPF7Vj8wLcGyN2pBOIevRjBeGGhfciBWWbsz+9h3eq610Cv/iU
+						b/IynFccjjF7bx5iJyggB45pEIJQdhLOAuqR96crdrcVYtXYspErn+3gIvDi7sR5
+						UbkffR0RAFrPzKRqjcDLdTTrTzzZ2gUqAfSNu/zXZg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infodev-d7-dev.nsms.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://infodev-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://infodev-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://infodev-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blav-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blav-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blav-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blav-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blueflame-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blueflame-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blueflame-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blueflame-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cih-dev.nsms.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://cih-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cih-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cih-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cns-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cns-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cns-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cns-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cns-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cns-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cns-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cns-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crhb-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="29"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crhb-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crhb-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="31"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crhb-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="32"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ctmet-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="33"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ctmet-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="34"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ctmet-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="35"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ctmet-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="36"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dandy-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="37"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dandy-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dandy-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="39"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dandy-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="40"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dhox-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="41"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dhox-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="42"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dhox-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="43"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dhox-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="44"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dolly-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="45"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dolly-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="46"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dolly-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="47"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dolly-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="48"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eship-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="49"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eship-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="50"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eship-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="51"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eship-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="52"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://geg-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="53"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://geg-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="54"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://geg-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="55"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://geg-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="56"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://horizon2020-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="57"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://horizon2020-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="58"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://horizon2020-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="59"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://horizon2020-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="60"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://humresgrp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="61"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://humresgrp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="62"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://humresgrp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="63"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://humresgrp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="64"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ictforum-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="65"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ictforum-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="66"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ictforum-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="67"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ictforum-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="68"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ithelp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="69"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ithelp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="70"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ithelp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="71"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ithelp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="72"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mansfield-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="73"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mansfield-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="74"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mansfield-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="75"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mansfield-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="76"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdex-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="77"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mdex-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="78"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mdex-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="79"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mdex-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="80"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mmp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="81"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mmp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="82"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mmp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="83"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mmp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="84"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mpls-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="85"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mpls-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="86"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mpls-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="87"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mpls-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="88"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://museumswifi-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="89"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://museumswifi-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="90"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://museumswifi-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="91"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://museumswifi-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="92"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myanmar-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="93"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myanmar-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="94"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://myanmar-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="95"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://myanmar-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="96"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openspires-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="97"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://openspires-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="98"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://openspires-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="99"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openspires-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="100"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxsparks-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="101"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxsparks-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="102"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxsparks-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="103"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxsparks-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="104"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sias-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="105"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sias-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="106"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sias-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="107"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sias-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="108"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://socsci-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="109"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://socsci-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="110"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://socsci-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="111"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://socsci-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="112"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://torch-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="113"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://torch-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="114"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://torch-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="115"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://torch-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="116"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://woodlab-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="117"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://woodlab-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="118"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://woodlab-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="119"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://woodlab-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="120"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - infodev-d7-dev.nsms.ox.ac.uk</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://infodev-d7-dev.nsms.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NSMS</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/infodev-d7-live.nsms.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/infodev-d7-live.nsms.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..3b03a273
--- /dev/null
+++ b/swamid-interfederations-2.0/infodev-d7-live.nsms.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://infodev-d7-live.nsms.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-21T11:16: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">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDHjCCAgagAwIBAgIJAPb4uUizKWAPMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+						BAMTHWluZm9kZXYtZDctbGl2ZS5uc21zLm94LmFjLnVrMB4XDTE1MDExNjE2MjUw
+						MFoXDTI1MDExMzE2MjUwMFowKDEmMCQGA1UEAxMdaW5mb2Rldi1kNy1saXZlLm5z
+						bXMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoyqIt
+						i62chxgBpyHpAYgQPbFS6iKvOfv+5sgs+vWfc1VvKk1Bb3OqYXytZJw17y/IYyXS
+						0jG+M5CeS4MxxXW8j98pESvL1eYZH27FJhzOJLpITmoosQLT0nCQqJvGip1/6hhA
+						yCpUaLkmvLJZOdanv6YDx1xc+89xUR5LqmV4Z+7xsLX8haEhlIHDhjVhOI7CDlkD
+						JLUYEdix8VLZS9FPnrybrrHxYyfCSweBtxDHi8QEjxAoRU04q4BF4kLmQkH+vWN2
+						Jr4akJz/fmIu00RdhyytFuED4S8lGHs/McYoRArdaWutaRj5t+xsppbcKjpCp6ru
+						UPUqUjC9SQSBmDBLAgMBAAGjSzBJMCgGA1UdEQQhMB+CHWluZm9kZXYtZDctbGl2
+						ZS5uc21zLm94LmFjLnVrMB0GA1UdDgQWBBT2sRRg0Yfg28xAo5KMPC0EUeGUljAN
+						BgkqhkiG9w0BAQUFAAOCAQEAY+NeJ6VjX51Oq+0YAArzeOxNEVm1vn2TIlzPC5sV
+						V7/bCTixWP6q1dJNTpW0Lb39NfUwalzedpnVvP/+6DIPRZGVC2pGqO4WlY1ogh89
+						hZuJIK4ATPVR9sXw+eKut5ZhtJgSQwrIs42FubQLKM4y4HJnh2mGRLoUYeBSNnla
+						NrD2GHtfAwbxycQ1OqCY1qO6Sj2zV//ITElPv7Z3yLe9cFkEx7bt09fJ6JURo3cr
+						jucD7A2vE9jV+4NdX4CgIWFyNbmRWP3dlBo3pUYtrKleXb7EUun6XxUz+cbK3LQl
+						jfsceKH2qEFeCSuP5iMel4HC/c7ZnMeQnKSRmWnnQNwUmQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infodev-d7-live.nsms.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://infodev-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://infodev-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://infodev-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://africanstudies-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://africanstudies-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://africanstudies-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://africanstudies-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs.oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.oxfordsparks.co.uk/Shibboleth.sso/SAML2/ECP" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.oxfordsparks.co.uk/Shibboleth.sso/SAML/POST" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.oxfordsparks.com/Shibboleth.sso/SAML2/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs.oxfordsparks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.oxfordsparks.com/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.oxfordsparks.com/Shibboleth.sso/SAML/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.oxfordsparks.net/Shibboleth.sso/SAML2/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs.oxfordsparks.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.oxfordsparks.net/Shibboleth.sso/SAML2/ECP" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.oxfordsparks.net/Shibboleth.sso/SAML/POST" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.oxfordsparks.org/Shibboleth.sso/SAML2/POST" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs.oxfordsparks.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.oxfordsparks.org/Shibboleth.sso/SAML2/ECP" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.oxfordsparks.org/Shibboleth.sso/SAML/POST" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blueflame-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blueflame-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blueflame-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blueflame-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bsg.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="29"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bsg.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bsg.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="31"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bsg.ox.ac.uk/Shibboleth.sso/SAML/POST" index="32"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://chinacentre-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="33"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://chinacentre-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="34"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://chinacentre-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="35"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://chinacentre-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="36"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cih-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="37"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cih-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cih-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="39"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cih-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="40"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="41"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="42"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="43"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="44"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cns-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="45"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cns-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="46"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cns-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="47"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cns-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="48"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crhb-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="49"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crhb-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="50"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crhb-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="51"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crhb-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="52"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ctmet-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="53"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ctmet-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="54"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ctmet-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="55"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ctmet-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="56"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ctmet.theology.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="57"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ctmet.theology.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="58"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ctmet.theology.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="59"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ctmet.theology.ox.ac.uk/Shibboleth.sso/SAML/POST" index="60"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dhox-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="61"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dhox-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="62"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dhox-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="63"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dhox-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="64"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://digital.humanities.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="65"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://digital.humanities.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="66"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://digital.humanities.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="67"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://digital.humanities.ox.ac.uk/Shibboleth.sso/SAML/POST" index="68"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eship.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="69"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eship.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="70"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eship.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="71"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eship.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="72"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://globaleconomicgovernance.org/Shibboleth.sso/SAML2/POST" index="73"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://globaleconomicgovernance.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="74"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://globaleconomicgovernance.org/Shibboleth.sso/SAML2/ECP" index="75"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://globaleconomicgovernance.org/Shibboleth.sso/SAML/POST" index="76"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://horizon2020.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="77"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://horizon2020.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="78"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://horizon2020.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="79"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://horizon2020.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="80"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lac-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="81"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lac-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="82"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lac-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="83"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lac-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="84"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mansfield-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="85"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mansfield-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="86"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mansfield-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="87"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mansfield-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="88"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mes-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="89"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mes-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="90"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mes-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="91"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mes-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="92"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mmp-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="93"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mmp-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="94"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mmp-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="95"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mmp-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="96"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myanmar-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="97"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myanmar-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="98"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://myanmar-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="99"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://myanmar-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="100"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nissan-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="101"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nissan-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="102"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nissan-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="103"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nissan-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="104"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openspires-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="105"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://openspires-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="106"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://openspires-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="107"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openspires-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="108"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST" index="109"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="110"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxfordsparks.co.uk/Shibboleth.sso/SAML2/ECP" index="111"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxfordsparks.co.uk/Shibboleth.sso/SAML/POST" index="112"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxfordsparks.com/Shibboleth.sso/SAML2/POST" index="113"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxfordsparks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="114"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxfordsparks.com/Shibboleth.sso/SAML2/ECP" index="115"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxfordsparks.com/Shibboleth.sso/SAML/POST" index="116"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxfordsparks.net/Shibboleth.sso/SAML2/POST" index="117"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxfordsparks.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="118"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxfordsparks.net/Shibboleth.sso/SAML2/ECP" index="119"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxfordsparks.net/Shibboleth.sso/SAML/POST" index="120"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxfordsparks.org/Shibboleth.sso/SAML2/POST" index="121"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxfordsparks.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="122"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxfordsparks.org/Shibboleth.sso/SAML2/ECP" index="123"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxfordsparks.org/Shibboleth.sso/SAML/POST" index="124"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxsparks-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="125"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxsparks-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="126"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxsparks-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="127"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxsparks-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="128"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portfolio.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="129"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://portfolio.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="130"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portfolio.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="131"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portfolio.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="132"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rees-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="133"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rees-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="134"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rees-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="135"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rees-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="136"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sias-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="137"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sias-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="138"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sias-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="139"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sias-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="140"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="141"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="142"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="143"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML/POST" index="144"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://southasia-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="145"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://southasia-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="146"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://southasia-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="147"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://southasia-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="148"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://torch.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="149"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://torch.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="150"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://torch.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="151"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://torch.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="152"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://torch.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="153"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://torch.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="154"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://torch.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="155"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://torch.ox.ac.uk/Shibboleth.sso/SAML/POST" index="156"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://woodlab-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="157"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://woodlab-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="158"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://woodlab-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="159"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://woodlab-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="160"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.africanstudies.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="161"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.africanstudies.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="162"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.africanstudies.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="163"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.africanstudies.ox.ac.uk/Shibboleth.sso/SAML/POST" index="164"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.area-studies.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="165"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.area-studies.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="166"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.area-studies.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="167"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.area-studies.ox.ac.uk/Shibboleth.sso/SAML/POST" index="168"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.brazil.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="169"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.brazil.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="170"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.brazil.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="171"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.brazil.ox.ac.uk/Shibboleth.sso/SAML/POST" index="172"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bsg.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="173"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bsg.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="174"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bsg.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="175"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bsg.ox.ac.uk/Shibboleth.sso/SAML/POST" index="176"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ccsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="177"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ccsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="178"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ccsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="179"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ccsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="180"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.china-studies.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="181"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.china-studies.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="182"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.china-studies.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="183"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.china-studies.ox.ac.uk/Shibboleth.sso/SAML/POST" index="184"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.chinacentre.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="185"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.chinacentre.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="186"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.chinacentre.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="187"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.chinacentre.ox.ac.uk/Shibboleth.sso/SAML/POST" index="188"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ertegun.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="189"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ertegun.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="190"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ertegun.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="191"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ertegun.ox.ac.uk/Shibboleth.sso/SAML/POST" index="192"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.europegateway.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="193"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.europegateway.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="194"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.europegateway.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="195"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.europegateway.ox.ac.uk/Shibboleth.sso/SAML/POST" index="196"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.globaleconomicgovernance.org/Shibboleth.sso/SAML2/POST" index="197"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.globaleconomicgovernance.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="198"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.globaleconomicgovernance.org/Shibboleth.sso/SAML2/ECP" index="199"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.globaleconomicgovernance.org/Shibboleth.sso/SAML/POST" index="200"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lac.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="201"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lac.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="202"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lac.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="203"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lac.ox.ac.uk/Shibboleth.sso/SAML/POST" index="204"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mes.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="205"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mes.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="206"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mes.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="207"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mes.ox.ac.uk/Shibboleth.sso/SAML/POST" index="208"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nissan.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="209"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nissan.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="210"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nissan.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="211"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nissan.ox.ac.uk/Shibboleth.sso/SAML/POST" index="212"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST" index="213"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="214"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.oxfordsparks.co.uk/Shibboleth.sso/SAML2/ECP" index="215"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oxfordsparks.co.uk/Shibboleth.sso/SAML/POST" index="216"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.oxfordsparks.com/Shibboleth.sso/SAML2/POST" index="217"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.oxfordsparks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="218"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.oxfordsparks.com/Shibboleth.sso/SAML2/ECP" index="219"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oxfordsparks.com/Shibboleth.sso/SAML/POST" index="220"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.oxfordsparks.net/Shibboleth.sso/SAML2/POST" index="221"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.oxfordsparks.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="222"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.oxfordsparks.net/Shibboleth.sso/SAML2/ECP" index="223"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oxfordsparks.net/Shibboleth.sso/SAML/POST" index="224"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.oxfordsparks.org/Shibboleth.sso/SAML2/POST" index="225"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.oxfordsparks.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="226"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.oxfordsparks.org/Shibboleth.sso/SAML2/ECP" index="227"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oxfordsparks.org/Shibboleth.sso/SAML/POST" index="228"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.photonics.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="229"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.photonics.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="230"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.photonics.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="231"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.photonics.ox.ac.uk/Shibboleth.sso/SAML/POST" index="232"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rees.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="233"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.rees.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="234"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.rees.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="235"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.rees.ox.ac.uk/Shibboleth.sso/SAML/POST" index="236"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="237"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="238"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="239"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML/POST" index="240"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.southasia.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="241"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.southasia.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="242"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.southasia.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="243"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.southasia.ox.ac.uk/Shibboleth.sso/SAML/POST" index="244"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.torch.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="245"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.torch.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="246"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.torch.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="247"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.torch.ox.ac.uk/Shibboleth.sso/SAML/POST" index="248"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - infodev-d7-live.nsms.ox.ac.uk</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://infodev-d7-live.nsms.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NSMS</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/infodev-d7-test.nsms.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/infodev-d7-test.nsms.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..4c379d0e
--- /dev/null
+++ b/swamid-interfederations-2.0/infodev-d7-test.nsms.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://infodev-d7-test.nsms.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-30T14:20: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">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDHjCCAgagAwIBAgIJAL9xsW9eJb1AMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+						BAMTHWluZm9kZXYtZDctdGVzdC5uc21zLm94LmFjLnVrMB4XDTE0MDYyNTEzMTcy
+						NFoXDTI0MDYyMjEzMTcyNFowKDEmMCQGA1UEAxMdaW5mb2Rldi1kNy10ZXN0Lm5z
+						bXMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuXn49
+						I6qel9fSQqlzjbRwgaJxfu/JY6GsfuZkKZntJpdFsV9KOg1iNPA2uRwCUKZvCSBC
+						4zCErXIYJa6n0RLiupn5jAD/4e9SRUS3PpDIx2HngXOUTFV8pargq4hxJ0HCf04b
+						+7qfyBqqzk6R090JX8BDCgqptBfCYAb0+IwV1nbCOT+ZUHdN6k9bXm9dqwLsoOMC
+						aqezQMox0rdu703VEgQKBA9a0fvs/FXdxO1L6aGhPDeLo/Im+yhlWMNCu4Zd1JkH
+						I6lmhRptDGEE1kZuJI/+yGhgK3RcObmljwZg47dS582V4zjkDdm9muvHWyL+YQVt
+						CqZ2np34rhUkR6yLAgMBAAGjSzBJMCgGA1UdEQQhMB+CHWluZm9kZXYtZDctdGVz
+						dC5uc21zLm94LmFjLnVrMB0GA1UdDgQWBBS3TF9lwkGPgc/inGvcBU9lnhCfIDAN
+						BgkqhkiG9w0BAQUFAAOCAQEAKvnTMZAof5tq+3Tm12XoiXAreXZ47HmZu0PdgFXX
+						3peHdYS6BfbsJFzYafpfzUzOegFavYDHMag0zZGaFjpeiWZEI7qO9quKMnIqO5Yc
+						i5QfviShmcdtEp89zidPZi7UepHuG21GulbkX55jKu3rvbcvPXTdmP3gYRaR/xX2
+						faifNN5e97ItMwkIH0ke5DiWsvQ/zXActH/BVBIku8R2gitOV/TG9eLUZtrmK7h1
+						UNVfwntu6NfNjGx/LbCPVgVAJmhuH1YgTJbhDFfE9Ocu9CpxSlmhJXZu08kiPloJ
+						xea684iW5WHGZB3KGh4Yslx4LE5VuYerU1NXuEUbzyPLlA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infodev-d7-test.nsms.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://infodev-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://infodev-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://infodev-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://africanstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://africanstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://africanstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://africanstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blav-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blav-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blav-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blav-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blueflame-test.nsms.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://blueflame-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blueflame-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blueflame-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://brazil-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://brazil-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://brazil-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://brazil-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ccsp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ccsp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ccsp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ccsp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://chinacentre-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://chinacentre-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://chinacentre-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://chinacentre-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cih-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="29"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cih-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cih-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="31"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cih-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="32"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="33"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="34"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="35"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="36"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cns-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="37"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cns-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cns-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="39"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cns-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="40"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crhb-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="41"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crhb-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="42"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crhb-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="43"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crhb-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="44"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ctmet-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="45"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ctmet-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="46"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ctmet-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="47"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ctmet-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="48"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dandy-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="49"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dandy-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="50"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dandy-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="51"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dandy-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="52"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="53"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="54"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="55"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://demo-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="56"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dhox-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="57"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dhox-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="58"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dhox-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="59"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dhox-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="60"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dolly-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="61"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dolly-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="62"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dolly-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="63"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dolly-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="64"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ertegun-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="65"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ertegun-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="66"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ertegun-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="67"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ertegun-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="68"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eship-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="69"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eship-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="70"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eship-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="71"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eship-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="72"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://geg-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="73"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://geg-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="74"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://geg-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="75"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://geg-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="76"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://horizon2020-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="77"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://horizon2020-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="78"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://horizon2020-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="79"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://horizon2020-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="80"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://humresgrp.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="81"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://humresgrp.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="82"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://humresgrp.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="83"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://humresgrp.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="84"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ictforum-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="85"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ictforum-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="86"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ictforum-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="87"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ictforum-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="88"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infodev-d7-sandbox.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="89"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://infodev-d7-sandbox.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="90"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://infodev-d7-sandbox.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="91"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://infodev-d7-sandbox.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="92"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://italianstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="93"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://italianstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="94"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://italianstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="95"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://italianstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="96"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ithelp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="97"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ithelp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="98"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ithelp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="99"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ithelp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="100"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itlpportfolio-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="101"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://itlpportfolio-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="102"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://itlpportfolio-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="103"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://itlpportfolio-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="104"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itlptoolkit-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="105"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://itlptoolkit-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="106"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://itlptoolkit-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="107"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://itlptoolkit-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="108"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lac-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="109"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lac-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="110"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lac-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="111"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lac-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="112"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mansfield-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="113"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mansfield-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="114"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mansfield-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="115"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mansfield-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="116"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdex-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="117"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mdex-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="118"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mdex-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="119"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mdex-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="120"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mes-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="121"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mes-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="122"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mes-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="123"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mes-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="124"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mpls-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="125"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mpls-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="126"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mpls-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="127"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mpls-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="128"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myanmar-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="129"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myanmar-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="130"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://myanmar-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="131"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://myanmar-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="132"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nissan-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="133"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nissan-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="134"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nissan-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="135"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nissan-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="136"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openspires-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="137"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://openspires-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="138"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://openspires-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="139"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openspires-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="140"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxsparks-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="141"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxsparks-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="142"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxsparks-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="143"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxsparks-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="144"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://photonicsd7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="145"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://photonicsd7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="146"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://photonicsd7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="147"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://photonicsd7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="148"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://poeticforms-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="149"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://poeticforms-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="150"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://poeticforms-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="151"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://poeticforms-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="152"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rees-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="153"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rees-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="154"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rees-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="155"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rees-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="156"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sias-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="157"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sias-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="158"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sias-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="159"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sias-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="160"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://socsci-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="161"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://socsci-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="162"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://socsci-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="163"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://socsci-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="164"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://southasia-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="165"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://southasia-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="166"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://southasia-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="167"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://southasia-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="168"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://torch-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="169"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://torch-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="170"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://torch-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="171"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://torch-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="172"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://woodlab-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="173"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://woodlab-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="174"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://woodlab-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="175"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://woodlab-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="176"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - infodev-d7-test.nsms.ox.ac.uk</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://infodev-d7-test.nsms.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NSMS</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/informahealthcare.com-shibboleth.xml b/swamid-interfederations-2.0/informahealthcare.com-shibboleth.xml
new file mode 100644
index 00000000..f572e54e
--- /dev/null
+++ b/swamid-interfederations-2.0/informahealthcare.com-shibboleth.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://informahealthcare.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>
+						MIIDrzCCApegAwIBAgIJAL1L+CnJYaryMA0GCSqGSIb3DQEBBQUAMIGWMQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEeMBwGA1UEAxMVaW5mb3JtYWhlYWx0aGNhcmUuY29t
+						MB4XDTA5MTEwNDE4NDc1N1oXDTE5MTEwMjE4NDc1N1owgZYxCzAJBgNVBAYTAlVT
+						MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEdMBsG
+						A1UEChMUQXR5cG9uIFN5c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBTeXN0
+						ZW1zLCBJbmMuMR4wHAYDVQQDExVpbmZvcm1haGVhbHRoY2FyZS5jb20wggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcCSOdjx4WPdtGyJjfck1tUZfO437x
+						1m+lPZ5OSstZ4+RCxLKUPD0O/nDJ3ifJH20WTEM5X+lyDjWu/+UsptpKXY24Pk/K
+						59k+snzu6c1Uhy1Lp2puq15HjRVceTGp3G+NV7HJr1jKxoSp2lsY9vmTvbU1JK+o
+						jYEZyNOuuNraw/UHCm66rrZOeFtKS3zYJry7bmT9I2e78macP7Dk7uAzCDxNLDbF
+						nYV34Im5cItQn3nE4cDNyWc2RpK7KIrhFBn3f7IOvzyOVYKvpu1tGmw5s1NCakT8
+						jM4PaB4tNuaTm5Qh+QplB930UU29XWD5eO8qm162WhtJLqH8hWvqSrApAgMBAAEw
+						DQYJKoZIhvcNAQEFBQADggEBAG3tBSpj5KTbQs8CJsJc5mMlD3IVgf45kPhShXMz
+						nww61zb1FJIv0C0IOKwjfBjCFTJMyfo96cDeEWNSHfEOIhkJcEGkiB04DhyKYptH
+						CquKWP97U55nqXOVDEbtMamu+z+9f7uQmc7VuB0rqZ07xbrSrASqhIbUZFtX9F68
+						Z070zJKi+gMdsiZ6b5LeUZu6xy/3hPCxmZrigqziTBELJ5QMLN/GEk1w2kieul6s
+						0TQo9eEOFz98F25hOf1rUmu63xykgZRZdxtNYfJ7yiSngyqdQniyRN731dZJVzH8
+						1zeV5IEFxJAFO/Pen4K7kRhv6MCgvFrf6ufTpCDojAeGU1E=                        
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://informahealthcare.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://informahealthcare.com/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informahealthcare.com/action/samlACS" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Informa Healthcare</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.informahealthcare.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/informationservice-test.idoxgroup.com-shibboleth.xml b/swamid-interfederations-2.0/informationservice-test.idoxgroup.com-shibboleth.xml
new file mode 100644
index 00000000..a8fc3852
--- /dev/null
+++ b/swamid-interfederations-2.0/informationservice-test.idoxgroup.com-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+						MIIDljCCAn4CAQAwDQYJKoZIhvcNAQEEBQAwgZAxCzAJBgNVBAYTAkdCMREwDwYD
+						VQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dvdzETMBEGA1UEChMKSURPWCBH
+						cm91cDEcMBoGA1UECxMTSW5mb3JtYXRpb24gU2VydmljZTEpMCcGA1UEAxMgaW5m
+						b3JtYXRpb25zZXJ2aWNlLmlkb3hncm91cC5jb20wHhcNMTAwMzE5MTM0MzAyWhcN
+						MjAwMzE2MTM0MzAyWjCBkDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5k
+						MRAwDgYDVQQHEwdHbGFzZ293MRMwEQYDVQQKEwpJRE9YIEdyb3VwMRwwGgYDVQQL
+						ExNJbmZvcm1hdGlvbiBTZXJ2aWNlMSkwJwYDVQQDEyBpbmZvcm1hdGlvbnNlcnZp
+						Y2UuaWRveGdyb3VwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AJtxqpaLhnY5M+Op1rdKcu4Q+NKkG9xTyhrVyD3q6Ebd3F2z7Pq4Ul++dsMy+eWO
+						4KSwYjAFnIMS8uuuGCa9sagt9xHs/K2F5nGB+rAfkbW11LikdL9fuEmUc44/Qh1z
+						D85p0GLoMHVdfJJTK3atAbXY6MExGvYCrnB6GnmqU14HW2M6jR64pxopBRobpgHn
+						z3fH+ShiI57swZ3PQNSlpUjTM8oYNiBE8aiA9/4LdyBXK3MCZd2B8v6+OIcoJbB8
+						J5Xaqt/aUkMhAPZOgYTnvSwuj1vDnq5aKLJefw/ot2PvrVB60+v+ImP3OlMZ74qG
+						zCtl1ahe2V5j+d5uooOpZt0CAwEAATANBgkqhkiG9w0BAQQFAAOCAQEAYy1VOTwC
+						gb3FghRYG9j/2TXGBb1bBzZqjadF3xll1j9mRyKr9AajSSVWg+UrZGUVY3XRvBfB
+						JnNZwDWamqw0iFwv+leY3IazhRqSONOiJiRQSzwPbUBkRTiefjg2mUYQBXj3uZw+
+						OW5/UBFrqYN63pRYS7bK9fuAzda/3bVX+ySwp+GFoEatDd+3S8J07HaHWxUVcd3q
+						DYGFIWBoJhWGJbsYbjmnI+A4a1o356y+CnWR1Xz/EHtgkIt4ZRYtja1tUVh/F+wy
+						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>
+						MIIDljCCAn4CAQAwDQYJKoZIhvcNAQEEBQAwgZAxCzAJBgNVBAYTAkdCMREwDwYD
+						VQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dvdzETMBEGA1UEChMKSURPWCBH
+						cm91cDEcMBoGA1UECxMTSW5mb3JtYXRpb24gU2VydmljZTEpMCcGA1UEAxMgaW5m
+						b3JtYXRpb25zZXJ2aWNlLmlkb3hncm91cC5jb20wHhcNMTAwMzE5MTM0MzAyWhcN
+						MjAwMzE2MTM0MzAyWjCBkDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5k
+						MRAwDgYDVQQHEwdHbGFzZ293MRMwEQYDVQQKEwpJRE9YIEdyb3VwMRwwGgYDVQQL
+						ExNJbmZvcm1hdGlvbiBTZXJ2aWNlMSkwJwYDVQQDEyBpbmZvcm1hdGlvbnNlcnZp
+						Y2UuaWRveGdyb3VwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AJtxqpaLhnY5M+Op1rdKcu4Q+NKkG9xTyhrVyD3q6Ebd3F2z7Pq4Ul++dsMy+eWO
+						4KSwYjAFnIMS8uuuGCa9sagt9xHs/K2F5nGB+rAfkbW11LikdL9fuEmUc44/Qh1z
+						D85p0GLoMHVdfJJTK3atAbXY6MExGvYCrnB6GnmqU14HW2M6jR64pxopBRobpgHn
+						z3fH+ShiI57swZ3PQNSlpUjTM8oYNiBE8aiA9/4LdyBXK3MCZd2B8v6+OIcoJbB8
+						J5Xaqt/aUkMhAPZOgYTnvSwuj1vDnq5aKLJefw/ot2PvrVB60+v+ImP3OlMZ74qG
+						zCtl1ahe2V5j+d5uooOpZt0CAwEAATANBgkqhkiG9w0BAQQFAAOCAQEAYy1VOTwC
+						gb3FghRYG9j/2TXGBb1bBzZqjadF3xll1j9mRyKr9AajSSVWg+UrZGUVY3XRvBfB
+						JnNZwDWamqw0iFwv+leY3IazhRqSONOiJiRQSzwPbUBkRTiefjg2mUYQBXj3uZw+
+						OW5/UBFrqYN63pRYS7bK9fuAzda/3bVX+ySwp+GFoEatDd+3S8J07HaHWxUVcd3q
+						DYGFIWBoJhWGJbsYbjmnI+A4a1o356y+CnWR1Xz/EHtgkIt4ZRYtja1tUVh/F+wy
+						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>
diff --git a/swamid-interfederations-2.0/informationservice.idoxgroup.com-shibboleth.xml b/swamid-interfederations-2.0/informationservice.idoxgroup.com-shibboleth.xml
new file mode 100644
index 00000000..39bde35e
--- /dev/null
+++ b/swamid-interfederations-2.0/informationservice.idoxgroup.com-shibboleth.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://informationservice.idoxgroup.com/shibboleth">
+  <md:Extensions>
+    <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDljCCAn4CAQAwDQYJKoZIhvcNAQEEBQAwgZAxCzAJBgNVBAYTAkdCMREwDwYD
+						VQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dvdzETMBEGA1UEChMKSURPWCBH
+						cm91cDEcMBoGA1UECxMTSW5mb3JtYXRpb24gU2VydmljZTEpMCcGA1UEAxMgaW5m
+						b3JtYXRpb25zZXJ2aWNlLmlkb3hncm91cC5jb20wHhcNMTAwMzE5MTM0MzAyWhcN
+						MjAwMzE2MTM0MzAyWjCBkDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5k
+						MRAwDgYDVQQHEwdHbGFzZ293MRMwEQYDVQQKEwpJRE9YIEdyb3VwMRwwGgYDVQQL
+						ExNJbmZvcm1hdGlvbiBTZXJ2aWNlMSkwJwYDVQQDEyBpbmZvcm1hdGlvbnNlcnZp
+						Y2UuaWRveGdyb3VwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AJtxqpaLhnY5M+Op1rdKcu4Q+NKkG9xTyhrVyD3q6Ebd3F2z7Pq4Ul++dsMy+eWO
+						4KSwYjAFnIMS8uuuGCa9sagt9xHs/K2F5nGB+rAfkbW11LikdL9fuEmUc44/Qh1z
+						D85p0GLoMHVdfJJTK3atAbXY6MExGvYCrnB6GnmqU14HW2M6jR64pxopBRobpgHn
+						z3fH+ShiI57swZ3PQNSlpUjTM8oYNiBE8aiA9/4LdyBXK3MCZd2B8v6+OIcoJbB8
+						J5Xaqt/aUkMhAPZOgYTnvSwuj1vDnq5aKLJefw/ot2PvrVB60+v+ImP3OlMZ74qG
+						zCtl1ahe2V5j+d5uooOpZt0CAwEAATANBgkqhkiG9w0BAQQFAAOCAQEAYy1VOTwC
+						gb3FghRYG9j/2TXGBb1bBzZqjadF3xll1j9mRyKr9AajSSVWg+UrZGUVY3XRvBfB
+						JnNZwDWamqw0iFwv+leY3IazhRqSONOiJiRQSzwPbUBkRTiefjg2mUYQBXj3uZw+
+						OW5/UBFrqYN63pRYS7bK9fuAzda/3bVX+ySwp+GFoEatDd+3S8J07HaHWxUVcd3q
+						DYGFIWBoJhWGJbsYbjmnI+A4a1o356y+CnWR1Xz/EHtgkIt4ZRYtja1tUVh/F+wy
+						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>
+						MIIDljCCAn4CAQAwDQYJKoZIhvcNAQEEBQAwgZAxCzAJBgNVBAYTAkdCMREwDwYD
+						VQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dvdzETMBEGA1UEChMKSURPWCBH
+						cm91cDEcMBoGA1UECxMTSW5mb3JtYXRpb24gU2VydmljZTEpMCcGA1UEAxMgaW5m
+						b3JtYXRpb25zZXJ2aWNlLmlkb3hncm91cC5jb20wHhcNMTAwMzE5MTM0MzAyWhcN
+						MjAwMzE2MTM0MzAyWjCBkDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5k
+						MRAwDgYDVQQHEwdHbGFzZ293MRMwEQYDVQQKEwpJRE9YIEdyb3VwMRwwGgYDVQQL
+						ExNJbmZvcm1hdGlvbiBTZXJ2aWNlMSkwJwYDVQQDEyBpbmZvcm1hdGlvbnNlcnZp
+						Y2UuaWRveGdyb3VwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AJtxqpaLhnY5M+Op1rdKcu4Q+NKkG9xTyhrVyD3q6Ebd3F2z7Pq4Ul++dsMy+eWO
+						4KSwYjAFnIMS8uuuGCa9sagt9xHs/K2F5nGB+rAfkbW11LikdL9fuEmUc44/Qh1z
+						D85p0GLoMHVdfJJTK3atAbXY6MExGvYCrnB6GnmqU14HW2M6jR64pxopBRobpgHn
+						z3fH+ShiI57swZ3PQNSlpUjTM8oYNiBE8aiA9/4LdyBXK3MCZd2B8v6+OIcoJbB8
+						J5Xaqt/aUkMhAPZOgYTnvSwuj1vDnq5aKLJefw/ot2PvrVB60+v+ImP3OlMZ74qG
+						zCtl1ahe2V5j+d5uooOpZt0CAwEAATANBgkqhkiG9w0BAQQFAAOCAQEAYy1VOTwC
+						gb3FghRYG9j/2TXGBb1bBzZqjadF3xll1j9mRyKr9AajSSVWg+UrZGUVY3XRvBfB
+						JnNZwDWamqw0iFwv+leY3IazhRqSONOiJiRQSzwPbUBkRTiefjg2mUYQBXj3uZw+
+						OW5/UBFrqYN63pRYS7bK9fuAzda/3bVX+ySwp+GFoEatDd+3S8J07HaHWxUVcd3q
+						DYGFIWBoJhWGJbsYbjmnI+A4a1o356y+CnWR1Xz/EHtgkIt4ZRYtja1tUVh/F+wy
+						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.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/instantanatomy.co.uk-shib.xml b/swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml
new file mode 100644
index 00000000..b26d56c0
--- /dev/null
+++ b/swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml
@@ -0,0 +1,91 @@
+<?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>
+      <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>
+						MIIDGDCCAgCgAwIBAgIJAOU2/77+QBVIMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG2Rhcndpbi5pbnN0YW50YW5hdG9teS5jby51azAeFw0xMjA4MTcwMTQ5MzFa
+						Fw0yMjA4MTUwMTQ5MzFaMCYxJDAiBgNVBAMTG2Rhcndpbi5pbnN0YW50YW5hdG9t
+						eS5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5l4CVTvTSr
+						wY4T+jbnjlcqK7uLjuUnblB1tp+UClVHk31XDiJGDC/G8uUmL275wVRKcvC5Uj5m
+						1+SK5wNJ+4DkDLFhpho7adK/UZLW6EMvpgUg5nSq5qeJErkDdmexwUgWMX9v4YYr
+						CDxN9qQ3Mf869ORLNUwwwMN+sPT6p8ppiYpdjR1lLkmFRNWPiWztxA2gbHWueC6H
+						NBDxEH3NitETaKo2KV0R2S/7yLa9f0yffK5M8n26WFoTE/OPKhiN/lyT+8ZRQe3E
+						O6MEPQudNhQuR0/7vvd1giIvQr9ARy4tpROL3VQ1VFLeVaoHQgPi8XDkRrUGoGnf
+						coCiPWctp30CAwEAAaNJMEcwJgYDVR0RBB8wHYIbZGFyd2luLmluc3RhbnRhbmF0
+						b215LmNvLnVrMB0GA1UdDgQWBBRCrm+NptHsROj8vWQkA1ifzUbsPzANBgkqhkiG
+						9w0BAQUFAAOCAQEAkKx3nfhfX4Am9Isc0yEXdtJznme1IxfFXHauCupdnZnZU2yd
+						sOqqZaeiEf1E3KU+PcL9m8/syQ9O8RfiTdkrXPwRsrGll6Rpg0s6QHYLpiWRkeu+
+						MXgBUGS7F+HdMah4vBYlB1xK2q5wlzKhFiXWqWuHqpHOlYVgRvVyJhqzwT9QVhgF
+						zvqMQdvEtFw0qF7qwDlxkzDp8qWfa7bNnehynDwVxB6jAdgXbSbu5sqBlTB0naJE
+						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>
diff --git a/swamid-interfederations-2.0/intarch.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intarch.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..e4066450
--- /dev/null
+++ b/swamid-interfederations-2.0/intarch.ac.uk-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://intarch.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-06-17T17: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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIETDCCAzSgAwIBAgIJANeltYZYTpEfMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYD
+						VQQGEwJHQjENMAsGA1UECBMEWW9yazENMAsGA1UEBxMEWW9yazEdMBsGA1UEChMU
+						SW50ZXJuZXQgQXJjaGFlb2xvZ3kxGzAZBgNVBAsTElVuaXZlcnNpdHkgb2YgWW9y
+						azEWMBQGA1UEAxMNaW50YXJjaC5hYy51azElMCMGCSqGSIb3DQEJARYWdG9ueS5h
+						dXN0aW5AeW9yay5hYy51azAeFw0xMTExMjQxNTM1MjJaFw0yMTExMjExNTM1MjJa
+						MIGmMQswCQYDVQQGEwJHQjENMAsGA1UECBMEWW9yazENMAsGA1UEBxMEWW9yazEd
+						MBsGA1UEChMUSW50ZXJuZXQgQXJjaGFlb2xvZ3kxGzAZBgNVBAsTElVuaXZlcnNp
+						dHkgb2YgWW9yazEWMBQGA1UEAxMNaW50YXJjaC5hYy51azElMCMGCSqGSIb3DQEJ
+						ARYWdG9ueS5hdXN0aW5AeW9yay5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAKtlAiwlls16Jrvc8GkLnMAufqCuUJpWkmNeBDkr2oumVYGXSwSC
+						J0K53uu6vfS4cSSWw7V9sO+Bn7Y6DM5TlVnXmkdKY9nG1x5Qomyh6YXdph0hTjUK
+						MV3UF0LR6k5PdGgKANikaorx9anM20BmfgC+tie38hi6D0rIijzLfAWmusQuTO7y
+						obgkFfmxYU7TY9Wy5llocZ5f6xpbzPPmmdos+CR0b4ZJbvMprROzXH+SfiUDLVeO
+						sd1XT8C2uz0ObeAVOVVixAZPdsgBhrw4lWaqdUKV7y2KJKscPbWaSx7puCgac+bg
+						sfENrIhQOeqRx2YMFwu8i5OUyXrLPSM4HpUCAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFH+bs5MZtwpOLOsrRQ66dYcr7DknMB8GA1UdIwQYMBaAFH+bs5MZtwpO
+						LOsrRQ66dYcr7DknMA0GCSqGSIb3DQEBBQUAA4IBAQAXCPGBG6YiQvzDdrEfYfbq
+						xHN4bQTnUoXN8PDnC8lktGOqjbijIiV+Ql522TP7NSm74f59gEU0ADY7I/4BhduM
+						WlDV+W3on0VIoktMWzcpyNy5VVzrf8qfuP4r2l9LPlPnyoYSPOf7pyI08BtgMqQJ
+						gNQicUUX04v2A2Rr92YLwFqQGC43DICo0+IG6N9GD6czWOjEgxMSb+t/NMJkLvIZ
+						Sgu0JlMLK1MlmSL3Lxn1TZbD/dkwzz9/+ke751F9WDRBQqA98rEoFYHmJ/KuKv6i
+						7hpWJ/uLvdYiGqAODCPZ76XQXMCSclWolY4WyBgIefP3bIncqOfsYaSe4skzsy0g
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIETDCCAzSgAwIBAgIJANeltYZYTpEfMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYD
+						VQQGEwJHQjENMAsGA1UECBMEWW9yazENMAsGA1UEBxMEWW9yazEdMBsGA1UEChMU
+						SW50ZXJuZXQgQXJjaGFlb2xvZ3kxGzAZBgNVBAsTElVuaXZlcnNpdHkgb2YgWW9y
+						azEWMBQGA1UEAxMNaW50YXJjaC5hYy51azElMCMGCSqGSIb3DQEJARYWdG9ueS5h
+						dXN0aW5AeW9yay5hYy51azAeFw0xMTExMjQxNTM1MjJaFw0yMTExMjExNTM1MjJa
+						MIGmMQswCQYDVQQGEwJHQjENMAsGA1UECBMEWW9yazENMAsGA1UEBxMEWW9yazEd
+						MBsGA1UEChMUSW50ZXJuZXQgQXJjaGFlb2xvZ3kxGzAZBgNVBAsTElVuaXZlcnNp
+						dHkgb2YgWW9yazEWMBQGA1UEAxMNaW50YXJjaC5hYy51azElMCMGCSqGSIb3DQEJ
+						ARYWdG9ueS5hdXN0aW5AeW9yay5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAKtlAiwlls16Jrvc8GkLnMAufqCuUJpWkmNeBDkr2oumVYGXSwSC
+						J0K53uu6vfS4cSSWw7V9sO+Bn7Y6DM5TlVnXmkdKY9nG1x5Qomyh6YXdph0hTjUK
+						MV3UF0LR6k5PdGgKANikaorx9anM20BmfgC+tie38hi6D0rIijzLfAWmusQuTO7y
+						obgkFfmxYU7TY9Wy5llocZ5f6xpbzPPmmdos+CR0b4ZJbvMprROzXH+SfiUDLVeO
+						sd1XT8C2uz0ObeAVOVVixAZPdsgBhrw4lWaqdUKV7y2KJKscPbWaSx7puCgac+bg
+						sfENrIhQOeqRx2YMFwu8i5OUyXrLPSM4HpUCAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFH+bs5MZtwpOLOsrRQ66dYcr7DknMB8GA1UdIwQYMBaAFH+bs5MZtwpO
+						LOsrRQ66dYcr7DknMA0GCSqGSIb3DQEBBQUAA4IBAQAXCPGBG6YiQvzDdrEfYfbq
+						xHN4bQTnUoXN8PDnC8lktGOqjbijIiV+Ql522TP7NSm74f59gEU0ADY7I/4BhduM
+						WlDV+W3on0VIoktMWzcpyNy5VVzrf8qfuP4r2l9LPlPnyoYSPOf7pyI08BtgMqQJ
+						gNQicUUX04v2A2Rr92YLwFqQGC43DICo0+IG6N9GD6czWOjEgxMSb+t/NMJkLvIZ
+						Sgu0JlMLK1MlmSL3Lxn1TZbD/dkwzz9/+ke751F9WDRBQqA98rEoFYHmJ/KuKv6i
+						7hpWJ/uLvdYiGqAODCPZ76XQXMCSclWolY4WyBgIefP3bIncqOfsYaSe4skzsy0g
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intarch.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intarch.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intarch.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intarch.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intarch.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intarch.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intarch.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intarch.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intarch.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intarch.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intarch.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intarch.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intarch.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intarch.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intarch.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of York</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of York: Internet Archaeology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://intarch.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Judith</md:GivenName>
+    <md:SurName>Winters</md:SurName>
+    <md:EmailAddress>mailto:judith.winters@york.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Charno</md:SurName>
+    <md:EmailAddress>mailto:michael.charno@york.ac.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
new file mode 100644
index 00000000..802999f5
--- /dev/null
+++ b/swamid-interfederations-2.0/integration.wcn.co.uk-shibboleth-sp.xml
@@ -0,0 +1,116 @@
+<?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://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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://integration.wcn.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>
+						MIIFjDCCA3QCCQDY/5lx43eOoTANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
+						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMSIwIAYDVQQKExlX
+						b3JsZCBDYXJlZXJzIE5ldHdvcmsgUExDMRIwEAYDVQQLEwl0ZWNobmljYWwxHjAc
+						BgNVBAMTFWludGVncmF0aW9uLndjbi5jby51azAeFw0wOTEyMTYxNTE2NDJaFw0x
+						OTEyMTcxNTE2NDJaMIGHMQswCQYDVQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8w
+						DQYDVQQHEwZMb25kb24xIjAgBgNVBAoTGVdvcmxkIENhcmVlcnMgTmV0d29yayBQ
+						TEMxEjAQBgNVBAsTCXRlY2huaWNhbDEeMBwGA1UEAxMVaW50ZWdyYXRpb24ud2Nu
+						LmNvLnVrMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvrf1ETn8BhT8
+						s52CBJ9LyGmGnTtM/C083rx8h3es5OxrP28+dAL4aD5OBtocpJDWhbtDBjYJKF8P
+						ZJOCK6AkmsRb/NoLifWNDcguwkhETSGjoYdp3CqmeSbaPsCsCqb3vRfP5OH/BXTB
+						vVv6NwfotXYsp5zTyQawyG2C/bMZk3bBjOlwZ0kKK0RjvAivfODIIylDsbueBvrL
+						5Te328/fQt+cmKHdpCLDZk0x8WUuEpcZIVrysEAivAQbQjddBZULs0nVnmacAjl0
+						LzwGJSkVxu2JhECPHh5KXvauTqD66ZC6PToNXX1b6gmW9N4SZH5X8C1vbltLTiL2
+						OzNKHY4ZhPsQmaZTcIhxNSJcypK0HwXxbGqodIqdLub7buF4ZiqXsocG0QQiDMsF
+						aMjjS76MpUqSrIEXtt8HsGlJeYvvSiuoU+US1YHMK3iKOycErKTM2eHOBUlijZ4N
+						42YCaI01PJrs/M0fvtKxsS9xl7BMg69gLpChTYYOy9ieMSiinfqRY/f5EWW9SePE
+						vrXliik8CBjhz5CIwdLbUTP6MM12WSFPYmNQJ2k3SgETi2uxSkM8CoJp2WH/8YOd
+						9Z+tvDCvyzcgJwBITet8kNq/GeFrl00CtYMC+zojnllzD7FQjAogE5SB0ibgi1dW
+						PBKuRgYISMVS+4J2wp9qEkjWL6JETdsCAwEAATANBgkqhkiG9w0BAQUFAAOCAgEA
+						Wl7cp7aSpDSfHW35edbOQdDnJwPBhb61DtP2ypyLr5TXtCGUy04le6Isqa0n0JC7
+						Wjvm3mW4WmEKJIdijAV0ILdKLxdIpX7qyEbIY39S7G6q7867DxW4J0ANvo3B2MkM
+						n91Hj0ZeDie1Oiha9Ul94seEqz5/oxIvzUI7uULfBDisVzlnYJS/seXDBq3D0h+s
+						D6tZ4DIr6HrGqkb47heg+mwLgQBEpmB4x+qhAnkrTGE1Fw2OSPt3p/ayddRzdKQX
+						tk0si7mWSfWo8W1rfBuy0EErIFByBxGhtNq4Wlxf5yzt0Ln/T1KBDHTgilYqhSgQ
+						XvvgTcBa1pmiaRdZ5T6LT5hVybhpoFAm6xQecURFvXhlFHjK+H/Ia7H5Ecr1vcQq
+						LbD07pGwTVUcJAJ5VM5g2jfGzYCHlBiUPiE3J3Aj506duKDJZRwuDQfnl4IGG1ca
+						b9KTU0KPPBNSynKb++GcCyUtoknrMDGMSnfDcs2SsqzuFQHHA87p2ookjrC5z8//
+						mIdiC4GxRRby9bddF2uF4kFjGYhHGP0ELHD+McESSUPqfG1Ooyw7XRhgl+DRl8Re
+						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>
+						MIIFjDCCA3QCCQDY/5lx43eOoTANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
+						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMSIwIAYDVQQKExlX
+						b3JsZCBDYXJlZXJzIE5ldHdvcmsgUExDMRIwEAYDVQQLEwl0ZWNobmljYWwxHjAc
+						BgNVBAMTFWludGVncmF0aW9uLndjbi5jby51azAeFw0wOTEyMTYxNTE2NDJaFw0x
+						OTEyMTcxNTE2NDJaMIGHMQswCQYDVQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8w
+						DQYDVQQHEwZMb25kb24xIjAgBgNVBAoTGVdvcmxkIENhcmVlcnMgTmV0d29yayBQ
+						TEMxEjAQBgNVBAsTCXRlY2huaWNhbDEeMBwGA1UEAxMVaW50ZWdyYXRpb24ud2Nu
+						LmNvLnVrMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvrf1ETn8BhT8
+						s52CBJ9LyGmGnTtM/C083rx8h3es5OxrP28+dAL4aD5OBtocpJDWhbtDBjYJKF8P
+						ZJOCK6AkmsRb/NoLifWNDcguwkhETSGjoYdp3CqmeSbaPsCsCqb3vRfP5OH/BXTB
+						vVv6NwfotXYsp5zTyQawyG2C/bMZk3bBjOlwZ0kKK0RjvAivfODIIylDsbueBvrL
+						5Te328/fQt+cmKHdpCLDZk0x8WUuEpcZIVrysEAivAQbQjddBZULs0nVnmacAjl0
+						LzwGJSkVxu2JhECPHh5KXvauTqD66ZC6PToNXX1b6gmW9N4SZH5X8C1vbltLTiL2
+						OzNKHY4ZhPsQmaZTcIhxNSJcypK0HwXxbGqodIqdLub7buF4ZiqXsocG0QQiDMsF
+						aMjjS76MpUqSrIEXtt8HsGlJeYvvSiuoU+US1YHMK3iKOycErKTM2eHOBUlijZ4N
+						42YCaI01PJrs/M0fvtKxsS9xl7BMg69gLpChTYYOy9ieMSiinfqRY/f5EWW9SePE
+						vrXliik8CBjhz5CIwdLbUTP6MM12WSFPYmNQJ2k3SgETi2uxSkM8CoJp2WH/8YOd
+						9Z+tvDCvyzcgJwBITet8kNq/GeFrl00CtYMC+zojnllzD7FQjAogE5SB0ibgi1dW
+						PBKuRgYISMVS+4J2wp9qEkjWL6JETdsCAwEAATANBgkqhkiG9w0BAQUFAAOCAgEA
+						Wl7cp7aSpDSfHW35edbOQdDnJwPBhb61DtP2ypyLr5TXtCGUy04le6Isqa0n0JC7
+						Wjvm3mW4WmEKJIdijAV0ILdKLxdIpX7qyEbIY39S7G6q7867DxW4J0ANvo3B2MkM
+						n91Hj0ZeDie1Oiha9Ul94seEqz5/oxIvzUI7uULfBDisVzlnYJS/seXDBq3D0h+s
+						D6tZ4DIr6HrGqkb47heg+mwLgQBEpmB4x+qhAnkrTGE1Fw2OSPt3p/ayddRzdKQX
+						tk0si7mWSfWo8W1rfBuy0EErIFByBxGhtNq4Wlxf5yzt0Ln/T1KBDHTgilYqhSgQ
+						XvvgTcBa1pmiaRdZ5T6LT5hVybhpoFAm6xQecURFvXhlFHjK+H/Ia7H5Ecr1vcQq
+						LbD07pGwTVUcJAJ5VM5g2jfGzYCHlBiUPiE3J3Aj506duKDJZRwuDQfnl4IGG1ca
+						b9KTU0KPPBNSynKb++GcCyUtoknrMDGMSnfDcs2SsqzuFQHHA87p2ookjrC5z8//
+						mIdiC4GxRRby9bddF2uF4kFjGYhHGP0ELHD+McESSUPqfG1Ooyw7XRhgl+DRl8Re
+						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: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/intranet.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.balliol.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..e909e8d3
--- /dev/null
+++ b/swamid-interfederations-2.0/intranet.balliol.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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://intranet.balliol.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-20T10:53: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://intranet.balliol.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>
+						MIIDEjCCAfqgAwIBAgIJAOwRlblp/LXWMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGWludHJhbmV0LmJhbGxpb2wub3guYWMudWswHhcNMTIwNDE3MjA1NTA2WhcN
+						MjIwNDE1MjA1NTA2WjAkMSIwIAYDVQQDExlpbnRyYW5ldC5iYWxsaW9sLm94LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwL6S+yOh34IjmsZs
+						TrXKdS8/zYgSAvWJeY3UcN3rMyzWwQYuLdZUl05bWVgBW537kFwnIBcYhgOnKGt3
+						RAJZozV56f6CSgPoZ4o2L88xEpKkoG6/o6N0Jkg29Ljxlm50NOtCb1UsV0BNFOXi
+						y7zrVR2fF/MWTSySj0HulN8FhbhOFhlIV2FQOsSg/C2aZFtvNghQJfxSG69kDSXY
+						LOwlCjEGGjnExfMW/sXvZdDR9hRRALQ6J1RMqTGegciqIp7g7brzKWbB+S+ki4ys
+						rPQ/3SKoK7Iof9iK+MCyV7A2mNc/DbcdzvTsRSfBYb0jThNzmSpfhgcRq6BZCVPf
+						H6sCXwIDAQABo0cwRTAkBgNVHREEHTAbghlpbnRyYW5ldC5iYWxsaW9sLm94LmFj
+						LnVrMB0GA1UdDgQWBBQ9zyb5zExfVTLeIqsAs7Q5I2aZTTANBgkqhkiG9w0BAQUF
+						AAOCAQEAWjRkul6zFV8UhblhJk5sdrkODZb+vtp7UYQpn77tgDl8ELZxLdHqG3K0
+						Xflyy9KNxBOg79k1sSveHVKrQ4J0VxBfXyIBZaJV3sal3v2Ck8nm6g/0NwdZRhV8
+						yW+7rGDdzYDShpxhRnbHTZ/prlR1fT0pbUFgmqa7ea4DyoOOZndZI/glh0LLjH1W
+						MRo3TPdgGytJBLS1Ii8Kgujc8zYy82yBtytw/iw6aqRFMK1jaVdDsDNW0fZY84C6
+						6EroyluFZnuwVFP5KuAz1NWnBKBqkboQyDgYhvIVQ9qYV3pykcWIyXzSCoixNyIE
+						k4rhTMQ1dT+zT8nwSPUV6q5j1PQYPg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Balliol Intranet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stewart</md:GivenName>
+    <md:SurName>Tolhurst</md:SurName>
+    <md:EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stewart</md:GivenName>
+    <md:SurName>Tolhurst</md:SurName>
+    <md:EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet.hmc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.hmc.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..eeb6999b
--- /dev/null
+++ b/swamid-interfederations-2.0/intranet.hmc.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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://intranet.hmc.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="2012-10-02T13:11:22Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://intranet.hmc.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>
+						MIIDBjCCAe6gAwIBAgIJAIU8QGcz0dW7MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWludHJhbmV0LmhtYy5veC5hYy51azAeFw0xMjA5MjgxNDAxMjFaFw0yMjA5
+						MjYxNDAxMjFaMCAxHjAcBgNVBAMTFWludHJhbmV0LmhtYy5veC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALpxFuwu20NkTMGvbkdalfQmgkqK
+						OYWin+c2AjcyEvYwu+ltFotD3VU0dwQcIIvKzS4lWf8oFY1T096/Xya+ghriVkLO
+						/W1pS0D/a/m65zhqLL4Lxm6QQNXWrzXMqsbzCIX/PsCB289VH8U9o+veby1MwqeD
+						/IEWkOvnbMo7XdM1NYTjGCbjXj/V1MPsX5MCKCC1qpnKTpLlKCM4IMQ7uyR4gpZ9
+						uOYbisoTB6sM5IHhZ1iEPnoMRUc+XVV/2PTXKYvmHFK0nK69WgJTqhHq8JpLDReL
+						WMTu1IBX2HkkD4lusDGHbjsnXPMPk667selsm+sdKGS6VZK8rcQeVoHGGmcCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVaW50cmFuZXQuaG1jLm94LmFjLnVrMB0GA1UdDgQW
+						BBQrgF2zSfUhkXvNqRmMVewVsB8BDDANBgkqhkiG9w0BAQUFAAOCAQEANM4f7Js5
+						kWP9l88MlcZED8jKgnUU6xzk2/cucL3NWMQHRf3tX5Zx+TQNmCQPrQQuOVnZGBGy
+						t0BsjUWnm5EL8L8S2zPacTEXTPwIWZfMCGgfU6ukzf/qOvEEI4HmpwEb3Cyct+kW
+						L+md/et04WByDCOYBpI8miBmImtD0ivT52Z5mkqAcQ4kkjI4mmDKux1Z2LE6GjBl
+						pdBX86sXKhJFK+sd+W8tH5MhXx/QeQOm59E4lTEqycQzWU1bdSi2wSsfpTdn5QuP
+						MG4F8FSqKxqBRa2o7IBGKpQEM+oUTCVgDCGI+CPT56LdiS12JrjrSyPxyNJ1f+q3
+						nulyyQrBNsg/BA==
+					</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://intranet.hmc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.hmc.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://intranet.hmc.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://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.hmc.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 - HMC Intranet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hmc.ox.ac.uk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jonathan</md:GivenName>
+    <md:SurName>Boucard</md:SurName>
+    <md:EmailAddress>mailto:it-support@hmc.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jonathan</md:GivenName>
+    <md:SurName>Boucard</md:SurName>
+    <md:EmailAddress>mailto:it-support@hmc.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet.merton.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.merton.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..4cc95e15
--- /dev/null
+++ b/swamid-interfederations-2.0/intranet.merton.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,69 @@
+<?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://intranet.merton.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-26T15:23: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://intranet.merton.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, Merton College Intranet</mdui:DisplayName>
+        <mdui:Logo height="111" width="263">https://intranet.merton.ox.ac.uk/sites/intranet.merton.ox.ac.uk/themes/intranet_merton/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>
+						MIIDPDCCAiSgAwIBAgIJAKQRJD1xnl84MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGGludHJhbmV0Lm1lcnRvbi5veC5hYy51azAeFw0xMzA5MjMxMzIwMzlaFw0y
+						MzA5MjExMzIwMzlaMCMxITAfBgNVBAMTGGludHJhbmV0Lm1lcnRvbi5veC5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJp0mSk8QaA3c+pVIhXH
+						OqeLTK1d8dfufGu0fXb6mk3NEHlfh9kYV6Nil1S52S0OPpCoQpN9WqZoNxENwBKB
+						izzkZAZkQsA1v64lX1uVbHK3wIF9JS0im1quoeeRO8RKuHhjpUKzeXlWnW3lMLnu
+						2ej8mmIkNfRKXuCSUUXJiz5KScTNyE/0PiPfcRxDWpacxwOfu9g85sKyFib1gx/5
+						kQTGjABsts3PeAyg7SljCzA/U6J9ViLL19HttvHC+5NBu99amLA71JlR4zLp7W1v
+						XzAJg0YiKDI6KtVVnEmQwcruWYK3+dGpbdzevqXPQl2rQIKep2MxQU7A5M4xNFbx
+						WY0CAwEAAaNzMHEwUAYDVR0RBEkwR4IYaW50cmFuZXQubWVydG9uLm94LmFjLnVr
+						hitodHRwczovL2ludHJhbmV0Lm1lcnRvbi5veC5hYy51ay9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBQPWqo8KVCpXpCs58z3yiZxZ7aEXDANBgkqhkiG9w0BAQUFAAOCAQEA
+						N6g+njK3z8Em26gSbBPkb4IEbyvTfThDXOaQdut6Z483Vz5zVL1K+4VWVNTfD2wG
+						n1s86viBwlcPJJpn5odC1qFKQ9vQUgG7d6ThYlkbD1HSMa3oHYcZ1InASsULyXjW
+						uIn0LrsIj0VWZuRR1cn4yMJ39sFy6a+cF8ja3UlZasePp//1wk+/wuzV4jawCBKz
+						/1hHqxpIN9q/vDF9YJV6Ymks3ZOEu7fhzg5UufviWDbAAUmnvGalqCKytCyWKD1i
+						b3NJBlsPeMT6yUB7hAJFAejood7dtZsCUPn2IDv6f2bPORb1Y/KTI647jYeWY8T9
+						U2c4+fv9MNj3M0Of+23vCw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford, Merton College Intranet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://intranet.merton.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Cope</md:SurName>
+    <md:EmailAddress>mailto:simon.cope@merton.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Bowdery</md:SurName>
+    <md:EmailAddress>mailto:steve.bowdery@merton.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..86213dc5
--- /dev/null
+++ b/swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,58 @@
+<?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://intranet.sbs.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T13:50:10Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://intranet.sbs.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>
+						MIIDBjCCAe6gAwIBAgIJAIouVk51M2UYMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWludHJhbmV0LnNicy5veC5hYy51azAeFw0xMzAzMjAxMTI3MTlaFw0yMzAz
+						MTgxMTI3MTlaMCAxHjAcBgNVBAMTFWludHJhbmV0LnNicy5veC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJSaQFswjc93gqeaMWkdXqZIm/2A
+						6WEVgInFCFHUPWLsPs/iiVhmDIOVNVPlqI85DqshRuocfPkwV7m/22J7b7tC1NnL
+						ArnTdE3Btb+BqDwZaQfcXP/FzG5JaTef2ktLljY1tyue6cIRPsAkSE9lqkl1tTwe
+						nugT9tu5hI2pio7lmN9NBx6Chxr6BDCLoYD+cRPy9lEcCpUenoIGNNg22xieE6Y2
+						Nc+URn/J+sxhbyWwBxDgByrMcFsBPsMdOt5p2topnysc07+CgZdM7uiswYBz5Aj9
+						qUeZF2gC+BtzaR/tOHyN8L57gzWOthH/e6hcS9l2CSE74o98gI0uEvX+GY0CAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVaW50cmFuZXQuc2JzLm94LmFjLnVrMB0GA1UdDgQW
+						BBS6ncz+YNbGJqBNWLnmu8GRL482ljANBgkqhkiG9w0BAQUFAAOCAQEAK/wwGRID
+						V3WbBMsPSYWm9iH47V35BxxjTA45d6/lfbkFb4s5DD2FwD+wPubcri2s8cz289Kh
+						h9j9yj0Y4msbvYOzioA2xvayntydLgwNjky1EqpnIn6Fv/Atpuq+rt8+CLYZQPHD
+						vsmmQuZ7aORWFNPFIM1Ga51RurF2i83sKH5e6wYIWWx52d64DQfwa4rD9jrfurbW
+						sS3dlTasQa1eAmqc8L/WbrFA7NAV8W0lvldrz/n/iljP9P/C1E4isf14+nQaBUlb
+						PSLOQrLs+FvAmj0LpfNiX0FaipT5pKGuXV1Vmb7SKrEv9ecuOjMhpfcwfOoU2jWA
+						EknFc192G29Now==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School Intranet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Aaron</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..3304fd58
--- /dev/null
+++ b/swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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://intranet.wadham.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="2013-11-22T11:59: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://intranet.wadham.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>
+						MIIDDzCCAfegAwIBAgIJAJUJ+mlkoDXOMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGGludHJhbmV0LndhZGhhbS5veC5hYy51azAeFw0xMzExMTkxNjQ4MDdaFw0y
+						MzExMTcxNjQ4MDdaMCMxITAfBgNVBAMTGGludHJhbmV0LndhZGhhbS5veC5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1hB/bg6UfaT/XuBowU
+						VPZMqkb8Po4FYgkF3hO52To/bqnCdsalOx/XLfZ4HA09I14q8f0D/cWCYEYtOnVr
+						VY2hXOFO6YaRKWzQI8F2zHnAgkl9ytbWNqqIMQ6TINe96RCNV22ZZR/uOMQAiXwg
+						yyxGiQNquo5+vMKhLITbnQTJ/h22K0/DzGH0YF0PvJc/nu/sZMww6FxcdwvEpfzT
+						cK1WkSeqs4mHmrL1pi8VJTETFFZ8WGJZ2q8ueDloMFKfCa6S2fL2QuzXWbOpRDoW
+						qC/GpTJDfY4Zi2sixl9dtPlzETR0eOcRtuocv9q+K3JcypWIuy7n4Kr7ZbHYSEn9
+						DbkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYaW50cmFuZXQud2FkaGFtLm94LmFjLnVr
+						MB0GA1UdDgQWBBRL8H7cVFCFP5rpqrBDxU4lUQ/0LDANBgkqhkiG9w0BAQUFAAOC
+						AQEAOW8FQM1uFKk7chAErvTO0wiXvoVubVL0nqvA38zW1QNGFsJ9DjylIE7ijVvu
+						ZhvN9mSMl5j3T1UM0wOBw+ChBCNhHMmCLtyZsTwGA2fnWR+HXCcZ98A45/+7JI84
+						gdxPXpQMcNcP5VTP2scCQ5k4I2R2985N7NVU0DiqeMFeLqgAuwnuouv+RDioh5HA
+						ZJlfdbEsApOe9P5VcHAMbIUIGMpLu369MEomRijiAf/R0VuF84TDX6UT3xzg18kx
+						94ZMLY2ekb/Sv1LxRNNJ/leILLJJxXJunf2rk1wYhUMoq2lRPSkrGVMMu/H5c9fe
+						NCo2Q3oQaG5ZPA9VV7LCeIfm+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://intranet.wadham.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.wadham.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://intranet.wadham.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://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.wadham.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, Wadham College Intranet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wadham.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Wootton</md:SurName>
+    <md:EmailAddress>mailto:itmanager@wadh.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Wootton</md:SurName>
+    <md:EmailAddress>mailto:itmanager@wadh.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet1.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet1.balliol.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..2fdf3362
--- /dev/null
+++ b/swamid-interfederations-2.0/intranet1.balliol.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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://intranet1.balliol.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-23T16:59: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://intranet1.balliol.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>
+						MIIDFTCCAf2gAwIBAgIJANtuMW21siCKMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGmludHJhbmV0MS5iYWxsaW9sLm94LmFjLnVrMB4XDTEyMDIyMzE1MzU1OVoX
+						DTIyMDIyMDE1MzU1OVowJTEjMCEGA1UEAxMaaW50cmFuZXQxLmJhbGxpb2wub3gu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXqpKnpB86sI2f
+						YyXP5xx7UOIuKbes/RrYkncKSmMWE8uXd1yvRlcFaV9WESLV60t1ikFCKtruLGGY
+						6RAF6DQ/r4r+hRKxuAFswxjRmC4OOR5xGJnbrnso2OZXoj9rAJlAmi/4wNo3DOEe
+						KSgBM3hARnv2JEVx4qL5cTypoWGMyD3WesCVG3KakHxDjs33/jBTeSe9NS+xpSSv
+						LPGOWNHwBeOeMQX1YKnZOd/TXx6cKa3V4KS9P6tkTrYCWPydGw7mQ8aF5Bc4zr8T
+						edj/6ZyIrKmGaKqlFev+tv/CdSRXVdSRGmNPVViffa3GbH1YKmyM1Xo305MlRYQD
+						DofCRc2VAgMBAAGjSDBGMCUGA1UdEQQeMByCGmludHJhbmV0MS5iYWxsaW9sLm94
+						LmFjLnVrMB0GA1UdDgQWBBSNpnZI8DCyHFQzH7BeHXu0mLJP4TANBgkqhkiG9w0B
+						AQUFAAOCAQEAbeUAlzJ0gH6h2pPy+Nr2/n4AHqSwKkwhbwBCuRcKPwy1krCfnYL9
+						Y5V49NjBhZeGAH/IHi07tR8u5c2dUQyRQw6T6uqJ427rWCtgXnL1QgHZXwXV+K7Q
+						pBhdnwxYgbRRyXo/WMSCH3NRFeAxOFrY9HhA2XHbUfBBrjzAnT8YhaNK5Aadw12X
+						3Zo9jNZl9JZafaY0MPE5nRJMZa5eKXpwkjZqh5oJsPfx5lVxS9GkeR9Z/Y5h3ejN
+						GtgjT6jUqydjKMm9CYdL/rijp53LywBZwuQwoABOwwG91MwjrbwXRaw9BcK05VaI
+						LAXaNqQTfqwaHXaDqprLhpetEiURD1WEyg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Balliol Intranet 1</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stewart</md:GivenName>
+    <md:SurName>Tolhurst</md:SurName>
+    <md:EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stewart</md:GivenName>
+    <md:SurName>Tolhurst</md:SurName>
+    <md:EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranetdev.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranetdev.balliol.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..5526d16c
--- /dev/null
+++ b/swamid-interfederations-2.0/intranetdev.balliol.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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://intranetdev.balliol.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="2014-04-15T12:10: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://intranetdev.balliol.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>
+						MIIDGzCCAgOgAwIBAgIJAI5vRYCws2FVMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+						BAMTHGludHJhbmV0ZGV2LmJhbGxpb2wub3guYWMudWswHhcNMTQwMjI3MTMzNDA5
+						WhcNMjQwMjI1MTMzNDA5WjAnMSUwIwYDVQQDExxpbnRyYW5ldGRldi5iYWxsaW9s
+						Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtMyp0j7Q
+						QH4qKNg/mYxxkTP5lRgV8pEl8vu9nl8LxE4faJpL8+QxAQoW7Yw88EFjBfcc5O/O
+						hV31cOb3FlhBt30NDeoE7ik7wSmduVmeS5TUo+izAzjcdM109FGFkQMZ78bkefFC
+						c3S5b6Axqd1JIzkm5n9z30q3h5LIWKCvWjlW5KXDeDyGXWxbzj3HnXexXJ9os8m2
+						eDqr9TlKpLWU9zesJ5rXh0GU/CE33ryqRCx52sxBsZas8qevzmE9vfKi7YbqMD1+
+						HUYZNK3PyNV4GQFa8avYHf7QNfATiAbz39QPY0JHIDOiPwgcmgiou+Jhxhcy7ZUX
+						4z0C4oJwUo3fdQIDAQABo0owSDAnBgNVHREEIDAeghxpbnRyYW5ldGRldi5iYWxs
+						aW9sLm94LmFjLnVrMB0GA1UdDgQWBBQOQYNUMVsP1jC9dexfFq+RNkXwqjANBgkq
+						hkiG9w0BAQUFAAOCAQEAkw8XWWT+TWzs62pcUR1uBmHFpJ0tf2WSwlnIo9Dr3Vj4
+						x3yjAV3L3PWjOOMQ2hTGeaMhiAdpcA72tgcrwcRkFcucDahpCAKo7BP452nem4sf
+						y64vJrMFgh0sRH5XAIKhygLhm/A5gDU7rUI/QKaxgKut3ODMoy55YTWQq5u6J/ul
+						JxlRyjtfdq0hjkIbKTMa5YSd8FBH8ymgQuVKdA3FuGfAjbrtCgmYDdb7HGFKxnQ7
+						hfD6/CA/f85GY7EYDdnji9q+RnLnkfGPqwh0p3kJXOA245d3zlLF1uOud8XK2vvR
+						fjCDcSlVMXyh2hrW1XKa208JjXg3T5XCg7kENrTk1w==
+					</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://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranetdev.balliol.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://intranetdev.balliol.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://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranetdev.balliol.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 Balliol Intranet Dev</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Balliol Computing</md:GivenName>
+    <md:EmailAddress>mailto:computing@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Balliol Computing</md:GivenName>
+    <md:EmailAddress>mailto:computing@balliol.ox.ac.uk</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
new file mode 100644
index 00000000..f329408c
--- /dev/null
+++ b/swamid-interfederations-2.0/ioe-shib.hosted.exlibrisgroup.com-shib.xml
@@ -0,0 +1,85 @@
+<?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>
+      <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>
+						MIIC3DCCAcSgAwIBAgIJANemOX300yXbMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB2FpbzAwMDEwHhcNMTQwNjE2MDgwNTMzWhcNMjQwNjEzMDgwNTMzWjASMRAw
+						DgYDVQQDEwdhaW8wMDAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						3COtFzBkSfK1KCO/jH0lzKjiIrHOlF+RFmElA6xvQiDv4chS5BXhekHcHw3Z1Gxv
+						KzRA4631UsQDghhrSItEzmrHEYQfequz/x/b9JGFZCCfbMIvsZkaUe+8Aj+s3LC5
+						H5VAtO93PEvuERxTv3p2xx3sz4CxY66u3WnWjPzMagfYZ8EcOekfLECoKXPiKVzo
+						X0qja/oBlCQczODQIbDJcB4wNCcphcQz2vMMN6ReFBVQLVVMqy9vnXE85/rUDl6w
+						57KBsTmIJVs9XRgpdALB97lYekbx0fT855/NiBNJJs+/UvL10DCrjvX463x6iDTy
+						M9l/Cfh4fVx/8YjlyOUHPwIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDAxMB0G
+						A1UdDgQWBBRGl7/0TzLGNLSOnXLqSZJ7CiZcxDANBgkqhkiG9w0BAQUFAAOCAQEA
+						Ak/tINf0uXC5Vuhd72Rk3l+LuSAzSU6dVjsI5HLtiP5kCbEJ1lwoI5OlTv/S2n1D
+						XlxhUeuRRJc8cQ8ThpUgMOJacWUT3CP49EgbtYlBth/FaOjoz6nFO7pku1ESIKaK
+						DDCOMIav5NNhcpg/0Hj1MRjkEirS06KvFmXxk9cCNX1RZCuiGJ2VzIgTzkJvlMD/
+						bfYdtTbiKqgJw24mmX8WL8qqpwc1lSmWXikUYB5smGzrg5XxxlGoJnK/iO/VP6x1
+						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>
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
new file mode 100644
index 00000000..5fa40c6b
--- /dev/null
+++ b/swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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: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>
+					      MIIDdTCCAl2gAwIBAgIUfVeQwiqB95BAl22ynEYVWqJBclowDQYJKoZIhvcNAQEF
+BQAwLTErMCkGA1UEAwwiaXItbGFuLWZpZDAxLmltYWdlcy1ldC1yZXNlYXV4LmNv
+bTAeFw0xNDEwMTQxNDU4MzFaFw0xNzEwMTQxNDU4MzFaMC0xKzApBgNVBAMMImly
+LWxhbi1maWQwMS5pbWFnZXMtZXQtcmVzZWF1eC5jb20wggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCEtN1a3z7IoDPq2fx+81W+8BVvtZ3skA7iyZjCpNC9
+maYCL9gPo8qOQoXKE3z8vtxZwmV0ynmZBVtPjHwtQqdBCpcViEmT+aXhg9+KaRlQ
+1c8FriEX/A7JtWfwwHRgAvMLujFbi0qIQa+sMZ7ggFDwiqZojQwOgFgKBUTAgN/M
+A+ynQZUo9z1uSxdCiXJpY2010TLJf8WSv1MZGhQP2KLUNKXCY3MNfCMC42OEALJb
+mpRUPiI1weJk7QX6hefMOHwc61bXT9PT62R2LNipzA9f2UBYBQhXXOvtnKcg03/w
+90uQIg+kP6doqffDrlmQsB/AeDbnGbpAM3xumEcdxvOdAgMBAAGjgYwwgYkwHQYD
+VR0OBBYEFNhsNcOXWxlijZxR+nrdBdsaPfw0MGgGA1UdEQRhMF+CImlyLWxhbi1m
+aWQwMS5pbWFnZXMtZXQtcmVzZWF1eC5jb22GOWh0dHBzOi8vaXItbGFuLWZpZDAx
+LmltYWdlcy1ldC1yZXNlYXV4LmNvbS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0B
+AQUFAAOCAQEACZDPw9UgXcEPiwrXkB+//NbYYpuvj1SW8rS9kV6NhmtToFAfhbn4
+IjhsjSJ9eHC5E6pBthKPif9strOG1GitiSfHHwu9gRCDxLkj53oZhBOXmUDOV7oV
+aaI0SbgfGoUbSZ44WuJdafHEybFlCucWd789zpZGrnLhd+J7G1RWZe+fV4Gn+amf
+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>
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
new file mode 100644
index 00000000..359c982d
--- /dev/null
+++ b/swamid-interfederations-2.0/isls-shibsp1.wmin.ac.uk-shibboleth.xml
@@ -0,0 +1,73 @@
+<?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://isls-shibsp1.wmin.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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIRAKcKlpWKeiQ2JgZOpQd7r2EwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzAzMDQwMDAwMDBaFw0xNjAzMDMyMzU5NTlaMEUxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXaXNscy1zaGli
+						c3AxLndtaW4uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDq
+						Sxx+9Zm7n7ts0gcLBL/GQZP56I05X3MvQlwpUBuA9yklTUwj0pqHoFA52djvPQ0B
+						qQQHkIfn9oasbC5W9RoDWfLYgFKYTx3Hat8eXz+qBYBUBvjRSVbCvwcIuKPwkOYd
+						jLhbwhzBKQjJ2IRWFt7/+fapP5pD1GH0ONYi8CGGYl2GDq3PR5q0vY1138k929Qf
+						5/usrmB8gS+dWP3YDFtZHVSKAPJPRTAYdxrXu0oNljNoCe1qYzwjCQ8PaFiblrD5
+						XwdDgzpVTIsIcNvCqlzSQLdonuL/PNsyX1zp6ZVE0YK+MwHY2PHuLAvAelmJuev7
+						Rv6RvrK9/aqow00uvGjzAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
+						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUlraHm+YFRDr0FiNFsq5kX8EU4ZYwDgYD
+						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
+						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF2lzbHMtc2hpYnNw
+						MS53bWluLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQAlJVMwZfnCbDGZ6tRoWcv/
+						9SsLIpuq3Qqz0h0Yj0UdsIQ8PN9XSf1XIQj4pcNA1l1vktjPtPj6NKihliOIyZse
+						shUfTdaZW03i6lEGiluEUptYKDnIOx37EPJjzv/LqLNGK9Pc6RaPn3tsWF7SXMxw
+						7w749ND4CQlVRFyrH5eYy9RhrKWjr+dA/wvnx+Zd+6+KtsqrAA3nn+LHyrGKpx1o
+						8lNuCyzYaYjhVk66P94RHX24e+pNbKMB8rgrY3yDCduz+RTpfpei2zdyQ7ozhrsC
+						axbN6Uoxykqr5+rRKWbZi38xg9VP+mnAXiGvl5s+v2hjV6Gq2/orQwDLhV+b40U4
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..022a1470
--- /dev/null
+++ b/swamid-interfederations-2.0/iss-openathensla-runtime.swan.ac.uk-oala-metadata.xml
@@ -0,0 +1,64 @@
+<?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>
+      <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>
+						MIIDxzCCAq+gAwIBAgIJAKaRp6YdpxbFMA0GCSqGSIb3DQEBBQUAMEsxGzAZBgNV
+						BAoTElN3YW5zZWEgVW5pdmVyc2l0eTEsMCoGA1UEAxMjaXNzLW9wZW5hdGhlbnNs
+						YS1ydW50aW1lLnN3YW4uYWMudWswHhcNMTQwMzIxMTAzMzI5WhcNMjQwMzE4MTAz
+						MzI5WjBLMRswGQYDVQQKExJTd2Fuc2VhIFVuaXZlcnNpdHkxLDAqBgNVBAMTI2lz
+						cy1vcGVuYXRoZW5zbGEtcnVudGltZS5zd2FuLmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAxSGK+XQQj0yhGBm/ig/1JYcAKjOblBds1+DH85ub
+						1MasaxAq+Wxo8PkneHtsBZVagc+7mpUjH6LrQBVY2ltWNz8w1Lw3bEIFvkvHrYYb
+						+DzMI6vBpyRlGgwZUTQpSFsHUrkEJmS7Y2lGPRCOZGFduvQwa85BmTciympInFcL
+						467abYfL7YCjjvjrAL0A7T5v91UvfLkqkV0ZwLWCzs/vZH2z7zd24t4FqsX3DLnA
+						EWFaLSmgdP/EEaSL1XHRV7rBEpyNe9aPjYIeL8Y0X0Wm2KHUu/L4er7Rwd6BcVLg
+						74CDPps4QC3cfRALzllx/4UiBFpftJ7OTEU/h8A47kl/awIDAQABo4GtMIGqMB0G
+						A1UdDgQWBBRta2Fv0weameEGf4FV4KhhXCwFXzB7BgNVHSMEdDBygBRta2Fv0wea
+						meEGf4FV4KhhXCwFX6FPpE0wSzEbMBkGA1UEChMSU3dhbnNlYSBVbml2ZXJzaXR5
+						MSwwKgYDVQQDEyNpc3Mtb3BlbmF0aGVuc2xhLXJ1bnRpbWUuc3dhbi5hYy51a4IJ
+						AKaRp6YdpxbFMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIr4duye
+						2F9oXAkfotF0kQdAKR9a2xgbsx/qQiKPyuk2QGucPeY1Aw8XfkLcgfw7GzFU8EVf
+						3h8Bwu53/UinLh3xOjZxbzPA+Pj76PfkPV9aZNTpE8AZeHM+BTBj94/cNN3CYzWc
+						w6Yiz84MqktGMLyScDPi0bKaoLRd5hrzbbu2Uu9ohmVhP9MDMKAFOYuVel8xiat9
+						51jvG6uRFNoAE6W4So601BjZMsvOAzUjnTpkdwVBtCRhf8TOlO2JMZN1GaqbzQjC
+						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>
diff --git a/swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml b/swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml
new file mode 100644
index 00000000..e8c4b4f5
--- /dev/null
+++ b/swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml
@@ -0,0 +1,116 @@
+<?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>
+      <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>
+						MIIDRjCCAi6gAwIBAgIJAPjZ6g1hwfvPMA0GCSqGSIb3DQEBBQUAMFExEzARBgoJ
+						kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMR4wHAYD
+						VQQDExVpc3N1ZXMuc2hpYmJvbGV0aC5uZXQwHhcNMTMxMTI1MTQ1ODA4WhcNMzcw
+						MzA0MTQ1ODA4WjBRMRMwEQYKCZImiZPyLGQBGRYDbmV0MRowGAYKCZImiZPyLGQB
+						GRYKc2hpYmJvbGV0aDEeMBwGA1UEAxMVaXNzdWVzLnNoaWJib2xldGgubmV0MIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb4jIloWGvHJsSeq0PMjkWDA
+						+hseZ6/6/cEJKPk245f6hktC2k3z0AqJL8Kw9OudOjDx2op2jKm45TuIA46ti6VP
+						f4stLIi7mO1B4A6jTWThCwU0DjMCwBXLhANdBQloyUYJU/usN8RBXlPnWZAV1dVb
+						ygb7GUorkMON+wnFd7nhBePmQdJfbsqvKN8MykWfQ56chS+0lCYhyT7qql2bskJ4
+						y621WSo47php2NyyU1KNcaFBLoao+UTH7KZ9qHOWJyGJGuWKwgZmCiVd0LQhWywP
+						3M/JxZvpTr2Bs/J5d8BzZGSFUaHrVcPzIX+5c3sdK4d1wXUur1XE++bh9F9TjwID
+						AQABoyEwHzAdBgNVHQ4EFgQUHtV8GWr64AIUV634b9YBlMEpHOwwDQYJKoZIhvcN
+						AQEFBQADggEBAI0BSqXoyw5bUVQJKNCnxB3hUwHIOXeoS77jqgv2lesyTqz5U4NV
+						v4Cdz7icwYzt+c6ZSZqem4pqmi3/6COZnf/+l29J/XwWkva32P6tfoO4af3qywF+
+						TvuZiRMXdt1KE7GTlYOSxOsnxaRmXVc6MWfxPT6oTOt5z15aTdfEzK+wVfeUkIf1
+						1soEmMHgjDaa/HQdGgXGq/fStDc0Mcm2W7y50+aNwqIMNiQQiwQYSUgpBatSfKy1
+						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">
+				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 Collections and Janet 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
new file mode 100644
index 00000000..165bc423
--- /dev/null
+++ b/swamid-interfederations-2.0/itacare.bahiana.edu.br-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIIEZDCCA0wCAQAwDQYJKoZIhvcNAQEFBQAwgfcxPTA7BgNVBAoUNEVCTVNQIC0g
+RXNjb2xhIEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYcO6ZGUgUMO6YmxpY2ExNDAy
+BgNVBAsUK05USSAtIE7DumNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fD
+o28xLzAtBgkqhkiG9w0BCQEWIG50aS1jbGF1ZGlvc2FudG9zQGJhaGlhbmEuZWR1
+LmJyMREwDwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJBgNVBAYT
+AkJSMR8wHQYDVQQDExZpdGFjYXJlLmJhaGlhbmEuZWR1LmJyMB4XDTE0MDQyOTIz
+NDgwMloXDTE5MDQyODIzNDgwMlowgfcxPTA7BgNVBAoUNEVCTVNQIC0gRXNjb2xh
+IEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYcO6ZGUgUMO6YmxpY2ExNDAyBgNVBAsU
+K05USSAtIE7DumNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xLzAt
+BgkqhkiG9w0BCQEWIG50aS1jbGF1ZGlvc2FudG9zQGJhaGlhbmEuZWR1LmJyMREw
+DwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJBgNVBAYTAkJSMR8w
+HQYDVQQDExZpdGFjYXJlLmJhaGlhbmEuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArfqLewyUzBJPl5bZ5wEkkGRTPti74wbKnaAPLgzhLtPD
+tqICjgEVituk3ZSaEi3S9z6XUKLS32zOv0+U2aD1+IefqGrEOEyBbEPQJ7+gr4Zi
+Z13qHrjNWJ5a9b7UVNTD+6r0HWD1SPzW+lWzEaQzsV4WyBUo2l5b7Ik2hPWGn+UR
+STLduCX3Pb9UOTmwGikTN+uhKiyvhYMVkVVI1AV8byR0kXjbpzaOss0MgldLCqZL
+8NA/yF4XULGoUKb4DnH7i2ljgC3inay2oOdwRF1UYhI+lYaWq0bgxu+aDPRbQePZ
+/qOEl6Fg/p6I9mCN5boSalR1c2paAWXjQFIb1yzooQIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQCgIsNDggjacZw0Q/ngHibIkh9B1GzvRXR74eG42/Lsdfyr9VEe+foh
+E8YVGgT0PDJF/TU8a9IK/j5HLMUnwCEiEEA5yt5RjC3QmIlKVkBD19/2EwJ0m9y+
+4xPQ977AsGpdh1IgtwgFGDKe0ZuVMyOJkWBx0VDdROP14215yTMhTgho9BnfAWcL
+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>
+      
+MIIEZDCCA0wCAQAwDQYJKoZIhvcNAQEFBQAwgfcxPTA7BgNVBAoUNEVCTVNQIC0g
+RXNjb2xhIEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYcO6ZGUgUMO6YmxpY2ExNDAy
+BgNVBAsUK05USSAtIE7DumNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fD
+o28xLzAtBgkqhkiG9w0BCQEWIG50aS1jbGF1ZGlvc2FudG9zQGJhaGlhbmEuZWR1
+LmJyMREwDwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJBgNVBAYT
+AkJSMR8wHQYDVQQDExZpdGFjYXJlLmJhaGlhbmEuZWR1LmJyMB4XDTE0MDQyOTIz
+NDgwMloXDTE5MDQyODIzNDgwMlowgfcxPTA7BgNVBAoUNEVCTVNQIC0gRXNjb2xh
+IEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYcO6ZGUgUMO6YmxpY2ExNDAyBgNVBAsU
+K05USSAtIE7DumNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xLzAt
+BgkqhkiG9w0BCQEWIG50aS1jbGF1ZGlvc2FudG9zQGJhaGlhbmEuZWR1LmJyMREw
+DwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJBgNVBAYTAkJSMR8w
+HQYDVQQDExZpdGFjYXJlLmJhaGlhbmEuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArfqLewyUzBJPl5bZ5wEkkGRTPti74wbKnaAPLgzhLtPD
+tqICjgEVituk3ZSaEi3S9z6XUKLS32zOv0+U2aD1+IefqGrEOEyBbEPQJ7+gr4Zi
+Z13qHrjNWJ5a9b7UVNTD+6r0HWD1SPzW+lWzEaQzsV4WyBUo2l5b7Ik2hPWGn+UR
+STLduCX3Pb9UOTmwGikTN+uhKiyvhYMVkVVI1AV8byR0kXjbpzaOss0MgldLCqZL
+8NA/yF4XULGoUKb4DnH7i2ljgC3inay2oOdwRF1UYhI+lYaWq0bgxu+aDPRbQePZ
+/qOEl6Fg/p6I9mCN5boSalR1c2paAWXjQFIb1yzooQIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQCgIsNDggjacZw0Q/ngHibIkh9B1GzvRXR74eG42/Lsdfyr9VEe+foh
+E8YVGgT0PDJF/TU8a9IK/j5HLMUnwCEiEEA5yt5RjC3QmIlKVkBD19/2EwJ0m9y+
+4xPQ977AsGpdh1IgtwgFGDKe0ZuVMyOJkWBx0VDdROP14215yTMhTgho9BnfAWcL
+dB9LD1cUTQOHl3pALNiJEUoalHigtqsPtZx1ld1qskHvvv/6WhObJBh0DbSXJtak
+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>
diff --git a/swamid-interfederations-2.0/its-aai-logon.unibas.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/its-aai-logon.unibas.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..8e0b7168
--- /dev/null
+++ b/swamid-interfederations-2.0/its-aai-logon.unibas.ch-idp-shibboleth.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://its-aai-logon.unibas.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-03-09T19:56:20Z">
+      <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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibas.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Basel  [DO NOT USE YET]</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Basel  [DO NOT USE YET]</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">Université de Bâle  [DO NOT USE YET]</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Universität Basel</mdui:Description>
+        <mdui:Description xml:lang="en">University of Basel</mdui:Description>
+        <mdui:Description xml:lang="fr">Université de Bâle</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAgklEQVQ4EbVRQQ6AMAib/o/X8kANi90KG3GJ0wu0tJTMUv74ROSKe2ecaU4IMwHmXFMtBly5tyXAvND1JpiJMv5Y2uoiOlDV6u/M08W0iAcDCJzOlXvTAcPT/gKILdVSOCliDtn/iFlaxvM17YFwPpuYcyYACAxzvzqHrta3BU78Fdzl9FuPpzdbqAAAAABJRU5ErkJggg==</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+hkAAAfHSURBVHic7JvZTxVJFIf9n3zz2QffTFzBLSoxikiURFkcFBUUInpBFgUVVHAB9QIuIJlxA69xQUSGxRVUXABFVBQVQXu+3IqVovt2D/FWDeNynrqq6zb1dZ0653e6mwnWL2YTTP+Bpqam9PT0sYzMycm5cOGC4emYB25sbNywYcNYRm7fvv3s2bOm5/NfAG/cuHEsI38Y4FevXj148MDtrAp89+7dt2/fqmc/fPjQ3t4ujr2BHz9+3NvbG/5sNQA/e/YsMjKyoaEh5FkVuKamZvHixQMDA6L56dOnmJiY8vJy0fQA5qZERER0dHSEP1s9Lt3Z2Tlr1qzr1687T9lc+vjx41FRUf39/e/fv1+xYsW+ffvkKTdgaLl4W1ublqlq28MPHz4MyezcwzAfPnz4xIkT+/fvV/tDAuultfQGrZDMTuChoaHW1tbbt2+zyGq/ExjOmTNnyk2uxTRHaSezDZgotXTp0tOnT1+8eHHRokVv3ryRp2zA0OpdW2H605JgvnbtmmiqwNBGR0cfPHhQNKuqqlRmFVjQ6l1bYUby8KNHjySzBLbRChPMIldJYBxeuydLMyU8BDO0zB5g9i20paWlzpGVlZUwDw4O+ny++vp6crU5Wsuo0nr+/PnChQsPHDgASWJi4tGjR91Gkp/j4uJyc3OLi4tJ1FryrZt9PzBL8ZenUQmwpIFA4MWLF4WFhefPn//TxRhZUFDADcIjyMw0va987ty5cQBmWuw6n7tlZWXt2LEDTTI8PAw5xZDbSIaxtggvmFnn7Oxsj8uK8eMAPBZLSEjIz88HBgnZ0tLiNoybsnz5cobt2rVr5cqV3CBzUzIF/PHjRxiOHDkC56ZNm9Dbaq5SjajGKfYtHkHQIkXLuG3CNACzPkQmtUfQik6ZlkTctukwkYFQXZaSlioqKghdNuaysjItIkQDMAk2Pj6ejSeaKq01WnjYdJhKa40WHoJZ1lVFRUVUGlqWXY9Lf/nyhe0KM7IJWrUqsElLwXzjxg0yrS3f2qSl3++HmbqKvQ0tIU3LVLXt4a9fv546der+/fukGbXfWTxQytfV1V29evXevXtqv7N4QG+T/Ljs58+fdc1TGzCezMLeuXOH0k/tdwI3NzefOXOGrAaz2u8EppBk35aUlGiMYXqA2cbLli1jZhysXbuWqctTNuBbt27h0qxbV1fX7NmzL1++LE/ZgNEqq1atQnKyn1Fsal0VjmkA5vZDK6sCfBtm5IFoqsCCFrcXzSdPnkREREhmFXj37t3QSk+mxoD55cuX4c9WAzBrhRhWe4hhkvnmzZsCWNDa9q3KLIFttMJQlPJOhWOmhAfMSUlJ6MSmpiaAxZMaG60wmPFt4jY3iChFPkNsaYxSNjMrLdPS0vLy8tBbsbGxgLkN6+vrI/EQ7SghkpOTjU7p+4Grq6vx2z88LT09vaenh8GHDh1KSUlJdrH169eLx5evX7/OzMykx/uy69atGwdg5DHbstndyCisLRkIUUmphK7628VweJwfhydXkdv4ocdlMX4yDsD/asx7wYIF5eXlGRkZqampILmNZHnZ8BQPeDWVQ8gaQ5eZAhYxmRqI1RAv09CeIDlH7tmzhx0+MjJClL506VJ3dzcxLBAIGJqYEWA1AzU0NAhgqbfVkXv37oV2aGiI423btolHGU+fPiVXGWLWD2xTFxLYCjKrdZVKaynAlklmzcA2Wms0sPWNGZFcW1tLKpK01mhgK8iMb+PkemeoE9hJazmAhaGlGWZTFzZg69s662XWBoyictJaoYBRF6WlpZWVlWqNYYUCtgww6wFGMIektRzA0KKTqSWHh4eREEDKUyGBrW/M9fX1WqaqAZiCfu7cuW7KXgX2+/2qThZ1lXwY5AZsBZnnzZsnHwaFYxqABwYGPAo3FRhxpkYpjPQLjDj2AMb6+/sRnuHP1vhHLSGDVkjzBtZlxoHRiezVsYyk0rA9DzNhxoF7e3vHqI2JfB4lpC4zDvx/s9/AP7v9BtZtVAtCaSAzpORAZolXJ5yVL0c5oGl6PsaB29vbV69ebQULBnFgBR9xTJw4saur68qVKxSJojMtLY2m6fkYBybZREZGctDS0oIkFp1ZWVnTpk1LTU2tq6vLyMgQnVSLP8bXtN7W2Ng4f/58DlDCEnjr1q3Hjh2jiZCWNRMy+2dQWpQWU6dO7e7uLisrA0l04r2wFRYWTpo0SX6wER0d/TMoLSv4lgRCpLL84BkwFvzdu3eJiYmyBqqoqNDyMsXbjAAPDg4iEm3FDVGaMljt6ezslN+XErQpuXp6ehhmBV9H2gbrMiPAmzdvjo+PX7NmjfxqnNlTMy9ZskSOKSgoYM1PnjwpCNnSM2bMKC4uFlmKs+qn1BrNCHBCQkJtbW1ubm51dbXoqampwavnzJkj/1mAgj4vL0/+BLzY2FhcWvATyfLz803MzQhwUlJSVVVVVFSU3+8XPawtPJMnT87JyRE94oV4TEyMICwpKZk+fTq/EtrD5/OxyCbmZgQYgUG+KSoqEqV/R0cH/swWRVdMmTIFvQUVsaqtrQ3IkZERK/iMOi4ujp0vmpmZmVTR/FC79jICjCenpKTALL7NIBUTqMWpnTt39vX1cZCdna1+xYM+4TZt2bKF0E0zEAjQZJ21vyj+5YqHfwAAAP//AwAvb8SJSpHFqAAAAABJRU5ErkJggg==</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>192.43.196.0/24</mdui:IPHint>
+        <mdui:IPHint>192.43.192.0/22</mdui:IPHint>
+        <mdui:IPHint>2001:620:200::/48</mdui:IPHint>
+        <mdui:IPHint>192.43.196.0/24</mdui:IPHint>
+        <mdui:IPHint>195.176.29.0/25</mdui:IPHint>
+        <mdui:IPHint>193.8.136.0/23</mdui:IPHint>
+        <mdui:IPHint>131.152.0.0/16</mdui:IPHint>
+        <mdui:IPHint>131.152.188.64/26</mdui:IPHint>
+        <mdui:IPHint>131.152.193.0/24</mdui:IPHint>
+        <mdui:IPHint>131.152.194.0/23</mdui:IPHint>
+        <mdui:IPHint>131.152.227.192/29</mdui:IPHint>
+        <mdui:IPHint>131.152.227.200/30</mdui:IPHint>
+        <mdui:IPHint>131.152.227.204/31</mdui:IPHint>
+        <mdui:IPHint>131.152.227.206/32</mdui:IPHint>
+        <mdui:DomainHint>unibas.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.55898,7.58352</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>
+MIIDPDCCAiSgAwIBAgIJAKhSRQPaDjLiMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2l0cy1hYWktbG9nb24udW5pYmFzLmNoMB4XDTE1MDMwNTE1MjYzM1oXDTE4
+MDMwNDE1MjYzM1owIjEgMB4GA1UEAxMXaXRzLWFhaS1sb2dvbi51bmliYXMuY2gw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/Ew0TSF/LwcaHcLKqWygO
+LsQ8WqnH1fWhHjrO6uah9IlR5ReAblC3D6eF8I2E+oT36R6kO+hdUsTCwOXCdn86
+HgtD/b6bONReTSc3DJ3i50/hCZOAE9xkF7StvkEkTOEvKoQf8LF5phothcu2/4MJ
+uUqYiRm8TeYm8lfnWCjbSuCT7Na2P8s+EwLnbutkHwKFc03uCIWlCOQ5cw8soSXI
+ANd4xuL7t8LYTPWHB1dTv+VA/jWxddNgQ5cnJ5rkWRrLSTT3hgsUbgq7KAheF+8i
+WtPOlJr2cSqwK+C36LIg1c2BPs7rbUVlciBwOAhSXZ+VV75i2h939cUdiEVS4OzT
+AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2l0cy1hYWktbG9nb24udW5pYmFzLmNohi5o
+dHRwczovL2l0cy1hYWktbG9nb24udW5pYmFzLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRVRTA2rDViMaivqEgVn3TaybQJ8jANBgkqhkiG9w0BAQUFAAOCAQEA
+O8NZZx2cIVnL7crxy9znPUD6NbTfSF/J1pY2Rl0mSfQ3BTgA4u6Fu9ds8Ty9p8vH
+lpa1Sep/Iys6jsf578P6UXCZZxvYBbDXQehjIUJu4mRUBNIkKKMStbm6lSEWhHhv
+gqxkeAhQRXsCbbUiignEDLfAPJ7Oja+aMAVreBN0ojEDy+5Yapi5De5Mb9fbBPN8
+t7o0+SaKUJCeKAti9v18Sw7+gB8Ri2WoGKHTtfy75PYMlzPNcjXBKddSiDOhl/P0
+K1deBnSSDhXeFcAL/Dug74f6LwUYH0gE0hQ21MCU4h2mY69FTNjTnRtZA/ExQdQW
+xVM3RvYuoZFN8VKpoMHa6A==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-aai-logon.unibas.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:oasis:names: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://its-aai-logon.unibas.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-aai-logon.unibas.ch/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://its-aai-logon.unibas.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">unibas.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIJAKhSRQPaDjLiMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2l0cy1hYWktbG9nb24udW5pYmFzLmNoMB4XDTE1MDMwNTE1MjYzM1oXDTE4
+MDMwNDE1MjYzM1owIjEgMB4GA1UEAxMXaXRzLWFhaS1sb2dvbi51bmliYXMuY2gw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/Ew0TSF/LwcaHcLKqWygO
+LsQ8WqnH1fWhHjrO6uah9IlR5ReAblC3D6eF8I2E+oT36R6kO+hdUsTCwOXCdn86
+HgtD/b6bONReTSc3DJ3i50/hCZOAE9xkF7StvkEkTOEvKoQf8LF5phothcu2/4MJ
+uUqYiRm8TeYm8lfnWCjbSuCT7Na2P8s+EwLnbutkHwKFc03uCIWlCOQ5cw8soSXI
+ANd4xuL7t8LYTPWHB1dTv+VA/jWxddNgQ5cnJ5rkWRrLSTT3hgsUbgq7KAheF+8i
+WtPOlJr2cSqwK+C36LIg1c2BPs7rbUVlciBwOAhSXZ+VV75i2h939cUdiEVS4OzT
+AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2l0cy1hYWktbG9nb24udW5pYmFzLmNohi5o
+dHRwczovL2l0cy1hYWktbG9nb24udW5pYmFzLmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRVRTA2rDViMaivqEgVn3TaybQJ8jANBgkqhkiG9w0BAQUFAAOCAQEA
+O8NZZx2cIVnL7crxy9znPUD6NbTfSF/J1pY2Rl0mSfQ3BTgA4u6Fu9ds8Ty9p8vH
+lpa1Sep/Iys6jsf578P6UXCZZxvYBbDXQehjIUJu4mRUBNIkKKMStbm6lSEWhHhv
+gqxkeAhQRXsCbbUiignEDLfAPJ7Oja+aMAVreBN0ojEDy+5Yapi5De5Mb9fbBPN8
+t7o0+SaKUJCeKAti9v18Sw7+gB8Ri2WoGKHTtfy75PYMlzPNcjXBKddSiDOhl/P0
+K1deBnSSDhXeFcAL/Dug74f6LwUYH0gE0hQ21MCU4h2mY69FTNjTnRtZA/ExQdQW
+xVM3RvYuoZFN8VKpoMHa6A==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-aai-logon.unibas.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">unibas.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Basel  [DO NOT USE YET]</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Basel  [DO NOT USE YET]</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">Université de Bâle  [DO NOT USE YET]</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>URZ</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:support-urz@unibas.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Arsene</md:GivenName>
+    <md:SurName>Gschwind</md:SurName>
+    <md:EmailAddress>mailto:arsene.gschwind@unibas.ch</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
new file mode 100644
index 00000000..195d1f33
--- /dev/null
+++ b/swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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="fr">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage 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>
+					      MIIDSDCCAjCgAwIBAgIVANQRFAgpYoToGKMWg8l5CtEP+fE3MA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMTF2phbnVzLmJvcmRlYXV4LmFyY2hpLmZyMB4XDTE0MDEw
+NjE0MzYyN1oXDTM0MDEwNjE0MzYyN1owIjEgMB4GA1UEAxMXamFudXMuYm9yZGVh
+dXguYXJjaGkuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8pUD1
+rfIX1k/y24cQnDYj/j06C8eRpjJ7h809cAuMA++rFeeM8CPjzDBxOgcM/sxLk4Hm
+kxetKPSwWaz2Q0eXRpjy1+gX53dz5mYyb7D3kSz3/kLTfrY5IrPjXUgOGZWwYlcG
+Mt05Mh7AMNPns+xuNrrVhKMy9hA/1HO5cgDfamc+ovDqnvRBQIjqRhvxM4CEnJGH
+cyxaGrF++0Hh/DYWrlH0dCeLxLNGUyv6SfDKCm5GBkK3pmPoKu9HYeJb0AZcIA37
+ugRWnx+kHmgLaHWGkKEqTf52sp1mJYplVc+ykdztLYXoghlRRVKJxotZa6aFmcDV
+ukmhCWQLQ8l4xewZAgMBAAGjdTBzMFIGA1UdEQRLMEmCF2phbnVzLmJvcmRlYXV4
+LmFyY2hpLmZyhi5odHRwczovL2phbnVzLmJvcmRlYXV4LmFyY2hpLmZyL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBT/gbDUy3XKG6rYVG7mfleHRs97XTANBgkqhkiG
+9w0BAQUFAAOCAQEAar3F3OsrV1trAQ/ObeP8/KPTgUrGa3HV0yNwbNCP/F8CNzZI
+pKY0hE8eGHjdFpfxrC9MPe3YR7CmZtlAT0rkkDZFVRFtjaLK15oOnmrbvuCMkPI7
+yATc1qnTMbH0EgMl55zJvyXy6+HpCn8xASpeGqqf/ZGu0Y4p4oytrD/UZKjHGj59
+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://unknown.site.com</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/javasp.test.openathens.net-hello-oa-metadata.xml b/swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml
new file mode 100644
index 00000000..8d7aba7c
--- /dev/null
+++ b/swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://javasp.test.openathens.net/hello/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-21T14:54:26Z"/>
+  </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>
+						MIIDDDCCAfSgAwIBAgIETzp1STANBgkqhkiG9w0BAQUFADBIMSEwHwYDVQQKExhK
+						QVZBIFNQIHRlc3QgYXBwbGljYXRpb24xIzAhBgNVBAMTGmphdmFzcC50ZXN0Lm9w
+						ZW5hdGhlbnMubmV0MB4XDTEyMDIxNDE0NTI1N1oXDTIyMDIxMTE0NTI1N1owSDEh
+						MB8GA1UEChMYSkFWQSBTUCB0ZXN0IGFwcGxpY2F0aW9uMSMwIQYDVQQDExpqYXZh
+						c3AudGVzdC5vcGVuYXRoZW5zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBALUqBTnXevAE/4OvIH7iS72gHaJqRZulPN0BFVnkDvy5HdX1ShlnMlgt
+						h6lvRe7AmRgiMCrIGbGeDzV6DeeXXQKbruXrtamp3rKOkgZCFKsGbc/mTsOQsP1R
+						INm86m1lyZAh/+qxT3ipL1ln+KeVT9h3Ws65ZLRn2tiZJb0cuKdkOmH8NWZ6Ou7r
+						2GEWNyIVxjGyZLttO4ZIwghGLpUJCLgnghd4NnsqaDUV1xO4GYPg+NJxezJqy2Zf
+						ejLPGqhz8/Woj8yeWWPBExl7qyZty1shUknPARparzQK1JcuEHRHu9lyB9kZtPYz
+						Mi39XcXfVVEC4/Jo0/wIzMPC3m57qJcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						q95Lu8qgTLA2xmLlraZnUmR7PmKnIQbERbwHIstyz7tYfUat3n0q2EBULuwSK9Pa
+						uWq2x8zfanPNX4Uvn9GDsM7Nn35oblasq2xuonbwlB2FYxEOlrlmcRbT6hCZBx6P
+						SPOGSH8MH6li5/PEifq4nLgmm6PXjueGexndqv7q+ocLtHOPpBusbY2ISXZnow4T
+						4SiAK8aOQpY8PxOjKov3l9P94mzeagx9eIoVc6aDdGv+nGYGGG4zg8VI/yKR1tZR
+						jSU46LhuFHdIEYRnIpm/KtYCZBA6synnD/Ba0JF8JVqJ0O2UaWc25MSMbAo7II40
+						r4IsboH0bf7jMEFfq6CCew==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDDCCAfSgAwIBAgIETzp1STANBgkqhkiG9w0BAQUFADBIMSEwHwYDVQQKExhK
+						QVZBIFNQIHRlc3QgYXBwbGljYXRpb24xIzAhBgNVBAMTGmphdmFzcC50ZXN0Lm9w
+						ZW5hdGhlbnMubmV0MB4XDTEyMDIxNDE0NTI1N1oXDTIyMDIxMTE0NTI1N1owSDEh
+						MB8GA1UEChMYSkFWQSBTUCB0ZXN0IGFwcGxpY2F0aW9uMSMwIQYDVQQDExpqYXZh
+						c3AudGVzdC5vcGVuYXRoZW5zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBALUqBTnXevAE/4OvIH7iS72gHaJqRZulPN0BFVnkDvy5HdX1ShlnMlgt
+						h6lvRe7AmRgiMCrIGbGeDzV6DeeXXQKbruXrtamp3rKOkgZCFKsGbc/mTsOQsP1R
+						INm86m1lyZAh/+qxT3ipL1ln+KeVT9h3Ws65ZLRn2tiZJb0cuKdkOmH8NWZ6Ou7r
+						2GEWNyIVxjGyZLttO4ZIwghGLpUJCLgnghd4NnsqaDUV1xO4GYPg+NJxezJqy2Zf
+						ejLPGqhz8/Woj8yeWWPBExl7qyZty1shUknPARparzQK1JcuEHRHu9lyB9kZtPYz
+						Mi39XcXfVVEC4/Jo0/wIzMPC3m57qJcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						q95Lu8qgTLA2xmLlraZnUmR7PmKnIQbERbwHIstyz7tYfUat3n0q2EBULuwSK9Pa
+						uWq2x8zfanPNX4Uvn9GDsM7Nn35oblasq2xuonbwlB2FYxEOlrlmcRbT6hCZBx6P
+						SPOGSH8MH6li5/PEifq4nLgmm6PXjueGexndqv7q+ocLtHOPpBusbY2ISXZnow4T
+						4SiAK8aOQpY8PxOjKov3l9P94mzeagx9eIoVc6aDdGv+nGYGGG4zg8VI/yKR1tZR
+						jSU46LhuFHdIEYRnIpm/KtYCZBA6synnD/Ba0JF8JVqJ0O2UaWc25MSMbAo7II40
+						r4IsboH0bf7jMEFfq6CCew==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://javasp.test.openathens.net/hello/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: Test Java 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/jcolls.mimas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcolls.mimas.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..8c90f1c4
--- /dev/null
+++ b/swamid-interfederations-2.0/jcolls.mimas.ac.uk-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+						MIIEKzCCAxOgAwIBAgIJAP8Lcrq8+dIXMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
+						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
+						CxMFTWltYXMxGzAZBgNVBAMTEmpjb2xscy5taW1hcy5hYy51azAeFw0xMzA1MjAx
+						MzM2NDFaFw0yMzA1MTgxMzM2NDFaMIGLMQswCQYDVQQGEwJHQjETMBEGA1UECBMK
+						TWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3RlcjElMCMGA1UEChMcVGhlIFVu
+						aXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UECxMFTWltYXMxGzAZBgNVBAMT
+						Empjb2xscy5taW1hcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAJu5gU3fnvknoUtOKZ2D014hSlAGLXQuTe9ZDgXQ+tNjrRf5arfqGIsZlHWR
+						6AHBbDZaD8iljZAvsOWbAlC+gBQumWZEDAV0RJd+M8lBMnwDodXe6t0jYBTiH1Un
+						vWWMm8YKMpDWJq/qPVtW+fWyKhJkA1yaDRqvNVmSL9d6sCWpzr4gvIPjg7PgdJKt
+						Q3h3uJzBGJ5rXCg4zUGO6UejVKg5zy+skZQ8oEFahEH3abeWS/aQtCOesDlBh/JM
+						k3OBCI+sS1g15y7bvQwcHDN+o31yDDMQ5fvdfQyUyGdCG5FIdtMOAUsYiVCDNzGd
+						8h4QebK1hogewsHQYIQjTvtH7tsCAwEAAaOBjzCBjDAJBgNVHRMEAjAAMAsGA1Ud
+						DwQEAwIEsDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0RBBYw
+						FIISamNvbGxzLm1pbWFzLmFjLnVrMDQGA1UdEgQtMCuBKW1pbWFzLXNoaWItdGVj
+						aEBsaXN0c2Vydi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBZ
+						25RsQQiA5RuxYb+8GGPDd1N8dkLIU0nPyqlFhWQM43lSrqL54UYUlh2IBjE5KJob
+						TMwRNeX3CDRHkAskF1ZIziV9RNCdd2/92WI7ieYl/Q8H14vNVEhTv496l5wBPinN
+						NakZzsD1bcTod/MY/CwUeKhKDMTtRgNe+AJirONfQSY1yqjdjXG2dX2lgle7FDKX
+						TQ94Ks3wbgojEoHofaKoPKkBWUnwtDL8Wc0O99jQbIVx771gJ/KbmC2Qvq7oGYBW
+						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>
+						MIIEKzCCAxOgAwIBAgIJAP8Lcrq8+dIXMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
+						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
+						CxMFTWltYXMxGzAZBgNVBAMTEmpjb2xscy5taW1hcy5hYy51azAeFw0xMzA1MjAx
+						MzM2NDFaFw0yMzA1MTgxMzM2NDFaMIGLMQswCQYDVQQGEwJHQjETMBEGA1UECBMK
+						TWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3RlcjElMCMGA1UEChMcVGhlIFVu
+						aXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UECxMFTWltYXMxGzAZBgNVBAMT
+						Empjb2xscy5taW1hcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAJu5gU3fnvknoUtOKZ2D014hSlAGLXQuTe9ZDgXQ+tNjrRf5arfqGIsZlHWR
+						6AHBbDZaD8iljZAvsOWbAlC+gBQumWZEDAV0RJd+M8lBMnwDodXe6t0jYBTiH1Un
+						vWWMm8YKMpDWJq/qPVtW+fWyKhJkA1yaDRqvNVmSL9d6sCWpzr4gvIPjg7PgdJKt
+						Q3h3uJzBGJ5rXCg4zUGO6UejVKg5zy+skZQ8oEFahEH3abeWS/aQtCOesDlBh/JM
+						k3OBCI+sS1g15y7bvQwcHDN+o31yDDMQ5fvdfQyUyGdCG5FIdtMOAUsYiVCDNzGd
+						8h4QebK1hogewsHQYIQjTvtH7tsCAwEAAaOBjzCBjDAJBgNVHRMEAjAAMAsGA1Ud
+						DwQEAwIEsDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0RBBYw
+						FIISamNvbGxzLm1pbWFzLmFjLnVrMDQGA1UdEgQtMCuBKW1pbWFzLXNoaWItdGVj
+						aEBsaXN0c2Vydi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBZ
+						25RsQQiA5RuxYb+8GGPDd1N8dkLIU0nPyqlFhWQM43lSrqL54UYUlh2IBjE5KJob
+						TMwRNeX3CDRHkAskF1ZIziV9RNCdd2/92WI7ieYl/Q8H14vNVEhTv496l5wBPinN
+						NakZzsD1bcTod/MY/CwUeKhKDMTtRgNe+AJirONfQSY1yqjdjXG2dX2lgle7FDKX
+						TQ94Ks3wbgojEoHofaKoPKkBWUnwtDL8Wc0O99jQbIVx771gJ/KbmC2Qvq7oGYBW
+						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>
diff --git a/swamid-interfederations-2.0/jcr.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcr.new.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..88901300
--- /dev/null
+++ b/swamid-interfederations-2.0/jcr.new.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,84 @@
+<?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://jcr.new.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="2013-11-06T14:29: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://jcr.new.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> 
+						MIIDHDCCAgSgAwIBAgIJAI83ga/ABB6dMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEGpjci5uZXcub3guYWMudWswHhcNMTMxMTAzMjA0MDUwWhcNMjMxMTAxMjA0
+						MDUwWjAbMRkwFwYDVQQDExBqY3IubmV3Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAvoS72hGDIl+GbpfaZL0UOlgGgFcuhaVeqX55D1qa
+						8iloWd33o/c52UZEezMCA8DDlUeD4tZhomLRyXX4ZEzKGtigDhJ+fZbo5JgP9lBh
+						pF6L9WoHRGlNO8VaiRM9Imu8sO5+btTfA1rMeVXCmG/NftOG8upXG6RNKB+ccakY
+						m5mbe2ecDBy6r58usRIFqZK/4/My3LWU288l33bOE6r6tUCpSyW81b1sEWpllY3Z
+						B82hAbOEXQD4ozVURP6QJoID+kOQFRIyzvg9FXfMCoPuUWdboJW1hv5BmZWt9MOa
+						UmE2UVqYYvvEmaOT65suW3OTyMiOnt48A3fFi98MNKebcQIDAQABo2MwYTBABgNV
+						HREEOTA3ghBqY3IubmV3Lm94LmFjLnVrhiNodHRwczovL2pjci5uZXcub3guYWMu
+						dWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUaMxyJ9eSM7u3SF3NXi1HGMaHYFowDQYJ
+						KoZIhvcNAQEFBQADggEBAEl38kBgp1fMgU18W6ChrzZm8EoQiBIOSdScErmZ6XCr
+						Va99wjy8bnI/7q5KhXvoJyemNbpIK3c80zFzAdHNkZ6uMhJfyU53Ur8PSzDCNFrO
+						7uGDj/N4AXqZWuHATG/lHXp7icK+LsgNhhCdqsKCTl9/JBiU9lNR1fR+hliLzEYW
+						R6X5dggs8sDIZPju4N0Y/Z8OuvlWwV60zbX9YJG5nr/CnccPblaYPmL5Don0DP8b
+						VUZfweYVy3ttIKxcB2s5AxK4AtXzsKxkiSjPJcaH5cKJQqGGe4tKvDBjw2tS1r+t
+						onpvIhg5z9yn4KlD1Bc4Zvi28xZZVC4yS0Js/3rxhHY=
+					</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://jcr.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcr.new.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://jcr.new.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://jcr.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcr.new.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 New College JCR admin host</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Officer</md:GivenName>
+    <md:EmailAddress>mailto:it-support@new.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Officer</md:GivenName>
+    <md:EmailAddress>mailto:it-support@new.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jcrmail.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcrmail.new.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..807190fb
--- /dev/null
+++ b/swamid-interfederations-2.0/jcrmail.new.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,84 @@
+<?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://jcrmail.new.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="2013-11-05T16:23: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://jcrmail.new.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>
+						MIIDLDCCAhSgAwIBAgIJAML2ZGVSnH6fMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFGpjcm1haWwubmV3Lm94LmFjLnVrMB4XDTEzMTEwMzIyMDMyM1oXDTIzMTEw
+						MTIyMDMyM1owHzEdMBsGA1UEAxMUamNybWFpbC5uZXcub3guYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiH44HVc7zwdznUT53Ufb/uHtkUSKH
+						vhNV0gxzxtABgh2RTyiOj8nqvc7fAPvalplfGDCeIEM+GgibAb61Ue3Zg3uPp+Qo
+						1M2bc1aoEi9ox8M9xvvnCfOlJl8bnSOk/RaExmiu+5tVZHL7+BazhzrwQFWt2me9
+						V7iUJ95Q3mSU1sPGCu4LXL7lbruFwFgUr2H8mB9lIxb2DHa/gHN2V+0Kv7pzUsV5
+						iEZCwhhwVKUU5UEIRWoeUOyaOyp8rkk50aS34bLW36PzrEbsrYoXF4/PQMN5EP2S
+						Dy1ov1ixqp/k9Gg5PEamucgFxk/QBefkQ+mxPkqxTzgK+ISeKsCdE+sdAgMBAAGj
+						azBpMEgGA1UdEQRBMD+CFGpjcm1haWwubmV3Lm94LmFjLnVrhidodHRwczovL2pj
+						cm1haWwubmV3Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFHR95FV4l+sE
+						8+nH5oH2kTRP3/t7MA0GCSqGSIb3DQEBBQUAA4IBAQBHEM8J5uExzSroMin/n6oI
+						EsSttlp2u4TtBmpC3TAYtMA3owuRM9fv4FnLSrZB91SMep6t0oR6jlh6VrKkn2zA
+						/G0hmfyK/DZGfJ/NZTNFB6lF0PrwKDX2qmhQgnL5/i8maXS2vRt9GrLiu6UzQTAI
+						+KjNdtR5fYAgw6tW/Np+gCA4As0BzxTpkV588Y4xjm7GpJL2GI8YfOajVWP2TbJj
+						rWSav486oZmP/J9mHTY5hq1nBQg5BBvDfZfRUEc1bHmLUUnkWs/N/pQ7ZGTtDzBT
+						SdLjFqV63m+3naMFk5mGsDJ3Yq4gTPUfmPETdxdYN89CIxT7pJrqTDBXpqSZgMkc
+					</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://jcrmail.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrmail.new.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://jcrmail.new.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://jcrmail.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcrmail.new.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 New College JCR Mail service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Officer</md:GivenName>
+    <md:EmailAddress>mailto:it-support@new.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Officer</md:GivenName>
+    <md:EmailAddress>mailto:it-support@new.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jcrold.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcrold.new.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c7e5b096
--- /dev/null
+++ b/swamid-interfederations-2.0/jcrold.new.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,84 @@
+<?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://jcrold.new.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-01-28T11:49: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://jcrold.new.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>
+						MIIDKDCCAhCgAwIBAgIJAOCZ0GCvpLO7MA0GCSqGSIb3DQEBDQUAMB4xHDAaBgNV
+						BAMTE2pjcm9sZC5uZXcub3guYWMudWswHhcNMTUwMTIyMTU1NzE2WhcNMjUwMTE5
+						MTU1NzE2WjAeMRwwGgYDVQQDExNqY3JvbGQubmV3Lm94LmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkz2ksPpFpDVR2F9qvKhey+uyifIUkf47
+						IkTpFript8sNAvVDxxaNnmqNRBOUQvVINbV6K7l/qPPf3pA8WzZRB5ZpRmvTIyay
+						O10XlLJQzqS/2xgXB4uXQA03GFTtqnA7rnFzYJmXPMyWj4qtvDe322azmZfCIXAf
+						H5gpekdH2tGeUPxG6d2ewyjqqVyI7wk8XF5GRThC0wf501BAQ6252A6RqoV7x6UW
+						OrEkxdCjoxmg6aZ2ArFvAEQrtq5NobfWs7UiFvH9U3/uWCXRKowE5it+u9uuiytS
+						nFIsuQod/sqOInFMgK2QJT+meBcKjlYWDn4zNuFAH55CLvPyeI7yOwIDAQABo2kw
+						ZzBGBgNVHREEPzA9ghNqY3JvbGQubmV3Lm94LmFjLnVrhiZodHRwczovL2pjcm9s
+						ZC5uZXcub3guYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUmD8DElMxF75BJXhy
+						epLcwStYFz4wDQYJKoZIhvcNAQENBQADggEBAGLKFMmZHsWvbeAtTPCF6gT0p+/I
+						Oa2Pl7MWsHLWMWHAnSzQAvPv8InACCX3m3W9v+30L5jmgW3tWMkdJjDvlUOv0Rvd
+						+oGWe/ixJzbmpxX1QZNi1HE1IEvu8s32aoBvmqFOJ1w1K2tIA8EzSWssi5NI5rvZ
+						A5XTIuUmVl/Uo83t//t+LferDHvcc2rHBhxvItHx4fTMFjVOHgbTZMB4mXD+SoBc
+						zXSvW3Gq5gD44CbBJWMOayTQthbG//wFxnVUbViJp5VSwfr5Lok+neOEwJvPTSO9
+						08W9A9x0ao2q/PABpXt+L60pvnWkWgjpmErt5XPyIKeq0XmaSX30YEMd4TE=
+					</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://jcrold.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrold.new.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://jcrold.new.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://jcrold.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcrold.new.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 New College JCR old website</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://jcr.new.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>JCR IT Officer</md:GivenName>
+    <md:EmailAddress>mailto:it@jcr.new.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>JCR IT Officer</md:GivenName>
+    <md:EmailAddress>mailto:it@jcr.new.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jcrtest.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcrtest.new.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..b84ff519
--- /dev/null
+++ b/swamid-interfederations-2.0/jcrtest.new.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,84 @@
+<?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://jcrtest.new.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="2013-11-06T10:25: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://jcrtest.new.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>
+						MIIDLDCCAhSgAwIBAgIJAOjOE9gl5zabMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFGpjcnRlc3QubmV3Lm94LmFjLnVrMB4XDTEzMTEwMzIxNTk0N1oXDTIzMTEw
+						MTIxNTk0N1owHzEdMBsGA1UEAxMUamNydGVzdC5uZXcub3guYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8UTciDnh59ywOKTwTmbkZNTYgI1Mz
+						NxF73zZDbKfujWGl1WHTH7xdajdPtYaIYmXSjGgn2nt7IUZqJLEbSgxkyXpivTUe
+						FZcmWWxOghoKHU68YjsgbxKaHldfav0c7LnjTtOzU1yxVX+v2TRNVULTHRBZwVKO
+						8R4GcshmpIW5fLr53UeofuMdOJgTe8Ra90SEUGONBCoeKqwf1gXCy4UFb8B2NoAn
+						NNaiFSOSIqxXva349XU8bYZZNT57kbIa+4tsAzGvQAY0ZvqUpVKezxKbvuP9r+qF
+						MM/x4Y1rx+YKLLebzFP3vwAtW0Jdw1Cgi0A2ov5XtHmHyHEHrGuIkDPpAgMBAAGj
+						azBpMEgGA1UdEQRBMD+CFGpjcnRlc3QubmV3Lm94LmFjLnVrhidodHRwczovL2pj
+						cnRlc3QubmV3Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFN7qW3yVIa1C
+						sZTAQ3GbBz/xAXn0MA0GCSqGSIb3DQEBBQUAA4IBAQCDldZnrvi53hsFku7A3STF
+						mdO+I9YZpwAsT1DvabRgXAakSrgU1KUGBQ0FZJ0/mk9AbSTkgksXAKdmfQs6mJ5+
+						bsC2Tlp773NigTWYvPjGeNtSyRa43SXBVMaaA+19f9CVCElBMpp+WXk9i/s4krK/
+						l4EtgbrADwp+fX56e6OJQHMdYEr5zLV9whvi6erQRIVjY6GfHOJgcG0xazSL94AJ
+						jg6rthw7nWMxfGy5g2m7bR5K9C9hks5la20hBYOduowvjuGDKEentOVJ04RdZ0Ju
+						A4sEXh+cYpGgb/I6uHjcoawS2Dzya/8X0VeiH6UcwvGot5WuSMDg/DSUEUK5b1KJ
+					</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://jcrtest.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrtest.new.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://jcrtest.new.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://jcrtest.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcrtest.new.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 New College JCR development systems</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Officer</md:GivenName>
+    <md:EmailAddress>mailto:it-support@new.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Officer</md:GivenName>
+    <md:EmailAddress>mailto:it-support@new.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jcrweb.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcrweb.new.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..ad735cc9
--- /dev/null
+++ b/swamid-interfederations-2.0/jcrweb.new.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,85 @@
+<?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://jcrweb.new.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="2013-10-18T10:02: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://jcrweb.new.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>
+						MIIDKDCCAhCgAwIBAgIJAM+jRUVpcaogMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE2pjcndlYi5uZXcub3guYWMudWswHhcNMTMxMDExMjEyMDIwWhcNMjMxMDA5
+						MjEyMDIwWjAeMRwwGgYDVQQDExNqY3J3ZWIubmV3Lm94LmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3RatgWIQ0tgieur/TZdJMa+J7+Qm3D+y
+						1oev1jnx1mgLo/dzafOHFhoJZ3AqLUNJAIbJPNlIhJpGEViwpJnBIlukULWKtF9x
+						UxH/vQvkQhMWxox1bHO4heWt4QmHcBM0vVi84MoobVjHKHk4/IFBg4cD9P8URObR
+						uKhZ5a7UPlOk5+RYN7vP5PjazNzHW3IX68ta3BL2RG4Eni4TGFCuUg9tUVeNFUVN
+						y9JnYcLSRrNOF1ND9XX9p/SjFDV9WvjbWsgyUrTVPTvXSzgYZI58r01WSrE7tz9f
+						dvbOP6KMEgI6JONlYflpA0Cb+QyYqBA4ZFYNsqb2yhg4ZltCwOZDiwIDAQABo2kw
+						ZzBGBgNVHREEPzA9ghNqY3J3ZWIubmV3Lm94LmFjLnVrhiZodHRwczovL2pjcndl
+						Yi5uZXcub3guYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUq8M4jctknnDLTc81
+						iYJG2rgDVYQwDQYJKoZIhvcNAQEFBQADggEBAKmylrHk0WDPwoHAy1KXqQbySSyF
+						LYHyEAWxVceWoY5AozLFysUu0MpllDbZcUTBMs+TzLVpq8PUdrj3A87IVB7WhIzw
+						uwBi61ZmPvMiE43s/5HZJG0ibf48q0ZS7h1cVsUOFaJGYattJUvvfRu0GgtMyjJi
+						/msRlm6B8YkO95AZc9BsxfnuPYn0LRzQyt1T8pObH/oNUsCcvybXJTHG93oE7mRd
+						hryZmf6zRTaMrw9KT6SvQf2Let/RJHv8OK3juH8kw6iraOSc+cK0Ea2rCWJYNWS0
+						aHp4plsboCSy3YDvkk573vE1IbHvoT86Qg9cIOVoUOd1BE8uxQhXOVg/WDM=
+					</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://jcrweb.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrweb.new.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://jcrweb.new.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://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcrweb.new.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 New College JCR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://jcr.new.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@new.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jakub</md:GivenName>
+    <md:SurName>Warmuz</md:SurName>
+    <md:EmailAddress>mailto:jakub.warmuz@new.ox.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
new file mode 100644
index 00000000..4fb3d8d8
--- /dev/null
+++ b/swamid-interfederations-2.0/jenkins.ukfederation.org.uk-entity.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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>
+						MIIEPjCCAyagAwIBAgIJAOVnQ3eBaoIXMA0GCSqGSIb3DQEBBQUAMIGfMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDFD
+						MEEGA1UEChM6VUsgQWNjZXNzIE1hbmFnZW1lbnQgRmVkZXJhdGlvbiBmb3IgRWR1
+						Y2F0aW9uIGFuZCBSZXNlYXJjaDEkMCIGA1UEAxMbamVua2lucy51a2ZlZGVyYXRp
+						b24ub3JnLnVrMB4XDTEzMDcxMjEwMDQxOFoXDTIzMDcxMDEwMDQxOFowgZ8xCzAJ
+						BgNVBAYTAkdCMREwDwYDVQQIEwhTY290bGFuZDESMBAGA1UEBxMJRWRpbmJ1cmdo
+						MUMwQQYDVQQKEzpVSyBBY2Nlc3MgTWFuYWdlbWVudCBGZWRlcmF0aW9uIGZvciBF
+						ZHVjYXRpb24gYW5kIFJlc2VhcmNoMSQwIgYDVQQDExtqZW5raW5zLnVrZmVkZXJh
+						dGlvbi5vcmcudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCU/xHG
+						Dw0FRJUVC8evIBKqH77osYeVSYqeaHhjnCMDGURYfua8by5lYVWufRS6gVv/MaJU
+						FKbZY9XKPH6uDBJ/l5Lypx6H7V1tZn7BroXg9fNyLrC0WpUrBYw5S+MYFQgEuB+C
+						B2wvuvoKKa0GSPHvgfV/K8ymh08ARsgT83MMfW9rA0+gy2x1AvJt0VYO96rGjI1q
+						0SeDGMWwk58OFXA/4UbIsTg56hl9NfW2QLkSsi4cz/uJD2q1F44Ai/pOUHiT8lVH
+						XAl77Nefma9w5Djng2yVoMd9tQ9Sx5bWOZ6VxnbA0ARJBq/8QzRvkiiQ3Ceacu0G
+						V961M6U1X4ZcqSpRAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
+						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSeM+/WeAoJ
+						DPll4Dh3TUT+dI3oPzAfBgNVHSMEGDAWgBSeM+/WeAoJDPll4Dh3TUT+dI3oPzAN
+						BgkqhkiG9w0BAQUFAAOCAQEAHUHH0JodQuv4B984Z8aESW04OJSDFIpYL30luVQr
+						AwFPZ3wopM5qfkO6CpJIa+IK9oQxppOi+Fs+dYEBUYHjXQbx/xbSuqzjr7GE/xS6
+						Kumhmn3Y1RP9/2l0Ema7DMryN7nxIsF+fxDr0LgaXboAMnITKvhf0k5cVDdAO/JT
+						y+lx0ZxwizlzdmjyfmmCIJkUXvPwnh8Le+9AqU2qjh14OPw4cHabf2mtEKAXFkJ/
+						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">
+				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>
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
new file mode 100644
index 00000000..0c236f69
--- /dev/null
+++ b/swamid-interfederations-2.0/jisrc.mercury.hosting.eduserv.org.uk-oa-metadata.xml
@@ -0,0 +1,81 @@
+<?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>
+						MIIDqTCCApGgAwIBAgIJAPDI+Ol0Xn6oMA0GCSqGSIb3DQEBBQUAMEExEDAOBgNV
+						BAoTB2ppc2Nyc2MxLTArBgNVBAMTJGppc3JjLm1lcmN1cnkuaG9zdGluZy5lZHVz
+						ZXJ2Lm9yZy51azAeFw0xMTA2MzAxMzI3MDBaFw0yMTA2MjcxMzI3MDBaMEExEDAO
+						BgNVBAoTB2ppc2Nyc2MxLTArBgNVBAMTJGppc3JjLm1lcmN1cnkuaG9zdGluZy5l
+						ZHVzZXJ2Lm9yZy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOTA
+						ZTBha819J62QySsCGuEUyR5kEWxqLCJwR/mVGszwh02W/Mlze6MOInxzDj3vQmOi
+						3PGqqfrHq++uTxnT7N4U0TXDq4GpIw3yeFKjAry4s0fJVLlWm5Jsij7tcWEp1aus
+						DgRFvmDIMsR1UyRlfEeY1Ip3KfGsZ1sHhEnyiWImc+wZO6EewDTHl+i/5nMM82HQ
+						CfE53syeeLSyOkLlm5Mma4qbqb8rmX7ASva54Lgiy/zm0pRnUUxUPFVh4cKbPtJ7
+						ib+FMyge0fMzKJSozhQM4/RUzcdkPwoUobvl1hVNpvNvgBKavGY61uRIip1UK3dt
+						I8318jahHjlgOeFtwkECAwEAAaOBozCBoDAdBgNVHQ4EFgQUluqwb/9EM1UOnRTf
+						1CDLbbg3Do0wcQYDVR0jBGowaIAUluqwb/9EM1UOnRTf1CDLbbg3Do2hRaRDMEEx
+						EDAOBgNVBAoTB2ppc2Nyc2MxLTArBgNVBAMTJGppc3JjLm1lcmN1cnkuaG9zdGlu
+						Zy5lZHVzZXJ2Lm9yZy51a4IJAPDI+Ol0Xn6oMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+						hvcNAQEFBQADggEBAOMyu0YB1WMyzkPXHLUX0AGeHsQXfuoaMHPQXRrCCRdtHZVG
+						boVz41c/jLt7oqOTxX26MA9PL2fwgjn4yDS+Jqkb0qwm2w/8m6jtIQQcbMoR+7f+
+						uZCmeEf7CgSss+yKcBeDmdeolCH0YjikLFNi+ID1i3qUOLqTRGxvTUI9aGR6n5GF
+						FgUlTlX3oZ6t06BaqHmj15GruaiRQzY20Y9HKmkto+GtbRiUSTz7Ro8QzuWowzZP
+						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>
+						MIIDqTCCApGgAwIBAgIJAPDI+Ol0Xn6oMA0GCSqGSIb3DQEBBQUAMEExEDAOBgNV
+						BAoTB2ppc2Nyc2MxLTArBgNVBAMTJGppc3JjLm1lcmN1cnkuaG9zdGluZy5lZHVz
+						ZXJ2Lm9yZy51azAeFw0xMTA2MzAxMzI3MDBaFw0yMTA2MjcxMzI3MDBaMEExEDAO
+						BgNVBAoTB2ppc2Nyc2MxLTArBgNVBAMTJGppc3JjLm1lcmN1cnkuaG9zdGluZy5l
+						ZHVzZXJ2Lm9yZy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOTA
+						ZTBha819J62QySsCGuEUyR5kEWxqLCJwR/mVGszwh02W/Mlze6MOInxzDj3vQmOi
+						3PGqqfrHq++uTxnT7N4U0TXDq4GpIw3yeFKjAry4s0fJVLlWm5Jsij7tcWEp1aus
+						DgRFvmDIMsR1UyRlfEeY1Ip3KfGsZ1sHhEnyiWImc+wZO6EewDTHl+i/5nMM82HQ
+						CfE53syeeLSyOkLlm5Mma4qbqb8rmX7ASva54Lgiy/zm0pRnUUxUPFVh4cKbPtJ7
+						ib+FMyge0fMzKJSozhQM4/RUzcdkPwoUobvl1hVNpvNvgBKavGY61uRIip1UK3dt
+						I8318jahHjlgOeFtwkECAwEAAaOBozCBoDAdBgNVHQ4EFgQUluqwb/9EM1UOnRTf
+						1CDLbbg3Do0wcQYDVR0jBGowaIAUluqwb/9EM1UOnRTf1CDLbbg3Do2hRaRDMEEx
+						EDAOBgNVBAoTB2ppc2Nyc2MxLTArBgNVBAMTJGppc3JjLm1lcmN1cnkuaG9zdGlu
+						Zy5lZHVzZXJ2Lm9yZy51a4IJAPDI+Ol0Xn6oMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+						hvcNAQEFBQADggEBAOMyu0YB1WMyzkPXHLUX0AGeHsQXfuoaMHPQXRrCCRdtHZVG
+						boVz41c/jLt7oqOTxX26MA9PL2fwgjn4yDS+Jqkb0qwm2w/8m6jtIQQcbMoR+7f+
+						uZCmeEf7CgSss+yKcBeDmdeolCH0YjikLFNi+ID1i3qUOLqTRGxvTUI9aGR6n5GF
+						FgUlTlX3oZ6t06BaqHmj15GruaiRQzY20Y9HKmkto+GtbRiUSTz7Ro8QzuWowzZP
+						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 Services Management Company Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">JISC Services Management Company Ltd: 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
new file mode 100644
index 00000000..dffa288c
--- /dev/null
+++ b/swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br-idp-shibboleth.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIIEPDCCAyQCAQAwDQYJKoZIhvcNAQEFBQAwgeMxNjA0BgNVBAoTLUlGRmFycm91
+cGlsaGEgLSBJbnN0aXR1dG8gRmVkZXJhbCBGYXJyb3VwaWxoYTENMAsGA1UECxME
+Q0dUSTEwMC4GCSqGSIb3DQEJARYhZXZlcnRvbi5mYXZhQGlmZmFycm91cGlsaGEu
+ZWR1Yi5yMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgGA1UECBMRUmlvIEdyYW5k
+ZSBkbyBTdWwxCzAJBgNVBAYTAkJSMSkwJwYDVQQDEyBqb2FvZG9iYXJyby5pZmZh
+cnJvdXBpbGhhLmVkdS5icjAeFw0xNDA5MTAxMjAzMzJaFw0xNzA5MDkxMjAzMzJa
+MIHjMTYwNAYDVQQKEy1JRkZhcnJvdXBpbGhhIC0gSW5zdGl0dXRvIEZlZGVyYWwg
+RmFycm91cGlsaGExDTALBgNVBAsTBENHVEkxMDAuBgkqhkiG9w0BCQEWIWV2ZXJ0
+b24uZmF2YUBpZmZhcnJvdXBpbGhhLmVkdWIucjEUMBIGA1UEBxMLU2FudGEgTWFy
+aWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEpMCcG
+A1UEAxMgam9hb2RvYmFycm8uaWZmYXJyb3VwaWxoYS5lZHUuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjbxzJf9stIGm23HODfY3e2Qgf5TP4pv4f
+pn2oss8MkC99Rm2XPKcui4ny8H5QJoxHU7L059QST5LdKmUKPWX/ormEqUp9pgSL
+k3V5FChn6P/G636wk8Q4b7zPtk4V5R2crxXXt2jxo3Xhb8PLAm4ypN8uUeDgTj4J
+wgRd3KDJt7fFnAXAouT1l4e0a0LELiuI8kjvGyKcGNV+8opQg2S8/+R9qAh07fKL
+V//OVmoPVWnSJmZBHCoH8AcbghazA7mY3YJVnPZdZC4WwAP7u58pRSKkt0OnXnpF
+SWuviPcoIFLbV5JtgZuyxMzq5wwXniienr18Uv0CBpK0PciRnKtTAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBABzAstXEYvu0dkoQvxEhhOh3kBPm8OurJpiGzGQDKX/G
+VDhgLOI+V/3UjYPTcBEMDJsjWE9Q86tjfyEXl+L3WNg2tDscxTi0hXrn9HtKeFdl
+Eqn7o0P0Zy+Ck28whDSlAKtIsoupQvhvDfE6zVltnk7Y6BtBS6IMbLVtOEC83ayc
+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>
+      
+MIIEPDCCAyQCAQAwDQYJKoZIhvcNAQEFBQAwgeMxNjA0BgNVBAoTLUlGRmFycm91
+cGlsaGEgLSBJbnN0aXR1dG8gRmVkZXJhbCBGYXJyb3VwaWxoYTENMAsGA1UECxME
+Q0dUSTEwMC4GCSqGSIb3DQEJARYhZXZlcnRvbi5mYXZhQGlmZmFycm91cGlsaGEu
+ZWR1Yi5yMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgGA1UECBMRUmlvIEdyYW5k
+ZSBkbyBTdWwxCzAJBgNVBAYTAkJSMSkwJwYDVQQDEyBqb2FvZG9iYXJyby5pZmZh
+cnJvdXBpbGhhLmVkdS5icjAeFw0xNDA5MTAxMjAzMzJaFw0xNzA5MDkxMjAzMzJa
+MIHjMTYwNAYDVQQKEy1JRkZhcnJvdXBpbGhhIC0gSW5zdGl0dXRvIEZlZGVyYWwg
+RmFycm91cGlsaGExDTALBgNVBAsTBENHVEkxMDAuBgkqhkiG9w0BCQEWIWV2ZXJ0
+b24uZmF2YUBpZmZhcnJvdXBpbGhhLmVkdWIucjEUMBIGA1UEBxMLU2FudGEgTWFy
+aWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEpMCcG
+A1UEAxMgam9hb2RvYmFycm8uaWZmYXJyb3VwaWxoYS5lZHUuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjbxzJf9stIGm23HODfY3e2Qgf5TP4pv4f
+pn2oss8MkC99Rm2XPKcui4ny8H5QJoxHU7L059QST5LdKmUKPWX/ormEqUp9pgSL
+k3V5FChn6P/G636wk8Q4b7zPtk4V5R2crxXXt2jxo3Xhb8PLAm4ypN8uUeDgTj4J
+wgRd3KDJt7fFnAXAouT1l4e0a0LELiuI8kjvGyKcGNV+8opQg2S8/+R9qAh07fKL
+V//OVmoPVWnSJmZBHCoH8AcbghazA7mY3YJVnPZdZC4WwAP7u58pRSKkt0OnXnpF
+SWuviPcoIFLbV5JtgZuyxMzq5wwXniienr18Uv0CBpK0PciRnKtTAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBABzAstXEYvu0dkoQvxEhhOh3kBPm8OurJpiGzGQDKX/G
+VDhgLOI+V/3UjYPTcBEMDJsjWE9Q86tjfyEXl+L3WNg2tDscxTi0hXrn9HtKeFdl
+Eqn7o0P0Zy+Ck28whDSlAKtIsoupQvhvDfE6zVltnk7Y6BtBS6IMbLVtOEC83ayc
+u4j17sJlJYYOO++rnuIMpOk6AArPrZCTBgIM1YGGAVC23z5M4KF25L02p/JvzcCH
+BB5WV7TdBFR34zcIEGOr4l8afrmCKZJw4zqLP7HxMwfVQL+bJw/aVx4owdFh/VEr
+7kc9bN7ChGuVCbg9lLSKtVhDRKDWyuIUt/ioaVOWP8s=
+
+                    
+            </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>
diff --git a/swamid-interfederations-2.0/jomectechnicaloffice.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/jomectechnicaloffice.sisoshibboleth.co.uk-entity.xml
new file mode 100644
index 00000000..9ad620ce
--- /dev/null
+++ b/swamid-interfederations-2.0/jomectechnicaloffice.sisoshibboleth.co.uk-entity.xml
@@ -0,0 +1,84 @@
+<?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>
+      <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>
+						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
+						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
+						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
+						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
+						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
+						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
+						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
+						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
+						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
+						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
+						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
+						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
+						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>
diff --git a/swamid-interfederations-2.0/journalarchives.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/journalarchives.jisc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..ac53c4d0
--- /dev/null
+++ b/swamid-interfederations-2.0/journalarchives.jisc.ac.uk-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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>
+						MIIEETCCAvmgAwIBAgIJAKgxolJV/8T9MA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNV
+						BAYTAkdCMRMwEQYDVQQIEwpNYW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVy
+						MQ0wCwYDVQQKEwRKaXNjMQ4wDAYDVQQLEwVNaW1hczEjMCEGA1UEAxMaam91cm5h
+						bGFyY2hpdmVzLmppc2MuYWMudWswHhcNMTQxMTEwMTUzOTAyWhcNMjQxMTA3MTUz
+						OTAyWjB7MQswCQYDVQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UE
+						BxMKTWFuY2hlc3RlcjENMAsGA1UEChMESmlzYzEOMAwGA1UECxMFTWltYXMxIzAh
+						BgNVBAMTGmpvdXJuYWxhcmNoaXZlcy5qaXNjLmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAsM9KyvNgUEVD6RBVV5FbcVgnkltHhgegfpVTJ8xR
+						bzpRTekHIp6FvTzX0uF7NK3hnG7q0reo15cqJldDRNjUKoLrTrjSPbu+8zL+Z3l+
+						JnaTiy6HowB30hHc/YydK+X8GA3r6LNRmtAdciS+lkZQHdn4JIUosYPfS2PcgMDD
+						l9ck/CxG58jWR/GhD/Tx9exu902PEr5sXsaOJkoPLWqXOvxLLd867HA5JbUN6qZe
+						ls1Mtvpvj2GC1kU8aU7bBjmX9Cz7lQYJijDK3BC6VbKdHI6p7OH3r6cIPUwWkYKJ
+						ytg40bQwHX3TatBgsS+43yQc7Lky3+XzYp5v2XekTjufnQIDAQABo4GXMIGUMAkG
+						A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+						BQcDAjAlBgNVHREEHjAcghpqb3VybmFsYXJjaGl2ZXMuamlzYy5hYy51azA0BgNV
+						HRIELTArgSltaW1hcy1zaGliLXRlY2hAbGlzdHNlcnYubWFuY2hlc3Rlci5hYy51
+						azANBgkqhkiG9w0BAQUFAAOCAQEAeHESBFlQcPHfRo7eU/SA2dAZpq0V0brrtF+D
+						Kq+A5/lbscUP6q5g5wA46JapB3NpKBgMK2WTa4Ms/OTv1y49YWqCDSPC+L5+rxZ6
+						iLypmPXb6tUNS6CuJV27Lm26mx2ecHTvwB1wXjoLZ27BJneN0hfA4hWhXIBGYjKh
+						Wz8zmrlfqu4WFQQojXIc5tVLSoqEnaUYcvo03OpXyq3pGDoN6+ipoZ03PyXHbDLS
+						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>
diff --git a/swamid-interfederations-2.0/journals.bmj.com-shibboleth.xml b/swamid-interfederations-2.0/journals.bmj.com-shibboleth.xml
new file mode 100644
index 00000000..dc36839c
--- /dev/null
+++ b/swamid-interfederations-2.0/journals.bmj.com-shibboleth.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..499fb970
--- /dev/null
+++ b/swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://journals.heacademy.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-19T12:00: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>
+						MIIDPDCCAiSgAwIBAgIJAJOTTFp5kRupMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGGpvdXJuYWxzLmhlYWNhZGVteS5hYy51azAeFw0xMzAzMjgwMDI0MDlaFw0x
+						NjAzMjcwMDI0MDlaMCMxITAfBgNVBAMTGGpvdXJuYWxzLmhlYWNhZGVteS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOQ1INQ2UjzPpKIERLZ
+						T4ImAal+OGN8XMHm54PSKVdl6oMmXOQW/oshCsm+Wd768BHhfSgajkKJQ9cGLdKG
+						rQcPg0NeGlebSQxEAU5EymIbgJdyA03NSAK9C1iPdGkJ5+PNE88eKtQP/cVwa/QC
+						RymCnLroxKfquAVvf/iLiTJtx0oIuLS3PaVoqSrBrRU6vJOtim7xaWBaJVmvd0I1
+						FT+wgIkHtRRCi6O7ku31n1CfXuBenov/NLxOW1HpLHYqX9H+Mxt5XPjzs7vf3cIy
+						hE6c5NVtN9S2qNsXhHvZMB5JQcOk6JFv/K5yxElR0/W53KQN8pstmmXQrSjAliPa
+						8UUCAwEAAaNzMHEwUAYDVR0RBEkwR4IYam91cm5hbHMuaGVhY2FkZW15LmFjLnVr
+						hitodHRwczovL2pvdXJuYWxzLmhlYWNhZGVteS5hYy51ay9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBRZYwKjd2FZxBTfe1YCf4Uciwsz9jANBgkqhkiG9w0BAQUFAAOCAQEA
+						bhkLgMPYt9MdLliyOC7frDpRExeYqYeGQ+LS5vnY9FwT3rAkIlutdaCbqZijh8Jl
+						9p8vRWcKJuGmYSHMxIrciHTmjSkNa/zYLsP3+QGLzre9MQfJZ5YiwMA9ym05xbon
+						hgCKylNLWd8lQIIf3joPFBOI5dgfey8dUxoIVk2e1x8YRv2OcNfpkGQkp1HyXs3T
+						lLhRoL+MLFM0aKaW18hNnV3Uuhj5OoBKJQCWbtJix2yrO2MUqUNORWsdExS69Hev
+						q88umX3v6Cwt6Ri/vzVQOj/4u5vQ6NY1evS6uEYxlnfneEICxZ1WRKqXdA1MWfO4
+						aaX1Y4N8Fbb80yxu7/QWIQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://journals.heacademy.ac.uk/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://journals.heacademy.ac.uk/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://journals.heacademy.ac.uk/action/samlACS" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Higher Education Academy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://journals.heacademy.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/journals.rcni.com-shibboleth.xml b/swamid-interfederations-2.0/journals.rcni.com-shibboleth.xml
new file mode 100644
index 00000000..95c2e49c
--- /dev/null
+++ b/swamid-interfederations-2.0/journals.rcni.com-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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>
+						MIIDIDCCAgigAwIBAgIJAMqMZUiIsl4nMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEXJjbnB1Ymxpc2hpbmcuY29tMB4XDTEzMTAwMzIxMzU1OFoXDTIzMTAwMTIx
+						MzU1OFowHDEaMBgGA1UEAxMRcmNucHVibGlzaGluZy5jb20wggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDBlUJDDRaIIieWxx02H8sbXKNbUE6X+ZQbDeEk
+						ifb/0TqrolBjWGbwIB55jf4qL5aHy1Xb9lWiuItveLETbDsb6LGVRXjoBLMD/hq/
+						INQNKlId7sUyaDD1dKdWo8vZAORnLLJfiNfJBFSfwt8dnnQihsv8ip1sQonfdjWF
+						2JaPRwKHX864wn6x8CvqOgRNheowlhj6Hq69zX9mL9bKww6MC9c++11rwOYHVdGZ
+						vZqhU0CxzNTDJWDRYwu5//PpMDLMJGTpbuRnN0SRR0uOJ6H9hACTO4MLGzO/WF4X
+						cU1+I48q2gCdsZ2LaHWmNJqIy5IU24r2gu75uYAdUfE/n6UxAgMBAAGjZTBjMEIG
+						A1UdEQQ7MDmCEXJjbnB1Ymxpc2hpbmcuY29thiRodHRwczovL3JjbnB1Ymxpc2hp
+						bmcuY29tL3NoaWJib2xldGgwHQYDVR0OBBYEFBME3+HToUv+o1RLhxpnUhzXeecR
+						MA0GCSqGSIb3DQEBBQUAA4IBAQAiMV6SbpPn4cSK/tteSnvlGDu0kx0WrKHcq70j
+						/TQyKZYc/roD1Xsbusj6kNhtbyg2UDKZMtUDJUX49Gy6od4hMft/LaO0d+S0fBA5
+						pMGEl3rQpubIUem/SBAfN+Au+7j6yqi0vukGCqSWNAaQXt/XqkKys69b/CIbqkrm
+						ggWl3cXSrJx7GPKL1S9O5Oxd/cJO+g32L9qMH7LuKHLlnkEH8O5ZKjZjn+F6rBy7
+						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>
diff --git a/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..c504b0af
--- /dev/null
+++ b/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml
@@ -0,0 +1,119 @@
+<?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: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">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>
+MIIDKzCCAhOgAwIBAgIUMysVZyotzMFN08smrMEjxr7cBg4wDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQa2F0YWxvZy5zdmtvcy5jejAeFw0xMzExMTEyMDIxMjJa
+Fw0zMzExMTEyMDIxMjJaMBsxGTAXBgNVBAMTEGthdGFsb2cuc3Zrb3MuY3owggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMXDtGvbcdogNvhJbrKZmDxFqb
+9VJ33XYnH+mBPdndP5kMDcE70SZqBpJQlP4JP+0GvETydNlHnK/t7TUE8SyRV+5y
+dLMeuFnAvP4So2OGfJfcivVizSvNSKuiYWBO2c7z90E3e0qBET0/gBSZ/lMvNSu5
+GS7Xe3+j35NGUiwGIzRglMKOAPxiA+szn0wIBsG7JhMdHuZMUASeVJewAxlPVv1p
+C7BrtRYVPmHm8xfqoTFg9RJz8nWDfugKLOPeVfdB17UwQICMYLM6pCvCmDGZ3SFz
+k83oy1GqWnfsXasaEWAL9VpQI5keYO34kgjRadlrSCjaMCSwPEgII6Z7J88HAgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGthdGFsb2cuc3Zrb3MuY3qGJ2h0dHBzOi8va2F0
+YWxvZy5zdmtvcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS5NR0hEzdvRO
+kCB+T+bV6A3WQG8wDQYJKoZIhvcNAQEFBQADggEBAHVlLp4Vdb1zrlGQVO0AZBoz
+pPpRx2+MW9nasMPsd8ybYW/mbvAQU1c1MaUCK+rRk3Tu+Jj08A6YJOY5x/yLXxjh
+Us6l6JqIDYn6M/44vMf0fH+DkA40zfnpI8fv07O5Oc8EV1MsBdQm6zBh19MmDxY8
+diuVwTi1E9kR6Q3RIzhH1TERBDOpIfsUGVv5IHywYlUYsxYfOy6A0FjEtenMpfsI
+4NMjUoYVfnC0z5aWU7Vdu5LJIfkNj4HCuxLZur7NBvX3UTEuegzZRewy5edw+/hp
+K1WmgwfZhpsu54HYP1WZcpvCC4nCiZ9b1wiwdAixsl/orsvhTGeJVLtV1MbEaHY=
+
+                    </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: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>
+MIIDKzCCAhOgAwIBAgIUMysVZyotzMFN08smrMEjxr7cBg4wDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQa2F0YWxvZy5zdmtvcy5jejAeFw0xMzExMTEyMDIxMjJa
+Fw0zMzExMTEyMDIxMjJaMBsxGTAXBgNVBAMTEGthdGFsb2cuc3Zrb3MuY3owggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMXDtGvbcdogNvhJbrKZmDxFqb
+9VJ33XYnH+mBPdndP5kMDcE70SZqBpJQlP4JP+0GvETydNlHnK/t7TUE8SyRV+5y
+dLMeuFnAvP4So2OGfJfcivVizSvNSKuiYWBO2c7z90E3e0qBET0/gBSZ/lMvNSu5
+GS7Xe3+j35NGUiwGIzRglMKOAPxiA+szn0wIBsG7JhMdHuZMUASeVJewAxlPVv1p
+C7BrtRYVPmHm8xfqoTFg9RJz8nWDfugKLOPeVfdB17UwQICMYLM6pCvCmDGZ3SFz
+k83oy1GqWnfsXasaEWAL9VpQI5keYO34kgjRadlrSCjaMCSwPEgII6Z7J88HAgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGthdGFsb2cuc3Zrb3MuY3qGJ2h0dHBzOi8va2F0
+YWxvZy5zdmtvcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS5NR0hEzdvRO
+kCB+T+bV6A3WQG8wDQYJKoZIhvcNAQEFBQADggEBAHVlLp4Vdb1zrlGQVO0AZBoz
+pPpRx2+MW9nasMPsd8ybYW/mbvAQU1c1MaUCK+rRk3Tu+Jj08A6YJOY5x/yLXxjh
+Us6l6JqIDYn6M/44vMf0fH+DkA40zfnpI8fv07O5Oc8EV1MsBdQm6zBh19MmDxY8
+diuVwTi1E9kR6Q3RIzhH1TERBDOpIfsUGVv5IHywYlUYsxYfOy6A0FjEtenMpfsI
+4NMjUoYVfnC0z5aWU7Vdu5LJIfkNj4HCuxLZur7NBvX3UTEuegzZRewy5edw+/hp
+K1WmgwfZhpsu54HYP1WZcpvCC4nCiZ9b1wiwdAixsl/orsvhTGeJVLtV1MbEaHY=
+
+                    </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: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">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
new file mode 100644
index 00000000..fdcfdb5d
--- /dev/null
+++ b/swamid-interfederations-2.0/kbplus.k-int.com-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAPwTavbo3IrSMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEGticGx1cy5rLWludC5jb20wHhcNMTMxMjIzMTgzMDA4WhcNMjMxMjIxMTgz
+						MDA4WjAbMRkwFwYDVQQDExBrYnBsdXMuay1pbnQuY29tMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEA7fBPgC0AH+qt5xKCAoaKj+0ochHqjdqcTeArNf6/
+						u6h6WC7ycqyOiNlo0+zAL9hCl6TCItCVHc0XbWdR/jl0T9Xexwb2ldIqeQDmR6Zl
+						zrNz0T5Z6Zi8GrhfxM7D+7CnnDCxlehSSnDlv2v1KRVEvoZYp+e+tN1n81TnbNVZ
+						ejiVXbnS3zLdUyjFd6PZ4PlWyxucFVtuM94JUZ+OQeL9YVi2ZIMHfc90BDEqD5pI
+						wqMefY/gMaQdF9apRsrwNKT2eDNmempPVn09T3/IShNPibGwy1+u+NQO1zXIgqb/
+						x1d67ymh6vf4wRrzwO35J6jhoi3yECJCPYXhDcf09u5W4QIDAQABoz4wPDAbBgNV
+						HREEFDASghBrYnBsdXMuay1pbnQuY29tMB0GA1UdDgQWBBTOzLiM7iYZBRuZ455l
+						D2qUybc4IzANBgkqhkiG9w0BAQUFAAOCAQEAbB2APqTBcyl3cqddEabdHcgHwMkW
+						IpXH9vY4I5vN+QLYRNAMWzVqTLvSAterk8Zg08AVHhMVKOIGTToy/I3baknJN6dt
+						s+2zzA4DZ5PBNJZ1dZrcb3tQ+8KTXNzerY5RX1r9/6O8BenKsLSdZNelDWONQrbn
+						QAgM92q8JTWyEOe/xar1vmeALxxQ34ktaW3O0mIUzeMxQ8VYqU93utJYJffBHoR1
+						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>
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
new file mode 100644
index 00000000..6ef3b3a9
--- /dev/null
+++ b/swamid-interfederations-2.0/kclidp.kcl.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?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>
+      <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>
+						MIIEZjCCA06gAwIBAgIBADANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJHQjEP
+						MA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHTAbBgNVBAoTFEtpbmdz
+						IENvbGxlZ2UgTG9uZG9uMQswCQYDVQQLEwJJVDEZMBcGA1UEAxMQa2NsaWRwLmtj
+						bC5hYy51azAeFw0xMzAxMDkxNjQyMTRaFw0yMzAxMDcxNjQyMTRaMHYxCzAJBgNV
+						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEdMBsGA1UE
+						ChMUS2luZ3MgQ29sbGVnZSBMb25kb24xCzAJBgNVBAsTAklUMRkwFwYDVQQDExBr
+						Y2xpZHAua2NsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						yEpyzp6Y1kvj+GsPL1pQiQvDBLnNck72Bn7SVCrEAbhoYSSymjchXt7yI3dw1pMB
+						f9+0iA6s5ex0Mt7tnjggWV6wIGM3zw62X+cSINnWp4TRWHZ3LVEwcU9O2R1o0o3U
+						467XviRD/SrNsaRnZp/5XmddQjTt0nLqsGw/RVqlEwGNoxr3/ufUqyC9C2mbOtb7
+						DcrUqH7z4R+f6YokzqMhjuBtd7bHr4aKDeRKzmltpGlVFEz4wrVNi+79WfjLkX7l
+						dcxzXU9jnHOpgzbnUcmkwbxSl9DBSC9VxJBC83ncXRuRBgyqPpXYmZ6xdnUm+7e2
+						eCRUuVRGB09QC4yrvCXZZwIDAQABo4H+MIH7MAkGA1UdEwQCMAAwLAYJYIZIAYb4
+						QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSp
+						TH5kAuUTBts/2kYGhN6eOKOXzDCBoAYDVR0jBIGYMIGVgBSpTH5kAuUTBts/2kYG
+						hN6eOKOXzKF6pHgwdjELMAkGA1UEBhMCR0IxDzANBgNVBAgTBkxvbmRvbjEPMA0G
+						A1UEBxMGTG9uZG9uMR0wGwYDVQQKExRLaW5ncyBDb2xsZWdlIExvbmRvbjELMAkG
+						A1UECxMCSVQxGTAXBgNVBAMTEGtjbGlkcC5rY2wuYWMudWuCAQAwDQYJKoZIhvcN
+						AQEFBQADggEBAJ0zF1N2N5bQS/ZK08jAbsd1gDuk4u4D5o8vEW5Np3aUPrHE3fK1
+						59bl8mpz3q9/kDJuu2NGZRlNGpFOUSDZJBWz6g6gg6sYSgTVXSRnfsSBnQ103dzb
+						v0MG4GA9B+WAD/6/henwXa0cSB708MU9ezq8dufilyHzNo033tfKXiWZbbvgO+mk
+						hBFPNvEdfJ98vLKS6q+wmNlvmzhFr7aoH1tYENryGrJWTJ0PEjv+SYWiHRjZdrF4
+						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>
+						MIIEZjCCA06gAwIBAgIBADANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJHQjEP
+						MA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHTAbBgNVBAoTFEtpbmdz
+						IENvbGxlZ2UgTG9uZG9uMQswCQYDVQQLEwJJVDEZMBcGA1UEAxMQa2NsaWRwLmtj
+						bC5hYy51azAeFw0xMzAxMDkxNjQyMTRaFw0yMzAxMDcxNjQyMTRaMHYxCzAJBgNV
+						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEdMBsGA1UE
+						ChMUS2luZ3MgQ29sbGVnZSBMb25kb24xCzAJBgNVBAsTAklUMRkwFwYDVQQDExBr
+						Y2xpZHAua2NsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						yEpyzp6Y1kvj+GsPL1pQiQvDBLnNck72Bn7SVCrEAbhoYSSymjchXt7yI3dw1pMB
+						f9+0iA6s5ex0Mt7tnjggWV6wIGM3zw62X+cSINnWp4TRWHZ3LVEwcU9O2R1o0o3U
+						467XviRD/SrNsaRnZp/5XmddQjTt0nLqsGw/RVqlEwGNoxr3/ufUqyC9C2mbOtb7
+						DcrUqH7z4R+f6YokzqMhjuBtd7bHr4aKDeRKzmltpGlVFEz4wrVNi+79WfjLkX7l
+						dcxzXU9jnHOpgzbnUcmkwbxSl9DBSC9VxJBC83ncXRuRBgyqPpXYmZ6xdnUm+7e2
+						eCRUuVRGB09QC4yrvCXZZwIDAQABo4H+MIH7MAkGA1UdEwQCMAAwLAYJYIZIAYb4
+						QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSp
+						TH5kAuUTBts/2kYGhN6eOKOXzDCBoAYDVR0jBIGYMIGVgBSpTH5kAuUTBts/2kYG
+						hN6eOKOXzKF6pHgwdjELMAkGA1UEBhMCR0IxDzANBgNVBAgTBkxvbmRvbjEPMA0G
+						A1UEBxMGTG9uZG9uMR0wGwYDVQQKExRLaW5ncyBDb2xsZWdlIExvbmRvbjELMAkG
+						A1UECxMCSVQxGTAXBgNVBAMTEGtjbGlkcC5rY2wuYWMudWuCAQAwDQYJKoZIhvcN
+						AQEFBQADggEBAJ0zF1N2N5bQS/ZK08jAbsd1gDuk4u4D5o8vEW5Np3aUPrHE3fK1
+						59bl8mpz3q9/kDJuu2NGZRlNGpFOUSDZJBWz6g6gg6sYSgTVXSRnfsSBnQ103dzb
+						v0MG4GA9B+WAD/6/henwXa0cSB708MU9ezq8dufilyHzNo033tfKXiWZbbvgO+mk
+						hBFPNvEdfJ98vLKS6q+wmNlvmzhFr7aoH1tYENryGrJWTJ0PEjv+SYWiHRjZdrF4
+						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>
diff --git a/swamid-interfederations-2.0/keelesu.com-shibboleth.xml b/swamid-interfederations-2.0/keelesu.com-shibboleth.xml
new file mode 100644
index 00000000..1b7a971c
--- /dev/null
+++ b/swamid-interfederations-2.0/keelesu.com-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
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
new file mode 100644
index 00000000..f11b9f47
--- /dev/null
+++ b/swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
@@ -0,0 +1,67 @@
+<?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:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEujCCA6KgAwIBAgIQLINqZJFs8l1wYd2J2IBMTjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMDIyOTAwMDAwMFoXDTE1MDIyODIzNTk1OVowgZUxCzAJBgNV
+BAYTAkRLMQowCAYDVQQREwEuMQowCAYDVQQIEwEuMQswCQYDVQQHEwIuLjEZMBcG
+A1UECRMQREsgMjk3MCBIb3JzaG9sbTEVMBMGA1UECRMMQWdlcm4gQWxsZSAzMRUw
+EwYDVQQKEwxOT1JEVW5ldCBBL1MxGDAWBgNVBAMUDyouYXBwLm5vcmR1Lm5ldDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkBbj0ZJsjuirO6tN9rbRhE
+5PfQKfjrwMf5lp1a05DHlJcxsv2JZGPszkOA260D8gouWfjk3DJQIIJJgELfn5yP
+L4zwKArBDpsttTXW+DFmhfECbkemWV571ErDHMVC9JUD39uLhE1bAoYFxAeJGr14
+mg/N5YdnsuSTGOfVfC+XuhA3CgylcGBIWoXHPbPlUJk3VWVeNnYjO+nLlKPjhSSq
+mRVhmVhEwREiRPgbKyMEEoFpdmSzuNWcBMtVKt4FTLa0cjx3/rIn77imztcXRDSN
+T6GwXaG5pjy+7E602epC4t5hbj6pxzrC7mpyIQXdYjKboPgaKQ+E7bv+OqJNG3sC
+AwEAAaOCAWIwggFeMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0G
+A1UdDgQWBBT0F6Szj83YxTlMGIIIf3I9jdTedjAOBgNVHQ8BAf8EBAMCBaAwDAYD
+VR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0g
+BBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3Js
+LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8w
+NQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+Q0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAa
+BgNVHREEEzARgg8qLmFwcC5ub3JkdS5uZXQwDQYJKoZIhvcNAQEFBQADggEBADMQ
+bc0dPVC1SlyOxDf90hN9sDKw92YdVtsUNFfs9MYivZK7KI5+qEQStpAvXkrBUNfd
+gM9wqL9ea9BDDmBcn5lYyjPBgGJBeLLkcyBbZ56JbcBAxIncKKFw6r5M3j7tMcth
+f06K4cm7ngUg80ZEYK00ioAyFle56qPfZ5UM25QFzV38DGvusLl5H1bTtpz1ijh7
+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>leifj@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet</md:Company>
+    <md:GivenName>Johan</md:GivenName>
+    <md:SurName>Berggren</md:SurName>
+    <md:EmailAddress>jbn@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
new file mode 100644
index 00000000..26e764d6
--- /dev/null
+++ b/swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml
@@ -0,0 +1,133 @@
+<?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>
+      <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>
+MIIDGDCCAgCgAwIBAgIVAM0PmHWir6jrdlS8z2iCpGvo0CqaMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2tpaWRwLmtpLnNlMB4XDTEwMTEwOTA4MTgwNloXDTMw
+MTEwOTA4MTgwNlowFjEUMBIGA1UEAxMLa2lpZHAua2kuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCGXvXTTL9jXqeUnjwuEuPctScCyn+hRZQOmWm7
+OrvAHMIi+MKQMeSboowpbj+apvYbaxQFY4PH4287fd4OhYJGAdfNk68E7h+S5Ryq
+BVrJVM9SSGcwGAViCSq5YfuSo/ZtvMCGtQJ8ef1uu4sg4VJ+UzXtSjfRvKNko9Jm
+r3lJ3qDUp3ltm+r9Yk7EQ+tKfJFIg41HiAEeFl9Zztlp6DqbOlwXleUjCVPklCZV
+4emEO9flD+uk3zxp9y9TlcOAtuFNp6EmzH5Xc2LvWOusDZITsuNtL6OfadIixkfb
+IctgW4hgD0GOnDi2chYu4Yq3vets8GsQVkD0BAIXNxhJ1HEjAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2tpaWRwLmtpLnNlhiJodHRwczovL2tpaWRwLmtpLnNlL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBSDaQ4ABwxargqbAwedMAvPxCvABjANBgkqhkiG
+9w0BAQUFAAOCAQEAhHhPDWxChQt/L74HjwWVQHPQghTRcxJaQcBefWKH2yiERNyd
+/PKXU5G3RIzOS3Y3fYGwOMxH+PidKd48txJ50n/3VDI75g2MJsB+KJjLi2iVVkan
+xTyNLauF4A6ueNbn9V/myyZTa7kiru+iDSOasFSlLMf2leQXQHX3qBkOyBmy5Nu8
+eGhJzMVovMnIaDofE1FXMI6yTuF3KG+Uep7moWj+WHY028TupWsiAE4LVs793dAn
+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>
+MIIDGDCCAgCgAwIBAgIVAM0PmHWir6jrdlS8z2iCpGvo0CqaMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2tpaWRwLmtpLnNlMB4XDTEwMTEwOTA4MTgwNloXDTMw
+MTEwOTA4MTgwNlowFjEUMBIGA1UEAxMLa2lpZHAua2kuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCGXvXTTL9jXqeUnjwuEuPctScCyn+hRZQOmWm7
+OrvAHMIi+MKQMeSboowpbj+apvYbaxQFY4PH4287fd4OhYJGAdfNk68E7h+S5Ryq
+BVrJVM9SSGcwGAViCSq5YfuSo/ZtvMCGtQJ8ef1uu4sg4VJ+UzXtSjfRvKNko9Jm
+r3lJ3qDUp3ltm+r9Yk7EQ+tKfJFIg41HiAEeFl9Zztlp6DqbOlwXleUjCVPklCZV
+4emEO9flD+uk3zxp9y9TlcOAtuFNp6EmzH5Xc2LvWOusDZITsuNtL6OfadIixkfb
+IctgW4hgD0GOnDi2chYu4Yq3vets8GsQVkD0BAIXNxhJ1HEjAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2tpaWRwLmtpLnNlhiJodHRwczovL2tpaWRwLmtpLnNlL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBSDaQ4ABwxargqbAwedMAvPxCvABjANBgkqhkiG
+9w0BAQUFAAOCAQEAhHhPDWxChQt/L74HjwWVQHPQghTRcxJaQcBefWKH2yiERNyd
+/PKXU5G3RIzOS3Y3fYGwOMxH+PidKd48txJ50n/3VDI75g2MJsB+KJjLi2iVVkan
+xTyNLauF4A6ueNbn9V/myyZTa7kiru+iDSOasFSlLMf2leQXQHX3qBkOyBmy5Nu8
+eGhJzMVovMnIaDofE1FXMI6yTuF3KG+Uep7moWj+WHY028TupWsiAE4LVs793dAn
+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>Malin Westerberg</md:SurName>
+    <md:EmailAddress>malin.westerberg@ki.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 524 86693</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Karolinska Institutet</md:Company>
+    <md:SurName>Eric Johansson</md:SurName>
+    <md:EmailAddress>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>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/knowledge.sagepub.com-oa-metadata.xml b/swamid-interfederations-2.0/knowledge.sagepub.com-oa-metadata.xml
new file mode 100644
index 00000000..692f63ab
--- /dev/null
+++ b/swamid-interfederations-2.0/knowledge.sagepub.com-oa-metadata.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIEUqnsnzANBgkqhkiG9w0BAQUFADA5MRcwFQYDVQQKEw5T
+						QUdFIEtub3dsZWRnZTEeMBwGA1UEAxMVa25vd2xlZGdlLnNhZ2VwdWIuY29tMB4X
+						DTEzMTIxMjE3MDQzMVoXDTIzMTIxMDE3MDQzMVowOTEXMBUGA1UEChMOU0FHRSBL
+						bm93bGVkZ2UxHjAcBgNVBAMTFWtub3dsZWRnZS5zYWdlcHViLmNvbTCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+8ZzgPSwEfb6WMoObF9tmbrlBloL2z
+						OL7vldcop8YDfeOthyRQqOEGVnc83uJoz0Ut8TexVpSiaGAwDNNuFS9cgwZif/N6
+						5mNhYRoxyqbBsm7WrIxT0zVjPKE2PWDtlaoNlcCvicnc4+1rdRlL19nz2EJIBcqb
+						vqoSOCNqkcJxMNVoSlMVEln4Wwt77gKCJxSaegWRcviWacFpJ71IReD6mRcyelc+
+						Ym6DJNyomPgGiySW0WOJ4MvBcduRf0qTfceeJkq30wgCfs5z39pKA5y3W/eAAzCS
+						Bi9gi+M6+JeK1KJFz0kLs9yW0emRiuBeihFCrvss26OE3MeUqTsb6pECAwEAATAN
+						BgkqhkiG9w0BAQUFAAOCAQEAgbKk/wRJddJm1KFDE+vE9DYSS9tcUO20suWWrsyW
+						Ega1Id7xOB5EmYyFLeoHwnwjndInkf8LwyPeevraFWdyAlNYjPnte87trpM6AETp
+						7ZFvAt6nVZuTzYLvqXRoLCOKCL8zyiYRRLSgPpbJzhdpb98cQWCe5Qr36/9EDRhc
+						wULr8Z8HJOgONxWQbNnZTPU8Z0lrisOhAbAu3QGk5Km4+6v9o8PQch1zECh7HEZa
+						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>
+						MIIC7jCCAdagAwIBAgIEUqnsnzANBgkqhkiG9w0BAQUFADA5MRcwFQYDVQQKEw5T
+						QUdFIEtub3dsZWRnZTEeMBwGA1UEAxMVa25vd2xlZGdlLnNhZ2VwdWIuY29tMB4X
+						DTEzMTIxMjE3MDQzMVoXDTIzMTIxMDE3MDQzMVowOTEXMBUGA1UEChMOU0FHRSBL
+						bm93bGVkZ2UxHjAcBgNVBAMTFWtub3dsZWRnZS5zYWdlcHViLmNvbTCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+8ZzgPSwEfb6WMoObF9tmbrlBloL2z
+						OL7vldcop8YDfeOthyRQqOEGVnc83uJoz0Ut8TexVpSiaGAwDNNuFS9cgwZif/N6
+						5mNhYRoxyqbBsm7WrIxT0zVjPKE2PWDtlaoNlcCvicnc4+1rdRlL19nz2EJIBcqb
+						vqoSOCNqkcJxMNVoSlMVEln4Wwt77gKCJxSaegWRcviWacFpJ71IReD6mRcyelc+
+						Ym6DJNyomPgGiySW0WOJ4MvBcduRf0qTfceeJkq30wgCfs5z39pKA5y3W/eAAzCS
+						Bi9gi+M6+JeK1KJFz0kLs9yW0emRiuBeihFCrvss26OE3MeUqTsb6pECAwEAATAN
+						BgkqhkiG9w0BAQUFAAOCAQEAgbKk/wRJddJm1KFDE+vE9DYSS9tcUO20suWWrsyW
+						Ega1Id7xOB5EmYyFLeoHwnwjndInkf8LwyPeevraFWdyAlNYjPnte87trpM6AETp
+						7ZFvAt6nVZuTzYLvqXRoLCOKCL8zyiYRRLSgPpbJzhdpb98cQWCe5Qr36/9EDRhc
+						wULr8Z8HJOgONxWQbNnZTPU8Z0lrisOhAbAu3QGk5Km4+6v9o8PQch1zECh7HEZa
+						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>
diff --git a/swamid-interfederations-2.0/krad.cityplym.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/krad.cityplym.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..d5e7ad69
--- /dev/null
+++ b/swamid-interfederations-2.0/krad.cityplym.ac.uk-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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
+						LmNpdHlwbHltLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						nET5Mc3Z+5IC8b2KhU2EyWVau8c/sMwNos2wAWwQGJWVq70ZFnPAKWMjmVYx37TC
+						DJk0uMtZHBWqNcHRooNqHXy3yVVhve+Sc03YCQ6VwAfJJXFkjgCaL274mLLADIhF
+						/UV86AJ48yq7x/4LNtKZA1U86uJvTOT41TkJkPNix1H7IT0ssevZHOgV/jdKJw+T
+						FixUsccDdv5+RxRfM24gx7vQ2IGIpYRsISgAtejbtpO/PKNSunqgjjbWE8QB0+UE
+						AyGjAEXq1t6HJ6yjLrRR6YAMkfHHpjU1sNBICv5ambVVXX8iS9EzTat9O4cSCU6B
+						lklM7JQ0schSt+CQZd9iHwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
+						LmNpdHlwbHltLmFjLnVrhjBodHRwczovL3NoaWJib2xldGguY2l0eXBseW0uYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLwDRVMVjMMG9ZF7cH13znMifPUP
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCXpJ+3D+ONPxEb/+WhbIHTFFZNYyWK01l4q4Jq
+						X3tDpd6vAFvcKr/wqj1UZ6YeXi1MvQpStlNrOnF7ASsQlKIQ167PrcZu6W3mlkiZ
+						8WZQ4AGsRuoCxywamNK0tXkdd9Dz1lDwzrkwE/g1GGHg6c/9YFQb2MUjm+6kqvQ8
+						iqFQFpdPj9VNUgXt5+3bPeaOluJnAOE9T3IQv8+0MQp+mJ9M+3dChHotIgiXqCuh
+						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>
+						MIIDUDCCAjigAwIBAgIVAMOc1kqMl4mYFgYDAXyXKjoH9obQMA0GCSqGSIb3DQEB
+						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGguY2l0eXBseW0uYWMudWswHhcNMTEw
+						NjE3MTEzNjUwWhcNMzEwNjE3MTEzNjUwWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
+						LmNpdHlwbHltLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						nET5Mc3Z+5IC8b2KhU2EyWVau8c/sMwNos2wAWwQGJWVq70ZFnPAKWMjmVYx37TC
+						DJk0uMtZHBWqNcHRooNqHXy3yVVhve+Sc03YCQ6VwAfJJXFkjgCaL274mLLADIhF
+						/UV86AJ48yq7x/4LNtKZA1U86uJvTOT41TkJkPNix1H7IT0ssevZHOgV/jdKJw+T
+						FixUsccDdv5+RxRfM24gx7vQ2IGIpYRsISgAtejbtpO/PKNSunqgjjbWE8QB0+UE
+						AyGjAEXq1t6HJ6yjLrRR6YAMkfHHpjU1sNBICv5ambVVXX8iS9EzTat9O4cSCU6B
+						lklM7JQ0schSt+CQZd9iHwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
+						LmNpdHlwbHltLmFjLnVrhjBodHRwczovL3NoaWJib2xldGguY2l0eXBseW0uYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLwDRVMVjMMG9ZF7cH13znMifPUP
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCXpJ+3D+ONPxEb/+WhbIHTFFZNYyWK01l4q4Jq
+						X3tDpd6vAFvcKr/wqj1UZ6YeXi1MvQpStlNrOnF7ASsQlKIQ167PrcZu6W3mlkiZ
+						8WZQ4AGsRuoCxywamNK0tXkdd9Dz1lDwzrkwE/g1GGHg6c/9YFQb2MUjm+6kqvQ8
+						iqFQFpdPj9VNUgXt5+3bPeaOluJnAOE9T3IQv8+0MQp+mJ9M+3dChHotIgiXqCuh
+						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>
diff --git a/swamid-interfederations-2.0/ku-primo-prod.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/ku-primo-prod.hosted.exlibrisgroup.com-shib.xml
new file mode 100644
index 00000000..39c5b02e
--- /dev/null
+++ b/swamid-interfederations-2.0/ku-primo-prod.hosted.exlibrisgroup.com-shib.xml
@@ -0,0 +1,66 @@
+<?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-prod.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-07-04T11: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ku-primo-prod.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>
+						MIIDNjCCAh6gAwIBAgIJAKw/r3u7k/vAMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
+						BAMTJWRjMDF2ZzAwMzlldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTEw
+						NjI5MTM1NTE5WhcNMjEwNjI2MTM1NTE5WjAwMS4wLAYDVQQDEyVkYzAxdmcwMDM5
+						ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA87/H7BfMefIzd78V/qDhPXBb2XQkICooMjJDekUKaKdykC2r
+						oPp20O/k3XdMvWjJe9bgCURkzcGLoAB8+8YJG5j6ACMfTpcV32q4gIfXk8PlNSBt
+						KjAjJW/EqaN1p8Q0BaMZfcWoNaOhhLWgBkiHIwuCkinsqy0RBy28NBVv9QWnC2PG
+						iJkRAZtXx8RmHDXu9EP/xnQI2a21i4VrbUbG0wvt/h2yYeQ3c1SGQUfdRxFXktTS
+						B5zkt1fKE4K0vJStL/anr6RJpFFiBfLxE9oy1B+HcINrZhwtv37OM9bsfOVL+UFm
+						zZYUjMnpEMzJXY7L8iyCPUElOzO+GafGuwqYNwIDAQABo1MwUTAwBgNVHREEKTAn
+						giVkYzAxdmcwMDM5ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
+						BBT5akq8gSoJTPqBY/a0JeGDONIu4TANBgkqhkiG9w0BAQUFAAOCAQEAEmFX5dmF
+						aHlpAY9j87joM+fWjqQVEwKiw2qYVaWYZmJwyGd6GTTS6zbiiqtxdUovv2lGEBoa
+						VL7D/Mbrp+uzy6eyJErd8k3JQ754BH2cSgklWKJcO4WRjnlGSGrC5BzlcdweLIwz
+						vjuFU3fkSBXs9nytRd4E/+NTht9U5cJTFFxs9A5OCdY4eXXqU0WleM2hDHgyAB46
+						77eCEE6qd9aFGsoeujg81dSL9J+yCorax8K6BVMi4xPOG5Jp1JXIM1oOJZHoXz0w
+						pauro8vi+P0JtAcliUP2Gs8Vg54ROeafsweovJoRVdgEpdGW1FOPlDk07IM0/4Cl
+						/f5ttpDEx/6kcw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ex Libris: ASP Service on behalf of the Kingston University</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/ku-primo.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/ku-primo.hosted.exlibrisgroup.com-shib.xml
new file mode 100644
index 00000000..8a42c6bf
--- /dev/null
+++ b/swamid-interfederations-2.0/ku-primo.hosted.exlibrisgroup.com-shib.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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>
+						MIIDNjCCAh6gAwIBAgIJAOj3Zz/p9Vx7MA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
+						BAMTJWRjMDNrZzAzNTFldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTQw
+						MjI2MDYwNDE0WhcNMjQwMjI0MDYwNDE0WjAwMS4wLAYDVQQDEyVkYzAza2cwMzUx
+						ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAs22oyR6YHnUVlPNR5rrT+7OGLDqXqRlEiY421vfiWrK45xJU
+						9421fSc08tvnqwK+Wb3lrpreJKWVD45K+Z3+UNjdHph8NYPLhbJIbj7zSr+omGbG
+						iFeNesU2DhrQyT5LLMPl+qUQINUt4v7W1xyAVO0RF2PxAAvcyVS6vcDtIVUmLZNP
+						uN581JOJaccTqiU/iAByjPzTHJlL0OfKeGJb0BYYdOCqTyGZZxShWk/RoFyA4Sbt
+						kG7U/BD0rkeJ4ELkq2vLefxGDK23/AT5C3N4lhDvX1KFGZOzlYguLyNAIToxfjh4
+						kXcrGtVE/kUvGih0i+J7nBYI9ZzbnMqmSJ7XhQIDAQABo1MwUTAwBgNVHREEKTAn
+						giVkYzAza2cwMzUxZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
+						BBSTwa3ljw9niFjJ56VIlGAjNu3LYTANBgkqhkiG9w0BAQUFAAOCAQEAldmrNdUD
+						5+i8MC5tiz066ckM4SZQEY5H0nGHdZQQJ5Q4y3umW9574rssXH3hYURDl+694FXM
+						j69h6iPUdihT1zKvFB24hz23XDMRiEF5sorDXDJ/xzzxOqntc7XSuGPUTDjcdGS2
+						rDCC/Pu2G5iD9xJIE5OX95DV8fNx1MRYmDtrShM2Szi1i/IgwaAYPDpw5ueH5JGd
+						wvc45uy/tbhY1br1RKM0v9UTqSkpfOnkZ1fpgkLs28mopwsbTWZbVATkhnNcIZVd
+						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>
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
new file mode 100644
index 00000000..cd89ecc1
--- /dev/null
+++ b/swamid-interfederations-2.0/l4l-sp-02.kent.ac.uk-entity.xml
@@ -0,0 +1,90 @@
+<?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>
+						MIIEJjCCAw6gAwIBAgIJAKa9P2cE2HGrMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
+						VQQGEwJVSzENMAsGA1UECBMES2VudDETMBEGA1UEBxMKQ2FudGVyYnVyeTEbMBkG
+						A1UEChMSVW5pdmVyc2l0eSBvZiBLZW50MQ4wDAYDVQQLEwVpc3NyZzETMBEGA1UE
+						AxMKS3Jpc3R5IFNpdTEeMBwGCSqGSIb3DQEJARYPa3dzc0BrZW50LmFjLnVrMB4X
+						DTEyMDExMTE0MjE0M1oXDTIyMDEwODE0MjE0M1owgZMxCzAJBgNVBAYTAlVLMQ0w
+						CwYDVQQIEwRLZW50MRMwEQYDVQQHEwpDYW50ZXJidXJ5MRswGQYDVQQKExJVbml2
+						ZXJzaXR5IG9mIEtlbnQxDjAMBgNVBAsTBWlzc3JnMRMwEQYDVQQDEwpLcmlzdHkg
+						U2l1MR4wHAYJKoZIhvcNAQkBFg9rd3NzQGtlbnQuYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQC2APnwJCFAJGZgARhHGG1q9EYwpVkWiVvScfbM
+						gSxgGhs4jhzYX3bLUqOFM1+FVqRQsQjka1pEt3sNsH1rTkQG0BCRNXfiUOAzH+ex
+						xNtyj6M3Rj2Jb7wUo/Dk9IJaEKrRWYRczFa4UoTLBfuh98T+ii3+nx9143zXz3fu
+						dUKSOm2VBGQx9BfucN55C90uBg3FzdaSgh3DUErnuVOtaR2ORKCgW8VanjkzrWv0
+						/mtdhNycFh9ECBy/Emgyw5zG2fxyEL3KftNJxogBDcEC6dU3PZPFo1p+TTIjOZa1
+						c0Z0cvzLeTqDJsYi07CWMotobZ5XMmM+T2oS3adB8hXb4DVLAgMBAAGjezB5MAkG
+						A1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRp
+						ZmljYXRlMB0GA1UdDgQWBBT2YT5wLzaLNBPtBUgm1xylI03WXDAfBgNVHSMEGDAW
+						gBT2YT5wLzaLNBPtBUgm1xylI03WXDANBgkqhkiG9w0BAQUFAAOCAQEAJIYNiO5b
+						Yzb3dZ2PqL3WdhMTg3vHXTBVKKnSegNwd/huTybPzs6oqNIxgDqsxT6/p5WZVz/f
+						6MT3bvUnGoy70gNVaSjHZg01QXKCzbEi1C/hcMO1cMdYVYZYAiQeFv7+4HuChkC6
+						ZIkwMmoSeX/Q13G3ZOltY+xV81E7Afc3+MTeowDYayfRHTpp4SHqRe098k/XJ6w9
+						3PMjGO33JAAAaNAJzsmzrtb86q5d9O4r4Y45vRypyBfu6Mr8TbufXsxUEKcdFaRv
+						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>
+						MIIEJjCCAw6gAwIBAgIJAKa9P2cE2HGrMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
+						VQQGEwJVSzENMAsGA1UECBMES2VudDETMBEGA1UEBxMKQ2FudGVyYnVyeTEbMBkG
+						A1UEChMSVW5pdmVyc2l0eSBvZiBLZW50MQ4wDAYDVQQLEwVpc3NyZzETMBEGA1UE
+						AxMKS3Jpc3R5IFNpdTEeMBwGCSqGSIb3DQEJARYPa3dzc0BrZW50LmFjLnVrMB4X
+						DTEyMDExMTE0MjE0M1oXDTIyMDEwODE0MjE0M1owgZMxCzAJBgNVBAYTAlVLMQ0w
+						CwYDVQQIEwRLZW50MRMwEQYDVQQHEwpDYW50ZXJidXJ5MRswGQYDVQQKExJVbml2
+						ZXJzaXR5IG9mIEtlbnQxDjAMBgNVBAsTBWlzc3JnMRMwEQYDVQQDEwpLcmlzdHkg
+						U2l1MR4wHAYJKoZIhvcNAQkBFg9rd3NzQGtlbnQuYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQC2APnwJCFAJGZgARhHGG1q9EYwpVkWiVvScfbM
+						gSxgGhs4jhzYX3bLUqOFM1+FVqRQsQjka1pEt3sNsH1rTkQG0BCRNXfiUOAzH+ex
+						xNtyj6M3Rj2Jb7wUo/Dk9IJaEKrRWYRczFa4UoTLBfuh98T+ii3+nx9143zXz3fu
+						dUKSOm2VBGQx9BfucN55C90uBg3FzdaSgh3DUErnuVOtaR2ORKCgW8VanjkzrWv0
+						/mtdhNycFh9ECBy/Emgyw5zG2fxyEL3KftNJxogBDcEC6dU3PZPFo1p+TTIjOZa1
+						c0Z0cvzLeTqDJsYi07CWMotobZ5XMmM+T2oS3adB8hXb4DVLAgMBAAGjezB5MAkG
+						A1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRp
+						ZmljYXRlMB0GA1UdDgQWBBT2YT5wLzaLNBPtBUgm1xylI03WXDAfBgNVHSMEGDAW
+						gBT2YT5wLzaLNBPtBUgm1xylI03WXDANBgkqhkiG9w0BAQUFAAOCAQEAJIYNiO5b
+						Yzb3dZ2PqL3WdhMTg3vHXTBVKKnSegNwd/huTybPzs6oqNIxgDqsxT6/p5WZVz/f
+						6MT3bvUnGoy70gNVaSjHZg01QXKCzbEi1C/hcMO1cMdYVYZYAiQeFv7+4HuChkC6
+						ZIkwMmoSeX/Q13G3ZOltY+xV81E7Afc3+MTeowDYayfRHTpp4SHqRe098k/XJ6w9
+						3PMjGO33JAAAaNAJzsmzrtb86q5d9O4r4Y45vRypyBfu6Mr8TbufXsxUEKcdFaRv
+						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>
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
new file mode 100644
index 00000000..e8504b04
--- /dev/null
+++ b/swamid-interfederations-2.0/lamlash.edina.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-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-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>
+      <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>
+						MIIDODCCAiCgAwIBAgIVAKvJ0PaKlvVefbTn1IBkeTbOYlJ+MA0GCSqGSIb3DQEB
+						BQUAMB4xHDAaBgNVBAMTE2xhbWxhc2guZWRpbmEuYWMudWswHhcNMTQwNDIxMTA1
+						MjUyWhcNMzQwNDIxMTA1MjUyWjAeMRwwGgYDVQQDExNsYW1sYXNoLmVkaW5hLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmbX35g2GJCus1uPx
+						/L6rbG7I7H1dItoif7TIgRBoSADOXfTYS2aPGTs8SBmBzbinLIKTz1caA1wftCjO
+						o3seUptoMqdH9yrCdik96FzvxtaPjH5EY/dy7PuuHeTbTtYSpekM7OBrgadsDTzn
+						paW3wt+C/Sea3vvn6N4QSud/iv4/m53K338ALMONvRoyZvlx1F7APuC9Rw35ieES
+						3kIVrFBmfgMZkBqvHkeJEmS+zanEppqKFN/Oj5qVn8aiy9ZpjLjXQ37m15/QQDbq
+						isflNTYdHrdMlMeR4HWHXVhDb3ww66V7dIDKPwG7XzKeJiz2bKhejOECcEqpRZlU
+						dIY+gQIDAQABo20wazBKBgNVHREEQzBBghNsYW1sYXNoLmVkaW5hLmFjLnVrhipo
+						dHRwczovL2xhbWxhc2guZWRpbmEuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
+						BBYEFMeJ4HF17TJSXkZeWX/+yMLzCXNZMA0GCSqGSIb3DQEBBQUAA4IBAQAJIFrN
+						16nAtc4JrwqWXt0U0JVWc/68lGLcByu00uX4LNLzisvuhczutiIMaN1tD32YC4To
+						S4YkaJnCTnMhJCZCjcya5od8vKwa4RswGrzIzUwRvPTqIHYJQOdmsuzvYDDI65U8
+						tekHNhquu7nIzAAAjgtQFV07fcFVJ7JMI2FN4Xjp8qS43o/VsGC0LogiTVeRl57h
+						/Y7F/55wgk3R+DJx8utj3xG4fk+RzJLeWxjjrs885E/BZ/vn2FLIur2+rSa8rxB+
+						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>
+						MIIDODCCAiCgAwIBAgIVAKvJ0PaKlvVefbTn1IBkeTbOYlJ+MA0GCSqGSIb3DQEB
+						BQUAMB4xHDAaBgNVBAMTE2xhbWxhc2guZWRpbmEuYWMudWswHhcNMTQwNDIxMTA1
+						MjUyWhcNMzQwNDIxMTA1MjUyWjAeMRwwGgYDVQQDExNsYW1sYXNoLmVkaW5hLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmbX35g2GJCus1uPx
+						/L6rbG7I7H1dItoif7TIgRBoSADOXfTYS2aPGTs8SBmBzbinLIKTz1caA1wftCjO
+						o3seUptoMqdH9yrCdik96FzvxtaPjH5EY/dy7PuuHeTbTtYSpekM7OBrgadsDTzn
+						paW3wt+C/Sea3vvn6N4QSud/iv4/m53K338ALMONvRoyZvlx1F7APuC9Rw35ieES
+						3kIVrFBmfgMZkBqvHkeJEmS+zanEppqKFN/Oj5qVn8aiy9ZpjLjXQ37m15/QQDbq
+						isflNTYdHrdMlMeR4HWHXVhDb3ww66V7dIDKPwG7XzKeJiz2bKhejOECcEqpRZlU
+						dIY+gQIDAQABo20wazBKBgNVHREEQzBBghNsYW1sYXNoLmVkaW5hLmFjLnVrhipo
+						dHRwczovL2xhbWxhc2guZWRpbmEuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
+						BBYEFMeJ4HF17TJSXkZeWX/+yMLzCXNZMA0GCSqGSIb3DQEBBQUAA4IBAQAJIFrN
+						16nAtc4JrwqWXt0U0JVWc/68lGLcByu00uX4LNLzisvuhczutiIMaN1tD32YC4To
+						S4YkaJnCTnMhJCZCjcya5od8vKwa4RswGrzIzUwRvPTqIHYJQOdmsuzvYDDI65U8
+						tekHNhquu7nIzAAAjgtQFV07fcFVJ7JMI2FN4Xjp8qS43o/VsGC0LogiTVeRl57h
+						/Y7F/55wgk3R+DJx8utj3xG4fk+RzJLeWxjjrs885E/BZ/vn2FLIur2+rSa8rxB+
+						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>
diff --git a/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml b/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml
new file mode 100644
index 00000000..92280e24
--- /dev/null
+++ b/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?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>
+      <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>
+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>
+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>
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
new file mode 100644
index 00000000..aad262ac
--- /dev/null
+++ b/swamid-interfederations-2.0/lc-idp.lincolncollege.ac.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						bGVnZS5hYy51azAeFw0xMjA3MjMwOTE3NTVaFw0zMjA3MTgwOTE3NTVaMHYxCzAJ
+						BgNVBAYTAkdCMRUwEwYDVQQIEwxMaW5jb2xuc2hpcmUxEDAOBgNVBAcTB0xpbmNv
+						bG4xGDAWBgNVBAoTD0xpbmNvbG4gQ29sbGVnZTEkMCIGA1UEAxMbbGMtaWRwLmxp
+						bmNvbG5jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAuHXeFxNwSynRVryyHfnvoz3yjpFR7OWEGJxkoJLeIHtFx1TLEyU5sW472CSw
+						ntzE7L2JdkblesYNlq7Wb7JoCs3og71B7wYJywd2yCxiDST7Pnxyjy9A1cwo7yeN
+						BxPP21b5UcNvd1KtFGe3CGOWhgWa0ai4Z3DA/pkOwmy42GmSrC3Z/U5pviUAaBOp
+						kidvrj6VnaV58qBcVgnqCRauWqr3M0jqSqwDzGQ5iCjfG4Bm/19dHsyQgQ8cXPJs
+						E+lviBx6UHpAMZqcu0RXl/Y5tvY3+MDpC9vLQKjoGkZH0PToO2mYakLDDgboK64C
+						vaQtg+qydns+za80qF4hLDEwrwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBTnrK6
+						5J0QLLwWgAre26KAspklobXnnNcKR1VySi6N5SgvHVmLBSRtvODgdrf0gr/vilvG
+						KXF3TBYnRMMfm61zPVFf1qfzmS7JTseVeO0jEH/vEgK46snDSinmyJSeTiWyNDsi
+						GwNh2Z+HS5CtvtBiGucmHx17liMvdyICIGTeTvfF4tSK0yb0lJYJdYOTSPHy3tp6
+						RQFsfuy0eglvAwYrJ1wHg3wQFXVkiYunGf1Mp3LOpY+lBmMlHEaRbomidxLXk1qv
+						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>
+						MIIDaDCCAlACCQD46bmBVwfiXDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
+						QjEVMBMGA1UECBMMTGluY29sbnNoaXJlMRAwDgYDVQQHEwdMaW5jb2xuMRgwFgYD
+						VQQKEw9MaW5jb2xuIENvbGxlZ2UxJDAiBgNVBAMTG2xjLWlkcC5saW5jb2xuY29s
+						bGVnZS5hYy51azAeFw0xMjA3MjMwOTE3NTVaFw0zMjA3MTgwOTE3NTVaMHYxCzAJ
+						BgNVBAYTAkdCMRUwEwYDVQQIEwxMaW5jb2xuc2hpcmUxEDAOBgNVBAcTB0xpbmNv
+						bG4xGDAWBgNVBAoTD0xpbmNvbG4gQ29sbGVnZTEkMCIGA1UEAxMbbGMtaWRwLmxp
+						bmNvbG5jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAuHXeFxNwSynRVryyHfnvoz3yjpFR7OWEGJxkoJLeIHtFx1TLEyU5sW472CSw
+						ntzE7L2JdkblesYNlq7Wb7JoCs3og71B7wYJywd2yCxiDST7Pnxyjy9A1cwo7yeN
+						BxPP21b5UcNvd1KtFGe3CGOWhgWa0ai4Z3DA/pkOwmy42GmSrC3Z/U5pviUAaBOp
+						kidvrj6VnaV58qBcVgnqCRauWqr3M0jqSqwDzGQ5iCjfG4Bm/19dHsyQgQ8cXPJs
+						E+lviBx6UHpAMZqcu0RXl/Y5tvY3+MDpC9vLQKjoGkZH0PToO2mYakLDDgboK64C
+						vaQtg+qydns+za80qF4hLDEwrwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBTnrK6
+						5J0QLLwWgAre26KAspklobXnnNcKR1VySi6N5SgvHVmLBSRtvODgdrf0gr/vilvG
+						KXF3TBYnRMMfm61zPVFf1qfzmS7JTseVeO0jEH/vEgK46snDSinmyJSeTiWyNDsi
+						GwNh2Z+HS5CtvtBiGucmHx17liMvdyICIGTeTvfF4tSK0yb0lJYJdYOTSPHy3tp6
+						RQFsfuy0eglvAwYrJ1wHg3wQFXVkiYunGf1Mp3LOpY+lBmMlHEaRbomidxLXk1qv
+						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>
diff --git a/swamid-interfederations-2.0/lcm.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/lcm.idm.oclc.org-shibboleth.xml
new file mode 100644
index 00000000..c0103749
--- /dev/null
+++ b/swamid-interfederations-2.0/lcm.idm.oclc.org-shibboleth.xml
@@ -0,0 +1,57 @@
+<?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>
+						MIID+DCCAuCgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBgMRswGQYDVQQDFBIqLmxj
+						bS5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xDMSUwIwYJ
+						KoZIhvcNAQkBFhZqdWxpYW4ubWNmYWxsQG9jbGMub3JnMB4XDTEzMTAxODE2MDMw
+						OFoXDTIzMTAxODE2MDMwOFowYDEbMBkGA1UEAxQSKi5sY20uaWRtLm9jbGMub3Jn
+						MQswCQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzElMCMGCSqGSIb3DQEJARYWanVs
+						aWFuLm1jZmFsbEBvY2xjLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBALXw8P+ELg/oOkOBKaQEW84oW+Kp043lngkY/hZledNtKgLP37IYa3Ml/K5T
+						+sehBTRFrXeR/MzYM1dbsvzl92ty0f5yF1q97QAEK9BbKF2vCIItuteFw/Fe6/7Q
+						ApGDrC842s/EexAQPFuOn5o5G/F6kRghWiOk0U/tkdO0muilulCNA3O/5A1HYWnb
+						QwwDdrS/EOHM8y1DM1bn+66WZgdQaXuAn5RSQFm0KLj+v/fq6MlU34Zueg3YUAwV
+						o0U22FvtARo2Mc4kbfekM9dZQF22chbVSRh2DMrE8ySF96IMeW2gcwsK150D9uNR
+						CiIhxdaEXus73yNKjGgtAr8ww9ECAwEAAaOBvDCBuTAdBgNVHQ4EFgQUDoMxYApE
+						qa3KQU0dQ8E0V4c0C14wgYkGA1UdIwSBgTB/gBQOgzFgCkSprcpBTR1DwTRXhzQL
+						XqFkpGIwYDEbMBkGA1UEAxQSKi5sY20uaWRtLm9jbGMub3JnMQswCQYDVQQGEwJV
+						SzENMAsGA1UEChMET0NMQzElMCMGCSqGSIb3DQEJARYWanVsaWFuLm1jZmFsbEBv
+						Y2xjLm9yZ4IBAzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCaSvOu
+						ZiZdvyHNxoVgF9k34mfDKLanrgxcr2jf2Y4B4i/6hrL7jHDZyfh8RoZW4G0pX3Zo
+						CKJob6cqxEIzws+yRcVdjpseSrmZ4iRMdBxFuFLlrvV7f1OTpkOZGNg7vW+vWKsp
+						J7LF3OeilOJJkWrvYEHhJw0gHzLB69Td6A2JmlDm0x8M1OrJ16u942azdVIfiH8U
+						tu7Gx1GoWXiIjQU5JRhcXnxLhaWk8RCK8DnS+uxTD9Gi2auCgUwe/M1GPF5XQ2Co
+						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>
diff --git a/swamid-interfederations-2.0/lcmshibboleth.lcm.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/lcmshibboleth.lcm.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..24b019ce
--- /dev/null
+++ b/swamid-interfederations-2.0/lcmshibboleth.lcm.ac.uk-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						ZXRoLmxjbS5hYy51azAeFw0xNDA3MjQwODU3MDFaFw0zNDA3MTkwODU3MDFaMHkx
+						CzAJBgNVBAYTAkdCMRcwFQYDVQQIEw5XZXN0IFlvcmtzaGlyZTEOMAwGA1UEBxMF
+						TGVlZHMxHzAdBgNVBAoTFkxlZWRzIENvbGxlZ2Ugb2YgTXVzaWMxIDAeBgNVBAMT
+						F2xjbXNoaWJib2xldGgubGNtLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEApG4Esv3AxTUvvzukB4IfpYjGoaoxV9l97/vcdiR/9yOZFm1V1rcv
+						T96COV3X5pHyGX8di+R6FtVO2mHgOa1EJuqzS1SoI1z6Yz6q7hkLCFIM70DB0hvB
+						Du/a5GIFI/5BEqObekmVBD+8DkcaIKD7LfnzdtPOGc10dm4pPciT5ovf5t6zo1L7
+						Bk8OgjPKqE0NKJ8OQII3tpEZXe3EoS1axvDD4mnoP3ysqal7Yi0NlbwPOW3UNZRk
+						qgBg6preVFv5gOW8NewdBX6ko1oZGxss3ht769PKv48KMKsT7DDb6UFl3BFvlqAZ
+						ugGMA45B03xlXm40CjOAsfwsavrI/yOl+wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+						AQA2X+hPxLp7q5Pgv60O6A41PVWwqfAHcyb4wrndH4S9W9Dy7hCIQOZDHsYpmw6u
+						LcnbDBhZGGKWImvN0+g0PJMcvQirsCmvgIIO4/7MI7+/w1GadLwjgDyY6BvtocNv
+						FB0fIVmHXBE9NZLCorWDGKZUqUFrvB5zN/as0JdZEmFLtX9iVKqsqBwHc8tBUhr8
+						i/FmVnrfJragfycVs2oi5jXygB4KPhLtZc0m5/DAbE9KJP2G1VPKAFT/44NZ2bGQ
+						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>
+						MIIDbjCCAlYCCQDlpTunux/L3jANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJH
+						QjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxDjAMBgNVBAcTBUxlZWRzMR8wHQYD
+						VQQKExZMZWVkcyBDb2xsZWdlIG9mIE11c2ljMSAwHgYDVQQDExdsY21zaGliYm9s
+						ZXRoLmxjbS5hYy51azAeFw0xNDA3MjQwODU3MDFaFw0zNDA3MTkwODU3MDFaMHkx
+						CzAJBgNVBAYTAkdCMRcwFQYDVQQIEw5XZXN0IFlvcmtzaGlyZTEOMAwGA1UEBxMF
+						TGVlZHMxHzAdBgNVBAoTFkxlZWRzIENvbGxlZ2Ugb2YgTXVzaWMxIDAeBgNVBAMT
+						F2xjbXNoaWJib2xldGgubGNtLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEApG4Esv3AxTUvvzukB4IfpYjGoaoxV9l97/vcdiR/9yOZFm1V1rcv
+						T96COV3X5pHyGX8di+R6FtVO2mHgOa1EJuqzS1SoI1z6Yz6q7hkLCFIM70DB0hvB
+						Du/a5GIFI/5BEqObekmVBD+8DkcaIKD7LfnzdtPOGc10dm4pPciT5ovf5t6zo1L7
+						Bk8OgjPKqE0NKJ8OQII3tpEZXe3EoS1axvDD4mnoP3ysqal7Yi0NlbwPOW3UNZRk
+						qgBg6preVFv5gOW8NewdBX6ko1oZGxss3ht769PKv48KMKsT7DDb6UFl3BFvlqAZ
+						ugGMA45B03xlXm40CjOAsfwsavrI/yOl+wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+						AQA2X+hPxLp7q5Pgv60O6A41PVWwqfAHcyb4wrndH4S9W9Dy7hCIQOZDHsYpmw6u
+						LcnbDBhZGGKWImvN0+g0PJMcvQirsCmvgIIO4/7MI7+/w1GadLwjgDyY6BvtocNv
+						FB0fIVmHXBE9NZLCorWDGKZUqUFrvB5zN/as0JdZEmFLtX9iVKqsqBwHc8tBUhr8
+						i/FmVnrfJragfycVs2oi5jXygB4KPhLtZc0m5/DAbE9KJP2G1VPKAFT/44NZ2bGQ
+						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>
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
new file mode 100644
index 00000000..c99abd03
--- /dev/null
+++ b/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de-idp-shibboleth.xml
@@ -0,0 +1,139 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMjAxMTIx
+MzMxMzFaFw0xNzAxMTAxMzMxMzFaMHsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdN
+YXgtUGxhbmNrLUdlc2VsbHNjaGFmdDElMCMGA1UECxMcUmVjaGVuemVudHJ1bSBH
+YXJjaGluZyAoUlpHKTEjMCEGA1UEAxMabGRhcC1kYXJpYWguZXNjLnJ6Zy5tcGcu
+ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbyc9BVBglxQEt8MmI
+cbf3GKqCdQADGnnNXAwx9gjq5mQI2+VNGcBk8aq24p5a++hlemue+6P6RQONiv5z
+sAXlIZb6MuGOcF6gOUqRijMuWW1OueysiO4F5ODOJ8TaGSjWytCSQ28cpJbc7wWo
+mnlZxL6NvVyRiDCJuUfDyIW8ICgk7Aw1K0UdpJXeVzFUiBtTIM7Ira80o3yeLDhi
+DDPc+swDZA9syWvn8/W57kN0/vtUYKzGs6Ae+uRxahSfNg/kx1Rnv0sUln1hgUHh
+VuiKqu1MlAIcckNt00Ck/v7LQV98KJJx+rWWPV1F09a6vPEAesEY+GnJQkwAzh/O
+xiTjAgMBAAGjggG0MIIBsDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
+FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFEnnIPu9e2M7ABKF66CA
+uTWv1Jf8MB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMCkGA1UdEQQi
+MCCBHnNlcnZlci1jZXJ0aWZpY2F0ZXNAcnpnLm1wZy5kZTB3BgNVHR8EcDBuMDWg
+M6Axhi9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA1oDOgMYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2Ny
+bC9jYWNybC5jcmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+PwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAxDSpJ7Mn2hmiyDzK
+VVtARi1U9EvfTcSIWZFanc1xn9DaFI8s3c6vnEB7+BL/HMbAwnDauWjUPoNzc5I2
+TeH5IjX8MGDjEh7TyNyycWRNJ88ah0LtQoaCgXc0vpTtXZzGelh0A25Hw80sHKa1
+xY4iDAPYwaPY+kFxxAGyeAL9M4q9Z39t6ZIoze+lQm0sxQ3eTvQUPwukAeI9xOzb
+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
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMjAxMTIx
+MzMxMzFaFw0xNzAxMTAxMzMxMzFaMHsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdN
+YXgtUGxhbmNrLUdlc2VsbHNjaGFmdDElMCMGA1UECxMcUmVjaGVuemVudHJ1bSBH
+YXJjaGluZyAoUlpHKTEjMCEGA1UEAxMabGRhcC1kYXJpYWguZXNjLnJ6Zy5tcGcu
+ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbyc9BVBglxQEt8MmI
+cbf3GKqCdQADGnnNXAwx9gjq5mQI2+VNGcBk8aq24p5a++hlemue+6P6RQONiv5z
+sAXlIZb6MuGOcF6gOUqRijMuWW1OueysiO4F5ODOJ8TaGSjWytCSQ28cpJbc7wWo
+mnlZxL6NvVyRiDCJuUfDyIW8ICgk7Aw1K0UdpJXeVzFUiBtTIM7Ira80o3yeLDhi
+DDPc+swDZA9syWvn8/W57kN0/vtUYKzGs6Ae+uRxahSfNg/kx1Rnv0sUln1hgUHh
+VuiKqu1MlAIcckNt00Ck/v7LQV98KJJx+rWWPV1F09a6vPEAesEY+GnJQkwAzh/O
+xiTjAgMBAAGjggG0MIIBsDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
+FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFEnnIPu9e2M7ABKF66CA
+uTWv1Jf8MB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMCkGA1UdEQQi
+MCCBHnNlcnZlci1jZXJ0aWZpY2F0ZXNAcnpnLm1wZy5kZTB3BgNVHR8EcDBuMDWg
+M6Axhi9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA1oDOgMYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2Ny
+bC9jYWNybC5jcmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+PwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAxDSpJ7Mn2hmiyDzK
+VVtARi1U9EvfTcSIWZFanc1xn9DaFI8s3c6vnEB7+BL/HMbAwnDauWjUPoNzc5I2
+TeH5IjX8MGDjEh7TyNyycWRNJ88ah0LtQoaCgXc0vpTtXZzGelh0A25Hw80sHKa1
+xY4iDAPYwaPY+kFxxAGyeAL9M4q9Z39t6ZIoze+lQm0sxQ3eTvQUPwukAeI9xOzb
+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>
diff --git a/swamid-interfederations-2.0/ldf.data.kit.edu-sp.xml b/swamid-interfederations-2.0/ldf.data.kit.edu-sp.xml
new file mode 100644
index 00000000..81db5107
--- /dev/null
+++ b/swamid-interfederations-2.0/ldf.data.kit.edu-sp.xml
@@ -0,0 +1,76 @@
+<?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>
+      <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
+BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
+bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
+Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
+A1UEAxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTE0MTIx
+ODA5MDcxN1oXDTE3MTIxNzA5MDcxN1owgYUxCzAJBgNVBAYTAkRFMRswGQYDVQQI
+ExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UE
+ChMhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRkwFwYDVQQDExBs
+ZGYuZGF0YS5raXQuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+w4Tlx9PXJ4wmH1qouc6BYZ7yj0k6Y63omGZt84db2VTEaBxZUb+1lZzzCxE3KS5t
+pmpky6uVRuxbaxc3nDef+IGRKy0gzrQLilFYWXkPNOp4KZ6lMPg9L1ezLIrZTIqh
+nR7px/HK7ZRYnKG9B6ljmwQYrK/phYMX5eJCItsHO9TToBpyn4v6MXCA/7lzbEFz
+mKxH1qDrV0K7gTavryYWR6N5100mlQK5n6Mz3HWIXpcX8708JGrkGH6AQO01/4RZ
++vdjoz/J0Zhwn34+jTC4+yBMNDhvIVLtxZyUtij+CCpu74pvGokqKBB8NP9M6WFA
+zjwiV2Eh/EKI+iXAzT7WLwIDAQABo4ICIjCCAh4wTwYDVR0gBEgwRjARBg8rBgEE
+AYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQw
+DQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAww
+CgYIKwYBBQUHAwEwHQYDVR0OBBYEFHoFMKXIzPiHG76LnfVqmEJ7SJ1EMB8GA1Ud
+IwQYMBaAFB90ZfSaHXr2MenfYRtzKw1t0DNJMBsGA1UdEQQUMBKCEGxkZi5kYXRh
+LmtpdC5lZHUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS9raXQtY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBj
+YS5kZm4uZGUva2l0LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHHBggrBgEFBQcBAQSB
+ujCBtzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNl
+cnZlci9PQ1NQMD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2tp
+dC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPwYIKwYBBQUHMAKGM2h0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkq
+hkiG9w0BAQsFAAOCAQEAjA1MbhMpdWsD9SUJ9uULTf+rbnsk6iBEFk+Soucq9szt
+i/KF4bq3qlK9nkuYbEZqrPR0dI0PuEgMIyLQgJrKiKp/NCkeg1FlW3tPgF4Kg4SQ
+Ige0yNKN093nxdVvRoiHpitpOHaue100CBjYBBN9loCpmTTYhnrX2x1r5IU02VXj
+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: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: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
new file mode 100644
index 00000000..dc42d8ef
--- /dev/null
+++ b/swamid-interfederations-2.0/ldp.esc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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
+						MDIxNTE1MDgyNloXDTMzMDIxMDE1MDgyNlowZjELMAkGA1UEBhMCR0IxDzANBgNV
+						BAgTBlN1cnJleTEQMA4GA1UEBxMHUmVkaGlsbDEcMBoGA1UEChMTRWFzdCBTdXJy
+						ZXkgQ29sbGVnZTEWMBQGA1UEAxMNbGRwLmVzYy5hYy51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBAN4077Zl1Y8VXd7nsyZ2Y1yP+5iYqzjbBfy35BSI
+						bTdcPSuiPuYdlIij+ThG2KGSjxSJ+ErmKSqHzjF+IXfwoe4sjcESY1VGtn0Gu/ym
+						wyynWCnq5+ClJ+6SAT6EUzF9m5E6kT4nj2XZn7tLrW9PvT3IJpqNfzhruzzUwhqa
+						tahM/bg27nPtXzhdjVKiYcwDEtDggSlT2gxbI2ZCtwtCjlAavHE8uBWHJPwVSCBT
+						iLb20qdLR/hWGnBR9Dg20y8M3Yxl/rrTsllQTPqp1V+A1K7xRSauFsed3tkth0KQ
+						wPzI04I6Cdp3R33h/0y/OG2yJGBgX0NuvfSuc8L/nJ1d7+8CAwEAATANBgkqhkiG
+						9w0BAQUFAAOCAQEAEYSEGne2kBrM0Nq2GbquH/XbjwFpMS6dLHChZyRmNNL18XVb
+						vrjkBvHxMYTtHJhXdM9odkb08pxFIToG/V0nd3zy7MUZFnZQ6RAyaVTXll9DCMFc
+						Pp4ufilnrQMlW3OqR/MsKHZx0xAMWMDyMbPp9OrDxVj0V62p7XvlNfk1fDDNnoQN
+						Rgd0Lv896JOa398XcorCNltyF5C47lvpS1iJPiMCq58ZOV9/wpYzf2yA3EctFgPz
+						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>
+						MIIDSDCCAjACCQCbDs0NVoukPTANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
+						QjEPMA0GA1UECBMGU3VycmV5MRAwDgYDVQQHEwdSZWRoaWxsMRwwGgYDVQQKExNF
+						YXN0IFN1cnJleSBDb2xsZWdlMRYwFAYDVQQDEw1sZHAuZXNjLmFjLnVrMB4XDTEz
+						MDIxNTE1MDgyNloXDTMzMDIxMDE1MDgyNlowZjELMAkGA1UEBhMCR0IxDzANBgNV
+						BAgTBlN1cnJleTEQMA4GA1UEBxMHUmVkaGlsbDEcMBoGA1UEChMTRWFzdCBTdXJy
+						ZXkgQ29sbGVnZTEWMBQGA1UEAxMNbGRwLmVzYy5hYy51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBAN4077Zl1Y8VXd7nsyZ2Y1yP+5iYqzjbBfy35BSI
+						bTdcPSuiPuYdlIij+ThG2KGSjxSJ+ErmKSqHzjF+IXfwoe4sjcESY1VGtn0Gu/ym
+						wyynWCnq5+ClJ+6SAT6EUzF9m5E6kT4nj2XZn7tLrW9PvT3IJpqNfzhruzzUwhqa
+						tahM/bg27nPtXzhdjVKiYcwDEtDggSlT2gxbI2ZCtwtCjlAavHE8uBWHJPwVSCBT
+						iLb20qdLR/hWGnBR9Dg20y8M3Yxl/rrTsllQTPqp1V+A1K7xRSauFsed3tkth0KQ
+						wPzI04I6Cdp3R33h/0y/OG2yJGBgX0NuvfSuc8L/nJ1d7+8CAwEAATANBgkqhkiG
+						9w0BAQUFAAOCAQEAEYSEGne2kBrM0Nq2GbquH/XbjwFpMS6dLHChZyRmNNL18XVb
+						vrjkBvHxMYTtHJhXdM9odkb08pxFIToG/V0nd3zy7MUZFnZQ6RAyaVTXll9DCMFc
+						Pp4ufilnrQMlW3OqR/MsKHZx0xAMWMDyMbPp9OrDxVj0V62p7XvlNfk1fDDNnoQN
+						Rgd0Lv896JOa398XcorCNltyF5C47lvpS1iJPiMCq58ZOV9/wpYzf2yA3EctFgPz
+						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>
diff --git a/swamid-interfederations-2.0/leeds.wadham.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/leeds.wadham.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c0776c6c
--- /dev/null
+++ b/swamid-interfederations-2.0/leeds.wadham.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,81 @@
+<?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://leeds.wadham.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="2013-09-04T14:59: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://leeds.wadham.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>
+						MIIDBjCCAe6gAwIBAgIJALdAFtXAAI1PMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWxlZWRzLndhZGhhbS5veC5hYy51azAeFw0xMzA5MDQxMDIwNTBaFw0yMzA5
+						MDIxMDIwNTBaMCAxHjAcBgNVBAMTFWxlZWRzLndhZGhhbS5veC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcYhEqzgTzrAvZbgM5mFhntNkh7
+						gEh1HCO3ryI/YihGdH8ZblvfyuZU1mgaogarprLdOK0snmWos8DaX2yjFnh7Wtou
+						UjT0OWVzj9KeVUbWZzLMmTBYe89fdS6LVb8zMhW0/axUGzHnnc5cnlLqJqT+K/AA
+						2Gs0Etkn+SZRiKmevQ7O0oRBrz/Pmm5trvGnb709n751lPOmf/S0acJy2EbKch9b
+						fPGffhRLhQMuZ3fir5+Q6uWeQbfqrELFJjSFeo4HKKoETZNnECZCjtLfDirtfaE+
+						2p4vWnOAMQC5/veZ+zSJur3nMCpeNNTHgXriwbuwh5fUF1t544laEQdQTKMCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVbGVlZHMud2FkaGFtLm94LmFjLnVrMB0GA1UdDgQW
+						BBRcBV5eDW2Ctx+PdpiRbP/kukLo0jANBgkqhkiG9w0BAQUFAAOCAQEAwhOZbxZI
+						Z7AFmVFFVXZJ7ad9NOl0/QnSXyTgwhoPDx87MCNGkmKVy8s7wQqJ+YlJDMveVWgF
+						+youH53RrrEbXoNpDMfNchapK4Wek9jf85DxYZyGzJGngzG3LBhhEc/SVUoGr6vo
+						Rm6rMPmFL1ALyLXGZqRLsSDhdFAwuYhSMGKcQm/YIVDEu4dqmeQm7QIoM6dgzj2G
+						/z+frfonKNwjPK3btmrQsxsL8EcBcct9xXv2wdOL7opOcKewckJjt/JvA6LcMeNq
+						abMDiWvBUb2X096WTJgy3KGVjlDLOAYi2b7DnBiNdqK6aKsYxIYawphCfA4BRGeW
+						/7J4oftolmp18g==
+					</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://leeds.wadham.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds.wadham.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://leeds.wadham.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://leeds.wadham.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://leeds.wadham.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, Wadham College NAC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wadham.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Wootton</md:SurName>
+    <md:EmailAddress>mailto:itmanager@wadh.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Wootton</md:SurName>
+    <md:EmailAddress>mailto:itmanager@wadh.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..4828e840
--- /dev/null
+++ b/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://leedstrinity.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"/>
+  </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">leedstrinity.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID0DCCArigAwIBAgIJAIjk4Kwl/h8pMA0GCSqGSIb3DQEBBQUAME4xKTAnBgNV
+						BAoTIExlZWRzIFRyaW5pdHkgVW5pdmVyc2l0eSBDb2xsZWdlMSEwHwYDVQQDExhs
+						YWlkcC5sZWVkc3RyaW5pdHkuYWMudWswHhcNMTEwNzExMTUyMzUzWhcNMjEwNzA4
+						MTUyMzUzWjBOMSkwJwYDVQQKEyBMZWVkcyBUcmluaXR5IFVuaXZlcnNpdHkgQ29s
+						bGVnZTEhMB8GA1UEAxMYbGFpZHAubGVlZHN0cmluaXR5LmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw/9bLwTP7SZutO6X+sUMG7pv4yPNmLGO
+						thWm0PORm0ENtopolxC13bfCnMWLEzD01MkWLHLp3H1Mf9N+nMj7kJPbR+92180p
+						fQlXz7PSviGwjNChbVDJvRzC+z/qDf3skRo5qNSqmXpQzfHC3OG5jXb6pa/lDQzm
+						4iY6a13yCiSd1QlcT/4EzLpmgoyCnP0N0jw0EDmKtfQWtkyFsbAsJ8Gx65ykG7gY
+						kaYV/oyGNOhdYaxe02zcgGUZxxHCiSo3w9TV83wWFTufSdwMMoub3XHvC9kDfE/F
+						u9fz01ClQomVzuHY0m6KdCZA1iKY4/GT1d7mHgJOSLmLIzriFtFTPwIDAQABo4Gw
+						MIGtMB0GA1UdDgQWBBTGNjTJ1OSofwGC0/s7BsBo6eOOIDB+BgNVHSMEdzB1gBTG
+						NjTJ1OSofwGC0/s7BsBo6eOOIKFSpFAwTjEpMCcGA1UEChMgTGVlZHMgVHJpbml0
+						eSBVbml2ZXJzaXR5IENvbGxlZ2UxITAfBgNVBAMTGGxhaWRwLmxlZWRzdHJpbml0
+						eS5hYy51a4IJAIjk4Kwl/h8pMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAJtt39tCDzI46L55zb4hzRqWPio8/gmoW5oOhParyPu/VWrIHOeIbNxyKoBk
+						agUiOIYx5KoPgZxpMXDD0WiKaSYbes6EA0YoCX4U9WuZsBD+sexlbeIlLQM9axip
+						TomO9q/cQI97n3J7Bk/iR87guOU2fYEKwgg95PODcOguCAjqzRr+JtmGRU5JJ9RT
+						+wIvRjQcfi7iHgTfaRIWrdIUqGI565IW+zaL4dJjduR2tOkHmmMQM7XLiKy+1RV6
+						hiTw6O9ZgAbb1k6UlXJ58qZgeqwBEzDd9AvQRKIIsk7MD/7u7AiaLkpSD/FIKa3n
+						BDeKbG3KsdzVqHjcQxeUmsCbRe0=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID0DCCArigAwIBAgIJAIjk4Kwl/h8pMA0GCSqGSIb3DQEBBQUAME4xKTAnBgNV
+						BAoTIExlZWRzIFRyaW5pdHkgVW5pdmVyc2l0eSBDb2xsZWdlMSEwHwYDVQQDExhs
+						YWlkcC5sZWVkc3RyaW5pdHkuYWMudWswHhcNMTEwNzExMTUyMzUzWhcNMjEwNzA4
+						MTUyMzUzWjBOMSkwJwYDVQQKEyBMZWVkcyBUcmluaXR5IFVuaXZlcnNpdHkgQ29s
+						bGVnZTEhMB8GA1UEAxMYbGFpZHAubGVlZHN0cmluaXR5LmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw/9bLwTP7SZutO6X+sUMG7pv4yPNmLGO
+						thWm0PORm0ENtopolxC13bfCnMWLEzD01MkWLHLp3H1Mf9N+nMj7kJPbR+92180p
+						fQlXz7PSviGwjNChbVDJvRzC+z/qDf3skRo5qNSqmXpQzfHC3OG5jXb6pa/lDQzm
+						4iY6a13yCiSd1QlcT/4EzLpmgoyCnP0N0jw0EDmKtfQWtkyFsbAsJ8Gx65ykG7gY
+						kaYV/oyGNOhdYaxe02zcgGUZxxHCiSo3w9TV83wWFTufSdwMMoub3XHvC9kDfE/F
+						u9fz01ClQomVzuHY0m6KdCZA1iKY4/GT1d7mHgJOSLmLIzriFtFTPwIDAQABo4Gw
+						MIGtMB0GA1UdDgQWBBTGNjTJ1OSofwGC0/s7BsBo6eOOIDB+BgNVHSMEdzB1gBTG
+						NjTJ1OSofwGC0/s7BsBo6eOOIKFSpFAwTjEpMCcGA1UEChMgTGVlZHMgVHJpbml0
+						eSBVbml2ZXJzaXR5IENvbGxlZ2UxITAfBgNVBAMTGGxhaWRwLmxlZWRzdHJpbml0
+						eS5hYy51a4IJAIjk4Kwl/h8pMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAJtt39tCDzI46L55zb4hzRqWPio8/gmoW5oOhParyPu/VWrIHOeIbNxyKoBk
+						agUiOIYx5KoPgZxpMXDD0WiKaSYbes6EA0YoCX4U9WuZsBD+sexlbeIlLQM9axip
+						TomO9q/cQI97n3J7Bk/iR87guOU2fYEKwgg95PODcOguCAjqzRr+JtmGRU5JJ9RT
+						+wIvRjQcfi7iHgTfaRIWrdIUqGI565IW+zaL4dJjduR2tOkHmmMQM7XLiKy+1RV6
+						hiTw6O9ZgAbb1k6UlXJ58qZgeqwBEzDd9AvQRKIIsk7MD/7u7AiaLkpSD/FIKa3n
+						BDeKbG3KsdzVqHjcQxeUmsCbRe0=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://laidp.leedstrinity.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laidp.leedstrinity.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Leeds Trinity University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Leeds Trinity University OALA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.leedstrinity.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:Helpdesk@leedstrinity.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ryan</md:GivenName>
+    <md:SurName>Dolan</md:SurName>
+    <md:EmailAddress>mailto:R.Dolan@leedstrinity.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeremy</md:GivenName>
+    <md:SurName>Grayson</md:SurName>
+    <md:EmailAddress>mailto:J.Grayson@leedstrinity.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
new file mode 100644
index 00000000..d16f1d2b
--- /dev/null
+++ b/swamid-interfederations-2.0/library.qub.ac.uk-shibboleth-metadata.xml
@@ -0,0 +1,83 @@
+<?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>
+      <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>
+						MIIC2TCCAcGgAwIBAgIJANx6SVUginfkMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
+						BAMTBnJhcHRvcjAeFw0xMzA0MjQwODU0MTdaFw0yMzA0MjIwODU0MTdaMBExDzAN
+						BgNVBAMTBnJhcHRvcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKB3
+						k6ymJAJTxp7t77CFWoRJKYBCfNxiXaE5BcT76ZcWIohzpsiHyTpPlKU0uZe1rjNh
+						gOEVjcdNI3n6AAaIT3CvawtbczAIHi5XflQ//S9qdn+W1+kgcSFvgINSIhHIW66F
+						OXSa7oHCHNxmb3LYE7EZj1pEpFAgYvNG4V6UW8lgDmB4fS4DPdO+BPj6AIYVb6PF
+						50FzrMiDPdRkr/aXZ7evxWmD7ruojrJRLuFI7bZoNlaEGpKRQ/krZPZz1VddUy/d
+						tFznDa328ytxn9fGq5ZWPoiaA/1zaEJ9yVdAwKi/M5KQRTgZZ/Yae/zu8rTlTjZB
+						ob5AJgSgOW5RoAyKG+cCAwEAAaM0MDIwEQYDVR0RBAowCIIGcmFwdG9yMB0GA1Ud
+						DgQWBBTsdKLXymwLx7MoCSzQZgdEcVhc2zANBgkqhkiG9w0BAQUFAAOCAQEANfHO
+						1TeImBAPHOsgGuGedT9q45nkmtJDXSGI7a68chsPvaOzQfAlVeFFBDyQ7YfoHmLb
+						yuBjU5OCRfpJ3PyQAnVO8l/aEMUT1qe4HKbOWLV3jdM/HxumqkEDraZe3mAceelj
+						7Xs+Fpncf80Iie3I4LEvgjSkqryciRQFFESA8dLMkuKoMKMmiswVwKVErw/nMClb
+						ARNvuh8GT+MqNqACjO9Dstixdcr2A5WapXIs5G+is7RnGVtxwQBp4Q0ULqbqSJiD
+						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>Karen</md:GivenName>
+    <md:SurName>Murphy</md:SurName>
+    <md:EmailAddress>mailto:eresources@qub.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Karen</md:GivenName>
+    <md:SurName>Murphy</md:SurName>
+    <md:EmailAddress>mailto:k.l.murphy@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
new file mode 100644
index 00000000..68e11769
--- /dev/null
+++ b/swamid-interfederations-2.0/liepu-idp.lanet.lv.xml
@@ -0,0 +1,48 @@
+<?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>
+      <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>
+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>
+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>
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
new file mode 100644
index 00000000..fb2ca19a
--- /dev/null
+++ b/swamid-interfederations-2.0/ligo.org-ligovirgo-cbcnote-shibboleth-sp.xml
@@ -0,0 +1,90 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0: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="https://incommon.org"/>
+  </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>
+MIIEbzCCA1egAwIBAgIBLDANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
+ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
+BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
+dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMTAxMDYyMzI0NTJaFw0yMTAx
+MDUyMzI0NTJaMHYxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
+FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxIzAh
+BgNVBAMTGnd3dy5sc2MtZ3JvdXAucGh5cy51d20uZWR1MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAuecfG1v+W0aaj7hPyPMuomjqJhV2cRndqwqckQlP
+V8CpGTEUZo1p1xX/Inx3lX7hUYkiGD+0pN120FSI79umMM5mgiRUPqqKYMiQZoS6
+q7P7gm8NNitjhlt3vwlMO2Spsfe84jjy+KkgJRV2ReRpxn6P+A4DkEUn88Ct+BmS
+F3YYh5hPlJJ/uGqVIG+XxgMyii2y1W11GZJuxls5u4aOnWGnZbgimmUJfQ3Ymjme
+1AM2JOp0B2xCJFVY4j0GsHCRKIy6lKisMTsXMhnPL8gL1y/OxqGSs0J2vMnNRqxO
+rNajrq/EPuyxAWp/53fptT8ZMDSKyXuFk7lG23vvKywIuQIDAQABo4H1MIHyMAwG
+A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+BggrBgEFBQcDAjAZBgNVHSAEEjAQMA4GDCsGAQQBgfpGAgECATA5BgNVHR8EMjAw
+MC6gLKAqhihodHRwOi8vY2EubGlnby5vcmcvNTQxNDA0YzMvNTQxNDA0YzMuY3Js
+MB8GA1UdIwQYMBaAFFJu3Xuqb4VcCCLTl5+tfyNWHmrRMDwGA1UdEQQ1MDOCMXd3
+dy5sc2MtZ3JvdXAucGh5cy51d20uZWR1OnNjb3R0LmtvcmFuZGFAbGlnby5vcmcw
+DQYJKoZIhvcNAQEFBQADggEBAC8RMkc5TrNWkNJ8yMVS6NFIKRSV7H6J2NToTu8h
+1X4zHC1o2tb2kh5Kcg1rhAKtUKpLHnsrZ+OYGY1kJ/NpfUQWHDoYq/2NGnIUAFod
+zJvIT/a/9ENSVVEe0TUwz6oI7EC0TYmggHL6kdkKXB237ah1NLQrSZ3xEJaoK0I3
+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>
diff --git a/swamid-interfederations-2.0/lists.geant.net.xml b/swamid-interfederations-2.0/lists.geant.net.xml
new file mode 100644
index 00000000..5f777d4e
--- /dev/null
+++ b/swamid-interfederations-2.0/lists.geant.net.xml
@@ -0,0 +1,94 @@
+<?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: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">Geant test mailing list service</mdui:DisplayName>
+        <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>
+					      MIIC+jCCAeKgAwIBAgIJAJ91D96cmmSLMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEXZpc2hudS5yZW5hdGVyLmZyMB4XDTE0MDIyMTIyNDM0MFoXDTI0MDIxOTIy
+NDM0MFowHDEaMBgGA1UEAxMRdmlzaG51LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC6Au7wJo96snIMRI96gF4vNkIBCMni4sxYfVmC
+sm+s0Dvnzjuxv0GfZOZrw7VTMrucqNzh0XWHIsdoLtqBg0ZHXRlRraGsEs22cm+w
+CbU0P+vJAT6EgJ2O1IJ9vdrlnFF/KsFuh0wJ3n/DLXnn9pdb9zHW8wUu1LZGEPHs
+WIpQTnWxm6b2FiPfQV6kJRjXgjwQ5LnbirUmSRfjZ/MD166k1/XhKXjtKikP/chF
+sC/3+s8CsNB/3Et/NzJKIpLBXjFdrj5R92zV2r9l5LusQe8YzTP8sjAGKadex8XM
+WdlydXTpMaIqAGZ1D3MJ8W8TSU7k4AS1zh2ldBgesq6bwI49AgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXZpc2hudS5yZW5hdGVyLmZyMB0GA1UdDgQWBBQ3YVGlQFn0dZcJ
+6z0TrciC5+NrIzANBgkqhkiG9w0BAQUFAAOCAQEAUBfBHUpO/03/rkQJiEaoA8xO
+M15wkTwW8q4/UaFlGCHmp+RZyAQW6kwqB4TL7Ej3x/5x551s2qYtstXEPawcNFH7
+s0MdoBzjVldZr1Oo5YbWeqwx6YeBDefRC/uJCeR8XI/tGqHGgj8Jc2cQrT5QhfcT
+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>
+					      MIIC+jCCAeKgAwIBAgIJAJ91D96cmmSLMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEXZpc2hudS5yZW5hdGVyLmZyMB4XDTE0MDIyMTIyNDM0MFoXDTI0MDIxOTIy
+NDM0MFowHDEaMBgGA1UEAxMRdmlzaG51LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC6Au7wJo96snIMRI96gF4vNkIBCMni4sxYfVmC
+sm+s0Dvnzjuxv0GfZOZrw7VTMrucqNzh0XWHIsdoLtqBg0ZHXRlRraGsEs22cm+w
+CbU0P+vJAT6EgJ2O1IJ9vdrlnFF/KsFuh0wJ3n/DLXnn9pdb9zHW8wUu1LZGEPHs
+WIpQTnWxm6b2FiPfQV6kJRjXgjwQ5LnbirUmSRfjZ/MD166k1/XhKXjtKikP/chF
+sC/3+s8CsNB/3Et/NzJKIpLBXjFdrj5R92zV2r9l5LusQe8YzTP8sjAGKadex8XM
+WdlydXTpMaIqAGZ1D3MJ8W8TSU7k4AS1zh2ldBgesq6bwI49AgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXZpc2hudS5yZW5hdGVyLmZyMB0GA1UdDgQWBBQ3YVGlQFn0dZcJ
+6z0TrciC5+NrIzANBgkqhkiG9w0BAQUFAAOCAQEAUBfBHUpO/03/rkQJiEaoA8xO
+M15wkTwW8q4/UaFlGCHmp+RZyAQW6kwqB4TL7Ej3x/5x551s2qYtstXEPawcNFH7
+s0MdoBzjVldZr1Oo5YbWeqwx6YeBDefRC/uJCeR8XI/tGqHGgj8Jc2cQrT5QhfcT
+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="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.geant.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <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">RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">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/liverpool.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/liverpool.idm.oclc.org-shibboleth.xml
new file mode 100644
index 00000000..70792187
--- /dev/null
+++ b/swamid-interfederations-2.0/liverpool.idm.oclc.org-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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>
+						MIIECzCCAvOgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBmMSEwHwYDVQQDFBgqLmxp
+						dmVycG9vbC5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xD
+						MSUwIwYJKoZIhvcNAQkBFhZjYXJsLnByZW50aWNlQG9jbGMub3JnMB4XDTE0MTEw
+						NzE1NDczOFoXDTI0MTEwNjE1NDczOFowZjEhMB8GA1UEAxQYKi5saXZlcnBvb2wu
+						aWRtLm9jbGMub3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzElMCMGCSqG
+						SIb3DQEJARYWY2FybC5wcmVudGljZUBvY2xjLm9yZzCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAMR8ySKDcf3OT9U/DzD5phNed/00olgxko57IMTRvhek
+						ew/PJCROOTOWkgHi3jn5gdCJUmY52LA+R/1DS85h6jBvIHCfM9hPRzzJ+UhxaYx9
+						V3UFpPXdwQRCkPT7IJ4t5PUH4Ejoxk/7kNfXIMvtZKbP/2RBK37BNF+jtRCuCo75
+						OTlAuuiAmuuu87S11EBpGc2FAVg4dgFkP0kXkwB94+TH5xMhbaTAcj2EFvn0UYBX
+						FHyTBMkrPhjKzQBIwvKsxLVZpshshn5By4ehV4i/aNxn+vtN2i2wI8WUaNGsfx6R
+						lpA5mhFtgUzKoZdaP26TRcFNxMLwRcsz5H/Mn+UbNJkCAwEAAaOBwzCBwDAdBgNV
+						HQ4EFgQUFjxA60obD8QtsXc1NHdND3Ye//gwgZAGA1UdIwSBiDCBhYAUFjxA60ob
+						D8QtsXc1NHdND3Ye//ihaqRoMGYxITAfBgNVBAMUGCoubGl2ZXJwb29sLmlkbS5v
+						Y2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxJTAjBgkqhkiG9w0B
+						CQEWFmNhcmwucHJlbnRpY2VAb2NsYy5vcmeCAQIwDAYDVR0TBAUwAwEB/zANBgkq
+						hkiG9w0BAQUFAAOCAQEAC9bn5EoAcvFfD21a5RT/k9u4QS6FpLZGZiLiPx5w44eF
+						fZPIr8WpKD/MuSnW4zaXLQUsQGxNbPvnh5gIqSMtqFErnD0HAggq+4ameyhrmL9U
+						CKv4M31+DlYdYuryrrrVmKIEI3G/sNTsuChxYG3qh+frm8nI2tKqXYcoWyQAOO/e
+						Xx7jgG7X3RADR3aW9mxhwCslNWmlcXCg08Cb4xkpo1CnWp+gNSm1u3G0rIgqsqXR
+						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>
diff --git a/swamid-interfederations-2.0/livesrv.ex.vr.se-idp-shibboleth.xml b/swamid-interfederations-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
new file mode 100644
index 00000000..dacbd25c
--- /dev/null
+++ b/swamid-interfederations-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://livesrv.ex.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:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vr.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+
+MIIDLDCCAhSgAwIBAgIVAKrFALRGt/sXrJc+5j0adTu2M0/4MA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEGxpdmVzcnYuZXgudnIuc2UwHhcNMTExMDExMDkwNjI1
+WhcNMzExMDExMDkwNjI1WjAbMRkwFwYDVQQDExBsaXZlc3J2LmV4LnZyLnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnXd832CJ92pEWl9agbHgE+yc
+zLwonOox29ZXk9x68vd5+n+36bO1gkb4dg+8xgHR3WqXOUwVajMWtUkhH7YN1dq2
+h8JzOQ20oTTfJQi13uzL+uyfu3Z+X1mAnxfAz8wr1IjRLBfjgCiyii87/TcpEZBl
+lT8p6W3E8hiB8Qdbd7FJf52q6y4nRikMlYK0JMAg9v9SvQPZoSd0Fift5Mt92Tes
+73vmimu0FK/2AkvDw7ANTV1YfuyFYUgZ6koRe1gO3JUFIKYXMgovUh2Gy9VjxW0h
+/YeOxgGUb8sC33VHDUd03oB90XcSdih+KaSxkw6gWUyuQZ9GvnzfYPpj2nblCQID
+AQABo2cwZTBEBgNVHREEPTA7ghBsaXZlc3J2LmV4LnZyLnNlhidodHRwczovL2xp
+dmVzcnYuZXgudnIuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKHqhiJr9a82
+J7vvd4BcjZn84W0qMA0GCSqGSIb3DQEBBQUAA4IBAQBpzAB/oEEbx4Hnbd9H+B/U
+ZkIrKc9RNnz76jr0EHVGma3iy7EeueJLdgEBgmwvYrzl5dyWSLrdw/sXBsuer7wM
+FeegMJozSv56MrpSoAODBsCeyrmldFGqRzBu5KjF9/MVRpwBqXEZnDEPe4gDKP+b
+JdxMfnBNi8mPEIZK/cAPcdnNYatIvWFzrvcGfLwUlJvEPt3FVPxibY8rMqS0v4vl
+E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
+7yrPHZ1JX3HLDgrZHMW5EZ5df29H0UA1YU9mTvpo3CCy3fzJINtdT5JRBXtEqudj
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://livesrv.ex.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://livesrv.ex.vr.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://livesrv.ex.vr.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://livesrv.ex.vr.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://livesrv.ex.vr.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">vr.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+
+MIIDLDCCAhSgAwIBAgIVAKrFALRGt/sXrJc+5j0adTu2M0/4MA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEGxpdmVzcnYuZXgudnIuc2UwHhcNMTExMDExMDkwNjI1
+WhcNMzExMDExMDkwNjI1WjAbMRkwFwYDVQQDExBsaXZlc3J2LmV4LnZyLnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnXd832CJ92pEWl9agbHgE+yc
+zLwonOox29ZXk9x68vd5+n+36bO1gkb4dg+8xgHR3WqXOUwVajMWtUkhH7YN1dq2
+h8JzOQ20oTTfJQi13uzL+uyfu3Z+X1mAnxfAz8wr1IjRLBfjgCiyii87/TcpEZBl
+lT8p6W3E8hiB8Qdbd7FJf52q6y4nRikMlYK0JMAg9v9SvQPZoSd0Fift5Mt92Tes
+73vmimu0FK/2AkvDw7ANTV1YfuyFYUgZ6koRe1gO3JUFIKYXMgovUh2Gy9VjxW0h
+/YeOxgGUb8sC33VHDUd03oB90XcSdih+KaSxkw6gWUyuQZ9GvnzfYPpj2nblCQID
+AQABo2cwZTBEBgNVHREEPTA7ghBsaXZlc3J2LmV4LnZyLnNlhidodHRwczovL2xp
+dmVzcnYuZXgudnIuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKHqhiJr9a82
+J7vvd4BcjZn84W0qMA0GCSqGSIb3DQEBBQUAA4IBAQBpzAB/oEEbx4Hnbd9H+B/U
+ZkIrKc9RNnz76jr0EHVGma3iy7EeueJLdgEBgmwvYrzl5dyWSLrdw/sXBsuer7wM
+FeegMJozSv56MrpSoAODBsCeyrmldFGqRzBu5KjF9/MVRpwBqXEZnDEPe4gDKP+b
+JdxMfnBNi8mPEIZK/cAPcdnNYatIvWFzrvcGfLwUlJvEPt3FVPxibY8rMqS0v4vl
+E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
+7yrPHZ1JX3HLDgrZHMW5EZ5df29H0UA1YU9mTvpo3CCy3fzJINtdT5JRBXtEqudj
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://livesrv.ex.vr.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">VR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Vetenskapsrådet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vr.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Swedish Reasearch Council</md:Company>
+    <md:EmailAddress>kontors-it@vr.se</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
new file mode 100644
index 00000000..50590818
--- /dev/null
+++ b/swamid-interfederations-2.0/lma-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?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>
+      <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>
+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>
+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>
diff --git a/swamid-interfederations-2.0/lmu.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/lmu.idm.oclc.org-shibboleth.xml
new file mode 100644
index 00000000..6a87bd5e
--- /dev/null
+++ b/swamid-interfederations-2.0/lmu.idm.oclc.org-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+						MIID6DCCAtCgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBbMRswGQYDVQQDFBIqLmxt
+						dS5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVTMQ0wCwYDVQQKEwRPQ0xDMSAwHgYJ
+						KoZIhvcNAQkBFhFha2tpbmVudkBvY2xjLm9yZzAeFw0xNDAxMTMxMzU5MTRaFw0y
+						NDAxMTMxMzU5MTRaMFsxGzAZBgNVBAMUEioubG11LmlkbS5vY2xjLm9yZzELMAkG
+						A1UEBhMCVVMxDTALBgNVBAoTBE9DTEMxIDAeBgkqhkiG9w0BCQEWEWFra2luZW52
+						QG9jbGMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Nlr+UKo
+						6r624NJHmnxuc0LKf7ZOu25xgUUg4QKbRBMSEyjjHgRsmo9Ec1XehNAlHHVQgSQF
+						ptJr7514KyzcaXSJ31LdQDWqEMJ6sLM3K4HXrLaaC6DTzlLMG383a2wYfBuzw2Fz
+						6mdGD68qDZTNqZ83/mpwZ8+cMrfD6fwQeHYJa42Qhn6yU5/LTtN8fZtkIHtA9/76
+						OyU0Cq3feDgCp+c8h57aIj96kNWMHqTN1iQh1iHnW6iZvfDnd5fIexeTzRkzmyQq
+						DicctXN/Rc+lD7BQGhzTgf8TZOiARBDiNnZAKpJ4RIpDy+MrWWLKN846GfV4/806
+						FJvmmKDsBAzPRQIDAQABo4G2MIGzMB0GA1UdDgQWBBR7OLBpKOBjHmpVWgr2dMFZ
+						jyvTpTCBgwYDVR0jBHwweoAUeziwaSjgYx5qVVoK9nTBWY8r06WhX6RdMFsxGzAZ
+						BgNVBAMUEioubG11LmlkbS5vY2xjLm9yZzELMAkGA1UEBhMCVVMxDTALBgNVBAoT
+						BE9DTEMxIDAeBgkqhkiG9w0BCQEWEWFra2luZW52QG9jbGMub3JnggEDMAwGA1Ud
+						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGFjalQl+9HTwqjPLYddpV4ZuyII
+						iqk8a5Hb2yC9cOdtjvJkN/0dr3a5kz9oht05zpfWb7AnMOZH82EbEaJ9uiGlkO+J
+						3I1hY/YncJcT2+n6hlTC190Zo9IxrxDk7inS6WMwUPhIq0mZILmMbvE4NdFQUzVz
+						lhGA2mVxM0WNLhBnyz4bboD18V69TnuRBbWEWyhPCQoc/h6MlUrPapg+23uPtEZV
+						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>
diff --git a/swamid-interfederations-2.0/lmuidp.lrz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/lmuidp.lrz.de-idp-shibboleth.xml
new file mode 100644
index 00000000..ae35d445
--- /dev/null
+++ b/swamid-interfederations-2.0/lmuidp.lrz.de-idp-shibboleth.xml
@@ -0,0 +1,232 @@
+<?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>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDE5WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DWxtdWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2
+XRjCEr0k6MbdVul4Fh7LnStVjlCFPs86sKFP+AR+B/F7KO9mZiyN9geN8OLcTt/t
+6EVjJ5wlwmqmBNI1LiZ2pcbXDXBISZ5sqOc0AJu12J9vp8BhXbL8TVLb3jKwe+h+
+gTYIZYQr4ZHAzy61GoHjllR91bd97yhOg6+uDb0WIsSEByMNQSYvQ+Ez1wl43oTD
+acsTha0uEdeGRbhEyTnM0K7Vl53y3mobsYhr41PDQQ5C+G97DhYPrApPkx+8c1+K
+AWSeuKsOaUhPd/+U27SjN85d3XFZsTaO7DE+1JwIx2YQuQZIqEdB/c4Nx6rWkBbP
+goQ525ShGAcUp01pLfxTAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKaWNKU6lkHit7g+/fkQT0Gy
+N+svMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
+DWxtdWlkcC5scnouZGWCDmxtdWlkcDEubHJ6LmRlgg5sbXVpZHAyLmxyei5kZYEW
+emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
+gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA/lqhcmySrV1rFabrkq5Q0w3jt
+p/3uI7EwzzcjJi3OYd3RkxM6kg6e2rrUqvZFcc8SpYm2xpMua5rAFnxn3ua1c6fZ
+oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
+0bR8i9IWBuWR9eXmdY3CFmkrSplog2JvWb8Llbdy1qtrufrh0UvQzLorV9+XfFTq
+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
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDE5WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DWxtdWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2
+XRjCEr0k6MbdVul4Fh7LnStVjlCFPs86sKFP+AR+B/F7KO9mZiyN9geN8OLcTt/t
+6EVjJ5wlwmqmBNI1LiZ2pcbXDXBISZ5sqOc0AJu12J9vp8BhXbL8TVLb3jKwe+h+
+gTYIZYQr4ZHAzy61GoHjllR91bd97yhOg6+uDb0WIsSEByMNQSYvQ+Ez1wl43oTD
+acsTha0uEdeGRbhEyTnM0K7Vl53y3mobsYhr41PDQQ5C+G97DhYPrApPkx+8c1+K
+AWSeuKsOaUhPd/+U27SjN85d3XFZsTaO7DE+1JwIx2YQuQZIqEdB/c4Nx6rWkBbP
+goQ525ShGAcUp01pLfxTAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKaWNKU6lkHit7g+/fkQT0Gy
+N+svMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
+DWxtdWlkcC5scnouZGWCDmxtdWlkcDEubHJ6LmRlgg5sbXVpZHAyLmxyei5kZYEW
+emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
+gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA/lqhcmySrV1rFabrkq5Q0w3jt
+p/3uI7EwzzcjJi3OYd3RkxM6kg6e2rrUqvZFcc8SpYm2xpMua5rAFnxn3ua1c6fZ
+oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
+0bR8i9IWBuWR9eXmdY3CFmkrSplog2JvWb8Llbdy1qtrufrh0UvQzLorV9+XfFTq
+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
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDE5WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DWxtdWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2
+XRjCEr0k6MbdVul4Fh7LnStVjlCFPs86sKFP+AR+B/F7KO9mZiyN9geN8OLcTt/t
+6EVjJ5wlwmqmBNI1LiZ2pcbXDXBISZ5sqOc0AJu12J9vp8BhXbL8TVLb3jKwe+h+
+gTYIZYQr4ZHAzy61GoHjllR91bd97yhOg6+uDb0WIsSEByMNQSYvQ+Ez1wl43oTD
+acsTha0uEdeGRbhEyTnM0K7Vl53y3mobsYhr41PDQQ5C+G97DhYPrApPkx+8c1+K
+AWSeuKsOaUhPd/+U27SjN85d3XFZsTaO7DE+1JwIx2YQuQZIqEdB/c4Nx6rWkBbP
+goQ525ShGAcUp01pLfxTAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKaWNKU6lkHit7g+/fkQT0Gy
+N+svMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
+DWxtdWlkcC5scnouZGWCDmxtdWlkcDEubHJ6LmRlgg5sbXVpZHAyLmxyei5kZYEW
+emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
+gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA/lqhcmySrV1rFabrkq5Q0w3jt
+p/3uI7EwzzcjJi3OYd3RkxM6kg6e2rrUqvZFcc8SpYm2xpMua5rAFnxn3ua1c6fZ
+oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
+0bR8i9IWBuWR9eXmdY3CFmkrSplog2JvWb8Llbdy1qtrufrh0UvQzLorV9+XfFTq
+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
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDE5WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DWxtdWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2
+XRjCEr0k6MbdVul4Fh7LnStVjlCFPs86sKFP+AR+B/F7KO9mZiyN9geN8OLcTt/t
+6EVjJ5wlwmqmBNI1LiZ2pcbXDXBISZ5sqOc0AJu12J9vp8BhXbL8TVLb3jKwe+h+
+gTYIZYQr4ZHAzy61GoHjllR91bd97yhOg6+uDb0WIsSEByMNQSYvQ+Ez1wl43oTD
+acsTha0uEdeGRbhEyTnM0K7Vl53y3mobsYhr41PDQQ5C+G97DhYPrApPkx+8c1+K
+AWSeuKsOaUhPd/+U27SjN85d3XFZsTaO7DE+1JwIx2YQuQZIqEdB/c4Nx6rWkBbP
+goQ525ShGAcUp01pLfxTAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKaWNKU6lkHit7g+/fkQT0Gy
+N+svMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
+DWxtdWlkcC5scnouZGWCDmxtdWlkcDEubHJ6LmRlgg5sbXVpZHAyLmxyei5kZYEW
+emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
+gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA/lqhcmySrV1rFabrkq5Q0w3jt
+p/3uI7EwzzcjJi3OYd3RkxM6kg6e2rrUqvZFcc8SpYm2xpMua5rAFnxn3ua1c6fZ
+oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
+0bR8i9IWBuWR9eXmdY3CFmkrSplog2JvWb8Llbdy1qtrufrh0UvQzLorV9+XfFTq
+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>
diff --git a/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml b/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml
new file mode 100644
index 00000000..7f0485aa
--- /dev/null
+++ b/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?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>
+      <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>
+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>
+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>
diff --git a/swamid-interfederations-2.0/login-idp.auth.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/login-idp.auth.gr-idp-shibboleth.xml
new file mode 100644
index 00000000..bab41c3f
--- /dev/null
+++ b/swamid-interfederations-2.0/login-idp.auth.gr-idp-shibboleth.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login-idp.auth.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>
+      <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: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>
+                            MIIGkjCCBXqgAwIBAgIIFYOcoI+l1dUwDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNV
+                            BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
+                            SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE7MDkGA1UEAxMyQXJpc3RvdGxl
+                            IFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpIENlbnRyYWwgQ0EgUjQwHhcNMTQw
+                            NTA2MDAwMDAwWhcNMTYwNTA1MjI0NjQzWjB/MQswCQYDVQQGEwJHUjEtMCsGA1UE
+                            ChMkQXJpc3RvdGxlIFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpMRIwEAYDVQQL
+                            EwlJVCBDZW50ZXIxLTArBgNVBAMTJElkZW50aXR5IFByb3ZpZGVyIGZvciBzaW5n
+                            bGUtc2lnbi1vbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPEkfAH9
+                            KWWtM1cux4wPBESwyAGk/SmEWCpj9OyOohQnaaTuRMgK6Athqr0MeKyQSX7TQrAF
+                            0xbmB3zIqIjhP20JiyC3FuYa+h9U/vGD5yMStCk3i6kVYr+gjmqymChIhYlJXhhR
+                            VZGt38nr5p7iScUixgf5AXRdHjrNkiwdA8RhCEgsgELytCvtuZaWGRpyvJ3TKYcC
+                            3evvLv9X7GyvVnMOibcBdgRZ5WgyWphu7WIMWL/bYdkit8amJQppq72AQ8bsALgI
+                            9dt8c69R6gAFv0tMSuimVc1b0sbZ1seu4FAIPo3s1JT/Kpx6mlmz+0mWlYmwEo/V
+                            j+W1Ee72myVZz8sCAwEAAaOCAv4wggL6MAsGA1UdDwQEAwIFoDA7BgNVHSUENDAy
+                            BggrBgEFBQcDAgYIKwYBBQUHAwEGCCsGAQUFBwMFBggrBgEFBQcDBgYIKwYBBQUH
+                            AwcwHQYDVR0OBBYEFAVWQ1l2u4IqtEcqJX4xdkAM8tarMB8GA1UdIwQYMBaAFPWT
+                            F0odc7Z/fyCypRSUV3IZMzbSMHEGCCsGAQUFBwEBBGUwYzAjBggrBgEFBQcwAYYX
+                            aHR0cDovL29jc3AucGtpLmF1dGguZ3IwPAYIKwYBBQUHMAKGMGh0dHA6Ly93d3cu
+                            cGtpLmF1dGguZ3IvY2VydHMvQXV0aENlbnRyYWxDQVI0LnBlbTBHBgNVHR8EQDA+
+                            MDygOqA4hjZodHRwOi8vY3JsdjEucGtpLmF1dGguZ3IvQXV0aENlbnRyYWxDQVI0
+                            L2NybHYxLmRlci5jcmwwggEgBgNVHSAEggEXMIIBEzCCAQ8GCysGAQQBvB0CAAMF
+                            MIH/MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnBraS5hdXRoLmdyL2RvY3VtZW50
+                            cy9DUFMucGhwMIHGBggrBgEFBQcCAjCBuTArFiRBcmlzdG90bGUgVW5pdmVyc2l0
+                            eSBvZiBUaGVzc2Fsb25pa2kwAwIBARqBiVRoaXMgY2VydGlmaWNhdGUgaXMgc3Vi
+                            amVjdCB0byBHcmVlayBsYXdzIGFuZCBvdXIgQ1BTLiBUaGlzIENlcnRpZmljYXRl
+                            IG11c3Qgb25seSBiZSB1c2VkIGZvciBhY2FkZW1pYywgcmVzZWFyY2ggb3IgZWR1
+                            Y2F0aW9uYWwgcHVycG9zZXMuMIGNBgNVHREEgYUwgYKCEWxvZ2luLWlkcC5hdXRo
+                            LmdyghRsb2dpbi1pZHAuaXQuYXV0aC5ncoIVbG9naW4taWRwMS5pdC5hdXRoLmdy
+                            ghVsb2dpbi1pZHAxLml0LmF1dGguZ3KCFWxvZ2luLWlkcDIuaXQuYXV0aC5ncoIS
+                            bG9naW4taWRwMi5hdXRoLmdyMA0GCSqGSIb3DQEBBQUAA4IBAQAC990lHYriaAC8
+                            ytQP/AeYS5vsltSv2exJDK21E6+/KmlpWh2t/0UFk4bIvJJc9YKDURurAV3TJ78a
+                            aRMxNCo57TXV54dQNiHw+8pSjvoDCJjEXiVqJX93SPtzD9f26oFG23UBo+MDBEyV
+                            WEugwrXZ3sTrR7SFXNc6+pjEidNSzH4Es4TSa7yHKx5xJzFRcPAFwIFUw35GHxhG
+                            EWOy5M46Ik4/nBvl6CYk52aTjE/uP2WLn61Cd34oQnWspazclxgVENaVJOyWF6Lv
+                            ea+x68KwePqG5bRs+iOrVG/8NNGTlS0TSvDlubnVYNuyHffDHitYaPd3jg8U2q0q
+                            z6v6NL8x
+                        </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.auth.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-idp.auth.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-idp.auth.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-idp.auth.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login-idp.auth.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-idp.auth.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">auth.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIGkjCCBXqgAwIBAgIIFYOcoI+l1dUwDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNV
+                            BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
+                            SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE7MDkGA1UEAxMyQXJpc3RvdGxl
+                            IFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpIENlbnRyYWwgQ0EgUjQwHhcNMTQw
+                            NTA2MDAwMDAwWhcNMTYwNTA1MjI0NjQzWjB/MQswCQYDVQQGEwJHUjEtMCsGA1UE
+                            ChMkQXJpc3RvdGxlIFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpMRIwEAYDVQQL
+                            EwlJVCBDZW50ZXIxLTArBgNVBAMTJElkZW50aXR5IFByb3ZpZGVyIGZvciBzaW5n
+                            bGUtc2lnbi1vbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPEkfAH9
+                            KWWtM1cux4wPBESwyAGk/SmEWCpj9OyOohQnaaTuRMgK6Athqr0MeKyQSX7TQrAF
+                            0xbmB3zIqIjhP20JiyC3FuYa+h9U/vGD5yMStCk3i6kVYr+gjmqymChIhYlJXhhR
+                            VZGt38nr5p7iScUixgf5AXRdHjrNkiwdA8RhCEgsgELytCvtuZaWGRpyvJ3TKYcC
+                            3evvLv9X7GyvVnMOibcBdgRZ5WgyWphu7WIMWL/bYdkit8amJQppq72AQ8bsALgI
+                            9dt8c69R6gAFv0tMSuimVc1b0sbZ1seu4FAIPo3s1JT/Kpx6mlmz+0mWlYmwEo/V
+                            j+W1Ee72myVZz8sCAwEAAaOCAv4wggL6MAsGA1UdDwQEAwIFoDA7BgNVHSUENDAy
+                            BggrBgEFBQcDAgYIKwYBBQUHAwEGCCsGAQUFBwMFBggrBgEFBQcDBgYIKwYBBQUH
+                            AwcwHQYDVR0OBBYEFAVWQ1l2u4IqtEcqJX4xdkAM8tarMB8GA1UdIwQYMBaAFPWT
+                            F0odc7Z/fyCypRSUV3IZMzbSMHEGCCsGAQUFBwEBBGUwYzAjBggrBgEFBQcwAYYX
+                            aHR0cDovL29jc3AucGtpLmF1dGguZ3IwPAYIKwYBBQUHMAKGMGh0dHA6Ly93d3cu
+                            cGtpLmF1dGguZ3IvY2VydHMvQXV0aENlbnRyYWxDQVI0LnBlbTBHBgNVHR8EQDA+
+                            MDygOqA4hjZodHRwOi8vY3JsdjEucGtpLmF1dGguZ3IvQXV0aENlbnRyYWxDQVI0
+                            L2NybHYxLmRlci5jcmwwggEgBgNVHSAEggEXMIIBEzCCAQ8GCysGAQQBvB0CAAMF
+                            MIH/MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnBraS5hdXRoLmdyL2RvY3VtZW50
+                            cy9DUFMucGhwMIHGBggrBgEFBQcCAjCBuTArFiRBcmlzdG90bGUgVW5pdmVyc2l0
+                            eSBvZiBUaGVzc2Fsb25pa2kwAwIBARqBiVRoaXMgY2VydGlmaWNhdGUgaXMgc3Vi
+                            amVjdCB0byBHcmVlayBsYXdzIGFuZCBvdXIgQ1BTLiBUaGlzIENlcnRpZmljYXRl
+                            IG11c3Qgb25seSBiZSB1c2VkIGZvciBhY2FkZW1pYywgcmVzZWFyY2ggb3IgZWR1
+                            Y2F0aW9uYWwgcHVycG9zZXMuMIGNBgNVHREEgYUwgYKCEWxvZ2luLWlkcC5hdXRo
+                            LmdyghRsb2dpbi1pZHAuaXQuYXV0aC5ncoIVbG9naW4taWRwMS5pdC5hdXRoLmdy
+                            ghVsb2dpbi1pZHAxLml0LmF1dGguZ3KCFWxvZ2luLWlkcDIuaXQuYXV0aC5ncoIS
+                            bG9naW4taWRwMi5hdXRoLmdyMA0GCSqGSIb3DQEBBQUAA4IBAQAC990lHYriaAC8
+                            ytQP/AeYS5vsltSv2exJDK21E6+/KmlpWh2t/0UFk4bIvJJc9YKDURurAV3TJ78a
+                            aRMxNCo57TXV54dQNiHw+8pSjvoDCJjEXiVqJX93SPtzD9f26oFG23UBo+MDBEyV
+                            WEugwrXZ3sTrR7SFXNc6+pjEidNSzH4Es4TSa7yHKx5xJzFRcPAFwIFUw35GHxhG
+                            EWOy5M46Ik4/nBvl6CYk52aTjE/uP2WLn61Cd34oQnWspazclxgVENaVJOyWF6Lv
+                            ea+x68KwePqG5bRs+iOrVG/8NNGTlS0TSvDlubnVYNuyHffDHitYaPd3jg8U2q0q
+                            z6v6NL8x
+                        </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.auth.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-idp.auth.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">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-test.st-andrews.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/login-test.st-andrews.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..09bb0dc2
--- /dev/null
+++ b/swamid-interfederations-2.0/login-test.st-andrews.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,124 @@
+<?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>
+      <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
+						IzAhBgNVBAMTGk1hc3RlciBTaWduaW5nIENlcnRpZmljYXRlMSgwJgYJKoZIhvcN
+						AQkBFhloZWxwZGVza0BzdC1hbmRyZXdzLmFjLnVrMB4XDTEzMTIwNjEwNTYyMFoX
+						DTMzMTIwMTEwNTYyMFowgZAxCzAJBgNVBAYTAkdCMQ0wCwYDVQQIEwRGaWZlMRMw
+						EQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFN0IEFu
+						ZHJld3MxFDASBgNVBAsTC0lUIFNlcnZpY2VzMSQwIgYDVQQDExtsb2dpbi10ZXN0
+						LnN0LWFuZHJld3MuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC7cuS9mxZ5h3o5tZduDhluyOYa143mbMTZm1xzG/VZZmo56iqLsG9Rz4KNyV5i
+						ejnvsSIaOf9L6OAJIlmp/grdKDQc3CU53jJGvRzfTUWLbgbCyEzzWPWjxF7ReFUK
+						0Iy5ptAVa7JnxuBZSji1IXVROJUv+aaViIERDhlLp9QOtSHz3iW4IjQ5XJKEpJi/
+						cWEqwWbhLWYg4mCL0U4GJ3WtKeHsNMaQNNKrNdBwoJTZCBzB6/z91q5wZX8xfnlJ
+						BdU/msyzCWEg9khGD69v5H48Dm+JN8XevquX3M4Ymao9SdVr3zHIC/itEyvhGJ0g
+						DZEWpwIr6j51JgqhbuYgNzKBAgMBAAGjggGGMIIBgjAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU7An8KIwCJZKUpSxs2PR8zEacU88wgfAGA1UdIwSB6DCB5YAURVkprYqR6rp8
+						gi1KY6b2O6qok5OhgcGkgb4wgbsxCzAJBgNVBAYTAlVLMQ0wCwYDVQQIEwRGaWZl
+						MRMwEQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFN0
+						IEFuZHJld3MxFjAUBgNVBAsTDUkuVC4gU2VydmljZXMxIzAhBgNVBAMTGk1hc3Rl
+						ciBTaWduaW5nIENlcnRpZmljYXRlMSgwJgYJKoZIhvcNAQkBFhloZWxwZGVza0Bz
+						dC1hbmRyZXdzLmFjLnVrggkAuOk/yzc55tswNQYJYIZIAYb4QgEEBCgWJmh0dHA6
+						Ly93d3cuc3QtYW5kcmV3cy5hYy51ay9jYS1jcmwucGVtMA0GCSqGSIb3DQEBBQUA
+						A4IBAQBNFniAL5xV5qrTPNItZnmGBnzKxOsrs3mz/iczwz/R1Ev0i5XJ92/99Cwo
+						vxQYooCA3YgD5dWIevK4fuVR+3Yc8/qcTldvlRxBemhLDE7j2X6ENGqHTR8iSIuG
+						rTnutC9BjIt+zF1TXZE7arOLHEEO3qpzncl7Xi7LqlKHrU3qUUBQaDbVx+zbQHoM
+						CcPryKaouAbm9rbuwZYfUXUdsBr5DNn7uBM8O+AEZtWOF05/q0nAfR0cpUbNlaaU
+						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>
+						MIIFUTCCBDmgAwIBAgICEKQwDQYJKoZIhvcNAQEFBQAwgbsxCzAJBgNVBAYTAlVL
+						MQ0wCwYDVQQIEwRGaWZlMRMwEQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhV
+						bml2ZXJzaXR5IG9mIFN0IEFuZHJld3MxFjAUBgNVBAsTDUkuVC4gU2VydmljZXMx
+						IzAhBgNVBAMTGk1hc3RlciBTaWduaW5nIENlcnRpZmljYXRlMSgwJgYJKoZIhvcN
+						AQkBFhloZWxwZGVza0BzdC1hbmRyZXdzLmFjLnVrMB4XDTEzMTIwNjEwNTYyMFoX
+						DTMzMTIwMTEwNTYyMFowgZAxCzAJBgNVBAYTAkdCMQ0wCwYDVQQIEwRGaWZlMRMw
+						EQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFN0IEFu
+						ZHJld3MxFDASBgNVBAsTC0lUIFNlcnZpY2VzMSQwIgYDVQQDExtsb2dpbi10ZXN0
+						LnN0LWFuZHJld3MuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC7cuS9mxZ5h3o5tZduDhluyOYa143mbMTZm1xzG/VZZmo56iqLsG9Rz4KNyV5i
+						ejnvsSIaOf9L6OAJIlmp/grdKDQc3CU53jJGvRzfTUWLbgbCyEzzWPWjxF7ReFUK
+						0Iy5ptAVa7JnxuBZSji1IXVROJUv+aaViIERDhlLp9QOtSHz3iW4IjQ5XJKEpJi/
+						cWEqwWbhLWYg4mCL0U4GJ3WtKeHsNMaQNNKrNdBwoJTZCBzB6/z91q5wZX8xfnlJ
+						BdU/msyzCWEg9khGD69v5H48Dm+JN8XevquX3M4Ymao9SdVr3zHIC/itEyvhGJ0g
+						DZEWpwIr6j51JgqhbuYgNzKBAgMBAAGjggGGMIIBgjAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU7An8KIwCJZKUpSxs2PR8zEacU88wgfAGA1UdIwSB6DCB5YAURVkprYqR6rp8
+						gi1KY6b2O6qok5OhgcGkgb4wgbsxCzAJBgNVBAYTAlVLMQ0wCwYDVQQIEwRGaWZl
+						MRMwEQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFN0
+						IEFuZHJld3MxFjAUBgNVBAsTDUkuVC4gU2VydmljZXMxIzAhBgNVBAMTGk1hc3Rl
+						ciBTaWduaW5nIENlcnRpZmljYXRlMSgwJgYJKoZIhvcNAQkBFhloZWxwZGVza0Bz
+						dC1hbmRyZXdzLmFjLnVrggkAuOk/yzc55tswNQYJYIZIAYb4QgEEBCgWJmh0dHA6
+						Ly93d3cuc3QtYW5kcmV3cy5hYy51ay9jYS1jcmwucGVtMA0GCSqGSIb3DQEBBQUA
+						A4IBAQBNFniAL5xV5qrTPNItZnmGBnzKxOsrs3mz/iczwz/R1Ev0i5XJ92/99Cwo
+						vxQYooCA3YgD5dWIevK4fuVR+3Yc8/qcTldvlRxBemhLDE7j2X6ENGqHTR8iSIuG
+						rTnutC9BjIt+zF1TXZE7arOLHEEO3qpzncl7Xi7LqlKHrU3qUUBQaDbVx+zbQHoM
+						CcPryKaouAbm9rbuwZYfUXUdsBr5DNn7uBM8O+AEZtWOF05/q0nAfR0cpUbNlaaU
+						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>
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
new file mode 100644
index 00000000..8f4ba438
--- /dev/null
+++ b/swamid-interfederations-2.0/login.aai.pionier.net.pl-IdP-saml2-idp-metadata.php.xml
@@ -0,0 +1,47 @@
+<?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>
+      <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>
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
new file mode 100644
index 00000000..d23fc5d0
--- /dev/null
+++ b/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml
@@ -0,0 +1,276 @@
+<?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>
+      <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">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">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">gradri.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">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">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">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">tcs.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-umag.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>MIIEbDCCA1SgAwIBAgIRAMJdD3IJBmpJHEQG+rTMyXwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzAzMDUwMDAwMDBaFw0xNjAzMDQyMzU5NTlaMD0xITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApy7oHZwX71g3azW6La+cLUi+IQ30SheA6BQy2QDpeYc8CfD88mdNqq7m9ZMg81bKS0YH+dsx4/SRfus1XeyvJpFnYeEbfjk4HMbowkgn8L7ChaepbpVvEjGOE951WtDmRhhmrI7YmxOZLH4b+gI0cVkM6Ui/H4WnhbH48/I5azEtOlxFhMsknDkkKisla4scnzAQh66Cn3+BTPMD23GrrH9Rw5fqR4FiE6Ktyh8x+5m6UdReqz69lV4R5wsaO42LWDig6/xA20QAqM5RGvLCF+aJJir2tX/Lt3ZquEw7GEm6fmmvFkusiFo5ltj0DAWTrfefyDS3FyOJnyY8bZS3SQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD5Y+Ju72FzuaCJlvwPZEYpU/T9SMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dpbi5hYWllZHUuaHIwDQYJKoZIhvcNAQEFBQADggEBABfnS6qVN+xKNaG6FYggkorFWcSGe5L/ff00AFxkYRZfaWn+UfX3bxUF3zGzbhTw7aW95cfyI6ACs8N/WiK5ACbU8H+BoAZqbceuTbEjuyEFlXOqXTX/BGkE9cU9FT9RKV/BOVBQZDGFEGi0lidYqtj8A51kyYIRVDb6MkfUQ3TnB7Iv7yD1ut9eqhq/ifrPvyG8dDwUMEir/iUosdVQBiNyXkGqrL7Wo2VCfAGEmWeeHmDCdEIWktUv+L/b1e0k1Jd9Zvf1vRxHCQNMkUXGbY3OHNircf1wySgccgiCUHKT00armIaw4lbpd98m5ZnaOl6ZhrsZGsvYk/iCoo+sfug=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEbDCCA1SgAwIBAgIRAMJdD3IJBmpJHEQG+rTMyXwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzAzMDUwMDAwMDBaFw0xNjAzMDQyMzU5NTlaMD0xITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApy7oHZwX71g3azW6La+cLUi+IQ30SheA6BQy2QDpeYc8CfD88mdNqq7m9ZMg81bKS0YH+dsx4/SRfus1XeyvJpFnYeEbfjk4HMbowkgn8L7ChaepbpVvEjGOE951WtDmRhhmrI7YmxOZLH4b+gI0cVkM6Ui/H4WnhbH48/I5azEtOlxFhMsknDkkKisla4scnzAQh66Cn3+BTPMD23GrrH9Rw5fqR4FiE6Ktyh8x+5m6UdReqz69lV4R5wsaO42LWDig6/xA20QAqM5RGvLCF+aJJir2tX/Lt3ZquEw7GEm6fmmvFkusiFo5ltj0DAWTrfefyDS3FyOJnyY8bZS3SQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD5Y+Ju72FzuaCJlvwPZEYpU/T9SMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dpbi5hYWllZHUuaHIwDQYJKoZIhvcNAQEFBQADggEBABfnS6qVN+xKNaG6FYggkorFWcSGe5L/ff00AFxkYRZfaWn+UfX3bxUF3zGzbhTw7aW95cfyI6ACs8N/WiK5ACbU8H+BoAZqbceuTbEjuyEFlXOqXTX/BGkE9cU9FT9RKV/BOVBQZDGFEGi0lidYqtj8A51kyYIRVDb6MkfUQ3TnB7Iv7yD1ut9eqhq/ifrPvyG8dDwUMEir/iUosdVQBiNyXkGqrL7Wo2VCfAGEmWeeHmDCdEIWktUv+L/b1e0k1Jd9Zvf1vRxHCQNMkUXGbY3OHNircf1wySgccgiCUHKT00armIaw4lbpd98m5ZnaOl6ZhrsZGsvYk/iCoo+sfug=</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
new file mode 100644
index 00000000..cbc2b884
--- /dev/null
+++ b/swamid-interfederations-2.0/login.aaiedu.hr-wayf-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,55 @@
+<?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>MIIEbDCCA1SgAwIBAgIRAMJdD3IJBmpJHEQG+rTMyXwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzAzMDUwMDAwMDBaFw0xNjAzMDQyMzU5NTlaMD0xITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApy7oHZwX71g3azW6La+cLUi+IQ30SheA6BQy2QDpeYc8CfD88mdNqq7m9ZMg81bKS0YH+dsx4/SRfus1XeyvJpFnYeEbfjk4HMbowkgn8L7ChaepbpVvEjGOE951WtDmRhhmrI7YmxOZLH4b+gI0cVkM6Ui/H4WnhbH48/I5azEtOlxFhMsknDkkKisla4scnzAQh66Cn3+BTPMD23GrrH9Rw5fqR4FiE6Ktyh8x+5m6UdReqz69lV4R5wsaO42LWDig6/xA20QAqM5RGvLCF+aJJir2tX/Lt3ZquEw7GEm6fmmvFkusiFo5ltj0DAWTrfefyDS3FyOJnyY8bZS3SQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD5Y+Ju72FzuaCJlvwPZEYpU/T9SMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dpbi5hYWllZHUuaHIwDQYJKoZIhvcNAQEFBQADggEBABfnS6qVN+xKNaG6FYggkorFWcSGe5L/ff00AFxkYRZfaWn+UfX3bxUF3zGzbhTw7aW95cfyI6ACs8N/WiK5ACbU8H+BoAZqbceuTbEjuyEFlXOqXTX/BGkE9cU9FT9RKV/BOVBQZDGFEGi0lidYqtj8A51kyYIRVDb6MkfUQ3TnB7Iv7yD1ut9eqhq/ifrPvyG8dDwUMEir/iUosdVQBiNyXkGqrL7Wo2VCfAGEmWeeHmDCdEIWktUv+L/b1e0k1Jd9Zvf1vRxHCQNMkUXGbY3OHNircf1wySgccgiCUHKT00armIaw4lbpd98m5ZnaOl6ZhrsZGsvYk/iCoo+sfug=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEbDCCA1SgAwIBAgIRAMJdD3IJBmpJHEQG+rTMyXwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzAzMDUwMDAwMDBaFw0xNjAzMDQyMzU5NTlaMD0xITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApy7oHZwX71g3azW6La+cLUi+IQ30SheA6BQy2QDpeYc8CfD88mdNqq7m9ZMg81bKS0YH+dsx4/SRfus1XeyvJpFnYeEbfjk4HMbowkgn8L7ChaepbpVvEjGOE951WtDmRhhmrI7YmxOZLH4b+gI0cVkM6Ui/H4WnhbH48/I5azEtOlxFhMsknDkkKisla4scnzAQh66Cn3+BTPMD23GrrH9Rw5fqR4FiE6Ktyh8x+5m6UdReqz69lV4R5wsaO42LWDig6/xA20QAqM5RGvLCF+aJJir2tX/Lt3ZquEw7GEm6fmmvFkusiFo5ltj0DAWTrfefyDS3FyOJnyY8bZS3SQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD5Y+Ju72FzuaCJlvwPZEYpU/T9SMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dpbi5hYWllZHUuaHIwDQYJKoZIhvcNAQEFBQADggEBABfnS6qVN+xKNaG6FYggkorFWcSGe5L/ff00AFxkYRZfaWn+UfX3bxUF3zGzbhTw7aW95cfyI6ACs8N/WiK5ACbU8H+BoAZqbceuTbEjuyEFlXOqXTX/BGkE9cU9FT9RKV/BOVBQZDGFEGi0lidYqtj8A51kyYIRVDb6MkfUQ3TnB7Iv7yD1ut9eqhq/ifrPvyG8dDwUMEir/iUosdVQBiNyXkGqrL7Wo2VCfAGEmWeeHmDCdEIWktUv+L/b1e0k1Jd9Zvf1vRxHCQNMkUXGbY3OHNircf1wySgccgiCUHKT00armIaw4lbpd98m5ZnaOl6ZhrsZGsvYk/iCoo+sfug=</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>team@aaiedu.hr</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
new file mode 100644
index 00000000..fabc2644
--- /dev/null
+++ b/swamid-interfederations-2.0/login.athena-innovation.gr-idp-shibboleth.xml
@@ -0,0 +1,144 @@
+<?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>
+      <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>
+                            MIIEmzCCA4OgAwIBAgIQTEvhgWFGJLdkM4ZD5wBQTDANBgkqhkiG9w0BAQUFADA2
+                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+                            U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowSDEhMB8GA1UE
+                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpsb2dpbi5hdGhl
+                            bmEtaW5ub3ZhdGlvbi5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+                            AKaZpSw3Pb3kDBhJzRXUcnUqFZqJSoLjvSMHnxt0GDjBsvmQZwDflsuIu5nbXQ86
+                            DnK7ImdQszT42hal7RFODHrD9F1TC/7zoQRd5DoLnHdKOeHQRAa2WF+IwkrtiyQT
+                            gMhswaqal8wXr7sM+f0bDOYvU3Q2MVdAmE1TefrlPx90hHys+SbreRjj/HUCCsBI
+                            zgfnFcy56Mmr0m9Olbh56VhAs+qZhYpWDyGhuHaRaNEhuJCx0R7IZmFhNGZ/+2+s
+                            CdK1j/hq08c1L7wON/ZDdSBGbM5cuCoxPqIcLyyEgEh4ieo/c8e04ZfxwBFU9XZI
+                            ApX4niHSErzC/bNDMWR+f3kCAwEAAaOCAZEwggGNMB8GA1UdIwQYMBaAFAy9k2gM
+                            896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR0AyJjhZwmKiXLMvyVR6BYE68JYTAO
+                            BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+                            AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+                            OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+                            TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+                            Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+                            aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwPwYDVR0RBDgwNoIabG9naW4uYXRo
+                            ZW5hLWlubm92YXRpb24uZ3KCGGlkcC5hdGhlbmEtaW5ub3ZhdGlvbi5ncjANBgkq
+                            hkiG9w0BAQUFAAOCAQEAA1a3pfD6Iq6rMgZgmJeUEge9y3uLN5YGzJYjsNYvznhZ
+                            tnfuKighFcdQwH/Ph/ceZYtwcIMXstZFxXsFM878PiEehLSghYJorC0e9EDszIsc
+                            QgbzraX/vEjWRZ4ywQU1nsc1+3EYZyIfxmi35FiT8g0xSEVpSj4O1RoDO3xUz8NJ
+                            zDycQMlH2qMDDNdgYGqs/U3habyE1MeAHbz6zWhX6Sa1oeIy6gijvGUUadDULhX3
+                            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>
+                            MIIEmzCCA4OgAwIBAgIQTEvhgWFGJLdkM4ZD5wBQTDANBgkqhkiG9w0BAQUFADA2
+                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+                            U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowSDEhMB8GA1UE
+                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpsb2dpbi5hdGhl
+                            bmEtaW5ub3ZhdGlvbi5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+                            AKaZpSw3Pb3kDBhJzRXUcnUqFZqJSoLjvSMHnxt0GDjBsvmQZwDflsuIu5nbXQ86
+                            DnK7ImdQszT42hal7RFODHrD9F1TC/7zoQRd5DoLnHdKOeHQRAa2WF+IwkrtiyQT
+                            gMhswaqal8wXr7sM+f0bDOYvU3Q2MVdAmE1TefrlPx90hHys+SbreRjj/HUCCsBI
+                            zgfnFcy56Mmr0m9Olbh56VhAs+qZhYpWDyGhuHaRaNEhuJCx0R7IZmFhNGZ/+2+s
+                            CdK1j/hq08c1L7wON/ZDdSBGbM5cuCoxPqIcLyyEgEh4ieo/c8e04ZfxwBFU9XZI
+                            ApX4niHSErzC/bNDMWR+f3kCAwEAAaOCAZEwggGNMB8GA1UdIwQYMBaAFAy9k2gM
+                            896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR0AyJjhZwmKiXLMvyVR6BYE68JYTAO
+                            BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+                            AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+                            OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+                            TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+                            Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+                            aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwPwYDVR0RBDgwNoIabG9naW4uYXRo
+                            ZW5hLWlubm92YXRpb24uZ3KCGGlkcC5hdGhlbmEtaW5ub3ZhdGlvbi5ncjANBgkq
+                            hkiG9w0BAQUFAAOCAQEAA1a3pfD6Iq6rMgZgmJeUEge9y3uLN5YGzJYjsNYvznhZ
+                            tnfuKighFcdQwH/Ph/ceZYtwcIMXstZFxXsFM878PiEehLSghYJorC0e9EDszIsc
+                            QgbzraX/vEjWRZ4ywQU1nsc1+3EYZyIfxmi35FiT8g0xSEVpSj4O1RoDO3xUz8NJ
+                            zDycQMlH2qMDDNdgYGqs/U3habyE1MeAHbz6zWhX6Sa1oeIy6gijvGUUadDULhX3
+                            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>
diff --git a/swamid-interfederations-2.0/login.bme.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.bme.hu-idp-shibboleth.xml
new file mode 100644
index 00000000..09fdf351
--- /dev/null
+++ b/swamid-interfederations-2.0/login.bme.hu-idp-shibboleth.xml
@@ -0,0 +1,74 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bme.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"/>
+      <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>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVALPowTex/0kkPUAX6SJu1p93b0VwMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGxvZ2luLmJtZS5odTAeFw0xMTEwMDMwMTE0MzVaFw0z
+MTEwMDMwMTE0MzVaMBcxFTATBgNVBAMTDGxvZ2luLmJtZS5odTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALFQWz8d0dz50J5zJVgQPv739xAPTQjQV6Rw
+QdE9u+ajgytrDy+VuCrBGluvGspGekOjhlEESc7sZ0l92wzEdcdG0McLeg7PL9V4
+JE9qwKJO289t403EFbxCqekjeZWp3KDhHpDefLOUywYMQ1mPNfYbVRRFg82VtPL+
+G3FMTSQBWrnjWYLshVjexbHwbK1rMiy8MHBbjVAF27v6RvGHLhzPhNNW11+lqweo
+gXc3d73fgkIBMicKm5SgW/jQvBtlODy49xeoef1GD6MUgckPRpqIyXdd01rqpdGq
+eDJOyjamB5VI+LMjjpNr6h2pA0LjNNm0RZJVobbgzfFpdzwI09ECAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMbG9naW4uYm1lLmh1hiNodHRwczovL2xvZ2luLmJtZS5odS9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbB8MWrjcjCvj3wlxfUMUsdRjYd4wDQYJ
+KoZIhvcNAQEFBQADggEBAK1vfjY8DTLVqrZm7G5g+PSDRalpmk5Iwg5c/flDtGJG
+8LoHaX5y9AGNyXNOqgfzWw/UITQnl6J1L5o8n/AHYv6B1BHY0VqGBdIg/JvIzX1s
+ODAdbOlYvLdhYqACjK+S/KNW7H0ASh2sY1OVSc4/nOLfdJYgoZ2YZphvWu3zn7oE
+AaEBL1G1kaHYRTuJcRrS6QtL2P2jj+McxtRwaC5QgcMyewJW6I/608AV0/0++UUq
+Wpb29HUit4H03Mt/7qc2ekLuPcOk+AEXajE97z8Ia99IrBj/n3N4edS+Oj570z1S
+MzhtuCKzErQeySAtySu6EbCabd0L2JXIDLr2fjc8B+s=
+                                            </ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>login.bme.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.bme.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution"/>
+    <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: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">https://bme.hu/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://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
new file mode 100644
index 00000000..fdbe2889
--- /dev/null
+++ b/swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml
@@ -0,0 +1,66 @@
+<?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"/>
+  </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>
+						MIIEpjCCA46gAwIBAgIRAJuqvEQb2nivw9LlulsKgTUwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjExMTUwMDAwMDBaFw0xNTExMTUyMzU5NTlaMH8xCzAJBgNV
+						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEyMDAGA1UE
+						ChQpQnJpdGlzaCBVbml2ZXJzaXRpZXMgRmlsbSAmIFZpZGVvIENvdW5jaWwxGjAY
+						BgNVBAMTEWxvZ2luLmJ1ZnZjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEA5h2PqOMzg3Y08haJK077LpqFTNbDklYS9e5vqDeUhSa9M+ugGPuT
+						0Y8CLiqX8/eJHHRNd8h0cFFLuEgT8ERasWhVYMCrHRSglwJvm+5IXGrGjhmaLZy1
+						5q+pr7mERLXzdlvBsMTpYrizh9lW3fSMVl8bM3EjqG8NLDQzRfp53gJ1O9pjjr26
+						484VfYdaxgUvuitfq5RH5h8OeeyTBm3S3D0R7ruwn3c7Nyzhq5IlGIx7stVQ4Ydi
+						k1W95HwPQKvnMZUTgtv5LRLeSbZdZpePXYOiQUwkSsj8aVsp4klmJB/hzfWaVFKK
+						J8/1OQKJRFKN9wh2NDQm7TatDmXd1QC0JwIDAQABo4IBZDCCAWAwHwYDVR0jBBgw
+						FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFGVB6NEoch0GDSTWKrA4
+						f2KZQ+6+MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+						CCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoG
+						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWxvZ2luLmJ1ZnZj
+						LmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBCj+si/OAXKczTJ1Zssfnf4ovLzFVU
+						+KqUWRBYYCb2GQRz4BbhyTPbWhBZnBj0Uge8/z9Sfn9GN4IWGXMTuLGrAQPJvDBB
+						WYo7C0/TE7MZL7apTfsQ7SM45VE0qD1doCxyqcYd0L1CDQnwzR+BJ1z7OZoy3jau
+						Hm8Suozr2gMsWn7mu4ZIzXd2sKx7nVnoQPchMSVef9T8ZWrUR2qkBnB14yPdNWoA
+						9PbWT7R0kyF2cAxF6tw8SiYAiYXG4EbKZsV/4B7O9aPBN2pWHFNAySuneWFDdTSB
+						oQfF2ly+fZDgA4A2ONfvSehmCoqARP9BO8oWbigQqF3J7vI3MfNsgIRl
+					</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/auth/rcv" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.bufvc.ac.uk/auth/rcv" index="2"/>
+    <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="3" 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="4"/>
+    <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="5"/>
+    <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="6"/>
+    <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="7"/>
+    <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="8"/>
+    <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="9"/>
+    <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="10"/>
+  </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.du.se-idp-shibboleth.xml b/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml
new file mode 100644
index 00000000..b6926e19
--- /dev/null
+++ b/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml
@@ -0,0 +1,122 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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 height="350" width="146" xml:lang="sv">https://login.du.se/duse-logo-sv.png</mdui:Logo>
+        <mdui:Logo height="350" width="146" xml:lang="en">https://login.du.se/duse-logo-en.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">hda du</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">hda du</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>du.se</mdui:DomainHint>
+        <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>
+MIIDGDCCAgCgAwIBAgIVAPJo+xMJRgt7yTXfyDqsZSyRFE0zMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2xvZ2luLmR1LnNlMB4XDTExMDIwNDEzMzg1MloXDTMx
+MDIwNDEzMzg1MlowFjEUMBIGA1UEAxMLbG9naW4uZHUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCKFHqKqppmo8B66lFgTbIQDdDNqlBpsrhjZx4m
+l4ay7TR/Q9JhxJCpsg3fttFyYbG6pl4PViMMt6jagpYYMBlBBKGUDefAT95oAcBN
+eRlkTxXfXG4XCS1phIIc6H9Kt8HwFadqLIgx+9ICCuyTZicPIwnUBt+TS4A+hz6k
+8KA87QWvnhteMHpu4UjIL8YRUAdNbFbRV9AuOmaR9HP11yueQd3B+5XnTt8x+JaO
+yWgsbUvBeGKIXPtGm70UgXeBi32vr6LtP5s2ijtj4zORMh5dxAkrjE0hO96E3D6Y
+riLlccqVMGTYhweDuIE4HJA+sY8vFXxSTsL193erJ6ooBUWxAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2xvZ2luLmR1LnNlhiJodHRwczovL2xvZ2luLmR1LnNlL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTYD58W7KLBxdd1F6vo5xlukwwdOTANBgkqhkiG
+9w0BAQUFAAOCAQEAXZRof2FZml44oPJ+2GkhIIK0U2t143xH4Z4J2iPbTjQyNfeo
+eusGj+AvLkdkHLisqz8HTQC93sSYwPrQ1PMrqwAmnJZkhcySTto15Rgi5yNWsUFU
+E5RfYEcGj1P2R+uxUpCZ3qf9usCpGf5ao5rCoOjxtxGyv3PqDFTBwkjheuASpsug
+KnPqLMWV0RL1gmJhfAoCbhm+rM8FZZLXloDuV+Xzb0OmjruPupqtTJpHVBkaQ3OI
+2FIPaCf07HjPPcy4s9mQJGq9TEBKJ+WWwoT5ZvhYErkO7m2iQNsXUqCk/dt2Tp7e
+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>
+MIIDGDCCAgCgAwIBAgIVAPJo+xMJRgt7yTXfyDqsZSyRFE0zMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2xvZ2luLmR1LnNlMB4XDTExMDIwNDEzMzg1MloXDTMx
+MDIwNDEzMzg1MlowFjEUMBIGA1UEAxMLbG9naW4uZHUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCKFHqKqppmo8B66lFgTbIQDdDNqlBpsrhjZx4m
+l4ay7TR/Q9JhxJCpsg3fttFyYbG6pl4PViMMt6jagpYYMBlBBKGUDefAT95oAcBN
+eRlkTxXfXG4XCS1phIIc6H9Kt8HwFadqLIgx+9ICCuyTZicPIwnUBt+TS4A+hz6k
+8KA87QWvnhteMHpu4UjIL8YRUAdNbFbRV9AuOmaR9HP11yueQd3B+5XnTt8x+JaO
+yWgsbUvBeGKIXPtGm70UgXeBi32vr6LtP5s2ijtj4zORMh5dxAkrjE0hO96E3D6Y
+riLlccqVMGTYhweDuIE4HJA+sY8vFXxSTsL193erJ6ooBUWxAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2xvZ2luLmR1LnNlhiJodHRwczovL2xvZ2luLmR1LnNlL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTYD58W7KLBxdd1F6vo5xlukwwdOTANBgkqhkiG
+9w0BAQUFAAOCAQEAXZRof2FZml44oPJ+2GkhIIK0U2t143xH4Z4J2iPbTjQyNfeo
+eusGj+AvLkdkHLisqz8HTQC93sSYwPrQ1PMrqwAmnJZkhcySTto15Rgi5yNWsUFU
+E5RfYEcGj1P2R+uxUpCZ3qf9usCpGf5ao5rCoOjxtxGyv3PqDFTBwkjheuASpsug
+KnPqLMWV0RL1gmJhfAoCbhm+rM8FZZLXloDuV+Xzb0OmjruPupqtTJpHVBkaQ3OI
+2FIPaCf07HjPPcy4s9mQJGq9TEBKJ+WWwoT5ZvhYErkO7m2iQNsXUqCk/dt2Tp7e
+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>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>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>support@du.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 23 778888</md:TelephoneNumber>
+  </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
new file mode 100644
index 00000000..f9b35c68
--- /dev/null
+++ b/swamid-interfederations-2.0/login.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,67 @@
+<?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>
+						MIIFHzCCBAegAwIBAgIRANyZcMkOxifiYwLZXeooCQUwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xNDAyMTkwMDAwMDBaFw0xNzAyMjgyMzU5NTlaMIHiMQswCQYD
+						VQQGEwJHQjEPMA0GA1UEERMGRTEgNE5TMRcwFQYDVQQIEw5DZW50cmFsIExvbmRv
+						bjEPMA0GA1UEBxMGTE9ORE9OMRowGAYDVQQJExEzMjcgTWlsZSBFbmQgUm9hZDE/
+						MD0GA1UEChM2UXVlZW4gTWFyeSBhbmQgV2VzdGZpZWxkIENvbGxlZ2UsIFVuaXZl
+						cnNpdHkgb2YgTG9uZG9uMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczElMCMGA1UEAxQc
+						Ki5lenByb3h5LmxpYnJhcnkucW11bC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBALSqVecWKa3l+sxPyi/CtJeCEGF9I4KPcF8uF7ICXpeWqg+q
+						2FVP4drw1LLiChY2MWRxYOknYABhhMcF+FKPNu+NWDl3M5ic542GXcj2dSgMuc/M
+						GQ+iK860WmthtPkCZ4PTuFRD1BTuLpJBU/vAhCIrh5fr5+CjJDlH4vNERFy34WXO
+						+KZH1inY7sV5Pk/2ZO8HgMwVsf4YeSywGRH/LxViQ7UjhP1pq1oaL7CiwPGaJxTl
+						KYhvW1IM7ePCCcTiGWodhN7c6HAA9hpQYgExDcyUMgzxSM4tPsKbVp81Y51fekNT
+						kN5sY7rSxFaD/6WzWVa6wlbjfSAiNR9MsQJPfq8CAwEAAaOCAXkwggF1MB8GA1Ud
+						IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRy0dy6tqogk0Db
+						1AZcyxh7b+l5+DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
+						FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQIC
+						HTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAw
+						HoIcKi5lenByb3h5LmxpYnJhcnkucW11bC5hYy51azANBgkqhkiG9w0BAQUFAAOC
+						AQEAav8++MEPaToHmyfXb1sn+ofaMyjtJjsvao8SSpPNYGzaQZl/OiDshe5h3fJs
+						BadfZZrPkDvrmiMSAr2bUzEJ4jrL59sP7I0mCNFL+TzqJ4HulWFL01sshFheYg71
+						eBpXNBuP2/erRfdu1NHlYdURdYgWG9othpL+YmkEZy3S7t+ubmPoVMQuVc4YXGhC
+						E6qofr4r607yV971dq5p3CSGzk8Pa/dKDBM24e/q9F1XIEXoGi2tSKZqINYhll14
+						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>
diff --git a/swamid-interfederations-2.0/login.fanshawec.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/login.fanshawec.ca-idp-shibboleth.xml
new file mode 100644
index 00000000..1a598857
--- /dev/null
+++ b/swamid-interfederations-2.0/login.fanshawec.ca-idp-shibboleth.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-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">
+                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>
+      <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>
+                        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>
+            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>
+                        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>
+            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>
diff --git a/swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..03ef9f34
--- /dev/null
+++ b/swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.feld.cvut.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T12:33: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/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </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">fel.cvut.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="en">Identity Provider for CTU FEE in Prague</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro ČVUT FEL v Praze</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.fel.cvut.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.fel.cvut.cz/cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="53">https://login.fel.cvut.cz/img/logo_cvut_40pix.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEgzCCA2ugAwIBAgIQANoVlz6PcuJYsEUfHOK6tjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxNjAwMDAwMFoXDTE3MDQxNTIzNTk1OVowPzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFsb2dpbi5mZWwu
+Y3Z1dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnY8VAP8P7X
+ecu4o79lrMkoZuocDhGM9f5zFHIKPU9f4fNhuPkStgyMmEnqpoMvI6obtmLNXyGE
+/BfUrfn8xb27lURWgixhGl8/h9FFGb+xV7/fq4q8j3IJ1jaA+CF292ZL8ua8d1uG
+wqi++ra/Rp6Od/IecwC7z69cBRidqRnBOWEKfgzWtQu7O409Rv4xTjrvLx+8GDKB
+tvJdDykSWDTWkIHY/UuJsFIZKuVHT4ursigm4kFQu9URqLyhKKNIY5JvdDqBHcCn
+7XKPrqugTJZKpwEmmFV2PciClXnLIIdPCaNzsSKvh2nLxFes1m0q4gY6WN8PCYrp
+HUpBqISdJssCAwEAAaOCAYIwggF+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+R+qQ47ntMB0GA1UdDgQWBBSx5rIOvDo/4kkNb0wMf/gQTgj5BjAOBgNVHQ8BAf8E
+BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwMAYDVR0RBCkwJ4IRbG9naW4uZmVsLmN2dXQuY3qC
+EmxvZ2luLmZlbGQuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAiA8p8TJej3G9
+P7D51SRAL3uVNwfa0441UL41kRPZ46iz+N6aUudHEDCFWtYtn16htmR/KuUEje6p
+4GgmxFw6TXZhni+TdEjP9NIdXR6XpEZoIqfCY4qB5dBJPJYvEhlOv10jJftckG3u
+r7AIipmKOCM2ufytJ5g2J1YlX37szN/p0QIAbEoip8xAS/wtZVqBsNIBfy15Kd2j
+qXbm8qnB2nj+ucVKO30Gnya5Ada0cnp/DP2YjBv9MfFPjj5+kDoK3gAX5IJi9yjr
+UjhYjMJA2yybAxhTAYld1Ku+NHoYOQoZmiwobVToYcT63SF4OQv/u+1hNQh+/lM2
+yrp1Je1EyA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.fel.cvut.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fel.cvut.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fel.cvut.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fel.cvut.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fel.cvut.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEgzCCA2ugAwIBAgIQANoVlz6PcuJYsEUfHOK6tjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxNjAwMDAwMFoXDTE3MDQxNTIzNTk1OVowPzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFsb2dpbi5mZWwu
+Y3Z1dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnY8VAP8P7X
+ecu4o79lrMkoZuocDhGM9f5zFHIKPU9f4fNhuPkStgyMmEnqpoMvI6obtmLNXyGE
+/BfUrfn8xb27lURWgixhGl8/h9FFGb+xV7/fq4q8j3IJ1jaA+CF292ZL8ua8d1uG
+wqi++ra/Rp6Od/IecwC7z69cBRidqRnBOWEKfgzWtQu7O409Rv4xTjrvLx+8GDKB
+tvJdDykSWDTWkIHY/UuJsFIZKuVHT4ursigm4kFQu9URqLyhKKNIY5JvdDqBHcCn
+7XKPrqugTJZKpwEmmFV2PciClXnLIIdPCaNzsSKvh2nLxFes1m0q4gY6WN8PCYrp
+HUpBqISdJssCAwEAAaOCAYIwggF+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+R+qQ47ntMB0GA1UdDgQWBBSx5rIOvDo/4kkNb0wMf/gQTgj5BjAOBgNVHQ8BAf8E
+BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwMAYDVR0RBCkwJ4IRbG9naW4uZmVsLmN2dXQuY3qC
+EmxvZ2luLmZlbGQuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAiA8p8TJej3G9
+P7D51SRAL3uVNwfa0441UL41kRPZ46iz+N6aUudHEDCFWtYtn16htmR/KuUEje6p
+4GgmxFw6TXZhni+TdEjP9NIdXR6XpEZoIqfCY4qB5dBJPJYvEhlOv10jJftckG3u
+r7AIipmKOCM2ufytJ5g2J1YlX37szN/p0QIAbEoip8xAS/wtZVqBsNIBfy15Kd2j
+qXbm8qnB2nj+ucVKO30Gnya5Ada0cnp/DP2YjBv9MfFPjj5+kDoK3gAX5IJi9yjr
+UjhYjMJA2yybAxhTAYld1Ku+NHoYOQoZmiwobVToYcT63SF4OQv/u+1hNQh+/lM2
+yrp1Je1EyA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="cs">ČVUT FEL</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CTU FEE</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="cs">http://www.fel.cvut.cz/cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fel.cvut.cz/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ivan</md:GivenName>
+    <md:SurName>Novakov</md:SurName>
+    <md:EmailAddress>novakoi@fel.cvut.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jíří</md:GivenName>
+    <md:SurName>Cejp</md:SurName>
+    <md:EmailAddress>cejp@fel.cvut.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.fhv.at-shibboleth.xml b/swamid-interfederations-2.0/login.fhv.at-shibboleth.xml
new file mode 100644
index 00000000..4220f9ad
--- /dev/null
+++ b/swamid-interfederations-2.0/login.fhv.at-shibboleth.xml
@@ -0,0 +1,74 @@
+<?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>
+      <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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Vorarlberg University of Applied Sciences</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="de">Fachhochschule Vorarlberg</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>
+MIIDHDCCAgSgAwIBAgIVANvjM2hsZMTPMmIUd7JVjV9bZ4d1MA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGxvZ2luLmZodi5hdDAeFw0xMTA3MjYwOTQ1MTRaFw0z
+MTA3MjYwOTQ1MTRaMBcxFTATBgNVBAMTDGxvZ2luLmZodi5hdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKxwsD9+OJckD5tkuEmbHOuzwYAtkRyXfVuV
+/Y4up4H8I+eUgqr44g+o4IiIjW/MQHqiottVUUeimuFzbiVwsr/VRzMQBJqNiE/h
+eT2TOnUzHh+nPuZDtVzwy2S5lMxpGI7a5v6IwGhLjf6jV9jJjB1VtQys6ofH7uqv
+jF75Jkz7X5cuPMRCXGaXEecWKeOLX0PaMsptIOUR+a6YXX2dOJbPJojH/E0OOlg2
+XxoizHzZceZF7K3Tr1SZX7mT7TjcFjCOIcbiL0hkrto5oSBkY1G77d3fdkyZvO8u
+65iPN5rVoJSuYe7aYjVqlDECQSHH46vNJXanepMmZ+iPU5K0tkECAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMbG9naW4uZmh2LmF0hiNodHRwczovL2xvZ2luLmZodi5hdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1hyr7QdkMxYmdbqg/wxKiwGh9nUwDQYJ
+KoZIhvcNAQEFBQADggEBAHZCy5j4cx8jyYL6m6sY0oIzX9F5kVGPdKSXhjE85RrY
+GzGlRpXjBTA8CPlxnu99Wt4jZ2jjudwrw/bHLPwxOkZNALxj4HUa7T0cdWXCj3lR
+1b8iI5tXTYHmgjCbl+UTl/WA8YVQvA4v+2RaBMduspAFsvjwZDDOXvskLB4Aflbu
+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>
diff --git a/swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.xml
new file mode 100644
index 00000000..e94051d2
--- /dev/null
+++ b/swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDJDCCAgygAwIBAgIVAL7RygPVs9a1+rjGCPpUtPOFwEDPMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmxvZ2luLmZtYWNoLmV1MB4XDTExMDYxMDA3NDEzNloX
+DTMxMDYxMDA3NDEzNlowGTEXMBUGA1UEAxMObG9naW4uZm1hY2guZXUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgvLOdY/V7PGWb7V1/vNzCeZm+9TwO
+X1GsQmZY6D2Fga4FVcHbyhQNmZ2VrOi/JvC5SptjQZjQkKee4BUfgiieqhnwTfdI
+OV0ZMESh0YwXMkjRomZwjdnf6Z4i2LS4tbmZN1ajYkYqUprce5JwaslCw5UAIeUU
+FsimxhaLNnUdFgxbVpa1hWUEN2KHCfYZMCbXwumheaywWlSZqEWh1C5fBNgVb3Rs
+cyfaiz9t7N4GAf3EGP9MhR2pCRJXt619hUKV6mw6CDRfoTx2bYXuFPeIrLwWun/e
+9h73eWLnIAZlLkvcQ7sy6u+jYxOcNLKXSFhGyEE3zBF2/t3zuU3zA2oxAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmxvZ2luLmZtYWNoLmV1hiVodHRwczovL2xvZ2luLmZt
+YWNoLmV1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQY45TiPjkTzOErxnp12W9S
+CVH3ITANBgkqhkiG9w0BAQUFAAOCAQEAAoSAjAdcuIdCgDppnwVN9D7O12cTz8R2
+cYeudMepYKBaxKaskNMVp3FdfW/dc06JRBZm4fkf9wENsweDmhup0LoEkpbPkwsn
+RprHixFjI9xrgp4Zet8rYTv/o8/LojuPVm/fmJiw0GCJ0u0hw53ZlXXM60DvXXoQ
+2BlaYyHT1YTRi9t00RKB0s2poxPrleuS/VRSByhj9Ff2OFTkrpRhf09gy2NgjYbB
+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>
+MIIDJDCCAgygAwIBAgIVAL7RygPVs9a1+rjGCPpUtPOFwEDPMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmxvZ2luLmZtYWNoLmV1MB4XDTExMDYxMDA3NDEzNloX
+DTMxMDYxMDA3NDEzNlowGTEXMBUGA1UEAxMObG9naW4uZm1hY2guZXUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgvLOdY/V7PGWb7V1/vNzCeZm+9TwO
+X1GsQmZY6D2Fga4FVcHbyhQNmZ2VrOi/JvC5SptjQZjQkKee4BUfgiieqhnwTfdI
+OV0ZMESh0YwXMkjRomZwjdnf6Z4i2LS4tbmZN1ajYkYqUprce5JwaslCw5UAIeUU
+FsimxhaLNnUdFgxbVpa1hWUEN2KHCfYZMCbXwumheaywWlSZqEWh1C5fBNgVb3Rs
+cyfaiz9t7N4GAf3EGP9MhR2pCRJXt619hUKV6mw6CDRfoTx2bYXuFPeIrLwWun/e
+9h73eWLnIAZlLkvcQ7sy6u+jYxOcNLKXSFhGyEE3zBF2/t3zuU3zA2oxAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmxvZ2luLmZtYWNoLmV1hiVodHRwczovL2xvZ2luLmZt
+YWNoLmV1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQY45TiPjkTzOErxnp12W9S
+CVH3ITANBgkqhkiG9w0BAQUFAAOCAQEAAoSAjAdcuIdCgDppnwVN9D7O12cTz8R2
+cYeudMepYKBaxKaskNMVp3FdfW/dc06JRBZm4fkf9wENsweDmhup0LoEkpbPkwsn
+RprHixFjI9xrgp4Zet8rYTv/o8/LojuPVm/fmJiw0GCJ0u0hw53ZlXXM60DvXXoQ
+2BlaYyHT1YTRi9t00RKB0s2poxPrleuS/VRSByhj9Ff2OFTkrpRhf09gy2NgjYbB
+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>
diff --git a/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml b/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
index 986ba144..c76aac8b 100644
--- a/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://login.helsinki.fi/shibboleth">
+<md: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>
-      <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">helsinki.fi</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIE3jCCA8agAwIBAgIQWSnA5EzgO1nthR4AsdlaoTANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
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
new file mode 100644
index 00000000..98f59c0e
--- /dev/null
+++ b/swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.xml
@@ -0,0 +1,107 @@
+<?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>
+  </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 height="146" width="144" xml:lang="sv">https://www.eduid.se/img/logo/logo_144x146.png </mdui:Logo>
+        <mdui:Logo height="146" width="144" xml:lang="en">https://www.eduid.se/img/logo/logo_144x146.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
+RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
+MjAxNDA4MjZaFw0yNDAzMTcxNDA4MzVaMDQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQK
+EwVTVU5FVDEVMBMGA1UEAxMMaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEF
+AAOCAT8AMIIBOgKCATEA2bUN2oo9TywdepzbH9HIDwajUBkfAJl2Map2uvW5zaRQ
+eTQrTRSNsxXOmdx4VP/Ex2enSv5h15ggbLkppAKNkgDiNTaad5BcABHmOXUud7Jq
+G6/miLbXnOY2r4hqJguCqSIeP3Zd+2XjGrFVS67bfRNxyrVN/dJ71X0emdA7Y6fR
+dBRbGkjDmCg+pok4+QFtVsrlyEpOlUvug61GllJ0QsayHV31qmXWyqVDsSYIonGU
+F/BcJVeUi90cQ6anbZvmcF2Mf/ZgLBH11yIDC2H0/4+iqX1MTpcgi82keNTPq6Tx
+JXEWB8Is7I2FXaDbelxTrzfuG9Ii/0amXye6KPTHtnXkLLaD+IT2vR2Z2kGBKcZa
+fEpI8bkTdXiLt36iXhYDTY68ybN31FgaxKEsnOjvvwIDAQABo0AwPjAMBgNVHRMB
+Af8EAjAAMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFHW/jDUAIDiwRGb4EMEV
+5h1IHrWNMA0GCSqGSIb3DQEBCwUAA4IBMQCcACcgnGmR78mSErbK8DZuAUcP58So
+ri5TnvBLHP1XiqkyBS085HG4nmBsa7kWvf9iULjnJztM/4Ws6+32vMZIYoQgg7P2
+cd48ZElpm2FqpTz6gtKw+kvEhY5Aip0RZY+GxUHgGoYMbF7ONMVebZtBN8K8XJgh
+q/vNNO18HxFYokk+moCvt4Xlb8VQd1GqKRFAMV3Rn1R6nSEQVJk+HwgHsIdi2jzu
+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
+RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
+MjAxNDA4MjZaFw0yNDAzMTcxNDA4MzVaMDQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQK
+EwVTVU5FVDEVMBMGA1UEAxMMaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEF
+AAOCAT8AMIIBOgKCATEA2bUN2oo9TywdepzbH9HIDwajUBkfAJl2Map2uvW5zaRQ
+eTQrTRSNsxXOmdx4VP/Ex2enSv5h15ggbLkppAKNkgDiNTaad5BcABHmOXUud7Jq
+G6/miLbXnOY2r4hqJguCqSIeP3Zd+2XjGrFVS67bfRNxyrVN/dJ71X0emdA7Y6fR
+dBRbGkjDmCg+pok4+QFtVsrlyEpOlUvug61GllJ0QsayHV31qmXWyqVDsSYIonGU
+F/BcJVeUi90cQ6anbZvmcF2Mf/ZgLBH11yIDC2H0/4+iqX1MTpcgi82keNTPq6Tx
+JXEWB8Is7I2FXaDbelxTrzfuG9Ii/0amXye6KPTHtnXkLLaD+IT2vR2Z2kGBKcZa
+fEpI8bkTdXiLt36iXhYDTY68ybN31FgaxKEsnOjvvwIDAQABo0AwPjAMBgNVHRMB
+Af8EAjAAMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFHW/jDUAIDiwRGb4EMEV
+5h1IHrWNMA0GCSqGSIb3DQEBCwUAA4IBMQCcACcgnGmR78mSErbK8DZuAUcP58So
+ri5TnvBLHP1XiqkyBS085HG4nmBsa7kWvf9iULjnJztM/4Ws6+32vMZIYoQgg7P2
+cd48ZElpm2FqpTz6gtKw+kvEhY5Aip0RZY+GxUHgGoYMbF7ONMVebZtBN8K8XJgh
+q/vNNO18HxFYokk+moCvt4Xlb8VQd1GqKRFAMV3Rn1R6nSEQVJk+HwgHsIdi2jzu
+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>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>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>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
new file mode 100644
index 00000000..f16aebbf
--- /dev/null
+++ b/swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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
+BQUAMBsxGTAXBgNVBAMTEGxvZ2luLmlkcC5oaHMuc2UwHhcNMTQwMjE4MDgzNTI1
+WhcNMTcwMjE4MDgzNTI1WjAbMRkwFwYDVQQDExBsb2dpbi5pZHAuaGhzLnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHfxE/NtoBdovpvyI+ShRpC9
+PvASzTQ7O2zsFwRsaooYlSeRxWq4jL4dyC7lm1Z5CPWgOAqcprYFkUI1wFhopOLU
+nYvqjc0jx8lSV9nqdSRC2MJrLbOS8V0CL8pAWeVbHE848nVeJS4elOr2EvYkZAij
+t78R/RvBJrVBpRKiAz1uvCGIyZ2HYt6bQBzWkG4L+pxC3z/ttjI2ql9ctWB3im00
+mzdmN7GW6bCQJlYWm8sy0iHI9Yt1aUMkXlBnrlUVNzq+cp+2hhuB7qy/XqhUVUMq
+PkBxpIkk6To2kCN+00uQP4oslomw3khz0GcrV88+nAIAAEeA3zrYbBvh05ABGQID
+AQABo2cwZTBEBgNVHREEPTA7ghBsb2dpbi5pZHAuaGhzLnNlhidodHRwczovL2xv
+Z2luLmlkcC5oaHMuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIMbKfamMiy4
+s3T84Lli4DWzkdIbMA0GCSqGSIb3DQEBBQUAA4IBAQBZt9RVrBFSfR+F5L+zPQrl
+3rTfcJXbivC8hWORCF3mFf3Z7nlOY/c/0LvOMK5pXF+gU50kjMhQ56mQHcmph9NC
+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
+BQUAMBsxGTAXBgNVBAMTEGxvZ2luLmlkcC5oaHMuc2UwHhcNMTQwMjE4MDgzNTI1
+WhcNMTcwMjE4MDgzNTI1WjAbMRkwFwYDVQQDExBsb2dpbi5pZHAuaGhzLnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHfxE/NtoBdovpvyI+ShRpC9
+PvASzTQ7O2zsFwRsaooYlSeRxWq4jL4dyC7lm1Z5CPWgOAqcprYFkUI1wFhopOLU
+nYvqjc0jx8lSV9nqdSRC2MJrLbOS8V0CL8pAWeVbHE848nVeJS4elOr2EvYkZAij
+t78R/RvBJrVBpRKiAz1uvCGIyZ2HYt6bQBzWkG4L+pxC3z/ttjI2ql9ctWB3im00
+mzdmN7GW6bCQJlYWm8sy0iHI9Yt1aUMkXlBnrlUVNzq+cp+2hhuB7qy/XqhUVUMq
+PkBxpIkk6To2kCN+00uQP4oslomw3khz0GcrV88+nAIAAEeA3zrYbBvh05ABGQID
+AQABo2cwZTBEBgNVHREEPTA7ghBsb2dpbi5pZHAuaGhzLnNlhidodHRwczovL2xv
+Z2luLmlkcC5oaHMuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIMbKfamMiy4
+s3T84Lli4DWzkdIbMA0GCSqGSIb3DQEBBQUAA4IBAQBZt9RVrBFSfR+F5L+zPQrl
+3rTfcJXbivC8hWORCF3mFf3Z7nlOY/c/0LvOMK5pXF+gU50kjMhQ56mQHcmph9NC
+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>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
new file mode 100644
index 00000000..442617a7
--- /dev/null
+++ b/swamid-interfederations-2.0/login.insa-lyon.fr-idp-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+      <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 de Lyon</mdui:DisplayName>
+        <mdui:Description xml:lang="en">everyone at INSA de LYON</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">INSA de Lyon</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">toutes population (etudiants/personnels) de l'INSA de 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>
+					      MIIDMzCCAhugAwIBAgIUSMWboaAOUaXanB/KMcwBhD32kfYwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSbG9naW4uaW5zYS1seW9uLmZyMB4XDTEyMDQyNTExNDMz
+NFoXDTMyMDQyNTExNDMzNFowHTEbMBkGA1UEAxMSbG9naW4uaW5zYS1seW9uLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlGLzIxkhLAo8tJXMprLD
+mHamE3JsZx6MPSahfc1eDQek6dAC6I1vT6/g29ykVG02oLLhh6yQdsbl64D625jn
+w38xWf7lIMcnTUOSMWhYs9iGchAAnUrbFBuH+Hf2JnDgHauxX+4HHsvPZEesfyIF
+t8K9nVk/F4w7od3s8gUcRwGyp9JL2L12BFLYcFSZQK99n/xkdnLm7zVYRnjXRHvF
+O19qsTLuOigWEYISS7dMcsJUR0sCrj5m372agTuPlsnr0zRivTHLSkn9KXvRB/9V
+pE+nw4U/oQU7VnyrqJM/QUvJeCT0uDC7lOJiKRvn5MG9AbfeItJi5c7meYSX79pR
+DwIDAQABo2swaTBIBgNVHREEQTA/ghJsb2dpbi5pbnNhLWx5b24uZnKGKWh0dHBz
+Oi8vbG9naW4uaW5zYS1seW9uLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRc
+WvjDFJ1TMxlmW51//gXYknsBAjANBgkqhkiG9w0BAQUFAAOCAQEAbtOsiF0RFf30
+qcDbB3gF0jfxXG5QH1xGsMlw9ERAT5PBAWLY6Z+KKswxSq/cx/+oZWIclmfkkAvl
+aV/dRYFKbJgui6NFxXpZOmAabsFVgev5pH+USVi4xXYoi+St5lhS8dGIaCx4gY+j
+fXGsI0PmacCwdzgBQqprkNfuTb9FCKffmdOXwq77P+/RU2rDsnIsprJnuRe9aLyS
+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 de Lyon</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INSA de Lyon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</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
new file mode 100644
index 00000000..e74f515a
--- /dev/null
+++ b/swamid-interfederations-2.0/login.justis.com.xml
@@ -0,0 +1,55 @@
+<?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">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEADCCAuigAwIBAgIJAOUEkaPJ2Bd5MA0GCSqGSIb3DQEBBQUAMIGAMQswCQYD
+						VQQGEwJHQjEPMA0GA1UECAwGTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xHjAcBgNV
+						BAoMFUp1c3RpcyBQdWJsaXNoaW5nIEx0ZDEUMBIGA1UECwwLRGV2ZWxvcG1lbnQx
+						GTAXBgNVBAMMEGxvZ2luLmp1c3Rpcy5jb20wHhcNMTEwNzE4MTQ1MTMzWhcNMjEw
+						NzE1MTQ1MTMzWjCBgDELMAkGA1UEBhMCR0IxDzANBgNVBAgMBkxvbmRvbjEPMA0G
+						A1UEBwwGTG9uZG9uMR4wHAYDVQQKDBVKdXN0aXMgUHVibGlzaGluZyBMdGQxFDAS
+						BgNVBAsMC0RldmVsb3BtZW50MRkwFwYDVQQDDBBsb2dpbi5qdXN0aXMuY29tMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3w8g9C9ESGQ0H2JeatthhPcG
+						Ev3dywh7L27cbXmFL5yB8trjZRo6BfREpv4FRSgWlboRh62N/CQLHP6eF3gngSjR
+						aO3ERVm8KNKHmXXrhn4jP4EZYIFjXkO3MYYML4zdzgLWi2s9xbjN+ehQz/Hnvr9d
+						w0n9pSMhWTyW4R0Hprgdf/KhssKKTIILXFgbzGrMTvATtCUbWhbY0eKOlrzVwgxZ
+						Ttt+1twitnAtG7L88X78NcwE49rKbMRFLcnLmXFF0nb71d2srGBwMDHJ4SagIRcR
+						ZZH/pjICbkuB0JzFUjnYYv7OGnHyxbSU6irjXB4Ci433KxArlBKtLS4w5agHKQID
+						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
+						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU2ZuXN7VAgmrTrBEbRUT6AI3pPmsw
+						HwYDVR0jBBgwFoAU2ZuXN7VAgmrTrBEbRUT6AI3pPmswDQYJKoZIhvcNAQEFBQAD
+						ggEBAIyTpXAbDuMXIX49higmZ25epvKjkmgBcmMZnGayDUKwUD8PkzXt8g0BzywD
+						seFZvib6KXOGSV2vxvKnhvwMacmpwFEXX90xyBdCt+DuLlpL6BmT9LdAANsdQHuC
+						qOiB5SbfVRjDmDwXwLFaWMzu9UN+JP763GBPpMTkk+riHTNyC/n8FO5UWYUwuTyU
+						/bY2QdSNZKtnrbGDlwWELTISsdCOz0ki4XRd0/WquIqcjfVTW+zGiQQuSIAWDx9Q
+						NIvd6OcCOBRPMOvpQ4W5ZAMlO7++IzhzP7s2kHgb6yXBWvzJQx8aK8C1aE2eBBJK
+						+Y+kE//yTUdY4YMzolvRCyf44z8=
+					</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.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: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.ktu.lt-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..68a3a4ad
--- /dev/null
+++ b/swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,85 @@
+<?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="2014-05-01T11:00:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://federacija.litnet.lt/en</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="lt">https://federacija.litnet.lt/lt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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">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:Keywords xml:lang="en">Kaunas Kaunas+University+of+Technology</mdui:Keywords>
+        <mdui:Keywords xml:lang="lt">Kaunas Kauno+technologijos+universitetas</mdui:Keywords>
+        <mdui:Logo width="80" height="88" xml:lang="en">https://tinklas.ktu.lt/images/logo/ktu_80x88.png</mdui:Logo>
+        <mdui:Logo width="80" height="88" xml:lang="lt">https://tinklas.ktu.lt/images/logo/ktu_80x88.png</mdui:Logo>
+        <mdui:Logo width="16" height="16" xml:lang="en">https://tinklas.ktu.lt/images/logo/ktu_16x16.png</mdui:Logo>
+        <mdui:Logo width="16" height="16" xml:lang="lt">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.9049679,23.956717000000026</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:54.8988679,23.91259100000002</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:54.898964, 23.921850</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>MIIElTCCA32gAwIBAgIJALYznSATuns+MA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNVBAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMMbG9naW4ua3R1Lmx0MRkwFwYJKoZIhvcNAQkBFgpzc29Aa3R1Lmx0MB4XDTE0MDgwNDEzMDY0MFoXDTI0MDgwMzEzMDY0MFowgY0xCzAJBgNVBAYTAkxUMQ8wDQYDVQQIEwZLYXVuYXMxDzANBgNVBAcTBkthdW5hczEqMCgGA1UEChMhS2F1bm8gdGVjaG5vbG9naWpvcyB1bml2ZXJzaXRldGFzMRUwEwYDVQQDEwxsb2dpbi5rdHUubHQxGTAXBgkqhkiG9w0BCQEWCnNzb0BrdHUubHQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr3YT9UZdS87hoUW2O+nElhco6e1mSJnCVfDXliqaOAv421+khPEqJuKeL1pCeDNHpSlcbVlmdNiwb3SZGUxaXoenTFxaqCZPV09Ggny5f9YBkEzaDOJpB3yGfvbhyrmoRM6zeziATUJiHcns395XuJwd2nwbkNGwY4u4BO7ennVZeQR2r9GOyL+yz3Kly+q8YhIEw0DBXYoPXKhfHBr+otszV9CRXCgnDgVQ7lqqMbxJiK/n7skd1WLRjxxIuTBh3UfTSKmmy3RqwA/NlUYl5Uh42GFE/D0UlKYwzNoBjsV7QXkkmMf8vUiy/x7Tj6PM4zsg716AOafJCPESSuKQJAgMBAAGjgfUwgfIwHQYDVR0OBBYEFMCp68JzkZdFKWHkjPn0XTCo98WhMIHCBgNVHSMEgbowgbeAFMCp68JzkZdFKWHkjPn0XTCo98WhoYGTpIGQMIGNMQswCQYDVQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNVBAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMMbG9naW4ua3R1Lmx0MRkwFwYJKoZIhvcNAQkBFgpzc29Aa3R1Lmx0ggkAtjOdIBO6ez4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAdpZ936wIu3ArrlB0/+RL5FreCZnnXhvxSOGWUZzrzq143BXnClnd/i9oZMMz5C4apRk6f7USWQZFeYrzSb8dpSjgJUYXPcCT5REf+u2aMOoPtmwGGg+zkQKY18WZYC3BW4LPwzNocH3YYBhPrxTkKX/d+xjGM9/b0yOCwdJjj0BlwXq5unq0LIK49aSIyuHwA23d+drva9TON936JL4SEqchA2hbnws1elOJNIiykHUJfKqYy/dY9rqRSx+Hf8gsa2TNLU3sl57neVdLF6p6w/3g4mjB111B4U382kXULKO7Y+J1uffkJ71sGBdRWsvH09i0ReJWzbWxAtF2jtzfkw==</ds:X509Certificate>
+        </ds: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+MA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNVBAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMMbG9naW4ua3R1Lmx0MRkwFwYJKoZIhvcNAQkBFgpzc29Aa3R1Lmx0MB4XDTE0MDgwNDEzMDY0MFoXDTI0MDgwMzEzMDY0MFowgY0xCzAJBgNVBAYTAkxUMQ8wDQYDVQQIEwZLYXVuYXMxDzANBgNVBAcTBkthdW5hczEqMCgGA1UEChMhS2F1bm8gdGVjaG5vbG9naWpvcyB1bml2ZXJzaXRldGFzMRUwEwYDVQQDEwxsb2dpbi5rdHUubHQxGTAXBgkqhkiG9w0BCQEWCnNzb0BrdHUubHQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr3YT9UZdS87hoUW2O+nElhco6e1mSJnCVfDXliqaOAv421+khPEqJuKeL1pCeDNHpSlcbVlmdNiwb3SZGUxaXoenTFxaqCZPV09Ggny5f9YBkEzaDOJpB3yGfvbhyrmoRM6zeziATUJiHcns395XuJwd2nwbkNGwY4u4BO7ennVZeQR2r9GOyL+yz3Kly+q8YhIEw0DBXYoPXKhfHBr+otszV9CRXCgnDgVQ7lqqMbxJiK/n7skd1WLRjxxIuTBh3UfTSKmmy3RqwA/NlUYl5Uh42GFE/D0UlKYwzNoBjsV7QXkkmMf8vUiy/x7Tj6PM4zsg716AOafJCPESSuKQJAgMBAAGjgfUwgfIwHQYDVR0OBBYEFMCp68JzkZdFKWHkjPn0XTCo98WhMIHCBgNVHSMEgbowgbeAFMCp68JzkZdFKWHkjPn0XTCo98WhoYGTpIGQMIGNMQswCQYDVQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNVBAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMMbG9naW4ua3R1Lmx0MRkwFwYJKoZIhvcNAQkBFgpzc29Aa3R1Lmx0ggkAtjOdIBO6ez4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAdpZ936wIu3ArrlB0/+RL5FreCZnnXhvxSOGWUZzrzq143BXnClnd/i9oZMMz5C4apRk6f7USWQZFeYrzSb8dpSjgJUYXPcCT5REf+u2aMOoPtmwGGg+zkQKY18WZYC3BW4LPwzNocH3YYBhPrxTkKX/d+xjGM9/b0yOCwdJjj0BlwXq5unq0LIK49aSIyuHwA23d+drva9TON936JL4SEqchA2hbnws1elOJNIiykHUJfKqYy/dY9rqRSx+Hf8gsa2TNLU3sl57neVdLF6p6w/3g4mjB111B4U382kXULKO7Y+J1uffkJ71sGBdRWsvH09i0ReJWzbWxAtF2jtzfkw==</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:NameIDFormat>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.ktu.lt/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kaunas University of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="lt">Kauno technologijos universitetas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kaunas University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="lt">Kauno technologijos universitetas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ktu.edu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="lt">http://ktu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>KTU</md:GivenName>
+    <md:SurName>SSO</md:SurName>
+    <md:EmailAddress>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
new file mode 100644
index 00000000..a40f6f75
--- /dev/null
+++ b/swamid-interfederations-2.0/login.library.dmu.ac.uk-oala-metadata.xml
@@ -0,0 +1,67 @@
+<?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>
+      <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>
+						MIID3DCCAsQCCQDPnZdVNsgAazANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
+						R0IxFzAVBgNVBAgMDkxlaWNlc3RlcnNoaXJlMRIwEAYDVQQHDAlMZWljZXN0ZXIx
+						HzAdBgNVBAoMFkRlIE1vbnRmb3J0IFVuaXZlcnNpdHkxDTALBgNVBAsMBElUTVMx
+						IDAeBgNVBAMMF2xvZ2luLmxpYnJhcnkuZG11LmFjLnVrMSEwHwYJKoZIhvcNAQkB
+						FhJ3aWxsaWFtc0BkbXUuYWMudWswHhcNMTQwOTE2MTU0MzM3WhcNMjQwOTEzMTU0
+						MzM3WjCBrzELMAkGA1UEBhMCR0IxFzAVBgNVBAgMDkxlaWNlc3RlcnNoaXJlMRIw
+						EAYDVQQHDAlMZWljZXN0ZXIxHzAdBgNVBAoMFkRlIE1vbnRmb3J0IFVuaXZlcnNp
+						dHkxDTALBgNVBAsMBElUTVMxIDAeBgNVBAMMF2xvZ2luLmxpYnJhcnkuZG11LmFj
+						LnVrMSEwHwYJKoZIhvcNAQkBFhJ3aWxsaWFtc0BkbXUuYWMudWswggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLa9/jC6wzawogWidhy6b9gQSQKsTr03Q/
+						E2MRXhtd1dX0n6b0Ogf5Ikf4J38s1JOjbr56ysY6xiPGObvKb/jAh8Ugt3s2DYZh
+						umSNPuDnemyj8h521oFQ6Wd8bhnSKRZXY2oJsSKLA/d3nLbUKoe9w1pf4rDU2Cjm
+						RZMyY4cNt0gb0Tt3/gtiwJ/1WzWrEe8g5uvNbmFC3E96T2Cq5fqgqRKk6mHuA6+V
+						w+Ke96AbvsrVjCRRxYq47CRYlpPfeQJfiz50jN0F37CQxIf/joj7Vo1V+950bYm+
+						6KB6IWTjSVY9csmkz2B/vLDadU/Qo7XjvgsLYqYVmH3mmzo4dH5NAgMBAAEwDQYJ
+						KoZIhvcNAQEFBQADggEBAKNNaTkgvr2ied3nooS6i4rRWM7U9MC93AFJprJYHHKx
+						STDcHqNtX6f1e3UeZI6wsgpSiWFfBZgEd0hJ+cgE62a/G6DTUUPdnf0LClRZpXoE
+						Mu+6NWSoNNdr9hLtWBxZkU+FLIgDpw9+qnx3tYydEoxC0oGcyuvCMbJJbPGQwHML
+						bkOwLZxeNbAlpdb+tXylus+anQwqlrcukkxTVeI89O28QETfN1sIFL97/AwE2oD7
+						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>
diff --git a/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml
new file mode 100644
index 00000000..09399066
--- /dev/null
+++ b/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml
@@ -0,0 +1,125 @@
+<?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>
+      <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 height="68" width="350" xml:lang="sv">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
+        <mdui:Logo height="68" width="350" xml:lang="en">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>
+MIIDGzCCAgOgAwIBAgIUUGevf/6+3wexHl4UyWmMfjha+8owDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMB4XDTA5MDYyNTA2Mjg1NloXDTI5
+MDYyNTA2Mjg1NlowFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkdGaEeZYE4lLbCTP3I/7SWH2dI4RfbVp0bPH
+X3TSDGUAJMf8lVwignl37pypkj1it/Ea1oOs1QAUUJF2s7eDKbbsQZ6IMEZHUCG9
+2yBt6cAA7HH8XyhyQodkTZd6JhY/HJY1oAiKXar7JSnxnVdg6365Z4rP+W4UHcHM
+ePgj6SqR0eW6qXmEIx9a/cyJ+s/R5cUiTrNDL9c0FH/watGYgesLxCxSSgijW7L1
+Cobl5Y5+Wr8i3sPPNVVtHXsp1aRI4G4YWW2qsoPF94s9f+LguJ+vHMT2URqplOZ3
+g41V7NFMqSw8f7n32BKl7ekAVBfhAwMuiKSENCuJ1vWHsXS7wwIDAQABo18wXTA8
+BgNVHREENTAzggxsb2dpbi5saXUuc2WGI2h0dHBzOi8vbG9naW4ubGl1LnNlL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSouPd/n3U2de/t4ArJMSZcZGlsrjANBgkq
+hkiG9w0BAQUFAAOCAQEAdupL+cmtm9wOczmRze5JGpSkrEnJLWOABVH71QGhRPd3
+bEA93XLjwiO9NPuFyLrb03IUrcgdlgkxnCoq2dla2IQBI6ky+VSuc4lCsdanI+XB
+t2SymRPiqJ60K04Rm4TYOZHsDVHPO3dE3f4mjbhx/irlPmDIM+eB88SbT1nPRQfv
+G2bsafC6oxZjtT5CDJP30lUpieKkmIneVjTmYHBLQmWvl0G5o5j5OLtVj1xhfz9r
+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>
+MIIDGzCCAgOgAwIBAgIUUGevf/6+3wexHl4UyWmMfjha+8owDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMB4XDTA5MDYyNTA2Mjg1NloXDTI5
+MDYyNTA2Mjg1NlowFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkdGaEeZYE4lLbCTP3I/7SWH2dI4RfbVp0bPH
+X3TSDGUAJMf8lVwignl37pypkj1it/Ea1oOs1QAUUJF2s7eDKbbsQZ6IMEZHUCG9
+2yBt6cAA7HH8XyhyQodkTZd6JhY/HJY1oAiKXar7JSnxnVdg6365Z4rP+W4UHcHM
+ePgj6SqR0eW6qXmEIx9a/cyJ+s/R5cUiTrNDL9c0FH/watGYgesLxCxSSgijW7L1
+Cobl5Y5+Wr8i3sPPNVVtHXsp1aRI4G4YWW2qsoPF94s9f+LguJ+vHMT2URqplOZ3
+g41V7NFMqSw8f7n32BKl7ekAVBfhAwMuiKSENCuJ1vWHsXS7wwIDAQABo18wXTA8
+BgNVHREENTAzggxsb2dpbi5saXUuc2WGI2h0dHBzOi8vbG9naW4ubGl1LnNlL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSouPd/n3U2de/t4ArJMSZcZGlsrjANBgkq
+hkiG9w0BAQUFAAOCAQEAdupL+cmtm9wOczmRze5JGpSkrEnJLWOABVH71QGhRPd3
+bEA93XLjwiO9NPuFyLrb03IUrcgdlgkxnCoq2dla2IQBI6ky+VSuc4lCsdanI+XB
+t2SymRPiqJ60K04Rm4TYOZHsDVHPO3dE3f4mjbhx/irlPmDIM+eB88SbT1nPRQfv
+G2bsafC6oxZjtT5CDJP30lUpieKkmIneVjTmYHBLQmWvl0G5o5j5OLtVj1xhfz9r
+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>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>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>helpdesk@liu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 13 282828</md:TelephoneNumber>
+  </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
new file mode 100644
index 00000000..e2653ecb
--- /dev/null
+++ b/swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,117 @@
+<?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>
+      <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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIE2TCCA8GgAwIBAgIQGudxojDeqfulg/H1pHAxSzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMTEwNTAwMDAwMFoXDTE1MTEwNTIzNTk1OVowgawxCzAJBgNV
+						BAYTAkdCMRYwFAYDVQQIEw1UeW5lIGFuZCBXZWFyMRwwGgYDVQQHExNOZXdjYXN0
+						bGUgdXBvbiBUeW5lMS8wLQYDVQQKEyZVbml2ZXJzaXR5IG9mIE5vcnRodW1icmlh
+						IGF0IE5ld2Nhc3RsZTEUMBIGA1UECxMLSVQgU2VydmljZXMxIDAeBgNVBAMTF2xv
+						Z2luLm5vcnRodW1icmlhLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAqc9f4NtBjhi29ZKRccCyzF3iB+35p3py/klIgY4QQBE7FHFueLXPcxmm
+						pUd+V0xkzQdZaOhT71Z+cRQxwvImtJjdJ090cwoTLUVhGYksVf+7DBnZ3netcnxO
+						UcJEYDwFnRbuftjypYFG6TxnAQr+NUMxNM2CCK+4rKOMjfv8xZBo+TLAYJc5+WEz
+						yRhmAXe94oEohAgbiWX9Lt0sf8XRj9p7bBbMSZwZN6CQy2SxZMbojS+ZQZJ3W3Qs
+						e6rzW57Jj/dlGwhSinQoemsYw5j2IEDnqcoZK0G5DgowVRnfmprTWSrFXjHtZETL
+						T2uHyUZ06Me85fAODtp0a34v55EpKQIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAU
+						DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFFNs8KCvp7u4egtbbZRM0Q3p
+						eceOMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
+						AQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1Ud
+						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF2xvZ2luLm5vcnRodW1i
+						cmlhLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBAKCRPdKKl96slQq2xAxKQg4k8
+						Elb1NlN6reI5BK161a4paiuRRB2cvqgcweuIs3ixuQ2jFKvfJ/zvp9ypRLAzst6b
+						zhBFuwr+5ndv+MknYu3zyA718wsd1KNojFtkDPTmG5oSwLZQAGATFkiyrpTKrMnU
+						8AWfyiFkRW5hVmFNHMfrguFgCukxHd6XpKSNMPer17k3YrYJhUecYn2/UvW7Fc0b
+						s9brte9lyJUe7fju3PqSm+0xKInyL5Z1KkA0Sikn3hhHQ9yxya0CVoWovZUot1c4
+						r25Y4ksJ8/yqZPWuks/qIP+Ba5XJieaK24iMjG1RbWOpqhOToldEnV9Omxxs
+					</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIE2TCCA8GgAwIBAgIQGudxojDeqfulg/H1pHAxSzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMTEwNTAwMDAwMFoXDTE1MTEwNTIzNTk1OVowgawxCzAJBgNV
+						BAYTAkdCMRYwFAYDVQQIEw1UeW5lIGFuZCBXZWFyMRwwGgYDVQQHExNOZXdjYXN0
+						bGUgdXBvbiBUeW5lMS8wLQYDVQQKEyZVbml2ZXJzaXR5IG9mIE5vcnRodW1icmlh
+						IGF0IE5ld2Nhc3RsZTEUMBIGA1UECxMLSVQgU2VydmljZXMxIDAeBgNVBAMTF2xv
+						Z2luLm5vcnRodW1icmlhLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAqc9f4NtBjhi29ZKRccCyzF3iB+35p3py/klIgY4QQBE7FHFueLXPcxmm
+						pUd+V0xkzQdZaOhT71Z+cRQxwvImtJjdJ090cwoTLUVhGYksVf+7DBnZ3netcnxO
+						UcJEYDwFnRbuftjypYFG6TxnAQr+NUMxNM2CCK+4rKOMjfv8xZBo+TLAYJc5+WEz
+						yRhmAXe94oEohAgbiWX9Lt0sf8XRj9p7bBbMSZwZN6CQy2SxZMbojS+ZQZJ3W3Qs
+						e6rzW57Jj/dlGwhSinQoemsYw5j2IEDnqcoZK0G5DgowVRnfmprTWSrFXjHtZETL
+						T2uHyUZ06Me85fAODtp0a34v55EpKQIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAU
+						DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFFNs8KCvp7u4egtbbZRM0Q3p
+						eceOMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
+						AQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1Ud
+						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF2xvZ2luLm5vcnRodW1i
+						cmlhLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBAKCRPdKKl96slQq2xAxKQg4k8
+						Elb1NlN6reI5BK161a4paiuRRB2cvqgcweuIs3ixuQ2jFKvfJ/zvp9ypRLAzst6b
+						zhBFuwr+5ndv+MknYu3zyA718wsd1KNojFtkDPTmG5oSwLZQAGATFkiyrpTKrMnU
+						8AWfyiFkRW5hVmFNHMfrguFgCukxHd6XpKSNMPer17k3YrYJhUecYn2/UvW7Fc0b
+						s9brte9lyJUe7fju3PqSm+0xKInyL5Z1KkA0Sikn3hhHQ9yxya0CVoWovZUot1c4
+						r25Y4ksJ8/yqZPWuks/qIP+Ba5XJieaK24iMjG1RbWOpqhOToldEnV9Omxxs
+					</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>
diff --git a/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml
new file mode 100644
index 00000000..56fd2623
--- /dev/null
+++ b/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml
@@ -0,0 +1,175 @@
+<?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>
+      <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:InformationURL xml:lang="en">https://login.ntua.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">https://login.ntua.gr/</mdui:InformationURL>
+      </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:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIEmzCCA4OgAwIBAgIBTDANBgkqhkiG9w0BAQUFADA4MQswCQYDVQQGEwJHUjEN
+                            MAsGA1UEChMETlRVQTEaMBgGA1UEAxMRTlRVQSBDQSAyMDA2LTIwMTgwHhcNMDcw
+                            MzIzMTE0NjAyWhcNMTcwMzIwMTE0NjAyWjBTMQswCQYDVQQGEwJncjENMAsGA1UE
+                            ChMEbnR1YTEQMA4GA1UECxMHc2VydmVyczEWMBQGA1UEAxMNbG9naW4ubnR1YS5n
+                            cjELMAkGA1UEBRMCNzYwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALZ9Qnww
+                            BRe5Kc0EYuVdbkMASUIBc624cYA8QCv9e0S769ePElXSndg7caaSRXG8pN4gkc9+
+                            LUhvqefUt3ihIDsOIcdDW1tGOJ5b9UH9zjRpUCjubKOcYSxaxFjs+15RGhMweSwm
+                            DwYcFLpmDvFC7vbh+X8rt5ri4S3YSpT9eZdVAgMBAAGjggIXMIICEzAJBgNVHRME
+                            AjAAMEwGA1UdIARFMEMwDQYLKwYBBAGHSQMCAQEwMgYLKwYBBAGHSQMBAQEwIzAh
+                            BggrBgEFBQcCARYVaHR0cDovL2NhLm50dWEuZ3IvY3BzMBEGCWCGSAGG+EIBAQQE
+                            AwIGQDALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwIQYJYIZIAYb4
+                            QgENBBQWEldXVy1TZXJ2ZXIgb2YgTlRVQTAdBgNVHQ4EFgQUiEqRWLpVT7bpJ6K4
+                            9EfC0UPUGpkwWwYDVR0jBFQwUoAUfNqsx+A0dIrLwYwYsWoolK95CJWhN6Q1MDMx
+                            CzAJBgNVBAYTAkdSMQ0wCwYDVQQKEwROVFVBMRUwEwYDVQQDEwxOVFVBIFJPT1Qg
+                            Q0GCAQIwLwYDVR0RBCgwJoEPbm9jQG5vYy5udHVhLmdyhwSTZt7dgg1sb2dpbi5u
+                            dHVhLmdyMBUGA1UdEgQOMAyBCmNhQG50dWEuZ3IwMgYJYIZIAYb4QgEEBCUWI2h0
+                            dHA6Ly9jYS5udHVhLmdyL3B1Yi9jcmwvY2FjcmwuY3JsMDIGCWCGSAGG+EIBAwQl
+                            FiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDA0BgNVHR8ELTAr
+                            MCmgJ6AlhiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDANBgkq
+                            hkiG9w0BAQUFAAOCAQEAXHXewa99f7iIlhvgdMWp6NXfT9TG9FCGWhtO2V5GeUii
+                            2TBYddAH6+tYrVlJ4cN6p444Dhvin8eVA/Y0WfeVll4YasViq6zxSH9FLZkszbKr
+                            f7CfFyYqChsjcrn/oGJWsfsqGqMGPfdAQSkkpyGOHVMMARCY+gP0S973yK89frkA
+                            QGG+elGtKx786IeEEbm4YS4Z0VMkD3obJk/QRmiy6lvHadODGcpiGLCZq9G1Es2i
+                            mcNedy126VjwlNcg6XBbl0shvgGkjqzA89TPFY/FwtklJGfNl8SP88p8I41CsM8Q
+                            /PFGb40C/OoiQncMfOelJJXz6O+w4jNGdUoJdTCpdQ==
+                        </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>
+                            MIIDFDCCAfygAwIBAgIJAOE9jL5hLZ+yMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+                            BAMTDWxvZ2luLm50dWEuZ3IwHhcNMTMxMjExMTMyNzM3WhcNMjMxMjA5MTMyNzM3
+                            WjAYMRYwFAYDVQQDEw1sb2dpbi5udHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOC
+                            AQ8AMIIBCgKCAQEA9PPd/C1Smrn+DH1bYdJ24qqvA7aDt7izs/c9bmsF1/zOumIj
+                            3Tmi9V/zmeNt2yiV/Nva2ZU3M/cTUxZST7XYWz+758EyqmvKVvHgyOmmF8JdV+9r
+                            hFT3R3DEdDnGnep4N7QZySOQ/mOp3IsY2Wxqka3NU672keZq/VhV/B1MPDqhqPGt
+                            TPeW/NJGjo2UrMKkeyJLCHQJeNbKOOSzefc5TJYFJHLXqGs7DWIXwqqab0MPJ3Na
+                            N7Ap0SEIZWpNS7u/lAAS//1HJQ26zW15GcUhxgi2pMk3GHs6uwWF+DYLEbWg17MQ
+                            Er9MFbftJjf9V4GOfUILDvgNlutCPnmM6aB4gQIDAQABo2EwXzA+BgNVHREENzA1
+                            gg1sb2dpbi5udHVhLmdyhiRodHRwczovL2xvZ2luLm50dWEuZ3IvaWRwL3NoaWJi
+                            b2xldGgwHQYDVR0OBBYEFNP8/C26TomQ3yAZFMY2W84V40ihMA0GCSqGSIb3DQEB
+                            BQUAA4IBAQAv4cC1fu39MNQlvoSY/k/kV7cbkmS30FfVlsuwdfZQJO/3r2a/E7kd
+                            l9QR9Us+Eraabx6ccq6BYbtsMaXkDrgKPL6KfXFWNIjbizqmmvgdlB2ptYYKN7d0
+                            Bz2L7y0ZWkKApEBDVMUwmBHsS18xs35xchKyezTAralRy3tHBAop93jBumHiRRYF
+                            RuRSEM4KM01/DkDDwkCXWEWu0TolnSozTFtYddwi1u48s0tq4TSBkYk3C7XoyCol
+                            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>
+                            MIIEmzCCA4OgAwIBAgIBTDANBgkqhkiG9w0BAQUFADA4MQswCQYDVQQGEwJHUjEN
+                            MAsGA1UEChMETlRVQTEaMBgGA1UEAxMRTlRVQSBDQSAyMDA2LTIwMTgwHhcNMDcw
+                            MzIzMTE0NjAyWhcNMTcwMzIwMTE0NjAyWjBTMQswCQYDVQQGEwJncjENMAsGA1UE
+                            ChMEbnR1YTEQMA4GA1UECxMHc2VydmVyczEWMBQGA1UEAxMNbG9naW4ubnR1YS5n
+                            cjELMAkGA1UEBRMCNzYwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALZ9Qnww
+                            BRe5Kc0EYuVdbkMASUIBc624cYA8QCv9e0S769ePElXSndg7caaSRXG8pN4gkc9+
+                            LUhvqefUt3ihIDsOIcdDW1tGOJ5b9UH9zjRpUCjubKOcYSxaxFjs+15RGhMweSwm
+                            DwYcFLpmDvFC7vbh+X8rt5ri4S3YSpT9eZdVAgMBAAGjggIXMIICEzAJBgNVHRME
+                            AjAAMEwGA1UdIARFMEMwDQYLKwYBBAGHSQMCAQEwMgYLKwYBBAGHSQMBAQEwIzAh
+                            BggrBgEFBQcCARYVaHR0cDovL2NhLm50dWEuZ3IvY3BzMBEGCWCGSAGG+EIBAQQE
+                            AwIGQDALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwIQYJYIZIAYb4
+                            QgENBBQWEldXVy1TZXJ2ZXIgb2YgTlRVQTAdBgNVHQ4EFgQUiEqRWLpVT7bpJ6K4
+                            9EfC0UPUGpkwWwYDVR0jBFQwUoAUfNqsx+A0dIrLwYwYsWoolK95CJWhN6Q1MDMx
+                            CzAJBgNVBAYTAkdSMQ0wCwYDVQQKEwROVFVBMRUwEwYDVQQDEwxOVFVBIFJPT1Qg
+                            Q0GCAQIwLwYDVR0RBCgwJoEPbm9jQG5vYy5udHVhLmdyhwSTZt7dgg1sb2dpbi5u
+                            dHVhLmdyMBUGA1UdEgQOMAyBCmNhQG50dWEuZ3IwMgYJYIZIAYb4QgEEBCUWI2h0
+                            dHA6Ly9jYS5udHVhLmdyL3B1Yi9jcmwvY2FjcmwuY3JsMDIGCWCGSAGG+EIBAwQl
+                            FiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDA0BgNVHR8ELTAr
+                            MCmgJ6AlhiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDANBgkq
+                            hkiG9w0BAQUFAAOCAQEAXHXewa99f7iIlhvgdMWp6NXfT9TG9FCGWhtO2V5GeUii
+                            2TBYddAH6+tYrVlJ4cN6p444Dhvin8eVA/Y0WfeVll4YasViq6zxSH9FLZkszbKr
+                            f7CfFyYqChsjcrn/oGJWsfsqGqMGPfdAQSkkpyGOHVMMARCY+gP0S973yK89frkA
+                            QGG+elGtKx786IeEEbm4YS4Z0VMkD3obJk/QRmiy6lvHadODGcpiGLCZq9G1Es2i
+                            mcNedy126VjwlNcg6XBbl0shvgGkjqzA89TPFY/FwtklJGfNl8SP88p8I41CsM8Q
+                            /PFGb40C/OoiQncMfOelJJXz6O+w4jNGdUoJdTCpdQ==
+                        </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>
+                            MIIDFDCCAfygAwIBAgIJAOE9jL5hLZ+yMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+                            BAMTDWxvZ2luLm50dWEuZ3IwHhcNMTMxMjExMTMyNzM3WhcNMjMxMjA5MTMyNzM3
+                            WjAYMRYwFAYDVQQDEw1sb2dpbi5udHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOC
+                            AQ8AMIIBCgKCAQEA9PPd/C1Smrn+DH1bYdJ24qqvA7aDt7izs/c9bmsF1/zOumIj
+                            3Tmi9V/zmeNt2yiV/Nva2ZU3M/cTUxZST7XYWz+758EyqmvKVvHgyOmmF8JdV+9r
+                            hFT3R3DEdDnGnep4N7QZySOQ/mOp3IsY2Wxqka3NU672keZq/VhV/B1MPDqhqPGt
+                            TPeW/NJGjo2UrMKkeyJLCHQJeNbKOOSzefc5TJYFJHLXqGs7DWIXwqqab0MPJ3Na
+                            N7Ap0SEIZWpNS7u/lAAS//1HJQ26zW15GcUhxgi2pMk3GHs6uwWF+DYLEbWg17MQ
+                            Er9MFbftJjf9V4GOfUILDvgNlutCPnmM6aB4gQIDAQABo2EwXzA+BgNVHREENzA1
+                            gg1sb2dpbi5udHVhLmdyhiRodHRwczovL2xvZ2luLm50dWEuZ3IvaWRwL3NoaWJi
+                            b2xldGgwHQYDVR0OBBYEFNP8/C26TomQ3yAZFMY2W84V40ihMA0GCSqGSIb3DQEB
+                            BQUAA4IBAQAv4cC1fu39MNQlvoSY/k/kV7cbkmS30FfVlsuwdfZQJO/3r2a/E7kd
+                            l9QR9Us+Eraabx6ccq6BYbtsMaXkDrgKPL6KfXFWNIjbizqmmvgdlB2ptYYKN7d0
+                            Bz2L7y0ZWkKApEBDVMUwmBHsS18xs35xchKyezTAralRy3tHBAop93jBumHiRRYF
+                            RuRSEM4KM01/DkDDwkCXWEWu0TolnSozTFtYddwi1u48s0tq4TSBkYk3C7XoyCol
+                            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">National Technical University of Athens</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 - Network Management Center</md:Company>
+    <md:EmailAddress>noc@noc.ntua.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>National Technical University of Athens - Network Management Center</md:Company>
+    <md:EmailAddress>help-data@noc.ntua.gr</md:EmailAddress>
+    <md:TelephoneNumber>+30-210-772-1861</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml
new file mode 100644
index 00000000..80d0facf
--- /dev/null
+++ b/swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.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>
+  </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</mdui:Description>
+        <mdui:Logo height="36" width="108">https://static.surfconext.nl/media/idp/uu.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">Universiteit Utrecht UU</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">Universiteit Utrecht 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/419dd62d92bdaae8aef5a8a97b1c3f77"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universiteit Utrecht</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Universiteit Utrecht</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uu.nl/ict</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:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.talisaspire.com-entity.xml b/swamid-interfederations-2.0/login.talisaspire.com-entity.xml
new file mode 100644
index 00000000..00705f35
--- /dev/null
+++ b/swamid-interfederations-2.0/login.talisaspire.com-entity.xml
@@ -0,0 +1,59 @@
+<?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>
+						MIIESjCCAzKgAwIBAgIJAMtZwUsUp4zOMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYD
+						VQQGEwJVSzEWMBQGA1UECAwNV2VzdCBNaWRsYW5kczETMBEGA1UEBwwKQmlybWlu
+						Z2hhbTEYMBYGA1UECgwPVGFsaXMgRWR1Y2F0aW9uMQ4wDAYDVQQLDAVUYWxpczEY
+						MBYGA1UEAwwPdGFsaXNhc3BpcmUuY29tMSUwIwYJKoZIhvcNAQkBFhZjaHJpcy5j
+						bGFya2VAdGFsaXMuY29tMB4XDTExMDMwODA1MTM0MFoXDTIxMDMwNTA1MTM0MFow
+						gaUxCzAJBgNVBAYTAlVLMRYwFAYDVQQIDA1XZXN0IE1pZGxhbmRzMRMwEQYDVQQH
+						DApCaXJtaW5naGFtMRgwFgYDVQQKDA9UYWxpcyBFZHVjYXRpb24xDjAMBgNVBAsM
+						BVRhbGlzMRgwFgYDVQQDDA90YWxpc2FzcGlyZS5jb20xJTAjBgkqhkiG9w0BCQEW
+						FmNocmlzLmNsYXJrZUB0YWxpcy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQC2jZ0F13y/HTgY+8IeQup/7jpz3B92qJAKqwr0C/MyQfwYAmB1GjOF
+						KatEmOGFVfNtYRrALj7pbupnk8Ef9LuaQ4tIoKronwbdGhlgXkju4dkw29Mb4pQ/
+						+XUBeWfsw+P9B6TwWk8Ve12bPqrwdSgEUFXgke74HjJIzGDGGdd7p4uAUJM7zXzY
+						JeirO8hJps8SURuBKqlB5bIZM55NQ3l+HaoSP5MAFhzToBDTFS9XBalr6cz34pNm
+						7Tl2OZrF4Ze3icIWYuTDp/P+TKoyVbEVJXpAzvg4xve9/HCIBMD3TWoNJ4H78iR9
+						GIs8UMZFQL72G1PEX9x5u5FZDgEaJ59LAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJ
+						YIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1Ud
+						DgQWBBQLIjm7E2bjzlksRCqfC3wndwz54TAfBgNVHSMEGDAWgBQLIjm7E2bjzlks
+						RCqfC3wndwz54TANBgkqhkiG9w0BAQUFAAOCAQEAqBGZuPQkesleYXskpWTcmMSo
+						SOVN/fqGgwKKIizYn41iGJVnbJyy2v5c3I3mHd09zNhqCyHJysIy5EhwrA24BXHF
+						n6CbrPDIiDlg6gRx6rpBwxdXLnyihBHSSg5MSe5aGW5r/gEJ/2/LE9kavj/N8Ggu
+						sI5mcCc2NACB3QCr8/ZDZgUH0EadrQfTp1B3glB2fMCHm0dGsXnU9DWjXSHq5BTA
+						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>
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
new file mode 100644
index 00000000..970a9c8b
--- /dev/null
+++ b/swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml
@@ -0,0 +1,53 @@
+<?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>
+  </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/media/idp/terena.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">TERENA Secretariat Trans-European Research and Education Networking Association</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">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: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
new file mode 100644
index 00000000..acd68f6f
--- /dev/null
+++ b/swamid-interfederations-2.0/login.uea.ac.uk-entity.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIDoDCCAoigAwIBAgIJAIuKNtoJUQjXMA0GCSqGSIb3DQEBBQUAMD4xIjAgBgNV
+						BAoTGVVuaXZlcnNpdHkgb2YgRWFzdCBBbmdsaWExGDAWBgNVBAMTD2xvZ2luLnVl
+						YS5hYy51azAeFw0xMDExMDkwNzU3NTJaFw0yMDExMDYwNzU3NTJaMD4xIjAgBgNV
+						BAoTGVVuaXZlcnNpdHkgb2YgRWFzdCBBbmdsaWExGDAWBgNVBAMTD2xvZ2luLnVl
+						YS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM9oeuK7k5dK
+						bp97dCPSq7gqVrm3Rq2fyW62SFx1IVwFBtoW1CIQOkDJF8bVkKa2U+dMmwLHvfEP
+						qVnXXA59eDJeGRib2ME6o1q90McllqBVWhuBoR08GFEdXhbt1lpUpBNOF+V9lv+y
+						f37bDm2ii+iaCaOcaT5sO9g0krqw/mlWsSPUIhAG7TzndSECH4lHdqBEWPlk87gn
+						5LeuezjWpgQmdPD6PaB2fuTyQyP+BeNeIK8EiJvCpBzA92EKitTHxTa6ON3LEy0L
+						qzJCDWx7rq0R0ch7TmzGw8DLrKIWRHbfH2nMWMFMp7Hf1EhB/Z1+R7nhgIV6HxQi
+						d+DmuhrLJB8CAwEAAaOBoDCBnTAdBgNVHQ4EFgQUREAlXs64Gbcn4E+0R5mumL5k
+						+MwwbgYDVR0jBGcwZYAUREAlXs64Gbcn4E+0R5mumL5k+MyhQqRAMD4xIjAgBgNV
+						BAoTGVVuaXZlcnNpdHkgb2YgRWFzdCBBbmdsaWExGDAWBgNVBAMTD2xvZ2luLnVl
+						YS5hYy51a4IJAIuKNtoJUQjXMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAKhau/vUIiWf7K2ILlfdK89NKLuvUwndns9sYEcIFAqTMWnGlpXogPzFUqvd
+						PTEjYSkffvr5xHPIasBpaouVmqsr245P1aX9qZh4f6K7FLS+hUHdJvaFrGl6oxEe
+						WPILAJimme/YZqVCmyyLeYAB+l9Yt81wd+xkaajOrbNalv2f1fxIwQpGp3oosR3b
+						WXVQwwCnZX7KrZHmIfiRvY9yYctOsXs1xlbZoR8m0F5Tq3xOZIoHjOoWyl4AARFM
+						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>
+						MIIDoDCCAoigAwIBAgIJAIuKNtoJUQjXMA0GCSqGSIb3DQEBBQUAMD4xIjAgBgNV
+						BAoTGVVuaXZlcnNpdHkgb2YgRWFzdCBBbmdsaWExGDAWBgNVBAMTD2xvZ2luLnVl
+						YS5hYy51azAeFw0xMDExMDkwNzU3NTJaFw0yMDExMDYwNzU3NTJaMD4xIjAgBgNV
+						BAoTGVVuaXZlcnNpdHkgb2YgRWFzdCBBbmdsaWExGDAWBgNVBAMTD2xvZ2luLnVl
+						YS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM9oeuK7k5dK
+						bp97dCPSq7gqVrm3Rq2fyW62SFx1IVwFBtoW1CIQOkDJF8bVkKa2U+dMmwLHvfEP
+						qVnXXA59eDJeGRib2ME6o1q90McllqBVWhuBoR08GFEdXhbt1lpUpBNOF+V9lv+y
+						f37bDm2ii+iaCaOcaT5sO9g0krqw/mlWsSPUIhAG7TzndSECH4lHdqBEWPlk87gn
+						5LeuezjWpgQmdPD6PaB2fuTyQyP+BeNeIK8EiJvCpBzA92EKitTHxTa6ON3LEy0L
+						qzJCDWx7rq0R0ch7TmzGw8DLrKIWRHbfH2nMWMFMp7Hf1EhB/Z1+R7nhgIV6HxQi
+						d+DmuhrLJB8CAwEAAaOBoDCBnTAdBgNVHQ4EFgQUREAlXs64Gbcn4E+0R5mumL5k
+						+MwwbgYDVR0jBGcwZYAUREAlXs64Gbcn4E+0R5mumL5k+MyhQqRAMD4xIjAgBgNV
+						BAoTGVVuaXZlcnNpdHkgb2YgRWFzdCBBbmdsaWExGDAWBgNVBAMTD2xvZ2luLnVl
+						YS5hYy51a4IJAIuKNtoJUQjXMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAKhau/vUIiWf7K2ILlfdK89NKLuvUwndns9sYEcIFAqTMWnGlpXogPzFUqvd
+						PTEjYSkffvr5xHPIasBpaouVmqsr245P1aX9qZh4f6K7FLS+hUHdJvaFrGl6oxEe
+						WPILAJimme/YZqVCmyyLeYAB+l9Yt81wd+xkaajOrbNalv2f1fxIwQpGp3oosR3b
+						WXVQwwCnZX7KrZHmIfiRvY9yYctOsXs1xlbZoR8m0F5Tq3xOZIoHjOoWyl4AARFM
+						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>
diff --git a/swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml b/swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml
new file mode 100644
index 00000000..fed0293f
--- /dev/null
+++ b/swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxMjAwBgNVBAoTKVVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMQwwCgYDVQQLEwNDUEQx
+JTAjBgkqhkiG9w0BCQEWFmZvc2NhcmluaUBjcGQudWZyZ3MuYnIxFTATBgNVBAcT
+DFBvcnRvIEFsZWdyZTEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNV
+BAYTAkJSMRcwFQYDVQQDEw5sb2dpbi51ZnJncy5icjAeFw0xMzAxMDMxNzU3NDVa
+Fw0xNjAxMDMxNzU3NDVaMIHCMTIwMAYDVQQKEylVbml2ZXJzaWRhZGUgRmVkZXJh
+bCBkbyBSaW8gR3JhbmRlIGRvIFN1bDEMMAoGA1UECxMDQ1BEMSUwIwYJKoZIhvcN
+AQkBFhZmb3NjYXJpbmlAY3BkLnVmcmdzLmJyMRUwEwYDVQQHEwxQb3J0byBBbGVn
+cmUxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEXMBUG
+A1UEAxMObG9naW4udWZyZ3MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC8fLEh7cCQVt0LwqhO5aqUVgh+UDY14fXIi/NLIF/cGW8fz/sL+ZQ/A8/w
+ghXVH/+Fz4BQT1l/ON+wXhgyzum26Ic28+v5U8+zFIw56Qt762t+LNFigyUUnNDB
+2wsctazoyvp0BsEZm/NC+9icGjOZbDzJDMa5upsDsxxCrI3Eeu8JLPQ5F8/uQgJw
+jtFvDJhjixBYeahlQ93oR7ZFSJneFqLoIrE5CgnK0N51OkshiQtKduNTN+NfRofG
+bqU+nfMGk5gRNfd9O0I4KapVxfSj3gjg4HJjX/hvaT/gLDDMiICZSyOY2Lx+Vjbs
+qBqdgRIx36iLCSOGtUwvEk7VpxZPAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIUJ
+OF+eWl6O7zZ3Pbb9nvsMx8RV8SgfgdKuATFboeHCWsuc0U/YM+RR3f9fInMLjBQC
+Dm+rvGhVjZgvgQJPenkIy49CZ4OmbRGCerZi2bFmB59cVYCisguPcc7xuJrk8hQI
+71Pztij+L2DR4WJ3GLhhF4wR+3Nr4ElHZyhP6WpMx+DMFfiHVHfVtZkQakpgDOhr
+l5reSTUY4gaj4KVESTXBsgJ+2R7xwwJSiNbtbTixhY8P2KkKHQ6LHigc3EhDA6YW
+Dh7IIF01BPWbOdLHGgWAGTEMXmOoSd0iv7mgHOSCbjETABC8zl5tn1WRaZfIEOsE
+OZgo7MlCCIU7m3ddaIg=
+            </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+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxMjAwBgNVBAoTKVVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMQwwCgYDVQQLEwNDUEQx
+JTAjBgkqhkiG9w0BCQEWFmZvc2NhcmluaUBjcGQudWZyZ3MuYnIxFTATBgNVBAcT
+DFBvcnRvIEFsZWdyZTEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNV
+BAYTAkJSMRcwFQYDVQQDEw5sb2dpbi51ZnJncy5icjAeFw0xMzAxMDMxNzU3NDVa
+Fw0xNjAxMDMxNzU3NDVaMIHCMTIwMAYDVQQKEylVbml2ZXJzaWRhZGUgRmVkZXJh
+bCBkbyBSaW8gR3JhbmRlIGRvIFN1bDEMMAoGA1UECxMDQ1BEMSUwIwYJKoZIhvcN
+AQkBFhZmb3NjYXJpbmlAY3BkLnVmcmdzLmJyMRUwEwYDVQQHEwxQb3J0byBBbGVn
+cmUxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEXMBUG
+A1UEAxMObG9naW4udWZyZ3MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC8fLEh7cCQVt0LwqhO5aqUVgh+UDY14fXIi/NLIF/cGW8fz/sL+ZQ/A8/w
+ghXVH/+Fz4BQT1l/ON+wXhgyzum26Ic28+v5U8+zFIw56Qt762t+LNFigyUUnNDB
+2wsctazoyvp0BsEZm/NC+9icGjOZbDzJDMa5upsDsxxCrI3Eeu8JLPQ5F8/uQgJw
+jtFvDJhjixBYeahlQ93oR7ZFSJneFqLoIrE5CgnK0N51OkshiQtKduNTN+NfRofG
+bqU+nfMGk5gRNfd9O0I4KapVxfSj3gjg4HJjX/hvaT/gLDDMiICZSyOY2Lx+Vjbs
+qBqdgRIx36iLCSOGtUwvEk7VpxZPAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIUJ
+OF+eWl6O7zZ3Pbb9nvsMx8RV8SgfgdKuATFboeHCWsuc0U/YM+RR3f9fInMLjBQC
+Dm+rvGhVjZgvgQJPenkIy49CZ4OmbRGCerZi2bFmB59cVYCisguPcc7xuJrk8hQI
+71Pztij+L2DR4WJ3GLhhF4wR+3Nr4ElHZyhP6WpMx+DMFfiHVHfVtZkQakpgDOhr
+l5reSTUY4gaj4KVESTXBsgJ+2R7xwwJSiNbtbTixhY8P2KkKHQ6LHigc3EhDA6YW
+Dh7IIF01BPWbOdLHGgWAGTEMXmOoSd0iv7mgHOSCbjETABC8zl5tn1WRaZfIEOsE
+OZgo7MlCCIU7m3ddaIg=
+                    
+            </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>
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
new file mode 100644
index 00000000..eb0f99fa
--- /dev/null
+++ b/swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml
@@ -0,0 +1,59 @@
+<?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-09T09:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="lt">https://fedi.litnet.lt/lt/tvarka</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">https://fedi.litnet.lt/en/policy</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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="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="256" height="256">https://login.utenos-kolegija.lt/static/logo_tr.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.219.181.192/26</mdui:IPHint>
+        <mdui:DomainHint>utenos-kolegija.lt</mdui:DomainHint>
+        <mdui:DomainHint>ukolegija.lt</mdui:DomainHint>
+        <mdui:DomainHint>utenacollege.eu</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:55.5,25.6</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>MIIGITCCBAmgAwIBAgICUAEwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMCTFQxGDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEYMBYGA1UEAwwPVXRlbm9zIGtvbGVnaWphMB4XDTE0MDgxMjA2MjYwNFoXDTI0MDgwOTA2MjYwNFowWDELMAkGA1UEBhMCTFQxGDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEMMAoGA1UECwwDSWRQMSEwHwYDVQQDDBhsb2dpbi51dGVub3Mta29sZWdpamEubHQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCs/TqFTWGqdM+1C6I4p5UE4CnXi7h2wcKZ2sHR8RAuPZvfrjFEjLOo72eYiXZ7QTCfg/5m7CIhjRZYerW9GjRoM9UPPmhkJThI9QSClDSXyAhADm7Yehp7n+tB78GeGlMeJoVaw2tskUxmKsjcdylUitSSThKHpl3Xi4SViXQgNK3RmAPMF7nzYZ6SOH2Ufaf1Yg+ky0iX50xsh19s5aQ+gc/JHnvvGNx+XIk0Wf/zj6uD+M0hI5OcK6Y69cUxfeIXaQe2cLNTOMpTKPHcR0R11TvBZnDhhnIHio/EOEx/8Zp0YebWUH9Ol4c6WB85ndqIZ90XnFEqGtCwFLiXPjrSli0JfpZMHkv2iF6xpeJVpTarMVPRzRemqIroDqHcDbUNJ3OAdoWpcZ1EmrkWwlHZa52K6cm8G1WqsSP2ghoWjeNl7gkuF9DTfWx33F4bOWcJ7WM++khTPDBhUTrWoIcjyu63liHGEV0mLvACm85bnje39XTpQ9/c1QLNNitDnt05XOnR6jKnvCXB8Np5MVmG+23gzleaO973xTTaQlhhFzIShEIKGNrqSZCUgh6ehsaXT8osxHxpOXwxd1HWLZj+N5/SXeFT8BUv/sQAwEgXrdA32w8bUf/1uJnHTw1b7KYx1bi+YuejIsfmv5Hh8uRgO1/qoCMFIdBb0G8c7jQrtwIDAQABo4IBCjCCAQYwDwYDVR0TAQH/BAUwAwEBADAdBgNVHQ4EFgQUcvHStojsZcuShVRpNcJkLmFby88wagYDVR0jBGMwYYAUQeWj/Ma9Fu5g3DHHEezH9JZ33A2hRaRDMEExCzAJBgNVBAYTAkxUMRgwFgYDVQQKDA9VdGVub3Mga29sZWdpamExGDAWBgNVBAMMD1V0ZW5vcyBrb2xlZ2lqYYICE4gwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL3d3dy51dGVub3Mta29sZWdpamEubHQvdWtvbGVnaWphLmNybDALBgNVHQ8EBAMCAKgwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4ICAQBFRmlUAfF3RTfhIOay1xKfTKE5NVOnZ1g5bVnMhyci8U76aSs91xThWr4ratbDOmkrujAL/TGCkmgiTgDAztQEt6ZzjSbscHs7W3i7C2XkwsJ2XKFgQmOXHD3IflN6FcxcMCU35pEzGfqBFIEjFeSt45pcJ77GEFGnxWvuSybERyJF/PDFRy9VAaT4FSIOy2OXZdUW0bBuU9nCqKISVnQ8qTJPm2qlC+g+zl5/bmlFu0B0aGyQVvLdeqGwapC8oIuLW9d6LwdUd5bcNSJdbLxOrKJ458/I9wZ69BZA5hOg7uB1YRK8v3XuhFNPQUB8QeVe4L2ae4FY3lypHGdH0iAfr7C3c/1GhuRNbRFqi9sIQOWU/wdSiw7xTax2I5Ncy6CcSjDT1LCFNIU3QnuB/DoAVHY+LG+3CqRIaM6c+hVw5WiIttIQadX94mSSUpCY0Y8tYXvvD0N32Q64cQBlB0vvj2z6925X3UyhUEjLYYIo/+JLo1v17Ta+fdqYtIr+tlT340eUa0Z+YOZ04TIzfer1p6a6kDDz5uSIaGR7KqCUxc+S4eJqqWfkpiZeBV0MOlujel6XVFLC2CIVcb5cAdi7hpUVEHnN1VIkiElj3WHvPCXCQ5g1Y2/cUHTlEKznj9X7OaE5yB8TaJ70N3iVL1dcDebj6FVy4WPNsp66iv3hRA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGITCCBAmgAwIBAgICUAEwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMCTFQxGDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEYMBYGA1UEAwwPVXRlbm9zIGtvbGVnaWphMB4XDTE0MDgxMjA2MjYwNFoXDTI0MDgwOTA2MjYwNFowWDELMAkGA1UEBhMCTFQxGDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEMMAoGA1UECwwDSWRQMSEwHwYDVQQDDBhsb2dpbi51dGVub3Mta29sZWdpamEubHQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCs/TqFTWGqdM+1C6I4p5UE4CnXi7h2wcKZ2sHR8RAuPZvfrjFEjLOo72eYiXZ7QTCfg/5m7CIhjRZYerW9GjRoM9UPPmhkJThI9QSClDSXyAhADm7Yehp7n+tB78GeGlMeJoVaw2tskUxmKsjcdylUitSSThKHpl3Xi4SViXQgNK3RmAPMF7nzYZ6SOH2Ufaf1Yg+ky0iX50xsh19s5aQ+gc/JHnvvGNx+XIk0Wf/zj6uD+M0hI5OcK6Y69cUxfeIXaQe2cLNTOMpTKPHcR0R11TvBZnDhhnIHio/EOEx/8Zp0YebWUH9Ol4c6WB85ndqIZ90XnFEqGtCwFLiXPjrSli0JfpZMHkv2iF6xpeJVpTarMVPRzRemqIroDqHcDbUNJ3OAdoWpcZ1EmrkWwlHZa52K6cm8G1WqsSP2ghoWjeNl7gkuF9DTfWx33F4bOWcJ7WM++khTPDBhUTrWoIcjyu63liHGEV0mLvACm85bnje39XTpQ9/c1QLNNitDnt05XOnR6jKnvCXB8Np5MVmG+23gzleaO973xTTaQlhhFzIShEIKGNrqSZCUgh6ehsaXT8osxHxpOXwxd1HWLZj+N5/SXeFT8BUv/sQAwEgXrdA32w8bUf/1uJnHTw1b7KYx1bi+YuejIsfmv5Hh8uRgO1/qoCMFIdBb0G8c7jQrtwIDAQABo4IBCjCCAQYwDwYDVR0TAQH/BAUwAwEBADAdBgNVHQ4EFgQUcvHStojsZcuShVRpNcJkLmFby88wagYDVR0jBGMwYYAUQeWj/Ma9Fu5g3DHHEezH9JZ33A2hRaRDMEExCzAJBgNVBAYTAkxUMRgwFgYDVQQKDA9VdGVub3Mga29sZWdpamExGDAWBgNVBAMMD1V0ZW5vcyBrb2xlZ2lqYYICE4gwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL3d3dy51dGVub3Mta29sZWdpamEubHQvdWtvbGVnaWphLmNybDALBgNVHQ8EBAMCAKgwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4ICAQBFRmlUAfF3RTfhIOay1xKfTKE5NVOnZ1g5bVnMhyci8U76aSs91xThWr4ratbDOmkrujAL/TGCkmgiTgDAztQEt6ZzjSbscHs7W3i7C2XkwsJ2XKFgQmOXHD3IflN6FcxcMCU35pEzGfqBFIEjFeSt45pcJ77GEFGnxWvuSybERyJF/PDFRy9VAaT4FSIOy2OXZdUW0bBuU9nCqKISVnQ8qTJPm2qlC+g+zl5/bmlFu0B0aGyQVvLdeqGwapC8oIuLW9d6LwdUd5bcNSJdbLxOrKJ458/I9wZ69BZA5hOg7uB1YRK8v3XuhFNPQUB8QeVe4L2ae4FY3lypHGdH0iAfr7C3c/1GhuRNbRFqi9sIQOWU/wdSiw7xTax2I5Ncy6CcSjDT1LCFNIU3QnuB/DoAVHY+LG+3CqRIaM6c+hVw5WiIttIQadX94mSSUpCY0Y8tYXvvD0N32Q64cQBlB0vvj2z6925X3UyhUEjLYYIo/+JLo1v17Ta+fdqYtIr+tlT340eUa0Z+YOZ04TIzfer1p6a6kDDz5uSIaGR7KqCUxc+S4eJqqWfkpiZeBV0MOlujel6XVFLC2CIVcb5cAdi7hpUVEHnN1VIkiElj3WHvPCXCQ5g1Y2/cUHTlEKznj9X7OaE5yB8TaJ70N3iVL1dcDebj6FVy4WPNsp66iv3hRA==</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:NameIDFormat>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.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>mantas@utenos-kolegija.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
new file mode 100644
index 00000000..d9291041
--- /dev/null
+++ b/swamid-interfederations-2.0/login.w-hs.de-idp-shibboleth.xml
@@ -0,0 +1,159 @@
+<?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="2015-01-13T13:45: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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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
+BhMCREUxSDBGBgNVBAoTP1dlc3RmYWVsaXNjaGUgSG9jaHNjaHVsZSBHZWxzZW5r
+aXJjaGVuLCBCb2Nob2x0LCBSZWNrbGluZ2hhdXNlbjEvMC0GA1UEAxMmQ0EgZGVy
+IFdlc3RmYWVsaXNjaGVuIEhvY2hzY2h1bGUgLSBHMDExGTAXBgkqhkiG9w0BCQEW
+CmNhQHctaHMuZGUwHhcNMTQxMTIxMDk1MDE0WhcNMTkwNzA2MDAwMDAwWjCBtjEL
+MAkGA1UEBhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xFjAUBgNV
+BAcTDUdlbHNlbmtpcmNoZW4xSDBGBgNVBAoTP1dlc3RmYWVsaXNjaGUgSG9jaHNj
+aHVsZSBHZWxzZW5raXJjaGVuLCBCb2Nob2x0LCBSZWNrbGluZ2hhdXNlbjEPMA0G
+A1UECxMGWklNLUlUMRYwFAYDVQQDEw1sb2dpbi53LWhzLmRlMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAuxkxwqc536d5blbSQG6VrReP5UdEWuDNV6nZ
+Hv9EtQ4WobU6hSk/hi/vIX+2NMQ56AI1WCewc2IwqAAdn6y7QbB79qqz1E9GZa04
+odpEOJSe+C+rdA4t1KJlEuzRSAaredliMbNWWOQhaoVqx9IYcoddE6M1WQktMtAV
+3XFVpNeEdty1kK4/Agfg1qzAoBkUNG2uKVWrjqvzJU/vsdsDRwKY5aAJGy5xj2Pd
+SoQE31K8oyKJKT1suFPsbQ9yqlfrgAW8GzrblfHNV2ZNfXK54DVJIrsLq6nnMXnc
+6ie/v6FuAv9zA5isBBN6EKQ4gwOhv0662PlBqnnDJlFvhHm7eInTS0iC4Mq4/VD6
+r0phSVWevTqKf6rr9Ljm3MmGXIytB/0gHnmMYtzSiUhOHezX1pyrytzCtCh3WM4F
+U/EEUwFmYFZ7v80/ENTveAezhSC5Sg8ZKNxhiV1dcONTRDVQu4wwGvvgs8dOMe1M
+cW5R+Jqx2TTCVUzWQ58QHOKR+caRfy+nRUpM7wBPE1Ossy0/FS3VCxRGlDNWBc8c
+agSyXiwidDGJkOMd8nfsVEb/VbBHNEA3OXh3DKDTPYOw2Tey7/Uo2MVvNWy4e23A
+SY3l/nCrFZ2iapefeZfYQiESHWQ/71MpSn60VdeGt1L9CniNIsYsVW/JEbt0wvIo
+nD2kkAsCAwEAAaOCAi0wggIpMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUlTAP3LoqZtwR/c5+
+VR6DYP4HzAAwHwYDVR0jBBgwFoAU/LMkKo3ThpDON7se1/by9MeqXygwGAYDVR0R
+BBEwD4INbG9naW4udy1ocy5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL3ctaHMtY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdy1ocy1jYS9wdWIvY3JsL2NhY3JsLmNybDCB
+yQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5k
+Zm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS93LWhzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBABggrBgEF
+BQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS93LWhzLWNhL3B1Yi9jYWNlcnQv
+Y2FjZXJ0LmNydDBPBgNVHSAESDBGMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGB
+rSGCLB4wEQYPKwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATANBgkq
+hkiG9w0BAQsFAAOCAQEAduqxgH88kkDpiIzH1QKaiGk+JoZbzcj9PcBPocpk1K3k
+LCzRSqNM+XUvQtmSzJA5Q4t5kZ9Xk0iU4NYxkXV3vhQOtHc3UT4ZAIImcRmoBZDw
+Pnk7L9ezrKfw4OIbw+a8y9w0KVrlMifHPahcc5Vp7k6B3l8sWS/A4NONCbTY0b9k
+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
+BhMCREUxSDBGBgNVBAoTP1dlc3RmYWVsaXNjaGUgSG9jaHNjaHVsZSBHZWxzZW5r
+aXJjaGVuLCBCb2Nob2x0LCBSZWNrbGluZ2hhdXNlbjEvMC0GA1UEAxMmQ0EgZGVy
+IFdlc3RmYWVsaXNjaGVuIEhvY2hzY2h1bGUgLSBHMDExGTAXBgkqhkiG9w0BCQEW
+CmNhQHctaHMuZGUwHhcNMTQxMTIxMDk1MDE0WhcNMTkwNzA2MDAwMDAwWjCBtjEL
+MAkGA1UEBhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xFjAUBgNV
+BAcTDUdlbHNlbmtpcmNoZW4xSDBGBgNVBAoTP1dlc3RmYWVsaXNjaGUgSG9jaHNj
+aHVsZSBHZWxzZW5raXJjaGVuLCBCb2Nob2x0LCBSZWNrbGluZ2hhdXNlbjEPMA0G
+A1UECxMGWklNLUlUMRYwFAYDVQQDEw1sb2dpbi53LWhzLmRlMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAuxkxwqc536d5blbSQG6VrReP5UdEWuDNV6nZ
+Hv9EtQ4WobU6hSk/hi/vIX+2NMQ56AI1WCewc2IwqAAdn6y7QbB79qqz1E9GZa04
+odpEOJSe+C+rdA4t1KJlEuzRSAaredliMbNWWOQhaoVqx9IYcoddE6M1WQktMtAV
+3XFVpNeEdty1kK4/Agfg1qzAoBkUNG2uKVWrjqvzJU/vsdsDRwKY5aAJGy5xj2Pd
+SoQE31K8oyKJKT1suFPsbQ9yqlfrgAW8GzrblfHNV2ZNfXK54DVJIrsLq6nnMXnc
+6ie/v6FuAv9zA5isBBN6EKQ4gwOhv0662PlBqnnDJlFvhHm7eInTS0iC4Mq4/VD6
+r0phSVWevTqKf6rr9Ljm3MmGXIytB/0gHnmMYtzSiUhOHezX1pyrytzCtCh3WM4F
+U/EEUwFmYFZ7v80/ENTveAezhSC5Sg8ZKNxhiV1dcONTRDVQu4wwGvvgs8dOMe1M
+cW5R+Jqx2TTCVUzWQ58QHOKR+caRfy+nRUpM7wBPE1Ossy0/FS3VCxRGlDNWBc8c
+agSyXiwidDGJkOMd8nfsVEb/VbBHNEA3OXh3DKDTPYOw2Tey7/Uo2MVvNWy4e23A
+SY3l/nCrFZ2iapefeZfYQiESHWQ/71MpSn60VdeGt1L9CniNIsYsVW/JEbt0wvIo
+nD2kkAsCAwEAAaOCAi0wggIpMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUlTAP3LoqZtwR/c5+
+VR6DYP4HzAAwHwYDVR0jBBgwFoAU/LMkKo3ThpDON7se1/by9MeqXygwGAYDVR0R
+BBEwD4INbG9naW4udy1ocy5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL3ctaHMtY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdy1ocy1jYS9wdWIvY3JsL2NhY3JsLmNybDCB
+yQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5k
+Zm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS93LWhzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBABggrBgEF
+BQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS93LWhzLWNhL3B1Yi9jYWNlcnQv
+Y2FjZXJ0LmNydDBPBgNVHSAESDBGMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGB
+rSGCLB4wEQYPKwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATANBgkq
+hkiG9w0BAQsFAAOCAQEAduqxgH88kkDpiIzH1QKaiGk+JoZbzcj9PcBPocpk1K3k
+LCzRSqNM+XUvQtmSzJA5Q4t5kZ9Xk0iU4NYxkXV3vhQOtHc3UT4ZAIImcRmoBZDw
+Pnk7L9ezrKfw4OIbw+a8y9w0KVrlMifHPahcc5Vp7k6B3l8sWS/A4NONCbTY0b9k
+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>
diff --git a/swamid-interfederations-2.0/los.scran.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/los.scran.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..67413dcf
--- /dev/null
+++ b/swamid-interfederations-2.0/los.scran.ac.uk-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+					MIIEpzCCA4+gAwIBAgIJAJr9uyuwy/Y2MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
+					VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEP
+					MA0GA1UEChMGUkNBSE1TMQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jh
+					bi5hYy51azEkMCIGCSqGSIb3DQEJARYVd2ViYWRtaW5zQHNjcmFuLmFjLnVrMB4X
+					DTEwMDIyMjExNDU1OVoXDTIwMDIyMDExNDU1OVowgZMxCzAJBgNVBAYTAkdCMREw
+					DwYDVQQIEwhTY290bGFuZDESMBAGA1UEBxMJRWRpbmJ1cmdoMQ8wDQYDVQQKEwZS
+					Q0FITVMxDjAMBgNVBAsTBVNjcmFuMRYwFAYDVQQDDA0qLnNjcmFuLmFjLnVrMSQw
+					IgYJKoZIhvcNAQkBFhV3ZWJhZG1pbnNAc2NyYW4uYWMudWswggEiMA0GCSqGSIb3
+					DQEBAQUAA4IBDwAwggEKAoIBAQDEywuow7F7KjwlfTa4vj/2QWvtexIy+OO0hWvn
+					SJ8B3goDjqaC7Mv1fNJdxtZMl/kR6ZfMT86Xa2VfK47NOe14jJDgZxN/0lbwsLwb
+					GyyxcZeDg0NCcv/jFKUiH6m2jSLkpSrSTHuUqRUhGpR0wcr3+HZjLZrpHI0FQ5EH
+					cnkhg1fYwZ5Z6vth+0NhZt9HjWLrUtia4Bj0orj0MkUAKlGEBudrPsC/OITO9oUp
+					pXV0PBi0hILJdbgeJXDFhxfcEpCczQlQgdx/KWD6q/6nSOmT9hNGMjkiprn/w/q1
+					SsAMRqSfrWrR6q8hWTkWmNsm/c39bJFuMvkfkiOgvvBVqE3nAgMBAAGjgfswgfgw
+					HQYDVR0OBBYEFG8UIQ7Hc9WHtlS6PKYYP/7RWNcrMIHIBgNVHSMEgcAwgb2AFG8U
+					IQ7Hc9WHtlS6PKYYP/7RWNcroYGZpIGWMIGTMQswCQYDVQQGEwJHQjERMA8GA1UE
+					CBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEPMA0GA1UEChMGUkNBSE1T
+					MQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jhbi5hYy51azEkMCIGCSqG
+					SIb3DQEJARYVd2ViYWRtaW5zQHNjcmFuLmFjLnVrggkAmv27K7DL9jYwDAYDVR0T
+					BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAWSSnSaVz28lDBISUNRmNJFwKvjo5
+					nC4+WM7h6Tg9QbC/EYNCwkH7bOoEcCJs28jn0EwRfn4GUgc1LFkf9UYc3rJ+mihD
+					+RZDHjaJSZDbQgZI55y8dpuYT8r70rCg+xtq1Iwv0NzcM+Q/3cEeiMlIXY6YFAAA
+					Dsp1/4NlItMUs6ZwAyMLjyIlSjIHjTVLI2bRTDlY4nUgZhqz4spvqDtnmq7PERUN
+					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>
diff --git a/swamid-interfederations-2.0/lse.ac.uk-idp.xml b/swamid-interfederations-2.0/lse.ac.uk-idp.xml
new file mode 100644
index 00000000..a1f08e66
--- /dev/null
+++ b/swamid-interfederations-2.0/lse.ac.uk-idp.xml
@@ -0,0 +1,117 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFMDCCBBigAwIBAgILAQAAAAABKq7oAYQwDQYJKoZIhvcNAQEFBQAwajEjMCEG
+						A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
+						bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
+						b24gQ0EwHhcNMTAwODI2MTQwMDA3WhcNMTUwODI2MTQwMDA2WjCBpTELMAkGA1UE
+						BhMCR0IxDzANBgNVBAgTBkxvbmRvbjEXMBUGA1UEBxMOR3JlYXRlciBMb25kb24x
+						EDAOBgNVBAsTB0xpYnJhcnkxOTA3BgNVBAoTMExvbmRvbiBTY2hvb2wgb2YgRWNv
+						bm9taWNzIGFuZCBQb2xpdGljYWwgU2NpZW5jZTEfMB0GA1UEAxMWZ2F0ZS5saWJy
+						YXJ5LmxzZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrE
+						lEgnIq2xpH4ztZ3DAc5/1AiykNaad+v+5DHohA+aWemWgUqg9clHwaN3jkwK1g54
+						R4//DrKcjxiCaPxstw3ODc7pG5lGkihZ2Ew2+fg/pblh4UhFMmRv7iaUl5jDoNz9
+						7y5/YZ0rStnPTQ3iynfl2ypURFh+9hSh7MiMqGjQjqkzjtve0olQlQ06srdGNSa+
+						WhkV4IFr48L+fSpTJNnu/XLWposL+ZHVH5HSpOGST2dhXLA7tOZeGh0qC2XObgCE
+						4NpcDr3FQYWTGhDz95vb7kdBf7yrMBKwwkJC5DRiHyxS9zGlamB+nRvIgxYbLikb
+						7rugz0QDu/vQxxHvkCsCAwEAAaOCAZkwggGVMB8GA1UdIwQYMBaAFH1tKuxmq6dR
+						NqsCafFwj8RZC5ofMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDov
+						L3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvb3JndjEuY3J0MD8GA1UdHwQ4
+						MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvT3JnYW5pemF0aW9u
+						VmFsMS5jcmwwHQYDVR0OBBYEFIrzweZBjZRanmFejLLkK74xdaWZMAkGA1UdEwQC
+						MAAwDgYDVR0PAQH/BAQDAgWgMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcD
+						AgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBFDAzMDEGCCsGAQUF
+						BwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCG
+						SAGG+EIBAQQEAwIGwDAhBgNVHREEGjAYghZnYXRlLmxpYnJhcnkubHNlLmFjLnVr
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBdWOcNxu5Mh7ilUgSr8UlwWpjqJ7GgXMZwbVk+
+						2q++FeptORv0yJxIVvDsmbFwKqwvp3123aBAFaG9WQPAXL0Wz+P7wYymZH/G1XSr
+						+NsLfXaYRvmmwySBWfq0NQJEU9uGDHTOtX4wCZLiQFfM+e+TRkwZ7pMHoI956bOp
+						7gYRTux7lAWqJbc5cJ9o61ev/AnP+5TPXEXNFzcLDP+zp4knO9JkG39yY3DO97fx
+						S6FeuFcX0f1neB/aTknIH/D2by2/RTpvl3bTKKqoGN7YyQO7TH+sR7wZaSnqjKDn
+						IEMWqUMBdf7PSA/0yLPierGPBFLmkn+UmFv38wt09uGqCdDj
+					</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFMDCCBBigAwIBAgILAQAAAAABKq7oAYQwDQYJKoZIhvcNAQEFBQAwajEjMCEG
+						A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
+						bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
+						b24gQ0EwHhcNMTAwODI2MTQwMDA3WhcNMTUwODI2MTQwMDA2WjCBpTELMAkGA1UE
+						BhMCR0IxDzANBgNVBAgTBkxvbmRvbjEXMBUGA1UEBxMOR3JlYXRlciBMb25kb24x
+						EDAOBgNVBAsTB0xpYnJhcnkxOTA3BgNVBAoTMExvbmRvbiBTY2hvb2wgb2YgRWNv
+						bm9taWNzIGFuZCBQb2xpdGljYWwgU2NpZW5jZTEfMB0GA1UEAxMWZ2F0ZS5saWJy
+						YXJ5LmxzZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrE
+						lEgnIq2xpH4ztZ3DAc5/1AiykNaad+v+5DHohA+aWemWgUqg9clHwaN3jkwK1g54
+						R4//DrKcjxiCaPxstw3ODc7pG5lGkihZ2Ew2+fg/pblh4UhFMmRv7iaUl5jDoNz9
+						7y5/YZ0rStnPTQ3iynfl2ypURFh+9hSh7MiMqGjQjqkzjtve0olQlQ06srdGNSa+
+						WhkV4IFr48L+fSpTJNnu/XLWposL+ZHVH5HSpOGST2dhXLA7tOZeGh0qC2XObgCE
+						4NpcDr3FQYWTGhDz95vb7kdBf7yrMBKwwkJC5DRiHyxS9zGlamB+nRvIgxYbLikb
+						7rugz0QDu/vQxxHvkCsCAwEAAaOCAZkwggGVMB8GA1UdIwQYMBaAFH1tKuxmq6dR
+						NqsCafFwj8RZC5ofMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDov
+						L3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvb3JndjEuY3J0MD8GA1UdHwQ4
+						MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvT3JnYW5pemF0aW9u
+						VmFsMS5jcmwwHQYDVR0OBBYEFIrzweZBjZRanmFejLLkK74xdaWZMAkGA1UdEwQC
+						MAAwDgYDVR0PAQH/BAQDAgWgMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcD
+						AgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBFDAzMDEGCCsGAQUF
+						BwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCG
+						SAGG+EIBAQQEAwIGwDAhBgNVHREEGjAYghZnYXRlLmxpYnJhcnkubHNlLmFjLnVr
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBdWOcNxu5Mh7ilUgSr8UlwWpjqJ7GgXMZwbVk+
+						2q++FeptORv0yJxIVvDsmbFwKqwvp3123aBAFaG9WQPAXL0Wz+P7wYymZH/G1XSr
+						+NsLfXaYRvmmwySBWfq0NQJEU9uGDHTOtX4wCZLiQFfM+e+TRkwZ7pMHoI956bOp
+						7gYRTux7lAWqJbc5cJ9o61ev/AnP+5TPXEXNFzcLDP+zp4knO9JkG39yY3DO97fx
+						S6FeuFcX0f1neB/aTknIH/D2by2/RTpvl3bTKKqoGN7YyQO7TH+sR7wZaSnqjKDn
+						IEMWqUMBdf7PSA/0yLPierGPBFLmkn+UmFv38wt09uGqCdDj
+					</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>Michael</md:GivenName>
+    <md:SurName>McFarlane</md:SurName>
+    <md:EmailAddress>mailto:m.d.mcfarlane@lse.ac.uk</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
new file mode 100644
index 00000000..b7e93eb5
--- /dev/null
+++ b/swamid-interfederations-2.0/lu-idp.lu.lv.xml
@@ -0,0 +1,50 @@
+<?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>
+      <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>
+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>
+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>
diff --git a/swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..a10c9756
--- /dev/null
+++ b/swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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-03-23T11:16:13Z"/>
+  </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>
+						MIIC+jCCAeKgAwIBAgIJAOwYneQhzo5oMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEW1haGFyYS5xbXVsLmFjLnVrMB4XDTEyMDMwNzE0MjEwNloXDTIyMDMwNTE0
+						MjEwNlowHDEaMBgGA1UEAxMRbWFoYXJhLnFtdWwuYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDC6euix10xI3odR6qK7o7F6N7YyLoO5c2th9Bo
+						/b35Wr/qBVSgOzn1KXGYbCLVi4eVAkT8xTj2THbq1u1C1q8dyl8YQfAXDpaqYZo3
+						nqXFgse4GhV4zjYyMsOUOgF0V7yWLxphFBjxyKhiTMejfW3Q8CDWWKKsDQeEhwgZ
+						W3GHMyrK8q5Gryup8167wMaK6r4wT1/VbVTuYbpLKzlbi0I1gpZOmHlqOSXX3e7n
+						AHWW3TkxQjWNb1eGhQrFUjHXncKpMwzHIM+PaminDt+SZo7y1StiNNP10TntE5A2
+						TBfzoe3IDAOn/zRo0uXqZqC4ebjI2yzR2kYzzqefNjQjuoXxAgMBAAGjPzA9MBwG
+						A1UdEQQVMBOCEW1haGFyYS5xbXVsLmFjLnVrMB0GA1UdDgQWBBS/AXRs2oVTF6D+
+						THVv7yl1bZJ2TTANBgkqhkiG9w0BAQUFAAOCAQEAKNPcq+ND9H2B61cPocxo7p4V
+						d82vTDJNgq4qOBhSLiO0kV6tRf7hL6Y7t+/mb3Wx/HwJmKWbZUrk0EUSQINmjOGQ
+						OAuR7O93J4SJIbV5ZYtjnVqmvXcQO2DSqISjxBRr3mr30urXxBOGO8uyRJg67jS5
+						os06ShMhV0fFhCUk8WRxWu5BifoMTzBFkOHa52+NwYtwQT4aONuY2i4oG9NHjWj0
+						9o3kCjJO6/SHCxcXe9hGTfApb21kyXQKcSfNYwTnIqkxmPXhGu0X2Fgpo3/g31P8
+						WiYD2aYtXd/zZbmDIrYXVHx4QlflHS9YB8RvA1ka/vrQL224R2jgl3vFARpqCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mahara.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://mahara.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://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://mahara.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+  </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: 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/mail.secure.easymail.rm.com-shibboleth.xml b/swamid-interfederations-2.0/mail.secure.easymail.rm.com-shibboleth.xml
new file mode 100644
index 00000000..8223c2a4
--- /dev/null
+++ b/swamid-interfederations-2.0/mail.secure.easymail.rm.com-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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>
+						MIID3jCCAsagAwIBAgIQCHWvfofj36Opnfb9g9MhATANBgkqhkiG9w0BAQUFADA8
+						MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
+						aGF3dGUgU1NMIENBMB4XDTEwMTExNzAwMDAwMFoXDTEzMTExNjIzNTk1OVowdzEL
+						MAkGA1UEBhMCR0IxEDAOBgNVBAgTB0VuZ2xhbmQxETAPBgNVBAcUCEFiaW5nZG9u
+						MQ8wDQYDVQQKFAZSTSBQTEMxDDAKBgNVBAsUA0lIRzEkMCIGA1UEAxQbbWFpbC5z
+						ZWN1cmUuZWFzeW1haWwucm0uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAo8ztGMK/HAAJWHuz2zIWwm/vHROyyGhKi+Ad01lL1PM9sGBxsuYPlMHe
+						mN6tuPtq4+dqv/Z3EKZwBvRKUpLer51lBKpg8odCcHpEeRLFb2B/3dzIZvH/vAvm
+						kGda0BQ/9q/1gyZh4OwaNzfFZ4z5JKWIiZwzGIsAE/rxmgCPuXh2B0tBmgJ6gr11
+						Qw01aJcx2/f6CADUbRh1piNJdbquXz1MZRHJNhMwWkb/YYBVdsZT+U/CptXCIphv
+						9T5Woss8Fc7lYQFi3KV29m8u3StSPsvaXi4H/nktUWEbsUY+DpCGgORZuAcYKuc8
+						vhbdGYdl2wUJqtr+7t7xwYDoMzxSIQIDAQABo4GgMIGdMAwGA1UdEwEB/wQCMAAw
+						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL3N2ci1vdi1jcmwudGhhd3RlLmNvbS9U
+						aGF3dGVPVi5jcmwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGCCsG
+						AQUFBwEBBCYwJDAiBggrBgEFBQcwAYYWaHR0cDovL29jc3AudGhhd3RlLmNvbTAN
+						BgkqhkiG9w0BAQUFAAOCAQEAhYUzax2HMdcsuWBoeLG8pqsZk2O7kKCUTbmLFVPP
+						4ul98x6vYF1Afl3K2XHFfmloay/dImTIaAA/uIe8mZVPljT2rNBoWI++nzaiBb+F
+						nZVlgw8W0QsyI6K6UdINDd09s1vwN0iF56d5rnR5w1SB2N5i5ngTSajTORO1QjG5
+						wWPsVDAK1jMviPmJzaUTLnR1o51iZ5To9GXuwY1/ZtIjTB7XfYVdHDoM2p0VuqcH
+						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>
+						MIID3jCCAsagAwIBAgIQCHWvfofj36Opnfb9g9MhATANBgkqhkiG9w0BAQUFADA8
+						MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
+						aGF3dGUgU1NMIENBMB4XDTEwMTExNzAwMDAwMFoXDTEzMTExNjIzNTk1OVowdzEL
+						MAkGA1UEBhMCR0IxEDAOBgNVBAgTB0VuZ2xhbmQxETAPBgNVBAcUCEFiaW5nZG9u
+						MQ8wDQYDVQQKFAZSTSBQTEMxDDAKBgNVBAsUA0lIRzEkMCIGA1UEAxQbbWFpbC5z
+						ZWN1cmUuZWFzeW1haWwucm0uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAo8ztGMK/HAAJWHuz2zIWwm/vHROyyGhKi+Ad01lL1PM9sGBxsuYPlMHe
+						mN6tuPtq4+dqv/Z3EKZwBvRKUpLer51lBKpg8odCcHpEeRLFb2B/3dzIZvH/vAvm
+						kGda0BQ/9q/1gyZh4OwaNzfFZ4z5JKWIiZwzGIsAE/rxmgCPuXh2B0tBmgJ6gr11
+						Qw01aJcx2/f6CADUbRh1piNJdbquXz1MZRHJNhMwWkb/YYBVdsZT+U/CptXCIphv
+						9T5Woss8Fc7lYQFi3KV29m8u3StSPsvaXi4H/nktUWEbsUY+DpCGgORZuAcYKuc8
+						vhbdGYdl2wUJqtr+7t7xwYDoMzxSIQIDAQABo4GgMIGdMAwGA1UdEwEB/wQCMAAw
+						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL3N2ci1vdi1jcmwudGhhd3RlLmNvbS9U
+						aGF3dGVPVi5jcmwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGCCsG
+						AQUFBwEBBCYwJDAiBggrBgEFBQcwAYYWaHR0cDovL29jc3AudGhhd3RlLmNvbTAN
+						BgkqhkiG9w0BAQUFAAOCAQEAhYUzax2HMdcsuWBoeLG8pqsZk2O7kKCUTbmLFVPP
+						4ul98x6vYF1Afl3K2XHFfmloay/dImTIaAA/uIe8mZVPljT2rNBoWI++nzaiBb+F
+						nZVlgw8W0QsyI6K6UdINDd09s1vwN0iF56d5rnR5w1SB2N5i5ngTSajTORO1QjG5
+						wWPsVDAK1jMviPmJzaUTLnR1o51iZ5To9GXuwY1/ZtIjTB7XfYVdHDoM2p0VuqcH
+						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>
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
new file mode 100644
index 00000000..770f6641
--- /dev/null
+++ b/swamid-interfederations-2.0/man-fe.hosted.exlibrisgroup.com-shib.xml
@@ -0,0 +1,68 @@
+<?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>
+    <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>
+      <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>
+						MIIC4jCCAcqgAwIBAgIJAIbeMpWWYVSeMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+						BAMTCXByaW1vMDV2MTAeFw0xMTEyMjAxMzUyMzJaFw0yMTEyMTcxMzUyMzJaMBQx
+						EjAQBgNVBAMTCXByaW1vMDV2MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAKiRUXmFIRlhuxsJeh0+w5gfpNAdGrklnQCjra/ZKnDLTPUkNRfPV4anjMpj
+						PGgb74nMKHmC0w/JQnaNc1bujjkovT8kuUqtTakxiFx2YBYNt6g8Zf540iV87WwC
+						f4+EqBHAc9jb/BCxD+/27ena7P0sFijzKnqXSZwVCLjYTUniRSxqRoYj9zWbVVp/
+						Q/kgLM6dvx4oKkwr+LVOt8hrva24fkHcI2JkDpSuB8WQk9rqkF9pangmtwL70i47
+						nUc40roGM0Xm1joVEO4vMycHevYDVDCbfsQRY9GLmSC3MFkg7K1+t1CUPBaK1N2L
+						vxf/xyVEj3xzv+R35PSyVZowc+ECAwEAAaM3MDUwFAYDVR0RBA0wC4IJcHJpbW8w
+						NXYxMB0GA1UdDgQWBBS5QVANx9PFctiP1JyHti3S/g/xCDANBgkqhkiG9w0BAQUF
+						AAOCAQEAHiif6wam0p7c/7tdnRzgRsmJzEv57G0S4pHOA77fJvNdgGxwM3geVHAu
+						Rsiw17BFn4goleyfXxBFU2v9tFYxttKuAGtD0yKoi03Ow8zKkQmBmNCCxc0/1+CQ
+						0pdMDkNUcxBClO7CKruncD1pHT5ma5t7/pXLgg/RDPN5Gne4hGo0ATiG0sn0Md6D
+						/yqSdIsk+Q+YUG8vuYNuGMpsyZLO+oyjI6O/5TV2+hONQ4Gl4YkiNLflLOq9YArz
+						xu+sfXm5Vz/xJCu3Nv3uhHzNTFCBcy2GKUQtjMF0urKfflleQNKKAmD3mEi7msCS
+						/gNJ6QmwQgxVykU77MUZfn6sO6YmDg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..b64064b1
--- /dev/null
+++ b/swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxEDAOBgNVBAoTB0lGU3VsTUcx
+DTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJlZGVzQGlmc3VsZGVtaW5h
+cy5lZHUuYnIxFTATBgNVBAcTDFBvdXNvIEFsZWdyZTEVMBMGA1UECBMMTWluYXMg
+R2VyYWlzMQswCQYDVQQGEwJCUjEkMCIGA1UEAxMbbWFycmVjby5pZnN1bGRlbWlu
+YXMuZWR1LmJyMB4XDTE0MDgxMzE4MDQxOFoXDTE3MDgxMjE4MDQxOFowgawxEDAO
+BgNVBAoTB0lGU3VsTUcxDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJl
+ZGVzQGlmc3VsZGVtaW5hcy5lZHUuYnIxFTATBgNVBAcTDFBvdXNvIEFsZWdyZTEV
+MBMGA1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEkMCIGA1UEAxMbbWFy
+cmVjby5pZnN1bGRlbWluYXMuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAm2G39mQLF6PtP9yQ9r1eG9BB4CC+gdwgj+AmrhyYAwHlcTiRaWNo
+8AE4cvo23i5Wl3wSSGTLVxA8aGWXP0gFYFJQ53r/7k0LZoSsoQVQFpUP5niY9ZI1
+hixiFsvNayQTp/cGJF/WyKzvIs6YsFnoMazjSQYVtC1cciraGJrF1cFLltab5ETj
+vBG9jVs8bJK+98/FgbAHomZnjuYV2ohoXpqNGl0nb7wX++24ucIhJ4XSUYSd7DLM
+jPSQIsEfDo3857dQj00/UcjRiBsKb5jr66VCRJ1m+in8WAf2htC4XhtPxX7Pn9tw
+ljSUVu4w99synaTNpKmVZ6C1orKGy+WFjQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQAbH/Qk1f0GPuG5FVA+RRnT4zCZBIq4NMPoK0S8mpjSTgGjenezQwwKWhuk/AKG
+qrrUxlJjV6hcMPDi7iFdIOiaVACNAX5n2mOlmeVeYWIrx5vcUu+UahoOsc0DuNHI
+svUttVic+ZMMAxiLXKULW3UY2w1NnxyfMnLuWdgMnAnP/k8Sils+k4J1YypmHR2o
+ZoVaASv7o3le6wJtM415/rrhZ30hHei1enZf3Nul5NiZNxTU3eD7ijkPeKduCNoj
+x/USSNxCh4YzSmU2UWPjPNR0CTdzDlbTQaFqPnhJ4B2fquVT9s/kO8jgJ03t3UlF
+XcsDTkgAli2ZOTFPSACYrL9s
+            </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>
+      
+MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxEDAOBgNVBAoTB0lGU3VsTUcx
+DTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJlZGVzQGlmc3VsZGVtaW5h
+cy5lZHUuYnIxFTATBgNVBAcTDFBvdXNvIEFsZWdyZTEVMBMGA1UECBMMTWluYXMg
+R2VyYWlzMQswCQYDVQQGEwJCUjEkMCIGA1UEAxMbbWFycmVjby5pZnN1bGRlbWlu
+YXMuZWR1LmJyMB4XDTE0MDgxMzE4MDQxOFoXDTE3MDgxMjE4MDQxOFowgawxEDAO
+BgNVBAoTB0lGU3VsTUcxDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJl
+ZGVzQGlmc3VsZGVtaW5hcy5lZHUuYnIxFTATBgNVBAcTDFBvdXNvIEFsZWdyZTEV
+MBMGA1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEkMCIGA1UEAxMbbWFy
+cmVjby5pZnN1bGRlbWluYXMuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAm2G39mQLF6PtP9yQ9r1eG9BB4CC+gdwgj+AmrhyYAwHlcTiRaWNo
+8AE4cvo23i5Wl3wSSGTLVxA8aGWXP0gFYFJQ53r/7k0LZoSsoQVQFpUP5niY9ZI1
+hixiFsvNayQTp/cGJF/WyKzvIs6YsFnoMazjSQYVtC1cciraGJrF1cFLltab5ETj
+vBG9jVs8bJK+98/FgbAHomZnjuYV2ohoXpqNGl0nb7wX++24ucIhJ4XSUYSd7DLM
+jPSQIsEfDo3857dQj00/UcjRiBsKb5jr66VCRJ1m+in8WAf2htC4XhtPxX7Pn9tw
+ljSUVu4w99synaTNpKmVZ6C1orKGy+WFjQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQAbH/Qk1f0GPuG5FVA+RRnT4zCZBIq4NMPoK0S8mpjSTgGjenezQwwKWhuk/AKG
+qrrUxlJjV6hcMPDi7iFdIOiaVACNAX5n2mOlmeVeYWIrx5vcUu+UahoOsc0DuNHI
+svUttVic+ZMMAxiLXKULW3UY2w1NnxyfMnLuWdgMnAnP/k8Sils+k4J1YypmHR2o
+ZoVaASv7o3le6wJtM415/rrhZ30hHei1enZf3Nul5NiZNxTU3eD7ijkPeKduCNoj
+x/USSNxCh4YzSmU2UWPjPNR0CTdzDlbTQaFqPnhJ4B2fquVT9s/kO8jgJ03t3UlF
+XcsDTkgAli2ZOTFPSACYrL9s
+                    
+            </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>
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
new file mode 100644
index 00000000..b55697a9
--- /dev/null
+++ b/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIIDwjCCAqoCAQAwDQYJKoZIhvcNAQEFBQAwgaYxFDASBgNVBAoTC0lGU0VSVEFP
+LVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZlQGlmc2VydGFv
+LXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQIEwpQZXJuYW1i
+dWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0YW8tcGUuZWR1
+LmJyMB4XDTEzMTIwNDEzMjExOFoXDTE2MTIwMzEzMjExOFowgaYxFDASBgNVBAoT
+C0lGU0VSVEFPLVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZl
+QGlmc2VydGFvLXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQI
+EwpQZXJuYW1idWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0
+YW8tcGUuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0JDE
+PZ1eD+TXUZG+HP4FX/SfAqONECwpduJLWNaX2VSorGCmNyQfjyFil0Fce0RdxL2B
+oLc/B4EgGvm9/KCEnhK8EwhWIy9eAi34mJ6dsQnYL40afuO2NFBiGc7TeB+Lj3Hj
+Z/y5g40t50LCnwWUrqzNedUbSLtmJVXWIwn9iO0jPuHuemhTs7YiSt+qIBzBpY2g
+7AeeNkE8VQoJwUFaj5mlmtE4SU9WgURp+u7k05q9La8nIn/xfHFcuVMEzGvQcHsR
+T8lyvJMBjcVJsiJeNCD565GdRTfu3W4tlysQQBM2V/uttteCZ8BpdMQLOop0oNbh
+BPHafdSvF8bLnebtcwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwKBvF2yL3oSI9
+sqKlq1ktY18vHBT58Lc928kyVOWSQH+nDGGJsYOYXCh+zJQdq8Ow3aZA7tXQili3
+avGOhmOM5LfaRvkWCEigfw5frMj4/gRDXk0I7mONk5o5c47XxhSjHg2OiGpQQdqm
+/6MnIQMt98zXoy47mzCtkdgH3qc+hvv2biZtFExcmuZsbjun9TbaCQs1WlTX4Yr9
+ICLuROVF4HNDdN1IeVc+YjL3dIZBw294A3cg8CpSY+5qKEBJF6MgRzrDPy2vzTGP
+UeJoFHTC661va14QsI92zQQCObT42jGq0hRml0MKslZo+c7Cwet0N1xBPQmkjNbe
+DH5XzO/u
+            </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>
+      
+MIIDwjCCAqoCAQAwDQYJKoZIhvcNAQEFBQAwgaYxFDASBgNVBAoTC0lGU0VSVEFP
+LVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZlQGlmc2VydGFv
+LXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQIEwpQZXJuYW1i
+dWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0YW8tcGUuZWR1
+LmJyMB4XDTEzMTIwNDEzMjExOFoXDTE2MTIwMzEzMjExOFowgaYxFDASBgNVBAoT
+C0lGU0VSVEFPLVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZl
+QGlmc2VydGFvLXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQI
+EwpQZXJuYW1idWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0
+YW8tcGUuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0JDE
+PZ1eD+TXUZG+HP4FX/SfAqONECwpduJLWNaX2VSorGCmNyQfjyFil0Fce0RdxL2B
+oLc/B4EgGvm9/KCEnhK8EwhWIy9eAi34mJ6dsQnYL40afuO2NFBiGc7TeB+Lj3Hj
+Z/y5g40t50LCnwWUrqzNedUbSLtmJVXWIwn9iO0jPuHuemhTs7YiSt+qIBzBpY2g
+7AeeNkE8VQoJwUFaj5mlmtE4SU9WgURp+u7k05q9La8nIn/xfHFcuVMEzGvQcHsR
+T8lyvJMBjcVJsiJeNCD565GdRTfu3W4tlysQQBM2V/uttteCZ8BpdMQLOop0oNbh
+BPHafdSvF8bLnebtcwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwKBvF2yL3oSI9
+sqKlq1ktY18vHBT58Lc928kyVOWSQH+nDGGJsYOYXCh+zJQdq8Ow3aZA7tXQili3
+avGOhmOM5LfaRvkWCEigfw5frMj4/gRDXk0I7mONk5o5c47XxhSjHg2OiGpQQdqm
+/6MnIQMt98zXoy47mzCtkdgH3qc+hvv2biZtFExcmuZsbjun9TbaCQs1WlTX4Yr9
+ICLuROVF4HNDdN1IeVc+YjL3dIZBw294A3cg8CpSY+5qKEBJF6MgRzrDPy2vzTGP
+UeJoFHTC661va14QsI92zQQCObT42jGq0hRml0MKslZo+c7Cwet0N1xBPQmkjNbe
+DH5XzO/u
+                    
+            </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</md:SurName>
+    <md:EmailAddress>cafe@ifsertao-pe.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/masaq.oucs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/masaq.oucs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..971d50f3
--- /dev/null
+++ b/swamid-interfederations-2.0/masaq.oucs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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://masaq.oucs.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="2013-10-10T10:47: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://masaq.oucs.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>
+						MIIDADCCAeigAwIBAgIJALjsZAqK6FUqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE21hc2FxLm91Y3Mub3guYWMudWswHhcNMTMwOTIwMTExNjU2WhcNMjMwOTE4
+						MTExNjU2WjAeMRwwGgYDVQQDExNtYXNhcS5vdWNzLm94LmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9ULFDudvq0bdTHSkYluO2b262utN9p1x
+						u7YY0T2GOemIWmw2SOngyFEh67o0VSWWcaWjnRMmzyLIXC+XK7ypriibmhZBVRHK
+						xAIgVhH8wbK3CEMP5+F8WQcdDwwGxnk6rhn0YmPJ8GFq6TNo+FnYwry3Ojgs/sUr
+						guGE27x+GdRcWmsTbQj5mlxoffaB93k/kyzAC2d9Gitq5fvypQMiakFVafCdksXn
+						PnYp5/jYKQGo/zcFvdO+SLUDd4u1cJvPQxIgZp8qkQzjU5p6u8eXC2+05pIQJBbg
+						vH/Al4iW258o4V873HyXehm5Y715gWoNR1Ewmyp/h2g6OZH7PfQnGQIDAQABo0Ew
+						PzAeBgNVHREEFzAVghNtYXNhcS5vdWNzLm94LmFjLnVrMB0GA1UdDgQWBBTGZXOE
+						j1iBntwwxtXItqm0nW1J+DANBgkqhkiG9w0BAQUFAAOCAQEAdXM8ECCvAtZp/Jr2
+						zHKMycrGPZbt6y6Nk/+fMzRgAyP80WQV/Nci5jwwYan6he0TtjEVUP3zNWuElAfA
+						sgIvEY4VTrvJ2ARcw+bfp/BeXvzMAclzBzZSlcfHqXenXyw5N/PBtfkgyBUOORVA
+						/9aPp3RuJXVca95Y6JaHmGBYeZgYVFQkAWiz9PgRLKLFkcw9y7VwlMsZkylnk79F
+						2BAnVXYem+hQf+NT2FvT8TrUTef/Kwav9nPgM1Nat4v06xkugbPo8pd+0g22Wkzz
+						LZxdIwRUrC1nm1O2BiRECpUQO5gPwpupPhMET0F9cEaFH68MT9DLJtVI1N1P1ZIO
+						DkSyzg==
+					</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://masaq.oucs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://masaq.oucs.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://masaq.oucs.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://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://masaq.oucs.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, Test Shibboleth SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.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/mayumba.msh-paris.fr-shibauth.php.xml b/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml
new file mode 100644
index 00000000..8b4e527c
--- /dev/null
+++ b/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml
@@ -0,0 +1,135 @@
+<?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>
+  </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: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>
+					      MIIEdjCCA16gAwIBAgIRAJLT9rWH2+hZg6OeczPW/SMwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAzMTcwMDAwMDBaFw0xNzAzMTYyMzU5NTlaMEIxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUbWF5dW1iYS5t
+c2gtcGFyaXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+2Evn
+EJ4196BzLBm5zH056JWxzlbBm/WSBOeLNNImAqDs12N7+b3hUd6xtp1m3A2vCCMO
+n/XVB3ud7bIP7kKOmSzfM4/CXjiO6SkrFEhaGz1DfDAwAloHi3Yfj2ec/U9QDAy6
+YrAG4ylizSnFy/01RAyztNjPNAMrOl2TYYJrqRCg+fU3HacNejKcCf+RDGpbdTL6
+6AHfeenebVRjDpv3eLb6pkRy4u8dbDJ70G9Iq+JOs/CxD0mD5kuj0M+uQ807o9D6
+5QZlrDAaqb+RS0oczHXwitgJ0bFPc+IRyxwzM4S2chebQpoVbB2x5HNVarfDTzC1
+c1vFGYsJssOgzCS3AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+ays3V0fqkOO57TAdBgNVHQ4EFgQUIvVHzc7309TyAJFX8xxYFgp3K+0wDgYDVR0P
+AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFG1heXVtYmEubXNoLXBh
+cmlzLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBxCtuXfhTlAFKYiPQFeKaJvL6wAwM7
+DYM9EpC8jzoaqk+K31QAH7+tDSWOMxIL8ovb21/L9Ol863cYl9wve3oXZIYLKmXf
+fU8vBZ6jaEzn7A5o2G0+jcH6ufWmgfgzhq482oCMGca+GVcPvwwRhuEA85k0/hYf
+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>
+					      MIIEdjCCA16gAwIBAgIRAJLT9rWH2+hZg6OeczPW/SMwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAzMTcwMDAwMDBaFw0xNzAzMTYyMzU5NTlaMEIxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUbWF5dW1iYS5t
+c2gtcGFyaXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+2Evn
+EJ4196BzLBm5zH056JWxzlbBm/WSBOeLNNImAqDs12N7+b3hUd6xtp1m3A2vCCMO
+n/XVB3ud7bIP7kKOmSzfM4/CXjiO6SkrFEhaGz1DfDAwAloHi3Yfj2ec/U9QDAy6
+YrAG4ylizSnFy/01RAyztNjPNAMrOl2TYYJrqRCg+fU3HacNejKcCf+RDGpbdTL6
+6AHfeenebVRjDpv3eLb6pkRy4u8dbDJ70G9Iq+JOs/CxD0mD5kuj0M+uQ807o9D6
+5QZlrDAaqb+RS0oczHXwitgJ0bFPc+IRyxwzM4S2chebQpoVbB2x5HNVarfDTzC1
+c1vFGYsJssOgzCS3AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+ays3V0fqkOO57TAdBgNVHQ4EFgQUIvVHzc7309TyAJFX8xxYFgp3K+0wDgYDVR0P
+AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFG1heXVtYmEubXNoLXBh
+cmlzLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBxCtuXfhTlAFKYiPQFeKaJvL6wAwM7
+DYM9EpC8jzoaqk+K31QAH7+tDSWOMxIL8ovb21/L9Ol863cYl9wve3oXZIYLKmXf
+fU8vBZ6jaEzn7A5o2G0+jcH6ufWmgfgzhq482oCMGca+GVcPvwwRhuEA85k0/hYf
+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>
+					      MIIC5TCCAc2gAwIBAgIJAPzxQDl/0G/mMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+BAMTCnVjb3BpYS5jb20wHhcNMTQwNjA2MTMwMTAyWhcNMjQwNjAzMTMwMTAyWjAV
+MRMwEQYDVQQDEwp1Y29waWEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA1awiqcSL2EvF9eWa8XJ7RerWu2Ol4rKdx4hEltu48MCuL/i1C4Yg7I7I
+JkAl2ZKcQHIGCyUVpfotn5m7Owy78jsotpbzY8PN54LVN816FHa2KKCfBgJ7/5uh
+GtYisUKez6O/UafnM4Uc6U/Ol5e/MmlUvE6v12MJbvwAIrYhVUp5aSKOX0Gp3hO+
+XVlFsEfHCDFCdulXSPkUNGhqYftMOvlP10miPE2CzoqcxP5iQIctfzfAyK387KDe
+/oFzT/OicnRHMIQRaOpDht3nKGNs7JKjxVpcLDdNqDCAfkRNfUxg7QFQ3/9gPILi
+n3Lskv9dvcmMjXBVoPUe01aUCIiDmwIDAQABozgwNjAVBgNVHREEDjAMggp1Y29w
+aWEuY29tMB0GA1UdDgQWBBRbFXLSHc4k19XNE68D/izAhYDEBTANBgkqhkiG9w0B
+AQUFAAOCAQEAYyDBOUun2YgaT0jndrx9mjcimVIDr71YtGvyF3eSL5fc6DeTH3Ur
+ktOsqDP0MwPZmm5qfQLsD1q/+nLdzdRKStpwOozjUPYSEx/Ebe7JpzsEyC2yOD6w
+vWDCm38KJUKvAS7ekRK9Z8pFYlhaW7N+qSzrK3gbvJkx1txdnKvHTV7W51p4n1jS
+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="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mayumba.msh-paris.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <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">
+        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">Adresse mail institutionnelle</saml:AttributeValue>
+      </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">
+        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">Nom Prénom</saml:AttributeValue>
+      </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">
+        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">Nom Prénom</saml:AttributeValue>
+      </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">
+        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">identifiant de session persistant</saml:AttributeValue>
+      </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://unknown.site.com</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
new file mode 100644
index 00000000..93931b54
--- /dev/null
+++ b/swamid-interfederations-2.0/mccall.henley-cov.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?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>
+      <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
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXbWNjYWxsLmhl
+						bmxleS1jb3YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ
+						5xUydUjAY8iBFq35sgRsWpuqs1cKDHv5LkIL4N8qaVekHdBej6mWW6CXWc+OGXPm
+						e3M1JpIkEgT85GEckGTiQAEzGk6BviKhHTLbg6r1goWR891xbXkbdaPlY/MUtKpb
+						NGXR1CBMgGEiW22sy9omQRGQlSAMNaM9c4zsVBbWfKHSCSyZ5mxR5Q1AjQVvM2w0
+						PCxLRfWyYxp16QxXWCUYr+XB/S7BHERXETpaoH+sBcspjT70g4taoOzjRmL8IlN5
+						Rk9V4DZxybO+lun4IJ7hYsEm+1Hxd91pzB3MUDUuZ4W3+wiBxcTdGWWl6mbWIV+z
+						nnkpse1/4oHG+yihRBKHAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
+						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUdTMEcyrs2BVOrd+a9jLSinjcU8gwDgYD
+						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
+						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF21jY2FsbC5oZW5s
+						ZXktY292LmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQB4+WToqhio4ygMFQRaR7jx
+						GnN7OvUWOSdUUfzmwE54tXHoKqshC3xp1rqhZjdK77Vaoe5VdzuQv8lO0YyBdEfY
+						6DKG7nqsZdomYRoogxOPL8TPrkh+AGVmfZaJhJ/GZauEvJAXHO1zjP/1IMIxia+Y
+						4SkJBKVpsA4cUn7A082gFqfnGhHvl2JuDNszY/E+mDVxx3MXBT6aeq+gNF2Qx3kc
+						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>
+						MIIEfDCCA2SgAwIBAgIRAMs1hpx5cLrrnqC1wRQthWwwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA5MTIwMDAwMDBaFw0xNjA5MTEyMzU5NTlaMEUxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXbWNjYWxsLmhl
+						bmxleS1jb3YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ
+						5xUydUjAY8iBFq35sgRsWpuqs1cKDHv5LkIL4N8qaVekHdBej6mWW6CXWc+OGXPm
+						e3M1JpIkEgT85GEckGTiQAEzGk6BviKhHTLbg6r1goWR891xbXkbdaPlY/MUtKpb
+						NGXR1CBMgGEiW22sy9omQRGQlSAMNaM9c4zsVBbWfKHSCSyZ5mxR5Q1AjQVvM2w0
+						PCxLRfWyYxp16QxXWCUYr+XB/S7BHERXETpaoH+sBcspjT70g4taoOzjRmL8IlN5
+						Rk9V4DZxybO+lun4IJ7hYsEm+1Hxd91pzB3MUDUuZ4W3+wiBxcTdGWWl6mbWIV+z
+						nnkpse1/4oHG+yihRBKHAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
+						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUdTMEcyrs2BVOrd+a9jLSinjcU8gwDgYD
+						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
+						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF21jY2FsbC5oZW5s
+						ZXktY292LmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQB4+WToqhio4ygMFQRaR7jx
+						GnN7OvUWOSdUUfzmwE54tXHoKqshC3xp1rqhZjdK77Vaoe5VdzuQv8lO0YyBdEfY
+						6DKG7nqsZdomYRoogxOPL8TPrkh+AGVmfZaJhJ/GZauEvJAXHO1zjP/1IMIxia+Y
+						4SkJBKVpsA4cUn7A082gFqfnGhHvl2JuDNszY/E+mDVxx3MXBT6aeq+gNF2Qx3kc
+						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>
diff --git a/swamid-interfederations-2.0/meals.oriel.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/meals.oriel.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..aa64be88
--- /dev/null
+++ b/swamid-interfederations-2.0/meals.oriel.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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.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="2014-07-08T13:49: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://meals.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>
+						MIIDDzCCAfegAwIBAgIJALmb+DO/MaS5MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGG9jLXdlYi0wMS5vcmllbC5veC5hYy51azAeFw0xNDA2MzAwNzM3MjVaFw0y
+						NDA2MjcwNzM3MjVaMCMxITAfBgNVBAMTGG9jLXdlYi0wMS5vcmllbC5veC5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgsApZRfnxtPZO5Hlo8
+						XOJOqeY06UUqgPmZHMPqf3qbfsJF9xhiZsa/0ibzVLgOnt260hbLx4rNSrJ/9wqz
+						CuZJo2m+fgH+ZmwSZ0ZKQEdBxijLdlCUzicGviHGISVa9pEU/9SR2MU14e+A2wZG
+						c579TbmbM6w8pHjDPAVIWCOTr97s6tb/XDKWenLEyFZbCELye5yxX1MW4g4tuqjb
+						s4UfPdqgpW9FMNchrrI1zPRGFhYABG1KfptlOl7szj3qXq5moEo5muv98oMtB9aZ
+						ZGHT85Mid0oz1BQNruFNwutLkWi8Gmah8mRXKqAfmF6Na5SME3rFH2PvQgeKxFVm
+						RGcCAwEAAaNGMEQwIwYDVR0RBBwwGoIYb2Mtd2ViLTAxLm9yaWVsLm94LmFjLnVr
+						MB0GA1UdDgQWBBT4ryll+f6nterkgUsy+VKPBeg9ITANBgkqhkiG9w0BAQUFAAOC
+						AQEAMEq/A5WkFnihpXsWwBny88AIJzDHl5FmIJGoHbTQnfBNYvSOUa2fath1EAsO
+						Xk6AFo/lOmIFIT4TgLWU1i1hnnVJnCEDDCg4aB8pmj46xrdNEa7u76gk0nrBfHIx
+						LT5Mh2cquN+9Z/TGuLw2prcFXdRxbptp7HyB/SBgHYTEtR7sdX0haUv/PA+ZzUsI
+						r6MFmWXUYci0/1YgPys4wGRgAG+NHLE971WSvxx8IDW5T4gYF97hOMAMi/OPNPHZ
+						xAqkSqnwVVs56gUqm4F/yMP1Awjz5xbsrK1FldW05Srlls6dQ8+GzB5Z1VlxMHDz
+						odYX/MzKAdQHVZQ3URmqkhT1Iw==
+					</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.oriel.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.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://meals.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://meals.oriel.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meals.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://meals.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://meals.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 Meals</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oriel.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dale</md:GivenName>
+    <md:SurName>Lloyd</md:SurName>
+    <md:EmailAddress>mailto:dale.lloyd@oriel.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dale</md:GivenName>
+    <md:SurName>Lloyd</md:SurName>
+    <md:EmailAddress>mailto:dale.lloyd@oriel.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/meals.queens.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/meals.queens.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..6604f32f
--- /dev/null
+++ b/swamid-interfederations-2.0/meals.queens.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,77 @@
+<?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.queens.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-10-25T15: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://meals.queens.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>
+						MIIDBjCCAe6gAwIBAgIJAMAjMajvPz0aMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFW1lYWxzLnF1ZWVucy5veC5hYy51azAeFw0xMTEwMjQxNDQwMDNaFw0yMTEw
+						MjExNDQwMDNaMCAxHjAcBgNVBAMTFW1lYWxzLnF1ZWVucy5veC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK0Ujc3SARKgpkUI63cpU+6PJvkB
+						3V8HXAhp3kgMuQwmnYPDoP841SKFgpdMmVhTjyUMBxi8OdoHMEWUQHIBlvZ09Y2Y
+						B3imiyyBTWyiQ1XYi8sMfdcBDIKAz6MAQnCaHvQLsFsIVcx/JmjcXYk+8opasie9
+						aWO/HJtZjuRbD8t5WYIEvr8r0AvP+xyIsgHqoUdPASJmASBh8m7nrQJxJCYGf4HF
+						f40KS6vRnHLqG7NtdeOvrtNsAj5PM2xS5mE8/yTRHShAw3Mfi/d2N+w3GimQ1Uz5
+						rEscoavvonA1PxyI5mJYN5Zbp6SO88Y2VkLTOuJtup8zS8KuxSy5R7zQS9sCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVbWVhbHMucXVlZW5zLm94LmFjLnVrMB0GA1UdDgQW
+						BBSwvlfO/FTSVbEK/jfZvVIKJj873zANBgkqhkiG9w0BAQUFAAOCAQEAp92sniTk
+						ZSASz65sXSEy+fJLa74U5i46qmZ/X34fsGLf0M0TeJvaSzIhFHaq5QKIY/g6E5mK
+						B8nWM5/BF63D24Zaan9TPlvDhzxGZjeShl/OTNfzXNglNQmjGaxbevVUslZjx0mN
+						V9YgkAEtf9UAsf3Go2FwHZK5JRy7QFe2SEjlHZ6EjepKE7pykfPSbCDYnKe17dQ+
+						aqKbidJ2A2qvk4Q1fJYXt6BKk3QZkXBDeFBUq57rsWgyBZQktwygfpRWBd3Xtd/g
+						3PB65hPlPbSG/nOvJYuygzVd27oDnjZqYq0chh9ii4ZBM94b8/aB5sUHUaVNGe5E
+						YBkjzBZwhE01Yw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: The Queen's College Meals</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.queens.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Queen's College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@queens.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Queen's College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@queens.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/meals.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/meals.some.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..e15f2192
--- /dev/null
+++ b/swamid-interfederations-2.0/meals.some.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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.some.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="2014-04-02T09:50: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://meals.some.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>
+						MIIDADCCAeigAwIBAgIJAKdoXXjdRuKBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE21lYWxzLnNvbWUub3guYWMudWswHhcNMTQwNTA3MTIxOTE1WhcNMjQwNTA0
+						MTIxOTE1WjAeMRwwGgYDVQQDExNtZWFscy5zb21lLm94LmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3pZqASbklNp3OW65A/tnT53MAtVqLHpT
+						cFTZ4rNWM/IINC0ZvXP7BWL589NCpaHd/df4iA0wro+FcV2TN+t4cx1Rkbz2mAst
+						bKeRwGildmWxAoaR9d6bEKCcAx/2iEUoc/oLOixHn1sXekaSWWn3aHHPxyMJDIwZ
+						kAhqR0CVx07tysXDprs1+hN7QWQGntNOGVTczQ9lwsDGleMpJ72xhU8FcWN0u39F
+						bZQBXZH1tEixD1MAVKTpU5DwPw32LA7b99nROZe4w15HZTX9s/Xtj2le/vI4CquL
+						JwT/qceQYeSfiB+oZh34xHwU9e3mwVFcoJ0LZbcjdtDhTmFzpL7gzQIDAQABo0Ew
+						PzAeBgNVHREEFzAVghNtZWFscy5zb21lLm94LmFjLnVrMB0GA1UdDgQWBBT3GkjK
+						BbnQcej4g/y3dazREgp4RTANBgkqhkiG9w0BAQUFAAOCAQEA0ZH/J9U3r6izhN4v
+						c+wdNsk1lay9K4FBFUa1c+DG/CKC8bt6lDl6aqG6kvgEYyoDQnJOTZGMvfxFnILV
+						M6wdVOp5xuPq5dKdaE/70m70+5prlGeHU/YNWzHberTqMECwh9oTwgwpkKozAphk
+						F8JKeM+VucOKir0JOHVcUDosUMxKE/7wEqC5tPUPhEfxNPZjU/EqKqK8VGWgvOmX
+						3lKemjnQyLllbHV4tHvOZ0haaI6p3eCvJIB7sHoe44icIgcffxJx7+vojZ6RJWSs
+						OeDLSoVBc18OSRpvQLpc4JSFrhflY9L3LUBJCxMEiDBjMWfd8NOpECzTJ5YW6Ua7
+						4GrqaA==
+					</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.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.some.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.some.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.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meals.some.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.some.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.some.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, Somerville College MBS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Somerville College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it.support@some.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Somerville College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it.support@some.ox.ac.uk</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
new file mode 100644
index 00000000..8354f200
--- /dev/null
+++ b/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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>
+      <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>
+						MIIEdDCCA1ygAwIBAgIRAM7NnU7tUSvZo89k8bNlDzkwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA0MTcwMDAwMDBaFw0xNjA0MTYyMzU5NTlaMEExITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTbWVnc3ZsZS5s
+						Ym9yby5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKoGHlVk
+						O6QB+0tuyJzq0vsd7NExlR42u6aWFPCfvujwV3om3gMN9ZjGqev6sY3xIVlg+ZOs
+						I+1xKcIverLKiCbYtVnTxLBQI6zWybM8uK5AdTUC/BHpIA/fZqVkOajYzn002WFf
+						u4rrUr0NZZszGm+RPSjdalhSf+BuUjm6Edn3TYB2PsEdtsyPEgETasdlZFgcdet+
+						gYCkg6bTm7Hz7fUyj4q4iguswHzxj/p0N4STbtIJWPlFYJvgCLCHlcv+wrUXdl3u
+						/W1uo6IK4xFHA88KA5iC0/WRcP0AZBoIIYt0m0WAfS5ESFVA9knCz3exQ2QW56rM
+						w2JuyMdeIHaikQECAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
+						KzdXR+qQ47ntMB0GA1UdDgQWBBT7biuxyf6+GROU/N8IfMZmq4AQzDAOBgNVHQ8B
+						Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
+						BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
+						BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+						QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+						cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+						L29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITbWVnc3ZsZS5sYm9yby5h
+						Yy51azANBgkqhkiG9w0BAQUFAAOCAQEAeDFbLufu17MX88aTRPH2cLy2WRcPsvmS
+						1PGKkwJHRZXTg+MnviRJo9EhwPkjrolqCF6vmW//ksXqi/YO/3ot0zHW6EqrrAck
+						7RwNMtgBa/SP92iEYAzsEi76YeZupzlA5kRHwIVC9OJG/S/zSwSuxjHjDxPw4eGi
+						+R7xcUcH1tUFYvS1VOVDyc3avo/QMa4TQhlK4g6ovUUFhINq1iX6P3ecBj7Z2GUg
+						69s/LbNH0HnpjKJnuLt3L94iQIWcehXxzOZ8OhZ7SExniAb3cB+9v5q6/Bt7Powx
+						uIgZedCEHUiDOuVv71eq6ny67K+S91yR6wRAgV+vQo/hlnqZBHmccw==
+					</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://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
new file mode 100644
index 00000000..39558ef9
--- /dev/null
+++ b/swamid-interfederations-2.0/member.goodpractice.net-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis: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>
+						MIIC2TCCAcGgAwIBAgIJANAQiZL85UcxMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
+						BAMTBmdwd2ViMTAeFw0wOTEwMjkwOTQyMDhaFw0xOTEwMjcwOTQyMDhaMBExDzAN
+						BgNVBAMTBmdwd2ViMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJo3
+						K9NuAfabszZBVr7jycgfy5gF5CuTKcE7E3NKECb80e5tBzNZMtVP9bysddyd6m51
+						BcUb6B/f/iE6Qjve9+RyIsGtXshJTfPKfNyt0m+hp5PS9JNxhwW1GQRYgAXMRAXI
+						1c4U1TT/ZVyriupfhjjmm4gNH7MFWlC73jPEImN3Azykz/9/SKAYSH5DQVcE30wC
+						I0q6Nl99CBcgBxPU4KT1eBxlWtXwCA/2brBBUnBkcB8MiHljAbHI3qDi3pAvPfNd
+						/88T0Gh76moQIzjYc34FInQ9bdbsnebyFvtFuXT819lo6dL+1i688wxUMJlklKWq
+						m+juOoKmeL6XoXRGZN8CAwEAAaM0MDIwEQYDVR0RBAowCIIGZ3B3ZWIxMB0GA1Ud
+						DgQWBBS+l+ek7zsiE7FuieyU4W19XwhfNzANBgkqhkiG9w0BAQUFAAOCAQEALofg
+						bvE4ztxhrWJMt5IDwYrc/c31N3+xSMsyLZjKSRY5jKN1sd5s7xDi3aXduMua1MKV
+						BFOuiXQqWS8wv/5GOrI1/K0yFxasQEOzPGhrj3ceMfut8iP7peeBWQrNOQyi+SkV
+						axuK3oO/KhVtGaPWpv+c/RzLMP7UXF7Zw4O/OsdYHPppr7UF0BgibN2jCiIPUBOd
+						4fobI74SpX1VIQa8pyC6NOR6lPU7Ozex4xzKCq6nnS4OxObTjylU/2d8YdGB/Zda
+						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>
+						MIIC2TCCAcGgAwIBAgIJANAQiZL85UcxMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
+						BAMTBmdwd2ViMTAeFw0wOTEwMjkwOTQyMDhaFw0xOTEwMjcwOTQyMDhaMBExDzAN
+						BgNVBAMTBmdwd2ViMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJo3
+						K9NuAfabszZBVr7jycgfy5gF5CuTKcE7E3NKECb80e5tBzNZMtVP9bysddyd6m51
+						BcUb6B/f/iE6Qjve9+RyIsGtXshJTfPKfNyt0m+hp5PS9JNxhwW1GQRYgAXMRAXI
+						1c4U1TT/ZVyriupfhjjmm4gNH7MFWlC73jPEImN3Azykz/9/SKAYSH5DQVcE30wC
+						I0q6Nl99CBcgBxPU4KT1eBxlWtXwCA/2brBBUnBkcB8MiHljAbHI3qDi3pAvPfNd
+						/88T0Gh76moQIzjYc34FInQ9bdbsnebyFvtFuXT819lo6dL+1i688wxUMJlklKWq
+						m+juOoKmeL6XoXRGZN8CAwEAAaM0MDIwEQYDVR0RBAowCIIGZ3B3ZWIxMB0GA1Ud
+						DgQWBBS+l+ek7zsiE7FuieyU4W19XwhfNzANBgkqhkiG9w0BAQUFAAOCAQEALofg
+						bvE4ztxhrWJMt5IDwYrc/c31N3+xSMsyLZjKSRY5jKN1sd5s7xDi3aXduMua1MKV
+						BFOuiXQqWS8wv/5GOrI1/K0yFxasQEOzPGhrj3ceMfut8iP7peeBWQrNOQyi+SkV
+						axuK3oO/KhVtGaPWpv+c/RzLMP7UXF7Zw4O/OsdYHPppr7UF0BgibN2jCiIPUBOd
+						4fobI74SpX1VIQa8pyC6NOR6lPU7Ozex4xzKCq6nnS4OxObTjylU/2d8YdGB/Zda
+						hgAqoNDf0vZ9o4I+/6GGvgcEbYv7mKbt3TUuccRc5lIFVpggzB037hyw4n055xO+
+						1GNLhUn46SUcF9uHqw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..fdf6951c
--- /dev/null
+++ b/swamid-interfederations-2.0/member.staging.goodpractice.net-shibboleth.xml
@@ -0,0 +1,73 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-17T16:43: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>
+      <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>
+						MIIDITCCAgmgAwIBAgIJAJy/kkU0owaoMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+						BAMTHmphcnZpNzdyLmRjMS5pb21hcnRob3N0aW5nLmNvbTAeFw0xMjA2MjcxMzE2
+						MzVaFw0yMjA2MjUxMzE2MzVaMCkxJzAlBgNVBAMTHmphcnZpNzdyLmRjMS5pb21h
+						cnRob3N0aW5nLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8h
+						piEPuJVRNJZUS9daETwxWIBmvfmWA6hmVoCsx3ItOQFgodv0AiVBIxggDjl4CYMQ
+						aBj5YFh+eUmuawXNC1Wt2g+A5HzMPwaM7HjVPkV/noQKbiHPkxHTlRKc7fuROoSd
+						w7/iHnVpFLAbkqVetprKKW1ga8zzdpiBzj/kHDBQZhyBQiihLmWYGXumdrG7by+l
+						PRej1p0IITpDUVRf4TaV7GgemDNbAn5l1fBQ8Ta1w/JAYRmBFJ//oZUhhMVdD1kH
+						FYdIvon50qUfFQLKa5X8FUTw4Bj2pSnuhH8Mmyl2agg3Ks2cV93McohQAzEsOzaZ
+						vq+UgBCJYXIHltmj65MCAwEAAaNMMEowKQYDVR0RBCIwIIIeamFydmk3N3IuZGMx
+						LmlvbWFydGhvc3RpbmcuY29tMB0GA1UdDgQWBBQayJlZGTlhGT8rvz+s/wZJ2tAK
+						eDANBgkqhkiG9w0BAQUFAAOCAQEAJDg5g1FRnTnwP7BoAOnB2ossDfOboWbQcqSg
+						1YeTTY/mOAE3oEaM3BG83RRXFGXdSgIgtM/P8iPMebNWR2/gPMLeGAWC5+SDm5EY
+						ARWQsnfFKkTG3vsMK7OPmgA5zIi59QUYwAOF4aJOsuUQjgrXWMwXUT7zMatHtkrw
+						lL+0VBkOHGU5cAs2oqBAH/59U9QIqSwusvSoD6CdxzxZQj0p8gyx3q6Ijy69dVOA
+						KULkafBZ1w0flcIDYXPGZ5yUAZ5CqNvngRk2eXfCx0Sd1xmXOiGxZw/Tok1DjIm0
+						0qqTdaZlBtbfqT/WNg1eTd6gOUqbJuNDRUO+ozHfOSsoRzZ1Yw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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:2.0:bindings:HTTP-POST" Location="https://umentor.staging.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.staging.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.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:1.0:profiles:browser-post" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umentor.staging.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">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/members.myworks.co.uk-shibboleth.xml b/swamid-interfederations-2.0/members.myworks.co.uk-shibboleth.xml
new file mode 100644
index 00000000..b22c7485
--- /dev/null
+++ b/swamid-interfederations-2.0/members.myworks.co.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://members.myworks.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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDMDCCAhigAwIBAgIJAP1/7w+UzNYuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFW1lbWJlcnMubXl3b3Jrcy5jby51azAeFw0xMTA0MzAyMjU0MjNaFw0yMTA0
+						MjcyMjU0MjNaMCAxHjAcBgNVBAMTFW1lbWJlcnMubXl3b3Jrcy5jby51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMeY74DchIYNTo/SCxAvbvWrqkft
+						batjLhAHZD4UOsbFVOdGHPno50QweYbOu36Uy7FzoZ1r+8/8CMUZc3zNpNaKyNWg
+						Xd7qeX9DRWVi0D4wJsRuBhzx2fTk1g2HnltqAg3ssVPyDQ70lRh019gVeBeMvm+P
+						lYWoRzoJTEl2z8hwMPGqf5oydmVCwTCRQX3CPMlY8YQKtTO//gMZcrQAen1Wn9ez
+						WMlRmouAsvnJdeaLNP32pLTWVdLJ55oHElLQTPnW/1bKY4xwsyE2DL3I0RWbksTx
+						q6onlTN92hJ05aX3o0n+8uIWaJO0UVyi8FxJ0gAIsdIDeyDt+809/Zd2XDkCAwEA
+						AaNtMGswSgYDVR0RBEMwQYIVbWVtYmVycy5teXdvcmtzLmNvLnVrhihodHRwczov
+						L21lbWJlcnMubXl3b3Jrcy5jby51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBSi9ltT
+						qVMqHPMmEyiFzvZ64nzIszANBgkqhkiG9w0BAQUFAAOCAQEATztbeTRrNLBSPyjC
+						PBKTYRD0vGmU+f6OKRucwQoZrx3Zq2NdMwguQxTyF/X+6JZDXLoUqiIrxJvurzQb
+						wabd2BU8NdmZMqmCF/IQxObeRi6gWtETddI3ZGVsIp53C/QImtO/NcnV7N1Yd9bu
+						nVLntJUV5K8vV/yJfYkCgtNvZZ4ZH+0qNzWZFtMOj+5R6fUJe9Yez4/T4Ot4pjUN
+						wWebWwcZxvNH1tnZQxeOTvlzmEpvUwfR54UeQyqJCF/w/2kxlQvMDgoueWCyUQqI
+						GLAzKLRI6HmGZU/JUFbJ9qhoBEQYy3BfAIUiC3z0Cm38kIFUUNl0TIsJJ4fFskdc
+						8rYfwQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDMDCCAhigAwIBAgIJAP1/7w+UzNYuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFW1lbWJlcnMubXl3b3Jrcy5jby51azAeFw0xMTA0MzAyMjU0MjNaFw0yMTA0
+						MjcyMjU0MjNaMCAxHjAcBgNVBAMTFW1lbWJlcnMubXl3b3Jrcy5jby51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMeY74DchIYNTo/SCxAvbvWrqkft
+						batjLhAHZD4UOsbFVOdGHPno50QweYbOu36Uy7FzoZ1r+8/8CMUZc3zNpNaKyNWg
+						Xd7qeX9DRWVi0D4wJsRuBhzx2fTk1g2HnltqAg3ssVPyDQ70lRh019gVeBeMvm+P
+						lYWoRzoJTEl2z8hwMPGqf5oydmVCwTCRQX3CPMlY8YQKtTO//gMZcrQAen1Wn9ez
+						WMlRmouAsvnJdeaLNP32pLTWVdLJ55oHElLQTPnW/1bKY4xwsyE2DL3I0RWbksTx
+						q6onlTN92hJ05aX3o0n+8uIWaJO0UVyi8FxJ0gAIsdIDeyDt+809/Zd2XDkCAwEA
+						AaNtMGswSgYDVR0RBEMwQYIVbWVtYmVycy5teXdvcmtzLmNvLnVrhihodHRwczov
+						L21lbWJlcnMubXl3b3Jrcy5jby51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBSi9ltT
+						qVMqHPMmEyiFzvZ64nzIszANBgkqhkiG9w0BAQUFAAOCAQEATztbeTRrNLBSPyjC
+						PBKTYRD0vGmU+f6OKRucwQoZrx3Zq2NdMwguQxTyF/X+6JZDXLoUqiIrxJvurzQb
+						wabd2BU8NdmZMqmCF/IQxObeRi6gWtETddI3ZGVsIp53C/QImtO/NcnV7N1Yd9bu
+						nVLntJUV5K8vV/yJfYkCgtNvZZ4ZH+0qNzWZFtMOj+5R6fUJe9Yez4/T4Ot4pjUN
+						wWebWwcZxvNH1tnZQxeOTvlzmEpvUwfR54UeQyqJCF/w/2kxlQvMDgoueWCyUQqI
+						GLAzKLRI6HmGZU/JUFbJ9qhoBEQYy3BfAIUiC3z0Cm38kIFUUNl0TIsJJ4fFskdc
+						8rYfwQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://members.myworks.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://members.myworks.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://members.myworks.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://members.myworks.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://members.myworks.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://members.myworks.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://members.myworks.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://members.myworks.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://members.myworks.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Boardworks Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Boardworks Limited: MyWorks</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.myworks.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Catherine</md:GivenName>
+    <md:SurName>Marks</md:SurName>
+    <md:EmailAddress>mailto:catherine.marks@boardworks.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Catherine</md:GivenName>
+    <md:SurName>Marks</md:SurName>
+    <md:EmailAddress>mailto:catherine.marks@boardworks.co.uk</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
new file mode 100644
index 00000000..d8b5b562
--- /dev/null
+++ b/swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml
@@ -0,0 +1,91 @@
+<?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"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis: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"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDKTCCAhGgAwIBAgIJAJuTjrsyhFeQMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEXRhbm5lcnJpdGNoaWUuY29tMB4XDTExMDcyMjE4NDMxOFoXDTIxMDcxOTE4
+						NDMxOFowHDEaMBgGA1UEAxMRdGFubmVycml0Y2hpZS5jb20wggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCyqSLwWCSrAJFK+BTDF52BRSvMaAXNFn5KWtXc
+						pfeV3Zma0MI54MUqc0SPirRK/fmIsQkSPk7HVaXFYZ6nkvBL8Ke3rHBA3ViMlGsJ
+						UMLs8qhlSfQn9d+J3DJVRqdV9RRZY9G0iKoBi0lM32kuX9cGVq71EJdjm2Nwfz3Z
+						5UyDoVfVMqVPnlESlY/bomcDjqwyz15z7cIRCbmZPqHyPqdsFRiKWUuVa+uwvxoB
+						CpwKxbfviJaYu9j0oQGzwSHse+fEOTCwV96Kr28PSqisolHhVaIxHjfCj3fAZQHm
+						EX8klaku9AnNItvTY5BJsdt3+DIFf6N9XIpSUuNeso+e497LAgMBAAGjbjBsMEsG
+						A1UdEQREMEKCEXRhbm5lcnJpdGNoaWUuY29thi1odHRwczovL21lbXNvLnRhbm5l
+						cnJpdGNoaWUuY29tL3NoaWJib2xldGgtc3AwHQYDVR0OBBYEFLbIWzGGpN1GGb1c
+						G8hXwXpvUiF/MA0GCSqGSIb3DQEBBQUAA4IBAQAeB5k8DkVkBHTP2LD2M8A3K5SC
+						Oe8jL3An51jBa+r9B7UGVNiC20DOYOVAsauMHYMP+lqaOKHIhSEBlQXHx61fWQQ5
+						mhN+0GUVbfKmqiOQmSLYeyzMiT5sb6JqSVVcAErBcN3nKxIhWMi9NJd+UntPLRYt
+						lbpIp+I1zWkV9kzElE1CzAq9pOuQQlL+7f4nbYYwppTyXQ5Gl6hW24oje4WtiHl/
+						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>
+						MIIDKTCCAhGgAwIBAgIJAJuTjrsyhFeQMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEXRhbm5lcnJpdGNoaWUuY29tMB4XDTExMDcyMjE4NDMxOFoXDTIxMDcxOTE4
+						NDMxOFowHDEaMBgGA1UEAxMRdGFubmVycml0Y2hpZS5jb20wggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCyqSLwWCSrAJFK+BTDF52BRSvMaAXNFn5KWtXc
+						pfeV3Zma0MI54MUqc0SPirRK/fmIsQkSPk7HVaXFYZ6nkvBL8Ke3rHBA3ViMlGsJ
+						UMLs8qhlSfQn9d+J3DJVRqdV9RRZY9G0iKoBi0lM32kuX9cGVq71EJdjm2Nwfz3Z
+						5UyDoVfVMqVPnlESlY/bomcDjqwyz15z7cIRCbmZPqHyPqdsFRiKWUuVa+uwvxoB
+						CpwKxbfviJaYu9j0oQGzwSHse+fEOTCwV96Kr28PSqisolHhVaIxHjfCj3fAZQHm
+						EX8klaku9AnNItvTY5BJsdt3+DIFf6N9XIpSUuNeso+e497LAgMBAAGjbjBsMEsG
+						A1UdEQREMEKCEXRhbm5lcnJpdGNoaWUuY29thi1odHRwczovL21lbXNvLnRhbm5l
+						cnJpdGNoaWUuY29tL3NoaWJib2xldGgtc3AwHQYDVR0OBBYEFLbIWzGGpN1GGb1c
+						G8hXwXpvUiF/MA0GCSqGSIb3DQEBBQUAA4IBAQAeB5k8DkVkBHTP2LD2M8A3K5SC
+						Oe8jL3An51jBa+r9B7UGVNiC20DOYOVAsauMHYMP+lqaOKHIhSEBlQXHx61fWQQ5
+						mhN+0GUVbfKmqiOQmSLYeyzMiT5sb6JqSVVcAErBcN3nKxIhWMi9NJd+UntPLRYt
+						lbpIp+I1zWkV9kzElE1CzAq9pOuQQlL+7f4nbYYwppTyXQ5Gl6hW24oje4WtiHl/
+						mXSnza8yA2NPDhefbmxqxbVeU+1Qu1PyHQaUX/mdzAXVOXgaM0F72BimTAXQ4Zxr
+						/1WxEAHX32o1DtTZC+Pspbm0oN2KG0dyUSoFR2R8XYShQowVVtr7glWJTcdo
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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/meta.cesnet.cz-sp-shibboleth.xml b/swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml
new file mode 100644
index 00000000..954b02f4
--- /dev/null
+++ b/swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml
@@ -0,0 +1,170 @@
+<?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>
+      <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
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIwNzAwMDAwMFoXDTE1MTIwNzIzNTk1OVowOzELMAkGA1UE
+BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSd3d3Lm1ldGFjZW50cnVt
+LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz+Ob1/WykMJvEau5
+B4VkUv6mmjO+yjh7YFYPQKBUhdZS9AISjX8NRPH7y0SXasCOCdi3phwlzKnWoUQq
+UuRh/inUe/DVGu44F1oai33gxKQuRCLgbxD5Uxm7M0QDm5q6XjIqkSYJU7pZtFgR
+JvosB0AdYylrPY2paWk0+BGWhWjFHB8zZywmiEMmCawjD8cLcCRTwhTzBTHDSFKQ
+5JnqHJSKazWj/l55ECVsnx2ezUT9DqaXCBjM6R4r7l5vRA2328mHpwgfOqEONboF
+s1BOPwf6pbqAEeLSDSwLBwsUguohYan5adisAPIcN9A5aGdsLWxy1bi5TH5vET+c
+js6xcwIDAQABo4ICATCCAf0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+ue0wHQYDVR0OBBYEFDQ/IQ/LVEu8GUWMKwhdu7L1XoWyMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
+BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
+Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
+BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
+b3JnMIG4BgNVHREEgbAwga2CEnd3dy5tZXRhY2VudHJ1bS5jeoIQZWluZnJhLmNl
+c25ldC5jeoIObWV0YS5jZXNuZXQuY3qCDm1ldGFjZW50cnVtLmN6ghBtZXRhdm8u
+Y2VzbmV0LmN6ghVtZXRhdm8ubWV0YWNlbnRydW0uY3qCFHBlcnVuLm1ldGFjZW50
+cnVtLmN6ghF2by5tZXRhY2VudHJ1bS5jeoITd2lraS5tZXRhY2VudHJ1bS5jejAN
+BgkqhkiG9w0BAQUFAAOCAQEAHJ2gaM4WNXYhUWFb+KdRdw8kCSZsZF3AekhGd2XG
+mK6aUsbLfJcLMg0tuROkJnxMtZoeLLfPvHiCBtUPD7jvCJcNDCNlICkaEG3Grmd6
+swb1hC+ELuGTAC5om1b/1bIbbYQvCx1mk19kBugPSI47Yyb0G4RqBQLWNvAjH1gI
+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
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIwNzAwMDAwMFoXDTE1MTIwNzIzNTk1OVowOzELMAkGA1UE
+BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSd3d3Lm1ldGFjZW50cnVt
+LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz+Ob1/WykMJvEau5
+B4VkUv6mmjO+yjh7YFYPQKBUhdZS9AISjX8NRPH7y0SXasCOCdi3phwlzKnWoUQq
+UuRh/inUe/DVGu44F1oai33gxKQuRCLgbxD5Uxm7M0QDm5q6XjIqkSYJU7pZtFgR
+JvosB0AdYylrPY2paWk0+BGWhWjFHB8zZywmiEMmCawjD8cLcCRTwhTzBTHDSFKQ
+5JnqHJSKazWj/l55ECVsnx2ezUT9DqaXCBjM6R4r7l5vRA2328mHpwgfOqEONboF
+s1BOPwf6pbqAEeLSDSwLBwsUguohYan5adisAPIcN9A5aGdsLWxy1bi5TH5vET+c
+js6xcwIDAQABo4ICATCCAf0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+ue0wHQYDVR0OBBYEFDQ/IQ/LVEu8GUWMKwhdu7L1XoWyMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
+BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
+Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
+BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
+b3JnMIG4BgNVHREEgbAwga2CEnd3dy5tZXRhY2VudHJ1bS5jeoIQZWluZnJhLmNl
+c25ldC5jeoIObWV0YS5jZXNuZXQuY3qCDm1ldGFjZW50cnVtLmN6ghBtZXRhdm8u
+Y2VzbmV0LmN6ghVtZXRhdm8ubWV0YWNlbnRydW0uY3qCFHBlcnVuLm1ldGFjZW50
+cnVtLmN6ghF2by5tZXRhY2VudHJ1bS5jeoITd2lraS5tZXRhY2VudHJ1bS5jejAN
+BgkqhkiG9w0BAQUFAAOCAQEAHJ2gaM4WNXYhUWFb+KdRdw8kCSZsZF3AekhGd2XG
+mK6aUsbLfJcLMg0tuROkJnxMtZoeLLfPvHiCBtUPD7jvCJcNDCNlICkaEG3Grmd6
+swb1hC+ELuGTAC5om1b/1bIbbYQvCx1mk19kBugPSI47Yyb0G4RqBQLWNvAjH1gI
+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>
diff --git a/swamid-interfederations-2.0/metalib.library.qmul.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/metalib.library.qmul.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..9d350344
--- /dev/null
+++ b/swamid-interfederations-2.0/metalib.library.qmul.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://metalib.library.qmul.ac.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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFMDCCBBigAwIBAgIQCR4X+YYxugtmUqrjt8DPOjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDcxNzAwMDAwMFoXDTE2MDcxNjIzNTk1OVowgdsxCzAJBgNV
+						BAYTAkdCMQ8wDQYDVQQREwZFMSA0TlMxFzAVBgNVBAgTDkNlbnRyYWwgTG9uZG9u
+						MQ8wDQYDVQQHEwZMT05ET04xGjAYBgNVBAkTETMyNyBNaWxlIEVuZCBSb2FkMT8w
+						PQYDVQQKEzZRdWVlbiBNYXJ5IGFuZCBXZXN0ZmllbGQgQ29sbGVnZSwgVW5pdmVy
+						c2l0eSBvZiBMb25kb24xEDAOBgNVBAsTB0xpYnJhcnkxIjAgBgNVBAMTGWRyYXBl
+						ci5saWJyYXJ5LnFtdWwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+						AoIBAQDFgBdbGL/GSo5oQqq88P2aZQsDZKGXcROQf+x9ooJAy7nZhbYjyohCyMPJ
+						Nfc541+v5+UqZgSU/GoN1s9RCPdvNkObiyEIzhBCTrTRE11H1MGJoUF0acx2jpWZ
+						0g8px6vi4mX2P/9hwVt6y9L++U6KdAoqDpG8vy1CNmyWV+b+39nn2hmGn8T/GDdJ
+						5Tg2bnA35B+H0n4M+0Ezcm/+fvexplwI31A90R7fWQryYyORlYC/mZRvDLgd7pDs
+						J8RXFNW3RAum7FHQxVsmMEYiKfobt1jLd+L7jsG+94W43dfv3s2x0Woin3douEBZ
+						tciHGAHATDTHzZcpkibQxNtROQLbAgMBAAGjggGSMIIBjjAfBgNVHSMEGDAWgBQM
+						vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU517jMU/gexoHTBO9dLm4x2eW
+						SmAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
+						BQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EM
+						AQICMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
+						VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
+						cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
+						MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMEAGA1UdEQQ5MDeCGWRyYXBl
+						ci5saWJyYXJ5LnFtdWwuYWMudWuCGm1ldGFsaWIubGlicmFyeS5xbXVsLmFjLnVr
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCK31/RCDY1vk7ZlYo2TsEMApl7BtMDHSSjBC8X
+						ynY3HufFVHn5MfOOWgd4lP8J2xkhWTrlNdN6HGWLHnyi1X83SWxeiFc8v24tIWDY
+						/l0lyk0vbTCl3WJqAlczmNCLHIIGLM6epn1zWgprydw6zh9tjKyTNTQGvpdxZm54
+						EyakhTXxRyQ8ZvhI7o0O5gdLR7G1O7TAi01VhlqYN2qZl2a1MKKMIh/in7W26lGw
+						qD1u5MIJDZI2AWzuWcbWVnG1eCS7OjS6L3VLGe42HdA/PcDTlP1Sa3fhtW0dicnN
+						lkd9ORqKnAn0Eu92u/K4wIU0zyHK7lXeeOVZsm/ErYmcGtTS
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </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: QMUL Metalib 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>Jeremy</md:GivenName>
+    <md:SurName>Acland</md:SurName>
+    <md:EmailAddress>mailto:j.acland@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kieran</md:GivenName>
+    <md:SurName>Whitbread</md:SurName>
+    <md:EmailAddress>mailto:k.j.whitbread@qmul.ac.uk</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
new file mode 100644
index 00000000..b94d82b2
--- /dev/null
+++ b/swamid-interfederations-2.0/metalib01vapp2.hosted.exlibrisgroup.com-shib.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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>
+						MIIC8TCCAdmgAwIBAgIJAJPmUlsftXVuMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+						BAMTDm1ldGFsaWIwMXZhcHAyMB4XDTExMTAwNTEzNTc1N1oXDTIxMTAwMjEzNTc1
+						N1owGTEXMBUGA1UEAxMObWV0YWxpYjAxdmFwcDIwggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQDdfV06FKaI8A9DfiUSJ+tN2ttYWY/n08jESSAsRma+m2bx
+						P+0+GGz5Sme+qeYFITXzVU3Wh/s1fNSjA7puiNC48YPWEUYwbwhbApkTU1ehIydr
+						xwYAXbgtG7oCVnapcmVFZ9JBRlBmpDFsZKMvavmVRUGuNT+clSR0SghwAT8jsvvk
+						F3P0UYniQmw5fcTzvgew9xAlI6h85CRi8VzcsByhsHzn9A5JxHBAsGSiv0xQEMMv
+						IxsuPaUyUt321O7BalJ0gJZw/8CWknc25BYwm7PNBs3GzmPum3bfIuAyFajHM1Dh
+						9TaXXra+yMnvChDvWChT3ZTdPBTqFqpn8hYogkOxAgMBAAGjPDA6MBkGA1UdEQQS
+						MBCCDm1ldGFsaWIwMXZhcHAyMB0GA1UdDgQWBBSG8M7BLbEa4/0WVcZF1lp/kPbe
+						EzANBgkqhkiG9w0BAQUFAAOCAQEAM/Ubls8cWPbwnN3//MJfiZvbRMcuBu+R9DjC
+						2l3pd0tSyUlz/uaXuJazAxpK9lcTY3aqyxIq7fF6GkfM6wU0Jb0X6YXlsiinpRDW
+						UV8FIc/S7YQVK6ELGJQOjcsvZcBbwi7rFer4ATFaScgaEn7OTvV0Zx+ShVH7sD96
+						IqCnSd6IoMcMdIapXRGwKuv2QKUDxZ+e/74CRXn5u/RSArYJs5SNEOjyRZHMU/LV
+						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>
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
new file mode 100644
index 00000000..0fce2461
--- /dev/null
+++ b/swamid-interfederations-2.0/mnementh.csi.cam.ac.uk-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIC3zCCAcegAwIBAgIJAOVxp6HWm9xkMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+						BAMTCG1uZW1lbnRoMB4XDTA5MDIxODE3MjYzOFoXDTE5MDIxNjE3MjYzOFowEzER
+						MA8GA1UEAxMIbW5lbWVudGgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCWDFJMwCnDDlN4+JVj+jxbThz13wSWChP78LNPleUdjm1zbsQJOfcJ542EkyqM
+						7/O3TqgXES/VlkTccIfr/e86lO8AxFYeXsowEju+3AnyAXav3fL03diiRR+mWTlr
+						A0GjD6uQHlIZGce0IACh/GUc+nMxYjSZlnc/IKDF0lGrOhQdsdjasxc9daJ0HQOY
+						BXcJkFQO1m4uztNXPu/3JLYSzpLgKVY9W/24fyd9zpsPrG4xHl3D08jUovDvnENc
+						+q0gyt5TwRt28hifF9kdV+zdyTYQvKi4uOimqzt9wjSbv9xhvNa5VElt7GbiAZRE
+						OGUAj4gEbQbBhU4TLJN84h9jAgMBAAGjNjA0MBMGA1UdEQQMMAqCCG1uZW1lbnRo
+						MB0GA1UdDgQWBBQjLNqsyE3DpyRHamNjGNFPfpd5qTANBgkqhkiG9w0BAQUFAAOC
+						AQEAGkihtfVr4oVSzPreJwViJnqosAxrnTg2rEwvTnp02Es6Vaam5M995JQkWS8x
+						vQAwCywoccsRuk02LOZ7bhP7IExPYSmzSJ3bIbXYxTJ5+36ELmxS0dETZq69c0QT
+						Xja0CXAviE3TjK3VLvemSaJWJlssPB3dGIHhJ1oulB7mG1F1gj6MY8FHtjgsjJ2k
+						jKWUyCTonkcj/j22UdaMzsBb0vOtRoDBlhtEyppm06VQFQpizV2XyH/de8R1mrNK
+						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>
+						MIIC3zCCAcegAwIBAgIJAOVxp6HWm9xkMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+						BAMTCG1uZW1lbnRoMB4XDTA5MDIxODE3MjYzOFoXDTE5MDIxNjE3MjYzOFowEzER
+						MA8GA1UEAxMIbW5lbWVudGgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCWDFJMwCnDDlN4+JVj+jxbThz13wSWChP78LNPleUdjm1zbsQJOfcJ542EkyqM
+						7/O3TqgXES/VlkTccIfr/e86lO8AxFYeXsowEju+3AnyAXav3fL03diiRR+mWTlr
+						A0GjD6uQHlIZGce0IACh/GUc+nMxYjSZlnc/IKDF0lGrOhQdsdjasxc9daJ0HQOY
+						BXcJkFQO1m4uztNXPu/3JLYSzpLgKVY9W/24fyd9zpsPrG4xHl3D08jUovDvnENc
+						+q0gyt5TwRt28hifF9kdV+zdyTYQvKi4uOimqzt9wjSbv9xhvNa5VElt7GbiAZRE
+						OGUAj4gEbQbBhU4TLJN84h9jAgMBAAGjNjA0MBMGA1UdEQQMMAqCCG1uZW1lbnRo
+						MB0GA1UdDgQWBBQjLNqsyE3DpyRHamNjGNFPfpd5qTANBgkqhkiG9w0BAQUFAAOC
+						AQEAGkihtfVr4oVSzPreJwViJnqosAxrnTg2rEwvTnp02Es6Vaam5M995JQkWS8x
+						vQAwCywoccsRuk02LOZ7bhP7IExPYSmzSJ3bIbXYxTJ5+36ELmxS0dETZq69c0QT
+						Xja0CXAviE3TjK3VLvemSaJWJlssPB3dGIHhJ1oulB7mG1F1gj6MY8FHtjgsjJ2k
+						jKWUyCTonkcj/j22UdaMzsBb0vOtRoDBlhtEyppm06VQFQpizV2XyH/de8R1mrNK
+						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>
diff --git a/swamid-interfederations-2.0/mobileauth.labs.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/mobileauth.labs.jisc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..58cd5724
--- /dev/null
+++ b/swamid-interfederations-2.0/mobileauth.labs.jisc.ac.uk-shibboleth.xml
@@ -0,0 +1,81 @@
+<?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://mobileauth.labs.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#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata: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-27T15:06: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mobileauth.labs.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>
+						MIIC9zCCAd+gAwIBAgIJAPBv1wp/OCGRMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEGlwLTE3Mi0zMS0yMC0yMzAwHhcNMTQxMDA4MTcyNzQzWhcNMjQxMDA1MTcy
+						NzQzWjAbMRkwFwYDVQQDExBpcC0xNzItMzEtMjAtMjMwMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAt3TRLhrGfSXumBs5SmnJC+yfA3rqF/QD4fZw9v/d
+						SveQkvvyrExRLkxDCIM2k1zxyKsZcn4IS9teBOUYcPFi75NPSQUqpUkeBEoW15+g
+						1CKDgVtwMcCEDubppfov27Js9Dx1+AAtd6o/UWpZiGo+dmDNCIKZuABGZN1jGXRU
+						VcmsnV83kuxclC+lBBk6t+U9WXI1LJNo3VNBm5F57vH/gLlou+/Js9Vt6fyDcpOq
+						FTj1ge4O8kZZIB+YeIJXA4oEVgPKXrLpnMDQZp5xtued7cX2IWwartY78doRaurm
+						bCHlsHljJ226bteRxbr2e1P95sLDXAkhCPndoNbltAHpxQIDAQABoz4wPDAbBgNV
+						HREEFDASghBpcC0xNzItMzEtMjAtMjMwMB0GA1UdDgQWBBSZ7kmarCHOt+GFQsqa
+						F9DvVFNEmDANBgkqhkiG9w0BAQUFAAOCAQEAMXl2SEg4EN0e7qsLuBUiF3x/fP6w
+						jd1aW4RQEN5DOfgZ01AK80g1VXbIv1LTg1/Sm2x5q3BZX1oC+jsBGFUgx/F8RQVY
+						78G97m2m3DVY1D2fehCLYsDcgqVBo2LukhlBL6VbUdJhN+uJVklg5IBPI9ETxijK
+						gndnJMwOxMc+buHndoeVlAs/X55FdDs5zLMb0h4e9VbYCG1aCKWsF3ECJFhp87sv
+						0FZvRG6zm2EPpEqSV0oXoY+IPMPisIDSO5jm3Y49W50XW19KVc0oeoPpfsatzvq/
+						8J/wFQ9AjU02BhtkFOyzvJznUQqbPG+SpHHO9++dYfjF/Arkr9f8mZzLxA==
+					</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://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mobileauth.labs.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://mobileauth.labs.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://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mobileauth.labs.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">Test Mobile Authentication Proxy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jisc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Webb</md:SurName>
+    <md:EmailAddress>mailto:m.webb@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Webb</md:SurName>
+    <md:EmailAddress>mailto:m.webb@jisc.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
new file mode 100644
index 00000000..ebf82a4e
--- /dev/null
+++ b/swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,51 @@
+<?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>
+    <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: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/moodle.fsp.uni-lj.si-sp-201411192359.xml b/swamid-interfederations-2.0/moodle.fsp.uni-lj.si-sp-201411192359.xml
new file mode 100644
index 00000000..8b3aef67
--- /dev/null
+++ b/swamid-interfederations-2.0/moodle.fsp.uni-lj.si-sp-201411192359.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:algsupport="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:req="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://moodle.fsp.uni-lj.si/sp/201411192359">
+  <md:Extensions>
+    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <algsupport:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-11-21T15: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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <req:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UL - Faculty of Sports</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">Univerza v Ljubljani Fakulteta za šport</mdui:DisplayName>
+        <mdui:Description xml:lang="en">FSP Moodle</mdui:Description>
+        <mdui:Description xml:lang="sl">FSP Moodle</mdui:Description>
+        <mdui:Keywords xml:lang="en">FSP Moodle</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">FSP Moodle</mdui:Keywords>
+        <mdui:Logo height="300" width="300">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAAEsCAYAAAB5fY51AAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+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/FRgAAOyxJREFUeNrsnXd4JVX5xz9zS3rbTbbX7NIWWLqAdOmCdBBkkV6kCSr+VECw0EVFitIUERRBVhFFiiAqiDRhQUDqVrZmd7MlySa3ze+P8w73ZDJzk5tN9t6bfT/PkyfJlDNnZs58z3ve855zHNd1URRFKQUi+ggURSkVYoW6sOM4+vSVocJRwG7ATsA64DAg3YfzJgNbAbvLuecDH5TKTRekdea6bkF+gEqgESgPyFYFMBwIU7W4nOsX3DI5Ty3HoUM5UBVU5wHDpKwUmjsBV36ezuO8e6zz5gC1pfRiCqEbsQLe73bAycAUKXRtUghrgbXAO8BlQFfAueOB74to1QKrgAY57zXg2/qdDxkOBX4GtALvAVF5701ARqySpwucx68Dx0kZvCWP824BPif3cr+UX6VILayoiM1k4Dmrpvk3sDlQnatFKYVjV2ChVbNNEcttoNgKeBG4KYe1pwwudcA04C6rjHwAHAJM7aOFNQG4FNh0kPI4RfK1VKz8fPhIzt0pYN/hwJeK7H1EJE+HFkQ3CihYNidahfFzeT7Aa+W8owfh5fzVytc5qh0F5SDrXeyS57lPyXm/GqS8fUPSvynP83aV894OcGPsad3v/kX0Hr4ueVpVCN0oFl/PSuvvRJ7nLpDfLYOQrw7r71WqGQXF+2hfBF7K47wmjFMbscYHg2Pk9715nneE/H5Imrc2niingWVF9B4+I79nF+LisSJ5CPH1ONdr97cOQr7Ok+bHLOBB1YyCW1gAj+Z53nLgBmAScM0g5GtX4FPA88DreZ47Q34H+eAeA/YGZgJvFtF7uE3cOV/f2HxYNodZ5u+Bed7CfnLe5vpND1n2ssrHp4osb3dIvr7WD0vFBd4v1ZeyMTcJBwINZRi6fFp+vwW8UkT5qiDrc32on/f0a329+pF7VAFb0rOHL58evyaMw330AObLwfSCVvVy3NaYWKPBwmFgez8Hqyf1KPk9swBlKNc9HQyMFXfBAp+rpbdv63j5/fgAP88DgaswvavF8O60SRjSJJxmbauXND8i66DdEbgd+BDjTP9PL2Z8M/BdTOTyGqsAnCYCtiumK3oG3XsQKzDdvscAOwBnWL6KCuAK4FWxFpYC72J6ST2iwLbAA3LtRhHLP0g+bpDjTpFa/cvAV4FLxK9wmlz7HEwMUxBHSHrtQFKEYH26/IcBN2M6T37n23e0XKe/vbhbW2XjM3meOwb4keTr8oD9cXluy4CfB+yPYvyXD4Sk/xfJl/f+pgG/AT7GOPjPDjlvWznvrZD9BwHPSjq9vZcG4FRMTGMZJg7RBUb4jttR3vMqeVd2pX4Lxtf3HrBzjmvtDzwj31XzxhzWMNCC9S0rvfcwgYcvywd+FzDf2n9zSLpf9KXhcSUw19q3ChPEahfyy4Elsn++iFYDJpp5FXCSfIjbYZzIdpf4blbay0XgFljb3pbjfiv//w8Tx/Yy8Dcp5N6xP/DdU7UIyhvAN4GrgcVy7H/JP4YIuYdW65pJTGCvx3Wy/R/9FKxvWveZD4cDKStffiHd03pHLvBIQBony767Qyo0l2xnzwny/z3ybp+Q/w8POPe7su+6gH2/svLkSvkO4yuYAOv35VivnNzmO84Lu8jI79/I9unyDH5INlr/2YDr1Fvi7GJ65EeqYA2cYAH82UrztoDz7rP2Tw9J+4YAwfJq5jd9L9/PI5gQDc/UXiYvPYj/SFp7y/9XW3l7XCysI0WQjsAEQraHfAwvyHl+n0qlFOhWugflbm9d69A8n/2uYq2einGGu5jeMpuzyAYE9wfvQ/lpHudcbH3s3vCXk639ZwOLpCJ5I0e584I69wzYd57sOwvYV/4+1tr/JcJjs/4t+7a3tpWLdfQCsI/sX0JwAHVUhKXNsoiOsd7jbj7Bfx8ToP1l2b+dNGUXyzMAuChEuLeW8n+9WGKuNDlRweqfYHmFZSvf9u/I9jdCzpuGGfbjL2g254cIFtLk8mpYv39rEt2DTa+R/+8DzgS+J5bat4FbxepyZTuYGBzveewUItK3hNS4rojIJN++a+zC5uM92Xdens/+93I/iBUbFGB7kmzvT0jBJv0oF/vLBzrdVxlMtcrLG8AoaTa5Ikz+Ma1ny76XQ67ziuy/QKycA0IqxBtDmriv+rb/3KrQ9pZj/hRy7TmYcBs7LGkHOefNgG+rSf7+QCzpmPw+3TruYTn/eN/5Z1pi74n7lhu7YB05ABbWFiGC9XzIeZXiQ+qvYNVILe2vvZEm4UcBNfUfgScxkddPYSLpX5JabSawh0+wUlITBtWwUd+2yeKrCROeg3JYULPJf7RA3PKTTJPz2wKcvZfKvh37IVieRTCXvg8M3kZEwf6I/27tnyI/SFPIlWa3zQireXV+wDU8a/Id8UOd7ts/1qqEZvj2fc9XOXnPck/rHu8MKVdIGXJFzG1+aFl85MjzKdI8vimgYlgLjAw5//N+Ed2YBesQS7COz7NQnyZ+k5oNLFi2f+Y53/aFcn3EZHfJLzq7N8EKwvNp/asfwuD55A7pZ7PtRjn/RyHN3bf7me5jku6d/Tz/OwHiYDfBltoWQ4B11GZZZjZXWOX12oD9nkgvFP+PzesBzUF8nTZz5JiJIfdzbIBAevkdEZLuT+Q7+Q09g6Cv78Nz9nyt+6tgmVoxE1Lb9cb10tZ3CiBYO1kFd2fL2btSevds38J/8+g6zlewjrbysVcfrzFc/Cz/sM49rB+iMNJqWvs/wq1k++f7ke5kK90T+ylYnp9x94B9nhviyYAm0Jocjngww4O8Xj4n4Hksl/1XhpSXd3KUhT0InqbGsxZfDDjndtl3R0iaZVIppaQC2dRn3XkV1i453Cc9mpsbc+DoPLJj9fbI89yDLX/ChuZVy+/gid5xYravCPDHTBmEPNRavU23Av/sw/N6VD7UneXZpWRff8rDF+SDeJqeQ1N+LBbfQ/1Idx9JdyW5Y5XC2E78WB+HWLeeJW8Hbh4hFY4X7/XLgPOmWx/2VQHlzpv26E269x5juTseylFej5PfzwY0JaFnz+IJlt/w/pA09xKfZlTKiD1J4KGy7+85WgHejBH3FlwpisTCss3/dQH+qDCmyzln52gODKaF5VlUXvjCDmJJ7RZihV06CBaW50xfENAciFuWXpxsz+k9mDALxOfkWRS75ll8POetSza40/6QXGCzfhbNP8j5v+3DscMwMWh2kO0FIU5vMPFZLtBpnbObVEC7iBWyynLEb002yNfrbHmfnmEgR1rvbbeA677vs/gmk+0Z9h+znbXtALLT6jg+K/GjECe+zd2ETy74uOw7KYcl3oYZhN1k+fhiG3OTELIxLy7BQXxBPEX4oOcNJViIie/lPciamEW2R3GbHJbS6DwFy+5NPDVg/+nij7H9FD8L+NjX9VNc9rCaODZb58hTXxhldSCc2Yfj76JnEOZLcv4xOd7rbVaHRKtUlF7T62bLYrKHA3m9obf60txUPuowP+ynLNHxeEXei8ee1jF2p8oD9AztOEasOC/GyhuMvKVsi1ri4nUA7BFS4S+V/3ckG5jscbbPP3mMZ/Fu7IKF9EB4H+BVvRTSB+W4A4pAsC4nd6Dfhdb+pSG+gqcwEev5CNZTlsUUxFuWQHm9S36zfr/18GF5ImhHgu8uArg+MyNcYuXpC70c683PtKdPPFxgNcHDn/5o+R2Plub7oT5xmI4JE0liItPxNee+am0bJ26NXCL9f3TvdXwxQGS9cmQ3JUfLfdjl9DIRqwlSubtiKe8ix15gnT8j5L3b1vmpcg8t9AxL8SzoHeW4tSLwKljSxLBF631M4Nv+YjofIm34NnHSB032N0EK8RwrnXvpHs90sPgpvP2vAeeSjdAeKS/9XeuY+0LMfMhGPb+Tww90t5VWBtOzeLM4SpeLL6xK/CjPW8c+KIXIb5nZ84j/Ve75BinsP7WsJq8H7Dxfz9b+mADVZ+Sj9NI5QmrVmj4Ii3dPqzDR23fKO5vRT1/cIWS7511LdO4UB/Z18pFdJ8LiRek/7EvLa7b9MqSTYJ3VJPyQbMzWFGvfSrGM/b2E3/IJwL5yTge5h7X83aqIn5NmZyREHPbxdUi5lsP9WekMqMUEla6xmoRtmBEaQdb9tr7t40Sove9sIabHHZ9Pz7v2MkzA67baS9iTI+TjSfkKb6co/D2ED0beX5zK12Aini8X382XZb8j5u2vRQy/Is7hmZao7YwJirxB9n8TE7uSywf1H8KH+Xh8UQqQfV8psnPQV0uNeSdmnOM3MN3RT5Cd7M2zDu+Q2v528fM8JmL/qPgqXhRBsvkF3YcU3SlpfdbK0xp5bn3Bi3T3glXvpv+DxCfLe/2T3M/tYh3OlI/9j9b9PSadC3+VZ+MfqfCI5OmzIZb1Aqv5bvv9dvYJcBA1VoXyNmbI0I30PrfcM3JOQp57PKQXcH7AuV5P7nJMRLrdsWBXWv7YrPGEhytsZ1WezxAcJ+fFjM0WoXYK7f8uVsGyC8d06eXYU2q7Yh1VvrU4c3vDEStwlwLdzxRptvkDBMeKBTkqz/SaxQooK5L3MM7qhAgTkbEBH7fHNMJjmezOjJ2ladTXWRGGix8rTNAvzdEx0yTlKxqwb3N6jmrwKJPzGkL2b0X3cZ9+GkTYyoulw67YBUtR8sVr+l5dYvn2hr1sUioZ1gn8FGX98XoFby+hPO8oVupM8akpIahgKUOJaRgn+M/pPqFeseONGbxRX2ERmnXaJFQGiJF091N5MVJTizjPtWSDecH4wJL07OlU7SiylZ8VZX04DNNj+AVMr+JmmJkKzqD7TBnrb/40DeOohnpaUimaYjH+uGo19y438cqOA2c2Defg+lqSLnzU1cVlHy/JldzvMY7yaZg5za7AhBScqq+0d5xCWTuOowspK+vFqWQDZp/AzIrwICYMZMCY0djA/VMngQNuxv2k3D6xei2/XrGS05oa2bdOQtZiUea2dbDJf98jHf5dPYeJOF+ImWurUYR20FfP2beuhh2qKrlxycAs4VkI7VDBUkq2ssXEtR2IiW26hfzXBcytiE3DuGfKRJYnU7RlMkTIjlhuiEapL4uxKpFidToNGIfwiHiMO5at4OL5i8KSnYQJzN0cE7B8I/kvHpw30ysreHbaVBqrKvnWR/O5bvH6r82qglVaDMfELP2vQB/rlpiZCFardvWNXWuqmN2VwHVhx+pKOkSE0sDLbR10ybcwubyM2yaNY//6WtrSadakM33qnXIxDrVxlRXcsngZX543OAtNH1BXw8H1tfxwyXIWJZOfbN+mqoIrx45ibDzOibPnM6fL6ODWlRU8tcVUGqNRlqdSjK0o59qPF3PD4hZWidiqYA1NwYpjHLoHSc346w3se2jGDFE6DxN8usVQFazKSISJZXG6XJf5XYke67jnQ300ymVjR/LV0SP459p2Mi7s11BHMp0m6jhEIhG+vWARVy1aymlNw7l87CimVJazuCtBZ8YlmkdRdYGoA+MrKrh18TIu7KdoTSqLc/m40SQyGa5etOwTYZpaXsYzW0xlUnUVH6xt56X2Dn62bAWNsSiPbjbF5MBxeLWtnefWtuPgcFhDLRPK4nycSBJxHGIOjC8vZ1FXgh8saeG3K1qpiERYkEiQdlWwBluwtsM4LrswY8vS4s9ogE/KuYuJEq7CjIkqw4wze7ofVtXzZBe8uAkzdGdD8UOyg27nkR3DOKTYrqqSy8eO5JD6OlpSKR5tXcML7e08sGJV3mntU1vNleNGs8+wOhav66IuamylJckUccfBBeKOQ200QmsqzZh4jC7XZans7yNRqcw6vQ0RYHxlOT9ZtCxX87AH48rifHlkEyc2NjC+3AwemN3Zxf0rVtGSTHHuyEY2rShjTleS4bEoTWUxViRSRBxIZFzWZVzSuDTFYtTHTGD88mSKNek0Met+Uq7L8FiUumiU5ak0XZkMv5bn+9uVrbzR0amCNUiCNQXTU/QFsgtRLMOM/ctIYfLGTG2BWdsuhhkCcW0/rre1iFZ9AQQLjKP51KEoWNtVVfL10SM4rrGBuOOwoCtB3HEYXV4Grsvza9r52bIVPNS6ilQfyu3nhzXw4KaTSbsZ5ncliIaUOa82izkOKdclTc7xUt/FjGN8xtp2C2ZCxD/70xxfWcGti5Zx4fzeLa2vjBrB98ePpjoaYWkiSafcY0XEYWQ8juM4LE8kWSuWoXcdT3hTrpvXOC9XhDXqOESAkWVxIrEo89s7OeC9j3i/s0sFaxCbhJthBhZXYuY5uiDkuFGYKZVvJDuHUL48hplZoBCCdTomMHJICFa54/DAJpMYEYuxZVUlw2MRFncl6HKzUc0ZqWEa4zEqolFmtXfwlXkL+cfadmKOw+41VdRHoyxLpXixrQOAGY3DuH+TSaxMJlmTyhAZuOL2iPw+Un7PxIwP3D3MpzU8HufDzi4umreQZ9e2BSb6jTEjuW7yOFZ3JVidzhTsfaRdl0kVZSxMpDjg3Y94L4doFUI7hlIc1keY0ewTCBmsKSwV66scpeBEHIedqiuZUFHB0q4u5qxLflLj282rDLAsmSKSTLF9VSX3TZ3II62rGRmLccSweipiMVYmEjzSupqo43DksHpWJVOsTmXy8kH1gbswM0eMleb5QZiZJnpWypgpMJYnk0yvquCPm03muA/n8eTqtZ8cM62yguvHj+bA+lqWdnaxLlPY8XJRx2FuZ4IJ5WX8c9pUblzSws9bWlmZShVFeRmqgaNOHwpdg8pF4XFxWZ5MUx9J0pVxQ5tt3kt1xadTE41w4agRpFyXJYkkiUSSykiE05uG4wKLkylJb8CzPEt8VfMxftPdpKLMmec5nV3URqM8sfkUnl3TxiXzFzG7K8Fjm02mubKCj9d1kaI4xsrFpDk+PBbjholjOb1pOA+uXA0uA2mpqmDlwV9VKkqXmOPQmTG9h/a2pOsyP5G0rIVBufxCTCjLTpjZQ9/oq+XSkckwryvBHrXVPLnFFNamMzTGoszp6OxhVQ4SVRj/51P0Msg65jisSadZnU4zPBbjynGjiuPda/EfknjzObUMcLrjMDNxrtvIn+8scUH8Mscxe2GWPbtdLLFPLK6FiSSVkWzPZHTDhfjMwPh396CPs0I4QGcm061y8JhYCBfCRljY9iP3VLZDgb/Qv7UAc7ElJgykdgg8n7hYSI39PP8szKpAufgFplNmfNBH15Vx6UhnNuTsjXFMWMz79G+x3aJgqApWrvDdKwhe+3BTzHzof8H4uA7I85pRzOyok8nOLnkRJgzBK7ST5MM/GrMoQb3vXWyCiSs7FjNFcn0/7v0Kus9fP0auHzRHez2mp/R3wN8wqwIHLfU1TPZtgfH91WKczmPoOdWvg5ma+JeYbv4rBqAybpTn9XtMCMEZdHd0Xyj7e/tgvXbNMZgVaw7qR14mY0JibiAbj+dnd0yA8Wyxrvoq8pVyH09hBnYfmuPY/THrENrrGmyNmev+QF8rKo4Jx6jFTDcNpnNqfKm1soaqYIX1AG6LmSzNP5r/BsyiAttj5tY+UwrNBXnWYOdgur1XYAa2nolx0HrR6Mdj5gGfKYJk29kZ+RBeFwH5GlYgYh84Svwr3lzkt0qaCzFzQ13uO/5ojOP4cMxiG89LIf433QcQ/1ialt7iA+/K/SwEFtF9BaAtMSEfX8XExx0o+XlVmpP9YU/MnOYni8BcgJk7/j1M7NM7mLn0F+bw23wHs+zXEnmvl0il9myeeTlU3t1FIvRP0n2K5N0x86DfbX1ff8E45f8NfDpH2kdjZm84X+63TgQ/aG75azB+2BlkV5feGeNPO8F6f/tgFmNZipmTHUy8Yru8+5+RXURXBauAnCwvxftpwyySMAuz0IM38rNOTOSTxSr4HCamxltz7twACyKMTvmYvEUETheL61zMwhmeMHrLX3mLB9icLk0JT8DyGei1VJog3rV+hBnGcxxmkPB9Pl/GTMnvnphFMK6Qv2/FLNhxuhz7pJWntcAp8pxOkLS9NQkPETF+R6xTb7Xh2eJTO6cf73FrqQC+KX/Xi+VyFGYc5YFi6e1K9xWcPXYQIdsTs1DoyZKvHTGLeCzOIy+fEYvmDLHUviuWdEzK1G/l3XpDppDnvo1UXLsCL9Bz4VQwi43MlLK4GWZ654OkzF5B93ngL5afGbJ/pWz/GdnOpIhVuXxWyiCY9Q53Fiv+UwQvQKyCVQCelw/qFPnwTpUX7K2f53Ul/VyaglfTfUzeTZbFsHke171LPohmwtcKnNVLGs/2855fwCzv5Tl4n5OfmfKhvW01ae7HrKrzINlFJLbETIhXbn0YYKZueVL+XoeZaO4vcu7D8sFsLpaV/ewQQbjf+uDz5ToRhbnyf0oE8AOx4OZIvl8KsYb+I9bOfiKk94mlg0/A+8IPMavpeO/veyJOKyUP/xAx+o3sf4bsmpj3ifAg4mtzjtznYhFW7/11WWK0vU+Ed5HnX4Vx6t+MWePwYLlnT7yXyHZvqbc/iYh9IFbv4lL7sIdqL+Gb8nL8/EE+nF3khbVIYbkzR1rtfbzm9dIk2IQccTlFwAzLt/Uq2dVuUpjVWTx/Sz6zUNRhHPI/FssniBVBG8ucCPWxKOnggP1XRHi2Ibvo6L4iBq+L1RI0Nct20py6h+6jGSZLM2mWCHZfKZP3WitN4zfEAm618umtDn2J/H7cl4Z3bLO1bZLVfLuc7r26E8h2CsQs/+ApYplfLPfeJL4orxPgAGlR+N0FiBVY0gxVwarIse8W6+M5r5d0lpN7NoRNxMS+Vj6eyUUuVkgt7DVXniMbAuGI5dlp1fB95RV676QInIZzTTrNC2vbOKlpOKtSXf4u/muk6bbM+hg9h/QRIdepF/GcZzVrPTzH/D15PrOEVIK7i//q9JDjtpRmakYsIJsGn3AhvrVyqTh+4Tt+L4wTPilWET4XwufEaj5YrpUISN/zbU2XY18r9Q97YwxruKaXmmYLy0Hp9CLqk0Ws9hXz/LAiv/cass5zz9fVIj/LpLCvk5/1HdBWLv6TIy0rJZAfLGnh464EtdEey+4lRegy8myfkubVETmuexPZWTz9YnKupPVQP+7Ha9qeJmISxNHy+6EAS9NbqPRpyz93cg4B9SqAt6QJZzNSzm8U3+WDOfLtWVePkp9PVAWriBkhfqwXxCewh/V8cj2jJ8U/cq3lEzuqyN93xhLbwWBP+WD/Kf6a8b1Z83HHISYzDoRwlnxwd1ofeRAHYfyVj9NzNMMtlj9pST/u6x7L0glzVp/sEyWPRikniOh6PraIWPu/9x0/huxyZfeH3OcoTLjIT3vJt9dU/PNQ+FA3dsGqkBp5GSZ26RrxcZxh+a9y+bA8k+BSq5Z8kICR+0VCp+UnOX6A054uTY4nMI7x0zFOaG81mJVhJ142ZiSjy+K0Bc9+eaoI1c307Gk8EePs95pbXgjAr3zH/USsYOj/6jRdZENDjqXnytmHYjpwVmN8pTYzxP/1qDTDIRsr90KAgJ4k1vCygHsB0yPriehbOfJ8oFRMb8p1ECHcQwWruEj28bg7xCfhdSP/2WrOgIkzWtvHtE7HBF/GMQ7/LXo5PsqGnzEiQbYX8oReCm4+QdiTMI7s7UWsv0m2V9KzrOYGnVgXjbJtdRWtqVTQEJWvkJ3/66KA02vl4/2CWHK7iMVid7jci3Fgz5X36b3jvWV7PsyU+ywPeD5HW8fY4lwlFVoX2bi+KNmeu7/40qnHhJV4Pi6/T3S05Xq4pZf8Huhrcp6ACehtVcEqDmvJi5lq6MPxlWQd0LMCfAReU7E6jzwcjuk2HybNxeaAYzwzoongQMKBGja0Zch2u/Z/SCwjP7uTjUXzN202Czk+gukmfzvgHAgJHE24GVan0kR76uN3MbFkazBhE5+Vd2bjWQ0pES0wkdztIiiPicXzA7E0fmKl/YM+fLhjLMvMY7WI31KfiHjX9zvPH5Dm22FkF3dNWxXhPN/xl4v4PoCJrfKzl5TJh8m96EYM07ECJpbtPEnzhIB3pIK1AakRgbqMbIDdMfIzLId4rZOmC5jeo7Hyko+zfFLNZIdHbCM16zbygwjOBKtp2I6J10H8C89LzWuL3nNke72+b/l4Jkuz51zrAz8N46xtkm3DrVpzAsahbfuG2sk6aC+0ROso68N7XCxL74N8Wfwgh8i1LpF8z7bSnWdZBl5PWzWmiz1iXXOMvAdP9G+0rIFj5V1MkZ9cfBMTt/SeWEXfEktkqTyzqZLWldLcuUuah15FdIr4m94Ra+VIyyJ7Viy2Y+nZ/e/nIkwIxbete9jbekdYzWuvR2+pVS7/IZXYIQE+teesiuuT1rE8/8fJhp/4OTsP68qreP8n4r8/2Xi5kmQozDh6vpjaCamNvbFbcallHyU7fMHPwXSPl1mMcRbfKh/GPlbT8Btirl8gNXOHfLTDMDFY90jBvVwKbUysiwZMt/8ZVo1+oYiTxwqpcX8shf6nlt/nNRGcKRinviP3WSbpP0v38IwjfVZUq/hITqN7gOWl8iH6Q0A65IP+nW/7XZiIbc+iWYtxIH9R8ny35fvrFGvidrn2L+V9pMUCPUsEhYqIwwvTNmVqeZm3gkuD5PlP8rGD6TH7Nsahb/O0PJs2sSK83sMFcr/PiKC+blUyD8l99KWpfx5mdgOvguuU8vaA77gnyI5LXCj/7yz3fg4mwNXPJvI+hmM6AiaJ9XQT4bPYjpGy+K8++KGusHx6L4vYLhjIb3jirHdUsPpBvVg+LXSPU4lLDbOOHA5fTJDhUeJreJpsVHeT1NQTpQA+LuLkYiKe7SZPWrbVi1Ct8OWjUfJgBzluL4I5CtMF/rA0NT4rH4q3zl6LZdFUiU/DtbZVB9z7Dpg4nUbMNCK/DnkGozGBtNPk/FfkI18X4tM6Wj7EuAjln3zW+jGyvxUTOuJZabuK5dou4vWJ9RYgWI5YEX+jZ3f+RBGt7aU5aPeujZfn9rJUUnZYxrEiWPeT/4Klx4lvbK5cz7+ixPZSqayUd1Zj+dHe6iXtWhHA7SRfd5Md2hXWmrhYyugrvaQ9FdNr+YxUwgOOCpay0REgWKXGT6TZeatYzhsNhRAsjcNSlPXQW7Jxd7/Tx6GCpSjFzMGYzo83yA50VlSwFKUoOc2yrjL6OFSwFKVY2YJsL+ZMfRwqWIpSrFRjAk/BhDHM00eigqUoxUY5Jn7tJUzYSAIzF9gTmIDhOn1Eg4su86UofSeBCRp9HBN3l8RE/4+X3136iFSwFKVYcAmOWtcmoTYJFUVRVLAURVHBUhRFUcFSFEVRwVIURQVLURRFBUtRFBUsRVEUFSxFURQVLEVRVLAURVFUsBRFUVSwFEVRwVIURVHBUhRFUcFSFEUFS1EURQVLURRFBUtRFBUsRVEUFSxFURQVLEVRVLAURVFUsBRFUVSwlGIm7jjURiNkcPVhKCpYSnGzNp1hSTJFQ1mctKuipahgKUXOUR/M5c22dTRXVqhoKSpYSnGzPJVij/99wGtt7TSXl6toKSpYSvE3Dfd9dzYvtrfTXFVJ3HFUuBQVLKV4WZ1Oc/yH83mwZSWN8RjNVZWMK4tTGXFIq3YpgOMWqBZzHEefvhLKZ+pqiDpwQF0N540aQQRYmkgS7Ue5cYGY41AVibAukyHpumjpW38mznpHBUtR/GxeUc6z06YyprycBZ2d9LXIOg6kXZeR8ThRHN7t7KS5vIy6WAwvkQwuixJJUq42N1SwVLCUAWKLinK+M24UhzTUUROJsCSZojOT6WFxuYADjInHSbgZKiIO/13XyVULlzGzdTUzGoexT101rak0nRmXhliEU5uG05VxaUtniGixVMFSwVIGih2qKrloVBMnNA2jLBolnU7TmkqzNp0m4jhEgVHxOK+2d3DlwqXM7uqiPWNivcI4f2Qjt06ZyPKuBG2ZjFpaKlgqWMrAsndtDThwcF0t541qIu5AMuNSV1nOzR8v4aJ5C/NK77xRTdzWPEFFSwVLBUsZXKZXVvDE5lNYm85w7eKl3L9iVb9CIs4eMZw7mieyLJmkQ0VLBUsFSxkshsWiALSm0uuVztkjGrmjeTwtyRTtKlpFJ1gxfezKUGB9hcrjzpYVxBy4rXkCTiKpzcMiQwVLUXz8dNkKHAdubZ4I6tNSwVKUYue2pStIZODO5vG42jxUwVKUYueulhW4uNzVPAEnmVJLSwVLUYqbu1tWEnMcfjZlAk5XkrUaXKqCpSjFzO3LVhDF4dYpE3DVp6WCpSjFzm3LlpN0M9zRPAGSKToyGX0oBUArCkXpI3e2rOTsOQuoiUSYWF5GeUTn7FLBUpQi5q6WlWz39vvcvKSFaidCc2UFVZEIKRWuDYJGuitKP5lSXs6FIxs5Y1QjtbEYK7sSRHop1xGgI5Oh03VL3lrQoTmKUpLCVcZlY0dyUH0tK3uJuE+4LpPKynCg5HscVbAUpUSJOw6VjkNvrvi2TIbDG+qYuelk2tMZVqZS/ZpFVQVLBUtRNhhHD6tn5qaTwHFYnkixNp0uOeEqhGCp011RCsDvW1ez2ZvvcfPiFiqjUZorK6iLRon1wUrbmFELS1EKzCbl5Vw6diT71FXTFItTG4uaOecdhxWJJGuK1PrSJqGibKTEHIeU6zKjcRjTK8tZk86wJp3hrBHD2aqygnmJBLEi+2ZUsBRF6caEsjL+MW0Kk8rKmNtVXKKlPixlqLAz8Hl9DOvPgkSC/d6dzbxEkinl5Rt9ZL0KljIYbA0cpI9hYJjTleCAdz9iXiJBc3UlZY5DufVT4TjEHIeNQcpUsJTBYB2wRh/DwPFRV4J93v2Iu5csB0wAapf8tGUyVEUiVEUiQ94C09kalMFCB9cNMHO7Epw392O+F491e7hLkymOGVbPA5tMosxxSjoYVQVLUYYQSddlQSLZY/tvV67C+RB+s+lkXGBVKj0kJxrUJqGiDBEeWLmKz38wl7pYlPpYhMwQtHFVsBRlCPG7las47oO51EWjNMQiQy5qXgVLUYYYv29dzYkfzacmGmVyWRkTy8qoHSJzdqkPS1GGIA+tXMXrHR1cMnoko+MxNq+sYPPqSkiXts2lgqUoQ5QPOhOcM/djALasrGDn6krWDqBgPayCpSjKYPDOuk7eWddZ8vehPixFUVSwFEVRVLAURVHBUpQBxNGypahgKaVCGujSx6AMNNpLqAwGHwKL9DEoKlhKsXME8BlgW+DfwKX6SBRtEirFSB2wHLgYM+PotsAm+liUgULndC/x9yeVTrpI8jMCM9too+RpPPA+8KQ+q6FHIbRDLazS5lPAUUWUnw5gNRAFdgDOAS4rkrx9psielaIW1kbHaLFq/luk+TsS+CqwN4WfgXSKWFfztNiohaUUjglFnLcKiqdjZ6FYfZVaZEoXFazSZgnQDOxUpPn7GHiV4pjfvQvYHhipxaZ00bCG0n53ewJHA1UiDIVmU4zDvVYsmSnAHMlfRwHzVQXsB8wAVgI3afFRC0vZsJQD5wM1mGW1igGvJy4CxDH+ot2AWQVuutYAXwLagFVadEoY13UL8qOsN2XAAcC5YtEUM1eJhfW5Aj6rw4AzgWotOqWrHSpYpUsVMBy4G/hrCeT3c9Ic+3qBntVI4B7gj1p0SlewNKyh9KkF/g5cBDy/ga4ZxYRTRKHbwiz+wuRKMzENtGCWrz8U+EaBmrGTgMcwUfjvaNFZf8Ha0KjTvfRpF9/Mhiw9aRHK8UBKfhqAsZKPdozzfRKQlONHAp3AdOBC4IYCPKtV0jQdpYJVmqhglT6OiMSGru4+kB87HzERr+GYXsLlYoW5sm8NpofumAIJVkzyk9RiU5poL+EQsMwpjgnzXBECV6yoT4tF1S5WzRo57k6xtrYokLhrmVcLSymwhbVWxKFYmJWjbL0rv7ex/t6QoprRIlPChV2d7kOCbTH+GW/g8WCIIpJ+X5pTZcCBwFNAImD/vSIcp8n/1RifWFp+aoBh0ry08+D5w/yFJ0mww9/La1QsvVWYkQFLKGwg69Aw7dXprvSDg4DvycdYFmBBREQ0WjG+pZj1cUfIBlI25LA+4hif1PnAy9b2KGbCvueBZbKtHPgh8FlM7JPn3B6OmTFhJvA6cJavHFaSdeBXS36Skse1IjBbSDopsr67VmCyNDM9gcrIsxgnaXdghi89Q/HMHqGohTWkaRDL42Pf9puAxcBPMLM3+EnI9q0x8VpxEQEXM75uNxGt10QMwkQrItfxhyNsiYmvWmJtOwsz8PkXYtl47CDXmQ78SsRufh/ufazc+/sB+z4lYjlPRM/rgIhg4q8imJCKk4FrgWlk/WnIs1lVZE1qtbByXVQDR0uCLTExTDaTMMGQFX04/xbgxJDm5J3SBOsPlwAnWP+PFHH4hqTtUQlcB+wq/38EnN7Ha2yKiZ/aLGDfscDP+5jObEy8ms0xYokpJaAd2mNSOnwoAjXG2ra9bO+LdfA2wUNj3sAMUj48x7lbEzzLwTjZ7llRBwOnAP8Cbge+BVwt+2rkJy7/v2YJ0BbSrAvjA7GU9gzY9zfgEPo2Y8VMYH/ftloVLFVJtbAGh0t9H9yF0qTrC1thJtILYndgYo5zjxZ/VK4m20nAvvL/pzEzIwBcjuk1/IzvnFPFl4Vc++xe8r+bCLafchGshj48g52ApZiAV4+TMJMMKmphKQNdRoBdrKbXOuA/OY4fZzX13gb+IX83yo/Hv8SXNB6oD0hnpfifwq6xBfC4WDu7SNozgPswA58vE5/V963z/is+pka59taY4T42wy1xeYHsbKFlmN4+xA/3F/FDNYp4hvEqZrobWxw/CmlqKqqSamH1k5HArRin90zZtl0vVg/ABSFW1ZEhzcOLxDqyqQeew8zYWRdwTo1YOWBWyLFXybkX+Kf8fQSmt84Ou3gBOAM4TsT4hAD/0hdDfFrfDPFnndbLM/kOZuyld78vyXMdpcVMLSxlYMhgYqB+BFxvWR+v96EZeFbA9smYUAi/NbVtwPEpOfYAgmOX2siu8vyh/GA1B6diHO6tAedejFm78E1pMj7m21+HmT5njG97FNOBcKRve5WIdK65t34uzctPi8X2rFxjjRaz4kcFqzRYLpbVTpYVsojeJ6O7FeNQb/JtvwkTs+R3QN8mzSN7fq20COauIc3FXHSIUMVD9r+MidMqAzYXcbO5RwRxZ9/2d0Xo9vBt/5U8lyNz5GkB8AURqCelWX1eP+5NUcFScvAa8JBYTd5H29YHwVhHcGzVCnpGjLcHHN8pH/c1mF7JfKgkGwCai3cxIQ6nBuxrITjAeUWO+yrr5XozMT69dZhwjwa0p7Ak0Ej30qKF/OaRyoh1Ewt592UBx5cFHP8/TGBovtG+a4DfSp7LcxyXpPvMD37RC7puBcEzVERyWHRBrJTnGtfipYKlDPz7yscqXgc8Qfdoc4+nMT1kNm1yfGfAdaPkP4XNGkxgKRin/bU50oiF7Ps7wWsJhq3G8wJ9i563iWrRUsFSBod8rJxl0pQLImg+qkUiKkFWSzXhEfXlmNCGCZjOgCrMkKAmOfc/mGFBuSbNqw5pyt0ccvxvQrbf3o/nGaE4liJTVLCUAaADuDFEcBqBveTvdzC9meWY3sUoxpm+L8Y/dZU0L4O4l959coOFilWp1NY6+LmkqMcERr4vVoHTS9PGm089GfKRru/Lr8NEyb8pTb5cfAEzVOduTLR5meSvXJqsj9A9bMLzRbm+bY7v/pJkZ2/wyHfOq62kGblWi1geKl8A7VDBKk02xcw60GV9oI40yapFpJDfXjS5LVBpTAR8jfVxZ8TiHiHCMF4E5vEc+Rgm57T0Md8nY9YHXCFCM5zs/FSHkZ2iBmlO7iJ5dUWUGjGzK3j3503HXCd/e/fnNUu9c2OSnrdoRkaat5thovPP0CKlgqWCNXDEMUNX/odxiEcIdhT7HfLeZHgjAgSrUSy2tE+wRks6NZgI9/4s1rCJpDc7j3O+L5bjfZb1FAuwGO2Ck5R7a/AJ1ghLuL2e0lGWYHlC3ozpnXyY4lmMVgWrt4vq0JyipxbjJB+xga97ilhY+fRMfh74LmZIziNi7fSF9zGBqxua8SLKU7WYFb92aOBoiZQNTK+brfQ1YskERWgPl33VIR/oRHrGHZXJOSMsK2aYWCG2NTdCjqsKSDuGCTe4EjgeM+voGSH521TuwWMN3X1tEzBDiMoCrMjJmEBPv5VZJXkLEskRIkpVAdbrZDQOqyRQwSod/I7kBGZM3D8xw29s1mHG2j1Bz4DNGGbIzg9921OSzp/IDqpOy3UyvmbYV+g57s9Lw2sGLsZEsNeE3MtJmFiwSI6y+VOyYyftcxsw0epfDmgCb4+ZlWKrgLydA/xZi5IKlrLhScjH10DP2ULXYcbJjQsQrLkYX1hzgBA8JYI0Msd1V2FmOJjYhzyWEbwIxSoRlTGEB23OE/9S0HQxszAOev++Lrnv6gChbMU42CejgaIqWErB3l8XwWELEYyDPpWjiRlE0Ao0QWK5vouRJuQnVxlMhuTf25cOsfI6Q9J1CB9bqahgKRugmVhBcIR4BjMOLyg4OEr42L5yeo+mL6f3AcZg/EVVOdIo70U8ygj3LZWHWEreCjyZEKGuVAurdNFI99LGxfRwBQU8dsm+IEtoSQ7B+oDguatsWujbIqjPEh7ZvirHPo+Pycaa+ZlN95V6bMvrnZDzOmRfSotOqZZ4DWsoBWowk+g1hVjJTp4WtNPLOd6+CzFR7EER9OtrnfvTeBUzT1dfr+P08779+5rJrnmoFLl2qIU1NJqF+e5z+5meff761jp9SSPXMW4/71trS20SKson1GFCKiZgAkEX6SNRBgp1upc2W9F90Qe7Ito5pAnZJPuCHM9b0jOmK6jM7ETwwqsRTLBoBjgQM63MmIDjopgVmxt7Eb4dQyrVCZjVo4PYjuA1Dmvkviu12KhgKYXhFOAZeq7J52ICQ+8P+difwvin/MwAng8ROo8ysZx+H7CvAhMMeqcIUgKzSo2fcsyCGg/luE4NJjj1qoB922Lmgw9a+edMyYM/yr8W+AM9A1EVFSxlA/EdjCN5F9/2NGamhS3ouTTX65iVY/YNSW8OuR3QnZgOgKBhPx2YmRg8WkIsmg5JYxPCwxYWYZzw4wP2/VmEeq+AfVdKmnaku4OJvP8/ekbAKypYygaiAxMeENS8S2OCJNMhohPUtZ8UweltXN1KzNi/yHrmvbOXNJYTHtawjmAHeofkLeqzOMGEf3RqsVHBUgqDQ+651sN6xXKdE6P3nrQo/Zvj3Z/3iO//oOZnrtAFN8czIcczUVSwlEEWpqCP16HnrJz2hxkPeccRwnuIbSHyjgua2XR950GPyU/GStPpRdT854fdWzxH3jTKXQVLGWRcacr4P8KMNJnCrJAugmOSwqZNxtdU9I5zA85P0/sQnlxxT0m6jyUMCn/IkP9YwkyOZiRolHuJfwka6V4qFcvoEKvIv1KzR5XsC6qURgOTQq7VTHamgyZJwy9M1fQe/gBmzquwZeOrMQtUeGlvi5lV1aaRYKc7kv/RIc9qM4LHMNbRM+RBI91LSDt0imRlY6cZswr0DvRtfKRiCdaGRiPdS5PRYi0kMXNCNVhNHW9u9gkYv1fGasbVyHkZX7Otge4zHGTkQ74ZE7NVgQkArcbMseWtxhOV61RY1x9GdhaGFGZG1Hr5Oy1p1JNdDKJOtp+K6aEcJ3kZ7TtvpFh8Keu8aiudGrJz1Ges63jN1yrJm9eUHQbcg1mq/mpMj6RS5KhglQZlwAXAr+TDWo4JLQCzZFaQAzzua8ql5CNt9Pl+XBED/2o7ozGxS4hP6GO5zpyQ67jy2ws6TYhwjZJrenNbNcgx3mIQtSJQru9+FvnuK0q2BzND90U00pJuo+9/T+BSInCjLAEcb+Xhai1i2g5VH9bAUQ08kMOfM1iciIkOz7dzZjPyX9ThQeCbBXi24zBR881azIpfO7SXsDQI6pWrAD4NHE5PB3MtsB9mPJ//HU8GTsDMfW7jiB/neLLO7FGY8YVR33G5HJDHARdjpkB+iuAOgaA0thLx8BgraW0fcP4mcg+bBliinwaODbhuozyr/QLO2Zrw+cGUIkIFq3TplI/sl5hFVW3WYnrx7gn4cFdgxiB+x19hSrPteuAgqxlph0ZshRkD+DzZhSps6jDzvZ8n4rcnZs0/v0VzlQjamb77sZuqS4GzQqyu1cC3gdN92xMi3r+g56DwFSJM96grRAVLKQxviT8rGbJvdcC+tcCLBMcw/RfTUxY2NCcjgvYo8Bt6LgKxBrPkO5hFIv4PMwi6wWfR3Ipx6P+YnqEMtlX5n5B7a5G8Bll6L2AWsKgI2Pe63H9ai44KllJ8hDXfbCc3AU2ksH3/w0xLfD2wEDi0l+t/KAJh52EOxpn/sIjOMTnOj+dofsZzlOlYL89EUcFSCkBvi1BUEDwUZX0XofAsoN6GuZRZzc0gUr1YO/1ZhCIq962LUAxBtC1f2nQAXyW7eCk+S+Zrcoyfh+g57YzHVcBHfRSs3ppWvQlfhtxTMt9P+Ko7P5YmaNAz+Ro9wy+8ZvLX0OE5KlhKQeikp1PbYxnBk+wBvJIjzceL6P5ezrHvmRxWW9h9fyw/ijYJFUVRVLCU8OZWLKTZFSHcT5NrWbAoxeOUjuYon2H5dHLsy/VMFBUsZZApwwRB3kLPWQsqMFHqN9DTaT0G+C5wTkCa22OmJd6lCO5vJMafdmbAvqmSzyMC9u0J3A5M9G2vAs4ArtGio4KlbHi6gFnAkfQcstOBccQfT0+n9UJMMGlQ4OdrIlbTi+D+FmPGPh4YsO99zNQ0e/i2uxjH+mcDRLwNMz7xRNR3q4KlFARvErugsIFUjn3JkO0Zwif2C2p+OX08rr9pJAgPiUjkEPJkSLq5nolSAmhNU9q4wHtiPQR9uO8RHikeFi4wB7OwhVc+vFiudECTtLfxdw4m7imsnMXJRqQHHbeY8NCJ+Zie0CBRep/gWUc75JlopHvJlnidraEUqMTEJE3YwNfdGfhSiLVyLma8YC42AS4ieJgMmDmw9pS/z6LnwOQNgc44WkLaoRZWabBOfDJPAQvI9vRlgHbLOnEtyyYl51XTfV4pBxO/lREryw2wQuKYmRAuxDiwbwAOwAwgbgT+KUL0ecwah630DAAdg1kj8CcYB/leZOfwGoYZlnMqxmf2BMaBPkbS9gJKOyR//nw6si8iYmjfW9gziUgzspPsFNBJzJxZcXT5L20SKgPKj4G9CV6MYjCYE3OcpVEg4bpvuaasrMU47N+OOw4ZWJh23WelSerP0zAHlsQdh6TrvumaZpjXdK0B5sUdBxdaU677QpnjZNKu25k2M0FkNlCzzWvq3oKZHUIpcgo2p/vxjcP06RcxK1JpTmpsYO+6aq5b1MLCZJLqSAQXWJfJ8H9jRjCro5M/ta5hWKxneFNHJsP4sjinNg3jFy2tLE4mqYxk+3haU2m+OqaJhYkk9y5fxfUTRvPc2naeWdNGQ1TDpUqBB1e0bjyCxS7b6RvPD38TZ9DpzGTocl1qo9Ee3clt6TRxx6E8Et7RnAHa02mqA84HaM9kzEjlaJS2VIqySISywi1O0o72HubHS7M2nibh/K6EvvD8uAcTO7XBmy6rU+vXOmvt7fykNxa5IJ13FRh/2F4Er42ohDCxANdUH1bpMA7jfNa5xweevkyVoxQBGjhaOmT0ESgqWIqiKCpYiqIoKliKoqhgKYqiqGApiqKoYCmKooKlKIqigqUoiqKCpSiKCpaiKIoKlqIoigqWoigqWIqiKCpYiqIoKliKoqhgKYqiqGApiqKoYCmKooKlKIqigqUoiqKCpSiKCpaiKIoKlqIoigqWoigqWIqiKCpYiqIoKliKoqhgKYqiqGApiqKCpSiKooKlKIqigqUoigqWoiiKCpaiKIoKlqIoKliKoigqWIqiKCpYiqKoYCmKoqhgKYqiqGApiqKCpSiKooKlKIqigqUoigqWoiiKCpaiKIoKlqIoKliKoigqWIqiKCpYiqKoYCmKoqhgKYqiqGApiqKCpSiKooKlKIqigqUoigqWoiiKCpaiKCpYiqIoKliKoigqWIqiqGApiqKoYCmKoqhgKYqigqUoiqKCpSiKooKlKIoKlqIoigqWoiiKCpaiKCpYiqIoKliKoigqWIqiqGApiqKoYCmKoqhgKYqigqUoiqKCpSiKooKlKIoKlqIoigqWoiiKCpaiKCpYiqIoKliKvitFAYjpIygZ3gemAsv0UQwo5cA6IKmPovhxXNfVp6AoSknw/wMA93duQP8MRygAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.fsp.uni-lj.si</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.fsp.uni-lj.si</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>Fakulteta za sport, ponudnik storitve moodle</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=Fakulteta za sport\, ponudnik storitve moodle,L=Ljubljana,C=SI</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFfzCCA2egAwIBAgIFLuUK5icwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTE1MDMGA1UEAwwsRmFrdWx0ZXRhIHphIHNwb3J0LCBwb251ZG5payBzdG9yaXR2ZSBtb29kbGUwHhcNMTQxMTE5MDk1MzQ2WhcNMTYxMTA4MDk1MzQ2WjBYMQswCQYDVQQGEwJTSTESMBAGA1UEBwwJTGp1YmxqYW5hMTUwMwYDVQQDDCxGYWt1bHRldGEgemEgc3BvcnQsIHBvbnVkbmlrIHN0b3JpdHZlIG1vb2RsZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALK3QSuPOg4kuzt6vH1kcUEDI1Szreg9eMDIDlJ3JD4XJjJZFdgMl4HTp96zQh/AQrLF9Z2DCIqe1/eeG9aufBU7TKS1g2y7kUj53NF9d5xjgts/xlkRXb962CD3UugwcPsJScR3CiWlnFpRWw7vSBYBo/yaN6/TR7LG1195J360HuAx02E6HcqlteHc7n4QujHraB/arafCwIRDt9H3kmhiiRaW2QnlQxi7NVIOspGDtQhjMZs/+Hfb/RGiVEnFSVKl43lELHDa+hXMwnkWZfpWfnAaRku96FXLkxo4ycRKrdr5v5lSRbFQ47B3yhemt7R3deqmTHimTaUjsM6rztbXir12hDlk2OBqFXnrgl5kx/aRpgVLODOkmSOrpT8I7SkVHKXmDGUIY62RVRcYenlGixeH8JM2wuTba77mluaesea+OgDW0CDINXy4qVxxGg5rPXZvQNC9eRQzWPk9YAksk/tndSQPHM53AREm95ov5vQUP0mu+Z/J37pzCTwPrj4/luZka9Nkhqy9hDljnXyWqjagXJqhcJMm5PjinfCveoiwri1YPD1CJlRnLQiuaMoJVv6PRfwkqDMQp6pYbwohyRkiTJt9X/TYilmrjLenacBD90ByCdKd/1LUUcy1wlxKmzISPwCJZpQdCC1d0FwxI+jX0yYd/++vW3wa01fVAgMBAAGjUDBOMB0GA1UdDgQWBBTCOuEP6Bdx8zqqRkiGioMWbutLsDAfBgNVHSMEGDAWgBTCOuEP6Bdx8zqqRkiGioMWbutLsDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQARjG6usg8fOKQQCjEoV29JapGhXNnFT2UmbTUvZyyyjGUVonJ0kSd++gBm7JgO6C5xRrVkgWstRBopdNqeeu8INwzWQHuMIhD7+skvRGiCC6VDP+BEquS5zYOPcg9MZwDk4Nbt5jTaMOV/6wNUaArT32kHuc1X1tgVYFXvL4x0/qCtjaKEIi7PeWuwcTmr4ODvLhKPUi/5sKTrQioJWErETN3RGR5xCMdvu3ij6YnnY4o11xDlbsG+zTjzZotrbMEtMDpsZvFtLP7kocmbyJBVzIU+IwWmFxeKjJO80OCDY3lbvYiJ75uhl85HOyM8uauafnqTU4YQ2Eitf94+JsZI2d7faCLez4vaT/cBsdbtPpEeBcMkMh3eMdNIJ9HsFejeGesfllgivvbVzy+B0WFEPEQag1QnTmeu0CKVqlF9ShTziTO7ulowIbbbH9ZWw6IVl0APTMLjDBfTlMNfHea8xyC/kU5HiIPgZyg1G0yv5k2goaMzPCNs78/SIoKd6E91rsKVHnGEDF1xi1N8YqwzD5rG9SsPunioqOz0ISw83bV60yZtxv7tMO0htxZLMuZ+M/Im2CPbDhLB03r2a9CX6eILGGXjFvIEFKv2MbiXYr1Jopl/6ZvS2YuzzT8/8UfOYaqBG5uuSS7X1ZCa1rAMrEf6QbyDSoIMTwgeDel6Lg==</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://moodle.fsp.uni-lj.si/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">UL - Faculty of Sports</md:ServiceName>
+      <md:ServiceName xml:lang="sl">Univerza v Ljubljani Fakulteta za šport</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">FSP Moodle</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sl">FSP Moodle</md:ServiceDescription>
+      <md:RequestedAttribute Name="sn"/>
+      <md:RequestedAttribute Name="givenName"/>
+      <md:RequestedAttribute Name="mail"/>
+      <md:RequestedAttribute Name="eduPersonPrincipalName"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Univerza v Ljubljani Fakulteta za šport</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">Univerza v Ljubljani Fakulteta za šport</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Univerza v Ljubljani Fakulteta za šport</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">Univerza v Ljubljani Fakulteta za šport</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fsp.uni-lj.si</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.fsp.uni-lj.si</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Milan</md:GivenName>
+    <md:SurName>Žvan</md:SurName>
+    <md:EmailAddress>mailto:dekanat@fsp.uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:rc@fsp.uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matej</md:GivenName>
+    <md:SurName>Lekše</md:SurName>
+    <md:EmailAddress>mailto:matej.lekse@fsp.uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Matej</md:GivenName>
+    <md:SurName>Lekše</md:SurName>
+    <md:EmailAddress>mailto:milan.zvan@fsp.uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Advant</md:GivenName>
+    <md:SurName>Advant</md:SurName>
+    <md:EmailAddress>mailto:metod.skufca@advant.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matej</md:GivenName>
+    <md:SurName>Lekše</md:SurName>
+    <md:EmailAddress>mailto:matej.lekse@fsp.uni-lj.si</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
new file mode 100644
index 00000000..a757a1aa
--- /dev/null
+++ b/swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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>
+    <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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDKTCCAhGgAwIBAgIJAOIR3F6LuGvGMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+						BAMTDG11c2Uuamh1LmVkdTAeFw0xMDEwMTgxNjE0MDlaFw0xNTEwMTcxNjE0MDla
+						MBcxFTATBgNVBAMTDG11c2Uuamh1LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAKXSvhMUByiNmgMXXR8H8ilO8erIEV/I3k/P71sm0M1lcQLzRusJ
+						u0NUg00MY8D1SQZ8MYNspyL09m1uROJCwG9o8dZK1Xv5ERGCyDlKgV5riXeZvG5z
+						w+3oK7FEmvTIfd+Y8PwD23AWs5rmSEjBkmSK8zEyA2uGjScIm3COxsQyPSxSR85m
+						zQMpPme2nqLVNhtZ5vKOfNcsTkuuYtfm6rBC0Ioou3upu39G4tSIoaIy24XxT+RS
+						O0uahKG9ACm3l9kORefakFd5dReNNEROBiG9j/ciKVgRfO9e9AH15GAgYwa/wwwW
+						vTbWsWCIbHJWh+ZrToA3M1deLBZumUxe00ECAwEAAaN4MHYwHQYDVR0OBBYEFCw/
+						zCg/0ZwGiY1V1jFOvRx4Ree/MEcGA1UdIwRAMD6AFCw/zCg/0ZwGiY1V1jFOvRx4
+						Ree/oRukGTAXMRUwEwYDVQQDEwxtdXNlLmpodS5lZHWCCQDiEdxei7hrxjAMBgNV
+						HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAzBTom6sXDhCiBDr5y+l+BezNf
+						qaUIgKnPav1eTgtxKGjeMlkSsu17dcbtit4twdnLZ9JGr6waAzNGDTNEKB4c+kNe
+						mFKzanCcUbBkM7mX/SolEAWk2MN5q3CPbsYroZKzfDMTuNGrnWrWOOVwAQ4vuraG
+						ispnohZ9z4ZZB9oNdJvVIz6bGdygJ//l0kO2dtmrvoaz0NCJVIpfWUyGm6cCT7ou
+						lGiItHq08I4MlLGBb745LccJFBtEcR/crSN1ZIO6PXho3CYj8rtb58O4tntsXVK1
+						9MpcCwdbUHRyxyZPqy0FehjRRzPeiNXzoFkFcf8b1TfjG3luyUDnnGVT+B/D
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDKTCCAhGgAwIBAgIJAOIR3F6LuGvGMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+						BAMTDG11c2Uuamh1LmVkdTAeFw0xMDEwMTgxNjE0MDlaFw0xNTEwMTcxNjE0MDla
+						MBcxFTATBgNVBAMTDG11c2Uuamh1LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAKXSvhMUByiNmgMXXR8H8ilO8erIEV/I3k/P71sm0M1lcQLzRusJ
+						u0NUg00MY8D1SQZ8MYNspyL09m1uROJCwG9o8dZK1Xv5ERGCyDlKgV5riXeZvG5z
+						w+3oK7FEmvTIfd+Y8PwD23AWs5rmSEjBkmSK8zEyA2uGjScIm3COxsQyPSxSR85m
+						zQMpPme2nqLVNhtZ5vKOfNcsTkuuYtfm6rBC0Ioou3upu39G4tSIoaIy24XxT+RS
+						O0uahKG9ACm3l9kORefakFd5dReNNEROBiG9j/ciKVgRfO9e9AH15GAgYwa/wwwW
+						vTbWsWCIbHJWh+ZrToA3M1deLBZumUxe00ECAwEAAaN4MHYwHQYDVR0OBBYEFCw/
+						zCg/0ZwGiY1V1jFOvRx4Ree/MEcGA1UdIwRAMD6AFCw/zCg/0ZwGiY1V1jFOvRx4
+						Ree/oRukGTAXMRUwEwYDVQQDEwxtdXNlLmpodS5lZHWCCQDiEdxei7hrxjAMBgNV
+						HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAzBTom6sXDhCiBDr5y+l+BezNf
+						qaUIgKnPav1eTgtxKGjeMlkSsu17dcbtit4twdnLZ9JGr6waAzNGDTNEKB4c+kNe
+						mFKzanCcUbBkM7mX/SolEAWk2MN5q3CPbsYroZKzfDMTuNGrnWrWOOVwAQ4vuraG
+						ispnohZ9z4ZZB9oNdJvVIz6bGdygJ//l0kO2dtmrvoaz0NCJVIpfWUyGm6cCT7ou
+						lGiItHq08I4MlLGBb745LccJFBtEcR/crSN1ZIO6PXho3CYj8rtb58O4tntsXVK1
+						9MpcCwdbUHRyxyZPqy0FehjRRzPeiNXzoFkFcf8b1TfjG3luyUDnnGVT+B/D
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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/my.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/my.sbs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..77e28c6f
--- /dev/null
+++ b/swamid-interfederations-2.0/my.sbs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,57 @@
+<?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://my.sbs.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-09T08:52: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://my.sbs.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>
+						MIIC9DCCAdygAwIBAgIJAJVRvogczC70MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+						BAMTD215LnNicy5veC5hYy51azAeFw0xMzA0MDUxODIxMzFaFw0yMzA0MDMxODIx
+						MzFaMBoxGDAWBgNVBAMTD215LnNicy5veC5hYy51azCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAOFMWOnq7etNEDgCmE/lKHlcRvPpQph0V4Zf2G9zNixO
+						ZeHhw5ZSSQVtMSj+3Yyfnl1RVFdlux0YHe/0uVk670Duqs+i3ulxTVWo4MXv5iq7
+						xbnBuiK4mez3+MDPE49LR5Txz+MiHUsbIVmcZcIksxPWgyZuD4d/d4MtpYqwpk99
+						WoD55Ng9GOae2bBZnS26qPAKp0aDG7pV6NvQ2dXuqpZMi/+8j+UiemP2aDyjIvF0
+						xu/8/1kIX2QsTn6+/A6qfJd+byEkUef1/Q8HHmTka3b10NbiGzJFXXyvWvyCyPVA
+						tDIMj/jOfziE0z9VFqpZkbrbJfpgshYpUEN2mf85tvsCAwEAAaM9MDswGgYDVR0R
+						BBMwEYIPbXkuc2JzLm94LmFjLnVrMB0GA1UdDgQWBBQ32HmqAoYtyy9Syo+ReOhH
+						Uh5bQzANBgkqhkiG9w0BAQUFAAOCAQEAhwjVQiw60XvGioiZEAtJn88u3X9lkkuQ
+						MTDQoZt1OIXu5gPJe/W5LmiWLjcTVrFLRwQQndTjki/HKkyU0U6HCIvRaqW4M/ac
+						KDIDFuCQugN5b7kHGdG5ak78bGzGvaZSuNcZqG+QtfA5rxhqtYcmyin9+S4xDaJk
+						nXlI0zEE1GXi6UVPNu6WQDYniwSK5EQ53ZrO/shYSX04+mbfkZCnIdOLpQZbQy/K
+						AYcgSvCKfLTGV/yTREOHBqv8AXsIk85z9io8dztQliPAu5qvUz+nNpjZuV4z5/HG
+						JAQyJQOynWStb4SGfCYSIs0ujtdolEQkpG3EPehVm2fslcYEveqUHQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School Intranet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Aaron</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</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
new file mode 100644
index 00000000..f96e84a6
--- /dev/null
+++ b/swamid-interfederations-2.0/myconcern.thinkiteducation.co.uk-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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>
+						MIIDDzCCAfegAwIBAgIJAKF0PyvuaE7mMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHRoaW5rLW15Yy0wMS5zZXJlbi5sb2NhbDAeFw0xNDEyMDkxMTQwMTJaFw0y
+						NDEyMDYxMTQwMTJaMCMxITAfBgNVBAMTGHRoaW5rLW15Yy0wMS5zZXJlbi5sb2Nh
+						bDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAP5SUqhHh8zasv2aaTdf
+						jkchvuKO0YzniwI3PNBg9NpL+cNiDyzQ/Qk9X625jQBj7rMD+IIR2XVg4SLChTjK
+						S/+bkNDmq1eki/4pHQH/91fkOIscLpJvhp7OyGOKzWqors7REAWnJw1EeTurrV0B
+						RXpX5wQLBnV8zKfEyBG12Q5nIP7LDg/+YRDV2EKYeLVcYWzgDzdi2xnRwuUigeiF
+						00uMF+AWeen+0kjr9YNUnDbaECJ42m+DCjRGNuZ/Ty4hcCMXTlm1PoHQZf8B/CTj
+						QQFx1VbMKUwtfLSF52TGH76iu21oIIuyS8AmHPyacEH1hjOkRgsO6odLo98AoBxO
+						egkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYdGhpbmstbXljLTAxLnNlcmVuLmxvY2Fs
+						MB0GA1UdDgQWBBQ6KbEs1aIG7ZMKVkd2A/hR3MlT/zANBgkqhkiG9w0BAQUFAAOC
+						AQEAO9Oe6XOW3B2zdbT8ayBlxGcHiOorP7GcE5nf6WI1h4FpWub11HIm+N3Wn+lI
+						KlhihanbVe4My9QTwk67di82CDzjWSqVQe33rUiDyt9vG26XhPDM6znyzaJHD9V+
+						CZ0ucm1cXKLna5recIfbZC1ezYWvQqQIaAQQ1rCuvGr8vB8W21dPnEMKORKJTOOd
+						zXvof96kNX/JUr7jBRfw+XTgNZKgJGR3U8GlOKO1f6g/A9eLAoqzeb0s+Rtllczv
+						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>
diff --git a/swamid-interfederations-2.0/mylogin.uni-freiburg.de-shibboleth.xml b/swamid-interfederations-2.0/mylogin.uni-freiburg.de-shibboleth.xml
new file mode 100644
index 00000000..0e9e5be9
--- /dev/null
+++ b/swamid-interfederations-2.0/mylogin.uni-freiburg.de-shibboleth.xml
@@ -0,0 +1,160 @@
+<?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>
+      <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
+BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMN
+UmVjaGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZI
+hvcNAQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTE0MTAzMDA4MjYzNVoX
+DTE5MDcwOTIzNTkwMFowgckxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1X
+dWVydHRlbWJlcmcxETAPBgNVBAcTCEZyZWlidXJnMR4wHAYDVQQKExVVbml2ZXJz
+aXRhZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVr
+MSAwHgYDVQQDExdteWxvZ2luLnVuaS1mcmVpYnVyZy5kZTEmMCQGCSqGSIb3DQEJ
+ARYXbXlsb2dpbkB1bmktZnJlaWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC/4V8eOGGiBsPa7LGWLaZV7yWmlNpUEO+PBvGLCTDy2HtomaOj
+yg+feJIOV6GKbj0Bq0gdQdxjsajzArpQfdyLbVn4xrzTovg/AB8/AuWxgG9c8G2v
+c/px4b/gn4C0PSlftJ1YL+K9cvKHcVE17F/jSBs/3KAmXG7NhSASFBqlug2bsbTE
+MWyIjYWrKGbvOkJdFh7xNOiiCQLLOfFnzBHcnT7Y2w7gIQ9+5WtFymxXBioY+u95
+QhjxRlLPauAOgs2tpLBAU3How+aveQozCrOfCwbvdk3bvjogYLaxX/Haf7pQl0vq
+WBTb29b1XR+/4O/BNFWcrBXtIQI68LAK4fWfAgMBAAGjggKdMIICmTBPBgNVHSAE
+SDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYB
+BAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
+4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFCeoJkCh
+YyKHWqzcL2F6FcLnK+7xMB8GA1UdIwQYMBaAFDNnqdbxk1U2rKEyvcHkljn/THAx
+MF0GA1UdEQRWMFSCHW15bG9naW4tcWEudWIudW5pLWZyZWlidXJnLmRlghpteWxv
+Z2luLnViLnVuaS1mcmVpYnVyZy5kZYIXbXlsb2dpbi51bmktZnJlaWJ1cmcuZGUw
+gY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkt
+ZnJlaWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2Nk
+cDIucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNy
+bDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBj
+YS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NhY2VydC9nX2NhY2Vy
+dC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZy
+ZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUA
+A4IBAQAqWNfHU8krriggd2mwdlKnKQE3N6IvFSC9uzXmYxRp4Q6z6livfsyRGOx8
+DJxxnc0fqnOr0gAXzROyKZ4g+7EFeoS98Fe5UErT5DgPn3KlHJtzv/8lky9jhhdk
+CYfwNJY59oC1n7fbwbUvMLF4U5y8GJm+U8vsM8cz7qwowWZZj3h8PQc3+uJ3x8Rt
+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
+BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMN
+UmVjaGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZI
+hvcNAQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTE0MTAzMDA4MjYzNVoX
+DTE5MDcwOTIzNTkwMFowgckxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1X
+dWVydHRlbWJlcmcxETAPBgNVBAcTCEZyZWlidXJnMR4wHAYDVQQKExVVbml2ZXJz
+aXRhZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVr
+MSAwHgYDVQQDExdteWxvZ2luLnVuaS1mcmVpYnVyZy5kZTEmMCQGCSqGSIb3DQEJ
+ARYXbXlsb2dpbkB1bmktZnJlaWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC/4V8eOGGiBsPa7LGWLaZV7yWmlNpUEO+PBvGLCTDy2HtomaOj
+yg+feJIOV6GKbj0Bq0gdQdxjsajzArpQfdyLbVn4xrzTovg/AB8/AuWxgG9c8G2v
+c/px4b/gn4C0PSlftJ1YL+K9cvKHcVE17F/jSBs/3KAmXG7NhSASFBqlug2bsbTE
+MWyIjYWrKGbvOkJdFh7xNOiiCQLLOfFnzBHcnT7Y2w7gIQ9+5WtFymxXBioY+u95
+QhjxRlLPauAOgs2tpLBAU3How+aveQozCrOfCwbvdk3bvjogYLaxX/Haf7pQl0vq
+WBTb29b1XR+/4O/BNFWcrBXtIQI68LAK4fWfAgMBAAGjggKdMIICmTBPBgNVHSAE
+SDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYB
+BAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
+4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFCeoJkCh
+YyKHWqzcL2F6FcLnK+7xMB8GA1UdIwQYMBaAFDNnqdbxk1U2rKEyvcHkljn/THAx
+MF0GA1UdEQRWMFSCHW15bG9naW4tcWEudWIudW5pLWZyZWlidXJnLmRlghpteWxv
+Z2luLnViLnVuaS1mcmVpYnVyZy5kZYIXbXlsb2dpbi51bmktZnJlaWJ1cmcuZGUw
+gY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkt
+ZnJlaWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2Nk
+cDIucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNy
+bDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBj
+YS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NhY2VydC9nX2NhY2Vy
+dC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZy
+ZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUA
+A4IBAQAqWNfHU8krriggd2mwdlKnKQE3N6IvFSC9uzXmYxRp4Q6z6livfsyRGOx8
+DJxxnc0fqnOr0gAXzROyKZ4g+7EFeoS98Fe5UErT5DgPn3KlHJtzv/8lky9jhhdk
+CYfwNJY59oC1n7fbwbUvMLF4U5y8GJm+U8vsM8cz7qwowWZZj3h8PQc3+uJ3x8Rt
+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>
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
new file mode 100644
index 00000000..dcd60341
--- /dev/null
+++ b/swamid-interfederations-2.0/naming.ja.net-bcp-dns-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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://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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcp-naming.ja.net/Shibboleth.sso/WAYF"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC4jCCAcqgAwIBAgIJAKvL1FR4I0BGMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+						BAMTCWJjcDAwNDI3OTAeFw0xMTEyMDcxMjE3MzBaFw0yMTEyMDQxMjE3MzBaMBQx
+						EjAQBgNVBAMTCWJjcDAwNDI3OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAON8mrdgSPpMs4dHJC6hBIE10lGEzsoS35vckVgFUoyhMfHZEJu2t9SVTC0T
+						GUGYIyArxQt0KSK1qHHGw+2l99xPLEH2rMAiR4JCyeer9EvQrN/mn+aERKMNX8Dd
+						mXIoM/8rqIvqA3ftE/c3H/+C3hKvTRbN7wpG9Vam/olfkujCljqd9Ve4y+uokGry
+						6rqi+5IKcb/FM8ARfZ1uFWOzUj1+THWEJgC2w8dkquMUUlYNylOvdBrY6PTeTGmh
+						EItXPsq/P1fx2hn23vahUDelahUDgE7vQY0h4DlF2iRJSV6+zfVw51cgxUZ67xko
+						jDYNPpKD1QA4x9NsIwZ7sTpVPqUCAwEAAaM3MDUwFAYDVR0RBA0wC4IJYmNwMDA0
+						Mjc5MB0GA1UdDgQWBBRasuhXna2QNf3yqFpBP2RC5kpfTDANBgkqhkiG9w0BAQUF
+						AAOCAQEA4Lepl7qoBfXJZ7t4zmd5ihlIuGEiFIlXBKiAtQYiPmK0ADxYHn87f1qq
+						5i1/Hmx9jLXSmtts1uCzotkRtvYrrJRMWfUKiyPbfhRjy7rvx57VVe568QYpRKia
+						xk86+ZRKnckWG/jo5EFFhGrjBEh+Puw+9a/RqHf7C371HF0QmQA7isNGE0n9o28p
+						Pvz4RA25T97WH7AHcdNy5uokObzKg8lI3FqM8YFDWk6RPyq5lZzhftcNfU148nyH
+						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-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 Collections and Janet 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
new file mode 100644
index 00000000..e6a7b2a4
--- /dev/null
+++ b/swamid-interfederations-2.0/naming.ja.net-dns-shibboleth.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://naming.ja.net/dns/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>
+						MIIC4jCCAcqgAwIBAgIJAKyF+vahRReuMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+						BAMTCWhhcjAwMzkxODAeFw0wOTExMjAwODM4MTVaFw0xOTExMTgwODM4MTVaMBQx
+						EjAQBgNVBAMTCWhhcjAwMzkxODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAKyGnAXQpTnriKaVLhBxB2V01KEV7JFljb6JyCUgmPzhjozQV78Lt6wnrlVE
+						PMJUFzx6MhVOOFdmoud9f4uEt3eLeNNBkXy6F1hLsK93MmEq7NycC9f+RTGkXuI9
+						ZZ6bHpCQg4cgLlo+e+oSmyFrqdwHkKXRxhx7sLDpmrBRt4WS1Yom/sf1roaj/HYJ
+						I09jwKfl5mlFhWqHoprT6zHYZ/q4HIgo8CYFzRPTBYP2WoakD87P3UPpVZj6uLAz
+						d8LCuv1ZX2HJTHYrUyEM4tbqA2cv/CN8W6cgTkm5puZAMvPmFeNnoQlkBnUpH/oc
+						oGDmT026FyBGQ6yXva1uZVOX0xMCAwEAAaM3MDUwFAYDVR0RBA0wC4IJaGFyMDAz
+						OTE4MB0GA1UdDgQWBBQST9Pog/haMAhYi8W9rY0cKz3XfjANBgkqhkiG9w0BAQUF
+						AAOCAQEAERDcKAB+oNKMF14ys3MjR7NgPZzAnxNjyDizDMsPug9ZqfXKTfU1NFZx
+						nx1ihIXHOBZgLU4RKLJSopHZ57V+HlOebXCckx/je1y4a30B0sIg3yk9ZZlMNcVI
+						JWEIEGc6kkIhgQBMAtTaae+Yd1gqk4MQBQG08iDy9M3E4jp3BmgZbJL2lBYwCoRc
+						U2soIdQNoQS5WDuqwDVXqOljUfijVZU9YRpjPDsXqDQDVO+7v/EbPxVtRThQChxY
+						LwXeoQe6wBNtmeBEdm16Ik+PCxkgQlTCLythjkwmB+AjmqoW6Kp9bNfh7/Tlv/lM
+						bYW9q2/JzwJW2LhAXTV1ev8D9e3peg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC4jCCAcqgAwIBAgIJAKyF+vahRReuMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+						BAMTCWhhcjAwMzkxODAeFw0wOTExMjAwODM4MTVaFw0xOTExMTgwODM4MTVaMBQx
+						EjAQBgNVBAMTCWhhcjAwMzkxODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAKyGnAXQpTnriKaVLhBxB2V01KEV7JFljb6JyCUgmPzhjozQV78Lt6wnrlVE
+						PMJUFzx6MhVOOFdmoud9f4uEt3eLeNNBkXy6F1hLsK93MmEq7NycC9f+RTGkXuI9
+						ZZ6bHpCQg4cgLlo+e+oSmyFrqdwHkKXRxhx7sLDpmrBRt4WS1Yom/sf1roaj/HYJ
+						I09jwKfl5mlFhWqHoprT6zHYZ/q4HIgo8CYFzRPTBYP2WoakD87P3UPpVZj6uLAz
+						d8LCuv1ZX2HJTHYrUyEM4tbqA2cv/CN8W6cgTkm5puZAMvPmFeNnoQlkBnUpH/oc
+						oGDmT026FyBGQ6yXva1uZVOX0xMCAwEAAaM3MDUwFAYDVR0RBA0wC4IJaGFyMDAz
+						OTE4MB0GA1UdDgQWBBQST9Pog/haMAhYi8W9rY0cKz3XfjANBgkqhkiG9w0BAQUF
+						AAOCAQEAERDcKAB+oNKMF14ys3MjR7NgPZzAnxNjyDizDMsPug9ZqfXKTfU1NFZx
+						nx1ihIXHOBZgLU4RKLJSopHZ57V+HlOebXCckx/je1y4a30B0sIg3yk9ZZlMNcVI
+						JWEIEGc6kkIhgQBMAtTaae+Yd1gqk4MQBQG08iDy9M3E4jp3BmgZbJL2lBYwCoRc
+						U2soIdQNoQS5WDuqwDVXqOljUfijVZU9YRpjPDsXqDQDVO+7v/EbPxVtRThQChxY
+						LwXeoQe6wBNtmeBEdm16Ik+PCxkgQlTCLythjkwmB+AjmqoW6Kp9bNfh7/Tlv/lM
+						bYW9q2/JzwJW2LhAXTV1ev8D9e3peg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <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:HTTP-POST" Location="https://naming.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming.ja.net/Shibboleth.sso/NIM/SOAP"/>
+    <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:HTTP-POST" Location="https://naming.ja.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming.ja.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <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="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://naming.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://naming.ja.net/Shibboleth.sso/SAML/POST" 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:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">JISC Collections and Janet 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
new file mode 100644
index 00000000..31c686eb
--- /dev/null
+++ b/swamid-interfederations-2.0/naming.ja.net-dns-test-shibboleth.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://naming.ja.net/dns-test/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>
+						MIIC4jCCAcqgAwIBAgIJAKyF+vahRReuMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+						BAMTCWhhcjAwMzkxODAeFw0wOTExMjAwODM4MTVaFw0xOTExMTgwODM4MTVaMBQx
+						EjAQBgNVBAMTCWhhcjAwMzkxODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAKyGnAXQpTnriKaVLhBxB2V01KEV7JFljb6JyCUgmPzhjozQV78Lt6wnrlVE
+						PMJUFzx6MhVOOFdmoud9f4uEt3eLeNNBkXy6F1hLsK93MmEq7NycC9f+RTGkXuI9
+						ZZ6bHpCQg4cgLlo+e+oSmyFrqdwHkKXRxhx7sLDpmrBRt4WS1Yom/sf1roaj/HYJ
+						I09jwKfl5mlFhWqHoprT6zHYZ/q4HIgo8CYFzRPTBYP2WoakD87P3UPpVZj6uLAz
+						d8LCuv1ZX2HJTHYrUyEM4tbqA2cv/CN8W6cgTkm5puZAMvPmFeNnoQlkBnUpH/oc
+						oGDmT026FyBGQ6yXva1uZVOX0xMCAwEAAaM3MDUwFAYDVR0RBA0wC4IJaGFyMDAz
+						OTE4MB0GA1UdDgQWBBQST9Pog/haMAhYi8W9rY0cKz3XfjANBgkqhkiG9w0BAQUF
+						AAOCAQEAERDcKAB+oNKMF14ys3MjR7NgPZzAnxNjyDizDMsPug9ZqfXKTfU1NFZx
+						nx1ihIXHOBZgLU4RKLJSopHZ57V+HlOebXCckx/je1y4a30B0sIg3yk9ZZlMNcVI
+						JWEIEGc6kkIhgQBMAtTaae+Yd1gqk4MQBQG08iDy9M3E4jp3BmgZbJL2lBYwCoRc
+						U2soIdQNoQS5WDuqwDVXqOljUfijVZU9YRpjPDsXqDQDVO+7v/EbPxVtRThQChxY
+						LwXeoQe6wBNtmeBEdm16Ik+PCxkgQlTCLythjkwmB+AjmqoW6Kp9bNfh7/Tlv/lM
+						bYW9q2/JzwJW2LhAXTV1ev8D9e3peg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC4jCCAcqgAwIBAgIJAKyF+vahRReuMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+						BAMTCWhhcjAwMzkxODAeFw0wOTExMjAwODM4MTVaFw0xOTExMTgwODM4MTVaMBQx
+						EjAQBgNVBAMTCWhhcjAwMzkxODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAKyGnAXQpTnriKaVLhBxB2V01KEV7JFljb6JyCUgmPzhjozQV78Lt6wnrlVE
+						PMJUFzx6MhVOOFdmoud9f4uEt3eLeNNBkXy6F1hLsK93MmEq7NycC9f+RTGkXuI9
+						ZZ6bHpCQg4cgLlo+e+oSmyFrqdwHkKXRxhx7sLDpmrBRt4WS1Yom/sf1roaj/HYJ
+						I09jwKfl5mlFhWqHoprT6zHYZ/q4HIgo8CYFzRPTBYP2WoakD87P3UPpVZj6uLAz
+						d8LCuv1ZX2HJTHYrUyEM4tbqA2cv/CN8W6cgTkm5puZAMvPmFeNnoQlkBnUpH/oc
+						oGDmT026FyBGQ6yXva1uZVOX0xMCAwEAAaM3MDUwFAYDVR0RBA0wC4IJaGFyMDAz
+						OTE4MB0GA1UdDgQWBBQST9Pog/haMAhYi8W9rY0cKz3XfjANBgkqhkiG9w0BAQUF
+						AAOCAQEAERDcKAB+oNKMF14ys3MjR7NgPZzAnxNjyDizDMsPug9ZqfXKTfU1NFZx
+						nx1ihIXHOBZgLU4RKLJSopHZ57V+HlOebXCckx/je1y4a30B0sIg3yk9ZZlMNcVI
+						JWEIEGc6kkIhgQBMAtTaae+Yd1gqk4MQBQG08iDy9M3E4jp3BmgZbJL2lBYwCoRc
+						U2soIdQNoQS5WDuqwDVXqOljUfijVZU9YRpjPDsXqDQDVO+7v/EbPxVtRThQChxY
+						LwXeoQe6wBNtmeBEdm16Ik+PCxkgQlTCLythjkwmB+AjmqoW6Kp9bNfh7/Tlv/lM
+						bYW9q2/JzwJW2LhAXTV1ev8D9e3peg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming-test.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <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:HTTP-POST" Location="https://naming-test.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming-test.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/SOAP"/>
+    <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:HTTP-POST" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming-test.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <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="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming-test.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://naming-test.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://naming-test.ja.net/Shibboleth.sso/SAML/POST" 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:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">JISC Collections and Janet 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
new file mode 100644
index 00000000..4a2ed521
--- /dev/null
+++ b/swamid-interfederations-2.0/napier-shib.hosted.exlibrisgroup.com-shib.xml
@@ -0,0 +1,84 @@
+<?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>
+      <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>
+						MIIC3DCCAcSgAwIBAgIJALjiKNTZ3VmHMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB2FpbzAwMDIwHhcNMTQwNjI0MTcxNjM0WhcNMjQwNjIxMTcxNjM0WjASMRAw
+						DgYDVQQDEwdhaW8wMDAyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						0NHNpqzxRZEUmqRAPecaMNEk3LHrAoN6YR/8d+4JrHvkwY3PQYhFZUHjqcP02fwy
+						9UEoelEWltX0QAnLlKFu2uiHVcm+5lhJ4vZqUmoYhtuqfaYcCmYi59ejY72uUP9c
+						aqd8duyC5kh8vKio4zHfuGPtlvc/Uoyw8tcBoDq/u+3NBCrSjZKh8+nW7HWhdJ2l
+						g59HWZwLUo2iZUqicyQo57Ahut6YYl8guO3EBLg7pwtq/hdHydq5QGaAd0tbOOYt
+						V4Y32/BLWUuChN4n/BDLCEYaeJUQ1dyKuMu4uOKJtQ2C3cWgDBk6sA316QvHhfTY
+						vCrmCekrNXTVoRGy09icywIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDAyMB0G
+						A1UdDgQWBBRzYEI+CDBGccK525266LYvcGwuljANBgkqhkiG9w0BAQUFAAOCAQEA
+						a/j2gPQbZ7lzb8OthFIBt4ktulrb1rwBHpvv4BvtJ6VtM1uJMwGilVVba6mczihR
+						k3sLeicALw06cqkgzGjSv8gLHBD1c06sRiTPh4YHdJKGpKRrS4quCnv7/9Eu7Use
+						DT5R2cNjNfBIavipSX0HeP6I8ZUDvfZc2IeC1r/J6I29YD23siyMXkCE+cahWaj8
+						dhTPVvq/avtplWKyECD0Mnf3r/NmLbjyc1e3nXCsYE+kMCWWe4Q+g4yWxXmrOS3Q
+						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>
diff --git a/swamid-interfederations-2.0/naxos.queens.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/naxos.queens.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..98a9a1de
--- /dev/null
+++ b/swamid-interfederations-2.0/naxos.queens.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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://naxos.queens.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-22T15:10: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://naxos.queens.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>
+						MIIDAzCCAeugAwIBAgIJAL977jDe7lTRMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFGhvb3QucXVlZW5zLm94LmFjLnVrMB4XDTExMDkxOTE0MzgwNVoXDTIxMDkx
+						NjE0MzgwNVowHzEdMBsGA1UEAxMUaG9vdC5xdWVlbnMub3guYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCUf1Kw2V+k8E3SpgVw20dkkKaTgreb
+						cEaSH9iWBFQwX7kSmLRTgABVGVb80BK44pJ5ob0Fi0N5yC6ZftuAVst2p4CEVege
+						APdglPc5cY49vWQs6P12qaYUe9T/USrpJsWBC2h6Q4yfF4ZpKqZ+S6roCjx0RN+Z
+						Nt/E/v1YhBOWxzDS1XLFkIh7bmkZMXiwEQHIJ8eHvyAHaDPJ+FBEsQBgwFozHD5D
+						OBwCKfu9MC1XkzitnSK7VmKCTKQNMpCjKzHlvv/YAu3+Gpc1+IFZsmFvm3ClMUwO
+						bft0pv0h6LvlOpfsYHdK79DezjOFIC1ErI9GT3jtzq0XAAP7S6AtXwOXAgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFGhvb3QucXVlZW5zLm94LmFjLnVrMB0GA1UdDgQWBBSB
+						1rkdpl832bWJL72XQwzSvahSpDANBgkqhkiG9w0BAQUFAAOCAQEAReq3JOhtVKTQ
+						mtSaPD5CCtKYphLumrMiGEc3ANhlnxqbi3sjcGKemaj7vKt1XvpGiIYioMLa5Vhh
+						+48n4V4dwaCPYmwORCo/sQMdyQ5bUEAONX0kqsdY23fOLfdm8EBdNYEVWoVHgWPb
+						meJXz3xzYE+vlimyl5qbv1nVYZo/y8U5cclOUJ2mnrUILpTqaKlm6D94xMVtvJ0d
+						wPg715M2n27ESKdvOZHoH25/GASFleHihcIxhKTq2AFHr+G1OjzuSBS0/SZbkvub
+						pce4A1Yh2scVlAkDZTwf4fSnjM5RVNvhl8LGJvgDzWwJOYXIRYnSmkY93lliTvSz
+						aAJiV4ZfqQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: The Queen's College Naxos Music Site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.queens.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Queen's College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@queens.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Queen's College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@queens.ox.ac.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
new file mode 100644
index 00000000..f3be2d48
--- /dev/null
+++ b/swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.xml
@@ -0,0 +1,111 @@
+<?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>
+      <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>
+						MIIEzzCCA7egAwIBAgIQIgup9AQXq2/mAIVLgDo0IjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMTExNDAwMDAwMFoXDTE1MTExNDIzNTk1OVowgZsxCzAJBgNV
+						BAYTAkdCMRkwFwYDVQQIExBOb3J0aGFtcHRvbnNoaXJlMRQwEgYDVQQHEwtOb3J0
+						aGFtcHRvbjEcMBoGA1UEChMTTm9ydGhhbXB0b24gQ29sbGVnZTEUMBIGA1UECxML
+						SUNUIFN1cHBvcnQxJzAlBgNVBAMTHm5jaWRwLm5vcnRoYW1wdG9uY29sbGVnZS5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeeFbVvv17/P6HO
+						wOY8GirpA+GhEw2GzXC1vlg8eRB7GGxq1/71Sgkh7FnoRpjoosJhPB4gf4Y8ei5w
+						OWuasHOnSweOInxPiE+mA40PFEfbuiTLbAHIGNlkSDwXJlaNYGdqdUBcyk0QCZUa
+						bikvr1bKiKokbmwfMTEi44m6LrzroVKRYq2FdShi2fnw4QigZjhqT9PQ1iyhu8cP
+						1u7bPskuxK3Wx18MkcM9QEubG5zNr/+2LrgbLTUQ/hqR//wyvgdb6oE83dVhb8jG
+						2O539NdKzOBYWEYYPijsBP7TYZ7T5JDYT/XHskkdXaF3D0GD1F15FEEvm4diLZGv
+						Z+ag3okCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+						47ntMB0GA1UdDgQWBBQRoCcXSYYU2EYCVk+2uoXCPVXPlzAOBgNVHQ8BAf8EBAMC
+						BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+						GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
+						Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
+						AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
+						Lm9yZzApBgNVHREEIjAggh5uY2lkcC5ub3J0aGFtcHRvbmNvbGxlZ2UuYWMudWsw
+						DQYJKoZIhvcNAQEFBQADggEBALVvySVz7NtJnZ89cwkf8ta+IzoAx5GMf80lASMs
+						DSmIH0OMGiH9h6Zu6F9sQPyNTc2LgLCm8E24HQGd712DZe3CJK0lRuE6st5AG5J4
+						K0eYQuX5N+sE0e4VDCYRGX8p+aCHl+DqCw/Szn3EhyJX4JHqJwQNljuiepH8NkCE
+						CqNCKt6m8aXV4T43wtxQg9NxDdAXpWLLMBkUJE1PLay38GzuL/pYTZEsBkH6UmgZ
+						qhUWeOqVzacp7woehhN0eaRV3nnAw1LoqSlJrOZn7I0UmNaaJp2sfN4Xfaa6E666
+						nPxMI3FEofI4DVsiFacYByziNu2TwI98djtN8Z+o0+N0j9k=
+					</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>
+						MIIEzzCCA7egAwIBAgIQIgup9AQXq2/mAIVLgDo0IjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMTExNDAwMDAwMFoXDTE1MTExNDIzNTk1OVowgZsxCzAJBgNV
+						BAYTAkdCMRkwFwYDVQQIExBOb3J0aGFtcHRvbnNoaXJlMRQwEgYDVQQHEwtOb3J0
+						aGFtcHRvbjEcMBoGA1UEChMTTm9ydGhhbXB0b24gQ29sbGVnZTEUMBIGA1UECxML
+						SUNUIFN1cHBvcnQxJzAlBgNVBAMTHm5jaWRwLm5vcnRoYW1wdG9uY29sbGVnZS5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALeeFbVvv17/P6HO
+						wOY8GirpA+GhEw2GzXC1vlg8eRB7GGxq1/71Sgkh7FnoRpjoosJhPB4gf4Y8ei5w
+						OWuasHOnSweOInxPiE+mA40PFEfbuiTLbAHIGNlkSDwXJlaNYGdqdUBcyk0QCZUa
+						bikvr1bKiKokbmwfMTEi44m6LrzroVKRYq2FdShi2fnw4QigZjhqT9PQ1iyhu8cP
+						1u7bPskuxK3Wx18MkcM9QEubG5zNr/+2LrgbLTUQ/hqR//wyvgdb6oE83dVhb8jG
+						2O539NdKzOBYWEYYPijsBP7TYZ7T5JDYT/XHskkdXaF3D0GD1F15FEEvm4diLZGv
+						Z+ag3okCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+						47ntMB0GA1UdDgQWBBQRoCcXSYYU2EYCVk+2uoXCPVXPlzAOBgNVHQ8BAf8EBAMC
+						BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+						GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
+						Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
+						AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
+						Lm9yZzApBgNVHREEIjAggh5uY2lkcC5ub3J0aGFtcHRvbmNvbGxlZ2UuYWMudWsw
+						DQYJKoZIhvcNAQEFBQADggEBALVvySVz7NtJnZ89cwkf8ta+IzoAx5GMf80lASMs
+						DSmIH0OMGiH9h6Zu6F9sQPyNTc2LgLCm8E24HQGd712DZe3CJK0lRuE6st5AG5J4
+						K0eYQuX5N+sE0e4VDCYRGX8p+aCHl+DqCw/Szn3EhyJX4JHqJwQNljuiepH8NkCE
+						CqNCKt6m8aXV4T43wtxQg9NxDdAXpWLLMBkUJE1PLay38GzuL/pYTZEsBkH6UmgZ
+						qhUWeOqVzacp7woehhN0eaRV3nnAw1LoqSlJrOZn7I0UmNaaJp2sfN4Xfaa6E666
+						nPxMI3FEofI4DVsiFacYByziNu2TwI98djtN8Z+o0+N0j9k=
+					</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>
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
new file mode 100644
index 00000000..b8254e1b
--- /dev/null
+++ b/swamid-interfederations-2.0/ncnidp2.ncn.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKCGTdXZNjFkxlbPHQZ+
+						AJcFLw+6FdBn+L2ryybG5i4X9Ft92AEKXbaIH/Q0nOwP3+Gq0yyFPgloiAk/r3KJ
+						uhIziuJ1di0tRxJcCJWH3E+Mv4LrDsV30xILVq3pNiQW96Y7jwPqquHJS6116cjh
+						xBIwMnMizXkAz6ZbUyayFO5KfQ5ShcJKCA/fUbNZ2jIT0imHwIWEzsF/uCrxMpVL
+						GGu+hnWZOz8Jd0zbI3+ZowJB9HB8mX7GpP6WsImuSay0JTGxcb80v6GIV/8iuMwk
+						BAYWskCARpIImOABiYzUN4t5be3frkdrmOVuvKDmFhKU362V6IaVpaYUifNK+7jk
+						IQMCAwEAAaNrMGkwSAYDVR0RBEEwP4ISbmNhLWlkcDEubmNuLmFjLnVrhilodHRw
+						czovL25jYS1pZHAxLm5jbi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						nZnTzYWrQVq2AEx7CHvOlze4oH4wDQYJKoZIhvcNAQEFBQADggEBAAPRO5cV0WBn
+						pJrW/poSP+Y0adkGgK3vIihqdp4blGWWwitUryfhoWJd6s5fDwAlCUzmUjrGuxlh
+						QIsgrUyYbBKAmrDoAwzlTiz6hs3Q3eN8ljN1jviJmStQoV4HugtrmKLP8A5bI6eI
+						VR/fx4TFwbsIgmZR+mM73zf0z2oOPp6WiIOZV0JIiEeT2Z5vIMTUzyGdIhGmr6FF
+						4cP+49glAVtsuTup9MRChUB6znydUVf9fVmi74FCsLaxEqMys8UMzXXMiCG1g6XG
+						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>
+						MIIDNDCCAhygAwIBAgIVALRppuv8S4ANdlBHMhXkfMZDERBpMA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEm5jYS1pZHAxLm5jbi5hYy51azAeFw0xMzEwMDgxMzIz
+						MDNaFw0zMzEwMDgxMzIzMDNaMB0xGzAZBgNVBAMTEm5jYS1pZHAxLm5jbi5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKCGTdXZNjFkxlbPHQZ+
+						AJcFLw+6FdBn+L2ryybG5i4X9Ft92AEKXbaIH/Q0nOwP3+Gq0yyFPgloiAk/r3KJ
+						uhIziuJ1di0tRxJcCJWH3E+Mv4LrDsV30xILVq3pNiQW96Y7jwPqquHJS6116cjh
+						xBIwMnMizXkAz6ZbUyayFO5KfQ5ShcJKCA/fUbNZ2jIT0imHwIWEzsF/uCrxMpVL
+						GGu+hnWZOz8Jd0zbI3+ZowJB9HB8mX7GpP6WsImuSay0JTGxcb80v6GIV/8iuMwk
+						BAYWskCARpIImOABiYzUN4t5be3frkdrmOVuvKDmFhKU362V6IaVpaYUifNK+7jk
+						IQMCAwEAAaNrMGkwSAYDVR0RBEEwP4ISbmNhLWlkcDEubmNuLmFjLnVrhilodHRw
+						czovL25jYS1pZHAxLm5jbi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						nZnTzYWrQVq2AEx7CHvOlze4oH4wDQYJKoZIhvcNAQEFBQADggEBAAPRO5cV0WBn
+						pJrW/poSP+Y0adkGgK3vIihqdp4blGWWwitUryfhoWJd6s5fDwAlCUzmUjrGuxlh
+						QIsgrUyYbBKAmrDoAwzlTiz6hs3Q3eN8ljN1jviJmStQoV4HugtrmKLP8A5bI6eI
+						VR/fx4TFwbsIgmZR+mM73zf0z2oOPp6WiIOZV0JIiEeT2Z5vIMTUzyGdIhGmr6FF
+						4cP+49glAVtsuTup9MRChUB6znydUVf9fVmi74FCsLaxEqMys8UMzXXMiCG1g6XG
+						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>
diff --git a/swamid-interfederations-2.0/neiss.nesc.gla.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/neiss.nesc.gla.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..57e6c6c4
--- /dev/null
+++ b/swamid-interfederations-2.0/neiss.nesc.gla.ac.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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://neiss.nesc.gla.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://neiss.nesc.gla.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>
+						MIIDAzCCAeugAwIBAgIJAP+u9FsUkGK4MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFG5laXNzLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDcyMzEzNDkyNFoXDTE5MDcy
+						MTEzNDkyNFowHzEdMBsGA1UEAxMUbmVpc3MubmVzYy5nbGEuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnRKUYCtTm/YAA/xOx01gsbodauTrk
+						3UupsTSRFJMucsSFwl0oHTNFXjXacGxSEhq1nwRw3W+aKaaxOsbRqLRPd9TFCo1r
+						SZLU5N3+S3NSfesZnrKLxcDb5XJf4ToqBCwHwu8bSwMC9g3LOZvm31lxaBu7lRhO
+						2qPlxx8ESD6xJNU+c7ijTfBCwGnm7zH30oTsbspFTPfGHPp2DpmG42SWJZxgJYyv
+						hx4No30U+MssN9O3g9bcLm837aIEzVJDDBamQA83oBkBUYTgHYo21qfMezYDBXaU
+						IlRFNZt5eHu+nbW+wGuBQDa3P8ffDVGzXwNcIntYZXpjAww3DaC8JFjxAgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFG5laXNzLm5lc2MuZ2xhLmFjLnVrMB0GA1UdDgQWBBTb
+						Qzadk9TtnjjvYEry7dZ8XQ4MeDANBgkqhkiG9w0BAQUFAAOCAQEAWYIBYcDCXnr1
+						OTz0D8hx4aJRlPAouoAtc5+UUMIu9FCII/DqyMljxynRR7psCi8xk4bJ0Mk1cg7i
+						EhwKWmRxUaL92m1ebHb4eisdleGnnMeO89Gn1kGA1QplNvsJZP8UBqzf5pQshe8K
+						K9F6pn8/3FE3JpEeNlNBz597gxTM99FIUUvSR8bllqljPaSOEBgbNEHdrgd5qGBt
+						nzxUn0XdIcnfDxTTYkF7ht34kwNAVJ16q6bz5FFIaxLFy7ZkwbCvm23tN5KDYUjo
+						Re0suMUuwA9QTypNllFOEaKQvLOuxyE/vtnrNN/NV0jRqCCQ1ycWU6bRleT7xMpF
+						sLv7XXQhLg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDAzCCAeugAwIBAgIJAP+u9FsUkGK4MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFG5laXNzLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDcyMzEzNDkyNFoXDTE5MDcy
+						MTEzNDkyNFowHzEdMBsGA1UEAxMUbmVpc3MubmVzYy5nbGEuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnRKUYCtTm/YAA/xOx01gsbodauTrk
+						3UupsTSRFJMucsSFwl0oHTNFXjXacGxSEhq1nwRw3W+aKaaxOsbRqLRPd9TFCo1r
+						SZLU5N3+S3NSfesZnrKLxcDb5XJf4ToqBCwHwu8bSwMC9g3LOZvm31lxaBu7lRhO
+						2qPlxx8ESD6xJNU+c7ijTfBCwGnm7zH30oTsbspFTPfGHPp2DpmG42SWJZxgJYyv
+						hx4No30U+MssN9O3g9bcLm837aIEzVJDDBamQA83oBkBUYTgHYo21qfMezYDBXaU
+						IlRFNZt5eHu+nbW+wGuBQDa3P8ffDVGzXwNcIntYZXpjAww3DaC8JFjxAgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFG5laXNzLm5lc2MuZ2xhLmFjLnVrMB0GA1UdDgQWBBTb
+						Qzadk9TtnjjvYEry7dZ8XQ4MeDANBgkqhkiG9w0BAQUFAAOCAQEAWYIBYcDCXnr1
+						OTz0D8hx4aJRlPAouoAtc5+UUMIu9FCII/DqyMljxynRR7psCi8xk4bJ0Mk1cg7i
+						EhwKWmRxUaL92m1ebHb4eisdleGnnMeO89Gn1kGA1QplNvsJZP8UBqzf5pQshe8K
+						K9F6pn8/3FE3JpEeNlNBz597gxTM99FIUUvSR8bllqljPaSOEBgbNEHdrgd5qGBt
+						nzxUn0XdIcnfDxTTYkF7ht34kwNAVJ16q6bz5FFIaxLFy7ZkwbCvm23tN5KDYUjo
+						Re0suMUuwA9QTypNllFOEaKQvLOuxyE/vtnrNN/NV0jRqCCQ1ycWU6bRleT7xMpF
+						sLv7XXQhLg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Glasgow</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NeSC (Glasgow): NeISS Portal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.neiss.org.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/nerckwshibba.nerc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/nerckwshibba.nerc.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..8b03f912
--- /dev/null
+++ b/swamid-interfederations-2.0/nerckwshibba.nerc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,287 @@
+<?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>
+      <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
+						aGliYmEubmVyYy5hYy51azEoMCYGCSqGSIb3DQEJARYZaXN0X2lkX3N1cHBvcnRA
+						bmVyYy5hYy51azAeFw0xMzAyMTMxMTI4NTJaFw0yMzAyMTExMTI4NTJaMIGgMQsw
+						CQYDVQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTETMBEGA1UEBwwKTm90dGlu
+						Z2hhbTENMAsGA1UECgwETkVSQzEMMAoGA1UECwwDSVNUMSAwHgYDVQQDDBduZXJj
+						a3dzaGliYmEubmVyYy5hYy51azEoMCYGCSqGSIb3DQEJARYZaXN0X2lkX3N1cHBv
+						cnRAbmVyYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBM
+						zJ+uj+q3UWvsNeEmNq3/OYAxNMCxLaZWZbDtt2gQDBpB2GJBZHIl4GEMTda6w2j6
+						34lhz0mZsOXSpE18Tdvp177L3k/h9b0sH2k43I3gq4+mFl6wxPQ8F/wR08dEaz6k
+						wMfv3ntfF1Y7bLedyw5M94qRUv7rcI/9iFOfyhnpnwCIo2usiIrjkKFUc/gRvkXH
+						A9PCkz0+PyPi5HrmrkMaRjxkx25PsKuxbxbplM0Z9wxsCpO6KM/kwxLroYLQh0oJ
+						HngCvCuNmVPH4YjCQXh5KVNRx/Wc/F0C9qvFd4aZzgC9Ms8Wmj2FIfTABtyr0u9D
+						Zhm3G9422dhg6EgZg+sCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0E
+						HxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCGcQ2SN
+						NR/KKBotn3XrDl2OH91cMB8GA1UdIwQYMBaAFCGcQ2SNNR/KKBotn3XrDl2OH91c
+						MA0GCSqGSIb3DQEBBQUAA4IBAQArZkQSlvSTa9oSr1XJXdDrW3Inf0YlA6D6w9ZC
+						HY9vG4FylgXNq/VRKzugFa/esvTNN0xaEciidPqvpaF/JyxCNWFui5X+GWGDt7zi
+						vEP34+fzlmhMZu3Jjhu2O/YS9BOQWqCwD8J/KftAbPeSbwB1dWUOnwnlC8X2BfOA
+						UTWhDsoVipIEPLnhvSVzDJvSzygzN2BnHMFyaaqHAthaLoyn7BV/SFtk7VaFK7OQ
+						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>
+						MIIEQDCCAyigAwIBAgIJAPRnCt9s8k0UMA0GCSqGSIb3DQEBBQUAMIGgMQswCQYD
+						VQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTETMBEGA1UEBwwKTm90dGluZ2hh
+						bTENMAsGA1UECgwETkVSQzEMMAoGA1UECwwDSVNUMSAwHgYDVQQDDBduZXJja3dz
+						aGliYmEubmVyYy5hYy51azEoMCYGCSqGSIb3DQEJARYZaXN0X2lkX3N1cHBvcnRA
+						bmVyYy5hYy51azAeFw0xMzAyMTMxMTI4NTJaFw0yMzAyMTExMTI4NTJaMIGgMQsw
+						CQYDVQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTETMBEGA1UEBwwKTm90dGlu
+						Z2hhbTENMAsGA1UECgwETkVSQzEMMAoGA1UECwwDSVNUMSAwHgYDVQQDDBduZXJj
+						a3dzaGliYmEubmVyYy5hYy51azEoMCYGCSqGSIb3DQEJARYZaXN0X2lkX3N1cHBv
+						cnRAbmVyYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBM
+						zJ+uj+q3UWvsNeEmNq3/OYAxNMCxLaZWZbDtt2gQDBpB2GJBZHIl4GEMTda6w2j6
+						34lhz0mZsOXSpE18Tdvp177L3k/h9b0sH2k43I3gq4+mFl6wxPQ8F/wR08dEaz6k
+						wMfv3ntfF1Y7bLedyw5M94qRUv7rcI/9iFOfyhnpnwCIo2usiIrjkKFUc/gRvkXH
+						A9PCkz0+PyPi5HrmrkMaRjxkx25PsKuxbxbplM0Z9wxsCpO6KM/kwxLroYLQh0oJ
+						HngCvCuNmVPH4YjCQXh5KVNRx/Wc/F0C9qvFd4aZzgC9Ms8Wmj2FIfTABtyr0u9D
+						Zhm3G9422dhg6EgZg+sCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0E
+						HxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCGcQ2SN
+						NR/KKBotn3XrDl2OH91cMB8GA1UdIwQYMBaAFCGcQ2SNNR/KKBotn3XrDl2OH91c
+						MA0GCSqGSIb3DQEBBQUAA4IBAQArZkQSlvSTa9oSr1XJXdDrW3Inf0YlA6D6w9ZC
+						HY9vG4FylgXNq/VRKzugFa/esvTNN0xaEciidPqvpaF/JyxCNWFui5X+GWGDt7zi
+						vEP34+fzlmhMZu3Jjhu2O/YS9BOQWqCwD8J/KftAbPeSbwB1dWUOnwnlC8X2BfOA
+						UTWhDsoVipIEPLnhvSVzDJvSzygzN2BnHMFyaaqHAthaLoyn7BV/SFtk7VaFK7OQ
+						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>
diff --git a/swamid-interfederations-2.0/netauth.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/netauth.new.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..69bf860a
--- /dev/null
+++ b/swamid-interfederations-2.0/netauth.new.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,81 @@
+<?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://netauth.new.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="2013-10-02T13:03: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://netauth.new.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>
+						MIIDAzCCAeugAwIBAgIJAKMSnZeSVHgEMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFG5ldGF1dGgubmV3Lm94LmFjLnVrMB4XDTEzMDkzMDE1MzQ0N1oXDTIzMDky
+						ODE1MzQ0N1owHzEdMBsGA1UEAxMUbmV0YXV0aC5uZXcub3guYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC035v936htfmoVzstmJwIfPvfUB2qE
+						wey1wBMBuucw69i5g4yl8YZ17yklNQAXs3aLxiTUhLoLVZ8OK5vc4/z5PCrnIQbj
+						eO9ll6jwn6svf2NRiK5L6rDGgxjrbCjz7W7azQefCW9UF6HApFLY2GJOrZxYhnFW
+						RTiQIN5SrZxBqMNi780uPw88Qchm/8+B3E941F9Dh61Gp/DQHsORQWgEy5RF99Yk
+						MGc3wFWFNy0M0e3FHgjRxgNHvbIW5ny1TO1EAZnGfwzV30onyu/OgO/3V3jVb3Bk
+						0S48VDUFi2GTep9fOwmqJbKNy4r3VKBn5eIgVVlnveK/BbF7yIcMgwLrAgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFG5ldGF1dGgubmV3Lm94LmFjLnVrMB0GA1UdDgQWBBQa
+						NkzluKeibaDUOYUKYis0I+BaDjANBgkqhkiG9w0BAQUFAAOCAQEAUabom1zsaMeN
+						Ah+SzTLFnBQAwHWSeJfWnEdtDFavwTenxjyxGMm9T85kvnQK16p0dI7yRxuHR26V
+						E6glnUU/XcO13yX2f0vPGtqLzVTK2lDK4BuSErJ+HQAuJxr0fGIHYP5s4U+Fe11l
+						wRU+KT7ijBH7IcHy7U/Kt6qKTSF9B3oMQJRvYTszduhik4fM2YCyWOscjvI+MCEd
+						4q3awKar8d4qiAqBFM627qTU+ozjYwV6O3mFPIfi8Kp3GM5+qbVBPgJhlPU6n6Fs
+						Fqnx77OlqMFgNDUgKpoXmT1+nh6Fb9/4orNFUp3gAJBvm80LmYl61O+UozUgtg1C
+						JBJczVcyrQ==
+					</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://netauth.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netauth.new.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://netauth.new.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://netauth.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://netauth.new.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, New College NAC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Dore</md:SurName>
+    <md:EmailAddress>mailto:james.dore@new.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Dore</md:SurName>
+    <md:EmailAddress>mailto:james.dore@new.ox.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
new file mode 100644
index 00000000..8e56460f
--- /dev/null
+++ b/swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml
@@ -0,0 +1,82 @@
+<?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>
+  </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: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>
+					      MIIDfTCCAmWgAwIBAgIEbaA2aTANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJGUjEVMBMGA1UE
+CBMMSGF1dGUtU2F2b2llMRAwDgYDVQQHEwdBcmdvbmF5MQ4wDAYDVQQKEwVtYWF0RzEOMAwGA1UE
+CxMFbWFhdEcxFzAVBgNVBAMTDm5ldWdyaWQ0eW91LmZyMB4XDTEzMTIwNDE0MzYyNVoXDTIzMTIw
+MjE0MzYyNVowbzELMAkGA1UEBhMCRlIxFTATBgNVBAgTDEhhdXRlLVNhdm9pZTEQMA4GA1UEBxMH
+QXJnb25heTEOMAwGA1UEChMFbWFhdEcxDjAMBgNVBAsTBW1hYXRHMRcwFQYDVQQDEw5uZXVncmlk
+NHlvdS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwvYRQpDscRzuobC7VIfUFz
+3DHejMCC3s+l49pcdzngiqHvmNdtveTjg8G2HKqjcakLZZqBGmgFUMk2419BQSGt70Lvyap2Ys8k
+MFV+MX6CveGSNYDO7q6mEoDFSYDGn3YwYIXxWEnrbLxoC1TuPeUJWkgJN5zvuPZYumu5ChqPUGkv
+OfSGFEoWn4RCgzb2Fs1sQ4kGrExA0Ht+wMjy/z55hDarvrOK9dBov8oALhWrIlYc5nNu4a6xrmDz
+sDNjQZywobKSHJXjT34Ymrqvx6oP9s9Zh4nSJiBKhvOHPLsiUTyIvzRTO11sqh4IMxQtQwIrsQ+c
+P5nt2tYlSnTxCFMCAwEAAaMhMB8wHQYDVR0OBBYEFBNhnLLuvMIhcsk4yvJRBX9vsN/bMA0GCSqG
+SIb3DQEBCwUAA4IBAQAneAmyrRTMxvH+QvS9272MMrmKZ7T5krCT1BgIKbxwEHqAqww+6We2R87t
+b8znR6Jgt8SMexYL40BzR4RHXPkr39usz6ptO1Cvdv/WuB238EoqrmGCsnSx3S5Nmbunh0pyWigh
+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>
+					      MIIDfTCCAmWgAwIBAgIEbaA2aTANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJGUjEVMBMGA1UE
+CBMMSGF1dGUtU2F2b2llMRAwDgYDVQQHEwdBcmdvbmF5MQ4wDAYDVQQKEwVtYWF0RzEOMAwGA1UE
+CxMFbWFhdEcxFzAVBgNVBAMTDm5ldWdyaWQ0eW91LmZyMB4XDTEzMTIwNDE0MzYyNVoXDTIzMTIw
+MjE0MzYyNVowbzELMAkGA1UEBhMCRlIxFTATBgNVBAgTDEhhdXRlLVNhdm9pZTEQMA4GA1UEBxMH
+QXJnb25heTEOMAwGA1UEChMFbWFhdEcxDjAMBgNVBAsTBW1hYXRHMRcwFQYDVQQDEw5uZXVncmlk
+NHlvdS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwvYRQpDscRzuobC7VIfUFz
+3DHejMCC3s+l49pcdzngiqHvmNdtveTjg8G2HKqjcakLZZqBGmgFUMk2419BQSGt70Lvyap2Ys8k
+MFV+MX6CveGSNYDO7q6mEoDFSYDGn3YwYIXxWEnrbLxoC1TuPeUJWkgJN5zvuPZYumu5ChqPUGkv
+OfSGFEoWn4RCgzb2Fs1sQ4kGrExA0Ht+wMjy/z55hDarvrOK9dBov8oALhWrIlYc5nNu4a6xrmDz
+sDNjQZywobKSHJXjT34Ymrqvx6oP9s9Zh4nSJiBKhvOHPLsiUTyIvzRTO11sqh4IMxQtQwIrsQ+c
+P5nt2tYlSnTxCFMCAwEAAaMhMB8wHQYDVR0OBBYEFBNhnLLuvMIhcsk4yvJRBX9vsN/bMA0GCSqG
+SIb3DQEBCwUAA4IBAQAneAmyrRTMxvH+QvS9272MMrmKZ7T5krCT1BgIKbxwEHqAqww+6We2R87t
+b8znR6Jgt8SMexYL40BzR4RHXPkr39usz6ptO1Cvdv/WuB238EoqrmGCsnSx3S5Nmbunh0pyWigh
+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="1"/>
+    <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://unknown.site.com</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/new-primo.hosted.exlibrisgroup.com-shibboleth.xml b/swamid-interfederations-2.0/new-primo.hosted.exlibrisgroup.com-shibboleth.xml
new file mode 100644
index 00000000..604b9a8a
--- /dev/null
+++ b/swamid-interfederations-2.0/new-primo.hosted.exlibrisgroup.com-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIDNjCCAh6gAwIBAgIJAIdGru6Iz9m0MA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
+						BAMTJWRjMDN2ZzAwMjJldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTEw
+						OTAxMTIyMTEzWhcNMjEwODI5MTIyMTEzWjAwMS4wLAYDVQQDEyVkYzAzdmcwMDIy
+						ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAuZcRSbYJXYqvCMDcsN1NvvfB37VY156cSBF8FUKYdu1yco+G
+						534wiphhYFRsnkDnUuAP9yQED27E/rGfdWrQ3OhkDViuEkKxWhzqYSzopxe/5y6i
+						4oNFORY6HpbdrqF21IZc8bfspS7uz6oOET6V1hYIhd3V5nOTB5VyO1CdKd7o65wr
+						CTGj2rzKDXb4uj0HKST3aRLK26jlER5x9uR68RW4nUM45/vmHRgyqfKd+pVMPld2
+						TCGDh/jmFvjyHlzZf6jXMgVAgDUAvFXWgCxPo2fuOqlWpVJTalj3CK7uuEx6+SUk
+						I3g+FyUC5sJGMTEOwFgKjhOECeYU8+5a/zqnFwIDAQABo1MwUTAwBgNVHREEKTAn
+						giVkYzAzdmcwMDIyZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
+						BBQPC+IZUQn+WJezFAf2U7VnfAJiKjANBgkqhkiG9w0BAQUFAAOCAQEAbK7NgNnG
+						T3qgmYt+4otVR0DBCGlsj50HFvNb4C4uWOEWREUZ9Bb3Ju7E49zMRzf96HpWZneS
+						cfaUQrhYl1n8grNGdy8O0PXffSkqr0d9FfaT3IkuIQSqy6mi198brqgVeyNR5BjR
+						bi3OGv48vQdkPhzzTR5/H5/mi4U0i54sSI8GFkcRjytrqS1eqdHDRVFkdXbaKsaU
+						o+p64ZHxRlqxaFsieCz+5CdiqP9pJwHX3ghS40QMYAMP+P43YJmSlc9FnseWulik
+						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>
diff --git a/swamid-interfederations-2.0/newcastle.kit-catalogue.com-shibboleth.xml b/swamid-interfederations-2.0/newcastle.kit-catalogue.com-shibboleth.xml
new file mode 100644
index 00000000..cdb6976d
--- /dev/null
+++ b/swamid-interfederations-2.0/newcastle.kit-catalogue.com-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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>
+						MIIG4TCCBcmgAwIBAgIQHCGC1CK9V9XFPYeyU9ZeCTANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMTAwMjAwMDAwMFoXDTE2MTAwMTIzNTk1OVowPzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFueXNzYS5sYm9y
+						by5hYy51azCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOt+A9QV+8R4
+						NWqBkrIjTu9/xINfhF9fChi/eqVEwrBqXwmGc0/Sf+lzygHrj72BClpWtdIUFtTW
+						LWWVUfXqBn2mLfuygJO9kbFnJjFlDEShVIpJbIFsCUg43QBnb2UCI7vHzk9f7njW
+						/bMjMLDkfSxVNSH33cJ3CEp9/hKuUjgNj+ApX8AYn0YlVaiak15gTEH4gRFxfGNi
+						r6B8uuGX58fV7UUC/uOou6x8UAeoUk9Y1y4jwMvyZ7SRUqWvm0/RAnEgtbh3XcUO
+						TLWo3EJsMSmofvOwYvxO0Tew/avFAJPglXKaSKod0J7a0tMAhCuhmuzWoO1jvI8+
+						eW39w0p0MXvJGQiVxkYPyLi6eB9z9ljpOUx6X5hRHtyiro1ai1Xd11S8a2r+m3IB
+						WZByEraWqfdPc2l6eTAwQw+5uK1XRXzF4ek5FNE8qQQa8XhR0kV6Dz2saK2qG7P3
+						enTZZWpC6TKLypqqaep2ZvSd2uutFMBVTMwXBcRhWM8Ro0I1fhKGr6iMRLEgCwPW
+						eDC7AEfSOA8DuyCeHSZwgH4+jUfVxab5C+PeIhqKc6YTqhmQSp+6Hw9Zpn7risQq
+						eX4XrFAsoPvPcxscK9lARy74qxo5JOoE4OT6or/POCH7DTTxdBt61HaYZzlpFoo5
+						Dqk3ME/XtA2cSUf01Dqeeq0JpqxW0WHbAgMBAAGjggLgMIIC3DAfBgNVHSMEGDAW
+						gBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU7KQCFDuM+zl6I69tYQ+Q
+						BIIzneQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYI
+						KwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYG
+						Z4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5v
+						cmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYp
+						aHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYB
+						BQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMIIBjAYDVR0RBIIBgzCC
+						AX+CEW55c3NhLmxib3JvLmFjLnVrghVhdHRlbmRhbnQubGJvcm8uYWMudWuCGGNv
+						LXR1dG9yLWRldi5sYm9yby5hYy51a4IUY28tdHV0b3IubGJvcm8uYWMudWuCFWRt
+						dS5raXQtY2F0YWxvZ3VlLmNvbYIVZXF1aXBtZW50Lmxib3JvLmFjLnVrghprYy1k
+						ZXZlbG9wbWVudC5sYm9yby5hYy51a4ISa2MtZG11Lmxib3JvLmFjLnVrghhrYy1u
+						ZXdjYXN0bGUubGJvcm8uYWMudWuCGmtjLW5vcnRodW1icmlhLmxib3JvLmFjLnVr
+						ghlrYy1wb3J0c21vdXRoLmxib3JvLmFjLnVrghtuZXdjYXN0bGUua2l0LWNhdGFs
+						b2d1ZS5jb22CFG5ld3dlYnBhLmxib3JvLmFjLnVrghdwcm9qZWN0bGlzdC5sYm9y
+						by5hYy51a4IRd2VicGEubGJvcm8uYWMudWuCFXd3dy5raXQtY2F0YWxvZ3VlLmNv
+						bTANBgkqhkiG9w0BAQUFAAOCAQEAphJCGIqShIxjiFA5nUWXF7HkHLajaEc0HBrJ
+						4MrJ6TtH2GJCBZsr6+p0j47saos465BXpC8UR5VmSwlCJ7E70DUyn2lhKCaJyFO9
+						S/nK5mQjfutwJvtonCIPWKUnDYibrXslgortvBhB8YAJrlrEzSvWDTf9FfeMzTNs
+						ZpQgLiW8vcEZ1hQrb+UrelMV2Z9tjAaFbCFbDFAm6FeEsaMHiG/s65TLHgy9HLdd
+						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>
diff --git a/swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..aa835590
--- /dev/null
+++ b/swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nortcoll.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-28T10:54: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nortcoll.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUDCCAjigAwIBAgIIQ+s4Z37Tk+QwDQYJKoZIhvcNAQEFBQAwPzEgMB4GA1UE
+						CgwXTm9ydG9uIFJhZHN0b2NrIENvbGxlZ2UxGzAZBgNVBAMMEmlkcC5ub3J0Y29s
+						bC5hYy51azAeFw0xMzA2MjYwOTUyNTVaFw0yMzA2MjYwOTUyNTVaMD8xIDAeBgNV
+						BAoMF05vcnRvbiBSYWRzdG9jayBDb2xsZWdlMRswGQYDVQQDDBJpZHAubm9ydGNv
+						bGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH2GL7v3ab
+						MLFWgzBVzSj8VLSGJ9ATCAdxU9rfFTJm/9OWMo13AReVUclXxf56GQo0FJOc39hM
+						6XsyyeZTts2nDDUzg+t0Xibp2UKLSppkuSwVGTqHMaJp7DpUCEluUnhu3ZU/lBwo
+						ZiOb7IGtRvMlTgCkaIlAmvrrGvx09F9AopZdIY6a4kL6Oia8IpIP3pmeRqP7wrG1
+						28kjGbS/4nhAGKvwl+pzBGbnKXPLPXV6xrJB7S4KeS/RotDLgoI9/BOj9CCpjE2U
+						FtrQ3NEkfWhIVlZtJ+9M5YchdhsL1NwiO/ysgeLCOb+PJ0i1hkl7YxPf5oYgk37M
+						kPkontewA0prAgMBAAGjUDBOMB0GA1UdDgQWBBTEMkl+KBelULhBUBgqoQSs3Zk2
+						jzAfBgNVHSMEGDAWgBTEMkl+KBelULhBUBgqoQSs3Zk2jzAMBgNVHRMEBTADAQH/
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCSYXa4gCKN3kYfrj3zI0qlVhdP0lqxbj3NvtbK
+						zt+XYGjOX9/cW51qe7islCZ4jQcBeiq0NKMHHvLSQm38xy0T18VOLplrnXBU+0Uo
+						NnE0ausV72tNdfOz4QjcAnB0IwZRQr4geoBva4pV92l3Ru9UyYzwu0dH1IHc6j6W
+						bHhSmZU3SkxAghaK0RKw+VdI0IEXmAjIXgYvKSp4ERZtQxQiHzDaC6TnINxbJYaL
+						CSul4tUiaGBvrD99sK5xjSXRyT76i+NqkzJme8EXyYH6C+s/pkoragQycIXRTAjo
+						J0oYK7cSzs2XI5pXVxiG7kNJsJQjVrM0wa9wTu+fWkXIg1Pq
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUDCCAjigAwIBAgIIQ+s4Z37Tk+QwDQYJKoZIhvcNAQEFBQAwPzEgMB4GA1UE
+						CgwXTm9ydG9uIFJhZHN0b2NrIENvbGxlZ2UxGzAZBgNVBAMMEmlkcC5ub3J0Y29s
+						bC5hYy51azAeFw0xMzA2MjYwOTUyNTVaFw0yMzA2MjYwOTUyNTVaMD8xIDAeBgNV
+						BAoMF05vcnRvbiBSYWRzdG9jayBDb2xsZWdlMRswGQYDVQQDDBJpZHAubm9ydGNv
+						bGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH2GL7v3ab
+						MLFWgzBVzSj8VLSGJ9ATCAdxU9rfFTJm/9OWMo13AReVUclXxf56GQo0FJOc39hM
+						6XsyyeZTts2nDDUzg+t0Xibp2UKLSppkuSwVGTqHMaJp7DpUCEluUnhu3ZU/lBwo
+						ZiOb7IGtRvMlTgCkaIlAmvrrGvx09F9AopZdIY6a4kL6Oia8IpIP3pmeRqP7wrG1
+						28kjGbS/4nhAGKvwl+pzBGbnKXPLPXV6xrJB7S4KeS/RotDLgoI9/BOj9CCpjE2U
+						FtrQ3NEkfWhIVlZtJ+9M5YchdhsL1NwiO/ysgeLCOb+PJ0i1hkl7YxPf5oYgk37M
+						kPkontewA0prAgMBAAGjUDBOMB0GA1UdDgQWBBTEMkl+KBelULhBUBgqoQSs3Zk2
+						jzAfBgNVHSMEGDAWgBTEMkl+KBelULhBUBgqoQSs3Zk2jzAMBgNVHRMEBTADAQH/
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCSYXa4gCKN3kYfrj3zI0qlVhdP0lqxbj3NvtbK
+						zt+XYGjOX9/cW51qe7islCZ4jQcBeiq0NKMHHvLSQm38xy0T18VOLplrnXBU+0Uo
+						NnE0ausV72tNdfOz4QjcAnB0IwZRQr4geoBva4pV92l3Ru9UyYzwu0dH1IHc6j6W
+						bHhSmZU3SkxAghaK0RKw+VdI0IEXmAjIXgYvKSp4ERZtQxQiHzDaC6TnINxbJYaL
+						CSul4tUiaGBvrD99sK5xjSXRyT76i+NqkzJme8EXyYH6C+s/pkoragQycIXRTAjo
+						J0oYK7cSzs2XI5pXVxiG7kNJsJQjVrM0wa9wTu+fWkXIg1Pq
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nortcoll.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nortcoll.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Norton Radstock College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Norton Radstock College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nortcoll.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kye</md:GivenName>
+    <md:SurName>Pearce-Rees</md:SurName>
+    <md:EmailAddress>mailto:kye.pearce-rees@nortcoll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kye</md:GivenName>
+    <md:SurName>Pearce-Rees</md:SurName>
+    <md:EmailAddress>mailto:kye.pearce-rees@nortcoll.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
new file mode 100644
index 00000000..1845b75c
--- /dev/null
+++ b/swamid-interfederations-2.0/nrc-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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>
+						MIIDtTCCAp2gAwIBAgIJALKKItp/j602MA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEhMB8GA1UEAxMYd3d3Lm5yY3Jlc2VhcmNocHJlc3Mu
+						Y29tMB4XDTExMDExODIyMTkyOFoXDTIxMDExNTIyMTkyOFowgZkxCzAJBgNVBAYT
+						AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEd
+						MBsGA1UEChMUQXR5cG9uIFN5c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBT
+						eXN0ZW1zLCBJbmMuMSEwHwYDVQQDExh3d3cubnJjcmVzZWFyY2hwcmVzcy5jb20w
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcz5rmUAuG5ucWJq6TAKiy
+						jdkO5jrOKk+rUFbtvHqCdEy0ndFUraE+sQO4zuRabXKzI6p7sF090VqDi9NZ4Zq0
+						uK2m6Wuwkzr5DRstBamZXzUZdFZ/NOQxFIQbhx+ZNVx02IlK89CZmzRzaczqgwtd
+						j0IPZY2SpWeZuRfFZ0H6IBI/I5rL+HaokTdZaYgRUasqu7HFdKquN369iP7Qqe7l
+						Yhm9XtVnEMLsHuPy1gNkyOddLdHKt9oKzKkql7IkhcGbE/f4YrKIqxC5SvdSE9cg
+						ih+IO/OAyHn+cS0LqNCECRbdnViUgUaSr5/s9FXTTMsEMtJtgZQyEzGW9B9omLhJ
+						AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADcSQSrkKZG/QL6LSKSG8rKB0BxWNFvO
+						3mEBndEEsioTZzPGzSfuMcEDdICWyILaXN7HraUkTCvSD1N9n/AS8uu+jCoe+f8z
+						cV3f15LjxYyZI9ZmO9eixGA2huK2LsRzAj93TWYK7Q0CuZrTq/3J/vJ+xvM2habG
+						PToSEnpA/ALGVSXSxGpLJYn84qX9ub0yX1yYNmleylRkHqFwYHvdU5Hk7UZdrCKZ
+						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>
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
new file mode 100644
index 00000000..7590c0ca
--- /dev/null
+++ b/swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,64 @@
+<?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">
+http://cofre.reuna.cl/index.php/es/reglas-federacion
+</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">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">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/nte.gemtech.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..4f01f05b
--- /dev/null
+++ b/swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml
@@ -0,0 +1,92 @@
+<?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>
+      <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="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>
+					      MIIDJDCCAgygAwIBAgIVAJZdt1xPd7UWKJgii2kanwcKApotMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDm50ZS5nZW10ZWNoLmZyMB4XDTA5MDUyMDE3MjgyNFoX
+DTI5MDUyMDE3MjgyNFowGTEXMBUGA1UEAxMObnRlLmdlbXRlY2guZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4iCTgrLcSAZX5/Lvf3AIy7IUEL0dH
+WFyInLn9KME0MwePaECP/y7/GkdmfseeUUvEXPVgEIviQjgqN46wW0dg4G+CdBhw
+VLr+msYPS5upRMnmGuhtyovd425MhUBMRPn0ugicPwQF2u7wqM27SsimUUPZojZj
+IZ4pB244wrF+iFAcwPhvQo7pzEi5nzSisrWhVD3oxYp2nCwNQGsl6ClGr8gUeu8/
+uIAuwP5gLjBV4WLlObeDw3oudCc8RhBtEHevmcO10TAo67Ny7LT+4hKC+OV79sAQ
+us8coX2KRr2nqdCYdIKuhtYmaoZdi44PcdfGPzqgQvfsJYGhllVED+LrAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDm50ZS5nZW10ZWNoLmZyhiVodHRwczovL250ZS5nZW10
+ZWNoLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSiUapEWm278Sxm5q+fQP2N
+STunvjANBgkqhkiG9w0BAQUFAAOCAQEAe5xGN3CE9neVaPtex7sVpzIkNqtkoHWN
+jtDNpIWy+Uyv8eO9iBsdufVxmkCznTOqDggis3g6AeSHzsy2+LILeuIOq1hXcHXR
+O1WbkwBXfOzgEokck5HY/n4oWyJGnL9zoo6hE5GnG6sOuotxoquUO1jM/nEXfH+Y
+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>
+					      MIIDJDCCAgygAwIBAgIVAJZdt1xPd7UWKJgii2kanwcKApotMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDm50ZS5nZW10ZWNoLmZyMB4XDTA5MDUyMDE3MjgyNFoX
+DTI5MDUyMDE3MjgyNFowGTEXMBUGA1UEAxMObnRlLmdlbXRlY2guZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4iCTgrLcSAZX5/Lvf3AIy7IUEL0dH
+WFyInLn9KME0MwePaECP/y7/GkdmfseeUUvEXPVgEIviQjgqN46wW0dg4G+CdBhw
+VLr+msYPS5upRMnmGuhtyovd425MhUBMRPn0ugicPwQF2u7wqM27SsimUUPZojZj
+IZ4pB244wrF+iFAcwPhvQo7pzEi5nzSisrWhVD3oxYp2nCwNQGsl6ClGr8gUeu8/
+uIAuwP5gLjBV4WLlObeDw3oudCc8RhBtEHevmcO10TAo67Ny7LT+4hKC+OV79sAQ
+us8coX2KRr2nqdCYdIKuhtYmaoZdi44PcdfGPzqgQvfsJYGhllVED+LrAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDm50ZS5nZW10ZWNoLmZyhiVodHRwczovL250ZS5nZW10
+ZWNoLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSiUapEWm278Sxm5q+fQP2N
+STunvjANBgkqhkiG9w0BAQUFAAOCAQEAe5xGN3CE9neVaPtex7sVpzIkNqtkoHWN
+jtDNpIWy+Uyv8eO9iBsdufVxmkCznTOqDggis3g6AeSHzsy2+LILeuIOq1hXcHXR
+O1WbkwBXfOzgEokck5HY/n4oWyJGnL9zoo6hE5GnG6sOuotxoquUO1jM/nEXfH+Y
+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://unknown.site.com</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/o-las.net-simplesaml.xml b/swamid-interfederations-2.0/o-las.net-simplesaml.xml
new file mode 100644
index 00000000..1d48f1ce
--- /dev/null
+++ b/swamid-interfederations-2.0/o-las.net-simplesaml.xml
@@ -0,0 +1,94 @@
+<?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>
+						MIIEjDCCA3SgAwIBAgIJAOlTCyllHsJlMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYD
+						VQQGEwJJRTEPMA0GA1UECBMGR2Fsd2F5MQ8wDQYDVQQHEwZHYWx3YXkxGTAXBgNV
+						BAoTEFJpc2tXaXplIExpbWl0ZWQxEjAQBgNVBAMTCW8tbGFzLm5ldDEqMCgGCSqG
+						SIb3DQEJARYbc3VwcG9ydEBlc3NlbnRpYWxza2lsbHouY29tMB4XDTEzMDIxNTEy
+						MTMzOVoXDTIzMDIxMzEyMTMzOVowgYoxCzAJBgNVBAYTAklFMQ8wDQYDVQQIEwZH
+						YWx3YXkxDzANBgNVBAcTBkdhbHdheTEZMBcGA1UEChMQUmlza1dpemUgTGltaXRl
+						ZDESMBAGA1UEAxMJby1sYXMubmV0MSowKAYJKoZIhvcNAQkBFhtzdXBwb3J0QGVz
+						c2VudGlhbHNraWxsei5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCzBw8unrlJzrEx1ScoRXbGY38ubsh1jyFdOs1uvgiDNNG+KLc9Pjwre65KTnDY
+						hyu+EvFdD9AVoYPRttD9zqCeD19I1TIy22idIRriJGcX0SCs3Dq8w2N+FJoyy2p1
+						G+47j4CY85Qzf797shUA/eTapnFbuQruS2PiLrx1uSx3HEIXNSYj0HyxUP7Cx8Ru
+						MROnYnLtqceX2TzZDbA+1T+rhxIxsiSRG+UJRuHuOqsP0ysaIh9bYunTJRIp5eZB
+						UdlxKEn8/vHKO1Q7j3PG7semIP48HLI741F4xHwnb7juU/L5jBc/mDUUuYcJO7PO
+						dwJUBre6uvZCTsvQuH1nsVY9AgMBAAGjgfIwge8wHQYDVR0OBBYEFKzwDC8hO6M7
+						hPFSjiLQNoTwe8l3MIG/BgNVHSMEgbcwgbSAFKzwDC8hO6M7hPFSjiLQNoTwe8l3
+						oYGQpIGNMIGKMQswCQYDVQQGEwJJRTEPMA0GA1UECBMGR2Fsd2F5MQ8wDQYDVQQH
+						EwZHYWx3YXkxGTAXBgNVBAoTEFJpc2tXaXplIExpbWl0ZWQxEjAQBgNVBAMTCW8t
+						bGFzLm5ldDEqMCgGCSqGSIb3DQEJARYbc3VwcG9ydEBlc3NlbnRpYWxza2lsbHou
+						Y29tggkA6VMLKWUewmUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
+						PI2idOloyeT1CbmfwW8PYhiV2G/HfA2/y/vwQ4C8XP6fvhbY9g9YmRI3lC7CbJjS
+						fVYbyWr4Nxc7ZHrpJAfTN2ZvkF08wKldoB5fY72G50tLekoDobhwoW9LXPS9aqeG
+						xtl8wKCKoPT+59pMroQtEfdm656QOXGcoERNOzFpa6OwHX8x11TjQ3PiDCGNCpxU
+						kaa2zts1SP2Y2bsCzqpD78gA+QvpBnnjljTXqQtl9TVtY/0+5ht4Qh/Jg8VYSYYy
+						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>
+						MIIEjDCCA3SgAwIBAgIJAOlTCyllHsJlMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYD
+						VQQGEwJJRTEPMA0GA1UECBMGR2Fsd2F5MQ8wDQYDVQQHEwZHYWx3YXkxGTAXBgNV
+						BAoTEFJpc2tXaXplIExpbWl0ZWQxEjAQBgNVBAMTCW8tbGFzLm5ldDEqMCgGCSqG
+						SIb3DQEJARYbc3VwcG9ydEBlc3NlbnRpYWxza2lsbHouY29tMB4XDTEzMDIxNTEy
+						MTMzOVoXDTIzMDIxMzEyMTMzOVowgYoxCzAJBgNVBAYTAklFMQ8wDQYDVQQIEwZH
+						YWx3YXkxDzANBgNVBAcTBkdhbHdheTEZMBcGA1UEChMQUmlza1dpemUgTGltaXRl
+						ZDESMBAGA1UEAxMJby1sYXMubmV0MSowKAYJKoZIhvcNAQkBFhtzdXBwb3J0QGVz
+						c2VudGlhbHNraWxsei5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCzBw8unrlJzrEx1ScoRXbGY38ubsh1jyFdOs1uvgiDNNG+KLc9Pjwre65KTnDY
+						hyu+EvFdD9AVoYPRttD9zqCeD19I1TIy22idIRriJGcX0SCs3Dq8w2N+FJoyy2p1
+						G+47j4CY85Qzf797shUA/eTapnFbuQruS2PiLrx1uSx3HEIXNSYj0HyxUP7Cx8Ru
+						MROnYnLtqceX2TzZDbA+1T+rhxIxsiSRG+UJRuHuOqsP0ysaIh9bYunTJRIp5eZB
+						UdlxKEn8/vHKO1Q7j3PG7semIP48HLI741F4xHwnb7juU/L5jBc/mDUUuYcJO7PO
+						dwJUBre6uvZCTsvQuH1nsVY9AgMBAAGjgfIwge8wHQYDVR0OBBYEFKzwDC8hO6M7
+						hPFSjiLQNoTwe8l3MIG/BgNVHSMEgbcwgbSAFKzwDC8hO6M7hPFSjiLQNoTwe8l3
+						oYGQpIGNMIGKMQswCQYDVQQGEwJJRTEPMA0GA1UECBMGR2Fsd2F5MQ8wDQYDVQQH
+						EwZHYWx3YXkxGTAXBgNVBAoTEFJpc2tXaXplIExpbWl0ZWQxEjAQBgNVBAMTCW8t
+						bGFzLm5ldDEqMCgGCSqGSIb3DQEJARYbc3VwcG9ydEBlc3NlbnRpYWxza2lsbHou
+						Y29tggkA6VMLKWUewmUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
+						PI2idOloyeT1CbmfwW8PYhiV2G/HfA2/y/vwQ4C8XP6fvhbY9g9YmRI3lC7CbJjS
+						fVYbyWr4Nxc7ZHrpJAfTN2ZvkF08wKldoB5fY72G50tLekoDobhwoW9LXPS9aqeG
+						xtl8wKCKoPT+59pMroQtEfdm656QOXGcoERNOzFpa6OwHX8x11TjQ3PiDCGNCpxU
+						kaa2zts1SP2Y2bsCzqpD78gA+QvpBnnjljTXqQtl9TVtY/0+5ht4Qh/Jg8VYSYYy
+						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>
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
new file mode 100644
index 00000000..bcddc37f
--- /dev/null
+++ b/swamid-interfederations-2.0/oa-idp.wlv.ac.uk-oala-metadata.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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>
+						MIIEbTCCA1WgAwIBAgIQRbWDhc0R8UaLGXPl9rxLvTANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDgwNTAwMDAwMFoXDTE2MDgwNDIzNTk1OVowPjEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBvYS1pZHAud2x2
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyqgaC0+Mj/Vo
+						DzjH2QdqKLTGXwb7yVTNoI13TXq5/l+QvC9euPlXgEs1QNCEOzB8s3CyzIiE0EHM
+						uD8HzuHBgke1+NgcVoMQItPR0VbvEFyfRZSETifGd6YQgIwsV8quVZqJyTDSGekR
+						7SMjfuP1GNhGalikQsl0zkjyvpMbmDfMJwIdy2JdBihO1qgxTl/HtXlEG6sWQ3ue
+						EY4xeGVjdX9Hfy8kYGT+wFNREWPqd1lD+NQ7vX2O+HLrSTW6XF7DTr33OCEgs4UK
+						cYvxQcyZWQCgAwOU4mt3M24AtYMDd/yXhUJCmR6WbnzQDHFQhEex/mJjXIspqU2d
+						pzupx+l2RQIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+						6pDjue0wHQYDVR0OBBYEFG1BhhHLGjmAtOUN6kJL0e0sZ3oJMA4GA1UdDwEB/wQE
+						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+						cC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBvYS1pZHAud2x2LmFjLnVrMA0G
+						CSqGSIb3DQEBBQUAA4IBAQAuvgffeCZCPUXbXW93/kEnGLP+Lx3dcDPX+V7rspdR
+						axX0WtDbRGP2RtjQsHFS+41mti/J3A4virIpZ6ILPu0Fu0xOsT1IoDRb3eEg2Mqn
+						mI+jSRc7CdkaDYMA047pXL9bCTP9GiHfyVH0/2PyGFt8cdNDTPDUmfWT8df588HA
+						0tkCmdWAVq5OZPFMZ4sXFsmFrV2LXx11JP7xz3RbIc634pQsVo5bK7AG4JoUTiWm
+						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>
+						MIIEbTCCA1WgAwIBAgIQRbWDhc0R8UaLGXPl9rxLvTANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDgwNTAwMDAwMFoXDTE2MDgwNDIzNTk1OVowPjEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBvYS1pZHAud2x2
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyqgaC0+Mj/Vo
+						DzjH2QdqKLTGXwb7yVTNoI13TXq5/l+QvC9euPlXgEs1QNCEOzB8s3CyzIiE0EHM
+						uD8HzuHBgke1+NgcVoMQItPR0VbvEFyfRZSETifGd6YQgIwsV8quVZqJyTDSGekR
+						7SMjfuP1GNhGalikQsl0zkjyvpMbmDfMJwIdy2JdBihO1qgxTl/HtXlEG6sWQ3ue
+						EY4xeGVjdX9Hfy8kYGT+wFNREWPqd1lD+NQ7vX2O+HLrSTW6XF7DTr33OCEgs4UK
+						cYvxQcyZWQCgAwOU4mt3M24AtYMDd/yXhUJCmR6WbnzQDHFQhEex/mJjXIspqU2d
+						pzupx+l2RQIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+						6pDjue0wHQYDVR0OBBYEFG1BhhHLGjmAtOUN6kJL0e0sZ3oJMA4GA1UdDwEB/wQE
+						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+						cC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBvYS1pZHAud2x2LmFjLnVrMA0G
+						CSqGSIb3DQEBBQUAA4IBAQAuvgffeCZCPUXbXW93/kEnGLP+Lx3dcDPX+V7rspdR
+						axX0WtDbRGP2RtjQsHFS+41mti/J3A4virIpZ6ILPu0Fu0xOsT1IoDRb3eEg2Mqn
+						mI+jSRc7CdkaDYMA047pXL9bCTP9GiHfyVH0/2PyGFt8cdNDTPDUmfWT8df588HA
+						0tkCmdWAVq5OZPFMZ4sXFsmFrV2LXx11JP7xz3RbIc634pQsVo5bK7AG4JoUTiWm
+						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>
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
new file mode 100644
index 00000000..6136af7b
--- /dev/null
+++ b/swamid-interfederations-2.0/oa-idp22.wlv.ac.uk-oala-metadata.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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>
+						MIIDWDCCAkCgAwIBAgIICo+mehMlNtowDQYJKoZIhvcNAQEFBQAwQzEkMCIGA1UE
+						CgwbVW5pdmVyc2l0eSBvZiBXb2x2ZXJoYW1wdG9uMRswGQYDVQQDDBJvYS1pZHAy
+						Mi53bHYuYWMudWswHhcNMTUwMTIwMTI1ODE5WhcNMjUwMTIwMTI1ODE5WjBDMSQw
+						IgYDVQQKDBtVbml2ZXJzaXR5IG9mIFdvbHZlcmhhbXB0b24xGzAZBgNVBAMMEm9h
+						LWlkcDIyLndsdi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AIm+DWXZjRBVNcSwWm76ONZ4PP97SOtfI9xLxSul1B6VGbaBj9psMTA83h9Thwyi
+						hnu4qql1o58dtH7u2Du2W9bIR0K3BT3Whn5N+oTB6dakZ5TIp27cHnZfedbQ3xfX
+						Ovg+eXl0hQieICaF5NW2zSJGKacp+cckbR6USlUMjVAmu8T+Q7afw2k3do5IyNF4
+						8FnuSL/S6PtwpbLMl5+DkQKS2pNXx76jqfGwoJBiXzxR43vyzIz6Lz6foh7B+sCH
+						PFB9w9nKQOSW0RTlUTSlNIRrFKYS8jBmGg0SYCTCqAOZQd/S2wDoNdxotnUh045c
+						PlS66duNqlV/BcMhGZriVocCAwEAAaNQME4wHQYDVR0OBBYEFCCaekjMQckGDHAs
+						uGTK2YWenmVqMB8GA1UdIwQYMBaAFCCaekjMQckGDHAsuGTK2YWenmVqMAwGA1Ud
+						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGT5NNSjh5DLoY11NupSxaqm2kXx
+						Or1pIN4QgEPl5KKBxfnBGQSzzACg+pFzzhq7PS/1D1/ctmTAowDH7RNQLRNKMcq1
+						hD9bUfVfcItmYyR6RLFFX1TTvf94W2UbfVvblMbBY1+BLkPgRO7YFxGuhcdXTh9t
+						yBnW7SQuYB8OadqOhgnBxGohFnwIAxMzsQTBi0rd4ujeKiZxoMj27dzH0lIgKC7D
+						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>
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
new file mode 100644
index 00000000..8850a138
--- /dev/null
+++ b/swamid-interfederations-2.0/oa.pep-web.org-oa-metadata.xml
@@ -0,0 +1,85 @@
+<?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>
+						MIID0DCCArigAwIBAgIJAKHVd8LSwH+3MA0GCSqGSIb3DQEBBQUAME4xMzAxBgNV
+						BAoTKlBzeWNob2FuYWx5dGljIEVsZWN0cm9uaWMgUHVibGlzaGluZywgSW5jLjEX
+						MBUGA1UEAxMOb2EucGVwLXdlYi5vcmcwHhcNMTIxMjEwMTUwNjI5WhcNMjIxMjA4
+						MTUwNjI5WjBOMTMwMQYDVQQKEypQc3ljaG9hbmFseXRpYyBFbGVjdHJvbmljIFB1
+						Ymxpc2hpbmcsIEluYy4xFzAVBgNVBAMTDm9hLnBlcC13ZWIub3JnMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvxjOhHh3BRMA7mPHoLC5a5JrtjuFihOA
+						5419SfkRPVg6l5WaH6J2KSbRsMp27NEk7AAwGfwsqMh2FYgmrelQQ3e69++VPnUe
+						vD+/hyo5d97KueVlktu7T7qxewBJr31k6l//SZgKWhOvN8hvMGMtul2SUtob8x1w
+						wTv5bh6OCXE7AzJj7VXWLAVrzChuXo1r3xxC1GLi/NpCQLYwCsUVIfHByw2+omEF
+						nA6wLRxTezFdKnGmrl0Zutw/acf19nCZZLD6N84Qorko3sON8qwm1+cnuJyyKeW1
+						MtKbZuULd7MnePyCbH771qy33WZeOsRFi3QDrYJAfFpqAKFwM9W7MwIDAQABo4Gw
+						MIGtMB0GA1UdDgQWBBStEHOsouCRTUqh8vj2LJ+XIL9R3TB+BgNVHSMEdzB1gBSt
+						EHOsouCRTUqh8vj2LJ+XIL9R3aFSpFAwTjEzMDEGA1UEChMqUHN5Y2hvYW5hbHl0
+						aWMgRWxlY3Ryb25pYyBQdWJsaXNoaW5nLCBJbmMuMRcwFQYDVQQDEw5vYS5wZXAt
+						d2ViLm9yZ4IJAKHVd8LSwH+3MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAEaj7/jzs4v2do/oClsw9dhcIDbFLFQW2AIxM7Fkfk2BaDN1mxQGFNE1sMk+
+						bi0B1Xqge7EZOEumtjpWDmJrxkZnIO0cyUDUAloo1vBnm4EcUlcJWptXbqh+Esgm
+						XNg7/3xZYmafTSCLqI/JPkgWAoBtQNtmJLjmFLr9ypn4D90HD6jH0pf5MEQbEIG0
+						3GPCgUTHBYi3HLtxWAZFhJU4hqNAik7h9/Ja4ekHPBymeb17XD9sR876/l1ofgUo
+						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>
+						MIID0DCCArigAwIBAgIJAKHVd8LSwH+3MA0GCSqGSIb3DQEBBQUAME4xMzAxBgNV
+						BAoTKlBzeWNob2FuYWx5dGljIEVsZWN0cm9uaWMgUHVibGlzaGluZywgSW5jLjEX
+						MBUGA1UEAxMOb2EucGVwLXdlYi5vcmcwHhcNMTIxMjEwMTUwNjI5WhcNMjIxMjA4
+						MTUwNjI5WjBOMTMwMQYDVQQKEypQc3ljaG9hbmFseXRpYyBFbGVjdHJvbmljIFB1
+						Ymxpc2hpbmcsIEluYy4xFzAVBgNVBAMTDm9hLnBlcC13ZWIub3JnMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvxjOhHh3BRMA7mPHoLC5a5JrtjuFihOA
+						5419SfkRPVg6l5WaH6J2KSbRsMp27NEk7AAwGfwsqMh2FYgmrelQQ3e69++VPnUe
+						vD+/hyo5d97KueVlktu7T7qxewBJr31k6l//SZgKWhOvN8hvMGMtul2SUtob8x1w
+						wTv5bh6OCXE7AzJj7VXWLAVrzChuXo1r3xxC1GLi/NpCQLYwCsUVIfHByw2+omEF
+						nA6wLRxTezFdKnGmrl0Zutw/acf19nCZZLD6N84Qorko3sON8qwm1+cnuJyyKeW1
+						MtKbZuULd7MnePyCbH771qy33WZeOsRFi3QDrYJAfFpqAKFwM9W7MwIDAQABo4Gw
+						MIGtMB0GA1UdDgQWBBStEHOsouCRTUqh8vj2LJ+XIL9R3TB+BgNVHSMEdzB1gBSt
+						EHOsouCRTUqh8vj2LJ+XIL9R3aFSpFAwTjEzMDEGA1UEChMqUHN5Y2hvYW5hbHl0
+						aWMgRWxlY3Ryb25pYyBQdWJsaXNoaW5nLCBJbmMuMRcwFQYDVQQDEw5vYS5wZXAt
+						d2ViLm9yZ4IJAKHVd8LSwH+3MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAEaj7/jzs4v2do/oClsw9dhcIDbFLFQW2AIxM7Fkfk2BaDN1mxQGFNE1sMk+
+						bi0B1Xqge7EZOEumtjpWDmJrxkZnIO0cyUDUAloo1vBnm4EcUlcJWptXbqh+Esgm
+						XNg7/3xZYmafTSCLqI/JPkgWAoBtQNtmJLjmFLr9ypn4D90HD6jH0pf5MEQbEIG0
+						3GPCgUTHBYi3HLtxWAZFhJU4hqNAik7h9/Ja4ekHPBymeb17XD9sR876/l1ofgUo
+						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>
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
new file mode 100644
index 00000000..9e0fdaaf
--- /dev/null
+++ b/swamid-interfederations-2.0/oala-runtime.eastleigh.ac.uk-oala-metadata.xml
@@ -0,0 +1,79 @@
+<?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>
+      <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>
+						MIIDWDCCAkCgAwIBAgIIFsnOesAaesswDQYJKoZIhvcNAQEFBQAwQzEaMBgGA1UE
+						CgwRRWFzdGxlaWdoIENvbGxlZ2UxJTAjBgNVBAMMHG9hbGEtcnVudGltZS5lYXN0
+						bGVpZ2guYWMudWswHhcNMTIwMjI0MTYxMzQ2WhcNMjIwMjI0MTYxMzQ2WjBDMRow
+						GAYDVQQKDBFFYXN0bGVpZ2ggQ29sbGVnZTElMCMGA1UEAwwcb2FsYS1ydW50aW1l
+						LmVhc3RsZWlnaC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AJbpGbVq+3W87P3LSE9yvoZPJWOQpvodKGXQvZpgCpw42A7z9w3DiW36ssWDOhbN
+						rS+E1Inklx6meSmLCuTYhRVNL8xBnaqL6zWfIHnO00ELD5ZhOMWzKQQ5RNm6HbF5
+						8SdPVqbwt4IVq2NhqvH7Om5AruMBXp/S8r4v8ajgnp85gZ7XgGNoCacSi6M5ykfr
+						w5LMOlE7vXHF9ysFyGLPcidUZvE4QDChNxX0FZWcqHwfAhuj1CEunry9STQHIXkr
+						ypcE3I5Xg4OA9qRC4J7wyHkG5uiJImjYHcmnM/3EzbL94wT9Gd8ddYrlN9E9tray
+						Odsf7pPpbVAmKNNxeQo3FocCAwEAAaNQME4wHQYDVR0OBBYEFJDbbznYPa+ALKbL
+						IigXdI0UE13lMB8GA1UdIwQYMBaAFJDbbznYPa+ALKbLIigXdI0UE13lMAwGA1Ud
+						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGkxUw38I8xJdFvH3/j+GY1GulB5
+						vAN7o+JTPxXToGx9O6mQvv5ZKT/TmVmGHz7CdeToVW1JWICQGCm9pXCjIZoJs3cJ
+						+hdHncZrUPm0ZkibNNd2Ix4TSs7NAm0aaYlgTR37+8Gpl67/rjm7psuUZL5UBtST
+						SxWzN84a0Zpsx8lZvkt0aVCY3jJpbmYRaDalkG1DJAEH6AqdF18GmTS9c8CN75uB
+						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>
+						MIIDWDCCAkCgAwIBAgIIFsnOesAaesswDQYJKoZIhvcNAQEFBQAwQzEaMBgGA1UE
+						CgwRRWFzdGxlaWdoIENvbGxlZ2UxJTAjBgNVBAMMHG9hbGEtcnVudGltZS5lYXN0
+						bGVpZ2guYWMudWswHhcNMTIwMjI0MTYxMzQ2WhcNMjIwMjI0MTYxMzQ2WjBDMRow
+						GAYDVQQKDBFFYXN0bGVpZ2ggQ29sbGVnZTElMCMGA1UEAwwcb2FsYS1ydW50aW1l
+						LmVhc3RsZWlnaC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AJbpGbVq+3W87P3LSE9yvoZPJWOQpvodKGXQvZpgCpw42A7z9w3DiW36ssWDOhbN
+						rS+E1Inklx6meSmLCuTYhRVNL8xBnaqL6zWfIHnO00ELD5ZhOMWzKQQ5RNm6HbF5
+						8SdPVqbwt4IVq2NhqvH7Om5AruMBXp/S8r4v8ajgnp85gZ7XgGNoCacSi6M5ykfr
+						w5LMOlE7vXHF9ysFyGLPcidUZvE4QDChNxX0FZWcqHwfAhuj1CEunry9STQHIXkr
+						ypcE3I5Xg4OA9qRC4J7wyHkG5uiJImjYHcmnM/3EzbL94wT9Gd8ddYrlN9E9tray
+						Odsf7pPpbVAmKNNxeQo3FocCAwEAAaNQME4wHQYDVR0OBBYEFJDbbznYPa+ALKbL
+						IigXdI0UE13lMB8GA1UdIwQYMBaAFJDbbznYPa+ALKbLIigXdI0UE13lMAwGA1Ud
+						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGkxUw38I8xJdFvH3/j+GY1GulB5
+						vAN7o+JTPxXToGx9O6mQvv5ZKT/TmVmGHz7CdeToVW1JWICQGCm9pXCjIZoJs3cJ
+						+hdHncZrUPm0ZkibNNd2Ix4TSs7NAm0aaYlgTR37+8Gpl67/rjm7psuUZL5UBtST
+						SxWzN84a0Zpsx8lZvkt0aVCY3jJpbmYRaDalkG1DJAEH6AqdF18GmTS9c8CN75uB
+						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>
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
new file mode 100644
index 00000000..4bb22d8a
--- /dev/null
+++ b/swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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>
+						MIIDVjCCAj6gAwIBAgIIU8+cSxqyjekwDQYJKoZIhvcNAQEFBQAwQjEiMCAGA1UE
+						CgwZQXJjaGl0ZWN0dXJhbCBBc3NvY2lhdGlvbjEcMBoGA1UEAwwTb2FsYS5hYXNj
+						aG9vbC5hYy51azAeFw0xNDAyMDUxMjU0MjFaFw0yNDAyMDUxMjU0MjFaMEIxIjAg
+						BgNVBAoMGUFyY2hpdGVjdHVyYWwgQXNzb2NpYXRpb24xHDAaBgNVBAMME29hbGEu
+						YWFzY2hvb2wuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCN
+						6u0fQexpAbYeL/juhqSYF3kRc6sf9w3ycYdDTx5r8k/3OwklSYshGn6qwJDS7aS4
+						QJy2dkFzAaSCycdoEPTRfkcpIQ9nfT9ABzngbDIjYIvCMT7xMyZZCelO6NDuK5F4
+						NFWN0vB357o3rce6gzmKY6tvIJ4C61yn2SArKo3VXTJSiLWtjVTTWWMuxK+DMmdD
+						wxgzB1tiQhGq2aNZHHSMuqri1wCegVB8awO8vn8sVrpd+OxubDS3Me5y4WlY4grs
+						XqfrpFtHuQon30WhFgLqXjm5M2Htth44J2aRWvNwQ9UbcUAPDu8zn1EEWjGoeT4U
+						KBo2hLbd5xckdJqLhBtvAgMBAAGjUDBOMB0GA1UdDgQWBBTfbelHaYpCBZW2wcu5
+						R3SX1LLrejAfBgNVHSMEGDAWgBTfbelHaYpCBZW2wcu5R3SX1LLrejAMBgNVHRME
+						BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBNPyhqpXFNU8s9HuXtFRXCraLXUYqW
+						Cg6Qq9ArXhdGBaPDLI33B5MFfxrK207ZszoC8NsBRU2TGhUs2TcYQYBnCEBjpVNs
+						T9Pl+HT+1RAqFDXJfz8vnva16QFyohJQcOXgwbKcasy3v4TFOBLlQSYUN6gJyPDz
+						RbuvCdEwIL74sLpZmHbGtF88nINKnPkRlQXIqCnnQg3nfL/qBd67lt6Ih4wyPCkX
+						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>
+						MIIDVjCCAj6gAwIBAgIIU8+cSxqyjekwDQYJKoZIhvcNAQEFBQAwQjEiMCAGA1UE
+						CgwZQXJjaGl0ZWN0dXJhbCBBc3NvY2lhdGlvbjEcMBoGA1UEAwwTb2FsYS5hYXNj
+						aG9vbC5hYy51azAeFw0xNDAyMDUxMjU0MjFaFw0yNDAyMDUxMjU0MjFaMEIxIjAg
+						BgNVBAoMGUFyY2hpdGVjdHVyYWwgQXNzb2NpYXRpb24xHDAaBgNVBAMME29hbGEu
+						YWFzY2hvb2wuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCN
+						6u0fQexpAbYeL/juhqSYF3kRc6sf9w3ycYdDTx5r8k/3OwklSYshGn6qwJDS7aS4
+						QJy2dkFzAaSCycdoEPTRfkcpIQ9nfT9ABzngbDIjYIvCMT7xMyZZCelO6NDuK5F4
+						NFWN0vB357o3rce6gzmKY6tvIJ4C61yn2SArKo3VXTJSiLWtjVTTWWMuxK+DMmdD
+						wxgzB1tiQhGq2aNZHHSMuqri1wCegVB8awO8vn8sVrpd+OxubDS3Me5y4WlY4grs
+						XqfrpFtHuQon30WhFgLqXjm5M2Htth44J2aRWvNwQ9UbcUAPDu8zn1EEWjGoeT4U
+						KBo2hLbd5xckdJqLhBtvAgMBAAGjUDBOMB0GA1UdDgQWBBTfbelHaYpCBZW2wcu5
+						R3SX1LLrejAfBgNVHSMEGDAWgBTfbelHaYpCBZW2wcu5R3SX1LLrejAMBgNVHRME
+						BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBNPyhqpXFNU8s9HuXtFRXCraLXUYqW
+						Cg6Qq9ArXhdGBaPDLI33B5MFfxrK207ZszoC8NsBRU2TGhUs2TcYQYBnCEBjpVNs
+						T9Pl+HT+1RAqFDXJfz8vnva16QFyohJQcOXgwbKcasy3v4TFOBLlQSYUN6gJyPDz
+						RbuvCdEwIL74sLpZmHbGtF88nINKnPkRlQXIqCnnQg3nfL/qBd67lt6Ih4wyPCkX
+						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>
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
new file mode 100644
index 00000000..27200256
--- /dev/null
+++ b/swamid-interfederations-2.0/oala.surrey.ac.uk-oala-metadata.xml
@@ -0,0 +1,80 @@
+<?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>
+      <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>
+						MIIDSDCCAjCgAwIBAgIITOCMDokwhbkwDQYJKoZIhvcNAQEFBQAwOzEdMBsGA1UE
+						CgwUVW5pdmVyc2l0eSBvZiBTdXJyZXkxGjAYBgNVBAMMEW9hbGEuc3VycmV5LmFj
+						LnVrMB4XDTEyMDMyOTExMjUyM1oXDTIyMDMyOTExMjUyM1owOzEdMBsGA1UECgwU
+						VW5pdmVyc2l0eSBvZiBTdXJyZXkxGjAYBgNVBAMMEW9hbGEuc3VycmV5LmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlQUcfoCNygSZkRb1rvMz
+						qIdbaZhcLek/W5QweKu1cWymyjBOFHK2Ioj3gFotYvLqp/CwaX9Ku++urHOtfW4C
+						FdYt2uZi34Frap5Q34QiDcIfSpm+tb8YmsuJczxTfJ7Azywd3uEFjPqcNKyRJPMC
+						j8aoMdcpjf8JwjO97ngErjEdjdlaehVTk1jhylDj40UOXdIuuKiHTo+rC9/fHN87
+						5Iz1xrANl4rb5JdV96iXZamGjXYMXhlJ70JIGkerWyW2fAggDTmrfL5vWiKD4SnJ
+						2yTz5N5OA7PARBZSmyiri9dWuiB0hled2Vjzee2FDKEfuBZ04PRku6ZsljETVDmO
+						nQIDAQABo1AwTjAdBgNVHQ4EFgQUsVamXCDZmaPx60a0iF4Ra5i4X0gwHwYDVR0j
+						BBgwFoAUsVamXCDZmaPx60a0iF4Ra5i4X0gwDAYDVR0TBAUwAwEB/zANBgkqhkiG
+						9w0BAQUFAAOCAQEAeOQBpi5xhTBE6nbSLMoxTWl04TFjyNx3efNdK9v6yJthudfJ
+						njM/yh51DlNLclhx1DG0mxSaqrLi3Z/ZccYsKtZJVLWD0BaNQyXegPG4eyOLH4sq
+						bmFhvrffVsmifynPezbM2QSDcz3nHZZQEUQg+j4THrqSka4oJEYlMtsgTRjbrFYf
+						CeUkTgB5mVNUfTS23sXp544zCo0W8kUF5ViUNuNL6p2XPRpXnrmVePgz1TU2egd2
+						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>
+						MIIDSDCCAjCgAwIBAgIITOCMDokwhbkwDQYJKoZIhvcNAQEFBQAwOzEdMBsGA1UE
+						CgwUVW5pdmVyc2l0eSBvZiBTdXJyZXkxGjAYBgNVBAMMEW9hbGEuc3VycmV5LmFj
+						LnVrMB4XDTEyMDMyOTExMjUyM1oXDTIyMDMyOTExMjUyM1owOzEdMBsGA1UECgwU
+						VW5pdmVyc2l0eSBvZiBTdXJyZXkxGjAYBgNVBAMMEW9hbGEuc3VycmV5LmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlQUcfoCNygSZkRb1rvMz
+						qIdbaZhcLek/W5QweKu1cWymyjBOFHK2Ioj3gFotYvLqp/CwaX9Ku++urHOtfW4C
+						FdYt2uZi34Frap5Q34QiDcIfSpm+tb8YmsuJczxTfJ7Azywd3uEFjPqcNKyRJPMC
+						j8aoMdcpjf8JwjO97ngErjEdjdlaehVTk1jhylDj40UOXdIuuKiHTo+rC9/fHN87
+						5Iz1xrANl4rb5JdV96iXZamGjXYMXhlJ70JIGkerWyW2fAggDTmrfL5vWiKD4SnJ
+						2yTz5N5OA7PARBZSmyiri9dWuiB0hled2Vjzee2FDKEfuBZ04PRku6ZsljETVDmO
+						nQIDAQABo1AwTjAdBgNVHQ4EFgQUsVamXCDZmaPx60a0iF4Ra5i4X0gwHwYDVR0j
+						BBgwFoAUsVamXCDZmaPx60a0iF4Ra5i4X0gwDAYDVR0TBAUwAwEB/zANBgkqhkiG
+						9w0BAQUFAAOCAQEAeOQBpi5xhTBE6nbSLMoxTWl04TFjyNx3efNdK9v6yJthudfJ
+						njM/yh51DlNLclhx1DG0mxSaqrLi3Z/ZccYsKtZJVLWD0BaNQyXegPG4eyOLH4sq
+						bmFhvrffVsmifynPezbM2QSDcz3nHZZQEUQg+j4THrqSka4oJEYlMtsgTRjbrFYf
+						CeUkTgB5mVNUfTS23sXp544zCo0W8kUF5ViUNuNL6p2XPRpXnrmVePgz1TU2egd2
+						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>
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
new file mode 100644
index 00000000..2dba4c3a
--- /dev/null
+++ b/swamid-interfederations-2.0/oala.trinitylaban.ac.uk-oala-metadata.xml
@@ -0,0 +1,67 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIRAOP4a2rGltT7syLTMWMP0yMwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xNDAzMTEwMDAwMDBaFw0xNzAzMTAyMzU5NTlaMEUxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXb2FsYS50cmlu
+						aXR5bGFiYW4uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8
+						fS+Lxi6rqfi+4r69jVE3cZB4Xgi/URiCP2UbOHnoYjeRCy+ePHchk31oebEfF6kq
+						g/PcrAsmgNCgQ0XUesiZPGTZDPUrmsZAzX6ExMxTPiNXeQtnbbVRdIee/16duWoX
+						F2T6vfYvyisZgkI8FGVWcUY6HOnXEKCFTtzznX4pkv/FpnTlB9Z4DEuAHWnAJUfz
+						dzUO1941DE5MEi4/29Y1aoj0QdliLy5qTGB0AKO7OjYWjfx6XcwqYKhYVcDAwiBK
+						q5LoiH/P6CKwYs4iea0ZFT3F6CSOyN0nmiOH/WzT853wiAqLptO/oun8FeDXz5kr
+						bkBJX8ODB6ChlLd0FEJnAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
+						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQU2kzdewE+omvtXAoSGI0rZxkquW0wDgYD
+						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
+						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF29hbGEudHJpbml0
+						eWxhYmFuLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQAO0EL0yO9As2ommUEfYOiM
+						usV7rpBuxj8wQdETSk+MFeXC5DmGn5K31g6QSeKABgxl3f5mwugs/6oP0XN9356W
+						b8EQHmldHx+Rgba2RjSSW7BPhMMXWD0fWOt4wQmHvDk4KHazg/r/kmuHBlQJjHEQ
+						pqHqnF2Z/6dd8RF5gnVplUfuv4iAwHMNYanvOPzjKEBu5Ah6ONV0b6MqAKibPKbW
+						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>
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
new file mode 100644
index 00000000..7f00a264
--- /dev/null
+++ b/swamid-interfederations-2.0/oala.uws.ac.uk-oala-metadata.xml
@@ -0,0 +1,85 @@
+<?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>
+      <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>
+						MIIDODCCAiCgAwIBAgIIbQnNE5dUfa4wDQYJKoZIhvcNAQEFBQAwMzEYMBYGA1UE
+						CgwPVVdTX0RldmVsb3BtZW50MRcwFQYDVQQDDA5vYWxhLnV3cy5hYy51azAeFw0x
+						MjEyMTgxNTE5MDZaFw0yMjEyMTgxNTE5MDZaMDMxGDAWBgNVBAoMD1VXU19EZXZl
+						bG9wbWVudDEXMBUGA1UEAwwOb2FsYS51d3MuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQDiqewakPZodoX19+9+qPMOcxYrTZqEt/ljYtVrSkFb
+						fo7QBQ8i7cI3gmLDR6OudWF7rc8Mg8Nhjdsv/qijBXWXK5pzmbczwKA2hYVg148M
+						+GyIlOcIUD/OJ2xixpkXiaa11Z9m4SdOh50AgXyfOvo1WFMgJqC5Xg9dQtNWrP7r
+						R91dVGaF4dY+PlEfgQ2HQp4N4YK8C2MhNppUyfgOrt8iczCNYBX1kqyOdny8/bDR
+						cvzqAg9oIf910rGS5RvetpLxnIiG9bLnUoiXCiGytNntKZjj/3qKb4x4iTvrCFe8
+						/2NRGe47rTzOKfyVDo0YnXDkEGhEuAjMu4FGQeo8muBLAgMBAAGjUDBOMB0GA1Ud
+						DgQWBBTY1w4Mn4Xy3KHsgxVO5XFrEFf1ezAfBgNVHSMEGDAWgBTY1w4Mn4Xy3KHs
+						gxVO5XFrEFf1ezAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDFaE6E
+						87PXIBb66PY1c75fSj1QItA8RkQLh/AqAbiV2+xonO44rxiNqMbUX8Cd3Sow0X/6
+						Uj59jtAhKHEslOaDIPNsig377yt9ppgGGgFeruK6yZ/TV86Jq6s2xxOYgJYjZv0f
+						FOgbdMm1EtUk72qmcDL4+MQbCJrC4QZYlRglm2X+0uuiaoyamkJC32Z6Nfy5iqot
+						Hd5rN37WdO15lqq/9oJ7ceZcIfGUr4mn0u73iT2AJ0YwTl85Ra6iu/IdiCvPbNE8
+						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>
+						MIIDODCCAiCgAwIBAgIIbQnNE5dUfa4wDQYJKoZIhvcNAQEFBQAwMzEYMBYGA1UE
+						CgwPVVdTX0RldmVsb3BtZW50MRcwFQYDVQQDDA5vYWxhLnV3cy5hYy51azAeFw0x
+						MjEyMTgxNTE5MDZaFw0yMjEyMTgxNTE5MDZaMDMxGDAWBgNVBAoMD1VXU19EZXZl
+						bG9wbWVudDEXMBUGA1UEAwwOb2FsYS51d3MuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQDiqewakPZodoX19+9+qPMOcxYrTZqEt/ljYtVrSkFb
+						fo7QBQ8i7cI3gmLDR6OudWF7rc8Mg8Nhjdsv/qijBXWXK5pzmbczwKA2hYVg148M
+						+GyIlOcIUD/OJ2xixpkXiaa11Z9m4SdOh50AgXyfOvo1WFMgJqC5Xg9dQtNWrP7r
+						R91dVGaF4dY+PlEfgQ2HQp4N4YK8C2MhNppUyfgOrt8iczCNYBX1kqyOdny8/bDR
+						cvzqAg9oIf910rGS5RvetpLxnIiG9bLnUoiXCiGytNntKZjj/3qKb4x4iTvrCFe8
+						/2NRGe47rTzOKfyVDo0YnXDkEGhEuAjMu4FGQeo8muBLAgMBAAGjUDBOMB0GA1Ud
+						DgQWBBTY1w4Mn4Xy3KHsgxVO5XFrEFf1ezAfBgNVHSMEGDAWgBTY1w4Mn4Xy3KHs
+						gxVO5XFrEFf1ezAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDFaE6E
+						87PXIBb66PY1c75fSj1QItA8RkQLh/AqAbiV2+xonO44rxiNqMbUX8Cd3Sow0X/6
+						Uj59jtAhKHEslOaDIPNsig377yt9ppgGGgFeruK6yZ/TV86Jq6s2xxOYgJYjZv0f
+						FOgbdMm1EtUk72qmcDL4+MQbCJrC4QZYlRglm2X+0uuiaoyamkJC32Z6Nfy5iqot
+						Hd5rN37WdO15lqq/9oJ7ceZcIfGUr4mn0u73iT2AJ0YwTl85Ra6iu/IdiCvPbNE8
+						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>
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
new file mode 100644
index 00000000..be26f1b3
--- /dev/null
+++ b/swamid-interfederations-2.0/oasp-omicron.athensams.net-oa-metadata.xml
@@ -0,0 +1,83 @@
+<?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>
+						MIIDsjCCApqgAwIBAgIJALsMSAHJEd0ZMA0GCSqGSIb3DQEBBQUAMEQxHTAbBgNV
+						BAoTFE9hc3AgT21pY3JvbiBUZXN0IFNQMSMwIQYDVQQDExpvYXNwLW9taWNyb24u
+						YXRoZW5zYW1zLm5ldDAeFw0xMzAzMTMxMjIyMDdaFw0yMzAzMTExMjIyMDdaMEQx
+						HTAbBgNVBAoTFE9hc3AgT21pY3JvbiBUZXN0IFNQMSMwIQYDVQQDExpvYXNwLW9t
+						aWNyb24uYXRoZW5zYW1zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAMaxRxvM95+hPSWZCcg/KX76tfQylQa05bLKMRJTbV5AkDb8EmpQVXVfzldY
+						5/MyU1KM++Uv6oTBme91dZSIy79B63l/Wy88yXUtGYFqo6hFsl7CbQ7/V6oh95oI
+						KeFlVgqfVb6cdq+2V/sbJqCTPHmDxxV1zmK4mvZ5on3SzJT51Ep5YQOZ+bEs7oP2
+						5WadgH2iaLRhTsL1bkdIRBfkJigrMFgEMruueGmjLs+JbNMLnOth3XGgu6I674M9
+						lkiSnxB25Hs/lf6f/K1dz4TGEeS+TSbjP1QFvOuesuUuI8uHxptez1Y+ORPoesD6
+						fRz5ix5wbhLTxxjIQRwZqEwqLBsCAwEAAaOBpjCBozAdBgNVHQ4EFgQUZw3RZM3w
+						E8/wsk30/ArzpIEl8ccwdAYDVR0jBG0wa4AUZw3RZM3wE8/wsk30/ArzpIEl8ceh
+						SKRGMEQxHTAbBgNVBAoTFE9hc3AgT21pY3JvbiBUZXN0IFNQMSMwIQYDVQQDExpv
+						YXNwLW9taWNyb24uYXRoZW5zYW1zLm5ldIIJALsMSAHJEd0ZMAwGA1UdEwQFMAMB
+						Af8wDQYJKoZIhvcNAQEFBQADggEBAEi6C2myxUc6XLkaF8ZhrO/BefiJDx/FSKoN
+						y4mvsi+FiF1AtAoE5FFX/42Sf50wziL8sVWK+oaEu0W6EValylaE5wsUvzfM45bo
+						Pubt3AUWVcBMKNrw9hQZBB87sB5k0RSMaGF/f5lkW2NhqDtnKkd3rTp1rJa66WWy
+						DqbDrFhXtlqYibcYli8Vv6jXOCEl6H+G6lm7adMwBj+r/MmkORQFQXP5He9OoXtB
+						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>
+						MIIDsjCCApqgAwIBAgIJALsMSAHJEd0ZMA0GCSqGSIb3DQEBBQUAMEQxHTAbBgNV
+						BAoTFE9hc3AgT21pY3JvbiBUZXN0IFNQMSMwIQYDVQQDExpvYXNwLW9taWNyb24u
+						YXRoZW5zYW1zLm5ldDAeFw0xMzAzMTMxMjIyMDdaFw0yMzAzMTExMjIyMDdaMEQx
+						HTAbBgNVBAoTFE9hc3AgT21pY3JvbiBUZXN0IFNQMSMwIQYDVQQDExpvYXNwLW9t
+						aWNyb24uYXRoZW5zYW1zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAMaxRxvM95+hPSWZCcg/KX76tfQylQa05bLKMRJTbV5AkDb8EmpQVXVfzldY
+						5/MyU1KM++Uv6oTBme91dZSIy79B63l/Wy88yXUtGYFqo6hFsl7CbQ7/V6oh95oI
+						KeFlVgqfVb6cdq+2V/sbJqCTPHmDxxV1zmK4mvZ5on3SzJT51Ep5YQOZ+bEs7oP2
+						5WadgH2iaLRhTsL1bkdIRBfkJigrMFgEMruueGmjLs+JbNMLnOth3XGgu6I674M9
+						lkiSnxB25Hs/lf6f/K1dz4TGEeS+TSbjP1QFvOuesuUuI8uHxptez1Y+ORPoesD6
+						fRz5ix5wbhLTxxjIQRwZqEwqLBsCAwEAAaOBpjCBozAdBgNVHQ4EFgQUZw3RZM3w
+						E8/wsk30/ArzpIEl8ccwdAYDVR0jBG0wa4AUZw3RZM3wE8/wsk30/ArzpIEl8ceh
+						SKRGMEQxHTAbBgNVBAoTFE9hc3AgT21pY3JvbiBUZXN0IFNQMSMwIQYDVQQDExpv
+						YXNwLW9taWNyb24uYXRoZW5zYW1zLm5ldIIJALsMSAHJEd0ZMAwGA1UdEwQFMAMB
+						Af8wDQYJKoZIhvcNAQEFBQADggEBAEi6C2myxUc6XLkaF8ZhrO/BefiJDx/FSKoN
+						y4mvsi+FiF1AtAoE5FFX/42Sf50wziL8sVWK+oaEu0W6EValylaE5wsUvzfM45bo
+						Pubt3AUWVcBMKNrw9hQZBB87sB5k0RSMaGF/f5lkW2NhqDtnKkd3rTp1rJa66WWy
+						DqbDrFhXtlqYibcYli8Vv6jXOCEl6H+G6lm7adMwBj+r/MmkORQFQXP5He9OoXtB
+						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>
diff --git a/swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml b/swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml
new file mode 100644
index 00000000..41c5f013
--- /dev/null
+++ b/swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml
@@ -0,0 +1,151 @@
+<?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>
+      <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>
+						MIIEtTCCA52gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCR0Ix
+						ETAPBgNVBAgTCFNvbWVyc2V0MQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdFZHVz
+						ZXJ2MQ8wDQYDVQQLEwZBdGhlbnMxIDAeBgNVBAMTF29hc3AuYmV0YS5hdGhlbnNh
+						bXMubmV0MScwJQYJKoZIhvcNAQkBFhhhdGhlbnNkc3BAZWR1c2Vydi5vcmcudWsw
+						HhcNMDgwMjE1MDk1ODM1WhcNMTgwMjEyMDk1ODM1WjCBnTELMAkGA1UEBhMCR0Ix
+						ETAPBgNVBAgTCFNvbWVyc2V0MQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdFZHVz
+						ZXJ2MQ8wDQYDVQQLEwZBdGhlbnMxIDAeBgNVBAMTF29hc3AuYmV0YS5hdGhlbnNh
+						bXMubmV0MScwJQYJKoZIhvcNAQkBFhhhdGhlbnNkc3BAZWR1c2Vydi5vcmcudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLYAfycv0j9S88QfU4GCGU
+						Md16DqYLQpEDBvRPLuAjKypBoIZwnKbhh+p6GlafYsXk/oNpG5EZ4Wn/tYd8CM2w
+						2bpoifmGAiXKvWoh87vgotkZnrvStGj/Aw7eUM8nsfduMbiw6vCO7BQAfwGzkUL7
+						7obaMLA9Zbz5afGAvzq9k58+D6u9ox/DzAdN4iqbrFgvnxiN2uvusIkIeMoxUREd
+						qiFFoXlk97Sj7yeKggkA25AtOUO2LnI8Le7FT3dP2jlCB9onlIa0ZR0Fm/RjFu4t
+						zxB+jwvZ3VTqmxIzzCYxi6wK+xOaJPVwLvSGTwyquNUJSrMAOef43rIMCVAQDmKr
+						AgMBAAGjgf0wgfowHQYDVR0OBBYEFH7zEIp6CNN5LLMic1imrULmiSBgMIHKBgNV
+						HSMEgcIwgb+AFH7zEIp6CNN5LLMic1imrULmiSBgoYGjpIGgMIGdMQswCQYDVQQG
+						EwJHQjERMA8GA1UECBMIU29tZXJzZXQxDTALBgNVBAcTBEJhdGgxEDAOBgNVBAoT
+						B0VkdXNlcnYxDzANBgNVBAsTBkF0aGVuczEgMB4GA1UEAxMXb2FzcC5iZXRhLmF0
+						aGVuc2Ftcy5uZXQxJzAlBgkqhkiG9w0BCQEWGGF0aGVuc2RzcEBlZHVzZXJ2Lm9y
+						Zy51a4IBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBoIKKJtwn/
+						MUxqYHeOpCjgHxOFssQpALuuasCpx7Ojb/a1fkV2523hI09zDTy2m7s3C9szPhwx
+						Zv1LUshbMsZon2bYXZwDdFa8tkzOYlZpKhguv6r/5LFZI2s09uDaVrFl6cVxFAUz
+						FQiY8XQHME4m+hxqf8RMGMid+33QtIIlEAD4/OnvquHXBxiO8ESMxebV4mNLkn34
+						KEfS16BFBP3scX62GBHqg+dAZVJHHjbIdIQsPcFa/3UElFMxur1gOKclzjHa8GX3
+						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>
+						MIIEtTCCA52gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCR0Ix
+						ETAPBgNVBAgTCFNvbWVyc2V0MQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdFZHVz
+						ZXJ2MQ8wDQYDVQQLEwZBdGhlbnMxIDAeBgNVBAMTF29hc3AuYmV0YS5hdGhlbnNh
+						bXMubmV0MScwJQYJKoZIhvcNAQkBFhhhdGhlbnNkc3BAZWR1c2Vydi5vcmcudWsw
+						HhcNMDgwMjE1MDk1ODM1WhcNMTgwMjEyMDk1ODM1WjCBnTELMAkGA1UEBhMCR0Ix
+						ETAPBgNVBAgTCFNvbWVyc2V0MQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdFZHVz
+						ZXJ2MQ8wDQYDVQQLEwZBdGhlbnMxIDAeBgNVBAMTF29hc3AuYmV0YS5hdGhlbnNh
+						bXMubmV0MScwJQYJKoZIhvcNAQkBFhhhdGhlbnNkc3BAZWR1c2Vydi5vcmcudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLYAfycv0j9S88QfU4GCGU
+						Md16DqYLQpEDBvRPLuAjKypBoIZwnKbhh+p6GlafYsXk/oNpG5EZ4Wn/tYd8CM2w
+						2bpoifmGAiXKvWoh87vgotkZnrvStGj/Aw7eUM8nsfduMbiw6vCO7BQAfwGzkUL7
+						7obaMLA9Zbz5afGAvzq9k58+D6u9ox/DzAdN4iqbrFgvnxiN2uvusIkIeMoxUREd
+						qiFFoXlk97Sj7yeKggkA25AtOUO2LnI8Le7FT3dP2jlCB9onlIa0ZR0Fm/RjFu4t
+						zxB+jwvZ3VTqmxIzzCYxi6wK+xOaJPVwLvSGTwyquNUJSrMAOef43rIMCVAQDmKr
+						AgMBAAGjgf0wgfowHQYDVR0OBBYEFH7zEIp6CNN5LLMic1imrULmiSBgMIHKBgNV
+						HSMEgcIwgb+AFH7zEIp6CNN5LLMic1imrULmiSBgoYGjpIGgMIGdMQswCQYDVQQG
+						EwJHQjERMA8GA1UECBMIU29tZXJzZXQxDTALBgNVBAcTBEJhdGgxEDAOBgNVBAoT
+						B0VkdXNlcnYxDzANBgNVBAsTBkF0aGVuczEgMB4GA1UEAxMXb2FzcC5iZXRhLmF0
+						aGVuc2Ftcy5uZXQxJzAlBgkqhkiG9w0BCQEWGGF0aGVuc2RzcEBlZHVzZXJ2Lm9y
+						Zy51a4IBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBoIKKJtwn/
+						MUxqYHeOpCjgHxOFssQpALuuasCpx7Ojb/a1fkV2523hI09zDTy2m7s3C9szPhwx
+						Zv1LUshbMsZon2bYXZwDdFa8tkzOYlZpKhguv6r/5LFZI2s09uDaVrFl6cVxFAUz
+						FQiY8XQHME4m+hxqf8RMGMid+33QtIIlEAD4/OnvquHXBxiO8ESMxebV4mNLkn34
+						KEfS16BFBP3scX62GBHqg+dAZVJHHjbIdIQsPcFa/3UElFMxur1gOKclzjHa8GX3
+						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>
+						MIIEtTCCA52gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCR0Ix
+						ETAPBgNVBAgTCFNvbWVyc2V0MQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdFZHVz
+						ZXJ2MQ8wDQYDVQQLEwZBdGhlbnMxIDAeBgNVBAMTF29hc3AuYmV0YS5hdGhlbnNh
+						bXMubmV0MScwJQYJKoZIhvcNAQkBFhhhdGhlbnNkc3BAZWR1c2Vydi5vcmcudWsw
+						HhcNMDgwMjE1MDk1ODM1WhcNMTgwMjEyMDk1ODM1WjCBnTELMAkGA1UEBhMCR0Ix
+						ETAPBgNVBAgTCFNvbWVyc2V0MQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdFZHVz
+						ZXJ2MQ8wDQYDVQQLEwZBdGhlbnMxIDAeBgNVBAMTF29hc3AuYmV0YS5hdGhlbnNh
+						bXMubmV0MScwJQYJKoZIhvcNAQkBFhhhdGhlbnNkc3BAZWR1c2Vydi5vcmcudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLYAfycv0j9S88QfU4GCGU
+						Md16DqYLQpEDBvRPLuAjKypBoIZwnKbhh+p6GlafYsXk/oNpG5EZ4Wn/tYd8CM2w
+						2bpoifmGAiXKvWoh87vgotkZnrvStGj/Aw7eUM8nsfduMbiw6vCO7BQAfwGzkUL7
+						7obaMLA9Zbz5afGAvzq9k58+D6u9ox/DzAdN4iqbrFgvnxiN2uvusIkIeMoxUREd
+						qiFFoXlk97Sj7yeKggkA25AtOUO2LnI8Le7FT3dP2jlCB9onlIa0ZR0Fm/RjFu4t
+						zxB+jwvZ3VTqmxIzzCYxi6wK+xOaJPVwLvSGTwyquNUJSrMAOef43rIMCVAQDmKr
+						AgMBAAGjgf0wgfowHQYDVR0OBBYEFH7zEIp6CNN5LLMic1imrULmiSBgMIHKBgNV
+						HSMEgcIwgb+AFH7zEIp6CNN5LLMic1imrULmiSBgoYGjpIGgMIGdMQswCQYDVQQG
+						EwJHQjERMA8GA1UECBMIU29tZXJzZXQxDTALBgNVBAcTBEJhdGgxEDAOBgNVBAoT
+						B0VkdXNlcnYxDzANBgNVBAsTBkF0aGVuczEgMB4GA1UEAxMXb2FzcC5iZXRhLmF0
+						aGVuc2Ftcy5uZXQxJzAlBgkqhkiG9w0BCQEWGGF0aGVuc2RzcEBlZHVzZXJ2Lm9y
+						Zy51a4IBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBoIKKJtwn/
+						MUxqYHeOpCjgHxOFssQpALuuasCpx7Ojb/a1fkV2523hI09zDTy2m7s3C9szPhwx
+						Zv1LUshbMsZon2bYXZwDdFa8tkzOYlZpKhguv6r/5LFZI2s09uDaVrFl6cVxFAUz
+						FQiY8XQHME4m+hxqf8RMGMid+33QtIIlEAD4/OnvquHXBxiO8ESMxebV4mNLkn34
+						KEfS16BFBP3scX62GBHqg+dAZVJHHjbIdIQsPcFa/3UElFMxur1gOKclzjHa8GX3
+						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: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/oasp.test.openathens.net-oa-metadata.xml b/swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml
new file mode 100644
index 00000000..285e6f20
--- /dev/null
+++ b/swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oasp.test.openathens.net/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-21T14:55:47Z"/>
+  </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>
+						MIIDqTCCApGgAwIBAgIJAIF6hHuafvj6MA0GCSqGSIb3DQEBBQUAMEExHDAaBgNV
+						BAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVzdC5vcGVu
+						YXRoZW5zLm5ldDAeFw0xMTExMjUxMzI5MjZaFw0yMTExMjIxMzI5MjZaMEExHDAa
+						BgNVBAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVzdC5v
+						cGVuYXRoZW5zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO0g
+						7T/RWjQt10WSM05mXnFuOdcMCOIaLb2CaJrcafZXDsEPyZwuliy9dbtQj+NtKaJk
+						yHi4eXwZMCcHlIp1w9WK8qqkIMqZcQ1JS55e5f2JsvzD9IRkFXey8gHzMybeL/3E
+						jvqlsNSYRPP+WVAJAgWFuZcKkx3PdmaP0j1qrj2TknKKW1mUxN67JMEDk8Zow938
+						jqfCVyJMUqklfEmAsizu4Y9xCGd5wGhhBYCW8LV0JsdE1DcZlAVs5vhkhYX/W281
+						dmoNkcuRoIua7juEYIB4j3lt73+U12x7nNqBCOkm0lSUxpXS3GU9saGiTFKmuIYG
+						RwidXYL38UON0Sna3lECAwEAAaOBozCBoDAdBgNVHQ4EFgQUplgZXO9FGWF0QS0Y
+						mRnlYo+iX2AwcQYDVR0jBGowaIAUplgZXO9FGWF0QS0YmRnlYo+iX2ChRaRDMEEx
+						HDAaBgNVBAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVz
+						dC5vcGVuYXRoZW5zLm5ldIIJAIF6hHuafvj6MAwGA1UdEwQFMAMBAf8wDQYJKoZI
+						hvcNAQEFBQADggEBAB7E38GQDT3TsUstX+fj7pbxn4mdttp31TquTa4t1tzN/InY
+						/yNMCzLwtu4jK1lFJj47VzZt8aAc7p9T6g623PLqz+xDtK+TPN4a8mqqIvDmzZPP
+						gcdA7Lj6OcnHqY14IBKytoserwXlZ2YdL7uRmzaAqwCi9CMGaMY95HzcyWCGVPgX
+						6N8bVcOOBA0SE+SUt3YercH/Hld/MZomRY4reZ2c6jnlSKcvwAYnodgLEYtvFEOJ
+						LkNq6dHtQ2tqCxYPDiW/zNOwr6vpVYvmXDxZuRF0VwPJzC2N2mSQOH7GOnWclgA+
+						GFyeNtcZ1d2CHmxNE+2pWsg9tOPp/m2Vtq7TRpg=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDqTCCApGgAwIBAgIJAIF6hHuafvj6MA0GCSqGSIb3DQEBBQUAMEExHDAaBgNV
+						BAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVzdC5vcGVu
+						YXRoZW5zLm5ldDAeFw0xMTExMjUxMzI5MjZaFw0yMTExMjIxMzI5MjZaMEExHDAa
+						BgNVBAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVzdC5v
+						cGVuYXRoZW5zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO0g
+						7T/RWjQt10WSM05mXnFuOdcMCOIaLb2CaJrcafZXDsEPyZwuliy9dbtQj+NtKaJk
+						yHi4eXwZMCcHlIp1w9WK8qqkIMqZcQ1JS55e5f2JsvzD9IRkFXey8gHzMybeL/3E
+						jvqlsNSYRPP+WVAJAgWFuZcKkx3PdmaP0j1qrj2TknKKW1mUxN67JMEDk8Zow938
+						jqfCVyJMUqklfEmAsizu4Y9xCGd5wGhhBYCW8LV0JsdE1DcZlAVs5vhkhYX/W281
+						dmoNkcuRoIua7juEYIB4j3lt73+U12x7nNqBCOkm0lSUxpXS3GU9saGiTFKmuIYG
+						RwidXYL38UON0Sna3lECAwEAAaOBozCBoDAdBgNVHQ4EFgQUplgZXO9FGWF0QS0Y
+						mRnlYo+iX2AwcQYDVR0jBGowaIAUplgZXO9FGWF0QS0YmRnlYo+iX2ChRaRDMEEx
+						HDAaBgNVBAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVz
+						dC5vcGVuYXRoZW5zLm5ldIIJAIF6hHuafvj6MAwGA1UdEwQFMAMBAf8wDQYJKoZI
+						hvcNAQEFBQADggEBAB7E38GQDT3TsUstX+fj7pbxn4mdttp31TquTa4t1tzN/InY
+						/yNMCzLwtu4jK1lFJj47VzZt8aAc7p9T6g623PLqz+xDtK+TPN4a8mqqIvDmzZPP
+						gcdA7Lj6OcnHqY14IBKytoserwXlZ2YdL7uRmzaAqwCi9CMGaMY95HzcyWCGVPgX
+						6N8bVcOOBA0SE+SUt3YercH/Hld/MZomRY4reZ2c6jnlSKcvwAYnodgLEYtvFEOJ
+						LkNq6dHtQ2tqCxYPDiW/zNOwr6vpVYvmXDxZuRF0VwPJzC2N2mSQOH7GOnWclgA+
+						GFyeNtcZ1d2CHmxNE+2pWsg9tOPp/m2Vtq7TRpg=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp.test.openathens.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.test.openathens.net/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp.test.openathens.net/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp.test.openathens.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: Test C 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/obu-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/obu-shib.hosted.exlibrisgroup.com-shib.xml
new file mode 100644
index 00000000..4cf85daf
--- /dev/null
+++ b/swamid-interfederations-2.0/obu-shib.hosted.exlibrisgroup.com-shib.xml
@@ -0,0 +1,85 @@
+<?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>
+      <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>
+						MIIC3DCCAcSgAwIBAgIJAPFOgb8PLs1hMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB2FpbzAwMDYwHhcNMTQwNzE4MDk0MTQ2WhcNMjQwNzE1MDk0MTQ2WjASMRAw
+						DgYDVQQDEwdhaW8wMDA2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						w5jThjFg2+mq3htgoZ/7sbvVBxxVAGqdT5NtVXSIUskbq4alYYsgryo70x+8DxN/
+						rS8D9mTTGXq+bLnY33u47D3KIuGpfLdkCZkzFMk6YfM4kSrSXbrrpbNSlcaFF1dv
+						3Vbz771m5M3+xUZNZIi0jZxUN8FvRefdjw0rqJTpOK4X6+JjkUNlFAYv70kCyLuB
+						l0vwRhA1S+Jbp0C2+gmNA8F2T5mLHAGnB4jFij7KMLufdpkRAO5h4yD5vu8s11yZ
+						9dwd60Cy3D+kRtT06xv57n9VpSl0GTCC0OHpYOfZ4Woy/z4A6HUD+yFNeASQXyDt
+						w190QC5KOwHl/3eQnPl0CwIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDA2MB0G
+						A1UdDgQWBBReo4WgGu2sffn17A9SeJ4Q1DObDjANBgkqhkiG9w0BAQUFAAOCAQEA
+						wegTw3Rlw+xt3urRqa2SyUNVf2F4jwDxajd/c0ww3yE/nK4hyMWXIXe7BlU4HTfz
+						EIi6Qhx8lU//bIgVqUP813TS9NbKfCdzRbibmq8QyL06JqGAI7Cs1tMqKCvnPTYo
+						U9vu+nqQ6gg1u2TJbjYTHm+gGNNFd42yGzLyEUMZk/2+bXmCWPxhnF7xo3rGmycH
+						bLxo3ecAAi972stBzrMH22htpDBOqkUlYW+SoEmjOV+w/LCF8my2hECuV77/yBOJ
+						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>
diff --git a/swamid-interfederations-2.0/olasdev.e-skillz.com-simplesaml.xml b/swamid-interfederations-2.0/olasdev.e-skillz.com-simplesaml.xml
new file mode 100644
index 00000000..e3fbedf8
--- /dev/null
+++ b/swamid-interfederations-2.0/olasdev.e-skillz.com-simplesaml.xml
@@ -0,0 +1,94 @@
+<?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>
+						MIIEmDCCA4CgAwIBAgIJAMNMayaHMlLmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+						VQQGEwJJRTEPMA0GA1UECBMGR2Fsd2F5MQ8wDQYDVQQHEwZHYWx3YXkxGTAXBgNV
+						BAoTEFJpc2tXaXplIExpbWl0ZWQxHTAbBgNVBAMTFG9sYXNkZXYuZS1za2lsbHou
+						Y29tMSMwIQYJKoZIhvcNAQkBFhRvbGFzMmFkbWluQG8tbGFzLm5ldDAeFw0xMzAx
+						MzExNTIzMDhaFw0yMzAxMjkxNTIzMDhaMIGOMQswCQYDVQQGEwJJRTEPMA0GA1UE
+						CBMGR2Fsd2F5MQ8wDQYDVQQHEwZHYWx3YXkxGTAXBgNVBAoTEFJpc2tXaXplIExp
+						bWl0ZWQxHTAbBgNVBAMTFG9sYXNkZXYuZS1za2lsbHouY29tMSMwIQYJKoZIhvcN
+						AQkBFhRvbGFzMmFkbWluQG8tbGFzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAMm1K4AqDnJdBA/pC+lRp8BzRuRCPcSL0XxST7xl6Fi9zsR1TZ+2
+						0lotJFA6XVcEWtdCUon+ajNJvbsuIYy5ATGOO0oGiewRdGr/3RVKlPQb0owFLqwA
+						v4rZVdKPNEACas538WBLGv168cH/GUxWtFo12gVBRbldok8SAVYqe6FW0jvsV+6K
+						u1c6lNtwxR+eAklRfI/83zG2FBJyEWfGVlvsigKhkDyHoHdgumMbgTQCBM/Bd9AW
+						lM7ViU5D/xnayCTLFbWaNq70ovy9NuGdxBFiNwpBTk9P7SVPuTHXZE0FIlTFZzf4
+						YPaeYchlb+RZRWTkNlqLenYVAv8kmhoaofkCAwEAAaOB9jCB8zAdBgNVHQ4EFgQU
+						QQs8XxfzBOfgW7ZgJd3VKVtthskwgcMGA1UdIwSBuzCBuIAUQQs8XxfzBOfgW7Zg
+						Jd3VKVtthsmhgZSkgZEwgY4xCzAJBgNVBAYTAklFMQ8wDQYDVQQIEwZHYWx3YXkx
+						DzANBgNVBAcTBkdhbHdheTEZMBcGA1UEChMQUmlza1dpemUgTGltaXRlZDEdMBsG
+						A1UEAxMUb2xhc2Rldi5lLXNraWxsei5jb20xIzAhBgkqhkiG9w0BCQEWFG9sYXMy
+						YWRtaW5Aby1sYXMubmV0ggkAw0xrJocyUuYwDAYDVR0TBAUwAwEB/zANBgkqhkiG
+						9w0BAQUFAAOCAQEAmSflsmzJ+wmNyXI6Wyji+Yp1yKy/ac66sJX/dUdmJmiVu36t
+						dG8rVXi0EQpa5+i3o7YLoqkjyK5JcwHJVdFLFBp0kNauJc2LYMLQqVm+pzcP/ZCj
+						tI2XmsxxYYqhYlYgITP1Xw19ZcX5MDiY9D8QGNRzkZuoZ/QVR2wwss0nvmbpnEp2
+						5MkYlORfzYHGqotvku0d+oO2cmLNlLjbvU9v7VR76l+SelsJ+T7izVAkUSmfoSil
+						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>
+						MIIEmDCCA4CgAwIBAgIJAMNMayaHMlLmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+						VQQGEwJJRTEPMA0GA1UECBMGR2Fsd2F5MQ8wDQYDVQQHEwZHYWx3YXkxGTAXBgNV
+						BAoTEFJpc2tXaXplIExpbWl0ZWQxHTAbBgNVBAMTFG9sYXNkZXYuZS1za2lsbHou
+						Y29tMSMwIQYJKoZIhvcNAQkBFhRvbGFzMmFkbWluQG8tbGFzLm5ldDAeFw0xMzAx
+						MzExNTIzMDhaFw0yMzAxMjkxNTIzMDhaMIGOMQswCQYDVQQGEwJJRTEPMA0GA1UE
+						CBMGR2Fsd2F5MQ8wDQYDVQQHEwZHYWx3YXkxGTAXBgNVBAoTEFJpc2tXaXplIExp
+						bWl0ZWQxHTAbBgNVBAMTFG9sYXNkZXYuZS1za2lsbHouY29tMSMwIQYJKoZIhvcN
+						AQkBFhRvbGFzMmFkbWluQG8tbGFzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAMm1K4AqDnJdBA/pC+lRp8BzRuRCPcSL0XxST7xl6Fi9zsR1TZ+2
+						0lotJFA6XVcEWtdCUon+ajNJvbsuIYy5ATGOO0oGiewRdGr/3RVKlPQb0owFLqwA
+						v4rZVdKPNEACas538WBLGv168cH/GUxWtFo12gVBRbldok8SAVYqe6FW0jvsV+6K
+						u1c6lNtwxR+eAklRfI/83zG2FBJyEWfGVlvsigKhkDyHoHdgumMbgTQCBM/Bd9AW
+						lM7ViU5D/xnayCTLFbWaNq70ovy9NuGdxBFiNwpBTk9P7SVPuTHXZE0FIlTFZzf4
+						YPaeYchlb+RZRWTkNlqLenYVAv8kmhoaofkCAwEAAaOB9jCB8zAdBgNVHQ4EFgQU
+						QQs8XxfzBOfgW7ZgJd3VKVtthskwgcMGA1UdIwSBuzCBuIAUQQs8XxfzBOfgW7Zg
+						Jd3VKVtthsmhgZSkgZEwgY4xCzAJBgNVBAYTAklFMQ8wDQYDVQQIEwZHYWx3YXkx
+						DzANBgNVBAcTBkdhbHdheTEZMBcGA1UEChMQUmlza1dpemUgTGltaXRlZDEdMBsG
+						A1UEAxMUb2xhc2Rldi5lLXNraWxsei5jb20xIzAhBgkqhkiG9w0BCQEWFG9sYXMy
+						YWRtaW5Aby1sYXMubmV0ggkAw0xrJocyUuYwDAYDVR0TBAUwAwEB/zANBgkqhkiG
+						9w0BAQUFAAOCAQEAmSflsmzJ+wmNyXI6Wyji+Yp1yKy/ac66sJX/dUdmJmiVu36t
+						dG8rVXi0EQpa5+i3o7YLoqkjyK5JcwHJVdFLFBp0kNauJc2LYMLQqVm+pzcP/ZCj
+						tI2XmsxxYYqhYlYgITP1Xw19ZcX5MDiY9D8QGNRzkZuoZ/QVR2wwss0nvmbpnEp2
+						5MkYlORfzYHGqotvku0d+oO2cmLNlLjbvU9v7VR76l+SelsJ+T7izVAkUSmfoSil
+						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>
diff --git a/swamid-interfederations-2.0/online.learning.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/online.learning.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..eb587abd
--- /dev/null
+++ b/swamid-interfederations-2.0/online.learning.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,57 @@
+<?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.learning.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-15T17:02: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://online.learning.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>
+						MIIDDzCCAfegAwIBAgIJAOXHb2XHLXDRMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGG9ubGluZS5sZWFybmluZy5veC5hYy51azAeFw0xMzAyMTQxMjM5MzJaFw0y
+						MzAyMTIxMjM5MzJaMCMxITAfBgNVBAMTGG9ubGluZS5sZWFybmluZy5veC5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANiPgk2FpHiAr7rihXV6
+						Se87QZa1C0IvcZsWRo14htlX8pOGA0SS35HDw/XYohB+JiCsuRTw3G++/8MDRMrS
+						/PVsTEsPHwrbexlr3tpvwHGk2MGGRlrWDBIUnKsIMx/Fe4tTsBsTP/2TYj7MRS3m
+						bms6w0+ouJDJgF7d07LebLrpMZrYAYIZFT6FSB/KQP8VWytCawI/ZsyXG15aeC9B
+						502unJUCdG8RziUAzoqglLsaGddoEjCctXo9X3WFQS+P7aiKlGjITmPtsuqm1LD1
+						bUBkqhQVHvCFF7Siqurl8MbVFymDZy+YVta06jCtb7bwfDDzj8qlGlSUR/MaiIp1
+						eFECAwEAAaNGMEQwIwYDVR0RBBwwGoIYb25saW5lLmxlYXJuaW5nLm94LmFjLnVr
+						MB0GA1UdDgQWBBRk8+5NSCNEYCchqOa7djqpmDEBizANBgkqhkiG9w0BAQUFAAOC
+						AQEAG4qfEzoBRdcsDiwwUV/0j2+a6jyvvubrSTT0CN7uimYD4WvToZPzbF4Iplhl
+						HfhNea9qW3FZP7HL5WrPJ7BouC4fd1ANNLHkWP4d8SG791AsFmOYE6CuoQNtIgIk
+						gP7FCwLm32qfdKDTstNJD5M8xxnsaPEpJ3CzWdfj9W3+N9zHFN6Mmzx1lmN13caY
+						q1sEo+gMWL70f630KrLkv+mSCX7HOghX0MdfHiMfFF8pWMDcdK95shlMvgxopchA
+						SaTzWzW01k5T4ghk2Vu3wFC5Uhvf784/L5scPVgjdNOphSkNU8CjG6/BKcNB+Sj9
+						o5MI6HedqkvwS3+4RL381q0wMw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford Learning Institute</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.learing.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</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
new file mode 100644
index 00000000..2db709a0
--- /dev/null
+++ b/swamid-interfederations-2.0/online.sagepub.com-shibboleth.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <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
new file mode 100644
index 00000000..f56e7b20
--- /dev/null
+++ b/swamid-interfederations-2.0/online.statref.com-shibboleth.xml
@@ -0,0 +1,70 @@
+<?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>
+    <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>
+      <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"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID+TCCAuGgAwIBAgIJAJwEXu6tonahMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYD
+						VQQGEwJVUzEQMA4GA1UECAwHV3lvbWluZzEQMA4GA1UEBwwHSmFja3NvbjEbMBkG
+						A1UECgwSVGV0b24gRGF0YSBTeXN0ZW1zMRswGQYDVQQDDBJvbmxpbmUuc3RhdHJl
+						Zi5jb20xJTAjBgkqhkiG9w0BCQEWFmptYXh3ZWxsQHRldG9uZGF0YS5jb20wHhcN
+						MTAxMjAyMTY1MzE1WhcNMjAxMjAxMTY1MzE1WjCBkjELMAkGA1UEBhMCVVMxEDAO
+						BgNVBAgMB1d5b21pbmcxEDAOBgNVBAcMB0phY2tzb24xGzAZBgNVBAoMElRldG9u
+						IERhdGEgU3lzdGVtczEbMBkGA1UEAwwSb25saW5lLnN0YXRyZWYuY29tMSUwIwYJ
+						KoZIhvcNAQkBFhZqbWF4d2VsbEB0ZXRvbmRhdGEuY29tMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAvxUW98iDiWy1rnYLXmrSut26X+wCpXsS+xit1uhr
+						oD83HOiE18fidOCPR2Reusw2PVS2Mv3Z2MouDxrbnxI1f40YTWmxWLJD9D+MeAbI
+						Dvt2uRctN82aVwL1Hy0GFsiS0RXztW0XiSZy6u/bqHVpSjYNw3AcnSadCPrt0ue0
+						eW1x+nvefeXxSgFfFxyjG+F/6br+CDvZk6oXNkDs8xRGiekM9mPo2DF1Qx3zxqPl
+						zW5homj1P2LlaeNvtXSj5EAfob0SPpx+gnNzXMbNzqwCLcY/amQkNjTPQC4nFYpc
+						JWiEOt4GKS8NuztVvrk1z6e0q4/2UUZJuiSUEB4Bk9BtEQIDAQABo1AwTjAdBgNV
+						HQ4EFgQU0mxo874bLxgMm12FGngVP4j3EnYwHwYDVR0jBBgwFoAU0mxo874bLxgM
+						m12FGngVP4j3EnYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAuN4c
+						d4KiRWdzWokz0NV0SRulD0yBRyMpR2LjVr9y7Btg+/IbKJdooR6+kStOvmZHctvI
+						KVZ5Kr9dUuOgQ2Kkyf4nXVPkwzpNj+N1+gNJ4/JlOzZEkshBf++ASMbQ8OEWkrl+
+						iimaLh3BSCDp/giL8/geH+5fFSgtXyCXx7pcP0GKxdOR7vLcZ9EK+qsutOW4006w
+						FaXTVDbgg006UGxD1VGW78cSfM5DGkwQvkG+52xLWNe3VhasnbqeirkuSHfmD6Ma
+						fV8vvSNyvTmWbK+/nHcVDJiqmb81XOuXy/NJDOZQpcK8Rx8vc6eAlgNTbLj6iTAJ
+						ZHzp7ICc2EW3RkJNUQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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: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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://online.statref.com/shibAuth.aspx" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://onlinebeta.statref.com/shibAuth.aspx" index="1"/>
+    <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: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/online.wadham.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/online.wadham.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..6c160a6c
--- /dev/null
+++ b/swamid-interfederations-2.0/online.wadham.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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.wadham.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="2013-09-20T14:05: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://online.wadham.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>
+						MIIDCTCCAfGgAwIBAgIJALC8N31Bxem1MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFm9ubGluZS53YWRoYW0ub3guYWMudWswHhcNMTMwOTE4MTUxMDAzWhcNMjMw
+						OTE2MTUxMDAzWjAhMR8wHQYDVQQDExZvbmxpbmUud2FkaGFtLm94LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw6P1eqo6vGLQ8belmeC1OABP
+						Q+8rrHutPoi2tZqxTpTrJ487RzfXewuseL9ZnqiqrM1oGbtaLCeSMAscUhA+0pVG
+						3JQqyPVx4OTMD1fCpmHCoJhP84Hm0E1OGRIQrwsh9jkUaPfnyTT5CPVfhLvYeeof
+						/2QJyBTFto97tu/e3g1lryfl+G6DGz45QsxlT8Y8XWKTTEah5yV9kMf9NvsQcBQO
+						y1UoeC54+WxVbJOLmgwpJ21bf2BtR9HZJsOe3J37t7JUh4qf8UA5fBrUJ6mCFGL3
+						bWe3wpjlGcHXFDvbkLULbYAeKQvRXyAPL3fBjhi7dYRxAhZQ1/U2euya1tjvQwID
+						AQABo0QwQjAhBgNVHREEGjAYghZvbmxpbmUud2FkaGFtLm94LmFjLnVrMB0GA1Ud
+						DgQWBBR8Qf8m1RqCT3m33pxvjlTkhZATXTANBgkqhkiG9w0BAQUFAAOCAQEAi2NK
+						DPuahKflk5F15c2KvgsjN2HZlqyjArXAOkC/WEHxmALfcC7fKhxZ+ZswN/GaloMq
+						wkK9MMl61drhKc0Orc6tFmhGir/XYKkOVBKu/Pf2yCa6s3OG/qyE6qW4QIeX/0ST
+						Nh+S9H9eUwANjSvlEi90DqdAjBtptDiixL8vQv6xJOiDGHbhLEy9pNIqA+PuhxYq
+						ZBzrg7vmdb8KkovS484OUW581FTUg6swa1qCaUDGpx0qTlPS7az48E48M2MH2noU
+						rS7gR1zE0y5C6TsN4qrs1MIERdUghBanwGLvUx0cbHGEEeORDix59lF5UFrB/jID
+						tUQQdKZmNRJfFzNHXQ==
+					</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://online.wadham.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.wadham.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://online.wadham.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://online.wadham.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://online.wadham.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, Wadham College Online Services</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wadham.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Wootton</md:SurName>
+    <md:EmailAddress>mailto:itmanager@wadh.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Wootton</md:SurName>
+    <md:EmailAddress>mailto:itmanager@wadh.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/onlinepayments.gtc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/onlinepayments.gtc.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..f3c1a7fa
--- /dev/null
+++ b/swamid-interfederations-2.0/onlinepayments.gtc.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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://onlinepayments.gtc.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="2014-03-03T14:46: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://onlinepayments.gtc.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 GTC Payment Portal</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSDCCAjCgAwIBAgIJAIfUM6q/Gli+MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG29ubGluZXBheW1lbnRzLmd0Yy5veC5hYy51azAeFw0xNDAyMjAxMjEwNDBa
+						Fw0yNDAyMTgxMjEwNDBaMCYxJDAiBgNVBAMTG29ubGluZXBheW1lbnRzLmd0Yy5v
+						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAo0jNoAJ35
+						4RSXKscYK/u467z0iUzdWgYOjMHe5UpBsWfFlI/Ht7nWyh9K0/oUlmON6OJrzwKW
+						hZ6lUM3WB7aHcJU5rWDEUb79JVs0WvpHiyPdNc4HXw7qlBb+onytoul+/jUf7TmM
+						/EXbQLe1pCrIvuw4hl8PA72x1w7wHmu9qHd+g2YL5CG6Dbrfm4pWdV25gHjJeEsb
+						q8s0/tPXZaIf6pAi4xHKrNLPqN23gb45U2YQdQDNDyI12MXcnNtSjRNpf9pUFY5I
+						kotJPTd63SRqhDb28F5suj95eJyTsNWfbpKuSt7hgEtSyY7L2zSELszRN61yDimU
+						6GZTNxKQJPUCAwEAAaN5MHcwVgYDVR0RBE8wTYIbb25saW5lcGF5bWVudHMuZ3Rj
+						Lm94LmFjLnVrhi5odHRwczovL29ubGluZXBheW1lbnRzLmd0Yy5veC5hYy51ay9z
+						aGliYm9sZXRoMB0GA1UdDgQWBBSpFZP5B8uXTAyHaB/6loL+XXZwKDANBgkqhkiG
+						9w0BAQUFAAOCAQEAw7mINrL58vxvF80oRDCfNYC9GbVPdL3BkXfkGHuJSeDWnwKX
+						qKEu/eozVkqa5Ga/a+HLP2LOC1kron+345wrk/4YlJIil1Dzg1DtVaMJFP5cEeXu
+						FF5rOpaPWGNnGjpDsOG1r1qKZllb8wIdlNWmA7wyx6+1qPRCbxo1lLTyGbmfFM3p
+						ZLJDIjnSv6J3TRvdcAodbFFBBMpL+JY7nT+f4DzIKac74poPr5uTyVfm6aDbAF5h
+						WROHDG1OigdsV0lHfv8R//K1WuravjH7pc14IsuVxpCqscLS7gG3wsF6lwLk1hdF
+						oAOlTseHmkuBUL+dk7KV4h9GrQ/jeKO4EhVuYw==
+					</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://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onlinepayments.gtc.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://onlinepayments.gtc.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://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://onlinepayments.gtc.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 GTC Payment Portal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gtc.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dominic</md:GivenName>
+    <md:SurName>Bown</md:SurName>
+    <md:EmailAddress>mailto:dominic.bown@gtc.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Alex</md:GivenName>
+    <md:SurName>Clark</md:SurName>
+    <md:EmailAddress>mailto:it-support@gtc.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dominic</md:GivenName>
+    <md:SurName>Bown</md:SurName>
+    <md:EmailAddress>mailto:dominic.bown@gtc.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/onurbantribe.com-shibboleth.xml b/swamid-interfederations-2.0/onurbantribe.com-shibboleth.xml
new file mode 100644
index 00000000..b3fca590
--- /dev/null
+++ b/swamid-interfederations-2.0/onurbantribe.com-shibboleth.xml
@@ -0,0 +1,65 @@
+<?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://onurbantribe.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-13T12:53: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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Urban Tribe</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Urban Tribe officially verifies your student identity online enabling you to unlock online discounts, deals in your city and tickets for clubs.</mdui:Description>
+        <mdui:Logo height="100" width="350">https://onurbantribe.com/static/images/shibboleth-sp/logo.jpg</mdui:Logo>
+        <mdui:Logo height="100" width="350">https://onurbantribe.com/static/images/shibboleth-sp/logo-transparent.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://onurbantribe.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://onurbantribe.com/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://onurbantribe.com/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC0zCCAbugAwIBAgIJAJMTWAj8iFJsMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+						BAMTBHN2NTYwHhcNMTIwNjExMjA0NTQyWhcNMjIwNjA5MjA0NTQyWjAPMQ0wCwYD
+						VQQDEwRzdjU2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0GLBi1CD
+						FHq3HmJgAWG0/YEmU+KwVuSo2CbyoBy8L5hxzkOkuvnBQCh48sIPDJ4iFstOF9Cm
+						nXlv7/V3O0Z5LCnAQpZfiMPL1A09QUFqe+LNAHjGluXmPMztYgPrt5rF95j1lkGU
+						KYOmIoy1F7HK2RdBnOS2/6KAmUs1954ACi8h0YEFBrMq2XG40UrMp6FMwfonb/57
+						9Bugk4pzeht7QxxOuZc/+nK1H1a+b25PJ2yVxwJ/ddVRPSmEbyLTr5v2yhJgtinr
+						veI3nor4gZaKZFaV/YpanhCrOFjWk15iD661Ovy1psOYo52RAi+x+SWsgxWix2Ft
+						S0l8SVNx9n/bLQIDAQABozIwMDAPBgNVHREECDAGggRzdjU2MB0GA1UdDgQWBBS7
+						Fz3DaNXlImw2RhvMkRZNeQW8IzANBgkqhkiG9w0BAQUFAAOCAQEAXoOTtO7bh2QH
+						CkAHtfRrF18lFcyUFQS4EEq+HHIBVYG0+W4NQ6TNeLqSGyBBRZTDfspRKQxEiEgk
+						8OoxTCPsMsYgBaHwLCoGmIpTYlH/I3DRm4kmhcEdCW8coLxCrhPuNd0IywZzO/o/
+						Z84Ls08JJEL0EufednzIztSLzMOsfUIDGKBXb9G6tsGcJkWYOx8LDI4T8c6NfNuK
+						WHwGUCdFlPpjpHE9D30V2nD9AuJIVynYXOpenY9dBST3j2Tn/vg+xvKKioQsZJg+
+						8akeor6orfFsXUIHWOFjGoCjDH9laFChiptGPA8oP0hffeCl6PI2PJGFyKWI/47f
+						nBvhT8cuYQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://onurbantribe.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onurbantribe.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://onurbantribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onurbantribe.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://onurbantribe.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://onurbantribe.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://onurbantribe.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Take Note Student Advertising Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Urban Tribe</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://onurbantribe.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nicolas</md:GivenName>
+    <md:SurName>Carey</md:SurName>
+    <md:EmailAddress>mailto:nicolas@takenoteadvertising.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Guerit</md:SurName>
+    <md:EmailAddress>mailto:ian@helastel.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/opac.hull-college.ac.uk-secure.xml b/swamid-interfederations-2.0/opac.hull-college.ac.uk-secure.xml
new file mode 100644
index 00000000..527fdc2a
--- /dev/null
+++ b/swamid-interfederations-2.0/opac.hull-college.ac.uk-secure.xml
@@ -0,0 +1,58 @@
+<?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://opac.hull-college.ac.uk/secure">
+  <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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDzCCAfegAwIBAgIJANOjhZD2KOnOMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHdlYmJ5Lmh1bGwtY29sbGVnZS5hYy51azAeFw0xMDEyMjEwOTM2MTNaFw0y
+						MDEyMTgwOTM2MTNaMCMxITAfBgNVBAMTGHdlYmJ5Lmh1bGwtY29sbGVnZS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8IuxsLcsMEuxEORkW9
+						AnFMjw02hjqgUFDxdvxidErQcU28+mhiLL5E8IE9Rl74eLMQVz4wT1HFrCXuYQcw
+						Re3p38ZVz1jryJPdIrycInbSlofAnvCtou/C6Xoax+FN4N1WzMBQEQCH2JAx0phj
+						z8bg7ZiujJsI19ubQMogbyPgpxmyUPbU2w1RM7N12XUK8x54M7oMNIczSeKcA5AL
+						bw2hAcDiDjmhjwHDQmT6pUeB4pGbjj1XcQ1+OnQtTJaDqBGXJuiTvFr3jyNa2oPv
+						MiZBfOU8AQP7SMCBc/TL3rR9dMVViKIXTV1ypd0Vf2IM7dsckDchrEfuQ/R8vK97
+						ZyECAwEAAaNGMEQwIwYDVR0RBBwwGoIYd2ViYnkuaHVsbC1jb2xsZWdlLmFjLnVr
+						MB0GA1UdDgQWBBRJ3Rc19IVRl3z9Sk6sf/ZVgjBJ+jANBgkqhkiG9w0BAQUFAAOC
+						AQEAABVnWpRznLdi/6Qs0tZigAbHQTmkB+PQQMcn3wHFiRCN8XmjCQlDDwPwjOO0
+						RgXmDs1dsnOerNdxCoDAwKgcpKvwsTNt+BrseDpLgMVyKLlTOyABP/y+Py+dROtX
+						NT38ftWChZlPQlYrXk/sxsSmwSBTkShxD67Cw28xbHjoQs+zyVM/ulX4z76tsvzu
+						9TZI38v39ORLQaev1uXFtEsesP5Jac6jbfZ/K3mfmeV5Jrirz3qiTONz7x4h/GId
+						uC6cDuM71qVAazldO/xl5o70zE8taPprobQAtnQsNipmDtYx9dcrK69k2Mj8fONH
+						hreSCClyOnSq2fhxrYHcWSAqPw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Hull College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hull College: Group Libraries Catalogue</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://library.hull-college.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Perry</md:SurName>
+    <md:EmailAddress>mailto:dperry@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:dperry@hull-college.ac.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
new file mode 100644
index 00000000..46760542
--- /dev/null
+++ b/swamid-interfederations-2.0/openathens.aston.ac.uk-oala-metadata.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIDSjCCAjKgAwIBAgIIeTpa4BHO1jIwDQYJKoZIhvcNAQEFBQAwPDEZMBcGA1UE
+						CgwQQXN0b24gVW5pdmVyc2l0eTEfMB0GA1UEAwwWb3BlbmF0aGVucy5hc3Rvbi5h
+						Yy51azAeFw0xMjA2MjUxNTAxMzNaFw0yMjA2MjUxNTAxMzNaMDwxGTAXBgNVBAoM
+						EEFzdG9uIFVuaXZlcnNpdHkxHzAdBgNVBAMMFm9wZW5hdGhlbnMuYXN0b24uYWMu
+						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiynBTPNB1iYMl464O
+						8yQghrgRuIll2drDAQX4uoytwUsPYzlR1Vg//tu/lfk/nPZvt5P3cuxnoFRjKu30
+						jDp+D0BlrJGBVKxcWwcstBl95GPLzJk6iLN2XzkQk5CEOvE/hieTfaAVts/UWSpy
+						Xjmo6lW99KsOLd5bHrJUJ3glw8wYv3q5Uy769KbQmsVi3+kfwvKWBg6uWi4C0Ea9
+						PkGzykek7n2GvjHLvwFLPFW32F6Vc3RJlCiE+eJ3iDE3DWG76GG9rJdDQCeN8aYK
+						xe8wMZaSPve76I5X8EKBdgVtOnJb2IfG6wUNFiWpDR45fWox+6oE3IydEe6nV7dg
+						WE4xAgMBAAGjUDBOMB0GA1UdDgQWBBT+uPA5lqwqcWsIWFERADKcdDri+jAfBgNV
+						HSMEGDAWgBT+uPA5lqwqcWsIWFERADKcdDri+jAMBgNVHRMEBTADAQH/MA0GCSqG
+						SIb3DQEBBQUAA4IBAQAIe+0nlbX41IeZ/2YZOmGp9OQjj2vDoDg3YDRlkP7UoMQL
+						BVBXKb0m2sCCRQVvlfcIzDORdlkH+YO/QCJDwzgKB/Lb4CtMvUrE/EItN+ZO8EtZ
+						0hoEdCagdPCJa8QhNx5oy1T45OLidoTxWrafZsWN4Jw6Gpm1luyzLIU4HtwABhW9
+						yYFFhJjiOOrlQ8ANkt+gMTFL3hYwDGTJt4iFjH4zqAAxR9yn9gCu8ajniBrQNVO7
+						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>
+						MIIDSjCCAjKgAwIBAgIIeTpa4BHO1jIwDQYJKoZIhvcNAQEFBQAwPDEZMBcGA1UE
+						CgwQQXN0b24gVW5pdmVyc2l0eTEfMB0GA1UEAwwWb3BlbmF0aGVucy5hc3Rvbi5h
+						Yy51azAeFw0xMjA2MjUxNTAxMzNaFw0yMjA2MjUxNTAxMzNaMDwxGTAXBgNVBAoM
+						EEFzdG9uIFVuaXZlcnNpdHkxHzAdBgNVBAMMFm9wZW5hdGhlbnMuYXN0b24uYWMu
+						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiynBTPNB1iYMl464O
+						8yQghrgRuIll2drDAQX4uoytwUsPYzlR1Vg//tu/lfk/nPZvt5P3cuxnoFRjKu30
+						jDp+D0BlrJGBVKxcWwcstBl95GPLzJk6iLN2XzkQk5CEOvE/hieTfaAVts/UWSpy
+						Xjmo6lW99KsOLd5bHrJUJ3glw8wYv3q5Uy769KbQmsVi3+kfwvKWBg6uWi4C0Ea9
+						PkGzykek7n2GvjHLvwFLPFW32F6Vc3RJlCiE+eJ3iDE3DWG76GG9rJdDQCeN8aYK
+						xe8wMZaSPve76I5X8EKBdgVtOnJb2IfG6wUNFiWpDR45fWox+6oE3IydEe6nV7dg
+						WE4xAgMBAAGjUDBOMB0GA1UdDgQWBBT+uPA5lqwqcWsIWFERADKcdDri+jAfBgNV
+						HSMEGDAWgBT+uPA5lqwqcWsIWFERADKcdDri+jAMBgNVHRMEBTADAQH/MA0GCSqG
+						SIb3DQEBBQUAA4IBAQAIe+0nlbX41IeZ/2YZOmGp9OQjj2vDoDg3YDRlkP7UoMQL
+						BVBXKb0m2sCCRQVvlfcIzDORdlkH+YO/QCJDwzgKB/Lb4CtMvUrE/EItN+ZO8EtZ
+						0hoEdCagdPCJa8QhNx5oy1T45OLidoTxWrafZsWN4Jw6Gpm1luyzLIU4HtwABhW9
+						yYFFhJjiOOrlQ8ANkt+gMTFL3hYwDGTJt4iFjH4zqAAxR9yn9gCu8ajniBrQNVO7
+						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>
diff --git a/swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml b/swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml
new file mode 100644
index 00000000..afb3f3c4
--- /dev/null
+++ b/swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDZTCCAk2gAwIBAgIJAKKRPRBvWSX/MA0GCSqGSIb3DQEBBQUAMEkxKjAoBgNV
+						BAoMIVJlZWQgQnVzaW5lc3MgSW5mb3JtYXRpb24gTGltaXRlZDEbMBkGA1UEAwwS
+						d3d3LmNjaW5mb3JtLmNvLnVrMB4XDTEzMDkyNjEzNTY1N1oXDTIzMDkyNDEzNTY1
+						N1owSTEqMCgGA1UECgwhUmVlZCBCdXNpbmVzcyBJbmZvcm1hdGlvbiBMaW1pdGVk
+						MRswGQYDVQQDDBJ3d3cuY2NpbmZvcm0uY28udWswggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQCiSfdM8paAx3KGFEkvIiJmFArz//0sKDgaaXY3vZVd6Stp
+						9LZffRwcJvn6bk8uLYysQt8PZW6kOTiixg3bDCVZMEzt2bq4y8evv0ewOFD3Vjc9
+						wOSor5sP3TpY4F+qzbJrpEbl+iv2JPZ+SjUnpmAdc0VRi1ZnjaSqhfu/qZ75Cri6
+						k6HMxtWxn7vXD8blFpYca2QRplBQWPYuCFNzzzXgjiImJWCYMGsVt79rbg92OV4p
+						3TcCoPzZUzLrhrSjfO348jWYURQQ9xKq6kXeF28CJ9p2FU2y/gcdrihgwaphI9pf
+						AFcoTpW2DpUXY/IYePqbTX0WmStxScXvu2/iCbnjAgMBAAGjUDBOMB0GA1UdDgQW
+						BBRAUKgdenTd14XFc5yK+VGRJ8kdoTAfBgNVHSMEGDAWgBRAUKgdenTd14XFc5yK
+						+VGRJ8kdoTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCMyWIX9ktw
+						4r/H9lNuRYQupri7ms/5DxbzXqYQVXIMwFMSeoo1flg6QtBvNcP7sKSlnZMQ4GDP
+						lVuzhS689QFBfFQjTrAoa+R+I48ko9gGkiNf34aQ4pla6ACZ57TpkGgwQWDbGGVs
+						aPIvsdzLALl3jcqTX7IGDYodV7EJAX/lBkq+9WKVHcNQRzf8UhTC+K7KUDJKtA43
+						VEcVnYm5fLKRJbNk4QV62rEk7/fH1bmIVU9Sw3Uh+atVV0hO9pjM0nySYpp87QIA
+						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://singlesignonsystest.awsviper.reedbusiness.net/ccinform/shibboleth/samlhandler" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://singlesignonsystest.awsviper.reedbusiness.net/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 Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ccinform.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Eric</md:GivenName>
+    <md:SurName>Sebastian</md:SurName>
+    <md:EmailAddress>mailto:Eric.sebastian@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eric</md:GivenName>
+    <md:SurName>Sebastian</md:SurName>
+    <md:EmailAddress>mailto:Eric.sebastian@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Farr</md:SurName>
+    <md:EmailAddress>mailto:Andrew.Farr@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
new file mode 100644
index 00000000..c3d219a9
--- /dev/null
+++ b/swamid-interfederations-2.0/openathens.keele.ac.uk-oala-metadata.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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>
+						MIID5zCCAs+gAwIBAgIJAJYE6X8FdcoOMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
+						VQQGEwJHQjEWMBQGA1UECAwNU3RhZmZvcmRzaGlyZTEOMAwGA1UEBwwFS2VlbGUx
+						HDAaBgNVBAoME1VuaXZlcnNpdHkgb2YgS2VlbGUxEzARBgNVBAsMCm9wZW5hdGhl
+						bnMxHzAdBgNVBAMMFm9wZW5hdGhlbnMua2VlbGUuYWMudWswHhcNMTMxMjE2MTYy
+						MTMyWhcNMjMxMjE3MTYyMTMyWjCBiTELMAkGA1UEBhMCR0IxFjAUBgNVBAgMDVN0
+						YWZmb3Jkc2hpcmUxDjAMBgNVBAcMBUtlZWxlMRwwGgYDVQQKDBNVbml2ZXJzaXR5
+						IG9mIEtlZWxlMRMwEQYDVQQLDApvcGVuYXRoZW5zMR8wHQYDVQQDDBZvcGVuYXRo
+						ZW5zLmtlZWxlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						oJKbr6JC7sgMXeXfP7Sj721oLA9jhqan0QnG/5NTm6v/HgkgQnjezp/uBD9OirA+
+						pyCmYUhQWLBgiD8JxH5bhhmfTGUD3iLcUeo4yKPJPzyWhHjCru2iPSAbnvl6yzAQ
+						7pBZFJktxfO4Dx6iOQsiaCC93z04GPdqL0eNt2NZNNX/X5r3HdYkzonf6DvYTEfR
+						k/xkzj35q70jDKwIrIiMUFr+xzUeQUYzVE4gysoYoaIfDvcO3kPKUgTuIZvbDsBm
+						QIkjOb3MQcqXL3JXrhv6nwCahJOTvORHxEBzD4LAaowVbtJsfU/FRKQph98FGvdZ
+						9Sef14MLaj6OLM/0CTH8vQIDAQABo1AwTjAdBgNVHQ4EFgQUxaJLsEIgT0EQ9l/i
+						X0XT8xDk764wHwYDVR0jBBgwFoAUxaJLsEIgT0EQ9l/iX0XT8xDk764wDAYDVR0T
+						BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAExw2HRuHuKy63i3dBx7siDE333dA
+						Wote0EBhijBShMcGmfNl1I1n9clrfHlm/yBuOyZABwysuTsjmNVWnaYOPGX53sxP
+						Gz2ibT6mPhZKVu0XiMaeoMnW0KO/SBCdYlLP6Z0J9NWU5c5prP9Nwmz+lcDH2qB8
+						CIjUT62cW6wo0WKs4QuucTw5zDlZCqT62yWqhb5RAlB0yy0nHDZfi69RXl5y8vhx
+						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>
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
new file mode 100644
index 00000000..1750c2d7
--- /dev/null
+++ b/swamid-interfederations-2.0/openathens.rave.ac.uk-oala-metadata.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIDQDCCAiigAwIBAgIIGb+QLd2Xcf4wDQYJKoZIhvcNAQEFBQAwNzEVMBMGA1UE
+						CgwMUmF2ZW5zYm91cm5lMR4wHAYDVQQDDBVvcGVuYXRoZW5zLnJhdmUuYWMudWsw
+						HhcNMTMwNzIyMTYxMzA5WhcNMjMwNzIyMTYxMzA5WjA3MRUwEwYDVQQKDAxSYXZl
+						bnNib3VybmUxHjAcBgNVBAMMFW9wZW5hdGhlbnMucmF2ZS5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4X5KvF9EBh9l7DqAvG93KVmReRhEcW
+						G8I9i8Uv+b5lFLQs6bWQBXp9hpEC+/AmlkP5NoI7SaDBXvCxu2PT7h2Gb0sM0IpF
+						ZCsWKpcAsJV0RVEaoCGXX95xBko/lyS3CAIRIs1QkUwx1PS9SV5SHif8AKDOWCxT
+						ykDNxeF3Sk8iQXBTsJ/soYm6qK7r44h+wqCxyAfStJC7IHbtziL1/XGY2LeZ4GZw
+						0LeJmhnLdcZCnUrej/M6wQ6i9TlghMuLj+7XyW/wipOy+k7fr+vXvHwBItn3/Kii
+						8aZ8NQMF5D6azrfiKhgEXGWHMPaqkKNYr7QVZpazA2pxE4tE53WkPH8CAwEAAaNQ
+						ME4wHQYDVR0OBBYEFMmSda3XmZAaZrHLPwDl/UJh7lCRMB8GA1UdIwQYMBaAFMmS
+						da3XmZAaZrHLPwDl/UJh7lCRMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBACuMYIy6+tNV2P6o4SspyHtXfbml23xkuN/aFw2xNfCXI6I5vn/dU9PG9Geu
+						ECffsJck1qObzQXGXJX6B0vUFJxlF7c5qbF+CUyuxe243WVeAA9NSHo7XLqrHMUG
+						8czKxdEynFvBsUE+8cwQ7K4jJfZC18BY8sGLDJFpENNMHxZAJdbyKbnDE3EbPN4e
+						JeKhksTpDBV97dUf2Dd2AzFiJyOqTBDKKPM5Afl9SHD6+IDUEDxoclh3Jgyhc4wN
+						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>
+						MIIDQDCCAiigAwIBAgIIGb+QLd2Xcf4wDQYJKoZIhvcNAQEFBQAwNzEVMBMGA1UE
+						CgwMUmF2ZW5zYm91cm5lMR4wHAYDVQQDDBVvcGVuYXRoZW5zLnJhdmUuYWMudWsw
+						HhcNMTMwNzIyMTYxMzA5WhcNMjMwNzIyMTYxMzA5WjA3MRUwEwYDVQQKDAxSYXZl
+						bnNib3VybmUxHjAcBgNVBAMMFW9wZW5hdGhlbnMucmF2ZS5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4X5KvF9EBh9l7DqAvG93KVmReRhEcW
+						G8I9i8Uv+b5lFLQs6bWQBXp9hpEC+/AmlkP5NoI7SaDBXvCxu2PT7h2Gb0sM0IpF
+						ZCsWKpcAsJV0RVEaoCGXX95xBko/lyS3CAIRIs1QkUwx1PS9SV5SHif8AKDOWCxT
+						ykDNxeF3Sk8iQXBTsJ/soYm6qK7r44h+wqCxyAfStJC7IHbtziL1/XGY2LeZ4GZw
+						0LeJmhnLdcZCnUrej/M6wQ6i9TlghMuLj+7XyW/wipOy+k7fr+vXvHwBItn3/Kii
+						8aZ8NQMF5D6azrfiKhgEXGWHMPaqkKNYr7QVZpazA2pxE4tE53WkPH8CAwEAAaNQ
+						ME4wHQYDVR0OBBYEFMmSda3XmZAaZrHLPwDl/UJh7lCRMB8GA1UdIwQYMBaAFMmS
+						da3XmZAaZrHLPwDl/UJh7lCRMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBACuMYIy6+tNV2P6o4SspyHtXfbml23xkuN/aFw2xNfCXI6I5vn/dU9PG9Geu
+						ECffsJck1qObzQXGXJX6B0vUFJxlF7c5qbF+CUyuxe243WVeAA9NSHo7XLqrHMUG
+						8czKxdEynFvBsUE+8cwQ7K4jJfZC18BY8sGLDJFpENNMHxZAJdbyKbnDE3EbPN4e
+						JeKhksTpDBV97dUf2Dd2AzFiJyOqTBDKKPM5Afl9SHD6+IDUEDxoclh3Jgyhc4wN
+						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>
diff --git a/swamid-interfederations-2.0/openathens.xperthr.co.uk-shibboleth.xml b/swamid-interfederations-2.0/openathens.xperthr.co.uk-shibboleth.xml
new file mode 100644
index 00000000..eacfc109
--- /dev/null
+++ b/swamid-interfederations-2.0/openathens.xperthr.co.uk-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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"/>
+  </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>
+						MIID0zCCArugAwIBAgIJAKdy83q7VjjVMA0GCSqGSIb3DQEBBQUAME8xKjAoBgNV
+						BAoTIVJlZWQgQnVzaW5lc3MgSW5mb3JtYXRpb24gTGltaXRlZDEhMB8GA1UEAxMY
+						b3BlbmF0aGVucy54cGVydGhyLmNvLnVrMB4XDTEzMDIyMDA5MDM0MVoXDTIzMDIx
+						ODA5MDM0MVowTzEqMCgGA1UEChMhUmVlZCBCdXNpbmVzcyBJbmZvcm1hdGlvbiBM
+						aW1pdGVkMSEwHwYDVQQDExhvcGVuYXRoZW5zLnhwZXJ0aHIuY28udWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2162/mC0Gz3ROipcljMbf1GgybliO
+						KbFF3u/YkRjUsDtZEu0qmAjAG8SiyrdfVeFo0j3UJXaU7cxk4dlTObGCT8CyvcvH
+						Hx2mmv/neiSSxNtgO3MTR98HMM10BukTmElxzqCKZkv4HlP6HnNBcUPHLsjZI5O5
+						wuUQ3w+CVtpzDt5OrHMFuNa0zfMX4u+BGH45vOCdV/k6ATDwSM1owTPY/OFweXff
+						VqRfTWGEyuttfsdasLY4vHQEdvDzN6lr7IFjGWyTPE58kusOhP/L1SUIYb+0Ex//
+						GAbEDH9u1FCuMRghKbAiIALd1JwlqY8CNw7ge2MdUc3k6KlVo+UkIqj/AgMBAAGj
+						gbEwga4wHQYDVR0OBBYEFITidDHmP8InJnv6gxnO7KJJRR5eMH8GA1UdIwR4MHaA
+						FITidDHmP8InJnv6gxnO7KJJRR5eoVOkUTBPMSowKAYDVQQKEyFSZWVkIEJ1c2lu
+						ZXNzIEluZm9ybWF0aW9uIExpbWl0ZWQxITAfBgNVBAMTGG9wZW5hdGhlbnMueHBl
+						cnRoci5jby51a4IJAKdy83q7VjjVMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
+						BQADggEBAIjjC5ksqfCLMGDnJ7eTTmcbulNT5obU/LywU8xt6A5quQk1GiQVzwtn
+						8oWIk5sQrnLAYKTbdJRKwb7LxzmachZjK7K7ynk417BgxLUFyZ23bp/KpvFSLbEf
+						UBlXqICTyVNICvIBdU3X5Q2mQM0vYS97458YZvKc0FvIrPCdtPLqNKl/tHVz8v0z
+						aGbG/lyqPs/EGFeGDglSIn6OznOg39M+CERTjbi6MWYdQjIfpHNpyfkaOHWDd3qJ
+						G00MtLi3tY1/2X6iice+w3Jc5sQ7pDpiK6XkjmDlHeVhzu9iP1cdF/r3tD06iFoj
+						jHeoqxMNf447T2ASpYbVkR+zuL9RA8I=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathens.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://openathens.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">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>Mark</md:GivenName>
+    <md:SurName>Gale</md:SurName>
+    <md:EmailAddress>mailto:mark.gale@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Gale</md:SurName>
+    <md:EmailAddress>mailto:mark.gale@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Farr</md:SurName>
+    <md:EmailAddress>mailto:Andrew.Farr@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
new file mode 100644
index 00000000..2ffd841d
--- /dev/null
+++ b/swamid-interfederations-2.0/openathensr.guildford.ac.uk-oala-metadata.xml
@@ -0,0 +1,80 @@
+<?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>
+      <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>
+						MIIDVjCCAj6gAwIBAgIIe3m5sSwnVj4wDQYJKoZIhvcNAQEFBQAwQjEaMBgGA1UE
+						CgwRR3VpbGRmb3JkIENvbGxlZ2UxJDAiBgNVBAMMG29wZW5hdGhlbnNyLmd1aWxk
+						Zm9yZC5hYy51azAeFw0xMjA2MTgwOTU0MDhaFw0yMjA2MTgwOTU0MDhaMEIxGjAY
+						BgNVBAoMEUd1aWxkZm9yZCBDb2xsZWdlMSQwIgYDVQQDDBtvcGVuYXRoZW5zci5n
+						dWlsZGZvcmQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa
+						jH7z+VqWeDSvhMnEFsD4sZsOfJhV3NX7HGVHCVqTFsymT0wEBvO0b8b7lZCKV9b/
+						H02a+SMOJ2LTvotBv8PZRAewXduxXJ6oE7WHzQhjuoEE+yKJD/QM1Si9KAABbwHg
+						Zue3CnUGhxxSM775UBtXiW9H6eKJTwl1IRJCVPw5HiLAjFhQxKCz0B+40a6oGxUt
+						S6UPfWHL+Crpyl8aax6W9XkIfscztQKwDBna4n6XSZTX9Kx3DZccj8hy03UW+GSv
+						ioBJjgokeECz6XO3gO5BH5JJyILascOCYBfabt4NlJ+cA53D96sUg8OLi5RkORnB
+						Vj1ksTMHxy/Qtgtna+JxAgMBAAGjUDBOMB0GA1UdDgQWBBRFFB5eZ8WhztAdakWm
+						cUfH9sR0bDAfBgNVHSMEGDAWgBRFFB5eZ8WhztAdakWmcUfH9sR0bDAMBgNVHRME
+						BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAfA4k20dG3AmWR/ubqcyMTGk8cs4o6
+						FQ/E4wYSC5CuAlrE/8NC9r52FcQ6vhoVKGKeWMvT9k7/z7lz+GOoF3TjzEk2JKhC
+						iQpsPXCCCngMORcqAJVHow/Q3MEOLrr2G/Z6FMygD67bU6svpF5AZWY95xMQcVCD
+						fUmYMaQlV7g+KidGHADcvmK4xufY93k+depQ2OM4rgWwk4LrtZJ+GisQR/2LJPtD
+						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>
+						MIIDVjCCAj6gAwIBAgIIe3m5sSwnVj4wDQYJKoZIhvcNAQEFBQAwQjEaMBgGA1UE
+						CgwRR3VpbGRmb3JkIENvbGxlZ2UxJDAiBgNVBAMMG29wZW5hdGhlbnNyLmd1aWxk
+						Zm9yZC5hYy51azAeFw0xMjA2MTgwOTU0MDhaFw0yMjA2MTgwOTU0MDhaMEIxGjAY
+						BgNVBAoMEUd1aWxkZm9yZCBDb2xsZWdlMSQwIgYDVQQDDBtvcGVuYXRoZW5zci5n
+						dWlsZGZvcmQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa
+						jH7z+VqWeDSvhMnEFsD4sZsOfJhV3NX7HGVHCVqTFsymT0wEBvO0b8b7lZCKV9b/
+						H02a+SMOJ2LTvotBv8PZRAewXduxXJ6oE7WHzQhjuoEE+yKJD/QM1Si9KAABbwHg
+						Zue3CnUGhxxSM775UBtXiW9H6eKJTwl1IRJCVPw5HiLAjFhQxKCz0B+40a6oGxUt
+						S6UPfWHL+Crpyl8aax6W9XkIfscztQKwDBna4n6XSZTX9Kx3DZccj8hy03UW+GSv
+						ioBJjgokeECz6XO3gO5BH5JJyILascOCYBfabt4NlJ+cA53D96sUg8OLi5RkORnB
+						Vj1ksTMHxy/Qtgtna+JxAgMBAAGjUDBOMB0GA1UdDgQWBBRFFB5eZ8WhztAdakWm
+						cUfH9sR0bDAfBgNVHSMEGDAWgBRFFB5eZ8WhztAdakWmcUfH9sR0bDAMBgNVHRME
+						BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAfA4k20dG3AmWR/ubqcyMTGk8cs4o6
+						FQ/E4wYSC5CuAlrE/8NC9r52FcQ6vhoVKGKeWMvT9k7/z7lz+GOoF3TjzEk2JKhC
+						iQpsPXCCCngMORcqAJVHow/Q3MEOLrr2G/Z6FMygD67bU6svpF5AZWY95xMQcVCD
+						fUmYMaQlV7g+KidGHADcvmK4xufY93k+depQ2OM4rgWwk4LrtZJ+GisQR/2LJPtD
+						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>
diff --git a/swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml b/swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml
new file mode 100644
index 00000000..b9fdfd04
--- /dev/null
+++ b/swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathenstest1.test.openathens.net/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-02T14:42:55Z"/>
+  </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>
+						MIIDjTCCAnWgAwIBAgIJALTj9dSJGZ41MA0GCSqGSIb3DQEBBQUAMF0xLTArBgNV
+						BAoMJEVkdXNlcnYgT3BlbiBBdGhlbnMgU3VwcG9ydCBUZXN0IFNQMTEsMCoGA1UE
+						Awwjb3BlbmF0aGVuc3Rlc3QxLnRlc3Qub3BlbmF0aGVucy5uZXQwHhcNMTMwODAy
+						MDkyNTU2WhcNMjMwNzMxMDkyNTU2WjBdMS0wKwYDVQQKDCRFZHVzZXJ2IE9wZW4g
+						QXRoZW5zIFN1cHBvcnQgVGVzdCBTUDExLDAqBgNVBAMMI29wZW5hdGhlbnN0ZXN0
+						MS50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAsSxzVK27FBg2REsAgVGGmMEW5RPrxkiLh5NWeIpxyFeSG7x5Okp8W+zP
+						/555EqKqXgcDGLGsrdOEWEU/nZB0FvP90hBCNsbbpmj0vI6lYO0USh4JCfxB1RoW
+						A9+t2nflhOeQxoLKm+RHxa2HPGDfKoiGco0TZjVgS1dXNoIl197JCvCe5MnoVo+m
+						r5ziPm/QM9mj1zQf4Di4Pm0FuklnLRJoi/mAPB8Nz3r2/MeBCyLdTn64ZwxddvdD
+						tyNwTWmL1Xm7Xq4j32iIWoMU5Mft7NodXOQDIotMIC4z+4DanXdyVi9ly2ZO5NLa
+						zyf/Ejq+iZayUuwMOmmTsSUYDY3xNQIDAQABo1AwTjAdBgNVHQ4EFgQUMpM47pKS
+						2C+RkT90fWLYvsNZSJEwHwYDVR0jBBgwFoAUMpM47pKS2C+RkT90fWLYvsNZSJEw
+						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAT22VEuJbmNjFz1EnSRJF
+						GJaQg5onQPfPT0GgJQwdgNzR4Wyyff0kXy8VYfEDrJrAypSrDm73xxyQH6IMruQ4
+						mphdZbeO+48utZJcvg52PorqRI3UEP+CeScjsr7gsDAmleXmk7P6khxkibbjeNQJ
+						Zl03IQYnAQU8z0sfuM6iy3wT6bLaVmpg4O88P4Sl51wnZFwiBfAD//zmwRn57E1n
+						ZtdbHmRILcNxHFKmp7FmZ4pCd5ZcINRVGMA5XLO9aAzzTazT2YS/RSOiSoWcoGYG
+						FJRHW+mtZ5VBgzIP0OnTOQQDoLrnju/M9wplIKP5LyVnQ/b+i3eTpvbRI0fYQAh9
+						UQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDjTCCAnWgAwIBAgIJALTj9dSJGZ41MA0GCSqGSIb3DQEBBQUAMF0xLTArBgNV
+						BAoMJEVkdXNlcnYgT3BlbiBBdGhlbnMgU3VwcG9ydCBUZXN0IFNQMTEsMCoGA1UE
+						Awwjb3BlbmF0aGVuc3Rlc3QxLnRlc3Qub3BlbmF0aGVucy5uZXQwHhcNMTMwODAy
+						MDkyNTU2WhcNMjMwNzMxMDkyNTU2WjBdMS0wKwYDVQQKDCRFZHVzZXJ2IE9wZW4g
+						QXRoZW5zIFN1cHBvcnQgVGVzdCBTUDExLDAqBgNVBAMMI29wZW5hdGhlbnN0ZXN0
+						MS50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAsSxzVK27FBg2REsAgVGGmMEW5RPrxkiLh5NWeIpxyFeSG7x5Okp8W+zP
+						/555EqKqXgcDGLGsrdOEWEU/nZB0FvP90hBCNsbbpmj0vI6lYO0USh4JCfxB1RoW
+						A9+t2nflhOeQxoLKm+RHxa2HPGDfKoiGco0TZjVgS1dXNoIl197JCvCe5MnoVo+m
+						r5ziPm/QM9mj1zQf4Di4Pm0FuklnLRJoi/mAPB8Nz3r2/MeBCyLdTn64ZwxddvdD
+						tyNwTWmL1Xm7Xq4j32iIWoMU5Mft7NodXOQDIotMIC4z+4DanXdyVi9ly2ZO5NLa
+						zyf/Ejq+iZayUuwMOmmTsSUYDY3xNQIDAQABo1AwTjAdBgNVHQ4EFgQUMpM47pKS
+						2C+RkT90fWLYvsNZSJEwHwYDVR0jBBgwFoAUMpM47pKS2C+RkT90fWLYvsNZSJEw
+						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAT22VEuJbmNjFz1EnSRJF
+						GJaQg5onQPfPT0GgJQwdgNzR4Wyyff0kXy8VYfEDrJrAypSrDm73xxyQH6IMruQ4
+						mphdZbeO+48utZJcvg52PorqRI3UEP+CeScjsr7gsDAmleXmk7P6khxkibbjeNQJ
+						Zl03IQYnAQU8z0sfuM6iy3wT6bLaVmpg4O88P4Sl51wnZFwiBfAD//zmwRn57E1n
+						ZtdbHmRILcNxHFKmp7FmZ4pCd5ZcINRVGMA5XLO9aAzzTazT2YS/RSOiSoWcoGYG
+						FJRHW+mtZ5VBgzIP0OnTOQQDoLrnju/M9wplIKP5LyVnQ/b+i3eTpvbRI0fYQAh9
+						UQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathenstest1.test.openathens.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://openathenstest1.test.openathens.net/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openathenstest1.test.openathens.net/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openathenstest1.test.openathens.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 Open Athens Support Test SP1</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eduserv.org.uk/Identity-Access/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Westhoff</md:SurName>
+    <md:EmailAddress>mailto:jw@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Westhoff</md:SurName>
+    <md:EmailAddress>mailto:jw@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml b/swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml
new file mode 100644
index 00000000..233de2e9
--- /dev/null
+++ b/swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathenstest2.test.openathens.net/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-02T14:50:35Z"/>
+  </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>
+						MIIDjTCCAnWgAwIBAgIJAPpeUfXoPz3SMA0GCSqGSIb3DQEBBQUAMF0xLTArBgNV
+						BAoMJEVkdXNlcnYgT3BlbiBBdGhlbnMgU3VwcG9ydCBUZXN0IFNQMjEsMCoGA1UE
+						Awwjb3BlbmF0aGVuc3Rlc3QyLnRlc3Qub3BlbmF0aGVucy5uZXQwHhcNMTMwODAy
+						MDkyNTMxWhcNMjMwNzMxMDkyNTMxWjBdMS0wKwYDVQQKDCRFZHVzZXJ2IE9wZW4g
+						QXRoZW5zIFN1cHBvcnQgVGVzdCBTUDIxLDAqBgNVBAMMI29wZW5hdGhlbnN0ZXN0
+						Mi50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAwGzRtVjqQ/TSm4mrrT15rMui+ndGNsKg0xMYynVx1EvfBNLGEjMuujsG
+						eDRac1cRJ1rNDCR9MMM3UGlj4OAwDo5scgdXhcCbOmaCKHg7yzoHNAKmrNPnGSGr
+						ELONSoUw+92TqMjfoat2mHDOLIwQnUFsRE2BjLrfK8Nx+Vvnc6SlcTEWDT0Sk7Kb
+						zL0ZohL6fEMf48CphVookAdwAeeP8/3YjVUQxwld8FhRyhVa93nuG5hr7X54xyeO
+						tmo6orjd/EC8dkvj9zsMx/G6LiIn+pVEjy4OQFagIi6sC4u1OhreHHyBVe7GU15w
+						HeKQ5DFHJ0MNudzJbxt8FAYqDzk8FwIDAQABo1AwTjAdBgNVHQ4EFgQUM3B4Mjiy
+						V+nN1qlddtPfLMH+7I4wHwYDVR0jBBgwFoAUM3B4MjiyV+nN1qlddtPfLMH+7I4w
+						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAYdrxZqo2dnOxGqIjpOWS
+						EYUyVXPWSuI0z2B+qJmFNqvmui9XY6ENtm/1xS/YsXfgfAzUmSi4SjxSZOHO+5Ck
+						dQ2GpyurAotAOYHNG6sDn2BJgNZwACbBZhuy3YaOuJi98P0UrrfJv25l6ozPO9kO
+						FEofXzBgWbozFdiM6n+eVf/KNg5a+JuWRmSoCWe0YODn3gHws7eUs97uKVKo8BCU
+						yrt2fpGoiLLnIbQcsxWn7wHsqBNguXCdOi4cxemzaXstcVxT03fwrOGmRTSuUkd/
+						ikEWkSYQ6y6rO/PIhSfgjkyaGizGDtYrG1vpjrlnWaIzHB7+hwqCHu6amKOsqJvJ
+						6g==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDjTCCAnWgAwIBAgIJAPpeUfXoPz3SMA0GCSqGSIb3DQEBBQUAMF0xLTArBgNV
+						BAoMJEVkdXNlcnYgT3BlbiBBdGhlbnMgU3VwcG9ydCBUZXN0IFNQMjEsMCoGA1UE
+						Awwjb3BlbmF0aGVuc3Rlc3QyLnRlc3Qub3BlbmF0aGVucy5uZXQwHhcNMTMwODAy
+						MDkyNTMxWhcNMjMwNzMxMDkyNTMxWjBdMS0wKwYDVQQKDCRFZHVzZXJ2IE9wZW4g
+						QXRoZW5zIFN1cHBvcnQgVGVzdCBTUDIxLDAqBgNVBAMMI29wZW5hdGhlbnN0ZXN0
+						Mi50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAwGzRtVjqQ/TSm4mrrT15rMui+ndGNsKg0xMYynVx1EvfBNLGEjMuujsG
+						eDRac1cRJ1rNDCR9MMM3UGlj4OAwDo5scgdXhcCbOmaCKHg7yzoHNAKmrNPnGSGr
+						ELONSoUw+92TqMjfoat2mHDOLIwQnUFsRE2BjLrfK8Nx+Vvnc6SlcTEWDT0Sk7Kb
+						zL0ZohL6fEMf48CphVookAdwAeeP8/3YjVUQxwld8FhRyhVa93nuG5hr7X54xyeO
+						tmo6orjd/EC8dkvj9zsMx/G6LiIn+pVEjy4OQFagIi6sC4u1OhreHHyBVe7GU15w
+						HeKQ5DFHJ0MNudzJbxt8FAYqDzk8FwIDAQABo1AwTjAdBgNVHQ4EFgQUM3B4Mjiy
+						V+nN1qlddtPfLMH+7I4wHwYDVR0jBBgwFoAUM3B4MjiyV+nN1qlddtPfLMH+7I4w
+						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAYdrxZqo2dnOxGqIjpOWS
+						EYUyVXPWSuI0z2B+qJmFNqvmui9XY6ENtm/1xS/YsXfgfAzUmSi4SjxSZOHO+5Ck
+						dQ2GpyurAotAOYHNG6sDn2BJgNZwACbBZhuy3YaOuJi98P0UrrfJv25l6ozPO9kO
+						FEofXzBgWbozFdiM6n+eVf/KNg5a+JuWRmSoCWe0YODn3gHws7eUs97uKVKo8BCU
+						yrt2fpGoiLLnIbQcsxWn7wHsqBNguXCdOi4cxemzaXstcVxT03fwrOGmRTSuUkd/
+						ikEWkSYQ6y6rO/PIhSfgjkyaGizGDtYrG1vpjrlnWaIzHB7+hwqCHu6amKOsqJvJ
+						6g==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathenstest2.test.openathens.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://openathenstest2.test.openathens.net/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openathenstest2.test.openathens.net/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openathenstest2.test.openathens.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 Open Athens Support Test SP2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eduserv.org.uk/Identity-Access/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Westhoff</md:SurName>
+    <md:EmailAddress>mailto:jw@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Westhoff</md:SurName>
+    <md:EmailAddress>mailto:jw@eduserv.org.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
new file mode 100644
index 00000000..42a92941
--- /dev/null
+++ b/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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://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>
+      <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">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</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
+BAMTBnR3d3cxMTAeFw0xMzA0MTYxNTA3MzhaFw0yMzA0MTQxNTA3MzhaMBExDzAN
+BgNVBAMTBnR3d3cxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAP4a
+E7gfLARdAbSMy3ntWsCqI0M4uXkeN8vZe2aiBUGi0hN9TuN9DO8mr4P8EXjhT0qQ
+/tfff3FOJggFQwT8xXjSxevD3/fQfc31cc19W48xLzZ2299w0GlT6ABVeykixnT/
+2N4BUFwlGKKSYZ25VvF7HStpO8PoqoOU+vTxxOSHv+k8r/E+e8/Yqy1x+tYwjtCp
+mRTuej2AEg7EvCPez4+63GcSkSFJDTkAdUkIsQwBvBjceeeNjPrfDdcVriYq8zEq
+aHlAM88NOWqkzhFn7RDDQ9I40Km2sv+zEwHn+cYe8RQktx+7kTocNfttlc6Gj3cx
+wBo6gLCYlDtE9Bp4Hg0CAwEAAaM0MDIwEQYDVR0RBAowCIIGdHd3dzExMB0GA1Ud
+DgQWBBTEKetHu5XysV19YPdBXllRdGy+0jANBgkqhkiG9w0BAQUFAAOCAQEAIRi/
+IZLuNXS7kk8e6Hj4QW0eeqNBpHRHVPC/J2/2C9GpRVEPCmsYTRhIDc6y1XDEpJlW
+u6J75jXhfSisrzaVYvDTLymYV2qhob3hqlM39PGcyXWvnyT8HWQA6nhOGIIq2K2c
+M+dr9RBlPlv+0rJq07ZbkNJqfxu4tigKOP/+sJiMuORso9uk4Ak+0cX+yb/48zqE
+6qUUo3jx8o3Uv51YiYTaPeMacxDH4TcMEZOttUmY7SH7jkZCoRlpFnozCB6QwfA/
+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">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</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="eduPersonPrincipalName" Name="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="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="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">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/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 8e67777f..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,8 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-08-09T11:34:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNINETT OpenWiki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">UNINETT OpenWiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</mdui:Description>
+        <mdui:Description xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
         </ds:X509Data>
@@ -12,24 +32,27 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a wikifarm where Feide users can create their own wiki.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikifarm hvor Feidebrukere kan lage egne wikier.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="nn">UNINETT OpenWiki er ein wikifarm der Feidebrukarar kan lage eigne wikiar.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md: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:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" 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:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:Company>UNINETT AS</md:Company>
-    <md:GivenName>Andreas</md:GivenName>
-    <md:SurName>Solberg</md:SurName>
-    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
-    <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
+    <md:GivenName>Feide Support</md:GivenName>
+    <md:EmailAddress>support@feide.no</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/opn-shibb.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/opn-shibb.hosted.exlibrisgroup.com-shib.xml
new file mode 100644
index 00000000..128dde33
--- /dev/null
+++ b/swamid-interfederations-2.0/opn-shibb.hosted.exlibrisgroup.com-shib.xml
@@ -0,0 +1,84 @@
+<?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>
+      <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>
+						MIIC3DCCAcSgAwIBAgIJAN/TZ90ziE5NMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB2FpbzAwMTEwHhcNMTQxMTAzMDg1NDE2WhcNMjQxMDMxMDg1NDE2WjASMRAw
+						DgYDVQQDEwdhaW8wMDExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						nQx6etOky8LDPvPoToHiJSBUUbPpQxiLjqkEvq+FDfpM4PFPMUJ2TjBh80tv2cXj
+						XiWLfQkTWtLlf+abgvENsiGaHlK2AZ5b8t60q+42VKpU59G3wz8MusZ36HWrKVQC
+						Zu9tTjVv/0ghCHEkOQpqd67HTi9aAu0YnrKO55qky/e/cYi9um5DnjLlF+crQ4yr
+						gZM/8LQctNdhogyBcAt6xBg8Jr2XHW1xsfkSkDIoYZXayCvAvcc0Mo7NNH+N5BYp
+						27LP0y2iwzLJW8Qed08YvSmW1r958jSVgbytxciA7Lq2qkYqHijj3vgThN50btxY
+						mVKrJb2kJ3eC9mZKfZGZnwIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDExMB0G
+						A1UdDgQWBBRi4CFW+JRCErw9kobNaWoBKMNngzANBgkqhkiG9w0BAQUFAAOCAQEA
+						Yki1ymUQA9dc6srKtRlQ+ve4SKgz/P52iL9nr4AUWa4nhXKcbFpSs1NSni11Cmyj
+						W9d2eOoamn2xBVY1DhsuHD2AMHggzmC9/OJoALwpK8Elan/Ax5ixWcphvv7b0dMT
+						aQHbE5PSPEPEy9zVle7EXtDsViu1D++1VaX0lXwZpbwT6c3nEmrnVjJRs+VWElQk
+						/QU/IhyoAsyU3z5FdHN7/4vnuL1JjOoPmo+ZVGNBpGYhGKty8wxHB8/dh5GlnkkJ
+						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>
diff --git a/swamid-interfederations-2.0/osms.maps-ict.com.xml b/swamid-interfederations-2.0/osms.maps-ict.com.xml
new file mode 100644
index 00000000..e1c330e9
--- /dev/null
+++ b/swamid-interfederations-2.0/osms.maps-ict.com.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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>
+						MIIC9DCCAdygAwIBAgIJAJyVBMODdwzEMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+						BAMTD2lwLTEwLTMyLTE5LTEwNjAeFw0xMzExMjgxNjQ3NDZaFw0yMzExMjYxNjQ3
+						NDZaMBoxGDAWBgNVBAMTD2lwLTEwLTMyLTE5LTEwNjCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBANTrpuu5ybIeAyxaWJnZxMplwrKL/mgJny/7/nSMJwsg
+						FJ3StMih3uGlOcpjAryS1LgwRZf8P/Y9zsUkT6OSsytGhBbJr9z8H4bMK3ADfDAm
+						/kM1A1t57z4aw6d/N8MHsJxyXTjVq+9xx9fpDuq3G+ypWotiOhhZ5N8MbMH6WOwN
+						cPYZv5/kXhuLwJvGgEH8rNjzGI0eIeNJg2OMtuZ3PQG7l+Lzy2b0T4d9Zhg22vJt
+						5k2ErBjDWW5Q2sdAjYv64lZJMEiaWlXmxi9TU/N4TaABd8FUKOAOng109uAkoDKX
+						J8dUJJI7qxQsp4hMlPzk6VFutijpVdK/YFu3BEa2Ot0CAwEAAaM9MDswGgYDVR0R
+						BBMwEYIPaXAtMTAtMzItMTktMTA2MB0GA1UdDgQWBBR2v7XhnQu0Ul9J+aahR2Zw
+						GvD2ajANBgkqhkiG9w0BAQUFAAOCAQEAW3w9Vga1Y1e+dGRpO91PdxEPfbb46/XK
+						U3G9ljGdtXj1cC+TRnzFWJefIafn29U2ZMDzeofZeohOxyJhPgqo5Slq7c8DOamm
+						Hk4NjPmAf5g8UkuROx6qIYBkj7nlJY89bGibNgAUS0k77W8+i9sDnEA7+GiXCLyS
+						xWZrqNLhfdUH4yPJ+++IRfG7Ov4gg6lLjpHtah6YXmB30VFQl8rDc2XHr/O/q64w
+						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>
diff --git a/swamid-interfederations-2.0/ossdev.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ossdev.bsp.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..6fe89b72
--- /dev/null
+++ b/swamid-interfederations-2.0/ossdev.bsp.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,76 @@
+<?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://ossdev.bsp.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-26T09:16:33Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ossdev.bsp.ox.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>
+						MIIEljCCA36gAwIBAgIJAL60sh6RnutVMA0GCSqGSIb3DQEBBQUAMIHLMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
+						MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsMHkJ1c2luZXNz
+						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEcMBoGA1UEAwwTb3NzZGV2LmJzcC5veC5h
+						Yy51azEvMC0GCSqGSIb3DQEJARYgb3BzLXRlYW1AbWFpbGxpc3QuYWRtaW4ub3gu
+						YWMudWswHhcNMTIwNDIwMDgwNzEyWhcNMjIwNDE4MDgwNzEyWjCByzELMAkGA1UE
+						BhMCR0IxFDASBgNVBAgMC094Zm9yZHNoaXJlMQ8wDQYDVQQHDAZPeGZvcmQxHTAb
+						BgNVBAoMFFVuaXZlcnNpdHkgb2YgT3hmb3JkMScwJQYDVQQLDB5CdXNpbmVzcyBT
+						ZXJ2aWNlcyBhbmQgUHJvamVjdHMxHDAaBgNVBAMME29zc2Rldi5ic3Aub3guYWMu
+						dWsxLzAtBgkqhkiG9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFkbWluLm94LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4rRdHCcVuu6oz7AM
+						wQfDCXAm+0yoSqVpTShs2+uW2wr6VxCzgmLlwONGazhA3jZR/0ojRQJT35j35RSk
+						pL6RE8Jy9zZXD/GQ7HR5H/LcIo3AXKv9FHhRVk5bIgcp6/rS/chlJQ3TKIE1RMHn
+						lMrKCv6WyYyKIe6qJJt4DN/rtNWaIZVkzjAZD+8QJOBEMJi7iWnctQ3EF9nzcuS1
+						RJBTc2aJhyShlHEEsBLV20id8pkxKNfbZeMSFaQw33UYdtJh2JPmLCfcciQZApIK
+						i5B8IhBVpn2qpelM5Pq5jl9QhfASM0+5xD9oWfM36fLfJXIBRjz9M5CWYw8FxEi4
+						AvVT3wIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
+						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUtZDn+cXPWWmCgDu2phPc
+						jplSjIQwHwYDVR0jBBgwFoAUtZDn+cXPWWmCgDu2phPcjplSjIQwDQYJKoZIhvcN
+						AQEFBQADggEBALFrP69gFcbGc90D0HJlwzjnRo5hVAcxxXN89gCRsEZkqQ3O+yWO
+						XWMW7XJB0ELH9pooNovUpumlgmW6iuzZI0BksQ/8mbIZGicrHDqnyGp0KQYHWmPl
+						8hesAETEYDNJ6cUT5FKxzMgydHP9fDB9w/GMLlxYtbslM2vj4M1eL6xVC2q1j944
+						lQOR5Bc2Iy/6Btvksi+ow/omQFSObI38xadNJ728KJeHBhVOZ8YhZuV6D1byjuNz
+						UmbxIdIWDNzlHZ0uKB8tDHzZ5YbPQEKEOWLwH1Bk6ws+sbt96iZaPFIQ62VZnYoY
+						YxU030ZIxuip1Y4fwxQO9oIOpSCiB+C0W+U=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdev.bsp.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://ossdev.bsp.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://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ossdev.bsp.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: Oracle Student Systems Development Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stephan</md:GivenName>
+    <md:SurName>Eckweiler</md:SurName>
+    <md:EmailAddress>mailto:stephan.eckweiler@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ossqa.uas.ox.ac.uk-test-shibboleth.xml b/swamid-interfederations-2.0/ossqa.uas.ox.ac.uk-test-shibboleth.xml
new file mode 100644
index 00000000..2889f6ce
--- /dev/null
+++ b/swamid-interfederations-2.0/ossqa.uas.ox.ac.uk-test-shibboleth.xml
@@ -0,0 +1,115 @@
+<?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://ossqa.uas.ox.ac.uk/test/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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ossqa.uas.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>
+						MIIFeTCCBGGgAwIBAgIJAJnksbFAueL/MA0GCSqGSIb3DQEBBQUAMIHKMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
+						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
+						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEbMBkGA1UEAxMSb3NzcWEudWFzLm94LmFj
+						LnVrMS8wLQYJKoZIhvcNAQkBFiBvcHMtdGVhbUBtYWlsbGlzdC5hZG1pbi5veC5h
+						Yy51azAeFw0xMjAzMDUxMzI0MDdaFw0yMjAzMDMxMzI0MDdaMIHKMQswCQYDVQQG
+						EwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsG
+						A1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNl
+						cnZpY2VzIGFuZCBQcm9qZWN0czEbMBkGA1UEAxMSb3NzcWEudWFzLm94LmFjLnVr
+						MS8wLQYJKoZIhvcNAQkBFiBvcHMtdGVhbUBtYWlsbGlzdC5hZG1pbi5veC5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/+g95ivEoWaKPygo1o
+						GiDFprts8tNb/Lb9UmG/ykZaMY+yB+66NOg7aJDfsBCEzGCuuZuxeXNF6sUhUmVE
+						cvIIdP/hXzUEiCPz5LcfU2GrVTlfDn+njnIS+n19wgu/R0GZTbMk+4u4S7UxMq4z
+						JCYLajpfKTTSLAsTKRdy6LM68W+5MphvgLNWCkqgD+9L9zYtrcLrVqh+t1KVSZ+0
+						kpCTESGzWGCMh1t9BoLt49Im//01nSAu8XyuOrL2w3oxxSO5/k7YJi6RPJ8nEQWj
+						+nUaroumpaC1UBnbvF4UyB6X4ebjCNkdh+Tiubkys/DLMz7CmHCg2oTE/HqY2+UR
+						WYcCAwEAAaOCAV4wggFaMAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
+						U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTOuAowx121jbiBBs1/
+						FqbE4pNPaDCB/wYDVR0jBIH3MIH0gBTOuAowx121jbiBBs1/FqbE4pNPaKGB0KSB
+						zTCByjELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQH
+						EwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMScwJQYDVQQL
+						Ex5CdXNpbmVzcyBTZXJ2aWNlcyBhbmQgUHJvamVjdHMxGzAZBgNVBAMTEm9zc3Fh
+						LnVhcy5veC5hYy51azEvMC0GCSqGSIb3DQEJARYgb3BzLXRlYW1AbWFpbGxpc3Qu
+						YWRtaW4ub3guYWMudWuCCQCZ5LGxQLni/zANBgkqhkiG9w0BAQUFAAOCAQEAEf7S
+						+TzVC8Zq65a1hcRCmXGHkBTOchnPlqFrm4lqJkjItX6B+wE985dy/DV4z+LoypFs
+						mOpJZI2A44jznpTZj0gV4r1xcjXnpS/JiQtRyQ64NDQwmIJTPU1+oyqYaMu0Nh27
+						FRvT9F/sixwPpax4OcyOXqIecawLTTcUf6KemTRmc0zFmSLgCBfXzO0UST7s4nIW
+						zLcEiFKmS/2I3iGPJa+BVROcRn0XdwOQsjD5sJpvnrOd5vnMFgv5Ib6P21hNJtXj
+						X09UugykpbT5QYHsHArFhfBRDDSVYroBYZTQHn+pGpHugLzrZv+R6eNNN3UErThn
+						7a/D/ZX8zHELsULLOw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFeTCCBGGgAwIBAgIJAJnksbFAueL/MA0GCSqGSIb3DQEBBQUAMIHKMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
+						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
+						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEbMBkGA1UEAxMSb3NzcWEudWFzLm94LmFj
+						LnVrMS8wLQYJKoZIhvcNAQkBFiBvcHMtdGVhbUBtYWlsbGlzdC5hZG1pbi5veC5h
+						Yy51azAeFw0xMjAzMDUxMzI0MDdaFw0yMjAzMDMxMzI0MDdaMIHKMQswCQYDVQQG
+						EwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsG
+						A1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNl
+						cnZpY2VzIGFuZCBQcm9qZWN0czEbMBkGA1UEAxMSb3NzcWEudWFzLm94LmFjLnVr
+						MS8wLQYJKoZIhvcNAQkBFiBvcHMtdGVhbUBtYWlsbGlzdC5hZG1pbi5veC5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/+g95ivEoWaKPygo1o
+						GiDFprts8tNb/Lb9UmG/ykZaMY+yB+66NOg7aJDfsBCEzGCuuZuxeXNF6sUhUmVE
+						cvIIdP/hXzUEiCPz5LcfU2GrVTlfDn+njnIS+n19wgu/R0GZTbMk+4u4S7UxMq4z
+						JCYLajpfKTTSLAsTKRdy6LM68W+5MphvgLNWCkqgD+9L9zYtrcLrVqh+t1KVSZ+0
+						kpCTESGzWGCMh1t9BoLt49Im//01nSAu8XyuOrL2w3oxxSO5/k7YJi6RPJ8nEQWj
+						+nUaroumpaC1UBnbvF4UyB6X4ebjCNkdh+Tiubkys/DLMz7CmHCg2oTE/HqY2+UR
+						WYcCAwEAAaOCAV4wggFaMAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
+						U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTOuAowx121jbiBBs1/
+						FqbE4pNPaDCB/wYDVR0jBIH3MIH0gBTOuAowx121jbiBBs1/FqbE4pNPaKGB0KSB
+						zTCByjELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQH
+						EwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMScwJQYDVQQL
+						Ex5CdXNpbmVzcyBTZXJ2aWNlcyBhbmQgUHJvamVjdHMxGzAZBgNVBAMTEm9zc3Fh
+						LnVhcy5veC5hYy51azEvMC0GCSqGSIb3DQEJARYgb3BzLXRlYW1AbWFpbGxpc3Qu
+						YWRtaW4ub3guYWMudWuCCQCZ5LGxQLni/zANBgkqhkiG9w0BAQUFAAOCAQEAEf7S
+						+TzVC8Zq65a1hcRCmXGHkBTOchnPlqFrm4lqJkjItX6B+wE985dy/DV4z+LoypFs
+						mOpJZI2A44jznpTZj0gV4r1xcjXnpS/JiQtRyQ64NDQwmIJTPU1+oyqYaMu0Nh27
+						FRvT9F/sixwPpax4OcyOXqIecawLTTcUf6KemTRmc0zFmSLgCBfXzO0UST7s4nIW
+						zLcEiFKmS/2I3iGPJa+BVROcRn0XdwOQsjD5sJpvnrOd5vnMFgv5Ib6P21hNJtXj
+						X09UugykpbT5QYHsHArFhfBRDDSVYroBYZTQHn+pGpHugLzrZv+R6eNNN3UErThn
+						7a/D/ZX8zHELsULLOw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqa.uas.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://ossqa.uas.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://ossqa.uas.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ossqa.uas.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: OSS Internal QA System</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ops</md:GivenName>
+    <md:EmailAddress>mailto:ops@admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Livings</md:SurName>
+    <md:EmailAddress>mailto:tom.livings@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ossqareg.bsp.ox.ac.uk-test-shibboleth.xml b/swamid-interfederations-2.0/ossqareg.bsp.ox.ac.uk-test-shibboleth.xml
new file mode 100644
index 00000000..4edb2f5e
--- /dev/null
+++ b/swamid-interfederations-2.0/ossqareg.bsp.ox.ac.uk-test-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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://ossqareg.bsp.ox.ac.uk/test/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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ossqareg.bsp.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>
+						MIIDBjCCAe6gAwIBAgIJAMKLTuIl8HViMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFW9zc3FhcmVnLmJzcC5veC5hYy51azAeFw0xMzA2MDMxODMzMDFaFw0zMzA1
+						MjkxODMzMDFaMCAxHjAcBgNVBAMTFW9zc3FhcmVnLmJzcC5veC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZr7IJhB64g62Jt+7EgvSh0L8V4
+						m/2FVHXVo/FJoCU5PVVVNtfuEAnO7f/FMuF34bTtHVzqu6mIqfJqEiO1tyRuiJsy
+						VjXxm9MWyq/UQPiEoyV8QJ/qpWGpNUPGzcn1Gw0oFN0lYrSIyepJiEAYiaMYR+rY
+						S2PMc+iU6KpqIhLvsyv7ccs738tzCxM+aSnAoQ+vVoig30PZ1HzGywOs0Pis682+
+						eeWGBpmvutNjLk2cotxbizRADWFr/yx+rZ4HMXGLI1Sc1EFC9x6WtySmuiM5k3+n
+						Vg4+4VBsUVISUjYgOVsRvYvdeJqzVoDm3nP4s4LEqoxYqulVNDUGKlieHekCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVb3NzcWFyZWcuYnNwLm94LmFjLnVrMB0GA1UdDgQW
+						BBR7YBp6Sgd3qSoeZUtIn4qB1FFc1DANBgkqhkiG9w0BAQUFAAOCAQEAj+SAqGCM
+						vuaZE0dqcay6x2xY0sbT+d8DWreTan79N+q8WanXqs+clmS/w6rVhdYxMffDNEQv
+						v7zq3OQpOS3ReIRjz5Dm/qFZjyCZE4L3LkYNC+9RUbMvApvzYTD5CPYznlAdyXA8
+						FG9ZWeeQI0pEHHHRykEmz12uK0/zO16v78VKuhP09My7mJ1mxWIr0fS9kgwP0X3m
+						MkwFVKoU+Yy9f858uV0KW21E0q5IeebnXIUe7laEFgq3ZNDaukZBuIVNy2bRGJjz
+						5ZuRYtdAggGQrbnCncfBTvRdkt5NW1P+dd8GrqAak6nyIRovFxZ6uoRPnfDeJnx5
+						RLm2YLdhtPjigw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDBjCCAe6gAwIBAgIJAMKLTuIl8HViMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFW9zc3FhcmVnLmJzcC5veC5hYy51azAeFw0xMzA2MDMxODMzMDFaFw0zMzA1
+						MjkxODMzMDFaMCAxHjAcBgNVBAMTFW9zc3FhcmVnLmJzcC5veC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZr7IJhB64g62Jt+7EgvSh0L8V4
+						m/2FVHXVo/FJoCU5PVVVNtfuEAnO7f/FMuF34bTtHVzqu6mIqfJqEiO1tyRuiJsy
+						VjXxm9MWyq/UQPiEoyV8QJ/qpWGpNUPGzcn1Gw0oFN0lYrSIyepJiEAYiaMYR+rY
+						S2PMc+iU6KpqIhLvsyv7ccs738tzCxM+aSnAoQ+vVoig30PZ1HzGywOs0Pis682+
+						eeWGBpmvutNjLk2cotxbizRADWFr/yx+rZ4HMXGLI1Sc1EFC9x6WtySmuiM5k3+n
+						Vg4+4VBsUVISUjYgOVsRvYvdeJqzVoDm3nP4s4LEqoxYqulVNDUGKlieHekCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVb3NzcWFyZWcuYnNwLm94LmFjLnVrMB0GA1UdDgQW
+						BBR7YBp6Sgd3qSoeZUtIn4qB1FFc1DANBgkqhkiG9w0BAQUFAAOCAQEAj+SAqGCM
+						vuaZE0dqcay6x2xY0sbT+d8DWreTan79N+q8WanXqs+clmS/w6rVhdYxMffDNEQv
+						v7zq3OQpOS3ReIRjz5Dm/qFZjyCZE4L3LkYNC+9RUbMvApvzYTD5CPYznlAdyXA8
+						FG9ZWeeQI0pEHHHRykEmz12uK0/zO16v78VKuhP09My7mJ1mxWIr0fS9kgwP0X3m
+						MkwFVKoU+Yy9f858uV0KW21E0q5IeebnXIUe7laEFgq3ZNDaukZBuIVNy2bRGJjz
+						5ZuRYtdAggGQrbnCncfBTvRdkt5NW1P+dd8GrqAak6nyIRovFxZ6uoRPnfDeJnx5
+						RLm2YLdhtPjigw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqareg.bsp.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://ossqareg.bsp.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://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ossqareg.bsp.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: Oracle Student Systems (OSS QA REG)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help OSS single sign on</md:GivenName>
+    <md:EmailAddress>mailto:help_oss_single_sign_on@admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical OSS single sign on</md:GivenName>
+    <md:EmailAddress>mailto:technical_oss_single_sign_on@admin.ox.ac.uk</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
new file mode 100644
index 00000000..2f5545ff
--- /dev/null
+++ b/swamid-interfederations-2.0/ota.oerc.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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>
+						MIIC+jCCAeKgAwIBAgIJAKV6Q72EmGfrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEW90YS5vZXJjLm94LmFjLnVrMB4XDTEwMDgwMzEzNTQ0M1oXDTIwMDczMTEz
+						NTQ0M1owHDEaMBgGA1UEAxMRb3RhLm9lcmMub3guYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCeu6epLyuqiwf12AcNx4/KDUyNqPv/JlTyMkDH
+						UTazP/OhS5CwI5dShCMCCT/1t+nurzNvwizpiQpl/aD3iavbv0cQi36m8rIgfFxB
+						5MPAYC6VYFrftNHCQsQ76mxSRh5oByG8K6LQZZx9AnyDiPIfwYtEuzrzcbYi9Q4j
+						jqJf/TTEkDep2i5UW3FTSL0ew4sPkddBqV+eX+htMM0yn0ktLo5vyv4A64UBC3Ej
+						65QAES0boFfzJ80avZpcbrLWs8jLgT8z+exuRmwZFjuVn/Nl7iqe/r0NTOSBW7jN
+						TCO4VGX/8wKeNHGMLlAZW/Zo7SRmocmMxcOumIBMEti09RP/AgMBAAGjPzA9MBwG
+						A1UdEQQVMBOCEW90YS5vZXJjLm94LmFjLnVrMB0GA1UdDgQWBBR0KpHgTKXM6MFj
+						NqnkzMyWPfdEvDANBgkqhkiG9w0BAQUFAAOCAQEAC6mZHBr0ba7FcLrDdQ+/i8+m
+						Yg7jLKYDI+fnVbd3PQyteeLpuup9s9UEAv7x55Hp9m6xhhlZe2dOjlhssfndpRqM
+						LhmIZ5TRLxUu5j4Jfgb4KjpPiFhWDGLmxfH6EfK1+XWGD7RlTn36npUhTIJM+9om
+						RvgpnK7C23YLJG2cq05ZKe+qvZf+eD1XJ9vSUg9Apu2TM5BDt3ujn80mrkApmFhr
+						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>
+						MIIC+jCCAeKgAwIBAgIJAKV6Q72EmGfrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEW90YS5vZXJjLm94LmFjLnVrMB4XDTEwMDgwMzEzNTQ0M1oXDTIwMDczMTEz
+						NTQ0M1owHDEaMBgGA1UEAxMRb3RhLm9lcmMub3guYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCeu6epLyuqiwf12AcNx4/KDUyNqPv/JlTyMkDH
+						UTazP/OhS5CwI5dShCMCCT/1t+nurzNvwizpiQpl/aD3iavbv0cQi36m8rIgfFxB
+						5MPAYC6VYFrftNHCQsQ76mxSRh5oByG8K6LQZZx9AnyDiPIfwYtEuzrzcbYi9Q4j
+						jqJf/TTEkDep2i5UW3FTSL0ew4sPkddBqV+eX+htMM0yn0ktLo5vyv4A64UBC3Ej
+						65QAES0boFfzJ80avZpcbrLWs8jLgT8z+exuRmwZFjuVn/Nl7iqe/r0NTOSBW7jN
+						TCO4VGX/8wKeNHGMLlAZW/Zo7SRmocmMxcOumIBMEti09RP/AgMBAAGjPzA9MBwG
+						A1UdEQQVMBOCEW90YS5vZXJjLm94LmFjLnVrMB0GA1UdDgQWBBR0KpHgTKXM6MFj
+						NqnkzMyWPfdEvDANBgkqhkiG9w0BAQUFAAOCAQEAC6mZHBr0ba7FcLrDdQ+/i8+m
+						Yg7jLKYDI+fnVbd3PQyteeLpuup9s9UEAv7x55Hp9m6xhhlZe2dOjlhssfndpRqM
+						LhmIZ5TRLxUu5j4Jfgb4KjpPiFhWDGLmxfH6EfK1+XWGD7RlTn36npUhTIJM+9om
+						RvgpnK7C23YLJG2cq05ZKe+qvZf+eD1XJ9vSUg9Apu2TM5BDt3ujn80mrkApmFhr
+						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>
diff --git a/swamid-interfederations-2.0/ousu.org-shibboleth.xml b/swamid-interfederations-2.0/ousu.org-shibboleth.xml
new file mode 100644
index 00000000..aaf335b2
--- /dev/null
+++ b/swamid-interfederations-2.0/ousu.org-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
diff --git a/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml b/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml
new file mode 100644
index 00000000..5febc5ba
--- /dev/null
+++ b/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://owncloud.cesnet.cz/saml/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-02-19T21:13:48Z">
+      <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: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">OwnCloud</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">OwnCloud</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CESNETs servis for sharing files.</mdui:Description>
+        <mdui:Description xml:lang="cs">Cesnetí služba pro sdílení souborů.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://owncloud.cesnet.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://owncloud.cesnet.cz/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC8jCCAdoCCQDhANKgo6HWgzANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MRswGQYDVQQDExJvd25jbG91ZC5jZXNuZXQuY3owHhcNMTUwMTI1MTQxNzE4WhcNMzUwMTI1MTQxNzE4WjA7MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MRswGQYDVQQDExJvd25jbG91ZC5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcQUxW1Zi6objf1qJixZpDJJxuprjnUXoKQlRbLj8XxFK9jIdQv1M+Sxto3RbH4opZWpxpiM0xfJqP8y5V0N/w6h7/81p9B4r/c302Zh3z8UV4IoPUGb/+IBMinufM3qtqk5+5/Fdz+mzCoIi7adGsLFPEwiuY48mOnCsHNjvirQcE/JVwZsJoBiTJiplYe3XsPiUAFOgcyZ5DCu2LEbttBqHgdpSESyweNlWTpHhDmkxSyRlxOb1jdEyvnKdMXgZEo7OfX7O5SPe9AlvV5T3PMMsrlP34rJmQ3+2wrLr7bbh6CEGuqGxW2rhEMV3XK7HHiZX+PHPPQmeaz8nIeKPfAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJGaqabntG6EQW2wZJCCEB7nXmFJbMActIhJoTgWYlp75E781jSs+qhQ40NjO+kfJ3YIf+4JKMSo3EAAY0UFrZ/JFaK2dHehx9dn6Y697yKg7fPITMI9eo3ehXBe+gpoAvF0iPD2XfpgwQn6ASMHOQdKA3LC5qhwJ6wPYwF4THKqDrGveE5BF83FSLL6w4veMuyNzfhpQ7cBZEUkEShPkfAu7B88TNz0FWE5LBsnjBEn1bWeC4QTubRFJSSIt60klOvHcToniY0qRpQAVaIQtiNNNjanNv365lXICzlcTdN/lVWawZw1MGCdjqzlrMgL9wCKb+9nQFz+yW23eJDxptU=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC8jCCAdoCCQDhANKgo6HWgzANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MRswGQYDVQQDExJvd25jbG91ZC5jZXNuZXQuY3owHhcNMTUwMTI1MTQxNzE4WhcNMzUwMTI1MTQxNzE4WjA7MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MRswGQYDVQQDExJvd25jbG91ZC5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcQUxW1Zi6objf1qJixZpDJJxuprjnUXoKQlRbLj8XxFK9jIdQv1M+Sxto3RbH4opZWpxpiM0xfJqP8y5V0N/w6h7/81p9B4r/c302Zh3z8UV4IoPUGb/+IBMinufM3qtqk5+5/Fdz+mzCoIi7adGsLFPEwiuY48mOnCsHNjvirQcE/JVwZsJoBiTJiplYe3XsPiUAFOgcyZ5DCu2LEbttBqHgdpSESyweNlWTpHhDmkxSyRlxOb1jdEyvnKdMXgZEo7OfX7O5SPe9AlvV5T3PMMsrlP34rJmQ3+2wrLr7bbh6CEGuqGxW2rhEMV3XK7HHiZX+PHPPQmeaz8nIeKPfAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJGaqabntG6EQW2wZJCCEB7nXmFJbMActIhJoTgWYlp75E781jSs+qhQ40NjO+kfJ3YIf+4JKMSo3EAAY0UFrZ/JFaK2dHehx9dn6Y697yKg7fPITMI9eo3ehXBe+gpoAvF0iPD2XfpgwQn6ASMHOQdKA3LC5qhwJ6wPYwF4THKqDrGveE5BF83FSLL6w4veMuyNzfhpQ7cBZEUkEShPkfAu7B88TNz0FWE5LBsnjBEn1bWeC4QTubRFJSSIt60klOvHcToniY0qRpQAVaIQtiNNNjanNv365lXICzlcTdN/lVWawZw1MGCdjqzlrMgL9wCKb+9nQFz+yW23eJDxptU=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud6.cesnet.cz/simplesamlphp/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.cesnet.cz/simplesamlphp/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.cesnet.cz/simplesamlphp/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.cesnet.cz/simplesamlphp/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.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="7"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ces.net/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lubos</md:GivenName>
+    <md:SurName>Kopecky</md:SurName>
+    <md:EmailAddress>du-support@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oxford-stg.saasiteu.com-.xml b/swamid-interfederations-2.0/oxford-stg.saasiteu.com-.xml
new file mode 100644
index 00000000..b0ec1708
--- /dev/null
+++ b/swamid-interfederations-2.0/oxford-stg.saasiteu.com-.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oxford-stg.saasiteu.com/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-01T12:23: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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
+						iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
+						BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
+						MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
+						A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
+						bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
+						RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
+						Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
+						VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
+						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
+						GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
+						ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
+						qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
+						m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
+						CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
+						m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
+						MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
+						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
+						VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
+						ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
+						Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
+						dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
+						dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
+						U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
+						b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
+						hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
+						82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
+						LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
+						QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
+						Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
+						sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
+						iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
+						BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
+						MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
+						A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
+						bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
+						RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
+						Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
+						VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
+						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
+						GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
+						ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
+						qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
+						m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
+						CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
+						m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
+						MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
+						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
+						VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
+						ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
+						Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
+						dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
+						dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
+						U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
+						b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
+						hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
+						82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
+						LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
+						QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
+						Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
+						sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <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://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx?binding=urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx" index="3" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="false">
+      <md:ServiceName xml:lang="en">FRS</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" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SaaSit Staging for the University of Oxford</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://oxford-stg.saasiteu.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Cloud Service Management</md:GivenName>
+    <md:EmailAddress>mailto:CloudServiceManagement.Support@frontrange.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SaaS NOC</md:GivenName>
+    <md:EmailAddress>mailto:SaaS.NOC@frontrange.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oxford-uat.saasiteu.com-.xml b/swamid-interfederations-2.0/oxford-uat.saasiteu.com-.xml
new file mode 100644
index 00000000..83a0d7bd
--- /dev/null
+++ b/swamid-interfederations-2.0/oxford-uat.saasiteu.com-.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oxford-uat.saasiteu.com/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-05T13:57: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">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
+						iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
+						BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
+						MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
+						A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
+						bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
+						RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
+						Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
+						VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
+						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
+						GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
+						ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
+						qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
+						m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
+						CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
+						m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
+						MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
+						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
+						VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
+						ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
+						Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
+						dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
+						dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
+						U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
+						b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
+						hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
+						82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
+						LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
+						QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
+						Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
+						sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
+						iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
+						BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
+						MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
+						A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
+						bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
+						RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
+						Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
+						VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
+						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
+						GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
+						ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
+						qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
+						m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
+						CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
+						m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
+						MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
+						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
+						VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
+						ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
+						Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
+						dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
+						dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
+						U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
+						b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
+						hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
+						82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
+						LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
+						QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
+						Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
+						sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <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://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx?binding=urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx" index="3" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="false">
+      <md:ServiceName xml:lang="en">FRS</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" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SaaSit UAT for the University of Oxford</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://oxford-uat.saasiteu.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Cloud Service Management</md:GivenName>
+    <md:EmailAddress>mailto:CloudServiceManagement.Support@frontrange.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SaaS NOC</md:GivenName>
+    <md:EmailAddress>mailto:SaaS.NOC@frontrange.com</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
new file mode 100644
index 00000000..f8981c01
--- /dev/null
+++ b/swamid-interfederations-2.0/oxford.corefacilities.org-account-saml-oxford.xml
@@ -0,0 +1,51 @@
+<?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>
+						MIIDezCCAmOgAwIBAgIJAJ2ckmy8lsPeMA0GCSqGSIb3DQEBBQUAMFQxCzAJBgNV
+						BAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRzMQ8wDQYDVQQHDAZCb3N0b24x
+						HDAaBgNVBAoME2lMYWIgU29sdXRpb25zLCBMTEMwHhcNMTMxMjExMTUyNTA3WhcN
+						MjQxMjExMTUyNTA3WjBUMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
+						ZXR0czEPMA0GA1UEBwwGQm9zdG9uMRwwGgYDVQQKDBNpTGFiIFNvbHV0aW9ucywg
+						TExDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2VPbpu2uPVmE3NDD
+						E+aGuO9Zf2eLz+61ubkjuwz6ipY01oHliSId5iETSwGT3r1gJvTnpP3ndGMFq8X0
+						4xcsNb2cU2ZxCZ4+GE9XFriD2eskrfCuuBX6bKeW/yYeMNVoSBF/2YeEC+5kZ+2y
+						B7neQsUFKpB2J4kO7TlFKDAa0aj+ani0TOWdjejcYrZWNfR74Bft3IOFWxvapYvZ
+						9k6LMU/VouCVM8TqfmmTkwHemaB2bdk5rgaZpV3UgsiO5yXS9CDLlrijQSb95I1l
+						QZ2hMtbDu70xKoVOAbMhYcuVZppOObeketCXOoN4MIWEn/dYPhwHsWnGR9sOZhaB
+						9PVJzwIDAQABo1AwTjAdBgNVHQ4EFgQUfo3FkNz5UDtfW6QR5ostJDL7z1owHwYD
+						VR0jBBgwFoAUfo3FkNz5UDtfW6QR5ostJDL7z1owDAYDVR0TBAUwAwEB/zANBgkq
+						hkiG9w0BAQUFAAOCAQEAF4BJ6QX/Y6WV0rMGZYmydg/vE8SgtVB++/rGMfohXW6P
+						s/NEKrzOdIt/Nhannnn77RrjujDLkz5wp3u5zabjffHk/bPqP9yucOBMlIdyggKA
+						SQhzrFygr1kgA2JmUYrmrlKPSSrjfTGJj33qgbo23hzioLULaFFSbvEcZdP8x5lG
+						x8UndDxLcOxRMdxGTdMTu4q/TMnJlugnOe5YmIhg9jbYMwwm8JYVJ86llO5piiUv
+						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>
diff --git a/swamid-interfederations-2.0/oxford.saasiteu.com-.xml b/swamid-interfederations-2.0/oxford.saasiteu.com-.xml
new file mode 100644
index 00000000..26860079
--- /dev/null
+++ b/swamid-interfederations-2.0/oxford.saasiteu.com-.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oxford.saasiteu.com/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-05T14:04: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">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
+						iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
+						BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
+						MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
+						A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
+						bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
+						RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
+						Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
+						VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
+						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
+						GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
+						ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
+						qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
+						m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
+						CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
+						m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
+						MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
+						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
+						VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
+						ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
+						Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
+						dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
+						dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
+						U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
+						b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
+						hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
+						82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
+						LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
+						QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
+						Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
+						sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
+						iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
+						BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
+						MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
+						A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
+						bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
+						RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
+						Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
+						VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
+						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
+						GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
+						ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
+						qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
+						m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
+						CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
+						m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
+						MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
+						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
+						VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
+						ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
+						Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
+						dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
+						dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
+						U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
+						b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
+						hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
+						82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
+						LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
+						QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
+						Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
+						sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
+    <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://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx?binding=urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx" index="3" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="false">
+      <md:ServiceName xml:lang="en">FRS</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" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SaaSit Production for the University of Oxford</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://oxford.saasiteu.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Cloud Service Management</md:GivenName>
+    <md:EmailAddress>mailto:CloudServiceManagement.Support@frontrange.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SaaS NOC</md:GivenName>
+    <md:EmailAddress>mailto:SaaS.NOC@frontrange.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
new file mode 100644
index 00000000..4c90aadb
--- /dev/null
+++ b/swamid-interfederations-2.0/oxfordbrookes.idm.oclc.org-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+						MIIEIDCCAwigAwIBAgIBAjANBgkqhkiG9w0BAQUFADBtMSUwIwYDVQQDFBwqLm94
+						Zm9yZGJyb29rZXMuaWRtLm9jbGMub3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChME
+						T0NMQzEoMCYGCSqGSIb3DQEJARYZamFtZXMuaHV0Y2hpbnNvbkBvY2xjLm9yZzAe
+						Fw0xMzA3MTIxNjAzMjRaFw0yMzA3MTIxNjAzMjRaMG0xJTAjBgNVBAMUHCoub3hm
+						b3JkYnJvb2tlcy5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRP
+						Q0xDMSgwJgYJKoZIhvcNAQkBFhlqYW1lcy5odXRjaGluc29uQG9jbGMub3JnMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr98hUqEihQmuIR7RB4Y0re+Z
+						IJfBuWjAwmklHjbQ107kHndb4WfbCcDCrUDZ01RoPPkGwHajnpg2K5pXY6bg+Ljf
+						Q9QjnVvnLnVv5nICmNy6K3t1DsQ0v+eK0+CrEpvUGjdhfBD2z6FOJpjcKdhZXvAH
+						s2DWovpT/eoje9C5lZ+Ur22hHj+Sit5GiAWjPsE84Tdmzwp3OIcAXga/Pq0ClnNk
+						djFeZNIwaspWxik0s/hHaPUmBBm1HYqLcPXo4JjV3jLPdgH4ZlQZHx/XGIh8lUio
+						3S7ZV9rvguSAQwXCkrgChCt0TnuDik99upgOFr0FlUR2AvKazaQ2vXtbMdZ6yQID
+						AQABo4HKMIHHMB0GA1UdDgQWBBQl//EPgt0B3DrTbBuX38VSyb/r7TCBlwYDVR0j
+						BIGPMIGMgBQl//EPgt0B3DrTbBuX38VSyb/r7aFxpG8wbTElMCMGA1UEAxQcKi5v
+						eGZvcmRicm9va2VzLmlkbS5vY2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoT
+						BE9DTEMxKDAmBgkqhkiG9w0BCQEWGWphbWVzLmh1dGNoaW5zb25Ab2NsYy5vcmeC
+						AQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAa2zH9XCznFPWbsSL
+						Y2Hhaw/Xm97dFWsIIFFbRFZYl1AynVS4b5q3v5ZCzwKfKDqclhZm13E7PJufvBfV
+						rgs3zZBkoVTyUIc7KV6bk2qIR3IjB4ITG1BBn8a54b+AjjXqty1HWBBZ+UZ/r+38
+						YPLmj20+F/PjJ+4ODI6YM+Rp9Ct7si1ahxtUn+4Yl+lr6Z7bJRLUuUbBk/M3q6UK
+						ci+Pgp7VeTDMUoK9qC84LxTPeNIOYJN5nbf5u3VU8KvrglIDqRWmGz2nRAtcWhaY
+						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>
diff --git a/swamid-interfederations-2.0/oxris.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/oxris.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..0f27d164
--- /dev/null
+++ b/swamid-interfederations-2.0/oxris.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,82 @@
+<?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://oxris.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="2013-05-24T09:03:32Z"/>
+  </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://oxris.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>
+						MIIDFDCCAfygAwIBAgIJANz9IQy8b9XUMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+						BAMTDm94cmlzLm94LmFjLnVrMB4XDTEzMDUyMzEzMDczMVoXDTM4MDUxNzEzMDcz
+						MVowGTEXMBUGA1UEAxMOb3hyaXMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQDN6rRAxFlBqDGTExqMRUSaXGm1yq5hSiwSye0kEMaw78Mw
+						Q9bzvdiiFIqQYOzAmPTXjjTcFl49W/WsWGI0E3oupKEj6yvVve9GlHdS9ecsULw6
+						TSlglQfGdoa5OcIXPsPtB2CLlAYnodJ7efunK5eRxlEajioIr9Hw3HioMaCmrFBt
+						hskCpa0I7YDwhP2MhuEInmPajPKBy6JKhfFfmm3sVKmy42jFJ4ZzqgM/A+pQW8ep
+						iDMZlN6Bf4Uc8d8BqxaYjjHmM0r75yo16keF2rTbw13VzQqZWjFgxUCAvlQcu9IT
+						esF4JRBAM1yKw+jZu0rrE9ZhL6S4mLWJeR5mpST3AgMBAAGjXzBdMDwGA1UdEQQ1
+						MDOCDm94cmlzLm94LmFjLnVrhiFodHRwczovL294cmlzLm94LmFjLnVrL3NoaWJi
+						b2xldGgwHQYDVR0OBBYEFFVJkWxVEz06s2GjVAjMidooLybqMA0GCSqGSIb3DQEB
+						BQUAA4IBAQBtukSj8KhiZC8MvgG4nF05YlhbD/7lm9QDxmHakjwUA6WraBzZgvtf
+						sqlsQCvsOyRM+I4VB987Ib0vUzIgJ9dthq4gxLYJ0TudIDHotAVsiprgmpe1hCs7
+						cmD5/YwOukvE5rkxkTgHn9l7zd3ZHHmDMmIt/uN8CeKrmGSLuIxI0/N6GHHiZXXe
+						yowH/IAzH/mmfgXZoIopCvOTvbQAnaYP8THvMHnL2msQellt5QKsGxWVBT/mBXy7
+						F6nq62YvHGeR/gQ1pJn5GCiX9fCm9dtCRAW4mZGFoQVTTBi0u5wVGpbSVpf/ECNE
+						a211q7638e8Me8aRfDaUkXlVr7Xnqd5+
+					</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://oxris.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford Symplectic</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Malin</md:SurName>
+    <md:EmailAddress>mailto:ben.malin@it.ox.ac.uk</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
new file mode 100644
index 00000000..cb196c0b
--- /dev/null
+++ b/swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIID0jCCAroCAQAwDQYJKoZIhvcNAQEFBQAwga4xKTAnBgNVBAoUIFVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRlIEl0YWp1YsOhMQwwCgYDVQQLEwNEU0kxIDAeBgkqhkiG
+9w0BCQEWEWRzaUB1bmlmZWkuZWR1LmJyMREwDwYDVQQHFAhJdGFqdWLDoTEVMBMG
+A1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRcGFuLnVu
+aWZlaS5lZHUuYnIwHhcNMTQxMTI0MTEwOTAwWhcNMTkxMTIzMTEwOTAwWjCBrjEp
+MCcGA1UEChQgVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgSXRhanViw6ExDDAKBgNV
+BAsTA0RTSTEgMB4GCSqGSIb3DQEJARYRZHNpQHVuaWZlaS5lZHUuYnIxETAPBgNV
+BAcUCEl0YWp1YsOhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJS
+MRowGAYDVQQDExFwYW4udW5pZmVpLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBANt2APgawi3BE1qLGEfcHXGHVgoi+W7JvTzfwEnzZ9GZt47v
+RKsnjRe6Nww6SDLsJipvBaIzvqEqaJJFMV8NTF7t2DWPAy1Okq58syxqvyvfp2PQ
+uArvWqq5n4E0MiEj3K7HP5bXiFhFwwxhV1NhUNTik334QoobGlfWcOhxRFi56ZYX
+ghhdhzeIAPABrUS9K2Erz1bdLOzHQ1nUGQwjeVUiTgJps39t6AlKAN5AQgN/VpXj
+SKWRCM/5AMYrt0qWtiedn9y42AU2kME1yTpx9dFFpma9u9GNW/UE1lxPxx+NXjoo
+Fo9mWQ0SGJg2etW+Mk7GKtJc3j720TafS9mL8b0CAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEAwSg/dr8TZxZSwJFoq+6ZLUsN9OThA4sitiMM83rlY8alnk2KMXyw78K7
+Qi4WcZX2EnLhDXqOnRoqLBSRlRlJgyZACG2baROEASdJa+0EDCvHAYyN+ZvXKQ94
+/I2/54+QbyBolwyyi9aPKOcEYJR9ChnX1lgIUuLO2iZ/95izSMoAdQcTlFW1UBAP
+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>
+      
+MIID0jCCAroCAQAwDQYJKoZIhvcNAQEFBQAwga4xKTAnBgNVBAoUIFVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRlIEl0YWp1YsOhMQwwCgYDVQQLEwNEU0kxIDAeBgkqhkiG
+9w0BCQEWEWRzaUB1bmlmZWkuZWR1LmJyMREwDwYDVQQHFAhJdGFqdWLDoTEVMBMG
+A1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRcGFuLnVu
+aWZlaS5lZHUuYnIwHhcNMTQxMTI0MTEwOTAwWhcNMTkxMTIzMTEwOTAwWjCBrjEp
+MCcGA1UEChQgVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgSXRhanViw6ExDDAKBgNV
+BAsTA0RTSTEgMB4GCSqGSIb3DQEJARYRZHNpQHVuaWZlaS5lZHUuYnIxETAPBgNV
+BAcUCEl0YWp1YsOhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJS
+MRowGAYDVQQDExFwYW4udW5pZmVpLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBANt2APgawi3BE1qLGEfcHXGHVgoi+W7JvTzfwEnzZ9GZt47v
+RKsnjRe6Nww6SDLsJipvBaIzvqEqaJJFMV8NTF7t2DWPAy1Okq58syxqvyvfp2PQ
+uArvWqq5n4E0MiEj3K7HP5bXiFhFwwxhV1NhUNTik334QoobGlfWcOhxRFi56ZYX
+ghhdhzeIAPABrUS9K2Erz1bdLOzHQ1nUGQwjeVUiTgJps39t6AlKAN5AQgN/VpXj
+SKWRCM/5AMYrt0qWtiedn9y42AU2kME1yTpx9dFFpma9u9GNW/UE1lxPxx+NXjoo
+Fo9mWQ0SGJg2etW+Mk7GKtJc3j720TafS9mL8b0CAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEAwSg/dr8TZxZSwJFoq+6ZLUsN9OThA4sitiMM83rlY8alnk2KMXyw78K7
+Qi4WcZX2EnLhDXqOnRoqLBSRlRlJgyZACG2baROEASdJa+0EDCvHAYyN+ZvXKQ94
+/I2/54+QbyBolwyyi9aPKOcEYJR9ChnX1lgIUuLO2iZ/95izSMoAdQcTlFW1UBAP
+JTNyehL8YKvoYOOcL8ISIrvMhXuGKFDjadKblevs1pari0G7RPdSzzjm0kdQpneJ
+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>
diff --git a/swamid-interfederations-2.0/papercut.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/papercut.balliol.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..204c1c0c
--- /dev/null
+++ b/swamid-interfederations-2.0/papercut.balliol.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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://papercut.balliol.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="2014-09-05T13:49: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://papercut.balliol.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>
+						MIIDEjCCAfqgAwIBAgIJAPTQm4DlPP/UMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXBhcGVyY3V0LmJhbGxpb2wub3guYWMudWswHhcNMTQwODI5MTMxNDQyWhcN
+						MjQwODI2MTMxNDQyWjAkMSIwIAYDVQQDExlwYXBlcmN1dC5iYWxsaW9sLm94LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAutBlc2yLd/3y+6h6
+						VzJ6YyuYupu08Ij3ktLRVCoTOybjBGPYu38BgUrs+Y+Vf5nXtpDWDpATpWSpfSMf
+						YSIjOC2nhbfT5QdHQu83HhxP4ZD3kMEqBnL7X6E3ywR/+IdmdizTjbm6lIHUK9cp
+						Rt2OwtJ5i0ScP7twuzvTlljkcMIw5HQzKOkRhwQHoKSnx0jrCwNo4AW/PlWspZ8j
+						B6bg9xuToATk2l/TpPojyv2MOaa3KHCk6IGsI/wVOKZQ5lMbD5EHNKQ+cGkdMbX7
+						r4XNkWpQ4nsYCLjo/JYeR67Zlc0prCf3TaGFikHKIBedGcVmU5GaCpqAzVGt4aFE
+						e2ckkwIDAQABo0cwRTAkBgNVHREEHTAbghlwYXBlcmN1dC5iYWxsaW9sLm94LmFj
+						LnVrMB0GA1UdDgQWBBSBxNdryBa0/LvTZJnl7cLecW0RiTANBgkqhkiG9w0BAQUF
+						AAOCAQEAj+CNndELm4jDspknGEKTYGu0xmMsLz8nO/tQ6hHYFsa7sE3pqYE9KNmy
+						Cumz2wyZEJx3j5nLhIhtLnTD1d+EW8L0bVkyjNrv9HCMo8yZ2Sk+8ABDYQGIqCBY
+						yILBp/EuvtnyDORlet6Xg3Jz350i2eKVGA3ju/fU3a4902Z9BidRw494682y26T6
+						ZIKinjyVBG8zpJ9Kt1X5IyIp8hTOsGtpe3TqqRmyT82pquTgC7AZG3cZ4OE6ga28
+						bLgZB5ayiZnXyheZDs/80xBMdoPVDvXvu3r7rN+MJrp51f5vVXi2ikp/nXY0Hh1L
+						lBJNwFF+dySVUM4QYmAzTnXIHhR7DA==
+					</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://papercut.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://papercut.balliol.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://papercut.balliol.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://papercut.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://papercut.balliol.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 Balliol Print Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Balliol Computing</md:GivenName>
+    <md:EmailAddress>mailto:computing@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Balliol Computing</md:GivenName>
+    <md:EmailAddress>mailto:computing@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/papercut.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/papercut.some.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..e0ef3849
--- /dev/null
+++ b/swamid-interfederations-2.0/papercut.some.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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://papercut.some.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="2014-04-14T15:00: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://papercut.some.ox.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>
+						MIIDCTCCAfGgAwIBAgIJAJTgsqCNR2RFMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnBhcGVyY3V0LnNvbWUub3guYWMudWswHhcNMTQwMjI1MTQwODM0WhcNMjQw
+						MjIzMTQwODM0WjAhMR8wHQYDVQQDExZwYXBlcmN1dC5zb21lLm94LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2DvJXeXlacXKCCY8E78LHJh8
+						eRHB6YWFigkDoY4gljzONk1eXVs91A4fk1soSLaitd7eweWpsSIu2il8iPEpKS1X
+						0Fp6dU2EOkeo+/pDlq71lFg0zGncxuKBAklZMmMMthj0o6u0M5ZH6Uv2Ep9H4dna
+						8iXyoAjvF2HihhNc9qaJ29BayvL4ucgRhce8+vNfl4eFcgSYU+rQSAZedPcMf4Rh
+						xiWV1ipV/pqrzLTCP9Mwy1yeneOP9saE/2hRa2JGaq1lF5F2LzL5++Ek+/gpoESy
+						1yIeMvOuE0beSFRb32mYvNNMQ/Do1lloe09RJasy4MO4ze/Ub7B05rBknkeouwID
+						AQABo0QwQjAhBgNVHREEGjAYghZwYXBlcmN1dC5zb21lLm94LmFjLnVrMB0GA1Ud
+						DgQWBBQmEF+Bgv8GPVkPUmxy+ZDVjdTonTANBgkqhkiG9w0BAQUFAAOCAQEAbfj2
+						C9Oz1jGuH3oqNtIQOzq7VV38/xUZHQOWEFlbn2GdDLd0Bp9KYrfZMJ2Gpr9XgFm+
+						GNHTkfJakoOyDrmwui3XMBkZqs/RtVsBnxPYfFkrawh1oZpls5+uyAHgoGGApOMn
+						bK69F+9mOEWH2QPaQn7hLTqNTHcubfP0V52ChJrnYdlKgADnCEaCyJRfZjmljdzT
+						gbEWpkOKwE5d0gwdq4us5exBrdkUlMM7KHLuugDsVNTLNbaHlfnE4c4EjQfT3Bpv
+						jrFl6qt83WYiXy7/PXLwzdBVFaAdHuYVityl5CQOME5+dJK+op9PdCByouFxrRFQ
+						gKBXjAALAzv1gQI1Jw==
+					</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://papercut.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://papercut.some.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://papercut.some.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://papercut.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://papercut.some.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, Somerville College PaperCut</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Somerville College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it.support@some.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Somerville College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it.support@some.ox.ac.uk</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
new file mode 100644
index 00000000..e585df7b
--- /dev/null
+++ b/swamid-interfederations-2.0/papi.kfki.hu-idp-shibboleth.xml
@@ -0,0 +1,119 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">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>
+      <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>
+      <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>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUdn3t4i5i7MiVMJB07lC7yL4IAoowDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMcGFwaS5rZmtpLmh1MB4XDTA5MDgxMDE2MDEyMloXDTI5
+MDgxMDE2MDEyMlowFzEVMBMGA1UEAxMMcGFwaS5rZmtpLmh1MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEApGGAG9GWNsCJZ6JayutI95u4FmGvsfza6uSK
+UX3XuZp1uUViY6eH4h4gCNgCzufvJ4GNSdxYhohFEgzB0MM23MrDl9DzS4NX+g7e
+YFCmmD1zPcui4YzIYJWmCSXAqXDqaLox4aVxtQrOr4sBcy/0jzlXXC3IHSS2GKuC
+j8tlXf9TLoZTZgZaNcyphelUa/y2DsmNSMIcfZXmYbZCqD/VErNBwfPD5mAr+M+1
+C5JxRY+6XIPs7jh2eibWZsiafsgDYV2Px2M5NoPfwaJDyBLVA57t34p2G9xCeCak
++5cPgu3sZ+sdGC1OZ5uLr+32l9KUu+mR/Q/j2m06dlK4wF8rzwIDAQABo18wXTA8
+BgNVHREENTAzggxwYXBpLmtma2kuaHWGI2h0dHBzOi8vcGFwaS5rZmtpLmh1L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBS0zg53E13omfWDQUJAKMLs2TKjgDANBgkq
+hkiG9w0BAQUFAAOCAQEASowJqpasNKCiw9UvgdaYs98wdI5xKFNIngJdJUKqlYIR
+1EgibCKFSap6dQkjkuVyMoUfd13WNcruCKHm+TYR+A77/xQB8mr07LAKhcMCYXVR
+3JuHLewzEbKrXhifaP9Qj5isuiLTFPpsYHtOra9HkEhpRRxM9UO0F1tBXZwV9XtT
+fbSk/vqQUID4MufOnlLGcfoL551wEa8lQWTcj8+alUaizeIp66M3tFIB317xM7gM
+tAPdkp5FOyEO25ko6DuIXXFA4vIbGhJSPNmb9GjmKF4i2LlEZpFzW8FCrHS12cVt
+mDBUE8rw993QIE38s8Bi64wgMQPCG9dgeIUvHKn/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>
+MIIEcDCCA1igAwIBAgIQdJ8kRHCkiTNnB2gsFl8HnDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTAwNTIzNTk1OVowTzELMAkGA1UE
+BhMCSFUxKTAnBgNVBAoTIE1UQSBXaWduZXIgRml6aWthaSBLdXRhdG9rb3pwb250
+MRUwEwYDVQQDEwxwYXBpLmtma2kuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC2GCoP21qShohHWYORncFPElyjE3mBXCbNIDM+a0GkG0IbiD7b042i
+seaCxqlTioQtux2wV92DmvGolJvVYHQB4X3bR407ZSCM0KWZpcU+1IsZnQ+t2Zbg
+C+Hdu4S3lgr8ShWx4b8fsMLZRJDZpMv26jVDMRw3AgC6hYjHlxhEK5dq4Zf+QB39
+cecsI7AbMeME7VxSV9DrfunDr2gWeGH/VZZ1WxQ7pzaaPg4H/Dwy9PSGL3wcyB4J
+tmmoxC9V0MtD443Q+eNqTQDOVCgDMRQjPCBLP17EsEtNCAOKoixFR/BnpQIOf7d+
+nZnBkTZQ4qcQyda2gREyC+YPH9HVZulLAgMBAAGjggFfMIIBWzAfBgNVHSMEGDAW
+gBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU+K5mh3yYNEZJ1h03qgYc
+nzPDUXYwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYD
+VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
+U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
+LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
+cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFwYDVR0RBBAwDoIMcGFwaS5rZmtpLmh1
+MA0GCSqGSIb3DQEBBQUAA4IBAQC3UcffXrc9R6QaYjPRX1mPnFaBd//JZufTUCNj
+meVU5cxV0BXy1pbyJGwrDnIEGtjazkvcF3mwaCLD2B3mGaiXKlO3S7bVfNjCaGQZ
+VmKPlzHMWRubUihPPcDN4MEgXEd5qnRnGw+dMdFX01DK+RPuiQIbvLKrSV3lpwoA
+m0rIYuognbxmdIinzkU6+lrpQZt77eCvnzTMBDkg1TIFUYFoBJ42viPN7R+380D9
+DSmV3nh/ewZj71mT6313QdODR2sY8XQsac4OSC/wMQdSQzeQZAAWY+LeLiXUko9E
+YlwRUdoU5XY/oFrHpRah3uswFK8aKlyxNx0mkPp9lGI/bfOL
+                                            </ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>papi.kfki.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://papi.kfki.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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:Organization>
+    <md:OrganizationName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">WIGNER Research Centre for Physics</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">WIGNER Research Centre for Physics</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://wigner.mta.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://wigner.mta.hu</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/passport01.leeds.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/passport01.leeds.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..3d884fea
--- /dev/null
+++ b/swamid-interfederations-2.0/passport01.leeds.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,132 @@
+<?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>
+      <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://www.leeds.ac.uk/leeds/logo/UOLL16px.gif</mdui:Logo>
+        <mdui:Logo height="60" width="60">https://www.leeds.ac.uk/leeds/logo/UOLL60px.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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEhzCCA2+gAwIBAgIQZugaNgYGJKacmZHftg6FwDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDUwODAwMDAwMFoXDTE1MDUwODIzNTk1OVowXDELMAkGA1UE
+						BhMCR0IxDjAMBgNVBAcTBUxlZWRzMRwwGgYDVQQKExNVbml2ZXJzaXR5IG9mIExl
+						ZWRzMR8wHQYDVQQDExZwYXNzcG9ydDAxLmxlZWRzLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEApJ8CSCtWcwfYjAoGYAct3rbbZEjkhBBVBdKP
+						WiPUgXluspslc+Ex28zKzpuRHfokDxLJBs5PkcZ+dsc0AbwsIx66BOWPc9vUnJ/P
+						1g66NJQIuKm/uBMp9GSFLlSvawpxwv8H+mT3mWzekZE9jtVDf1bTeZm7CoF422WS
+						WDZAkPkZe+Y2I93/YUwX5NR3jFjCeWk77WmMNAmYbmCWLQd4zR2FhK/6WmB6CFcr
+						u/mJZUuxUXTOrnxr2RG+5XZRJN31TkUcgLTm042wYPeD537V87R7TQPEtd6TzYjR
+						gpIngiEAE6/YwDeiVWwmslm44KnG5iYeshcKd3jvdFqh0gqXLQIDAQABo4IBaTCC
+						AWUwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFACO
+						7Rt4p/HuV6f9LndFJ0kdN9gpMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
+						MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysG
+						AQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
+						YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
+						AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
+						KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCEGA1UdEQQaMBiC
+						FnBhc3Nwb3J0MDEubGVlZHMuYWMudWswDQYJKoZIhvcNAQEFBQADggEBACQsm5vI
+						4o44Cc/MaLBJ/SPFLoq0BOvVfiGla2OZqkThKevMx9zhJ7F0jPuUf3xeid4dDTVS
+						LZpgbS2plArMls7lrgiB9p6hthZhcpMTsDBFqxmCR4XpWO2FFw4V+JfjEH49cLnf
+						J+7thzg2igVBLyjROj08CwVEIePVL4Sy7dQJzeXzUhkuYv4UNCCljlZZPqoGR1AG
+						RJKHqx110JN4FqLHDbBskqFHroYIWqeqhlI/4/tb1u0AK5NUyXXGjVQ8qHq6gddw
+						hVngRa/lqhP2VGXCqr+WQusp6h/AIwM29L5TPaQMeMqhgLPhDibY/1u3efDbylza
+						RtGpd9sEbI6dDKE=
+					</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEhzCCA2+gAwIBAgIQZugaNgYGJKacmZHftg6FwDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDUwODAwMDAwMFoXDTE1MDUwODIzNTk1OVowXDELMAkGA1UE
+						BhMCR0IxDjAMBgNVBAcTBUxlZWRzMRwwGgYDVQQKExNVbml2ZXJzaXR5IG9mIExl
+						ZWRzMR8wHQYDVQQDExZwYXNzcG9ydDAxLmxlZWRzLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEApJ8CSCtWcwfYjAoGYAct3rbbZEjkhBBVBdKP
+						WiPUgXluspslc+Ex28zKzpuRHfokDxLJBs5PkcZ+dsc0AbwsIx66BOWPc9vUnJ/P
+						1g66NJQIuKm/uBMp9GSFLlSvawpxwv8H+mT3mWzekZE9jtVDf1bTeZm7CoF422WS
+						WDZAkPkZe+Y2I93/YUwX5NR3jFjCeWk77WmMNAmYbmCWLQd4zR2FhK/6WmB6CFcr
+						u/mJZUuxUXTOrnxr2RG+5XZRJN31TkUcgLTm042wYPeD537V87R7TQPEtd6TzYjR
+						gpIngiEAE6/YwDeiVWwmslm44KnG5iYeshcKd3jvdFqh0gqXLQIDAQABo4IBaTCC
+						AWUwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFACO
+						7Rt4p/HuV6f9LndFJ0kdN9gpMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
+						MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysG
+						AQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
+						YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
+						AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
+						KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCEGA1UdEQQaMBiC
+						FnBhc3Nwb3J0MDEubGVlZHMuYWMudWswDQYJKoZIhvcNAQEFBQADggEBACQsm5vI
+						4o44Cc/MaLBJ/SPFLoq0BOvVfiGla2OZqkThKevMx9zhJ7F0jPuUf3xeid4dDTVS
+						LZpgbS2plArMls7lrgiB9p6hthZhcpMTsDBFqxmCR4XpWO2FFw4V+JfjEH49cLnf
+						J+7thzg2igVBLyjROj08CwVEIePVL4Sy7dQJzeXzUhkuYv4UNCCljlZZPqoGR1AG
+						RJKHqx110JN4FqLHDbBskqFHroYIWqeqhlI/4/tb1u0AK5NUyXXGjVQ8qHq6gddw
+						hVngRa/lqhP2VGXCqr+WQusp6h/AIwM29L5TPaQMeMqhgLPhDibY/1u3efDbylza
+						RtGpd9sEbI6dDKE=
+					</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>
diff --git a/swamid-interfederations-2.0/passport2.e2bn.org-shibboleth.xml b/swamid-interfederations-2.0/passport2.e2bn.org-shibboleth.xml
new file mode 100644
index 00000000..5258a7b6
--- /dev/null
+++ b/swamid-interfederations-2.0/passport2.e2bn.org-shibboleth.xml
@@ -0,0 +1,71 @@
+<?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://passport2.e2bn.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-06T09:59: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://passport2.e2bn.org/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://passport2.e2bn.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>
+						MIIEqjCCA5KgAwIBAgIQaxilpKtFyudwNIabYTWe6zANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDgwMzAwMDAwMFoXDTE1MDgwMzIzNTk1OVowgYIxCzAJBgNV
+						BAYTAkdCMRYwFAYDVQQIEw1IZXJ0Zm9yZHNoaXJlMRIwEAYDVQQHEwlIaW54d29y
+						dGgxKjAoBgNVBAoTIUVhc3Qgb2YgRW5nbGFuZCBCcm9hZGJhbmQgTmV0d29yazEb
+						MBkGA1UEAxMScGFzc3BvcnQyLmUyYm4ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAwWzHYa3GF8L0WS6Vy+/oj4BXuLIegDpYmZpOdNHKc6cUelYD
+						mANHjc8crK/OzfIkdYZ/xd+RM6GWHiDfo0DwI7/T8WtOLEGy/liM+ekPEq4XQdZk
+						tDWCF937oj5CbXH8QPWdzyFVf4AUA6Sb+JZpO0zT5ptW8WHeM6TFP1izlXhaNvOl
+						Ql3lBSCuVJcMCiHUUabgA96JByWviim2i0UkHDK5NVrsx1KYL7oK2ipOuds5HXa6
+						yy/s1FUQ4DkK3xEn3ES6JQTFEwPQ1RgR3xryY335ilcvtd7Xd+ELBKuHxxB2FJGy
+						6hNcwxreLeFQiKiIV6BMJLvOh4JPBJ82GKaXQQIDAQABo4IBZTCCAWEwHwYDVR0j
+						BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFE6U3xk/mGGDfrom
+						4PmC+wZxRgXgMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
+						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgId
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEnBhc3Nwb3J0
+						Mi5lMmJuLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEAGF313BU94mPtvNABYwuN2RmM
+						6bUyIkedHzkE2t3jhLB5TBl1dbqcAqA9Ojgxa0/81bbtOgccAYm90df/PqFI2V5z
+						pyeMJodK8M/W+mlGfl6KtBPyV3ioFflhIeyubLUhDxP2pacTI40+4GYsylHMcvEx
+						NwzL7DXqWFzPK2OqdEqrQWFko+VnnfRDcg7pMaKO9+xqhutw9XGmllUTk1rLr/Bn
+						QVZejbc10E/YaTEWXrvsnOUPvKi9ufV7mkfi5Zq0LtwlpeI4IjgaykGZHEEcTdNA
+						A48T78ntBTNuYYtFdpAkqpAcvMhkrMJplW2G4+KFLeotqtZzBTkyIj5MANRJuA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport2.e2bn.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport2.e2bn.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passport2.e2bn.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport2.e2bn.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passport2.e2bn.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">East of England Broadband Network</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">E2BN Online 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/payments.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/payments.balliol.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..29856934
--- /dev/null
+++ b/swamid-interfederations-2.0/payments.balliol.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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://payments.balliol.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-20T10:54:03Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://payments.balliol.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>
+						MIIDEjCCAfqgAwIBAgIJAPvOedFZEvkcMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXBheW1lbnRzLmJhbGxpb2wub3guYWMudWswHhcNMTIwNDE3MjA1NTM3WhcN
+						MjIwNDE1MjA1NTM3WjAkMSIwIAYDVQQDExlwYXltZW50cy5iYWxsaW9sLm94LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwFpid6d55DBZOLIs
+						xpDcZGgKfqu6Gm/T/ZVJY3AOj5BjTdjCiLn57FpMEkyCci7wODhEnTl7M1DFhVpo
+						CskYhETMeERTP9C2vNco/X3UdCtkPR2ZWs/yBGraqBkyeg4kx7U6+trEwO+Sqirj
+						2AHrPOwBJgtyIUGVsXgF9o54bptyQQsHIUX7+XPW7stiZ5X035HR5tB6hjfoZoRe
+						skzs6kploPCCxN8dL83lYw8VdYHWyvQmgXL4fsqTGaULcUGEjhekubGxIFL5xQRF
+						l3oWY4sIz5x9FMkbwt2S8NQzQokbvKpQcntotUMHYik1fLU/0QVoTEj0PR7en4GO
+						guTiNQIDAQABo0cwRTAkBgNVHREEHTAbghlwYXltZW50cy5iYWxsaW9sLm94LmFj
+						LnVrMB0GA1UdDgQWBBTP8wkRhzQFe7iXTxZIrPIt8T4xtTANBgkqhkiG9w0BAQUF
+						AAOCAQEADgadkCnPCWgs1Y0S3Uz5ErkdPvxNlTx0Qau1DxXx2QOwqVvc55xyNcKt
+						s6MJ4dwlZPYWPZT2b1G49pmUUMUp87XD1M6melhm2IzcTbyRJrA+KoSAFEL/hEBp
+						z8MrOtNI5/IPFfZOpwvoJMdUb2wxAscU+CoEa9HF+YndCPZmscMYOE3D3/3g+hAE
+						CC7AGt/AG6LsibsXDiL7RB3S0844C/T32nam6C59kwWg0CWWQuZIY+9xZDctOgIb
+						IDoUKfE1W4rdUtZ3bT+Ra7wnX0tmfUBlBc/h/38W9wQV1kqa3tnH8BEuC0Jpqcq4
+						U0MKDSCQFv1ZBA4ckzGCSivlU9HSig==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Balliol Payments</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stewart</md:GivenName>
+    <md:SurName>Tolhurst</md:SurName>
+    <md:EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stewart</md:GivenName>
+    <md:SurName>Tolhurst</md:SurName>
+    <md:EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</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
new file mode 100644
index 00000000..dc0906bf
--- /dev/null
+++ b/swamid-interfederations-2.0/peterborough.ac.uk-oala-metadata.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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>
+						MIIDZDCCAkygAwIBAgIINjMwhVf3jFkwDQYJKoZIhvcNAQEFBQAwSTEmMCQGA1UE
+						CgwdUGV0ZXJib3JvdWdoIFJlZ2lvbmFsIENvbGxlZ2UxHzAdBgNVBAMMFmFhcy5w
+						ZXRlcmJvcm91Z2guYWMudWswHhcNMTIxMDE3MTMzODAwWhcNMjIxMDE3MTMzODAw
+						WjBJMSYwJAYDVQQKDB1QZXRlcmJvcm91Z2ggUmVnaW9uYWwgQ29sbGVnZTEfMB0G
+						A1UEAwwWYWFzLnBldGVyYm9yb3VnaC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBAIIbeuWlQPhTqwxItEPE51NVFfArYjaRW8O9b0aYfoYRQH86
+						yYBOpO0xeaqb6fpCrjwvZwz+SPDcSu26f2u0NJ4eHClO8QAWGyh9XGH3WZu0R6YW
+						nvbPTHjJOxSlDVo2Ukba3/TG+6WMQXa89b86NKbzLrOBISyrbLky1NTAtFI2+Kcm
+						Tsw7G+lk/jbAR4WD/AaXS9iXZjvOR5Fd+6ntvKp7PheNoD+7pbnEJV2Il1YMrmT4
+						puMw74kAIRbwKOGwA1VivNNGfnuGW8lYmujwPVfJwWXUXUgOqr86MHt+iatvJ7EA
+						3ZmSUYmlJYFkdc3aWbMplI5WuOLlKK0EeBlVAG0CAwEAAaNQME4wHQYDVR0OBBYE
+						FAF22/FrH+1Anys4Xk2bheSlL00KMB8GA1UdIwQYMBaAFAF22/FrH+1Anys4Xk2b
+						heSlL00KMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAkfZ2yKKff4
+						P6/mGdaEIu1t/eVwRgeCHKiW4cnDTPlIJ3qQ0oWKPnqvMuLnARbwJcA+BAKHrH47
+						Z/o9G70hzo4+yQrw9Oh9N+b99gW62DhdWNiVJKD7u9pFI5w9rX0wPRlM9tuJJQqY
+						mkS3SnkZDJOloF0cUjC2zo9cJNsCbPrjN+DkkVweNV6Bbzu8ABwDr6UV3zkY8iot
+						S7F79s1+CGoFcU8g07hpq93i957bqsyCasIEc/wn54jQyLs4LorcKO5WJg/50Q2j
+						/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>
+						MIIDZDCCAkygAwIBAgIINjMwhVf3jFkwDQYJKoZIhvcNAQEFBQAwSTEmMCQGA1UE
+						CgwdUGV0ZXJib3JvdWdoIFJlZ2lvbmFsIENvbGxlZ2UxHzAdBgNVBAMMFmFhcy5w
+						ZXRlcmJvcm91Z2guYWMudWswHhcNMTIxMDE3MTMzODAwWhcNMjIxMDE3MTMzODAw
+						WjBJMSYwJAYDVQQKDB1QZXRlcmJvcm91Z2ggUmVnaW9uYWwgQ29sbGVnZTEfMB0G
+						A1UEAwwWYWFzLnBldGVyYm9yb3VnaC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBAIIbeuWlQPhTqwxItEPE51NVFfArYjaRW8O9b0aYfoYRQH86
+						yYBOpO0xeaqb6fpCrjwvZwz+SPDcSu26f2u0NJ4eHClO8QAWGyh9XGH3WZu0R6YW
+						nvbPTHjJOxSlDVo2Ukba3/TG+6WMQXa89b86NKbzLrOBISyrbLky1NTAtFI2+Kcm
+						Tsw7G+lk/jbAR4WD/AaXS9iXZjvOR5Fd+6ntvKp7PheNoD+7pbnEJV2Il1YMrmT4
+						puMw74kAIRbwKOGwA1VivNNGfnuGW8lYmujwPVfJwWXUXUgOqr86MHt+iatvJ7EA
+						3ZmSUYmlJYFkdc3aWbMplI5WuOLlKK0EeBlVAG0CAwEAAaNQME4wHQYDVR0OBBYE
+						FAF22/FrH+1Anys4Xk2bheSlL00KMB8GA1UdIwQYMBaAFAF22/FrH+1Anys4Xk2b
+						heSlL00KMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAkfZ2yKKff4
+						P6/mGdaEIu1t/eVwRgeCHKiW4cnDTPlIJ3qQ0oWKPnqvMuLnARbwJcA+BAKHrH47
+						Z/o9G70hzo4+yQrw9Oh9N+b99gW62DhdWNiVJKD7u9pFI5w9rX0wPRlM9tuJJQqY
+						mkS3SnkZDJOloF0cUjC2zo9cJNsCbPrjN+DkkVweNV6Bbzu8ABwDr6UV3zkY8iot
+						S7F79s1+CGoFcU8g07hpq93i957bqsyCasIEc/wn54jQyLs4LorcKO5WJg/50Q2j
+						/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>
diff --git a/swamid-interfederations-2.0/platformdev-secure.nature.com-shibboleth.xml b/swamid-interfederations-2.0/platformdev-secure.nature.com-shibboleth.xml
new file mode 100644
index 00000000..eb6111d6
--- /dev/null
+++ b/swamid-interfederations-2.0/platformdev-secure.nature.com-shibboleth.xml
@@ -0,0 +1,73 @@
+<?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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDPjCCAiagAwIBAgIET2caITANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJVSzEPMA0GA1UE
+						BxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzEfMB0GA1UEAxMWdGVz
+						dC1zZWN1cmUubmF0dXJlLmNvbTAeFw0xMjAzMTkxMTM2MDFaFw0xNTAzMTkxMTM2MDFaMGExCzAJ
+						BgNVBAYTAlVLMQ8wDQYDVQQHEwZMb25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoGA1UECxMD
+						TlBHMR8wHQYDVQQDExZ0ZXN0LXNlY3VyZS5uYXR1cmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAloYBXDytAMlqZ8QR8WUEylHacH6PxyMHYlwXrNIHGG4XgH9n9cU53EQO03KW
+						MmCx7ERrLumsMEKHHDf/h5Hh9VP3s8eaQ6bC80I7eAf2nKSK7DQdTnoWj+e86xBduqTiBqm9bc4G
+						5lBtfUpGM9l/oTBXTpjrM6T78bhNfaTARRKS+CCPmh8XVosCN59DbdT0R3QAkcee2gzvAfJRbij2
+						yVty0zlOECmyMilMmIhdvhU6+hNNi9s4/uvuWQ9SNHxNYhhjljHX8iKAd2cPAf1FT6MOBbXZvPpT
+						KxiE0mdOFNo/tAx5vlSAbjVmhTbGFbSLgCwdsP40d5xz3bV5qE427wIDAQABMA0GCSqGSIb3DQEB
+						BQUAA4IBAQAHQDwA52lJAzlFkV+S6HZ4C2U0KuyE8471M5s1x1Wgm0QKGMuD/ekLJw9wsnlnBkEl
+						fghY1z/bEpWTHc8O8l3tTGPWTzvSk7ytpgF/L7z4eT1qkaqxayLbvc+TVVnr3cLynjMgfs2h0DBW
+						dCzh/Nb+ErDv3nW6EwUBunIkjkDENvgB9UMdwSZ2em9tKeXiLBM4390C8AC2L/6OtivmKueQt9RN
+						G78rDXp3dmAVNtesGvTY2bL3k7m3FK+oebpTXEuw2IeEFSEmWoJEeZY4twKNYzlqgbv8LuBMo0f+
+						LQ5Lw2JD/nDF1yE5VgYUt3VBW4f1MJLtYPQX+ej4Mx3Q3Udl
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDPjCCAiagAwIBAgIET2caITANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJVSzEPMA0GA1UE
+						BxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzEfMB0GA1UEAxMWdGVz
+						dC1zZWN1cmUubmF0dXJlLmNvbTAeFw0xMjAzMTkxMTM2MDFaFw0xNTAzMTkxMTM2MDFaMGExCzAJ
+						BgNVBAYTAlVLMQ8wDQYDVQQHEwZMb25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoGA1UECxMD
+						TlBHMR8wHQYDVQQDExZ0ZXN0LXNlY3VyZS5uYXR1cmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAloYBXDytAMlqZ8QR8WUEylHacH6PxyMHYlwXrNIHGG4XgH9n9cU53EQO03KW
+						MmCx7ERrLumsMEKHHDf/h5Hh9VP3s8eaQ6bC80I7eAf2nKSK7DQdTnoWj+e86xBduqTiBqm9bc4G
+						5lBtfUpGM9l/oTBXTpjrM6T78bhNfaTARRKS+CCPmh8XVosCN59DbdT0R3QAkcee2gzvAfJRbij2
+						yVty0zlOECmyMilMmIhdvhU6+hNNi9s4/uvuWQ9SNHxNYhhjljHX8iKAd2cPAf1FT6MOBbXZvPpT
+						KxiE0mdOFNo/tAx5vlSAbjVmhTbGFbSLgCwdsP40d5xz3bV5qE427wIDAQABMA0GCSqGSIb3DQEB
+						BQUAA4IBAQAHQDwA52lJAzlFkV+S6HZ4C2U0KuyE8471M5s1x1Wgm0QKGMuD/ekLJw9wsnlnBkEl
+						fghY1z/bEpWTHc8O8l3tTGPWTzvSk7ytpgF/L7z4eT1qkaqxayLbvc+TVVnr3cLynjMgfs2h0DBW
+						dCzh/Nb+ErDv3nW6EwUBunIkjkDENvgB9UMdwSZ2em9tKeXiLBM4390C8AC2L/6OtivmKueQt9RN
+						G78rDXp3dmAVNtesGvTY2bL3k7m3FK+oebpTXEuw2IeEFSEmWoJEeZY4twKNYzlqgbv8LuBMo0f+
+						LQ5Lw2JD/nDF1yE5VgYUt3VBW4f1MJLtYPQX+ej4Mx3Q3Udl
+					</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>
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
new file mode 100644
index 00000000..04c6bffb
--- /dev/null
+++ b/swamid-interfederations-2.0/platformdev-secure.palgrave-journals.com-shibboleth.xml
@@ -0,0 +1,81 @@
+<?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 use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDYjCCAkqgAwIBAgIET2caJTANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzExMC8GA1UEAxMocGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlLWpvdXJu
+						YWxzLmNvbTAeFw0xMjAzMTkxMTM2MDVaFw0xNTAzMTkxMTM2MDVaMHMxCzAJBgNV
+						BAYTAlVLMQ8wDQYDVQQHEwZMb25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoG
+						A1UECxMDTlBHMTEwLwYDVQQDEyhwbGF0Zm9ybWRldi1zZWN1cmUucGFsZ3JhdmUt
+						am91cm5hbHMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA00uo
+						Fepe7K4B8tH6GPgOvp/dv5XSOkwspr5dF0NiFuXC3MJ7E1xcQx8SnIJP62pseky6
+						K++HYKSNClkhD+uhp9lvTN/6M/KRj7wy4H2Ic9s4Ej+UxwrLlzQMdE2lfglK8qOg
+						hnjGP5IkSbVvzhVXHCw7bbgAR242XPPXUegFmzFv47dpmhzoW2GfoYIEAbqRgyhT
+						JW29WL3KXTh6SWl+6BdLmbbaVvNZKMqUS6HlfEqez5I5Rk1m/4IEz1Wd6IPjfE23
+						0HGCnn82AQHKXIBQ9tEXspC0aOGoC5KfLnkVpXXpn12zegeHPUlFpdtNsbdA9lio
+						V2J4LxcNyjUh4KtH/QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBXS5oeZYz9b2ht
+						6vTdHwEt/Awl2lGRfVsReKjUmfAyI/yNCnxx6uk0Eg5nunO8O0IllIpSrDHHNr0F
+						pzxdv09HLucN/8rjyzPOtTbfgq5peztG3yKj52y118/OcMb9K2lN48DcxvXR0P89
+						0qBgMI3X0ebwygH70IMQ8t00vKkndnSaOz9OHmMWl6m4BIV7xvEGL+L+bYJx+SVt
+						8PO4wSB5/5945Iz+mgNQd2oilPNCX4RnHxlVhZqUs8HF5W3Imw7nT0sQ+jYSMyCC
+						FtOpFZqPowf2on+XEHwFTuileOyHWzeIBzdiHwKk1hLHMs9AppiXEnQnBdRWWMqQ
+						iCrPGcvd
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDYjCCAkqgAwIBAgIET2caJTANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzExMC8GA1UEAxMocGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlLWpvdXJu
+						YWxzLmNvbTAeFw0xMjAzMTkxMTM2MDVaFw0xNTAzMTkxMTM2MDVaMHMxCzAJBgNV
+						BAYTAlVLMQ8wDQYDVQQHEwZMb25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoG
+						A1UECxMDTlBHMTEwLwYDVQQDEyhwbGF0Zm9ybWRldi1zZWN1cmUucGFsZ3JhdmUt
+						am91cm5hbHMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA00uo
+						Fepe7K4B8tH6GPgOvp/dv5XSOkwspr5dF0NiFuXC3MJ7E1xcQx8SnIJP62pseky6
+						K++HYKSNClkhD+uhp9lvTN/6M/KRj7wy4H2Ic9s4Ej+UxwrLlzQMdE2lfglK8qOg
+						hnjGP5IkSbVvzhVXHCw7bbgAR242XPPXUegFmzFv47dpmhzoW2GfoYIEAbqRgyhT
+						JW29WL3KXTh6SWl+6BdLmbbaVvNZKMqUS6HlfEqez5I5Rk1m/4IEz1Wd6IPjfE23
+						0HGCnn82AQHKXIBQ9tEXspC0aOGoC5KfLnkVpXXpn12zegeHPUlFpdtNsbdA9lio
+						V2J4LxcNyjUh4KtH/QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBXS5oeZYz9b2ht
+						6vTdHwEt/Awl2lGRfVsReKjUmfAyI/yNCnxx6uk0Eg5nunO8O0IllIpSrDHHNr0F
+						pzxdv09HLucN/8rjyzPOtTbfgq5peztG3yKj52y118/OcMb9K2lN48DcxvXR0P89
+						0qBgMI3X0ebwygH70IMQ8t00vKkndnSaOz9OHmMWl6m4BIV7xvEGL+L+bYJx+SVt
+						8PO4wSB5/5945Iz+mgNQd2oilPNCX4RnHxlVhZqUs8HF5W3Imw7nT0sQ+jYSMyCC
+						FtOpFZqPowf2on+XEHwFTuileOyHWzeIBzdiHwKk1hLHMs9AppiXEnQnBdRWWMqQ
+						iCrPGcvd
+					</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>
diff --git a/swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml
new file mode 100644
index 00000000..f038c6aa
--- /dev/null
+++ b/swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://platformdev-secure.palgraveconnect.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-14T15:05:33Z"/>
+  </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>
+						MIIDXjCCAkagAwIBAgIEUA5y6zANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzEvMC0GA1UEAxMmcGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlY29ubmVj
+						dC5jb20wHhcNMTIwNzI0MTAwMzIzWhcNMTUwNzI0MTAwMzIzWjBxMQswCQYDVQQG
+						EwJVSzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNV
+						BAsTA05QRzEvMC0GA1UEAxMmcGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlY29u
+						bmVjdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClpsvzfYR2
+						JlYzZElx7y+EoBqStGsaBrV2cLzxPRH6766SFX54bWVQEpPpO41Fdjh9+QHzglWk
+						XOCrO+bgTcqdat8t9pOTSxGuq5uu4wWNz7eGlXzaR54MKGU1T1XdNxGf++sStrvI
+						ggQh5XxdDUWn+mB5j0Q3IE0zUUQClDmvYhhXfSGd1iChHzO3z/jf+yEpflNVhdgo
+						XQJZW0OcwwV46X+BqH5NhWN+j44GHtDozvX+XAT1jp7qnchiXHcrsA6gjF1DuzNT
+						XuYa7GNo8inl6Mc+v1MaO3EaVZBc1tfuvkWBC/GLcuHGminyB3ckXZGoEuvqZ2HB
+						ve/IKaHz8OnzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKPsP4ULhqHt+J81MkAg
+						X/c61vNXrGIVZSrz3xea4TkKkvsKCWMo1FHqWjdciiXg+yooM6nrPxnnCyMojNuA
+						UG4c+tsa2uOfYoZdQ7SewVHGq0ybjrfXrrtD2BRfXwXq5SSF+x+XtaRTjCVIGBSr
+						+HzaaE6rIMeZTS+pBEXIegkYc8lnyCs0CpeX1Z+COEfQ4ciH+OuCMoDVheU0pkdm
+						1WY2k3rJluzt/ebVxpCr95vbzC+2P6dsSXNs8IOqic1AeKAPSULUKTLxNQ2xfMyt
+						oPw888JFFsXn54w5CfuyMgEQDCEr1p6s/+H0QQwfabvIs7qcyK6l3eMbILFqG0Wy
+						ZuQ=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDXjCCAkagAwIBAgIEUA5y6zANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzEvMC0GA1UEAxMmcGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlY29ubmVj
+						dC5jb20wHhcNMTIwNzI0MTAwMzIzWhcNMTUwNzI0MTAwMzIzWjBxMQswCQYDVQQG
+						EwJVSzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNV
+						BAsTA05QRzEvMC0GA1UEAxMmcGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlY29u
+						bmVjdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClpsvzfYR2
+						JlYzZElx7y+EoBqStGsaBrV2cLzxPRH6766SFX54bWVQEpPpO41Fdjh9+QHzglWk
+						XOCrO+bgTcqdat8t9pOTSxGuq5uu4wWNz7eGlXzaR54MKGU1T1XdNxGf++sStrvI
+						ggQh5XxdDUWn+mB5j0Q3IE0zUUQClDmvYhhXfSGd1iChHzO3z/jf+yEpflNVhdgo
+						XQJZW0OcwwV46X+BqH5NhWN+j44GHtDozvX+XAT1jp7qnchiXHcrsA6gjF1DuzNT
+						XuYa7GNo8inl6Mc+v1MaO3EaVZBc1tfuvkWBC/GLcuHGminyB3ckXZGoEuvqZ2HB
+						ve/IKaHz8OnzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKPsP4ULhqHt+J81MkAg
+						X/c61vNXrGIVZSrz3xea4TkKkvsKCWMo1FHqWjdciiXg+yooM6nrPxnnCyMojNuA
+						UG4c+tsa2uOfYoZdQ7SewVHGq0ybjrfXrrtD2BRfXwXq5SSF+x+XtaRTjCVIGBSr
+						+HzaaE6rIMeZTS+pBEXIegkYc8lnyCs0CpeX1Z+COEfQ4ciH+OuCMoDVheU0pkdm
+						1WY2k3rJluzt/ebVxpCr95vbzC+2P6dsSXNs8IOqic1AeKAPSULUKTLxNQ2xfMyt
+						oPw888JFFsXn54w5CfuyMgEQDCEr1p6s/+H0QQwfabvIs7qcyK6l3eMbILFqG0Wy
+						ZuQ=
+					</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.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://platformdev-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://platformdev-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://platformdev-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">Macmillan Publishers Limited: Palgrave Connect Dev</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>Mohammad</md:GivenName>
+    <md:SurName>Nawab</md:SurName>
+    <md:EmailAddress>mailto:m.nawab@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/playgen.a-n.co.uk-shibboleth.xml b/swamid-interfederations-2.0/playgen.a-n.co.uk-shibboleth.xml
new file mode 100644
index 00000000..5139ccd3
--- /dev/null
+++ b/swamid-interfederations-2.0/playgen.a-n.co.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIDIDCCAgigAwIBAgIJALZ0HnVpTZsXMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEXBsYXlnZW4uYS1uLmNvLnVrMB4XDTEzMTAxODExMTYwMloXDTE2MTAxNzEx
+						MTYwMlowHDEaMBgGA1UEAxMRcGxheWdlbi5hLW4uY28udWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDGy7TgC2JyLa2SqOL0bKb3UZrkBMHI3+FKgZtl
+						AeQvpKyZ8I9wG139BAdYIZlKH+RUIj/Wd2Wa69IZDnU/P20iKKQmBrheWna8ce3x
+						vGRi4q7Qp4xk+Oks/3KF3N48PYLy6JWQvOKlzkDo+vZndMwrZITINkJ+WwtWabBr
+						85yQ+g2OCnqjznYVIyzVyWaWwD7EW/x5kyDi70nYVUQ8fR21T3m64hoNfD9cPhF1
+						Uq/qvtls5ubHJWiZDoUG5OX1jhMPPtd0zwt+vNzlkm1RfnYC7WrW5WeL1WrhRU/V
+						Sozkoxl36qJwtZQAYhOXSs9lKrnX+yE2lXQRR5hlQId52oMlAgMBAAGjZTBjMEIG
+						A1UdEQQ7MDmCEXBsYXlnZW4uYS1uLmNvLnVrhiRodHRwczovL3BsYXlnZW4uYS1u
+						LmNvLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFIeK96KEhd/EQmjx2xd3pj8Zeu+l
+						MA0GCSqGSIb3DQEBBQUAA4IBAQA+Po3EcuVGKS41nGDet0fD7fyEQ4sOPeCe65/T
+						PMYWByMs53FXHlB32xObJruW/cFyoDMFhwWq4D5FwmYpGnyC1TQBrR7K25yP6ZuT
+						9ogMtqKb/VIx/UlIcfiaDHZJWW4N6qF6MAwX8Qpv7ek9PQ3/ZiFdzbtEZqDd/grz
+						NtSKUusX30kNI9tAc2qvsccGEuzWWLI6h82aipoHtvb2CF+yYkS060MItJZreMSp
+						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>Jennifer</md:GivenName>
+    <md:SurName>Picken</md:SurName>
+    <md:EmailAddress>mailto:jennifer.picken@a-n.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Padwick</md:SurName>
+    <md:EmailAddress>mailto:richard.padwick@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
new file mode 100644
index 00000000..dc346d40
--- /dev/null
+++ b/swamid-interfederations-2.0/pleiades.lesoco.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						by5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPujg+dd0hL+
+						ZJb26+crh6T4fcFpxBBdaKNGTF1LNu5esjitzTXrAnijQVB4y1P5lR/fmqO+ajmA
+						x3hoPL7UNgH7ID5fgyMLNzzox82qoByHejpswLKp+4Snvt7bhxo/6w97iKV1Sjh3
+						pRRtxoeRBq7uxnL8e5WFbr7Ew9MFGDlD07ytU1gLVXZCg8+zxUU+BJ6PwLKnvujE
+						hYdC+A+DDAcHWGF6BlQaDjH1CXmh66E9zCRJ6YSLvazKqcJiaGbOP9skQ0Rgo4Lu
+						Xq1qXbfHxKbBhTcQbqvjSnzuMLLKrX0mGWugn+sfk7cwIXNNgBs+JbI8AfNF7dTs
+						J6e9Qasq25UCAwEAAaNxMG8wTgYDVR0RBEcwRYIVcGxlaWFkZXMubGVzb2NvLmFj
+						LnVrhixodHRwczovL3BsZWlhZGVzLmxlc29jby5hYy51ay9pZHAvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUA1OBiJSoiADL+KSZEPRvSD86g0YwDQYJKoZIhvcNAQEFBQAD
+						ggEBAISZ2JQYw5QMKpAL5VZh0/noDgzh+zYZWjDwj8w4PmvFqi7ZXyu+jLUcwU8C
+						HCSmMn/ehuxZ2zR8I1qqFSbASBPTmAcYvoK4gEVyXHVEQVkwJNj0gG39UzYcymO6
+						if1dnoQNOpU/a0wIxjtN4XqBamWuDybeb5vzGtWUDFlHn8kBMeNQjK8OjdPwF91X
+						dHvlCj9Ab4Uvebf2faiFpEykRznumWXGzFmfqHyXlwXbomP/wBN56GbiWQUEc2+1
+						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>
+						MIIDQDCCAiigAwIBAgIVAKbHiecwCXwEW8jzRANDUcHw0nS3MA0GCSqGSIb3DQEB
+						BQUAMCAxHjAcBgNVBAMTFXBsZWlhZGVzLmxlc29jby5hYy51azAeFw0xMzA5MDQx
+						NDQ5MjBaFw0zMzA5MDQxNDQ5MjBaMCAxHjAcBgNVBAMTFXBsZWlhZGVzLmxlc29j
+						by5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPujg+dd0hL+
+						ZJb26+crh6T4fcFpxBBdaKNGTF1LNu5esjitzTXrAnijQVB4y1P5lR/fmqO+ajmA
+						x3hoPL7UNgH7ID5fgyMLNzzox82qoByHejpswLKp+4Snvt7bhxo/6w97iKV1Sjh3
+						pRRtxoeRBq7uxnL8e5WFbr7Ew9MFGDlD07ytU1gLVXZCg8+zxUU+BJ6PwLKnvujE
+						hYdC+A+DDAcHWGF6BlQaDjH1CXmh66E9zCRJ6YSLvazKqcJiaGbOP9skQ0Rgo4Lu
+						Xq1qXbfHxKbBhTcQbqvjSnzuMLLKrX0mGWugn+sfk7cwIXNNgBs+JbI8AfNF7dTs
+						J6e9Qasq25UCAwEAAaNxMG8wTgYDVR0RBEcwRYIVcGxlaWFkZXMubGVzb2NvLmFj
+						LnVrhixodHRwczovL3BsZWlhZGVzLmxlc29jby5hYy51ay9pZHAvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUA1OBiJSoiADL+KSZEPRvSD86g0YwDQYJKoZIhvcNAQEFBQAD
+						ggEBAISZ2JQYw5QMKpAL5VZh0/noDgzh+zYZWjDwj8w4PmvFqi7ZXyu+jLUcwU8C
+						HCSmMn/ehuxZ2zR8I1qqFSbASBPTmAcYvoK4gEVyXHVEQVkwJNj0gG39UzYcymO6
+						if1dnoQNOpU/a0wIxjtN4XqBamWuDybeb5vzGtWUDFlHn8kBMeNQjK8OjdPwF91X
+						dHvlCj9Ab4Uvebf2faiFpEykRznumWXGzFmfqHyXlwXbomP/wBN56GbiWQUEc2+1
+						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>
diff --git a/swamid-interfederations-2.0/plymouth.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/plymouth.idm.oclc.org-shibboleth.xml
new file mode 100644
index 00000000..06bf28f4
--- /dev/null
+++ b/swamid-interfederations-2.0/plymouth.idm.oclc.org-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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>
+						MIIEETCCAvmgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBoMSAwHgYDVQQDFBcqLnBs
+						eW1vdXRoLmlkbS5vY2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMx
+						KDAmBgkqhkiG9w0BCQEWGWphbWVzLmh1dGNoaW5zb25Ab2NsYy5vcmcwHhcNMTQx
+						MTA2MDk0MDI3WhcNMjQxMTA1MDk0MDI3WjBoMSAwHgYDVQQDFBcqLnBseW1vdXRo
+						LmlkbS5vY2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxKDAmBgkq
+						hkiG9w0BCQEWGWphbWVzLmh1dGNoaW5zb25Ab2NsYy5vcmcwggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCuSNLwavt673OzkEej1fIP9HcNwOTTe26lJ16u
+						q1OKPqzwFMbqZchzJb2ztNCyzUAO0MxlolD9JXQ9YMr8YtwWeZVGyvkf4FKUBA1c
+						IyN8H7M5SuvtuxMsJdFnT5gje9uSUWL/64jjkrjMEDcXRbWYo2nbJwDV7ee2TIE0
+						U8+JNsFthZ0GrCzZ70xHx+VWCUIhNZv4/3n0iGHztTJvgs3JG28k5neYq39g3OBv
+						S+sc9xR2dwGXelf55dkI0WbIDf5x5l1CmbzlKA+gQJKf2462i56SbCgzqENcNNaW
+						PsaTvD8ffl9TlAmcV0YXuAaZkCi7vkeMyihWfVd+Hr9Wbn6/AgMBAAGjgcUwgcIw
+						HQYDVR0OBBYEFJCWYysoHhiotHTwQjgzoc6p7oGCMIGSBgNVHSMEgYowgYeAFJCW
+						YysoHhiotHTwQjgzoc6p7oGCoWykajBoMSAwHgYDVQQDFBcqLnBseW1vdXRoLmlk
+						bS5vY2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxKDAmBgkqhkiG
+						9w0BCQEWGWphbWVzLmh1dGNoaW5zb25Ab2NsYy5vcmeCAQIwDAYDVR0TBAUwAwEB
+						/zANBgkqhkiG9w0BAQUFAAOCAQEARRtwHtlFqlIHE6Nuu7cUw/o5fxEUFnTVV2M3
+						SBRCo6rF/Msjr5OGP2M2Z+jKbxFHAPFlgiu/PnPbdByiiaErnFlnJmUP/7OZrPsc
+						TcsIHGFgHws25yGWdZC5GZx1jTSwW3qyARN9+4C95K74jBIEKfR5BksuUIo1Asx6
+						20zAuzlfMrBAuc99gaAZdWMERpZT2UXTKoPxZiF9y0W2OCspiMh52JeXtkz6nSac
+						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>
diff --git a/swamid-interfederations-2.0/portail.u-picardie.fr.xml b/swamid-interfederations-2.0/portail.u-picardie.fr.xml
new file mode 100644
index 00000000..8481df98
--- /dev/null
+++ b/swamid-interfederations-2.0/portail.u-picardie.fr.xml
@@ -0,0 +1,102 @@
+<?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>
+  </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: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>
+					      MIIEeDCCA2CgAwIBAgIRAI8ATZBA7Bnw3Q1sS4vt94owDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA5MDIwMDAwMDBaFw0xNzA5MDEyMzU5NTlaMEMxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVcG9ydGFpbC51
+LXBpY2FyZGllLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtnBM
+cAhCPXC9pBbPm3er4NW+GudXQ7RdSSbjcwvdrTJaZYz87cHLW9S9Z8IT1U0yMUF5
+GWpY3QJdZD7sqWRmbbqSPTRocfStRu1BCXeBFhSDmO7BStGYcFNOLEM0m85ltHY9
+8gqegGoWM1khQmIBNZJAzGQXRs9lOG0ot08mPW/XyZGoo5yvCO4VWNpkd1wlZ7Jg
+TiXyPsqRm4R7+YHwn1R8UMWVMsUUvF2CQNxW8+Ghg/OVn7YrvLb+36vQHznSz1iK
+NYTtRUwXlxM5+o2eIdNWlmZJ3TagRLqWvmUSxbWPZMQ6TTQ0yAyoqqwo2uI3SLw5
+Qz9y2Qmb27YCL88i2QIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFBOVnqjQVT5ecFN5XpHZFMjTE6qvMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVwb3J0YWlsLnUtcGlj
+YXJkaWUuZnIwDQYJKoZIhvcNAQEFBQADggEBAKWOzDpu8ZDdABvbqfqVypK26AuS
+KZQgRWrbhjWXO6beNP1vgv2zkG45tlStDR/IsyJdhif96xUrtHIMNrIJHAX7bO8A
+INrL50AL/tmfSBMrc6zAP4XZyX0MG8PXhMHyZjxuI7mLM/woxXCkn4OiKMZhWVbD
+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>
+					      MIIEeDCCA2CgAwIBAgIRAI8ATZBA7Bnw3Q1sS4vt94owDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA5MDIwMDAwMDBaFw0xNzA5MDEyMzU5NTlaMEMxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVcG9ydGFpbC51
+LXBpY2FyZGllLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtnBM
+cAhCPXC9pBbPm3er4NW+GudXQ7RdSSbjcwvdrTJaZYz87cHLW9S9Z8IT1U0yMUF5
+GWpY3QJdZD7sqWRmbbqSPTRocfStRu1BCXeBFhSDmO7BStGYcFNOLEM0m85ltHY9
+8gqegGoWM1khQmIBNZJAzGQXRs9lOG0ot08mPW/XyZGoo5yvCO4VWNpkd1wlZ7Jg
+TiXyPsqRm4R7+YHwn1R8UMWVMsUUvF2CQNxW8+Ghg/OVn7YrvLb+36vQHznSz1iK
+NYTtRUwXlxM5+o2eIdNWlmZJ3TagRLqWvmUSxbWPZMQ6TTQ0yAyoqqwo2uI3SLw5
+Qz9y2Qmb27YCL88i2QIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFBOVnqjQVT5ecFN5XpHZFMjTE6qvMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVwb3J0YWlsLnUtcGlj
+YXJkaWUuZnIwDQYJKoZIhvcNAQEFBQADggEBAKWOzDpu8ZDdABvbqfqVypK26AuS
+KZQgRWrbhjWXO6beNP1vgv2zkG45tlStDR/IsyJdhif96xUrtHIMNrIJHAX7bO8A
+INrL50AL/tmfSBMrc6zAP4XZyX0MG8PXhMHyZjxuI7mLM/woxXCkn4OiKMZhWVbD
+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="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portail.u-picardie.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <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">
+        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">eppn</saml:AttributeValue>
+      </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://unknown.site.com</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 33a0d19e..90a2100a 100644
--- a/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
+++ b/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://portal.clarin.inl.nl/">
+<md: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>
+  </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://portal.clarin.inl.nl/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Repository for source material for Dutch in the form of historical and contemporary corpora, dictionaries and language technology tools.</mdui:Description>
-        <mdui:Description xml:lang="fi">Hollannin kielen lähderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian työkaluja.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://portal.clarin.inl.nl/doc/information_about_deposition.pdf</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/end_user_license_agreement.pdf</mdui:PrivacyStatementURL>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://portal.clarin.inl.nl/Shibboleth.sso/DiscoJuice" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Institute for Dutch Lexicology Portal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institute for Dutch Lexicology Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Institute for Dutch Lexicology Portal</mdui:Description>
+        <mdui:Description xml:lang="en">Institute for Dutch Lexicology Portal</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://portal.clarin.inl.nl/</mdui:InformationURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>portal.clarin.inl.nl</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>CN=portal.clarin.inl.nl,OU=InstantSSL,O=St Instituut voor Nederlandse Lexicologie,street=Matthias de Vrieshof 2-3,L=Leiden,ST=Zuid-Holland,postalCode=2311 BZ,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIFwTCCBKmgAwIBAgIQYT/URYqjuNs5Wvey06PWozANBgkqhkiG9w0BAQUFADCB
 iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
 A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
@@ -49,45 +52,36 @@ wVaPQRJ8CAJ75BRokKozs/dbRFsK7nykWIz4ryP8ygPDVVOxVdvweTZY6iRrMhhm
 ipw6JOA9+S12wS4ZVDTw1Lnqx55zhvZufKE/IcYUtXQG9zIThXvkSaZsbl81PeiJ
 JzPwUvRo8xI+nUirIcO80HN9FlZJ2MUHnt5EJNvdzWMOrwVyvIkSPllFsVLwRIih
 EYedRymWuO/OSGWReWSkDjCXxPNrqd4aaZSZH67bOcYLz4FUMR64+4JXSN8/gchW
-zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==</ds:X509Certificate>
+zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</md:ServiceName>
-      <md:ServiceName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Hollannin kielen lahderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian tyokaluja.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Repository for source material for Dutch in the form of historical and contemporary corpora, dictionaries and language technology tools.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+    <md: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:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Institute for Dutch Lexicology Portal</md:ServiceName>
+      <md:ServiceName xml:lang="en">Institute for Dutch Lexicology Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Institute for Dutch Lexicology Portal</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Institute for Dutch Lexicology 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="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="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>systeembeheer@inl.nl</md:GivenName>
-    <md:SurName>INL</md:SurName>
+    <md:GivenName>System</md:GivenName>
+    <md:SurName>Management</md:SurName>
     <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>servicedesk@inl.nl</md:GivenName>
-    <md:SurName>INL</md:SurName>
+    <md:GivenName>Service</md:GivenName>
+    <md:SurName>Desk</md:SurName>
     <md:EmailAddress>mailto:servicedesk@inl.nl</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
new file mode 100644
index 00000000..6a306d2f
--- /dev/null
+++ b/swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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://portal.moonshot.ja.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://portal.moonshot.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>
+						MIIC/TCCAeWgAwIBAgIJAPSyqGhwjBRoMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnAxLm1vb25zaG90LmphLm5ldDAeFw0xNDA2MDMxNTE5MzVaFw0yNDA1MzEx
+						NTE5MzVaMB0xGzAZBgNVBAMTEnAxLm1vb25zaG90LmphLm5ldDCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAJuhB6CwLcwlMU1BCmk7K2dV0tbnx7uOd2xP
+						6u2OIMpfc6DybIXXbrFlvQc0iu74D8BwVZliaThcufwdCCuRYawa+WgfGq2vbC+e
+						ZDLWub927i71sVPGvUbjpf2o70CWWd8mnJI8O1GW/4h75izs4o6rzIUYKKhhZj8+
+						bT1WfpQIEl6f4dfCaL0BwxcJdtUB5mRXIluvJ/jIOwrZfUwBtt4kTwNv+O5ZnSDR
+						ka9xUVMb5zo5ThKQwvyIasrWHvtJTVrDgipgl5U3yy0pICbefHsVRGsWI9tpedGE
+						yk9lBy4aaitqVUw0wAj9c819R/kFfUO7rrFDL9XXW6fb89JSwsECAwEAAaNAMD4w
+						HQYDVR0RBBYwFIIScDEubW9vbnNob3QuamEubmV0MB0GA1UdDgQWBBQG/nxwZyg5
+						WmVT7dW1ls/M1vbiozANBgkqhkiG9w0BAQUFAAOCAQEAkLBx3gDitwIxjSCuMSxd
+						5ll6UJCygSwaYm6Xi6mjH1ORIInecwlZkJpGpKALcfQK5bKnSMZ+uP2WR5xOawuf
+						y0Thr2Kpi+zHhU1Va2rS92OUTPGzTiFEeg6ZCFx2Gx+8zAHv217cE7c4L1ubwWIh
+						dPnM3T/hDlfNmnxVwsFSlq/bpPL6rtLzkJkguh/4/0RcBo8qiBU524S6Tg06CDIv
+						JRAUSwga2eSyN/TtSCo0cHOhSyngdaInidFRKtt/Fx7MUp6IcmnoeoqeEFw8LfG3
+						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://portal.moonshot.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.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://portal.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://portal.moonshot.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portal.moonshot.ja.net/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 Collections and Janet Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Moonshot Portal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://portal.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/portofranco.ufma.br-idp-shibboleth.xml b/swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml
new file mode 100644
index 00000000..04e45b4b
--- /dev/null
+++ b/swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIEJDCCAwwCAQAwDQYJKoZIhvcNAQEFBQAwgdcxLzAtBgNVBAoUJlVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRvIE1hcmFuaMOjby9VRk1BMTIwMAYDVQQLFClOw7pjbGVv
+IGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvL05USTEcMBoGCSqGSIb3DQEJ
+ARYNcmVkZXNAdWZtYS5icjETMBEGA1UEBxQKU8OjbyBMdcOtczESMBAGA1UECBQJ
+TWFyYW5ow6NvMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTcG9ydG9mcmFuY28udWZt
+YS5icjAeFw0xNDAzMTgxNTI5MTRaFw0xNzAzMTcxNTI5MTRaMIHXMS8wLQYDVQQK
+FCZVbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBNYXJhbmjDo28vVUZNQTEyMDAGA1UE
+CxQpTsO6Y2xlbyBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Ojby9OVEkxHDAa
+BgkqhkiG9w0BCQEWDXJlZGVzQHVmbWEuYnIxEzARBgNVBAcUClPDo28gTHXDrXMx
+EjAQBgNVBAgUCU1hcmFuaMOjbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3BvcnRv
+ZnJhbmNvLnVmbWEuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDn
++fvGMOGQgGgI1pferSixirhZIU56t7zGZuExYh7xj6SpoJJOAKi9ytBC0LXYC8Hj
+2ewc5oYSdqTkp1pIo56yZoeOqxyaXE7oW3qrOYoN+5lcqpzsYlDYvANXPoL4A0Pq
+j5neYufrWnhnDjwcx+Dvsf3eqpc7uMAhqOu0bxhxiUKs+o4VXGl9N72YHyGawRC5
+nEpfbX5kT8kwSxEjLqyevqbIlFVkIo1wFyHBOvy2zyHZTg3ZUPi2royE1EE6S7sW
+A16T+HWBCqVRrWvmW4tota0FAZ6rgyowUrmQabqF/CoRJcOA0BpbPsv2U4ZTV6wW
+c7EJ8R89ba0iyA3Se3tRAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJNLZTZn91Wx
+CfYam6xq2A9JnzfL60U3/gsu6tf8Oi6Wpgn1+AXA7Fp4vDKlJGXzxS/jmontDzv3
+P/y18eZOdKcfrUg6EygCFN42Sp7oBzqawCWhJuxoDdBxQXOgW09MLwmzigZ1mTLh
+SS7tAfEZcPLNxBnlu2gyyGTU/tc+RK3eM233qiYsgROUsV8PYaK9AUVYug7xTNms
+xtsGHLRz0ZKG891/D/g5DHMCUekGMfNmH+TmQJZx8eK7kRIVGK1oVj3CMRzHgZQw
+2xytvGMY5mdxYdj8MXhqLRuWXSzLwESsl8rxdYZ8jeUXUniYOqoCuB8IhYSVNgc4
+3Z5X6IYvXaw=
+            </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>
+      
+MIIEJDCCAwwCAQAwDQYJKoZIhvcNAQEFBQAwgdcxLzAtBgNVBAoUJlVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRvIE1hcmFuaMOjby9VRk1BMTIwMAYDVQQLFClOw7pjbGVv
+IGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvL05USTEcMBoGCSqGSIb3DQEJ
+ARYNcmVkZXNAdWZtYS5icjETMBEGA1UEBxQKU8OjbyBMdcOtczESMBAGA1UECBQJ
+TWFyYW5ow6NvMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTcG9ydG9mcmFuY28udWZt
+YS5icjAeFw0xNDAzMTgxNTI5MTRaFw0xNzAzMTcxNTI5MTRaMIHXMS8wLQYDVQQK
+FCZVbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBNYXJhbmjDo28vVUZNQTEyMDAGA1UE
+CxQpTsO6Y2xlbyBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Ojby9OVEkxHDAa
+BgkqhkiG9w0BCQEWDXJlZGVzQHVmbWEuYnIxEzARBgNVBAcUClPDo28gTHXDrXMx
+EjAQBgNVBAgUCU1hcmFuaMOjbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3BvcnRv
+ZnJhbmNvLnVmbWEuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDn
++fvGMOGQgGgI1pferSixirhZIU56t7zGZuExYh7xj6SpoJJOAKi9ytBC0LXYC8Hj
+2ewc5oYSdqTkp1pIo56yZoeOqxyaXE7oW3qrOYoN+5lcqpzsYlDYvANXPoL4A0Pq
+j5neYufrWnhnDjwcx+Dvsf3eqpc7uMAhqOu0bxhxiUKs+o4VXGl9N72YHyGawRC5
+nEpfbX5kT8kwSxEjLqyevqbIlFVkIo1wFyHBOvy2zyHZTg3ZUPi2royE1EE6S7sW
+A16T+HWBCqVRrWvmW4tota0FAZ6rgyowUrmQabqF/CoRJcOA0BpbPsv2U4ZTV6wW
+c7EJ8R89ba0iyA3Se3tRAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJNLZTZn91Wx
+CfYam6xq2A9JnzfL60U3/gsu6tf8Oi6Wpgn1+AXA7Fp4vDKlJGXzxS/jmontDzv3
+P/y18eZOdKcfrUg6EygCFN42Sp7oBzqawCWhJuxoDdBxQXOgW09MLwmzigZ1mTLh
+SS7tAfEZcPLNxBnlu2gyyGTU/tc+RK3eM233qiYsgROUsV8PYaK9AUVYug7xTNms
+xtsGHLRz0ZKG891/D/g5DHMCUekGMfNmH+TmQJZx8eK7kRIVGK1oVj3CMRzHgZQw
+2xytvGMY5mdxYdj8MXhqLRuWXSzLwESsl8rxdYZ8jeUXUniYOqoCuB8IhYSVNgc4
+3Z5X6IYvXaw=
+                    
+            </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>Roscio Brito</md:SurName>
+    <md:EmailAddress>roscio.brito@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
new file mode 100644
index 00000000..7d86d02d
--- /dev/null
+++ b/swamid-interfederations-2.0/pp.webauth.soton.ac.uk-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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
+						dG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhsR/mkH2
+						pEjNzEduiMVW7wu/no0JAcOD/EcR9ahH61oTkQMgfgMen7daVq7inRLptsV/bI1m
+						WTF+Tzh49zxomLsHpf88yt8AbGMVy2oTWU69H4AN2b3L81h2psONA8AgHU/8ifUY
+						RKtAmXGPd4Po5fVqG8zrTys/QKYAZJF4uUaCNSsSE5s5YnbTQieq69N/Z9TjhgUx
+						W2hKmjKze2wPmyR2FVT/mqY8J8aLRL/VYXees210zs1F5V+PDVrfblrlrvy8vYG0
+						V7vktx+P8P12hwj+dDy2i6Re7R02W5WNrPq6Yu66Q7IkUCeFkclCIom6JEXz8XUP
+						7lSL3h2EhUOgXQIDAQABo3MwcTBQBgNVHREESTBHghZwcC53ZWJhdXRoLnNvdG9u
+						LmFjLnVrhi1odHRwczovL3BwLndlYmF1dGguc290b24uYWMudWsvaWRwL3NoaWJi
+						b2xldGgwHQYDVR0OBBYEFBTJEexZ7VRA9DX/eiB9OwNfBS5jMA0GCSqGSIb3DQEB
+						BQUAA4IBAQAw2wkGyB4qxKKCRDKddaje78ND2bkMl0mKWBMDujL7KIYIOZvbkCL1
+						9InkQvU+PIu6lIFUvfmx2AbccHWf/o2IKi83UOrvb/e3QocIqnOIA0fX6Ivsnr88
+						JfkdJfXNBh8ucc1N6joFNX2a8mR4ywv/QRAwHujF+AwsHz9AiBYJHV9YgbSKo326
+						6cCK0I5oyB3iimdExWcc+a074sggo5kujGJhxhnHbB6BNFGjkc5kG+KR9udWk06t
+						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>
+						MIIDRDCCAiygAwIBAgIVAKwAy5Y30bYosT2rmKq0Nj3qJE+DMA0GCSqGSIb3DQEB
+						BQUAMCExHzAdBgNVBAMTFnBwLndlYmF1dGguc290b24uYWMudWswHhcNMTEwNDA1
+						MTYxNTA5WhcNMzEwNDA1MTYxNTA5WjAhMR8wHQYDVQQDExZwcC53ZWJhdXRoLnNv
+						dG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhsR/mkH2
+						pEjNzEduiMVW7wu/no0JAcOD/EcR9ahH61oTkQMgfgMen7daVq7inRLptsV/bI1m
+						WTF+Tzh49zxomLsHpf88yt8AbGMVy2oTWU69H4AN2b3L81h2psONA8AgHU/8ifUY
+						RKtAmXGPd4Po5fVqG8zrTys/QKYAZJF4uUaCNSsSE5s5YnbTQieq69N/Z9TjhgUx
+						W2hKmjKze2wPmyR2FVT/mqY8J8aLRL/VYXees210zs1F5V+PDVrfblrlrvy8vYG0
+						V7vktx+P8P12hwj+dDy2i6Re7R02W5WNrPq6Yu66Q7IkUCeFkclCIom6JEXz8XUP
+						7lSL3h2EhUOgXQIDAQABo3MwcTBQBgNVHREESTBHghZwcC53ZWJhdXRoLnNvdG9u
+						LmFjLnVrhi1odHRwczovL3BwLndlYmF1dGguc290b24uYWMudWsvaWRwL3NoaWJi
+						b2xldGgwHQYDVR0OBBYEFBTJEexZ7VRA9DX/eiB9OwNfBS5jMA0GCSqGSIb3DQEB
+						BQUAA4IBAQAw2wkGyB4qxKKCRDKddaje78ND2bkMl0mKWBMDujL7KIYIOZvbkCL1
+						9InkQvU+PIu6lIFUvfmx2AbccHWf/o2IKi83UOrvb/e3QocIqnOIA0fX6Ivsnr88
+						JfkdJfXNBh8ucc1N6joFNX2a8mR4ywv/QRAwHujF+AwsHz9AiBYJHV9YgbSKo326
+						6cCK0I5oyB3iimdExWcc+a074sggo5kujGJhxhnHbB6BNFGjkc5kG+KR9udWk06t
+						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>
diff --git a/swamid-interfederations-2.0/ppms.eu-shibboleth.xml b/swamid-interfederations-2.0/ppms.eu-shibboleth.xml
new file mode 100644
index 00000000..e312be9c
--- /dev/null
+++ b/swamid-interfederations-2.0/ppms.eu-shibboleth.xml
@@ -0,0 +1,92 @@
+<?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>
+      <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>
+						MIIC8TCCAdmgAwIBAgIJAPz0WtwkZDRdMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+						BAMTDmV1MS1zdHJhdG9jb3JlMB4XDTEzMDIyMDAyMTc0M1oXDTIzMDIxODAyMTc0
+						M1owGTEXMBUGA1UEAxMOZXUxLXN0cmF0b2NvcmUwggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQDCYe74FvKADvVsBi9j+q8cpjOQBOu2IEbdgXBT+0UNiYFp
+						p9/gMt08fbGxcXDxzKBqZ9wvjnslhXgpFrZKbD3uY1I9sEiA1rqDYmplgMwZ4A8E
+						Ow+/qRqm5t4VQ0JOZzTYccgzelBQRyl5YMYqy0FauH5CEPMuQHFKSi3CO7LO4ucg
+						gIGZOEbjKl0BNhjKd8M6zQNsKk1KzYLxZ5YzU/1ETDs1J1cqIwqI/uq+dvfCVVeX
+						o+XrPad+t/8iwhmyTS5vio21kZK+biil/cOSwQaRhBTWclg3zHVVTtPap0ypZOeK
+						xiFrqWmmr9c1qOoaG6kFZtAFkCkepZb1ix+4eLzpAgMBAAGjPDA6MBkGA1UdEQQS
+						MBCCDmV1MS1zdHJhdG9jb3JlMB0GA1UdDgQWBBSEMJDeqFu+BPz5HcVjdtaJreHK
+						3zANBgkqhkiG9w0BAQUFAAOCAQEAWnElDes0a9Fx5nP926lMbNUIhblAqziZPyvl
+						nyi1vh5zCQepefZGgFNM+8Pbi5x0059jyAnA6rfmwxNvkOtEK/qSLBLOyDpqwVbM
+						xQwQb6KUn5P28wdbbetRw1sxsYjNGmEs8RcisPyx4vK/cZnlLvGk/6b96LiCTeLV
+						C/wvGbXTcUyrTEniOO/54sVWnioRNxFz3lsa918j8CCFJbd+aM3q3fm7LPfbYIWW
+						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>
diff --git a/swamid-interfederations-2.0/prd.thieme.de-shibboleth-sp.xml b/swamid-interfederations-2.0/prd.thieme.de-shibboleth-sp.xml
new file mode 100644
index 00000000..d2523c73
--- /dev/null
+++ b/swamid-interfederations-2.0/prd.thieme.de-shibboleth-sp.xml
@@ -0,0 +1,72 @@
+<?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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIICtDCCAZygAwIBAgIEUX/qATANBgkqhkiG9w0BAQUFADAcMRowGAYDVQQDExFw
+						cm9maWxlLnRoaWVtZS5kZTAeFw0xMzA0MzAxNTU3NTNaFw0xNjA0MjkxNTU3NTNa
+						MBwxGjAYBgNVBAMTEXByb2ZpbGUudGhpZW1lLmRlMIIBIjANBgkqhkiG9w0BAQEF
+						AAOCAQ8AMIIBCgKCAQEA04gpJrPW9OU6dyBVlNQgapngsHYAZc2m1ZbGohqA82Kw
+						wH2Q2hYvbIP3cHReCRkgj4rrehbrbR0smkFVrbk/lIv0/nEe191KNKYSf+2s29NO
+						SiLcGSXonAsapEH8jGx5y3rubPXQRobiz/6Wr9Xd9ojbRcaYpM+noiMYdjwGdFdV
+						UGk1R5MWa8cSc+RIfbPUOpVcGGEszDnQsiqKe+etUM01Bj8ya29uovxP2QPjt52i
+						Ilny/cTWzYkp0FkTRw8YNULgt021BavPSNQiVfF23fbN0t7CrprBGdWiqe7ski3s
+						RyVCxrd59enndAcxwG/rh2KJ8dSB/XBlcxn666xxhwIDAQABMA0GCSqGSIb3DQEB
+						BQUAA4IBAQC6BbU3qM+zYtG9gTvC5DjCU7loA9SPqP3cxvZdccZ+3Md8Op0cRVIM
+						WSyCwyNfNd6keQ3oFpMWwbebpUoyN5bs9TLzvLyVZ62eTxzMIbRa2ExZ05kZefpq
+						bK6qbEPkTGE8JMRTo7X44I/ymhKvAHPAdb8Y4nSj0i+td/Fwr/mPvreZ8/l22HCQ
+						Ngm9TpbnmenLhSckNt4gPRZNh9qffqWgT8g73pR5ZDcRKCkjUn0Z91ivcMggBhjF
+						fueU1fclrPqsuWG41V/1ffiLVsq8iok7N1hm0YIfI2Up81sAz+xqa2LntJQDPxso
+						iV7miXl0O9QZaSRSXuCmtnNbIcR4K9Mg
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIICtDCCAZygAwIBAgIEUX/qATANBgkqhkiG9w0BAQUFADAcMRowGAYDVQQDExFw
+						cm9maWxlLnRoaWVtZS5kZTAeFw0xMzA0MzAxNTU3NTNaFw0xNjA0MjkxNTU3NTNa
+						MBwxGjAYBgNVBAMTEXByb2ZpbGUudGhpZW1lLmRlMIIBIjANBgkqhkiG9w0BAQEF
+						AAOCAQ8AMIIBCgKCAQEA04gpJrPW9OU6dyBVlNQgapngsHYAZc2m1ZbGohqA82Kw
+						wH2Q2hYvbIP3cHReCRkgj4rrehbrbR0smkFVrbk/lIv0/nEe191KNKYSf+2s29NO
+						SiLcGSXonAsapEH8jGx5y3rubPXQRobiz/6Wr9Xd9ojbRcaYpM+noiMYdjwGdFdV
+						UGk1R5MWa8cSc+RIfbPUOpVcGGEszDnQsiqKe+etUM01Bj8ya29uovxP2QPjt52i
+						Ilny/cTWzYkp0FkTRw8YNULgt021BavPSNQiVfF23fbN0t7CrprBGdWiqe7ski3s
+						RyVCxrd59enndAcxwG/rh2KJ8dSB/XBlcxn666xxhwIDAQABMA0GCSqGSIb3DQEB
+						BQUAA4IBAQC6BbU3qM+zYtG9gTvC5DjCU7loA9SPqP3cxvZdccZ+3Md8Op0cRVIM
+						WSyCwyNfNd6keQ3oFpMWwbebpUoyN5bs9TLzvLyVZ62eTxzMIbRa2ExZ05kZefpq
+						bK6qbEPkTGE8JMRTo7X44I/ymhKvAHPAdb8Y4nSj0i+td/Fwr/mPvreZ8/l22HCQ
+						Ngm9TpbnmenLhSckNt4gPRZNh9qffqWgT8g73pR5ZDcRKCkjUn0Z91ivcMggBhjF
+						fueU1fclrPqsuWG41V/1ffiLVsq8iok7N1hm0YIfI2Up81sAz+xqa2LntJQDPxso
+						iV7miXl0O9QZaSRSXuCmtnNbIcR4K9Mg
+					</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>
diff --git a/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml b/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml
new file mode 100644
index 00000000..5de87c80
--- /dev/null
+++ b/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+  </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: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>
+					      MIIDPjCCAiagAwIBAgIJAL5YcwA5sxaHMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGGRldi1yZHYudmlzaW8ucmVuYXRlci5mcjAeFw0xNTAyMjAxMjA5MDVaFw0y
+NTAyMTcxMjA5MDVaMCMxITAfBgNVBAMTGGRldi1yZHYudmlzaW8ucmVuYXRlci5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMvHnK+FZY7ulG3K9SdL
+k2H/HGG19IVFZE5nrrkg5StqoqjvQyaNHxTTQ7Q85H9w4bQ9woSPVHux/3NWveqt
+qzmMJ4MrYW1yLGdvg3zCsyg9BC2w6svY7sFcm2VBp5HZeoDXEZCc7gZrjSz0zpUw
+MLfB/t5FY3XJjUrH7RtMaqGj6W7eoa0WilXhlM5yCs7Y0XFVf30Ti/zjcX+jvkFg
+hGvo3oRGP+XSMZ5Kyi0HY1g4RYfNYfvhn7RH4LbO+DxflBvIPa0yysy4Vi/h4w4l
+tXuEyTC+JzrSXrlsReyWAyEEuZ+CyIfj9qGq/hFwnlU1nNANPkODc0UuksV4ls3v
+qJcCAwEAAaN1MHMwUgYDVR0RBEswSYIYZGV2LXJkdi52aXNpby5yZW5hdGVyLmZy
+hi1odHRwczovL3ByZXByb2QtbWVldGluZy5yZW5hdGVyLmZyL3NoaWJib2xldGgw
+HQYDVR0OBBYEFGdnP1ZS9MVZFLUfMsR5Hc1I0BZkMA0GCSqGSIb3DQEBBQUAA4IB
+AQChY+X9G6w3GwiVlazXx1JCW4dbdvTp78dSMUwB9r2Yy0Tn4i5jZIZmcLSjZMCe
+hhbmiZCge1H7mn6C27jMyMsoKy1U66aaJP9/gSUQSnxXZJ4oAsvw/PeEoT9X1vVa
+qXimugP1OJ411nT+PugizY54txS/AR5S5Z/Su8hfeN4AGq89p8o8s7Sb1XrrfXhm
+Mfmz5jy2D56c4c6yFAsFGE7GK3x6/8JhDvUqG3iox4Zmkl7JWas1B9Y7/ShBOJvE
+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>
+					      MIIDPjCCAiagAwIBAgIJAL5YcwA5sxaHMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGGRldi1yZHYudmlzaW8ucmVuYXRlci5mcjAeFw0xNTAyMjAxMjA5MDVaFw0y
+NTAyMTcxMjA5MDVaMCMxITAfBgNVBAMTGGRldi1yZHYudmlzaW8ucmVuYXRlci5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMvHnK+FZY7ulG3K9SdL
+k2H/HGG19IVFZE5nrrkg5StqoqjvQyaNHxTTQ7Q85H9w4bQ9woSPVHux/3NWveqt
+qzmMJ4MrYW1yLGdvg3zCsyg9BC2w6svY7sFcm2VBp5HZeoDXEZCc7gZrjSz0zpUw
+MLfB/t5FY3XJjUrH7RtMaqGj6W7eoa0WilXhlM5yCs7Y0XFVf30Ti/zjcX+jvkFg
+hGvo3oRGP+XSMZ5Kyi0HY1g4RYfNYfvhn7RH4LbO+DxflBvIPa0yysy4Vi/h4w4l
+tXuEyTC+JzrSXrlsReyWAyEEuZ+CyIfj9qGq/hFwnlU1nNANPkODc0UuksV4ls3v
+qJcCAwEAAaN1MHMwUgYDVR0RBEswSYIYZGV2LXJkdi52aXNpby5yZW5hdGVyLmZy
+hi1odHRwczovL3ByZXByb2QtbWVldGluZy5yZW5hdGVyLmZyL3NoaWJib2xldGgw
+HQYDVR0OBBYEFGdnP1ZS9MVZFLUfMsR5Hc1I0BZkMA0GCSqGSIb3DQEBBQUAA4IB
+AQChY+X9G6w3GwiVlazXx1JCW4dbdvTp78dSMUwB9r2Yy0Tn4i5jZIZmcLSjZMCe
+hhbmiZCge1H7mn6C27jMyMsoKy1U66aaJP9/gSUQSnxXZJ4oAsvw/PeEoT9X1vVa
+qXimugP1OJ411nT+PugizY54txS/AR5S5Z/Su8hfeN4AGq89p8o8s7Sb1XrrfXhm
+Mfmz5jy2D56c4c6yFAsFGE7GK3x6/8JhDvUqG3iox4Zmkl7JWas1B9Y7/ShBOJvE
+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="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" 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="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="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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RENATER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Médard Sébastien</md:SurName>
+    <md:EmailAddress>sebastien.medard@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
new file mode 100644
index 00000000..969ea509
--- /dev/null
+++ b/swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml
@@ -0,0 +1,51 @@
+<?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>
+						MIIDKDCCAhCgAwIBAgIJAIDfY9h2oTCVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE3ByZXNzLmVuZG9jcmluZS5vcmcwHhcNMTMxMjExMDUzOTQ2WhcNMjMxMjA5
+						MDUzOTQ2WjAeMRwwGgYDVQQDExNwcmVzcy5lbmRvY3JpbmUub3JnMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw2Hn+r9tAA0W/oAXm9ShLD2wvy+YKkeV
+						yrmUJbzdU8DeJ0mQ0SS6/Y3yKZEAT6vsh4j4xso51qtly0HHh459F8y8n3vd829B
+						vhxRwdE5PMZixPbWyltRPbx3XogpswBust9PXIWW4Unmo37NZhxrZQrt7GHvVvIX
+						kuUAEoTkLkSurvgkLuUrPs/wm179D50kbx4E50Uz7nvJYVyEWqHdf3TGaD8gMM1E
+						6DR2w0j4pKHBAjkLDy9mHGV6c91qFVNnWrhACmX35JjBiCvc1+JTVRpapM1/JgzP
+						HNTCJogvQNn5SDU3cZsZV0T1Bu23Pb8MlXoZPmWJy2djNPzw1JtO6QIDAQABo2kw
+						ZzBGBgNVHREEPzA9ghNwcmVzcy5lbmRvY3JpbmUub3JnhiZodHRwczovL3ByZXNz
+						LmVuZG9jcmluZS5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUG3/mbZR4LTuD9+bU
+						dU0k7Li0WNkwDQYJKoZIhvcNAQEFBQADggEBAC4Sz/Os31gGbtIPklQ8SJHBs0ji
+						MgbcKx15S3OkM06S75oDVI2qIrWXnAuWidexconSD35izsAscXlGI4EJgOflRJIB
+						1kD9LOsHiz9kqUS2q7MNxWVloiQzxYCX14HGwPMtmKVTeTg5Vjo2BAuCRAhdxdFH
+						seE5nYMbC4i31u1taTsM1Ydifr3UzmWTI5AZ884SYR9TfPh07rcW5m26Pmr3LLOa
+						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:1.0:profiles:artifact-01" Location="https://press.endocrine.org/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://press.endocrine.org/action/samlACS" 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
new file mode 100644
index 00000000..49947a2f
--- /dev/null
+++ b/swamid-interfederations-2.0/primo.abdn.ac.uk-shib.xml
@@ -0,0 +1,62 @@
+<?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>
+      <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>
+						MIIC1jCCAb6gAwIBAgIJAMK+qzxsAVY1MA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
+						BAMTBXByaW1vMB4XDTExMDcxMjExMTY0MloXDTIxMDcwOTExMTY0MlowEDEOMAwG
+						A1UEAxMFcHJpbW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfZEZ7
+						3ADkE4F3laV8ke0QGpgfucFdPwG0lOTLi4MKafPLILMNDqluOcTXxFuS5yUsBuPW
+						O4tZ7bph8eV4CbTtbiibrUmjJBO+ilEq5yfNzhvvo89jNgY9A9SunBVKWO1FP9qY
+						Z9cNgFN6PYesvXEvZR34hioeuVWVhE1Y/xVcUFIROHTkQnSHK7rtotCQqa/9HoDV
+						6kajTr9j2B1jAMGgT8DEwA+xSVjsFNYdyCR/eehpd4DDvMEH4ohRO+sv2mMEQN5V
+						42nI3Ry9T+ruhDafQwuYENxbgSvPWeemIIRfbBS9x08BKpcd5URH+B3CXOh8NZdR
+						T9tgvlBacHrI76cjAgMBAAGjMzAxMBAGA1UdEQQJMAeCBXByaW1vMB0GA1UdDgQW
+						BBSLotg/CQq8b92d1niWksO6U2D+XzANBgkqhkiG9w0BAQUFAAOCAQEARyX+nTKW
+						HTzqsYGh1z9iznrcFQt6lJKEeuXbtb/L7WFCo3Fbd3s7nhg0Ejeuu2w9c1qV9OeV
+						LihlrjrSd9kBDjRX5JcugGZIhqU/8VGldl0dtMJElkgp5rk8avXuReDl7kCASy5E
+						aleRz39Q9X/S2nLHvoHWscNqE87goeIUjz0w+YKA225anc3bm2pRGTyUJbBHiUhS
+						jn/3FReyjv9Dt5ub2TcmU14Fy+gT7WbL5z+JC2wNWtURDjVnHKcFaYA7YLNdvS2q
+						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>
diff --git a/swamid-interfederations-2.0/primotest.abdn.ac.uk-shib.xml b/swamid-interfederations-2.0/primotest.abdn.ac.uk-shib.xml
new file mode 100644
index 00000000..6b93e460
--- /dev/null
+++ b/swamid-interfederations-2.0/primotest.abdn.ac.uk-shib.xml
@@ -0,0 +1,63 @@
+<?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>
+      <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>
+						MIIDAzCCAeugAwIBAgIJANJZVmK8+XpGMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFHByaW1vdGVzdC5hYmRuLmFjLnVrMB4XDTExMDcxMzA3NTEzNloXDTIxMDcx
+						MDA3NTEzNlowHzEdMBsGA1UEAxMUcHJpbW90ZXN0LmFiZG4uYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD5eVGCkyjaiKuouemgreU03zdLqREO
+						Vwxuwzd/eUQ1wymVUOjlxofXiT2zbsn0U++WUmD0MgR4DMs2ZFxfSBWJDuVHk7DW
+						bnpkC2U1ookX8Um63uYnmx6MF7BaM9MOyYAEYKMlZNMOX28zbaSOVuGAc1Q9yFkL
+						U2WN6pZKIXQC5gSYo4Y3YwQqAqiK6ShU3NQrZPdHX0kgfpVCEyODA3fTCxczCTss
+						d5xvMq/Y6HhrAOOCNm7l8hPsIwnRyIqio3PdfDCUPBZ48fHQCEWazaUtLEYwu9NL
+						YFQmGQIe9qv6dJ/wd/M+XbDhZ8k/9Lh6kuOrzEqcD3LEHYu9hyF/vz3bAgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFHByaW1vdGVzdC5hYmRuLmFjLnVrMB0GA1UdDgQWBBSL
+						h1KihDFxRIVjQQ4CxS58qfCXZjANBgkqhkiG9w0BAQUFAAOCAQEAlysZy/rmOO6c
+						FwbLDhIDKqdqCMm9Dq8jBZTwxd4z2AwOienEaMp0tmWc2fMSLYu+UQhEb36dDjOi
+						LbAsMsI1TcZIc6WERZ8BdpP9LG6v1NvyfOmDaw8oBT9UJyOPleeXtv/4OqrOdbAk
+						RpHvoxq6fmeJpbQeEZqbRszVqCO/yTjJlx/eSIS92NHk8Y0so14/Not8QWFRCVxH
+						Nta2tgU0F6QZ4efIfZjyquoIZcDzEZJJdp/6HTmtkffnGCYDBICrm7p7AZXHLwWS
+						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>
diff --git a/swamid-interfederations-2.0/print.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/print.new.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..f5aa8fdb
--- /dev/null
+++ b/swamid-interfederations-2.0/print.new.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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://print.new.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="2013-09-20T14:13: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://print.new.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>
+						MIIC/TCCAeWgAwIBAgIJALkFh47QbpfXMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnByaW50Lm5ldy5veC5hYy51azAeFw0xMzA5MTkxMDI5MzNaFw0yMzA5MTcx
+						MDI5MzNaMB0xGzAZBgNVBAMTEnByaW50Lm5ldy5veC5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBANPIKlurQiFli0Hnv0m5ABmNWlKx/lyPaFvx
+						x0Q/WZekfTwsY+rOlrEAxzqrsIxFovJVjC08ZXlJAbVhEBQF7wyMdUKGqWx7sZw2
+						FdejixKcMWoVbNLHKVXyqyvLkvrFwPnHtugz4vYyAAPb9OCLuvxXyMPKaY7lOjJ3
+						eSbeTN5PGY+6mLKnUlqeYVz2t1JIKgBJDU/N4AslwEwpb+LcmwYtktphGnV2bq7+
+						1yevEbRdBoALjE9wMmSP2hptG8ULhIA4xHy/EzzBBz3GQbAG/cGlthXQ34yTOFk6
+						cth/nq/3dTHHA+7hGnDn9PlMGa33BrldC1+0SjGJnOhIsUhEm2UCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIIScHJpbnQubmV3Lm94LmFjLnVrMB0GA1UdDgQWBBRl12Aof4tQ
+						GJLhta22gjeyyN3jaTANBgkqhkiG9w0BAQUFAAOCAQEAql1ag5DE6IPslp7ECr0m
+						7RVAUphXsGCKZeQBT4506oixZJkCINmwaElEArQqqoti5xURzP9KSqVOQE4mPH6i
+						Z94XKj6JENbFTqagUu+65ZA36NkBpYaMNOts1Fzo/Sy28EDSlPnixmkfxmAgzfNk
+						mhR1Me4KBDpOWuIsvWcNrZhbyAoRSSO3/C8iARyPx1lOlmEKUV8M81KRSeKqL4xR
+						p08yeSnz0XrdHuuJNFUqliMTnBlTkrm0svViEkM5VcKnalM6kSWqlTY0MZMP3TtP
+						fKkA3j1NfGZ2BkxqPMYQINetFuqX8bhCEVYwwQxYfCw9LXHLmYYRbR0Gmrgy3w8e
+						dg==
+					</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://print.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://print.new.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://print.new.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://print.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://print.new.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 New College Printing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Dore</md:SurName>
+    <md:EmailAddress>mailto:it-support@new.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Dore</md:SurName>
+    <md:EmailAddress>mailto:it-support@new.ox.ac.uk</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
new file mode 100644
index 00000000..9a7377b5
--- /dev/null
+++ b/swamid-interfederations-2.0/projecteuclid.org-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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>
+						MIIDNjCCAh6gAwIBAgIJANq1a2ZDBykIMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
+						BAMTJXNmLWxpYi1hcHAtMDA4LnNlcnZlcmZhcm0uY29ybmVsbC5lZHUwHhcNMTMw
+						NTMxMTUwNjIyWhcNMjMwNTI5MTUwNjIyWjAwMS4wLAYDVQQDEyVzZi1saWItYXBw
+						LTAwOC5zZXJ2ZXJmYXJtLmNvcm5lbGwuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAs3Hxfw7oGscg+A30MSnTHdbuukajMhIlCtrm+bfsayPDApUE
+						QLxW643U876lLNxMA5wmU0NV07gjj87yqv7ECGPLq95tIoTcTzI0MXLr8s3GTzwT
+						M9N0LEWdp37CRH2kgvYA3Cf5Oba8FxpEDHgc6rzAc2LccucdpWvi8Zon9OLZuEsH
+						qAjQlfIeuSB7YIe6z2/7VbZM9CcAb80cwYButlqMdIOcS7jBqofGq9YvovXJr7F0
+						vEXJtiL7fW28Lmv2SHdS2mL/34ud2fj5CEDaXAzKWCiDR0L7a1qYNW7upxD+w6no
+						rDAYfWrO8E6mcXv1d8P1JKLzsaZKopsuHE3BtQIDAQABo1MwUTAwBgNVHREEKTAn
+						giVzZi1saWItYXBwLTAwOC5zZXJ2ZXJmYXJtLmNvcm5lbGwuZWR1MB0GA1UdDgQW
+						BBSu8boXmoNWqSqD0y4uSmiE8p1EHzANBgkqhkiG9w0BAQUFAAOCAQEAQXOGXl4Y
+						fTXnrJQuD1xaOmLgUkLpN4eq89OisGTsdefpvAJ1SD6QSaIj1UFchfQ6Qb4vK2Fp
+						E1Ss6sZNU0rCE/C1EpQplAkQve8+IhQdIOQM7B/Yp4lHWd+3snJLF+fmIczVu9DB
+						odqQ2YbmpxPDBzZMRAIppajebSXLz2r65Uj8+cB28v4WhCt7v/T3M8w4h591pePO
+						xW2fpyIqGsGpuVRd2EOkYGmm7nqrAH9WGyUsRT1YHFY25mjgExVPYpah7eTsNYql
+						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">
+				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>
diff --git a/swamid-interfederations-2.0/pubs.acs.org-shibboleth.xml b/swamid-interfederations-2.0/pubs.acs.org-shibboleth.xml
new file mode 100644
index 00000000..00a7b8c3
--- /dev/null
+++ b/swamid-interfederations-2.0/pubs.acs.org-shibboleth.xml
@@ -0,0 +1,57 @@
+<?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">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDDCCAfSgAwIBAgIJAOzcasgcJSa4MA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+						BAMTDHB1YnMuYWNzLm9yZzAeFw0xMzExMTkxODU1MDNaFw0yMzExMTcxODU1MDNa
+						MBcxFTATBgNVBAMTDHB1YnMuYWNzLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALImSxorZmmzwmreQuS1BVGZkMj73sgCMICQzTYANKHnh+ePY3gC
+						z01Y+hT/hEy7cugwJm5UXynMhIsFo5N8gnhyouCbvZ0Lxh9gwk9bUAGfiz2jqSJH
+						xx8Q3HTpPR8HkIa7UmHzlDIpkqAD9snW7V4YomQE3j+4rW/svlla3H14g6o0XuX4
+						FL+1oufOmOfVfTKjzMfIiFfR6B5Dy4wJwFanPg6J/hF7/FZDX2sgS8x9KsKrLeVY
+						OfduVu5zABA77RDKTI6aNecePKTVndzLrSn5pTEtTPckRYuoD9SMR3SZCS79ldhz
+						oG0qTMfgCuGY2emKb4XoOb/ZWhZ7iYlS9Q0CAwEAAaNbMFkwOAYDVR0RBDEwL4IM
+						cHVicy5hY3Mub3Jnhh9odHRwczovL3B1YnMuYWNzLm9yZy9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBTbqI9nN5yxvTDNHBMS8b0QZJ6JXTANBgkqhkiG9w0BAQUFAAOCAQEA
+						X69dLDGafkljVuMCEGPLKvPkHIlmKjhKAH4dN02XQ8RKIYURa5wPnmL/yEp9Zncy
+						cALR9HvfFwYFx+g+8RIU6S9kOUFz0n5vKLmjOXX/8TSVKTrV0z/tq3/rXK0A7ERI
+						3F27TMEqazUTvLu3qsdcTC9geQBrwikJfEdtOzzHAtCUiAxW5UakfvjUnoZ9o+iO
+						ydnNa/tXKePgutQedylFePevjWY720k48YGfPjGK13nrYLrF52k7QjvSkj7Y18x/
+						8GUzvq+yCgYrddBczbR8g2OcC0/xDKm3vE+T6oJkpKHJFMUW26mgOMR3bgtm2Tey
+						ZOvs4J+UrDF71xNxlC9wTQ==
+					</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://pubs.acs.org/action/samlACS" index="0"/>
+  </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>Michael</md:GivenName>
+    <md:SurName>Norton</md:SurName>
+    <md:EmailAddress>mailto:M_norton@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
new file mode 100644
index 00000000..90b927b3
--- /dev/null
+++ b/swamid-interfederations-2.0/pubs.aeaweb.org-shibboleth.xml
@@ -0,0 +1,51 @@
+<?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>
+						MIIDGDCCAgCgAwIBAgIJAKoOWJDw6RetMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+						BAMTD3B1YnMuYWVhd2ViLm9yZzAeFw0xMzEyMTIwMTI3NDRaFw0yMzEyMTAwMTI3
+						NDRaMBoxGDAWBgNVBAMTD3B1YnMuYWVhd2ViLm9yZzCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBALhJgZeh9u4wYjh6peTaimer1DET8rqQSpXrOzF4O8Fx
+						XbNq98Fl+jcptXhLqBFB92SludwbeI0WEV935EPXZ778ujoum5BeomZa5ovc6CpL
+						B+1ETN3oDS30R/vMQuF5WT7mSd8vXNZdXcvlPbNjO59Xctib/BzaVVjzkkc5SWVO
+						rz5q/0JVCOata4vzqv1oSJ0O6rNl7icY5zkeZq9x8tFmZZSgayPIw1aTWjf92EE2
+						xJl8G34vhK+1Lcn641Aih7lyXGiRS+GvcgSqVUaicWjJ3yDhaaiwQVFP09mC4eTr
+						jRR7BYAk1PzR+ScsSSmI4AXQp3wi0S/Yc0tYIDQxoFECAwEAAaNhMF8wPgYDVR0R
+						BDcwNYIPcHVicy5hZWF3ZWIub3JnhiJodHRwczovL3B1YnMuYWVhd2ViLm9yZy9z
+						aGliYm9sZXRoMB0GA1UdDgQWBBSMePkpVX6JEvtEmetRdkNOgvAt/zANBgkqhkiG
+						9w0BAQUFAAOCAQEAfVr2rxL8fNCBjE981MAhaSCPznvdN5v7vFSUMSQTDB+X8WoL
+						B45kfM/nRSJjzdZVmDlUOdTJed+dNZIbHGCOHS/keALrgeL1HTPNtP/4mqgvJ+0G
+						BKFoKN0CQ6sLZkXBrQ1v6AfLeGU+W0UPD9rfjjRCYu805v3II7TdN3evfnbtLmjS
+						pnNdZgNqGVODh7jJgoM3dVPNXnKjGq60l7Fbxa0hjUTA9XaNZg4BeTvFQN7qi5M9
+						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:1.0:profiles:artifact-01" Location="https://pubs.aeaweb.or/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubs.aeaweb.org/action/samlACS" 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
new file mode 100644
index 00000000..d575dbb6
--- /dev/null
+++ b/swamid-interfederations-2.0/pubs.ama-assn.org-shibboleth.xml
@@ -0,0 +1,80 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pubs.amstat.org-shibboleth.xml b/swamid-interfederations-2.0/pubs.amstat.org-shibboleth.xml
new file mode 100644
index 00000000..e109cdb6
--- /dev/null
+++ b/swamid-interfederations-2.0/pubs.amstat.org-shibboleth.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pubs.amstat.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>
+						MIIDozCCAougAwIBAgIJAIL6QS5OyVe1MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEYMBYGA1UEAxMPcHVicy5hbXN0YXQub3JnMB4XDTEw
+						MTEyOTIzNTY0OVoXDTIwMTEyNjIzNTY0OVowgZAxCzAJBgNVBAYTAlVTMRMwEQYD
+						VQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEdMBsGA1UEChMU
+						QXR5cG9uIFN5c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBTeXN0ZW1zLCBJ
+						bmMuMRgwFgYDVQQDEw9wdWJzLmFtc3RhdC5vcmcwggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQDMMabeVNJUDKULVnS/2AzzJ1ChraJlmgKe0uhBaFcdN8N/
+						Qlr8kJTFCy545+5NIO7GcJjK2NSH6fxw2w50Tg6ixjF+88z5mX48HNkdWOy/i29h
+						zEwQoQc9B8EQerzyXWXKxB5BPBbV69/XOPhMKutclFEIwJdE1z1ry3uiLXbH85ei
+						0RntcR8h4lacdS5j9hjpIGya3FUCuvdXq2ub/LWAFsmOm+oKO1PWFxFouBDJwNUL
+						nHgWtbyFiF5oQV+x2AI556D1leNh+qbDCtjBDC8/RYivsaY5Wj6tHryJlOfY3MOS
+						HSJUuhsqzyT2Mpefh4fDymQiqQvYI9tUBM8BOKzfAgMBAAEwDQYJKoZIhvcNAQEF
+						BQADggEBAAgs9qFfV/MRlrrvqXiGs7AlYbmzDbqdvednE96oL9u3+4kkDjAMVHhn
+						MJzVxH4EzHFn7jw6UoC8+mLLOfCUrqFg4aInLNZLM5UmAQ/UQ8G5CmplN5+Z9xxN
+						bf8A2OyGssC3B6pKy1LVSdJPjAP+4JU1DNU5MKPdy41NCvD0EHeysFP7PiK3E4gn
+						nNrcBY+bVdYszYhGpa+yX2R1V1PYCyfw9MBNGCGjOPkgS7iPHp4Gqr2vaBpYdUeh
+						shtK6jJLDGGZn48eRlKtdi7Ff6SfZA3dQ6PsXTiyETDSkkvCc1J1EQ6CCJ7121pK
+						7hEpM9XB8Ed60foFC25ZEBphVHMP/4s=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pubs.amstat.org/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pubs.amstat.org/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubs.amstat.org/action/samlACS" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atypon Systems: American Statistical Association</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.amstat.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.rsna.org-shibboleth.xml b/swamid-interfederations-2.0/pubs.rsna.org-shibboleth.xml
new file mode 100644
index 00000000..21c8236b
--- /dev/null
+++ b/swamid-interfederations-2.0/pubs.rsna.org-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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>
+						MIIDEDCCAfigAwIBAgIJAJzgAWzkM8T0MA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXB1YnMucnNuYS5vcmcwHhcNMTMxMDA3MjA0NzI1WhcNMjMxMDA1MjA0NzI1
+						WjAYMRYwFAYDVQQDEw1wdWJzLnJzbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAqRPhvibBGQpooUm65mN4690Qia2tM6BbQnYd/7y9HRKQe1Kk
+						hmUlNF4+ZjeEmxFvmawnGLTA/eN2oYdQXANiSjrGgmQRIUr1fcPK5xoeyyNULdic
+						iLZejtSlvXzY4dgz/DX2hMlH4Q+w6A4c1UBD8qKHDgE4ss+bN+noT4ObEua8n/Tb
+						J290MYG3/kwRyfx6Wnsm8J3kKnRwyiTMxMchimxpd1IXDE/Dt8M45TKzEQwzqlux
+						l1qz9v71h9zk5nkBKmhJ4b1BTIdECQ2Ah56jOQ/9Cuxbv0AKltJM7bLEB8qTsV/Q
+						29xm/rVVt5rQbWk1Imam0403xgmMyvGEyR/7UQIDAQABo10wWzA6BgNVHREEMzAx
+						gg1wdWJzLnJzbmEub3JnhiBodHRwczovL3B1YnMucnNuYS5vcmcvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQU0JkMEFSeGhSejeQCBo6K11ftUFEwDQYJKoZIhvcNAQEFBQAD
+						ggEBADP2WaN5mVSM3Zv9UqUPG2bO7XTXPnhtvHIgAa4hSobLixQP98Ml7sXVlqnL
+						P31IWgToTjtXTjpTNYE7vsCsKRVP9uvVOziS2A5EBtoKWrQLbOCrwTBl0IzFLn8s
+						iJfNHHNUdwDxOhJYCC0cwS22b3t0Rfv9LjQ82TRO0FvIc82gJMzlnPogQyrWOTjR
+						IhAm74GLoDngxl3tXhPN8jSSx82EAYJJpITK4Fffule8pHHZFSwOXTB73RfDBu2L
+						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>
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
new file mode 100644
index 00000000..561761f3
--- /dev/null
+++ b/swamid-interfederations-2.0/pymca-wg-gw01.sso.picturemaxx.com-shibboleth-sp.xml
@@ -0,0 +1,109 @@
+<?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>
+      <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>
+						MIIEszCCA5ugAwIBAgIDByqUMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
+						MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
+						HhcNMTIwNjI4MjIzNjIzWhcNMTQwODMxMDM1NDExWjCBxDEpMCcGA1UEBRMgSk8z
+						cmM4bmcwZS04QW8yZEU0V0tnTW9yZDhDWjVVbnUxEzARBgNVBAsTCkdUNjYzMDAx
+						NDYxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
+						KGMpMTIxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
+						U1NMKFIpMR4wHAYDVQQDDBUqLnNzby5waWN0dXJlbWF4eC5jb20wggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaEVjXASuIZBhwoM8n9T5i/102ypwRzTRA
+						wTv7UWx2ja1W3EKVyU0Z5Jj/iVZ+5bSXjJj06OIqjB0i4wsKYqFjIx7Wn22EsOUq
+						4kHr1wD1YNMxt2Ol6weE00h7KMyygDv4jZluYskfGJqx2QKs1TNNKlhQ4e+p1277
+						xnzRrRzd4cs6fXctINxFYugxxkedRHRJhqVyiphnuwIFxK9m04zSLhZOtJuybI5y
+						mvAUCQjdU+ps6Sf618jP9LsivfpET3yVhbkapQLkgxB//BJmCunYyTfmdnW1890o
+						pFtpvB6UsUOTQQ0Jj1zNKD9BwYFetSL3yWxbW2aKirAAxE4VTgnTAgMBAAGjggEz
+						MIIBLzAfBgNVHSMEGDAWgBRraT1qGEJK3Y8CZTn9NSSGeJEWMDAOBgNVHQ8BAf8E
+						BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCAGA1UdEQQZMBeC
+						FSouc3NvLnBpY3R1cmVtYXh4LmNvbTBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8v
+						cmFwaWRzc2wtY3JsLmdlb3RydXN0LmNvbS9jcmxzL3JhcGlkc3NsLmNybDAdBgNV
+						HQ4EFgQUiPqxey8W2LkPp0cqZhEBGOa7J5IwDAYDVR0TAQH/BAIwADBJBggrBgEF
+						BQcBAQQ9MDswOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1haWEuZ2VvdHJ1
+						c3QuY29tL3JhcGlkc3NsLmNydDANBgkqhkiG9w0BAQUFAAOCAQEACCUxI/EBYHlX
+						w158lYdvKKJsSwAUuUH3QIJskViLUjFmvY26aMk26Tni45pMV+2QwZ2Iwi3I6xJo
+						uoE7GikGThGpOYsxb5gCSR/bb+Fs2lD+2gcvPIFINZFO+zqs2uaxvJxZJ3NKTOhg
+						9dOoaTOjMQiUrmkFoNwHHHgkej/fNfaU5rSpYBcd7AhG4aNhKPMiplLvq7sbXuXa
+						ZcPCNSMoOVlUc+s8JOa8ukbBUx1yIxEShNdfO+X/DqA6Mbz9ZPmOhUVvjS+qEZ/u
+						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>
+						MIIEszCCA5ugAwIBAgIDByqUMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
+						MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
+						HhcNMTIwNjI4MjIzNjIzWhcNMTQwODMxMDM1NDExWjCBxDEpMCcGA1UEBRMgSk8z
+						cmM4bmcwZS04QW8yZEU0V0tnTW9yZDhDWjVVbnUxEzARBgNVBAsTCkdUNjYzMDAx
+						NDYxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
+						KGMpMTIxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
+						U1NMKFIpMR4wHAYDVQQDDBUqLnNzby5waWN0dXJlbWF4eC5jb20wggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaEVjXASuIZBhwoM8n9T5i/102ypwRzTRA
+						wTv7UWx2ja1W3EKVyU0Z5Jj/iVZ+5bSXjJj06OIqjB0i4wsKYqFjIx7Wn22EsOUq
+						4kHr1wD1YNMxt2Ol6weE00h7KMyygDv4jZluYskfGJqx2QKs1TNNKlhQ4e+p1277
+						xnzRrRzd4cs6fXctINxFYugxxkedRHRJhqVyiphnuwIFxK9m04zSLhZOtJuybI5y
+						mvAUCQjdU+ps6Sf618jP9LsivfpET3yVhbkapQLkgxB//BJmCunYyTfmdnW1890o
+						pFtpvB6UsUOTQQ0Jj1zNKD9BwYFetSL3yWxbW2aKirAAxE4VTgnTAgMBAAGjggEz
+						MIIBLzAfBgNVHSMEGDAWgBRraT1qGEJK3Y8CZTn9NSSGeJEWMDAOBgNVHQ8BAf8E
+						BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCAGA1UdEQQZMBeC
+						FSouc3NvLnBpY3R1cmVtYXh4LmNvbTBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8v
+						cmFwaWRzc2wtY3JsLmdlb3RydXN0LmNvbS9jcmxzL3JhcGlkc3NsLmNybDAdBgNV
+						HQ4EFgQUiPqxey8W2LkPp0cqZhEBGOa7J5IwDAYDVR0TAQH/BAIwADBJBggrBgEF
+						BQcBAQQ9MDswOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1haWEuZ2VvdHJ1
+						c3QuY29tL3JhcGlkc3NsLmNydDANBgkqhkiG9w0BAQUFAAOCAQEACCUxI/EBYHlX
+						w158lYdvKKJsSwAUuUH3QIJskViLUjFmvY26aMk26Tni45pMV+2QwZ2Iwi3I6xJo
+						uoE7GikGThGpOYsxb5gCSR/bb+Fs2lD+2gcvPIFINZFO+zqs2uaxvJxZJ3NKTOhg
+						9dOoaTOjMQiUrmkFoNwHHHgkej/fNfaU5rSpYBcd7AhG4aNhKPMiplLvq7sbXuXa
+						ZcPCNSMoOVlUc+s8JOa8ukbBUx1yIxEShNdfO+X/DqA6Mbz9ZPmOhUVvjS+qEZ/u
+						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>
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
new file mode 100644
index 00000000..eb7a3eab
--- /dev/null
+++ b/swamid-interfederations-2.0/qa-sso.knewknovel.com-entry-uk_federation-Metadata.xml
@@ -0,0 +1,67 @@
+<?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>
+      <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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDyDCCArCgAwIBAgIJAJCNhx+kTAXdMA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNV
+						BAYTAlVTMQswCQYDVQQIEwJOWTEMMAoGA1UEBxMDTllDMRswGQYDVQQKExJLbm92
+						ZWwgQ29ycG9yYXRpb24xHjAcBgNVBAMTFXFhLXNzby5rbmV3a25vdmVsLmNvbTAe
+						Fw0xNDA0MTQxMzEzMjVaFw0zNDA0MDkxMzEzMjVaMGUxCzAJBgNVBAYTAlVTMQsw
+						CQYDVQQIEwJOWTEMMAoGA1UEBxMDTllDMRswGQYDVQQKExJLbm92ZWwgQ29ycG9y
+						YXRpb24xHjAcBgNVBAMTFXFhLXNzby5rbmV3a25vdmVsLmNvbTCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAOQhGveEVeEN0I/ykyCiX8YKNvBr1iK2bikE
+						UQZ17yOXoJNASYu5l3yuZrUemJ3xHYEQhwD8Hnd5A6Q2yJqt1OYdm77F/wL5cx/X
+						JQ7re247Ef5XCos9jvuBWmOs3rtjz9Hv64uVY1L7t8B1UicJA+vTXmxCoD+J8/Wf
+						6gq0Q476E75nJUYq/5Tmrdp5qCS3Sn49Scxvtruhll0dbxj1NCooJNUF2wH0QZuI
+						m1WAAuDMN/CY4DCEd5SCyMGAHL3VoT7/y+dH+VPPbJ5Z1c6KGYqVpBfQ9Z2o+QRb
+						CykI7eQa9nHfw74+jpewna843xOsrIAg8S1TdPldKPTibaOOacECAwEAAaN7MHkw
+						CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
+						dGlmaWNhdGUwHQYDVR0OBBYEFFAEiQ09smJAJxIrIVt1ggD1uphuMB8GA1UdIwQY
+						MBaAFFAEiQ09smJAJxIrIVt1ggD1uphuMA0GCSqGSIb3DQEBBQUAA4IBAQBjh39R
+						2d0urMDY7xTtE7vAhUuEO0h+gM40FRR04r111KpGmOuFX9gx785aOuK0RcYPCttS
+						fT6CodNXybhQXgjQlq5SoN7FzVVnpeTpGk3tmQedItvfwTHUNPkPWPuCi1d36Rs6
+						wv6EWmsWCQN8IT8XAZuaZr7PxwJb3u94zp5UM6mh8Sxeb3fAKGdc1K0SZIrxCmq8
+						lC/2DFnuXxC5HzfoekMdC/b+ye1nuUAFCMOrTFiavilNMdakID5vMAAt2VMIplTw
+						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>
diff --git a/swamid-interfederations-2.0/qa.dawsonera.com-shibboleth.xml b/swamid-interfederations-2.0/qa.dawsonera.com-shibboleth.xml
new file mode 100644
index 00000000..9be38ac9
--- /dev/null
+++ b/swamid-interfederations-2.0/qa.dawsonera.com-shibboleth.xml
@@ -0,0 +1,83 @@
+<?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>
+      <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>
+						MIIDPDCCAiQCCQC0Ky/bIMuQajANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJV
+						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+						c2VtYW50aWNvMRkwFwYDVQQDExBxYS5kYXdzb25lcmEuY29tMB4XDTEzMDQxMDA5
+						NTMzMVoXDTE1MDQxMDA5NTMzMVowYDELMAkGA1UEBhMCVUsxDzANBgNVBAgTBlN1
+						c3NleDERMA8GA1UEBxMIQnJpZ2h0b24xEjAQBgNVBAoTCXNlbWFudGljbzEZMBcG
+						A1UEAxMQcWEuZGF3c29uZXJhLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAMk2vJiHzuv5fLpisAaVQFFIQVgcxiLnq1IUgsDD2b2dZwbJ+jnc9L0W
+						lRUVg7UczlTX6yFDMHXexbLr2ZK5kzamWSwPyi5VEvxrFTJk6RYHoV+OCLdqBugX
+						b7nb3k3tvtdY4M1tvNiepfxeEGvB/j2+vThdG8ziwxk9o4OoRfW5EcXI7LJiJkIx
+						lVtxQHyZ4ZzFsNx+pgaJcGuf6BXRSJ3AOUezkPGaBOLKyBeMTgwvANubCzQy6GXI
+						SVdOM5qCMMEpsjp9Bob242iJo07deEv9um7bBI4pGlE2y85PNYnIXqhnFKlqN+wP
+						n4/JgFJ4f/uiz3MNULKFd7dT6zvNhRkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						t3FU0AH1Cg/vyOcNtqk2UW67h0M8TXzya9QlYBjNPeeD2b2FxWYOWckYyxp73QUE
+						MDm/lzz9Vnt3uUR53DuidNfSwoh1xoDZWxCa04wFq41+dv+K+KTpMtbCx3LEWkm4
+						fE/AIcvD/5i0IR0UYvgyElJC8ZA5gINZQGs7GUHOWl+WSJATVZ04NMkSu81ecgPR
+						uAgAlVn4CIs6BK7w+GYmGIMPh+TOwuBeA9RXPVtYV1/DOi8J488bu1t1BRSzgFAZ
+						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>
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
new file mode 100644
index 00000000..d765259a
--- /dev/null
+++ b/swamid-interfederations-2.0/qa.idp.uhi.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,96 @@
+<?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>
+      <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
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlXe5g51wML4p4iVbnMtrY1UZ
+						MwRAtZXU1vKNIy3XvoqzOTYA/dRB30t8A3hw/4AuhwI7yU5NdIXMP56K1hfxUfV5
+						S7ZLwnPuc87diwqXJ/m+5Tbb7i+7d4drcpB+MrYYW4JzbHiFXbk9Ze1JnAkhMTYU
+						VbmKN6Zj6YFf99Cjde4RolQlQ62VH/9AXn4IWwl4hVXvy6Qgp5hvYIaIL1TpjdKH
+						aOs8c1DUDXGgnSuOMD/jWeaGYn4WS/DbH7aaWXf/Zoz/xwyt8aVOvWw1UqkquNd/
+						E32zseb5Zp8CAYD9x60Xbwj1bI2HUIFzgwakwP1X6CnUu82fUeL+JJ5ZQQtoXwID
+						AQABo2cwZTBEBgNVHREEPTA7ghBxYS5pZHAudWhpLmFjLnVrhidodHRwczovL3Fh
+						LmlkcC51aGkuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDyTxLg3Gvf/
+						fXWfHu0sMyLodkRSMA0GCSqGSIb3DQEBBQUAA4IBAQA036ZXr0EiOMvr8ClIRlc8
+						7yFiXYFeG1slgTj6uwridK51PZhwfszlg3M/uyaogjWQd2IXJtG03s+svWpsXTWP
+						Cq70+Aa9nXM5aLs/TY5aNVQpDKPhmG8xvI5WViIMvXZ4Ty/egPGfjp+W//Nj1ogR
+						4eCQAKrUFpb1UvZqA736QcWachN+WqUlEnwtvU+yE8Wtj8CGnxRLODuRIgDhi3ml
+						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>
+						MIIDLDCCAhSgAwIBAgIVANneP+Hfy2xrQ53aw8HQ+q7keJG8MA0GCSqGSIb3DQEB
+						BQUAMBsxGTAXBgNVBAMTEHFhLmlkcC51aGkuYWMudWswHhcNMTMwMjA4MDgyODQ1
+						WhcNMzMwMjA4MDgyODQ1WjAbMRkwFwYDVQQDExBxYS5pZHAudWhpLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlXe5g51wML4p4iVbnMtrY1UZ
+						MwRAtZXU1vKNIy3XvoqzOTYA/dRB30t8A3hw/4AuhwI7yU5NdIXMP56K1hfxUfV5
+						S7ZLwnPuc87diwqXJ/m+5Tbb7i+7d4drcpB+MrYYW4JzbHiFXbk9Ze1JnAkhMTYU
+						VbmKN6Zj6YFf99Cjde4RolQlQ62VH/9AXn4IWwl4hVXvy6Qgp5hvYIaIL1TpjdKH
+						aOs8c1DUDXGgnSuOMD/jWeaGYn4WS/DbH7aaWXf/Zoz/xwyt8aVOvWw1UqkquNd/
+						E32zseb5Zp8CAYD9x60Xbwj1bI2HUIFzgwakwP1X6CnUu82fUeL+JJ5ZQQtoXwID
+						AQABo2cwZTBEBgNVHREEPTA7ghBxYS5pZHAudWhpLmFjLnVrhidodHRwczovL3Fh
+						LmlkcC51aGkuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDyTxLg3Gvf/
+						fXWfHu0sMyLodkRSMA0GCSqGSIb3DQEBBQUAA4IBAQA036ZXr0EiOMvr8ClIRlc8
+						7yFiXYFeG1slgTj6uwridK51PZhwfszlg3M/uyaogjWQd2IXJtG03s+svWpsXTWP
+						Cq70+Aa9nXM5aLs/TY5aNVQpDKPhmG8xvI5WViIMvXZ4Ty/egPGfjp+W//Nj1ogR
+						4eCQAKrUFpb1UvZqA736QcWachN+WqUlEnwtvU+yE8Wtj8CGnxRLODuRIgDhi3ml
+						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>
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
new file mode 100644
index 00000000..fecd34d5
--- /dev/null
+++ b/swamid-interfederations-2.0/qml.corefacilities.org-account-saml-qml.xml
@@ -0,0 +1,53 @@
+<?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>
+						MIIDezCCAmOgAwIBAgIJAJ2ckmy8lsPeMA0GCSqGSIb3DQEBBQUAMFQxCzAJBgNV
+						BAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRzMQ8wDQYDVQQHDAZCb3N0b24x
+						HDAaBgNVBAoME2lMYWIgU29sdXRpb25zLCBMTEMwHhcNMTMxMjExMTUyNTA3WhcN
+						MjQxMjExMTUyNTA3WjBUMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
+						ZXR0czEPMA0GA1UEBwwGQm9zdG9uMRwwGgYDVQQKDBNpTGFiIFNvbHV0aW9ucywg
+						TExDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2VPbpu2uPVmE3NDD
+						E+aGuO9Zf2eLz+61ubkjuwz6ipY01oHliSId5iETSwGT3r1gJvTnpP3ndGMFq8X0
+						4xcsNb2cU2ZxCZ4+GE9XFriD2eskrfCuuBX6bKeW/yYeMNVoSBF/2YeEC+5kZ+2y
+						B7neQsUFKpB2J4kO7TlFKDAa0aj+ani0TOWdjejcYrZWNfR74Bft3IOFWxvapYvZ
+						9k6LMU/VouCVM8TqfmmTkwHemaB2bdk5rgaZpV3UgsiO5yXS9CDLlrijQSb95I1l
+						QZ2hMtbDu70xKoVOAbMhYcuVZppOObeketCXOoN4MIWEn/dYPhwHsWnGR9sOZhaB
+						9PVJzwIDAQABo1AwTjAdBgNVHQ4EFgQUfo3FkNz5UDtfW6QR5ostJDL7z1owHwYD
+						VR0jBBgwFoAUfo3FkNz5UDtfW6QR5ostJDL7z1owDAYDVR0TBAUwAwEB/zANBgkq
+						hkiG9w0BAQUFAAOCAQEAF4BJ6QX/Y6WV0rMGZYmydg/vE8SgtVB++/rGMfohXW6P
+						s/NEKrzOdIt/Nhannnn77RrjujDLkz5wp3u5zabjffHk/bPqP9yucOBMlIdyggKA
+						SQhzrFygr1kgA2JmUYrmrlKPSSrjfTGJj33qgbo23hzioLULaFFSbvEcZdP8x5lG
+						x8UndDxLcOxRMdxGTdMTu4q/TMnJlugnOe5YmIhg9jbYMwwm8JYVJ86llO5piiUv
+						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>
diff --git a/swamid-interfederations-2.0/qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/qmplus.qmul.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..fb1746fb
--- /dev/null
+++ b/swamid-interfederations-2.0/qmplus.qmul.ac.uk-shibboleth.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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-03-23T11:14:55Z"/>
+  </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>
+						MIIC+jCCAeKgAwIBAgIJAPaB7sCOW6sMMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEXFtcGx1cy5xbXVsLmFjLnVrMB4XDTEyMDMyMDEzNTk0OVoXDTIyMDMxODEz
+						NTk0OVowHDEaMBgGA1UEAxMRcW1wbHVzLnFtdWwuYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQC2Vf26P1kkbcsHU4m1xEpgU+iLkK48mVJyAX5O
+						Z7xdKj83aNr1Gj7jCRAt+fjpiyIkW9VtAjmgw5pUUHXb+YlybL0D2KilhaBBJ57M
+						t1P8AvKm1kFoeLVDFNrjQ54Hl7dFjEOiysvNHum0x6lqUC6I+lClvsLGw5o4Ak58
+						Xok3pDfUc3sUBh3p40L15iecRAcdyKFtLdvC4wkAiE21rUwn752Ps2VcZsyZ1WpU
+						6S/p5sMeO4f+udz1yfFP60oayeFBNjF5m4zeg0a7fLUtv+BQcn5cI8fIxDNjSZfF
+						u344v+tmqXK8mnNkDtdCU6kxXQxAfFX6J21YLl+8F7MSk8tbAgMBAAGjPzA9MBwG
+						A1UdEQQVMBOCEXFtcGx1cy5xbXVsLmFjLnVrMB0GA1UdDgQWBBQQlIWz5fKbyOW+
+						9rRmstXW+70WmTANBgkqhkiG9w0BAQUFAAOCAQEAOlmo8VlQRqr7nX+vW6mj6VWR
+						hxtQzPraKFBPhQmIJHwFZ8AnVN9aqnKMXq2b1yYs3u9jO8s33wh3hroPDn7RyGLH
+						944rjsPv0ewZ8EXRSpffyEDVoPm6W6jjwYVxtn+Q9Yf0iWO6DkJCQNutz4NqB+fH
+						0Ef1BuYUHqeAqvAxl8OCrDt+s2FP501Hq12OK7qDCsYwRinzg0OGFkdPBgexowdz
+						bz6KW4rkg8eKPLhaIFVt+XE567ZyrpklFJoCNYdIuca4RlGFNwPYD+JOy0um0t7k
+						SwkwunLyPQxUR+IPDEnIaJdbbdJmZA6Ub4aErcVHsvez5uap1LW7i8xTdA2DoA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <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:PAOS" Location="https://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://qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+  </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.simitive.com.xml b/swamid-interfederations-2.0/qmul.simitive.com.xml
new file mode 100644
index 00000000..8e884591
--- /dev/null
+++ b/swamid-interfederations-2.0/qmul.simitive.com.xml
@@ -0,0 +1,66 @@
+<?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>
+      <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>
+						MIIDSzCCAjOgAwIBAgIJAIWe2hAWoGqQMA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
+						BAMTI2hvc3QtOTUtMTU0LTI1NC0xMjcucnNjbGllbnRkbnMuY29tMB4XDTE0MDYx
+						MzE0MTUxNFoXDTI0MDYxMDE0MTUxNFowLjEsMCoGA1UEAxMjaG9zdC05NS0xNTQt
+						MjU0LTEyNy5yc2NsaWVudGRucy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQCzdKvT4GTJO7A71YpcNcqOsCuBviRZeKiNTcCSYluuzje0N/pUe1F8
+						ufP1DZqHYIrSAW3mg0cJYqD1X5bgtCU8EOIsaTZQTtPjT3ed5VgSON6Lg/S6FjE3
+						XuJ1m7JLrMRmvnkIaPFgU5zum4FehgxqyQDFKQRZx93BtsKP+evPyHtlT0Em239I
+						DShp4FQtIBKxPf7OxmIpQna+zU4rSayVZOU258MHkwtY6cKQjryrZCpHFVcr188q
+						MBF5x+64lxNfdP5xkQ7X9hW/bmAQiUMzlF7MImCko4vvnMl9zY6duqZ0bTJwmLjk
+						BccJ3+omtIm2ngVIJiY3CKdst19uYKkNAgMBAAGjbDBqMEkGA1UdEQRCMECCI2hv
+						c3QtOTUtMTU0LTI1NC0xMjcucnNjbGllbnRkbnMuY29thhlodHRwczovL3FtdWwu
+						c2ltaXRpdmUuY29tMB0GA1UdDgQWBBRPeM2+fxZB7bvxwd2ptFgsyF0JPDANBgkq
+						hkiG9w0BAQUFAAOCAQEAY9B4aw4BHYBO1OCD7A5+7w45WU9G72QywKOzmXT0aAtW
+						jq/43SGIiH2R186dmyz4OTiwNau7XBfxYBfPtadkiGtKPJNUce1kSXzjKb+N541P
+						hGBs643+UQgKqOlxa7UM475DW2fNRV7J0Bru6TCcNlsxOUo9zxI7n1ce3eaiyT5i
+						7tjzB4+FQ+VGdIgmenNgv1HJZmQn3crXtTWYIyhLHy+J63mEoxRUQobPXf0W0XAk
+						+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>Joe</md:GivenName>
+    <md:SurName>Vallender</md:SurName>
+    <md:EmailAddress>mailto:joe.vallender@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Joe</md:GivenName>
+    <md:SurName>Vallender</md:SurName>
+    <md:EmailAddress>mailto:joe.vallender@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
new file mode 100644
index 00000000..c313398a
--- /dev/null
+++ b/swamid-interfederations-2.0/qmulfed.simitive.com.xml
@@ -0,0 +1,66 @@
+<?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>
+      <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>
+						MIIDOTCCAiGgAwIBAgIJAPVp/A+epmGvMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+						BAMTHGh0dHBzOi8vcW11bGZlZC5zaW1pdGl2ZS5jb20wHhcNMTQwNDIzMTYyNTA5
+						WhcNMjQwNDIwMTYyNTA5WjAnMSUwIwYDVQQDExxodHRwczovL3FtdWxmZWQuc2lt
+						aXRpdmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2LEXCwL6
+						pyGXQKURhMSkMPWdAgyCTROyTahJM7C27+wAupRevc91r7c9cEk+ygo5Gf8meSxK
+						NEMuZ2eM6Nc1eGMkauYrpmZLjfZW8CDrMiKjI+RPFVvvmVahgXAEfHzJiH5tpayv
+						yNafBmRw5/OgwcvTNc8hg/tKF5GNvAd3B+KNdzIW4cAxiSnYw/oDMYNW6HSEGdID
+						hqWTZKBYJxcAZs4GKCNaqPsmobTK8yGvL4tGpyDwcM0iTn8YQqQQMPf25/qv/kDR
+						ROdmi/CyV/5EVZhKR/Dt8+VaOWgfAlnbdRGULf9Asuxjhr46wP9VmqpqFX6bbp2z
+						oLxzvmeJHYi8iwIDAQABo2gwZjBFBgNVHREEPjA8ghxodHRwczovL3FtdWxmZWQu
+						c2ltaXRpdmUuY29thhxodHRwczovL3FtdWxmZWQuc2ltaXRpdmUuY29tMB0GA1Ud
+						DgQWBBR77Asd02wLNO71ILyxI+RJ0/M0PjANBgkqhkiG9w0BAQUFAAOCAQEAyO6o
+						3q+pL3igo8+wZfI2+p+4jxYfXs2iWaRl4pKTNED0rXnE30XIK5cYJrU5YIkfdNTB
+						mYhaeWXt8McmkfDQxayIFSIFaLzBV5e/voE6sNcysuThCWkAEyLNP3wVsFlAVCcy
+						PE8vdP8/SofL5jazCRqi2/LWq8gYdFoWJrkd0hhmXUL87WDgLKf8atdm+xQ0Ew+8
+						3+xNT16PluCwsfg+6AU3NapfmTsG8iwxyOkQ6jgqAVS/wboDTOewKYbpjqnLNI3T
+						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>Joe</md:GivenName>
+    <md:SurName>Vallender</md:SurName>
+    <md:EmailAddress>mailto:joe.vallender@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Joe</md:GivenName>
+    <md:SurName>Vallender</md:SurName>
+    <md:EmailAddress>mailto:joe.vallender@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
new file mode 100644
index 00000000..060ba431
--- /dev/null
+++ b/swamid-interfederations-2.0/qub.ac.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIreX13KY2pe43eXfxccSvl/4f3N
+						QD5HtQfUY7tjkMyT+og8bDiavnHm5puyoO8hsIOOV0Hqv4nrF8cKhu895IcnstWY
+						sd9vLjSRhSKXa8w3VcRhpWDMLaxd21jgi/32tofMCWodFx38cGyuINI2Wuv2ME05
+						r03JMVnwWmjFCzGWsdUTHSffi0GlW6bo1X/3jzx+5VMkKRobbLzCvMSzTmyCFEn8
+						rZQhhFtShz3JZAajnOsRLiiJmYi2ep70Ub3aE8ZB3HOizWYsgPulmMTUm3nacr50
+						x9P+tWxKdtd4qU/m4v9wYsRJhJpA6yljZmtrQMsoKMdpgKkHhd1WGdwQt1MCAwEA
+						AaNlMGMwQgYDVR0RBDswOYIPc2hpYjMucXViLmFjLnVrhiZodHRwczovL3NoaWIz
+						LnF1Yi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXmiIagkYVllQI5LM
+						BnzS+VAh5EAwDQYJKoZIhvcNAQEFBQADggEBADuA54YASAFyW/RVKg44Aktj/bGe
+						aYcuOfGcv48TNIOeS/NHRqlQeyjiyvPGlc8ul3mMYv8Q9MoB7DxpCJa7BbbXSVQC
+						n5jkx70rmbc7WOrSH5uNjQP34rbRMK56yOGdlUEAKf4V3raGWHOs5V+Q4n9gE4FG
+						bHqn90pt5kR9L7VZW8D1dPpMA3YDbDj2anX0zM8VQxiqipUWeoISWX0P6cEhQzsz
+						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>
+						MIIDKDCCAhCgAwIBAgIVAJycK9QeBfR7eEXzFTRCeXgxyljUMA0GCSqGSIb3DQEB
+						BQUAMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azAeFw0xMjAzMjcxMzE4NTha
+						Fw0zMjAzMjcxNDE4NThaMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIreX13KY2pe43eXfxccSvl/4f3N
+						QD5HtQfUY7tjkMyT+og8bDiavnHm5puyoO8hsIOOV0Hqv4nrF8cKhu895IcnstWY
+						sd9vLjSRhSKXa8w3VcRhpWDMLaxd21jgi/32tofMCWodFx38cGyuINI2Wuv2ME05
+						r03JMVnwWmjFCzGWsdUTHSffi0GlW6bo1X/3jzx+5VMkKRobbLzCvMSzTmyCFEn8
+						rZQhhFtShz3JZAajnOsRLiiJmYi2ep70Ub3aE8ZB3HOizWYsgPulmMTUm3nacr50
+						x9P+tWxKdtd4qU/m4v9wYsRJhJpA6yljZmtrQMsoKMdpgKkHhd1WGdwQt1MCAwEA
+						AaNlMGMwQgYDVR0RBDswOYIPc2hpYjMucXViLmFjLnVrhiZodHRwczovL3NoaWIz
+						LnF1Yi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXmiIagkYVllQI5LM
+						BnzS+VAh5EAwDQYJKoZIhvcNAQEFBQADggEBADuA54YASAFyW/RVKg44Aktj/bGe
+						aYcuOfGcv48TNIOeS/NHRqlQeyjiyvPGlc8ul3mMYv8Q9MoB7DxpCJa7BbbXSVQC
+						n5jkx70rmbc7WOrSH5uNjQP34rbRMK56yOGdlUEAKf4V3raGWHOs5V+Q4n9gE4FG
+						bHqn90pt5kR9L7VZW8D1dPpMA3YDbDj2anX0zM8VQxiqipUWeoISWX0P6cEhQzsz
+						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>Karen</md:GivenName>
+    <md:SurName>Murphy</md:SurName>
+    <md:EmailAddress>mailto:eresources@qub.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Karen</md:GivenName>
+    <md:SurName>Murphy</md:SurName>
+    <md:EmailAddress>mailto:k.l.murphy@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
new file mode 100644
index 00000000..a5451433
--- /dev/null
+++ b/swamid-interfederations-2.0/quod.lib.umich.edu-shibboleth-sp-acls.xml
@@ -0,0 +1,105 @@
+<?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>
+      <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>
+						MIIEijCCA3KgAwIBAgIJAIT48jHMZ0+hMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
+						VQQGEwJVUzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjEf
+						MB0GA1UEChMWVW5pdmVyc2l0eSBvZiBNaWNoaWdhbjEnMCUGA1UECxMeTGlicmFy
+						eSBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MRswGQYDVQQDExJxdW9kLmxpYi51bWlj
+						aC5lZHUxKDAmBgkqhkiG9w0BCQEWGWxpdC1jcy1zeXNhZG1pbkB1bWljaC5lZHUw
+						HhcNMDkwODA3MTUyODU0WhcNMTkwODA1MTUyODU0WjCBxTELMAkGA1UEBhMCVVMx
+						ETAPBgNVBAgTCE1pY2hpZ2FuMRIwEAYDVQQHEwlBbm4gQXJib3IxHzAdBgNVBAoT
+						FlVuaXZlcnNpdHkgb2YgTWljaGlnYW4xJzAlBgNVBAsTHkxpYnJhcnkgSW5mb3Jt
+						YXRpb24gVGVjaG5vbG9neTEbMBkGA1UEAxMScXVvZC5saWIudW1pY2guZWR1MSgw
+						JgYJKoZIhvcNAQkBFhlsaXQtY3Mtc3lzYWRtaW5AdW1pY2guZWR1MIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtw76D6i/mIoKdM0RKwvl4j5DN7POIScx
+						hTDtXslnmEzd7Lzfl8q8NVgoFDJ7U6ciRA3ajKe26wlJO/E0F4iZPQiJvcl1T6lT
+						wKOp4lK4xGFBScYsaLJnI1WzjiTHJt8QpMqpuHpfFSzqozhS9rYADBKwVPANi9qr
+						FplIQr/d/h3R48H/9fHcEDV8GFucH5kLw5EkLOmIAu++skkRAG6Wvajj498drE0e
+						CHDGa7O2l3S7HYlLiQH+KnRk9Fv/kwWsqVAk7E/48oa3UuOdJM01/PNVSAEKBg2w
+						i2S0YP5sZqBuCP43RzHarEFHNawmu8kcb51aXFagOq6xlbaisTMjUQIDAQABo3sw
+						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
+						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUjqnAa9SKCm5M1p4CTERZW+ouqEkwHwYDVR0j
+						BBgwFoAUjqnAa9SKCm5M1p4CTERZW+ouqEkwDQYJKoZIhvcNAQEFBQADggEBAKjc
+						MNz0L7eP9Ck1v07Q239cbH31S/KxWaiQP/gbHw7knNZhhNywCs5F/V+/zI/xaPUu
+						gtWOiQborOuysBa7lGdrQkKqP5r8j5Tq8HtM5XhIf0r8BIZg1wX8k92CBI8JR7IY
+						k4qcrrSDrImNB2EEnTTMAWWc8VTKW8+D5z1ygDXQsB2Gxf/ywk4xQ9r+AChBCwt9
+						319gyt4k8RIkhvErotahf2MFzZrzM7GrEdNZhjfyprI8GilTC3MC7tep5wHyvRQ5
+						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>
+						MIIEijCCA3KgAwIBAgIJAIT48jHMZ0+hMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
+						VQQGEwJVUzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjEf
+						MB0GA1UEChMWVW5pdmVyc2l0eSBvZiBNaWNoaWdhbjEnMCUGA1UECxMeTGlicmFy
+						eSBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MRswGQYDVQQDExJxdW9kLmxpYi51bWlj
+						aC5lZHUxKDAmBgkqhkiG9w0BCQEWGWxpdC1jcy1zeXNhZG1pbkB1bWljaC5lZHUw
+						HhcNMDkwODA3MTUyODU0WhcNMTkwODA1MTUyODU0WjCBxTELMAkGA1UEBhMCVVMx
+						ETAPBgNVBAgTCE1pY2hpZ2FuMRIwEAYDVQQHEwlBbm4gQXJib3IxHzAdBgNVBAoT
+						FlVuaXZlcnNpdHkgb2YgTWljaGlnYW4xJzAlBgNVBAsTHkxpYnJhcnkgSW5mb3Jt
+						YXRpb24gVGVjaG5vbG9neTEbMBkGA1UEAxMScXVvZC5saWIudW1pY2guZWR1MSgw
+						JgYJKoZIhvcNAQkBFhlsaXQtY3Mtc3lzYWRtaW5AdW1pY2guZWR1MIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtw76D6i/mIoKdM0RKwvl4j5DN7POIScx
+						hTDtXslnmEzd7Lzfl8q8NVgoFDJ7U6ciRA3ajKe26wlJO/E0F4iZPQiJvcl1T6lT
+						wKOp4lK4xGFBScYsaLJnI1WzjiTHJt8QpMqpuHpfFSzqozhS9rYADBKwVPANi9qr
+						FplIQr/d/h3R48H/9fHcEDV8GFucH5kLw5EkLOmIAu++skkRAG6Wvajj498drE0e
+						CHDGa7O2l3S7HYlLiQH+KnRk9Fv/kwWsqVAk7E/48oa3UuOdJM01/PNVSAEKBg2w
+						i2S0YP5sZqBuCP43RzHarEFHNawmu8kcb51aXFagOq6xlbaisTMjUQIDAQABo3sw
+						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
+						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUjqnAa9SKCm5M1p4CTERZW+ouqEkwHwYDVR0j
+						BBgwFoAUjqnAa9SKCm5M1p4CTERZW+ouqEkwDQYJKoZIhvcNAQEFBQADggEBAKjc
+						MNz0L7eP9Ck1v07Q239cbH31S/KxWaiQP/gbHw7knNZhhNywCs5F/V+/zI/xaPUu
+						gtWOiQborOuysBa7lGdrQkKqP5r8j5Tq8HtM5XhIf0r8BIZg1wX8k92CBI8JR7IY
+						k4qcrrSDrImNB2EEnTTMAWWc8VTKW8+D5z1ygDXQsB2Gxf/ywk4xQ9r+AChBCwt9
+						319gyt4k8RIkhvErotahf2MFzZrzM7GrEdNZhjfyprI8GilTC3MC7tep5wHyvRQ5
+						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>
diff --git a/swamid-interfederations-2.0/ra-idp.lanet.lv.xml b/swamid-interfederations-2.0/ra-idp.lanet.lv.xml
new file mode 100644
index 00000000..8a982901
--- /dev/null
+++ b/swamid-interfederations-2.0/ra-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?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>
+      <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>
+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>
+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>
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
new file mode 100644
index 00000000..f669cb66
--- /dev/null
+++ b/swamid-interfederations-2.0/rastreador.ifba.edu.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxKjAoBgNVBAoTIUlGQkEgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkYSBCYWhpYTENMAsGA1UECxMEREdUSTEoMCYGCSqG
+SIb3DQEJARYZcmVpbmFsZG9jb3N0YUBpZmJhLmVkdS5icjERMA8GA1UEBxMIU2Fs
+dmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMWcmFz
+dHJlYWRvci5pZmJhLmVkdS5icjAeFw0xNDA1MjgxNDExMDVaFw0xNzA1MjcxNDEx
+MDVaMIG2MSowKAYDVQQKEyFJRkJBIC0gSW5zdGl0dXRvIEZlZGVyYWwgZGEgQmFo
+aWExDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJlaW5hbGRvY29zdGFA
+aWZiYS5lZHUuYnIxETAPBgNVBAcTCFNhbHZhZG9yMQ4wDAYDVQQIEwVCYWhpYTEL
+MAkGA1UEBhMCQlIxHzAdBgNVBAMTFnJhc3RyZWFkb3IuaWZiYS5lZHUuYnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC76YPzCeUvBq3XTaaWh0zo1nn6
+1lSxQFz/f0d9NOSjMe4aIxyMfCQHhWvoCldVgPzeVBHM8pioQsSyP8KZve1N0H5d
+6KWPZzk99oCPPkuGWVocYfEOHgodYqKD5aEU4gu8x+sggzZO0sCFlrqCbI26dhEx
+WmBLPy7bu0iownsyQE4UKeYWMBDI9Zmpq8LAIkzlLcs6RPkCqeC5Fl0JY1rmOYqd
+1/dr2oZapOQApH9En6lxfCBm4lo/BWKYJXnJ48GgpxsmaiUZ5A/2ORM7Ts0cJ8Fa
+FOi3KP1izvNxheJRS5i/H9dzPtrpbAz5cvpj36eLPNvLf038tNgRSTpKBCe5AgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBALAgWE0GCvUpvnMtQD1Jht1dNdGX+1MlVt2k
+9Vq2Z6qlQbidL2aP2nsg8wvGCnoJbH3ChV8URBf0nSxjo070sjoPd24++a8+FZ66
+fxopAvdKKImq6VnSQIXL2fUFtIld/vGGnbPj/IKdlKCvhNNziDBkhnc+N5bM9qnS
+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>
+      
+MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxKjAoBgNVBAoTIUlGQkEgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkYSBCYWhpYTENMAsGA1UECxMEREdUSTEoMCYGCSqG
+SIb3DQEJARYZcmVpbmFsZG9jb3N0YUBpZmJhLmVkdS5icjERMA8GA1UEBxMIU2Fs
+dmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMWcmFz
+dHJlYWRvci5pZmJhLmVkdS5icjAeFw0xNDA1MjgxNDExMDVaFw0xNzA1MjcxNDEx
+MDVaMIG2MSowKAYDVQQKEyFJRkJBIC0gSW5zdGl0dXRvIEZlZGVyYWwgZGEgQmFo
+aWExDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJlaW5hbGRvY29zdGFA
+aWZiYS5lZHUuYnIxETAPBgNVBAcTCFNhbHZhZG9yMQ4wDAYDVQQIEwVCYWhpYTEL
+MAkGA1UEBhMCQlIxHzAdBgNVBAMTFnJhc3RyZWFkb3IuaWZiYS5lZHUuYnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC76YPzCeUvBq3XTaaWh0zo1nn6
+1lSxQFz/f0d9NOSjMe4aIxyMfCQHhWvoCldVgPzeVBHM8pioQsSyP8KZve1N0H5d
+6KWPZzk99oCPPkuGWVocYfEOHgodYqKD5aEU4gu8x+sggzZO0sCFlrqCbI26dhEx
+WmBLPy7bu0iownsyQE4UKeYWMBDI9Zmpq8LAIkzlLcs6RPkCqeC5Fl0JY1rmOYqd
+1/dr2oZapOQApH9En6lxfCBm4lo/BWKYJXnJ48GgpxsmaiUZ5A/2ORM7Ts0cJ8Fa
+FOi3KP1izvNxheJRS5i/H9dzPtrpbAz5cvpj36eLPNvLf038tNgRSTpKBCe5AgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBALAgWE0GCvUpvnMtQD1Jht1dNdGX+1MlVt2k
+9Vq2Z6qlQbidL2aP2nsg8wvGCnoJbH3ChV8URBf0nSxjo070sjoPd24++a8+FZ66
+fxopAvdKKImq6VnSQIXL2fUFtIld/vGGnbPj/IKdlKCvhNNziDBkhnc+N5bM9qnS
+hjssLnLT/qVvMxplYjAB4fCD+h83bAPR2b9oFjduMP9LQ4c0/EMD/2HNmvomB4mM
+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>
diff --git a/swamid-interfederations-2.0/rave.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/rave.sisoshibboleth.co.uk-entity.xml
new file mode 100644
index 00000000..c64a6e31
--- /dev/null
+++ b/swamid-interfederations-2.0/rave.sisoshibboleth.co.uk-entity.xml
@@ -0,0 +1,84 @@
+<?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>
+      <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>
+						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
+						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
+						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
+						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
+						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
+						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
+						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
+						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
+						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
+						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
+						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
+						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
+						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>
diff --git a/swamid-interfederations-2.0/rcm.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/rcm.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..e956b0ae
--- /dev/null
+++ b/swamid-interfederations-2.0/rcm.ac.uk-oala-metadata.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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>
+						MIIDXjCCAkagAwIBAgIIPDy/aki2TD8wDQYJKoZIhvcNAQEFBQAwRjEjMCEGA1UE
+						CgwaVGhlIFJveWFsIENvbGxlZ2UgT2YgTXVzaWMxHzAdBgNVBAMMFm9wZW5hdGhl
+						bnNsYS5yY20uYWMudWswHhcNMTMxMDE1MTMzNDAwWhcNMjMxMDE1MTMzNDAwWjBG
+						MSMwIQYDVQQKDBpUaGUgUm95YWwgQ29sbGVnZSBPZiBNdXNpYzEfMB0GA1UEAwwW
+						b3BlbmF0aGVuc2xhLnJjbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBANtJudIyT/BQLf6P2zHPfjH4YZIqzeMjC9WgCSjtRx/asbh+78VXuUwy
+						pii28+E34wn1N0QtNx/03Bp3ngCAdm5l4WG0oB8l/prCKS3Y+Y/otrlBq9nF2NmX
+						aVh0f3PEGCFs5mCIoCMQlwZZrXBoRB+aqaCDo3jRwxoUDqWI76KMsXdPepMWwGD2
+						qnXP22WWpvrvAJBBrlxJDa9RH48vYh6hiydfjx43wRbz6zlCCsRphZpZ6UQneUw+
+						tKYrSMmKnaFFLEOzWov4slEqxwcGkq+KbF7pNRv+GHAZFmuoOR5y3+9OB1mpyU70
+						jdVwT8X4fKAycVV1m0HwGrXniqL7RfkCAwEAAaNQME4wHQYDVR0OBBYEFB6LU7jQ
+						5XlDoou/R5C0Amhjp0rXMB8GA1UdIwQYMBaAFB6LU7jQ5XlDoou/R5C0Amhjp0rX
+						MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGiCXJS6KYYdPOa16ONp
+						YO9RxyV1UAJ4SWolE2othZv8HQHhH6lxlI9rOISOoBo8XkeSscrVAYMLA6fPM1aR
+						8+X/Et65VWSZN52sI2oEFlXub3DmwFI77vd67QYt13jdrJQW9rLG4Jqf7XKjvtLf
+						SwPhDfohab9O3yTxGcfxRLwgU1ZyNHOQMIz72ti085RavSLCsFOqy7hGE2DvZFrD
+						01UxhUq4UgJxcsbvAMRjOJVsxJ1TowhnDxLNv67GSMTj83+5zZaCU0ZWvU9nTggB
+						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>
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
new file mode 100644
index 00000000..b706c121
--- /dev/null
+++ b/swamid-interfederations-2.0/rcnp-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml
@@ -0,0 +1,58 @@
+<?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>
+      <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>
+						MIIDIDCCAgigAwIBAgIJAMqMZUiIsl4nMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEXJjbnB1Ymxpc2hpbmcuY29tMB4XDTEzMTAwMzIxMzU1OFoXDTIzMTAwMTIx
+						MzU1OFowHDEaMBgGA1UEAxMRcmNucHVibGlzaGluZy5jb20wggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDBlUJDDRaIIieWxx02H8sbXKNbUE6X+ZQbDeEk
+						ifb/0TqrolBjWGbwIB55jf4qL5aHy1Xb9lWiuItveLETbDsb6LGVRXjoBLMD/hq/
+						INQNKlId7sUyaDD1dKdWo8vZAORnLLJfiNfJBFSfwt8dnnQihsv8ip1sQonfdjWF
+						2JaPRwKHX864wn6x8CvqOgRNheowlhj6Hq69zX9mL9bKww6MC9c++11rwOYHVdGZ
+						vZqhU0CxzNTDJWDRYwu5//PpMDLMJGTpbuRnN0SRR0uOJ6H9hACTO4MLGzO/WF4X
+						cU1+I48q2gCdsZ2LaHWmNJqIy5IU24r2gu75uYAdUfE/n6UxAgMBAAGjZTBjMEIG
+						A1UdEQQ7MDmCEXJjbnB1Ymxpc2hpbmcuY29thiRodHRwczovL3JjbnB1Ymxpc2hp
+						bmcuY29tL3NoaWJib2xldGgwHQYDVR0OBBYEFBME3+HToUv+o1RLhxpnUhzXeecR
+						MA0GCSqGSIb3DQEBBQUAA4IBAQAiMV6SbpPn4cSK/tteSnvlGDu0kx0WrKHcq70j
+						/TQyKZYc/roD1Xsbusj6kNhtbyg2UDKZMtUDJUX49Gy6od4hMft/LaO0d+S0fBA5
+						pMGEl3rQpubIUem/SBAfN+Au+7j6yqi0vukGCqSWNAaQXt/XqkKys69b/CIbqkrm
+						ggWl3cXSrJx7GPKL1S9O5Oxd/cJO+g32L9qMH7LuKHLlnkEH8O5ZKjZjn+F6rBy7
+						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>
diff --git a/swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..525059e9
--- /dev/null
+++ b/swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml
@@ -0,0 +1,82 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reading.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDajCCAlKgAwIBAgIISa3f8+58NocwDQYJKoZIhvcNAQEFBQAwTDEiMCAGA1UE
+						CgwZVGhlIFVuaXZlcnNpdHkgb2YgUmVhZGluZzEmMCQGA1UEAwwdb3BlbmF0aGVu
+						cy5hdXRoLnJlYWRpbmcuYWMudWswHhcNMTIwMTEyMTIxNDAwWhcNMjIwMTEyMTIx
+						NDAwWjBMMSIwIAYDVQQKDBlUaGUgVW5pdmVyc2l0eSBvZiBSZWFkaW5nMSYwJAYD
+						VQQDDB1vcGVuYXRoZW5zLmF1dGgucmVhZGluZy5hYy51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBAJNYQ5WyjzIufrzwdnz8gBri2uTETchGZlYYHPUF
+						LA9W8uFfZwlFbJPnxcGxiXSCVmPGfLp0c8DywmQUbumdlVuTDPBoQnKMCst8fRcI
+						CitVbYTotup97HEneR3zoWVgsAYZ92QJ/Jucxf+aXrhUygK3cIjUXq69Kgk3ywjc
+						gFfRIjpQCVi7h2VuhNE2Zy7/7kSHpG7BVWC9ebUrDC7M+enF7c+wNZZEMZzjAzDE
+						s8WuIqgnnog+KpEYqEvhNgjTKx5/aZ8JEWBmdKQc/Q/UnwUtjsYyC5aWr4q0rX5/
+						IothWPf9dwzVbJutK8fyJ098HrViCGEwFbCCGw6dAhSOAqECAwEAAaNQME4wHQYD
+						VR0OBBYEFL19dBzqhuxKdXZOjxR98MipVHf5MB8GA1UdIwQYMBaAFL19dBzqhuxK
+						dXZOjxR98MipVHf5MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAChi
+						Oe5GqHzBymz+7I+UquzLz4v4aZrTbse1kiMHNVBGPnZsmAO5J0pR+8G4fI9/q8yi
+						H1NZ7j2Rju/LAnbACJoWD/Y09csVqkeYCsostlBAg0iswiGrV4XsUjoIV/2G8K/6
+						w7o2aNw0vao8gLryS7iAVTJnivnzmtjItUMX9bFCFR6DKA2z74FeyslBE8NqAw49
+						sRTw7OH3rhuCeSVieXNUUnMD1nX1cdRkndht3wn1EpJoWEywup92YqBZORywFPcY
+						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>
+						MIIDajCCAlKgAwIBAgIISa3f8+58NocwDQYJKoZIhvcNAQEFBQAwTDEiMCAGA1UE
+						CgwZVGhlIFVuaXZlcnNpdHkgb2YgUmVhZGluZzEmMCQGA1UEAwwdb3BlbmF0aGVu
+						cy5hdXRoLnJlYWRpbmcuYWMudWswHhcNMTIwMTEyMTIxNDAwWhcNMjIwMTEyMTIx
+						NDAwWjBMMSIwIAYDVQQKDBlUaGUgVW5pdmVyc2l0eSBvZiBSZWFkaW5nMSYwJAYD
+						VQQDDB1vcGVuYXRoZW5zLmF1dGgucmVhZGluZy5hYy51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBAJNYQ5WyjzIufrzwdnz8gBri2uTETchGZlYYHPUF
+						LA9W8uFfZwlFbJPnxcGxiXSCVmPGfLp0c8DywmQUbumdlVuTDPBoQnKMCst8fRcI
+						CitVbYTotup97HEneR3zoWVgsAYZ92QJ/Jucxf+aXrhUygK3cIjUXq69Kgk3ywjc
+						gFfRIjpQCVi7h2VuhNE2Zy7/7kSHpG7BVWC9ebUrDC7M+enF7c+wNZZEMZzjAzDE
+						s8WuIqgnnog+KpEYqEvhNgjTKx5/aZ8JEWBmdKQc/Q/UnwUtjsYyC5aWr4q0rX5/
+						IothWPf9dwzVbJutK8fyJ098HrViCGEwFbCCGw6dAhSOAqECAwEAAaNQME4wHQYD
+						VR0OBBYEFL19dBzqhuxKdXZOjxR98MipVHf5MB8GA1UdIwQYMBaAFL19dBzqhuxK
+						dXZOjxR98MipVHf5MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAChi
+						Oe5GqHzBymz+7I+UquzLz4v4aZrTbse1kiMHNVBGPnZsmAO5J0pR+8G4fI9/q8yi
+						H1NZ7j2Rju/LAnbACJoWD/Y09csVqkeYCsostlBAg0iswiGrV4XsUjoIV/2G8K/6
+						w7o2aNw0vao8gLryS7iAVTJnivnzmtjItUMX9bFCFR6DKA2z74FeyslBE8NqAw49
+						sRTw7OH3rhuCeSVieXNUUnMD1nX1cdRkndht3wn1EpJoWEywup92YqBZORywFPcY
+						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>Celia</md:GivenName>
+    <md:SurName>Ayres</md:SurName>
+    <md:EmailAddress>mailto:c.a.ayres@reading.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Neal</md:GivenName>
+    <md:SurName>Curran</md:SurName>
+    <md:EmailAddress>mailto:j.n.curran@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
new file mode 100644
index 00000000..d83b3cd1
--- /dev/null
+++ b/swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.xml
@@ -0,0 +1,89 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reading.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDdDCCAlygAwIBAgIIb9uiE/y9tsIwDQYJKoZIhvcNAQEFBQAwUTEiMCAGA1UE
+						CgwZVGhlIFVuaXZlcnNpdHkgb2YgUmVhZGluZzErMCkGA1UEAwwib3BlbmF0aGVu
+						cy10ZXN0LmF1dGgucmVhZGluZy5hYy51azAeFw0xNDA0MjQxNTI2NTdaFw0yNDA0
+						MjQxNTI2NTdaMFExIjAgBgNVBAoMGVRoZSBVbml2ZXJzaXR5IG9mIFJlYWRpbmcx
+						KzApBgNVBAMMIm9wZW5hdGhlbnMtdGVzdC5hdXRoLnJlYWRpbmcuYWMudWswggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHXwJkUHepe5o+ocIg/oU4ER85
+						TJcVQtpf/D7x2bs9nJS5Uu4Egoz6bJBHYDDBFj3H4ERKX2aS9o0xpBBJfLUx3/X+
+						KC19K7Zy8BdfTnZ3ZhOvMS5UBcdkOycJdGH1CBsW2vuDCRnpacm4T7kwTWHEuIEt
+						L9hkUebIbThdm8/Zq0sBnzDXMsYiI7jQtTVKPf6zAuD507BqJZJPjFtL/ZaSkNxU
+						Tov0pu7aQBZHEToMRJSC8iQnnQx4bxMwnxuP/00MIgxwT+edw0yi3Qz/8WaCpqoR
+						kLYwahs641bUAAdEm2dlxuUA3EOj0xK66BU+5TY1E/1EWcGfXGXC7Mhgeq7LAgMB
+						AAGjUDBOMB0GA1UdDgQWBBShqMqROBVGHF2mle9Q1RK3Jj7n3jAfBgNVHSMEGDAW
+						gBShqMqROBVGHF2mle9Q1RK3Jj7n3jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
+						BQUAA4IBAQAZfO08d/FsQzqhHa3L0++q+gjSyZ6GUnMsy9TEX0MxAmShPAEXP8La
+						K2JKGb/vkF1PZtfVWSH/ZzbWPkfVfyb/q9gHPv23RDpqsomcLe5RrRYpQeCnlf71
+						ZJU9uOnwqIxYI3l8x0Ahk/87G+JKTxE2Wzoy0NZiJn2Tt79qhnYq2HbYn4K7YK3q
+						BtvapLZ0XanBO2b1uBLDNem6vQ608pgrlkstf7C2jSnpM7ixx8qSg/zZWVv1QVgS
+						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>
+						MIIDdDCCAlygAwIBAgIIb9uiE/y9tsIwDQYJKoZIhvcNAQEFBQAwUTEiMCAGA1UE
+						CgwZVGhlIFVuaXZlcnNpdHkgb2YgUmVhZGluZzErMCkGA1UEAwwib3BlbmF0aGVu
+						cy10ZXN0LmF1dGgucmVhZGluZy5hYy51azAeFw0xNDA0MjQxNTI2NTdaFw0yNDA0
+						MjQxNTI2NTdaMFExIjAgBgNVBAoMGVRoZSBVbml2ZXJzaXR5IG9mIFJlYWRpbmcx
+						KzApBgNVBAMMIm9wZW5hdGhlbnMtdGVzdC5hdXRoLnJlYWRpbmcuYWMudWswggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHXwJkUHepe5o+ocIg/oU4ER85
+						TJcVQtpf/D7x2bs9nJS5Uu4Egoz6bJBHYDDBFj3H4ERKX2aS9o0xpBBJfLUx3/X+
+						KC19K7Zy8BdfTnZ3ZhOvMS5UBcdkOycJdGH1CBsW2vuDCRnpacm4T7kwTWHEuIEt
+						L9hkUebIbThdm8/Zq0sBnzDXMsYiI7jQtTVKPf6zAuD507BqJZJPjFtL/ZaSkNxU
+						Tov0pu7aQBZHEToMRJSC8iQnnQx4bxMwnxuP/00MIgxwT+edw0yi3Qz/8WaCpqoR
+						kLYwahs641bUAAdEm2dlxuUA3EOj0xK66BU+5TY1E/1EWcGfXGXC7Mhgeq7LAgMB
+						AAGjUDBOMB0GA1UdDgQWBBShqMqROBVGHF2mle9Q1RK3Jj7n3jAfBgNVHSMEGDAW
+						gBShqMqROBVGHF2mle9Q1RK3Jj7n3jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
+						BQUAA4IBAQAZfO08d/FsQzqhHa3L0++q+gjSyZ6GUnMsy9TEX0MxAmShPAEXP8La
+						K2JKGb/vkF1PZtfVWSH/ZzbWPkfVfyb/q9gHPv23RDpqsomcLe5RrRYpQeCnlf71
+						ZJU9uOnwqIxYI3l8x0Ahk/87G+JKTxE2Wzoy0NZiJn2Tt79qhnYq2HbYn4K7YK3q
+						BtvapLZ0XanBO2b1uBLDNem6vQ608pgrlkstf7C2jSnpM7ixx8qSg/zZWVv1QVgS
+						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>Celia</md:GivenName>
+    <md:SurName>Ayres</md:SurName>
+    <md:EmailAddress>mailto:c.a.ayres@reading.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Neal</md:GivenName>
+    <md:SurName>Curran</md:SurName>
+    <md:EmailAddress>mailto:j.n.curran@reading.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/refserver.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/refserver.new.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c5866ebc
--- /dev/null
+++ b/swamid-interfederations-2.0/refserver.new.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,84 @@
+<?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://refserver.new.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="2014-01-14T16:46: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://refserver.new.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>
+						MIIDCTCCAfGgAwIBAgIJAItsMlvuKT4IMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnJlZnNlcnZlci5uZXcub3guYWMudWswHhcNMTQwMTE0MTEzMTM5WhcNMjQw
+						MTEyMTEzMTM5WjAhMR8wHQYDVQQDExZyZWZzZXJ2ZXIubmV3Lm94LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnZrPEqAQHxxuuiaezoehBHpU
+						NawZ3YVrRODqy6xwsr8QD/12/q0q4QbY1a+PR/PxApAQDkitQwS+a2rRpxwoy7C/
+						enwcamAD6uFz7v1LYav6zqpZvlDq86R10TBq2RGXhw7gyIQh8BrVnS2JCfgatn5E
+						I7FX3Fr3J20K/gffhULR0BnegUM0V/TGRRSgHyIXvB3mpxpg/dSm2zfSV3bSkxjp
+						9XfRaM1y5stVVYZX+9MEqtMehaqashrhMmZH+Q23viQKXlnK3MQOGZ9cvV/QFndL
+						5GXp0xEevx4e3cDgYpGmnB4c68KTEQ3YPInzXXvc45W9mDYhyL0HTIJL9WisMwID
+						AQABo0QwQjAhBgNVHREEGjAYghZyZWZzZXJ2ZXIubmV3Lm94LmFjLnVrMB0GA1Ud
+						DgQWBBQvMIkjuod+Da1WtFejwhAJgqa2QzANBgkqhkiG9w0BAQUFAAOCAQEAiAOq
+						cNyzyuzytSQuC86ZMmT7Xp9nIIf620PdY+G7dIUnef3vcUz4pclZ0rJsx0EwjqW3
+						Y85Is9c781dqSnSaRRUrcnb+gQlQG0WT8xLyrwbaMLeIlU2c5plESfPcyMGothbR
+						QeslfRUPQlDHfdNDegs4QzDAg2FNIjU38nrQ2tFEvqXcIzMKJaw79j2sZjt9aI2R
+						jCvGboxIJuuy6zHBiB9Y342szp4QckSwdMw+bqdW/bA+redm3bMeul0Wo5JdOE7z
+						iHiKjF+ReWFUDsfw6iItWOSgeR015KNrE0lmrbB6JHQ+pK5V196zFfOA1zDoFtNr
+						T76PuZpBItplf7PXbw==
+					</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://refserver.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://refserver.new.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://refserver.new.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://refserver.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://refserver.new.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, New College reference manager</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@new.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@new.ox.ac.uk</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
new file mode 100644
index 00000000..09b0950f
--- /dev/null
+++ b/swamid-interfederations-2.0/register-ci.nii.ac.jp-shibboleth-sp.xml
@@ -0,0 +1,69 @@
+<?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>
+      <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>
+						MIIEPDCCAyQCCQDZrw7Kede8nzANBgkqhkiG9w0BAQUFADCB3zELMAkGA1UEBhMC
+						SlAxDjAMBgNVBAgTBVRva3lvMRMwEQYDVQQHEwpDaGl5b2RhLWt1MSowKAYDVQQK
+						EyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxPDA6BgNVBAsTM0N5
+						YmVyIFNjaWVuY2UgSW5mcmFzdHJ1Y3R1cmUgRGV2ZWxvcG1lbnQgRGVwYXJ0bWVu
+						dDEeMBwGA1UEAxMVcmVnaXN0ZXItY2kubmlpLmFjLmpwMSEwHwYJKoZIhvcNAQkB
+						FhJzeXMtZGVza0BuaWkuYWMuanAwHhcNMTMwMTI1MDYwMTQyWhcNMTgwMTI0MDYw
+						MTQyWjCB3zELMAkGA1UEBhMCSlAxDjAMBgNVBAgTBVRva3lvMRMwEQYDVQQHEwpD
+						aGl5b2RhLWt1MSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3Jt
+						YXRpY3MxPDA6BgNVBAsTM0N5YmVyIFNjaWVuY2UgSW5mcmFzdHJ1Y3R1cmUgRGV2
+						ZWxvcG1lbnQgRGVwYXJ0bWVudDEeMBwGA1UEAxMVcmVnaXN0ZXItY2kubmlpLmFj
+						LmpwMSEwHwYJKoZIhvcNAQkBFhJzeXMtZGVza0BuaWkuYWMuanAwggEiMA0GCSqG
+						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/Xcxh22qm6u7RqOrnmljIaPC5ym11FNJA
+						Lj6DSm6S2tJs4G1wbfQ4iFIF5I1QtaPzlDhUYPT+/GX81BiLDzUEFRHykGMNTLus
+						hJGYKV54EavnUgWIbhjcRR4PC+kk8GG9HplfdeWXHgODNAe7xNUtRDOv7ygoxiX/
+						H8zDrbDIRspRCsXl1qcGk+KrOx92xh2In6tIVVuvEmRKUpYcIagCClOTtoLjWBup
+						PqAA5kSSwTFLHN+BgsvCTdTSVeqhMgbYhVtZgHu6QjjKm2lvipa+WVabVT46rrGs
+						Rf47qWlyq5Cq+262PjglCpbzQAIXheL3c1ShHmjgklyC7hyjnYG9AgMBAAEwDQYJ
+						KoZIhvcNAQEFBQADggEBAHET4JzjWe5TiAbAyB8VbOnUTWeMGI3AIMhQytfeyZqf
+						L42eAMPpZjiO/g49ucpbj1ZE0YYB1MoMhYtvrKjK56Zqc3VfRFtRGoqfZlrdwcLE
+						pgQ5yAtZ4lMirrC00coUEx5ZP9LD687N1qz2B0q552twCdx92Jiv/EPGrziQRvcL
+						d781O3GDfCNtRlgCnyL71b1Djwz0WY6llpbOvbLm9AlSYTNfNve2AO700cKHVfHi
+						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>
diff --git a/swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml b/swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml
new file mode 100644
index 00000000..adbf96e7
--- /dev/null
+++ b/swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml
@@ -0,0 +1,112 @@
+<?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: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>
+      <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
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMjAxMTIx
+MzMxMzFaFw0xNzAxMTAxMzMxMzFaMHsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdN
+YXgtUGxhbmNrLUdlc2VsbHNjaGFmdDElMCMGA1UECxMcUmVjaGVuemVudHJ1bSBH
+YXJjaGluZyAoUlpHKTEjMCEGA1UEAxMabGRhcC1kYXJpYWguZXNjLnJ6Zy5tcGcu
+ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbyc9BVBglxQEt8MmI
+cbf3GKqCdQADGnnNXAwx9gjq5mQI2+VNGcBk8aq24p5a++hlemue+6P6RQONiv5z
+sAXlIZb6MuGOcF6gOUqRijMuWW1OueysiO4F5ODOJ8TaGSjWytCSQ28cpJbc7wWo
+mnlZxL6NvVyRiDCJuUfDyIW8ICgk7Aw1K0UdpJXeVzFUiBtTIM7Ira80o3yeLDhi
+DDPc+swDZA9syWvn8/W57kN0/vtUYKzGs6Ae+uRxahSfNg/kx1Rnv0sUln1hgUHh
+VuiKqu1MlAIcckNt00Ck/v7LQV98KJJx+rWWPV1F09a6vPEAesEY+GnJQkwAzh/O
+xiTjAgMBAAGjggG0MIIBsDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
+FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFEnnIPu9e2M7ABKF66CA
+uTWv1Jf8MB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMCkGA1UdEQQi
+MCCBHnNlcnZlci1jZXJ0aWZpY2F0ZXNAcnpnLm1wZy5kZTB3BgNVHR8EcDBuMDWg
+M6Axhi9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA1oDOgMYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2Ny
+bC9jYWNybC5jcmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+PwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAxDSpJ7Mn2hmiyDzK
+VVtARi1U9EvfTcSIWZFanc1xn9DaFI8s3c6vnEB7+BL/HMbAwnDauWjUPoNzc5I2
+TeH5IjX8MGDjEh7TyNyycWRNJ88ah0LtQoaCgXc0vpTtXZzGelh0A25Hw80sHKa1
+xY4iDAPYwaPY+kFxxAGyeAL9M4q9Z39t6ZIoze+lQm0sxQ3eTvQUPwukAeI9xOzb
+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>
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
new file mode 100644
index 00000000..8fbfc5ee
--- /dev/null
+++ b/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-idp.xml
@@ -0,0 +1,95 @@
+<?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="2013-09-17T11:54: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>
+      <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
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw+bbvyxNRo4vqJ7KuunzG
+						mQUqIxIkPKIbcIMzLDy9qJPqAx+GkycAXUjAJZxQdaKBqWRaSqJfFU4rEmyJcFiR
+						yCh/7/KDylWQ+NKfgfbrzPc4EQ0mkCMt75Hi4dzpqs0FodlU/uzhlXCvyS0XG4d8
+						Xz8Sm9bDTnIzfuWF8k3jcFjMTXXrx6mm1fqnhtSYgC65ZvJi3WZySF1KjAcWfg4p
+						Kyep7d1wrNUpl9/f+mw+3snwogAwrfgMTcrE0HGszozeQLzpxF07BXCHcplGP/oq
+						tb4JuCs+yWfTRwjX3yGF7qQ0vUhz9Ujukn7c/kwloe1CVBnfDXre80rBMOx/lnsP
+						AgMBAAGjgYQwgYEwHQYDVR0OBBYEFJjIqPJ4q4nUpNIPB4J3EiQ2X/RqMFIGA1Ud
+						IwRLMEmAFJjIqPJ4q4nUpNIPB4J3EiQ2X/RqoSakJDAiMSAwHgYDVQQDExdpZHAu
+						c2hpYmJvbGV0aC5veC5hYy51a4IJAJ3Ublo6lbs7MAwGA1UdEwQFMAMBAf8wDQYJ
+						KoZIhvcNAQEFBQADggEBABGZFS4mtXb2vU13u6iDnT37ZhC+6M6b2dFtDNFVZQdC
+						ktfI3EvvmGuS56t26QaaR8rgfBv4dYpHiVXOj/p8+UPnJPC6HSFsnhHUsCdTaCh0
+						kw8+T4yKYQKBm7vkwItZv/wegtz1GPrcQMu8/xqaROu0SDnUn6UTiPY5Km0exKz7
+						H0oDt1HEdH/27sP4oo1Mfcj+7+n6caKbrnOH3hVNWbDJa0WIfiK03ciufpwGd3+V
+						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>
+						MIIDTDCCAjSgAwIBAgIJAJ3Ublo6lbs7MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF2lkcC5zaGliYm9sZXRoLm94LmFjLnVrMB4XDTE0MDEwOTE0MzkyNFoXDTM0
+						MDEwOTE0MzkyNFowIjEgMB4GA1UEAxMXaWRwLnNoaWJib2xldGgub3guYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw+bbvyxNRo4vqJ7KuunzG
+						mQUqIxIkPKIbcIMzLDy9qJPqAx+GkycAXUjAJZxQdaKBqWRaSqJfFU4rEmyJcFiR
+						yCh/7/KDylWQ+NKfgfbrzPc4EQ0mkCMt75Hi4dzpqs0FodlU/uzhlXCvyS0XG4d8
+						Xz8Sm9bDTnIzfuWF8k3jcFjMTXXrx6mm1fqnhtSYgC65ZvJi3WZySF1KjAcWfg4p
+						Kyep7d1wrNUpl9/f+mw+3snwogAwrfgMTcrE0HGszozeQLzpxF07BXCHcplGP/oq
+						tb4JuCs+yWfTRwjX3yGF7qQ0vUhz9Ujukn7c/kwloe1CVBnfDXre80rBMOx/lnsP
+						AgMBAAGjgYQwgYEwHQYDVR0OBBYEFJjIqPJ4q4nUpNIPB4J3EiQ2X/RqMFIGA1Ud
+						IwRLMEmAFJjIqPJ4q4nUpNIPB4J3EiQ2X/RqoSakJDAiMSAwHgYDVQQDExdpZHAu
+						c2hpYmJvbGV0aC5veC5hYy51a4IJAJ3Ublo6lbs7MAwGA1UdEwQFMAMBAf8wDQYJ
+						KoZIhvcNAQEFBQADggEBABGZFS4mtXb2vU13u6iDnT37ZhC+6M6b2dFtDNFVZQdC
+						ktfI3EvvmGuS56t26QaaR8rgfBv4dYpHiVXOj/p8+UPnJPC6HSFsnhHUsCdTaCh0
+						kw8+T4yKYQKBm7vkwItZv/wegtz1GPrcQMu8/xqaROu0SDnUn6UTiPY5Km0exKz7
+						H0oDt1HEdH/27sP4oo1Mfcj+7+n6caKbrnOH3hVNWbDJa0WIfiK03ciufpwGd3+V
+						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>
diff --git a/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-sp-ouls-ezproxy.xml b/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-sp-ouls-ezproxy.xml
new file mode 100644
index 00000000..e467a3a1
--- /dev/null
+++ b/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-sp-ouls-ezproxy.xml
@@ -0,0 +1,64 @@
+<?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/sp/ouls-ezproxy">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-06-24T15:16: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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFIDCCBAigAwIBAgIBBTANBgkqhkiG9w0BAQUFADCBwDEeMBwGA1UEAxMVZXpw
+						cm94eS5vdWxzLm94LmFjLnVrMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jk
+						c2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUQ2FjaGUgU2VhcmNoIFJl
+						c3VsdHMxGzAZBgNVBAsTEkJvZGxlaWFuIExpYnJhcmllczEuMCwGCSqGSIb3DQEJ
+						ARYfc2ltb24ubWNsZWlzaEBib2RsZWlhbi5veC5hYy51azAeFw0xNDA1MTkxNDM3
+						MzNaFw0yNDA1MTgxNDM3MzNaMIHAMR4wHAYDVQQDExVlenByb3h5Lm91bHMub3gu
+						YWMudWsxCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UE
+						BxMGT3hmb3JkMR0wGwYDVQQKExRDYWNoZSBTZWFyY2ggUmVzdWx0czEbMBkGA1UE
+						CxMSQm9kbGVpYW4gTGlicmFyaWVzMS4wLAYJKoZIhvcNAQkBFh9zaW1vbi5tY2xl
+						aXNoQGJvZGxlaWFuLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEApfyE0QKZIyAWjyeQX3u6j8VerSbSJedbx7Xpe9xeYKO+jofSaYCI4vER
+						EktCBcydO8Thbb4FG5+Dm3UbFvL3HaoJ1kwRCPe2s6DIjMkSQgOOmJXI8uv/Fo9+
+						WbeQMSBkh3eguj7UfUyYf6X0rEDthba26UgK2A961uxhjtjBiJxOvE2m9CmA/7lw
+						fNUQo/kVMj84Cx93CSXk4ErJOR+tkz9fLsXCmD+Df47b/pBHg/O26cs/LW8kmcsL
+						rS9+C9elxDuCjyxsmwufXUfxKfXrXDuWKm1ttTn8YS72JeF7WOvkTWqRfPZfsyT+
+						vJoSB7defi3ewxXEmQ63TR+YfI1u/wIDAQABo4IBITCCAR0wHQYDVR0OBBYEFPbM
+						9KZMKtal5T6yuLnxqwAh9B6xMIHtBgNVHSMEgeUwgeKAFPbM9KZMKtal5T6yuLnx
+						qwAh9B6xoYHGpIHDMIHAMR4wHAYDVQQDExVlenByb3h5Lm91bHMub3guYWMudWsx
+						CzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hm
+						b3JkMR0wGwYDVQQKExRDYWNoZSBTZWFyY2ggUmVzdWx0czEbMBkGA1UECxMSQm9k
+						bGVpYW4gTGlicmFyaWVzMS4wLAYJKoZIhvcNAQkBFh9zaW1vbi5tY2xlaXNoQGJv
+						ZGxlaWFuLm94LmFjLnVrggEFMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAA7f5WlR21SqJJ23OtP/Hxeo3jmmm5LRrjfdftTiXWrVQdGmj0znEEZK3feS
+						VOdJucmpuwUha9y7IwcJSW5cpNON1EgNAEFJBk3yVc/QJFBI1GP4cz+LeYuGQ78y
+						QWhC1dCTzrmkZ8GPgp01z3T/Fd/alcmPfi+jakFVNVBzo438HdGp83iYOT9ZZ3wS
+						7GvWeEI9pCF6+FLSVo7lAwCdKnUz+I2QwShkVM5qz1XTwBz5r+8hSIUkjYsHnzej
+						xSMRZgfeIDO98i9fIEp6Mv4OIj7bVMTNmC+VJoKpu/T2PjuD/KHWjPouvRmDz4nu
+						OpGViTGdF0S5kv2uRj4LZ+tfkm4=
+					</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://ezproxy.ouls.ox.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ezproxy.ouls.ox.ac.uk/Shibboleth.shire" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Oxford University: EZproxy Server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ouls.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Mcleish</md:SurName>
+    <md:EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Mcleish</md:SurName>
+    <md:EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</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
new file mode 100644
index 00000000..f7cb755b
--- /dev/null
+++ b/swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MDkwMDAwMDBaFw0xNzA0MDgyMzU5NTlaMEUxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXcmVtcy5lbGl4
+aXItZmlubGFuZC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDE
+PmEMb9faLtRJlg+4uDV6K9hy3F0rBS/qhD5Gx9+4r3XLUGif6nX+zwErh+nQCqNS
+tujxdFOGALGsM5j6EvUJUyAvgQkoPq/z4GiRymexQeJkg3mQlRJ8rC0eRNfmdMo6
+KwE14GC0Y3aEJnxYbnArBcR2xb5qYM4nXE/2k3Tm6gRHasj2fK2CxbROilD42Dmd
+fj+zPx1kl0qOAZCKfhGNf36nt5VT9Hf39Y0xEBIDKKclAhMm8F9kfy6iDW9wi7yb
+6cNqSgZhe3kJ0SSWidFJVkHbdlxEII5bqlDflEiabxpt1bZk3BCfB66IH+gPOsES
+2wQTIzxeBDn0b++Misf5joU1wP26vhWNV6ZTQWtAqKKg9fXTWyqGGNNGpAZDaO+K
+ObS/EucGN7eDHmvLVpaRIN7RZHHbcMR3Irb9GPb7ICApjcrDiugl3tyTlZiznkpW
+5oL5+yZgc7wBGIGLV7r4ZcGFljJ0hq6+TviclrE/0DQVbHe51iM7nAkRlEdVF9Uc
+sliaHiswU1dhul14qXTNGi4dPUIkFW47Hy050O4ZqK9Bx7/WDhqm//oWt7mmNeW9
+Q7or0YK6btf+8IzuuC7GcGzHI8vhB1aV74wiRoHeegDwVpID+k3iWsZpLHYviCz6
+Vm6D2XZGznbw31YBJJhEVT/zz0nTv+DFY84ezBmmBwIDAQABo4IBdDCCAXAwHwYD
+VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNKSOwZ7HEKk
+M5/M4lFidibAuVwcMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEB
+AgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYB
+BQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0
+MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAiBgNVHREE
+GzAZghdyZW1zLmVsaXhpci1maW5sYW5kLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
+SGEF/c7aUAjf57SVtsoZqNkrR8YwBEEu99mKvQlvT6qLdIjNdq4bOYsCIHS+MAmv
+nhJyuiMY+Q4FK+jUsX+Emltk7aii37PAMlHSCpgo7OGDK0c6gdg7FYBuWj20HA6n
+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>
diff --git a/swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c03a89d8
--- /dev/null
+++ b/swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://repo.nsms.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-28T13:41: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">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC/TCCAeWgAwIBAgIJAL0apyznrmFdMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnJlcG8ubnNtcy5veC5hYy51azAeFw0xNDA0MjUxMjU4MjNaFw0yNDA0MjIx
+						MjU4MjNaMB0xGzAZBgNVBAMTEnJlcG8ubnNtcy5veC5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBALZontMMY7ZVutHk9dU2b20uFGvoDoXIGTVY
+						zqXI5Z3QhWz8nZ0eWPoxRd8Bk8NhVvLc1yQ3PcFXWIe9YtdATvlQCdRjrWUvRmOt
+						FBfB4pKU2LVt1goVRZSr7r+EO0yW3clMtK2LJxzxmMYX1Bodx2HMDeDI856v6U1l
+						rK+NiGWx7rbj+NtgInQkIWTeHpEWuiWbbbPTikBUNlnqVOOebZAWxW53PNekENzS
+						8fvLAt9clhDvdh21raqlWXlMd3Uv3uxs3vQrvEVstT/K1Ba1zZay8Nu3kBmlWT39
+						KLKvlhA4d9RZ5RZCpSgHjA3J3x23cvv4Vr2XVJfN3fvtGpY89PECAwEAAaNAMD4w
+						HQYDVR0RBBYwFIIScmVwby5uc21zLm94LmFjLnVrMB0GA1UdDgQWBBRFVnTingt7
+						M2lVTnK1KceB7L0uVzANBgkqhkiG9w0BAQUFAAOCAQEAblejPTxWn4YhyqGHdrhc
+						ZpxaDshVRatbNS1SbDCgIxyq3xxVBnnEHdpClyPOpHUkndAzcggOI1e4IBDCuOW5
+						wG8kYaNHY+DMmbHzKn98lw81C+GuFdJOItu+PGModOO0YbpQOG9Nr9C/gj+zKpGn
+						GGAGaT7oqzWlIjvKrUB637afxa+2J5NqYIP6sC7n8HTToAjRSqsdS5UnKDiQPueJ
+						2LL/tGKw+ZPMBwQTAT/8JwWuLTAMCVmSA8jYeMs9ojVopgDZfhefsrbUDQQ2BJrF
+						UK2XQQ615BPS2VvrQ5yDpfPpT6W4IUf2fuTG6/tGecZWZMICz8HakAZtXnKKEs2q
+						AQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repo.nsms.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://repo.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repo.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repo.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oper.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oper.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oper.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oper.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - repo.nsms.ox.ac.uk</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</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 d6f444c4..01c28ff0 100644
--- a/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml
@@ -1,23 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://repos.ids-mannheim.de/shibboleth">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<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: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>
       <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>
-        <mdui:DisplayName xml:lang="en">Institute for the German Language (IDS) - Repository</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fi">Institute for the German Language (IDS) - Repository</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Language resources repository of the Institute for the German Language (IDS).</mdui:Description>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS) - Forschungsprimärdatenrepository</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institute for the German Language (IDS) - 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: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="fi">https://repos.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://repos.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <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
@@ -50,34 +61,38 @@ Qac7iOiqrpszdbdXFtIVuZBWaZpeeei/0ZHNEzByrEIqCsgwrMat5CkjURt7uBLw
 T4i6DwZIlHs/RRr1euCJszIc25Pco/JCHf+UCNaWmXi8tWbM+RbvP14lGpgMqtEU
 2JPXOJVaUapaUeeWCx2WNpjvZQ3l7KIm3Mzz80P9gL3oMEkFZYkSaNjAV2AQwNoH
 6DYCJd/I407y24ykEwvD8HQjyERNEDJFz2P5IyH4kmsIOwXNQEoOhSFt/cvvSplt
-PZjG46BQGsou6pJHmLhC/+tMXlY0jVRn6uQ4yFjtazWE24EYG+Q7dJ5yMw==</ds:X509Certificate>
+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:NameIDFormat>urn:oasis:names: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://repos.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Institute for the German Language (IDS) - Repository</md:ServiceName>
-      <md:ServiceName xml:lang="en">Institute for the German Language (IDS) - Repository</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Language resources repository of the Institute for the German Language (IDS).</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+    <md: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">Institut für Deutsche Sprache (IDS) - Forschungsprimärdatenrepository</md:ServiceName>
+      <md:ServiceName xml:lang="en">Institute for the German Language (IDS) - 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="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="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>
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
new file mode 100644
index 00000000..b95abb01
--- /dev/null
+++ b/swamid-interfederations-2.0/repository.abertay.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,77 @@
+<?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>
+      <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>
+						MIIC8TCCAdmgAwIBAgIJAMHx/2oqSbXWMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+						BAMTDmxhYy1yZXBvLWxpdmU5MB4XDTEyMTEyNzE0MjE1M1oXDTIyMTEyNTE0MjE1
+						M1owGTEXMBUGA1UEAxMObGFjLXJlcG8tbGl2ZTkwggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQDJ9vq9tg+S9T5/aGYg5Mfd2tm4NI3LcZZir3/hqJ5Bjq9F
+						vJ5gafvU85Np3kdUz0CJlitvg3D6fpfL3odhfJLZ/nalafXvyVbFHEqfUgjzRCwU
+						xyB0ExqofsExKpvXujLRFdn6mumYupp6otb/xvfGgW23f+2ZmS7Jv9zu9SwuU+Nr
+						eQhqUdVnyPYydisF5iMn12aFptn/2ZscTWWtrIL7MtLLTy7WV9Eq/m1D0FlbsNPN
+						F3LmeAbDM5etk4NmcFt9XCjs+J4i38PR5QrMB0RvhTXm8e+/z59pVmz76XrtXhmh
+						NBN3ToPLxS4I35XoUuUt5HRC5qazF8lbcW/Nn6apAgMBAAGjPDA6MBkGA1UdEQQS
+						MBCCDmxhYy1yZXBvLWxpdmU5MB0GA1UdDgQWBBTs+3Y7cFrCnQ+3Cfo4Ji5HdNsI
+						/zANBgkqhkiG9w0BAQUFAAOCAQEAArPWLF9YlItvEYMxgDYgwbEd0PNWYuUagNkb
+						iCxjaAFwSGj5Vuq6+XtuyQb8LtHRtm/jnqm9xVsbY8vUOvOZmrTnCZMkuK+Zcjv4
+						U0yiUxFjUVttOIoH+3GoYIWFHO3lHFCOFxslZF9Hg/sSMyTtEB0w5uqcdjDPsFjD
+						caMRH5TbGtBmGRK+F/VflLfSstl5y7jOP8jFdkj9a9Ul3RtUV07Y6yeu3gpTiLYY
+						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>
diff --git a/swamid-interfederations-2.0/repository.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/repository.jisc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..3de5ad77
--- /dev/null
+++ b/swamid-interfederations-2.0/repository.jisc.ac.uk-shibboleth.xml
@@ -0,0 +1,70 @@
+<?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>
+      <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>
+						MIIDDzCCAfegAwIBAgIJALWBNu60kA8RMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGGpyZXBsdjAxLmppc2MudWxjYy5hYy51azAeFw0xMjA3MDUxMzQ1NTlaFw0y
+						MjA3MDMxMzQ1NTlaMCMxITAfBgNVBAMTGGpyZXBsdjAxLmppc2MudWxjYy5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANMowFcUBw/JzuJmgKZj
+						FOomnF2WVKgHSx/o9t7qz1M2nFTDdPVyOoofneLhp2PMPfpOaymaM2wVby+bqn/Y
+						chnbZlG4+QwVP5sPl0DmlYu3PTnI/rsEpE1rZYVn0KAM9TR45wgE6LeA7PDuJd2J
+						y15bi7h3rXCuQRQ1aZ8tRHD1fjBf6KiLm9B4bguHwLGeDgDrkA/JdY1Xeh4XTVar
+						WHrnXdvY9V3vlN7uBNSd1O/eWNwE0pd0Y4a1ysf4BfNoYKjgH1AL8+7BSJDyTX2C
+						7KP6oHRSNyN1vNE3UXVSC7cYH0tFGzEim0U+y5iM2zUdtnK1+EhwgAo8brILd1As
+						8tECAwEAAaNGMEQwIwYDVR0RBBwwGoIYanJlcGx2MDEuamlzYy51bGNjLmFjLnVr
+						MB0GA1UdDgQWBBQ0t7spq60qClWktBGJSUPQIRVaxjANBgkqhkiG9w0BAQUFAAOC
+						AQEApE0apWehglMp9y1cB0UdhOyXmfTq5pZ2C0alGrlEbNVT0Em7F8grWUylhTe4
+						awNjE+xlABLi6tpG2KuMoHIhf1rrh5cdj/ghFupuhYM8f7I7lnXAGbJ4qHciHEyE
+						ocQQCWlh5ad/iAQttMmOoXhvDafSP/Qo+HQCLK6DuhWWCySMdMHOYuqnQeQTFsC/
+						XCvc3RmAP9XqWR/l5KW9IwdMXkrZRle9VYOjsx7BKKufVb5OTScl5B94AHrJvc4P
+						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>
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
new file mode 100644
index 00000000..df55597a
--- /dev/null
+++ b/swamid-interfederations-2.0/researchmonitor.euromonitor.com-web-oa-metadata.xml
@@ -0,0 +1,87 @@
+<?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>
+						MIID0DCCArigAwIBAgIJAKS7WQdSWYPPMA0GCSqGSIb3DQEBBQUAME4xIjAgBgNV
+						BAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxKDAmBgNVBAMTH3Jlc2VhcmNo
+						bW9uaXRvci5ldXJvbW9uaXRvci5jb20wHhcNMTMxMTA3MDYxNTUyWhcNMjMxMTA1
+						MDYxNTUyWjBOMSIwIAYDVQQKExlFdXJvbW9uaXRvciBJbnRlcm5hdGlvbmFsMSgw
+						JgYDVQQDEx9yZXNlYXJjaG1vbml0b3IuZXVyb21vbml0b3IuY29tMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx6hv8EMNT+GdE0vHgiy5tkCTZ7VEqS5L
+						vJLdan+dg7InlJviBBTcSzS2xpumpCS7qnsOkNxQ3e5CAeqZku5hG5C5EbaVQO3D
+						8UmtS8RyXAS74PoEKMAtg8vp0pXRIG3GjqYGX1qE6tSja/fPjLiVGbgj4z7sF3RY
+						zU4KgIXCYUuTYB7VuKYbodu8rwW9/gKTdkhkw+OvKWjXtUpE32QH6R9N4GVcbIN2
+						JlqqKRTsg+Xsa8vY09D2Z53aH7ONGLh/978PboQ6fjmmvZNZRFAs68333PGyAke0
+						TtAreI5whvZ/eLQ9c8HXSBgGQ6A4oifabhTecqL67c5K1xp+axxwlQIDAQABo4Gw
+						MIGtMB0GA1UdDgQWBBQCFXdeKCqBj/JyQg8QN7yLhzLIPzB+BgNVHSMEdzB1gBQC
+						FXdeKCqBj/JyQg8QN7yLhzLIP6FSpFAwTjEiMCAGA1UEChMZRXVyb21vbml0b3Ig
+						SW50ZXJuYXRpb25hbDEoMCYGA1UEAxMfcmVzZWFyY2htb25pdG9yLmV1cm9tb25p
+						dG9yLmNvbYIJAKS7WQdSWYPPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAMB/zTwkzS3z8AVTmS9I+DHzsxKDPDCfTPbdKcfylA6pPS+OVYLJDK2DvBaV
+						dvgbbK1nreCbds2RnLizdU9pkKyHPk0mNKmQSlozuKTfePtaYlxfIBU369tZIVgR
+						uAkdCT2/Y77ES7DV+qxiZXO7sCNPHWdiArpPTKzdFg3zX96SGxf6c0eXE8pplech
+						86ClSyVVW8ABVY4G7ljWArG7zF5Aa9Yi1YRrPI+VZM7gH0+HqmJLV2K5Ei6GNAG1
+						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>
+						MIID0DCCArigAwIBAgIJAKS7WQdSWYPPMA0GCSqGSIb3DQEBBQUAME4xIjAgBgNV
+						BAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxKDAmBgNVBAMTH3Jlc2VhcmNo
+						bW9uaXRvci5ldXJvbW9uaXRvci5jb20wHhcNMTMxMTA3MDYxNTUyWhcNMjMxMTA1
+						MDYxNTUyWjBOMSIwIAYDVQQKExlFdXJvbW9uaXRvciBJbnRlcm5hdGlvbmFsMSgw
+						JgYDVQQDEx9yZXNlYXJjaG1vbml0b3IuZXVyb21vbml0b3IuY29tMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx6hv8EMNT+GdE0vHgiy5tkCTZ7VEqS5L
+						vJLdan+dg7InlJviBBTcSzS2xpumpCS7qnsOkNxQ3e5CAeqZku5hG5C5EbaVQO3D
+						8UmtS8RyXAS74PoEKMAtg8vp0pXRIG3GjqYGX1qE6tSja/fPjLiVGbgj4z7sF3RY
+						zU4KgIXCYUuTYB7VuKYbodu8rwW9/gKTdkhkw+OvKWjXtUpE32QH6R9N4GVcbIN2
+						JlqqKRTsg+Xsa8vY09D2Z53aH7ONGLh/978PboQ6fjmmvZNZRFAs68333PGyAke0
+						TtAreI5whvZ/eLQ9c8HXSBgGQ6A4oifabhTecqL67c5K1xp+axxwlQIDAQABo4Gw
+						MIGtMB0GA1UdDgQWBBQCFXdeKCqBj/JyQg8QN7yLhzLIPzB+BgNVHSMEdzB1gBQC
+						FXdeKCqBj/JyQg8QN7yLhzLIP6FSpFAwTjEiMCAGA1UEChMZRXVyb21vbml0b3Ig
+						SW50ZXJuYXRpb25hbDEoMCYGA1UEAxMfcmVzZWFyY2htb25pdG9yLmV1cm9tb25p
+						dG9yLmNvbYIJAKS7WQdSWYPPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+						ggEBAMB/zTwkzS3z8AVTmS9I+DHzsxKDPDCfTPbdKcfylA6pPS+OVYLJDK2DvBaV
+						dvgbbK1nreCbds2RnLizdU9pkKyHPk0mNKmQSlozuKTfePtaYlxfIBU369tZIVgR
+						uAkdCT2/Y77ES7DV+qxiZXO7sCNPHWdiArpPTKzdFg3zX96SGxf6c0eXE8pplech
+						86ClSyVVW8ABVY4G7ljWArG7zF5Aa9Yi1YRrPI+VZM7gH0+HqmJLV2K5Ei6GNAG1
+						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>
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
new file mode 100644
index 00000000..25c6b9ae
--- /dev/null
+++ b/swamid-interfederations-2.0/researchtools.ncl.ac.uk-shibboleth-metadata.xml
@@ -0,0 +1,66 @@
+<?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>
+      <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>
+						MIIC6zCCAdOgAwIBAgIJAJn8r34tncaPMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+						BAMTDHJ1bW1hZ2UtbGl2ZTAeFw0xNDAzMDUxNTIyMTlaFw0yNDAzMDIxNTIyMTla
+						MBcxFTATBgNVBAMTDHJ1bW1hZ2UtbGl2ZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAJwmLl9WkTW0grIGK3+WIh0MErwFhiYXThAyK7IvAZjwoU5Wt1FJ
+						GP9RqrP95wIPmfSsWv8aCvqdmxX4YwOrN3u2DZ9o7H+zsnyslsD5kLd+JHy3+gX3
+						gxsslN+nPDaKabboFfpdxNgr6NZAl+jy5WVipYpVCgWuiyVAfCX/yEZDXIX3i1hc
+						mmVehlWYM/ZcQnqBl95CSIGtl8ESyJfgD2OVa1ObPqRlR9jOdAXxH5JjS1J2tU4l
+						fjArUueGycguxxH12DniYLkSdEK744o66hxEh0aVostcXX6k8PNhIiA5g5DykA5g
+						hp0u18B3XkllYKEvRAc/nF3gmTjwgCiW6ysCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+						cnVtbWFnZS1saXZlMB0GA1UdDgQWBBQtq+ijf01hdHfpDHVKyfWIjfRXrDANBgkq
+						hkiG9w0BAQUFAAOCAQEAMUdMSWRT+1ew6sHAmZXW6QO2u2iqEv0GwLXLs4jpRkg2
+						uh6uIG66nSb2otSPiSTqXOMPvo74u2k6VQ/t9MtsOrEtF9rbIdMaOEeK+1SamEgV
+						e5fa/SnTn3tj5EUu8DDwGuZ0a2jkfTDdt9aJ3O8ayWYl//ICYWf+9yTeZbn8vazR
+						fzTZQCjmCdN+vsrv/vw6nrhJ0eDyzUlGV1oSZBgOI/x935a+lpBdxrt8zkC+AmQU
+						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/iss/</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/rhc-fed.reaseheath.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/rhc-fed.reaseheath.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..268fdfb5
--- /dev/null
+++ b/swamid-interfederations-2.0/rhc-fed.reaseheath.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0: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>
+						MIIDSzCCAjOgAwIBAgIUNxasJULKbpMOpbItLjinO2pL3PAwDQYJKoZIhvcNAQEF
+						BQAwIzEhMB8GA1UEAxMYcmhjLWZlZC5yZWFzZWhlYXRoLmFjLnVrMB4XDTEwMDQy
+						ODEzMDIxNFoXDTMwMDQyODEzMDIxNFowIzEhMB8GA1UEAxMYcmhjLWZlZC5yZWFz
+						ZWhlYXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhA/C
+						TAyqXBbOxhdvH+rHx6/ndNIzjsXHkc9RNukt1Wh8AYmZemrlWKej49hkbEe7xmPy
+						FIv2O3mGcy7g6kk7nq2nxwhbTuQrphwrOzlZczUJ/tnGQ0wmptBxxPc0XNqYY91w
+						2u4x9sPwqr+6c++trui5yY19aTMsVFT8AvQUuiduRMk+AzbO2NRhPrZx/0u56S/y
+						ZDffhiOsiBvs4mDINtkpLg1y3XwaRIum/90MXmaM0dmSHiK/qF55IlgSjjI/HbTo
+						k7xtDx55GoafEsgIDy5QmXmg4YpIg8oGXhL5whv2T5t/KFJCYRMDB1GoRzozDfvF
+						nw96LUIj/sj8Z+nBCQIDAQABo3cwdTBUBgNVHREETTBLghhyaGMtZmVkLnJlYXNl
+						aGVhdGguYWMudWuGL2h0dHBzOi8vcmhjLWZlZC5yZWFzZWhlYXRoLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBT05rbZBV59vbt0pafOJPWkJYXOrjANBgkq
+						hkiG9w0BAQUFAAOCAQEAHQ9b3tuhB7XlnMA9Vr3o+bVHH8T9Q7bHKLhU33E+NfFv
+						tAxyHVWxRgr7bB9Djt3JIF4CxBrnMF1PKY07L/ux6cEE1KyMlO+vTtB1E7RNGzs0
+						gpML9g1Sgqc2WGzp7dUDmmthcqd4/oFQvkFbAIOCzK1fX7IVm6B5S0MVsi6D3C30
+						QFEbkeCExCPO53+3f4bvb+ghJLKr1Tn/ZnGTpxfRk9UXxlKdnmHgexUh9a2Zsgmu
+						sGCRQL/6FsO6cheIiAbrbecqriG0JKqdoOh6IZmmAmaqMhgoXpncCakdO4A8QU8t
+						S99oJ8PNcigPCSv5zllL+TqtWkASNW/9KxXCnZGDbA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rhc-fed.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://rhc-fed.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://rhc-fed.reaseheath.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rhc-fed.reaseheath.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rhc-fed.reaseheath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rhc-fed.reaseheath.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0: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>
+						MIIDSzCCAjOgAwIBAgIUNxasJULKbpMOpbItLjinO2pL3PAwDQYJKoZIhvcNAQEF
+						BQAwIzEhMB8GA1UEAxMYcmhjLWZlZC5yZWFzZWhlYXRoLmFjLnVrMB4XDTEwMDQy
+						ODEzMDIxNFoXDTMwMDQyODEzMDIxNFowIzEhMB8GA1UEAxMYcmhjLWZlZC5yZWFz
+						ZWhlYXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhA/C
+						TAyqXBbOxhdvH+rHx6/ndNIzjsXHkc9RNukt1Wh8AYmZemrlWKej49hkbEe7xmPy
+						FIv2O3mGcy7g6kk7nq2nxwhbTuQrphwrOzlZczUJ/tnGQ0wmptBxxPc0XNqYY91w
+						2u4x9sPwqr+6c++trui5yY19aTMsVFT8AvQUuiduRMk+AzbO2NRhPrZx/0u56S/y
+						ZDffhiOsiBvs4mDINtkpLg1y3XwaRIum/90MXmaM0dmSHiK/qF55IlgSjjI/HbTo
+						k7xtDx55GoafEsgIDy5QmXmg4YpIg8oGXhL5whv2T5t/KFJCYRMDB1GoRzozDfvF
+						nw96LUIj/sj8Z+nBCQIDAQABo3cwdTBUBgNVHREETTBLghhyaGMtZmVkLnJlYXNl
+						aGVhdGguYWMudWuGL2h0dHBzOi8vcmhjLWZlZC5yZWFzZWhlYXRoLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBT05rbZBV59vbt0pafOJPWkJYXOrjANBgkq
+						hkiG9w0BAQUFAAOCAQEAHQ9b3tuhB7XlnMA9Vr3o+bVHH8T9Q7bHKLhU33E+NfFv
+						tAxyHVWxRgr7bB9Djt3JIF4CxBrnMF1PKY07L/ux6cEE1KyMlO+vTtB1E7RNGzs0
+						gpML9g1Sgqc2WGzp7dUDmmthcqd4/oFQvkFbAIOCzK1fX7IVm6B5S0MVsi6D3C30
+						QFEbkeCExCPO53+3f4bvb+ghJLKr1Tn/ZnGTpxfRk9UXxlKdnmHgexUh9a2Zsgmu
+						sGCRQL/6FsO6cheIiAbrbecqriG0JKqdoOh6IZmmAmaqMhgoXpncCakdO4A8QU8t
+						S99oJ8PNcigPCSv5zllL+TqtWkASNW/9KxXCnZGDbA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rhc-fed.reaseheath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rhc-fed.reaseheath.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </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>Wardell</md:SurName>
+    <md:EmailAddress>mailto:oliverw@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
new file mode 100644
index 00000000..a0e14a5c
--- /dev/null
+++ b/swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis: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>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
+dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
+uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
+3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
+TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
+7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
+F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
+BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
+LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
+cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
+bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
+Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
+aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
+bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
+BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
+VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
+nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
+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>
diff --git a/swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..25601717
--- /dev/null
+++ b/swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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: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>
+					      MIIDHzCCAgegAwIBAgIUH3f/yFgC6fTl8d177PnqB8yGBfUwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNcmlnYWwuZW5wYy5mcjAeFw0xNDAzMDMwOTIwMTFaFw0z
+NDAzMDMwOTIwMTFaMBgxFjAUBgNVBAMTDXJpZ2FsLmVucGMuZnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1gDcOz8nWvGsuFucX+6kW5jtwJMMbDRR1
+gtOCqEiJGk1rgbQEDrUi30PQP67F4qnV/AsVuZqIY17YmTgDSIg/Fu+nkS4FoK5N
+RVWn24laimwKJuCKJHGe01aTsQl1rr+W0uFd2K7R7/dn2fDCHhdtfebNHEMYcE//
+ef6yaBnkUewNpRApFj3WMJtOaQSg68DY0DYLEJZwU/d7UVKeYUiTk7J+K0wWdVX8
+arjMUB4DvKo5s3hpatBpMj5SIdTRuWe4xAZqL/q+gSUZEHuaMRTg7frHlEFNK3vE
+sNGIKqvSmIvhsTW33NUStnl48WhsLI223phM7OCi2nQsI4Es7uqRAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDXJpZ2FsLmVucGMuZnKGJGh0dHBzOi8vcmlnYWwuZW5wYy5m
+ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUvu92pbXivK9Fs+FYMN/ImZAwVMIw
+DQYJKoZIhvcNAQEFBQADggEBAJaDtoqa/0UAA0ubCVxJB587RFFavytKS7WJlk5X
+BRPIWKG/bSw0NGmzwPy32o4ZKfdp7nTNjJk6qk6w0ZDDRNA9dQkMZamNyVJDMF5/
+QG0wbOzJn8UPu/6A+tB9LwGwB3nX+FbML9DdxBVli9njUoFvNh0Ni4o6U/HXvPeq
+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>
+					      MIIDHzCCAgegAwIBAgIUH3f/yFgC6fTl8d177PnqB8yGBfUwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNcmlnYWwuZW5wYy5mcjAeFw0xNDAzMDMwOTIwMTFaFw0z
+NDAzMDMwOTIwMTFaMBgxFjAUBgNVBAMTDXJpZ2FsLmVucGMuZnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1gDcOz8nWvGsuFucX+6kW5jtwJMMbDRR1
+gtOCqEiJGk1rgbQEDrUi30PQP67F4qnV/AsVuZqIY17YmTgDSIg/Fu+nkS4FoK5N
+RVWn24laimwKJuCKJHGe01aTsQl1rr+W0uFd2K7R7/dn2fDCHhdtfebNHEMYcE//
+ef6yaBnkUewNpRApFj3WMJtOaQSg68DY0DYLEJZwU/d7UVKeYUiTk7J+K0wWdVX8
+arjMUB4DvKo5s3hpatBpMj5SIdTRuWe4xAZqL/q+gSUZEHuaMRTg7frHlEFNK3vE
+sNGIKqvSmIvhsTW33NUStnl48WhsLI223phM7OCi2nQsI4Es7uqRAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDXJpZ2FsLmVucGMuZnKGJGh0dHBzOi8vcmlnYWwuZW5wYy5m
+ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUvu92pbXivK9Fs+FYMN/ImZAwVMIw
+DQYJKoZIhvcNAQEFBQADggEBAJaDtoqa/0UAA0ubCVxJB587RFFavytKS7WJlk5X
+BRPIWKG/bSw0NGmzwPy32o4ZKfdp7nTNjJk6qk6w0ZDDRNA9dQkMZamNyVJDMF5/
+QG0wbOzJn8UPu/6A+tB9LwGwB3nX+FbML9DdxBVli9njUoFvNh0Ni4o6U/HXvPeq
+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://unknown.site.com</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
new file mode 100644
index 00000000..b4d11b77
--- /dev/null
+++ b/swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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: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>
+      <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
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMDYxMDU2MTZaFw0xOTAzMDUx
+MDU2MTZaMIGBMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRYwFAYDVQQDEw1yaXIuZGFyaWFoLmV1MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyyqlVXHDU7q2tfzvU/H9hzwLJgQ2
+zL9lU7xuTatNw6xZf/ur1KzoVobA0Pi3v5Z112fgi9fz/zbniyJSk5aH+1aWv3hF
+cR1HPscdsh3vWD9XSCon/hHtwVJqJyUFNSXeNRQglvJh/KC2mxH9rx4ipzux7uM/
+jZf8pCIHKys7BxDb7Y3mhSesPg6ZX+LeLEDCEqQilyyXp+x/+4unmE4AiFDv3o4N
+/HO9eiu+9pujU/iuF4wh/xe0AMYr0TbuUZK/kNePYuYrexhkbXRJ07215WPVUFIa
+2MJ5s0RZyKY1Swcmk8A58jzP+Tuobb2OM7025qxccHtpS5oE/9ugTX3lwwIDAQAB
+o4ICQjCCAj4wOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGB
+rSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFPJVqHGmkxAqwrbD
+qS4U0CRl+hYCMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzrMBgGA1Ud
+EQQRMA+CDXJpci5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3Js
+LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdl
+bi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
+BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
+BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdl
+bi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NhY2VydC9jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBWY1r2RQTMoizuMgCy9rtmqgMT1UzZ
+t9CgpUi0mE5n3v84kKLIU//R70xxNwiWvdjXVCyfwSYYPXnIQZsWH+m5f4xz+h/j
+Kh/j8DjAqucHpK2i8RA7QwiPNF7mesX/HzqGrUKDXXkAGXfHBxv7Nia5k/0f7Dsj
+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>
diff --git a/swamid-interfederations-2.0/rja-idp.lanet.lv.xml b/swamid-interfederations-2.0/rja-idp.lanet.lv.xml
new file mode 100644
index 00000000..d44a4ea7
--- /dev/null
+++ b/swamid-interfederations-2.0/rja-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?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>
+      <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>
+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>
+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>
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
new file mode 100644
index 00000000..053d54c3
--- /dev/null
+++ b/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIIDmjCCAoICAQAwDQYJKoZIhvcNAQEFBQAwgZIxDDAKBgNVBAoTA0lGUzEMMAoG
+A1UECxMDRFRJMR8wHQYJKoZIhvcNAQkBFhBjb2ltckBpZnMuZWR1LmJyMQwwCgYD
+VQQHEwNBSlUxJTAjBgNVBAgTHElOU1RJVFVUTyBGRURFUkFMIERFIFNFUkdJUEUx
+CzAJBgNVBAYTAkJSMREwDwYDVQQDEwhybnAtY2FmZTAeFw0xNDExMTgxNzQ2MDNa
+Fw0xOTExMTcxNzQ2MDNaMIGSMQwwCgYDVQQKEwNJRlMxDDAKBgNVBAsTA0RUSTEf
+MB0GCSqGSIb3DQEJARYQY29pbXJAaWZzLmVkdS5icjEMMAoGA1UEBxMDQUpVMSUw
+IwYDVQQIExxJTlNUSVRVVE8gRkVERVJBTCBERSBTRVJHSVBFMQswCQYDVQQGEwJC
+UjERMA8GA1UEAxMIcm5wLWNhZmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDCM5DpvNNnNY/sEgNPlwTqln/1ErY5NIUFJpd8Z8nhF/Ycg2PHgyaRS5QG
+zg/ytuSPgQwNsqQrBDPVYTM2mPN4bqy3JCMsQ/wurwGY33HQihsq7gsys6sIS3E9
+OeGP2PVEFAAOGBK8/7re/MNkk3zWxVrGHz+jWHUj/XVuz5bEOq/LNmUYgdCKA4EF
+8Fmi22aL522xCT3Fox8ReTq817YxTq+5XLsQEAnOzwIIvOAmRjNZD33lcASWzSJp
+2YMsVKeFpHslgJJUT6a5lbgwH1VOX8VQRYSDGayNfBh63AphlRPbRJRcLG6bQmbx
+D/hfNk2K0FKD9IWxVIJ4O+jxTatlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAAXZ
+ggk3PPdDktXF9fuhLnPpctJpFydTZaJOtZyiTr/YRjRa563VN7ryU7cIN6L/0v9J
+VqW3/LVA5m3vxJn0JFoez65HTVlIgaELJbIw5deHZbYe07e0cQKfEcfuJwzh33YO
+3PyBLMg/gdxoK6cYW0oPM3fZ9p7ypRHyrH/FwJOiFKOKEVdDPI5TlmWJnw85aAEP
+0j+yWPYFmv5t3igK9Iu0WM927mw6gZ0Wk1g53us1aWqoMTjkJZpfI7yBXCsuYYbp
+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>
+      
+MIIDmjCCAoICAQAwDQYJKoZIhvcNAQEFBQAwgZIxDDAKBgNVBAoTA0lGUzEMMAoG
+A1UECxMDRFRJMR8wHQYJKoZIhvcNAQkBFhBjb2ltckBpZnMuZWR1LmJyMQwwCgYD
+VQQHEwNBSlUxJTAjBgNVBAgTHElOU1RJVFVUTyBGRURFUkFMIERFIFNFUkdJUEUx
+CzAJBgNVBAYTAkJSMREwDwYDVQQDEwhybnAtY2FmZTAeFw0xNDExMTgxNzQ2MDNa
+Fw0xOTExMTcxNzQ2MDNaMIGSMQwwCgYDVQQKEwNJRlMxDDAKBgNVBAsTA0RUSTEf
+MB0GCSqGSIb3DQEJARYQY29pbXJAaWZzLmVkdS5icjEMMAoGA1UEBxMDQUpVMSUw
+IwYDVQQIExxJTlNUSVRVVE8gRkVERVJBTCBERSBTRVJHSVBFMQswCQYDVQQGEwJC
+UjERMA8GA1UEAxMIcm5wLWNhZmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDCM5DpvNNnNY/sEgNPlwTqln/1ErY5NIUFJpd8Z8nhF/Ycg2PHgyaRS5QG
+zg/ytuSPgQwNsqQrBDPVYTM2mPN4bqy3JCMsQ/wurwGY33HQihsq7gsys6sIS3E9
+OeGP2PVEFAAOGBK8/7re/MNkk3zWxVrGHz+jWHUj/XVuz5bEOq/LNmUYgdCKA4EF
+8Fmi22aL522xCT3Fox8ReTq817YxTq+5XLsQEAnOzwIIvOAmRjNZD33lcASWzSJp
+2YMsVKeFpHslgJJUT6a5lbgwH1VOX8VQRYSDGayNfBh63AphlRPbRJRcLG6bQmbx
+D/hfNk2K0FKD9IWxVIJ4O+jxTatlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAAXZ
+ggk3PPdDktXF9fuhLnPpctJpFydTZaJOtZyiTr/YRjRa563VN7ryU7cIN6L/0v9J
+VqW3/LVA5m3vxJn0JFoez65HTVlIgaELJbIw5deHZbYe07e0cQKfEcfuJwzh33YO
+3PyBLMg/gdxoK6cYW0oPM3fZ9p7ypRHyrH/FwJOiFKOKEVdDPI5TlmWJnw85aAEP
+0j+yWPYFmv5t3igK9Iu0WM927mw6gZ0Wk1g53us1aWqoMTjkJZpfI7yBXCsuYYbp
+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>
diff --git a/swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml b/swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml
new file mode 100644
index 00000000..393df42d
--- /dev/null
+++ b/swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">impa.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca 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>
+    MIIDijCCAnICAQAwDQYJKoZIhvcNAQEFBQAwgYoxDTALBgNVBAoTBElNUEExDDAK
+BgNVBAsTA0NJTjEdMBsGCSqGSIb3DQEJARYObmV0YWRtQGltcGEuYnIxFzAVBgNV
+BAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkG
+A1UEBhMCQlIxDTALBgNVBAMTBHJvc3MwHhcNMTQwOTMwMTg0MjE1WhcNMTcwOTI5
+MTg0MjE1WjCBijENMAsGA1UEChMESU1QQTEMMAoGA1UECxMDQ0lOMR0wGwYJKoZI
+hvcNAQkBFg5uZXRhZG1AaW1wYS5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
+FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
+cm9zczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZqzra9igATlWYM
+nWpR0mCkXBwbB1mMRmr7vJF9A9ZfKeF4ztOmG+6YRmCLZk8rbd+mhp4bPJ504hL5
+rSjixTm2IXf9XJHcFIQKZLkq77ZquBcdeYKGjkkRqlyFv4YdptJEgViamXqyL9Oj
+U3lbO5I7QLL5l255KUdsiYRxlAAdXJGv+7tglOXkcSf3c7+M3bgM151LruzoHRqM
+x8i5m5PL0Ve8hvUvPiuaPUxKEDRzqgxTCcyeoFTbgXV/P6vt+/LaNNFQia8mrmVV
+2w0LwoLF1NkFbbrSfFuxiMpPCV7voI0F8BLAjHZgZYCgj+e490QfdUCUscVR5xZc
+SssOYGUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAQYIyUBaYYa+BI7KF3xLb2C6K
+J4PY4GkCxtWEYnaBZYRSsef85OgMT7r1F4finTBY3KfoCOt5Yti5TIkXtwxvoCTN
+nF68zBR55rLFO67LJWJ+B/aAazptn17X53wky+x7pdKASE54GcWhTxW9QEWVLaWD
+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>
+      
+MIIDijCCAnICAQAwDQYJKoZIhvcNAQEFBQAwgYoxDTALBgNVBAoTBElNUEExDDAK
+BgNVBAsTA0NJTjEdMBsGCSqGSIb3DQEJARYObmV0YWRtQGltcGEuYnIxFzAVBgNV
+BAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkG
+A1UEBhMCQlIxDTALBgNVBAMTBHJvc3MwHhcNMTQwOTMwMTg0MjE1WhcNMTcwOTI5
+MTg0MjE1WjCBijENMAsGA1UEChMESU1QQTEMMAoGA1UECxMDQ0lOMR0wGwYJKoZI
+hvcNAQkBFg5uZXRhZG1AaW1wYS5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
+FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
+cm9zczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZqzra9igATlWYM
+nWpR0mCkXBwbB1mMRmr7vJF9A9ZfKeF4ztOmG+6YRmCLZk8rbd+mhp4bPJ504hL5
+rSjixTm2IXf9XJHcFIQKZLkq77ZquBcdeYKGjkkRqlyFv4YdptJEgViamXqyL9Oj
+U3lbO5I7QLL5l255KUdsiYRxlAAdXJGv+7tglOXkcSf3c7+M3bgM151LruzoHRqM
+x8i5m5PL0Ve8hvUvPiuaPUxKEDRzqgxTCcyeoFTbgXV/P6vt+/LaNNFQia8mrmVV
+2w0LwoLF1NkFbbrSfFuxiMpPCV7voI0F8BLAjHZgZYCgj+e490QfdUCUscVR5xZc
+SssOYGUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAQYIyUBaYYa+BI7KF3xLb2C6K
+J4PY4GkCxtWEYnaBZYRSsef85OgMT7r1F4finTBY3KfoCOt5Yti5TIkXtwxvoCTN
+nF68zBR55rLFO67LJWJ+B/aAazptn17X53wky+x7pdKASE54GcWhTxW9QEWVLaWD
+xu2Y7bPNIthUtiW9wmbWB+4fY4LhTVhcuh+/4xaFx/MVoTRhf2tFS6hBFeaUcsWT
+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 - Associac Instituto Nacional de Matemaca Pura e Aplicada</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca 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
new file mode 100644
index 00000000..eb1bbf80
--- /dev/null
+++ b/swamid-interfederations-2.0/royalsocietypublishing.org-shibboleth.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <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 5c5d5cb3..dc3a0b94 100644
--- a/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml
+++ b/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://rr.funet.fi/attribute-test">
+<md: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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
         <mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
@@ -13,13 +23,9 @@
         <mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIFijCCBHKgAwIBAgIRAOpF8XtkiUr3wCQ16Yh9PYYwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
@@ -62,74 +68,74 @@ aUiD/5UIQRBIZKprBZPaQHh3M9a6FfXTAKWnwrePtRcite62ajmeGa3G0Ldh0TLO
       <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
       <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCategory"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCode"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="CountryOfResidence"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="description"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseMember"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseOffering"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgUnitDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="electronicIdentificationNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="facsimileTelephoneNumber"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonCreditUnits"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonECTS"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonEPPNTimeStamp"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonHomeCity"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonPrimaryStudyStart"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonProgram"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonSpecialisation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentCategory"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentStatus"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentUnion"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyStart"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyToEnd"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonTargetDegree"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePhone"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePostalAddress"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="initials"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="jpegPhoto"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="l"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="labeledURI"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="nationalIdentificationNumber"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Nickname"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="ou"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalCode"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postOfficeBox"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacDateOfBirth"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacGender"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacMotherTongue"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPlaceOfBirth"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="seeAlso"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="street"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="title"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userCertificate"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userPresenceID"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userStatus"/>
+      <md: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="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="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>
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
new file mode 100644
index 00000000..a955396d
--- /dev/null
+++ b/swamid-interfederations-2.0/rs.eqa.ggtest.com-AthensWeb-oa-metadata.xml
@@ -0,0 +1,75 @@
+<?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>
+						MIIC7TCCAdWgAwIBAgIEIjkEdjANBgkqhkiG9w0BAQsFADAnMRIwEAYDVQQKEwlh
+						dGhlbnMgc3AxETAPBgNVBAMTCGdhbGUuY29tMB4XDTEyMTIwNDIxMTYzN1oXDTIy
+						MTIwMjIxMTYzN1owJzESMBAGA1UEChMJYXRoZW5zIHNwMREwDwYDVQQDEwhnYWxl
+						LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJxQUhGXjG7xd51b
+						/rsCdpNcLqfT3pYo8YyuV3uzd5i/6eiI7adgcnJW/CgR+KhHBo2Ys0ViAxwzm2Mn
+						S4hYhp1SUQySVxEPv9E0QVAN2WDmUSRHxv9mDIYxlyxpWZnM6f7cufH9KFNXEwJB
+						HDB32LAt5QkxNUwPL+jy3aYEchp3Lxpd/C+yIeJYrTTO7Pr4rlIeNv9e9yH+WzQX
+						/e6gZvMJ0SXfleHdjaew8qMlqhQK/IIYDuCQ+q1aPDuDEPJI0xVjPd6vjF5NgVYC
+						BUwfWKWPBxRwOBJdG4XIlbcAKJLkUJeSMEQrQzg5LjtCg7+h3sQvHfDpyDhuNtDQ
+						/yp60sUCAwEAAaMhMB8wHQYDVR0OBBYEFCd8RyK1/NXJdOhfAWO07Jc3qrJCMA0G
+						CSqGSIb3DQEBCwUAA4IBAQAx32SYGWD9NXQlh8tcsYE6B0Yz75TdmD9TI5991fNY
+						EyI9e+lvuPp3K4L6FC8jGDDtwHCsdoC8BXl/eJzQ1nnQsZP/2GUroDDkHlwj2MF1
+						4J0n2nRSJtiHvWBiSX5filskbjLw2NibLK3p0UcA9uYA1HAR9gd0dHozBtisGXA4
+						aqB4rOHpFZjxV0CskNZhZPPnSgJtT5ryRxch2E9kIUGQ2qnHJkoOsqSNiolddahU
+						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>
+						MIIC7TCCAdWgAwIBAgIEIjkEdjANBgkqhkiG9w0BAQsFADAnMRIwEAYDVQQKEwlh
+						dGhlbnMgc3AxETAPBgNVBAMTCGdhbGUuY29tMB4XDTEyMTIwNDIxMTYzN1oXDTIy
+						MTIwMjIxMTYzN1owJzESMBAGA1UEChMJYXRoZW5zIHNwMREwDwYDVQQDEwhnYWxl
+						LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJxQUhGXjG7xd51b
+						/rsCdpNcLqfT3pYo8YyuV3uzd5i/6eiI7adgcnJW/CgR+KhHBo2Ys0ViAxwzm2Mn
+						S4hYhp1SUQySVxEPv9E0QVAN2WDmUSRHxv9mDIYxlyxpWZnM6f7cufH9KFNXEwJB
+						HDB32LAt5QkxNUwPL+jy3aYEchp3Lxpd/C+yIeJYrTTO7Pr4rlIeNv9e9yH+WzQX
+						/e6gZvMJ0SXfleHdjaew8qMlqhQK/IIYDuCQ+q1aPDuDEPJI0xVjPd6vjF5NgVYC
+						BUwfWKWPBxRwOBJdG4XIlbcAKJLkUJeSMEQrQzg5LjtCg7+h3sQvHfDpyDhuNtDQ
+						/yp60sUCAwEAAaMhMB8wHQYDVR0OBBYEFCd8RyK1/NXJdOhfAWO07Jc3qrJCMA0G
+						CSqGSIb3DQEBCwUAA4IBAQAx32SYGWD9NXQlh8tcsYE6B0Yz75TdmD9TI5991fNY
+						EyI9e+lvuPp3K4L6FC8jGDDtwHCsdoC8BXl/eJzQ1nnQsZP/2GUroDDkHlwj2MF1
+						4J0n2nRSJtiHvWBiSX5filskbjLw2NibLK3p0UcA9uYA1HAR9gd0dHozBtisGXA4
+						aqB4rOHpFZjxV0CskNZhZPPnSgJtT5ryRxch2E9kIUGQ2qnHJkoOsqSNiolddahU
+						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>
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
new file mode 100644
index 00000000..0e70342b
--- /dev/null
+++ b/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIEluc3RpdHV0
+byBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvMQ0wCwYDVQQLEwRER1RJMR8wHQYJKoZI
+hvcNAQkBFhBkZ3RpQGlmbXQuZWR1LmJyMQ8wDQYDVQQHEwZDdWlhYmExFDASBgNV
+BAgTC01hdG8gR3Jvc3NvMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMWcnRydmlyc2hp
+Yi5pZm10LmVkdS5icjAeFw0xNDA5MjMxNzU4MzVaFw0xNzA5MjIxNzU4MzVaMIGw
+MSkwJwYDVQQKEyBJbnN0aXR1dG8gRmVkZXJhbCBkZSBNYXRvIEdyb3NzbzENMAsG
+A1UECxMEREdUSTEfMB0GCSqGSIb3DQEJARYQZGd0aUBpZm10LmVkdS5icjEPMA0G
+A1UEBxMGQ3VpYWJhMRQwEgYDVQQIEwtNYXRvIEdyb3NzbzELMAkGA1UEBhMCQlIx
+HzAdBgNVBAMTFnJ0cnZpcnNoaWIuaWZtdC5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCydC4cBkxGYZFCNynLc//e8GiIClU8rwevPbd9onai
+aFM70fL+7y+rCLKcCYh1B8S1XvsG4LMXBaAQQKgG6/vgct0WAzaQinsZ+P38Ifnf
+ZETOWYbyqUjG35xNTlv64WHuhY2xFmAaokpqok9eEtBKymlGgzBQDcL51B6gO5Ey
+VY+ZWsf7gc2lg9kw5yNVW6lxr/XoSJ88qhemWSJK7T1nQl/Gvjvu/KF2xRJ1MBO+
++8k6mzMx0niR8DbkI1MLRxGoAn6kzjib4bOsDirM8b51DqjUXBA/a7txNr6BeG3b
+Po1+W8HyXcqDEbxu5Oe5BhQdiqVSGkAZlPdpGyBiQgKZAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAK0RWkmTRqTK6j69f82eBN4E0J6s38vgZAHD7aV2IuQLVPhbVXXR
+X5CHHt5DnOEB8kGPugglg6Tx+cfwIp5ovdmA85PqS3/QgXkStUzmHMj/bQbAC3h/
+FEjqRxV5Qh29RLcicW5QCb2aroYw7fmSlA7uRfx/JUqjKgcN14WvBLqs26nFTUiC
+9DwsvX1GAbzqE186+n2wFnL00+1L5WnbT3jY1Ciq0S3l1GMENbbCd7k5m0CIxe1Y
+u0x8OE6tr6gp+toHWJm1IFLU9l1+AnSL7ZouTfPETt3SCmQjXa/PxoZ8Fkp+W8T1
+tzoJ03xkyR4ziZpwCwxsiwogmXqIyFewAiw=
+            </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>
+      
+MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIEluc3RpdHV0
+byBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvMQ0wCwYDVQQLEwRER1RJMR8wHQYJKoZI
+hvcNAQkBFhBkZ3RpQGlmbXQuZWR1LmJyMQ8wDQYDVQQHEwZDdWlhYmExFDASBgNV
+BAgTC01hdG8gR3Jvc3NvMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMWcnRydmlyc2hp
+Yi5pZm10LmVkdS5icjAeFw0xNDA5MjMxNzU4MzVaFw0xNzA5MjIxNzU4MzVaMIGw
+MSkwJwYDVQQKEyBJbnN0aXR1dG8gRmVkZXJhbCBkZSBNYXRvIEdyb3NzbzENMAsG
+A1UECxMEREdUSTEfMB0GCSqGSIb3DQEJARYQZGd0aUBpZm10LmVkdS5icjEPMA0G
+A1UEBxMGQ3VpYWJhMRQwEgYDVQQIEwtNYXRvIEdyb3NzbzELMAkGA1UEBhMCQlIx
+HzAdBgNVBAMTFnJ0cnZpcnNoaWIuaWZtdC5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCydC4cBkxGYZFCNynLc//e8GiIClU8rwevPbd9onai
+aFM70fL+7y+rCLKcCYh1B8S1XvsG4LMXBaAQQKgG6/vgct0WAzaQinsZ+P38Ifnf
+ZETOWYbyqUjG35xNTlv64WHuhY2xFmAaokpqok9eEtBKymlGgzBQDcL51B6gO5Ey
+VY+ZWsf7gc2lg9kw5yNVW6lxr/XoSJ88qhemWSJK7T1nQl/Gvjvu/KF2xRJ1MBO+
++8k6mzMx0niR8DbkI1MLRxGoAn6kzjib4bOsDirM8b51DqjUXBA/a7txNr6BeG3b
+Po1+W8HyXcqDEbxu5Oe5BhQdiqVSGkAZlPdpGyBiQgKZAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAK0RWkmTRqTK6j69f82eBN4E0J6s38vgZAHD7aV2IuQLVPhbVXXR
+X5CHHt5DnOEB8kGPugglg6Tx+cfwIp5ovdmA85PqS3/QgXkStUzmHMj/bQbAC3h/
+FEjqRxV5Qh29RLcicW5QCb2aroYw7fmSlA7uRfx/JUqjKgcN14WvBLqs26nFTUiC
+9DwsvX1GAbzqE186+n2wFnL00+1L5WnbT3jY1Ciq0S3l1GMENbbCd7k5m0CIxe1Y
+u0x8OE6tr6gp+toHWJm1IFLU9l1+AnSL7ZouTfPETt3SCmQjXa/PxoZ8Fkp+W8T1
+tzoJ03xkyR4ziZpwCwxsiwogmXqIyFewAiw=
+                    
+            </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>lilian.goncalves@ifmt.edu.br</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
new file mode 100644
index 00000000..4fe72d60
--- /dev/null
+++ b/swamid-interfederations-2.0/rutcathens.rutc.ac.uk-oala-metadata.xml
@@ -0,0 +1,84 @@
+<?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>
+      <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>
+						MIIDuzCCAqOgAwIBAgIJAN1WsDggoMVvMA0GCSqGSIb3DQEBBQUAMEcxJTAjBgNV
+						BAoTHFJpY2htb25kIHVwb24gVGhhbWVzIENvbGxlZ2UxHjAcBgNVBAMTFXJ1dGNh
+						dGhlbnMucnV0Yy5hYy51azAeFw0xMDExMTExMTM0MTZaFw0yMDExMDgxMTM0MTZa
+						MEcxJTAjBgNVBAoTHFJpY2htb25kIHVwb24gVGhhbWVzIENvbGxlZ2UxHjAcBgNV
+						BAMTFXJ1dGNhdGhlbnMucnV0Yy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALqStCmUSU8IaQxOwt2Ou+wphpG1cqQYzY/17w8G0ftlzo5+mSJf
+						AoPIBYSKmqvJtAqPww4TSrePmQihLopDHHlj6FcFywWYMoGf0JDk/piGgNF/Clj6
+						mSXdu/VSuanx2uq5V512W+5A9clJqmBPIAZiglMaHcxDgR5cG7K75it3iSAX81wA
+						PX9+T0TbvLGvqVSeSqQ2UVy728uLF53I2eSYta24l99yrSnOziNVHCD6+b0l7t1K
+						OKrkuOLLSfuwTzxLeMlq67VOgymL1FrNWvWaySrh1NWWKAdND11Vgk7z4+hFbbfL
+						ersUW6JBGJUGysvTIFlrpnp81ibXAO28mTUCAwEAAaOBqTCBpjAdBgNVHQ4EFgQU
+						nUoRxGM/pC8cQmwmpxUhC8V8wikwdwYDVR0jBHAwboAUnUoRxGM/pC8cQmwmpxUh
+						C8V8wimhS6RJMEcxJTAjBgNVBAoTHFJpY2htb25kIHVwb24gVGhhbWVzIENvbGxl
+						Z2UxHjAcBgNVBAMTFXJ1dGNhdGhlbnMucnV0Yy5hYy51a4IJAN1WsDggoMVvMAwG
+						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKwWAWDeDlDvy8ROsFlboPkl
+						R0Kq4+4fYhf6/1ihswDC/81AsYtT+2+J7ddNt2mQ8ElBJIvPxFGo9nrfh0OAEQqE
+						/SFzabz7Co6EZrTjaq6w0Ga4SLGllKtDtHV/OgvNhNk0HdkHP4EHueq4KJl+ZWoS
+						k3F+XEpmVs7e8DSGPY2CQO1cKYqFZF/4mqs1dcmXWqK4FLU8xlR4urtwxPybYRd3
+						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>
+						MIIDuzCCAqOgAwIBAgIJAN1WsDggoMVvMA0GCSqGSIb3DQEBBQUAMEcxJTAjBgNV
+						BAoTHFJpY2htb25kIHVwb24gVGhhbWVzIENvbGxlZ2UxHjAcBgNVBAMTFXJ1dGNh
+						dGhlbnMucnV0Yy5hYy51azAeFw0xMDExMTExMTM0MTZaFw0yMDExMDgxMTM0MTZa
+						MEcxJTAjBgNVBAoTHFJpY2htb25kIHVwb24gVGhhbWVzIENvbGxlZ2UxHjAcBgNV
+						BAMTFXJ1dGNhdGhlbnMucnV0Yy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALqStCmUSU8IaQxOwt2Ou+wphpG1cqQYzY/17w8G0ftlzo5+mSJf
+						AoPIBYSKmqvJtAqPww4TSrePmQihLopDHHlj6FcFywWYMoGf0JDk/piGgNF/Clj6
+						mSXdu/VSuanx2uq5V512W+5A9clJqmBPIAZiglMaHcxDgR5cG7K75it3iSAX81wA
+						PX9+T0TbvLGvqVSeSqQ2UVy728uLF53I2eSYta24l99yrSnOziNVHCD6+b0l7t1K
+						OKrkuOLLSfuwTzxLeMlq67VOgymL1FrNWvWaySrh1NWWKAdND11Vgk7z4+hFbbfL
+						ersUW6JBGJUGysvTIFlrpnp81ibXAO28mTUCAwEAAaOBqTCBpjAdBgNVHQ4EFgQU
+						nUoRxGM/pC8cQmwmpxUhC8V8wikwdwYDVR0jBHAwboAUnUoRxGM/pC8cQmwmpxUh
+						C8V8wimhS6RJMEcxJTAjBgNVBAoTHFJpY2htb25kIHVwb24gVGhhbWVzIENvbGxl
+						Z2UxHjAcBgNVBAMTFXJ1dGNhdGhlbnMucnV0Yy5hYy51a4IJAN1WsDggoMVvMAwG
+						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKwWAWDeDlDvy8ROsFlboPkl
+						R0Kq4+4fYhf6/1ihswDC/81AsYtT+2+J7ddNt2mQ8ElBJIvPxFGo9nrfh0OAEQqE
+						/SFzabz7Co6EZrTjaq6w0Ga4SLGllKtDtHV/OgvNhNk0HdkHP4EHueq4KJl+ZWoS
+						k3F+XEpmVs7e8DSGPY2CQO1cKYqFZF/4mqs1dcmXWqK4FLU8xlR4urtwxPybYRd3
+						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>
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
new file mode 100644
index 00000000..d30a834b
--- /dev/null
+++ b/swamid-interfederations-2.0/sa-test.ted.is.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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>
+      <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>
+						MIIDAzCCAeugAwIBAgIJAPiFnX/AGXS/MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFHNhdC1zYS1hdDF0LmVkLmFjLnVrMB4XDTEzMDIyMjEyMDcyMFoXDTIzMDIy
+						MDEyMDcyMFowHzEdMBsGA1UEAxMUc2F0LXNhLWF0MXQuZWQuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZWzFApufviUmWOb4eZ/Rf/2U1+0at
+						EFW/52W/u2Iw9m//9VQ6Cmyd/mRwVLyA9czHl7kfMVcjotbhi4VHQwgN+HyNcZUW
+						bI7WaVCtHyQyzBOpMM4Wv7+i7qI3sdkXqmKKu6MCmr4k3rLiVObuGADn2INLZ48Y
+						xS1wg9mnJX8/2WtzjL3E6aW3ehXozsQ9PGD6zFMfnxpZcO+b5iHQ74opo8fcwajF
+						Xg9d9xo4sdUbxvNnUDrE7+GXm7LQUErwpKnz1rqQFrK3xwt3D1kWs9dqc0nx+0As
+						ghF3QkXLrUc99DmZAcYIhiwCd/KIqtqml3WkMvE8g6A1aK9A/Cdx9E7pAgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFHNhdC1zYS1hdDF0LmVkLmFjLnVrMB0GA1UdDgQWBBTD
+						M6QITNYO3b7WJKWqUPckzkpzzjANBgkqhkiG9w0BAQUFAAOCAQEAKo+YeiJkib22
+						EcMLNrtDi6ehAheTWZUT//zUfKYA7tcCbVaVlloDjcqkVciqFIt5z0eX/c7pXzR6
+						1ljp6Rv1NIrNu4qxS3PLlCP4WHiGwvQDvbvVnk3Y/iYkUcdnRKnGWQUDOmecK1Mb
+						q44Etl9/3KCm+Tq4VPDTfBYaAGk/GTR2AFdYm7rTcKhB3ngzRKkNU5hCLkeDgZPD
+						Cx/5AlRbCnfNhNDUrEv60WPdmwE21yV4R7tXWfuToTw/ubrc06yf+akxOPvd0y9m
+						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>
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
new file mode 100644
index 00000000..cf530762
--- /dev/null
+++ b/swamid-interfederations-2.0/sa1.nimr.mrc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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
+						BAsMAklUMRswGQYDVQQDDBJzYTEubmltci5tcmMuYWMudWsxJDAiBgkqhkiG9w0B
+						CQEWFXdpbnN5c0BuaW1yLm1yYy5hYy51azAeFw0xMzA0MTkwOTM2MzJaFw0yMzA0
+						MTcwOTM2MzJaMIG0MQswCQYDVQQGEwJHQjEPMA0GA1UECAwGTG9uZG9uMRIwEAYD
+						VQQHDAlNaWxsIEhpbGwxMDAuBgNVBAoMJ05hdGlvbmFsIEluc3RpdHV0ZSBmb3Ig
+						TWVkaWNhbCBSZXNlYXJjaDELMAkGA1UECwwCSVQxGzAZBgNVBAMMEnNhMS5uaW1y
+						Lm1yYy5hYy51azEkMCIGCSqGSIb3DQEJARYVd2luc3lzQG5pbXIubXJjLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyJBI4lShZ0LaFhcN4tSj
+						QYFj8uheICfLxpOIqS2MgbOsZHt6jVVs8z09yuUxbNW6C2TaY+5XtdL+QTouh6n/
+						VYfiPwHwonJ/atlbwjFL+TVzxxYXYE/BCaYxnbB3TXTVi0XkJUoFmnT98LWoxZ07
+						lAAG7Wj/oRFTZJYX4MdziRPD46wAm8IJrZ/CGdVvuGHy/TkD43sBxbvsbrNUxiy9
+						Q3Xq+4WMikIVIGu50NCh9H5t4JqTidcAJkBJWt/z86zGGMWjfQqZX+M4Va7aD7Uu
+						YWdvTVbdSlyaj9PnIiC0to/fTzOseRd/Rb9wp/NWMFjSli+FII4q8RMKFhzOHKkg
+						NwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBedlMtL3DYskkxf4i0fwhT72CHeQc4
+						puA2l9ThP8KXw5mU0y4qYdwPinntG02ni4u3bytgpI0cQ9pdvHX161BzLyr3e1dg
+						u1+4DMMereeOjlGu0YYifj1bxzTfOxJn19t4E8+T5d1BxfC50pw3YbZOcjgX5iSV
+						/o654wjFeFkG0N785HcoPL3so14RkvUXoAtCoMR9s0g0VrQzQC2ATeMoEMe23JCz
+						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>
+						MIID5jCCAs4CCQCynm0QUqUXRjANBgkqhkiG9w0BAQUFADCBtDELMAkGA1UEBhMC
+						R0IxDzANBgNVBAgMBkxvbmRvbjESMBAGA1UEBwwJTWlsbCBIaWxsMTAwLgYDVQQK
+						DCdOYXRpb25hbCBJbnN0aXR1dGUgZm9yIE1lZGljYWwgUmVzZWFyY2gxCzAJBgNV
+						BAsMAklUMRswGQYDVQQDDBJzYTEubmltci5tcmMuYWMudWsxJDAiBgkqhkiG9w0B
+						CQEWFXdpbnN5c0BuaW1yLm1yYy5hYy51azAeFw0xMzA0MTkwOTM2MzJaFw0yMzA0
+						MTcwOTM2MzJaMIG0MQswCQYDVQQGEwJHQjEPMA0GA1UECAwGTG9uZG9uMRIwEAYD
+						VQQHDAlNaWxsIEhpbGwxMDAuBgNVBAoMJ05hdGlvbmFsIEluc3RpdHV0ZSBmb3Ig
+						TWVkaWNhbCBSZXNlYXJjaDELMAkGA1UECwwCSVQxGzAZBgNVBAMMEnNhMS5uaW1y
+						Lm1yYy5hYy51azEkMCIGCSqGSIb3DQEJARYVd2luc3lzQG5pbXIubXJjLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyJBI4lShZ0LaFhcN4tSj
+						QYFj8uheICfLxpOIqS2MgbOsZHt6jVVs8z09yuUxbNW6C2TaY+5XtdL+QTouh6n/
+						VYfiPwHwonJ/atlbwjFL+TVzxxYXYE/BCaYxnbB3TXTVi0XkJUoFmnT98LWoxZ07
+						lAAG7Wj/oRFTZJYX4MdziRPD46wAm8IJrZ/CGdVvuGHy/TkD43sBxbvsbrNUxiy9
+						Q3Xq+4WMikIVIGu50NCh9H5t4JqTidcAJkBJWt/z86zGGMWjfQqZX+M4Va7aD7Uu
+						YWdvTVbdSlyaj9PnIiC0to/fTzOseRd/Rb9wp/NWMFjSli+FII4q8RMKFhzOHKkg
+						NwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBedlMtL3DYskkxf4i0fwhT72CHeQc4
+						puA2l9ThP8KXw5mU0y4qYdwPinntG02ni4u3bytgpI0cQ9pdvHX161BzLyr3e1dg
+						u1+4DMMereeOjlGu0YYifj1bxzTfOxJn19t4E8+T5d1BxfC50pw3YbZOcjgX5iSV
+						/o654wjFeFkG0N785HcoPL3so14RkvUXoAtCoMR9s0g0VrQzQC2ATeMoEMe23JCz
+						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>
diff --git a/swamid-interfederations-2.0/sabia.ipen.br-idp-shibboleth.xml b/swamid-interfederations-2.0/sabia.ipen.br-idp-shibboleth.xml
new file mode 100644
index 00000000..7b5a1ea3
--- /dev/null
+++ b/swamid-interfederations-2.0/sabia.ipen.br-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIEXDCCA0QCAQAwDQYJKoZIhvcNAQEFBQAwgfMxQzBBBgNVBAoTOklQRU4gLSBJ
+bnN0aXR1dG8gZGUgUGVzcXVpc2FzIEVuZXJnZXRpY2FzIGUgTnVjbGVhcmVzIC0g
+U1AxEzARBgNVBAsTCkJpYmxpb3RlY2ExHjAcBgkqhkiG9w0BCQEWD3N1cG9ydGVA
+aXBlbi5icjESMBAGA1UEBxMJU2FvIFBhdWxvMT4wPAYDVQQIEzVJUEVOIC0gSW5z
+dGl0dXRvIGRlIFBlc3F1aXNhcyBFbmVyZ2V0aWNhcyBlIE51Y2xlYXJlczELMAkG
+A1UEBhMCQlIxFjAUBgNVBAMTDXNhYmlhLmlwZW4uYnIwHhcNMTQxMDEzMTcwODAx
+WhcNMTcxMDEyMTcwODAxWjCB8zFDMEEGA1UEChM6SVBFTiAtIEluc3RpdHV0byBk
+ZSBQZXNxdWlzYXMgRW5lcmdldGljYXMgZSBOdWNsZWFyZXMgLSBTUDETMBEGA1UE
+CxMKQmlibGlvdGVjYTEeMBwGCSqGSIb3DQEJARYPc3Vwb3J0ZUBpcGVuLmJyMRIw
+EAYDVQQHEwlTYW8gUGF1bG8xPjA8BgNVBAgTNUlQRU4gLSBJbnN0aXR1dG8gZGUg
+UGVzcXVpc2FzIEVuZXJnZXRpY2FzIGUgTnVjbGVhcmVzMQswCQYDVQQGEwJCUjEW
+MBQGA1UEAxMNc2FiaWEuaXBlbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALrq5ZevUSQE7GS93A4oZ2SZKFdHq2elGjkqOPdjvsh/mk6KZ/OECO9j
+QGA3zk8wJVmUeVJSG0ZvnpF0s3iJZHDiv5R/m8G5V4GeQsP4fc4tv5gt3ZzjCCeT
+EVO55Y0v1mnFsDT4vGhsDgICf4U+21i5nqJVQom/w2mnfccwQAkCWjbJO5OAqVF5
+at5ecNAyNutcrs4LdsbmxJPGMWjkBSiVzk7THdWy6S7Gw9PKoX82BXMewgGD/6PS
+bj9bxGb+/8o8oBeEvALvp+Jc2Z5S5NlNatZqk4CW3CsB0HhADy2HXeopDhtegWJn
+KGKKSyS/xf1Hbrk2s22GZ9tD4VpXKYcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+r2qNXfEenoYjW7Tth+cwTNXSq1k/k3xAOSiaT7he6lNhUo/QksLNb0a725ccpDf/
+JsCBqky0xj0QxQMsvLOZ+ekrY3MzsTD/ysx0Q9f04iletyBHpcHtMPtGGwXTpmWg
+rhXZjzRuezHV7mv1FA6tAR6UgoQv2WQ4WR7Yb9p4ZVVLoaguyfkWNLzYmn9wpPm0
+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>
+      
+MIIEXDCCA0QCAQAwDQYJKoZIhvcNAQEFBQAwgfMxQzBBBgNVBAoTOklQRU4gLSBJ
+bnN0aXR1dG8gZGUgUGVzcXVpc2FzIEVuZXJnZXRpY2FzIGUgTnVjbGVhcmVzIC0g
+U1AxEzARBgNVBAsTCkJpYmxpb3RlY2ExHjAcBgkqhkiG9w0BCQEWD3N1cG9ydGVA
+aXBlbi5icjESMBAGA1UEBxMJU2FvIFBhdWxvMT4wPAYDVQQIEzVJUEVOIC0gSW5z
+dGl0dXRvIGRlIFBlc3F1aXNhcyBFbmVyZ2V0aWNhcyBlIE51Y2xlYXJlczELMAkG
+A1UEBhMCQlIxFjAUBgNVBAMTDXNhYmlhLmlwZW4uYnIwHhcNMTQxMDEzMTcwODAx
+WhcNMTcxMDEyMTcwODAxWjCB8zFDMEEGA1UEChM6SVBFTiAtIEluc3RpdHV0byBk
+ZSBQZXNxdWlzYXMgRW5lcmdldGljYXMgZSBOdWNsZWFyZXMgLSBTUDETMBEGA1UE
+CxMKQmlibGlvdGVjYTEeMBwGCSqGSIb3DQEJARYPc3Vwb3J0ZUBpcGVuLmJyMRIw
+EAYDVQQHEwlTYW8gUGF1bG8xPjA8BgNVBAgTNUlQRU4gLSBJbnN0aXR1dG8gZGUg
+UGVzcXVpc2FzIEVuZXJnZXRpY2FzIGUgTnVjbGVhcmVzMQswCQYDVQQGEwJCUjEW
+MBQGA1UEAxMNc2FiaWEuaXBlbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALrq5ZevUSQE7GS93A4oZ2SZKFdHq2elGjkqOPdjvsh/mk6KZ/OECO9j
+QGA3zk8wJVmUeVJSG0ZvnpF0s3iJZHDiv5R/m8G5V4GeQsP4fc4tv5gt3ZzjCCeT
+EVO55Y0v1mnFsDT4vGhsDgICf4U+21i5nqJVQom/w2mnfccwQAkCWjbJO5OAqVF5
+at5ecNAyNutcrs4LdsbmxJPGMWjkBSiVzk7THdWy6S7Gw9PKoX82BXMewgGD/6PS
+bj9bxGb+/8o8oBeEvALvp+Jc2Z5S5NlNatZqk4CW3CsB0HhADy2HXeopDhtegWJn
+KGKKSyS/xf1Hbrk2s22GZ9tD4VpXKYcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+r2qNXfEenoYjW7Tth+cwTNXSq1k/k3xAOSiaT7he6lNhUo/QksLNb0a725ccpDf/
+JsCBqky0xj0QxQMsvLOZ+ekrY3MzsTD/ysx0Q9f04iletyBHpcHtMPtGGwXTpmWg
+rhXZjzRuezHV7mv1FA6tAR6UgoQv2WQ4WR7Yb9p4ZVVLoaguyfkWNLzYmn9wpPm0
+fNUrS3qTDFop0W8sMweA+5AaaaV9dpi2vgB00MvdL7O4yhuNFrLBxSPQMjCeJq8E
+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>
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
new file mode 100644
index 00000000..122a6eb7
--- /dev/null
+++ b/swamid-interfederations-2.0/safe.epcc.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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>
+						MIIC/TCCAeWgAwIBAgIJAM6PYwal8Sr+MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnNhZmUuZXBjYy5lZC5hYy51azAeFw0xNDA2MTMxMjI1MjNaFw0yNDA2MTAx
+						MjI1MjNaMB0xGzAZBgNVBAMTEnNhZmUuZXBjYy5lZC5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBALyfMo6ccoUJQkWr8s+D+5Pumxqu2bpFc4V7
+						RbGGcmMLq5Nigv34AzDcdHSBejB0CbdtLd8rm7trjUx3kF50aZkU2cSYoPjl6qFq
+						+Y6FdfdGpSA7s2kRsqEyDB/BTXy8ePUgtFTmzgscI0zYtbeNNjqfoKEprtWys3+W
+						DMzHcWoc5ayCQiWzQMKxkuOaBynpaZeePBMHncmtqBOECU6xqVlhbN0C8SSqBHVf
+						/AZyaT9Re6F65v0Sstph+Hm1jBTj5zmCoszWiGpTIE392eFuU7UE6oKO2NbX1HGG
+						97+Wd1OyIxxSm6MgN1fni0n5gSEJdvfDUrllUvE1RI86kA0GXkUCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISc2FmZS5lcGNjLmVkLmFjLnVrMB0GA1UdDgQWBBQPSH7aENek
+						efLSP07GJnhd4Rz83jANBgkqhkiG9w0BAQUFAAOCAQEAWVuBgQop6+C6N61h/mbb
+						Ts2aW47rBqWb3e1SywL4QNlI6+ktCmycQmuuYxWi8kayicIk01LT8XMABRNRM/Tr
+						CmHYn2TXOnA7eWB2Cqb6dSQcKc/DuY43DWnrPNiqdWyyWkbHldf91sLBMERwjGam
+						tczJCAEP3dcXxAZQ/jY9wmFmq9hB5wK9N0VJyoR1Fk823uTGxynkdrp36JQ9ye2U
+						TbDGOMsMVIOoZaFZSBuZXWOuZZPBR9cZ3w9R2+H7PuQcpA0bbn5Zg5q8jO0EsVrY
+						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>
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
new file mode 100644
index 00000000..69b94d7e
--- /dev/null
+++ b/swamid-interfederations-2.0/saml-delegation.data.kit.edu-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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>
+      <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
+BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
+bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
+Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
+A1UEAxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTE0MDYw
+NjEzMzcxMVoXDTE3MDYwNTEzMzcxMVowgZExCzAJBgNVBAYTAkRFMRswGQYDVQQI
+ExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UE
+ChMhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MSUwIwYDVQQDExxz
+YW1sLWRlbGVnYXRpb24uZGF0YS5raXQuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAupIPmAT/4ExIS3CVsY4ZjH3rG7Y8LxZ5iDEDcMqRhUco9d+v
+4e10NaRwPQUk+E9QqwwleWMHoQtejG0gPuapL8IqDSOu7z9ms+hkXJ0hLDQqDrsT
+tvm30y9bMllkScGpcmy3OTom3iL+/FmhOyDzwyW/QAPbR7b+kBDdAHNoPjUHR75l
+bdn0ruWn7TU1NUIdWkma3IdlngRHUcRySkGYDoSPQZP0PekQCZYi3ndP+KTOHaA2
+9HkcO/fUXohy4HIwwernltSttVkI9vw+Ki31x31lbMtnGOA1mvdeCOFssxGWoQwj
+HHlUnOJnnwI59aFo9GrjDfFP5X/Gki7IjJ2EzQIDAQABo4ICMTCCAi0wOQYDVR0g
+BDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeB
+DAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
+AgYIKwYBBQUHAwEwHQYDVR0OBBYEFIXstfJIO0zEeHL1bQ82yMdGzg3sMB8GA1Ud
+IwQYMBaAFB90ZfSaHXr2MenfYRtzKw1t0DNJMDYGA1UdEQQvMC2CHHNhbWwtZGVs
+ZWdhdGlvbi5kYXRhLmtpdC5lZHWBDWhhcmR0QGtpdC5lZHUwdwYDVR0fBHAwbjA1
+oDOgMYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9raXQtY2EvcHViL2NybC9jYWNy
+bC5jcmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIHHBggrBgEFBQcBAQSBujCBtzAzBggrBgEFBQcwAYYnaHR0
+cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD8GCCsGAQUFBzAC
+hjNodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2tpdC1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAPTiFZNdF
+kBSlYR1zkgXDCEa5GTXN+/qoLAFMdzTXhJkX0hcjZ+XXB9jhFXtB5Pi0PiaPfzT5
+hAPIJwomSpmB8d5TX69e8MKWtAXcn8Rhk5bVUjcHUt9HcORq2srluD7/HfsittAk
+TCBn2gnlr4We33hQcPqeZQUqiOImbpySLYO2Gj/f/O5Us+IlFvBS15i2sLO4dbnL
+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: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: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
new file mode 100644
index 00000000..d0388d2c
--- /dev/null
+++ b/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml
@@ -0,0 +1,96 @@
+<?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>
+      <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>
+						MIIDRzCCAi+gAwIBAgIJAPW0ygzcXbqIMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MTAxNTE1MzQxMloX
+						DTE3MTAxNTE1MzQxMlowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
+						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC98MhL6OnVYsRP
+						WXeQsxSmCCKvfovv0fG9p7m0BmUe2ZIYYYgq/jM1A8mvnebREWRnJhTzpRMjvUNi
+						6hQE5poxBQk77MGzTbjNFVC4C8u0yvSrWqv5JxbsgBu+V9rRoOVaemlm3+LRpfqP
+						CBi0aeo1oImivuaaT5mnzBp6cNmT2CpiF/obM6r2m1GBquKUu533CnAks46gPTpP
+						zNufB0g9kIRq4FRE/Uk9Si1HkEfqOSKCMWwoOnM2KteZdh/Es87aOcvVAW+sS5Xg
+						kc8BGHA50reChQJMk1XwZa2dqVCT8V/0XzRBDTw5SzDayNE9k9dPxApkMotelhiC
+						Y6T4eZFRAgMBAAGjejB4MFcGA1UdEQRQME6CGnBzLXVpLXRlc3QucWFsYWIuZ2Vh
+						bnQubmV0hjBodHRwczovL3BzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0L3BlcmZz
+						b25hci11aS8wHQYDVR0OBBYEFLXYmn/M+mCCItbU6rYMlxHSZxqUMA0GCSqGSIb3
+						DQEBBQUAA4IBAQCKT4IkHvxOFluo5D/aNp+02GqjP0YY4dJFAuzfhBBq1XMkPyPV
+						lyiiPxy4aOeTPgslc44bZzyCgVGZ5REXi667pcs03fpRMu74VSnMknrq/rwt6D3A
+						/s/dLQia27XeAI8g3NWgIeJ/Gg3RHPUeRL7Eus0nc9KSOeX6+hXiHti3Gsbe72lb
+						an/pPnEB3tlAZCbeecFyBM4XdIddT7F7fJxAQKi/bqqGVWcRBXc9UmvbU/GvTfhe
+						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>
+						MIIDRzCCAi+gAwIBAgIJAPW0ygzcXbqIMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MTAxNTE1MzQxMloX
+						DTE3MTAxNTE1MzQxMlowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
+						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC98MhL6OnVYsRP
+						WXeQsxSmCCKvfovv0fG9p7m0BmUe2ZIYYYgq/jM1A8mvnebREWRnJhTzpRMjvUNi
+						6hQE5poxBQk77MGzTbjNFVC4C8u0yvSrWqv5JxbsgBu+V9rRoOVaemlm3+LRpfqP
+						CBi0aeo1oImivuaaT5mnzBp6cNmT2CpiF/obM6r2m1GBquKUu533CnAks46gPTpP
+						zNufB0g9kIRq4FRE/Uk9Si1HkEfqOSKCMWwoOnM2KteZdh/Es87aOcvVAW+sS5Xg
+						kc8BGHA50reChQJMk1XwZa2dqVCT8V/0XzRBDTw5SzDayNE9k9dPxApkMotelhiC
+						Y6T4eZFRAgMBAAGjejB4MFcGA1UdEQRQME6CGnBzLXVpLXRlc3QucWFsYWIuZ2Vh
+						bnQubmV0hjBodHRwczovL3BzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0L3BlcmZz
+						b25hci11aS8wHQYDVR0OBBYEFLXYmn/M+mCCItbU6rYMlxHSZxqUMA0GCSqGSIb3
+						DQEBBQUAA4IBAQCKT4IkHvxOFluo5D/aNp+02GqjP0YY4dJFAuzfhBBq1XMkPyPV
+						lyiiPxy4aOeTPgslc44bZzyCgVGZ5REXi667pcs03fpRMu74VSnMknrq/rwt6D3A
+						/s/dLQia27XeAI8g3NWgIeJ/Gg3RHPUeRL7Eus0nc9KSOeX6+hXiHti3Gsbe72lb
+						an/pPnEB3tlAZCbeecFyBM4XdIddT7F7fJxAQKi/bqqGVWcRBXc9UmvbU/GvTfhe
+						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">DANTE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>DANTE IT Support</md:Company>
+    <md:EmailAddress>mailto:DANTEITSupport@dante.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>DANTE IT</md:Company>
+    <md:EmailAddress>mailto:it@dante.net</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
new file mode 100644
index 00000000..ed084de1
--- /dev/null
+++ b/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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>
+						MIIDRjCCAi6gAwIBAgIJAJOr6D3n/9SDMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MDYxMDE3MTA0OFoX
+						DTE3MDYxMDE3MTA0OFowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
+						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6yykwlB/6E0us
+						mtnDv6wniXzry26DbtIv8I5Bn588caVmJmYgeDQSn5ED8riG9BJgYUcOuIZBANfL
+						IzpuKgl91Hr8fAnBJ9TgssX623YkoQ1LFoXul9mfW9FrwyZQSxp3FzyKg9mKLsXJ
+						eDXOi1VFfHUhYnlPrnc0auSNDnBZ9tcMYSY9Q3xNDCsIsg2Mlqqp2p9l99oxMHIi
+						tFT0SXvjDYP+pBiVBfaXDHRPKlTdBeO1HR7TZLpjEA7gPKmNXTTK/wNMP/al9MOw
+						K/93kvcQePV3mb1JugDF9yuZIJOzAAdxXSb5vS9ijRg1MOW6O2XtxyCGGr7rrf09
+						sCpO1kR5AgMBAAGjeTB3MFYGA1UdEQRPME2CGnBzLXVpLXRlc3QucWFsYWIuZ2Vh
+						bnQubmV0hi9odHRwczovL3BzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0L3BlcmZz
+						b25hci11aTAdBgNVHQ4EFgQUfw6mrDLe+r53jDsgfKCkYTxXAnYwDQYJKoZIhvcN
+						AQEFBQADggEBAFqcGCSPmdl+S/e4GRWSNVEfe9XEf7z/YKMe6j8fnOTpO6WPFOZX
+						bTYctAUCwoefVBj9aKb17kotmg4jPL8SABR9zk24D4pudXUmlTTPeJDZyC6TVIyL
+						jOTIpR3K6nGXu644BjE0ofUv0BJV/kTepdbjKXD1NJRSJQIdEbGZcQMKhdBk+5+y
+						WPSLKAT9q9ZQLPCammS1mXbwWe3yhLt5vkVfmimQd9C7zuFwVmW/MBiEFcsEbArb
+						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>
+						MIIDRjCCAi6gAwIBAgIJAJOr6D3n/9SDMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MDYxMDE3MTA0OFoX
+						DTE3MDYxMDE3MTA0OFowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
+						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6yykwlB/6E0us
+						mtnDv6wniXzry26DbtIv8I5Bn588caVmJmYgeDQSn5ED8riG9BJgYUcOuIZBANfL
+						IzpuKgl91Hr8fAnBJ9TgssX623YkoQ1LFoXul9mfW9FrwyZQSxp3FzyKg9mKLsXJ
+						eDXOi1VFfHUhYnlPrnc0auSNDnBZ9tcMYSY9Q3xNDCsIsg2Mlqqp2p9l99oxMHIi
+						tFT0SXvjDYP+pBiVBfaXDHRPKlTdBeO1HR7TZLpjEA7gPKmNXTTK/wNMP/al9MOw
+						K/93kvcQePV3mb1JugDF9yuZIJOzAAdxXSb5vS9ijRg1MOW6O2XtxyCGGr7rrf09
+						sCpO1kR5AgMBAAGjeTB3MFYGA1UdEQRPME2CGnBzLXVpLXRlc3QucWFsYWIuZ2Vh
+						bnQubmV0hi9odHRwczovL3BzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0L3BlcmZz
+						b25hci11aTAdBgNVHQ4EFgQUfw6mrDLe+r53jDsgfKCkYTxXAnYwDQYJKoZIhvcN
+						AQEFBQADggEBAFqcGCSPmdl+S/e4GRWSNVEfe9XEf7z/YKMe6j8fnOTpO6WPFOZX
+						bTYctAUCwoefVBj9aKb17kotmg4jPL8SABR9zk24D4pudXUmlTTPeJDZyC6TVIyL
+						jOTIpR3K6nGXu644BjE0ofUv0BJV/kTepdbjKXD1NJRSJQIdEbGZcQMKhdBk+5+y
+						WPSLKAT9q9ZQLPCammS1mXbwWe3yhLt5vkVfmimQd9C7zuFwVmW/MBiEFcsEbArb
+						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">DANTE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>DANTE IT Support</md:GivenName>
+    <md:EmailAddress>mailto:DANTEITSupport@dante.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>DANTE IT</md:GivenName>
+    <md:EmailAddress>mailto:it@dante.net</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
new file mode 100644
index 00000000..4ad81212
--- /dev/null
+++ b/swamid-interfederations-2.0/saml.sys.kth.se-idp-shibboleth.xml
@@ -0,0 +1,148 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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
+BQUAMBwxGjAYBgNVBAMTEXNhbWwtMi5zeXMua3RoLnNlMB4XDTE0MDMyNDEyNDE1
+OFoXDTM0MDMyNDEyNDE1OFowHDEaMBgGA1UEAxMRc2FtbC0yLnN5cy5rdGguc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCBH0+OjrfAPCqpnnbg/DWA
+xeYXkv8kKpi2qR5cF6O4mA38n7bYwogiu8dfX96D+PoJeXIT7JTlDLCCdzEsGwUK
+vPqpTpVD2RcOSfZY/yU6CK2dv5LdRqoB1iCZDg1hkvBpDpchSIJjw4CQrQxrTpJO
+XY2FE9E2UnaskX3UJ0mnpBicRQ6aARbPJtwbvMTPynDlI+TZVxnpQ71mn6+VVIgE
+mUBzZZy2S8DR7ihY8IioceEXnn8Pj072fbrYAbZcZPIfKiDJwx0A77rp2mAMKPRS
+tP3Z6xAaOEzwZQmXCS+evNMfyHEIPoj1sug5xDBqQx7RDFYVo6oxXEJ9f+z1evKz
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNhbWwtMi5zeXMua3RoLnNlhihodHRwczov
+L3NhbWwtMi5zeXMua3RoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRplyH7
+GQb3f40/3+jtNHO+xRON1jANBgkqhkiG9w0BAQUFAAOCAQEAIIHu+ayuE6ydI1pE
+F9Vx6Z3MGI8exqT5j8Zw/6IrURTGWbkRMcW/7loquuv6A62R7ZZzd6/ghZuh43vI
+j7VGLrmH/frz5+HvU1PRbpV0u8dkjfOvzAlXxE4qB2nXd+rWzVX5ZugoPtl+iMeV
+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
+BQUAMBwxGjAYBgNVBAMTEXNhbWwtMi5zeXMua3RoLnNlMB4XDTE0MDMyNDEyNDE1
+OFoXDTM0MDMyNDEyNDE1OFowHDEaMBgGA1UEAxMRc2FtbC0yLnN5cy5rdGguc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCBH0+OjrfAPCqpnnbg/DWA
+xeYXkv8kKpi2qR5cF6O4mA38n7bYwogiu8dfX96D+PoJeXIT7JTlDLCCdzEsGwUK
+vPqpTpVD2RcOSfZY/yU6CK2dv5LdRqoB1iCZDg1hkvBpDpchSIJjw4CQrQxrTpJO
+XY2FE9E2UnaskX3UJ0mnpBicRQ6aARbPJtwbvMTPynDlI+TZVxnpQ71mn6+VVIgE
+mUBzZZy2S8DR7ihY8IioceEXnn8Pj072fbrYAbZcZPIfKiDJwx0A77rp2mAMKPRS
+tP3Z6xAaOEzwZQmXCS+evNMfyHEIPoj1sug5xDBqQx7RDFYVo6oxXEJ9f+z1evKz
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNhbWwtMi5zeXMua3RoLnNlhihodHRwczov
+L3NhbWwtMi5zeXMua3RoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRplyH7
+GQb3f40/3+jtNHO+xRON1jANBgkqhkiG9w0BAQUFAAOCAQEAIIHu+ayuE6ydI1pE
+F9Vx6Z3MGI8exqT5j8Zw/6IrURTGWbkRMcW/7loquuv6A62R7ZZzd6/ghZuh43vI
+j7VGLrmH/frz5+HvU1PRbpV0u8dkjfOvzAlXxE4qB2nXd+rWzVX5ZugoPtl+iMeV
+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>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>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>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/samlviewer.cf.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/samlviewer.cf.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..03180798
--- /dev/null
+++ b/swamid-interfederations-2.0/samlviewer.cf.ac.uk-shibboleth.xml
@@ -0,0 +1,149 @@
+<?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>
+      <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>
+						MIIDADCCAeigAwIBAgIJAItfjPqmm9zNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE3NhbWx2aWV3ZXIuY2YuYWMudWswHhcNMTIwNTEyMTI0ODUzWhcNMjIwNTEw
+						MTI0ODUzWjAeMRwwGgYDVQQDExNzYW1sdmlld2VyLmNmLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA41cEtiZIZyvzKrakm60sIuweLpKd4xDx
+						vINqrj2C0zh8Gd9OeTElNSsHvJIKMezm1CnTBvWcd0F0tK9Mz0DADQLwcDVG+KuU
+						yNHAMp94uTCKz5eqCLLl7M+A0fX7E1DugtnqI8qClpOxs3D7WJijKfy6yUz0q2ac
+						a5uXGueKC47EHUrU1TsavzpQjNSAMC4L2J7dS4HAIt36T7Lo61+HRrdDC2Jh0fVq
+						MC9a+Qt2C5pusWHv9zi4YXTicoAhByZ/Trz/ijU+LhZpQ3m3hpKDx6SEgCnHTSRk
+						/d8cDFr0Npa7njU7mKYq8ago2/nBMZCBiguWSLwr9c6L+SaEDqcaVQIDAQABo0Ew
+						PzAeBgNVHREEFzAVghNzYW1sdmlld2VyLmNmLmFjLnVrMB0GA1UdDgQWBBSDis4a
+						NupQl7nNT9JwJ5E2m0HmczANBgkqhkiG9w0BAQUFAAOCAQEAd4fBqInXGnQ7Kdf8
+						yqdauBjEjVJASJ6N9GB86tBXbtVM0+iIJvDOmpLW6s2Ovq+/DkXvroDAUu/G7Rre
+						ZSxpgN5oz6XwSiMDxeJGPgSF35/c/Q5A/fKiq4b/mKWllUVhX9UqRa5LiJbllmdq
+						BIVHSoP90oksNnRHSsBbQXvqaoVZgFNgCDX6c/NYmX+CwQB4vMnSKTWN0EoCcZI+
+						uZB7Oj929YrcQ17FRcBp7KLu6jPQEqUpqiwmRTy1KEvUT48h33zw+6dfgnmlqvpA
+						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">
+				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>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:smith@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:smith@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
new file mode 100644
index 00000000..127e3142
--- /dev/null
+++ b/swamid-interfederations-2.0/sandbox-eu.alma.exlibrisgroup.com-mng-login.xml
@@ -0,0 +1,59 @@
+<?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>
+						MIIEUDCCArigAwIBAgIEUWQ+bzANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJJ
+						TDESMBAGA1UECBMJSmVydXNhbGVtMRIwEAYDVQQHEwlKZXJ1c2FsZW0xETAPBgNV
+						BAoTCEV4bGlicmlzMQ0wCwYDVQQLEwRBbG1hMREwDwYDVQQDEwhTQU1MIEpLUzAe
+						Fw0xMzA0MDkxNjE0MzlaFw0yMzA0MDcxNjE0MzlaMGoxCzAJBgNVBAYTAklMMRIw
+						EAYDVQQIEwlKZXJ1c2FsZW0xEjAQBgNVBAcTCUplcnVzYWxlbTERMA8GA1UEChMI
+						RXhsaWJyaXMxDTALBgNVBAsTBEFsbWExETAPBgNVBAMTCFNBTUwgSktTMIIBojAN
+						BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAkZEP11/7z1BnlfvByEfwmvkEeWdS
+						4h0500whQeaSyLAeIQLnBvv0AL+yrnHUCQhdXtuKcB2KP1hHkORujT/AoyX5KaV6
+						iO+afUWdMfePg6nHRXhg/Efpkg4pzq1suDRNlY36nloFU39LHMTDOm6fc6cli5/h
+						v0mSgEI3rwTQRYKxe3gt7Yx2HCnyehxdEMYxxLgTUst+fnDvlJ8XSeLcIgwMe8S6
+						5tDQJDxCSumDG9gLv4mHIeIWKbAaX3boeDKXM0cj7k1MA0ppDjXZiYeTeM11c3A9
+						YNHnosQPN03vKl2Z38Qtg5wBJfGKxbI9mmO517iLpZWw0ppnW0VuxOuzUoIRRgM8
+						H9Ic4MdrHrOBpdkjTdiC5P6Dy9CvPsKAf53L2olwlWtv0fAljQ1Zd7tABvUjzOHD
+						I+oGLmP5JKt42Pr1xQtA3HEm6Gdi7CMclBAFqOb//xt9fmCh6o8Elxr4p70qU48S
+						hZAXj5G1oykPWWL0Z9/Jf106wQ4fK5ePxhapAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+						ggGBAIfkCOJbJuchcJJOQVa1Ryw6T5MDdOS81uZW8MyFRlBI9bB0CfcM0BcddzFs
+						WAGslqQra8XWpTQXUrkyY+Uqt5pM1fIupPciVoeCJcK899u+5RM5D6gP5HpC/yc3
+						IKyHg91SiGq3nUynaMsRUgGPHZ5rjsXoFg+wYbfT6fDcO+ca4y8OI/mrGczTRjWb
+						WWDkVX4RzUZgk8DqwTMytfOdUzhml7qKfdoJyP7+ScfhEkwri1ZinIJ+Drn7lQdw
+						xCofIkXeJ/2llGWekavHYf+wCINX2m7zrsl7u0pBdbvOrqB54xJ9Jd03tKlyFs7k
+						87lAj02qwCOxkOQ1PmbzjBji8NOq05yfUEHzKG/l3mPfj25HTLqLQ8M8Qs87S/H/
+						2lA7QhxVaWc0V7kPWo1yIE0KYVnXbHy4Hw2on+dcwH7wPLItCneryp8rM1WRSE+X
+						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>
diff --git a/swamid-interfederations-2.0/sant-ssp.sant.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sant-ssp.sant.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..ea817275
--- /dev/null
+++ b/swamid-interfederations-2.0/sant-ssp.sant.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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://sant-ssp.sant.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-08T17:02: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sant-ssp.sant.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>
+						MIIDCTCCAfGgAwIBAgIJAMhwD42RejeVMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnNhbnQtc3NwLnNhbnQub3guYWMudWswHhcNMTMwNTA2MTM0MzQ5WhcNMjMw
+						NTA0MTM0MzQ5WjAhMR8wHQYDVQQDExZzYW50LXNzcC5zYW50Lm94LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTP5u2MTtwDgk9nE/YOMLyBq
+						kdM0PgaJ7CsZmtf3kynVVet2TCudVGbDPzz0ucLUGvEf5gFtJSmKNtBHS2dpECN3
+						v/tQyeCiaDxVvlpgAMquKStWxPP6/jRS0jk+QtIEzNlMqD9QQ1Y6GZB1hTK9uAXM
+						CtwYZkiwQlDFtygxQO6IMmYidVNmSGGX8WPmwKypijBwpPtLoEA5r2vj6yDZ6d/S
+						0+4w4oaXHIYJ/7i6K/L15gXeN0UG8Cf8eOrU2VKGfdWtJF1TbLlBEiMdfLMDfe5W
+						Q4xRldVXO7rvdHMSkIUw2+qehAzFYRdGOBH5OMZak699Oqcx3qLfRQP7LMgPtwID
+						AQABo0QwQjAhBgNVHREEGjAYghZzYW50LXNzcC5zYW50Lm94LmFjLnVrMB0GA1Ud
+						DgQWBBRmXuxwJcoRmVF9892XQF5+JbXQ/jANBgkqhkiG9w0BAQUFAAOCAQEAbcG6
+						cPqRKjU4ErmifQX4WGhI7VI1cef4Un1kKDSHVj7/ons5ZSUqbHFwnM9m2NRsrRGI
+						WchHAYkVnChDsRPIGrNURK1AqOE2xEo/1C2TeKWZF1wWs+xpPguU5IJO+/esIdwn
+						JtrLlTDk3mlB3bfF2ztvoAHN3UBy+WEfIw/eXdKFEyGQzR2OAAZuKIEOJ3WY3UGR
+						bq0VNxsBVKEJFDN4/AdTPVFyhsDEHYyrQ+z/oiZqsif3QjM7vB8AUXcqUDMNKnpt
+						S/rurkWwA1QuSeIejchaeEijndoSyqUMeTq7IPVoiZ/yUj9fFoh7dNt0uj9E0paJ
+						5gefI6a4f/mL0eFXGQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">St Antony's College Shibboleth SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sant.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>St Antony's College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@sant.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Christopher</md:GivenName>
+    <md:SurName>Hoskin</md:SurName>
+    <md:EmailAddress>mailto:it-manager@sant.ox.ac.uk</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
new file mode 100644
index 00000000..70167b93
--- /dev/null
+++ b/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br-idp-shibboleth.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxLDAqBgNVBAoTI0lGQmFpYW5v
+IC0gSW5zdGl0dXRvIEZlZGVyYWwgQmFpYW5vMQ0wCwYDVQQLEwRER1RJMSQwIgYJ
+KoZIhvcNAQkBFhVjb3RlY0BpZmJhaWFuby5lZHUuYnIxETAPBgNVBAcTCFNhbHZh
+ZG9yMQ4wDAYDVQQIEwVCYWhpYTELMAkGA1UEBhMCQlIxITAfBgNVBAMTGHNhdTA5
+cmV0LmlmYmFpYW5vLmVkdS5icjAeFw0xNDA0MTQyMjU4MThaFw0xNzA0MTMyMjU4
+MThaMIG2MSwwKgYDVQQKEyNJRkJhaWFubyAtIEluc3RpdHV0byBGZWRlcmFsIEJh
+aWFubzENMAsGA1UECxMEREdUSTEkMCIGCSqGSIb3DQEJARYVY290ZWNAaWZiYWlh
+bm8uZWR1LmJyMREwDwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJ
+BgNVBAYTAkJSMSEwHwYDVQQDExhzYXUwOXJldC5pZmJhaWFuby5lZHUuYnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD5ijX0kBu2O+XuV9a01EvCeTof
+uSU2K6jzaX5id9jZB0XcsYFo548SFE5qtzIwuWtN5VmdIKdCCycuvY84ON+WbX+D
+reNAq04e+OfS1tf9KSLwfSvIl1+D4IJvx8ul7U8SPEmd3oxLxdwM6XA1Yz1G2ejh
+WxAZtJB4uAX8y+tXwIjMIFldf2oY0sGTnC7c8CtOu/XmDTo1F8rKm+kbqvehueQO
+LodkLDH/ZwFgoEt+eCEDo2lA9B5saYJk7/8i/zW4M/sHgVLew3+mLHlhzeIjpqLj
+yNsYFFnPECAufWsr8c8e0Dc5WmKEQEXXHnIve3Z/JeNqAyMxP0yCYj/IWpzxAgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBAIkge9KkVX+lKhFX4QRd6CvNcpXOhVy2W2nt
+A3lLpsleXQD7OOSMGQFT3t0+oddMeOffBZDe5wpZx9jONf+rnnt8nYMBkollvrds
+FY0/KoGApJQfHXBPr+RO1K4eWCllKRSyjuEMCqXM2+jLEVdGa2j3cLVI3tJ69jga
+0hrCLIV6907qSEx/YjUHPazugxLpgiJMl83TdxmbU1K9/XwC27A0xsx6DZEXS1Cu
+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>
+      
+MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxLDAqBgNVBAoTI0lGQmFpYW5v
+IC0gSW5zdGl0dXRvIEZlZGVyYWwgQmFpYW5vMQ0wCwYDVQQLEwRER1RJMSQwIgYJ
+KoZIhvcNAQkBFhVjb3RlY0BpZmJhaWFuby5lZHUuYnIxETAPBgNVBAcTCFNhbHZh
+ZG9yMQ4wDAYDVQQIEwVCYWhpYTELMAkGA1UEBhMCQlIxITAfBgNVBAMTGHNhdTA5
+cmV0LmlmYmFpYW5vLmVkdS5icjAeFw0xNDA0MTQyMjU4MThaFw0xNzA0MTMyMjU4
+MThaMIG2MSwwKgYDVQQKEyNJRkJhaWFubyAtIEluc3RpdHV0byBGZWRlcmFsIEJh
+aWFubzENMAsGA1UECxMEREdUSTEkMCIGCSqGSIb3DQEJARYVY290ZWNAaWZiYWlh
+bm8uZWR1LmJyMREwDwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJ
+BgNVBAYTAkJSMSEwHwYDVQQDExhzYXUwOXJldC5pZmJhaWFuby5lZHUuYnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD5ijX0kBu2O+XuV9a01EvCeTof
+uSU2K6jzaX5id9jZB0XcsYFo548SFE5qtzIwuWtN5VmdIKdCCycuvY84ON+WbX+D
+reNAq04e+OfS1tf9KSLwfSvIl1+D4IJvx8ul7U8SPEmd3oxLxdwM6XA1Yz1G2ejh
+WxAZtJB4uAX8y+tXwIjMIFldf2oY0sGTnC7c8CtOu/XmDTo1F8rKm+kbqvehueQO
+LodkLDH/ZwFgoEt+eCEDo2lA9B5saYJk7/8i/zW4M/sHgVLew3+mLHlhzeIjpqLj
+yNsYFFnPECAufWsr8c8e0Dc5WmKEQEXXHnIve3Z/JeNqAyMxP0yCYj/IWpzxAgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBAIkge9KkVX+lKhFX4QRd6CvNcpXOhVy2W2nt
+A3lLpsleXQD7OOSMGQFT3t0+oddMeOffBZDe5wpZx9jONf+rnnt8nYMBkollvrds
+FY0/KoGApJQfHXBPr+RO1K4eWCllKRSyjuEMCqXM2+jLEVdGa2j3cLVI3tJ69jga
+0hrCLIV6907qSEx/YjUHPazugxLpgiJMl83TdxmbU1K9/XwC27A0xsx6DZEXS1Cu
+KvM7Bvwx6NC1trrrHXoIC8WaSeKyhFAIJ9+q5R0er2tgB1Ylp4iWYJWITk6o2ISg
+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>
diff --git a/swamid-interfederations-2.0/sawfish.conted.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sawfish.conted.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..262c703e
--- /dev/null
+++ b/swamid-interfederations-2.0/sawfish.conted.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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://sawfish.conted.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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sawfish.conted.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>
+						MIIDDDCCAfSgAwIBAgIJAKibhIeIrX0OMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF3Nhd2Zpc2guY29udGVkLm94LmFjLnVrMB4XDTExMTAxMTE1MTgwOVoXDTIx
+						MTAwODE1MTgwOVowIjEgMB4GA1UEAxMXc2F3ZmlzaC5jb250ZWQub3guYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBqzfHO6TPn1IpvOvkGXB6
+						hdiMh61norAph+ZTqYFeXKdFI3ifdf1i52vBa4ODsCFJlgxow1+DkOO7/3Ipp4h6
+						k2xP7Vrll7cNkC80jh+/fENc4OVXBoPyNGREpLtsIHaV82cUImjEiCtjOtmA/EeO
+						QDceq/cRPfKnalntdynhPGfBKV5B07+sMYaYyfwRp2hu2OdZzFWdJqCAJ6kFxw+E
+						hFr7P4TfrMm+4ESvfjN31IpT6ak0AJk3CckpXmRgM6i5lQv4H+DXYQgOWrvIISdU
+						L6FRTKlIQ++57A9FV/UJVWRz3FGW8NIb/7NdK+u9N1z/4YTK9PTwDAwY8iQi3gX1
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3Nhd2Zpc2guY29udGVkLm94LmFjLnVrMB0G
+						A1UdDgQWBBRDY6WGUq5Zg1sxv81m23/toHTbSjANBgkqhkiG9w0BAQUFAAOCAQEA
+						XP6+tO+WyXfIXIW9xXVt+uQvjMDm58zMG4lGE+PC89lk0itPmciDMgMSko0Al3Ev
+						NMpnTh0JSmZipjOACprBt9s5ykhWBybE0Blid2TN+42tGzW2RUW7PhJbsqhF16v4
+						o4WkcJWOyhVDhzDckPu40VZ5lQSIVVrZHEegQXVPRy+lupq7lz5cnmVTrwBHk9yG
+						zIiW5643Vuv02Ma83i9eWPfruX5z4LZzLPYz4Jv/CfoIinqbj9EPmTYVl5oRm4HC
+						QdQJumsqcKAGRRjW1vvKET66KjehtL8C9hqVxyAKc5b95A2qq4WtX01eejeJLYO+
+						mkBQ7rIcTw8YYbUpVUyQVw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Conted development site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.conted.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@conted.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@conted.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sbs-webhosting.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sbs-webhosting.sbs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..f3f5ee80
--- /dev/null
+++ b/swamid-interfederations-2.0/sbs-webhosting.sbs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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://sbs-webhosting.sbs.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-06T09:27: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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sbs-webhosting.sbs.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>
+						MIIDGDCCAgCgAwIBAgIJAPNCbuPT2io8MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG3Nicy13ZWJob3N0aW5nLnNicy5veC5hYy51azAeFw0xMjEyMDUwODM5MTda
+						Fw0yMjEyMDMwODM5MTdaMCYxJDAiBgNVBAMTG3Nicy13ZWJob3N0aW5nLnNicy5v
+						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO4N7eRtQMSY
+						X3IvueK45VAqmOQeQoGJie/mdclap1q7mhJ0QUDXvly81iLx6tYrj+pcHJjM+bZN
+						Hmwn5aNTNQeygCwYu9Q6P71Si005fRPHP6JSZxywI6DgQw2bC7PDA1ZgsEhvXqIT
+						6FUbF/K0XxaKRgYv0jire9e+mTkronnDlJOeAQtCOdf5wgp/zQjs4Yln4dD2+UXN
+						4tw1B4aOSCAlEteMO5up/DBwnx/G904kaidbOssQ180a3QEogF27bRh6lT+nDlOG
+						epKbPNwIzkJRhBZYjHHLjGUAgVIXQayS9etKvAH9hxsJ4NIiImUfH8a+2GFqZSvN
+						EgR8INMq7XcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbc2JzLXdlYmhvc3Rpbmcuc2Jz
+						Lm94LmFjLnVrMB0GA1UdDgQWBBRWZ9b7Zkx8CdEWWb10cWqQmA5CujANBgkqhkiG
+						9w0BAQUFAAOCAQEAmDjFtdmBhewEwwaAu6XPYVTnMsA1rOnrzTH8srObrgyRBNI7
+						Cd0bm1vq4Y5KwgxZYOW36b2dNDLO/oQSh/SHsWtweZj3njJsgKNZQ/9ES8gJRLAF
+						fIJK5CZBw46X4GqFSUKjBsOwq4Lwb4ziuyM7le+qJMw926RVXxCDFfsoIFFTQvMG
+						RTiokPOX7gSv91SdETtK2jf20YUt5iWlhyphx3gdd2fZBYO1yaKEaz4NMO1yIgKx
+						0qkXHgvbow0c6PP7ral0MuJkqj97HPvDvCpLuBosFVK4GDtLtMxhpTrp6NQjp982
+						uhmO5vu/Ld2xEnYKvQLGliEfuIyqmiCdmboi4w==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDGDCCAgCgAwIBAgIJAPNCbuPT2io8MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG3Nicy13ZWJob3N0aW5nLnNicy5veC5hYy51azAeFw0xMjEyMDUwODM5MTda
+						Fw0yMjEyMDMwODM5MTdaMCYxJDAiBgNVBAMTG3Nicy13ZWJob3N0aW5nLnNicy5v
+						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO4N7eRtQMSY
+						X3IvueK45VAqmOQeQoGJie/mdclap1q7mhJ0QUDXvly81iLx6tYrj+pcHJjM+bZN
+						Hmwn5aNTNQeygCwYu9Q6P71Si005fRPHP6JSZxywI6DgQw2bC7PDA1ZgsEhvXqIT
+						6FUbF/K0XxaKRgYv0jire9e+mTkronnDlJOeAQtCOdf5wgp/zQjs4Yln4dD2+UXN
+						4tw1B4aOSCAlEteMO5up/DBwnx/G904kaidbOssQ180a3QEogF27bRh6lT+nDlOG
+						epKbPNwIzkJRhBZYjHHLjGUAgVIXQayS9etKvAH9hxsJ4NIiImUfH8a+2GFqZSvN
+						EgR8INMq7XcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbc2JzLXdlYmhvc3Rpbmcuc2Jz
+						Lm94LmFjLnVrMB0GA1UdDgQWBBRWZ9b7Zkx8CdEWWb10cWqQmA5CujANBgkqhkiG
+						9w0BAQUFAAOCAQEAmDjFtdmBhewEwwaAu6XPYVTnMsA1rOnrzTH8srObrgyRBNI7
+						Cd0bm1vq4Y5KwgxZYOW36b2dNDLO/oQSh/SHsWtweZj3njJsgKNZQ/9ES8gJRLAF
+						fIJK5CZBw46X4GqFSUKjBsOwq4Lwb4ziuyM7le+qJMw926RVXxCDFfsoIFFTQvMG
+						RTiokPOX7gSv91SdETtK2jf20YUt5iWlhyphx3gdd2fZBYO1yaKEaz4NMO1yIgKx
+						0qkXHgvbow0c6PP7ral0MuJkqj97HPvDvCpLuBosFVK4GDtLtMxhpTrp6NQjp982
+						uhmO5vu/Ld2xEnYKvQLGliEfuIyqmiCdmboi4w==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbs-webhosting.sbs.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://sbs-webhosting.sbs.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://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sbs-webhosting.sbs.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 - Said Business School</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Aaron</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sbsintranet-prod.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sbsintranet-prod.sbs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..883154ea
--- /dev/null
+++ b/swamid-interfederations-2.0/sbsintranet-prod.sbs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,58 @@
+<?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://sbsintranet-prod.sbs.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T13:51:17Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sbsintranet-prod.sbs.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>
+						MIIDHjCCAgagAwIBAgIJANdB9eXrYLgxMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+						BAMTHXNic2ludHJhbmV0LXByb2Quc2JzLm94LmFjLnVrMB4XDTEzMDMyMDExMjYw
+						OFoXDTIzMDMxODExMjYwOFowKDEmMCQGA1UEAxMdc2JzaW50cmFuZXQtcHJvZC5z
+						YnMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChX2rJ
+						z07BWAA9qBYJttygZiFvA4P68EyXKHVKJP0+GQkVbz+QWgiakqrUJ4ug/2t7WZqw
+						AYGboWfEF7fn1RTk/Cmb2qrbZnDbw91K5kBq9UHm40EVGKAvbl3pH79PvNltXm4R
+						rRmFU73w9qiSSYSoJw+H9aVwoulz6SNcgT5vBL9yU3WBbVL5UUZ6Ar0NA4MSKt1M
+						s2Di56Bj7/yruiS/IWvYEdwwviOlfwv2zNOSq5WE6+3JUjmENVIaeD2quR72jl8A
+						+A5/oCejuRxA1MXtW14c28kcW8WAq+jJNhZTyTz9J747SfjwevvZC7ZpJiHpLQ3E
+						C5ZlCMmqBkkpXHG7AgMBAAGjSzBJMCgGA1UdEQQhMB+CHXNic2ludHJhbmV0LXBy
+						b2Quc2JzLm94LmFjLnVrMB0GA1UdDgQWBBQK6qQ7cJpaQHEchczSL1pO4sUdJDAN
+						BgkqhkiG9w0BAQUFAAOCAQEAgQSIM4wPZ/toneOiC8SOGTAQCLXXKLhAExgtVYt4
+						iD21kD77ltKjTnexFoEYZYhNYbpvjryLjoUwHNN0vkefEILSJ1AROtAtqrVRe/eq
+						BFSJUPEc9ldfaZyHfHm0HlXw/IqkB8Xwbl/pxeuk9UpANSK1BJEVF7fQ2OB+Q9tY
+						WfbpayK2H+et/4GqNBArhbaPTc24UmEg4iSMKM62px4LAFHDyY+l5hPyZIjbjaH4
+						PyOioUMLHQD7AFqiiudIMbHIexs1H8m72DY04eOfS0LbPKWjjQfnIvza4jrk5QVg
+						Pk/JmOFKxpYp6MjeyevIyqMKT75dQqAph+dRuPdrLpw3uQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School Intranet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Aaron</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sbsintranet-test.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sbsintranet-test.sbs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..9fd212cd
--- /dev/null
+++ b/swamid-interfederations-2.0/sbsintranet-test.sbs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,58 @@
+<?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://sbsintranet-test.sbs.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T13:51:45Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sbsintranet-test.sbs.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>
+						MIIDHjCCAgagAwIBAgIJAPI8dJKkzOVWMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+						BAMTHXNic2ludHJhbmV0LXRlc3Quc2JzLm94LmFjLnVrMB4XDTEzMDMyMDExMjY1
+						M1oXDTIzMDMxODExMjY1M1owKDEmMCQGA1UEAxMdc2JzaW50cmFuZXQtdGVzdC5z
+						YnMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYJfL7
+						38MTfaNtX2gG3YT22obvOUO4CBPVBAy6kpRIoph8N7TnRqFquy/W9ml4eAX4hUD+
+						BB+mDDaSNxKfHgBu6IItHr65Dlpr1SoFqkedhbc62MwQBfTstT0kNZAfDrMs4Uzn
+						RWpcVQ57hsIzpIFglN4+cIr8RxVtECnjOw83OXSmT5Mr4kzBkZXaHfwZBEtY7cKA
+						k7GOY+NoeBiZ1DgIpHDpYi/r2YJYaRUyLliEcb9Ub2uc+C9aBhdhOn7/E/BpMn9w
+						jvW0TMCFqUQN/oV9fyoeUUx5raCSinh7rjrYefxu+tJ5Fo7IyXq+oE/B0eu6ofPM
+						E92JNYaN4aco80SLAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXNic2ludHJhbmV0LXRl
+						c3Quc2JzLm94LmFjLnVrMB0GA1UdDgQWBBRs98UMkEznWm8oWFvOszcJxU6CmDAN
+						BgkqhkiG9w0BAQUFAAOCAQEAxeGvvr413wr+UGJexIedFITpLxgAG4F3YUeEXYsm
+						ol+WU2ekOFAge5nNj0Io8UmoTHpEIMXg62OSDWyTkAtpWYdIAdUoL+42lLrdTSr6
+						sbjZdXHQcSp+5fvpEuYkm3L0yCQktNy5J2dZ2dhAJOP+qf8V2G18TxkVQBmWrBW9
+						no1TMarB/+B7solMtdlyN4JUycjEP4wiTpfvxMdCtBXUDRMzZC1fHe8D77N97TwB
+						auw5Unm40o1QfOlAsaIC1jGRjFVcQ3PEo8PRFrExKCn33xDWXqLDPLP6pQUxxItK
+						1fSI3rsM+k375WfV9e/ofVNzCZ1FWe1GqB0/yu/x0I7M8w==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School Intranet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Aaron</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sbsplatinum-prod.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sbsplatinum-prod.sbs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..a0e8e89e
--- /dev/null
+++ b/swamid-interfederations-2.0/sbsplatinum-prod.sbs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,57 @@
+<?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://sbsplatinum-prod.sbs.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-24T14:21: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sbsplatinum-prod.sbs.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>
+						MIIDHjCCAgagAwIBAgIJANgO33fFtCcXMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+						BAMTHXNic3BsYXRpbnVtLXByb2Quc2JzLm94LmFjLnVrMB4XDTEzMDYxOTA3NDQw
+						OVoXDTIzMDYxNzA3NDQwOVowKDEmMCQGA1UEAxMdc2JzcGxhdGludW0tcHJvZC5z
+						YnMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxsxUF
+						O8JjMA3zbx6THu/sz0Ji3AlS8k4IqdAG/t4t5ZygUgU+gaTrSC9kpD0wg9WvE1Py
+						ZW/ogfB8KiAkfSbUi16O919f0uowJmUUYz2D9KjZJiVq2CmDUUyryEKwe94TR17M
+						rVLMg2UxhSP7n2uT4VuZTaC+37MUDmE/VOLon7qN/mXYWCXJJyPWEbWjev6WRZ8t
+						LkMgqDUPlpt6hgfVnQKAJ7cJteULGGVp4gCb5Ezj91o2LBTM+uzKCIeJAo6Avm18
+						SKSFgqx+oxQ8SD6AAuSrdwf5fwO//I51N/9uj8xtgO7MA4tN3epUXRtJD+j/LQd5
+						mDVcTJUmZnpWvWrbAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXNic3BsYXRpbnVtLXBy
+						b2Quc2JzLm94LmFjLnVrMB0GA1UdDgQWBBRo8x/YSzthXDfDcxhd2ZUvbJKGbTAN
+						BgkqhkiG9w0BAQUFAAOCAQEATbUWqGmTXGv5wlEYF0b0cm4Zwp/LPehRLpH5gYai
+						XRa/STYpeQvvRBHHiDVM64PhguE3yZ3+SxUVXdqRKJz0uTjcXZ+CHhngw+4VKW6E
+						eqSchBsjbPj/ETSykfoI+sQsmEWONYRO/zFbNrZe+rPL4QW1ZOIVZJ8xa+eZuQsS
+						AlWBC0vCmI+zMjDlUQuLquZRDchZdotqjbv7Ct1Tj9iIGOK053EIl14AILzsN/li
+						f24euHknRDl0vq3AIWYr+PO3m1B7ePD1ZQ4IOgvM+4GciI1WhjTZNvp1wIbfBfgZ
+						FNl6Gg44YYASw44hQ6PiTIcOCq19poc5h6W/PVSnhMFIZA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sbsplatinum-test.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sbsplatinum-test.sbs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..a0c8f2ba
--- /dev/null
+++ b/swamid-interfederations-2.0/sbsplatinum-test.sbs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,57 @@
+<?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://sbsplatinum-test.sbs.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-24T14:25:35Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sbsplatinum-test.sbs.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>
+						MIIDHjCCAgagAwIBAgIJAIgYFNjAnI8eMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+						BAMTHXNic3BsYXRpbnVtLXRlc3Quc2JzLm94LmFjLnVrMB4XDTEzMDYxOTA3NDQy
+						MFoXDTIzMDYxNzA3NDQyMFowKDEmMCQGA1UEAxMdc2JzcGxhdGludW0tdGVzdC5z
+						YnMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCflklY
+						AT1EVMNRPCXm3sOtAlwJDoogJBj40AyzlvY1aj/jviEd048i0l5oYQ/Y5K7AJlML
+						9XA2ke/k6+gHsY9uglMCSY4nyeScfRdU63ZrH72D8OzkMM5sTHITyd0UYtXQfl/a
+						o3/RjnZBwarQZ4BVmSuU9KR1KHuJEaUEq3NAClcy6CKNVcJA/DuN7NyL0ib/Ihd0
+						LHN+bZ+3s34nw0k7URxyLUJPZegofLUa1i8CmKqTc59rkRtR+Akiy9cOdpWYPZgw
+						P967o/ZlTPH5emZ6WUjFKxd6ofr00sipRrIZ8ZyK6LOd5n37pIJ12yh7aDna3nlU
+						T34MBjPE33mzL2ifAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXNic3BsYXRpbnVtLXRl
+						c3Quc2JzLm94LmFjLnVrMB0GA1UdDgQWBBRLBQqOm4D109M7QY2GgFO/wHFMyjAN
+						BgkqhkiG9w0BAQUFAAOCAQEAMfbJ0CGrfs6yV/K5LCFZDzIRkI6x+524ghvZbI3P
+						6+GI87D6gZ+QTxta29tqlF9ZlAMtIgdo+XYoRLephxPN5Xo6wbw2ku/U7cBcDrzD
+						MiBwpjCWzhcfIyu7pxEaU6qvuc+EAxBDjC7w388bp28FFyMPaKPfKEZ/7BKITo6K
+						i7kYtYbV9ZwSj5yAamnbMtgI0abgpQ+7UqoNV9afIABRbnVzfmMqFxvSrx07x4FC
+						73qtZeNIxo0mTGRa1eU9hyImd8BX5uoy1TQikkBGmXAXTS0AFbOZYLYVsQn5eNNj
+						so5f+e8LVT91d0XnbqkBqNlepWrI70hiDyeSNXgeZvtkAQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</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
new file mode 100644
index 00000000..a3552f69
--- /dev/null
+++ b/swamid-interfederations-2.0/scatfam.shrewsbury.ac.uk-shibboleth.xml
@@ -0,0 +1,111 @@
+<?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>
+      <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>
+						MIIEzDCCA7SgAwIBAgIQD+da6y76fB0jjOTGMjnLqTANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDEyMjAwMDAwMFoXDTE2MDEyMjIzNTk1OVowgZgxCzAJBgNV
+						BAYTAkdCMRMwEQYDVQQIEwpTaHJvcHNoaXJlMRMwEQYDVQQHEwpTaHJld3NidXJ5
+						MTIwMAYDVQQKEylTaHJld3NidXJ5IENvbGxlZ2Ugb2YgQXJ0cyBhbmQgVGVjaG5v
+						bG9neTEMMAoGA1UECxMDVElTMR0wGwYDVQQDExRpZHAuc2hyZXdzYnVyeS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKisy8sa7jFFL0nZC+L2
+						23cRWxMUAab3ZyiiDzrFgldPvWrpL6PoEubFAnVl0gq4wAPfXIvPupuSx8vCRHkd
+						TyEGhFbSZV3m9Xj3XxqSFPbJI44YnBixesLPycrk9llxBcsL+hEH17nJ0KPjtjAh
+						2cSw5/MBFvjFFLlMdDMxlAitf9LmRR0FVnASr6SeL2hS2Eq00nrkWKh9bgs4N4b3
+						HO/MFzh43gt8Wx2WdnrRiM/R4DsNsLmjw6/n0pLTsczpnPNCxzn4ylOGQt+YaaxD
+						ospa5nEwoWdg0f86VGytOPj/18o7dVPDlzz+3EQIFX4w4Lm2ZyinW9nKYlp/RoIX
+						1R0CAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
+						MB0GA1UdDgQWBBSezYEALpOmAolu4WZN/gHXOmYdPjAOBgNVHQ8BAf8EBAMCBaAw
+						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
+						VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2g
+						K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
+						KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
+						b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
+						LnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRwLnNocmV3c2J1cnkuYWMudWswDQYJ
+						KoZIhvcNAQEFBQADggEBACahrFuSCyAb3Nf1CM4ojODgm3kKRhMrzlmMi+3WsSg6
+						SzoHSQO+AEde6shDXt86/6J0Od2SbSBik879mhfsHL6sJDXwBMDCVJkZtKKmVvWG
+						74gBe6i+DT3FlD0HVMiyIGC3FcyIRQKRkdYuE0fPBsNSOLDoIGF56Mxvbz6AEkRn
+						lMHJ8zQ3wp6zkF8ftwjtEqQORb+MezhsTkAG+482GdAGx1MbMiaLqxHxUcq0HXxZ
+						hPMrscDk2MJAklZ3xDaD7/f5gLOHz7ROukBwtboELdtbixVYFg/+gWJbA7r6j0Tg
+						mloGlWVhsD7tw1Q2KJR2v8bTsRLlDw+z58R01VtOCmI=
+					</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>
+						MIIEzDCCA7SgAwIBAgIQD+da6y76fB0jjOTGMjnLqTANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDEyMjAwMDAwMFoXDTE2MDEyMjIzNTk1OVowgZgxCzAJBgNV
+						BAYTAkdCMRMwEQYDVQQIEwpTaHJvcHNoaXJlMRMwEQYDVQQHEwpTaHJld3NidXJ5
+						MTIwMAYDVQQKEylTaHJld3NidXJ5IENvbGxlZ2Ugb2YgQXJ0cyBhbmQgVGVjaG5v
+						bG9neTEMMAoGA1UECxMDVElTMR0wGwYDVQQDExRpZHAuc2hyZXdzYnVyeS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKisy8sa7jFFL0nZC+L2
+						23cRWxMUAab3ZyiiDzrFgldPvWrpL6PoEubFAnVl0gq4wAPfXIvPupuSx8vCRHkd
+						TyEGhFbSZV3m9Xj3XxqSFPbJI44YnBixesLPycrk9llxBcsL+hEH17nJ0KPjtjAh
+						2cSw5/MBFvjFFLlMdDMxlAitf9LmRR0FVnASr6SeL2hS2Eq00nrkWKh9bgs4N4b3
+						HO/MFzh43gt8Wx2WdnrRiM/R4DsNsLmjw6/n0pLTsczpnPNCxzn4ylOGQt+YaaxD
+						ospa5nEwoWdg0f86VGytOPj/18o7dVPDlzz+3EQIFX4w4Lm2ZyinW9nKYlp/RoIX
+						1R0CAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
+						MB0GA1UdDgQWBBSezYEALpOmAolu4WZN/gHXOmYdPjAOBgNVHQ8BAf8EBAMCBaAw
+						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
+						VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2g
+						K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
+						KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
+						b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
+						LnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRwLnNocmV3c2J1cnkuYWMudWswDQYJ
+						KoZIhvcNAQEFBQADggEBACahrFuSCyAb3Nf1CM4ojODgm3kKRhMrzlmMi+3WsSg6
+						SzoHSQO+AEde6shDXt86/6J0Od2SbSBik879mhfsHL6sJDXwBMDCVJkZtKKmVvWG
+						74gBe6i+DT3FlD0HVMiyIGC3FcyIRQKRkdYuE0fPBsNSOLDoIGF56Mxvbz6AEkRn
+						lMHJ8zQ3wp6zkF8ftwjtEqQORb+MezhsTkAG+482GdAGx1MbMiaLqxHxUcq0HXxZ
+						hPMrscDk2MJAklZ3xDaD7/f5gLOHz7ROukBwtboELdtbixVYFg/+gWJbA7r6j0Tg
+						mloGlWVhsD7tw1Q2KJR2v8bTsRLlDw+z58R01VtOCmI=
+					</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>
diff --git a/swamid-interfederations-2.0/school.c2kni.net-shibboleth.xml b/swamid-interfederations-2.0/school.c2kni.net-shibboleth.xml
new file mode 100644
index 00000000..44976627
--- /dev/null
+++ b/swamid-interfederations-2.0/school.c2kni.net-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						aS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkD+gWZlQqFrJB
+						yQRfAA7lP5L4bJeiiOEsvjG7LaA3/ZqcA+g8q+FScODRcyX/5OEU/Q1x82xrNAQw
+						cCW0t5m/VaA2aRmxn0eVt9hZop9BtBhhMMALLmh8eYKz8udoO0QNpaYmFVSFoPiL
+						USj+wSmPPkFQZefSDtog6FD0SrAHQw91okx8ng4Zg3MoJtFQ0/V/F/wFMK7YjGYj
+						heTrgBsMYiJf3Oc0YQclckjhdp5j/t553IttizOY1tXEmapAfpiosxVDPClbfBBK
+						Au/qIEF2Gq2yPRIIm+vlujmmW9eaeo1bEqk6J2z8/umD7gkzDBErFve/537oX8di
+						cusmQfeFAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGguYzJrbmkubmV0
+						hitodHRwczovL3NoaWJib2xldGguYzJrbmkubmV0L2lkcC9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBRfggaNcJ76bEhFucG0h3JafiQA5DANBgkqhkiG9w0BAQUFAAOCAQEA
+						HaRM+/rYecDWHpBrYykfl91MAJFE2T4OTCW719CpNh8zG51/AFavDS6Nopm8qibi
+						QjOehBpYlFdtyON8kkcMEKdikR9BW8mnpE8rP581hkfQl47IxX1ckbS5wD9EScWf
+						uKCraaUUkwQ4eSGQwrpkMyKMGaW7irCowInKdiOwvb3AwRQQnpHmrTR7NeoYlWEh
+						euSkfjxXVLnVBwu/4sXAV5NiZCkjNnvTE+jfqI+bYtH/7EI9Q2rn5vdwfTstN7Px
+						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>
+						MIIDPDCCAiSgAwIBAgIVALsvx6NLIdhUhxT9mKREB6ksXTLJMA0GCSqGSIb3DQEB
+						BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguYzJrbmkubmV0MB4XDTEwMDgxMjEw
+						MzcxN1oXDTMwMDgxMjEwMzcxN1owHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5jMmtu
+						aS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkD+gWZlQqFrJB
+						yQRfAA7lP5L4bJeiiOEsvjG7LaA3/ZqcA+g8q+FScODRcyX/5OEU/Q1x82xrNAQw
+						cCW0t5m/VaA2aRmxn0eVt9hZop9BtBhhMMALLmh8eYKz8udoO0QNpaYmFVSFoPiL
+						USj+wSmPPkFQZefSDtog6FD0SrAHQw91okx8ng4Zg3MoJtFQ0/V/F/wFMK7YjGYj
+						heTrgBsMYiJf3Oc0YQclckjhdp5j/t553IttizOY1tXEmapAfpiosxVDPClbfBBK
+						Au/qIEF2Gq2yPRIIm+vlujmmW9eaeo1bEqk6J2z8/umD7gkzDBErFve/537oX8di
+						cusmQfeFAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGguYzJrbmkubmV0
+						hitodHRwczovL3NoaWJib2xldGguYzJrbmkubmV0L2lkcC9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBRfggaNcJ76bEhFucG0h3JafiQA5DANBgkqhkiG9w0BAQUFAAOCAQEA
+						HaRM+/rYecDWHpBrYykfl91MAJFE2T4OTCW719CpNh8zG51/AFavDS6Nopm8qibi
+						QjOehBpYlFdtyON8kkcMEKdikR9BW8mnpE8rP581hkfQl47IxX1ckbS5wD9EScWf
+						uKCraaUUkwQ4eSGQwrpkMyKMGaW7irCowInKdiOwvb3AwRQQnpHmrTR7NeoYlWEh
+						euSkfjxXVLnVBwu/4sXAV5NiZCkjNnvTE+jfqI+bYtH/7EI9Q2rn5vdwfTstN7Px
+						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>
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
new file mode 100644
index 00000000..96f1914a
--- /dev/null
+++ b/swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIE6TCCA9GgAwIBAgIRANEjD1aUdtcPPWqsYvlNii0wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMjA1MTUwMDAwMDBaFw0xNTA1MTUyMzU5NTlaMHoxCzAJBgNV
+BAYTAklUMS4wLAYDVQQKEyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51
+Y2xlYXJlMRMwEQYDVQQLEwpJTkZOLVJPTUEzMSYwJAYDVQQDEx1zY2llbmNlLWdh
+dGV3YXkucm9tYTMuaW5mbi5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMuILctwFvSF9Yr4Nm5pWLH5WYaUBIA7rv0AN4pMaB9hnvuqq8I4Tmi+FlkG
+sI0EmsCO99y+6yo9C8MpALmJSkna2G/+yw9e7C3Ze0nYUXgvR7PEk14ad3d699zM
+Wk8NN/6wrwx5H99wkIs9xygXqXvYZkv5jp8wfGIXhf5UBCp4a8JR+v2ztOsWpC9T
+oLUDFZdd1Ho7aV9DDqyVyHvVhRqkMKXsKJEZ0D5QJMNAcoRChWncs7xJnNUTh4ZZ
+Od0vqp7hqSlI+fX82QHjN6f4lnKAytcBczG5RTfXqYkaxkH/AXVSMfI2gw3zx18s
+XayRZZsutAZhLabY05URI2Ni5fMCAwEAAaOCAawwggGoMB8GA1UdIwQYMBaAFAy9
+k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQoCA4lGZcVFGnG4UnclARLBiwF
+rjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
+BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzBkBgNVHREEXTBbgh1zY2llbmNlLWdhdGV3YXku
+cm9tYTMuaW5mbi5pdIIYZ3JpZHNydi0wMy5yb21hMy5pbmZuLml0giBzY2llbmNl
+LWdhdGV3YXkuY2hhaW4tcHJvamVjdC5ldTANBgkqhkiG9w0BAQUFAAOCAQEAg4oZ
+gRrEtULAKSkLPZrmmESdqUdVmgMooDo5sknJ9FClzqEHBCVgMp0R/Lu3oZw9kM/2
+F8ImmlWB6oLEkuArS892zIiurvfqEVDRT0Va7UN1tbbC1u8MtzrO3fqJkCtN3lP7
++AP9hKxecl638JNYqMnVGPq7bgAUIq4bkiJMWrymmbYp/Ru0ZhNXCUt8dH54SMKc
+73DGb2MPM2kDVwtfWci9zMrgRgz2EgYU8coHbgap+pTN/It3I4Swlx7tTtDScQ6Q
++3BiBRBlmvGinE8WshaUxHGcZ7k84AykVo99TMQPgjPJ3JHlFihk3dTtdXnOHH51
+uYYzGifeDE10paSw+w==
+</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>
diff --git a/swamid-interfederations-2.0/scitation.aip.org-shibboleth.xml b/swamid-interfederations-2.0/scitation.aip.org-shibboleth.xml
new file mode 100644
index 00000000..633396c3
--- /dev/null
+++ b/swamid-interfederations-2.0/scitation.aip.org-shibboleth.xml
@@ -0,0 +1,54 @@
+<?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>
+						MIIDnDCCAoSgAwIBAgIEUdvRkTANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
+						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
+						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDcwOTA5
+						MDIwOVoXDTE2MDcwODA5MDIwOVowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
+						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
+						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
+						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAIqfzThQ2R8sCWiSeU7PeibXuB31/Ey51i4rdZwIcTeNRRcDxH5PYjLD
+						NjSwarBEIgTyFxmByOrkAZzaExBpdGtNrDo7b6fyI7966gCDEYO4Sh1ZKZxWQsbu
+						zQwQjovDrlqUnGa3z/h2UfilQY8wtc/2wF1/rZbqRnqMjVCwJsaFyo2OlwUh2xWu
+						gPL2usYYVkBr0qdYfjs3zxy7U+dWN1oYu3Ing9GUx7ueT/9nWUQX+4TzSCjzGb3Z
+						xRrjkEwUrRu6KXuaMVqrZbAzQboEh4HVXp7VKJijCG0gisXdcEMqBblsCtthRYkw
+						7V59Q/K8owmELbi0vaii1t0c0GQg3GMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						hiHnQS4R1ji95KCr9u+67dPdC9qTwFpo8/znSwFAC6aGbMX68swzifkIqDbgSAOY
+						NPGZCyRV4wz2gpBnVXOm9wVJvdGylmrk8dfakKwzljTKEm2+Xqq6CHD3QSQpjRrG
+						X7eKZgK+HyDDiVmFAenAzSkAHazV0I0wWOFnZp5lgrU66YggtaZMHk19Nf4ZXJuD
+						dYsGoaLN6fCVEuPStNGZ32wu4CH6sUWhi2OhlJl+rF/Z7zBFpydwMFSfd+DFUUlg
+						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">Publishing Technology 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>Talvinder</md:GivenName>
+    <md:SurName>Matharu</md:SurName>
+    <md:EmailAddress>mailto:openathens@publishingtechnology.com</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
new file mode 100644
index 00000000..1c971aef
--- /dev/null
+++ b/swamid-interfederations-2.0/scsh.scran.ac.uk-shibboleth.xml
@@ -0,0 +1,117 @@
+<?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>
+      <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>
+						MIIEpzCCA4+gAwIBAgIJAJr9uyuwy/Y2MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEP
+						MA0GA1UEChMGUkNBSE1TMQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jh
+						bi5hYy51azEkMCIGCSqGSIb3DQEJARYVd2ViYWRtaW5zQHNjcmFuLmFjLnVrMB4X
+						DTEwMDIyMjExNDU1OVoXDTIwMDIyMDExNDU1OVowgZMxCzAJBgNVBAYTAkdCMREw
+						DwYDVQQIEwhTY290bGFuZDESMBAGA1UEBxMJRWRpbmJ1cmdoMQ8wDQYDVQQKEwZS
+						Q0FITVMxDjAMBgNVBAsTBVNjcmFuMRYwFAYDVQQDDA0qLnNjcmFuLmFjLnVrMSQw
+						IgYJKoZIhvcNAQkBFhV3ZWJhZG1pbnNAc2NyYW4uYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDEywuow7F7KjwlfTa4vj/2QWvtexIy+OO0hWvn
+						SJ8B3goDjqaC7Mv1fNJdxtZMl/kR6ZfMT86Xa2VfK47NOe14jJDgZxN/0lbwsLwb
+						GyyxcZeDg0NCcv/jFKUiH6m2jSLkpSrSTHuUqRUhGpR0wcr3+HZjLZrpHI0FQ5EH
+						cnkhg1fYwZ5Z6vth+0NhZt9HjWLrUtia4Bj0orj0MkUAKlGEBudrPsC/OITO9oUp
+						pXV0PBi0hILJdbgeJXDFhxfcEpCczQlQgdx/KWD6q/6nSOmT9hNGMjkiprn/w/q1
+						SsAMRqSfrWrR6q8hWTkWmNsm/c39bJFuMvkfkiOgvvBVqE3nAgMBAAGjgfswgfgw
+						HQYDVR0OBBYEFG8UIQ7Hc9WHtlS6PKYYP/7RWNcrMIHIBgNVHSMEgcAwgb2AFG8U
+						IQ7Hc9WHtlS6PKYYP/7RWNcroYGZpIGWMIGTMQswCQYDVQQGEwJHQjERMA8GA1UE
+						CBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEPMA0GA1UEChMGUkNBSE1T
+						MQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jhbi5hYy51azEkMCIGCSqG
+						SIb3DQEJARYVd2ViYWRtaW5zQHNjcmFuLmFjLnVrggkAmv27K7DL9jYwDAYDVR0T
+						BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAWSSnSaVz28lDBISUNRmNJFwKvjo5
+						nC4+WM7h6Tg9QbC/EYNCwkH7bOoEcCJs28jn0EwRfn4GUgc1LFkf9UYc3rJ+mihD
+						+RZDHjaJSZDbQgZI55y8dpuYT8r70rCg+xtq1Iwv0NzcM+Q/3cEeiMlIXY6YFAAA
+						Dsp1/4NlItMUs6ZwAyMLjyIlSjIHjTVLI2bRTDlY4nUgZhqz4spvqDtnmq7PERUN
+						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>
diff --git a/swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml b/swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml
new file mode 100644
index 00000000..4dc15b50
--- /dev/null
+++ b/swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml
@@ -0,0 +1,76 @@
+<?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>
+      <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>
+						MIIEoDCCA4igAwIBAgIBATANBgkqhkiG9w0BAQQFADCBljELMAkGA1UEBhMCVVMx
+						DTALBgNVBAgTBE9oaW8xEzARBgNVBAcTCk1pYW1pc2J1cmcxFDASBgNVBAoTC0xF
+						WElTLU5FWElTMSEwHwYDVQQDExhzZGF1dGguc2NpZW5jZWRpcmVjdC5jb20xKjAo
+						BgkqhkiG9w0BCQEWG0VtYWlsTm90TmVlZGVkQGVsc2V2aWVyLmNvbTAeFw0xMjA3
+						MjcxMzU2MDlaFw0yMjA3MjUxMzU2MDlaMIGWMQswCQYDVQQGEwJVUzENMAsGA1UE
+						CBMET2hpbzETMBEGA1UEBxMKTWlhbWlzYnVyZzEUMBIGA1UEChMLTEVYSVMtTkVY
+						SVMxITAfBgNVBAMTGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTEqMCgGCSqGSIb3
+						DQEJARYbRW1haWxOb3ROZWVkZWRAZWxzZXZpZXIuY29tMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEArv49mYjjAEm6cINEmhRwPk3amwJjENDm/adyrmDV
+						yo8vP2qV0t1yMkQ4/mjtKNbNtHXdYmHhfKWUvkcfGrWSlTTtL58pzUa1yrAa4/zG
+						4yMDsu0TRa9mXrJObLyQgbW7UW6k4cYVFYh7NdNUlYYZJlQcnOnzd1vg5YUoTCG7
+						2bVvN18ECMgmwpetOuU34+C/0VMWmAta11MnI9SVFdBa7/V34Ui3kQURo9rZGBOK
+						X38UCEQaL0t6OaStEVpPOBubbG3Xk/dOCLTqq0L/694oXr38pZLRy+R+PinTTqTL
+						gg2k8d35knIQoQ+/HbTJnTZ+N0RG2Qs8PjQ+saYJtvf8lQIDAQABo4H2MIHzMB0G
+						A1UdDgQWBBRj2Qz+DnqMnI6xhYJHngQCnWxPyjCBwwYDVR0jBIG7MIG4gBSSutEA
+						8L7ay1vyhalDZtLDe5WNRqGBnKSBmTCBljELMAkGA1UEBhMCVVMxDTALBgNVBAgT
+						BE9oaW8xEzARBgNVBAcTCk1pYW1pc2J1cmcxFDASBgNVBAoTC0xFWElTLU5FWElT
+						MSEwHwYDVQQDExhzZGF1dGguc2NpZW5jZWRpcmVjdC5jb20xKjAoBgkqhkiG9w0B
+						CQEWG0VtYWlsTm90TmVlZGVkQGVsc2V2aWVyLmNvbYIBADAMBgNVHRMEBTADAQH/
+						MA0GCSqGSIb3DQEBBAUAA4IBAQAjfpImUzNMumHr2S2vLEsK7z+m7NQNPEarTSYx
+						j+0TNH3W+ylvgjcEprAoXWVEkJEQkvcYHXS8rWqxqZ9zJptPsaqJ/kDEv3i2MguF
+						4iCRAhUJzNCpIvdpaJ2rDTfLfx2mk+2co78Gx6Ixc5TaUYimoKbWdBgetTLMAT0i
+						EUxAtEgo6M2yacBtQGewYQSnA6/pAiJUlDUBvw0tyEUDs8sAv/LrBFnl/jeYcb4V
+						/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>
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
new file mode 100644
index 00000000..687f8b6c
--- /dev/null
+++ b/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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>
+      <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
+BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
+ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
+A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
+HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTUwMjEwMTAzOTE2WhcN
+MTkwNzA5MjM1OTAwWjCBszELMAkGA1UEBhMCREUxDzANBgNVBAgMBkJlcmxpbjEP
+MA0GA1UEBwwGQmVybGluMSIwIAYDVQQKDBlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
+bGluMTkwNwYDVQQLDDBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
+d2lzc2Vuc2NoYWZ0ZW4xIzAhBgNVBAMMGnNkcy5nZXNjaGt1bHQuZnUtYmVybGlu
+LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxQiC2Eb0zNzFtrlQ
+FMqNF4v5tTD2G4MRUDCu6j2q44u6KIq8MmUj0kmEEEwPp+SM2KgBjvWGFbi6JRxo
+KVPgqo7lSMSOxWzvPtdpMet5FNWl1fMCRff35GsWHb9eM7eE6QZDc4zNyyOCWHYk
+f/fwzWk4a5asHg00+92I1WI9+6Qud5IR4jrvoMG7Jbt3vZQLJeCxiwdiNaK+5QxO
+p/H4zXwqrUZsGCovnpgTYXJ70blUzgScyeDc0mceFActrimEfWgSM0jCIsqSALDF
+PSeQLDrLYmFsp/qWN/UeTU2KvO05CQc88f4OcwwTyZ9Bz8M2XElXT9g47eZQDImh
+PFl+PwIDAQABo4ICMjCCAi4wTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwMw
+EQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGC
+LB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
+CCsGAQUFBwMBMB0GA1UdDgQWBBS+8dPy2YsDwhLcALXLrUDmTPk7oTAfBgNVHSME
+GDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDAlBgNVHREEHjAcghpzZHMuZ2VzY2hr
+dWx0LmZ1LWJlcmxpbi5kZTB1BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAwhi5odHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHFBggrBgEF
+BQcBAQSBuDCBtTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9P
+Q1NQLVNlcnZlci9PQ1NQMD4GCCsGAQUFBzAChjJodHRwOi8vY2RwMS5wY2EuZGZu
+LmRlL2Z1LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA+BggrBgEFBQcwAoYyaHR0
+cDovL2NkcDIucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQELBQADggEBABvBL8LrCEwVzArAZ4PVyQSg20buTtyqg/O8rs45
+BUyFP3s10JQH2VMIIkZdSOwy6uBpHdvPN+QIVBz/6j6/awFAPnrDwux/1vH5OgCP
+UDG3QmeebcWtz+uhQR/LXKK5mqD46TLan1WHj1fnDCK678pIaqNefn71IO9wGuLZ
+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>
diff --git a/swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml b/swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml
new file mode 100644
index 00000000..48a0169d
--- /dev/null
+++ b/swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml
@@ -0,0 +1,143 @@
+<?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:Attribute>
+    </mdattr:EntityAttributes>
+  </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
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMTMxNTMxMTJaFw0xOTAzMTIx
+NTMxMTJaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNzZWFyY2guZGUuZGFyaWFoLmV1
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7pmrlhefv+M2gPqsZGL
+VcaIqF4WYCm6UGO6P2CzjPCMXOoXdHI5dCTAPl0moSDoTLIJ9PHrCsel5qpdblfh
+nuB7b2TbeehaE/kZqduvcbZn3/TTOdax6dwmlbQbbkwEjPcLTiII1co9vccN3OJj
+pClCGbM+g4iPYtqRcSJlmgh6sbyEi8GaRSt/hrVjLz7LgLA4zlwFNCWvwWnapNOw
+PgVINO1PUW7/gUuqaXD4nigvvJueyj5vI17/7XTOJNVOQGdx+WnPutdJupqFR967
+TGKMCYwZivzMh+a36onE+N81dMRERNa+xUbaef0JmWodMRRJX/XINEmNMtvGgB3A
+wQIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
+KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFCCZUdbp
+ix/yKKub4Cu5WlpydwXbMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
+MB4GA1UdEQQXMBWCE3NlYXJjaC5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
+oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
+dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
+gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
+ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCATCaFTv5NkXiH
+Gqk6O1y9Zkt7MtJheq1ATf2itAeCHVIapN6damvsHhb5IUwKu4pSAyT4h5c6PCiK
+N7f+C0KJPSbH7yEz62BdSa2n+Ut+L8rdz2KjxYC3LMtZgJDOCqVP9c3JL6zGQItA
+3RaIPoIzrB4kD/pJz3I2Tl7JfbnYSDtTaLVzysHtuApY5N+zjLJ54GokAlB5hjcm
+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
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMTMxNTMxMTJaFw0xOTAzMTIx
+NTMxMTJaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNzZWFyY2guZGUuZGFyaWFoLmV1
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7pmrlhefv+M2gPqsZGL
+VcaIqF4WYCm6UGO6P2CzjPCMXOoXdHI5dCTAPl0moSDoTLIJ9PHrCsel5qpdblfh
+nuB7b2TbeehaE/kZqduvcbZn3/TTOdax6dwmlbQbbkwEjPcLTiII1co9vccN3OJj
+pClCGbM+g4iPYtqRcSJlmgh6sbyEi8GaRSt/hrVjLz7LgLA4zlwFNCWvwWnapNOw
+PgVINO1PUW7/gUuqaXD4nigvvJueyj5vI17/7XTOJNVOQGdx+WnPutdJupqFR967
+TGKMCYwZivzMh+a36onE+N81dMRERNa+xUbaef0JmWodMRRJX/XINEmNMtvGgB3A
+wQIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
+KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFCCZUdbp
+ix/yKKub4Cu5WlpydwXbMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
+MB4GA1UdEQQXMBWCE3NlYXJjaC5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
+oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
+dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
+gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
+ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCATCaFTv5NkXiH
+Gqk6O1y9Zkt7MtJheq1ATf2itAeCHVIapN6damvsHhb5IUwKu4pSAyT4h5c6PCiK
+N7f+C0KJPSbH7yEz62BdSa2n+Ut+L8rdz2KjxYC3LMtZgJDOCqVP9c3JL6zGQItA
+3RaIPoIzrB4kD/pJz3I2Tl7JfbnYSDtTaLVzysHtuApY5N+zjLJ54GokAlB5hjcm
+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>
diff --git a/swamid-interfederations-2.0/search.de.dariah.eu-search.xml b/swamid-interfederations-2.0/search.de.dariah.eu-search.xml
new file mode 100644
index 00000000..8a481271
--- /dev/null
+++ b/swamid-interfederations-2.0/search.de.dariah.eu-search.xml
@@ -0,0 +1,143 @@
+<?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:Attribute>
+    </mdattr:EntityAttributes>
+  </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
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMTMxNTMxMTJaFw0xOTAzMTIx
+NTMxMTJaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNzZWFyY2guZGUuZGFyaWFoLmV1
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7pmrlhefv+M2gPqsZGL
+VcaIqF4WYCm6UGO6P2CzjPCMXOoXdHI5dCTAPl0moSDoTLIJ9PHrCsel5qpdblfh
+nuB7b2TbeehaE/kZqduvcbZn3/TTOdax6dwmlbQbbkwEjPcLTiII1co9vccN3OJj
+pClCGbM+g4iPYtqRcSJlmgh6sbyEi8GaRSt/hrVjLz7LgLA4zlwFNCWvwWnapNOw
+PgVINO1PUW7/gUuqaXD4nigvvJueyj5vI17/7XTOJNVOQGdx+WnPutdJupqFR967
+TGKMCYwZivzMh+a36onE+N81dMRERNa+xUbaef0JmWodMRRJX/XINEmNMtvGgB3A
+wQIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
+KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFCCZUdbp
+ix/yKKub4Cu5WlpydwXbMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
+MB4GA1UdEQQXMBWCE3NlYXJjaC5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
+oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
+dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
+gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
+ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCATCaFTv5NkXiH
+Gqk6O1y9Zkt7MtJheq1ATf2itAeCHVIapN6damvsHhb5IUwKu4pSAyT4h5c6PCiK
+N7f+C0KJPSbH7yEz62BdSa2n+Ut+L8rdz2KjxYC3LMtZgJDOCqVP9c3JL6zGQItA
+3RaIPoIzrB4kD/pJz3I2Tl7JfbnYSDtTaLVzysHtuApY5N+zjLJ54GokAlB5hjcm
+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
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMTMxNTMxMTJaFw0xOTAzMTIx
+NTMxMTJaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNzZWFyY2guZGUuZGFyaWFoLmV1
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7pmrlhefv+M2gPqsZGL
+VcaIqF4WYCm6UGO6P2CzjPCMXOoXdHI5dCTAPl0moSDoTLIJ9PHrCsel5qpdblfh
+nuB7b2TbeehaE/kZqduvcbZn3/TTOdax6dwmlbQbbkwEjPcLTiII1co9vccN3OJj
+pClCGbM+g4iPYtqRcSJlmgh6sbyEi8GaRSt/hrVjLz7LgLA4zlwFNCWvwWnapNOw
+PgVINO1PUW7/gUuqaXD4nigvvJueyj5vI17/7XTOJNVOQGdx+WnPutdJupqFR967
+TGKMCYwZivzMh+a36onE+N81dMRERNa+xUbaef0JmWodMRRJX/XINEmNMtvGgB3A
+wQIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
+KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFCCZUdbp
+ix/yKKub4Cu5WlpydwXbMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
+MB4GA1UdEQQXMBWCE3NlYXJjaC5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
+oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
+dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
+gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
+ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCATCaFTv5NkXiH
+Gqk6O1y9Zkt7MtJheq1ATf2itAeCHVIapN6damvsHhb5IUwKu4pSAyT4h5c6PCiK
+N7f+C0KJPSbH7yEz62BdSa2n+Ut+L8rdz2KjxYC3LMtZgJDOCqVP9c3JL6zGQItA
+3RaIPoIzrB4kD/pJz3I2Tl7JfbnYSDtTaLVzysHtuApY5N+zjLJ54GokAlB5hjcm
+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>
diff --git a/swamid-interfederations-2.0/secure.anatomy.tv-shibboleth.xml b/swamid-interfederations-2.0/secure.anatomy.tv-shibboleth.xml
new file mode 100644
index 00000000..6a3fd295
--- /dev/null
+++ b/swamid-interfederations-2.0/secure.anatomy.tv-shibboleth.xml
@@ -0,0 +1,92 @@
+<?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>
+      <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>
+						MIIDrzCCApegAwIBAgIJAP7Ws37fxxA8MA0GCSqGSIb3DQEBBQUAMEMxJTAjBgNV
+						BAoTHFByaW1hbCBQaWN0dXJlcyAtIEFuYXRvbXkudHYxGjAYBgNVBAMTEXNlY3Vy
+						ZS5hbmF0b215LnR2MB4XDTEzMTEyMjEzNDY1OVoXDTIzMTEyMDEzNDY1OVowQzEl
+						MCMGA1UEChMcUHJpbWFsIFBpY3R1cmVzIC0gQW5hdG9teS50djEaMBgGA1UEAxMR
+						c2VjdXJlLmFuYXRvbXkudHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDAJdYIxLYxyV/0MqpVRYZhafOPVAbv/BmBL+1RrxBA4SUv0jiSnJiBSPnE0/YX
+						oSgyFI8UDshYX5bf78Uk0YFPQ9W9lRZaElZ2RuYqfZjZLbfM8EAtB1WSpFXim6gq
+						9rIKHBLh8jhtTZSWinAezthfpvMJWHEArEjbReJF2+dzc6bXTsKZMf84VtC4t7eh
+						dwbMCq84D8PNtBR5B4YCcIWKrTGxdTuclb/oU+hiUR8/x9DKj/QIIVgb2g/eDEmv
+						fHXrUrwUECqXCi+TLhIFEOe8eNw+cIueOkqtsg02qzTr7ThIW/LGlcprdOS+1Me1
+						Gm/0Hal/v3x79JSOaZ1ZOy2xAgMBAAGjgaUwgaIwHQYDVR0OBBYEFMPJgV8IFMbg
+						J+I6xIAIsgAZxRrtMHMGA1UdIwRsMGqAFMPJgV8IFMbgJ+I6xIAIsgAZxRrtoUek
+						RTBDMSUwIwYDVQQKExxQcmltYWwgUGljdHVyZXMgLSBBbmF0b215LnR2MRowGAYD
+						VQQDExFzZWN1cmUuYW5hdG9teS50doIJAP7Ws37fxxA8MAwGA1UdEwQFMAMBAf8w
+						DQYJKoZIhvcNAQEFBQADggEBAEVvZ6kazfA45CuWgSeHvBvwfotPTQ1L0I5LQm2Z
+						8eniR7GRXHoe8ARm0KeKkOI0RPDH7P7ovvdTaBWjbESxwa/LybHUKNGKikJBnmpW
+						kD+04h6aOISdCNM5gK7arXSdymnw8tBDDcD4InhaUjpb16lKzLOg9MrEflKxYGvt
+						sRNksXgJ/NXz72RR6e2XBJc/GcJLYqtE9GUa+9WBBywVjKxCfkTchtKZJJ5671gt
+						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>
+						MIIDrzCCApegAwIBAgIJAP7Ws37fxxA8MA0GCSqGSIb3DQEBBQUAMEMxJTAjBgNV
+						BAoTHFByaW1hbCBQaWN0dXJlcyAtIEFuYXRvbXkudHYxGjAYBgNVBAMTEXNlY3Vy
+						ZS5hbmF0b215LnR2MB4XDTEzMTEyMjEzNDY1OVoXDTIzMTEyMDEzNDY1OVowQzEl
+						MCMGA1UEChMcUHJpbWFsIFBpY3R1cmVzIC0gQW5hdG9teS50djEaMBgGA1UEAxMR
+						c2VjdXJlLmFuYXRvbXkudHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDAJdYIxLYxyV/0MqpVRYZhafOPVAbv/BmBL+1RrxBA4SUv0jiSnJiBSPnE0/YX
+						oSgyFI8UDshYX5bf78Uk0YFPQ9W9lRZaElZ2RuYqfZjZLbfM8EAtB1WSpFXim6gq
+						9rIKHBLh8jhtTZSWinAezthfpvMJWHEArEjbReJF2+dzc6bXTsKZMf84VtC4t7eh
+						dwbMCq84D8PNtBR5B4YCcIWKrTGxdTuclb/oU+hiUR8/x9DKj/QIIVgb2g/eDEmv
+						fHXrUrwUECqXCi+TLhIFEOe8eNw+cIueOkqtsg02qzTr7ThIW/LGlcprdOS+1Me1
+						Gm/0Hal/v3x79JSOaZ1ZOy2xAgMBAAGjgaUwgaIwHQYDVR0OBBYEFMPJgV8IFMbg
+						J+I6xIAIsgAZxRrtMHMGA1UdIwRsMGqAFMPJgV8IFMbgJ+I6xIAIsgAZxRrtoUek
+						RTBDMSUwIwYDVQQKExxQcmltYWwgUGljdHVyZXMgLSBBbmF0b215LnR2MRowGAYD
+						VQQDExFzZWN1cmUuYW5hdG9teS50doIJAP7Ws37fxxA8MAwGA1UdEwQFMAMBAf8w
+						DQYJKoZIhvcNAQEFBQADggEBAEVvZ6kazfA45CuWgSeHvBvwfotPTQ1L0I5LQm2Z
+						8eniR7GRXHoe8ARm0KeKkOI0RPDH7P7ovvdTaBWjbESxwa/LybHUKNGKikJBnmpW
+						kD+04h6aOISdCNM5gK7arXSdymnw8tBDDcD4InhaUjpb16lKzLOg9MrEflKxYGvt
+						sRNksXgJ/NXz72RR6e2XBJc/GcJLYqtE9GUa+9WBBywVjKxCfkTchtKZJJ5671gt
+						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>
diff --git a/swamid-interfederations-2.0/secure.ibisworld.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/secure.ibisworld.co.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..7395ab3a
--- /dev/null
+++ b/swamid-interfederations-2.0/secure.ibisworld.co.uk-shibboleth-sp.xml
@@ -0,0 +1,66 @@
+<?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://secure.ibisworld.co.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-23T09:34: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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IBISWorld UK</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Welcome to IBISWorld, the UK's richest source of business and industry information.</mdui:Description>
+        <mdui:Logo height="48" width="158">https://secure.ibisworld.co.uk/img/logosmall.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC/TCCAeWgAwIBAgIJAP4Fp5haHFgMMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnNwLmliaXN3b3JsZC5jby51azAeFw0xMTA5MDYwMDQ0MTVaFw0yMTA5MDMw
+						MDQ0MTVaMB0xGzAZBgNVBAMTEnNwLmliaXN3b3JsZC5jby51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAMQHhKOh5tWySehDDucIlkK15NotzimeWOnr
+						1QklBthu1UJa07hTqrBw57aMHuJ0+WI1KSz30/xfwk3mv8sB3HvSCgt9HhwFeVnJ
+						7jMmZF/MNqI/RXFtCQdVmGyBNhhU/C2n6zDVYQE4f9115r4iIcxpR6ddbL3s9B1I
+						5UDDhTTOkFXrnfdyaPWfhANdmLbjO386S5o0IdeS5+WilyEHO7Gk7tKwi4Qn9Jim
+						tnDz0UFuMgRS9yiuNepiXhReEO2QwYRw+tDfmDql3bc+lRzlaqFTX4AbJh6OdMrO
+						zcPPjsHMnlCwDyg81UYSkNsfyUjswp5UYfZhb9KAMKyXNVLcs40CAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISc3AuaWJpc3dvcmxkLmNvLnVrMB0GA1UdDgQWBBS3kV42C8Eb
+						2/LQ1U4eh6whZrS6TDANBgkqhkiG9w0BAQUFAAOCAQEAuhXSnv+l5lcCYuhfhZ2N
+						QqAgP+4kETNy9DSiOJ65IrRP8udPrC89IXfL5ypHO8fdhNOCxI8krdIH64Jm7lth
+						vDck0+gkDGLAeXVxEDczwP8O3nNWdC+fNWTgIAkyXLDS3jhJq/cwHvW1jJRdyJlQ
+						ltUXRoyxRkveiAx/M1pMtUkJGGAwAvcwutr8poLb/SwMgqnSSyDga+zXpwYqrZ8V
+						taIO6RtXMxMf+yv3uebcJiUMAUZExF8G4h6rIPSAt2Xi3oDAavBfo1ZRS0esJUL+
+						QRuvgFY9tYDxs2vrZOwMut/o9z69OWvnQoV87PqJAH1KjIQSClzrY9gj9k0aPiva
+						3w==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IBISWorld</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IBISWorld UK</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ibisworld.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IBISWorld IT Team</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@ibisworld.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Sells</md:SurName>
+    <md:EmailAddress>mailto:Roberts@ibisworld.com</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
new file mode 100644
index 00000000..7999932c
--- /dev/null
+++ b/swamid-interfederations-2.0/secure.nature.com-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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 use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDNDCCAhygAwIBAgIEUBaY0jANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzEaMBgGA1UEAxMRc2VjdXJlLm5hdHVyZS5jb20wHhcNMTIwNzMwMTQyMzE0
+						WhcNMTUwNzMwMTQyMzE0WjBcMQswCQYDVQQGEwJVSzEPMA0GA1UEBxMGTG9uZG9u
+						MRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzEaMBgGA1UEAxMRc2Vj
+						dXJlLm5hdHVyZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCN
+						ab3XUgdogYGSr1QIaEGDF9YUvqapAg6Sq8rkGfahy2+Iqp+myMr0rqQpeDEpch6U
+						/figIswWVR4P5GA9+w68AKkmNGQhCmAbJQCWK3yQlDb8aHnPDG6aOZcJPsvT7lGs
+						/uyR5CkE9Hbvk3EbwKmnz7GDtxG6J/LrnO2VMEbfzgbFBe2saOdShY2ysUJ6ZVBM
+						+DtLBhJRGokaKrIOjunydAA2HHpBgOdjyiiZ6H2Q1XE+5iOLXRl4oyBTbJZKlgCC
+						ozBMFSI6x8oaMwA15Ik90BQD8baO7rB23Tumaw8cytgm5YxT1M923h2OfgNOw1qY
+						Frx3iKQk79n4ZynvxHDNAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGY2fxjlC2+8
+						ZQIVdSVMR5470507XCMZ0vA33K2oScR1a+klcSFeOfu3Z+HEG4aCaB6E5wKpZPLZ
+						PQhZDNPhoUso4pBjOLOjWRG89ziWsfbMZ4JPlEmiK5U+zLOR4yA2T0ipiLGqS5pv
+						hmOditj2X06Ghbcn029hXKWsczc/dW0+ukraC9cndXkyESYkzc0spBtlMqKwrD8g
+						AeQV1hunv4YQE3qWv7zRvHaUmAmv5GyW6HQiBudCyrZx9AA3+2YRknwTSCUu6bYR
+						uVW5mhgM/CBHwaVDUF0abyuyizsj0KRc7tWbtxpwomE+symUtrrmQBqPW3B5yq6+
+						53kqJpLR8ZE=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDNDCCAhygAwIBAgIEUBaY0jANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzEaMBgGA1UEAxMRc2VjdXJlLm5hdHVyZS5jb20wHhcNMTIwNzMwMTQyMzE0
+						WhcNMTUwNzMwMTQyMzE0WjBcMQswCQYDVQQGEwJVSzEPMA0GA1UEBxMGTG9uZG9u
+						MRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzEaMBgGA1UEAxMRc2Vj
+						dXJlLm5hdHVyZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCN
+						ab3XUgdogYGSr1QIaEGDF9YUvqapAg6Sq8rkGfahy2+Iqp+myMr0rqQpeDEpch6U
+						/figIswWVR4P5GA9+w68AKkmNGQhCmAbJQCWK3yQlDb8aHnPDG6aOZcJPsvT7lGs
+						/uyR5CkE9Hbvk3EbwKmnz7GDtxG6J/LrnO2VMEbfzgbFBe2saOdShY2ysUJ6ZVBM
+						+DtLBhJRGokaKrIOjunydAA2HHpBgOdjyiiZ6H2Q1XE+5iOLXRl4oyBTbJZKlgCC
+						ozBMFSI6x8oaMwA15Ik90BQD8baO7rB23Tumaw8cytgm5YxT1M923h2OfgNOw1qY
+						Frx3iKQk79n4ZynvxHDNAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGY2fxjlC2+8
+						ZQIVdSVMR5470507XCMZ0vA33K2oScR1a+klcSFeOfu3Z+HEG4aCaB6E5wKpZPLZ
+						PQhZDNPhoUso4pBjOLOjWRG89ziWsfbMZ4JPlEmiK5U+zLOR4yA2T0ipiLGqS5pv
+						hmOditj2X06Ghbcn029hXKWsczc/dW0+ukraC9cndXkyESYkzc0spBtlMqKwrD8g
+						AeQV1hunv4YQE3qWv7zRvHaUmAmv5GyW6HQiBudCyrZx9AA3+2YRknwTSCUu6bYR
+						uVW5mhgM/CBHwaVDUF0abyuyizsj0KRc7tWbtxpwomE+symUtrrmQBqPW3B5yq6+
+						53kqJpLR8ZE=
+					</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>
diff --git a/swamid-interfederations-2.0/secure.palgrave-journals.com-shibboleth.xml b/swamid-interfederations-2.0/secure.palgrave-journals.com-shibboleth.xml
new file mode 100644
index 00000000..9dabe72b
--- /dev/null
+++ b/swamid-interfederations-2.0/secure.palgrave-journals.com-shibboleth.xml
@@ -0,0 +1,50 @@
+<?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>
+						MIIDSjCCAjKgAwIBAgIEUBaY1DANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJVSzEPMA0GA1UE
+						BxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzElMCMGA1UEAxMcc2Vj
+						dXJlLnBhbGdyYXZlLWpvdXJuYWxzLmNvbTAeFw0xMjA3MzAxNDIzMTZaFw0xNTA3MzAxNDIzMTZa
+						MGcxCzAJBgNVBAYTAlVLMQ8wDQYDVQQHEwZMb25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoG
+						A1UECxMDTlBHMSUwIwYDVQQDExxzZWN1cmUucGFsZ3JhdmUtam91cm5hbHMuY29tMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlmzoWHBfCOrPzhq9lUehc6j7ZTBAW+yIgksFMqi3BB5L
+						nKm8DkRtMGK1JQQgi26LVi7Ag3LHdiA1VSytBuMqTfpreSA586Il+TizIU2AqTLdXyAC5lSj2h9S
+						F+X0tyaNBNrKNY7YOBLYpxm5PS81GVAuFQE2HziYWg2jTPAnQs8c9X7V/mnzMPUDmWnXDoffgATP
+						TfM60cSe0oUSwlUGxquUGzxf4dIvk7OA3P+uivFEwl0XzTREMAe3NHyMMnbU6l8SxTGzjRvArsIM
+						H7GuW1PKqsF6RPBO+HpXgYUfm2+RIjn/Bfs5K1yw1IVvPeqg88Vnn5LnjGP1bGtfohycdwIDAQAB
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBvSh7zwMqKaXPvLDU023aGMvGmbRKIWoJMvc62mlZcUS8ShnUd
+						4EnxBxXTGFDYRK4H/iqgW0yBLe3jDiZs0Inyh9uzBZReq6WR/DUcDujFN3QlcMO6RyZOdEV2QD/R
+						okVuGT7aiRF1MTMKfHy+rwkHaQRh/RlDiPfSVT+X7wyuhq8pjP9stOVf1D3Y/qT4o0PVl7KwWvOA
+						RMJKrIybbPhY24D6MNcLI37vIbdZTBiGptX1b7NjAy7X3GWf/WRNGtq5AtnvNOrpdm2oQti46Uoz
+						CY8R5Hdqk3bQ4t6lE/3HXbHeRZ2muCOaYSfg60h1RTCtR4IUqmJ9cWgJQtCUe2CF
+					</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>
diff --git a/swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml
new file mode 100644
index 00000000..a47ee022
--- /dev/null
+++ b/swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml
@@ -0,0 +1,53 @@
+<?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>
+						MIIDRjCCAi6gAwIBAgIEUgn/jjANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzEjMCEGA1UEAxMac2VjdXJlLnBhbGdyYXZlY29ubmVjdC5jb20wHhcNMTMw
+						ODEzMDk0MjM4WhcNMjMwODExMDk0MjM4WjBlMQswCQYDVQQGEwJVSzEPMA0GA1UE
+						BxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzEjMCEG
+						A1UEAxMac2VjdXJlLnBhbGdyYXZlY29ubmVjdC5jb20wggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQDVuyehBoUW75bHqXMOByfTlLs2QoQlyQjZdoQ6CE3N
+						iAsKnBQ9SzcxeLUItBFzZ5rrZtSgfbOrF8qGX7JDvr61o3We5tz33Z4zClmolRUU
+						PWItfDhUybNf217Yg0nASYdovP3feM8Li2tg+jSguD+EwUIpfNcQ+DQShpPaOj+d
+						nvl7Kut68r6JcLPaWWD/FMxFzyEr/EGmfWzyFb4wfZEaRBEEvMpwJxl+kk8hoCXx
+						vIjr4KLxlWjzplPbhdQFAvyiYvrzGEhCbNedFDXX9qE66KvY0bB4+JQ5dLEsVlIc
+						zxNZY/pCQo7k6HJ1W+lDpr8EddoJ0gt+dzwWx7Ea+5HfAgMBAAEwDQYJKoZIhvcN
+						AQEFBQADggEBAK/wqCVa2CziSKHgisbadotO21AeWCn8p1ny0df1iytnuxqK+UX8
+						lfr96g99CWWU74FHr0bT80sEi0HGsRXzQ2SwoHCEUNHFrSgvLWWDEVM/MOrJy/fB
+						2turD2G56p77lp1prGNUGmVQzuQaGTktcT/20+mOw0cCoHXzGPeqGb2M1EqgC5Ua
+						eGEGQvbkiflwYCRd8BLV8NL1Y5b+W+Qb+6K8GbLWiA2HLKnJBgXAtjrDau1B431H
+						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>Mohammad</md:GivenName>
+    <md:SurName>Nawab</md:SurName>
+    <md:EmailAddress>mailto:m.nawab@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mohammad</md:GivenName>
+    <md:SurName>Nawab</md:SurName>
+    <md:EmailAddress>mailto:m.nawab@nature.com</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
new file mode 100644
index 00000000..f2703a5c
--- /dev/null
+++ b/swamid-interfederations-2.0/send.goetec.ac.uk-simplesaml.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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>
+						MIID7zCCAtegAwIBAgIJAJ98fbY88KSnMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
+						VQQGEwJHQjENMAsGA1UECAwES2VudDETMBEGA1UEBwwKQ2FudGVyYnVyeTEfMB0G
+						A1UECgwWVGhlIFVuaXZlcnNpdHkgb2YgS2VudDEdMBsGA1UECwwUSW5mb3JtYXRp
+						b24gU2VydmljZXMxGjAYBgNVBAMMEXNlbmQuZ29ldGVjLmFjLnVrMB4XDTEyMDkx
+						MTEzMTU0OFoXDTIyMDkxMTEzMTU0OFowgY0xCzAJBgNVBAYTAkdCMQ0wCwYDVQQI
+						DARLZW50MRMwEQYDVQQHDApDYW50ZXJidXJ5MR8wHQYDVQQKDBZUaGUgVW5pdmVy
+						c2l0eSBvZiBLZW50MR0wGwYDVQQLDBRJbmZvcm1hdGlvbiBTZXJ2aWNlczEaMBgG
+						A1UEAwwRc2VuZC5nb2V0ZWMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQCtwHM4Adap0jYPj2ltPUClbjXDRxayuW36hG8Po/ZN4FxOKs1mqWvX
+						BlJowimehp8nwyKafPw2hVvsW2VsHeyECbH7Qrin7n0kXBF3n1bp6uNqK9S/j3uq
+						irlSXke+Oqn1N/1sKsAr++jSksoareGtKZyaKiWHsXGVix8m+6+xAEpbFYU+YoGK
+						UikpUW6njVMx59scTMg9fCjmEu+/FrTA1AMv3NQrdvH7SEKfkCohpQiF+IUHWwxT
+						t0pVZQwwbVwyhNCkghQquIIbffkGiP1k65GD9auUsUS+PsnDqUljkDgw/EZM+dRJ
+						yHO7R2Z7+XQTARIIX+2e2cUoNGaiJfznAgMBAAGjUDBOMB0GA1UdDgQWBBQt99ir
+						zKa9WJyz55xd4C6c2D/15TAfBgNVHSMEGDAWgBQt99irzKa9WJyz55xd4C6c2D/1
+						5TAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBDDC8ZFKjivkxNix2N
+						eNWm6sNTLb7F3NxUod3uBpmWPjoLwC1OFgv6ZWn+E5pvRZM73tT6pt84uGv1HECb
+						hyrP+/EvzcVZOnEZhZ3xcmkY8tjU4YV+mxbOjM9+o6fPK6wZZEGkvuvEiozgZWz9
+						1pgoAYbcAKQg863qMZd5UZVKFnkeZSwbtT6YN7QQTvmIinB0D3kmBaIni6UE1+LV
+						ikLmcdp+31aJwR3BuffzGGsxJouON2Ls8NTGPMMhJSpVYpgtCyjVDCVU3OVosnUZ
+						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>
+						MIID7zCCAtegAwIBAgIJAJ98fbY88KSnMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
+						VQQGEwJHQjENMAsGA1UECAwES2VudDETMBEGA1UEBwwKQ2FudGVyYnVyeTEfMB0G
+						A1UECgwWVGhlIFVuaXZlcnNpdHkgb2YgS2VudDEdMBsGA1UECwwUSW5mb3JtYXRp
+						b24gU2VydmljZXMxGjAYBgNVBAMMEXNlbmQuZ29ldGVjLmFjLnVrMB4XDTEyMDkx
+						MTEzMTU0OFoXDTIyMDkxMTEzMTU0OFowgY0xCzAJBgNVBAYTAkdCMQ0wCwYDVQQI
+						DARLZW50MRMwEQYDVQQHDApDYW50ZXJidXJ5MR8wHQYDVQQKDBZUaGUgVW5pdmVy
+						c2l0eSBvZiBLZW50MR0wGwYDVQQLDBRJbmZvcm1hdGlvbiBTZXJ2aWNlczEaMBgG
+						A1UEAwwRc2VuZC5nb2V0ZWMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQCtwHM4Adap0jYPj2ltPUClbjXDRxayuW36hG8Po/ZN4FxOKs1mqWvX
+						BlJowimehp8nwyKafPw2hVvsW2VsHeyECbH7Qrin7n0kXBF3n1bp6uNqK9S/j3uq
+						irlSXke+Oqn1N/1sKsAr++jSksoareGtKZyaKiWHsXGVix8m+6+xAEpbFYU+YoGK
+						UikpUW6njVMx59scTMg9fCjmEu+/FrTA1AMv3NQrdvH7SEKfkCohpQiF+IUHWwxT
+						t0pVZQwwbVwyhNCkghQquIIbffkGiP1k65GD9auUsUS+PsnDqUljkDgw/EZM+dRJ
+						yHO7R2Z7+XQTARIIX+2e2cUoNGaiJfznAgMBAAGjUDBOMB0GA1UdDgQWBBQt99ir
+						zKa9WJyz55xd4C6c2D/15TAfBgNVHSMEGDAWgBQt99irzKa9WJyz55xd4C6c2D/1
+						5TAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBDDC8ZFKjivkxNix2N
+						eNWm6sNTLb7F3NxUod3uBpmWPjoLwC1OFgv6ZWn+E5pvRZM73tT6pt84uGv1HECb
+						hyrP+/EvzcVZOnEZhZ3xcmkY8tjU4YV+mxbOjM9+o6fPK6wZZEGkvuvEiozgZWz9
+						1pgoAYbcAKQg863qMZd5UZVKFnkeZSwbtT6YN7QQTvmIinB0D3kmBaIni6UE1+LV
+						ikLmcdp+31aJwR3BuffzGGsxJouON2Ls8NTGPMMhJSpVYpgtCyjVDCVU3OVosnUZ
+						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>
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
new file mode 100644
index 00000000..2e74c461
--- /dev/null
+++ b/swamid-interfederations-2.0/serviceadmin-test.company.ja.net-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-17T13:22: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/WAYF"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC4jCCAcqgAwIBAgIJAKyF+vahRReuMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+						BAMTCWhhcjAwMzkxODAeFw0wOTExMjAwODM4MTVaFw0xOTExMTgwODM4MTVaMBQx
+						EjAQBgNVBAMTCWhhcjAwMzkxODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAKyGnAXQpTnriKaVLhBxB2V01KEV7JFljb6JyCUgmPzhjozQV78Lt6wnrlVE
+						PMJUFzx6MhVOOFdmoud9f4uEt3eLeNNBkXy6F1hLsK93MmEq7NycC9f+RTGkXuI9
+						ZZ6bHpCQg4cgLlo+e+oSmyFrqdwHkKXRxhx7sLDpmrBRt4WS1Yom/sf1roaj/HYJ
+						I09jwKfl5mlFhWqHoprT6zHYZ/q4HIgo8CYFzRPTBYP2WoakD87P3UPpVZj6uLAz
+						d8LCuv1ZX2HJTHYrUyEM4tbqA2cv/CN8W6cgTkm5puZAMvPmFeNnoQlkBnUpH/oc
+						oGDmT026FyBGQ6yXva1uZVOX0xMCAwEAAaM3MDUwFAYDVR0RBA0wC4IJaGFyMDAz
+						OTE4MB0GA1UdDgQWBBQST9Pog/haMAhYi8W9rY0cKz3XfjANBgkqhkiG9w0BAQUF
+						AAOCAQEAERDcKAB+oNKMF14ys3MjR7NgPZzAnxNjyDizDMsPug9ZqfXKTfU1NFZx
+						nx1ihIXHOBZgLU4RKLJSopHZ57V+HlOebXCckx/je1y4a30B0sIg3yk9ZZlMNcVI
+						JWEIEGc6kkIhgQBMAtTaae+Yd1gqk4MQBQG08iDy9M3E4jp3BmgZbJL2lBYwCoRc
+						U2soIdQNoQS5WDuqwDVXqOljUfijVZU9YRpjPDsXqDQDVO+7v/EbPxVtRThQChxY
+						LwXeoQe6wBNtmeBEdm16Ik+PCxkgQlTCLythjkwmB+AjmqoW6Kp9bNfh7/Tlv/lM
+						bYW9q2/JzwJW2LhAXTV1ev8D9e3peg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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="6"/>
+    <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="7"/>
+    <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="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://serviceadmin-test.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-test.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-test.company.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">JISC Collections and Janet 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
new file mode 100644
index 00000000..8aa0d1fd
--- /dev/null
+++ b/swamid-interfederations-2.0/serviceadmin.company.ja.net-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-17T14:09:03Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol 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"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC4jCCAcqgAwIBAgIJAKyF+vahRReuMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+						BAMTCWhhcjAwMzkxODAeFw0wOTExMjAwODM4MTVaFw0xOTExMTgwODM4MTVaMBQx
+						EjAQBgNVBAMTCWhhcjAwMzkxODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAKyGnAXQpTnriKaVLhBxB2V01KEV7JFljb6JyCUgmPzhjozQV78Lt6wnrlVE
+						PMJUFzx6MhVOOFdmoud9f4uEt3eLeNNBkXy6F1hLsK93MmEq7NycC9f+RTGkXuI9
+						ZZ6bHpCQg4cgLlo+e+oSmyFrqdwHkKXRxhx7sLDpmrBRt4WS1Yom/sf1roaj/HYJ
+						I09jwKfl5mlFhWqHoprT6zHYZ/q4HIgo8CYFzRPTBYP2WoakD87P3UPpVZj6uLAz
+						d8LCuv1ZX2HJTHYrUyEM4tbqA2cv/CN8W6cgTkm5puZAMvPmFeNnoQlkBnUpH/oc
+						oGDmT026FyBGQ6yXva1uZVOX0xMCAwEAAaM3MDUwFAYDVR0RBA0wC4IJaGFyMDAz
+						OTE4MB0GA1UdDgQWBBQST9Pog/haMAhYi8W9rY0cKz3XfjANBgkqhkiG9w0BAQUF
+						AAOCAQEAERDcKAB+oNKMF14ys3MjR7NgPZzAnxNjyDizDMsPug9ZqfXKTfU1NFZx
+						nx1ihIXHOBZgLU4RKLJSopHZ57V+HlOebXCckx/je1y4a30B0sIg3yk9ZZlMNcVI
+						JWEIEGc6kkIhgQBMAtTaae+Yd1gqk4MQBQG08iDy9M3E4jp3BmgZbJL2lBYwCoRc
+						U2soIdQNoQS5WDuqwDVXqOljUfijVZU9YRpjPDsXqDQDVO+7v/EbPxVtRThQChxY
+						LwXeoQe6wBNtmeBEdm16Ik+PCxkgQlTCLythjkwmB+AjmqoW6Kp9bNfh7/Tlv/lM
+						bYW9q2/JzwJW2LhAXTV1ev8D9e3peg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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 Collections and Janet 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/serviceregistry.oerc.ox.ac.uk-simplesaml-.xml b/swamid-interfederations-2.0/serviceregistry.oerc.ox.ac.uk-simplesaml-.xml
new file mode 100644
index 00000000..a2a9c361
--- /dev/null
+++ b/swamid-interfederations-2.0/serviceregistry.oerc.ox.ac.uk-simplesaml-.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://serviceregistry.oerc.ox.ac.uk/simplesaml/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-26T17: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:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFCTCCA++gAwIBAgIJAJMYOQ/+WX4fMA0GCSqGSIb3DQEBBQUAMIGyMQswCQYD
+						VQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
+						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxDTALBgNVBAsTBE9lUkMxJjAk
+						BgNVBAMTHXNlcnZpY2VyZWdpc3RyeS5vZXJjLm94LmFjLnVrMSYwJAYJKoZIhvcN
+						AQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51azAeFw0xMTA1MTkxNDE5MTFaFw0y
+						MTA1MTYxNDE5MTFaMIGyMQswCQYDVQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hp
+						cmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZv
+						cmQxDTALBgNVBAsTBE9lUkMxJjAkBgNVBAMTHXNlcnZpY2VyZWdpc3RyeS5vZXJj
+						Lm94LmFjLnVrMSYwJAYJKoZIhvcNAQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51
+						azCCASMwDQYJKoZIhvcNAQEBBQADggEQADCCAQsCggECAsypwS5qHz9mQhrwO7Ij
+						rtstJaTgrcuhP3S8WDlonzdTW7CWOAaUQVRpp7sOJ8o1ikA5XB0aU9ORyCu2jJOZ
+						zlVnSP5ev88JcGFTUgsWHCQ9YCS6kJFnMhnxrWP1Xr3hdmL5TVU5SEaWzINfRxNu
+						i5plV62UwuWImwVUcQ2h/kvU1GSzuS7BAH8fvUZ/bfiaCKEvmfD/PnfE/etWpil+
+						X3WrL3MYlbVcPPndHDr5w+Vk/ffzYoH19/Dqu12/iVboR7zUSrj51bojPlHlx4JS
+						el60U7gHm0muN3KPVgWJQvcyLphBEpID0zm2Zw+7+/DG4c3laJLeYTds0tpS2pBP
+						7FzfAgMBAAGjggEbMIIBFzAdBgNVHQ4EFgQUiVhE6lTDYudFqofjxhNzqqQEjz4w
+						gecGA1UdIwSB3zCB3IAUiVhE6lTDYudFqofjxhNzqqQEjz6hgbikgbUwgbIxCzAJ
+						BgNVBAYTAlVLMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3Jk
+						MR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9yZDENMAsGA1UECxMET2VSQzEm
+						MCQGA1UEAxMdc2VydmljZXJlZ2lzdHJ5Lm9lcmMub3guYWMudWsxJjAkBgkqhkiG
+						9w0BCQEWF3hpbi54aW9uZ0BvZXJjLm94LmFjLnVrggkAkxg5D/5Zfh8wDAYDVR0T
+						BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQMAAFaAy6JCEMZESspH2sDJ+37EmnCS
+						Am8e961gQd7OBlNXjqV8K9+Qrt18YAXKWwq7s1A19+96Ui1Uuc8swDRNIYdg76nV
+						Zip44kIDpk3g98Dth5zJ12BRJkd+hkR9TZ+7rOHdMZB2Legn6/hWK59PDHZCOLMq
+						3olFW9tmuxO/MTw3ZAVcitKR3q/amlCesr907AY5vnfd2tyVN3c65pY4/nEjNYpc
+						61bbwWt6x/xnmBlwdx+jNjdn8d2mHctH+1lBi3k8g494Aa27yX2t8NkGs6sk3x6j
+						vXs3buSo2iGEY4/5JsFSctsHW8yaW/nRJXKVYM/0r0m5duuXPBhRFWpkEfNU
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFCTCCA++gAwIBAgIJAJMYOQ/+WX4fMA0GCSqGSIb3DQEBBQUAMIGyMQswCQYD
+						VQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
+						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxDTALBgNVBAsTBE9lUkMxJjAk
+						BgNVBAMTHXNlcnZpY2VyZWdpc3RyeS5vZXJjLm94LmFjLnVrMSYwJAYJKoZIhvcN
+						AQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51azAeFw0xMTA1MTkxNDE5MTFaFw0y
+						MTA1MTYxNDE5MTFaMIGyMQswCQYDVQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hp
+						cmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZv
+						cmQxDTALBgNVBAsTBE9lUkMxJjAkBgNVBAMTHXNlcnZpY2VyZWdpc3RyeS5vZXJj
+						Lm94LmFjLnVrMSYwJAYJKoZIhvcNAQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51
+						azCCASMwDQYJKoZIhvcNAQEBBQADggEQADCCAQsCggECAsypwS5qHz9mQhrwO7Ij
+						rtstJaTgrcuhP3S8WDlonzdTW7CWOAaUQVRpp7sOJ8o1ikA5XB0aU9ORyCu2jJOZ
+						zlVnSP5ev88JcGFTUgsWHCQ9YCS6kJFnMhnxrWP1Xr3hdmL5TVU5SEaWzINfRxNu
+						i5plV62UwuWImwVUcQ2h/kvU1GSzuS7BAH8fvUZ/bfiaCKEvmfD/PnfE/etWpil+
+						X3WrL3MYlbVcPPndHDr5w+Vk/ffzYoH19/Dqu12/iVboR7zUSrj51bojPlHlx4JS
+						el60U7gHm0muN3KPVgWJQvcyLphBEpID0zm2Zw+7+/DG4c3laJLeYTds0tpS2pBP
+						7FzfAgMBAAGjggEbMIIBFzAdBgNVHQ4EFgQUiVhE6lTDYudFqofjxhNzqqQEjz4w
+						gecGA1UdIwSB3zCB3IAUiVhE6lTDYudFqofjxhNzqqQEjz6hgbikgbUwgbIxCzAJ
+						BgNVBAYTAlVLMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3Jk
+						MR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9yZDENMAsGA1UECxMET2VSQzEm
+						MCQGA1UEAxMdc2VydmljZXJlZ2lzdHJ5Lm9lcmMub3guYWMudWsxJjAkBgkqhkiG
+						9w0BCQEWF3hpbi54aW9uZ0BvZXJjLm94LmFjLnVrggkAkxg5D/5Zfh8wDAYDVR0T
+						BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQMAAFaAy6JCEMZESspH2sDJ+37EmnCS
+						Am8e961gQd7OBlNXjqV8K9+Qrt18YAXKWwq7s1A19+96Ui1Uuc8swDRNIYdg76nV
+						Zip44kIDpk3g98Dth5zJ12BRJkd+hkR9TZ+7rOHdMZB2Legn6/hWK59PDHZCOLMq
+						3olFW9tmuxO/MTw3ZAVcitKR3q/amlCesr907AY5vnfd2tyVN3c65pY4/nEjNYpc
+						61bbwWt6x/xnmBlwdx+jNjdn8d2mHctH+1lBi3k8g494Aa27yX2t8NkGs6sk3x6j
+						vXs3buSo2iGEY4/5JsFSctsHW8yaW/nRJXKVYM/0r0m5duuXPBhRFWpkEfNU
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceregistry.oerc.ox.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://serviceregistry.oerc.ox.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://serviceregistry.oerc.ox.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://serviceregistry.oerc.ox.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://serviceregistry.oerc.ox.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 Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Service Registry SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oerc.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:support@oerc.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:support@oerc.ox.ac.uk</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
new file mode 100644
index 00000000..c40182e4
--- /dev/null
+++ b/swamid-interfederations-2.0/services.oxfordjournals.org-shibboleth.xml
@@ -0,0 +1,80 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</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
new file mode 100644
index 00000000..65e458de
--- /dev/null
+++ b/swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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="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>
+					      MIIDLzCCAhegAwIBAgIUFBBFYZ1kzTq980fHApAgt04rr94wDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRc2VzYW1lLmlmc3R0YXIuZnIwHhcNMTIxMDE4MTI0NzIw
+WhcNMzIxMDE4MTI0NzIwWjAcMRowGAYDVQQDExFzZXNhbWUuaWZzdHRhci5mcjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAITYkLPB/bNFZ5N45Mbt3Qpu
+ln2afxx+yKPW6GmrNVSNF9P8WUoG3ThL1zzgjcfbstBjvG/kDYE93+ltFqIH7tbl
+VzHxVB+tKQW/+343lwuu0efE8bS/KeIwcGc7Z/HHBYj3uMGKwb3uGCuT9NL0OkYw
+PCVruRk9okCFSi4ae1ObBVkuItgvgpTDI/kdj7KmIIMr/yLFAkyMz1DuV3l9+AZz
+duqcJiF+LHJSE0lZf0svHQCLzD6Pe1JQ45OGCWwnoBLmeVKf/b7j2h6W6RXq4RMT
+lrZ5fzWwJ0KsGdEGQVXj5GimCDS9dBogdj2r/talnEQLqPjMiXhp30jhOJwcoFEC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2VzYW1lLmlmc3R0YXIuZnKGKGh0dHBzOi8v
+c2VzYW1lLmlmc3R0YXIuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFE+NF0RZ
+ywRw9y1ZNpMcW8EacqukMA0GCSqGSIb3DQEBBQUAA4IBAQAHY1rVEQaKk+8ppYzL
+ov5SpSlw9ET6XgBLdOcqa8sR0+ON0AMWc/wAeAKSeZhgSe6rPOppfiupEshtW0GK
+JWcq/QlK1jG8S/MnP3qSrwezdBVpRz305E5u6DDHu2q1WP+2N/zk9WEd/T6q5H23
+whwyEA7h89qOhhU/MmrnogQcF0tNY54dz6faTjhoEUNTniRB1+Wc4yrrLoikBONr
+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://unknown.site.com</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
new file mode 100644
index 00000000..64b4e799
--- /dev/null
+++ b/swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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">
+                        Africa Grid Science Gateway
+                    </mdui:DisplayName>
+        <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">
+                        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>
+MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
+VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
+EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
+c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
+T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
+3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
+O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
+i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
+LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
+TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
+AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
+BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
+A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
+IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
+KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
+AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
+Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
+ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
+ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
+bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
+LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
+ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
+cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
+iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
+PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
+n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
+zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
+2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
+j/MCNlE=
+</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">
+                    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>
diff --git a/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml b/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml
new file mode 100644
index 00000000..03d10449
--- /dev/null
+++ b/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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: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>
+MIIE6TCCA9GgAwIBAgIRALptUo7+DEUSrs09PRm311swDQYJKoZIhvcNAQEFBQAw
+PzELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEfMB0GA1UEAxMWVEVSRU5B
+IGVTY2llbmNlIFNTTCBDQTAeFw0xNTAxMDcwMDAwMDBaFw0xNjAyMDYyMzU5NTla
+MIGCMRMwEQYKCZImiZPyLGQBGRYDb3JnMRYwFAYKCZImiZPyLGQBGRYGdGVyZW5h
+MRMwEQYKCZImiZPyLGQBGRYDdGNzMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBW
+YWxpZGF0ZWQxGzAZBgNVBAMTEnNnLWxpZmVyYXkuZ2Fyci5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALX1GKeAFimAFVU5XaPX0Jb/UnbO9FMew0rS
+CwlGA/57V+7Gr0RsuCsmUoMOuITbTCz0K23A1e9mPflSuJNPQf30d/jE+rf3icrK
+M7wZVzKdqyodzV7d2e0p1LjVz7qE/DCREUI9ADZJpMRRLk2hWfBxog93SIM3YwFq
+u6r+BySrtDuwwAbiz3Hvo3QL+dsQbX8p8doML8O1F8S2KC82Pn5piyq+QzeYzJeL
+evr+8XyUzmDVEahQ8OxU0UxsSwm19WIqhYY3TB5o2Y0fxhCJzOA6Ypg9gul/o+Jp
+Tsi1HJFrbWhQxI9rNmcy6VIoH45stsYkiFrdgY2xb2WlsH7/ad0CAwEAAaOCAZow
+ggGWMB8GA1UdIwQYMBaAFCPTl73A2KGUYYgNhbbMdZ/JeTuSMB0GA1UdDgQWBBQj
+k9y2Mc0DO7GK4AOzZF2f+FDsWDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMAYDVR0gBCkwJzANBgsr
+BgEEAbIxAQICHTAMBgoqhkiG90wFAgIBMAgGBmeBDAECATBCBgNVHR8EOzA5MDeg
+NaAzhjFodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQWVTY2llbmNlU1NM
+Q0EuY3JsMHUGCCsGAQUFBwEBBGkwZzA9BggrBgEFBQcwAoYxaHR0cDovL2NydC50
+Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNydDAmBggrBgEFBQcw
+AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwKgYDVR0RBCMwIYISc2ctbGlm
+ZXJheS5nYXJyLml0ggtzZ3cuZ2Fyci5pdDANBgkqhkiG9w0BAQUFAAOCAQEAQcaR
+DxdFgJsT0c5yNj/3GqYtNVwyWXN7AWul/V4VGq9sp36IqV2wmqScGkCEWHGsaUrX
+K5mNW5cmEM8Yqhew/Bvl8I10lvVreZ2TVvd+YGa2aLdIdhKld0fEMZ2RR5AYzGPY
+34PFlE6JqWOWHTvxwYGTv+tIy+Pel0D06afKEJ3PaVCcs2HuM/PxxQ/fDmvABZwR
+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>
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
new file mode 100644
index 00000000..1bfff377
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-dev-idp.ucl.ac.uk-shibboleth.xml
@@ -0,0 +1,111 @@
+<?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>
+      <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
+						VQQDDBZzaGliLWRldi1pZHAudWNsLmFjLnVrMSAwHgYJKoZIhvcNAQkBFhFzeXN0
+						ZW1zQHVjbC5hYy51azAeFw0xNDA3MTYwOTM2MjVaFw0zNDA3MTEwOTM2MjVaMIGj
+						MQswCQYDVQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJz
+						aXR5IENvbGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1z
+						MR8wHQYDVQQDDBZzaGliLWRldi1pZHAudWNsLmFjLnVrMSAwHgYJKoZIhvcNAQkB
+						FhFzeXN0ZW1zQHVjbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAJoeYUGKiYtv/Oyig14vtdTmJkVWkZ72Snk6jTD0dym9MG6W7VonflQXcDtN
+						jrLd2soPM8zktKrhIH9QvzAw6w11q55zyhsQWb+L2zPob6M7+b0OuBpU2m4Cc+K6
+						8uZJWzKPJSi6wGR4cm//dGlGWdCZGA0ziXD596H7OEBOB9pq2rxHm+YeOjAmGGzm
+						iyjvMfuMDLz5o5H0jiMgXaYSlYv2kBhnemOoDOjwluFxXhiSJvtgLjsbCppSn+vz
+						fWbSD7Fu2zTA86bcKpV77EjQfudOCKhBahBrTxqj0GAkHFGvew3cxb73H0g8Fx8U
+						MLlupjasOW/Pt9M/4OEWHzUsTaUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
+						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
+						FPweEEgVPfNY/nKzIBiBfs9yjj9RMB8GA1UdIwQYMBaAFPweEEgVPfNY/nKzIBiB
+						fs9yjj9RMA0GCSqGSIb3DQEBBQUAA4IBAQAomp8HYBjip3PbTsXEQvh7khCLjTBP
+						f0cyv39SOf5yV7p6H8hZx5o+v2aUM/MFUqFEvErdUdxGz3vhBu8BYtih7dOLspL7
+						bZzCWdl3Kt7i556G0ncfalL6mf3oW0T/LWh0bUJ3B71MU9UkoJHtUiXe+7O4C5U5
+						JKVC8RUekD9hgAAkQxlSejhbCUnVn32/6G9Ujj+VVCg9FaMxWmVaopjLDb4bdGMS
+						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>
+						MIIERjCCAy6gAwIBAgIJAMLCfrKk2sGkMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
+						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IENv
+						bGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1zMR8wHQYD
+						VQQDDBZzaGliLWRldi1pZHAudWNsLmFjLnVrMSAwHgYJKoZIhvcNAQkBFhFzeXN0
+						ZW1zQHVjbC5hYy51azAeFw0xNDA3MTYwOTM2MjVaFw0zNDA3MTEwOTM2MjVaMIGj
+						MQswCQYDVQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJz
+						aXR5IENvbGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1z
+						MR8wHQYDVQQDDBZzaGliLWRldi1pZHAudWNsLmFjLnVrMSAwHgYJKoZIhvcNAQkB
+						FhFzeXN0ZW1zQHVjbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAJoeYUGKiYtv/Oyig14vtdTmJkVWkZ72Snk6jTD0dym9MG6W7VonflQXcDtN
+						jrLd2soPM8zktKrhIH9QvzAw6w11q55zyhsQWb+L2zPob6M7+b0OuBpU2m4Cc+K6
+						8uZJWzKPJSi6wGR4cm//dGlGWdCZGA0ziXD596H7OEBOB9pq2rxHm+YeOjAmGGzm
+						iyjvMfuMDLz5o5H0jiMgXaYSlYv2kBhnemOoDOjwluFxXhiSJvtgLjsbCppSn+vz
+						fWbSD7Fu2zTA86bcKpV77EjQfudOCKhBahBrTxqj0GAkHFGvew3cxb73H0g8Fx8U
+						MLlupjasOW/Pt9M/4OEWHzUsTaUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
+						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
+						FPweEEgVPfNY/nKzIBiBfs9yjj9RMB8GA1UdIwQYMBaAFPweEEgVPfNY/nKzIBiB
+						fs9yjj9RMA0GCSqGSIb3DQEBBQUAA4IBAQAomp8HYBjip3PbTsXEQvh7khCLjTBP
+						f0cyv39SOf5yV7p6H8hZx5o+v2aUM/MFUqFEvErdUdxGz3vhBu8BYtih7dOLspL7
+						bZzCWdl3Kt7i556G0ncfalL6mf3oW0T/LWh0bUJ3B71MU9UkoJHtUiXe+7O4C5U5
+						JKVC8RUekD9hgAAkQxlSejhbCUnVn32/6G9Ujj+VVCg9FaMxWmVaopjLDb4bdGMS
+						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>
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
new file mode 100644
index 00000000..c760c886
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
@@ -0,0 +1,117 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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
+BQUAMBwxGjAYBgNVBAMTEXNoaWItaWRwLTEub3J1LnNlMB4XDTA5MTAyNjEwMjU1
+NVoXDTI5MTAyNjA5MjU1NVowHDEaMBgGA1UEAxMRc2hpYi1pZHAtMS5vcnUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7J4bgJcpbTuu4SD8pYvDC
+D5lRoaxVTvvacSPEIt2FUTGfa+smWLJvaoxL7eaP517Re9xqqw0MyRZ2fjyDW2GU
+z84RhCMQemT6EccDCEDwubkjoq41QQFbOsk/uh40Q0a/fOniP+e9cDpq57vQTux6
+a1tFNHgbOVR/1PsCksVsY6tdVbR364otqKXIti8ddYmPB5ax5Qr4+ezD7MJwitvN
+NyOgZZ2qM8P7Y1rMN+kKb4OTPHLIhVUiCRtww3p/9HTZOhjxRZbDKNLVQjHCwv9N
+pKh+cON1k5YGSEYba28z1ZuKKvVq6cCMcgndTiMA0R8LxMi3psbWB6rohddoo8E9
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWItaWRwLTEub3J1LnNlhihodHRwczov
+L3NoaWItaWRwLTEub3J1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSJG9Hv
+5hKDK9iBmJYEU3Hg0DZZPzANBgkqhkiG9w0BAQUFAAOCAQEAC1tgenssXaACi4b0
+O+j5Qno3bjq35y+cj0OC/Za2lBuD10zYiySOMcuxg7WdPDiiTKtoBdYkRRN6oKiT
+ix3hLTwuU3PjLTIZ83ytNgezEa6oK+iCGi/ecz2ax77QZ9rqpQCRNudIZjbTN6SO
+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
+BQUAMBwxGjAYBgNVBAMTEXNoaWItaWRwLTEub3J1LnNlMB4XDTA5MTAyNjEwMjU1
+NVoXDTI5MTAyNjA5MjU1NVowHDEaMBgGA1UEAxMRc2hpYi1pZHAtMS5vcnUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7J4bgJcpbTuu4SD8pYvDC
+D5lRoaxVTvvacSPEIt2FUTGfa+smWLJvaoxL7eaP517Re9xqqw0MyRZ2fjyDW2GU
+z84RhCMQemT6EccDCEDwubkjoq41QQFbOsk/uh40Q0a/fOniP+e9cDpq57vQTux6
+a1tFNHgbOVR/1PsCksVsY6tdVbR364otqKXIti8ddYmPB5ax5Qr4+ezD7MJwitvN
+NyOgZZ2qM8P7Y1rMN+kKb4OTPHLIhVUiCRtww3p/9HTZOhjxRZbDKNLVQjHCwv9N
+pKh+cON1k5YGSEYba28z1ZuKKvVq6cCMcgndTiMA0R8LxMi3psbWB6rohddoo8E9
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWItaWRwLTEub3J1LnNlhihodHRwczov
+L3NoaWItaWRwLTEub3J1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSJG9Hv
+5hKDK9iBmJYEU3Hg0DZZPzANBgkqhkiG9w0BAQUFAAOCAQEAC1tgenssXaACi4b0
+O+j5Qno3bjq35y+cj0OC/Za2lBuD10zYiySOMcuxg7WdPDiiTKtoBdYkRRN6oKiT
+ix3hLTwuU3PjLTIZ83ytNgezEa6oK+iCGi/ecz2ax77QZ9rqpQCRNudIZjbTN6SO
+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>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>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>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
new file mode 100644
index 00000000..d1d72ebf
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de-idp-shibboleth.xml
@@ -0,0 +1,151 @@
+<?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>
+      <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>MIIGRzCCBS+gAwIBAgIHF2Z6KgngwzANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQG
+EwJERTEoMCYGA1UEChMfSHVtYm9sZHQtVW5pdmVyc2l0YWV0IHp1IEJlcmxpbjEO
+MAwGA1UEAxMFSFUtQ0ExHzAdBgkqhkiG9w0BCQEWEHBraUBodS1iZXJsaW4uZGUw
+HhcNMTQwNDEwMjAxODM1WhcNMTkwNDA5MjAxODM1WjCBqDELMAkGA1UEBhMCREUx
+DzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSgwJgYDVQQKEx9IdW1i
+b2xkdC1Vbml2ZXJzaXRhZXQgenUgQmVybGluMScwJQYDVQQLEx5aRSBDb21wdXRl
+ci0gdW5kIE1lZGllbnNlcnZpY2UxJDAiBgNVBAMTG3NoaWJib2xldGgudXZmLmh1
+LWJlcmxpbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOIlG04F
+e1/y8yyfq/fx3J0yPiTwpkbixt92V8eGFt7JsHRAmK0kJ7RkWtIq8QBzopssW8Kh
+ovSQCJv+iZsx8VIViC6wWNKhfFxBlRMt2yKwA36t9PXZHho41BTJDdFJergVY0Se
+/+R+JXb7M6YTvElpmyT2tqNpsz9MzWqEcWlWD0YO+fD57QImAy5EnenLS0DHOxf8
+W8df0q6UDXeYIpH7owADpLHTl6WvKmLSHuoB4gWGo34F67zs17VGZJNV2fwvw5D4
+rJGdkJ+C+Jpb9rXfaD7+spZdvB2dZEHkVsZe11zTo7IDAQZ7taErgaxP26Yobr0A
+GhE5XKlUKdtKKNcCAwEAAaOCArMwggKvMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGC
+LAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBR45u1WtZRCUF41/A0X15YNq112RjAfBgNVHSMEGDAWgBQf9Sw+90CrLpCg
+atPieV7yds2DdDCBngYDVR0RBIGWMIGTghhzaGliLWRzLmNtcy5odS1iZXJsaW4u
+ZGWCGXNoaWItaWRwLmNtcy5odS1iZXJsaW4uZGWCHnNoaWJib2xldGgtZHMuY21z
+Lmh1LWJlcmxpbi5kZYIfc2hpYmJvbGV0aC1pZHAuY21zLmh1LWJlcmxpbi5kZYIb
+c2hpYmJvbGV0aC51dmYuaHUtYmVybGluLmRlMIGDBgNVHR8EfDB6MDugOaA3hjVo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2h1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9odS1iZXJsaW4tY2Ev
+cHViL2NybC9jYWNybC5jcmwwgdMGCCsGAQUFBwEBBIHGMIHDMDMGCCsGAQUFBzAB
+hidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRQYIKwYB
+BQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHUtYmVybGluLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDovL2NkcDIucGNhLmRm
+bi5kZS9odS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3
+DQEBBQUAA4IBAQCzPNgkjA6fa1I4Jmz8jK7uUBK3GJyauJ5ADHqc4ljsvoOjrKzT
+mT4gIy1XVKjsYWVID9anOnqd21EHJ82XNf2UKKmiVc1CIMz50VP5TCFqPr+a3LPy
+YeKN8H82ZHVCuQr1PpCeGDNewdyAWgOWrGGMvvZkYmGskvc3epkKfxG8T/HyueHh
+Moe3fU74QPZ/65iFysiDuK+9lqlT7VRp0FC61qhlPOjZPNcjMYeOXa4zS7hq4NYT
+yc3mkCS1I4050gDzdhTX9WbjFlGXZ1Eyu1ZPMcO9ebA1xXBbvbShAyKREaEl7UoS
+lp8Ny4TYeDIkRYSv+DuzIcJCFhAY//i8BXS8
+</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>MIIGRzCCBS+gAwIBAgIHF2Z6KgngwzANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQG
+EwJERTEoMCYGA1UEChMfSHVtYm9sZHQtVW5pdmVyc2l0YWV0IHp1IEJlcmxpbjEO
+MAwGA1UEAxMFSFUtQ0ExHzAdBgkqhkiG9w0BCQEWEHBraUBodS1iZXJsaW4uZGUw
+HhcNMTQwNDEwMjAxODM1WhcNMTkwNDA5MjAxODM1WjCBqDELMAkGA1UEBhMCREUx
+DzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSgwJgYDVQQKEx9IdW1i
+b2xkdC1Vbml2ZXJzaXRhZXQgenUgQmVybGluMScwJQYDVQQLEx5aRSBDb21wdXRl
+ci0gdW5kIE1lZGllbnNlcnZpY2UxJDAiBgNVBAMTG3NoaWJib2xldGgudXZmLmh1
+LWJlcmxpbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOIlG04F
+e1/y8yyfq/fx3J0yPiTwpkbixt92V8eGFt7JsHRAmK0kJ7RkWtIq8QBzopssW8Kh
+ovSQCJv+iZsx8VIViC6wWNKhfFxBlRMt2yKwA36t9PXZHho41BTJDdFJergVY0Se
+/+R+JXb7M6YTvElpmyT2tqNpsz9MzWqEcWlWD0YO+fD57QImAy5EnenLS0DHOxf8
+W8df0q6UDXeYIpH7owADpLHTl6WvKmLSHuoB4gWGo34F67zs17VGZJNV2fwvw5D4
+rJGdkJ+C+Jpb9rXfaD7+spZdvB2dZEHkVsZe11zTo7IDAQZ7taErgaxP26Yobr0A
+GhE5XKlUKdtKKNcCAwEAAaOCArMwggKvMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGC
+LAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBR45u1WtZRCUF41/A0X15YNq112RjAfBgNVHSMEGDAWgBQf9Sw+90CrLpCg
+atPieV7yds2DdDCBngYDVR0RBIGWMIGTghhzaGliLWRzLmNtcy5odS1iZXJsaW4u
+ZGWCGXNoaWItaWRwLmNtcy5odS1iZXJsaW4uZGWCHnNoaWJib2xldGgtZHMuY21z
+Lmh1LWJlcmxpbi5kZYIfc2hpYmJvbGV0aC1pZHAuY21zLmh1LWJlcmxpbi5kZYIb
+c2hpYmJvbGV0aC51dmYuaHUtYmVybGluLmRlMIGDBgNVHR8EfDB6MDugOaA3hjVo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2h1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9odS1iZXJsaW4tY2Ev
+cHViL2NybC9jYWNybC5jcmwwgdMGCCsGAQUFBwEBBIHGMIHDMDMGCCsGAQUFBzAB
+hidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRQYIKwYB
+BQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHUtYmVybGluLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDovL2NkcDIucGNhLmRm
+bi5kZS9odS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3
+DQEBBQUAA4IBAQCzPNgkjA6fa1I4Jmz8jK7uUBK3GJyauJ5ADHqc4ljsvoOjrKzT
+mT4gIy1XVKjsYWVID9anOnqd21EHJ82XNf2UKKmiVc1CIMz50VP5TCFqPr+a3LPy
+YeKN8H82ZHVCuQr1PpCeGDNewdyAWgOWrGGMvvZkYmGskvc3epkKfxG8T/HyueHh
+Moe3fU74QPZ/65iFysiDuK+9lqlT7VRp0FC61qhlPOjZPNcjMYeOXa4zS7hq4NYT
+yc3mkCS1I4050gDzdhTX9WbjFlGXZ1Eyu1ZPMcO9ebA1xXBbvbShAyKREaEl7UoS
+lp8Ny4TYeDIkRYSv+DuzIcJCFhAY//i8BXS8
+</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>
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
new file mode 100644
index 00000000..01bc4fa3
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-idp.ucl.ac.uk-shibboleth.xml
@@ -0,0 +1,109 @@
+<?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>
+      <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>
+						MIIEBjCCAu6gAwIBAgIJAL1ZxB217UWjMA0GCSqGSIb3DQEBBQUAMIGDMQswCQYD
+						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IENv
+						bGxlZ2UgTG9uZG9uMRswGQYDVQQDDBJzaGliLWlkcC51Y2wuYWMudWsxIjAgBgkq
+						hkiG9w0BCQEWE3VrZXJuYS1yYUB1Y2wuYWMudWswHhcNMTQwMTI4MTUyODA0WhcN
+						MzQwMTIzMTUyODA0WjCBgzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEi
+						MCAGA1UECgwZVW5pdmVyc2l0eSBDb2xsZWdlIExvbmRvbjEbMBkGA1UEAwwSc2hp
+						Yi1pZHAudWNsLmFjLnVrMSIwIAYJKoZIhvcNAQkBFhN1a2VybmEtcmFAdWNsLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvqkif+72KaxIswUf
+						g18mBnkqiMaO23A1P2ovEyKwROBCOAtnEMQS04vNVa9xFdbz1HBDtdkXsQQrdDSi
+						NH7uTxOoliLe581gdJW5yOPZaLa/23YSsdbJxBykcFIXDNUCIDa5IefR6EnPHUCu
+						LBFtMGQDfv8FAQBrFj0sRTc+9c5WMvSe0GToJ4RepVS7ZudffDbIeDVEh4Tg+3yH
+						2dXIj5u6UVhg8ocYM4hk3Fjg1uggdW7EjxZBf5rjIax2e6316ppteVSEBxwxj9FI
+						lZU3iBn6ihgf3Ix6Gp/sQQvk6WcLFd6269iPt1/BTupcKiJlcSEAv8kfbJksRnvS
+						CMw13wIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
+						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUNk7UuvDUFbJTfGTthmZA
+						bhQIyU8wHwYDVR0jBBgwFoAUNk7UuvDUFbJTfGTthmZAbhQIyU8wDQYJKoZIhvcN
+						AQEFBQADggEBAFfIkvqQOaajAbNmCX6aO+Hl4xJRnDf7zDENT0iwe7llYeA4C9Mg
+						rPkCX31HnS+m7lx42q8T/ultqoeiIRfHGPFSwYrBsWqFOZtxjZVSFYtuKyM/W2+G
+						idRkeM71d3s1jkfx9nhphI27iK860nYlmbPp+a+JzjDrFXLi21vY4WkWRJoVcnPe
+						RC5J5k/16Nz+bxbzqUUPenUNiYyCbrxH7vZnqQ9xlN57YD0yfCzTQ+TyKIHWXC4I
+						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>
+						MIIEBjCCAu6gAwIBAgIJAL1ZxB217UWjMA0GCSqGSIb3DQEBBQUAMIGDMQswCQYD
+						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IENv
+						bGxlZ2UgTG9uZG9uMRswGQYDVQQDDBJzaGliLWlkcC51Y2wuYWMudWsxIjAgBgkq
+						hkiG9w0BCQEWE3VrZXJuYS1yYUB1Y2wuYWMudWswHhcNMTQwMTI4MTUyODA0WhcN
+						MzQwMTIzMTUyODA0WjCBgzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEi
+						MCAGA1UECgwZVW5pdmVyc2l0eSBDb2xsZWdlIExvbmRvbjEbMBkGA1UEAwwSc2hp
+						Yi1pZHAudWNsLmFjLnVrMSIwIAYJKoZIhvcNAQkBFhN1a2VybmEtcmFAdWNsLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvqkif+72KaxIswUf
+						g18mBnkqiMaO23A1P2ovEyKwROBCOAtnEMQS04vNVa9xFdbz1HBDtdkXsQQrdDSi
+						NH7uTxOoliLe581gdJW5yOPZaLa/23YSsdbJxBykcFIXDNUCIDa5IefR6EnPHUCu
+						LBFtMGQDfv8FAQBrFj0sRTc+9c5WMvSe0GToJ4RepVS7ZudffDbIeDVEh4Tg+3yH
+						2dXIj5u6UVhg8ocYM4hk3Fjg1uggdW7EjxZBf5rjIax2e6316ppteVSEBxwxj9FI
+						lZU3iBn6ihgf3Ix6Gp/sQQvk6WcLFd6269iPt1/BTupcKiJlcSEAv8kfbJksRnvS
+						CMw13wIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
+						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUNk7UuvDUFbJTfGTthmZA
+						bhQIyU8wHwYDVR0jBBgwFoAUNk7UuvDUFbJTfGTthmZAbhQIyU8wDQYJKoZIhvcN
+						AQEFBQADggEBAFfIkvqQOaajAbNmCX6aO+Hl4xJRnDf7zDENT0iwe7llYeA4C9Mg
+						rPkCX31HnS+m7lx42q8T/ultqoeiIRfHGPFSwYrBsWqFOZtxjZVSFYtuKyM/W2+G
+						idRkeM71d3s1jkfx9nhphI27iK860nYlmbPp+a+JzjDrFXLi21vY4WkWRJoVcnPe
+						RC5J5k/16Nz+bxbzqUUPenUNiYyCbrxH7vZnqQ9xlN57YD0yfCzTQ+TyKIHWXC4I
+						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>
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
new file mode 100644
index 00000000..211be282
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de-idp-shibboleth.xml
@@ -0,0 +1,146 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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>MIIGNTCCBR2gAwIBAgIEEKRuOjANBgkqhkiG9w0BAQUFADCBkTELMAkGA1UEBhMC
+REUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1S
+ZWNoZW56ZW50cnVtMSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBHLTAw
+MjEjMCEGCSqGSIb3DQEJARYUY2FAdW5pLW9zbmFicnVlY2suZGUwHhcNMTAwOTA2
+MTM0NjE4WhcNMTUwOTA1MTM0NjE4WjCBmTELMAkGA1UEBhMCREUxFjAUBgNVBAgT
+DU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCk9zbmFicnVlY2sxIDAeBgNVBAoTF1Vu
+aXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMSMw
+IQYDVQQDExpzaGliLWlkcC51bmktb3NuYWJydWVjay5kZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALxNTwcD5VKiaXzNT0AktZBsA8IHNiu7NToXpKBv
+fFcVzi1SBo1IIMrW+YgkShoN1ObEzJPnyVOCSzZzya9/Rj7TXlfYRlDm8BMoR2Su
+pHQxQZeWMT0SWWkFdYA3NLUVdwzhNRi8t5BHmrh44GhqeLW+hUKI6NxeLPwfaDCr
+NqxGkZay5Ex4lYVdTmn07NASOmY5ub2Om0HFL3mshbS4t92+VBJyq8zTdKGCZPN3
+9SIBzFDuT3NhVVoSc+0EMNLdQL9DdKf01/TrSKOsleC4DOE/P05UFUXcxP5mAfV2
+m+CRfmeXCdek9FQs7zCJy3z/SxbuN3ncAUzKcmpBJ+B5OZsCAwEAAaOCAokwggKF
+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
+BgEFBQcDATAdBgNVHQ4EFgQUMwLyrOd0efTabm0joB2PFxA4IkQwHwYDVR0jBBgw
+FoAUqh/YdxVumeRfkNbsYyZOGepnFFAwgc4GA1UdEQSBxjCBw4Ead3d3YWRtaW5A
+VW5pLU9zbmFicnVlY2suREWCGnNoaWItaWRwLnVuaS1vc25hYnJ1ZWNrLmRlghtz
+aGliLWlkcDEudW5pLW9zbmFicnVlY2suZGWCG3NoaWItaWRwMi51bmktb3NuYWJy
+dWVjay5kZYIac2hpYi1pZHAudW5pLW9zbmFicnVlY2suZGWCD3NoaWItaWRwLnVv
+cy5kZYIQc2hpYi1pZHAxLnVvcy5kZYIQc2hpYi1pZHAyLnVvcy5kZTCBjwYDVR0f
+BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1vc25hYnJ1
+ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3VuaS1vc25hYnJ1ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
+BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS91bmktb3NuYWJydWVjay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
+BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLW9zbmFicnVlY2stY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCR1/LENWkw
+y4C2NqyQZTtiANtGy9pTN6AYCNNu+16zFixw75ntjYUJ09AR0mIMflfFQp2rGRoZ
++B8mxheTEkGLmjzJlfm8WwRlLShZjSYz0F0gsm8AQInLEbBtn2me8RnreFOO1HhE
+a3vnkTm80/vAShiwgLh2I0i1HMPQD18kgdBD6YFICICm2RQgTTzAix4fUNB5BnoF
+u4OLAbY4k+wOHu9hyUmeKuXL5QWmI8iiadsGV+pyD+n51I/zP0nxYCIcs6bdVbyO
+N4m+KSLv+bRSF+sK71PQ017Nux/K9ylqfpaMkhzXgFvspL3ZQm1yUDByjp0GBW7j
+nT7WnMt5n4CA
+</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="ttps://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>MIIGNTCCBR2gAwIBAgIEEKRuOjANBgkqhkiG9w0BAQUFADCBkTELMAkGA1UEBhMC
+REUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1S
+ZWNoZW56ZW50cnVtMSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBHLTAw
+MjEjMCEGCSqGSIb3DQEJARYUY2FAdW5pLW9zbmFicnVlY2suZGUwHhcNMTAwOTA2
+MTM0NjE4WhcNMTUwOTA1MTM0NjE4WjCBmTELMAkGA1UEBhMCREUxFjAUBgNVBAgT
+DU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCk9zbmFicnVlY2sxIDAeBgNVBAoTF1Vu
+aXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMSMw
+IQYDVQQDExpzaGliLWlkcC51bmktb3NuYWJydWVjay5kZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALxNTwcD5VKiaXzNT0AktZBsA8IHNiu7NToXpKBv
+fFcVzi1SBo1IIMrW+YgkShoN1ObEzJPnyVOCSzZzya9/Rj7TXlfYRlDm8BMoR2Su
+pHQxQZeWMT0SWWkFdYA3NLUVdwzhNRi8t5BHmrh44GhqeLW+hUKI6NxeLPwfaDCr
+NqxGkZay5Ex4lYVdTmn07NASOmY5ub2Om0HFL3mshbS4t92+VBJyq8zTdKGCZPN3
+9SIBzFDuT3NhVVoSc+0EMNLdQL9DdKf01/TrSKOsleC4DOE/P05UFUXcxP5mAfV2
+m+CRfmeXCdek9FQs7zCJy3z/SxbuN3ncAUzKcmpBJ+B5OZsCAwEAAaOCAokwggKF
+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
+BgEFBQcDATAdBgNVHQ4EFgQUMwLyrOd0efTabm0joB2PFxA4IkQwHwYDVR0jBBgw
+FoAUqh/YdxVumeRfkNbsYyZOGepnFFAwgc4GA1UdEQSBxjCBw4Ead3d3YWRtaW5A
+VW5pLU9zbmFicnVlY2suREWCGnNoaWItaWRwLnVuaS1vc25hYnJ1ZWNrLmRlghtz
+aGliLWlkcDEudW5pLW9zbmFicnVlY2suZGWCG3NoaWItaWRwMi51bmktb3NuYWJy
+dWVjay5kZYIac2hpYi1pZHAudW5pLW9zbmFicnVlY2suZGWCD3NoaWItaWRwLnVv
+cy5kZYIQc2hpYi1pZHAxLnVvcy5kZYIQc2hpYi1pZHAyLnVvcy5kZTCBjwYDVR0f
+BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1vc25hYnJ1
+ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3VuaS1vc25hYnJ1ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
+BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS91bmktb3NuYWJydWVjay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
+BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLW9zbmFicnVlY2stY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCR1/LENWkw
+y4C2NqyQZTtiANtGy9pTN6AYCNNu+16zFixw75ntjYUJ09AR0mIMflfFQp2rGRoZ
++B8mxheTEkGLmjzJlfm8WwRlLShZjSYz0F0gsm8AQInLEbBtn2me8RnreFOO1HhE
+a3vnkTm80/vAShiwgLh2I0i1HMPQD18kgdBD6YFICICm2RQgTTzAix4fUNB5BnoF
+u4OLAbY4k+wOHu9hyUmeKuXL5QWmI8iiadsGV+pyD+n51I/zP0nxYCIcs6bdVbyO
+N4m+KSLv+bRSF+sK71PQ017Nux/K9ylqfpaMkhzXgFvspL3ZQm1yUDByjp0GBW7j
+nT7WnMt5n4CA
+</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>
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
new file mode 100644
index 00000000..e914891a
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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>
+						MIIDETCCAfmgAwIBAgIJAPGWoIhDomdwMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+						BAMTC3NoaWItc3AtZGV2MB4XDTEwMTEwNTA0MTY1MVoXDTMwMTAzMTA0MTY1MVow
+						FjEUMBIGA1UEAxMLc2hpYi1zcC1kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQDPvKQqQDjZxRKqICIU8CfnT+wU1zRJIHgP9fbiebqVEpklkUwXnlQK
+						+Bif5oNaHAKq3etAp/QzP9/HffBCTHrRubdXPjzzhsqDCLvLMZ4xFk/omgjl36/N
+						1ruDUapMB2T0xUGS2Gev1olYbfL0MjRnhQqasJOvdqswI/U9eU8xYXLnz1dqeOPs
+						Ury21Zop4fVL9KY6sAvFDg6TrdgY7h5f8RJbIkjA3R3E0M+TR/dZiOvIw4CIjKFU
+						qUcIX4F+c0BGvSJU4RaunAG9RyNTGZvm9LBptiVcLGNXMyb0+KxIpwFQdd9juOpp
+						OXHjzkqxwQ87BZ+lCPMH5I4UhqBfNNJDAgMBAAGjYjBgMD8GA1UdEQQ4MDaCC3No
+						aWItc3AtZGV2hidodHRwczovL3NoaWItc3AtZGV2LmNmLmFjLnVrL3NoaWJib2xl
+						dGgwHQYDVR0OBBYEFAiqFmapO7egaR+j3lXoc8yFYs6oMA0GCSqGSIb3DQEBBQUA
+						A4IBAQATLXYR4ia9D/oDtOBHmfxwRHLcrDZqUdYD2NmJc3R7VQoV+SiGeHCxqZ65
+						wF5wWEDWByWjk/LQmOM/vov8UzlLD6GlyVlyo/yLfvNrsDbh83Ohc4TSLKXGar1x
+						2IzA6DP5OwA0FdJ5mZt6F+Mx9f/bo/yQf4yh219Gkuy/2MBtlTDelkSALTuoiaiq
+						9VuAp1o2yJr3ttEa3oyZUQyMi0TbnfVd8rfEkGefvGvjmWdDSRT1ZoojRIfZh+tV
+						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>
+						MIIDETCCAfmgAwIBAgIJAPGWoIhDomdwMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+						BAMTC3NoaWItc3AtZGV2MB4XDTEwMTEwNTA0MTY1MVoXDTMwMTAzMTA0MTY1MVow
+						FjEUMBIGA1UEAxMLc2hpYi1zcC1kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQDPvKQqQDjZxRKqICIU8CfnT+wU1zRJIHgP9fbiebqVEpklkUwXnlQK
+						+Bif5oNaHAKq3etAp/QzP9/HffBCTHrRubdXPjzzhsqDCLvLMZ4xFk/omgjl36/N
+						1ruDUapMB2T0xUGS2Gev1olYbfL0MjRnhQqasJOvdqswI/U9eU8xYXLnz1dqeOPs
+						Ury21Zop4fVL9KY6sAvFDg6TrdgY7h5f8RJbIkjA3R3E0M+TR/dZiOvIw4CIjKFU
+						qUcIX4F+c0BGvSJU4RaunAG9RyNTGZvm9LBptiVcLGNXMyb0+KxIpwFQdd9juOpp
+						OXHjzkqxwQ87BZ+lCPMH5I4UhqBfNNJDAgMBAAGjYjBgMD8GA1UdEQQ4MDaCC3No
+						aWItc3AtZGV2hidodHRwczovL3NoaWItc3AtZGV2LmNmLmFjLnVrL3NoaWJib2xl
+						dGgwHQYDVR0OBBYEFAiqFmapO7egaR+j3lXoc8yFYs6oMA0GCSqGSIb3DQEBBQUA
+						A4IBAQATLXYR4ia9D/oDtOBHmfxwRHLcrDZqUdYD2NmJc3R7VQoV+SiGeHCxqZ65
+						wF5wWEDWByWjk/LQmOM/vov8UzlLD6GlyVlyo/yLfvNrsDbh83Ohc4TSLKXGar1x
+						2IzA6DP5OwA0FdJ5mZt6F+Mx9f/bo/yQf4yh219Gkuy/2MBtlTDelkSALTuoiaiq
+						9VuAp1o2yJr3ttEa3oyZUQyMi0TbnfVd8rfEkGefvGvjmWdDSRT1ZoojRIfZh+tV
+						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>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:smith@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:smith@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
new file mode 100644
index 00000000..c9266358
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-sp.mediacore.tv.xml
@@ -0,0 +1,77 @@
+<?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>
+    <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 protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol 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>
+						MIIFYTCCBEmgAwIBAgIQaRrqhKKBIbJHb1Xg3FKffDANBgkqhkiG9w0BAQsFADCB
+						kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
+						BAMTLUNPTU9ETyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
+						QTAeFw0xNDA0MTYwMDAwMDBaFw0xNTA0MTYyMzU5NTlaMFgxITAfBgNVBAsTGERv
+						bWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UECxMLUG9zaXRpdmVTU0wxHTAb
+						BgNVBAMTFHNoaWItc3AubWVkaWFjb3JlLnR2MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAuXfsOw3NXRphz0NrcmK38BwoV1eeEGsv7gMI79ofGWRQHBbx
+						Pddu5yDiz5G6pVdQRjo/ykhWaDhocIKKhhv2e3n/hLBnQFsdvgGFfZB2cb+Z/qvs
+						/iqOxgmefQ+zSynS6x/2YSd9e8IV6gZuPtCuS8ccMPZhpnohBvs92senZRadaqa1
+						IQdj6N3ygXulr7CW/yy2I6fhNAlPkWwb6OmuQgxRkJdm7ueo1d9HmSyOMCbI+7Ry
+						z0ubrtzN9yxvkOGZo88U0vJH5ERQkLkhaVbRkZJsNUcr/H7VpkOAEurBSquPHn2v
+						pP/KfAfRDOtBFB+gFzJpGBpyo5FA3YQO5Rh3lQIDAQABo4IB7DCCAegwHwYDVR0j
+						BBgwFoAUkK9qOpRaC9iQ6hJWc99DtDoo2ucwHQYDVR0OBBYEFOttslYJv2/qFQUt
+						NmYx4u0eBeggMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
+						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjBQBgNVHSAESTBHMDsGDCsGAQQBsjEBAgED
+						BDArMCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5jb21vZG8ubmV0L0NQUzAI
+						BgZngQwBAgEwVAYDVR0fBE0wSzBJoEegRYZDaHR0cDovL2NybC5jb21vZG9jYS5j
+						b20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNybDCB
+						hQYIKwYBBQUHAQEEeTB3ME8GCCsGAQUFBzAChkNodHRwOi8vY3J0LmNvbW9kb2Nh
+						LmNvbS9DT01PRE9SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3J0
+						MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOQYDVR0RBDIw
+						MIIUc2hpYi1zcC5tZWRpYWNvcmUudHaCGHd3dy5zaGliLXNwLm1lZGlhY29yZS50
+						djANBgkqhkiG9w0BAQsFAAOCAQEAW/hU+rvp5DuoqeW163U/YudsHv9RU9Hn2yIF
+						p1FGo1h3MOgalR+dtVkXjyFXLpK+d1Iu/n2Fh0V6y125NQCnR+vl2f94NEsv3OhF
+						58qUbEDR4DymDvqgfmF+e2IZaCgASp4HC5UilyeETbBZvM5kOwEAWI6UOhuGEfHp
+						uWjlO3wYo2i1jCvaHxi9XgVK/PmQyOWWPnCCnmptyp4q9Mhz8Rv1hAEdQYM62R8L
+						/2NDnY4jkkQJOGXz1bqfE0moBc0zFZQ7/QQi3y0/AKJeGCG3q5gR/7cYyyQwappV
+						5matq67waWoBg35C0yaj9gEDi3KaTs1KOLbzqyVUcmP0FtB7rw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/POST" index="0"/>
+    <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="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </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: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
new file mode 100644
index 00000000..e97db85a
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-sp.unity.ac-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib-sp.unity.ac/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDHDCCAgSgAwIBAgIJALWq54jw0HS7MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHNoaWItc3AudW5pdHkuYWMwHhcNMTQxMDAzMTA0ODI1WhcNMjQwOTMwMTA0
+						ODI1WjAbMRkwFwYDVQQDExBzaGliLXNwLnVuaXR5LmFjMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAwS2lW2kzzr/Kwa45pah/4TVU66zHOku2Fots9M5f
+						bdzB0Q0be5rh5k2Ne3LCucEJlp2n0rIAeuuHhDIVE+opQTy0I28c5R83Bt1TY8W7
+						QSa8hg7YK/Im0dSLx4ENSEHxMuPBuynl01qdNfGGg8qjBRjZ62SvQIzA8FBgJu2g
+						DA27J3EMQrXC9ELL9ifE+IdUGflr3BuDrefipnxv67mkOZ6LCxY0+ME7w4ooZcSB
+						BrG+r7RWkv1Qzcb5xzd19MqVaDuZLv/tynE6VQ88iyz79zvYsNL9vIhwpO/OgND3
+						DOMr47v6Q5GmG3KdVfMJwvINBNQmfqxWk6+1sQRY67MFzwIDAQABo2MwYTBABgNV
+						HREEOTA3ghBzaGliLXNwLnVuaXR5LmFjhiNodHRwczovL3NoaWItc3AudW5pdHku
+						YWMvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVcMrT2HHLPUMrdzGkObutsQRt4cwDQYJ
+						KoZIhvcNAQEFBQADggEBABxD0edMnpEUBFe0UmeSKmhBGOPUKbDJUC3xAnAjEnQR
+						l8DHsxWji4F5KMPHN/CCHVI83XvcnvB2gsp8np3xQoxVZ5ckHYkBO2p4967BgqWc
+						Bwj8AlcNkK+CcsY6WbtzAUlIl/FTguFZ08mAV5YK88hh3qfZKHPYj6AibBiB6mqf
+						Q9x6aKcEZ9texjswuDsvMxxGZhORHo5SErlJRuO+g3KuQdE56tPdwcQLQ8uKUXvW
+						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>
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
new file mode 100644
index 00000000..1c6dd1aa
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-test.raven.cam.ac.uk-shibboleth.xml
@@ -0,0 +1,116 @@
+<?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>
+      <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>
+						MIIDRjCCAi6gAwIBAgIJANGv1GtjrUKOMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXNoaWItdGVzdC5yYXZlbi5jYW0uYWMudWswHhcNMTIxMjA0MTE1NjQ0WhcN
+						MjIxMjAyMTE1NjQ0WjAkMSIwIAYDVQQDExlzaGliLXRlc3QucmF2ZW4uY2FtLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtJeHcwBjETJCV4XX
+						P9xI6qFSpbDJ94veVlT11dN1opYY/3QC+6pa811/4wXeQ35e64U1UcqpzP0f1EFR
+						MBxT22Wt3ASBpdp+2U+AEwOahfUI8uQDK2n3E67dQ1km76vhpxbX0CyZggnSkluN
+						kOMLIJrZFr0gaI7/a08JoTzwn6pjFWklvMhPHpu2Wr5AodSY6+sljX4/nNKUxyHo
+						WfwiZG50/u4f3PmFb0b2YIpjmdBIJQzaBbOHSjDUVpONRwz++rPr1DuXeWzmOHIK
+						hqGZzsk+TjbhZcA0mX26iaw59pNZq/y0W8IXSzHUGum19L6LWKwt61path7OdZTz
+						sHD2twIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
+						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUYj7x7CBTsVBP86VAwrNz
+						q/nvhRYwHwYDVR0jBBgwFoAUYj7x7CBTsVBP86VAwrNzq/nvhRYwDQYJKoZIhvcN
+						AQEFBQADggEBAKJEUuUYXss4j3cfFtz7fK8pQ7Xejnop18wBEThSyzJSjd7YEq6w
+						ZCdfGTzWjBmUXQWRijm9JX9f2sobXiUuwDvHK6N/1OM/7V2a0qPrdX53UMceVY0o
+						M/x+HKKZ6svBXkj5VTovzPEUnPAl3m1JiZAffJtn7mz+wEPluJEcgqWWrwHjRJs8
+						lzuR6fJ3PacP0Qcg2nBk9y9YxSrGKHFFZ6s8iszpnsVDzQPD3NZSuHTCbp2J7cz0
+						/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>
+						MIIDRjCCAi6gAwIBAgIJANGv1GtjrUKOMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXNoaWItdGVzdC5yYXZlbi5jYW0uYWMudWswHhcNMTIxMjA0MTE1NjQ0WhcN
+						MjIxMjAyMTE1NjQ0WjAkMSIwIAYDVQQDExlzaGliLXRlc3QucmF2ZW4uY2FtLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtJeHcwBjETJCV4XX
+						P9xI6qFSpbDJ94veVlT11dN1opYY/3QC+6pa811/4wXeQ35e64U1UcqpzP0f1EFR
+						MBxT22Wt3ASBpdp+2U+AEwOahfUI8uQDK2n3E67dQ1km76vhpxbX0CyZggnSkluN
+						kOMLIJrZFr0gaI7/a08JoTzwn6pjFWklvMhPHpu2Wr5AodSY6+sljX4/nNKUxyHo
+						WfwiZG50/u4f3PmFb0b2YIpjmdBIJQzaBbOHSjDUVpONRwz++rPr1DuXeWzmOHIK
+						hqGZzsk+TjbhZcA0mX26iaw59pNZq/y0W8IXSzHUGum19L6LWKwt61path7OdZTz
+						sHD2twIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
+						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUYj7x7CBTsVBP86VAwrNz
+						q/nvhRYwHwYDVR0jBBgwFoAUYj7x7CBTsVBP86VAwrNzq/nvhRYwDQYJKoZIhvcN
+						AQEFBQADggEBAKJEUuUYXss4j3cfFtz7fK8pQ7Xejnop18wBEThSyzJSjd7YEq6w
+						ZCdfGTzWjBmUXQWRijm9JX9f2sobXiUuwDvHK6N/1OM/7V2a0qPrdX53UMceVY0o
+						M/x+HKKZ6svBXkj5VTovzPEUnPAl3m1JiZAffJtn7mz+wEPluJEcgqWWrwHjRJs8
+						lzuR6fJ3PacP0Qcg2nBk9y9YxSrGKHFFZ6s8iszpnsVDzQPD3NZSuHTCbp2J7cz0
+						/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>Computing Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:service-desk@ucs.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
new file mode 100644
index 00000000..1fc2e25b
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-uat-idp.ucl.ac.uk-shibboleth.xml
@@ -0,0 +1,111 @@
+<?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>
+      <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
+						VQQDDBZzaGliLXVhdC1pZHAudWNsLmFjLnVrMSAwHgYJKoZIhvcNAQkBFhFzeXN0
+						ZW1zQHVjbC5hYy51azAeFw0xNDA2MDIxMjIyMjhaFw0zNDA1MjgxMjIyMjhaMIGj
+						MQswCQYDVQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJz
+						aXR5IENvbGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1z
+						MR8wHQYDVQQDDBZzaGliLXVhdC1pZHAudWNsLmFjLnVrMSAwHgYJKoZIhvcNAQkB
+						FhFzeXN0ZW1zQHVjbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAL/n3Jeei9jS1qL5Tn0xK04C1gHXLNkI4FV3TQ0tZTW4kf7am/h94OOI3rd5
+						6UCXobFG5FsEAWOCwY9Vt6xsNBMLXK6qRvS87+Hs4SmooBbQSt4JzhHA083a/JAy
+						TIUZj+RCKQl1tgg/bSXaun43ZwSFNoHS7mW5OUDNKTSVDtS2sw9i3ZbogIaKvGUJ
+						jG00XFXQjjSG6Ak90CphUkqJ7ng4We+eyuYTWnYJGO9Zz8l6BmjX7jEPOt5DTujp
+						OhjiE9tGG94bM3EWAM0CcxSI1LDvhAIP+/5bMX34QBHWFDHADGHbEjLkKgfvamcq
+						9OPYDKsIDxhQCfWzdmjmhfIQdhsCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
+						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
+						FNdWyQJ4XXk6XM2IjlafonfZo/63MB8GA1UdIwQYMBaAFNdWyQJ4XXk6XM2Ijlaf
+						onfZo/63MA0GCSqGSIb3DQEBBQUAA4IBAQCPI7W8d09hillpAL7U1zIkcbjfyyKp
+						GtHaYd/PMQxuz3+Z1jMR6xOD4DBONW3c5BIro6+Mgpygh3KI271ga5PxwBdCx5jk
+						Vud3xtV26Ed2aZQPM5xw6JgfRQqBTgcDeGdjiOqre9Dy8cpqr3o2YGk0FByoEQgE
+						X6aW9mLTo8QWtgvnz08xXahl/Wun46LszukLrs4ESWSgsy5UODsFkVk1vGtuIUCY
+						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>
+						MIIERjCCAy6gAwIBAgIJAMClfsZN+MybMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
+						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IENv
+						bGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1zMR8wHQYD
+						VQQDDBZzaGliLXVhdC1pZHAudWNsLmFjLnVrMSAwHgYJKoZIhvcNAQkBFhFzeXN0
+						ZW1zQHVjbC5hYy51azAeFw0xNDA2MDIxMjIyMjhaFw0zNDA1MjgxMjIyMjhaMIGj
+						MQswCQYDVQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJz
+						aXR5IENvbGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1z
+						MR8wHQYDVQQDDBZzaGliLXVhdC1pZHAudWNsLmFjLnVrMSAwHgYJKoZIhvcNAQkB
+						FhFzeXN0ZW1zQHVjbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAL/n3Jeei9jS1qL5Tn0xK04C1gHXLNkI4FV3TQ0tZTW4kf7am/h94OOI3rd5
+						6UCXobFG5FsEAWOCwY9Vt6xsNBMLXK6qRvS87+Hs4SmooBbQSt4JzhHA083a/JAy
+						TIUZj+RCKQl1tgg/bSXaun43ZwSFNoHS7mW5OUDNKTSVDtS2sw9i3ZbogIaKvGUJ
+						jG00XFXQjjSG6Ak90CphUkqJ7ng4We+eyuYTWnYJGO9Zz8l6BmjX7jEPOt5DTujp
+						OhjiE9tGG94bM3EWAM0CcxSI1LDvhAIP+/5bMX34QBHWFDHADGHbEjLkKgfvamcq
+						9OPYDKsIDxhQCfWzdmjmhfIQdhsCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
+						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
+						FNdWyQJ4XXk6XM2IjlafonfZo/63MB8GA1UdIwQYMBaAFNdWyQJ4XXk6XM2Ijlaf
+						onfZo/63MA0GCSqGSIb3DQEBBQUAA4IBAQCPI7W8d09hillpAL7U1zIkcbjfyyKp
+						GtHaYd/PMQxuz3+Z1jMR6xOD4DBONW3c5BIro6+Mgpygh3KI271ga5PxwBdCx5jk
+						Vud3xtV26Ed2aZQPM5xw6JgfRQqBTgcDeGdjiOqre9Dy8cpqr3o2YGk0FByoEQgE
+						X6aW9mLTo8QWtgvnz08xXahl/Wun46LszukLrs4ESWSgsy5UODsFkVk1vGtuIUCY
+						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>
diff --git a/swamid-interfederations-2.0/shib.alexanderstreet.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shib.alexanderstreet.com-shibboleth-sp.xml
new file mode 100644
index 00000000..d9d18b10
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.alexanderstreet.com-shibboleth-sp.xml
@@ -0,0 +1,70 @@
+<?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>
+      <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>
+						MIIDwDCCAqgCCQDCf0TzHdVL9zANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
+						VVMxETAPBgNVBAgMCFZpcmdpbmlhMRMwEQYDVQQHDApBbGV4YW5kcmlhMR8wHQYD
+						VQQKDBZBbGV4YW5kZXIgU3RyZWV0IFByZXNzMSEwHwYDVQQDDBhzaGliLmFsZXhh
+						bmRlcnN0cmVldC5jb20xJjAkBgkqhkiG9w0BCQEWF2FzcC1pdEBhc3RyZWV0cHJl
+						c3MuY29tMB4XDTE0MDkyOTE0MzI0MloXDTI0MDkyNjE0MzI0MlowgaExCzAJBgNV
+						BAYTAlVTMREwDwYDVQQIDAhWaXJnaW5pYTETMBEGA1UEBwwKQWxleGFuZHJpYTEf
+						MB0GA1UECgwWQWxleGFuZGVyIFN0cmVldCBQcmVzczEhMB8GA1UEAwwYc2hpYi5h
+						bGV4YW5kZXJzdHJlZXQuY29tMSYwJAYJKoZIhvcNAQkBFhdhc3AtaXRAYXN0cmVl
+						dHByZXNzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANT9VZht
+						tKm/kA8GzvNL7sCY66dybafPY36Glm7gLRFeZAC09fAGkzkW+SmLrY5Gum5kYYhH
+						99ckibDhfe3/61sgoBIwmaFn0atEb9bMbO7IVQ9bQV3vdVI+/AvsA5EIF8W9ildv
+						tx09CLonner4y8yol0h7VuUJyrlMef/rEBFiFnnDceEswiP1va3vGRRlYx396Uki
+						n/cCPae+YYFxo0HZFc6QFfCwmGkSdPeEjjrew4OBmbEeTV4NWgn7a2y81n4FlUwY
+						C6fNHuLjaB11lc0i+yNjKipTuAiTr1zRzvXuRSwwPpI9OJ0YHPUXB1Ug3U+jkNE+
+						qihC1Waoa6RNKiMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAuUgodJSN/sFhG1wy
+						ifZuq4hKlDGtpmwds+qFBYyCJV/dChhasqcvkqWfzTj7BUn83mPmdIfDcP0evdup
+						6QCFVlIr5Qv5I5f5eThovcJquPHKUTWEQdMh3VAhnp+zrjnO8CYozCKlEYJs0Z0J
+						vCIOdqIBfxQ/De7HqksyEeLWT/aAuI8WJHmYT4ZrcXs3t0zadwmxf+Fx7ItyjYSG
+						35u+naLO9KhT59QszZB81NpWP7n7dgh8TKyJzWSKI5ZcnRdD3y+J41RvnBRxuKQ+
+						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>
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
new file mode 100644
index 00000000..b935107e
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.aylesbury.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,96 @@
+<?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>
+      <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
+						YnVyeS5hYy51azAeFw0xMjAyMjcwOTAxMjBaFw0zMjAyMjIwOTAxMjBaMHYxCzAJ
+						BgNVBAYTAkdCMRgwFgYDVQQIEw9CdWNraW5naGFtc2hpcmUxEjAQBgNVBAcTCUF5
+						bGVzYnVyeTEaMBgGA1UEChMRQXlsZXNidXJ5IENvbGxlZ2UxHTAbBgNVBAMTFHNo
+						aWIuYXlsZXNidXJ5LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAxNalaxRpBTFege7acqsKBZ6UUTfpWmEDY71s+eLUBDmEluiHkpM00EKjlB/3
+						4AGsYB0Il9Rjh35ShhwKC4S+ShzVd8P1zodK8G+UQLtSYhT16Y0Mx1TjUpoIdQLe
+						wcDZfk67VTOIT4IoDKcAxTuWFaZS/DtZdplYTcXnMf/BMCUaJ6CyLpt9QhHXUSP4
+						E7XaxQqRCCIVReIlwDEO7z5luyanVvm2GwDTyvuzN9jVt/hggpRUhe9DVaCrG+SG
+						DwaYh5rcs1IDPQgoxAJVGLvmkNZVnp4oeLqiAgEOPMdGboHbzgDejdGwBGrtEyOi
+						d0NzpBIgNQab0MfW7G3h+dvIpwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA1NJJY
+						sMnElc1qAHTTvgfFgP6NqtdWzPBMYnDy7++/p+cd2MVTNdY0PK4SaAVCZkv6oK86
+						swsd1XGJeCu6OuYRtBaqIhgwuxVQHO+XhG14OCtm6myaEkY5Fm6HJeBUUUfRtOI6
+						Ecw57bA/W1K1Y1G9nyNAGjl59JeK9K8aqk0lA7UtzdIs6OIsMGuyNSL99uxrFNA9
+						yHCtpXTRm06+mB1rtoTe/kVGes5CR782wPoGcmw0Phekn6yPV+dr4bwMViIfLx14
+						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>
+						MIIDaDCCAlACCQCoGCOGp22Z0jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
+						QjEYMBYGA1UECBMPQnVja2luZ2hhbXNoaXJlMRIwEAYDVQQHEwlBeWxlc2J1cnkx
+						GjAYBgNVBAoTEUF5bGVzYnVyeSBDb2xsZWdlMR0wGwYDVQQDExRzaGliLmF5bGVz
+						YnVyeS5hYy51azAeFw0xMjAyMjcwOTAxMjBaFw0zMjAyMjIwOTAxMjBaMHYxCzAJ
+						BgNVBAYTAkdCMRgwFgYDVQQIEw9CdWNraW5naGFtc2hpcmUxEjAQBgNVBAcTCUF5
+						bGVzYnVyeTEaMBgGA1UEChMRQXlsZXNidXJ5IENvbGxlZ2UxHTAbBgNVBAMTFHNo
+						aWIuYXlsZXNidXJ5LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAxNalaxRpBTFege7acqsKBZ6UUTfpWmEDY71s+eLUBDmEluiHkpM00EKjlB/3
+						4AGsYB0Il9Rjh35ShhwKC4S+ShzVd8P1zodK8G+UQLtSYhT16Y0Mx1TjUpoIdQLe
+						wcDZfk67VTOIT4IoDKcAxTuWFaZS/DtZdplYTcXnMf/BMCUaJ6CyLpt9QhHXUSP4
+						E7XaxQqRCCIVReIlwDEO7z5luyanVvm2GwDTyvuzN9jVt/hggpRUhe9DVaCrG+SG
+						DwaYh5rcs1IDPQgoxAJVGLvmkNZVnp4oeLqiAgEOPMdGboHbzgDejdGwBGrtEyOi
+						d0NzpBIgNQab0MfW7G3h+dvIpwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA1NJJY
+						sMnElc1qAHTTvgfFgP6NqtdWzPBMYnDy7++/p+cd2MVTNdY0PK4SaAVCZkv6oK86
+						swsd1XGJeCu6OuYRtBaqIhgwuxVQHO+XhG14OCtm6myaEkY5Fm6HJeBUUUfRtOI6
+						Ecw57bA/W1K1Y1G9nyNAGjl59JeK9K8aqk0lA7UtzdIs6OIsMGuyNSL99uxrFNA9
+						yHCtpXTRm06+mB1rtoTe/kVGes5CR782wPoGcmw0Phekn6yPV+dr4bwMViIfLx14
+						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>
diff --git a/swamid-interfederations-2.0/shib.blackpool.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.blackpool.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..846287c6
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.blackpool.ac.uk-shibboleth.xml
@@ -0,0 +1,117 @@
+<?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>
+      <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>
+						MIIEHDCCAwSgAwIBAgIJAOAT321OtbqJMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2twb29s
+						MSgwJgYDVQQKEx9CbGFja3Bvb2wgYW5kIFRoZSBGeWxkZSBDb2xsZWdlMQ0wCwYD
+						VQQLEwRMSVRTMR0wGwYDVQQDExRzaGliLmJsYWNrcG9vbC5hYy51azAeFw0xMjA2
+						MDExNDEzMTVaFw0yMjA1MzAxNDEzMTVaMIGOMQswCQYDVQQGEwJHQjETMBEGA1UE
+						CBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2twb29sMSgwJgYDVQQKEx9CbGFj
+						a3Bvb2wgYW5kIFRoZSBGeWxkZSBDb2xsZWdlMQ0wCwYDVQQLEwRMSVRTMR0wGwYD
+						VQQDExRzaGliLmJsYWNrcG9vbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAOZi4DacZbrXsVBpgZiW5dr3SG2U/yd3zNYWONklw89gYavq7S+w
+						3oRmBvzz+9oPLS5h40CGY5xkvly2KeT1f9XN+ndeM8NmhwT97WIA4H/TwQgOIwDD
+						NtR7hGpIalhT0poHJizomHB7G/DOL00RZSkX/GKb4KIIdyEVN9WLqQ7xNGQh8m90
+						T2bTCtqSVZgByrz48kOrYRexDogrmZHHPfw90DZjNt8p8OfhJ3VLuxMMN8QI2kg2
+						BQCc4MVWYTkSiryqzZBwePz2KdVAY8kXTVZ5mu/a5ACNdzGKNdqlvqwdht9LGu3m
+						aY8bFax0DbjQwyyY77NPKoB3n+qhtDmIfScCAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFO/ZdgkN54wOyABu+OjzGMF7wVXeMB8GA1UdIwQYMBaAFO/ZdgkN54wO
+						yABu+OjzGMF7wVXeMA0GCSqGSIb3DQEBBQUAA4IBAQB2x0UZ97nn/MeHMOjOT3ze
+						b8qzdKk1Wz4pFmz1vrUue9YJYFwemFkg54oooqwt2GBFRbBHEHc858XQWvSo0zhv
+						LN6Qo+f9BhwH4hMy8Q76WG8nYZ12zUv/7gBisXfmQh9iPZ51cMPzhwplLocQN9hz
+						m9JVeMFR9C7q/qrL35H+Rq75FpUxX7y9ndVIdrGjyjAvTHZUuu8F92YE5PeFtfSD
+						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>
+						MIIEHDCCAwSgAwIBAgIJAOAT321OtbqJMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2twb29s
+						MSgwJgYDVQQKEx9CbGFja3Bvb2wgYW5kIFRoZSBGeWxkZSBDb2xsZWdlMQ0wCwYD
+						VQQLEwRMSVRTMR0wGwYDVQQDExRzaGliLmJsYWNrcG9vbC5hYy51azAeFw0xMjA2
+						MDExNDEzMTVaFw0yMjA1MzAxNDEzMTVaMIGOMQswCQYDVQQGEwJHQjETMBEGA1UE
+						CBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2twb29sMSgwJgYDVQQKEx9CbGFj
+						a3Bvb2wgYW5kIFRoZSBGeWxkZSBDb2xsZWdlMQ0wCwYDVQQLEwRMSVRTMR0wGwYD
+						VQQDExRzaGliLmJsYWNrcG9vbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAOZi4DacZbrXsVBpgZiW5dr3SG2U/yd3zNYWONklw89gYavq7S+w
+						3oRmBvzz+9oPLS5h40CGY5xkvly2KeT1f9XN+ndeM8NmhwT97WIA4H/TwQgOIwDD
+						NtR7hGpIalhT0poHJizomHB7G/DOL00RZSkX/GKb4KIIdyEVN9WLqQ7xNGQh8m90
+						T2bTCtqSVZgByrz48kOrYRexDogrmZHHPfw90DZjNt8p8OfhJ3VLuxMMN8QI2kg2
+						BQCc4MVWYTkSiryqzZBwePz2KdVAY8kXTVZ5mu/a5ACNdzGKNdqlvqwdht9LGu3m
+						aY8bFax0DbjQwyyY77NPKoB3n+qhtDmIfScCAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFO/ZdgkN54wOyABu+OjzGMF7wVXeMB8GA1UdIwQYMBaAFO/ZdgkN54wO
+						yABu+OjzGMF7wVXeMA0GCSqGSIb3DQEBBQUAA4IBAQB2x0UZ97nn/MeHMOjOT3ze
+						b8qzdKk1Wz4pFmz1vrUue9YJYFwemFkg54oooqwt2GBFRbBHEHc858XQWvSo0zhv
+						LN6Qo+f9BhwH4hMy8Q76WG8nYZ12zUv/7gBisXfmQh9iPZ51cMPzhwplLocQN9hz
+						m9JVeMFR9C7q/qrL35H+Rq75FpUxX7y9ndVIdrGjyjAvTHZUuu8F92YE5PeFtfSD
+						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>
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
new file mode 100644
index 00000000..51b0c01e
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.bsdc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsdc.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Burton and South Derbyshire College</mdui:DisplayName>
+        <mdui:Logo height="163" width="288">https://shib.bsdc.ac.uk/mduilogo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDKDCCAhCgAwIBAgIVAPqc3rb7Due/A8SDksahSIV81mhLMA0GCSqGSIb3DQEB
+						BQUAMBoxGDAWBgNVBAMTD3NoaWIuYnNkYy5hYy51azAeFw0xMjA3MTAxNTUyMzVa
+						Fw0zMjA3MTAxNTUyMzVaMBoxGDAWBgNVBAMTD3NoaWIuYnNkYy5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALVOink2gWh8mkWeSVHq2r9YG1Tm
+						MqJO8YLKq6iYGPLHgqBknI2RnbNOP2BbvRz6HpXOBhSADK6ihqs2oPWPgvfQSaaQ
+						k0SPcObBaxoQf1obLqrckTQlsUMZpiYXbFqNQvxzvieRotPA+UDJypvpo7eoWjfR
+						R7xgPDl+MyEGr0j+eg817H2ODl98TeP7wNkbct6ROxi/SRTv2G31lslOqpV7k0EB
+						vWZhDTqdJ5QfOABXUIDJsiS0HGmQmF6r22X/eSpYgCPXoYbXJUzM0Kmxg5ak6MUt
+						Cbf1l9RpY5z5CIOBjiImDI0JsJQFqDCIgEbHFJwxHayM04p+rgZOuaCSBD0CAwEA
+						AaNlMGMwQgYDVR0RBDswOYIPc2hpYi5ic2RjLmFjLnVrhiZodHRwczovL3NoaWIu
+						YnNkYy5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdGAiYrBrJg3eOSOb
+						kV7aCm4GFm4wDQYJKoZIhvcNAQEFBQADggEBAAFPVigjx7LAJET1QnJQukSSJK7W
+						0EpEzBtVEA4OG7bEWcSc1vn4Jxzsceg+Q7QLPahg3isvR5NGGJ2sBC/KaOXZqI9e
+						6CkuUhu2bqJnsY7KvkTMt4H44WUzTx2z5YPhHWkIGo0F39MH7pKk3OMLe71BbLG4
+						WFdm8pU2h+LDxCbGWnHqsuIr2C5hqvKKs77Pti7otupF2+6+2XOlE1bk3DJMGLG6
+						5i3cPVfbVjl/Ztn02yBxrgoVTKLqChuTcez6Af5eVptOkfnWcn9J3YedTv3P5CpT
+						ymcVURb4Pl30AjdHCCwyQvSiuYZfdDSOolEVcnTZVvKK1wft5xLTTAb2R4M=
+					</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 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsdc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDKDCCAhCgAwIBAgIVAPqc3rb7Due/A8SDksahSIV81mhLMA0GCSqGSIb3DQEB
+						BQUAMBoxGDAWBgNVBAMTD3NoaWIuYnNkYy5hYy51azAeFw0xMjA3MTAxNTUyMzVa
+						Fw0zMjA3MTAxNTUyMzVaMBoxGDAWBgNVBAMTD3NoaWIuYnNkYy5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALVOink2gWh8mkWeSVHq2r9YG1Tm
+						MqJO8YLKq6iYGPLHgqBknI2RnbNOP2BbvRz6HpXOBhSADK6ihqs2oPWPgvfQSaaQ
+						k0SPcObBaxoQf1obLqrckTQlsUMZpiYXbFqNQvxzvieRotPA+UDJypvpo7eoWjfR
+						R7xgPDl+MyEGr0j+eg817H2ODl98TeP7wNkbct6ROxi/SRTv2G31lslOqpV7k0EB
+						vWZhDTqdJ5QfOABXUIDJsiS0HGmQmF6r22X/eSpYgCPXoYbXJUzM0Kmxg5ak6MUt
+						Cbf1l9RpY5z5CIOBjiImDI0JsJQFqDCIgEbHFJwxHayM04p+rgZOuaCSBD0CAwEA
+						AaNlMGMwQgYDVR0RBDswOYIPc2hpYi5ic2RjLmFjLnVrhiZodHRwczovL3NoaWIu
+						YnNkYy5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdGAiYrBrJg3eOSOb
+						kV7aCm4GFm4wDQYJKoZIhvcNAQEFBQADggEBAAFPVigjx7LAJET1QnJQukSSJK7W
+						0EpEzBtVEA4OG7bEWcSc1vn4Jxzsceg+Q7QLPahg3isvR5NGGJ2sBC/KaOXZqI9e
+						6CkuUhu2bqJnsY7KvkTMt4H44WUzTx2z5YPhHWkIGo0F39MH7pKk3OMLe71BbLG4
+						WFdm8pU2h+LDxCbGWnHqsuIr2C5hqvKKs77Pti7otupF2+6+2XOlE1bk3DJMGLG6
+						5i3cPVfbVjl/Ztn02yBxrgoVTKLqChuTcez6Af5eVptOkfnWcn9J3YedTv3P5CpT
+						ymcVURb4Pl30AjdHCCwyQvSiuYZfdDSOolEVcnTZVvKK1wft5xLTTAb2R4M=
+					</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:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.bsdc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </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">http://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: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
new file mode 100644
index 00000000..c2c923b6
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDNDCCAhygAwIBAgIJAJPOWX6jxm8nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFnNoaWIuY29tdW5lLnRyaWVzdGUuaXQwHhcNMTMxMTE5MTMyNzM1WhcNNDMx
+MTEyMTMyNzM1WjAhMR8wHQYDVQQDExZzaGliLmNvbXVuZS50cmllc3RlLml0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Y+CScWVXs3Hl2gxmGp5D1Co
+GdHbRD9LShZ7fCeEpcjxJjZ2apGnXXuQc7DpTthfkiYw+10SvgspjpOsT0T2fPGg
+oL6FIS4AUGKkspcGqmlHJjdj2d0bzVcyEpthd4LQmPajX5vNfiTFL01ZlJC4kBbE
+dFVobxxZPaeeMhxBFAwkf0vfmXBgJrUU4+zQoXE2VD/BOsK/tQStqrQH0uIGMR54
+lCkdFmiAaedYkdjsteZvKtxgb8TslE+ULxK0HAl9MmuHPSs/duaHmiM0Huybztj7
+OCgoa2hXKT9G867xB8kdFKwJgfyTZ2f9bIuPwcJEsVd6p5NBZFvd9qG1ILFWpQID
+AQABo28wbTBMBgNVHREERTBDghZzaGliLmNvbXVuZS50cmllc3RlLml0hilodHRw
+czovL3NoaWIuY29tdW5lLnRyaWVzdGUuaXQvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+gYEe61royxEPHxue0/dBHfj4x0swDQYJKoZIhvcNAQEFBQADggEBAMvNk6mztqu3
+5fKoBZNYhJTdVcC9C4MqjcgrgNtiCCltJt9KrFyok7M+/DUKbBOLAVuGyr+W+Lmk
+Gk4CXXAv222AlsZxuOW73uF21H1mUBcCbEWfXphKHkzjGlTlbrqXjop8IHeTD9XO
+NEirAqDB1j/4PAgFsTFBl0We5vJ/96mEYHjk4Ouk5/mn+Tpc2FgVgoe5tizQJ9Lv
+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>
+MIIDNDCCAhygAwIBAgIJAJPOWX6jxm8nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFnNoaWIuY29tdW5lLnRyaWVzdGUuaXQwHhcNMTMxMTE5MTMyNzM1WhcNNDMx
+MTEyMTMyNzM1WjAhMR8wHQYDVQQDExZzaGliLmNvbXVuZS50cmllc3RlLml0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Y+CScWVXs3Hl2gxmGp5D1Co
+GdHbRD9LShZ7fCeEpcjxJjZ2apGnXXuQc7DpTthfkiYw+10SvgspjpOsT0T2fPGg
+oL6FIS4AUGKkspcGqmlHJjdj2d0bzVcyEpthd4LQmPajX5vNfiTFL01ZlJC4kBbE
+dFVobxxZPaeeMhxBFAwkf0vfmXBgJrUU4+zQoXE2VD/BOsK/tQStqrQH0uIGMR54
+lCkdFmiAaedYkdjsteZvKtxgb8TslE+ULxK0HAl9MmuHPSs/duaHmiM0Huybztj7
+OCgoa2hXKT9G867xB8kdFKwJgfyTZ2f9bIuPwcJEsVd6p5NBZFvd9qG1ILFWpQID
+AQABo28wbTBMBgNVHREERTBDghZzaGliLmNvbXVuZS50cmllc3RlLml0hilodHRw
+czovL3NoaWIuY29tdW5lLnRyaWVzdGUuaXQvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+gYEe61royxEPHxue0/dBHfj4x0swDQYJKoZIhvcNAQEFBQADggEBAMvNk6mztqu3
+5fKoBZNYhJTdVcC9C4MqjcgrgNtiCCltJt9KrFyok7M+/DUKbBOLAVuGyr+W+Lmk
+Gk4CXXAv222AlsZxuOW73uF21H1mUBcCbEWfXphKHkzjGlTlbrqXjop8IHeTD9XO
+NEirAqDB1j/4PAgFsTFBl0We5vJ/96mEYHjk4Ouk5/mn+Tpc2FgVgoe5tizQJ9Lv
+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>
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
new file mode 100644
index 00000000..91b234a6
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.dur.ac.uk:444-idp-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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>
+      <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>
+						MIID9jCCAt6gAwIBAgIJAPxm6Cbnsa4zMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
+						BAYTAkdCMRYwFAYDVQQIDA1Db3VudHkgRHVyaGFtMQ8wDQYDVQQHDAZEdXJoYW0x
+						HTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgRHVyaGFtMQwwCgYDVQQLDANDSVMxFzAV
+						BgNVBAMMDnNoaWIuZHVyLmFjLnVrMB4XDTEzMDMwNDExNTYyMloXDTIzMDMwNDEx
+						NTYyMlowfDELMAkGA1UEBhMCR0IxFjAUBgNVBAgMDUNvdW50eSBEdXJoYW0xDzAN
+						BgNVBAcMBkR1cmhhbTEdMBsGA1UECgwUVW5pdmVyc2l0eSBvZiBEdXJoYW0xDDAK
+						BgNVBAsMA0NJUzEXMBUGA1UEAwwOc2hpYi5kdXIuYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDb3Inw3qmbQglj/PfdG0Gt4NLlgIF3VyMMKhkX
+						KTgEZnEqMtz56yCrEQUv2q52+gEBHj5BC2I+tLH/D+hxeE2mscTsj5GYQEdXrZro
+						8+hlAxD5ygHPYYA0vTUWXp1jy7Oa5jL9nzVFVCcxXowuEOezLFdDPR2+q99dz29O
+						Az/9b6dVHb3IatG0ueDDNE+jtr+z7s67OEsgYL9cgkOs5bTbqZe6+BHs+MuRNYTI
+						3FmwtVRwiGEITMbAe/BRyr6Oa04uzLBqH5Xgrl/N0cqwsjo+IR9QG1GoMwY1PYa4
+						oQKr5NXMfnjZ1fZnWwbiDnRpwvxzX8nDgPdNRrjqZGQzxLofAgMBAAGjezB5MAkG
+						A1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRp
+						ZmljYXRlMB0GA1UdDgQWBBTjOCzu4jEoqNnF741QhQ6iWPfeIzAfBgNVHSMEGDAW
+						gBTjOCzu4jEoqNnF741QhQ6iWPfeIzANBgkqhkiG9w0BAQUFAAOCAQEA0Ayun4MT
+						76SeQDaSUUJY6CSMgk65rX/U7Be3QgPLGkjnWS1jyuQ0iEMIbMINEQuqhLAhxmh1
+						yGzwt4GOwqDO/HmzGbDA02coUENR58uwPXRwGjmNIW8k+BNOvfyh018rjM7dLxJU
+						zxGW+ge+jbEjiGG/gVdarffIDjDmAONjmcdhrbunMCcL9xgH/2UDm/eowOr8TiBC
+						drL5y3PFQUwmcJwJx4hZs8GiTUtuEQa18vxYTM4tgKvOpey97hnhJxWOhk+kuH7v
+						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>
+						MIID9jCCAt6gAwIBAgIJAPxm6Cbnsa4zMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
+						BAYTAkdCMRYwFAYDVQQIDA1Db3VudHkgRHVyaGFtMQ8wDQYDVQQHDAZEdXJoYW0x
+						HTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgRHVyaGFtMQwwCgYDVQQLDANDSVMxFzAV
+						BgNVBAMMDnNoaWIuZHVyLmFjLnVrMB4XDTEzMDMwNDExNTYyMloXDTIzMDMwNDEx
+						NTYyMlowfDELMAkGA1UEBhMCR0IxFjAUBgNVBAgMDUNvdW50eSBEdXJoYW0xDzAN
+						BgNVBAcMBkR1cmhhbTEdMBsGA1UECgwUVW5pdmVyc2l0eSBvZiBEdXJoYW0xDDAK
+						BgNVBAsMA0NJUzEXMBUGA1UEAwwOc2hpYi5kdXIuYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDb3Inw3qmbQglj/PfdG0Gt4NLlgIF3VyMMKhkX
+						KTgEZnEqMtz56yCrEQUv2q52+gEBHj5BC2I+tLH/D+hxeE2mscTsj5GYQEdXrZro
+						8+hlAxD5ygHPYYA0vTUWXp1jy7Oa5jL9nzVFVCcxXowuEOezLFdDPR2+q99dz29O
+						Az/9b6dVHb3IatG0ueDDNE+jtr+z7s67OEsgYL9cgkOs5bTbqZe6+BHs+MuRNYTI
+						3FmwtVRwiGEITMbAe/BRyr6Oa04uzLBqH5Xgrl/N0cqwsjo+IR9QG1GoMwY1PYa4
+						oQKr5NXMfnjZ1fZnWwbiDnRpwvxzX8nDgPdNRrjqZGQzxLofAgMBAAGjezB5MAkG
+						A1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRp
+						ZmljYXRlMB0GA1UdDgQWBBTjOCzu4jEoqNnF741QhQ6iWPfeIzAfBgNVHSMEGDAW
+						gBTjOCzu4jEoqNnF741QhQ6iWPfeIzANBgkqhkiG9w0BAQUFAAOCAQEA0Ayun4MT
+						76SeQDaSUUJY6CSMgk65rX/U7Be3QgPLGkjnWS1jyuQ0iEMIbMINEQuqhLAhxmh1
+						yGzwt4GOwqDO/HmzGbDA02coUENR58uwPXRwGjmNIW8k+BNOvfyh018rjM7dLxJU
+						zxGW+ge+jbEjiGG/gVdarffIDjDmAONjmcdhrbunMCcL9xgH/2UDm/eowOr8TiBC
+						drL5y3PFQUwmcJwJx4hZs8GiTUtuEQa18vxYTM4tgKvOpey97hnhJxWOhk+kuH7v
+						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>
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
new file mode 100644
index 00000000..59d18e8b
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.gcu.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,96 @@
+<?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>
+      <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
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIchBd2lzuQ45cxGQVaDT0WpztTW9Bi1
+						+oXgxor2jun7trjtQe93sHmkCfjsAvZad9+gSVxFV3gHFHfpDix+XRZu1l3/f1mW
+						bDhQtsFi3ooMRb+z8eN6XsSzRXjOm+Zq/TtvG5ASVvJIqKM5zAZmbAjhlF3GyaWa
+						+MFTc9Jk84Gfo9v7apFKx1LAUxnQaCYNSMSombtAyVUNSc74YqN56F/0V+jUnvMT
+						NkkQ4YiiFYzcO7M6xut1avUzZn00aEjlnCFHB8beWH4UV+DXGKxb/k31IjOpox4K
+						esz9S1J0UhZsqmLZdjxExfVzgZLvplKpSKfEpxyheSeSg525XURwl2kCAwEAAaNj
+						MGEwQAYDVR0RBDkwN4IOc2hpYi5nY3UuYWMudWuGJWh0dHBzOi8vc2hpYi5nY3Uu
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFC2/w2ppSqmygKbmZGMoPqKT
+						cbhrMA0GCSqGSIb3DQEBBQUAA4IBAQBCV7RJxCsiFIMkBwB9FwOCP3jGjOcUXde7
+						fwMwb99pAuwEZPe2LwwHxZZSowsKkt3y7KEhqzG4mMxBvvf++mlmErnpvVW9xptc
+						nRHfNCw44o/MXjTc5oK85iUDL0XW6NpaNlUFO68oYh+o5syUgLeSjtFVvrZn7Skd
+						NyG6F7QvM6YMx7RFp0ij1h9/yGfUb2iVFTWOePRzTTJ+/u8zOay+fLHiFmL3u6Al
+						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>
+						MIIDIzCCAgugAwIBAgIUGOsthEUhMn8ZqSRhbf29aeFD9OswDQYJKoZIhvcNAQEF
+						BQAwGTEXMBUGA1UEAxMOc2hpYi5nY3UuYWMudWswHhcNMTQwNDAxMTUxOTAwWhcN
+						MzQwNDAxMTUxOTAwWjAZMRcwFQYDVQQDEw5zaGliLmdjdS5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIchBd2lzuQ45cxGQVaDT0WpztTW9Bi1
+						+oXgxor2jun7trjtQe93sHmkCfjsAvZad9+gSVxFV3gHFHfpDix+XRZu1l3/f1mW
+						bDhQtsFi3ooMRb+z8eN6XsSzRXjOm+Zq/TtvG5ASVvJIqKM5zAZmbAjhlF3GyaWa
+						+MFTc9Jk84Gfo9v7apFKx1LAUxnQaCYNSMSombtAyVUNSc74YqN56F/0V+jUnvMT
+						NkkQ4YiiFYzcO7M6xut1avUzZn00aEjlnCFHB8beWH4UV+DXGKxb/k31IjOpox4K
+						esz9S1J0UhZsqmLZdjxExfVzgZLvplKpSKfEpxyheSeSg525XURwl2kCAwEAAaNj
+						MGEwQAYDVR0RBDkwN4IOc2hpYi5nY3UuYWMudWuGJWh0dHBzOi8vc2hpYi5nY3Uu
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFC2/w2ppSqmygKbmZGMoPqKT
+						cbhrMA0GCSqGSIb3DQEBBQUAA4IBAQBCV7RJxCsiFIMkBwB9FwOCP3jGjOcUXde7
+						fwMwb99pAuwEZPe2LwwHxZZSowsKkt3y7KEhqzG4mMxBvvf++mlmErnpvVW9xptc
+						nRHfNCw44o/MXjTc5oK85iUDL0XW6NpaNlUFO68oYh+o5syUgLeSjtFVvrZn7Skd
+						NyG6F7QvM6YMx7RFp0ij1h9/yGfUb2iVFTWOePRzTTJ+/u8zOay+fLHiFmL3u6Al
+						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>
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
new file mode 100644
index 00000000..4a686c59
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.hope.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzmHDbw1UxozQxVsCj8D1elIGXe1j
+						lUMlT8KADqpY0N1K5R2G1j2cXXGXxx764LMpBm7Ln1WruGU0c+pSN+4m/5/hc1Ub
+						q1PKjnVuhj+kBJjx6GilX4UaeCJVpxTsPvev9Nd8Wxg+FFBVppJXPvJvAlZxACjX
+						i93rokFJXieWQx3R4OGiJxsouCbfJsyjKxS+DOMtQqQ229NrcGNNfBwjKtLopaYI
+						oo8ofxZLY6Y1aOhpepMTczZqFND/gtHVcUfhXGHNUDG+sN/cbe6W6VEzDIKlge5w
+						vjEJWn9IRfdo2RYGoBdc561L1RnXiTNekmsmrBOGO3MXUJSkplzepr08XwIDAQAB
+						o2UwYzBCBgNVHREEOzA5gg9zaGliLmhvcGUuYWMudWuGJmh0dHBzOi8vc2hpYi5o
+						b3BlLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTS/UZaSWqRgi54sLx4
+						HaDi1fGhizANBgkqhkiG9w0BAQUFAAOCAQEAQMiFtqFds58lE3wT/UqQqFSxpz6t
+						eFvNR90R1jJ1en7YGFKFtVqL6gEOh/O4Y5et+VASZ9OJalRpmlO14l3NrG5+h8Nx
+						K4NUH/9lOBrMPvwgWWuiSYxigmWIgfsTTQIWbnc8m/koGuAzHkhmki/LE0DcEeeW
+						c4OxCwaN4AHpdet/nYzSAU7dO1RunbPGSx57N97B8hDELyYW722iSbUHrUceve4L
+						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>
+						MIIDJzCCAg+gAwIBAgIUF9LBjyyNarRHVF85JrS8jx1eFDIwDQYJKoZIhvcNAQEF
+						BQAwGjEYMBYGA1UEAxMPc2hpYi5ob3BlLmFjLnVrMB4XDTEzMDcxNjA4NDgyMloX
+						DTMzMDcxNjA4NDgyMlowGjEYMBYGA1UEAxMPc2hpYi5ob3BlLmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzmHDbw1UxozQxVsCj8D1elIGXe1j
+						lUMlT8KADqpY0N1K5R2G1j2cXXGXxx764LMpBm7Ln1WruGU0c+pSN+4m/5/hc1Ub
+						q1PKjnVuhj+kBJjx6GilX4UaeCJVpxTsPvev9Nd8Wxg+FFBVppJXPvJvAlZxACjX
+						i93rokFJXieWQx3R4OGiJxsouCbfJsyjKxS+DOMtQqQ229NrcGNNfBwjKtLopaYI
+						oo8ofxZLY6Y1aOhpepMTczZqFND/gtHVcUfhXGHNUDG+sN/cbe6W6VEzDIKlge5w
+						vjEJWn9IRfdo2RYGoBdc561L1RnXiTNekmsmrBOGO3MXUJSkplzepr08XwIDAQAB
+						o2UwYzBCBgNVHREEOzA5gg9zaGliLmhvcGUuYWMudWuGJmh0dHBzOi8vc2hpYi5o
+						b3BlLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTS/UZaSWqRgi54sLx4
+						HaDi1fGhizANBgkqhkiG9w0BAQUFAAOCAQEAQMiFtqFds58lE3wT/UqQqFSxpz6t
+						eFvNR90R1jJ1en7YGFKFtVqL6gEOh/O4Y5et+VASZ9OJalRpmlO14l3NrG5+h8Nx
+						K4NUH/9lOBrMPvwgWWuiSYxigmWIgfsTTQIWbnc8m/koGuAzHkhmki/LE0DcEeeW
+						c4OxCwaN4AHpdet/nYzSAU7dO1RunbPGSx57N97B8hDELyYW722iSbUHrUceve4L
+						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>
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
new file mode 100644
index 00000000..f755aebd
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.hopwood.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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>
+      <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
+						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjESMBAGA1UEBxMJTWlkZGxldG9u
+						MR0wGwYDVQQKExRIb3B3b29kIEhhbGwgQ29sbGVnZTEUMBIGA1UECxMLSVQgU2Vy
+						dmljZXMxGzAZBgNVBAMTEnNoaWIuaG9wd29vZC5hYy51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBAMTEzlsQCuuQ22DtG3+IFJTPxvZ2iZyYdIbOFduU
+						USos7vfb5GQfJkwSrYS6UursJvwrFBVcKi2KCDkS+EJ7ymvWaMKSQY38NbaNwsjw
+						0MzynunhcVGHVEidZB2X2MgwYn6aT2rWcu8GSdScxYg9mlgGy0xN6kxooMB3Gxhy
+						Bi06mYqMZYGFwdZfuJC0VbRfAW2X1cxxIs07aTrx+xx7Lghzf7BWgupVnqtvIkGW
+						efk4oYerYwcCWe6pNHhw5XTbJzjyNLIKz+4yAP36Bbu2TezoGr0ZiQ8ah2Xwq/h6
+						Wzg4Jbvx2u+9BCuBXyELhOKi5Idfg3f4LHaG4pcrhiT0fmUCAwEAAaOCAWUwggFh
+						MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTaHgoB
+						4D9pslBrxTsyQgpCmLFk2zAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAd
+						BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEE
+						AbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+						b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+						KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+						AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+						aGliLmhvcHdvb2QuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAHRlfjnge7jB++dY
+						xSUX3tdqK0mUO9z3QurwOkMQ/IiJj0vZEag9Y34Pmz4rG0qMGrZAM0oUpH7y2kDA
+						7zib/aBERmNzdzviCw7FOcSBeNL53vRJqmK/4/cz6eLYeFqCZlSQ6m9Cog9VpmhQ
+						RrSHcJlKGTejTq/XoLiwUFgRzlpDcRWJ8oyxyGEWfut2jG15SNTa99RXGvpC3KJW
+						ZE3W6D7eFqgEQqfNN5r+aVuRrBxgIJYC+CrJWOyGifwjtqLbHmdDiH6jiAocIYvG
+						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>
+						MIIEsTCCA5mgAwIBAgIRALnjZG05JaVVoUZ0xE0JifUwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMTA4MTgwMDAwMDBaFw0xNDA4MTcyMzU5NTlaMIGIMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjESMBAGA1UEBxMJTWlkZGxldG9u
+						MR0wGwYDVQQKExRIb3B3b29kIEhhbGwgQ29sbGVnZTEUMBIGA1UECxMLSVQgU2Vy
+						dmljZXMxGzAZBgNVBAMTEnNoaWIuaG9wd29vZC5hYy51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBAMTEzlsQCuuQ22DtG3+IFJTPxvZ2iZyYdIbOFduU
+						USos7vfb5GQfJkwSrYS6UursJvwrFBVcKi2KCDkS+EJ7ymvWaMKSQY38NbaNwsjw
+						0MzynunhcVGHVEidZB2X2MgwYn6aT2rWcu8GSdScxYg9mlgGy0xN6kxooMB3Gxhy
+						Bi06mYqMZYGFwdZfuJC0VbRfAW2X1cxxIs07aTrx+xx7Lghzf7BWgupVnqtvIkGW
+						efk4oYerYwcCWe6pNHhw5XTbJzjyNLIKz+4yAP36Bbu2TezoGr0ZiQ8ah2Xwq/h6
+						Wzg4Jbvx2u+9BCuBXyELhOKi5Idfg3f4LHaG4pcrhiT0fmUCAwEAAaOCAWUwggFh
+						MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTaHgoB
+						4D9pslBrxTsyQgpCmLFk2zAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAd
+						BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEE
+						AbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+						b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+						KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+						AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+						aGliLmhvcHdvb2QuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAHRlfjnge7jB++dY
+						xSUX3tdqK0mUO9z3QurwOkMQ/IiJj0vZEag9Y34Pmz4rG0qMGrZAM0oUpH7y2kDA
+						7zib/aBERmNzdzviCw7FOcSBeNL53vRJqmK/4/cz6eLYeFqCZlSQ6m9Cog9VpmhQ
+						RrSHcJlKGTejTq/XoLiwUFgRzlpDcRWJ8oyxyGEWfut2jG15SNTa99RXGvpC3KJW
+						ZE3W6D7eFqgEQqfNN5r+aVuRrBxgIJYC+CrJWOyGifwjtqLbHmdDiH6jiAocIYvG
+						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>
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
new file mode 100644
index 00000000..136619bd
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.ifgoiano.edu.br-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIIEOjCCAyICAQAwDQYJKoZIhvcNAQEFBQAwgeIxLDAqBgNVBAoTI0lGR09JQU5P
+IC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5vMT0wOwYDVQQLFDRER1RJIC0gRGly
+ZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMSMwIQYJ
+KoZIhvcNAQkBFhRkZ3RpQGlmZ29pYW5vLmVkdS5icjERMA8GA1UEBxQIR29pw6Ju
+aWExDzANBgNVBAgUBkdvacOhczELMAkGA1UEBhMCQlIxHTAbBgNVBAMTFHNoaWIu
+aWZnb2lhbm8uZWR1LmJyMB4XDTE0MDQxMDIxMDc1MFoXDTE5MDQwOTIxMDc1MFow
+geIxLDAqBgNVBAoTI0lGR09JQU5PIC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5v
+MT0wOwYDVQQLFDRER1RJIC0gRGlyZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEg
+ZGEgSW5mb3JtYcOnw6NvMSMwIQYJKoZIhvcNAQkBFhRkZ3RpQGlmZ29pYW5vLmVk
+dS5icjERMA8GA1UEBxQIR29pw6JuaWExDzANBgNVBAgUBkdvacOhczELMAkGA1UE
+BhMCQlIxHTAbBgNVBAMTFHNoaWIuaWZnb2lhbm8uZWR1LmJyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2egNizK29vvUL0C4Iju9kh6RJ4OE3QjcNHY
+Zh+JmAi+yb81E5CF8/dhBQRZ8Nqqp7DfpqipfD9P8pWUo1FsKeAmgfYGUr0gwYXY
+fQX7E5fOjSLeZegi5J6PYs7UveFRle4WIlD55CP5ERIVZ0QWFEnSXFAX3+xp1Zb7
+L0CASlxgi2UunN5jjpJWSW27A2rUwo3QPoJKPvBLh0tSTB5VAAuO/ksHULLDvDGl
+DdWrDRADXxQCnFKRrAYYfklnnGjegu8MNx1bMTxXHdeuZZEmWzes+FZ/aoZY2/vu
+NGsmNvHhoUTiT+BJRDskEICJ7gLTW9iWEg+tCpX2wuEqqHqkQwIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQAdb1hHAUd7k8uxZn48i38WEK/EteeVDFnK5rNsSpmXBNQn
+VE2McbYxHWpObBmavcG54nlrjgbKz/O8AHoD+uygRmEm70iyXO8La1SqmEaIppWF
++Aydp01u0EC9VE50ZFYphNpdtKv695D3wvwsQGQ/kV+5xKyHQ8thXD97bVIj9oMR
+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>
+      
+MIIEOjCCAyICAQAwDQYJKoZIhvcNAQEFBQAwgeIxLDAqBgNVBAoTI0lGR09JQU5P
+IC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5vMT0wOwYDVQQLFDRER1RJIC0gRGly
+ZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMSMwIQYJ
+KoZIhvcNAQkBFhRkZ3RpQGlmZ29pYW5vLmVkdS5icjERMA8GA1UEBxQIR29pw6Ju
+aWExDzANBgNVBAgUBkdvacOhczELMAkGA1UEBhMCQlIxHTAbBgNVBAMTFHNoaWIu
+aWZnb2lhbm8uZWR1LmJyMB4XDTE0MDQxMDIxMDc1MFoXDTE5MDQwOTIxMDc1MFow
+geIxLDAqBgNVBAoTI0lGR09JQU5PIC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5v
+MT0wOwYDVQQLFDRER1RJIC0gRGlyZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEg
+ZGEgSW5mb3JtYcOnw6NvMSMwIQYJKoZIhvcNAQkBFhRkZ3RpQGlmZ29pYW5vLmVk
+dS5icjERMA8GA1UEBxQIR29pw6JuaWExDzANBgNVBAgUBkdvacOhczELMAkGA1UE
+BhMCQlIxHTAbBgNVBAMTFHNoaWIuaWZnb2lhbm8uZWR1LmJyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2egNizK29vvUL0C4Iju9kh6RJ4OE3QjcNHY
+Zh+JmAi+yb81E5CF8/dhBQRZ8Nqqp7DfpqipfD9P8pWUo1FsKeAmgfYGUr0gwYXY
+fQX7E5fOjSLeZegi5J6PYs7UveFRle4WIlD55CP5ERIVZ0QWFEnSXFAX3+xp1Zb7
+L0CASlxgi2UunN5jjpJWSW27A2rUwo3QPoJKPvBLh0tSTB5VAAuO/ksHULLDvDGl
+DdWrDRADXxQCnFKRrAYYfklnnGjegu8MNx1bMTxXHdeuZZEmWzes+FZ/aoZY2/vu
+NGsmNvHhoUTiT+BJRDskEICJ7gLTW9iWEg+tCpX2wuEqqHqkQwIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQAdb1hHAUd7k8uxZn48i38WEK/EteeVDFnK5rNsSpmXBNQn
+VE2McbYxHWpObBmavcG54nlrjgbKz/O8AHoD+uygRmEm70iyXO8La1SqmEaIppWF
++Aydp01u0EC9VE50ZFYphNpdtKv695D3wvwsQGQ/kV+5xKyHQ8thXD97bVIj9oMR
+m8XXI7eDPZ2s/B0UoEZbvIAy68id7h/EtRyWbYyD8P5TNQ5JUs2I57orOEHfSbTz
+0+MpDn1u65HRka+3/3thgXdHyoyS+kkP9TjNdcnRxhsHpwwB0gvCfFXHS899/zsI
+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>
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
new file mode 100644
index 00000000..74e7da41
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.ihs.ac.at-idp-shibboleth.xml
@@ -0,0 +1,80 @@
+<?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>
+      <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="en">Institute for Advanced Studies</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="de">Institut für Höhere Studien</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>
+MIIDJDCCAgygAwIBAgIVAOgeJhXY1VXjDMkzFquM9nu+yZo+MA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDnNoaWIuaWhzLmFjLmF0MB4XDTE0MDUwOTE1MjU1MloX
+DTM0MDUwOTE1MjU1MlowGTEXMBUGA1UEAxMOc2hpYi5paHMuYWMuYXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeED2QysFaRKSzdMP+QuJArV7j8bBP
+bVVZqLwW25RDrL6kBl5FRyQYtnkTE9yXKlEy2mAj43FzqBTknxnTMWHShXSFISdi
+3mY/tjqoTAgaN6JfyISlBSNLsx+0XcZ3ZelakqZHp1b5mvJnSiGI6o69dunFcxGU
+vPf9NJaaZsUxM+9wYlQQqLM7HYeknl6KpCi9jgDr9k3INlqE6wpVXHdyDytd7CAh
+8NGvmmlB9744Pd07raqnQGOHizgZ97/33of6S5QAC0F+KihcSSMxq93VTkC6eRUI
+YEZUyhPfPDyv1a26+bqikA5PWER/Vfq6bdaS62ARr9hvbZafYwfM8YpTAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDnNoaWIuaWhzLmFjLmF0hiVodHRwczovL3NoaWIuaWhz
+LmFjLmF0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSkJ/IMZqy7K+EaaDk3roup
+bMsUJjANBgkqhkiG9w0BAQUFAAOCAQEAd1TCkWpH7wc9NVWtzJ1y67C7ZX9C6SL2
+lIUqBMKL95mVmnLloOUhUSqydLznim5sMdduKAh+p6axDxAwP+3Q9uwVtcHh0tlb
+C0+F70Mm6MnVaQwVDITcqCIBqeONDDXUd++dTxPqDj2cQ1Mg6a+ULXxwhjBwfW8g
+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</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Institute for Advanced Studies</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
new file mode 100644
index 00000000..597f0bbc
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.informit.com.au/Shibboleth.sso/DS" index="1"/>
+      <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"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDAzCCAeugAwIBAgIJALYvWF0HTg94MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFHNoaWIuaW5mb3JtaXQuY29tLmF1MB4XDTEzMDYwNjAxMzMzMFoXDTIzMDYw
+						NDAxMzMzMFowHzEdMBsGA1UEAxMUc2hpYi5pbmZvcm1pdC5jb20uYXUwggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQConFnj3K7sHy3Xa8iyPuW3NSYl9H8L
+						1yUYum0MvgrMtxSn+hhrRQZS9Ub1E+7BLjsdBfmnDVsL8i+nCmTtWuDhINSeCPhh
+						RVF4pJ6zl6OFRc0k4X5JhTF7hfqKMmvALAUzMvRRb/Q6YmRFdsZq6cdyZxZaMKUN
+						CWwjsFHD9Tg4bF6s+OVdnSqpTJE518wzl8LxklkSeo/xjWoBezA11t8/E5HKFqv3
+						Djwvd5cF8Pt5Cyxp8wz8oacyzamQFhWcn2XQcaSUh8vodNCFtFxvPXl1mcZGY+kq
+						iCyT91pSxSFasliWoJaY839DmqaqYZtPN92lYMmDLeNYEX0hBczBxztTAgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFHNoaWIuaW5mb3JtaXQuY29tLmF1MB0GA1UdDgQWBBT2
+						l+da01RVVegnzL4KMKKI9W79cTANBgkqhkiG9w0BAQUFAAOCAQEAKZyhvO7eDK57
+						xQ2STBOYKOJC9yEpH2CmNhkshIgvTN3S2yYfz1jjtTAxCke/2FyO3BIJCGgDeXG/
+						MdL9DTmblscFdhyAqvw/Y4IZMVPePrvOna8CmdsSXxV1V1B+YO6q8qlWQ/19Aqs8
+						yfoTBDA3DSXYPqfYN2Q44J9B45tSdfr5Et3bcISdusu6aXnxwfpm2S9SZ9fkQCSM
+						oT3Pa2/yXfxkvLyszNsiSjV7p30I6qpIOELLILYxN881SGs0Xi0GPhw9LtGJT6wY
+						/HUOp21fktmi6T1RRosh/kjF69hpNeY1qnoobw4stsDRi36AybFABgv0wxFk/4PL
+						t2UA+9z1qA==
+					</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:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/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: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>Deepak</md:GivenName>
+    <md:SurName>Vasa</md:SurName>
+    <md:EmailAddress>mailto:deepak.vasa@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
new file mode 100644
index 00000000..f73a003e
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.ingramdigital.com-shibboleth.xml
@@ -0,0 +1,77 @@
+<?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>
+      <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>
+						MIIFxDCCBKygAwIBAgIQOpCD+8UZ84TwSedea43aUDANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwMzMw
+						MDAwMDAwWhcNMTgwMzMxMjM1OTU5WjCBsDELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+						CVRlbm5lc3NlZTERMA8GA1UEBxQITGFWZXJnbmUxFzAVBgNVBAoUDkluZ3JhbSBE
+						aWdpdGFsMQswCQYDVQQLFAJJVDEzMDEGA1UECxQqVGVybXMgb2YgdXNlIGF0IHd3
+						dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MR8wHQYDVQQDFBZzaGliLmluZ3JhbWRp
+						Z2l0YWwuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtR7bJj0G
+						944b3VEsUv+lB9czHTMCVsjQxKL9gj39e5kwh0pv1d2dNgcVTiMxjeX+ytziakLw
+						jvNugfmWRqV5P2TAcyforAVFjknUGIY33vfqqn8EhxE8ydpcf1e2soYb8SnqBW84
+						AKkcuy9sOvsmjH2mP5wxzdHfbUG+2iJqhXPzEdZZp+3OjA0MKpJgoo0LDxmiGbKL
+						6u+DOLsi0sqvh8c/M0fq3vA+BQQOL+9vWL2Yf1jbV0hpdoTUMxixLlf9thItPh6h
+						Ucok8f6OhWSK5slTXO3IVoki9uRAzEOckkyzRqthuNOgQgXSzDVxzaygeGSfmvSL
+						wJ59DW3pYFhLIwIDAQABo4IB0TCCAc0wCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAw
+						RQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL1NWUlNlY3VyZS1HMy1jcmwudmVyaXNp
+						Z24uY29tL1NWUlNlY3VyZUczLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcD
+						MCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwHQYD
+						VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFA1EXBZTRMGC
+						fh0gqyX0AWPYvnmlMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDov
+						L29jc3AudmVyaXNpZ24uY29tMEAGCCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJl
+						LUczLWFpYS52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY2VyMG4GCCsGAQUFBwEM
+						BGIwYKFeoFwwWjBYMFYWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy7
+						0FI4mymsSweLIQUYMCYWJGh0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28x
+						LmdpZjANBgkqhkiG9w0BAQUFAAOCAQEApLyZmCn4L1QNZ2xg1zbqv07Jfvo4WllF
+						kWOxaWWOBLoWi73/BNwcPsUgbnDGxRFLWKeMbdVPiS2ezI4ckTPShxw6Vq7wkRWQ
+						wRkQAE8AOfv5ZqMc3T2RSEJQu+FRSfYh4W6CTbDd0YXf6kPC5X/tStgFWlFr3hNY
+						ahkl80i8Ykgw14NIuW0AFTSQc+9Wl/B46rQ2wyOhM51XOQe9yvfKllef3npk8NTw
+						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>
diff --git a/swamid-interfederations-2.0/shib.labarchives.com-sp-production.xml b/swamid-interfederations-2.0/shib.labarchives.com-sp-production.xml
new file mode 100644
index 00000000..2e1e9c2d
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.labarchives.com-sp-production.xml
@@ -0,0 +1,67 @@
+<?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>
+      <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>
+						MIIDQjCCAiqgAwIBAgIJAN/P3HVfB4O6MA0GCSqGSIb3DQEBBQUAMDQxMjAwBgNV
+						BAMTKWRvbVUtMTItMzEtMzktMDMtMzAtNTQuY29tcHV0ZS0xLmludGVybmFsMB4X
+						DTEyMTIwNDIxMDM1NloXDTIyMTIwMjIxMDM1NlowNDEyMDAGA1UEAxMpZG9tVS0x
+						Mi0zMS0zOS0wMy0zMC01NC5jb21wdXRlLTEuaW50ZXJuYWwwggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDYEIq97L4YEh0lzxO1gU0c3ZlD4luAqhr2DQeo
+						/14OAlhUDRqgDgEdpKaGec2guAXiyJSuA0bsTFOx+DaYZorr7MFfuMMm2P7rU45G
+						mbrhBmMLiQalvlAyk/2tOVenPM4yCJ6FMvf9o5AS+c4JsZCprSKSjSegMt6+zy4E
+						uaO/SjD4DJ6sz4Xa7RqWIxVygGrjPKD7zOQpfDVVOc78mdUnCtNAudTiiLGBsRrZ
+						etlymJm7snHG2gGcHC9Zfa1uoBsBzrwPA4X/nu/B4ICnuyTgLJq4Fx+o54bqWSZZ
+						A9CNXvSXjoAOw3+Jqgdm1WFOrYOwOPGP0Y84vKUbaj+lzL1FAgMBAAGjVzBVMDQG
+						A1UdEQQtMCuCKWRvbVUtMTItMzEtMzktMDMtMzAtNTQuY29tcHV0ZS0xLmludGVy
+						bmFsMB0GA1UdDgQWBBQXjWp50EyWG9BwpuZJai08QZoJRTANBgkqhkiG9w0BAQUF
+						AAOCAQEAiczpR8WP641CI/wX0wuVnhtYWQvrLcqhbzsOSojlK04DC8MdDysK+tpv
+						KROZ8F4D1Tngrr4l1MWa0+BVQhW03opIQ2iKDp7fRSlqyJqqXS4DMEw0G2zcde7P
+						D7o/Q8YD/PsboOIvsveaV8g3uaRvv0Y6/i+B/TslX8Mcpc8kkYhpVR1QfFpHo18m
+						OzV0TEys7QRbVskIW8+a0uomjapzkYd3A9GWE4liaWByDSNDw/dqz9TNHKxHg4Ii
+						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>
diff --git a/swamid-interfederations-2.0/shib.lexisnexis.com.xml b/swamid-interfederations-2.0/shib.lexisnexis.com.xml
new file mode 100644
index 00000000..9824d466
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.lexisnexis.com.xml
@@ -0,0 +1,83 @@
+<?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>
+						MIIEQzCCAyugAwIBAgIJAKsEBMs9ysWqMA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNV
+						BAYTAlVTMQ0wCwYDVQQIEwRPaGlvMRMwEQYDVQQHEwpNaWFtaXNidXJnMRQwEgYD
+						VQQKEwtMRVhJUy1ORVhJUzEcMBoGA1UEAxMTc2hpYi5sZXhpc25leGlzLmNvbTAe
+						Fw0xMTExMzAwMjQ4MzRaFw0yMTExMjcwMjQ4MzRaMGUxCzAJBgNVBAYTAlVTMQ0w
+						CwYDVQQIEwRPaGlvMRMwEQYDVQQHEwpNaWFtaXNidXJnMRQwEgYDVQQKEwtMRVhJ
+						Uy1ORVhJUzEcMBoGA1UEAxMTc2hpYi5sZXhpc25leGlzLmNvbTCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBANjDzx1Y2nFbwojj8gXeqQnJ4QIhK/XYagTy
+						I3v7vJODtI5Ekns5oUqW3eDlJrOsixuzk5sYoqQEkNF3vjcVXPrwEOVb/I4vq/qb
+						Sk8q1+YkFD7CCNx8sMOhUeuJEsYYdgxOaWuHzB0juAGxbeCYGLZU8DY/Zb5kBLXU
+						esSqF1uRKTUl+z5CTls/91Bq9PuM58jesGRIKTg7doyAx+VJi0frnr0Dyse2mG6Y
+						onlgiGOSVdUGQsqj4zHP10xRGbQqEfpvnZxRR/j34uZLaS3H9r0Yks8FSQj+UmtL
+						OkaEDqoWJVGpdwY+HUX6bmTt5BBu1uowAlgOI+6jqF6cXrX0jR0CAwEAAaOB9TCB
+						8jAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
+						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUbbexhyY79bl5AamiayqLi4BN4PowgZcGA1Ud
+						IwSBjzCBjIAUbbexhyY79bl5AamiayqLi4BN4PqhaaRnMGUxCzAJBgNVBAYTAlVT
+						MQ0wCwYDVQQIEwRPaGlvMRMwEQYDVQQHEwpNaWFtaXNidXJnMRQwEgYDVQQKEwtM
+						RVhJUy1ORVhJUzEcMBoGA1UEAxMTc2hpYi5sZXhpc25leGlzLmNvbYIJAKsEBMs9
+						ysWqMA0GCSqGSIb3DQEBBQUAA4IBAQC5UdjOHxhSl8qRwWklR4bpml1aD4/lDInE
+						3/QtvJRQVnZY/VlUF6wnyFMiRJ8twjYvFDQ9OnUFj56N1rc0tbrYxxwhmJ8zGVs0
+						mNKoRZDSa/iUDZ1tUZ1e2Qc2D0/kqqg8tD2WUmXJqHu8SdFZE0wobj2mIOxAO6pV
+						PCAt4y7P0xNscbZ9tXX5RoVIAw1mR7NqFPeGSSUDkzkdpF/ikuRiv2/JLhsb5V+3
+						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>
diff --git a/swamid-interfederations-2.0/shib.lynda.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shib.lynda.com-shibboleth-sp.xml
new file mode 100644
index 00000000..4c556ba3
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.lynda.com-shibboleth-sp.xml
@@ -0,0 +1,63 @@
+<?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>
+						MIIDFDCCAfygAwIBAgIJAMLZrCd7zl9XMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXd3dy5seW5kYS5jb20wHhcNMTExMDIxMTQ0OTE5WhcNMzExMDE2MTQ0OTE5
+						WjAYMRYwFAYDVQQDEw13d3cubHluZGEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA6j3DFreCqV2jROA5Y0LR/q5BCpbI3NmdMyq5wF0CbkZOfp/s
+						rnGyK2Xf6EdidAwGe8E2DwzvQpQHcs3iUb9jyaep8uo4Vkih8UTuO5G7+iZGprYI
+						6qi83uH0euXoCmH7Z0iiFsyYrtnzmxWzGYYiFyXS0/7HaGBnWgXrMCqs5e0VZO0I
+						uYn58OC4HR4Ydx7S11CwV8l/3Yuf1iESuT8718ik2N6xGEY+yAe1GB/QT/GVzuel
+						4R7y+Aas9Gl+6SgvY1Mkxo7iqERx+viGY3sWLzMuQblC4+pCrKU6AeK4Exs+NxWL
+						HT+/B4ADE+vdSF4L6r/D2CBw/kog7x33ociv2QIDAQABo2EwXzA+BgNVHREENzA1
+						gg13d3cubHluZGEuY29thiRodHRwczovL3NoaWIubHluZGEuY29tL3NoaWJib2xl
+						dGgtc3AwHQYDVR0OBBYEFE7TaeX7Yg7gEyzogSoL4g+zg2EzMA0GCSqGSIb3DQEB
+						BQUAA4IBAQCeIHAuamRAKxlbCsSi8xqG9KrFgCA75JhT1eJqkM1IofR0Ylx5fLnp
+						Qi99/vxNtqfPLCvFBEIkOjKy1INVM8rjkz2koMbLSQuyM4e69P3Xdd691sceFgMb
+						f0T7vMGKHoRElMWERg4VPjYA7vQaVQ+DWV+WPhHILmCBkKXI4ja4p4pW3NWBU96E
+						ooh1dyZQJXIr1k+cKdlHm9q8QtJfE7O6dZsm3aKBwQVkOuwZnv7lL8/ePgxp/bDv
+						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>
diff --git a/swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..196e8535
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml
@@ -0,0 +1,134 @@
+<?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>
+      <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>
+						MIIEdzCCA1+gAwIBAgIQaXCywgq+vX5DO7vX+v+c6TANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDUzMDAwMDAwMFoXDTE2MDUyOTIzNTk1OVowQzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliLm1hbmNo
+						ZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD7mNMx
+						lCtJ3uEbR9KNxl4wxdpRof4DyoKCu/FfByvIDfr9zB5H2P8mGQfOD0o49xiEkFCd
+						lozVa8f8a3yNjY3pHgibEIMXSJ1QalP+CrINr/a32O8WYV9ZA2w3rkSggtWxxmVD
+						HHQ9ufTl2lmvkGg1Z0+3VCic5mEEDHDKXKm4CWo5CGnT8/FzTD2sJfGdSsfi1WDK
+						k6Gff+hv9VZCjWzSJgXtuLgYP5Ze9ZcDgcKuqlwlpOzOO6NEMI8dzfHMp+yTL+4B
+						JaahF0zPuOsfJFdi6/r5GsmVLtJXiQuPstRPVTwb9mQuhOmDC4zYcPfjA49yjqnC
+						reJTACJv6Z42rmtRAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+						ays3V0fqkOO57TAdBgNVHQ4EFgQUNwr+LyyfLnzNIYq172tNWGDX2tIwDgYDVR0P
+						AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+						AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFXNoaWIubWFuY2hlc3Rl
+						ci5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAcL1bk4E3a2N2C+va00jBDRb4BF69
+						PfSqKZkXeeUHOpGUU0l30p8iS2uR7F+t3CYHulqN3jqPbtpNHUbtUdBpbIY/KTGW
+						nm2fF8hW84RwmGhR2w7B+f3He5gleC7t7Tj91L+z7ue8YvbYxiLjIZfiEmon0iUT
+						7d2BkbiIL7TVA3W63EIHnQHT4xNLzv1pvWCXU275R2k54qFyoYdmhC9sljPQWZ1v
+						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>
+						MIIEdzCCA1+gAwIBAgIQaXCywgq+vX5DO7vX+v+c6TANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDUzMDAwMDAwMFoXDTE2MDUyOTIzNTk1OVowQzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliLm1hbmNo
+						ZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD7mNMx
+						lCtJ3uEbR9KNxl4wxdpRof4DyoKCu/FfByvIDfr9zB5H2P8mGQfOD0o49xiEkFCd
+						lozVa8f8a3yNjY3pHgibEIMXSJ1QalP+CrINr/a32O8WYV9ZA2w3rkSggtWxxmVD
+						HHQ9ufTl2lmvkGg1Z0+3VCic5mEEDHDKXKm4CWo5CGnT8/FzTD2sJfGdSsfi1WDK
+						k6Gff+hv9VZCjWzSJgXtuLgYP5Ze9ZcDgcKuqlwlpOzOO6NEMI8dzfHMp+yTL+4B
+						JaahF0zPuOsfJFdi6/r5GsmVLtJXiQuPstRPVTwb9mQuhOmDC4zYcPfjA49yjqnC
+						reJTACJv6Z42rmtRAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+						ays3V0fqkOO57TAdBgNVHQ4EFgQUNwr+LyyfLnzNIYq172tNWGDX2tIwDgYDVR0P
+						AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+						AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFXNoaWIubWFuY2hlc3Rl
+						ci5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAcL1bk4E3a2N2C+va00jBDRb4BF69
+						PfSqKZkXeeUHOpGUU0l30p8iS2uR7F+t3CYHulqN3jqPbtpNHUbtUdBpbIY/KTGW
+						nm2fF8hW84RwmGhR2w7B+f3He5gleC7t7Tj91L+z7ue8YvbYxiLjIZfiEmon0iUT
+						7d2BkbiIL7TVA3W63EIHnQHT4xNLzv1pvWCXU275R2k54qFyoYdmhC9sljPQWZ1v
+						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>IT Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:IT-Servicedesk@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sam</md:GivenName>
+    <md:SurName>Jones</md:SurName>
+    <md:EmailAddress>mailto:sam.jones@manchester.ac.uk</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
new file mode 100644
index 00000000..db956cce
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.mines-albi.fr-idp-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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: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>
+					      MIIDNDCCAhygAwIBAgIVAP0DZFmoaqaMkf4YJmDc1SwYfx2yMA0GCSqGSIb3DQEB
+BQUAMB0xGzAZBgNVBAMMEnNoaWIubWluZXMtYWxiaS5mcjAeFw0xNTAyMTcwODU0
+NDhaFw0zNTAyMTcwODU0NDhaMB0xGzAZBgNVBAMMEnNoaWIubWluZXMtYWxiaS5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIVlu4wyAmLrCkmiUliB
+ffvyAmfDXYpQ0p9cjFJY7lN5DzaUNgObehddk7YFmyzBcfl7QKILPO4a81e3TcNr
+8+RXWspk3qkIcTwPrIPhp2vbcjRZR/j10akqG8A2D1beHNJbQ4K5IqfJG0EFeSc0
+ut1LrdW/ZSiUMNESZHa8ASJU7yHJO667ij9yYAA8IHDgN57vO15Z/kHeFOGddNDo
+MR4Gn1NLytcC+AVZghIw+Asj/Ch6049LcxEXBj4nFvaa8JNdxJJVcetDMbXg/jsE
+JwgBfnlCn5PmuTaBBRI4YmaBjSJdNvepYcH0IhiJjrkp8HbNHIkwGmCfyCsVCxz1
+MHUCAwEAAaNrMGkwHQYDVR0OBBYEFCXTZozk5rGaw1NTmqrzTXYM5TLrMEgGA1Ud
+EQRBMD+CEnNoaWIubWluZXMtYWxiaS5mcoYpaHR0cHM6Ly9zaGliLm1pbmVzLWFs
+YmkuZnIvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAHmGkCqHUGFu
+K6g9Cy+JUbNDGILpNw8T4o/8acA/D5fwooiU7e2vo9/vX9WDOu7HU8jSW+gQxFLe
+9OhUpOZq6WV5R1zhFS8tkvhAXNtPGvon33QxcmT7nAS9epiQMrpbkBL6L+B9Rp/z
+rqj9lwITB6M5lt9s7WCWPr7yqGM4vyB7Gos/2Ng9XoK1IKl5LfMtmEbHlv454dlK
+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://unknown.site.com</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
new file mode 100644
index 00000000..13f849fd
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.newbury-college.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						cnktY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						ALEO9V52NgElGB2494w+RP0YGpV97JXNQa7mSeSgrExS6EYfC+xq6GpShPq2CxZG
+						ds8DqfA6A4SZ9Br6MVw65X/9vuDu2rN9caivpV9v/Q9MEgkOlJK9NzgKqdZYLz/X
+						pkkL9sqN5L5SQ85+dRa3OaiV2WeqL+Op4Zljp0MEnJXYcA7rFvPcwZiSXrb56xTl
+						bqMKMuAPlDQ+GB46Z63uGGnXg4lm5eIh5txkl7hDeHZhVnnGQ8BZfsBvtRjCOyUm
+						x5oW7gUsD0tFzC1ZSXtM69Ufy5KsLN24tlfDmU2D3G0KCjpgRwypbgRNKOCavn2q
+						afjRy10kfcAKg740DO0v4W8CAwEAAaN7MHkwWAYDVR0RBFEwT4Iac2hpYi5uZXdi
+						dXJ5LWNvbGxlZ2UuYWMudWuGMWh0dHBzOi8vc2hpYi5uZXdidXJ5LWNvbGxlZ2Uu
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHm3jrIqUdXgKqgeoSsHsYWg
+						a0miMA0GCSqGSIb3DQEBBQUAA4IBAQB2vb7dzO3rVcbWlAffs2ssjty0vACBKm5M
+						1WoSA1j0DGIr9s8LxWn+On/L+JzR6ymXfGkK7WdVmVMZcD/zTm4fjFJOviNHAUwl
+						3jttuRJtG6FLibv72jFLFyIF7a02ezNKViNbsX0s89zIHLSW7RA64DBp6pgQXDes
+						IICc/5SxQeg7BRlfLHwGFe6l6N7L6OpXJccvAiEgMum/l0HVtOIQC0qW3tgyUohj
+						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>
+						MIIDUzCCAjugAwIBAgIUKgGFTl/wyIVoEZcrAuaNGJkaS4AwDQYJKoZIhvcNAQEF
+						BQAwJTEjMCEGA1UEAxMac2hpYi5uZXdidXJ5LWNvbGxlZ2UuYWMudWswHhcNMTQw
+						NDMwMTU1OTUzWhcNMzQwNDMwMTU1OTUzWjAlMSMwIQYDVQQDExpzaGliLm5ld2J1
+						cnktY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						ALEO9V52NgElGB2494w+RP0YGpV97JXNQa7mSeSgrExS6EYfC+xq6GpShPq2CxZG
+						ds8DqfA6A4SZ9Br6MVw65X/9vuDu2rN9caivpV9v/Q9MEgkOlJK9NzgKqdZYLz/X
+						pkkL9sqN5L5SQ85+dRa3OaiV2WeqL+Op4Zljp0MEnJXYcA7rFvPcwZiSXrb56xTl
+						bqMKMuAPlDQ+GB46Z63uGGnXg4lm5eIh5txkl7hDeHZhVnnGQ8BZfsBvtRjCOyUm
+						x5oW7gUsD0tFzC1ZSXtM69Ufy5KsLN24tlfDmU2D3G0KCjpgRwypbgRNKOCavn2q
+						afjRy10kfcAKg740DO0v4W8CAwEAAaN7MHkwWAYDVR0RBFEwT4Iac2hpYi5uZXdi
+						dXJ5LWNvbGxlZ2UuYWMudWuGMWh0dHBzOi8vc2hpYi5uZXdidXJ5LWNvbGxlZ2Uu
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHm3jrIqUdXgKqgeoSsHsYWg
+						a0miMA0GCSqGSIb3DQEBBQUAA4IBAQB2vb7dzO3rVcbWlAffs2ssjty0vACBKm5M
+						1WoSA1j0DGIr9s8LxWn+On/L+JzR6ymXfGkK7WdVmVMZcD/zTm4fjFJOviNHAUwl
+						3jttuRJtG6FLibv72jFLFyIF7a02ezNKViNbsX0s89zIHLSW7RA64DBp6pgQXDes
+						IICc/5SxQeg7BRlfLHwGFe6l6N7L6OpXJccvAiEgMum/l0HVtOIQC0qW3tgyUohj
+						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>
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
new file mode 100644
index 00000000..74c46977
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.nnc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZwzwsxTC1S4Zdkq15KxeNPBEbJiboZ
+						YZ2hEYpxFqy+A/DL2QSUGG4rwuOuMha2LTrJ7otU3kdtMSXEPfXdsxiBE4KAKIPH
+						E0ZtFllhPLUcbI0N0LJ98XEgMca0Lla/gpM26fuWzWMNAMHYl/FH6Rd2HMxJ48qE
+						iVbAPuBLb1tUNL5Ui3TwnrA9xww1XiRt2Uy2zLzEjRc2byeaOTGmF0XB3xzxQKfW
+						tcWlAsLsIgoeE/R2XoJI8Te/hWBncvFqxJMZO0B2hBz6VhW8lf6l+bXSp7xlK5Di
+						kqEfGFfx0OUXZyVyJXQVd3m37KfeibVa8idPhlpWGQU4YIboMp1+Cg0CAwEAAaNj
+						MGEwQAYDVR0RBDkwN4IOc2hpYi5ubmMuYWMudWuGJWh0dHBzOi8vc2hpYi5ubmMu
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJddobBGcJBNHVz8Kk+BuJXI
+						KiMdMA0GCSqGSIb3DQEBBQUAA4IBAQAZX/aRdg2GVkabHj/GL50YvG+BVIgAr5+p
+						tg29AUnLVYL8kpC9FaV/fZnS35JRd2/fM60CZwJxdQ7gP7b9Ye9dXanZTTwTIcpf
+						khlHK7mZbvhDwmoHdRRhmXE5UAiNzgXa6xZoAVYaNyW0jw83P7XS1YdRvo4uXK7U
+						l50OB20JMRNVKn6M1Ot/Mu87f9+3bPEW+FiOzPQ+X3IKzJ+l9Tayqs299FNrMAXr
+						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>
+						MIIDIzCCAgugAwIBAgIUAVYbxlyk3ieD8sFKJKXLfvokSAIwDQYJKoZIhvcNAQEF
+						BQAwGTEXMBUGA1UEAxMOc2hpYi5ubmMuYWMudWswHhcNMTQwODExMTUwNzQ4WhcN
+						MzQwODExMTUwNzQ4WjAZMRcwFQYDVQQDEw5zaGliLm5uYy5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZwzwsxTC1S4Zdkq15KxeNPBEbJiboZ
+						YZ2hEYpxFqy+A/DL2QSUGG4rwuOuMha2LTrJ7otU3kdtMSXEPfXdsxiBE4KAKIPH
+						E0ZtFllhPLUcbI0N0LJ98XEgMca0Lla/gpM26fuWzWMNAMHYl/FH6Rd2HMxJ48qE
+						iVbAPuBLb1tUNL5Ui3TwnrA9xww1XiRt2Uy2zLzEjRc2byeaOTGmF0XB3xzxQKfW
+						tcWlAsLsIgoeE/R2XoJI8Te/hWBncvFqxJMZO0B2hBz6VhW8lf6l+bXSp7xlK5Di
+						kqEfGFfx0OUXZyVyJXQVd3m37KfeibVa8idPhlpWGQU4YIboMp1+Cg0CAwEAAaNj
+						MGEwQAYDVR0RBDkwN4IOc2hpYi5ubmMuYWMudWuGJWh0dHBzOi8vc2hpYi5ubmMu
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJddobBGcJBNHVz8Kk+BuJXI
+						KiMdMA0GCSqGSIb3DQEBBQUAA4IBAQAZX/aRdg2GVkabHj/GL50YvG+BVIgAr5+p
+						tg29AUnLVYL8kpC9FaV/fZnS35JRd2/fM60CZwJxdQ7gP7b9Ye9dXanZTTwTIcpf
+						khlHK7mZbvhDwmoHdRRhmXE5UAiNzgXa6xZoAVYaNyW0jw83P7XS1YdRvo4uXK7U
+						l50OB20JMRNVKn6M1Ot/Mu87f9+3bPEW+FiOzPQ+X3IKzJ+l9Tayqs299FNrMAXr
+						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>
diff --git a/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml
new file mode 100644
index 00000000..2580eeef
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml
@@ -0,0 +1,58 @@
+<?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>
+						MIIEgDCCA2igAwIBAgIJAK0C0pCgLQHkMA0GCSqGSIb3DQEBBQUAMIGGMQswCQYD
+						VQQGEwJVUzELMAkGA1UECBMCT0gxDzANBgNVBAcTBkR1YmxpbjETMBEGA1UEChMK
+						T0NMQywgSW5jLjEgMB4GA1UECxMXR2xvYmFsIFdvcmxkIERvbWluYXRpb24xIjAg
+						BgkqhkiG9w0BCQEWE3NoaWJib2xldGhAb2NsYy5vcmcwHhcNMTIwMzA4MjIyNDM3
+						WhcNMjIwMzA5MjIyNDM3WjCBhjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk9IMQ8w
+						DQYDVQQHEwZEdWJsaW4xEzARBgNVBAoTCk9DTEMsIEluYy4xIDAeBgNVBAsTF0ds
+						b2JhbCBXb3JsZCBEb21pbmF0aW9uMSIwIAYJKoZIhvcNAQkBFhNzaGliYm9sZXRo
+						QG9jbGMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0GMRvPa5
+						AnW0p6El1RovfmD5jNK3ZSWbdSmD3rPaJY14iaG+oUjYqTz/qD7gRsYsCv1s3FIg
+						H8q1/6Q83qZnw0GMGF6Aot2GtsQneLaYNFdiqQEvRLcDcHcb+fwlglXI8/Q14E1i
+						OlEfkqLshRGHRM8H+l+8ypyMFcSgX+9Y2ep8qPp7ZA6bbO0/AiYBWXqOF5Xj0cxj
+						YsX0gwv3gipvhjLUnKjA5dDjWr7MWEYhN0rGY9jAZqgm6/eLLit1LnnebeJPMKOm
+						RtNOkZ7icgq+yBMi7fwsUt/wti5M5tot2cqqS5pSpgfWszAoWSzaiC5TlKCrrdp8
+						GPPWTC1Q2/O27QIDAQABo4HuMIHrMB0GA1UdDgQWBBQJScrHf319rPm2hwo2omNl
+						YBaYLzCBuwYDVR0jBIGzMIGwgBQJScrHf319rPm2hwo2omNlYBaYL6GBjKSBiTCB
+						hjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk9IMQ8wDQYDVQQHEwZEdWJsaW4xEzAR
+						BgNVBAoTCk9DTEMsIEluYy4xIDAeBgNVBAsTF0dsb2JhbCBXb3JsZCBEb21pbmF0
+						aW9uMSIwIAYJKoZIhvcNAQkBFhNzaGliYm9sZXRoQG9jbGMub3JnggkArQLSkKAt
+						AeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAZtUntXC2HfkkdS1q
+						MBeKgtNkk9Cb822R0k8IBww/7pxe3367g2CP8CIauPjOTunG1gXG+iab50pVtQvW
+						uezeGx3+9i4VPhDeadseTR1nIXxHb08VcokvVKWOlFMQt61cr+Qzx8Oax9eWkvFh
+						yCzg3zaEeSOXc//ZSVgIHk7bkLXKx6379Y8oFy7E4f3u1zE0YIuHlA/VaRbPdyif
+						Onno/UhKeJYKJm14L5Bi6jy3zHMgSbIRNBA9fIEmPGgEHy+65R9vCQ0Qw+cQQF8I
+						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>
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
new file mode 100644
index 00000000..2f8e9e56
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.pebblepad.co.uk-shibboleth-sp.xml
@@ -0,0 +1,101 @@
+<?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>
+						MIIEZjCCA06gAwIBAgIJAL5B8Zy7kEzwMA0GCSqGSIb3DQEBBQUAMIGzMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKU2hyb3BzaGlyZTEQMA4GA1UEBxMHVGVsZm9yZDEc
+						MBoGA1UEChMTUGViYmxlIExlYXJuaW5nIEx0ZDETMBEGA1UECxMKVUsgSG9zdGlu
+						ZzEdMBsGA1UEAxMUc2hpYi5wZWJibGVwYWQuY28udWsxKzApBgkqhkiG9w0BCQEW
+						HHN1cHBvcnRAcGViYmxlbGVhcm5pbmcuY28udWswHhcNMDkwNTIwMTAwMDQxWhcN
+						MTkwNTE4MTAwMDQxWjCBszELMAkGA1UEBhMCR0IxEzARBgNVBAgTClNocm9wc2hp
+						cmUxEDAOBgNVBAcTB1RlbGZvcmQxHDAaBgNVBAoTE1BlYmJsZSBMZWFybmluZyBM
+						dGQxEzARBgNVBAsTClVLIEhvc3RpbmcxHTAbBgNVBAMTFHNoaWIucGViYmxlcGFk
+						LmNvLnVrMSswKQYJKoZIhvcNAQkBFhxzdXBwb3J0QHBlYmJsZWxlYXJuaW5nLmNv
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxTTa8hVdZcuaVazA
+						mzHq2+kxGvJwrHFlre1YjACzeq8kqAm/nIWXALQetTP8qyKI0XtSIiMDwjPjgY4A
+						/8e3X0ykeOqMGldu+D3Wj29tF4n6B8/JjWHwg2f6V5xarviTvy/MWdLXqk1epnQv
+						MsRyWC6qA9/Lta3WtKDkYzcLDpoUZzYQUhcK2Zuobr0kW3egsvh3Qf2sAIBkKaF6
+						qq4J+HioE16VdtearBQzYgCd5G2p+sVpusp/6wMMFB6DopIDbV5Z6Ob9e5AdFtmu
+						R8U8VH15T8+kNnV/pF5++iq0u7y3SloOZYo8RcnB1BcobclmxiiDB0w0BbzmcU58
+						mSt0swIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
+						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUmispW4WPol2JC57a4w9q
+						nAQtGlkwHwYDVR0jBBgwFoAUmispW4WPol2JC57a4w9qnAQtGlkwDQYJKoZIhvcN
+						AQEFBQADggEBAIsdhSn+mIj+smLRJiIBHcXLN+DTXuv/7d3ev9mllgNMfTVemgdz
+						ELW6lFbWrpSs/F/nxIunKJ4dVp2FqR/mDKbjck2rb4d+9lgT6/8lT9WwkXdNG+be
+						xhqqERiKJ6Juo2OoDBv+ME96WzF7Z1iiO4LZNO8UKx8xFOThs68EyTqftpxekdQA
+						oCdcuQpmPD4qPGMmsHZ1mHWV0odYX88syhOV9mp2LGHBku49npZzCtHSHomwAH2t
+						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>
+						MIIEZjCCA06gAwIBAgIJAL5B8Zy7kEzwMA0GCSqGSIb3DQEBBQUAMIGzMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKU2hyb3BzaGlyZTEQMA4GA1UEBxMHVGVsZm9yZDEc
+						MBoGA1UEChMTUGViYmxlIExlYXJuaW5nIEx0ZDETMBEGA1UECxMKVUsgSG9zdGlu
+						ZzEdMBsGA1UEAxMUc2hpYi5wZWJibGVwYWQuY28udWsxKzApBgkqhkiG9w0BCQEW
+						HHN1cHBvcnRAcGViYmxlbGVhcm5pbmcuY28udWswHhcNMDkwNTIwMTAwMDQxWhcN
+						MTkwNTE4MTAwMDQxWjCBszELMAkGA1UEBhMCR0IxEzARBgNVBAgTClNocm9wc2hp
+						cmUxEDAOBgNVBAcTB1RlbGZvcmQxHDAaBgNVBAoTE1BlYmJsZSBMZWFybmluZyBM
+						dGQxEzARBgNVBAsTClVLIEhvc3RpbmcxHTAbBgNVBAMTFHNoaWIucGViYmxlcGFk
+						LmNvLnVrMSswKQYJKoZIhvcNAQkBFhxzdXBwb3J0QHBlYmJsZWxlYXJuaW5nLmNv
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxTTa8hVdZcuaVazA
+						mzHq2+kxGvJwrHFlre1YjACzeq8kqAm/nIWXALQetTP8qyKI0XtSIiMDwjPjgY4A
+						/8e3X0ykeOqMGldu+D3Wj29tF4n6B8/JjWHwg2f6V5xarviTvy/MWdLXqk1epnQv
+						MsRyWC6qA9/Lta3WtKDkYzcLDpoUZzYQUhcK2Zuobr0kW3egsvh3Qf2sAIBkKaF6
+						qq4J+HioE16VdtearBQzYgCd5G2p+sVpusp/6wMMFB6DopIDbV5Z6Ob9e5AdFtmu
+						R8U8VH15T8+kNnV/pF5++iq0u7y3SloOZYo8RcnB1BcobclmxiiDB0w0BbzmcU58
+						mSt0swIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
+						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUmispW4WPol2JC57a4w9q
+						nAQtGlkwHwYDVR0jBBgwFoAUmispW4WPol2JC57a4w9qnAQtGlkwDQYJKoZIhvcN
+						AQEFBQADggEBAIsdhSn+mIj+smLRJiIBHcXLN+DTXuv/7d3ev9mllgNMfTVemgdz
+						ELW6lFbWrpSs/F/nxIunKJ4dVp2FqR/mDKbjck2rb4d+9lgT6/8lT9WwkXdNG+be
+						xhqqERiKJ6Juo2OoDBv+ME96WzF7Z1iiO4LZNO8UKx8xFOThs68EyTqftpxekdQA
+						oCdcuQpmPD4qPGMmsHZ1mHWV0odYX88syhOV9mp2LGHBku49npZzCtHSHomwAH2t
+						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>
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
new file mode 100644
index 00000000..328cad62
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.raven.cam.ac.uk-shibboleth.xml
@@ -0,0 +1,125 @@
+<?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>
+      <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>
+						MIIEmDCCA4CgAwIBAgIQfLHlbRUtdCp5KSC69ObH+DANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMTIwNDAwMDAwMFoXDTE1MTIwNDIzNTk1OVowbzELMAkGA1UE
+						BhMCR0IxIDAeBgNVBAoTF1VuaXZlcnNpdHkgb2YgQ2FtYnJpZGdlMR8wHQYDVQQL
+						ExZVQ1MgU2hpYmJvbGV0aCBTZXJ2aWNlMR0wGwYDVQQDExRzaGliLnJhdmVuLmNh
+						bS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQTbdQmYTcE
+						Hwkw+7E9FXLcALHRwKoTpgA4PiZKcNu0CsVSD5VADQGN3u5myrlhjWIy7/filK5M
+						BoUl5zsFFAgtNcPvCaSCNo9VuvIgLyhrM36JVX5n4/L6rHEP1KpUimho67lpN/eL
+						92+3nXWIexwgDrYDiQyCl/RdHmzJCHakIMNnubnp8LdUvU4MDr2IviH7mecoUL/W
+						LsKO+kEvFJMTsr2XUWZezCHIcTtEx2k2G63GtBrEnPq/UiG/vqzOX0NMsUM4d+j6
+						mxogNZ6Ev3YZEWW98sCzzaBc7qsFjr3Derm4TuWDipkz59TdLlYPeC1TAsTFpTvg
+						42fGhZjK/esCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+						R+qQ47ntMB0GA1UdDgQWBBSW6ydPZrdKjKgjpVpJ6K3T8BZrLzAOBgNVHQ8BAf8E
+						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+						AwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilo
+						dHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEF
+						BQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcv
+						VEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVy
+						ZW5hLm9yZzAfBgNVHREEGDAWghRzaGliLnJhdmVuLmNhbS5hYy51azANBgkqhkiG
+						9w0BAQUFAAOCAQEAh5t+ortlUIp2CkhSF3KTeUm3O8vhM0EX0Kl6bid2qI69nxom
+						vGYMqBMPKcc9foCbEgILSKa9kUwt3lcyF4HFK7X/BzU0c7YyR/Di734fxyvWqsgj
+						H8WJJmZnS7md614HFlfoCMjeeC6iTuAT5LcsreBdl+VBerpL51/SCb0IKtd3J0dK
+						4+EFLNpQgQKhMYR2zGYIeNX+3uH5ESHhFYL7bgG3RsBTzn2CZALHGm6+dVgnjw49
+						fHaY+8yYGVTfXPZqJ08SfZxCidmlWejicoxE1uHFGuL6HSEDMm/uF3L0H4mUPoxO
+						iDQ+4/pKRbtOiTokxLohAPABDm+GgCrcuwZjqg==
+					</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>
+						MIIEmDCCA4CgAwIBAgIQfLHlbRUtdCp5KSC69ObH+DANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMTIwNDAwMDAwMFoXDTE1MTIwNDIzNTk1OVowbzELMAkGA1UE
+						BhMCR0IxIDAeBgNVBAoTF1VuaXZlcnNpdHkgb2YgQ2FtYnJpZGdlMR8wHQYDVQQL
+						ExZVQ1MgU2hpYmJvbGV0aCBTZXJ2aWNlMR0wGwYDVQQDExRzaGliLnJhdmVuLmNh
+						bS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQTbdQmYTcE
+						Hwkw+7E9FXLcALHRwKoTpgA4PiZKcNu0CsVSD5VADQGN3u5myrlhjWIy7/filK5M
+						BoUl5zsFFAgtNcPvCaSCNo9VuvIgLyhrM36JVX5n4/L6rHEP1KpUimho67lpN/eL
+						92+3nXWIexwgDrYDiQyCl/RdHmzJCHakIMNnubnp8LdUvU4MDr2IviH7mecoUL/W
+						LsKO+kEvFJMTsr2XUWZezCHIcTtEx2k2G63GtBrEnPq/UiG/vqzOX0NMsUM4d+j6
+						mxogNZ6Ev3YZEWW98sCzzaBc7qsFjr3Derm4TuWDipkz59TdLlYPeC1TAsTFpTvg
+						42fGhZjK/esCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+						R+qQ47ntMB0GA1UdDgQWBBSW6ydPZrdKjKgjpVpJ6K3T8BZrLzAOBgNVHQ8BAf8E
+						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+						AwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilo
+						dHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEF
+						BQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcv
+						VEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVy
+						ZW5hLm9yZzAfBgNVHREEGDAWghRzaGliLnJhdmVuLmNhbS5hYy51azANBgkqhkiG
+						9w0BAQUFAAOCAQEAh5t+ortlUIp2CkhSF3KTeUm3O8vhM0EX0Kl6bid2qI69nxom
+						vGYMqBMPKcc9foCbEgILSKa9kUwt3lcyF4HFK7X/BzU0c7YyR/Di734fxyvWqsgj
+						H8WJJmZnS7md614HFlfoCMjeeC6iTuAT5LcsreBdl+VBerpL51/SCb0IKtd3J0dK
+						4+EFLNpQgQKhMYR2zGYIeNX+3uH5ESHhFYL7bgG3RsBTzn2CZALHGm6+dVgnjw49
+						fHaY+8yYGVTfXPZqJ08SfZxCidmlWejicoxE1uHFGuL6HSEDMm/uF3L0H4mUPoxO
+						iDQ+4/pKRbtOiTokxLohAPABDm+GgCrcuwZjqg==
+					</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>Computing Service Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:help-desk@ucs.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
new file mode 100644
index 00000000..c103d147
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.rcs.ac.uk-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						aGliLnJjcy5hYy51azAeFw0xNDA3MDgxNTMzNTJaFw0zNDA3MDMxNTMzNTJaMHkx
+						CzAJBgNVBAYTAkdCMREwDwYDVQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dv
+						dzEsMCoGA1UEChMjVGhlIFJveWFsIENvbnNlcnZhdG9pcmUgb2YgU2NvdGxhbmQx
+						FzAVBgNVBAMTDnNoaWIucmNzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEAypwPMmApdGwlBBiB1xNnyoOydBx+QGr/Hh9ENnyZ6PAmvpBu2Zlg
+						lqFx0o710C1Adp4kMYgBGWBxUDUrGVOJjnHQDmKcSFo1fLy95F6TPm9t51c6OE16
+						OP8pF+yJeJA5A6Lk26SHxzdadp7D1sZ7PYO9WhvpggBrNixRMFWADiSL4aoKQ5bG
+						/guTCqW2yV9jBsEFWmCoF4meLfk5j7MQvVwDo6Ks9Xtal6zXyh5UHwqGSZC4kWmv
+						D0Xj44cKZsow5BrvErlGwNyyIsQcvl4NsO6+2C+YpYv24Fk5QNm5eYUvLwZ+6zC5
+						lNXusB64DThRBvI7f3D3douu8/8MCTBhTQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+						AQAAH+R05+KlX9gIGrwim26gw95z3xY+FFF6nrlx/6jJ9cxvbGQIbnblZ6N1DumI
+						HK1bm97f82MEbzPMCgOzDP93ENjWhaAaq3Z4+6g5ZFrPSVDeVxYs7f2t6RmjA5Ep
+						3JEHgX11kAupmM+H41zV9aLJ+w3u2j4g3nsZYYUb4PDrVaI0oWHBjN6UaxfMT+F0
+						bBPdUZwF66jbWazOEZrNvrVSSPetTOf49psjExkYxe4IGFRM7wTcavKwljxUd6RU
+						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>
+						MIIDbjCCAlYCCQCDCJdvHB5WaDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJH
+						QjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxLDAqBgNVBAoT
+						I1RoZSBSb3lhbCBDb25zZXJ2YXRvaXJlIG9mIFNjb3RsYW5kMRcwFQYDVQQDEw5z
+						aGliLnJjcy5hYy51azAeFw0xNDA3MDgxNTMzNTJaFw0zNDA3MDMxNTMzNTJaMHkx
+						CzAJBgNVBAYTAkdCMREwDwYDVQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dv
+						dzEsMCoGA1UEChMjVGhlIFJveWFsIENvbnNlcnZhdG9pcmUgb2YgU2NvdGxhbmQx
+						FzAVBgNVBAMTDnNoaWIucmNzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEAypwPMmApdGwlBBiB1xNnyoOydBx+QGr/Hh9ENnyZ6PAmvpBu2Zlg
+						lqFx0o710C1Adp4kMYgBGWBxUDUrGVOJjnHQDmKcSFo1fLy95F6TPm9t51c6OE16
+						OP8pF+yJeJA5A6Lk26SHxzdadp7D1sZ7PYO9WhvpggBrNixRMFWADiSL4aoKQ5bG
+						/guTCqW2yV9jBsEFWmCoF4meLfk5j7MQvVwDo6Ks9Xtal6zXyh5UHwqGSZC4kWmv
+						D0Xj44cKZsow5BrvErlGwNyyIsQcvl4NsO6+2C+YpYv24Fk5QNm5eYUvLwZ+6zC5
+						lNXusB64DThRBvI7f3D3douu8/8MCTBhTQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+						AQAAH+R05+KlX9gIGrwim26gw95z3xY+FFF6nrlx/6jJ9cxvbGQIbnblZ6N1DumI
+						HK1bm97f82MEbzPMCgOzDP93ENjWhaAaq3Z4+6g5ZFrPSVDeVxYs7f2t6RmjA5Ep
+						3JEHgX11kAupmM+H41zV9aLJ+w3u2j4g3nsZYYUb4PDrVaI0oWHBjN6UaxfMT+F0
+						bBPdUZwF66jbWazOEZrNvrVSSPetTOf49psjExkYxe4IGFRM7wTcavKwljxUd6RU
+						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>
diff --git a/swamid-interfederations-2.0/shib.rsc-uat.org-shibboleth.xml b/swamid-interfederations-2.0/shib.rsc-uat.org-shibboleth.xml
new file mode 100644
index 00000000..1c886977
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.rsc-uat.org-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAIdMRZNoOlUKMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHNoaWIucnNjLXVhdC5vcmcwHhcNMTMwNjEzMTUxMTA3WhcNMjMwNjExMTUx
+						MTA3WjAbMRkwFwYDVQQDExBzaGliLnJzYy11YXQub3JnMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAvCYfBRJznhtFJ6ObF/CZd2L+NfFHkc3Xc1Hq8ahf
+						B3OjIWGT86P11rSBoqgKAKjc/paf3H8fqbieWcl23zFYZt2p5Tgn/N+0gWEDqU3E
+						FElv3BkG1qDm6dzASfUe2d6UmywWxA8o755qiR61EyW44t8zBnMlP3zz/4D/c30c
+						60pE6ey7vjYo/OSUU1NtJKiSnRVul4ojisBcyQBqTEA+rSz3tdY5tDahZs0ETY15
+						OulSEeIgAJ+jyixna5hG88LujxTLfP8eJ5c44bB6tlj+zxX6t2NffbJvmbGA7tsO
+						m9HNLaEYpIkvB85FcFU0okDKvEVb0oCi9bxV1G1KnwW5pQIDAQABoz4wPDAbBgNV
+						HREEFDASghBzaGliLnJzYy11YXQub3JnMB0GA1UdDgQWBBStPkn6a3WJboUaFzSW
+						4gO3/fZFDTANBgkqhkiG9w0BAQUFAAOCAQEAC63PW0yGjrWEiHKCIPHQJfekHD1/
+						EVXsk3Acjv9Hi6oCgMc3aWPvOwdL6CaeiX4VHGkVtiTWpSaG/6UbsjMVF9sdG4PD
+						/DsYKjsjVj3+72zIpVhSrKQt5tbl0fvgaZWLjiCTua1NI+Iw2BSI1C6NCgguvpP8
+						LKnz7yF0ck8omkoQVuAEUEJcniWzdaxXPeU53/4LeWti2tH7240yH3gjNeN3J09v
+						/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>
diff --git a/swamid-interfederations-2.0/shib.rsc.org-shibboleth.xml b/swamid-interfederations-2.0/shib.rsc.org-shibboleth.xml
new file mode 100644
index 00000000..74528dee
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.rsc.org-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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>
+      <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>
+						MIIC6zCCAdOgAwIBAgIJAI2c7IusuZ5TMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+						BAMTDHNoaWIucnNjLm9yZzAeFw0xMDA3MjcxMTA3MzlaFw0yMDA3MjQxMTA3Mzla
+						MBcxFTATBgNVBAMTDHNoaWIucnNjLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAMZz+1jRYCDUqaGAKnq3AH6BAdsUjMW+saQwgx8bEjEa5kQ0NSHw
+						7g3RyE6qNB6BVRoeveqTaR97haz2K02ujOKLJpCRQvZ8qT3/KdnrjRhTfekhGV/F
+						PLk1sUu32B4VLXY82hqHjaRBNteF+3Ez2/kFOD8VO82woiN2P9s2HhKSqXsM9rDB
+						EJNKva0oFUyDrvcmGyU5hebbAO6aJSkjC2ZZ+oRTbc7jVfSvYxJFejMQRe+3vApj
+						WcE1rSqiVA9D5m1zy8q+pYMgyWUgm2tPK46s+xq8QsSguimNhlrAaWkUtXaGmyPo
+						ygZBl83B4BiSIVkXVp6pVRhBF6tVp6a7n4kCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+						c2hpYi5yc2Mub3JnMB0GA1UdDgQWBBSg4xxfMjUKAHXCOPIEKfl+m56MUDANBgkq
+						hkiG9w0BAQUFAAOCAQEAZuQxsfshqIs1QF9EK+lblk0K8GLOpC9bUgGbM0xO+qk7
+						2VYpi1DjmCLMemfPSqopr0X68jrnd/K5SLv5GUKy2tpJyndVBQcOGYjUtanIUtiB
+						DirWlDDT+Ru5J94mc+aEeyrWH6slRrONqYgEOuKOzD8pDgS7fcThTZBnqo/ywE5a
+						hYnP/EZ3wPhR+HudHbRcaFguVSAe+9hu7lqpPOUsmmZIAcUkPq78sckMhVohpyy/
+						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>
diff --git a/swamid-interfederations-2.0/shib.slcs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.slcs.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..eadf592d
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.slcs.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.slcs.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-05T16: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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slcs.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Science Learning Centre</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Science Learning Centres are a national network for professional development in science teaching.</mdui:Description>
+        <mdui:Logo height="72" width="200">https://shib.slcs.ac.uk/images/nslc.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEbDCCA1SgAwIBAgIRAK0yQqUXeWtcLxUv7qHLOWMwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA0MTYwMDAwMDBaFw0xNjA0MTUyMzU5NTlaMD0xITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPc2hpYi5zbGNz
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwmGmPdTY0lm
+						gJv1BOz0VKGDHxYARn6CjWcAiYwSCRdKPcvuC+9u+WE/Ix99pohRmUBPMvMrV7cQ
+						3tay1PVfzRKaQHuaBfebcdKvTbYit+9qkPF0G2bpEAGExDILj+iX4hz2aDXWALsZ
+						h7KgAnqDmFtEBTQ7zSSaJ0RC/OHxSfnPcKq+5u9q2khSSlZ2qm9TALHBqzHFZ5Fc
+						CqiwDlpaTHUsq+na51qgzMTlFcRUdhuWqswjHwMCXfy+LXrKuB2Tqx2GJGhyxKj0
+						qOEcS2Y0sCcbFxWu2YMWBLALrMbWrlxEYQx+rUhc4vaSUP3bdn9WeGSDDmvivc0G
+						EH0WGNlHHQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+						6pDjue0wHQYDVR0OBBYEFF5kyhGCi1vHv58VqH8E0F2lyFtzMA4GA1UdDwEB/wQE
+						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+						cC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9zaGliLnNsY3MuYWMudWswDQYJ
+						KoZIhvcNAQEFBQADggEBAJNfGU4saCObDfVoX5gl/czSR7tT7d/SCn/eC1SrGrfq
+						JQGYqWjJUd99BXN5E6ZKWyrYxQmoiciKNDLznkP5JmxKKASZe2J5gTzLX2KiPx43
+						b3Bh0oqr3h/aLs0ZPoODUoMYoNDl1Pa83zR9g7sfWD+xmrKWUTLRLtZkagMl17wh
+						fofDtEw68wcgdZRE5Nal0fh0lB2W0Ot9fuWEHHIsw1ofedKSyQBmRdB+ZXmaBzeb
+						FUt9W2huCi7fG7A5O4VNeh4rrdcQ4EOfg/K4pTSayAphryV7DfnH3L7BpreKFQwX
+						7nwQQNJNDTLtIPdwewp8lXQLC+3IMUUqhQCTVQ9TVrs=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.slcs.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.slcs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>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.slcs.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.slcs.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.slcs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.slcs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slcs.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEbDCCA1SgAwIBAgIRAK0yQqUXeWtcLxUv7qHLOWMwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA0MTYwMDAwMDBaFw0xNjA0MTUyMzU5NTlaMD0xITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPc2hpYi5zbGNz
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwmGmPdTY0lm
+						gJv1BOz0VKGDHxYARn6CjWcAiYwSCRdKPcvuC+9u+WE/Ix99pohRmUBPMvMrV7cQ
+						3tay1PVfzRKaQHuaBfebcdKvTbYit+9qkPF0G2bpEAGExDILj+iX4hz2aDXWALsZ
+						h7KgAnqDmFtEBTQ7zSSaJ0RC/OHxSfnPcKq+5u9q2khSSlZ2qm9TALHBqzHFZ5Fc
+						CqiwDlpaTHUsq+na51qgzMTlFcRUdhuWqswjHwMCXfy+LXrKuB2Tqx2GJGhyxKj0
+						qOEcS2Y0sCcbFxWu2YMWBLALrMbWrlxEYQx+rUhc4vaSUP3bdn9WeGSDDmvivc0G
+						EH0WGNlHHQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+						6pDjue0wHQYDVR0OBBYEFF5kyhGCi1vHv58VqH8E0F2lyFtzMA4GA1UdDwEB/wQE
+						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+						cC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9zaGliLnNsY3MuYWMudWswDQYJ
+						KoZIhvcNAQEFBQADggEBAJNfGU4saCObDfVoX5gl/czSR7tT7d/SCn/eC1SrGrfq
+						JQGYqWjJUd99BXN5E6ZKWyrYxQmoiciKNDLznkP5JmxKKASZe2J5gTzLX2KiPx43
+						b3Bh0oqr3h/aLs0ZPoODUoMYoNDl1Pa83zR9g7sfWD+xmrKWUTLRLtZkagMl17wh
+						fofDtEw68wcgdZRE5Nal0fh0lB2W0Ot9fuWEHHIsw1ofedKSyQBmRdB+ZXmaBzeb
+						FUt9W2huCi7fG7A5O4VNeh4rrdcQ4EOfg/K4pTSayAphryV7DfnH3L7BpreKFQwX
+						7nwQQNJNDTLtIPdwewp8lXQLC+3IMUUqhQCTVQ9TVrs=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.slcs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.slcs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MyScience.co Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Science Learning Centre</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.sciencelearningcentres.org.uk/national/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SLCS support</md:GivenName>
+    <md:EmailAddress>mailto:support@slcs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SLCS support</md:GivenName>
+    <md:EmailAddress>mailto:support@slcs.ac.uk</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
new file mode 100644
index 00000000..4258239c
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.u-paris10.fr-idp-shibboleth.xml
@@ -0,0 +1,66 @@
+<?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>
+      <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="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>
+					      MIIEbzCCA1egAwIBAgIQZbrrSlxkQhTabmBhnkMIcjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQyOTAwMDAwMFoXDTE3MDQyODIzNTk1OVowPzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFzaGliLnUtcGFy
+aXMxMC5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOXQot32/G4U
+65ArzPTHDzV0pukloeif+NPsD1UJ2jRxzVXdalcqbxIo50XubnqASgfJI8quCcQI
+UivML6Pid61W+G1xaFDFH3oqv4rUz+3cvl+e3rk/7EOxv6mCIhsagERX6/7tPG6Q
+nhy5yUAmnPXVG+N5c8+VD0tDnL3GY7kUFIl6EK0kYObmdpX8jJZeQ4LmPBGxIAWX
+zonq0y2/2MDAMiiX4qVmTJphw0LpxILXBcP8ODsSu9EIA01iC0hqr0ZJaGnmm9jF
+e5GR856RaR5IYoWDhJ2B5rA0gnAp1ORkDwxW22SISQeWLE6XFV3Zee+7aQBP6qWo
+GYqJMGQgo4ECAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+R+qQ47ntMB0GA1UdDgQWBBQUr2hjbMrOoM0u5PrMn5ks6PmoKzAOBgNVHQ8BAf8E
+BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRc2hpYi51LXBhcmlzMTAuZnIw
+DQYJKoZIhvcNAQEFBQADggEBAHvXqPlH0S0iV2DZuBMgkVjm0FojB9jefcIojoP+
+W5v120m9tvbtWJmE+xOKQi2y+Zct/SWFDKcV+otWus9O0IyfoZcXHwPmPntlhNkD
+NmIWXzwJnDXnnoc0TG2edyNMmtuQMNIjeDSsnCDbspTfymBdnIYKuuuPLy2hSH+V
+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://unknown.site.com</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
new file mode 100644
index 00000000..44a6cca4
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.ufg.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xLDAqBgNVBAoTI1VGRyAtIFVu
+aXZlcnNpZGFkZSBGZWRlcmFsIGRlIEdvaWFzMTQwMgYDVQQLEytDRVJDT01QIC0g
+Q2VudHJvIGRlIFJlY3Vyc29zIENvbXB1dGFjaW9uYWlzMSMwIQYJKoZIhvcNAQkB
+FhRyZWRlcy5jZXJjb21wQHVmZy5icjEQMA4GA1UEBxMHR29pYW5pYTEOMAwGA1UE
+CBMFR29pYXMxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtzaGliLnVmZy5icjAeFw0x
+NDA3MjIxNTU1NTRaFw0xOTA3MjExNTU1NTRaMIHOMSwwKgYDVQQKEyNVRkcgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBHb2lhczE0MDIGA1UECxMrQ0VSQ09NUCAt
+IENlbnRybyBkZSBSZWN1cnNvcyBDb21wdXRhY2lvbmFpczEjMCEGCSqGSIb3DQEJ
+ARYUcmVkZXMuY2VyY29tcEB1ZmcuYnIxEDAOBgNVBAcTB0dvaWFuaWExDjAMBgNV
+BAgTBUdvaWFzMQswCQYDVQQGEwJCUjEUMBIGA1UEAxMLc2hpYi51ZmcuYnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjd7v1zv9XiZujENayVRf+lRcF
+HvUq3KtLFWnys3UhsAlQPiXl3rCdCV3qgC3mLFKoQtCIvxW0ubaX7E+7U1FGdLZH
+ZBgkCXdvJ32wMtF/DEhiD/AwT6JMjSWLcE9eGK35NBaB6kC91Pn9oID8OjggQmFA
+ot2NQ7KRlSNJg3nY3RQYCFZghgsLec9+0h/YHaRuKgDKcFnreAQ9UQ4M4Q1jPKit
+Fkn/IJa2okSwXIu6gwV/2Y2I92ar3LgbNfpXCPW/gGqflkPEA+4AXwRb7ZbOdqsD
+g/PLMzi3jS4VHIOVUHx4fg7PZF+CEJpNG65i5pQB2d9VI2he2e3gUtnYxZeBAgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBAIGSDjTFfq0AONjf4OEJxiG1pZ5um0QwIzUD
+hC+CCdoxsZcUc47cT+VxHi5vrJ1TBJF8mwk1zTp0CKfNxPt+etJMhNwnXhjR7qF/
+A7JtQE9MuoHiWpjIWiwck00x6pAqJCkEcYRrz5UorN6YjBd/3SEkKU0qv1haRVPV
+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>
+      
+MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xLDAqBgNVBAoTI1VGRyAtIFVu
+aXZlcnNpZGFkZSBGZWRlcmFsIGRlIEdvaWFzMTQwMgYDVQQLEytDRVJDT01QIC0g
+Q2VudHJvIGRlIFJlY3Vyc29zIENvbXB1dGFjaW9uYWlzMSMwIQYJKoZIhvcNAQkB
+FhRyZWRlcy5jZXJjb21wQHVmZy5icjEQMA4GA1UEBxMHR29pYW5pYTEOMAwGA1UE
+CBMFR29pYXMxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtzaGliLnVmZy5icjAeFw0x
+NDA3MjIxNTU1NTRaFw0xOTA3MjExNTU1NTRaMIHOMSwwKgYDVQQKEyNVRkcgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBHb2lhczE0MDIGA1UECxMrQ0VSQ09NUCAt
+IENlbnRybyBkZSBSZWN1cnNvcyBDb21wdXRhY2lvbmFpczEjMCEGCSqGSIb3DQEJ
+ARYUcmVkZXMuY2VyY29tcEB1ZmcuYnIxEDAOBgNVBAcTB0dvaWFuaWExDjAMBgNV
+BAgTBUdvaWFzMQswCQYDVQQGEwJCUjEUMBIGA1UEAxMLc2hpYi51ZmcuYnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjd7v1zv9XiZujENayVRf+lRcF
+HvUq3KtLFWnys3UhsAlQPiXl3rCdCV3qgC3mLFKoQtCIvxW0ubaX7E+7U1FGdLZH
+ZBgkCXdvJ32wMtF/DEhiD/AwT6JMjSWLcE9eGK35NBaB6kC91Pn9oID8OjggQmFA
+ot2NQ7KRlSNJg3nY3RQYCFZghgsLec9+0h/YHaRuKgDKcFnreAQ9UQ4M4Q1jPKit
+Fkn/IJa2okSwXIu6gwV/2Y2I92ar3LgbNfpXCPW/gGqflkPEA+4AXwRb7ZbOdqsD
+g/PLMzi3jS4VHIOVUHx4fg7PZF+CEJpNG65i5pQB2d9VI2he2e3gUtnYxZeBAgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBAIGSDjTFfq0AONjf4OEJxiG1pZ5um0QwIzUD
+hC+CCdoxsZcUc47cT+VxHi5vrJ1TBJF8mwk1zTp0CKfNxPt+etJMhNwnXhjR7qF/
+A7JtQE9MuoHiWpjIWiwck00x6pAqJCkEcYRrz5UorN6YjBd/3SEkKU0qv1haRVPV
+EqoljRD7IOrbW5m12y+UCojor5ttyl5aYIk3DYXLlqiddtxHwyAyP4VKxOS5373c
+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>
diff --git a/swamid-interfederations-2.0/shib.ukmsl.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shib.ukmsl.com-shibboleth-sp.xml
new file mode 100644
index 00000000..208c289a
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.ukmsl.com-shibboleth-sp.xml
@@ -0,0 +1,65 @@
+<?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>
+      <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>
+						MIIDGzCCAgOgAwIBAgIJAOulbFGs3eq7MA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+						BAMTHHR1cmJlcnQuc3VuaW9uLndhcndpY2suYWMudWswHhcNMTEwODMwMDkwNzMw
+						WhcNMjEwODI3MDkwNzMwWjAnMSUwIwYDVQQDExx0dXJiZXJ0LnN1bmlvbi53YXJ3
+						aWNrLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoVp3lX99
+						jZkKVQIWyMblgNh9oHW9l2eEE7gW7RyzMEcjJ/lWehfc7K8LDiWWbidZapYC5Sx7
+						pRwdgdqOAC8grdmdcJA/qj0ep0fV3I9jnVIlgwRGn2RO9Io955nLQzwRTvYmt/9I
+						e77UaHwA+XNzTzw9cOzsoTgcyAPjRqnfhvlUFfsFblCWTrUNhD/HvgpWmYmJsdrF
+						sbVA0UzXVnMe9qFSkBXS/lhD5h5prR/3JEq0TKqPTGDYFTaOjpPgwqSDmySem+bb
+						bxJjAvBgcqw3kLEboy9rZMFej5tg9ojBHe12QjHNey+pGXNNeu0qJbrJ13KTIj5n
+						ZSTzchG5IsNHDwIDAQABo0owSDAnBgNVHREEIDAeghx0dXJiZXJ0LnN1bmlvbi53
+						YXJ3aWNrLmFjLnVrMB0GA1UdDgQWBBTh+kMq012za4Vb14VoRQiKCduefzANBgkq
+						hkiG9w0BAQUFAAOCAQEADE2xlhQD+GsVP9wp4iGgCnvwaS4+WY/pNclIsvVQM3FA
+						jqLqJZNQ3qm4gORayrhAsdkMUetnjDAQjDDFW/PUlFVIXQOyA1zjY5Fsga6/ljsc
+						MnoexDo4msuSsqQ2ug42cHD8PhRVTMhj5sPsOtUZe2f7aiuIzWkJp/wb3iVy2nxu
+						DYftq3HQKKsx0H2I6M/DsHTovhShrj0DhS9SK5vBhS8+bJv1fP6sc3YYazxdRcMC
+						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>
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
new file mode 100644
index 00000000..355a22f9
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.ulster.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,109 @@
+<?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>
+      <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
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIzQ0qaikQBm8TZ4mHIlwkqF
+						mc0XXnZoH1mBi1nU/jK0ofWvDzr13EueVf+kkIwdq1NcGhy4Q45tPpCJ/ut+Hx1Y
+						ui51P952G6gkZaa70FaW0y6x98Lo9MnJEazdBYH8tXNmDBOaUV+r6FvSWkCA+943
+						PDrRLbdVXr3SvwNAMY0sjbqAoaqQ34jyR5vwICvQvm2kgZnO/b2pWBIcnUUihRl/
+						C23Lhzc2h4XzLoo05mxUqkZwTWoZG3LvayctaN3/4wQD6OMFg50JvK25JoKLBiFw
+						ywvcDl3s0lWaPy2D6k1qtNiSXkNmQKNdTqnZ1P55U41jnhruP2bstMFdfMCRtaUC
+						AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2hpYi51bHN0ZXIuYWMudWuGKGh0dHBzOi8v
+						c2hpYi51bHN0ZXIuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMlgjh3c
+						rPcwJ+B2l9Oe56HULqhaMA0GCSqGSIb3DQEBBQUAA4IBAQAede2459De5mPMtedE
+						hGfrQtgggyPWJqsu+nvWhHpDQAJ2Rcq+dvMmMmCWpdWjhUiTQ1AQnWbuhKmMsker
+						sWZZIQ7WqcFwSMNS8OQyyO+OqDxJaoyu2qRS39URPMgKwWPtHOeYp93zfEdE5cGA
+						kWw4oPABOL0VlWRoVlGFOGxiyvTuq0DOPC9M50ICx/suLNyuidxyK35XGCUzjn6c
+						MkaQH8OymowRW981IQbhbtM6IWY9ATbrmw7+YJwstcEaQN6LvUhkUESTrdCKPobT
+						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>
+						MIIDLzCCAhegAwIBAgIUDpGkh/duNiN6+rhYKO7+e0H+z0owDQYJKoZIhvcNAQEF
+						BQAwHDEaMBgGA1UEAxMRc2hpYi51bHN0ZXIuYWMudWswHhcNMTQwOTI5MTMxMDQw
+						WhcNMzQwOTI5MTMxMDQwWjAcMRowGAYDVQQDExFzaGliLnVsc3Rlci5hYy51azCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIzQ0qaikQBm8TZ4mHIlwkqF
+						mc0XXnZoH1mBi1nU/jK0ofWvDzr13EueVf+kkIwdq1NcGhy4Q45tPpCJ/ut+Hx1Y
+						ui51P952G6gkZaa70FaW0y6x98Lo9MnJEazdBYH8tXNmDBOaUV+r6FvSWkCA+943
+						PDrRLbdVXr3SvwNAMY0sjbqAoaqQ34jyR5vwICvQvm2kgZnO/b2pWBIcnUUihRl/
+						C23Lhzc2h4XzLoo05mxUqkZwTWoZG3LvayctaN3/4wQD6OMFg50JvK25JoKLBiFw
+						ywvcDl3s0lWaPy2D6k1qtNiSXkNmQKNdTqnZ1P55U41jnhruP2bstMFdfMCRtaUC
+						AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2hpYi51bHN0ZXIuYWMudWuGKGh0dHBzOi8v
+						c2hpYi51bHN0ZXIuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMlgjh3c
+						rPcwJ+B2l9Oe56HULqhaMA0GCSqGSIb3DQEBBQUAA4IBAQAede2459De5mPMtedE
+						hGfrQtgggyPWJqsu+nvWhHpDQAJ2Rcq+dvMmMmCWpdWjhUiTQ1AQnWbuhKmMsker
+						sWZZIQ7WqcFwSMNS8OQyyO+OqDxJaoyu2qRS39URPMgKwWPtHOeYp93zfEdE5cGA
+						kWw4oPABOL0VlWRoVlGFOGxiyvTuq0DOPC9M50ICx/suLNyuidxyK35XGCUzjn6c
+						MkaQH8OymowRW981IQbhbtM6IWY9ATbrmw7+YJwstcEaQN6LvUhkUESTrdCKPobT
+						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>
diff --git a/swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml
new file mode 100644
index 00000000..27e94952
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDHzCCAgegAwIBAgIUckjOBnjDyzW3TnsQ+ZAfn867Dh4wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNc2hpYi51bmliby5pdDAeFw0xMzAzMDcxMTI2MTJaFw0y
+MzAzMDcxMTI2MTJaMBgxFjAUBgNVBAMTDXNoaWIudW5pYm8uaXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgeiI39V0e9g2iI6g7xdn6lDpiRQaN5ZpH
+PN3QkBIFQcpsEk824owXGp6AkONgTucUADDJ2QUu0EvaQ2LZE77LFAIqr6sPm+3b
+cUogUFHPAk/Dc5MXA3fk+G3ot40V1VOnBYJCiGhZY8cQjQl74MmvbVJqt3Xj46Bn
+0175RSwWX2U9MYsq1+Dx3y25w66BqjvzegC6xgCUqHDQoKi60kX7d5OQ85Nm9bYb
+K18Py2v4YsS48sn7P78VhShgTzDD1MLqtExBd0Rer3VSgCWeB9YblkBlamQAqk6+
+/Xsg2eRwrAbeb0PlL5MEbCXP+sjhf3yVAIcRpS3Ep9N59UOsxiXtAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDXNoaWIudW5pYm8uaXSGJGh0dHBzOi8vc2hpYi51bmliby5p
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjAf6KRUx3TaBHIBCT8R3u0p3PUcw
+DQYJKoZIhvcNAQEFBQADggEBACrvNM6+6LFPF9y9lV1ODuPQjv4Vi15QBWqSC1ut
+ttb9Drp8YGTx1O3+h8u1xUaXj6eCci2CZHr5XY0ER8jRwQKueNBGmA75ZVElJLV5
+I+H/b8NbMbUHmN3XKOFJHBR/vo/SDN78Llm+7TiIZm2QzXjUOZLKti9uZtKxW6we
+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>
+MIIDHzCCAgegAwIBAgIUckjOBnjDyzW3TnsQ+ZAfn867Dh4wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNc2hpYi51bmliby5pdDAeFw0xMzAzMDcxMTI2MTJaFw0y
+MzAzMDcxMTI2MTJaMBgxFjAUBgNVBAMTDXNoaWIudW5pYm8uaXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgeiI39V0e9g2iI6g7xdn6lDpiRQaN5ZpH
+PN3QkBIFQcpsEk824owXGp6AkONgTucUADDJ2QUu0EvaQ2LZE77LFAIqr6sPm+3b
+cUogUFHPAk/Dc5MXA3fk+G3ot40V1VOnBYJCiGhZY8cQjQl74MmvbVJqt3Xj46Bn
+0175RSwWX2U9MYsq1+Dx3y25w66BqjvzegC6xgCUqHDQoKi60kX7d5OQ85Nm9bYb
+K18Py2v4YsS48sn7P78VhShgTzDD1MLqtExBd0Rer3VSgCWeB9YblkBlamQAqk6+
+/Xsg2eRwrAbeb0PlL5MEbCXP+sjhf3yVAIcRpS3Ep9N59UOsxiXtAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDXNoaWIudW5pYm8uaXSGJGh0dHBzOi8vc2hpYi51bmliby5p
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjAf6KRUx3TaBHIBCT8R3u0p3PUcw
+DQYJKoZIhvcNAQEFBQADggEBACrvNM6+6LFPF9y9lV1ODuPQjv4Vi15QBWqSC1ut
+ttb9Drp8YGTx1O3+h8u1xUaXj6eCci2CZHr5XY0ER8jRwQKueNBGmA75ZVElJLV5
+I+H/b8NbMbUHmN3XKOFJHBR/vo/SDN78Llm+7TiIZm2QzXjUOZLKti9uZtKxW6we
+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>
diff --git a/swamid-interfederations-2.0/shib.worldcat.org-shibboleth.xml b/swamid-interfederations-2.0/shib.worldcat.org-shibboleth.xml
new file mode 100644
index 00000000..3bf5bbd6
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.worldcat.org-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+						MIIE/zCCA+egAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBtTEaMBgGA1UEAxMRc2hp
+						Yi53b3JsZGNhdC5vcmcxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIEwRPaGlvMQ8wDQYD
+						VQQHEwZEdWJsaW4xMTAvBgNVBAoTKE9DTEMgT25saW5lIENvbXB1dGVyIExpYnJh
+						cnkgQ2VudGVyIEluYy4xDDAKBgNVBAsTA1NNRDEpMCcGCSqGSIb3DQEJARYaY2Vy
+						dGlmaWNhdGUtYWRtaW5Ab2NsYy5vcmcwHhcNMTEwMjExMTcxNzI4WhcNMjEwMjEw
+						MTcxNzI4WjCBtTEaMBgGA1UEAxMRc2hpYi53b3JsZGNhdC5vcmcxCzAJBgNVBAYT
+						AlVTMQ0wCwYDVQQIEwRPaGlvMQ8wDQYDVQQHEwZEdWJsaW4xMTAvBgNVBAoTKE9D
+						TEMgT25saW5lIENvbXB1dGVyIExpYnJhcnkgQ2VudGVyIEluYy4xDDAKBgNVBAsT
+						A1NNRDEpMCcGCSqGSIb3DQEJARYaY2VydGlmaWNhdGUtYWRtaW5Ab2NsYy5vcmcw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7tgh0vvmAnEsG8bASyhYl
+						eRFMyBU6aDW4FZSaPjNGfCYEWUlbyjTGP23btu2B4w17NIV3xySC+N4HXIunliQt
+						chF0ojhLnJBiyZBRnni502yNrV9Xtve1HaTq0bByDEs26O1sEBiCc7bcduCnx8ib
+						G3KFe0B/iG6+9/TpAuOnfMl7YP5euaZGqhBCQuecKif2aWb8L9AGJt1qDTOABUI/
+						WcNATCPH3WNanU+TDZszALwGv8xkDk6W36PSRq1yI/PYrWbSvi64MqEfAdPYb8jT
+						Lo+OAensfJCfgjVQwp/B3TPgqMDe2yEQbxwCQ/ls0O3m9vnqdjQ0ULbWQA/MlOsf
+						AgMBAAGjggEWMIIBEjAdBgNVHQ4EFgQUw9NsKfrnZn9WPdX8Q9nW7qRgvO4wgeIG
+						A1UdIwSB2jCB14AUw9NsKfrnZn9WPdX8Q9nW7qRgvO6hgbukgbgwgbUxGjAYBgNV
+						BAMTEXNoaWIud29ybGRjYXQub3JnMQswCQYDVQQGEwJVUzENMAsGA1UECBMET2hp
+						bzEPMA0GA1UEBxMGRHVibGluMTEwLwYDVQQKEyhPQ0xDIE9ubGluZSBDb21wdXRl
+						ciBMaWJyYXJ5IENlbnRlciBJbmMuMQwwCgYDVQQLEwNTTUQxKTAnBgkqhkiG9w0B
+						CQEWGmNlcnRpZmljYXRlLWFkbWluQG9jbGMub3JnggECMAwGA1UdEwQFMAMBAf8w
+						DQYJKoZIhvcNAQEFBQADggEBACTeN4dChviZW1r3dOo29w2TrvhVg0neuq13mvV7
+						d7jh1Jnhic7peKCK2E/0falzbxMoPPPecAXSXeppLa2EQhyu5AVqDhlt5GxZGClr
+						ennnS/O0j18Y1Z/alUPANxWdJy66p60jIPWDdkx+W5uED0YPpmw+QS76eYe9tkHk
+						9ZcqwRIZnNYFUVwVwxtZQY+v3fwq4awgw7ThqT2uaivEygJDBhOciGC3GfTY3+3c
+						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>
diff --git a/swamid-interfederations-2.0/shib.york.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.york.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..6295effb
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.york.ac.uk-shibboleth.xml
@@ -0,0 +1,103 @@
+<?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>
+      <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
+						BgNVBAMTD3NoaWIueW9yay5hYy51azAeFw0xMzA4MTYxMjAxNDRaFw0yMzA4MTQx
+						MjAxNDRaMH0xCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxDTALBgNV
+						BAcTBFlvcmsxGzAZBgNVBAoTElVuaXZlcnNpdHkgb2YgWW9yazEUMBIGA1UECxML
+						SVQgU2VydmljZXMxGDAWBgNVBAMTD3NoaWIueW9yay5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAMQQw+p+wFg6EvOtEOJWjX0W+IYuNq5EQjVW
+						6iupNRMJvuG6sMJB5WK/fPSiCRzrnZKOQrL8S23fitL4bxCN2tJd60ejKsy0TVy1
+						wyOZNUKYOjwaV+luAiyiLNfwZpHiDXWLlW8OwrdWNKXP9klVE+bOQSVmseIN996p
+						EZdsxZCwr0cmOqHC5dOssX+LWbk+q/8mqRnt/somCs+4wmc0E8OyTVsbqoR7b4vm
+						c62mHsixUDg4QE21L+weQb1zHdTq2ORAGpumB57Az8k+xsB3FDrhLiZKWRrBfaYd
+						bKRUDkgjUuTqVheeOS7IEUlrkA8XALDPZWyiYRCf8EkPBI+QvWcCAwEAAaN7MHkw
+						CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
+						dGlmaWNhdGUwHQYDVR0OBBYEFLmjsqdnc3fM4amWI6O1nF3/1biZMB8GA1UdIwQY
+						MBaAFLmjsqdnc3fM4amWI6O1nF3/1biZMA0GCSqGSIb3DQEBBQUAA4IBAQBcwCD/
+						mgjaj2CnORxfVcGbllIdCBDnFx6xWFbz1GxeSxzFGeL8HdWVEzYCcu9o7/GAX00c
+						XAOU7qUVI6cGL9S9cuzembcLDKf1DzIf1IGA0QIaNxwEpu+MVxOp/i2tAuOnKjXp
+						r/ot+oYXtU1O4QoDtO7cDOx0LN3/fi5SiELgAzfcCPB5CNC6NWhkZ9dz1t9cFMbM
+						A4SSjs/kcAjGVXIv19yyulv4kZ+uUD7OoB6uGhcXA8L9ENEXmcpZ9Cr6n6Op1cEJ
+						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>
+						MIID+DCCAuCgAwIBAgIJAJhO6a6qGOfvMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNV
+						BAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxDTALBgNVBAcTBFlvcmsxGzAZBgNV
+						BAoTElVuaXZlcnNpdHkgb2YgWW9yazEUMBIGA1UECxMLSVQgU2VydmljZXMxGDAW
+						BgNVBAMTD3NoaWIueW9yay5hYy51azAeFw0xMzA4MTYxMjAxNDRaFw0yMzA4MTQx
+						MjAxNDRaMH0xCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxDTALBgNV
+						BAcTBFlvcmsxGzAZBgNVBAoTElVuaXZlcnNpdHkgb2YgWW9yazEUMBIGA1UECxML
+						SVQgU2VydmljZXMxGDAWBgNVBAMTD3NoaWIueW9yay5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAMQQw+p+wFg6EvOtEOJWjX0W+IYuNq5EQjVW
+						6iupNRMJvuG6sMJB5WK/fPSiCRzrnZKOQrL8S23fitL4bxCN2tJd60ejKsy0TVy1
+						wyOZNUKYOjwaV+luAiyiLNfwZpHiDXWLlW8OwrdWNKXP9klVE+bOQSVmseIN996p
+						EZdsxZCwr0cmOqHC5dOssX+LWbk+q/8mqRnt/somCs+4wmc0E8OyTVsbqoR7b4vm
+						c62mHsixUDg4QE21L+weQb1zHdTq2ORAGpumB57Az8k+xsB3FDrhLiZKWRrBfaYd
+						bKRUDkgjUuTqVheeOS7IEUlrkA8XALDPZWyiYRCf8EkPBI+QvWcCAwEAAaN7MHkw
+						CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
+						dGlmaWNhdGUwHQYDVR0OBBYEFLmjsqdnc3fM4amWI6O1nF3/1biZMB8GA1UdIwQY
+						MBaAFLmjsqdnc3fM4amWI6O1nF3/1biZMA0GCSqGSIb3DQEBBQUAA4IBAQBcwCD/
+						mgjaj2CnORxfVcGbllIdCBDnFx6xWFbz1GxeSxzFGeL8HdWVEzYCcu9o7/GAX00c
+						XAOU7qUVI6cGL9S9cuzembcLDKf1DzIf1IGA0QIaNxwEpu+MVxOp/i2tAuOnKjXp
+						r/ot+oYXtU1O4QoDtO7cDOx0LN3/fi5SiELgAzfcCPB5CNC6NWhkZ9dz1t9cFMbM
+						A4SSjs/kcAjGVXIv19yyulv4kZ+uUD7OoB6uGhcXA8L9ENEXmcpZ9Cr6n6Op1cEJ
+						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>
diff --git a/swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..646f6f32
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.xml
@@ -0,0 +1,120 @@
+<?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>
+      <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>
+MIIDFzCCAf+gAwIBAgIUCDrOzILCIUYr3TrnUQPEsHWa+wMwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLc2hpYi56Y3UuY3owHhcNMTIwNjE1MTIwNzE1WhcNMzIw
+NjE1MTIwNzE1WjAWMRQwEgYDVQQDEwtzaGliLnpjdS5jejCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAIZDgPqv9Pzl5boNk7nXJpoxPt4AVs++zbuJNPU8
+kJWFdeXrjB2m2wGSDm+1X33NrnkGs2LrNqSqjfXdoPM7UwBKUzqZx6qNSsDssrKt
+S3vK8RfyOss31NXhY6tgG4nw1YhO4324spqFIA7oXMR/QxuPXHnRxUMZjln0XgeM
+hAeHcJJYU/c8ZbLPr4M7eVeQSnzccvkdIc1Hil5qpsdpvb48yvUCOKl7Flm/iVLM
+OKlj1i4IKGSQNd8cUnZZukWK62/H1pr7Al6368zJqkYKvUJbRNfRiXEeV3c9pcg/
+/bx/j66ebUulE4A4ITpE5oQvMpgx/1w2h76mY9rHzTHBMp0CAwEAAaNdMFswOgYD
+VR0RBDMwMYILc2hpYi56Y3UuY3qGImh0dHBzOi8vc2hpYi56Y3UuY3ovaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFHLlm9ZAYoCIoT1NQsdo7sPzShFWMA0GCSqGSIb3
+DQEBBQUAA4IBAQAHtEngv7KaSiRJxFaLn3VdzH6f3SC4xNGKTPyGVq0pBrwUitf4
+kMl17K3Hg73ef1D+wInl3+9IuoCDsTH2wKKD3tUSZsL+xgekRGiIu3LIFcoa+U+o
+5n1nnfZ7xfvh8lgmsRZ7TVC3dXFl9wU+BmsVvOWEjneOA5oZQ2MUkKDC9+5sh6jV
+BXl4hMGBSLfs19/xa81PR7nkC9e6N0ri6nq6rT/SwoXXsAxHMHRz9M9gSq5lwxYO
+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>
+MIIDFzCCAf+gAwIBAgIUCDrOzILCIUYr3TrnUQPEsHWa+wMwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLc2hpYi56Y3UuY3owHhcNMTIwNjE1MTIwNzE1WhcNMzIw
+NjE1MTIwNzE1WjAWMRQwEgYDVQQDEwtzaGliLnpjdS5jejCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAIZDgPqv9Pzl5boNk7nXJpoxPt4AVs++zbuJNPU8
+kJWFdeXrjB2m2wGSDm+1X33NrnkGs2LrNqSqjfXdoPM7UwBKUzqZx6qNSsDssrKt
+S3vK8RfyOss31NXhY6tgG4nw1YhO4324spqFIA7oXMR/QxuPXHnRxUMZjln0XgeM
+hAeHcJJYU/c8ZbLPr4M7eVeQSnzccvkdIc1Hil5qpsdpvb48yvUCOKl7Flm/iVLM
+OKlj1i4IKGSQNd8cUnZZukWK62/H1pr7Al6368zJqkYKvUJbRNfRiXEeV3c9pcg/
+/bx/j66ebUulE4A4ITpE5oQvMpgx/1w2h76mY9rHzTHBMp0CAwEAAaNdMFswOgYD
+VR0RBDMwMYILc2hpYi56Y3UuY3qGImh0dHBzOi8vc2hpYi56Y3UuY3ovaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFHLlm9ZAYoCIoT1NQsdo7sPzShFWMA0GCSqGSIb3
+DQEBBQUAA4IBAQAHtEngv7KaSiRJxFaLn3VdzH6f3SC4xNGKTPyGVq0pBrwUitf4
+kMl17K3Hg73ef1D+wInl3+9IuoCDsTH2wKKD3tUSZsL+xgekRGiIu3LIFcoa+U+o
+5n1nnfZ7xfvh8lgmsRZ7TVC3dXFl9wU+BmsVvOWEjneOA5oZQ2MUkKDC9+5sh6jV
+BXl4hMGBSLfs19/xa81PR7nkC9e6N0ri6nq6rT/SwoXXsAxHMHRz9M9gSq5lwxYO
+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>
diff --git a/swamid-interfederations-2.0/shib1.hw.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib1.hw.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..958e127c
--- /dev/null
+++ b/swamid-interfederations-2.0/shib1.hw.ac.uk-shibboleth.xml
@@ -0,0 +1,112 @@
+<?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>
+      <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
+						A1UEAxMOc2hpYjEuaHcuYWMudWsxIjAgBgkqhkiG9w0BCQEWE24uYS5tb3JyaXNA
+						aHcuYWMudWswHhcNMTQwNDA0MTMzNzQ3WhcNMjQwNDAxMTMzNzQ3WjCBnjELMAkG
+						A1UEBhMCR0IxEDAOBgNVBAgTB0xvdGhpYW4xEjAQBgNVBAcTCUVkaW5idXJnaDEf
+						MB0GA1UEChMWSGVyaW90LVdhdHQgVW5pdmVyc2l0eTELMAkGA1UECxMCSVMxFzAV
+						BgNVBAMTDnNoaWIxLmh3LmFjLnVrMSIwIAYJKoZIhvcNAQkBFhNuLmEubW9ycmlz
+						QGh3LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyz97yEPF
+						VuXIJNgPVIbakqCkohOfu84WhDL2Ng6/IfVHAM0Ekw9wb36iaTnAY8FzwzHOoV3Z
+						iyWJ9LNcR4LZ5twCgtmbXb+IhvTGY24M/kNmcIjy035m/JQTaZrUt98K4LjjW0tw
+						Hb8PaP/OH4KP+aD2RofacCD1LQ5uglFOMQtEAWUDgR2S0v4Mpsp9iPmJcr9Jk3Br
+						PX+zjfhiwo05X8iS4XJL5wO3hrMi4/wNG+y2Ag1A4OBtojGwvUAeHCv5QzLgVY4N
+						9YdC9Y+p89xHX4VtNpHY8Y1Mu4jU3iyUsoK0S+UKNSfdBnHJkgAjhD7hWb1ipqM7
+						BrTpfWSizP5GgQIDAQABo4IBBzCCAQMwHQYDVR0OBBYEFOjliEHArhe9qgYgp1QL
+						q/BpgJgXMIHTBgNVHSMEgcswgciAFOjliEHArhe9qgYgp1QLq/BpgJgXoYGkpIGh
+						MIGeMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHTG90aGlhbjESMBAGA1UEBxMJRWRp
+						bmJ1cmdoMR8wHQYDVQQKExZIZXJpb3QtV2F0dCBVbml2ZXJzaXR5MQswCQYDVQQL
+						EwJJUzEXMBUGA1UEAxMOc2hpYjEuaHcuYWMudWsxIjAgBgkqhkiG9w0BCQEWE24u
+						YS5tb3JyaXNAaHcuYWMudWuCCQCEc+JxDT806zAMBgNVHRMEBTADAQH/MA0GCSqG
+						SIb3DQEBBQUAA4IBAQCYhVo1561uH9WLY6BDdgrHOYy7mWEaFh9IN3hGiN0Xaol1
+						l9cL/OQxrDiNAeYE5v2k4gmrmqQ1k+SarfyG1+y2Cz2nRCeIvFUgzP2ZxY6NihlK
+						rxiPaMOj8Lhpm1qnMYqfOgEmZm7DspgWTca9ee3GfMi3gNKDhNc3ClT3fmJEz3su
+						m591vtWWwBK8FFjmdrfEpMscEBDIjmK3++ZSZcpi7RDgmcOkyYAU4SehufVqTiG/
+						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>
+						MIIEyjCCA7KgAwIBAgIJAIRz4nENPzTrMA0GCSqGSIb3DQEBBQUAMIGeMQswCQYD
+						VQQGEwJHQjEQMA4GA1UECBMHTG90aGlhbjESMBAGA1UEBxMJRWRpbmJ1cmdoMR8w
+						HQYDVQQKExZIZXJpb3QtV2F0dCBVbml2ZXJzaXR5MQswCQYDVQQLEwJJUzEXMBUG
+						A1UEAxMOc2hpYjEuaHcuYWMudWsxIjAgBgkqhkiG9w0BCQEWE24uYS5tb3JyaXNA
+						aHcuYWMudWswHhcNMTQwNDA0MTMzNzQ3WhcNMjQwNDAxMTMzNzQ3WjCBnjELMAkG
+						A1UEBhMCR0IxEDAOBgNVBAgTB0xvdGhpYW4xEjAQBgNVBAcTCUVkaW5idXJnaDEf
+						MB0GA1UEChMWSGVyaW90LVdhdHQgVW5pdmVyc2l0eTELMAkGA1UECxMCSVMxFzAV
+						BgNVBAMTDnNoaWIxLmh3LmFjLnVrMSIwIAYJKoZIhvcNAQkBFhNuLmEubW9ycmlz
+						QGh3LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyz97yEPF
+						VuXIJNgPVIbakqCkohOfu84WhDL2Ng6/IfVHAM0Ekw9wb36iaTnAY8FzwzHOoV3Z
+						iyWJ9LNcR4LZ5twCgtmbXb+IhvTGY24M/kNmcIjy035m/JQTaZrUt98K4LjjW0tw
+						Hb8PaP/OH4KP+aD2RofacCD1LQ5uglFOMQtEAWUDgR2S0v4Mpsp9iPmJcr9Jk3Br
+						PX+zjfhiwo05X8iS4XJL5wO3hrMi4/wNG+y2Ag1A4OBtojGwvUAeHCv5QzLgVY4N
+						9YdC9Y+p89xHX4VtNpHY8Y1Mu4jU3iyUsoK0S+UKNSfdBnHJkgAjhD7hWb1ipqM7
+						BrTpfWSizP5GgQIDAQABo4IBBzCCAQMwHQYDVR0OBBYEFOjliEHArhe9qgYgp1QL
+						q/BpgJgXMIHTBgNVHSMEgcswgciAFOjliEHArhe9qgYgp1QLq/BpgJgXoYGkpIGh
+						MIGeMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHTG90aGlhbjESMBAGA1UEBxMJRWRp
+						bmJ1cmdoMR8wHQYDVQQKExZIZXJpb3QtV2F0dCBVbml2ZXJzaXR5MQswCQYDVQQL
+						EwJJUzEXMBUGA1UEAxMOc2hpYjEuaHcuYWMudWsxIjAgBgkqhkiG9w0BCQEWE24u
+						YS5tb3JyaXNAaHcuYWMudWuCCQCEc+JxDT806zAMBgNVHRMEBTADAQH/MA0GCSqG
+						SIb3DQEBBQUAA4IBAQCYhVo1561uH9WLY6BDdgrHOYy7mWEaFh9IN3hGiN0Xaol1
+						l9cL/OQxrDiNAeYE5v2k4gmrmqQ1k+SarfyG1+y2Cz2nRCeIvFUgzP2ZxY6NihlK
+						rxiPaMOj8Lhpm1qnMYqfOgEmZm7DspgWTca9ee3GfMi3gNKDhNc3ClT3fmJEz3su
+						m591vtWWwBK8FFjmdrfEpMscEBDIjmK3++ZSZcpi7RDgmcOkyYAU4SehufVqTiG/
+						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>
diff --git a/swamid-interfederations-2.0/shib1.napier.ac.uk-entity.xml b/swamid-interfederations-2.0/shib1.napier.ac.uk-entity.xml
new file mode 100644
index 00000000..0af90f8f
--- /dev/null
+++ b/swamid-interfederations-2.0/shib1.napier.ac.uk-entity.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiWQo/dClCX3CqsYfxWDB
+						ouKIAl/kkobQLrukfV5cyu9P94PBOQK/hR+S2V7zxtZ/vmE+kWO9SXfnTJv8hBhr
+						0QiF64tK2fllzTRGC5NoWBy2iJ7LsxxI37wmB5n195mfaenb+nOdEF3XYhTer1NR
+						c/PjrcnWmWOImGGS770Gra7jC+i4LDqlVRihJQHfUooStIPghmblu7qsIjUZ+LUU
+						Xc8RK12Va5Wl0CvEJj0jPNUZ9IjuJjlLcz27Ot1XFiLMdo3qBCk4VM9pTB8k6Y4Z
+						J7GaEo4PlMja9u6qerThIFeIGPzfCg9wvExNi5T+qjgO75C4pcduMWCipa4Lbt/F
+						swIDAQABo2swaTBIBgNVHREEQTA/ghJzaGliMS5uYXBpZXIuYWMudWuGKWh0dHBz
+						Oi8vc2hpYjEubmFwaWVyLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSc
+						+TA4/2hb/0/5R4QBKnrA3hTQ0jANBgkqhkiG9w0BAQUFAAOCAQEAhP6pcfyhqfAc
+						SolKIRerz/8MieqSFSBR+MCc3Ow4MeGcf++7wim6IPKpAlBXl8T8BatoqO9yVLLB
+						2AFpRHHlgoYceryrlwcWJOcyX/DwPBvaqEZgg16IwGZ6dwrVm+qHlRWZgOPs3blY
+						0AvEsoucZkWGp4q5rVXTSb8V+PZ++QQuvxPpN6ZweVJWLyqNTiprHzg3ef+lecK2
+						FeboIZjNCsRtYo3FhXguhrf4ORkzU6jmm4iqdqApQbNyPuQ/W+6GQ7EQcU0dyK9M
+						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>
+						MIIDMzCCAhugAwIBAgIUTi/qwLJiY52T4kltTmNqkd1B5l4wDQYJKoZIhvcNAQEF
+						BQAwHTEbMBkGA1UEAxMSc2hpYjEubmFwaWVyLmFjLnVrMB4XDTE0MDMyNDE2MjEy
+						NloXDTM0MDMyNDE2MjEyNlowHTEbMBkGA1UEAxMSc2hpYjEubmFwaWVyLmFjLnVr
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiWQo/dClCX3CqsYfxWDB
+						ouKIAl/kkobQLrukfV5cyu9P94PBOQK/hR+S2V7zxtZ/vmE+kWO9SXfnTJv8hBhr
+						0QiF64tK2fllzTRGC5NoWBy2iJ7LsxxI37wmB5n195mfaenb+nOdEF3XYhTer1NR
+						c/PjrcnWmWOImGGS770Gra7jC+i4LDqlVRihJQHfUooStIPghmblu7qsIjUZ+LUU
+						Xc8RK12Va5Wl0CvEJj0jPNUZ9IjuJjlLcz27Ot1XFiLMdo3qBCk4VM9pTB8k6Y4Z
+						J7GaEo4PlMja9u6qerThIFeIGPzfCg9wvExNi5T+qjgO75C4pcduMWCipa4Lbt/F
+						swIDAQABo2swaTBIBgNVHREEQTA/ghJzaGliMS5uYXBpZXIuYWMudWuGKWh0dHBz
+						Oi8vc2hpYjEubmFwaWVyLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSc
+						+TA4/2hb/0/5R4QBKnrA3hTQ0jANBgkqhkiG9w0BAQUFAAOCAQEAhP6pcfyhqfAc
+						SolKIRerz/8MieqSFSBR+MCc3Ow4MeGcf++7wim6IPKpAlBXl8T8BatoqO9yVLLB
+						2AFpRHHlgoYceryrlwcWJOcyX/DwPBvaqEZgg16IwGZ6dwrVm+qHlRWZgOPs3blY
+						0AvEsoucZkWGp4q5rVXTSb8V+PZ++QQuvxPpN6ZweVJWLyqNTiprHzg3ef+lecK2
+						FeboIZjNCsRtYo3FhXguhrf4ORkzU6jmm4iqdqApQbNyPuQ/W+6GQ7EQcU0dyK9M
+						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</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/shib1snc.suffolk.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib1snc.suffolk.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..8e2605b9
--- /dev/null
+++ b/swamid-interfederations-2.0/shib1snc.suffolk.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						bGsuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC33xMKw0Bo
+						NtZFy4/0pVwutCV+s+Abw8SVssaEsgfE5uTPitGRAr04JCD7OIXMYSPqwLb84Bc7
+						TWZ3gelziBLZMHv/QmtAv09OtZOlRW3PeCPTuDRKDjQaxskOYdLPQXF9tMv52pEQ
+						gmdDobUnDTErerHZNE48bUWlcdqkN8wp9z+qdK0ejZHEDevEmaH6mCfI+2pzJyMr
+						iiASeSxQSUjdkFgxt7JF1zohHJXs+Qykvqd3X5hd/vfnt1F11CRcl1FSg+efjWKR
+						tTKudEzjYgHLDds/J0i3c6wnbqArLUMW+M2S62r0RIKtQU7zZ8FhC299a4s7gIuk
+						6wqWUcQ13qBbAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWIxc25jLnN1ZmZvbGsu
+						YWMudWuGLWh0dHBzOi8vc2hpYjFzbmMuc3VmZm9say5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQUPHsNuCLkrODOU8s0nhrCAIWnNl4wDQYJKoZIhvcNAQEF
+						BQADggEBAIMg4WDk4Sb4oO4jUn5dxcZS1kZi3BP0nnO3cn1qU4y2qdEEbtqgBdF1
+						/dhGj1sGEH2b08HjCx52Xr/IsOjlmEgBq5nZgwqccCHiALZLqhazV620dGTjhU5F
+						w4AoSO2LyrDCX7xSAI0CF9EDcUGw6o6t3WrlwlTRmUY4/c12SSmqqhYM/YOS+2ny
+						b+2KrX7e6vI0vlvmPFiGkoKPfkUfJp3sUu/x1b48DEceZ2/gtZ0P5hdneYTP0kZI
+						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>
+						MIIDQzCCAiugAwIBAgIUfzCoW57XmoYd7vMlxp5dQBZ3IlswDQYJKoZIhvcNAQEF
+						BQAwITEfMB0GA1UEAxMWc2hpYjFzbmMuc3VmZm9say5hYy51azAeFw0xMjA4MTYx
+						MDQxNTlaFw0zMjA4MTYxMDQxNTlaMCExHzAdBgNVBAMTFnNoaWIxc25jLnN1ZmZv
+						bGsuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC33xMKw0Bo
+						NtZFy4/0pVwutCV+s+Abw8SVssaEsgfE5uTPitGRAr04JCD7OIXMYSPqwLb84Bc7
+						TWZ3gelziBLZMHv/QmtAv09OtZOlRW3PeCPTuDRKDjQaxskOYdLPQXF9tMv52pEQ
+						gmdDobUnDTErerHZNE48bUWlcdqkN8wp9z+qdK0ejZHEDevEmaH6mCfI+2pzJyMr
+						iiASeSxQSUjdkFgxt7JF1zohHJXs+Qykvqd3X5hd/vfnt1F11CRcl1FSg+efjWKR
+						tTKudEzjYgHLDds/J0i3c6wnbqArLUMW+M2S62r0RIKtQU7zZ8FhC299a4s7gIuk
+						6wqWUcQ13qBbAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWIxc25jLnN1ZmZvbGsu
+						YWMudWuGLWh0dHBzOi8vc2hpYjFzbmMuc3VmZm9say5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQUPHsNuCLkrODOU8s0nhrCAIWnNl4wDQYJKoZIhvcNAQEF
+						BQADggEBAIMg4WDk4Sb4oO4jUn5dxcZS1kZi3BP0nnO3cn1qU4y2qdEEbtqgBdF1
+						/dhGj1sGEH2b08HjCx52Xr/IsOjlmEgBq5nZgwqccCHiALZLqhazV620dGTjhU5F
+						w4AoSO2LyrDCX7xSAI0CF9EDcUGw6o6t3WrlwlTRmUY4/c12SSmqqhYM/YOS+2ny
+						b+2KrX7e6vI0vlvmPFiGkoKPfkUfJp3sUu/x1b48DEceZ2/gtZ0P5hdneYTP0kZI
+						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>
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
new file mode 100644
index 00000000..3d18e180
--- /dev/null
+++ b/swamid-interfederations-2.0/shib2.blackpool.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,122 @@
+<?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>
+      <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>
+						MIIEHjCCAwagAwIBAgIJAIbJGsXAMFHuMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2twb29s
+						MSgwJgYDVQQKEx9CbGFja3Bvb2wgYW5kIFRoZSBGeWxkZSBDb2xsZWdlMQ0wCwYD
+						VQQLEwRMSVRTMR4wHAYDVQQDExVzaGliMi5ibGFja3Bvb2wuYWMudWswHhcNMTIw
+						NjI5MTMxNzIwWhcNMjIwNjI3MTMxNzIwWjCBjzELMAkGA1UEBhMCR0IxEzARBgNV
+						BAgTCkxhbmNhc2hpcmUxEjAQBgNVBAcTCUJsYWNrcG9vbDEoMCYGA1UEChMfQmxh
+						Y2twb29sIGFuZCBUaGUgRnlsZGUgQ29sbGVnZTENMAsGA1UECxMETElUUzEeMBwG
+						A1UEAxMVc2hpYjIuYmxhY2twb29sLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAyJaTYlzIs0P3e0xr3KRAdAsm7NTC3b68nCcX7SwTefwgwGPT
+						/dkYhR2Fbu8pUVb5gZ7YX3G6ZnGwsq5pV/gr8Zw6jgtYJ+aqq18lkPbRdTcd+rLX
+						OL456IhQmjYV5MathiVukkhpKlYmxL+eIL5PfHCF5JlwEQgwgSktpfM4Rk7Z29wG
+						rZrv3AMQqey3BzgYm4Zhp1FDMn5lFgB9ivkBzzsNkHDciHO1AP0kfdtqBrXYr2m1
+						gIG6AOi8bkHAB2nwwPCPGVhyvEYHAt+8PvofdCS80g8W0mSXz28QRE7QMTy0p2e/
+						sEkceF7V/sbvMjxGPsjbGWoEgARFtBQl07stTwIDAQABo3sweTAJBgNVHRMEAjAA
+						MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
+						BgNVHQ4EFgQURhmQ85mS+G8vK+IC45bY0aQx2eAwHwYDVR0jBBgwFoAURhmQ85mS
+						+G8vK+IC45bY0aQx2eAwDQYJKoZIhvcNAQEFBQADggEBALu+51j8hIjTAxO2UHND
+						SzTANca/7K/++d4p7oYuIqlkg1Ql3Fm8xXmwljOdYhhIKWeB24pRP8waewl9Ibvh
+						JFZfmm07XW2qYna5cJeow7QeaHo2wD7x2jz6D893ONrqXNLjv03lhA/le97LZ6KU
+						2C/oKDxGvwFMDa+3acPWPrcwhz4l5/FeYAn9UbxAqmSdmioz7WFitbzAlLFyf+OT
+						pGnYFjRQBxApP6mPCrh3glB5kkCEtqw1V/vxHo6bGyC8XyoGVuMcihpEfWzu7bKa
+						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>
+						MIIEHjCCAwagAwIBAgIJAIbJGsXAMFHuMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2twb29s
+						MSgwJgYDVQQKEx9CbGFja3Bvb2wgYW5kIFRoZSBGeWxkZSBDb2xsZWdlMQ0wCwYD
+						VQQLEwRMSVRTMR4wHAYDVQQDExVzaGliMi5ibGFja3Bvb2wuYWMudWswHhcNMTIw
+						NjI5MTMxNzIwWhcNMjIwNjI3MTMxNzIwWjCBjzELMAkGA1UEBhMCR0IxEzARBgNV
+						BAgTCkxhbmNhc2hpcmUxEjAQBgNVBAcTCUJsYWNrcG9vbDEoMCYGA1UEChMfQmxh
+						Y2twb29sIGFuZCBUaGUgRnlsZGUgQ29sbGVnZTENMAsGA1UECxMETElUUzEeMBwG
+						A1UEAxMVc2hpYjIuYmxhY2twb29sLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAyJaTYlzIs0P3e0xr3KRAdAsm7NTC3b68nCcX7SwTefwgwGPT
+						/dkYhR2Fbu8pUVb5gZ7YX3G6ZnGwsq5pV/gr8Zw6jgtYJ+aqq18lkPbRdTcd+rLX
+						OL456IhQmjYV5MathiVukkhpKlYmxL+eIL5PfHCF5JlwEQgwgSktpfM4Rk7Z29wG
+						rZrv3AMQqey3BzgYm4Zhp1FDMn5lFgB9ivkBzzsNkHDciHO1AP0kfdtqBrXYr2m1
+						gIG6AOi8bkHAB2nwwPCPGVhyvEYHAt+8PvofdCS80g8W0mSXz28QRE7QMTy0p2e/
+						sEkceF7V/sbvMjxGPsjbGWoEgARFtBQl07stTwIDAQABo3sweTAJBgNVHRMEAjAA
+						MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
+						BgNVHQ4EFgQURhmQ85mS+G8vK+IC45bY0aQx2eAwHwYDVR0jBBgwFoAURhmQ85mS
+						+G8vK+IC45bY0aQx2eAwDQYJKoZIhvcNAQEFBQADggEBALu+51j8hIjTAxO2UHND
+						SzTANca/7K/++d4p7oYuIqlkg1Ql3Fm8xXmwljOdYhhIKWeB24pRP8waewl9Ibvh
+						JFZfmm07XW2qYna5cJeow7QeaHo2wD7x2jz6D893ONrqXNLjv03lhA/le97LZ6KU
+						2C/oKDxGvwFMDa+3acPWPrcwhz4l5/FeYAn9UbxAqmSdmioz7WFitbzAlLFyf+OT
+						pGnYFjRQBxApP6mPCrh3glB5kkCEtqw1V/vxHo6bGyC8XyoGVuMcihpEfWzu7bKa
+						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>
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
new file mode 100644
index 00000000..d1db61da
--- /dev/null
+++ b/swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEHDCCAwSgAwIBAgIJALXqP3+WEFbxMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+						VQQGEwJHQjEVMBMGA1UECBMMRWFzdCBMb3RoaWFuMRQwEgYDVQQHEwtNdXNzZWxi
+						dXJnaDEiMCAGA1UEChMZUXVlZW4gTWFyZ2FyZXQgVW5pdmVyc2l0eTEUMBIGA1UE
+						CxMLSVQgU2VydmljZXMxGDAWBgNVBAMTD3NoaWIyLnFtdS5hYy51azAeFw0xNTAy
+						MDYxMzQ5MzlaFw0yNTAyMDMxMzQ5MzlaMIGOMQswCQYDVQQGEwJHQjEVMBMGA1UE
+						CBMMRWFzdCBMb3RoaWFuMRQwEgYDVQQHEwtNdXNzZWxidXJnaDEiMCAGA1UEChMZ
+						UXVlZW4gTWFyZ2FyZXQgVW5pdmVyc2l0eTEUMBIGA1UECxMLSVQgU2VydmljZXMx
+						GDAWBgNVBAMTD3NoaWIyLnFtdS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALZ45sT4BFzeyQq+7s+fB3MXY5DEJ7M5LqLwOuLQu9qQy8QXkfjl
+						IF/njXWdTISjaQduqpfxQ2s2math1WjYqw+ahbBo7pLMtJjUZaFuBu8SfWOvlAcj
+						nBmZGuo38oaKVi7F+cPEltwEyA4soxdjy+VnwIHlcmgapQf6/qu/zUwDzQpr+DjO
+						VXLc2E/F4ac6DdWaymQgCyuukR6nz8y690XurJmd9neaZGMjYRcM9MStHM6rNuRh
+						snpjcTgJ1LVtMeLHzp6F3AyEy10oRGmuehLNsG53jD8qyjVQgiN1BICaUBEwuz49
+						lB5IsP1LbP5ZaGx23w/gm/TndqTo3toThX8CAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFG+x6Z1HFy1EVNofQT5Pz5MbLFglMB8GA1UdIwQYMBaAFG+x6Z1HFy1E
+						VNofQT5Pz5MbLFglMA0GCSqGSIb3DQEBBQUAA4IBAQBu+SRFvMc99/KKW615vkO0
+						IZYqXVKtt13FjHOzNIm9Pb51dzOqEBVqSn4Hc0lhaL5Bat8t8JgDbKFd85H8v/oB
+						tM7XBK4bgQhyG4jd144SSwN1HLqWKdQE54w3MyWvFHrGrPAqjgqZMqGSCFpORlJG
+						rd2EC/yHEkOrY0X74q0uaU6D7Kp96Ayv5NtZWvCcj1hNdQF/CoX0vA+uFdYWWUEd
+						oiaa7CX11axaCto39+d4wwqSeX3j0YUkvkU+0spZeYstSA5PNX4G8drgxRGK3+uV
+						blLOGW/k9vBqR2M4FEIMjli/7ytkIVG6q0g1ENv3x89Q6y7pqzP/G1L4q0d0lkKq
+					</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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEHDCCAwSgAwIBAgIJALXqP3+WEFbxMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+						VQQGEwJHQjEVMBMGA1UECBMMRWFzdCBMb3RoaWFuMRQwEgYDVQQHEwtNdXNzZWxi
+						dXJnaDEiMCAGA1UEChMZUXVlZW4gTWFyZ2FyZXQgVW5pdmVyc2l0eTEUMBIGA1UE
+						CxMLSVQgU2VydmljZXMxGDAWBgNVBAMTD3NoaWIyLnFtdS5hYy51azAeFw0xNTAy
+						MDYxMzQ5MzlaFw0yNTAyMDMxMzQ5MzlaMIGOMQswCQYDVQQGEwJHQjEVMBMGA1UE
+						CBMMRWFzdCBMb3RoaWFuMRQwEgYDVQQHEwtNdXNzZWxidXJnaDEiMCAGA1UEChMZ
+						UXVlZW4gTWFyZ2FyZXQgVW5pdmVyc2l0eTEUMBIGA1UECxMLSVQgU2VydmljZXMx
+						GDAWBgNVBAMTD3NoaWIyLnFtdS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALZ45sT4BFzeyQq+7s+fB3MXY5DEJ7M5LqLwOuLQu9qQy8QXkfjl
+						IF/njXWdTISjaQduqpfxQ2s2math1WjYqw+ahbBo7pLMtJjUZaFuBu8SfWOvlAcj
+						nBmZGuo38oaKVi7F+cPEltwEyA4soxdjy+VnwIHlcmgapQf6/qu/zUwDzQpr+DjO
+						VXLc2E/F4ac6DdWaymQgCyuukR6nz8y690XurJmd9neaZGMjYRcM9MStHM6rNuRh
+						snpjcTgJ1LVtMeLHzp6F3AyEy10oRGmuehLNsG53jD8qyjVQgiN1BICaUBEwuz49
+						lB5IsP1LbP5ZaGx23w/gm/TndqTo3toThX8CAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFG+x6Z1HFy1EVNofQT5Pz5MbLFglMB8GA1UdIwQYMBaAFG+x6Z1HFy1E
+						VNofQT5Pz5MbLFglMA0GCSqGSIb3DQEBBQUAA4IBAQBu+SRFvMc99/KKW615vkO0
+						IZYqXVKtt13FjHOzNIm9Pb51dzOqEBVqSn4Hc0lhaL5Bat8t8JgDbKFd85H8v/oB
+						tM7XBK4bgQhyG4jd144SSwN1HLqWKdQE54w3MyWvFHrGrPAqjgqZMqGSCFpORlJG
+						rd2EC/yHEkOrY0X74q0uaU6D7Kp96Ayv5NtZWvCcj1hNdQF/CoX0vA+uFdYWWUEd
+						oiaa7CX11axaCto39+d4wwqSeX3j0YUkvkU+0spZeYstSA5PNX4G8drgxRGK3+uV
+						blLOGW/k9vBqR2M4FEIMjli/7ytkIVG6q0g1ENv3x89Q6y7pqzP/G1L4q0d0lkKq
+					</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>
diff --git a/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml
new file mode 100644
index 00000000..311c1beb
--- /dev/null
+++ b/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2.to.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceris.cnr.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CNR IRCrES</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">CNR IRCrES</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for CNR IRCrES users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di CNR IRCrES</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.to.cnr.it/index.php/contatti</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.to.cnr.it/index.php/contatti</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.to.cnr.it/index.php/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.to.cnr.it/index.php/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://intranet.ircres.cnr.it/IRCRES_80x60.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://intranet.ircres.cnr.it/IRCRES_80x60.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://intranet.ircres.cnr.it/IRCRES_16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://intranet.ircres.cnr.it/IRCRES_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>
+MIIEkDCCA3igAwIBAgIQA7YHo7zjDDdKW4N5+ddItjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDExNTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowbDELMAkGA1UE
+BhMCSVQxQzBBBgNVBAoTOkNOUiAtIElzdGl0dXRvIGRpIFJpY2VyY2Egc3VsbCdJ
+bXByZXNhIGxvIFN2aWx1cHBvIChDRVJJUykxGDAWBgNVBAMTD3NoaWIyLnRvLmNu
+ci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMo4zqb/PU/AH2Vs
+d1oQAnJpAXHO6OEMutdBGxRRw4np3jjr32Lehd/NsAtUq4GOzbui08cWj/q6C0S9
+kX7soZti+/wggpZt9l5DaQIO9n0cfBo3qvsSZwHY8wfzi6mmkm+uBR1ro67BvHe5
+HoFTgdmmsB2kXPyZTzatC4+0ux0xGEa+3RdrFRe/nH21mVpc5NpRmHnSCDf8XEEJ
+VsbQAJ5IXEOIb7ZqmlhWdKYwJZt/C/tcWHDOl9T5uVQe1SKsNZRPqbbL6HH5LYm8
+e2umiaOk0HIDGlMyQR0U95s3SfAi2GyLulpxKWoE+1VaV/YQc3MB0htH9b6qvNfF
+EbkzNVcCAwEAAaOCAWIwggFeMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+47ntMB0GA1UdDgQWBBQJMBh7eDwsje9LkEEtlZu97Y4YvjAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
+Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
+AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
+RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
+Lm9yZzAaBgNVHREEEzARgg9zaGliMi50by5jbnIuaXQwDQYJKoZIhvcNAQEFBQAD
+ggEBAANUFWLXwxPLIukJtShIOBuAFLKmCgRIoJHJEKJqj6SkMG/j3RalS312LPxk
+DGm6OsPSk34AvloSfpUJHeFtrNECpxlcC34jtpGG/uvjC7V1O78o/1KO1ON4966T
+6hbhZ1NWs9VFg+kKDnOni712akqaqNiHqP1C0PMKbOWWRRRgKHe6CpV3BLfJnZCy
+XQ0hJbyzxm5hOhXJdPBwl8V65TrVG+4FBN4iK077+leQWzjvwtyCXuKjoA8CbEUn
+75aNc43eKZdsPVAV7uXumhc4b3eAgh72H+p3SL8/4gU4+EqqdslhzhZqSqpqdl/o
+xLAyzTVSpamrag76ZF4Qye/ENGU=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.to.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.to.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://shib2.to.cnr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.to.cnr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2.to.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.to.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">ceris.cnr.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEkDCCA3igAwIBAgIQA7YHo7zjDDdKW4N5+ddItjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDExNTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowbDELMAkGA1UE
+BhMCSVQxQzBBBgNVBAoTOkNOUiAtIElzdGl0dXRvIGRpIFJpY2VyY2Egc3VsbCdJ
+bXByZXNhIGxvIFN2aWx1cHBvIChDRVJJUykxGDAWBgNVBAMTD3NoaWIyLnRvLmNu
+ci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMo4zqb/PU/AH2Vs
+d1oQAnJpAXHO6OEMutdBGxRRw4np3jjr32Lehd/NsAtUq4GOzbui08cWj/q6C0S9
+kX7soZti+/wggpZt9l5DaQIO9n0cfBo3qvsSZwHY8wfzi6mmkm+uBR1ro67BvHe5
+HoFTgdmmsB2kXPyZTzatC4+0ux0xGEa+3RdrFRe/nH21mVpc5NpRmHnSCDf8XEEJ
+VsbQAJ5IXEOIb7ZqmlhWdKYwJZt/C/tcWHDOl9T5uVQe1SKsNZRPqbbL6HH5LYm8
+e2umiaOk0HIDGlMyQR0U95s3SfAi2GyLulpxKWoE+1VaV/YQc3MB0htH9b6qvNfF
+EbkzNVcCAwEAAaOCAWIwggFeMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+47ntMB0GA1UdDgQWBBQJMBh7eDwsje9LkEEtlZu97Y4YvjAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
+Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
+AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
+RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
+Lm9yZzAaBgNVHREEEzARgg9zaGliMi50by5jbnIuaXQwDQYJKoZIhvcNAQEFBQAD
+ggEBAANUFWLXwxPLIukJtShIOBuAFLKmCgRIoJHJEKJqj6SkMG/j3RalS312LPxk
+DGm6OsPSk34AvloSfpUJHeFtrNECpxlcC34jtpGG/uvjC7V1O78o/1KO1ON4966T
+6hbhZ1NWs9VFg+kKDnOni712akqaqNiHqP1C0PMKbOWWRRRgKHe6CpV3BLfJnZCy
+XQ0hJbyzxm5hOhXJdPBwl8V65TrVG+4FBN4iK077+leQWzjvwtyCXuKjoA8CbEUn
+75aNc43eKZdsPVAV7uXumhc4b3eAgh72H+p3SL8/4gU4+EqqdslhzhZqSqpqdl/o
+xLAyzTVSpamrag76ZF4Qye/ENGU=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.to.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.to.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 IRCrES</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CNR IRCrES</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.ircres.cnr.it/index.php/it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.ircres.cnr.it/index.php/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Giancarlo Birello</md:SurName>
+    <md:EmailAddress>mailto:giancarlo.birello@ircres.cnr.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:supporto@to.cnr.it</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
new file mode 100644
index 00000000..190e74be
--- /dev/null
+++ b/swamid-interfederations-2.0/shib2idp-2.rgu.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?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>
+      <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
+						IENBIDIwHhcNMTUwMjE4MDAwMDAwWhcNMTgwMjE3MjM1OTU5WjBCMSEwHwYDVQQL
+						ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHTAbBgNVBAMTFHNoaWIyaWRwLTIu
+						cmd1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0f5wqUju
+						aXytpxhUvEINWnjJknOJlQCjE5I3b6zLtA19wEjJwPaxfynT6RNyZ6SFB+YLhmY1
+						/jwMQtInvaCvyNwlT12/dgllyCroi8pcHzNk2qIr4oeKuV3Ey+Gu4f6Q3O7r2jIA
+						/ZLasZYEBssdZXibwiIzGMIptXgNpA32G0hZkf4CXOfyXf21YxWaEQUAmNF/kZzx
+						nI/syf/lT3WofFf1Z44xpxY3hvqurxwp+y+pFp3ulJ52NL11BYcpxyucKSNqLvvf
+						aCFLPbhRPXC1l4ZZaNcYt37YRTb7uFzDn/DBZC/WvDaRugpxwAKcNtvlhtyHiXm4
+						idSf1CbxT2C8IQIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZU
+						G+GGKLD9tr0wHQYDVR0OBBYEFIm+C+W8KETQHZjRFK0SNZLp4bTlMA4GA1UdDwEB
+						/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+						BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+						MzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0Ey
+						LmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNl
+						cnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8v
+						b2NzcC51c2VydHJ1c3QuY29tMB8GA1UdEQQYMBaCFHNoaWIyaWRwLTIucmd1LmFj
+						LnVrMA0GCSqGSIb3DQEBCwUAA4IBAQB58/SY7DvyV8owwALt0tzRGdeDQ/Mquplz
+						Un9XXTbrFycawmt5bes3zKhCeeRaKk/ZDfM1PbKydYxJlJ+1C7KGxW6eLCNTiKCO
+						yvbjvqG6DSZPq8PBf5V+Z28WTn5z5TPQlfjiqW7NJrDv8wQeDRImflWLNpW4/iu2
+						UD9E6mx+MNBQB3V1ICH9GdlNtmcdBjEIdAqfYQ1XRhVezlsKreHw7U5osiJRutAX
+						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>
+						MIIEozCCA4ugAwIBAgIRAKWfpZdh7g9wz9mxzKXmeEMwDQYJKoZIhvcNAQELBQAw
+						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
+						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
+						IENBIDIwHhcNMTUwMjE4MDAwMDAwWhcNMTgwMjE3MjM1OTU5WjBCMSEwHwYDVQQL
+						ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHTAbBgNVBAMTFHNoaWIyaWRwLTIu
+						cmd1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0f5wqUju
+						aXytpxhUvEINWnjJknOJlQCjE5I3b6zLtA19wEjJwPaxfynT6RNyZ6SFB+YLhmY1
+						/jwMQtInvaCvyNwlT12/dgllyCroi8pcHzNk2qIr4oeKuV3Ey+Gu4f6Q3O7r2jIA
+						/ZLasZYEBssdZXibwiIzGMIptXgNpA32G0hZkf4CXOfyXf21YxWaEQUAmNF/kZzx
+						nI/syf/lT3WofFf1Z44xpxY3hvqurxwp+y+pFp3ulJ52NL11BYcpxyucKSNqLvvf
+						aCFLPbhRPXC1l4ZZaNcYt37YRTb7uFzDn/DBZC/WvDaRugpxwAKcNtvlhtyHiXm4
+						idSf1CbxT2C8IQIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZU
+						G+GGKLD9tr0wHQYDVR0OBBYEFIm+C+W8KETQHZjRFK0SNZLp4bTlMA4GA1UdDwEB
+						/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+						BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+						MzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0Ey
+						LmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNl
+						cnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8v
+						b2NzcC51c2VydHJ1c3QuY29tMB8GA1UdEQQYMBaCFHNoaWIyaWRwLTIucmd1LmFj
+						LnVrMA0GCSqGSIb3DQEBCwUAA4IBAQB58/SY7DvyV8owwALt0tzRGdeDQ/Mquplz
+						Un9XXTbrFycawmt5bes3zKhCeeRaKk/ZDfM1PbKydYxJlJ+1C7KGxW6eLCNTiKCO
+						yvbjvqG6DSZPq8PBf5V+Z28WTn5z5TPQlfjiqW7NJrDv8wQeDRImflWLNpW4/iu2
+						UD9E6mx+MNBQB3V1ICH9GdlNtmcdBjEIdAqfYQ1XRhVezlsKreHw7U5osiJRutAX
+						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>Edward</md:GivenName>
+    <md:SurName>Alaszewski</md:SurName>
+    <md:EmailAddress>mailto:e.alaszewski@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
new file mode 100644
index 00000000..a1b3ef01
--- /dev/null
+++ b/swamid-interfederations-2.0/shib2idp.ntu.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?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>
+      <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>
+						MIIEzzCCA7egAwIBAgIQZVN9rG0l85bNmeRDGBbHLzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMTEyMDAwMDAwMFoXDTE1MTEyMDIzNTk1OVowgZ0xCzAJBgNV
+						BAYTAkdCMRgwFgYDVQQIEw9Ob3R0aW5naGFtc2hpcmUxEzARBgNVBAcTCk5vdHRp
+						bmdoYW0xJDAiBgNVBAoTG05vdHRpbmdoYW0gVHJlbnQgVW5pdmVyc2l0eTEcMBoG
+						A1UECxMTSW5mb3JtYXRpb24gU3lzdGVtczEbMBkGA1UEAxMSc2hpYjJpZHAubnR1
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtn3OZnkj82U1
+						qep4KBD8tMy2A84GtKZj14us/mCzU4JBMQWoBUhihZfhLNErE4EQllz5wUAEDfYY
+						wnclcngY2X6nzgqTJuGmrQLZfukFRPzBfdrQnJGTg/3/dIvCGJ+KfqIt5fGEAwYV
+						pMJaDg6LjBcZSgjmppOocEKVQJydZWEZtKp5+PLDIfQ4btrxw1mCOo/ngEGB8owP
+						eFXstxIweC+9XNhJp4c8L2iZEsfyrNSE+0KFb7DI2sdEbFyaDixLSFlX5CY7fhUS
+						tPUzMOnhXnl2UR9hdgH8x60zu0iUAIXLx0cs81W+VtX2xgsg42oB/dw/6rfFWT37
+						EmXuJi+cQQIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+						6pDjue0wHQYDVR0OBBYEFHTmFwoiMP9Pj5rstxvnY+0oWgtJMA4GA1UdDwEB/wQE
+						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECAjA6BgNVHR8EMzAx
+						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+						cC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJzaGliMmlkcC5udHUuYWMudWsw
+						DQYJKoZIhvcNAQEFBQADggEBAIZ6BAgo8Zi5yspwW//AFgxFQiwEYVh3Yp+yK5w2
+						VEy67No5WpuheooXvw4cq04Q+ikk7RHqIQIIBYTt+Fq4XI7Gb00KVPtPsigN2CqH
+						YETn2eAdF/GFgG93dlvHgD4R9XbJRKHXute7IB+rDxmLgmlYqpvEvi6smNGDPva1
+						d5ov1zOG7hoA1/J6Lfk5HcE21t0djYAVVvy3542TVcUMQ2sqdu0Z/Col04ZiJHn6
+						JxibzI8iw53EN5HTasIQDh7O3YcSotjGNBo5+26kj2O3mTTJ19R8XnQCFBh2NRkX
+						3I2wr94vUQfHVJYPxSRAdsD5lXL80++ASxNlvqIWpKedTnA=
+					</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>
+						MIIEzzCCA7egAwIBAgIQZVN9rG0l85bNmeRDGBbHLzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMTEyMDAwMDAwMFoXDTE1MTEyMDIzNTk1OVowgZ0xCzAJBgNV
+						BAYTAkdCMRgwFgYDVQQIEw9Ob3R0aW5naGFtc2hpcmUxEzARBgNVBAcTCk5vdHRp
+						bmdoYW0xJDAiBgNVBAoTG05vdHRpbmdoYW0gVHJlbnQgVW5pdmVyc2l0eTEcMBoG
+						A1UECxMTSW5mb3JtYXRpb24gU3lzdGVtczEbMBkGA1UEAxMSc2hpYjJpZHAubnR1
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtn3OZnkj82U1
+						qep4KBD8tMy2A84GtKZj14us/mCzU4JBMQWoBUhihZfhLNErE4EQllz5wUAEDfYY
+						wnclcngY2X6nzgqTJuGmrQLZfukFRPzBfdrQnJGTg/3/dIvCGJ+KfqIt5fGEAwYV
+						pMJaDg6LjBcZSgjmppOocEKVQJydZWEZtKp5+PLDIfQ4btrxw1mCOo/ngEGB8owP
+						eFXstxIweC+9XNhJp4c8L2iZEsfyrNSE+0KFb7DI2sdEbFyaDixLSFlX5CY7fhUS
+						tPUzMOnhXnl2UR9hdgH8x60zu0iUAIXLx0cs81W+VtX2xgsg42oB/dw/6rfFWT37
+						EmXuJi+cQQIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+						6pDjue0wHQYDVR0OBBYEFHTmFwoiMP9Pj5rstxvnY+0oWgtJMA4GA1UdDwEB/wQE
+						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECAjA6BgNVHR8EMzAx
+						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+						cC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJzaGliMmlkcC5udHUuYWMudWsw
+						DQYJKoZIhvcNAQEFBQADggEBAIZ6BAgo8Zi5yspwW//AFgxFQiwEYVh3Yp+yK5w2
+						VEy67No5WpuheooXvw4cq04Q+ikk7RHqIQIIBYTt+Fq4XI7Gb00KVPtPsigN2CqH
+						YETn2eAdF/GFgG93dlvHgD4R9XbJRKHXute7IB+rDxmLgmlYqpvEvi6smNGDPva1
+						d5ov1zOG7hoA1/J6Lfk5HcE21t0djYAVVvy3542TVcUMQ2sqdu0Z/Col04ZiJHn6
+						JxibzI8iw53EN5HTasIQDh7O3YcSotjGNBo5+26kj2O3mTTJ19R8XnQCFBh2NRkX
+						3I2wr94vUQfHVJYPxSRAdsD5lXL80++ASxNlvqIWpKedTnA=
+					</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:ITSShibbolethTechnical@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
new file mode 100644
index 00000000..f88f6e44
--- /dev/null
+++ b/swamid-interfederations-2.0/shib2idp.rgu.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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>
+      <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>
+						MIIEuzCCA6OgAwIBAgIRAOjNCL+1Jq0meczdFgdLDN0wDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjA4MDEwMDAwMDBaFw0xNTA4MDEyMzU5NTlaMIGSMQswCQYD
+						VQQGEwJHQjEWMBQGA1UECBMNQWJlcmRlZW5zaGlyZTERMA8GA1UEBxMIQWJlcmRl
+						ZW4xJTAjBgNVBAoTHFRoZSBSb2JlcnQgR29yZG9uIFVuaXZlcnNpdHkxFDASBgNV
+						BAsTC0lUIFNlcnZpY2VzMRswGQYDVQQDExJzaGliMmlkcC5yZ3UuYWMudWswggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD0TlotgTmGWUSItlyoG33Gk1w2
+						iUKuliqtKawu+UouoghH5vslAKBQZ2wydef+yovFE778CsDChMscNlurlH1gRwMI
+						PJ+kPf0A8f/k9vycdKiJH78dRsCXIqydgldVvuiQZLX8muIEwbUUhH4NS3eguoWT
+						IL18/QcjosjR2TkKewD+6reddWJY/KEJjj5aroMIIsk9NgJzGowR4SneWKsu5LWA
+						xGLkOSIuyq7T2A/ZaC2vKz+iLPsYpb4vX38LUfwEZwxIsFOe3/ByNWF3sK/shUb7
+						/U5Z1rz9MCWHcjkxMNKM7zwaigUSRFDroMQTuJDjWggf4/h47fPUgnZhSWplAgMB
+						AAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV
+						HQ4EFgQUeS8VSGO5tj8gfOpUXdqp38VRLFswDgYDVR0PAQH/BAQDAgWgMAwGA1Ud
+						EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR
+						MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50
+						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG
+						CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+						LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHQYD
+						VR0RBBYwFIISc2hpYjJpZHAucmd1LmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBu
+						7gMyUNw6vJZ7NgziCD9GEGd5H51ZeHRI/Gf6SLp04in04Cy7ILi2+79dNqepG3nx
+						fumYR/jMnj/dMQbfK58lb4tEaji3pfBHaveVK+kHRy/fHXQlXXuJH57DltZVjxDd
+						Kn8zLHWWC4+X5srANwATyv1jWc9+XzZ8Ub7J6DQsz9GAeEJeUDrlQcCegIfDR2C/
+						H/fXmcNh2ltWDkHSyZYNXRPcYycmR/erb0UbwRBZB6Zkyh5fgizY0jAN1L7obwfz
+						Yp7rUeDHUOHQPNa3+J2AVJDg8xrRxn2R85zkOHX2tcEy0bUNW7hkZb4gKpM9N5Ln
+						71pAjOe8DdU65Ivo169+
+					</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>
+						MIIEuzCCA6OgAwIBAgIRAOjNCL+1Jq0meczdFgdLDN0wDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjA4MDEwMDAwMDBaFw0xNTA4MDEyMzU5NTlaMIGSMQswCQYD
+						VQQGEwJHQjEWMBQGA1UECBMNQWJlcmRlZW5zaGlyZTERMA8GA1UEBxMIQWJlcmRl
+						ZW4xJTAjBgNVBAoTHFRoZSBSb2JlcnQgR29yZG9uIFVuaXZlcnNpdHkxFDASBgNV
+						BAsTC0lUIFNlcnZpY2VzMRswGQYDVQQDExJzaGliMmlkcC5yZ3UuYWMudWswggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD0TlotgTmGWUSItlyoG33Gk1w2
+						iUKuliqtKawu+UouoghH5vslAKBQZ2wydef+yovFE778CsDChMscNlurlH1gRwMI
+						PJ+kPf0A8f/k9vycdKiJH78dRsCXIqydgldVvuiQZLX8muIEwbUUhH4NS3eguoWT
+						IL18/QcjosjR2TkKewD+6reddWJY/KEJjj5aroMIIsk9NgJzGowR4SneWKsu5LWA
+						xGLkOSIuyq7T2A/ZaC2vKz+iLPsYpb4vX38LUfwEZwxIsFOe3/ByNWF3sK/shUb7
+						/U5Z1rz9MCWHcjkxMNKM7zwaigUSRFDroMQTuJDjWggf4/h47fPUgnZhSWplAgMB
+						AAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV
+						HQ4EFgQUeS8VSGO5tj8gfOpUXdqp38VRLFswDgYDVR0PAQH/BAQDAgWgMAwGA1Ud
+						EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR
+						MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50
+						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG
+						CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+						LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHQYD
+						VR0RBBYwFIISc2hpYjJpZHAucmd1LmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBu
+						7gMyUNw6vJZ7NgziCD9GEGd5H51ZeHRI/Gf6SLp04in04Cy7ILi2+79dNqepG3nx
+						fumYR/jMnj/dMQbfK58lb4tEaji3pfBHaveVK+kHRy/fHXQlXXuJH57DltZVjxDd
+						Kn8zLHWWC4+X5srANwATyv1jWc9+XzZ8Ub7J6DQsz9GAeEJeUDrlQcCegIfDR2C/
+						H/fXmcNh2ltWDkHSyZYNXRPcYycmR/erb0UbwRBZB6Zkyh5fgizY0jAN1L7obwfz
+						Yp7rUeDHUOHQPNa3+J2AVJDg8xrRxn2R85zkOHX2tcEy0bUNW7hkZb4gKpM9N5Ln
+						71pAjOe8DdU65Ivo169+
+					</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>Edward</md:GivenName>
+    <md:SurName>Alaszewski</md:SurName>
+    <md:EmailAddress>mailto:e.alaszewski@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/shib2sp.ntu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib2sp.ntu.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..2300a4f0
--- /dev/null
+++ b/swamid-interfederations-2.0/shib2sp.ntu.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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://shib2sp.ntu.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib2sp.ntu.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>
+						MIIC3DCCAcSgAwIBAgIJAJo8E70ZFlUHMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB3NoaWIyc3AwHhcNMTAwNTE3MDk0MjM5WhcNMjAwNTE0MDk0MjM5WjASMRAw
+						DgYDVQQDEwdzaGliMnNwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						wdIcqfW5diwfvyCH6wQhCg9/foLi7OgVOsxPag90eS2QTU1+AXjRpXPo7SWF8L6s
+						vPbnWuBNb6ygxNtSgou9dq1+s9/Ib5JeDNfJYF0HmcXme72xdqkRlLNd+AM1pWie
+						ww6+pTJRognTl8Kvahr9OWmF8WsmnTpktC4sKzOalchrTt+FoEJotyN/b4Eo7XI3
+						6IFsW8UkX9Fgq0A2RC99URx3eJoeJ+tBaWAkarGCvpzRt4EL9htAui+oeiRRldKV
+						VY2WlIJC6v8ay9cnqmhMwk/jhx9uyNmFIP49pFinhJiZ9MkOhJHDdVYuDmp9covj
+						YXyaBJIPeEbvHovSzcaKEwIDAQABozUwMzASBgNVHREECzAJggdzaGliMnNwMB0G
+						A1UdDgQWBBQz/l71WUEnWuQoGlxqcvps54wrbTANBgkqhkiG9w0BAQUFAAOCAQEA
+						OSvTiwxS1HnSyTRzmBtU2AL8w/IhO7XHYbMQpaaMYDSrQs8ajxDpUOjOuvXv5g+I
+						d9kncKZzuE4IJ1OmdzcsrJ0eETDjujPI0b5smxOoBWNJxl3KKKeJybpJVMFkTA0z
+						yLyymq/nf23QG76qVbUDr6GsJO2RDgX6h1OfUhBzEzGW59TQRoqKyvWqPuCNp4lU
+						os1OGZMyq8k9K5S1yIrNqmxI+TI/+aG1QXGKqGy0uhOHGEa0mClLrFBUVGEpoi2L
+						x5BCvr49YvlqB+HeIWj+ZmcF8e+8yYKceVaZ67yVFCkZMcHp/CkVY7V1hLX8mHki
+						4lcfxOKtZ+Rx/ai+73mSLQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC3DCCAcSgAwIBAgIJAJo8E70ZFlUHMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB3NoaWIyc3AwHhcNMTAwNTE3MDk0MjM5WhcNMjAwNTE0MDk0MjM5WjASMRAw
+						DgYDVQQDEwdzaGliMnNwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						wdIcqfW5diwfvyCH6wQhCg9/foLi7OgVOsxPag90eS2QTU1+AXjRpXPo7SWF8L6s
+						vPbnWuBNb6ygxNtSgou9dq1+s9/Ib5JeDNfJYF0HmcXme72xdqkRlLNd+AM1pWie
+						ww6+pTJRognTl8Kvahr9OWmF8WsmnTpktC4sKzOalchrTt+FoEJotyN/b4Eo7XI3
+						6IFsW8UkX9Fgq0A2RC99URx3eJoeJ+tBaWAkarGCvpzRt4EL9htAui+oeiRRldKV
+						VY2WlIJC6v8ay9cnqmhMwk/jhx9uyNmFIP49pFinhJiZ9MkOhJHDdVYuDmp9covj
+						YXyaBJIPeEbvHovSzcaKEwIDAQABozUwMzASBgNVHREECzAJggdzaGliMnNwMB0G
+						A1UdDgQWBBQz/l71WUEnWuQoGlxqcvps54wrbTANBgkqhkiG9w0BAQUFAAOCAQEA
+						OSvTiwxS1HnSyTRzmBtU2AL8w/IhO7XHYbMQpaaMYDSrQs8ajxDpUOjOuvXv5g+I
+						d9kncKZzuE4IJ1OmdzcsrJ0eETDjujPI0b5smxOoBWNJxl3KKKeJybpJVMFkTA0z
+						yLyymq/nf23QG76qVbUDr6GsJO2RDgX6h1OfUhBzEzGW59TQRoqKyvWqPuCNp4lU
+						os1OGZMyq8k9K5S1yIrNqmxI+TI/+aG1QXGKqGy0uhOHGEa0mClLrFBUVGEpoi2L
+						x5BCvr49YvlqB+HeIWj+ZmcF8e+8yYKceVaZ67yVFCkZMcHp/CkVY7V1hLX8mHki
+						4lcfxOKtZ+Rx/ai+73mSLQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2sp.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://shib2sp.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://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib2sp.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">Nottingham Trent University: 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:ITSShibbolethTechnical@ntu.ac.uk</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
new file mode 100644
index 00000000..acd0c702
--- /dev/null
+++ b/swamid-interfederations-2.0/shibb-idp.cymoedd.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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>
+      <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>
+						MIIDRzCCAi+gAwIBAgIULRO7ZHUs0SJDRM62ZW0iCOUY4fQwDQYJKoZIhvcNAQEF
+						BQAwIjEgMB4GA1UEAxMXc2hpYmItaWRwLmN5bW9lZGQuYWMudWswHhcNMTMxMjE4
+						MTMyNTQ2WhcNMzMxMjE4MTMyNTQ2WjAiMSAwHgYDVQQDExdzaGliYi1pZHAuY3lt
+						b2VkZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALC7lzGf
+						WahC/hN3q1zfeZNpJQHnhPrxXWw9VZ5IJ6YZtk88fKlV6dPp1SAUPS4bq0FcjJ/3
+						8Pue5g9qIFS1q9xrBnYZzmaQhNxZRyYBc7KRQW9PaxUgGZ70GzYu1hQ/dPv4J7jd
+						+Y1RjDAu/Z1WbsFFUZD3eJjmZw5OKDmQ/fWAWTMt8jMN7D8RG5Fu9/qTCpskNlPK
+						CXO8md73Khe8Gj/0lrxv46e36AtFNEaU70Gta2pGAyRmYjrqEshADb8m1swPWRgH
+						kL0bLR8VAw+QMu27wID1uE1InC4lGL7lYm3l98+2IN+pA0t2BGdBywBcpyKWGKL1
+						GC/lpoa7+tEcwxUCAwEAAaN1MHMwUgYDVR0RBEswSYIXc2hpYmItaWRwLmN5bW9l
+						ZGQuYWMudWuGLmh0dHBzOi8vc2hpYmItaWRwLmN5bW9lZGQuYWMudWsvaWRwL3No
+						aWJib2xldGgwHQYDVR0OBBYEFGV/KcZ9mmkWUCs5f8fBqJPndCu/MA0GCSqGSIb3
+						DQEBBQUAA4IBAQAVU8CEJc6dLNj3fs3Ec+hBH5YZcHHe8nMS1SZY0y8lM+os3n2/
+						7HRf3c9z1sFRNW44cAcnIpAu2nRlHrE5dk/EiL473wzZQ3vRMqbQR15FKRJvgMoH
+						AHSzhYPddx22CM/y9YDphk+LDM+DGVMmINO2Uc2BYnD3f+AefKfUuNCLvhXrY27R
+						jhEtJPVTHnkMndHjGw4cWPO0F6Ve9Ta6ztDhdfYyUrEF2lr6qD+8ujpDMl5ngI7T
+						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>
+						MIIDRzCCAi+gAwIBAgIULRO7ZHUs0SJDRM62ZW0iCOUY4fQwDQYJKoZIhvcNAQEF
+						BQAwIjEgMB4GA1UEAxMXc2hpYmItaWRwLmN5bW9lZGQuYWMudWswHhcNMTMxMjE4
+						MTMyNTQ2WhcNMzMxMjE4MTMyNTQ2WjAiMSAwHgYDVQQDExdzaGliYi1pZHAuY3lt
+						b2VkZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALC7lzGf
+						WahC/hN3q1zfeZNpJQHnhPrxXWw9VZ5IJ6YZtk88fKlV6dPp1SAUPS4bq0FcjJ/3
+						8Pue5g9qIFS1q9xrBnYZzmaQhNxZRyYBc7KRQW9PaxUgGZ70GzYu1hQ/dPv4J7jd
+						+Y1RjDAu/Z1WbsFFUZD3eJjmZw5OKDmQ/fWAWTMt8jMN7D8RG5Fu9/qTCpskNlPK
+						CXO8md73Khe8Gj/0lrxv46e36AtFNEaU70Gta2pGAyRmYjrqEshADb8m1swPWRgH
+						kL0bLR8VAw+QMu27wID1uE1InC4lGL7lYm3l98+2IN+pA0t2BGdBywBcpyKWGKL1
+						GC/lpoa7+tEcwxUCAwEAAaN1MHMwUgYDVR0RBEswSYIXc2hpYmItaWRwLmN5bW9l
+						ZGQuYWMudWuGLmh0dHBzOi8vc2hpYmItaWRwLmN5bW9lZGQuYWMudWsvaWRwL3No
+						aWJib2xldGgwHQYDVR0OBBYEFGV/KcZ9mmkWUCs5f8fBqJPndCu/MA0GCSqGSIb3
+						DQEBBQUAA4IBAQAVU8CEJc6dLNj3fs3Ec+hBH5YZcHHe8nMS1SZY0y8lM+os3n2/
+						7HRf3c9z1sFRNW44cAcnIpAu2nRlHrE5dk/EiL473wzZQ3vRMqbQR15FKRJvgMoH
+						AHSzhYPddx22CM/y9YDphk+LDM+DGVMmINO2Uc2BYnD3f+AefKfUuNCLvhXrY27R
+						jhEtJPVTHnkMndHjGw4cWPO0F6Ve9Ta6ztDhdfYyUrEF2lr6qD+8ujpDMl5ngI7T
+						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>
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
new file mode 100644
index 00000000..52fb452a
--- /dev/null
+++ b/swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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="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>
+					      MIIDODCCAiCgAwIBAgIVAPKv3AMhxdHV3jWXxqMbNKHYz0KVMA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMTE3NoaWJib3VsZXRoLmVzZW8uZnIwHhcNMTQwNTEzMTI0
+NDQ4WhcNMzQwNTEzMTI0NDQ4WjAeMRwwGgYDVQQDExNzaGliYm91bGV0aC5lc2Vv
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmCTC2H03ZXvDs4Io
+a1d+L6ggwRUqGwP45mlW5l6Nuti5JBqjDLBvP1tPqAeh1V6boPufnkd2ZquVCZDP
+1WFjLKyL015a81gLeWvJMId1yWq4+7s4s1HBFgaftNM6z6Hl/sTt1UL/dFM3DrNH
+Z1fUHe+TWGv8e60KA4DqhjdphtM+Q0dsZNVDGGp5d0zLOPhrikoZE8pqXvbOD7r/
+W9I8jWEX4RIBJkvpeBI5zpGZVRbq5LKNVaccEJW3dx9v1MyI7JQbT90hmUdBYIOl
+b+vQ5fgJCj9RlgK+tEMJsB67w2SvD7YsG3w/DqogoZBeQUgolwPKteAyKGZIh0Y2
+5pyMSQIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm91bGV0aC5lc2VvLmZyhipo
+dHRwczovL3NoaWJib3VsZXRoLmVzZW8uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFMR3J/ymlt+tWJbLpfaFrrhqC2qZMA0GCSqGSIb3DQEBBQUAA4IBAQAzJ0MU
+jZjJiOzYrQkeSkDw0kl2drKEOW1/54ANucqNSko1MQ2QXbOiL2bcgOXC8jDgOyEX
++G0QO8YdGio1CCirUVPTWSIsxpRM9nI2FbhpGk+DXe2wgPTYnJPN94kdVJrWEE/Y
+BtBvR1BzklAZ6sLrXQMWerGNHAQIyQ8+SInFpqtbB9yJuWuc9oVaoGYIm3TI2N8S
+/Uo1+w4j8jXAl7tXaUnoZ1oKW36H+0sRVhZ2Ys4eH3Vk6nvf5qHPdgUCNjh6txmf
+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://unknown.site.com</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
new file mode 100644
index 00000000..02fd9ffd
--- /dev/null
+++ b/swamid-interfederations-2.0/shibb.crous-amiens.fr-idp-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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="fr">CROUS Amiens Picardie</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDPzCCAiegAwIBAgIUWk75AksWnL8BoI7cZDfQb1ljg5cwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVc2hpYmIuY3JvdXMtYW1pZW5zLmZyMB4XDTEyMDYxOTE1
+MjQ1N1oXDTMyMDYxOTE1MjQ1N1owIDEeMBwGA1UEAxMVc2hpYmIuY3JvdXMtYW1p
+ZW5zLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Xc9nAhkLiO/
+5Q/cExGa3IiU3Mubsa8mxcpyFUb1IyYtxSByEpp1MQuyfxdcwZ0NraVqz6fo0RCT
+wrzDYD8nwFomEz24KTtJ1Iz4QkvAtIO4R+sELCHVsxDjkc4F27+SSNaw5Nd2ArQ0
+0mVexM7wlQhI9/iSu8XPKt1USrv94aGMZjyiErELkYux9y9r3DjeKqZ0Iy/o5Q0P
+eZjmLLmbQhBeDQV+8jEMy7FdTxAFjSD180ZTQs0Nr1lULpqaS0MRCKXmuVcbwG3j
+0YAA12FpSxqxytPQ5AA+nZEqmp7TjIA80Jr3bdXnZsebYh5PQiuaORuTW1HVuHhP
+8cb2nKk+tQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYi5jcm91cy1hbWllbnMu
+ZnKGLGh0dHBzOi8vc2hpYmIuY3JvdXMtYW1pZW5zLmZyL2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRM+7NkS0UwjHIAamV6UpRchDXMXjANBgkqhkiG9w0BAQUFAAOC
+AQEAVoAbZa8pL0cAwB2lI/Z4HxZ6DRJMNg/UmuaKLvA6t9E3YyPFgi/Rrd/Mfzne
+QB7E/k87akBINd4wo4YaZFD9p03wYH/1nRM+2HNGRBUIE89zUSddA5hX8n0Oe0IT
+jS+8ryJP7PxPFutpAwK7gQmjIJedhZfKb2wSW0Lr+7T5BvDJvlWw4scbtglEvGPJ
+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>
+					      MIIDPzCCAiegAwIBAgIUWk75AksWnL8BoI7cZDfQb1ljg5cwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVc2hpYmIuY3JvdXMtYW1pZW5zLmZyMB4XDTEyMDYxOTE1
+MjQ1N1oXDTMyMDYxOTE1MjQ1N1owIDEeMBwGA1UEAxMVc2hpYmIuY3JvdXMtYW1p
+ZW5zLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Xc9nAhkLiO/
+5Q/cExGa3IiU3Mubsa8mxcpyFUb1IyYtxSByEpp1MQuyfxdcwZ0NraVqz6fo0RCT
+wrzDYD8nwFomEz24KTtJ1Iz4QkvAtIO4R+sELCHVsxDjkc4F27+SSNaw5Nd2ArQ0
+0mVexM7wlQhI9/iSu8XPKt1USrv94aGMZjyiErELkYux9y9r3DjeKqZ0Iy/o5Q0P
+eZjmLLmbQhBeDQV+8jEMy7FdTxAFjSD180ZTQs0Nr1lULpqaS0MRCKXmuVcbwG3j
+0YAA12FpSxqxytPQ5AA+nZEqmp7TjIA80Jr3bdXnZsebYh5PQiuaORuTW1HVuHhP
+8cb2nKk+tQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYi5jcm91cy1hbWllbnMu
+ZnKGLGh0dHBzOi8vc2hpYmIuY3JvdXMtYW1pZW5zLmZyL2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRM+7NkS0UwjHIAamV6UpRchDXMXjANBgkqhkiG9w0BAQUFAAOC
+AQEAVoAbZa8pL0cAwB2lI/Z4HxZ6DRJMNg/UmuaKLvA6t9E3YyPFgi/Rrd/Mfzne
+QB7E/k87akBINd4wo4YaZFD9p03wYH/1nRM+2HNGRBUIE89zUSddA5hX8n0Oe0IT
+jS+8ryJP7PxPFutpAwK7gQmjIJedhZfKb2wSW0Lr+7T5BvDJvlWw4scbtglEvGPJ
+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://unknown.site.com</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
new file mode 100644
index 00000000..c43d7a45
--- /dev/null
+++ b/swamid-interfederations-2.0/shibb.hull-college.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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>
+						MIIDSzCCAjOgAwIBAgIUaojREYh1XaT0V1FbUQE451xU0T0wDQYJKoZIhvcNAQEF
+						BQAwIzEhMB8GA1UEAxMYc2hpYmIuaHVsbC1jb2xsZWdlLmFjLnVrMB4XDTEyMDcx
+						OTEzMTM1MFoXDTMyMDcxOTEzMTM1MFowIzEhMB8GA1UEAxMYc2hpYmIuaHVsbC1j
+						b2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgitW
+						1WtEbKdSdLiySMQehTDMJzDlxehSdnF2OLuqZ0uTM96o2B2IGg1tjtasFrPMIqbp
+						rjBFb3RfnLHRpB1W0jvCdHcVcDVDJIPJmxnujwo8MzwV106lVq2bdaqLe0MFnCoa
+						qXrUw3KtSwHu4+DkT0kuMTY1w91kujDEnhW5XSYM3S8bnw7TBk58sMVT4B6V4o5I
+						UfTstLtrvvV2uAi5s7NKZ6wG3CtnAR7ES28+mUtVz6G0igmf/V6MAm1bIT93+MUs
+						0kNBVxbpoyKwrdhjDXM6UsnnC+uoIwvNSSPdpc5nszWl2EYPRkSrAsBEGNyGDqiS
+						fVRdso7W1gYDdkaCvQIDAQABo3cwdTBUBgNVHREETTBLghhzaGliYi5odWxsLWNv
+						bGxlZ2UuYWMudWuGL2h0dHBzOi8vc2hpYmIuaHVsbC1jb2xsZWdlLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRBbufVWySSGAnFZn47ZezwsIEqKTANBgkq
+						hkiG9w0BAQUFAAOCAQEAULRr5dWJdGzVQyhZwMvUGtfL4XgS6jTMW99FPP5+3BoF
+						N1CPJbKXN8+b0bSSdNA9OLiY/ycevimB9pNjXaAJx+Edj04Y9LzecvgfV01wBU1A
+						ouidR8OSzpyqetIWiOhbAA9m0h8FZIWIHhbGwng4gwJVfDF8ixQWCSZTFCngmuqZ
+						ZLAhXvkTwRYoP60aCOACmjVvh8aF32WD6VDxt7NXaWpTS3BmJMx2qyGefphE4NnN
+						7o+IRgxv0/VW0v/iF5qQdz/1X8tcpEFwYCYvZdd5oN7n2AXtreVdQpzjNvgwMPm4
+						7vcAoZwF/ISCxozoxB7yb8jG71OF0Xtjmc8O0nClQA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.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.hull-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://shibb.hull-college.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.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.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.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>
+						MIIDSzCCAjOgAwIBAgIUaojREYh1XaT0V1FbUQE451xU0T0wDQYJKoZIhvcNAQEF
+						BQAwIzEhMB8GA1UEAxMYc2hpYmIuaHVsbC1jb2xsZWdlLmFjLnVrMB4XDTEyMDcx
+						OTEzMTM1MFoXDTMyMDcxOTEzMTM1MFowIzEhMB8GA1UEAxMYc2hpYmIuaHVsbC1j
+						b2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgitW
+						1WtEbKdSdLiySMQehTDMJzDlxehSdnF2OLuqZ0uTM96o2B2IGg1tjtasFrPMIqbp
+						rjBFb3RfnLHRpB1W0jvCdHcVcDVDJIPJmxnujwo8MzwV106lVq2bdaqLe0MFnCoa
+						qXrUw3KtSwHu4+DkT0kuMTY1w91kujDEnhW5XSYM3S8bnw7TBk58sMVT4B6V4o5I
+						UfTstLtrvvV2uAi5s7NKZ6wG3CtnAR7ES28+mUtVz6G0igmf/V6MAm1bIT93+MUs
+						0kNBVxbpoyKwrdhjDXM6UsnnC+uoIwvNSSPdpc5nszWl2EYPRkSrAsBEGNyGDqiS
+						fVRdso7W1gYDdkaCvQIDAQABo3cwdTBUBgNVHREETTBLghhzaGliYi5odWxsLWNv
+						bGxlZ2UuYWMudWuGL2h0dHBzOi8vc2hpYmIuaHVsbC1jb2xsZWdlLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRBbufVWySSGAnFZn47ZezwsIEqKTANBgkq
+						hkiG9w0BAQUFAAOCAQEAULRr5dWJdGzVQyhZwMvUGtfL4XgS6jTMW99FPP5+3BoF
+						N1CPJbKXN8+b0bSSdNA9OLiY/ycevimB9pNjXaAJx+Edj04Y9LzecvgfV01wBU1A
+						ouidR8OSzpyqetIWiOhbAA9m0h8FZIWIHhbGwng4gwJVfDF8ixQWCSZTFCngmuqZ
+						ZLAhXvkTwRYoP60aCOACmjVvh8aF32WD6VDxt7NXaWpTS3BmJMx2qyGefphE4NnN
+						7o+IRgxv0/VW0v/iF5qQdz/1X8tcpEFwYCYvZdd5oN7n2AXtreVdQpzjNvgwMPm4
+						7vcAoZwF/ISCxozoxB7yb8jG71OF0Xtjmc8O0nClQA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.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.hull-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">Hull College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hull College Group (Shibboleth)</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:cskerrow@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:dperry@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
new file mode 100644
index 00000000..257ae808
--- /dev/null
+++ b/swamid-interfederations-2.0/shibb.stockport.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?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>
+      <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
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAifpJBo9UYsko
+						kMULJTlBmVICnEZWWnlX3XFNf3aUtkOYW5EgGgwro1jR0irV252k/WIThep4ozjI
+						C31suuhrKVUtPggMVaP7LxXcEvO7FP2fc++yqvpUYs8h4kJylmy5J4UX6MlSqM7W
+						LcyH3SOPeQkh/XEGdsNcxphhaXHMhyCEsB5xESYyp0tMFh7bjX9+YjBMxnoWu7iz
+						Zk/+bxP2lgaQA1DayxgvhSEsvdSJkxCerjPnPrGv6f0pVN2exDCOpwsFPPQWsCIC
+						0BQnqbxqf/ONpBUCi2fJHFEqNHIh+YBfLBqSOpPqIkhAlXnAlYVfP3/oJ/zaIHoG
+						TKp2AP62pQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYi5zdG9ja3BvcnQuYWMu
+						dWuGLGh0dHBzOi8vc2hpYmIuc3RvY2twb3J0LmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MB0GA1UdDgQWBBTNA3WQ8zvZbogwr3KVdrj2DAZLlTANBgkqhkiG9w0BAQUFAAOC
+						AQEATxljwm7uXHGMCNLIFyJlpTx/TLCW7m4kP+FMhDa67Odpv3rNyu33fgtxP5lN
+						14RioV5jXaPruxMjdVw8L2v3Q4mBAOOB1qfJyIAmn+QpGvouXvh/rIOywlz9S9Ng
+						a0vc5R47wfL6Zyb548WnO6QqVgSgg8ZbsBZalcvrDLHLX+xFlltXo3x+rrfWLgf6
+						hfWNaS4qX4wFjS02bb6BaYt8dExP/MjJ93F/NnsaatHc6ez2OQSQAaHDWWBUXB/P
+						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>
+						MIIDPzCCAiegAwIBAgIUM+WxIbWXv2I74/FnfG6jjwU+Ri0wDQYJKoZIhvcNAQEF
+						BQAwIDEeMBwGA1UEAxMVc2hpYmIuc3RvY2twb3J0LmFjLnVrMB4XDTExMDUwNjE0
+						MDAyM1oXDTMxMDUwNjE0MDAyM1owIDEeMBwGA1UEAxMVc2hpYmIuc3RvY2twb3J0
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAifpJBo9UYsko
+						kMULJTlBmVICnEZWWnlX3XFNf3aUtkOYW5EgGgwro1jR0irV252k/WIThep4ozjI
+						C31suuhrKVUtPggMVaP7LxXcEvO7FP2fc++yqvpUYs8h4kJylmy5J4UX6MlSqM7W
+						LcyH3SOPeQkh/XEGdsNcxphhaXHMhyCEsB5xESYyp0tMFh7bjX9+YjBMxnoWu7iz
+						Zk/+bxP2lgaQA1DayxgvhSEsvdSJkxCerjPnPrGv6f0pVN2exDCOpwsFPPQWsCIC
+						0BQnqbxqf/ONpBUCi2fJHFEqNHIh+YBfLBqSOpPqIkhAlXnAlYVfP3/oJ/zaIHoG
+						TKp2AP62pQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYi5zdG9ja3BvcnQuYWMu
+						dWuGLGh0dHBzOi8vc2hpYmIuc3RvY2twb3J0LmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MB0GA1UdDgQWBBTNA3WQ8zvZbogwr3KVdrj2DAZLlTANBgkqhkiG9w0BAQUFAAOC
+						AQEATxljwm7uXHGMCNLIFyJlpTx/TLCW7m4kP+FMhDa67Odpv3rNyu33fgtxP5lN
+						14RioV5jXaPruxMjdVw8L2v3Q4mBAOOB1qfJyIAmn+QpGvouXvh/rIOywlz9S9Ng
+						a0vc5R47wfL6Zyb548WnO6QqVgSgg8ZbsBZalcvrDLHLX+xFlltXo3x+rrfWLgf6
+						hfWNaS4qX4wFjS02bb6BaYt8dExP/MjJ93F/NnsaatHc6ez2OQSQAaHDWWBUXB/P
+						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>
diff --git a/swamid-interfederations-2.0/shibb.ws.seemis.gov.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/shibb.ws.seemis.gov.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..84ce0a45
--- /dev/null
+++ b/swamid-interfederations-2.0/shibb.ws.seemis.gov.uk-shibboleth-sp.xml
@@ -0,0 +1,72 @@
+<?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.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>
+						MIIC1jCCAb6gAwIBAgIJANnFj5LehaRsMA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
+						BAMTBXNoaWJiMB4XDTEwMDkxMzE0MjEyMloXDTIwMDkxMDE0MjEyMlowEDEOMAwG
+						A1UEAxMFc2hpYmIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtSXC9
+						5Iq68ruXAxPoscW47pepV3+UBJne3/lJ5VxdI3n3QbmM0GfMrd3jDkS4r2BgnYF1
+						veTqa9BCCGKh5Hp6ISDo9dZ4Si/zllypDYhOmcBBbuUr/bjAj7y7hjp9Q18yHBnO
+						FmeYQIXfI5Q5gbEaTT3JCON+65nVMH3rifQvoGU9Dbxwo2INR0lmZtLBpPgeq+2i
+						Gt+FKLOOOey0ydB0eKD2qDASoqQhOKKNTvgxmWGWiXQwswRQNygLyvbnJ+pIf0GG
+						YyHCyplLkq99nEeChSx7wSjaiD9J5uUDEICJAZo6V6vqNC+DJu6Ztx4Tq1w39m0A
+						QuwgWV4d5XQTLnftAgMBAAGjMzAxMBAGA1UdEQQJMAeCBXNoaWJiMB0GA1UdDgQW
+						BBTuy95SjJcKxjwAb2d7iwYOHVJMETANBgkqhkiG9w0BAQUFAAOCAQEAOeOhi+4R
+						GhqXhKLiw8yUCOSff4x+dDfjzseeWUeBhVyYeMsAklANvDE7nlKB8gcQv9HgHaLC
+						fbo2bGQegAumPYkNBbLbHk5wMM9lcKV+h08ak54ufgY5dxdKN2YYl9EC56egzuJg
+						hTWoSRbwML5X6CGKuKMLSCiEVJXS8hmZHJl1kxmwXKAqArUhFwhfFMYxBbXnBUSV
+						gI3Rbjt43XXJJEt6BhLaLVxqmzndyabdI2u3zx6CdtvFynSPDOA/p8Rifcrfzt20
+						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>
+						MIIC1jCCAb6gAwIBAgIJANnFj5LehaRsMA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
+						BAMTBXNoaWJiMB4XDTEwMDkxMzE0MjEyMloXDTIwMDkxMDE0MjEyMlowEDEOMAwG
+						A1UEAxMFc2hpYmIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtSXC9
+						5Iq68ruXAxPoscW47pepV3+UBJne3/lJ5VxdI3n3QbmM0GfMrd3jDkS4r2BgnYF1
+						veTqa9BCCGKh5Hp6ISDo9dZ4Si/zllypDYhOmcBBbuUr/bjAj7y7hjp9Q18yHBnO
+						FmeYQIXfI5Q5gbEaTT3JCON+65nVMH3rifQvoGU9Dbxwo2INR0lmZtLBpPgeq+2i
+						Gt+FKLOOOey0ydB0eKD2qDASoqQhOKKNTvgxmWGWiXQwswRQNygLyvbnJ+pIf0GG
+						YyHCyplLkq99nEeChSx7wSjaiD9J5uUDEICJAZo6V6vqNC+DJu6Ztx4Tq1w39m0A
+						QuwgWV4d5XQTLnftAgMBAAGjMzAxMBAGA1UdEQQJMAeCBXNoaWJiMB0GA1UdDgQW
+						BBTuy95SjJcKxjwAb2d7iwYOHVJMETANBgkqhkiG9w0BAQUFAAOCAQEAOeOhi+4R
+						GhqXhKLiw8yUCOSff4x+dDfjzseeWUeBhVyYeMsAklANvDE7nlKB8gcQv9HgHaLC
+						fbo2bGQegAumPYkNBbLbHk5wMM9lcKV+h08ak54ufgY5dxdKN2YYl9EC56egzuJg
+						hTWoSRbwML5X6CGKuKMLSCiEVJXS8hmZHJl1kxmwXKAqArUhFwhfFMYxBbXnBUSV
+						gI3Rbjt43XXJJEt6BhLaLVxqmzndyabdI2u3zx6CdtvFynSPDOA/p8Rifcrfzt20
+						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.uk/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.uk/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.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SEEMIS Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:letters@seemis.gov.uk</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.uk</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
new file mode 100644
index 00000000..893074dc
--- /dev/null
+++ b/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml
@@ -0,0 +1,122 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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 height="77" width="299" xml:lang="sv">https://hj.se/webdav/images/system/gfx/logotype/hj-sv.png</mdui:Logo>
+        <mdui:Logo height="77" width="277" xml:lang="en">https://hj.se/webdav/images/system/gfx/logotype/hj-en.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>hj.se</mdui:DomainHint>
+        <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>
+MIIDGzCCAgOgAwIBAgIUB7TrKFw9b8VuoROWwTsp8hJE5oowDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMB4XDTA5MTAxMzA3MjcyNVoXDTI5
+MTAxMzA3MjcyNVowFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk5R5pnnBvG4o7SW4uekwfFNvAvGSAGUf9lOu
+f7ui6bIi2J0j4mIJXbeVdGsUbXCFUKwoJB9AfBfQm/9V3Szwxk5qHoTOFOH0Y0MS
+FCimnTUv4j2lIeab980784pyfDD2dBgMzsWmFra8JXg6Y66Ag3TXTYQOX1Bodr6W
+Lff27tYfoEiUqfL1WRE3KeH2EzVaTf53zHrMwlbAifB+jhdA7AIJw9gGpMuUpzB4
+sPR5tD/M/SUJPIz37YyGbmpI3pqGoabpvZ8bBWut4Z1EnUFtd7fIwt5UMbFc4i5/
+gUL3jKpDHO7mKfZq8BstcWkgzZ1x0HHRWZFFzfowQytvHea3ewIDAQABo18wXTA8
+BgNVHREENTAzggxzaGliYjEuaGouc2WGI2h0dHBzOi8vc2hpYmIxLmhqLnNlL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBS2nNJVvFq4dsSheCENArwBFmDmCzANBgkq
+hkiG9w0BAQUFAAOCAQEAEg326B4J0RirwToLWX/dAa5nTC2mkbzpbVnTTb06mFLp
+ZEo7uIRiucdqAFhQKN6zo0GdxRnTq+9SClFxLhiuJlG7AhnoQEVe63cyVdNcmQNs
+fkeZrOpWJvTz8tWBmhmhwgMmvUgSsJE9VGBgthyoU0W46y6sQv8/fkGz4d6ThXL1
+6BXs5VYnwyXH0q5N98XvDTOEz4u892/jdWIXVsgxipFMcnAI+Kq81w0n1leqthoK
+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>
+MIIDGzCCAgOgAwIBAgIUB7TrKFw9b8VuoROWwTsp8hJE5oowDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMB4XDTA5MTAxMzA3MjcyNVoXDTI5
+MTAxMzA3MjcyNVowFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk5R5pnnBvG4o7SW4uekwfFNvAvGSAGUf9lOu
+f7ui6bIi2J0j4mIJXbeVdGsUbXCFUKwoJB9AfBfQm/9V3Szwxk5qHoTOFOH0Y0MS
+FCimnTUv4j2lIeab980784pyfDD2dBgMzsWmFra8JXg6Y66Ag3TXTYQOX1Bodr6W
+Lff27tYfoEiUqfL1WRE3KeH2EzVaTf53zHrMwlbAifB+jhdA7AIJw9gGpMuUpzB4
+sPR5tD/M/SUJPIz37YyGbmpI3pqGoabpvZ8bBWut4Z1EnUFtd7fIwt5UMbFc4i5/
+gUL3jKpDHO7mKfZq8BstcWkgzZ1x0HHRWZFFzfowQytvHea3ewIDAQABo18wXTA8
+BgNVHREENTAzggxzaGliYjEuaGouc2WGI2h0dHBzOi8vc2hpYmIxLmhqLnNlL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBS2nNJVvFq4dsSheCENArwBFmDmCzANBgkq
+hkiG9w0BAQUFAAOCAQEAEg326B4J0RirwToLWX/dAa5nTC2mkbzpbVnTTb06mFLp
+ZEo7uIRiucdqAFhQKN6zo0GdxRnTq+9SClFxLhiuJlG7AhnoQEVe63cyVdNcmQNs
+fkeZrOpWJvTz8tWBmhmhwgMmvUgSsJE9VGBgthyoU0W46y6sQv8/fkGz4d6ThXL1
+6BXs5VYnwyXH0q5N98XvDTOEz4u892/jdWIXVsgxipFMcnAI+Kq81w0n1leqthoK
+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>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>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>helpdesk@hj.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 36 101112</md:TelephoneNumber>
+  </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
new file mode 100644
index 00000000..fdbe96cd
--- /dev/null
+++ b/swamid-interfederations-2.0/shibbo.ec-nantes.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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="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>
+					      MIIDODCCAiCgAwIBAgIVAJo2ABzrdqEuYQPEMg3AUqxh974mMA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMTE3NoaWJiby5lYy1uYW50ZXMuZnIwHhcNMDkwNjIzMTUy
+MzQ4WhcNMjkwNjIzMTUyMzQ4WjAeMRwwGgYDVQQDExNzaGliYm8uZWMtbmFudGVz
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkKdUKM4/DHJDjU4M
+wYoBAjsKU+LuXIELLk25O2l2qdHDvvXNli+i5dlCo87w+os/v7eUadHxCe+76G6b
+HiUuiMYVGuL1G27QA1AUOG1vAC0mbBIetw3ovME+LkiBwXQqTOlshYq7FaizifwX
+HGvn3qskkAHg29ZKvBsVyFka891bwvUAbiFjho+dwT/v+A4nXJWzv6vvsGw+u16m
+XhMyUpZjxGek9/7LpOjK+j9DNWn0wP9LAiEbLr3n7jguPLBBAC6f70U671Zdnf3R
+mBJkAYRe+YdpYuuVGA5/oIPZGcNb6VBYEH0wxgP+7BpiPoYUqVpiCsKc9FVuFKWG
+eZzi6wIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm8uZWMtbmFudGVzLmZyhipo
+dHRwczovL3NoaWJiby5lYy1uYW50ZXMuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFKJXfKXL/okbKTLodXy6vDPmJc8BMA0GCSqGSIb3DQEBBQUAA4IBAQBKmvA3
+m29NOTfsDcF2X2zSok+1L9aDG/EGK28kVuojf2hp3GQMpdjXQ/05CtqYtcNDNBOt
+2rcopaZQsIRdiaU/hcxT/6JUsacFrowdBbpkNxAAuZ9ZJGUwEosSL61TkX9oaaFP
+NCaSmFdeleFd7KVMhtOkDy5+BQC9tJyraO5MqPUm5Q0QwXQN84al67IlnhIg0sNc
+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://unknown.site.com</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
new file mode 100644
index 00000000..aaa1c0f9
--- /dev/null
+++ b/swamid-interfederations-2.0/shibbo.emse.fr-idp-shibboleth.xml
@@ -0,0 +1,54 @@
+<?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>
+      <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="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>
+					      MIIDIzCCAgugAwIBAgIUWG4OdOHMXs/jWUMbrVKK/qGFpQgwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOc2hpYmJvLmVtc2UuZnIwHhcNMTEwMTI1MTUxOTAzWhcN
+MzEwMTI1MTUxOTAzWjAZMRcwFQYDVQQDEw5zaGliYm8uZW1zZS5mcjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIcRRG3bC6uPGH2dcbNjJvqCvFfy3P3p
+joVSK2SVXe1rqJ/mV0PBzyAi0grECmHoCoM8p5wg6IxdOTVrtnXEf4Wfg70bMGQY
+B/3BA5mXlO5gn9sJD/xx89b+vEJdIjAo8XHLjeLXlM5Om9f69jIxgr8RvmDHFl3E
+DzeCiNLURAB10ZgwwMjukIyPoFg7Hp77NH85/hni4yG1/7e82i1eKir4IGujDk3y
+UCc3TIPxLFYEBccoupZ6NfYn7LHgeJOHZktkNjSISyU7ZWlk7xBKrYijTbZmfWBm
+QxKaaAm/vhj7JgxVUdlgickTgyUZ4wptyHENPK6CLstOEU7eZVksgE0CAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOc2hpYmJvLmVtc2UuZnKGJWh0dHBzOi8vc2hpYmJvLmVt
+c2UuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIeWYn8hGuMdpEWP1VMxfDVP
+VoIhMA0GCSqGSIb3DQEBBQUAA4IBAQBhsFzDv5g8+KI9HPYtus470fLWG6QeoPJS
+okvD3oKa25+3hfen1fUgNEg4mLmcKG1+y/Ej9u6UiJrjZeo/iHIu3VSh9KClDAal
+BRbo30th1KQ122Nhkz1Hzt0MuVprMJbVzNo3jRfTw6iFtadaVPyC1koEvn5FucTD
+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://unknown.site.com</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
new file mode 100644
index 00000000..f4b4a303
--- /dev/null
+++ b/swamid-interfederations-2.0/shibbo.enise.fr-idp-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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="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>
+					      MIIDKDCCAhCgAwIBAgIVAKRfdU8KUsLMr6sENGNF8GhmyStGMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD3NoaWJiby5lbmlzZS5mcjAeFw0xMTA1MjcwOTIxNTZa
+Fw0zMTA1MjcwOTIxNTZaMBoxGDAWBgNVBAMTD3NoaWJiby5lbmlzZS5mcjCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALvfzNxgnq/k6QzZmj7igMSW1qoa
+F1Ca593Y6+Ry+ITmjSE8hg91Y6DaSLgfVxiVPRllOLnpeZSdS9/Njq6yfUKKSKOv
+RLWUFiaNqob9Bgx3GSIZAahkmmoc0luCLY0DSK1bRzyhYUAZDe9c9diY7ljke4a2
+4jdUQZJt2T2VPQgh8Zhs97cS7r971agIob8QWyuwXNR7soWTIz7Q4ovHCOX+2jln
+g+KoMxRhXfepOmO/knp5oRnXDgVgTYpeLcUogYvn6ZUQVt0t5zsqd4I6STvS/dss
+EaTN8OY6DTHxifn3+etPf113awDeASDFukJvWkkZdyL2fSIORFIsOlRYN48CAwEA
+AaNlMGMwQgYDVR0RBDswOYIPc2hpYmJvLmVuaXNlLmZyhiZodHRwczovL3NoaWJi
+by5lbmlzZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUOnQUAUQSlpsPV4GZ
+bvoXVPrHAIAwDQYJKoZIhvcNAQEFBQADggEBAIdboPwyqZpsWeFhof+pAG78na8I
+iy+DO6p9S4JvkXn0vqozLDaFIg3KVep+0sNstXNaVDafWmbzJRxTWUUmNoVkOBbE
+mi41vE+3dxoAltau1ybtHb6/0m9LzR3FRihAVyPa4FbzqdViXv5S5OFVak6+Dqi1
+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://unknown.site.com</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>Benoit Berson</md:SurName>
+    <md:EmailAddress>berson@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
new file mode 100644
index 00000000..c6c77662
--- /dev/null
+++ b/swamid-interfederations-2.0/shibbo.ephe.fr-idp-shibboleth.xml
@@ -0,0 +1,58 @@
+<?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>
+      <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: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>
+					      MIIDJDCCAgygAwIBAgIVANOJEmB/RSq08vn3PcA/H7ukbajAMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDnNoaWJiby5lcGhlLmZyMB4XDTE0MDUxOTA4MjI1N1oX
+DTM0MDUxOTA4MjI1N1owGTEXMBUGA1UEAxMOc2hpYmJvLmVwaGUuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI4+IJOGa+cmOpJD8q9VeYqvP8ZaRA
++JmrK6SnW22qtxoxIDaVjCb8OCcrDWewdw7q6jjUsmj8nAgmV2PLGNn1RbWjWvZN
+xI/bmfa3X9EEILm644BiV2c0riLWxo0/b8tlhYQ9ys4py4zlFlrWSkhFo2Lr5i6o
+9Qrd9dHVV22TV8Gj1sKWzCx1Rf0xRENYN0AUUafOrO5P0ixBAzOq3VDs32j/xrZm
+kxv9a9h3/z3WAucP5Xrip52iuQMBFpoPV6Jg9DWUz5PF7M6Fhy7hXM+Chf/wZDmN
+aaBvi/cqo5QXvuaig+Ru4+tjRJyKkre9s5tkb7PQlFCJLmBM5ltSi+zdAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDnNoaWJiby5lcGhlLmZyhiVodHRwczovL3NoaWJiby5l
+cGhlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQi9BRR9wUI7SW85gyPxGtF
+0XBsHjANBgkqhkiG9w0BAQUFAAOCAQEAe5Mt6cKdJvYGUZchEK2KmteKL0On1KgS
+LjYx0IY8cQodPkKgPmk2+Y/ykaacjLFl+nPaklEiOVtFrGYxYLa0FngNfyOFrRGi
+bjbOwp1K3V2q3i5Ai2k7FiOSvIuFAXK4KrIW7UQVlYz3K/m6owj1O9B0+IIG+HYG
+0IBMSERU/HEGxDpkNT0UD9IzEsPzQN2Cee2EzIZRO1VYtdga9AtzLcpuTe/EVo92
+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://unknown.site.com</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
new file mode 100644
index 00000000..7528a32f
--- /dev/null
+++ b/swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml
@@ -0,0 +1,120 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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>
+MIIDHzCCAgegAwIBAgIUP6+KvKtryxxdtAf12hYO26nsSrMwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNc2hpYmJvLmx0dS5zZTAeFw0wOTEwMjcxMTUyMDNaFw0y
+OTEwMjcxMDUyMDNaMBgxFjAUBgNVBAMTDXNoaWJiby5sdHUuc2UwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZNYF4pQz13p+ghYGwBZFa/IjzXgLxpM4n
+KJ15+pCqabsxo3VJsnXgnu0monCvx7qFC+1HVfMHAj795wdq0yywGvuUiMI4ncCj
+GWi2ED3VZaZr+mpr+UW2OScWawvli/oN8vs/P1G59ykgEjtRWQ+4ndHumuHXWh7e
+3uUZA+1t/iV6EaIyaIIyDx//83skBEWDIgqZb/IVAGOFh1BUWqZBR2m6PG6ryLX/
+2opHozlbvMlWSZ1RqCmjEuCUCcgm93CS4saGZZmNt1qnt87vDY1V49Iwjin9ORr0
+PX6Ls8lUc4OWWYu+UZlOr6RTi8ravy0OOWnOJiLNnGlhgpI1MXW9AgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDXNoaWJiby5sdHUuc2WGJGh0dHBzOi8vc2hpYmJvLmx0dS5z
+ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU+e389gsAkX7kVDwQ360GaU31H50w
+DQYJKoZIhvcNAQEFBQADggEBAAO2nuaLdYOmmj2HaMe7mwRBP7T6zcmSD/HGQ3Wu
+3jqMh2Iws2OW07P+TH9I64Ok/7nzud9ZphqkR71Isq7WiFRMa90dI9PSjVuf2Bp7
+ia0JP50WEAWHivmopL7eCeBWwF06zb5XpVWmsydlIizO6akOvK1vZEsWMBlDvu7h
+iY+1cCt6dGBggGgMiiTLb5MtHZEgS2AEFgT0SXMX/xZS46mb71eFoEt+F0UlQMip
+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>
+MIIDHzCCAgegAwIBAgIUP6+KvKtryxxdtAf12hYO26nsSrMwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNc2hpYmJvLmx0dS5zZTAeFw0wOTEwMjcxMTUyMDNaFw0y
+OTEwMjcxMDUyMDNaMBgxFjAUBgNVBAMTDXNoaWJiby5sdHUuc2UwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZNYF4pQz13p+ghYGwBZFa/IjzXgLxpM4n
+KJ15+pCqabsxo3VJsnXgnu0monCvx7qFC+1HVfMHAj795wdq0yywGvuUiMI4ncCj
+GWi2ED3VZaZr+mpr+UW2OScWawvli/oN8vs/P1G59ykgEjtRWQ+4ndHumuHXWh7e
+3uUZA+1t/iV6EaIyaIIyDx//83skBEWDIgqZb/IVAGOFh1BUWqZBR2m6PG6ryLX/
+2opHozlbvMlWSZ1RqCmjEuCUCcgm93CS4saGZZmNt1qnt87vDY1V49Iwjin9ORr0
+PX6Ls8lUc4OWWYu+UZlOr6RTi8ravy0OOWnOJiLNnGlhgpI1MXW9AgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDXNoaWJiby5sdHUuc2WGJGh0dHBzOi8vc2hpYmJvLmx0dS5z
+ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU+e389gsAkX7kVDwQ360GaU31H50w
+DQYJKoZIhvcNAQEFBQADggEBAAO2nuaLdYOmmj2HaMe7mwRBP7T6zcmSD/HGQ3Wu
+3jqMh2Iws2OW07P+TH9I64Ok/7nzud9ZphqkR71Isq7WiFRMa90dI9PSjVuf2Bp7
+ia0JP50WEAWHivmopL7eCeBWwF06zb5XpVWmsydlIizO6akOvK1vZEsWMBlDvu7h
+iY+1cCt6dGBggGgMiiTLb5MtHZEgS2AEFgT0SXMX/xZS46mb71eFoEt+F0UlQMip
+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>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>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>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
new file mode 100644
index 00000000..b0abeaff
--- /dev/null
+++ b/swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml
@@ -0,0 +1,134 @@
+<?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>
+      <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>
+                        MIIEcjCCA1qgAwIBAgIRAPfZ5zaSWEpw8Vc1xSSxyNgwDQYJKoZIhvcNAQEFBQAw
+                        NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                        IFNTTCBDQTAeFw0xMjExMTMwMDAwMDBaFw0xNTExMTMyMzU5NTlaME8xCzAJBgNV
+                        BAYTAkNaMSgwJgYDVQQKEx9UZWNobmljYWwgVW5pdmVyc2l0eSBvZiBMaWJlcmVj
+                        MRYwFAYDVQQDEw1zaGliYm8udHVsLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+                        MIIBCgKCAQEArstKIJXSamcd4N0fzyZ0ViFYVCJBZZU3QKmQ25NZq6Cfrw8kH75E
+                        SioySW1H4kSzTKLze7qTOLmVYpZyq68emuK+d2vf2wm9TPLYbjC+LVJKrPiRtRHF
+                        7cCi2k5ONwENq7jnIvpq0Z+V30sC0/WfXESnjsB51/PklOa04YMwpUQDqQHsWl/8
+                        pG9fQ5G9OtzWUiYYHPbyNe3zZa1O9uUKpATKNuwtx49+b/VdNKW2voHieVG0beyE
+                        b59FR/Io4gVRevLxo2B/tkBaa8SmuTfCwyqSkkv59sywUObnN3KYmVUb8Fpmbx4X
+                        c1BJHi2wC6IqbTxWKS+e4FkqW3Snc0xNNwIDAQABo4IBYDCCAVwwHwYDVR0jBBgw
+                        FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNxZp6dM+6sOb4hhs74b
+                        sMtnL5OTMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+                        CCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoG
+                        A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+                        U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+                        dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+                        dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDXNoaWJiby50dWwu
+                        Y3owDQYJKoZIhvcNAQEFBQADggEBAKfiwyXiInmGSgBMFTEGwFsaE0opLkvDEiSp
+                        +C4namIgpNTRIb7rsp1R+C8NgQaykoQTNdMgUJO94lF8VESOdfoYjkEYZi9KWs1U
+                        9+wtdJxx0FY2NKhx2mgvF/FgTbNdUEEqW+5byWxTLXycTYe5ZIgbHgRcOupU9NKs
+                        dfl8zJKwqtOjOIm2fKE3Z8xULMvw8D6rV7dWuVFios3P4sBfkt0S5uK15mlX5lDI
+                        vZBzEWQ1L9C1GELPPMS56JYfObgJxGzcNZu+s6lXOINBoROYT/5p2mhI5xWeZWJZ
+                        zOSaicB9fW0hVsTwGJDw4hwESk9eLj3tlpyvWSYXvbf1Y06t8rw=
+                   </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>
+			MIIEcjCCA1qgAwIBAgIRAPfZ5zaSWEpw8Vc1xSSxyNgwDQYJKoZIhvcNAQEFBQAw
+			NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+			IFNTTCBDQTAeFw0xMjExMTMwMDAwMDBaFw0xNTExMTMyMzU5NTlaME8xCzAJBgNV
+			BAYTAkNaMSgwJgYDVQQKEx9UZWNobmljYWwgVW5pdmVyc2l0eSBvZiBMaWJlcmVj
+			MRYwFAYDVQQDEw1zaGliYm8udHVsLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+			MIIBCgKCAQEArstKIJXSamcd4N0fzyZ0ViFYVCJBZZU3QKmQ25NZq6Cfrw8kH75E
+			SioySW1H4kSzTKLze7qTOLmVYpZyq68emuK+d2vf2wm9TPLYbjC+LVJKrPiRtRHF
+			7cCi2k5ONwENq7jnIvpq0Z+V30sC0/WfXESnjsB51/PklOa04YMwpUQDqQHsWl/8
+			pG9fQ5G9OtzWUiYYHPbyNe3zZa1O9uUKpATKNuwtx49+b/VdNKW2voHieVG0beyE
+			b59FR/Io4gVRevLxo2B/tkBaa8SmuTfCwyqSkkv59sywUObnN3KYmVUb8Fpmbx4X
+			c1BJHi2wC6IqbTxWKS+e4FkqW3Snc0xNNwIDAQABo4IBYDCCAVwwHwYDVR0jBBgw
+			FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNxZp6dM+6sOb4hhs74b
+			sMtnL5OTMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+			CCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoG
+			A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+			U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+			dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+			dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDXNoaWJiby50dWwu
+			Y3owDQYJKoZIhvcNAQEFBQADggEBAKfiwyXiInmGSgBMFTEGwFsaE0opLkvDEiSp
+			+C4namIgpNTRIb7rsp1R+C8NgQaykoQTNdMgUJO94lF8VESOdfoYjkEYZi9KWs1U
+			9+wtdJxx0FY2NKhx2mgvF/FgTbNdUEEqW+5byWxTLXycTYe5ZIgbHgRcOupU9NKs
+			dfl8zJKwqtOjOIm2fKE3Z8xULMvw8D6rV7dWuVFios3P4sBfkt0S5uK15mlX5lDI
+			vZBzEWQ1L9C1GELPPMS56JYfObgJxGzcNZu+s6lXOINBoROYT/5p2mhI5xWeZWJZ
+			zOSaicB9fW0hVsTwGJDw4hwESk9eLj3tlpyvWSYXvbf1Y06t8rw=
+		   </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>
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
new file mode 100644
index 00000000..4b12decb
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-dev.derby.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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>
+      <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
+						aC1kZXYuZGVyYnkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDAhN9QbYsdN4nENW2bozesyzvCnPKGADL66kcw7+SIXbUcmpiLZctfG2pk8Myq
+						b42n1RQlHcQ9QXcH0DD0bJWNiiiVkBciVtY7WcfxkyTlioc8IfgncHergH0uBVfE
+						YRINrSSbss5l657QRbnbJVJ8R2c0WHS4Pw8Nm40hkbO7GqYkht/MiRL6utW2yrA5
+						ID2o/dXX7NqUr/9NUtvtczfd12reoyradlg7DkqfCHCE8S5Q8CWbj68nbZN+eEK8
+						wdiRnVmyvsC6htWN9HsnYMQAEAqQBA9KHbVsVFAdZsYlIGvjirTDD3n4TLPppfDE
+						YY5HoNYNe1nJJnXAqE/OpBJLAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWJib2xl
+						dGgtZGV2LmRlcmJ5LmFjLnVrhjFodHRwczovL3NoaWJib2xldGgtZGV2LmRlcmJ5
+						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSqUMV7MJKbA3K8FtQY5Ern
+						kVp6BzANBgkqhkiG9w0BAQUFAAOCAQEAXkonAxu78/1gNxTeBdASryyipP8T56v7
+						BptkFIG8pjymWe5JpBFANjePMUrlyYisC3qfivdEJxP51Igw+TEf/rbRL+HFElWC
+						nRgEkUmLAicNpCsDujXAw7J9ID28kcM+Ut8uQqRQs+/potj1TN4WInzjasH2R+Lw
+						yrDOv2opvCGUupfH/dkIGHNdgs0iQRRgp0rUv9OCwwWYcQazmovxHPuXd0yd7uXR
+						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>
+						MIIDVDCCAjygAwIBAgIVAIS5CSZypB0N/9WAdPoZcaHvhD9FMA0GCSqGSIb3DQEB
+						BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGgtZGV2LmRlcmJ5LmFjLnVrMB4XDTEz
+						MDYyMDExMjUxN1oXDTMzMDYyMDExMjUxN1owJTEjMCEGA1UEAxMac2hpYmJvbGV0
+						aC1kZXYuZGVyYnkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDAhN9QbYsdN4nENW2bozesyzvCnPKGADL66kcw7+SIXbUcmpiLZctfG2pk8Myq
+						b42n1RQlHcQ9QXcH0DD0bJWNiiiVkBciVtY7WcfxkyTlioc8IfgncHergH0uBVfE
+						YRINrSSbss5l657QRbnbJVJ8R2c0WHS4Pw8Nm40hkbO7GqYkht/MiRL6utW2yrA5
+						ID2o/dXX7NqUr/9NUtvtczfd12reoyradlg7DkqfCHCE8S5Q8CWbj68nbZN+eEK8
+						wdiRnVmyvsC6htWN9HsnYMQAEAqQBA9KHbVsVFAdZsYlIGvjirTDD3n4TLPppfDE
+						YY5HoNYNe1nJJnXAqE/OpBJLAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWJib2xl
+						dGgtZGV2LmRlcmJ5LmFjLnVrhjFodHRwczovL3NoaWJib2xldGgtZGV2LmRlcmJ5
+						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSqUMV7MJKbA3K8FtQY5Ern
+						kVp6BzANBgkqhkiG9w0BAQUFAAOCAQEAXkonAxu78/1gNxTeBdASryyipP8T56v7
+						BptkFIG8pjymWe5JpBFANjePMUrlyYisC3qfivdEJxP51Igw+TEf/rbRL+HFElWC
+						nRgEkUmLAicNpCsDujXAw7J9ID28kcM+Ut8uQqRQs+/potj1TN4WInzjasH2R+Lw
+						yrDOv2opvCGUupfH/dkIGHNdgs0iQRRgp0rUv9OCwwWYcQazmovxHPuXd0yd7uXR
+						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>
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
new file mode 100644
index 00000000..ed275983
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp-test.webbased.co.uk-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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>
+      <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
+						aWJib2xldGgtaWRwLXRlc3Qud2ViYmFzZWQuY28udWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCLdK52PjcXq4Ol8NM3JEzp9DoMRpuXHR8Aj30ibsVR
+						U60FWLT43hZ1Bv8oKDrk5dPu1rbRPntV8n3a77vVdEysx+/Ee3qnAib4jXBxMgST
+						9M+ShmalHppcgfAjWokVcym+75djvZalpSRZKeQF+3FrRGOOn93vpVyOWWp/Kma9
+						hiIJAA/zndFX306yCSfNlz50uts3CpWNsgrV4ZKuh5VelMPPEhz7wx0LB1Dvl+jY
+						Kd0npHNZZCwmsQPYataRG6ivOgO5MFs+lb+9dNWTqBFs9iyad24NrPrWSKcpdOix
+						FxEsisZokUFqsZdJI++Bqd2gCn+Y6JHmT5rb6djaCbTDAgMBAAGjgYwwgYkwaAYD
+						VR0RBGEwX4Iic2hpYmJvbGV0aC1pZHAtdGVzdC53ZWJiYXNlZC5jby51a4Y5aHR0
+						cHM6Ly9zaGliYm9sZXRoLWlkcC10ZXN0LndlYmJhc2VkLmNvLnVrL2lkcC9zaGli
+						Ym9sZXRoMB0GA1UdDgQWBBQHkqpcIbQGn1UX9UfHYM+wlpwvODANBgkqhkiG9w0B
+						AQUFAAOCAQEAhcdcLi+i56v9SuXTG9ejuPQE0dGJHfYKyMCWlae8ogjJgjqZ0IE+
+						6ujWQbp0RO8awbbNd/z8jdC3yxG3+Ql8vKUEaF1brIzM3HSs4HSe823bArArCIyJ
+						gwVdLzFEOlP2joNaVF2FU/8pqqZMQZaj3PQoDe5pBiVCYMxl2w+s0Jl58BexEA5q
+						zQlggw4Sx2/53VlcvWHqThdnSyFcZdnzCNHKstZ74Ck9k3cCklVflVfJu3owPlGB
+						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>
+						MIIDdTCCAl2gAwIBAgIUU54vEjtKOOABUhSxZsk0VE1MwU0wDQYJKoZIhvcNAQEF
+						BQAwLTErMCkGA1UEAxMic2hpYmJvbGV0aC1pZHAtdGVzdC53ZWJiYXNlZC5jby51
+						azAeFw0xMDA3MjAwODMzNDRaFw0zMDA3MjAwODMzNDRaMC0xKzApBgNVBAMTInNo
+						aWJib2xldGgtaWRwLXRlc3Qud2ViYmFzZWQuY28udWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCLdK52PjcXq4Ol8NM3JEzp9DoMRpuXHR8Aj30ibsVR
+						U60FWLT43hZ1Bv8oKDrk5dPu1rbRPntV8n3a77vVdEysx+/Ee3qnAib4jXBxMgST
+						9M+ShmalHppcgfAjWokVcym+75djvZalpSRZKeQF+3FrRGOOn93vpVyOWWp/Kma9
+						hiIJAA/zndFX306yCSfNlz50uts3CpWNsgrV4ZKuh5VelMPPEhz7wx0LB1Dvl+jY
+						Kd0npHNZZCwmsQPYataRG6ivOgO5MFs+lb+9dNWTqBFs9iyad24NrPrWSKcpdOix
+						FxEsisZokUFqsZdJI++Bqd2gCn+Y6JHmT5rb6djaCbTDAgMBAAGjgYwwgYkwaAYD
+						VR0RBGEwX4Iic2hpYmJvbGV0aC1pZHAtdGVzdC53ZWJiYXNlZC5jby51a4Y5aHR0
+						cHM6Ly9zaGliYm9sZXRoLWlkcC10ZXN0LndlYmJhc2VkLmNvLnVrL2lkcC9zaGli
+						Ym9sZXRoMB0GA1UdDgQWBBQHkqpcIbQGn1UX9UfHYM+wlpwvODANBgkqhkiG9w0B
+						AQUFAAOCAQEAhcdcLi+i56v9SuXTG9ejuPQE0dGJHfYKyMCWlae8ogjJgjqZ0IE+
+						6ujWQbp0RO8awbbNd/z8jdC3yxG3+Ql8vKUEaF1brIzM3HSs4HSe823bArArCIyJ
+						gwVdLzFEOlP2joNaVF2FU/8pqqZMQZaj3PQoDe5pBiVCYMxl2w+s0Jl58BexEA5q
+						zQlggw4Sx2/53VlcvWHqThdnSyFcZdnzCNHKstZ74Ck9k3cCklVflVfJu3owPlGB
+						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>
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
new file mode 100644
index 00000000..5fc52875
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.admin.furness.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						aGliYm9sZXRoLWlkcC5hZG1pbi5mdXJuZXNzLmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAjXzSa0XZ09tmjgj707vH8G0c/8tQzEMLaCM0Ro3o
+						YElCAtaGAOXZU4H727e70sJE5lsyjVfvcazQUciEKSUMkpVLNUWrxBK7CHz7Y5v8
+						fjZ/EI8trVar9lKy897qNQ/bn2Afjo3I+lxpTHLG1vr6ITkDe1mtBtK4JR1Z6Ile
+						RhPcfuuodAnAKTrqUKKkzwdU93lv8zQlcry2KQXHCogR5zmSBD+tWLJ+xEuNlg1e
+						GNVGd8fxPKq4JuNgBp+RFgVD+syo4atfM1vFRQ5OpLPAQhqepi5DTRSYhnlpmZ4O
+						A39LqmIHNFiHLTnl3gXYwjrRbmB+8FizX+xJlHLm+ot06wIDAQABo4GMMIGJMGgG
+						A1UdEQRhMF+CInNoaWJib2xldGgtaWRwLmFkbWluLmZ1cm5lc3MuYWMudWuGOWh0
+						dHBzOi8vc2hpYmJvbGV0aC1pZHAuYWRtaW4uZnVybmVzcy5hYy51ay9pZHAvc2hp
+						YmJvbGV0aDAdBgNVHQ4EFgQUnVQpK7QZsa33ZUV9YeeadKMUBScwDQYJKoZIhvcN
+						AQEFBQADggEBADsc9RB178Iytf4OpvflGmaYZSNppreZ/RfUpASOLqXUmvk7nTdO
+						Xw7boB4N1hRj6qTNiAHsxvbSu5je9WzU6j7KSg4tvHo2x+UzvIBqiwFbO7o+BrWf
+						BrYava5ZGwylfPUgyyN1Y66GqtFAso4bHEf5VyzT6ASKYS8v5WOrza/8cSOIjW6q
+						jvZuFG9kOofHYbc+fAN/kuemGV3ihFTphEwivQAOV5houX2LonzDn+o6DtpBYyew
+						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>
+						MIIDdjCCAl6gAwIBAgIVALs/YE9npCxW3z5NMlKyKk2qevJIMA0GCSqGSIb3DQEB
+						BQUAMC0xKzApBgNVBAMTInNoaWJib2xldGgtaWRwLmFkbWluLmZ1cm5lc3MuYWMu
+						dWswHhcNMTQwNTIxMDk1NzUxWhcNMzQwNTIxMDk1NzUxWjAtMSswKQYDVQQDEyJz
+						aGliYm9sZXRoLWlkcC5hZG1pbi5mdXJuZXNzLmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAjXzSa0XZ09tmjgj707vH8G0c/8tQzEMLaCM0Ro3o
+						YElCAtaGAOXZU4H727e70sJE5lsyjVfvcazQUciEKSUMkpVLNUWrxBK7CHz7Y5v8
+						fjZ/EI8trVar9lKy897qNQ/bn2Afjo3I+lxpTHLG1vr6ITkDe1mtBtK4JR1Z6Ile
+						RhPcfuuodAnAKTrqUKKkzwdU93lv8zQlcry2KQXHCogR5zmSBD+tWLJ+xEuNlg1e
+						GNVGd8fxPKq4JuNgBp+RFgVD+syo4atfM1vFRQ5OpLPAQhqepi5DTRSYhnlpmZ4O
+						A39LqmIHNFiHLTnl3gXYwjrRbmB+8FizX+xJlHLm+ot06wIDAQABo4GMMIGJMGgG
+						A1UdEQRhMF+CInNoaWJib2xldGgtaWRwLmFkbWluLmZ1cm5lc3MuYWMudWuGOWh0
+						dHBzOi8vc2hpYmJvbGV0aC1pZHAuYWRtaW4uZnVybmVzcy5hYy51ay9pZHAvc2hp
+						YmJvbGV0aDAdBgNVHQ4EFgQUnVQpK7QZsa33ZUV9YeeadKMUBScwDQYJKoZIhvcN
+						AQEFBQADggEBADsc9RB178Iytf4OpvflGmaYZSNppreZ/RfUpASOLqXUmvk7nTdO
+						Xw7boB4N1hRj6qTNiAHsxvbSu5je9WzU6j7KSg4tvHo2x+UzvIBqiwFbO7o+BrWf
+						BrYava5ZGwylfPUgyyN1Y66GqtFAso4bHEf5VyzT6ASKYS8v5WOrza/8cSOIjW6q
+						jvZuFG9kOofHYbc+fAN/kuemGV3ihFTphEwivQAOV5houX2LonzDn+o6DtpBYyew
+						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>
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
new file mode 100644
index 00000000..65003d43
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.don.ac.uk-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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>
+      <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>
+						MIIEsjCCA5qgAwIBAgIQJXdh9qnY6REO/Zy3Td93GDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDUyMTAwMDAwMFoXDTE1MDUyMTIzNTk1OVowgY8xCzAJBgNV
+						BAYTAkdCMRgwFgYDVQQIEw9Tb3V0aCBZb3Jrc2hpcmUxEjAQBgNVBAcTCURvbmNh
+						c3RlcjEaMBgGA1UEChMRRG9uY2FzdGVyIENvbGxlZ2UxHjAcBgNVBAsTFUNvcnBv
+						cmF0ZSBJVCBTZXJ2aWNlczEWMBQGA1UEAxMNaWRwLmRvbi5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAOExJKNwk9FG5VM2l8PxFFSn+rxJoHDz
+						xPi+V34Yp5vSaEUdSB3X99jY3SAHGs6dQv+Lo1cN56bdKz4sbozhCI27keRtE5FS
+						bkKYTgYgzemovXfyNi4S1orDiuYRtU++tWyvaaX3vn9BjFgv6BrUUB5WSjmcpJDw
+						Slsgg/v1ypI37keCSFbsJjCzKtEob2EyYp87mKtoFYtBC8g5XN6IbhrXh62kjiO0
+						79kJ6Nv1MdB5AbiiZByI52N6HLBaHsR7JcBYRlkGiLYD/yz0pp1exnFXbhmJuxz4
+						12C4nwkbj7ohoKFiqrRDiEQngcGaocuKVzdMeUm6hvBY8AlwOsBLYWkCAwEAAaOC
+						AWAwggFcMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQW
+						BBQ/E3x/Zf39MX7MOTyLGbBmeu4fQjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/
+						BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzAN
+						BgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50
+						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYB
+						BQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0
+						MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAYBgNVHREE
+						ETAPgg1pZHAuZG9uLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBjSCq267eB5uFW
+						U+T2FM6mEMtpDj9CEd1T5/3MsHjCZL0SGFq/EjEdVefEQmgLK1JWGvDHVWezO/q6
+						XCCzaxzcEYEx+yoSiLPh/XXwalQe9q5ACm3Q4YhgOkrbwnnYoov1Kke6mgGfc6t5
+						XnU5IFx5jO7+zCmrrxwhBCXts1NJxWPGtASOrE6nuKgLhqlAifxm8cD43oX8CGPf
+						DOiKhq+GtE1AGngBM3oaz212VOm57O4mptjzUomhK993ErLWbNgj0fv0MbAXTt2X
+						kyXiO13V3QS/aGG3burxjKwiFa7jOzuOmqKuDhhUUNMZUggc7ANqyjQ6N6wkEQjn
+						tY2MO8Vk
+					</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>
+						MIIEsjCCA5qgAwIBAgIQJXdh9qnY6REO/Zy3Td93GDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDUyMTAwMDAwMFoXDTE1MDUyMTIzNTk1OVowgY8xCzAJBgNV
+						BAYTAkdCMRgwFgYDVQQIEw9Tb3V0aCBZb3Jrc2hpcmUxEjAQBgNVBAcTCURvbmNh
+						c3RlcjEaMBgGA1UEChMRRG9uY2FzdGVyIENvbGxlZ2UxHjAcBgNVBAsTFUNvcnBv
+						cmF0ZSBJVCBTZXJ2aWNlczEWMBQGA1UEAxMNaWRwLmRvbi5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAOExJKNwk9FG5VM2l8PxFFSn+rxJoHDz
+						xPi+V34Yp5vSaEUdSB3X99jY3SAHGs6dQv+Lo1cN56bdKz4sbozhCI27keRtE5FS
+						bkKYTgYgzemovXfyNi4S1orDiuYRtU++tWyvaaX3vn9BjFgv6BrUUB5WSjmcpJDw
+						Slsgg/v1ypI37keCSFbsJjCzKtEob2EyYp87mKtoFYtBC8g5XN6IbhrXh62kjiO0
+						79kJ6Nv1MdB5AbiiZByI52N6HLBaHsR7JcBYRlkGiLYD/yz0pp1exnFXbhmJuxz4
+						12C4nwkbj7ohoKFiqrRDiEQngcGaocuKVzdMeUm6hvBY8AlwOsBLYWkCAwEAAaOC
+						AWAwggFcMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQW
+						BBQ/E3x/Zf39MX7MOTyLGbBmeu4fQjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/
+						BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzAN
+						BgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50
+						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYB
+						BQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0
+						MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAYBgNVHREE
+						ETAPgg1pZHAuZG9uLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBjSCq267eB5uFW
+						U+T2FM6mEMtpDj9CEd1T5/3MsHjCZL0SGFq/EjEdVefEQmgLK1JWGvDHVWezO/q6
+						XCCzaxzcEYEx+yoSiLPh/XXwalQe9q5ACm3Q4YhgOkrbwnnYoov1Kke6mgGfc6t5
+						XnU5IFx5jO7+zCmrrxwhBCXts1NJxWPGtASOrE6nuKgLhqlAifxm8cD43oX8CGPf
+						DOiKhq+GtE1AGngBM3oaz212VOm57O4mptjzUomhK993ErLWbNgj0fv0MbAXTt2X
+						kyXiO13V3QS/aGG3burxjKwiFa7jOzuOmqKuDhhUUNMZUggc7ANqyjQ6N6wkEQjn
+						tY2MO8Vk
+					</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>
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
new file mode 100644
index 00000000..c819515c
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxLTArBgNVBAoTJFVGViAtIFVu
+aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UECxMrRFRJIC0gRGly
+ZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
+ARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYDVQQIEwxNaW5hcyBH
+ZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9sZXRoLWlkcC5kdGku
+dWZ2LmJyMB4XDTE0MDQxNDExMzc1N1oXDTE5MDQxMzExMzc1N1owgdkxLTArBgNV
+BAoTJFVGViAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UE
+CxMrRFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZ
+MBcGCSqGSIb3DQEJARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYD
+VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9s
+ZXRoLWlkcC5kdGkudWZ2LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAwHXw5lxhsUVVy9cHSvvnkanv1HyyMZz6lmeY76rh79I2bopDPgZlbdHnTAYn
+8vDrHts9RZOOOUXHYsJR2D0jm4lcVRxczZD5P4qDLpYp28kY3OfsOQ9TMZJ8HmnN
+RyjAmR8CofBG1ZHN2xi7tWqMI4HVEJfZw/ZvSWfX4eNBQsvv5oTa1v5eOw1YQQ6A
+aHB6p/Xp7tccGX0+OgTVty2Bq20xEZNBJeJtz2SBYxbiRUE+vaiYTyCJVxDeyNcN
+YIkiOUCUu2pEvgFciuzjhlG7UuUsq7S19HqOEjtUiqdH72gDRGvLNRhwpQ+u22vd
+WBOsXDXZeHB/5MfcOQImtgkYUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCm0AKL
+BmP26xPlCqtrHLg2jUVBieOXLlF9hwc9TT6XQe1oMFHNaYYTEuw6/5To0xBkAWEl
+DrxKfa2qriSd6HBbn33RlWGpkfbMTqI52EgKvq+aUqcHjZfEQIKzdMA+ROIRdNgh
+j5pN94R1x14OARIvBnoYUXTDr/RajPVTs44HPmIKFviSVtkEC0o2pxt44/z1/jcq
+9gDbQO3dHyy+s3Twv7TBBPSECaFM8h3hescyO8I5bU4HJ1SrfjwwOX3jA+f6/U7f
+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>
+      
+MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxLTArBgNVBAoTJFVGViAtIFVu
+aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UECxMrRFRJIC0gRGly
+ZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
+ARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYDVQQIEwxNaW5hcyBH
+ZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9sZXRoLWlkcC5kdGku
+dWZ2LmJyMB4XDTE0MDQxNDExMzc1N1oXDTE5MDQxMzExMzc1N1owgdkxLTArBgNV
+BAoTJFVGViAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UE
+CxMrRFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZ
+MBcGCSqGSIb3DQEJARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYD
+VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9s
+ZXRoLWlkcC5kdGkudWZ2LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAwHXw5lxhsUVVy9cHSvvnkanv1HyyMZz6lmeY76rh79I2bopDPgZlbdHnTAYn
+8vDrHts9RZOOOUXHYsJR2D0jm4lcVRxczZD5P4qDLpYp28kY3OfsOQ9TMZJ8HmnN
+RyjAmR8CofBG1ZHN2xi7tWqMI4HVEJfZw/ZvSWfX4eNBQsvv5oTa1v5eOw1YQQ6A
+aHB6p/Xp7tccGX0+OgTVty2Bq20xEZNBJeJtz2SBYxbiRUE+vaiYTyCJVxDeyNcN
+YIkiOUCUu2pEvgFciuzjhlG7UuUsq7S19HqOEjtUiqdH72gDRGvLNRhwpQ+u22vd
+WBOsXDXZeHB/5MfcOQImtgkYUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCm0AKL
+BmP26xPlCqtrHLg2jUVBieOXLlF9hwc9TT6XQe1oMFHNaYYTEuw6/5To0xBkAWEl
+DrxKfa2qriSd6HBbn33RlWGpkfbMTqI52EgKvq+aUqcHjZfEQIKzdMA+ROIRdNgh
+j5pN94R1x14OARIvBnoYUXTDr/RajPVTs44HPmIKFviSVtkEC0o2pxt44/z1/jcq
+9gDbQO3dHyy+s3Twv7TBBPSECaFM8h3hescyO8I5bU4HJ1SrfjwwOX3jA+f6/U7f
+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>
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
new file mode 100644
index 00000000..2d984dc5
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml
@@ -0,0 +1,150 @@
+<?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>
+      <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://www.gwdg.de/fileadmin/images/favicon.ico</mdui:Logo>
+        <mdui:Logo height="72" width="240">https://www.gwdg.de/fileadmin/images/neu/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>MIIGCTCCBPGgAwIBAgIHF4B1oKcqfjANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
+RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
+IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
+IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTQwNDMwMTMx
+ODA4WhcNMTkwMjI3MDAwMDAwWjCBmzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5J
+RURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xPjA8BgNVBAoTNUdlc2Vs
+bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
+MR8wHQYDVQQDExZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA5YEqdBFXQNiRNJSWaVBGzqEh5Tu8c0UU/9OzzDt2
+CnYc4GVPoXcecHnUlvDZWlt9pABpVQ6cey1sjM45RO4XDSjNaWUjz1cv9qsIYj8w
+i3sZfAnbc3657E2Sloh6oCNpaS5m6mHimdQc+s7qNYF+Z8jzu60y9KOPVoX1Cggz
+Usr6cVjpBjxfx8Hd9ZmZWdXPiHApyEU963KSpf+Vkwgh8P0S/2DftW8huQbCk5Wj
+nhU5C/oUGuZBHfKgV6C3P9RA+oy4J0pnJUvzvnwRxT6CH5dk5C7my6clf3M8d9AR
+FhPwt2RxaGHGL6R5JOkHfYtvAqVcs7/mjAPsFgADSW2OJwIDAQABo4ICLjCCAiow
+OQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMB
+MAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
+BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFC8ZqXogv+bpEvXmgZrx6XAEeVUG
+MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMC8GA1UdEQQoMCaCFnNo
+aWJib2xldGgtaWRwLmd3ZGcuZGWBDHNoaWJAZ3dkZy5kZTB5BgNVHR8EcjBwMDag
+NKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNy
+bC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDCByQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0
+dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcw
+AoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2Fj
+ZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2Rn
+LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAKK8w
+/Ytq3kzSvek5YglcbnEsa1JFfwxi6z/6l0p+xYB4nAVDWT15f0xLAh/9TRbEagIb
+eAuNmJiL70ONTY2WXph9d2jUwDsRSR9vg1PDbfux8TvEkgZSh2dVewNsUrHw/9gg
+8uGbaIiaKNaVFi58Z4Jx4gCWpJ0p1wdAb6/JurbR0DhtUPWwLFXpEewfTXD9sZEW
+YGsmOqBm6mBudDrpWoxmEougvsI2JgsTV3XaZdVfCi3vuhgUA3IbPt9nVoDbG2E1
+2C0rxeNaWUqzXpReVgkf3qmqvf9Pl+BwQM5Ua5RHHyI4zoP1KaPExje9CuigkVnz
+0k8KqBoqgDYGCrwSLQ==
+</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>MIIGCTCCBPGgAwIBAgIHF4B1oKcqfjANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
+RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
+IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
+IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTQwNDMwMTMx
+ODA4WhcNMTkwMjI3MDAwMDAwWjCBmzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5J
+RURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xPjA8BgNVBAoTNUdlc2Vs
+bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
+MR8wHQYDVQQDExZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA5YEqdBFXQNiRNJSWaVBGzqEh5Tu8c0UU/9OzzDt2
+CnYc4GVPoXcecHnUlvDZWlt9pABpVQ6cey1sjM45RO4XDSjNaWUjz1cv9qsIYj8w
+i3sZfAnbc3657E2Sloh6oCNpaS5m6mHimdQc+s7qNYF+Z8jzu60y9KOPVoX1Cggz
+Usr6cVjpBjxfx8Hd9ZmZWdXPiHApyEU963KSpf+Vkwgh8P0S/2DftW8huQbCk5Wj
+nhU5C/oUGuZBHfKgV6C3P9RA+oy4J0pnJUvzvnwRxT6CH5dk5C7my6clf3M8d9AR
+FhPwt2RxaGHGL6R5JOkHfYtvAqVcs7/mjAPsFgADSW2OJwIDAQABo4ICLjCCAiow
+OQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMB
+MAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
+BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFC8ZqXogv+bpEvXmgZrx6XAEeVUG
+MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMC8GA1UdEQQoMCaCFnNo
+aWJib2xldGgtaWRwLmd3ZGcuZGWBDHNoaWJAZ3dkZy5kZTB5BgNVHR8EcjBwMDag
+NKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNy
+bC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDCByQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0
+dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcw
+AoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2Fj
+ZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2Rn
+LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAKK8w
+/Ytq3kzSvek5YglcbnEsa1JFfwxi6z/6l0p+xYB4nAVDWT15f0xLAh/9TRbEagIb
+eAuNmJiL70ONTY2WXph9d2jUwDsRSR9vg1PDbfux8TvEkgZSh2dVewNsUrHw/9gg
+8uGbaIiaKNaVFi58Z4Jx4gCWpJ0p1wdAb6/JurbR0DhtUPWwLFXpEewfTXD9sZEW
+YGsmOqBm6mBudDrpWoxmEougvsI2JgsTV3XaZdVfCi3vuhgUA3IbPt9nVoDbG2E1
+2C0rxeNaWUqzXpReVgkf3qmqvf9Pl+BwQM5Ua5RHHyI4zoP1KaPExje9CuigkVnz
+0k8KqBoqgDYGCrwSLQ==
+</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>
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
new file mode 100644
index 00000000..00ffc40d
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml
@@ -0,0 +1,144 @@
+<?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>
+      <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>MIIFlTCCBH2gAwIBAgIHF4B2l7InVDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDA0MzAx
+MzIyMTVaFw0xOTA0MjkxMzIyMTVaMIGKMQswCQYDVQQGEwJERTEWMBQGA1UECBMN
+TmllZGVyc2FjaHNlbjETMBEGA1UEBxMKR29ldHRpbmdlbjEgMB4GA1UEChMXTWF4
+LVBsYW5jay1HZXNlbGxzY2hhZnQxDDAKBgNVBAsTA1BLSTEeMBwGA1UEAxMVc2hp
+YmJvbGV0aC1pZHAubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEArolAQS1UWd9cHm/XD91J6m3yhQHIzNcHyAPHyPsF4Z/M5+2g4hlSSIPrHYSc
+HI2PSF7DpttiBfTMim2yq7GFCBdJHtZZP0i5Ajk2KuyM4oHHxANYaBzAPiClYbOb
+0oO0hENluVnIBiTkgcfmmFrEXiiA7ltjyONOmSRdEeIdbDUm704NI5d0S6OJ0J+5
+01NLXyHwMLdiLa7dOIjINY9wMJVOhgotYb0HodCfZUF4vuuvkw/JEWK2xEigvTD9
+aIJXdwdpcrx7DgkBbNto+fNPV2evJHHUy++QPbiNG2/2QajLnUAIAgQQsAfZX7zT
+xN2UW9V2dKXIykA621NzSOp8bwIDAQABo4ICKTCCAiUwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFP4tPNkQOhz1sk/77Ft0aqscEojMMB8GA1UdIwQYMBaAFALW
+Hm4Jq79YZacKPEgzYdHOfcNbMC4GA1UdEQQnMCWCFXNoaWJib2xldGgtaWRwLm1w
+Zy5kZYEMc2hpYkBnd2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
+KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
+ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
+hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBACneffiJgzK7uq8KZEhT3Qh1YA8EoPHD
+z5pigbg1F2IjuRozsxx2MPIHbzvuuXgXLhCNfxw4kepXammx0aYKFQJfhL9/O8Xo
+/KusssOTqTOM5tPJ6w5irVthTIAodch2St9DmF6YV4LfOnXPdKNKAz+LMOfl80ua
+tB/B2fjfaQGqTZY70RctOsS3SdOPub29OqAPS3xYT/dCZd3CSP4E6pjpqFKWDz0w
+LmveeJ9FG98fbaN0wbBh6abViYIfyeednJGp6efTra9aHjdxlGyExBnGjeAbi7iK
+tfyPYfYMvj1QxW+/LOG5aWb/RlyNQG90t+E7Ydh7zj03deDYQk4u3wM=
+</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>MIIFlTCCBH2gAwIBAgIHF4B2l7InVDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDA0MzAx
+MzIyMTVaFw0xOTA0MjkxMzIyMTVaMIGKMQswCQYDVQQGEwJERTEWMBQGA1UECBMN
+TmllZGVyc2FjaHNlbjETMBEGA1UEBxMKR29ldHRpbmdlbjEgMB4GA1UEChMXTWF4
+LVBsYW5jay1HZXNlbGxzY2hhZnQxDDAKBgNVBAsTA1BLSTEeMBwGA1UEAxMVc2hp
+YmJvbGV0aC1pZHAubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEArolAQS1UWd9cHm/XD91J6m3yhQHIzNcHyAPHyPsF4Z/M5+2g4hlSSIPrHYSc
+HI2PSF7DpttiBfTMim2yq7GFCBdJHtZZP0i5Ajk2KuyM4oHHxANYaBzAPiClYbOb
+0oO0hENluVnIBiTkgcfmmFrEXiiA7ltjyONOmSRdEeIdbDUm704NI5d0S6OJ0J+5
+01NLXyHwMLdiLa7dOIjINY9wMJVOhgotYb0HodCfZUF4vuuvkw/JEWK2xEigvTD9
+aIJXdwdpcrx7DgkBbNto+fNPV2evJHHUy++QPbiNG2/2QajLnUAIAgQQsAfZX7zT
+xN2UW9V2dKXIykA621NzSOp8bwIDAQABo4ICKTCCAiUwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFP4tPNkQOhz1sk/77Ft0aqscEojMMB8GA1UdIwQYMBaAFALW
+Hm4Jq79YZacKPEgzYdHOfcNbMC4GA1UdEQQnMCWCFXNoaWJib2xldGgtaWRwLm1w
+Zy5kZYEMc2hpYkBnd2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
+KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
+ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
+hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBACneffiJgzK7uq8KZEhT3Qh1YA8EoPHD
+z5pigbg1F2IjuRozsxx2MPIHbzvuuXgXLhCNfxw4kepXammx0aYKFQJfhL9/O8Xo
+/KusssOTqTOM5tPJ6w5irVthTIAodch2St9DmF6YV4LfOnXPdKNKAz+LMOfl80ua
+tB/B2fjfaQGqTZY70RctOsS3SdOPub29OqAPS3xYT/dCZd3CSP4E6pjpqFKWDz0w
+LmveeJ9FG98fbaN0wbBh6abViYIfyeednJGp6efTra9aHjdxlGyExBnGjeAbi7iK
+tfyPYfYMvj1QxW+/LOG5aWb/RlyNQG90t+E7Ydh7zj03deDYQk4u3wM=
+</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>
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
new file mode 100644
index 00000000..9eddfa7a
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.pucrs.br-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIC6jCCAdICAQAwDQYJKoZIhvcNAQEFBQAwOzEKMAgGA1UECxMBIDELMAkGA1UE
+BhMCQlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMB4XDTE0MDkw
+MzE2NTAyNloXDTE5MDkwMjE2NTAyNlowOzEKMAgGA1UECxMBIDELMAkGA1UEBhMC
+QlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1iilPh8rOxBD8ceqrAb8KcN3WRX6V8CtSEs8
+GBAKjDt9nRYpFavkJcW6w6+w6ZJz1KlJndy6sgleGjsXR1za5nK3gKe3nvWJwkIm
+qNX/nAjBegCnvxq8VSJ4VspLYZQYoTIbAiGvSs7pP++/7OBimb424JHU+16+ceqG
+F75C9tXeA3vOJzHS/bLgxhRwyhhug25DHkTl8wVDuCU0q/P8Y0D6sLEXaYFb2jl0
+piXWK7dz/5LhX2AyyKtrYlQEzgndR/SkANY5iIFiXqJ7/q5tQTOQQN4aeb9YEQJa
+NWJfoa4co8LTmHki6KQvPCmtaBBAjSU7kk9s3+mXJL8lgtRI6QIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQDRcEBWeU30bZBS/mtcDGdhsbxjLmd1IhHAio/iuHrVvfv6
+0RJv9BtOokGbtsGLInxH/HEqUAm7+I3lm2UH/ah5oSEreumLPpNnGwtqsK+z/oN3
+we03FEd0WUl8GkMsLapmbaQ/NlP8oQDVWTjfYsrUSak42uW8LZ88OUz30NHhYFwo
+2UCXamrmbHrnlCKZFKjWypn2GCwPMZ+liM1Yfxdlp6yVzgTDKpAI8fU/bEwgc3V4
+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>
+      
+MIIC6jCCAdICAQAwDQYJKoZIhvcNAQEFBQAwOzEKMAgGA1UECxMBIDELMAkGA1UE
+BhMCQlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMB4XDTE0MDkw
+MzE2NTAyNloXDTE5MDkwMjE2NTAyNlowOzEKMAgGA1UECxMBIDELMAkGA1UEBhMC
+QlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1iilPh8rOxBD8ceqrAb8KcN3WRX6V8CtSEs8
+GBAKjDt9nRYpFavkJcW6w6+w6ZJz1KlJndy6sgleGjsXR1za5nK3gKe3nvWJwkIm
+qNX/nAjBegCnvxq8VSJ4VspLYZQYoTIbAiGvSs7pP++/7OBimb424JHU+16+ceqG
+F75C9tXeA3vOJzHS/bLgxhRwyhhug25DHkTl8wVDuCU0q/P8Y0D6sLEXaYFb2jl0
+piXWK7dz/5LhX2AyyKtrYlQEzgndR/SkANY5iIFiXqJ7/q5tQTOQQN4aeb9YEQJa
+NWJfoa4co8LTmHki6KQvPCmtaBBAjSU7kk9s3+mXJL8lgtRI6QIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQDRcEBWeU30bZBS/mtcDGdhsbxjLmd1IhHAio/iuHrVvfv6
+0RJv9BtOokGbtsGLInxH/HEqUAm7+I3lm2UH/ah5oSEreumLPpNnGwtqsK+z/oN3
+we03FEd0WUl8GkMsLapmbaQ/NlP8oQDVWTjfYsrUSak42uW8LZ88OUz30NHhYFwo
+2UCXamrmbHrnlCKZFKjWypn2GCwPMZ+liM1Yfxdlp6yVzgTDKpAI8fU/bEwgc3V4
+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>
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
new file mode 100644
index 00000000..92ff1438
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml
@@ -0,0 +1,150 @@
+<?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>
+      <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>MIIGKjCCBRKgAwIBAgIHF4B3Y7hUSjANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MzAxMzI1MzlaFw0xOTA0Mjkx
+MzI1MzlaMIGUMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMSkwJwYDVQQDEyBzaGliYm9sZXRoLWlkcC51bmkt
+Z29ldHRpbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKaY
+OIuBhaYLZU4M7a9+ut9NChZQiFVxbIJ3jZPMMjtiulx5f6zLDK43QUI4G6MBy6l0
+EEToRvIP2Y39COyDFrJO6Bgk+gIfHvHpogXBZiOk7Nf4PbtV9Mi9uffE/B9fMLdZ
++jwoHS8ZD8bRuTXuJRq9pHK8g5qrJfYwoWvU4Z+DvdU2hYEvtNm28rUDkyfbPUI2
+HruUKu4nJyc/wK1uwZSrGsXvJ8J/YouIVYEUl0LoEZg4zrXolh1yka9U+GwNY/a9
+Pyvsi8Qglsujvs/klWyDM8k7iGeVwpAVcEQasNo+enjBodt9PLeNnHcjtaqvlvXK
+G8NOjFrtm+nP38EzXXkCAwEAAaOCAmMwggJfMDkGA1UdIAQyMDAwEQYPKwYBBAGB
+rSGCLAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIw
+ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
+A1UdDgQWBBS5CdgiLqqsrOWLdx1BYgQU/xu4vDAfBgNVHSMEGDAWgBQdvXPMbe5u
+HHRw2aMbOrqoJ9686zA5BgNVHREEMjAwgiBzaGliYm9sZXRoLWlkcC51bmktZ29l
+dHRpbmdlbi5kZYEMc2hpYkBnd2RnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9j
+YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0
+aW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
+CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
+U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0
+aW5nZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQv
+Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEARzs6ng60wS+YtUJeEpa6j2Ee
+kB2+JrXmoBO5ho8X4zUXIsnFU09yEL9Fp3uxmSZnUIKBKQbjmOqJlQj5a3jfuqhU
+lz4BJHDcFG7ine6xMmVR8HEo7vgYISyjqfIJn4aB9EO1Vi1uOY8WApPnDVlFpoHt
+khvLc8hFipt8dWc+LHalZibqdVsNppN0LZi/A2zDnq/oSBrFB49Rs9eaMHx7H95I
+bs3e0k+2d5H0rUK+/oKp9nWzCEt7wDpI2zPVzKyKbMwZ5/DIYtiF6WMZK1bM3zow
+NoiaiccK26vE3CCe+eBrIvz53bLP3zTxI0Z+80apvUj+JwIw0UL03626ma24wQ==
+</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>MIIGKjCCBRKgAwIBAgIHF4B3Y7hUSjANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MzAxMzI1MzlaFw0xOTA0Mjkx
+MzI1MzlaMIGUMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMSkwJwYDVQQDEyBzaGliYm9sZXRoLWlkcC51bmkt
+Z29ldHRpbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKaY
+OIuBhaYLZU4M7a9+ut9NChZQiFVxbIJ3jZPMMjtiulx5f6zLDK43QUI4G6MBy6l0
+EEToRvIP2Y39COyDFrJO6Bgk+gIfHvHpogXBZiOk7Nf4PbtV9Mi9uffE/B9fMLdZ
++jwoHS8ZD8bRuTXuJRq9pHK8g5qrJfYwoWvU4Z+DvdU2hYEvtNm28rUDkyfbPUI2
+HruUKu4nJyc/wK1uwZSrGsXvJ8J/YouIVYEUl0LoEZg4zrXolh1yka9U+GwNY/a9
+Pyvsi8Qglsujvs/klWyDM8k7iGeVwpAVcEQasNo+enjBodt9PLeNnHcjtaqvlvXK
+G8NOjFrtm+nP38EzXXkCAwEAAaOCAmMwggJfMDkGA1UdIAQyMDAwEQYPKwYBBAGB
+rSGCLAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIw
+ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
+A1UdDgQWBBS5CdgiLqqsrOWLdx1BYgQU/xu4vDAfBgNVHSMEGDAWgBQdvXPMbe5u
+HHRw2aMbOrqoJ9686zA5BgNVHREEMjAwgiBzaGliYm9sZXRoLWlkcC51bmktZ29l
+dHRpbmdlbi5kZYEMc2hpYkBnd2RnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9j
+YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0
+aW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
+CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
+U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0
+aW5nZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQv
+Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEARzs6ng60wS+YtUJeEpa6j2Ee
+kB2+JrXmoBO5ho8X4zUXIsnFU09yEL9Fp3uxmSZnUIKBKQbjmOqJlQj5a3jfuqhU
+lz4BJHDcFG7ine6xMmVR8HEo7vgYISyjqfIJn4aB9EO1Vi1uOY8WApPnDVlFpoHt
+khvLc8hFipt8dWc+LHalZibqdVsNppN0LZi/A2zDnq/oSBrFB49Rs9eaMHx7H95I
+bs3e0k+2d5H0rUK+/oKp9nWzCEt7wDpI2zPVzKyKbMwZ5/DIYtiF6WMZK1bM3zow
+NoiaiccK26vE3CCe+eBrIvz53bLP3zTxI0Z+80apvUj+JwIw0UL03626ma24wQ==
+</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>
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
new file mode 100644
index 00000000..745cc7a6
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
@@ -0,0 +1,155 @@
+<?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>
+      <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>MIIFvjCCBKagAwIBAgIHE7iKqh6JUDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
+A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxIDAeBgNVBAMTF1VuaSBSZWdl
+bnNidXJnIENBIC0gRzAxMSQwIgYJKoZIhvcNAQkBFhVwa2lAdW5pLXJlZ2Vuc2J1
+cmcuZGUwHhcNMTIwNDI2MDg1MzQ2WhcNMTcwNDI1MDg1MzQ2WjCBmDELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
+A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnpl
+bnRydW0xKTAnBgNVBAMTIHNoaWJib2xldGgtaWRwLnVuaS1yZWdlbnNidXJnLmRl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb6jhoh17E9k//d3JMwg
+vcKYcaYVfQV5ly3yO9jffYX7wQY8MMPcyZNICWDZb+vrMUdjDaVo6cH7E2x0wACY
+wLza6Y7XVODjm5KMiWOIaZ2UL8n4EM7uaqYqhOCuv5kSZ1wkCGQ1F8ta24vZRaxr
+Y/rFslWZ36ckoVh2UD1H2PASmPQNxtk8515kmjpAJa0pRxh6dmLuyaFnENhb/hMA
+VVvhrA7/BVeunf7k+slyafn3bfomRwlTsC7AmGO1zn2C7+PFT3DKEN565ZJjbM59
+aBhlshOyZx1eZ1il7jc8JtfuoChI1ZumbCuXsCMWQyWZEuzQJreloTZqs7S9bHu9
+nwIDAQABo4ICBDCCAgAwHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEEAgIwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
+BwMBMB0GA1UdDgQWBBQm+KuXQAlIJpFpDmYOW9kmR01qYTAfBgNVHSMEGDAWgBQH
+1915iF9BccwW4dTH852yeLHdSDAsBgNVHREEJTAjgSFlZG11bmQud2ViZXJAcnou
+dW5pLXJlZ2Vuc2J1cmcuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS91bmktcmVnZW5zYnVyZy1jYS9wdWIvY3JsL2NhY3JsLmNy
+bDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktcmVnZW5zYnVyZy1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXJlZ2Vuc2J1cmctY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3VuaS1yZWdlbnNidXJnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQUFAAOCAQEAIGBPkosDWyhVvKtHzWP1W9i9/lg4v7+iRg/f+USs
+eBDEM5dyL80f6JBpYYBq0uguNmo7Z0hbg0UJIuWz4qReSASOXERlaN0MXtgYxXYa
+QCfZ9dSqommep5TDLY+tFX687R0aM3+D6livh8Zlk9tjvIK3peazeib7jWXkZuep
+3ZqgDNF14zSqrcGRg0wY/AEkpLf9k8+Aft3WAqjbf2QghzH1QLOwcBvFyJTKP1lf
+Eo29vwrtTxadJSyiGZd7qdYZPDi9NjCGU9ZAfN/60TZncWEoJmVZaq00as0wwSr3
+yRrHi0bPUSEYjGLZ5Muj2HV6lkYUuuhQxYEy8YCM01kN3A==
+</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>MIIFvjCCBKagAwIBAgIHE7iKqh6JUDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
+A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxIDAeBgNVBAMTF1VuaSBSZWdl
+bnNidXJnIENBIC0gRzAxMSQwIgYJKoZIhvcNAQkBFhVwa2lAdW5pLXJlZ2Vuc2J1
+cmcuZGUwHhcNMTIwNDI2MDg1MzQ2WhcNMTcwNDI1MDg1MzQ2WjCBmDELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
+A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnpl
+bnRydW0xKTAnBgNVBAMTIHNoaWJib2xldGgtaWRwLnVuaS1yZWdlbnNidXJnLmRl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb6jhoh17E9k//d3JMwg
+vcKYcaYVfQV5ly3yO9jffYX7wQY8MMPcyZNICWDZb+vrMUdjDaVo6cH7E2x0wACY
+wLza6Y7XVODjm5KMiWOIaZ2UL8n4EM7uaqYqhOCuv5kSZ1wkCGQ1F8ta24vZRaxr
+Y/rFslWZ36ckoVh2UD1H2PASmPQNxtk8515kmjpAJa0pRxh6dmLuyaFnENhb/hMA
+VVvhrA7/BVeunf7k+slyafn3bfomRwlTsC7AmGO1zn2C7+PFT3DKEN565ZJjbM59
+aBhlshOyZx1eZ1il7jc8JtfuoChI1ZumbCuXsCMWQyWZEuzQJreloTZqs7S9bHu9
+nwIDAQABo4ICBDCCAgAwHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEEAgIwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
+BwMBMB0GA1UdDgQWBBQm+KuXQAlIJpFpDmYOW9kmR01qYTAfBgNVHSMEGDAWgBQH
+1915iF9BccwW4dTH852yeLHdSDAsBgNVHREEJTAjgSFlZG11bmQud2ViZXJAcnou
+dW5pLXJlZ2Vuc2J1cmcuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS91bmktcmVnZW5zYnVyZy1jYS9wdWIvY3JsL2NhY3JsLmNy
+bDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktcmVnZW5zYnVyZy1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXJlZ2Vuc2J1cmctY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3VuaS1yZWdlbnNidXJnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQUFAAOCAQEAIGBPkosDWyhVvKtHzWP1W9i9/lg4v7+iRg/f+USs
+eBDEM5dyL80f6JBpYYBq0uguNmo7Z0hbg0UJIuWz4qReSASOXERlaN0MXtgYxXYa
+QCfZ9dSqommep5TDLY+tFX687R0aM3+D6livh8Zlk9tjvIK3peazeib7jWXkZuep
+3ZqgDNF14zSqrcGRg0wY/AEkpLf9k8+Aft3WAqjbf2QghzH1QLOwcBvFyJTKP1lf
+Eo29vwrtTxadJSyiGZd7qdYZPDi9NjCGU9ZAfN/60TZncWEoJmVZaq00as0wwSr3
+yRrHi0bPUSEYjGLZ5Muj2HV6lkYUuuhQxYEy8YCM01kN3A==
+</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>
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
new file mode 100644
index 00000000..887e5d37
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-sp-test.webbased.co.uk-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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>
+      <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>
+						MIIFYjCCA0oCCQD/5vJ0PJIN6jANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJH
+						QjEOMAwGA1UECBMFRGV2b24xETAPBgNVBAcTCFBseW1vdXRoMRUwEwYDVQQKEwxX
+						ZWJiYXNlZCBMdGQxKjAoBgNVBAMTIXNoaWJib2xldGgtc3AtdGVzdC53ZWJiYXNl
+						ZC5jby51azAeFw0wOTA5MDMxNTUzNDBaFw0xOTA5MDExNTUzNDBaMHMxCzAJBgNV
+						BAYTAkdCMQ4wDAYDVQQIEwVEZXZvbjERMA8GA1UEBxMIUGx5bW91dGgxFTATBgNV
+						BAoTDFdlYmJhc2VkIEx0ZDEqMCgGA1UEAxMhc2hpYmJvbGV0aC1zcC10ZXN0Lndl
+						YmJhc2VkLmNvLnVrMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsrL+
+						xb8NRkLHPxuI5LMuev0YqCjb4YC/cN0s9ywj8kSIf/wJzt55HlrWmnDJNd0dz2Vm
+						DWbpP9nmK2nbVAeAaA5SftcWvOp/rrDcpTQyeajS1PDMThlxvy9tLmld0bscpimW
+						1hQJP9iMmquflg4ONdsu+dO3xjHs/phQ5WrqOGPTpecSreeIHx2Mu9zBOYgV7lqG
+						lgi/HyKafyAlnBSPnuoU2mq2PB0LZTZ3pkKyUtl1sNQcuTNHhhJNtNKYj5NZf1Hl
+						9nZTnZxxaa4Sfj3ZTsYA+fECfvNJBi03/uDihNgw3UZkX0QvrWS3TupuWiQkvgYd
+						U8gcMaGnMXQIZVr3RKaVbBraB2F90zUXtut9w6pc53xmtyI7cvQgNpkMiI06eJxh
+						M/8r9Wet9LX02AIDbpPYiqgJgPMGfqmrYg7ZVoo66/TaSYxLs4P0h5aGEfRSaLk5
+						OSx8ulRn7CXXOK1g8XGpIV48KvN7hW2yZz04jKBa3VSwF1Tc7w3+AoG3YswQ3iLz
+						FTtCDzKEKCxzJQ7m5Dtzgy9+4hWlGbbgcf9IJqozsl/bVxWlrPi82Cqw9Ykj1uf4
+						oWS8V6/d3r/gJIK263+0cz43DJ9Pa2qOrZkqn5q6VhnCVxbbbI4Crq6pip7y6812
+						Qzpv59krPNWa0UMgzQPEcd/oYMWFw2ECmnYttaMCAwEAATANBgkqhkiG9w0BAQUF
+						AAOCAgEAnwsq//wg4lK92Uhu3Z/ysqHK7s0nTERPAcPgeDDTQ880UbRhu7sMnq3k
+						UzjKyJkBx4wA8kvUPK2V+JzpIvMIrUirQfAvsRZ7CZhcJN2rDF/VHwukXPS5xMPD
+						UxP1wajf4PlWF/1Mj6xOB6OjVzex53aFwbMVbgc73YVNwpokYBN78bDyG2Kn17Pf
+						KZbxvRjx6PGyJrR7Sr3bA3Fos2sYK1iJkBK+Pnk7eMc6JjJhGyOsGsfSM8psoeQE
+						S5/a+2vHqxuxK0crKJ7uKLPIscpxByAEwElNisfgSpDXEzLQogltVn1MIN1JxhDe
+						/k8QOhPdJ6VcUVD0MRLce2qjLcuMZ2f4fLNtlweh9NkiJ1OBL8EYLSMk6Xomxhgk
+						nZgO4QVByq5mnWXjSKMTOSjXdaDDPHOIFLWyKmcXR2HqTVk/XswR+MNCw+0EQuwk
+						XAB7b3eZFZTZtQARW1s4mixqKB+V1mvMVbk/hcsJHJXR8Fdy2wS9n1PguPSsrwp3
+						Kr+bKu7e3h6jwWD8hxF8iF4kq+jJOyG9WLz86De+pOFk7Wl1DeZcgEqZr44eiaTd
+						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>
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
new file mode 100644
index 00000000..e2b30015
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-sp.pre.proquest.com-shibboleth.xml
@@ -0,0 +1,92 @@
+<?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>
+      <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>
+						MIIDJTCCAg2gAwIBAgIJALnScQHvrMirMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+						BAMMHnNoaWJib2xldGgtc3AucHJlLnByb3F1ZXN0LmNvbTAeFw0xNDA0MzAxNjM3
+						NThaFw0xNzA0MjkxNjM3NThaMCkxJzAlBgNVBAMMHnNoaWJib2xldGgtc3AucHJl
+						LnByb3F1ZXN0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu2
+						ulnDhrfoKBQQbuEz/DLnadTAPbH6mjwEN1WL3wwzsbT9tBvbgUkeJVek3IzrcQyY
+						wNupltjdz1oy+D8SEeZl3k7FNl++OOWbYeoJC2x+H4DlN9JJKAc3BHjWWqxgsg/q
+						yA90PqgnLx92Ssrg3Q1A7wEtX2Og7KRZvduo7Ku+xwZaKUHSOldk/us9EydhyPXX
+						8mq4f8+VfsdHxEG8snu8XUaldH8m155dnh14JqgeK9Fhwd50uXbrMsRuRuoy6nTD
+						OI2tkuHK31wlsDuJe7MskWmHTuF2U58dG4K7EoWEkPxJhddFFGlEWL3Zx9ZMncmb
+						H4a0EjLSv4sVs865dYcCAwEAAaNQME4wHQYDVR0OBBYEFMHUep80KowQJBTazxKk
+						hIM2iDwYMB8GA1UdIwQYMBaAFMHUep80KowQJBTazxKkhIM2iDwYMAwGA1UdEwQF
+						MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIMGnbKNiy6Pt/ODzEQH2cmNzHVLIjsk
+						RHjBtRtCFaPaicReEVfb4TsC5BIUcocizp/ik+cicggvvbmsDhygbugA+iXo2edH
+						4u40jaPWUfSdhPJkUeU/R8s+5NPXrI3IVyHhc+oYeDIHTFOulXqICtymxidq54ci
+						nVpwM/ENfcMy0H4azdwnzuvUnJcane6w7tBryN0nitUrL0/g1CM4/jw1x+hpZBUf
+						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>
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
new file mode 100644
index 00000000..1d3813e3
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-sp.prod.proquest.com-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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>
+						MIIDWTCCAkGgAwIBAgIJALUXgtUwAcW1MA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
+						BAMTH3NoaWJib2xldGgtc3AucHJvZC5wcm9xdWVzdC5jb20wHhcNMTQwODA0MTgx
+						NjMxWhcNMTcwODA0MTgxNjMxWjAqMSgwJgYDVQQDEx9zaGliYm9sZXRoLXNwLnBy
+						b2QucHJvcXVlc3QuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						uL3AvdPUloVAT2SxU5zfIMS1Q51dz15rM97hcspWkeJbOJRzuWGmdn1NTO8wNgfH
+						WMcvxCH+MlUZdixFEEZ/oghDCKYQyngBe5DFb1o2MmXyXidtaFVzKOdkvwkrGNB4
+						AEAg0ee6EN72qxlUSk3md90GWsv2RVOicpxwKcpk/f8ibfuaqwUZoqyzBM9/jADp
+						uBG3iyiNr1/uGvCBhghvTpHRjZ6+L1t1tY8fi9xs15kd8k5nxQi1BSoGcqkmGJXB
+						OwBhn5mb5FjHGbzw6kbL/O+zWBLlzIIJmS3YsbgBiAGWbzIdGl366VRkea0yuVQE
+						KybgYDA/W5ezLNSeEdmMlwIDAQABo4GBMH8wXgYDVR0RBFcwVYIfc2hpYmJvbGV0
+						aC1zcC5wcm9kLnByb3F1ZXN0LmNvbYYyaHR0cHM6Ly9zaGliYm9sZXRoLXNwLnBy
+						b2QucHJvcXVlc3QuY29tL3NoaWJib2xldGgwHQYDVR0OBBYEFGaLI8FVRsbPeB4H
+						Q2517x6lRlkqMA0GCSqGSIb3DQEBBQUAA4IBAQCqcb5MKykmiQCSv19us1E1+gk5
+						LWew6OUY/rWRdM9EpVbKlMgo0A2KTuJ5qrI/miS69wv+5nbEPax007kP7Xd4e54K
+						yK0KWmTt92O3Rie2uf1dIF/VDOaIGvny0WTNfgiRmGrq3KERz26j7vQXbk9WOdp3
+						+L3v1Wr8+1N/MLrQ7JDZAygO3Xb4gGcGI9VWlPKL8o09K4fR8EM97p3qeqJINMqw
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth-test.cranfield.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-test.cranfield.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..52b35f33
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-test.cranfield.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-test.cranfield.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-07-22T11: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>
+      <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>
+						MIIDajCCAlKgAwIBAgIVAIq9SAD1Wg+WoXnjv9yjObPYWEodMA0GCSqGSIb3DQEB
+						BQUAMCoxKDAmBgNVBAMTH3NoaWJib2xldGgtdGVzdC5jcmFuZmllbGQuYWMudWsw
+						HhcNMTMwNzE1MTMyMjQ2WhcNMjMwNzE1MTMyMjQ2WjAqMSgwJgYDVQQDEx9zaGli
+						Ym9sZXRoLXRlc3QuY3JhbmZpZWxkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAp4zvWrdtUsjn4bWBMxcW7m7yBE72BSjOlFqmS6V9l0bDXRSc
+						NRcAOv4E65rwa3PfWv5omXyoWeUb2NxL5VYzOT3Q2oOuhFgyJ2IW82ahcdGuNkHM
+						FzT3iToZD5Ar9LPHv22f08wd3xY/cNhYgmE8G/CbpImr/GYflwYcK7r+bXTXl3WG
+						rKtHyo/G9U5IR1+Vt3yYKmF80v2gUPBMkIYt2XwgR4pJ17jZhX9GrDvL36wab9BR
+						Q23xAQqzqiIyC2sJwFR8xAKlmR84V42tJyOnA0P7dsOS1MD8SiRYXxf22hxelP4D
+						Th1cShuxjeOywDMAitOyWF5CCm2Fed2EyFm8ewIDAQABo4GGMIGDMGIGA1UdEQRb
+						MFmCH3NoaWJib2xldGgtdGVzdC5jcmFuZmllbGQuYWMudWuGNmh0dHBzOi8vc2hp
+						YmJvbGV0aC10ZXN0LmNyYW5maWVsZC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNV
+						HQ4EFgQUrjkjd0ZnnftSM8MS2V3BqUFOiJIwDQYJKoZIhvcNAQEFBQADggEBAGUJ
+						krPSvm32mmqQUAzrm2F5QYvjIzuyhLGWCYdhsbXrfHfOp1zc/9n3WCqYLGroA37f
+						tWg1qarE74v1q8oBh3sHw6zYLAY5ux/NBJ1yucwQ4p/ephvQ3uD56Nv7lTOgcFbW
+						OJQNwi2Zh6712VNACDXmyjrVE2GciTgNLXE5QQRS/yjAHEmB4KyDSRQkyRXAI/Hy
+						wfhbnquAZuaCCkre7CpbzMJT2HZNadhZPWZLs58MzV/eS2uQrjTSe0gr6o7CTA4R
+						v2E0+ZOLGM5EVx5myEWFewRqBgWxwDEuZlkHEMta+VVrrEZOu9qqgIM8xVeTbq+O
+						D8DFHLHPKqVbB13mytQ=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-test.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-test.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-test.cranfield.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-test.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-test.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-test.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>
+						MIIDajCCAlKgAwIBAgIVAIq9SAD1Wg+WoXnjv9yjObPYWEodMA0GCSqGSIb3DQEB
+						BQUAMCoxKDAmBgNVBAMTH3NoaWJib2xldGgtdGVzdC5jcmFuZmllbGQuYWMudWsw
+						HhcNMTMwNzE1MTMyMjQ2WhcNMjMwNzE1MTMyMjQ2WjAqMSgwJgYDVQQDEx9zaGli
+						Ym9sZXRoLXRlc3QuY3JhbmZpZWxkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAp4zvWrdtUsjn4bWBMxcW7m7yBE72BSjOlFqmS6V9l0bDXRSc
+						NRcAOv4E65rwa3PfWv5omXyoWeUb2NxL5VYzOT3Q2oOuhFgyJ2IW82ahcdGuNkHM
+						FzT3iToZD5Ar9LPHv22f08wd3xY/cNhYgmE8G/CbpImr/GYflwYcK7r+bXTXl3WG
+						rKtHyo/G9U5IR1+Vt3yYKmF80v2gUPBMkIYt2XwgR4pJ17jZhX9GrDvL36wab9BR
+						Q23xAQqzqiIyC2sJwFR8xAKlmR84V42tJyOnA0P7dsOS1MD8SiRYXxf22hxelP4D
+						Th1cShuxjeOywDMAitOyWF5CCm2Fed2EyFm8ewIDAQABo4GGMIGDMGIGA1UdEQRb
+						MFmCH3NoaWJib2xldGgtdGVzdC5jcmFuZmllbGQuYWMudWuGNmh0dHBzOi8vc2hp
+						YmJvbGV0aC10ZXN0LmNyYW5maWVsZC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNV
+						HQ4EFgQUrjkjd0ZnnftSM8MS2V3BqUFOiJIwDQYJKoZIhvcNAQEFBQADggEBAGUJ
+						krPSvm32mmqQUAzrm2F5QYvjIzuyhLGWCYdhsbXrfHfOp1zc/9n3WCqYLGroA37f
+						tWg1qarE74v1q8oBh3sHw6zYLAY5ux/NBJ1yucwQ4p/ephvQ3uD56Nv7lTOgcFbW
+						OJQNwi2Zh6712VNACDXmyjrVE2GciTgNLXE5QQRS/yjAHEmB4KyDSRQkyRXAI/Hy
+						wfhbnquAZuaCCkre7CpbzMJT2HZNadhZPWZLs58MzV/eS2uQrjTSe0gr6o7CTA4R
+						v2E0+ZOLGM5EVx5myEWFewRqBgWxwDEuZlkHEMta+VVrrEZOu9qqgIM8xVeTbq+O
+						D8DFHLHPKqVbB13mytQ=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-test.cranfield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-test.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 - Test</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>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.aber.ac.uk-shibboleth-TST.xml b/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth-TST.xml
new file mode 100644
index 00000000..0ae84399
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth-TST.xml
@@ -0,0 +1,129 @@
+<?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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Aberystwyth University IdP 2 Test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cy">Pryfisgol Aberystwyth</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Login@Aber</mdui:Description>
+        <mdui:Description xml:lang="cy">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>
+						MIIEeDCCA2CgAwIBAgIRAJlcQ3++vLgNmrr+TlKHgPEwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzAzMDQwMDAwMDBaFw0xNjAzMDMyMzU5NTlaMEMxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
+						aC5hYmVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAolIy
+						AOe63/CzqzDShypFAjBduFNikhH/mCUETUQh/Y88DZtr8PocWwdKjanlJTU0YHe5
+						3Qmc3YrLfKQggFUv6QWpF4wf8wAB25rWJ90nFrTyPobwXXelzuyQrUep8j6deoHv
+						3v+FAefGZWOUY4h+LOoH/Q2Jgsn10+US0JRQMjNdJWKU6gS6M7XEflYoyPn8QnEm
+						pWX/HyOniLsNXYhZQA/S0Djb/BObLm6FrrqAWJ2crepTeUnfB/Zf5qLjipcaEC2R
+						Qc3I0/d65uWntrgiSE2PElLqOy/QOxXV5EqGX6Q+Wv274aN8BTUjdtdNJPEUNbHp
+						36suelLrZKWI1IPy6wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+						SWsrN1dH6pDjue0wHQYDVR0OBBYEFIxYqlYMBHB65BGIwDs05Rczer4UMA4GA1Ud
+						DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+						BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+						HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+						TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+						dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+						Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoLmFi
+						ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAtvRG+fRTg4bOlUsHXG6+me9RmP
+						gMJqh8AQ2gpjzebvRhRV8YWs1uG0NBkRoE5Xx/fQvQhtCgLT1/u4KAY0cTxj4yBj
+						gTBN4PV9GOXGRu4UXE1WKqplWdJqUCyxlbnd3tqFxM3GFhgnHqLnOIpTWoHrHu6G
+						3RoRWG0AHyw8UkdwXsog5maEmIPV6a5wQ5jXAY0o5Zo4IHQ6W/vVikKgscDVE+Ow
+						oD+ZwrzABgYMNDIXKI/ZVxUCKUZPwyTwbdNfp5n8qYK3USLu/OP0l8IjGUlW5jGA
+						N2VovIYVKB2cEEl6RMPPBLiQbsczCeN/O4Du2hxilIDiH+4CjORDPnzK5dA=
+					</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>
+						MIIEeDCCA2CgAwIBAgIRAJlcQ3++vLgNmrr+TlKHgPEwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzAzMDQwMDAwMDBaFw0xNjAzMDMyMzU5NTlaMEMxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
+						aC5hYmVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAolIy
+						AOe63/CzqzDShypFAjBduFNikhH/mCUETUQh/Y88DZtr8PocWwdKjanlJTU0YHe5
+						3Qmc3YrLfKQggFUv6QWpF4wf8wAB25rWJ90nFrTyPobwXXelzuyQrUep8j6deoHv
+						3v+FAefGZWOUY4h+LOoH/Q2Jgsn10+US0JRQMjNdJWKU6gS6M7XEflYoyPn8QnEm
+						pWX/HyOniLsNXYhZQA/S0Djb/BObLm6FrrqAWJ2crepTeUnfB/Zf5qLjipcaEC2R
+						Qc3I0/d65uWntrgiSE2PElLqOy/QOxXV5EqGX6Q+Wv274aN8BTUjdtdNJPEUNbHp
+						36suelLrZKWI1IPy6wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+						SWsrN1dH6pDjue0wHQYDVR0OBBYEFIxYqlYMBHB65BGIwDs05Rczer4UMA4GA1Ud
+						DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+						BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+						HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+						TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+						dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+						Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoLmFi
+						ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAtvRG+fRTg4bOlUsHXG6+me9RmP
+						gMJqh8AQ2gpjzebvRhRV8YWs1uG0NBkRoE5Xx/fQvQhtCgLT1/u4KAY0cTxj4yBj
+						gTBN4PV9GOXGRu4UXE1WKqplWdJqUCyxlbnd3tqFxM3GFhgnHqLnOIpTWoHrHu6G
+						3RoRWG0AHyw8UkdwXsog5maEmIPV6a5wQ5jXAY0o5Zo4IHQ6W/vVikKgscDVE+Ow
+						oD+ZwrzABgYMNDIXKI/ZVxUCKUZPwyTwbdNfp5n8qYK3USLu/OP0l8IjGUlW5jGA
+						N2VovIYVKB2cEEl6RMPPBLiQbsczCeN/O4Du2hxilIDiH+4CjORDPnzK5dA=
+					</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 2 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
new file mode 100644
index 00000000..b9e3a3ad
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth.xml
@@ -0,0 +1,123 @@
+<?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>
+      <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>
+						MIIEeDCCA2CgAwIBAgIRAJlcQ3++vLgNmrr+TlKHgPEwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzAzMDQwMDAwMDBaFw0xNjAzMDMyMzU5NTlaMEMxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
+						aC5hYmVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAolIy
+						AOe63/CzqzDShypFAjBduFNikhH/mCUETUQh/Y88DZtr8PocWwdKjanlJTU0YHe5
+						3Qmc3YrLfKQggFUv6QWpF4wf8wAB25rWJ90nFrTyPobwXXelzuyQrUep8j6deoHv
+						3v+FAefGZWOUY4h+LOoH/Q2Jgsn10+US0JRQMjNdJWKU6gS6M7XEflYoyPn8QnEm
+						pWX/HyOniLsNXYhZQA/S0Djb/BObLm6FrrqAWJ2crepTeUnfB/Zf5qLjipcaEC2R
+						Qc3I0/d65uWntrgiSE2PElLqOy/QOxXV5EqGX6Q+Wv274aN8BTUjdtdNJPEUNbHp
+						36suelLrZKWI1IPy6wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+						SWsrN1dH6pDjue0wHQYDVR0OBBYEFIxYqlYMBHB65BGIwDs05Rczer4UMA4GA1Ud
+						DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+						BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+						HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+						TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+						dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+						Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoLmFi
+						ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAtvRG+fRTg4bOlUsHXG6+me9RmP
+						gMJqh8AQ2gpjzebvRhRV8YWs1uG0NBkRoE5Xx/fQvQhtCgLT1/u4KAY0cTxj4yBj
+						gTBN4PV9GOXGRu4UXE1WKqplWdJqUCyxlbnd3tqFxM3GFhgnHqLnOIpTWoHrHu6G
+						3RoRWG0AHyw8UkdwXsog5maEmIPV6a5wQ5jXAY0o5Zo4IHQ6W/vVikKgscDVE+Ow
+						oD+ZwrzABgYMNDIXKI/ZVxUCKUZPwyTwbdNfp5n8qYK3USLu/OP0l8IjGUlW5jGA
+						N2VovIYVKB2cEEl6RMPPBLiQbsczCeN/O4Du2hxilIDiH+4CjORDPnzK5dA=
+					</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>
+						MIIEeDCCA2CgAwIBAgIRAJlcQ3++vLgNmrr+TlKHgPEwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzAzMDQwMDAwMDBaFw0xNjAzMDMyMzU5NTlaMEMxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
+						aC5hYmVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAolIy
+						AOe63/CzqzDShypFAjBduFNikhH/mCUETUQh/Y88DZtr8PocWwdKjanlJTU0YHe5
+						3Qmc3YrLfKQggFUv6QWpF4wf8wAB25rWJ90nFrTyPobwXXelzuyQrUep8j6deoHv
+						3v+FAefGZWOUY4h+LOoH/Q2Jgsn10+US0JRQMjNdJWKU6gS6M7XEflYoyPn8QnEm
+						pWX/HyOniLsNXYhZQA/S0Djb/BObLm6FrrqAWJ2crepTeUnfB/Zf5qLjipcaEC2R
+						Qc3I0/d65uWntrgiSE2PElLqOy/QOxXV5EqGX6Q+Wv274aN8BTUjdtdNJPEUNbHp
+						36suelLrZKWI1IPy6wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+						SWsrN1dH6pDjue0wHQYDVR0OBBYEFIxYqlYMBHB65BGIwDs05Rczer4UMA4GA1Ud
+						DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+						BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+						HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+						TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+						dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+						Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoLmFi
+						ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAtvRG+fRTg4bOlUsHXG6+me9RmP
+						gMJqh8AQ2gpjzebvRhRV8YWs1uG0NBkRoE5Xx/fQvQhtCgLT1/u4KAY0cTxj4yBj
+						gTBN4PV9GOXGRu4UXE1WKqplWdJqUCyxlbnd3tqFxM3GFhgnHqLnOIpTWoHrHu6G
+						3RoRWG0AHyw8UkdwXsog5maEmIPV6a5wQ5jXAY0o5Zo4IHQ6W/vVikKgscDVE+Ow
+						oD+ZwrzABgYMNDIXKI/ZVxUCKUZPwyTwbdNfp5n8qYK3USLu/OP0l8IjGUlW5jGA
+						N2VovIYVKB2cEEl6RMPPBLiQbsczCeN/O4Du2hxilIDiH+4CjORDPnzK5dA=
+					</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>
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
new file mode 100644
index 00000000..7deed780
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ac-limoges.fr-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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: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>
+					      MIIGAzCCA+ugAwIBAgIRAODebMx5oGfvlJ1vAEw7CMkwDQYJKoZIhvcNAQEFBQAw
+cTELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVyZSBlZHVjYXRpb24gbmF0
+aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEbMBkGA1UEAxMS
+QUMgSW5mcmFzdHJ1Y3R1cmVzMB4XDTE0MDYwNDA5MTQyNVoXDTE2MDYwNDA5MTQy
+NVowgYwxCzAJBgNVBAYTAkZSMS8wLQYDVQQKEyZNaW5pc3RlcmUgRWR1Y2F0aW9u
+IE5hdGlvbmFsZSAoTUVORVNSKTEUMBIGA1UECxMLMTEwIDA0MyAwMTUxEzARBgNV
+BAsTCmFjLWxpbW9nZXMxITAfBgNVBAMTGHNoaWJib2xldGguYWMtbGltb2dlcy5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZeOaPk5f0fk/DzmnjJ
+YfxkijPIiy5fuK/YOdIrRPUUK+owNbHwvXIswRYwOkwUI1rlu6KsAy+mAdbzYmMH
+RG+nGEiNVncU35S/RIfUUJ4yweoTXO+g1CW9PQAAaJZqBUFgD1mfRq2FNNHy99nA
+VD+KawE/lu2kzZNCLq7hlAtuVBQVCtPVKc0OJnvDUFvI2Xu4W6tMx0QIwjKDDPbD
+4W1gw8UTbAfZYi4kDAQQf3Q1KakY9qURMFYkc3/BpWtjRXMV2OsWgN5BoR/O39oN
+NWialAH7qcYNsL194slvVkJ4To7vq0WJUiFW9GBC+qzP9TXc5Q6Cz8t7PMq4jVIx
+wzcCAwEAAaOCAXgwggF0MEsGCCsGAQUFBwEBBD8wPTA7BggrBgEFBQcwAoYvaHR0
+cDovL3d3dy5pZ2MuZWR1Y2F0aW9uLmZyL0luZnJhc3RydWN0dXJlcy5jcnQwHwYD
+VR0jBBgwFoAUvjgif3JGqdaEFZ/VyCh/XLMCIMswGgYDVR0gBBMwETAPBg0rBgEE
+AYGeZkUBAQQBMIGqBgNVHR8EgaIwgZ8wgZyggZmggZaGMGh0dHA6Ly9jcmwxLmln
+Yy5lZHVjYXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNybIYwaHR0cDovL2NybDIu
+aWdjLmVkdWNhdGlvbi5mci9JbmZyYXN0cnVjdHVyZXMuY3JshjBodHRwOi8vY3Js
+My5pZ2MuZWR1Y2F0aW9uLmZyL0luZnJhc3RydWN0dXJlcy5jcmwwEwYDVR0lBAww
+CgYIKwYBBQUHAwEwDgYDVR0PAQH/BAQDAgWgMBYGA1UdDgQPBA1BVVRPX0dFTkVS
+QVRFMA0GCSqGSIb3DQEBBQUAA4ICAQCbE0n4trI2ybwNLa9fOcM4jfEiFwZ4eFBI
+3KxNX5QSDMWFbkUV4DAvo9nQ0m1llDht0iR4kV1klWCUXeIeR3DXEWXFv4Pv4Zt2
+b8NjNIwhqqF9OH85emYyuOXUYJXzTruj/68sGfC52K+xuA4/0Id53PH1Alod9eKv
+6RafF5JjF5aIflVav/3gFl1zmGiQjlRcc/eRg16EzrVfk7UhfwwDo7ZVg/9ojGVW
+PDznf+1FlB2chzcr+58tduKq7+XCj8W66ZOECwOhg/j67ETJTqtEhzc5/zsrnZ+d
+u3ANuFqmhoqm3cD+O3cKRUEHdRbncizL8E/HbT0PD4Vs/AvVivkRtOIu3HI7IhqY
+h5v+C5lLUsmGVYfqYv1nvMVvK0kEBpsm8xfP31eYFHRJhQH2qXAV6QeIMJTc3IVj
+ObLnOAhEZ/dO992aFiB6KgGN5t73Iv93tk8DY+Qvq15TRc3FbSQSwkSJsnYA9Gmi
+bpU0eyh+xjLxD/DVKrkuaAfttUwJU5OYN7o8zRgclhjUxU1EZ84ipZf6G5UbhtxE
+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>
+					      MIIDTDCCAjSgAwIBAgIVAPI2OQnwEI796qTcWNc+EBU8y1vbMA0GCSqGSIb3DQEB
+BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGguYWMtbGltb2dlcy5mcjAeFw0xNDA0
+MzAxNDIzMjFaFw0zNDA0MzAxNDIzMjFaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
+YWMtbGltb2dlcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJRE
+S2ttB2Q4gKGoOA7GRB1u8quMRF/jC0B+dtcxhilipU7ITjiQMCto0Vvlr8MhJsiH
+XzQpucbD2jvfBqX9/3/opLgNgLEEQFiJ8mPtXwcSDiEZVrj/9wqq63wnNQQ6b0qV
+jO8jrD2PmLpPTPmuxd6RpugQ+KM7sEzbM8d/GGnmuBHyKcKYXcmko6WKCwCwm7xf
+WozFuDYQQES8282sRCi1PdPaiUvqkqnx8Bl4N82iwTdN9cDvSWSSlcdamX0z4/6O
+06Cp+q8xWn24vm26UxA2PhODaLH8CAWExTtQS2DEasu6d066vaSx6UVuB2s9C+rM
+ngdB7azRm1ujFU6T4akCAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5h
+Yy1saW1vZ2VzLmZyhi9odHRwczovL3NoaWJib2xldGguYWMtbGltb2dlcy5mci9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU88f2Yh9G3YvxK1a9XpdwWCspbSYwDQYJ
+KoZIhvcNAQEFBQADggEBAGqCAwe7lZDbaE1Ynj11VxMaRxzphVIYtWTGVoZQmoZ1
+774wmVw96rSxU4CWgFJ+1nurcgdZvH6mkKE8O9FXYklO25mpLD6DB7cGiVjcJVn6
+puYEzKtucKDG57f6KJ2EnO7kWCmtw/56d16JE069Ze7wr8BYHy3XON29UhdBGDZo
+0jnd9p9OUdk+gHxUcc6oAa++jyUOUpJd9O/P/HjovoqvE+brI5WHXFgxXg6ILpXo
+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://unknown.site.com</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
new file mode 100644
index 00000000..4f48dc97
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ad.cybera.ca-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-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
+</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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>
+MIIDSDCCAjCgAwIBAgIVAMmg9Pn2Pq9LL6hnJsqirBsx1/hBMA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYWQuY3liZXJhLmNhMB4XDTE0MDYw
+NTIzMjM0N1oXDTM0MDYwNTIzMjM0N1owIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5h
+ZC5jeWJlcmEuY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCG+m9g
+JN1yrI2i29T5fSilW2A3o/2+kV1cQzaDj2pNU7CiXfohyKvw3p6rTWriLh0nGSJp
+9DWtA4DhWOQsrtpPUNez8ZgFDzRQc7OUqZJIdh0EexhlGEipyGsAd4piEDqIbl5R
+EKMyqc7ok+22Lv8KbWi68ksMOYxvxggTbj37MJzoD7siYo72jztDAl8LWUu0On9u
+znQcoGN+yp3b0ZNFrZ+xciiNVN1IISqoHvVZVCzPH8jXrsZKon9Ga75B7DXouQbS
+RJwMEYMBKmBdCa8iL2fn+oaD9GHDZ6TlmRJFsun4ydIpmJYmUy5WzlNHQ95f+hG7
+h1HEt1rKkb33lJu/AgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJib2xldGguYWQu
+Y3liZXJhLmNhhi5odHRwczovL3NoaWJib2xldGguYWQuY3liZXJhLmNhL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBRF16/3CUxWL/2Gig8kuGMyT5Y1RTANBgkqhkiG
+9w0BAQUFAAOCAQEAeYprnDekEmkdGOz7RcEmUGrWjEC+KKSQrXaPNSx1+Wuasc7K
+ARqreWX3dEg+qUFi+M6pPD6/g6GmCyTioxeu9qeq7/vwT06RGA/2XbnLrgJ+Z95v
+vSbaqBB2xbthzV5vSRymh/jT0rYcidffG4i/3VFhM5pTgy1glAM/aorb2M1FWqLw
+jd3mIdybjOjUXTDDMgc5TuyyS3tgaOcbVSTPFZfCzjryjRH3yflUVIW1uhDM189R
+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>
+MIIDSDCCAjCgAwIBAgIVAMmg9Pn2Pq9LL6hnJsqirBsx1/hBMA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYWQuY3liZXJhLmNhMB4XDTE0MDYw
+NTIzMjM0N1oXDTM0MDYwNTIzMjM0N1owIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5h
+ZC5jeWJlcmEuY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCG+m9g
+JN1yrI2i29T5fSilW2A3o/2+kV1cQzaDj2pNU7CiXfohyKvw3p6rTWriLh0nGSJp
+9DWtA4DhWOQsrtpPUNez8ZgFDzRQc7OUqZJIdh0EexhlGEipyGsAd4piEDqIbl5R
+EKMyqc7ok+22Lv8KbWi68ksMOYxvxggTbj37MJzoD7siYo72jztDAl8LWUu0On9u
+znQcoGN+yp3b0ZNFrZ+xciiNVN1IISqoHvVZVCzPH8jXrsZKon9Ga75B7DXouQbS
+RJwMEYMBKmBdCa8iL2fn+oaD9GHDZ6TlmRJFsun4ydIpmJYmUy5WzlNHQ95f+hG7
+h1HEt1rKkb33lJu/AgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJib2xldGguYWQu
+Y3liZXJhLmNhhi5odHRwczovL3NoaWJib2xldGguYWQuY3liZXJhLmNhL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBRF16/3CUxWL/2Gig8kuGMyT5Y1RTANBgkqhkiG
+9w0BAQUFAAOCAQEAeYprnDekEmkdGOz7RcEmUGrWjEC+KKSQrXaPNSx1+Wuasc7K
+ARqreWX3dEg+qUFi+M6pPD6/g6GmCyTioxeu9qeq7/vwT06RGA/2XbnLrgJ+Z95v
+vSbaqBB2xbthzV5vSRymh/jT0rYcidffG4i/3VFhM5pTgy1glAM/aorb2M1FWqLw
+jd3mIdybjOjUXTDDMgc5TuyyS3tgaOcbVSTPFZfCzjryjRH3yflUVIW1uhDM189R
+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>
diff --git a/swamid-interfederations-2.0/shibboleth.amdigital.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/shibboleth.amdigital.co.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..d87142c9
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.amdigital.co.uk-shibboleth-sp.xml
@@ -0,0 +1,69 @@
+<?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.amdigital.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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.amdigital.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>
+						MIIDFTCCAf2gAwIBAgIJAPe6QSEcGRk8MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGnNoaWJib2xldGguYW1kaWdpdGFsLmNvLnVrMB4XDTExMDMwMzEyMDIxMloX
+						DTE2MDMwMTEyMDIxMlowJTEjMCEGA1UEAxMac2hpYmJvbGV0aC5hbWRpZ2l0YWwu
+						Y28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4pvlbjpzFVWoX
+						CwMEQs/lKAB5fRNdIbeCLqumBjdVeh/rNVWHsLdOltDuaLlfRT+OXYI3962tezKO
+						gPJb0WhuUEoT5My92nyceHU1tUtZTtRxrXh7NbNxNasmBpXxhWxdxPkQpvt7tza8
+						bcoXX7Y1V8AFdoOoOA+CE05mimoqPf+76JuW6PTpF083fPMyf34EyYwWiVcGNfTJ
+						IaNdAd23Q3hxpm2P3WhFI3y/jWK74jziP0a9r6Wp/HRIvcyFfLlaqlFaOvr7v0SR
+						Gk6kuMF2sXrfj9OMd7m6+5v9CRdiX56nYYHdD1jhf/5zsNXMDvMTY1fNtosEIomm
+						BaGnnwIHAgMBAAGjSDBGMCUGA1UdEQQeMByCGnNoaWJib2xldGguYW1kaWdpdGFs
+						LmNvLnVrMB0GA1UdDgQWBBRSfPmrYGKQQdVWbnmrysdcv1KtpzANBgkqhkiG9w0B
+						AQUFAAOCAQEAYalolZpZEQk9zTCR503YHoxf901rRBqF39GBt59Gw/pDKhop+ktm
+						i0aYmIJP60NATkKYluvUtQBKSb11FaSil6QZuzcz5q1aVPfyW1jMgK2C3R0f43mD
+						pl8gfZGBXF6Sm96KGuXrT89+bWuzndflDLCaHltTmwg7UFM0uGYhfO49TVENLU9O
+						9O3zn5BmDgPO6E7zlnLLkLd3HYV5mf8JmQmupCsuHeL8Ip1twZbbuixEVrXSOEV/
+						iw65O0mJIhVzUnl2rQ+/7GiB0A3wZpvGu8EVEgjJGT6wye3l8D8lN11NNGCs76CC
+						lM5VbBovDN5R8HI4KUo2eMInLDUUf5p0oQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.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://shibboleth.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://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.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 Digital Limited</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.amdigital.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jonathan</md:GivenName>
+    <md:SurName>Mansfield</md:SurName>
+    <md:EmailAddress>mailto:support@amdigital.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Glyn</md:GivenName>
+    <md:SurName>Porritt</md:SurName>
+    <md:EmailAddress>mailto:glyn@amdigital.co.uk</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 8ceef1b3..5d10e6d3 100644
--- a/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml
@@ -1,74 +1,141 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://shibboleth.bbaw.de/shibboleth">
-  <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:EntityDescriptor 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="2009-12-10T08:47: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>
+  </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/Login" index="1"/>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Berlin-Brandenburgische Akademie der Wissenschaften</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Berlin Brandenburg Academy of Sciences and Humanities</mdui:DisplayName>
+        <mdui:Description xml:lang="de">CLARIN Föderations-Demonstrator: Corpus Annotationswerkzeuge</mdui:Description>
+        <mdui:Description xml:lang="en">CLARIN Federation Demonstrator: Corpus annotation tools</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://clarin.eu</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.clarin-d.de</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://shibboleth.bbaw.de/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    <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:X509Certificate>MIIFEjCCA/qgAwIBAgIEDxpjazANBgkqhkiG9w0BAQUFADCBnDELMAkGA1UEBhMC
-REUxPDA6BgNVBAoTM0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWllIGRl
-ciBXaXNzZW5zY2hhZnRlbjEgMB4GA1UECxMXSW5mb3JtYXRpb25zdGVjaG5vbG9n
-aWUxEjAQBgNVBAMTCUJCQVctQ0EgMTEZMBcGCSqGSIb3DQEJARYKY2FAYmJhdy5k
-ZTAeFw0wOTExMTExNjI3MDdaFw0xNDExMTAxNjI3MDdaMGgxCzAJBgNVBAYTAkRF
-MTwwOgYDVQQKEzNCZXJsaW4tQnJhbmRlbmJ1cmdpc2NoZSBBa2FkZW1pZSBkZXIg
-V2lzc2Vuc2NoYWZ0ZW4xGzAZBgNVBAMTEnNoaWJib2xldGguYmJhdy5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqdL1VpZaKldYSwvu4z+8iXzy+j
-+6tpAq1lED8CDcXRJsbgL/F4sioQ9uNylJgX4aromN5kTT8nfmtEN84C9s5ExVg6
-29bkxSPEWviJzdDxKstRqWbl7PzpipFa9Th2b7jOwX4ec3nirC4ijoTACQBge7qd
-GNniTFM/2k5E7D8NPTJg2d9ITWs8JW7Qbx0ezFpKlg1eVWZNZs86L3UShdXWnwrT
-oNtZwKm309EbdDNGDvsAgHseFNhmQIV+rOuMxv44nVMxDUSymARAKhzbeJ4CUWth
-gYjByHbQM45twUdQKGO01vQX+DwS+9RmA34PDZ8nRSktRtlG/Llr9SRXf9ECAwEA
-AaOCAY0wggGJMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
-AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUoy4g7ejcIv8AoY2/BQx6coBR6EIw
-HwYDVR0jBBgwFoAUjKaP8T8UOwK1+SdUTKs8odgbkJgweQYDVR0fBHIwcDA2oDSg
-MoYwaHR0cDovL2NkcDEucGNhLmRmbi5kZS9iYmF3LWNhL3B1Yi9jcmwvY2Fjcmwu
-Y3JsMDagNKAyhjBodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JiYXctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEAGCCsGAQUFBzAChjRodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL2JiYXctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MEAGCCsGAQUFBzAChjRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JiYXctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBrAUHthoQFOwKU
-a8KybrhK1NofkstRQxhVR2jcNWQDhFB+ife+kXdindHuh6OeWgys07llwmPqACQ9
-T6ccWjVBVyV7DqFwuRCn/Ui/4E+c6EHtJEJ6nktXj4jCRla7a7gxmdnBqBKvjoPJ
-7AdIQbn9kpuWDN+2hoiGPdAz+ZBp1zcY28SJhtHoNHdLmAjyNlrCj3fWsppLL7/k
-znAYO9ZznwCtBE+BWq+rxu0TJhYBf84+fn0kwBruvHWgpCrb+57XpX3RN1HxNbvR
-9lvp1UltizFA44damYGbbKBKOLCHFvJbBg6v81WGKxZB+dv9TcZSMDNaj1oqBxUW
-eQj7ACg8</ds:X509Certificate>
+          <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
+dy5kZTAeFw0xNDEwMTMxNTMxMDdaFw0xOTA3MDkyMzU5MDBaMIGKMQswCQYDVQQG
+EwJERTEPMA0GA1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xPDA6BgNVBAoT
+M0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWllIGRlciBXaXNzZW5zY2hh
+ZnRlbjEbMBkGA1UEAxMSc2hpYmJvbGV0aC5iYmF3LmRlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtciZovXzGD+K7C5bwgQl29CGss8jg8NoLco1C+h7
+REVbgOZo9ipf4OUoI8XieicXewor2hTF89Iy5nt/HuTQuKDW8q3edn+C/DNJgu4B
+0gmdZmZ+ubXcOd/1hnjRRLS9wxvgq2Q+mBLZwV8wMMJA/tEkO1xd0yGAysl4tcu2
+BcV/2SM+oI9rdWNuGK2m4lOsouEi0mIvm9v4aJBIfknOXm0cfC7xJB1fV5Q59gBL
+74PYTB99XKjQ3jVTzu3j1lOq9UgwbhYNXOiw2rWT2wY64LFAuNrk2j0tFnIIBLYM
+ws2DLo4AXOeDUR6TY5xWfMRg6rHEKYY8s/ggeEj5KG+HNwIDAQABo4ICMjCCAi4w
+TwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwIwEQYPKwYBBAGBrSGCLAIBBAMB
+MA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNV
+HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
+BBTr7kmL7423Mx9V5mu8Ukx5vyME0zAfBgNVHSMEGDAWgBSMpo/xPxQ7ArX5J1RM
+qzyh2BuQmDAdBgNVHREEFjAUghJzaGliYm9sZXRoLmJiYXcuZGUweQYDVR0fBHIw
+cDA2oDSgMoYwaHR0cDovL2NkcDEucGNhLmRmbi5kZS9iYmF3LWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMDagNKAyhjBodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JiYXctY2Ev
+cHViL2NybC9jYWNybC5jcmwwgckGCCsGAQUFBwEBBIG8MIG5MDMGCCsGAQUFBzAB
+hidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwQAYIKwYB
+BQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYmJhdy1jYS9wdWIvY2FjZXJ0
+L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
+YmJhdy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEB
+AIcuZcIEBKtbbf/OOTxBfEiZ2iGfu3kLO2QXYR5oqh6D7ZVjrjXfWjyCR6beFosY
+M/2YkWIzRwfI/DAwXhiwXByqyYFcB6ICnqtIenuxgrhgcZcY5nOrV5NJ+kS8ivv8
+jLdayhH+CBCA/UpDbyujMdeVjlJWPwaSacD51FIm6Ao3T+DBdXArNSphcGV+y2jD
+5JLMDjRaj/g29jQuJNhTvNajJFfVdNZt8KPEbYvJwwOk9rD9P3BEyAT9At/V6LyY
+gP+LmoAAhHE052Fg3khXrQ8qLV5ubP7DKZtIWA7nGg8v7/9iynjoUJ6yZn8Gx4s4
+WdNzDxmjE9EyFPvbQdfnOkE=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md: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://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">German NLP tools from the BBAW/DWDS</md:ServiceName>
-      <md:ServiceName xml:lang="en">German NLP tools from the BBAW/DWDS</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Tokenizer, Tagger (Moot), Shallow Parser (SynCop) and Named Entity Recognition for historic texts. For Humanities and Social Sciences researchers.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-    </md:AttributeConsumingService>
+    <md: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
+dy5kZTAeFw0xNDEwMTMxNTMxMDdaFw0xOTA3MDkyMzU5MDBaMIGKMQswCQYDVQQG
+EwJERTEPMA0GA1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xPDA6BgNVBAoT
+M0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWllIGRlciBXaXNzZW5zY2hh
+ZnRlbjEbMBkGA1UEAxMSc2hpYmJvbGV0aC5iYmF3LmRlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtciZovXzGD+K7C5bwgQl29CGss8jg8NoLco1C+h7
+REVbgOZo9ipf4OUoI8XieicXewor2hTF89Iy5nt/HuTQuKDW8q3edn+C/DNJgu4B
+0gmdZmZ+ubXcOd/1hnjRRLS9wxvgq2Q+mBLZwV8wMMJA/tEkO1xd0yGAysl4tcu2
+BcV/2SM+oI9rdWNuGK2m4lOsouEi0mIvm9v4aJBIfknOXm0cfC7xJB1fV5Q59gBL
+74PYTB99XKjQ3jVTzu3j1lOq9UgwbhYNXOiw2rWT2wY64LFAuNrk2j0tFnIIBLYM
+ws2DLo4AXOeDUR6TY5xWfMRg6rHEKYY8s/ggeEj5KG+HNwIDAQABo4ICMjCCAi4w
+TwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwIwEQYPKwYBBAGBrSGCLAIBBAMB
+MA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNV
+HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
+BBTr7kmL7423Mx9V5mu8Ukx5vyME0zAfBgNVHSMEGDAWgBSMpo/xPxQ7ArX5J1RM
+qzyh2BuQmDAdBgNVHREEFjAUghJzaGliYm9sZXRoLmJiYXcuZGUweQYDVR0fBHIw
+cDA2oDSgMoYwaHR0cDovL2NkcDEucGNhLmRmbi5kZS9iYmF3LWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMDagNKAyhjBodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JiYXctY2Ev
+cHViL2NybC9jYWNybC5jcmwwgckGCCsGAQUFBwEBBIG8MIG5MDMGCCsGAQUFBzAB
+hidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwQAYIKwYB
+BQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYmJhdy1jYS9wdWIvY2FjZXJ0
+L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
+YmJhdy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEB
+AIcuZcIEBKtbbf/OOTxBfEiZ2iGfu3kLO2QXYR5oqh6D7ZVjrjXfWjyCR6beFosY
+M/2YkWIzRwfI/DAwXhiwXByqyYFcB6ICnqtIenuxgrhgcZcY5nOrV5NJ+kS8ivv8
+jLdayhH+CBCA/UpDbyujMdeVjlJWPwaSacD51FIm6Ao3T+DBdXArNSphcGV+y2jD
+5JLMDjRaj/g29jQuJNhTvNajJFfVdNZt8KPEbYvJwwOk9rD9P3BEyAT9At/V6LyY
+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:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="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
new file mode 100644
index 00000000..6b3fb25b
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.bca.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						FHNoaWJib2xldGguYmNhLmFjLnVrMB4XDTE1MDExNTEwMjA1OVoXDTM1MDExMDEw
+						MjA1OVowgYAxCzAJBgNVBAYTAkdCMRIwEAYDVQQIDAlCZXJrc2hpcmUxEzARBgNV
+						BAcMCk1haWRlbmhlYWQxKTAnBgNVBAoMIEJlcmtzaGlyZSBDb2xsZWdlIG9mIEFn
+						cmljdWx0dXJlMR0wGwYDVQQDDBRzaGliYm9sZXRoLmJjYS5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALmriTHAnzTh0koWNhcZeqWl1VkHR+wi
+						0w6zWxI3961lmUJbfu9md/HZT6wTzoTxiIUPq1CS11zgkUuDybtNc3JHUojHtArw
+						LHw/PgRaDZaPZMpqEf7zsRR7ouytPw9XqhVD4XJLWSQMYpHlvHB7rE1sLVb6j9dA
+						h5niM+6kmd3iozcDcVENptYeNxwuZwKk6BfMT9PgpWCYB0SvfgYdMPGC3VJ0VgPw
+						NrNeI0IKRyl7Lj0g6h8HUfl0C4sVcf+PXnzD0iLzaEmra1fBWV3Yy7E+E7N7NqwW
+						TCNTNiRO2lBbddVjtaRYVcj4RyxsESJ3dwAT8iojFTYYW8/ZH7l4JWcCAwEAATAN
+						BgkqhkiG9w0BAQsFAAOCAQEABU3bhbpaCtOrumoaBklKmVhZTrpuo1T9SGHMA6yO
+						Gjd+E5ZFgNQp3CYO0nDikmQX5QFIxnW+tVpC/fsC/zaNxj4WqYSP4+Ufv6vg2wiY
+						KX4rkZ8a6kRvTprxFwrrXySL4l9b7Y/3gNco5Pqm38x3QUp/D4jfI5kzTyxnQjaR
+						X7DQsNjtE8jJQMzY4q+fazQ0xcgVtYP8Hyr5zw6Pm83IbTUjHSsQt8DKA6N4lHKY
+						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>
+						MIIDfjCCAmYCCQDx7t/Xm+vk2jANBgkqhkiG9w0BAQsFADCBgDELMAkGA1UEBhMC
+						R0IxEjAQBgNVBAgMCUJlcmtzaGlyZTETMBEGA1UEBwwKTWFpZGVuaGVhZDEpMCcG
+						A1UECgwgQmVya3NoaXJlIENvbGxlZ2Ugb2YgQWdyaWN1bHR1cmUxHTAbBgNVBAMM
+						FHNoaWJib2xldGguYmNhLmFjLnVrMB4XDTE1MDExNTEwMjA1OVoXDTM1MDExMDEw
+						MjA1OVowgYAxCzAJBgNVBAYTAkdCMRIwEAYDVQQIDAlCZXJrc2hpcmUxEzARBgNV
+						BAcMCk1haWRlbmhlYWQxKTAnBgNVBAoMIEJlcmtzaGlyZSBDb2xsZWdlIG9mIEFn
+						cmljdWx0dXJlMR0wGwYDVQQDDBRzaGliYm9sZXRoLmJjYS5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALmriTHAnzTh0koWNhcZeqWl1VkHR+wi
+						0w6zWxI3961lmUJbfu9md/HZT6wTzoTxiIUPq1CS11zgkUuDybtNc3JHUojHtArw
+						LHw/PgRaDZaPZMpqEf7zsRR7ouytPw9XqhVD4XJLWSQMYpHlvHB7rE1sLVb6j9dA
+						h5niM+6kmd3iozcDcVENptYeNxwuZwKk6BfMT9PgpWCYB0SvfgYdMPGC3VJ0VgPw
+						NrNeI0IKRyl7Lj0g6h8HUfl0C4sVcf+PXnzD0iLzaEmra1fBWV3Yy7E+E7N7NqwW
+						TCNTNiRO2lBbddVjtaRYVcj4RyxsESJ3dwAT8iojFTYYW8/ZH7l4JWcCAwEAATAN
+						BgkqhkiG9w0BAQsFAAOCAQEABU3bhbpaCtOrumoaBklKmVhZTrpuo1T9SGHMA6yO
+						Gjd+E5ZFgNQp3CYO0nDikmQX5QFIxnW+tVpC/fsC/zaNxj4WqYSP4+Ufv6vg2wiY
+						KX4rkZ8a6kRvTprxFwrrXySL4l9b7Y/3gNco5Pqm38x3QUp/D4jfI5kzTyxnQjaR
+						X7DQsNjtE8jJQMzY4q+fazQ0xcgVtYP8Hyr5zw6Pm83IbTUjHSsQt8DKA6N4lHKY
+						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>
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
new file mode 100644
index 00000000..d4678a7a
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.bolton-sfc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						aC5ib2x0b24tc2ZjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAhQnvJrLzeiakUFvRRezAt2TPOMDRSgg6jZvnjaD489IZbDTbod7VBI3LGMKq
+						D/sox6gm/tM42nYXpL/UBCyfP5GYc6ahLg0CSPtmv/uY2TUZEJzUNjQG2X7LzbUv
+						yWzG8HniHgag9q0FLRx6Qf1jNWCLVEOEPtceWJz+UCDdJzOvjYE6/XIqQ/7tY+V8
+						2yDafdgzOOoNNkPYuuY4qUcGLvKP0WNos04YdZZr3P5JEvey1Ssvb+LAiExKNHmC
+						CFMLNd/zFwEE/TMno412PSPhfbSuAbCropK4QvV67nf7pOZQ6llX3XvWNuL7fN4t
+						FtwHCwYYHDm6JzksA56K4QugkwIDAQABo30wezBaBgNVHREEUzBRghtzaGliYm9s
+						ZXRoLmJvbHRvbi1zZmMuYWMudWuGMmh0dHBzOi8vc2hpYmJvbGV0aC5ib2x0b24t
+						c2ZjLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ908freXtGmAgPCz06
+						ptbx0ZuXHjANBgkqhkiG9w0BAQUFAAOCAQEAP0xmq5ftDMTIuPDbqPNvfR/GrDTo
+						NfX8pt5dTiTvTqJC0g2YCHWgQt1rOZl1ZjXyNFaDwqg4VVEVLvG2k99FshXsZzY7
+						Rwp8AfzaNt5B9TpRRhchBVwgfpXbhHVsSB602J0qYHHgGY7IvlaZ9xGq2B6OgCR2
+						+l2Yh1ZOPqvRkj1VINzLNwJLroZLGURQoqwsADWBw9GRr/6hecHiE3T33dCHzfcd
+						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>
+						MIIDVzCCAj+gAwIBAgIUWPJgrnNMjlbymBlvPaO34/X+UVswDQYJKoZIhvcNAQEF
+						BQAwJjEkMCIGA1UEAxMbc2hpYmJvbGV0aC5ib2x0b24tc2ZjLmFjLnVrMB4XDTEz
+						MTExMTEzMDE1OFoXDTMzMTExMTEzMDE1OFowJjEkMCIGA1UEAxMbc2hpYmJvbGV0
+						aC5ib2x0b24tc2ZjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAhQnvJrLzeiakUFvRRezAt2TPOMDRSgg6jZvnjaD489IZbDTbod7VBI3LGMKq
+						D/sox6gm/tM42nYXpL/UBCyfP5GYc6ahLg0CSPtmv/uY2TUZEJzUNjQG2X7LzbUv
+						yWzG8HniHgag9q0FLRx6Qf1jNWCLVEOEPtceWJz+UCDdJzOvjYE6/XIqQ/7tY+V8
+						2yDafdgzOOoNNkPYuuY4qUcGLvKP0WNos04YdZZr3P5JEvey1Ssvb+LAiExKNHmC
+						CFMLNd/zFwEE/TMno412PSPhfbSuAbCropK4QvV67nf7pOZQ6llX3XvWNuL7fN4t
+						FtwHCwYYHDm6JzksA56K4QugkwIDAQABo30wezBaBgNVHREEUzBRghtzaGliYm9s
+						ZXRoLmJvbHRvbi1zZmMuYWMudWuGMmh0dHBzOi8vc2hpYmJvbGV0aC5ib2x0b24t
+						c2ZjLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ908freXtGmAgPCz06
+						ptbx0ZuXHjANBgkqhkiG9w0BAQUFAAOCAQEAP0xmq5ftDMTIuPDbqPNvfR/GrDTo
+						NfX8pt5dTiTvTqJC0g2YCHWgQt1rOZl1ZjXyNFaDwqg4VVEVLvG2k99FshXsZzY7
+						Rwp8AfzaNt5B9TpRRhchBVwgfpXbhHVsSB602J0qYHHgGY7IvlaZ9xGq2B6OgCR2
+						+l2Yh1ZOPqvRkj1VINzLNwJLroZLGURQoqwsADWBw9GRr/6hecHiE3T33dCHzfcd
+						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>
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
new file mode 100644
index 00000000..da09e807
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.bradfordcollege.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?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>
+      <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
+						cmFkZm9yZGNvbGxlZ2UuYWMudWsxKTAnBgkqhkiG9w0BCQEWGnJvb3RAYnJhZGZv
+						cmRjb2xsZWdlLmFjLnVrMB4XDTEzMTEwODEyMzI1OFoXDTIzMTEwNjEyMzI1OFow
+						gaUxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxETAPBgNVBAcTCEJy
+						YWRmb3JkMRkwFwYDVQQKExBCcmFkZm9yZCBDb2xsZWdlMSkwJwYDVQQDEyBzaGli
+						Ym9sZXRoLmJyYWRmb3JkY29sbGVnZS5hYy51azEpMCcGCSqGSIb3DQEJARYacm9v
+						dEBicmFkZm9yZGNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQCwYsDvkLqkCOFTHrZ3Er53jfoqYD9mq8d0KGt6BH/oaEhDf9LVLoTm
+						zDgu0dSsDBxCyoIWcyV2snrQ1SjkRRKc7km1Cqlt3X1F7HJwCd9ocJRkWOkJLCyv
+						o0lMzO9Fv1PcjWHwnJmFQom7WTrZ5bqAOYmvPJF03Mfbg5pQcNXZqSz0F4r7wJpX
+						4d0rU+sq2H27TDaIgwWZ2PU8vfLlYshctMv1b8h1wpyBwyLdidtov8yHXRjKuTmL
+						xYhHESz4j3Ji4bPY5Dry2mG+TVDbI8MKScdYxdIXaI51fwo5JtOv0mT3qAUD+RN+
+						TAg7YXpwS6X6dlQqqJDu6AbgDzAImq47AgMBAAGjggE5MIIBNTAJBgNVHRMEAjAA
+						MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
+						BgNVHQ4EFgQUvwyrftHX/bc1Rrx58TEml80zNagwgdoGA1UdIwSB0jCBz4AUvwyr
+						ftHX/bc1Rrx58TEml80zNaihgaukgagwgaUxCzAJBgNVBAYTAkdCMRIwEAYDVQQI
+						EwlZb3Jrc2hpcmUxETAPBgNVBAcTCEJyYWRmb3JkMRkwFwYDVQQKExBCcmFkZm9y
+						ZCBDb2xsZWdlMSkwJwYDVQQDEyBzaGliYm9sZXRoLmJyYWRmb3JkY29sbGVnZS5h
+						Yy51azEpMCcGCSqGSIb3DQEJARYacm9vdEBicmFkZm9yZGNvbGxlZ2UuYWMudWuC
+						CQC3bJSC09OakDANBgkqhkiG9w0BAQUFAAOCAQEAQMSXezpcwMwJDj1eg9Y/I0gj
+						ArGP9oZIvPUX7l19e915ndg+eYaiDHNcjf+fMduiTS9SKd0HhGhki0FwLhbf//yX
+						0YGKyeBEdV2lz9WjXZelGt45DuMLBtMB2TFWxXizW5KAObNvrtTW2nYQLaZ8LkD4
+						yIPqH09eGC1qsTVOeHKlOT58VuXVL/UgKg4Qt09Tve327l1vkIoklaF62AX6cXKF
+						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>
+						MIIFCjCCA/KgAwIBAgIJALdslILT05qQMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYD
+						VQQGEwJHQjESMBAGA1UECBMJWW9ya3NoaXJlMREwDwYDVQQHEwhCcmFkZm9yZDEZ
+						MBcGA1UEChMQQnJhZGZvcmQgQ29sbGVnZTEpMCcGA1UEAxMgc2hpYmJvbGV0aC5i
+						cmFkZm9yZGNvbGxlZ2UuYWMudWsxKTAnBgkqhkiG9w0BCQEWGnJvb3RAYnJhZGZv
+						cmRjb2xsZWdlLmFjLnVrMB4XDTEzMTEwODEyMzI1OFoXDTIzMTEwNjEyMzI1OFow
+						gaUxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxETAPBgNVBAcTCEJy
+						YWRmb3JkMRkwFwYDVQQKExBCcmFkZm9yZCBDb2xsZWdlMSkwJwYDVQQDEyBzaGli
+						Ym9sZXRoLmJyYWRmb3JkY29sbGVnZS5hYy51azEpMCcGCSqGSIb3DQEJARYacm9v
+						dEBicmFkZm9yZGNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQCwYsDvkLqkCOFTHrZ3Er53jfoqYD9mq8d0KGt6BH/oaEhDf9LVLoTm
+						zDgu0dSsDBxCyoIWcyV2snrQ1SjkRRKc7km1Cqlt3X1F7HJwCd9ocJRkWOkJLCyv
+						o0lMzO9Fv1PcjWHwnJmFQom7WTrZ5bqAOYmvPJF03Mfbg5pQcNXZqSz0F4r7wJpX
+						4d0rU+sq2H27TDaIgwWZ2PU8vfLlYshctMv1b8h1wpyBwyLdidtov8yHXRjKuTmL
+						xYhHESz4j3Ji4bPY5Dry2mG+TVDbI8MKScdYxdIXaI51fwo5JtOv0mT3qAUD+RN+
+						TAg7YXpwS6X6dlQqqJDu6AbgDzAImq47AgMBAAGjggE5MIIBNTAJBgNVHRMEAjAA
+						MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
+						BgNVHQ4EFgQUvwyrftHX/bc1Rrx58TEml80zNagwgdoGA1UdIwSB0jCBz4AUvwyr
+						ftHX/bc1Rrx58TEml80zNaihgaukgagwgaUxCzAJBgNVBAYTAkdCMRIwEAYDVQQI
+						EwlZb3Jrc2hpcmUxETAPBgNVBAcTCEJyYWRmb3JkMRkwFwYDVQQKExBCcmFkZm9y
+						ZCBDb2xsZWdlMSkwJwYDVQQDEyBzaGliYm9sZXRoLmJyYWRmb3JkY29sbGVnZS5h
+						Yy51azEpMCcGCSqGSIb3DQEJARYacm9vdEBicmFkZm9yZGNvbGxlZ2UuYWMudWuC
+						CQC3bJSC09OakDANBgkqhkiG9w0BAQUFAAOCAQEAQMSXezpcwMwJDj1eg9Y/I0gj
+						ArGP9oZIvPUX7l19e915ndg+eYaiDHNcjf+fMduiTS9SKd0HhGhki0FwLhbf//yX
+						0YGKyeBEdV2lz9WjXZelGt45DuMLBtMB2TFWxXizW5KAObNvrtTW2nYQLaZ8LkD4
+						yIPqH09eGC1qsTVOeHKlOT58VuXVL/UgKg4Qt09Tve327l1vkIoklaF62AX6cXKF
+						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>
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
new file mode 100644
index 00000000..b1e15fd4
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.burnley.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?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>
+      <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
+						eS5hYy51azAeFw0xMjAyMTUxMDU2NDJaFw0zMjAyMTAxMDU2NDJaMHMxCzAJBgNV
+						BAYTAkdCMRAwDgYDVQQIEwdCdXJubGV5MRUwEwYDVQQHEwxPcm1lcm9kIFJvYWQx
+						GDAWBgNVBAoTD0J1cm5sZXkgQ29sbGVnZTEhMB8GA1UEAxMYc2hpYmJvbGV0aC5i
+						dXJubGV5LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu02J
+						nEVRwBDvdmovXS1AGkMGHjfX43NPkhCOkgIBw5eiN2ZqnijYvkt9abqueU6hPqQE
+						sOm09pPLBfqHGj2bWNVksv57Msym/17UFUQnA3v6B5WQeqYG4X96Ek5KwRp96flv
+						+wwzfdUq5eS5sekw9dNk9zT5vgfzcfWwvCS+ceiqu+yu7Jd2HlRl9f0PXgZWhxMK
+						ECIlXNbGmW5IErMiF1EBYBgcnP7mlq9wHXxx97KzmzSl2ZKpAFipp/tgslChrEgI
+						UjSRYOh7OsUH4B8cFAee7qjcm+GUY1oCH/g6qpg3jTaousib7RMrBeLYEgHaXjqy
+						vpTQpYhoUz3qayisYQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCMCpYGjy9m7F9i
+						r3iVWZU47F/HLYFD1k7vKpEwnotBHhb5SZMz0+uzEOv1axpp4gPb1m2J14G11Iz1
+						BR9vPcPg65pNjq1oE2G7UDV2gciosZZrioSF/DJuJuDrbxJegLruU2ESijSPR1wg
+						bhpDgRRK956nWY98DxglA1v+LqEQuEFve/Fn9HGfeW43xrmO1a6RuvtTI0HilcuN
+						T5S5xQpcCrkdevvm82/mNdA0aolYGIbnMkORSc3Mtphr4LxXm42SPa+JxVDiY0bJ
+						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>
+						MIIDYjCCAkoCCQC+CFHVE+EW0DANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJH
+						QjEQMA4GA1UECBMHQnVybmxleTEVMBMGA1UEBxMMT3JtZXJvZCBSb2FkMRgwFgYD
+						VQQKEw9CdXJubGV5IENvbGxlZ2UxITAfBgNVBAMTGHNoaWJib2xldGguYnVybmxl
+						eS5hYy51azAeFw0xMjAyMTUxMDU2NDJaFw0zMjAyMTAxMDU2NDJaMHMxCzAJBgNV
+						BAYTAkdCMRAwDgYDVQQIEwdCdXJubGV5MRUwEwYDVQQHEwxPcm1lcm9kIFJvYWQx
+						GDAWBgNVBAoTD0J1cm5sZXkgQ29sbGVnZTEhMB8GA1UEAxMYc2hpYmJvbGV0aC5i
+						dXJubGV5LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu02J
+						nEVRwBDvdmovXS1AGkMGHjfX43NPkhCOkgIBw5eiN2ZqnijYvkt9abqueU6hPqQE
+						sOm09pPLBfqHGj2bWNVksv57Msym/17UFUQnA3v6B5WQeqYG4X96Ek5KwRp96flv
+						+wwzfdUq5eS5sekw9dNk9zT5vgfzcfWwvCS+ceiqu+yu7Jd2HlRl9f0PXgZWhxMK
+						ECIlXNbGmW5IErMiF1EBYBgcnP7mlq9wHXxx97KzmzSl2ZKpAFipp/tgslChrEgI
+						UjSRYOh7OsUH4B8cFAee7qjcm+GUY1oCH/g6qpg3jTaousib7RMrBeLYEgHaXjqy
+						vpTQpYhoUz3qayisYQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCMCpYGjy9m7F9i
+						r3iVWZU47F/HLYFD1k7vKpEwnotBHhb5SZMz0+uzEOv1axpp4gPb1m2J14G11Iz1
+						BR9vPcPg65pNjq1oE2G7UDV2gciosZZrioSF/DJuJuDrbxJegLruU2ESijSPR1wg
+						bhpDgRRK956nWY98DxglA1v+LqEQuEFve/Fn9HGfeW43xrmO1a6RuvtTI0HilcuN
+						T5S5xQpcCrkdevvm82/mNdA0aolYGIbnMkORSc3Mtphr4LxXm42SPa+JxVDiY0bJ
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..6c0d058b
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						LnVrMB4XDTE0MDcwOTE0Mjk1OFoXDTM0MDcwNDE0Mjk1OFowbzELMAkGA1UEBhMC
+						R0IxEzARBgNVBAgTCk1hbmNoZXN0ZXIxDTALBgNVBAcTBEJ1cnkxFTATBgNVBAoT
+						DEJ1cnkgQ29sbGVnZTElMCMGA1UEAxMcc2hpYmJvbGV0aC5idXJ5Y29sbGVnZS5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAND/tL2yS5omqRAg
+						MRXvoOL7sdII0Bl3pe6mSPebwAIk252444CXXnPyYxNjjwTc4EKRNsI2KYAVgqRf
+						ng9+2bie34Qfb/xvgHN6wrh/oJRQCXaTt1fFLdOIVNKRNVEE5/Gij9ItT9RAWCgZ
+						oQsu6e5wIfxmkPARwDrhw99UfIlZG5vsrlISaxE+EWUZCjaJdBPwAEKbm9HF3/Zm
+						BQ2fldxbMSG0uBm17UNg606BmWlRthXlSG2mbvwEPTRnQ4n0vvOWIl6fFUD1iNUE
+						tX3Ay3ab3/FagvJ8jiwDXPZT6boXNYdd1zLwHsuHcAvphi+AxIW7xZ3kBAHHWQ6z
+						yIUdNQkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcU/my3lp/CHxZE45dOmGmex2
+						Smuni9Wzh9U01OHUiBzY7FTET4pdpitboZ/f7xRobnbHecFJfzHt3bVJDBDAPs/+
+						VHwRJP40SvrSDtq5fHA4L41sMZcHVfxFHmzQblgpBjuwUqcfsoEmg3/lCrk8zhef
+						wllZha3ZbPbLaTMqhttUtOhgZ+x3tJEvnoJJem9gXu6yAdQQooEtOvSebLbnxjL5
+						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>
+						MIIDWjCCAkICCQC8tl6skoCc8zANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJH
+						QjETMBEGA1UECBMKTWFuY2hlc3RlcjENMAsGA1UEBxMEQnVyeTEVMBMGA1UEChMM
+						QnVyeSBDb2xsZWdlMSUwIwYDVQQDExxzaGliYm9sZXRoLmJ1cnljb2xsZWdlLmFj
+						LnVrMB4XDTE0MDcwOTE0Mjk1OFoXDTM0MDcwNDE0Mjk1OFowbzELMAkGA1UEBhMC
+						R0IxEzARBgNVBAgTCk1hbmNoZXN0ZXIxDTALBgNVBAcTBEJ1cnkxFTATBgNVBAoT
+						DEJ1cnkgQ29sbGVnZTElMCMGA1UEAxMcc2hpYmJvbGV0aC5idXJ5Y29sbGVnZS5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAND/tL2yS5omqRAg
+						MRXvoOL7sdII0Bl3pe6mSPebwAIk252444CXXnPyYxNjjwTc4EKRNsI2KYAVgqRf
+						ng9+2bie34Qfb/xvgHN6wrh/oJRQCXaTt1fFLdOIVNKRNVEE5/Gij9ItT9RAWCgZ
+						oQsu6e5wIfxmkPARwDrhw99UfIlZG5vsrlISaxE+EWUZCjaJdBPwAEKbm9HF3/Zm
+						BQ2fldxbMSG0uBm17UNg606BmWlRthXlSG2mbvwEPTRnQ4n0vvOWIl6fFUD1iNUE
+						tX3Ay3ab3/FagvJ8jiwDXPZT6boXNYdd1zLwHsuHcAvphi+AxIW7xZ3kBAHHWQ6z
+						yIUdNQkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcU/my3lp/CHxZE45dOmGmex2
+						Smuni9Wzh9U01OHUiBzY7FTET4pdpitboZ/f7xRobnbHecFJfzHt3bVJDBDAPs/+
+						VHwRJP40SvrSDtq5fHA4L41sMZcHVfxFHmzQblgpBjuwUqcfsoEmg3/lCrk8zhef
+						wllZha3ZbPbLaTMqhttUtOhgZ+x3tJEvnoJJem9gXu6yAdQQooEtOvSebLbnxjL5
+						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>Pam</md:GivenName>
+    <md:SurName>Riley</md:SurName>
+    <md:EmailAddress>mailto:pam.riley@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
new file mode 100644
index 00000000..6ad32268
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.c2kqa.net-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?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:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">c2kqa.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDOzCCAiOgAwIBAgIUOmrWnoGvFDkaJ0RFpEBraZk80cMwDQYJKoZIhvcNAQEF
+						BQAwHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5jMmtxYS5uZXQwHhcNMTAwNjIzMTAy
+						OTA0WhcNMzAwNjIzMTAyOTA0WjAfMR0wGwYDVQQDExRzaGliYm9sZXRoLmMya3Fh
+						Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAaXKjkiDo2I09Y
+						lpyzrWyIg2MrK0AKi5dIi5Svue8pv9XXCwhlBaFqvPZgmI6isdCUzOXAh0lV/XzY
+						OEvvQsBVoEeebWpWm7pPOS8rtGYuUvwFPkdi6MyXsVw7Ei+d70rFeKJijNbhnMkg
+						oMRk/pRTPROQCffl4SqmFAqb2vn+L4XbXcXdcT/bhaxitbjalTffvx3PrGhco/D1
+						wjWxoR9kY8Q6t9K9/8hnZU3xlUUqy5Viq5fCacu7zv9frhZ1O85p6F/NZSwnKQq0
+						wZrbDDBGwXHVh4IMIwVLTaCmB7gNUWTfo0dOPKjakUMNaIEsyDt6KNRe0CGslv3J
+						eVzKMJcCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmJvbGV0aC5jMmtxYS5uZXSG
+						K2h0dHBzOi8vc2hpYmJvbGV0aC5jMmtxYS5uZXQvaWRwL3NoaWJib2xldGgwHQYD
+						VR0OBBYEFOA3DMt6qji7fUywGEUlp+SNCqGGMA0GCSqGSIb3DQEBBQUAA4IBAQBj
+						CI4GK5AcY+NYY3twlyOt4BTjECTWTndFbctqKM1eLgNOrucaKchRGoqZUs5TOjpM
+						DWTD6sROH1SSmPb+igQeR7H1hLBsVCHt25WCNfaSlw9v4s1+6H78iugY30bdP00/
+						wx1YQ8oQAT/f0u0QyNCmwHrFc3Z0KL7Ep/Ja8Dv2BfKXZ2D1epNins1ehZeMbEbT
+						/FYibzNtKmBDmCiTF20Bglf6nJySn8cN31z+VlHQNZxyCz/vae4TfgOktsDN7AOL
+						q3KitZrzJZ0KGE9R1nnKSuW86fm+eLp6ai0jhUZP9NV+uUb/O4wRuJP8JTec0tjd
+						DE3ljx9HJYZ7RbLYPnxd
+					</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 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">c2kqa.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDOzCCAiOgAwIBAgIUOmrWnoGvFDkaJ0RFpEBraZk80cMwDQYJKoZIhvcNAQEF
+						BQAwHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5jMmtxYS5uZXQwHhcNMTAwNjIzMTAy
+						OTA0WhcNMzAwNjIzMTAyOTA0WjAfMR0wGwYDVQQDExRzaGliYm9sZXRoLmMya3Fh
+						Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAaXKjkiDo2I09Y
+						lpyzrWyIg2MrK0AKi5dIi5Svue8pv9XXCwhlBaFqvPZgmI6isdCUzOXAh0lV/XzY
+						OEvvQsBVoEeebWpWm7pPOS8rtGYuUvwFPkdi6MyXsVw7Ei+d70rFeKJijNbhnMkg
+						oMRk/pRTPROQCffl4SqmFAqb2vn+L4XbXcXdcT/bhaxitbjalTffvx3PrGhco/D1
+						wjWxoR9kY8Q6t9K9/8hnZU3xlUUqy5Viq5fCacu7zv9frhZ1O85p6F/NZSwnKQq0
+						wZrbDDBGwXHVh4IMIwVLTaCmB7gNUWTfo0dOPKjakUMNaIEsyDt6KNRe0CGslv3J
+						eVzKMJcCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmJvbGV0aC5jMmtxYS5uZXSG
+						K2h0dHBzOi8vc2hpYmJvbGV0aC5jMmtxYS5uZXQvaWRwL3NoaWJib2xldGgwHQYD
+						VR0OBBYEFOA3DMt6qji7fUywGEUlp+SNCqGGMA0GCSqGSIb3DQEBBQUAA4IBAQBj
+						CI4GK5AcY+NYY3twlyOt4BTjECTWTndFbctqKM1eLgNOrucaKchRGoqZUs5TOjpM
+						DWTD6sROH1SSmPb+igQeR7H1hLBsVCHt25WCNfaSlw9v4s1+6H78iugY30bdP00/
+						wx1YQ8oQAT/f0u0QyNCmwHrFc3Z0KL7Ep/Ja8Dv2BfKXZ2D1epNins1ehZeMbEbT
+						/FYibzNtKmBDmCiTF20Bglf6nJySn8cN31z+VlHQNZxyCz/vae4TfgOktsDN7AOL
+						q3KitZrzJZ0KGE9R1nnKSuW86fm+eLp6ai0jhUZP9NV+uUb/O4wRuJP8JTec0tjd
+						DE3ljx9HJYZ7RbLYPnxd
+					</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:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.c2kqa.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</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/shibboleth.cambridge.org-shibboleth-sp.xml b/swamid-interfederations-2.0/shibboleth.cambridge.org-shibboleth-sp.xml
new file mode 100644
index 00000000..e7201b3c
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.cambridge.org-shibboleth-sp.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIFVTCCBD2gAwIBAgIQO9N4D50Dc9cwSe8N1yLYVzANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTQwOTI5
+						MDAwMDAwWhcNMTYwOTI4MjM1OTU5WjCBoTELMAkGA1UEBhMCR0IxFzAVBgNVBAgT
+						DkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHFAlDYW1icmlkZ2UxIzAhBgNVBAoUGkNh
+						bWJyaWRnZSBVbml2ZXJzaXR5IFByZXNzMR0wGwYDVQQLFBRJbmZvcm1hdGlvbiBT
+						ZXJ2aWNlczEhMB8GA1UEAxQYc2hpYmJvbGV0aC5jYW1icmlkZ2Uub3JnMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt2Ofo7vlrETNfNCDgn7biPRQ6hcB
+						/CTA+LxQwZeDt/ib3gdfnnoPvBVTd4hyLZRCvwL+5plgYSVrqLSbLbHQR6kCwHAH
+						jexj8CJWOG/Kozy0MgNbOfrzhQ8RZWwxB7/RIH6d5FpJKtZ+RyrN/Ms43HjLwfNo
+						x5d2N9X25q6gPg9Zmk2OJTPbj0UUhFN3ktL05ONWRU7E4Q1Hw7W9ChMxpMy/QftW
+						2ewCMT7+5th31HbAwhMm6yhA0qGy2A/hY75ULpd/Ira3OV65QVyEfSD7x+ZszAgc
+						Rcq0iXLDFzuNcz7MyNht1EZNhgy3tx2+nBY+V4pCkpqC3ofq8aIlXUet3QIDAQAB
+						o4IBcTCCAW0wIwYDVR0RBBwwGoIYc2hpYmJvbGV0aC5jYW1icmlkZ2Uub3JnMAkG
+						A1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMCsGA1UdHwQkMCIwIKAeoByGGmh0dHA6
+						Ly9zZC5zeW1jYi5jb20vc2QuY3JsMGUGA1UdIAReMFwwWgYKYIZIAYb4RQEHNjBM
+						MCMGCCsGAQUFBwIBFhdodHRwczovL2Quc3ltY2IuY29tL2NwczAlBggrBgEFBQcC
+						AjAZDBdodHRwczovL2Quc3ltY2IuY29tL3JwYTAdBgNVHSUEFjAUBggrBgEFBQcD
+						AQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUDURcFlNEwYJ+HSCrJfQBY9i+eaUwVwYI
+						KwYBBQUHAQEESzBJMB8GCCsGAQUFBzABhhNodHRwOi8vc2Quc3ltY2QuY29tMCYG
+						CCsGAQUFBzAChhpodHRwOi8vc2Quc3ltY2IuY29tL3NkLmNydDANBgkqhkiG9w0B
+						AQUFAAOCAQEACZOZGk5CunXPz+ceERyAtjpwXIaeI1hb8OYTtz8U5yPEHvzRTC+L
+						yWrcVOSZ46esMYOMaTxrCljd3XEBTVeuNDg+guiNS8UsU5WQNxdHubzJ9coxsqX5
+						2YEDY4zCSo/GMTI5lz5QKWRmKx1TLzfz2v6pvqVmYBW9eAq7dH9GqQCGlh7bhzOp
+						rLk0pczCE3uRGx+U6l+lMCT/vtfKPUesSkmhcLyfHS+esyPJ7ve9KoAoISmkYmjQ
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.camsfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.camsfc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..b8606182
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.camsfc.ac.uk-shibboleth.xml
@@ -0,0 +1,116 @@
+<?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>
+      <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>
+						MIIDqDCCApACCQDwANC11k/QRTANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC
+						R0IxEDAOBgNVBAgTB0NoZWFkbGUxETAPBgNVBAcTCENoZXNoaXJlMS4wLAYDVQQK
+						EyVDaGVhZGxlIGFuZCBNYXJwbGUgU2l4dGggRm9ybSBDb2xsZWdlMQ8wDQYDVQQL
+						EwZDQU1TRkMxIDAeBgNVBAMTF3NoaWJib2xldGguY2Ftc2ZjLmFjLnVrMB4XDTE0
+						MDkxMDA5NTAxM1oXDTM0MDkwNTA5NTAxM1owgZUxCzAJBgNVBAYTAkdCMRAwDgYD
+						VQQIEwdDaGVhZGxlMREwDwYDVQQHEwhDaGVzaGlyZTEuMCwGA1UEChMlQ2hlYWRs
+						ZSBhbmQgTWFycGxlIFNpeHRoIEZvcm0gQ29sbGVnZTEPMA0GA1UECxMGQ0FNU0ZD
+						MSAwHgYDVQQDExdzaGliYm9sZXRoLmNhbXNmYy5hYy51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBALWoieHqdYIyK9llKMreLfw+cesAbbzWLjzwf02H
+						WiYZbu7oS8XYciMNI4fKxq7GNuJ7AmaoRXcdIftWVgyKkYQtPqquBw0PLZng0T00
+						aEwbfLLlnm34XeacBdx2rNp4dui4OBm3qVI+qDFGNTCCOA+ZrGcSbgItsjvLAeN2
+						uzttrVkFr6/Cyj4//oYTi4SWw1Hj7VBWk6flZzUIDBsGL2Z5A5hlKrrmsZ3t3ifD
+						SwCioXaemR8yH6k1QqBv3hD94iYJGvHN4OTHqe6/icpUv9FzgGV9VwMAhbvKIUkM
+						MtxEJWfHt15HOnBskmpX4+OUC0iugxmraNTmMFflWAWLBcUCAwEAATANBgkqhkiG
+						9w0BAQUFAAOCAQEAHxg3UuDrKkAPNdPNySJYL1zynlQWmmdK9ZO4dAPUPl8a0Avq
+						3KSwrukc+XTOfpQVOBlSf8JdqzANPaBW1Q9a4CKqu/Qm6T4I9EoRrgeo/8BsZ2em
+						4Kx2U3lm3CLLW8hROcppUG2h+MPGxcQ4i7GqphKdn/NYLDBkPVQqWwKWtuqHOCr/
+						Tda5UoqXbj6fZAnihorAj7enYU3EniX+yZaXEdmnL7lPQkAdWYylnwNkHOOE+Riz
+						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>
+						MIIDqDCCApACCQDwANC11k/QRTANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC
+						R0IxEDAOBgNVBAgTB0NoZWFkbGUxETAPBgNVBAcTCENoZXNoaXJlMS4wLAYDVQQK
+						EyVDaGVhZGxlIGFuZCBNYXJwbGUgU2l4dGggRm9ybSBDb2xsZWdlMQ8wDQYDVQQL
+						EwZDQU1TRkMxIDAeBgNVBAMTF3NoaWJib2xldGguY2Ftc2ZjLmFjLnVrMB4XDTE0
+						MDkxMDA5NTAxM1oXDTM0MDkwNTA5NTAxM1owgZUxCzAJBgNVBAYTAkdCMRAwDgYD
+						VQQIEwdDaGVhZGxlMREwDwYDVQQHEwhDaGVzaGlyZTEuMCwGA1UEChMlQ2hlYWRs
+						ZSBhbmQgTWFycGxlIFNpeHRoIEZvcm0gQ29sbGVnZTEPMA0GA1UECxMGQ0FNU0ZD
+						MSAwHgYDVQQDExdzaGliYm9sZXRoLmNhbXNmYy5hYy51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBALWoieHqdYIyK9llKMreLfw+cesAbbzWLjzwf02H
+						WiYZbu7oS8XYciMNI4fKxq7GNuJ7AmaoRXcdIftWVgyKkYQtPqquBw0PLZng0T00
+						aEwbfLLlnm34XeacBdx2rNp4dui4OBm3qVI+qDFGNTCCOA+ZrGcSbgItsjvLAeN2
+						uzttrVkFr6/Cyj4//oYTi4SWw1Hj7VBWk6flZzUIDBsGL2Z5A5hlKrrmsZ3t3ifD
+						SwCioXaemR8yH6k1QqBv3hD94iYJGvHN4OTHqe6/icpUv9FzgGV9VwMAhbvKIUkM
+						MtxEJWfHt15HOnBskmpX4+OUC0iugxmraNTmMFflWAWLBcUCAwEAATANBgkqhkiG
+						9w0BAQUFAAOCAQEAHxg3UuDrKkAPNdPNySJYL1zynlQWmmdK9ZO4dAPUPl8a0Avq
+						3KSwrukc+XTOfpQVOBlSf8JdqzANPaBW1Q9a4CKqu/Qm6T4I9EoRrgeo/8BsZ2em
+						4Kx2U3lm3CLLW8hROcppUG2h+MPGxcQ4i7GqphKdn/NYLDBkPVQqWwKWtuqHOCr/
+						Tda5UoqXbj6fZAnihorAj7enYU3EniX+yZaXEdmnL7lPQkAdWYylnwNkHOOE+Riz
+						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>
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
new file mode 100644
index 00000000..071e6933
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.cavc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzHe0UQloxGjG
+						ZSgJRA29yJy7PZGb8Dnt4+BvZfJUZN2Pyo2MzXgDzDN1XuX+STZboJJDF5O/yzsH
+						HHk//noti8fyc5HcZrFUj8fkqtHgOlqwWCootKydYBdqxDY7V6RCZIcFXUf9INfQ
+						Lw49oTnTGBD82+q4QCNq3vU4xVosiyz2MOMcK8bka4QIThU0u9JeKd3e93/jWWhj
+						ccuPzn/vplmhWlubEznTDRu2KEeJMy6mKl1srJYvur+iQitTVZgb3tn4wLG2AWve
+						NTZ0oSh71IsHtx/utcFuKUHbILjWaw/6QQNhIoTCwrB8ADclhsZnxbMUEDUXJcMB
+						YbEH7f9B4QIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLmNhdmMuYWMu
+						dWuGLGh0dHBzOi8vc2hpYmJvbGV0aC5jYXZjLmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MB0GA1UdDgQWBBRy33u71EP4CwAaRU0KGQfUaXZUTTANBgkqhkiG9w0BAQUFAAOC
+						AQEAIcImOx9qUjZJEeywXVQfG4LLMWVAfwWa/kaa99HgSkiP+I1ZyYszSP7uq08X
+						6ZCmuNuKnmFPdvcXlRmXtDnIJAxGzUnz7MmxZQM33oI9SCmMpjZs8hAGM/rv4umc
+						jv2oS0AuPs4zUKf+FtlkLozX/MLYFWGA1k2DWkMpX0NhkO6x/2L0U7R80KEV7kjt
+						S3mGmEvdiB1r5NGqANDV0tnMuBTD8QZ1QJk4ysLfZlB/OuMcqyNX5ltn2B0DCO00
+						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>
+						MIIDPzCCAiegAwIBAgIUH99VjfXgjcBNReQ0wEed9egxoRQwDQYJKoZIhvcNAQEF
+						BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5jYXZjLmFjLnVrMB4XDTEzMDgwNjEw
+						MzcxM1oXDTMzMDgwNjEwMzcxM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5jYXZj
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzHe0UQloxGjG
+						ZSgJRA29yJy7PZGb8Dnt4+BvZfJUZN2Pyo2MzXgDzDN1XuX+STZboJJDF5O/yzsH
+						HHk//noti8fyc5HcZrFUj8fkqtHgOlqwWCootKydYBdqxDY7V6RCZIcFXUf9INfQ
+						Lw49oTnTGBD82+q4QCNq3vU4xVosiyz2MOMcK8bka4QIThU0u9JeKd3e93/jWWhj
+						ccuPzn/vplmhWlubEznTDRu2KEeJMy6mKl1srJYvur+iQitTVZgb3tn4wLG2AWve
+						NTZ0oSh71IsHtx/utcFuKUHbILjWaw/6QQNhIoTCwrB8ADclhsZnxbMUEDUXJcMB
+						YbEH7f9B4QIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLmNhdmMuYWMu
+						dWuGLGh0dHBzOi8vc2hpYmJvbGV0aC5jYXZjLmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MB0GA1UdDgQWBBRy33u71EP4CwAaRU0KGQfUaXZUTTANBgkqhkiG9w0BAQUFAAOC
+						AQEAIcImOx9qUjZJEeywXVQfG4LLMWVAfwWa/kaa99HgSkiP+I1ZyYszSP7uq08X
+						6ZCmuNuKnmFPdvcXlRmXtDnIJAxGzUnz7MmxZQM33oI9SCmMpjZs8hAGM/rv4umc
+						jv2oS0AuPs4zUKf+FtlkLozX/MLYFWGA1k2DWkMpX0NhkO6x/2L0U7R80KEV7kjt
+						S3mGmEvdiB1r5NGqANDV0tnMuBTD8QZ1QJk4ysLfZlB/OuMcqyNX5ltn2B0DCO00
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml
new file mode 100644
index 00000000..1b42528e
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC5TCCAc2gAwIBAgIJAPVbJWGWsfPlMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+						BAMTCmN2LXNoaWJiaWUwHhcNMTQwMjAzMjIzMjQ3WhcNMjQwMjAxMjIzMjQ3WjAV
+						MRMwEQYDVQQDEwpjdi1zaGliYmllMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAnV1dwqyl8MfIyVDZGPZRTmEeNsJrZzWY5wFR/35trfu2bfnjRyJuuKGZ
+						aMj90GOwidzqXbLxbgjwbUb6RuhvOoYUHTtyohu0CWBU3e/aU4G4Ls6BmikRHrSr
+						6aT6u4AFFf9v4yxO33ReJME++3wVVNPI5v+kb/MGc6FJ2PAjj4lyAetxciTFmgwq
+						GiuVPklxqCK/j0KrIeE284b7DsP5HpZYjiW4wRATPfRym86vxWwrWIlBM/xSYvb1
+						rnGImAhg0fxTQWteHkZKscBENZCGZl8GWF6NqzqeQcvqCZOBXMHXY3ct5+M/IaSJ
+						YcVg19SOyoyukEUjQzppN5zMvUMX7wIDAQABozgwNjAVBgNVHREEDjAMggpjdi1z
+						aGliYmllMB0GA1UdDgQWBBQxeZ/BBNNlmEB5ICBbpXjIjxUFmzANBgkqhkiG9w0B
+						AQUFAAOCAQEAjjtVTDqGA+4JL2WbtqFxubs2yWHLPgkKFHNZmdryZ9EX383Gs0Ca
+						3HrzTAkuJ9aZLDYdWbfxiSWePEcNYhnSKM1EmPo2BV3oVbtODDRJNcQC1fdHJHXJ
+						1RdFLgH0TlaYLT0JhwCO89P87JGP0+5toAe1opZW+nYI+AzNvq4m7IBovB92/GPq
+						iF49vK9SE3cKIQt+ICcLmrbU38hVtA6HDc0YxSC1CgGJOrx7RjG2+iwmcXCqnC7Y
+						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="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Newman</md:SurName>
+    <md:EmailAddress>mailto:chris.newman@clickview.co.uk</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:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Newman</md:SurName>
+    <md:EmailAddress>mailto:chris.newman@clickview.co.uk</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
new file mode 100644
index 00000000..31146674
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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="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>
+					      MIIDNDCCAhygAwIBAgIVAPGwxNIFT88TgM2ndmBAqxnLIgA6MA0GCSqGSIb3DQEB
+BQUAMB0xGzAZBgNVBAMTEnNoaWJib2xldGguY25kcC5mcjAeFw0xMzEwMzEwODE0
+MTJaFw0zMzEwMzEwODE0MTJaMB0xGzAZBgNVBAMTEnNoaWJib2xldGguY25kcC5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANcmMpskeoFHzssZUII5
+4pz7M6i7OXbgHJZR9pMGoAz5vOOt9cjmPsh+ZFkW2tjGAk4dEMzUrdk3lqhMjwdr
+06Nw2FBqUYKG/OP//lPOaYYyF7VaUei4Da7KL+NMsUW4S8gACmwl7NwqCTnhaXQ9
+D8J6ChWjaxQmvUDYVG8ktDsqwbrzUqq+yAbCd6i5EOZOJ169Xg/Y0IUiPMREU7ho
+yQfQHnw7bmkMSIOjoOkEFZK7zZzr0+ce3ZUTjCimv9ys7NCLDSJWVvifwHt2lRFG
+iRaIPyn6Oh308mmoizVTCalVRoYV0w+gVu9d0/WOt3Zj+DaCKIB+eOL0YTylZNTr
+4g0CAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYmJvbGV0aC5jbmRwLmZyhilodHRw
+czovL3NoaWJib2xldGguY25kcC5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+B/TrtIJ0tEcByCbKeQMho+xJCQMwDQYJKoZIhvcNAQEFBQADggEBAF+sG6yrz/ao
+30uEN8NpTHFmuiFjFeInMboFMb987yjaA1RonVH3+VquF92H1e8ZDBZK/VRdP7xi
+V42K4OajjP8NYPl0+JwHEvJaGNEhXOm1NNhCw6o/H+VYcqtriqunZc5Ob4p6vsXA
+8IC4FI56+0/UFMFrCPpXh5f/3JrjYAzLACLZAOsD4G3eBWdtnfn5oEz1Prpq6U6a
+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://unknown.site.com</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.cranfield.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cranfield.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..b6271ba5
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.cranfield.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?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>
+      <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
+						ZXBhcnRtZW50MSMwIQYDVQQDExpzaGliYm9sZXRoLmNyYW5maWVsZC5hYy51azEm
+						MCQGCSqGSIb3DQEJARYXc3lzdGVtc0BjcmFuZmllbGQuYWMudWswHhcNMTIwODE1
+						MTQzNDAyWhcNMjIwODEzMTQzNDAyWjCBvDELMAkGA1UEBhMCR0IxFTATBgNVBAgT
+						DEJlZGZvcmRzaGlyZTESMBAGA1UEBxMJQ3JhbmZpZWxkMR0wGwYDVQQKExRDcmFu
+						ZmllbGQgVW5pdmVyc2l0eTEWMBQGA1UECxMNSVQgRGVwYXJ0bWVudDEjMCEGA1UE
+						AxMac2hpYmJvbGV0aC5jcmFuZmllbGQuYWMudWsxJjAkBgkqhkiG9w0BCQEWF3N5
+						c3RlbXNAY3JhbmZpZWxkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEArQKTDHzFCgeJlA5Ihl8bKlVKmOvvTb9hzAEVRKaJJV7SEhzGEfVMdy48
+						MAYvF7MxGmSFmDlUQGIEdQIaV+4GKikmArV5HvQijm/REkyChWhv6cqbWrweWg2k
+						IxwvLwYDy6e3tqfyGoGODstlqT6Paacu0y/WGi6XqczrVqr6pFITc0qfGopqOxTO
+						S8VTCbucP5T85NDuG2g58TRYAEwX6UX5Lpzl22HRrQxm9yBxydzF9eidb9N2QLFJ
+						fsl9nAWzAcf1wIfJr2IQwjeNUG+971To0nToQwT8wUm//IhiXqcynbWOCuIgWCnr
+						NpMhzqaVgo7MrJ5hJusDN6aWxaN8wwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQUJR+QfdHNcDVCRxPsYFyKxIATcAAwHwYDVR0jBBgwFoAUJR+QfdHNcDVCRxPs
+						YFyKxIATcAAwDQYJKoZIhvcNAQEFBQADggEBAIKd+Q/1umHnB0U4yJMmz60kXEn2
+						4V7hWArz9KGhwKLcHKM3lMdMzvFIdXDXVp0XWeorzD0fboFtOpIN8+Lmgo5la3rR
+						P5NozQTzlC6ga8zKBjhjaELLhiTBKJ5KWpe/xF1qY6qSO1Id35gjx9zOnsT5Xdkz
+						jJZspa0idepzJcotgx/YCQvfz6LGQpK7yx4lzKJyLXC0vLGjK3ZHPBVgfVlvFEpm
+						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>
+						MIIEeDCCA2CgAwIBAgIJAMVh01FmcQItMA0GCSqGSIb3DQEBBQUAMIG8MQswCQYD
+						VQQGEwJHQjEVMBMGA1UECBMMQmVkZm9yZHNoaXJlMRIwEAYDVQQHEwlDcmFuZmll
+						bGQxHTAbBgNVBAoTFENyYW5maWVsZCBVbml2ZXJzaXR5MRYwFAYDVQQLEw1JVCBE
+						ZXBhcnRtZW50MSMwIQYDVQQDExpzaGliYm9sZXRoLmNyYW5maWVsZC5hYy51azEm
+						MCQGCSqGSIb3DQEJARYXc3lzdGVtc0BjcmFuZmllbGQuYWMudWswHhcNMTIwODE1
+						MTQzNDAyWhcNMjIwODEzMTQzNDAyWjCBvDELMAkGA1UEBhMCR0IxFTATBgNVBAgT
+						DEJlZGZvcmRzaGlyZTESMBAGA1UEBxMJQ3JhbmZpZWxkMR0wGwYDVQQKExRDcmFu
+						ZmllbGQgVW5pdmVyc2l0eTEWMBQGA1UECxMNSVQgRGVwYXJ0bWVudDEjMCEGA1UE
+						AxMac2hpYmJvbGV0aC5jcmFuZmllbGQuYWMudWsxJjAkBgkqhkiG9w0BCQEWF3N5
+						c3RlbXNAY3JhbmZpZWxkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEArQKTDHzFCgeJlA5Ihl8bKlVKmOvvTb9hzAEVRKaJJV7SEhzGEfVMdy48
+						MAYvF7MxGmSFmDlUQGIEdQIaV+4GKikmArV5HvQijm/REkyChWhv6cqbWrweWg2k
+						IxwvLwYDy6e3tqfyGoGODstlqT6Paacu0y/WGi6XqczrVqr6pFITc0qfGopqOxTO
+						S8VTCbucP5T85NDuG2g58TRYAEwX6UX5Lpzl22HRrQxm9yBxydzF9eidb9N2QLFJ
+						fsl9nAWzAcf1wIfJr2IQwjeNUG+971To0nToQwT8wUm//IhiXqcynbWOCuIgWCnr
+						NpMhzqaVgo7MrJ5hJusDN6aWxaN8wwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQUJR+QfdHNcDVCRxPsYFyKxIATcAAwHwYDVR0jBBgwFoAUJR+QfdHNcDVCRxPs
+						YFyKxIATcAAwDQYJKoZIhvcNAQEFBQADggEBAIKd+Q/1umHnB0U4yJMmz60kXEn2
+						4V7hWArz9KGhwKLcHKM3lMdMzvFIdXDXVp0XWeorzD0fboFtOpIN8+Lmgo5la3rR
+						P5NozQTzlC6ga8zKBjhjaELLhiTBKJ5KWpe/xF1qY6qSO1Id35gjx9zOnsT5Xdkz
+						jJZspa0idepzJcotgx/YCQvfz6LGQpK7yx4lzKJyLXC0vLGjK3ZHPBVgfVlvFEpm
+						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>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.crous-poitiers.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..8a1d6aec
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.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-22T15:55: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>
+      <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="fr">CROUS Poitiers - 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>
+					      MIIDWzCCAkOgAwIBAgIUMWKZ8/6tKA7kwdsn4f4/cqyDED0wDQYJKoZIhvcNAQEF
+BQAwJzElMCMGA1UEAxMcc2hpYmJvbGV0aC5jcm91cy1wb2l0aWVycy5mcjAeFw0x
+MDA2MTAxMzMyNTNaFw0zMDA2MTAxMzMyNTNaMCcxJTAjBgNVBAMTHHNoaWJib2xl
+dGguY3JvdXMtcG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCax6s86p49Xf1m/noYZtAqbN3LTSLj2rpuCe9jcMM9Gpf4X6p0btKZtWVq
+PMyJ+1oytarshKxBGV7m1U3MkZu88/Bn1OykynsaPPFYCraOWIawJRFJL2t45/By
+K7LVjmahS2JJj5qfVNuFNL4MsrfNieEZjZHdE/B9FZR4ME5sxwH44WvHEOnmumO7
+l6GY8pHrWp8e0HDXf8Y1gn3dj4u0tNs5GBDVygqXgPKsSRi8IHAHKxbNuWx+PDWZ
+m25S2ouiGO27vkIYYPWvFjyxNqe0KFVD6yVYVoWdHFM7rskYJqE+iinmLpgE+tZX
+Q2oMnhEZlFeUiSzKq21Pi07JAwfHAgMBAAGjfzB9MFwGA1UdEQRVMFOCHHNoaWJi
+b2xldGguY3JvdXMtcG9pdGllcnMuZnKGM2h0dHBzOi8vc2hpYmJvbGV0aC5jcm91
+cy1wb2l0aWVycy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhXma4CxtS0tm
+sfkbl1uusiIUhq8wDQYJKoZIhvcNAQEFBQADggEBAGzVwbgJ/j2DYjRc8NR7NnDG
+1FAueaBwSVOPe/zawt1M/nNhyHeIAXzsMaLLTptJmXSI1NYH8Zf0ZePlTj34W+iM
+MMYtACZXOqn9MROynG9sUKwh3qTe+yrskUoemApa/WndPY3mlEmoee5v7mJnD70Q
+asxkqS76pkUhyQAUBIZs2XwAdKamI/Fo3kfiOI/3GAFjQObwwnsg9fQLGq/jO8gK
+n44H8PXS4Vf4LLnN8kOUlNvmDD0us5c73Gli/rg/cKTptN1l+TbZ97qBqjTofxPa
+uPReZV8LGAFTW7W5OYm6HcXR3TA/vVBHjBqTmNFZ7/8t8dmgZ5uNGJNLsSgBhg8=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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.crous-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.crous-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.crous-poitiers.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Poitiers - Etudiants</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Poitiers - Etudiants</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</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/shibboleth.derby.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..f4e89614
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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>
+      <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 Shibboleth</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>
+						MIIDjDCCAnQCCQDB/+b3WBJu4jANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
+						R0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUxDjAMBgNVBAcMBURlcmJ5MRwwGgYDVQQK
+						DBNVbml2ZXJzaXR5IG9mIERlcmJ5MRQwEgYDVQQLDAtJVCBTZXJ2aWNlczEfMB0G
+						A1UEAwwWc2hpYmJvbGV0aC5kZXJieS5hYy51azAeFw0xNDA2MDIxNDI3MDBaFw0z
+						NDA1MjgxNDI3MDBaMIGHMQswCQYDVQQGEwJHQjETMBEGA1UECAwKRGVyYnlzaGly
+						ZTEOMAwGA1UEBwwFRGVyYnkxHDAaBgNVBAoME1VuaXZlcnNpdHkgb2YgRGVyYnkx
+						FDASBgNVBAsMC0lUIFNlcnZpY2VzMR8wHQYDVQQDDBZzaGliYm9sZXRoLmRlcmJ5
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyaG4GcFLhW2i
+						LUYQjbt0nWR4lff3ePqBKhJbkWPdOe35XpvjmJxivjq81mbm413kBgxowFFoCusE
+						weZsikrolFyP5VTMGPB+W6aUyY5Y1DeYx7c4hsk5eMusH4jaL07jHxEhhhTfzadW
+						B4gdiN2SOZ3+xTGzB8jTe7D25Ybao+zGSssBwJbB5+72cdDGxS+n/eCVzVHYbnXm
+						lOnjfre31eZ+IO5ZBUje0fO/gd1kr9pEUsmo3PSw080iFrWriDxzFVa8z0zEd6EO
+						tdFmz6ySbiehdCMk8SIXH3UcWUooZ4PaNvvUt7j/rm7sg7tn8Mj+RrolaKvnHMnk
+						P3zR71nQywIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBRrEfwYWy6FI49DHbVj/5t
+						uFEhgyUR45mSX6f4YEZ7aUiwSPsXKdsceKhiJYKtVZCX9cELHAIyHED3fOpfRy7y
+						5g+9Fw2fBY6jPnh3EabPcR6W4RRtj4ZdOTl8K0frMzfJ6GfRCu17JJCPxNVML8lK
+						qgZjHrxaYoVYcuk9ruVRVZrwVE6HyB75TC8SGz/562HZ/888QhiWQfLbI0H0Xdx6
+						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>
+						MIIDjDCCAnQCCQDB/+b3WBJu4jANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
+						R0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUxDjAMBgNVBAcMBURlcmJ5MRwwGgYDVQQK
+						DBNVbml2ZXJzaXR5IG9mIERlcmJ5MRQwEgYDVQQLDAtJVCBTZXJ2aWNlczEfMB0G
+						A1UEAwwWc2hpYmJvbGV0aC5kZXJieS5hYy51azAeFw0xNDA2MDIxNDI3MDBaFw0z
+						NDA1MjgxNDI3MDBaMIGHMQswCQYDVQQGEwJHQjETMBEGA1UECAwKRGVyYnlzaGly
+						ZTEOMAwGA1UEBwwFRGVyYnkxHDAaBgNVBAoME1VuaXZlcnNpdHkgb2YgRGVyYnkx
+						FDASBgNVBAsMC0lUIFNlcnZpY2VzMR8wHQYDVQQDDBZzaGliYm9sZXRoLmRlcmJ5
+						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyaG4GcFLhW2i
+						LUYQjbt0nWR4lff3ePqBKhJbkWPdOe35XpvjmJxivjq81mbm413kBgxowFFoCusE
+						weZsikrolFyP5VTMGPB+W6aUyY5Y1DeYx7c4hsk5eMusH4jaL07jHxEhhhTfzadW
+						B4gdiN2SOZ3+xTGzB8jTe7D25Ybao+zGSssBwJbB5+72cdDGxS+n/eCVzVHYbnXm
+						lOnjfre31eZ+IO5ZBUje0fO/gd1kr9pEUsmo3PSw080iFrWriDxzFVa8z0zEd6EO
+						tdFmz6ySbiehdCMk8SIXH3UcWUooZ4PaNvvUt7j/rm7sg7tn8Mj+RrolaKvnHMnk
+						P3zR71nQywIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBRrEfwYWy6FI49DHbVj/5t
+						uFEhgyUR45mSX6f4YEZ7aUiwSPsXKdsceKhiJYKtVZCX9cELHAIyHED3fOpfRy7y
+						5g+9Fw2fBY6jPnh3EabPcR6W4RRtj4ZdOTl8K0frMzfJ6GfRCu17JJCPxNVML8lK
+						qgZjHrxaYoVYcuk9ruVRVZrwVE6HyB75TC8SGz/562HZ/888QhiWQfLbI0H0Xdx6
+						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 Shibboleth</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.dundeeandangus.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.dundeeandangus.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..f49774fd
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.dundeeandangus.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,125 @@
+<?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>
+      <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>
+						MIIDaTCCAlGgAwIBAgIUOOzCa1peQPJkYnPUCVHoA+pzk+UwDQYJKoZIhvcNAQEF
+						BQAwKjEoMCYGA1UEAxMfc2hpYmJvbGV0aC5kdW5kZWVhbmRhbmd1cy5hYy51azAe
+						Fw0xNDAzMDQyMTIxNDlaFw0zNDAzMDQyMTIxNDlaMCoxKDAmBgNVBAMTH3NoaWJi
+						b2xldGguZHVuZGVlYW5kYW5ndXMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
+						DwAwggEKAoIBAQCG2sBuC7Mb3oSBWgAfzmW3W3Fij3UeBb7+9WKK3dwMYminLoii
+						tjrz4muGd6kDAZAZ+kOihheh7gkaEmPpwo1x422cJ6MVWf1/FVKs6pV33GVGVgrj
+						XtVxr5KdSiwhlGh5xDVUga8zM68PULLT65ISWl7MnMPETIZTZDZoKZVXoFlPsVc3
+						vRIciFJB0Zh7TxwccN8pWx9ZbPkqkyIDZ4OajnflX6nEDVY+JgNRvaCndfxRlvhi
+						AdTXRldjdsJEW9UMY8fUBI11ZX8Cf5L05GOCQm38kzlb2hdCQAQBZiJGbKStxcSs
+						gxntCMX+E0yp+NAaYTI6hTgJcjRbh2KdJuMtAgMBAAGjgYYwgYMwYgYDVR0RBFsw
+						WYIfc2hpYmJvbGV0aC5kdW5kZWVhbmRhbmd1cy5hYy51a4Y2aHR0cHM6Ly9zaGli
+						Ym9sZXRoLmR1bmRlZWFuZGFuZ3VzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1Ud
+						DgQWBBTjIJQ164yN7YeSnns0H3DhdDD8vDANBgkqhkiG9w0BAQUFAAOCAQEAP7ZJ
+						osT/Ni9LMsaM9W/xQ97ZhxlEigWXZyunCRzgb7qGwTcXn8dMcC1oU6Ev/ybMtZrl
+						teisZkrhVG85zQ4tUc5ih2ykURPpgOnWgmuPzaWLiEH3EG+GL790735hmPzlVGeG
+						BkPj9QZ/fMjn1WiGr9zF/UN7IgpHEN1c6M5+m5bh6IQOWf3d0KDz5Mb62bCTWj1a
+						Iokh6jB1sQpje3UFWqG8L+fDFPhzyuFkCBT6y89gyyPHNj8UN7ggOg6KaEJ/KYdm
+						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>
+						MIIDaTCCAlGgAwIBAgIUOOzCa1peQPJkYnPUCVHoA+pzk+UwDQYJKoZIhvcNAQEF
+						BQAwKjEoMCYGA1UEAxMfc2hpYmJvbGV0aC5kdW5kZWVhbmRhbmd1cy5hYy51azAe
+						Fw0xNDAzMDQyMTIxNDlaFw0zNDAzMDQyMTIxNDlaMCoxKDAmBgNVBAMTH3NoaWJi
+						b2xldGguZHVuZGVlYW5kYW5ndXMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
+						DwAwggEKAoIBAQCG2sBuC7Mb3oSBWgAfzmW3W3Fij3UeBb7+9WKK3dwMYminLoii
+						tjrz4muGd6kDAZAZ+kOihheh7gkaEmPpwo1x422cJ6MVWf1/FVKs6pV33GVGVgrj
+						XtVxr5KdSiwhlGh5xDVUga8zM68PULLT65ISWl7MnMPETIZTZDZoKZVXoFlPsVc3
+						vRIciFJB0Zh7TxwccN8pWx9ZbPkqkyIDZ4OajnflX6nEDVY+JgNRvaCndfxRlvhi
+						AdTXRldjdsJEW9UMY8fUBI11ZX8Cf5L05GOCQm38kzlb2hdCQAQBZiJGbKStxcSs
+						gxntCMX+E0yp+NAaYTI6hTgJcjRbh2KdJuMtAgMBAAGjgYYwgYMwYgYDVR0RBFsw
+						WYIfc2hpYmJvbGV0aC5kdW5kZWVhbmRhbmd1cy5hYy51a4Y2aHR0cHM6Ly9zaGli
+						Ym9sZXRoLmR1bmRlZWFuZGFuZ3VzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1Ud
+						DgQWBBTjIJQ164yN7YeSnns0H3DhdDD8vDANBgkqhkiG9w0BAQUFAAOCAQEAP7ZJ
+						osT/Ni9LMsaM9W/xQ97ZhxlEigWXZyunCRzgb7qGwTcXn8dMcC1oU6Ev/ybMtZrl
+						teisZkrhVG85zQ4tUc5ih2ykURPpgOnWgmuPzaWLiEH3EG+GL790735hmPzlVGeG
+						BkPj9QZ/fMjn1WiGr9zF/UN7IgpHEN1c6M5+m5bh6IQOWf3d0KDz5Mb62bCTWj1a
+						Iokh6jB1sQpje3UFWqG8L+fDFPhzyuFkCBT6y89gyyPHNj8UN7ggOg6KaEJ/KYdm
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.eb.com-sp.xml b/swamid-interfederations-2.0/shibboleth.eb.com-sp.xml
new file mode 100644
index 00000000..931a0431
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.eb.com-sp.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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>
+						MIIEYzCCAksCAQwwDQYJKoZIhvcNAQEFBQAwZzELMAkGA1UEBhMCVVMxCzAJBgNV
+						BAgTAklMMRAwDgYDVQQHEwdDaGljYWdvMQswCQYDVQQKEwJFQjEPMA0GA1UEAxMG
+						ZWJjZXJ0MRswGQYJKoZIhvcNAQkBFgxqbWFyc0BlYi5jb20wHhcNMTMwNjIwMTY0
+						OTE0WhcNMjMwNjE4MTY0OTE0WjCBhzELMAkGA1UEBhMCVVMxETAPBgNVBAgMCEls
+						bGlub2lzMRAwDgYDVQQHDAdDaGljYWdvMSYwJAYDVQQKDB1FbmN5Y2xvcGFlZGlh
+						IEJyaXRhbm5pY2EgSW5jLjEPMA0GA1UECwwGc3lzb3BzMRowGAYDVQQDDBFzaGli
+						Ym9sZXRoLmViLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALs+
+						F77GATVQVtLGWEh7lOxGpCm2VFHMdcTjxRNWudanh5+/8sI+Bkd0Vpxkdtla2KaX
+						bopDUTB1Q9vXYAwVbsX0iqNDI9PaWdCyUmzVujF1NNy3WWVj8YJMr0AnE9eRuo4H
+						5FFesx8Felcgq7Nmgd3xUvjOy6IjtpJWbnY3lyPFqp0wCue2He23Mq/NMlJTxS4c
+						JLGZR4FMeHsjfKgSL3hFDIfbpsxDK8iJCVGYR0eQjHMfZU94qkD6jdqTFZYKIcw4
+						5IfRNq7i0T0l2JQiBaUJJoGIv4GoDlkX65evO4CioeyrT3UXbFH9ZjSYmih9OfUm
+						jcLhWMxYdOAYN2aeOJ0CAwEAATANBgkqhkiG9w0BAQUFAAOCAgEAJmUFYnjaD/Lw
+						/ukxO1//gyndf1wzSoUTKZB4XWJp+2g/wgf7RL+VR3YW9Myy7w4uq0SFy+pZx2bW
+						XVZd05NOtNgeD1CgpLH002mZRTmnj+5aRwI8oz0pR1xiYF5YOQDtiXEDAIA1UGdH
+						snBJsArumZHo55ss77gESONBhvdxDcHmF8RyRp+f60Mtey9+miz8I3sLQ48nELnE
+						X84qrPzS76qfMmmIVQwvDLqEmw6RKVkMZlzkmkQ/b3TTCAFy84Affka+17k5iEsi
+						GJCbUZNo+AjrSMHfeJrcert1blUZP0d8CCaLATfp6PlSzzO+LpjqZ0kWDX88CyhG
+						sV415fcnDyiyNf7Iyw9B4B8IfNIn0sr0EknE08D+3gUuuVssnczkVL/CWc5U8sOA
+						G2Yl+jnqxB2IKB/kY4uDWIxHMMmONZt4+t+O3vBW/hz0hkif61g3+BhRT2nOkcLa
+						JxMvVqRPiV2vdiRkLea3MALOJZHR6LAsPNawvyWIGZ66GVOiKD40xXGWL/GzsnvQ
+						QiXYbS6BL57mxJ4BotTRZRSFxOtIh0qOraMLWEcG4Tdv07T1n0cfv356aouGl2dR
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml b/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml
new file mode 100644
index 00000000..77d883e8
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml
@@ -0,0 +1,95 @@
+<?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>
+    <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>
+      <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>
+						MIIFizCCBHOgAwIBAgIQAUMqMY4GGE7RyypkxwmWTzANBgkqhkiG9w0BAQsFADCB
+						vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
+						VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
+						DTEzMDMyNzAwMDAwMFoXDTE2MDMyNjIzNTk1OVowgaoxCzAJBgNVBAYTAlVTMRYw
+						FAYDVQQIEw1NYXNzYWNodXNldHRzMRAwDgYDVQQHFAdJcHN3aWNoMRkwFwYDVQQK
+						FBBFQlNDTyBQdWJsaXNoaW5nMTMwMQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3
+						LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxITAfBgNVBAMUGHNoaWJib2xldGguZWJz
+						Y29ob3N0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKUKHWUi
+						hEa2qeQcooFqXBl/+AwmtcvIMdNroFBD2a8Z0r0HFYYxfsisIWxnJkfwkzYpuz/X
+						jOy5kBHRDoFmdpPcEf65fLfdrhsUJ/oHnZ5mf3XNVZA3mrabZzWUI7WPTpR2SMB/
+						1mgFthIZ/+4KSqAScC8OKbb7pkg6McxDw+c20RplQIwlayVezCn1DD3ynNYlXz26
+						kqNMLhWwT4AGkEHD8H4w5QDbhYaAW7bo36syiOnU+FhGHzTCbjYCM+ZeolY56rjj
+						UctR2S9HZQyXqeHQ/ksMW7PKgsuhsfuUqYmI+rvxoVe1jkquhCGYODQVnWJyiiFS
+						qat+jjZyPeVHiRkCAwEAAaOCAZcwggGTMCMGA1UdEQQcMBqCGHNoaWJib2xldGgu
+						ZWJzY29ob3N0LmNvbTAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIFoDBDBgNVHSAE
+						PDA6MDgGCmCGSAGG+EUBBzYwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cudmVy
+						aXNpZ24uY29tL2NwczBBBgNVHR8EOjA4MDagNKAyhjBodHRwOi8vU1ZSSW50bC1H
+						My1jcmwudmVyaXNpZ24uY29tL1NWUkludGxHMy5jcmwwNAYDVR0lBC0wKwYIKwYB
+						BQUHAwEGCCsGAQUFBwMCBglghkgBhvhCBAEGCisGAQQBgjcKAwMwHwYDVR0jBBgw
+						FoAU15t82CKgFffdrV/OKZtYw7xGALUwcgYIKwYBBQUHAQEEZjBkMCQGCCsGAQUF
+						BzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5jb20wPAYIKwYBBQUHMAKGMGh0dHA6
+						Ly9TVlJJbnRsLUczLWFpYS52ZXJpc2lnbi5jb20vU1ZSSW50bEczLmNlcjANBgkq
+						hkiG9w0BAQsFAAOCAQEAZDAVJq/8qorA7GxHW+6rcjxUsjjlrPFIsE+xWWlrLepn
+						GmSTrw9udap0Iq0kO+42bCd0aMvhRlTOZKW5+ra89vKoaH16hrpnYZMIxpwzre7X
+						zxhkNnw1Mx1dE8Cmol47V8dPBTr8/U8HiJmH4YFCoQX+zMsdC40AcyhPIxgyo1ra
+						Gki40IQJ/zFXkLpUO87nAYQy6WVJNFbtPB0ZWEhmaPWsmF51Dybw0HK0/2KkXLP9
+						aefnD8KF5bcPuu2spKwU4CfbZdSPo0n6AiDTxucbJt/OMS5Uh50ZRiE8Oc8v1tt+
+						8z47khf6dA5tT/OCeVEwt2z0O8VgNTQ4gcF2jbuK/A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
+						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtMod/aT8Q+Jc1qRTOh
+						ijxgxCZRkg+BRBkokvsaeVfq4LSMRxaqh2CMK7WOmFOkM4vQinV3LIKmu9oQ5ObW
+						SOXTeNpfIko03lQTIf20smhS83dPCsROz3np5KtrTwTmMkIHdSOasczD9yVJkrvZ
+						ClKrYHnvzY76iWzlI3NP6GIdlCEk9hIYG2Otxiyg1ct7cXHhqOPZwA3lKTFZDoH5
+						DeqU70gNZ/L39QmPTb/WOj06/+96pyzWTO0Ij7hw/Z2Bg3o+X96dmQ9h5QxFfkcR
+						3nsGOvoeQfT0o4cWLehX8NYTGoBil8N1E7XVbxbJoB7G6dCGnKUk7z13VjC8Zqkm
+						EI0CAwEAAaNGMEQwIwYDVR0RBBwwGoIYc2hpYmJvbGV0aC5lYnNjb2hvc3QuY29t
+						MB0GA1UdDgQWBBQMMZ62QB2/b4UMhukiOjiYXAJw7TANBgkqhkiG9w0BAQUFAAOC
+						AQEANelL29dtzQAUTGXzBDFuE5gR7paWe5KmCSoRmyHLP1gu6dqW6GO1NSHuXcZi
+						Ls2Owljlh0YDUaIEItrE/vD/ZSezpHzjkzyH+OHwmkyAImJDwcapY0XoQ4soBMa5
+						Oge0TZw8Cu4zEDbxgr4ksddHQNpPoqZGsFB4yctpm68wEO65F235UHzKNULOD2Ho
+						xq2Z8ufFFZpmY2EJDQy/ILLbkUvgglfy4P1gTNCHfbDFSV+DSXJ3xxgKDoOnn9ha
+						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="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/Artifact" 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="2"/>
+    <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="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/Artifact" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/ECP" index="5"/>
+  </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
new file mode 100644
index 00000000..2f86cb36
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edgehill.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEwjCCA6qgAwIBAgIQWxPdS8jCDo8CQ9VCPed5HzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDcyNjAwMDAwMFoXDTE1MDcyNjIzNTk1OVowgZMxCzAJBgNV
+						BAYTAkdCMRgwFgYDVQQIEw9XZXN0IExhbmNhc2hpcmUxETAPBgNVBAcTCE9ybXNr
+						aXJrMR0wGwYDVQQKExRFZGdlIEhpbGwgVW5pdmVyc2l0eTEUMBIGA1UECxMLSVQg
+						U2VydmljZXMxIjAgBgNVBAMTGXNoaWJib2xldGguZWRnZWhpbGwuYWMudWswggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCthQGEpUJ/yS9OfmAkx6OZg6Wh
+						FzM1cXm63rNtc2uZkd+ozCw3WtQKKyDRBr8Q7XbJr50fwKptdNJ3T0oWTIWLy38U
+						69KC8EwSAVy63DSWOhR4Quk+WzIc84XSfJWzQo3uFfJxx0N4K19ppIUP66oA8rII
+						9HsSSFfSDKkIARrCu+hvYv1qhIVsFRqF8REjrq5uh/Ono8MjMxshAPc6bGc5gZdu
+						d5NkvWy0vWUo472pkKBYnLShqI6+7gR5pIpoisasohleI6cYIW5SnSHv4OPILRRF
+						KLsjc5VKRyrcp51ZR61PD2ugifyHtY3t1fQMKzE8Xu10uegPvh8dP1ReHeDrAgMB
+						AAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV
+						HQ4EFgQUa57IILbkKZWeXJJRgQDqoRdmZhcwDgYDVR0PAQH/BAQDAgWgMAwGA1Ud
+						EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR
+						MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50
+						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG
+						CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+						LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYD
+						VR0RBB0wG4IZc2hpYmJvbGV0aC5lZGdlaGlsbC5hYy51azANBgkqhkiG9w0BAQUF
+						AAOCAQEAJ1aYSHILz1s8FOUJ8CyMaY6SJ51sIDsUR/CzifMmTaYi/tWoTVO+GQWg
+						yZJnChdXnQPRXs2H24F7HXGERAlLVy52Iu1S3ki7QaAbHz2/RtVcclrhepZAgMAe
+						0MXVBU6ZQmx5GLXr54lmU9eZqttIAJF0Z4yQJUVWsJG/1Y9zhabO2xwqZGAZNvdR
+						un+tHnO3jqbRxuhvqKQRWH3hTxOQykP3HN8cMvy5zKhz/7Sc0Mub+1RRMo8aIx/V
+						xn4HkrUz5OwdKNj8DIn8uLlo3BCRPqo2J/ar4yAyNFbG0bBj20vNsgM8MxTWQg1o
+						NovUGgpJ3goRRkkfWFQ2MkKl4od7aQ==
+					</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEwjCCA6qgAwIBAgIQWxPdS8jCDo8CQ9VCPed5HzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDcyNjAwMDAwMFoXDTE1MDcyNjIzNTk1OVowgZMxCzAJBgNV
+						BAYTAkdCMRgwFgYDVQQIEw9XZXN0IExhbmNhc2hpcmUxETAPBgNVBAcTCE9ybXNr
+						aXJrMR0wGwYDVQQKExRFZGdlIEhpbGwgVW5pdmVyc2l0eTEUMBIGA1UECxMLSVQg
+						U2VydmljZXMxIjAgBgNVBAMTGXNoaWJib2xldGguZWRnZWhpbGwuYWMudWswggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCthQGEpUJ/yS9OfmAkx6OZg6Wh
+						FzM1cXm63rNtc2uZkd+ozCw3WtQKKyDRBr8Q7XbJr50fwKptdNJ3T0oWTIWLy38U
+						69KC8EwSAVy63DSWOhR4Quk+WzIc84XSfJWzQo3uFfJxx0N4K19ppIUP66oA8rII
+						9HsSSFfSDKkIARrCu+hvYv1qhIVsFRqF8REjrq5uh/Ono8MjMxshAPc6bGc5gZdu
+						d5NkvWy0vWUo472pkKBYnLShqI6+7gR5pIpoisasohleI6cYIW5SnSHv4OPILRRF
+						KLsjc5VKRyrcp51ZR61PD2ugifyHtY3t1fQMKzE8Xu10uegPvh8dP1ReHeDrAgMB
+						AAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV
+						HQ4EFgQUa57IILbkKZWeXJJRgQDqoRdmZhcwDgYDVR0PAQH/BAQDAgWgMAwGA1Ud
+						EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR
+						MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50
+						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG
+						CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+						LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYD
+						VR0RBB0wG4IZc2hpYmJvbGV0aC5lZGdlaGlsbC5hYy51azANBgkqhkiG9w0BAQUF
+						AAOCAQEAJ1aYSHILz1s8FOUJ8CyMaY6SJ51sIDsUR/CzifMmTaYi/tWoTVO+GQWg
+						yZJnChdXnQPRXs2H24F7HXGERAlLVy52Iu1S3ki7QaAbHz2/RtVcclrhepZAgMAe
+						0MXVBU6ZQmx5GLXr54lmU9eZqttIAJF0Z4yQJUVWsJG/1Y9zhabO2xwqZGAZNvdR
+						un+tHnO3jqbRxuhvqKQRWH3hTxOQykP3HN8cMvy5zKhz/7Sc0Mub+1RRMo8aIx/V
+						xn4HkrUz5OwdKNj8DIn8uLlo3BCRPqo2J/ar4yAyNFbG0bBj20vNsgM8MxTWQg1o
+						NovUGgpJ3goRRkkfWFQ2MkKl4od7aQ==
+					</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>
diff --git a/swamid-interfederations-2.0/shibboleth.editure.co.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.editure.co.uk-shibboleth.xml
new file mode 100644
index 00000000..7e1cbf27
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.editure.co.uk-shibboleth.xml
@@ -0,0 +1,67 @@
+<?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>
+      <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>
+						MIIDPDCCAiSgAwIBAgIJALzAXoogu0OFMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHNoaWJib2xldGguZWRpdHVyZS5jby51azAeFw0xMjA0MTMxNDE1NDFaFw0y
+						MjA0MTExNDE1NDFaMCMxITAfBgNVBAMTGHNoaWJib2xldGguZWRpdHVyZS5jby51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMG3mYtAvjNLIGIChu6j
+						S4ia5UAGno6CWIeM3yIJje1WnjVc0K6Bm/ulQGou7KFw0QrMhqTmdcqoT25tUbD+
+						YGTajArHEW/cefay3G1NKP/IqVfUp9xKFimvtUEqAPCAWTWUP7VeGPyhlB99p43F
+						PxXNu4wb8TRleXTpstyarlstM5+AK6MoMZXaoGtkUh0c14ChE7KFvGiH32Z/I9L5
+						oeTM3lE3naAyy3cUlmKGPcageo4r5ToiPaY2Ym8zmAI4XzSFLQPELbjZKua6zN8W
+						Pgg6fm1xDsIw7V2hfOt3xlf+0JmY0e0L9yUbtqk8oQ1c5KaIN4pBahzQT6tt3P5o
+						u7cCAwEAAaNzMHEwUAYDVR0RBEkwR4IYc2hpYmJvbGV0aC5lZGl0dXJlLmNvLnVr
+						hitodHRwczovL3NoaWJib2xldGguZWRpdHVyZS5jby51ay9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBTzRjbL3Tk36c5S0QNEKRYtvxmf/TANBgkqhkiG9w0BAQUFAAOCAQEA
+						hTfB/KawwGi4mjlbn+FzNAz3uxuS0vWxMQbaCgwuMSz2bP7c3c/bpT7RGZx+pZAp
+						WYYKQgARJ1HZPBjKNKUqD7vGcEDWMFZbLD9uAhM/7ZWw5heZkObT1Z50i9RnOnQ9
+						ZHxvcsQDEK642BUAccrT9hJnSOBv1HjryKFsjI4H2ISJwQAGZrx8gK1w3E7yN2Xz
+						8JKVpWqvncLCV9twO3woRmjq9S9D59j7p0kNLfLO3cmk9CuBi9z2rwevsTlaSpHC
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..a9b8ae7a
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ens-lyon.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-04-16T15:12: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>
+      <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="fr">ENS 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>
+					      MIIEkjCCA3qgAwIBAgIQM3AXkLVSja9N0N1o4axc9zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxNDAwMDAwMFoXDTE3MDQxMzIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
+LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtebY
+BLAK3BOoXxYZldMlRY8Mre/ppCSUS3lemujSiq02SS9eZSO0ktkJLEcDc5LYGTk/
+wtn0XcHV/CHTfjpb9vwHBkq4OcJITQahLW+3o52emt1/g+YI2dfJzBIEaVh3my/o
+eNHacSvA8PRtdMMMbxp4kHM7VGyPaU5sNtcdPOhZGwzwH0+1MwLz8T7A82CGCznb
+EfzHSt/7PuWZ0uxexh8w40O4C5sB1d0mrCQZUOinl+04vX+QZaOCU2YOPe/GfF7n
+Tt0AAoK9JejT6vFQ7bO1h9HzF0ahnAFiIyvkVv9xG7CQCtggqpbSl0vXHk61mPsq
+OA0wXeAwVKnd+ts+/QIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFChWxiARdSk1TBcSYp/N8SSictJjMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
+cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
+AAOCAQEAuUKiMBx/HCAebLHhz3hfgd6P31r5FqLVYxTngYyrJLvDKBifyoOiIPiA
+4ZVx5YEwM31MuRwMZudRSCN9nmv24OocG41g0d2YrPW7UpV3uTgWSdmmeLSkMBFm
+H7rtx57vWgmrW+OrnkeH8Ab0kyJlv41Y1kqDLYbX3biWRhvqYuvUsmsipSI4qhW2
+U0uR+ZuXE63ib7nvKVaOhE0xA51kaVYWGXDkiGZclFShjfn6aiOrb4/AndVNIJ7X
+XmIvINFpZiRoszGN9qpUIgFXGimzydOuKLYTgeczy0lp74wlpYTy5AXt7TIM/Wcm
+fe1ohrE7LQaSLfH8v3Q8YrsPai3rjA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEkjCCA3qgAwIBAgIQGRyVaSVPM2LHhUv3k7YEPjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDQwMTAwMDAwMFoXDTE2MDMzMTIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
+LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypO2
+f6+uJhiZJuaWf1UR+oXBgxm+DnE5Os2ZdvPGiQnD2lWGj4UEAfh/EZzW0iNHY1KW
+tfNh9/2XHu/Et02238FkIvUymO6LOwWP9UDuCHQ4Wy7JvKa3lLYxnvh8Gal+NfEP
+I/U/DHx630t+8EimYAFZgcenWpbqkT9xjLChptj9qR5T3NbrD2hOBHwSm2G1F1D+
+p11116eELjJjePpiqOk3oL/NYtR9JiyM/5fEpfHIWEvBIfVXO5u2+cbFLttc//ZS
+WbTQGeRIfaJzPizv1jLVzwvGgl+FQr50tPleghThr/mJ3OxYwxjkh/RK6/awr0+z
+3ugq4lRl1Y06z0bJYQIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFJ7Argu6V5TSZhZ5LVnljAZDb4KxMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
+cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
+AAOCAQEAF4crvTXRVC0lUVCOrGvozi2C2B+R/m0tiJUGXw1C32550RW2dM/q9hio
+Bld7tdjr2g6on8L2Sc46fjlBBC9fI0r2i1rukZ1ERlEmDNhvyrIaxHCG02jfNGij
+oCanvWoBa+NAyh4BHHuBenlOrqeXZjfw1RZPOrCtZ6JnPVRuoXqpl+gt+raM4ey1
+bQt3dofx0M7vegUNzfuOJcUEBTik/WBAXuuu1i9QIeIcIPzTYCzFPs7T2tZDRU7z
+y6ERbMGTdksmIgsjjeVA9sAKxWeNXtg7OcpgcfUdIEqTGsbw3Xf7UbHr/xAEEuHW
+3rKoIY8FKvLhu0jcNpr+QzAZX6s2yw==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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.ens-lyon.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ens-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ens-lyon.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">ens-lyon.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEkjCCA3qgAwIBAgIQM3AXkLVSja9N0N1o4axc9zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxNDAwMDAwMFoXDTE3MDQxMzIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
+LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtebY
+BLAK3BOoXxYZldMlRY8Mre/ppCSUS3lemujSiq02SS9eZSO0ktkJLEcDc5LYGTk/
+wtn0XcHV/CHTfjpb9vwHBkq4OcJITQahLW+3o52emt1/g+YI2dfJzBIEaVh3my/o
+eNHacSvA8PRtdMMMbxp4kHM7VGyPaU5sNtcdPOhZGwzwH0+1MwLz8T7A82CGCznb
+EfzHSt/7PuWZ0uxexh8w40O4C5sB1d0mrCQZUOinl+04vX+QZaOCU2YOPe/GfF7n
+Tt0AAoK9JejT6vFQ7bO1h9HzF0ahnAFiIyvkVv9xG7CQCtggqpbSl0vXHk61mPsq
+OA0wXeAwVKnd+ts+/QIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFChWxiARdSk1TBcSYp/N8SSictJjMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
+cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
+AAOCAQEAuUKiMBx/HCAebLHhz3hfgd6P31r5FqLVYxTngYyrJLvDKBifyoOiIPiA
+4ZVx5YEwM31MuRwMZudRSCN9nmv24OocG41g0d2YrPW7UpV3uTgWSdmmeLSkMBFm
+H7rtx57vWgmrW+OrnkeH8Ab0kyJlv41Y1kqDLYbX3biWRhvqYuvUsmsipSI4qhW2
+U0uR+ZuXE63ib7nvKVaOhE0xA51kaVYWGXDkiGZclFShjfn6aiOrb4/AndVNIJ7X
+XmIvINFpZiRoszGN9qpUIgFXGimzydOuKLYTgeczy0lp74wlpYTy5AXt7TIM/Wcm
+fe1ohrE7LQaSLfH8v3Q8YrsPai3rjA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEkjCCA3qgAwIBAgIQGRyVaSVPM2LHhUv3k7YEPjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDQwMTAwMDAwMFoXDTE2MDMzMTIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
+LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypO2
+f6+uJhiZJuaWf1UR+oXBgxm+DnE5Os2ZdvPGiQnD2lWGj4UEAfh/EZzW0iNHY1KW
+tfNh9/2XHu/Et02238FkIvUymO6LOwWP9UDuCHQ4Wy7JvKa3lLYxnvh8Gal+NfEP
+I/U/DHx630t+8EimYAFZgcenWpbqkT9xjLChptj9qR5T3NbrD2hOBHwSm2G1F1D+
+p11116eELjJjePpiqOk3oL/NYtR9JiyM/5fEpfHIWEvBIfVXO5u2+cbFLttc//ZS
+WbTQGeRIfaJzPizv1jLVzwvGgl+FQr50tPleghThr/mJ3OxYwxjkh/RK6/awr0+z
+3ugq4lRl1Y06z0bJYQIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFJ7Argu6V5TSZhZ5LVnljAZDb4KxMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
+cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
+AAOCAQEAF4crvTXRVC0lUVCOrGvozi2C2B+R/m0tiJUGXw1C32550RW2dM/q9hio
+Bld7tdjr2g6on8L2Sc46fjlBBC9fI0r2i1rukZ1ERlEmDNhvyrIaxHCG02jfNGij
+oCanvWoBa+NAyh4BHHuBenlOrqeXZjfw1RZPOrCtZ6JnPVRuoXqpl+gt+raM4ey1
+bQt3dofx0M7vegUNzfuOJcUEBTik/WBAXuuu1i9QIeIcIPzTYCzFPs7T2tZDRU7z
+y6ERbMGTdksmIgsjjeVA9sAKxWeNXtg7OcpgcfUdIEqTGsbw3Xf7UbHr/xAEEuHW
+3rKoIY8FKvLhu0jcNpr+QzAZX6s2yw==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ens-lyon.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">ENS de Lyon</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENS de Lyon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Hugo Etievant</md:SurName>
+    <md:EmailAddress>hugo.etievant@ens-lyon.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sébastien Mei</md:SurName>
+    <md:EmailAddress>Sebastien.Mei@ens-lyon.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
new file mode 100644
index 00000000..47bad802
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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="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>
+					      MIIDVDCCAjygAwIBAgIVAN6gM4+w8Gx9no3WaW+bpt8Vs/EOMA0GCSqGSIb3DQEB
+BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGguZW5zaS1ib3VyZ2VzLmZyMB4XDTEy
+MDQyMDEzMzk0N1oXDTMyMDQyMDEzMzk0N1owJTEjMCEGA1UEAxMac2hpYmJvbGV0
+aC5lbnNpLWJvdXJnZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCcEpHcghvI1KrNU3oU02iIBGA4qV6Etno9hG4LfTZL+J+8LUY9xbnK2ZBpfUsk
+GN/ioX6FEBSIU+cXNvbxZT45Y4gs492nzjmNpTDKNeU3+HRhnQkGM4b0JXY5G1v2
+nQavrSD1ECIM0BpSveHi1ihDn6iWw8CVdutoKJ4EktVbCr/BNZpYc2k3EJtsKKXm
+ewaAkLxr4IKzeDpY7XWnO7jvmzOYeG4JQ/8japsEG8Nczb+x8kiSyiyYyNVGpxbh
+zsgiB22z/DKOdyKS5qRRL4UeFCtWv21It2d6/yFolks7Q4szZL8L2M5QidVQyK7i
+kUjUNXpeG4ym2em847qId4OvAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWJib2xl
+dGguZW5zaS1ib3VyZ2VzLmZyhjFodHRwczovL3NoaWJib2xldGguZW5zaS1ib3Vy
+Z2VzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSAz0Hnruvk56ktSDWEWNPX
+cun+TTANBgkqhkiG9w0BAQUFAAOCAQEAR0Cv5H8SVMZC9TwCd+HoaKsrFbTWylbp
+aqg3E1ZS0/lN+DhoMWtjsV11e4/FUjKWjKejbXMEfGYPJBsssEx8YS7RH3cP/7zD
+8j7MuadL92A6IjA/PSI88Ee+yozMFyDUyEZwhcAvzsDiJgqoZ/Jqyx1n/Ahq4zFo
+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://unknown.site.com</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
new file mode 100644
index 00000000..9f24df99
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ensicaen.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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="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>
+					      MIIDQzCCAiugAwIBAgIUWJlRFhwGwMk4lj3M8MGZi+WUiKQwDQYJKoZIhvcNAQEF
+BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aC5lbnNpY2Flbi5mcjAeFw0xMDAzMTUw
+OTI0MzlaFw0zMDAzMTUwOTI0MzlaMCExHzAdBgNVBAMTFnNoaWJib2xldGguZW5z
+aWNhZW4uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVj+NT2Lhd
+BHoJ7m+6gaI8xBsdkm7dNyFtVJyfsMU9Dvc/qlhjNR+2YSVbiDdmDvqeMgbrFjcC
+lMo5ife47oQMLjBUHhvj2xliSt+evvqEUnRRnJU10PIf4Bchub/v82hS5JbPxL8b
+wLyFag5llUg6hbi93lvhp+bgYk8ZAz5hmJ/VrS3yAQ4sCsogGB1nMuQ00JGZxxxE
+4PfQnVL10DDP5/RpHDLENJu4vZKY/7C+S9CEN4RkqxA+yNyP3JS0KRbP9+7ATYiR
+q+QhF2V4eQZ4KnjiN62O+lJ6Gs3vVBAPqdb2lEFfnaSBsZ19HyZFY6/GjNIcyv3h
+qf5za6LbS4xBAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGguZW5zaWNh
+ZW4uZnKGLWh0dHBzOi8vc2hpYmJvbGV0aC5lbnNpY2Flbi5mci9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUI3L7p8efYitE5TlY75ZGW7uC4eAwDQYJKoZIhvcNAQEF
+BQADggEBAIC8Dw+q0N19K6FB0xTbEGYEvLbIXSzPei5QAx8aJVm6fowYs1N582Le
+UXfwhI2N0hkIUQiPVnZ263lM2J17OO7neACCFtyHPkG0Qa8gMcu+0BuZZ+YU9zyc
+t7msRhc+8ZFE//98p8mhQ182k1Qwif4Vzn8Sq+ygBIyZyim4zKT2TsS09EuXdzFw
+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://unknown.site.com</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
new file mode 100644
index 00000000..98ba53c7
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ensiie.fr-idp-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+      <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="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>
+					      MIIDPDCCAiSgAwIBAgIVAJhRpKXWoL4ec82/4p6JsfCsvqKyMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguZW5zaWllLmZyMB4XDTExMDEyMDA5
+MTQ0OVoXDTMxMDEyMDA5MTQ0OVowHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5lbnNp
+aWUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHdchDzLlTFyjs
+d9B41OSth9PhLDux66bxohuYtsLWri93KmXhI4I9lBQNkUhQopg6b8Q6XGyKrdsE
+SOLIuRmD+O0ml5xN36fPfJRCh5Y1Z8Jg4luD3zDaK+LybgU437Dd0IKmPH27Iene
+BiLmMCs0ekRmjQN4cmmzRFoYbY9qaZQjW3y+vg7ucUF7YrXWxbxUcTiNWTdl3N3s
+WxWbRQEdcOeQl9CRNI6nA7Bo0V+6IjB+/8J9ho3GYoLtWbcdAeAW34dwv6AvVrex
+XJqb6PcjbqkESZ8PnXDHD1UMsnLy+NbF0CWxi/A1fAhHDYPMEPWIrJBWJ/Fzl6qN
+x2wlkSPTAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGguZW5zaWllLmZy
+hitodHRwczovL3NoaWJib2xldGguZW5zaWllLmZyL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBT58XqSFu3/O2kvOm+ckV4Eeyur9zANBgkqhkiG9w0BAQUFAAOCAQEA
+eUF1Ye+cUNUfZvi0QHiDVtB1bJVFDVimtqt3DJl5g/eYV5jeLHK48+2xrqo2HRk5
+SU+JpT4lGmxVv89cyGF6QzDl5ZC6f5mTi+bR+DXJagoDTeXTph1bDSy9v12tTmXi
+Omo9LtDoYKd4WKUOxzgMJli1ng3wojkFrCmfVJjUzbFWs7EX9DjDYSfwHEXxO+jI
+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://unknown.site.com</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
new file mode 100644
index 00000000..4814cc08
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.envt.fr-idp-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+      <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="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>
+					      MIIDNDCCAhygAwIBAgIVALbIAX96KL3MHHLOC3iIdPBazQtRMA0GCSqGSIb3DQEB
+BQUAMB0xGzAZBgNVBAMTEnNoaWJib2xldGguZW52dC5mcjAeFw0xMzA2MjYwNzQ1
+MjhaFw0zMzA2MjYwNzQ1MjhaMB0xGzAZBgNVBAMTEnNoaWJib2xldGguZW52dC5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL14Y39Z+9nkRJRbtsZs
+GIFZcTO8R4DH9nhPuokCn/mByrzCtVAEdC91yQ7+jGgXB/DZ/HECMvolPFnV3aRP
+CrsFap1m1WbaL72fLhO3zxappC0BzZxyefuHtRkvf2yx6hS7qg2HHgzNVqUpJFW9
+cbaxLyIIZuy6cmGvfNGZ7SchdgIqcUclhxZWOo8HH2d4rFZWIIOScZ9gyhThlZUs
+ZKXCe2cw0b69B3tU7DVT2ZL3G8HPDOsJ02EHckSJhExRRB6obM7FSnvi2qOkSoTS
+/tobBMNR6vGN6EYc3+6MwR572TEG0YKDWA4UkfVkrb5BGwclehPoYybuwLO9bIGz
+y+MCAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYmJvbGV0aC5lbnZ0LmZyhilodHRw
+czovL3NoaWJib2xldGguZW52dC5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+fCqGnApiVU0GuQF3nPx7nd06SPswDQYJKoZIhvcNAQEFBQADggEBADI4y7Im35ne
+5YqpHF4hfF6HCIVezRvIrm6WrdL5aB7U//Pfq+ZTDnByLzULEU2LIgOlEyFlz5Os
+5yYI9c5nGrStndK9dvWTTUhQdZjVBJAfiHx0wBIdgEgI/R7X4kUpgZgpPC/WCk0W
+CP+KGdCy+HnpZ40bq0AhDKIoX5iXoXIIvmioONovPXmUh0aHgHVFufW8Y4qHilW/
+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://unknown.site.com</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
new file mode 100644
index 00000000..05ed1c90
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.falmouth.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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
+						LmZhbG1vdXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						htyRP37lfHCQSvTtB09QGwRMXaHxV0KcAyDm2haJWRVnS/Q2nCXkDH4N0l3nsb8S
+						ibeizS3gnWkJM52C4VXm1Dn/4jZEu0tT/yrjfz4LOWx6pPluUg29euLr7ICLdPAv
+						fjH0iQ4Ah2mVc0iEwtFhrnDCV1uGPgxsu8DpiV0TrpoqTlEIzcB9z6Y4ha7yuZ2j
+						p0SP1piRoFBoeXeRDJ3D4Lprw8YV1ZKLOZaeyI8n8KIwspLZLcAqIkGoJ0k1u1Fl
+						OcqRD2xPzQ+CgOtzzvSIOrPD0yKhuwb1zJ66cu2cpRdITRnrg2ayP/gXiF+LAhTJ
+						ybc9lDB//HyWDrj9iU00cwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
+						LmZhbG1vdXRoLmFjLnVrhjBodHRwczovL3NoaWJib2xldGguZmFsbW91dGguYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDl7aG6kieISm3+HL81qMYelebh9
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBvm0t4OJ4W610vCQDGC5irYM4JqFYItWAL783e
+						raMoAAhoQ37r+qfeXeZXox0tpz1A2Jt//4ub46//AOksCPbAa22mWoHyFxcJcjRR
+						ZR17kXkAaopgrcUhrrPSt+TFy2i2CHnuWcR1ypqyPj6nq5RfgptUYkJEVe4fwF6n
+						zjv7yp0173zZckOhbclz2yer9jl92eYG0eTVtOY43TILPkc55e5JDd72A2YfqLSz
+						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>
+						MIIDUDCCAjigAwIBAgIVALQiK8QYmXH3vEarjOmgkNsvKZyyMA0GCSqGSIb3DQEB
+						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGguZmFsbW91dGguYWMudWswHhcNMTQx
+						MTExMTUxMzMxWhcNMzQxMTExMTUxMzMxWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
+						LmZhbG1vdXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						htyRP37lfHCQSvTtB09QGwRMXaHxV0KcAyDm2haJWRVnS/Q2nCXkDH4N0l3nsb8S
+						ibeizS3gnWkJM52C4VXm1Dn/4jZEu0tT/yrjfz4LOWx6pPluUg29euLr7ICLdPAv
+						fjH0iQ4Ah2mVc0iEwtFhrnDCV1uGPgxsu8DpiV0TrpoqTlEIzcB9z6Y4ha7yuZ2j
+						p0SP1piRoFBoeXeRDJ3D4Lprw8YV1ZKLOZaeyI8n8KIwspLZLcAqIkGoJ0k1u1Fl
+						OcqRD2xPzQ+CgOtzzvSIOrPD0yKhuwb1zJ66cu2cpRdITRnrg2ayP/gXiF+LAhTJ
+						ybc9lDB//HyWDrj9iU00cwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
+						LmZhbG1vdXRoLmFjLnVrhjBodHRwczovL3NoaWJib2xldGguZmFsbW91dGguYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDl7aG6kieISm3+HL81qMYelebh9
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBvm0t4OJ4W610vCQDGC5irYM4JqFYItWAL783e
+						raMoAAhoQ37r+qfeXeZXox0tpz1A2Jt//4ub46//AOksCPbAa22mWoHyFxcJcjRR
+						ZR17kXkAaopgrcUhrrPSt+TFy2i2CHnuWcR1ypqyPj6nq5RfgptUYkJEVe4fwF6n
+						zjv7yp0173zZckOhbclz2yer9jl92eYG0eTVtOY43TILPkc55e5JDd72A2YfqLSz
+						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>
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
new file mode 100644
index 00000000..78eefe7f
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?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>
+      <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="en">University of Applied Sciences Wiener Neustadt</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="de">FH 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
+BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHduLmFjLmF0MB4XDTEzMTExMzA4
+MjkxMVoXDTMzMTExMzA4MjkxMVowIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHdu
+LmFjLmF0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoS8CXF8y8Lcd
+J1bWqWqpcxqK07ajkBtZQ5E7Fo4pOaXx54R4eOQZR72VMLTf7Qg8W8UYopD1A1/h
+cd8u5Un/yFHDuy34pG/rPTc0rvmHEeZ5nEkDNzvKbebX78bizbZ7cThwFf8WADiV
+UAC9gxpxLAiVhqEPjytIJOnoC9ENNBqqKOaBme3KgifRW/18vEes1DANSNMP1LZi
+MLZCMLouKgwVzBpR7MGiDFx3+Xdn/g1210TpXyW4yr4FZyNxJOmuZPY8GGQBoI15
+NmWKp5Wgh1EcuMK/X0rOm7QZuuHMAUd6awXTE71MljXlPmlfDylcLWBx2QHG8Yrq
+WClEBAefeQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLmZod24uYWMu
+YXSGLGh0dHBzOi8vc2hpYmJvbGV0aC5maHduLmFjLmF0L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRju/KxvciXjf6JW/P+nVPegBlUsTANBgkqhkiG9w0BAQUFAAOC
+AQEATpk3i0dOltmwiHTi2NwkXPVnQh6Wtk70ZJle/2Vwl6IJGU5AcruKL9ySROKO
+z69XGJlr/CJsuZcwee/rdeGkQEaNKLjL6PgGqmxWz85LRz5rbBFAFujLj5yBSEXA
+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
+BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHduLmFjLmF0MB4XDTEzMTExMzA4
+MjkxMVoXDTMzMTExMzA4MjkxMVowIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHdu
+LmFjLmF0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoS8CXF8y8Lcd
+J1bWqWqpcxqK07ajkBtZQ5E7Fo4pOaXx54R4eOQZR72VMLTf7Qg8W8UYopD1A1/h
+cd8u5Un/yFHDuy34pG/rPTc0rvmHEeZ5nEkDNzvKbebX78bizbZ7cThwFf8WADiV
+UAC9gxpxLAiVhqEPjytIJOnoC9ENNBqqKOaBme3KgifRW/18vEes1DANSNMP1LZi
+MLZCMLouKgwVzBpR7MGiDFx3+Xdn/g1210TpXyW4yr4FZyNxJOmuZPY8GGQBoI15
+NmWKp5Wgh1EcuMK/X0rOm7QZuuHMAUd6awXTE71MljXlPmlfDylcLWBx2QHG8Yrq
+WClEBAefeQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLmZod24uYWMu
+YXSGLGh0dHBzOi8vc2hpYmJvbGV0aC5maHduLmFjLmF0L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRju/KxvciXjf6JW/P+nVPegBlUsTANBgkqhkiG9w0BAQUFAAOC
+AQEATpk3i0dOltmwiHTi2NwkXPVnQh6Wtk70ZJle/2Vwl6IJGU5AcruKL9ySROKO
+z69XGJlr/CJsuZcwee/rdeGkQEaNKLjL6PgGqmxWz85LRz5rbBFAFujLj5yBSEXA
+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>
diff --git a/swamid-interfederations-2.0/shibboleth.globaldata.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.globaldata.com-shibboleth.xml
new file mode 100644
index 00000000..5297e1c5
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.globaldata.com-shibboleth.xml
@@ -0,0 +1,67 @@
+<?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>
+      <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>
+						MIIDDDCCAfSgAwIBAgIJAItPz9n2+PuaMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF2RlZDA5Ni5tYXhpbXVtYXNwLmxvY2FsMB4XDTExMTEyODEwMTQxMFoXDTE2
+						MTEyNjEwMTQxMFowIjEgMB4GA1UEAxMXZGVkMDk2Lm1heGltdW1hc3AubG9jYWww
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwNeNpZKlWDp7GciyA162g
+						VSy3uTRG2BT48mp/oB4Wh7DqNbPHx8PrWJrN0xw+c1o1OarYuaWK24H9F1n3ZI8g
+						i/czA4Zi2JsIZmWksu5jYVgZQQnMyVCrA1fB4tjz2GTnrmy7HTt7axMAHlUyupDw
+						gh/YcaJ84U1JssiLeSypkHeSyLv/Cew5HI6kARv99/oVSBR7kfOAUPg+fP8kjvlK
+						dn6RShLwkY+9KQCK9lY6aaJHrNtRDfSQVZsZgfLwzK+HCGspWHFp7KirfdTBcCkR
+						w+berqH4RmOPbcv4TxGva/XEefM9Ikw8FD1Yb7Hcum6avHcD/s02jYzvISUr56FT
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2RlZDA5Ni5tYXhpbXVtYXNwLmxvY2FsMB0G
+						A1UdDgQWBBQsoQCuifh3Q5K7lzut09/s9A3G8jANBgkqhkiG9w0BAQUFAAOCAQEA
+						DyvSdKPdXmbCft4A6Bwqpw0Y1hMuyme8wOskJpQIJ7WXhdyCB3eOYz1dGcmFkeQU
+						aUJS6x9ZPLkRVX0e8Eoa/w1rYam5Zi3Fv0ZjLLKA7EFkX4aNzeE8vU0y/XZ9amRf
+						fIZ/Tse7wvCJTHWNrw0eoTy2xNnPRWhLALF8nNaR66S5Usesosv0fKqpK20nrjmF
+						wtHuAhh4Jbh6mZZemqKOgcxs9JX5qTsO96plS+Rb2iH2oMP0PrqzjwvHyFAPv8gb
+						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>
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
new file mode 100644
index 00000000..68043bbc
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.grenoble-inp.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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="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>
+					      MIIDVDCCAjygAwIBAgIVAO/QaN+dR8TZXZ6cNFwn8jJiB3QdMA0GCSqGSIb3DQEB
+BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGguZ3Jlbm9ibGUtaW5wLmZyMB4XDTEy
+MDEwOTA5MzY1NVoXDTMyMDEwOTA5MzY1NVowJTEjMCEGA1UEAxMac2hpYmJvbGV0
+aC5ncmVub2JsZS1pbnAuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDKu60J1wRxU9drIKvmtJJfsJ/w+Xmdd+PQOxz0+mIwpdUSpkMbkXWoiYTsj2nf
+BorFExB0qYHAUJTdPVBJL1LVSqOBK8k1w7BopKJnQ/XYujiSPuodTifKRYjiGyiB
+rDKs+pNLawv8jzWTtqnM8NYsfa0+25kdVDwHhKqmSmypB6leLyjNr9MKdHDQ38ca
+q3tKlKz0Mif1iZ0BZdo5eQSzZwO67pzU/4YUgmN2HpJxrwRsk9U98oILg2NVW+0U
+BNcheLXY2XrRd+fTbbPbTTMA4RNcYLCS0EPJ6YA77+wZ5YfD1FGu/hxBKUbCP8b8
+hhQ5O7Y//nWY3w5MlGqLAPjbAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWJib2xl
+dGguZ3Jlbm9ibGUtaW5wLmZyhjFodHRwczovL3NoaWJib2xldGguZ3Jlbm9ibGUt
+aW5wLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTAG7NXFV8rO7re+ySoBXuv
+3FrnkDANBgkqhkiG9w0BAQUFAAOCAQEAIFBwVqbJE++ODmHmwh6E3ScDv+LDM3q3
+GBpZKQ6I+g5uVdM1r5TRKZBxKL59J51wHBQ2+AmDhlNEeqUszaw42GXFJhWLf8RU
+5hnqyBQawD8NpztjyoNgHg1dLdg6uz8k1YHXTw3mG4eWaqxmeeUKspv+XXyBg7Sw
+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://unknown.site.com</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.hartpury.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.hartpury.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..29db8565
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.hartpury.ac.uk-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJPi0Xw859VIvqyqTHWt
+						JXN7KlgEhe+OXy4YNimWwphxPFMuYkdzycnAyhzso9oSou0rcwNpKGVFSmSyjF9x
+						xeVb/vZtn3xG/peLC+ui20w1caoRJytCC93mWCgtBtj4cZ88jJu8Y/t/5Cmcr+ov
+						R4+nJrEP+z162/Law913nLBPAW4TNKFtUGvXaaHDu4H3kAKZeVmIDMqzhyXtAvQV
+						vODGiCAYEKm7nqYW5qzIs6+W4mdyYQai0Aw9C5XzlOjV4IaH6Y2kWa2AedcrBao9
+						IpBR9tm6PlOT4L+gwwtPynhoHrKGVsu+633JjFIkcOK5xGQtRhe5nwJMTZVnILvG
+						4n8CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmhhcnRwdXJ5LmFjLnVrhilodHRw
+						czovL2lkcC5oYXJ0cHVyeS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						xqp4n/FKdmw6rnk/dIBV654mwsgwDQYJKoZIhvcNAQEFBQADggEBAF14kkpYbOAR
+						ReDt0Wk1RjJDj7YT3rPx3/A4+6h0WtzMRlTEOp6H99cDnRd/HKtWnhYwy9DU7MBg
+						rQumD2VgmCnnOTR8X/oFq3t/hB9bIRY2+w9RL+WSeM1tWCHBob+8SOibzLf/c63g
+						1OpfT+X0bK40aTOvuJeVlZ66WKxW8dUr9GOzCOxkarW6HQlFhE7y+p5mt9jnKoQJ
+						R93wQBJdWf3Bsr51pnY1XKCkYNQn0uxLS9zJYG2Nyvo7hV6Q2GBQko+XJSHsA3cm
+						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>
+						MIIDNDCCAhygAwIBAgIVALyl0dbpeXfYuEe49LYtPN8+LpmNMA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEmlkcC5oYXJ0cHVyeS5hYy51azAeFw0xMjA4MTQxODM2
+						MjlaFw0zMjA4MTQxODM2MjlaMB0xGzAZBgNVBAMTEmlkcC5oYXJ0cHVyeS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJPi0Xw859VIvqyqTHWt
+						JXN7KlgEhe+OXy4YNimWwphxPFMuYkdzycnAyhzso9oSou0rcwNpKGVFSmSyjF9x
+						xeVb/vZtn3xG/peLC+ui20w1caoRJytCC93mWCgtBtj4cZ88jJu8Y/t/5Cmcr+ov
+						R4+nJrEP+z162/Law913nLBPAW4TNKFtUGvXaaHDu4H3kAKZeVmIDMqzhyXtAvQV
+						vODGiCAYEKm7nqYW5qzIs6+W4mdyYQai0Aw9C5XzlOjV4IaH6Y2kWa2AedcrBao9
+						IpBR9tm6PlOT4L+gwwtPynhoHrKGVsu+633JjFIkcOK5xGQtRhe5nwJMTZVnILvG
+						4n8CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmhhcnRwdXJ5LmFjLnVrhilodHRw
+						czovL2lkcC5oYXJ0cHVyeS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						xqp4n/FKdmw6rnk/dIBV654mwsgwDQYJKoZIhvcNAQEFBQADggEBAF14kkpYbOAR
+						ReDt0Wk1RjJDj7YT3rPx3/A4+6h0WtzMRlTEOp6H99cDnRd/HKtWnhYwy9DU7MBg
+						rQumD2VgmCnnOTR8X/oFq3t/hB9bIRY2+w9RL+WSeM1tWCHBob+8SOibzLf/c63g
+						1OpfT+X0bK40aTOvuJeVlZ66WKxW8dUr9GOzCOxkarW6HQlFhE7y+p5mt9jnKoQJ
+						R93wQBJdWf3Bsr51pnY1XKCkYNQn0uxLS9zJYG2Nyvo7hV6Q2GBQko+XJSHsA3cm
+						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>
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
new file mode 100644
index 00000000..ecd382e5
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.hct.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						YmJvbGV0aC5oY3QuYWMudWswHhcNMTMwODI3MDkyNzIzWhcNMzMwODIyMDkyNzIz
+						WjB9MQswCQYDVQQGEwJHQjERMA8GA1UECBMISGVyZWZvcmQxEzARBgNVBAcTCkZv
+						bGx5IExhbmUxJzAlBgNVBAoTHkhlcmVmb3JkIENvbGxlZ2Ugb2YgVGVjaG5vbG9n
+						eTEdMBsGA1UEAxMUc2hpYmJvbGV0aC5oY3QuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQDJUQE1iW+9qx6vTJryX7gJC751rIfdGGscSfDDeU9h
+						ajg6x36EmcA8+c4FYCDQ74uPS7rjSAedaj4AyZTeowz9BWF6vj+YaF8myeVZ/RSt
+						vnc9YqOitKw9i1h9TGoQgR2t8PU+hp+47mtlyAT2WtD9DAHHteT7RjK+nwR3Q4iX
+						CjQrmZuwUUrAraFDjhQtTPopUYe082QcwirOqL2DBICET6RCsTdlNfXTKWNYLRU0
+						+Itxl1jX+o9bQaZdNeiiJD1f2+E0CCQmjB2Bovw3Lg3NQ1Namtn1u4t7VyWF7xs4
+						0N0r9K0lgiPaawL3AuXIlAxnP1EhsxMXv7nOZSB0qftZAgMBAAEwDQYJKoZIhvcN
+						AQEFBQADggEBADTTj8sJmX8p5EnhiLOWYFpKgkHrsmwEKYCwWzc+dLuH2DD8ixZ0
+						g2xPQ/OjhsU/kH0DH7DCgLyn8Y0hzeZSV2w+aeJqxgIZirTa1snIIsYIZGYKpSqm
+						LtF4rEYgkYUzZhU7Sg1F3/uuMZcxU30ZzI6LoBZiXjd4tlgwe7IB8WYNpm8wVq9w
+						zCsZ4C4OWoz56oDjCrFYo4PJlF9/ERp+XPVpQ1rbAwQsbZzKY22ypn8D1dkIz6Cm
+						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>
+						MIIDdjCCAl4CCQDfc3alqzccaDANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJH
+						QjERMA8GA1UECBMISGVyZWZvcmQxEzARBgNVBAcTCkZvbGx5IExhbmUxJzAlBgNV
+						BAoTHkhlcmVmb3JkIENvbGxlZ2Ugb2YgVGVjaG5vbG9neTEdMBsGA1UEAxMUc2hp
+						YmJvbGV0aC5oY3QuYWMudWswHhcNMTMwODI3MDkyNzIzWhcNMzMwODIyMDkyNzIz
+						WjB9MQswCQYDVQQGEwJHQjERMA8GA1UECBMISGVyZWZvcmQxEzARBgNVBAcTCkZv
+						bGx5IExhbmUxJzAlBgNVBAoTHkhlcmVmb3JkIENvbGxlZ2Ugb2YgVGVjaG5vbG9n
+						eTEdMBsGA1UEAxMUc2hpYmJvbGV0aC5oY3QuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQDJUQE1iW+9qx6vTJryX7gJC751rIfdGGscSfDDeU9h
+						ajg6x36EmcA8+c4FYCDQ74uPS7rjSAedaj4AyZTeowz9BWF6vj+YaF8myeVZ/RSt
+						vnc9YqOitKw9i1h9TGoQgR2t8PU+hp+47mtlyAT2WtD9DAHHteT7RjK+nwR3Q4iX
+						CjQrmZuwUUrAraFDjhQtTPopUYe082QcwirOqL2DBICET6RCsTdlNfXTKWNYLRU0
+						+Itxl1jX+o9bQaZdNeiiJD1f2+E0CCQmjB2Bovw3Lg3NQ1Namtn1u4t7VyWF7xs4
+						0N0r9K0lgiPaawL3AuXIlAxnP1EhsxMXv7nOZSB0qftZAgMBAAEwDQYJKoZIhvcN
+						AQEFBQADggEBADTTj8sJmX8p5EnhiLOWYFpKgkHrsmwEKYCwWzc+dLuH2DD8ixZ0
+						g2xPQ/OjhsU/kH0DH7DCgLyn8Y0hzeZSV2w+aeJqxgIZirTa1snIIsYIZGYKpSqm
+						LtF4rEYgkYUzZhU7Sg1F3/uuMZcxU30ZzI6LoBZiXjd4tlgwe7IB8WYNpm8wVq9w
+						zCsZ4C4OWoz56oDjCrFYo4PJlF9/ERp+XPVpQ1rbAwQsbZzKY22ypn8D1dkIz6Cm
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asmjournals.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asmjournals.xml
new file mode 100644
index 00000000..b1962bf5
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asmjournals.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <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
new file mode 100644
index 00000000..e6caff6c
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asnjnls.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <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
new file mode 100644
index 00000000..93c90249
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-cobjnls.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <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
new file mode 100644
index 00000000..2b61d99f
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-dupjnls.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <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
new file mode 100644
index 00000000..6be9f959
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-ecspubs.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <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
new file mode 100644
index 00000000..38dfee57
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-jbjsbrumb.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <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
new file mode 100644
index 00000000..282649c9
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-lcgsl.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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">Stanford University: Lyell Collection</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lyellcollection.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <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
new file mode 100644
index 00000000..2509a2b4
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-oupacademic.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <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
new file mode 100644
index 00000000..c09e093f
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-oxfordservices.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <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
new file mode 100644
index 00000000..cefc19ef
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-physiology.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <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
new file mode 100644
index 00000000..21dfa9d3
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-rupjnls.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <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
new file mode 100644
index 00000000..5d29bcbf
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-secure-sp.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</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
new file mode 100644
index 00000000..90f1e5e2
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.huddnewcoll.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,103 @@
+<?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>
+      <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
+						aWJib2xldGguaHVkZG5ld2NvbGwuYWMudWsxJTAjBgNVBAMTHHNoaWJib2xldGgu
+						aHVkZG5ld2NvbGwuYWMudWswHhcNMTMwNTIwMDg1NDM5WhcNMzMwNTE1MDg1NDM5
+						WjCBrDELMAkGA1UEBhMCR0IxFTATBgNVBAgTDEh1ZGRlcnNmaWVsZDEVMBMGA1UE
+						BxMMTmV3IEhleSBSb2FkMSEwHwYDVQQKExhIdWRkZXJzZmllbGQgTmV3IENvbGxl
+						Z2UxJTAjBgNVBAsTHHNoaWJib2xldGguaHVkZG5ld2NvbGwuYWMudWsxJTAjBgNV
+						BAMTHHNoaWJib2xldGguaHVkZG5ld2NvbGwuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQDITxYchqgwkjzeMznQ3pAKZcssEogz3vkQpZhnuABl
+						PiVWBj/mBI2HuVXXKIi5hf5vxwtU5vrxGyWnQobKl8GioNDH0ijbZE2XSiB6xDWP
+						NVnvWOwQF60Rmblu/nGlbyKY3iRsTs3cJSMxGb0if6eBb2Z+vYtfhvcxU7omCCNU
+						6QjV0klmu0fLOP/qoVFkyPRKPvYgkZMtajvXt4yc6gigwsNmVJF7VczqjJNi9yN2
+						k2GkGUXcMg7Vaqgg61kGhDOO7zqHNRrMnbBjQte+99OkuOLDPdHgreFlP3MV7Jbc
+						ZEzpFuoFYk3qdGbAVhM1965Kgoqy6ch4AOgmFSFy0KxpAgMBAAEwDQYJKoZIhvcN
+						AQEFBQADggEBAK9RrkLse5uPKVnAsFhGFEnSgcaf/4kejl2cy/+2kTkUXYPJegf+
+						5bluOqZJfjsYcguTtOIhRli4JnNrPd5b1evrXnBAZFDztvqSiBaZkT7pGwuecrjF
+						Kfykj21LxZrPCfIdmfTyacDCWJamUblQG5B/fpIzRlUps5ueI5uyIBKYqtg8rpdz
+						S5Tv7kpjdFCJnO8nyD95EiGc36pV+C6Q91k7Zq08mIxJEgDlnFEGjkPpN5QFUI1B
+						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>
+						MIID1jCCAr4CCQDipzubEmV65TANBgkqhkiG9w0BAQUFADCBrDELMAkGA1UEBhMC
+						R0IxFTATBgNVBAgTDEh1ZGRlcnNmaWVsZDEVMBMGA1UEBxMMTmV3IEhleSBSb2Fk
+						MSEwHwYDVQQKExhIdWRkZXJzZmllbGQgTmV3IENvbGxlZ2UxJTAjBgNVBAsTHHNo
+						aWJib2xldGguaHVkZG5ld2NvbGwuYWMudWsxJTAjBgNVBAMTHHNoaWJib2xldGgu
+						aHVkZG5ld2NvbGwuYWMudWswHhcNMTMwNTIwMDg1NDM5WhcNMzMwNTE1MDg1NDM5
+						WjCBrDELMAkGA1UEBhMCR0IxFTATBgNVBAgTDEh1ZGRlcnNmaWVsZDEVMBMGA1UE
+						BxMMTmV3IEhleSBSb2FkMSEwHwYDVQQKExhIdWRkZXJzZmllbGQgTmV3IENvbGxl
+						Z2UxJTAjBgNVBAsTHHNoaWJib2xldGguaHVkZG5ld2NvbGwuYWMudWsxJTAjBgNV
+						BAMTHHNoaWJib2xldGguaHVkZG5ld2NvbGwuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQDITxYchqgwkjzeMznQ3pAKZcssEogz3vkQpZhnuABl
+						PiVWBj/mBI2HuVXXKIi5hf5vxwtU5vrxGyWnQobKl8GioNDH0ijbZE2XSiB6xDWP
+						NVnvWOwQF60Rmblu/nGlbyKY3iRsTs3cJSMxGb0if6eBb2Z+vYtfhvcxU7omCCNU
+						6QjV0klmu0fLOP/qoVFkyPRKPvYgkZMtajvXt4yc6gigwsNmVJF7VczqjJNi9yN2
+						k2GkGUXcMg7Vaqgg61kGhDOO7zqHNRrMnbBjQte+99OkuOLDPdHgreFlP3MV7Jbc
+						ZEzpFuoFYk3qdGbAVhM1965Kgoqy6ch4AOgmFSFy0KxpAgMBAAEwDQYJKoZIhvcN
+						AQEFBQADggEBAK9RrkLse5uPKVnAsFhGFEnSgcaf/4kejl2cy/+2kTkUXYPJegf+
+						5bluOqZJfjsYcguTtOIhRli4JnNrPd5b1evrXnBAZFDztvqSiBaZkT7pGwuecrjF
+						Kfykj21LxZrPCfIdmfTyacDCWJamUblQG5B/fpIzRlUps5ueI5uyIBKYqtg8rpdz
+						S5Tv7kpjdFCJnO8nyD95EiGc36pV+C6Q91k7Zq08mIxJEgDlnFEGjkPpN5QFUI1B
+						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>
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
new file mode 100644
index 00000000..ad627369
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ifpr.edu.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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.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>
+    MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKzApBgNVBAoTIklGUFIgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBQYXJhbmExDTALBgNVBAsTBERUSUMxITAfBgkq
+hkiG9w0BCQEWEmNpbmZyYUBpZnByLmVkdS5icjERMA8GA1UEBxMIQ3VyaXRpYmEx
+DzANBgNVBAgTBlBhcmFuYTELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFnNoaWJib2xl
+dGguaWZwci5lZHUuYnIwHhcNMTQwNDIyMTgyMTAyWhcNMTcwNDIxMTgyMTAyWjCB
+sTErMCkGA1UEChMiSUZQUiAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFBhcmFuYTEN
+MAsGA1UECxMERFRJQzEhMB8GCSqGSIb3DQEJARYSY2luZnJhQGlmcHIuZWR1LmJy
+MREwDwYDVQQHEwhDdXJpdGliYTEPMA0GA1UECBMGUGFyYW5hMQswCQYDVQQGEwJC
+UjEfMB0GA1UEAxMWc2hpYmJvbGV0aC5pZnByLmVkdS5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAL+QMvkPnIAOTQOZTKrQeyHwl1GsqdR5m7+7XhQl
+7GKYJbNwcszmZ755m7uOtz7lmBiI0ZGe77tvcExGPh9lbQiu2IGNLfA2hEtJ4FOA
+RfAATUN6HNtLEEGFxBoG94+E46FdhNVOWUUIlaPVuu9rWbEnY4+rleHEFQ4qveY6
+l1lan5To0CEd4AZEox20EDvtASKR0V+rsgGTGfX7PRnmLFLmbaOj8DkAaYrLdsvC
+l4cA/KspTuSeFO/JSGaZMwZzUlw9znB7KK1oBIas4HQq4JdgqN02mP32E1zYJwm8
+0i/jqijkPrq8vNh97L8itIKB3Z+MEMUc2mimLfbBHu/BrP8CAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAUE5Wp5u744Ur0FMDBRSKpsG0mfgBhneFPE5BnLyjKaNKe9wL
+oWvmERcRMKMfXCthEdL7xRjg3PyaCHanuR2KtqiGrKNMtLtBewhqLBoygasNUfeE
+CIjCG+f57fEsd+cqTidaq5uJn3mcKIy/f3cBEesjRvGsTEQQIjrd6pxKqqKNdMPc
+0s9J+ykM0ZPdWusS+IIStc5WEuS3ZrvkwqgInZxvpAobYBxfFIdZeW1pAudK8YHw
+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>
+      
+MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKzApBgNVBAoTIklGUFIgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBQYXJhbmExDTALBgNVBAsTBERUSUMxITAfBgkq
+hkiG9w0BCQEWEmNpbmZyYUBpZnByLmVkdS5icjERMA8GA1UEBxMIQ3VyaXRpYmEx
+DzANBgNVBAgTBlBhcmFuYTELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFnNoaWJib2xl
+dGguaWZwci5lZHUuYnIwHhcNMTQwNDIyMTgyMTAyWhcNMTcwNDIxMTgyMTAyWjCB
+sTErMCkGA1UEChMiSUZQUiAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFBhcmFuYTEN
+MAsGA1UECxMERFRJQzEhMB8GCSqGSIb3DQEJARYSY2luZnJhQGlmcHIuZWR1LmJy
+MREwDwYDVQQHEwhDdXJpdGliYTEPMA0GA1UECBMGUGFyYW5hMQswCQYDVQQGEwJC
+UjEfMB0GA1UEAxMWc2hpYmJvbGV0aC5pZnByLmVkdS5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAL+QMvkPnIAOTQOZTKrQeyHwl1GsqdR5m7+7XhQl
+7GKYJbNwcszmZ755m7uOtz7lmBiI0ZGe77tvcExGPh9lbQiu2IGNLfA2hEtJ4FOA
+RfAATUN6HNtLEEGFxBoG94+E46FdhNVOWUUIlaPVuu9rWbEnY4+rleHEFQ4qveY6
+l1lan5To0CEd4AZEox20EDvtASKR0V+rsgGTGfX7PRnmLFLmbaOj8DkAaYrLdsvC
+l4cA/KspTuSeFO/JSGaZMwZzUlw9znB7KK1oBIas4HQq4JdgqN02mP32E1zYJwm8
+0i/jqijkPrq8vNh97L8itIKB3Z+MEMUc2mimLfbBHu/BrP8CAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAUE5Wp5u744Ur0FMDBRSKpsG0mfgBhneFPE5BnLyjKaNKe9wL
+oWvmERcRMKMfXCthEdL7xRjg3PyaCHanuR2KtqiGrKNMtLtBewhqLBoygasNUfeE
+CIjCG+f57fEsd+cqTidaq5uJn3mcKIy/f3cBEesjRvGsTEQQIjrd6pxKqqKNdMPc
+0s9J+ykM0ZPdWusS+IIStc5WEuS3ZrvkwqgInZxvpAobYBxfFIdZeW1pAudK8YHw
+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>
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
new file mode 100644
index 00000000..eb86bcdf
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml
@@ -0,0 +1,111 @@
+<?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>
+      <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="193" height="92">https://shibboleth.im.jku.at/logos/JKULogokurzWappenlinks_50.png</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://shibboleth.im.jku.at/logos/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>
+MIIDPDCCAiSgAwIBAgIVAON+suZcxVqRRl5fo2FX1rk+r+TxMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguaW0uamt1LmF0MB4XDTA4MDczMDA3
+Mzk0M1oXDTI4MDczMDA3Mzk0M1owHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5pbS5q
+a3UuYXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDfNbFkkCSmIqH
+O3Ai8h+10/n3Pjix9u92Vhnz+V40ZBz+V7BFdQv5gOPuoggwLymOpYjjZ0x3tV1M
+M/hgng8MYnWp4/d5HOMHYPvO1NL/24tuCM2S+sZKeQheKecosQi+lyuOPSG+XCbu
+Nkhsi4hhOzFvEbEV3rpxYZmy+0DYI47hGtEla+41LSkUcxiaym9cPmwTh+iyYRN1
+4qyQ5UsTghf0LNz+7zUwCvCncwOtfb5tyi6gdrnim9fLu6ocjL8kgu96XfcpSBlv
+KZmUsBMlqj0HwpO7SxDfuCZOwcAwZHjKkbGphPtJshWfWioX29Py7tayeYRyf/ul
+2a27GU03AgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGguaW0uamt1LmF0
+hitodHRwczovL3NoaWJib2xldGguaW0uamt1LmF0L2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRT3TnG4PgZ44Zu/p6xsK1iBPCknDANBgkqhkiG9w0BAQUFAAOCAQEA
+CcqKRJyTg6PARys1IRCMTAiMiXyEsOORL1sVdJmsV2ljypJfJAkhNgQrPPjnXRB9
+lPmUma+ihYK57HkgICfvCw23RjJ4o5IntarEwHAYyKoI+9kO1P5PCF+cD+P77ACN
+mwWSntdEXINxg2lEH8MZe6JAmAxn4U7EMV7w5zGjn005Dd5h//ESTUorWDwiOYMC
+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: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://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
+a3UuYXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDfNbFkkCSmIqH
+O3Ai8h+10/n3Pjix9u92Vhnz+V40ZBz+V7BFdQv5gOPuoggwLymOpYjjZ0x3tV1M
+M/hgng8MYnWp4/d5HOMHYPvO1NL/24tuCM2S+sZKeQheKecosQi+lyuOPSG+XCbu
+Nkhsi4hhOzFvEbEV3rpxYZmy+0DYI47hGtEla+41LSkUcxiaym9cPmwTh+iyYRN1
+4qyQ5UsTghf0LNz+7zUwCvCncwOtfb5tyi6gdrnim9fLu6ocjL8kgu96XfcpSBlv
+KZmUsBMlqj0HwpO7SxDfuCZOwcAwZHjKkbGphPtJshWfWioX29Py7tayeYRyf/ul
+2a27GU03AgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGguaW0uamt1LmF0
+hitodHRwczovL3NoaWJib2xldGguaW0uamt1LmF0L2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRT3TnG4PgZ44Zu/p6xsK1iBPCknDANBgkqhkiG9w0BAQUFAAOCAQEA
+CcqKRJyTg6PARys1IRCMTAiMiXyEsOORL1sVdJmsV2ljypJfJAkhNgQrPPjnXRB9
+lPmUma+ihYK57HkgICfvCw23RjJ4o5IntarEwHAYyKoI+9kO1P5PCF+cD+P77ACN
+mwWSntdEXINxg2lEH8MZe6JAmAxn4U7EMV7w5zGjn005Dd5h//ESTUorWDwiOYMC
+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: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="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
new file mode 100644
index 00000000..c592bd8b
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?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>
+      <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
+						LmFjLnVrMB4XDTEzMDUwMjE1NDcyMVoXDTMzMDQyNzE1NDcyMVowcjELMAkGA1UE
+						BhMCR0IxDzANBgNVBAcMBkxvbmRvbjEgMB4GA1UECgwXSW1wZXJpYWwgQ29sbGVn
+						ZSBMb25kb24xDDAKBgNVBAsMA0lDVDEiMCAGA1UEAwwZc2hpYmJvbGV0aC5pbXBl
+						cmlhbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxAnDyn
+						QHFHVPockHEPcWY70joBPv5GA7uT+SqC1z1wv3LBph6XcOhzAo9Xv7ZHK/GLjo7s
+						rUwZOeP34XDDKytxA7+suaxzyXvLieiw8DIauHZrFiX9DPEvmjJGAMAeQnStLrr/
+						c62m8EvOmGrp0hjh9W8Lu/4NtWJuW2rUa2BZIPDskL9qZbYlyQ2RzPpG7yFNtUwG
+						5qhNigg2h5S4nJP8fA3LbMcTxijg5Pr+P5L2sYxHaXoVORZLTM1Ntz7JObaNK27u
+						VVFV0K7BdpnIjMrOV/uZhEJGgODdXG1qBzItxBLQNCq2AYGYeCFawd5wJfRLRcaD
+						nCd0ayGrmasOvPsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAKSFrP+8jjrpPD70+
+						DYfQZCMZng6eoHfOsTaylUNHpfwrPGBITD1uu27OblMyw6KVncQHv86JBdVjDJ0T
+						soPNdUDNO/ive6jgRlHAKRN337IDAiyVLC7eNBBm5ofIECroy02r5ky32diX2GH8
+						VMTm57mqOmOFgN0in1t2Nobl70hfHV4P+k6XKwVspjwAe4ZjfGdN83bOclR1LovF
+						EGdpH3yR/c95KaT/pQDJjpgdv6EE2duDckyDDeFabHacXtUGuaMAb6vK0xAaA1V6
+						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>
+						MIIDYDCCAkgCCQDjJF1/WYnlsjANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
+						QjEPMA0GA1UEBwwGTG9uZG9uMSAwHgYDVQQKDBdJbXBlcmlhbCBDb2xsZWdlIExv
+						bmRvbjEMMAoGA1UECwwDSUNUMSIwIAYDVQQDDBlzaGliYm9sZXRoLmltcGVyaWFs
+						LmFjLnVrMB4XDTEzMDUwMjE1NDcyMVoXDTMzMDQyNzE1NDcyMVowcjELMAkGA1UE
+						BhMCR0IxDzANBgNVBAcMBkxvbmRvbjEgMB4GA1UECgwXSW1wZXJpYWwgQ29sbGVn
+						ZSBMb25kb24xDDAKBgNVBAsMA0lDVDEiMCAGA1UEAwwZc2hpYmJvbGV0aC5pbXBl
+						cmlhbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxAnDyn
+						QHFHVPockHEPcWY70joBPv5GA7uT+SqC1z1wv3LBph6XcOhzAo9Xv7ZHK/GLjo7s
+						rUwZOeP34XDDKytxA7+suaxzyXvLieiw8DIauHZrFiX9DPEvmjJGAMAeQnStLrr/
+						c62m8EvOmGrp0hjh9W8Lu/4NtWJuW2rUa2BZIPDskL9qZbYlyQ2RzPpG7yFNtUwG
+						5qhNigg2h5S4nJP8fA3LbMcTxijg5Pr+P5L2sYxHaXoVORZLTM1Ntz7JObaNK27u
+						VVFV0K7BdpnIjMrOV/uZhEJGgODdXG1qBzItxBLQNCq2AYGYeCFawd5wJfRLRcaD
+						nCd0ayGrmasOvPsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAKSFrP+8jjrpPD70+
+						DYfQZCMZng6eoHfOsTaylUNHpfwrPGBITD1uu27OblMyw6KVncQHv86JBdVjDJ0T
+						soPNdUDNO/ive6jgRlHAKRN337IDAiyVLC7eNBBm5ofIECroy02r5ky32diX2GH8
+						VMTm57mqOmOFgN0in1t2Nobl70hfHV4P+k6XKwVspjwAe4ZjfGdN83bOclR1LovF
+						EGdpH3yR/c95KaT/pQDJjpgdv6EE2duDckyDDeFabHacXtUGuaMAb6vK0xAaA1V6
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..609f24af
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						LmFjLnVrMB4XDTEzMDUwMjE1NDcyMVoXDTMzMDQyNzE1NDcyMVowcjELMAkGA1UE
+						BhMCR0IxDzANBgNVBAcMBkxvbmRvbjEgMB4GA1UECgwXSW1wZXJpYWwgQ29sbGVn
+						ZSBMb25kb24xDDAKBgNVBAsMA0lDVDEiMCAGA1UEAwwZc2hpYmJvbGV0aC5pbXBl
+						cmlhbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxAnDyn
+						QHFHVPockHEPcWY70joBPv5GA7uT+SqC1z1wv3LBph6XcOhzAo9Xv7ZHK/GLjo7s
+						rUwZOeP34XDDKytxA7+suaxzyXvLieiw8DIauHZrFiX9DPEvmjJGAMAeQnStLrr/
+						c62m8EvOmGrp0hjh9W8Lu/4NtWJuW2rUa2BZIPDskL9qZbYlyQ2RzPpG7yFNtUwG
+						5qhNigg2h5S4nJP8fA3LbMcTxijg5Pr+P5L2sYxHaXoVORZLTM1Ntz7JObaNK27u
+						VVFV0K7BdpnIjMrOV/uZhEJGgODdXG1qBzItxBLQNCq2AYGYeCFawd5wJfRLRcaD
+						nCd0ayGrmasOvPsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAKSFrP+8jjrpPD70+
+						DYfQZCMZng6eoHfOsTaylUNHpfwrPGBITD1uu27OblMyw6KVncQHv86JBdVjDJ0T
+						soPNdUDNO/ive6jgRlHAKRN337IDAiyVLC7eNBBm5ofIECroy02r5ky32diX2GH8
+						VMTm57mqOmOFgN0in1t2Nobl70hfHV4P+k6XKwVspjwAe4ZjfGdN83bOclR1LovF
+						EGdpH3yR/c95KaT/pQDJjpgdv6EE2duDckyDDeFabHacXtUGuaMAb6vK0xAaA1V6
+						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>
+						MIIDYDCCAkgCCQDjJF1/WYnlsjANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
+						QjEPMA0GA1UEBwwGTG9uZG9uMSAwHgYDVQQKDBdJbXBlcmlhbCBDb2xsZWdlIExv
+						bmRvbjEMMAoGA1UECwwDSUNUMSIwIAYDVQQDDBlzaGliYm9sZXRoLmltcGVyaWFs
+						LmFjLnVrMB4XDTEzMDUwMjE1NDcyMVoXDTMzMDQyNzE1NDcyMVowcjELMAkGA1UE
+						BhMCR0IxDzANBgNVBAcMBkxvbmRvbjEgMB4GA1UECgwXSW1wZXJpYWwgQ29sbGVn
+						ZSBMb25kb24xDDAKBgNVBAsMA0lDVDEiMCAGA1UEAwwZc2hpYmJvbGV0aC5pbXBl
+						cmlhbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxAnDyn
+						QHFHVPockHEPcWY70joBPv5GA7uT+SqC1z1wv3LBph6XcOhzAo9Xv7ZHK/GLjo7s
+						rUwZOeP34XDDKytxA7+suaxzyXvLieiw8DIauHZrFiX9DPEvmjJGAMAeQnStLrr/
+						c62m8EvOmGrp0hjh9W8Lu/4NtWJuW2rUa2BZIPDskL9qZbYlyQ2RzPpG7yFNtUwG
+						5qhNigg2h5S4nJP8fA3LbMcTxijg5Pr+P5L2sYxHaXoVORZLTM1Ntz7JObaNK27u
+						VVFV0K7BdpnIjMrOV/uZhEJGgODdXG1qBzItxBLQNCq2AYGYeCFawd5wJfRLRcaD
+						nCd0ayGrmasOvPsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAKSFrP+8jjrpPD70+
+						DYfQZCMZng6eoHfOsTaylUNHpfwrPGBITD1uu27OblMyw6KVncQHv86JBdVjDJ0T
+						soPNdUDNO/ive6jgRlHAKRN337IDAiyVLC7eNBBm5ofIECroy02r5ky32diX2GH8
+						VMTm57mqOmOFgN0in1t2Nobl70hfHV4P+k6XKwVspjwAe4ZjfGdN83bOclR1LovF
+						EGdpH3yR/c95KaT/pQDJjpgdv6EE2duDckyDDeFabHacXtUGuaMAb6vK0xAaA1V6
+						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>
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
new file mode 100644
index 00000000..c46d38f3
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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: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>
+					      MIIDVDCCAjygAwIBAgIVAN6gM4+w8Gx9no3WaW+bpt8Vs/EOMA0GCSqGSIb3DQEB
+BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGguZW5zaS1ib3VyZ2VzLmZyMB4XDTEy
+MDQyMDEzMzk0N1oXDTMyMDQyMDEzMzk0N1owJTEjMCEGA1UEAxMac2hpYmJvbGV0
+aC5lbnNpLWJvdXJnZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCcEpHcghvI1KrNU3oU02iIBGA4qV6Etno9hG4LfTZL+J+8LUY9xbnK2ZBpfUsk
+GN/ioX6FEBSIU+cXNvbxZT45Y4gs492nzjmNpTDKNeU3+HRhnQkGM4b0JXY5G1v2
+nQavrSD1ECIM0BpSveHi1ihDn6iWw8CVdutoKJ4EktVbCr/BNZpYc2k3EJtsKKXm
+ewaAkLxr4IKzeDpY7XWnO7jvmzOYeG4JQ/8japsEG8Nczb+x8kiSyiyYyNVGpxbh
+zsgiB22z/DKOdyKS5qRRL4UeFCtWv21It2d6/yFolks7Q4szZL8L2M5QidVQyK7i
+kUjUNXpeG4ym2em847qId4OvAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWJib2xl
+dGguZW5zaS1ib3VyZ2VzLmZyhjFodHRwczovL3NoaWJib2xldGguZW5zaS1ib3Vy
+Z2VzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSAz0Hnruvk56ktSDWEWNPX
+cun+TTANBgkqhkiG9w0BAQUFAAOCAQEAR0Cv5H8SVMZC9TwCd+HoaKsrFbTWylbp
+aqg3E1ZS0/lN+DhoMWtjsV11e4/FUjKWjKejbXMEfGYPJBsssEx8YS7RH3cP/7zD
+8j7MuadL92A6IjA/PSI88Ee+yozMFyDUyEZwhcAvzsDiJgqoZ/Jqyx1n/Ahq4zFo
+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://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Christophe DEROUET</md:SurName>
+    <md:EmailAddress>christophe.derouet@insa-cvl.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sylvain LESAGE</md:SurName>
+    <md:EmailAddress>sylvain.lesage@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
new file mode 100644
index 00000000..b06858ea
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.insa-rouen.fr-idp-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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="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>
+					      MIIDTDCCAjSgAwIBAgIVAMjnzzUZMi+gw/G65zb8aEmhPMcsMA0GCSqGSIb3DQEB
+BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGguaW5zYS1yb3Vlbi5mcjAeFw0xMDAy
+MTIxNDE0MTNaFw0zMDAyMTIxNDE0MTNaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
+aW5zYS1yb3Vlbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIrS
++3iUIFUKCA9bdG5CkzYxYKWg6huMkcRrqruetEbUobvCf/B5Q4R2SuEHa+VG2SMd
+bgjcHSjPIqwtzcaFq9cEK+I24UPSpBUYei/m9//CWMUNR0YGJWgQdtMi9v4N60qP
+Fiep4U5vj/whakGeMY5J3E8mKrzITemh0yLFThQh+edav5QaPOuOuWW1kx8e3Y2P
+uCEdDDvxXS6vtUJ0Y9OOmq824e9Olo2DIHsbicraB3hnHVDwljw4gwKGDqlkr7kJ
+P/5ORgPyRa51RcD21XHaMcNbiZ9BWuyZkgIX7MwY5Pucn9xZBLOCF1XVPrIz5Thw
+3JBDfons1+l52SpmlW0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5p
+bnNhLXJvdWVuLmZyhi9odHRwczovL3NoaWJib2xldGguaW5zYS1yb3Vlbi5mci9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVroJwDQMTj+P/Qy2rF0hgSrMGd0wDQYJ
+KoZIhvcNAQEFBQADggEBABzLkZCSjBO68HuRhDjlVblgc9up8dN5pZZMxxWyQfQM
+GZgv3sYwktpBL/I7jUuEhiMbr5n8I/hq0HrxiBAFulVvuLhahzfY4GxMwEBHTYm/
+gOoNn2cJD+ZKFF1PPZ3TYnlbM1nJ17AbSCjS2QxzNygTzi2tDulpOJgUmacLr81Q
+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>
+					      MIIDTDCCAjSgAwIBAgIVAMjnzzUZMi+gw/G65zb8aEmhPMcsMA0GCSqGSIb3DQEB
+BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGguaW5zYS1yb3Vlbi5mcjAeFw0xMDAy
+MTIxNDE0MTNaFw0zMDAyMTIxNDE0MTNaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
+aW5zYS1yb3Vlbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIrS
++3iUIFUKCA9bdG5CkzYxYKWg6huMkcRrqruetEbUobvCf/B5Q4R2SuEHa+VG2SMd
+bgjcHSjPIqwtzcaFq9cEK+I24UPSpBUYei/m9//CWMUNR0YGJWgQdtMi9v4N60qP
+Fiep4U5vj/whakGeMY5J3E8mKrzITemh0yLFThQh+edav5QaPOuOuWW1kx8e3Y2P
+uCEdDDvxXS6vtUJ0Y9OOmq824e9Olo2DIHsbicraB3hnHVDwljw4gwKGDqlkr7kJ
+P/5ORgPyRa51RcD21XHaMcNbiZ9BWuyZkgIX7MwY5Pucn9xZBLOCF1XVPrIz5Thw
+3JBDfons1+l52SpmlW0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5p
+bnNhLXJvdWVuLmZyhi9odHRwczovL3NoaWJib2xldGguaW5zYS1yb3Vlbi5mci9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVroJwDQMTj+P/Qy2rF0hgSrMGd0wDQYJ
+KoZIhvcNAQEFBQADggEBABzLkZCSjBO68HuRhDjlVblgc9up8dN5pZZMxxWyQfQM
+GZgv3sYwktpBL/I7jUuEhiMbr5n8I/hq0HrxiBAFulVvuLhahzfY4GxMwEBHTYm/
+gOoNn2cJD+ZKFF1PPZ3TYnlbM1nJ17AbSCjS2QxzNygTzi2tDulpOJgUmacLr81Q
+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://unknown.site.com</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.iumis.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/shibboleth.iumis.co.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..b691f928
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.iumis.co.uk-shibboleth-sp.xml
@@ -0,0 +1,62 @@
+<?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.iumis.co.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-03T13: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDBjCCAe6gAwIBAgIJAMfd/MptgTr4MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXUwMTgwNDUudW5pd2FyZS5jby51azAeFw0xMjA0MjAxMjQyMzZaFw0yMjA0
+						MTgxMjQyMzZaMCAxHjAcBgNVBAMTFXUwMTgwNDUudW5pd2FyZS5jby51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKRgcl652XDcWIJ4rVhsdKbWPRD/
+						+pr2WI7G91fpbrbgpmelV8i+YyQ3Xztz/7XbfQDLPyWUvy8cPRUXLBq+xzk65Hj+
+						Pe17k8Bo2YzWk3mVj9utSi+4VWZ+qC4l+GnIdQ4t0iDj9X9KcMCJFv541Ih1I0cA
+						Dq3YggxcibM13Bne3mYkBr38Zk8zUHFW0oxlwndOtvMaTZkoANuPAxgs2W004VFh
+						9BOv6Ww+w0aU08LkmI5U5Yxojuq/53/1IDXsMPoSdxrICR/AzJ2RbZB8i2ttYvCy
+						yU8VungwG8rkGU5T8w91kSQdlmF0TaiiYTqYqVxon0tRulqyKRomPIBIIasCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVdTAxODA0NS51bml3YXJlLmNvLnVrMB0GA1UdDgQW
+						BBRXqfbwMPvQYTEZhluO4Cu+YM7d6TANBgkqhkiG9w0BAQUFAAOCAQEAFanur4sV
+						TKS5I8TvnCyG57S4W3xJb18W64opxWNxEPHIady60LRlLWIQWaXFLIEL5zq4/VEA
+						0boBhIhSGJO821Z/WRH0bzD4gVjnbR1aJasaxgd1hkwTcJRRorW/f8OPnCNy/FAH
+						VaMplq1E0yMFcCozq0ZfWXwlUaZMdvCqweAsSFt3EehdtZpJVoA73fOoPiwoYzSl
+						BnmDKI4Ch//jObq+xXoENh7q2w/pbPPCeDOyYi50fV69n0sGVpsCUwkNdm+r+94g
+						Nbnt/AF1tYJKe6aqD99bOFtcFksQP75LCDERU5vsluFzm5Qf9YwXFM39YfiP2X/u
+						7ArVRNUmGaMpHw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Uniware Systems Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Uniware Systems Limited: Test Development System</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uniware.co.uk/upay</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/shibboleth.iwcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.iwcollege.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..ab7db8fc
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.iwcollege.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						Lml3Y29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AKzUxmDIS29Sejm1J9fiY/ld8mkk6sskW5Pghzam6gGCa/YcH0VYdJvqCMC2juZO
+						rGHHePIr4X4pygytSKgyXf6MOuavQ8xdhpglM73DDiPeGZsGsdvAET994q2gbIpR
+						UaR0kzFW4LDSsY1GFbujIl59hu0vbxbddlgR9byKamsEmiXETKf+1oDkWLPHQQ9H
+						Sc6xFZihQT5562RBlhswMquk2ZKY9WsUhzG+PaVrXxQoFCPsus8QhX9cALKNFH2g
+						99VkRqlS+3fE5v3AQnEBCUXJSAK/Y8lNuLWQnSmLuYRxXbXVzQy3JB1fHCZKCxYm
+						DTlMiNEMJoziUQ3Oa+9cqxECAwEAAaN7MHkwWAYDVR0RBFEwT4Iac2hpYmJvbGV0
+						aC5pd2NvbGxlZ2UuYWMudWuGMWh0dHBzOi8vc2hpYmJvbGV0aC5pd2NvbGxlZ2Uu
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFoss0RidHbwaeYmqjP1zYLn
+						4ptTMA0GCSqGSIb3DQEBBQUAA4IBAQCj2RH3sEFLevVNOV7Tg30KcYw0IYYLGVD9
+						g2WjGCAm/7ukH4jP9Tbdo8aUMx7ouCdTFcfHO0j5l5iezPf65fo/Zt8sCf8vd75f
+						CfUeB0p5d174teNMpQiMrF753TWUjdtde36+d97WHpAhDwaKEfRc1wR1N0rjXrBy
+						nZ3+lS4aUxJqdbzU2/zHJxfsMasqJTybKUk2CEkFp+54nbE88LmFe0be3S+1iTKY
+						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>
+						MIIDUzCCAjugAwIBAgIUU3AARW5EezCLsq9ZxfkceNTJVYEwDQYJKoZIhvcNAQEF
+						BQAwJTEjMCEGA1UEAxMac2hpYmJvbGV0aC5pd2NvbGxlZ2UuYWMudWswHhcNMTQw
+						MjEwMTQ0MDEzWhcNMzQwMjEwMTQ0MDEzWjAlMSMwIQYDVQQDExpzaGliYm9sZXRo
+						Lml3Y29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AKzUxmDIS29Sejm1J9fiY/ld8mkk6sskW5Pghzam6gGCa/YcH0VYdJvqCMC2juZO
+						rGHHePIr4X4pygytSKgyXf6MOuavQ8xdhpglM73DDiPeGZsGsdvAET994q2gbIpR
+						UaR0kzFW4LDSsY1GFbujIl59hu0vbxbddlgR9byKamsEmiXETKf+1oDkWLPHQQ9H
+						Sc6xFZihQT5562RBlhswMquk2ZKY9WsUhzG+PaVrXxQoFCPsus8QhX9cALKNFH2g
+						99VkRqlS+3fE5v3AQnEBCUXJSAK/Y8lNuLWQnSmLuYRxXbXVzQy3JB1fHCZKCxYm
+						DTlMiNEMJoziUQ3Oa+9cqxECAwEAAaN7MHkwWAYDVR0RBFEwT4Iac2hpYmJvbGV0
+						aC5pd2NvbGxlZ2UuYWMudWuGMWh0dHBzOi8vc2hpYmJvbGV0aC5pd2NvbGxlZ2Uu
+						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFoss0RidHbwaeYmqjP1zYLn
+						4ptTMA0GCSqGSIb3DQEBBQUAA4IBAQCj2RH3sEFLevVNOV7Tg30KcYw0IYYLGVD9
+						g2WjGCAm/7ukH4jP9Tbdo8aUMx7ouCdTFcfHO0j5l5iezPf65fo/Zt8sCf8vd75f
+						CfUeB0p5d174teNMpQiMrF753TWUjdtde36+d97WHpAhDwaKEfRc1wR1N0rjXrBy
+						nZ3+lS4aUxJqdbzU2/zHJxfsMasqJTybKUk2CEkFp+54nbE88LmFe0be3S+1iTKY
+						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>
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
new file mode 100644
index 00000000..b9192449
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.kcollege.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,109 @@
+<?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>
+      <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
+						GXNoaWJib2xldGgua2NvbGxlZ2UuYWMudWsxKDAmBgkqhkiG9w0BCQEWGWl0c2Vy
+						dmljZXNAa2NvbGxlZ2UuYWMudWswHhcNMTQwMjEyMDk1MDA5WhcNMjQwMjEwMDk1
+						MDA5WjCBqjELMAkGA1UEBhMCR0IxDTALBgNVBAgTBEtlbnQxEjAQBgNVBAcTCVRv
+						bmJyaWRnZTESMBAGA1UEChMJSyBDb2xsZWdlMRYwFAYDVQQLEw1JVCBEZXBhcnRt
+						ZW50MSIwIAYDVQQDExlzaGliYm9sZXRoLmtjb2xsZWdlLmFjLnVrMSgwJgYJKoZI
+						hvcNAQkBFhlpdHNlcnZpY2VzQGtjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAyUONnw9FNuYKcET6VNifgEdvZOAOZXlyJTOmS+dR
+						tEhyW8TBc5gFjyPyc12Odj3qelGj/IwN0UuvN9XSZwVXVfTfxShmAxfA4jGp9/QS
+						3GDvDJRaIEpZBXdnnj1/mBtXUc3kz8bATlKK2iOyl+M4YtwxoHzDyFhlsu+h4A2Y
+						LOl3ippTtSql++pgoRAITDLuALIgF/BSzWV/wv1l11AzPauPONJTPWH8uBZ8e85H
+						kcgm2+psZwP3NYGrgzWmR2OKFZg/4buis+S1LDTX66zuwaMnCwnK7y6jcgQ8piB0
+						Y5ypSZCq4fOUc7vNiYmA/EJVq5c6//cyfo4OHUxMgOStHwIDAQABo3sweTAJBgNV
+						HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
+						Y2F0ZTAdBgNVHQ4EFgQUhvOVaHPTsggHRCxEXm6G8hfJbVswHwYDVR0jBBgwFoAU
+						hvOVaHPTsggHRCxEXm6G8hfJbVswDQYJKoZIhvcNAQEFBQADggEBALIGgkvNn9fX
+						HlxH5CiHKVOSwEHE7MlnkJLOemlMv/n4jjWJyKOQ1XR6nZ7Q9UQl0v5cHZKJMMYq
+						chJebSDsho3kb9LkibDEAO6b2b8ZUGMf0F/6hqETy5Qj/w9YFRHqsIHkDMbCZAKd
+						8fm5chrfV2op269TzIrs0LLiCqGE7Jak0ZafxxHUofxQb2d31OdT5xga47ReJI1n
+						CwTAsqXJlK6Zt6T5x29G94U0l5jgYlIrkbGI5ybdfCmOI7NIk+N6uadQ0CLx4sbH
+						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>
+						MIIEVDCCAzygAwIBAgIJAIt8JpQ7ds27MA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
+						VQQGEwJHQjENMAsGA1UECBMES2VudDESMBAGA1UEBxMJVG9uYnJpZGdlMRIwEAYD
+						VQQKEwlLIENvbGxlZ2UxFjAUBgNVBAsTDUlUIERlcGFydG1lbnQxIjAgBgNVBAMT
+						GXNoaWJib2xldGgua2NvbGxlZ2UuYWMudWsxKDAmBgkqhkiG9w0BCQEWGWl0c2Vy
+						dmljZXNAa2NvbGxlZ2UuYWMudWswHhcNMTQwMjEyMDk1MDA5WhcNMjQwMjEwMDk1
+						MDA5WjCBqjELMAkGA1UEBhMCR0IxDTALBgNVBAgTBEtlbnQxEjAQBgNVBAcTCVRv
+						bmJyaWRnZTESMBAGA1UEChMJSyBDb2xsZWdlMRYwFAYDVQQLEw1JVCBEZXBhcnRt
+						ZW50MSIwIAYDVQQDExlzaGliYm9sZXRoLmtjb2xsZWdlLmFjLnVrMSgwJgYJKoZI
+						hvcNAQkBFhlpdHNlcnZpY2VzQGtjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAyUONnw9FNuYKcET6VNifgEdvZOAOZXlyJTOmS+dR
+						tEhyW8TBc5gFjyPyc12Odj3qelGj/IwN0UuvN9XSZwVXVfTfxShmAxfA4jGp9/QS
+						3GDvDJRaIEpZBXdnnj1/mBtXUc3kz8bATlKK2iOyl+M4YtwxoHzDyFhlsu+h4A2Y
+						LOl3ippTtSql++pgoRAITDLuALIgF/BSzWV/wv1l11AzPauPONJTPWH8uBZ8e85H
+						kcgm2+psZwP3NYGrgzWmR2OKFZg/4buis+S1LDTX66zuwaMnCwnK7y6jcgQ8piB0
+						Y5ypSZCq4fOUc7vNiYmA/EJVq5c6//cyfo4OHUxMgOStHwIDAQABo3sweTAJBgNV
+						HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
+						Y2F0ZTAdBgNVHQ4EFgQUhvOVaHPTsggHRCxEXm6G8hfJbVswHwYDVR0jBBgwFoAU
+						hvOVaHPTsggHRCxEXm6G8hfJbVswDQYJKoZIhvcNAQEFBQADggEBALIGgkvNn9fX
+						HlxH5CiHKVOSwEHE7MlnkJLOemlMv/n4jjWJyKOQ1XR6nZ7Q9UQl0v5cHZKJMMYq
+						chJebSDsho3kb9LkibDEAO6b2b8ZUGMf0F/6hqETy5Qj/w9YFRHqsIHkDMbCZAKd
+						8fm5chrfV2op269TzIrs0LLiCqGE7Jak0ZafxxHUofxQb2d31OdT5xga47ReJI1n
+						CwTAsqXJlK6Zt6T5x29G94U0l5jgYlIrkbGI5ybdfCmOI7NIk+N6uadQ0CLx4sbH
+						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">South and West Kent 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
new file mode 100644
index 00000000..9667a99b
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.knovel.com-shibboleth.xml
@@ -0,0 +1,65 @@
+<?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>
+      <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"/>
+      <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="2"/>
+      <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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDujCCAqKgAwIBAgIJANDf/KbdI37xMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNV
+						BAYTAlVTMQswCQYDVQQIEwJOWTEMMAoGA1UEBxMDTllDMRswGQYDVQQKExJLbm92
+						ZWwgQ29ycG9yYXRpb24xFzAVBgNVBAMTDnNzby5rbm92ZWwuY29tMB4XDTE0MDQx
+						NDEzMTQxNVoXDTM0MDQwOTEzMTQxNVowXjELMAkGA1UEBhMCVVMxCzAJBgNVBAgT
+						Ak5ZMQwwCgYDVQQHEwNOWUMxGzAZBgNVBAoTEktub3ZlbCBDb3Jwb3JhdGlvbjEX
+						MBUGA1UEAxMOc3NvLmtub3ZlbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQCiA2U/scRrpv+vAMjajlfo6VL+7LbLAbFwf/B+Irwb6+tqNgE7KhZx
+						fFb7gTQE4zaDnhBEtlHoJtR0mKz0Lnh2XK09EijA3Z1Rtu7sWbJIlIfZxA6PxPzp
+						OXY6tuTOzjPYM90I4fpHHLd04lGwWiJyRcx02tKAPUSxMXcmFYXFDaa9jAXRXYxe
+						Qjvpg9uZhmRd8qyA3MraLTSva/Qx6iXpT7G50RJvMIuZ91wW654/BSWSBdaCFzoL
+						PNLEb1Wda08XmNPebfdi5fDyZV6ePvYNLQZnjxtIWwy13QMop7bmCqbYf4hC13Rh
+						Svd/rtye0RZp900uxpNrBghIPPnR91obAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJ
+						YIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1Ud
+						DgQWBBT/FCscZUqNjJQkE+P0/Z8imgrKGTAfBgNVHSMEGDAWgBT/FCscZUqNjJQk
+						E+P0/Z8imgrKGTANBgkqhkiG9w0BAQUFAAOCAQEAVRTsaVKqAMLTv6iYqf5KDPSU
+						6BQssDlhy249VNVAdQ3kX1flTxmLcCrRVQVCZ9oB4U67mixsro+vCcs04cZ+aoQM
+						uZGBE7ikRv3sOn0uwc5JJ1en4jF4CxzSlESZZt/REnCYecmsnzUFHgwezQoRFArV
+						biQRRQxr3A4va92z/pjASq8J0R4rJ50j5aQi0ay1zE6aAiyXiws8450D0lBg6+Te
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.lsbu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.lsbu.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..ad675878
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.lsbu.ac.uk-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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>
+						MIIDQzCCAiugAwIBAgIUPksCn3BruNlalmPU1+Y/4zBDRkEwDQYJKoZIhvcNAQEF
+						BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aDIubHNidS5hYy51azAeFw0xMjAyMTMx
+						MzI5NDJaFw0zMjAyMTMxMzI5NDJaMCExHzAdBgNVBAMTFnNoaWJib2xldGgyLmxz
+						YnUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChnhct+F+F
+						8yqhCpZrGgSzMVxqLQazMISxrLM+KX5+PIM5myd5MYoZ0O9JDeJF9Ww65dV7lbaw
+						DlnSf1GRlQW1YD//GaeTQQYHtbx9orC7TKZF73L2nTH4NcfD/lm1jyPpNyeB8I20
+						QxgIGDMmoZXqNgggmAcA8tibSiUPWP1NmiZP4fGmReqWbA1Rq9DfxwjBt4YjFvxe
+						7tUnQVcEL2h5g4/RSFCwmC2O8Wsh9x4RGz4iVFpyOXZ0P96WiRShG/FnyfKXaMWe
+						e/zBAq0g51BcbPCVf2vELMAuH3oDKdIcyiDps7ixz+hIl9tW4g7fFeVr34eg0wj3
+						OZZ2T+cyJr5pAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGgyLmxzYnUu
+						YWMudWuGLWh0dHBzOi8vc2hpYmJvbGV0aDIubHNidS5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQU0DRW++Gu2kI3IgXnorvTnzWmXMQwDQYJKoZIhvcNAQEF
+						BQADggEBAEFHkhujfcQMepjTo57cZzYSIxSYO5qvvOweEwWXKY226L1SqwOAFg0I
+						hqoVVuOPC2NupUK/JM9UwgR1L+rNc25Kosb0QgiLXt4kq5+fpFKu291BBRHdaHQj
+						80KlkkS3H2AWyGMEFAPCBB9RpXFBOVG/Y4ed315j5KmB/DT3jYf9xBXr3RX5/6C+
+						3a/VC9/mfyzUZA1tKSf+GAeS1aoNnnNVncVd4oVud+i6+rggnVbYLCT6JPtTNr38
+						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>
+						MIIDQzCCAiugAwIBAgIUPksCn3BruNlalmPU1+Y/4zBDRkEwDQYJKoZIhvcNAQEF
+						BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aDIubHNidS5hYy51azAeFw0xMjAyMTMx
+						MzI5NDJaFw0zMjAyMTMxMzI5NDJaMCExHzAdBgNVBAMTFnNoaWJib2xldGgyLmxz
+						YnUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChnhct+F+F
+						8yqhCpZrGgSzMVxqLQazMISxrLM+KX5+PIM5myd5MYoZ0O9JDeJF9Ww65dV7lbaw
+						DlnSf1GRlQW1YD//GaeTQQYHtbx9orC7TKZF73L2nTH4NcfD/lm1jyPpNyeB8I20
+						QxgIGDMmoZXqNgggmAcA8tibSiUPWP1NmiZP4fGmReqWbA1Rq9DfxwjBt4YjFvxe
+						7tUnQVcEL2h5g4/RSFCwmC2O8Wsh9x4RGz4iVFpyOXZ0P96WiRShG/FnyfKXaMWe
+						e/zBAq0g51BcbPCVf2vELMAuH3oDKdIcyiDps7ixz+hIl9tW4g7fFeVr34eg0wj3
+						OZZ2T+cyJr5pAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGgyLmxzYnUu
+						YWMudWuGLWh0dHBzOi8vc2hpYmJvbGV0aDIubHNidS5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQU0DRW++Gu2kI3IgXnorvTnzWmXMQwDQYJKoZIhvcNAQEF
+						BQADggEBAEFHkhujfcQMepjTo57cZzYSIxSYO5qvvOweEwWXKY226L1SqwOAFg0I
+						hqoVVuOPC2NupUK/JM9UwgR1L+rNc25Kosb0QgiLXt4kq5+fpFKu291BBRHdaHQj
+						80KlkkS3H2AWyGMEFAPCBB9RpXFBOVG/Y4ed315j5KmB/DT3jYf9xBXr3RX5/6C+
+						3a/VC9/mfyzUZA1tKSf+GAeS1aoNnnNVncVd4oVud+i6+rggnVbYLCT6JPtTNr38
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..8c6de095
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.medvik.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-16T11:08: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/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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">medvik.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Medical Library, Prague - Medvik</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Národní lékařská knihovna - Medvik</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for users of Medvik system.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro uživatele systému Medvik.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.nlk.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.nlk.cz/</mdui:InformationURL>
+        <mdui:Logo height="75" width="108">https://www.medvik.cz/images/medvik-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>
+
+MIIDPDCCAiSgAwIBAgIVALhNUzUSgsNOgW9LDvjMF1eO3MVfMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGgubWVkdmlrLmN6MB4XDTE0MTAwNjEy
+NDAyMFoXDTM0MTAwNjEyNDAyMFowHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5tZWR2
+aWsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbFpOdyzUFOL+l
+OfkXH3elU8ELBA4HPJxhmnbC0HLcOhtG7F1cpeeHn1qEW8VmTpdrjcXc1+cy7tBo
+cJOtkSYxWPU8SPzSnSXEoxpvaFfLjmQScJ4BnbTj03pItD+ZxBodSwS1MCI0LjJw
+Al1KI2fnV3hCsJ11PW35bhRqyl0zdTrne2Y7s5eQ6lnYOVcxNQBwY5Pz72TuNrvz
+PjyCD9v1iHozseTc+tkhl1EgWtr7NX9uvYqhh0IiowvjWQzhJbKH710mrhtyazYV
+1QsjU/M28FJJh8OY8zwaCN6xKTc+JONGdFMonK4yjrbzZUw8OUfktl4rAMyLtbA2
+WuLV9fRRAgMBAAGjbzBtMB0GA1UdDgQWBBSIZSVLqhf/EKsXe5yziqT5xbGAijBM
+BgNVHREERTBDghRzaGliYm9sZXRoLm1lZHZpay5jeoYraHR0cHM6Ly9zaGliYm9s
+ZXRoLm1lZHZpay5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
+aliUWOCr/uziYYSeLmJbKRcNwQVyYhGZOVpaar2LpgVo1NfS7+MRjZCEWg+oXPKF
+9ixygW/vaxBeXtXR5/FMgBkzP4NmlRMUVYL8paMqqUqBvJ7Do0yrGOBKf/enm0iJ
+FPk29vsRDXPZtqchryyFgQcubaItqzMjV1tDGNeKKcWXk7DtdXWYX8zYw/9ANWjz
+Avi9oeMfp7Q/w76zUkcHl5PiV8Mr7cxF4InWUWhR/+jbDKL0B22R0je0Jw9QUD2d
+IBOVCjh6ZnQwMUpNxRVeU1zEvy1CHYLyc/jhFnxxmgS0k24qlyQ6BuB76t++E1a5
+0WzVDPkawhmccTbRUyqTcQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.medvik.cz/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/SOAP/SLO"/>
+    <md: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.medvik.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.medvik.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="true">medvik.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+
+MIIDPDCCAiSgAwIBAgIVALhNUzUSgsNOgW9LDvjMF1eO3MVfMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGgubWVkdmlrLmN6MB4XDTE0MTAwNjEy
+NDAyMFoXDTM0MTAwNjEyNDAyMFowHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5tZWR2
+aWsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbFpOdyzUFOL+l
+OfkXH3elU8ELBA4HPJxhmnbC0HLcOhtG7F1cpeeHn1qEW8VmTpdrjcXc1+cy7tBo
+cJOtkSYxWPU8SPzSnSXEoxpvaFfLjmQScJ4BnbTj03pItD+ZxBodSwS1MCI0LjJw
+Al1KI2fnV3hCsJ11PW35bhRqyl0zdTrne2Y7s5eQ6lnYOVcxNQBwY5Pz72TuNrvz
+PjyCD9v1iHozseTc+tkhl1EgWtr7NX9uvYqhh0IiowvjWQzhJbKH710mrhtyazYV
+1QsjU/M28FJJh8OY8zwaCN6xKTc+JONGdFMonK4yjrbzZUw8OUfktl4rAMyLtbA2
+WuLV9fRRAgMBAAGjbzBtMB0GA1UdDgQWBBSIZSVLqhf/EKsXe5yziqT5xbGAijBM
+BgNVHREERTBDghRzaGliYm9sZXRoLm1lZHZpay5jeoYraHR0cHM6Ly9zaGliYm9s
+ZXRoLm1lZHZpay5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
+aliUWOCr/uziYYSeLmJbKRcNwQVyYhGZOVpaar2LpgVo1NfS7+MRjZCEWg+oXPKF
+9ixygW/vaxBeXtXR5/FMgBkzP4NmlRMUVYL8paMqqUqBvJ7Do0yrGOBKf/enm0iJ
+FPk29vsRDXPZtqchryyFgQcubaItqzMjV1tDGNeKKcWXk7DtdXWYX8zYw/9ANWjz
+Avi9oeMfp7Q/w76zUkcHl5PiV8Mr7cxF4InWUWhR/+jbDKL0B22R0je0Jw9QUD2d
+IBOVCjh6ZnQwMUpNxRVeU1zEvy1CHYLyc/jhFnxxmgS0k24qlyQ6BuB76t++E1a5
+0WzVDPkawhmccTbRUyqTcQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.medvik.cz/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.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">National Medical Library</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Národní lékařská knihovna</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Medical Library, Prague - Medvik</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Národní lékařská knihovna - Medvik</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nlk.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.nlk.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Filip</md:GivenName>
+    <md:SurName>Kriz</md:SurName>
+    <md:EmailAddress>medvik@nlk.cz</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
new file mode 100644
index 00000000..ebae5ca9
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.metapress.com-shibboleth-sp.xml
@@ -0,0 +1,87 @@
+<?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>
+						MIIDPjCCAiagAwIBAgIJAKTDQvdm67vhMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHNoaWJib2xldGgubWV0YXByZXNzLmNvbTAeFw0xMjA2MjUxNTI5NDFaFw0y
+						MjA2MjMxNTI5NDFaMCMxITAfBgNVBAMTGHNoaWJib2xldGgubWV0YXByZXNzLmNv
+						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANCgbbfHnyWZP//SKjok
+						oNxy7YAFDxFysMjUBJnoeSN0J/nD8XvggcO10PpL+g1RnUAnc9L/2Zp0A6DpQSbN
+						9RUX3o+lG4X9bQGBntImQcRx37joWq6bEKuMNxJzf42gqUCGYbUyXIRfPpjAgqEE
+						5MEmjt7qK3j1NsE7NPoLpXtgNGSl9TM2dClruZiSGVPeYjA1GFW6cAk6CWy17KyB
+						CZMF0d+FLEu5RQnJZOYz4fCSdhdn4lOw1gjNRI02zhMtfwgJt4Haq5H/qtsJyaPW
+						9kcz1EqeX88QpJKB/eDYwQ5cLcQXuNex3eaPuzF4lwS+Ybh3CDCBg3k+VPCNVgx5
+						0zECAwEAAaN1MHMwUgYDVR0RBEswSYIYc2hpYmJvbGV0aC5tZXRhcHJlc3MuY29t
+						hi1odHRwOi8vc2hpYmJvbGV0aC5tZXRhcHJlc3MuY29tL3NoaWJib2xldGgtc3Aw
+						HQYDVR0OBBYEFPmH00sX6+2+UJXx2FEPf008kLDjMA0GCSqGSIb3DQEBBQUAA4IB
+						AQAu+UyC9yMgDkfRYmLOzgIu6lUExX7JNN1tAjU6mXUb59cSs0nnk6s6lHab2DD4
+						tc4i9aWS0e5q4UXnzV04+tr2Cr6AYDBS05d1trKAb3QZLBxeC9h+DGw23nLRwKTg
+						YCELf07nXYSUr6KfLpNCH3d+ws+urhZtpFeElipKJQXdUnV1oe7be4ZveCaqqLm4
+						yAJJ+ag8LeAszHnxACtNDd7cMvM0vgEc9WosMsBoMhY02dXSniM/9aMeKUNx6vLO
+						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>
+						MIIDPjCCAiagAwIBAgIJAKTDQvdm67vhMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHNoaWJib2xldGgubWV0YXByZXNzLmNvbTAeFw0xMjA2MjUxNTI5NDFaFw0y
+						MjA2MjMxNTI5NDFaMCMxITAfBgNVBAMTGHNoaWJib2xldGgubWV0YXByZXNzLmNv
+						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANCgbbfHnyWZP//SKjok
+						oNxy7YAFDxFysMjUBJnoeSN0J/nD8XvggcO10PpL+g1RnUAnc9L/2Zp0A6DpQSbN
+						9RUX3o+lG4X9bQGBntImQcRx37joWq6bEKuMNxJzf42gqUCGYbUyXIRfPpjAgqEE
+						5MEmjt7qK3j1NsE7NPoLpXtgNGSl9TM2dClruZiSGVPeYjA1GFW6cAk6CWy17KyB
+						CZMF0d+FLEu5RQnJZOYz4fCSdhdn4lOw1gjNRI02zhMtfwgJt4Haq5H/qtsJyaPW
+						9kcz1EqeX88QpJKB/eDYwQ5cLcQXuNex3eaPuzF4lwS+Ybh3CDCBg3k+VPCNVgx5
+						0zECAwEAAaN1MHMwUgYDVR0RBEswSYIYc2hpYmJvbGV0aC5tZXRhcHJlc3MuY29t
+						hi1odHRwOi8vc2hpYmJvbGV0aC5tZXRhcHJlc3MuY29tL3NoaWJib2xldGgtc3Aw
+						HQYDVR0OBBYEFPmH00sX6+2+UJXx2FEPf008kLDjMA0GCSqGSIb3DQEBBQUAA4IB
+						AQAu+UyC9yMgDkfRYmLOzgIu6lUExX7JNN1tAjU6mXUb59cSs0nnk6s6lHab2DD4
+						tc4i9aWS0e5q4UXnzV04+tr2Cr6AYDBS05d1trKAb3QZLBxeC9h+DGw23nLRwKTg
+						YCELf07nXYSUr6KfLpNCH3d+ws+urhZtpFeElipKJQXdUnV1oe7be4ZveCaqqLm4
+						yAJJ+ag8LeAszHnxACtNDd7cMvM0vgEc9WosMsBoMhY02dXSniM/9aMeKUNx6vLO
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.midkent.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.midkent.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..d7e4db85
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.midkent.ac.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						Lm1pZGtlbnQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZ
+						FxthTyRgoHipxaAAoald9sOKxKf6dmrKSu8aZe0aI2vELihyQ80EBbhq+ELFUKzr
+						+ZMA2BGC7j2xlzplC7evTx1hTIFwCr6r+5Ezh6yhozKDkMCLVh8SkCqoMuVLkwr+
+						414KLGmmPqS51QuRajcDJu/5kg12CI8rvw3M6NvEhmduwuRZFCwuDOEB9nftY3PY
+						9B6bIx7wBLO9YflPbfP/+kZUqp5iwoWZrsHiX/do8w2zHp5hH0ny3dmAtqNhDzEA
+						xCvvyeU0FXjKcz+0INbl4VMvyjGzfrqSL8CuDx8xegcIWg3p8Q7ZqqNAIOb+3GQ0
+						Mfv+SNteBe1wsMXzOcIXAgMBAAGjeTB3MFYGA1UdEQRPME2CGXNoaWJib2xldGgy
+						Lm1pZGtlbnQuYWMudWuGMGh0dHBzOi8vc2hpYmJvbGV0aDIubWlka2VudC5hYy51
+						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUGgaMdXWEPm2ueSgt1bplk0u9X1Mw
+						DQYJKoZIhvcNAQEFBQADggEBAFLDEKLNrzHBhOjb3jING7WIb57xMaTCN2n57blH
+						PWD826DN9EQiqh8zCbhw/b8K7GQmZBbL7egvh0imC7kzdEqDiGeK4BV7YG1i1TUA
+						hS8mQvrMq7xl7SHPOEHEFxxZE2b65R3JYZQhyrFaOOEGv95d+8QbOG7XaAC5JBLS
+						Ak8fnTEGoUAB4X7VPvdzUe48WHAf3O7GkhvbMTZ0t9nqGI5teTltQNINbI5DEhBJ
+						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>
+						MIIDTzCCAjegAwIBAgIUNoEJdB/0XMNzrx6TpF9l+vmgmH0wDQYJKoZIhvcNAQEF
+						BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aDIubWlka2VudC5hYy51azAeFw0xNDA1
+						MDYxMzEzNTVaFw0zNDA1MDYxMzEzNTVaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgy
+						Lm1pZGtlbnQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZ
+						FxthTyRgoHipxaAAoald9sOKxKf6dmrKSu8aZe0aI2vELihyQ80EBbhq+ELFUKzr
+						+ZMA2BGC7j2xlzplC7evTx1hTIFwCr6r+5Ezh6yhozKDkMCLVh8SkCqoMuVLkwr+
+						414KLGmmPqS51QuRajcDJu/5kg12CI8rvw3M6NvEhmduwuRZFCwuDOEB9nftY3PY
+						9B6bIx7wBLO9YflPbfP/+kZUqp5iwoWZrsHiX/do8w2zHp5hH0ny3dmAtqNhDzEA
+						xCvvyeU0FXjKcz+0INbl4VMvyjGzfrqSL8CuDx8xegcIWg3p8Q7ZqqNAIOb+3GQ0
+						Mfv+SNteBe1wsMXzOcIXAgMBAAGjeTB3MFYGA1UdEQRPME2CGXNoaWJib2xldGgy
+						Lm1pZGtlbnQuYWMudWuGMGh0dHBzOi8vc2hpYmJvbGV0aDIubWlka2VudC5hYy51
+						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUGgaMdXWEPm2ueSgt1bplk0u9X1Mw
+						DQYJKoZIhvcNAQEFBQADggEBAFLDEKLNrzHBhOjb3jING7WIb57xMaTCN2n57blH
+						PWD826DN9EQiqh8zCbhw/b8K7GQmZBbL7egvh0imC7kzdEqDiGeK4BV7YG1i1TUA
+						hS8mQvrMq7xl7SHPOEHEFxxZE2b65R3JYZQhyrFaOOEGv95d+8QbOG7XaAC5JBLS
+						Ak8fnTEGoUAB4X7VPvdzUe48WHAf3O7GkhvbMTZ0t9nqGI5teTltQNINbI5DEhBJ
+						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>
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
new file mode 100644
index 00000000..926509bf
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.mines-ales.fr-idp-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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="fr">Ecole des Mines d'Ales</mdui:DisplayName>
+      </mdui:UIInfo>
+    </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
+bWluZXMtYWxlcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAItD
+aS5KDMxNFvZLeYTCJMufD5l6n30RVg7kPxP6QDJsXvCyKW8kaAojwgr0BUNhIuWW
+9KYTab705HN9IUTNHQGngYmcLtOvMvX5eGO9tYKXqBA+vjSyCet5HRSd8bimtjwJ
+mHfOheQXeHtHtF4gcM5rKlToUdny4UKc3V5EaglZPOsgA9bIdLX/XGuXORoU7C8d
+jQpyo3Y6knBQsxHfZEZFiIUQTBfenc/Hqt5+ialLA4OqjR/yZATpVXZubVf1f2Vj
+XEo4685sWxRC2IsZ0IIjCtEWvf+9P4jEgiBW/M9FFwhXLkofqbossasVs+INU04m
+UGfb7SH1222oPbeawBECAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5t
+aW5lcy1hbGVzLmZyhi9odHRwczovL3NoaWJib2xldGgubWluZXMtYWxlcy5mci9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTlAtOzPum6kvlDfiRmAWJAeNWVswDQYJ
+KoZIhvcNAQEFBQADggEBAD4IpGmClwDAJUSTNQeYZoRCk5dliPTxshVu/X1QLfLg
+oonrMZBGnnbJPqATRQDQyGnDjL7v437cDtzOtpCMYIOLiGIFtBdS/dupqNNvKMJg
+wX5vqXzxlSZNkwHveUeipfZvvRDYNEwwGsGaMWFiYYxQlncMl9ebxvvF+dNyYzue
+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>
+					      MIIDTDCCAjSgAwIBAgIVAIqjvHm0aoiaxBOCA0hQPBF/i3NHMA0GCSqGSIb3DQEB
+BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGgubWluZXMtYWxlcy5mcjAeFw0xMDAy
+MDUxNTM3MzNaFw0zMDAyMDUxNTM3MzNaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
+bWluZXMtYWxlcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAItD
+aS5KDMxNFvZLeYTCJMufD5l6n30RVg7kPxP6QDJsXvCyKW8kaAojwgr0BUNhIuWW
+9KYTab705HN9IUTNHQGngYmcLtOvMvX5eGO9tYKXqBA+vjSyCet5HRSd8bimtjwJ
+mHfOheQXeHtHtF4gcM5rKlToUdny4UKc3V5EaglZPOsgA9bIdLX/XGuXORoU7C8d
+jQpyo3Y6knBQsxHfZEZFiIUQTBfenc/Hqt5+ialLA4OqjR/yZATpVXZubVf1f2Vj
+XEo4685sWxRC2IsZ0IIjCtEWvf+9P4jEgiBW/M9FFwhXLkofqbossasVs+INU04m
+UGfb7SH1222oPbeawBECAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5t
+aW5lcy1hbGVzLmZyhi9odHRwczovL3NoaWJib2xldGgubWluZXMtYWxlcy5mci9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTlAtOzPum6kvlDfiRmAWJAeNWVswDQYJ
+KoZIhvcNAQEFBQADggEBAD4IpGmClwDAJUSTNQeYZoRCk5dliPTxshVu/X1QLfLg
+oonrMZBGnnbJPqATRQDQyGnDjL7v437cDtzOtpCMYIOLiGIFtBdS/dupqNNvKMJg
+wX5vqXzxlSZNkwHveUeipfZvvRDYNEwwGsGaMWFiYYxQlncMl9ebxvvF+dNyYzue
+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'Ales</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole des Mines d'Ales</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</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
new file mode 100644
index 00000000..f9024281
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor 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"/>
+  </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">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>
+						MIIDXTCCAkWgAwIBAgIJAIPNJpzdV/nXMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
+						BAMTH3NoaWJib2xldGgubXNhY2FkZW1pY3ZlcmlmeS5jb20wHhcNMTMwNzEyMDc0
+						ODEwWhcNMTYwNzExMDc0ODEwWjAqMSgwJgYDVQQDEx9zaGliYm9sZXRoLm1zYWNh
+						ZGVtaWN2ZXJpZnkuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						y8xlr8kDHGHgLvfGzdFlV4gWov5IpGy9dtMWjkf5xE5817sGXhBNIt1ejQN6Nj3w
+						y3ZwPWaDJ/tOXDhncPJ2+ur2L6a4IuNlTg0FcqEwc/VnofaRC5iyihtSGuttheQY
+						6T+ptcdvbLDp4Wsq5hpQJrL3W6f4KfFkDr+3iqzLMFbw1IbhGSmpuS6xfHE7nTdR
+						NheBF1pZgeUsNvgacwrKpZN4pdU9kmaEy3Iti59uOwGACOydxE6LHKCYcjVVjOmb
+						Z65jPB+P3mnW0gdcz4U26jlThTJ+4E6DbLbeBZ2tGGWNZ9xvSrJzTqrh6wJbpXbg
+						Z0F+FUfPtfT1uHBezSolZQIDAQABo4GFMIGCMGEGA1UdEQRaMFiCH3NoaWJib2xl
+						dGgubXNhY2FkZW1pY3ZlcmlmeS5jb22GNWh0dHBzOi8vc2hpYmJvbGV0aC5tc2Fj
+						YWRlbWljdmVyaWZ5LmNvbS9zaGliYm9sZXRoLXNwMB0GA1UdDgQWBBSl6x2NAW3h
+						oeUBLh7lSL+yIFmolTANBgkqhkiG9w0BAQUFAAOCAQEAGimMyBN15TiohXYEeg+7
+						Ky0ggztUQVHcvlZZL+E4bo048H2hZYD2mYwtbYfa9GQdWv+H2qy0Q9rjkWupdz6J
+						audemQiHo2otVR/QQLRaj8KJAieheIMfnH9UB4ZJBGPhVlO9eMuU5fpwKtPZMahY
+						Z2eUEvuRzidSTbSHWxeQ0lwbeFjEsO+vPTsWG+khGESA9fb/WhndZk+Qvn8Gdlfb
+						I36H8KRs3YIJ7eKIg6CS6g1/n1MP65pAvitTtY/yf7Oy5BGDBVJ0c8vhaDx0NMdm
+						oqv/H3FB0kYoLtSxthUd1GcV2kgO0brHNSobuzYi4yePTH9rkY8Kn/ZF5pDVu4SK
+						/Q==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <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
new file mode 100644
index 00000000..bc226d35
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.mzk.cz-simplesaml-metadata.xml.xml
@@ -0,0 +1,78 @@
+<?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>
+      <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>
+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:KeyDescriptor use="encryption">
+      <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEmDCCA4CgAwIBAgIJAP7tUyCsoo2RMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcTBEJybm8xGTAXBgNVBAoTEE1vcmF2aWFuIExpYnJhcnkxGjAYBgNVBAMTEXNoaWJib2xldGgubXprLmN6MSAwHgYJKoZIhvcNAQkBFhFzaGliYm9sZXRoQG16ay5jejAeFw0xMTA3MjAwNjUyMjFaFw0xNDA3MTkwNjUyMjFaMIGOMQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcTBEJybm8xGTAXBgNVBAoTEE1vcmF2aWFuIExpYnJhcnkxGjAYBgNVBAMTEXNoaWJib2xldGgubXprLmN6MSAwHgYJKoZIhvcNAQkBFhFzaGliYm9sZXRoQG16ay5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM3A8vApmQ5m5S+vblZKdVzA7z3ef+3jqE5XfdVX9ehRTuQ1FZfjcooX6G7/Y3cR4ylFBwQSJ1TNm8vX1s8w/sbmuP6t40HLezMiwdj7gDr6HY8roXF2I+UQPxsCM+c0SleOAoZiVNQsWGAi9w0jU8AN+VsmPuRqeAUdkVGFzaiS2lsWPiriP/EOWBxo0i4rc1jE0bwam4/hJEfUub6n+11YmmKFTtieYVRomWmlwuCOMQ30xwXJwrF7p8rMNhKLohBQKU/3BhDZC1U269AAlAa9WVF1hhXjypkzFXdwKA42rGVKl5G17tWwmhv9kTmgZnLtK1KDq1mBYfo9VUOysA8CAwEAAaOB9jCB8zAdBgNVHQ4EFgQUK1gE2KOVHyAUVS5m/2wK40F0ohkwgcMGA1UdIwSBuzCBuIAUK1gE2KOVHyAUVS5m/2wK40F0ohmhgZSkgZEwgY4xCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1YmxpYzENMAsGA1UEBxMEQnJubzEZMBcGA1UEChMQTW9yYXZpYW4gTGlicmFyeTEaMBgGA1UEAxMRc2hpYmJvbGV0aC5temsuY3oxIDAeBgkqhkiG9w0BCQEWEXNoaWJib2xldGhAbXprLmN6ggkA/u1TIKyijZEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAvkpXj3KlQ+dRxqvw5WX338tepnd070CV0cEIf06e4BBDkdOKsKxwKuY+26/G8kYLdok22GCZPDkpOe0j+IDXWfjy48X65+anIY75jEOZRBIgQkjeNMC9+PkRxV9w7k1qlWsQ8sJVNX9d7npkhA6fNItrWSm79nPRoT6GURgDvRRRddIyPS+RHtQIPe7a/bbWD4Sw7RdqZw0BEWiVEg6odFK1XQ72XYeIxfWvpCqcsLtlb6zCjOH5X31UYPrccoKKUGPs7IMP4NFkCnS28FpCAxRMqOEdwt7iWhedJFr51k+vX6wKGI/AiyHkhHm97+w7OsrwIZfpX4yUDfALdaN10Q==
+</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>
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
new file mode 100644
index 00000000..32c81da6
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ncl-coll.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+    <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>
+      <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
+						aC5uY2wtY29sbC5hYy51azAeFw0xMzA1MTcxNTE4MjBaFw0yMzA1MTUxNTE4MjBa
+						MHcxCzAJBgNVBAYTAkdCMRQwEgYDVQQIDAtUeW5lICYgV2VhcjESMBAGA1UEBxMJ
+						TmV3Y2FzdGxlMRowGAYDVQQKExFOZXdjYXN0bGUgQ29sbGVnZTEiMCAGA1UEAxMZ
+						c2hpYmJvbGV0aC5uY2wtY29sbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAKEREiypT26FB/GHKtfr/XZBjcQtpJyzBCpluioX4s8mCiX+7Hxp
+						W8zb5LV5FobeUhGMfj7We1a6vXxE7+DRci2O3RebrkGUDrtxuhTYJeM9eiD1ym8u
+						1xJUc9wkkFyKR8ELzhK3Nwc4AmZUlnCR/8nmQKogkbs+DMxcCOendqTFU/PHO5YB
+						Tldaj5K754XLQDrJcF9eanWYsR80lPro7QboTnFqpYpmDMk2gRgZ+c0UGpLh+PHz
+						0HBGnT/8NgcEoCbrNYnmAdAlu8maPeqmPLXqI2k2WeFeEIrMjXOsBy7Swa9BtC6v
+						+nZe4CxFnbDBbOCz680ljgHyi171yID9RdcCAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJCtZq7NRV0Nn0t1gEEPHCm/NIyyMB8GA1UdIwQYMBaAFJCtZq7NRV0N
+						n0t1gEEPHCm/NIyyMA0GCSqGSIb3DQEBBQUAA4IBAQBfWO+H2B2VXoVehJgjYjb8
+						NHcIMyKbL1TH9lle3rAVqQB/p41UODk+g3Tzqe5uFN7sHF88PhcrSq+7ORzOYzLr
+						2zBQ/BZUixt92KT1Z/jvnfF1d2aLXh2XL5JG6j3NZQhVBDbKrD38L+/1hP7xfeRz
+						+qQ9puB9hRIDZnglAE3rYfPKQ1d7gLxnz683ny0uYRlPIWuWETJNQ+8mae0wS/k6
+						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>
+						MIID7DCCAtSgAwIBAgIJAKVaXHtxIPVVMA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNV
+						BAYTAkdCMRQwEgYDVQQIDAtUeW5lICYgV2VhcjESMBAGA1UEBxMJTmV3Y2FzdGxl
+						MRowGAYDVQQKExFOZXdjYXN0bGUgQ29sbGVnZTEiMCAGA1UEAxMZc2hpYmJvbGV0
+						aC5uY2wtY29sbC5hYy51azAeFw0xMzA1MTcxNTE4MjBaFw0yMzA1MTUxNTE4MjBa
+						MHcxCzAJBgNVBAYTAkdCMRQwEgYDVQQIDAtUeW5lICYgV2VhcjESMBAGA1UEBxMJ
+						TmV3Y2FzdGxlMRowGAYDVQQKExFOZXdjYXN0bGUgQ29sbGVnZTEiMCAGA1UEAxMZ
+						c2hpYmJvbGV0aC5uY2wtY29sbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAKEREiypT26FB/GHKtfr/XZBjcQtpJyzBCpluioX4s8mCiX+7Hxp
+						W8zb5LV5FobeUhGMfj7We1a6vXxE7+DRci2O3RebrkGUDrtxuhTYJeM9eiD1ym8u
+						1xJUc9wkkFyKR8ELzhK3Nwc4AmZUlnCR/8nmQKogkbs+DMxcCOendqTFU/PHO5YB
+						Tldaj5K754XLQDrJcF9eanWYsR80lPro7QboTnFqpYpmDMk2gRgZ+c0UGpLh+PHz
+						0HBGnT/8NgcEoCbrNYnmAdAlu8maPeqmPLXqI2k2WeFeEIrMjXOsBy7Swa9BtC6v
+						+nZe4CxFnbDBbOCz680ljgHyi171yID9RdcCAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJCtZq7NRV0Nn0t1gEEPHCm/NIyyMB8GA1UdIwQYMBaAFJCtZq7NRV0N
+						n0t1gEEPHCm/NIyyMA0GCSqGSIb3DQEBBQUAA4IBAQBfWO+H2B2VXoVehJgjYjb8
+						NHcIMyKbL1TH9lle3rAVqQB/p41UODk+g3Tzqe5uFN7sHF88PhcrSq+7ORzOYzLr
+						2zBQ/BZUixt92KT1Z/jvnfF1d2aLXh2XL5JG6j3NZQhVBDbKrD38L+/1hP7xfeRz
+						+qQ9puB9hRIDZnglAE3rYfPKQ1d7gLxnz683ny0uYRlPIWuWETJNQ+8mae0wS/k6
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.nkp.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.nkp.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..9359f384
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.nkp.cz-idp-shibboleth.xml
@@ -0,0 +1,127 @@
+<?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>
+      <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>
+MIIEhTCCA22gAwIBAgIRAPEPRVT7rSQP6fkTB6zdejAwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMzAwMDAwMDBaFw0xNjAxMzAyMzU5NTlaMF4xCzAJBgNV
+BAYTAkNaMTMwMQYDVQQKEypUaGUgTmF0aW9uYWwgTGlicmFyeSBvZiB0aGUgQ3pl
+Y2ggUmVwdWJsaWMxGjAYBgNVBAMTEXNoaWJib2xldGgubmtwLmN6MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxVz9glo7tIF0FV6n1PNww6xY1RXXH863
+lHNc2GIdZPHjjqjZLEuRY80rRawhlCtRhis0zfwnwlfFE5svgQzs2VhSS+858BJe
+rWKkDhx2NkGOVAvhVpikk8+dslRxYAGh8zMbEfdJccZdpx397gaCLhHxbpbDxKlQ
+K0Cv6nHhmv1gb1q/KOgNpFDGPByjQQ6yZN5q0UQ1jYUtb/yoydt2hbtBFCE9/5Zo
+ehK3Qr8GMkF36bL8yXxezRXX3gK9rM5n2M/6bM86D+YHG40r4Q3XvQLdAPMMphr4
+b1C3sfkX8iGjolxgQEm8YfUYVXUFG4Qx5mxwJQPOaQj863wwn4EYGwIDAQABo4IB
+ZDCCAWAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
+FBXpVcpKQRux0SxErHIOSwZzsq16MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
+AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
+CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
+cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
+BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
+JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQV
+MBOCEXNoaWJib2xldGgubmtwLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQCJokHGcY4h
+y9JK4CIPAHM/y0dwMHMMkkq/VOt9Uefw3AUjFY88J5C7y8fP5CcL9mjF3ju6BgCc
+AWheiYFqdoyp6+A8Vj2bTLw01buM7vR+Tf0uGifsA2mwM+GhBfFfWyQtP/seRsbm
+djnx/F1oz/xk1IpzldKYSHaBKgyU/U0q3Ow5wlGlbvTJ6YOcbruT16Abppt50cte
+xmdVCMK5UEKKXtyyAnpzRiyMtk9ZZWc43aoG9u8g6QnQAvL13eUZCckfkhw20QIo
+6Np3O+ShRrAGEZ1+BEKuslKeFR7s24CAMvHYCmZM1d1l28D/tQ2qUOvshwSFaLye
+sSo3OKOyCBTf
+                    </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>
+MIIEhTCCA22gAwIBAgIRAPEPRVT7rSQP6fkTB6zdejAwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMzAwMDAwMDBaFw0xNjAxMzAyMzU5NTlaMF4xCzAJBgNV
+BAYTAkNaMTMwMQYDVQQKEypUaGUgTmF0aW9uYWwgTGlicmFyeSBvZiB0aGUgQ3pl
+Y2ggUmVwdWJsaWMxGjAYBgNVBAMTEXNoaWJib2xldGgubmtwLmN6MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxVz9glo7tIF0FV6n1PNww6xY1RXXH863
+lHNc2GIdZPHjjqjZLEuRY80rRawhlCtRhis0zfwnwlfFE5svgQzs2VhSS+858BJe
+rWKkDhx2NkGOVAvhVpikk8+dslRxYAGh8zMbEfdJccZdpx397gaCLhHxbpbDxKlQ
+K0Cv6nHhmv1gb1q/KOgNpFDGPByjQQ6yZN5q0UQ1jYUtb/yoydt2hbtBFCE9/5Zo
+ehK3Qr8GMkF36bL8yXxezRXX3gK9rM5n2M/6bM86D+YHG40r4Q3XvQLdAPMMphr4
+b1C3sfkX8iGjolxgQEm8YfUYVXUFG4Qx5mxwJQPOaQj863wwn4EYGwIDAQABo4IB
+ZDCCAWAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
+FBXpVcpKQRux0SxErHIOSwZzsq16MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
+AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
+CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
+cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
+BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
+JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQV
+MBOCEXNoaWJib2xldGgubmtwLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQCJokHGcY4h
+y9JK4CIPAHM/y0dwMHMMkkq/VOt9Uefw3AUjFY88J5C7y8fP5CcL9mjF3ju6BgCc
+AWheiYFqdoyp6+A8Vj2bTLw01buM7vR+Tf0uGifsA2mwM+GhBfFfWyQtP/seRsbm
+djnx/F1oz/xk1IpzldKYSHaBKgyU/U0q3Ow5wlGlbvTJ6YOcbruT16Abppt50cte
+xmdVCMK5UEKKXtyyAnpzRiyMtk9ZZWc43aoG9u8g6QnQAvL13eUZCckfkhw20QIo
+6Np3O+ShRrAGEZ1+BEKuslKeFR7s24CAMvHYCmZM1d1l28D/tQ2qUOvshwSFaLye
+sSo3OKOyCBTf
+                    </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>Ivan</md:GivenName>
+    <md:SurName>Petřík</md:SurName>
+    <md:EmailAddress>ivan.petrik@nkp.cz</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
new file mode 100644
index 00000000..9128b3c6
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.obspm.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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="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>
+					      MIIDODCCAiCgAwIBAgIVAN6NefE7MNV1gsFFJM6ZXxl7ricmMA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgub2JzcG0uZnIwHhcNMTEwMjAzMTYx
+NTIwWhcNMzEwMjAzMTYxNTIwWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLm9ic3Bt
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAorMZSrDEOOO6Zvun
++HTeRAYTSqd7FSq6F9ojEwPMs1wu6IREubuy8VdxUiPLawen20ZFp3X8XDCAQnWj
+qIq2EN4lmc8Ibtq6tVO6OjS5CilSmPw2pzyl1uc6Cipd/AemRahBzDHUPZgKJSSs
+vABRQDfalExfXUndgnYaROxMKHmrLdBUnHQO/8v0ZQQwXaHxFPCrMoA5FFF6D4Ro
+xrGhxR0TdDWXdyIat9ltvWIslziH+J1gGY+e1q5tmmAaZCeFdy/MthAhCxuTT64d
+E1+nXXT+6tUsI7mHc9/5Vusb4bc6UNxNKTECTB566qMK3CVq19JLrvl/ajzZoo1C
+06pKywIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm9sZXRoLm9ic3BtLmZyhipo
+dHRwczovL3NoaWJib2xldGgub2JzcG0uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFI4fpndolWB8RsDA1fRZm87FZGxaMA0GCSqGSIb3DQEBBQUAA4IBAQABf7PS
+TBmzFMbWo85wif9s/cXjoDefSk3RltzARoLvIBxjeMR+xFanb4VeLLbMpVhoZDE/
+EAgQgBZdfZ963sa65/a0MpPQ7c8CwWuVRLNAPFcbOusWMfCV5RGohCbkoPcRWhKy
+i7WmF8LW2bDPzHIIAJ0fJPEwsPD6MceV9aZgtnvcIax2zObATB9AO4e4HTm/QKPE
+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://unknown.site.com</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
new file mode 100644
index 00000000..921a0149
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.oldham.ac.uk-shibboleth.xml
@@ -0,0 +1,119 @@
+<?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>
+      <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
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXc2hpYmJvbGV0
+						aC5vbGRoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDp
+						ck8rlkYXQ99QaIZpn1ik2kBd7wvCnJ6QifQFXckEGEMSZzGG0/mWchho5XXOb+Sm
+						6jOAIEI+m/pSzss1iz3tPAKJIujtV0D7NwiEwFaUOrOQ+oeRAQtdNS8GBbKPGMgH
+						lsX6zIydvH/59ZeYT11FsKErwVb4n1apu2BbGuwK9M40vJ8eRwxS3y7kK64NdE9/
+						XBsxC6+iswe9UBTMYi3h5Pny4ihsJtZrMgC+ctyZFv4N3GVTXA1gK7QaGaUjhg+M
+						Z3CSDfpc6UzQ++hxvve8LO6w3nJ0M/uyyq9kZ5ZvxVcx8Dv+mFSWXdf9QC5A0amJ
+						WXbZTlWDz3tHCvCC2FwxAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
+						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUxy1jShUzSc9Rh9vCP8y/c9yzUk0wDgYD
+						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
+						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF3NoaWJib2xldGgu
+						b2xkaGFtLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQB0Fwd2Jh3G5xkA8gbEi1HV
+						2lvMgUxoo/8e4ZwmQpPT7zS/No3XGcpxw07+6Zx8X6FKm5MnqcLsehvJ5Vvpty6T
+						jur/5oD0I4L+Vuj/fQxSuG7AlGMC/0geHY65BAuxVOrKhKEU3bBdSIg8aWZwjzLS
+						CSyVju5jBTncT/ebRNdOVn9WQ6it8wQBHnLRw/s6liYD81K8OJL+WUUPetyDokGJ
+						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>
+						MIIEfDCCA2SgAwIBAgIRAMcHtIGAOBG7Xl/x6OlCvx8wDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzExMjAwMDAwMDBaFw0xNjExMTkyMzU5NTlaMEUxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXc2hpYmJvbGV0
+						aC5vbGRoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDp
+						ck8rlkYXQ99QaIZpn1ik2kBd7wvCnJ6QifQFXckEGEMSZzGG0/mWchho5XXOb+Sm
+						6jOAIEI+m/pSzss1iz3tPAKJIujtV0D7NwiEwFaUOrOQ+oeRAQtdNS8GBbKPGMgH
+						lsX6zIydvH/59ZeYT11FsKErwVb4n1apu2BbGuwK9M40vJ8eRwxS3y7kK64NdE9/
+						XBsxC6+iswe9UBTMYi3h5Pny4ihsJtZrMgC+ctyZFv4N3GVTXA1gK7QaGaUjhg+M
+						Z3CSDfpc6UzQ++hxvve8LO6w3nJ0M/uyyq9kZ5ZvxVcx8Dv+mFSWXdf9QC5A0amJ
+						WXbZTlWDz3tHCvCC2FwxAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
+						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUxy1jShUzSc9Rh9vCP8y/c9yzUk0wDgYD
+						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
+						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF3NoaWJib2xldGgu
+						b2xkaGFtLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQB0Fwd2Jh3G5xkA8gbEi1HV
+						2lvMgUxoo/8e4ZwmQpPT7zS/No3XGcpxw07+6Zx8X6FKm5MnqcLsehvJ5Vvpty6T
+						jur/5oD0I4L+Vuj/fQxSuG7AlGMC/0geHY65BAuxVOrKhKEU3bBdSIg8aWZwjzLS
+						CSyVju5jBTncT/ebRNdOVn9WQ6it8wQBHnLRw/s6liYD81K8OJL+WUUPetyDokGJ
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.ovid.com-entity.xml b/swamid-interfederations-2.0/shibboleth.ovid.com-entity.xml
new file mode 100644
index 00000000..6c7f78bc
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ovid.com-entity.xml
@@ -0,0 +1,73 @@
+<?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"/>
+  </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>
+						MIIFMTCCBBmgAwIBAgIQfv7Bk7nIRqL4U2lirVWK/zANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTQwMjI4
+						MDAwMDAwWhcNMTUwMzI3MjM1OTU5WjBsMQswCQYDVQQGEwJVUzENMAsGA1UECBME
+						VXRhaDEOMAwGA1UEBxQFU2FuZHkxIDAeBgNVBAoUF092aWQgVGVjaG5vbG9naWVz
+						LCBJbmMuMRwwGgYDVQQDFBNTSElCQk9MRVRILk9WSUQuQ09NMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4DqNAGFwCsKjB9dHoJbFZ8QOxMi6A+WhXkqE
+						RGImmDDeJZQq8X7pZFThywYDbk+0SN8s41UuFnvxSSI8+HbWtKvoRtapOMpJDU+a
+						qaXn3gkmPEl1/VEd/yE5XafkeoSN3N3C0kMqLWrypBAPnGLA2toFUohx1/9TYqBI
+						QKjqyDuXjOPWbRKkcGZrTbxDNcTiuyGOgcKgwkUw51DWZpEDHSbdDZtvFGgERYSe
+						7XHreTFYgLgM6mml3gVRaGjTert96ecd+EPO6xU9d7wLjiH5U48Bsd4qwmFVmPyw
+						b4YmYXjKhV6mWLY+LANh7HiZ/Zf1uo1KsaIveDy/57fp0WfQgwIDAQABo4IBgzCC
+						AX8wHgYDVR0RBBcwFYITU0hJQkJPTEVUSC5PVklELkNPTTAJBgNVHRMEAjAAMA4G
+						A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwQwYD
+						VR0gBDwwOjA4BgpghkgBhvhFAQc2MCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3
+						LnZlcmlzaWduLmNvbS9jcHMwHwYDVR0jBBgwFoAUDURcFlNEwYJ+HSCrJfQBY9i+
+						eaUwRQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL1NWUlNlY3VyZS1HMy1jcmwudmVy
+						aXNpZ24uY29tL1NWUlNlY3VyZUczLmNybDB2BggrBgEFBQcBAQRqMGgwJAYIKwYB
+						BQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0
+						cDovL1NWUlNlY3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNl
+						cjANBgkqhkiG9w0BAQUFAAOCAQEAGAXDoMW+0QJTf1Cf36+BVIt0jGdUST3s03JN
+						YCvoQZLOlNqMS9JVrdwMmzcbNt39+CQ4HC1lohoRtA+9tS7Vo3BmWPrldGhPQTbw
+						wvDlVLhgL+TBBZdKCAks2tXPer45Ai7RD50XbA4ea3nbBJO3c8JlWfPkTEmV/Tuf
+						2AQVyY8ZLR3a9N4jftZyzZIH5gsmr9xoVFfIidG1PIFqAc/V7lEpRIRx1V/KO3sa
+						XJ8FoKPmyRIa/2LU5KTE6rvd/MdeJbnd7KXzPK4Yv8Q9rrGNyYyfkG7oLCdHINDf
+						mnkgw2LOZlkhn0R8WcFzR3Dzvvt0bYhCncSqKQ/Of4TV/07GbQ==
+					</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>
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
new file mode 100644
index 00000000..18ed78c1
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.plymouth.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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>
+      <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
+						LnBseW1vdXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						7/XpT5wwAH8Exy6GRuy5UQnZxgs/AuMqzHHOyTQY0h9zNIIDaOWMClV6uRFtAonE
+						Bw7hdGCh4Rp+0USw8BlOXE5MR+wCNPOhK4a/HnE2YNDG3BadDdaM5XEqaT+NGEXI
+						a9bT3j7Py3sm3p6+sMp6gPb36VkrZABZBkc1hORvvM6DkEtge3cihaSFd8o57UHQ
+						LuEda0EW2fq1obYWUFEHN6mW12D4HHl6S2NjIHbh/Ytnqui4qO+0G/FL79+N7S2O
+						/hrV1zpM4kUl0GlMEWHy8Hayjpx8mff6pdmXxyFDy5tCmdYyy8Jj5Cc3NwqUtZu/
+						E0klUwSGUatD15/FAnTzmwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
+						LnBseW1vdXRoLmFjLnVrhjBodHRwczovL3NoaWJib2xldGgucGx5bW91dGguYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDlNnbrNQSY8ZiIbc+S8WrOlEJc2
+						MA0GCSqGSIb3DQEBBQUAA4IBAQB9av5yp4nund76PaSJ2vRDvTXPSc5ZndJ0nj1L
+						tcU5a2BVJFFrawhywnhdMMEA3fuQu5FRmleEJks2pS8Dx4Kbhk/6sEyiB1PzshYs
+						Jb6jGIV50inltedhNWRLxPZLxNb/vVZnObebZzVaRjVuWu0CImGGFHxj/T6VzXtb
+						FzqACoxbXFZHV4khqLuBuCunbKy4VovkiT9T/fK8dDDgohiAbDpmOL3I+wN95kA5
+						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>
+						MIIDUDCCAjigAwIBAgIVAKyHcygxYWHKhPBwJxtAsM65mkppMA0GCSqGSIb3DQEB
+						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgucGx5bW91dGguYWMudWswHhcNMTMx
+						MDAzMTQyOTA0WhcNMzMxMDAzMTQyOTA0WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
+						LnBseW1vdXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						7/XpT5wwAH8Exy6GRuy5UQnZxgs/AuMqzHHOyTQY0h9zNIIDaOWMClV6uRFtAonE
+						Bw7hdGCh4Rp+0USw8BlOXE5MR+wCNPOhK4a/HnE2YNDG3BadDdaM5XEqaT+NGEXI
+						a9bT3j7Py3sm3p6+sMp6gPb36VkrZABZBkc1hORvvM6DkEtge3cihaSFd8o57UHQ
+						LuEda0EW2fq1obYWUFEHN6mW12D4HHl6S2NjIHbh/Ytnqui4qO+0G/FL79+N7S2O
+						/hrV1zpM4kUl0GlMEWHy8Hayjpx8mff6pdmXxyFDy5tCmdYyy8Jj5Cc3NwqUtZu/
+						E0klUwSGUatD15/FAnTzmwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
+						LnBseW1vdXRoLmFjLnVrhjBodHRwczovL3NoaWJib2xldGgucGx5bW91dGguYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDlNnbrNQSY8ZiIbc+S8WrOlEJc2
+						MA0GCSqGSIb3DQEBBQUAA4IBAQB9av5yp4nund76PaSJ2vRDvTXPSc5ZndJ0nj1L
+						tcU5a2BVJFFrawhywnhdMMEA3fuQu5FRmleEJks2pS8Dx4Kbhk/6sEyiB1PzshYs
+						Jb6jGIV50inltedhNWRLxPZLxNb/vVZnObebZzVaRjVuWu0CImGGFHxj/T6VzXtb
+						FzqACoxbXFZHV4khqLuBuCunbKy4VovkiT9T/fK8dDDgohiAbDpmOL3I+wN95kA5
+						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>
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
new file mode 100644
index 00000000..4069e705
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.rcn.org.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						b3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwdOecQlpkznI
+						hj5OKgl7HSg1bcTEbk4t2l4CZ/nrQYqTr/y3eGM66v4+V/jU65iw989xVal3o65N
+						baDB1+eIAEtDadhCxVZrdqRFLm8M5XgCfZ9FHZyPmth02mh6ODrqHGpuK6g7rfYw
+						RZ+1aU00kUoPTS3Ex95m9wufCai/IYpCLNF0uLqvgrPjHUdSkFBhJumUH8Km7HHo
+						iJRLc3lCIBfnEDLHLgESNQ/R7H7t3bg0ncar6EvNXEJzG+2lfQqVSZcQh+cgl4Z8
+						/O0w/C67yIop+NYlbP+H42NqHwWu5UNYvj1QFidh3UAD0kEGaCu6JLV8aBpKyoTR
+						hanCRBgPtwIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLnJjbi5vcmcu
+						dWuGLGh0dHBzOi8vc2hpYmJvbGV0aC5yY24ub3JnLnVrL2lkcC9zaGliYm9sZXRo
+						MB0GA1UdDgQWBBQWbyOjE1aj+Hbxix3s/WCO8tOA9zANBgkqhkiG9w0BAQUFAAOC
+						AQEAm20IB4KT5TykwOLIRbEhNK9+ccd0EcRKkTc91w/J7JCU64n69AJZ/xeXCo5E
+						8YxmkJSO/SQSTzXrWFR+lGo0brO622Uc9YxUdbTIfiiq/bZIDqTiEiIkpfUoBTkB
+						l5LenKSFfnvnty697DGOKJ5ZCyvuEiitdYyIrXU09wrVw+03FnhMwkUKOaZ0WFxl
+						jbsZ5ut9IHExbGMJJDg+dMBS7B9dlekzYvzdcqJaF3YMUgF4mCuKvM52VxCaJeHg
+						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>
+						MIIDPzCCAiegAwIBAgIUXswXhO6uDK4MV7I9aly5vnD77ZcwDQYJKoZIhvcNAQEF
+						BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5yY24ub3JnLnVrMB4XDTEyMDgxNTE1
+						MTcwM1oXDTMyMDgxNTE1MTcwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5yY24u
+						b3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwdOecQlpkznI
+						hj5OKgl7HSg1bcTEbk4t2l4CZ/nrQYqTr/y3eGM66v4+V/jU65iw989xVal3o65N
+						baDB1+eIAEtDadhCxVZrdqRFLm8M5XgCfZ9FHZyPmth02mh6ODrqHGpuK6g7rfYw
+						RZ+1aU00kUoPTS3Ex95m9wufCai/IYpCLNF0uLqvgrPjHUdSkFBhJumUH8Km7HHo
+						iJRLc3lCIBfnEDLHLgESNQ/R7H7t3bg0ncar6EvNXEJzG+2lfQqVSZcQh+cgl4Z8
+						/O0w/C67yIop+NYlbP+H42NqHwWu5UNYvj1QFidh3UAD0kEGaCu6JLV8aBpKyoTR
+						hanCRBgPtwIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLnJjbi5vcmcu
+						dWuGLGh0dHBzOi8vc2hpYmJvbGV0aC5yY24ub3JnLnVrL2lkcC9zaGliYm9sZXRo
+						MB0GA1UdDgQWBBQWbyOjE1aj+Hbxix3s/WCO8tOA9zANBgkqhkiG9w0BAQUFAAOC
+						AQEAm20IB4KT5TykwOLIRbEhNK9+ccd0EcRKkTc91w/J7JCU64n69AJZ/xeXCo5E
+						8YxmkJSO/SQSTzXrWFR+lGo0brO622Uc9YxUdbTIfiiq/bZIDqTiEiIkpfUoBTkB
+						l5LenKSFfnvnty697DGOKJ5ZCyvuEiitdYyIrXU09wrVw+03FnhMwkUKOaZ0WFxl
+						jbsZ5ut9IHExbGMJJDg+dMBS7B9dlekzYvzdcqJaF3YMUgF4mCuKvM52VxCaJeHg
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml
new file mode 100644
index 00000000..ae4c9509
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-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.reitoria.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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">unesp.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNESP - Univ Estadual Paulista</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNESP - Univ Estadual Paulista</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNESP - Univ Estadual Paulista</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNESP - Univ 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>
+    MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQx
+MjAxMjAzOTQ3WhcNMTkxMTMwMjAzOTQ3WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ+enDXKwvFOCJ3Ybg6BK+bGi1qY9P2
+bIvFwo6pJnzMsR0+Pl3pZbuxGur2ri3HajOlwc5QnxfSq9fSY8PLiBPo/eA/oeYU
+uPMnu8Kwn/DtUeNGvSLgQ+k3Z4X5Qx12yOTwDZGnHHiaPCctEezundMVLQZmh8de
+HpH7fsL/m9ONsUNtoVrmabHAAR6WbqkKgX2lfP7Lkcu0zO2+mdNDn/S1oELavFwp
+VpDg+yyCdoBfu/AANYqu2a6gahRcABWog2Ut6smft/UYtODRb8tLEfduguEevnjn
+E9/Wam33SID6yKXYA5EIoS9HkgxftMVSMNKaqO/zMMPELRNxX0AMc3sCAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAKrx3a2Gx+/r3DpVp56AsqZx8lm92UVSSWBe2Hxfa
+jCEz9C1zxRQK2y1W9QC9t1XrCBG+6H18pqikLUWKGe+lHminNX2zZp6JNtMl4k6m
+WZTifmyvycjY/ZfeVcREIlonkRB2XAAnSdC3ZGCv/qarQEpn3tvsc9FthlDcpv/q
+bjo2re/YAP8PVnYBlLiTBGioRSaNN83HLM81sgrJnNM3rohFrgD1DWGzyj/M7u1Y
+/oUNFeEG1kFkbG2kXLPg+ylOKuUKOaa56gsXv8KFbcMQdIFkQ6od/YWPh2M+V8a7
+KFxMONImVUlFWJZRk3i46kBydqoZoCzP7nOBK6XCQ2WSPg==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.reitoria.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.reitoria.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.reitoria.unesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.reitoria.unesp.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.reitoria.unesp.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.reitoria.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>
+      
+MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQx
+MjAxMjAzOTQ3WhcNMTkxMTMwMjAzOTQ3WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ+enDXKwvFOCJ3Ybg6BK+bGi1qY9P2
+bIvFwo6pJnzMsR0+Pl3pZbuxGur2ri3HajOlwc5QnxfSq9fSY8PLiBPo/eA/oeYU
+uPMnu8Kwn/DtUeNGvSLgQ+k3Z4X5Qx12yOTwDZGnHHiaPCctEezundMVLQZmh8de
+HpH7fsL/m9ONsUNtoVrmabHAAR6WbqkKgX2lfP7Lkcu0zO2+mdNDn/S1oELavFwp
+VpDg+yyCdoBfu/AANYqu2a6gahRcABWog2Ut6smft/UYtODRb8tLEfduguEevnjn
+E9/Wam33SID6yKXYA5EIoS9HkgxftMVSMNKaqO/zMMPELRNxX0AMc3sCAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAKrx3a2Gx+/r3DpVp56AsqZx8lm92UVSSWBe2Hxfa
+jCEz9C1zxRQK2y1W9QC9t1XrCBG+6H18pqikLUWKGe+lHminNX2zZp6JNtMl4k6m
+WZTifmyvycjY/ZfeVcREIlonkRB2XAAnSdC3ZGCv/qarQEpn3tvsc9FthlDcpv/q
+bjo2re/YAP8PVnYBlLiTBGioRSaNN83HLM81sgrJnNM3rohFrgD1DWGzyj/M7u1Y
+/oUNFeEG1kFkbG2kXLPg+ylOKuUKOaa56gsXv8KFbcMQdIFkQ6od/YWPh2M+V8a7
+KFxMONImVUlFWJZRk3i46kBydqoZoCzP7nOBK6XCQ2WSPg==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.reitoria.unesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.reitoria.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 - Univ Estadual Paulista</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UNESP - Univ Estadual Paulista</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNESP - Univ Estadual Paulista</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNESP - Univ 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>Carlos Coletti</md:SurName>
+    <md:EmailAddress>grc@unesp.br</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
new file mode 100644
index 00000000..b410950c
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr-idp-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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="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>
+					      MIIDcTCCAlmgAwIBAgIURqMsHzlG8fMfvT+cOJR2geBiBKYwDQYJKoZIhvcNAQEF
+BQAwLDEqMCgGA1UEAxMhc2hpYmJvbGV0aC5zY2llbmNlc3BvLWdyZW5vYmxlLmZy
+MB4XDTEyMDEyMDA3NTIyN1oXDTMyMDEyMDA3NTIyN1owLDEqMCgGA1UEAxMhc2hp
+YmJvbGV0aC5zY2llbmNlc3BvLWdyZW5vYmxlLmZyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAhX/KcdRkiRFlthd8Wm2CC78FJfSCcgKLLfy6HMkq7nk5
+ROvdhRU3ZXjqeP/fuOO5xDdskzLe17jzlyd5isL7SqD4mE48l/i/3sFQdTBeuiy2
+qfqOdW5hoDwlVVNgWkmOQCriiGrn6LPtrtd1boDupPAAtWqYxRcNVLob2WfrbtCU
+915+6Gn606wk0Lh+dLKrT/a7HBD0qIgbftw554oMHDYVYQv8o/oYVWqHfvuzejSv
+z+mAUjyw6gQJnTaTjRBinCuh+vnnMV6Ev+1RsMcL932qASZz1TaL5hEDlDrb/Tqp
++inaEYsHzaPh5nyDrzZj64Zr+fN0ltc+jV2sQpYbmQIDAQABo4GKMIGHMGYGA1Ud
+EQRfMF2CIXNoaWJib2xldGguc2NpZW5jZXNwby1ncmVub2JsZS5mcoY4aHR0cHM6
+Ly9zaGliYm9sZXRoLnNjaWVuY2VzcG8tZ3Jlbm9ibGUuZnIvaWRwL3NoaWJib2xl
+dGgwHQYDVR0OBBYEFEdiRcE0wWEjU0jB5SLpKHdjJg80MA0GCSqGSIb3DQEBBQUA
+A4IBAQA0E4HykvLXNmhVTzSEepHr0aW5oJWCZOh6va5holMs61vKkFAnNlNkZlI9
+r5R2mU1jEmG5C3uxSvcEs4bk5EkkzVcdoVr6lLrTlAuuaiA5LQSqUpAp/CgfdH5z
+RExURiwE7RHT2mZuEkOLfUPVwWEU1WBGNrW6JnO20sglEQazZd4lsFit+LnVi0mQ
+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://unknown.site.com</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
new file mode 100644
index 00000000..f06bf160
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.selby.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,117 @@
+<?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>
+      <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
+						aWNlczEfMB0GA1UEAxMWc2hpYmJvbGV0aC5zZWxieS5hYy51azEjMCEGCSqGSIb3
+						DQEJARYUcGlsbGluZ21Ac2VsYnkuYWMudWswHhcNMTMxMDI5MDkzNjA4WhcNMjMx
+						MDI3MDkzNjA4WjCBsDELMAkGA1UEBhMCR0IxGDAWBgNVBAgTD05vcnRoIFlvcmtz
+						aGlyZTEOMAwGA1UEBxMFU2VsYnkxFjAUBgNVBAoTDVNlbGJ5IENvbGxlZ2UxGTAX
+						BgNVBAsTEE5ldHdvcmsgU2VydmljZXMxHzAdBgNVBAMTFnNoaWJib2xldGguc2Vs
+						YnkuYWMudWsxIzAhBgkqhkiG9w0BCQEWFHBpbGxpbmdtQHNlbGJ5LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0WCeQdUOOwr1zgrswrslHE0L
+						UIN97PbpESv/ash874+27SUiJ4xff+OCrmTD/bleiWTwe2gS629blM8ehj7WMI4i
+						Qvor3Kx13jDsb7rp2TF/G3rFhCwvl6PyDJGUzdKWxKMxyaNRaAI6KmKwFNeUGnTO
+						l9f4tXZvuZlvGOmERxmArpIq4R7sMU+ORooIQxDtGriEd/OD9ILPBv7sI0ahY03h
+						uLcUpk/INWDdwxS1gxAB7tkpbg7P5ZCczYPEHY0LLSh4G3sQ7dGJULKzj4CwWODS
+						No+XLXpRBg86gE8ijvyMm9znVjoh2jH2izn5pvc61GALEKbDeJnM9dtqG0wrVQID
+						AQABo4IBRDCCAUAwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
+						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFBe4qAGMntqL06Msf5ZbMHGk
+						Ppp9MIHlBgNVHSMEgd0wgdqAFBe4qAGMntqL06Msf5ZbMHGkPpp9oYG2pIGzMIGw
+						MQswCQYDVQQGEwJHQjEYMBYGA1UECBMPTm9ydGggWW9ya3NoaXJlMQ4wDAYDVQQH
+						EwVTZWxieTEWMBQGA1UEChMNU2VsYnkgQ29sbGVnZTEZMBcGA1UECxMQTmV0d29y
+						ayBTZXJ2aWNlczEfMB0GA1UEAxMWc2hpYmJvbGV0aC5zZWxieS5hYy51azEjMCEG
+						CSqGSIb3DQEJARYUcGlsbGluZ21Ac2VsYnkuYWMudWuCCQCBgHWIQnVzkzANBgkq
+						hkiG9w0BAQUFAAOCAQEAdFdP+fjhBkK5qfIPqErHOJRlOUq3NNgpbrzpq7P6aGY+
+						bCH1vZCV593B3x1avTMWjP/6GEjXxPQOrhC93u3DQsAH+sbpGHIhSnir7egKa0GO
+						tCIRBjIuEVrwoLkNudGD+ZXG6rSQBe/8rvKa1PovjeGSWvtMiLdNyI2LqW9gzQog
+						YJQRakt5pqHYL0KK+TdZceNVnRyiTTJfl6GZw24ij7zIbTdOTv/vDfNLqHdebkIo
+						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>
+						MIIFKzCCBBOgAwIBAgIJAIGAdYhCdXOTMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
+						VQQGEwJHQjEYMBYGA1UECBMPTm9ydGggWW9ya3NoaXJlMQ4wDAYDVQQHEwVTZWxi
+						eTEWMBQGA1UEChMNU2VsYnkgQ29sbGVnZTEZMBcGA1UECxMQTmV0d29yayBTZXJ2
+						aWNlczEfMB0GA1UEAxMWc2hpYmJvbGV0aC5zZWxieS5hYy51azEjMCEGCSqGSIb3
+						DQEJARYUcGlsbGluZ21Ac2VsYnkuYWMudWswHhcNMTMxMDI5MDkzNjA4WhcNMjMx
+						MDI3MDkzNjA4WjCBsDELMAkGA1UEBhMCR0IxGDAWBgNVBAgTD05vcnRoIFlvcmtz
+						aGlyZTEOMAwGA1UEBxMFU2VsYnkxFjAUBgNVBAoTDVNlbGJ5IENvbGxlZ2UxGTAX
+						BgNVBAsTEE5ldHdvcmsgU2VydmljZXMxHzAdBgNVBAMTFnNoaWJib2xldGguc2Vs
+						YnkuYWMudWsxIzAhBgkqhkiG9w0BCQEWFHBpbGxpbmdtQHNlbGJ5LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0WCeQdUOOwr1zgrswrslHE0L
+						UIN97PbpESv/ash874+27SUiJ4xff+OCrmTD/bleiWTwe2gS629blM8ehj7WMI4i
+						Qvor3Kx13jDsb7rp2TF/G3rFhCwvl6PyDJGUzdKWxKMxyaNRaAI6KmKwFNeUGnTO
+						l9f4tXZvuZlvGOmERxmArpIq4R7sMU+ORooIQxDtGriEd/OD9ILPBv7sI0ahY03h
+						uLcUpk/INWDdwxS1gxAB7tkpbg7P5ZCczYPEHY0LLSh4G3sQ7dGJULKzj4CwWODS
+						No+XLXpRBg86gE8ijvyMm9znVjoh2jH2izn5pvc61GALEKbDeJnM9dtqG0wrVQID
+						AQABo4IBRDCCAUAwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
+						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFBe4qAGMntqL06Msf5ZbMHGk
+						Ppp9MIHlBgNVHSMEgd0wgdqAFBe4qAGMntqL06Msf5ZbMHGkPpp9oYG2pIGzMIGw
+						MQswCQYDVQQGEwJHQjEYMBYGA1UECBMPTm9ydGggWW9ya3NoaXJlMQ4wDAYDVQQH
+						EwVTZWxieTEWMBQGA1UEChMNU2VsYnkgQ29sbGVnZTEZMBcGA1UECxMQTmV0d29y
+						ayBTZXJ2aWNlczEfMB0GA1UEAxMWc2hpYmJvbGV0aC5zZWxieS5hYy51azEjMCEG
+						CSqGSIb3DQEJARYUcGlsbGluZ21Ac2VsYnkuYWMudWuCCQCBgHWIQnVzkzANBgkq
+						hkiG9w0BAQUFAAOCAQEAdFdP+fjhBkK5qfIPqErHOJRlOUq3NNgpbrzpq7P6aGY+
+						bCH1vZCV593B3x1avTMWjP/6GEjXxPQOrhC93u3DQsAH+sbpGHIhSnir7egKa0GO
+						tCIRBjIuEVrwoLkNudGD+ZXG6rSQBe/8rvKa1PovjeGSWvtMiLdNyI2LqW9gzQog
+						YJQRakt5pqHYL0KK+TdZceNVnRyiTTJfl6GZw24ij7zIbTdOTv/vDfNLqHdebkIo
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.serc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.serc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..4d620193
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.serc.ac.uk-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						Ym9sZXRoLnNlcmMuYWMudWswHhcNMTQwMjI4MDkyNzQ3WhcNMzQwMjIzMDkyNzQ3
+						WjB9MQswCQYDVQQGEwJHQjEUMBIGA1UECBMLQ291bnR5IERvd24xDzANBgNVBAcT
+						BkJhbmdvcjEnMCUGA1UEChMeU291dGggRWFzdGVybiBSZWdpb25hbCBDb2xsZWdl
+						MR4wHAYDVQQDExVzaGliYm9sZXRoLnNlcmMuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQDENh+SLa6LWOKed5gS07GYyu6+XW7RVMQ+hutgiqxO
+						rOnTzAmZTxJTIvwmaRsk37+z3n/rsU5YDosjMTlO0Wl1C7xruvOAHd2K44HHrb16
+						X+A4pK7znx9FMt8n0i/stUVQMhh8ir/sZlOjQz0uat4y3HtioZybengGjkNL7iM9
+						tG31fIwpOYBlfNVknslvVUFYLsnVOnlEcZ0O+5WlYnHa8Qd6Ay4XiA2VdkICAIdN
+						10jIMe0hV/2hBnIIxSdGwRghNhcTMmN/80xV59XX6QkXtpZy/Gd9L5BQfabfQyFm
+						tRF+hcMgW7tqqpp+KFnXjG/WMzuOhBJjSqfZGZcjQUThAgMBAAEwDQYJKoZIhvcN
+						AQEFBQADggEBACrmmmqUQY1zCfiSNfeTPob6wNDyJh1XglgeR5hUuQRuHrNCT2D5
+						tDERide7jZM0FYzXFuovuoMtHr7uHyK3qOEqYzWlS6Z9hwMqYZm5jXZ4zSfExu9p
+						EyeDHLmQt0/PZPb25hQrWUHCvnqbu3d5ScAVVh9gJ4CpFmaustbEXckAdabDm5bR
+						K69fc1XerX5HiEz1kSI0AGecOS4aHq5B1LgKWodL9JIvJi3de1GNSxG7OCOPINA7
+						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>
+						MIIDdjCCAl4CCQCag8g+o0iWVDANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJH
+						QjEUMBIGA1UECBMLQ291bnR5IERvd24xDzANBgNVBAcTBkJhbmdvcjEnMCUGA1UE
+						ChMeU291dGggRWFzdGVybiBSZWdpb25hbCBDb2xsZWdlMR4wHAYDVQQDExVzaGli
+						Ym9sZXRoLnNlcmMuYWMudWswHhcNMTQwMjI4MDkyNzQ3WhcNMzQwMjIzMDkyNzQ3
+						WjB9MQswCQYDVQQGEwJHQjEUMBIGA1UECBMLQ291bnR5IERvd24xDzANBgNVBAcT
+						BkJhbmdvcjEnMCUGA1UEChMeU291dGggRWFzdGVybiBSZWdpb25hbCBDb2xsZWdl
+						MR4wHAYDVQQDExVzaGliYm9sZXRoLnNlcmMuYWMudWswggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQDENh+SLa6LWOKed5gS07GYyu6+XW7RVMQ+hutgiqxO
+						rOnTzAmZTxJTIvwmaRsk37+z3n/rsU5YDosjMTlO0Wl1C7xruvOAHd2K44HHrb16
+						X+A4pK7znx9FMt8n0i/stUVQMhh8ir/sZlOjQz0uat4y3HtioZybengGjkNL7iM9
+						tG31fIwpOYBlfNVknslvVUFYLsnVOnlEcZ0O+5WlYnHa8Qd6Ay4XiA2VdkICAIdN
+						10jIMe0hV/2hBnIIxSdGwRghNhcTMmN/80xV59XX6QkXtpZy/Gd9L5BQfabfQyFm
+						tRF+hcMgW7tqqpp+KFnXjG/WMzuOhBJjSqfZGZcjQUThAgMBAAEwDQYJKoZIhvcN
+						AQEFBQADggEBACrmmmqUQY1zCfiSNfeTPob6wNDyJh1XglgeR5hUuQRuHrNCT2D5
+						tDERide7jZM0FYzXFuovuoMtHr7uHyK3qOEqYzWlS6Z9hwMqYZm5jXZ4zSfExu9p
+						EyeDHLmQt0/PZPb25hQrWUHCvnqbu3d5ScAVVh9gJ4CpFmaustbEXckAdabDm5bR
+						K69fc1XerX5HiEz1kSI0AGecOS4aHq5B1LgKWodL9JIvJi3de1GNSxG7OCOPINA7
+						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>
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
new file mode 100644
index 00000000..17dcd58d
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.staffs.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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>
+						MIIDRzCCAi+gAwIBAgIUM4eMQ3ZvFUQU7+tPiztqHDYE9F8wDQYJKoZIhvcNAQEF
+						BQAwIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5zdGFmZnMuYWMudWswHhcNMTMwOTAz
+						MTQzNzA3WhcNMzMwOTAzMTQzNzA3WjAiMSAwHgYDVQQDExdzaGliYm9sZXRoLnN0
+						YWZmcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIkk3zHZ
+						A/HFNwUa+mjyTJ7sQG+RJEb+4sG1vqYyQPhK0OcqIqpqFLY/PRnWx7WXDCtAq9R2
+						xHx47wzNCmZGwvO0GYc2oc/RRafhKAhQlhYQH2CTjPQhP8A74e50WJanedCBrOXi
+						jttjPCennFXePlGMGCh68Nb0hKlm8GjyI/S5vjJa4NeFuis1NrZEZPJjINUFj6im
+						LRbd6iNcVqc+DoOj7PD+DFzYc8/La1lzDhTsuH969NPc+OOtM4axVddxAK5WVsr/
+						zJK3mzC0u9+kYiQp4Qr3mbVn9SSonBkUjKxgE4PdwwuBTi60bYJe6YKvp0ghRSQU
+						Dx4iR7ug0ympOw0CAwEAAaN1MHMwUgYDVR0RBEswSYIXc2hpYmJvbGV0aC5zdGFm
+						ZnMuYWMudWuGLmh0dHBzOi8vc2hpYmJvbGV0aC5zdGFmZnMuYWMudWsvaWRwL3No
+						aWJib2xldGgwHQYDVR0OBBYEFLUI9TLJ8mZwP8L792SDHlWJMQXCMA0GCSqGSIb3
+						DQEBBQUAA4IBAQAoT+y1xv7Cb/xtwH8cLn0zNIo7Ms6TbKxqeSWE0R2c4rvS9nlA
+						59iqcUsUaAzVIjQ8kRUP8mgss42xfOwYYnJXoj5EFn2fV6ttjnepw/FI+kV9DJpH
+						eggpV2XUmasjPqAZCbkO87/SirnICsDxhO6n09FEAIvJrDb4M3VTHR2lXZI8JyTp
+						1DvaCJgwgU7t2y/roz2nLo21kY1XAZG+JWxytS+r4dU1UskopixMZNxh2QN+Oxqf
+						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>
+						MIIDRzCCAi+gAwIBAgIUM4eMQ3ZvFUQU7+tPiztqHDYE9F8wDQYJKoZIhvcNAQEF
+						BQAwIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5zdGFmZnMuYWMudWswHhcNMTMwOTAz
+						MTQzNzA3WhcNMzMwOTAzMTQzNzA3WjAiMSAwHgYDVQQDExdzaGliYm9sZXRoLnN0
+						YWZmcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIkk3zHZ
+						A/HFNwUa+mjyTJ7sQG+RJEb+4sG1vqYyQPhK0OcqIqpqFLY/PRnWx7WXDCtAq9R2
+						xHx47wzNCmZGwvO0GYc2oc/RRafhKAhQlhYQH2CTjPQhP8A74e50WJanedCBrOXi
+						jttjPCennFXePlGMGCh68Nb0hKlm8GjyI/S5vjJa4NeFuis1NrZEZPJjINUFj6im
+						LRbd6iNcVqc+DoOj7PD+DFzYc8/La1lzDhTsuH969NPc+OOtM4axVddxAK5WVsr/
+						zJK3mzC0u9+kYiQp4Qr3mbVn9SSonBkUjKxgE4PdwwuBTi60bYJe6YKvp0ghRSQU
+						Dx4iR7ug0ympOw0CAwEAAaN1MHMwUgYDVR0RBEswSYIXc2hpYmJvbGV0aC5zdGFm
+						ZnMuYWMudWuGLmh0dHBzOi8vc2hpYmJvbGV0aC5zdGFmZnMuYWMudWsvaWRwL3No
+						aWJib2xldGgwHQYDVR0OBBYEFLUI9TLJ8mZwP8L792SDHlWJMQXCMA0GCSqGSIb3
+						DQEBBQUAA4IBAQAoT+y1xv7Cb/xtwH8cLn0zNIo7Ms6TbKxqeSWE0R2c4rvS9nlA
+						59iqcUsUaAzVIjQ8kRUP8mgss42xfOwYYnJXoj5EFn2fV6ttjnepw/FI+kV9DJpH
+						eggpV2XUmasjPqAZCbkO87/SirnICsDxhO6n09FEAIvJrDb4M3VTHR2lXZI8JyTp
+						1DvaCJgwgU7t2y/roz2nLo21kY1XAZG+JWxytS+r4dU1UskopixMZNxh2QN+Oxqf
+						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>
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
new file mode 100644
index 00000000..8eaddba0
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.stamford.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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
+						cHBvcnQxIjAgBgNVBAMTGXNoaWJib2xldGguc3RhbWZvcmQuYWMudWsxKzApBgkq
+						hkiG9w0BCQEWHGFkbWluaXN0cmF0b3JAc3RhbWZvcmQuYWMudWswHhcNMTMwOTE5
+						MTEyMDEzWhcNMjMwOTE3MTEyMDEzWjCBvDELMAkGA1UEBhMCR0IxFTATBgNVBAgT
+						DExpbmNvbG5zaGlyZTERMA8GA1UEBxMIU3RhbWZvcmQxHTAbBgNVBAoTFE5ldyBD
+						b2xsZWdlIFN0YW1mb3JkMRMwEQYDVQQLEwpJVCBTdXBwb3J0MSIwIAYDVQQDExlz
+						aGliYm9sZXRoLnN0YW1mb3JkLmFjLnVrMSswKQYJKoZIhvcNAQkBFhxhZG1pbmlz
+						dHJhdG9yQHN0YW1mb3JkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAxNZhRlfySArnO5DOBDE9vfyzUzoKovS7ek9eQTI0kcze+pG227ymsKwW
+						B/vhPHZt2344CtXqBiKxUv0U9jCf3/Dway3SvQ4fCAxgx0ceLqHToSZY1V67apeV
+						R75t4Cexv2OZJ5mdvBA6Re1i37J+xZyKiSFnI2Bw0tCEY34tyxsdJFH2Q+S7kmiq
+						YB56/pq3y8FDeDMntCJQNGPtjPQg0wNYz8z3FxBN7X/ko1bpr8TSYe/jfGOIiEbT
+						/zE3izycJIpeLbTUX0RWsmA35mRdEe/SUPykEBaWhzcdE2aDAQMrCXSYdbf2hrCF
+						DV6ekslfNFcfnoDVd4idzcC/AnvmfQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQUZE2SOgx8EKt1Vry6YLh4zpTWE6cwHwYDVR0jBBgwFoAUZE2SOgx8EKt1Vry6
+						YLh4zpTWE6cwDQYJKoZIhvcNAQEFBQADggEBAG/yhdTzRTEiwb5aApbiIFT9di/+
+						i9pClFe37QWrqTr+oNrbbIThq/gB4tEeFNXopYg8ZQIgLTsc1HZKmociZ1zYMQ3C
+						4eHvRxRpflQtIGy61+An9q5Gsx39ttAtLt4lG6VhJZQFFVD9CT6sBoQoFM+G2NQA
+						RO1nSa2NmA2ezlRRuq0sJ7Ves9T4A0llSSpuPYVn0mOpU/oOgbWl88Fwr1G4/xIL
+						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>
+						MIIEeDCCA2CgAwIBAgIJAK+NSDEsMrPuMA0GCSqGSIb3DQEBBQUAMIG8MQswCQYD
+						VQQGEwJHQjEVMBMGA1UECBMMTGluY29sbnNoaXJlMREwDwYDVQQHEwhTdGFtZm9y
+						ZDEdMBsGA1UEChMUTmV3IENvbGxlZ2UgU3RhbWZvcmQxEzARBgNVBAsTCklUIFN1
+						cHBvcnQxIjAgBgNVBAMTGXNoaWJib2xldGguc3RhbWZvcmQuYWMudWsxKzApBgkq
+						hkiG9w0BCQEWHGFkbWluaXN0cmF0b3JAc3RhbWZvcmQuYWMudWswHhcNMTMwOTE5
+						MTEyMDEzWhcNMjMwOTE3MTEyMDEzWjCBvDELMAkGA1UEBhMCR0IxFTATBgNVBAgT
+						DExpbmNvbG5zaGlyZTERMA8GA1UEBxMIU3RhbWZvcmQxHTAbBgNVBAoTFE5ldyBD
+						b2xsZWdlIFN0YW1mb3JkMRMwEQYDVQQLEwpJVCBTdXBwb3J0MSIwIAYDVQQDExlz
+						aGliYm9sZXRoLnN0YW1mb3JkLmFjLnVrMSswKQYJKoZIhvcNAQkBFhxhZG1pbmlz
+						dHJhdG9yQHN0YW1mb3JkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAxNZhRlfySArnO5DOBDE9vfyzUzoKovS7ek9eQTI0kcze+pG227ymsKwW
+						B/vhPHZt2344CtXqBiKxUv0U9jCf3/Dway3SvQ4fCAxgx0ceLqHToSZY1V67apeV
+						R75t4Cexv2OZJ5mdvBA6Re1i37J+xZyKiSFnI2Bw0tCEY34tyxsdJFH2Q+S7kmiq
+						YB56/pq3y8FDeDMntCJQNGPtjPQg0wNYz8z3FxBN7X/ko1bpr8TSYe/jfGOIiEbT
+						/zE3izycJIpeLbTUX0RWsmA35mRdEe/SUPykEBaWhzcdE2aDAQMrCXSYdbf2hrCF
+						DV6ekslfNFcfnoDVd4idzcC/AnvmfQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQUZE2SOgx8EKt1Vry6YLh4zpTWE6cwHwYDVR0jBBgwFoAUZE2SOgx8EKt1Vry6
+						YLh4zpTWE6cwDQYJKoZIhvcNAQEFBQADggEBAG/yhdTzRTEiwb5aApbiIFT9di/+
+						i9pClFe37QWrqTr+oNrbbIThq/gB4tEeFNXopYg8ZQIgLTsc1HZKmociZ1zYMQ3C
+						4eHvRxRpflQtIGy61+An9q5Gsx39ttAtLt4lG6VhJZQFFVD9CT6sBoQoFM+G2NQA
+						RO1nSa2NmA2ezlRRuq0sJ7Ves9T4A0llSSpuPYVn0mOpU/oOgbWl88Fwr1G4/xIL
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.statista.com.xml b/swamid-interfederations-2.0/shibboleth.statista.com.xml
new file mode 100644
index 00000000..e92df862
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.statista.com.xml
@@ -0,0 +1,100 @@
+<?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.statista.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="2014-08-11T11:49: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.statista.com/Shibboleth.sso/Login"/>
+      <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="en">Statista</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Statista.com is a statistics portal integrating data on over 60,000 topics from over 18,000 sources.</mdui:Description>
+        <mdui:Logo height="36" width="169">https://d28wbuch0jlv7v.cloudfront.net/static/img/Statista-Logo-Color-Primary.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIE4jCCA8qgAwIBAgIHEn65XsmOBDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
+						EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0G
+						A1UEAxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMTA5MDEwODAxMThaFw0x
+						NjA4MzAwODAxMThaME4xCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWlu
+						MRAwDgYDVQQLEwdERk4tUEtJMRgwFgYDVQQDEw9kZS5zdGF0aXN0YS5jb20wggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIP8FskLI19g/XBvxY1ua4uEtg
+						Q0vdL6f/wuKNP8wc/hCNh/HGJLYj9S0BRFmVlCxiXFhr5GRZAAZN+b6msehsgPs3
+						V6yKsP0Ga4yt7ccJuAzUFVU8Qrva2TIvDLPZ7Qucj+2M4ekxpqBjp850JbTqdGO1
+						oDmrKAzuxWXUS/9L88tFHiHvaxLEIBK3OYf6k8lK61BZuU2DXIFkd72iCF7LS/sE
+						uHh1db+185ssxNiLICu2vqJ9ZpsrYN6qOxSNvxI3jQ7jHNOlVXwFGAeDsnjg4Qxa
+						oqfgLekPagmmDWpAI9QHTyqUOAaN03UWigVeb01IiH8EwBKzi82mims7CHb1AgMB
+						AAGjggG8MIIBuDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
+						BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFOG/Ep6pb7z0/1gHX1D6Yx8DZsGx
+						MB8GA1UdIwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMIGRBgNVHR8EgYkwgYYw
+						QaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNh
+						L3B1Yi9jcmwvY2FjcmwuY3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRl
+						L2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBqgYIKwYBBQUH
+						AQEEgZ0wgZowSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xv
+						YmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBLBggrBgEFBQcw
+						AoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHVi
+						L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCJFZsyyBpVIHAp
+						preO/3S9+1Gw4OFWgS4Ajpfxz8H5pV5+6PK9bogtUWt7kSt41rbrWKWWbiZkjuTo
+						Th4aHytOOeHpaUYH9qkFa7Cla5L4FEB52uarXlnXtrp3/2sTPvpZWtDk7KNZYvcN
+						Psfu+IqZEGwHWuwh58Hl2v5xf137GhgcYuOm5Yabvi0+MdmtHihWuJ2sA7NEWzn8
+						LW8dBcS4uGBLwmZ5Tq4zIAbppwwoqV81YwY+IaW9ObNpYJUMPhyxxW6ydTxF4yuT
+						qZL8C8tvRqJtGUxFqPs4xImg3b9WLPThwMkFkuH/xzQqmN+xeoD3LvL/2DF88T3y
+						l/xjGBYl
+					</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.statista.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <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:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Statista GmbH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Statista</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.statista.com/aboutus/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Technik</md:GivenName>
+    <md:EmailAddress>mailto:technik@statista.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technik</md:GivenName>
+    <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
new file mode 100644
index 00000000..f2055149
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.strode-college.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,109 @@
+<?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>
+      <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>
+						MIIEjDCCA3SgAwIBAgIRAM41B8R40Vbx+iUIaGkgqqcwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA0MjMwMDAwMDBaFw0xNjA0MjIyMzU5NTlaME0xITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEoMCYGA1UEAxMfc2hpYmJvbGV0
+						aC5zdHJvZGUtY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBANirzHi6TLkZ9a/jBiJnW2SDq3C12XDTz48ohkxhJdNVaDP6s7mkHI/C
+						QIAivdA1t+uVpXq+6jq6usl7kiZ5vJ6PdPSETEI/hzzd+yr7pb9nJ/4gCNSwwdUg
+						bmZPATbzR6lqnpEZYdoiTOO7r/fDHfyaeKEyZq1fxlH51LLxhH0zsox+KZATFd/I
+						5Pv0OqZYZa+QEWSReFHEFaISSjiI1XBq7kNUDqbgaTWhcSju4CK/XNal0wVC604S
+						3ABvSh8kPwppxNcqRFiRXADhAcLF4+mSx3XRCE0SlGbNjmJqu3pPAFNErX3wHZCF
+						I4jvlMkfAPaCu5a580L95zDEOuQ+/mMCAwEAAaOCAXwwggF4MB8GA1UdIwQYMBaA
+						FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBS0f5oAazGa9uNdSNquviGF
+						58J0ZTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
+						BgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZn
+						gQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+						Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+						dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+						BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwKgYDVR0RBCMwIYIfc2hp
+						YmJvbGV0aC5zdHJvZGUtY29sbGVnZS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEA
+						mD7iITFcafQy6S75VcRHWZoBZ8AaxGPfzw2h584swzmfpDhfuTrAPb0gQqnI3wB1
+						ojHA7nHWi5SBjZbfRrtYkXkLP7JBqd/ODCJwjs9OOR2Bs2FYgSKfIaDo0x7bxlXL
+						jMVLJMOlw5CyOen7L56pSrFSDUCcFI11qQqTZrJKOnuB8+M+OJ7NXdPTxeovx8DE
+						i1o/5lZY4ExXtpBi8C824VQW/kaw/OLw7AoixIO8NtHJQZXczCluq3DmSfjmzXxL
+						zk34zZV8zfCKL8nip9c7FyOs4T435ohfn/pgjdeymebl6lxosT05f0q1YHmUC76K
+						0HEvec1HFeaydGx2GgAgcA==                        
+					</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>
+						MIIEjDCCA3SgAwIBAgIRAM41B8R40Vbx+iUIaGkgqqcwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA0MjMwMDAwMDBaFw0xNjA0MjIyMzU5NTlaME0xITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEoMCYGA1UEAxMfc2hpYmJvbGV0
+						aC5zdHJvZGUtY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBANirzHi6TLkZ9a/jBiJnW2SDq3C12XDTz48ohkxhJdNVaDP6s7mkHI/C
+						QIAivdA1t+uVpXq+6jq6usl7kiZ5vJ6PdPSETEI/hzzd+yr7pb9nJ/4gCNSwwdUg
+						bmZPATbzR6lqnpEZYdoiTOO7r/fDHfyaeKEyZq1fxlH51LLxhH0zsox+KZATFd/I
+						5Pv0OqZYZa+QEWSReFHEFaISSjiI1XBq7kNUDqbgaTWhcSju4CK/XNal0wVC604S
+						3ABvSh8kPwppxNcqRFiRXADhAcLF4+mSx3XRCE0SlGbNjmJqu3pPAFNErX3wHZCF
+						I4jvlMkfAPaCu5a580L95zDEOuQ+/mMCAwEAAaOCAXwwggF4MB8GA1UdIwQYMBaA
+						FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBS0f5oAazGa9uNdSNquviGF
+						58J0ZTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
+						BgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZn
+						gQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+						Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+						dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+						BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwKgYDVR0RBCMwIYIfc2hp
+						YmJvbGV0aC5zdHJvZGUtY29sbGVnZS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEA
+						mD7iITFcafQy6S75VcRHWZoBZ8AaxGPfzw2h584swzmfpDhfuTrAPb0gQqnI3wB1
+						ojHA7nHWi5SBjZbfRrtYkXkLP7JBqd/ODCJwjs9OOR2Bs2FYgSKfIaDo0x7bxlXL
+						jMVLJMOlw5CyOen7L56pSrFSDUCcFI11qQqTZrJKOnuB8+M+OJ7NXdPTxeovx8DE
+						i1o/5lZY4ExXtpBi8C824VQW/kaw/OLw7AoixIO8NtHJQZXczCluq3DmSfjmzXxL
+						zk34zZV8zfCKL8nip9c7FyOs4T435ohfn/pgjdeymebl6lxosT05f0q1YHmUC76K
+						0HEvec1HFeaydGx2GgAgcA==                        
+					</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>
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
new file mode 100644
index 00000000..f15c9653
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.stvincent.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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>
+      <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
+						U2VydmljZXMxIzAhBgNVBAMMGnNoaWJib2xldGguc3R2aW5jZW50LmFjLnVrMB4X
+						DTE0MDQyMjA4NTEzOVoXDTI0MDQxOTA4NTEzOVowgZMxCzAJBgNVBAYTAkdCMRIw
+						EAYDVQQIDAlIYW1wc2hpcmUxEDAOBgNVBAcMB0dvc3BvcnQxHDAaBgNVBAoME1N0
+						LiBWaW5jZW50IENvbGxlZ2UxGzAZBgNVBAsMEkNvbXB1dGluZyBTZXJ2aWNlczEj
+						MCEGA1UEAwwac2hpYmJvbGV0aC5zdHZpbmNlbnQuYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDnZN2BAOnzT6khf5iV7SoGU+o5T0gZUqi06pWN
+						t9QBYAcls5EtcX1Use0V9o3T6eolbTAuTEtLb4rA2XTl3GdC0Kxp47+FpxQPl+eE
+						T5FKpm4JtsSGwSlOTWlpVB5tM5MHgo08OXCJvheFYalwHJwTSJq9iJRl3k1z/7iu
+						awm0mwfrL7WkoGqsxByzuPzVOeVjcwcCu6vqPD0FdSnbgtdhUooEPH5Z9UxGmLkz
+						JTsswUt4HgoZ8wfpOF8rMmWx3q2j6AlWouDZ2e+09/Da6P+OzZc3MuLI0p5RsL5g
+						FZbZAd9ug3co9kat8Dv8lpgAbOD7rKnpypSd0vYQvlFnHiADAgMBAAGjUDBOMB0G
+						A1UdDgQWBBRLo6YHlfQdXHuHAgwUecCZHW5n+jAfBgNVHSMEGDAWgBRLo6YHlfQd
+						XHuHAgwUecCZHW5n+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCF
+						fCPtuwRUOtWh/CW45ut5124QgxvCuSz6fhINBWUAJ+MM0jwq+IXwyfPZrdHYfSSR
+						ibIfAW15EHT+aDnHNGLkvmWN6E4OBzHiN5kepH4ANrSp2WSIwYEzTBvYSxhzc8Tf
+						B1OGqzI4O9v3sTAnoh0MgUa0/8Bl6dhhVfvZ2VCyPSpem42FBLrrZS08MPogLkSJ
+						jxpoy684e6jQDX0X1mn+f5o9syml1pEXHgsZrnWrW71xBngBKc7NdUf3GhdDNIYL
+						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>
+						MIID+zCCAuOgAwIBAgIJAPVJaPGZ6hp0MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
+						VQQGEwJHQjESMBAGA1UECAwJSGFtcHNoaXJlMRAwDgYDVQQHDAdHb3Nwb3J0MRww
+						GgYDVQQKDBNTdC4gVmluY2VudCBDb2xsZWdlMRswGQYDVQQLDBJDb21wdXRpbmcg
+						U2VydmljZXMxIzAhBgNVBAMMGnNoaWJib2xldGguc3R2aW5jZW50LmFjLnVrMB4X
+						DTE0MDQyMjA4NTEzOVoXDTI0MDQxOTA4NTEzOVowgZMxCzAJBgNVBAYTAkdCMRIw
+						EAYDVQQIDAlIYW1wc2hpcmUxEDAOBgNVBAcMB0dvc3BvcnQxHDAaBgNVBAoME1N0
+						LiBWaW5jZW50IENvbGxlZ2UxGzAZBgNVBAsMEkNvbXB1dGluZyBTZXJ2aWNlczEj
+						MCEGA1UEAwwac2hpYmJvbGV0aC5zdHZpbmNlbnQuYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDnZN2BAOnzT6khf5iV7SoGU+o5T0gZUqi06pWN
+						t9QBYAcls5EtcX1Use0V9o3T6eolbTAuTEtLb4rA2XTl3GdC0Kxp47+FpxQPl+eE
+						T5FKpm4JtsSGwSlOTWlpVB5tM5MHgo08OXCJvheFYalwHJwTSJq9iJRl3k1z/7iu
+						awm0mwfrL7WkoGqsxByzuPzVOeVjcwcCu6vqPD0FdSnbgtdhUooEPH5Z9UxGmLkz
+						JTsswUt4HgoZ8wfpOF8rMmWx3q2j6AlWouDZ2e+09/Da6P+OzZc3MuLI0p5RsL5g
+						FZbZAd9ug3co9kat8Dv8lpgAbOD7rKnpypSd0vYQvlFnHiADAgMBAAGjUDBOMB0G
+						A1UdDgQWBBRLo6YHlfQdXHuHAgwUecCZHW5n+jAfBgNVHSMEGDAWgBRLo6YHlfQd
+						XHuHAgwUecCZHW5n+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCF
+						fCPtuwRUOtWh/CW45ut5124QgxvCuSz6fhINBWUAJ+MM0jwq+IXwyfPZrdHYfSSR
+						ibIfAW15EHT+aDnHNGLkvmWN6E4OBzHiN5kepH4ANrSp2WSIwYEzTBvYSxhzc8Tf
+						B1OGqzI4O9v3sTAnoh0MgUa0/8Bl6dhhVfvZ2VCyPSpem42FBLrrZS08MPogLkSJ
+						jxpoy684e6jQDX0X1mn+f5o9syml1pEXHgsZrnWrW71xBngBKc7NdUf3GhdDNIYL
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.submit.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.submit.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..4a84b9d4
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.submit.ac.uk-shibboleth.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.submit.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>
+						MIIEJDCCAwygAwIBAgIJANNCqdS5T/uTMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYD
+						VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEQMA4GA1UEBwwHT2FrbGFuZDET
+						MBEGA1UECgwKaVBhcmFkaWdtczEgMB4GA1UEAwwXc2hpYmJvbGV0aC5zdWJtaXQu
+						YWMudWsxJTAjBgkqhkiG9w0BCQEWFnNoaWJhZG1pbkB0dXJuaXRpbi5jb20wHhcN
+						MTMwODIzMDAzMjM4WhcNMjMwODIxMDAzMjM4WjCBkjELMAkGA1UEBhMCVVMxEzAR
+						BgNVBAgMCkNhbGlmb3JuaWExEDAOBgNVBAcMB09ha2xhbmQxEzARBgNVBAoMCmlQ
+						YXJhZGlnbXMxIDAeBgNVBAMMF3NoaWJib2xldGguc3VibWl0LmFjLnVrMSUwIwYJ
+						KoZIhvcNAQkBFhZzaGliYWRtaW5AdHVybml0aW4uY29tMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAwP4A/JGVAR4/MLEn2/YgG+8RqWnJqi/Pxuux6AR8
+						YJouaq6OIN7FtmFTze4aOVji3u0QoxDU559gl72VA3c4J+DYV/6sKz4LCGrN7NTM
+						RdtHrHJkPtj1ktIkBaCSYPADoTsrlQnRqZ5sSc8Q1vQNFQCfhf61mkKE3VX+EwTK
+						njx6NhyhpPSfctUdPR/QADZZCWazldENSuH7yyUjTlxhBLLQD9Yyahn2e11Afqvc
+						iJvyZMVtfQ0ezKVQlinXTtPKROuVHPybKcCcvu0WLncrW1M1kbhkmUNbCjPWspxp
+						y91ggvdRePbOdZZwmUIxkEMeGiXDA8YvmF2gk6wptRv/7wIDAQABo3sweTAJBgNV
+						HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
+						Y2F0ZTAdBgNVHQ4EFgQUvcJOH3FW/nHHBg7gjXPFvTUg0EkwHwYDVR0jBBgwFoAU
+						vcJOH3FW/nHHBg7gjXPFvTUg0EkwDQYJKoZIhvcNAQEFBQADggEBAJteiRc11ZQe
+						mm2idBi0wnpXTsXq7Boo2tFBB1QhJ4c/XkkBb1gzBaGe2dH4jZ0NbpN8+JXifplz
+						ZokKNVILqvi7xnR3aAs2lFRqN3mpZ2a3Kkn5liLtiOeuVx37o/n6RxpTKS/KHufz
+						ebYCs8ORGrdWHuiGHPX6LNy9ITONdFr7ma57aQ7Xr47hxgT/XRk48OcDGhTFAlmt
+						XCnhD1dwMqXgkfULzheeg/j2BDCBfWjfG+4D6FzQlbFbyfOK03w8Yjxmy397OYbC
+						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.submit.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </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.submit.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Shuh</md:SurName>
+    <md:EmailAddress>mailto:mshuh@iparadigms.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Miller</md:SurName>
+    <md:EmailAddress>mailto:jmiller@turnitin.com</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
new file mode 100644
index 00000000..f48418b7
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.techlib.cz-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?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>
+      <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
+BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNobGliLmN6MB4XDTEwMDIxNzEy
+MjYwM1oXDTMwMDIxNzEyMjYwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNo
+bGliLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi5FN6efQHuiH
+zERWjziRdD9X4sF76m0v9dest6lxrVXdxBIMjo52h7zkmZnWTwr402rCu6MLr2rX
+Lfz050FcEGSBDQyVr47QsUEQkvsThjdb2LZtjHzxiMc20fngB5+7nrZG4pBwragw
+XxfklvQ9VVdhQ1evD4QLn9Vj0LavZi9BzyOtbO6nPzzw624u0buU/QNeZAs2gNgj
+DJKx2UQW50R/YJUHz7XEd/q8r48+gSWkqh0KPvAbqaQJkZJ2lwyggcqPCV9i9wlF
+aUuE8aDyVKUkmT6Z8HfJKsFUgoGbiUvMMHTKuasiT4UP9hBvVrwgsIjOvSVu9NnL
+uxtP5VnHvQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLnRlY2hsaWIu
+Y3qGLGh0dHBzOi8vc2hpYmJvbGV0aC50ZWNobGliLmN6L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRvpKOl45kZis1SGQnbs2WT6PX2UjANBgkqhkiG9w0BAQUFAAOC
+AQEAbtw87jOn1csGq3iYcEzPXyNO9j+YX1OFhjWhnjhD0z14FYOJKvr2yZ49hJoA
+UoxLanwsquNEE5MyxwlFjE0J9KAg+gTYZ/RQtUWI4qPMOGHzfT02U6HdXtMJVZOO
+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
+BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNobGliLmN6MB4XDTEwMDIxNzEy
+MjYwM1oXDTMwMDIxNzEyMjYwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNo
+bGliLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi5FN6efQHuiH
+zERWjziRdD9X4sF76m0v9dest6lxrVXdxBIMjo52h7zkmZnWTwr402rCu6MLr2rX
+Lfz050FcEGSBDQyVr47QsUEQkvsThjdb2LZtjHzxiMc20fngB5+7nrZG4pBwragw
+XxfklvQ9VVdhQ1evD4QLn9Vj0LavZi9BzyOtbO6nPzzw624u0buU/QNeZAs2gNgj
+DJKx2UQW50R/YJUHz7XEd/q8r48+gSWkqh0KPvAbqaQJkZJ2lwyggcqPCV9i9wlF
+aUuE8aDyVKUkmT6Z8HfJKsFUgoGbiUvMMHTKuasiT4UP9hBvVrwgsIjOvSVu9NnL
+uxtP5VnHvQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLnRlY2hsaWIu
+Y3qGLGh0dHBzOi8vc2hpYmJvbGV0aC50ZWNobGliLmN6L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRvpKOl45kZis1SGQnbs2WT6PX2UjANBgkqhkiG9w0BAQUFAAOC
+AQEAbtw87jOn1csGq3iYcEzPXyNO9j+YX1OFhjWhnjhD0z14FYOJKvr2yZ49hJoA
+UoxLanwsquNEE5MyxwlFjE0J9KAg+gTYZ/RQtUWI4qPMOGHzfT02U6HdXtMJVZOO
+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>
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
new file mode 100644
index 00000000..5b2c4726
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.truro-penwith.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						bGV0aC50cnVyby1wZW53aXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEAjNqa9ASmhvPnSc/Sg2TXmSShKIwWmTXV7eNgqQY/yacb2zrsWJes
+						Fx/hGQ2GADV/+PWyHNT208q0Bb7IsutKLSRCntKKB8FPREaSTRO8QVkEpDAuakpR
+						m9B/Q1z0+HGVlGc6ZifDgChxZYYlOxr8CyGk9r5xNu28KnQsjUodwEPW7Xv5tjaH
+						Ukg9ZI8UpYkxYKt9yQj+KdfV5g0BiUkaKTRIQ+20L5ohFYweuH2DKTOv48td7bMa
+						Y5MRpabacOhJOs+Pt6AKToGcmM+gEhib0fifhdMg2Qf77dZ3miuI+8sjIZFuttyQ
+						SKeWWJgnpka95I0m8hfr/DxzkSPIHzJFbQIDAQABo4GEMIGBMGAGA1UdEQRZMFeC
+						HnNoaWJib2xldGgudHJ1cm8tcGVud2l0aC5hYy51a4Y1aHR0cHM6Ly9zaGliYm9s
+						ZXRoLnRydXJvLXBlbndpdGguYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYE
+						FPe307YqPO7BPihGONrKkqFzgZCDMA0GCSqGSIb3DQEBBQUAA4IBAQCL0w8cTddh
+						iqoUJu/oGOju7URDWO+YwIjJV+tWEf8lC0nGnPehoaYitXDexoNNZ9yqEJ3XhrTF
+						gTNtJfRPnT9RZ0e+dbJu/f68HKLkv798yy14wgv6m20miPvY14OhlTT2mUcUuhz0
+						m29Yd8Kg1MIDcH1Me7SVAvJex0uaDn0J74dNJofWxeCRv4+rlMuDQa2NL2sJ6GL0
+						oZnqLAehosKei0nPPNYFE4aa+L/V6BSDs7hqimBf6oFt4qDqOeGgfAZeuWdqCYDN
+						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>
+						MIIDZTCCAk2gAwIBAgIUVIqVGTLdOThvAs45mIha28LOG0cwDQYJKoZIhvcNAQEF
+						BQAwKTEnMCUGA1UEAxMec2hpYmJvbGV0aC50cnVyby1wZW53aXRoLmFjLnVrMB4X
+						DTEzMDcyNTA5MjU1OFoXDTMzMDcyNTA5MjU1OFowKTEnMCUGA1UEAxMec2hpYmJv
+						bGV0aC50cnVyby1wZW53aXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEAjNqa9ASmhvPnSc/Sg2TXmSShKIwWmTXV7eNgqQY/yacb2zrsWJes
+						Fx/hGQ2GADV/+PWyHNT208q0Bb7IsutKLSRCntKKB8FPREaSTRO8QVkEpDAuakpR
+						m9B/Q1z0+HGVlGc6ZifDgChxZYYlOxr8CyGk9r5xNu28KnQsjUodwEPW7Xv5tjaH
+						Ukg9ZI8UpYkxYKt9yQj+KdfV5g0BiUkaKTRIQ+20L5ohFYweuH2DKTOv48td7bMa
+						Y5MRpabacOhJOs+Pt6AKToGcmM+gEhib0fifhdMg2Qf77dZ3miuI+8sjIZFuttyQ
+						SKeWWJgnpka95I0m8hfr/DxzkSPIHzJFbQIDAQABo4GEMIGBMGAGA1UdEQRZMFeC
+						HnNoaWJib2xldGgudHJ1cm8tcGVud2l0aC5hYy51a4Y1aHR0cHM6Ly9zaGliYm9s
+						ZXRoLnRydXJvLXBlbndpdGguYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYE
+						FPe307YqPO7BPihGONrKkqFzgZCDMA0GCSqGSIb3DQEBBQUAA4IBAQCL0w8cTddh
+						iqoUJu/oGOju7URDWO+YwIjJV+tWEf8lC0nGnPehoaYitXDexoNNZ9yqEJ3XhrTF
+						gTNtJfRPnT9RZ0e+dbJu/f68HKLkv798yy14wgv6m20miPvY14OhlTT2mUcUuhz0
+						m29Yd8Kg1MIDcH1Me7SVAvJex0uaDn0J74dNJofWxeCRv4+rlMuDQa2NL2sJ6GL0
+						oZnqLAehosKei0nPPNYFE4aa+L/V6BSDs7hqimBf6oFt4qDqOeGgfAZeuWdqCYDN
+						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>
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
new file mode 100644
index 00000000..3066b9f2
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.u-bourgogne.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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="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>
+					      MIIDUDCCAjigAwIBAgIVAIeNiIDKvgtvFqf45aiuB8pnYHO3MA0GCSqGSIb3DQEB
+BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgudS1ib3VyZ29nbmUuZnIwHhcNMTMw
+MzA0MTQwODU5WhcNMzMwMzA0MTQwODU5WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
+LnUtYm91cmdvZ25lLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+u4o6aNzFq5dFOOJ3FjDd+yUWvuKjHbjxZZXITTSkTY1dJWnNeWgU5/hMqe1eT0b3
+mkREk+0lLOFpIgc8XP7komHv/+oTRBWyrZiHYEBMLa+I7OxNYG9maHm7hABBAMlp
+aCNHLnd3e2mX4ZFiCAx6boIwrXPs1jo3vaEqdqU6t2U6WexjUXscGP7x0P7xthFd
+Givnhf9ibWnQ3FHFsjFK0J0NQJ7gakfiop2OcacHIS7NBFtKzj+F7/4u0OW4yJmq
+TJD3BlbzVWASv40bnETttxYFMysr95/lZ8fE3xHQ+JNZizt4xDQw+43hrxF9z05U
+0gfLMPtaaREZmw7jVjW6NwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
+LnUtYm91cmdvZ25lLmZyhjBodHRwczovL3NoaWJib2xldGgudS1ib3VyZ29nbmUu
+ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGXgakJMT66MdgHobQe6tYhWEVpn
+MA0GCSqGSIb3DQEBBQUAA4IBAQA/R7RnXq7N0ZByIkA4xB0LA8EK2e7+ArChE6hN
+44ocg1dUJ1KGCKI22K9RlGC0qyQ/SjXvlyEbTyVxUSeu2ofFb2Q0WtdE/BIIs6PB
+vK4DxIEhIEeNjucQ1nOS0k1U1Yz/vjQ0BtSxOj+ULknjrXLlA+LKXtvi5se+1xu2
++ibSc3IIu6Xdz3M7tFhB6/OAQ7JJzRG6CI9w3WM6DhE3KsZTBm2duAhH/kV59uey
+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://unknown.site.com</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
new file mode 100644
index 00000000..c03ae43e
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.u-grenoble3.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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="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>
+					      MIIDTzCCAjegAwIBAgIUO6lqrfWSVSjaNN+/XubYFEzq/2wwDQYJKoZIhvcNAQEF
+BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aC51LWdyZW5vYmxlMy5mcjAeFw0xMjEw
+MDgxNTIyMjNaFw0zMjEwMDgxNTIyMjNaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgu
+dS1ncmVub2JsZTMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCC
+1riCyjqN5GFKjy2yese7U7AiHqI/1YdAemLeLBHr11KT6/RsdqW++jwV2lszQiGw
+BSVr2gAI8RY8j4zP7KzeyD+2Hn/ARvRsiZpQhLKDSPDafInTJz5rW5rfgoNHd2nv
+Ii/k66l24ZuslrTYuaTPxAgJGx0acyDk76r8gl4JUFCSkYV17SmLv5ixd2r+Wphz
+6gCVJ1EUSBoZFLIIfqIfWAPOF+liAxKYZuUSHtKGaLt9FkZgy5ykGcTCO7CIKvof
+82sjo5Sd57mZIubuyUHb+ycFN7pTcy7fURSBNuHOgVBgiUufjjPFlWT0j3eQENte
+fSgMl+lzEG8ZNII4If2TAgMBAAGjeTB3MFYGA1UdEQRPME2CGXNoaWJib2xldGgu
+dS1ncmVub2JsZTMuZnKGMGh0dHBzOi8vc2hpYmJvbGV0aC51LWdyZW5vYmxlMy5m
+ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUDQaomDjXR+8EYADTSozsPnhYfAow
+DQYJKoZIhvcNAQEFBQADggEBAEXNNQ9VnGiLhmkTJ8QADVpW7ft6nwvIWfUoxTfn
+92YJAWct5VVIzA39d05Sji5eWo2krLwGvSzsK9bUjQsQ/WDrdxfxsn//h5ynYdSF
+Ahxpo7Kp3p5+IvSRzULb5wprjdeKf9sL2mfCfh28siZPtehQLcnu2rjdwzNGsLr7
+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://unknown.site.com</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.ufsc.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ufsc.br-idp-shibboleth.xml
new file mode 100644
index 00000000..2444a21f
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ufsc.br-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBFVGU0MxDjAM
+BgNVBAsTBVNlVElDMRwwGgYJKoZIhvcNAQkBFg1hZG1pbkB1ZnNjLmJyMRYwFAYD
+VQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkG
+A1UEBhMCQlIxGzAZBgNVBAMTEnNoaWJib2xldGgudWZzYy5icjAeFw0xNDA0MTYy
+MjI4MTZaFw0xOTA0MTUyMjI4MTZaMIGYMQ0wCwYDVQQKEwRVRlNDMQ4wDAYDVQQL
+EwVTZVRJQzEcMBoGCSqGSIb3DQEJARYNYWRtaW5AdWZzYy5icjEWMBQGA1UEBxMN
+Rmxvcmlhbm9wb2xpczEXMBUGA1UECBMOU2FudGEgQ2F0YXJpbmExCzAJBgNVBAYT
+AkJSMRswGQYDVQQDExJzaGliYm9sZXRoLnVmc2MuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC/oBIF0VeleZ37F3PzefDHAIrgwIaN2aRyLzZ4Uv8/
+FYsWLIXeOxXr49qJ77jFFkv/UzXZJvLvb6yhKC0A18E+ZDcKSQZuYoG8Arx+ohPR
+EI824htm1uAwGAw/SUsDVTgFodHOmIOmal71f6sorCKb1GeBkDkpkSYyYXG3t7fk
+tVY741kqaPcGellMrccwKztjFs31GvNLNZCpLOpF3lLmmpDApOaFO1f9qbSKv0GZ
+PYPm/8NxE+4wJMUVHzExCpn/YV0rBd4DfNhU4LJGx6yYQCe+Rj6Uu9vL3AHcBU5k
+PT/ggxte+CDsQADIoYct8oPPDsZa4ezejgh1+XbTcqTzAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBALAr9prD3ASLuuTCydBg5NHQIFkQdIhoPkgu1VA5IHdqr4qpM4HL
+I1BFbUi7CFBXMlVFC6xDB4H5byq8TidvLcAvePhrL4WLbO6q/CmuOeLEuGXEXY2T
+rYGyJI3JK0/Y2vb4IURylGMQvl0+dX8PHocy3wfNoXVdUYG4w3XYPKAXgWKlKC8F
+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>
+      
+MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBFVGU0MxDjAM
+BgNVBAsTBVNlVElDMRwwGgYJKoZIhvcNAQkBFg1hZG1pbkB1ZnNjLmJyMRYwFAYD
+VQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkG
+A1UEBhMCQlIxGzAZBgNVBAMTEnNoaWJib2xldGgudWZzYy5icjAeFw0xNDA0MTYy
+MjI4MTZaFw0xOTA0MTUyMjI4MTZaMIGYMQ0wCwYDVQQKEwRVRlNDMQ4wDAYDVQQL
+EwVTZVRJQzEcMBoGCSqGSIb3DQEJARYNYWRtaW5AdWZzYy5icjEWMBQGA1UEBxMN
+Rmxvcmlhbm9wb2xpczEXMBUGA1UECBMOU2FudGEgQ2F0YXJpbmExCzAJBgNVBAYT
+AkJSMRswGQYDVQQDExJzaGliYm9sZXRoLnVmc2MuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC/oBIF0VeleZ37F3PzefDHAIrgwIaN2aRyLzZ4Uv8/
+FYsWLIXeOxXr49qJ77jFFkv/UzXZJvLvb6yhKC0A18E+ZDcKSQZuYoG8Arx+ohPR
+EI824htm1uAwGAw/SUsDVTgFodHOmIOmal71f6sorCKb1GeBkDkpkSYyYXG3t7fk
+tVY741kqaPcGellMrccwKztjFs31GvNLNZCpLOpF3lLmmpDApOaFO1f9qbSKv0GZ
+PYPm/8NxE+4wJMUVHzExCpn/YV0rBd4DfNhU4LJGx6yYQCe+Rj6Uu9vL3AHcBU5k
+PT/ggxte+CDsQADIoYct8oPPDsZa4ezejgh1+XbTcqTzAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBALAr9prD3ASLuuTCydBg5NHQIFkQdIhoPkgu1VA5IHdqr4qpM4HL
+I1BFbUi7CFBXMlVFC6xDB4H5byq8TidvLcAvePhrL4WLbO6q/CmuOeLEuGXEXY2T
+rYGyJI3JK0/Y2vb4IURylGMQvl0+dX8PHocy3wfNoXVdUYG4w3XYPKAXgWKlKC8F
+sexAwdseeJPodXooXs+WzgUbhKZAlQtfw8w/jEEf3UiOtj8R0oKJpp9NjDxmvFt1
+0Zsj1b736wkbB0weh6x+SjGFDGvN0Pqy6oMe1Up1GltN2e2mwU//UUWTp7hwgRuK
+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>
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
new file mode 100644
index 00000000..97cadffd
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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="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>
+					      MIIDUzCCAjugAwIBAgIUIBrWKHsL8z9pJuwM6Xugq6gtHv0wDQYJKoZIhvcNAQEF
+BQAwJTEjMCEGA1UEAxMac2hpYmJvbGV0aC51amYtZ3Jlbm9ibGUuZnIwHhcNMTIw
+NTMwMTM1OTEwWhcNMzIwNTMwMTM1OTEwWjAlMSMwIQYDVQQDExpzaGliYm9sZXRo
+LnVqZi1ncmVub2JsZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AMKh7FBSR/eSLc6z91Pnqz9DwOsoTcYsmk7vMR5pzzma04GnURN9m4wdLXXXthpT
+wsLsm6X3IajdWwPcychQX+QXjFVu9SwujThoTVKEKHQNQeLcd5d7diiE9NyCnL4n
+dT2TCMetnw7mZi9hjQNzqglecS6hYfz9AbPjE6nBrCMolp93fMW2+DNUx8LjsfhY
+trmbX8302s9oEXbOgawV/4aqrDuRlXUKtCQoHhNZDlaXwRIbEljHvQ+e4RNz1OcA
+WIsARWe7H1WEow3q+SbIRFSYURRqpnA7I98Iee6jk4KrGVSmlzQHpnxYJ2lPVMnG
+9l0VGLuWBE1JLzD9tKnmrPkCAwEAAaN7MHkwWAYDVR0RBFEwT4Iac2hpYmJvbGV0
+aC51amYtZ3Jlbm9ibGUuZnKGMWh0dHBzOi8vc2hpYmJvbGV0aC51amYtZ3Jlbm9i
+bGUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMI3jVWm2/k0WcsNlvWwLwUo
+/OsaMA0GCSqGSIb3DQEBBQUAA4IBAQCGC1Rg9cMwkd7AojNiF8YZ0UBY1cK208ik
+AcP7bhMUTIo2OxlhEDqGa8y0wCr2GFOJXutgR0HED33N+VfzvV2lhPJf3hEg6yFa
+gBnVXFgNP7+m+wjJ8l//EX2x8XGefCEobUFXP1g2xurqfr5Wvm7BlN2dKhhEVn3d
+/Jm1bb3fZT1CM1ryggYtQLnNNlcJYyYDbqPshKA5LIXn3PlSyxC7QtqY3PRgag68
+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://unknown.site.com</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.unb.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.xml
new file mode 100644
index 00000000..94ad340e
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxJzAlBgNVBAoTHlVOQiAtIFVu
+aXZlcnNpZGFkZSBkZSBCcmFzaWxpYTEMMAoGA1UECxMDQ1BEMSAwHgYJKoZIhvcN
+AQkBFhFkaW9uaXNpb2pyQHVuYi5icjERMA8GA1UEBxMIQnJhc2lsaWExGTAXBgNV
+BAgTEERpc3RyaXRvIEZlZGVyYWwxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFzaGli
+Ym9sZXRoLnVuYi5icjAeFw0xNDA3MDEyMTUxMjJaFw0xNzA2MzAyMTUxMjJaMIGw
+MScwJQYDVQQKEx5VTkIgLSBVbml2ZXJzaWRhZGUgZGUgQnJhc2lsaWExDDAKBgNV
+BAsTA0NQRDEgMB4GCSqGSIb3DQEJARYRZGlvbmlzaW9qckB1bmIuYnIxETAPBgNV
+BAcTCEJyYXNpbGlhMRkwFwYDVQQIExBEaXN0cml0byBGZWRlcmFsMQswCQYDVQQG
+EwJCUjEaMBgGA1UEAxMRc2hpYmJvbGV0aC51bmIuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDzc4RTYqDqObR8seN1H6eMRfhielgf2cd7of8T2n9h
+LZV6lakR193gP0qRj+SaZUNaDwoiPoDs4jH8C8a901DmE6QoTMDjg6LL+97swZb4
+lCsZRs5V4qIRNjQZ6nF3rgsEs/oNONQwTq0AQKIorYG5zC4oibwwwjYFan7oOszi
+MeohgrdZWl/bhlsEwWOlDaOpKlFxXYtHXskOSbf+3fvZvJArgq5S7PNuG1oBxvuJ
+Xi5AzjHABYt3CziIawUtMS1dWojrnC+64WN3gf3ninVTt4k+xbqn2gZujdoAR/yn
+6JUYi3PZRU77H6xjCag+3+1kuKBx0EBFFdr85ZF8mauHAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAIW2/04fVCKbAv0BKaTdhj8HIG++0nmdA9PsDECgFyURwoh8M2nY
+rkViEKpFdl0s9+8wtj/cGhYVWru0g8Qm1Uo27pXElYIPgU4hm3988VopipwDT2DY
+xsxk+MdoP6KTRtSNJNKFMbuPYj/jr7n7MFJYiWgvOvZ/n/o4RSRHrGhOYVuYNeyn
+/ejprsKScl7RnhMg5dtMXt9qeGgIWW/heVImJJzDURNdsF4sDHD4qKhf3pDNRhHn
+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>
+      
+MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxJzAlBgNVBAoTHlVOQiAtIFVu
+aXZlcnNpZGFkZSBkZSBCcmFzaWxpYTEMMAoGA1UECxMDQ1BEMSAwHgYJKoZIhvcN
+AQkBFhFkaW9uaXNpb2pyQHVuYi5icjERMA8GA1UEBxMIQnJhc2lsaWExGTAXBgNV
+BAgTEERpc3RyaXRvIEZlZGVyYWwxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFzaGli
+Ym9sZXRoLnVuYi5icjAeFw0xNDA3MDEyMTUxMjJaFw0xNzA2MzAyMTUxMjJaMIGw
+MScwJQYDVQQKEx5VTkIgLSBVbml2ZXJzaWRhZGUgZGUgQnJhc2lsaWExDDAKBgNV
+BAsTA0NQRDEgMB4GCSqGSIb3DQEJARYRZGlvbmlzaW9qckB1bmIuYnIxETAPBgNV
+BAcTCEJyYXNpbGlhMRkwFwYDVQQIExBEaXN0cml0byBGZWRlcmFsMQswCQYDVQQG
+EwJCUjEaMBgGA1UEAxMRc2hpYmJvbGV0aC51bmIuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDzc4RTYqDqObR8seN1H6eMRfhielgf2cd7of8T2n9h
+LZV6lakR193gP0qRj+SaZUNaDwoiPoDs4jH8C8a901DmE6QoTMDjg6LL+97swZb4
+lCsZRs5V4qIRNjQZ6nF3rgsEs/oNONQwTq0AQKIorYG5zC4oibwwwjYFan7oOszi
+MeohgrdZWl/bhlsEwWOlDaOpKlFxXYtHXskOSbf+3fvZvJArgq5S7PNuG1oBxvuJ
+Xi5AzjHABYt3CziIawUtMS1dWojrnC+64WN3gf3ninVTt4k+xbqn2gZujdoAR/yn
+6JUYi3PZRU77H6xjCag+3+1kuKBx0EBFFdr85ZF8mauHAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAIW2/04fVCKbAv0BKaTdhj8HIG++0nmdA9PsDECgFyURwoh8M2nY
+rkViEKpFdl0s9+8wtj/cGhYVWru0g8Qm1Uo27pXElYIPgU4hm3988VopipwDT2DY
+xsxk+MdoP6KTRtSNJNKFMbuPYj/jr7n7MFJYiWgvOvZ/n/o4RSRHrGhOYVuYNeyn
+/ejprsKScl7RnhMg5dtMXt9qeGgIWW/heVImJJzDURNdsF4sDHD4qKhf3pDNRhHn
+99zu7PASZZerAxI9xXpDiD+of+jaX+uI2/zzap1sMVtlaInMICk/Sa1CL2tBGzY8
+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>
diff --git a/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml
new file mode 100644
index 00000000..0e53649e
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDLDCCAhSgAwIBAgIJAPWvhnhnIM07MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3NoaWJib2xldGgudW5pZmkuaXQwHhcNMTEwNTA5MTI0MTMyWhcNMzEwNTA5
+MTI0MTMyWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuaWZpLml0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlTYplVQaIDgOLjhY6W0ysUneVOsAhdD3
+nKOLZC6NO1CFlFB8gINO2i+SkTVkhQ2jFAjq9XXb9WBsqx2Ta4skroyM1I039R6z
+HVFAmtib4Ea8spGXhg87OnxiPaXijJ81d6ka3At+g0VQYJ5w7jC/cuRaT4sk3scc
+eiQlViLn1kdcUYyXQo54gtwBjEoNvlPfF/S9ljdyo/yU7/oz4SQrDuYThqV+xXCM
+4ZTRt0gWcEAdd+d3mpfohNrEuGptbVoD6gpBkG9ytl/UVnKpkd32JDWLxeDDNOQz
+H+PWA1KbjR2aM//87u7rq9WBgjufjwYzTT4nulbzl/Mur+eyUFF80QIDAQABo20w
+azBKBgNVHREEQzBBghNzaGliYm9sZXRoLnVuaWZpLml0hipodHRwczovL3NoaWJi
+b2xldGgudW5pZmkuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHnEVLfzRW+Y
+o/M/MOvtO3S+knB3MA0GCSqGSIb3DQEBBQUAA4IBAQCM8asqBBYAnVvJXtFEfuyM
+qNAqiwomAQ1YPTPj4tD0w9EK9aMqJN4OCo/3Dy4fuHx4F9xAtWApP8cRvUswCURu
+saq1eUJ4Oay+ck1AxKl93EueGJxk46ZLUjizspod/N5U342IYKAIMTV2EZxKaLGD
+0yF4A47fZKHJSY+L0MaonVdOleDN1dsICwYbCo5xvhaV+QlW+10orfGhe+JqMm9T
+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>
+MIIDLDCCAhSgAwIBAgIJAPWvhnhnIM07MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3NoaWJib2xldGgudW5pZmkuaXQwHhcNMTEwNTA5MTI0MTMyWhcNMzEwNTA5
+MTI0MTMyWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuaWZpLml0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlTYplVQaIDgOLjhY6W0ysUneVOsAhdD3
+nKOLZC6NO1CFlFB8gINO2i+SkTVkhQ2jFAjq9XXb9WBsqx2Ta4skroyM1I039R6z
+HVFAmtib4Ea8spGXhg87OnxiPaXijJ81d6ka3At+g0VQYJ5w7jC/cuRaT4sk3scc
+eiQlViLn1kdcUYyXQo54gtwBjEoNvlPfF/S9ljdyo/yU7/oz4SQrDuYThqV+xXCM
+4ZTRt0gWcEAdd+d3mpfohNrEuGptbVoD6gpBkG9ytl/UVnKpkd32JDWLxeDDNOQz
+H+PWA1KbjR2aM//87u7rq9WBgjufjwYzTT4nulbzl/Mur+eyUFF80QIDAQABo20w
+azBKBgNVHREEQzBBghNzaGliYm9sZXRoLnVuaWZpLml0hipodHRwczovL3NoaWJi
+b2xldGgudW5pZmkuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHnEVLfzRW+Y
+o/M/MOvtO3S+knB3MA0GCSqGSIb3DQEBBQUAA4IBAQCM8asqBBYAnVvJXtFEfuyM
+qNAqiwomAQ1YPTPj4tD0w9EK9aMqJN4OCo/3Dy4fuHx4F9xAtWApP8cRvUswCURu
+saq1eUJ4Oay+ck1AxKl93EueGJxk46ZLUjizspod/N5U342IYKAIMTV2EZxKaLGD
+0yF4A47fZKHJSY+L0MaonVdOleDN1dsICwYbCo5xvhaV+QlW+10orfGhe+JqMm9T
+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>
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
new file mode 100644
index 00000000..42edac78
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.univ-corse.fr-idp-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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="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>
+					      MIIDSzCCAjOgAwIBAgIUMl8XYihMN+c1fr7Z/kwhIqchZ14wDQYJKoZIhvcNAQEF
+BQAwIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC51bml2LWNvcnNlLmZyMB4XDTEwMDUy
+MDA4MjIyOFoXDTMwMDUyMDA4MjIyOFowIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC51
+bml2LWNvcnNlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmBAW
+WcnpElNR57uUh2Eb7CEy5InpGkloYXu6jUpiZGV/vIM+dB0n2n/gWLLy5G2ME0Om
+clCBmVWG3uDMNZZyC6EBiEoBWbyj6Af93eEOscjfXXSMWgg0Atmyh84/HZWemhM3
+od2NXDRgHRpJ8ZjZ0VcQE4YNjh7kk5yDaFIoHPqpVK5ItNpZfk1nQ6gYHTsuAe9z
+6UDYE/fXOqF2+TO3Q+XG8+aRjcf0g+y2PaZnv8eSJGRYG3412oJEG4MggFmsAWkc
+lCLEiyMk325+7/8tKY5n/Rnd7jCuLEAqZMo2R/PlwbUO7kf5tcRoWaoKeBtjeweP
+LoIqXeXDkYQB93Q+MQIDAQABo3cwdTBUBgNVHREETTBLghhzaGliYm9sZXRoLnVu
+aXYtY29yc2UuZnKGL2h0dHBzOi8vc2hpYmJvbGV0aC51bml2LWNvcnNlLmZyL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBStZw7/ALbTOYIUU68SwgUXNM+5LTANBgkq
+hkiG9w0BAQUFAAOCAQEAjzOt2lHyqGXgYtxbu8D4aCdJfCgT9dKcN3zfZLJKUUBk
+w5QRiOoz4AKj/QWqYucmWu4KElu6J8GDKsAblw5IGkMto1Pf+hIogTgqSXaFd9/O
+tu/fwQ4sWsVZIl8MeC735h6C+NK4d3cCB+0fHRJFZ4mriZG9tGHmUHFB4rqn27JK
+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>
+					      MIIDSzCCAjOgAwIBAgIUMl8XYihMN+c1fr7Z/kwhIqchZ14wDQYJKoZIhvcNAQEF
+BQAwIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC51bml2LWNvcnNlLmZyMB4XDTEwMDUy
+MDA4MjIyOFoXDTMwMDUyMDA4MjIyOFowIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC51
+bml2LWNvcnNlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmBAW
+WcnpElNR57uUh2Eb7CEy5InpGkloYXu6jUpiZGV/vIM+dB0n2n/gWLLy5G2ME0Om
+clCBmVWG3uDMNZZyC6EBiEoBWbyj6Af93eEOscjfXXSMWgg0Atmyh84/HZWemhM3
+od2NXDRgHRpJ8ZjZ0VcQE4YNjh7kk5yDaFIoHPqpVK5ItNpZfk1nQ6gYHTsuAe9z
+6UDYE/fXOqF2+TO3Q+XG8+aRjcf0g+y2PaZnv8eSJGRYG3412oJEG4MggFmsAWkc
+lCLEiyMk325+7/8tKY5n/Rnd7jCuLEAqZMo2R/PlwbUO7kf5tcRoWaoKeBtjeweP
+LoIqXeXDkYQB93Q+MQIDAQABo3cwdTBUBgNVHREETTBLghhzaGliYm9sZXRoLnVu
+aXYtY29yc2UuZnKGL2h0dHBzOi8vc2hpYmJvbGV0aC51bml2LWNvcnNlLmZyL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBStZw7/ALbTOYIUU68SwgUXNM+5LTANBgkq
+hkiG9w0BAQUFAAOCAQEAjzOt2lHyqGXgYtxbu8D4aCdJfCgT9dKcN3zfZLJKUUBk
+w5QRiOoz4AKj/QWqYucmWu4KElu6J8GDKsAblw5IGkMto1Pf+hIogTgqSXaFd9/O
+tu/fwQ4sWsVZIl8MeC735h6C+NK4d3cCB+0fHRJFZ4mriZG9tGHmUHFB4rqn27JK
+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://unknown.site.com</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
new file mode 100644
index 00000000..4553b606
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.univ-evry.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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="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>
+					      MIIDRzCCAi+gAwIBAgIUAq2mpKTxqh6qstX6eHwrmooVbmMwDQYJKoZIhvcNAQEF
+BQAwIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC51bml2LWV2cnkuZnIwHhcNMTAwOTI0
+MTA0OTA0WhcNMzAwOTI0MTA0OTA0WjAiMSAwHgYDVQQDExdzaGliYm9sZXRoLnVu
+aXYtZXZyeS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJp52EEk
+t5jLp2Fdl+FW8WxlusVfSKNpnmDCk08OeoWrF+6oxlfGzRxK87iUGawBhHx9Q3Iv
+pDyxfCBr6Cl8uLD1B881s1HF79T5iNeNS42MwGCjYxDmnDK1Jc1DcNDP8e5wfvBL
+2fT8WSjajtOOy+KXFltTsIcoenaCLcPb3l3EBpxmQQdgLwWb886kExL6oeYXxtXs
+DlTo6jzVCtFRxw9JMx7DaaxlPGHLBkGuUjYV6HJ1lX9N9lKzLt5C8QP+zlvaNj4l
+l4NWnvoxZ6b6tmB8A3yOv6YJNZmJEztCWr5szNuLIHV1Ps//jinag738uxQVsH2b
+gYAkC5aLCdheVnMCAwEAAaN1MHMwUgYDVR0RBEswSYIXc2hpYmJvbGV0aC51bml2
+LWV2cnkuZnKGLmh0dHBzOi8vc2hpYmJvbGV0aC51bml2LWV2cnkuZnIvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFEWCfI5AXn3/RakH6dnpRYDa2t9VMA0GCSqGSIb3
+DQEBBQUAA4IBAQBLNO5vu0/3c4pxRULtvx6c/OUQQQcjiPraIvVQVrnEb24aGKs7
+pIHGnk3VnyPaieODwif5KDUqQc3fkG0tXIUVshI4aRzopVL4qFDfwi7KbpDS6nUC
+cRyZSJ4Xp6SYPhadkK49sLSe9lf5tdcn8Kr6EpAL3uvQx45HdtzV9CI1KS8nI/ZE
++pvpXfptS9ZSrvsEz2SP9KjeEzSWiBTfCmGkKVxTPTiq/Qrg9Ceeoep8sj39Dh6Z
+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://unknown.site.com</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-paris-est.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..5cdcbf22
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr-idp-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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="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>
+					      MIIDXDCCAkSgAwIBAgIVAN+DxU7o62WL7i36RkN6D6PRm0jqMA0GCSqGSIb3DQEB
+BQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgudW5pdi1wYXJpcy1lc3QuZnIwHhcN
+MTIwNzA0MDcyMjAwWhcNMzIwNzA0MDcyMjAwWjAnMSUwIwYDVQQDExxzaGliYm9s
+ZXRoLnVuaXYtcGFyaXMtZXN0LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAkrTsAnTcBP9CxCVbjCyA74Nl/zSOMm1L3Iy6DHDAKHvDdpj+RwrrhmQW
+sFBn6HqmSkCe6uO+7NwWfCIF5h0PdvRFNCfAQNLv6k5d3PU6Ala8gIKrUuviQUul
+AMd2JsGoVhbUB2ieQFWn8CrBkjFbvuLBd4Dlgmiw/mveqwiLapzmi/CRHcHQOSiP
+eDl7p9bUXfpYkJN0974ptVB6phGMyVWpW1q1n61W/xN84NCOCeo0yMNqGRkhJfyN
+hrczmA5QFL3QF11imB3Y6kHZFkBRSSr0B+0FvKjxgfej3C7P0KWNmeYPPHxhYKmx
+G0Sii5++F5IdUiLgpA5b6SHVLrDHiwIDAQABo38wfTBcBgNVHREEVTBTghxzaGli
+Ym9sZXRoLnVuaXYtcGFyaXMtZXN0LmZyhjNodHRwczovL3NoaWJib2xldGgudW5p
+di1wYXJpcy1lc3QuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCmKWcbQVqe7
+UnO+QpVcDdKOFRGzMA0GCSqGSIb3DQEBBQUAA4IBAQAEQTnWIsJCaKZp8hJvMkwp
+3TBuf0rF8MvQlF2zAXb6ZsWLl41tEYZxFOFMny0GR7JjfWQqKWr7Db/R13e6xFiy
+vlRibUEZS3cR/1TtOEj7PqttNuZrWJVAgBzAHHgJPyWz9C3Q8d474YVHwJsYCDIY
+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>
+					      MIIDXDCCAkSgAwIBAgIVAN+DxU7o62WL7i36RkN6D6PRm0jqMA0GCSqGSIb3DQEB
+BQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgudW5pdi1wYXJpcy1lc3QuZnIwHhcN
+MTIwNzA0MDcyMjAwWhcNMzIwNzA0MDcyMjAwWjAnMSUwIwYDVQQDExxzaGliYm9s
+ZXRoLnVuaXYtcGFyaXMtZXN0LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAkrTsAnTcBP9CxCVbjCyA74Nl/zSOMm1L3Iy6DHDAKHvDdpj+RwrrhmQW
+sFBn6HqmSkCe6uO+7NwWfCIF5h0PdvRFNCfAQNLv6k5d3PU6Ala8gIKrUuviQUul
+AMd2JsGoVhbUB2ieQFWn8CrBkjFbvuLBd4Dlgmiw/mveqwiLapzmi/CRHcHQOSiP
+eDl7p9bUXfpYkJN0974ptVB6phGMyVWpW1q1n61W/xN84NCOCeo0yMNqGRkhJfyN
+hrczmA5QFL3QF11imB3Y6kHZFkBRSSr0B+0FvKjxgfej3C7P0KWNmeYPPHxhYKmx
+G0Sii5++F5IdUiLgpA5b6SHVLrDHiwIDAQABo38wfTBcBgNVHREEVTBTghxzaGli
+Ym9sZXRoLnVuaXYtcGFyaXMtZXN0LmZyhjNodHRwczovL3NoaWJib2xldGgudW5p
+di1wYXJpcy1lc3QuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCmKWcbQVqe7
+UnO+QpVcDdKOFRGzMA0GCSqGSIb3DQEBBQUAA4IBAQAEQTnWIsJCaKZp8hJvMkwp
+3TBuf0rF8MvQlF2zAXb6ZsWLl41tEYZxFOFMny0GR7JjfWQqKWr7Db/R13e6xFiy
+vlRibUEZS3cR/1TtOEj7PqttNuZrWJVAgBzAHHgJPyWz9C3Q8d474YVHwJsYCDIY
+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://unknown.site.com</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
new file mode 100644
index 00000000..3c652e54
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.univ-savoie.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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="fr">Université de Savoie</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDUDCCAjigAwIBAgIVAOCN4YQhvq5Sv3vtQso0xMZI5ttnMA0GCSqGSIb3DQEB
+BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgudW5pdi1zYXZvaWUuZnIwHhcNMTIw
+NjA4MTMzMzIwWhcNMzIwNjA4MTMzMzIwWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
+LnVuaXYtc2F2b2llLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+h/Lp4hxtoYybi7jGd4Kz/DRgpdKdfRE4OAoYzhejo67XVyQxHXgR02HodAroX54a
+WePk5fNovnQn/IhGFCVKrvLpoRVc3LB6CpGdkTRsK7ytoM27mHHIEjw8WkA72Zpp
+YcuxyVqHmXkrOM8o2BO6gB9LHscMcAyym7mJViKP3UX0qeur6qkSV57jFMm58lXx
+3QneHV4QC7LAu0up9dg8JBFR24fiUxWWMQW52dN2akzDZAnlpUuk6tXs8jtKOlCm
+ijyb4lC5d8BjytJrND/L80FtToFb+kN1/Lzo8/Z33dgQiYCt1UDI2ow4ffzRhK98
+zHOY3ut2l9pNlnF/qa0cbwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
+LnVuaXYtc2F2b2llLmZyhjBodHRwczovL3NoaWJib2xldGgudW5pdi1zYXZvaWUu
+ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDrclfWLO3Mi8ua3uUmtjqaKn6m+
+MA0GCSqGSIb3DQEBBQUAA4IBAQBztZW6PM4sJs6GEjKLjErybGaVbFCR8tTaTR9e
+q7xDCH4hgSYf9y0QhZnd2vjWqEwjNNr3CDz+pv1KYwBMq/suwisliWgW38vdF+Cs
+GYwkdO6IyIRgwJ9ZViYwzYsSSA4SYQ/dfLBG2iJyB/22gMjA7xW385fbWt3JbMFK
+W9owxoUf+fPjvX5Ty7b119CywDW9VRH4Z8S28n4nzg7uMhsFlS7O8tp2/37N8erp
++NlgMF1DgA8x2HmDU9K2W+cDxSf7STvLM+4I767LY4lCR6E6/w4SyobMV6/H5bWY
+fRpaYtLzzvazSNT3CXWP0kJT5+P6Ck0s8cpcMlV7frEEnL4u
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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é de Savoie</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Savoie</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unknown.site.com</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
new file mode 100644
index 00000000..9d1ab52d
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.univ-toulouse.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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="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>
+					      MIIDVzCCAj+gAwIBAgIUbiBTqjVuFrpcZlYOFXAV5Gkjxo8wDQYJKoZIhvcNAQEF
+BQAwJjEkMCIGA1UEAxMbc2hpYmJvbGV0aC51bml2LXRvdWxvdXNlLmZyMB4XDTEy
+MDgwNjE2NTI0N1oXDTMyMDgwNjE2NTI0N1owJjEkMCIGA1UEAxMbc2hpYmJvbGV0
+aC51bml2LXRvdWxvdXNlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAy9KO/R6+ULM1wnOCGj+j9i8QL0T6U+HG5hoKcK1H0MfUcyukRBVXLp6ICeqx
+JUifD3xjbZ+AcDD6TJZcCpXCXejQmadrl9DxQWd3M6mkeRqVR7gtoeOqRocQRcja
+JYBlzh7psgNLX7uET4uXmz38rVBO3NpIYLQuG65wKlZTMTPSxMQogcvWSRbIQ0RE
+xnDLfrumHYiM7KWM5GVzLUHXglDDOMBNjOG1xZuxa5ohFZbkSpIcEChQZrY6ZTkN
+1i6n3tC/8kq53YfTmvv99TB1RmjXPgZMnJFX4Ed36zodJhr+Jynxt6IYVsA93qu/
+N79fk1dZrKa15JEJQKLZarhexQIDAQABo30wezBaBgNVHREEUzBRghtzaGliYm9s
+ZXRoLnVuaXYtdG91bG91c2UuZnKGMmh0dHBzOi8vc2hpYmJvbGV0aC51bml2LXRv
+dWxvdXNlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQbAAEzAb1fawuGZY3z
+jqchRx7fNzANBgkqhkiG9w0BAQUFAAOCAQEARouJ8loz83h+XBcCZsj1ZaEe0pxi
+xtvXJu+V9ujSNcSp4VtpiNUgUhDcgb7vk5q/gpafgTgA4bae7lPLB1qbTnxKNl7u
+OKips5hzSQ3IQ9KA5YKG90c07/lhogp1lk0ZOLnamioOF2ZqY4KqinKXEQe2GA9K
+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://unknown.site.com</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.upmf-grenoble.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..02554b52
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr-idp-shibboleth.xml
@@ -0,0 +1,58 @@
+<?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>
+      <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: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>
+					      MIIDVzCCAj+gAwIBAgIUO1f61l32R6TuA6rB5vgAXHLdHFMwDQYJKoZIhvcNAQEF
+BQAwJjEkMCIGA1UEAxMbc2hpYmJvbGV0aC51cG1mLWdyZW5vYmxlLmZyMB4XDTEy
+MDYwNjEzNTYxMVoXDTMyMDYwNjEzNTYxMVowJjEkMCIGA1UEAxMbc2hpYmJvbGV0
+aC51cG1mLWdyZW5vYmxlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEApxQzW/bnlgZAvW5YGo5kkUHGQ7kmIH68l7JQJs/lpKGiFJ9J1dker2NpZAeM
+O4DXoPky5GYaLIUW7gB+rwV5rn/xdPcHXEoM6fk4Fo+UdAvAoCfy5+td7H2Vh9FN
+W01HShLqyP6L1t2wNRYYybSn6d1Bn8fmifPaj70AwpTjnIPcfzfoLJQ7cZ2FEiIs
+wncAb2WGIwUpVWff/i8tPFQFb17+DB9iZJZcuBNNutR+XL8ieEqKn1iRMFOacs0m
+lH5g4Upv5s2V+43DJY08+KhNT4ZTAuPDeeduHsR6xWaPJXMr1zIE8kojoI7xWVfi
+ueki9ESCMgGRdo1gxHvSAr0hZQIDAQABo30wezBaBgNVHREEUzBRghtzaGliYm9s
+ZXRoLnVwbWYtZ3Jlbm9ibGUuZnKGMmh0dHBzOi8vc2hpYmJvbGV0aC51cG1mLWdy
+ZW5vYmxlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS7nbtER24yD2pjgXdT
+K9fyXANcdTANBgkqhkiG9w0BAQUFAAOCAQEAWC0ENJVG41ftYyD19+p0d1Ij0kfQ
+Xz86gMzPL/738R1fdrfgDG33nm95lR98v0+MrxwANS7ah9173mxGFY+otLFCwMdb
+5A8+SFx3HTdJmCyiQ0cE7KcWKp2H7t+Y/9rpF9YCw2DQ9SjsdmqdPHnmrNlYBtQN
+7TXRykcIk9vJpCtq5G265MQ9fVkvutx0dFmhkwIB03HwX91V7EQyKFPS7BsMfu50
+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://unknown.site.com</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
new file mode 100644
index 00000000..3b7a4c27
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ups-tlse.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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="fr">Université de Toulouse 3 - Paul Sabatier</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDQzCCAiugAwIBAgIUdyy5eL0UrTjscSSpJnKojdThIJcwDQYJKoZIhvcNAQEF
+BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aC51cHMtdGxzZS5mcjAeFw0wOTA1MTkw
+NzIzMTNaFw0yOTA1MTkwNzIzMTNaMCExHzAdBgNVBAMTFnNoaWJib2xldGgudXBz
+LXRsc2UuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDSYueWm19
+K3YtiKE5xRc4CKFGp/aYCA+JIcqXXK7+ky65enp2ObjeYDf2MOcHyiRCNW122y5p
+Ek4UXqWk+tagZ2WOGTszb2Rw7WCWIM7Z+bCfwjtTplv3DEFgj+gCAo6nIBbTSLmt
+sCjT95ZxCXxADhXzfjnrrOls7ySgGLQc5yd/lvnlF5l+EDM8uXqoQtfpxuAhFTUE
+aXJwSqvV4uEX7eyTJQuYcXerMP0BxURRTKayufMqAs6cIxck8DS28b5x0nnt3zTL
+JcVsc19rxk7AQT5eSGMQLmdq+FQh6hFX0AMo06/7Qd0z1cTWSXNN8LXD+tTDsHAj
+vPvpa1SpFyjdAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGgudXBzLXRs
+c2UuZnKGLWh0dHBzOi8vc2hpYmJvbGV0aC51cHMtdGxzZS5mci9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUnJKnH/FGOsBSsn6uVbMZZ0wO/IYwDQYJKoZIhvcNAQEF
+BQADggEBABgI82Q35fXOPU4JxpA1zRehoH8Y70OZmtDy+OxfoYZ8HHBO1ZXtlFJ6
+rSQtUHvPKR8VUZy8/Z4D5/FncTTLf/LOhisWHk/BOXJNV3KfOE8aVcQAZd2BzQtf
+396ZSsY0HBdgsEGBoWxuZcUeiaI4wzomtE4OfXRngBccgd6580JerqmON7fLytQK
+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://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Christophe Marteau</md:SurName>
+    <md:EmailAddress>christophe.marteau@univ-tlse3.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Pole enseignement-recherche</md:SurName>
+    <md:EmailAddress>dsrt.ger@univ-tlse3.fr</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
new file mode 100644
index 00000000..e4b7813f
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.utb.cz-idp-shibboleth.xml
@@ -0,0 +1,122 @@
+<?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>
+      <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>
+MIIDMDCCAhigAwIBAgIVAPR52o0qmfjhfAJboYmgUpU/SqjDMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXNoaWJib2xldGgudXRiLmN6MB4XDTExMTEwMzEyMjk0
+N1oXDTMxMTEwMzEyMjk0N1owHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC51dGIuY3ow
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFRk1W6FPOnadCPc4c7A2l
+KQCxuFDyLR8N0xl5zO3tpTZigrINz67uhtiBuKf9rjGggMpis6UeciCE3/AkPIVX
+k7qfj/UiLmcTjYZIsTDI5mcSTRpaq5vYJdz0X2CisSikn25wg3cUbKUdBNWT8T0b
+LrhAUO4ggx9A9tA0vtwg6a2bIUFoGFcbL/Id2isGMzz2rbUxHv++QJTxPNzXwL4A
+wLooYQs4lAUryfnjtoQxfnvi5HqrKs5e1+fv3IvTCLobBwfkXlQLeW6lSxFcPG9O
+nwByQ850LKah0Or8gQu2qrVFQzYv3GI8qXyMlqy9A/7d07O5Uv7szM1qjyVZh/ZN
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWJib2xldGgudXRiLmN6hihodHRwczov
+L3NoaWJib2xldGgudXRiLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTmmhOV
+wIQYpPgGpS7cKCtioshLgjANBgkqhkiG9w0BAQUFAAOCAQEAAMCQLFF/BWMlT1BV
+/GfVdWCg7oY7FR7VHJ3fH1FTKZvnrBcYy9TRu/D+TLqnpJCTn+7c3J3g7LgsTYC9
+R/wn2qxF0UpAmn932EDWWUPUshS8hA1M5Zro4yjR9qW7l4i063AE2DMrjcartZPk
+IpiDh7CMu+xJnggrA/8aComkgfBp+kCz2xQO86tw+wKzx37lm1WyPZuqlIzpJlhJ
+IFlWgY0cksTWiNm1xra51au80h26ax/qoIO7VdYFZ1MHWOqOio57l2Nv14znaYPZ
+1Jh1bXQr/aq8Yjx95a7JoiiHOjXNS4PdSsMUUUxHALhpen2ceJrLSfFbSnqS7k3u
+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>
+MIIDMDCCAhigAwIBAgIVAPR52o0qmfjhfAJboYmgUpU/SqjDMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXNoaWJib2xldGgudXRiLmN6MB4XDTExMTEwMzEyMjk0
+N1oXDTMxMTEwMzEyMjk0N1owHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC51dGIuY3ow
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFRk1W6FPOnadCPc4c7A2l
+KQCxuFDyLR8N0xl5zO3tpTZigrINz67uhtiBuKf9rjGggMpis6UeciCE3/AkPIVX
+k7qfj/UiLmcTjYZIsTDI5mcSTRpaq5vYJdz0X2CisSikn25wg3cUbKUdBNWT8T0b
+LrhAUO4ggx9A9tA0vtwg6a2bIUFoGFcbL/Id2isGMzz2rbUxHv++QJTxPNzXwL4A
+wLooYQs4lAUryfnjtoQxfnvi5HqrKs5e1+fv3IvTCLobBwfkXlQLeW6lSxFcPG9O
+nwByQ850LKah0Or8gQu2qrVFQzYv3GI8qXyMlqy9A/7d07O5Uv7szM1qjyVZh/ZN
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWJib2xldGgudXRiLmN6hihodHRwczov
+L3NoaWJib2xldGgudXRiLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTmmhOV
+wIQYpPgGpS7cKCtioshLgjANBgkqhkiG9w0BAQUFAAOCAQEAAMCQLFF/BWMlT1BV
+/GfVdWCg7oY7FR7VHJ3fH1FTKZvnrBcYy9TRu/D+TLqnpJCTn+7c3J3g7LgsTYC9
+R/wn2qxF0UpAmn932EDWWUPUshS8hA1M5Zro4yjR9qW7l4i063AE2DMrjcartZPk
+IpiDh7CMu+xJnggrA/8aComkgfBp+kCz2xQO86tw+wKzx37lm1WyPZuqlIzpJlhJ
+IFlWgY0cksTWiNm1xra51au80h26ax/qoIO7VdYFZ1MHWOqOio57l2Nv14znaYPZ
+1Jh1bXQr/aq8Yjx95a7JoiiHOjXNS4PdSsMUUUxHALhpen2ceJrLSfFbSnqS7k3u
+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>
diff --git a/swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..16c2be9b
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.xml
@@ -0,0 +1,55 @@
+<?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>
+      <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="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>
+					      MIIDMzCCAhugAwIBAgIUMO6BFdwk5alVPNeSspXonkZTWeswDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSc2hpYmJvbGV0aC51dnNxLmZyMB4XDTEwMTAwNTExMTQw
+MFoXDTMwMTAwNTExMTQwMFowHTEbMBkGA1UEAxMSc2hpYmJvbGV0aC51dnNxLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo1ZxxeymEkqEnXapufkc
+UEfhQXv/1iuIwtD+7rcxG6+QJsAM7h+3U6UqmJ76/c2xkkMT2+87E+TYUD2ISZh+
+ByajOxOeXJZJAZ+o/pHg4AZy1x+DyNJEweOARipGh4TqWeaUPNCtGzriVmfv5dBp
+FX3/eh7hLNSUFfOldVWuU2NLV9uWK0XHMIvT89/X3O7wNYI9nPT4vuJMyWkqpAIP
+TBykD3LFDNyIBzhtVoStJ7/uOAX4L52obU3j3HkuM9uac67pB/7b8FJzRdOHsP+K
+gxhGIPmFO19IelN8PegCSi3yZy6m3bikydI+SJo5ib8Gq8HKYUcg7SrP+T0NI+M8
+LQIDAQABo2swaTBIBgNVHREEQTA/ghJzaGliYm9sZXRoLnV2c3EuZnKGKWh0dHBz
+Oi8vc2hpYmJvbGV0aC51dnNxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTg
+inmoBiTrLzklizIwevMDHFTLfzANBgkqhkiG9w0BAQUFAAOCAQEAY4zjJzGjeWdX
+Mgqsoi30wmKnJFY3nwC2pdPnlwgMxP7PRVG8hmNTNjT3Jo5h5HmTQIPa1RhoCIXw
+2FUL8mMkEfxUsXwvn+H5GzmplenZxF2600TSFmx0Ic0+gd3TJCgJcB9N6CrkR1S/
+C1FLA1wgCxeTsi+KmGq0JNFvQAHIBwG6SwwHuCVWY97C3gaBpILCbZoeJw31Niw5
+5qJF/OGV6Pk7AkhK7ZMH0ptOIL2qiUmkUl4x5nU0Dk81rzc5tQVzHUIUfnzAtayv
+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://unknown.site.com</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.webbased.co.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.webbased.co.uk-shibboleth.xml
new file mode 100644
index 00000000..66f4c159
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.webbased.co.uk-shibboleth.xml
@@ -0,0 +1,120 @@
+<?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>
+    <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>
+      <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>
+						MIIFpDCCA4wCCQCP8vR8IUmCBDANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMC
+						R0IxDjAMBgNVBAgTBURldm9uMREwDwYDVQQHEwhQbHltb3V0aDEVMBMGA1UEChMM
+						V2ViYmFzZWQgTHRkMSIwIAYDVQQDExlzaGliYm9sZXRoLndlYmJhc2VkLmNvLnVr
+						MSYwJAYJKoZIhvcNAQkBFhduZXRhZG1pbkB3ZWJiYXNlZC5jby51azAeFw0xMTA2
+						MjExNDA4MTBaFw0yMTA2MTgxNDA4MTBaMIGTMQswCQYDVQQGEwJHQjEOMAwGA1UE
+						CBMFRGV2b24xETAPBgNVBAcTCFBseW1vdXRoMRUwEwYDVQQKEwxXZWJiYXNlZCBM
+						dGQxIjAgBgNVBAMTGXNoaWJib2xldGgud2ViYmFzZWQuY28udWsxJjAkBgkqhkiG
+						9w0BCQEWF25ldGFkbWluQHdlYmJhc2VkLmNvLnVrMIICIjANBgkqhkiG9w0BAQEF
+						AAOCAg8AMIICCgKCAgEAoC+KXQB15Io1DiDBUVorELHad4huNa0iADzNBmAT+tyS
+						SYgGLHswOKHyI5Koe6DEMTJzJ5xbVXk0cRTxUGUZw1GTQ8Y4Dv4U6CmlxE6DlMpy
+						mdhSWGBO3ox02xb0IXAodJJA8bumHJe9wXaUM60QAnrFWfKpnEHC92jWGLLM2b/4
+						pgL0pWmus4yCSCYYVk9OVrJm71al1XKfYAtva6DdTISpP2+oVzS+Oj5MhCrS/ZDP
+						oGe5H9r1zG01fvBmoSjcVRqhQwfzynsWJxoGn+j3uWNmylGuaA4HHDD2a8ISbA+w
+						84bp1OEVsLtghBCYfzyourS8qABWdph2mMiegT+ZONfo4pwEoUGqxhSQrSaIXfYQ
+						NW8p5SkIRQwHdIM0+DZEAWXrH175FiLAvK9DhrKGuzmmMZb4ZLgS7dM8brszh1Mm
+						9OLDA/ihqIaKnCyTVvqVmJ29X52dbEXAKYyXNWBiWpjsPJtsVQQCKdrHCkG+byPx
+						JgG7pRiCFWmArV8htmh0++IUWFx+Y9ttNv6nXYRCuKw3dAx8X39TX3EGfcTkANtR
+						vU3atZ+o9/Fs6gL3uXI7dFsir5Ul455yLMHRGUjnxCzqR8Dm7TlPqrYRdPPne5hp
+						oaxLDBdi0krH0JojC1GfIZZT2X0xTN91e80qLgk6mNGcvwfqfi13PIOtprOUDDEC
+						AwEAATANBgkqhkiG9w0BAQUFAAOCAgEATRfmcssmq5kPyMR040q5OQVjdkDn6+pQ
+						57ZJoV34kWB/wctzLrJxxKx6L/0FY73cahEGax5fvGhFwI1D+ie/gBg6KNHn2+JI
+						USoe6gqePe9GkxWFxAIt5ix+xjN4KSe+VBhXyEKS4hBy4UdzNEYp/cdQOv45Bcb9
+						GjsI+mB5ixVVCsmyRURQhZkUSG5n7Jk7Pneo4GeaMqe7SkPoJf2R1rcTuKp9FD6/
+						WcCQ7szqO4Pvl00kQJLknCrQ1E3o3Uq1vG+9CQ/j4+aU2NX5zSUL8qMfCD+JvS6d
+						o0fcTsXPBRLdJ2/jF2lpc2x2QqwOMkkJwV12gkDwKaELrpy4qlKmq95Cv+ZbypM8
+						CNUXpbjNpY3h8QKHEKRR7gIpJwYTRoCYSoCzGxfxRf6p1KhoJhdnsctp9i0vutth
+						BvwS9Pa4G70DWK0OEAdIlq9IzoS9wrpwnTxqh/3r2Tc2UI2jBMIIc4bO4I/3iKFm
+						N/9pdhtg/I+5E1Z31TZKsITn6of95kq7QtLnUljDS/JzfVxbR4qiNj+ykM1d/xl3
+						+Uspyfhao9S5Uyk1W8N4oqmy29fTYGZOdFHhz/zohW3pe5pRD3xG1DmvQM3ITw6s
+						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>
+						MIIFpDCCA4wCCQCP8vR8IUmCBDANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMC
+						R0IxDjAMBgNVBAgTBURldm9uMREwDwYDVQQHEwhQbHltb3V0aDEVMBMGA1UEChMM
+						V2ViYmFzZWQgTHRkMSIwIAYDVQQDExlzaGliYm9sZXRoLndlYmJhc2VkLmNvLnVr
+						MSYwJAYJKoZIhvcNAQkBFhduZXRhZG1pbkB3ZWJiYXNlZC5jby51azAeFw0xMTA2
+						MjExNDA4MTBaFw0yMTA2MTgxNDA4MTBaMIGTMQswCQYDVQQGEwJHQjEOMAwGA1UE
+						CBMFRGV2b24xETAPBgNVBAcTCFBseW1vdXRoMRUwEwYDVQQKEwxXZWJiYXNlZCBM
+						dGQxIjAgBgNVBAMTGXNoaWJib2xldGgud2ViYmFzZWQuY28udWsxJjAkBgkqhkiG
+						9w0BCQEWF25ldGFkbWluQHdlYmJhc2VkLmNvLnVrMIICIjANBgkqhkiG9w0BAQEF
+						AAOCAg8AMIICCgKCAgEAoC+KXQB15Io1DiDBUVorELHad4huNa0iADzNBmAT+tyS
+						SYgGLHswOKHyI5Koe6DEMTJzJ5xbVXk0cRTxUGUZw1GTQ8Y4Dv4U6CmlxE6DlMpy
+						mdhSWGBO3ox02xb0IXAodJJA8bumHJe9wXaUM60QAnrFWfKpnEHC92jWGLLM2b/4
+						pgL0pWmus4yCSCYYVk9OVrJm71al1XKfYAtva6DdTISpP2+oVzS+Oj5MhCrS/ZDP
+						oGe5H9r1zG01fvBmoSjcVRqhQwfzynsWJxoGn+j3uWNmylGuaA4HHDD2a8ISbA+w
+						84bp1OEVsLtghBCYfzyourS8qABWdph2mMiegT+ZONfo4pwEoUGqxhSQrSaIXfYQ
+						NW8p5SkIRQwHdIM0+DZEAWXrH175FiLAvK9DhrKGuzmmMZb4ZLgS7dM8brszh1Mm
+						9OLDA/ihqIaKnCyTVvqVmJ29X52dbEXAKYyXNWBiWpjsPJtsVQQCKdrHCkG+byPx
+						JgG7pRiCFWmArV8htmh0++IUWFx+Y9ttNv6nXYRCuKw3dAx8X39TX3EGfcTkANtR
+						vU3atZ+o9/Fs6gL3uXI7dFsir5Ul455yLMHRGUjnxCzqR8Dm7TlPqrYRdPPne5hp
+						oaxLDBdi0krH0JojC1GfIZZT2X0xTN91e80qLgk6mNGcvwfqfi13PIOtprOUDDEC
+						AwEAATANBgkqhkiG9w0BAQUFAAOCAgEATRfmcssmq5kPyMR040q5OQVjdkDn6+pQ
+						57ZJoV34kWB/wctzLrJxxKx6L/0FY73cahEGax5fvGhFwI1D+ie/gBg6KNHn2+JI
+						USoe6gqePe9GkxWFxAIt5ix+xjN4KSe+VBhXyEKS4hBy4UdzNEYp/cdQOv45Bcb9
+						GjsI+mB5ixVVCsmyRURQhZkUSG5n7Jk7Pneo4GeaMqe7SkPoJf2R1rcTuKp9FD6/
+						WcCQ7szqO4Pvl00kQJLknCrQ1E3o3Uq1vG+9CQ/j4+aU2NX5zSUL8qMfCD+JvS6d
+						o0fcTsXPBRLdJ2/jF2lpc2x2QqwOMkkJwV12gkDwKaELrpy4qlKmq95Cv+ZbypM8
+						CNUXpbjNpY3h8QKHEKRR7gIpJwYTRoCYSoCzGxfxRf6p1KhoJhdnsctp9i0vutth
+						BvwS9Pa4G70DWK0OEAdIlq9IzoS9wrpwnTxqh/3r2Tc2UI2jBMIIc4bO4I/3iKFm
+						N/9pdhtg/I+5E1Z31TZKsITn6of95kq7QtLnUljDS/JzfVxbR4qiNj+ykM1d/xl3
+						+Uspyfhao9S5Uyk1W8N4oqmy29fTYGZOdFHhz/zohW3pe5pRD3xG1DmvQM3ITw6s
+						MlkmuDE86SLn6Pl2VHZsCJtNwZ6kVVRrQymRQjAQg24OEroEgBwpCF9SRFm61TfW
+						HJPUxmoTmWo=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..0404197e
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.westking.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						ExlzaGliYm9sZXRoLndlc3RraW5nLmFjLnVrMB4XDTE0MDQwOTA5NTIzMVoXDTM0
+						MDQwNDA5NTIzMVowgYYxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xGzAZ
+						BgNVBAcTEjIxMSBHcmF5cyBJbm4gUm9hZDElMCMGA1UEChMcV2VzdG1pbnN0ZXIg
+						S2luZ3N3YXkgQ29sbGVnZTEiMCAGA1UEAxMZc2hpYmJvbGV0aC53ZXN0a2luZy5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN7zCFR0dysInbEU
+						t/zyXqB++zmwMY8p6aZqQQ3lvHWVLPOTXNqXpEXygu6v+mlg2fV3SJhnJJcZU/uS
+						luUn9pAZooB5ROZv8I/IpPl2UH0d0v5qf0FNwnebH9RmGhtElkFSdplGEN1j8hux
+						X1jx6/693zj99WZPSWNpYMdFezMYnXjpVvU92GHO0C6iC6hwIaI+7RECgP0Ly8oy
+						RTvba+OAcPivfED7dTfFMj6H4vjC6nNjP71mqAjhd0yRr+4piJm0q94fREi2HvzZ
+						Hpu97MC717l3FOgtytKycjrOuw/YpVOuXaOdbUnEPlnc2BYg1h+1QFx+Rr1l0Py9
+						Jh1MPfUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAHj/mYxaOUqQyhiTnJrDAAfrj
+						zgUA6Eoiba5DDqQnKXh33wcQms3fAXRgAX05gzFWg3u8Vdhsy1ZqTpciehiJ1fLF
+						M8Xx1VkrRL5tfPGg/yVYCN5Xu8FQTzrlZ0LwVLXt92DjzaibfWDzFeraUXDdswFT
+						bKSORgtYFUWhQUplo8lZ5o/eDOyrhxktqBlRzfm6E8McZraYSEK67MGgKC+7npdD
+						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>
+						MIIDijCCAnICCQDsX92sZyIapDANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
+						R0IxDzANBgNVBAgTBkxvbmRvbjEbMBkGA1UEBxMSMjExIEdyYXlzIElubiBSb2Fk
+						MSUwIwYDVQQKExxXZXN0bWluc3RlciBLaW5nc3dheSBDb2xsZWdlMSIwIAYDVQQD
+						ExlzaGliYm9sZXRoLndlc3RraW5nLmFjLnVrMB4XDTE0MDQwOTA5NTIzMVoXDTM0
+						MDQwNDA5NTIzMVowgYYxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xGzAZ
+						BgNVBAcTEjIxMSBHcmF5cyBJbm4gUm9hZDElMCMGA1UEChMcV2VzdG1pbnN0ZXIg
+						S2luZ3N3YXkgQ29sbGVnZTEiMCAGA1UEAxMZc2hpYmJvbGV0aC53ZXN0a2luZy5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN7zCFR0dysInbEU
+						t/zyXqB++zmwMY8p6aZqQQ3lvHWVLPOTXNqXpEXygu6v+mlg2fV3SJhnJJcZU/uS
+						luUn9pAZooB5ROZv8I/IpPl2UH0d0v5qf0FNwnebH9RmGhtElkFSdplGEN1j8hux
+						X1jx6/693zj99WZPSWNpYMdFezMYnXjpVvU92GHO0C6iC6hwIaI+7RECgP0Ly8oy
+						RTvba+OAcPivfED7dTfFMj6H4vjC6nNjP71mqAjhd0yRr+4piJm0q94fREi2HvzZ
+						Hpu97MC717l3FOgtytKycjrOuw/YpVOuXaOdbUnEPlnc2BYg1h+1QFx+Rr1l0Py9
+						Jh1MPfUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAHj/mYxaOUqQyhiTnJrDAAfrj
+						zgUA6Eoiba5DDqQnKXh33wcQms3fAXRgAX05gzFWg3u8Vdhsy1ZqTpciehiJ1fLF
+						M8Xx1VkrRL5tfPGg/yVYCN5Xu8FQTzrlZ0LwVLXt92DjzaibfWDzFeraUXDdswFT
+						bKSORgtYFUWhQUplo8lZ5o/eDOyrhxktqBlRzfm6E8McZraYSEK67MGgKC+7npdD
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth.wmintelligence.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.wmintelligence.com-shibboleth.xml
new file mode 100644
index 00000000..41864aeb
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.wmintelligence.com-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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>
+						MIIDTzCCAjegAwIBAgIJAOR5X3M97uKJMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+						BAMTHXNoaWJib2xldGgud21pbnRlbGxpZ2VuY2UuY29tMB4XDTE0MDMyMjA0MDAy
+						OVoXDTE3MDMyMTA0MDAyOVowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC53bWludGVs
+						bGlnZW5jZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiRNxg
+						Ce6zMPijvEumDw+cb4Y/DUR8GPLV9HqiAN+0n0QKE/lZIa+kC3TxldgMrIkFjtle
+						gZ4iG7MCBvoAb8w2DPjrH5KwoyhLRRXKVEq8axmdeXU0CUJw+N6518vzKmQGv1GU
+						Rs8If5ctvvZi6LcZIUI09/fHPt1PehNUFzoCDN7RCE3xztWCIbFaDptDLrJ1oMqW
+						vbNbOnn07uyEtNYjAtI7mkR/A1fbYNTez0t+6GawtGmexwHCOT3UefOhRfGqBh+5
+						RM2VvZQH+vGxzqzg4qdDahF7FYi9r2OpxgTeebSmrZ7vjfRRt9TQ29oN1NyxgjJr
+						W5S+LhdfiIWqMOL3AgMBAAGjfDB6MFkGA1UdEQRSMFCCHXNoaWJib2xldGgud21p
+						bnRlbGxpZ2VuY2UuY29thi9odHRwOi8vc2hpYmJvbGV0aC53bWludGVsbGlnZW5j
+						ZS5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU6LfyT/3Hb1BITfsUmAwnzz3jX+0w
+						DQYJKoZIhvcNAQEFBQADggEBAGVK1LxrSZw5uwP6rjgaFGtFFjvdlPoyS3S7CTsj
+						9wpg7zs/gEoO+ptXeAcPkENgU7InUxfn3RVhB1sIit5UWRYCtNFBih4WZXCbmL0G
+						/9YOOmSGbEGpDrPCLmxYc8oVNFe5ks5+lOBqUZK15lPpgwQwlAX/c1Jn//BMte7c
+						gP556YvRParYU9E1zN+npL4c7pbLXPpkkpDTqJjplvCcnMbkD9e5LmexaRwy5CQa
+						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>
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
new file mode 100644
index 00000000..acf76c79
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.wolvcoll.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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>
+      <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>
+						MIIDTzCCAjegAwIBAgIUQ4d3Glz5yjW7FW9jd2mP9LsAUe8wDQYJKoZIhvcNAQEF
+						BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aC53b2x2Y29sbC5hYy51azAeFw0xNDA2
+						MjQwOTA1MTdaFw0zNDA2MjQwOTA1MTdaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgu
+						d29sdmNvbGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCl
+						AWQo9/uMAecnAsdN9csAGTK2489RtQ7rJcRbozcr64BT1/w1iuh+RrWWqACgoNJP
+						aC2cGGm4DAEtguZlxv/EIm2YhKNQaDSgA472GPHRLslb2pRfNVJyFRfKJeVn2H/L
+						/StgbnczUp1gj81bZpdT6LoT0kw6SBh42H4ktTQQcdchiLqapDdLl+mx/x6F+BuH
+						HH6Pa4TwIKyu7FM7sTKek/Q4PLrLuHDFP7rg43lqjL2pQntsF4cNPewN+bcQujKn
+						+aQ/sUzUtLsi0bAuTJeU0rPZgJtg5Y3XnmZTlHyVvyBODtQhXhU2OfYH2FWiEZmj
+						D886Zakepq44z9wE19c5AgMBAAGjeTB3MFYGA1UdEQRPME2CGXNoaWJib2xldGgu
+						d29sdmNvbGwuYWMudWuGMGh0dHBzOi8vc2hpYmJvbGV0aC53b2x2Y29sbC5hYy51
+						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUEPnyUWWLLersRzyV9z/bHlXyz0Ew
+						DQYJKoZIhvcNAQEFBQADggEBAJmDjexTbXsG8J5SYzXt8hda+nyrnlraOl6E6ql8
+						yIazs9Tg2nKgLhlAalyERD712mwL+lSE+qHHFifdSO44YuOgVNJ0e+vWxISrhNpt
+						d59kjd1l8b1ZeQ3P507rDz2Uw+cA5YxkEVdlBrkb9fR26kPXDsXiz1P1DhHh/Qt0
+						48PkIQdrwiSygWvNQGgMaB76XA3hqVyadpokVL/F1MFP2mKRIG4kGlDoV6iemLP6
+						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>
+						MIIDTzCCAjegAwIBAgIUQ4d3Glz5yjW7FW9jd2mP9LsAUe8wDQYJKoZIhvcNAQEF
+						BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aC53b2x2Y29sbC5hYy51azAeFw0xNDA2
+						MjQwOTA1MTdaFw0zNDA2MjQwOTA1MTdaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgu
+						d29sdmNvbGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCl
+						AWQo9/uMAecnAsdN9csAGTK2489RtQ7rJcRbozcr64BT1/w1iuh+RrWWqACgoNJP
+						aC2cGGm4DAEtguZlxv/EIm2YhKNQaDSgA472GPHRLslb2pRfNVJyFRfKJeVn2H/L
+						/StgbnczUp1gj81bZpdT6LoT0kw6SBh42H4ktTQQcdchiLqapDdLl+mx/x6F+BuH
+						HH6Pa4TwIKyu7FM7sTKek/Q4PLrLuHDFP7rg43lqjL2pQntsF4cNPewN+bcQujKn
+						+aQ/sUzUtLsi0bAuTJeU0rPZgJtg5Y3XnmZTlHyVvyBODtQhXhU2OfYH2FWiEZmj
+						D886Zakepq44z9wE19c5AgMBAAGjeTB3MFYGA1UdEQRPME2CGXNoaWJib2xldGgu
+						d29sdmNvbGwuYWMudWuGMGh0dHBzOi8vc2hpYmJvbGV0aC53b2x2Y29sbC5hYy51
+						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUEPnyUWWLLersRzyV9z/bHlXyz0Ew
+						DQYJKoZIhvcNAQEFBQADggEBAJmDjexTbXsG8J5SYzXt8hda+nyrnlraOl6E6ql8
+						yIazs9Tg2nKgLhlAalyERD712mwL+lSE+qHHFifdSO44YuOgVNJ0e+vWxISrhNpt
+						d59kjd1l8b1ZeQ3P507rDz2Uw+cA5YxkEVdlBrkb9fR26kPXDsXiz1P1DhHh/Qt0
+						48PkIQdrwiSygWvNQGgMaB76XA3hqVyadpokVL/F1MFP2mKRIG4kGlDoV6iemLP6
+						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>
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
new file mode 100644
index 00000000..8693a2b9
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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="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>
+					      MIIDYTCCAkmgAwIBAgIVAK1JJY+Vni1K2/Gj8TSecZ2nfA5OMA0GCSqGSIb3DQEB
+BQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgyLmNyb3VzLXBvaXRpZXJzLmZyMB4X
+DTEwMDYxODE2MTUxOVoXDTMwMDYxODE2MTUxOVowKDEmMCQGA1UEAxMdc2hpYmJv
+bGV0aDIuY3JvdXMtcG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCBCubIqgo0FUOM1f5vf5m3nQci9P++opOfsX5fmLp0bICTokfgFoOZ
+qEhQmhg/kLnibKyqKs7BqZtSJ+xaku9h7+ueSm1w2apw8QOVim+xe3ll8aymK7xb
+mdH4zW7B7Jks0zifo7e4nW4stsXfPUJOrCNXRdRET703nk6QN/Qiu17RWt88Uadu
+cGadx/AQRGeAZcYBR41LML9/U1xF1FsyuT/zdrN/fVZFnqXOrtEXxYEGRm3ozoNi
+gva/5phybzqwBnpc2SIyRpDuy902LI4WzOLkzeYtpo2lLI5WkoCsXohIMGoFAIj9
+itfNchnJBI4ECX1nJopd2qaxJUGK4uxDAgMBAAGjgYEwfzBeBgNVHREEVzBVgh1z
+aGliYm9sZXRoMi5jcm91cy1wb2l0aWVycy5mcoY0aHR0cHM6Ly9zaGliYm9sZXRo
+Mi5jcm91cy1wb2l0aWVycy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUaHXQ
+kgsbK/sw5gbIYYRKSjZpG2wwDQYJKoZIhvcNAQEFBQADggEBAGTaQjStIv9u9FoZ
+avsynkNcb346aklMcpI2DCN722bMnOEFszECCBUwEsV23E5n1n/7Axq1InKhpOiv
+T/W9JX1JkE/9aAd5z/oUz2yhhSK1LLz94CZ6UQdVnHXH7ipsHaQryVyO7b+13wcG
+v+jbjhaMv9VLvYGT+M8DiuyweuLEfE+pVHdheqAQoN7HULjW4qne/1BENMUb/vCi
+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>
+					      MIIEhDCCA2ygAwIBAgIRAOyWnKD1f6FGsnPww4j9GTkwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMjA1MDcwMDAwMDBaFw0xNTA1MDcyMzU5NTlaMFExCzAJBgNV
+BAYTAkZSMRowGAYDVQQKExFDUk9VUyBERSBQT0lUSUVSUzEmMCQGA1UEAxMdc2hp
+YmJvbGV0aDIuY3JvdXMtcG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCq8uXwSNtArSyErjq/oG7p0QL/ln1e+IEAI95cZwsSwHhdLJqq
+tTNrReMd59N9Py1QzszFEdwbXONtL9UsvAN0vMdGP+9sZMm23iDgAQn4vf994zhR
+zhY7igRMHO9QnpfWbjrWh0f+J83FdIzWfEUAVVz9WnzSacx1qgu+t91PaQtkTXl1
+XFd1DnYSYlVayUjFFIPQVCgMzLRrXmUWK1b88qieHUxlbMoZMi3nzvYA6Wn4NDyV
+lo+qRKV6vOgax3hS3qXsnA+uLp8zsj5skPy79Los8vkPPNvNRp+relTDlRZ7mxT/
+0z6K/ro3KUlZIVTfG3ZcqBGa+QbPtIqTKLT9AgMBAAGjggFwMIIBbDAfBgNVHSME
+GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUTexnzbEx0Nu56kKI
+nfaKkQfYNAEwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
+FAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0w
+OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwKAYDVR0RBCEwH4Idc2hpYmJvbGV0
+aDIuY3JvdXMtcG9pdGllcnMuZnIwDQYJKoZIhvcNAQEFBQADggEBAH96TmpWVsZ+
+Vx9ODPTwUZzJIx1aXaIKbGGo8u2J/Oitc836gQoJUNCGsOBPRSKI39074Dy/A5Pt
+a1xkTIbU48smyqjOaP7O7ZDDGD0naX921rfxNl26srCDhP8/nSgRvltS8ngPFPzc
+9yTu7AT7ByIdmJF0oU+tOsHqW1q4swkUWXSY4miFKP3lKYAXAwnFP6W+WrggXjzZ
+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://unknown.site.com</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.liv.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2.liv.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..cd0cdfe9
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2.liv.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?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>
+      <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>
+						MIIEoDCCA4igAwIBAgIQJbk5gu6nSkztgUHYXvoiSDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDUxNTAwMDAwMFoXDTE1MDUxNTIzNTk1OVowdjELMAkGA1UE
+						BhMCR0IxEDAOBgNVBAgTB0VuZ2xhbmQxEzARBgNVBAcTCk1lcnNleXNpZGUxIDAe
+						BgNVBAoTF1VuaXZlcnNpdHkgb2YgTGl2ZXJwb29sMR4wHAYDVQQDExVzaGliYm9s
+						ZXRoMi5saXYuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJ
+						sZZKdK6HqdTSrLnI3nCISEhOXVatafVfJ9s6YlJtWDZX4lH9gZCA+pas56phMwPq
+						Yn1zamA9ZrwB9M9ARCqTjNGL+9alxvlpnCBb1joH6WiBjBWq/oIjjg4ivkCAjJVl
+						Lc4C8rrLJ6JO6H+DlSdLY3wsmA6q6QYo6/S45yEacqR70m0tLJQHNo8H6cqNQLnb
+						RmcuxGIVj5oZuC/UetqfpWTaH6RIuORcu1xJV7HJQ8Rjso6LKED7O+A9VcjErsc1
+						I9Et6RFp/F+bYiqDYsvYe++O/mojeg6CtnDO6fsfKpD2GmZW/v58we9mDd3Tf6+3
+						UGy23r2NIm/4xxwNr9ZvAgMBAAGjggFoMIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPe
+						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUjl58Iov7wnp9WmmNXSmqmGx/qogwDgYD
+						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+						CCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAv
+						oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
+						bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
+						bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
+						dGNzLnRlcmVuYS5vcmcwIAYDVR0RBBkwF4IVc2hpYmJvbGV0aDIubGl2LmFjLnVr
+						MA0GCSqGSIb3DQEBBQUAA4IBAQANFYeXDWTtnC74o8GR0P0uDGeebDafYyTxGjZx
+						fP4svfDgr6tZqFXj3XhHeirwaqlI30nftbPP7eDpmJGm1dKEb6xh6p+NkeW5Kk8s
+						lXvhx+SHp0ikW8vVb6yUh2yXqHhmRAh+a37jekgShFPIAp3akv6D3WLRBLD8gTef
+						au7JGHQUmkRG10b7N1PX1Ah1W+woAcHTQrHYy1OGuFEJOG7RpXQpo+4vqSSgfzAp
+						Cnkp8o7O0+8d+k86AIYCezOpEiyyIGwlcHhCC9dlIvsuKihL2hWZPjwA3cgdkpmB
+						BEgw2V8ximLnmC/lT834ECXztNcbpgfWfj+1VCPZN1+rG08t
+					</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>
+						MIIEoDCCA4igAwIBAgIQJbk5gu6nSkztgUHYXvoiSDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMDUxNTAwMDAwMFoXDTE1MDUxNTIzNTk1OVowdjELMAkGA1UE
+						BhMCR0IxEDAOBgNVBAgTB0VuZ2xhbmQxEzARBgNVBAcTCk1lcnNleXNpZGUxIDAe
+						BgNVBAoTF1VuaXZlcnNpdHkgb2YgTGl2ZXJwb29sMR4wHAYDVQQDExVzaGliYm9s
+						ZXRoMi5saXYuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJ
+						sZZKdK6HqdTSrLnI3nCISEhOXVatafVfJ9s6YlJtWDZX4lH9gZCA+pas56phMwPq
+						Yn1zamA9ZrwB9M9ARCqTjNGL+9alxvlpnCBb1joH6WiBjBWq/oIjjg4ivkCAjJVl
+						Lc4C8rrLJ6JO6H+DlSdLY3wsmA6q6QYo6/S45yEacqR70m0tLJQHNo8H6cqNQLnb
+						RmcuxGIVj5oZuC/UetqfpWTaH6RIuORcu1xJV7HJQ8Rjso6LKED7O+A9VcjErsc1
+						I9Et6RFp/F+bYiqDYsvYe++O/mojeg6CtnDO6fsfKpD2GmZW/v58we9mDd3Tf6+3
+						UGy23r2NIm/4xxwNr9ZvAgMBAAGjggFoMIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPe
+						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUjl58Iov7wnp9WmmNXSmqmGx/qogwDgYD
+						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+						CCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAv
+						oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
+						bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
+						bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
+						dGNzLnRlcmVuYS5vcmcwIAYDVR0RBBkwF4IVc2hpYmJvbGV0aDIubGl2LmFjLnVr
+						MA0GCSqGSIb3DQEBBQUAA4IBAQANFYeXDWTtnC74o8GR0P0uDGeebDafYyTxGjZx
+						fP4svfDgr6tZqFXj3XhHeirwaqlI30nftbPP7eDpmJGm1dKEb6xh6p+NkeW5Kk8s
+						lXvhx+SHp0ikW8vVb6yUh2yXqHhmRAh+a37jekgShFPIAp3akv6D3WLRBLD8gTef
+						au7JGHQUmkRG10b7N1PX1Ah1W+woAcHTQrHYy1OGuFEJOG7RpXQpo+4vqSSgfzAp
+						Cnkp8o7O0+8d+k86AIYCezOpEiyyIGwlcHhCC9dlIvsuKihL2hWZPjwA3cgdkpmB
+						BEgw2V8ximLnmC/lT834ECXztNcbpgfWfj+1VCPZN1+rG08t
+					</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>
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
new file mode 100644
index 00000000..26ead730
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2.rwcmd.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?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>
+      <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
+						Ew1JVCBEZXBhcnRtZW50MSAwHgYDVQQDExdzaGliYm9sZXRoMi5yd2NtZC5hYy51
+						azEdMBsGCSqGSIb3DQEJARYOaXRAcndjbWQuYWMudWswHhcNMTQwMTE1MTE0MjM4
+						WhcNMjMxMDE1MTE0MjM4WjCBuzELMAkGA1UEBhMCR0IxEDAOBgNVBAgTB0NhcmRp
+						ZmYxEDAOBgNVBAcTB0NhcmRpZmYxLzAtBgNVBAoTJlJveWFsIFdlbHNoIENvbGxl
+						Z2Ugb2YgTXVzaWMgYW5kIERyYW1hMRYwFAYDVQQLEw1JVCBEZXBhcnRtZW50MSAw
+						HgYDVQQDExdzaGliYm9sZXRoMi5yd2NtZC5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						aXRAcndjbWQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDK
+						Lb1ki7lYC9VR+7oMZTbIxAM8xRp25olZgAX2sXp6huwiCuhIpQKdiSNaC/CY2ExZ
+						MtlABHncCP9yvaxZeQKsAlNi3LuPHtPoLwtfePDbaTxWgRt65yzKXYsdFCq5tSDa
+						rsRUSYyQPpdOzTolcwdyJBObpis3Mgzeg+Sid4rrDIVK+Ym+Z7CxC63O1eBgDi+8
+						C78moSRVzQjhywJtxQp2tcKOV9X21TE08+s3B9QLswV0rFqkyToaAMV0EfAdk0oh
+						oQXQXuqD7QnfHkaQw2vca6uQRjR5PEK9VRHV0J7XTglqK+elUbENyeYeAVqzHZ6n
+						KLmi8UcCPbvepguEL88fAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAK+dGhOQQSJ+
+						8OHwaQkkDUciMrYx5V3fGSTxO76ZrK4Ix/mD6iaRqvd1rxPaDfxXITC8qTQLjSFK
+						ihgzoQqRM4EbL4XBpyLQw6Z7wtxsrWmm7iQXA2p+w39c8myPl4nTfXI4aGKfMvpO
+						0Ee/EdEKxwC+QJ4WXiATs0V2+zWtsN2wOAbTw23MXKKQawAiDQpGZ7acpGFXrElS
+						cwH6hlJACBs1fsuXyjkrQGe636ZQdjK/v7wCFQXTzg6bW6WiqW0DtdKYxD7bLN6q
+						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>
+						MIID9DCCAtwCCQCCojb3OfH/lTANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+						R0IxEDAOBgNVBAgTB0NhcmRpZmYxEDAOBgNVBAcTB0NhcmRpZmYxLzAtBgNVBAoT
+						JlJveWFsIFdlbHNoIENvbGxlZ2Ugb2YgTXVzaWMgYW5kIERyYW1hMRYwFAYDVQQL
+						Ew1JVCBEZXBhcnRtZW50MSAwHgYDVQQDExdzaGliYm9sZXRoMi5yd2NtZC5hYy51
+						azEdMBsGCSqGSIb3DQEJARYOaXRAcndjbWQuYWMudWswHhcNMTQwMTE1MTE0MjM4
+						WhcNMjMxMDE1MTE0MjM4WjCBuzELMAkGA1UEBhMCR0IxEDAOBgNVBAgTB0NhcmRp
+						ZmYxEDAOBgNVBAcTB0NhcmRpZmYxLzAtBgNVBAoTJlJveWFsIFdlbHNoIENvbGxl
+						Z2Ugb2YgTXVzaWMgYW5kIERyYW1hMRYwFAYDVQQLEw1JVCBEZXBhcnRtZW50MSAw
+						HgYDVQQDExdzaGliYm9sZXRoMi5yd2NtZC5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						aXRAcndjbWQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDK
+						Lb1ki7lYC9VR+7oMZTbIxAM8xRp25olZgAX2sXp6huwiCuhIpQKdiSNaC/CY2ExZ
+						MtlABHncCP9yvaxZeQKsAlNi3LuPHtPoLwtfePDbaTxWgRt65yzKXYsdFCq5tSDa
+						rsRUSYyQPpdOzTolcwdyJBObpis3Mgzeg+Sid4rrDIVK+Ym+Z7CxC63O1eBgDi+8
+						C78moSRVzQjhywJtxQp2tcKOV9X21TE08+s3B9QLswV0rFqkyToaAMV0EfAdk0oh
+						oQXQXuqD7QnfHkaQw2vca6uQRjR5PEK9VRHV0J7XTglqK+elUbENyeYeAVqzHZ6n
+						KLmi8UcCPbvepguEL88fAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAK+dGhOQQSJ+
+						8OHwaQkkDUciMrYx5V3fGSTxO76ZrK4Ix/mD6iaRqvd1rxPaDfxXITC8qTQLjSFK
+						ihgzoQqRM4EbL4XBpyLQw6Z7wtxsrWmm7iQXA2p+w39c8myPl4nTfXI4aGKfMvpO
+						0Ee/EdEKxwC+QJ4WXiATs0V2+zWtsN2wOAbTw23MXKKQawAiDQpGZ7acpGFXrElS
+						cwH6hlJACBs1fsuXyjkrQGe636ZQdjK/v7wCFQXTzg6bW6WiqW0DtdKYxD7bLN6q
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth2.ufms.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2.ufms.br-idp-shibboleth.xml
new file mode 100644
index 00000000..66cdbeb3
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2.ufms.br-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIEDDCCAvQCAQAwDQYJKoZIhvcNAQEFBQAwgcsxODA2BgNVBAoTL1VuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvIGRvIFN1bC9VRk1TMQwwCgYDVQQL
+EwNOVEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGUubnRpQHVmbXMuYnIxFTATBgNV
+BAcTDENhbXBvIEdyYW5kZTEbMBkGA1UECBMSTWF0byBHcm9zc28gZG8gU3VsMQsw
+CQYDVQQGEwJCUjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5icjAeFw0xNDA0
+MTAxMjA1NTNaFw0xNzA0MDkxMjA1NTNaMIHLMTgwNgYDVQQKEy9Vbml2ZXJzaWRh
+ZGUgRmVkZXJhbCBkZSBNYXRvIEdyb3NzbyBkbyBTdWwvVUZNUzEMMAoGA1UECxMD
+TlRJMSIwIAYJKoZIhvcNAQkBFhNzdXBvcnRlLm50aUB1Zm1zLmJyMRUwEwYDVQQH
+EwxDYW1wbyBHcmFuZGUxGzAZBgNVBAgTEk1hdG8gR3Jvc3NvIGRvIFN1bDELMAkG
+A1UEBhMCQlIxHDAaBgNVBAMTE3NoaWJib2xldGgyLnVmbXMuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4/qfltMXAD1oXEDGUlbOVwwm4Yd7R4bgh
+i+ZU4OlPPPwzeTMe1dnCDypxxw93/5z6tj3iaYakMf/XVPh4GelknjH0nPiQL/Nb
+n+VL9Jx7xScZ//sl/Jr+IGzRl0TIpcWwJaJcIUfyAqKwkvlyvgB7z/78FYhgE/Fn
+8QNPrLQYmpEaiKGA1WkNe3o9U7t/b6xFgOOkZOhRC2jn8MBN+Kn5eUxH0waQk6ti
+HHZ80rH5ud8C6E0ocpkODEFWx5H2Xn5tU0PUn6RngVUEsqzgkQQbAk3tkRdD7d0g
+XG8NHTP74ocv0ivvv3BBpDDjSHlrYvUq5bV7zdPUXpVVlZGPFI2rAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAH10d5nog6/WojS/rTHB9L6KIwS2btcXXrwgGQymDMOw
+vQKwRXh0lPIpYeIYmsz7aO19HP09KxmEkpJfSbtJ0RAVtYeWvxYdOxRn5B0Tbq9m
+OLQTa+DiCDxNywlFsc5zwJkoeY0LFVVyuL9R+zHC6xjNP4qWN8CuBjY8WtRtXvIr
+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>
+      
+MIIEDDCCAvQCAQAwDQYJKoZIhvcNAQEFBQAwgcsxODA2BgNVBAoTL1VuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvIGRvIFN1bC9VRk1TMQwwCgYDVQQL
+EwNOVEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGUubnRpQHVmbXMuYnIxFTATBgNV
+BAcTDENhbXBvIEdyYW5kZTEbMBkGA1UECBMSTWF0byBHcm9zc28gZG8gU3VsMQsw
+CQYDVQQGEwJCUjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5icjAeFw0xNDA0
+MTAxMjA1NTNaFw0xNzA0MDkxMjA1NTNaMIHLMTgwNgYDVQQKEy9Vbml2ZXJzaWRh
+ZGUgRmVkZXJhbCBkZSBNYXRvIEdyb3NzbyBkbyBTdWwvVUZNUzEMMAoGA1UECxMD
+TlRJMSIwIAYJKoZIhvcNAQkBFhNzdXBvcnRlLm50aUB1Zm1zLmJyMRUwEwYDVQQH
+EwxDYW1wbyBHcmFuZGUxGzAZBgNVBAgTEk1hdG8gR3Jvc3NvIGRvIFN1bDELMAkG
+A1UEBhMCQlIxHDAaBgNVBAMTE3NoaWJib2xldGgyLnVmbXMuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4/qfltMXAD1oXEDGUlbOVwwm4Yd7R4bgh
+i+ZU4OlPPPwzeTMe1dnCDypxxw93/5z6tj3iaYakMf/XVPh4GelknjH0nPiQL/Nb
+n+VL9Jx7xScZ//sl/Jr+IGzRl0TIpcWwJaJcIUfyAqKwkvlyvgB7z/78FYhgE/Fn
+8QNPrLQYmpEaiKGA1WkNe3o9U7t/b6xFgOOkZOhRC2jn8MBN+Kn5eUxH0waQk6ti
+HHZ80rH5ud8C6E0ocpkODEFWx5H2Xn5tU0PUn6RngVUEsqzgkQQbAk3tkRdD7d0g
+XG8NHTP74ocv0ivvv3BBpDDjSHlrYvUq5bV7zdPUXpVVlZGPFI2rAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAH10d5nog6/WojS/rTHB9L6KIwS2btcXXrwgGQymDMOw
+vQKwRXh0lPIpYeIYmsz7aO19HP09KxmEkpJfSbtJ0RAVtYeWvxYdOxRn5B0Tbq9m
+OLQTa+DiCDxNywlFsc5zwJkoeY0LFVVyuL9R+zHC6xjNP4qWN8CuBjY8WtRtXvIr
+aRfk3bQ9jyZLbKyZ5RRLR3PgnM7LyYcRYQ4jWTV/13H8rF4l3VHWo6d+zgkRREeT
+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>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.bpp.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.bpp.semcs.net-shibboleth.xml
new file mode 100644
index 00000000..37448789
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2sp.bpp.semcs.net-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+						MIIDzjCCAzegAwIBAgIDEAAXMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+						dHkwHhcNMTIwMzI4MTU0MTQ2WhcNMTcwMzI3MTU0MTQ2WjBrMQswCQYDVQQGEwJV
+						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+						c2VtYW50aWNvMSQwIgYDVQQDExtzaGliYm9sZXRoMnNwLmJwcC5zZW1jcy5uZXQw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEzdkuVvTeZ0gCxQtc3rMj
+						gY1fVWq9dFsxbWvTuGT9Sejzz2vbDFrOHgeBoLZnjfKf5JujsfGFirnip9ZmJiks
+						GVFjaV+JemCPYh2WNIudQYufAC+wv1NCWjR2+04QOHr581rWwFkf6q0jTtF5UP4F
+						ub19xhGI1iV90SENqOoXUAYKd4M883OKzNeZEALsldjsTw9yqeA78puMxPGVCM+H
+						esxrbYjQxvrANfTewFKgyUP3/vY285iZuOtCWD3xNxA9LVjIomm5DHmPo9al+uB5
+						fvZkyeffX4RaJxxsFbZEF3IY2XbwM3pe/X8VZVTmZ2sgek59mBlzmEiieNFtLxqr
+						AgMBAAGjgfcwgfQwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
+						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMMIwcKVssY66nSLa95evHYB
+						Ux7eMIGZBgNVHSMEgZEwgY6AFAIbTpo38I1qaERGxh1E/rqyXr45oXOkcTBvMQsw
+						CQYDVQQGEwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjES
+						MBAGA1UEChMJc2VtYW50aWNvMSgwJgYDVQQDEx9zZW1hbnRpY28gQ2VydGlmaWNh
+						dGUgQXV0aG9yaXR5ggEAMA0GCSqGSIb3DQEBBAUAA4GBAD4uD2MnsI21aulQbNDY
+						e+c3unQDVuXqlUaNPqxWnOMQfPCL4I2GRkM8L0v9i4cXyFHf5lZTcAgAilLEk1vJ
+						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>
+						MIIDzjCCAzegAwIBAgIDEAAXMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+						dHkwHhcNMTIwMzI4MTU0MTQ2WhcNMTcwMzI3MTU0MTQ2WjBrMQswCQYDVQQGEwJV
+						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+						c2VtYW50aWNvMSQwIgYDVQQDExtzaGliYm9sZXRoMnNwLmJwcC5zZW1jcy5uZXQw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEzdkuVvTeZ0gCxQtc3rMj
+						gY1fVWq9dFsxbWvTuGT9Sejzz2vbDFrOHgeBoLZnjfKf5JujsfGFirnip9ZmJiks
+						GVFjaV+JemCPYh2WNIudQYufAC+wv1NCWjR2+04QOHr581rWwFkf6q0jTtF5UP4F
+						ub19xhGI1iV90SENqOoXUAYKd4M883OKzNeZEALsldjsTw9yqeA78puMxPGVCM+H
+						esxrbYjQxvrANfTewFKgyUP3/vY285iZuOtCWD3xNxA9LVjIomm5DHmPo9al+uB5
+						fvZkyeffX4RaJxxsFbZEF3IY2XbwM3pe/X8VZVTmZ2sgek59mBlzmEiieNFtLxqr
+						AgMBAAGjgfcwgfQwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
+						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMMIwcKVssY66nSLa95evHYB
+						Ux7eMIGZBgNVHSMEgZEwgY6AFAIbTpo38I1qaERGxh1E/rqyXr45oXOkcTBvMQsw
+						CQYDVQQGEwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjES
+						MBAGA1UEChMJc2VtYW50aWNvMSgwJgYDVQQDEx9zZW1hbnRpY28gQ2VydGlmaWNh
+						dGUgQXV0aG9yaXR5ggEAMA0GCSqGSIb3DQEBBAUAA4GBAD4uD2MnsI21aulQbNDY
+						e+c3unQDVuXqlUaNPqxWnOMQfPCL4I2GRkM8L0v9i4cXyFHf5lZTcAgAilLEk1vJ
+						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>
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
new file mode 100644
index 00000000..3ad616e6
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID2TCCA0KgAwIBAgIDEAB/MA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+						dHkwHhcNMTAwNzA4MTIxNTI5WhcNMTUwNzA3MTIxNTI5WjB2MQswCQYDVQQGEwJV
+						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+						c2VtYW50aWNvMS8wLQYDVQQDEyZzaGliYm9sZXRoMnNwLmJyaWxsLnRlc3Quc2Vt
+						YW50aWNvLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKG3jtkz
+						QfLlLf0PaYfXJvK2wFxKxxQQtUEamoSkj4hqEGtEOJ1fdZDOSexSRWtJ78+uSXor
+						RWhi8BSNK3l5Wpj/DkUQeedDDCmK71N0r7zpNLxSsGHC7oS/YKmUnAL7kprZydxx
+						QhlkeSkuQnzKY8zGRQHN09aNJB0kMTyWluVvqQeprMhZ8GREsyzDa3JXFrqJsm9h
+						MiQU3RqhG1zUh3/ZF/JLhHmJ86lg8qdDVOb9XFRqNm8egtYblzIJD8Xy0TUgba7t
+						G0+vKBUmSvTEO2nGyE1ASHNjAX2fjpoWaIphQT0Ljp5sMWyECk62c8VpwiwN4nhb
+						C95LYMbNp+pgjfMCAwEAAaOB9zCB9DAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQf
+						Fh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUETYeFc3g
+						b6aKmwTSh3GWsLvSaI8wgZkGA1UdIwSBkTCBjoAUAhtOmjfwjWpoREbGHUT+urJe
+						vjmhc6RxMG8xCzAJBgNVBAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcT
+						CEJyaWdodG9uMRIwEAYDVQQKEwlzZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGlj
+						byBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQAwDQYJKoZIhvcNAQEEBQADgYEAZWJ1
+						q4bbc9sJWPIKdCOhMO7ZOXmhmLy2Fz/8zGRRIrzjD4hEFxfBRMnNhuxvcGdv6kNY
+						w97NvuBU1SebHu4e5lQFmCzTfri8mnA18Aes7a/XFCDIrv+uzHM3Xjph077RjIes
+						BxT33lxvsp2mnJhaeCweHAs12pOLwFLFrd/lN0g=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID2TCCA0KgAwIBAgIDEAB/MA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+						dHkwHhcNMTAwNzA4MTIxNTI5WhcNMTUwNzA3MTIxNTI5WjB2MQswCQYDVQQGEwJV
+						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+						c2VtYW50aWNvMS8wLQYDVQQDEyZzaGliYm9sZXRoMnNwLmJyaWxsLnRlc3Quc2Vt
+						YW50aWNvLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKG3jtkz
+						QfLlLf0PaYfXJvK2wFxKxxQQtUEamoSkj4hqEGtEOJ1fdZDOSexSRWtJ78+uSXor
+						RWhi8BSNK3l5Wpj/DkUQeedDDCmK71N0r7zpNLxSsGHC7oS/YKmUnAL7kprZydxx
+						QhlkeSkuQnzKY8zGRQHN09aNJB0kMTyWluVvqQeprMhZ8GREsyzDa3JXFrqJsm9h
+						MiQU3RqhG1zUh3/ZF/JLhHmJ86lg8qdDVOb9XFRqNm8egtYblzIJD8Xy0TUgba7t
+						G0+vKBUmSvTEO2nGyE1ASHNjAX2fjpoWaIphQT0Ljp5sMWyECk62c8VpwiwN4nhb
+						C95LYMbNp+pgjfMCAwEAAaOB9zCB9DAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQf
+						Fh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUETYeFc3g
+						b6aKmwTSh3GWsLvSaI8wgZkGA1UdIwSBkTCBjoAUAhtOmjfwjWpoREbGHUT+urJe
+						vjmhc6RxMG8xCzAJBgNVBAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcT
+						CEJyaWdodG9uMRIwEAYDVQQKEwlzZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGlj
+						byBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQAwDQYJKoZIhvcNAQEEBQADgYEAZWJ1
+						q4bbc9sJWPIKdCOhMO7ZOXmhmLy2Fz/8zGRRIrzjD4hEFxfBRMnNhuxvcGdv6kNY
+						w97NvuBU1SebHu4e5lQFmCzTfri8mnA18Aes7a/XFCDIrv+uzHM3Xjph077RjIes
+						BxT33lxvsp2mnJhaeCweHAs12pOLwFLFrd/lN0g=
+					</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>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml
new file mode 100644
index 00000000..1cc91d7a
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDzzCCAzigAwIBAgIDEACAMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+						dHkwHhcNMTAwODAzMTEyMjUyWhcNMTUwODAyMTEyMjUyWjBsMQswCQYDVQQGEwJV
+						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+						c2VtYW50aWNvMSUwIwYDVQQDExxzaGliYm9sZXRoMnNwLmJyaWxsb25saW5lLm5s
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ryqiC3McpzrOXZWOeFF
+						GTO4Nd/oiBgEQtfP/oymsEm+1H1TvDDoXpqNVo+tTrWbfZh/yjgsBzxW8/1sWM5n
+						jZO0JygTkJmh5Pmvdz6P7mUNu9HlGk60B8PpU0dRsJrNJRNgBe9vWJnNxaSDerxO
+						M5+iWGJUgRf2jh3+PQ9FFflEBEUpesJHBKKYVLAwk0q2UUcXIzN92xVakUUN8+u6
+						DapeD9bYi1N/6E9jiwwE7J3JDAhKbGrJRWt63dzCd79iHJG3jj7TdJzQtHoJ3f1r
+						eJ+hE+ST+uikU9GxNfWmoCTTnjh5Cncwl7Zz6aig71MKNR/Z2jjAOIg7CKvI9zjR
+						kwIDAQABo4H3MIH0MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg
+						R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSeZ1VPClGa+wJ0lwl8apv1
+						XRb0fTCBmQYDVR0jBIGRMIGOgBQCG06aN/CNamhERsYdRP66sl6+OaFzpHEwbzEL
+						MAkGA1UEBhMCVUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24x
+						EjAQBgNVBAoTCXNlbWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmlj
+						YXRlIEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOBgQBx33DwzT1uEOkH9GrA
+						XO6DXjduvykr96g5B1CmnfdEiFQCninnDdjoIZ0e+437a98rBx81bH4xGdu/Q+4Y
+						E4RTqlWzO+xS8HLYiuSrIL83sSKGPmX94xlWMVvuvoJRhidkKvammP+IReq4q99w
+						OsSkSoP6HZrPCOXMEAK23C8pxQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDzzCCAzigAwIBAgIDEACAMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+						dHkwHhcNMTAwODAzMTEyMjUyWhcNMTUwODAyMTEyMjUyWjBsMQswCQYDVQQGEwJV
+						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+						c2VtYW50aWNvMSUwIwYDVQQDExxzaGliYm9sZXRoMnNwLmJyaWxsb25saW5lLm5s
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ryqiC3McpzrOXZWOeFF
+						GTO4Nd/oiBgEQtfP/oymsEm+1H1TvDDoXpqNVo+tTrWbfZh/yjgsBzxW8/1sWM5n
+						jZO0JygTkJmh5Pmvdz6P7mUNu9HlGk60B8PpU0dRsJrNJRNgBe9vWJnNxaSDerxO
+						M5+iWGJUgRf2jh3+PQ9FFflEBEUpesJHBKKYVLAwk0q2UUcXIzN92xVakUUN8+u6
+						DapeD9bYi1N/6E9jiwwE7J3JDAhKbGrJRWt63dzCd79iHJG3jj7TdJzQtHoJ3f1r
+						eJ+hE+ST+uikU9GxNfWmoCTTnjh5Cncwl7Zz6aig71MKNR/Z2jjAOIg7CKvI9zjR
+						kwIDAQABo4H3MIH0MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg
+						R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSeZ1VPClGa+wJ0lwl8apv1
+						XRb0fTCBmQYDVR0jBIGRMIGOgBQCG06aN/CNamhERsYdRP66sl6+OaFzpHEwbzEL
+						MAkGA1UEBhMCVUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24x
+						EjAQBgNVBAoTCXNlbWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmlj
+						YXRlIEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOBgQBx33DwzT1uEOkH9GrA
+						XO6DXjduvykr96g5B1CmnfdEiFQCninnDdjoIZ0e+437a98rBx81bH4xGdu/Q+4Y
+						E4RTqlWzO+xS8HLYiuSrIL83sSKGPmX94xlWMVvuvoJRhidkKvammP+IReq4q99w
+						OsSkSoP6HZrPCOXMEAK23C8pxQ==
+					</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>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.cab.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.cab.semcs.net-shibboleth.xml
new file mode 100644
index 00000000..b0f28e83
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2sp.cab.semcs.net-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDzTCCAzagAwIBAgICAykwDQYJKoZIhvcNAQEEBQAwbzELMAkGA1UEBhMCVUsx
+						DzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24xEjAQBgNVBAoTCXNl
+						bWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmljYXRlIEF1dGhvcml0
+						eTAeFw0xMDA0MzAxNTM3MTZaFw0xNTA0MjkxNTM3MTZaMGsxCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AuY2FiLnNlbWNzLm5ldDCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO42i9MXn6Q0LpeyV4mjnd1r
+						+88RRCHq/bU88GSaG0/HF+w7my09xHfTXwT/c7YjE9BtWQ/B07eBHoCV+Rh8oHDO
+						zDP6VTly83kw9xkIk5qMSPVKbMWOWsr9rkmnNvfUlswJ0kiatFcujo1lCPvXChiz
+						76SKPAPW3X41yVg3RS4s7KkjJZh3NfYqxwjZA9xpJ5Z1NYaiJh1VKq1/7mJkrXVo
+						tdkmdjhClhLjN6Ob1Zn4YDIk9T/ZDbFYUG9V07ezYjq5LIwf3inVebSsV/yIRoi2
+						olZwQ32/QMznh1WXY8L4TSgFiV/rWbPYROpJh8HszE2dfSnjcm2HosjoA5tOxdcC
+						AwEAAaOB9zCB9DAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl
+						bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU2iwhxRBWiHx4REhOZE238Gd+
+						ECMwgZkGA1UdIwSBkTCBjoAUAhtOmjfwjWpoREbGHUT+urJevjmhc6RxMG8xCzAJ
+						BgNVBAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIw
+						EAYDVQQKEwlzZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0
+						ZSBBdXRob3JpdHmCAQAwDQYJKoZIhvcNAQEEBQADgYEAOgTYcRyWFJbYdtvZw5jN
+						GZ38yC2RhLcG10pC9XakGVDJaLvpcB4MTeRoUPPe9rN600Lg2SvCyQUSciy1J04n
+						veuQvl2jaldh7KnxNaI2EtdpMXmP+MpN11xT3mUrtvvLvaOf2bKrD3/EOi8PE/z9
+						0bil3yner3RTjEu3NdoEolQ=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDzTCCAzagAwIBAgICAykwDQYJKoZIhvcNAQEEBQAwbzELMAkGA1UEBhMCVUsx
+						DzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24xEjAQBgNVBAoTCXNl
+						bWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmljYXRlIEF1dGhvcml0
+						eTAeFw0xMDA0MzAxNTM3MTZaFw0xNTA0MjkxNTM3MTZaMGsxCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AuY2FiLnNlbWNzLm5ldDCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO42i9MXn6Q0LpeyV4mjnd1r
+						+88RRCHq/bU88GSaG0/HF+w7my09xHfTXwT/c7YjE9BtWQ/B07eBHoCV+Rh8oHDO
+						zDP6VTly83kw9xkIk5qMSPVKbMWOWsr9rkmnNvfUlswJ0kiatFcujo1lCPvXChiz
+						76SKPAPW3X41yVg3RS4s7KkjJZh3NfYqxwjZA9xpJ5Z1NYaiJh1VKq1/7mJkrXVo
+						tdkmdjhClhLjN6Ob1Zn4YDIk9T/ZDbFYUG9V07ezYjq5LIwf3inVebSsV/yIRoi2
+						olZwQ32/QMznh1WXY8L4TSgFiV/rWbPYROpJh8HszE2dfSnjcm2HosjoA5tOxdcC
+						AwEAAaOB9zCB9DAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl
+						bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU2iwhxRBWiHx4REhOZE238Gd+
+						ECMwgZkGA1UdIwSBkTCBjoAUAhtOmjfwjWpoREbGHUT+urJevjmhc6RxMG8xCzAJ
+						BgNVBAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIw
+						EAYDVQQKEwlzZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0
+						ZSBBdXRob3JpdHmCAQAwDQYJKoZIhvcNAQEEBQADgYEAOgTYcRyWFJbYdtvZw5jN
+						GZ38yC2RhLcG10pC9XakGVDJaLvpcB4MTeRoUPPe9rN600Lg2SvCyQUSciy1J04n
+						veuQvl2jaldh7KnxNaI2EtdpMXmP+MpN11xT3mUrtvvLvaOf2bKrD3/EOi8PE/z9
+						0bil3yner3RTjEu3NdoEolQ=
+					</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>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.gar.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.gar.semcs.net-shibboleth.xml
new file mode 100644
index 00000000..474ef2b4
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2sp.gar.semcs.net-shibboleth.xml
@@ -0,0 +1,71 @@
+<?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>
+      <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>
+						MIIDzjCCAzegAwIBAgIDEAAjMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+						dHkwHhcNMTIwNDIwMTM1MjI5WhcNMTcwNDE5MTM1MjI5WjBrMQswCQYDVQQGEwJV
+						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+						c2VtYW50aWNvMSQwIgYDVQQDExtzaGliYm9sZXRoMnNwLmdhci5zZW1jcy5uZXQw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdJq+9YYHBJSKcQ26wtmpE
+						hsXw0R2I+9H9WSzo6ERHWulIEv7ttLeE6c3kaZ2n0lI9LQJ2AY1FrHh5tuf7gNCG
+						2RuCOn3i5TMKOw1V3t6PST+iobyoHm/sVH5g83gsnWdy4wMQr35u/0ltPpx5prEd
+						iTLDBechElt+xSBmwab5FK+MDqd9cjYsg8JSw4bdwA9sXmODhARJTt4tq8lM4okO
+						XJv9Wxs1YChFDfp8IxCbPt6POqwSsRzQkUEOmXslZXFAliClL1MN0PrEIzjHX37+
+						VuUJiClGh0xIk8Q5W8zQmSt7aFDXz0Sd5iMTAFt4uD3euQKSj1h3zlKra7/tDKIF
+						AgMBAAGjgfcwgfQwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
+						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFKMVuS23Tsl/+3uAUf2T1db7
+						/LWdMIGZBgNVHSMEgZEwgY6AFAIbTpo38I1qaERGxh1E/rqyXr45oXOkcTBvMQsw
+						CQYDVQQGEwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjES
+						MBAGA1UEChMJc2VtYW50aWNvMSgwJgYDVQQDEx9zZW1hbnRpY28gQ2VydGlmaWNh
+						dGUgQXV0aG9yaXR5ggEAMA0GCSqGSIb3DQEBBAUAA4GBAHV2kw0DugD5tIFjK8Nz
+						zc07Blr0nhVACm9y3rE+qThIW9N36HG9QiFbMjNECctggBtR/3Ne81wMqJF4V2fT
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.mhp.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.mhp.semcs.net-shibboleth.xml
new file mode 100644
index 00000000..3d6f9fae
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2sp.mhp.semcs.net-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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>
+						MIID0jCCArqgAwIBAgIJAPx54Ehep++5MA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
+						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
+						VQQKEwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AubWhwLnNlbWNz
+						Lm5ldDAeFw0xMzA4MjkxNTQ1MzNaFw0zMzA4MjQxNTQ1MzNaMGsxCzAJBgNVBAYT
+						AlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQK
+						EwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AubWhwLnNlbWNzLm5l
+						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLkKacGmaIQb0f44H/J
+						PPzSXgOvQaKBnm2r76HIj9DQCy71fneTf7dWt0XgNi6ycsP+lBPYxry28khmukva
+						G1BJVsnvJcDSR6uu2O57Bv0tr50g6N8GHOAl+MlS1ONLwpGwVXs4X/OAY+8NnWFX
+						bxTElNYuuu7p2zRL46qTwpUKe+9KQ2Np9NM1ZtPMLU/a4p8uKhq/4mJb4/wK+Ek5
+						27WEKp8wdOaBGsZ9KsxlohgDpks0F5hTA99vzmlztBtR7OmEvkbT6S8MSOgNIPxM
+						NacyuEdnkjQnUkBZFJYnGSbZnWvnmF2Vr3NqPnpISOTf1SLW98fuX49FdAC9Rhqu
+						5ycCAwEAAaN5MHcwVgYDVR0RBE8wTYIbc2hpYmJvbGV0aDJzcC5taHAuc2VtY3Mu
+						bmV0hi5odHRwczovL3NoaWJib2xldGgyc3AubWhwLnNlbWNzLm5ldC9zaGliYm9s
+						ZXRoMB0GA1UdDgQWBBQPQt9ON9lAutcLAfmC6Avxe1vevzANBgkqhkiG9w0BAQUF
+						AAOCAQEAgwVbqg3PtW154Dg+JiUgVohCnst3ntJr+LU0gbu9i92Dcpfy1ZSDI82Z
+						GVV2W70h0UfzRWiaejdi8+nOOp7q7Ak6zcm5bGwdkXSB7cTiybZ8OrkRPMS0Lp2M
+						V5II6/xvAsvKWCA1bnLkTdzm+J2WTzvQG+tnxdBF3xkHSQLbuXO8guyRjh28V4uU
+						xzWt1riN1QDY2gtPot2jCKrPXE1/M0Xwj0UkV8OAM9RuttQXCPVyoppkI+/4ULDQ
+						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>
+						MIID0jCCArqgAwIBAgIJAPx54Ehep++5MA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
+						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
+						VQQKEwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AubWhwLnNlbWNz
+						Lm5ldDAeFw0xMzA4MjkxNTQ1MzNaFw0zMzA4MjQxNTQ1MzNaMGsxCzAJBgNVBAYT
+						AlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQK
+						EwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AubWhwLnNlbWNzLm5l
+						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLkKacGmaIQb0f44H/J
+						PPzSXgOvQaKBnm2r76HIj9DQCy71fneTf7dWt0XgNi6ycsP+lBPYxry28khmukva
+						G1BJVsnvJcDSR6uu2O57Bv0tr50g6N8GHOAl+MlS1ONLwpGwVXs4X/OAY+8NnWFX
+						bxTElNYuuu7p2zRL46qTwpUKe+9KQ2Np9NM1ZtPMLU/a4p8uKhq/4mJb4/wK+Ek5
+						27WEKp8wdOaBGsZ9KsxlohgDpks0F5hTA99vzmlztBtR7OmEvkbT6S8MSOgNIPxM
+						NacyuEdnkjQnUkBZFJYnGSbZnWvnmF2Vr3NqPnpISOTf1SLW98fuX49FdAC9Rhqu
+						5ycCAwEAAaN5MHcwVgYDVR0RBE8wTYIbc2hpYmJvbGV0aDJzcC5taHAuc2VtY3Mu
+						bmV0hi5odHRwczovL3NoaWJib2xldGgyc3AubWhwLnNlbWNzLm5ldC9zaGliYm9s
+						ZXRoMB0GA1UdDgQWBBQPQt9ON9lAutcLAfmC6Avxe1vevzANBgkqhkiG9w0BAQUF
+						AAOCAQEAgwVbqg3PtW154Dg+JiUgVohCnst3ntJr+LU0gbu9i92Dcpfy1ZSDI82Z
+						GVV2W70h0UfzRWiaejdi8+nOOp7q7Ak6zcm5bGwdkXSB7cTiybZ8OrkRPMS0Lp2M
+						V5II6/xvAsvKWCA1bnLkTdzm+J2WTzvQG+tnxdBF3xkHSQLbuXO8guyRjh28V4uU
+						xzWt1riN1QDY2gtPot2jCKrPXE1/M0Xwj0UkV8OAM9RuttQXCPVyoppkI+/4ULDQ
+						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>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.now.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.now.semcs.net-shibboleth.xml
new file mode 100644
index 00000000..1103f955
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2sp.now.semcs.net-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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.now.semcs.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-19T09:18: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.now.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>
+						MIIDzjCCAzegAwIBAgIDEAB8MA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+						dHkwHhcNMTMwMzI2MTYzODM1WhcNMTgwMzI1MTYzODM1WjBrMQswCQYDVQQGEwJV
+						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+						c2VtYW50aWNvMSQwIgYDVQQDExtzaGliYm9sZXRoMnNwLm5vdy5zZW1jcy5uZXQw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDspSMFisMgrFl7wbAzbd0d
+						7Mm2vqPTBIx9JUrInCeyptcCL6cYsmkZfD6L34Izf4lXxiFYSeZ9/arLvMrfHw6V
+						LHCY1c8Ujlldrf1jWXUlddjV/0jj2bHSpaSkd5Pv2DE+YPbQuWNgEO8LvveJRhsj
+						RjdlVb+kp/suP4rV0fE+mBtI0r+fg89NVt0ljGY/fG93jIXZOo+EoRTLQuZdB2p0
+						qs/LT/cvicGvD9nlYagx02iRpkRzdEaMd/8K3m9LlUdWAoTE8Pp/gRoDvtjC1b3s
+						zNw8bTlb6cnxaNnNkTVhcNVFJU93E+i/tofqdg5SXm1t5XQLBVRn7h+flMhz96dR
+						AgMBAAGjgfcwgfQwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
+						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFGn2QrAsZmobkkf7vuZiAaeV
+						qBTIMIGZBgNVHSMEgZEwgY6AFAIbTpo38I1qaERGxh1E/rqyXr45oXOkcTBvMQsw
+						CQYDVQQGEwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjES
+						MBAGA1UEChMJc2VtYW50aWNvMSgwJgYDVQQDEx9zZW1hbnRpY28gQ2VydGlmaWNh
+						dGUgQXV0aG9yaXR5ggEAMA0GCSqGSIb3DQEBBAUAA4GBAN99BJdWNmZf2n1X5eDs
+						nh+bjmiearQYMxtcGari4biwsLaxboTxWA3RdKAOSiu8mYM/eG9SoafdW5qTv87n
+						VvzqCHHHXeXOtizBpnolXO1ggqU5oY8lbIEdGeigfwDCyyKwefLkemv34QpzHWes
+						unAmGhPhZk/kNUUgSblqhFu7
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDzjCCAzegAwIBAgIDEAB8MA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+						dHkwHhcNMTMwMzI2MTYzODM1WhcNMTgwMzI1MTYzODM1WjBrMQswCQYDVQQGEwJV
+						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+						c2VtYW50aWNvMSQwIgYDVQQDExtzaGliYm9sZXRoMnNwLm5vdy5zZW1jcy5uZXQw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDspSMFisMgrFl7wbAzbd0d
+						7Mm2vqPTBIx9JUrInCeyptcCL6cYsmkZfD6L34Izf4lXxiFYSeZ9/arLvMrfHw6V
+						LHCY1c8Ujlldrf1jWXUlddjV/0jj2bHSpaSkd5Pv2DE+YPbQuWNgEO8LvveJRhsj
+						RjdlVb+kp/suP4rV0fE+mBtI0r+fg89NVt0ljGY/fG93jIXZOo+EoRTLQuZdB2p0
+						qs/LT/cvicGvD9nlYagx02iRpkRzdEaMd/8K3m9LlUdWAoTE8Pp/gRoDvtjC1b3s
+						zNw8bTlb6cnxaNnNkTVhcNVFJU93E+i/tofqdg5SXm1t5XQLBVRn7h+flMhz96dR
+						AgMBAAGjgfcwgfQwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
+						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFGn2QrAsZmobkkf7vuZiAaeV
+						qBTIMIGZBgNVHSMEgZEwgY6AFAIbTpo38I1qaERGxh1E/rqyXr45oXOkcTBvMQsw
+						CQYDVQQGEwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjES
+						MBAGA1UEChMJc2VtYW50aWNvMSgwJgYDVQQDEx9zZW1hbnRpY28gQ2VydGlmaWNh
+						dGUgQXV0aG9yaXR5ggEAMA0GCSqGSIb3DQEBBAUAA4GBAN99BJdWNmZf2n1X5eDs
+						nh+bjmiearQYMxtcGari4biwsLaxboTxWA3RdKAOSiu8mYM/eG9SoafdW5qTv87n
+						VvzqCHHHXeXOtizBpnolXO1ggqU5oY8lbIEdGeigfwDCyyKwefLkemv34QpzHWes
+						unAmGhPhZk/kNUUgSblqhFu7
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.now.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.now.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.now.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.now.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: Now Publishers Shibboleth 2 SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nowpublishers.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:info@nowpublishers.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:info@nowpublishers.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
new file mode 100644
index 00000000..75a88b1c
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2sp.pm.semcs.net-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDzDCCAzWgAwIBAgICAxUwDQYJKoZIhvcNAQEEBQAwbzELMAkGA1UEBhMCVUsx
+						DzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24xEjAQBgNVBAoTCXNl
+						bWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmljYXRlIEF1dGhvcml0
+						eTAeFw0xMDAzMTkxNjIzNTdaFw0xNTAzMTgxNjIzNTdaMGoxCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xIzAhBgNVBAMTGnNoaWJib2xldGgyc3AucG0uc2VtY3MubmV0MIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApQz1U8pFZAWF+PDWjyAen9NM
+						S6bvzd4wXOkclHTrIr7aDwXYM6EebucyOgBzUyiat+f3vLU6R8hMbtFqgegQ4WGh
+						MyzBgpr0dhHpLMsYschvAnB409CoB+wRuipBE40yNT/KccwgLFGZPIBb1gDGU+D+
+						jPyQO5HddAy2z7GPgD6enx//EjaPgshmk7GAc6aCuAZFAG8abUHbUBht6fxRSWVH
+						dP0hmbsdOCon1Wd+eb2Sgv09oDAaTyDAq9FVQvrOnD8LUBwxmFnfjD+SPeXnNZdA
+						Q402Dz2aOfnc/KBiOPUxvnQC1efRIq49NjGqR+P8hH4lkTb5Y65NLTJKFet4UwID
+						AQABo4H3MIH0MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2Vu
+						ZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBS6tz/6uCRkd5TJtxrKde6GyNOT
+						njCBmQYDVR0jBIGRMIGOgBQCG06aN/CNamhERsYdRP66sl6+OaFzpHEwbzELMAkG
+						A1UEBhMCVUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24xEjAQ
+						BgNVBAoTCXNlbWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmljYXRl
+						IEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOBgQDFAGa6RU+GlwwTywGJ5fpP
+						auiTuISakA3RGU3sCFrdHL0cr+SeLI6rKdiqKFQ++C3kvOUaf89a19vRg4A+nSdZ
+						fJ4Xde3jLc6Uc16kp6daiaLky6XJ3pFW/NeFXQW2Ua9vLEDhezZ0zzodChycToa0
+						LtNtkK+uFBAGkrBvmYeR4w==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDzDCCAzWgAwIBAgICAxUwDQYJKoZIhvcNAQEEBQAwbzELMAkGA1UEBhMCVUsx
+						DzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24xEjAQBgNVBAoTCXNl
+						bWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmljYXRlIEF1dGhvcml0
+						eTAeFw0xMDAzMTkxNjIzNTdaFw0xNTAzMTgxNjIzNTdaMGoxCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xIzAhBgNVBAMTGnNoaWJib2xldGgyc3AucG0uc2VtY3MubmV0MIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApQz1U8pFZAWF+PDWjyAen9NM
+						S6bvzd4wXOkclHTrIr7aDwXYM6EebucyOgBzUyiat+f3vLU6R8hMbtFqgegQ4WGh
+						MyzBgpr0dhHpLMsYschvAnB409CoB+wRuipBE40yNT/KccwgLFGZPIBb1gDGU+D+
+						jPyQO5HddAy2z7GPgD6enx//EjaPgshmk7GAc6aCuAZFAG8abUHbUBht6fxRSWVH
+						dP0hmbsdOCon1Wd+eb2Sgv09oDAaTyDAq9FVQvrOnD8LUBwxmFnfjD+SPeXnNZdA
+						Q402Dz2aOfnc/KBiOPUxvnQC1efRIq49NjGqR+P8hH4lkTb5Y65NLTJKFet4UwID
+						AQABo4H3MIH0MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2Vu
+						ZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBS6tz/6uCRkd5TJtxrKde6GyNOT
+						njCBmQYDVR0jBIGRMIGOgBQCG06aN/CNamhERsYdRP66sl6+OaFzpHEwbzELMAkG
+						A1UEBhMCVUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24xEjAQ
+						BgNVBAoTCXNlbWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmljYXRl
+						IEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOBgQDFAGa6RU+GlwwTywGJ5fpP
+						auiTuISakA3RGU3sCFrdHL0cr+SeLI6rKdiqKFQ++C3kvOUaf89a19vRg4A+nSdZ
+						fJ4Xde3jLc6Uc16kp6daiaLky6XJ3pFW/NeFXQW2Ua9vLEDhezZ0zzodChycToa0
+						LtNtkK+uFBAGkrBvmYeR4w==
+					</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>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.sams.oup.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.sams.oup.com-shibboleth.xml
new file mode 100644
index 00000000..ab9130b3
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2sp.sams.oup.com-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDzTCCAzagAwIBAgIDEACGMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+						dHkwHhcNMTAwOTAxMTMxMTAzWhcNMTUwODMxMTMxMTAzWjBqMQswCQYDVQQGEwJV
+						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+						c2VtYW50aWNvMSMwIQYDVQQDExpzaGliYm9sZXRoMnNwLnNhbXMub3VwLmNvbTCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOc+XAgdXPJb6aEmkp+EgQ6q
+						wHRj4jeim/4WWyXbwBkjWSq5h1pgPlCvalNPh+QQrHRPjY7Quy9QaWrt/C87kqCo
+						SpqFUS5J+ox55xDdYUY12qWgxQ7MdlxRn3lwGJpkWCXwUcheSYBSsRtBwOqvZr41
+						4UZZbeU5wKwApG3QJNmQlLmpNGkssFPcldrF9nyv9dIq5A8XAMRGE4SIjTTI0wVD
+						pjxYCjE4q+4TmtvXD52Jbj53lR7AU5JBR1/Nd66yy7kuL6Nnnl60JF/EYcZDlajV
+						uJnATjqo/QSNT8snpm04f+YYIrNlVI/7dhzVsx/sOZ7L+3dHvi+TMqFwiZuS0osC
+						AwEAAaOB9zCB9DAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl
+						bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUViwOapXqz4uGfUiHN8HJ/XrO
+						uvkwgZkGA1UdIwSBkTCBjoAUAhtOmjfwjWpoREbGHUT+urJevjmhc6RxMG8xCzAJ
+						BgNVBAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIw
+						EAYDVQQKEwlzZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0
+						ZSBBdXRob3JpdHmCAQAwDQYJKoZIhvcNAQEEBQADgYEAQ1HimR+AbABwPUoURURN
+						NRTOy768gl3mrryD5gyYd38j5Z8ezsYZ/ckf5GI+Gf5TWlJhLu/U5E/T9gEVAXhN
+						0QWHl07qsOY/1rxVBoCsTP180Wz4O7ImkJ1mdepSSqGFqMnbgMNTi2xTmYqLHqUL
+						+1yJNL1Pcqp7Aqx8EmO7na4=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDzTCCAzagAwIBAgIDEACGMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+						dHkwHhcNMTAwOTAxMTMxMTAzWhcNMTUwODMxMTMxMTAzWjBqMQswCQYDVQQGEwJV
+						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+						c2VtYW50aWNvMSMwIQYDVQQDExpzaGliYm9sZXRoMnNwLnNhbXMub3VwLmNvbTCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOc+XAgdXPJb6aEmkp+EgQ6q
+						wHRj4jeim/4WWyXbwBkjWSq5h1pgPlCvalNPh+QQrHRPjY7Quy9QaWrt/C87kqCo
+						SpqFUS5J+ox55xDdYUY12qWgxQ7MdlxRn3lwGJpkWCXwUcheSYBSsRtBwOqvZr41
+						4UZZbeU5wKwApG3QJNmQlLmpNGkssFPcldrF9nyv9dIq5A8XAMRGE4SIjTTI0wVD
+						pjxYCjE4q+4TmtvXD52Jbj53lR7AU5JBR1/Nd66yy7kuL6Nnnl60JF/EYcZDlajV
+						uJnATjqo/QSNT8snpm04f+YYIrNlVI/7dhzVsx/sOZ7L+3dHvi+TMqFwiZuS0osC
+						AwEAAaOB9zCB9DAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl
+						bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUViwOapXqz4uGfUiHN8HJ/XrO
+						uvkwgZkGA1UdIwSBkTCBjoAUAhtOmjfwjWpoREbGHUT+urJevjmhc6RxMG8xCzAJ
+						BgNVBAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIw
+						EAYDVQQKEwlzZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0
+						ZSBBdXRob3JpdHmCAQAwDQYJKoZIhvcNAQEEBQADgYEAQ1HimR+AbABwPUoURURN
+						NRTOy768gl3mrryD5gyYd38j5Z8ezsYZ/ckf5GI+Gf5TWlJhLu/U5E/T9gEVAXhN
+						0QWHl07qsOY/1rxVBoCsTP180Wz4O7ImkJ1mdepSSqGFqMnbgMNTi2xTmYqLHqUL
+						+1yJNL1Pcqp7Aqx8EmO7na4=
+					</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>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.samstest.oup.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.samstest.oup.com-shibboleth.xml
new file mode 100644
index 00000000..e56734fa
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2sp.samstest.oup.com-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID0TCCAzqgAwIBAgIDEAB5MA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+						dHkwHhcNMTAwNTI1MTIxNTI2WhcNMTUwNTI0MTIxNTI2WjBuMQswCQYDVQQGEwJV
+						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+						c2VtYW50aWNvMScwJQYDVQQDEx5zaGliYm9sZXRoMnNwLnNhbXN0ZXN0Lm91cC5j
+						b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8X1ZKDjohpHzTTTT2
+						pDcpuakFJXzNx2fKNHX0WtKOFy4XXK/yrSFIClNCHEVusMuyrl6A7rhpJX6nDbIA
+						UJsSpBY7aiw0C7VQTk/6u/YbVnIpSUOp5My47e2NwOzrIXWCD5UbMg+SnrqVELvZ
+						GZsGyjuumGkaMMBr5dd9DxIyQhPjTPyREefXMWdD0DYLw4JjILmM0e+bpBrNPuz2
+						YtrHHafK+r1KzNK7aZDRGwgxTADFBV8suvcDV79GfgyvZ4CjMLxUjFs3vqKLAO+s
+						N/tUhzwYhbRxty0qF6EAiSmukgUsZAnPnn9jaYu+nB6movRIeW0oBUqIwFSvRCPr
+						9acLAgMBAAGjgfcwgfQwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNT
+						TCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFJjLmmhAa4y9Rov7qSCm
+						WaDV7tbFMIGZBgNVHSMEgZEwgY6AFAIbTpo38I1qaERGxh1E/rqyXr45oXOkcTBv
+						MQswCQYDVQQGEwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRv
+						bjESMBAGA1UEChMJc2VtYW50aWNvMSgwJgYDVQQDEx9zZW1hbnRpY28gQ2VydGlm
+						aWNhdGUgQXV0aG9yaXR5ggEAMA0GCSqGSIb3DQEBBAUAA4GBAKkUfEkRGzWCmoF1
+						4+Lpg7r4JW495/VG8mnmDBFLtLzkARx9G5av86Pmse3xlJG83T4Dm+m8VEzeycUj
+						K8NFYtpNqV5ind9DOGxSLUyXyhAIK33VSszN/CivIYgoggurI5br2gCOuW9/4jN+
+						vYPXuQ+eSdChL6mTgPg+9yenoGuA
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID0TCCAzqgAwIBAgIDEAB5MA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+						dHkwHhcNMTAwNTI1MTIxNTI2WhcNMTUwNTI0MTIxNTI2WjBuMQswCQYDVQQGEwJV
+						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+						c2VtYW50aWNvMScwJQYDVQQDEx5zaGliYm9sZXRoMnNwLnNhbXN0ZXN0Lm91cC5j
+						b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8X1ZKDjohpHzTTTT2
+						pDcpuakFJXzNx2fKNHX0WtKOFy4XXK/yrSFIClNCHEVusMuyrl6A7rhpJX6nDbIA
+						UJsSpBY7aiw0C7VQTk/6u/YbVnIpSUOp5My47e2NwOzrIXWCD5UbMg+SnrqVELvZ
+						GZsGyjuumGkaMMBr5dd9DxIyQhPjTPyREefXMWdD0DYLw4JjILmM0e+bpBrNPuz2
+						YtrHHafK+r1KzNK7aZDRGwgxTADFBV8suvcDV79GfgyvZ4CjMLxUjFs3vqKLAO+s
+						N/tUhzwYhbRxty0qF6EAiSmukgUsZAnPnn9jaYu+nB6movRIeW0oBUqIwFSvRCPr
+						9acLAgMBAAGjgfcwgfQwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNT
+						TCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFJjLmmhAa4y9Rov7qSCm
+						WaDV7tbFMIGZBgNVHSMEgZEwgY6AFAIbTpo38I1qaERGxh1E/rqyXr45oXOkcTBv
+						MQswCQYDVQQGEwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRv
+						bjESMBAGA1UEChMJc2VtYW50aWNvMSgwJgYDVQQDEx9zZW1hbnRpY28gQ2VydGlm
+						aWNhdGUgQXV0aG9yaXR5ggEAMA0GCSqGSIb3DQEBBAUAA4GBAKkUfEkRGzWCmoF1
+						4+Lpg7r4JW495/VG8mnmDBFLtLzkARx9G5av86Pmse3xlJG83T4Dm+m8VEzeycUj
+						K8NFYtpNqV5ind9DOGxSLUyXyhAIK33VSszN/CivIYgoggurI5br2gCOuW9/4jN+
+						vYPXuQ+eSdChL6mTgPg+9yenoGuA
+					</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>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.tf.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.tf.semcs.net-shibboleth.xml
new file mode 100644
index 00000000..22dca90f
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2sp.tf.semcs.net-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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>
+						MIIDzTCCAzagAwIBAgIDEAAKMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+						dHkwHhcNMTIwMjE2MTI1MjA3WhcNMTcwMjE0MTI1MjA3WjBqMQswCQYDVQQGEwJV
+						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+						c2VtYW50aWNvMSMwIQYDVQQDExpzaGliYm9sZXRoMnNwLnRmLnNlbWNzLm5ldDCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALlHB2zAGe9ctjQQJMRQ5EGr
+						jbe3RucMOl2TTv2XxD3QRkPltjR/loYX9+Elz+YXVHqUmJmkhK/7K3sbM+8dPtwr
+						kMbWJ7I6peKmOF0fFx5KY0hWAiXC+oPpBBBItpNETnNGQUJPsTh7EeK6Qh8a5oAe
+						7qp2i3PdH2kKb54NTeUjmeXDCq3sVo9KScjbcQx2FHdVXWX6VzO4gLQ+GoPP9ZK1
+						U3hQ7OMW3d3B2WQFQZB9awkqWpWcsWPr+xYY7noxvu5+raYUgy+ks4usWM8va+bU
+						MRLDxCfY0lV/rpxEvrq30gi1GmDNt/XvZXOqS6VL8m1vPhzchscavOZ/CfW2+ykC
+						AwEAAaOB9zCB9DAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl
+						bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU98wmnF2Ul7kw8GGRolQKie7T
+						eKcwgZkGA1UdIwSBkTCBjoAUAhtOmjfwjWpoREbGHUT+urJevjmhc6RxMG8xCzAJ
+						BgNVBAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIw
+						EAYDVQQKEwlzZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0
+						ZSBBdXRob3JpdHmCAQAwDQYJKoZIhvcNAQEEBQADgYEAOjfVqx8vLDf9nQv1XKXK
+						l+HFoV80S0R0abpO7IEELQENa8GWPIJyVHHVjESHXYDF63/SgnHJXAMl1afR7t8R
+						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>
+						MIIDzTCCAzagAwIBAgIDEAAKMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+						dHkwHhcNMTIwMjE2MTI1MjA3WhcNMTcwMjE0MTI1MjA3WjBqMQswCQYDVQQGEwJV
+						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+						c2VtYW50aWNvMSMwIQYDVQQDExpzaGliYm9sZXRoMnNwLnRmLnNlbWNzLm5ldDCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALlHB2zAGe9ctjQQJMRQ5EGr
+						jbe3RucMOl2TTv2XxD3QRkPltjR/loYX9+Elz+YXVHqUmJmkhK/7K3sbM+8dPtwr
+						kMbWJ7I6peKmOF0fFx5KY0hWAiXC+oPpBBBItpNETnNGQUJPsTh7EeK6Qh8a5oAe
+						7qp2i3PdH2kKb54NTeUjmeXDCq3sVo9KScjbcQx2FHdVXWX6VzO4gLQ+GoPP9ZK1
+						U3hQ7OMW3d3B2WQFQZB9awkqWpWcsWPr+xYY7noxvu5+raYUgy+ks4usWM8va+bU
+						MRLDxCfY0lV/rpxEvrq30gi1GmDNt/XvZXOqS6VL8m1vPhzchscavOZ/CfW2+ykC
+						AwEAAaOB9zCB9DAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl
+						bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU98wmnF2Ul7kw8GGRolQKie7T
+						eKcwgZkGA1UdIwSBkTCBjoAUAhtOmjfwjWpoREbGHUT+urJevjmhc6RxMG8xCzAJ
+						BgNVBAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIw
+						EAYDVQQKEwlzZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0
+						ZSBBdXRob3JpdHmCAQAwDQYJKoZIhvcNAQEEBQADgYEAOjfVqx8vLDf9nQv1XKXK
+						l+HFoV80S0R0abpO7IEELQENa8GWPIJyVHHVjESHXYDF63/SgnHJXAMl1afR7t8R
+						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>Samantha</md:GivenName>
+    <md:SurName>Grant</md:SurName>
+    <md:EmailAddress>mailto:samantha.grant@tandf.co.uk</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
new file mode 100644
index 00000000..33786881
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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>
+      <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
+						di5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtlHz1hrD0F
+						f0M6F1zN8ZBoY5qI2wYwfjcRuXVfZlSJVhODsOUWWxUnfdqV7KBA0HcgRCK008g2
+						h/sjZXH/VU8M0EHhaYHHkyQxSBwEjWhbVcOT9iI1TkZqHNqZtJQIw7rnybskkv/3
+						6IiBtGZgkZL3CZjp0kkqsOh19k/cioEsNsd4cKUyvhVEUvqtO1VULemasTnkmUtk
+						xJegTZXyW2W6TYMlTxeTwJQWe97WNxpCvV/3ounzXnLTUG5Te4i2ptA67JItknmw
+						kS1p/a6d9B63gvHch27jFzollXccq4Gb2VSNLq3B8eAo8+Hnny9vLYYlKH1H7H9q
+						gAo8OSA2ZbUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYmJvbGV0aDMubGl2LmFj
+						LnVrhixodHRwczovL3NoaWJib2xldGgzLmxpdi5hYy51ay9pZHAvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQU7Cmjd6WsvyQ90NQeufSKvO/8yVIwDQYJKoZIhvcNAQEFBQAD
+						ggEBAIhTLBoOX4fvW9dYMfvjD77y8lyo2UFdATt6G6KWlCosBDkOwDTGK4N5g7CU
+						/AxoGWBYLtd+KHy5ii5oV781aMLPa3ClDs1UYE/NuwkylvoSO0+agpeH6oF7IJxH
+						N7EsSimVuaLi/R2ghs0KLwv6JfFUkhO2G2S5VTS/FZn/B8NgmBo+fLuJ6DLCQwJJ
+						vnqXf9DPozHSBUOQAEkZcjKRSl+QTO6SleKLg5ahHNC3kT+dzF2ACKJMC7f4WzAL
+						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:9443/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth3.liv.ac.uk:9443/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:9443/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth3.liv.ac.uk:9443/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:9443/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:9443/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.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
+						di5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtlHz1hrD0F
+						f0M6F1zN8ZBoY5qI2wYwfjcRuXVfZlSJVhODsOUWWxUnfdqV7KBA0HcgRCK008g2
+						h/sjZXH/VU8M0EHhaYHHkyQxSBwEjWhbVcOT9iI1TkZqHNqZtJQIw7rnybskkv/3
+						6IiBtGZgkZL3CZjp0kkqsOh19k/cioEsNsd4cKUyvhVEUvqtO1VULemasTnkmUtk
+						xJegTZXyW2W6TYMlTxeTwJQWe97WNxpCvV/3ounzXnLTUG5Te4i2ptA67JItknmw
+						kS1p/a6d9B63gvHch27jFzollXccq4Gb2VSNLq3B8eAo8+Hnny9vLYYlKH1H7H9q
+						gAo8OSA2ZbUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYmJvbGV0aDMubGl2LmFj
+						LnVrhixodHRwczovL3NoaWJib2xldGgzLmxpdi5hYy51ay9pZHAvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQU7Cmjd6WsvyQ90NQeufSKvO/8yVIwDQYJKoZIhvcNAQEFBQAD
+						ggEBAIhTLBoOX4fvW9dYMfvjD77y8lyo2UFdATt6G6KWlCosBDkOwDTGK4N5g7CU
+						/AxoGWBYLtd+KHy5ii5oV781aMLPa3ClDs1UYE/NuwkylvoSO0+agpeH6oF7IJxH
+						N7EsSimVuaLi/R2ghs0KLwv6JfFUkhO2G2S5VTS/FZn/B8NgmBo+fLuJ6DLCQwJJ
+						vnqXf9DPozHSBUOQAEkZcjKRSl+QTO6SleKLg5ahHNC3kT+dzF2ACKJMC7f4WzAL
+						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 - 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/shibboletht.lsbu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboletht.lsbu.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..7fa67475
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboletht.lsbu.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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>
+						MIIDRDCCAiygAwIBAgIVANaRWeyV4EZWBxiDDbeqrCEOlAx/MA0GCSqGSIb3DQEB
+						BQUAMCExHzAdBgNVBAMTFnNoaWJib2xldGh0LmxzYnUuYWMudWswHhcNMTMwMzEy
+						MDkyMDQwWhcNMzMwMzEyMDkyMDQwWjAhMR8wHQYDVQQDExZzaGliYm9sZXRodC5s
+						c2J1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt3WPIRAX
+						SJiOngXAXVwOhNgUECGAqkuPpP1Z4hot13WcBWcFfPEHVEuT0a+J7mDNmunMcmuy
+						VWaONGK3/1xsQIUOUeFwQGbjc3XB/EAmvu6HtPXHPcJ6lKfNM4qclTp5+S4XeZHl
+						ZwVvC+dN/h/zy5w+ACq4OpTMU/QXScW+S/cGaM7vIdb1K2EHSBQ/VxZaqYZ7XvCW
+						A2kwNXj2NCszMCooKY9SGZOz6GIygBgT7H1tLgCzpQhdsC/4CQAeXXflAuX03FDD
+						2Lpcv+xIxMsUFFX0CdWYFhKPBftUllLFaWg9vdI/sG7GdIor4I5BV5R+YcCltJGV
+						OiMC1TRF0i2FXQIDAQABo3MwcTBQBgNVHREESTBHghZzaGliYm9sZXRodC5sc2J1
+						LmFjLnVrhi1odHRwczovL3NoaWJib2xldGh0LmxzYnUuYWMudWsvaWRwL3NoaWJi
+						b2xldGgwHQYDVR0OBBYEFNxLjXNMtSLAaE8RKxedlIosAclRMA0GCSqGSIb3DQEB
+						BQUAA4IBAQBgWpZTk1YRTk3D4L5OR2MfPGoj3OGUFuZtD3P5rPuysHIGpQyEx0wk
+						EStgqbOJZO3y3F66F/XidGOJelvsvzoVSIesi2MHa9bJZCwm5vhNiJ1oyRp1jkL9
+						kEHXYD2pY2NAb8lwV4mVuZrFj6BAibWGG1r+d1mZzf7v/HnT1tFS3dM0N8ijf4lO
+						MdmPrJL11otwyxOjhso4vrK69UvDP+y1PYqiAkqEHOuBh5Ei1bcIu95yA+6B//dg
+						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>
+						MIIDRDCCAiygAwIBAgIVANaRWeyV4EZWBxiDDbeqrCEOlAx/MA0GCSqGSIb3DQEB
+						BQUAMCExHzAdBgNVBAMTFnNoaWJib2xldGh0LmxzYnUuYWMudWswHhcNMTMwMzEy
+						MDkyMDQwWhcNMzMwMzEyMDkyMDQwWjAhMR8wHQYDVQQDExZzaGliYm9sZXRodC5s
+						c2J1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt3WPIRAX
+						SJiOngXAXVwOhNgUECGAqkuPpP1Z4hot13WcBWcFfPEHVEuT0a+J7mDNmunMcmuy
+						VWaONGK3/1xsQIUOUeFwQGbjc3XB/EAmvu6HtPXHPcJ6lKfNM4qclTp5+S4XeZHl
+						ZwVvC+dN/h/zy5w+ACq4OpTMU/QXScW+S/cGaM7vIdb1K2EHSBQ/VxZaqYZ7XvCW
+						A2kwNXj2NCszMCooKY9SGZOz6GIygBgT7H1tLgCzpQhdsC/4CQAeXXflAuX03FDD
+						2Lpcv+xIxMsUFFX0CdWYFhKPBftUllLFaWg9vdI/sG7GdIor4I5BV5R+YcCltJGV
+						OiMC1TRF0i2FXQIDAQABo3MwcTBQBgNVHREESTBHghZzaGliYm9sZXRodC5sc2J1
+						LmFjLnVrhi1odHRwczovL3NoaWJib2xldGh0LmxzYnUuYWMudWsvaWRwL3NoaWJi
+						b2xldGgwHQYDVR0OBBYEFNxLjXNMtSLAaE8RKxedlIosAclRMA0GCSqGSIb3DQEB
+						BQUAA4IBAQBgWpZTk1YRTk3D4L5OR2MfPGoj3OGUFuZtD3P5rPuysHIGpQyEx0wk
+						EStgqbOJZO3y3F66F/XidGOJelvsvzoVSIesi2MHa9bJZCwm5vhNiJ1oyRp1jkL9
+						kEHXYD2pY2NAb8lwV4mVuZrFj6BAibWGG1r+d1mZzf7v/HnT1tFS3dM0N8ijf4lO
+						MdmPrJL11otwyxOjhso4vrK69UvDP+y1PYqiAkqEHOuBh5Ei1bcIu95yA+6B//dg
+						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>
diff --git a/swamid-interfederations-2.0/shibbox.charanga.com-shibboleth.xml b/swamid-interfederations-2.0/shibbox.charanga.com-shibboleth.xml
new file mode 100644
index 00000000..12ef8231
--- /dev/null
+++ b/swamid-interfederations-2.0/shibbox.charanga.com-shibboleth.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbox.charanga.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>
+						MIIELjCCAxagAwIBAgIJAL9/L58hDw4wMA0GCSqGSIb3DQEBBQUAMIGXMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLRWFzdCBTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9u
+						MRkwFwYDVQQKExBDaGFyYW5nYSBMaW1pdGVkMR0wGwYDVQQDExRzaGliYm94LmNo
+						YXJhbmdhLmNvbTElMCMGCSqGSIb3DQEJARYWd2VibWFzdGVyQGNoYXJhbmdhLmNv
+						bTAeFw0xMDA2MjkxNTIyMDNaFw0yMDA2MjYxNTIyMDNaMIGXMQswCQYDVQQGEwJH
+						QjEUMBIGA1UECBMLRWFzdCBTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRkwFwYD
+						VQQKExBDaGFyYW5nYSBMaW1pdGVkMR0wGwYDVQQDExRzaGliYm94LmNoYXJhbmdh
+						LmNvbTElMCMGCSqGSIb3DQEJARYWd2VibWFzdGVyQGNoYXJhbmdhLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANYoGZS/WguHq6pRim/vSIB5qhOu
+						n6ijPVVZBurlhU7gFfVBPMY5rYdfa0H3h4QGXA9jMYdQKcpH+g7kMrmClQ8azLH/
+						d67snvtCHZ81AzIVJjGfOoHucyEVkPas6jgG5RWfpxOzQtYfm0lYc+CuTrkIojwC
+						9wpFRzWL4OEVqy5FiQygjFJBI5CpDG2EmEY+XKjp+AfAxvvZ5Vyk07Rm9gQmrk99
+						m0qG6g5JJa68p/v8VmTannqtyERmmb4PMfRjilXgWYkZegBn0pj2ltFZVKp/F0sr
+						5oVxHQE/rhxWtSz43C6yEGaZ8jIoTReQzn+ouCI4WEjJlIBvEPVnpofu34cCAwEA
+						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
+						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMruJSo1sytozEbczKQEttLtBtmmMB8G
+						A1UdIwQYMBaAFMruJSo1sytozEbczKQEttLtBtmmMA0GCSqGSIb3DQEBBQUAA4IB
+						AQBdR/7rtP4OTHjxidRF98wl6Rd/fXvEs/YdjCQlxFXNQhbT/r9TiX9Y0FCNlJYr
+						uza26IEc8Dm4oA//8eWV96mD7KErkUBvzojhkovHcOjdsFG8ceuJnpEvHkM2rDqC
+						pKD5W56d97cUdLuyAtPVjl5ho4aF0achwbrBuGXg/VpzCBzHP02WmEuxBBkhIFLV
+						XZ2jOgpiCSrVlDNm2X6Chg9g/tfgK30lN0GImnnzzSHuRlFTxgwKuDV4JeuqTsvf
+						0ImlveH8IqR28SFnSUED+nylj0Ap/8RB58BHLlZN5R6bUTKRFRdNeESGNH5i+NRc
+						lvxdpwxr83npRdyMleyUtAKF
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIELjCCAxagAwIBAgIJAL9/L58hDw4wMA0GCSqGSIb3DQEBBQUAMIGXMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLRWFzdCBTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9u
+						MRkwFwYDVQQKExBDaGFyYW5nYSBMaW1pdGVkMR0wGwYDVQQDExRzaGliYm94LmNo
+						YXJhbmdhLmNvbTElMCMGCSqGSIb3DQEJARYWd2VibWFzdGVyQGNoYXJhbmdhLmNv
+						bTAeFw0xMDA2MjkxNTIyMDNaFw0yMDA2MjYxNTIyMDNaMIGXMQswCQYDVQQGEwJH
+						QjEUMBIGA1UECBMLRWFzdCBTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRkwFwYD
+						VQQKExBDaGFyYW5nYSBMaW1pdGVkMR0wGwYDVQQDExRzaGliYm94LmNoYXJhbmdh
+						LmNvbTElMCMGCSqGSIb3DQEJARYWd2VibWFzdGVyQGNoYXJhbmdhLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANYoGZS/WguHq6pRim/vSIB5qhOu
+						n6ijPVVZBurlhU7gFfVBPMY5rYdfa0H3h4QGXA9jMYdQKcpH+g7kMrmClQ8azLH/
+						d67snvtCHZ81AzIVJjGfOoHucyEVkPas6jgG5RWfpxOzQtYfm0lYc+CuTrkIojwC
+						9wpFRzWL4OEVqy5FiQygjFJBI5CpDG2EmEY+XKjp+AfAxvvZ5Vyk07Rm9gQmrk99
+						m0qG6g5JJa68p/v8VmTannqtyERmmb4PMfRjilXgWYkZegBn0pj2ltFZVKp/F0sr
+						5oVxHQE/rhxWtSz43C6yEGaZ8jIoTReQzn+ouCI4WEjJlIBvEPVnpofu34cCAwEA
+						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
+						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMruJSo1sytozEbczKQEttLtBtmmMB8G
+						A1UdIwQYMBaAFMruJSo1sytozEbczKQEttLtBtmmMA0GCSqGSIb3DQEBBQUAA4IB
+						AQBdR/7rtP4OTHjxidRF98wl6Rd/fXvEs/YdjCQlxFXNQhbT/r9TiX9Y0FCNlJYr
+						uza26IEc8Dm4oA//8eWV96mD7KErkUBvzojhkovHcOjdsFG8ceuJnpEvHkM2rDqC
+						pKD5W56d97cUdLuyAtPVjl5ho4aF0achwbrBuGXg/VpzCBzHP02WmEuxBBkhIFLV
+						XZ2jOgpiCSrVlDNm2X6Chg9g/tfgK30lN0GImnnzzSHuRlFTxgwKuDV4JeuqTsvf
+						0ImlveH8IqR28SFnSUED+nylj0Ap/8RB58BHLlZN5R6bUTKRFRdNeESGNH5i+NRc
+						lvxdpwxr83npRdyMleyUtAKF                        
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbox.charanga.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbox.charanga.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbox.charanga.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbox.charanga.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbox.charanga.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbox.charanga.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbox.charanga.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbox.charanga.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Charanga Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Charanga eLearning</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.charanga.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@charanga.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jay</md:GivenName>
+    <md:SurName>Caines-Gooby</md:SurName>
+    <md:EmailAddress>mailto:jaygooby@charanga.com</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
new file mode 100644
index 00000000..7628feeb
--- /dev/null
+++ b/swamid-interfederations-2.0/shibbox.lpplus.net-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-13T11:11: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>
+      <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>
+						MIIDEjCCAfqgAwIBAgIJAOvJq9SpMgxUMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGWxwZTFiMTEtZHBtLTAxLmxwcGx1cy5uZXQwHhcNMTIwNTIyMjE1NTA5WhcN
+						MjIwNTIwMjE1NTA5WjAkMSIwIAYDVQQDExlscGUxYjExLWRwbS0wMS5scHBsdXMu
+						bmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApgqes0bD5qoOp080
+						u+KhiD5DAzL0d64pXnU+zGbtrpGzVMATxZq+r0XXU5bChOvExcMK9ARSnekRlbiX
+						+chby5Wg9ggUEGpAJjp55n/WegNnyC0o+kLUf1A3G8QDLXBQLHrSOMzJNkCI3PGF
+						qK1VK99D/DFZ7T2mIpy0yUSSf8VSBqrdQS80KIPxvM3eo0w6ylTWiltrIYkEuSA1
+						qt5wiP8ImWQxF6zWIZPnQKMY56x6sDSO+a6PRHLk1//oqeMVJNPZNINNlJ1iBL96
+						85t29u06/bsNTXtQhRvCK3Z49tBcuwCNM30U811m6J516LWpDEbPPX7mW4Bs17Ov
+						/gbLcwIDAQABo0cwRTAkBgNVHREEHTAbghlscGUxYjExLWRwbS0wMS5scHBsdXMu
+						bmV0MB0GA1UdDgQWBBSiYyNxFCuAgnZlmNignwMcxakVmDANBgkqhkiG9w0BAQUF
+						AAOCAQEAFl5MTs2DTDRUzHeCsZfnQgJsvm0WH+Q1fOCnfLugiu3obEHoT42E4lrP
+						hVf7+ltN5YyVY8XPtORd08qBD6OtSrar+TA4gi8chwNq7uPfGYhsEa+AmHMI+FPo
+						OcaCMIbwGwsUNj0F/V3L3pM6YX1J10SCtgYlBl3Am7LWh6bjJZBiGtxMQSTLgzYI
+						nOtLHaaW7Bcm7ojKAaLROEXozphSgIcQ4ybkuJe9+NCbxtTJQii1bUVwgwVANYsT
+						pLiQ94tdCQCJyIy7nbYBCd0VPxd77phGWiJ9ORU3N1GZRfJ62CynVRY7x1Gw5zGv
+						TjoeIGCjXxAPbXggX+6qY0QO5Scj2w==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbox.lpplus.net/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <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="0"/>
+    <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="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </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
new file mode 100644
index 00000000..0217fdf2
--- /dev/null
+++ b/swamid-interfederations-2.0/shibbserver.preston.ac.uk-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						LmFjLnVrMB4XDTEzMDYyMTExNTYxNVoXDTMzMDYxNjExNTYxNVowcjELMAkGA1UE
+						BhMCR0IxEzARBgNVBAgTCkxhbmNhc2hpcmUxEDAOBgNVBAcTB1ByZXN0b24xGDAW
+						BgNVBAoTD1ByZXN0b24gQ29sbGVnZTEiMCAGA1UEAxMZc2hpYmJzZXJ2ZXIucHJl
+						c3Rvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKirj7Jb
+						E0a0tk0wGm4kACMfzDGVLCpovdU4TKE0a40zGy77oJugnCwdYPkeGFRTXL6mp64A
+						6jSJKG2PwAKsqgZ8kBlYSmsPAEqWpKGukqEVmNubJuZjlSGQW6/03/ILRP1v2FBR
+						YPa5QVL+iZDQnOabgD0xHA+5TOeyF+ncACMR6CVbf67b04nTUfMSMdPfALJmKB9t
+						LaKqb5IkNVc0UyN66BnH+KZfXyex5c8qtPTc9d6dRkpPT2OawbvhZv94U9kYzzwI
+						0UeARnr6h4dcmUjmP2KsXXpdEzyNb6H5cBYavz9+Ah2c2fQowMRe1BAaxFsYqpq7
+						c9CUEf0f37JXRnsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAjcuAywnWMGSntE85
+						+1TM+UZ9C30HujCptlqpPq9TatZLNn5Epbn9c9OFeap5yfz1T0cMF+Uj6l/+Hgbg
+						jpWIrGeD+Q3IaZ2Ogk1UbezOsHvz6TLdLnZ+TdxlVaRs500HboPa4vRb5f8tYy3p
+						HwUtkElhKcKebgtaSh48WyztxtXq3rS6FiDGrri8JKXCudW9OIsbRdOjqliPKAxf
+						RNVnEXmfbv4cN/YlvFrKtrMPOPc8PDI8GPtHap8DHTyVLrw+0PGX8P4tJ+m8GUMC
+						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>
+						MIIDYDCCAkgCCQDkmtqgfo843jANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
+						QjETMBEGA1UECBMKTGFuY2FzaGlyZTEQMA4GA1UEBxMHUHJlc3RvbjEYMBYGA1UE
+						ChMPUHJlc3RvbiBDb2xsZWdlMSIwIAYDVQQDExlzaGliYnNlcnZlci5wcmVzdG9u
+						LmFjLnVrMB4XDTEzMDYyMTExNTYxNVoXDTMzMDYxNjExNTYxNVowcjELMAkGA1UE
+						BhMCR0IxEzARBgNVBAgTCkxhbmNhc2hpcmUxEDAOBgNVBAcTB1ByZXN0b24xGDAW
+						BgNVBAoTD1ByZXN0b24gQ29sbGVnZTEiMCAGA1UEAxMZc2hpYmJzZXJ2ZXIucHJl
+						c3Rvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKirj7Jb
+						E0a0tk0wGm4kACMfzDGVLCpovdU4TKE0a40zGy77oJugnCwdYPkeGFRTXL6mp64A
+						6jSJKG2PwAKsqgZ8kBlYSmsPAEqWpKGukqEVmNubJuZjlSGQW6/03/ILRP1v2FBR
+						YPa5QVL+iZDQnOabgD0xHA+5TOeyF+ncACMR6CVbf67b04nTUfMSMdPfALJmKB9t
+						LaKqb5IkNVc0UyN66BnH+KZfXyex5c8qtPTc9d6dRkpPT2OawbvhZv94U9kYzzwI
+						0UeARnr6h4dcmUjmP2KsXXpdEzyNb6H5cBYavz9+Ah2c2fQowMRe1BAaxFsYqpq7
+						c9CUEf0f37JXRnsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAjcuAywnWMGSntE85
+						+1TM+UZ9C30HujCptlqpPq9TatZLNn5Epbn9c9OFeap5yfz1T0cMF+Uj6l/+Hgbg
+						jpWIrGeD+Q3IaZ2Ogk1UbezOsHvz6TLdLnZ+TdxlVaRs500HboPa4vRb5f8tYy3p
+						HwUtkElhKcKebgtaSh48WyztxtXq3rS6FiDGrri8JKXCudW9OIsbRdOjqliPKAxf
+						RNVnEXmfbv4cN/YlvFrKtrMPOPc8PDI8GPtHap8DHTyVLrw+0PGX8P4tJ+m8GUMC
+						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>
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
new file mode 100644
index 00000000..d10547ff
--- /dev/null
+++ b/swamid-interfederations-2.0/shibbsrv1.gsa.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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
+						LnVrMB4XDTEzMDQxMDE0Mjc1MloXDTMzMDQwNTE0Mjc1MlowbzELMAkGA1UEBhMC
+						R0IxEDAOBgNVBAgTB0dsYXNnb3cxFzAVBgNVBAcTDlJlbmZyZXcgU3RyZWV0MRcw
+						FQYDVQQKEw5SZW5mcmV3IFN0cmVldDEcMBoGA1UEAxMTc2hpYmJzcnYxLmdzYS5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyvtXXL1ZjqGV45
+						QRqdOrqXaX+trM2srXsh74k8UfivA5QxDAho548YVlcdmnm/d1kSTYSIHzD1IZu0
+						1HD2X3RehRORQTiejQQl+KfZa3HNwVc96PqkQ3UDmsTLwkzCnKToto3SVqEmflGG
+						ibj1SUA8kr/4kYmO/EZEIyhDq0dWYlx4iMQGHoUUHUp1FBDFRfOffBjUVyoDGzbM
+						cZesKVyJLIMuwZdWYm8diYnQggNHw17N0t/FsgKbUnPA1Wj2w5bE2sObR/eGCRv1
+						/QgiPvuW0qawibwgfdNYr+u6x8ZB9D1CA5xwSAmLhxDxAG8Vn34e/j51doS1ET5U
+						rR071ccCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAzBfS3T2zWUe+nCXopLOASUxv
+						Jzx4WHXsLbuR5I9dA/l1GXdQkgswDwMvSBh+eP6bLe2qncKOys/2QLx2R1g/ata2
+						dxACjh5t68Aca5xKfxD4Axnyzu2j0aW3CojrR0SlzIAiXEWzQAOwUM9FtEYfrcDc
+						SauS3ziuUbHzzLufHrnuKOvzyTv/6acMNnlL4JZQPTUtMluzdNxApbsndvYuOty+
+						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>
+						MIIDWjCCAkICCQCivWPQEvRbljANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJH
+						QjEQMA4GA1UECBMHR2xhc2dvdzEXMBUGA1UEBxMOUmVuZnJldyBTdHJlZXQxFzAV
+						BgNVBAoTDlJlbmZyZXcgU3RyZWV0MRwwGgYDVQQDExNzaGliYnNydjEuZ3NhLmFj
+						LnVrMB4XDTEzMDQxMDE0Mjc1MloXDTMzMDQwNTE0Mjc1MlowbzELMAkGA1UEBhMC
+						R0IxEDAOBgNVBAgTB0dsYXNnb3cxFzAVBgNVBAcTDlJlbmZyZXcgU3RyZWV0MRcw
+						FQYDVQQKEw5SZW5mcmV3IFN0cmVldDEcMBoGA1UEAxMTc2hpYmJzcnYxLmdzYS5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyvtXXL1ZjqGV45
+						QRqdOrqXaX+trM2srXsh74k8UfivA5QxDAho548YVlcdmnm/d1kSTYSIHzD1IZu0
+						1HD2X3RehRORQTiejQQl+KfZa3HNwVc96PqkQ3UDmsTLwkzCnKToto3SVqEmflGG
+						ibj1SUA8kr/4kYmO/EZEIyhDq0dWYlx4iMQGHoUUHUp1FBDFRfOffBjUVyoDGzbM
+						cZesKVyJLIMuwZdWYm8diYnQggNHw17N0t/FsgKbUnPA1Wj2w5bE2sObR/eGCRv1
+						/QgiPvuW0qawibwgfdNYr+u6x8ZB9D1CA5xwSAmLhxDxAG8Vn34e/j51doS1ET5U
+						rR071ccCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAzBfS3T2zWUe+nCXopLOASUxv
+						Jzx4WHXsLbuR5I9dA/l1GXdQkgswDwMvSBh+eP6bLe2qncKOys/2QLx2R1g/ata2
+						dxACjh5t68Aca5xKfxD4Axnyzu2j0aW3CojrR0SlzIAiXEWzQAOwUM9FtEYfrcDc
+						SauS3ziuUbHzzLufHrnuKOvzyTv/6acMNnlL4JZQPTUtMluzdNxApbsndvYuOty+
+						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>
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
new file mode 100644
index 00000000..f6de3d28
--- /dev/null
+++ b/swamid-interfederations-2.0/shibby.wmc.ac.uk-shibboleth-idp.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmB+fHJr1LUyR9Z4JroVqJhPy
+						OkmecEdAqw1uuIFVlyZ+XH4yxYE8fcOww4aKm0vEs6QRvrMHwr4w0ndRb2W/iWHK
+						BGBfsafixfxI/aS40pc3OTzoXpo11535MsOzg4yTzulhKwi5MgYqX+Zb9Q/XaLFd
+						mAkZC45yIjpPQvzjgHLHNW27dlfQiCdy9lzsL68FrYVHuZTV3AVAEyczC33HoRUA
+						ReCN5EJFpvbYL1NfsqaAQF7C9Yyga0WCTSjKugWEi3gjOePo6MFztyHYU8LvDeYx
+						6vBtcnI1VjIycVHgI1g/t6MPm7buiaEJPl9230fcHZIG15/M8UqLxzM2Phru7wID
+						AQABo2cwZTBEBgNVHREEPTA7ghBzaGliYnkud21jLmFjLnVrhidodHRwczovL3No
+						aWJieS53bWMuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMcgJtREB6nk
+						HiCQfshoRqRshvq6MA0GCSqGSIb3DQEBBQUAA4IBAQAp8LRX6cOK/u0y/bA8HCt7
+						3PyZAwXyAGN905x9Yd7PCdnRxiI+WMKmuD01M71FM6apJFsHHkHv8IgvTZb10yXm
+						bIbgE1718NiZTL33E08l+QAPUp/5AsEv4HFOmVgyOO5149w2pdwft/z23acf2fVV
+						ddz5OPjsJSdkZP//qO0C6lKsE+rlRXdBkuUVKopVPGLWV5xzk2yCzeIj6V/nzDbf
+						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>
+						MIIDLDCCAhSgAwIBAgIVAJm8LRnbbTtCyAebesXC3JGiCv8lMA0GCSqGSIb3DQEB
+						BQUAMBsxGTAXBgNVBAMTEHNoaWJieS53bWMuYWMudWswHhcNMTIxMTAyMTYxNDQx
+						WhcNMzIxMTAyMTYxNDQxWjAbMRkwFwYDVQQDExBzaGliYnkud21jLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmB+fHJr1LUyR9Z4JroVqJhPy
+						OkmecEdAqw1uuIFVlyZ+XH4yxYE8fcOww4aKm0vEs6QRvrMHwr4w0ndRb2W/iWHK
+						BGBfsafixfxI/aS40pc3OTzoXpo11535MsOzg4yTzulhKwi5MgYqX+Zb9Q/XaLFd
+						mAkZC45yIjpPQvzjgHLHNW27dlfQiCdy9lzsL68FrYVHuZTV3AVAEyczC33HoRUA
+						ReCN5EJFpvbYL1NfsqaAQF7C9Yyga0WCTSjKugWEi3gjOePo6MFztyHYU8LvDeYx
+						6vBtcnI1VjIycVHgI1g/t6MPm7buiaEJPl9230fcHZIG15/M8UqLxzM2Phru7wID
+						AQABo2cwZTBEBgNVHREEPTA7ghBzaGliYnkud21jLmFjLnVrhidodHRwczovL3No
+						aWJieS53bWMuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMcgJtREB6nk
+						HiCQfshoRqRshvq6MA0GCSqGSIb3DQEBBQUAA4IBAQAp8LRX6cOK/u0y/bA8HCt7
+						3PyZAwXyAGN905x9Yd7PCdnRxiI+WMKmuD01M71FM6apJFsHHkHv8IgvTZb10yXm
+						bIbgE1718NiZTL33E08l+QAPUp/5AsEv4HFOmVgyOO5149w2pdwft/z23acf2fVV
+						ddz5OPjsJSdkZP//qO0C6lKsE+rlRXdBkuUVKopVPGLWV5xzk2yCzeIj6V/nzDbf
+						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>
diff --git a/swamid-interfederations-2.0/shibdev.ltscotland.com-shibboleth.xml b/swamid-interfederations-2.0/shibdev.ltscotland.com-shibboleth.xml
new file mode 100644
index 00000000..d3d10487
--- /dev/null
+++ b/swamid-interfederations-2.0/shibdev.ltscotland.com-shibboleth.xml
@@ -0,0 +1,69 @@
+<?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>
+    <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>
+      <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>
+						MIIDEjCCAfqgAwIBAgIJALr0olzkd9TzMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGWx0c2UtZGV2MDEubHRzY290bGFuZC5jb20wHhcNMTAwMzAzMTIyMjEyWhcN
+						MjAwMjI5MTIyMjEyWjAkMSIwIAYDVQQDExlsdHNlLWRldjAxLmx0c2NvdGxhbmQu
+						Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3MIiCvfKQ/w1RYJg
+						bp1tfVWaaCH66IQO0yE2PG0Eotdg+GR/LVfQlY9QXJj7Kvj1UqsncmIia9hK9Td/
+						onmydjcfxsheeLPDkS9H8EUTJSn1yNfq/4bMJ03Wn+/gT/UWVtyhRBvCMwA/gdUJ
+						nyQTdKBOLOYCzSr1Q3X8NlBmezmsw1mAu1wa+nyWciUP4d7pH+5h4oHCXHzAyw2I
+						5HHCTzN8bR2Q5y6W0yCXfcM/ChbO1ii3uHwnLruN1LKBqvmirLk7UlkCITpaYLmC
+						a2eS2ZkA3bMEbixGL5osjpUah5GB9tB/IK5EKkXxSrlyE+TvBIoXx5HKWEyLb6PO
+						HhY76wIDAQABo0cwRTAkBgNVHREEHTAbghlsdHNlLWRldjAxLmx0c2NvdGxhbmQu
+						Y29tMB0GA1UdDgQWBBQQVXRf9vWh6lfW092XrIDlT6WLejANBgkqhkiG9w0BAQUF
+						AAOCAQEAyrRlJ79mn0tmcyiAX6HsYcnBvITOztgXcyHmnGMSAwqpWDidderSwgso
+						P82PaffnZkYc62eOrMbDqOdPjhpUT7DepyRRjIxdmZq5DiC1u+XweoQhe0EO4qAG
+						xrp6528ksWgecUNgh28/Mw2MmsbVeuZY4hIUiTE+dUCaH+85e8i7MBnycNrJVDco
+						wRbczc6a1T+FCSy+cYF5TLdZXQneRVv9VxTmhgsXpES+gwKiFO2YrqySuVbE8P5A
+						EWiBnZJb0MdjMCENixhuHes8WRqs5CZ3GRqswZ1WdQJI7YirJLzaSydiasXH/QqL
+						eoQwxslZb8rsMUyN8K/+4EGSsAa35g==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..b7482ebf
--- /dev/null
+++ b/swamid-interfederations-2.0/shibdev.shef.ac.uk-shibboleth.xml
@@ -0,0 +1,114 @@
+<?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>
+      <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
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSc2hpYmRldi5z
+						aGVmLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq0TlVbOQ
+						ComVMFNLl1MPD2RkIrJXoaAZlR+ezoCmdec4rv5SadlGQSXFiGsiw9fhjkS/bb1p
+						TfqxwdcBGJQ2FSw5Hig+vlVDiPo/BEA0H0ejnRZ7RwYe4q3gKentjhJ9OyI3qBkX
+						wPMFfX4x+CG0sML/SC26omReQUVLFBJR0tHlIOiKgsbvHPY2ih9FcvWYhckG/VMd
+						0VwAhWzue7c6e/f6HASq1V4ovtlgmbbvaWgah01iPHiCzG/Yo9SbGewHObj5GR7K
+						FC7ayORvM6tzKoR5JmJ8QX9IYuiH0wuoNFDz9kQtMvZJBjEGYq8hsYgJACC5S8Dt
+						vF2JFzmsUM43hwIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+						N1dH6pDjue0wHQYDVR0OBBYEFB+0r9UYq6Ytp9e3hwqSARAVypaSMA4GA1UdDwEB
+						/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+						BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+						MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+						LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+						LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+						b2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJzaGliZGV2LnNoZWYuYWMu
+						dWswDQYJKoZIhvcNAQEFBQADggEBADAWzwonR3Un1FKUk5dQyOe5ugNt+jqIQ8MX
+						9CVYHWFpT76cH6jw9xRPooIigi+qUAMfdDhustmzMHJwapt1cKLCuwbsFXTQS4r4
+						b9wWuemt/4hefT+Cv8h+oo4uCxEipD2H20c+I7bS0TcejN9/HeO378rSAAvI40Mo
+						eq4++mTN6M8HJRBOOtfwU0dpQ/ln6PkOSsXGvDcklLsMaMfM+IE+4vq1cF0jPZ2n
+						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>
+						MIIEcjCCA1qgAwIBAgIRAPsd0lQ3zA9qshZ/AtQzPukwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA5MzAwMDAwMDBaFw0xNjA5MjkyMzU5NTlaMEAxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSc2hpYmRldi5z
+						aGVmLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq0TlVbOQ
+						ComVMFNLl1MPD2RkIrJXoaAZlR+ezoCmdec4rv5SadlGQSXFiGsiw9fhjkS/bb1p
+						TfqxwdcBGJQ2FSw5Hig+vlVDiPo/BEA0H0ejnRZ7RwYe4q3gKentjhJ9OyI3qBkX
+						wPMFfX4x+CG0sML/SC26omReQUVLFBJR0tHlIOiKgsbvHPY2ih9FcvWYhckG/VMd
+						0VwAhWzue7c6e/f6HASq1V4ovtlgmbbvaWgah01iPHiCzG/Yo9SbGewHObj5GR7K
+						FC7ayORvM6tzKoR5JmJ8QX9IYuiH0wuoNFDz9kQtMvZJBjEGYq8hsYgJACC5S8Dt
+						vF2JFzmsUM43hwIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+						N1dH6pDjue0wHQYDVR0OBBYEFB+0r9UYq6Ytp9e3hwqSARAVypaSMA4GA1UdDwEB
+						/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+						BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+						MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+						LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+						LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+						b2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJzaGliZGV2LnNoZWYuYWMu
+						dWswDQYJKoZIhvcNAQEFBQADggEBADAWzwonR3Un1FKUk5dQyOe5ugNt+jqIQ8MX
+						9CVYHWFpT76cH6jw9xRPooIigi+qUAMfdDhustmzMHJwapt1cKLCuwbsFXTQS4r4
+						b9wWuemt/4hefT+Cv8h+oo4uCxEipD2H20c+I7bS0TcejN9/HeO378rSAAvI40Mo
+						eq4++mTN6M8HJRBOOtfwU0dpQ/ln6PkOSsXGvDcklLsMaMfM+IE+4vq1cF0jPZ2n
+						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>
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
new file mode 100644
index 00000000..bfd8e5d6
--- /dev/null
+++ b/swamid-interfederations-2.0/shibdev2.stir.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,125 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stir.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFczCCBFugAwIBAgIQIL2D0diB6YBG+8rOQmekSzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTE0MDUxMzAwMDAwMFoXDTE3MDUxMjIzNTk1OVowQTEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNzaGliZGV2Mi5z
+						dGlyLmFjLnVrMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwgrFtR/J
+						voK7/c+KDX0XUZqQkDnx+XwAvkJwRvRWJDgMmqajuC10ksTw9T/CW65BCXDpRI/x
+						TAn2ktYvR+JdfV3IeV6oBdur4f6jlSipKZOfDXej7Ypi/kQjCrjKvS3zboCYq4y2
+						rV+/N8bW8z/vFjgaogmCROoGAJrISVZnGuXuMwoldN5qgzdaAFuiZ8wuVnWkFIIm
+						fnDCxDgtIWSF+xD4KIhZPOVM/jEdn/DuVTbWIZtddlx8RlnVlBEjQ0qY+ggXejXf
+						5Ny6vgNK8wmKHbR+eZQNfh+EwmdbTwHPWSZBUaz9qGDcxgB2I0NNHKOGl4+O3BL6
+						IVIPqgIdrR8XLD7xd0uT2iKOKGANHUq0HLkCSEfL9G6zvL7eTWYaoQEbgiLt4MvO
+						P0b6LYmcyfIILi3N0gm854nw9LIwfOtu90P1wf0QKCJ7VWPws85dBKurKVOeT05l
+						IT5mSE9I2VczG+iLJye2ty3Y7fUlMsA47nlc3lQ6ECjZIfEK9yBxzi9E7TuMZD5m
+						rbq1FBJ/t09GO7WfvIAujaetCZhBBa5/cs7H1C5jY6AOXOnMjjvt0KjMD4SI1qAT
+						mqSz7F19C/qTIpfEtB1b0uA16G1txrCsPOys6qy0LeOTlPZcx6VUMHj5GQwsd3jl
+						myZ1va1yq7muxs8EAjOoHb8I+JMT52Zsi6ECAwEAAaOCAXAwggFsMB8GA1UdIwQY
+						MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTk+Ch3PUz9vlaFREMq
+						xqML3xNPxDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
+						BggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAI
+						BgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5h
+						Lm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAC
+						hilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggr
+						BgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYIT
+						c2hpYmRldjIuc3Rpci5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAoY+8HykdGG3j
+						Wo9U/RTQsGUejsaafMPPjcpQjFep0GI3S+cDFYiw4RNuumhlM7FvJQQ2+exogkG6
+						xlXSj4KxuXfY5aYRcV5hnHGQE/9AzClpYiilVQmPoVkfd3dmHAcDkp5ka7j+0MyA
+						ceB0T51gFWY3u+Idd96z4xrJDbVenn0dy1HsvNsaiozrndzXdpGWs0XDumic7jxZ
+						bavf0Ovny/qEwpR5vrSyEr2rwqzs8crHw4HTtekaTUnzXyBZ+HidfEDq7T+qVw2k
+						JJDXl3JKJ9QAJhoJsVEdDNBO6NqODHT+mLQl3OoHTxHoF74zn1LJw06SRNBAwkvm
+						ky1VDCZ6sw==
+					</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFczCCBFugAwIBAgIQIL2D0diB6YBG+8rOQmekSzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTE0MDUxMzAwMDAwMFoXDTE3MDUxMjIzNTk1OVowQTEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNzaGliZGV2Mi5z
+						dGlyLmFjLnVrMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwgrFtR/J
+						voK7/c+KDX0XUZqQkDnx+XwAvkJwRvRWJDgMmqajuC10ksTw9T/CW65BCXDpRI/x
+						TAn2ktYvR+JdfV3IeV6oBdur4f6jlSipKZOfDXej7Ypi/kQjCrjKvS3zboCYq4y2
+						rV+/N8bW8z/vFjgaogmCROoGAJrISVZnGuXuMwoldN5qgzdaAFuiZ8wuVnWkFIIm
+						fnDCxDgtIWSF+xD4KIhZPOVM/jEdn/DuVTbWIZtddlx8RlnVlBEjQ0qY+ggXejXf
+						5Ny6vgNK8wmKHbR+eZQNfh+EwmdbTwHPWSZBUaz9qGDcxgB2I0NNHKOGl4+O3BL6
+						IVIPqgIdrR8XLD7xd0uT2iKOKGANHUq0HLkCSEfL9G6zvL7eTWYaoQEbgiLt4MvO
+						P0b6LYmcyfIILi3N0gm854nw9LIwfOtu90P1wf0QKCJ7VWPws85dBKurKVOeT05l
+						IT5mSE9I2VczG+iLJye2ty3Y7fUlMsA47nlc3lQ6ECjZIfEK9yBxzi9E7TuMZD5m
+						rbq1FBJ/t09GO7WfvIAujaetCZhBBa5/cs7H1C5jY6AOXOnMjjvt0KjMD4SI1qAT
+						mqSz7F19C/qTIpfEtB1b0uA16G1txrCsPOys6qy0LeOTlPZcx6VUMHj5GQwsd3jl
+						myZ1va1yq7muxs8EAjOoHb8I+JMT52Zsi6ECAwEAAaOCAXAwggFsMB8GA1UdIwQY
+						MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTk+Ch3PUz9vlaFREMq
+						xqML3xNPxDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
+						BggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAI
+						BgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5h
+						Lm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAC
+						hilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggr
+						BgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYIT
+						c2hpYmRldjIuc3Rpci5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAoY+8HykdGG3j
+						Wo9U/RTQsGUejsaafMPPjcpQjFep0GI3S+cDFYiw4RNuumhlM7FvJQQ2+exogkG6
+						xlXSj4KxuXfY5aYRcV5hnHGQE/9AzClpYiilVQmPoVkfd3dmHAcDkp5ka7j+0MyA
+						ceB0T51gFWY3u+Idd96z4xrJDbVenn0dy1HsvNsaiozrndzXdpGWs0XDumic7jxZ
+						bavf0Ovny/qEwpR5vrSyEr2rwqzs8crHw4HTtekaTUnzXyBZ+HidfEDq7T+qVw2k
+						JJDXl3JKJ9QAJhoJsVEdDNBO6NqODHT+mLQl3OoHTxHoF74zn1LJw06SRNBAwkvm
+						ky1VDCZ6sw==
+					</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>
diff --git a/swamid-interfederations-2.0/shibfederation.scientia.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shibfederation.scientia.com-shibboleth-sp.xml
new file mode 100644
index 00000000..e4cce735
--- /dev/null
+++ b/swamid-interfederations-2.0/shibfederation.scientia.com-shibboleth-sp.xml
@@ -0,0 +1,66 @@
+<?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://shibfederation.scientia.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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibfederation.scientia.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Scientia Ltd</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Suppliers of resource management software, including timetabling and room booking, to higher and further education institutions</mdui:Description>
+        <mdui:Logo height="106" width="145">https://shibfederation.scientia.com/SciLogo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC7jCCAdagAwIBAgIJALUmSoZ/nhXKMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDWNhbS1ocS1kLXNoaWIwHhcNMTIwMTA1MTIzNzI0WhcNMjIwMTAyMTIzNzI0
+						WjAYMRYwFAYDVQQDEw1jYW0taHEtZC1zaGliMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAvvEtt6F0MPyMWhtA09h6qNKFwRoVVVK//Ob4WbTMkjjuO1QP
+						jFT958wdcKdwIam0d5pg0cx/UaYUUJ0EdXMh4Q6yZNS93WrRtodCnUupAqh4KiiW
+						uKVpNN5zcM+uUwvK1PIksL+KXmj8xUZkho/iD8hnY53Kdd7p9qAx5KZIo0nH07ja
+						nvQhtJjqlhF7DndPXQqCHs7SgP3DRUVQyxTfFz0soqwgLNSFN98k+P0HUrgWyL2O
+						UWCLMk3l1nUYvo4vFKnrQsrkGudico9LIO6pemDzKoGWuJGvdzPfUqOYTraOZEW7
+						8p34N3qSDFLFK0mmkuDEzEJinbgv5lg44i9RtwIDAQABozswOTAYBgNVHREEETAP
+						gg1jYW0taHEtZC1zaGliMB0GA1UdDgQWBBRr4P0aIY3MN4nd8qZuZGwCoktgWDAN
+						BgkqhkiG9w0BAQUFAAOCAQEAcV9DdlcmZzYNK8X5n2nGmFOefRJLV8FHaw8R0Q5c
+						SUhUljXnPsg9QdVXs9FQDFublEKxzLkfr2rxiwL5oQKAyhEbYMjRLi0giCQ+zELy
+						xqT2IDXConQSIxOnlDEv7a0QCqy7luUpRbW+m8c5l9Q/02y9A7CN0AfU99yLzua6
+						mGdq90mfCHKbGw1fsxmOFwUFTPjYkJ6V9BoKAx46IrmahvllnGIRjUMYkcQcM+qN
+						0IDuIE9DmXK2avh/8h4afo2uRZVKxTLi/e4nrk/hZGdOaREmzxYTh18IZ85+JdDY
+						xpo3Zin7muZ026j4rqBuHFQyAaJoKcKU2m8kaKte2Mym8Q==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibfederation.scientia.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibfederation.scientia.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibfederation.scientia.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibfederation.scientia.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibfederation.scientia.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Scientia Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Scientia Service Provider</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.scientia.com/uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Bulman</md:SurName>
+    <md:EmailAddress>mailto:Richard_Bulman@scientia.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Strong</md:SurName>
+    <md:EmailAddress>mailto:Michael_Strong@scientia.com</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
new file mode 100644
index 00000000..85b74fd5
--- /dev/null
+++ b/swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDOzCCAiOgAwIBAgIUTSdt0Dt8swpFu9qJLBfnEV09alwwDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUc2hpYmlkcC5jY2EudW5pcGQuaXQwHhcNMTAxMjI5MTgz
+NjIyWhcNMzAxMjI5MTgzNjIyWjAfMR0wGwYDVQQDExRzaGliaWRwLmNjYS51bmlw
+ZC5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJMiK2A2ZC6vp69H
+sIR2wqYEMMkDfhs91u1UhDibfc1kT3LZEPN42L6B95s1TZb6+f1M5YDCmDzmHrlA
+YkFbK/yW2jSHXuTR+dSP071d+Xa+00qrokGotUYyqstfqOjiAhVyC4vDVwDgAPj3
+1K9wCjrZcazt3NZC6mPD9XJBQ1YJ6sDvk6y+UVQfeHoKKrAC9MSoFMRwoLI9izIq
+7NbqOLV9pDjV4GvspxJs00krQiATzoYblatuR4xtSHcSpmYFqD6VCTosKwISLqKA
+erlsKlyfKSBF7xuan+lgzJLSLWvvhj+Bv0oRfOJnQEsP1vjG/s9J8RQPee/HdmjQ
+kKiHOF0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmlkcC5jY2EudW5pcGQuaXSG
+K2h0dHBzOi8vc2hpYmlkcC5jY2EudW5pcGQuaXQvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFGYTCKzj5155S2lqpPV5/6I1jePjMA0GCSqGSIb3DQEBBQUAA4IBAQAM
+OKvcKfl2rMZS1ivnvOcDNNwgXEaa27Vre4D6PxMhR4dM3UvdS+qP2pL6M2guI95K
+HSR4VUoHXw4Hnq5Hk9yyCBp38xmPs7AefGcbYvgf3nx75CEtXE9jDG35tL9lgted
+d1Ksu3uT3jxKcPTVqdNWnTB7N2TYoWJhbGOmC1US4iMzp5UEGrvdZUvcZI+6/VsG
+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>
+MIIDOzCCAiOgAwIBAgIUTSdt0Dt8swpFu9qJLBfnEV09alwwDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUc2hpYmlkcC5jY2EudW5pcGQuaXQwHhcNMTAxMjI5MTgz
+NjIyWhcNMzAxMjI5MTgzNjIyWjAfMR0wGwYDVQQDExRzaGliaWRwLmNjYS51bmlw
+ZC5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJMiK2A2ZC6vp69H
+sIR2wqYEMMkDfhs91u1UhDibfc1kT3LZEPN42L6B95s1TZb6+f1M5YDCmDzmHrlA
+YkFbK/yW2jSHXuTR+dSP071d+Xa+00qrokGotUYyqstfqOjiAhVyC4vDVwDgAPj3
+1K9wCjrZcazt3NZC6mPD9XJBQ1YJ6sDvk6y+UVQfeHoKKrAC9MSoFMRwoLI9izIq
+7NbqOLV9pDjV4GvspxJs00krQiATzoYblatuR4xtSHcSpmYFqD6VCTosKwISLqKA
+erlsKlyfKSBF7xuan+lgzJLSLWvvhj+Bv0oRfOJnQEsP1vjG/s9J8RQPee/HdmjQ
+kKiHOF0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmlkcC5jY2EudW5pcGQuaXSG
+K2h0dHBzOi8vc2hpYmlkcC5jY2EudW5pcGQuaXQvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFGYTCKzj5155S2lqpPV5/6I1jePjMA0GCSqGSIb3DQEBBQUAA4IBAQAM
+OKvcKfl2rMZS1ivnvOcDNNwgXEaa27Vre4D6PxMhR4dM3UvdS+qP2pL6M2guI95K
+HSR4VUoHXw4Hnq5Hk9yyCBp38xmPs7AefGcbYvgf3nx75CEtXE9jDG35tL9lgted
+d1Ksu3uT3jxKcPTVqdNWnTB7N2TYoWJhbGOmC1US4iMzp5UEGrvdZUvcZI+6/VsG
+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>
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
new file mode 100644
index 00000000..2fc686b6
--- /dev/null
+++ b/swamid-interfederations-2.0/shibidp.kgv.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?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>
+      <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
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNzquN3Npl2h/H2EYoayIP
+						pfTpjPN10gvpYWT1OeMeGrGcTzwetB0UZaE4YYFmpfo+4LJH+wJMUY1FaLLw+GbE
+						XUsgaz3ungFsqyaMagEkBhHukrpDTbbU9daprg512h4HKckfdhnc0km7yXmB9dG9
+						7ahJvvxlirB0yM9VWK7c+b2AoGKDFLT1SDM/x2oSqP7VWouGg+ncxZvRvkyvx5oI
+						WfqoM6o3B7FF0N+XdZdiDiAtv7GqttiusFQvfHHLovREyrWgeIzUIeP7JcQ57gEa
+						RZRAqfI0M0FUKnIQrnks3u4pwhx6QyIpb6sk2GZ4rSAKs0FZElgVd+X8LxzC9YIf
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWJpZHAua2d2LmFjLnVrhihodHRwczov
+						L3NoaWJpZHAua2d2LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQXGuRc
+						d8maaWEM20jGXTwh0ag9bDANBgkqhkiG9w0BAQUFAAOCAQEAl85FH7yO5IZtaYZ3
+						Yx04UDAeMMS1LWAgLvz/tEyBK4/Fru7wDuPPhvT4UPtMfg37tKqPXzDisAXAulWP
+						0FGUHbDgIMVQ5etmv2hk6Ck/2QdTQ45FTS22xTiveTP0pUYwg3owS4on/hp4KAAb
+						VbRxFyQM5onKMCk2XREtfCWThnz+ftuhxJV7pfQMzHaR6Ws2saYHI6bk2TldpQXC
+						BzvBJQvwHShZeIlmDzHVNPfpyqDYE0lO2XiqqnHEAImYHuNKoAvgj5jJcViFhWXI
+						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>
+						MIIDMDCCAhigAwIBAgIVANzd8W7p4MbyVI3/OVktKiz5Ch7uMA0GCSqGSIb3DQEB
+						BQUAMBwxGjAYBgNVBAMTEXNoaWJpZHAua2d2LmFjLnVrMB4XDTE0MDUwODE1MDE1
+						NloXDTM0MDUwODE1MDE1NlowHDEaMBgGA1UEAxMRc2hpYmlkcC5rZ3YuYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNzquN3Npl2h/H2EYoayIP
+						pfTpjPN10gvpYWT1OeMeGrGcTzwetB0UZaE4YYFmpfo+4LJH+wJMUY1FaLLw+GbE
+						XUsgaz3ungFsqyaMagEkBhHukrpDTbbU9daprg512h4HKckfdhnc0km7yXmB9dG9
+						7ahJvvxlirB0yM9VWK7c+b2AoGKDFLT1SDM/x2oSqP7VWouGg+ncxZvRvkyvx5oI
+						WfqoM6o3B7FF0N+XdZdiDiAtv7GqttiusFQvfHHLovREyrWgeIzUIeP7JcQ57gEa
+						RZRAqfI0M0FUKnIQrnks3u4pwhx6QyIpb6sk2GZ4rSAKs0FZElgVd+X8LxzC9YIf
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWJpZHAua2d2LmFjLnVrhihodHRwczov
+						L3NoaWJpZHAua2d2LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQXGuRc
+						d8maaWEM20jGXTwh0ag9bDANBgkqhkiG9w0BAQUFAAOCAQEAl85FH7yO5IZtaYZ3
+						Yx04UDAeMMS1LWAgLvz/tEyBK4/Fru7wDuPPhvT4UPtMfg37tKqPXzDisAXAulWP
+						0FGUHbDgIMVQ5etmv2hk6Ck/2QdTQ45FTS22xTiveTP0pUYwg3owS4on/hp4KAAb
+						VbRxFyQM5onKMCk2XREtfCWThnz+ftuhxJV7pfQMzHaR6Ws2saYHI6bk2TldpQXC
+						BzvBJQvwHShZeIlmDzHVNPfpyqDYE0lO2XiqqnHEAImYHuNKoAvgj5jJcViFhWXI
+						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>
diff --git a/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml
new file mode 100644
index 00000000..4b8d9f4c
--- /dev/null
+++ b/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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="fr">Observatoire de la Côte d'Azur</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEajCCA1KgAwIBAgIRAIf9yjW7+yzJysfx2J6FNSMwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMDwxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOc2hpYmlkcC5v
+Y2EuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2ZMqKhwIA1xBC
+EBCO+wpjOq7EhVrZd216X+8M5bWSahDG82CE4doLvwb5DAfWgb3Q6Me7lKj5L8WW
+GUGuhIBKqFiyyh+qzrL76vfbh3TDhHct3macXDfEcn2oH2zRQLaQ7uiGOtvlSpAu
+ZSTiVGkmIFF+LU6VCSqWFHgqKDjJl7LQhCJ+bprdbbbBqUTXofWlFmZUAsr6uxKg
+bYQW4T40gGaZVM5TnYiCwQnYLId09UjivjvbreCbK2Xu2Wu7LV1VdlWaxXyWEStw
+tMb1XYBorpnvx8O5v4oOuHHkMsqbh846EsgTUlCx6YCjfGJKkXM+x31DQlxonvky
+BW9SfioNAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQUNMas5UrwCLjDZ2CgSW/QRLyatm0wDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDnNoaWJpZHAub2NhLmV1MA0GCSqG
+SIb3DQEBBQUAA4IBAQB6rhBitpV+rUiGYLQzKOFiF+a7+l7YYxdQd/E3hYctCzDj
+kx+1kLBLgg5AzWwtQJLpjxSa1+EY2F+7qWzLRtcNk1qj3zWJaJTmoss/7VnImu8w
+1WatAbY6YUAwqSK2UwSNVpjmcicncILNDhvp9YAOWbKLywKdZRO0QY/ri617we6R
+kCUcE5Ilz09S6b5aW+7aggZUciXDQLvjhdeYUhjNnIfLI7xHmmonebUZ5FLWqZlT
+65MeLzedeC8die2Q4iXL2VBdX2W4tHVMY6EmiKTcWLjEgvGqdZksWdPEkjOfAdnZ
+W9wN2CGinBD5hb6yOqDycAeJXd3DkGrWzSGIoXyp
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEajCCA1KgAwIBAgIRAPctB3OrtZ/DMXYngPzb1p0wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzA2MjQwMDAwMDBaFw0xNjA2MjMyMzU5NTlaMDwxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOc2hpYmlkcC5v
+Y2EuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNvpKIsWyO2FYq
+vWbwJoDZp3ISutces7YEgBLIttUEo/CzAG2nyVLn1QBdT2uBNlPPqwhxCYsUN4n1
+aK+ZSTII5sOm/8rc0UL6KVNpFpr+EE/F0gPiFLz8DvUpLjHbpIfLFg/WeoHmPxqd
+mDsGXBB2VpYk/nlz5+w+hd75oQgnnrwGOGHgW6RNeJJaKAyaBGD1GVKOdHW3IIKT
+yNW9gJEzrfPxW5k0PKwHGPQKwnVbE17OsSeZnR9JSVUQl0NHGw9+DPMiwwOLrt7r
+XalAOKvuiwHftWcffyhiEColQuMEoKGrJgrNveBxBt9ba7SMZtLX8gtxiks2l2FT
+5Xy2872RAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQUfKfBUhc3bS+3XyoSTHXxtHoU3cYwDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDnNoaWJpZHAub2NhLmV1MA0GCSqG
+SIb3DQEBBQUAA4IBAQCWshenf9oAyyQ7DMDYda6jKQLroVk179R9t4/IAjiz/QUN
+aJxe3ZSnNOXqFgbICMPD2ZNne3nM5hFCSPeeoPaxIyAYb4k0cv3FqYp8Zwlk/Md4
+WRsCETFGz1w6FK50fhf3UKxpb6BtMQkaaS3FXx8iaQl/PdT0NQ4olvY09bNyZy26
++tcgI3H4sW4p85DRkOTrzUErgdM7LjIRRPGcGIPRS0qogqsx9utaxT318FNzX9Pp
+81ORRTImyM6gcZmKlJMT38X1pIT3qJ6PO6rSYM5eQG+PtvoY6ql4fZ5m+ch/U3M/
+P4u6wlJiC0aMX+G6SJGafFSxDx4zhWz1m7Uou39f
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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://unknown.site.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>sit-nice@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
new file mode 100644
index 00000000..cd67aa4b
--- /dev/null
+++ b/swamid-interfederations-2.0/shibidp.polimi.it-idp-shibboleth.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDjTCCAnWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBiTELMAkGA1UEBhMCSVQx
+CzAJBgNVBAgTAk1JMQ4wDAYDVQQHEwVNaWxhbjEPMA0GA1UEChMGUE9MSU1JMQ4w
+DAYDVQQLEwVBU0lDVDEaMBgGA1UEAxMRc2hpYmlkcC5wb2xpbWkuaXQxIDAeBgkq
+hkiG9w0BCQEWEWhvc3RpbmdAcG9saW1pLml0MB4XDTE0MDIyMDExMDcwMFoXDTI2
+MDIyMDExMDcwMFowgYkxCzAJBgNVBAYTAklUMQswCQYDVQQIEwJNSTEOMAwGA1UE
+BxMFTWlsYW4xDzANBgNVBAoTBlBPTElNSTEOMAwGA1UECxMFQVNJQ1QxGjAYBgNV
+BAMTEXNoaWJpZHAucG9saW1pLml0MSAwHgYJKoZIhvcNAQkBFhFob3N0aW5nQHBv
+bGltaS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKhtqK271QYD
+CWbYMZSqPdm29Oh3yeOVC+6FyoU9i3DIHaiqRxa1yKlYHLx5oLgtPi8ASDzXPfMo
+6MGVGYLOzCe/Y2efdJyz1Pqguna+8jfDtm1MeNCrjYd/cTp5gr/HGZGz262dSmIM
+WrWloF7Zg3jwsXvJYO0wCHLsKVRul7vdosPX7Jy9pIxTO1ZJMZCa/NASWMqf1i+B
+tYVpJqMQZJ85H9pEnu+6dBJMz6QM67zL9WnncMUz1ANkCkLX6mAFV9sydjTXPKrK
+hBBCZF44HOdiIbeZ+NKBZLeirVNALptmTxMg1bNYR2eeys9pdht7qdrvDcBziy5E
+tVFwmsFxMF8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEApV/JH6zxNIBuB/8zTbO7
+K/uJsh14u/ihkWxCwGJoZTKSttIwlH2Y0+R8fQW/+ZV/aOT3vzJzxJJ/WL6x9Bku
+mlaYSnZ+zD0fQWWWSGK/ncqELDCE35h2B5/hmJ0wSHZewPTPRhvptIYsEFzr9Gr4
+hja1IylB5u+kXNOgR5XJvoojnI1855S/N1p6Y+JUfJKCTciw/0w8Kqlz5Hs9/GHt
+WRQMqSSzXV/Ti6l+6Mu2wvg0LSH2F9XZjN49ZX1E4LPcB8ChCzmrMf87+9+tru9C
+Y00stxLKVpXdX8pXFj3zFusdHk7fSeE4cCUYQvN7+Jyy7uSEM10eED6xOqvPw31n
+oA==
+</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>
+MIICbDCCAdWgAwIBAgIBATANBgkqhkiG9w0BAQUFADB8MQswCQYDVQQGEwJJVDEO
+MAwGA1UEBxMFTWlsYW4xDzANBgNVBAoTBlBPTElNSTEOMAwGA1UECxMFQVNJQ1Qx
+GjAYBgNVBAMTEXNoaWJpZHAucG9saW1pLml0MSAwHgYJKoZIhvcNAQkBFhFob3N0
+aW5nQHBvbGltaS5pdDAeFw0xMTA5MjYxMDE1NDJaFw0xNjA5MjQxMDE1NDJaMHwx
+CzAJBgNVBAYTAklUMQ4wDAYDVQQHEwVNaWxhbjEPMA0GA1UEChMGUE9MSU1JMQ4w
+DAYDVQQLEwVBU0lDVDEaMBgGA1UEAxMRc2hpYmlkcC5wb2xpbWkuaXQxIDAeBgkq
+hkiG9w0BCQEWEWhvc3RpbmdAcG9saW1pLml0MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQCjz71cLVbMNyigmSb65PrEOwyeox5VBxHiopdI1yKsbbyptChP67hK
+nXYogljqpFRzBloaqwJy5UT8gkCMohhtf2VQTfVYtxnrs33BXgy/+UrJRZnBcbu7
+JspXHcxOB4XWLooiNQDbHOFCvh+oHPpqDg3WFA0HJVfHi2mTZkra5wIDAQABMA0G
+CSqGSIb3DQEBBQUAA4GBAJOfpmXgkDQR7Eo3lwD1Q1s7425CHjYk0q/ZHehe4IBW
+0e9EjP+b3vfUE1M2FNWE3xdMwIc5ZzCkpy8C1K+Kur2AIDGmYGUSOJDxh89ZgaK1
+rO0iogFcYXXs7FpNjcZAv77ur9aGaFZhBzqhHA1KK1ovrRVssBQ1BXt9kWmU5QBu
+</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>
+MIICbDCCAdWgAwIBAgIBATANBgkqhkiG9w0BAQUFADB8MQswCQYDVQQGEwJJVDEO
+MAwGA1UEBxMFTWlsYW4xDzANBgNVBAoTBlBPTElNSTEOMAwGA1UECxMFQVNJQ1Qx
+GjAYBgNVBAMTEXNoaWJpZHAucG9saW1pLml0MSAwHgYJKoZIhvcNAQkBFhFob3N0
+aW5nQHBvbGltaS5pdDAeFw0xMTA5MjYxMDE1NDJaFw0xNjA5MjQxMDE1NDJaMHwx
+CzAJBgNVBAYTAklUMQ4wDAYDVQQHEwVNaWxhbjEPMA0GA1UEChMGUE9MSU1JMQ4w
+DAYDVQQLEwVBU0lDVDEaMBgGA1UEAxMRc2hpYmlkcC5wb2xpbWkuaXQxIDAeBgkq
+hkiG9w0BCQEWEWhvc3RpbmdAcG9saW1pLml0MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQCjz71cLVbMNyigmSb65PrEOwyeox5VBxHiopdI1yKsbbyptChP67hK
+nXYogljqpFRzBloaqwJy5UT8gkCMohhtf2VQTfVYtxnrs33BXgy/+UrJRZnBcbu7
+JspXHcxOB4XWLooiNQDbHOFCvh+oHPpqDg3WFA0HJVfHi2mTZkra5wIDAQABMA0G
+CSqGSIb3DQEBBQUAA4GBAJOfpmXgkDQR7Eo3lwD1Q1s7425CHjYk0q/ZHehe4IBW
+0e9EjP+b3vfUE1M2FNWE3xdMwIc5ZzCkpy8C1K+Kur2AIDGmYGUSOJDxh89ZgaK1
+rO0iogFcYXXs7FpNjcZAv77ur9aGaFZhBzqhHA1KK1ovrRVssBQ1BXt9kWmU5QBu
+</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>
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
new file mode 100644
index 00000000..ac701e76
--- /dev/null
+++ b/swamid-interfederations-2.0/shibidp.tameside.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						ZGUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtwxXIV0H0
+						N3Tn9kfx0vEjWwtR0RDsCQ5NIe4yemy1Ko/QcHoT55G0znKHbDyfufcP2C9hoqzd
+						cxWhDY21aYKNUUPCiwyA3y8IjfEfDXc/zN564SI1rXt0e8IyfzTegr7nEZ4pIzb3
+						ZsOvvZw/guS3SFRT8I/Y4+mQHAeBxYEFHhQEyTAzEa1CkMbQ5g0DBZaZLoem+WR+
+						Qe5522Hqix5Vx2Dy7ttKe+5mItJAbSGI17p9r6StS7VKBpGfODeoHMIoGcMH5kWs
+						79URYp9/KsJvK5xUQIxXYST21lM62fnaOjsNccCMT+6FT0bx/C4khty+ObYdDxWX
+						ZfbKM6X7b1uTAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJpZHAudGFtZXNpZGUu
+						YWMudWuGLWh0dHBzOi8vc2hpYmlkcC50YW1lc2lkZS5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQUXwU/7iPk5goOeUXikZ1DAsV1Z1UwDQYJKoZIhvcNAQEF
+						BQADggEBABuP25r95KICsuJ/DnQFVPFxzrHFt76smE3HPMGaxxZUmyijN/llqzVx
+						YqCeoMNc5mt0RKgd0FUl/ksik2tKc2J7LhFEaPSjPAGmT6ELbhTwU+/Fgnusy4tX
+						FE0VKaEDasnf6Ohel5aDDVPkFO1zTAGTm7PtXspdEe0v4JiDTqsDCe3fnu2gEdPL
+						w7TLUC8hL0gwos9S/WdgKCvIve41DEj6Y6n03Z2dCtlMMQbvt7OPDNpQRKssj2QV
+						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>
+						MIIDQzCCAiugAwIBAgIUFPl+UkOqD1xU344a+Z5gAA9KFhIwDQYJKoZIhvcNAQEF
+						BQAwITEfMB0GA1UEAxMWc2hpYmlkcC50YW1lc2lkZS5hYy51azAeFw0xMzEwMDMw
+						ODA2MDBaFw0zMzEwMDMwODA2MDBaMCExHzAdBgNVBAMTFnNoaWJpZHAudGFtZXNp
+						ZGUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtwxXIV0H0
+						N3Tn9kfx0vEjWwtR0RDsCQ5NIe4yemy1Ko/QcHoT55G0znKHbDyfufcP2C9hoqzd
+						cxWhDY21aYKNUUPCiwyA3y8IjfEfDXc/zN564SI1rXt0e8IyfzTegr7nEZ4pIzb3
+						ZsOvvZw/guS3SFRT8I/Y4+mQHAeBxYEFHhQEyTAzEa1CkMbQ5g0DBZaZLoem+WR+
+						Qe5522Hqix5Vx2Dy7ttKe+5mItJAbSGI17p9r6StS7VKBpGfODeoHMIoGcMH5kWs
+						79URYp9/KsJvK5xUQIxXYST21lM62fnaOjsNccCMT+6FT0bx/C4khty+ObYdDxWX
+						ZfbKM6X7b1uTAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJpZHAudGFtZXNpZGUu
+						YWMudWuGLWh0dHBzOi8vc2hpYmlkcC50YW1lc2lkZS5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQUXwU/7iPk5goOeUXikZ1DAsV1Z1UwDQYJKoZIhvcNAQEF
+						BQADggEBABuP25r95KICsuJ/DnQFVPFxzrHFt76smE3HPMGaxxZUmyijN/llqzVx
+						YqCeoMNc5mt0RKgd0FUl/ksik2tKc2J7LhFEaPSjPAGmT6ELbhTwU+/Fgnusy4tX
+						FE0VKaEDasnf6Ohel5aDDVPkFO1zTAGTm7PtXspdEe0v4JiDTqsDCe3fnu2gEdPL
+						w7TLUC8hL0gwos9S/WdgKCvIve41DEj6Y6n03Z2dCtlMMQbvt7OPDNpQRKssj2QV
+						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>
diff --git a/swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml
new file mode 100644
index 00000000..f0eb583b
--- /dev/null
+++ b/swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.to.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ivv.cnr.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CNR IPSP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">CNR IPSP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for CNR IPSP Turin users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Torino del CNR IPSP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.to.cnr.it/index.php/contatti</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.to.cnr.it/index.php/contatti</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.to.cnr.it/index.php/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.to.cnr.it/index.php/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIElDCCA3ygAwIBAgIQbmgQNrDfCy1Vf7XBczhplTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDExNTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowbjELMAkGA1UE
+BhMCSVQxQzBBBgNVBAoTOkNOUiAtIElzdGl0dXRvIGRpIFJpY2VyY2Egc3VsbCdJ
+bXByZXNhIGxvIFN2aWx1cHBvIChDRVJJUykxGjAYBgNVBAMTEXNoaWJpZHAudG8u
+Y25yLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVcNLT6xsJ8G
+dRHnHyBTfHOfe4OfgM4TylvG19un1euBULZEN5tDbbAZssX/on1N0LOhdcfhmi1x
+fVUQiyVf9Sbd8WicMuCHBfMRTylyPmyMS2Z398G8Vwy33o75Z8G3F6bXXKlLA0/J
+uLVFnNURX9lr4nfA8/309lRKoKVwAeSfHnMnrPbfChGN8mXxpCQygG/759ji+plk
+5DVvFhvPR/x1xVuYbrdAv/NbU1oBI4fVMzezwZkBxcZTBCewxgXVRR3/XZvQBPAL
+iICbJ6JHman13XLmUarrzmYzlK+eMHqkhksR4pU80IhuMd9ImFh9NAOvpl84BvcN
+/kTnRRvsSwIDAQABo4IBZDCCAWAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+6pDjue0wHQYDVR0OBBYEFFOg1tTJhlKw+kdxyVXznQztzUaSMA4GA1UdDwEB/wQE
+AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
+dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
+BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
+RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
+bmEub3JnMBwGA1UdEQQVMBOCEXNoaWJpZHAudG8uY25yLml0MA0GCSqGSIb3DQEB
+BQUAA4IBAQAn2QUgPIrMj5axwXQZ3DRdYICGToeZDt7OQTefoL38/lXx+msooHrH
+nCahg5fLkpxYx3eFLw/gfNcOoiXKe44oq6/lygg4ZoIKk81stcnxO0zm0w5P70ZN
+XEGKqcxD/uOM+VAVSFhHt4X2uZBBi5xeSQuOm4zG5rWzLz+KobBj9fcgrYn4AasW
+cITaZl/8c52MqyPOkBO1JSJce0RIGLVtQqgpCS5m+u1FtaxA/A5FxDBMW1HxodnP
+HvlG8PNgeM6dbExE/Kli1DjCbpmDaDpeRB/F3jemASDp0ZkFYf8HTU++WWB0tZdk
+MfjrxHcURjQu4WndL3iDdR1DMImDHyBu
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.to.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.to.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://shibidp.to.cnr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.to.cnr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.to.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.to.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">ivv.cnr.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIElDCCA3ygAwIBAgIQbmgQNrDfCy1Vf7XBczhplTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDExNTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowbjELMAkGA1UE
+BhMCSVQxQzBBBgNVBAoTOkNOUiAtIElzdGl0dXRvIGRpIFJpY2VyY2Egc3VsbCdJ
+bXByZXNhIGxvIFN2aWx1cHBvIChDRVJJUykxGjAYBgNVBAMTEXNoaWJpZHAudG8u
+Y25yLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVcNLT6xsJ8G
+dRHnHyBTfHOfe4OfgM4TylvG19un1euBULZEN5tDbbAZssX/on1N0LOhdcfhmi1x
+fVUQiyVf9Sbd8WicMuCHBfMRTylyPmyMS2Z398G8Vwy33o75Z8G3F6bXXKlLA0/J
+uLVFnNURX9lr4nfA8/309lRKoKVwAeSfHnMnrPbfChGN8mXxpCQygG/759ji+plk
+5DVvFhvPR/x1xVuYbrdAv/NbU1oBI4fVMzezwZkBxcZTBCewxgXVRR3/XZvQBPAL
+iICbJ6JHman13XLmUarrzmYzlK+eMHqkhksR4pU80IhuMd9ImFh9NAOvpl84BvcN
+/kTnRRvsSwIDAQABo4IBZDCCAWAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+6pDjue0wHQYDVR0OBBYEFFOg1tTJhlKw+kdxyVXznQztzUaSMA4GA1UdDwEB/wQE
+AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
+dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
+BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
+RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
+bmEub3JnMBwGA1UdEQQVMBOCEXNoaWJpZHAudG8uY25yLml0MA0GCSqGSIb3DQEB
+BQUAA4IBAQAn2QUgPIrMj5axwXQZ3DRdYICGToeZDt7OQTefoL38/lXx+msooHrH
+nCahg5fLkpxYx3eFLw/gfNcOoiXKe44oq6/lygg4ZoIKk81stcnxO0zm0w5P70ZN
+XEGKqcxD/uOM+VAVSFhHt4X2uZBBi5xeSQuOm4zG5rWzLz+KobBj9fcgrYn4AasW
+cITaZl/8c52MqyPOkBO1JSJce0RIGLVtQqgpCS5m+u1FtaxA/A5FxDBMW1HxodnP
+HvlG8PNgeM6dbExE/Kli1DjCbpmDaDpeRB/F3jemASDp0ZkFYf8HTU++WWB0tZdk
+MfjrxHcURjQu4WndL3iDdR1DMImDHyBu
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.to.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.to.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 IPSP</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CNR IPSP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.ipsp.cnr.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.ipsp.cnr.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Giancarlo Birello</md:SurName>
+    <md:EmailAddress>mailto:giancarlo.birello@ircres.cnr.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:supporto@to.cnr.it</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
new file mode 100644
index 00000000..0bfda6bf
--- /dev/null
+++ b/swamid-interfederations-2.0/shibidp.uclan.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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>
+						MIIDNzCCAh+gAwIBAgIUSKz+Pzg6MzaPsUgoAoOA39vnnNowDQYJKoZIhvcNAQEF
+						BQAwHjEcMBoGA1UEAxMTc2hpYmlkcC51Y2xhbi5hYy51azAeFw0xMDAxMTUxMDQ2
+						NTNaFw0zMDAxMTUxMDQ2NTNaMB4xHDAaBgNVBAMTE3NoaWJpZHAudWNsYW4uYWMu
+						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCGynbwRAulpAV+OM9i
+						+3U2cgeSZ9mAHMCKzC6gwA8hzFfKy950l0F5hCWwsr/vIuGGfPaR9MRUQ8KJB/O1
+						A/FpHnXd8yYXAac8OWCgn7/SRv/mfkAavse86Z8pve/7UiQCPFSQP8flvBS2PIt9
+						8Bq2J7qHUyFdYl9XEw0aJ2YNxOj3ixCpzcMGp6TY0agSX6OikkjhG2sazNgOZeXt
+						ZC8tqUVw/Ugq+yA7CT/ukLFJhNcXltjQlL72LO43/BrREI+JSQnysSc9yjA6dCXi
+						KVmZmOKVr9m4baagQmvqgYAGsar3Eoxxjny3ZU9zcQJtqiMt+UgMW1PKiiySXXru
+						LpHPAgMBAAGjbTBrMEoGA1UdEQRDMEGCE3NoaWJpZHAudWNsYW4uYWMudWuGKmh0
+						dHBzOi8vc2hpYmlkcC51Y2xhbi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
+						FgQU9qLDsRWZbj/L90KawITJWhL6MtUwDQYJKoZIhvcNAQEFBQADggEBAATyYytE
+						tX+7PJtIs6xzaA4ojgWYS/eJDBcwhulsCKWGbx/V+msGhcnTwiQibqLfIsXteSpm
+						iWeOxqR+VLsNqp0joIkm3xmi+oh207O7e9BzyuqxQViM2Y5/nHz5Cfp4XI5rt4NP
+						DQjdNXBz6C7DxHWMKx2UAdY6MfHKeLpZw6HhSR/3Jd4HMWTC8RAU5qto8RrTuKkD
+						y7VbRz7Q3F0I9B8KBxUR+PMnj44UKJTHADSIr6Zd9usBxRabe5fKGftkquEWWiXG
+						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>
+						MIIDNzCCAh+gAwIBAgIUSKz+Pzg6MzaPsUgoAoOA39vnnNowDQYJKoZIhvcNAQEF
+						BQAwHjEcMBoGA1UEAxMTc2hpYmlkcC51Y2xhbi5hYy51azAeFw0xMDAxMTUxMDQ2
+						NTNaFw0zMDAxMTUxMDQ2NTNaMB4xHDAaBgNVBAMTE3NoaWJpZHAudWNsYW4uYWMu
+						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCGynbwRAulpAV+OM9i
+						+3U2cgeSZ9mAHMCKzC6gwA8hzFfKy950l0F5hCWwsr/vIuGGfPaR9MRUQ8KJB/O1
+						A/FpHnXd8yYXAac8OWCgn7/SRv/mfkAavse86Z8pve/7UiQCPFSQP8flvBS2PIt9
+						8Bq2J7qHUyFdYl9XEw0aJ2YNxOj3ixCpzcMGp6TY0agSX6OikkjhG2sazNgOZeXt
+						ZC8tqUVw/Ugq+yA7CT/ukLFJhNcXltjQlL72LO43/BrREI+JSQnysSc9yjA6dCXi
+						KVmZmOKVr9m4baagQmvqgYAGsar3Eoxxjny3ZU9zcQJtqiMt+UgMW1PKiiySXXru
+						LpHPAgMBAAGjbTBrMEoGA1UdEQRDMEGCE3NoaWJpZHAudWNsYW4uYWMudWuGKmh0
+						dHBzOi8vc2hpYmlkcC51Y2xhbi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
+						FgQU9qLDsRWZbj/L90KawITJWhL6MtUwDQYJKoZIhvcNAQEFBQADggEBAATyYytE
+						tX+7PJtIs6xzaA4ojgWYS/eJDBcwhulsCKWGbx/V+msGhcnTwiQibqLfIsXteSpm
+						iWeOxqR+VLsNqp0joIkm3xmi+oh207O7e9BzyuqxQViM2Y5/nHz5Cfp4XI5rt4NP
+						DQjdNXBz6C7DxHWMKx2UAdY6MfHKeLpZw6HhSR/3Jd4HMWTC8RAU5qto8RrTuKkD
+						y7VbRz7Q3F0I9B8KBxUR+PMnj44UKJTHADSIr6Zd9usBxRabe5fKGftkquEWWiXG
+						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>
diff --git a/swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml
new file mode 100644
index 00000000..94a31ba9
--- /dev/null
+++ b/swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIDLDCCAhSgAwIBAgIVANMt6NQyQVgOzMWv6tQmeV5iMyCNMA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEHNoaWJpZHAudW5pcHIuaXQwHhcNMDkwOTAyMDgwMjMz
+WhcNMjkwOTAyMDgwMjMzWjAbMRkwFwYDVQQDExBzaGliaWRwLnVuaXByLml0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2vzK0+t0DPv0CugzVEeroctE
+N4VdJggVTqeQVexIM4sFW7q3kVQvmA8kgVMmcZ9RHYyZac6Uw3Dj0ooO+DjYsJBg
+YRB4eN13gCpeWZQ1gcbbgV9FhLZGs9r+SRPtWgOjPb1Sns88XFBftjy9fZ7RJqQo
+vbvklEOHgWhhuz4xy6YMOItT01Z+amabYrh6pDG0007vPZjhT10LqcEExwvZjo6I
+5xd5s0w8z84EtDry2FhSaWs5AX3sQZYIiPONp/11uRZSvBBFKmCMDEIA32bGEcEO
+DQLUNKNPs/9AYdj+JFhehtILdVFVmHj3U76P9z6x7Brhrr6bMZ+wdvj+t+kabQID
+AQABo2cwZTBEBgNVHREEPTA7ghBzaGliaWRwLnVuaXByLml0hidodHRwczovL3No
+aWJpZHAudW5pcHIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMlXoLjlhaJD
+mLtp1r0Upn1PYpYlMA0GCSqGSIb3DQEBBQUAA4IBAQCzfKVH8RL3qOrpo6ZAh/AV
+2vYGkeV1RlSc1yc07K/hKG3HKkBim5HvGxeT5jMRNLlXZRkWEnrzmfCoyeyTgbis
+4YWyqKT4VKLCqsOGBdn00mbRUVDhQSH2MSTEy6Iqa+3SDeQ8iyolKinYnBu0LDg7
+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>
+MIIDLDCCAhSgAwIBAgIVANMt6NQyQVgOzMWv6tQmeV5iMyCNMA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEHNoaWJpZHAudW5pcHIuaXQwHhcNMDkwOTAyMDgwMjMz
+WhcNMjkwOTAyMDgwMjMzWjAbMRkwFwYDVQQDExBzaGliaWRwLnVuaXByLml0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2vzK0+t0DPv0CugzVEeroctE
+N4VdJggVTqeQVexIM4sFW7q3kVQvmA8kgVMmcZ9RHYyZac6Uw3Dj0ooO+DjYsJBg
+YRB4eN13gCpeWZQ1gcbbgV9FhLZGs9r+SRPtWgOjPb1Sns88XFBftjy9fZ7RJqQo
+vbvklEOHgWhhuz4xy6YMOItT01Z+amabYrh6pDG0007vPZjhT10LqcEExwvZjo6I
+5xd5s0w8z84EtDry2FhSaWs5AX3sQZYIiPONp/11uRZSvBBFKmCMDEIA32bGEcEO
+DQLUNKNPs/9AYdj+JFhehtILdVFVmHj3U76P9z6x7Brhrr6bMZ+wdvj+t+kabQID
+AQABo2cwZTBEBgNVHREEPTA7ghBzaGliaWRwLnVuaXByLml0hidodHRwczovL3No
+aWJpZHAudW5pcHIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMlXoLjlhaJD
+mLtp1r0Upn1PYpYlMA0GCSqGSIb3DQEBBQUAA4IBAQCzfKVH8RL3qOrpo6ZAh/AV
+2vYGkeV1RlSc1yc07K/hKG3HKkBim5HvGxeT5jMRNLlXZRkWEnrzmfCoyeyTgbis
+4YWyqKT4VKLCqsOGBdn00mbRUVDhQSH2MSTEy6Iqa+3SDeQ8iyolKinYnBu0LDg7
+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>
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
new file mode 100644
index 00000000..c643cfd1
--- /dev/null
+++ b/swamid-interfederations-2.0/shibidp.varndean.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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>
+						MIIDQzCCAiugAwIBAgIUYnAHVOZFTgSHvflAx2tiuguv7kowDQYJKoZIhvcNAQEF
+						BQAwITEfMB0GA1UEAxMWc2hpYmlkcC52YXJuZGVhbi5hYy51azAeFw0xNDA1MDEx
+						MDEwNTlaFw0zNDA1MDExMDEwNTlaMCExHzAdBgNVBAMTFnNoaWJpZHAudmFybmRl
+						YW4uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAz+ei5lxa
+						TA4LwlADyP4JJKaGIa1xpQoSAkluJaXogaTq0BsXIFEk0/FOoTCq3bjUVpq+bjfz
+						ZbLeFioKUyWBULNW//qLBmfcN8lVWdWyhju/PepezoM3sjup7JW4pZQp/7fdjmok
+						fKFaaBFVsnILzIZ2/26KmDzek19cmlfI/Zn+9VTzKA7TL0qneQdFoyTkLUB2gIZG
+						1TGqohPGxW59ZyYsU0Ic209zpqS1VSz4lMAXvfCMAU/ngmDIXUqxWSwV/zZcEZGq
+						ySMdE23U5YFT9jNG2aLaYXx8GB6sWg/kshMcgadfPyT9AZa68ObpSdrm6uc1mqgj
+						PhqvevqDRLMtAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJpZHAudmFybmRlYW4u
+						YWMudWuGLWh0dHBzOi8vc2hpYmlkcC52YXJuZGVhbi5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQUmuqY360czCtkfOA9uYzZDygT2ogwDQYJKoZIhvcNAQEF
+						BQADggEBAGjREkcSrh8oEx1TCylPjB+DrzlZuIcrsQKtRBr3CwQcP011h5Dwq/Lq
+						1RXtMFm10qnU2+x7bhI8xCqjlz0k80G6yEcY/9+pwqL6LgoeUT3sGvXfMf0k6usJ
+						noW7QnGPavB+i2Al8yeH/setuVUWnsObISiLte3poWn1fY8028MQqDuwNJRojBRY
+						3M//PcIdYzftbeqgtno5g9++ChY3ZwaPFHnLJra/FVvTeUa0aIfk4KhEsmqzp/18
+						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>
+						MIIDQzCCAiugAwIBAgIUYnAHVOZFTgSHvflAx2tiuguv7kowDQYJKoZIhvcNAQEF
+						BQAwITEfMB0GA1UEAxMWc2hpYmlkcC52YXJuZGVhbi5hYy51azAeFw0xNDA1MDEx
+						MDEwNTlaFw0zNDA1MDExMDEwNTlaMCExHzAdBgNVBAMTFnNoaWJpZHAudmFybmRl
+						YW4uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAz+ei5lxa
+						TA4LwlADyP4JJKaGIa1xpQoSAkluJaXogaTq0BsXIFEk0/FOoTCq3bjUVpq+bjfz
+						ZbLeFioKUyWBULNW//qLBmfcN8lVWdWyhju/PepezoM3sjup7JW4pZQp/7fdjmok
+						fKFaaBFVsnILzIZ2/26KmDzek19cmlfI/Zn+9VTzKA7TL0qneQdFoyTkLUB2gIZG
+						1TGqohPGxW59ZyYsU0Ic209zpqS1VSz4lMAXvfCMAU/ngmDIXUqxWSwV/zZcEZGq
+						ySMdE23U5YFT9jNG2aLaYXx8GB6sWg/kshMcgadfPyT9AZa68ObpSdrm6uc1mqgj
+						PhqvevqDRLMtAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJpZHAudmFybmRlYW4u
+						YWMudWuGLWh0dHBzOi8vc2hpYmlkcC52YXJuZGVhbi5hYy51ay9pZHAvc2hpYmJv
+						bGV0aDAdBgNVHQ4EFgQUmuqY360czCtkfOA9uYzZDygT2ogwDQYJKoZIhvcNAQEF
+						BQADggEBAGjREkcSrh8oEx1TCylPjB+DrzlZuIcrsQKtRBr3CwQcP011h5Dwq/Lq
+						1RXtMFm10qnU2+x7bhI8xCqjlz0k80G6yEcY/9+pwqL6LgoeUT3sGvXfMf0k6usJ
+						noW7QnGPavB+i2Al8yeH/setuVUWnsObISiLte3poWn1fY8028MQqDuwNJRojBRY
+						3M//PcIdYzftbeqgtno5g9++ChY3ZwaPFHnLJra/FVvTeUa0aIfk4KhEsmqzp/18
+						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>
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
new file mode 100644
index 00000000..b6b37909
--- /dev/null
+++ b/swamid-interfederations-2.0/shibidp.wnc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						EXNoaWJpZHAud25jLmFjLnVrMB4XDTE0MDIwMzEwMzYzNVoXDTM0MDEyOTEwMzYz
+						NVowfjELMAkGA1UEBhMCR0IxGDAWBgNVBAgMD05vdHRpbmdoYW1zaGlyZTESMBAG
+						A1UEBwwJTWFuc2ZpZWxkMSUwIwYDVQQKDBxXZXN0IE5vdHRpbmdoYW1zaGlyZSBD
+						b2xsZWdlMRowGAYDVQQDDBFzaGliaWRwLnduYy5hYy51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBANjphOxHqFN24tCPo/ZUfNvzOUTDoyeq5lHSOWlN
+						aWRtax7z5fbQ+Ajpdgyp6wP7JA5+CktdwVjR5maIGS8Snow5W2/oLKIH6qZN3Dmh
+						4RbfL3IPjWNGqcLBZ5cR6B2b71BmEFowJ4RopV0uLd4yud0aVA33AuNHtt5FCbmx
+						57UaykuwNUH0AUP0Mmhw0Unlh5C/SmrLRdeQxQpB3qWDNasgFMcvCet7jUP3Tje5
+						LysqQdDV0iS5C7sWmAzVfwJ4oF+CgM6IrCobOf+45dEa7v5+ILDQEpYJJa5vYbvu
+						zGxTWbH6Wt6QnJOFX3ZHVYMnh7gogu/vposOzgaJhFYu6ekCAwEAATANBgkqhkiG
+						9w0BAQUFAAOCAQEAt2WPnd7BzzXgF7yd1qcPpYFcnx1eaFD5PHCqtSUtPM4tqmrT
+						ICM5ELCpwZYSZbyTm1MikC1um2U9tZIi780kZnjSSMff7YkiSCN3pEjjM8OaJtnO
+						7NKT0bRrx5y0UlVI0D/It4AasMZCL4tJf7J74lbi/6WGMMPz3JMKSJlWSaBg9875
+						0LiyYQ0LugAJYLzYvGjdzqg08QOZWnMgUB0clI8moXNLUiE8Q4VN12PJqugUuzEi
+						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>
+						MIIDeDCCAmACCQDV2f231qNoMzANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJH
+						QjEYMBYGA1UECAwPTm90dGluZ2hhbXNoaXJlMRIwEAYDVQQHDAlNYW5zZmllbGQx
+						JTAjBgNVBAoMHFdlc3QgTm90dGluZ2hhbXNoaXJlIENvbGxlZ2UxGjAYBgNVBAMM
+						EXNoaWJpZHAud25jLmFjLnVrMB4XDTE0MDIwMzEwMzYzNVoXDTM0MDEyOTEwMzYz
+						NVowfjELMAkGA1UEBhMCR0IxGDAWBgNVBAgMD05vdHRpbmdoYW1zaGlyZTESMBAG
+						A1UEBwwJTWFuc2ZpZWxkMSUwIwYDVQQKDBxXZXN0IE5vdHRpbmdoYW1zaGlyZSBD
+						b2xsZWdlMRowGAYDVQQDDBFzaGliaWRwLnduYy5hYy51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBANjphOxHqFN24tCPo/ZUfNvzOUTDoyeq5lHSOWlN
+						aWRtax7z5fbQ+Ajpdgyp6wP7JA5+CktdwVjR5maIGS8Snow5W2/oLKIH6qZN3Dmh
+						4RbfL3IPjWNGqcLBZ5cR6B2b71BmEFowJ4RopV0uLd4yud0aVA33AuNHtt5FCbmx
+						57UaykuwNUH0AUP0Mmhw0Unlh5C/SmrLRdeQxQpB3qWDNasgFMcvCet7jUP3Tje5
+						LysqQdDV0iS5C7sWmAzVfwJ4oF+CgM6IrCobOf+45dEa7v5+ILDQEpYJJa5vYbvu
+						zGxTWbH6Wt6QnJOFX3ZHVYMnh7gogu/vposOzgaJhFYu6ekCAwEAATANBgkqhkiG
+						9w0BAQUFAAOCAQEAt2WPnd7BzzXgF7yd1qcPpYFcnx1eaFD5PHCqtSUtPM4tqmrT
+						ICM5ELCpwZYSZbyTm1MikC1um2U9tZIi780kZnjSSMff7YkiSCN3pEjjM8OaJtnO
+						7NKT0bRrx5y0UlVI0D/It4AasMZCL4tJf7J74lbi/6WGMMPz3JMKSJlWSaBg9875
+						0LiyYQ0LugAJYLzYvGjdzqg08QOZWnMgUB0clI8moXNLUiE8Q4VN12PJqugUuzEi
+						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>
diff --git a/swamid-interfederations-2.0/shibidp.wqeic.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibidp.wqeic.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..0f1fc54b
--- /dev/null
+++ b/swamid-interfederations-2.0/shibidp.wqeic.ac.uk-shibboleth.xml
@@ -0,0 +1,111 @@
+<?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>
+      <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
+						bGVnZTEUMBIGA1UECwwLSVQgU2VydmljZXMxHDAaBgNVBAMME3NoaWJpZHAud3Fl
+						aWMuYWMudWsxJTAjBgkqhkiG9w0BCQEWFml0aGVscGRlc2tAd3FlaWMuYWMudWsw
+						HhcNMTQwMzE4MTIzNDU4WhcNMjQwMzE1MTIzNDU4WjCBxTELMAkGA1UEBhMCR0Ix
+						FzAVBgNVBAgMDkxlaWNlc3RlcnNoaXJlMRIwEAYDVQQHDAlMZWljZXN0ZXIxLjAs
+						BgNVBAoMJVd5Z2dlc3RvbiAmIFF1ZWVuIEVsaXphYmV0aCBJIENvbGxlZ2UxFDAS
+						BgNVBAsMC0lUIFNlcnZpY2VzMRwwGgYDVQQDDBNzaGliaWRwLndxZWljLmFjLnVr
+						MSUwIwYJKoZIhvcNAQkBFhZpdGhlbHBkZXNrQHdxZWljLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxVKEV8L05iIYj4KRgdBCcBJRuW6c6Kal
+						XrqwV6y55rPuKo+oAKPQ1D2N9/zLq7abDb5ftS0MaXMEg9oqiRc9d15J4cPMT5wp
+						h2icZMShZP14pouI4ia7hqgwzFpF1PYD77ZFRRNIyBh9fBeiB155D2NeUCJhu4Xl
+						riUhKCedOAfnL50GNTNpKEYxLjtrzVzHyrenKMUnF4aiq2G7DOfeWK9i/eItNETq
+						WF1lvNfYqxcKHjcUVmcs8ACHUEh4MLesvZdl9sZtP52gdxfNiCiAo1BJIxsqJ8HB
+						0NLOJK70YEU+To3XM9cONSUOffftTrB+9tmzRB+vc9mBGasg53+zgwIDAQABo3sw
+						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
+						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUSrv6hTErz+8nx1Np6R8mpyg4DU8wHwYDVR0j
+						BBgwFoAUSrv6hTErz+8nx1Np6R8mpyg4DU8wDQYJKoZIhvcNAQEFBQADggEBABiy
+						AqUhi20nKdQmVmHq0Rj6uWosu1NCYYVGAtrEfzG2pNFiKm7yGI5AsKYcYR80VEds
+						3QO66RRc4jtSEJokDpcuim7QsW08+87alhMfJSj+/Y2YMTRG6Ruv/WDXHln1OoFS
+						myDjdSWk4gIrAMQc5/AbnYtvgAJxmlvKOST34hXOCX5HXTu2hUjruPop15+ucwYC
+						cPVkx4NgoOPsM60BJJElzhBwYBBZmBTDfSg9XkvY41YCcKS5dyCqfkG0SD55tubN
+						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>
+						MIIEijCCA3KgAwIBAgIJANv4hjZSaLpQMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
+						VQQGEwJHQjEXMBUGA1UECAwOTGVpY2VzdGVyc2hpcmUxEjAQBgNVBAcMCUxlaWNl
+						c3RlcjEuMCwGA1UECgwlV3lnZ2VzdG9uICYgUXVlZW4gRWxpemFiZXRoIEkgQ29s
+						bGVnZTEUMBIGA1UECwwLSVQgU2VydmljZXMxHDAaBgNVBAMME3NoaWJpZHAud3Fl
+						aWMuYWMudWsxJTAjBgkqhkiG9w0BCQEWFml0aGVscGRlc2tAd3FlaWMuYWMudWsw
+						HhcNMTQwMzE4MTIzNDU4WhcNMjQwMzE1MTIzNDU4WjCBxTELMAkGA1UEBhMCR0Ix
+						FzAVBgNVBAgMDkxlaWNlc3RlcnNoaXJlMRIwEAYDVQQHDAlMZWljZXN0ZXIxLjAs
+						BgNVBAoMJVd5Z2dlc3RvbiAmIFF1ZWVuIEVsaXphYmV0aCBJIENvbGxlZ2UxFDAS
+						BgNVBAsMC0lUIFNlcnZpY2VzMRwwGgYDVQQDDBNzaGliaWRwLndxZWljLmFjLnVr
+						MSUwIwYJKoZIhvcNAQkBFhZpdGhlbHBkZXNrQHdxZWljLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxVKEV8L05iIYj4KRgdBCcBJRuW6c6Kal
+						XrqwV6y55rPuKo+oAKPQ1D2N9/zLq7abDb5ftS0MaXMEg9oqiRc9d15J4cPMT5wp
+						h2icZMShZP14pouI4ia7hqgwzFpF1PYD77ZFRRNIyBh9fBeiB155D2NeUCJhu4Xl
+						riUhKCedOAfnL50GNTNpKEYxLjtrzVzHyrenKMUnF4aiq2G7DOfeWK9i/eItNETq
+						WF1lvNfYqxcKHjcUVmcs8ACHUEh4MLesvZdl9sZtP52gdxfNiCiAo1BJIxsqJ8HB
+						0NLOJK70YEU+To3XM9cONSUOffftTrB+9tmzRB+vc9mBGasg53+zgwIDAQABo3sw
+						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
+						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUSrv6hTErz+8nx1Np6R8mpyg4DU8wHwYDVR0j
+						BBgwFoAUSrv6hTErz+8nx1Np6R8mpyg4DU8wDQYJKoZIhvcNAQEFBQADggEBABiy
+						AqUhi20nKdQmVmHq0Rj6uWosu1NCYYVGAtrEfzG2pNFiKm7yGI5AsKYcYR80VEds
+						3QO66RRc4jtSEJokDpcuim7QsW08+87alhMfJSj+/Y2YMTRG6Ruv/WDXHln1OoFS
+						myDjdSWk4gIrAMQc5/AbnYtvgAJxmlvKOST34hXOCX5HXTu2hUjruPop15+ucwYC
+						cPVkx4NgoOPsM60BJJElzhBwYBBZmBTDfSg9XkvY41YCcKS5dyCqfkG0SD55tubN
+						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>
diff --git a/swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..06b77e6f
--- /dev/null
+++ b/swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml
@@ -0,0 +1,108 @@
+<?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>
+      <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
+						ExZzaGliaWRwdGVzdC55b3JrLmFjLnVrMB4XDTEzMDUwNzEzMTIwOFoXDTIzMDUw
+						NTEzMTIwOFowfzELMAkGA1UEBhMCR0IxDTALBgNVBAgTBFlvcmsxDTALBgNVBAcT
+						BFlvcmsxGzAZBgNVBAoTElVuaXZlcnNpdHkgb2YgWW9yazEUMBIGA1UECxMLSVQg
+						U2VydmljZXMxHzAdBgNVBAMTFnNoaWJpZHB0ZXN0LnlvcmsuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMUmL9nDPjCZvZ8+dOTqAqJ7nskqlp
+						YXb94lrlj299DJ6vQaUm4/dR8S3lW1o4mImOJoRW1KWq57vnhKZc7XX8KjxLPRlB
+						LJ5RMSFnqkOZKMNxvESu03eFljawaedz6I9hgDV75EB8AQOXq5guFYx7gmFEmV01
+						68qtDZzfahsgTQaMmyvXDFtQjPFtyPFM7gXAZ7hN7IqG4/nfNXoGuL8ACGHsr7c9
+						B1loWgc7SHzM7Dg8Wx8I+cDvieJi2O6m7k39IX2SXcx4ddwNpsD07v0GmvwUckia
+						oqiV/ZwqCNIn5mNW9DIKVy7Tf845BlaQEQPeGwbYnG0tNi0VbxxEaXm/AgMBAAGj
+						ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
+						IENlcnRpZmljYXRlMB0GA1UdDgQWBBRxs5ICZ+pK/8qFe1SVvLDCXUUI5TAfBgNV
+						HSMEGDAWgBRxs5ICZ+pK/8qFe1SVvLDCXUUI5TANBgkqhkiG9w0BAQUFAAOCAQEA
+						PVQMh/w0BlmmO1IBojykKwkxfs5Q7dbUSbumoFPFfb/RzZ+qTNW7EKDtU84GULGR
+						HiFvbC7CxnXSzRtwt9v+RMyUcw3K9Rsm66zWWqebfm/apNvRgBLpB6z9AK2wQQiJ
+						XMxmlAoM41ZeENbLYI0MoUKTFPg9FnAsyDZe5MEk831VbuY7engJkezFtKQ1TuW3
+						/6bXFnodg3tFTgEcl9ZNZVahH/KRDlxlOR9umHIRKgd7BX/mZsAewsyt4BGs58yL
+						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>
+						MIID/DCCAuSgAwIBAgIJAOgs+vZkeVN+MA0GCSqGSIb3DQEBBQUAMH8xCzAJBgNV
+						BAYTAkdCMQ0wCwYDVQQIEwRZb3JrMQ0wCwYDVQQHEwRZb3JrMRswGQYDVQQKExJV
+						bml2ZXJzaXR5IG9mIFlvcmsxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR8wHQYDVQQD
+						ExZzaGliaWRwdGVzdC55b3JrLmFjLnVrMB4XDTEzMDUwNzEzMTIwOFoXDTIzMDUw
+						NTEzMTIwOFowfzELMAkGA1UEBhMCR0IxDTALBgNVBAgTBFlvcmsxDTALBgNVBAcT
+						BFlvcmsxGzAZBgNVBAoTElVuaXZlcnNpdHkgb2YgWW9yazEUMBIGA1UECxMLSVQg
+						U2VydmljZXMxHzAdBgNVBAMTFnNoaWJpZHB0ZXN0LnlvcmsuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMUmL9nDPjCZvZ8+dOTqAqJ7nskqlp
+						YXb94lrlj299DJ6vQaUm4/dR8S3lW1o4mImOJoRW1KWq57vnhKZc7XX8KjxLPRlB
+						LJ5RMSFnqkOZKMNxvESu03eFljawaedz6I9hgDV75EB8AQOXq5guFYx7gmFEmV01
+						68qtDZzfahsgTQaMmyvXDFtQjPFtyPFM7gXAZ7hN7IqG4/nfNXoGuL8ACGHsr7c9
+						B1loWgc7SHzM7Dg8Wx8I+cDvieJi2O6m7k39IX2SXcx4ddwNpsD07v0GmvwUckia
+						oqiV/ZwqCNIn5mNW9DIKVy7Tf845BlaQEQPeGwbYnG0tNi0VbxxEaXm/AgMBAAGj
+						ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
+						IENlcnRpZmljYXRlMB0GA1UdDgQWBBRxs5ICZ+pK/8qFe1SVvLDCXUUI5TAfBgNV
+						HSMEGDAWgBRxs5ICZ+pK/8qFe1SVvLDCXUUI5TANBgkqhkiG9w0BAQUFAAOCAQEA
+						PVQMh/w0BlmmO1IBojykKwkxfs5Q7dbUSbumoFPFfb/RzZ+qTNW7EKDtU84GULGR
+						HiFvbC7CxnXSzRtwt9v+RMyUcw3K9Rsm66zWWqebfm/apNvRgBLpB6z9AK2wQQiJ
+						XMxmlAoM41ZeENbLYI0MoUKTFPg9FnAsyDZe5MEk831VbuY7engJkezFtKQ1TuW3
+						/6bXFnodg3tFTgEcl9ZNZVahH/KRDlxlOR9umHIRKgd7BX/mZsAewsyt4BGs58yL
+						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>
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
new file mode 100644
index 00000000..1a0087fc
--- /dev/null
+++ b/swamid-interfederations-2.0/shiblogin.hull.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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>
+						MIIDOzCCAiOgAwIBAgIULUB2P8Qd8xEzfYUd14VtQqBiwXswDQYJKoZIhvcNAQEF
+						BQAwHzEdMBsGA1UEAxMUc2hpYmxvZ2luLmh1bGwuYWMudWswHhcNMTMwNjI2MTQy
+						ODQwWhcNMzMwNjI2MTQyODQwWjAfMR0wGwYDVQQDExRzaGlibG9naW4uaHVsbC5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK4dV4SFn79Mv9KA
+						ul1dlv9rPUfQuZPBVkNNjCtGk+KA3RpDPcidgV/2s8AdMG8NTknoT4vFzPYlgyaS
+						g2/tpzHKx9XqqJJQcAG4EvA3Pf8GF80Jk/hiI9T21tlp1S10g6KAU9hhqcsFZPR1
+						jSCtK45yjQ/WMzxdh/ds99qmCkjEQIn253Ra15vcoQApdSCusPO5oTENBK0SUTQe
+						uhGdWJlFBDHs7eHX+Fngyx066FrlrgUsCpiCor54m7DTB3NBOCD5LlpZMGJonrS6
+						O3XX/Bdt03ZdbPVLoAMb1hDY0uaIxrcCg3gMuIa9+wE5PsA/gvU60+uv3lzVzvsI
+						w81aZxsCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmxvZ2luLmh1bGwuYWMudWuG
+						K2h0dHBzOi8vc2hpYmxvZ2luLmh1bGwuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
+						VR0OBBYEFLMPSMcSqArLLEqd9nbiw7CBYaO3MA0GCSqGSIb3DQEBBQUAA4IBAQCs
+						sKAv5nTTPIJ70oUcqtifzfHIYYCKnAKU0M6ug6Vcd0mFZJJ705u3dmtsTDylbDC7
+						sNDHtw/gbrmPb6PCGK0+8Ifr0yl16/i5vAzm7oCN2OqTsX94qAlWuey8xNIF9SW5
+						3q7n2jTOvOo4293pV1hNFGkpZSrqM/KaNhgOxOKx2ezb17QvEmKXX/JUJprOA+Y1
+						iWz5dMqvNl4a8Gbvp71bMtREfKa6m904CBCK69NKllb4kqRRoXggkVQjHQlLChv1
+						+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>
+						MIIDOzCCAiOgAwIBAgIULUB2P8Qd8xEzfYUd14VtQqBiwXswDQYJKoZIhvcNAQEF
+						BQAwHzEdMBsGA1UEAxMUc2hpYmxvZ2luLmh1bGwuYWMudWswHhcNMTMwNjI2MTQy
+						ODQwWhcNMzMwNjI2MTQyODQwWjAfMR0wGwYDVQQDExRzaGlibG9naW4uaHVsbC5h
+						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK4dV4SFn79Mv9KA
+						ul1dlv9rPUfQuZPBVkNNjCtGk+KA3RpDPcidgV/2s8AdMG8NTknoT4vFzPYlgyaS
+						g2/tpzHKx9XqqJJQcAG4EvA3Pf8GF80Jk/hiI9T21tlp1S10g6KAU9hhqcsFZPR1
+						jSCtK45yjQ/WMzxdh/ds99qmCkjEQIn253Ra15vcoQApdSCusPO5oTENBK0SUTQe
+						uhGdWJlFBDHs7eHX+Fngyx066FrlrgUsCpiCor54m7DTB3NBOCD5LlpZMGJonrS6
+						O3XX/Bdt03ZdbPVLoAMb1hDY0uaIxrcCg3gMuIa9+wE5PsA/gvU60+uv3lzVzvsI
+						w81aZxsCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmxvZ2luLmh1bGwuYWMudWuG
+						K2h0dHBzOi8vc2hpYmxvZ2luLmh1bGwuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
+						VR0OBBYEFLMPSMcSqArLLEqd9nbiw7CBYaO3MA0GCSqGSIb3DQEBBQUAA4IBAQCs
+						sKAv5nTTPIJ70oUcqtifzfHIYYCKnAKU0M6ug6Vcd0mFZJJ705u3dmtsTDylbDC7
+						sNDHtw/gbrmPb6PCGK0+8Ifr0yl16/i5vAzm7oCN2OqTsX94qAlWuey8xNIF9SW5
+						3q7n2jTOvOo4293pV1hNFGkpZSrqM/KaNhgOxOKx2ezb17QvEmKXX/JUJprOA+Y1
+						iWz5dMqvNl4a8Gbvp71bMtREfKa6m904CBCK69NKllb4kqRRoXggkVQjHQlLChv1
+						+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>
diff --git a/swamid-interfederations-2.0/shibserv.abdn.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibserv.abdn.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..f0c936e3
--- /dev/null
+++ b/swamid-interfederations-2.0/shibserv.abdn.ac.uk-shibboleth.xml
@@ -0,0 +1,114 @@
+<?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>
+      <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>
+						MIIEYDCCA0igAwIBAgIJAKyEfiLtLS+qMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxETAPBgNVBAcTCEFiZXJkZWVuMR8w
+						HQYDVQQKExZVbml2ZXJzaXR5IG9mIEFiZXJkZWVuMRQwEgYDVQQLEwtJVCBTZXJ2
+						aWNlczEdMBsGA1UEAxMUc2hpYnNlcnYyLmFiZG4uYWMudWsxJTAjBgkqhkiG9w0B
+						CQEWFnNlcnZpY2VkZXNrQGFiZG4uYWMudWswHhcNMTMwNTI5MTQwMDEyWhcNMjMw
+						NTI3MTQwMDEyWjCBsDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMREw
+						DwYDVQQHEwhBYmVyZGVlbjEfMB0GA1UEChMWVW5pdmVyc2l0eSBvZiBBYmVyZGVl
+						bjEUMBIGA1UECxMLSVQgU2VydmljZXMxHTAbBgNVBAMTFHNoaWJzZXJ2Mi5hYmRu
+						LmFjLnVrMSUwIwYJKoZIhvcNAQkBFhZzZXJ2aWNlZGVza0BhYmRuLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxjGiuC2ICUaK41q9JytdjDtc
+						wh+gSpqeSVwFRdyjvLmZ8Y3r1be9yX0+7dqse0RmwPST6I1EX+K2hdwQA3BKqemm
+						puDVz0z5bra8Xo/vSxNfMpB0mEoH/52j5rGRuq7sXnrnfprbgX2iw7vAgTNDnlGE
+						9RjAYXRZI4n+8baD6nGSKhnVxI3FBSnDknyAjrkPBJdScENBlu09YJWOKTN6RpWB
+						5heA6wqQSJfrgzhLsyIVtz5bxO/FQa5hTgytbs+vtPutu2Q0oANo4Y1yZatt4oQE
+						28eoLvJTHq2z9PO4qbs2xUkAl7XZ/moN8zjj2JuFe0GeEnf+L5qknYM+oAw0MwID
+						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
+						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUfGZPIqt5aq2RSJNIdImK1zb36rcw
+						HwYDVR0jBBgwFoAUfGZPIqt5aq2RSJNIdImK1zb36rcwDQYJKoZIhvcNAQEFBQAD
+						ggEBAHK++6fKCQdVwNJW2zkiLWaHI82Ea/YE/8q9LXJjLE5iiCg+Nl8fjxW1Oad6
+						BhH6a9cAsada37Ppyt8+Y8yGrc5lwJHd1d5XupaFyojs4FuJ3eOb9cOHIG7P62Q5
+						NB0D7c52UvZDJkY3Z0OEmBhMWTFxK+H+B8B5QzAeQGWHGYScUAyelYg6kkQVeWyP
+						c+4InQwPaNfaS0QqachIQKxq2DIrhpWIC191CemLyuPi/1cqiqQoe/BCEZ4LuGAe
+						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>
+						MIIEYDCCA0igAwIBAgIJAKyEfiLtLS+qMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxETAPBgNVBAcTCEFiZXJkZWVuMR8w
+						HQYDVQQKExZVbml2ZXJzaXR5IG9mIEFiZXJkZWVuMRQwEgYDVQQLEwtJVCBTZXJ2
+						aWNlczEdMBsGA1UEAxMUc2hpYnNlcnYyLmFiZG4uYWMudWsxJTAjBgkqhkiG9w0B
+						CQEWFnNlcnZpY2VkZXNrQGFiZG4uYWMudWswHhcNMTMwNTI5MTQwMDEyWhcNMjMw
+						NTI3MTQwMDEyWjCBsDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMREw
+						DwYDVQQHEwhBYmVyZGVlbjEfMB0GA1UEChMWVW5pdmVyc2l0eSBvZiBBYmVyZGVl
+						bjEUMBIGA1UECxMLSVQgU2VydmljZXMxHTAbBgNVBAMTFHNoaWJzZXJ2Mi5hYmRu
+						LmFjLnVrMSUwIwYJKoZIhvcNAQkBFhZzZXJ2aWNlZGVza0BhYmRuLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxjGiuC2ICUaK41q9JytdjDtc
+						wh+gSpqeSVwFRdyjvLmZ8Y3r1be9yX0+7dqse0RmwPST6I1EX+K2hdwQA3BKqemm
+						puDVz0z5bra8Xo/vSxNfMpB0mEoH/52j5rGRuq7sXnrnfprbgX2iw7vAgTNDnlGE
+						9RjAYXRZI4n+8baD6nGSKhnVxI3FBSnDknyAjrkPBJdScENBlu09YJWOKTN6RpWB
+						5heA6wqQSJfrgzhLsyIVtz5bxO/FQa5hTgytbs+vtPutu2Q0oANo4Y1yZatt4oQE
+						28eoLvJTHq2z9PO4qbs2xUkAl7XZ/moN8zjj2JuFe0GeEnf+L5qknYM+oAw0MwID
+						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
+						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUfGZPIqt5aq2RSJNIdImK1zb36rcw
+						HwYDVR0jBBgwFoAUfGZPIqt5aq2RSJNIdImK1zb36rcwDQYJKoZIhvcNAQEFBQAD
+						ggEBAHK++6fKCQdVwNJW2zkiLWaHI82Ea/YE/8q9LXJjLE5iiCg+Nl8fjxW1Oad6
+						BhH6a9cAsada37Ppyt8+Y8yGrc5lwJHd1d5XupaFyojs4FuJ3eOb9cOHIG7P62Q5
+						NB0D7c52UvZDJkY3Z0OEmBhMWTFxK+H+B8B5QzAeQGWHGYScUAyelYg6kkQVeWyP
+						c+4InQwPaNfaS0QqachIQKxq2DIrhpWIC191CemLyuPi/1cqiqQoe/BCEZ4LuGAe
+						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>
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
new file mode 100644
index 00000000..9e52bac3
--- /dev/null
+++ b/swamid-interfederations-2.0/shibsles.brunel.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+    <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>
+      <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
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANeoXX34/IQVQfUnXhGeOIv+casO
+						4UTpWfR7m1jGvZwH29IDkD/yp1smabJz4uxHaMfgeN3KdjOThvkblPvElwuddnX0
+						ql6+zeJ0W/QaNU0dxgGzrUnaUcVsqmBH3onrR63dr94opNzYDw2SIV1HAhiUKCIM
+						A5zOAIEMTfSiS8xLxgQ8zR13tLPsq8TdRPoHDdqpbQFZOhxCD804NN3MvsN0LUnP
+						VvJ939m3aUpZbwjLlQsMgRBdkV7WfUxGggCfGgLMfuT8IoN555b0NzzsHdjIdCzi
+						jjpogH7HZYeIRn//qWCwz0Ulg6d/wpzyWW/YQhlkXiiP+LCRWbPtIBr4bskCAwEA
+						AaNxMG8wTgYDVR0RBEcwRYIVc2hpYnNsZXMuYnJ1bmVsLmFjLnVrhixodHRwczov
+						L3NoaWJzbGVzLmJydW5lbC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						Xp7b4ZI5lsrpyW2A+MmkBO+D/70wDQYJKoZIhvcNAQEFBQADggEBALimmRmPVvsh
+						gn3C/lssDcncpnnrNjhuMgjCkeO2Vh9bvDW4WDRgvNPsR2WXoRGFrFYB8DExh6Lk
+						+J92k7BKQtPriDYh+NtYxqc9z1pJxp0AIzh9DohkyY0QXllLjJ+GM5ddt0iRMAvJ
+						3tPbv2Kk6sZYIa2bgmQJiyjnDLFKHjihJk8cLzbWQ84NMZJmDyub+SpoEcFEcaZ7
+						0s54t2iEQpQ9z0JCYwZSE6JcBB0uxqxLEO79a2VJFTeQlf/u/0Urd6kVpprqh8rZ
+						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>
+						MIIDNDCCAhygAwIBAgIJAPWdUCwLL6STMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXNoaWJzbGVzLmJydW5lbC5hYy51azAeFw0xMjA2MDExMTMwMDFaFw0yMjA2
+						MDExMTMwMDFaMCAxHjAcBgNVBAMTFXNoaWJzbGVzLmJydW5lbC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANeoXX34/IQVQfUnXhGeOIv+casO
+						4UTpWfR7m1jGvZwH29IDkD/yp1smabJz4uxHaMfgeN3KdjOThvkblPvElwuddnX0
+						ql6+zeJ0W/QaNU0dxgGzrUnaUcVsqmBH3onrR63dr94opNzYDw2SIV1HAhiUKCIM
+						A5zOAIEMTfSiS8xLxgQ8zR13tLPsq8TdRPoHDdqpbQFZOhxCD804NN3MvsN0LUnP
+						VvJ939m3aUpZbwjLlQsMgRBdkV7WfUxGggCfGgLMfuT8IoN555b0NzzsHdjIdCzi
+						jjpogH7HZYeIRn//qWCwz0Ulg6d/wpzyWW/YQhlkXiiP+LCRWbPtIBr4bskCAwEA
+						AaNxMG8wTgYDVR0RBEcwRYIVc2hpYnNsZXMuYnJ1bmVsLmFjLnVrhixodHRwczov
+						L3NoaWJzbGVzLmJydW5lbC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						Xp7b4ZI5lsrpyW2A+MmkBO+D/70wDQYJKoZIhvcNAQEFBQADggEBALimmRmPVvsh
+						gn3C/lssDcncpnnrNjhuMgjCkeO2Vh9bvDW4WDRgvNPsR2WXoRGFrFYB8DExh6Lk
+						+J92k7BKQtPriDYh+NtYxqc9z1pJxp0AIzh9DohkyY0QXllLjJ+GM5ddt0iRMAvJ
+						3tPbv2Kk6sZYIa2bgmQJiyjnDLFKHjihJk8cLzbWQ84NMZJmDyub+SpoEcFEcaZ7
+						0s54t2iEQpQ9z0JCYwZSE6JcBB0uxqxLEO79a2VJFTeQlf/u/0Urd6kVpprqh8rZ
+						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</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.ntu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibsp.ntu.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..749b73a9
--- /dev/null
+++ b/swamid-interfederations-2.0/shibsp.ntu.ac.uk-shibboleth.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibsp.ntu.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-06T11:10: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">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEbjCCA1agAwIBAgIRAINZdo3dP0KuwGTsFOp3rQowDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA1MjkwMDAwMDBaFw0xNjA1MjgyMzU5NTlaMD4xITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQc2hpYnNwLm50
+						dS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALjSrervk/wV
+						ZiwDfbtcXMeFAaopjAy0e7cUKNvdKp7fPAqxmZWwD2Z3lWGjHBIX65SZvN1Tf8yc
+						FyW1f2LC4Pr8p6qSvtcqunw4MAM3TtGGjZCE2RDkMu21q7hxoadtWKgH89w4RgvK
+						1wUX0D06p/5OOXwbfQq4hH4hfjpdvZvk/AI4aw/Z7nVA4EtCqmE/g6nxOzpha96K
+						gzRpqcQQf7iCu+tKRathdsQ73rASZvSyofOz6IQvIjr/SWEvekDppGhxgOf8ZAmo
+						spLbk/mzNmXfJ3nQ4ohzN/dQy/3wq4bFw0Mczo3ro1KA5+UgCYg3VgmuyesMFDOa
+						kQmZUMYJqqsCAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+						R+qQ47ntMB0GA1UdDgQWBBQo0vzESwtkG5NMv5hxlHw90yR7mTAOBgNVHQ8BAf8E
+						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+						MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+						cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+						c3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQc2hpYnNwLm50dS5hYy51azAN
+						BgkqhkiG9w0BAQUFAAOCAQEAHbvvM7+e8Fy6zF7MXQBg0GkVyKXJVntproMyMFCl
+						V7rAkBskj1wqGekoWBCsbJjgufPVRTVvML0bb0YozvG87+ylkRnExP0hN5rxPp21
+						e045BvLwMOr2YoV5VO5LqezEZ2QfFDz4rg6zT1HoJiyt8bM+7KmlgWWX5bh8EY4/
+						N1aiE8XkC6/W0yuCvs0f/80m0QsWmyB+y034++yVFdcf4wlGfpYNa35uahVUjUgu
+						4VOhc9u8Jfzi1Zu3/q+zzoh0Uo71lKpSMkheTRTVM5jWEDbcUezX0ZSaZftRi/2o
+						RWaU8UjYRvmYN66UJFwccUT3ShNrqD2TR/qFSgGFq/7FpA==
+					</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://shibsp.ntu.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibsp.ntu.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nottingham Trent University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NTU Confluence service</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:ITSShibbolethTechnical@ntu.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
new file mode 100644
index 00000000..acf79935
--- /dev/null
+++ b/swamid-interfederations-2.0/shibsp.proofidcloud.co.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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>
+						MIIDEjCCAfqgAwIBAgIJALfRd5E/JliNMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXNoaWJzcC5wcm9vZmlkY2xvdWQuY28udWswHhcNMTQwNzEzMTkyOTQ5WhcN
+						MjQwNzEwMTkyOTQ5WjAkMSIwIAYDVQQDExlzaGlic3AucHJvb2ZpZGNsb3VkLmNv
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxBuaLEBvbWgdgBpO
+						FnM1RM+OOwl5Qq8nlII0jxOC8c9991duuNTY/0yPPN2aMoSVjOhotqoekAZOsuLx
+						GpEzeqc1KR0JBmRp4qdY0tG4cZ8/8OPzNq/XVPGPhbIslbq05qgxD0862KwldjYl
+						M6y4SbicMSda/xH1+pLh08uk7JD/3fX0/0TzXzr+zObsd7cMwEsLcLcLR+hLZV+N
+						wZAeyk/0eiUO8buhCiGUUHQtcR+tJjLcG1Kw/O2E4/qQese1tptJ0aLecVoIMvjN
+						V47ryW/nzAAxDrb2roD6zy7mp0hQDqQbi0qU1zeOcs7CC/rmKiOpp66nCvURZQhT
+						SKQH1wIDAQABo0cwRTAkBgNVHREEHTAbghlzaGlic3AucHJvb2ZpZGNsb3VkLmNv
+						LnVrMB0GA1UdDgQWBBRMzbqD0mqYS6TTIHBm28ieLfmDLDANBgkqhkiG9w0BAQUF
+						AAOCAQEAXj/KoR+c73NwSHM9ZhdlB740D0cV4h9jnj1XsDHLUH8c1lNqJ1/bY9ZH
+						st+jsNRPwgHO+bUaRzafhiCwR68qEsQH9nh1tllacUa238j4TRdy0N1IVcrXYqCr
+						UMy77YWaeoK/CYPn0nPcCqjioIbYLgPfSi1ZPlsGNUwbPhihJcVqSHv8lqsdkGO3
+						gr0BxErS7qeWyO5zobMuwI8+iBecdRrQgszN8qxaJjOLyq2eTaFzgxtQnzbrSZSD
+						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>
diff --git a/swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml b/swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml
new file mode 100644
index 00000000..fe95bc25
--- /dev/null
+++ b/swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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://shibsp.test.openathens.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-19T09:15: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibsp.test.openathens.net/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDFTCCAf2gAwIBAgIJAIk7Iq11rRt9MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGnNoaWJzcC50ZXN0Lm9wZW5hdGhlbnMubmV0MB4XDTEyMTAxNzE0NDA0NFoX
+						DTIyMTAxNTE0NDA0NFowJTEjMCEGA1UEAxMac2hpYnNwLnRlc3Qub3BlbmF0aGVu
+						cy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWGWHhxgjISM46
+						9b3A8gkGUa2ylMd+Ubx/41jPo8a9F0edLOfcJRrJz3yXz4fyqkfO7kINyQzN3mv3
+						CsLOu3SfYfS+oPlQV0UjRrwCJooGZgSYRCl1XzSesRUWUw6S42kc39z10KEKfC4o
+						8o3yvsef+OAMB6GpvY3JeiqzN8iSKZFRwr9hAA670YVs3PaGJtKcsGTIidX6PbXl
+						s7P9z6mnysxOLMVaPOFmo0poCLgEAmAg/8nIYd19sHJbT4Zp0rhLG31Re4P9b8IU
+						3YEUsNFlSQ7/9n69rYlthriKBq+Lu8dPfG8oHrBKmqmeDYAdHla5J00lCEJX6pjP
+						+F4a7x7rAgMBAAGjSDBGMCUGA1UdEQQeMByCGnNoaWJzcC50ZXN0Lm9wZW5hdGhl
+						bnMubmV0MB0GA1UdDgQWBBSNL+bmIEoGpOitytkAJWqzqQVexzANBgkqhkiG9w0B
+						AQUFAAOCAQEAh6YPN9WA+ie41e+xTwepOMsupMgdJAvO3Pj2GqTRV7ub8oYHsNPz
+						e4hnUgy3PgWZUprg2Xu0dR80UaCt76RZktkywhE5Ese6gRzCnw5naeq+BohzZYhT
+						3aQqYN/3seBxz7q2ykidNM/FAuK0wzoS4kekkValdz58KNlqM5dFWyahc8nHN+3Q
+						PbHhdrEP/5L39XmhM1jCI3DUOL0FupAeosuYPOSfA7eTha7pPKc4hbdPrBWDumBz
+						49zWCVrzQN0i1CSS9gy9YBiqjnns9/ziNp6qb1VX2BIJ9Po6llnGAYOR6DLLgcYQ
+						3+F3/x57N94upwLaCaoj+04/l3acLW3ylQ==
+					</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://shibsp.test.openathens.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Eduserv Test Shibboleth 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/shibtest.copac.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibtest.copac.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..438dd4ca
--- /dev/null
+++ b/swamid-interfederations-2.0/shibtest.copac.ac.uk-shibboleth.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibtest.copac.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>
+						MIIEqzCCA5OgAwIBAgIQNaQKyn5I3KvJMbfFiT6fKDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDExMDAwMDAwMFoXDTE2MDExMDIzNTk1OVoweDELMAkGA1UE
+						BhMCR0IxEzARBgNVBAgTClNvbWUtU3RhdGUxJTAjBgNVBAoTHFRoZSBVbml2ZXJz
+						aXR5IG9mIE1hbmNoZXN0ZXIxDjAMBgNVBAsTBU1pbWFzMR0wGwYDVQQDExRzaGli
+						dGVzdC5jb3BhYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AOB8APPzklLfr8onf7jJ5QWXg9qSwyv4OD7MI1CKlhTWb823O3iPX75XIjqZjFO9
+						EAZTxUwOBIxpmIWKt54HFt6jyuRAUVXxb9itICpOvI4lPqZuL9SiSOieT4p3lDCB
+						dXnoI4+JP6HUwc6EKHLhyRW0Q3bHjhSvxuArMNBRFSt6Ub8/IsytCdjai9rekQvH
+						+w2Rxv4c3TnRXemESfytPpyPVeBnBP/A5M73+oQ4ZOBrP7kr/6jDbaAWBRPzY4vV
+						TZInHKt3nhD8lD0avETHCVKPrXSHl7/NkGCeFQjb35Wrh2yMCb4X4C21mbbSc7Co
+						jxngvxKjZG3i29oCjOmDhAUCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM
+						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRs6qv/R9HUiqMWPiSJnw4MsKEt2TAO
+						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgIw
+						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUc2hpYnRlc3Qu
+						Y29wYWMuYWMudWswDQYJKoZIhvcNAQEFBQADggEBADK9aNSziNKbrsd/FCh1Cpiz
+						R8rgs1dV1XVT/4ujJXJB1D9reS7GFdeBAQfmzyr91p18JE91biGPCJ6lepimmwxZ
+						qNSvAWXN9XzVBmEzsx//9bYfG6D6NkbAcwiRq55IcqU46dhEV6WDGB8oMroYn9HW
+						cSbQ9aiheN+O6a/SRBZypTJGeNiQdCa66OpGjs73nGe4mvb36CPr1fzWbGf3gWG5
+						HgPzIhypbVI4JpBORlHqKDsC8MvgxIkyUhWwNyLBlC6fijceMN3rmHz98CefeG0a
+						S5e2E/dEHa+2m10+7mwUvLMiPVuCWlHXFKnowQb7f9R/riTtQWAi/MFqib3RS2Y=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.copac.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.copac.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.copac.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibtest.copac.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 Copac Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mimas.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Copac Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:copac@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.ex.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibtest.ex.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..5d595fbd
--- /dev/null
+++ b/swamid-interfederations-2.0/shibtest.ex.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCGliS4d9uxBYDLZbK65nnF
+						iOww/S5w/YUPIAFiEhcyc7pMYalA5hQ6u24jdJB2wCPws5zRNo4LCDhBI9HcEg1l
+						4/4cUQ9CCfroqYxKCvFoUMGIMD67YC1kyEl5EyI0IfTyMcaBM0ZC/w7sFizle34P
+						/o5HYgs2LH4A/oOrL1tnXStp7KIr86AolereIiuhPGTwRRZBKRpuTlL/H6OutQnR
+						id50ELwScoYGb8AMshr2/zi1A4qFRIrAKukzARMzzIEsA+HVTvSmoBE7c+Dd+xD1
+						9ysn3WJW8NZ0brpqMEf4l+mL/3zASMMOKncWs4fJtumZEDEibLn+WOjmNwgLTYMd
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWJ0ZXN0LmV4LmFjLnVrhihodHRwczov
+						L3NoaWJ0ZXN0LmV4LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQN7xG3
+						UNjLDL6+INIwixGOlqLKIjANBgkqhkiG9w0BAQUFAAOCAQEAPMJapSaPkXzXLCjf
+						gVn2/oOiORjWRHXMbAOAbVDZV8JDogSSAHOBnyoWm1EEq/7YsuCN2E0LIeCkesN/
+						3l5Te5sDLGVTsGgA38ZsCEARSgXTKtd7K12gN9PwrONxiWs8H2s4O+XWZXmSypnj
+						iAdNlsIaUIXm+9D2iCQf6AYGZGNLgTI/IpYcTO+bWM8j7+CLLRIZbgSGq5mxXvrH
+						cgnzzj6gsts4WdkjxbjFiamiKs7OcrccBoEwF+SbkhyLafqiH7RG4m37j/JTNCg7
+						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>
+						MIIDMDCCAhigAwIBAgIVAIy6kv9GigBZ9U3z8fU8Mx1ZZgITMA0GCSqGSIb3DQEB
+						BQUAMBwxGjAYBgNVBAMTEXNoaWJ0ZXN0LmV4LmFjLnVrMB4XDTE0MDQwMzEyMTU0
+						NFoXDTM0MDQwMzEyMTU0NFowHDEaMBgGA1UEAxMRc2hpYnRlc3QuZXguYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCGliS4d9uxBYDLZbK65nnF
+						iOww/S5w/YUPIAFiEhcyc7pMYalA5hQ6u24jdJB2wCPws5zRNo4LCDhBI9HcEg1l
+						4/4cUQ9CCfroqYxKCvFoUMGIMD67YC1kyEl5EyI0IfTyMcaBM0ZC/w7sFizle34P
+						/o5HYgs2LH4A/oOrL1tnXStp7KIr86AolereIiuhPGTwRRZBKRpuTlL/H6OutQnR
+						id50ELwScoYGb8AMshr2/zi1A4qFRIrAKukzARMzzIEsA+HVTvSmoBE7c+Dd+xD1
+						9ysn3WJW8NZ0brpqMEf4l+mL/3zASMMOKncWs4fJtumZEDEibLn+WOjmNwgLTYMd
+						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWJ0ZXN0LmV4LmFjLnVrhihodHRwczov
+						L3NoaWJ0ZXN0LmV4LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQN7xG3
+						UNjLDL6+INIwixGOlqLKIjANBgkqhkiG9w0BAQUFAAOCAQEAPMJapSaPkXzXLCjf
+						gVn2/oOiORjWRHXMbAOAbVDZV8JDogSSAHOBnyoWm1EEq/7YsuCN2E0LIeCkesN/
+						3l5Te5sDLGVTsGgA38ZsCEARSgXTKtd7K12gN9PwrONxiWs8H2s4O+XWZXmSypnj
+						iAdNlsIaUIXm+9D2iCQf6AYGZGNLgTI/IpYcTO+bWM8j7+CLLRIZbgSGq5mxXvrH
+						cgnzzj6gsts4WdkjxbjFiamiKs7OcrccBoEwF+SbkhyLafqiH7RG4m37j/JTNCg7
+						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>
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
new file mode 100644
index 00000000..4f375613
--- /dev/null
+++ b/swamid-interfederations-2.0/shibtest.idp.mimas.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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
+						cC5taW1hcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI5a
+						s9OeylQjgw9Ikt2LQ0PeyVpArU30QKiawZ0vTELSAYGmguMnDqONV6TpYeBA6ul1
+						/Yk50Qc8VoSLbz6gXINVdAHykSsYj4hdiAbKZUcu4+5GLvQ2/WRdsAQ+SHoL3IoD
+						V0u9rkSfuHH/TdVpF/Ub+FT2bRDqVWnxdePhKwyc6rFVu7fl4aJ9sPwaCykbF8YL
+						RvDjm+yRbO2REUv2j1S5ALKpem5RsSlk8BO/7N2GC9BZ45OdUyNEs61O0HSnTr5I
+						W8TIAyKkbHjPgDog26pFRBpIOXUGwX8iLTPd/A4t8OfivW+yQHhRly8DIJvEkmLQ
+						uQmFFsJYiD0cgcHEvLcCAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYnRlc3QuaWRw
+						Lm1pbWFzLmFjLnVrhi9odHRwczovL3NoaWJ0ZXN0LmlkcC5taW1hcy5hYy51ay9p
+						ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUF8HL505cOeu0WSjw1vYH0cpDUlUwDQYJ
+						KoZIhvcNAQEFBQADggEBADaxi5Bc/h9oaFU8tuD1V67gUlwPsNTU8lR3vlOGZqan
+						3gxFnmOAkB+GOyqOSZ2TKyQkSMslpV4Vh1CVYl/tCzojfjd0vtu/BGyj+GwkwLBH
+						v3xee+AZAE14ENQwNCakQmylSDk4Jrd+4L2LgaAj/HXO2LC2y4WpekFSo1LdBHIo
+						64Ar2nuXGtzIuQ1xaQP/uzhkbTSRn67RYWfNXaoy8gAbSVC64YfQPQsGrutJZBxr
+						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>
+						MIIDTDCCAjSgAwIBAgIVAN7ga1+uXpDOX1/droiJ39Pl1TLUMA0GCSqGSIb3DQEB
+						BQUAMCMxITAfBgNVBAMTGHNoaWJ0ZXN0LmlkcC5taW1hcy5hYy51azAeFw0xMDA3
+						MTAxNDE4NTdaFw0zMDA3MTAxNDE4NTdaMCMxITAfBgNVBAMTGHNoaWJ0ZXN0Lmlk
+						cC5taW1hcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI5a
+						s9OeylQjgw9Ikt2LQ0PeyVpArU30QKiawZ0vTELSAYGmguMnDqONV6TpYeBA6ul1
+						/Yk50Qc8VoSLbz6gXINVdAHykSsYj4hdiAbKZUcu4+5GLvQ2/WRdsAQ+SHoL3IoD
+						V0u9rkSfuHH/TdVpF/Ub+FT2bRDqVWnxdePhKwyc6rFVu7fl4aJ9sPwaCykbF8YL
+						RvDjm+yRbO2REUv2j1S5ALKpem5RsSlk8BO/7N2GC9BZ45OdUyNEs61O0HSnTr5I
+						W8TIAyKkbHjPgDog26pFRBpIOXUGwX8iLTPd/A4t8OfivW+yQHhRly8DIJvEkmLQ
+						uQmFFsJYiD0cgcHEvLcCAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYnRlc3QuaWRw
+						Lm1pbWFzLmFjLnVrhi9odHRwczovL3NoaWJ0ZXN0LmlkcC5taW1hcy5hYy51ay9p
+						ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUF8HL505cOeu0WSjw1vYH0cpDUlUwDQYJ
+						KoZIhvcNAQEFBQADggEBADaxi5Bc/h9oaFU8tuD1V67gUlwPsNTU8lR3vlOGZqan
+						3gxFnmOAkB+GOyqOSZ2TKyQkSMslpV4Vh1CVYl/tCzojfjd0vtu/BGyj+GwkwLBH
+						v3xee+AZAE14ENQwNCakQmylSDk4Jrd+4L2LgaAj/HXO2LC2y4WpekFSo1LdBHIo
+						64Ar2nuXGtzIuQ1xaQP/uzhkbTSRn67RYWfNXaoy8gAbSVC64YfQPQsGrutJZBxr
+						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>
diff --git a/swamid-interfederations-2.0/shibtest.informit.com.au-shibboleth.xml b/swamid-interfederations-2.0/shibtest.informit.com.au-shibboleth.xml
new file mode 100644
index 00000000..99949c2a
--- /dev/null
+++ b/swamid-interfederations-2.0/shibtest.informit.com.au-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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>
+						MIIDPDCCAiSgAwIBAgIJANAW6lqADfvcMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHNoaWJ0ZXN0LmluZm9ybWl0LmNvbS5hdTAeFw0xMjEwMDgwMzIxMjBaFw0y
+						MjEwMDYwMzIxMjBaMCMxITAfBgNVBAMTGHNoaWJ0ZXN0LmluZm9ybWl0LmNvbS5h
+						dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/16egiJMNo0s7luNCB
+						57tJ0Lvpe/CuA5MeEJJGnwumGP4tmmYjaLsO+7m1L5HVnH99JlPoY5XXLDIXpB46
+						R3VMs0yS5FkvSF3GKdKtzNdGNUKZwJHVyevayJbIoSFgsTzjdrKfn0f7wFl1gT/o
+						j8I8FWy+dzj6oFqQTd1hGQoIh/sqd6QoDJ3GYDR2LJUkmkYZbx+Y3XhEWXpklWzz
+						PTx47StStcciRwcpLQ5/PTiQPUjuzl4L3TuhpNt9jy7+min9zYrCVBjOKvjRIBKL
+						53G5WyAeHPn5Woe2c52Ryy5bZn07WG0xQbkpRfBXZm8JidyGZlZ3UQbFqk0vRmOA
+						k/kCAwEAAaNzMHEwUAYDVR0RBEkwR4IYc2hpYnRlc3QuaW5mb3JtaXQuY29tLmF1
+						hitodHRwczovL3NoaWJ0ZXN0LmluZm9ybWl0LmNvbS5hdS9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBS29MuUEdmm7liCK8DyPCyiBUnfNDANBgkqhkiG9w0BAQUFAAOCAQEA
+						KY+aK2b6zeMx50dKwVqjtsNMaUPI+Cwp2+ghJyG/j2NUmpeTRPwVBRPnifRFKSi6
+						UXCI+eRzP4vJqbdksIebPr0feqwEHD5XDrbYeDmOLM4IN2u/ykVuSDIqFVV4rwTr
+						Yf6JyJCYJoebja/DtiqRE2nqDIrOYgdzreGyTHRm+PaVlEv9DSapC324F+WZDwoo
+						aqtGszguF/5Km8U1LJxLaQTyYV0skSJEhKWK8c41Erip2Iuv4c3gT/J0ML5sY1xB
+						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>Deepak</md:GivenName>
+    <md:SurName>Vasa</md:SurName>
+    <md:EmailAddress>mailto:deepak.vasa@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
new file mode 100644
index 00000000..b72ad08f
--- /dev/null
+++ b/swamid-interfederations-2.0/shibtest.zetoc.mimas.ac.uk-shibboleth.xml
@@ -0,0 +1,65 @@
+<?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>
+						MIID+jCCAuKgAwIBAgIJALJQK6WnWBR9MA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNV
+						BAYTAkdCMRMwEQYDVQQHEwpNYW5jaGVzdGVyMSUwIwYDVQQKExxUaGUgVW5pdmVy
+						c2l0eSBvZiBNYW5jaGVzdGVyMQ4wDAYDVQQLEwVNaW1hczEjMCEGA1UEAxMac2hp
+						YnRlc3QuemV0b2MubWltYXMuYWMudWswHhcNMTMwMTMwMTIyODQwWhcNMjMwMTI4
+						MTIyODQwWjB+MQswCQYDVQQGEwJHQjETMBEGA1UEBxMKTWFuY2hlc3RlcjElMCMG
+						A1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UECxMFTWlt
+						YXMxIzAhBgNVBAMTGnNoaWJ0ZXN0LnpldG9jLm1pbWFzLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwYrzV9W4FRjd960nw7LQiR5ThpyMeY1K
+						tDzt4WG6K3hKfPrvbddxa5RjsQV2HbnTjEguOwM5pVqgYClgEP5TDRPWzzKwp/uF
+						l1RNPFAdzpYZry3+b5IOyTipOLaH0lSX2sxGeHzeM42Qk7sv5ze8M1OifovcMEUK
+						NZER6/evAJbUSwIpuYrom6WSyRP9cPFz/8aLHoQjVsk1GcXXEcfACGWKCHO4ImaB
+						y1+PfLgM7z8x4hGYM0Ovrmy6S3F4lnoS9E44l1nee2eicPEWRFepdprKEcl8sdF+
+						t/uhBeDX7AH2D3dzCJ7yxRzNKtOeKCKgpUjNxCTl75XmhGTLk4f4LwIDAQABo3sw
+						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
+						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUwxHyq5lUAiW+S9Wcs0KtNf9+mGswHwYDVR0j
+						BBgwFoAUwxHyq5lUAiW+S9Wcs0KtNf9+mGswDQYJKoZIhvcNAQEFBQADggEBAGf5
+						LwIB+2JMqPXXkE8giX64mlkKDUDvwht3dlkN5vV9pbejCghaY/aEFGGOw88tmGhw
+						L+as0lPq0kCvdUGRP1/N5zU198gLOvL6i6Oo3psCVgSIobEd+eIjBqJj+/KcjyU9
+						yhembQl9SuEgzUiGzkE2giwOv1SnD605/sSjrnBuPdI2PU3/r0tsipB1IN4PXRtK
+						epdNWNz3pMY8i82Zt86ehzgR/V1UJhAgJ53v8UCaAj+OuQGSiiOBUGnG8eDbm9ET
+						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>
diff --git a/swamid-interfederations-2.0/shidp.glam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shidp.glam.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..1ed864b1
--- /dev/null
+++ b/swamid-interfederations-2.0/shidp.glam.ac.uk-shibboleth.xml
@@ -0,0 +1,92 @@
+<?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>
+      <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
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtnzmaVL9I3yNiqKniGKG1pRF
+						WeRejOpNJia1Y7wGxD4WjiMyVMf3nhRGLFDtQgVxB0xFbkzuxRmcZxRb+YiPR/Dy
+						P4ASQJ2QgOpWj7YUMk48nEq1G3A747bWVzwiRBs1XXN2BT4dvhgYXfTxiFKVWOdv
+						ffGOixfNfmF2+y9KSQ138izkIewG1ZL4e+OB0zRe182rAr0w9mchZb7+VAV5BW6q
+						tVLekPky+WDA4FWHI2CFC/9NyGnzmEqxQczdSF/b5qCHm0HUTV2AO415wAc2yyKH
+						XVgeCx4TahSrh9/08xAySDYZIY96CkNOahNjN6FG0iBAC0lGgxWX5nTB+PBt+QID
+						AQABo2cwZTBEBgNVHREEPTA7ghBzaGlkcC5nbGFtLmFjLnVrhidodHRwczovL3No
+						aWRwLmdsYW0uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFL6PJ9Ijs6+h
+						r6RavogHch1LNQ+JMA0GCSqGSIb3DQEBBQUAA4IBAQAjwbTW6ulWDIbwoJl0bs2S
+						+akVMUNN5/y03Uy87vMs+x/C+8H5qKb77zCcT0ey5qtXWjxrguKzyskEiGiIN7zu
+						MwaAbQFWRXyWfyanR182Ff15emFrETH9QTprRp/XYIjs5VmL6rUHtVyRrFq5tTAw
+						fVxnP0tcwpKoAcs4TUvGFokcY0RHjxutrYKXKA2T9/kJXkqXcYJII8LAe0QOJ6Qx
+						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>
+						MIIDLDCCAhSgAwIBAgIVAOq/2C/MoDMaYd36KL3bSPyQItVzMA0GCSqGSIb3DQEB
+						BQUAMBsxGTAXBgNVBAMTEHNoaWRwLmdsYW0uYWMudWswHhcNMTIxMTIxMTA1NTE0
+						WhcNMzIxMTIxMTA1NTE0WjAbMRkwFwYDVQQDExBzaGlkcC5nbGFtLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtnzmaVL9I3yNiqKniGKG1pRF
+						WeRejOpNJia1Y7wGxD4WjiMyVMf3nhRGLFDtQgVxB0xFbkzuxRmcZxRb+YiPR/Dy
+						P4ASQJ2QgOpWj7YUMk48nEq1G3A747bWVzwiRBs1XXN2BT4dvhgYXfTxiFKVWOdv
+						ffGOixfNfmF2+y9KSQ138izkIewG1ZL4e+OB0zRe182rAr0w9mchZb7+VAV5BW6q
+						tVLekPky+WDA4FWHI2CFC/9NyGnzmEqxQczdSF/b5qCHm0HUTV2AO415wAc2yyKH
+						XVgeCx4TahSrh9/08xAySDYZIY96CkNOahNjN6FG0iBAC0lGgxWX5nTB+PBt+QID
+						AQABo2cwZTBEBgNVHREEPTA7ghBzaGlkcC5nbGFtLmFjLnVrhidodHRwczovL3No
+						aWRwLmdsYW0uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFL6PJ9Ijs6+h
+						r6RavogHch1LNQ+JMA0GCSqGSIb3DQEBBQUAA4IBAQAjwbTW6ulWDIbwoJl0bs2S
+						+akVMUNN5/y03Uy87vMs+x/C+8H5qKb77zCcT0ey5qtXWjxrguKzyskEiGiIN7zu
+						MwaAbQFWRXyWfyanR182Ff15emFrETH9QTprRp/XYIjs5VmL6rUHtVyRrFq5tTAw
+						fVxnP0tcwpKoAcs4TUvGFokcY0RHjxutrYKXKA2T9/kJXkqXcYJII8LAe0QOJ6Qx
+						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>
diff --git a/swamid-interfederations-2.0/shu.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shu.unidesk.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..fca9c019
--- /dev/null
+++ b/swamid-interfederations-2.0/shu.unidesk.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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.unidesk.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-18T13:51: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC/TCCAeWgAwIBAgIJAPHsl6kKrFrnMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEmxpdmUudW5pZGVzay5hYy51azAeFw0xMjA0MTExNDU4MjhaFw0yMjA0MDkx
+						NDU4MjhaMB0xGzAZBgNVBAMTEmxpdmUudW5pZGVzay5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAL9qh/Dehm5jJdWdeFPNKqcjMdiqii8Iz9Rc
+						tCAsEwRsYww4EQDG7MxG5hg4NSS+iIPFCp9gR+G7hTnZAMGgNpxs2vk4vs9lmhRY
+						GmB7Y1NFloP9Pcsu+MaufaLzxi6bzIXV4dBVHqVnIcgxchDIsXmPE6xlq4poEq+q
+						XJ3aFE/eWwxfwN9z0s5yeICzsil73xk9T9NLeNAeYq+jfVTcdqDbBHY6eHtMOYh/
+						uPVYYxkKXjkgSH5cwG0b+7qN4z+uzKDNBXxnI1Nz+bLOazXW6ljQIDtAPQZMJSlr
+						3OepVaQS+fMBi0Sku5yvADgINdXxkz6H4Zx4pZg/rTQBQ/8u2esCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISbGl2ZS51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBQ2tPlzxC8e
+						akC2nh9qrG4TWfI3tzANBgkqhkiG9w0BAQUFAAOCAQEAWPY3Nv9ChZ+4XVNANhLq
+						fGF7SbiPmUNj9vWGNjCp8Ma0tdDOZPvqBRzxKkkR+LS+fHpSQQ54RuNeZrulWBiN
+						akZe3LZiSH9AHG2uD0lDuxr0UQt1AHGDiLjFXuRg9+CdqqrdT3Anmy6exDDfRsjH
+						k+ZJflkEtqTNd0dbEVlkYlg8Baqx/ZMOxkccx8PtQt1yptAMsH4Rn92vXLd9d3JM
+						H1mrFuiriqrgsAfVLmzc4WeGmB+dK01cSB+CY7hKnoe7ds1y7kNhOmZ9HP3Iy7ev
+						gF2RCdnqkP9zScihW4b20PlVa/sWMUyCj2uZE1lSO51PJcGVU0H/JFrBEpaM7u6t
+						jg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shu.unidesk.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">Unidesk - Sheffield Hallam University</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/si.crous-rouen.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/si.crous-rouen.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..30f111fe
--- /dev/null
+++ b/swamid-interfederations-2.0/si.crous-rouen.fr-idp-shibboleth.xml
@@ -0,0 +1,103 @@
+<?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>
+      <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="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>
+					      MIIEhzCCA2+gAwIBAgIQJvlpRPEdizrPH+vEmo4c7zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIwNDAwMDAwMFoXDTE1MTIwNDIzNTk1OVowYTELMAkGA1UE
+BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIFJvdWVuMR0wGwYDVQQLExRTZXJ2aWNl
+IGluZm9ybWF0aXF1ZTEaMBgGA1UEAxMRc2kuY3JvdXMtcm91ZW4uZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxhfxnSTRvwvr8huLLous5gGIB3bA0
+VhtougdS1hdlNEhd+5ndm1GXOqQx3Mh0e6cEl2fmjAO1pf4VYuNpnjyGSmcln+58
+4CY/zPq5WNwKwY10rQy3N3TeXKaafI97p1bEOBViNdDmu/I2wr9tuGjfvMmBD00J
+k35yiFb8K2XxG3WUFRXBAIXwoxZbpBPalfr1dZ85F7UHqvgwh4fZQi3Zourwey5h
+08L86LLKBgeRkkoPbYrCJI6pcquCh9whh5jbFEjxpaFJD8zioEJ/q+ARdC4qtEF2
+OQebDHSd+Gy5wXWsnlu/XfSGhzxtaB6RNLLBogYuE+liCqDXVViQ9s71AgMBAAGj
+ggFkMIIBYDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
+FgQUF3MBzPJ4bF7LVHDZXQCs5WhxH5QwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
+/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
+DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
+AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0R
+BBUwE4IRc2kuY3JvdXMtcm91ZW4uZnIwDQYJKoZIhvcNAQEFBQADggEBACE/ua3I
+2BlsFzZ2gtxNlMVg6wLQhZkgoOx+Lz/IgZsCjwiIaoNDAj6XfNvSO/DAAbVoVQJt
+XzpmrdiHmG9L9U1RkVUkj7ADLF8BiHxsbXdva7fbRIry4hBdXfvy2vygdhP+YH78
+RAApFdog+ch9Q7pFovajXuJPxYa56W8OQ788uyO2cZqF834qJUbH9p6R78vLFH5Y
+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>
+					      MIIEhzCCA2+gAwIBAgIQJvlpRPEdizrPH+vEmo4c7zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIwNDAwMDAwMFoXDTE1MTIwNDIzNTk1OVowYTELMAkGA1UE
+BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIFJvdWVuMR0wGwYDVQQLExRTZXJ2aWNl
+IGluZm9ybWF0aXF1ZTEaMBgGA1UEAxMRc2kuY3JvdXMtcm91ZW4uZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxhfxnSTRvwvr8huLLous5gGIB3bA0
+VhtougdS1hdlNEhd+5ndm1GXOqQx3Mh0e6cEl2fmjAO1pf4VYuNpnjyGSmcln+58
+4CY/zPq5WNwKwY10rQy3N3TeXKaafI97p1bEOBViNdDmu/I2wr9tuGjfvMmBD00J
+k35yiFb8K2XxG3WUFRXBAIXwoxZbpBPalfr1dZ85F7UHqvgwh4fZQi3Zourwey5h
+08L86LLKBgeRkkoPbYrCJI6pcquCh9whh5jbFEjxpaFJD8zioEJ/q+ARdC4qtEF2
+OQebDHSd+Gy5wXWsnlu/XfSGhzxtaB6RNLLBogYuE+liCqDXVViQ9s71AgMBAAGj
+ggFkMIIBYDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
+FgQUF3MBzPJ4bF7LVHDZXQCs5WhxH5QwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
+/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
+DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
+AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0R
+BBUwE4IRc2kuY3JvdXMtcm91ZW4uZnIwDQYJKoZIhvcNAQEFBQADggEBACE/ua3I
+2BlsFzZ2gtxNlMVg6wLQhZkgoOx+Lz/IgZsCjwiIaoNDAj6XfNvSO/DAAbVoVQJt
+XzpmrdiHmG9L9U1RkVUkj7ADLF8BiHxsbXdva7fbRIry4hBdXfvy2vygdhP+YH78
+RAApFdog+ch9Q7pFovajXuJPxYa56W8OQ788uyO2cZqF834qJUbH9p6R78vLFH5Y
+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://unknown.site.com</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
new file mode 100644
index 00000000..2c1fdf66
--- /dev/null
+++ b/swamid-interfederations-2.0/siaiap08.univali.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xJzAlBgNVBAoTHlVuaXZlcnNp
+ZGFkZSBkbyBWYWxlIGRvIEl0YWphaTEMMAoGA1UECxMDR1RJMR8wHQYJKoZIhvcN
+AQkBFhBhZG1pbkB1bml2YWxpLmJyMQ8wDQYDVQQHEwZJdGFqYWkxFzAVBgNVBAgT
+DlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTc2lhaWFwMDgu
+dW5pdmFsaS5icjAeFw0xNDA0MTcxMjMzNTdaFw0xOTA0MTYxMjMzNTdaMIGtMScw
+JQYDVQQKEx5Vbml2ZXJzaWRhZGUgZG8gVmFsZSBkbyBJdGFqYWkxDDAKBgNVBAsT
+A0dUSTEfMB0GCSqGSIb3DQEJARYQYWRtaW5AdW5pdmFsaS5icjEPMA0GA1UEBxMG
+SXRhamFpMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxHDAa
+BgNVBAMTE3NpYWlhcDA4LnVuaXZhbGkuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC0j73uQz7HKNv3mF/UfQ4qiCC/A1o8QwYJGhvyT7Ie9DQUP1UL
+yxF4hSYQ/Xtla7Bm0E3iJBZkcJDZ9k6xOhIwMrWa7reWzDzqUCdzbb0DtvSqiR1e
+iDiHfS0kjS482IBaBsO9hYOueRm8FlrAe8JBEVWaild1/9o3OazFb6Nnm97tbuW0
+kLHeAjM5z5Q2HDaAPH4mw78ctdZrQgLgdwKn71EPIrD2Dw00Bz/1Ndvx1KJPUFxB
+hDHT0cMTQ3imeWptocy65Tq7q2xpBwtkWjJqGMLYoGVbr4+aBq8CahoW+8zMrlqo
+aVNU9398awtGiLuFKQRQzwoYOOAy9CoDlcJHAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAByTETZ7kpMiPJvt/zy+0q5ClKYda3WpqLpaTwnLl359k72A0KSYrZn6siv6
+GcSrTzlf5X+gEH1rFqySh+JYfIUo/xS2CYJC9zbtuCXiJKuzuXBgR69aPlzBP5kG
+qXMP3r2nGYCZhoVdtONZR7i1V9tzhjEziRi8FTj0RMxxE01pNYd34mp82tRxZsFk
++dmRQQjNfM5zWaEosG94oV1X+QP06y4AER/kTVZKh1TJOPzHvY/fG8QheEKOHO1j
+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>
+      
+MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xJzAlBgNVBAoTHlVuaXZlcnNp
+ZGFkZSBkbyBWYWxlIGRvIEl0YWphaTEMMAoGA1UECxMDR1RJMR8wHQYJKoZIhvcN
+AQkBFhBhZG1pbkB1bml2YWxpLmJyMQ8wDQYDVQQHEwZJdGFqYWkxFzAVBgNVBAgT
+DlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTc2lhaWFwMDgu
+dW5pdmFsaS5icjAeFw0xNDA0MTcxMjMzNTdaFw0xOTA0MTYxMjMzNTdaMIGtMScw
+JQYDVQQKEx5Vbml2ZXJzaWRhZGUgZG8gVmFsZSBkbyBJdGFqYWkxDDAKBgNVBAsT
+A0dUSTEfMB0GCSqGSIb3DQEJARYQYWRtaW5AdW5pdmFsaS5icjEPMA0GA1UEBxMG
+SXRhamFpMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxHDAa
+BgNVBAMTE3NpYWlhcDA4LnVuaXZhbGkuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC0j73uQz7HKNv3mF/UfQ4qiCC/A1o8QwYJGhvyT7Ie9DQUP1UL
+yxF4hSYQ/Xtla7Bm0E3iJBZkcJDZ9k6xOhIwMrWa7reWzDzqUCdzbb0DtvSqiR1e
+iDiHfS0kjS482IBaBsO9hYOueRm8FlrAe8JBEVWaild1/9o3OazFb6Nnm97tbuW0
+kLHeAjM5z5Q2HDaAPH4mw78ctdZrQgLgdwKn71EPIrD2Dw00Bz/1Ndvx1KJPUFxB
+hDHT0cMTQ3imeWptocy65Tq7q2xpBwtkWjJqGMLYoGVbr4+aBq8CahoW+8zMrlqo
+aVNU9398awtGiLuFKQRQzwoYOOAy9CoDlcJHAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAByTETZ7kpMiPJvt/zy+0q5ClKYda3WpqLpaTwnLl359k72A0KSYrZn6siv6
+GcSrTzlf5X+gEH1rFqySh+JYfIUo/xS2CYJC9zbtuCXiJKuzuXBgR69aPlzBP5kG
+qXMP3r2nGYCZhoVdtONZR7i1V9tzhjEziRi8FTj0RMxxE01pNYd34mp82tRxZsFk
++dmRQQjNfM5zWaEosG94oV1X+QP06y4AER/kTVZKh1TJOPzHvY/fG8QheEKOHO1j
+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>
diff --git a/swamid-interfederations-2.0/sid.kent.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sid.kent.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..464182bb
--- /dev/null
+++ b/swamid-interfederations-2.0/sid.kent.ac.uk-shibboleth.xml
@@ -0,0 +1,138 @@
+<?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>
+      <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>
+						MIIFtzCCBJ+gAwIBAgIQL+WrqVAi6nPu0mI9W17VBzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDEwOTAwMDAwMFoXDTE2MDEwOTIzNTk1OVowgYYxCzAJBgNV
+						BAYTAkdCMQ0wCwYDVQQIEwRLZW50MRMwEQYDVQQHEwpDYW50ZXJidXJ5MRswGQYD
+						VQQKExJVbml2ZXJzaXR5IG9mIEtlbnQxGjAYBgNVBAsTEUNvbXB1dGluZyBTZXJ2
+						aWNlMRowGAYDVQQDExFqb3JkYW4ua2VudC5hYy51azCCAiIwDQYJKoZIhvcNAQEB
+						BQADggIPADCCAgoCggIBAPGg+Gei4IjzW4dRDytADYkZUVdoJ/iYdQw6GMW7R4qh
+						0qjK9r2zlpkToS8kHKXRHJ4HjR31gNt4J2iqkFN3N/kqUD3ItgK+XvqWjTtdmIqR
+						MTR+YXm3dObzhAKTVmS6Pvwcp5/6kxG7BO3jK3CjsSeWnG0zLKBwK/HJguUiujw4
+						AOEGgvSB3H86GQ9r+ATZgoAqhElsaJMU3/YKhKn0q8J9pZQOhTQXFVkplOh9Hllx
+						K1NU/gQkMZiYsJtl7HRXL/SfyE9OFibNQ6/CkdWU3XuJcgPwTNsuavl+wzi7tz+q
+						aiCRrEfU2IGOtNnobXjwYv7w//xt8nkER7aDGbPPUWkVSe5VPWuL7f3+qAW8krjY
+						LvxQwOj0tKsHeoZM5YODXT6vq9+vJlNo0PgzU6nDSFWKkfgZ/y5QTGJoZ/neMQrm
+						2hMNBVHq05VeGu/EIONnK0NHp/ob2SaVFTHllYb8RGth5iqgWANdlR73SKX4v59h
+						Z5NgBF6nnPM0xOMxcNJBn6IP3D07VWvHzPzWDZXl1FURjcLgv5AF41k2i4PIhMgg
+						WZOT+Nb5kPq5/aly30hh1QcVcZVMIhD7X1QZTa7MhRFz2gChUTtEV2pmu+b2v1YE
+						kEJxXH4+RpXKELzVANmKXDsau/VV+R6pVr8fDxnaA5xjiKcIrYS5HAv3pT+6Lscz
+						AgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
+						BgNVHQ4EFgQUOpVDaesyKDnqlscJJKWiWKHpqEEwDgYDVR0PAQH/BAQDAgWgMAwG
+						A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
+						IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
+						KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
+						AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
+						Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
+						ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWpvcmRhbi5rZW50LmFjLnVrMA0GCSqGSIb3
+						DQEBBQUAA4IBAQCA/61/holHZJ8hI6Uhcab1sPQ0lPp00TY6rC25SPWIx9h2s7YH
+						2WrUu/ju/AoH3dc40n67ZCY4JDGsBh8okU1ELiq2pmA+qA7vl/4mEI8EecnycIZD
+						n2ZT3cr4T417QIT7WJ/CL/gHc/q7wV2gR/57h0AqHnQDHM7+h7MN5hXWE/a2winL
+						tABzuJSSQIJeaAB0O9/rn753rjzoxoWoB97il/W9CmCAAbw8+Q0kK4+9zDCT4l2J
+						H+yTsYxigI/BaQiYE1XKp4ypSndhqJCkCToQCrkDe1Cak0CspAbmdETK75tMn3S3
+						OaaXtDMA/vTUzkI2oLgGqsnhv6IRTH07P9WH
+					</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>
+						MIIFtzCCBJ+gAwIBAgIQL+WrqVAi6nPu0mI9W17VBzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDEwOTAwMDAwMFoXDTE2MDEwOTIzNTk1OVowgYYxCzAJBgNV
+						BAYTAkdCMQ0wCwYDVQQIEwRLZW50MRMwEQYDVQQHEwpDYW50ZXJidXJ5MRswGQYD
+						VQQKExJVbml2ZXJzaXR5IG9mIEtlbnQxGjAYBgNVBAsTEUNvbXB1dGluZyBTZXJ2
+						aWNlMRowGAYDVQQDExFqb3JkYW4ua2VudC5hYy51azCCAiIwDQYJKoZIhvcNAQEB
+						BQADggIPADCCAgoCggIBAPGg+Gei4IjzW4dRDytADYkZUVdoJ/iYdQw6GMW7R4qh
+						0qjK9r2zlpkToS8kHKXRHJ4HjR31gNt4J2iqkFN3N/kqUD3ItgK+XvqWjTtdmIqR
+						MTR+YXm3dObzhAKTVmS6Pvwcp5/6kxG7BO3jK3CjsSeWnG0zLKBwK/HJguUiujw4
+						AOEGgvSB3H86GQ9r+ATZgoAqhElsaJMU3/YKhKn0q8J9pZQOhTQXFVkplOh9Hllx
+						K1NU/gQkMZiYsJtl7HRXL/SfyE9OFibNQ6/CkdWU3XuJcgPwTNsuavl+wzi7tz+q
+						aiCRrEfU2IGOtNnobXjwYv7w//xt8nkER7aDGbPPUWkVSe5VPWuL7f3+qAW8krjY
+						LvxQwOj0tKsHeoZM5YODXT6vq9+vJlNo0PgzU6nDSFWKkfgZ/y5QTGJoZ/neMQrm
+						2hMNBVHq05VeGu/EIONnK0NHp/ob2SaVFTHllYb8RGth5iqgWANdlR73SKX4v59h
+						Z5NgBF6nnPM0xOMxcNJBn6IP3D07VWvHzPzWDZXl1FURjcLgv5AF41k2i4PIhMgg
+						WZOT+Nb5kPq5/aly30hh1QcVcZVMIhD7X1QZTa7MhRFz2gChUTtEV2pmu+b2v1YE
+						kEJxXH4+RpXKELzVANmKXDsau/VV+R6pVr8fDxnaA5xjiKcIrYS5HAv3pT+6Lscz
+						AgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
+						BgNVHQ4EFgQUOpVDaesyKDnqlscJJKWiWKHpqEEwDgYDVR0PAQH/BAQDAgWgMAwG
+						A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
+						IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
+						KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
+						AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
+						Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
+						ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWpvcmRhbi5rZW50LmFjLnVrMA0GCSqGSIb3
+						DQEBBQUAA4IBAQCA/61/holHZJ8hI6Uhcab1sPQ0lPp00TY6rC25SPWIx9h2s7YH
+						2WrUu/ju/AoH3dc40n67ZCY4JDGsBh8okU1ELiq2pmA+qA7vl/4mEI8EecnycIZD
+						n2ZT3cr4T417QIT7WJ/CL/gHc/q7wV2gR/57h0AqHnQDHM7+h7MN5hXWE/a2winL
+						tABzuJSSQIJeaAB0O9/rn753rjzoxoWoB97il/W9CmCAAbw8+Q0kK4+9zDCT4l2J
+						H+yTsYxigI/BaQiYE1XKp4ypSndhqJCkCToQCrkDe1Cak0CspAbmdETK75tMn3S3
+						OaaXtDMA/vTUzkI2oLgGqsnhv6IRTH07P9WH
+					</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>
diff --git a/swamid-interfederations-2.0/sids.somerset.ac.uk-metadata.xml b/swamid-interfederations-2.0/sids.somerset.ac.uk-metadata.xml
new file mode 100644
index 00000000..e10c5c79
--- /dev/null
+++ b/swamid-interfederations-2.0/sids.somerset.ac.uk-metadata.xml
@@ -0,0 +1,105 @@
+<?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>
+      <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
+						GgYDVQQDExNzaWRzLnNvbWVyc2V0LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJJVFVA
+						c29tZXJzZXQuYWMudWswHhcNMTMwMzIwMTEzMTQyWhcNMjMwMzE4MTEzMTQyWjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNvbWVyc2V0MRAwDgYDVQQHEwdUYXVu
+						dG9uMRkwFwYDVQQKExBTb21lcnNldCBDb2xsZWdlMRQwEgYDVQQLEwtJVCBTZXJ2
+						aWNlczEcMBoGA1UEAxMTc2lkcy5zb21lcnNldC5hYy51azEhMB8GCSqGSIb3DQEJ
+						ARYSSVRVQHNvbWVyc2V0LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAqf0t5xntwBwEwen1V+yeVDIQH/KeNSNBUF1LlaVU9q3HPKIRUVDVRp/P
+						+f/NwsxXfdIrcfycBmJJT/sJoIgtF+aiYJw1VZp0hSc7rCF1Z+VlBpA1mWvnvkGA
+						11V9tCEA3Hk0IO7Ttrt4ObsFgfM7DrvkKwlrb5JkqVZxNebhbrzOaaiwAy3iDbXn
+						RKIMz5AzFz88NYGM+swyfApuxMgvraNWW0dVqYuVuSRuTW5YGpevH2Ml1X7Z1yf8
+						nfOwgGpFiRWLrran8m+ePy6lNUXj+7LHKmIDDJY3XGkwme1XdM6AuizfE6fdkjgi
+						4nRHoueY2bE9c9R+Te9gKRYMy476MwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQUfm7ZHxim2b+0FmNBSQuHpaet4REwHwYDVR0jBBgwFoAUfm7ZHxim2b+0FmNB
+						SQuHpaet4REwDQYJKoZIhvcNAQEFBQADggEBABx6x/C2GGUJvqx3Zflx/tr/edtw
+						bsQ18fOij0TrN5aQUsCfrf3q2tTA+5lRbWYaxIHJW70re7IVmv275mFHkC696TtQ
+						r9suaJ7Ba+8p84OSHaY8jSyERKNoqCIQF7lHXHkL2kaeB8KZJ2uNaVOYGzBPFP5i
+						YcKE+b2k3LRS5iDhI34pgcWj7Dr096GSRwICVRaAjNyZUSgnQfVBMgeUOXKYy+sF
+						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>
+						MIIESDCCAzCgAwIBAgIJAJhc0Z//qBJuMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU29tZXJzZXQxEDAOBgNVBAcTB1RhdW50b24xGTAX
+						BgNVBAoTEFNvbWVyc2V0IENvbGxlZ2UxFDASBgNVBAsTC0lUIFNlcnZpY2VzMRww
+						GgYDVQQDExNzaWRzLnNvbWVyc2V0LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJJVFVA
+						c29tZXJzZXQuYWMudWswHhcNMTMwMzIwMTEzMTQyWhcNMjMwMzE4MTEzMTQyWjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNvbWVyc2V0MRAwDgYDVQQHEwdUYXVu
+						dG9uMRkwFwYDVQQKExBTb21lcnNldCBDb2xsZWdlMRQwEgYDVQQLEwtJVCBTZXJ2
+						aWNlczEcMBoGA1UEAxMTc2lkcy5zb21lcnNldC5hYy51azEhMB8GCSqGSIb3DQEJ
+						ARYSSVRVQHNvbWVyc2V0LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAqf0t5xntwBwEwen1V+yeVDIQH/KeNSNBUF1LlaVU9q3HPKIRUVDVRp/P
+						+f/NwsxXfdIrcfycBmJJT/sJoIgtF+aiYJw1VZp0hSc7rCF1Z+VlBpA1mWvnvkGA
+						11V9tCEA3Hk0IO7Ttrt4ObsFgfM7DrvkKwlrb5JkqVZxNebhbrzOaaiwAy3iDbXn
+						RKIMz5AzFz88NYGM+swyfApuxMgvraNWW0dVqYuVuSRuTW5YGpevH2Ml1X7Z1yf8
+						nfOwgGpFiRWLrran8m+ePy6lNUXj+7LHKmIDDJY3XGkwme1XdM6AuizfE6fdkjgi
+						4nRHoueY2bE9c9R+Te9gKRYMy476MwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQUfm7ZHxim2b+0FmNBSQuHpaet4REwHwYDVR0jBBgwFoAUfm7ZHxim2b+0FmNB
+						SQuHpaet4REwDQYJKoZIhvcNAQEFBQADggEBABx6x/C2GGUJvqx3Zflx/tr/edtw
+						bsQ18fOij0TrN5aQUsCfrf3q2tTA+5lRbWYaxIHJW70re7IVmv275mFHkC696TtQ
+						r9suaJ7Ba+8p84OSHaY8jSyERKNoqCIQF7lHXHkL2kaeB8KZJ2uNaVOYGzBPFP5i
+						YcKE+b2k3LRS5iDhI34pgcWj7Dr096GSRwICVRaAjNyZUSgnQfVBMgeUOXKYy+sF
+						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>
diff --git a/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml
new file mode 100644
index 00000000..4a9d1b1c
--- /dev/null
+++ b/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml
@@ -0,0 +1,126 @@
+<?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>
+      <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 height="116" width="350" xml:lang="sv">https://signon.hh.se/hh-logo-sv-350x116.png</mdui:Logo>
+        <mdui:Logo height="116" width="350" xml:lang="en">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>
+MIIDHDCCAgSgAwIBAgIVANvNFOWJZe9T3CpX7Sk5ZKgztjMgMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDHNpZ25vbi5oaC5zZTAeFw0wOTA5MTYwODM0MjZaFw0y
+OTA5MTYwODM0MjZaMBcxFTATBgNVBAMTDHNpZ25vbi5oaC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAIdi7+4jvkJyhmR/IHjVKV0TOJ1TBw5x8FXo
+VVDkZdixmiT/YVp6kfRsKL6yWlNKEm7X6kcrJ+xKUNYUi9n8p1uloS6tBhfG37pC
+Xt7fi7imSi882T4fUYzCR3cVAbe8k6L8UKIdWdNVGIkvXzgeBZh/qHCnvyjtF1Bd
+4mEUHh55KieKVmKCYD7TE4T14tE4xSBf7L9Dna4U9aM7Ne+xeHSW/rGGALtfZhIr
+DOZLZSBCIAzBhzwuDb2h7xYBrCBF7QEWInI8tkQPa/g/sS/5xH+nTGO0RAWY9EWu
+2V2HN3hp3/nX8smCSIKRyxWzLJ29htCrsljTLSvFVOstCU0NI/8CAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMc2lnbm9uLmhoLnNlhiNodHRwczovL3NpZ25vbi5oaC5zZS9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUQJ23SW9pFtWUbgw5WcI2qK7YSZAwDQYJ
+KoZIhvcNAQEFBQADggEBAIAl6LBd5IzC+1MxH293vgBeVnIJvRNAp0vn4BqyHgX0
+3i4lqzw/g8hj+va7kOfr1VidYoS3ur5YYnoVC7muILBy8uNeXGaRNeh7xRJHb+HF
+7eEjWvDrj2RQtaED3+1INj2bl5gR4vEt5VkWh6TVU40x4ea0V97Vm4ZO416b9L6I
+06Hp/H4L2oHEJUMdOfxhlipIXZeAxZ2lSHmGspfNRCybLAs/raVGBvq1/RSpRS+X
+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>
+MIIDHDCCAgSgAwIBAgIVANvNFOWJZe9T3CpX7Sk5ZKgztjMgMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDHNpZ25vbi5oaC5zZTAeFw0wOTA5MTYwODM0MjZaFw0y
+OTA5MTYwODM0MjZaMBcxFTATBgNVBAMTDHNpZ25vbi5oaC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAIdi7+4jvkJyhmR/IHjVKV0TOJ1TBw5x8FXo
+VVDkZdixmiT/YVp6kfRsKL6yWlNKEm7X6kcrJ+xKUNYUi9n8p1uloS6tBhfG37pC
+Xt7fi7imSi882T4fUYzCR3cVAbe8k6L8UKIdWdNVGIkvXzgeBZh/qHCnvyjtF1Bd
+4mEUHh55KieKVmKCYD7TE4T14tE4xSBf7L9Dna4U9aM7Ne+xeHSW/rGGALtfZhIr
+DOZLZSBCIAzBhzwuDb2h7xYBrCBF7QEWInI8tkQPa/g/sS/5xH+nTGO0RAWY9EWu
+2V2HN3hp3/nX8smCSIKRyxWzLJ29htCrsljTLSvFVOstCU0NI/8CAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMc2lnbm9uLmhoLnNlhiNodHRwczovL3NpZ25vbi5oaC5zZS9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUQJ23SW9pFtWUbgw5WcI2qK7YSZAwDQYJ
+KoZIhvcNAQEFBQADggEBAIAl6LBd5IzC+1MxH293vgBeVnIJvRNAp0vn4BqyHgX0
+3i4lqzw/g8hj+va7kOfr1VidYoS3ur5YYnoVC7muILBy8uNeXGaRNeh7xRJHb+HF
+7eEjWvDrj2RQtaED3+1INj2bl5gR4vEt5VkWh6TVU40x4ea0V97Vm4ZO416b9L6I
+06Hp/H4L2oHEJUMdOfxhlipIXZeAxZ2lSHmGspfNRCybLAs/raVGBvq1/RSpRS+X
+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>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>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>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
new file mode 100644
index 00000000..1127340c
--- /dev/null
+++ b/swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml
@@ -0,0 +1,48 @@
+<?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>
+  </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">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/media/idp/rug.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">University of Groningen Rijksuniversiteit Groningen RUG</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">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: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
new file mode 100644
index 00000000..67a1d016
--- /dev/null
+++ b/swamid-interfederations-2.0/sistemas.uepg.br-idp-shibboleth.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIE2zCCA8OgAwIBAgIQCOU7rX76FeJ9Ci35yhOEPDANBgkqhkiG9w0BAQsFADA8
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
+aGF3dGUgU1NMIENBMB4XDTEzMTEyMjAwMDAwMFoXDTE2MTIyMTIzNTk1OVowgasx
+CzAJBgNVBAYTAkJSMQ8wDQYDVQQIEwZQYXJhbmExFTATBgNVBAcUDFBvbnRhIEdy
+b3NzYTEuMCwGA1UEChQlVW5pdmVyc2lkYWRlIEVzdGFkdWFsIGRlIFBvbnRhIEdy
+b3NzYTEpMCcGA1UECxQgQ2VudHJvIGRlIFByb2Nlc3NhbWVudG8gZGUgRGFkb3Mx
+GTAXBgNVBAMUEHNpc3RlbWFzLnVlcGcuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC4Z3ynISGCCLmgO6uxZXCyCy2217M4h4R8pK0wB6tQUBxqU6jr
+VI2iw1O1Xw3H18qFkk6BdjDF4fJaF9qY3qwZ5JMrL2kKCWubkHB67Ig13R8bKVGL
+SCl/h8UAbhU6g8PDUSEN/gyPVT8H/g8jOeJAS3ruE9XVdbYQUUEHV6sCBRSztz2U
+NtlGDeQYZ0haN7sX2kXk1vx4xYLzYhTEavajLtY2Kcsp8u/Uy8f1IuV9chNsLfdl
+aZrnMT/Z28qCoWAeFfz4M6bAZ6Gcyy0TeSI8BDmAqsH7WVukEZ5WEhI/wQx3+z9V
+0YnDr3ZTZlDn1Z+1WLjvRpwDfYN048D3DnABAgMBAAGjggFnMIIBYzAbBgNVHREE
+FDASghBzaXN0ZW1hcy51ZXBnLmJyMAkGA1UdEwQCMAAwQgYDVR0gBDswOTA3Bgpg
+hkgBhvhFAQc2MCkwJwYIKwYBBQUHAgEWG2h0dHBzOi8vd3d3LnRoYXd0ZS5jb20v
+Y3BzLzAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUp6KDuzRFQD381TBPErk+
+oQGf9tswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL3N2ci1vdi1jcmwudGhhd3Rl
+LmNvbS9UaGF3dGVPVi5jcmwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MGkGCCsGAQUFBwEBBF0wWzAiBggrBgEFBQcwAYYWaHR0cDovL29jc3AudGhhd3Rl
+LmNvbTA1BggrBgEFBQcwAoYpaHR0cDovL3N2ci1vdi1haWEudGhhd3RlLmNvbS9U
+aGF3dGVPVi5jZXIwDQYJKoZIhvcNAQELBQADggEBADyZXmy6yj//w3chkKMS5mDJ
+c+QyGYnnANYl+3chFGMdOA0MbZV/r6bPpLj0ieHgH76jvCGq7cYDOIX2mJL5UaBt
+pFzP3P/mcrKtgiWVRKPTPSyIEOK3WhAch+kTAiyuf9BAdZXi8GUcF1SYOqxzbWKI
+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>
+      
+MIIE2zCCA8OgAwIBAgIQCOU7rX76FeJ9Ci35yhOEPDANBgkqhkiG9w0BAQsFADA8
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
+aGF3dGUgU1NMIENBMB4XDTEzMTEyMjAwMDAwMFoXDTE2MTIyMTIzNTk1OVowgasx
+CzAJBgNVBAYTAkJSMQ8wDQYDVQQIEwZQYXJhbmExFTATBgNVBAcUDFBvbnRhIEdy
+b3NzYTEuMCwGA1UEChQlVW5pdmVyc2lkYWRlIEVzdGFkdWFsIGRlIFBvbnRhIEdy
+b3NzYTEpMCcGA1UECxQgQ2VudHJvIGRlIFByb2Nlc3NhbWVudG8gZGUgRGFkb3Mx
+GTAXBgNVBAMUEHNpc3RlbWFzLnVlcGcuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC4Z3ynISGCCLmgO6uxZXCyCy2217M4h4R8pK0wB6tQUBxqU6jr
+VI2iw1O1Xw3H18qFkk6BdjDF4fJaF9qY3qwZ5JMrL2kKCWubkHB67Ig13R8bKVGL
+SCl/h8UAbhU6g8PDUSEN/gyPVT8H/g8jOeJAS3ruE9XVdbYQUUEHV6sCBRSztz2U
+NtlGDeQYZ0haN7sX2kXk1vx4xYLzYhTEavajLtY2Kcsp8u/Uy8f1IuV9chNsLfdl
+aZrnMT/Z28qCoWAeFfz4M6bAZ6Gcyy0TeSI8BDmAqsH7WVukEZ5WEhI/wQx3+z9V
+0YnDr3ZTZlDn1Z+1WLjvRpwDfYN048D3DnABAgMBAAGjggFnMIIBYzAbBgNVHREE
+FDASghBzaXN0ZW1hcy51ZXBnLmJyMAkGA1UdEwQCMAAwQgYDVR0gBDswOTA3Bgpg
+hkgBhvhFAQc2MCkwJwYIKwYBBQUHAgEWG2h0dHBzOi8vd3d3LnRoYXd0ZS5jb20v
+Y3BzLzAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUp6KDuzRFQD381TBPErk+
+oQGf9tswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL3N2ci1vdi1jcmwudGhhd3Rl
+LmNvbS9UaGF3dGVPVi5jcmwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MGkGCCsGAQUFBwEBBF0wWzAiBggrBgEFBQcwAYYWaHR0cDovL29jc3AudGhhd3Rl
+LmNvbTA1BggrBgEFBQcwAoYpaHR0cDovL3N2ci1vdi1haWEudGhhd3RlLmNvbS9U
+aGF3dGVPVi5jZXIwDQYJKoZIhvcNAQELBQADggEBADyZXmy6yj//w3chkKMS5mDJ
+c+QyGYnnANYl+3chFGMdOA0MbZV/r6bPpLj0ieHgH76jvCGq7cYDOIX2mJL5UaBt
+pFzP3P/mcrKtgiWVRKPTPSyIEOK3WhAch+kTAiyuf9BAdZXi8GUcF1SYOqxzbWKI
+gYTclKgiji9i8hTJ8NYvLjerxo+hYzXcehaXKvMH78M3qkbHQgu4vKy75hj1O3zw
+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>
diff --git a/swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml b/swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml
new file mode 100644
index 00000000..09d6e4d1
--- /dev/null
+++ b/swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml
@@ -0,0 +1,143 @@
+<?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">
+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>
+      <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
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
+aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
+MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
+bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
+cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
+RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
+l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
+/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
+UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
+amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
+AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
+G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
+ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
+dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
+cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
+KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
+BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
+bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
+ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
+DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
+8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
+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: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
+bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
+cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
+RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
+l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
+/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
+UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
+amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
+AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
+G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
+ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
+dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
+cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
+KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
+BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
+bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
+ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
+DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
+8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
+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: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>
diff --git a/swamid-interfederations-2.0/skmms-idp.lanet.lv.xml b/swamid-interfederations-2.0/skmms-idp.lanet.lv.xml
new file mode 100644
index 00000000..110b9219
--- /dev/null
+++ b/swamid-interfederations-2.0/skmms-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?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>
+      <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>
+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>
+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>
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
new file mode 100644
index 00000000..b31b34e7
--- /dev/null
+++ b/swamid-interfederations-2.0/smile.informatik.uni-freiburg.de-shibboleth.xml
@@ -0,0 +1,169 @@
+<?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>
+      <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
+BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMN
+UmVjaGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZI
+hvcNAQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTE0MTExMjA4MDUxNFoX
+DTE5MDcwOTIzNTkwMFowgd4xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1X
+dWVydHRlbWJlcmcxETAPBgNVBAcTCEZyZWlidXJnMR4wHAYDVQQKExVVbml2ZXJz
+aXRhZXQgRnJlaWJ1cmcxITAfBgNVBAsTGEluc3RpdHV0IGZ1ZXIgSW5mb3JtYXRp
+azEpMCcGA1UEAxMgc21pbGUuaW5mb3JtYXRpay51bmktZnJlaWJ1cmcuZGUxMTAv
+BgkqhkiG9w0BCQEWImlyYS13ZWJAaW5mb3JtYXRpay51bmktZnJlaWJ1cmcuZGUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYSbgNbyDYBOdqS7dDOA+x
+8IkgR+SYA4qbNrgytwTp3UKHUX6Um+LMhiKcAwjL7DtT/OBE/SmS9WbSlzrclIfB
+6wGiMUpZadWn7kegpFGlpijy7tZK525+FVd24KUVwW5nePHcD2oHCjgxJgbf+dj4
+J5IcLJzpno0GKr81TVwp97zavSsYh41Pwhhy+EWFm4vGK14rbaOl2TeQqGBGLwEJ
+X2s58zgYdLevLD2u74wy6mVGS7PjyK8PEWI7yzttZT4kfQeEseK64qWquYuGIsW4
+XYd4JGG226Jf0BZn1pKY3hIQN+2/ZQpnkXxYCQzlSE+TM60AGTJbj6dchLyeaq9L
+AgMBAAGjggPeMIID2jBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
+BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
+BQUHAwEwHQYDVR0OBBYEFIJWV6FrgUU9Zfwucawz8nLm1xHPMB8GA1UdIwQYMBaA
+FDNnqdbxk1U2rKEyvcHkljn/THAxMIIBnAYDVR0RBIIBkzCCAY+CJ2NoYW5nZS5z
+bWlsZS5pbmZvcm1hdGlrLnVuaS1mcmVpYnVyZy5kZYIlZGVtby5zbWlsZS5pbmZv
+cm1hdGlrLnVuaS1mcmVpYnVyZy5kZYIkZG9jLnNtaWxlLmluZm9ybWF0aWsudW5p
+LWZyZWlidXJnLmRlgitwbGF5Z3JvdW5kLnNtaWxlLmluZm9ybWF0aWsudW5pLWZy
+ZWlidXJnLmRlgihyZWRtaW5lLnNtaWxlLmluZm9ybWF0aWsudW5pLWZyZWlidXJn
+LmRlgiBzbWlsZS5pbmZvcm1hdGlrLnVuaS1mcmVpYnVyZy5kZYInc3RhYmxlLnNt
+aWxlLmluZm9ybWF0aWsudW5pLWZyZWlidXJnLmRlgiV0ZXN0LnNtaWxlLmluZm9y
+bWF0aWsudW5pLWZyZWlidXJnLmRlgih0ZXN0aW5nLnNtaWxlLmluZm9ybWF0aWsu
+dW5pLWZyZWlidXJnLmRlgiR3d3cuc21pbGUuaW5mb3JtYXRpay51bmktZnJlaWJ1
+cmcuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0
+cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9nX2Nh
+Y3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9v
+Y3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NhY2VydC9n
+X2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
+dW5pLWZyZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3
+DQEBCwUAA4IBAQA72D4fmLKd2ZyTnuy/Ma1pkT5/BcBFxEuYCUnrmiEFJIQAs85L
+pvghgeuoJFPXIqzGHdBdhQMNlAGKveE94pDCUzsb5KeYQfx1cxv7WHtrBiSFCNU9
+UoittffeRdPTKVbgYky7fvT1bNVSdjcY6XJeHsWGM9VEz3a8P418BuJD5r6ieta0
+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
+BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMN
+UmVjaGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZI
+hvcNAQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTE0MTExMjA4MDUxNFoX
+DTE5MDcwOTIzNTkwMFowgd4xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1X
+dWVydHRlbWJlcmcxETAPBgNVBAcTCEZyZWlidXJnMR4wHAYDVQQKExVVbml2ZXJz
+aXRhZXQgRnJlaWJ1cmcxITAfBgNVBAsTGEluc3RpdHV0IGZ1ZXIgSW5mb3JtYXRp
+azEpMCcGA1UEAxMgc21pbGUuaW5mb3JtYXRpay51bmktZnJlaWJ1cmcuZGUxMTAv
+BgkqhkiG9w0BCQEWImlyYS13ZWJAaW5mb3JtYXRpay51bmktZnJlaWJ1cmcuZGUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYSbgNbyDYBOdqS7dDOA+x
+8IkgR+SYA4qbNrgytwTp3UKHUX6Um+LMhiKcAwjL7DtT/OBE/SmS9WbSlzrclIfB
+6wGiMUpZadWn7kegpFGlpijy7tZK525+FVd24KUVwW5nePHcD2oHCjgxJgbf+dj4
+J5IcLJzpno0GKr81TVwp97zavSsYh41Pwhhy+EWFm4vGK14rbaOl2TeQqGBGLwEJ
+X2s58zgYdLevLD2u74wy6mVGS7PjyK8PEWI7yzttZT4kfQeEseK64qWquYuGIsW4
+XYd4JGG226Jf0BZn1pKY3hIQN+2/ZQpnkXxYCQzlSE+TM60AGTJbj6dchLyeaq9L
+AgMBAAGjggPeMIID2jBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
+BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
+BQUHAwEwHQYDVR0OBBYEFIJWV6FrgUU9Zfwucawz8nLm1xHPMB8GA1UdIwQYMBaA
+FDNnqdbxk1U2rKEyvcHkljn/THAxMIIBnAYDVR0RBIIBkzCCAY+CJ2NoYW5nZS5z
+bWlsZS5pbmZvcm1hdGlrLnVuaS1mcmVpYnVyZy5kZYIlZGVtby5zbWlsZS5pbmZv
+cm1hdGlrLnVuaS1mcmVpYnVyZy5kZYIkZG9jLnNtaWxlLmluZm9ybWF0aWsudW5p
+LWZyZWlidXJnLmRlgitwbGF5Z3JvdW5kLnNtaWxlLmluZm9ybWF0aWsudW5pLWZy
+ZWlidXJnLmRlgihyZWRtaW5lLnNtaWxlLmluZm9ybWF0aWsudW5pLWZyZWlidXJn
+LmRlgiBzbWlsZS5pbmZvcm1hdGlrLnVuaS1mcmVpYnVyZy5kZYInc3RhYmxlLnNt
+aWxlLmluZm9ybWF0aWsudW5pLWZyZWlidXJnLmRlgiV0ZXN0LnNtaWxlLmluZm9y
+bWF0aWsudW5pLWZyZWlidXJnLmRlgih0ZXN0aW5nLnNtaWxlLmluZm9ybWF0aWsu
+dW5pLWZyZWlidXJnLmRlgiR3d3cuc21pbGUuaW5mb3JtYXRpay51bmktZnJlaWJ1
+cmcuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0
+cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9nX2Nh
+Y3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9v
+Y3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NhY2VydC9n
+X2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
+dW5pLWZyZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3
+DQEBCwUAA4IBAQA72D4fmLKd2ZyTnuy/Ma1pkT5/BcBFxEuYCUnrmiEFJIQAs85L
+pvghgeuoJFPXIqzGHdBdhQMNlAGKveE94pDCUzsb5KeYQfx1cxv7WHtrBiSFCNU9
+UoittffeRdPTKVbgYky7fvT1bNVSdjcY6XJeHsWGM9VEz3a8P418BuJD5r6ieta0
+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: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="persistentId" Name="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" 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
new file mode 100644
index 00000000..ba95b403
--- /dev/null
+++ b/swamid-interfederations-2.0/snf.esc.cam.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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://snf.esc.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>
+      <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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
+						RsenNm/aXp0wIU+jHVmi/GAPCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
+						RsenNm/aXp0wIU+jHVmi/GAPCQ== 
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..8781c792
--- /dev/null
+++ b/swamid-interfederations-2.0/soasunion.org-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
diff --git a/swamid-interfederations-2.0/solo-dev.bodleian.ox.ac.uk-shib.xml b/swamid-interfederations-2.0/solo-dev.bodleian.ox.ac.uk-shib.xml
new file mode 100644
index 00000000..8bb8722c
--- /dev/null
+++ b/swamid-interfederations-2.0/solo-dev.bodleian.ox.ac.uk-shib.xml
@@ -0,0 +1,87 @@
+<?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://solo-dev.bodleian.ox.ac.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="2013-08-02T09:29: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://solo-dev.bodleian.ox.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>
+						MIIEXjCCA0agAwIBAgIJAPIgssUDFSzVMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
+						VQQGEwJHQjEPMA0GA1UEBwwGT3hmb3JkMR0wGwYDVQQKDBRVbml2ZXJzaXR5IG9m
+						IE94Zm9yZDEbMBkGA1UECwwSQm9kbGVpYW4gTGlicmFyaWVzMSMwIQYDVQQDDBpz
+						b2xvLWRldi5ib2RsZWlhbi5veC5hYy51azEuMCwGCSqGSIb3DQEJARYfc2ltb24u
+						bWNsZWlzaEBib2RsZWlhbi5veC5hYy51azAeFw0xMzA4MDExNTQzMjRaFw0yMzA3
+						MzAxNTQzMjRaMIGvMQswCQYDVQQGEwJHQjEPMA0GA1UEBwwGT3hmb3JkMR0wGwYD
+						VQQKDBRVbml2ZXJzaXR5IG9mIE94Zm9yZDEbMBkGA1UECwwSQm9kbGVpYW4gTGli
+						cmFyaWVzMSMwIQYDVQQDDBpzb2xvLWRldi5ib2RsZWlhbi5veC5hYy51azEuMCwG
+						CSqGSIb3DQEJARYfc2ltb24ubWNsZWlzaEBib2RsZWlhbi5veC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMvZxJ+caJPEyeOKUCDpxCorxYXA
+						gjxmXF5eia6O+3osrGkSsGcJVPonOM+4q5M//Fac712g7IKctYb0qyXW9AySECzT
+						K97wc2ipA8CrsO6WDn/OdP7+046grKrsebCA/lD4QPt9g3fnHL71cXGDFTxfviNw
+						by0Tm+ky2kCn9VjQ2LS+mlnvT/0k/KUnHE2t3RuD9R4n+W8UL8gVqSAcsK+TwfBG
+						6jGvkPXdtzDmhcpJtg2NHGyvSWaOfi3UMFKbUithVKD8lODXT0V5kNkCTXzSJ+KT
+						GFdnajEVh824e2i7ncVG7rEKT7DXy++Q/O1FN0r2nTkcNK7K/wlXm7xsuDcCAwEA
+						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
+						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFK2cTGkvAfXnkkIA0TYWaSP+rBeUMB8G
+						A1UdIwQYMBaAFK2cTGkvAfXnkkIA0TYWaSP+rBeUMA0GCSqGSIb3DQEBBQUAA4IB
+						AQCDb2fRtR3NBPHJv6/CEABkkM4M36YfPNTreUu4POStDXiLJat12vzVwd73YYTL
+						jLRTLzUybvy8DfYieF/9h3jgtO5b9lLJy1MARXsi8ESNjBY+T9g/8Ele9ZvrBiNH
+						SlowrQCG+L137zKlSwIakv9yPfIK+GoEaz6a4hVglxAsip60FGAbM3Tv+WsJNraD
+						82EzLVYI5MXAk7qcsYBenWo4EG5PVquqOOS1l1WjdnnY/hHky6NYXm9whp0gNm/V
+						xFbXEjzuiRklrfzb0OZYHQPZdkY+UfB4XOvmcF1J7aMpDDm8FdWUn4XY6IRPThH8
+						F+k7SwJUiw3OvQvFChsEMFm7
+					</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://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-dev.bodleian.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://solo-dev.bodleian.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://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://solo-dev.bodleian.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 development SOLO service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bodleian.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>McLeish</md:SurName>
+    <md:EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>McLeish</md:SurName>
+    <md:EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/solo-prd.bodleian.ox.ac.uk-shib.xml b/swamid-interfederations-2.0/solo-prd.bodleian.ox.ac.uk-shib.xml
new file mode 100644
index 00000000..9d07b34c
--- /dev/null
+++ b/swamid-interfederations-2.0/solo-prd.bodleian.ox.ac.uk-shib.xml
@@ -0,0 +1,102 @@
+<?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://solo-prd.bodleian.ox.ac.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="2013-08-30T09:30: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo-prd.bodleian.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>
+						MIIEYDCCA0igAwIBAgIJALCeRD5Ey6eDMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
+						VQQGEwJHQjEPMA0GA1UEBwwGT3hmb3JkMR0wGwYDVQQKDBRVbml2ZXJzaXR5IG9m
+						IE94Zm9yZDEbMBkGA1UECwwSQm9kbGVpYW4gTGlicmFyaWVzMSQwIgYDVQQDDBtw
+						cmltby1wcmQuYm9kbGVpYW4ub3guYWMudWsxLjAsBgkqhkiG9w0BCQEWH3NpbW9u
+						Lm1jbGVpc2hAYm9kbGVpYW4ub3guYWMudWswHhcNMTMwODE5MTI0ODM4WhcNMjMw
+						ODE3MTI0ODM4WjCBsDELMAkGA1UEBhMCR0IxDzANBgNVBAcMBk94Zm9yZDEdMBsG
+						A1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxGzAZBgNVBAsMEkJvZGxlaWFuIExp
+						YnJhcmllczEkMCIGA1UEAwwbcHJpbW8tcHJkLmJvZGxlaWFuLm94LmFjLnVrMS4w
+						LAYJKoZIhvcNAQkBFh9zaW1vbi5tY2xlaXNoQGJvZGxlaWFuLm94LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzd/glHdFqitXdRfTGqzwzfGS
+						pOKkqcZIUoxXJEuxnJ3dLgIALQMYu68UjS2W3WCZKF+k4MOXpitKFAmbFIcEi1/q
+						+jbuPiSIRXrWz6iqbpOZq5CZQriq3FYqewcYdNNxRNPqbgP9hWE66l2jmUTONv0K
+						He6UxllWYc/AFwsilPD9sX4np/qh3Q6a+zB1VE2f10rEzliqrYQ9ysNLHoX0lKd9
+						bX1VvqHcImn9kInq14JEDi/3wYst61K975KbCTTwlfLdujwnFvfa9aUl3RCu4NcL
+						TD0/XI6MjW4rIJE4/CJEeJ2+hrUJHQk+7s70bvABthrSvGVR3j9iGf0OJ+kKKQID
+						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
+						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUhcoljC8tV5EYZVtPEHERLNhg0Lcw
+						HwYDVR0jBBgwFoAUhcoljC8tV5EYZVtPEHERLNhg0LcwDQYJKoZIhvcNAQEFBQAD
+						ggEBAKFyCfTM1nEAMq9VubPmfl/ZM4hs7H8CJQPZ2s2JPJR3nlB7qs/7zRou89R+
+						I+J6eKQHyvxSLQYIp+4NwZ3Y8WYeDLc774bt3YK0KOSbgn5Fxm9yk8vArFCsGgq4
+						JmcylYYxEwwoyaivlDzBFyIINOz4fVMB2pU8nKfRc9WDp3O3kXMDZNRvGikPn3wS
+						euArapbRdg9RK9zs0vrqTZST4Q9BrNY4ER4NmfYXs7UIJBQ+ZXvg3B+GO3gBmBQ0
+						JX0GvDm9yo7Xori5a5cwo8I2TGwtSe+g9fh3f5Lmpj4re5r5ejlLXpqiWF31VvD5
+						Q3Km7nTnYkPWfM66yqBgn/yqO5c=
+					</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://solo.bodleian.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford's Bodleian SOLO Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bodleian.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>McLeish</md:SurName>
+    <md:EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>McLeish</md:SurName>
+    <md:EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/solo-qa.bodleian.ox.ac.uk-shib.xml b/swamid-interfederations-2.0/solo-qa.bodleian.ox.ac.uk-shib.xml
new file mode 100644
index 00000000..a9303e5f
--- /dev/null
+++ b/swamid-interfederations-2.0/solo-qa.bodleian.ox.ac.uk-shib.xml
@@ -0,0 +1,90 @@
+<?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://solo-qa.bodleian.ox.ac.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="2013-10-18T13:27: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://solo-qa.bodleian.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>
+						MIIEXDCCA0SgAwIBAgIJANKEvVlt+w2GMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
+						VQQGEwJHQjEPMA0GA1UEBwwGT3hmb3JkMR0wGwYDVQQKDBRVbml2ZXJzaXR5IG9m
+						IE94Zm9yZDEbMBkGA1UECwwSQm9kbGVpYW4gTGlicmFyaWVzMSIwIAYDVQQDDBlz
+						b2xvLXFhLmJvZGxlaWFuLm94LmFjLnVrMS4wLAYJKoZIhvcNAQkBFh9zaW1vbi5t
+						Y2xlaXNoQGJvZGxlaWFuLm94LmFjLnVrMB4XDTEzMTAwMjExMDIzMFoXDTIzMDkz
+						MDExMDIzMFowga4xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZPeGZvcmQxHTAbBgNV
+						BAoMFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRswGQYDVQQLDBJCb2RsZWlhbiBMaWJy
+						YXJpZXMxIjAgBgNVBAMMGXNvbG8tcWEuYm9kbGVpYW4ub3guYWMudWsxLjAsBgkq
+						hkiG9w0BCQEWH3NpbW9uLm1jbGVpc2hAYm9kbGVpYW4ub3guYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsSr8kv9nT1/q/4nj1PQTMFz6TNvE+
+						vNDC6OEKdrfRGNSF3Bynhn7wsp5J/BzcOlS6eFB3hGl3XnbzBPsXB/nlPQgqz3AX
+						psJC5B8w/4N4WDj2EtSdLIrcOe8ENHP/Rp4hITjgI++YbnMUCVeeMYoKHLWR1QmX
+						HO+1EmTGeECZKQV4BHlvnLDcJ2WpSyAJJRybRkYb8YaTzL1L92wzk+EZreppkLt4
+						Qz8PhuRUKYKX0a1y6j+2aKBI2cAi3ciftK9oDva3u7CzjAvZ2H6Twmv0IsUNncIe
+						iQqmamoCb2HQlEXrVw9edMd4nPvzrWAx9plzSOJoQMAKnW2we1t1HAJhAgMBAAGj
+						ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
+						IENlcnRpZmljYXRlMB0GA1UdDgQWBBSaMBPRVamznkbIVr8XEepipygz7TAfBgNV
+						HSMEGDAWgBSaMBPRVamznkbIVr8XEepipygz7TANBgkqhkiG9w0BAQUFAAOCAQEA
+						OO37gVWuVmsOtukeie3dwFMMG+lWihswACJNQBQ75DuN0L92PL+Vr85qoK0QqCFV
+						/IZJvAbAa7hA4GnLbCqb9e/wTv6Y7XLXzWW5tEwTQBgiuqnh2mv8rEUtBaLKCFKq
+						XYFkA5QpJPuWnApMHBw9Ilgaygy/MYn1kay5OJ4A0iTMnnKlPHel7T3zxyXeRX1C
+						+zygRQi8ayDN0ENItW0sO0/nGTbPmYEbMZ1g/duin1x1ql33MAoCdPxSclPNvUN4
+						7ECVkveDwi2J8q8OQ0pjkn12zYAm5DGVaFS6pcBq+bEKUEWI4nIgfmUiHy6LLPK6
+						0XHX1lZYfOrciG30TyZ4nA==
+					</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://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-qa.bodleian.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://solo-qa.bodleian.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://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://solo-qa.bodleian.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 Bodleian Libraries QA/test SOLO service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bodleian.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>McLeish</md:SurName>
+    <md:EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>McLeish</md:SurName>
+    <md:EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</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
new file mode 100644
index 00000000..63cedb79
--- /dev/null
+++ b/swamid-interfederations-2.0/solutions.sciquest.com.xml
@@ -0,0 +1,50 @@
+<?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>
+						MIIC8zCCAlygAwIBAgIIXNlF3j4QphEwDQYJKoZIhvcNAQEEBQAwXjELMAkGA1UEBhMCVVMxETAP
+						BgNVBAoTCFNjaVF1ZXN0MRMwEQYDVQQLEwpQcm9kdWN0aW9uMScwJQYDVQQDEx5TY2lRdWVzdCBD
+						ZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTMwOTA5MjAzMjE1WhcNMzMwMzMxMjAzMjE1WjBgMRUw
+						EwYDVQQDEwxzY2lxdWVzdC5jb20xFDASBgNVBAsTC0RldmVsb3BtZW50MRcwFQYDVQQKEw5TY2lR
+						dWVzdCwgSW5jLjELMAkGA1UECBMCTkMxCzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAggpL7bnjeQ/BI6voeasB/4RUMIL7d9rJN4ZAn+fUSbXquYhzHG5uifOOuEFn
+						KFq1XaXcGPRBy1Gvrt/JQb9ZL/0c/Z/IqtR0vsEthX+EStwtQUr1XJDC1l+eg9Z6x+CFXx2zsgHm
+						sIUcNeZ7nlDK6P+CI33P8wR1SkZZCce+4I0qc+C1Q3sN7LsNr2kdB2xAjHdRQtfBsD/3R/B9hChP
+						Svk9SiesQuiL5DnRC+GpLqmBeA6CQQ9n9LOg/E3NiSdLgUdQOyHt82eptEydm3vbZ/xRmfnNHEsZ
+						bAukNB2Iar+kg5dK9Qcw6QtqJhapi7nB1/cSRFj6uprpWw4bzBzEwwIDAQABozQwMjAOBgNVHQ8B
+						Af8EBAMCBaAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwQGCCsGAQUFBwMCMA0GCSqGSIb3DQEBBAUA
+						A4GBAHVXeQpZA5kEj/qufyv2U7NbVYKpscsAQ+G+9zMSF7Tclks6Nas1QybYXzpx7z84KfcsppK5
+						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>
diff --git a/swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..9b8aac2c
--- /dev/null
+++ b/swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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://some-develsp.some.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="2014-06-16T15:43: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://some-develsp.some.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>
+						MIIDRDCCAiygAwIBAgIJANXhSSqDSViiMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGnNvbWUtZGV2ZWxzcC5zb21lLm94LmFjLnVrMB4XDTE0MDYxMTE0MzU0NloX
+						DTI0MDYwODE0MzU0NlowJTEjMCEGA1UEAxMac29tZS1kZXZlbHNwLnNvbWUub3gu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCXH7lw13G4eqAT
+						prFxI+KMrjJs8IjKlnsfsHcBkHTwyPLf8hL9Ia5lJMtBhbJrTcv/fznsAnbzUo0I
+						nncmCF5tQFljOap2VhPCFKm79JZ69bL/Eu5o5bqiv/njw/PfdiiIR3x3cdqwPWOr
+						2aNuzoNVQzlXFK0v3Mt927MXZZ4BUpbtPaP3NjxHfEktZhCH/R2duFNz16azWWul
+						Pch0Jw9D+4XMeF6i8CqeBEgmawZFN0cb5sgPcoacMhNmd5lMd8Ami+qfsmFlp05t
+						HB6fMY47pYy/O5RvYskgdftCCGuDIu89UmiWmNjHPytv6VeoPAyTAW7kehdpa85j
+						9bn/cBdfAgMBAAGjdzB1MFQGA1UdEQRNMEuCGnNvbWUtZGV2ZWxzcC5zb21lLm94
+						LmFjLnVrhi1odHRwczovL3NvbWUtZGV2ZWxzcC5zb21lLm94LmFjLnVrL3NoaWJi
+						b2xldGgwHQYDVR0OBBYEFG0CsUCHIt0y9PN0th+wQkPelh/OMA0GCSqGSIb3DQEB
+						BQUAA4IBAQBxVrg19YoV4XxXSNhaPYcjbWyZgZ41mB5AVrG87TOHh8mxBkbKLLAU
+						ZR+c3JqU4zSfle0zPFtD2IZyqbGoojswc482B5ZTltUGjLycfvNksfTT1C0/w50g
+						+Je9Njn4evUuw62XBPBG9m4S9pPCuKe28zmWWC/MjFQenK43TYU4Unud3OoyEMHY
+						sRW3pdor018DiAv0bV1q7r2KaWaEZWbgFtdqWYxU/R7VhFYKj9wWHs5DLIAnpmkc
+						xrs3kV6juklNJUG4pICaF88CW9Zcd4d6B4O26HeShWAD1X37iJVfdAqAgTXXLyvj
+						0rrgwvOpovrO2SefkaQVmpAqclAivahc
+					</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://some-develsp.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://some-develsp.some.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://some-develsp.some.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://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://some-develsp.some.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 Somerville College SharePoint01</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Somerville College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it.support@some.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Somerville College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it.support@some.ox.ac.uk</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
new file mode 100644
index 00000000..fee4d39b
--- /dev/null
+++ b/swamid-interfederations-2.0/sonotc.cirqahosting.com-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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>
+						MIIDHjCCAgagAwIBAgIJAIkX1kpNjmt4MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+						BAMTHXNvbm90Yy5pc294Zm9yZC1ob3N0aW5nLmxvY2FsMB4XDTE1MDExNTE4NDcw
+						M1oXDTI1MDExMjE4NDcwM1owKDEmMCQGA1UEAxMdc29ub3RjLmlzb3hmb3JkLWhv
+						c3RpbmcubG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm8XcG
+						mYqERRLESmYo9p0ComVYypIJTvca91ISaE+CZLF/nvTY2b8VrW5EnhDNcn1sQCdY
+						BS3Jm57cw24x7reWWmLid33xz5obV/SR+zf+tesvohEUFO27Q+9PfOPLeURuVyYm
+						k2QNPBbi+LztRy+T6+ytAfv7WRqG/E6N4p7tDUKgR/5KXw/Nrfjt1ZBumICxmNp5
+						iyODvtllhXCsepO8tY7wAus1bn1/haI7+/rL3LcYJi01hO6+PAfVzNmRrAjj3oJ+
+						hJxfNYxMOkxcuyk+Ucvd0zVVlvNF4U+iAJxMlx5awstVo3Er7jwQ+qH5/+8ROB97
+						WlCeau59cJHcHWufAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXNvbm90Yy5pc294Zm9y
+						ZC1ob3N0aW5nLmxvY2FsMB0GA1UdDgQWBBT7cCXhL2ILRWx9LSOnFnbytrznLzAN
+						BgkqhkiG9w0BAQUFAAOCAQEAx2qlPDb0JBoonpmrM/TtbPIX8NgtRe4A/JgXCwmn
+						PjGISpu6iWzY+Q8kUm3DDUBwVVlCTaL1cQtxX/8KfUiFEsJH2P+OaHBSfeBVFX4S
+						biTsyzaBdGeFpH0IZsvds2VLUd8b8yrL7OE9lji65ATM/x26tSlYWT7wMG/RseNX
+						8M2al5lbt2WgyQjWHX6wAHx5xDo9xJzL2X+poFLb9QlyStkXIRWF/FwUsdhZ852p
+						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>
diff --git a/swamid-interfederations-2.0/sos.scran.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sos.scran.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..0d4787d3
--- /dev/null
+++ b/swamid-interfederations-2.0/sos.scran.ac.uk-shibboleth.xml
@@ -0,0 +1,117 @@
+<?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>
+      <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>
+						MIIEpzCCA4+gAwIBAgIJAJr9uyuwy/Y2MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEP
+						MA0GA1UEChMGUkNBSE1TMQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jh
+						bi5hYy51azEkMCIGCSqGSIb3DQEJARYVd2ViYWRtaW5zQHNjcmFuLmFjLnVrMB4X
+						DTEwMDIyMjExNDU1OVoXDTIwMDIyMDExNDU1OVowgZMxCzAJBgNVBAYTAkdCMREw
+						DwYDVQQIEwhTY290bGFuZDESMBAGA1UEBxMJRWRpbmJ1cmdoMQ8wDQYDVQQKEwZS
+						Q0FITVMxDjAMBgNVBAsTBVNjcmFuMRYwFAYDVQQDDA0qLnNjcmFuLmFjLnVrMSQw
+						IgYJKoZIhvcNAQkBFhV3ZWJhZG1pbnNAc2NyYW4uYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDEywuow7F7KjwlfTa4vj/2QWvtexIy+OO0hWvn
+						SJ8B3goDjqaC7Mv1fNJdxtZMl/kR6ZfMT86Xa2VfK47NOe14jJDgZxN/0lbwsLwb
+						GyyxcZeDg0NCcv/jFKUiH6m2jSLkpSrSTHuUqRUhGpR0wcr3+HZjLZrpHI0FQ5EH
+						cnkhg1fYwZ5Z6vth+0NhZt9HjWLrUtia4Bj0orj0MkUAKlGEBudrPsC/OITO9oUp
+						pXV0PBi0hILJdbgeJXDFhxfcEpCczQlQgdx/KWD6q/6nSOmT9hNGMjkiprn/w/q1
+						SsAMRqSfrWrR6q8hWTkWmNsm/c39bJFuMvkfkiOgvvBVqE3nAgMBAAGjgfswgfgw
+						HQYDVR0OBBYEFG8UIQ7Hc9WHtlS6PKYYP/7RWNcrMIHIBgNVHSMEgcAwgb2AFG8U
+						IQ7Hc9WHtlS6PKYYP/7RWNcroYGZpIGWMIGTMQswCQYDVQQGEwJHQjERMA8GA1UE
+						CBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEPMA0GA1UEChMGUkNBSE1T
+						MQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jhbi5hYy51azEkMCIGCSqG
+						SIb3DQEJARYVd2ViYWRtaW5zQHNjcmFuLmFjLnVrggkAmv27K7DL9jYwDAYDVR0T
+						BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAWSSnSaVz28lDBISUNRmNJFwKvjo5
+						nC4+WM7h6Tg9QbC/EYNCwkH7bOoEcCJs28jn0EwRfn4GUgc1LFkf9UYc3rJ+mihD
+						+RZDHjaJSZDbQgZI55y8dpuYT8r70rCg+xtq1Iwv0NzcM+Q/3cEeiMlIXY6YFAAA
+						Dsp1/4NlItMUs6ZwAyMLjyIlSjIHjTVLI2bRTDlY4nUgZhqz4spvqDtnmq7PERUN
+						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>
diff --git a/swamid-interfederations-2.0/sounds.bl.uk-shibboleth.xml b/swamid-interfederations-2.0/sounds.bl.uk-shibboleth.xml
new file mode 100644
index 00000000..a5c1dfe2
--- /dev/null
+++ b/swamid-interfederations-2.0/sounds.bl.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIC6DCCAdCgAwIBAgIJAMDqFzqjF6jWMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+						BAMTC3Y4Yi13ZWJwcm9kMB4XDTEzMDIxOTExMzIzMloXDTIzMDIxNzExMzIzMlow
+						FjEUMBIGA1UEAxMLdjhiLXdlYnByb2QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQDtV0Wcb1yKMcfz3CBPKqxKbUpn3P7rpOf1O0RgocPTghq4FKKiUKxg
+						TDQQRpzZtjH2b6JtzIt94fTi4H5ETHqDtCC2FnExmsKAsmowH4ZDZ5WgUIea9eN0
+						mYJovj3kVSGgMuo8/mFhebGLPf79BtBQZN5iwc+WWwIG4/ULdzAc1Zj2mM41LiBw
+						n4cJLaAGpT8Yu8bhLBAhby3yUB+/3h+U8tjwo9srjvDD9n+Y6TnLAuxuNehBpkhm
+						kKebnVqanDyjGUCoe3gVmVkQHrWrUF/L/wEBcq5sCKedCRdOCgOhiVhTypdRpUeD
+						ZDAEpFtnO4G4ryZF/2Npp7zx7hO6Sxk5AgMBAAGjOTA3MBYGA1UdEQQPMA2CC3Y4
+						Yi13ZWJwcm9kMB0GA1UdDgQWBBRGA+HLt05y3yAYOZQmk1mgc0Va+zANBgkqhkiG
+						9w0BAQUFAAOCAQEAUyjkQMO113dtFxaEMHWFog6V1jVKdGa9+lU3LtNh8jat6xPs
+						uV0wHYmAF8qFl17dD7vYOZBA05DTogo10/q89KJrfof6OLuHK32Hm0T8G3QoHe2G
+						fSum/EGk+8M8MupRPdVI+hwhlgFiGDVCY4q+6GiU9zmVXhvCsB+Ssfx0GH0D1Auq
+						CH7HN3mqNcjEsgFixzpgNsoD+McdGBeXrWNyKxJNgliq7BPvKnC2KhOXl7edd3hz
+						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>
diff --git a/swamid-interfederations-2.0/soundstage.bl.uk-shibboleth.xml b/swamid-interfederations-2.0/soundstage.bl.uk-shibboleth.xml
new file mode 100644
index 00000000..a2ceac17
--- /dev/null
+++ b/swamid-interfederations-2.0/soundstage.bl.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIC6DCCAdCgAwIBAgIJAMDqFzqjF6jWMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+						BAMTC3Y4Yi13ZWJwcm9kMB4XDTEzMDIxOTExMzIzMloXDTIzMDIxNzExMzIzMlow
+						FjEUMBIGA1UEAxMLdjhiLXdlYnByb2QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQDtV0Wcb1yKMcfz3CBPKqxKbUpn3P7rpOf1O0RgocPTghq4FKKiUKxg
+						TDQQRpzZtjH2b6JtzIt94fTi4H5ETHqDtCC2FnExmsKAsmowH4ZDZ5WgUIea9eN0
+						mYJovj3kVSGgMuo8/mFhebGLPf79BtBQZN5iwc+WWwIG4/ULdzAc1Zj2mM41LiBw
+						n4cJLaAGpT8Yu8bhLBAhby3yUB+/3h+U8tjwo9srjvDD9n+Y6TnLAuxuNehBpkhm
+						kKebnVqanDyjGUCoe3gVmVkQHrWrUF/L/wEBcq5sCKedCRdOCgOhiVhTypdRpUeD
+						ZDAEpFtnO4G4ryZF/2Npp7zx7hO6Sxk5AgMBAAGjOTA3MBYGA1UdEQQPMA2CC3Y4
+						Yi13ZWJwcm9kMB0GA1UdDgQWBBRGA+HLt05y3yAYOZQmk1mgc0Va+zANBgkqhkiG
+						9w0BAQUFAAOCAQEAUyjkQMO113dtFxaEMHWFog6V1jVKdGa9+lU3LtNh8jat6xPs
+						uV0wHYmAF8qFl17dD7vYOZBA05DTogo10/q89KJrfof6OLuHK32Hm0T8G3QoHe2G
+						fSum/EGk+8M8MupRPdVI+hwhlgFiGDVCY4q+6GiU9zmVXhvCsB+Ssfx0GH0D1Auq
+						CH7HN3mqNcjEsgFixzpgNsoD+McdGBeXrWNyKxJNgliq7BPvKnC2KhOXl7edd3hz
+						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>
diff --git a/swamid-interfederations-2.0/sourcesup.cru.fr-shibboleth.xml b/swamid-interfederations-2.0/sourcesup.cru.fr-shibboleth.xml
new file mode 100644
index 00000000..4e163f19
--- /dev/null
+++ b/swamid-interfederations-2.0/sourcesup.cru.fr-shibboleth.xml
@@ -0,0 +1,108 @@
+<?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>
+  </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: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>
+					      MIIDAzCCAeugAwIBAgIJAKFZlPlWzzteMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTE0MTAxNTE0NTAwMVoXDTI0MTAx
+MjE0NTAwMVowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmTMazqkrQ4bXYeC9QVeNhrsGdiblc
+QadYtbfOaXthSjbb+r3jXFUb6TY7/oaHFak+KltcgpzaRMRKicIB81rHBjp3eaXz
+AB1kBU1goo7qznlODkyTso3wftIstcXF8SEZGB5jHTBcZloZsNVJEO9ZsUDNfiI6
+ZBjvgKxKuhfMaH2rsIuv+ioOyTtsIyKq0OWSI4zcVranZw8/rctYRJ3uOH0VJ49u
+PKVteO2gp5vC+y1gDA1WnFfSi13IUwqk0IQliDPX53kV267M+Zk6GpbL2GJMu2lg
+8jdaa7+r739i0EoUk7qwHBqVNnT2M8Gu1a3ipxK4HduUKGYD1ynfkzGVAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB0GA1UdDgQWBBQK
+FmZfmEm0YVmRRt+HIA11jgYFIzANBgkqhkiG9w0BAQUFAAOCAQEAeGrTotOtswlQ
+ftuvhhyLALdVDNXSner08S2A51MbI97REIYpvBmGPzWpcBY0mTnI4YHExtgMjcis
+S5lWSg6a8WZgABRIGJpaOMzUrp6LToRyL0qWpcSR91nUZum6gHaZKfuNc3q7n4C7
+QW4WCvzD+mT2H+gVFpkcmkFsViZ+jWJPzNhmY6O5YZolcF9dhAz9hBSTbCRqhOjo
+iqiun1xo89/hxIYaIvlQpRAXlmykiBs8DeEooIP9KiUPhloaEcFkfx73JqT59b6/
+Q6I7TVBscvDAl+9Q9oB9akTeqhktBupWmJUgOxqeFOPlorir8ezn/AX+WSwZ9fPo
+6e4sAmYv7w==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDAzCCAeugAwIBAgIJAKFZlPlWzzteMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTE0MTAxNTE0NTAwMVoXDTI0MTAx
+MjE0NTAwMVowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmTMazqkrQ4bXYeC9QVeNhrsGdiblc
+QadYtbfOaXthSjbb+r3jXFUb6TY7/oaHFak+KltcgpzaRMRKicIB81rHBjp3eaXz
+AB1kBU1goo7qznlODkyTso3wftIstcXF8SEZGB5jHTBcZloZsNVJEO9ZsUDNfiI6
+ZBjvgKxKuhfMaH2rsIuv+ioOyTtsIyKq0OWSI4zcVranZw8/rctYRJ3uOH0VJ49u
+PKVteO2gp5vC+y1gDA1WnFfSi13IUwqk0IQliDPX53kV267M+Zk6GpbL2GJMu2lg
+8jdaa7+r739i0EoUk7qwHBqVNnT2M8Gu1a3ipxK4HduUKGYD1ynfkzGVAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB0GA1UdDgQWBBQK
+FmZfmEm0YVmRRt+HIA11jgYFIzANBgkqhkiG9w0BAQUFAAOCAQEAeGrTotOtswlQ
+ftuvhhyLALdVDNXSner08S2A51MbI97REIYpvBmGPzWpcBY0mTnI4YHExtgMjcis
+S5lWSg6a8WZgABRIGJpaOMzUrp6LToRyL0qWpcSR91nUZum6gHaZKfuNc3q7n4C7
+QW4WCvzD+mT2H+gVFpkcmkFsViZ+jWJPzNhmY6O5YZolcF9dhAz9hBSTbCRqhOjo
+iqiun1xo89/hxIYaIvlQpRAXlmykiBs8DeEooIP9KiUPhloaEcFkfx73JqT59b6/
+Q6I7TVBscvDAl+9Q9oB9akTeqhktBupWmJUgOxqeFOPlorir8ezn/AX+WSwZ9fPo
+6e4sAmYv7w==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIICwTCCAiqgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJGUjEm
+MCQGA1UEChMdQ29taXRlIFJlc2VhdSBkZXMgVW5pdmVyc2l0ZXMxGTAXBgNVBAMT
+EHNvdXJjZXN1cC5jcnUuZnIwHhcNMDgwOTE1MTIwMzQ5WhcNMjgwOTEwMTIwMzQ5
+WjBQMQswCQYDVQQGEwJGUjEmMCQGA1UEChMdQ29taXRlIFJlc2VhdSBkZXMgVW5p
+dmVyc2l0ZXMxGTAXBgNVBAMTEHNvdXJjZXN1cC5jcnUuZnIwgZ8wDQYJKoZIhvcN
+AQEBBQADgY0AMIGJAoGBAKoHgRHVnwdX+iQIvIu2/z5I2g2ljqlYJzp74p2HYslf
+xnndqD7YodHihtoLDLIkPrGJ6Y0vtOJceb6XjoFr8k+MP41hs59s4p3qQ1M0lbY4
+6yEqLXednj00mJkz4XciB0h812bJifjH/rhYx25PdLlnp7Y9xCkq7+2BR1AFWZmZ
+AgMBAAGjgaowgacwHQYDVR0OBBYEFDgGBRQ5LF28lBPNjNWLu8YCDtxhMHgGA1Ud
+IwRxMG+AFDgGBRQ5LF28lBPNjNWLu8YCDtxhoVSkUjBQMQswCQYDVQQGEwJGUjEm
+MCQGA1UEChMdQ29taXRlIFJlc2VhdSBkZXMgVW5pdmVyc2l0ZXMxGTAXBgNVBAMT
+EHNvdXJjZXN1cC5jcnUuZnKCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
+AAOBgQB05YFzaYIRKF0JL9Br0U0mCdSyyP3N9Unm2jG7yRrGXCR+2tnj16fwhQlk
+QIGLfHDFFpfBeBoWozJFBcCmFRCawnK8RYqrApvpy1M/k/Y+yIAhq8G8XfZqzU1G
+HaaOGqD8nCkO3t3qaIPP4CTmE+GS72ooHHntvoGy/RDn32aVVg==
+					    </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="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <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">RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">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/southdowns.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/southdowns.ac.uk-oala-metadata.xml
new file mode 100644
index 00000000..acaa5cd5
--- /dev/null
+++ b/swamid-interfederations-2.0/southdowns.ac.uk-oala-metadata.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://southdowns.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>
+      <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>
+						MIIDsjCCApqgAwIBAgIJAJAieyFUQYVfMA0GCSqGSIb3DQEBBQUAMEQxHDAaBgNV
+						BAoTE1NvdXRoIERvd25zIENvbGxlZ2UxJDAiBgNVBAMTG29wZW5hdGhlbnMuc291
+						dGhkb3ducy5hYy51azAeFw0xMDExMTUxNjA0NTNaFw0yMDExMTIxNjA0NTNaMEQx
+						HDAaBgNVBAoTE1NvdXRoIERvd25zIENvbGxlZ2UxJDAiBgNVBAMTG29wZW5hdGhl
+						bnMuc291dGhkb3ducy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBALi6iaxoZs3UPZ4OPz12rT6Q+by/nqe0LFm9rC54os5NF04Japi0AywD5mZl
+						QMTUmJA/6Plp6V1dvG2/4Mta9v6IJtZhZAL9KuYUCCT0TIAq+226B1Xn3U8i6QBD
+						HtjiEYtVf+wpSrt3Q+4SCn3yb/NkqoBRJrKK0LQaQk4309lMB5Z9PBy0mBp9nuW1
+						SwU8XfXfWP++yfpbb8TVqUZC51b9ZvlzWqEmnn6Uz+p85XoVL91iI9/9JrRaXX4U
+						/szDn/pLeMXFaH2cXLMQM4euz506SQlCNityzJglLDvdMPNunKHR5KjiTA4zNtQ9
+						dsPjyqib43NXqLQmzoKtEG/YsyECAwEAAaOBpjCBozAdBgNVHQ4EFgQU4IMEMW2y
+						iVoYr16A1nQXUHubRWYwdAYDVR0jBG0wa4AU4IMEMW2yiVoYr16A1nQXUHubRWah
+						SKRGMEQxHDAaBgNVBAoTE1NvdXRoIERvd25zIENvbGxlZ2UxJDAiBgNVBAMTG29w
+						ZW5hdGhlbnMuc291dGhkb3ducy5hYy51a4IJAJAieyFUQYVfMAwGA1UdEwQFMAMB
+						Af8wDQYJKoZIhvcNAQEFBQADggEBABSUUKFcDUqRg5UDgzKAaP8/+jb/T3W+KN6H
+						p7sy/xmc7LP732LfcBifw0t4HRQwRl/oTnoNvcD8W6jbY0U4fP8WNWkDdXrJYFjw
+						86jx+XlOz3/Y0wvgOSzRuJ41J7pFdLqYawpKeI8fKyKVaVSTWVxuCtwKP9CTVh7M
+						S1BtgAi2EBcadc3b+/mWU8er+wJ83YGZ9kguxptxmoCWj0mpsUKuAb9NzzLpIsPZ
+						NZ6Ufwr690QZwjqWJFZa7EmIM5KOqKWncwW5fglxrfs+EwXxWP3Ku0HY1JfDqKTX
+						7YF1KUNKqWlQIDB/gyHChM5t0MjRxWMs0WRm4Oorz+U4YZfObkI=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDsjCCApqgAwIBAgIJAJAieyFUQYVfMA0GCSqGSIb3DQEBBQUAMEQxHDAaBgNV
+						BAoTE1NvdXRoIERvd25zIENvbGxlZ2UxJDAiBgNVBAMTG29wZW5hdGhlbnMuc291
+						dGhkb3ducy5hYy51azAeFw0xMDExMTUxNjA0NTNaFw0yMDExMTIxNjA0NTNaMEQx
+						HDAaBgNVBAoTE1NvdXRoIERvd25zIENvbGxlZ2UxJDAiBgNVBAMTG29wZW5hdGhl
+						bnMuc291dGhkb3ducy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBALi6iaxoZs3UPZ4OPz12rT6Q+by/nqe0LFm9rC54os5NF04Japi0AywD5mZl
+						QMTUmJA/6Plp6V1dvG2/4Mta9v6IJtZhZAL9KuYUCCT0TIAq+226B1Xn3U8i6QBD
+						HtjiEYtVf+wpSrt3Q+4SCn3yb/NkqoBRJrKK0LQaQk4309lMB5Z9PBy0mBp9nuW1
+						SwU8XfXfWP++yfpbb8TVqUZC51b9ZvlzWqEmnn6Uz+p85XoVL91iI9/9JrRaXX4U
+						/szDn/pLeMXFaH2cXLMQM4euz506SQlCNityzJglLDvdMPNunKHR5KjiTA4zNtQ9
+						dsPjyqib43NXqLQmzoKtEG/YsyECAwEAAaOBpjCBozAdBgNVHQ4EFgQU4IMEMW2y
+						iVoYr16A1nQXUHubRWYwdAYDVR0jBG0wa4AU4IMEMW2yiVoYr16A1nQXUHubRWah
+						SKRGMEQxHDAaBgNVBAoTE1NvdXRoIERvd25zIENvbGxlZ2UxJDAiBgNVBAMTG29w
+						ZW5hdGhlbnMuc291dGhkb3ducy5hYy51a4IJAJAieyFUQYVfMAwGA1UdEwQFMAMB
+						Af8wDQYJKoZIhvcNAQEFBQADggEBABSUUKFcDUqRg5UDgzKAaP8/+jb/T3W+KN6H
+						p7sy/xmc7LP732LfcBifw0t4HRQwRl/oTnoNvcD8W6jbY0U4fP8WNWkDdXrJYFjw
+						86jx+XlOz3/Y0wvgOSzRuJ41J7pFdLqYawpKeI8fKyKVaVSTWVxuCtwKP9CTVh7M
+						S1BtgAi2EBcadc3b+/mWU8er+wJ83YGZ9kguxptxmoCWj0mpsUKuAb9NzzLpIsPZ
+						NZ6Ufwr690QZwjqWJFZa7EmIM5KOqKWncwW5fglxrfs+EwXxWP3Ku0HY1JfDqKTX
+						7YF1KUNKqWlQIDB/gyHChM5t0MjRxWMs0WRm4Oorz+U4YZfObkI=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.southdowns.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.southdowns.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <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>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:ithelpdesk@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/sp-test.canstudios.com-shibboleth.xml b/swamid-interfederations-2.0/sp-test.canstudios.com-shibboleth.xml
new file mode 100644
index 00000000..846857b9
--- /dev/null
+++ b/swamid-interfederations-2.0/sp-test.canstudios.com-shibboleth.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-test.canstudios.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>
+						MIIDRTCCAi2gAwIBAgIJALlo8Ome5hOyMA0GCSqGSIb3DQEBBQUAMDUxMzAxBgNV
+						BAMTKmlwLTEwLTU2LTY3LTE0My5ldS13ZXN0LTEuY29tcHV0ZS5pbnRlcm5hbDAe
+						Fw0xMTA0MDQxMDIyMTdaFw0yMTA0MDExMDIyMTdaMDUxMzAxBgNVBAMTKmlwLTEw
+						LTU2LTY3LTE0My5ldS13ZXN0LTEuY29tcHV0ZS5pbnRlcm5hbDCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAMyqeka+BvUmQyfbNfa3cIm0qDc0hrdsNcWe
+						WwqLVgVn1ybRvG7meK+hb9SunW9jo6drWN5YcDuKAvSzNFO5PaPM2c2rcSjqGnuk
+						hGt490fIchEKlEqMCdlcQ3iuADLDiugbWDmcUw9KsC7oXMCSeILvOGdX1uIe9TBY
+						zKcc8hUAHQ3wtcLspb36bkDK4NUzIaGgVLcq9g6zILb+Fcn/LhkLdJtoawiFM/Fq
+						I9GL0IpsUEcwBnVVJ0/95YUh2pc6XRp6+AYQNFm5z2KSJbJkXRkU2yuORh1Hj3dq
+						TZ+F+p0RDydWwqiRZcNUkfyb+CaJg3hFivY+C/AHu8djt56ahYECAwEAAaNYMFYw
+						NQYDVR0RBC4wLIIqaXAtMTAtNTYtNjctMTQzLmV1LXdlc3QtMS5jb21wdXRlLmlu
+						dGVybmFsMB0GA1UdDgQWBBT2pR0g9K3m7Y6bIq/RsoOj6lHjUTANBgkqhkiG9w0B
+						AQUFAAOCAQEANTAPP0B5Uh4eRpl2qmgeS4m+c0wNvYOeApgytH9UiCouivZrfx1x
+						0/0PUaF0rSnVjcGaGNVBkWh6Lj6ghfVis2BUa4McyetgsV1KmSsrrN+AtlK3WXkf
+						WLd6WQ/fB3FQ7gPEczRULjS6/tOrr3o96KW2ANkEZE3xjZi0YDC89dlEsESdojr4
+						icU0w5Hh2enXVym/rIrPReK+G19phnsZFw1AhSXQmhq0L1x4f0XQMHj0C2QDlJOD
+						SyG+rbw/0u9SeNx/iMZKa1qKz9WEOj6CZGh83bW8OneXzP04/g98kWgQ7FIAzYYb
+						zEv3N6DD8ZWFPrnpVVTE8F0rXeUFmbax4g==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDRTCCAi2gAwIBAgIJALlo8Ome5hOyMA0GCSqGSIb3DQEBBQUAMDUxMzAxBgNV
+						BAMTKmlwLTEwLTU2LTY3LTE0My5ldS13ZXN0LTEuY29tcHV0ZS5pbnRlcm5hbDAe
+						Fw0xMTA0MDQxMDIyMTdaFw0yMTA0MDExMDIyMTdaMDUxMzAxBgNVBAMTKmlwLTEw
+						LTU2LTY3LTE0My5ldS13ZXN0LTEuY29tcHV0ZS5pbnRlcm5hbDCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAMyqeka+BvUmQyfbNfa3cIm0qDc0hrdsNcWe
+						WwqLVgVn1ybRvG7meK+hb9SunW9jo6drWN5YcDuKAvSzNFO5PaPM2c2rcSjqGnuk
+						hGt490fIchEKlEqMCdlcQ3iuADLDiugbWDmcUw9KsC7oXMCSeILvOGdX1uIe9TBY
+						zKcc8hUAHQ3wtcLspb36bkDK4NUzIaGgVLcq9g6zILb+Fcn/LhkLdJtoawiFM/Fq
+						I9GL0IpsUEcwBnVVJ0/95YUh2pc6XRp6+AYQNFm5z2KSJbJkXRkU2yuORh1Hj3dq
+						TZ+F+p0RDydWwqiRZcNUkfyb+CaJg3hFivY+C/AHu8djt56ahYECAwEAAaNYMFYw
+						NQYDVR0RBC4wLIIqaXAtMTAtNTYtNjctMTQzLmV1LXdlc3QtMS5jb21wdXRlLmlu
+						dGVybmFsMB0GA1UdDgQWBBT2pR0g9K3m7Y6bIq/RsoOj6lHjUTANBgkqhkiG9w0B
+						AQUFAAOCAQEANTAPP0B5Uh4eRpl2qmgeS4m+c0wNvYOeApgytH9UiCouivZrfx1x
+						0/0PUaF0rSnVjcGaGNVBkWh6Lj6ghfVis2BUa4McyetgsV1KmSsrrN+AtlK3WXkf
+						WLd6WQ/fB3FQ7gPEczRULjS6/tOrr3o96KW2ANkEZE3xjZi0YDC89dlEsESdojr4
+						icU0w5Hh2enXVym/rIrPReK+G19phnsZFw1AhSXQmhq0L1x4f0XQMHj0C2QDlJOD
+						SyG+rbw/0u9SeNx/iMZKa1qKz9WEOj6CZGh83bW8OneXzP04/g98kWgQ7FIAzYYb
+						zEv3N6DD8ZWFPrnpVVTE8F0rXeUFmbax4g==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.canstudios.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.canstudios.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.canstudios.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.canstudios.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.canstudios.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.canstudios.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.canstudios.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.canstudios.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.canstudios.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Boardworks Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Boardworks Limited: MyWorks Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.myworks.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Catherine</md:GivenName>
+    <md:SurName>Marks</md:SurName>
+    <md:EmailAddress>mailto:catherine.marks@boardworks.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Catherine</md:GivenName>
+    <md:SurName>Marks</md:SurName>
+    <md:EmailAddress>mailto:catherine.marks@boardworks.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
new file mode 100644
index 00000000..1859c2d1
--- /dev/null
+++ b/swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <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>
+      <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
+BAMTEXNwLXRlc3Quc3dhbWlkLnNlMB4XDTE1MDEyODE0NDkzNVoXDTI1MDEyNTE0
+NDkzNVowHDEaMBgGA1UEAxMRc3AtdGVzdC5zd2FtaWQuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDB9LT9HoTmLjPiMQvo9zujGS3cLF6TbukK8A0B
+CfA/A6JJkwLpbHbGzL4VRnaSzS8qW+6TvehFFDlh+u1W91rOodiqkpAubHcO97O2
+th677wXUyyOWsnlyxnOWQVBrtWJFfV1zjmr8AfdHW1zbpstWWz+orEUNBE7X39dd
+Zq7eorJZD+rD07XU40cwXUwKUy7m73XLHlW3sXuJXddZ/1qs4UilC9LRflaL7j4A
+UmUbil+Md+xm3rEuiEjN3hiZiyjSTja7NIP2unhzxJSoAC9X/6cj5aWrEjO6oplf
+s+xei1Rya8qzFHcLvGRME2tFMb047sTCGl6oCkoizC4hCCfpAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXNwLXRlc3Quc3dhbWlkLnNlMB0GA1UdDgQWBBSsTWqxt6/xVeVD
+RW62Ap+udtmTNzANBgkqhkiG9w0BAQUFAAOCAQEAIB6TPgX+qJ5pa8oLETXnArQg
+C946h+Im7zjT8kuCpeiL7/lfohqclaJB3PfYOs82FwmOOkmA3kcZdk4aaOXXZkh9
+05ZoxxYo64mssvXLNcB0ydOJ1o82gdPzL2dTR+iT1IlanJkAyI6OR6ZO6q69+sFJ
+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>
diff --git a/swamid-interfederations-2.0/sp-test.wortech.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp-test.wortech.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..f28f5805
--- /dev/null
+++ b/swamid-interfederations-2.0/sp-test.wortech.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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-test.wortech.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.wortech.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>
+						MIIDBjCCAe6gAwIBAgIJAMwsgNyzDRXNMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXNwLXRlc3Qud29ydGVjaC5hYy51azAeFw0xMDExMDkxNTI5MDZaFw0yMDEx
+						MDYxNTI5MDZaMCAxHjAcBgNVBAMTFXNwLXRlc3Qud29ydGVjaC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANeI+dq6Q0k+EvCnXvyITtkxUYDS
+						+6b0GXkofMeMyDt+4fy0IznKXK46VncC1sfronjA5ah6Y2VXhDzZKrt/2TtPRNLQ
+						J7k9CfyYUTAXZ5B1pR4a1IevXcoQPFROmXxZsoqViuNXH+BzuIviv9f6TSPennW0
+						SX3plKCFAvnHiYPsPbdcBwTku6NVLOsgfeAV1XQUVHP0f3xBr2wk3TiELxEhbtTx
+						S2rNqgkHkx+eDKAfTBp7GzCh5Q7VsMfKNWmdgAq42HLpOnqvviPF/Fn9KLKCNuMA
+						TH01ypbb4vEL5xP/UbQKfER0Wa67isFpfkXgMeS66wmA6TlwNXCGOudrZIMCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVc3AtdGVzdC53b3J0ZWNoLmFjLnVrMB0GA1UdDgQW
+						BBSB03qpqS73R8ADFUKyCMvsO/7OozANBgkqhkiG9w0BAQUFAAOCAQEAxJctEFMq
+						SKsmQPuc/oudcQYsbC8IUzbVjJ6TsuC/s/Y9sVPKtCCmaCJFeymbx9yHRdH8k0dP
+						7n2pFmv7oHpohHniOzF/X5O3HZLTAKq077axk54ca4MtLU4gnkhGqQUQ6tucPJ/8
+						4fu2xH394cGVl3giPI6zZahTvks3OH4GizkELNF5/NYbxx6tilQDmYnijp5z+m88
+						58jIhUpEdUI/ZkwjA7Bgf/+1t8Q9ys2GC9xjBk46H537S7UlDJGwojUTsHPGceVD
+						mRjRzBOnlMe7YT8NEvKK16QvehZlwfnMosIlNFozGmhwVtWlJ+pJATGm0gu4vZDU
+						I64R7eQVc7Z6kw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDBjCCAe6gAwIBAgIJAMwsgNyzDRXNMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXNwLXRlc3Qud29ydGVjaC5hYy51azAeFw0xMDExMDkxNTI5MDZaFw0yMDEx
+						MDYxNTI5MDZaMCAxHjAcBgNVBAMTFXNwLXRlc3Qud29ydGVjaC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANeI+dq6Q0k+EvCnXvyITtkxUYDS
+						+6b0GXkofMeMyDt+4fy0IznKXK46VncC1sfronjA5ah6Y2VXhDzZKrt/2TtPRNLQ
+						J7k9CfyYUTAXZ5B1pR4a1IevXcoQPFROmXxZsoqViuNXH+BzuIviv9f6TSPennW0
+						SX3plKCFAvnHiYPsPbdcBwTku6NVLOsgfeAV1XQUVHP0f3xBr2wk3TiELxEhbtTx
+						S2rNqgkHkx+eDKAfTBp7GzCh5Q7VsMfKNWmdgAq42HLpOnqvviPF/Fn9KLKCNuMA
+						TH01ypbb4vEL5xP/UbQKfER0Wa67isFpfkXgMeS66wmA6TlwNXCGOudrZIMCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVc3AtdGVzdC53b3J0ZWNoLmFjLnVrMB0GA1UdDgQW
+						BBSB03qpqS73R8ADFUKyCMvsO/7OozANBgkqhkiG9w0BAQUFAAOCAQEAxJctEFMq
+						SKsmQPuc/oudcQYsbC8IUzbVjJ6TsuC/s/Y9sVPKtCCmaCJFeymbx9yHRdH8k0dP
+						7n2pFmv7oHpohHniOzF/X5O3HZLTAKq077axk54ca4MtLU4gnkhGqQUQ6tucPJ/8
+						4fu2xH394cGVl3giPI6zZahTvks3OH4GizkELNF5/NYbxx6tilQDmYnijp5z+m88
+						58jIhUpEdUI/ZkwjA7Bgf/+1t8Q9ys2GC9xjBk46H537S7UlDJGwojUTsHPGceVD
+						mRjRzBOnlMe7YT8NEvKK16QvehZlwfnMosIlNFozGmhwVtWlJ+pJATGm0gu4vZDU
+						I64R7eQVc7Z6kw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.wortech.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-test.wortech.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-test.wortech.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Heart of Worcestershire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Worcester College of Technology Test Service Provider</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/sp.careknowledge.com-shibboleth.xml b/swamid-interfederations-2.0/sp.careknowledge.com-shibboleth.xml
new file mode 100644
index 00000000..8af0fb78
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.careknowledge.com-shibboleth.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.careknowledge.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="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>
+						MIIEXDCCA0SgAwIBAgIJAIaBUg+B2NUPMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEZ
+						MBcGA1UEChMQT0xNIFBhdmlsaW9uIEx0ZDEWMBQGA1UECxMNQ2FyZUtub3dsZWRn
+						ZTEeMBwGA1UEAxMVd3d3LmNhcmVrbm93bGVkZ2UuY29tMSUwIwYJKoZIhvcNAQkB
+						FhZpbmZvQGNhcmVrbm93bGVkZ2UuY29tMB4XDTA5MTEwMzExMDYwM1oXDTE5MTEw
+						MTExMDYwM1owga4xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEP
+						MA0GA1UEBxMGT3hmb3JkMRkwFwYDVQQKExBPTE0gUGF2aWxpb24gTHRkMRYwFAYD
+						VQQLEw1DYXJlS25vd2xlZGdlMR4wHAYDVQQDExV3d3cuY2FyZWtub3dsZWRnZS5j
+						b20xJTAjBgkqhkiG9w0BCQEWFmluZm9AY2FyZWtub3dsZWRnZS5jb20wggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcltH4L5PBPkfoLbrKN6INtUzDUucH
+						en9Uln4yCiHHQG7V+I9fQ3VcwBUxuvkfCKlInOTh8UkHapOfTGXXgADtjBkMfhJ+
+						US/uuoi6mQ1csLq0Nnp7tVebJ3vpY2U8SPIhRMHp/fOGW//wEDVnO38wnjFF3rMp
+						UDbp6SZfJDhwgdIR322zk42aZUB/RQ41VpQiq11kT70V4gvKpHYjOq0tDbOz+i+p
+						YOvtpBhCRLChqsn89ovDnfqP12BvtVCJQegz04AXwssn+VeOK8J/1AQp6KzuCnRo
+						IOD/GjIpA+UCcqUnz4+eYl8i0u5NwVq+0vtatPKX4SWP41qzNegJFa/9AgMBAAGj
+						ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
+						IENlcnRpZmljYXRlMB0GA1UdDgQWBBSdSyju4c9KMWmI14j0cjp8z3+yijAfBgNV
+						HSMEGDAWgBSdSyju4c9KMWmI14j0cjp8z3+yijANBgkqhkiG9w0BAQUFAAOCAQEA
+						P+DxS8qDpaAO177uo8IKMvkRAx7ZsTaYdVXdEexuDNvq9wBesQ2x0CYfvK/Lsjmc
+						4kPebsg4+QXVrBgz0C/x+1ghCFf/DJ/XZTKhhh/d2Rzh2cYIZ7cc1zTEM6X0LXJr
+						wXvwW77b4h6OWrwJ2Ac0/9fNSx7sAhvkJB8iV0Ft8R0gCIevsCAwtwr9ymflkYke
+						897WDuAEO09j/qAUO/jrH5Pg26OBtxtg9sX066+SbjK5np8BaDuqP48kJpuCix1g
+						RvsXL6hYaWg/uy9ysgrbgq2tuyMRazTbxZK+zevikEMHJiu9q4K1kYadgYDXUATo
+						DOZU336g80XprEbmhq+v7w==
+					</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/athens/ukfedrcv.aspx" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.careknowledge.com/athens/ukfedrcv.aspx" 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">http://www.careknowledge.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tanya</md:GivenName>
+    <md:SurName>Rackham</md:SurName>
+    <md:EmailAddress>mailto:Tanya.Rackham@olmgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ralf</md:GivenName>
+    <md:SurName>Buckenmaier</md:SurName>
+    <md:EmailAddress>mailto:Ralf.Buckenmaier@olmgroup.com</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 071fb97a..a7aba045 100644
--- a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -1,21 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.catalog.clarin.eu">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+<md: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://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>
-      <mdui:UIInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://catalog.clarin.eu/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Clarin Catalog Service Provider</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Clarin Catalog Service Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Description>
-        <mdui:Keywords xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Keywords>
+        <mdui:Description xml:lang="de">Clarin Catalog Service Provider, verstrekt toegang tot de Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) en meer</mdui:Description>
+        <mdui:Description xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.clarin.eu</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.clarin.eu</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://catalog.clarin.eu/privacy_statement.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    <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
@@ -35,36 +48,85 @@ A0oCNgDwBaY/GdYIYloU/6GAxEu5Kql4HmB1XW5XyYZ15+zYluL86eLFe2DHnPHR
 Z3ZjnjzAkcZS6VU/vbowpAL9Oiic9I15BwyNXsT8lWPtOxKcmxAESMc7OtWm0o4C
 ijjjB4MNkyvUmnvJZD+7ZpYW6qI4v64a4h1kdydtuCSxFz7lQ9U80gOA+oJWKa9a
 yN2Xk8rmco4g1veIYIZ6hKrydr0QJ40WvaiR1EkO0tpPa7wkayhFaOQDRrzFNpfr
-gDLbA/e0dbDclBvxUIm9cemA</ds:X509Certificate>
+gDLbA/e0dbDclBvxUIm9cemA
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md: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://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Clarin Catalog Service Provider</md:ServiceName>
+    <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
+ODAyMDVaFw0xOTA0MjcwODAyMDVaMIGQMQswCQYDVQQGEwJOTDEMMAoGA1UECBMD
+R0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJLVBMMRMwEQYDVQQL
+EwpjYXRhbG9nIHNwMRowGAYDVQQDExFjYXRhbG9nLmNsYXJpbi5ldTEeMBwGCSqG
+SIb3DQEJARYPbGF0YWRtaW5AbXBpLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA38nLf8TTeexrcqzfF5LOQ3F/9Tar+V7kNsLFUKO1ua6npX+4zgBu
+EYCm+hKrKDW09QN8yrBd+79a+slA4nCcpUymkh02rQhVbMpNiEQh8UFjqfaYv5fM
+R1OlgIWYXx2POdn60KbUYXIPGSrp2zQSXMFJMrnUOXHqxF8fxfTdbDEtcviXXwyC
+UjhXC4AJSLL/S8eftV8iioQDZMs5h1Kd95NVFsMhRC5MtD+iUyNsYR8X1PGaFg20
+bVg/Jg2eVNwPas49POr+HBOxk3BBtk8KwCAMwjCQUGL3zn7KeDLDFYsry/bWQtVn
+IbebSTysNhbrji3/VKnsPHiuOfCvYiqWEQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQDTDfQr4wjJGAUo7os8PWTmKFkAH4D3oFQpxe4bvf6U9of4+fmE778S+WZc9kKs
+A0oCNgDwBaY/GdYIYloU/6GAxEu5Kql4HmB1XW5XyYZ15+zYluL86eLFe2DHnPHR
+Z3ZjnjzAkcZS6VU/vbowpAL9Oiic9I15BwyNXsT8lWPtOxKcmxAESMc7OtWm0o4C
+ijjjB4MNkyvUmnvJZD+7ZpYW6qI4v64a4h1kdydtuCSxFz7lQ9U80gOA+oJWKa9a
+yN2Xk8rmco4g1veIYIZ6hKrydr0QJ40WvaiR1EkO0tpPa7wkayhFaOQDRrzFNpfr
+gDLbA/e0dbDclBvxUIm9cemA
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Artifact"/>
+    <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 Catalog Service Provider</md:ServiceName>
       <md:ServiceName xml:lang="en">Clarin Catalog Service Provider</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Clarin Catalog Service Provider</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Providing services like the Data Category Registry (ISOcat), Component Registry, Virtual  Language Observatory (VLO) and more</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:ServiceDescription xml:lang="de">Clarin Catalog Service Provider, verstrekt toegang tot de Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) en meer</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</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="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="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>Daan</md:GivenName>
+    <md:SurName>Broeder</md:SurName>
+    <md:EmailAddress>mailto:Daan.Broeder@mpi.nl</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:SurName>Technical support</md:SurName>
-    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
+    <md:GivenName>Tobias</md:GivenName>
+    <md:SurName>van Valkenhoef</md:SurName>
+    <md:EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dieter</md:GivenName>
+    <md:SurName>Van Uytvanck</md:SurName>
+    <md:EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</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
new file mode 100644
index 00000000..d296ddf2
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.cds.stfc.ac.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALfgUSfF89pnMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDWNkczYuZGwuYWMudWswHhcNMTAwMjE2MTMzNDI2WhcNMjAwMjE0MTMzNDI2
+						WjAYMRYwFAYDVQQDEw1jZHM2LmRsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA7oViYpAbYqdi+QInwb//yT2pCJ+lMpq1ST4TgOsu8A+NJ8V7
+						8zE4TzIDsXKOlXhWQ51JhvbpqGQeYHWO/ipGC/GJIxfb/ZMsRH9NOubO2A9JQsSu
+						4pFhSjoEq2OyQYQQYbf5+06vWxr2MAhCyBhH3UvC1yIbhwGJYFgZZg05pBGIBoR2
+						GxcfEXNQLhhdgdYUUDLUmF3s79U10I8ZJikvzKGLlXmWWaMD53M8M4Rom8r13kEB
+						0xr13CWhd/H9xKwVImG62qCCMakF2O6+8HZziZmfPuiJD/G6HSVL3hTz9hdz9unP
+						pOTFmcGxjnRU1k79TEPbbHvsTJXoYInGFiqyOQIDAQABozswOTAYBgNVHREEETAP
+						gg1jZHM2LmRsLmFjLnVrMB0GA1UdDgQWBBSpcwVd1js90ymqIUzIeiUp1K8BHzAN
+						BgkqhkiG9w0BAQUFAAOCAQEASYhQmAbVn4Yt+5+xcqsE25rCn9Etx3ZVqNLfoZ3G
+						9Xc7QCggfVTltVFKKvxeIZ9QUOb1HH/27V1okJoH6uRoD+AnK1UGVP/+ufv0Ev2H
+						vkPSyG+oVhDFYuMrTmUE3bwBiNSfHAOsflR44GEQZ5RqWTdztS4PhWF2g3s3sMY4
+						Jr9dD/8WUXZhV60ZQJC0hTV0RzKjdqCrKuTgMbmwCmEVQTrkj5JkrOafI7/SnfHf
+						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>
+						MIIC7jCCAdagAwIBAgIJALfgUSfF89pnMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDWNkczYuZGwuYWMudWswHhcNMTAwMjE2MTMzNDI2WhcNMjAwMjE0MTMzNDI2
+						WjAYMRYwFAYDVQQDEw1jZHM2LmRsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA7oViYpAbYqdi+QInwb//yT2pCJ+lMpq1ST4TgOsu8A+NJ8V7
+						8zE4TzIDsXKOlXhWQ51JhvbpqGQeYHWO/ipGC/GJIxfb/ZMsRH9NOubO2A9JQsSu
+						4pFhSjoEq2OyQYQQYbf5+06vWxr2MAhCyBhH3UvC1yIbhwGJYFgZZg05pBGIBoR2
+						GxcfEXNQLhhdgdYUUDLUmF3s79U10I8ZJikvzKGLlXmWWaMD53M8M4Rom8r13kEB
+						0xr13CWhd/H9xKwVImG62qCCMakF2O6+8HZziZmfPuiJD/G6HSVL3hTz9hdz9unP
+						pOTFmcGxjnRU1k79TEPbbHvsTJXoYInGFiqyOQIDAQABozswOTAYBgNVHREEETAP
+						gg1jZHM2LmRsLmFjLnVrMB0GA1UdDgQWBBSpcwVd1js90ymqIUzIeiUp1K8BHzAN
+						BgkqhkiG9w0BAQUFAAOCAQEASYhQmAbVn4Yt+5+xcqsE25rCn9Etx3ZVqNLfoZ3G
+						9Xc7QCggfVTltVFKKvxeIZ9QUOb1HH/27V1okJoH6uRoD+AnK1UGVP/+ufv0Ev2H
+						vkPSyG+oVhDFYuMrTmUE3bwBiNSfHAOsflR44GEQZ5RqWTdztS4PhWF2g3s3sMY4
+						Jr9dD/8WUXZhV60ZQJC0hTV0RzKjdqCrKuTgMbmwCmEVQTrkj5JkrOafI7/SnfHf
+						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>
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
new file mode 100644
index 00000000..65d4b056
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.cliowebhost.co.uk-Patron-Stirling-entity.xml
@@ -0,0 +1,52 @@
+<?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>
+						MIIDCDCCAfSgAwIBAgIQY/Afradun5dG2rwUj4AANzAJBgUrDgMCHQUAMBsxGTAX
+						BgNVBAMTEENsaW9TdGlybGluZzIwMTMwHhcNMTMwOTAzMDgyNDMxWhcNMjMwOTAz
+						MDgyNDMwWjAbMRkwFwYDVQQDExBDbGlvU3RpcmxpbmcyMDEzMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvG5RHaEtu4OXZip6APTjKWL0vy+WYJoVodIP
+						yNRRO5oP1R9N09kOKo+3fHvnURA0W8guZIk9twGs/RdB4tNzD4aWgPmo7Ml1tVZw
+						eHZdwU2y87lSSkdM1/sZtY3Ju7ERoxdK3jCoIdnRSVx8Fm7WOtStpgdclT6V0fcZ
+						3YQUuPONRpOdxivawPkUPL0c9i2Jx67kp35f63eBY/dPBON8p5Vo8BnZ70zqepUj
+						cnXhG3PfE10lKASLRarQqGJjrdm/sGY44ChIHcKfSbUhonop6K9oh4hEKatBL1+p
+						xodbS0BaJEZ/fkgQrbyPLlgf5jDL80Ua7tcuVGm8ozi0Ls3CzQIDAQABo1AwTjBM
+						BgNVHQEERTBDgBCQ/hClfq8r3PkbIADeLaxtoR0wGzEZMBcGA1UEAxMQQ2xpb1N0
+						aXJsaW5nMjAxM4IQY/Afradun5dG2rwUj4AANzAJBgUrDgMCHQUAA4IBAQAwe5Xx
+						ZrFE+rCI3Z2tfBX4oocgkgLD6weq29MqRcuhxBALpxeoKpT4bjjHzusLg/hzEyeQ
+						xbkZwu0HvXa230LnC9fpO3mjLHewLXDFEaZpfrOZvNa142RfMQU7iAQJfIrc42j8
+						rl7s17BVtYq+EzGgFgZm0YMBoL4SASS2QCoviwsGYHZmy/8h33jvHRMAB41OWjXZ
+						WoaVaOm8sp/5AegAAcoIF33Tqv+fweHdrB4J/Q3d8+7vE8hWjTQ/HB+ZrOUig+Da
+						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>
diff --git a/swamid-interfederations-2.0/sp.colegsirgar.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.colegsirgar.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..56762441
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.colegsirgar.ac.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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>
+						MIICzTCCAbWgAwIBAgIJAIl+WHxfd4mhMA0GCSqGSIb3DQEBBQUAMA0xCzAJBgNV
+						BAMTAnNwMB4XDTE1MDEwNzEzNDc0N1oXDTI1MDEwNDEzNDc0N1owDTELMAkGA1UE
+						AxMCc3AwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6TAAssygAHhtn
+						scD7mgyf5RjV5+wncxcsVLdGtm6GaROqqhz/SL521Y+aQLxtqCfJyBlN9mIkboAv
+						vBmmcvc4xCBirmHWFQEtcISIYyh7KYcVpUomXQUIJUkJa8EXdyWlVxV9EE0K3VYF
+						z5nlUXgpLjwfxnevkRJhRI/lR5J4iAJner61vAWNvcTyu6g6Hlj4TeH20GzuuEY/
+						adgKwtqW8riKaQWNIebfHNGzW3S0lqEYLmntPC2Y/M8rH6m9t8yN2qUx6hBKB0mH
+						eCwqxC3BAbZax55sMSw+f6/MHKF0pjtWymqDbbNfD98VxhUkmqmVjgq3/DhbKWCH
+						aI6p4KKVAgMBAAGjMDAuMA0GA1UdEQQGMASCAnNwMB0GA1UdDgQWBBR7ZIA5K0DE
+						+CdJsFCvDsIXaCvouDANBgkqhkiG9w0BAQUFAAOCAQEAY79NtNn1cgqdO9E985g5
+						vx4j3mzDqBkajG6TP/pnAEzNoHODaltP5bHAX0Kew6bVnlYwzN7jVZec0WDdH/SH
+						2enUTJkD15/XZvH+oFa7MWLJ2pLYEfgJIxFz3nw0ozzZKAHuPsRejpXMKAv56bT3
+						lu1S/dkNs9u6MttdCQcznLppIGSjx7QUx7tPF6bE706BYytYlCHziB9NmgqT1b4n
+						xccA2shkXbhcoEQ78y2YHMlhkM4axlYHsnnpVmTA2vASPrQoaIim/diEbv44/EFm
+						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>
diff --git a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
index d2dba0bc..1329d931 100644
--- a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
@@ -1,83 +1,108 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.corpus1.mpi.nl">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md: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>
+  </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/DS" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Psykolingvistiikan Max Planck-instituutin palveluntarjoaja</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider for Linguistic Services aimed at researchers.</mdui:Description>
-        <mdui:Description xml:lang="fi">Psykolingvistiikan Max Planck-instituutin tutkijoille suunnattu kielitieteellinen palveluntarjoaja.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://corpus1.mpi.nl/IMDI/info/privacy_statement.html</mdui:PrivacyStatementURL>
+      <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">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:Description>
+        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.mpi.nl</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.mpi.nl</mdui:InformationURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    <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:X509Certificate>MIIFxTCCBK2gAwIBAgIHFy/hnqc8wTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDAyMjgx
-MDI1MThaFw0xOTAyMjcxMDI1MThaMIGkMQswCQYDVQQGEwJOTDETMBEGA1UECBMK
-R2VsZGVybGFuZDERMA8GA1UEBxMITmlqbWVnZW4xIDAeBgNVBAoTF01heC1QbGFu
-Y2stR2VzZWxsc2NoYWZ0MTIwMAYDVQQLEylNYXgtUGxhbmNrLUluc3RpdHV0IGZ1
-ZXIgUHN5Y2hvbGluZ3Vpc3RpazEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGbPWbCx1FfjX9sh831NEW6MHN
-VSd9DElQH+1eAqevdt5g6sLCK4HTsigUkl94MdiaLzDwVngYoJ/QwycncE0bFFxg
-H0YHs8URXAOfkO9RmKy4x6TkuYElF8AmBnnEhoF58O1b/0DG8TdSpmWsMBrw+lyB
-gV++v15+WjuHn4DdXbG3AaaUMNYWPSk4fIvjPX19U9ys0euYcKa/kTU8nFuOJzVy
-WmUyNWjcgwImszfwwKaumIGDHGKSJ9eME/idNczuUhihY/kgU30+x4yfQ0PPJ6y1
-YLd+E2xAOmbjEbBnytkbRPVxHAPqw0py80meld2s70Cxxklj739+oP+++PwhAgMB
-AAGjggI/MIICOzA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEE
-AYGtIYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUE8+HM0pUcvXN
-4uBiDV/q2xwu2O8wHwYDVR0jBBgwFoAUAtYebgmrv1hlpwo8SDNh0c59w1swRAYD
-VR0RBD0wO4IOY29ycHVzMS5tcGkubmyCDGx1eDA3Lm1waS5ubIEbdG9iaWFzLnZh
-bnZhbGtlbmhvZWZAbXBpLm5sMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
-KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
-ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
-hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAGH5IPCi3tfYwo+CN357NdkGav1KQT2
-T0sjZ2chg//8SNucof42LXWvMlRIaRXjFP2bTW8sPt3hNwPyVLLAUFE/ogRz955Y
-a4Fbx/0bS1XZSCCneQ+pP+gnfad0AA3PJ2fDb/LUQ43q8xu8B1tm9GyTz6sE2mjU
-c0GOYUp4wvC/Hu3Wr1/80KbebBX5QxQPg9CVqXaz8yECpZwrTJsa3d+pY8WVA6Fr
-/0vQmp9LyYl9II3xrP5KMkLFWfusAqfDQbO+l0q44mGImEee3G4Wkg7VAcwDgKBa
-LHbuhlrBzMoxQBZGyW4eOToiuysyE37dSKtUgCs4vDN4S4EWz90Y6xY=</ds:X509Certificate>
+          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=corpus1.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDbDCCAlQCCQDcydJCAWzKeDANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJO
+TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
+LVBMMRcwFQYDVQQDEw5jb3JwdXMxLm1waS5ubDEeMBwGCSqGSIb3DQEJARYPbGF0
+YWRtaW5AbXBpLm5sMB4XDTE0MDUwMjExMjkwNVoXDTE5MDUwMTExMjkwNVoweDEL
+MAkGA1UEBhMCTkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzAN
+BgNVBAoTBk1QSS1QTDEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwxHjAcBgkqhkiG
+9w0BCQEWD2xhdGFkbWluQG1waS5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMFrApun/KXB9YtFiT49PHz7uV9EoVmrFsCBNqVWYhM+msq2dkM7rNVe
+eZdy2hHID72ILMeqeXKX+hFQPyX18eN4L6lfJzzJJI2HGdIuGPyKZXCsVrCqnIWo
+VPRi5dnTlCpCEPhebt05L9TMQJrLWue2qDhhdwkaYrVfm+tsYGK9yiy3Gbsoa10L
+kEpd2oJZLDGHXSZJ6GL4oUMbQ+Z9bIjCelQWC4tU/u6qFGIzyoabaJbAlnFAxFSq
+DIQ9+27JObXMnVH/6iK0mhHTooB72Gd0LQHVHGiCrFyxmbhMp7tIX0vU3Qn4/U8F
+kt/Kep3+Wam/1h1NmmOJzTux2NuRurcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+YPPRnb1/92C/Si/V5I15TfFSTdOeMcVHQ0DY0ohUw8B4fEbr9htjZoW7Umyco5pF
+kf+2Jm0GRVEJKjBxFEsbNbY8vusnP25u88vJa4Qy3JJZbsYGcPZiFOKffZWg/xqW
+t5F3i+akH5ihUn910/5l85SDUnDS1VvHVdOGwsedRNW4Yi9eEWjiEGQwjlhH0sWh
+uxjCIgYajcptpsZ8N8g+bR7ysVk61E5tcmScA5Pnu1fwu6+76mTF6gZO57jzWK93
+FlSHA6c7bCPMo+r4EZVccHBdrTRe6ZdD+OSOuEV4i0iI7IONOE1/ClWKUyueTsA/
+vKRir2Cb6A/NaScKNHBBhg==
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Psykolingvistiikan Max Planck-instituutin palveluntarjoaja</md:ServiceName>
-      <md:ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Psykolingvistiikan Max Planck-instituutin tutkijoille suunnattu kielitieteellinen palveluntarjoaja.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider for Linguistic Services aimed at researchers.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=corpus1.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDbDCCAlQCCQDcydJCAWzKeDANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJO
+TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
+LVBMMRcwFQYDVQQDEw5jb3JwdXMxLm1waS5ubDEeMBwGCSqGSIb3DQEJARYPbGF0
+YWRtaW5AbXBpLm5sMB4XDTE0MDUwMjExMjkwNVoXDTE5MDUwMTExMjkwNVoweDEL
+MAkGA1UEBhMCTkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzAN
+BgNVBAoTBk1QSS1QTDEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwxHjAcBgkqhkiG
+9w0BCQEWD2xhdGFkbWluQG1waS5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMFrApun/KXB9YtFiT49PHz7uV9EoVmrFsCBNqVWYhM+msq2dkM7rNVe
+eZdy2hHID72ILMeqeXKX+hFQPyX18eN4L6lfJzzJJI2HGdIuGPyKZXCsVrCqnIWo
+VPRi5dnTlCpCEPhebt05L9TMQJrLWue2qDhhdwkaYrVfm+tsYGK9yiy3Gbsoa10L
+kEpd2oJZLDGHXSZJ6GL4oUMbQ+Z9bIjCelQWC4tU/u6qFGIzyoabaJbAlnFAxFSq
+DIQ9+27JObXMnVH/6iK0mhHTooB72Gd0LQHVHGiCrFyxmbhMp7tIX0vU3Qn4/U8F
+kt/Kep3+Wam/1h1NmmOJzTux2NuRurcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+YPPRnb1/92C/Si/V5I15TfFSTdOeMcVHQ0DY0ohUw8B4fEbr9htjZoW7Umyco5pF
+kf+2Jm0GRVEJKjBxFEsbNbY8vusnP25u88vJa4Qy3JJZbsYGcPZiFOKffZWg/xqW
+t5F3i+akH5ihUn910/5l85SDUnDS1VvHVdOGwsedRNW4Yi9eEWjiEGQwjlhH0sWh
+uxjCIgYajcptpsZ8N8g+bR7ysVk61E5tcmScA5Pnu1fwu6+76mTF6gZO57jzWK93
+FlSHA6c7bCPMo+r4EZVccHBdrTRe6ZdD+OSOuEV4i0iI7IONOE1/ClWKUyueTsA/
+vKRir2Cb6A/NaScKNHBBhg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
+    <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">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</md:ServiceName>
+      <md:ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic 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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="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>Technical</md:GivenName>
@@ -85,7 +110,8 @@ LHbuhlrBzMoxQBZGyW4eOToiuysyE37dSKtUgCs4vDN4S4EWz90Y6xY=</ds:X509Certificate>
     <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:corpman@mpi.nl</md:EmailAddress>
+    <md:GivenName>General</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:latadmin@mpi.nl</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
new file mode 100644
index 00000000..238dcf4e
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.eblib.com-shibboleth.xml
@@ -0,0 +1,68 @@
+<?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"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn: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
+						ADCCAQoCggEBAL7h4T/JsESXBRIXlPdeBLB5L9UAYCBdvpvPtqiksWkphoujeqjk
+						mBO2NT98USIRwg6ktP4KYTBlQxItfniFx/lt4xeS8TboN+sTlW6LnY05j9UPL5kN
+						rnIpFmtbhKseIfDEEbO3m8h0+SZKE/RmfS6+l4/yTePoIhvtTKISDajr2GhdhJoa
+						/fjng0lHMikaFzfdd39DfKg/v73v8X9UvtH14ZkSrn4bTRvBCrKHSaMNneAH5N1G
+						PopSv+eVkrTPuQMse/w3JplYk08jujhv5Y24YvP9FCpgbQClxXbDn6OxMmejIpEk
+						Ri3EU2qqEN6N0BSN3N1PeuDOiaViOhbCAoUCAwEAAaNaMFgwNwYDVR0RBDAwLoIM
+						c3AuZWJsaWIuY29thh5odHRwOi8vc3AuZWJsaWIuY29tL3NoaWJib2xldGgwHQYD
+						VR0OBBYEFH/f6xMjqy+Ci9ctWA+7FStjJwNoMA0GCSqGSIb3DQEBBQUAA4IBAQC8
+						y6IkTzJqruNKtOZno4GswDkszRcDYMNx1w+JfMVJZG2YkVkPvWkP9JTCN/tVjKEZ
+						a5H4kq2jMUrBndjdu1W+v5jio8mXY8kDCp7Sly5eUtWrqE2q/1iTmJ4oWCHydRcD
+						Ez+X0sxSnQqxmcFe4ssS8EFzs1WPvinbhz71JZbnkOadPf//1epRxqJlDTq41p0e
+						mllYEt3rXPJBv1vCEbjLcZ8d1CTzPc8iveaNjU5h/rglqvDFwoIL870yMJg0n9bK
+						4elyV6s5HxPWucc0hyO4eUkbyMnP9QKLAemBKJUgU4SzTVSPLfiFdbe1x4zUMsSO
+						3yQ7F/pT44mChEK7mdRw                       
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..6923d1b4
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.ebrary.com-shibboleth.xml
@@ -0,0 +1,92 @@
+<?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>
+      <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/DS" index="2"/>
+      <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">Um Bibliotheken mit strategischen ebook Akquisition unterstützen, bietet eine Reihe von ebrary Pakete unter Abonnement und ewigen Archiv-Modelle, die von Hand durch unsere on-Bibliothekare ausgewählt sind. Diese abgepackte Produkte können miteinander kombiniert, sowie einzelne Titel unter Modelle wie Patron driven Erwerb und kurzfristige Darlehen für den größten Wert erworben werden.</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
+BAMTEnNoaWJiMDEuZWJyYXJ5LmNvbTAeFw0xMjAzMDYxNTEzNDFaFw0yMjAzMDQx
+NTEzNDFaMB0xGzAZBgNVBAMTEnNoaWJiMDEuZWJyYXJ5LmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALuIVAFYCaz6nqWxxN9tMxXk+aXzCN0eAyG0
+HIRrO2trVL6ypFzofTm8f2+G95PRXVxzx8E8+9XOo3EpOnU8g/kVP7qT7IrUtZXD
+Vzy2iGgdgwMWrttFC+lOGCwO+bbYUAwYoXtfBh0LkG0Q4gf0TLMg3j61C36ceKLV
+dIOqDdU07YPgRls4eOpYltJjcqa52mODEO+KFJ9FWc8dmVaBRVZgaGDsoZlXhsSo
+tDTHJirO+F14ODi9FL258jF2/lodHD1irsZEGQBQatJE3zJuJ9XfTD3lFGdWq+ZR
+WF/qIMYiTvQN69b1UV5zgoGBsn2S90nEtfA98BC4JirJ5qUzy9sCAwEAAaNAMD4w
+HQYDVR0RBBYwFIISc2hpYmIwMS5lYnJhcnkuY29tMB0GA1UdDgQWBBQayHM3e6AN
+AKKlRKtofjjdfLQdFDANBgkqhkiG9w0BAQUFAAOCAQEAixoxwjRIM1LyByB/9jm0
+UEQQsDIkIYByMdLGSKmhTWNbd6aKOP3We5br6uH544XL2HlsSRQ48QHJLRBtRwvR
+2drWZgfJfUQP6iGs2rZQUjCk7EWW/cVGc0DxJef2nbvwtibk2TVZfLpjrso9T32W
+C5fDoiy5vcwBBRPdhH7xJpgBSzx71lAiYjpUZqkt3URWaPYA3RWEnP5dlRZ1SuY6
+3Nob3XeM7KrmF+lL8P1x0wKpXJo9/mHT9AURPFdgyqkIeGpJRSuOXZrp9rMtBexk
+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: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">Um Bibliotheken mit strategischen ebook Akquisition unterstützen, bietet eine Reihe von ebrary Pakete unter Abonnement und ewigen Archiv-Modelle, die von Hand durch unsere on-Bibliothekare ausgewählt sind. Diese abgepackte Produkte können miteinander kombiniert, sowie einzelne Titel unter Modelle wie Patron driven Erwerb und kurzfristige Darlehen für den größten Wert erworben werden.</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
new file mode 100644
index 00000000..c439355f
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml
@@ -0,0 +1,69 @@
+<?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/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">
+    <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://vsp2.edina.ac.uk/public/images/splogos/agcensus.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>
+						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
+						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						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/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: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
new file mode 100644
index 00000000..8d897e6f
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-cris.xml
@@ -0,0 +1,117 @@
+<?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/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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
+						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						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>
+						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
+						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						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/cris/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/cris/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/cris/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/cris/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/cris/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/cris/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/cris/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <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: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-depot.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-depot.xml
new file mode 100644
index 00000000..87be21dd
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-depot.xml
@@ -0,0 +1,62 @@
+<?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/depot">
+  <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
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						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/depot/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/depot/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/depot/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/depot/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/depot/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/depot/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/depot/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/depot/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: The Depot</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.depot.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-digicolleges.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml
new file mode 100644
index 00000000..ddb6568b
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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://vsp2.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>
+						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
+						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						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>
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
new file mode 100644
index 00000000..36beb34e
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digischools.xml
@@ -0,0 +1,62 @@
+<?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/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">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
+						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						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/digischools/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/digischools/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/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: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-kbplus.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-kbplus.xml
new file mode 100644
index 00000000..b33ac0f0
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-kbplus.xml
@@ -0,0 +1,117 @@
+<?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/kbplus">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-27T15:54:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis: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 Base+</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Knowledge Base+</mdui:Description>
+        <mdui:Logo height="64" width="318">https://vsp2.edina.ac.uk/public/images/splogos/kbplus.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/UKDA"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/EDINASchools"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/UKall"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/UKDA"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/EDINASchools"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/UKall"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
+						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						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/kbplus/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="3"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/kbplus/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/kbplus/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/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/Artifact" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/Artifact" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/ECP" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EDINA Knowledge Base+</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jisc-collections.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-m2m.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
new file mode 100644
index 00000000..9f76a3cc
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
@@ -0,0 +1,95 @@
+<?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/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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/WAYF/UKall"/>
+      <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://vsp2.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>
+						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
+						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						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/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://vsp2.edina.ac.uk/m2m/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/SLO/SOAP"/>
+    <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://vsp2.edina.ac.uk/m2m/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/NIM/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://vsp2.edina.ac.uk/m2m/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/m2m/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/m2m/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/m2m/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/m2m/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/m2m/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/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: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
new file mode 100644
index 00000000..dbae1c48
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
@@ -0,0 +1,124 @@
+<?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/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>
+      <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://vsp2.edina.ac.uk/public/images/splogos/mediahub.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>
+						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
+						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						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>
+						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
+						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						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/mediahub/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/mediahub/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/mediahub/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/mediahub/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/mediahub/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/mediahub/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/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <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: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-ukborders.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
new file mode 100644
index 00000000..82d4adaa
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
@@ -0,0 +1,69 @@
+<?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:1.1:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UKBORDERS</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://vsp2.edina.ac.uk/public/images/splogos/ukborders.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>
+						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
+						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						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/ukborders/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/ukborders/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/ukborders/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/ukborders/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/ukborders/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/ukborders/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/ukborders/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/ukborders/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: UKBORDERS</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
new file mode 100644
index 00000000..d63995d7
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-vsm.xml
@@ -0,0 +1,62 @@
+<?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>
+						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
+						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						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>
diff --git a/swamid-interfederations-2.0/sp.gigajamvle.com-shibboleth.xml b/swamid-interfederations-2.0/sp.gigajamvle.com-shibboleth.xml
new file mode 100644
index 00000000..7ed6f80b
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.gigajamvle.com-shibboleth.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.gigajamvle.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>
+						MIIC6DCCAdCgAwIBAgIJAKL0Rd2ZS0IhMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+						BAMTC3NlcnZlcjUwNjg1MB4XDTA5MDYxNTA4NDU1NloXDTE5MDYxMzA4NDU1Nlow
+						FjEUMBIGA1UEAxMLc2VydmVyNTA2ODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQC7qvdYa5Ntk80wfZrtkJTFwAI9Cdx88C0Ql9/nab/L7oXVdNO3IgGx
+						bQqI0P71yCA//g5oJrnaQstNPA1pjq9wJsn6Dppy8+DQTOaYmJAZbt2dZ2JJZQPs
+						5THow+T6BbXGKtEVmKBtkvCuyK9uRlSHu/B6gQCsEeCCk+zZA9XP7rGxvEddWD2Y
+						rhmNpe4P9k5QzFbW7fBIgCC+v8tE2U+4ufm9AY1whs+VgKLS8F7hYGnjjQAM62mC
+						E+4M/9UgNt30TSwUcHmaDw0S6obsOUY+pH2kUdiNL3IPfd5/RTwcbm90kgae1ks3
+						MrOXjRxnKx3dS0KwMVBbjgPW89CYPTlRAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3Nl
+						cnZlcjUwNjg1MB0GA1UdDgQWBBSGpWMub0XU+qKZm5q1SOxMSPBqPDANBgkqhkiG
+						9w0BAQUFAAOCAQEAD54bxpNe9K1R0GDlV/q3Y4SrAGRps7//DdtqBE1VgvYYxKNn
+						liNEGxWKg7fe9NNXUsnlbkmGFzgvbUlfAiRhprB8yEeKOCfCzpEem6I7qQiRk1vP
+						bdYf3nxNr1AYf71QskQrVcG4NazrOEBhscNBZNzDdgYJh9iHMWOKoAwOXAux7rwj
+						wmvyOXcT8nYskOwgP+S6bY9Nujy4N3zOK67MWQUeGaDk+Dy2MWeE4HALRS1uekZO
+						GQLj4hRRG7q1Bd+rjyh4YI3FtCDrmTk9ZtVL2OigpRhl4zF46htqt7B1EoZrG9V7
+						U7cJNLDizKNwHettuv1vTwydaCIJ4VQ8cvkIaQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC6DCCAdCgAwIBAgIJAKL0Rd2ZS0IhMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+						BAMTC3NlcnZlcjUwNjg1MB4XDTA5MDYxNTA4NDU1NloXDTE5MDYxMzA4NDU1Nlow
+						FjEUMBIGA1UEAxMLc2VydmVyNTA2ODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQC7qvdYa5Ntk80wfZrtkJTFwAI9Cdx88C0Ql9/nab/L7oXVdNO3IgGx
+						bQqI0P71yCA//g5oJrnaQstNPA1pjq9wJsn6Dppy8+DQTOaYmJAZbt2dZ2JJZQPs
+						5THow+T6BbXGKtEVmKBtkvCuyK9uRlSHu/B6gQCsEeCCk+zZA9XP7rGxvEddWD2Y
+						rhmNpe4P9k5QzFbW7fBIgCC+v8tE2U+4ufm9AY1whs+VgKLS8F7hYGnjjQAM62mC
+						E+4M/9UgNt30TSwUcHmaDw0S6obsOUY+pH2kUdiNL3IPfd5/RTwcbm90kgae1ks3
+						MrOXjRxnKx3dS0KwMVBbjgPW89CYPTlRAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3Nl
+						cnZlcjUwNjg1MB0GA1UdDgQWBBSGpWMub0XU+qKZm5q1SOxMSPBqPDANBgkqhkiG
+						9w0BAQUFAAOCAQEAD54bxpNe9K1R0GDlV/q3Y4SrAGRps7//DdtqBE1VgvYYxKNn
+						liNEGxWKg7fe9NNXUsnlbkmGFzgvbUlfAiRhprB8yEeKOCfCzpEem6I7qQiRk1vP
+						bdYf3nxNr1AYf71QskQrVcG4NazrOEBhscNBZNzDdgYJh9iHMWOKoAwOXAux7rwj
+						wmvyOXcT8nYskOwgP+S6bY9Nujy4N3zOK67MWQUeGaDk+Dy2MWeE4HALRS1uekZO
+						GQLj4hRRG7q1Bd+rjyh4YI3FtCDrmTk9ZtVL2OigpRhl4zF46htqt7B1EoZrG9V7
+						U7cJNLDizKNwHettuv1vTwydaCIJ4VQ8cvkIaQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gigajamvle.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gigajamvle.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigajamvle.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigajamvle.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gigajamvle.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gigajamvle.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigajamvle.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigajamvle.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigajamvle.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gigajamvle.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigajamvle.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gigajamvle.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gigajamvle.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gigajamvle.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Interactive Music School Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Interactive Music School Limited: GigajamVLE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://gigajamvle.com/about/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Iain</md:GivenName>
+    <md:SurName>Norman</md:SurName>
+    <md:EmailAddress>mailto:support@gigajam.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Iain</md:GivenName>
+    <md:SurName>Norman</md:SurName>
+    <md:EmailAddress>mailto:iain.norman@gigajam.com</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
new file mode 100644
index 00000000..68d8e7fa
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml
@@ -0,0 +1,69 @@
+<?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>
+      <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://vsp2.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>
+						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
+						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						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>
diff --git a/swamid-interfederations-2.0/sp.igpublish.com-shibboleth.xml b/swamid-interfederations-2.0/sp.igpublish.com-shibboleth.xml
new file mode 100644
index 00000000..aeeb292c
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.igpublish.com-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC5TCCAc2gAwIBAgIJAP+bL8Y9JiKWMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+						BAMTClNFQVJDSFNSVkEwHhcNMTAxMTEyMDcyMzA4WhcNMjAxMTA5MDcyMzA4WjAV
+						MRMwEQYDVQQDEwpTRUFSQ0hTUlZBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEA3wqCYIkxitDSLy2yJdmPGTWLPB4MDvgRHEwT7ZiPsrPigXhAF3/ZOs/n
+						hMBNYwEUZZr0aFNoqxzsEk2gbWFedJXAQsU1bIX9ykDP0QfHLijVUv2KdWQfzKGw
+						udm2WFSCFJArqpHcM8gvbLjvYxMMCgw5c5Ja8XWL6mjjRKMdBpTboJpsEZWsTL1h
+						E6hHY9yFIKHsmGr69cMOCSSpfGx10ZKSQgugBMKq6JatdNPFLkEn2T0AzZOOQgL+
+						TNQEpLLXZ/69j4DjYAB5kjr9cpvWZQReE7lP0lkSnALUVM7s+/fytV8lfGs7pDbR
+						NE5VpOgewWdXpqX119X6LZPdQJgEKwIDAQABozgwNjAVBgNVHREEDjAMggpTRUFS
+						Q0hTUlZBMB0GA1UdDgQWBBQoMgjN6ERGsRxlKhUylzN5II0OuTANBgkqhkiG9w0B
+						AQUFAAOCAQEAOf1vokGaIZdmdbIk+HrncGML98lEQrjna4Wp4NiMOKuauszLFKEK
+						Ys6b42oL0NdaDM/9zu6lwxtJBGO2Hb7DKA6CwBRObDhbLOdaFynDGHq45roQN0gB
+						R69V4ZFGxqrpFdyX1gp2P3YRGfdoZKFa+U9n4kZ7GGofaak15ZiCrWPh6GeRLCF/
+						xQfXQh802/FPY2tnqk2bs7LHIjGziCAjvvLVxHGIqoXUgmD89oQTYA8zB6b2jwWo
+						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>
+						MIIC5TCCAc2gAwIBAgIJAP+bL8Y9JiKWMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+						BAMTClNFQVJDSFNSVkEwHhcNMTAxMTEyMDcyMzA4WhcNMjAxMTA5MDcyMzA4WjAV
+						MRMwEQYDVQQDEwpTRUFSQ0hTUlZBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEA3wqCYIkxitDSLy2yJdmPGTWLPB4MDvgRHEwT7ZiPsrPigXhAF3/ZOs/n
+						hMBNYwEUZZr0aFNoqxzsEk2gbWFedJXAQsU1bIX9ykDP0QfHLijVUv2KdWQfzKGw
+						udm2WFSCFJArqpHcM8gvbLjvYxMMCgw5c5Ja8XWL6mjjRKMdBpTboJpsEZWsTL1h
+						E6hHY9yFIKHsmGr69cMOCSSpfGx10ZKSQgugBMKq6JatdNPFLkEn2T0AzZOOQgL+
+						TNQEpLLXZ/69j4DjYAB5kjr9cpvWZQReE7lP0lkSnALUVM7s+/fytV8lfGs7pDbR
+						NE5VpOgewWdXpqX119X6LZPdQJgEKwIDAQABozgwNjAVBgNVHREEDjAMggpTRUFS
+						Q0hTUlZBMB0GA1UdDgQWBBQoMgjN6ERGsRxlKhUylzN5II0OuTANBgkqhkiG9w0B
+						AQUFAAOCAQEAOf1vokGaIZdmdbIk+HrncGML98lEQrjna4Wp4NiMOKuauszLFKEK
+						Ys6b42oL0NdaDM/9zu6lwxtJBGO2Hb7DKA6CwBRObDhbLOdaFynDGHq45roQN0gB
+						R69V4ZFGxqrpFdyX1gp2P3YRGfdoZKFa+U9n4kZ7GGofaak15ZiCrWPh6GeRLCF/
+						xQfXQh802/FPY2tnqk2bs7LHIjGziCAjvvLVxHGIqoXUgmD89oQTYA8zB6b2jwWo
+						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">Academic Rights Press Limited: IGP</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
new file mode 100644
index 00000000..9eab6a63
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.issuesonline.co.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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>
+						MIIDITCCAgmgAwIBAgIJALqyRi7RcRm9MA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+						BAMTHnNlcmVuaXR5LTAwMS5yZWFsbmV0MjAwMC5jby51azAeFw0xNTAyMjYxMjEy
+						NTNaFw0yNTAyMjMxMjEyNTNaMCkxJzAlBgNVBAMTHnNlcmVuaXR5LTAwMS5yZWFs
+						bmV0MjAwMC5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL7f
+						GguU7RUkjcExiPCDt6y7m8O95jgYTnBf0JR1NC6XUmq5ClSrvwopeoYHdFZgZNPg
+						hBdN9ZpLNf7zXprkNnycsMw4FNKw+9XptaiYLM4j1/yNTyZ8Rskrnvd1lPvlVjmx
+						RvOtF+gNbXDKDgPTWYsvu1BkjtaHHcWN/tmRkPdjST7H4aGhQc7F5S0ka1HiqO1T
+						p6IWYiJ25VCVq+eszCz+FO/bXkR8B32P3Zp0ccLwqOEAHn0K3UKu21/HJ6eNpT5s
+						0b7uirPmveSS7L5+XSIDe6u1jmlxwtk9cDgSh0FvRBqEjLw5us7tXfMhUHTWAr/s
+						GoUgXNHkYBRT6DFAxhsCAwEAAaNMMEowKQYDVR0RBCIwIIIec2VyZW5pdHktMDAx
+						LnJlYWxuZXQyMDAwLmNvLnVrMB0GA1UdDgQWBBTCr+UQKfAtVYV9QIFpBp8sxXhJ
+						8zANBgkqhkiG9w0BAQUFAAOCAQEAvRii27N52xgxwRsO9qQC67rbW4Wa7tNzKlGH
+						iRzlhTWBFi5e3nmnDZ/svXQI0dfeJIsVV293CgO7RQqkcNH/ZqQ6wQW8nkBG0ruz
+						BlPV8v27e017FzbrjncQMT8Fxsxxc5YPa710ihh+OTvDAjMhW7UmOYRL7oOTXI5Z
+						95HM8MY0CercGLx6vUpLCoiAj/HXDu8lxP1meX4fUODoAiKXXyNI0F6X2WBCeW1O
+						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>
diff --git a/swamid-interfederations-2.0/sp.kbplus.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.kbplus.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..62813a66
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.kbplus.ac.uk-shibboleth.xml
@@ -0,0 +1,132 @@
+<?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>
+      <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://www2.kbplus.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www2.kbplus.ac.uk/Shibboleth.sso/Login" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://kbplus.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kbplus.ac.uk/Shibboleth.sso/Login" index="3"/>
+      <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>
+						MIIC7jCCAdagAwIBAgIJAIBmyUyWFATyMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDWlwLTEwLTAtNjAtMjgwHhcNMTQxMjE5MTQzMzE5WhcNMjQxMjE2MTQzMzE5
+						WjAYMRYwFAYDVQQDEw1pcC0xMC0wLTYwLTI4MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA08UgodtgpL2QVTy9K43/KrIMvEIh1ZQZpAFsmWYyHaW0T0kx
+						bBVyV9jmFOyCC6YIsP7wb5EwwXsYQKuDYwyhucrF7mBTJYT9JHsBEsNTI/ckB7YJ
+						rTe21BGZYrDsNl+Ncxqnt9RFalljCet7N+co2H3/EBXIhttz+Yfv+RwtvGQnTK7s
+						+jHMwXHni4pRCeuJZJzynTjQypBT3noRu1Ay0nJPnDuDOzcJ+t+5T1NQkGOFGWbo
+						Vr/rlGILNibJ+SK+o2ZYvezTh1KWo3I/1GiMCUnAywyiF47k7TiFF2BVSVj1gAr5
+						X8w9v7qU/EFGCtk6SNrNjwdzfSaHzBQa1RqMZwIDAQABozswOTAYBgNVHREEETAP
+						gg1pcC0xMC0wLTYwLTI4MB0GA1UdDgQWBBQGGh8/UCXKoembhzc6Bpt5IT315DAN
+						BgkqhkiG9w0BAQUFAAOCAQEAPBszDkuKHytoFPV3P/nnXaHdLJuLer/XxPi8BiWI
+						MwQaaqcymdqZOixsdXyIHYcIwS1HRwob+aMgdo5R87v830DO0bAWLnXHb89Bls/z
+						zRo1bSnkNNo8ifNwmaQE1J8ttvbwmQuveBy8iD/NQjmhlS2oULEIVCGsIEsfPGDw
+						HArLHsB6yRGs0bwBfGpXx1hD8vblXsTAdm3ZPR0BwG300xFfVAAzIYTB9ScB8q46
+						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:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www2.kbplus.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kbplus.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kbplus.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <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://www2.kbplus.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www2.kbplus.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.kbplus.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.kbplus.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kbplus.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <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://kbplus.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <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://kbplus.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <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://kbplus.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <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://www2.kbplus.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www2.kbplus.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.kbplus.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www2.kbplus.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www2.kbplus.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www2.kbplus.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kbplus.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
+    <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://kbplus.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="15"/>
+    <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://kbplus.ac.uk/Shibboleth.sso/SAML2/Artifact" index="17"/>
+    <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://kbplus.ac.uk/Shibboleth.sso/SAML2/ECP" index="19"/>
+    <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://kbplus.ac.uk/Shibboleth.sso/SAML/POST" index="21"/>
+    <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://kbplus.ac.uk/Shibboleth.sso/SAML/Artifact" index="23"/>
+    <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 Collections and Janet 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 45933ebd..59d8dae0 100644
--- a/swamid-interfederations-2.0/sp.korp.csc.fi-.xml
+++ b/swamid-interfederations-2.0/sp.korp.csc.fi-.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.korp.csc.fi/">
+<md: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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Concordance search service for text corpora</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Konkordanssihakuohjelma tekstiaineistolle</mdui:DisplayName>
         <mdui:Description xml:lang="fi">Tällä työkalulla voit tutkia tekstikorpuksia.</mdui:Description>
@@ -14,13 +24,9 @@
         <mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIQTmDBZrbiqJFnGKHn80dL1zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -57,8 +63,8 @@ eeQKhPUjOTj9UPCeCE8rjrLqJ3pBtqlfhwUkfbIpUeGbYh9FI3zJNDKLmwCGS0g+
       <md:ServiceName xml:lang="en">Korp – search service for text material</md:ServiceName>
       <md:ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md: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>
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
new file mode 100644
index 00000000..3ef061ad
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.lamlash.edina.ac.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIDADCCAeigAwIBAgIJANJlwPezlAQrMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE2xhbWxhc2guZWRpbmEuYWMudWswHhcNMTQwNDIxMTE0MDI5WhcNMjQwNDE4
+						MTE0MDI5WjAeMRwwGgYDVQQDExNsYW1sYXNoLmVkaW5hLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA06kL+mfAnhlI7D66kXFBxfHzxXm2/Ubd
+						wLfeLw31FmLHI9xs4/cxenQY//b5zxXqSr5y3US/JafaiSK0mumPcpM5DIBD0iJ4
+						b9t9hzjwR/RcbbCkLDfD2tHd30pt67wVLDP5eYX+wP/Vk66d6phBYSsZscTWGGGd
+						tczbgIjj9+8q7o3nWdqaktmXyGJxRi6r9vifGIRoqKHJWFH5UgruW3HO0q+i1jow
+						3IMGf0R4JkFGO7fFmRubW4ijdsk/Xp7H+CLfSKWWo3vfwy3ryq/y1kbLb3KcbrS+
+						mBd3Dv5laF72GqlxiU8hw/9puVD0xepKBPGCETaJ9VS9ZTsVjtSsNwIDAQABo0Ew
+						PzAeBgNVHREEFzAVghNsYW1sYXNoLmVkaW5hLmFjLnVrMB0GA1UdDgQWBBQ6pROa
+						8EWlhVLi7V/BeagYmCUDGDANBgkqhkiG9w0BAQUFAAOCAQEAtP7GWLYIZNa3Y+YU
+						9zYwm23LFyofQ9D/sYSGfgfgmFZoD2Fn/j755mtWk4T0Yg3FLps4hlmqAlJVSIJZ
+						+hmej7CJq7fgdtZ4+hnHVMRpkWMbnCsyboiIFgZxWNhyiC88Z0gMd8iv1oNVOSP/
+						v64hI6UX5cuqZGzJ0FHWrPZ/jLIQXFrMJXMYBNSSq2OnIWHpfoleI8lVtA1KKCfU
+						5n5Iz5/4LWZk6kGk6WaiPazMz0S3Sx9xKs8VDVXcUDLbrZ8oP7kxb7/4bfnxFTVL
+						1xaxBzs2JRNZGBZ4nbp3kLTMlQURE8zE9nCZ3isA4PbkjBkq1d4glstq0wZTZKPj
+						ej8VlA==
+					</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>
diff --git a/swamid-interfederations-2.0/sp.lat.csc.fi.xml b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
index ce823d46..0ab6b5d5 100644
--- a/swamid-interfederations-2.0/sp.lat.csc.fi.xml
+++ b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://sp.lat.csc.fi">
+<md: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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
+      <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="en">LAT – Language Archive Tools</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">LAT – Language Archive Tools</mdui:DisplayName>
         <mdui:Description xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja käsitellä video- ja äänimateriaalia.</mdui:Description>
@@ -16,13 +26,9 @@
         <mdui:PrivacyStatementURL xml:lang="en">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:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQIp6gFDuZ6VnJilIzPrnFvzANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -59,7 +65,7 @@ TE5WJb+s+lUOs3IoVL33fpbG+Aor</ds:X509Certificate>
       <md:ServiceName xml:lang="en">LAT – Language Archive Tools</md:ServiceName>
       <md:ServiceDescription xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja kasitella video- ja aanimateriaalia.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="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>
diff --git a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
index 52390543..b4c363b5 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -1,23 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.lux17.mpi.nl">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+<md: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://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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics lux17 SP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fi">Max Planck Institute for Psycholinguistics lux17 SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics lux17 Service Provider for Linguistic Services aimed at researchers</mdui:Description>
+      <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">Max Planck Instituut voor Psycholinguistiek tweede Service Provider</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider voor Taalkundige Services gericht op onderzoekers</mdui:Description>
+        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider for Linguistic Services aimed at researchers</mdui:Description>
         <mdui:Logo height="90" width="90">https://lux17.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Max Planck Institute for Psycholinguistics Lux17 Service Provider Linguistic Services</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="fi">https://lux17.mpi.nl/privacy_statement.html</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="de">http://www.mpi.nl</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.mpi.nl</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://lux17.mpi.nl/privacy_statement.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    <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
+BgNVBAYTAk5MMQwwCgYDVQQIEwNHTEQxETAPBgNVBAcTCE5pam1lZ2VuMQ8wDQYD
+VQQKEwZNUEktUEwxFTATBgNVBAMTDGx1eDE3Lm1waS5ubDEeMBwGCSqGSIb3DQEJ
+ARYPbGF0YWRtaW5AbXBpLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA3QaSP0LJ0mVZZIdEh7zFJW8lnkVGQFuueAiDfVVvGtGvJ5iz7CRoyrdTQDco
+oJjQDFub/uU6v0i+saVgI+LuzUlq28hrKF5hIjhWCLMRgYZzsnArcGK3etcChsNE
+OPfWNCOCGi90sIqNmJcVRoDw36tLiHXmIkhcy4ZE06SYXvT+qAwo4h30Z/IH2de/
+QlYEpkqF131p2lJGWx1Bi5l7IMeZtlwIzbJn08htAT/T8h6g9XvDfmQxS4xuiXGr
+uRwVhTTkTP9OsdrXkktJEkSE2p+qP0tYekb+ZPd4LzlSjnDWf3V1T/DrbL071eiC
+rx2iDW3n5Wy7so0iwmU5nr9QhwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAFSrqi
+HOMohDd4JXB3rjX8npCSTTeam84LTI1Twd8GXOmDQ8izcwsfUIILusEqd+66V/kh
+iwnBgmrwgw0CVEZjgwkbVdZH68RGO4i6n5hZwmzr5jx4yNkfLZ5uwfHLIkqgJjj0
+DvsA6Saom/5BD6dln6TuQ9cwFu+9pOxaWjfEeD2Rm5HFP+VF9GPxM19Gs6xcYi2L
+GlEfBQvH/6vp65r3ciw760KPeO1ITxaIfqX5fOxOaA0NLOIGLjX0G11vf/i3n1OQ
+MZTR7RMV+bjZiLNoPOJ/Ezz5lr+k0V12yVJ35J2J6TIz6lcB9M1tCFDY7tS89nYf
+HFhkY9jzkGrcHMME
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor 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
@@ -36,37 +76,56 @@ iwnBgmrwgw0CVEZjgwkbVdZH68RGO4i6n5hZwmzr5jx4yNkfLZ5uwfHLIkqgJjj0
 DvsA6Saom/5BD6dln6TuQ9cwFu+9pOxaWjfEeD2Rm5HFP+VF9GPxM19Gs6xcYi2L
 GlEfBQvH/6vp65r3ciw760KPeO1ITxaIfqX5fOxOaA0NLOIGLjX0G11vf/i3n1OQ
 MZTR7RMV+bjZiLNoPOJ/Ezz5lr+k0V12yVJ35J2J6TIz6lcB9M1tCFDY7tS89nYf
-HFhkY9jzkGrcHMME</ds:X509Certificate>
+HFhkY9jzkGrcHMME
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md: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://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Max Planck Institute for Psycholinguistics second Service Provider</md:ServiceName>
+    <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:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
+    <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">Max Planck Instituut voor Psycholinguistiek tweede Service Provider</md:ServiceName>
       <md:ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider voor Taalkundige Services gericht op onderzoekers</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider for Linguistic Services aimed at researchers</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="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="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="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="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:SurName>Technical support</md:SurName>
+    <md:GivenName>Lat</md:GivenName>
+    <md:SurName>Admin</md:SurName>
     <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Dieter</md:GivenName>
+    <md:SurName>Van Uytvanck</md:SurName>
+    <md:EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dieter</md:GivenName>
+    <md:SurName>Van Uytvanck</md:SurName>
+    <md:EmailAddress>mailto:dieter.vanuytvanck@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
new file mode 100644
index 00000000..61f36d7f
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.moodledo.co.uk-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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>
+      <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>
+						MIIEMDCCAxigAwIBAgIJAKFo34oT/WkGMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKU2hyb3BzaGlyZTEQMA4GA1UEBxMHVGVsZm9yZDEb
+						MBkGA1UEChMSQ2FwaXRhIElUIFNlcnZpY2VzMRowGAYDVQQDExFzcC5tb29kbGVk
+						by5jby51azEpMCcGCSqGSIb3DQEJARYabGVvbi5zdHJpbmdlckBjYXBpdGEuY28u
+						dWswHhcNMTMwNTEwMTQzNDUwWhcNMjMwNTA4MTQzNDUwWjCBmDELMAkGA1UEBhMC
+						R0IxEzARBgNVBAgTClNocm9wc2hpcmUxEDAOBgNVBAcTB1RlbGZvcmQxGzAZBgNV
+						BAoTEkNhcGl0YSBJVCBTZXJ2aWNlczEaMBgGA1UEAxMRc3AubW9vZGxlZG8uY28u
+						dWsxKTAnBgkqhkiG9w0BCQEWGmxlb24uc3RyaW5nZXJAY2FwaXRhLmNvLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzLCy9BYBftu1xzeN6tnaMoN0
+						9rGw0uDYUME/UTy4u+U7z0X713tkOl1vzkovtJ258OxyzJbBXTC3YH+bFckTDwtl
+						nh+o5NjzmHuqc1n+upyvAK4Yx4dc9JE6xBR7KEjaXsc4B4zRzoOMMvtrKt/J9H0K
+						tNVWVyeVSaY42yyan/upsI7soM9P8ra+Bo2MvhAIWZiIgIx9fm1+LzI+hIDoy2AA
+						MVc5EbkHhxiZxeJmzHM6dRdziaGk5X1otlIaOujBAoHzuO6tzBlAX083l/S4XkVw
+						dBEJgDXUdHv85zHIG2ZOxG/J3QaWNszT7833NeRcp3SY6cZZwcB3fsMkT5Z71QID
+						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
+						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU4BQ5j9K8ujFcLWS01aleXlPTUcgw
+						HwYDVR0jBBgwFoAU4BQ5j9K8ujFcLWS01aleXlPTUcgwDQYJKoZIhvcNAQEFBQAD
+						ggEBACVCBEuzqfOAYQP2T0wLnYymfdqTwb8wuGC/a47+Ei7p6eS+tG/I+3wjCJY0
+						8Q5MF/7lytwu1ZSWBjPRDgdSWUcE2C0MFlsrecrW0rN3pDYbZfFtNxi07IJcKpD7
+						33Wwu4cTuaZoMF+R2jPg6r9bfGjfeLsvDIqMB7EiVI8XLi23TnwfR1fXGRAPqKlI
+						+VanMzaeUvLeG0d+DOFMj12LXFuLTTrpegsFVfcjOCkgmsGva1d0l245oUjrcjHE
+						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>
+						MIIEMDCCAxigAwIBAgIJAKFo34oT/WkGMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKU2hyb3BzaGlyZTEQMA4GA1UEBxMHVGVsZm9yZDEb
+						MBkGA1UEChMSQ2FwaXRhIElUIFNlcnZpY2VzMRowGAYDVQQDExFzcC5tb29kbGVk
+						by5jby51azEpMCcGCSqGSIb3DQEJARYabGVvbi5zdHJpbmdlckBjYXBpdGEuY28u
+						dWswHhcNMTMwNTEwMTQzNDUwWhcNMjMwNTA4MTQzNDUwWjCBmDELMAkGA1UEBhMC
+						R0IxEzARBgNVBAgTClNocm9wc2hpcmUxEDAOBgNVBAcTB1RlbGZvcmQxGzAZBgNV
+						BAoTEkNhcGl0YSBJVCBTZXJ2aWNlczEaMBgGA1UEAxMRc3AubW9vZGxlZG8uY28u
+						dWsxKTAnBgkqhkiG9w0BCQEWGmxlb24uc3RyaW5nZXJAY2FwaXRhLmNvLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzLCy9BYBftu1xzeN6tnaMoN0
+						9rGw0uDYUME/UTy4u+U7z0X713tkOl1vzkovtJ258OxyzJbBXTC3YH+bFckTDwtl
+						nh+o5NjzmHuqc1n+upyvAK4Yx4dc9JE6xBR7KEjaXsc4B4zRzoOMMvtrKt/J9H0K
+						tNVWVyeVSaY42yyan/upsI7soM9P8ra+Bo2MvhAIWZiIgIx9fm1+LzI+hIDoy2AA
+						MVc5EbkHhxiZxeJmzHM6dRdziaGk5X1otlIaOujBAoHzuO6tzBlAX083l/S4XkVw
+						dBEJgDXUdHv85zHIG2ZOxG/J3QaWNszT7833NeRcp3SY6cZZwcB3fsMkT5Z71QID
+						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
+						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU4BQ5j9K8ujFcLWS01aleXlPTUcgw
+						HwYDVR0jBBgwFoAU4BQ5j9K8ujFcLWS01aleXlPTUcgwDQYJKoZIhvcNAQEFBQAD
+						ggEBACVCBEuzqfOAYQP2T0wLnYymfdqTwb8wuGC/a47+Ei7p6eS+tG/I+3wjCJY0
+						8Q5MF/7lytwu1ZSWBjPRDgdSWUcE2C0MFlsrecrW0rN3pDYbZfFtNxi07IJcKpD7
+						33Wwu4cTuaZoMF+R2jPg6r9bfGjfeLsvDIqMB7EiVI8XLi23TnwfR1fXGRAPqKlI
+						+VanMzaeUvLeG0d+DOFMj12LXFuLTTrpegsFVfcjOCkgmsGva1d0l245oUjrcjHE
+						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>Jim</md:GivenName>
+    <md:SurName>Prince</md:SurName>
+    <md:EmailAddress>mailto:Jim.prince@capita.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jim</md:GivenName>
+    <md:SurName>Prince</md:SurName>
+    <md:EmailAddress>mailto:Jim.prince@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
new file mode 100644
index 00000000..c472a19f
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml
@@ -0,0 +1,117 @@
+<?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>
+      <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>
+						MIIFTDCCBDSgAwIBAgIQGN7fuC0Uze8yew92tsrArTANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTQwNjA0
+						MDAwMDAwWhcNMTYwNzE3MjM1OTU5WjCBljELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+						Ck5ldyBKZXJzZXkxETAPBgNVBAcUCFNvbWVyc2V0MR8wHQYDVQQKFBZKb2huIFdp
+						bGV5ICYgU29ucywgSW5jMRkwFwYDVQQLFBBJbnRlcm5ldCBIb3N0aW5nMSMwIQYD
+						VQQDFBpzcC5vbmxpbmVsaWJyYXJ5LndpbGV5LmNvbTCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBALxNMyyEQztZxX2CnHwTsI5AIKhOza2HNuJ7fsfbmnS7
+						xCaDNVaVoT9nWvpLNwJ8Dn54IYCVJoFtnwkWHFu/E6AKjGROJt1YDQUMmoeNse+/
+						L1fj5NdGSiUpmFdnrJFSB5dFQ1qDG3R+23lfEZCKqByqEd6nnNZJIgMe32+1vA+k
+						S46cU2tRw+Z5UUDjdZ5dyTjKpdQ4mC+zQW4X1h6vrouNxcs/1En+EFqadQuVmLsQ
+						Yzkj0eLBGrYatWNELyZOxIOFj8ERb9Z+08eiXHa19K7uYUHw7ZBlyYciJZNZYVbw
+						59YiXaByT9BR7cFgGxNKoAJpfw+PsBnT7kFB103yxqkCAwEAAaOCAXMwggFvMCUG
+						A1UdEQQeMByCGnNwLm9ubGluZWxpYnJhcnkud2lsZXkuY29tMAkGA1UdEwQCMAAw
+						DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBl
+						BgNVHSAEXjBcMFoGCmCGSAGG+EUBBzYwTDAjBggrBgEFBQcCARYXaHR0cHM6Ly9k
+						LnN5bWNiLmNvbS9jcHMwJQYIKwYBBQUHAgIwGRoXaHR0cHM6Ly9kLnN5bWNiLmNv
+						bS9ycGEwHwYDVR0jBBgwFoAUDURcFlNEwYJ+HSCrJfQBY9i+eaUwKwYDVR0fBCQw
+						IjAgoB6gHIYaaHR0cDovL3NkLnN5bWNiLmNvbS9zZC5jcmwwVwYIKwYBBQUHAQEE
+						SzBJMB8GCCsGAQUFBzABhhNodHRwOi8vc2Quc3ltY2QuY29tMCYGCCsGAQUFBzAC
+						hhpodHRwOi8vc2Quc3ltY2IuY29tL3NkLmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
+						Dc2lww9Dk/JaDPLQoHbqQjprtJZUTe9cEVvu02AKWMGvNlaUWDeHAqd1D+dbmMn7
+						mIXhqERDQUiEr7kS9yehKNSazQXvNy5S9xnPuO64m77zoDTslWIREyRgRPClxmvE
+						6LXZzucaLy1KMuuiWK2Jle/yb8e9s5M51jU0UQVVQjFQaWe1NKUzrt31QgWAgTWX
+						vSMwOdHJKGYpHXjpalopAX8fNV4lNg6kt9Ob3kJsQtUQkVLlPkwaVwlVLgWjbTIO
+						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">
+				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>Zhiming</md:GivenName>
+    <md:SurName>Chen</md:SurName>
+    <md:EmailAddress>mailto:zchen@wiley.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Zhiming</md:GivenName>
+    <md:SurName>Chen</md:SurName>
+    <md:EmailAddress>mailto:zchen@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
new file mode 100644
index 00000000..fc5a743e
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.owncloud.gla.ac.uk-entity.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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>
+						MIIECjCCAvKgAwIBAgIJAKwtx3NdckJyMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
+						VQQGEwJHQjERMA8GA1UECAwIU2NvdGxhbmQxEDAOBgNVBAcMB0dsYXNnb3cxHjAc
+						BgNVBAoMFVVuaXZlcnNpdHkgb2YgR2xhc2dvdzEUMBIGA1UECwwLSVQgU2Vydmlj
+						ZXMxGzAZBgNVBAMMEm93bmNsb3VkLmdsYS5hYy51azAeFw0xNTAyMjMxMDI5NDNa
+						Fw0yNTAyMjAxMDI5NDNaMIGFMQswCQYDVQQGEwJHQjERMA8GA1UECAwIU2NvdGxh
+						bmQxEDAOBgNVBAcMB0dsYXNnb3cxHjAcBgNVBAoMFVVuaXZlcnNpdHkgb2YgR2xh
+						c2dvdzEUMBIGA1UECwwLSVQgU2VydmljZXMxGzAZBgNVBAMMEm93bmNsb3VkLmds
+						YS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPW7Jsg02GHZ
+						/E01ULgwISkQ4Qr/Rid4+bhe3TG4OH5aHcdChNRdxP55PYuIV+yy4yOYD6ZP+veE
+						PlmBw0VYl6IIQTpFVeY+j2LrxL9vdRmSfn4+qnd0xbr2hBdd5xtC0SMvxZLEzM7U
+						gGHu4LUn9WDhwRiuCSZFoEhEjVFOcV8MdnxUA3GsleMdVQaI7Hb7yR9o5cYMsXPj
+						sCCCpnH5E76O9/uNuh+0CzBJaVqxwjungiXrWz1tr/+j/dKtpf/sTdH+Tw+xj02X
+						HXCwjO8My8rPf2q5hn6+xKjsHnnIJXGHIxiYbEzESbffLzOFl8mevIQLQWxDz8L1
+						Khwjk85sw18CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
+						blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFPz/VTu8R3dicZ/o
+						TV75yyBGAgSvMB8GA1UdIwQYMBaAFPz/VTu8R3dicZ/oTV75yyBGAgSvMA0GCSqG
+						SIb3DQEBCwUAA4IBAQAElnHrdy1FhRqY0gV7Ml2+QUdaI/o3Z2SAlDlKhk9dlOsw
+						dzyizx/wdXksEgBk/oqXglL5LgsvbPITtx8VfTbxZ9azdvD2ke+rc5I4vuzlHu/R
+						Y7l8W96uek7tSYpHJElPPOkktXJuPH1e4e58loyeLFBTmYHgvTSxbY8/+L21M2DB
+						W4Xvn7yK6tXwYACCGw3h0dVy62OoQHGef8uxeiJJAuQQ9Bu6VMsUWTsgpZ14h0Qh
+						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>
+						MIIECjCCAvKgAwIBAgIJAKwtx3NdckJyMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
+						VQQGEwJHQjERMA8GA1UECAwIU2NvdGxhbmQxEDAOBgNVBAcMB0dsYXNnb3cxHjAc
+						BgNVBAoMFVVuaXZlcnNpdHkgb2YgR2xhc2dvdzEUMBIGA1UECwwLSVQgU2Vydmlj
+						ZXMxGzAZBgNVBAMMEm93bmNsb3VkLmdsYS5hYy51azAeFw0xNTAyMjMxMDI5NDNa
+						Fw0yNTAyMjAxMDI5NDNaMIGFMQswCQYDVQQGEwJHQjERMA8GA1UECAwIU2NvdGxh
+						bmQxEDAOBgNVBAcMB0dsYXNnb3cxHjAcBgNVBAoMFVVuaXZlcnNpdHkgb2YgR2xh
+						c2dvdzEUMBIGA1UECwwLSVQgU2VydmljZXMxGzAZBgNVBAMMEm93bmNsb3VkLmds
+						YS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPW7Jsg02GHZ
+						/E01ULgwISkQ4Qr/Rid4+bhe3TG4OH5aHcdChNRdxP55PYuIV+yy4yOYD6ZP+veE
+						PlmBw0VYl6IIQTpFVeY+j2LrxL9vdRmSfn4+qnd0xbr2hBdd5xtC0SMvxZLEzM7U
+						gGHu4LUn9WDhwRiuCSZFoEhEjVFOcV8MdnxUA3GsleMdVQaI7Hb7yR9o5cYMsXPj
+						sCCCpnH5E76O9/uNuh+0CzBJaVqxwjungiXrWz1tr/+j/dKtpf/sTdH+Tw+xj02X
+						HXCwjO8My8rPf2q5hn6+xKjsHnnIJXGHIxiYbEzESbffLzOFl8mevIQLQWxDz8L1
+						Khwjk85sw18CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
+						blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFPz/VTu8R3dicZ/o
+						TV75yyBGAgSvMB8GA1UdIwQYMBaAFPz/VTu8R3dicZ/oTV75yyBGAgSvMA0GCSqG
+						SIb3DQEBCwUAA4IBAQAElnHrdy1FhRqY0gV7Ml2+QUdaI/o3Z2SAlDlKhk9dlOsw
+						dzyizx/wdXksEgBk/oqXglL5LgsvbPITtx8VfTbxZ9azdvD2ke+rc5I4vuzlHu/R
+						Y7l8W96uek7tSYpHJElPPOkktXJuPH1e4e58loyeLFBTmYHgvTSxbY8/+L21M2DB
+						W4Xvn7yK6tXwYACCGw3h0dVy62OoQHGef8uxeiJJAuQQ9Bu6VMsUWTsgpZ14h0Qh
+						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>
diff --git a/swamid-interfederations-2.0/sp.primaryblogger.co.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.primaryblogger.co.uk-shibboleth.xml
new file mode 100644
index 00000000..d9a91ee7
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.primaryblogger.co.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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.primaryblogger.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:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.primaryblogger.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>
+						MIIDBjCCAe6gAwIBAgIJAOZHOEMKBHC2MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0wOTExMDgyMzUxNThaFw0xOTEx
+						MDYyMzUxNThaMCAxHjAcBgNVBAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgEkbr2RKR4I0utlNh/vw1jX7p0
+						i7kqSW+nn6yL0AkkoTCheUI7wG+g0tr85EI8NJDgjn32VTuwKuvZfG8Glq6egaN3
+						gYTrZobvMpeGE5EdkFDRqGdecxjaNoVnVJypPo2h6WYiID7AvHb2+HWMcwa4sboH
+						ROg+xUA9WEuD0NHXiNgM7Olq41GDGnfkpra3xIQyuTdqi8m4BeKx0C37twr7cuEf
+						dDUI/obOQXGKMaq7o0vEIRIzQAVkiYdwHhT0QCZ9iy8TdNzLymGHqqwWUql3kADh
+						d4JF159CUg4DfC+nOOsyrBrALcKQrnvPG/m9co8RXE1uUjdU/3Eu/KcM0wUCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVbG9jYWxob3N0LmxvY2FsZG9tYWluMB0GA1UdDgQW
+						BBRocwEiryFGPISri/h1VtntIAhbuzANBgkqhkiG9w0BAQUFAAOCAQEAebIJkE/j
+						XykPygSsAdZVXKw/udtaFkWOnTQCjfUpJClLnuTwTSwd4n5yp+YbQ5OK3i9TsziF
+						vIF8Ef6Lu7CBDEgKqQbQaiRSPSGV83eCcQ3dPMz3Y7e0b1N5VJZ2+PdOvU0G62ti
+						P40Lq5ggDCKejJNh/G/3cZ13ycwUZ7e5tqS0dcCKqBNvDLbYEGa9jjClclFOyDv8
+						3fDaIHNHpBeXqtP3TOkAAkdBLQrdvuA2DOYl1fNLMFFKKP8ARt9zTwNCEyLuzSmG
+						+gFtPl/xOz4ha0mucdRHuztOM32CHnYO8dv4s6hr0hWVu5rt+msf4UN1lgNd3lVf
+						LzHzZem0YfRmWw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDBjCCAe6gAwIBAgIJAOZHOEMKBHC2MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0wOTExMDgyMzUxNThaFw0xOTEx
+						MDYyMzUxNThaMCAxHjAcBgNVBAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgEkbr2RKR4I0utlNh/vw1jX7p0
+						i7kqSW+nn6yL0AkkoTCheUI7wG+g0tr85EI8NJDgjn32VTuwKuvZfG8Glq6egaN3
+						gYTrZobvMpeGE5EdkFDRqGdecxjaNoVnVJypPo2h6WYiID7AvHb2+HWMcwa4sboH
+						ROg+xUA9WEuD0NHXiNgM7Olq41GDGnfkpra3xIQyuTdqi8m4BeKx0C37twr7cuEf
+						dDUI/obOQXGKMaq7o0vEIRIzQAVkiYdwHhT0QCZ9iy8TdNzLymGHqqwWUql3kADh
+						d4JF159CUg4DfC+nOOsyrBrALcKQrnvPG/m9co8RXE1uUjdU/3Eu/KcM0wUCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVbG9jYWxob3N0LmxvY2FsZG9tYWluMB0GA1UdDgQW
+						BBRocwEiryFGPISri/h1VtntIAhbuzANBgkqhkiG9w0BAQUFAAOCAQEAebIJkE/j
+						XykPygSsAdZVXKw/udtaFkWOnTQCjfUpJClLnuTwTSwd4n5yp+YbQ5OK3i9TsziF
+						vIF8Ef6Lu7CBDEgKqQbQaiRSPSGV83eCcQ3dPMz3Y7e0b1N5VJZ2+PdOvU0G62ti
+						P40Lq5ggDCKejJNh/G/3cZ13ycwUZ7e5tqS0dcCKqBNvDLbYEGa9jjClclFOyDv8
+						3fDaIHNHpBeXqtP3TOkAAkdBLQrdvuA2DOYl1fNLMFFKKP8ARt9zTwNCEyLuzSmG
+						+gFtPl/xOz4ha0mucdRHuztOM32CHnYO8dv4s6hr0hWVu5rt+msf4UN1lgNd3lVf
+						LzHzZem0YfRmWw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primaryblogger.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.primaryblogger.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.primaryblogger.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Primary Technology Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Primary Technology Limited: Primary Blogger</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.primaryt.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>McLear</md:SurName>
+    <md:EmailAddress>mailto:john@mclear.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>McLear</md:SurName>
+    <md:EmailAddress>mailto:john@mclear.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.primarylogon.co.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.primarylogon.co.uk-shibboleth.xml
new file mode 100644
index 00000000..17447015
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.primarylogon.co.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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.primarylogon.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:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.primarylogon.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>
+						MIIDBjCCAe6gAwIBAgIJAJEKbmu/vCH3MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0wOTExMDcwNDU0NDBaFw0xOTEx
+						MDUwNDU0NDBaMCAxHjAcBgNVBAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN7lMkqj6Sxq7AexnModmAyRAUTx
+						YHjriZnM6f7X8+QI8VYMXxvSHtA7HGmihqtSN/1A1Y0KuCF0Qs3nD5mrc6MT7bo9
+						yKOgy5lYMV3gAdTxWj8EwKxdfdVNXM/AuqE0zPNtft56Owx0OkCUIBAabcTFVn5p
+						TdTa8d8KaxFmHQFnsrFKMm2EcXJrJMU3uBvlOLeAn5Wv88prnghIwMz81VZ9NXPC
+						aG4BYUNPXKgFbzAScFj8DVftSanhN9CPCEO2LhQl7u9O0DVEA95iyTabEG1eJyoY
+						yZEsvRbeliHAaAZWzaw8d/7T9D72MqVYYVkbshHGs1MYnxSdRC1ANSu/utUCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVbG9jYWxob3N0LmxvY2FsZG9tYWluMB0GA1UdDgQW
+						BBSQ00uRX/jErFhgECxBXIKkX9nOZTANBgkqhkiG9w0BAQUFAAOCAQEAwzhPMTAw
+						7+kNYCssU8JOywDnM90RKKEa1Te+WaknFIWTz+m7hGeCWnjtyMugcszVp+CEwOqb
+						/LfOGM0ShQR6obvcM5VlH/xiHKehNVllQeuTWYujv9jdruO/Wr2sBA/y8aREczkF
+						OQzugXsXyhPY4m++zmEBuACnEXzc3Ew/hBCWvyU3aKKOHcC/RTipEO7Ouh87CTpd
+						/TDfAurDdKg6puGSzPyDVwiwFd6LBghyvs4+/aN4Stz0Y4KzUpBLCQ6wOgXbiZr3
+						XJd0Lv5uSEgCMCJLNmufrXzG8Ygi4fCiOlWFIcFhWkWqNwd+ZTds6K04wdYGL3bA
+						uNL0cvubK2qd7Q==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDBjCCAe6gAwIBAgIJAJEKbmu/vCH3MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0wOTExMDcwNDU0NDBaFw0xOTEx
+						MDUwNDU0NDBaMCAxHjAcBgNVBAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN7lMkqj6Sxq7AexnModmAyRAUTx
+						YHjriZnM6f7X8+QI8VYMXxvSHtA7HGmihqtSN/1A1Y0KuCF0Qs3nD5mrc6MT7bo9
+						yKOgy5lYMV3gAdTxWj8EwKxdfdVNXM/AuqE0zPNtft56Owx0OkCUIBAabcTFVn5p
+						TdTa8d8KaxFmHQFnsrFKMm2EcXJrJMU3uBvlOLeAn5Wv88prnghIwMz81VZ9NXPC
+						aG4BYUNPXKgFbzAScFj8DVftSanhN9CPCEO2LhQl7u9O0DVEA95iyTabEG1eJyoY
+						yZEsvRbeliHAaAZWzaw8d/7T9D72MqVYYVkbshHGs1MYnxSdRC1ANSu/utUCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVbG9jYWxob3N0LmxvY2FsZG9tYWluMB0GA1UdDgQW
+						BBSQ00uRX/jErFhgECxBXIKkX9nOZTANBgkqhkiG9w0BAQUFAAOCAQEAwzhPMTAw
+						7+kNYCssU8JOywDnM90RKKEa1Te+WaknFIWTz+m7hGeCWnjtyMugcszVp+CEwOqb
+						/LfOGM0ShQR6obvcM5VlH/xiHKehNVllQeuTWYujv9jdruO/Wr2sBA/y8aREczkF
+						OQzugXsXyhPY4m++zmEBuACnEXzc3Ew/hBCWvyU3aKKOHcC/RTipEO7Ouh87CTpd
+						/TDfAurDdKg6puGSzPyDVwiwFd6LBghyvs4+/aN4Stz0Y4KzUpBLCQ6wOgXbiZr3
+						XJd0Lv5uSEgCMCJLNmufrXzG8Ygi4fCiOlWFIcFhWkWqNwd+ZTds6K04wdYGL3bA
+						uNL0cvubK2qd7Q==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primarylogon.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.primarylogon.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.primarylogon.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Primary Technology Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Primary Technology Limited: Primary Logon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.primaryt.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>McLear</md:SurName>
+    <md:EmailAddress>mailto:john@mclear.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>McLear</md:SurName>
+    <md:EmailAddress>mailto:john@mclear.co.uk</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
new file mode 100644
index 00000000..0e4dedad
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.sae.org-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIC5TCCAc2gAwIBAgIJAMzQRYYPKgNmMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+						BAMTCnNwLnNhZS5vcmcwHhcNMTQwNTA4MTg1ODAyWhcNMjQwNTA1MTg1ODAyWjAV
+						MRMwEQYDVQQDEwpzcC5zYWUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAwFM+ZGsgDIBo8K5978MlaXxqFBHhNVp1EcI9irg627zjSQxc58G4U1H2
+						3kvm4ku04jon3/4jBtfmBTZOtWbdOjTKcbEgwmINlH2Jauy3S2M4XmxM3Q5PU412
+						LKe6zZE7jpjJ1lRzHDKtFyujKoIUAiGYjuCJN+XxQJIdIci7mwpnrIJeu+bbbDfX
+						gGjUHQnVXI/OOxb+lfzp/dc6feYQL/RGammPm+sZpsIjtSBuNQkTlJZOZylFMtqb
+						O/IoQuMEiRmqb2OAAv+ePnQf7lnS14sLu4nhXrBgCEn1K+Lql/Vkk3I1NKQRDGwA
+						8TkLBm8tQRBZNtLMWatCJZ3b9MIrEwIDAQABozgwNjAVBgNVHREEDjAMggpzcC5z
+						YWUub3JnMB0GA1UdDgQWBBRZD8PzLLNGYvb95Q+GmvZonJ73fzANBgkqhkiG9w0B
+						AQUFAAOCAQEACkDp1AnogySx14XbKgPuD4L1II4SOiNZZIPtzpTY+oKJYBI/ftRY
+						jO1WDh0kG9vr/OUCVPCrJ5Dzf8Vq2VgBkYbkJHt15bkYRb0RTOl3CQEH14gLXpbf
+						yhY+SiW+b9UpRYfYX5r9zE78Ksb4yNLVztvrs+KtfLO6D6lZzVMTVHeGt4neg6XG
+						Mfac7z4zH4mgPgRDdM9yZU21CjuCGmHqVKYQhz27rUhkxn/LTEYANpKYlULAKk/N
+						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>
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
new file mode 100644
index 00000000..5661ccef
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.schoolspeoplenet.nsix.org.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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>
+						MIIDDzCCAfegAwIBAgIJAN5YKsPXDSWGMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGG5jY3ZtcnAwOC5ub3Jmb2xrLmdvdi51azAeFw0xNDAxMDkwOTI3MzhaFw0y
+						NDAxMDcwOTI3MzhaMCMxITAfBgNVBAMTGG5jY3ZtcnAwOC5ub3Jmb2xrLmdvdi51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKY8JugWRi8mTZVkCiD0
+						HBPw7+uorNwt6pOfIvtRqs7TJyNYjbKaE5dM/ZSuiD0Zv+YSuOGmZJClcRbX5w5S
+						58qNXjqQKSj5FrSxOmlGq0SGcmNVai1fedaMSrUIgJzoGEKwmpGw1+TL7m22h1nZ
+						lYl2p47/8hSXixdYYwLH0XpPzLrqQzvj3TRGQOVHYhnUJcDR2gUzmPqXAaKDEd5d
+						neeV/s3eko9kJWRpGsXG+epPzrYtakHhireRsoaka+t20T3biRLa4IT9OqQzT4OJ
+						Xn4ae/LvJ9NLORVDKTgPKxp0shN0OLvOmWKCZIyb2I2dp9JyXVXDdCC4rJXZi23S
+						HbMCAwEAAaNGMEQwIwYDVR0RBBwwGoIYbmNjdm1ycDA4Lm5vcmZvbGsuZ292LnVr
+						MB0GA1UdDgQWBBSPEDbgPGg9G0Jm+54R4+UEvh/UrzANBgkqhkiG9w0BAQUFAAOC
+						AQEADudrAdcCD/UWqwvZ7+wL+RUK3E5YCIqwLOYVa80vMtR+PzBpHALoAj6cCm60
+						t05dwf4wbPYnJaHoTF/m0Lp/Upwx4UWn8eATlg9Ao6Crkblv3z4gkzd744Cxc9Jr
+						gOEHnn+YomA2pEe91rWT/vWapAlveMKdbXLw7eYmUfXeC0w2fQ6elnfhLSpUJXCR
+						4DTDyww2YdMVDdkW+8e520LdkXROLEyzZjRWJ8ltXFMGqIr7/ulkOh4M6CoMgSO5
+						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>
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
new file mode 100644
index 00000000..078b59b8
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-accp-development-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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>
+						MIIC9DCCAdygAwIBAgIJAOnxeyETHXm1MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+						BAMTD3Npc3dlYjEuc3NjLmludDAeFw0xMjA2MDUxNzU2NDNaFw0yMjA2MDMxNzU2
+						NDNaMBoxGDAWBgNVBAMTD3Npc3dlYjEuc3NjLmludDCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBALL55DRPN6W6LC899+Z4S/wvZop4jMfn+8fyeuWrU4HO
+						KVLk0zt8oG8KNff1eaU0SUshqbNDrotvDFrF67/CUvxTiju3TBAwCU9+1+ui9hG3
+						RrB09ScBsMnODAIDEAPtPYXg5q2FDFRnO1mgT0/Kys4jlIujsYtPhVs+cMQl5mt6
+						ANH14RiICRPnuQM5xcsXe284Ry40E8vi5/yJcozV3DaRjnE17f9mAEsbWOB7kUDc
+						9frQKlNH2x7CIjnku9FvjkqRyoGJKtdVoSP0Yh6RXuDwsjS9cXEodTkC5bwB2SLt
+						WD1vMUuwwB7DqPOn21WxHZ+gM86ASHwVQp+rvyVkKQ0CAwEAAaM9MDswGgYDVR0R
+						BBMwEYIPc2lzd2ViMS5zc2MuaW50MB0GA1UdDgQWBBTus065XW0fl57GPIa3yPRk
+						3Y2igTANBgkqhkiG9w0BAQUFAAOCAQEAr5XZgVon2nogF3UL6P5b9kVURyaUQkK/
+						2gITgZPyfSzPbcsaXptatkJY3l2Z3Au/gTbttZwFs6kr+B6q6OuNG4H9zyqxPZS4
+						zlC2bag5nJ1CkLd2yRiMGp5o1s0lFLeHmhjtPJfLYOayXad/tMxaC+/dzlkOTgrc
+						IYejATqDiN2j2OBZrExvo4VBaMVQK/xhIb8PiQZVPnTabOR0M6A4XKQUziCwvQ2M
+						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>
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
new file mode 100644
index 00000000..6b2c4ea2
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-accp-production-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-03T09:21:14Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol 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>
+						MIIDDzCCAfegAwIBAgIJAM6qfAoL8z8tMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmludDAeFw0xMjA2MjYxNzQ2NDhaFw0y
+						MjA2MjQxNzQ2NDhaMCMxITAfBgNVBAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmlu
+						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9CZk4YB3WUKTLvuW+B
+						cm42hphwMqoPawLn39vfw2PHuSOBKHuXLb8+h1Gnoq6WUID6cJuGmhPQ2Dal6byB
+						bsyW7psjPTC0RO3CL7kbTcZ6x0ieqp/HJjy9bpGnM7Uph0+vVfSqBVlLVaa2ztKB
+						+Q88LYalVV9qmPZ0a1+gZzzol6cnOMachgPujO5KC3KnWSBXuYKLJYyorPspHjvU
+						3E+oq5f2xd90SnH/TlX3PhODQRvqN/lCSh6hc9DqAIyqsr7uCe/80LKOdCfxeHKp
+						/Anv5CWl9CjMWg7A9UfF8OIV/vOgdZMTGTrp5jDuBc6joskvHwRcAjdTqEBRkjOG
+						VWsCAwEAAaNGMEQwIwYDVR0RBBwwGoIYc2NtNi1kNXB2bS13ZWIxLnNjc2wuaW50
+						MB0GA1UdDgQWBBTHG4J30/NZerp0VtZHwb1PCtCQdzANBgkqhkiG9w0BAQUFAAOC
+						AQEAdRr2MgwHUOwdeYeEHdsn9kK6kQp5tapHtsrLymJ/lMqIekac7sBcHqrSm7s4
+						MZFAQDL+kpipMslm40+Q6V/bM17nWp8FL1S8ujRED64NkTl2ianVOAbpTHQTCNds
+						Q0T7rHJH0o4B/RzjOOP7gfXd4BKaT7FnKzDlhvWc6NhBNotWdr/RUXvrU88eiHCd
+						QSF1TwC8AJQUu7iTXalcg3ETu7qMIE/yRp/DLd29kztdVPLkjpPaxqzW5tYAU9Wr
+						Dme3Upx+SwBPhVrpKbIfsHldCI9J0bRn99npxaboQO+IQiQDt6/VckxpoA8KHPJT
+						f2uosMUQ4B+r8+Je/nia0So1Zg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://publications.chestnet.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <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="0"/>
+    <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="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://publications.chestnet.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://publications.chestnet.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://publications.chestnet.org/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://publications.chestnet.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">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
new file mode 100644
index 00000000..1cbf3fef
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-accp-qa-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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>
+      <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>
+						MIIDODCCAiCgAwIBAgIJAMSQAnn0pgeRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFmFjY3BxYS5zaWx2ZXJjaGFpci5jb20wHhcNMTIwOTEwMTQ1NjUxWhcNMTcw
+						OTA5MTQ1NjUxWjAhMR8wHQYDVQQDExZhY2NwcWEuc2lsdmVyY2hhaXIuY29tMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxZl4R9l1SS4hPAUlQuAVpW4M
+						p5PkbMvIPjiUSlz2FRTuenQlqe2wj+pM0UvM/V/gTO7+ntoEl4SeCZHrcGXLgDJu
+						e4r1RRQlrbQPHO9Ve03rpSTHpaDf3qkL01bCecr6ykHg9TMeOWxTY3qgwPqtsiCa
+						kfKB+sJtLFbsQ/nWwxVTqJauz2TA4HIyHsbDIhXV8aRVWtVhPzfd1+/JnEeNUtWm
+						plg5iOrqOmvoR6SQ0DQaMSIGntxvCpnMd3Abl/4EiV/6f1J8YD9SdfpfOyPp5vRq
+						dBV5OHEcBfqPrPKBzy8xenCVEycOS4uw272sZhqwLVgKbyTM4PKu02G3aLeO3QID
+						AQABo3MwcTBQBgNVHREESTBHghZhY2NwcWEuc2lsdmVyY2hhaXIuY29thi1odHRw
+						czovL3NwLnNpbHZlcmNoYWlyLmNvbS9hY2NwL3FhL3NoaWJib2xldGgwHQYDVR0O
+						BBYEFOakAFHnBCHBmItiTPD/b02+9LYZMA0GCSqGSIb3DQEBBQUAA4IBAQC0nnWZ
+						NJSzLUIRSw/HDu9AGLo+eL9TaTq1WihsiFKnHfzLoifIUsxTpPFr7YXkA5E1KXXp
+						M7oTK/CclJlYIyT4JaUbtkrvAeTUnmgPbUNbhMFwPreiZxdpUCu5DA1ZHigpNEAM
+						njgVQ3ZdcDNSKNMtUf97LJnEJ+vaRA0AixdGEzuPJMEooNeVvBcje+wnE7FDS/iW
+						sA9dTGf+pnvdG9G13kS6IKKKgtZOt69tbjc7+QEcC4D7L0hpaKqNXpDR/7/rwIPp
+						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>
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
new file mode 100644
index 00000000..99bd8772
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-accp-staging-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-18T14:48: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>
+      <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>
+						MIIC/TCCAeWgAwIBAgIJAOEuLFXx6a/0MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnNjbWlpc3ZtMDEuc2NtLmludDAeFw0xMjA2MTUxNDMxMzhaFw0yMjA2MTMx
+						NDMxMzhaMB0xGzAZBgNVBAMTEnNjbWlpc3ZtMDEuc2NtLmludDCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAMfjq2NwXeXARit43FBo4UDEZTZ73LrMn2zj
+						c8JADoZIjU3vtU2EELS3CcRYv1WIjk1cWG3MehPqni6o15VHHZ44YqbaEg+BIZW1
+						cNXcWyceIGwX5/UxD12UDZfmL5YTB8uyeMqWTLpTH9sBsBRRrN11xf2S5A7MzYQL
+						7Vb+KXStHmuhhpQPUyLFQqq2zaZivhLcY8YpsSCDzPPMFPfjhBbOqWHhqvCFmJHB
+						YDbMSks52EoZs81B74TZWDbwN96gzY6gMSoPvPxYyuGqn0402JAnYOjUN9V9aBKE
+						zpJbbeM46qt364t6hJYZOTdMA+1ilC7kd1c3NIb+JJEGnPTL6NcCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISc2NtaWlzdm0wMS5zY20uaW50MB0GA1UdDgQWBBQqhLMJpbph
+						necBjfa4CfIkHZI3WTANBgkqhkiG9w0BAQUFAAOCAQEAA8kBnpqLW0bXTLdJUaXV
+						tJzqqvzvY+z/icmpahqatXQ3/VhOFkIny5vma6UHwYooFVTjJHu1Hgxh6gY8ZqTa
+						LtfrKrqhT3KX1Pw2U+fxuov3SwJWcgX3VVtqLjvNvuyAv+ouafstAxS48x9rSDt6
+						qlwPGcucjHapjnSFb5UiNVWD/JOtuYlzZBsoRdtcoNPeMbV6X9XGpRoauBDIJbXg
+						mKatvLJeSXXq5VP5qbdNAwM5sOtdlRX7Ci9toa2Yqp9IOTUZ4yy5QNjNQC34wfts
+						I6X8aNlnA40xKApV1tJ29hsA2IGI50gX4K9jY3oIoNIo2JicK/gMx3bhC9a6sGIW
+						0Q==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accprc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <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="0"/>
+    <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="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accprc.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 Staging: American College of Chest Physicians</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://accprc.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-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-acp-development-shibboleth.xml
new file mode 100644
index 00000000..7daf36ed
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-acp-development-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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>
+						MIIC9DCCAdygAwIBAgIJANkdfBndUGSUMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+						BAMTD3Npc3dlYjEuc3NjLmludDAeFw0xMjAzMTQyMDU5NTlaFw0yMjAzMTIyMDU5
+						NTlaMBoxGDAWBgNVBAMTD3Npc3dlYjEuc3NjLmludDCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBALDS5+UqQIJ2fAumOUsihM5wVe2HSLiGUnX4bLxaKFCY
+						aO393EIDcGk0kcGwgD7zyJC+q/iCdIUn32vWY160wit+pIQFBHfSU8AMrV0QwPOy
+						ayVgO5EK3LY0hXceSQqaqRYt2wZF0EDIABCESQjyUU/9uTvpWjuBtSpeicRBUwkB
+						OfOBo4LbuyYgd9hcYNWwIymoZqrZkEEkrFdT9CKPi8hWP7VAJvwxhBs1cJe6EOUv
+						73uUw5UMHQBVrJOpv/YxyIxPNBHG/kZYESWo5Yir6GMrTSK4D5UWurBA05wfbhAh
+						k8mq2LtrvGGZjKhHvRVYvSXD4uQEOrwpq53J//M5MzECAwEAAaM9MDswGgYDVR0R
+						BBMwEYIPc2lzd2ViMS5zc2MuaW50MB0GA1UdDgQWBBQNKdSTkEGS8KPfjVSaZe3V
+						N7DQRDANBgkqhkiG9w0BAQUFAAOCAQEAAqtYH86Hpr8AXcEcPCb3Rq2e+b8aa3yA
+						mEnbgu6Qk4A1GDx/GC0RTpj2s/tdOPj7BNY22eAgbspo9UcC0YOVKc1Gtnaurogq
+						RTE0t3GtSyzRjV2pH/9fefP61ttsyM63ec1K75xXGHaAJEdMPoIWR2ysP0C5whCA
+						iJdGkrh2wQvBJF8yd8KS1zSVg1Bk8tKbasqqg8sBe5O2OElzKKdOmWebrQH7h5Jg
+						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>
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
new file mode 100644
index 00000000..3fe4e8c4
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-acp-production-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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>
+      <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>
+						MIIDDzCCAfegAwIBAgIJANicnaiWujsWMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmludDAeFw0xMjAzMjMxNjEzNDlaFw0y
+						MjAzMjExNjEzNDlaMCMxITAfBgNVBAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmlu
+						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMBwkz9AV9PbPUK7SXa7
+						rWvUj+xCylNNDrE4beQIKFSon64hKwfgXFyH7y9UMAq8eajn4J86htU7sLxQxaxe
+						XMkU35WHo7GoFbtSFb+L6NHHv+UnIpl2FpeVwGGFUAEG/L4q69Bpy4VMDs0/7m6r
+						UBEn/vz74A9nIvglxtyY3aOC9z5RWf0WYQ6MKFXDcVpWzXXRBxiQAGjwNLIDwMn/
+						CCSsDjnt8vKWyBr8d/ehkPalUYWj5pBWdhrdSrQ1cWCrBtYJpBxJFgXbFs4i28w8
+						b/Zf7ZkXkRLEL6d9C3Bs4yOQmBLWB33VURvAwTGt2SSgVCSt1PYrjkX8qdxe0bE6
+						PJ0CAwEAAaNGMEQwIwYDVR0RBBwwGoIYc2NtNi1kNXB2bS13ZWIxLnNjc2wuaW50
+						MB0GA1UdDgQWBBSDkYKQ64pYrPAkh2OIuEEcmy3reTANBgkqhkiG9w0BAQUFAAOC
+						AQEAuMzCg0YVNDuS7dA9lQSKoqrXh5UjrTVS66McThWCSVz5anQLzk+yYzjDRfY5
+						6UGp6vzrnXkd06hLXiYkhp+iKaWi0XtcSzMJ2hKK7JZCEjlDv2aa5G1RZOlVbrgb
+						b5iLQRhPD8vkD41JfwqVWFPSUbhCHLpVyxcGsiSvns0lUyShDr+ud/ew1+uD38T+
+						IYw3q6gIHAZTydVD5h3Zk0H2VtT1QjoMs9YQFl1iJJCLayeOSRulsUdyB8DxhkGJ
+						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>
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
new file mode 100644
index 00000000..0b593523
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-acp-staging-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-12T09:28:44Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol 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>
+						MIIC/TCCAeWgAwIBAgIJAK+O24Whf1j9MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnNjbWlpc3ZtMDEuc2NtLmludDAeFw0xMjAzMTkyMTE3NThaFw0yMjAzMTcy
+						MTE3NThaMB0xGzAZBgNVBAMTEnNjbWlpc3ZtMDEuc2NtLmludDCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAMvlGhNSWmeo5NZhKfSSI9+LjR6ydzsFAkJ6
+						Ab9rv15257qlPWSWqiU2g6VLS9wQJT34uXBWxKJFnxjz+7e3nsQrStFPzRjUP25L
+						QrY4404PIDwn/PzmGCmeaX/6fT97DDET1znoyIUG6u/Z9sj6Ejs7B0M4bNPddKgf
+						oXWq/bj5ltNRx5WIfNR++bjNf5z+rg7TLM++DfuhMb+oyXTCJJ7Dm89pWp3Qf9bZ
+						S/nSlg8cQUXIV+aeasbR3W97a50ponwXruKxZ8CHFwRtQxuRx92BUAE48Wmsqy8C
+						hFfl71FZFRndqAk7QmcGNBtfgh8uBk0AnS/s6RstL84D8GdReRcCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISc2NtaWlzdm0wMS5zY20uaW50MB0GA1UdDgQWBBSl3AvtbnYc
+						BN78/OMu1ic7k39ydjANBgkqhkiG9w0BAQUFAAOCAQEAtV2ts6haCyIZOCsp/S1b
+						yYO4JPgZ7vpDfNJidIsWBjysOHr+/tdejm4HpEDI1hwbvw2+wDjhWasjTa7u6qtM
+						OPg12pcV4pQHtCX6QfPodm2kE+x/hlRNIfo8Qkxm0Y3gIbjkfxNisCL50SBzFtJd
+						X88cjx2suAEtEaZj5MMvw1r5/5kfntUqakEr5N8awV3EyV37T808Ntkb58I2C4Iy
+						ofGLunRSyqES28AGD84TrEJtLXR1B4Lv/7AQJTcivD22gngPtgMJH/ebyxDXbv9w
+						bnNwQSmBaN64Rwb9vczMXqoqPY2xhjI0mUtqSUN+H6LacrhUaqr8wQ0YICpwTktl
+						tg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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="0"/>
+    <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="0"/>
+    <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="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://annals.acprc.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 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-ama-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-ama-development-shibboleth.xml
new file mode 100644
index 00000000..48cfe0bf
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-ama-development-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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>
+						MIIC9DCCAdygAwIBAgIJAPXRSgDr+PDuMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+						BAMTD3Npc3dlYjEuc3NjLmludDAeFw0xMjA0MTAyMTEyNDRaFw0yMjA0MDgyMTEy
+						NDRaMBoxGDAWBgNVBAMTD3Npc3dlYjEuc3NjLmludDCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAKgoCVhPuU9Ngx3Lz1NGrE/FnVRd/IHInKH51CEBq2W9
+						Wq8r7y7YxRZa6DoFzoE6wM223zkBEFkNzc9pAQBTyQOKyHYrPV8nwbjifeA/Lq2h
+						nbUx6nrc3RxwGw7v31H24AVkmf8cpnAcgnnD01LvNtLpbmGJoOGCBJEwi+YmFK2N
+						fo0M15Cptq6NVZc2JR2OOFb6mCwwu2otazAYsPSQpZAZ4CHz8s9kiEkC7+KJu8jQ
+						d5DmdkRGxESwHsWIHCmRWLxH40tLp9rYuaGSmFBd0TK8Fb+POB2RYroqi3KBMQUH
+						GOu4PKqcMvXkDkqMJSOWaYZHi2SCPkGvZ/0sPtkNMt8CAwEAAaM9MDswGgYDVR0R
+						BBMwEYIPc2lzd2ViMS5zc2MuaW50MB0GA1UdDgQWBBSjS9WbtSJtcWgF6gaMH9yn
+						PGYwxTANBgkqhkiG9w0BAQUFAAOCAQEAIkWEhqevWn7BMqwO73Gu6EDCFrf7POjP
+						7Nq1ALesArOQUEJPW5hv0HeAvLoSsByllgw+2eZVSseJNXOMlK0LIeVOmZyreasX
+						eBmkQhpPKu+KVbO7hABeZxTrbihD/TiQnyfA63w/mRSHsqjtSfzzQOKTak2v8KQY
+						xQLA0eVmbaFhMoCCprPDcR7RqVaK2+mKWqi3KloNz3xVwGffjM8YHIoyIiHu328a
+						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>
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
new file mode 100644
index 00000000..ca6aa554
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-ama-production-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-01T09:41: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>
+      <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>
+						MIIDDzCCAfegAwIBAgIJAORzNvJp0EaDMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmludDAeFw0xMjA0MTYxOTA1NTVaFw0y
+						MjA0MTQxOTA1NTVaMCMxITAfBgNVBAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmlu
+						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9MqpHzY/2XNz5e72by
+						iLIMsfTp+IkYpxH7J24qf9S59sNFD228Eds7HOixJwIx4qPkMkKWQiJgHbOw9yo6
+						1vYZKWeJs9AiJhZxJqML69mcpXaJ+DcHrTuIARbLixwv8DgrbaqVd7E6xfGnqkwd
+						DBn6fEKEOOKENzZoLoihYfXbVmvAmErwoezim/cBMBJP8+v1/tbYaTwBWkOMEzap
+						C29TA8+rIqHeeH34NczHkKvcdecV/G5wh1/xrCpQFjQ3301L3T25HBE8dPXdxrap
+						ysgQyjNM7lvDHkpJIGRTv/pLeKWwuESpmqqsd8rdm/EV1G/rj1lab0zz5VoX0/+H
+						l8ECAwEAAaNGMEQwIwYDVR0RBBwwGoIYc2NtNi1kNXB2bS13ZWIxLnNjc2wuaW50
+						MB0GA1UdDgQWBBRMXra8qny2NUOSMAON/3BRFvrkNzANBgkqhkiG9w0BAQUFAAOC
+						AQEAFjRqhwmt88P4noKvHM4nBVtIobkwD283MrJ9fD/Fc+tTuqCj5XhIA9tmhzkH
+						wuGP6tByD35/C7feUC9QSycD5+g8c1XuX7DoaBpjarBvlZRBQHeDDMl0Axq/5QaZ
+						KTTx0sAUqueD5Ksn8AOEmSXKagQQxmcD4T9A1+aENL3iORU/yTCIuEbulP/hTWqS
+						/4LfA6JCQzz9vWpeFEOQPxzYQdPtn/imfqK+APgxJ+sOt4VBiWDow3Rc/Jurvr/e
+						3rS8ZogxfmobnOH0s+5b057fVvyufQDC0HKekcn27HKzyGlml/uZVN0dN2ZxsPk9
+						dF0f57p7T8LXtcYychN122+l5A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jamanetwork.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <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="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jamanetwork.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jamanetwork.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jamanetwork.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jamanetwork.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jamanetwork.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: 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
new file mode 100644
index 00000000..5f8317c4
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-ama-staging-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-30T10:37:01Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol 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>
+						MIIC/TCCAeWgAwIBAgIJANoZlIfgssLlMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnNjbWlpc3ZtMDEuc2NtLmludDAeFw0xMjA0MTYxODIwMzVaFw0yMjA0MTQx
+						ODIwMzVaMB0xGzAZBgNVBAMTEnNjbWlpc3ZtMDEuc2NtLmludDCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAM3U7/tX7dHhjPedQT/6pNwQqKry2QwXt1b0
+						ZRHwDZJMB1QkyqW8BG53XbHBNLs5aDsqgcCZsqEak/k4freJsLrqPobG32873cyx
+						X9hJTUcQqESViPQbg8pndzYJej1nksJCpAxtE7iB7AwsT5LBj6sbL9rQvy84PGEf
+						oBT0ilcup3u9mLJ9hGVH2Bc0V4tvo+v2D3grJ8+6NnWyY5wGj57XVyQ4fe/I2sKI
+						zkJo/uZstJsPMXAK6/lGnR2H05WIyT6XD5QllnaiGDHDtLIfrNVRdNSm3hCQpI1k
+						WFqOdGHd8SWHk958A+lrMRCyL5KCxoN3IYZkYCRBid2X37hlBvUCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISc2NtaWlzdm0wMS5zY20uaW50MB0GA1UdDgQWBBQzcrr94k3o
+						3EA5BPJ4j8VkJmJEsTANBgkqhkiG9w0BAQUFAAOCAQEAhOnuDDO6WUhQyOsIXFqz
+						s1582zeYLMYlVs7Bo9hsmNzw0IRmjfxSsXlQG95DTNoqUVW3xLCw33YzqHJ4ZtGy
+						xNlaw7I4jQ9gc/TMSG2o+HtbcuWinlOnTnfWAbTNXIeKwxtlZhlx7JnPzVywXPWq
+						BuLJIbDCN2UlMMp/RmJ2665UQGIFDB5sNCXOmRk04U1ivYv+Eeau6V0WmcpUoWFr
+						wsi2nppBd2FL2kV3efMcD2LtpSIRP4WO8j8iAo8HaszDGrZlSIwEwcMAkDlZIf8p
+						AdXPoY+neLxlZRAvWPzwQx5+yTOvRDGArbDTK+OnqSivC6/OGSrEeHy5BXziuTgm
+						8g==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://amarc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <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="0"/>
+    <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="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://amarc.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 Staging: The American Medical Association</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://amarc.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-bates-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-bates-development-shibboleth.xml
new file mode 100644
index 00000000..72036c3e
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-bates-development-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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>
+						MIIC+jCCAeKgAwIBAgIJAOjfBbdUrprIMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEWJhdGVzLmRldi5zc2MuaW50MB4XDTE1MDEyMTE2MTk0NVoXDTI1MDExODE2
+						MTk0NVowHDEaMBgGA1UEAxMRYmF0ZXMuZGV2LnNzYy5pbnQwggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCtF8B7w3RLPqlpTfPyNw7l8qQYcYzbAEB2r7gY
+						QVcqP+SYFaZteqNeQhFGne7gXy3RJXjtoxmd7IrfegHPyn4oXyMQjg3WS1s63eG+
+						8rRLODdvRzswOncVJwj2toqrDdIIUm5ZrM/NuVIQpbvEMvxYDnWXx4q69qEGRcBI
+						o5rmd52HN1Xp9abdedJ7YMozlB1Hn/ipA+rlj92IK10ArAMh9qGsGW+tFWZhJMtX
+						uqskTE1kuVGq3MW8+6hWMf92y9JPslhavT69waNOxjUWAz+5nFHn8AHvkVLM9rHN
+						NihFourWQyE1dqf4rAZaojFfo2KIc2YeDzjXbuP9ILVsECBpAgMBAAGjPzA9MBwG
+						A1UdEQQVMBOCEWJhdGVzLmRldi5zc2MuaW50MB0GA1UdDgQWBBQ/Loo8ka7f9Tlf
+						+aVNZ7ZxQWUG/zANBgkqhkiG9w0BAQUFAAOCAQEApw44dQEXskBe5wU5SgJv50KW
+						6TwWigGk8NFtD+3qpESjSp1jWRV6bQTqwD9fyrqlhWIkcNfkygkiNGNsU5k/K8Aw
+						JyP6EVjyQrDVNTrWQAXbmV5PFZ2n506S9EbZLEiQLXrb3gCms+U0sR384Kzqt0kp
+						qETpTA41DoR0jrEVp2yysR9mTTeF5NzWf5CN58RVxIe5kv3XzcHp9f/MRkkl2o65
+						+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>
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
new file mode 100644
index 00000000..c12ad61c
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-bates-production-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIDBjCCAe6gAwIBAgIJAOFo9MBRXeFRMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXNjbS1wcm9kd2ViMDEuc2lzLmxhbjAeFw0xNTAyMjYxNjIyMzZaFw0yNTAy
+						MjMxNjIyMzZaMCAxHjAcBgNVBAMTFXNjbS1wcm9kd2ViMDEuc2lzLmxhbjCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL4rrdOYTdOOx3hU6sLw5SuLnoMY
+						Nl7zueILpPdpy/aix1CqJ9evkwFNwy9lST7MbJe5Dj6Llg+jnu4Czp0+FeGUUwFU
+						2osBP9fFBvU+0s7G0ixT6FoKSMak2mq8IF1QHCTa0h9Fxj+dWvGTsr5LwjuGoqAz
+						oPSm5wXFw2Wf/qCVDGrYpuwFrnI9C5tboukUQNLcoVxKUzUc74MKOSQ/yDnw+5gJ
+						d17oTEMXrId/snTfdz2Vt9g8St0nfL003+N45ZrksoZjLKyhAzZFk6nUPuUuqhOU
+						hCYkLhjlouMZass2IUJLY4YHBQ+YRnayoO14rOZ41n0dmKAOx/ji+l03yNkCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVc2NtLXByb2R3ZWIwMS5zaXMubGFuMB0GA1UdDgQW
+						BBT41sXyIBF6ETN3en6hOQZ+sfvkMzANBgkqhkiG9w0BAQUFAAOCAQEAuBRCom7N
+						l2KrRgCABtXj+EEpCAVmn/TU/Y1bNqmZIj7YB23w+YpbDS3o3d9euouHhcLeDRUg
+						L4guMR3sLMlEYzyJPNwuWXwbC/uctW1/djMHJbVh9VHF4Iq0u0WhsadwwMbKM+nH
+						JCLIoF3gnHM/zOyNSl9CiZH44SUjeF/Pi4BTugS7BIaeHNEL6INBheXWE24kDpil
+						d8SAOHfOQsqvYRLlnl61ESpAuh1vRvcG7MOQ9YRsDOLoK7O/wa4QpmHRnvBxk670
+						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>
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
new file mode 100644
index 00000000..f1765fee
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-bates-staging-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIDBjCCAe6gAwIBAgIJAJEOszchqPPKMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXNjbS1zdGFnd2ViMDEuc2lzLmxhbjAeFw0xNDA3MTcxMjUzMzhaFw0yNDA3
+						MTQxMjUzMzhaMCAxHjAcBgNVBAMTFXNjbS1zdGFnd2ViMDEuc2lzLmxhbjCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALN6dR/ZMdAbxkzlk67Oahda5aST
+						0llVu8EQcUpzNqRWUtaX5bYYIIKtccQq/jzujj4ihpwgSTp4fezyrvSfGKFUG5Ie
+						eM2yMRzPkbM6+No4PtURag6ssDZkYakoYYcH0EP11mFIXCCV3yUbn3XYTjoVBWO1
+						gnX5ZvM1FBazwsCZYwnoJWUUTvDK7mMJV+ZNfZ6OkuyZzz7PIslRjJJPl/c5HHXM
+						wAxzRNSRmBVJZNn1Za5ZMv8KmqAABpo+9UZIYz/v7Uo22Esqms/ed5M03AexHVzZ
+						2PPPuIPTJmg8p86OQeqR4PLPHPecuq/hwfEXBVr4I4WSMPo1GLZ2uF6m4sMCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVc2NtLXN0YWd3ZWIwMS5zaXMubGFuMB0GA1UdDgQW
+						BBQdSMpAFrrrHwfXs5oamxoxnP+SrjANBgkqhkiG9w0BAQUFAAOCAQEALcSuxuuq
+						Mh3ICB4AaWvcs4mRNVNfrlooQl7wK5kcLD0+N0CFzVxO5izK9Sx2AS0szW7D2Lta
+						cFGRmEU3mEC1GnztFND9DmQ/QBvFOyUDoGcEIVPC4JEyVYXGO0t0ynRpWhW3c8bs
+						88fi1UlK7YRGcOXmSdeSLJI+do496iE+cmOQMfttvIxIXdkf4Zhv9Dd2SvgZbePF
+						eaNTNKX6oB5hBTwgCxk0UjA7josVG5t2yLFfxkpSgB4D//uUCfootZNHwRPfpwRb
+						h3E7KGIcM/oOwkaJKZECcWbRlksF9S/z2lMjIhdualjgqn1ikhqgzuD1UDoDmJr0
+						DNUB3UqRi78seA==
+					</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:  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-esbates-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-esbates-production-shibboleth.xml
new file mode 100644
index 00000000..a7c5332f
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-esbates-production-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIDBjCCAe6gAwIBAgIJALin0XFwb82yMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXNjbS1wcm9kd2ViMDEuc2lzLmxhbjAeFw0xNTAzMDMxNTQyNDJaFw0yNTAy
+						MjgxNTQyNDJaMCAxHjAcBgNVBAMTFXNjbS1wcm9kd2ViMDEuc2lzLmxhbjCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALsi9y2ljlDuMGn64lhRsO1Q7MYo
+						ppIQ2Mm49zT3/7b9eEW+8DLIdhJocmwturiTb7Z+3LqVhuoRsBtAFq2xb3rh7Tv3
+						xc9jAeig/M3Sf4lEdr51hkQMZ2lfIyQNXEwCejKt8/al3i3CBAedBf/M3GeU53AC
+						lAKWbfs6jHbN2kE2rWbex8YxazX1tJARdbtBx9tujie7W/tOj2iVd5C6eqpsU5Zu
+						PvKKsmUQ8I0jIJa+eF/FSp+cKW8uXWLWx1l2S9HJme4vOBi1XGtLpjSn4VGOsF2p
+						bs5sHMyV5eApcSLVBaqZnHcE9HMoHhsjKLnme6JbJ826rtaCxLRXqr59lF0CAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVc2NtLXByb2R3ZWIwMS5zaXMubGFuMB0GA1UdDgQW
+						BBS2/5NIi4BwDPX6NXCg/cdzKP1RYjANBgkqhkiG9w0BAQUFAAOCAQEAcfRfLZgf
+						sZJ4U3auPGf6GCBzs1QjJUzNgIiL7IZOEHPE1ezvRMbBpxu5iXfuXU8mxFPTDtXE
+						KgRl0qPEZrtW5h/LZd97CcbA71WohAznkjzIAUOCHVBSfOCcstr3HbnCQ3LglCrC
+						YJQNwFhNRu0e2gbapN4xlKap+YS9akyd4i+ODD3Rj5jbxDbqlErDkwII6923Jo+s
+						HeKVBNQD3godVRJn/UlzOYvLfN4l3aS8VpRv1plf9gMPe1TF2ei+1LX1sRspFqqm
+						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>
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
new file mode 100644
index 00000000..79aec2b0
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-spie-development-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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>
+						MIIC9DCCAdygAwIBAgIJALlaiHmGwxxMMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+						BAMTD3Npc3dlYjEuc3NjLmludDAeFw0xMjA2MDUyMTQ2MzZaFw0yMjA2MDMyMTQ2
+						MzZaMBoxGDAWBgNVBAMTD3Npc3dlYjEuc3NjLmludDCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAOf/K/gvKC/u7Ua0cgI1XfMba1Wws8EAmB74uogwn6fd
+						/IoHNj1IYchQ/D8Him3Zn+/ZaqmXiRBs6BrIyvi5Wxcjset63BCM8JSyRK0tyiHu
+						x3d8Y787FKohrJ5KIT7a207fGGTBydEDz79Snp/Mfz334DyOt19/7STPBCAtAtvp
+						Ok4amip2bHfjA9tvQcnrM0hGcYibhEc9Kgxgx62J9rEoRC5sm/B5rvHtccu6lrHZ
+						CcVkK9nByGAA/bRm1B9E0Ds9sFHb4y5/t+wHh/atWOdaxCvQeQdcD9/hqOV6Oe0x
+						AFG/akUrXelKWsmcqcjcHSS2VOlWMUdH6o14Ah6PG1UCAwEAAaM9MDswGgYDVR0R
+						BBMwEYIPc2lzd2ViMS5zc2MuaW50MB0GA1UdDgQWBBT4/+lctR28WS/Ckl3SPVVe
+						JHflNzANBgkqhkiG9w0BAQUFAAOCAQEAK0W7UeTG1w5h97v3Zy+z+Gsx5qIsmY9I
+						ETvlGWIGaOmYx4O/ufFqU1dnqdbBb44Jm8l1N4YZdyo3iMxyD1SryH9tcr8V7PJj
+						Z1VVGS7Gg6Rp6mpEtubGukx1mRzL6GqUelMiG+MxxBLKhJv3Io5/ll6ooMi6VDzV
+						apjaONZvyrwnWfLcGurjHKeBE04zZEQQ1fOxpvLgcQS1XCw1KqqPAYvfNQnbr782
+						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>
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
new file mode 100644
index 00000000..76123d1f
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-spie-production-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-20T07:40: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>
+      <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>
+						MIIDDzCCAfegAwIBAgIJALDmz160GZUgMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmludDAeFw0xMjA3MTkxNzIyMjRaFw0y
+						MjA3MTcxNzIyMjRaMCMxITAfBgNVBAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmlu
+						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKy1suWo6bSOBOft6isd
+						NMjOmCiY/er3+zb7H4DEC71X76DUTN+BNYbPCvYzcgncAoFIMftH3OL1+2ku1zpX
+						+eHXPAmPX85cMIsnQG0mRFF67+Aieg/dSXPUg7H/4gV/qanlUX238A96pS/zf/aT
+						DKq/HB6wvb4UDB6874ZHkhlzsBmF6giQh3DsiyvQaMbw41oAIR/GReDZnu1yx7+u
+						UPzAwpLnqY/lrAnl1vyGmoxjNbwNnxCo6WjusiEtoQcd7Ted+oHjvi910FQI+7kI
+						b4Cj8Iqb5uZ0iQ60mzOuBTzMJgb+OYuQINPO8719Q/8Nf7YTgm5jCw0y4EZe4Otu
+						wmUCAwEAAaNGMEQwIwYDVR0RBBwwGoIYc2NtNi1kNXB2bS13ZWIxLnNjc2wuaW50
+						MB0GA1UdDgQWBBRDU2Ew8E7Xwa6XxKtPysNZNS59vDANBgkqhkiG9w0BAQUFAAOC
+						AQEAc91ruViikIw39jO3H0vYGk87IHE7x1F0ymeRlHJ/NsJ3oVIFrNFbwEy5CaIg
+						sS/0L+UwyBT/bW9r7XsYNHGaip3ONHH3bd05L4mxoBplKHJK9yhrw0Y0RHwPqfTr
+						VUJmsexW3CSDAShJ6SWydIqF2GfUGYz5WH6FH7Nsa9GwctxRGIn8/kDz0CpbsD8F
+						KRlv5RUWyPVOZr2sFhHsooERzhY6eRrj5wttWe/RKOiHYyC9zWDLrNktYF1MC/vz
+						MMW8uxvLMg0NdQGLtSclrrUCUf5qcoRvdAxkdoCxbJgrqNSI9xOnOmdQgwfDwQbu
+						4lzH+AGLbg18D+2I28Y7IdPrUg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spiedigitallibrary.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <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="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spiedigitallibrary.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: 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
new file mode 100644
index 00000000..ea9576d1
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-spie-qa-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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>
+      <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>
+						MIIDODCCAiCgAwIBAgIJAPnMLU76c53nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnNwaWVxYS5zaWx2ZXJjaGFpci5jb20wHhcNMTIwOTEwMTQ1ODM1WhcNMTcw
+						OTA5MTQ1ODM1WjAhMR8wHQYDVQQDExZzcGllcWEuc2lsdmVyY2hhaXIuY29tMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7QX2LidgKfknNSjQia/3NvVn
+						6COQ6GbaFb82GLhSJi6Zn76eUWEHLUXgZdh9eS+fQf0MN13huynlRLPbEpYdfVgF
+						6ps4s5y2NO++bu4MoirWV6HntJkvz1ry2gwG4VyqjSB2Rr+TYWpkgX6GVnGbImN2
+						T9z0tmDJk5tQzEJ14XcnTLuFJ4jnUY/JkbV3DVrFntXOClHc380dqepxZsdgfzXT
+						kq/jjPqG2i7ZSMNyO3U4Wp6tmgUOI8guNCch9nv7rJNGiYu8DEJwtaqh2LU2jvs0
+						vcMcxipge92/Ajdfhy60OGILioG8XF2VQuN95rp1oN6aur9WYXoGaKSDXIjgFQID
+						AQABo3MwcTBQBgNVHREESTBHghZzcGllcWEuc2lsdmVyY2hhaXIuY29thi1odHRw
+						czovL3NwLnNpbHZlcmNoYWlyLmNvbS9zcGllL3FhL3NoaWJib2xldGgwHQYDVR0O
+						BBYEFL6vSPSwRDKzRRCbhywrPQV0l2ZSMA0GCSqGSIb3DQEBBQUAA4IBAQCEfLqE
+						NvfbmbsSA8p71lWhtwqkOmZE2/oFxpAkTiXg7/PL9NlUCEWFMFu7GDQhu0MbSula
+						J1/NRV5btTBiaKOtiP63CfTsdeAKO9GnM1NFWEsb8Tv+QMJ/nkLcQ+rs/VzcqWAB
+						w0ztlvSh4toPIIyByTmn1/PGfUxXvcvLkJ5669f+ke9QD3xphlFH7GsdieKwLsr/
+						7scsYi/3Q+D+BCb00zz3lKyTCiMfOLsLMoRwyGXIi1F3Yt1qLqtrfMbzAq7O/2Pp
+						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>
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
new file mode 100644
index 00000000..489457b1
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-spie-staging-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-19T09:42:09Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol 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>
+						MIIC/TCCAeWgAwIBAgIJAOnrzsBkjESQMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnNjbWlpc3ZtMDEuc2NtLmludDAeFw0xMjA3MTgyMDA5MTRaFw0yMjA3MTYy
+						MDA5MTRaMB0xGzAZBgNVBAMTEnNjbWlpc3ZtMDEuc2NtLmludDCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAJSH3qtAZ6isNHLz991pKenoOuRqk7GLjGx2
+						I9nlEZeCro0IYoPRiyJT+EVO4Ors5iQjZd5ziFQWo88f2q95uRQoHMf0l6lsMLW4
+						9vdBz7c68IqUCY1k5VqutiDm9zhlTwD4CxmcnNungT04+BC+5V1vDMTY1Jl5RzOr
+						IlLJnilsW89CO1q5V8CqpKsLxK+9YFpa0d98ohRR98uqrLP1ddR4WDZeOYkb0Pxj
+						fvnVcUSEvKYS97z4blUjZlVu38hwu7YQsE4PJwJwtEQh1RoPhkg2Koxb7vef10k+
+						DdLp6/imsIipu8AMG7H+asnpgrII1tGyVVTpXc4iusNUiSKXtt8CAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISc2NtaWlzdm0wMS5zY20uaW50MB0GA1UdDgQWBBTaiM7RSkz2
+						jnM20tdprLWXixBWRTANBgkqhkiG9w0BAQUFAAOCAQEAIApf6ONeexe1hnHZ6EkQ
+						TjeRor026m2md5s3dTYtJrPp4Zilw12i7unf0L8JurJYsWFKj7RqS/mDqY0ASfhb
+						OYMO7IWb8XqHOFPPqIFWADQ/IPxJc3wSvR4Hmv54qT/mFdKBJYlzUGJDWoDifav6
+						THzrHDBcjCfLersDQVqizcuUtXAkv+mPCd9OCchUSP2LUOrH9att1oYikURgy705
+						wsE2XuGViUORAlKmv4f6V06gQ4PzqCAhJKLt7it9SXtBAWzuKrDW55PYDlQATRkr
+						ezZsX2LXTdz90NwA70GxTxB3shHO636WXcaOxymF4L732J32EQGrAgjRvole0atI
+						+Q==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spierc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <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="0"/>
+    <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="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spierc.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 Staging: International Society for Optics and Photonics (SPIE)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://spierc.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-wk-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-wk-development-shibboleth.xml
new file mode 100644
index 00000000..4c423d87
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-wk-development-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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>
+						MIIDSDCCAjCgAwIBAgIJAM4mt4HjZTAdMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGWhlYWx0aGxpYnJhcnkuZGV2LnNzYy5pbnQwHhcNMTQwNTA4MjA1NjM0WhcN
+						MTkwNTA3MjA1NjM0WjAkMSIwIAYDVQQDExloZWFsdGhsaWJyYXJ5LmRldi5zc2Mu
+						aW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnH2SvahuxzYrG2vg
+						YlVQRtgofqTbunyCsaZPZaTAh4/jZBL/vTzXJmNzS+E6w4H9+TJSjh4aqJrKJ/PZ
+						g39AAYwcFzAmUHn1FJVuG95LXmzMLYDCNlm8eJg9b+KZRUOQHauH9bmUZJGUYfby
+						QqxDJ20tw4RcnixvH+LO2IvIgh8GObI5kTjuwHrC3JkdYTgd8FKRHVC1MfsQItRh
+						bejY9cvU6sG27psysGDdxWlbS1NGfCE5zEQoKtCJJEJc7lcg+8tiuH4WvQ3NQY2C
+						D4y8p99ymSF2TJFFUlwVePNRNhESod6v/xKxN31xafJKlRg/ij4/WF6Krxow9Oig
+						vKGS8QIDAQABo30wezBaBgNVHREEUzBRghloZWFsdGhsaWJyYXJ5LmRldi5zc2Mu
+						aW50hjRodHRwczovL3NwLnNpbHZlcmNoYWlyLmNvbS93ay9kZXZlbG9wbWVudC9z
+						aGliYm9sZXRoMB0GA1UdDgQWBBRJ/uKkXqFZ+BTyqIUHrwtgEX7rhDANBgkqhkiG
+						9w0BAQUFAAOCAQEARvDVj3Ruyhy4E+dA87E98wayBUA/AryDbRSRlUsev4Jv2Ke0
+						u5rd11kOlH1XdKy6u+PG2x40OfBMAsOwVySBuEAXaQtQuWaudunqd6VWZWWT408L
+						23yBKeIGxdF3U0JRScDofsw42DYmunAVo9+s+DxG7tlUZH8KCUP0Gdl9MhybBeJ8
+						/DSTUyulPtQt0FMtAkI40yL4fBYO5tyeA2vI/KLlGZ2QtZL/9JHaMS2fXyfmfZOP
+						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>
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
new file mode 100644
index 00000000..a92b42d4
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-wk-production-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIDBjCCAe6gAwIBAgIJALWFGogVxAS2MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXNjbS1wcm9kd2ViMDguc2lzLmxhbjAeFw0xNDA1MTkyMDUwMzdaFw0yNDA1
+						MTYyMDUwMzdaMCAxHjAcBgNVBAMTFXNjbS1wcm9kd2ViMDguc2lzLmxhbjCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhlZv6BETquXyvEmf8oSffyC5pz
+						icdjsRznZHl1qBOlAjS5Eg9IktDIyzleBfFEEcduI/DhQ3WOg3qmCuhbAJnSEgps
+						lTRZAj5k7C9DHL4X3bAt6Hi4IS8D2R2N7INaXpQK5aLR/DuB5FglpEQMWcnTzUvC
+						FCA1jv48KvlsXL93dc7Q8ULDG7IWOSdEJyy02jP/TU6ZN8hRIq4WSuyC48JieodB
+						5aFxvr6pOHncTLb92wUyD7ER9fRJmDBQ2unCVwmJrwRfIjxFoZX8T0xZzhoJRguP
+						UWQdJ5oJ3gARrZ/ZCW+i4OLRPpWEDoeAAK2UkanEto6diwYGkRXUr1O1MS8CAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVc2NtLXByb2R3ZWIwOC5zaXMubGFuMB0GA1UdDgQW
+						BBRQrPatpd/nNs6l0KDSrXJADjhFijANBgkqhkiG9w0BAQUFAAOCAQEAjqPAWnJG
+						CAqkQzV0QtDiDvJ3CHRQrb4QyVWnIMw8ZY5SJL9VWRJjBoegrIhY+u0hMDtsjveH
+						GeR5mPej7fQ8kQL4IqvdNsulj/Du6RB1Z1oOXS7XKF1O+pK/sr3AJji9lxh4O6ir
+						FZd5eLT/2O9yYABsfsW2DQDTRW/vovQ++jOTlWLOW+UGdkMGtFemlZ8R+PBsq5AA
+						D8Sokc2SljU6av3gfZwm1dHxIru0BA5hR+iwsN48QV6SGyMeLF1gqgcxa3GUjl40
+						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>
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
new file mode 100644
index 00000000..8b6dcece
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.silverchair.com-wk-staging-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+    <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>
+      <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>
+						MIIDBjCCAe6gAwIBAgIJAMevnR9kOORGMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXNjbS1zdGFnd2ViMDEuc2lzLmxhbjAeFw0xNDA1MTUxNzIwMjlaFw0yNDA1
+						MTIxNzIwMjlaMCAxHjAcBgNVBAMTFXNjbS1zdGFnd2ViMDEuc2lzLmxhbjCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPiwocVjrwzmPn0Cr4uChpY4RvIx
+						zz62Gh9dnF1/zua5d/gY2anhrElnCO5F6Jj+BhsDJYRNy+9haPKwC2RHMoGAfr3s
+						g3QxrXbXXZY08uZEBvxUYFRSCUtm+ngTl9GKiKSUKWGYyqxvoHuuauD/floFBO7q
+						6FJSHDi9JFHIG/7YLH1/ZEOa5I8gLjcSbk43Qn63/cOS6quSmxwAnN5vA2PD3Sq1
+						SmpJIcPn74iJq3mGs85x2fL2d1/+Qupnfg2RHrbbK4fWzWLYcHdHsOzbRqD9Snas
+						eyeHP7IUv7ZxAjpE4k4a6kcTz5Kr187pn9rWxvdD0og5jVLRja3jrrpeBF8CAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVc2NtLXN0YWd3ZWIwMS5zaXMubGFuMB0GA1UdDgQW
+						BBQSJAWZcP3bfORLZjWD5rEHlvAhmjANBgkqhkiG9w0BAQUFAAOCAQEAgb9W4Xhd
+						izqTKzFBzcEZOTtjzz5duTCIawQ7X8Fr2VLasq0CK32UexZ0J+6jtC1GzDwoRm8K
+						tTMgz/xkuOuO+2E3G21k7AjJXl1jLjkZJNf3c+6VNIEy07eoKC4db0b4Bu8puKpF
+						Tzzzfb+2YjNzT2VZIfLnr3G8ppZ/Ddz47lVLQhviNsbG6tNiAjqVmydXsPuBPGxn
+						JGxTGSwV8LI6E66sW7TqW08bJvBKzi9DVhStoijGFn5hNY8FjwuCp6HzJEGqq+8K
+						WnSLVcYQzC8qg3VspdG8bvvSCcdXs2bYtwpXmayRq43XbYPGGBQf/DSuCfKUHkuQ
+						h8TawBIeAal8WA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <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="0"/>
+    <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="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://healthlibraryrc.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 Staging:  Wolters Kluwer Health Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://healthlibraryrc.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>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.studentsponge.com-shibboleth.xml b/swamid-interfederations-2.0/sp.studentsponge.com-shibboleth.xml
new file mode 100644
index 00000000..580668f3
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.studentsponge.com-shibboleth.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIDAzCCAeugAwIBAgIJALYqZP4B0mCPMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFHNwLnN0dWRlbnRzcG9uZ2UuY29tMB4XDTEzMDkyMDE5MTAwM1oXDTIzMDkx
+						ODE5MTAwM1owHzEdMBsGA1UEAxMUc3Auc3R1ZGVudHNwb25nZS5jb20wggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnGQZZo7AIdk66OMGPdbZ1fS5zgraJ
+						g1hN8bgJ4MoxCYHIj/CDMmYwA+ytanSfMs6U3fkTLQ+dhDKFQGqu7qafQTW01lCU
+						hPVZ8MdzgPM3tRqpMzl9/HyuJlJNgNUkqmbPT9Mwn2XezlFvt/gH/yOQBrrcQCNh
+						ZlByu4ye36m4zJu5KmBuFEmmgSQakFJopq5kNLz8q/t1j+IIfqbPdtHXvS757d58
+						aoZYQv8TWQJPxgH7b8T/FjUM+PSqhcuxpSrFHsrP7ymjdeRjDYy9Ne1dRUHOYdFt
+						WIXv79vIbigTD3r8451IqONlJEKepFK8tmWqzlZP/hscCPXkGZ3o4D1LAgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFHNwLnN0dWRlbnRzcG9uZ2UuY29tMB0GA1UdDgQWBBSq
+						5sq3KKEycHAzxzWF06kVNHhIUjANBgkqhkiG9w0BAQUFAAOCAQEAMoV5GJ+pOTmU
+						zI61k8AjKNU0rQtbZ1SPKxdy538McHq21MbcuR/aLS62itcbNz+3DQtzx3inrx8N
+						dT5H+hSbt0PRw3X3vmsqWPWzQJhp/XI3BYk+ydRvM2GtZrRH81sx6pJoXnAV7RwM
+						bIta8D3rYLx2ZTs+/GGrArLS48WmH338EW9Ind+RuBhfAC6xcoApTaF+VPSefQZ/
+						Q+PaTVlRgeskhX2LpBiTyJ36xqZyHPbhsBSUAZbSWytqN9wsEPWRPkjvMzlpziLG
+						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>
diff --git a/swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml b/swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml
new file mode 100644
index 00000000..cd9a8634
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml
@@ -0,0 +1,115 @@
+<?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" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <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>
+      <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
+BAMTDHNwLnN3YW1pZC5zZTAeFw0wOTA2MTYxMTA3NTRaFw0xOTA2MTQxMTA3NTRa
+MBcxFTATBgNVBAMTDHNwLnN3YW1pZC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAOVNkKXqQZrXXNCk7nE7JTsqyjuwbshkafxDCI7XN6HSaRcnR+OY
+swVYkSvGXfMr4XQLzAGyIOfYDcHwOqZina11Zf8sOdD5t6mygGKza+LzbGZN9d4y
+SosskTH1NiCVBCTdJVpfwU2+K87DKrT9xtuRf7TMDDKA3gjPtN+/IxT6hw2+oZZi
+UgQgJoGN68WO9C4c/WMfcFf7hgC7fSt4fji9MFNpJoOw9MsuaRgYEVkCaHubLj46
+Ya3NbyY48zzAuc4ix8hoLJ9dP+nUCyGKtkY81HprKGtuiu8kYSo+pC20nv1Qr8xP
+FhSU14YvXPUIVOGfX9zsGVLOQKpkb4Z4AkUCAwEAAaNbMFkwOAYDVR0RBDEwL4IM
+c3Auc3dhbWlkLnNlhh9odHRwczovL3NwLnN3YW1pZC5zZS9zaGliYm9sZXRoMB0G
+A1UdDgQWBBTpV1dUBMfW7y2/Rjo17VSql2/AijANBgkqhkiG9w0BAQUFAAOCAQEA
+SsYAA5tq6JjKqI5u2gvZfhM5S6ZKgrvciayGoezdTI6FfvpS3kWtCTZlu+CGDYIW
+VBpMtgQ84HpTrGbr3X1w25mspK+hsXi3K7SKqdfMdc0JynwNPrlL4GgmTuR/fgoo
+tuE0Wnbi7xdxpQ1qd0SFzw4gFWp1wC1+FsGtB9HLksSskgnNxniG9Z9+9WxgU6hD
+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
+BAMTDHNwLnN3YW1pZC5zZTAeFw0wOTA2MTYxMTA3NTRaFw0xOTA2MTQxMTA3NTRa
+MBcxFTATBgNVBAMTDHNwLnN3YW1pZC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAOVNkKXqQZrXXNCk7nE7JTsqyjuwbshkafxDCI7XN6HSaRcnR+OY
+swVYkSvGXfMr4XQLzAGyIOfYDcHwOqZina11Zf8sOdD5t6mygGKza+LzbGZN9d4y
+SosskTH1NiCVBCTdJVpfwU2+K87DKrT9xtuRf7TMDDKA3gjPtN+/IxT6hw2+oZZi
+UgQgJoGN68WO9C4c/WMfcFf7hgC7fSt4fji9MFNpJoOw9MsuaRgYEVkCaHubLj46
+Ya3NbyY48zzAuc4ix8hoLJ9dP+nUCyGKtkY81HprKGtuiu8kYSo+pC20nv1Qr8xP
+FhSU14YvXPUIVOGfX9zsGVLOQKpkb4Z4AkUCAwEAAaNbMFkwOAYDVR0RBDEwL4IM
+c3Auc3dhbWlkLnNlhh9odHRwczovL3NwLnN3YW1pZC5zZS9zaGliYm9sZXRoMB0G
+A1UdDgQWBBTpV1dUBMfW7y2/Rjo17VSql2/AijANBgkqhkiG9w0BAQUFAAOCAQEA
+SsYAA5tq6JjKqI5u2gvZfhM5S6ZKgrvciayGoezdTI6FfvpS3kWtCTZlu+CGDYIW
+VBpMtgQ84HpTrGbr3X1w25mspK+hsXi3K7SKqdfMdc0JynwNPrlL4GgmTuR/fgoo
+tuE0Wnbi7xdxpQ1qd0SFzw4gFWp1wC1+FsGtB9HLksSskgnNxniG9Z9+9WxgU6hD
+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 Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid: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">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.textgridlab.org-shibboleth.xml b/swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml
new file mode 100644
index 00000000..285a7b7c
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml
@@ -0,0 +1,163 @@
+<?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: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>
+      <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
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xMjAxMjAxNDUwMTJaFw0xNzAxMTgx
+NDUwMTJaMIHWMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMT4wPAYDVQQLEzVOaWVkZXJzYWVjaHNpc2NoZSBT
+dGFhdHMtIHVuZCBVbml2ZXJzaXRhZXRzYmlibGlvdGhlazERMA8GA1UECxMIVGV4
+dEdyaWQxGDAWBgNVBAMTD3RleHRncmlkbGFiLm9yZzCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANDyVAH2OTXsKccRpix/jGx2GRR2YH2Od8IAD/wf36Ep
+ypnqUN7iOCEUh9lB7SMAn/CQjwZ+zFWz+W/HjvlAlFSVZvMVlOF4qh5xiNaCF/bz
+ttSnoXoY0r8VxIooSLi7d+uDRcg44Ck+JpIaJcEh+2JJDLa12bsDbzS0/d1bgKLr
+FLPKKzo+XJjwYe6U0PtqDvuZCfXr1VFw6P2GckFRYd/xfuxWjhRvyRxTD2fmUkXV
+WhmgEhzf3cwxnHqQoUdlxS7iCPcaMrNeSBJMkxneOuYk/H2q0uA6Y+zWNdh6ss0R
+I1avpYOozbaMmY/aD7Avnyp6eby6NYUCPNMPpRPIRbcCAwEAAaOCAhUwggIRMAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
+BQcDATAdBgNVHQ4EFgQUsQ1Bhym48J36cebaA4fsHlU8etcwHwYDVR0jBBgwFoAU
+Hb1zzG3ubhx0cNmjGzq6qCfevOswWwYDVR0RBFQwUoIPdGV4dGdyaWRsYWIub3Jn
+ghN3d3cudGV4dGdyaWRsYWIub3JngRBpbmZvQHRleHRncmlkLmRlgRhjYUBzdWIu
+dW5pLWdvZXR0aW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNy
+bDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQUFAAOCAQEANgN+eFxmXlaksI2MQH046IM6azOS11ves9ITaOqh
+GH7vac+bgGRDfpgRnZn7FIZ9NIC0S6iXjsMcRZu1ObAwmJWAs1RHJidfC3+c1yY2
++C1Ts0VeFvQiM9fYYIAUpmhl1Ia/vDiRcdwuHyUtte1tq2QN67gSuOKVOj9GtDJk
+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
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xMjAxMjAxNDUwMTJaFw0xNzAxMTgx
+NDUwMTJaMIHWMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMT4wPAYDVQQLEzVOaWVkZXJzYWVjaHNpc2NoZSBT
+dGFhdHMtIHVuZCBVbml2ZXJzaXRhZXRzYmlibGlvdGhlazERMA8GA1UECxMIVGV4
+dEdyaWQxGDAWBgNVBAMTD3RleHRncmlkbGFiLm9yZzCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANDyVAH2OTXsKccRpix/jGx2GRR2YH2Od8IAD/wf36Ep
+ypnqUN7iOCEUh9lB7SMAn/CQjwZ+zFWz+W/HjvlAlFSVZvMVlOF4qh5xiNaCF/bz
+ttSnoXoY0r8VxIooSLi7d+uDRcg44Ck+JpIaJcEh+2JJDLa12bsDbzS0/d1bgKLr
+FLPKKzo+XJjwYe6U0PtqDvuZCfXr1VFw6P2GckFRYd/xfuxWjhRvyRxTD2fmUkXV
+WhmgEhzf3cwxnHqQoUdlxS7iCPcaMrNeSBJMkxneOuYk/H2q0uA6Y+zWNdh6ss0R
+I1avpYOozbaMmY/aD7Avnyp6eby6NYUCPNMPpRPIRbcCAwEAAaOCAhUwggIRMAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
+BQcDATAdBgNVHQ4EFgQUsQ1Bhym48J36cebaA4fsHlU8etcwHwYDVR0jBBgwFoAU
+Hb1zzG3ubhx0cNmjGzq6qCfevOswWwYDVR0RBFQwUoIPdGV4dGdyaWRsYWIub3Jn
+ghN3d3cudGV4dGdyaWRsYWIub3JngRBpbmZvQHRleHRncmlkLmRlgRhjYUBzdWIu
+dW5pLWdvZXR0aW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNy
+bDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQUFAAOCAQEANgN+eFxmXlaksI2MQH046IM6azOS11ves9ITaOqh
+GH7vac+bgGRDfpgRnZn7FIZ9NIC0S6iXjsMcRZu1ObAwmJWAs1RHJidfC3+c1yY2
++C1Ts0VeFvQiM9fYYIAUpmhl1Ia/vDiRcdwuHyUtte1tq2QN67gSuOKVOj9GtDJk
+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>
diff --git a/swamid-interfederations-2.0/sp.thestudentroom.com-entity.xml b/swamid-interfederations-2.0/sp.thestudentroom.com-entity.xml
new file mode 100644
index 00000000..8b70cdda
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.thestudentroom.com-entity.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIDBjCCAe6gAwIBAgIJAOQNyj4JRfiuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXNwLnRoZXN0dWRlbnRyb29tLmNvbTAeFw0xNTAxMjIxMTAyNTVaFw0yNTAx
+						MTkxMTAyNTVaMCAxHjAcBgNVBAMTFXNwLnRoZXN0dWRlbnRyb29tLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMKvl0LQot8N6i1fvhRTGjv127ap
+						IxWDJn+/vnCv7G/+UuSVJZWAUSrJB+ialjNWSTq8aV6cChi4ZbXrbvjALd7pxAop
+						jhyZbU2QKO3IfJs19f+23TP4W3kK8jw8gH9qY9jbLUQR/nG3HoM5nlgIRUd0+fX0
+						JiDxKq8Z3J62cE+f7eU9C+9RFq3BFju8sXK52aFyXAOMmzvSNQtNiERL2L8ep4jD
+						f7Y18pKfo+mMk7tNMcJbIFzGIPHqiY1aXIlWYLNAYJY5ifcVlK5bO9kGoZHF8/wC
+						DE3FWC3DEEI8GdGHyE/51wavQQAlQGPrJOkrHCASfuh4qrYLqVFo9SBJWj0CAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVc3AudGhlc3R1ZGVudHJvb20uY29tMB0GA1UdDgQW
+						BBRscE3ncwoF76gsgBUgGIIWI7qplTANBgkqhkiG9w0BAQUFAAOCAQEAqekMouVr
+						qGq+W0OljWwinzdXO78phag5LIwKDbVzRJYpgzpscoJhHMm8BMrAA4Qkp5e0s3Qu
+						WqXkHU/Io8rfU5Gq1cYWQMD4qY0Os6lsN0J51SgAAUhNzyYGn+4AXbZWsh2/CYYd
+						ScNd/jebhXMIBEcScQVGPIa8VQcdwX01SzwbgQR0tA6/Q2a+xvnsqcCnEkgSZFGk
+						enIxKHgvQxOdL9lDDqJgsT5xmbqv7TLrwbpPHFnQwdRV5R7U3wUHmzzljbAEF8B5
+						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>
diff --git a/swamid-interfederations-2.0/sp.tshhosting.com-shibboleth.xml b/swamid-interfederations-2.0/sp.tshhosting.com-shibboleth.xml
new file mode 100644
index 00000000..b4f58ca1
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.tshhosting.com-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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>
+      <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>
+						MIIF7jCCBNagAwIBAgIQH5TpeUp+Ukx0gMOWeqLCZDANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwNjIy
+						MDAwMDAwWhcNMTYwNzExMjM1OTU5WjCB2jELMAkGA1UEBhMCVVMxFDASBgNVBAgT
+						C0Nvbm5lY3RpY3V0MRMwEQYDVQQHFApFYXN0IEhhdmVuMTAwLgYDVQQKFCdUaG9t
+						c29uIFJldXRlcnMgKFRheCAmIEFjY291bnRpbmcpIEluYy4xGzAZBgNVBAsUElRo
+						b21zb24gU2NpZW50aWZpYzEzMDEGA1UECxQqVGVybXMgb2YgdXNlIGF0IHd3dy52
+						ZXJpc2lnbi5jb20vcnBhIChjKTA1MRwwGgYDVQQDFBNzaGliLnRzaGhvc3Rpbmcu
+						Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyW3478pCuAxKLWVx
+						n6RDCOsnRHN4GP9Z10GWhuE9CTCe+Z95sfeMhwwbpYgclX0ygYv8ZTsDqfu6Ln78
+						RDg/5G4H6ceA0dgiE7FT3yWCR/puIb8kWYgaq5XD5jq+e0cCWWeLhkL836D8LDuI
+						OwKXvbbzaRql38RxJj59lg/XARc7j6UdMUPcKcJrkSeuMrn6gw626x4yL01R5uEc
+						5s+VuwodLo1hTiRsewCOyfX0N7Fv16j8bxEecZtTfGOSL5FoxcjXjAf3JQcFoKr7
+						76IY5ImPxNnS1vwfx84tWN0m/481ho/Q9rH15jChF/QXvIENCu/LUfURO0UajjHs
+						yGADdQIDAQABo4IB0TCCAc0wCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwRQYDVR0f
+						BD4wPDA6oDigNoY0aHR0cDovL1NWUlNlY3VyZS1HMy1jcmwudmVyaXNpZ24uY29t
+						L1NWUlNlY3VyZUczLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYI
+						KwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwHQYDVR0lBBYw
+						FAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFA1EXBZTRMGCfh0gqyX0
+						AWPYvnmlMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3Au
+						dmVyaXNpZ24uY29tMEAGCCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJlLUczLWFp
+						YS52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY2VyMG4GCCsGAQUFBwEMBGIwYKFe
+						oFwwWjBYMFYWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4myms
+						SweLIQUYMCYWJGh0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjAN
+						BgkqhkiG9w0BAQUFAAOCAQEAJ+ckyvFj6ePTWp6PMkHSonNavE43FfEIw0cRoKWv
+						SgEwHPLRVpvS+iOwTzeTjy3Srph58ZbZugvjjp3Bc1vdbwcmUEsXGm2MN+M6tYK0
+						qIIvS9hGIKClhzKR43BEybO2BttESL2Bv2UUJcVH0Ds3//6pcUyaHuIxbnKbezfn
+						j5ijhM3Bth829thSjIr9zYbqKdYl2sBFhzBQe5oPdCNEger4Nn8SqbrMMbP4IhIX
+						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.isiknowledge.com/?auth=Shibboleth" index="1"/>
+    <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.isiknowledge.com/?auth=Shibboleth" index="3"/>
+    <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="6"/>
+  </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
new file mode 100644
index 00000000..dd32e8a6
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.uk-plc.net-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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>
+						MIIC7jCCAdagAwIBAgIJAIV70zuQ2vBVMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXNwLnVrLXBsYy5uZXQwHhcNMTEwMTE3MTEwNDU5WhcNMjEwMTE0MTEwNDU5
+						WjAYMRYwFAYDVQQDEw1zcC51ay1wbGMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAm69+UMm20EyOMmETcniHi59ED3GW+f1B+qNgCQZpP+PRNnLA
+						Z0+lLrrBrAb1oDjUqt3ya45AUVcHxDuEtpQnbIsvSvQztQr/J7Il9rBAHa7MKQVl
+						6vWt8VQA8njt/Zy3Zwed6CvbPyB6jBe6KrrHdqfdXBXqxXt5KbcNb4nTKUIe081p
+						wMkNThERBLbFg48FDsSytT2D+ERsz4Ivg8fW6kTEl7Fvx35lK4rBUQjIBcsWNuFN
+						hTy29mfVAZOWq0TnrzE84uYioNf5LrZiZSdmPFDarqyl9/T2Lo7OeG+8ZGxpOe8f
+						BRVhqpY/xHev7S1hdHTn8f+fM59PiWA8IUN+xwIDAQABozswOTAYBgNVHREEETAP
+						gg1zcC51ay1wbGMubmV0MB0GA1UdDgQWBBQm+W+pJIIr4Gh6H9Hl7CXWBYnjYTAN
+						BgkqhkiG9w0BAQUFAAOCAQEAhN9iAGeAhzrOkYr5wRWcZmJTaD1XCMZsgfB2sF/Z
+						+Xu8dlJ2wHw+xubq2PU7aYZRGb3QblGODdowyDzV1/hQ43/psakSBmm14VDqKu7M
+						/+ZvM5hCUoGfTgXRaUXPVhDbNLJyoFewg9IEYS1UXQo6GuXoFqOf602Bd9SWpfgM
+						WrjGCgrkN7arw85MqyiWoP5lEH9NMw3yyrYqEjV5L15ciszslzRCLsMF2viSpJDH
+						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>
+						MIIC7jCCAdagAwIBAgIJAIV70zuQ2vBVMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXNwLnVrLXBsYy5uZXQwHhcNMTEwMTE3MTEwNDU5WhcNMjEwMTE0MTEwNDU5
+						WjAYMRYwFAYDVQQDEw1zcC51ay1wbGMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAm69+UMm20EyOMmETcniHi59ED3GW+f1B+qNgCQZpP+PRNnLA
+						Z0+lLrrBrAb1oDjUqt3ya45AUVcHxDuEtpQnbIsvSvQztQr/J7Il9rBAHa7MKQVl
+						6vWt8VQA8njt/Zy3Zwed6CvbPyB6jBe6KrrHdqfdXBXqxXt5KbcNb4nTKUIe081p
+						wMkNThERBLbFg48FDsSytT2D+ERsz4Ivg8fW6kTEl7Fvx35lK4rBUQjIBcsWNuFN
+						hTy29mfVAZOWq0TnrzE84uYioNf5LrZiZSdmPFDarqyl9/T2Lo7OeG+8ZGxpOe8f
+						BRVhqpY/xHev7S1hdHTn8f+fM59PiWA8IUN+xwIDAQABozswOTAYBgNVHREEETAP
+						gg1zcC51ay1wbGMubmV0MB0GA1UdDgQWBBQm+W+pJIIr4Gh6H9Hl7CXWBYnjYTAN
+						BgkqhkiG9w0BAQUFAAOCAQEAhN9iAGeAhzrOkYr5wRWcZmJTaD1XCMZsgfB2sF/Z
+						+Xu8dlJ2wHw+xubq2PU7aYZRGb3QblGODdowyDzV1/hQ43/psakSBmm14VDqKu7M
+						/+ZvM5hCUoGfTgXRaUXPVhDbNLJyoFewg9IEYS1UXQo6GuXoFqOf602Bd9SWpfgM
+						WrjGCgrkN7arw85MqyiWoP5lEH9NMw3yyrYqEjV5L15ciszslzRCLsMF2viSpJDH
+						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>
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
new file mode 100644
index 00000000..6ccf0396
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.upv.es-saml-module.php-saml-sp-metadata.php-upv-sp-saml.xml
@@ -0,0 +1,42 @@
+<?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>
diff --git a/swamid-interfederations-2.0/sp.vivomiles.com-shibboleth.xml b/swamid-interfederations-2.0/sp.vivomiles.com-shibboleth.xml
new file mode 100644
index 00000000..54218ace
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.vivomiles.com-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN66lpSg173QMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHNwLnZpdm9taWxlcy5jb20wHhcNMTEwNDA1MTMzMTU5WhcNMjEwNDAyMTMz
+						MTU5WjAbMRkwFwYDVQQDExBzcC52aXZvbWlsZXMuY29tMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAzARjQBBuE87LSlNd6570gHLigYhVXr46123MR5ln
+						/VOeFHcnof6+To7Ztlh81cM4BoR9tf5j7UxzSFW5iepICzDDzSmT4IyoBvDwZwCT
+						nEw5RuYdlLDK26PVad6EhSMAm9JTmICCtO1VqfeslKCk5/MS2aq+I2W9aypnNNrC
+						3q8tg3fzmnXaBYBhJ3ToUszK/y/fu2cpzZZA6NaJjnmDe0GvJiqP2O3Ylx46QABv
+						8tU/Pur11+htjB4JVDS/SaiXtRP07E6db2EBYUbvYiG5hQZal+J+XBHyRIyHP5AP
+						RKdb9CGo9JKB+0wl9Gegqh859jUK2vs/Vum4MMczPwIozQIDAQABoz4wPDAbBgNV
+						HREEFDASghBzcC52aXZvbWlsZXMuY29tMB0GA1UdDgQWBBTTtb+JbRhX8ff+vn8w
+						t9K9SiJs/DANBgkqhkiG9w0BAQUFAAOCAQEARXepedwie+WYAgs5k9Xr7TbLD2ut
+						GunzGs/1QdR4rA6w7vz93tL2zYDq/D7GcfNnR343Y2/0nRIAbHc+MDo/IrjWxP0c
+						BOa7wztmyrmetlg+Xh8me0VqLoMlTbQms7RrzI1uHzb03qwr6q+bk88Pv0rTWNd3
+						uT01Jln+UHrfihCK+14tXFCr8VOtRad+q28tUyeQ+KIs3kV9K1vCAkP4FX5GCCNn
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN66lpSg173QMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHNwLnZpdm9taWxlcy5jb20wHhcNMTEwNDA1MTMzMTU5WhcNMjEwNDAyMTMz
+						MTU5WjAbMRkwFwYDVQQDExBzcC52aXZvbWlsZXMuY29tMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAzARjQBBuE87LSlNd6570gHLigYhVXr46123MR5ln
+						/VOeFHcnof6+To7Ztlh81cM4BoR9tf5j7UxzSFW5iepICzDDzSmT4IyoBvDwZwCT
+						nEw5RuYdlLDK26PVad6EhSMAm9JTmICCtO1VqfeslKCk5/MS2aq+I2W9aypnNNrC
+						3q8tg3fzmnXaBYBhJ3ToUszK/y/fu2cpzZZA6NaJjnmDe0GvJiqP2O3Ylx46QABv
+						8tU/Pur11+htjB4JVDS/SaiXtRP07E6db2EBYUbvYiG5hQZal+J+XBHyRIyHP5AP
+						RKdb9CGo9JKB+0wl9Gegqh859jUK2vs/Vum4MMczPwIozQIDAQABoz4wPDAbBgNV
+						HREEFDASghBzcC52aXZvbWlsZXMuY29tMB0GA1UdDgQWBBTTtb+JbRhX8ff+vn8w
+						t9K9SiJs/DANBgkqhkiG9w0BAQUFAAOCAQEARXepedwie+WYAgs5k9Xr7TbLD2ut
+						GunzGs/1QdR4rA6w7vz93tL2zYDq/D7GcfNnR343Y2/0nRIAbHc+MDo/IrjWxP0c
+						BOa7wztmyrmetlg+Xh8me0VqLoMlTbQms7RrzI1uHzb03qwr6q+bk88Pv0rTWNd3
+						uT01Jln+UHrfihCK+14tXFCr8VOtRad+q28tUyeQ+KIs3kV9K1vCAkP4FX5GCCNn
+						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>
diff --git a/swamid-interfederations-2.0/sp1.colegsirgar.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp1.colegsirgar.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..a7de335c
--- /dev/null
+++ b/swamid-interfederations-2.0/sp1.colegsirgar.ac.uk-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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>
+						MIIC0DCCAbigAwIBAgIJANFIrDUvJOlkMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
+						BAMTA3NwMTAeFw0xNTAxMTQxNjE2MDJaFw0yNTAxMTExNjE2MDJaMA4xDDAKBgNV
+						BAMTA3NwMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK14YbqRnUY2
+						9Ng3CMJNc6sDK4BdVAHlo9t4f7wU654KhGO3CHcxQoqL5hwtjUafymMx8+YToWSF
+						3Mzn/nC6zeJRWftWxoybvcyof1sYQgmIWO7f9h9klcDFXFfMvIumVHVHUlJL9K+Z
+						txSILIp1HpmTNEzhy425eTvn6ZLw0KO3nq3jSJbKXuhAePKjb4uoxKVbe4degGMZ
+						Q1pndraP5hE2PgQppj5pBj7YjB/O8zoo7Ae9FWuJ9EU38Zn8t38w6hkyZG9TVdK9
+						t07WnmhhMqkAP0DiO3zQn9AndRY6wFoqNYv95St2npoijJg+w5XIBsLITDfUVOYR
+						7QsUhK9LN70CAwEAAaMxMC8wDgYDVR0RBAcwBYIDc3AxMB0GA1UdDgQWBBTIzzX6
+						nK3dI0J1PMI0EG33fWbQ9TANBgkqhkiG9w0BAQUFAAOCAQEAJtcdejLz2iGZkK9o
+						kuWnZbj4ph+QcaW+HQNDhBvbJhMG4SgA3uVCP/ItSdUSrU8me/WwrJPOo6YlkBGl
+						V+QY0J9vCrzSn9rABLZ1HWVwmFCGF6sHzXqT5WhlBdDsV8cEqadERf+YvOCtsrao
+						lMxjYN1WMuZ/ZLCDJxP+0rPOEFFDaAnB58HWXgA3ER1fTAt9YaEctxld9x6vwi3z
+						SAb16SXmCgRoVpxpkU/+wWuoVe5ZpGiE3DBlrFFlrn05ujsrP0bTpkd2Q+3uDpCv
+						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>
diff --git a/swamid-interfederations-2.0/sp1.segfl.org.uk-shibboleth.xml b/swamid-interfederations-2.0/sp1.segfl.org.uk-shibboleth.xml
new file mode 100644
index 00000000..a4a4ac03
--- /dev/null
+++ b/swamid-interfederations-2.0/sp1.segfl.org.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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>
+      <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>
+						MIIC4jCCAcqgAwIBAgIJAKo2TwyB3hkyMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+						BAMTCXNlZ2ZsLXNwMTAeFw0xMTEyMTYxNTE0MDBaFw0yMTEyMTMxNTE0MDBaMBQx
+						EjAQBgNVBAMTCXNlZ2ZsLXNwMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAMQQA44wvMGBJWDyxubnF0Q5x3+ZZ2E9W6DhGIFlEUv09X+j9WIqNf7a66uQ
+						FW2N1OOTCbn4gDHSKKjQ3kTz03f6XIoGOJVJYJ/6dU0mXmZ5/jqZqWY9fFCoGQBz
+						rylI1SFH7X1O6r/wpPvmp8dbA0/AMwvirXKKhzvvw8F/Jpu5W1g89VXBvDTJ/yjh
+						RJasNM102Qhd8xlXH2N5ZReXXb1yEqzZ7Ss/oigFyXjhiHcxzBk/Zbt45+PyVDxw
+						zfqLJKW763oHunaEXbCq2w5rbYGnlbTLEXc6CjDA4asOxEqY3+xlzqE8yJTngNae
+						+SZQa5I6zSLjEwMz5s4EhJSdPGUCAwEAAaM3MDUwFAYDVR0RBA0wC4IJc2VnZmwt
+						c3AxMB0GA1UdDgQWBBThQdOJbEqv+ifbPsJuWrJSoWjNEDANBgkqhkiG9w0BAQUF
+						AAOCAQEAGNp6mtzGck7Dv7dxc6kZVC8jb9zVbXAFaVMBVyEjyd74E8T3/UTZVB00
+						ABKTImJYdFuSYSxSKLEtDQcMlIDvO/+YW7NuMaJCB1raxAJ5qRAxdqYheICa53uc
+						tokIITAaNj5kVTfnUeLmZTerotNEQRduwzHDKE0X3IqrSLYx0s+maaa7hN7wgL88
+						08KCC5+qL2JQQ6qNCwc/qY/ghhpEMhy3NLWnyrBnuv/4iErY0ogypOi/nXwOyNvn
+						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>
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
new file mode 100644
index 00000000..52f33434
--- /dev/null
+++ b/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-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>
+      <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>
+						MIIEZzCCA0+gAwIBAgIQSm2nqIqiox26I11iklHlFzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDQxNTAwMDAwMFoXDTE2MDQxNDIzNTk1OVowOzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1zcDIua2NjLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkTipNhRClDjUbpHw
+						ZAdd9ZrG0E9GnQF5oL2CgZJceS2V7zv34sMVnCzkxwqlpVR5z0HxSutQK+Rxy9XY
+						7/6HXsZA6OdzVc492YYTUHpJt1CSK9xbUYdbGe5c6fnJHEiIVjwZPukWbUH0Yz7n
+						VxLzq2GXvvwzwTQOjM+Y7eb5A1C6JURbo2EGgYO0LjA2QBwJV2EbTGYW7qE5iTo2
+						ajiEGbDBqWBrgmCYyz2zNCaMeD6DQTswELji1HKMk19mwIJpH0JQzmrn5O2aTCU/
+						3Oe0b8fB/HWak5Vg51kJLA2qxYQQmaH7KzjGkqYXV6irw631wKsee07E7ic4gioA
+						ox1CuwIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+						ue0wHQYDVR0OBBYEFM+h8xC5KMRvvlwFtYPzQvRPekYbMA4GA1UdDwEB/wQEAwIF
+						oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
+						BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
+						LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
+						BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
+						YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
+						Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1zcDIua2NjLmFjLnVrMA0GCSqGSIb3
+						DQEBBQUAA4IBAQB/KYLbwlBTr9Y5wz+L9aTbVCAbpGaEut5pUcX1FFnn8ZWyomvJ
+						Px4W55mC3W+XKjC6eH/tto15qaeRuJBstE+IqpFpJrgFRgjyAbdL6ytY03nA/ZnN
+						700/ZxxrYrAkRxNll3hsxupLg4mgPvi7VFFS15ogEKdlAdwzpxjFF5SzJ1s5NMbl
+						WNXBd/U8BYJREwDCEu9uV1OQU0IHx/7OVLgI6yH0Y4wElPPFvOXA4bPzZDr/lVLA
+						RZF/i3C90xcqJ/54WaYuFnU8EZDbYExPuqv6OvL53F215iCRecxWEfjYaz7D3amu
+						zWWeRb5g3nssaRQeVqEG3zg0tUq0GYtUj82l
+					</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>
+						MIIEZzCCA0+gAwIBAgIQSm2nqIqiox26I11iklHlFzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDQxNTAwMDAwMFoXDTE2MDQxNDIzNTk1OVowOzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1zcDIua2NjLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkTipNhRClDjUbpHw
+						ZAdd9ZrG0E9GnQF5oL2CgZJceS2V7zv34sMVnCzkxwqlpVR5z0HxSutQK+Rxy9XY
+						7/6HXsZA6OdzVc492YYTUHpJt1CSK9xbUYdbGe5c6fnJHEiIVjwZPukWbUH0Yz7n
+						VxLzq2GXvvwzwTQOjM+Y7eb5A1C6JURbo2EGgYO0LjA2QBwJV2EbTGYW7qE5iTo2
+						ajiEGbDBqWBrgmCYyz2zNCaMeD6DQTswELji1HKMk19mwIJpH0JQzmrn5O2aTCU/
+						3Oe0b8fB/HWak5Vg51kJLA2qxYQQmaH7KzjGkqYXV6irw631wKsee07E7ic4gioA
+						ox1CuwIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+						ue0wHQYDVR0OBBYEFM+h8xC5KMRvvlwFtYPzQvRPekYbMA4GA1UdDwEB/wQEAwIF
+						oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
+						BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
+						LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
+						BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
+						YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
+						Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1zcDIua2NjLmFjLnVrMA0GCSqGSIb3
+						DQEBBQUAA4IBAQB/KYLbwlBTr9Y5wz+L9aTbVCAbpGaEut5pUcX1FFnn8ZWyomvJ
+						Px4W55mC3W+XKjC6eH/tto15qaeRuJBstE+IqpFpJrgFRgjyAbdL6ytY03nA/ZnN
+						700/ZxxrYrAkRxNll3hsxupLg4mgPvi7VFFS15ogEKdlAdwzpxjFF5SzJ1s5NMbl
+						WNXBd/U8BYJREwDCEu9uV1OQU0IHx/7OVLgI6yH0Y4wElPPFvOXA4bPzZDr/lVLA
+						RZF/i3C90xcqJ/54WaYuFnU8EZDbYExPuqv6OvL53F215iCRecxWEfjYaz7D3amu
+						zWWeRb5g3nssaRQeVqEG3zg0tUq0GYtUj82l
+					</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 (TEST IdP Shib 2)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kcc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Leslie-Ann</md:GivenName>
+    <md:SurName>Campbell</md:SurName>
+    <md:EmailAddress>mailto:l.campbell@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
new file mode 100644
index 00000000..cb2aef22
--- /dev/null
+++ b/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc: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:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIC3DCCAcSgAwIBAgIJAJ7W+iRwOMUTMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+BAMTB2NlbnRvczUwHhcNMTEwNDA0MTAxMDU4WhcNMjEwNDAxMTAxMDU4WjASMRAw
+DgYDVQQDEwdjZW50b3M1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+6sjvgmK7cxJ5w1zwtrH1qA+lI1Ej1+KtG9N8bXx56KDj8Bg+xr2oRGB+/d34j8wS
+JI3lEic8dvC35SHULX1CcEIs8Nl2GhZIaAiqmwA8DTq0eReQsz5wg1Vq1p0P1vZ9
+0n8Ys1OoMO0euOSpN0lyWu8wzyeuKKssci8EXY8lcIocPVMaBpTScKJ6JP51zPQW
+ELZWw4OP33wLHshxvvhoSvzNAz2ylmul4cdSVeHOxuRYvunqm5Q4VeVsUP2iTCaG
+JPHG21d5B034qq2cTQAGyd85EowlKmqKoJ3wUVR4PVc0Q3XxMo+hoZcdIGwhNrsH
+M6u9mRKkNixl8OzILOxhMwIDAQABozUwMzASBgNVHREECzAJggdjZW50b3M1MB0G
+A1UdDgQWBBQcMWUI1jE4zye8yRzfx3qXhUwWsDANBgkqhkiG9w0BAQUFAAOCAQEA
+WHlWTANnI7kL0S4u9vE9yZp2inDzGrVhZZfY8NL6mN9oTvGEemsNXLmvj1toDJCx
+Mbqbb5ituCor4wAxfNTh6QnHTZiiZwxIAU+/qi1r2smt/2ZsqosQR48OVZ2cELaj
+uaAboK+B5hXLtcPjOxoZ36iZcHmGDQCCTrHfaxG1CIbuCfs5f3RVgf707xGR/OZu
+2LvpeFy4g0jYx0BjYGWSP+nqL5gmsOW3g8VpthgX8ogiA3JiLBjyFQDAPbl2aK3x
+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="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
new file mode 100644
index 00000000..753479bc
--- /dev/null
+++ b/swamid-interfederations-2.0/spaces.internet2.edu-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0: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="https://incommon.org"/>
+  </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">Collaboration Wiki Spaces at Internet2</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>
+MIID9TCCAt2gAwIBAgIBADANBgkqhkiG9w0BAQQFADBAMQswCQYDVQQGEwJVUzES
+MBAGA1UEChMJSW50ZXJuZXQyMR0wGwYDVQQDExRzcGFjZXMuaW50ZXJuZXQyLmVk
+dTAeFw0wNjEyMTMxNzQwMjdaFw0xNjEyMTAxNzQwMjdaMEAxCzAJBgNVBAYTAlVT
+MRIwEAYDVQQKEwlJbnRlcm5ldDIxHTAbBgNVBAMTFHNwYWNlcy5pbnRlcm5ldDIu
+ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxfZWpU5/8rgfFbxh
+DOwYuQ4/TNycAQ/VQ5DFMU3M3bvF52WktUtfwBDozdXQt/tOIlBFvPVHH/pdp0q6
+RrzjXP5pQFZoKKc+p9cGdxHqKlx7RWAnFycNaKFZyV9kUTUvSHDjQk00i5gJUGEt
+D1j8NLE9o0y68x+5jK3onhQs3IXkHVYDslXHNXPovcv7OQuWIL69oBxyTxeTBUIA
+WoIiSZh6XrjGmNUid2ZnFFk7YtY1UNGV18LbfVhnxBlIxIq5v9KQgK9T0P5pogYs
+6N7Ki4eMK3cKCJkAibrbo8iPcOJnwbCXTlLmnhv5yd/W8Bk8A/pluNX7kbsSYr1f
+7P6YqQIDAQABo4H5MIH2MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
+U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQ8t+Ty3BI/EncjTRX+
+JB8jn/SU0zBoBgNVHSMEYTBfgBQ8t+Ty3BI/EncjTRX+JB8jn/SU06FEpEIwQDEL
+MAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjEdMBsGA1UEAxMUc3BhY2Vz
+LmludGVybmV0Mi5lZHWCAQAwMgYDVR0RBCswKYYnaHR0cHM6Ly9zcGFjZXMuaW50
+ZXJuZXQyLmVkdS9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBAUAA4IBAQCd2JE3zSY3
+JLYBdr/WhFphpMHavrXpcK8GYro0YYfPN0QDxjBUSGkGgw0QzKAGmthqJWJ6yeip
+Ht36uzobQ2iQtFU08LKiK2jPNegSU3uW/LsmnweFCDmWDyacmK91q+m3oNfY631l
++vLX82GQYRssQbis1CJbrD/XE1W+2sEnGHc4eNRJZYNzMRvfSatNavCgI1IoOFEC
+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">Collaboration Wiki Spaces at Internet2</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: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="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="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">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
new file mode 100644
index 00000000..30c887b5
--- /dev/null
+++ b/swamid-interfederations-2.0/spprod.targetconnect.net-saml2.xml
@@ -0,0 +1,81 @@
+<?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>
+						MIIDpjCCAo6gAwIBAgIEUgEctzANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMRQwEgYDVQQHEwtXYWxsaW5nZm9yZDEW
+						MBQGA1UEChMNR1RJIE1lZGlhIEx0ZDEQMA4GA1UECxMHVW5rbm93bjEvMC0GA1UE
+						AxMmaHR0cHM6Ly9zcHByb2QudGFyZ2V0Y29ubmVjdC5uZXQvc2FtbDIwHhcNMTMw
+						ODA2MTU1NjM5WhcNMjMwODA0MTU1NjM5WjCBlDELMAkGA1UEBhMCR0IxFDASBgNV
+						BAgTC094Zm9yZHNoaXJlMRQwEgYDVQQHEwtXYWxsaW5nZm9yZDEWMBQGA1UEChMN
+						R1RJIE1lZGlhIEx0ZDEQMA4GA1UECxMHVW5rbm93bjEvMC0GA1UEAxMmaHR0cHM6
+						Ly9zcHByb2QudGFyZ2V0Y29ubmVjdC5uZXQvc2FtbDIwggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCXqeXpMl82js4Sp01xd/E1lMH4WDC3maIrSzCdbun4
+						uLWp3qTwa98USshgPrqTlBXRROnul/0fBJMLlBDREbNkk/PUPbWCNQHkXrybk5f1
+						4uK02zuD4IflscIuRKM3Iu3VV8IPvKKVhfLSx/1INZ+T6GHcRojlo6EfmaN3CPp4
+						AjzHrlwRzre2zhYJDgejAcdX4l9VBxuHSoSQVfVH96tHhKumKH4PwQif4wWGnlDB
+						rZ6I1cRTP1hm2eqqv1TzhYscjcwN0bdnynnfJTJAw+fMZGJxEZnZqqEyXuLJBPTp
+						25wRUGcsWR6GqH68K1Jn975hbIQ/dYc+Eccly61tkRWVAgMBAAEwDQYJKoZIhvcN
+						AQEFBQADggEBAH1oH3iIEwA13CJ+UleE3CP+82B9jk7BApq3+4QWWZ7deO5r4Z4+
+						d4XsCuifNIcYUchOBM9rB8KwCmgqM2+yKwgnLeCNzJk+SZR7qz+z8fsWTfbqctUn
+						HuJjg4LWfuJZb3TPqcZYAojH1ThumOPfgOUh+W+WarLHsVYOkBFz5LyFByrzPGvj
+						Y2H+JYtuN2ASqkblybMUB6KGy06f5doxkjT/jUQ/2wzKKEjWwr+qJrRpPQBGT0Wz
+						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>
+						MIIDpjCCAo6gAwIBAgIEUgEctzANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMRQwEgYDVQQHEwtXYWxsaW5nZm9yZDEW
+						MBQGA1UEChMNR1RJIE1lZGlhIEx0ZDEQMA4GA1UECxMHVW5rbm93bjEvMC0GA1UE
+						AxMmaHR0cHM6Ly9zcHByb2QudGFyZ2V0Y29ubmVjdC5uZXQvc2FtbDIwHhcNMTMw
+						ODA2MTU1NjM5WhcNMjMwODA0MTU1NjM5WjCBlDELMAkGA1UEBhMCR0IxFDASBgNV
+						BAgTC094Zm9yZHNoaXJlMRQwEgYDVQQHEwtXYWxsaW5nZm9yZDEWMBQGA1UEChMN
+						R1RJIE1lZGlhIEx0ZDEQMA4GA1UECxMHVW5rbm93bjEvMC0GA1UEAxMmaHR0cHM6
+						Ly9zcHByb2QudGFyZ2V0Y29ubmVjdC5uZXQvc2FtbDIwggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCXqeXpMl82js4Sp01xd/E1lMH4WDC3maIrSzCdbun4
+						uLWp3qTwa98USshgPrqTlBXRROnul/0fBJMLlBDREbNkk/PUPbWCNQHkXrybk5f1
+						4uK02zuD4IflscIuRKM3Iu3VV8IPvKKVhfLSx/1INZ+T6GHcRojlo6EfmaN3CPp4
+						AjzHrlwRzre2zhYJDgejAcdX4l9VBxuHSoSQVfVH96tHhKumKH4PwQif4wWGnlDB
+						rZ6I1cRTP1hm2eqqv1TzhYscjcwN0bdnynnfJTJAw+fMZGJxEZnZqqEyXuLJBPTp
+						25wRUGcsWR6GqH68K1Jn975hbIQ/dYc+Eccly61tkRWVAgMBAAEwDQYJKoZIhvcN
+						AQEFBQADggEBAH1oH3iIEwA13CJ+UleE3CP+82B9jk7BApq3+4QWWZ7deO5r4Z4+
+						d4XsCuifNIcYUchOBM9rB8KwCmgqM2+yKwgnLeCNzJk+SZR7qz+z8fsWTfbqctUn
+						HuJjg4LWfuJZb3TPqcZYAojH1ThumOPfgOUh+W+WarLHsVYOkBFz5LyFByrzPGvj
+						Y2H+JYtuN2ASqkblybMUB6KGy06f5doxkjT/jUQ/2wzKKEjWwr+qJrRpPQBGT0Wz
+						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>
diff --git a/swamid-interfederations-2.0/sprov.d2digital.co.uk-.xml b/swamid-interfederations-2.0/sprov.d2digital.co.uk-.xml
new file mode 100644
index 00000000..8a053c90
--- /dev/null
+++ b/swamid-interfederations-2.0/sprov.d2digital.co.uk-.xml
@@ -0,0 +1,68 @@
+<?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://sprov.d2digital.co.uk/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-26T11:23: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">d2 Digital By Design Limited</mdui:DisplayName>
+        <mdui:Description xml:lang="en">d2 Test SP</mdui:Description>
+        <mdui:Logo height="170" width="170">https://shib.d2digital.co.uk/d2-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>
+						MIIDMzCCAhugAwIBAgIJAIdis0SAXmmpMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXNwcm92LmQyZGlnaXRhbC5jby51azAeFw0xMjA3MjUxMjMzMzlaFw0yMjA3
+						MjMxMjMzMzlaMCAxHjAcBgNVBAMTFXNwcm92LmQyZGlnaXRhbC5jby51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbf3pH83WxgptR2EyioaxWy4OMy
+						PIxIoJ/ERpNdpTxQqWsjJf4pHcHA/DtbRpX9PFDgGFm604JfmzOj/Wd/U05Wo1MF
+						VhlvxgDvdpbANS9rR62f83WZv9WGkxk+N/Bz1haRdRFi3x4/zef3uxwOFJnGHHD0
+						Jas1+9nYUv/FxPNXYVDnBp1MfGk6OWlG3OPsemJXPSvgw0iG201oabyx/GWb/e2E
+						mi1Yjd65ksVvzdZ6LxZHAUGuyeV3m4wP35EaXjesHJ6Y5CmUZ9dapOGDlavJRjda
+						0Eau3HCAiS0mJ9KZjyOFIgX3oowO+cf+XXpzb3rp1X92wsT707wG5wN+ezECAwEA
+						AaNwMG4wTQYDVR0RBEYwRIIVc3Byb3YuZDJkaWdpdGFsLmNvLnVrhitodHRwczov
+						L3Nwcm92LmQyZGlnaXRhbC5jby51ay9zaGliYm9sZXRoLXNwMB0GA1UdDgQWBBQj
+						6RBpdUzW3y30eT1nnauBiEZ7ozANBgkqhkiG9w0BAQUFAAOCAQEASxk2bIv7u2TE
+						Ikm5avZwC0Jg4YmS/vEiMbsbF/cn7KklmdqrKoVZXPHXZGqGO95/Wni81s5ZCAPI
+						+Ny0a+4SGufdW6mu7LdzdKsDQTXw+tEGNF3+7FMyTaW9Ey4cQt+RgIUy/injMwnR
+						w5dC9P3x/w5PlmNgD8TTsKWeLoonP4y6RdtgsW7h33zylG5PdHmremgGmiKYr0mT
+						u5EpXfUGl1A/HdGkUYIP4AYxz0MB1K2ZdLrWtFqP1kgT8+iwxIh/v+PEVZ8ltU91
+						xdRbHTBf3Fd/8gVhZw4lSDWFHbyJDznGTYE6H5UyxgLqGI/KgQfMxDVdqXQhZ0Hu
+						UZV+Z3CP5w==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">D2.Digital By Design Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">d2 Test Service Provider</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.d2digital.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Thorpe</md:SurName>
+    <md:EmailAddress>mailto:shibboleth@d2digital.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Thorpe</md:SurName>
+    <md:EmailAddress>mailto:shibboleth@d2digital.co.uk</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
new file mode 100644
index 00000000..5c6a9da7
--- /dev/null
+++ b/swamid-interfederations-2.0/sprovtest.e2bn.org-shibboleth.xml
@@ -0,0 +1,81 @@
+<?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>
+      <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>
+						MIIEtTCCA52gAwIBAgIRAL/UEGcEJdNoENNZxjwllnswDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjEyMDQwMDAwMDBaFw0xNTEyMDQyMzU5NTlaMIGCMQswCQYD
+						VQQGEwJHQjEWMBQGA1UECBMNSGVydGZvcmRzaGlyZTESMBAGA1UEBxMJSGlueHdv
+						cnRoMSowKAYDVQQKEyFFYXN0IG9mIEVuZ2xhbmQgQnJvYWRiYW5kIE5ldHdvcmsx
+						GzAZBgNVBAMTEnNwcm92dGVzdC5lMmJuLm9yZzCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBANi6wBjpI+9v4mtgwak4/6Ykh8fULaEyxwuSNG4lIHcEjny9
+						Yy1+1A9jGF1TZybUPeHYAysVGu0Y5q7Tgf03IA6ERR5/UDb1OvWJCY9QVQg1riyN
+						6pjc+tiXRKbgrD9NLxUb3cS6i/KbkOsYb67y8E22HHpW1+GQr43maTv344MkF4ps
+						rrMsZynKh0UU9SfyLrifY5vIGosP1Jv5H3Vwg7lfspV2R1l1ygGLAmAlZclq/P23
+						bFGaIFkt1S20oGFd2J/XXt7a5Akmv0qopx1PPwWynQktVKPT6TEelGdI+jigkNew
+						hICxngBHXVbMKWF/LIiOnRkj5u4GqDecNftH9K8CAwEAAaOCAW8wggFrMB8GA1Ud
+						IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRwMgOxyc7vDLfY
+						1VUuMJsc1HQgvTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
+						FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQIC
+						HTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHQYDVR0RBBYw
+						FIISc3Byb3Z0ZXN0LmUyYm4ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBy6YBtW4u2
+						ZUwPqkdCJFqeVKpvBO9viQUKfvW5DoPfZPTHPWCDGaLZPG0KgWcTZhagUaKwDVoK
+						lBSr4+N+ASc9UxLeWRcm5UEJdKT8GZx1xTtfYnla9hTd4uG2k6uAL06p/MmsKAQL
+						nHid0QBJ0CWvvVKFNuUCusEhUgRP4vlSR6dYmHcXP0o3TCk2diFGS8MIAEJhULTH
+						2I8C0E8ig5uIfjiR1LD22/QWsZZJ5Ij8CJ/DhcW4Vlwk9cJpdbxZi69Q4OGFyuEb
+						s+Ov/y9lDqjYhtuYOBRcsp7WwbGlTubBX0E2iCXxgkCd0w7FBs7gzRgQnOqcfWI8
+						qKjQKYBJZIJI
+					</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>
diff --git a/swamid-interfederations-2.0/spuat.targetconnect.net-saml2.xml b/swamid-interfederations-2.0/spuat.targetconnect.net-saml2.xml
new file mode 100644
index 00000000..2fdb768d
--- /dev/null
+++ b/swamid-interfederations-2.0/spuat.targetconnect.net-saml2.xml
@@ -0,0 +1,81 @@
+<?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>
+						MIIDpDCCAoygAwIBAgIEUgEiyTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMRQwEgYDVQQHEwtXYWxsaW5nZm9yZDEW
+						MBQGA1UEChMNR1RJIE1lZGlhIEx0ZDEQMA4GA1UECxMHVW5rbm93bjEuMCwGA1UE
+						AxMlaHR0cHM6Ly9zcHVhdC50YXJnZXRjb25uZWN0Lm5ldC9zYW1sMjAeFw0xMzA4
+						MDYxNjIyMzNaFw0yMzA4MDQxNjIyMzNaMIGTMQswCQYDVQQGEwJHQjEUMBIGA1UE
+						CBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1H
+						VEkgTWVkaWEgTHRkMRAwDgYDVQQLEwdVbmtub3duMS4wLAYDVQQDEyVodHRwczov
+						L3NwdWF0LnRhcmdldGNvbm5lY3QubmV0L3NhbWwyMIIBIjANBgkqhkiG9w0BAQEF
+						AAOCAQ8AMIIBCgKCAQEAjum54CJ2ZfU7CLwF6PPVC92qUF29WORHMoZBEBQV0LFf
+						nhr9fGzS3sMGXEGi+0QGX8ckuVnnlaFkty8xkFFsCWy3SurIoD+De1Ks0cN19QfX
+						Nsk4OlfOQ3jfL7WfpKUCn5kDvKM35HCG5EVw9BQqxJ2sk+VVKiZe5w5R0M3khUkG
+						zUpvAayCExXeR1zc9F9vXmsqRmc4ALsz+nXGebKNQVaIQ+I40SANH6byim6BHU+A
+						g63jFlAbGR4v18TFKlLypBhcloaIc1cxVet4pnOTjUtt0bsD7WDAKggO4xXpwpof
+						u/nqx1SJFTnuup0Idlp9B1PjOBL42qaV2mmyfAkJrQIDAQABMA0GCSqGSIb3DQEB
+						BQUAA4IBAQCGZzX1ZYtU2dRSs63H+PhDHv1JgKRLCC5eparvxEQikkM/5h1iVQBo
+						iqn0iUG2nHznTm4AOX/shRG/5ygUPRAUhU4aaEmLPK7cK39HsMh4Bf3l/dDRQ7mO
+						+lz0j68e/qYsRtzkZl7idHUfNbrtaI1U6diNNzmJGomdH4+rh/TeS1N2xUcEIFdE
+						ULkKPr4aGmUaCn7/V9Od1Tnx92WaMZSvqcwoMMgF7lbOPkPoOSYXaxY6TmsG/HYu
+						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>
+						MIIDpDCCAoygAwIBAgIEUgEiyTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMRQwEgYDVQQHEwtXYWxsaW5nZm9yZDEW
+						MBQGA1UEChMNR1RJIE1lZGlhIEx0ZDEQMA4GA1UECxMHVW5rbm93bjEuMCwGA1UE
+						AxMlaHR0cHM6Ly9zcHVhdC50YXJnZXRjb25uZWN0Lm5ldC9zYW1sMjAeFw0xMzA4
+						MDYxNjIyMzNaFw0yMzA4MDQxNjIyMzNaMIGTMQswCQYDVQQGEwJHQjEUMBIGA1UE
+						CBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1H
+						VEkgTWVkaWEgTHRkMRAwDgYDVQQLEwdVbmtub3duMS4wLAYDVQQDEyVodHRwczov
+						L3NwdWF0LnRhcmdldGNvbm5lY3QubmV0L3NhbWwyMIIBIjANBgkqhkiG9w0BAQEF
+						AAOCAQ8AMIIBCgKCAQEAjum54CJ2ZfU7CLwF6PPVC92qUF29WORHMoZBEBQV0LFf
+						nhr9fGzS3sMGXEGi+0QGX8ckuVnnlaFkty8xkFFsCWy3SurIoD+De1Ks0cN19QfX
+						Nsk4OlfOQ3jfL7WfpKUCn5kDvKM35HCG5EVw9BQqxJ2sk+VVKiZe5w5R0M3khUkG
+						zUpvAayCExXeR1zc9F9vXmsqRmc4ALsz+nXGebKNQVaIQ+I40SANH6byim6BHU+A
+						g63jFlAbGR4v18TFKlLypBhcloaIc1cxVet4pnOTjUtt0bsD7WDAKggO4xXpwpof
+						u/nqx1SJFTnuup0Idlp9B1PjOBL42qaV2mmyfAkJrQIDAQABMA0GCSqGSIb3DQEB
+						BQUAA4IBAQCGZzX1ZYtU2dRSs63H+PhDHv1JgKRLCC5eparvxEQikkM/5h1iVQBo
+						iqn0iUG2nHznTm4AOX/shRG/5ygUPRAUhU4aaEmLPK7cK39HsMh4Bf3l/dDRQ7mO
+						+lz0j68e/qYsRtzkZl7idHUfNbrtaI1U6diNNzmJGomdH4+rh/TeS1N2xUcEIFdE
+						ULkKPr4aGmUaCn7/V9Od1Tnx92WaMZSvqcwoMMgF7lbOPkPoOSYXaxY6TmsG/HYu
+						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>
diff --git a/swamid-interfederations-2.0/srmo.sagepub.com-oa-metadata.xml b/swamid-interfederations-2.0/srmo.sagepub.com-oa-metadata.xml
new file mode 100644
index 00000000..8008269a
--- /dev/null
+++ b/swamid-interfederations-2.0/srmo.sagepub.com-oa-metadata.xml
@@ -0,0 +1,81 @@
+<?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>
+      <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>
+						MIIC8jCCAdqgAwIBAgIEU3YWujANBgkqhkiG9w0BAQUFADA7MR4wHAYDVQQKExVT
+						QUdFIFJlc2VhcmNoIE1ldGhvZHMxGTAXBgNVBAMTEHNybW8uc2FnZXB1Yi5jb20w
+						HhcNMTQwNTE2MTM0NjM0WhcNMjQwNTEzMTM0NjM0WjA7MR4wHAYDVQQKExVTQUdF
+						IFJlc2VhcmNoIE1ldGhvZHMxGTAXBgNVBAMTEHNybW8uc2FnZXB1Yi5jb20wggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAj7S6njJm0RnWWITsCrEtFaXe
+						fOL5sO/jeFs1OdsMOdJvrF2W1ogslAV1Dg7SnF/aVeOkybQbE1iA8astIPLf1qv/
+						Fcv6a8lSlGBk3hMFX6ye3431lqw1nsF53S/TUzEflixBjxO7j9QcM2l4wRLwuo9M
+						W2qYrOw2AfxE7vca3fDICdhtfcQIkHFnkLi67bhR6rFqTjwz1cj38RXXz2c2TSPA
+						fTjRZoePMNqDaucNcBVrT9KqXxWJBr8zqMrC5CUYGCuYiqNB8MbHdW/o14ah4uVl
+						ZB0B9iJ2eGmA5tzs+dTKzcspDpF11LS0i3RMBysfFB+Grj3mu5GgFGDnVW5nAgMB
+						AAEwDQYJKoZIhvcNAQEFBQADggEBAEV8fmC0KbKrXDKBq5ZDrvRRoFZMynTWnkMs
+						KT2ImrfxpIbv+XO06lWAh5j8XIgV5tqTTam9IpcudEOxjmd6imwQ4qTdc2MbFzRR
+						X4HG+J+GOuvH6ZhCSfWEoZRqRkw6c/PCokyWeYkXPPL24d8zVDWcVKQBngMPtopE
+						yJpPVcRPu71eZ5KOarxT9nawAzAhuVrMLrhlg8yqEWa66y1AZwtasasFZXqlkVI+
+						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>
+						MIIC8jCCAdqgAwIBAgIEU3YWujANBgkqhkiG9w0BAQUFADA7MR4wHAYDVQQKExVT
+						QUdFIFJlc2VhcmNoIE1ldGhvZHMxGTAXBgNVBAMTEHNybW8uc2FnZXB1Yi5jb20w
+						HhcNMTQwNTE2MTM0NjM0WhcNMjQwNTEzMTM0NjM0WjA7MR4wHAYDVQQKExVTQUdF
+						IFJlc2VhcmNoIE1ldGhvZHMxGTAXBgNVBAMTEHNybW8uc2FnZXB1Yi5jb20wggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAj7S6njJm0RnWWITsCrEtFaXe
+						fOL5sO/jeFs1OdsMOdJvrF2W1ogslAV1Dg7SnF/aVeOkybQbE1iA8astIPLf1qv/
+						Fcv6a8lSlGBk3hMFX6ye3431lqw1nsF53S/TUzEflixBjxO7j9QcM2l4wRLwuo9M
+						W2qYrOw2AfxE7vca3fDICdhtfcQIkHFnkLi67bhR6rFqTjwz1cj38RXXz2c2TSPA
+						fTjRZoePMNqDaucNcBVrT9KqXxWJBr8zqMrC5CUYGCuYiqNB8MbHdW/o14ah4uVl
+						ZB0B9iJ2eGmA5tzs+dTKzcspDpF11LS0i3RMBysfFB+Grj3mu5GgFGDnVW5nAgMB
+						AAEwDQYJKoZIhvcNAQEFBQADggEBAEV8fmC0KbKrXDKBq5ZDrvRRoFZMynTWnkMs
+						KT2ImrfxpIbv+XO06lWAh5j8XIgV5tqTTam9IpcudEOxjmd6imwQ4qTdc2MbFzRR
+						X4HG+J+GOuvH6ZhCSfWEoZRqRkw6c/PCokyWeYkXPPL24d8zVDWcVKQBngMPtopE
+						yJpPVcRPu71eZ5KOarxT9nawAzAhuVrMLrhlg8yqEWa66y1AZwtasasFZXqlkVI+
+						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>
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
new file mode 100644
index 00000000..ea6b3eb7
--- /dev/null
+++ b/swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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="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>
+					      MIIDWzCCAkOgAwIBAgIUZNcfs0me3gJRFzAZsv70xd7o1lAwDQYJKoZIhvcNAQEF
+BQAwJzElMCMGA1UEAxMcc3J2LWNyLWlkcC5jcmRwLWFxdWl0YWluZS5mcjAeFw0x
+MzA0MjIxNTMzMzhaFw0zMzA0MjIxNTMzMzhaMCcxJTAjBgNVBAMTHHNydi1jci1p
+ZHAuY3JkcC1hcXVpdGFpbmUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCA/Nt2kvmT5TdK1pTBSZ4HMyy+0ocpSDQJEnYy6/eYFvf9lnTcMscUXFBR
+3bx+elUMQInieeQxjaJ3wGTODu6QuVAUeGLrsE/AM+hkhcQuJ9BS3SCWcIPKVdiY
+bPP5VNYQSVspCDvCraTEcztfSjcQhZ8VqofRERNXw9I/yZTxVqXt0uXmo9BphO6o
+vwmO39HtroJ8kJnIhj0XATxP07e/zPAsWSwqWGorqILFnpIHVVvhh5nGq4XwhJaO
+IVVuwul2ffzsPMc3PUDy41JFpvzAiPS8dI5FXDerOp7wFR9nJqGcQ8vkkrDJVAGQ
+2Ux2yGLh0vVnouqFnLhukXV6PCrRAgMBAAGjfzB9MFwGA1UdEQRVMFOCHHNydi1j
+ci1pZHAuY3JkcC1hcXVpdGFpbmUuZnKGM2h0dHBzOi8vc3J2LWNyLWlkcC5jcmRw
+LWFxdWl0YWluZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUp3g4+XVx1rOL
+EduivpCD/pkqw5QwDQYJKoZIhvcNAQEFBQADggEBAENp1qGbki2B1hc76pCYlbJM
+CNIF/xnjp2kKLUpCSxrCNVhp1X1TPh5V3v8J6qCXIKDhVDU98eVCMtUoe7S4bXVs
+w1dahL5jKfTNt4gz2ye/eV9U80ls48DU8iHt+6DAsMKhUclXFGrUBJ3dMZtrb1mB
+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://unknown.site.com</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
new file mode 100644
index 00000000..1978f93c
--- /dev/null
+++ b/swamid-interfederations-2.0/srv-fii.insa-toulouse.fr-idp-shibboleth.xml
@@ -0,0 +1,58 @@
+<?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>
+      <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: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>
+					      MIIDTDCCAjSgAwIBAgIVAIc+7dsfBy6txSFiZjLaZo7oHPHjMA0GCSqGSIb3DQEB
+BQUAMCMxITAfBgNVBAMTGHNydi1maWkuaW5zYS10b3Vsb3VzZS5mcjAeFw0xNDAz
+MTEwOTIyNDNaFw0zNDAzMTEwOTIyNDNaMCMxITAfBgNVBAMTGHNydi1maWkuaW5z
+YS10b3Vsb3VzZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK74
+hluqPdWzcHqS+sJ7gMMK/AaaY5OTqquhY3ut8EdnWOhLrpdJUmAP67NrCsX7vnlj
+OJJvsPwITMeeuZxYPohw7+0/y/VVjluVM9u0r6QPkNYbUO4HAjZf6JOeSORtD6iq
+JCuHdURPtdx+AALX+1aM/EaX+w9dsq/xDR0aPluAyb8zHT9WYX2C8bFxGqZfayF7
+55F0fJY4YsI2WD0AnG6/DAH1/MpgW/x3rXYE3ofA1aHJTG9m2rhM5a6c2mQ1lsB0
+L4ThOBOeDm+/GPc7HsB3EwK3SJKQEPIZFpHl2HOiAbmp8ZuA9bIjvjFk+2aaJOla
+UVKxNJeBA29jlsdxnzkCAwEAAaN3MHUwVAYDVR0RBE0wS4IYc3J2LWZpaS5pbnNh
+LXRvdWxvdXNlLmZyhi9odHRwczovL3Nydi1maWkuaW5zYS10b3Vsb3VzZS5mci9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUQFnEXfdD1G/V0Zf4ArD2VSGlkcAwDQYJ
+KoZIhvcNAQEFBQADggEBAFmmxVsYiBe4u4MwR/vTomhTH6Y6rUTsbi55CBZJo0ki
+vDEeRGdAG/odez6Gx3HvfNQdGAkkXoVqzPM72suXTe3QbNwQ6p6Kfw3vlOb8Bxu+
+L4oGvqtYyKdsmZaOq8uHFSE7pmz5u86npm+5WF2EIISiNgh7V15avMGrXE3fQ+0C
+sSAKnwk3ZDiTJMkOC8JKJSxyHKmdG7tiqdhIxOoGnEa/oPdWgsVTV63xEVXfDHh3
+vVTEoXVyPovJRJieZVJDz0BmEE88Q/pDCAuhUQOCdeC0DX0uN8WrL9oI9WuGbzeD
+dQvqnCF/78eNFMZHSDdbRWgVyZp20ytlaxRlw1cKQ5w=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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://unknown.site.com</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/srv00847.soton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/srv00847.soton.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..f4c024b0
--- /dev/null
+++ b/swamid-interfederations-2.0/srv00847.soton.ac.uk-shibboleth.xml
@@ -0,0 +1,80 @@
+<?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>
+      <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>
+						MIIC3zCCAcegAwIBAgIJAIAbqup9yKKMMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+						BAMTCHNydjAwODQ3MB4XDTE0MDUwNjExNTY1MFoXDTI0MDUwMzExNTY1MFowEzER
+						MA8GA1UEAxMIc3J2MDA4NDcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDfhFR+xjj1/R3UX0UDL9wX1Yo1lMCA9gCjvzE6j6i6b2rLfTwlc9cgaBkN2Cpe
+						SLkFUxkJq4D1jtAE1slBTEos29o+7LGgpxr4CTbiKwAbcPIfezYGnjaCECBqCDVj
+						KMmYt0mP8K1n7Lh7lHpg55K6ldVtDS7v2UWEH/604fwxeRDEwvf2BvvKoD8aztkE
+						aZubA9KEWit+m0xPIpMKZ0xOc96upMsz0NZwByNe47NKt1UiR1qoba/54/w9hATQ
+						ICW7zdFN9eRFkC4kDOFU+8JPJ1PJwIIIwmZsL/h30uN3ZRr6P3Su57e4Be6Kse2u
+						w7lgpRDbBx4mec+wPZ8GD+oFAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHNydjAwODQ3
+						MB0GA1UdDgQWBBTBlMHnSTXBUylCdM2mqIb7TdtTIDANBgkqhkiG9w0BAQUFAAOC
+						AQEAhl9srCrHEXFRQhO7Q5tsSPYXwr/nWqgaPR/nPTjE43elXKNy57P0uDXdEAQU
+						3ax6OQIO5xMy4bBA4qRF50N2JzmKVz96GANDguvWQBtn3LDu0g8SRxgaogm0WYCv
+						6IhB/6HJ4XIeVeIwlQbwvp69lRV9z2O851yRJL1Rtqk5vnxmikSNQk7RH4Dd4PCw
+						7KH0cfGW3vA8sngRHX2JtjDpjgunpVKzmXffdt1WZIHJJ4LcNVXd8moFGQetL+H7
+						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>
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
new file mode 100644
index 00000000..585ed965
--- /dev/null
+++ b/swamid-interfederations-2.0/srvcafe.ifma.edu.br-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxLjAsBgNVBAoUJUlGTUEgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBNYXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBE
+aXJldG9yaWEgZGUgR2VzdMOjbyBkYSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Oj
+bzEfMB0GCSqGSIb3DQEJARYQZGd0aUBpZm1hLmVkdS5icjESMBAGA1UEBxQJU8Oj
+byBMdWlzMRIwEAYDVQQIFAlNYXJhbmjDo28xCzAJBgNVBAYTAkJSMRwwGgYDVQQD
+ExNzcnZjYWZlLmlmbWEuZWR1LmJyMB4XDTE0MDQxMTIwNTEzNVoXDTE5MDQxMDIw
+NTEzNVowgegxLjAsBgNVBAoUJUlGTUEgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBN
+YXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBEaXJldG9yaWEgZGUgR2VzdMOjbyBk
+YSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEfMB0GCSqGSIb3DQEJARYQZGd0
+aUBpZm1hLmVkdS5icjESMBAGA1UEBxQJU8OjbyBMdWlzMRIwEAYDVQQIFAlNYXJh
+bmjDo28xCzAJBgNVBAYTAkJSMRwwGgYDVQQDExNzcnZjYWZlLmlmbWEuZWR1LmJy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAndeQ2TDWt0/WD456cqgd
+XQ9b/8GofISh4bqfAgE/ryJnTq7+Qf/ZEFoAD0dIpSyPlBhUjYE2wwOlUURD4+8y
+ivNSwYbC44MXvTH+7QES86Ei+/rSUvmjOaibXr3jcoEZZPoYSHBUWvuPM8yubjXw
+aY+dyyg9AjGMGq6bm5xm7prcE9IQT++sCzhnLx9PLpfEiFlPr3pnZKuLWvlEb/OV
+E0IkzzCAoFfLDfZAbEK5NInsd399Zw9o0Bfo3M0pRGzyZUHahnTKiGBagdK//tpm
+BhiT3azSvfWF7pxleUOCMJHTEum426AtaBpFyKBrvIEKr0OqgDj8uBsia4PH1lUY
+IwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBIZQEEWkQzIWbBHPbM5qGGkRgu2KfT
+39lv6LGDDjZaJH7CPFP1FElKAsw1FVOlsYGdF5xbvclqLiZeRa2WUlFqsEeZQHS2
+WcCWgsYjMANovjer9I834lFpxNATnKe4H3NsI3rlrfyBGJrSX3w/48s2xa8XgWDq
+7EWAk7GVDgPvc25kWIzlex6FXlfmPOnwsXrgpieCk6HH1jFn+xKshJHMntCjk3al
+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>
+      
+MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxLjAsBgNVBAoUJUlGTUEgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBNYXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBE
+aXJldG9yaWEgZGUgR2VzdMOjbyBkYSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Oj
+bzEfMB0GCSqGSIb3DQEJARYQZGd0aUBpZm1hLmVkdS5icjESMBAGA1UEBxQJU8Oj
+byBMdWlzMRIwEAYDVQQIFAlNYXJhbmjDo28xCzAJBgNVBAYTAkJSMRwwGgYDVQQD
+ExNzcnZjYWZlLmlmbWEuZWR1LmJyMB4XDTE0MDQxMTIwNTEzNVoXDTE5MDQxMDIw
+NTEzNVowgegxLjAsBgNVBAoUJUlGTUEgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBN
+YXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBEaXJldG9yaWEgZGUgR2VzdMOjbyBk
+YSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEfMB0GCSqGSIb3DQEJARYQZGd0
+aUBpZm1hLmVkdS5icjESMBAGA1UEBxQJU8OjbyBMdWlzMRIwEAYDVQQIFAlNYXJh
+bmjDo28xCzAJBgNVBAYTAkJSMRwwGgYDVQQDExNzcnZjYWZlLmlmbWEuZWR1LmJy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAndeQ2TDWt0/WD456cqgd
+XQ9b/8GofISh4bqfAgE/ryJnTq7+Qf/ZEFoAD0dIpSyPlBhUjYE2wwOlUURD4+8y
+ivNSwYbC44MXvTH+7QES86Ei+/rSUvmjOaibXr3jcoEZZPoYSHBUWvuPM8yubjXw
+aY+dyyg9AjGMGq6bm5xm7prcE9IQT++sCzhnLx9PLpfEiFlPr3pnZKuLWvlEb/OV
+E0IkzzCAoFfLDfZAbEK5NInsd399Zw9o0Bfo3M0pRGzyZUHahnTKiGBagdK//tpm
+BhiT3azSvfWF7pxleUOCMJHTEum426AtaBpFyKBrvIEKr0OqgDj8uBsia4PH1lUY
+IwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBIZQEEWkQzIWbBHPbM5qGGkRgu2KfT
+39lv6LGDDjZaJH7CPFP1FElKAsw1FVOlsYGdF5xbvclqLiZeRa2WUlFqsEeZQHS2
+WcCWgsYjMANovjer9I834lFpxNATnKe4H3NsI3rlrfyBGJrSX3w/48s2xa8XgWDq
+7EWAk7GVDgPvc25kWIzlex6FXlfmPOnwsXrgpieCk6HH1jFn+xKshJHMntCjk3al
+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>
diff --git a/swamid-interfederations-2.0/srvcafe.uniso.br-idp-shibboleth.xml b/swamid-interfederations-2.0/srvcafe.uniso.br-idp-shibboleth.xml
new file mode 100644
index 00000000..3bb26916
--- /dev/null
+++ b/swamid-interfederations-2.0/srvcafe.uniso.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIFVOSVNPIC0g
+VW5pdmVyc2lkYWRlIGRlIFNvcm9jYWJhMQwwCgYDVQQLEwNTUEQxKDAmBgkqhkiG
+9w0BCQEWGXdpbGxpYW0ub2xpdmVpcmFAdW5pc28uYnIxETAPBgNVBAcTCFNvcm9j
+YWJhMRMwEQYDVQQIFApTw6NvIFBhdWxvMQswCQYDVQQGEwJCUjEWMBQGA1UEAxMN
+Y2FmZS51bmlzby5icjAeFw0xNDA1MTYxNzAzNTBaFw0xNzA1MTUxNzAzNTBaMIGw
+MSkwJwYDVQQKEyBVTklTTyAtIFVuaXZlcnNpZGFkZSBkZSBTb3JvY2FiYTEMMAoG
+A1UECxMDU1BEMSgwJgYJKoZIhvcNAQkBFhl3aWxsaWFtLm9saXZlaXJhQHVuaXNv
+LmJyMREwDwYDVQQHEwhTb3JvY2FiYTETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkG
+A1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUudW5pc28uYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDDGWne13N4Edo+DRkrx+sQwJPnh3Xzv00KomAfcn4l
+sH8RDMHvQEEv0oV82SCvrAEqf5HatLNZyxr2gioq73CGN8ijZjDayQ5rxgLKWeVM
++mlyuOXGGs/HQt9uFHglylC0uzM1Ns0bI2hpupKXmZvF+Mv6czX1sGlNMgLSMUvk
+wfCD4ak25YClASWwEzTzro9+kAtZV/lLWdrpENOgTU/H12QYIH7Gyjb20Mrksqu2
+5Wd5HFbyr/IwQF4FXfc6zS5soDCI2jqHJ4J/CE+JhCmJyUmbgzdGRg1smeKHpLPA
+c+q4dxHXlgG6O/Tk1tip455UbF7gevtNjxgcIOhTITftAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBABuT+O4ZBPQXWOaifgeuaA3o7pSegZExaqy4cTjOUH8UCZfyROd8
+gU6RmIWEKGdg/8FbY+L8UjqPYXzkzGNxxbQqWBu+ytrvAeSv24alfpEmI5M9sTzj
+OBGr+lwvbMLFKrSmDGfrWAGnEcj8l7zr5+WjiFgC8TT9RRkZmI2YL4LCa+xuaAHz
+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>
+      
+MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIFVOSVNPIC0g
+VW5pdmVyc2lkYWRlIGRlIFNvcm9jYWJhMQwwCgYDVQQLEwNTUEQxKDAmBgkqhkiG
+9w0BCQEWGXdpbGxpYW0ub2xpdmVpcmFAdW5pc28uYnIxETAPBgNVBAcTCFNvcm9j
+YWJhMRMwEQYDVQQIFApTw6NvIFBhdWxvMQswCQYDVQQGEwJCUjEWMBQGA1UEAxMN
+Y2FmZS51bmlzby5icjAeFw0xNDA1MTYxNzAzNTBaFw0xNzA1MTUxNzAzNTBaMIGw
+MSkwJwYDVQQKEyBVTklTTyAtIFVuaXZlcnNpZGFkZSBkZSBTb3JvY2FiYTEMMAoG
+A1UECxMDU1BEMSgwJgYJKoZIhvcNAQkBFhl3aWxsaWFtLm9saXZlaXJhQHVuaXNv
+LmJyMREwDwYDVQQHEwhTb3JvY2FiYTETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkG
+A1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUudW5pc28uYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDDGWne13N4Edo+DRkrx+sQwJPnh3Xzv00KomAfcn4l
+sH8RDMHvQEEv0oV82SCvrAEqf5HatLNZyxr2gioq73CGN8ijZjDayQ5rxgLKWeVM
++mlyuOXGGs/HQt9uFHglylC0uzM1Ns0bI2hpupKXmZvF+Mv6czX1sGlNMgLSMUvk
+wfCD4ak25YClASWwEzTzro9+kAtZV/lLWdrpENOgTU/H12QYIH7Gyjb20Mrksqu2
+5Wd5HFbyr/IwQF4FXfc6zS5soDCI2jqHJ4J/CE+JhCmJyUmbgzdGRg1smeKHpLPA
+c+q4dxHXlgG6O/Tk1tip455UbF7gevtNjxgcIOhTITftAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBABuT+O4ZBPQXWOaifgeuaA3o7pSegZExaqy4cTjOUH8UCZfyROd8
+gU6RmIWEKGdg/8FbY+L8UjqPYXzkzGNxxbQqWBu+ytrvAeSv24alfpEmI5M9sTzj
+OBGr+lwvbMLFKrSmDGfrWAGnEcj8l7zr5+WjiFgC8TT9RRkZmI2YL4LCa+xuaAHz
+u7FcVvwdnkRaJBMW8+99YtZd1DkhGac5z3rfeJagr4h/Dn7sDglWobnX/IjblwQo
+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>
diff --git a/swamid-interfederations-2.0/srvshibboleth.asfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/srvshibboleth.asfc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c9a04bd9
--- /dev/null
+++ b/swamid-interfederations-2.0/srvshibboleth.asfc.ac.uk-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						ExhzcnZzaGliYm9sZXRoLmFzZmMuYWMudWswHhcNMTQwMTA3MTYwMjI0WhcNMzQw
+						MTAyMTYwMjI0WjCBhTELMAkGA1UEBhMCR0IxEzARBgNVBAgTCkxhbmNhc2hpcmUx
+						GjAYBgNVBAcTEUFzaHRvbiBVbmRlciBMeW5lMSIwIAYDVQQKExlBc2h0b24gU2l4
+						dGggRm9ybSBDb2xsZWdlMSEwHwYDVQQDExhzcnZzaGliYm9sZXRoLmFzZmMuYWMu
+						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCS2BIAyZIFK07OlTIt
+						eoYkuz3iiWLp/kG4n9naDKw1EQ7iAbY6/vfnC0D9Gs7sS1Qq0oafilcqpEeZWutn
+						z24yc/iGJMOwHHI6+QZwdzULwZWbBRr9V1kesy1WxJYihX8JEOmawi/TmDECyCkA
+						6UZqvQTdniWBNzpQ1FWqTCQNK4EluxoVCVsx38pLHF0QYSTiojfXH46q2GRgD7NG
+						GcZdCRqm/lsnbV8v0o/F+WzRxSSQ6rsYwVOCVIT9aZ88JevgilDutmPayHbL8nVo
+						tqy/deyQ5P/hRhgNidC3aaKevzElSU++WxFEp6G0bWqm6FMeNC6l/I8hGwiwwi+a
+						yGP9AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBABVx5AkbvgqJzu2buqUDifFb8WEG
+						JdrR/8XUyISgoCS4HLTvglT9dpsYH2FOPDDNUoC6xHDH1ewbC3Y15Oj+e4DpOLPH
+						QNpflC+DaSA4M/Vm4Gro1M3VYiICZ0DZ/V824psUgmjPTCgdyjpVq0JUzDTL14ee
+						yohw7ORdRb7ikR1r3b8xdqme63+0bCEfUclFonQrZtlxnp3l/8SAjI4y4nD9NQFo
+						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>
+						MIIDiDCCAnACCQCMsALWwQfckDANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
+						R0IxEzARBgNVBAgTCkxhbmNhc2hpcmUxGjAYBgNVBAcTEUFzaHRvbiBVbmRlciBM
+						eW5lMSIwIAYDVQQKExlBc2h0b24gU2l4dGggRm9ybSBDb2xsZWdlMSEwHwYDVQQD
+						ExhzcnZzaGliYm9sZXRoLmFzZmMuYWMudWswHhcNMTQwMTA3MTYwMjI0WhcNMzQw
+						MTAyMTYwMjI0WjCBhTELMAkGA1UEBhMCR0IxEzARBgNVBAgTCkxhbmNhc2hpcmUx
+						GjAYBgNVBAcTEUFzaHRvbiBVbmRlciBMeW5lMSIwIAYDVQQKExlBc2h0b24gU2l4
+						dGggRm9ybSBDb2xsZWdlMSEwHwYDVQQDExhzcnZzaGliYm9sZXRoLmFzZmMuYWMu
+						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCS2BIAyZIFK07OlTIt
+						eoYkuz3iiWLp/kG4n9naDKw1EQ7iAbY6/vfnC0D9Gs7sS1Qq0oafilcqpEeZWutn
+						z24yc/iGJMOwHHI6+QZwdzULwZWbBRr9V1kesy1WxJYihX8JEOmawi/TmDECyCkA
+						6UZqvQTdniWBNzpQ1FWqTCQNK4EluxoVCVsx38pLHF0QYSTiojfXH46q2GRgD7NG
+						GcZdCRqm/lsnbV8v0o/F+WzRxSSQ6rsYwVOCVIT9aZ88JevgilDutmPayHbL8nVo
+						tqy/deyQ5P/hRhgNidC3aaKevzElSU++WxFEp6G0bWqm6FMeNC6l/I8hGwiwwi+a
+						yGP9AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBABVx5AkbvgqJzu2buqUDifFb8WEG
+						JdrR/8XUyISgoCS4HLTvglT9dpsYH2FOPDDNUoC6xHDH1ewbC3Y15Oj+e4DpOLPH
+						QNpflC+DaSA4M/Vm4Gro1M3VYiICZ0DZ/V824psUgmjPTCgdyjpVq0JUzDTL14ee
+						yohw7ORdRb7ikR1r3b8xdqme63+0bCEfUclFonQrZtlxnp3l/8SAjI4y4nD9NQFo
+						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>
diff --git a/swamid-interfederations-2.0/sse-idp.lanet.lv.xml b/swamid-interfederations-2.0/sse-idp.lanet.lv.xml
new file mode 100644
index 00000000..0ab2b8fa
--- /dev/null
+++ b/swamid-interfederations-2.0/sse-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?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>
+      <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>
+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>
+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>
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
new file mode 100644
index 00000000..802763fa
--- /dev/null
+++ b/swamid-interfederations-2.0/sso-ed.datamonitor.com-shibboleth-sp.xml
@@ -0,0 +1,80 @@
+<?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>
+						MIIDNDCCAhygAwIBAgIJAP/XaizrpNlBMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnNzby1lZC5kYXRhbW9uaXRvci5jb20wHhcNMDkwNDA2MTAwNzM0WhcNMTkw
+						NDA0MTAwNzM0WjAhMR8wHQYDVQQDExZzc28tZWQuZGF0YW1vbml0b3IuY29tMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuddGCkJFXviR4SRi3XTx8DoK
+						3+aJlykHiKhaiAEpDd9w58UnPF/zpUfjsgtTrX+TdZhH+qFMOaKs6D2g8SJvoeQX
+						WuiAhn3OKJJletlY1AoRD5Fc8rjkSxm2fIInbyq29ZfObrDoRVNgLHGZPmVGwCz8
+						+hj51L8eOll9/z1ltVa4HH1t1Xs1jHomRGz8fQAV3eXLkHZTnLiWpLh5oiMW8TXI
+						CoWMMUXKOyPwMO5LscwkDeFNmJvN9X+XMPiui20Qg6cacGaVdtGGne/Bvk0QDlL+
+						87DCk75+UH3DwhBBoBgnrvehUMlt74RKxtH+Cv33p5WFlk2xmS9+8GtG5xxkEQID
+						AQABo28wbTBMBgNVHREERTBDghZzc28tZWQuZGF0YW1vbml0b3IuY29thilodHRw
+						czovL3Nzby1lZC5kYXRhbW9uaXRvci5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						MXu5HxXSBcHmsiybSMrhwo++Hz8wDQYJKoZIhvcNAQEFBQADggEBACrHlgKlmU2Q
+						53w+aTrQUH9mhLeyGRZQXqvnuxwtrWVYeYtdCsOK5iMDz9IQGD2ev9I1qEx+12va
+						bOJNLoPSTJDQCvooD5krqoVmrTi+D87vxp64TCRYp1Z6qT8H6IJtKMBNrYnmTeCm
+						+Q/qp5Bd+dqCGcdzPtcdzIHNPZpjM4HCeZQtm7CDgnQCZ1kjPBKa1FwTMC50kafO
+						Nq109V5ZQQRDSDVgzxQR0RvkEZwZtvTqxKqVTLWwHcy3M34pmjpEbhJvpnAy+7F9
+						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>
+						MIIDNDCCAhygAwIBAgIJAP/XaizrpNlBMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnNzby1lZC5kYXRhbW9uaXRvci5jb20wHhcNMDkwNDA2MTAwNzM0WhcNMTkw
+						NDA0MTAwNzM0WjAhMR8wHQYDVQQDExZzc28tZWQuZGF0YW1vbml0b3IuY29tMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuddGCkJFXviR4SRi3XTx8DoK
+						3+aJlykHiKhaiAEpDd9w58UnPF/zpUfjsgtTrX+TdZhH+qFMOaKs6D2g8SJvoeQX
+						WuiAhn3OKJJletlY1AoRD5Fc8rjkSxm2fIInbyq29ZfObrDoRVNgLHGZPmVGwCz8
+						+hj51L8eOll9/z1ltVa4HH1t1Xs1jHomRGz8fQAV3eXLkHZTnLiWpLh5oiMW8TXI
+						CoWMMUXKOyPwMO5LscwkDeFNmJvN9X+XMPiui20Qg6cacGaVdtGGne/Bvk0QDlL+
+						87DCk75+UH3DwhBBoBgnrvehUMlt74RKxtH+Cv33p5WFlk2xmS9+8GtG5xxkEQID
+						AQABo28wbTBMBgNVHREERTBDghZzc28tZWQuZGF0YW1vbml0b3IuY29thilodHRw
+						czovL3Nzby1lZC5kYXRhbW9uaXRvci5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						MXu5HxXSBcHmsiybSMrhwo++Hz8wDQYJKoZIhvcNAQEFBQADggEBACrHlgKlmU2Q
+						53w+aTrQUH9mhLeyGRZQXqvnuxwtrWVYeYtdCsOK5iMDz9IQGD2ev9I1qEx+12va
+						bOJNLoPSTJDQCvooD5krqoVmrTi+D87vxp64TCRYp1Z6qT8H6IJtKMBNrYnmTeCm
+						+Q/qp5Bd+dqCGcdzPtcdzIHNPZpjM4HCeZQtm7CDgnQCZ1kjPBKa1FwTMC50kafO
+						Nq109V5ZQQRDSDVgzxQR0RvkEZwZtvTqxKqVTLWwHcy3M34pmjpEbhJvpnAy+7F9
+						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>Support Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:support@datamonitor.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-edu.datamonitor.com-shibboleth-sp.xml b/swamid-interfederations-2.0/sso-edu.datamonitor.com-shibboleth-sp.xml
new file mode 100644
index 00000000..22aa2d5e
--- /dev/null
+++ b/swamid-interfederations-2.0/sso-edu.datamonitor.com-shibboleth-sp.xml
@@ -0,0 +1,64 @@
+<?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-edu.datamonitor.com/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-25T14:51:54Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol 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-edu.datamonitor.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sso-edu.datamonitor.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>
+						MIIDLTCCAhWgAwIBAgIJAPEARr/fSR6iMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF3Nzby1lZHUuZGF0YW1vbml0b3IuY29tMB4XDTEyMDUyNTEzMTQxOFoXDTE1
+						MDUyNTEzMTQxOFowIjEgMB4GA1UEAxMXc3NvLWVkdS5kYXRhbW9uaXRvci5jb20w
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTb/l1EYurxP9VEh52g0mh
+						AUghEgUttKK8pK24M6AycR31By7SIheCo6pl91up5AIklg5b5Duq5fMlBN5WRcln
+						jC8sL98QxGS9Rl/F+LowtCxp7uXX9GGQ2NkUwUr4tvjg9HG+9BRDoBRuLLsoD9IJ
+						6nSImBa7gBXlEwh0yPH+9+tHPoI5zXLlY0Ss+pCXA9mU5iseHoYSEsb5EBd0sz+F
+						0galGRXZkVCU3PswP/vJ1AFiXJXfe1FMdBMxpqG/t89EK78RsZAyH6Pg8FplKFXC
+						7h0vLv63Rx1FIodnH9xa6k+5hX1LPk720ueqf+wVJuSJlWuyrAVslyKF6wyUkuTP
+						AgMBAAGjZjBkMEMGA1UdEQQ8MDqCF3Nzby1lZHUuZGF0YW1vbml0b3IuY29thh9o
+						dHRwczovL3Nzby1lZHUuZGF0YW1vbml0b3IuY29tMB0GA1UdDgQWBBRpkR0vHLfO
+						QUjVToJ/aO4n689nzTANBgkqhkiG9w0BAQUFAAOCAQEACRVd/BiZHPRxx1/RR0Z+
+						CYjmo/EhnbLZbGzLYVZcr0f0GvG5Z8rqHoIr8JgAjjJ0f/VAKEXR/VWaR6641zho
+						NQ91BwXmsNlk+sJPb5UZ7f71fqUbj0P4vD//+3Vv8cgZoSnnbZH8SeILDbEtNNsV
+						KK5WBNCHFTNqbZADGT3gbdp2Yqtyqo+0Or4QMFOp5I4pKUZVnfbxdpCL4zha620e
+						g7EF6Na72cHBA1e9oCu3fRtKUFvUsY2sGlOQBljN5GIbukKt3eKhDA1F1sfYVj/w
+						ZTNxdHOrjQBVdn6vnBjFYzKrNgiZZB9ZCm9Gcb2u0/+77IoDiyCWSbDyI9PbjGmT
+						IQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Datamonitor Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Datamonitor - 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-epos.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sso-epos.some.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..27e5b934
--- /dev/null
+++ b/swamid-interfederations-2.0/sso-epos.some.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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://sso-epos.some.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="2014-02-27T11:20: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sso-epos.some.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>
+						MIIDNDCCAhygAwIBAgIJAJHKGp/+izijMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnNzby1lcG9zLnNvbWUub3guYWMudWswHhcNMTQwMjI2MTUwODM5WhcNMjQw
+						MjI0MTUwODM5WjAhMR8wHQYDVQQDExZzc28tZXBvcy5zb21lLm94LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxK24wmjmNTuudz0HDi8xGw1x
+						t5v0jh301LqY7sjLKlxd+PoD+YdgdCLQR5gigy3mj/nTSdeAsPYFkhb679SUggS3
+						PmD2R0byhHL2e+MgRyG9euiq/e0/JNtKuRugccJFVKHSgr6bXARP4LGpN8H7oou1
+						S/I3jQwIvh1GdP/MkolhdgWsts4jRV5c2/m6CzrCvqHFcoyrN0ZUkTP2npNwqAPt
+						HvpQncjgUrtNm4v5beC3iCKzvn0q1Img4449MZrQUpAkwONMTb5lFn1emq48f6DF
+						cxylRZwY1u3z63k7YOm2mjvvW8axUoH8Mjktq42ZK29scNBzIWv3liHTU/KXIQID
+						AQABo28wbTBMBgNVHREERTBDghZzc28tZXBvcy5zb21lLm94LmFjLnVrhilodHRw
+						czovL3Nzby1lcG9zLnNvbWUub3guYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						SgHanJ//YKaw4iZ1IaEUS0q/rRUwDQYJKoZIhvcNAQEFBQADggEBALBM1ASGlxEl
+						sJALpwFfz987l1SDYa3fBLXCV9N194MgwtNeQyjoAM2VzWfbIUlCoVJuR8km6j47
+						xbZpJpRMKH7pV83RtI//+3Wm9r4R+TYP7woWbnzKgj2wEFM2ce6jkJ+vwcFlS4ES
+						W57SDZqlL4C6XqJNRFVAQTFdE0UoBvsSiKGXR8HAm+4MUjSNjrqq3TYqq/Ks/PGh
+						xrZT5L+b5jajEf81Ch6WYBBGyFb4GaIw+8aYwzAyS0z+aG9oTJIjehdGnVF/unlc
+						OnC87ksYf/icPcU2jtOfL+D3C48ePJ37jKehg9TyDwzy0r2riBc6WrycWWAmyeyh
+						FcgVm9Zjv/8=
+					</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-epos.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-epos.some.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://sso-epos.some.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://sso-epos.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso-epos.some.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 SC EPOS2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Somerville College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it.support@some.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Somerville College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it.support@some.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso-meals.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sso-meals.some.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..b79d6330
--- /dev/null
+++ b/swamid-interfederations-2.0/sso-meals.some.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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://sso-meals.some.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="2014-02-07T09:24: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sso-meals.some.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>
+						MIIDDDCCAfSgAwIBAgIJAJ7DgOId94EXMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF3Nzby1tZWFscy5zb21lLm94LmFjLnVrMB4XDTE0MDUwNzEyMTc1NVoXDTI0
+						MDUwNDEyMTc1NVowIjEgMB4GA1UEAxMXc3NvLW1lYWxzLnNvbWUub3guYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXKqSIdFGmx+j/kwnRtIS+
+						hp9gFesgW3QaozTA8Xt4rotBm1KyfeCfNngcsouV/xNRd+qgQ1G1HZXOfqguv35X
+						orHc07Qdr76CtIGo6u+sjWXgJub9+87rfO7f5s00Is6L6IgIEV3WaWLZjlCdyQ3z
+						ZPCmKhU6jmA7HyqINpz7CbK8ChVQIfCYhvjzvXclzfyAypkaV3bCv3Exe61Wkj4g
+						QgO4x9NMio2++MZNIuT5oUA3fHCXwSYKMpdmdVTmR+lyb7RjvGOf2pn7TwdEVKG+
+						5D7NtLPH5kXd/FmZjmrbRutaofPQ6iBJqh8MwkEH+6nWHDkXPPcRYNC4bT0uELvr
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3Nzby1tZWFscy5zb21lLm94LmFjLnVrMB0G
+						A1UdDgQWBBRAagWHG2SqaiNMxN2dQ7m9VvYBxzANBgkqhkiG9w0BAQUFAAOCAQEA
+						ksL6qd7gNUh0/YpWGxqeZrbDC1tmFjs2WEG2vMY7Tkms882USrbqPWt9jT4BUkIY
+						9w3R+Ux9ZAfFIS78gbsOtrnY/UvIHu6XspBfgP6o43x7iSZUo+Ky7x2FfYSpu3DF
+						C3SthR6n9OrYGTbQct7FzF/QpXnl1emDuzGtKe/a//XnVRevp64w+68G6v8Xs3dS
+						ZyISiQ3CkdeZZm9AoFkjX61uofrCaIjwp7ua0igkHU6EiBM7Zl5H4J1l/ddSpGth
+						u7LD03PH9+NExHi07hkWrhBhIWF4V+E9Rzo+FJFjTTC+S/bHhfU9Qo2hDti1XekI
+						eh55XqSqL91ZRV4UwUs1NQ==
+					</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-meals.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-meals.some.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://sso-meals.some.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://sso-meals.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso-meals.some.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 SCMBS2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Somerville College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it.support@some.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Somerville College IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it.support@some.ox.ac.uk</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
new file mode 100644
index 00000000..ba3561a6
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.bsfc.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIsaf63mJRi9DTIIEOZX
+						oTUhdrTefTq6ZgKMyPtehzYJpItEgN/CV/1l6iUZe2U5R8D5RtGXMhzqaFz/ZadW
+						tw+RB3W0s60YchtuSqDDC3QTK+TWZLDIHDlldik9zwts3819cU/sBdqwOzKu6WTb
+						vwzvRrCwiAt4wnOqXcF3EjncKWfNEySUsmRZlEQPvvbx9U3sPh3tyWWGN3rB8fBu
+						KXE6LKNuwopaBDjOAqm0auIpVxgqedDSwhT80UpV0ncAL8/A6D2WYdUZ5kwXE4SU
+						818MMM7U4d54TVdqFjHow4GMuzIsQ4AqE2bFlBB2ABLUVmVMXOrxv0wFvZ3ULcwU
+						/20CAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYmlkcC5ic2ZjLmFjLnVrhilodHRw
+						czovL3NoaWJpZHAuYnNmYy5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						jLVWkxPeVPF+7dS8T+2Dc3vbEDMwDQYJKoZIhvcNAQEFBQADggEBAEcAtYMdqfwd
+						uhf/ERsHz2fss7ROO6JFndGq19NXLlERMDf9qG6UHz1RKtzs/kNSS9Pr2JcERKBB
+						4hJOTPQ1q8cU5//2RIGsWrO+7Wt/WS1kQlAu0Ez9ly9nC8KqeAkxnhaCSTx3csnr
+						uSDKZSBupejCt+bDvXF1A1tMigvDhKbP35ELwx64900xSSfK+To51AdhAkzec4z0
+						lfSqU/r6WiiM1a5KTAfVjU4JPrFYU0VjRWds6BpNBZIx8JRYHHFhR7hxmOweJcKH
+						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>
+						MIIDNDCCAhygAwIBAgIVAJQNNxLqLyuVe5PctJiOH67/djG+MA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEnNoaWJpZHAuYnNmYy5hYy51azAeFw0xNDA0MTgxMzEx
+						MDNaFw0zNDA0MTgxMzExMDNaMB0xGzAZBgNVBAMTEnNoaWJpZHAuYnNmYy5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIsaf63mJRi9DTIIEOZX
+						oTUhdrTefTq6ZgKMyPtehzYJpItEgN/CV/1l6iUZe2U5R8D5RtGXMhzqaFz/ZadW
+						tw+RB3W0s60YchtuSqDDC3QTK+TWZLDIHDlldik9zwts3819cU/sBdqwOzKu6WTb
+						vwzvRrCwiAt4wnOqXcF3EjncKWfNEySUsmRZlEQPvvbx9U3sPh3tyWWGN3rB8fBu
+						KXE6LKNuwopaBDjOAqm0auIpVxgqedDSwhT80UpV0ncAL8/A6D2WYdUZ5kwXE4SU
+						818MMM7U4d54TVdqFjHow4GMuzIsQ4AqE2bFlBB2ABLUVmVMXOrxv0wFvZ3ULcwU
+						/20CAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYmlkcC5ic2ZjLmFjLnVrhilodHRw
+						czovL3NoaWJpZHAuYnNmYy5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						jLVWkxPeVPF+7dS8T+2Dc3vbEDMwDQYJKoZIhvcNAQEFBQADggEBAEcAtYMdqfwd
+						uhf/ERsHz2fss7ROO6JFndGq19NXLlERMDf9qG6UHz1RKtzs/kNSS9Pr2JcERKBB
+						4hJOTPQ1q8cU5//2RIGsWrO+7Wt/WS1kQlAu0Ez9ly9nC8KqeAkxnhaCSTx3csnr
+						uSDKZSBupejCt+bDvXF1A1tMigvDhKbP35ELwx64900xSSfK+To51AdhAkzec4z0
+						lfSqU/r6WiiM1a5KTAfVjU4JPrFYU0VjRWds6BpNBZIx8JRYHHFhR7hxmOweJcKH
+						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>
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
new file mode 100644
index 00000000..b9d4e4df
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.canterbury.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,108 @@
+<?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>
+      <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>
+						MIIDPDCCAiSgAwIBAgIVANaQnCAp0hjyfB+AlIzHFLa2I9EvMA0GCSqGSIb3DQEB
+						BQUAMB8xHTAbBgNVBAMTFHNzby5jYW50ZXJidXJ5LmFjLnVrMB4XDTEzMDcyNjE0
+						MzQ0M1oXDTE2MDcyNjE0MzQ0M1owHzEdMBsGA1UEAxMUc3NvLmNhbnRlcmJ1cnku
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCG4ddRgNHZrvt1
+						Ze2wElTfmo2+Y6Euo2vVDPt2Kmu4vwmPrr0BiafQA7NevLFPckE6sP4fjeZnoBR8
+						MSZpSzHiZpf//hEp0ZUFf37SBC+A04H64jnKvDxYSDihgNCpA3lAcLFYj8H/nFWS
+						RfhkKam8edfcETOqtivj3U/imXFYyFH7X5KPPSXTnVxgpX7fao+ik31OHqUl4NLn
+						yvLUMkASk442Cl7y67V6Yc38EXw+OHrAJ3FXpD+lgkLn9LMfspJxI0EQhYDRAO3Q
+						V5RIhGcxOtkOnO9+FW9gHrktVLT2MwN3tpxpPR0Al8om1O0V7MUkgI9gZ/otWG3v
+						SjJEK3khAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNzby5jYW50ZXJidXJ5LmFjLnVr
+						hitodHRwczovL3Nzby5jYW50ZXJidXJ5LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBRg/rITiyhdF1j8oOHSiproLSNiVjANBgkqhkiG9w0BAQUFAAOCAQEA
+						gEWjXuYQwxt0yzpzh4n8PYs22B8aH+jwo5lqiUPSAXQck809YBtpS7oYVclQPdTg
+						cZ0W0Zbh6+V6qqtvDWUnmZwKLdgPKcnC1wXxJxMPGrK2EjB/6CJAg6fn20e4bqX7
+						t70GW49LMiyQjQHApdt5Z0RNk3oBpZ3u/8/AyOHg3BWkXtFUis3zbgXs6bnNEgfT
+						IIi1oNlZMFDw/BwO4G3SwGbxZfqXaFDQEWL9th1ECitGs1G3jBVjwW/9rOb6ojuL
+						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>
+						MIIDPDCCAiSgAwIBAgIVANaQnCAp0hjyfB+AlIzHFLa2I9EvMA0GCSqGSIb3DQEB
+						BQUAMB8xHTAbBgNVBAMTFHNzby5jYW50ZXJidXJ5LmFjLnVrMB4XDTEzMDcyNjE0
+						MzQ0M1oXDTE2MDcyNjE0MzQ0M1owHzEdMBsGA1UEAxMUc3NvLmNhbnRlcmJ1cnku
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCG4ddRgNHZrvt1
+						Ze2wElTfmo2+Y6Euo2vVDPt2Kmu4vwmPrr0BiafQA7NevLFPckE6sP4fjeZnoBR8
+						MSZpSzHiZpf//hEp0ZUFf37SBC+A04H64jnKvDxYSDihgNCpA3lAcLFYj8H/nFWS
+						RfhkKam8edfcETOqtivj3U/imXFYyFH7X5KPPSXTnVxgpX7fao+ik31OHqUl4NLn
+						yvLUMkASk442Cl7y67V6Yc38EXw+OHrAJ3FXpD+lgkLn9LMfspJxI0EQhYDRAO3Q
+						V5RIhGcxOtkOnO9+FW9gHrktVLT2MwN3tpxpPR0Al8om1O0V7MUkgI9gZ/otWG3v
+						SjJEK3khAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNzby5jYW50ZXJidXJ5LmFjLnVr
+						hitodHRwczovL3Nzby5jYW50ZXJidXJ5LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBRg/rITiyhdF1j8oOHSiproLSNiVjANBgkqhkiG9w0BAQUFAAOCAQEA
+						gEWjXuYQwxt0yzpzh4n8PYs22B8aH+jwo5lqiUPSAXQck809YBtpS7oYVclQPdTg
+						cZ0W0Zbh6+V6qqtvDWUnmZwKLdgPKcnC1wXxJxMPGrK2EjB/6CJAg6fn20e4bqX7
+						t70GW49LMiyQjQHApdt5Z0RNk3oBpZ3u/8/AyOHg3BWkXtFUis3zbgXs6bnNEgfT
+						IIi1oNlZMFDw/BwO4G3SwGbxZfqXaFDQEWL9th1ECitGs1G3jBVjwW/9rOb6ojuL
+						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>
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
new file mode 100644
index 00000000..b2565e1f
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.connectis.nl-broker-sso-tpd-ukf.xml
@@ -0,0 +1,69 @@
+<?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>
+						MIIG1jCCBL6gAwIBAgIQdhfb7fVnOGRYSmoe+FjYWzANBgkqhkiG9w0BAQsFADBd
+						MQswCQYDVQQGEwJOTDEsMCoGA1UECgwjRVNHIGRlIEVsZWN0cm9uaXNjaGUgU2ln
+						bmF0dXVyIEIuVi4xIDAeBgNVBAMMF0VTRyBPcmdhbmlzYXRpZSBDQSAtIEcyMB4X
+						DTE1MDEyMTAwMDAwMFoXDTE4MDEyMDIzNTk1OVowgYwxCzAJBgNVBAYTAk5MMRUw
+						EwYDVQQIDAxadWlkLUhvbGxhbmQxEjAQBgNVBAcMCVJvdHRlcmRhbTErMCkGA1UE
+						CgwiQ29ubmVjdGVkIEluZm9ybWF0aW9uIFN5c3RlbXMgQi5WLjEKMAgGA1UEBRMB
+						MTEZMBcGA1UEAwwQYzAxLmNvbm5lY3Rpcy5ubDCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBAI9mGYL4aTRpDB8wSEcZF0NfuZljUpnyGpSTGBO3ANL3qYtb
+						LLMn9MdyX0xZuMQPPqr8x97PAR4DZqos+2vA0VArOqFo/c9Sw5sjZoV2NaMm3ODn
+						PWvqeRGU/I0E70Q1rgWHWHUYgbSxXX9qLQFRJoSFDRRheI0kTfmyw2zyaG8D2X5v
+						2kx/7dhbfbm4cUznwvdN1d5vasvgD0G7JrimzEAsm0GwKu7tWlaTRJDT8cX5VVYE
+						/6Rot4/vX/q8f0hfWq2ezHfZ4HX1AApBWlpVwKguqfWZaPKKNbOnicyW3kc6X9Rp
+						zkaZ2PJ6lpzyhYTQHw/DfhguK7I+wWaM1mIq/48CAwEAAaOCAmAwggJcMAwGA1Ud
+						EwEB/wQCMAAwUQYDVR0fBEowSDBGoESgQoZAaHR0cDovL2NybC5kZS1lbGVjdHJv
+						bmlzY2hlLXNpZ25hdHV1ci5ubC9lc2cvb3JnYW5pc2F0aWVjYWcyLmNybDAOBgNV
+						HQ8BAf8EBAMCA6gwHQYDVR0OBBYEFJkzmNtwPqxkFwc8PcccMe6klqc8MB8GA1Ud
+						IwQYMBaAFLosdwsI9w10HS/cXYCjl0HsqCeoMIHwBgNVHSAEgegwgeUwgeIGCmCE
+						EAGHawECBQYwgdMwNAYIKwYBBQUHAgEWKGh0dHA6Ly9jcHMuZGUtZWxlY3Ryb25p
+						c2NoZS1zaWduYXR1dXIubmwwgZoGCCsGAQUFBwICMIGNGoGKVGhlIHRlcm1zIGFu
+						ZCBjb25kaXRpb25zIGFzIG1lbnRpb25lZCBvbiBvdXIgd2Vic2l0ZSAoY3BzLmRl
+						LWVsZWN0cm9uaXNjaGUtc2lnbmF0dXVyLm5sKSwgYXJlIGFwcGxpY2FibGUgdG8g
+						YWxsIG91ciBwcm9kdWN0cyBhbmQgc2VydmljZXMuMFAGA1UdEQRJMEeCEGMwMS5j
+						b25uZWN0aXMubmygMwYKKwYBBAGCNxQCA6AlDCMyLjE2LjUyOC4xLjEwMDMuMS4z
+						LjUuMy4xLTEwMTk5OTExMTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+						RQYIKwYBBQUHAQEEOTA3MDUGCCsGAQUFBzABhilodHRwOi8vb2NzcC5kZS1lbGVj
+						dHJvbmlzY2hlLXNpZ25hdHV1ci5ubDANBgkqhkiG9w0BAQsFAAOCAgEAe7fGepJe
+						P7E4r2e+iNdvX66nTlkymXsbh+VhpWIRjLtHkatBJ7yJR2LTbdDGHh4R3JddS5fG
+						8C2q/nhkxhS2uuBHGGs9+PtnvPIpXR6OT7tAgJxokN8ECBflvzTBiMRDWSc/wmCd
+						6wZmPF2YFrqDq0dRb6HsQU1ikGJjsLUckH65rupe9VgrjGcII38EGpibLCPYQHhb
+						iNypnPG3mljjQ8fQVlYA7qNizw4YEQMA70vwYYXsnduoht9hGONr14O03RccDCPL
+						CWDIIXNjdsmXL7qAlNC3crXTy2v3YTM/DKW/WTmsTQQP5zSwHVJP1a83r6iiZVnU
+						EhrDfyr3c0MI73zoxfXbf26S7sTocgjd1CsVZ7nxjzzS1lWEoFg1Txyrj7wgaHUW
+						Bc3YoYMqtVr9M57EL8BFW4KjkTUT/RZXrxkSGJPozsZpZF//d2K5G23V5JIbfLlM
+						Ub1sW9w7D1eiYMhcFtWDM9EW0IlYmFGefD4SuNyo+t/AX+Uq3gmrlDnCXVSWtPo6
+						vZqvS89IV3lE9MQ2wt/hi9EkRZFrMwrh42AOKdawNb7yUwRcO/gdgGp/odP2iU2f
+						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>
diff --git a/swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml
new file mode 100644
index 00000000..6de7f9ac
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.dshs-koeln.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-01T10:15:58Z">
+      <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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dshs-koeln.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Deutsche Sporthochschule Köln</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">German Sport University Cologne</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Die Deutsche Sporthochschule Köln, 1947 in Köln gegründet, vereint qualifizierte Lehre, internationale Forschung und Spitzensport auf höchstem Niveau. Sie ist Deutschlands einzige Universität, die sich ausschließlich dem Themenfeld Sport und Bewegung widmet. Während an anderen Universitäten die Sportwissenschaft neben vielen weiteren Fachgebieten besteht, findet man in Köln eine außergewöhnliche Situation vor: An 21 Instituten, vier An-Instituten und neun wissenschaftlichen Zentren wird das vielfältige und spannende Gebiet der Sportwissenschaft in allen seinen Facetten detailliert unter die Lupe genommen.</mdui:Description>
+        <mdui:Description xml:lang="en">The University is recognized internationally for its research: the Faculty of Biochemistry’s renowned testing laboratory has been a part of the international fight against doping, experiments conducted at the Faculty of Physiology and Anatomy have soared with the astronauts into space, and the Research Centre for Performance Sport has brought together the combined efforts of multiple departments to coach and supervise elite athletes. The 21 faculties at the German Sport University Cologne – from education and humanities to social sciences and biomedicine – offer a diverse array of teaching and research opportunities to the university’s some 5,300 students from more than 60 countries. The campus, located directly across from the Muengersdorf Sport Park, provides students and staff alike a first-class environment for learning, working, and living.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://sso.dshs-koeln.de/logo_dshs_kl.png</mdui:Logo>
+        <mdui:Logo height="66" width="65">https://sso.dshs-koeln.de/logo_dshs_gr.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.dshs-koeln.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.dshs-koeln.de/english/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sso.dshs-koeln.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sso.dshs-koeln.de,OU=Dezernat 5.3,O=Deutsche Sporthochschule Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGQDCCBSigAwIBAgIHGEspqdzPezANBgkqhkiG9w0BAQsFADCBwzELMAkGA1UE
+BhMCREUxJzAlBgNVBAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjE7
+MDkGA1UECxMySW5mb3JtYXRpb25zLSB1bmQgS29tbXVuaWthdGlvbnN0ZWNobm9s
+b2dpZXplbnRydW0xLDAqBgNVBAMTI0RldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBL
+b2VsbiAtIENBMSAwHgYJKoZIhvcNAQkBFhFpdWtAZHNocy1rb2Vsbi5kZTAeFw0x
+NDEwMDEwNzI0MDlaFw0xOTA3MDkyMzU5MDBaMIGXMQswCQYDVQQGEwJERTEcMBoG
+A1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBxMFS29lbG4xJzAlBgNV
+BAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjEVMBMGA1UECxMMRGV6
+ZXJuYXQgNS4zMRowGAYDVQQDExFzc28uZHNocy1rb2Vsbi5kZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL2riKeEOiwcQmimbBWijXL5rg2SZJ+qWeqU
+z7S0FWoJnmVxWiDbI2+oxPILr1KDDa30ka/V985R31PJnHkf0vu8l+AIC9yBg51x
+bSml9vAeWhlxXczWw/KTGTxhIwdPOndIvvyaOsuBWQ9FLfJpx76d+MRiwiF5O1S8
+hVVytEOeJ4SvjL7z8kLXZ7G7jqS7yXzP4XY4jo4xzZuQMiXh8o8pD8vVK8dR2Cge
+js3F66inRV3FcWzt0XToYiFUGBTvDUpFVf62mS33xca9qSGmmxRgEDEN9zj2HAtc
+pq6bKYTSvTzvEBDzcoJqj7ZWe2ie9KGbckZfgG5ZKR1wALoiNGkCAwEAAaOCAmEw
+ggJdME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEGDysGAQQBga0hgiwC
+AQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
+HQ4EFgQUnr4i0Cl7HcLzIJgupNIWDcJr3RMwHwYDVR0jBBgwFoAUzq4uABegkDVE
+JDZfI3unKqZmtWswMwYDVR0RBCwwKoIRc3NvLmRzaHMta29lbG4uZGWBFXN1cHBv
+cnRAZHNocy1rb2Vsbi5kZTCBhQYDVR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS9kc2hzLWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4
+hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2RzaHMta29lbG4tY2EvcHViL2NybC9j
+YWNybC5jcmwwgdUGCCsGAQUFBwEBBIHIMIHFMDMGCCsGAQUFBzABhidodHRwOi8v
+b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRgYIKwYBBQUHMAKGOmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZHNocy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZHNo
+cy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQAD
+ggEBACm4urG18LsstWwUGDNyqslC0YKihGbClQKXHR6i9Ugmo30JnvpzrUNGLx20
+vM6lxmEGAZjs/l4JfPS8zSXvlU7YkHkoe6CaFqGLqfiXgbDvdydlPe6HmnW6xbI2
+fG+4lt5v58MmN7q30ttxTCiZWN83JwFj2xNIVpf07AdKZJuG/7MG+Lp7LLw56hpe
+rVDHH6cFq6xSr3qPv4NSJf+iHCa0MkpoqEENLXLFnrtan5l5sHYAJcr7smR2h9oS
+IvDoviW6Ttfq6uEFX0ymhUa7KPkTaU2+ywlqjlvNYEENl+V2Pa7m+Mmh4Df550WD
+G6UwcO6gyha4+bma6xJXYLqJqPE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-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://sso.dshs-koeln.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-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://sso.dshs-koeln.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.dshs-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">dshs-koeln.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sso.dshs-koeln.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sso.dshs-koeln.de,OU=Dezernat 5.3,O=Deutsche Sporthochschule Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGQDCCBSigAwIBAgIHGEspqdzPezANBgkqhkiG9w0BAQsFADCBwzELMAkGA1UE
+BhMCREUxJzAlBgNVBAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjE7
+MDkGA1UECxMySW5mb3JtYXRpb25zLSB1bmQgS29tbXVuaWthdGlvbnN0ZWNobm9s
+b2dpZXplbnRydW0xLDAqBgNVBAMTI0RldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBL
+b2VsbiAtIENBMSAwHgYJKoZIhvcNAQkBFhFpdWtAZHNocy1rb2Vsbi5kZTAeFw0x
+NDEwMDEwNzI0MDlaFw0xOTA3MDkyMzU5MDBaMIGXMQswCQYDVQQGEwJERTEcMBoG
+A1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBxMFS29lbG4xJzAlBgNV
+BAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjEVMBMGA1UECxMMRGV6
+ZXJuYXQgNS4zMRowGAYDVQQDExFzc28uZHNocy1rb2Vsbi5kZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL2riKeEOiwcQmimbBWijXL5rg2SZJ+qWeqU
+z7S0FWoJnmVxWiDbI2+oxPILr1KDDa30ka/V985R31PJnHkf0vu8l+AIC9yBg51x
+bSml9vAeWhlxXczWw/KTGTxhIwdPOndIvvyaOsuBWQ9FLfJpx76d+MRiwiF5O1S8
+hVVytEOeJ4SvjL7z8kLXZ7G7jqS7yXzP4XY4jo4xzZuQMiXh8o8pD8vVK8dR2Cge
+js3F66inRV3FcWzt0XToYiFUGBTvDUpFVf62mS33xca9qSGmmxRgEDEN9zj2HAtc
+pq6bKYTSvTzvEBDzcoJqj7ZWe2ie9KGbckZfgG5ZKR1wALoiNGkCAwEAAaOCAmEw
+ggJdME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEGDysGAQQBga0hgiwC
+AQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
+HQ4EFgQUnr4i0Cl7HcLzIJgupNIWDcJr3RMwHwYDVR0jBBgwFoAUzq4uABegkDVE
+JDZfI3unKqZmtWswMwYDVR0RBCwwKoIRc3NvLmRzaHMta29lbG4uZGWBFXN1cHBv
+cnRAZHNocy1rb2Vsbi5kZTCBhQYDVR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS9kc2hzLWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4
+hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2RzaHMta29lbG4tY2EvcHViL2NybC9j
+YWNybC5jcmwwgdUGCCsGAQUFBwEBBIHIMIHFMDMGCCsGAQUFBzABhidodHRwOi8v
+b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRgYIKwYBBQUHMAKGOmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZHNocy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZHNo
+cy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQAD
+ggEBACm4urG18LsstWwUGDNyqslC0YKihGbClQKXHR6i9Ugmo30JnvpzrUNGLx20
+vM6lxmEGAZjs/l4JfPS8zSXvlU7YkHkoe6CaFqGLqfiXgbDvdydlPe6HmnW6xbI2
+fG+4lt5v58MmN7q30ttxTCiZWN83JwFj2xNIVpf07AdKZJuG/7MG+Lp7LLw56hpe
+rVDHH6cFq6xSr3qPv4NSJf+iHCa0MkpoqEENLXLFnrtan5l5sHYAJcr7smR2h9oS
+IvDoviW6Ttfq6uEFX0ymhUa7KPkTaU2+ywlqjlvNYEENl+V2Pa7m+Mmh4Df550WD
+G6UwcO6gyha4+bma6xJXYLqJqPE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-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:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e421</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e421</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Deutsche Sporthochschule Köln</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">German Sport University Cologne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.dshs-koeln.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.dshs-koeln.de/english/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>DSHS</md:SurName>
+    <md:EmailAddress>mailto:support@dshs-koeln.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Silke</md:GivenName>
+    <md:SurName>Knorr</md:SurName>
+    <md:EmailAddress>mailto:s.knorr@dshs-koeln.de</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
new file mode 100644
index 00000000..47658d4b
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.ft.com-sso-sp-oa-metadata.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIC+zCCAeOgAwIBAgIEafPFVDANBgkqhkiG9w0BAQsFADAuMRcwFQYDVQQKEw5G
+						aW5hbmNpYWxUaW1lczETMBEGA1UEAxMKc3NvLmZ0LmNvbTAeFw0xNDA3MDMxMzQy
+						MDZaFw0yNDA2MzAxMzQyMDZaMC4xFzAVBgNVBAoTDkZpbmFuY2lhbFRpbWVzMRMw
+						EQYDVQQDEwpzc28uZnQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAkulmKh5DYu+xehNMXRz4Z5o7nZkMQol13xaldjkz9fBhMfcXkQTiAv8fQQaV
+						iwCkW41Awnv0wZpuJTfFPtAI8WUWzP/sY0/hzvQBlYSU3QlEFiTqfZvU5QYzfx5E
+						1ojgE9duo14Om/OXqdpZeajHH1v7QbaBtPFcsQsHCwKasmw1tybQ/bIHdeavJRtc
+						ybzsb7L5HInkooOttwzQr13kvmJcrBpnwdiyN2k7LyzM4nBGAn/BlfkWSGFXO/AL
+						HrUeoNqwWgqLbHnCBie9wWP6Lny+RhGsmyRbToQ2+BMvAZYL0gZWBsOGU9BvA4Zj
+						B0V1NQxRarqWnJf+b/Y4ydzXmwIDAQABoyEwHzAdBgNVHQ4EFgQUBfAdjBVmPr7R
+						FQxK1LBJrrp+4QswDQYJKoZIhvcNAQELBQADggEBAD2K0SlIiPK+uQ6Qv5/PzgID
+						WEw9tL2dR+badmm0PhMpG4JAJMSZj23/OdslbN5MjEIkoQSfbE1VZ0UKzPIXI2XJ
+						LcGAcpJyDkOuXDqU2hwenqnK6ea8TWjfmQXLGEF/lQ/oqizNvFBouzcBUi9NHj62
+						BE+MWP21n4ETGUN16FfvoDogsPGvL1VAJdxUmcvN5jdg+HkbGvKlbe4P8LIQu4jY
+						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>
+						MIIC+zCCAeOgAwIBAgIEafPFVDANBgkqhkiG9w0BAQsFADAuMRcwFQYDVQQKEw5G
+						aW5hbmNpYWxUaW1lczETMBEGA1UEAxMKc3NvLmZ0LmNvbTAeFw0xNDA3MDMxMzQy
+						MDZaFw0yNDA2MzAxMzQyMDZaMC4xFzAVBgNVBAoTDkZpbmFuY2lhbFRpbWVzMRMw
+						EQYDVQQDEwpzc28uZnQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAkulmKh5DYu+xehNMXRz4Z5o7nZkMQol13xaldjkz9fBhMfcXkQTiAv8fQQaV
+						iwCkW41Awnv0wZpuJTfFPtAI8WUWzP/sY0/hzvQBlYSU3QlEFiTqfZvU5QYzfx5E
+						1ojgE9duo14Om/OXqdpZeajHH1v7QbaBtPFcsQsHCwKasmw1tybQ/bIHdeavJRtc
+						ybzsb7L5HInkooOttwzQr13kvmJcrBpnwdiyN2k7LyzM4nBGAn/BlfkWSGFXO/AL
+						HrUeoNqwWgqLbHnCBie9wWP6Lny+RhGsmyRbToQ2+BMvAZYL0gZWBsOGU9BvA4Zj
+						B0V1NQxRarqWnJf+b/Y4ydzXmwIDAQABoyEwHzAdBgNVHQ4EFgQUBfAdjBVmPr7R
+						FQxK1LBJrrp+4QswDQYJKoZIhvcNAQELBQADggEBAD2K0SlIiPK+uQ6Qv5/PzgID
+						WEw9tL2dR+badmm0PhMpG4JAJMSZj23/OdslbN5MjEIkoQSfbE1VZ0UKzPIXI2XJ
+						LcGAcpJyDkOuXDqU2hwenqnK6ea8TWjfmQXLGEF/lQ/oqizNvFBouzcBUi9NHj62
+						BE+MWP21n4ETGUN16FfvoDogsPGvL1VAJdxUmcvN5jdg+HkbGvKlbe4P8LIQu4jY
+						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>
diff --git a/swamid-interfederations-2.0/sso.institutoptique.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.institutoptique.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..36c161ae
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.institutoptique.fr-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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: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>
+					      MIIFejCCBGKgAwIBAgIRAKt1DGxPKyjT+KkLO4BnO6YwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA2MDIwMDAwMDBaFw0xNzA2MDEyMzU5NTlaMEQxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEfMB0GA1UEAxMWc3NvLmluc3Rp
+dHV0b3B0aXF1ZS5mcjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALVr
+AcvdrBs6huG/Vz/cHCC0/fyl5qlak+6TiHXlnKp7dhZkjGHFpD09eql2SPCYro1o
+6Ar/RSvTR9HHHf/sJm2GK2s8qgbOiMdNPsBPKAOTSPKltfDvUP+WMTI+pbocnGCo
+UzOtRHMZyloVNbEd/LwNKJpFqwl/Y2JZSSZtekzt9TcS6glpYuSCQDFU+CZS/tjP
+Lt5UqQOJ7zR3FHRfbTOuf/RBo2ubXZLIoZfCTDHymZCv5SBEoDXCn9hHAhQHZowO
+DfXa4RW+dRvAByklsEli6IlOxvT6jS7qMqjcM529KyAF7b/kJrENLrP3fERHCxuV
+WnVTNjxWfygeuHmNbsbL5aWjDItyDFfqcx57pNVv8FFoohzLLc53Y32ZI1CUEbut
+HbtZH57FLgBNuqqU7NWfhrQMSMtPfBnVvKFzAnawRx4fEtQ/dH1bh+Q8mu7Nz0jT
+ASjclOuStczj3tgpek6aJMM7KewNT5WRxB8nmNOXC8POzpwHTELWA8dgfwMs27Yd
+jyoR7VUT+yL5OQMNPCDrfRcJBWsFeTVRmM56f6J1KvcTtVTaGgC26yU9H9WxKlOu
+1PIy1W2WQRAVENAfwDVwGGE9z7Lr+wMyYOZYX4RzthK+q082Ae2dlFkp1zcG1RIp
+DIZz41X/DXp7FFZqXwkFiS7ZXzDNwkfM6dda/yjzAgMBAAGjggFzMIIBbzAfBgNV
+HSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUpZEFQu6gLZl1
+4DFbyX8+XdInof8wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0l
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQEC
+Ah0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
+cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
+BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
+JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCEGA1UdEQQa
+MBiCFnNzby5pbnN0aXR1dG9wdGlxdWUuZnIwDQYJKoZIhvcNAQEFBQADggEBAIY6
+aA9g6qNL/9BruQSSjfgt4HrJUi+agJVEbXDumUNkulhD3QRJroMgZsooizhdfdpz
+7o+yQgIjjhfApH3NOG1LdszkldblDYNVM33TvFlsr/WZyTqSQWnqt85NyM9HFbhw
+9zCXUBd0F3uJ9blJaKDJ80YonJCLZPiuJT1Zdia1DxbHgOwwIeXQgK86xfF9SPS1
+8GZ1MoKXoeR8yrZtYX7euYUSA4WIXaYlly7Kdvn71HchIPtyIEXawgqz0o+zCrGJ
+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>
+					      MIIHeTCCBmGgAwIBAgIQWjSQUhWiEPpRYjoY6ThcITANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTAyODAwMDAwMFoXDTE2MTAyNzIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzc28uaW5zdGl0
+dXRvcHRpcXVlLmZyMIIEIjANBgkqhkiG9w0BAQEFAAOCBA8AMIIECgKCBAEA1gzs
+ryM0GS+EdHhf8FK8ukAp4FfI5y1L+4DJR2kvbCfOFpDWrlJWWh0O2j9HQIyKh1Wc
+Bv1Hh5RxM55oiHjt2cDCDAlD8gEXAffMatRkxAx179WQiB9/mN0KXbkxm45xhM5t
+zznKIlQ9A+bkXMo/NE+LtYlGUSgF9ybX7/exeEtVxBcTfIQGGkM92mJR6shz3KYu
+kciPWKUxAyNzkWaXtbt/azMRfhICnQU34IKWlQlB7UPbI7CogGNTXAOW3YASSSrn
+DejB+iQ7cHjYy5u0HkIuixICqdj7AcEmlsu3xgYes05T0h03PgLvVSCZ75378lJb
+PKZkyZ9QZpxnW7WAUHXeGDmxfyxj4jlT+mocxRFe6ZIBySQT34pmyMsvkehObCsw
+AlnbfnmWMUVKWEtVDwS9lUQwF7i3MepsFefRIWoLDYv46wN45fB2bZr7E0xfbL3F
+3qJeTN8bbjpNaeKXrFctahGz4Ny9u+Vae5TtTZTeM840ptTznTrRazgK1071R0fb
+HvodQLmBPSm2rr5KcLOC5OVUriqE/Z4lE0jI8N3qWEyLe938NsaqsdvCf3kqN86n
+VdggmJGHioxmuqlMsxJqJRvTolyDbeSnpoz3c74U8Szu0u4dm5rILBVLYp7KaIn1
+W1rnCaLmgxqICyT/8WSOyyfw9h4HshOdmSlqjjEMaoskYSRP41tVP66nSw7rBvYo
+oxN+YEG47Op/Sooabonrtpg33zgMz3Diroy1ezIvRxzdGpour1uYImfSqOMM/h2e
+WwfQ7H68RdqDhB52Z1FUvOHOmSgtY2J/oxrPnWtlpUpORhEa/8ZUAXIn8qAdygJY
+j02HQWGsXCDpy6jyi9+terK2Q4+IxwuiJFgLtl4+/Gm0QmH56/OCuzajg1gB2m/S
+1C/6mA/iBn6lftwhRSD0DKitxMcAur3GdZ9DBxOYogdFnP1GLG+Y1fZcPv0d9E+s
+F0h6q1IUoWDMle+HuAuD6J/+Y2w+1vdcPHYaEgtGMCN6nnR9o24IjcCLbD3OKEcO
+af1uSHAbcwA2x3faNXWBRdKLG194vqQLOwvNFHIFXlwI7nJgyOGc7eVo5oDQ+735
+9GEUG0/5zsuWaXWN3i/NYbBDRjtDCIYZG2QlNkSzPRQp9HJM0PmBDBd+WTooxngC
+1x4Bs1JY4799o2x797GSmJhJ2X/fo8ECu+l76mQfWS/7apbjb7MKKnj2JySAToXW
+TggrnchTD7p8SQWfUpSQ6QKwi8IDbN74dB6eO2r1m8rMQ5W/rwF9mH99THOPC0/r
+zGhXgv2V+8GeraFLqHRFKYv8ebti9wmXRYCyHzsCZOWqk1Aq0q1HhUo/6IKSw8XC
+o2lKCW8Xv7hZca+xFwIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFADhl3EMHhYhjBx83CTvMTrmmcGXMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzc28uaW5zdGl0dXRv
+cHRpcXVlLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQB5jJF6U+ahW/I6o3YXEwqjI32b
+h38zILufAMgajUdH08QFhu2qibjouVB0M3q6/LQ/SrZuaBZvow3kSrsFuQc5TZ+R
+TxxUyt6nT+6DF0UM3/vIZ+8I54cbc2hl9ATVdqHGZ8A+mGGi/tlcqu3P3SOsNWyl
+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://unknown.site.com</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
new file mode 100644
index 00000000..e953a3b0
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.ird.fr-idp-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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="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>
+					      MIIDEzCCAfugAwIBAgIUVaH89Xx207IW1cTeMZoDrJ2S8cMwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKc3NvLmlyZC5mcjAeFw0xMjEyMDQwODUzMTJaFw0zMjEy
+MDQwODUzMTJaMBUxEzARBgNVBAMTCnNzby5pcmQuZnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCxoxms45eFcIYxIAqWg8xwg1WpmjsGFAeOnBYoldj2
+Mm2bQSxgdA5wNgdHvpsE1NfsWatZ3o+Cu+lAeL4tbzhyeLcv/5tP7xW1lCUCOsnt
+U+71/QN+hd8t0cTZnOcIVQz2933j+GSlYLb7j4mkeOmH2N1t7eZUBHDHDzhTbRbo
+owW1vMec+I7kgS5hxoOJmthyGxqKquBiFbyVR6D2afe1AoFZCTgH5o34o0LJ56JC
+J+7L86F1PKd8M8BRD/+Bgk5z01rP6iLE4CTw0aalcVAcwUhfu+lSQaQc+UnsAkb6
+IO0r2WpflOy/h3qDYAe5ZaoadAVF7DXI3XkkM7PLvoHXAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCnNzby5pcmQuZnKGIWh0dHBzOi8vc3NvLmlyZC5mci9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUxuTYXqdJEQMDfLAcMpaizQmY728wDQYJKoZIhvcNAQEF
+BQADggEBAI0GQeWZzGLSJtpy/ThyIGBsvc9I4POytPsGTAXXjl225vxBW5wREjXT
+5iZYvqDcaRX7/5Ya0LuixjZd4vw0f/GxNVA1q7UrkYD186qwxdD9ERVBK4A8TKw+
+DTqPj960n+BmHjvfbO5kUiOCxRN8aUwkroiIuokjKo/F/ee4PPhJFmjkjC5UQnAR
+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://unknown.site.com</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.kgv.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.kgv.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..e63859ff
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.kgv.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?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>
+      <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
+						VQQGEwJHQjEQMA4GA1UEERMHUFI4IDZMUjETMBEGA1UECBMKTWVyc2V5c2lkZTES
+						MBAGA1UEBxMJU09VVEhQT1JUMR0wGwYDVQQJExRTY2FyaXNicmljayBOZXcgUm9h
+						ZDEeMBwGA1UEChMVS2luZyBHZW9yZ2UgViBDb2xsZWdlMRIwEAYDVQQLEwlJVFN1
+						cHBvcnQxFjAUBgNVBAMTDXNzby5rZ3YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQDueymCOvHFvXJkoXtlKiOrfDC88zyRVVg4BpTnMzf7BSP2
+						QHFcuJGXEDb6963Wufka5eBoD0YV3HMxkj/UJnlQIRWAJnVfcU5coMyjH8CgF9Bf
+						9U5EZ28pXQWNuguvMqKtNLND8YIiDOcqO8e3trmwDv7PLnovSwCfTP09WJmqEJra
+						yDhU8NdRYsNofVk9uLL8LePvttrIxi1o7oALtM4wxLbwhu/oMtikJ9hVdWLGovMa
+						TUX5U5VP0Nyvw3/WYXcr/aqdSrTbszupI1A+/Vg5M42uFQYd/Fr2UW+AwPTHEz+F
+						oTWcGlg2D5R0hVo0JSnVeleyODk4LgdP3pGCgAKLAgMBAAGjggFqMIIBZjAfBgNV
+						HSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUSx1khQvIHbbS
+						AYJosmXfN/R6SMQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0l
+						BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQEC
+						Ah0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
+						BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
+						JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQR
+						MA+CDXNzby5rZ3YuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAYbYA7nIj0rI03i
+						JTm/m2hkxCPFfsCMB+6diphJEMffubScT/M6/MRcDDfkc1xT6m5AxDaHsDlgAkcO
+						slEpTMOQnKm/dO3fAWv2Nx6AHTeStlzyiHTrUUEPcxcxRaadBz2TV+43lexjnibz
+						gqnbz0Qc4sMqE3hXaRUixGrou1bk/8TGpJaUcGWdo+UnAXtkelzuPRAGLXZEcOon
+						0FK89Xj6N+RUwAlA6Fuu/fXevoMdtHQ6b3EW2NZ7HcC5T3Du6XBYTv/CBSXX8FwP
+						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>
+						MIIE4TCCA8mgAwIBAgIRAOgdNtecQeRkdUUz80ab59kwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA1MTAwMDAwMDBaFw0xNjA1MDkyMzU5NTlaMIGzMQswCQYD
+						VQQGEwJHQjEQMA4GA1UEERMHUFI4IDZMUjETMBEGA1UECBMKTWVyc2V5c2lkZTES
+						MBAGA1UEBxMJU09VVEhQT1JUMR0wGwYDVQQJExRTY2FyaXNicmljayBOZXcgUm9h
+						ZDEeMBwGA1UEChMVS2luZyBHZW9yZ2UgViBDb2xsZWdlMRIwEAYDVQQLEwlJVFN1
+						cHBvcnQxFjAUBgNVBAMTDXNzby5rZ3YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQDueymCOvHFvXJkoXtlKiOrfDC88zyRVVg4BpTnMzf7BSP2
+						QHFcuJGXEDb6963Wufka5eBoD0YV3HMxkj/UJnlQIRWAJnVfcU5coMyjH8CgF9Bf
+						9U5EZ28pXQWNuguvMqKtNLND8YIiDOcqO8e3trmwDv7PLnovSwCfTP09WJmqEJra
+						yDhU8NdRYsNofVk9uLL8LePvttrIxi1o7oALtM4wxLbwhu/oMtikJ9hVdWLGovMa
+						TUX5U5VP0Nyvw3/WYXcr/aqdSrTbszupI1A+/Vg5M42uFQYd/Fr2UW+AwPTHEz+F
+						oTWcGlg2D5R0hVo0JSnVeleyODk4LgdP3pGCgAKLAgMBAAGjggFqMIIBZjAfBgNV
+						HSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUSx1khQvIHbbS
+						AYJosmXfN/R6SMQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0l
+						BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQEC
+						Ah0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
+						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
+						BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
+						JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQR
+						MA+CDXNzby5rZ3YuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAYbYA7nIj0rI03i
+						JTm/m2hkxCPFfsCMB+6diphJEMffubScT/M6/MRcDDfkc1xT6m5AxDaHsDlgAkcO
+						slEpTMOQnKm/dO3fAWv2Nx6AHTeStlzyiHTrUUEPcxcxRaadBz2TV+43lexjnibz
+						gqnbz0Qc4sMqE3hXaRUixGrou1bk/8TGpJaUcGWdo+UnAXtkelzuPRAGLXZEcOon
+						0FK89Xj6N+RUwAlA6Fuu/fXevoMdtHQ6b3EW2NZ7HcC5T3Du6XBYTv/CBSXX8FwP
+						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>
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
new file mode 100644
index 00000000..3852bba6
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.legendonlineservices.co.uk-shibboleth-sp.xml
@@ -0,0 +1,61 @@
+<?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>
+    <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>
+      <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>
+						MIICzTCCAbWgAwIBAgIJAJobCx55lv5EMA0GCSqGSIb3DQEBBQUAMA0xCzAJBgNV
+						BAMTAncxMB4XDTExMDgxMTA4NDkyNFoXDTIxMDgwODA4NDkyNFowDTELMAkGA1UE
+						AxMCdzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhMOvBTMzwJXzE
+						J59XFKXaqeI5zLdnA0YzdFsPnbLOlf/5+qjgRb86LlR1hYxDReSbKz1nm3H6eN9D
+						5IHZ/fZgdnvDblKno/xK0emOGRQ7ILDoHm9HTrpcd+qwzOGsqhN3dtZxMvGHv+bz
+						mULMepXiKk4KyqUp/pMuv52n0lshyJG5mJ0SctJEptUx/1IhXn6OhDg3fzvWiWQ9
+						6lgDiCg5TZ9p6r0FgEaAfp+EKfLIQKohkD8j1r88sSzIqgTW8TR+k0IOgSKydpiL
+						UPC8KqVFAATA7YisCxSwQL0Ol/km8h9M6I61U5sMzxQb96OjJNkJ0XkkqKpdJiQg
+						I0m6HiVnAgMBAAGjMDAuMA0GA1UdEQQGMASCAncxMB0GA1UdDgQWBBTcBGviv7Uv
+						SMf+iglk0SBxtdd8KzANBgkqhkiG9w0BAQUFAAOCAQEAicU/pEyeTf8EhIx3Hz/L
+						tN0lUevjM3RX5cpXHPnHGeO6lidknaaBi7e0Wnkbkur8VuKh9aTOENV+yNH4cQA+
+						ePNQefs0FqlzHiVMNFrb6nTzA4IXHCqLKkLWilFuQ17z+wih38PFjzqucXKZViow
+						MWaNgEGEyYBOyAKND5MtdS9WSQImqOn/fnx5PM6brLascO5a8ZBp96Zky7WvN28t
+						/eV2xzqBtVt3O87D1ta+yIbw0p2yXlWogVQNc4u6OKOcA9Rv2dO1UVPCGCsQCtdp
+						t3NdGb/WFfWxBSl2R2zNf9/vhRN+Senh5iasZaoZyaGSF1SZtyskYNDLshiBG/FS
+						7Q==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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="0"/>
+    <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="0"/>
+    <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="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </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
new file mode 100644
index 00000000..ab77629d
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.loucoll.ac.uk-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						Y29sbC5hYy51azAeFw0xNDA0MTUxMzU2MjZaFw0zNDA0MTAxMzU2MjZaMHYxCzAJ
+						BgNVBAYTAkdCMRUwEwYDVQQIEwxMb3VnaGJvcm91Z2gxFTATBgNVBAcTDExvdWdo
+						Ym9yb3VnaDEdMBsGA1UEChMUTG91Z2hib3JvdWdoIENvbGxlZ2UxGjAYBgNVBAMT
+						EXNzby5sb3Vjb2xsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAwQY7dDYZ1ca0Er7mJbTr/HINCIP66swXOlslbAoA7J7PNz9wnVUdasYtGzDL
+						pf71DvYJ7A7gQN41bNJif1AwOfr9YMg4Nnp+F3WhPsZuvMV2bu6I+eNv2nJV2gVE
+						NHcV4YrH1hYNX4lMUA3AgJUyXge5vyDnLloNbVdbBiap1gR/OHShe5c5rD1n6evm
+						8F0anTKcpwp0PXHx8sZ1VKVzs51NamfDlNscDY6k+XEsQ62ypJaOCYNo1vtcA7Kw
+						cIvLgQQ0zfi7nVkVJRoS58vR4ocTvQMItafdvp7GUgMAGolMcgWWILy5mp1qW9ZL
+						QxBjsPnxVsKwRVzbv7LsiiVIfQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQC7Wd4k
+						YLrM/UczkJ0T3jDB+dpFJtNu7BxmN7izPuIBk8ob+cw8w8mDcbjz0WiB3RhDtrMz
+						5xJa57WZQg5ySFdObFyR1etzDBGFKqauCeFr1P+5n5emZUWyDM2bur9Bu2yQAsYI
+						oXv1PaY+Yr5MnYBTDHOLFPGmEigyX5GotJVFiwxXD3rcf8xD0WCMVZH1ovoH6k6p
+						squru7H3FR8QUPvycQl5i03k6V6R3dEVoZSEa9oZF9YvhcztQc/p/FYiSfGOcEms
+						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>
+						MIIDaDCCAlACCQCHK+i1QORh+TANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
+						QjEVMBMGA1UECBMMTG91Z2hib3JvdWdoMRUwEwYDVQQHEwxMb3VnaGJvcm91Z2gx
+						HTAbBgNVBAoTFExvdWdoYm9yb3VnaCBDb2xsZWdlMRowGAYDVQQDExFzc28ubG91
+						Y29sbC5hYy51azAeFw0xNDA0MTUxMzU2MjZaFw0zNDA0MTAxMzU2MjZaMHYxCzAJ
+						BgNVBAYTAkdCMRUwEwYDVQQIEwxMb3VnaGJvcm91Z2gxFTATBgNVBAcTDExvdWdo
+						Ym9yb3VnaDEdMBsGA1UEChMUTG91Z2hib3JvdWdoIENvbGxlZ2UxGjAYBgNVBAMT
+						EXNzby5sb3Vjb2xsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAwQY7dDYZ1ca0Er7mJbTr/HINCIP66swXOlslbAoA7J7PNz9wnVUdasYtGzDL
+						pf71DvYJ7A7gQN41bNJif1AwOfr9YMg4Nnp+F3WhPsZuvMV2bu6I+eNv2nJV2gVE
+						NHcV4YrH1hYNX4lMUA3AgJUyXge5vyDnLloNbVdbBiap1gR/OHShe5c5rD1n6evm
+						8F0anTKcpwp0PXHx8sZ1VKVzs51NamfDlNscDY6k+XEsQ62ypJaOCYNo1vtcA7Kw
+						cIvLgQQ0zfi7nVkVJRoS58vR4ocTvQMItafdvp7GUgMAGolMcgWWILy5mp1qW9ZL
+						QxBjsPnxVsKwRVzbv7LsiiVIfQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQC7Wd4k
+						YLrM/UczkJ0T3jDB+dpFJtNu7BxmN7izPuIBk8ob+cw8w8mDcbjz0WiB3RhDtrMz
+						5xJa57WZQg5ySFdObFyR1etzDBGFKqauCeFr1P+5n5emZUWyDM2bur9Bu2yQAsYI
+						oXv1PaY+Yr5MnYBTDHOLFPGmEigyX5GotJVFiwxXD3rcf8xD0WCMVZH1ovoH6k6p
+						squru7H3FR8QUPvycQl5i03k6V6R3dEVoZSEa9oZF9YvhcztQc/p/FYiSfGOcEms
+						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>
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
new file mode 100644
index 00000000..ef52b09b
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.man.poznan.pl-idp-shibboleth.xml
@@ -0,0 +1,123 @@
+<?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>
+      <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
+BQUAMBwxGjAYBgNVBAMTEXNzby5tYW4ucG96bmFuLnBsMB4XDTEyMDIxNzE1MDAx
+NVoXDTMyMDIxNzE1MDAxNVowHDEaMBgGA1UEAxMRc3NvLm1hbi5wb3puYW4ucGww
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCsfe3J1Kxj8jL697Vw7r7
+tGu6li0IDa/8JecsxjRTFkMxl/6qrzs5A8x1i1jWO3Q58xYMjgrlBp4cevH1dbHn
+QxZ2o/FaE5Ww2eHsFmeR7nLZSJN3LukcxEjtA40evwEZPN+p/4DZD/bBMh7Hyw9s
+8Y6YdYCF0xNLUwEFhHo2yDVPZYhWrC6yx6fwY5/NXZZCA9b91W8mRfWTGPFBY9PK
+dVS0m923P/CkudYG3o3+w34gpxkYHca3i6syI9zHOvsE1GRdbwHW1xcqRWMLece+
+dhxL/I1AnlpCvuLqG0CpMxn5nAy19QqoODrH9zVtZeOUISIzb0UhSrlk29fFe6CV
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNzby5tYW4ucG96bmFuLnBshihodHRwczov
+L3Nzby5tYW4ucG96bmFuLnBsL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTroN0C
+2g3I0ikT1kP7hjwsQbJpTDANBgkqhkiG9w0BAQUFAAOCAQEAUQXUBQQIg4UXJrCp
+9H0zd65C58uH1fAdcwjYcZUojsftYg5Uc2OIH/TVq2rcB+ZiC9ZRx1x677+WuRq5
+lA85YUQHsPYKD/mOsxU69nIdkFuJcICSZIYBQA4bq4WAsWaD4Z75doqgR2MGoQBb
+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
+BQUAMBwxGjAYBgNVBAMTEXNzby5tYW4ucG96bmFuLnBsMB4XDTEyMDIxNzE1MDAx
+NVoXDTMyMDIxNzE1MDAxNVowHDEaMBgGA1UEAxMRc3NvLm1hbi5wb3puYW4ucGww
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCsfe3J1Kxj8jL697Vw7r7
+tGu6li0IDa/8JecsxjRTFkMxl/6qrzs5A8x1i1jWO3Q58xYMjgrlBp4cevH1dbHn
+QxZ2o/FaE5Ww2eHsFmeR7nLZSJN3LukcxEjtA40evwEZPN+p/4DZD/bBMh7Hyw9s
+8Y6YdYCF0xNLUwEFhHo2yDVPZYhWrC6yx6fwY5/NXZZCA9b91W8mRfWTGPFBY9PK
+dVS0m923P/CkudYG3o3+w34gpxkYHca3i6syI9zHOvsE1GRdbwHW1xcqRWMLece+
+dhxL/I1AnlpCvuLqG0CpMxn5nAy19QqoODrH9zVtZeOUISIzb0UhSrlk29fFe6CV
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNzby5tYW4ucG96bmFuLnBshihodHRwczov
+L3Nzby5tYW4ucG96bmFuLnBsL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTroN0C
+2g3I0ikT1kP7hjwsQbJpTDANBgkqhkiG9w0BAQUFAAOCAQEAUQXUBQQIg4UXJrCp
+9H0zd65C58uH1fAdcwjYcZUojsftYg5Uc2OIH/TVq2rcB+ZiC9ZRx1x677+WuRq5
+lA85YUQHsPYKD/mOsxU69nIdkFuJcICSZIYBQA4bq4WAsWaD4Z75doqgR2MGoQBb
+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>
diff --git a/swamid-interfederations-2.0/sso.mathletics.com-ukfederation.xml b/swamid-interfederations-2.0/sso.mathletics.com-ukfederation.xml
new file mode 100644
index 00000000..937a3b5a
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.mathletics.com-ukfederation.xml
@@ -0,0 +1,84 @@
+<?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>
+						MIIC9DCCAdygAwIBAgIJAP4D/fTY0gATMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+						BAMTD3dpbi1vaDJvMW1tZDM5MzAeFw0xMDA3MDIxNDQzMThaFw0yMDA2MjkxNDQz
+						MThaMBoxGDAWBgNVBAMTD3dpbi1vaDJvMW1tZDM5MzCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAMy+Vo/nUmNICl1EaHkt4ufsLfVzxrlwyOGA24oGCKFu
+						LjnWDFJDvj6QuT6k917FdFwDbzdflttObWI23WRdbptSoVb9Y4DBuaTCpTLxbcSl
+						YJ16wlNGd8CFijxwIt9a/oMyQLOPzP+5DGnodBRXSG0xkEhXEPe2rDP5v1NvHErD
+						NctMEGV9zBfrxbokDHeJH2xrO1OStSsIbngcY5IVCSneifJEz0HlGoUrVw5CRIBM
+						Fi4uoZYCQ9f7wPPvMb/GACYj441EXAvN1hAl4L/AmtrihUGmhA+45YXnvuGe3xOq
+						BP0mxerTLBHZtedkWS5Wg3oZxCeIFQ3nS9ibB7h1UjMCAwEAAaM9MDswGgYDVR0R
+						BBMwEYIPd2luLW9oMm8xbW1kMzkzMB0GA1UdDgQWBBQvlfJiq/7Uz+/L2t17aQ4L
+						I8tR5zANBgkqhkiG9w0BAQUFAAOCAQEAkXHpy1kVpS7z+KKJYqjIJWHpJ8AEpn/9
+						FP4ty2Y1cQVD6W/S31BoMOckY+SCxwzQZ/pnLXWenwbozRkDPnE9N4dw4hdpZyVz
+						tM2/rWzaYj14qqnIO2QNU0s4PSdLYL7YeANYNdqSeUljFqN1qp+eQCaVs/EKHwFk
+						clV69FtCaNVDaPCD2rQT+VzLdUc0PXGsSa6NS20kC9Ol3ZNdIY1OuA1eJNm6LEEb
+						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>
+						MIIC9DCCAdygAwIBAgIJAP4D/fTY0gATMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+						BAMTD3dpbi1vaDJvMW1tZDM5MzAeFw0xMDA3MDIxNDQzMThaFw0yMDA2MjkxNDQz
+						MThaMBoxGDAWBgNVBAMTD3dpbi1vaDJvMW1tZDM5MzCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAMy+Vo/nUmNICl1EaHkt4ufsLfVzxrlwyOGA24oGCKFu
+						LjnWDFJDvj6QuT6k917FdFwDbzdflttObWI23WRdbptSoVb9Y4DBuaTCpTLxbcSl
+						YJ16wlNGd8CFijxwIt9a/oMyQLOPzP+5DGnodBRXSG0xkEhXEPe2rDP5v1NvHErD
+						NctMEGV9zBfrxbokDHeJH2xrO1OStSsIbngcY5IVCSneifJEz0HlGoUrVw5CRIBM
+						Fi4uoZYCQ9f7wPPvMb/GACYj441EXAvN1hAl4L/AmtrihUGmhA+45YXnvuGe3xOq
+						BP0mxerTLBHZtedkWS5Wg3oZxCeIFQ3nS9ibB7h1UjMCAwEAAaM9MDswGgYDVR0R
+						BBMwEYIPd2luLW9oMm8xbW1kMzkzMB0GA1UdDgQWBBQvlfJiq/7Uz+/L2t17aQ4L
+						I8tR5zANBgkqhkiG9w0BAQUFAAOCAQEAkXHpy1kVpS7z+KKJYqjIJWHpJ8AEpn/9
+						FP4ty2Y1cQVD6W/S31BoMOckY+SCxwzQZ/pnLXWenwbozRkDPnE9N4dw4hdpZyVz
+						tM2/rWzaYj14qqnIO2QNU0s4PSdLYL7YeANYNdqSeUljFqN1qp+eQCaVs/EKHwFk
+						clV69FtCaNVDaPCD2rQT+VzLdUc0PXGsSa6NS20kC9Ol3ZNdIY1OuA1eJNm6LEEb
+						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: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.nikhef.nl-sso-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..0fa5c03d
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml
@@ -0,0 +1,48 @@
+<?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>
+  </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">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</mdui:Description>
+        <mdui:Logo height="48" width="108">https://static.surfconext.nl/media/idp/nikhef.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">nationaal instituut subatomaire fysica Nikhef Research</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">national institute subatomic physics 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</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nikhef</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://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:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.onesource.com-shibboleth.xml b/swamid-interfederations-2.0/sso.onesource.com-shibboleth.xml
new file mode 100644
index 00000000..d320fac9
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.onesource.com-shibboleth.xml
@@ -0,0 +1,80 @@
+<?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://sso.onesource.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sso.onesource.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>
+						MIIC8jCCAdqgAwIBAgIBADANBgkqhkiG9w0BAQUFADAcMRowGAYDVQQDExFzc28u
+						b25lc291cmNlLmNvbTAeFw0xMDEwMjcxOTMyMjFaFw0yMDEwMjQxOTMyMjFaMBwx
+						GjAYBgNVBAMTEXNzby5vbmVzb3VyY2UuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA0rAmWglWbPqA8WsNSqXmDoP5VXm04RUhsnf51me/R0+Oa+Lg
+						jKkGhenXjoEss2F+R4AFClOyBYlWCXcOor01+Ybm6wVjlhqiGsYQj+cT4/nH101C
+						mLCydJvqLVTreAAXIeeqrnHNOIL9dKKT9f4rXMd652NmSFRA7Hl6cQV70f2Bd/6r
+						5geLQ+flrJIpvhdXO40GtXOpf5VfX/BtQ3+3j4AZmEABEMCpo1mzO8Cp/d8adsnt
+						iJTvp51OggSLWpJPt3foT0afuug1xCl6zP0uySXDaSaAuE/s+nCG0xiZLEs0HTib
+						r3t9XXDIo2+gN4IULSn3XJIkXiR1L3BVu5M9UQIDAQABoz8wPTAcBgNVHREEFTAT
+						ghFzc28ub25lc291cmNlLmNvbTAdBgNVHQ4EFgQUBf9CwdAc1mBKZS6BJMndqkOQ
+						ccEwDQYJKoZIhvcNAQEFBQADggEBAHt0L5MxCaW+HF4r16kVr3GTAzjl/oQArntL
+						gK5rSvzn5vBGOYwRqoOqOyT0KIg5x95mssw8DIonSOZKkBERkFcKdjW77vfaKWMM
+						XbQyZQF9Udsf49yCac4/SEEDHqWVVB7uMngkx5FzU4dSwz+K7M9mlc1qpT0sYZc/
+						sMZlncHSACTa9ClqnABgSRK5VxYAaqLflKFLDwR2pBVBZzX4GQ6iMkRLpfKYakHY
+						90CPLNchMKTaFTDS0LQkkQ+PqzE2OTlf8ov8ppzVLVN5ZLemuX9i9GNzLOoeW6dr
+						XQgb23tk8eDNQABBWA7armXrmBXD1G1EQv6J+PqHowTqu2mI2qo=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC8jCCAdqgAwIBAgIBADANBgkqhkiG9w0BAQUFADAcMRowGAYDVQQDExFzc28u
+						b25lc291cmNlLmNvbTAeFw0xMDEwMjcxOTMyMjFaFw0yMDEwMjQxOTMyMjFaMBwx
+						GjAYBgNVBAMTEXNzby5vbmVzb3VyY2UuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA0rAmWglWbPqA8WsNSqXmDoP5VXm04RUhsnf51me/R0+Oa+Lg
+						jKkGhenXjoEss2F+R4AFClOyBYlWCXcOor01+Ybm6wVjlhqiGsYQj+cT4/nH101C
+						mLCydJvqLVTreAAXIeeqrnHNOIL9dKKT9f4rXMd652NmSFRA7Hl6cQV70f2Bd/6r
+						5geLQ+flrJIpvhdXO40GtXOpf5VfX/BtQ3+3j4AZmEABEMCpo1mzO8Cp/d8adsnt
+						iJTvp51OggSLWpJPt3foT0afuug1xCl6zP0uySXDaSaAuE/s+nCG0xiZLEs0HTib
+						r3t9XXDIo2+gN4IULSn3XJIkXiR1L3BVu5M9UQIDAQABoz8wPTAcBgNVHREEFTAT
+						ghFzc28ub25lc291cmNlLmNvbTAdBgNVHQ4EFgQUBf9CwdAc1mBKZS6BJMndqkOQ
+						ccEwDQYJKoZIhvcNAQEFBQADggEBAHt0L5MxCaW+HF4r16kVr3GTAzjl/oQArntL
+						gK5rSvzn5vBGOYwRqoOqOyT0KIg5x95mssw8DIonSOZKkBERkFcKdjW77vfaKWMM
+						XbQyZQF9Udsf49yCac4/SEEDHqWVVB7uMngkx5FzU4dSwz+K7M9mlc1qpT0sYZc/
+						sMZlncHSACTa9ClqnABgSRK5VxYAaqLflKFLDwR2pBVBZzX4GQ6iMkRLpfKYakHY
+						90CPLNchMKTaFTDS0LQkkQ+PqzE2OTlf8ov8ppzVLVN5ZLemuX9i9GNzLOoeW6dr
+						XQgb23tk8eDNQABBWA7armXrmBXD1G1EQv6J+PqHowTqu2mI2qo=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.onesource.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.onesource.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.onesource.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.onesource.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.onesource.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.onesource.com/Shibboleth.sso/SAML/POST" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">9Star Research, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">9Star: Global Business Intelligence</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.onesource.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Lee</md:SurName>
+    <md:EmailAddress>mailto:simon@9starresearch.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Wells</md:SurName>
+    <md:EmailAddress>mailto:andrew_wells@onesource.com</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
new file mode 100644
index 00000000..fece70a6
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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>
+      <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>
+MIIDIDCCAgigAwIBAgIVAM/a3obaebb4N7KALoWgPOwQKFPuMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDXNzby5zYmcuYWMuYXQwHhcNMTAwNDEwMTgxMzU0WhcN
+MzAwNDEwMTgxMzU0WjAYMRYwFAYDVQQDEw1zc28uc2JnLmFjLmF0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAso8F1k1Z3subIMuyqXHpPCNJogiv3GQ1
+uNXHNUL31ToqkIxcL+yL7QBLgnB8pZKmOaDOnveSllrTI8lArzJUbIYTRq/q8vjC
+35I5elBDktrOAAIeoogwdyhtau/AyiNvbZmPZGlcgBmWAPIUPoFjVF+U5+CbiQ8q
+iAzvdJn+yJvX+dkRQGg33Ebvh0pnlvD5qWeiwqWlJgFk4zUFNK40p3FFDMETNkTk
+7/U+bt/xMdwYdHI3wvb42ZBXTajsTsXnSlSA5B695dfpHfGbeIqTae32XsWHm77p
++Nrl7flUJNGtTm8SNPx7K4CJIdRhdhKiuIX+5sOSxZg8iVDghZC4pwIDAQABo2Ew
+XzA+BgNVHREENzA1gg1zc28uc2JnLmFjLmF0hiRodHRwczovL3Nzby5zYmcuYWMu
+YXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCr2Q6zhfulYa7kl0Pm752frFiF9
+MA0GCSqGSIb3DQEBBQUAA4IBAQB/AyjefKCO1cP806UO/L2olnsnD0VA50smzTto
+p72RH8sBCosRwkeyHI3/aqjSPEqsB1p1IcEEeOR4b+07PgtWmOMbZ6l9zOGDB7zB
+RCK2tq1P1avux6RGlj1q3vHlllfcdUnVFe3U6TOfk3faTeVBTLTpssBQOv0Y/W2k
+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>
+MIIDIDCCAgigAwIBAgIVAM/a3obaebb4N7KALoWgPOwQKFPuMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDXNzby5zYmcuYWMuYXQwHhcNMTAwNDEwMTgxMzU0WhcN
+MzAwNDEwMTgxMzU0WjAYMRYwFAYDVQQDEw1zc28uc2JnLmFjLmF0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAso8F1k1Z3subIMuyqXHpPCNJogiv3GQ1
+uNXHNUL31ToqkIxcL+yL7QBLgnB8pZKmOaDOnveSllrTI8lArzJUbIYTRq/q8vjC
+35I5elBDktrOAAIeoogwdyhtau/AyiNvbZmPZGlcgBmWAPIUPoFjVF+U5+CbiQ8q
+iAzvdJn+yJvX+dkRQGg33Ebvh0pnlvD5qWeiwqWlJgFk4zUFNK40p3FFDMETNkTk
+7/U+bt/xMdwYdHI3wvb42ZBXTajsTsXnSlSA5B695dfpHfGbeIqTae32XsWHm77p
++Nrl7flUJNGtTm8SNPx7K4CJIdRhdhKiuIX+5sOSxZg8iVDghZC4pwIDAQABo2Ew
+XzA+BgNVHREENzA1gg1zc28uc2JnLmFjLmF0hiRodHRwczovL3Nzby5zYmcuYWMu
+YXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCr2Q6zhfulYa7kl0Pm752frFiF9
+MA0GCSqGSIb3DQEBBQUAA4IBAQB/AyjefKCO1cP806UO/L2olnsnD0VA50smzTto
+p72RH8sBCosRwkeyHI3/aqjSPEqsB1p1IcEEeOR4b+07PgtWmOMbZ6l9zOGDB7zB
+RCK2tq1P1avux6RGlj1q3vHlllfcdUnVFe3U6TOfk3faTeVBTLTpssBQOv0Y/W2k
+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>
diff --git a/swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml b/swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml
new file mode 100644
index 00000000..3aca8901
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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>
+MIIDKDCCAhCgAwIBAgIJALzQmVldx2A3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3Nzby5zaXJvcGdsb2JhbC5vcmcwHhcNMTQxMDI4MDgxNzI5WhcNMTcxMDI3
+MDgxNzI5WjAeMRwwGgYDVQQDExNzc28uc2lyb3BnbG9iYWwub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx64WLavrAOUS3hrtNy48EdBVdzwbYcDg
+0HmBm6inH9I4yASQp+QSPXJ+5l3FymRLigGKt2HcLzNMsO7h7ptaMd+A3PI1UKT7
+yTu7kzOjsE+9iHgTQ4nbGhQt3yl5xjjBdYdqqQrEj5FWEbvYhA/Wt+iVQMMG+zoW
+dXDwyz9TTqL/UiE02mSt0Ro9ApmLk/kj/1MxUO5miBBuGyRrFUGdXNPgt1OSjPlI
+5VDjAXdg9CYDJffHUMhq6l/QextaQy1yFNDras8A8bGxTUe84VcAAjLIcnCtv827
+mWbwunc4mk4SDTUvVD0lEiB2xBujYPDbztE/DEzChiythqzU1mDDhwIDAQABo2kw
+ZzBGBgNVHREEPzA9ghNzc28uc2lyb3BnbG9iYWwub3JnhiZodHRwczovL3Nzby5z
+aXJvcGdsb2JhbC5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUUHYB3v8YkZziQywd
+6zbzQeks38UwDQYJKoZIhvcNAQEFBQADggEBAGKoO/l+amYeu2+/uI57e52A9PX1
+JhjburFtSrayQizXS4zFSIbu9H8SUGzo7UQ2wLEM9uI/rAlmn4Z5VnvkstkODfFj
+I29JZYw3d817h4Jqi20lasU++TfHMYGmnN7Wv9OjIQbOHIIZBGqyL7z7cTLYybT3
+7EI41ClPlg1xYunxMCEcVueS5VCVDpi/iRRgbtf8GefqPWe6nZxcbpmADIPMO8q4
+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="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:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="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">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>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.sunderland.ac.uk-auth-metadata.xml b/swamid-interfederations-2.0/sso.sunderland.ac.uk-auth-metadata.xml
new file mode 100644
index 00000000..94dcb76f
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.sunderland.ac.uk-auth-metadata.xml
@@ -0,0 +1,115 @@
+<?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>
+      <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>
+						MIIDVjCCAj6gAwIBAgIILQ5N0azZci0wDQYJKoZIhvcNAQEFBQAwQjEhMB8GA1UE
+						CgwYVW5pdmVyc2l0eSBvZiBTdW5kZXJsYW5kMR0wGwYDVQQDDBRzc28uc3VuZGVy
+						bGFuZC5hYy51azAeFw0xNDA2MTcwNzQ0NDJaFw0yNDA2MTcwNzQ0NDJaMEIxITAf
+						BgNVBAoMGFVuaXZlcnNpdHkgb2YgU3VuZGVybGFuZDEdMBsGA1UEAwwUc3NvLnN1
+						bmRlcmxhbmQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDR
+						+uVqAlnBPfii2qWCgu96Pvd+68pdoAH7WgsFtfn1zdyQK9X+WT7CT4RzNXQ/nEi1
+						n6r5D+xE57dknzCj/cgI465605GmckfcsyQbI4d4tJUMwIS6DKTr5YBV4wSOWXl1
+						+Ksws+ew7V/GOAh9EJIOiijq3E/e8R+O+pgH0Rvmpugyi+Nj3afppkSsIbLO0apL
+						94Cy1dIqxqQejrZnL8pMbdpELq9W8sDMTWsGjvLoRj2q3QYUN7217sf/pD4+5Noy
+						sVDEuE4UKZJfuXAAwL73JZmUjraGGqBFJj6Xt8ymTNrCCQO0MA7uuFC/sE+CIDeR
+						L9w/ofKvcmq2SZdb2mGHAgMBAAGjUDBOMB0GA1UdDgQWBBSYfGXJCjojjLJ4r4gr
+						SSL9uGflzDAfBgNVHSMEGDAWgBSYfGXJCjojjLJ4r4grSSL9uGflzDAMBgNVHRME
+						BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAfRpGz0INl+VKylH9UTb1+GmyEIzlX
+						RpWjTgKDGW2hvK07fH3ABGa28XUX3yVah1vXzOmfvQ9/f7l2tA5OaJzWHCXijANN
+						nkcCKJZSB2AFSkdL+jpXWbrVClomKIJfFLN1CzPvPJ3Ls9P/Xm0AZGFTZF3fM6ZH
+						WoaJAKOIUzfARiIRBoIf6y8EEpa3ZdcgPlRwAlHtKMxnUHrdomtBdDSz8WNqHPVF
+						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>
+						MIIDVjCCAj6gAwIBAgIILQ5N0azZci0wDQYJKoZIhvcNAQEFBQAwQjEhMB8GA1UE
+						CgwYVW5pdmVyc2l0eSBvZiBTdW5kZXJsYW5kMR0wGwYDVQQDDBRzc28uc3VuZGVy
+						bGFuZC5hYy51azAeFw0xNDA2MTcwNzQ0NDJaFw0yNDA2MTcwNzQ0NDJaMEIxITAf
+						BgNVBAoMGFVuaXZlcnNpdHkgb2YgU3VuZGVybGFuZDEdMBsGA1UEAwwUc3NvLnN1
+						bmRlcmxhbmQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDR
+						+uVqAlnBPfii2qWCgu96Pvd+68pdoAH7WgsFtfn1zdyQK9X+WT7CT4RzNXQ/nEi1
+						n6r5D+xE57dknzCj/cgI465605GmckfcsyQbI4d4tJUMwIS6DKTr5YBV4wSOWXl1
+						+Ksws+ew7V/GOAh9EJIOiijq3E/e8R+O+pgH0Rvmpugyi+Nj3afppkSsIbLO0apL
+						94Cy1dIqxqQejrZnL8pMbdpELq9W8sDMTWsGjvLoRj2q3QYUN7217sf/pD4+5Noy
+						sVDEuE4UKZJfuXAAwL73JZmUjraGGqBFJj6Xt8ymTNrCCQO0MA7uuFC/sE+CIDeR
+						L9w/ofKvcmq2SZdb2mGHAgMBAAGjUDBOMB0GA1UdDgQWBBSYfGXJCjojjLJ4r4gr
+						SSL9uGflzDAfBgNVHSMEGDAWgBSYfGXJCjojjLJ4r4grSSL9uGflzDAMBgNVHRME
+						BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAfRpGz0INl+VKylH9UTb1+GmyEIzlX
+						RpWjTgKDGW2hvK07fH3ABGa28XUX3yVah1vXzOmfvQ9/f7l2tA5OaJzWHCXijANN
+						nkcCKJZSB2AFSkdL+jpXWbrVClomKIJfFLN1CzPvPJ3Ls9P/Xm0AZGFTZF3fM6ZH
+						WoaJAKOIUzfARiIRBoIf6y8EEpa3ZdcgPlRwAlHtKMxnUHrdomtBdDSz8WNqHPVF
+						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>
diff --git a/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml
new file mode 100644
index 00000000..c8f9cd61
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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>
+MIIDHzCCAgegAwIBAgIUG6ra0BvXswfyErcCDmzw3AV+uI0wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNc3NvLnR1Z3Jhei5hdDAeFw0xMDAzMjkxNzEzMTZaFw0z
+MDAzMjkxODEzMTZaMBgxFjAUBgNVBAMTDXNzby50dWdyYXouYXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEyQxHIM1zxbBnXn60Ksg7B7HcPLPcN7bX
+LrLPOFXtkZxm0YkHY5Rxignm7wHD7C81U09DFS2eT8qRCcVtVz+kuwdgS54fC/al
+g9oLxXk4CgKjhtZZ2ECLdTHfUXOA5uOLlpoN1LY6VpIjSYe3UEX3HxfhXx/fPeE8
+VInGCKnml8Too22G30htB/EU44A2yqrR3LUngJIaq//N0QbeMYitNh02o6xB5+bp
+6k6noM7DH6S9phe0kCEibaiLaCf7k9LpNnAz9bPtQVth0gdJqoUry/iK1QBTFTEX
+vvJynFEp0+5Wz/XFmEcFhsaK8OcHd0R9FfpX5Z2fewA2Q0SLKz+bAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDXNzby50dWdyYXouYXSGJGh0dHBzOi8vc3NvLnR1Z3Jhei5h
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXd76PcSiXR6wFna5qQi+S0W/9Y0w
+DQYJKoZIhvcNAQEFBQADggEBACgkQqxBtYY1OcuoAUP/P+ukJW7XyofK89qs2dkG
+Clx7s0hR/1zImWgljgfguLJOSfC/CWE1wfNK9bTi4Fu9809PmOoaCxkNmniFRAya
+OiBoUz5XIpJniW7wBo+YBpBlXZXi5PmU2DOsfZxo7fs4se32dHO1WqgJodqkK2Wa
+4HDiigh42trZ9i3uS73uHSSCeIJYQNj84BMJ+ifgj3Zi/TgLS+IX7Ayy2bkDzIzI
+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: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://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
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEyQxHIM1zxbBnXn60Ksg7B7HcPLPcN7bX
+LrLPOFXtkZxm0YkHY5Rxignm7wHD7C81U09DFS2eT8qRCcVtVz+kuwdgS54fC/al
+g9oLxXk4CgKjhtZZ2ECLdTHfUXOA5uOLlpoN1LY6VpIjSYe3UEX3HxfhXx/fPeE8
+VInGCKnml8Too22G30htB/EU44A2yqrR3LUngJIaq//N0QbeMYitNh02o6xB5+bp
+6k6noM7DH6S9phe0kCEibaiLaCf7k9LpNnAz9bPtQVth0gdJqoUry/iK1QBTFTEX
+vvJynFEp0+5Wz/XFmEcFhsaK8OcHd0R9FfpX5Z2fewA2Q0SLKz+bAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDXNzby50dWdyYXouYXSGJGh0dHBzOi8vc3NvLnR1Z3Jhei5h
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXd76PcSiXR6wFna5qQi+S0W/9Y0w
+DQYJKoZIhvcNAQEFBQADggEBACgkQqxBtYY1OcuoAUP/P+ukJW7XyofK89qs2dkG
+Clx7s0hR/1zImWgljgfguLJOSfC/CWE1wfNK9bTi4Fu9809PmOoaCxkNmniFRAya
+OiBoUz5XIpJniW7wBo+YBpBlXZXi5PmU2DOsfZxo7fs4se32dHO1WqgJodqkK2Wa
+4HDiigh42trZ9i3uS73uHSSCeIJYQNj84BMJ+ifgj3Zi/TgLS+IX7Ayy2bkDzIzI
+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: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="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.utu.fi-sso-idp.xml b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
index 979f5b29..e8752fa3 100644
--- a/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
+++ b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sso.utu.fi/sso-idp">
+<md: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>
+  </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
-      <mdui:UIInfo>
+      <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="sv">Åbo universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIHATCCBemgAwIBAgIQA4hFUiEZYqQbSVWEoSGbCjANBgkqhkiG9w0BAQUFADBp
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
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
new file mode 100644
index 00000000..4afa2a2e
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml
@@ -0,0 +1,58 @@
+<?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-15T09:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="lt">https://fedi.litnet.lt/lt/tvarka</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">https://fedi.litnet.lt/en/policy</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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="lt">Vilniaus Gedimino technikos universitetas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Vilnius Gediminas technical university</mdui:DisplayName>
+        <mdui:Description xml:lang="lt">VGTU desc (lt)</mdui:Description>
+        <mdui:Description xml:lang="en">VGTU desc (en)</mdui:Description>
+        <mdui:InformationURL xml:lang="lt">http://www.vgtu.lt/lt</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.vgtu.lt/en</mdui:InformationURL>
+        <mdui:Logo width="256" height="256">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
+        <mdui:Logo width="80" height="88">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
+        <mdui:Logo width="16" height="16">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>158.129.192.0/18</mdui:IPHint>
+        <mdui:DomainHint>vgtu.lt</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:54.683333,25.283333</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>MIID2TCCAsGgAwIBAgIJAJxLaKaVPb80MA0GCSqGSIb3DQEBBQUAMIGCMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsGA1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0wGwYJKoZIhvcNAQkBFg5maWxzYXZAdmd0dS5sdDAeFw0xMzAzMDUxMDU3NDRaFw0yMzAzMDUxMDU3NDRaMIGCMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsGA1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0wGwYJKoZIhvcNAQkBFg5maWxzYXZAdmd0dS5sdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANPBRmQdW7yE6Ob47RS63wc6eamLrbcZ8d3BHbkTKOg3zvty9kNGlsRHKJKaTxZJHxxJeGyFK7wD1T7esm6H4xlGd/vPkJ8BiJGaYFt+z6AK0U/C24lAUTBme0XE12kVhR2Ld+AbocdKbgRvkQDs2nupi8bT8GrcLPqEVNfrEcuoWPR0VDrn+cc9eQWsnwAi6vqPNG9BP+tXun1mKRNjLwe7xpIU2dEt4kNNvHKHzbuqMOePvURsMLYWM0GiLA5qMXU/plsgEva09gSONJqUo5PiF5CkcFZqyyJNKznIAZnLuFWJR7a3G4ArQ0BEuGzv7nchzVf+ffdClMlYOflWas0CAwEAAaNQME4wHQYDVR0OBBYEFHaPCulJCIz/U1G0e7fraytboJPGMB8GA1UdIwQYMBaAFHaPCulJCIz/U1G0e7fraytboJPGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACoR6yldDCdkFwAM/UvbmAAhYizDFszWNi53//exw4Q7LYFFExl7h6jjnZphO8/JpYBQ8gqthhEyQe1QRs/3ZBkWJC6mhUu9V6pv/n+10wPew8fm2W6FIgprTmjfz98BCff/Bk7SAqssJRGSKKmgqetMcBXQDEcAQ9i1RpFK/j51mQ6+ynBRvynN0wpAGbKYnKlH4nZhe9DDhKO+P9MDMzbDrTudjZViRUXYxY0Ay8Kfm3TgjL+Yw8/LGhSXO0k9XfCcLVC+e+4YQEUOCQNgOPDRKmZH/jntqXmfY0Dtak0612n8RmJzwybPFyeNY+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>MIID2TCCAsGgAwIBAgIJAJxLaKaVPb80MA0GCSqGSIb3DQEBBQUAMIGCMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsGA1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0wGwYJKoZIhvcNAQkBFg5maWxzYXZAdmd0dS5sdDAeFw0xMzAzMDUxMDU3NDRaFw0yMzAzMDUxMDU3NDRaMIGCMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsGA1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0wGwYJKoZIhvcNAQkBFg5maWxzYXZAdmd0dS5sdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANPBRmQdW7yE6Ob47RS63wc6eamLrbcZ8d3BHbkTKOg3zvty9kNGlsRHKJKaTxZJHxxJeGyFK7wD1T7esm6H4xlGd/vPkJ8BiJGaYFt+z6AK0U/C24lAUTBme0XE12kVhR2Ld+AbocdKbgRvkQDs2nupi8bT8GrcLPqEVNfrEcuoWPR0VDrn+cc9eQWsnwAi6vqPNG9BP+tXun1mKRNjLwe7xpIU2dEt4kNNvHKHzbuqMOePvURsMLYWM0GiLA5qMXU/plsgEva09gSONJqUo5PiF5CkcFZqyyJNKznIAZnLuFWJR7a3G4ArQ0BEuGzv7nchzVf+ffdClMlYOflWas0CAwEAAaNQME4wHQYDVR0OBBYEFHaPCulJCIz/U1G0e7fraytboJPGMB8GA1UdIwQYMBaAFHaPCulJCIz/U1G0e7fraytboJPGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACoR6yldDCdkFwAM/UvbmAAhYizDFszWNi53//exw4Q7LYFFExl7h6jjnZphO8/JpYBQ8gqthhEyQe1QRs/3ZBkWJC6mhUu9V6pv/n+10wPew8fm2W6FIgprTmjfz98BCff/Bk7SAqssJRGSKKmgqetMcBXQDEcAQ9i1RpFK/j51mQ6+ynBRvynN0wpAGbKYnKlH4nZhe9DDhKO+P9MDMzbDrTudjZViRUXYxY0Ay8Kfm3TgjL+Yw8/LGhSXO0k9XfCcLVC+e+4YQEUOCQNgOPDRKmZH/jntqXmfY0Dtak0612n8RmJzwybPFyeNY+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:NameIDFormat>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://sso.vgtu.lt/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Vilnius Gediminas Technical University</md:OrganizationName>
+    <md:OrganizationName xml:lang="lt">Vilniaus Gedimino technikos universitetas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Vilnius Gediminas Technical University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="lt">Vilniaus Gedimino technikos universitetas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vgtu.lt</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Filip</md:GivenName>
+    <md:SurName>Savin</md:SurName>
+    <md:EmailAddress>sso@vgtu.lt</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
new file mode 100644
index 00000000..e641ca77
--- /dev/null
+++ b/swamid-interfederations-2.0/ssso.uni-muenster.de-shibboleth-sp.xml
@@ -0,0 +1,102 @@
+<?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>
+      <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">Das zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. Es gibt verschiedene Zugangswege (Reverse Proxy) für verschiedene Authentifizierungsverfahren:&lt;ul compact&gt; &lt;li&gt;http(s)://www.uni-muenster.de = unidentifiziert &lt;li&gt;https://sso.uni-muenster.de = lokales Passwort &lt;li&gt;https://xsso.uni-muenster.de = X.509-Zertifikat (DFN-PKI, Sicherheitsstufe Global) &lt;li&gt;https://&lt;strong&gt;ssso.uni-muenster.de&lt;/strong&gt; = Shibboleth-SP in der DFN-AAI &lt;/ul&gt; &lt;p&gt;Hinweis für IdP-Betreiber: Zur erfolgreichen Authentifizierung ist eduPersonPrincipalName oder eduPersonTargetedID erforderlich. Übergebene Attribute (erbeten wird insbesondere eduPersonScopedAffiliation) können von den einzelnen Webspacebetreibern u. a. zur Zugangskontrolle genutzt werden. &lt;p&gt;Ansprechpartner für technische Fragen: wwwadmin@uni-muenster.de</mdui:Description>
+        <mdui:Description xml:lang="en">Das zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. Es gibt verschiedene Zugangswege (Reverse Proxy) für verschiedene Authentifizierungsverfahren:&lt;ul compact&gt; &lt;li&gt;http(s)://www.uni-muenster.de = unidentifiziert &lt;li&gt;https://sso.uni-muenster.de = lokales Passwort &lt;li&gt;https://xsso.uni-muenster.de = X.509-Zertifikat (DFN-PKI, Sicherheitsstufe Global) &lt;li&gt;https://&lt;strong&gt;ssso.uni-muenster.de&lt;/strong&gt; = Shibboleth-SP in der DFN-AAI &lt;/ul&gt; &lt;p&gt;Hinweis für IdP-Betreiber: Zur erfolgreichen Authentifizierung ist eduPersonPrincipalName oder eduPersonTargetedID erforderlich. Übergebene Attribute (erbeten wird insbesondere eduPersonScopedAffiliation) können von den einzelnen Webspacebetreibern u. a. zur Zugangskontrolle genutzt werden. &lt;p&gt;Ansprechpartner für technische Fragen: wwwadmin@uni-muenster.de</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>
+      <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
+MTExNFoXDTE5MDcwOTIzNTkwMFowgaYxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
+b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
+VW5pdmVyc2l0YWV0IE11ZW5zdGVyMR0wGwYDVQQDExRzc3NvLnVuaS1tdWVuc3Rl
+ci5kZTEnMCUGCSqGSIb3DQEJARYYd3d3YWRtaW5AdW5pLW11ZW5zdGVyLmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmQsABvLwuKrHBohtO1U86YQ5
+Opt84fnrE75KDuMGYymx22yesGf+K/hygvJtTXtC+QbFq1wqCvmSL/AoN5Upx1c8
+DAr+F7rOpKsIY3fQzCF5xj1/34azBoxn7gsqXAR7or7SYaqrSkh2ynG/uWECO9PL
+4kfGvUj9PEWLNsQcKeIDxRK9XT1j9ga4LoyghKE+wuAOPNCymFjGDmI08i8jiF9C
+QhfJGNO4rI0sNTC+xrEiJX0ZR48xnc7pWrWcXoLYTyynAhDVjR+wq+NyIZHu4keL
+akDxynHgird1o7kj/jx/2ppf8faKDOqn1D1BPvJP6U+ECranLrzrSQP/bZUGRQID
+AQABo4ICcDCCAmwwTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwIwEQYPKwYB
+BAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
+BwMBMB0GA1UdDgQWBBSrZHTvkxxm2VdrB2TKDv9NNFCadTAfBgNVHSMEGDAWgBS+
+nlGiyZJ8u2CL5rBoZHdaUhmhADBXBgNVHREEUDBOghRzc3NvLnVuaS1tdWVuc3Rl
+ci5kZYILc3Nzby53d3UuZGWCGHd3dy5zc3NvLnVuaS1tdWVuc3Rlci5kZYIPd3d3
+LnNzc28ud3d1LmRlMHsGA1UdHwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvd3d1LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwN6A1oDOGMWh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgcsGCCsG
+AQUFBwEBBIG+MIG7MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
+L09DU1AtU2VydmVyL09DU1AwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAC
+hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY2FjZXJ0L2dfY2Fj
+ZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAARlsISgb7Li7l4WssY38waKmDuEl
+zHwy5l74OIiBTX+/TTrOxcSpfYCAyucG6z9rP91e1e73r4q3PbyAhwDj7Q3TV8ki
+bagtnLC6U7d2pKerlIh8yt9m28vBzsOniiHKadqOffy9iGH5FNhkMSRRDZtgRKpp
+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">Das zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. Es gibt verschiedene Zugangswege (Reverse Proxy) für verschiedene Authentifizierungsverfahren:&lt;ul compact&gt; &lt;li&gt;http(s)://www.uni-muenster.de = unidentifiziert &lt;li&gt;https://sso.uni-muenster.de = lokales Passwort &lt;li&gt;https://xsso.uni-muenster.de = X.509-Zertifikat (DFN-PKI, Sicherheitsstufe Global) &lt;li&gt;https://&lt;strong&gt;ssso.uni-muenster.de&lt;/strong&gt; = Shibboleth-SP in der DFN-AAI &lt;/ul&gt; &lt;p&gt;Hinweis für IdP-Betreiber: Zur erfolgreichen Authentifizierung ist eduPersonPrincipalName oder eduPersonTargetedID erforderlich. Übergebene Attribute (erbeten wird insbesondere eduPersonScopedAffiliation) können von den einzelnen Webspacebetreibern u. a. zur Zugangskontrolle genutzt werden. &lt;p&gt;Ansprechpartner für technische Fragen: wwwadmin@uni-muenster.de</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Das zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. Es gibt verschiedene Zugangswege (Reverse Proxy) für verschiedene Authentifizierungsverfahren:&lt;ul compact&gt; &lt;li&gt;http(s)://www.uni-muenster.de = unidentifiziert &lt;li&gt;https://sso.uni-muenster.de = lokales Passwort &lt;li&gt;https://xsso.uni-muenster.de = X.509-Zertifikat (DFN-PKI, Sicherheitsstufe Global) &lt;li&gt;https://&lt;strong&gt;ssso.uni-muenster.de&lt;/strong&gt; = Shibboleth-SP in der DFN-AAI &lt;/ul&gt; &lt;p&gt;Hinweis für IdP-Betreiber: Zur erfolgreichen Authentifizierung ist eduPersonPrincipalName oder eduPersonTargetedID erforderlich. Übergebene Attribute (erbeten wird insbesondere eduPersonScopedAffiliation) können von den einzelnen Webspacebetreibern u. a. zur Zugangskontrolle genutzt werden. &lt;p&gt;Ansprechpartner für technische Fragen: wwwadmin@uni-muenster.de</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/st-andrews.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/st-andrews.unidesk.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..95245024
--- /dev/null
+++ b/swamid-interfederations-2.0/st-andrews.unidesk.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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://st-andrews.unidesk.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-14T14:49: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC/TCCAeWgAwIBAgIJAPHsl6kKrFrnMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEmxpdmUudW5pZGVzay5hYy51azAeFw0xMjA0MTExNDU4MjhaFw0yMjA0MDkx
+						NDU4MjhaMB0xGzAZBgNVBAMTEmxpdmUudW5pZGVzay5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAL9qh/Dehm5jJdWdeFPNKqcjMdiqii8Iz9Rc
+						tCAsEwRsYww4EQDG7MxG5hg4NSS+iIPFCp9gR+G7hTnZAMGgNpxs2vk4vs9lmhRY
+						GmB7Y1NFloP9Pcsu+MaufaLzxi6bzIXV4dBVHqVnIcgxchDIsXmPE6xlq4poEq+q
+						XJ3aFE/eWwxfwN9z0s5yeICzsil73xk9T9NLeNAeYq+jfVTcdqDbBHY6eHtMOYh/
+						uPVYYxkKXjkgSH5cwG0b+7qN4z+uzKDNBXxnI1Nz+bLOazXW6ljQIDtAPQZMJSlr
+						3OepVaQS+fMBi0Sku5yvADgINdXxkz6H4Zx4pZg/rTQBQ/8u2esCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISbGl2ZS51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBQ2tPlzxC8e
+						akC2nh9qrG4TWfI3tzANBgkqhkiG9w0BAQUFAAOCAQEAWPY3Nv9ChZ+4XVNANhLq
+						fGF7SbiPmUNj9vWGNjCp8Ma0tdDOZPvqBRzxKkkR+LS+fHpSQQ54RuNeZrulWBiN
+						akZe3LZiSH9AHG2uD0lDuxr0UQt1AHGDiLjFXuRg9+CdqqrdT3Anmy6exDDfRsjH
+						k+ZJflkEtqTNd0dbEVlkYlg8Baqx/ZMOxkccx8PtQt1yptAMsH4Rn92vXLd9d3JM
+						H1mrFuiriqrgsAfVLmzc4WeGmB+dK01cSB+CY7hKnoe7ds1y7kNhOmZ9HP3Iy7ev
+						gF2RCdnqkP9zScihW4b20PlVa/sWMUyCj2uZE1lSO51PJcGVU0H/JFrBEpaM7u6t
+						jg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://st-andrews.unidesk.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: Unidesk - University of St Andrews</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:IS.Helpdesk@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/stage.mahara.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/stage.mahara.qmul.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..5fd1f7ce
--- /dev/null
+++ b/swamid-interfederations-2.0/stage.mahara.qmul.ac.uk-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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>
+						MIIDDDCCAfSgAwIBAgIJAMZqbUlmc/4pMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF3N0YWdlLm1haGFyYS5xbXVsLmFjLnVrMB4XDTEyMDYwNzE0NTU0N1oXDTIy
+						MDYwNTE0NTU0N1owIjEgMB4GA1UEAxMXc3RhZ2UubWFoYXJhLnFtdWwuYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDZvKm8ggjSAsLt7kGFZ2t
+						bGdbkDjwkTYPeCFNFRIy+Fi904W2Ff89/ryb56iyA8N9USlj1VUv3QMlvKQNrhbw
+						xad6u6/9F2PjL78zkoYc+uJ8U8z23CaMWFBi53nLQfXmVqby7grEd/ZPmBbXFmen
+						uZfPVB4pb2s7JG1yRKwxdAvq/Du8srEQMOnKLX0A0kFumhabL+lri/VXiWGnbYcm
+						lYrv/Hmh/e/ZoYFwPXajrLwmlAcA+adOqz0exzuZ1G91qAV2/buSXbS5gq+C/Y3H
+						oy5JYDmrpXjW3USSpueih9CCXINGjEHlAnaqaa0TCNYGFIQOVO7il0QonGIVeCuB
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3N0YWdlLm1haGFyYS5xbXVsLmFjLnVrMB0G
+						A1UdDgQWBBTbCH9ZyI7zqpqMbWKMMIDVxkc5DjANBgkqhkiG9w0BAQUFAAOCAQEA
+						ouDXbFLxN9s6JB+FMZXoH8ColtAmWTnial/A+tlDqp4QjbMOXBUP/dlNx55XYYyz
+						eiQwTf347Ap6ZhcC1t6o46VC247AKfBlGwe73ASTJujDiK3RmqAXjg1/tkAMzWrz
+						5GKNeLoTPP5TyuJ3614gZmZB6uLb8bfAVyXRmSH/IfxO616yF/LBzFtnTdERiHgX
+						5YYc1q/rFFhZW5VYzmdIUsY4SuZ6qwzfhzgJAhYz7s0bkwoBz6xZk1vMGtyqUXUh
+						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>
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
new file mode 100644
index 00000000..45bb1955
--- /dev/null
+++ b/swamid-interfederations-2.0/stage.qmplus.qmul.ac.uk-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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>
+						MIIDDDCCAfSgAwIBAgIJALKxAgePakkwMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF3N0YWdlLnFtcGx1cy5xbXVsLmFjLnVrMB4XDTEyMDYwNzE0NTMzMFoXDTIy
+						MDYwNTE0NTMzMFowIjEgMB4GA1UEAxMXc3RhZ2UucW1wbHVzLnFtdWwuYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD9ivAZ6UNVeUCEdXQpkMrd
+						4Vlqxd5DYH1EqZmXDyS7aPuHGCf0TRwe4f/gwrjW9pufpcvJdWIx5xVA050CO9x1
+						5tIaRoGpwGLpi57IBQEYjPpjocF/h8TsrG+/lqD2goznu4jVmNSqFd23uXQd93mE
+						AFWaqoUWc9PN14pwMfqeChg6R9EaBdmtjBPVjX+Nc2NWDvM5oQv8XlFO1BnA+tIt
+						eyWFAiTs7YlbvMoc40XUjuIfZb6JNklpI5zLwR3+aMeEm02TXfRZeNtJx59kgTf+
+						wehHjLurwoAmzsq9+YUxfvxZrL+mWyRTz15x4LwxAL9uTUh7dWE5/Zb7DDbPsrkt
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3N0YWdlLnFtcGx1cy5xbXVsLmFjLnVrMB0G
+						A1UdDgQWBBSFCiz/saHI8JKRz6iF3iUjGLJtCDANBgkqhkiG9w0BAQUFAAOCAQEA
+						7Szt9KT41JWd/xxX1MHzpAvnoBM4mX+1d1s2YjJDVmKiojZ6ugbcLf0b/su3Z/Pa
+						zWqW0DTHT2M9tlzcsO58Jom2e5KHlYi6JW53OdJt5BLkeAg/2pFxwWpLH08aa3JL
+						YY3BYCduezz4W6bFDKuO77ItOso7AA3ht0YitAcLqbQrRwcw2wWMCXFbL8xPIeeV
+						c4YFVQd6DXqsHBJR5oh7qENv5xR0T09lAOq+MJxeLw5SPODqAUTHj+vQWffkxX3L
+						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>
diff --git a/swamid-interfederations-2.0/staging-secure.nature.com-shibboleth.xml b/swamid-interfederations-2.0/staging-secure.nature.com-shibboleth.xml
new file mode 100644
index 00000000..6f29445d
--- /dev/null
+++ b/swamid-interfederations-2.0/staging-secure.nature.com-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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 use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDRDCCAiygAwIBAgIET2caIzANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzEiMCAGA1UEAxMZc3RhZ2luZy1zZWN1cmUubmF0dXJlLmNvbTAeFw0xMjAz
+						MTkxMTM2MDNaFw0xNTAzMTkxMTM2MDNaMGQxCzAJBgNVBAYTAlVLMQ8wDQYDVQQH
+						EwZMb25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoGA1UECxMDTlBHMSIwIAYD
+						VQQDExlzdGFnaW5nLXNlY3VyZS5uYXR1cmUuY29tMIIBIjANBgkqhkiG9w0BAQEF
+						AAOCAQ8AMIIBCgKCAQEAtS44ZSa00lg3pWQqThsWqRabcAU/g6tPhAZCYHGK6kkU
+						IMk2xQwnVu68SxoI4A2G2t97KGUXqQJbTPIf6s030XiIJHLTs9uAjWtbZtvEk/GN
+						E/ncjqTVIcEiL97+astuL8s7ptHXXX72krXPRIT9XxMtO4wvR7FqUb5CKkWxBKl7
+						zfSYiCzZPu9u54WsJe6aesqYFRe4laCl7FugDymEuWjGfO5uhvUSNl1k0gUrdBsc
+						ERbBMuP6HrhM1FzeC71p/QOSznKmExuYTQLQsWvOAt+VVQJRWjvajC+uZcYu3kTw
+						V+uzwUk/LTAaVaHqeHu/nR4FSYlLRtyHqs0ClMDcTwIDAQABMA0GCSqGSIb3DQEB
+						BQUAA4IBAQCaWE62k3aHGAcWMJRS6Jcqg1pRNXG8oJqnwX5lOWfE/kPv0chTtBIW
+						HPw8Ac9hTjkwVRGDDQvukopNQinbedbbD0fzO5A83FxD7aiiaJM0mVy5aRfhJ7NQ
+						OE8j8/f1bhb8z7nAPCC3xNwzui48FAFDVCCFcpu+IMGrGAfJFxbJmRrkENh5M+tI
+						TuV/Dpa/Lt86PpvNjRkW9XX059bUhoraGeQmUmpP7l39yeYn6qQaSTuIJSZ1ERnd
+						3VV+3gCHWn+WQmZInWnQXyGPvAw9GOJ1BXf+4hvqsBBB8L2KIwk4YHcNPdoByUwA
+						3jQmLuingHQqsMA04VEthwVsFyKU3hZD
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDRDCCAiygAwIBAgIET2caIzANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzEiMCAGA1UEAxMZc3RhZ2luZy1zZWN1cmUubmF0dXJlLmNvbTAeFw0xMjAz
+						MTkxMTM2MDNaFw0xNTAzMTkxMTM2MDNaMGQxCzAJBgNVBAYTAlVLMQ8wDQYDVQQH
+						EwZMb25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoGA1UECxMDTlBHMSIwIAYD
+						VQQDExlzdGFnaW5nLXNlY3VyZS5uYXR1cmUuY29tMIIBIjANBgkqhkiG9w0BAQEF
+						AAOCAQ8AMIIBCgKCAQEAtS44ZSa00lg3pWQqThsWqRabcAU/g6tPhAZCYHGK6kkU
+						IMk2xQwnVu68SxoI4A2G2t97KGUXqQJbTPIf6s030XiIJHLTs9uAjWtbZtvEk/GN
+						E/ncjqTVIcEiL97+astuL8s7ptHXXX72krXPRIT9XxMtO4wvR7FqUb5CKkWxBKl7
+						zfSYiCzZPu9u54WsJe6aesqYFRe4laCl7FugDymEuWjGfO5uhvUSNl1k0gUrdBsc
+						ERbBMuP6HrhM1FzeC71p/QOSznKmExuYTQLQsWvOAt+VVQJRWjvajC+uZcYu3kTw
+						V+uzwUk/LTAaVaHqeHu/nR4FSYlLRtyHqs0ClMDcTwIDAQABMA0GCSqGSIb3DQEB
+						BQUAA4IBAQCaWE62k3aHGAcWMJRS6Jcqg1pRNXG8oJqnwX5lOWfE/kPv0chTtBIW
+						HPw8Ac9hTjkwVRGDDQvukopNQinbedbbD0fzO5A83FxD7aiiaJM0mVy5aRfhJ7NQ
+						OE8j8/f1bhb8z7nAPCC3xNwzui48FAFDVCCFcpu+IMGrGAfJFxbJmRrkENh5M+tI
+						TuV/Dpa/Lt86PpvNjRkW9XX059bUhoraGeQmUmpP7l39yeYn6qQaSTuIJSZ1ERnd
+						3VV+3gCHWn+WQmZInWnQXyGPvAw9GOJ1BXf+4hvqsBBB8L2KIwk4YHcNPdoByUwA
+						3jQmLuingHQqsMA04VEthwVsFyKU3hZD
+					</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>
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
new file mode 100644
index 00000000..4d3a6727
--- /dev/null
+++ b/swamid-interfederations-2.0/staging-secure.palgrave-journals.com-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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 use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDWjCCAkKgAwIBAgIET2caKDANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzEtMCsGA1UEAxMkc3RhZ2luZy1zZWN1cmUucGFsZ3JhdmUtam91cm5hbHMu
+						Y29tMB4XDTEyMDMxOTExMzYwOFoXDTE1MDMxOTExMzYwOFowbzELMAkGA1UEBhMC
+						VUsxDzANBgNVBAcTBkxvbmRvbjESMBAGA1UEChMJTWFjbWlsbGFuMQwwCgYDVQQL
+						EwNOUEcxLTArBgNVBAMTJHN0YWdpbmctc2VjdXJlLnBhbGdyYXZlLWpvdXJuYWxz
+						LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALVVjvWvefpkF+bY
+						CJdrEBdtCKHSom2P52ssdwhtZFYNIrwuOcyERjesYufWPRmY9YOV1W5HmOM/+T5y
+						gv58MwsVEyTzqD421SfKVXsMqWaIZx2CT1cnbTeduw1pNxeTT4LeyjWjatoeh/Ug
+						QHzHEo7fBoN29s/oM8CeFiIzZcw7z3rFqHgdnuB2ARvwEckCd5cDbnl7sSsDTd1Z
+						ELduDjcuwTFqzPG6oLLdDRXbmNGaBeB7unWf04Pl1MKpn2CFoUQnIVC4mp9cKkyN
+						MnW5L7eVklNHy0Gnb9i6Pn66tLb4PROvlsGX5FbaeqHbCf81oO8i/gZYFgo5BgQv
+						9YPkUPECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEANcPuyeGA9zHRxWLkEThuEHAO
+						dNGvy0SHDfweVvsdQGLYnfT9LdUCMZN1vULzWZmDyMZQrBMAm+600lbRcK7qOjpA
+						e9+f1brW5rziW8kuPeIgZDTZHSMzahhlPcqJ5lUI/2BpGVIosfnkwPvLDYcVpO/k
+						XJgb1Anf9Vj+lEwmo+sKTV0tTLCzAvLHMzH3O9hjruAbcJcp6Ujh/Pzii/i8Bmt/
+						5Td+iats14erQVDwrPfDUDwoEbYtp7hJGz9iyWNPy3xiO0eUiXPPibiAeCfqtEkr
+						cWGsHtlbQ9aViT5Qk9u1i7uRK3WYk7iUi59sc+q/Q6MCl0eoNB+jTqbn2a/dOw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDWjCCAkKgAwIBAgIET2caKDANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzEtMCsGA1UEAxMkc3RhZ2luZy1zZWN1cmUucGFsZ3JhdmUtam91cm5hbHMu
+						Y29tMB4XDTEyMDMxOTExMzYwOFoXDTE1MDMxOTExMzYwOFowbzELMAkGA1UEBhMC
+						VUsxDzANBgNVBAcTBkxvbmRvbjESMBAGA1UEChMJTWFjbWlsbGFuMQwwCgYDVQQL
+						EwNOUEcxLTArBgNVBAMTJHN0YWdpbmctc2VjdXJlLnBhbGdyYXZlLWpvdXJuYWxz
+						LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALVVjvWvefpkF+bY
+						CJdrEBdtCKHSom2P52ssdwhtZFYNIrwuOcyERjesYufWPRmY9YOV1W5HmOM/+T5y
+						gv58MwsVEyTzqD421SfKVXsMqWaIZx2CT1cnbTeduw1pNxeTT4LeyjWjatoeh/Ug
+						QHzHEo7fBoN29s/oM8CeFiIzZcw7z3rFqHgdnuB2ARvwEckCd5cDbnl7sSsDTd1Z
+						ELduDjcuwTFqzPG6oLLdDRXbmNGaBeB7unWf04Pl1MKpn2CFoUQnIVC4mp9cKkyN
+						MnW5L7eVklNHy0Gnb9i6Pn66tLb4PROvlsGX5FbaeqHbCf81oO8i/gZYFgo5BgQv
+						9YPkUPECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEANcPuyeGA9zHRxWLkEThuEHAO
+						dNGvy0SHDfweVvsdQGLYnfT9LdUCMZN1vULzWZmDyMZQrBMAm+600lbRcK7qOjpA
+						e9+f1brW5rziW8kuPeIgZDTZHSMzahhlPcqJ5lUI/2BpGVIosfnkwPvLDYcVpO/k
+						XJgb1Anf9Vj+lEwmo+sKTV0tTLCzAvLHMzH3O9hjruAbcJcp6Ujh/Pzii/i8Bmt/
+						5Td+iats14erQVDwrPfDUDwoEbYtp7hJGz9iyWNPy3xiO0eUiXPPibiAeCfqtEkr
+						cWGsHtlbQ9aViT5Qk9u1i7uRK3WYk7iUi59sc+q/Q6MCl0eoNB+jTqbn2a/dOw==
+					</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>
diff --git a/swamid-interfederations-2.0/staging-secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/staging-secure.palgraveconnect.com-shibboleth.xml
new file mode 100644
index 00000000..a15b7e54
--- /dev/null
+++ b/swamid-interfederations-2.0/staging-secure.palgraveconnect.com-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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>
+						MIIDVjCCAj6gAwIBAgIETIS9pTANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzErMCkGA1UEAxMic3RhZ2luZy1zZWN1cmUucGFsZ3JhdmVjb25uZWN0LmNv
+						bTAeFw0xMDA5MDYxMDA4MzdaFw0xMzA5MDUxMDA4MzdaMG0xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQHEwZMb25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoGA1UECxMD
+						TlBHMSswKQYDVQQDEyJzdGFnaW5nLXNlY3VyZS5wYWxncmF2ZWNvbm5lY3QuY29t
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmorc2oOM/Jpc7xDJ+Jz4
+						DDtztP8WGnz6XAlSDwPmbEBZFUv7016jqXNj5k1JeB/caVHxHD4sXYm3Vgk2mXaL
+						0Ceh3Yolvihfsd97czXinucxWGoozR5P9r3LBOG0mDmm3H51P/RnNJBBv6ogZLM6
+						3Ypd7NiB1DPZeMsc908aPBOyCmMY6EwiDJ7yW4/7PDxaYQHZDCTHEx/wrJHddNKI
+						nQbZlQxDnVdGniCykir9QEz/la/WtA135GP5mGG5Du1qu2j4/DjqLCjRG5EkEelH
+						5Mg7fPP2RxtbD0TafZIPIO/9wYhKh8YDN08V9ov9anY547G7x6INPg4ymlY2lb3N
+						AQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCYYWAPH/FhXScjU+BjL0wovwMHv+2t
+						sL8urXcPJEVjEnnw1uGZQf+2rZdMWQutmdAtCs4K/oBPzduhnrPLmUTO8uePoK+E
+						LGymsoy9Znd+4fNsuN4MpFqUf1sIG0coizs6SiSBwaLIVi0veNQdBQaT/0iu16if
+						pjcFPSaWrve7IRpdVapI+5ZskHOUToWecugg7TVvb0q1Sslf2rkHn6f5R7e/bVRn
+						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>
+						MIIDVjCCAj6gAwIBAgIETIS9pTANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzErMCkGA1UEAxMic3RhZ2luZy1zZWN1cmUucGFsZ3JhdmVjb25uZWN0LmNv
+						bTAeFw0xMDA5MDYxMDA4MzdaFw0xMzA5MDUxMDA4MzdaMG0xCzAJBgNVBAYTAlVL
+						MQ8wDQYDVQQHEwZMb25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoGA1UECxMD
+						TlBHMSswKQYDVQQDEyJzdGFnaW5nLXNlY3VyZS5wYWxncmF2ZWNvbm5lY3QuY29t
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmorc2oOM/Jpc7xDJ+Jz4
+						DDtztP8WGnz6XAlSDwPmbEBZFUv7016jqXNj5k1JeB/caVHxHD4sXYm3Vgk2mXaL
+						0Ceh3Yolvihfsd97czXinucxWGoozR5P9r3LBOG0mDmm3H51P/RnNJBBv6ogZLM6
+						3Ypd7NiB1DPZeMsc908aPBOyCmMY6EwiDJ7yW4/7PDxaYQHZDCTHEx/wrJHddNKI
+						nQbZlQxDnVdGniCykir9QEz/la/WtA135GP5mGG5Du1qu2j4/DjqLCjRG5EkEelH
+						5Mg7fPP2RxtbD0TafZIPIO/9wYhKh8YDN08V9ov9anY547G7x6INPg4ymlY2lb3N
+						AQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCYYWAPH/FhXScjU+BjL0wovwMHv+2t
+						sL8urXcPJEVjEnnw1uGZQf+2rZdMWQutmdAtCs4K/oBPzduhnrPLmUTO8uePoK+E
+						LGymsoy9Znd+4fNsuN4MpFqUf1sIG0coizs6SiSBwaLIVi0veNQdBQaT/0iu16if
+						pjcFPSaWrve7IRpdVapI+5ZskHOUToWecugg7TVvb0q1Sslf2rkHn6f5R7e/bVRn
+						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>
diff --git a/swamid-interfederations-2.0/staging.anatomy.tv-shibboleth.xml b/swamid-interfederations-2.0/staging.anatomy.tv-shibboleth.xml
new file mode 100644
index 00000000..f9349c22
--- /dev/null
+++ b/swamid-interfederations-2.0/staging.anatomy.tv-shibboleth.xml
@@ -0,0 +1,57 @@
+<?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>
+						MIIDvjCCAqagAwIBAgIJANetmNOVoSNmMA0GCSqGSIb3DQEBBQUAMEgxKTAnBgNV
+						BAoTIEFuYXRvbXkudHYgLSBQcmltYWwgUGljdHVyZXMgTHRkMRswGQYDVQQDExJz
+						dGFnaW5nLmFuYXRvbXkudHYwHhcNMTMxMDMxMTExNjQ3WhcNMjMxMDI5MTExNjQ3
+						WjBIMSkwJwYDVQQKEyBBbmF0b215LnR2IC0gUHJpbWFsIFBpY3R1cmVzIEx0ZDEb
+						MBkGA1UEAxMSc3RhZ2luZy5hbmF0b215LnR2MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA3C52o8p8YkN1Fe4aZ6d6H5+LvpvXwLXm9Jwio0wYWhp+GYJI
+						L0iUZ8e3IN5h5wMXI9uPSn8fcTbdQMA3y1MMT+5CqKbLsUPTQTm68iXcdiPAJtfC
+						A4Bhg1ogW1Bh0npUAte2LDZLouKan8gd1/fBwqOc6qoI9LtDtQwzv4ICPSbmk8QJ
+						XeYnN9BnF7GK9qLBMsY/MjUNuMvTintAyw1fXt/RjDwUYaV38POWq2SWDLDUk4ZS
+						sCeIpmnOoPjtjMynCtdxCkpc/JoiXuPj+ZaVvC6dJ4HC4yYFJkh1Ekx0Y0FtLelo
+						I1eXC+3i1MsTxJgXH3BT7aoHabM1W6lMk3UdfwIDAQABo4GqMIGnMB0GA1UdDgQW
+						BBTm/zWeK4+cs7FFJxeAU1waEXxOhDB4BgNVHSMEcTBvgBTm/zWeK4+cs7FFJxeA
+						U1waEXxOhKFMpEowSDEpMCcGA1UEChMgQW5hdG9teS50diAtIFByaW1hbCBQaWN0
+						dXJlcyBMdGQxGzAZBgNVBAMTEnN0YWdpbmcuYW5hdG9teS50doIJANetmNOVoSNm
+						MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHfMpqXjIy5q2EeadDTI
+						i9O99x8TqLBfdKNEsCu3lP8lTM9I++qa+0DYDsjIfLqAqTkvzTi+ImFVaL7TbmmO
+						qgHv2xg9bzfi82Ulp4ZP/BbEolRw68E+CA090k4NR7Q1YWrxolVJAK87kzEEAiho
+						SeogrT6SJJ0CipUkd3gqEXko58uVoR8IE6s4h3bZUOaYdUzJLvwdQMtwYy7I1X29
+						lAZVRAko2Zq9RszxLCkIXsQOLcwUYO6jOhDzk5alRux9T1skZvBoztZSzqcwIH4d
+						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>
diff --git a/swamid-interfederations-2.0/staging.jorum.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/staging.jorum.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..bbed5aae
--- /dev/null
+++ b/swamid-interfederations-2.0/staging.jorum.ac.uk-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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>
+      <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>
+						MIIDKDCCAhCgAwIBAgIJAMvDRTJflddLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE3N0YWdpbmcuam9ydW0uYWMudWswHhcNMTMwMjAxMTE0MjMyWhcNMjMwMTMw
+						MTE0MjMyWjAeMRwwGgYDVQQDExNzdGFnaW5nLmpvcnVtLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAshCDHUltlUA+s2SyenjOhv25bLCgF0e/
+						6akdpCN65otOt5+naesfGFdZslcQ/CCqAe1i5tFCmBZ8eNSGt75pcmoqkzDPhpBN
+						mOsxaJjdwxHrnQWbFOXr+A10GPsdne0WfdBF/id4ZSPEHAeFPbqXtAP7cV1xQO6p
+						Pq7KVotO6vZZCDvqQlqnMXNuet3uVAYy9KZUCaJc2BqgN/PqZPGuFh05yUTDxpU+
+						NheOQB6G8uJOxeQMgzlda7DGpmyCJ/WQ2AfsFI5j5LFDd1bOF10D+CyWOwduieEX
+						1qNqbEEydR+CfFigLa2lHyOKTrz2S1O3pGo3Gv06ucLHbd+z3yDzDQIDAQABo2kw
+						ZzBGBgNVHREEPzA9ghNzdGFnaW5nLmpvcnVtLmFjLnVrhiZodHRwczovL3N0YWdp
+						bmcuam9ydW0uYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUUC/AOy7IH6iDm768
+						7bNBfNwPApgwDQYJKoZIhvcNAQEFBQADggEBAKtuA1eo/6O9HtcgSN6ykYW/HVIM
+						UvIXjowkbDvTBfF4az9ywZ2fgBMoJwTXUSGR4cRW5E8jlKexloFvfaoFMKNnN/C9
+						evebn4ffrjrfYh9RjsBl1vA6eingNUxUSfMNxsf2evGalI/x243F5XarJYDhbafL
+						U/UTjsVhMGOOVZopa3ibB9dCDw0152WL70p8i1CD5BdMuqEPxoMnDctaJ+4WXuyP
+						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>
diff --git a/swamid-interfederations-2.0/staging.lifeisaboutlearning.com-shibboleth-sp.xml b/swamid-interfederations-2.0/staging.lifeisaboutlearning.com-shibboleth-sp.xml
new file mode 100644
index 00000000..cf66a8b4
--- /dev/null
+++ b/swamid-interfederations-2.0/staging.lifeisaboutlearning.com-shibboleth-sp.xml
@@ -0,0 +1,56 @@
+<?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.lifeisaboutlearning.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 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://staging.lifeisaboutlearning.com/Shibboleth.sso/Secure"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDFTCCAf2gAwIBAgIJAPtViNwB/v+VMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGnN0YWdpbmctd2ViMS5zdGFnaW5nLmxvY2FsMB4XDTExMTAxMzEzMTYzNVoX
+						DTIxMTAxMDEzMTYzNVowJTEjMCEGA1UEAxMac3RhZ2luZy13ZWIxLnN0YWdpbmcu
+						bG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsSO+LEfMhRz4+
+						uG061XictuNJevlzijTaPoWaj2DKujftRfAOyU0AWkavCO3xHaNMFv75j6XT7dXd
+						FfHB4tGo3mImHU2eIWWVGzgW/s2aW9hVSTKxdGyv+8mJlmvG6/t/R9ST+3xftu0q
+						BhNuLJ0bXoX80DDnUlELKL5CfToICzxjWd9j4kWhizozANaCL0bOiSWZOSeJKyMF
+						pMaKAAg9sfimH8oA5h8GRkV4CThTVpjomo0pkolJd6qg8XUaDW741IRp6B8IKDcD
+						1O0PecGPulpmGmfUw8rkNiZLTlWgluURYd+lOwJsyasl+L8KzOcHGvkJt9DvUt1+
+						lDCCZQqBAgMBAAGjSDBGMCUGA1UdEQQeMByCGnN0YWdpbmctd2ViMS5zdGFnaW5n
+						LmxvY2FsMB0GA1UdDgQWBBQ15cgGQF4wtYN8+itk5IVnxEdLITANBgkqhkiG9w0B
+						AQUFAAOCAQEABPS6lPeNvN6Uy791yHF7St30KguiNupP/VQup+uxbDk8lqjjll9U
+						KkJuaUU1eMh5wS1jxguBEK7gHvznl/sP2CpFlvsPjp3YjqiGKtIay+4/oJdQ/FGm
+						fdcStvP1kyUC+mzBxOZ5J5gjLHntO3DDjiKf/gow7t5r4gk2Zf+BsgrkgNc0xNNe
+						N72Uwlv3YkaWqnsuwvdk8haYTXO2xRyC9oDmckLEwkTBlprJ/xd0QlLmCCvRdvbV
+						b2PQA7P/jCpmFijFWdQ7b5E/yxUa16Er5WOJ7RWofAsL5fUwaup+VZe7w5P1CA3q
+						wMNSSkLVhUVe+ea/BAb0o5QDEn314PCgNA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.lifeisaboutlearning.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.lifeisaboutlearning.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.lifeisaboutlearning.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging.lifeisaboutlearning.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.lifeisaboutlearning.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.lifeisaboutlearning.com/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: staging SP</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>John</md:GivenName>
+    <md:SurName>Burns</md:SurName>
+    <md:EmailAddress>mailto:john.burns@uniservity.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging.ords.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/staging.ords.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..80c34882
--- /dev/null
+++ b/swamid-interfederations-2.0/staging.ords.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,68 @@
+<?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.ords.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-29T09:09: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://staging.ords.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>
+						MIIDMDCCAhigAwIBAgIJAKM+ZGZAkigcMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXN0YWdpbmcub3Jkcy5veC5hYy51azAeFw0xNDA0MjMxMjAwMDhaFw0yNDA0
+						MjAxMjAwMDhaMCAxHjAcBgNVBAMTFXN0YWdpbmcub3Jkcy5veC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPIzMJGiy26YXX/hbUenRMs6kvgB
+						UNJfZ2QPHp1PIrFXA+vMlscS5YEy0kIqVPwtZz5+qJAHSqKlQOM5cg05gfAolGd3
+						mDuKsRrQ68k2mv9O9XzBvREtdpBikdEq/l2dGcVg6TuN1yxR9D41tPR4KAcAFG75
+						z/Ok+7wLq+iZn0WBi5moYSfHHL8m4tspB5u9+W9o+oqePg5Qq6ks1TRIXNTF5llq
+						Sgd4KXxf2tErwQuGm9igjZdLpxWBgK1JRKbj2KCU2QHAjeJZwpByWEc1v/bji1nX
+						2pixxbTuqQM/E9oMk4u3j6mDBMfkYRfPonjDZpBdLIAKPqv1jPerEO7ejhUCAwEA
+						AaNtMGswSgYDVR0RBEMwQYIVc3RhZ2luZy5vcmRzLm94LmFjLnVrhihodHRwczov
+						L3N0YWdpbmcub3Jkcy5veC5hYy51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBS+sZ7C
+						5GuAQYsRxmwh+yjol3j1gjANBgkqhkiG9w0BAQUFAAOCAQEAWfln4ibbE5na1BfQ
+						7vF4MV+eai9uR86eyT5q+8+jKHcPV7Uj3xrbQCg67cq0MpqR8wyF9J0HpIvsJBVH
+						D6KU4FpLI2j5Ewk1AB+axpsowB+5jb69bI/kpVBegyXMizEvABgTkeChtijEQUtb
+						lCScLer3eDATqxIm0NsKhH2cGuLxuxUMm+4+Y2JEydhVgCQPscLGAHltvqKAEQKb
+						R4qMEHpJDyr08tW/e33fKDXxJJYVoy2fXbLXvRj1b24EHWotph4ymU/yV2FosVvd
+						On31/B5cEn9CioFOXIoI+idVlFcYjds3UL80ccdMvMZbuhAOrdSuiml0w68W908T
+						087V5g==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.ords.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://staging.ords.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://staging.ords.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.ords.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 ORDS staging</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.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/staging.portal.euromonitor.com-athens.xml b/swamid-interfederations-2.0/staging.portal.euromonitor.com-athens.xml
new file mode 100644
index 00000000..c2df87fd
--- /dev/null
+++ b/swamid-interfederations-2.0/staging.portal.euromonitor.com-athens.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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>
+						MIIDzTCCArWgAwIBAgIJAKY1zcaXHG70MA0GCSqGSIb3DQEBBQUAME0xIjAgBgNV
+						BAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxJzAlBgNVBAMTHnN0YWdpbmcu
+						cG9ydGFsLmV1cm9tb25pdG9yLmNvbTAeFw0xMzEwMDMwOTQ1NDFaFw0yMzEwMDEw
+						OTQ1NDFaME0xIjAgBgNVBAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxJzAl
+						BgNVBAMTHnN0YWdpbmcucG9ydGFsLmV1cm9tb25pdG9yLmNvbTCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAMeswt5WPQ+4Df7A4WKjSgvrfS+O0NbD+Zr1
+						mzxgCovcVsYjCXfMgN6ylaYEKSb2rdB33RrtcA4U+9GUX7jV6czcSn+q9smEOiUP
+						01id8xU09xB+xKvfqxHlzm3WtvtNDAMkLQokEzEiuR+QORwqO0ylK7ngFyr3QN9A
+						Kk8nU8PPOAJ3DAPRpFnAAiUaAKHyNlZLqWONr+5jVQAJGlnWc7Z3ian57YLKcG6Z
+						Pmnqt9n9gfBUmk6Oh1mxvN2mf+bStCXNjSmIV6X39Xl1RWNnl6SIIEB8ibrAZqpE
+						Gbb40d+/Ki3Whzh1wS4Mr/V/Yxo6Klqr4VqQoIfDq6J5CVa8GwsCAwEAAaOBrzCB
+						rDAdBgNVHQ4EFgQUA0geA/VQ7QAYL0gI5OnhkuUEgPIwfQYDVR0jBHYwdIAUA0ge
+						A/VQ7QAYL0gI5OnhkuUEgPKhUaRPME0xIjAgBgNVBAoTGUV1cm9tb25pdG9yIElu
+						dGVybmF0aW9uYWwxJzAlBgNVBAMTHnN0YWdpbmcucG9ydGFsLmV1cm9tb25pdG9y
+						LmNvbYIJAKY1zcaXHG70MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+						AJAi5ZB4lhOmbmzFuLUCyELol15fQA/iRfQqDmuCx2pcZhKrcU2d3suWYaBKu5eT
+						VX8MMHAHeO/7hdFbbjmTRcXJNnLMfRs5V5pnOj3F8GZtetDt0oU808w7fGESWifs
+						RljP0mxWzKQoiBxZXU9XJLJa64Nkfpr5Ohb95YhLr3i+K/HnHsYZw2wGonekCqFB
+						WMAzY3lJ/UoRe6MIMFGB/LX/uXkVXtjTldrauOik4NiDX1Z8AwYfU8f0T4iWUzrh
+						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>
+						MIIDzTCCArWgAwIBAgIJAKY1zcaXHG70MA0GCSqGSIb3DQEBBQUAME0xIjAgBgNV
+						BAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxJzAlBgNVBAMTHnN0YWdpbmcu
+						cG9ydGFsLmV1cm9tb25pdG9yLmNvbTAeFw0xMzEwMDMwOTQ1NDFaFw0yMzEwMDEw
+						OTQ1NDFaME0xIjAgBgNVBAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxJzAl
+						BgNVBAMTHnN0YWdpbmcucG9ydGFsLmV1cm9tb25pdG9yLmNvbTCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAMeswt5WPQ+4Df7A4WKjSgvrfS+O0NbD+Zr1
+						mzxgCovcVsYjCXfMgN6ylaYEKSb2rdB33RrtcA4U+9GUX7jV6czcSn+q9smEOiUP
+						01id8xU09xB+xKvfqxHlzm3WtvtNDAMkLQokEzEiuR+QORwqO0ylK7ngFyr3QN9A
+						Kk8nU8PPOAJ3DAPRpFnAAiUaAKHyNlZLqWONr+5jVQAJGlnWc7Z3ian57YLKcG6Z
+						Pmnqt9n9gfBUmk6Oh1mxvN2mf+bStCXNjSmIV6X39Xl1RWNnl6SIIEB8ibrAZqpE
+						Gbb40d+/Ki3Whzh1wS4Mr/V/Yxo6Klqr4VqQoIfDq6J5CVa8GwsCAwEAAaOBrzCB
+						rDAdBgNVHQ4EFgQUA0geA/VQ7QAYL0gI5OnhkuUEgPIwfQYDVR0jBHYwdIAUA0ge
+						A/VQ7QAYL0gI5OnhkuUEgPKhUaRPME0xIjAgBgNVBAoTGUV1cm9tb25pdG9yIElu
+						dGVybmF0aW9uYWwxJzAlBgNVBAMTHnN0YWdpbmcucG9ydGFsLmV1cm9tb25pdG9y
+						LmNvbYIJAKY1zcaXHG70MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+						AJAi5ZB4lhOmbmzFuLUCyELol15fQA/iRfQqDmuCx2pcZhKrcU2d3suWYaBKu5eT
+						VX8MMHAHeO/7hdFbbjmTRcXJNnLMfRs5V5pnOj3F8GZtetDt0oU808w7fGESWifs
+						RljP0mxWzKQoiBxZXU9XJLJa64Nkfpr5Ohb95YhLr3i+K/HnHsYZw2wGonekCqFB
+						WMAzY3lJ/UoRe6MIMFGB/LX/uXkVXtjTldrauOik4NiDX1Z8AwYfU8f0T4iWUzrh
+						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: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
new file mode 100644
index 00000000..6cb09660
--- /dev/null
+++ b/swamid-interfederations-2.0/staging.researchmonitor.euromonitor.com-web-oa-metadata.xml
@@ -0,0 +1,87 @@
+<?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>
+						MIIDvjCCAqagAwIBAgIJAK7CyN11IEtLMA0GCSqGSIb3DQEBBQUAMEgxFDASBgNV
+						BAoTC0V1cm9tb25pdG9yMTAwLgYDVQQDEydzdGFnaW5nLnJlc2VhcmNobW9uaXRv
+						ci5ldXJvbW9uaXRvci5jb20wHhcNMTMwOTEzMDcxNTIyWhcNMjMwOTExMDcxNTIy
+						WjBIMRQwEgYDVQQKEwtFdXJvbW9uaXRvcjEwMC4GA1UEAxMnc3RhZ2luZy5yZXNl
+						YXJjaG1vbml0b3IuZXVyb21vbml0b3IuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAp2d1o2RyIodtFfrHj1W4RWAcGF8sUjEdZv7Gcc0Z62CKIAzO
+						ymxC+b6UmqZAZdFzkzNDvJ4L7SPzi+jh9aeahZepejALQD1HxhUqQNE6hQdJfIxl
+						nXXYRl7qdt12aASDSImpI+pnlEJERKGsQ7TGcWyHUBmGExbdSAQTCXcQbSzTrf8M
+						qiU2mR8+NwQ59nNsIw2NmKgUaFH1G4b16Qg6sjIOBc9Qvi3T8aNJLTlWBlsc0S34
+						NUhQ244bfbjDXBohORWcedO5rvVOf/jq1Zuqp2VcQjxH5mzdSwKcgaPA3Bi33kHL
+						RbwfnjU81MRwnMTYn/vL+qImma+pbZmbZUBSVwIDAQABo4GqMIGnMB0GA1UdDgQW
+						BBSRbu5R+jct73Fwv5E5tG05aqZk/DB4BgNVHSMEcTBvgBSRbu5R+jct73Fwv5E5
+						tG05aqZk/KFMpEowSDEUMBIGA1UEChMLRXVyb21vbml0b3IxMDAuBgNVBAMTJ3N0
+						YWdpbmcucmVzZWFyY2htb25pdG9yLmV1cm9tb25pdG9yLmNvbYIJAK7CyN11IEtL
+						MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHZcvly0zk2OsvuHpMFC
+						ds+Xmwp1NseFEB0VONywfd9lC004TmB0oCSRn7SN7fyMOBYbOsUwWM8WBUAmsY+F
+						KQw9MEaNxWONzEGa7ihBtkPHWE8OoxvAnoSNK6z2ZZjzh1NE/4znsxAwEAGKZryU
+						V016lBsKTqT6eRKQnV0m9IztJHZlAHRfTpNPI7cmzQssRjI+gj5GuaexhP5wr/3u
+						50IQrpoNjYPhA9Cm9ayYSsI8noy8x8QmuBoSjTHM3pN+WHbpbfa+lPCijyu3nof/
+						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>
+						MIIDvjCCAqagAwIBAgIJAK7CyN11IEtLMA0GCSqGSIb3DQEBBQUAMEgxFDASBgNV
+						BAoTC0V1cm9tb25pdG9yMTAwLgYDVQQDEydzdGFnaW5nLnJlc2VhcmNobW9uaXRv
+						ci5ldXJvbW9uaXRvci5jb20wHhcNMTMwOTEzMDcxNTIyWhcNMjMwOTExMDcxNTIy
+						WjBIMRQwEgYDVQQKEwtFdXJvbW9uaXRvcjEwMC4GA1UEAxMnc3RhZ2luZy5yZXNl
+						YXJjaG1vbml0b3IuZXVyb21vbml0b3IuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAp2d1o2RyIodtFfrHj1W4RWAcGF8sUjEdZv7Gcc0Z62CKIAzO
+						ymxC+b6UmqZAZdFzkzNDvJ4L7SPzi+jh9aeahZepejALQD1HxhUqQNE6hQdJfIxl
+						nXXYRl7qdt12aASDSImpI+pnlEJERKGsQ7TGcWyHUBmGExbdSAQTCXcQbSzTrf8M
+						qiU2mR8+NwQ59nNsIw2NmKgUaFH1G4b16Qg6sjIOBc9Qvi3T8aNJLTlWBlsc0S34
+						NUhQ244bfbjDXBohORWcedO5rvVOf/jq1Zuqp2VcQjxH5mzdSwKcgaPA3Bi33kHL
+						RbwfnjU81MRwnMTYn/vL+qImma+pbZmbZUBSVwIDAQABo4GqMIGnMB0GA1UdDgQW
+						BBSRbu5R+jct73Fwv5E5tG05aqZk/DB4BgNVHSMEcTBvgBSRbu5R+jct73Fwv5E5
+						tG05aqZk/KFMpEowSDEUMBIGA1UEChMLRXVyb21vbml0b3IxMDAuBgNVBAMTJ3N0
+						YWdpbmcucmVzZWFyY2htb25pdG9yLmV1cm9tb25pdG9yLmNvbYIJAK7CyN11IEtL
+						MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHZcvly0zk2OsvuHpMFC
+						ds+Xmwp1NseFEB0VONywfd9lC004TmB0oCSRn7SN7fyMOBYbOsUwWM8WBUAmsY+F
+						KQw9MEaNxWONzEGa7ihBtkPHWE8OoxvAnoSNK6z2ZZjzh1NE/4znsxAwEAGKZryU
+						V016lBsKTqT6eRKQnV0m9IztJHZlAHRfTpNPI7cmzQssRjI+gj5GuaexhP5wr/3u
+						50IQrpoNjYPhA9Cm9ayYSsI8noy8x8QmuBoSjTHM3pN+WHbpbfa+lPCijyu3nof/
+						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>
diff --git a/swamid-interfederations-2.0/staging.researchprofessional.com-shibboleth.xml b/swamid-interfederations-2.0/staging.researchprofessional.com-shibboleth.xml
new file mode 100644
index 00000000..47e61881
--- /dev/null
+++ b/swamid-interfederations-2.0/staging.researchprofessional.com-shibboleth.xml
@@ -0,0 +1,108 @@
+<?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>
+      <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>
+						MIID+jCCAuKgAwIBAgIJANtavlaD4gXtMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNV
+						BAYTAlVLMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZMb25kb24xHjAc
+						BgNVBAoTFVJlc2VhcmNoIFJlc2VhcmNoIEx0ZDEpMCcGA1UEAxMgc3RhZ2luZy5y
+						ZXNlYXJjaHByb2Zlc3Npb25hbC5jb20wHhcNMTQxMDAzMTUyNDUwWhcNMjQwOTMw
+						MTUyNDUwWjB+MQswCQYDVQQGEwJVSzETMBEGA1UECBMKU29tZS1TdGF0ZTEPMA0G
+						A1UEBxMGTG9uZG9uMR4wHAYDVQQKExVSZXNlYXJjaCBSZXNlYXJjaCBMdGQxKTAn
+						BgNVBAMTIHN0YWdpbmcucmVzZWFyY2hwcm9mZXNzaW9uYWwuY29tMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArdM6ozR6y5EBRjgqfDHUZPr2MicY03Gv
+						B3M3UlMLH63mzyUkG/PGu44ggqPLkb52ec7Gxj5/J+9xtFdLY9h2LUyBWF01O82H
+						j652edA19RigG5ph26VLy7d9fYG+PmUwhrlWlMIo4JvgopSL7Jrinn+CEMj2k7oY
+						fkCezsqL9jtSprylCHOwlFFysgIVNAcGhr9enQixVczaft02+CoWluBOgeXoUDZb
+						xJ0GY3Hld8Q2UrtLYJjgUPRoqIS4Vpcwo3byIE7Gd++CmeD5W4oeRrXYgt6c83PC
+						4L3g46OOqXyN9hb7LvaQmjsqSvpmpkHPPkUtPOcCyAGQpsx1FjOx5wIDAQABo3sw
+						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
+						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUle7hyLGQ0EpHrclYpACXpYbOYAMwHwYDVR0j
+						BBgwFoAUle7hyLGQ0EpHrclYpACXpYbOYAMwDQYJKoZIhvcNAQEFBQADggEBABGR
+						6qbmzA1hH18lj76R3XyV0ontRqZKvn8pwsK0K/GMWuKgv+OkYzEW6n6DeDL6sbSB
+						cC4uiuTaS2iclxRnYud8PZttjWjuZhzO1qICnLa8sUjKqV9HUD4Gr3AXgNXtcnwW
+						UMXAY2ys0GUtFoOR6vVPC0i35GErCCANcYOCw11ZRS71iNQtfXyblTHY1KVWNgsU
+						3NVNwf9tq1Pk1M2UgNmllfyyoGKxiNyechbWlb1MBkmdQEqHliRvGW7UV2UVhO5b
+						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: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/staging.weblearn.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/staging.weblearn.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..6611fb98
--- /dev/null
+++ b/swamid-interfederations-2.0/staging.weblearn.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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.weblearn.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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://staging.weblearn.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>
+						MIIDQDCCAiigAwIBAgIJAJX0ZKKX7ko1MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXN0YWdpbmcud2VibGVhcm4ub3guYWMudWswHhcNMTIwMTIwMTYyNDM2WhcN
+						MjIwMTE3MTYyNDM2WjAkMSIwIAYDVQQDExlzdGFnaW5nLndlYmxlYXJuLm94LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAujPN4+nPhmPX7IHC
+						DbKNREIMOegYbwxhS20EnBlNbePWKeWo/fRDsRITeV5aCBaEAUMPQ4pqm/WN7NOk
+						LkFyFdgf88u9RDRvt8nsiBj8cVP1vGOa8Fd+WJALk+UdTHjDmoz8bERL+cEsD1UC
+						FI/wUKmV9RfNGSEJFR0oDSddXI8Uy5DiFB0psDMY+b2CREqtSZcL8UZ5hXZHrBJn
+						MwSlpO9R09eYWePrDpSmB+3N0kZ8knt/452y4d3tqBiLlei8eYBJYx4uyVrh2yDe
+						TRXxFYf18C95X5alI6qQJ9LLtxUBG8H9dbqZNDZbDPUVZU43C9lyHZSNePL3nCey
+						/XundQIDAQABo3UwczBSBgNVHREESzBJghlzdGFnaW5nLndlYmxlYXJuLm94LmFj
+						LnVrhixodHRwczovL3N0YWdpbmcud2VibGVhcm4ub3guYWMudWsvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUoB3xlJRX2I37Yt1m1afvUCGruzYwDQYJKoZIhvcNAQEFBQAD
+						ggEBADSwA3sYHFxtdqLbm4mXlyYZV/imAfHxs2i4aXmyHYf5ygpKq6TyKxJlYj08
+						SPhSO87l5IsUJFQvvS0gn0JD+KQmD4zKwlxQrHHsSyltttXZr6/iLrpntrl9DXaB
+						6dYes8fj/+2FCai7W4DtMHfCKnIbZjgnjcHP1iJP38/qHF1OS6WFksXHWOHCT2S4
+						lsPet/+7viQNQBkHuxrb9h9hv4kbF+mLB8POpSkFi2qu8+YTwtU2LGOqYsOlcAc9
+						GEMwiQOt0LOOhVndYBUZf0Rt8g/Xn12lm3tkOjpVeRLw0oTli4DedF9JtqVyzKat
+						oWaY395NMNm9ZP2t/8TeydkoqYI=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Weblearn Staging</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oucs.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/stats-qa.ukdataservice.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/stats-qa.ukdataservice.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..aecc03e1
--- /dev/null
+++ b/swamid-interfederations-2.0/stats-qa.ukdataservice.ac.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIDDDCCAfSgAwIBAgIJAPpH6NVGj1XdMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF2RhZG90c3dlYnN0LmVzc2V4LmFjLnVrMB4XDTE1MDIxMjE0NTQxM1oXDTI1
+						MDIwOTE0NTQxM1owIjEgMB4GA1UEAxMXZGFkb3Rzd2Vic3QuZXNzZXguYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDsGGwsGqLlefqf9/trBWbE
+						xMSEW2OX4wNs+z2HTDqknWz3iMsiGiKwWCHWX1ZoQ/wtTNWm2ZrwJEoJaddI7Sz4
+						GM2TA4P21HdYjzXrW1pjU0kiZSU+pxVXVK4PXvuUwB6kxBaKe308r6GBMHItLh7F
+						hGe9A2SvWgDBBlblyw+edNw4L8CebjXhqy9FjySpMYbSOf5EPgSZk65F0nJpAWNP
+						VJGORlYolNR/ida5zT6nrNZNKkNONGJNecduaA4Gz8wpdh/130MFdkvxfcubPSA6
+						zj/2gx1YSKiX21GFTwJ6IpbgfCEbva0AUoeqiUnDQeMj9tDRJsvig++n4IyXvgYb
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2RhZG90c3dlYnN0LmVzc2V4LmFjLnVrMB0G
+						A1UdDgQWBBS+yIbRvhlwfAoaYco+n9wYnqCH6TANBgkqhkiG9w0BAQUFAAOCAQEA
+						W5xAKRmFGiobOWK3XSS7vVIdw53mxNeX8V7ktOPPZfc7btPc9+T72YPS5E+qEGyg
+						GbyhL1KhZQl7TBeXVurcU8ZiSZcqhBKlW2e35OXh2ayt1s7dZI4FRwmlwnCWYrWV
+						4L0omNrpUJehBBN8YocDnewHmOxgdwp8xEg+8sQwJGCOUgIEW7RqPz9Ac1jUQYeI
+						lA45WldwBjDa9kEY+2RWISHZ1suZU3lZiSZuev8MT6OWGn5p7+Jg0Kp9DjZB/92L
+						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:syrotiuk@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/store.lu.lv.xml b/swamid-interfederations-2.0/store.lu.lv.xml
new file mode 100644
index 00000000..ff28a803
--- /dev/null
+++ b/swamid-interfederations-2.0/store.lu.lv.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://store.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: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>
+MIIC6DCCAdCgAwIBAgIJANOTPRn8Yj6/MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC3N0b3JlLmx1Lmx2MB4XDTEzMDMwODEwMzcyNVoXDTI4MDMwNDEwMzcyNVow
+FjEUMBIGA1UEAxMLc3RvcmUubHUubHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCxCVKw78p1ayPtIH4fKtDzmG8bxfJRy2vpZPRn6JLOMWq6eNVvHtwl
+wen+fLTgig1i56GWHPQCF5PGwWoq6xj5S/uRoinAtiIk9Zz5sUz9HtBK5AXkdpLI
+fulUNJZ1uVIe0xIVBl3pGw3ckq1v5WFpDWk2vj5gebQq2090qbgK1TTiMXh/wKZe
+2aHiPT1WCklnTvdoEOgipSl+nClBtbLrTAZh7FZAbGYbxhZI3288pwUfNR91nWu6
+yJ9qdERB8WlN+sgpGsZDKgV/Z/DW+GW1TEIgoIu757jAY/rxB3nhhoqdiFRlj3uh
+zekJxOdPSxNvOHc72c/dV8nY/EGLzd8RAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3N0
+b3JlLmx1Lmx2MB0GA1UdDgQWBBSEEH1irCcK77NEFvdXDphAFRNGJzANBgkqhkiG
+9w0BAQUFAAOCAQEAnHXx7qR4cdStfhLr6YjEqF3w2BWAitOOGKFvewsbdkTNBKL9
+Kf9DyOnnZ35uC99GxqsOQBeoOD5zawYzXPkEMb5mGDaM73RBxZdzrin9NTEy+Dwp
+x1tOkp3N4I6CanD0q+pZ2z8RTOcVtfNKQR0yHJeHM7bA41cuBZ7dNYcAiPYcrZ9R
+E6m2FLWKCd74yEkCWZjPLL6XwGFivfUfpC65O8SIWi606B0fPBPFjldkY2qe/X89
+TBhpZrPMJoN9kYql+W/DkEYWP1Nwgu6Cy4R+MLdgSSsssAKnUAPXVXDQR5vHEPNC
+ibEIPrm7mKfc0uCo6x2gKWDvjQPf/Qr/ZYNoqQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIC6DCCAdCgAwIBAgIJANOTPRn8Yj6/MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC3N0b3JlLmx1Lmx2MB4XDTEzMDMwODEwMzcyNVoXDTI4MDMwNDEwMzcyNVow
+FjEUMBIGA1UEAxMLc3RvcmUubHUubHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCxCVKw78p1ayPtIH4fKtDzmG8bxfJRy2vpZPRn6JLOMWq6eNVvHtwl
+wen+fLTgig1i56GWHPQCF5PGwWoq6xj5S/uRoinAtiIk9Zz5sUz9HtBK5AXkdpLI
+fulUNJZ1uVIe0xIVBl3pGw3ckq1v5WFpDWk2vj5gebQq2090qbgK1TTiMXh/wKZe
+2aHiPT1WCklnTvdoEOgipSl+nClBtbLrTAZh7FZAbGYbxhZI3288pwUfNR91nWu6
+yJ9qdERB8WlN+sgpGsZDKgV/Z/DW+GW1TEIgoIu757jAY/rxB3nhhoqdiFRlj3uh
+zekJxOdPSxNvOHc72c/dV8nY/EGLzd8RAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3N0
+b3JlLmx1Lmx2MB0GA1UdDgQWBBSEEH1irCcK77NEFvdXDphAFRNGJzANBgkqhkiG
+9w0BAQUFAAOCAQEAnHXx7qR4cdStfhLr6YjEqF3w2BWAitOOGKFvewsbdkTNBKL9
+Kf9DyOnnZ35uC99GxqsOQBeoOD5zawYzXPkEMb5mGDaM73RBxZdzrin9NTEy+Dwp
+x1tOkp3N4I6CanD0q+pZ2z8RTOcVtfNKQR0yHJeHM7bA41cuBZ7dNYcAiPYcrZ9R
+E6m2FLWKCd74yEkCWZjPLL6XwGFivfUfpC65O8SIWi606B0fPBPFjldkY2qe/X89
+TBhpZrPMJoN9kYql+W/DkEYWP1Nwgu6Cy4R+MLdgSSsssAKnUAPXVXDQR5vHEPNC
+ibEIPrm7mKfc0uCo6x2gKWDvjQPf/Qr/ZYNoqQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://store.lu.lv/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://store.lu.lv/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://store.lu.lv/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://store.lu.lv/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://store.lu.lv/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LAIFE - LU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Latvia - LU SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lu.lv/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="lv">http://www.lu.lv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martins</md:GivenName>
+    <md:SurName>Purins</md:SurName>
+    <md:EmailAddress>mpurins@lu.lv</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
new file mode 100644
index 00000000..88782f38
--- /dev/null
+++ b/swamid-interfederations-2.0/strong.renater.fr-idp-shibboleth.xml
@@ -0,0 +1,58 @@
+<?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>
+      <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: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>
+					      MIIDMDCCAhigAwIBAgIVAKDRx8im6zJdLQ5NHz5dmbcaOBjOMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMMEXN0cm9uZy5yZW5hdGVyLmZyMB4XDTE0MTAwNjA3NDIx
+OFoXDTM0MTAwNjA3NDIxOFowHDEaMBgGA1UEAwwRc3Ryb25nLnJlbmF0ZXIuZnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcmKoiaTCP4jY9v53P+M5I
+vUAbcaFievc311/2CTLBAucCceVTZ9VwVoucZiQ9ZOebD2DtrxLqNJb/RMh5pyXj
+Qzr86Hwv5Yk3+BVpru02HiOzzGbBqWVjwgZ1HFTSfnqwAYP4zZsu7nx8X/SK+ZJV
+SjxiSpe/Y6Rm+t7gWBfZXYSWvKGu01fbywcVqaeGrGz/UQdi0jvhGwNbK7AUCb+J
+/zSw+tkxxAoDdf/8/uk1LScWt2Uim3HqL9a9E9jrrz6b0s2+6ws8asCL1TD3uAXQ
+IPZAmm3F+TZeJv89+VnI1UM7WsdQaCpZBZXLDXuVDnFFZ/j0Ol+rSTdnYVaws+ev
+AgMBAAGjaTBnMB0GA1UdDgQWBBR7MXxBw9coUGjDO8AWpl+AODh4EDBGBgNVHREE
+PzA9ghFzdHJvbmcucmVuYXRlci5mcoYoaHR0cHM6Ly9zdHJvbmcucmVuYXRlci5m
+ci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAVdeiyyjO1mbphNLM
+pc9tRSsPVeKkxBv7GFN4FaOivBJn5jTLKgCR3AEulI6ySreL9sgrMsN6LggFsFpW
+kjf4iyilbXeH0EQD05teoVCuaZf0JmT+bfbLGLZuHJckOJQW9WqIh8mog8g58chu
+gk019fVk/DFoPIZXyJZDD8FWLuZk9im8KlCBXNbGAwjwz5tfNkWlMAbaVUqdEvr1
+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>
diff --git a/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml
index 6261ab0f..578b7937 100644
--- a/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://sts.ait.dtu.dk/adfs/services/trust">
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.ait.dtu.dk/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEezCCA2OgAwIBAgIQbFP2zBUPa2qKmnvEij297DANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMTAyMzAwMDAwMFoXDTE2MTAyMjIzNTk1OVowRTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSAwHgYDVQQDExd0b2tlbnNpZ25pbmcuYWl0LmR0dS5kazCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqAUfbI6hct5ZYP3tNyUHAo+D+U0cVqZqCTJDfQWpO6+tSCRgmHY9Teu1pOR8Ddw/OdVI7R3lmTmWOWUuJHr4DDrAEQyvhmDklCDB78tbzBbbF514C5gyoagh1xAXn5bv9IPg4ByBCyi3Gbuwy4fBvpneVnpInaleRwNhWuxsPZWbpnHyaYBhjzTyA6U33cWXMdxZKXtPPgqPZvCfcsWagnzU90LgdCsumrulkTI0AZnLPzmYBH0ZpYUKVkIvbba53N5s96VJ7zbCCWrsnRQ42seGi1TQRpbPVd6jlegUvQJ2J/M4dtpMBjr3siWT/b9AN7IpnN5hcp9ZYl+ju/B38CAwEAAaOCAXQwggFwMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQjNdOyedlmcPWRhMy3I9+igVdZWDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIXdG9rZW5zaWduaW5nLmFpdC5kdHUuZGswDQYJKoZIhvcNAQEFBQADggEBAH3nPUupxXENBOof3REi6WHldSXIc59DkUw1Rng81XYh39A7SaHkGxGz1WYVKIzYNlzmhsDSl3JfluaWwpdNcpMh3VklKa453zM7He8u3jpSC+5sez0LSmWV/TRY0q3rASSNRMcDetGwm5/tgKCzX28cNvrqm2xAjrnNS2/BQlrSi4txHlxBxL39r6zkZ10h7ED6NO9F+ShCIcCZZMIwYeXOQqDY6pR4qJ7SI09O74RkSHF+Pdd7lNyRzZiFoM77yI0Aot0XxQqMKD7otqiNuKObpJ4OrC90pzrEOufKPmEe9tkHExlcpALfCv2UaFCsVZc0YHymIFgcXKvYX4Y3gTY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEezCCA2OgAwIBAgIQbFP2zBUPa2qKmnvEij297DANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMTAyMzAwMDAwMFoXDTE2MTAyMjIzNTk1OVowRTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSAwHgYDVQQDExd0b2tlbnNpZ25pbmcuYWl0LmR0dS5kazCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqAUfbI6hct5ZYP3tNyUHAo+D+U0cVqZqCTJDfQWpO6+tSCRgmHY9Teu1pOR8Ddw/OdVI7R3lmTmWOWUuJHr4DDrAEQyvhmDklCDB78tbzBbbF514C5gyoagh1xAXn5bv9IPg4ByBCyi3Gbuwy4fBvpneVnpInaleRwNhWuxsPZWbpnHyaYBhjzTyA6U33cWXMdxZKXtPPgqPZvCfcsWagnzU90LgdCsumrulkTI0AZnLPzmYBH0ZpYUKVkIvbba53N5s96VJ7zbCCWrsnRQ42seGi1TQRpbPVd6jlegUvQJ2J/M4dtpMBjr3siWT/b9AN7IpnN5hcp9ZYl+ju/B38CAwEAAaOCAXQwggFwMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQjNdOyedlmcPWRhMy3I9+igVdZWDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIXdG9rZW5zaWduaW5nLmFpdC5kdHUuZGswDQYJKoZIhvcNAQEFBQADggEBAH3nPUupxXENBOof3REi6WHldSXIc59DkUw1Rng81XYh39A7SaHkGxGz1WYVKIzYNlzmhsDSl3JfluaWwpdNcpMh3VklKa453zM7He8u3jpSC+5sez0LSmWV/TRY0q3rASSNRMcDetGwm5/tgKCzX28cNvrqm2xAjrnNS2/BQlrSi4txHlxBxL39r6zkZ10h7ED6NO9F+ShCIcCZZMIwYeXOQqDY6pR4qJ7SI09O74RkSHF+Pdd7lNyRzZiFoM77yI0Aot0XxQqMKD7otqiNuKObpJ4OrC90pzrEOufKPmEe9tkHExlcpALfCv2UaFCsVZc0YHymIFgcXKvYX4Y3gTY=</ds:X509Certificate>
         </ds:X509Data>
@@ -25,12 +30,12 @@
       <md:ServiceName xml:lang="da">Share DTU</md:ServiceName>
       <md:ServiceDescription xml:lang="en">to provide employees from WAYF-connected organisations personalised access to collaboration sites enabled by DTU employees</md:ServiceDescription>
       <md:ServiceDescription xml:lang="da">at give ansatte fra WAYF-tilsluttede institutioner personlig adgang til samarbejdssites oprettet af DTU-ansatte</md:ServiceDescription>
-      <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.10" 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:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="sn"/>
+      <md:RequestedAttribute Name="organizationName"/>
+      <md:RequestedAttribute Name="gn"/>
+      <md:RequestedAttribute Name="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="mail"/>
+      <md:RequestedAttribute Name="cn"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/sts.learnium.net-entity.xml b/swamid-interfederations-2.0/sts.learnium.net-entity.xml
new file mode 100644
index 00000000..db097e6f
--- /dev/null
+++ b/swamid-interfederations-2.0/sts.learnium.net-entity.xml
@@ -0,0 +1,97 @@
+<?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>
+						MIIE+jCCA+KgAwIBAgIJAO4YoaUX4maKMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
+						VQQGEwJHQjEOMAwGA1UECBMFR3dlbnQxEDAOBgNVBAcTB05ld3BvcnQxIDAeBgNV
+						BAoTF1RoZSBBbGFjcml0eSBGb3VuZGF0aW9uMREwDwYDVQQLEwhMZWFybml1bTEZ
+						MBcGA1UEAxMQc3RzLmxlYXJuaXVtLm5ldDEtMCsGCSqGSIb3DQEJARYedGh1Z2hl
+						c0BhbGFjcml0eWZvdW5kYXRpb24uY29tMB4XDTEzMDgyODExNTQyOFoXDTIzMDgy
+						ODExNTQyOFowga4xCzAJBgNVBAYTAkdCMQ4wDAYDVQQIEwVHd2VudDEQMA4GA1UE
+						BxMHTmV3cG9ydDEgMB4GA1UEChMXVGhlIEFsYWNyaXR5IEZvdW5kYXRpb24xETAP
+						BgNVBAsTCExlYXJuaXVtMRkwFwYDVQQDExBzdHMubGVhcm5pdW0ubmV0MS0wKwYJ
+						KoZIhvcNAQkBFh50aHVnaGVzQGFsYWNyaXR5Zm91bmRhdGlvbi5jb20wggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmsrdUSgNYSnRE0ddtJg2bdkb+bFVy
+						swu2z7H91PCUpp3eSQ87eVRKhjMnWnsDwhjWptrAd5k7FiOJXhYjkAVtEYgzUAF8
+						wiNNR2JKTP89x0JjwY3i9wBh3UqymZs23eqC5PSotG9hwXZLob6juabI07F0cIH+
+						F1RA8pZ5fcp02mdKogWlMFOKbIWXR1whOgYtAh4S8TnvNNPBg0Iqe8JO9wOHnnL/
+						SOPjSeJaaEnEt2yv4CVu3Zi1ve1gyZ2ZAKdLb4wZA2ujtxr2EGuvi+S2zIQNx491
+						BevoFakzEmrpaCb5i68k25Uw7aQywrgxq+EqGbCrbgxXvQKQKfu0EushAgMBAAGj
+						ggEXMIIBEzAdBgNVHQ4EFgQUSy9nXlJjwq8KvJJ0yRPJL+zaPfkwgeMGA1UdIwSB
+						2zCB2IAUSy9nXlJjwq8KvJJ0yRPJL+zaPfmhgbSkgbEwga4xCzAJBgNVBAYTAkdC
+						MQ4wDAYDVQQIEwVHd2VudDEQMA4GA1UEBxMHTmV3cG9ydDEgMB4GA1UEChMXVGhl
+						IEFsYWNyaXR5IEZvdW5kYXRpb24xETAPBgNVBAsTCExlYXJuaXVtMRkwFwYDVQQD
+						ExBzdHMubGVhcm5pdW0ubmV0MS0wKwYJKoZIhvcNAQkBFh50aHVnaGVzQGFsYWNy
+						aXR5Zm91bmRhdGlvbi5jb22CCQDuGKGlF+JmijAMBgNVHRMEBTADAQH/MA0GCSqG
+						SIb3DQEBBQUAA4IBAQCN+mOdxNb0Old9C8EXDZl47iMT/eLVGHRwTD1lKEOG7RxZ
+						C9/M2IWlWfAaczahV6o5J+AgkHMcRpr7Ba3AtKQGAa1CAjci6cUVqWDJuLVZoJwa
+						ZQK8Hio+p0uCqmWaxnfyJDCCPiSweI3JfFf16zKE7JpdwMN3FCwL3C9jZ9ox5AUB
+						ys8Sl9SIeCu/0BWv9719L8rOvWLf7A4A14xyqLJnN/DQ7HAGjZmy/mdT0BJsy3IH
+						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>
+						MIIE+jCCA+KgAwIBAgIJAO4YoaUX4maKMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
+						VQQGEwJHQjEOMAwGA1UECBMFR3dlbnQxEDAOBgNVBAcTB05ld3BvcnQxIDAeBgNV
+						BAoTF1RoZSBBbGFjcml0eSBGb3VuZGF0aW9uMREwDwYDVQQLEwhMZWFybml1bTEZ
+						MBcGA1UEAxMQc3RzLmxlYXJuaXVtLm5ldDEtMCsGCSqGSIb3DQEJARYedGh1Z2hl
+						c0BhbGFjcml0eWZvdW5kYXRpb24uY29tMB4XDTEzMDgyODExNTQyOFoXDTIzMDgy
+						ODExNTQyOFowga4xCzAJBgNVBAYTAkdCMQ4wDAYDVQQIEwVHd2VudDEQMA4GA1UE
+						BxMHTmV3cG9ydDEgMB4GA1UEChMXVGhlIEFsYWNyaXR5IEZvdW5kYXRpb24xETAP
+						BgNVBAsTCExlYXJuaXVtMRkwFwYDVQQDExBzdHMubGVhcm5pdW0ubmV0MS0wKwYJ
+						KoZIhvcNAQkBFh50aHVnaGVzQGFsYWNyaXR5Zm91bmRhdGlvbi5jb20wggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmsrdUSgNYSnRE0ddtJg2bdkb+bFVy
+						swu2z7H91PCUpp3eSQ87eVRKhjMnWnsDwhjWptrAd5k7FiOJXhYjkAVtEYgzUAF8
+						wiNNR2JKTP89x0JjwY3i9wBh3UqymZs23eqC5PSotG9hwXZLob6juabI07F0cIH+
+						F1RA8pZ5fcp02mdKogWlMFOKbIWXR1whOgYtAh4S8TnvNNPBg0Iqe8JO9wOHnnL/
+						SOPjSeJaaEnEt2yv4CVu3Zi1ve1gyZ2ZAKdLb4wZA2ujtxr2EGuvi+S2zIQNx491
+						BevoFakzEmrpaCb5i68k25Uw7aQywrgxq+EqGbCrbgxXvQKQKfu0EushAgMBAAGj
+						ggEXMIIBEzAdBgNVHQ4EFgQUSy9nXlJjwq8KvJJ0yRPJL+zaPfkwgeMGA1UdIwSB
+						2zCB2IAUSy9nXlJjwq8KvJJ0yRPJL+zaPfmhgbSkgbEwga4xCzAJBgNVBAYTAkdC
+						MQ4wDAYDVQQIEwVHd2VudDEQMA4GA1UEBxMHTmV3cG9ydDEgMB4GA1UEChMXVGhl
+						IEFsYWNyaXR5IEZvdW5kYXRpb24xETAPBgNVBAsTCExlYXJuaXVtMRkwFwYDVQQD
+						ExBzdHMubGVhcm5pdW0ubmV0MS0wKwYJKoZIhvcNAQkBFh50aHVnaGVzQGFsYWNy
+						aXR5Zm91bmRhdGlvbi5jb22CCQDuGKGlF+JmijAMBgNVHRMEBTADAQH/MA0GCSqG
+						SIb3DQEBBQUAA4IBAQCN+mOdxNb0Old9C8EXDZl47iMT/eLVGHRwTD1lKEOG7RxZ
+						C9/M2IWlWfAaczahV6o5J+AgkHMcRpr7Ba3AtKQGAa1CAjci6cUVqWDJuLVZoJwa
+						ZQK8Hio+p0uCqmWaxnfyJDCCPiSweI3JfFf16zKE7JpdwMN3FCwL3C9jZ9ox5AUB
+						ys8Sl9SIeCu/0BWv9719L8rOvWLf7A4A14xyqLJnN/DQ7HAGjZmy/mdT0BJsy3IH
+						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>
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
new file mode 100644
index 00000000..7c474af7
--- /dev/null
+++ b/swamid-interfederations-2.0/stsr4l.who.int-adfs-services-trust.xml
@@ -0,0 +1,126 @@
+<?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>
+      <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>
+						MIIGiDCCBXCgAwIBAgIKYVPlegAAAAAABTANBgkqhkiG9w0BAQUFADBcMRMwEQYK
+						CZImiZPyLGQBGRYDaW50MRMwEQYKCZImiZPyLGQBGRYDd2hvMRMwEQYKCZImiZPy
+						LGQBGRYDcjRsMRswGQYDVQQDExJyNGwtR1ZBMVNXRkFVTlMtQ0EwHhcNMTIwNTA2
+						MjIxMTEyWhcNMjIwNTA0MjIxMTEyWjCBjTELMAkGA1UEBhMCQ0gxFDASBgNVBAgT
+						C1N3aXR6ZXJsYW5kMQ8wDQYDVQQHEwZHZW5ldmExDDAKBgNVBAoTA1dITzEYMBYG
+						A1UECxMPUmVzZWFyY2ggNCBMaWZlMS8wLQYDVQQDEyZSZXNlYXJjaCA0IExpZmUg
+						RGVjcnlwdGlvbiBDZXJ0aWZpY2F0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAMVK/t8wzynyfSItN1BY/nejUBJDatb5lL58XROO7+yIL5pTZYaFLg/K
+						0b55EoIwYm950046lofctR5Xbp1qb9HqQptOOkChg38/qMuXnsQrm6eBfWohiktF
+						sNteuhQ+7YUaCrrLqwUodswhwFMyPD0rDN9DWIKy/Y6A3FsduiJIbNT0zpz9RGYj
+						Toa7HrSc9gKMzKdW+cMRfQeOJ0W51p1r18MXkaAMLmkbCrf1w9Ouka5yhLLkpNNF
+						8wBOem8AKxq8s1SuWkaJfVDucFkQWkJ57mmTKf7rjTy4xI2I6kQdydjPMsMhani1
+						6vd0VMwxwh8E2SFzP0vV37TqWYECuikCAwEAAaOCAxgwggMUMDsGCSsGAQQBgjcV
+						BwQuMCwGJCsGAQQBgjcVCIGo8Tu0k2aChZcAh7OWLYfmxTo86N1AgpfCQwIBZAIB
+						BDATBgNVHSUEDDAKBggrBgEFBQcDATAOBgNVHQ8BAf8EBAMCBaAwGwYJKwYBBAGC
+						NxUKBA4wDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUaybI92Naf+oLfYqLzrtFr5sR
+						4mEwHwYDVR0jBBgwFoAUhYqhzuILkqlHFYR7i0HAQQqs1yMwggEeBgNVHR8EggEV
+						MIIBETCCAQ2gggEJoIIBBYaBwGxkYXA6Ly8vQ049cjRsLUdWQTFTV0ZBVU5TLUNB
+						LENOPUdWQTFTV0ZBVU5TLENOPUNEUCxDTj1QdWJsaWMlMjBLZXklMjBTZXJ2aWNl
+						cyxDTj1TZXJ2aWNlcyxDTj1Db25maWd1cmF0aW9uLERDPXI0bCxEQz13aG8sREM9
+						aW50P2NlcnRpZmljYXRlUmV2b2NhdGlvbkxpc3Q/YmFzZT9vYmplY3RDbGFzcz1j
+						UkxEaXN0cmlidXRpb25Qb2ludIZAaHR0cDovL2d2YTFzd2ZhdW5zLnI0bC53aG8u
+						aW50L0NlcnRFbnJvbGwvcjRsLUdWQTFTV0ZBVU5TLUNBLmNybDCCAS8GCCsGAQUF
+						BwEBBIIBITCCAR0wgbQGCCsGAQUFBzAChoGnbGRhcDovLy9DTj1yNGwtR1ZBMVNX
+						RkFVTlMtQ0EsQ049QUlBLENOPVB1YmxpYyUyMEtleSUyMFNlcnZpY2VzLENOPVNl
+						cnZpY2VzLENOPUNvbmZpZ3VyYXRpb24sREM9cjRsLERDPXdobyxEQz1pbnQ/Y0FD
+						ZXJ0aWZpY2F0ZT9iYXNlP29iamVjdENsYXNzPWNlcnRpZmljYXRpb25BdXRob3Jp
+						dHkwZAYIKwYBBQUHMAKGWGh0dHA6Ly9ndmExc3dmYXVucy5yNGwud2hvLmludC9D
+						ZXJ0RW5yb2xsL0dWQTFTV0ZBVU5TLnI0bC53aG8uaW50X3I0bC1HVkExU1dGQVVO
+						Uy1DQS5jcnQwDQYJKoZIhvcNAQEFBQADggEBAJzeblEGJ/yQdbYzsDi1ibqTFRGy
+						Je7Zm1HBD+LHutlpNpx6QYbq08YyJbIwkd38TRLpgrc3gNM9pqRSMToklzHF+1VX
+						UhTeoMrBt5dQpVe158Frqf6IGn4RT5kItcQk3fXCZ/gtwvg8EQQ8WZDYDOpCTYsK
+						oJa867mo3NiwHHgWAkOku7zBJrE4y6WLm6v7Gbc8/qbKlkDOLM0JpN8M7RbwqFLB
+						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>
+						MIIGcjCCBVqgAwIBAgIKYSsQ1wAAAAAABDANBgkqhkiG9w0BAQUFADBcMRMwEQYK
+						CZImiZPyLGQBGRYDaW50MRMwEQYKCZImiZPyLGQBGRYDd2hvMRMwEQYKCZImiZPy
+						LGQBGRYDcjRsMRswGQYDVQQDExJyNGwtR1ZBMVNXRkFVTlMtQ0EwHhcNMTIwNTA2
+						MjEyNjM2WhcNMjIwNTA0MjEyNjM2WjB4MQswCQYDVQQGEwJDSDEPMA0GA1UECBMG
+						R2VuZXZhMQ8wDQYDVQQHEwZHZW5ldmExCzAJBgNVBAoTAlVOMQwwCgYDVQQLEwNX
+						SE8xLDAqBgNVBAMTI1Jlc2VhcmNoIDQgTGlmZSBTaWduaW5nIENlcnRpZmljYXRl
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjRqeMgwiOIvM7dWyWUmH
+						NRuYiBy2/PzOIEIFiTg8iNAYMTbvf9ynnoEDYxEUh9Xbmox7B5DGOtMi/Kx5HQ50
+						w7hdBdf2xCSMJXCK4MeZpvJnReH+vOriOJ6URuxBk8HTo01eIh1LgEeP1avKzhws
+						LYILbazCyxqW13MuGAMVSm5X1C2r29jR4nAd3kx48cssmHuQVnAlLqJIDyGigtia
+						edsnOqkSx0l2MBS3QBZo11L1jD7NFCi3/EQaL0UvFNwrYN+YMVb++xHVnG1Uk3uH
+						8UL1hgdz1Lz9kXVJCfqThTY1G/g4+giAFAw5pt5CVogozZHvSGqiNnguM+edAwdM
+						rwIDAQABo4IDGDCCAxQwOwYJKwYBBAGCNxUHBC4wLAYkKwYBBAGCNxUIgajxO7ST
+						ZoKFlwCHs5Yth+bFOjzo3UCCl8JDAgFkAgEEMBMGA1UdJQQMMAoGCCsGAQUFBwMB
+						MA4GA1UdDwEB/wQEAwIFoDAbBgkrBgEEAYI3FQoEDjAMMAoGCCsGAQUFBwMBMB0G
+						A1UdDgQWBBQKLtC/thXz3Vw0OcrEki+CvZIRYjAfBgNVHSMEGDAWgBSFiqHO4guS
+						qUcVhHuLQcBBCqzXIzCCAR4GA1UdHwSCARUwggERMIIBDaCCAQmgggEFhoHAbGRh
+						cDovLy9DTj1yNGwtR1ZBMVNXRkFVTlMtQ0EsQ049R1ZBMVNXRkFVTlMsQ049Q0RQ
+						LENOPVB1YmxpYyUyMEtleSUyMFNlcnZpY2VzLENOPVNlcnZpY2VzLENOPUNvbmZp
+						Z3VyYXRpb24sREM9cjRsLERDPXdobyxEQz1pbnQ/Y2VydGlmaWNhdGVSZXZvY2F0
+						aW9uTGlzdD9iYXNlP29iamVjdENsYXNzPWNSTERpc3RyaWJ1dGlvblBvaW50hkBo
+						dHRwOi8vZ3ZhMXN3ZmF1bnMucjRsLndoby5pbnQvQ2VydEVucm9sbC9yNGwtR1ZB
+						MVNXRkFVTlMtQ0EuY3JsMIIBLwYIKwYBBQUHAQEEggEhMIIBHTCBtAYIKwYBBQUH
+						MAKGgadsZGFwOi8vL0NOPXI0bC1HVkExU1dGQVVOUy1DQSxDTj1BSUEsQ049UHVi
+						bGljJTIwS2V5JTIwU2VydmljZXMsQ049U2VydmljZXMsQ049Q29uZmlndXJhdGlv
+						bixEQz1yNGwsREM9d2hvLERDPWludD9jQUNlcnRpZmljYXRlP2Jhc2U/b2JqZWN0
+						Q2xhc3M9Y2VydGlmaWNhdGlvbkF1dGhvcml0eTBkBggrBgEFBQcwAoZYaHR0cDov
+						L2d2YTFzd2ZhdW5zLnI0bC53aG8uaW50L0NlcnRFbnJvbGwvR1ZBMVNXRkFVTlMu
+						cjRsLndoby5pbnRfcjRsLUdWQTFTV0ZBVU5TLUNBLmNydDANBgkqhkiG9w0BAQUF
+						AAOCAQEArCQyLaK4yA7KCruY/0oYlIkk06X3y/sp4nZhrxyRQ7BQG6vKStUUqUKy
+						ZQCYT9WW/aUaDscwH74zoHMvk8unfNLNQZETf90881Uu9nqVX+CFxIGOPrKGBtCM
+						jYlkryG7XVFFknPPlDPU5SZ7IwaTb0lIYpQ0vuVwyLPds/6u3hGeza5SJ2SAkock
+						iIWGuT4LQLhLTYeYX2qGpHWT7jdOTiAVsrXHaOlZcWux72kCtDfpW7u2mIpeyMU0
+						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>
diff --git a/swamid-interfederations-2.0/studentstore.phoenixs.co.uk-shibboleth.xml b/swamid-interfederations-2.0/studentstore.phoenixs.co.uk-shibboleth.xml
new file mode 100644
index 00000000..5b3527ac
--- /dev/null
+++ b/swamid-interfederations-2.0/studentstore.phoenixs.co.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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>
+						MIIDSDCCAjCgAwIBAgIJAMKtTUHoN0LYMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG3N0dWRlbnRzdG9yZS5waG9lbml4cy5jby51azAeFw0xMjA4MDkxNTMxMTBa
+						Fw0yMjA4MDcxNTMxMTBaMCYxJDAiBgNVBAMTG3N0dWRlbnRzdG9yZS5waG9lbml4
+						cy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMiA8DdoMw8u
+						n7QMtSDz2zi+fHPDrKb3/a2NtSCQh2TXIpN4uARHv3hpsHcbUmEDr2gIK0KTE1nW
+						VD4ZrNqCiWBvWc9cf8sgUoYntcL9nXqwEfvoCtdw5jY6IzLj92hiH/TrkSFXL1Y7
+						fW53pwaNjTo1Rck8c5Um1eKH+hNWwB1/jKVAlTsyr56c3t39FBNahlAxB3OoL4+6
+						lPax1SXvugowfh7F7yWxCSIaKzAGXw75ml8jE0bo52jz+Zxk4Mmz8xDYjQ3+Itm1
+						PZ94WymMTiRpKM0HLqH3s6ExKKHm08ahAwvDEz7hxSXna6iozFaQGxFNXD8J0lXM
+						VJfYjJMmgscCAwEAAaN5MHcwVgYDVR0RBE8wTYIbc3R1ZGVudHN0b3JlLnBob2Vu
+						aXhzLmNvLnVrhi5odHRwczovL3N0dWRlbnRzdG9yZS5waG9lbml4cy5jby51ay9z
+						aGliYm9sZXRoMB0GA1UdDgQWBBSYHv7Z/DKteKW3DlKVYW5oR/QawzANBgkqhkiG
+						9w0BAQUFAAOCAQEAvkuWNy9+6h2kW77zyBfAOiNAkfhUQJhLbKnT8pLf+WWUH8os
+						K/U6TL8py/ReOLMIeIPMSLzDD4ZcXt029E1zoIo0XddRfpY/ts/zYvCSKvyV7Djm
+						6+dTy9zWotpj6u8EG7/NwyqQ9T3p59HXaJCJnqFOgqfdyuxbQqpJKNkMTBnU9Lsn
+						5/yTTiGVjO+kQJ4DqMBDIIXuxfOOLpnYEJpjRUkrGWqOiLvPUuOp6N+p7YOaof8+
+						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>Jose</md:GivenName>
+    <md:SurName>Diaz</md:SurName>
+    <md:EmailAddress>mailto:Jose-diaz@phoenixs.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jose</md:GivenName>
+    <md:SurName>Diaz</md:SurName>
+    <md:EmailAddress>mailto:Jose-diaz@phoenixs.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de-shibboleth.xml b/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de-shibboleth.xml
new file mode 100644
index 00000000..0c0bc62f
--- /dev/null
+++ b/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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://studienportal.vetmed.uni-muenchen.de/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-04-30T13:50: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://aai.dfn.de/category/vetmed-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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Studienportal tierärztliche Fakultät LMU</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Studienportal tierärztliche Fakultät LMU</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Studienportal tierärztliche Fakultät LMU</mdui:Description>
+        <mdui:Description xml:lang="en">Studienportal tierärztliche Fakultät LMU</mdui:Description>
+        <mdui:InformationURL xml:lang="de">https://studienportal.vetmed.uni-muenchen.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://studienportal.vetmed.uni-muenchen.de</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>studienportal.vetmed.uni-muenchen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=studienportal.vetmed.uni-muenchen.de,OU=Tieraerztliche Fakultaet,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFrDCCBJSgAwIBAgIEEOYptTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNVBAoT
+KEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzANBgNV
+BAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMDEwMjYx
+MDIzMzNaFw0xNTEwMjUxMDIzMzNaMIG2MQswCQYDVQQGEwJERTEPMA0GA1UECBMG
+QmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1heGlt
+aWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEhMB8GA1UECxMYVGllcmFlcnp0
+bGljaGUgRmFrdWx0YWV0MS0wKwYDVQQDEyRzdHVkaWVucG9ydGFsLnZldG1lZC51
+bmktbXVlbmNoZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCf
+aVM4c+oiLWXWdu/PVBS7JHqdNKqk//w0wQoH4o/g6gRK5LiSOy3Dqloz5UpFYjNW
+D7lQEzcg1Ar/0/NsQ3HEU75k7uUaOmZi+kNse8seagyCjlfWnU5DAsPDFG7SiotU
+0AX6dPL+GkzyWKpdG7/HrGze43pFbYkB67KaAuwLHPGZwBzeyIDyL9RPjdRXflhI
+o/sxJh5tv/9tLpxNupacnk7mfz1xDlfvSLyWEjr6pL/JtLR7Z3BQ5/PISFncWO+Q
+ZfrY7TGZ/E9uS2pnfteOY22Y6rR1FiVgcIowzScVTOwyshvopoVI1/u3d+ChMhBI
+ezjRfr1udeSajAk/RqVTAgMBAAGjggHkMIIB4DAJBgNVHRMEAjAAMAsGA1UdDwQE
+AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFGIL
+BlMn4wIAUnAiU7s+tIBt1iu0MB8GA1UdIwQYMBaAFHmHeGov+pu8I0+UpqN3HR4O
+lIAPMDIGA1UdEQQrMCmBJ2FkbWluaXN0cmF0b3JAaXQudmV0bWVkLnVuaS1tdWVu
+Y2hlbi5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZu
+LmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDA+oDygOoY4aHR0
+cDovL2NkcDIucGNhLmRmbi5kZS91bmktbXVlbmNoZW4tY2EvcHViL2NybC9jYWNy
+bC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLW11ZW5j
+aGVuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
+XoE3xNYk2QmdKevsY4W/szKTswy74uqQ3utXm5Hf5+/9+Cgd7BStYRZVHI24veXq
+a0YOorNUumnTkZFUB4B5OZpaDw9t80WSaefC3o1zc0PXH9+caRhoqmnBSG1JdF6L
+kY0pqAOralMzMChLKOrRb2cnjxHWa/Ug9C7XaXmEJhjP+7GCjZSLMS/du1E1wyKc
+3fN+WdEbKF4OiY1lK+MBlgDyGdXqkrAFX8JbGo1uWyGgDKu2gT7QhMeNXDPzpWn8
+YwnP4oYTHPCDNHFJR6XyRTogzebI5RgoL2eLI8SOf0LXXBTE2KvM2cOWFSmKlgFd
+NL76LsPu9j46CldHJOaVdg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Studienportal tierärztliche Fakultät LMU</md:ServiceName>
+      <md:ServiceName xml:lang="en">Studienportal tierärztliche Fakultät LMU</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Studienportal tierärztliche Fakultät LMU</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Studienportal tierärztliche Fakultät LMU</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="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="dfnEduPersonStudyBranch3" Name="urn:oid:1.3.6.1.4.1.22177.400.1.1.3.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">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>Cyrill</md:GivenName>
+    <md:SurName>Matenaers</md:SurName>
+    <md:EmailAddress>mailto:studienportal@it.vetmed.uni-muenchen.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Studienportal</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:studienportal@it.vetmed.uni-muenchen.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/study.conted.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/study.conted.ox.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..ce72d172
--- /dev/null
+++ b/swamid-interfederations-2.0/study.conted.ox.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://study.conted.ox.ac.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-04T13:59: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>
+						MIIEmjCCA4KgAwIBAgIJAOLozXNL6LsnMA0GCSqGSIb3DQEBBQUAMIHNMQswCQYD
+						VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
+						MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
+						bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMR4wHAYDVQQDDBVzdHVkeS5jb250
+						ZWQub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5bG9yQGNvbnRlZC5v
+						eC5hYy51azAeFw0xNDA1MjAxMDQ4MDhaFw0yNDA1MTcxMDQ4MDhaMIHNMQswCQYD
+						VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
+						MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
+						bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMR4wHAYDVQQDDBVzdHVkeS5jb250
+						ZWQub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5bG9yQGNvbnRlZC5v
+						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKQoniFVDKEq
+						6jlQx2bHK9cCCT2T4n8J4X3cHDgOnvngHl/n97SaRBrqkIW9wmDudfV/y7nGCptK
+						6towZz+rM0RDmCfIu7VH57WhEpfB4iUqGjYCY44vVy8gDJdRWgXf7pqa/9B0yHzy
+						ulyqOqlObv8YNz/fWgTnKQTCDiy6N4dVxWm1GElRv/grCQIzJ5tiWt9H11w8lyeZ
+						2kTFwbgJOGqAc6C9sJ7TXIycZef2oJaQ+Qf7oCD0BVyRy08yV5Xhhem6jWa+Zx7I
+						s00cN61Co34QAzXHdUdA21myUBd4R5i1kjNIroqV/a5+5Oj8NWOsFAtcAPLqrpvO
+						0+rzGQXFCCsCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
+						blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFINOZtymmwrCBaQ6
+						SBLdj5qEF+kPMB8GA1UdIwQYMBaAFINOZtymmwrCBaQ6SBLdj5qEF+kPMA0GCSqG
+						SIb3DQEBBQUAA4IBAQAhqfovymE3xaeIHPF/rqOT0odVHG20bKu4UdGI+xj5RlcZ
+						qhVwFiSgUU/fIK2wZ5vl3fCJEY1Jlq/okJfQhoDcGSWBlcXJ8Dy1LI7YzIPM9YYX
+						vyQTAKR/iimGYuWXLRAyKFBMliLVH51EeGP0bh+02fEW20jqrxkRfrrlZNNsRaZ+
+						gDRamuJk6cEQNIbH9vJ12gyng17kTfV9D5p+7mBBiBf4LAyZYBwpXFQcMR5MVlQX
+						E5fLZIdP/chQFDreH6byJlD+8ZHWy+sQqhUSFRNBcgEATwuq9aNcXkzm/0CKOVaD
+						4o+kyplCfQiX41wflBJr2mENvIue2wY387e4q0t2
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://study.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://study.conted.ox.ac.uk/Shibboleth.sso/SAML/POST" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Award bearing course delivery site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.conted.ox.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@conted.ox.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@conted.ox.ac.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
new file mode 100644
index 00000000..381ddbce
--- /dev/null
+++ b/swamid-interfederations-2.0/submissions.ref.ac.uk-shibboleth.xml
@@ -0,0 +1,65 @@
+<?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>
+      <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>
+						MIIC3zCCAcegAwIBAgIJAP8XeLlAC0V5MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+						BAMTCHJlZi13ZWIxMB4XDTEyMDYxMjA3MjYyNVoXDTIyMDYxMDA3MjYyNVowEzER
+						MA8GA1UEAxMIcmVmLXdlYjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDOgCaKzMbgtA6CxE1zNX2r4/bcIaPcfkPhFwRpoaE038g5C7HfSOWWXzkWVL8/
+						vV5eWKRd89XQ7fSUUwXAs4X3gZlSlzNxmPIEDPI9oRQDbKW2LNjW/En75IWJlrdL
+						u5QdSj/LMsqcRvBOAS729yCswFLstJLrqLbHALiqtKW5zeq2gWJ55p1XEZUXtb0C
+						gSjzI/Ni0mHvPouXqbuMQ2X2qrdZkzVcD8Uvoqk/jTtiPaFkpcIpqQsQ0f8qUJ2n
+						0fUPv89vxl0RqIWs8HC885NpCVTm28XwTFt10PlTY49GCXKOjP1ZilhtnQk0VhWX
+						tar6f3h4S5N9rN9lO4/z3JShAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHJlZi13ZWIx
+						MB0GA1UdDgQWBBQTvJTNEamzZ7uy0pGYmn33zELkAjANBgkqhkiG9w0BAQUFAAOC
+						AQEAQRXI7iLaQT7iAXn1KR5qtScyDTZSWwfvIPghihUNP+61aW+UOTG9r7R1H4R+
+						5Zig+v8HmiO8VB7wPubPhL8UkR1C+11vkhGXNauENN1uhEVWK5na+yA7KDE3t8Bf
+						Avy3unb1q8/mc1jKU2kVhbKBhFh68osJV9TZAoYdDRNfkdNFaTQqFl1j5zAkGdxL
+						5Ax4XXtFOPp6TuFLWL1QLxdfozypxkOfHDDFMknhhifVDnNhyNQhV4dtR1adKHmW
+						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>
diff --git a/swamid-interfederations-2.0/subscription.echalk.co.uk-shibboleth.xml b/swamid-interfederations-2.0/subscription.echalk.co.uk-shibboleth.xml
new file mode 100644
index 00000000..57b9b849
--- /dev/null
+++ b/swamid-interfederations-2.0/subscription.echalk.co.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis: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>
+						MIIDUjCCAjqgAwIBAgIJAIxk1ZoatOwHMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXN1YnNjcmlwdGlvbi5lY2hhbGsuY28udWswHhcNMDkwODE0MTAyNDMyWhcN
+						MTkwODEyMTAyNDMyWjAkMSIwIAYDVQQDExlzdWJzY3JpcHRpb24uZWNoYWxrLmNv
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA284/+4DBsyk67HOJ
+						ptE1JK2ntKVDgjUzGlqIdLGepXJEpWL6JEoMA0f2V+TI2GzhcXPUa3Refysqj9Yo
+						v+3Fo6jc8yMUz6PlMkRaOQH/0v5dTCCZIhaqDzBOI5XFCo/nTONY10oSDT59ypRZ
+						/fRWCLHPBRtWYQuKQeFadyFH6Ox4kjfANiykpzHYu+kzOStUsOF4hulZ4p5q4WoB
+						o/tnmCJuZO+wViVZw2P/KF1R4vFsEUiD7sFoFU/+zOyKoS4eC+cCcMBxXu9CsRaS
+						yk+5Ob1wSjDooOdd8pRBsAkuYMxzdv0d+uMznwhiybjlMj8Mk6OFswsHMo4B/moW
+						F2s7gQIDAQABo4GGMIGDMB0GA1UdDgQWBBQrvG0acEEnI7JXqoFYdrzLC171EzBU
+						BgNVHSMETTBLgBQrvG0acEEnI7JXqoFYdrzLC171E6EopCYwJDEiMCAGA1UEAxMZ
+						c3Vic2NyaXB0aW9uLmVjaGFsay5jby51a4IJAIxk1ZoatOwHMAwGA1UdEwQFMAMB
+						Af8wDQYJKoZIhvcNAQEFBQADggEBAHGSPPNL5RZ8hIzclnzlF0kgBZqIdY6pMvBk
+						+ftUmpI6NRkPsY1TI/k7SPYcAOcS+ujPUzrX7nnoosXRZ+z2WmA2Oyd+HTqnw83r
+						GdJflkPCAiKRkmBC7uJGdBP9AR+fTQeBZdbf7DbKQjmpkxjfhPaDM/3Oi69E/jli
+						+YM0f4JcfJWcxEPKRGDSpCkR/idaQZkVDc22T7lq7sOMlKVtS0bg02IjvSf9teJp
+						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>
+						MIIDUjCCAjqgAwIBAgIJAIxk1ZoatOwHMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXN1YnNjcmlwdGlvbi5lY2hhbGsuY28udWswHhcNMDkwODE0MTAyNDMyWhcN
+						MTkwODEyMTAyNDMyWjAkMSIwIAYDVQQDExlzdWJzY3JpcHRpb24uZWNoYWxrLmNv
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA284/+4DBsyk67HOJ
+						ptE1JK2ntKVDgjUzGlqIdLGepXJEpWL6JEoMA0f2V+TI2GzhcXPUa3Refysqj9Yo
+						v+3Fo6jc8yMUz6PlMkRaOQH/0v5dTCCZIhaqDzBOI5XFCo/nTONY10oSDT59ypRZ
+						/fRWCLHPBRtWYQuKQeFadyFH6Ox4kjfANiykpzHYu+kzOStUsOF4hulZ4p5q4WoB
+						o/tnmCJuZO+wViVZw2P/KF1R4vFsEUiD7sFoFU/+zOyKoS4eC+cCcMBxXu9CsRaS
+						yk+5Ob1wSjDooOdd8pRBsAkuYMxzdv0d+uMznwhiybjlMj8Mk6OFswsHMo4B/moW
+						F2s7gQIDAQABo4GGMIGDMB0GA1UdDgQWBBQrvG0acEEnI7JXqoFYdrzLC171EzBU
+						BgNVHSMETTBLgBQrvG0acEEnI7JXqoFYdrzLC171E6EopCYwJDEiMCAGA1UEAxMZ
+						c3Vic2NyaXB0aW9uLmVjaGFsay5jby51a4IJAIxk1ZoatOwHMAwGA1UdEwQFMAMB
+						Af8wDQYJKoZIhvcNAQEFBQADggEBAHGSPPNL5RZ8hIzclnzlF0kgBZqIdY6pMvBk
+						+ftUmpI6NRkPsY1TI/k7SPYcAOcS+ujPUzrX7nnoosXRZ+z2WmA2Oyd+HTqnw83r
+						GdJflkPCAiKRkmBC7uJGdBP9AR+fTQeBZdbf7DbKQjmpkxjfhPaDM/3Oi69E/jli
+						+YM0f4JcfJWcxEPKRGDSpCkR/idaQZkVDc22T7lq7sOMlKVtS0bg02IjvSf9teJp
+						yLoqT2I7utT6SVExQtH+R3jpEPqKRR2/ct8B9Yc+MaaWwU2CTYsvDydLgGgp7Ar/
+						j4zX/I526fHsI+R5AO9HpeyqGRBhxBBsymL4bb9BZ/Ew43NokdM=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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/sus-primo.hosted.exlibrisgroup.com-shibboleth.xml b/swamid-interfederations-2.0/sus-primo.hosted.exlibrisgroup.com-shibboleth.xml
new file mode 100644
index 00000000..a05bc306
--- /dev/null
+++ b/swamid-interfederations-2.0/sus-primo.hosted.exlibrisgroup.com-shibboleth.xml
@@ -0,0 +1,83 @@
+<?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>
+      <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>
+						MIIDNjCCAh6gAwIBAgIJANjfMJJw+7nwMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
+						BAMTJWRjMDNrZzAxNDhldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTIx
+						MTEyMTMwOTMwWhcNMjIxMTEwMTMwOTMwWjAwMS4wLAYDVQQDEyVkYzAza2cwMTQ4
+						ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA1p2saAGSBLpOZRm5yqYbFdQflusl57UUuSrnHYMnqGPOwC3e
+						pYeld2SGPFqzDvO20F6qSg8vRG1cttcmV2nhpWzNSBTD5Rzus0BLZL/CLFOHVJos
+						Q48nKp/N44XOZb00f7Zncfd6rA7vW8o5M9kPgdCUcovC+S9hJzIV1DC/i7rSyJHq
+						2b0EC2ZjQ8TI/jyqXSCTfIyxq7lSdXhSzaC+YmMs9UUBNTp6kfDkiHXGzQ5h5zJ5
+						dZLBXFA2xRUHzSfvn8RiFwEZ1y64TodCGMmrl+b5aQCydH9dVBjwQKV1iZtQewCk
+						s9z2XS3sJhT9vwD2XPITqN9xiN+kBCa7zGH9xQIDAQABo1MwUTAwBgNVHREEKTAn
+						giVkYzAza2cwMTQ4ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
+						BBT8Ab2k+zOfjnlq1xXjEzk0W6FG8DANBgkqhkiG9w0BAQUFAAOCAQEAaYwLFR4q
+						iFrda7fL/F5rcRfibrssQ/JLKEzE/GP5KR1k1eX32KROLWG7aS5iZHQhAOtW7CN4
+						gIo+bmR4x5GXkv3+AJ7s6ZyfCY0QwQ5rR2rN+NZmNVw0d9oem68GGFmsPZfbU+uu
+						mU+m4v2tgSW4KTehe+ShMe8UxrG4fJ1B9tSSq+mLrtRN0oWdS9tj81fcV2TZaZ6X
+						+WTlOidIOeT4xKwgnCbaqFX14dgmWUSKfhNZCGyicytCnOthsYx80xJDz1itrsqQ
+						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>
diff --git a/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml
new file mode 100644
index 00000000..c73d31d2
--- /dev/null
+++ b/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml
@@ -0,0 +1,119 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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 height="122" width="350" xml:lang="sv">https://swamid2.shh.se/idp/images/shh_logo.png</mdui:Logo>
+        <mdui:Logo height="122" width="350" xml:lang="en">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
+BQUAMBkxFzAVBgNVBAMTDnN3YW1pZDIuc2hoLnNlMB4XDTEzMDkxMTEyMjkzNloX
+DTMzMDkxMTEyMjkzNlowGTEXMBUGA1UEAxMOc3dhbWlkMi5zaGguc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAFjj9XWfRDUlUbQ5+JieOPIlb9ijT
+PpnUuzM3/lGbqOhK3wsSrfTx/xkfVVusFfqc+5maUjpG19yln6srVSF/kMAk55S+
+o9PhrSUY5gQl2uYBAeK99Ol/6bWR6frA7xCWlB19hUjuHyCER7bkWzgpucYfJa0m
+k2Ad0S3kmIlxN13NHar0eg3TtBzEF8+ckY+hRUif+N5dFilx1LUGnpxKdVMY7pWP
+4ITWkjffIFiKvtfYnKt7+OWF/pIsH2BnAC1aIixNFogxkbUOh/mxz6ETdRWUd5sq
+v7Y86uv3aKrScIELHyHQboHVicFIJ3z0YKV39JEBziR0nE/BkPkh3Hg7AgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDnN3YW1pZDIuc2hoLnNlhiVodHRwczovL3N3YW1pZDIu
+c2hoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRJhbf3IfPJnZ5yadVwH9OZ
+sJ6gfTANBgkqhkiG9w0BAQUFAAOCAQEAfq+blNorCZcCJwvC1dzohHaEkXPWu6Li
+eeffuQ3F98ZizlurLWK/a5T+GOpdMiD+Tv1gOGeF4xwFVtG/VMLKZdhsWSgVndoq
+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
+BQUAMBkxFzAVBgNVBAMTDnN3YW1pZDIuc2hoLnNlMB4XDTEzMDkxMTEyMjkzNloX
+DTMzMDkxMTEyMjkzNlowGTEXMBUGA1UEAxMOc3dhbWlkMi5zaGguc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAFjj9XWfRDUlUbQ5+JieOPIlb9ijT
+PpnUuzM3/lGbqOhK3wsSrfTx/xkfVVusFfqc+5maUjpG19yln6srVSF/kMAk55S+
+o9PhrSUY5gQl2uYBAeK99Ol/6bWR6frA7xCWlB19hUjuHyCER7bkWzgpucYfJa0m
+k2Ad0S3kmIlxN13NHar0eg3TtBzEF8+ckY+hRUif+N5dFilx1LUGnpxKdVMY7pWP
+4ITWkjffIFiKvtfYnKt7+OWF/pIsH2BnAC1aIixNFogxkbUOh/mxz6ETdRWUd5sq
+v7Y86uv3aKrScIELHyHQboHVicFIJ3z0YKV39JEBziR0nE/BkPkh3Hg7AgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDnN3YW1pZDIuc2hoLnNlhiVodHRwczovL3N3YW1pZDIu
+c2hoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRJhbf3IfPJnZ5yadVwH9OZ
+sJ6gfTANBgkqhkiG9w0BAQUFAAOCAQEAfq+blNorCZcCJwvC1dzohHaEkXPWu6Li
+eeffuQ3F98ZizlurLWK/a5T+GOpdMiD+Tv1gOGeF4xwFVtG/VMLKZdhsWSgVndoq
+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>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>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>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
new file mode 100644
index 00000000..837e7af8
--- /dev/null
+++ b/swamid-interfederations-2.0/swlite.sci-ware-customer.com-shibboleth.xml
@@ -0,0 +1,84 @@
+<?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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSDCCAjCgAwIBAgIJANYEwhA2kYlcMA0GCSqGSIb3DQEBBQUAMDYxNDAyBgNV
+						BAMTK2lwLTEwLTEwNi0xNDUtMjguZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWww
+						HhcNMTQwNjA1MTQzMTMzWhcNMjQwNjAyMTQzMTMzWjA2MTQwMgYDVQQDEytpcC0x
+						MC0xMDYtMTQ1LTI4LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFsMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8kRUHv2zrb4I8y4hg/omB3v9EQ6F4ESW
+						DjusedxQkitXVDgtVxAV8wuWC4wQwtZBuPIDDg+7W2kg9+KM2lYOBVCIOkr8EJNJ
+						hhw7CnjcZBIuLjK3UFMg57PEfOD9W7VcIs1fudzxkDr4y0OiyGavBegl9s6CvhNr
+						43zMyARBj3CU94TdibghGU71zBYwy/qWQtOQyfVcLbm4TMbwHSBL/MchU/MFK1WU
+						cQ7wHdeTAK6hfad67gVTK/ngSm5QgpnAYFMBWSQDnzDADw2R5LtIegWRaN0peK0R
+						FKF1SZXxG/w1qv5AkpaWkWWpYguYx8xkSJ8HeBcmJ7fGX/XKHt7EQwIDAQABo1kw
+						VzA2BgNVHREELzAtgitpcC0xMC0xMDYtMTQ1LTI4LmV1LXdlc3QtMS5jb21wdXRl
+						LmludGVybmFsMB0GA1UdDgQWBBRI66bOTCIKQ2oTtVqtgb0oQHl0KjANBgkqhkiG
+						9w0BAQUFAAOCAQEAMnniDesVe1hg/OKv5lO9xym5i95Qh59LVqyoiWW2gdUMJpih
+						CNVSz1MZfHpxs6VgApyzRdN4qFGOWFzVcHY1DmvyHuE4Y61Q70yzvG3FknwOt4Rs
+						A5skq8J2TXz8L5o90io2HteEFo47rX92xH+zyyLRTuwjI4NpoDX5TB4GRLqvEvvn
+						P0/oXOBETYlJqVK4OREqAyd+jVf7WpYSZDHCqgOWJ54MFvBd3vQp9gxTiCLdjTay
+						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>
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
new file mode 100644
index 00000000..451752d1
--- /dev/null
+++ b/swamid-interfederations-2.0/take-shape-share.fenc.org.uk-shibboleth-sp.xml
@@ -0,0 +1,74 @@
+<?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>
+      <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>
+						MIIC4jCCAcqgAwIBAgIJANjHSyxzQmcZMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+						BAMTCXMxNTUzMjEwNDAeFw0xMTA3MTQyMDM5MTNaFw0yMTA3MTEyMDM5MTNaMBQx
+						EjAQBgNVBAMTCXMxNTUzMjEwNDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBALahQjvkIC84CsDx3K7PooqAHW+QDmADL3p+5QNMs6Vb9hIu12BzjdVNBuEu
+						2P2zNU5pP17IVdVImIkFlT2ZnpzHOfFqb2cWLPZqNJorp/ZQQaWV67O+bYRewIe6
+						F25/b0cqH+0DcDlq/4kwdRfuhrCh9F0aNICcNRa51NWOAkfkJLxrLALvKFzqUGBr
+						0p2c54HqXM4vLAdwWtGjG0dmRGf6Nai00ZChhmoyZz9sFaKAJmBR8kp85RhjQWwS
+						v8SDmRDjTsLX3PiECR6aLVPA6msgalB/XS2D+0TPutL5RGHbmVcPikkierF29nfU
+						TG1yQe1V1KxvlpAmJ1EoxuSbGK0CAwEAAaM3MDUwFAYDVR0RBA0wC4IJczE1NTMy
+						MTA0MB0GA1UdDgQWBBT5mpvoe6jJ76xTkNcp5hc1CO86tTANBgkqhkiG9w0BAQUF
+						AAOCAQEAAK+SJfnu3gCma3+qgp6SXvPJbnhyAHCJjxAiNo629/3huTeRGTfYxsJa
+						0h61NTII8bvcbJoJB3XiLJnCqce66htzzbb/ujv2oFCsGxZqBOyizcpVlABSTB4J
+						8XGCeKqvK3XSiiVhAn8NFtRYCVO6DZSVC+giIv3QpcPYYw7ht/wW5uApRvewwEdZ
+						9dBzkeY5E55W+FwhhCCrueir8qzUss0qCfQApJctsGbC2vsxRow5wHQZZlZP7nyV
+						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>
diff --git a/swamid-interfederations-2.0/tandfbooks-test.literatumonline.com-shibboleth.xml b/swamid-interfederations-2.0/tandfbooks-test.literatumonline.com-shibboleth.xml
new file mode 100644
index 00000000..2828bacf
--- /dev/null
+++ b/swamid-interfederations-2.0/tandfbooks-test.literatumonline.com-shibboleth.xml
@@ -0,0 +1,53 @@
+<?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>
+						MIIDyzCCArOgAwIBAgIJAIr2ZmL2om1kMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEsMCoGA1UEAxMjdGFuZGZib29rcy10ZXN0LmxpdGVy
+						YXR1bW9ubGluZS5jb20wHhcNMTIwMjIzMTkwODU2WhcNMjIwMjIwMTkwODU2WjCB
+						pDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC1Nh
+						bnRhIENsYXJhMR0wGwYDVQQKExRBdHlwb24gU3lzdGVtcywgSW5jLjEdMBsGA1UE
+						CxMUQXR5cG9uIFN5c3RlbXMsIEluYy4xLDAqBgNVBAMTI3RhbmRmYm9va3MtdGVz
+						dC5saXRlcmF0dW1vbmxpbmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAs53ZiTs98yrcgUXyCNRq3N6bKiB5NodzqSlc1TNRAngr9NmzLOUkPTfm
+						sbwp8XsnBmvftlHW0TmxYw6c8peZL6vYO+vEuPB0BYL0uCzEfa2/ebHD1vy0vFOF
+						/qq/1+H+YQfzgYaQGI8++riXLSB6g6G+i9YPSLnRjvIcyh5QLtGQahuhSRRWxG4J
+						JllBrS0/J9gFaa13wtwq3dTqbuZFfX/y1RlbpwkLzCcpV/nB0WaIbRi9yKW0yf37
+						9LGViTHBDr52/LZkvED3otCeJzvphuOYWN+R83CVK4+YzD0YLsV6mfkHWPWFphBs
+						cXg7biduxcnmbHjBhvBHC+T8qArzUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBs
+						vuan78OdbsyivcVbUnFKH8lgg9BZ4wGTkDcfWuc7kTlWN398NZvj7Fvv4jwzFpwo
+						dBGiygfpqkV6obLL6HnMtWi+yqzMlu9Vmg0c7qR/4KPVSUbayVH3xXPjt4mBy47O
+						bZiXOrz/G+bNUTueC9eJwwIQb0kVUBD79za91elORwc/ds8/OYYl63s+uR9xVw/d
+						5Lugt9wL9A2YoP1B89RKchLPJSZzXZe0a/qTSyF/XH5IVcejvFd0ghV1FMQt3X7E
+						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:1.0:profiles:artifact-01" Location="https://tandfbooks-test.literatumonline.com/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tandfbooks-test.literatumonline.com/samlACS" 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
new file mode 100644
index 00000000..713ade23
--- /dev/null
+++ b/swamid-interfederations-2.0/tandfqa.literatumonline.com-shibboleth.xml
@@ -0,0 +1,52 @@
+<?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>
+						MIIDuzCCAqOgAwIBAgIJAMHQR7O3ueiuMA0GCSqGSIb3DQEBBQUAMIGcMQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEkMCIGA1UEAxMbdGFuZGZxYS5saXRlcmF0dW1vbmxp
+						bmUuY29tMB4XDTExMDExMTAyMTY1N1oXDTIxMDEwODAyMTY1N1owgZwxCzAJBgNV
+						BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFy
+						YTEdMBsGA1UEChMUQXR5cG9uIFN5c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBv
+						biBTeXN0ZW1zLCBJbmMuMSQwIgYDVQQDExt0YW5kZnFhLmxpdGVyYXR1bW9ubGlu
+						ZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOBD7j8NuqrWMk
+						JlW2zoI0oX0d/cXeV1cEmMxipa8yHu9uDTh6TyUl1egCH5wBWFHykNzBgZHrSs3u
+						PsYrCuh5KJpyYgZLdR7J+1GBVvcZD6xI3Q1YThKecPT++KHzsICw9hou4XvPCG9c
+						dr4SK3lYi/ssll2fGNZrRPs9RMdwpxIKj+LfX54hJFBvUO0J3lggc1DUQU44q+aj
+						XkBgde81i6gvJWfsjK4KM0jVVjLqgywitSljIVjeWEANCmvlvUsUpuuG0+afX9j+
+						fo1TEgSh+7m1SDMwu+rGtWZBwnNp6qaZUc1+ZWldOJb7K3hnq1GArPS7DR0Psx83
+						2LvTHa+VAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAL2/D+HEiBZVK9izoHtO67Io
+						g0KFZMMeDwj3Uzld0RG1rtkhTGmnvA8Semi8L2mUG4HEzujFnMfUbersgPYxDeij
+						zu5yMh3CRevxFbSjs9V/JwQhRO7LCQd7DLDqDnNkZi2vta9aKbfo/kUVbqTs9LiA
+						Q3UH11fV2Cy+OYiLqguNcuRnYBWTg52ad3A1om3phG9bmkNVpAj5zDrS0eOfCtqM
+						A4/wnlK9QkVMrwlcNoFfp2dSzwyPj2GEgKTB0stV0aZcVLG9v+WHlfCISUbS5y+q
+						bPzVscyGQK1JIpmgZYrroJet/O319V7SNs0Dr2InezbnNUlephe1pUJ8zUvcgNE=
+					</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:1.0:profiles:artifact-01" Location="https://tandfqa.literatumonline.com/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tandfqa.literatumonline.com/action/samlACS" 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
new file mode 100644
index 00000000..11542356
--- /dev/null
+++ b/swamid-interfederations-2.0/tandftest.literatumonline.com-shibboleth.xml
@@ -0,0 +1,53 @@
+<?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>
+						MIIDvzCCAqegAwIBAgIJANRcUnlRSKEQMA0GCSqGSIb3DQEBBQUAMIGeMQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEmMCQGA1UEAxMddGFuZGZ0ZXN0LmxpdGVyYXR1bW9u
+						bGluZS5jb20wHhcNMTEwMTExMDIxNTQ2WhcNMjEwMTA4MDIxNTQ2WjCBnjELMAkG
+						A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC1NhbnRhIENs
+						YXJhMR0wGwYDVQQKExRBdHlwb24gU3lzdGVtcywgSW5jLjEdMBsGA1UECxMUQXR5
+						cG9uIFN5c3RlbXMsIEluYy4xJjAkBgNVBAMTHXRhbmRmdGVzdC5saXRlcmF0dW1v
+						bmxpbmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAohFmZwIl
+						enTSQ2HX56fvSbUgIvMOE/yRpopFOjPIG0x+rWhnErZvAKADq3r0ixo1TlcBSart
+						uXfQocHfi3YyXGnT3+IDyMdfRT/nxWOfCJglTKE3IkBl69Vombxg5V+DgbEfqeLO
+						OlwDi0ZJHeU+CkjPvuvJqgLD1SIFBbtCffYvBYY6dbVWO1QqMLFESjbopRS2ITdq
+						WwHmBPn+OfGQ/r8T+OfhDjHIm24lFzIBB9iDXguyp6tO6F178BXHKDaKh4ViZkLF
+						R9z8qMY2lFXvKfCCSXmag9EIlAYv2sEZZBSvLcgMMK9GUX5oCDVw8VrOzvK1J6cf
+						KOmSxtknCj3MnQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBw0neXk9JXsNhdHsiN
+						Cc8jtIFAqhUKkkLgq2Mell7K/Yg4NXj/9Z+HaAkI8q8MEKqJZ1DQx3wBtetK5HY+
+						utd2udf/O/YEDdWEU6lNSRL/cr0eFW5uqaIY1AT6sirUD9KzXvgNk5PzvD9e+f34
+						yTqyUQToINLrMVK7FoMwWWAlWB5ehVctY5hcWthGnRtqDSw0tnf51HRNmlkFk80i
+						707KCv4XC15FQ/D0GgB9XzEOlmuK9y20tlvRqjLYzdXHeiUfkpoYdE4VLMhlChoz
+						2GHpkN4S0YQOVRyGSmKfACTFR7NoVZEM8NyKWxOeV1nRw9axzebovNlg1gpNLz68
+						O+nc
+					</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:1.0:profiles:artifact-01" Location="https://tandftest.literatumonline.com/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tandftest.literatumonline.com/action/samlACS" 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
new file mode 100644
index 00000000..f2e6eeb2
--- /dev/null
+++ b/swamid-interfederations-2.0/tc-web-01.groupgti.net-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+						MIIEXjCCA0agAwIBAgIJALr1RvO8/Hs1MA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
+						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
+						LXdlYi0wMS5ncm91cGd0aS5uZXQvc2hpYmJvbGV0aDEoMCYGCSqGSIb3DQEJARYZ
+						Y2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTAeFw0xMDA5MjMyMTA4MjZaFw0yMDA5
+						MjAyMTA4MjZaMIGvMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUx
+						FDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIw
+						MAYDVQQDEylodHRwczovL3RjLXdlYi0wMS5ncm91cGd0aS5uZXQvc2hpYmJvbGV0
+						aDEoMCYGCSqGSIb3DQEJARYZY2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO0G5rfLxGDxli2k/E//a1HfgrZA
+						oqvmIOcXaahpP1HCLK+3mgSU2cR3ukTvS0Pldnrn8dwXs/wsZTnGUqJNlvXVgHgf
+						KSuGAwqtKPzuX+0omVbl6lekO2Ie8SZbCRi1w0S3/PpWQv/00MrjokllQZtRMMQq
+						0XAmqEusMyf9O7S/CKz8Kd9FzezLdJ2E+cT6a8P+PEic9f05uk3iAEu9xafVLSgR
+						B/IK5HDfMy2/o+Hj9iVhTKRzvaERWB/WozNH3y8x34QNLTFXvLwVJ/Bz/IL4/uzc
+						unsARYJHZBZ6AtC7uqkXRgXIqeFJRduNNrmdRFa/MjVhpdnhOJxRy52kWTsCAwEA
+						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
+						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFOWwAghxTnuIj9RO/+IYp+V9QGMsMB8G
+						A1UdIwQYMBaAFOWwAghxTnuIj9RO/+IYp+V9QGMsMA0GCSqGSIb3DQEBBQUAA4IB
+						AQCQDWQJ4xYFcUa7OMF3bgWB0pOUUCzVvdJICIp41+6xdGJDkJo3e15dhEVtVjwx
+						jxvGruH07YSuYd6Sl8wEeYCR9sruxUMwNWKD/GBxuZUFrhM3avnpC81tgtMQs+BD
+						ND9wgQNP0oPlOmHRVAj8GZHGxRdwXfXmuc87a4+7E6ViI3zZKIZBW6PzRHHpKt00
+						uNvi0wNHgzVPgECjM6Fbs4BQdIxR65UHcLOPlFfJe6VtQ7zRL247jCghHmpLAM34
+						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>
+						MIIEXjCCA0agAwIBAgIJALr1RvO8/Hs1MA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
+						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
+						LXdlYi0wMS5ncm91cGd0aS5uZXQvc2hpYmJvbGV0aDEoMCYGCSqGSIb3DQEJARYZ
+						Y2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTAeFw0xMDA5MjMyMTA4MjZaFw0yMDA5
+						MjAyMTA4MjZaMIGvMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUx
+						FDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIw
+						MAYDVQQDEylodHRwczovL3RjLXdlYi0wMS5ncm91cGd0aS5uZXQvc2hpYmJvbGV0
+						aDEoMCYGCSqGSIb3DQEJARYZY2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO0G5rfLxGDxli2k/E//a1HfgrZA
+						oqvmIOcXaahpP1HCLK+3mgSU2cR3ukTvS0Pldnrn8dwXs/wsZTnGUqJNlvXVgHgf
+						KSuGAwqtKPzuX+0omVbl6lekO2Ie8SZbCRi1w0S3/PpWQv/00MrjokllQZtRMMQq
+						0XAmqEusMyf9O7S/CKz8Kd9FzezLdJ2E+cT6a8P+PEic9f05uk3iAEu9xafVLSgR
+						B/IK5HDfMy2/o+Hj9iVhTKRzvaERWB/WozNH3y8x34QNLTFXvLwVJ/Bz/IL4/uzc
+						unsARYJHZBZ6AtC7uqkXRgXIqeFJRduNNrmdRFa/MjVhpdnhOJxRy52kWTsCAwEA
+						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
+						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFOWwAghxTnuIj9RO/+IYp+V9QGMsMB8G
+						A1UdIwQYMBaAFOWwAghxTnuIj9RO/+IYp+V9QGMsMA0GCSqGSIb3DQEBBQUAA4IB
+						AQCQDWQJ4xYFcUa7OMF3bgWB0pOUUCzVvdJICIp41+6xdGJDkJo3e15dhEVtVjwx
+						jxvGruH07YSuYd6Sl8wEeYCR9sruxUMwNWKD/GBxuZUFrhM3avnpC81tgtMQs+BD
+						ND9wgQNP0oPlOmHRVAj8GZHGxRdwXfXmuc87a4+7E6ViI3zZKIZBW6PzRHHpKt00
+						uNvi0wNHgzVPgECjM6Fbs4BQdIxR65UHcLOPlFfJe6VtQ7zRL247jCghHmpLAM34
+						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>
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
new file mode 100644
index 00000000..b5d18680
--- /dev/null
+++ b/swamid-interfederations-2.0/tc-web-02.groupgti.net-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+						MIIEXjCCA0agAwIBAgIJAJEc5gsxNUbCMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
+						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
+						LXdlYi0wMi5ncm91cGd0aS5uZXQvc2hpYmJvbGV0aDEoMCYGCSqGSIb3DQEJARYZ
+						Y2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTAeFw0xMDA5MjMyMTA4NTRaFw0yMDA5
+						MjAyMTA4NTRaMIGvMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUx
+						FDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIw
+						MAYDVQQDEylodHRwczovL3RjLXdlYi0wMi5ncm91cGd0aS5uZXQvc2hpYmJvbGV0
+						aDEoMCYGCSqGSIb3DQEJARYZY2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANw+KqJVLy3RpCE6Szd2C/G3rLKO
+						u1BWzqGTcFrLxElc5zMQccTeYSQY42/BrQSjY8Oan7A7ilLI6M/83mNxTFcxOpUf
+						VPzajRcBnOTzUGWG7AzHn04jfYbCHozt7ek11VHoxWHGkZa1kykb+5Y1es8lKeDj
+						oxE82a2sRxpEQJWiJeer4S1CR8rd7AdZtxVm4CzJyfRb/eVCQAK+2aoTcyLc9fKC
+						iCOLMxX/Ld+y60m3qpxqOAFeNqk+ehtAy5dakXBL9VwNyeQ1ZHgQcnh/NVJ4N3Y3
+						r6tDPRHgML54s7nMz5XDewBhGjrtjvrTWYBP1Q8DTf2neLqdky+WsA63qa0CAwEA
+						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
+						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFOC1VfX8Qxzl8vzm0SuSJ+DPl6MSMB8G
+						A1UdIwQYMBaAFOC1VfX8Qxzl8vzm0SuSJ+DPl6MSMA0GCSqGSIb3DQEBBQUAA4IB
+						AQC0qyxzOV6UHVavg5wVHdx9j3d1e7zmChtGPKErHz3Hovjg209dhHIooP7UqkE/
+						0c4WbGEsny+Pwv6M3EAr+utRj4pjRnpglwaWygJ+cFtY29+D0g6oDLzJZy+pcgXI
+						lkOjkFTGcwGAnLbVB3uEg+PTglpRVCXz4bhXpZzPzZmxsdSe/8vQF9zaNv2AIOrl
+						t2r1GTl2jt/3Bg+hJvPeBCkIBHh5sNgL0UWtNMBK/j6Me0xJCkEL/IWQpHfvLKcA
+						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>
+						MIIEXjCCA0agAwIBAgIJAJEc5gsxNUbCMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
+						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
+						LXdlYi0wMi5ncm91cGd0aS5uZXQvc2hpYmJvbGV0aDEoMCYGCSqGSIb3DQEJARYZ
+						Y2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTAeFw0xMDA5MjMyMTA4NTRaFw0yMDA5
+						MjAyMTA4NTRaMIGvMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUx
+						FDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIw
+						MAYDVQQDEylodHRwczovL3RjLXdlYi0wMi5ncm91cGd0aS5uZXQvc2hpYmJvbGV0
+						aDEoMCYGCSqGSIb3DQEJARYZY2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANw+KqJVLy3RpCE6Szd2C/G3rLKO
+						u1BWzqGTcFrLxElc5zMQccTeYSQY42/BrQSjY8Oan7A7ilLI6M/83mNxTFcxOpUf
+						VPzajRcBnOTzUGWG7AzHn04jfYbCHozt7ek11VHoxWHGkZa1kykb+5Y1es8lKeDj
+						oxE82a2sRxpEQJWiJeer4S1CR8rd7AdZtxVm4CzJyfRb/eVCQAK+2aoTcyLc9fKC
+						iCOLMxX/Ld+y60m3qpxqOAFeNqk+ehtAy5dakXBL9VwNyeQ1ZHgQcnh/NVJ4N3Y3
+						r6tDPRHgML54s7nMz5XDewBhGjrtjvrTWYBP1Q8DTf2neLqdky+WsA63qa0CAwEA
+						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
+						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFOC1VfX8Qxzl8vzm0SuSJ+DPl6MSMB8G
+						A1UdIwQYMBaAFOC1VfX8Qxzl8vzm0SuSJ+DPl6MSMA0GCSqGSIb3DQEBBQUAA4IB
+						AQC0qyxzOV6UHVavg5wVHdx9j3d1e7zmChtGPKErHz3Hovjg209dhHIooP7UqkE/
+						0c4WbGEsny+Pwv6M3EAr+utRj4pjRnpglwaWygJ+cFtY29+D0g6oDLzJZy+pcgXI
+						lkOjkFTGcwGAnLbVB3uEg+PTglpRVCXz4bhXpZzPzZmxsdSe/8vQF9zaNv2AIOrl
+						t2r1GTl2jt/3Bg+hJvPeBCkIBHh5sNgL0UWtNMBK/j6Me0xJCkEL/IWQpHfvLKcA
+						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>
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
new file mode 100644
index 00000000..f764c2fa
--- /dev/null
+++ b/swamid-interfederations-2.0/tc-web-03.groupgti.net-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+						MIIEXjCCA0agAwIBAgIJAPnTayEZXM7VMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
+						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
+						LXdlYi0wMy5ncm91cGd0aS5uZXQvc2hpYmJvbGV0aDEoMCYGCSqGSIb3DQEJARYZ
+						Y2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTAeFw0xMDA5MjMyMTA5MThaFw0yMDA5
+						MjAyMTA5MThaMIGvMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUx
+						FDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIw
+						MAYDVQQDEylodHRwczovL3RjLXdlYi0wMy5ncm91cGd0aS5uZXQvc2hpYmJvbGV0
+						aDEoMCYGCSqGSIb3DQEJARYZY2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOdFx3Y5iAOlUIyGc1xyE+WO4faO
+						NyRg+RrLlJILmaqoAxvuj9S6ZIvozHcm9lt8MtbhuLGYHvccI3f/kFfIrcQIf4A1
+						AkiQvipgXcsskSxWWh1AccbS6EvCvfPWq4sKpUc8Sr0mexeWrOwtO8vw1Lhx0iaZ
+						JW9gbT6f3k6XdZHATqRB1L5M5QNHzr83DwFPkp7K7HPs88qI99x6KhIoxXkHS4F2
+						qxIKk6Jrk/XpMe+gmRno1Hy9wjFlpd92MS46kIfrPkwGb+btFfZVYwmRabsqVylL
+						O5Uj8q0B5kPE3qVzVggi3XoyCJb0rZRJGhmhTJHHzDpLH43b4ph7b6h6pgkCAwEA
+						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
+						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFBtiQvufwTjI+aEBDw5atKl92se6MB8G
+						A1UdIwQYMBaAFBtiQvufwTjI+aEBDw5atKl92se6MA0GCSqGSIb3DQEBBQUAA4IB
+						AQDmiCUup4EsfafrMTbIicd6BpA5O6MueKq5jqcsUnTN4LK54fvDgDXq662AOCH0
+						yN62pBTeqZDNPhqRhpz+UnnmPg6NavHhH//nrNXEDuQPZGEQDpkTKZ4W3lR+S8rt
+						LO4YljkGQFxpKFuXtOLIpCNbV0TP4m3nbnmizjFqIWwvKGqo4bh8rCz2BljYp2Fl
+						XgcpItZZi8MIg6yEJSFTyZnc42HTk3lZHIgGlttABV694S6HOslGEpSq6N1bFVLs
+						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>
+						MIIEXjCCA0agAwIBAgIJAPnTayEZXM7VMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
+						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
+						LXdlYi0wMy5ncm91cGd0aS5uZXQvc2hpYmJvbGV0aDEoMCYGCSqGSIb3DQEJARYZ
+						Y2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTAeFw0xMDA5MjMyMTA5MThaFw0yMDA5
+						MjAyMTA5MThaMIGvMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUx
+						FDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIw
+						MAYDVQQDEylodHRwczovL3RjLXdlYi0wMy5ncm91cGd0aS5uZXQvc2hpYmJvbGV0
+						aDEoMCYGCSqGSIb3DQEJARYZY2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOdFx3Y5iAOlUIyGc1xyE+WO4faO
+						NyRg+RrLlJILmaqoAxvuj9S6ZIvozHcm9lt8MtbhuLGYHvccI3f/kFfIrcQIf4A1
+						AkiQvipgXcsskSxWWh1AccbS6EvCvfPWq4sKpUc8Sr0mexeWrOwtO8vw1Lhx0iaZ
+						JW9gbT6f3k6XdZHATqRB1L5M5QNHzr83DwFPkp7K7HPs88qI99x6KhIoxXkHS4F2
+						qxIKk6Jrk/XpMe+gmRno1Hy9wjFlpd92MS46kIfrPkwGb+btFfZVYwmRabsqVylL
+						O5Uj8q0B5kPE3qVzVggi3XoyCJb0rZRJGhmhTJHHzDpLH43b4ph7b6h6pgkCAwEA
+						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
+						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFBtiQvufwTjI+aEBDw5atKl92se6MB8G
+						A1UdIwQYMBaAFBtiQvufwTjI+aEBDw5atKl92se6MA0GCSqGSIb3DQEBBQUAA4IB
+						AQDmiCUup4EsfafrMTbIicd6BpA5O6MueKq5jqcsUnTN4LK54fvDgDXq662AOCH0
+						yN62pBTeqZDNPhqRhpz+UnnmPg6NavHhH//nrNXEDuQPZGEQDpkTKZ4W3lR+S8rt
+						LO4YljkGQFxpKFuXtOLIpCNbV0TP4m3nbnmizjFqIWwvKGqo4bh8rCz2BljYp2Fl
+						XgcpItZZi8MIg6yEJSFTyZnc42HTk3lZHIgGlttABV694S6HOslGEpSq6N1bFVLs
+						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>
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
new file mode 100644
index 00000000..e12dc923
--- /dev/null
+++ b/swamid-interfederations-2.0/tc-web-04.groupgti.net-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+						MIIEXjCCA0agAwIBAgIJAMke5AjSxi5OMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
+						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
+						LXdlYi0wNC5ncm91cGd0aS5uZXQvc2hpYmJvbGV0aDEoMCYGCSqGSIb3DQEJARYZ
+						Y2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTAeFw0xMDA5MjMyMTA5NDRaFw0yMDA5
+						MjAyMTA5NDRaMIGvMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUx
+						FDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIw
+						MAYDVQQDEylodHRwczovL3RjLXdlYi0wNC5ncm91cGd0aS5uZXQvc2hpYmJvbGV0
+						aDEoMCYGCSqGSIb3DQEJARYZY2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0ZYat2MyEhnbeVgaS6DfqdejK4
+						ZspciHTMNsflPGSyUL+bjhQiP9q+QqkUQTRD6QvP3cwz0pGQPqrjh+bFLwuveyjw
+						ONzdJReT3YAMF0ykekIHhY2YEUCSdAV5MI6ABV1DHYRMYIMauac9BE8mxGbBPzDB
+						XO7NEzqOCsqAMqSxFpETUaTLlCGBNrf4/dqKGMHeWZTfxreET2nmGFy3vGy3WNzj
+						PrIvmNMV2BS+GK146TzTI8WSDTeFylu3FDcG8EDagY1AdsI2E67WWtXENnqh7nhg
+						CyXnHPlrWiWB7G1/dcMqFMiL7o4LdbrPah9SuSx5d3z5opC3hFqAyiLAPH0CAwEA
+						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
+						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFNOJpQGCNKkje2TJJrIQJrLEIPy5MB8G
+						A1UdIwQYMBaAFNOJpQGCNKkje2TJJrIQJrLEIPy5MA0GCSqGSIb3DQEBBQUAA4IB
+						AQBgAcdiAEiBYPdZKlhnP+lapwnxjYas7iPagZxh3VM48tMF4hYVQISOOWxkqhX+
+						JbdBv8IW6Hmm3nS32akZjGXLiXwcrXjQO+1V2JbfCRGV6Q0SMu4AToJBIcIykSRP
+						2YB1u8DSnsXGfzGjpsL0EIxEKrD4UWtw6o9r2JKqnNUocsDZNRZjS9gaF6ksZFMt
+						rrIVqvtKDRcWH9TezJ/JJPAhocQDKXstcd2m63uAlh3IjEaCnU0Dus2e3HTryBEM
+						/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>
+						MIIEXjCCA0agAwIBAgIJAMke5AjSxi5OMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
+						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
+						LXdlYi0wNC5ncm91cGd0aS5uZXQvc2hpYmJvbGV0aDEoMCYGCSqGSIb3DQEJARYZ
+						Y2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTAeFw0xMDA5MjMyMTA5NDRaFw0yMDA5
+						MjAyMTA5NDRaMIGvMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUx
+						FDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIw
+						MAYDVQQDEylodHRwczovL3RjLXdlYi0wNC5ncm91cGd0aS5uZXQvc2hpYmJvbGV0
+						aDEoMCYGCSqGSIb3DQEJARYZY2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0ZYat2MyEhnbeVgaS6DfqdejK4
+						ZspciHTMNsflPGSyUL+bjhQiP9q+QqkUQTRD6QvP3cwz0pGQPqrjh+bFLwuveyjw
+						ONzdJReT3YAMF0ykekIHhY2YEUCSdAV5MI6ABV1DHYRMYIMauac9BE8mxGbBPzDB
+						XO7NEzqOCsqAMqSxFpETUaTLlCGBNrf4/dqKGMHeWZTfxreET2nmGFy3vGy3WNzj
+						PrIvmNMV2BS+GK146TzTI8WSDTeFylu3FDcG8EDagY1AdsI2E67WWtXENnqh7nhg
+						CyXnHPlrWiWB7G1/dcMqFMiL7o4LdbrPah9SuSx5d3z5opC3hFqAyiLAPH0CAwEA
+						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
+						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFNOJpQGCNKkje2TJJrIQJrLEIPy5MB8G
+						A1UdIwQYMBaAFNOJpQGCNKkje2TJJrIQJrLEIPy5MA0GCSqGSIb3DQEBBQUAA4IB
+						AQBgAcdiAEiBYPdZKlhnP+lapwnxjYas7iPagZxh3VM48tMF4hYVQISOOWxkqhX+
+						JbdBv8IW6Hmm3nS32akZjGXLiXwcrXjQO+1V2JbfCRGV6Q0SMu4AToJBIcIykSRP
+						2YB1u8DSnsXGfzGjpsL0EIxEKrD4UWtw6o9r2JKqnNUocsDZNRZjS9gaF6ksZFMt
+						rrIVqvtKDRcWH9TezJ/JJPAhocQDKXstcd2m63uAlh3IjEaCnU0Dus2e3HTryBEM
+						/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>
diff --git a/swamid-interfederations-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..6751d44a
--- /dev/null
+++ b/swamid-interfederations-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-escience-portal.terena.org/simplesamlphp/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="2013-05-03T16:37:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">TERENA eScience Personal Certificate Service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service allows you to get or deactive a personal certificate for eScience applications, such as grid use.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.terena.org/tcs</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>MIIEITCCAwmgAwIBAgIJAMphslCtGfAvMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM4MDlaFw0zMzA0MDcwOTM4MDlaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJ78GlTdVJr8q1KWscjN4BEYwgaDQzpkfl5g0dJ/I1XhgRit1SFY1Qcu6MHgpaIJCepkwdrHeDXKJj/t/SwXOeDuwwqwYQIzHVFeGsG0fXkhpvA9Ae07bn6SlQqxp6msleHU+d4oGZnrUOcOVywnDkAaMMUvenWK42f/oBcyf0aJuFlt7ZvaBJv57/z2L02ESkQlCBH3R3NGt77GsBCNXdqGsYaz0BXgQ1U/25ofmL+HcxkbtBFlOfFKfntRMSJJZ3/osgsfkhx++ESQ88OaVdC0X1WEZcphkFjzd/QujxNRW1xlXErVhTtJvX85jYSwoQ0Hl2aO1lF7qundGBYYOsCAwEAAaOBzTCByjAdBgNVHQ4EFgQUFDOLIP6//PMYotoXXSVbz65lyAIwgZoGA1UdIwSBkjCBj4AUFDOLIP6//PMYotoXXSVbz65lyAKhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZ4IJAMphslCtGfAvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJhZchVmfk3ASZ1Spgk56942jWUZCVuloJpo6m0nxQvisa/ZcdsVVfbHFS8AgH79Fub253qHMPzasCfh/WWNn57SVf7QcP+ROA0JuPjmE7gAcPvEb035/tw/3+I5rmNWIq2HVW9ySs5dJVv+p9j1ecr5kLiD4eNJRQxUD0XXNkruWF4NChxTREUim/WaIBy8qlt8ljXF3zyXwkQ7KchQ8/vQu2/4g4cVrjOZR8oulgpTOZcVnVwzdfYZSicWxHv3TkGmc5mPBtUxfUKcuLBbJX38K8346P8aQnizVN26gsW2LbGUEsPwg9HgGnGxaMtL4m/fC32Y7lxU4X6D0MsH3xY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAMphslCtGfAvMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM4MDlaFw0zMzA0MDcwOTM4MDlaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJ78GlTdVJr8q1KWscjN4BEYwgaDQzpkfl5g0dJ/I1XhgRit1SFY1Qcu6MHgpaIJCepkwdrHeDXKJj/t/SwXOeDuwwqwYQIzHVFeGsG0fXkhpvA9Ae07bn6SlQqxp6msleHU+d4oGZnrUOcOVywnDkAaMMUvenWK42f/oBcyf0aJuFlt7ZvaBJv57/z2L02ESkQlCBH3R3NGt77GsBCNXdqGsYaz0BXgQ1U/25ofmL+HcxkbtBFlOfFKfntRMSJJZ3/osgsfkhx++ESQ88OaVdC0X1WEZcphkFjzd/QujxNRW1xlXErVhTtJvX85jYSwoQ0Hl2aO1lF7qundGBYYOsCAwEAAaOBzTCByjAdBgNVHQ4EFgQUFDOLIP6//PMYotoXXSVbz65lyAIwgZoGA1UdIwSBkjCBj4AUFDOLIP6//PMYotoXXSVbz65lyAKhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZ4IJAMphslCtGfAvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJhZchVmfk3ASZ1Spgk56942jWUZCVuloJpo6m0nxQvisa/ZcdsVVfbHFS8AgH79Fub253qHMPzasCfh/WWNn57SVf7QcP+ROA0JuPjmE7gAcPvEb035/tw/3+I5rmNWIq2HVW9ySs5dJVv+p9j1ecr5kLiD4eNJRQxUD0XXNkruWF4NChxTREUim/WaIBy8qlt8ljXF3zyXwkQ7KchQ8/vQu2/4g4cVrjOZR8oulgpTOZcVnVwzdfYZSicWxHv3TkGmc5mPBtUxfUKcuLBbJX38K8346P8aQnizVN26gsW2LbGUEsPwg9HgGnGxaMtL4m/fC32Y7lxU4X6D0MsH3xY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tcs-escience-portal.terena.org/simplesamlphp/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://tcs-escience-portal.terena.org/simplesamlphp/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://tcs-escience-portal.terena.org/simplesamlphp/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://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </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/tcs</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UvT</md:GivenName>
+    <md:SurName>LIS Unix</md:SurName>
+    <md:EmailAddress>lis-unix@uvt.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..ec652db6
--- /dev/null
+++ b/swamid-interfederations-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-05-03T16:31:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">TERENA Personal Certificate Service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service allows you to get or deactive a personal certificate.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.terena.org/tcs</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>MIIEITCCAwmgAwIBAgIJAJAgPhRkNLb/MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM5MTVaFw0zMzA0MDcwOTM5MTVaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBcWpnN9ebHCveyj0WRiPOylNZXR+KG1uRaiTTT0gDjeajlUlZioQGLX0uoxqWy9D/l86LrAq6VEHX4OaBA+Xz0QonTcLz2ri1Vf1GYDjHtInc+UO6pMQHKCdbxMfS97dUXqz++H25xav/cdSPxXvc9a9mIb3DT2yaR9qsUIR2kGxXqdwoZ1fClQLJOPvEGonvlxxNBfLvaJuhvIGtKx0IXvGdnXEl3bzvp2bGPAwUxSEnFcnhjr4qmIs5QEqaqkSOmfKqwv+v2GCXdUOBjkELGVO4475tR4ouIi5rVoWmx3Tg21m/AWa5UbTBdSS6Di6n2QXsk+0j1L/FVji6exhcCAwEAAaOBzTCByjAdBgNVHQ4EFgQUoPN3NNk77LXCa/WThDYvPCp7gPowgZoGA1UdIwSBkjCBj4AUoPN3NNk77LXCa/WThDYvPCp7gPqhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZ4IJAJAgPhRkNLb/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIrsiiKJmDtH73e8oySp/In6QwCw2y2v0MJ9yHrPOdlTH4dQ3QFaGOaKIcD1McdKN1xWCKE6FudqVr3nuJZVliSL4rM+RE+v4gkTuNFzzz/2ARR2EkCn14K/7FuM1kGoUfIHYloB1NohRvJup3vDRGpuvutWJjOznmfxdM5aUCYYzR1fX3GTVanuaYGNzKhpKnDIjlBuZwUx/YEzEbBlTmdh5I3s5PidRnQdU4EnD2rBoT3nuqgYKLoC0d4eN9LvpI14evq9Z4WrXhEJwU4ItX5OQz+iLB6Y7LX3JBqucdfKHYcPI+yvvQVxbeSuTWIB9vhooOqjt8jxGzrBq8arBmc=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAJAgPhRkNLb/MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM5MTVaFw0zMzA0MDcwOTM5MTVaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBcWpnN9ebHCveyj0WRiPOylNZXR+KG1uRaiTTT0gDjeajlUlZioQGLX0uoxqWy9D/l86LrAq6VEHX4OaBA+Xz0QonTcLz2ri1Vf1GYDjHtInc+UO6pMQHKCdbxMfS97dUXqz++H25xav/cdSPxXvc9a9mIb3DT2yaR9qsUIR2kGxXqdwoZ1fClQLJOPvEGonvlxxNBfLvaJuhvIGtKx0IXvGdnXEl3bzvp2bGPAwUxSEnFcnhjr4qmIs5QEqaqkSOmfKqwv+v2GCXdUOBjkELGVO4475tR4ouIi5rVoWmx3Tg21m/AWa5UbTBdSS6Di6n2QXsk+0j1L/FVji6exhcCAwEAAaOBzTCByjAdBgNVHQ4EFgQUoPN3NNk77LXCa/WThDYvPCp7gPowgZoGA1UdIwSBkjCBj4AUoPN3NNk77LXCa/WThDYvPCp7gPqhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZ4IJAJAgPhRkNLb/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIrsiiKJmDtH73e8oySp/In6QwCw2y2v0MJ9yHrPOdlTH4dQ3QFaGOaKIcD1McdKN1xWCKE6FudqVr3nuJZVliSL4rM+RE+v4gkTuNFzzz/2ARR2EkCn14K/7FuM1kGoUfIHYloB1NohRvJup3vDRGpuvutWJjOznmfxdM5aUCYYzR1fX3GTVanuaYGNzKhpKnDIjlBuZwUx/YEzEbBlTmdh5I3s5PidRnQdU4EnD2rBoT3nuqgYKLoC0d4eN9LvpI14evq9Z4WrXhEJwU4ItX5OQz+iLB6Y7LX3JBqucdfKHYcPI+yvvQVxbeSuTWIB9vhooOqjt8jxGzrBq8arBmc=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tcs-personal-portal.terena.org/simplesamlphp/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://tcs-personal-portal.terena.org/simplesamlphp/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://tcs-personal-portal.terena.org/simplesamlphp/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://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </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/tcs</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UvT</md:GivenName>
+    <md:SurName>LIS Unix</md:SurName>
+    <md:EmailAddress>lis-unix@uvt.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/teledir5.telecoms.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/teledir5.telecoms.ox.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..0978d364
--- /dev/null
+++ b/swamid-interfederations-2.0/teledir5.telecoms.ox.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,88 @@
+<?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://teledir5.telecoms.ox.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="2014-12-17T14:58: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://teledir5.telecoms.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>
+						MIIDRDCCAiygAwIBAgIJANX16FDnJfJzMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGnRlbGVkaXI1LnRlbGVjb21zLm94LmFjLnVrMB4XDTE0MTIxNjE2NTIwOFoX
+						DTE3MTIxNTE2NTIwOFowJTEjMCEGA1UEAxMadGVsZWRpcjUudGVsZWNvbXMub3gu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyweHxHPmnhnso
+						8M2RhuEmAULqIBgAXMR93f47bFP7BcmBhfhDvo2MbODKFgiLvargURn1e/NJpU9E
+						socaGCydVh/UfjanQ+BDv2OMC4TP+OkVpq3Ytj7OuNwS7XDJRH0DBF6ViuKeGLEI
+						QJcwcpDsty6Nv02KtTqx6s7xDq5ZTw1bWu1YnpgJEfptRWeP/Fy27kTbCxuhSoGM
+						i2AyhObTtip74KvLWrqdjnrDajmTyn3Q6NwJS78/WCZ9LhCDdEVDeFzh2Jmf7C8P
+						D9CS8ngFr7vstIyprWjW6zRWJfAHqZAl1q1BJqyapClxHcY+vaU+RGgg3rGOCmIZ
+						R6JJ4xpHAgMBAAGjdzB1MFQGA1UdEQRNMEuCGnRlbGVkaXI1LnRlbGVjb21zLm94
+						LmFjLnVrhi1odHRwczovL3RlbGVkaXI1LnRlbGVjb21zLm94LmFjLnVrL3NoaWJi
+						b2xldGgwHQYDVR0OBBYEFK8xAUsfV8iIepwmYhTalg2LmDkjMA0GCSqGSIb3DQEB
+						BQUAA4IBAQAbSeWfz3/JHz+K8QDFZ/hAXlSfhsZ8cLNRvAyngacjrShnNjt5FYYY
+						3NuRQNrqahhlVIeWWRVzQyEFAyeyjw6joZThkuFCFC80GobXltQynj74qquWn4xy
+						pEplFFeaZRm342BkjifrVHKKW2UQiYkvj3ZCpNqZaaMk2zJCRa279xR/NCst1OP1
+						gCyW8S6Qdj9uYRynfTwCiWupd0+MTueEXBkk4lT5/Xssy9WuWGV35FgIjGnGDw0J
+						dzxX0lnHhv9sM9OH0gWwl57wJlZjwzRDmZE7QmPpnD/Q1r3NzNFVfrfABjKuAZ8F
+						ZBxxFc3M3ZaEb+h0oQ8fK2f1XPDlw29j
+					</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://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://teledir5.telecoms.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://teledir5.telecoms.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://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://teledir5.telecoms.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 Test set up for Telecoms</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/telecoms/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Telecoms IT Support</md:GivenName>
+    <md:EmailAddress>mailto:telecomsitsupport@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Telecoms IT Support</md:GivenName>
+    <md:EmailAddress>mailto:telecomsitsupport@it.ox.ac.uk</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 7b64359e..89adff7b 100644
--- a/swamid-interfederations-2.0/terena.org-sp.xml
+++ b/swamid-interfederations-2.0/terena.org-sp.xml
@@ -1,32 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://terena.org/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">TERENA Service Provider Proxy</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A service provider proxy for all TERENA federated services</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://confluence.terena.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.terena.org/p3p</mdui:PrivacyStatementURL>
+        <mdui:Logo width="350" height="94">https://www.terena.org/gfx/terena_logo_slogan_rgb-350x97.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
-      <md:ServiceName xml:lang="da">TERENA Service Provider Proxy</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to be a Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at fungere som tjenesteudbyder-proxy for alle TERENAs fødererede tjenester</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:ServiceDescription xml:lang="en">A Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.terena.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>TERENA</md:GivenName>
+    <md:SurName>AAI team</md:SurName>
+    <md:EmailAddress>aai@terena.org</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml b/swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml
new file mode 100644
index 00000000..f80c9ff8
--- /dev/null
+++ b/swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="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://test-adfs.geant.net/adfs/services/trust" 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">
+  <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>
+      <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>
+MIIEcjCCA1qgAwIBAgIHFoCBhVY+iTANBgkqhkiG9w0BAQsFADA3MQswCQYDVQQG
+EwJERTEPMA0GA1UEChMGZWR1UEtJMRcwFQYDVQQDEw5lZHVQS0kgVGVzdCBDQTAe
+Fw0xMzEwMTgwOTQ4MzdaFw0xODEwMTcwOTQ4MzdaMG0xCzAJBgNVBAYTAkRFMTEw
+LwYDVQQKEyhUaGlzIGlzIGEgVGVzdCBhbmQgRGVtbyBDZXJ0aWZpY2F0ZSBvbmx5
+MQ0wCwYDVQQLEwRUZXN0MRwwGgYDVQQDExN0ZXN0LWFkZnMuZ2VhbnQubmV0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ZgGj3cbCZgNNTCY0P2g8jov
+74KFsNXtaPPM0vNT+RlmdfmqLVNFkCz90HHx+1ZFF98YYF3kNqvtipEYhv8AplU+
+j/UR9I6rPTEvHtM2BFrCv3fvsvLitkcYQVi4NDjI8Qzv4ugVGzfeC3vlPPOwNdsA
+wLsKrIKG5QbnDkgaJMuIKorsUD0QBOb/bema0x77jXWyo7Zsrz3EWE6x9VreBLde
+4bzWdvig79oYBCvYbzckS77qweOY4oDB2oxF96wf0UlyC26u40cyGBkWuwke3DX+
+mypM86il05F5gxbMq0iOt1e+rv4ewqzyLdCEEyrG1Iez9qYIZTqiKoCKCZNlcQID
+AQABo4IBSzCCAUcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRsZ/2CP8ljz4lbwswK7TlU+wvn
+uTAfBgNVHSMEGDAWgBSod7exoyNlktqfxGUUmz5e7PjKIDAtBgNVHREEJjAkghN0
+ZXN0LWFkZnMuZ2VhbnQubmV0gQ1zeXNAZ2VhbnQubmV0MEcGA1UdHwRAMD4wPKA6
+oDiGNmh0dHA6Ly9jZHAuZWR1cGtpLm9yZy9lZHVwa2ktdGVzdC1jYS9wdWIvY3Js
+L2NhY3JsLmNybDBWBggrBgEFBQcBAQRKMEgwRgYIKwYBBQUHMAKGOmh0dHA6Ly9j
+ZHAuZWR1cGtpLm9yZy9lZHVwa2ktdGVzdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwDQYJKoZIhvcNAQELBQADggEBAEgQ/IltN/cqHX76ne//6A3sHGdPmc37aIwF
+8x+9d7XrKMp/OPuU7B+rrIAw0NTh8lI6jtjksSJ+ONnTvMmNChpbyGt/MoCpzN96
+43SCBG69g9p65YQRbsjbk+F29ddyxbNMGMRRHmU3y/5PuaKT/kxwhI2qdG8jYos7
+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" 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="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:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="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="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="commonName" 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">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
new file mode 100644
index 00000000..ca884c3a
--- /dev/null
+++ b/swamid-interfederations-2.0/test-auth.galegroup.com-shibboleth.xml
@@ -0,0 +1,57 @@
+<?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>
+						MIIDTzCCAjegAwIBAgIJAJeid8J1f6CuMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHNoaWJib2xldGguZ2FsZWdyb3VwLmNvbTAeFw0xMjAzMTIxNzMwMjNaFw0z
+						MjAzMDcxNzMwMjNaMCMxITAfBgNVBAMTGHNoaWJib2xldGguZ2FsZWdyb3VwLmNv
+						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2Qn+1FW/n+4ZZGA0lv
+						z9F+I5FdDnX35oD5M7JuN6cbprWA4F8EHir6bYAuvU5lK0knO4w56aiH0uhbWXu1
+						SlUlxSbAIaJombApnC5AtCJ6WFOs+NaTi/gFlAyIh7w169ZhwfsLjQE/hkdplpWT
+						xjFUNpt12ZyU8LL1yEJmfkeBUN3oK2fa7Qe+oqnyY0eOHHTKVO9IIr9/SvzdhoA0
+						c8a2kXy4qM2T+qKGi7SGz3/Qhwpial3ZDGqeZ3m25n57h3I7BhxVSJGzzbSeOcib
+						jbWRk5VjYalmG0V+XGjEJtN4oUdAgnkvJMj+yOQ8IXzDws4OR+KWGYl5lEAijXce
+						qNcCAwEAAaOBhTCBgjAdBgNVHQ4EFgQUC3bQ/Jx1yAhQgWVLRtPePx/ipxYwUwYD
+						VR0jBEwwSoAUC3bQ/Jx1yAhQgWVLRtPePx/ipxahJ6QlMCMxITAfBgNVBAMTGHNo
+						aWJib2xldGguZ2FsZWdyb3VwLmNvbYIJAJeid8J1f6CuMAwGA1UdEwQFMAMBAf8w
+						DQYJKoZIhvcNAQEFBQADggEBABAvL5eepD3fliAIefJ/4pDBxKBcCynRXLlmUWir
+						1majii1tK0WEbDdF1a24njlftvCVDNDrrfdhu1rvXZ3UhyyiOS7fBpBvRPjCmzlf
+						DdvGiMuar/T+uNzbiNqcLsVeKvwZJfzMt9Y1T7MXDABez8BD3CkdFt05j+hPK0t5
+						3PLIZfOir72LoRAtXmilZs4ZAvvTL/BTTxYn4t165Vp5yBRPCLrdSAMIdTIENBZ7
+						/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>
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
new file mode 100644
index 00000000..d2b325b7
--- /dev/null
+++ b/swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.xml
@@ -0,0 +1,96 @@
+<?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>
+      <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>
+						MIIDNjCCAh6gAwIBAgIJAPH4vrYKW5oVMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnRlc3QtYm9kLWd1aS5nZWFudC5uZXQwHhcNMTQwNDExMTUxMDEyWhcNMTcw
+						NDExMTUxMDEyWjAhMR8wHQYDVQQDExZ0ZXN0LWJvZC1ndWkuZ2VhbnQubmV0MIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9wlYXUI0eKL4E4MgQ4gPk8XW
+						Nvn1drh2cKjBkxsclJ809ZoXdToxSOynO0CKmptzL58sBhHC+dpj6TKkUBeIkPtj
+						3lNzkpFcZAPPzWeloICGfmye6FCZxGJEv4+SCQgTCxJLPvfL7iHLgeNBfN26/kQH
+						7ydU3/TOkhiXjgkI+ZKX6VgLpEWkb+J9F/TWAjTxYQteqoMvgOxfbydM29ZIn/oE
+						727AhEzWwgrmc+rkmhKgSRCHzHif0J7r2eR+df3FYapS+6fknx/HYndQbaWr693q
+						SyNZqH9rxIjyCOZ8IYIFL5VWgP/pO6AuLu8EQrZQ1pW05vuEuxtrybeg1pzzrQID
+						AQABo3EwbzBOBgNVHREERzBFghZ0ZXN0LWJvZC1ndWkuZ2VhbnQubmV0hitodHRw
+						czovL3Rlc3QtYm9kLWd1aS5nZWFudC5uZXQvYXV0b2JhaG4tZ3VpMB0GA1UdDgQW
+						BBQE2RiLCknrDB2uim6zxukDDnVUFzANBgkqhkiG9w0BAQUFAAOCAQEAr2+uchPv
+						0EvCZ0TK19dhDOOTz0zRO1booiUajqPYOifUFaQWrAT5uEZPPO5wtwRARszL0BK7
+						M1oYWK3hxMjP8sAdlaP1nWk9eCK1LzEuquUiGB8V+1PQNi4pOBtobav0wYHfpWvs
+						fWLzAQzeuhVJ9tr7FoSEiIi+JEAriU966HD1LDYmwCJIB0wQrLtUUsBkaLEuq0sU
+						QrmdjxC4IVZG7dHqQgvtdBAMa/CXT0hJpL1NpCDNOlSea+fHGvN5Ztt7EOU1dtmv
+						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>
+						MIIDNjCCAh6gAwIBAgIJAPH4vrYKW5oVMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnRlc3QtYm9kLWd1aS5nZWFudC5uZXQwHhcNMTQwNDExMTUxMDEyWhcNMTcw
+						NDExMTUxMDEyWjAhMR8wHQYDVQQDExZ0ZXN0LWJvZC1ndWkuZ2VhbnQubmV0MIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9wlYXUI0eKL4E4MgQ4gPk8XW
+						Nvn1drh2cKjBkxsclJ809ZoXdToxSOynO0CKmptzL58sBhHC+dpj6TKkUBeIkPtj
+						3lNzkpFcZAPPzWeloICGfmye6FCZxGJEv4+SCQgTCxJLPvfL7iHLgeNBfN26/kQH
+						7ydU3/TOkhiXjgkI+ZKX6VgLpEWkb+J9F/TWAjTxYQteqoMvgOxfbydM29ZIn/oE
+						727AhEzWwgrmc+rkmhKgSRCHzHif0J7r2eR+df3FYapS+6fknx/HYndQbaWr693q
+						SyNZqH9rxIjyCOZ8IYIFL5VWgP/pO6AuLu8EQrZQ1pW05vuEuxtrybeg1pzzrQID
+						AQABo3EwbzBOBgNVHREERzBFghZ0ZXN0LWJvZC1ndWkuZ2VhbnQubmV0hitodHRw
+						czovL3Rlc3QtYm9kLWd1aS5nZWFudC5uZXQvYXV0b2JhaG4tZ3VpMB0GA1UdDgQW
+						BBQE2RiLCknrDB2uim6zxukDDnVUFzANBgkqhkiG9w0BAQUFAAOCAQEAr2+uchPv
+						0EvCZ0TK19dhDOOTz0zRO1booiUajqPYOifUFaQWrAT5uEZPPO5wtwRARszL0BK7
+						M1oYWK3hxMjP8sAdlaP1nWk9eCK1LzEuquUiGB8V+1PQNi4pOBtobav0wYHfpWvs
+						fWLzAQzeuhVJ9tr7FoSEiIi+JEAriU966HD1LDYmwCJIB0wQrLtUUsBkaLEuq0sU
+						QrmdjxC4IVZG7dHqQgvtdBAMa/CXT0hJpL1NpCDNOlSea+fHGvN5Ztt7EOU1dtmv
+						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">DANTE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dante.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>DANTE IT Support</md:Company>
+    <md:EmailAddress>mailto:DANTEITSupport@dante.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>DANTE IT</md:Company>
+    <md:EmailAddress>mailto:it@dante.net</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
new file mode 100644
index 00000000..bcde7135
--- /dev/null
+++ b/swamid-interfederations-2.0/test-idp.dante.net-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">DANTE (test)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">DANTE 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/16x16-DANTE.jpg</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://test-idp.dante.net/idp/images/80x60-DANTE.jpg</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>
+						MIIDNDCCAhygAwIBAgIVAKY6eNYR8734HaAHYHoKauOUXUzyMA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEnRlc3QtaWRwLmRhbnRlLm5ldDAeFw0xMzExMjgxMTI4
+						MzZaFw0zMzExMjgxMTI4MzZaMB0xGzAZBgNVBAMTEnRlc3QtaWRwLmRhbnRlLm5l
+						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJXUPRo76JDrVWULWsau
+						OjkcA3ETbv8mwcFns9mNBwWMGO/pVBluZrYnnmN2lq91mTEeJiMtk32bS21g1DLn
+						zyyRut9h48dIHfz36vrLI8VEGRxk85B6rhGZQx1m/vqaGLvQW3HUGcss61MHL2sb
+						z5YsXS4cvRz96nklxIKtFgUKqMLfxfmggoTyzfRXymYP0QYREMp9EGQ2pM19ne5O
+						ZPOJ5TQoz6kmRRVST60Hoo32UnD/rMNQfo8rGCBVHyozaL22nWWPK+l9awAxlD14
+						lpqTlapDu022R0VSHB7bP2oWYt29jD59dO2U57dSqImebCow7j9pGKG2zXl+Iq8M
+						mm0CAwEAAaNrMGkwSAYDVR0RBEEwP4ISdGVzdC1pZHAuZGFudGUubmV0hilodHRw
+						czovL3Rlc3QtaWRwLmRhbnRlLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						1mvjMlVsm3wMm3zVqydXM8i+GqUwDQYJKoZIhvcNAQEFBQADggEBAH+imlutE991
+						EiuXfeoLOQ13klBuoujtbswFGNraqLsUdgYhGpcVylNjA6E+ic2XmLmZZOe4IVyR
+						JEs4Owklxx/AN33T+NazKY7tesO/6yWG1yKlhM+YKtBVKPHaWlHF6Yl2ViXNQoET
+						nd59wmct2jnetatdD+nTcK4uoyYD4qi7T1yyi5BglwBgYXkkSMjNAsu/5Rs1Jm2G
+						gm003RY0Hacpz5iBy3ivF5Sn+9751MB1NXOxMKYLw9uf38YlZpaUbTHkhU0CWNbs
+						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>
+						MIIDNDCCAhygAwIBAgIVAKY6eNYR8734HaAHYHoKauOUXUzyMA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEnRlc3QtaWRwLmRhbnRlLm5ldDAeFw0xMzExMjgxMTI4
+						MzZaFw0zMzExMjgxMTI4MzZaMB0xGzAZBgNVBAMTEnRlc3QtaWRwLmRhbnRlLm5l
+						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJXUPRo76JDrVWULWsau
+						OjkcA3ETbv8mwcFns9mNBwWMGO/pVBluZrYnnmN2lq91mTEeJiMtk32bS21g1DLn
+						zyyRut9h48dIHfz36vrLI8VEGRxk85B6rhGZQx1m/vqaGLvQW3HUGcss61MHL2sb
+						z5YsXS4cvRz96nklxIKtFgUKqMLfxfmggoTyzfRXymYP0QYREMp9EGQ2pM19ne5O
+						ZPOJ5TQoz6kmRRVST60Hoo32UnD/rMNQfo8rGCBVHyozaL22nWWPK+l9awAxlD14
+						lpqTlapDu022R0VSHB7bP2oWYt29jD59dO2U57dSqImebCow7j9pGKG2zXl+Iq8M
+						mm0CAwEAAaNrMGkwSAYDVR0RBEEwP4ISdGVzdC1pZHAuZGFudGUubmV0hilodHRw
+						czovL3Rlc3QtaWRwLmRhbnRlLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						1mvjMlVsm3wMm3zVqydXM8i+GqUwDQYJKoZIhvcNAQEFBQADggEBAH+imlutE991
+						EiuXfeoLOQ13klBuoujtbswFGNraqLsUdgYhGpcVylNjA6E+ic2XmLmZZOe4IVyR
+						JEs4Owklxx/AN33T+NazKY7tesO/6yWG1yKlhM+YKtBVKPHaWlHF6Yl2ViXNQoET
+						nd59wmct2jnetatdD+nTcK4uoyYD4qi7T1yyi5BglwBgYXkkSMjNAsu/5Rs1Jm2G
+						gm003RY0Hacpz5iBy3ivF5Sn+9751MB1NXOxMKYLw9uf38YlZpaUbTHkhU0CWNbs
+						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">DANTE (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dante.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>DANTE Support</md:GivenName>
+    <md:EmailAddress>mailto:idp-support@dante.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>DANTE Support</md:GivenName>
+    <md:EmailAddress>mailto:idp-support@dante.net</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
new file mode 100644
index 00000000..a7496d3e
--- /dev/null
+++ b/swamid-interfederations-2.0/test-imagenweb.cambridgeimaging.co.uk-entityid.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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>
+						MIIDezCCAmOgAwIBAgIJAPwwUfeiolEpMA0GCSqGSIb3DQEBBQUAMFQxIjAgBgNV
+						BAoMGUNhbWJyaWRnZSBJbWFnaW5nIFN5c3RlbXMxLjAsBgNVBAMMJXRlc3QtaW1h
+						Z2Vud2ViLmNhbWJyaWRnZWltYWdpbmcuY28udWswHhcNMTMwNDI0MTIwMTI5WhcN
+						MjMwNDIyMTIwMTI5WjBUMSIwIAYDVQQKDBlDYW1icmlkZ2UgSW1hZ2luZyBTeXN0
+						ZW1zMS4wLAYDVQQDDCV0ZXN0LWltYWdlbndlYi5jYW1icmlkZ2VpbWFnaW5nLmNv
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyGcxbphI6UcE+Lwb
+						neJnYCwKqAEYdvKlZa/Z2Az/msA83mRzxJsDH/ocTJXQN60dZ1QE/YLj/IQme4rn
+						qCaFdOJ9pmQjz3NOdBem4HumVCOfc1yGDRWsF8Z0R6MAERVVlGJeYq/EC3sUNShh
+						bsy98TS+6hMHOq0o5+fx7JqwxXAcpH2vIZ0vf3k4J64MUWxratT/ui4ZnRVBDFFK
+						TinB5KBqG/hNED8y0TTxf2tImUta905zuE+Y3TpJhjgsy7MJLjcL95XCURd4/60x
+						d96dSQOBwSYoojdPVnBgG6g17G10w+US2KiFt+6VUSlKgjHqP1BcS8bx3t2V543z
+						gcKXKQIDAQABo1AwTjAdBgNVHQ4EFgQUa5bzetEGjL5bS2it0e/mIMOdch8wHwYD
+						VR0jBBgwFoAUa5bzetEGjL5bS2it0e/mIMOdch8wDAYDVR0TBAUwAwEB/zANBgkq
+						hkiG9w0BAQUFAAOCAQEAR7ab8RqmmkKBFn6NYixN36LeQr0hBcS64r18dCpl/aeb
+						iqdDmeYiwg3dq8ItUMFdJOxazqRfYO/flNg3tHCv3zAzPbdcRIs9Jez+W13RmPjH
+						nY3dtD7KvNgantmLXtoVXSQQhgQywgmEUtqBKDyFQQ490uzWi8Wx9MbGjnhbdcD2
+						D5mHorO8fbHlmkuT14vTZau06/2Hx9dqq3uHL3JHKmhbx6UBCBAQd17Ot425MmlX
+						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>
+						MIIDezCCAmOgAwIBAgIJAPwwUfeiolEpMA0GCSqGSIb3DQEBBQUAMFQxIjAgBgNV
+						BAoMGUNhbWJyaWRnZSBJbWFnaW5nIFN5c3RlbXMxLjAsBgNVBAMMJXRlc3QtaW1h
+						Z2Vud2ViLmNhbWJyaWRnZWltYWdpbmcuY28udWswHhcNMTMwNDI0MTIwMTI5WhcN
+						MjMwNDIyMTIwMTI5WjBUMSIwIAYDVQQKDBlDYW1icmlkZ2UgSW1hZ2luZyBTeXN0
+						ZW1zMS4wLAYDVQQDDCV0ZXN0LWltYWdlbndlYi5jYW1icmlkZ2VpbWFnaW5nLmNv
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyGcxbphI6UcE+Lwb
+						neJnYCwKqAEYdvKlZa/Z2Az/msA83mRzxJsDH/ocTJXQN60dZ1QE/YLj/IQme4rn
+						qCaFdOJ9pmQjz3NOdBem4HumVCOfc1yGDRWsF8Z0R6MAERVVlGJeYq/EC3sUNShh
+						bsy98TS+6hMHOq0o5+fx7JqwxXAcpH2vIZ0vf3k4J64MUWxratT/ui4ZnRVBDFFK
+						TinB5KBqG/hNED8y0TTxf2tImUta905zuE+Y3TpJhjgsy7MJLjcL95XCURd4/60x
+						d96dSQOBwSYoojdPVnBgG6g17G10w+US2KiFt+6VUSlKgjHqP1BcS8bx3t2V543z
+						gcKXKQIDAQABo1AwTjAdBgNVHQ4EFgQUa5bzetEGjL5bS2it0e/mIMOdch8wHwYD
+						VR0jBBgwFoAUa5bzetEGjL5bS2it0e/mIMOdch8wDAYDVR0TBAUwAwEB/zANBgkq
+						hkiG9w0BAQUFAAOCAQEAR7ab8RqmmkKBFn6NYixN36LeQr0hBcS64r18dCpl/aeb
+						iqdDmeYiwg3dq8ItUMFdJOxazqRfYO/flNg3tHCv3zAzPbdcRIs9Jez+W13RmPjH
+						nY3dtD7KvNgantmLXtoVXSQQhgQywgmEUtqBKDyFQQ490uzWi8Wx9MbGjnhbdcD2
+						D5mHorO8fbHlmkuT14vTZau06/2Hx9dqq3uHL3JHKmhbx6UBCBAQd17Ot425MmlX
+						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>
diff --git a/swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml b/swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml
new file mode 100644
index 00000000..048a63f8
--- /dev/null
+++ b/swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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 use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDPjCCAiagAwIBAgIET2caITANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzEfMB0GA1UEAxMWdGVzdC1zZWN1cmUubmF0dXJlLmNvbTAeFw0xMjAzMTkx
+						MTM2MDFaFw0xNTAzMTkxMTM2MDFaMGExCzAJBgNVBAYTAlVLMQ8wDQYDVQQHEwZM
+						b25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoGA1UECxMDTlBHMR8wHQYDVQQD
+						ExZ0ZXN0LXNlY3VyZS5uYXR1cmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEAloYBXDytAMlqZ8QR8WUEylHacH6PxyMHYlwXrNIHGG4XgH9n9cU5
+						3EQO03KWMmCx7ERrLumsMEKHHDf/h5Hh9VP3s8eaQ6bC80I7eAf2nKSK7DQdTnoW
+						j+e86xBduqTiBqm9bc4G5lBtfUpGM9l/oTBXTpjrM6T78bhNfaTARRKS+CCPmh8X
+						VosCN59DbdT0R3QAkcee2gzvAfJRbij2yVty0zlOECmyMilMmIhdvhU6+hNNi9s4
+						/uvuWQ9SNHxNYhhjljHX8iKAd2cPAf1FT6MOBbXZvPpTKxiE0mdOFNo/tAx5vlSA
+						bjVmhTbGFbSLgCwdsP40d5xz3bV5qE427wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+						AQAHQDwA52lJAzlFkV+S6HZ4C2U0KuyE8471M5s1x1Wgm0QKGMuD/ekLJw9wsnln
+						BkElfghY1z/bEpWTHc8O8l3tTGPWTzvSk7ytpgF/L7z4eT1qkaqxayLbvc+TVVnr
+						3cLynjMgfs2h0DBWdCzh/Nb+ErDv3nW6EwUBunIkjkDENvgB9UMdwSZ2em9tKeXi
+						LBM4390C8AC2L/6OtivmKueQt9RNG78rDXp3dmAVNtesGvTY2bL3k7m3FK+oebpT
+						XEuw2IeEFSEmWoJEeZY4twKNYzlqgbv8LuBMo0f+LQ5Lw2JD/nDF1yE5VgYUt3VB
+						W4f1MJLtYPQX+ej4Mx3Q3Udl
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDPjCCAiagAwIBAgIET2caITANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzEfMB0GA1UEAxMWdGVzdC1zZWN1cmUubmF0dXJlLmNvbTAeFw0xMjAzMTkx
+						MTM2MDFaFw0xNTAzMTkxMTM2MDFaMGExCzAJBgNVBAYTAlVLMQ8wDQYDVQQHEwZM
+						b25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoGA1UECxMDTlBHMR8wHQYDVQQD
+						ExZ0ZXN0LXNlY3VyZS5uYXR1cmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEAloYBXDytAMlqZ8QR8WUEylHacH6PxyMHYlwXrNIHGG4XgH9n9cU5
+						3EQO03KWMmCx7ERrLumsMEKHHDf/h5Hh9VP3s8eaQ6bC80I7eAf2nKSK7DQdTnoW
+						j+e86xBduqTiBqm9bc4G5lBtfUpGM9l/oTBXTpjrM6T78bhNfaTARRKS+CCPmh8X
+						VosCN59DbdT0R3QAkcee2gzvAfJRbij2yVty0zlOECmyMilMmIhdvhU6+hNNi9s4
+						/uvuWQ9SNHxNYhhjljHX8iKAd2cPAf1FT6MOBbXZvPpTKxiE0mdOFNo/tAx5vlSA
+						bjVmhTbGFbSLgCwdsP40d5xz3bV5qE427wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+						AQAHQDwA52lJAzlFkV+S6HZ4C2U0KuyE8471M5s1x1Wgm0QKGMuD/ekLJw9wsnln
+						BkElfghY1z/bEpWTHc8O8l3tTGPWTzvSk7ytpgF/L7z4eT1qkaqxayLbvc+TVVnr
+						3cLynjMgfs2h0DBWdCzh/Nb+ErDv3nW6EwUBunIkjkDENvgB9UMdwSZ2em9tKeXi
+						LBM4390C8AC2L/6OtivmKueQt9RNG78rDXp3dmAVNtesGvTY2bL3k7m3FK+oebpT
+						XEuw2IeEFSEmWoJEeZY4twKNYzlqgbv8LuBMo0f+LQ5Lw2JD/nDF1yE5VgYUt3VB
+						W4f1MJLtYPQX+ej4Mx3Q3Udl
+					</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>
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
new file mode 100644
index 00000000..804dcc60
--- /dev/null
+++ b/swamid-interfederations-2.0/test-secure.palgrave-journals.com-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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 use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDVDCCAjygAwIBAgIET2caJjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzEqMCgGA1UEAxMhdGVzdC1zZWN1cmUucGFsZ3JhdmUtam91cm5hbHMuY29t
+						MB4XDTEyMDMxOTExMzYwNloXDTE1MDMxOTExMzYwNlowbDELMAkGA1UEBhMCVUsx
+						DzANBgNVBAcTBkxvbmRvbjESMBAGA1UEChMJTWFjbWlsbGFuMQwwCgYDVQQLEwNO
+						UEcxKjAoBgNVBAMTIXRlc3Qtc2VjdXJlLnBhbGdyYXZlLWpvdXJuYWxzLmNvbTCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIoNcsvMozRfV8S+0W7sqKB4
+						pbUQyP7zd8IM/i7lx09v11z4QnprdGr0165v+FG3QLK7dzvHPzJin2O+/KEI00lK
+						Rm6iRtopGkL4uaz1lzNqm+UODmmxVIy7bjEmw59CrtQ2+WMymwevbWQZfIo/55wH
+						b65USn/bBkhafv3FuXwAPq06IuufhbirJk7jW6eI+Ef5JF4nu0DZTdFdD/znK2ih
+						PLsm+V1hYvKlMrAu+KdjGSv+McSF0GxB4OCLy0SS1aYYQgDv/TYWn8MMMwHQ3Dqr
+						ZuGIabuJ0OiUxv8DNAov7hiJIzCiYXprgX4fBhmRAtibMO3aI9klofqSjmAqbI0C
+						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAP4JcAlIwxtT9nwqdnOjKuGDHpknrPAGF
+						VssPB4cuHmlV/qQTm1rGVfI6SAM41BfG+rg+JsE84PCTWHWAkSH7UopMm417/A7l
+						pagQEKOKB+JTz1fvSF9wXk8nrBuacfTe33mD0NaDrFa+wYCbK6M0cd79qMDKb7zu
+						8RExGNUJmAeFNmMhql737DLZDE37OcdKWJuYqUkKpvi7dtx1MHjATDhzqW8W92tW
+						syCWJ1maeLAWLEij76i6KiU1vAec6ttH1qxyAjOV3Hz1K9mk5JhNPZQVJJnBJI5a
+						TrTDTgRHovF4QucVMSlNDSdtnG2InN8inOr8IvTx740AHKPlPd26xw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDVDCCAjygAwIBAgIET2caJjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzEqMCgGA1UEAxMhdGVzdC1zZWN1cmUucGFsZ3JhdmUtam91cm5hbHMuY29t
+						MB4XDTEyMDMxOTExMzYwNloXDTE1MDMxOTExMzYwNlowbDELMAkGA1UEBhMCVUsx
+						DzANBgNVBAcTBkxvbmRvbjESMBAGA1UEChMJTWFjbWlsbGFuMQwwCgYDVQQLEwNO
+						UEcxKjAoBgNVBAMTIXRlc3Qtc2VjdXJlLnBhbGdyYXZlLWpvdXJuYWxzLmNvbTCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIoNcsvMozRfV8S+0W7sqKB4
+						pbUQyP7zd8IM/i7lx09v11z4QnprdGr0165v+FG3QLK7dzvHPzJin2O+/KEI00lK
+						Rm6iRtopGkL4uaz1lzNqm+UODmmxVIy7bjEmw59CrtQ2+WMymwevbWQZfIo/55wH
+						b65USn/bBkhafv3FuXwAPq06IuufhbirJk7jW6eI+Ef5JF4nu0DZTdFdD/znK2ih
+						PLsm+V1hYvKlMrAu+KdjGSv+McSF0GxB4OCLy0SS1aYYQgDv/TYWn8MMMwHQ3Dqr
+						ZuGIabuJ0OiUxv8DNAov7hiJIzCiYXprgX4fBhmRAtibMO3aI9klofqSjmAqbI0C
+						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAP4JcAlIwxtT9nwqdnOjKuGDHpknrPAGF
+						VssPB4cuHmlV/qQTm1rGVfI6SAM41BfG+rg+JsE84PCTWHWAkSH7UopMm417/A7l
+						pagQEKOKB+JTz1fvSF9wXk8nrBuacfTe33mD0NaDrFa+wYCbK6M0cd79qMDKb7zu
+						8RExGNUJmAeFNmMhql737DLZDE37OcdKWJuYqUkKpvi7dtx1MHjATDhzqW8W92tW
+						syCWJ1maeLAWLEij76i6KiU1vAec6ttH1qxyAjOV3Hz1K9mk5JhNPZQVJJnBJI5a
+						TrTDTgRHovF4QucVMSlNDSdtnG2InN8inOr8IvTx740AHKPlPd26xw==
+					</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>
diff --git a/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml
new file mode 100644
index 00000000..1ffcb7a0
--- /dev/null
+++ b/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+						MIIDUDCCAjigAwIBAgIEUiiGYTANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJV
+						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+						A05QRzEoMCYGA1UEAxMfdGVzdC1zZWN1cmUucGFsZ3JhdmVjb25uZWN0LmNvbTAe
+						Fw0xMzA5MDUxMzI1NTNaFw0yMzA5MDMxMzI1NTNaMGoxCzAJBgNVBAYTAlVLMQ8w
+						DQYDVQQHEwZMb25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoGA1UECxMDTlBH
+						MSgwJgYDVQQDEx90ZXN0LXNlY3VyZS5wYWxncmF2ZWNvbm5lY3QuY29tMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsUYvYU275ISzg9fuYD4q550xgkOF
+						zpY/9rRNc+fFM0EsAWU8REv+lombeK4PQzRcK654Xyd6+WhCd5JViFJIZK+/E3KZ
+						jEghitSkY+sicWsjzA/L5v1QyX60s7HBvsYoNCLezbrjeFIN35qol/FgQJsEc/vr
+						2/dLDYkC/bDIC6O29mZEIt1lyrBXGUe8Dc1MshUNvkiw8vBHVCMJBxuDpB4aeHzS
+						5AvsQPkHAhB93cG7su1evDLZnsael3xD/58qbDFQqfsyKR1ScJxqsTcYU10UTA8m
+						zGC+1c7748O5j+NnbzoGH1ceRxF/xkAjGnnk3doTUvdTivxYdtP4PB9O5QIDAQAB
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBEzosiuF1PrqV9xnxsggY6+kLgGRYlYNDabyYa
+						6sqmH6VZK/xyDNiclAFq6zwodf+JQ937hbKJ92kef8HicvwdtZUugSVVp8200qRW
+						Pb2zeasxzMr/qDJi+aXD2MQ9o7Ek+EOIi3jHzsjSEvsfhZhhFgFumGfmxHfP8UGe
+						X4wqxqTD1XCB74snLGfBWiA8HTBSFWu2I6TcLOaB/h22q53Fb0kWGbKGxnQsIHxx
+						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>Mohammad</md:GivenName>
+    <md:SurName>Nawab</md:SurName>
+    <md:EmailAddress>mailto:m.nawab@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>Mohammad</md:GivenName>
+    <md:SurName>Nawab</md:SurName>
+    <md:EmailAddress>mailto:m.nawab@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
new file mode 100644
index 00000000..6661ba20
--- /dev/null
+++ b/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml
@@ -0,0 +1,104 @@
+<?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>
+      <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="en">eduID.at Demo Service</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="de">eduID.at Demo Service</mdui:DisplayName>
+        <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: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:InformationURL xml:lang="en">https://wiki.univie.ac.at/display/federation/SAML+Test+SP</mdui:InformationURL>
+        <mdui:Logo width="234" height="60">https://www.aco.net/fileadmin/aconet/Logos/Banner/234x60.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
+BAMTD3Rlc3Qtc3AuYWNvLm5ldDAeFw0wODA3MDkxMTQ1NTVaFw0xODA3MDcxMTQ1
+NTVaMBoxGDAWBgNVBAMTD3Rlc3Qtc3AuYWNvLm5ldDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALZXEDbiffZnDnsWcJlVUBlaAyEycf+0Bjg/DjsQAz4l
+vG9poVFKlPjaQCQCyk56PXhN0ZuZZJEylHHfMrJvfM6bpylY/a+KFyeNi28acrlg
+u+BRx7uXg+wac0mfp9Z9nj93qQBP4iC7Lbv9AUDrHvp6ig/MF8P8sEb3VZRwwJDc
+x2fLuro/TueYcT0Xw3Y70vkjaAbkugjNE2pU3OL7TxgXx+qzsOmoPiWI61VgpSkm
+pmxsN1bjiKJs1sqQ/K3pQ9mcR6Mb5STShcpKf6ZqmuUD53oPeWyB03vmi0AzCXeU
+uGftaM2iWwhaxLApEE6cgxctR2lc91sQtoCo0B1FIMkCAwEAAaNhMF8wPgYDVR0R
+BDcwNYIPdGVzdC1zcC5hY28ubmV0hiJodHRwczovL3Rlc3Qtc3AuYWNvLm5ldC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTyPUKdsFFI3eqmI9OQsgaDw6e8fjANBgkqhkiG
+9w0BAQUFAAOCAQEAeD0OZAEjUr2RJFCbW820q0iG49x0jvL3lSvbYKaUY+4zthXj
+394fALks0blb7XceA857NfIXHn2NI9ZrHllmpTjc6IeD332c6NW8AevYjU+mwGuM
+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: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: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="en">eduID.at Demo Service</md:ServiceName>
+      <md:ServiceName xml:lang="de">eduID.at Demo Service</md:ServiceName>
+      <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: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: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
new file mode 100644
index 00000000..9bf7a4c6
--- /dev/null
+++ b/swamid-interfederations-2.0/test-sp.ihs.com-entity.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-sp.ihs.com/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-19T16:18:25Z"/>
+  </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>
+						MIIDkTCCAnmgAwIBAgIJAI/FzT/AtE6SMA0GCSqGSIb3DQEBBQUAMDkxHTAbBgNV
+						BAoTFElIUyAoR2xvYmFsKSBMaW1pdGVkMRgwFgYDVQQDEw90ZXN0LXNwLmlocy5j
+						b20wHhcNMTIwMjE0MTQwODIzWhcNMjIwMjExMTQwODIzWjA5MR0wGwYDVQQKExRJ
+						SFMgKEdsb2JhbCkgTGltaXRlZDEYMBYGA1UEAxMPdGVzdC1zcC5paHMuY29tMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzcYNFcLi6oG5dHQ8JyqBaInQ
+						IsTC/RBGuHC8JUV0mQpFmhkX+5DdSjJaMddC3s9C0e8Q8+e75ZHAHH6TleT43E2V
+						RKDzT+QcFRSC4GDK1QBBWZmx4yU4emkoS3w+w+2Nb59TzlJLe2oxuqi3IJMlY1Ca
+						xjUnDEaJUTmk6yH3mBaGzP5P2bieAxoTaAu4Vmhhv8WalygHHTpPLH35D24ZvSPP
+						xbiHZwuah0oLOqFAkn9BwuHpp+X0tuQop4kOsLRnqjU7xth5RfsYl2IQuDsVu53s
+						0OVCEKbeLJXfI4z8B0/JUOdhRJ8NuYmlgnJNcfvEOc1p850MsQJ7J2BF6sM5QwID
+						AQABo4GbMIGYMB0GA1UdDgQWBBQ1hQ87e3QQHSQ9rTxi1Ikxmi+2ajBpBgNVHSME
+						YjBggBQ1hQ87e3QQHSQ9rTxi1Ikxmi+2aqE9pDswOTEdMBsGA1UEChMUSUhTIChH
+						bG9iYWwpIExpbWl0ZWQxGDAWBgNVBAMTD3Rlc3Qtc3AuaWhzLmNvbYIJAI/FzT/A
+						tE6SMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEybme1qA8c3j8CU
+						qLPc0bzp9k2X/xrDiOyBYd8eaQQIl8gZClTEFBre70PlwS3lQ+wDglSBYgOFO4Yp
+						5suPytT4CtatfGdutpOrhfPWIqvVInWCaeimGgbJ9DTLNYQxkrrhEODSM6t8NPHt
+						MD1G891QR+db+Y6hZYB7V/dviyyk74Tvlcw/xbo3B7SSqf+UgOT06E+bc2MvJyd0
+						9DZMBu4+qCS2+AjLPMVy/91fOpYLXRj3bgmfFQ/xg+RyrskuvZWNpMyAs0l/dqQi
+						4vfhoPrEVAqpuKaLzsDPicTPyXWcwlOOk2p8JeMF7NB6q6e79yzwXJxgMzMiK5D6
+						IxPviws=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDkTCCAnmgAwIBAgIJAI/FzT/AtE6SMA0GCSqGSIb3DQEBBQUAMDkxHTAbBgNV
+						BAoTFElIUyAoR2xvYmFsKSBMaW1pdGVkMRgwFgYDVQQDEw90ZXN0LXNwLmlocy5j
+						b20wHhcNMTIwMjE0MTQwODIzWhcNMjIwMjExMTQwODIzWjA5MR0wGwYDVQQKExRJ
+						SFMgKEdsb2JhbCkgTGltaXRlZDEYMBYGA1UEAxMPdGVzdC1zcC5paHMuY29tMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzcYNFcLi6oG5dHQ8JyqBaInQ
+						IsTC/RBGuHC8JUV0mQpFmhkX+5DdSjJaMddC3s9C0e8Q8+e75ZHAHH6TleT43E2V
+						RKDzT+QcFRSC4GDK1QBBWZmx4yU4emkoS3w+w+2Nb59TzlJLe2oxuqi3IJMlY1Ca
+						xjUnDEaJUTmk6yH3mBaGzP5P2bieAxoTaAu4Vmhhv8WalygHHTpPLH35D24ZvSPP
+						xbiHZwuah0oLOqFAkn9BwuHpp+X0tuQop4kOsLRnqjU7xth5RfsYl2IQuDsVu53s
+						0OVCEKbeLJXfI4z8B0/JUOdhRJ8NuYmlgnJNcfvEOc1p850MsQJ7J2BF6sM5QwID
+						AQABo4GbMIGYMB0GA1UdDgQWBBQ1hQ87e3QQHSQ9rTxi1Ikxmi+2ajBpBgNVHSME
+						YjBggBQ1hQ87e3QQHSQ9rTxi1Ikxmi+2aqE9pDswOTEdMBsGA1UEChMUSUhTIChH
+						bG9iYWwpIExpbWl0ZWQxGDAWBgNVBAMTD3Rlc3Qtc3AuaWhzLmNvbYIJAI/FzT/A
+						tE6SMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEybme1qA8c3j8CU
+						qLPc0bzp9k2X/xrDiOyBYd8eaQQIl8gZClTEFBre70PlwS3lQ+wDglSBYgOFO4Yp
+						5suPytT4CtatfGdutpOrhfPWIqvVInWCaeimGgbJ9DTLNYQxkrrhEODSM6t8NPHt
+						MD1G891QR+db+Y6hZYB7V/dviyyk74Tvlcw/xbo3B7SSqf+UgOT06E+bc2MvJyd0
+						9DZMBu4+qCS2+AjLPMVy/91fOpYLXRj3bgmfFQ/xg+RyrskuvZWNpMyAs0l/dqQi
+						4vfhoPrEVAqpuKaLzsDPicTPyXWcwlOOk2p8JeMF7NB6q6e79yzwXJxgMzMiK5D6
+						IxPviws=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-sp.ihs.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-sp.ihs.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-sp.ihs.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-sp.ihs.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IHS (Global) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IHS (Global) Limited (Test)</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.abertay.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..e63370bb
--- /dev/null
+++ b/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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.abertay.unidesk.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-12T12:54: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC/TCCAeWgAwIBAgIJAKOQZJ9XeRRZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnRlc3QudW5pZGVzay5hYy51azAeFw0xMjAzMjIxNjUwMTdaFw0yMjAzMjAx
+						NjUwMTdaMB0xGzAZBgNVBAMTEnRlc3QudW5pZGVzay5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAPweFLYNELDowDm8YWp8G8RKR0q+ufgUN7H7
+						h7RTesgxlO9T8wXLT1e4s1ruCVrYtkt8q3K+iXukZ+J5QD4lMtvWHfbpKJNddygG
+						RkURpJQ7bY1rTdWA6jNi16TR+8M2ECIf4Q6CVukHHrX9PuZM+b7Ktg2gf3fmy7vQ
+						MQ2/2Rp8/LKGKotVAoRYrNc8y3Y2PR9omsidxNGyyXxfD2OyTobuk1Ezb7Fk4Oq+
+						4VmetrJ5CwFOwTBmFUgfaazuooEvGM7tA/jjRGDY5H+4oyVDK63Ktf59pwGln6Bo
+						JyBfJIWYK/5w3psQJZCFyNgJ4WQSgxbAiORGQPZLfKxsvAaGD2UCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISdGVzdC51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBRxsmQCxZXe
+						bZvQMvehqWxt1yHYijANBgkqhkiG9w0BAQUFAAOCAQEAtOWghRw2KKVvYbX0sQEX
+						VDYPpi4Q1q6b1vl/MK0WU+zWjOmuljIIw377NOuH+A8zwJF2maelKlEHFmlMg8nl
+						a8MPTIQIhgJ3baXwfy5jvEIQrK++0LwaFiBdwg0dM3er6pyODVypn6oNpKY9gcFA
+						xCl05pTEBIWPAxFNcvYj/liPrDC8RcEBpnEiGZcJgvPGCulXV3O9FCRkoyTaVoUB
+						e42UmPVs7zqOGsBy6ZcHRGoD53VWtkvax8iBGBobK0fGICh6vyX7Qb6Me3r/7S1h
+						6WUcF/Nm7P5V6V2an8MJPYyIVNn6QorTplFsBhK4/Wr+Xb4JIurIwCWDqbVIYo1j
+						TA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.abertay.unidesk.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">the University of Edinburgh: Unidesk - University of Abertay (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:IS.Helpdesk@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/test.collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/test.collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..72d515da
--- /dev/null
+++ b/swamid-interfederations-2.0/test.collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,84 @@
+<?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>
+      <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>
+						MIIDGDCCAgCgAwIBAgIJANfNVj1DnlqLMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG2xhYy1yZXBvLXRlc3QxMS5pcy5lZC5hYy51azAeFw0xNDA3MDcwOTE1NTha
+						Fw0yNDA3MDQwOTE1NThaMCYxJDAiBgNVBAMTG2xhYy1yZXBvLXRlc3QxMS5pcy5l
+						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfz6S/b9yYq
+						Q/6HeUwaCKwKAJIUuTHj08JTHUWG+75rGMlyqkewe0UZOH9bpa+nNQB5vB8vJCYr
+						NDwJzWouBRzei3S54Jg5m3VYo+8iIhR6RxjpgI4tLi5KMt1KKiZxz30bdeC0Qm5m
+						k/7/Hzh4H0ipKsfTZpDLA5RjkFrX8YtYQlybcTp/HF6TkEoHtAuMlhctusu+6IbF
+						iYqC4cuZdBR+8AkkhZp2R8sLeNFnEtmbm3m9cGzAGhWwWKSxw3VAidLc196KlAgY
+						Y7OAstjjvTdnLifVmmTDPpyqNN2Grp6KY1CY8grw7HhyFrELgiDedO06lJ2RR9FA
+						ZkkAc8V1ty8CAwEAAaNJMEcwJgYDVR0RBB8wHYIbbGFjLXJlcG8tdGVzdDExLmlz
+						LmVkLmFjLnVrMB0GA1UdDgQWBBQpo+/VuRtYu86j3rJaR52JzNwJIDANBgkqhkiG
+						9w0BAQUFAAOCAQEAkEI1AVUowgMd+6N75DXgFvRCaHmzuQ2dUjA8d5WkCxa908W5
+						73P3ByJE/gIM0F868bmKjp1qmoNvDnTE7BjQaxwpBwO5EY8Ae1tYyZmVD+tDxcHI
+						1ydgtONpYW8dR565/96MAlaZTRhi0fJZkkMkTAiyDv5KwsfmXHvfw0JFeOugobuK
+						3QHRD2XfDvsOwuxQbGkkN+NSd4+UZqcnp9hgtWtJHWKOnqyNinhpCNosRVO+CpU4
+						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>
diff --git a/swamid-interfederations-2.0/test.ed.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.ed.unidesk.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..4e0fb665
--- /dev/null
+++ b/swamid-interfederations-2.0/test.ed.unidesk.ac.uk-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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.ed.unidesk.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-02T15: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ed.unidesk.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>
+						MIIC/TCCAeWgAwIBAgIJAKOQZJ9XeRRZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnRlc3QudW5pZGVzay5hYy51azAeFw0xMjAzMjIxNjUwMTdaFw0yMjAzMjAx
+						NjUwMTdaMB0xGzAZBgNVBAMTEnRlc3QudW5pZGVzay5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAPweFLYNELDowDm8YWp8G8RKR0q+ufgUN7H7
+						h7RTesgxlO9T8wXLT1e4s1ruCVrYtkt8q3K+iXukZ+J5QD4lMtvWHfbpKJNddygG
+						RkURpJQ7bY1rTdWA6jNi16TR+8M2ECIf4Q6CVukHHrX9PuZM+b7Ktg2gf3fmy7vQ
+						MQ2/2Rp8/LKGKotVAoRYrNc8y3Y2PR9omsidxNGyyXxfD2OyTobuk1Ezb7Fk4Oq+
+						4VmetrJ5CwFOwTBmFUgfaazuooEvGM7tA/jjRGDY5H+4oyVDK63Ktf59pwGln6Bo
+						JyBfJIWYK/5w3psQJZCFyNgJ4WQSgxbAiORGQPZLfKxsvAaGD2UCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISdGVzdC51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBRxsmQCxZXe
+						bZvQMvehqWxt1yHYijANBgkqhkiG9w0BAQUFAAOCAQEAtOWghRw2KKVvYbX0sQEX
+						VDYPpi4Q1q6b1vl/MK0WU+zWjOmuljIIw377NOuH+A8zwJF2maelKlEHFmlMg8nl
+						a8MPTIQIhgJ3baXwfy5jvEIQrK++0LwaFiBdwg0dM3er6pyODVypn6oNpKY9gcFA
+						xCl05pTEBIWPAxFNcvYj/liPrDC8RcEBpnEiGZcJgvPGCulXV3O9FCRkoyTaVoUB
+						e42UmPVs7zqOGsBy6ZcHRGoD53VWtkvax8iBGBobK0fGICh6vyX7Qb6Me3r/7S1h
+						6WUcF/Nm7P5V6V2an8MJPYyIVNn6QorTplFsBhK4/Wr+Xb4JIurIwCWDqbVIYo1j
+						TA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ed.unidesk.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: Unidesk (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:IS.Helpdesk@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/test.federation.renater.fr-validation-ressource.xml b/swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml
new file mode 100644
index 00000000..206480ae
--- /dev/null
+++ b/swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml
@@ -0,0 +1,145 @@
+<?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>
+  </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: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>
+					      MIIDADCCAeigAwIBAgIJAJo2eFCDBL32MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2ZlZHRvb2xzLnJlbmF0ZXIuZnIwHhcNMTMwNTEzMTQ0MDI5WhcNMjMwNTEx
+MTQ0MDI5WjAeMRwwGgYDVQQDExNmZWR0b29scy5yZW5hdGVyLmZyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLeEy6JlbrAPEwxBrnvwcx2fN5WtZ9Eq
+lZHBgQFocnfxEtHpf7KGSll+LNu3AgqF10Ymljoa1+Gn6E2SbsmKFmXzOs31aB5t
+eu79nAGci1abkuius628KO33o4Cjc3rJ/M7Rk7Px4t9kH7R01bXn3z3UGTvmPNyo
+mfa8LAX8epaD4haoar3ymF0hFHFB57d2HzWC/2HW/OT0Y5CO7T+dJd3TxI/soiK1
+pdw75LYAOdW6MT+ozrw3vY53B4um7jBZK2OhsrKIjrG2e4s0CzWFPs7jCUGnuvaY
+21nAd/kR666LjvmJcoVq/vErOSKksvMS9SxiuKpxjQNkj9lB9klqvQIDAQABo0Ew
+PzAeBgNVHREEFzAVghNmZWR0b29scy5yZW5hdGVyLmZyMB0GA1UdDgQWBBSglPv7
+4KwzHQSzBtZphKPBskiQ5TANBgkqhkiG9w0BAQUFAAOCAQEArYVUgbOsV3U+/Xb/
+NPPYIYdej09vWmdwOQjCjJc/DHiEkDPHQ4R/zbTEXPcW+t0CpYET2t/5MskmKNU7
+vgkZLdw9GrRbXuJarzZZ1ZSdMDNKvMjgujOJfcgQ6KnbSi/KLniU7hagAsvzQkYQ
+CXZqh5Jo6zGSJZIPTx3EpRuT82WFoFpcoccWeTSsda/A5nTQnq/1SpwBnfGz+xtE
+alqV781u8dMtyty6cbwPSg3sYisSoXQRdl+4b7U3vGXQvbHM6PNEAljhkeX0+1Tk
+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>
+					      MIIDADCCAeigAwIBAgIJAJo2eFCDBL32MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2ZlZHRvb2xzLnJlbmF0ZXIuZnIwHhcNMTMwNTEzMTQ0MDI5WhcNMjMwNTEx
+MTQ0MDI5WjAeMRwwGgYDVQQDExNmZWR0b29scy5yZW5hdGVyLmZyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLeEy6JlbrAPEwxBrnvwcx2fN5WtZ9Eq
+lZHBgQFocnfxEtHpf7KGSll+LNu3AgqF10Ymljoa1+Gn6E2SbsmKFmXzOs31aB5t
+eu79nAGci1abkuius628KO33o4Cjc3rJ/M7Rk7Px4t9kH7R01bXn3z3UGTvmPNyo
+mfa8LAX8epaD4haoar3ymF0hFHFB57d2HzWC/2HW/OT0Y5CO7T+dJd3TxI/soiK1
+pdw75LYAOdW6MT+ozrw3vY53B4um7jBZK2OhsrKIjrG2e4s0CzWFPs7jCUGnuvaY
+21nAd/kR666LjvmJcoVq/vErOSKksvMS9SxiuKpxjQNkj9lB9klqvQIDAQABo0Ew
+PzAeBgNVHREEFzAVghNmZWR0b29scy5yZW5hdGVyLmZyMB0GA1UdDgQWBBSglPv7
+4KwzHQSzBtZphKPBskiQ5TANBgkqhkiG9w0BAQUFAAOCAQEArYVUgbOsV3U+/Xb/
+NPPYIYdej09vWmdwOQjCjJc/DHiEkDPHQ4R/zbTEXPcW+t0CpYET2t/5MskmKNU7
+vgkZLdw9GrRbXuJarzZZ1ZSdMDNKvMjgujOJfcgQ6KnbSi/KLniU7hagAsvzQkYQ
+CXZqh5Jo6zGSJZIPTx3EpRuT82WFoFpcoccWeTSsda/A5nTQnq/1SpwBnfGz+xtE
+alqV781u8dMtyty6cbwPSg3sYisSoXQRdl+4b7U3vGXQvbHM6PNEAljhkeX0+1Tk
+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.
+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="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="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="o" Name="urn:oid:2.5.4.10" 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="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="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="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="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="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="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="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="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="ou" Name="urn:oid:2.5.4.11" 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="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="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="cn" Name="urn:oid:2.5.4.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="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="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="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="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="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="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="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="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="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" 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="l" Name="urn:oid:2.5.4.7" 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="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="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="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="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="sn" Name="urn:oid:2.5.4.4" 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="title" Name="urn:oid:2.5.4.12" 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="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="givenName" Name="urn:oid:2.5.4.42" 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="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="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="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="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="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="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="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="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="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="postalAddress" Name="urn:oid:2.5.4.16" 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="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="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="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="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="en">RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">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/test.ingentaconnect.com-shibboleth.xml b/swamid-interfederations-2.0/test.ingentaconnect.com-shibboleth.xml
new file mode 100644
index 00000000..56983b22
--- /dev/null
+++ b/swamid-interfederations-2.0/test.ingentaconnect.com-shibboleth.xml
@@ -0,0 +1,51 @@
+<?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>
+						MIIDcDCCAligAwIBAgIES2K84DANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJH
+						QjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEiMCAGA1UE
+						ChMZUHVibGlzaGluZyBUZWNobm9sb2d5IHBsYzEgMB4GA1UEAxMXdGVzdC5pbmdl
+						bnRhY29ubmVjdC5jb20wHhcNMTAwMTI5MTA0ODAwWhcNMjAwMTI3MTA0ODAwWjB6
+						MQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94
+						Zm9yZDEiMCAGA1UEChMZUHVibGlzaGluZyBUZWNobm9sb2d5IHBsYzEgMB4GA1UE
+						AxMXdGVzdC5pbmdlbnRhY29ubmVjdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+						DwAwggEKAoIBAQCJGOOYmYbgByL6RCx5qFriIOXcCdaGAi8Ersd+s/+q37OmoUIl
+						RLjxdngTuaDNzy7s7ZHaRqMsTBNgugYAwD0Re6lLMwvGRyqPAaeaoOWU/wawMRme
+						7G/H1v1fpD0WBr5s+qG+HmIkXBopoyR7KUwCFMBjEdSMiZJgaH+4gA6EnwQbyJ4Y
+						eTqWeCFu/+AS4xeoC2/PHXQD2gVTNsQovzrtDB2QHgQEiwZEZa3bviFo/Mn/JIq/
+						qQUXqY97a4ZCm0hRV8Q2Da86dFwLXNNAWCRIuiyZxP36lY56HMNeu+3O5+L1Taxv
+						hlHkiKu2l5Yh64dqIJl5cPQ9zaFtC8xcPr1HAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+						ggEBAGjyg0atXi4McUNX1JeZHTU1bZ+HF3NNIlYrJshrJOJ2Z+gOvDi1ub64SVpn
+						MqE5P6CU5+1x2Da4GD/k9Jj8zSQgWJWOrxowm9fGncjTqLQQDZByO6sGPsxXkqcT
+						yd+Xtva8bj9MRQVxbXZwqAmDJArs5KV/9hAkxZ8xv3ig7I/fttqECFiYFsskqTNy
+						22xpp/DkKhL/dg+HlyNFoWQ83ls2kJGLQEA0PVllTNNPEIOGmmCoNjf65pACg9pq
+						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">Publishing Technology 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>Dave</md:GivenName>
+    <md:SurName>Lord</md:SurName>
+    <md:EmailAddress>mailto:Dave.Lord@publishingtechnology.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
new file mode 100644
index 00000000..404debff
--- /dev/null
+++ b/swamid-interfederations-2.0/test.myplace.strath.ac.uk-shibboleth.xml
@@ -0,0 +1,85 @@
+<?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>
+      <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>
+						MIIC6zCCAdOgAwIBAgIJAO7nQtYFnLcLMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+						BAMTDG1vby10ZXN0LXdlYjAeFw0xNDA2MjUxNDMxMzhaFw0yNDA2MjIxNDMxMzha
+						MBcxFTATBgNVBAMTDG1vby10ZXN0LXdlYjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBANJssMJIvaAfEEk5XRDsOtquZ0z6hN61EalbRPyGDs7+YKu6jUJz
+						Yj8Hzxyu3y0Y3TRmacHK6o7kWDas2yqSFKX7nllEiEmNtpdKL5XrkFDhpI63DJ/5
+						v79V8z1rLV0dNJNmWiI70oPI80U4sTn0esgOCPArrb2vJXUwGiOHeyORBM05NN70
+						EHDDVChkfr59QYkGuftsF5nk8oeHS/znPurVyab0q6AF5on5KO2c2uApmOGIqElI
+						Cka55N9J7FRcVKTR6vzNx9HxV8Py+cJuuIaW3ARQQwSmBqnNu4zLzZva3izSkVm1
+						ky55z5IuP5k+xb/njyKl0e98Lq0RrESTXmUCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+						bW9vLXRlc3Qtd2ViMB0GA1UdDgQWBBTnSEhfktDUO6pGBtFLZOOXE7YFWDANBgkq
+						hkiG9w0BAQUFAAOCAQEAj2dOUifWSmIwqMwGkxdFXdJUv5IXu7bzWVsD+6mImbj9
+						31jazfu+RN4ipskDI/gQ6Rkn+0TYPKEBu3ZlB6V1HZjK+w7cQxjIHyoYMH9nQXzh
+						cCp3r98w8pKMyZZqvrX/jLbHPr7F2urvxsPjltk1TMTYWxBnePqrqPCp8o81kxbF
+						L4qsDwiUVrTqCoFoxja2IATYBQQHt5k77lAmNTinKsdpNkOv8CjRc5ZqNJXj1VvM
+						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>
diff --git a/swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml b/swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml
new file mode 100644
index 00000000..30a83234
--- /dev/null
+++ b/swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+						MIIDnDCCAoSgAwIBAgIEU2tkWDANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
+						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
+						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTE0MDUwODEx
+						MDI0OFoXDTI0MDUwNTExMDI0OFowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
+						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
+						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
+						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAJcWVXPMtm502GM5AzoGvXR4OtPIMaGYwDkw1LMpKfCuQoT8NCoX9V7t
+						egvVdrnXqwCyEvMmjHm2qWbBAh56DLWayL8wzDzOzdX9b0yTZ6von1iNEP8S91Of
+						hEv12yMdX3k2chcP3PUrGVt1jX+/HpyPJm5KdhJAgdtFwFbCxTfzx9SXgllft7x6
+						3Y+WVOnrQKLI+wr8qGwd6aCcP0vlFQGHftVf0qxGb6sTclX70CH+S8QapoHM8awf
+						TtTHEE/QdEIv7Hqk3hbP4irB0P6Ut8ZRLo92Ud9uW7+ua0AaLDzJuFgC4WeeMDnq
+						G/QL6Ezbp1Zf/i4wubi/j3r1YQbqjZ0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						FUSajzGeOC5KjjAWxsvkXxpM9t4K7GmXSb+B43gTyl6XmGd+K0QRFe1GveK7IGzZ
+						jpw72Q+x4E4VkuihkK7SUqe5ASTe80Wmpg62Ovf5ljf2+tyg1OpNJvKKtL19SB2N
+						gcmY0xXo6Q9zy/3QoYqKmSaV49V2FVzndzvWM2x7Th0oMhpHUpG706IHxnuoY8jm
+						mD2LPea0pWih1hxznLrsXVTZAzjyh5uIIiMQPj8siApUltyKQ2A259GRB6sta0Ui
+						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">Publishing Technology 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@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Babu</md:GivenName>
+    <md:SurName>Panneerselvam</md:SurName>
+    <md:EmailAddress>mailto:babu.panneerselvam@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Talvinder</md:GivenName>
+    <md:SurName>Matharu</md:SurName>
+    <md:EmailAddress>mailto:Talvinder.matharu@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml b/swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml
new file mode 100644
index 00000000..fae01778
--- /dev/null
+++ b/swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.openathens.net/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-02-21T14:53:36Z"/>
+  </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">test.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>
+						MIIDQjCCAiqgAwIBAgIIZvpg5YE3/HUwDQYJKoZIhvcNAQEFBQAwODEQMA4GA1UE
+						CgwHRWR1c2VydjEkMCIGA1UEAwwbcnVudGltZS50ZXN0Lm9wZW5hdGhlbnMubmV0
+						MB4XDTEyMTAxNTE0NDkwNloXDTIyMTAxNTE0NDkwNlowODEQMA4GA1UECgwHRWR1
+						c2VydjEkMCIGA1UEAwwbcnVudGltZS50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmxojj/t4L6T+Ckuu+G30Ces7IbT
+						5YnxmR9BePF3I3f5hEBMQp/ERea6AVZPlawdgilHV64giVRnE22zIQQtnjkJX84Z
+						7L9J4ODUbF+0YVwDzqgEdxjHfa96850YMf8MPoe4oJKJ7J4yCzfbwiVXGGWtqKQ4
+						idh+lBQK8MGwB7yOy8QwlnxeEoSMkX01I6spOiv7r+KrACopZkYc6WGCAg30/hv8
+						7SPQcxPNAbQDZVjpF2tnHwsY5nz9fLtZCBEmsF0zlEZ+RuxnfOLzk0pXDEwhkA5k
+						QPS6cYKH6IQeNZBX4bzUpxhrZ53Y4ZhDOgXiT7nSxsEOZlxv1Stu5c6FXQIDAQAB
+						o1AwTjAdBgNVHQ4EFgQUhiBEqrb5Qs7q+Rit3aIR+NJuI0swHwYDVR0jBBgwFoAU
+						hiBEqrb5Qs7q+Rit3aIR+NJuI0swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
+						AAOCAQEAEWtFo02LGecwaaFhx5rLS8q5+Cn06DDYFDuW6L2xpMV2EUBbyFY9sq+/
+						nssFZg1j9s4sm2NHNLkgns+bmAxhW1YSRKPy/D58dUBuGMKdftS1uVvMEeLh+y/5
+						g8e23YE2Rfy6PdQ+YytUyG1VhhEo5hU6LZWqAUR0OdsGAs/qWXhth+dgLkpumSqy
+						4zWQHLrUlweaQx3pDw73Xc8PeCPtMU+AbXL2vvRXQSizD4NtZJ/g/hYemC3ZISM+
+						Mjky/csk+C1ZALs8RSY2uzX8B3YfZSjDN1bUOd4O22o7EFyq7JNSP/xajHEBhCev
+						HclfHywYgqaVXnbHLCBK3GbvPxnZxQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDQjCCAiqgAwIBAgIIZvpg5YE3/HUwDQYJKoZIhvcNAQEFBQAwODEQMA4GA1UE
+						CgwHRWR1c2VydjEkMCIGA1UEAwwbcnVudGltZS50ZXN0Lm9wZW5hdGhlbnMubmV0
+						MB4XDTEyMTAxNTE0NDkwNloXDTIyMTAxNTE0NDkwNlowODEQMA4GA1UECgwHRWR1
+						c2VydjEkMCIGA1UEAwwbcnVudGltZS50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmxojj/t4L6T+Ckuu+G30Ces7IbT
+						5YnxmR9BePF3I3f5hEBMQp/ERea6AVZPlawdgilHV64giVRnE22zIQQtnjkJX84Z
+						7L9J4ODUbF+0YVwDzqgEdxjHfa96850YMf8MPoe4oJKJ7J4yCzfbwiVXGGWtqKQ4
+						idh+lBQK8MGwB7yOy8QwlnxeEoSMkX01I6spOiv7r+KrACopZkYc6WGCAg30/hv8
+						7SPQcxPNAbQDZVjpF2tnHwsY5nz9fLtZCBEmsF0zlEZ+RuxnfOLzk0pXDEwhkA5k
+						QPS6cYKH6IQeNZBX4bzUpxhrZ53Y4ZhDOgXiT7nSxsEOZlxv1Stu5c6FXQIDAQAB
+						o1AwTjAdBgNVHQ4EFgQUhiBEqrb5Qs7q+Rit3aIR+NJuI0swHwYDVR0jBBgwFoAU
+						hiBEqrb5Qs7q+Rit3aIR+NJuI0swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
+						AAOCAQEAEWtFo02LGecwaaFhx5rLS8q5+Cn06DDYFDuW6L2xpMV2EUBbyFY9sq+/
+						nssFZg1j9s4sm2NHNLkgns+bmAxhW1YSRKPy/D58dUBuGMKdftS1uVvMEeLh+y/5
+						g8e23YE2Rfy6PdQ+YytUyG1VhhEo5hU6LZWqAUR0OdsGAs/qWXhth+dgLkpumSqy
+						4zWQHLrUlweaQx3pDw73Xc8PeCPtMU+AbXL2vvRXQSizD4NtZJ/g/hYemC3ZISM+
+						Mjky/csk+C1ZALs8RSY2uzX8B3YfZSjDN1bUOd4O22o7EFyq7JNSP/xajHEBhCev
+						HclfHywYgqaVXnbHLCBK3GbvPxnZxQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://runtime.test.openathens.net/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://runtime.test.openathens.net/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Eduserv</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/test.qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.qmplus.qmul.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..e1105334
--- /dev/null
+++ b/swamid-interfederations-2.0/test.qmplus.qmul.ac.uk-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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>
+      <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>
+						MIIDCTCCAfGgAwIBAgIJAI8TavPBUIURMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnRlc3QucW1wbHVzLnFtdWwuYWMudWswHhcNMTIwNjA3MTQ1MTAzWhcNMjIw
+						NjA1MTQ1MTAzWjAhMR8wHQYDVQQDExZ0ZXN0LnFtcGx1cy5xbXVsLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuLs2cygGGnUNJWfWftkRzDk5
+						YnIqq6NP13SZ+zNa64WVuLvnwsbhvyfdVrfAQEPH2tyDtlp2qc51o+62liBhI6JS
+						LMtx6gVFf+58UE+tx8iU0Y5NyC1x7rbLH1ZtyjQt242IydqM62d4dxPogqdiF9vp
+						Ky+2hMR1h1q3Gj/xwkhwJK0750wWbh4ICEgzHUDhlsD5E+aIaONsrGoI7Su2aZP/
+						r9rHoMP4cGjLavmGWwbgrrOkhiFo363yLLGyvl0o5lhZpHNcMqfcbWY27fcnpvXG
+						hudYtAC4bDzdRBhSVLIatap33e3Ufib4FPaNfhyKRBzGXCoJypGCXcVIvp31HwID
+						AQABo0QwQjAhBgNVHREEGjAYghZ0ZXN0LnFtcGx1cy5xbXVsLmFjLnVrMB0GA1Ud
+						DgQWBBQzEI79jYpibhVQM4hk+a/kRUW1ZzANBgkqhkiG9w0BAQUFAAOCAQEArXfT
+						8CbMm1xmDrSXqfitHZUaLlPKEQD123WPfstSqCPjWxpEifgBtGzCKk5N8ZjYd7SJ
+						UpDsyz+x2jaZ8M+mlDtAAjt3KAz9YqlfSIHyOb4ZyI+2/h0zdkLXBnU8jR65701o
+						RjrK4QVCQOFrwkVHjbJyb4QcBEfhxtmUCwNyPlEu++4KpRyzaFtF3FiG1ZU0oYdF
+						jSRvU0UJgprAvhB2c5WoJ+uYGxUCq72HNy6dvU5cWEvQgdGJ9jQJdtU79L7T4UKD
+						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>
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
new file mode 100644
index 00000000..b33e140f
--- /dev/null
+++ b/swamid-interfederations-2.0/test.repository.abertay.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,77 @@
+<?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>
+      <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>
+						MIIC8TCCAdmgAwIBAgIJAJjxlcGvVj5jMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+						BAMTDmxhYy1yZXBvLXRlc3Q5MB4XDTEyMTAwOTA5MDA0OVoXDTIyMTAwNzA5MDA0
+						OVowGTEXMBUGA1UEAxMObGFjLXJlcG8tdGVzdDkwggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQDEpec8FWkD8JLlztjoDS3g7ijRCL8ikfvRkQ9G+Wt8K7/p
+						W2yuVI8KxzSyBoEJcGfz3qgMJfpgjjgOY5ujzJ45BMdZ8/gDcnnBC+RSgfNkC4rf
+						pFbtb5l9nDEDDCDCoRzpfnHO/G0vpJkaROPb/koYSh+ZSg1UlQ7ALDukqrQgieLU
+						gk1Wa/Ys4xudqiTGKmBy2RZeAfgJqGqeHciSfpMicJeYrSqpVevUFhpm8wdWMY9V
+						htXrDRu/LORdFRqcvNURebTrctSNGlALzvzzcL/KlLlDHUnf1CeBRVtf3XLsfAFI
+						8tTBejncXVYAmC+wyr7AR9VS2gyO+V29af0+1Q0lAgMBAAGjPDA6MBkGA1UdEQQS
+						MBCCDmxhYy1yZXBvLXRlc3Q5MB0GA1UdDgQWBBR1lj5GO1NfZoBe1gN7B6QWIqLJ
+						CTANBgkqhkiG9w0BAQUFAAOCAQEAKZxrZgAfIRaJMAYrc7q2BUcSPFsh6RPf15zt
+						d7psMrQlMeGacaNK9c0zfaVfVSO3VPw6sCxbWBW4JFtlYLccJN6aHOwZYgcIg0dm
+						Pd/ICzFokhV3IWblX6ZheUzgYbLOVNtrt90VUaFPH2JWcgK5HocMZbcvGKyXIAyH
+						VnLZjYpHz06QUBs4bVo144xJjBQL/ow+PhKUr+QGvhcX6c4lzq9xNrwsA3sqbdww
+						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>
diff --git a/swamid-interfederations-2.0/test.rpharms.com-entity.xml b/swamid-interfederations-2.0/test.rpharms.com-entity.xml
new file mode 100644
index 00000000..152a1622
--- /dev/null
+++ b/swamid-interfederations-2.0/test.rpharms.com-entity.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+			MIIDgjCCAmqgAwIBAgIJALwx9tll+qVcMA0GCSqGSIb3DQEBBQUAMDQxFTATBgNV
+			BAoTDHN0YWdpbmctY2JjbDEbMBkGA1UEAxMSc3RhZ2luZy5jYmNsLmNvLnVrMB4X
+			DTE1MDIyNTEyNTgxNVoXDTI1MDIyMjEyNTgxNVowNDEVMBMGA1UEChMMc3RhZ2lu
+			Zy1jYmNsMRswGQYDVQQDExJzdGFnaW5nLmNiY2wuY28udWswggEiMA0GCSqGSIb3
+			DQEBAQUAA4IBDwAwggEKAoIBAQC8udH1d2ZZEL/BDN30QIMSKtmpY7UEwFN/sUeV
+			dZ0Gy3g/INtPq7sD652of1/oL2wAFIAy3DDtn8AvxtZPq6YpXwa4YQFO+jdns95F
+			srPIYsNf07WMgiU+9RyPMlRisuQ6aP2vSmYKuCVClNsSqCUg75La9WoeCCwPVWpk
+			68PUmU2BnWn28SJh+PS6HCH1I5VNhxEI6HK3EiJn7GfYOYLYSUXT6h5vmiPs//Se
+			iIjgPVmp5WYp1C6Nll4W3zRYEHKDsoP17Q4J2xSLs29wV+E5KKtiGCVXlo3mmAKV
+			QEsSKZnOU2fctnZIT3XSR3boh2HPEbnRT44xE2f5ETqIg1ZtAgMBAAGjgZYwgZMw
+			HQYDVR0OBBYEFAzPDnpVwkT1SW2m+/wIUPwjc7unMGQGA1UdIwRdMFuAFAzPDnpV
+			wkT1SW2m+/wIUPwjc7unoTikNjA0MRUwEwYDVQQKEwxzdGFnaW5nLWNiY2wxGzAZ
+			BgNVBAMTEnN0YWdpbmcuY2JjbC5jby51a4IJALwx9tll+qVcMAwGA1UdEwQFMAMB
+			Af8wDQYJKoZIhvcNAQEFBQADggEBACB9SbHspWAUl22utozAqjRJrzQIAZpm3F/f
+			TJ5rSauNjMmynolPErFiK6r2vEZTognGfA4xNgwRzj7Pv9T6fYcZSgju6CLnTtKM
+			visn0gZI8/FbtZtcSRvDREeiq3khk8shExS5y2QF/yIPE9p7dsJzofIabcwNOi+L
+			3UmF4Wx9nQ/e6QqgVou2j1C4IUkLkTnomdtA0Azgc/IYHLD83q2v6aTucGndVhEe
+			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>
+			MIIDgjCCAmqgAwIBAgIJALwx9tll+qVcMA0GCSqGSIb3DQEBBQUAMDQxFTATBgNV
+			BAoTDHN0YWdpbmctY2JjbDEbMBkGA1UEAxMSc3RhZ2luZy5jYmNsLmNvLnVrMB4X
+			DTE1MDIyNTEyNTgxNVoXDTI1MDIyMjEyNTgxNVowNDEVMBMGA1UEChMMc3RhZ2lu
+			Zy1jYmNsMRswGQYDVQQDExJzdGFnaW5nLmNiY2wuY28udWswggEiMA0GCSqGSIb3
+			DQEBAQUAA4IBDwAwggEKAoIBAQC8udH1d2ZZEL/BDN30QIMSKtmpY7UEwFN/sUeV
+			dZ0Gy3g/INtPq7sD652of1/oL2wAFIAy3DDtn8AvxtZPq6YpXwa4YQFO+jdns95F
+			srPIYsNf07WMgiU+9RyPMlRisuQ6aP2vSmYKuCVClNsSqCUg75La9WoeCCwPVWpk
+			68PUmU2BnWn28SJh+PS6HCH1I5VNhxEI6HK3EiJn7GfYOYLYSUXT6h5vmiPs//Se
+			iIjgPVmp5WYp1C6Nll4W3zRYEHKDsoP17Q4J2xSLs29wV+E5KKtiGCVXlo3mmAKV
+			QEsSKZnOU2fctnZIT3XSR3boh2HPEbnRT44xE2f5ETqIg1ZtAgMBAAGjgZYwgZMw
+			HQYDVR0OBBYEFAzPDnpVwkT1SW2m+/wIUPwjc7unMGQGA1UdIwRdMFuAFAzPDnpV
+			wkT1SW2m+/wIUPwjc7unoTikNjA0MRUwEwYDVQQKEwxzdGFnaW5nLWNiY2wxGzAZ
+			BgNVBAMTEnN0YWdpbmcuY2JjbC5jby51a4IJALwx9tll+qVcMAwGA1UdEwQFMAMB
+			Af8wDQYJKoZIhvcNAQEFBQADggEBACB9SbHspWAUl22utozAqjRJrzQIAZpm3F/f
+			TJ5rSauNjMmynolPErFiK6r2vEZTognGfA4xNgwRzj7Pv9T6fYcZSgju6CLnTtKM
+			visn0gZI8/FbtZtcSRvDREeiq3khk8shExS5y2QF/yIPE9p7dsJzofIabcwNOi+L
+			3UmF4Wx9nQ/e6QqgVou2j1C4IUkLkTnomdtA0Azgc/IYHLD83q2v6aTucGndVhEe
+			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>
diff --git a/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..279824ef
--- /dev/null
+++ b/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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.shu.unidesk.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-03T13:52: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC/TCCAeWgAwIBAgIJAKOQZJ9XeRRZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnRlc3QudW5pZGVzay5hYy51azAeFw0xMjAzMjIxNjUwMTdaFw0yMjAzMjAx
+						NjUwMTdaMB0xGzAZBgNVBAMTEnRlc3QudW5pZGVzay5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAPweFLYNELDowDm8YWp8G8RKR0q+ufgUN7H7
+						h7RTesgxlO9T8wXLT1e4s1ruCVrYtkt8q3K+iXukZ+J5QD4lMtvWHfbpKJNddygG
+						RkURpJQ7bY1rTdWA6jNi16TR+8M2ECIf4Q6CVukHHrX9PuZM+b7Ktg2gf3fmy7vQ
+						MQ2/2Rp8/LKGKotVAoRYrNc8y3Y2PR9omsidxNGyyXxfD2OyTobuk1Ezb7Fk4Oq+
+						4VmetrJ5CwFOwTBmFUgfaazuooEvGM7tA/jjRGDY5H+4oyVDK63Ktf59pwGln6Bo
+						JyBfJIWYK/5w3psQJZCFyNgJ4WQSgxbAiORGQPZLfKxsvAaGD2UCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISdGVzdC51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBRxsmQCxZXe
+						bZvQMvehqWxt1yHYijANBgkqhkiG9w0BAQUFAAOCAQEAtOWghRw2KKVvYbX0sQEX
+						VDYPpi4Q1q6b1vl/MK0WU+zWjOmuljIIw377NOuH+A8zwJF2maelKlEHFmlMg8nl
+						a8MPTIQIhgJ3baXwfy5jvEIQrK++0LwaFiBdwg0dM3er6pyODVypn6oNpKY9gcFA
+						xCl05pTEBIWPAxFNcvYj/liPrDC8RcEBpnEiGZcJgvPGCulXV3O9FCRkoyTaVoUB
+						e42UmPVs7zqOGsBy6ZcHRGoD53VWtkvax8iBGBobK0fGICh6vyX7Qb6Me3r/7S1h
+						6WUcF/Nm7P5V6V2an8MJPYyIVNn6QorTplFsBhK4/Wr+Xb4JIurIwCWDqbVIYo1j
+						TA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.shu.unidesk.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: Unidesk - Sheffield Hallam University (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:IS.Helpdesk@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/test.st-andrews.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..6f037530
--- /dev/null
+++ b/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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.st-andrews.unidesk.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-12T13:01: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC/TCCAeWgAwIBAgIJAKOQZJ9XeRRZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnRlc3QudW5pZGVzay5hYy51azAeFw0xMjAzMjIxNjUwMTdaFw0yMjAzMjAx
+						NjUwMTdaMB0xGzAZBgNVBAMTEnRlc3QudW5pZGVzay5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAPweFLYNELDowDm8YWp8G8RKR0q+ufgUN7H7
+						h7RTesgxlO9T8wXLT1e4s1ruCVrYtkt8q3K+iXukZ+J5QD4lMtvWHfbpKJNddygG
+						RkURpJQ7bY1rTdWA6jNi16TR+8M2ECIf4Q6CVukHHrX9PuZM+b7Ktg2gf3fmy7vQ
+						MQ2/2Rp8/LKGKotVAoRYrNc8y3Y2PR9omsidxNGyyXxfD2OyTobuk1Ezb7Fk4Oq+
+						4VmetrJ5CwFOwTBmFUgfaazuooEvGM7tA/jjRGDY5H+4oyVDK63Ktf59pwGln6Bo
+						JyBfJIWYK/5w3psQJZCFyNgJ4WQSgxbAiORGQPZLfKxsvAaGD2UCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISdGVzdC51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBRxsmQCxZXe
+						bZvQMvehqWxt1yHYijANBgkqhkiG9w0BAQUFAAOCAQEAtOWghRw2KKVvYbX0sQEX
+						VDYPpi4Q1q6b1vl/MK0WU+zWjOmuljIIw377NOuH+A8zwJF2maelKlEHFmlMg8nl
+						a8MPTIQIhgJ3baXwfy5jvEIQrK++0LwaFiBdwg0dM3er6pyODVypn6oNpKY9gcFA
+						xCl05pTEBIWPAxFNcvYj/liPrDC8RcEBpnEiGZcJgvPGCulXV3O9FCRkoyTaVoUB
+						e42UmPVs7zqOGsBy6ZcHRGoD53VWtkvax8iBGBobK0fGICh6vyX7Qb6Me3r/7S1h
+						6WUcF/Nm7P5V6V2an8MJPYyIVNn6QorTplFsBhK4/Wr+Xb4JIurIwCWDqbVIYo1j
+						TA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.st-andrews.unidesk.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">the University of Edinburgh: Unidesk - University of St Andrews (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:IS.Helpdesk@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/test.ukfederation.org.uk-entity.xml b/swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml
new file mode 100644
index 00000000..069e65c6
--- /dev/null
+++ b/swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml
@@ -0,0 +1,185 @@
+<?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>
+      <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>
+						MIIDADCCAeigAwIBAgIJALYNI4chorkFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE3VrZi1zdmMuZWRpbmEuYWMudWswHhcNMTEwMTI4MTY1MjQ2WhcNMjEwMTI1
+						MTY1MjQ2WjAeMRwwGgYDVQQDExN1a2Ytc3ZjLmVkaW5hLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv8qWcZAP79noTlNXCrHVJoUUgWlcaBQc
+						V94tQnjUo313VRnbzWgaghHfv8xFEXpWRjQhTOCuAugI3wKmKVjmJQmSYhNc6pgJ
+						lUSUwlefMu2kDBhU9fcY9YhqMgMcsMYNkHygU0gMIZm2HDkJGxTM/BU03VLCM/8o
+						oJqJBqArueI2Crt/6emG2dT9KkxBhYb+mKiI4N8vK/XS6bCQHoAZTsh2fMCcjP/z
+						mI4oGoitkoEEYh4tHf489XQXmCXil7parkOfYPiSbOscpTMnKw+e1E9otaoDakH1
+						Sgs81mRPAWBcWttIOSmS75a6mfooDeVNAE5S4iGuakKTw424ykb96QIDAQABo0Ew
+						PzAeBgNVHREEFzAVghN1a2Ytc3ZjLmVkaW5hLmFjLnVrMB0GA1UdDgQWBBT4yzTF
+						d+G9wC0XOImSgaDBtORrbzANBgkqhkiG9w0BAQUFAAOCAQEAFsLiJAnNO6EQiXwx
+						hdKhH40h4veNxKL4bq3azVkH/YP7Ej8uQ89Ta+aR6xC+TDuvt2Baj3bmN5Dxejen
+						r4I2/WP0eR6nH4r2vZ0cNKNDV2LBcjmxJhvcOM5151HzRDxNdw9nNHfR5kFreU2N
+						ee/3SL8B+EZrQCu9mKZSL1OwuQbm9I9tp7Aqp414UDG9ivZIorrkIA5cJplfOaR9
+						/gIB1Eu9tAgJgofTwi9bzNde2kjOY410MZFfya1T7juPUJYx5WEJ0oHkJLbilx/W
+						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">
+				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>
diff --git a/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..90abb435
--- /dev/null
+++ b/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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.ulster.unidesk.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-29T15:23: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC/TCCAeWgAwIBAgIJAKOQZJ9XeRRZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnRlc3QudW5pZGVzay5hYy51azAeFw0xMjAzMjIxNjUwMTdaFw0yMjAzMjAx
+						NjUwMTdaMB0xGzAZBgNVBAMTEnRlc3QudW5pZGVzay5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAPweFLYNELDowDm8YWp8G8RKR0q+ufgUN7H7
+						h7RTesgxlO9T8wXLT1e4s1ruCVrYtkt8q3K+iXukZ+J5QD4lMtvWHfbpKJNddygG
+						RkURpJQ7bY1rTdWA6jNi16TR+8M2ECIf4Q6CVukHHrX9PuZM+b7Ktg2gf3fmy7vQ
+						MQ2/2Rp8/LKGKotVAoRYrNc8y3Y2PR9omsidxNGyyXxfD2OyTobuk1Ezb7Fk4Oq+
+						4VmetrJ5CwFOwTBmFUgfaazuooEvGM7tA/jjRGDY5H+4oyVDK63Ktf59pwGln6Bo
+						JyBfJIWYK/5w3psQJZCFyNgJ4WQSgxbAiORGQPZLfKxsvAaGD2UCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISdGVzdC51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBRxsmQCxZXe
+						bZvQMvehqWxt1yHYijANBgkqhkiG9w0BAQUFAAOCAQEAtOWghRw2KKVvYbX0sQEX
+						VDYPpi4Q1q6b1vl/MK0WU+zWjOmuljIIw377NOuH+A8zwJF2maelKlEHFmlMg8nl
+						a8MPTIQIhgJ3baXwfy5jvEIQrK++0LwaFiBdwg0dM3er6pyODVypn6oNpKY9gcFA
+						xCl05pTEBIWPAxFNcvYj/liPrDC8RcEBpnEiGZcJgvPGCulXV3O9FCRkoyTaVoUB
+						e42UmPVs7zqOGsBy6ZcHRGoD53VWtkvax8iBGBobK0fGICh6vyX7Qb6Me3r/7S1h
+						6WUcF/Nm7P5V6V2an8MJPYyIVNn6QorTplFsBhK4/Wr+Xb4JIurIwCWDqbVIYo1j
+						TA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ulster.unidesk.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">Unidesk - University of Ulster (TEST)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:IS.Helpdesk@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IS Application Technology Management</md:GivenName>
+    <md:EmailAddress>mailto:apps-techmgt@mlist.is.ed.ac.uk</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
new file mode 100644
index 00000000..7f45a355
--- /dev/null
+++ b/swamid-interfederations-2.0/test.worldbank.pub2web.ingenta.com-shibboleth.xml
@@ -0,0 +1,52 @@
+<?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>
+						MIIDkjCCAnqgAwIBAgIES9lH8TANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
+						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEUMBIGA1UECxMLRW5naW5lZXJpbmcx
+						HjAcBgNVBAMTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTAeFw0xMDA0MjkwODQ4NDla
+						Fw0yMDA0MjYwODQ4NDlaMIGKMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jk
+						c2hpcmUxDzANBgNVBAcTBk94Zm9yZDEeMBwGA1UEChMVUHVibGlzaGluZyBUZWNo
+						bm9sb2d5MRQwEgYDVQQLEwtFbmdpbmVlcmluZzEeMBwGA1UEAxMVUHVibGlzaGlu
+						ZyBUZWNobm9sb2d5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAikh+
+						4MJp8ZpbJ9gW//uabIFF+pyQoH0f4DeVSfFj6To5hn8nsw+HqCgICB3Y9z4p8Nth
+						2jjAcqF1NozrxlGmXQYMmoGjqxyHznJXq1UkN51oeFKRK+3IRpoe7Gh7RAC1qXC2
+						b9IBF2FRmpXD5t233lQ6pUEqRrVvrFsA+q+NPCSNGR00CizWvErN+H3n4hIbUcaK
+						Kab4oBFFfWzMSxtisRMNL9W/zdDwZxV8bQL14T0aQRYgWswLwrLnCCGHwHHd5+po
+						bCPFI+AbPYufxfBfcXw6fbNHn8MEsdbSWFjSL4IE1ykNBqmr1hcshiSrqiYqwIa1
+						Z347oG57JBVDAJjQ6QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCAYYRDtdxQBiWA
+						GPyAVEqdNvKKROS4NEBfKoppthAMCxTUIlFfzEJ6CICOYiE6/hQsxHwtmKkMr2/T
+						NRVrVuEYNo1816mHeR3CrZ0dpYg3vpVJoAz5n4aoYs433m/LnTcmTlqQgytaHE90
+						Db8+7pKyoBtNJrOMrf3jHICFgTBNd5EpQvmFGD6xvjtgKsxiWnQ9PVaGqSmITG1Q
+						RUMojjLi412ixiHu4QjBaTLshHvEuGlFclJjjUyyF+u+Kat0mwqRfRwor/2lp9Ia
+						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">Publishing Technology 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>Talvinder</md:GivenName>
+    <md:SurName>Matharu</md:SurName>
+    <md:EmailAddress>mailto:talvinder.matharu@publishingtechnology.com</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
new file mode 100644
index 00000000..72030a2a
--- /dev/null
+++ b/swamid-interfederations-2.0/testidp.nottingham.ac.uk-shibboleth.xml
@@ -0,0 +1,119 @@
+<?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>
+      <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>
+						MIIE3TCCA8WgAwIBAgIQJ6xm1LTElUlmA4yZoROJdDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMTEyMjAwMDAwMFoXDTE1MTEyMjIzNTk1OVowgaUxCzAJBgNV
+						BAYTAkdCMRgwFgYDVQQIEw9Ob3R0aW5naGFtc2hpcmUxEzARBgNVBAcTCk5vdHRp
+						bmdoYW0xJTAjBgNVBAoTHFRoZSBVbml2ZXJzaXR5IG9mIE5vdHRpbmdoYW0xHTAb
+						BgNVBAsTFEluZm9ybWF0aW9uIFNlcnZpY2VzMSEwHwYDVQQDExh0ZXN0aWRwLm5v
+						dHRpbmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ
+						iTjMdWPuQtFIVzw9OKgJ3UjhfSZ6DXxs4ALjaDzpfRni4jUcrdjOdkb2o6nrwNbx
+						qy4HhbZAPgG5qneqnmn4VVnbBOcTBuG3EWsI33Vl1el74O90OTk4Ti9VI0ElNsFm
+						yYsNNS51K1E6dxl7IRpPs8LwsVV+GdNkLqXwEBAO6Oa5GnJHbnvPFkfo1p+JA7wa
+						DE1doGkDZxyW1H5wcIKgvV26oemhUK9wHIgHC/wchGB+oKW2y4etmXM6KpABcN2t
+						/2Jfb62yn3ipyZrLwmykRGubkk07fANfrUDe6bryqkdudztmNhgw9e3Vvnh6vdZe
+						ME0tmtJKCRpkulxaxrHNAgMBAAGjggF1MIIBcTAfBgNVHSMEGDAWgBQMvZNoDPPe
+						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUMmN2nPdOhQzxgbeyF4RXLeKz2wowDgYD
+						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoG
+						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGHRlc3RpZHAubm90
+						dGluZ2hhbS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAGtpBh/RFxZSa7veOmGe1
+						STxrmdNWUh7G1NiS0AqHcHLFULQdX2eXEnCsm2N9LkqfgFDof3UW6WmwpdSq2eVX
+						7Ot/bndokCySHXW9dFpGiOE7pjw+XKJzuDkPULfvXU2wwHXdlzY/YP0GmVUljuyi
+						12HUDv9J1053FiAgggcfKEHD718KFAvd/miYlRjfV96riqydo9017C+68i0oRa1O
+						gSHWR1aXtFAxHrqQ5Y97N2zMnDd+orx52YopWPm+iFJgW4coN1hjesPZNE/TE5KL
+						mjtsVdskDH5UQmR1Jz+94QkZ62EJ5mbzCFRxqT5rmKSE4h0wSJl1645Jbb0LeXUW
+						LA==
+					</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>
+						MIIE3TCCA8WgAwIBAgIQJ6xm1LTElUlmA4yZoROJdDANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEyMTEyMjAwMDAwMFoXDTE1MTEyMjIzNTk1OVowgaUxCzAJBgNV
+						BAYTAkdCMRgwFgYDVQQIEw9Ob3R0aW5naGFtc2hpcmUxEzARBgNVBAcTCk5vdHRp
+						bmdoYW0xJTAjBgNVBAoTHFRoZSBVbml2ZXJzaXR5IG9mIE5vdHRpbmdoYW0xHTAb
+						BgNVBAsTFEluZm9ybWF0aW9uIFNlcnZpY2VzMSEwHwYDVQQDExh0ZXN0aWRwLm5v
+						dHRpbmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ
+						iTjMdWPuQtFIVzw9OKgJ3UjhfSZ6DXxs4ALjaDzpfRni4jUcrdjOdkb2o6nrwNbx
+						qy4HhbZAPgG5qneqnmn4VVnbBOcTBuG3EWsI33Vl1el74O90OTk4Ti9VI0ElNsFm
+						yYsNNS51K1E6dxl7IRpPs8LwsVV+GdNkLqXwEBAO6Oa5GnJHbnvPFkfo1p+JA7wa
+						DE1doGkDZxyW1H5wcIKgvV26oemhUK9wHIgHC/wchGB+oKW2y4etmXM6KpABcN2t
+						/2Jfb62yn3ipyZrLwmykRGubkk07fANfrUDe6bryqkdudztmNhgw9e3Vvnh6vdZe
+						ME0tmtJKCRpkulxaxrHNAgMBAAGjggF1MIIBcTAfBgNVHSMEGDAWgBQMvZNoDPPe
+						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUMmN2nPdOhQzxgbeyF4RXLeKz2wowDgYD
+						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
+						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoG
+						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGHRlc3RpZHAubm90
+						dGluZ2hhbS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAGtpBh/RFxZSa7veOmGe1
+						STxrmdNWUh7G1NiS0AqHcHLFULQdX2eXEnCsm2N9LkqfgFDof3UW6WmwpdSq2eVX
+						7Ot/bndokCySHXW9dFpGiOE7pjw+XKJzuDkPULfvXU2wwHXdlzY/YP0GmVUljuyi
+						12HUDv9J1053FiAgggcfKEHD718KFAvd/miYlRjfV96riqydo9017C+68i0oRa1O
+						gSHWR1aXtFAxHrqQ5Y97N2zMnDd+orx52YopWPm+iFJgW4coN1hjesPZNE/TE5KL
+						mjtsVdskDH5UQmR1Jz+94QkZ62EJ5mbzCFRxqT5rmKSE4h0wSJl1645Jbb0LeXUW
+						LA==
+					</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>
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
new file mode 100644
index 00000000..b37d05a7
--- /dev/null
+++ b/swamid-interfederations-2.0/testidp1.ntu.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?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>
+      <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>
+						MIIEcjCCA1qgAwIBAgIRAPTb+rk6jOmXCD8nphThP4UwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA1MjkwMDAwMDBaFw0xNjA1MjgyMzU5NTlaMEAxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSdGVzdGlkcDEu
+						bnR1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ORxXKiX
+						DYnYrh0URq0YrQvXUrUABDoA0oRStRQGmwgYBNHD4fTid9qJxRAXddoOxWHR3eLM
+						+LV7VAMuZvzNq4x5LXFhqkfRHPXuM1GwMT8t8kHIsgv3xlxf3xjAjyHGswnlv8kU
+						1uMiCj1u+q59WTt7VYGQkdiPYthy9pp6RCCWLvoeH2fpsE8Zfni/8YqkSLR0o7XX
+						FSw2BvgqNlxrdQtiVKSaAKqv6MtYLQfsPAf7KyHXcOn/Wa79zsyh7Gr5tkMHWCyO
+						z6/uA1UeHm+/00mCLJ2HxwGA/mQpiWmuTUtZRNyhIl6RCCpQvYmEYLcyTjXXgyCZ
+						btwqLlDrmrNeZwIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+						N1dH6pDjue0wHQYDVR0OBBYEFCi+rC8oIr09eQTC9ySKAjItBWkrMA4GA1UdDwEB
+						/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+						BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+						MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+						LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+						LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+						b2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJ0ZXN0aWRwMS5udHUuYWMu
+						dWswDQYJKoZIhvcNAQEFBQADggEBAFUt0QpPH6WC/+XltCugdJr76oMYrwjNsOtK
+						HakoQSRsf4uYg66wmJKnHhxEyFZeogB6cMAMe06PsaUB/86X35gkxFm2uMJGfsJB
+						iE67ALWlN2hwWDePC/07Olud9e8Nq4u473yKLqsS7S3uY6aFYLXE9rWMXq2fIBj8
+						iQFeWXQe0VfuG2l3k0UGs5Nty4UwRzLABv5sTmpnm8PJmDO5oAXmZg+lNYhRHkMO
+						kdhsjKI5gAW+1PdlGwcHdx98KyqoVSLQw9HcWAE7Wo7MoKCsFrnyBqC/8N+k+8tm
+						s7Obnw4aOinAMW06Fka45GA6qoSnJVj3y741U5pHrw0fWtVRZ3A=
+					</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>
+						MIIEcjCCA1qgAwIBAgIRAPTb+rk6jOmXCD8nphThP4UwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA1MjkwMDAwMDBaFw0xNjA1MjgyMzU5NTlaMEAxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSdGVzdGlkcDEu
+						bnR1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ORxXKiX
+						DYnYrh0URq0YrQvXUrUABDoA0oRStRQGmwgYBNHD4fTid9qJxRAXddoOxWHR3eLM
+						+LV7VAMuZvzNq4x5LXFhqkfRHPXuM1GwMT8t8kHIsgv3xlxf3xjAjyHGswnlv8kU
+						1uMiCj1u+q59WTt7VYGQkdiPYthy9pp6RCCWLvoeH2fpsE8Zfni/8YqkSLR0o7XX
+						FSw2BvgqNlxrdQtiVKSaAKqv6MtYLQfsPAf7KyHXcOn/Wa79zsyh7Gr5tkMHWCyO
+						z6/uA1UeHm+/00mCLJ2HxwGA/mQpiWmuTUtZRNyhIl6RCCpQvYmEYLcyTjXXgyCZ
+						btwqLlDrmrNeZwIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+						N1dH6pDjue0wHQYDVR0OBBYEFCi+rC8oIr09eQTC9ySKAjItBWkrMA4GA1UdDwEB
+						/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+						BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+						MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+						LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+						LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+						b2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJ0ZXN0aWRwMS5udHUuYWMu
+						dWswDQYJKoZIhvcNAQEFBQADggEBAFUt0QpPH6WC/+XltCugdJr76oMYrwjNsOtK
+						HakoQSRsf4uYg66wmJKnHhxEyFZeogB6cMAMe06PsaUB/86X35gkxFm2uMJGfsJB
+						iE67ALWlN2hwWDePC/07Olud9e8Nq4u473yKLqsS7S3uY6aFYLXE9rWMXq2fIBj8
+						iQFeWXQe0VfuG2l3k0UGs5Nty4UwRzLABv5sTmpnm8PJmDO5oAXmZg+lNYhRHkMO
+						kdhsjKI5gAW+1PdlGwcHdx98KyqoVSLQw9HcWAE7Wo7MoKCsFrnyBqC/8N+k+8tm
+						s7Obnw4aOinAMW06Fka45GA6qoSnJVj3y741U5pHrw0fWtVRZ3A=
+					</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:ITSShibbolethTechnical@ntu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testing.lifeisaboutlearning.com-shibboleth-sp.xml b/swamid-interfederations-2.0/testing.lifeisaboutlearning.com-shibboleth-sp.xml
new file mode 100644
index 00000000..710c325d
--- /dev/null
+++ b/swamid-interfederations-2.0/testing.lifeisaboutlearning.com-shibboleth-sp.xml
@@ -0,0 +1,52 @@
+<?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://testing.lifeisaboutlearning.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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://testing.lifeisaboutlearning.com/Shibboleth.sso/TestShib"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDGDCCAgCgAwIBAgIJALqK3r+ZErlKMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG2NsYy1kZW1vMS1zdnIubGlmZS5iZXRhLmNvbTAeFw0xMTA4MDMxMTMzMDha
+						Fw0yMTA3MzExMTMzMDhaMCYxJDAiBgNVBAMTG2NsYy1kZW1vMS1zdnIubGlmZS5i
+						ZXRhLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANm1+QxmQGLN
+						AHlee/8D35R5Iec1JNg8AKU0K7nE1ClK5glm802nOiCtmJkkjjtQzKYJ7aLSHxCB
+						mqJeiwcMA/KFcYlHel/B/96I8bsPjeXDoMvnxDjsX1kZ/5E/n6T8eauQt87c3Pv6
+						ZbpGxWqv7HSKDpEwPQbknMX1BnmjA+CcT6NqVwB+SRNpC4Y10uHJsDofeqWjjgtd
+						kqjAIebvD6rfsm576L1X2mXTBoYuhtRGUOKzeIrQfMVYF8qOaAYzHmKrPQ6O2kDj
+						dDufSOCj+sNUCTWfaB/kklTZK0hfeVYEQ23d8Utr8r1wEx31VG8VEZffGwZJrf5u
+						rTsjKJlWnWMCAwEAAaNJMEcwJgYDVR0RBB8wHYIbY2xjLWRlbW8xLXN2ci5saWZl
+						LmJldGEuY29tMB0GA1UdDgQWBBTbjK2BPOaPmxv8sZUdjuU2Y8KwYDANBgkqhkiG
+						9w0BAQUFAAOCAQEAvdVtlzXcFVa+3rmiraZIvAHldUrrOUlP48Bxw7zcRn9Txoek
+						2GLRP5I6u++cOmWqWP0YjSsYYzDTxskyxZx4XghVLQzwldRURCKL6eenl3YhHv+c
+						Q5S/qwsib4lldM0tE01uJkpl3MFVhLUo93QsxvOGjq6zVNlIwP0pcXeux97cZY3x
+						9b6bjEPg2f0QLJqZ4UMtIb9FsWLe1bVFp41mS3YmDOOKuXOhmSNEAa1xbpZh/Gai
+						KeeVS0l6GGBnqsa4q9sLUpG52esWnwPOZVIM3JC+t+1RMjF4hGJYLfewiBbclj+3
+						Dz+nuT/jMHw2luh6YHT8y6caxde8WpnDBF1CuA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testing.lifeisaboutlearning.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testing.lifeisaboutlearning.com/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</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>John</md:GivenName>
+    <md:SurName>Burns</md:SurName>
+    <md:EmailAddress>mailto:john.burns@uniservity.com</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
new file mode 100644
index 00000000..5ecbb5c4
--- /dev/null
+++ b/swamid-interfederations-2.0/testoala.surrey.ac.uk-oala-metadata.xml
@@ -0,0 +1,85 @@
+<?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>
+      <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>
+						MIIDUDCCAjigAwIBAgIIRNFxRp/Jwa8wDQYJKoZIhvcNAQEFBQAwPzEdMBsGA1UE
+						CgwUVW5pdmVyc2l0eSBvZiBTdXJyZXkxHjAcBgNVBAMMFXRlc3RvYWxhLnN1cnJl
+						eS5hYy51azAeFw0xMjAzMjkxNTM1MThaFw0yMjAzMjkxNTM1MThaMD8xHTAbBgNV
+						BAoMFFVuaXZlcnNpdHkgb2YgU3VycmV5MR4wHAYDVQQDDBV0ZXN0b2FsYS5zdXJy
+						ZXkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1j2zQKc7z
+						R2V/VMIag9WMfd66ABeoUemxyKIxtUi925IAuspYjlM54eFDzTxl9bkS/nEHF461
+						M/qusiKKasjxctKjllFKt81kiUvki20ghFA3GoxfHf9Ggdn0/9kCxJqaQC04E2+F
+						AmBKp2ndkfsg77eSfpfKoBlLzYCwm2Z/yWQtV1Emxlg/BiVHaiGXls/uB8jRYRR5
+						rTypT7QBgktFSTV2jJ4HZjbibC106DMseDwKuE+4sPjCtDIY0xB+CEWvIWFZ7m7i
+						4sQAEE/iNymvSgfD8FVM6qN3QZJktLND+ytw7xT2ApCyhufjVYXzChEdv8JAxtFc
+						yjupxFetN221AgMBAAGjUDBOMB0GA1UdDgQWBBS7I/yqh/AoV6xFYMqRCoLShzpp
+						/jAfBgNVHSMEGDAWgBS7I/yqh/AoV6xFYMqRCoLShzpp/jAMBgNVHRMEBTADAQH/
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBS+xHB77QPjESIz1lySOo6JzrQU14Tpt7/KXEN
+						m1QNxZEnuRh6ApWKHjAWGW0XvnkIh8QDzB9ypnBEskTe9mF7cimv3D1YCf12FyDZ
+						gn3NQNE21cOiZa9Ul2jaJLNoLVlj4pH75KMYUDSjNJaqa20qz2G0iCu5FPPz6kfz
+						N52TVaCkDD3rJ4lo4w5Q1BHy8GhzHGcw0nqVpEfkkEH0YJIFqhhwcUkWo1auD1k2
+						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>
+						MIIDUDCCAjigAwIBAgIIRNFxRp/Jwa8wDQYJKoZIhvcNAQEFBQAwPzEdMBsGA1UE
+						CgwUVW5pdmVyc2l0eSBvZiBTdXJyZXkxHjAcBgNVBAMMFXRlc3RvYWxhLnN1cnJl
+						eS5hYy51azAeFw0xMjAzMjkxNTM1MThaFw0yMjAzMjkxNTM1MThaMD8xHTAbBgNV
+						BAoMFFVuaXZlcnNpdHkgb2YgU3VycmV5MR4wHAYDVQQDDBV0ZXN0b2FsYS5zdXJy
+						ZXkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1j2zQKc7z
+						R2V/VMIag9WMfd66ABeoUemxyKIxtUi925IAuspYjlM54eFDzTxl9bkS/nEHF461
+						M/qusiKKasjxctKjllFKt81kiUvki20ghFA3GoxfHf9Ggdn0/9kCxJqaQC04E2+F
+						AmBKp2ndkfsg77eSfpfKoBlLzYCwm2Z/yWQtV1Emxlg/BiVHaiGXls/uB8jRYRR5
+						rTypT7QBgktFSTV2jJ4HZjbibC106DMseDwKuE+4sPjCtDIY0xB+CEWvIWFZ7m7i
+						4sQAEE/iNymvSgfD8FVM6qN3QZJktLND+ytw7xT2ApCyhufjVYXzChEdv8JAxtFc
+						yjupxFetN221AgMBAAGjUDBOMB0GA1UdDgQWBBS7I/yqh/AoV6xFYMqRCoLShzpp
+						/jAfBgNVHSMEGDAWgBS7I/yqh/AoV6xFYMqRCoLShzpp/jAMBgNVHRMEBTADAQH/
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBS+xHB77QPjESIz1lySOo6JzrQU14Tpt7/KXEN
+						m1QNxZEnuRh6ApWKHjAWGW0XvnkIh8QDzB9ypnBEskTe9mF7cimv3D1YCf12FyDZ
+						gn3NQNE21cOiZa9Ul2jaJLNoLVlj4pH75KMYUDSjNJaqa20qz2G0iCu5FPPz6kfz
+						N52TVaCkDD3rJ4lo4w5Q1BHy8GhzHGcw0nqVpEfkkEH0YJIFqhhwcUkWo1auD1k2
+						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>
diff --git a/swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-Shibboleth.xml b/swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-Shibboleth.xml
new file mode 100644
index 00000000..37658dcd
--- /dev/null
+++ b/swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-Shibboleth.xml
@@ -0,0 +1,79 @@
+<?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://testpbyp.camb-ed.com/SP/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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Personalisation by Pieces (PbyP)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Personalisation by Pieces (PbyP) is an approach
+					to teaching and learning developed by Cambridge Education in 2006. It is a
+					framework to support personalised learning based on core skills and competencies.</mdui:Description>
+        <mdui:Logo height="100" width="252">https://services.camb-ed.com/images/ce-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>
+						MIIDFTCCAf2gAwIBAgIJAJ0gsyZA9LuWMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGm50ZGQzMDk3LXZtMDEuY2FtYmJlLmxvY2FsMB4XDTExMTAxOTA5NDc0NloX
+						DTIxMTAxNjA5NDc0NlowJTEjMCEGA1UEAxMabnRkZDMwOTctdm0wMS5jYW1iYmUu
+						bG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCh5Q5Pfp0V1Ch6
+						BGzR3BdI5zG2iuEFSIXL86J8BjNtmXK7trhlmkFV8IRrSlZZT4HoQ5L8osWMmjvF
+						PT7QUShEgOa2whBn40B8FKCLgEpBw5cigexoc5CSsrwrlYFRvyI5dPFxWswcx+xJ
+						ZY8Rrzr2nWyt3uFzs2wNwIx/ftXQPLXQPVRU14OQQa34oy8EY8Gu+IcZJKbLUssz
+						3jFc/7RYXXE6GT6gU1zuIVTXl3C/rZniD2byTkw6cT9p0PqnAjt75A2tjd4Caro6
+						8wyof9P7NjtHaRAl1lY/FH0OFPuSoF4FJxFgzeY/iQ59qxZ0hpVx0/ypy35bkrIB
+						9sYRChKPAgMBAAGjSDBGMCUGA1UdEQQeMByCGm50ZGQzMDk3LXZtMDEuY2FtYmJl
+						LmxvY2FsMB0GA1UdDgQWBBQIox4FW13pfw8o8eGdT9Pf62b05TANBgkqhkiG9w0B
+						AQUFAAOCAQEAHZ1hImDls+f1zizRgGQVAi3oDJxKIbsZpabHWiF26ZLm510Scw0m
+						EMo+ujL+QZGZGrm8EFvRg3SXRgn1R7FogYof7rg8xegReDSpKLsnGJFiKj+CBq8w
+						bFZ1A4jfGD1BITLqn1RpFqrFAXHI5O+LbZSMf4LxC/y7h8H/oa86qKAyBQ/6VrGQ
+						xKt+6n+Wf8hbkI2xcBzfzr5RiRWynCDl7uBLZtgqVnqWm+kMSZ7pumsCoQVnIiUg
+						UY4Kot4hlc38yuDomldi17E41LhqZqi/ZOUi2o2l9r7kyGKDd5LCmXNiQdsGtfWb
+						7xE8KO+hyTvS+CzJoArDBNyd7hkQJqw3gw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cambridge Education Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cambridge Education Limited: Personalisation by Pieces</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.camb-ed.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Bell</md:SurName>
+    <md:EmailAddress>mailto:simon.bell@camb-ed.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Zishan</md:GivenName>
+    <md:SurName>Sheikh</md:SurName>
+    <md:EmailAddress>mailto:Zishan.sheikh@camb-ed.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Bell</md:SurName>
+    <md:EmailAddress>mailto:simon.bell@camb-ed.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Zishan</md:GivenName>
+    <md:SurName>Sheikh</md:SurName>
+    <md:EmailAddress>mailto:Zishan.sheikh@camb-ed.com</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
new file mode 100644
index 00000000..589b011e
--- /dev/null
+++ b/swamid-interfederations-2.0/testshib.msacademicverify.com-shibboleth-sp.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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 in its global business.
+					Academic eligibility is defined as: “Individual must be a full or part time enrolled university or college student or faculty or staff 
+					at an eligible accredited educational institution and must be able to provide proof of enrollment to Microsoft or its appointed vendor upon request. 
+					Alumni of these institutions are ineligible.” AVE uses federated data as one of many verification methods to determine 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>
+						MIIDVDCCAjygAwIBAgIJAJh4QX82u2pTMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+						BAMTHXRlc3RzaGliLm1zYWNhZGVtaWN2ZXJpZnkuY29tMB4XDTEzMDMyNjEzMTIw
+						N1oXDTE2MDMyNTEzMTIwN1owKDEmMCQGA1UEAxMddGVzdHNoaWIubXNhY2FkZW1p
+						Y3ZlcmlmeS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsLIq+
+						Kl9aCXy3gkjyDv1YWqWVL3c6S+G5aCnCwtlbwU9q5R9lo7r5pjxScujS+kwRRYfO
+						KJ5jg6M6T1oZOEkcMjAcx0hF5fat7a3z02zvL4eaZcZAnd4Jrn8xizKX363lE+mj
+						NGu38+xpEyknMNpybsFeqA9S+tbZDteMihHi4x+rkis5Cno9m4OXEN3fGrl6sa2L
+						+d5XHH/IlUa0LA0cpKP8ONMYNR4g+7lUy+SHuo9iQJZesEX16cCMNkbknNuexRH+
+						2FhGx3q6WB87KhgLjpdmb5ZPcPFAbdZSrbpZTMny2RDFMbpyQefYEMYlTETYwJ4S
+						3sSa4EhqIbri+CZzAgMBAAGjgYAwfjBdBgNVHREEVjBUgh10ZXN0c2hpYi5tc2Fj
+						YWRlbWljdmVyaWZ5LmNvbYYzaHR0cHM6Ly90ZXN0c2hpYi5tc2FjYWRlbWljdmVy
+						aWZ5LmNvbS9zaGliYm9sZXRoLXNwMB0GA1UdDgQWBBQKuJJcwHX2m6nuzSaqFlE9
+						NdEF/jANBgkqhkiG9w0BAQUFAAOCAQEAIUWZZuPR/N4BY2LeeHKQ5GCArl7ZPM50
+						6Znt2T7vw/D6JKNmUx1v9PVyt4GzleFCrWhWgX4mKlUfrT1EcGYblKj6YUKErERk
+						pRbaJp8mZ/X5Ugi00lpv0GlNtdvvrYv5R1V5wTUSyLd6L+Ci3jhhugkd5cTL3ttk
+						s/JNkMFd0eHEeJKi2jcI1jrhF9aWncdGup/MNdm0wPxmtnoylkuXUY0CIlmMYuas
+						ZCjBzPpPM2QIOXiuXypVLjuP32AirgS8h/uL+mY4z8pv68loW8C0ulYqmj6lPjDR
+						wWE+vceD2r7oFUYHr1E07cyX20HwNU1LL3TthPaNhs7M2ImLlYHapw==
+					</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>
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
new file mode 100644
index 00000000..1ea7c16c
--- /dev/null
+++ b/swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.xml
@@ -0,0 +1,102 @@
+<?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>
+      <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 (Staging)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Münster (Staging)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</mdui:Description>
+        <mdui:Description xml:lang="en">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</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>
+      <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
+MTExNloXDTE5MDcwOTIzNTkwMFowgdoxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
+b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
+VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
+b3JtYXRpb25zdmVyYXJiZWl0dW5nMSEwHwYDVQQDExh0ZXN0c3Nzby51bmktbXVl
+bnN0ZXIuZGUxJzAlBgkqhkiG9w0BCQEWGHd3d2FkbWluQHVuaS1tdWVuc3Rlci5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKSQWHcHeqedu29lqBRD
+VOO/WjA7ELkwwGSPcqtVdJSrunce1HkYWY98X8IKnKOk8OXMjNnHLb1ka6azAvcz
+HX8HPda+X2JeyYGehjGNRCP2AI+6C5tRgCpaySeobrH4nI1bLuP0J1xjwzKzqD8Q
+hjEy8jyIs5S5Pqx9V+4+tHPG6HsHlbTDAhxkZ4CWnyFcpnQwJJiJiXCcwbrlCU5/
+jZ8xeJmPEqACtL41o/d8HfBF2f9zXIlknGR5Lh2pCOy5Pt1GnJACUaCp+VKTsM3Y
+Zn71OASRAmMCp2sR+P/dNs9Awx6CPWyZRacArwTUbobVUKGNtcAw0vPsj/25UDkl
+YD0CAwEAAaOCAjwwggI4ME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEG
+DysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiwe
+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
+BgEFBQcDATAdBgNVHQ4EFgQUEc/OhyNJfLbAplQ81eqmpb8Zy0gwHwYDVR0jBBgw
+FoAUvp5RosmSfLtgi+awaGR3WlIZoQAwIwYDVR0RBBwwGoIYdGVzdHNzc28udW5p
+LW11ZW5zdGVyLmRlMHsGA1UdHwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvd3d1LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwN6A1oDOGMWh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgcsGCCsG
+AQUFBwEBBIG+MIG7MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
+L09DU1AtU2VydmVyL09DU1AwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAC
+hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY2FjZXJ0L2dfY2Fj
+ZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAZmamJrBlMURerBb8kNhic4WMrn9r
+O+tQOuWkYnRC7guOQxzI4xIyTwgToNimO+AZ2dCWqDnR+xOE2WPTvQ6MfG313kRO
+X7yOwhoZ0vbpzwBPr2+rVawbSYn/n4gZwoYFgewr5dEG4irT+ULcZMYuW+jEX2Da
+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 (Staging)</md:ServiceName>
+      <md:ServiceName xml:lang="en">Universität Münster (Staging)</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</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/testx.rewley.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/testx.rewley.ox.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..3b9ff931
--- /dev/null
+++ b/swamid-interfederations-2.0/testx.rewley.ox.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,76 @@
+<?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://testx.rewley.ox.ac.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-26T09:39: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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://testx.rewley.ox.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>
+						MIIEmjCCA4KgAwIBAgIJAN3lX0bKmvYOMA0GCSqGSIb3DQEBBQUAMIHNMQswCQYD
+						VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
+						MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
+						bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMR4wHAYDVQQDDBV0ZXN0eC5yZXds
+						ZXkub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5bG9yQGNvbnRlZC5v
+						eC5hYy51azAeFw0xNDA1MTYxMzUwNDZaFw0yNDA1MTMxMzUwNDZaMIHNMQswCQYD
+						VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
+						MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
+						bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMR4wHAYDVQQDDBV0ZXN0eC5yZXds
+						ZXkub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5bG9yQGNvbnRlZC5v
+						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALGlJIa2jDp7
+						2G0veO3PKZIeR5bEjwiIwMJ2eVLavYR8srwBfAJKqWfLSTkHpwqTDiV4TJzW1ZLX
+						DSA45CE21tx/hEb4u0vEARvRpNE1v+0852wV8MTWAIG32D3ciIOhNwH/6FInVbVR
+						iLRyjWoykWTvZoSdu6mQa5fTXq5CzUhMg3FDfT4Z6piyAdJMz9NUF8vr2chS6VLg
+						tWwC20/gerQ4TN81X1NZBZcdHQG1c9rvg7IR28CjfVggUvDkbsqaWYmf5ynO7328
+						l8LJxtzvWRxJu6XyiPE5wr8ISdtjYpXczE+2rzkIEo8ztJI9dx9X3bkq1QvJIWHP
+						uEeykQijZd0CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
+						blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFJIfR/ZYmJByuaE5
+						GldU6Q5Ti+4ZMB8GA1UdIwQYMBaAFJIfR/ZYmJByuaE5GldU6Q5Ti+4ZMA0GCSqG
+						SIb3DQEBBQUAA4IBAQACMlLHR3DfGj7btTxywdzVVxjVZPmwsbuBRUXx+2+BM6eJ
+						oRMnlavU7APk7/1WO39MXA94fsCUZqzS5J6zTH4M+Zz80yav2/6ovZ3hCLi7f95A
+						4EJYyZDhEoUj18ghVsx27DzvGvHT7iot93IyQl+TC5uzfaZewZKmdDjuFXnZyLE6
+						63zwkMgxdQZpNx3bBXnnQijmXKd9D0kDAn3QdzHWWAzLNIiElhkPtWOfyrr96d+E
+						Za3sWCoe1p7/z6S7QFrkaEIPoQUmWADygNzOdGEMR2oUtbX4FUMaKj6lJ0yn7x/D
+						kkjAFsFqiMDHkphikIOe1+UNnWIECZVMWqntNn7b
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testx.rewley.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://testx.rewley.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://testx.rewley.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testx.rewley.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">Oxford University: Continuing Education main test site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.conted.ox.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@conted.ox.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@conted.ox.ac.uk</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
new file mode 100644
index 00000000..735eac86
--- /dev/null
+++ b/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz-shibboleth.xml
@@ -0,0 +1,115 @@
+<?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>
+      <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
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTIxODAwMDAwMFoXDTE2MTIxNzIzNTk1OVowSDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExp0aGFsYW1vc3Mt
+ZGF0YS5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKUGwM1e1CiGbQVgLW460tAetS5QUTSANMKZEzThUgJYdI2mYJWp9NwF5bXelMo+
+lFObDPcG7wEc8+DpdpKGskBEE4SmcHbcKFE8/hmCYHPbf5AUrjPCei3XKDMbtIaC
+Htmut5AjE4gsG9GJa5vCFCjcsJgIdIat/PQp7++IOMc+qXx5WR22mUroYR15V89u
+jGe7CfjonOUmB4xxj5AVW73xcGEsAgYS1vmCGo3utSiawlgBKYENCTyb6e1AdbQ6
+MS1SBcN1gvFQH6ONoX2gXFG5NAEF1PCwevcUePVoJyUux5grmnBH6wE/7SOp8ygI
+7c6bUVZINmO9s5KY+Ohc7LUCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
+896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT+kNRsn7KWuNVl5xuCU3uOlH3ElTAO
+BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIadGhhbGFtb3Nz
+LWRhdGEuaWNzLm11bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAGXev97kSHOHKFTd
+Pb2+xAETh0vA4q5UFVUF96i0yqpOlpmeWF7gV+7VCSI0WOVfWJQE8LeE17KRymb2
+h4G6AetotMBoKdzPxVmuSTIT2GA3q/cMeNWt9Kc1xaFZ73/vV9kJ5ioA/Vqpbk3B
+BOn8kS74xu0s1frpPS3rn23kRY/3LsQORCi0RUhNcio1LcGbkUQ1J7nlEYXt62rH
+6kAGlj0ycmn4GA0vnQbgw7iAYh72rPmH2vvLyXrEf6wKo9L1ywQ7ag9BvQaxCLoT
+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>
diff --git a/swamid-interfederations-2.0/the.sketchengine.co.uk-entity.xml b/swamid-interfederations-2.0/the.sketchengine.co.uk-entity.xml
new file mode 100644
index 00000000..b3c31386
--- /dev/null
+++ b/swamid-interfederations-2.0/the.sketchengine.co.uk-entity.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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="60" width="180">https://the.sketchengine.co.uk/media/img/sketch_engine_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>
+						MIIDCTCCAfGgAwIBAgIJANfd9uOTdW5iMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnRoZS5za2V0Y2hlbmdpbmUuY28udWswHhcNMTQxMTE5MTAyMDQ1WhcNMjQx
+						MTE2MTAyMDQ1WjAhMR8wHQYDVQQDExZ0aGUuc2tldGNoZW5naW5lLmNvLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0htPnFyNGNzy926yL4N7stIk
+						RwcqbHXDObBZzyTB1JaRPZo6aq+bnibx5+03BBjPwOYdXVDdUVDIX/PspMGXyuTa
+						fqjs1c7xwkKLU79uECAqYvKQXd1rxx2A6njJ2oAxgo2yCzjnWXXwRBIFWuF58xgh
+						z+nECBY45t0Ao2IJHsUE87eSYRYf+ezs6aZDxnxvBrB3EtO2Xev5dv59a3BHFmIo
+						b0SIhjRc8C8zJNwtXK30dVBjwx+WrCmHb2VjsKgFpD68DGxE44J3WDUsM04Yza1k
+						PxzAoVyo0mSO0uBU8A08JukvZwkYQwF01pB3qWXLy0sY33LfFkFgE1G5mbBfNwID
+						AQABo0QwQjAhBgNVHREEGjAYghZ0aGUuc2tldGNoZW5naW5lLmNvLnVrMB0GA1Ud
+						DgQWBBRtKwxkOaJ6+vRN9Q+DFKAtuqpC+jANBgkqhkiG9w0BAQUFAAOCAQEAc2PS
+						SxkloyX01Vzja1OUX8lfpqDCDDx3cbicxWMHsVDg22fZuY3V168eUbpQfIEKeXdb
+						jaatza31vCxKyQgc83H3zmdszr40jaPOUTwvE5ukwrK/bXaNnMb7IqqJAVL3Dkur
+						/pF3k/FwyiKwz9iwXEk/+dy630qvm7in31qVfzk+2DcuBLxqKKYhUiHU6nbYCbqx
+						NkZosBDW43SWAkVLQoL5fzLdyBP5xJ8VeDKmic8571k9ePjRn4r10g9c2ZI8SNbe
+						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>
diff --git a/swamid-interfederations-2.0/thinkit.oneteamlogic.co.uk-shibboleth.xml b/swamid-interfederations-2.0/thinkit.oneteamlogic.co.uk-shibboleth.xml
new file mode 100644
index 00000000..6d7dc1dd
--- /dev/null
+++ b/swamid-interfederations-2.0/thinkit.oneteamlogic.co.uk-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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>
+						MIIDJDCCAgygAwIBAgIJAMwlTWVQn6vNMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
+						BAMTH21jczAxLmRlbW9hZC5vbmV0ZWFtbG9naWMuY28udWswHhcNMTQxMTEyMTUz
+						MDUwWhcNMjQxMTA5MTUzMDUwWjAqMSgwJgYDVQQDEx9tY3MwMS5kZW1vYWQub25l
+						dGVhbWxvZ2ljLmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						r1P9vVNqzEtb9Adrua0kwQ/eI++2FtfJPvxdUx7VZ/AihxkJ8bFdR4SCmPcCm2l6
+						NIuX5RzpFW84p77G9tmpVqKHRDIgm3+zFHuJu+4HIYpNGrtSHr0URRdzLzkqgsYz
+						2N1zkYdH20kMonR8H7DU9iJ+fuqiEmiUTuLjyFYJkDG5KvWseSK7ddrbOFRfj1+g
+						xFHg3G9dHSHXggaKXMJFS1jpZU0rRf1WLmRDxIwyAHjGCM6Jc1eHP6P+iXQaqNtn
+						NCF7LSOOQ0pHLMxaGmEHFsA/gCqtQLsQ3Tz/FI/aD+gDqH7uddQZc7MwWYyVwk86
+						45OYCIefIeg+cV33XFpNuQIDAQABo00wSzAqBgNVHREEIzAhgh9tY3MwMS5kZW1v
+						YWQub25ldGVhbWxvZ2ljLmNvLnVrMB0GA1UdDgQWBBRxX7MmM9QRHXRlA9tBztn1
+						Fprx4jANBgkqhkiG9w0BAQUFAAOCAQEAM68P0rnO7aXyvV8X5AKMtHJqpat4equg
+						eseVbcQi3PbVPh5eJgZa8fUK4LU8qFSHbz78TmvVaTD2gOfNA9LfY+TMQMK+y16t
+						Bz694/fpbNY6ztfD/+Hsexk2X0zn9nXnf2qNQIbLIzau5u+oEYGgzxQkxaC2VeI0
+						qy55H4npVR38eppq7qWkGZrlEGM8MnBrRNGqIBrHb4luiGcGwsB5K1G89SSdYJkG
+						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>
diff --git a/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml b/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml
new file mode 100644
index 00000000..ba69122f
--- /dev/null
+++ b/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml
@@ -0,0 +1,146 @@
+<?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>
+						MIIF/jCCBOagAwIBAgIQM+YpmcylIPDSTgnHfWNmNTANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwMzE5
+						MDAwMDAwWhcNMTgwMzE2MjM1OTU5WjCB6DELMAkGA1UEBhMCR0IxDTALBgNVBAgT
+						BEF2b24xEDAOBgNVBAcUB0JyaXN0b2wxGzAZBgNVBAoUEklPUCBQdWJsaXNoaW5n
+						IEx0ZDE1MDMGA1UECxQsVGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jby51
+						ay9ycGEgKGMpMDUxIjAgBgNVBAsTGUF1dGhlbnRpY2F0ZWQgYnkgVmVyaVNpZ24x
+						JzAlBgNVBAsTHk1lbWJlciwgVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UE
+						AxQOdGlja2V0LmlvcC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC5WcglO3vKPNW09UA2GygrxCcozj67wA8Qd6d7Mu17EPrFzxRUP3h2jqk9wAPn
+						vaIMcNooYHK/CzUawroiINRtdArpRT0lW1aNeXuiZ+9H6SU2KQKfMSI5WoXvIdW9
+						xUUnQyyptaXNVyXINAlkm5y+HTsrbRATRkjJN94Qw4ssRaYfWhOP66rpviu1DfLA
+						Vhhhc/uSme+la90C+bVQ9EHnfF5adHAMsGIiJbqdQCK4Hq5nFlzpW535GRqleHcE
+						9x3HUppIJ32Q1ehYEvzwSIMBp8ACO7hgnSiYPbegpYPdeH+eV1vBmPuSLo/DxaON
+						KCvHtgDOt1QzxMuqiCBfp5QFAgMBAAGjggHTMIIBzzAJBgNVHRMEAjAAMAsGA1Ud
+						DwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vU1ZSU2VjdXJlLUczLWNy
+						bC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY3JsMEYGA1UdIAQ/MD0wOwYLYIZI
+						AYb4RQEHFwMwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cudmVyaXNpZ24uY28u
+						dWsvcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
+						gBQNRFwWU0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUH
+						MAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDov
+						L1NWUlNlY3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBu
+						BggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIa
+						BBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5j
+						b20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJo/xmh2qJqsFbNlxD2V
+						whco2sZBjNrNBk12LFGtcFJmeUXPPIcAFeKGlWx/37mKirZ1ryxRbgdEi6ShZo8n
+						HGtdJlw9Wj0otC4Idr7PGPH/BEThfx27NYz2OzKiMvfm5vFfvHUPiSKdFlxleIBr
+						beDsBgKfA6YbhWElH6QIqmL9T6Qg2iMvAHdrgN6afMvuJ4h9iT5ad0LfuRxE3Gvq
+						Y7B/QdOZHDQVZ0KquFe/qnRDrWFhlvdPXRxwgByi9XOmbNVuRnlxfnbUOw8Jgks1
+						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>
+						MIIF/jCCBOagAwIBAgIQM+YpmcylIPDSTgnHfWNmNTANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwMzE5
+						MDAwMDAwWhcNMTgwMzE2MjM1OTU5WjCB6DELMAkGA1UEBhMCR0IxDTALBgNVBAgT
+						BEF2b24xEDAOBgNVBAcUB0JyaXN0b2wxGzAZBgNVBAoUEklPUCBQdWJsaXNoaW5n
+						IEx0ZDE1MDMGA1UECxQsVGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jby51
+						ay9ycGEgKGMpMDUxIjAgBgNVBAsTGUF1dGhlbnRpY2F0ZWQgYnkgVmVyaVNpZ24x
+						JzAlBgNVBAsTHk1lbWJlciwgVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UE
+						AxQOdGlja2V0LmlvcC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC5WcglO3vKPNW09UA2GygrxCcozj67wA8Qd6d7Mu17EPrFzxRUP3h2jqk9wAPn
+						vaIMcNooYHK/CzUawroiINRtdArpRT0lW1aNeXuiZ+9H6SU2KQKfMSI5WoXvIdW9
+						xUUnQyyptaXNVyXINAlkm5y+HTsrbRATRkjJN94Qw4ssRaYfWhOP66rpviu1DfLA
+						Vhhhc/uSme+la90C+bVQ9EHnfF5adHAMsGIiJbqdQCK4Hq5nFlzpW535GRqleHcE
+						9x3HUppIJ32Q1ehYEvzwSIMBp8ACO7hgnSiYPbegpYPdeH+eV1vBmPuSLo/DxaON
+						KCvHtgDOt1QzxMuqiCBfp5QFAgMBAAGjggHTMIIBzzAJBgNVHRMEAjAAMAsGA1Ud
+						DwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vU1ZSU2VjdXJlLUczLWNy
+						bC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY3JsMEYGA1UdIAQ/MD0wOwYLYIZI
+						AYb4RQEHFwMwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cudmVyaXNpZ24uY28u
+						dWsvcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
+						gBQNRFwWU0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUH
+						MAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDov
+						L1NWUlNlY3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBu
+						BggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIa
+						BBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5j
+						b20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJo/xmh2qJqsFbNlxD2V
+						whco2sZBjNrNBk12LFGtcFJmeUXPPIcAFeKGlWx/37mKirZ1ryxRbgdEi6ShZo8n
+						HGtdJlw9Wj0otC4Idr7PGPH/BEThfx27NYz2OzKiMvfm5vFfvHUPiSKdFlxleIBr
+						beDsBgKfA6YbhWElH6QIqmL9T6Qg2iMvAHdrgN6afMvuJ4h9iT5ad0LfuRxE3Gvq
+						Y7B/QdOZHDQVZ0KquFe/qnRDrWFhlvdPXRxwgByi9XOmbNVuRnlxfnbUOw8Jgks1
+						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://czh.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML/POST" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://czh.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://czh.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>Bruce</md:GivenName>
+    <md:SurName>Ferguson</md:SurName>
+    <md:EmailAddress>mailto:bruce.ferguson@iop.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..7715ec67
--- /dev/null
+++ b/swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,62 @@
+<?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://timetable.earth.ox.ac.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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://timetable.earth.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>
+						MIIDDzCCAfegAwIBAgIJAOsQvmtCqbDkMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHRpbWV0YWJsZS5lYXJ0aC5veC5hYy51azAeFw0xMTAxMDYxNjU0MThaFw0y
+						MTAxMDMxNjU0MThaMCMxITAfBgNVBAMTGHRpbWV0YWJsZS5lYXJ0aC5veC5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANNEwMterh/GkNFeH1Ox
+						jatg+8pug6Pr2Vyiu2+MLGUvpvhOA+4aHvxCYHTDR2yzWEwHkRILS3yA/B+QiW1y
+						jE4Wg259kMHXskPDdU+62T+tySdj5Hobx05oKGx1PxYy/d2KFzyLe5wfXdmWKrM3
+						dJHgrYIyY5bEOU5CpieAJJ/+Exfchmefht/NfRKV0bkkejvUg+IpdPwm9tSo7z5O
+						My+TYahe3/c5/KroVkcfDuoM1ACCRDsEI2NgBCCtVOYrfJN5F3+aVx58YVoOjC4n
+						4rbjfJDZs0VVJ3Up3B0OGsxAAIoCO8YUfoO50vjvhloqrIYFVLslV2iG0Gm817y3
+						6D0CAwEAAaNGMEQwIwYDVR0RBBwwGoIYdGltZXRhYmxlLmVhcnRoLm94LmFjLnVr
+						MB0GA1UdDgQWBBTG32OU9vtJWEvtMFERCWhc08NbJDANBgkqhkiG9w0BAQUFAAOC
+						AQEAzhSe/ubjNqjFP9MC5k4Fgu24Eqz2WyoiotA8dd2MKepsf0fEHxy6kB/E/lVO
+						aVvdYkRKINYmPbTeN/ylPEBwSVeN71OLBZ19fvMpB6J6lozKUNv+PrwfekSyUeCs
+						5j/pVm+vwWM4onyEUeWkTFmtXaj1tcWGfLSYtX1evbGskPMcReYNFTRKIOzRE0dS
+						KSF/1lKbLyDdcLr2P3aDc8DQYNK9WBiUuMmbN7w9RXp7pv5ZWefRYYVSVM2j6ccF
+						I2JAPf46KCAYCHz0xVbT9I0pJ3kqsy9OCiQfK0zbSCS+3xV4VALStOm8BiY/wDVm
+						/M5ANmyQkgK/JxOjRvUm4lHFeA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Timetable Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Will</md:GivenName>
+    <md:SurName>Hanrott</md:SurName>
+    <md:EmailAddress>mailto:will.hanrott@earth.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Will</md:GivenName>
+    <md:SurName>Hanrott</md:SurName>
+    <md:EmailAddress>mailto:will.hanrott@earth.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/timetable2.earth.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/timetable2.earth.ox.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..6550fcf3
--- /dev/null
+++ b/swamid-interfederations-2.0/timetable2.earth.ox.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,62 @@
+<?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://timetable2.earth.ox.ac.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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://timetable2.earth.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>
+						MIIDEjCCAfqgAwIBAgIJAIt5f6RWOLqKMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXRpbWV0YWJsZTIuZWFydGgub3guYWMudWswHhcNMTIwMjA3MTYwODQ3WhcN
+						MjIwMjA0MTYwODQ3WjAkMSIwIAYDVQQDExl0aW1ldGFibGUyLmVhcnRoLm94LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVDJbATimnosBA7H
+						2bLDXbABcMxjl2JwjC11jxEtzzJZxMRf+Hy0L8onaK9XuLyGt0nqE1X0phVKiPXB
+						9yaZ27WCZYGa41PUYIbF6OLCzuCN73KGRy13tcIyiTjot4Bct3ixjaUze478MIHY
+						7cem/cIlIlw0qXmKHvhMcjr6hamLZX5r+WMp3+1N/7RQ5NrKZJ0qkKapKtnCQ0l/
+						dlhtsSISuxKpWQ6XJR5JTsrkdHUsfSbL7i+KTKfoS9XOpJZS2+S0yaeKaD/lT07M
+						yaaCzZCQhs1Rv1FYJOow62S2DeQpQGMNxCVca4BWxVbH7ACXnApVeVkuFfonQkz5
+						SOGJ1QIDAQABo0cwRTAkBgNVHREEHTAbghl0aW1ldGFibGUyLmVhcnRoLm94LmFj
+						LnVrMB0GA1UdDgQWBBT/Ae0zEanWYNZV9FQg/TGuXx8rLjANBgkqhkiG9w0BAQUF
+						AAOCAQEAPmCO0Vc7Z6wGpKj77kUjoV8rJHz02as0f1JJxM/wV4dsyNY3KDYuUiQt
+						fwWCC5GZtGxxtrTpu5OJYXm1YnfF/Zqdw+IQEuJR7ygSZqZkpuN62jr4GghM3fTW
+						UG6oj/WaicSHb8xnXdNcPdAZw5u2oOaGDFicC67OYdnQpJZq5ELysDrHIDi0fhNL
+						mf72wR0yuR5fwKs2rC4b9PQmeJm2uE+Zq4tCHEfjG8rv6/Pw95uZSbFcA7OUVyCZ
+						EC5oy39+ZN5oMHwTu3h+Hg28mpBpIHj4EejKL1GatXCiEYcOiLGSKK0X+fmzBbGk
+						/1fpdjYY8WLnlR3GF1QjWUraVSirjg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Timetable Service (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Will</md:GivenName>
+    <md:SurName>Hanrott</md:SurName>
+    <md:EmailAddress>mailto:will.hanrott@earth.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Will</md:GivenName>
+    <md:SurName>Hanrott</md:SurName>
+    <md:EmailAddress>mailto:will.hanrott@earth.ox.ac.uk</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
new file mode 100644
index 00000000..6bf7b0a3
--- /dev/null
+++ b/swamid-interfederations-2.0/tkakin.nii.ac.jp-shibboleth-sp.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIEMDCCAxgCCQCgtKNkkJv8CzANBgkqhkiG9w0BAQUFADCB2TELMAkGA1UEBhMC
+						SlAxDjAMBgNVBAgMBVRva3lvMRMwEQYDVQQHDApDaGl5b2RhLWt1MSowKAYDVQQK
+						DCFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxOzA5BgNVBAsMMkN5
+						YmVyIFNjaWVuY2UgSW5mcmFzdHJ1Y3R1cmUgRGV2ZW9wbWVudCBEZXBhcnRtZW50
+						MRkwFwYDVQQDDBB0a2FraW4ubmlpLmFjLmpwMSEwHwYJKoZIhvcNAQkBFhJzeXMt
+						ZGVza0BuaWkuYWMuanAwHhcNMTMwMTI4MDI0MzU1WhcNMTgwMTI3MDI0MzU1WjCB
+						2TELMAkGA1UEBhMCSlAxDjAMBgNVBAgMBVRva3lvMRMwEQYDVQQHDApDaGl5b2Rh
+						LWt1MSowKAYDVQQKDCFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3Mx
+						OzA5BgNVBAsMMkN5YmVyIFNjaWVuY2UgSW5mcmFzdHJ1Y3R1cmUgRGV2ZW9wbWVu
+						dCBEZXBhcnRtZW50MRkwFwYDVQQDDBB0a2FraW4ubmlpLmFjLmpwMSEwHwYJKoZI
+						hvcNAQkBFhJzeXMtZGVza0BuaWkuYWMuanAwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+						DwAwggEKAoIBAQDPRGElRDorAQNGihyQfF6EQOjM5uuKsPMDO6PGX1pYU+gsNYJ+
+						QP7TwJMXEPu7lXLYWp/EuZF4TmJMz8V5PmAyEQHk6eDyUalXU6P5cDyeIcxYkal0
+						ThbKMf/v14tV3Kb0gkGH2G6RoGdrX5SYI0xdIGDOzxWoDHtsrA7oi2XRI6sR6In8
+						36eeX+8ByjabANQR+r4GvXRQucWqZ2PGKxsUtrPLmntxqTEcv4Lu3qvVg0l/COFC
+						DQi/4hK7hX2U88gHaelqiay9NOV6iliZV9N2SnB+VSqPYfAY9FpBTIUucNx884Ld
+						NintMgjJKZQJmo7ln/DvC+6Y+G4/1qXTHRXVAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+						ggEBAIdW+iDP7qZJU5xpImG72430mhd6DErjqrOj7uPDAFYJxS9Et41QZX1IFbC/
+						ZEc62CgXA7JXCtwnZoeqZ9DbySBtNKD2U6KqGlzFkS2luoIeRuBAtTxj7C13FSec
+						mkzVWGe5Zx6e6zf65bIQaNsIiOijMxJWd2t6RG/rkkEVk4cMrAQOG/JT9qV1Ts3e
+						aB3J/o1EJJH7yn19BaYNhXj5oUxwkC9WJpYHXTmN3KCcMiyfLbNO7DEE+t0G9ZqX
+						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>
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
new file mode 100644
index 00000000..0ad0d122
--- /dev/null
+++ b/swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml
@@ -0,0 +1,163 @@
+<?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>
+      <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="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>
+					      MIIEczCCA1ugAwIBAgIQbZHE6LrL3tqFs4H2fek89zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDIyNTAwMDAwMFoXDTE2MDIyNTIzNTk1OVowQTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExN0b25nYS51bml2
+LXRsc2UyLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7uSHCtcm
+npL8YfTCrzbfh/cn2+8KrKbkwXmvc08AEmB/KjifNxaSpnwDCe51yj4efbX/A2KC
+F6UkV9aebsg0yf57+dWVtkAdJZNxtKkj3X/vxa/8DLrFLUNuMrA0K2C+UvT4iahM
+Z7Wn61vXYuyVcjH1akY/zjDOEAGcLCw4PsEfBOyamQ3rjddnJydD2c7swQgWmKA9
+uq8bZ94uHoiEIxGUHx3LwsHeS83mBqCPE1VHFeqGkT5KvUlyXyVNiD4YuIzYhLPo
+OUN5l5VL9DTYJfl1XGTdJ3OETIsgckzzPQuAT7BPqV/063tRKfxs8OVz2af6S85L
+xRbt6XYYPrRbjwIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFKgyHfbTQ+G2wcZU0Xm2N40iXCg4MA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghN0b25nYS51bml2LXRsc2Uy
+LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBW18y/vhfzJr590f4NlYZFpKQdxuM3wrz0
+Lwyt8I0It1K5Axlb+0nCJcx1Wq9U5A7ZSJ/3R9LuhiYJYYeRGcgC12ecrO2JudXZ
+7+6WxjxuO+cfOMAx5Z2ymnLhRlSJlUhg4rSxEgWghxHtoXd/WFrgwv1Redy+fJSB
+yYOY5hOM9Nzxqq7dlvX91gr6aVTxS7Jke9Aje0Ti9jvas0RX5oJB3ItgVEqCIWRH
+4mlCAjYakzm6ucPqhPmbAupbA8CrMDl37ubPxFKnlDUqp02A1MwDJdUJ80A0f6Ce
+2CYly5GL5m70YorIGMbI46RWO/CgfsNzyphB/QHvtodxSrW/3YYs
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEFjCCAv6gAwIBAgIQU4s2cfoLMcS4CAQ5w7PbVzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDIyMjAwMDAwMFoXDTEzMDIyMTIzNTk1OVowcjELMAkGA1UE
+BhMCRlIxETAPBgNVBAcTCFRPVUxPVVNFMTIwMAYDVQQKDCl1bml2ZXJzaXTDqSB0
+b3Vsb3VzZSAyIHRvdWxvdXNlIGxlIG1pcmFpbDEcMBoGA1UEAxMTdG9uZ2EudW5p
+di10bHNlMi5mcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAseh2pkmnQfS6
+1n8W6B4Zl0oW8VO2U85B1vrP497tOLfg+YZFDExx3o9bo3G1MOe8pPYXX8o4IJbY
+EZOt+1r90hcIZYHxKUChzbj8A5s3JuDzPW9FBeoccJpyH8kjDAA+jOX/MByoXD1y
+eyVyXQ8A2z0xHAjtGKsiKk1or/rqtKUCAwEAAaOCAWYwggFiMB8GA1UdIwQYMBaA
+FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRXvFx/fYlHV5DfndKDygeO
+Anc/ITAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
+BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghN0b25nYS51bml2LXRs
+c2UyLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBXI9WubDIlttQfTXl0XzzBx5+nBxYa
+4Vk3IuemB4pj3xg0sJz+WcX5idfDC9TILD/j7WnceWpNVg5+4bX0LHr8nxXy5GXG
+y7ruA50fuwFlxL1m1f9Rl3lgSS+9OFX/pwO68j8bG2HaAmagHPMftOdES15tcE24
+xRjuQwA+Ci/KVDKRTgMwKPrSLR2unxAEhkQksJ5Qbxz0JZaeDWQuck52JGwY8AxD
+GwPwffWYrCia2bzxfKPUiZbuIIIMQI/JfP79/rDMk/bsiEaOoFyNMgbqG/xMCqJ8
+UiA93mbMlvGxjHprvnENF7KeRcs/1aCCDoPjE7iQ6Ne2AacxR45Vlcer
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names: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>
+					      MIIEczCCA1ugAwIBAgIQbZHE6LrL3tqFs4H2fek89zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDIyNTAwMDAwMFoXDTE2MDIyNTIzNTk1OVowQTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExN0b25nYS51bml2
+LXRsc2UyLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7uSHCtcm
+npL8YfTCrzbfh/cn2+8KrKbkwXmvc08AEmB/KjifNxaSpnwDCe51yj4efbX/A2KC
+F6UkV9aebsg0yf57+dWVtkAdJZNxtKkj3X/vxa/8DLrFLUNuMrA0K2C+UvT4iahM
+Z7Wn61vXYuyVcjH1akY/zjDOEAGcLCw4PsEfBOyamQ3rjddnJydD2c7swQgWmKA9
+uq8bZ94uHoiEIxGUHx3LwsHeS83mBqCPE1VHFeqGkT5KvUlyXyVNiD4YuIzYhLPo
+OUN5l5VL9DTYJfl1XGTdJ3OETIsgckzzPQuAT7BPqV/063tRKfxs8OVz2af6S85L
+xRbt6XYYPrRbjwIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFKgyHfbTQ+G2wcZU0Xm2N40iXCg4MA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghN0b25nYS51bml2LXRsc2Uy
+LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBW18y/vhfzJr590f4NlYZFpKQdxuM3wrz0
+Lwyt8I0It1K5Axlb+0nCJcx1Wq9U5A7ZSJ/3R9LuhiYJYYeRGcgC12ecrO2JudXZ
+7+6WxjxuO+cfOMAx5Z2ymnLhRlSJlUhg4rSxEgWghxHtoXd/WFrgwv1Redy+fJSB
+yYOY5hOM9Nzxqq7dlvX91gr6aVTxS7Jke9Aje0Ti9jvas0RX5oJB3ItgVEqCIWRH
+4mlCAjYakzm6ucPqhPmbAupbA8CrMDl37ubPxFKnlDUqp02A1MwDJdUJ80A0f6Ce
+2CYly5GL5m70YorIGMbI46RWO/CgfsNzyphB/QHvtodxSrW/3YYs
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEFjCCAv6gAwIBAgIQU4s2cfoLMcS4CAQ5w7PbVzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDIyMjAwMDAwMFoXDTEzMDIyMTIzNTk1OVowcjELMAkGA1UE
+BhMCRlIxETAPBgNVBAcTCFRPVUxPVVNFMTIwMAYDVQQKDCl1bml2ZXJzaXTDqSB0
+b3Vsb3VzZSAyIHRvdWxvdXNlIGxlIG1pcmFpbDEcMBoGA1UEAxMTdG9uZ2EudW5p
+di10bHNlMi5mcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAseh2pkmnQfS6
+1n8W6B4Zl0oW8VO2U85B1vrP497tOLfg+YZFDExx3o9bo3G1MOe8pPYXX8o4IJbY
+EZOt+1r90hcIZYHxKUChzbj8A5s3JuDzPW9FBeoccJpyH8kjDAA+jOX/MByoXD1y
+eyVyXQ8A2z0xHAjtGKsiKk1or/rqtKUCAwEAAaOCAWYwggFiMB8GA1UdIwQYMBaA
+FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRXvFx/fYlHV5DfndKDygeO
+Anc/ITAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
+BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghN0b25nYS51bml2LXRs
+c2UyLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBXI9WubDIlttQfTXl0XzzBx5+nBxYa
+4Vk3IuemB4pj3xg0sJz+WcX5idfDC9TILD/j7WnceWpNVg5+4bX0LHr8nxXy5GXG
+y7ruA50fuwFlxL1m1f9Rl3lgSS+9OFX/pwO68j8bG2HaAmagHPMftOdES15tcE24
+xRjuQwA+Ci/KVDKRTgMwKPrSLR2unxAEhkQksJ5Qbxz0JZaeDWQuck52JGwY8AxD
+GwPwffWYrCia2bzxfKPUiZbuIIIMQI/JfP79/rDMk/bsiEaOoFyNMgbqG/xMCqJ8
+UiA93mbMlvGxjHprvnENF7KeRcs/1aCCDoPjE7iQ6Ne2AacxR45Vlcer
+					    </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://unknown.site.com</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/topdesk-training.test.bath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/topdesk-training.test.bath.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c5a32e6c
--- /dev/null
+++ b/swamid-interfederations-2.0/topdesk-training.test.bath.ac.uk-shibboleth.xml
@@ -0,0 +1,68 @@
+<?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://topdesk-training.test.bath.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-23T14:21: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">University of Bath: TopDesk (training)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Service provider for TopDesk (training) at the University of Bath</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDEjCCAfqgAwIBAgIJAN5QrRKGCEmMMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXBhbmFjZWEuY2FtcHVzLmJhdGguYWMudWswHhcNMTQwMjEwMTI1NTA5WhcN
+						MjQwMjA4MTI1NTA5WjAkMSIwIAYDVQQDExlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1jtCtknVQDfj1rUp
+						yC1ni1iw6gmg5JnWDZlH14IvmOd6QR2KcMmoi8lkGM35bGeNZcj3OaxNIA/djk9C
+						F4SI0IbEd++TkLzg17pD3ZJQ3Bt3rST4epdDEaPmXjBEmIMFoRcVlLS1nH4URy3s
+						AsTrJdaIsEJJRCVpzu08J9Y7G7Lada2h1S+DPnE94KDXTucKbh3xP5YkA6flQidD
+						1zwJbY+KKNqSFW/+vjPhR19xcxyjiO8Wq5Vo+LOugX5gr/30aegPz52J6pWUBTPz
+						yZMAj68vOqtE6Zyy9e7couwh+gOhlyTO3mTIgbGKbnDzky904AnoWg1oHds917Rw
+						k6NwTwIDAQABo0cwRTAkBgNVHREEHTAbghlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
+						LnVrMB0GA1UdDgQWBBQfl7jnvLvliJGVVM2kOi/XeSG4AjANBgkqhkiG9w0BAQUF
+						AAOCAQEAfszE8GhCifTJ5ns829wqfmIgEU+/+Sj1B8JMEkIwDLy9tk326iU3mLLS
+						lmWxRMz61r9AxcQPDL3CQEOFdR0oGPOgJEreKeJM4xuKsxHWpB7vVea5qSzFKVd0
+						0Kk5u+NrjbvwHdYJptMoyUnV5lFrxKANSBLX8INj2goKs+PCJQ+ejNrcBjkRyWkA
+						NlDAeabwzpKMrIhBlUaom6nPBZsxORqI1nkE0Nga7rrV76BXDSNJ9AnmXNRoBVQA
+						KbRKfzx3m5xJpUI2zRa4ixOMwzqAaYD6/SqNeaLKdzUzjVypOQSB4oYF/6rU+m66
+						qFMMOfKg7++8v5BKcO9HrVptqPcsuA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Bath</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bath: TopDesk (training)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://topdesk-training.test.bath.ac.uk/</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/topdesk.bath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/topdesk.bath.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..848bdf6e
--- /dev/null
+++ b/swamid-interfederations-2.0/topdesk.bath.ac.uk-shibboleth.xml
@@ -0,0 +1,68 @@
+<?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://topdesk.bath.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-25T10:10: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Bath: TopDesk</mdui:DisplayName>
+        <mdui:Description xml:lang="en">TopDesk Service Desk Service Management facility for problem submission and support</mdui:Description>
+        <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDEjCCAfqgAwIBAgIJAN5QrRKGCEmMMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXBhbmFjZWEuY2FtcHVzLmJhdGguYWMudWswHhcNMTQwMjEwMTI1NTA5WhcN
+						MjQwMjA4MTI1NTA5WjAkMSIwIAYDVQQDExlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1jtCtknVQDfj1rUp
+						yC1ni1iw6gmg5JnWDZlH14IvmOd6QR2KcMmoi8lkGM35bGeNZcj3OaxNIA/djk9C
+						F4SI0IbEd++TkLzg17pD3ZJQ3Bt3rST4epdDEaPmXjBEmIMFoRcVlLS1nH4URy3s
+						AsTrJdaIsEJJRCVpzu08J9Y7G7Lada2h1S+DPnE94KDXTucKbh3xP5YkA6flQidD
+						1zwJbY+KKNqSFW/+vjPhR19xcxyjiO8Wq5Vo+LOugX5gr/30aegPz52J6pWUBTPz
+						yZMAj68vOqtE6Zyy9e7couwh+gOhlyTO3mTIgbGKbnDzky904AnoWg1oHds917Rw
+						k6NwTwIDAQABo0cwRTAkBgNVHREEHTAbghlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
+						LnVrMB0GA1UdDgQWBBQfl7jnvLvliJGVVM2kOi/XeSG4AjANBgkqhkiG9w0BAQUF
+						AAOCAQEAfszE8GhCifTJ5ns829wqfmIgEU+/+Sj1B8JMEkIwDLy9tk326iU3mLLS
+						lmWxRMz61r9AxcQPDL3CQEOFdR0oGPOgJEreKeJM4xuKsxHWpB7vVea5qSzFKVd0
+						0Kk5u+NrjbvwHdYJptMoyUnV5lFrxKANSBLX8INj2goKs+PCJQ+ejNrcBjkRyWkA
+						NlDAeabwzpKMrIhBlUaom6nPBZsxORqI1nkE0Nga7rrV76BXDSNJ9AnmXNRoBVQA
+						KbRKfzx3m5xJpUI2zRa4ixOMwzqAaYD6/SqNeaLKdzUzjVypOQSB4oYF/6rU+m66
+						qFMMOfKg7++8v5BKcO9HrVptqPcsuA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Bath</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bath: TopDesk</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://topdesk.bath.ac.uk/</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/topdesk.test.bath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/topdesk.test.bath.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..21932a92
--- /dev/null
+++ b/swamid-interfederations-2.0/topdesk.test.bath.ac.uk-shibboleth.xml
@@ -0,0 +1,68 @@
+<?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://topdesk.test.bath.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-11T12:51: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Bath: TopDesk</mdui:DisplayName>
+        <mdui:Description xml:lang="en">TopDesk Service Desk Service Management facility for problem submission and support</mdui:Description>
+        <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDEjCCAfqgAwIBAgIJAN5QrRKGCEmMMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXBhbmFjZWEuY2FtcHVzLmJhdGguYWMudWswHhcNMTQwMjEwMTI1NTA5WhcN
+						MjQwMjA4MTI1NTA5WjAkMSIwIAYDVQQDExlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1jtCtknVQDfj1rUp
+						yC1ni1iw6gmg5JnWDZlH14IvmOd6QR2KcMmoi8lkGM35bGeNZcj3OaxNIA/djk9C
+						F4SI0IbEd++TkLzg17pD3ZJQ3Bt3rST4epdDEaPmXjBEmIMFoRcVlLS1nH4URy3s
+						AsTrJdaIsEJJRCVpzu08J9Y7G7Lada2h1S+DPnE94KDXTucKbh3xP5YkA6flQidD
+						1zwJbY+KKNqSFW/+vjPhR19xcxyjiO8Wq5Vo+LOugX5gr/30aegPz52J6pWUBTPz
+						yZMAj68vOqtE6Zyy9e7couwh+gOhlyTO3mTIgbGKbnDzky904AnoWg1oHds917Rw
+						k6NwTwIDAQABo0cwRTAkBgNVHREEHTAbghlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
+						LnVrMB0GA1UdDgQWBBQfl7jnvLvliJGVVM2kOi/XeSG4AjANBgkqhkiG9w0BAQUF
+						AAOCAQEAfszE8GhCifTJ5ns829wqfmIgEU+/+Sj1B8JMEkIwDLy9tk326iU3mLLS
+						lmWxRMz61r9AxcQPDL3CQEOFdR0oGPOgJEreKeJM4xuKsxHWpB7vVea5qSzFKVd0
+						0Kk5u+NrjbvwHdYJptMoyUnV5lFrxKANSBLX8INj2goKs+PCJQ+ejNrcBjkRyWkA
+						NlDAeabwzpKMrIhBlUaom6nPBZsxORqI1nkE0Nga7rrV76BXDSNJ9AnmXNRoBVQA
+						KbRKfzx3m5xJpUI2zRa4ixOMwzqAaYD6/SqNeaLKdzUzjVypOQSB4oYF/6rU+m66
+						qFMMOfKg7++8v5BKcO9HrVptqPcsuA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Bath</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bath: TopDesk</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://topdesk.test.bath.ac.uk/</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/topup.chch.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/topup.chch.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..e86ec648
--- /dev/null
+++ b/swamid-interfederations-2.0/topup.chch.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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://topup.chch.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-01-08T15:01: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://topup.chch.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>
+						MIIDDzCCAfegAwIBAgIJAOgjayHP9ZbqMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGGFzbWVhbHMuY2hjaGxhbi5veC5hYy51azAeFw0xNTAxMDcxMDAwMzFaFw0y
+						NTAxMDQxMDAwMzFaMCMxITAfBgNVBAMTGGFzbWVhbHMuY2hjaGxhbi5veC5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANULnFykGUp7Gti10dcY
+						zKK5yeuxhTBxHfbr5nU/kIAouD5tqfottb6f2jfQRPXmmnLhx7jNzqzDQzvngZ1M
+						ZsfduI3IVItK4C6Emk5ddICmJXNWjMlidecTg8cWZpvb17FTdEUaHEdHXRFP6bdJ
+						n+oz0opigSuiBars6m8vxrw4uFaOPs3vKYzB5ac+COwQb5QjSBF6lhDG6IRvbAIh
+						7O+SYCOOTai7NAO5Hq4o7K6eRBizPQS/vInf+VPGX5NJXCACEjoXqsmxccm39Vfl
+						iofR6AOuwMcz7p0eGZYNgIWFohvRbRYF+PIY5Z3TLztK6wIzdn5UUQ+gtaejE16n
+						4mECAwEAAaNGMEQwIwYDVR0RBBwwGoIYYXNtZWFscy5jaGNobGFuLm94LmFjLnVr
+						MB0GA1UdDgQWBBRX0XxbsGyStcfpI1hR45KbWnfLLDANBgkqhkiG9w0BAQUFAAOC
+						AQEAVyfnZcfyh0wsGNQ9wnfflXfMsonJhECpnmT+8T7Lf/SPoPDtngnMuLA/xGIr
+						V8JCX+fO+uMnNlQjplb+VdLlNuI1w1/8gj4iw1osSxuDNaFX0Adaj6gsvEz2KLVt
+						j7OYdUoz+4QXoUNIfQ50P7Duc+No6/zmMIB9waCv3h/p6OLuMVQxJcMILMBGDl4z
+						p3Rvub4/tSm9TQrhcRfSD0Q2l+V7oErCOURmKkW+m3s0WTAdKUq2if3+lt7EeY38
+						SiU31D5xFUn5dIWaQYGhRkMJXZUEZeQvyRh4Tccj7KvZp6ukijIrPK3FPrvc6NoQ
+						PLpKazbWprz6PaLBp/jrAHGCLw==
+					</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://topup.chch.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topup.chch.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://topup.chch.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://topup.chch.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://topup.chch.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 Christ Church College Meal Booking System</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.chch.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:support@chch.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:support@chch.ox.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
new file mode 100644
index 00000000..b1fce67a
--- /dev/null
+++ b/swamid-interfederations-2.0/training.nicurriculum.org.uk-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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>
+						MIIDAzCCAeugAwIBAgIJAM1uIbHlDY9TMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFHRyYWluaW5nLmNjZWEub3JnLnVrMB4XDTEyMTEwNzExMTgxM1oXDTIyMTEw
+						NTExMTgxM1owHzEdMBsGA1UEAxMUdHJhaW5pbmcuY2NlYS5vcmcudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlpY86D7QHaObXoklR20+kjJzdQYfi
+						94QcGWeku6T24AvaJ33sHEilrvnRDfgm4aJpMaA5XxSyOzsWTRCu18T/jiBKFYvh
+						TQVYp8hdAog9GMjICrXqPARXwJQBOkQSJwQxozIxgABLzuxZetvv/Bhdbq0rbpk7
+						1Bgcx7iX1FYj/eOzYLpx+l9cpSJqtb3vveDQLMGESE0epefMdDhCf5oPJCkntr4A
+						5+pvyZyqgCCpJGxmFXil1zfpO2Hz3R9GSvkgwMX3ZxHI/9Zui7vF1bSLNTt50TKB
+						TfGsbVyWz06y/Y0e17HEP7J9AxNfO/8vowDUv0QLyaAFHnEkcYMGiIS9AgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFHRyYWluaW5nLmNjZWEub3JnLnVrMB0GA1UdDgQWBBTy
+						KmW+2gMYROrJikMsR2nPRYvbtjANBgkqhkiG9w0BAQUFAAOCAQEARKJcpoJ/AZbu
+						PAhqAR7v25TlONn/XQj5c6lES7TI1qPpCQ/5VsraIwKJDkbLO6Zv4DS0nVkepvaM
+						fAK6gPv9p5zT0VDJZQCFgB3CYxRMxlnrD885lMdETSPyiZnoyWjjBTB22fFJDeFy
+						1928iTJpB3Svjx81XAhbf71yAfcuTweb07W8cPgML47+4/NyaDdvWqClT8tebq/W
+						3ifzVDlGcQqf9eN6FyLVYWaj6Md/kiF0lae0FjLYgqYX0OD65HDgcWNGVEgHD/3y
+						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>
diff --git a/swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml
new file mode 100644
index 00000000..4fbc1b5c
--- /dev/null
+++ b/swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml
@@ -0,0 +1,231 @@
+<?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>
+      <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
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDIxWhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DXR1bWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj
+WPvROHchdCtMHI4Fxr9nNlnLzASonlX8SmuhZ6080jWEYQ+U9/AVyQge6p5kmASc
+NO+4VURn5WpGdT8q1RZeMxHMq0fIb8q8EU8qgC+bvOMgMEEx9tWB5tuOG5+gOPWI
+5NMTvtxRth8EV44DllZunA919Ei7JxvpJ2188y24u4zjs+henD4qir3h0oCiLVwI
+LCme6C0xXYH4aEX65YTfWL2bJqWCyLgWbMeZjxKDHqwDMFJfKZQazEK8la5n2Hzu
+h2bCCT61p1inNjHdxgWXkDYq3YfskDSksOOaY4+DzwGf1MtGiS9LfF7FuLF1uiUO
+h0upAZxiIYQfzCgsbukNAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFByOCp/OHHvM6gbSI9luT2kP
+qEPKMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
+DXR1bWlkcC5scnouZGWCDnR1bWlkcDEubHJ6LmRlgg50dW1pZHAyLmxyei5kZYEW
+emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
+gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQAT3As5OcAfO2e8xIYLlLgBED7E
+XewUJNl3fajpXnHHtzj0GmffS3yNX8ACBfnwHLH3pLZB7RUddm8G+ZE9S0uH5KJV
+UZgI+2769+aZGQZXvYpjdozSRWMsax3Dxk0/LM8dVd7ungufjQER6C1htiTPo20k
+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
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDIxWhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DXR1bWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj
+WPvROHchdCtMHI4Fxr9nNlnLzASonlX8SmuhZ6080jWEYQ+U9/AVyQge6p5kmASc
+NO+4VURn5WpGdT8q1RZeMxHMq0fIb8q8EU8qgC+bvOMgMEEx9tWB5tuOG5+gOPWI
+5NMTvtxRth8EV44DllZunA919Ei7JxvpJ2188y24u4zjs+henD4qir3h0oCiLVwI
+LCme6C0xXYH4aEX65YTfWL2bJqWCyLgWbMeZjxKDHqwDMFJfKZQazEK8la5n2Hzu
+h2bCCT61p1inNjHdxgWXkDYq3YfskDSksOOaY4+DzwGf1MtGiS9LfF7FuLF1uiUO
+h0upAZxiIYQfzCgsbukNAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFByOCp/OHHvM6gbSI9luT2kP
+qEPKMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
+DXR1bWlkcC5scnouZGWCDnR1bWlkcDEubHJ6LmRlgg50dW1pZHAyLmxyei5kZYEW
+emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
+gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQAT3As5OcAfO2e8xIYLlLgBED7E
+XewUJNl3fajpXnHHtzj0GmffS3yNX8ACBfnwHLH3pLZB7RUddm8G+ZE9S0uH5KJV
+UZgI+2769+aZGQZXvYpjdozSRWMsax3Dxk0/LM8dVd7ungufjQER6C1htiTPo20k
+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
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDIxWhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DXR1bWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj
+WPvROHchdCtMHI4Fxr9nNlnLzASonlX8SmuhZ6080jWEYQ+U9/AVyQge6p5kmASc
+NO+4VURn5WpGdT8q1RZeMxHMq0fIb8q8EU8qgC+bvOMgMEEx9tWB5tuOG5+gOPWI
+5NMTvtxRth8EV44DllZunA919Ei7JxvpJ2188y24u4zjs+henD4qir3h0oCiLVwI
+LCme6C0xXYH4aEX65YTfWL2bJqWCyLgWbMeZjxKDHqwDMFJfKZQazEK8la5n2Hzu
+h2bCCT61p1inNjHdxgWXkDYq3YfskDSksOOaY4+DzwGf1MtGiS9LfF7FuLF1uiUO
+h0upAZxiIYQfzCgsbukNAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFByOCp/OHHvM6gbSI9luT2kP
+qEPKMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
+DXR1bWlkcC5scnouZGWCDnR1bWlkcDEubHJ6LmRlgg50dW1pZHAyLmxyei5kZYEW
+emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
+gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQAT3As5OcAfO2e8xIYLlLgBED7E
+XewUJNl3fajpXnHHtzj0GmffS3yNX8ACBfnwHLH3pLZB7RUddm8G+ZE9S0uH5KJV
+UZgI+2769+aZGQZXvYpjdozSRWMsax3Dxk0/LM8dVd7ungufjQER6C1htiTPo20k
+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
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDIxWhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DXR1bWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj
+WPvROHchdCtMHI4Fxr9nNlnLzASonlX8SmuhZ6080jWEYQ+U9/AVyQge6p5kmASc
+NO+4VURn5WpGdT8q1RZeMxHMq0fIb8q8EU8qgC+bvOMgMEEx9tWB5tuOG5+gOPWI
+5NMTvtxRth8EV44DllZunA919Ei7JxvpJ2188y24u4zjs+henD4qir3h0oCiLVwI
+LCme6C0xXYH4aEX65YTfWL2bJqWCyLgWbMeZjxKDHqwDMFJfKZQazEK8la5n2Hzu
+h2bCCT61p1inNjHdxgWXkDYq3YfskDSksOOaY4+DzwGf1MtGiS9LfF7FuLF1uiUO
+h0upAZxiIYQfzCgsbukNAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFByOCp/OHHvM6gbSI9luT2kP
+qEPKMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
+DXR1bWlkcC5scnouZGWCDnR1bWlkcDEubHJ6LmRlgg50dW1pZHAyLmxyei5kZYEW
+emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
+gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQAT3As5OcAfO2e8xIYLlLgBED7E
+XewUJNl3fajpXnHHtzj0GmffS3yNX8ACBfnwHLH3pLZB7RUddm8G+ZE9S0uH5KJV
+UZgI+2769+aZGQZXvYpjdozSRWMsax3Dxk0/LM8dVd7ungufjQER6C1htiTPo20k
+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>
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
new file mode 100644
index 00000000..293fe273
--- /dev/null
+++ b/swamid-interfederations-2.0/uat-adfs.geant.net-adfs-services-trust.xml
@@ -0,0 +1,159 @@
+<?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>
+      <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>
+						MIIIojCCB4qgAwIBAgIQfoxrYI8bPClvLVhlQwiU/zANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTE0MDIwNDAwMDAwMFoXDTE3MDIwMzIzNTk1OVowPzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExF1YXQtd3d3Lmdl
+						YW50Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5OW7kGWzND
+						Q5/5RlPlHElH9zXF1L53YVLmi7PCVGgRcUW9X5EH/9obrP4c0MzdlGbC7RYf+9mK
+						77P1ApSlTi00FA7LS4Wf5JythfHvs1YqJQRz1RU8r+AFV4p65UpafSKnk8mx0vcb
+						KcOyo5cMUhhAt72v8rMzMXlNQk9+tM5liLdwOViLUJCRp6ZbwPj2gt+MDWzV8jC3
+						MWmK7OSW19FNOzj3yMlrTnUDDu1J5R8/ICocUzrRDAyq4PdtbAWu2UdbZdfu/ISi
+						Wg7w1CGIhWJMgM4bzZLl02KCo3yEtvLvRuH6u1JUlqFtbV1pDNQ4dW4rrmWuNWgx
+						hWP0Vh5vWdsCAwEAAaOCBaEwggWdMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+						R+qQ47ntMB0GA1UdDgQWBBT8CQHkvrrktHXoJLNb7Az5h7kqTTAOBgNVHQ8BAf8E
+						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+						MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+						cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+						c3AudGNzLnRlcmVuYS5vcmcwggRNBgNVHREEggREMIIEQIIRdWF0LXd3dy5nZWFu
+						dC5uZXSCEnVhdC1hZGZzLmRhbnRlLm5ldIISdWF0LWFkZnMuZ2VhbnQubmV0ghV1
+						YXQtYXJjaGl2ZS5kYW50ZS5uZXSCFnVhdC1hdXRvYmFobi5nZWFudC5uZXSCEXVh
+						dC1ib2QuZ2VhbnQubmV0ghN1YXQtY2FyZW4uZGFudGUubmV0ghN1YXQtY2xvdWQu
+						Z2VhbnQubmV0ghR1YXQtY2xvdWRzLmdlYW50Lm5ldIISdWF0LWNuaXMuZ2VhbnQu
+						bmV0ghd1YXQtY29tbXVuaXR5LmRhbnRlLm5ldIIXdWF0LWNvbW11bml0eS5nZWFu
+						dC5uZXSCEHVhdC1lYy5kYW50ZS5uZXSCEHVhdC1lYy5nZWFudC5uZXSCFXVhdC1l
+						ZHVjb25mLmdlYW50Lm5ldIIVdWF0LWVkdWdhaW4uZ2VhbnQubmV0ghV1YXQtZWR1
+						cGVydC5nZWFudC5uZXSCFHVhdC1lZHVwa2kuZ2VhbnQubmV0ghB1YXQtZXUuZGFu
+						dGUubmV0ghB1YXQtZXUuZ2VhbnQubmV0giV1YXQtZ2VhbnQzLWludHJhbmV0LmFy
+						Y2hpdmUuZ2VhbnQubmV0ghx1YXQtZ2VhbnQzLmFyY2hpdmUuZ2VhbnQubmV0ghJ1
+						YXQtZ2lkcC5nZWFudC5uZXSCFXVhdC1pLXNoYXJlLmdlYW50Lm5ldIIddWF0LWlu
+						dHJhbmV0LmFmcmljYWNvbm5lY3QuZXWCHHVhdC1pbnRyYW5ldC5jYXJlbi5kYW50
+						ZS5uZXSCFnVhdC1pbnRyYW5ldC5kYW50ZS5uZXSCHnVhdC1pbnRyYW5ldC5ldW1l
+						ZGNvbm5lY3QzLm5ldIIWdWF0LWludHJhbmV0LmdlYW50Lm5ldIIWdWF0LWludHJh
+						bmV0LnRlaW4zLm5ldIISdWF0LW1kc2QuZ2VhbnQubmV0ghJ1YXQtbmV3cy5kYW50
+						ZS5uZXSCEnVhdC1uZXdzLmdlYW50Lm5ldIIVdWF0LXBhcnRuZXIuZ2VhbnQubmV0
+						ghd1YXQtcGVyZnNvbmFyLmdlYW50Lm5ldIIRdWF0LXBsbS5nZWFudC5uZXSCFnVh
+						dC1zZXJ2aWNlcy5nZWFudC5uZXSCGHVhdC13YXZlbGVuZ3RoLmdlYW50Lm5ldIIW
+						dWF0LXdlYmxvZ2luLmRhbnRlLm5ldIIWdWF0LXdlYmxvZ2luLmdlYW50Lm5ldIIX
+						dWF0LXdlYmxvZ2luMi5kYW50ZS5uZXSCF3VhdC13ZWJsb2dpbjIuZ2VhbnQubmV0
+						ghh1YXQtd3d3LmFmcmljYWNvbm5lY3QuZXWCEXVhdC13d3cuZGFudGUubmV0ghl1
+						YXQtd3d3LmV1bWVkY29ubmVjdDMubmV0ghV1YXQtd3d3LmdlYW50b3Blbi5uZXSC
+						EXVhdC13d3cudGVpbjMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCBhFhaVetfTvO6
+						i09vIxNWRlO5kFxXzeVDuHbm351hshNBdkKn+wIynpGOr55RrbO9N3DeupyxD7yL
+						bAOmoo72KXi1hfWfHavmKEn4eYbkvGfa6tWhudLWUg53R2ddXFlEpjR476Ydw4K0
+						GxbHcI1+XRKqrKEaxbqxhonQL98tW3QPLMTApJgQ4pyP3WY/jTW4B24Y7mrVNIIq
+						eTvZVDJJOberCcq9MDxZsF5RYOeVgKpkuT8XbDr4xKXkgmmGRsMx3eRKntEj7EfC
+						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>
+						MIIIojCCB4qgAwIBAgIQfoxrYI8bPClvLVhlQwiU/zANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTE0MDIwNDAwMDAwMFoXDTE3MDIwMzIzNTk1OVowPzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExF1YXQtd3d3Lmdl
+						YW50Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5OW7kGWzND
+						Q5/5RlPlHElH9zXF1L53YVLmi7PCVGgRcUW9X5EH/9obrP4c0MzdlGbC7RYf+9mK
+						77P1ApSlTi00FA7LS4Wf5JythfHvs1YqJQRz1RU8r+AFV4p65UpafSKnk8mx0vcb
+						KcOyo5cMUhhAt72v8rMzMXlNQk9+tM5liLdwOViLUJCRp6ZbwPj2gt+MDWzV8jC3
+						MWmK7OSW19FNOzj3yMlrTnUDDu1J5R8/ICocUzrRDAyq4PdtbAWu2UdbZdfu/ISi
+						Wg7w1CGIhWJMgM4bzZLl02KCo3yEtvLvRuH6u1JUlqFtbV1pDNQ4dW4rrmWuNWgx
+						hWP0Vh5vWdsCAwEAAaOCBaEwggWdMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+						R+qQ47ntMB0GA1UdDgQWBBT8CQHkvrrktHXoJLNb7Az5h7kqTTAOBgNVHQ8BAf8E
+						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+						MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+						cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+						c3AudGNzLnRlcmVuYS5vcmcwggRNBgNVHREEggREMIIEQIIRdWF0LXd3dy5nZWFu
+						dC5uZXSCEnVhdC1hZGZzLmRhbnRlLm5ldIISdWF0LWFkZnMuZ2VhbnQubmV0ghV1
+						YXQtYXJjaGl2ZS5kYW50ZS5uZXSCFnVhdC1hdXRvYmFobi5nZWFudC5uZXSCEXVh
+						dC1ib2QuZ2VhbnQubmV0ghN1YXQtY2FyZW4uZGFudGUubmV0ghN1YXQtY2xvdWQu
+						Z2VhbnQubmV0ghR1YXQtY2xvdWRzLmdlYW50Lm5ldIISdWF0LWNuaXMuZ2VhbnQu
+						bmV0ghd1YXQtY29tbXVuaXR5LmRhbnRlLm5ldIIXdWF0LWNvbW11bml0eS5nZWFu
+						dC5uZXSCEHVhdC1lYy5kYW50ZS5uZXSCEHVhdC1lYy5nZWFudC5uZXSCFXVhdC1l
+						ZHVjb25mLmdlYW50Lm5ldIIVdWF0LWVkdWdhaW4uZ2VhbnQubmV0ghV1YXQtZWR1
+						cGVydC5nZWFudC5uZXSCFHVhdC1lZHVwa2kuZ2VhbnQubmV0ghB1YXQtZXUuZGFu
+						dGUubmV0ghB1YXQtZXUuZ2VhbnQubmV0giV1YXQtZ2VhbnQzLWludHJhbmV0LmFy
+						Y2hpdmUuZ2VhbnQubmV0ghx1YXQtZ2VhbnQzLmFyY2hpdmUuZ2VhbnQubmV0ghJ1
+						YXQtZ2lkcC5nZWFudC5uZXSCFXVhdC1pLXNoYXJlLmdlYW50Lm5ldIIddWF0LWlu
+						dHJhbmV0LmFmcmljYWNvbm5lY3QuZXWCHHVhdC1pbnRyYW5ldC5jYXJlbi5kYW50
+						ZS5uZXSCFnVhdC1pbnRyYW5ldC5kYW50ZS5uZXSCHnVhdC1pbnRyYW5ldC5ldW1l
+						ZGNvbm5lY3QzLm5ldIIWdWF0LWludHJhbmV0LmdlYW50Lm5ldIIWdWF0LWludHJh
+						bmV0LnRlaW4zLm5ldIISdWF0LW1kc2QuZ2VhbnQubmV0ghJ1YXQtbmV3cy5kYW50
+						ZS5uZXSCEnVhdC1uZXdzLmdlYW50Lm5ldIIVdWF0LXBhcnRuZXIuZ2VhbnQubmV0
+						ghd1YXQtcGVyZnNvbmFyLmdlYW50Lm5ldIIRdWF0LXBsbS5nZWFudC5uZXSCFnVh
+						dC1zZXJ2aWNlcy5nZWFudC5uZXSCGHVhdC13YXZlbGVuZ3RoLmdlYW50Lm5ldIIW
+						dWF0LXdlYmxvZ2luLmRhbnRlLm5ldIIWdWF0LXdlYmxvZ2luLmdlYW50Lm5ldIIX
+						dWF0LXdlYmxvZ2luMi5kYW50ZS5uZXSCF3VhdC13ZWJsb2dpbjIuZ2VhbnQubmV0
+						ghh1YXQtd3d3LmFmcmljYWNvbm5lY3QuZXWCEXVhdC13d3cuZGFudGUubmV0ghl1
+						YXQtd3d3LmV1bWVkY29ubmVjdDMubmV0ghV1YXQtd3d3LmdlYW50b3Blbi5uZXSC
+						EXVhdC13d3cudGVpbjMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCBhFhaVetfTvO6
+						i09vIxNWRlO5kFxXzeVDuHbm351hshNBdkKn+wIynpGOr55RrbO9N3DeupyxD7yL
+						bAOmoo72KXi1hfWfHavmKEn4eYbkvGfa6tWhudLWUg53R2ddXFlEpjR476Ydw4K0
+						GxbHcI1+XRKqrKEaxbqxhonQL98tW3QPLMTApJgQ4pyP3WY/jTW4B24Y7mrVNIIq
+						eTvZVDJJOberCcq9MDxZsF5RYOeVgKpkuT8XbDr4xKXkgmmGRsMx3eRKntEj7EfC
+						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">DANTE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dante.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>DANTE IT Support</md:GivenName>
+    <md:EmailAddress>mailto:DANTEITSupport@dante.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>DANTE IT</md:GivenName>
+    <md:EmailAddress>mailto:it@dante.net</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
new file mode 100644
index 00000000..769775aa
--- /dev/null
+++ b/swamid-interfederations-2.0/uat-bod-gui.geant.net-autobahn-gui.xml
@@ -0,0 +1,96 @@
+<?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>
+      <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>
+						MIIDMjCCAhqgAwIBAgIJAMEuy+eDkc/OMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDAeFw0xNDA0MTExNTEwMTRaFw0xNzA0
+						MTExNTEwMTRaMCAxHjAcBgNVBAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9lmeNqQLqsIvz+9wIHTQ01unef
+						zHS+ydVbDDdDAt9+GbKGtQMzkEKdDCQP/OVR4oFJoy26YZO2wC3LcgfcYsZn2RNV
+						9de4Y/Wyov/LOulVAtxiPBkcMuBpdDiyeHc04dI29BDAk4A9b/oh2DRLOSOr0X6n
+						SxYlVdoRqlsNlvt5P94O5Y+iywszr+fSWkg4wXnBbhU5wz8WiMajAhwSUv/WihTn
+						0kjbBPCC/oB9X4rInBWPavZlq/vLT+Xs90c/ouu+uDC2xtGopR9mk/tZZUw6VT+w
+						x6TOgSPPVBONVYcVn068Ea8L0fIDvKJUglVOhNnLo4SikRNP6Q6o+vSz5LsCAwEA
+						AaNvMG0wTAYDVR0RBEUwQ4IVdWF0LWJvZC1ndWkuZ2VhbnQubmV0hipodHRwczov
+						L3VhdC1ib2QtZ3VpLmdlYW50Lm5ldC9hdXRvYmFobi1ndWkwHQYDVR0OBBYEFDx7
+						wMI5VKSZDqbH18/emvgkpgogMA0GCSqGSIb3DQEBBQUAA4IBAQCxq8PPlNcMoFdK
+						BCMG8N+ZxA540tGHaaiEdBWutqQ29csBJn/c2BKdcP1P+A71lQKQrDOQUIZ0DHTi
+						KyVVjDeavoVZndhGLZuviHK4CJU7uON15fEzz2mu3tBm1H2i7bVDjG3Quh/TAar7
+						VnGDY6tHLG2vktHHIsXWxidajHIilI8XF14wC+Eoe8nt9ot2xJ0GxYzKcgu6wYUc
+						JTse+N5A0mRv40kor80ySUbJ+U4CrvelDlpaj+PmlcR5k4aSQ05prZnjWViRpQo+
+						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>
+						MIIDMjCCAhqgAwIBAgIJAMEuy+eDkc/OMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDAeFw0xNDA0MTExNTEwMTRaFw0xNzA0
+						MTExNTEwMTRaMCAxHjAcBgNVBAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9lmeNqQLqsIvz+9wIHTQ01unef
+						zHS+ydVbDDdDAt9+GbKGtQMzkEKdDCQP/OVR4oFJoy26YZO2wC3LcgfcYsZn2RNV
+						9de4Y/Wyov/LOulVAtxiPBkcMuBpdDiyeHc04dI29BDAk4A9b/oh2DRLOSOr0X6n
+						SxYlVdoRqlsNlvt5P94O5Y+iywszr+fSWkg4wXnBbhU5wz8WiMajAhwSUv/WihTn
+						0kjbBPCC/oB9X4rInBWPavZlq/vLT+Xs90c/ouu+uDC2xtGopR9mk/tZZUw6VT+w
+						x6TOgSPPVBONVYcVn068Ea8L0fIDvKJUglVOhNnLo4SikRNP6Q6o+vSz5LsCAwEA
+						AaNvMG0wTAYDVR0RBEUwQ4IVdWF0LWJvZC1ndWkuZ2VhbnQubmV0hipodHRwczov
+						L3VhdC1ib2QtZ3VpLmdlYW50Lm5ldC9hdXRvYmFobi1ndWkwHQYDVR0OBBYEFDx7
+						wMI5VKSZDqbH18/emvgkpgogMA0GCSqGSIb3DQEBBQUAA4IBAQCxq8PPlNcMoFdK
+						BCMG8N+ZxA540tGHaaiEdBWutqQ29csBJn/c2BKdcP1P+A71lQKQrDOQUIZ0DHTi
+						KyVVjDeavoVZndhGLZuviHK4CJU7uON15fEzz2mu3tBm1H2i7bVDjG3Quh/TAar7
+						VnGDY6tHLG2vktHHIsXWxidajHIilI8XF14wC+Eoe8nt9ot2xJ0GxYzKcgu6wYUc
+						JTse+N5A0mRv40kor80ySUbJ+U4CrvelDlpaj+PmlcR5k4aSQ05prZnjWViRpQo+
+						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">DANTE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dante.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>DANTE IT Support</md:Company>
+    <md:EmailAddress>mailto:DANTEITSupport@dante.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>DANTE IT</md:Company>
+    <md:EmailAddress>mailto:it@dante.net</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
new file mode 100644
index 00000000..5ce5f7cc
--- /dev/null
+++ b/swamid-interfederations-2.0/uat-nsuk.elsevieremea.com-oa-metadata.xml
@@ -0,0 +1,81 @@
+<?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>
+						MIIDgjCCAmqgAwIBAgIJAIPaQ409Yt0iMA0GCSqGSIb3DQEBBQUAMDQxDjAMBgNV
+						BAoTBU1OU1VLMSIwIAYDVQQDExl1YXQtbnN1ay5lbHNldmllcmVtZWEuY29tMB4X
+						DTEyMTEyOTAyNTIxM1oXDTIyMTEyNzAyNTIxM1owNDEOMAwGA1UEChMFTU5TVUsx
+						IjAgBgNVBAMTGXVhdC1uc3VrLmVsc2V2aWVyZW1lYS5jb20wggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDhnZp/bmCr/TQS5osRk8lfgcUeGptgZSid/7fI
+						LYQUzL1Dsl3hXmfucOS/Db+De0TqEFwkxZ2kf4qxn91X/rFnqWGiRfTy1LOFc5MW
+						eZ2XdU36cfq2Gt8Wq/bF0lVgvPqqM9z4b0fgMt3xMta9XHJXRE/HFSAuJ77FpDUw
+						YkCTIIzUvFPimdEFpSyltqlO0r77a2nrvGgDA0FwYYwQ0iRKT16RANcRAL07pzWe
+						1ECO4H79bvuDyeYmeHCNTbQ4lovqEjeGgu+I0i+jf2pod6KX6ILaPXPjWdZPW+u2
+						CTTqnDPt2oBmQJHHibn2r7yPPIXz2UlzT4u1/xSqMZu82n/vAgMBAAGjgZYwgZMw
+						HQYDVR0OBBYEFElTHK+kxkQmCYiclyw5swDyhIqEMGQGA1UdIwRdMFuAFElTHK+k
+						xkQmCYiclyw5swDyhIqEoTikNjA0MQ4wDAYDVQQKEwVNTlNVSzEiMCAGA1UEAxMZ
+						dWF0LW5zdWsuZWxzZXZpZXJlbWVhLmNvbYIJAIPaQ409Yt0iMAwGA1UdEwQFMAMB
+						Af8wDQYJKoZIhvcNAQEFBQADggEBAJPUl/JrhkaUwhHrrTzP9IojhhX/2lumXjNL
+						OIGtDF0A0yMuq6OuRwrQ6IEvCTgXNOpIZShkbzPPWR0YF240zLB3IobMDpfH8G1r
+						lycsXjuhgAT4oluZg08Ogs4EpzlQfxmzsiL8a+NV7JasoksJll1yZnHCt1BmaNZx
+						76fl5ti7eOha51lhC0p4dPM7nVjPklk1yOTbhAeLIqIiD+QbczadBc97lY0KqLvk
+						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>
+						MIIDgjCCAmqgAwIBAgIJAIPaQ409Yt0iMA0GCSqGSIb3DQEBBQUAMDQxDjAMBgNV
+						BAoTBU1OU1VLMSIwIAYDVQQDExl1YXQtbnN1ay5lbHNldmllcmVtZWEuY29tMB4X
+						DTEyMTEyOTAyNTIxM1oXDTIyMTEyNzAyNTIxM1owNDEOMAwGA1UEChMFTU5TVUsx
+						IjAgBgNVBAMTGXVhdC1uc3VrLmVsc2V2aWVyZW1lYS5jb20wggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDhnZp/bmCr/TQS5osRk8lfgcUeGptgZSid/7fI
+						LYQUzL1Dsl3hXmfucOS/Db+De0TqEFwkxZ2kf4qxn91X/rFnqWGiRfTy1LOFc5MW
+						eZ2XdU36cfq2Gt8Wq/bF0lVgvPqqM9z4b0fgMt3xMta9XHJXRE/HFSAuJ77FpDUw
+						YkCTIIzUvFPimdEFpSyltqlO0r77a2nrvGgDA0FwYYwQ0iRKT16RANcRAL07pzWe
+						1ECO4H79bvuDyeYmeHCNTbQ4lovqEjeGgu+I0i+jf2pod6KX6ILaPXPjWdZPW+u2
+						CTTqnDPt2oBmQJHHibn2r7yPPIXz2UlzT4u1/xSqMZu82n/vAgMBAAGjgZYwgZMw
+						HQYDVR0OBBYEFElTHK+kxkQmCYiclyw5swDyhIqEMGQGA1UdIwRdMFuAFElTHK+k
+						xkQmCYiclyw5swDyhIqEoTikNjA0MQ4wDAYDVQQKEwVNTlNVSzEiMCAGA1UEAxMZ
+						dWF0LW5zdWsuZWxzZXZpZXJlbWVhLmNvbYIJAIPaQ409Yt0iMAwGA1UdEwQFMAMB
+						Af8wDQYJKoZIhvcNAQEFBQADggEBAJPUl/JrhkaUwhHrrTzP9IojhhX/2lumXjNL
+						OIGtDF0A0yMuq6OuRwrQ6IEvCTgXNOpIZShkbzPPWR0YF240zLB3IobMDpfH8G1r
+						lycsXjuhgAT4oluZg08Ogs4EpzlQfxmzsiL8a+NV7JasoksJll1yZnHCt1BmaNZx
+						76fl5ti7eOha51lhC0p4dPM7nVjPklk1yOTbhAeLIqIiD+QbczadBc97lY0KqLvk
+						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>
diff --git a/swamid-interfederations-2.0/uat.digitaltheatreplus.com.xml b/swamid-interfederations-2.0/uat.digitaltheatreplus.com.xml
new file mode 100644
index 00000000..c5a0de00
--- /dev/null
+++ b/swamid-interfederations-2.0/uat.digitaltheatreplus.com.xml
@@ -0,0 +1,68 @@
+<?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>
+      <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>
+						MIIDBjCCAe6gAwIBAgIJANaX6ppqsyTMMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWR0cGx1cy51YXQudnVhbHRvLmNvbTAeFw0xNDA4MDQwOTM2MzNaFw0yNDA4
+						MDEwOTM2MzNaMCAxHjAcBgNVBAMTFWR0cGx1cy51YXQudnVhbHRvLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALPqJcWAY3p69eBmlJOCtQzRQWZF
+						osie4DnauZj5lnv0dONDi0HmpOMKaIEpGk2eIb5e7WRkdDdBMX4sq2+8aTgF8h0J
+						1cBZozFWEaVloD/Y049WF+BCyDipQxZWdHXuIC84w5Tnqy9lEBJjJZTI+n6Brcwf
+						ql2/Ao79SftGI5Mj+xgtAlXIpue4aYsaOOjU8JjiFZ92eNufe1WZlknqNCWB1YDM
+						PUJ4pUdAd3BtbgfT2m/7Ke/X6ly+SkUpkw2To+HU4IxrWzp2/NlaV/oub0xyZUKr
+						VaA/iaKJErNy0EYB5RTczyuYdlxm0nFEdDjKKpV2lBQ7gEFFS59+Z1EP93ECAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVZHRwbHVzLnVhdC52dWFsdG8uY29tMB0GA1UdDgQW
+						BBRSiWT+Tt9yalHP724P9qv9UqTQ+TANBgkqhkiG9w0BAQUFAAOCAQEAlmXLm1z8
+						+MQwuXCShn9XL65A8kkODZzmPblKi9M+D/7P48/RdLEgAdVWiMyRdr/WgFsk01pY
+						hqc2MhW6qMXhEt5bzSCEFrK5qhJd01q4TjMEfhg++dI9e1J4po9u+HiGMQAmxX1C
+						3CCDpy6cSBOLM4lVE/O7niehk7B7P6xlzGHRCVqtZlfkMP1HbV7nLnVZSkzGx2S+
+						zb5rciB24IYrz5HW46tnyGBvWZsxJe4P6iETYq0cX3GIPVJo9odMCBJ+VBtix+m/
+						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>
diff --git a/swamid-interfederations-2.0/uat.staffsubs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/uat.staffsubs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..7f08fc43
--- /dev/null
+++ b/swamid-interfederations-2.0/uat.staffsubs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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.staffsubs.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="2014-10-02T11:42: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.staffsubs.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>
+						MIIDCTCCAfGgAwIBAgIJAIqBFTxbOzVpMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnVhdC5zdGFmZnN1YnMub3guYWMudWswHhcNMTQxMDAxMTI1OTE1WhcNMjQw
+						OTI4MTI1OTE1WjAhMR8wHQYDVQQDExZ1YXQuc3RhZmZzdWJzLm94LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwiFfqsi+5atFOA+H2AGWJOkv
+						NP1h4W9LZMgyfC5BRBpRe+LTKuUOBgGnE0aELcDP2Sfko51AS4lNGOPO95ttYL/x
+						Mt01AeDnbZy++mzNpdok3GkGrn3TFy3pWiambJBU6gLTAif1xZwVFTYj/qkJy2d2
+						Kt6OE+D5zQgQYfIjhZTBM2+aQDHkt1wCdhGntHKenE1PqwFjM1wbIcKRfJuEYfTb
+						NiT/SCKJyIY8pMzGSGUOIWBiITwOo/74eVa16qEbjSLrOzh/3Ng2XSkJiBH89vx/
+						UYT9cfkiPhjlE+JmDIFHfaJR2eqitOpTD9fKt4Y46016CaKDSDeZjJXyQT22KwID
+						AQABo0QwQjAhBgNVHREEGjAYghZ1YXQuc3RhZmZzdWJzLm94LmFjLnVrMB0GA1Ud
+						DgQWBBQzimnzRTqL34ndNzsV9V2iNg6aNDANBgkqhkiG9w0BAQUFAAOCAQEAEKtE
+						guYI0ex37725s2GK7PzkqfbT91/Av/k97Z4+iGtYGBa0B7aL/p+Sw1PwgKnUqvw5
+						OOGswJOjFHdKUiwomyeedA/1ojlVZou1N/C86YSSr1YlbruOlRm90QIOulZVDMi3
+						IVaUamwWpie1+Nyas1X9pnKs/wn18YJYVEJmlG0oVh/9foZm7ph3Z5J7bkA9mV+R
+						HvrOoKZS5yUUfE03fYP/931Zv6/POl8Srljh+yBUpbEZXdQma0mrvPK+V5p1ugUL
+						Ay6LEowEY7LJXL5GFymbbohOZTDT/TEDZQxZd+gsi58/r2YixRwtO87tnOJdUEvw
+						21204RAvyjBXtPAIiA==
+					</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://uat.staffsubs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.staffsubs.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://uat.staffsubs.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://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uat.staffsubs.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 UAT Staff Subscriptions Site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ops Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rob</md:GivenName>
+    <md:SurName>Hebron</md:SurName>
+    <md:EmailAddress>mailto:rob.hebron@it.ox.ac.uk</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
new file mode 100644
index 00000000..b921eb07
--- /dev/null
+++ b/swamid-interfederations-2.0/uat.twigonglow.com-shibboleth-sp.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIDJzCCAg+gAwIBAgIJAJxETCSASpdZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnVhdC50d2lnb25nbG93LmNvbTAeFw0xNDA5MDIxMDUwMTdaFw0yNDA4MzAx
+						MDUwMTdaMB0xGzAZBgNVBAMTEnVhdC50d2lnb25nbG93LmNvbTCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAO16uIrDV6BS/n1wSQbEHv7o6/OBn2JKbIll
+						xT2Fju/J811O8tiGU5B9dioUK5rOhBayNFEdihjPfnhJyS0JQpR+HWMlepvVrWiq
+						MWoLlS0QPOkVv2n1bdf2lm6UpYF845mQ5W6O0UnaV9FbZ1WoE0XwmyKKCctBW8td
+						ZsDnm2NORInb5kcL55RoSvkM5uVdFxeWij+VJI8TKwbLmj1rNNOLf9sYrPKCCqiw
+						axFjbMNEPXj2BLoYkd+mF0wde4f13fcqbieVsHMm54reRArBxfj295B3qaUgiIFw
+						Xro+9UuAQVxfEfyNFtzuwe0Jci+55eqYBu3THRa3ufqq7jtaKs8CAwEAAaNqMGgw
+						RwYDVR0RBEAwPoISdWF0LnR3aWdvbmdsb3cuY29thihodHRwczovL3VhdC50d2ln
+						b25nbG93LmNvbS9zaGliYm9sZXRoLXNwMB0GA1UdDgQWBBTD+Uzr1X5gutAR4Yjh
+						wBn8vpBQZjANBgkqhkiG9w0BAQUFAAOCAQEAdOnoWG0rOFuToaqy+m9atSkqvkHR
+						CXqziHAxvLFRfvMrM/vNIHOcbpDiV0ZGmzOS6us3fY4sxE7rdEWZeYJ+W+b6rkln
+						d5t3frsl1dlJlrlT/SFTVX0YmkphXqncFxH0I62zcUpNRirx0T3LFGgTrpAdzXo2
+						RNKyssZjqxwRxhShdmZW2y2ja+oDFwZGNTNmgcm/1X3VGSyK+48LwOAsT5UGENtW
+						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>Jim</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:jsmith@twig-world.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jim</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:jsmith@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
new file mode 100644
index 00000000..a49034ac
--- /dev/null
+++ b/swamid-interfederations-2.0/uat.v-scene.ja.net-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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>
+						MIIEbjCCA1agAwIBAgIRAPLs2fw5NrHY6vHiBUWhWeIwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xNDA1MTYwMDAwMDBaFw0xNzA1MTUyMzU5NTlaMD4xITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxQQKi52LXNjZW5l
+						LmphLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMimqOow4OSM
+						cGivrxkXeSBOTQOp/jxDWV/Fgm9Q+jXCsHuLRzsi9luGrpglU/avF+HM55AuFb5z
+						I8O+H6k/+tMNoeJvcz8J8OiMo4Qul3CL61TjfyFElDwXY2ROJNAkS6vv5w92BTqx
+						h/u7UH6szFdUVK9ld980v5Sht4+YLlk0csTmtTJWAojm/kHVyM6uddr5rQrlfu9Y
+						omKaSVw8DGaQjfQ2x+FXHLOWQZ/NAHJiIRQ40D4UNxCw/dYxPUsfEToBZ/JShf+o
+						DXz2pMB4H0QzycPFLOICRISka0gO1wNWsGakAUn4uM6s1yfzDlyT5YM6+ycUo1jx
+						9NfQi1GaqjMCAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+						R+qQ47ntMB0GA1UdDgQWBBRISYDi3KrE1GaRx9MSCk+rgDVAcTAOBgNVHQ8BAf8E
+						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+						MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+						cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+						c3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQKi52LXNjZW5lLmphLm5ldDAN
+						BgkqhkiG9w0BAQUFAAOCAQEAcYIsGziwQ3v/twTh1kk3+Dhs1+kFvsZeTlQS4GTk
+						pkaE8RM8ELEx82PgQjuX2uUTxpfmopxst8FQ2eT/TAyh224EAoRkY2ODUru6Twzb
+						NmsBnIJtA0QWikK7P7i9sf1OGZJHCeKOxHHSsg6Z/mw1DGc420vUbA5KeZwRlVnk
+						X8Y8QEbGX7Ee0pvRVCURIBEuioQLUkMW1uJu4wwjBnGjRScSzgOXPQDY2q0+gYRt
+						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 Collections and Janet 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/ucl-safety.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..b95053fe
--- /dev/null
+++ b/swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml
@@ -0,0 +1,86 @@
+<?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>
+						MIIC9DCCAdygAwIBAgIJAKIVioCG3ZBZMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+						BAMTD3MwMzUyLTA1NDgtd2IwMTAeFw0xMDEwMDQxNzIxNTZaFw0yMDEwMDExNzIx
+						NTZaMBoxGDAWBgNVBAMTD3MwMzUyLTA1NDgtd2IwMTCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAMxOVF1mGMeCdKb7Z0syty24insTVStJ8v9nTwFjwwu9
+						czW5kz0LXEJ31BK26QOLcrf3GNJzWdSmUbwHJgv8KyzacBze6fUdKHjVEW6qIveA
+						nIzKGZxG+FjzZ280oIAEvZs+8Ti9bzSkPRp0IRRnsjmiov+hp7/Ga/pZe81WTRMn
+						p3cLL9UVvVg/SwUE9wOEfEIIiQ5rvQRKloTjC58b0layZgjJ1pKBkAeIwxusj++n
+						CqCyue4Kz3OjDmbQplVIn3d+EJKjmW/IXyNwOri7C9o6XKlmVmRdtDLQAwso4tXc
+						TvxPCm/makIaAt66yboQIuZJ6hZmTB1HqF0TlW9Gn5sCAwEAAaM9MDswGgYDVR0R
+						BBMwEYIPczAzNTItMDU0OC13YjAxMB0GA1UdDgQWBBQ2UBzH2KH4WXHk1WCJyf94
+						mG9F4zANBgkqhkiG9w0BAQUFAAOCAQEAxsn3j8kwu255CI0tn/uAdmNmDx+VRqrU
+						tbUjP4hERBpeLCSlVS799BrmOUH3Va+KXg4NwTWJpZJ5CszB4C8/RfpHZsIYHB+5
+						Qk4qtFWY9KiRwgt6HxFI4eSMa8xWKnA6FU3jlc1ngN4zRx4Mjjs6IstBqg53CXYo
+						hqpiMWakBYHx1vco/tadDS3tON9r0zGeOIH+Q3myZoTfXZkq1TCsKqHLi0G98soK
+						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>
+						MIIC9DCCAdygAwIBAgIJAKIVioCG3ZBZMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+						BAMTD3MwMzUyLTA1NDgtd2IwMTAeFw0xMDEwMDQxNzIxNTZaFw0yMDEwMDExNzIx
+						NTZaMBoxGDAWBgNVBAMTD3MwMzUyLTA1NDgtd2IwMTCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAMxOVF1mGMeCdKb7Z0syty24insTVStJ8v9nTwFjwwu9
+						czW5kz0LXEJ31BK26QOLcrf3GNJzWdSmUbwHJgv8KyzacBze6fUdKHjVEW6qIveA
+						nIzKGZxG+FjzZ280oIAEvZs+8Ti9bzSkPRp0IRRnsjmiov+hp7/Ga/pZe81WTRMn
+						p3cLL9UVvVg/SwUE9wOEfEIIiQ5rvQRKloTjC58b0layZgjJ1pKBkAeIwxusj++n
+						CqCyue4Kz3OjDmbQplVIn3d+EJKjmW/IXyNwOri7C9o6XKlmVmRdtDLQAwso4tXc
+						TvxPCm/makIaAt66yboQIuZJ6hZmTB1HqF0TlW9Gn5sCAwEAAaM9MDswGgYDVR0R
+						BBMwEYIPczAzNTItMDU0OC13YjAxMB0GA1UdDgQWBBQ2UBzH2KH4WXHk1WCJyf94
+						mG9F4zANBgkqhkiG9w0BAQUFAAOCAQEAxsn3j8kwu255CI0tn/uAdmNmDx+VRqrU
+						tbUjP4hERBpeLCSlVS799BrmOUH3Va+KXg4NwTWJpZJ5CszB4C8/RfpHZsIYHB+5
+						Qk4qtFWY9KiRwgt6HxFI4eSMa8xWKnA6FU3jlc1ngN4zRx4Mjjs6IstBqg53CXYo
+						hqpiMWakBYHx1vco/tadDS3tON9r0zGeOIH+Q3myZoTfXZkq1TCsKqHLi0G98soK
+						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>Steve</md:GivenName>
+    <md:SurName>Westwood</md:SurName>
+    <md:EmailAddress>mailto:stevew@optimadiagnostics.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Westwood</md:SurName>
+    <md:EmailAddress>mailto:stevew@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
new file mode 100644
index 00000000..06157ae5
--- /dev/null
+++ b/swamid-interfederations-2.0/ucl.epiclearninggroup.com-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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>
+      <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>
+						MIIC0DCCAbigAwIBAgIJAKNyH/gxrpu9MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
+						BAMTA3VjbDAeFw0xMjEyMTQwOTQ4NDBaFw0yMjEyMTIwOTQ4NDBaMA4xDDAKBgNV
+						BAMTA3VjbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/YpbWoOORQ
+						eVEUuO5C+fue4B/lIw3d7J+oaeySdcld/BlHL1smwyQ51NkvZ3GCiQvRtWqcEDj1
+						wxHQeIOxCh8vJr1t7sdEI8McfTD9XS4sSGgNPehiynpcWlPB0HqtjAOwqaD5WDfN
+						xJDH73KhEg5rgnNKUuL9GCeuCwRUen3bbFk1pK4+s7CBxYr/JpjYKYZ4gBhsMmk9
+						hoDlh6Cyp2pgPgPJEdTUvKoWPzYi45dn7ih1JAxtsBQ/cDkd7apdK0IUjBSuXbYj
+						jIPjhI522fXX6f3Vhwl/ftkmDQgTJ3tqd7hMajkF/me/j5UNOAU/NxaveDyQEiiO
+						S2bGBBdURgsCAwEAAaMxMC8wDgYDVR0RBAcwBYIDdWNsMB0GA1UdDgQWBBS+K+xw
+						EBCrHMQGnD8pYs3KlndVwzANBgkqhkiG9w0BAQUFAAOCAQEAhpRh7R7B45GEvxFI
+						rzT6QHsERtp00ZZmStaqAa5+E4DuFwX15G+igX4Bqqo5q67ClYrKKUExwElGYrWp
+						FmL1U9LebLQLrfRqFiJxx670LTVVFBX1ElbWsPsDo5deASYIa6dYUd5k7jl74qSv
+						0At3Ch8Jo71SfslPn9UXqwpLr4GeGK3xqYMZsEl09Mgfr/DQVpZ6LMr+2gc4o5pp
+						BOGduhIs7GQjZAkugHE9UwZJiQYDVkhgoHz/1+3QfYPXerhunV3JM5VUbXXguRcd
+						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>René</md:GivenName>
+    <md:SurName>Soltermann</md:SurName>
+    <md:EmailAddress>mailto:RSoltermann@epiclearninggroup.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
new file mode 100644
index 00000000..eaae084f
--- /dev/null
+++ b/swamid-interfederations-2.0/ucl.sisoshibboleth.co.uk-entity.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
+						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
+						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
+						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
+						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
+						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
+						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
+						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
+						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
+						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
+						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
+						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
+						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>
diff --git a/swamid-interfederations-2.0/uclu.org-shibboleth-sp.xml b/swamid-interfederations-2.0/uclu.org-shibboleth-sp.xml
new file mode 100644
index 00000000..fde75665
--- /dev/null
+++ b/swamid-interfederations-2.0/uclu.org-shibboleth-sp.xml
@@ -0,0 +1,70 @@
+<?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>
+      <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>
+						MIIC/zCCAeegAwIBAgIJAKwfQJ+dJ/UEMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+						BAMTCHVjbHUub3JnMB4XDTEzMDMxNDE3MzEwOFoXDTIzMDMxMjE3MzEwOFowEzER
+						MA8GA1UEAxMIdWNsdS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDHFh0se+NKTy6reLEX+Hj6WK2A0noHMtkJKOamHMxS+Qi4wGIjJ8PghwPEgP7Z
+						SGb4149KQ3MOET7/HkrwCC8DL0XxXnKyHgys5T4BrFwE3b7m2R+2QHDZ3d1Yf+EA
+						vDwS6W8vmI+Xt79vNeQeno42AlOdmqoTa7caS76+Me2dhiIhWbeVyTMLaVpBNX+x
+						ejMdQ6xMMGSc0FYKllbnpl/DA7GZ3y3WgC+1HYD2il7R95ApCJyZay4SVpPwqRzw
+						Bt0pqxONisGS210SyEkRAglU1EqKW46C0OtM9e3gdKb2lENSrbqVy0y4wE3kdax2
+						MHH/oubXZoSB0fPwvPDnG8czAgMBAAGjVjBUMDMGA1UdEQQsMCqCCHVjbHUub3Jn
+						hh5odHRwczovL3VjbHUub3JnL3NoaWJib2xldGgtc3AwHQYDVR0OBBYEFBjW1cD5
+						xuoeLApI9ixFbHPIT+OGMA0GCSqGSIb3DQEBBQUAA4IBAQATsVU+8YZBQC94+okM
+						3vNuMvpB+oZWWV8PSs4cQbkEOTRRCv4pWD6kbQQEzPBa1wUbOoN71keSJ47tj7xH
+						0P/p3Jq0LTTgnC1tZUnqQTfKxvKr/NGvgRIxYq/JuV2NVUSbb1LesWkVPEFY13l2
+						Pa3L99neKFzEenRFyiqk+uy69ZjX5kN9H5WBIds2oBl67UFIDFkSO6pUCsffvcBe
+						NaD+/OdSqymbiaE8lQ6bXsZx5xyHdYB9WjfUFqAetRMsBRX7uOwIT8lWgBUjPurY
+						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>Patrick</md:GivenName>
+    <md:SurName>Dawkins</md:SurName>
+    <md:EmailAddress>mailto:p.dawkins@ucl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Patrick</md:GivenName>
+    <md:SurName>Dawkins</md:SurName>
+    <md:EmailAddress>mailto:p.dawkins@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
new file mode 100644
index 00000000..56682f4e
--- /dev/null
+++ b/swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml
@@ -0,0 +1,111 @@
+<?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>
+  </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: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>
+					      MIIEhzCCA2+gAwIBAgIQAXISYiAdwfN5w2mDPgJyXzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDMxMzAwMDAwMFoXDTE3MDMxMjIzNTk1OVowSzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSYwJAYDVQQDEx11Y29waWEtc2hp
+Yi5lbnN0YS1icmV0YWduZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALWTpOdlsKt48L1D1ztRAo9flFnNBBzLbAc98Ii22vUHa2o1Liyd4z9CE2g2
+cGuSDpdnQbCVzvXmC6N7HVI69fUk5ZD8ZLNZ1nM/+eZHQvtHWA+GnJO+Or6t3TGJ
+OlTHdXx8jgoWthhMlqqDQAvH97EaRHCjY2DCRnkdJ0jol2gKP3N6oSxM3rfvLxqd
+SCarw41BJfMFDQHcpfgS3yINT20fPjuQpwIkOMw0ybK2voU5/y4FgTbHoPmWfFtu
+OA7NgQkpXfSvuyrqEmDoxsXkdtN4tT6zOrVmrlwbMD5jaxaxr5kTYIohfqTTwL40
+jPSK7Hwa6Ff1F7KGZ6ObyBijlKUCAwEAAaOCAXowggF2MB8GA1UdIwQYMBaAFAy9
+k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBScd3VJKkSIGpKtCVfjIsroPi2p
+6TAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
+BQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwB
+AgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9U
+RVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRw
+Oi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcw
+AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwKAYDVR0RBCEwH4IddWNvcGlh
+LXNoaWIuZW5zdGEtYnJldGFnbmUuZnIwDQYJKoZIhvcNAQEFBQADggEBALbJ7uMn
+SVocgEkQFnI0XR1OSgIblCojbRormbjUOPhcxtXAdj9Rnsr9mQU+L+NF05drhE7Q
+1sWotCJ8h+o7bClHJoqz2rvoZdWjA1rMq78+I+WE98TTmcB+qVBYAQL20JIRef6g
+gN/yEOUFjtv1sFSAo/J1jHxA+KNRgxoJaHQX7GrdfzxlrLQkW8pH4XU0TU86U56u
+Fak+2sEaxzBqxs63/YSX79JLE+rutfGuuXAvlK4zlewsUZXGEhJ2RskxzhIkotIv
+uORzsv2UbiGbqUg1EgUyt2aWOxc+qk+PSEkLSpeDjMj5sc66g8JkqnMEW4bumdEE
+77hhE5zuasiDdvw=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEhzCCA2+gAwIBAgIQAXISYiAdwfN5w2mDPgJyXzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDMxMzAwMDAwMFoXDTE3MDMxMjIzNTk1OVowSzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSYwJAYDVQQDEx11Y29waWEtc2hp
+Yi5lbnN0YS1icmV0YWduZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALWTpOdlsKt48L1D1ztRAo9flFnNBBzLbAc98Ii22vUHa2o1Liyd4z9CE2g2
+cGuSDpdnQbCVzvXmC6N7HVI69fUk5ZD8ZLNZ1nM/+eZHQvtHWA+GnJO+Or6t3TGJ
+OlTHdXx8jgoWthhMlqqDQAvH97EaRHCjY2DCRnkdJ0jol2gKP3N6oSxM3rfvLxqd
+SCarw41BJfMFDQHcpfgS3yINT20fPjuQpwIkOMw0ybK2voU5/y4FgTbHoPmWfFtu
+OA7NgQkpXfSvuyrqEmDoxsXkdtN4tT6zOrVmrlwbMD5jaxaxr5kTYIohfqTTwL40
+jPSK7Hwa6Ff1F7KGZ6ObyBijlKUCAwEAAaOCAXowggF2MB8GA1UdIwQYMBaAFAy9
+k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBScd3VJKkSIGpKtCVfjIsroPi2p
+6TAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
+BQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwB
+AgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9U
+RVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRw
+Oi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcw
+AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwKAYDVR0RBCEwH4IddWNvcGlh
+LXNoaWIuZW5zdGEtYnJldGFnbmUuZnIwDQYJKoZIhvcNAQEFBQADggEBALbJ7uMn
+SVocgEkQFnI0XR1OSgIblCojbRormbjUOPhcxtXAdj9Rnsr9mQU+L+NF05drhE7Q
+1sWotCJ8h+o7bClHJoqz2rvoZdWjA1rMq78+I+WE98TTmcB+qVBYAQL20JIRef6g
+gN/yEOUFjtv1sFSAo/J1jHxA+KNRgxoJaHQX7GrdfzxlrLQkW8pH4XU0TU86U56u
+Fak+2sEaxzBqxs63/YSX79JLE+rutfGuuXAvlK4zlewsUZXGEhJ2RskxzhIkotIv
+uORzsv2UbiGbqUg1EgUyt2aWOxc+qk+PSEkLSpeDjMj5sc66g8JkqnMEW4bumdEE
+77hhE5zuasiDdvw=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://controller.mobile.lan/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://controller.mobile.lan/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">
+        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">Adresse institutionnelle de courriers</saml:AttributeValue>
+      </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">
+        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">Identifiant Institutionnel</saml:AttributeValue>
+      </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://unknown.site.com</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
new file mode 100644
index 00000000..ba076738
--- /dev/null
+++ b/swamid-interfederations-2.0/ucreative.idm.oclc.org-shibboleth.xml
@@ -0,0 +1,57 @@
+<?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>
+						MIID/DCCAuSgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBhMSEwHwYDVQQDFBgqLnVj
+						cmVhdGl2ZS5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xD
+						MSAwHgYJKoZIhvcNAQkBFhFha2tpbmVudkBvY2xjLm9yZzAeFw0xMzAzMDYyMzU0
+						NTdaFw0yMzAzMDYyMzU0NTdaMGExITAfBgNVBAMUGCoudWNyZWF0aXZlLmlkbS5v
+						Y2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxIDAeBgkqhkiG9w0B
+						CQEWEWFra2luZW52QG9jbGMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAtQnizhQPQp2HjZLdRFGV1w20U0XsDrrHSzDiU0kxevGeroRLU3k9TDfO
+						H3X+4FZlamSAEyg7ocmV6vKOi3PWo2hGeINtwhPBEo5JLFAl2waySFsvIlsCS+hr
+						xI+ZMrUU87S0kDeiheUTw6okMi2hBTCkPEDp3E/B7q0KMZACvL/sxm37x4Q+W4A3
+						fP0pFLpbZqdZ2oxHY3KS8m/ZtWbakS2ghKq2+FayIt9/rB4V2FjnxpbqAajaT0h5
+						siljQFizMd49JzvzOOBuNvXcSJKUHOhH/wiOi5RN2Mx0HJX/0UiTJjpKCuv/+aIp
+						R/elpqrOpEcOfY3QVdOQ+pepxM5spQIDAQABo4G+MIG7MB0GA1UdDgQWBBSEJ4FL
+						+vjP0U4FQXK3tgP8CVC77zCBiwYDVR0jBIGDMIGAgBSEJ4FL+vjP0U4FQXK3tgP8
+						CVC776FlpGMwYTEhMB8GA1UEAxQYKi51Y3JlYXRpdmUuaWRtLm9jbGMub3JnMQsw
+						CQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzEgMB4GCSqGSIb3DQEJARYRYWtraW5l
+						bnZAb2NsYy5vcmeCAQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
+						ieePqbyx1ZdzWKUXCgD1geGlmym1MWpFK7UueQWLHUTIi8oGBFb+kJsBkLCQaaVY
+						ags/ViUndWoBpiKP8efTMzjM3MpBOiji8u4KO/3O2tX0VkpPmQoO3ngOPtVSvm0y
+						FdG/sr9ZdhLw4kYok8Gpb6vi08I/75OlSIbd+W/gL1nBe8wzcmORHV5aOZ7006WJ
+						IlhSzLTtewnsmcTIJ/hVmgL07gByHLaJxR/40btxhdJrWENaSUnE2Vc8PHr46XSK
+						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>
diff --git a/swamid-interfederations-2.0/ucs.cirqahosting.com-shibboleth.xml b/swamid-interfederations-2.0/ucs.cirqahosting.com-shibboleth.xml
new file mode 100644
index 00000000..19446561
--- /dev/null
+++ b/swamid-interfederations-2.0/ucs.cirqahosting.com-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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>
+						MIIDHjCCAgagAwIBAgIJAJgpdfh1+YmvMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+						BAMTHWNhbXN1Zi5pc294Zm9yZC1ob3N0aW5nLmxvY2FsMB4XDTE1MDEyNjIyNDIy
+						OVoXDTI1MDEyMzIyNDIyOVowKDEmMCQGA1UEAxMdY2Ftc3VmLmlzb3hmb3JkLWhv
+						c3RpbmcubG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5jC5
+						HNdlXT+XHl10MnAnG/1HHiqEUCEHPZlNP/4vgEZcS1odaZwnbgzb6p9uZZIvG/15
+						1ZichCYob2AOUOYVKn6tcafdQYxEDSqnmBuuH/6NMDZqVCQAvCDkt9Tm2E+hBfzz
+						xCW0Bgl0EYY5ttzz8cI4EmNdvmjwDMksvNFxXvDwsoGeawPegCSfgYyW2cfrbDlL
+						rgcWjuO3+5e0HXW/k982iElL8yb5fXyTHBj+RBvjUVxTdCuFeLEiQwDgSEJwQNNx
+						iMMcO67dRbaydylxFk9+GvVkRd3JFGO+UJxn5ZyN2dSbuP2bbLpdYEiWqhuxNSNb
+						bVg2H694UeApZWQBAgMBAAGjSzBJMCgGA1UdEQQhMB+CHWNhbXN1Zi5pc294Zm9y
+						ZC1ob3N0aW5nLmxvY2FsMB0GA1UdDgQWBBTRQN1mn2+jFE6f5U1fyWVWhLhxYzAN
+						BgkqhkiG9w0BAQUFAAOCAQEALb+vfdXhr5lXgudzXI+Fhnp1lGmHCdrVdut8E/pw
+						QrRqVxEZ1T4rVoHLcVG3jsKb7voknZMfTriayogl2b7F95nV0dfL6+7e13tsB0DE
+						CRuo3jPUm3lvdxkacsgC9SNSJASa3lo5lsq7rUpvfCsF4lxjyE5gkYLuYWIpjC2L
+						zfyCpYrSVsQpFGe4NcdkEGIxfMIN3/odMgwzWR5LxU3/UFjIb/smfYYJcpEgDA8z
+						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>
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 8b7b2688..e06f870c 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,25 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
+  <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://eduid.cz/uri/sp-group/clarin</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-21T15:24: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>
+  </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://lindat.mff.cuni.cz/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">LINDAT/CLARIN repository and services</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fi">LINDAT/CLARIN säilytyspaikka ja palvelut</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">LINDAT/CLARIN-projektin säilytyspaikka, jonka sijainti on \"Institute of Formal and Applied Linguistics\", Kaarlen yliopisto, Praha.</mdui:Description>
-        <mdui:Description xml:lang="en">The repository of the LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Charles University in Prague.</mdui:Description>
+        <mdui:DisplayName xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Digital repository and services related to the LINDAT/CLARIN project focused on language research infrastructure at the Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</mdui:Description>
+        <mdui:Description xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN zaměřené na podporu výzkumu jazyka na Ústavu formální a aplikované lingvistiky Matematicko-fyzikální fakulty Univerzity Karlovy v Praze</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fi">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+        <mdui:Logo height="29" width="29">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAdBAMAAACkvXo8AAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAABJQTFRF////6ruX6aZ44Hs48+fc5ItNY8IEdAAAAAFiS0dEAIgFHUgAAAAJcEhZcwAAAEgAAABIAEbJaz4AAABXSURBVBjTY2AgDggJoPKNUfkspg6ofBUkjmgoSJIpEMYXNgbzjYYPHxQYrIYwvrNxCEjUBMZnMgaGjpOxAjxAgo1NQ41NEQHEaAwEyAHKKKQoQmTEoAEATVsQ7xmwu4QAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTMtMTItMTdUMTQ6NDI6NTgrMDE6MDACpPM3AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEzLTEyLTE3VDE0OjQyOjU5KzAxOjAw1Y5APwAAAABJRU5ErkJggg==</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="fi">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/DS" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Login" index="2"/>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRANAZM0fxIWg+DEEhaZlreVowDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
@@ -45,43 +75,65 @@ fk90Maa8HYp1OQagBlY9jhs4ImbPbsHM5Aa3f4ycxhXs+hecaJBD4WiaxeWpOWes
 k5Q+FdJCZoPqHRD2chNwhBErztJgujEarVtMBCUpCEpy5lwgFFFc2oekH8CkhWLw
 sv6GENdYGamg5HfRAq57+mGW3FUnox3gkqTWDuVzOaMfDlHvfqRVtC7n4mhHVAqz
 adGmTo4VvqYQsi0gVzrts5HDZAQBI13mpxua74rU8XyluKEyjS4gkVXLnlRjwXeF
-IhAZYQU=</ds:X509Certificate>
+IhAZYQU=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">LINDAT/CLARIN sailytyspaikka ja palvelut</md:ServiceName>
-      <md:ServiceName xml:lang="en">LINDAT/CLARIN repository and services</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">LINDAT/CLARIN-projektin sailytyspaikka, jonka sijainti on "Institute of Formal and Applied Linguistics", Kaarlen yliopisto, Praha .</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">The repository of the LINDAT/CLARIN project at the Institute of Formal and Applied Linguistics, Charles University in Prague .</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">LINDAT/CLARIN digital repository and services</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Repository and services of LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague, Czech Republic</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav formální a aplikované lingvistiky, Matematicko-fyzikální fakulta, Univerzita Karlova v Praze</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">ÚFAL MFF UK</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ufal.mff.cuni.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://ufal.mff.cuni.cz/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Jozef</md:GivenName>
-    <md:SurName>Misutka</md:SurName>
-    <md:EmailAddress>mailto:clarin-list@ufal.mff.cuni.cz</md:EmailAddress>
+    <md:GivenName>Pavel</md:GivenName>
+    <md:SurName>Straňák</md:SurName>
+    <md:EmailAddress>stranak@ufal.mff.cuni.cz</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>Jozef</md:GivenName>
-    <md:SurName>Misutka</md:SurName>
-    <md:EmailAddress>mailto:clarin-list@ufal.mff.cuni.cz</md:EmailAddress>
+    <md:GivenName>Authentication Support</md:GivenName>
+    <md:EmailAddress>lindat-technical@ufal.mff.cuni.cz</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uk-bris-shibboleth.moveon4.com-shibboleth.xml b/swamid-interfederations-2.0/uk-bris-shibboleth.moveon4.com-shibboleth.xml
new file mode 100644
index 00000000..4a57c504
--- /dev/null
+++ b/swamid-interfederations-2.0/uk-bris-shibboleth.moveon4.com-shibboleth.xml
@@ -0,0 +1,102 @@
+<?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>
+      <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>
+						MIIFgTCCA2mgAwIBAgIJAPyfEjrHG6KuMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNV
+						BAYTAkRFMRwwGgYDVQQKDBNRUyB1bmlzb2x1dGlvbiBHbWJIMSowKAYDVQQDDCF1
+						ay1icmlzdG9sLXNoaWJib2xldGgubW92ZW9uNC5jb20wHhcNMTQxMTA1MDY1MDM4
+						WhcNMzQxMDMxMDY1MDM4WjBXMQswCQYDVQQGEwJERTEcMBoGA1UECgwTUVMgdW5p
+						c29sdXRpb24gR21iSDEqMCgGA1UEAwwhdWstYnJpc3RvbC1zaGliYm9sZXRoLm1v
+						dmVvbjQuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAy58jkooZ
+						4lsnCxbii74W0dEtLU+6+DCRCtPyjKUpVG/dYTlj1WNASBiHWDKKYBk4L/SpkUik
+						WWvOktHoXCz3KPU6VaqtB2Um2dSKpEQb7qhQjeK36LB6kq6opwKk2svIaxkT1E3j
+						pc+o+toGxaLfoc9D11ZiwnWibaRZFvqWJ/cl0saNNzfdHjNIDJlNPZSfiXbGdGim
+						jgzc7Q1cG8acwLBaEYfNScd/+zKob7Hh0QJqpvP9faLdgsbtz6/hgJdbzrnnuIw5
+						WZijXpCkjbXV77JdoRRdTa7IotL6/p9/QgfoU21tjydql0RorjuhBV9xj4aEY0xo
+						Dm5hKpCb2NtxZU9FlyVEyYx+lrAkUHkrWTJuH6YlGref+TgXAyq3Pu1UcQfPxGv7
+						tGv6Sr0lxPI+MwbXkY1KcmWYQvgsIthPcuHRoud9x4TOwY2trMKwq8KEYJPj7Hhg
+						luoGOlLgLy9uE1rY8IrVMPta0jAWbVJ7087OnWS9bzBPPff+ThZVh3pOrIOW3ZDZ
+						EEOe+FgaPKiuTyCT3rsKecmTOmMCXiFISWgq9x8VPxOIxJRL0ze7c1NlHuGU494K
+						UjHj29M5cDmyVud3yJVDSr5kde5QvdVT2Rjid+8seaX0L0R+5BFc3VAjDRkRQlZM
+						6/OHPHiN1yTZ3rvS9/Gmu0Gxaou8AF7DtBECAwEAAaNQME4wHQYDVR0OBBYEFD5O
+						Xi14slUrKao3oHh+fJfqknUEMB8GA1UdIwQYMBaAFD5OXi14slUrKao3oHh+fJfq
+						knUEMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBACotJj7JrPXhz//v
+						d7lW6LSVOFEbMJQ+faci4XIXg2Hp/imeAKNpbldokdYjHLbobC5OgPpwjGgb89K9
+						9y0XUSmPucnKMFLFB6OLibMf1zCHel956wLJOrGGdoAy3hdhi/na2U02vtjexxGT
+						IqbicXEmAcVCRve0TDSUU/yJ/Q9kjNEoOlyo1Sy3+4SeO7tuY6FRCM07WnucXzJL
+						gNCrnqVxCTNa5ZhjP/Ppp2V3jIvcwvXg4TAtmKZBu6RhBSni4Ml4kTmiy2g9U8NP
+						3j1zWY0V5QaZ8B+nbBjRxpthROM+qN0M0ILxw/ClKIECo4k2ScmP/Idx82bGmX3H
+						kiyTX6+OoXY4uM3utyjDm3hTmz2w/Mwj+dZy5StmU7qxcjOIYlyrl7uRUyltW0c2
+						3U5scKxzexpKZ7anUmxecAvV0D5jmJyBOoUIwS0NbOJmS3aWdhu2gjJIXJCFeHY4
+						wz3mDO5e3XWr7c8Rw3Mh15bWxVZyYv7TvdbuPmZyEHL4Tmq1vnzsFDOMdOQQNlS9
+						kN8cbSNag89eDMLjs+0I64QRuC8zW7VzRw8/Jm/w4Th0ZNfF36dbmGe1Oa4YHKlq
+						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>
diff --git a/swamid-interfederations-2.0/uk.ihs.com-entity.xml b/swamid-interfederations-2.0/uk.ihs.com-entity.xml
new file mode 100644
index 00000000..659e6c40
--- /dev/null
+++ b/swamid-interfederations-2.0/uk.ihs.com-entity.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uk.ihs.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">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEGjCCAwKgAwIBAgIJANbtDttZCw1wMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
+						VQQGEwJVSzEQMA4GA1UECBMHRW5nbGFuZDESMBAGA1UEBxMJQnJhY2tuZWxsMQww
+						CgYDVQQKEwNJSFMxCzAJBgNVBAsTAklUMRYwFAYDVQQDEw13d3cuaWhzdGkuY29t
+						MSUwIwYJKoZIhvcNAQkBFhZob3N0aW5nc3VwcG9ydEBpaHMuY29tMB4XDTA5MDky
+						MjEwMzM0OFoXDTE5MDkyMDEwMzM0OFowgY0xCzAJBgNVBAYTAlVLMRAwDgYDVQQI
+						EwdFbmdsYW5kMRIwEAYDVQQHEwlCcmFja25lbGwxDDAKBgNVBAoTA0lIUzELMAkG
+						A1UECxMCSVQxFjAUBgNVBAMTDXd3dy5paHN0aS5jb20xJTAjBgkqhkiG9w0BCQEW
+						Fmhvc3RpbmdzdXBwb3J0QGlocy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQC/Ba3IwwsIvQgkzb/ssluNjiU95zWtyFMBCJ9b03XmB12QPF+/nTEV
+						VFu8Lm4btL7bu4FEQs04rWfxQ4EWpNgeh//UzohcUkikRT+empVepOlyxMCBr+3Q
+						fq/JN8P9riOuhW6uiADUWQ1OXOTdl4lAUXzSc7e/N+7vg4wIb7xzFDtp6h8BqhdF
+						a/noDPXXFesxtEq0ZjSVYahNMOhpsIZXNPKjuBlCFM/IC+5K6LYCY+2qYcuKH4YB
+						QtDtc7/KKJK0i3SpormleAXE9UPX+79nQ2uqUbhNG6OQzKpD+nIYDN/sPec8u2m8
+						2c+GPkqg8pKQz6LzdL8uTN5sZHgzQvg9AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJ
+						YIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1Ud
+						DgQWBBR99TJ9Meg90c3p614N474dVMS82DAfBgNVHSMEGDAWgBR99TJ9Meg90c3p
+						614N474dVMS82DANBgkqhkiG9w0BAQUFAAOCAQEAPM9Luz4hiaqXrCtcJ8NmNp40
+						b8x/zkUTI9VRq0EtIlD2UqnVVAh4HrGgGI0wnlzIdyaMdfjied/PBflfDto5tTz9
+						Z/9C4EViX91kOmApwJyiScP/cJX4BjUk08vORqIbu8oXlOfmcCAjT5+Y6RcloS9h
+						nkGwwNk8UnymkQtqw/MnK3DKTxcLdG4iphtzwpbcnAgO/Nb/mT8/tRWy215OuDII
+						DzE+93eMDZMqxG6X3jyYtfF9f551vCFvTDvOxkDd9dnSYPzb+++8BfTYtEnwpNiK
+						yKYcCFVxFCy1km7h2HBrOZMLUAbs0gGoTmSRAEByt0E3C8xzV1Ywu9htzRHmog==
+					</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.ihsti.com/logon/federatedaccess/UKFedAuthRec.aspx" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ihsti.com/logon/federatedaccess/UKFedAuthRec.aspx" index="1"/>
+  </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
new file mode 100644
index 00000000..33152560
--- /dev/null
+++ b/swamid-interfederations-2.0/uk.practicallaw.com-cs-oa-metadata.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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>
+						MIIC6DCCAdCgAwIBAgIEU1pN/TANBgkqhkiG9w0BAQUFADA2MRYwFAYDVQQKEw1Q
+						cmFjdGljYWwgTGF3MRwwGgYDVQQDExN1ay5wcmFjdGljYWxsYXcuY29tMB4XDTE0
+						MDQyNTExNTg1M1oXDTI0MDQyMjExNTg1M1owNjEWMBQGA1UEChMNUHJhY3RpY2Fs
+						IExhdzEcMBoGA1UEAxMTdWsucHJhY3RpY2FsbGF3LmNvbTCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBAJBGaaaJYyVzFc48ThFdkzUVkcPFQLgdZGSuQYPe
+						6hps6CmWGKKxGF5Wra1PlYMrgxu8dOMtMgzBTGEySJnjm5SUUemHehN+xL9AyCs2
+						UgHJooNsqdu6PbxVJMOhFuVCGhiIysSFA/xBinxRBgPcl+4aLIXdE8Lha2CWYxdd
+						4BfeOtx7X92vqpmBmMI/68/7BZWiJAmmko1D+OgH/DupwmdkasFisVcdFzWUQEgp
+						OY65dB7FxZpOY3zXrC7Af3OUxw9RnnlsgD2boRU48ddGBh4txXBU5Ft7RaGuRM+K
+						Bfh24nSjIXd1YDOjhTOPnD5Ty6/lO+tT+4Zlsww85LQKEwcCAwEAATANBgkqhkiG
+						9w0BAQUFAAOCAQEAGlqkedupw+BYF0ae7nLgesJ2VBdGTabqg+vB/G16ZAGKeBoj
+						vmd0w4Aii9sNnyb6BIQvXnlqvi7sNRXcBovlaQARTpTcCm9jHqWPvZzK9hxdm2/o
+						kbHBKjHnTL7YBxPwMfHkaOmQhx2tTPgGhOK34eUzhXlLSPYrtGcde/pCFsyuhCUT
+						NJ0vqLTB/w2YDJ0jC7xTCx+X6N+NulCteQosnKxtZ/blaHMwwX+j96LGHPtpOmN7
+						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>
+						MIIC6DCCAdCgAwIBAgIEU1pN/TANBgkqhkiG9w0BAQUFADA2MRYwFAYDVQQKEw1Q
+						cmFjdGljYWwgTGF3MRwwGgYDVQQDExN1ay5wcmFjdGljYWxsYXcuY29tMB4XDTE0
+						MDQyNTExNTg1M1oXDTI0MDQyMjExNTg1M1owNjEWMBQGA1UEChMNUHJhY3RpY2Fs
+						IExhdzEcMBoGA1UEAxMTdWsucHJhY3RpY2FsbGF3LmNvbTCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBAJBGaaaJYyVzFc48ThFdkzUVkcPFQLgdZGSuQYPe
+						6hps6CmWGKKxGF5Wra1PlYMrgxu8dOMtMgzBTGEySJnjm5SUUemHehN+xL9AyCs2
+						UgHJooNsqdu6PbxVJMOhFuVCGhiIysSFA/xBinxRBgPcl+4aLIXdE8Lha2CWYxdd
+						4BfeOtx7X92vqpmBmMI/68/7BZWiJAmmko1D+OgH/DupwmdkasFisVcdFzWUQEgp
+						OY65dB7FxZpOY3zXrC7Af3OUxw9RnnlsgD2boRU48ddGBh4txXBU5Ft7RaGuRM+K
+						Bfh24nSjIXd1YDOjhTOPnD5Ty6/lO+tT+4Zlsww85LQKEwcCAwEAATANBgkqhkiG
+						9w0BAQUFAAOCAQEAGlqkedupw+BYF0ae7nLgesJ2VBdGTabqg+vB/G16ZAGKeBoj
+						vmd0w4Aii9sNnyb6BIQvXnlqvi7sNRXcBovlaQARTpTcCm9jHqWPvZzK9hxdm2/o
+						kbHBKjHnTL7YBxPwMfHkaOmQhx2tTPgGhOK34eUzhXlLSPYrtGcde/pCFsyuhCUT
+						NJ0vqLTB/w2YDJ0jC7xTCx+X6N+NulCteQosnKxtZ/blaHMwwX+j96LGHPtpOmN7
+						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>
diff --git a/swamid-interfederations-2.0/ukaf.it-innovation.soton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ukaf.it-innovation.soton.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..f6fdd3ba
--- /dev/null
+++ b/swamid-interfederations-2.0/ukaf.it-innovation.soton.ac.uk-shibboleth.xml
@@ -0,0 +1,76 @@
+<?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://ukaf.it-innovation.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-13T15:30: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GENESI-DEC bridge to UK Access Management federation</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Enables UK Access Management federation members to access GENESI-DEC repositories</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDVDCCAjygAwIBAgIJAL06GKgIw781MA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+						BAMTHnVrYWYuaXQtaW5ub3ZhdGlvbi5zb3Rvbi5hYy51azAeFw0xMjAyMjMxNDU5
+						MzVaFw0yMjAyMjAxNDU5MzVaMCkxJzAlBgNVBAMTHnVrYWYuaXQtaW5ub3ZhdGlv
+						bi5zb3Rvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsh
+						7nb5qjRPVhJKl7d7HtTfVbmWSMq1NPzDzYyTMAOg0+VcmDFvu5ICIp0w2w07QzGv
+						3ryZp2TaT+9DNyYaeVfnSB5rPPAuHLHrXvTwszgfXH6Bq88fkBLEHR7xIMPNqNFG
+						9JHf6VY3Z6HwRhX2wJt34O6IO7q1AuMsgmSR8vLD6ftHX7VzSXkS305cA1zNN1vD
+						xnV8Zp8ZyNE3F5xVCZBVs7XK9futaxSL8GJfX8l0IzBFeezXh9BmN5p0/2KDtwmw
+						YsBinxXAIwBCUVctfuMpnM3p9ZHRTfR4hbkDwpbTXxwEmajDXnyrbdNK/zEuGhOW
+						4+m38wiymTEmMQaPys0CAwEAAaN/MH0wXAYDVR0RBFUwU4IedWthZi5pdC1pbm5v
+						dmF0aW9uLnNvdG9uLmFjLnVrhjFodHRwczovL3VrYWYuaXQtaW5ub3ZhdGlvbi5z
+						b3Rvbi5hYy51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBTAs5xK22h/EZSU8IMQeGKQ
+						mYg4YjANBgkqhkiG9w0BAQUFAAOCAQEAxm8quSodKR3OSqZKQyv48Nw4ztkOgoIq
+						iRT/SNCtGIsIxRLE/wh6VD92ini8KLXyjY+9vnySiIz7EmPU8noS67XRkfMss33Y
+						gB0uKN4jwo7wQw0oWzd7YuPjWBfWVgHElvtITjpJ/NR5MCk2A4w2kKjvCd70e+Ut
+						O8Uiewnm0VArTVusZ1IZtT3P+5Yp4Hiq5+sjtRbxhTQn/cAkl57CemlBrj6jsPT2
+						uH0taQOxowajF5t/STCwIlCRBNptPlAMFB0x6AB2Oq2dNjzLhq8VnpSAZ6+EwSuo
+						3nkLy6HSlY8Nka9tIZollWJv0yu6+6BHzf/KMzryiGaxpKjMtB+Caw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/POST" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Southampton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GENESI-DEC bridge to UK Access Management federation</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it-innovation.soton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:support@it-innovation.soton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Web Master</md:GivenName>
+    <md:EmailAddress>mailto:webmaster@it-innovation.soton.ac.uk</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
new file mode 100644
index 00000000..8e69483e
--- /dev/null
+++ b/swamid-interfederations-2.0/ukamf.belfastmet.ac.uk-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						YXN0bWV0LmFjLnVrMB4XDTE0MDMwNTA5NTUwNVoXDTM0MDIyODA5NTUwNVoweDEL
+						MAkGA1UEBhMCR0IxDzANBgNVBAgTBkFudHJpbTEQMA4GA1UEBxMHQmVsZmFzdDEl
+						MCMGA1UEChMcQmVsZmFzdCBNZXRyb3BvbGl0YW4gQ29sbGVnZTEfMB0GA1UEAxMW
+						dWthbWYuYmVsZmFzdG1ldC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAPLTkv6VRQDek5hYjPK1NawnSD9oeyhD+49qSNtArFn0C7VUSj3m+ags
+						5AAoNGDCLvxZ2suDNlPfLJs25ql4/TdyzFLcAPe09MClF5h8drxz264w9/fL+Oen
+						RnFSDBHSBkc1VwAxbmhoRbeR/fuxqwEtxfRnhU7p3YQSuVchtBNXyqN2J5UlW3Jb
+						ckV+4ITMNIVJdvqZPH8KoCEFCbblIA7I1atNNTUA0QelcNEYEYc4r6AvLijw/zmr
+						zzSOhpoycdy1vhId/rPZZ5/PxHZWEqgZep/MFl9MW1h4jbWBdtkEiD1wHkSl3EZr
+						Uorg9PcWnWQQr3A3uG3F4XJKfgYdyMcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						dOnRSUciIibF74fAF1NGvnXdyiMwznJcOogjfFKglD8dzkvqPahw29NipSBHcUoZ
+						28Qyn4cHJd9UWpr20uDLK2N3EU5eorUqcGDb/YIR3M6S0cYQF1qz+b33EuJo57rd
+						M36PNV1otHQPewerYlauSTnIh3lNNN1i5hCh8T+Xedz9pSH9kXBHY1r0Twzt7EWI
+						zUilG5FJClGAgoOvIxbWkcT9SVdFk5jX5f73w2fWDy/hLAvizbrVs1CFbwy9x/8s
+						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>
+						MIIDbDCCAlQCCQDS2kVQVGZPUTANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
+						QjEPMA0GA1UECBMGQW50cmltMRAwDgYDVQQHEwdCZWxmYXN0MSUwIwYDVQQKExxC
+						ZWxmYXN0IE1ldHJvcG9saXRhbiBDb2xsZWdlMR8wHQYDVQQDExZ1a2FtZi5iZWxm
+						YXN0bWV0LmFjLnVrMB4XDTE0MDMwNTA5NTUwNVoXDTM0MDIyODA5NTUwNVoweDEL
+						MAkGA1UEBhMCR0IxDzANBgNVBAgTBkFudHJpbTEQMA4GA1UEBxMHQmVsZmFzdDEl
+						MCMGA1UEChMcQmVsZmFzdCBNZXRyb3BvbGl0YW4gQ29sbGVnZTEfMB0GA1UEAxMW
+						dWthbWYuYmVsZmFzdG1ldC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAPLTkv6VRQDek5hYjPK1NawnSD9oeyhD+49qSNtArFn0C7VUSj3m+ags
+						5AAoNGDCLvxZ2suDNlPfLJs25ql4/TdyzFLcAPe09MClF5h8drxz264w9/fL+Oen
+						RnFSDBHSBkc1VwAxbmhoRbeR/fuxqwEtxfRnhU7p3YQSuVchtBNXyqN2J5UlW3Jb
+						ckV+4ITMNIVJdvqZPH8KoCEFCbblIA7I1atNNTUA0QelcNEYEYc4r6AvLijw/zmr
+						zzSOhpoycdy1vhId/rPZZ5/PxHZWEqgZep/MFl9MW1h4jbWBdtkEiD1wHkSl3EZr
+						Uorg9PcWnWQQr3A3uG3F4XJKfgYdyMcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						dOnRSUciIibF74fAF1NGvnXdyiMwznJcOogjfFKglD8dzkvqPahw29NipSBHcUoZ
+						28Qyn4cHJd9UWpr20uDLK2N3EU5eorUqcGDb/YIR3M6S0cYQF1qz+b33EuJo57rd
+						M36PNV1otHQPewerYlauSTnIh3lNNN1i5hCh8T+Xedz9pSH9kXBHY1r0Twzt7EWI
+						zUilG5FJClGAgoOvIxbWkcT9SVdFk5jX5f73w2fWDy/hLAvizbrVs1CFbwy9x/8s
+						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>
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
new file mode 100644
index 00000000..36732375
--- /dev/null
+++ b/swamid-interfederations-2.0/ukdsdev01.ds.man.ac.uk-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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>
+      <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>
+						MIIDCTCCAfGgAwIBAgIJAJQ6G0iUGwxqMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnVrZHNkZXYwMS5kcy5tYW4uYWMudWswHhcNMTMwODI3MTExNDIwWhcNMjMw
+						ODI1MTExNDIwWjAhMR8wHQYDVQQDExZ1a2RzZGV2MDEuZHMubWFuLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6jrshIhFr1+KeJ+y0r7iJ3A/
+						rBC1NRF37B6kkETjvys8fB3rlHd6FmYsN1Avz3CvlSXldom4yi7lJ7Qg7D5bn2Wy
+						buSPBi0OCCA9eHkbCpAwkFoTHQyfXWdGBOV/L1X5rfmetBbA21EjvxcZYzYndqBY
+						eUrYTrHZkwDfKf9L3+Qym2RWnGC5S/WmVmMmTNv0W49U80wZsPVHjL7ZS+2m2KhW
+						gtQfo7ajDiRtNKwt+4ERVwu8D/kZk9hzlYwvHr1Gb7HVc5sRM5i4MCO5MAcLq80R
+						Fk7Hh7aLR0mnSk1DP6ZJgX9gOLaqq08NIZ+vuIiGOTL2j02Iw1LwMqFH9TJlJwID
+						AQABo0QwQjAhBgNVHREEGjAYghZ1a2RzZGV2MDEuZHMubWFuLmFjLnVrMB0GA1Ud
+						DgQWBBR1ncC2lP6ZoPxifhXf0uadQrtHYjANBgkqhkiG9w0BAQUFAAOCAQEAZKKU
+						Z1Mulo7W/CRWi3gKja0RXSCnBpUxLmsK0t15x0yyzkl+32aFufv7KJnss3hVM8ad
+						vg4P2x7N0/ynIXMAnnQ4oSoxcrcpTeHNmoxihWbHrr7fulyC7M5xOcnYbzJnZkl/
+						EIR0cR/e6eNoGWlwT90ahXojm0dpWDhg0Mhd6K3WmBNYzj+kgzrMKz9HnMm/k0OI
+						NjwwhBPTGbuTw70hTnAbdHtos1vz/wSFk+Eff5MzXnH2nmtw3TPIxviq2ZAoZRRa
+						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>
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
new file mode 100644
index 00000000..5af6fa13
--- /dev/null
+++ b/swamid-interfederations-2.0/ukdsdev02.ds.man.ac.uk-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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>
+      <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>
+						MIIDCTCCAfGgAwIBAgIJAIIDXwPwi+LyMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnVrZHNkZXYwMi5kcy5tYW4uYWMudWswHhcNMTMwNTA3MjIwNDQ5WhcNMjMw
+						NTA1MjIwNDQ5WjAhMR8wHQYDVQQDExZ1a2RzZGV2MDIuZHMubWFuLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxWv1f4Zdu52CZBxZqf1DwU11
+						Otm/yjLWwHJkOXiKBkKcglwarnpyugvCHWLKLAP0z92u1Y8096RjJGRDfKA9hCjs
+						oaxCXBJvAF0CfyMJeiwtfs329Ue5ldClYGP4rwQotdBwLyyWo0SuP/se0S2M8xp0
+						A+voqvLUdsxG4hc0YvMMqH/kzhZ3dKyJ/Tk/fTWU6neTGvn3dwS/duQ3aJRkyzNT
+						5/h33Qp+LTy0Dd2p2B60cvtYE+5RbBnkgN/q2rx15mVLmwv1HWSwrgoTHqT6j1tE
+						pnRbNJnhwCsmzJtMvn7jEvSX59b3vng0/k8dVvF3F+S2Rd+W+ovGtfFJY99DFQID
+						AQABo0QwQjAhBgNVHREEGjAYghZ1a2RzZGV2MDIuZHMubWFuLmFjLnVrMB0GA1Ud
+						DgQWBBRFo5TxIqVQV5pH2yn/082R9vdp/TANBgkqhkiG9w0BAQUFAAOCAQEARCdl
+						cpIlZDByr7ZgfV1DoRhYUC5Jy4NlLEEmJO8eee2FNk7ErmVZe0u+XxOA3imTHhnw
+						CZHLcJOfe2S37JOd0FViOx4oJPrMx544WTE1yzNTeRQk1x584f6k2h/p7Bv4neZ2
+						CWBPAc229eO0WNrIpfPNUcWkek5yi0yfUxHr1PwLRQx838+/FT3CVwb+vsK9QieB
+						25KjLzXOmj1F3wz9Rf3+0u0lPYbcaz9dO/OWp47q5VaUWmyIjRCRPGtrWFxvgnC+
+						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>
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
new file mode 100644
index 00000000..5cb15bb1
--- /dev/null
+++ b/swamid-interfederations-2.0/ukf-cds-dev.edina.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,211 @@
+<?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>
+      <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>
+						MIIDRzCCAi+gAwIBAgIUBB4CY9LTFyM3EXf9sYyoc5nC8bswDQYJKoZIhvcNAQEL
+						BQAwIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYuZWRpbmEuYWMudWswHhcNMTUwMTE0
+						MTkyMTQ0WhcNMzUwMTE0MTkyMTQ0WjAiMSAwHgYDVQQDDBd1a2YtY2RzLWRldi5l
+						ZGluYS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJJjGHX0
+						gTsZeh7pBq1fotfiY5p7TFfhWXl9NLAn8qtjopUPZ7INVm9eiXN6wtDT+Sa64bgb
+						RNXj3XORrxDmUgNEwEqb7ztFw7T6OcewKFNwqGwC/Ie3Pa4RhkkOJjVZUcrnLJdz
+						uuw/dKWF8XIivcg+tenjVB8/l0FTZAF4soVOSJeOOirzJ25kzI6NKWbPLuRzjIXy
+						VghaindImSruNTwpXJScPGHwEnzgPs5MfE3oqR7hAzX+qYk477fK9ThCPPU84Iap
+						iudMKcBaRS03FqBG/c9jcFOBIUStL8+X16JlSiL0ClYhN6Uz2mjcweh07p/jLLTx
+						+fszhA2i2+E1jT0CAwEAAaN1MHMwHQYDVR0OBBYEFMKj+WwrZtwZ+eQVXf//sE6Y
+						Ku2JMFIGA1UdEQRLMEmCF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrhi5odHRwczov
+						L3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+						DQEBCwUAA4IBAQCGKsD7QegA/s6Jy27QPGXzM+k74R/IqYumr9lJ31ozKrEgUmIa
+						yYI9+uGvBb7nwesbKbzGZ9JQg6KvZyx0BckkZk6ih9lPWQuPQIo+aSHME9abUM10
+						CUMKFtU6UP1Y4qbpKrdDCkvUxcvVWtZUhPID8pRihZC6H+e1ClWPLPZEk/OFmQL3
+						gP5k7yksZI/us6PsMnvSEy2TKxtUcZNxEmS+muI7baepenTBLGDK3+lEwZxsAXsZ
+						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>
+						MIIDSDCCAjCgAwIBAgIVAISNTXRh2wiSKN30xxQsJll0coC3MA0GCSqGSIb3DQEB
+						CwUAMCIxIDAeBgNVBAMMF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrMB4XDTE1MDEx
+						NDE5MjE0M1oXDTM1MDExNDE5MjE0M1owIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYu
+						ZWRpbmEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZsUXz
+						hV5tyaOviAMJ4hlKf7g1aFguY089foMCIaBOgNs7boEHHweTkMo9XmOZ2m2RUKMK
+						J4pXMu6AlO8QkxQvN4CsClGLeTUU627Sg8n528HTQZDCgXD2/fCdNciORlQ1OvYv
+						qDrS8RXnaCqnO/6sidUF+osg8zufV/a0reSlORH2snMfM+HGn3WTqYI2Yi3JeB7u
+						XjwqYMJ8p9gP3JLpipKKg5QVfAq4aol2sueygwEv9+eZB5AJMP/Kmw39nMvi1DBc
+						VePzQwbgaJRw+buqUCP3BswuOC+kKswUbSugqVK6T7FK8s/1komuudBR5VSda9tv
+						SwC85UZKDqSQgsZDAgMBAAGjdTBzMB0GA1UdDgQWBBSkxKn4g8SR4Ekk8u0mk84V
+						AVjyXTBSBgNVHREESzBJghd1a2YtY2RzLWRldi5lZGluYS5hYy51a4YuaHR0cHM6
+						Ly91a2YtY2RzLWRldi5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+						9w0BAQsFAAOCAQEAZqUX2GjoqblfFGGKDoVM3WFis1umleH9y6VNYes/KnI2EPaJ
+						cjCb05KKpt5U5Wkx7lprMHsyGq+HgirrYrqtpwn47bdoh7oQ3VvzHn7vNpinBHh1
+						CaDUKRKHr/Na+Yv+M0S23nR4dWn1gPzycUttJpueQyjPxh2lkE5rlzOIIynnurwV
+						Q02bZ4JCaP5GAJw8C54H10EdxRgzv5wZdRxWQfJGFCSYmCE70EkfZJD+Q+AH12Yc
+						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>
+						MIIDSDCCAjCgAwIBAgIVAMyETyrbJMvfpEgxBPZJODiVCBsEMA0GCSqGSIb3DQEB
+						CwUAMCIxIDAeBgNVBAMMF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrMB4XDTE1MDEx
+						NDE5MjE0NFoXDTM1MDExNDE5MjE0NFowIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYu
+						ZWRpbmEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgclRI
+						qtCb5bEZag4Wl2L46TmFPxqaqm7iexkjGDf0sznghGesSWjl5atvEpfvUPlKPPUA
+						Fev9gxnx43FxZgMienEXJ90AJQOGtxLlv637DYsfWRV1xcRo0Mg2ssI3nDcGG/l0
+						dW/M6ZUHTYXiy7DBOu1oebrCz7/TT+yG0j/4abqUatu+vCZisyZ+euro2P6XqlOI
+						deafWyxDunj7oAj0hkfjEjPmy6/ZR914ter0Yas7Pp7PZXfLfIWfSn1IuoDb3F8L
+						bovi40ZNnL8mSrj4k9T87JkJKNs34Ae9DGOig20bYnoIo3UxLj+BVLUfEcaIbBa1
+						rLVIESYf4czLw/aDAgMBAAGjdTBzMB0GA1UdDgQWBBSooCAlGu0lof2KxKIRS4FM
+						ZovoFjBSBgNVHREESzBJghd1a2YtY2RzLWRldi5lZGluYS5hYy51a4YuaHR0cHM6
+						Ly91a2YtY2RzLWRldi5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+						9w0BAQsFAAOCAQEAb72v10CpBtC2a3WfirN6Hb+tC75rGU8yk+jU9uhwK1K9YKxq
+						1Vl+s+VSQG5j/cwFIwFR/ysSpTV48dEhRCJoVKMdc6s/1M4ZWj86Y590ZxY4CxfK
+						zcE8DCY9TJw0gt/4IJ+lKKD5d84pPEbf28JwFSQzR0tuotJgv1jB7xWAHeiZXEw1
+						HIX5hCyV5er2P4FmLwybtmJn1b+G0+GS810Pkfv/U7klyobndVigZ673cycGQ3UN
+						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>
+						MIIDRzCCAi+gAwIBAgIUBB4CY9LTFyM3EXf9sYyoc5nC8bswDQYJKoZIhvcNAQEL
+						BQAwIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYuZWRpbmEuYWMudWswHhcNMTUwMTE0
+						MTkyMTQ0WhcNMzUwMTE0MTkyMTQ0WjAiMSAwHgYDVQQDDBd1a2YtY2RzLWRldi5l
+						ZGluYS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJJjGHX0
+						gTsZeh7pBq1fotfiY5p7TFfhWXl9NLAn8qtjopUPZ7INVm9eiXN6wtDT+Sa64bgb
+						RNXj3XORrxDmUgNEwEqb7ztFw7T6OcewKFNwqGwC/Ie3Pa4RhkkOJjVZUcrnLJdz
+						uuw/dKWF8XIivcg+tenjVB8/l0FTZAF4soVOSJeOOirzJ25kzI6NKWbPLuRzjIXy
+						VghaindImSruNTwpXJScPGHwEnzgPs5MfE3oqR7hAzX+qYk477fK9ThCPPU84Iap
+						iudMKcBaRS03FqBG/c9jcFOBIUStL8+X16JlSiL0ClYhN6Uz2mjcweh07p/jLLTx
+						+fszhA2i2+E1jT0CAwEAAaN1MHMwHQYDVR0OBBYEFMKj+WwrZtwZ+eQVXf//sE6Y
+						Ku2JMFIGA1UdEQRLMEmCF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrhi5odHRwczov
+						L3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+						DQEBCwUAA4IBAQCGKsD7QegA/s6Jy27QPGXzM+k74R/IqYumr9lJ31ozKrEgUmIa
+						yYI9+uGvBb7nwesbKbzGZ9JQg6KvZyx0BckkZk6ih9lPWQuPQIo+aSHME9abUM10
+						CUMKFtU6UP1Y4qbpKrdDCkvUxcvVWtZUhPID8pRihZC6H+e1ClWPLPZEk/OFmQL3
+						gP5k7yksZI/us6PsMnvSEy2TKxtUcZNxEmS+muI7baepenTBLGDK3+lEwZxsAXsZ
+						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>
+						MIIDSDCCAjCgAwIBAgIVAISNTXRh2wiSKN30xxQsJll0coC3MA0GCSqGSIb3DQEB
+						CwUAMCIxIDAeBgNVBAMMF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrMB4XDTE1MDEx
+						NDE5MjE0M1oXDTM1MDExNDE5MjE0M1owIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYu
+						ZWRpbmEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZsUXz
+						hV5tyaOviAMJ4hlKf7g1aFguY089foMCIaBOgNs7boEHHweTkMo9XmOZ2m2RUKMK
+						J4pXMu6AlO8QkxQvN4CsClGLeTUU627Sg8n528HTQZDCgXD2/fCdNciORlQ1OvYv
+						qDrS8RXnaCqnO/6sidUF+osg8zufV/a0reSlORH2snMfM+HGn3WTqYI2Yi3JeB7u
+						XjwqYMJ8p9gP3JLpipKKg5QVfAq4aol2sueygwEv9+eZB5AJMP/Kmw39nMvi1DBc
+						VePzQwbgaJRw+buqUCP3BswuOC+kKswUbSugqVK6T7FK8s/1komuudBR5VSda9tv
+						SwC85UZKDqSQgsZDAgMBAAGjdTBzMB0GA1UdDgQWBBSkxKn4g8SR4Ekk8u0mk84V
+						AVjyXTBSBgNVHREESzBJghd1a2YtY2RzLWRldi5lZGluYS5hYy51a4YuaHR0cHM6
+						Ly91a2YtY2RzLWRldi5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+						9w0BAQsFAAOCAQEAZqUX2GjoqblfFGGKDoVM3WFis1umleH9y6VNYes/KnI2EPaJ
+						cjCb05KKpt5U5Wkx7lprMHsyGq+HgirrYrqtpwn47bdoh7oQ3VvzHn7vNpinBHh1
+						CaDUKRKHr/Na+Yv+M0S23nR4dWn1gPzycUttJpueQyjPxh2lkE5rlzOIIynnurwV
+						Q02bZ4JCaP5GAJw8C54H10EdxRgzv5wZdRxWQfJGFCSYmCE70EkfZJD+Q+AH12Yc
+						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>
+						MIIDSDCCAjCgAwIBAgIVAMyETyrbJMvfpEgxBPZJODiVCBsEMA0GCSqGSIb3DQEB
+						CwUAMCIxIDAeBgNVBAMMF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrMB4XDTE1MDEx
+						NDE5MjE0NFoXDTM1MDExNDE5MjE0NFowIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYu
+						ZWRpbmEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgclRI
+						qtCb5bEZag4Wl2L46TmFPxqaqm7iexkjGDf0sznghGesSWjl5atvEpfvUPlKPPUA
+						Fev9gxnx43FxZgMienEXJ90AJQOGtxLlv637DYsfWRV1xcRo0Mg2ssI3nDcGG/l0
+						dW/M6ZUHTYXiy7DBOu1oebrCz7/TT+yG0j/4abqUatu+vCZisyZ+euro2P6XqlOI
+						deafWyxDunj7oAj0hkfjEjPmy6/ZR914ter0Yas7Pp7PZXfLfIWfSn1IuoDb3F8L
+						bovi40ZNnL8mSrj4k9T87JkJKNs34Ae9DGOig20bYnoIo3UxLj+BVLUfEcaIbBa1
+						rLVIESYf4czLw/aDAgMBAAGjdTBzMB0GA1UdDgQWBBSooCAlGu0lof2KxKIRS4FM
+						ZovoFjBSBgNVHREESzBJghd1a2YtY2RzLWRldi5lZGluYS5hYy51a4YuaHR0cHM6
+						Ly91a2YtY2RzLWRldi5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
+						9w0BAQsFAAOCAQEAb72v10CpBtC2a3WfirN6Hb+tC75rGU8yk+jU9uhwK1K9YKxq
+						1Vl+s+VSQG5j/cwFIwFR/ysSpTV48dEhRCJoVKMdc6s/1M4ZWj86Y590ZxY4CxfK
+						zcE8DCY9TJw0gt/4IJ+lKKD5d84pPEbf28JwFSQzR0tuotJgv1jB7xWAHeiZXEw1
+						HIX5hCyV5er2P4FmLwybtmJn1b+G0+GS810Pkfv/U7klyobndVigZ673cycGQ3UN
+						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>
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
new file mode 100644
index 00000000..0938e51e
--- /dev/null
+++ b/swamid-interfederations-2.0/ukfed.one-test2.contrail.rl.ac.uk-portal-sp.xml
@@ -0,0 +1,97 @@
+<?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>
+						MIID5DCCAsygAwIBAgIJALS9Y48v9modMA0GCSqGSIb3DQEBBQUAMHMxCzAJBgNV
+						BAYTAlVLMQ0wCwYDVQQIDARPeG9uMRAwDgYDVQQHDAdDaGlsdG9uMQ0wCwYDVQQK
+						DARTVEZDMQwwCgYDVQQLDANTQ0QxJjAkBgNVBAMMHSoub25lLXRlc3QyLmNvbnRy
+						YWlsLnJsLmFjLnVrMB4XDTE0MDMyMTExMDMxN1oXDTI0MDMyMTExMDMxN1owczEL
+						MAkGA1UEBhMCVUsxDTALBgNVBAgMBE94b24xEDAOBgNVBAcMB0NoaWx0b24xDTAL
+						BgNVBAoMBFNURkMxDDAKBgNVBAsMA1NDRDEmMCQGA1UEAwwdKi5vbmUtdGVzdDIu
+						Y29udHJhaWwucmwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDExxwHlrNj6qpRM+sfph0089TyUUke0ygR4088OhXfUIUnYo4TfFLm9xGuzG1x
+						ubfmJWLAhynRSuu6xYAALo3ArMPCcBm3/dVviXjZ9rolhikpLso7a9kGefpAo0Qb
+						aBSow1ANeRNIlw4ADnjxqAF083qzbUx3BLNHrQJ8S1vhXXxV1uCxzCUoeBcptrr9
+						EYH01nue5+URc2c7gH9hGb9vu3AJgMURD7BWE6eC8YoQdK52CaEfnlXPmhgaG9vZ
+						m+orn2ytJdl0FMxadEzmW2OtvkkyCZAH8PzB7GrZzOHXV3y30TFpKow4jIof+z0j
+						JF+4uzI26YdaKInXMw5G9YnhAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4
+						QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRK
+						sVJ3ilHlVQpjnfG284PH5J6P4TAfBgNVHSMEGDAWgBRKsVJ3ilHlVQpjnfG284PH
+						5J6P4TANBgkqhkiG9w0BAQUFAAOCAQEAmQX0Q/YZW5/sSDHz7c+wvqhfWRzbh49m
+						ls5MnJ2jYgU87tpG123xg3QKfqCZ9spN1SHs7Q8cbqYE2/HihCBZ2Gw6tNAVkAQM
+						RZgpdCJti0Pjy9kZg/k0DL7aww6DyHLycQBSvHF0xa8JMo+fgwbaYlNAK/uLF8nP
+						0vMwDcGlsvd0KKM80qbxrTvNLp9jbp1QnV1bEFqWWpViEMHWtlhtKTzKKiL+k0rQ
+						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>
+						MIID5DCCAsygAwIBAgIJALS9Y48v9modMA0GCSqGSIb3DQEBBQUAMHMxCzAJBgNV
+						BAYTAlVLMQ0wCwYDVQQIDARPeG9uMRAwDgYDVQQHDAdDaGlsdG9uMQ0wCwYDVQQK
+						DARTVEZDMQwwCgYDVQQLDANTQ0QxJjAkBgNVBAMMHSoub25lLXRlc3QyLmNvbnRy
+						YWlsLnJsLmFjLnVrMB4XDTE0MDMyMTExMDMxN1oXDTI0MDMyMTExMDMxN1owczEL
+						MAkGA1UEBhMCVUsxDTALBgNVBAgMBE94b24xEDAOBgNVBAcMB0NoaWx0b24xDTAL
+						BgNVBAoMBFNURkMxDDAKBgNVBAsMA1NDRDEmMCQGA1UEAwwdKi5vbmUtdGVzdDIu
+						Y29udHJhaWwucmwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDExxwHlrNj6qpRM+sfph0089TyUUke0ygR4088OhXfUIUnYo4TfFLm9xGuzG1x
+						ubfmJWLAhynRSuu6xYAALo3ArMPCcBm3/dVviXjZ9rolhikpLso7a9kGefpAo0Qb
+						aBSow1ANeRNIlw4ADnjxqAF083qzbUx3BLNHrQJ8S1vhXXxV1uCxzCUoeBcptrr9
+						EYH01nue5+URc2c7gH9hGb9vu3AJgMURD7BWE6eC8YoQdK52CaEfnlXPmhgaG9vZ
+						m+orn2ytJdl0FMxadEzmW2OtvkkyCZAH8PzB7GrZzOHXV3y30TFpKow4jIof+z0j
+						JF+4uzI26YdaKInXMw5G9YnhAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4
+						QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRK
+						sVJ3ilHlVQpjnfG284PH5J6P4TAfBgNVHSMEGDAWgBRKsVJ3ilHlVQpjnfG284PH
+						5J6P4TANBgkqhkiG9w0BAQUFAAOCAQEAmQX0Q/YZW5/sSDHz7c+wvqhfWRzbh49m
+						ls5MnJ2jYgU87tpG123xg3QKfqCZ9spN1SHs7Q8cbqYE2/HihCBZ2Gw6tNAVkAQM
+						RZgpdCJti0Pjy9kZg/k0DL7aww6DyHLycQBSvHF0xa8JMo+fgwbaYlNAK/uLF8nP
+						0vMwDcGlsvd0KKM80qbxrTvNLp9jbp1QnV1bEFqWWpViEMHWtlhtKTzKKiL+k0rQ
+						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>
diff --git a/swamid-interfederations-2.0/ukfed.ukpressonline.co.uk-shibboleth.xml b/swamid-interfederations-2.0/ukfed.ukpressonline.co.uk-shibboleth.xml
new file mode 100644
index 00000000..c56d189f
--- /dev/null
+++ b/swamid-interfederations-2.0/ukfed.ukpressonline.co.uk-shibboleth.xml
@@ -0,0 +1,67 @@
+<?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>
+      <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>
+						MIIDHjCCAgagAwIBAgIJAPiDlYs5S2Y2MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+						BAMTHWRpZ2ktd2ViLXN2ci5kaWdpdG9yaWFsLmNvLnVrMB4XDTE0MDcwMTExMTY0
+						NVoXDTM0MDYyNjExMTY0NVowKDEmMCQGA1UEAxMdZGlnaS13ZWItc3ZyLmRpZ2l0
+						b3JpYWwuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJqtxk
+						XLaWpCtU00hwXbdTdF0bAXa5qA9NNHoD3Pc2SD+QAZCHFSNYUn5LkI2MNzKuD9Lo
+						jF+R6dun5C6jaU8vtSJHaVLWJwNn6vfTLFidCyKAa/0fY+qSB46NNjSiXwmFNpiI
+						Sgy5HwDOJpC4avgA0nlO57BLs7Qal1is7/goZWodTwIPIzDU3bwmlNm0gJxR2UkX
+						mZvmx6LPozYL6lbSfuY3MKfbRpfrCXAgH8xYW3F7jBxIhJuv7Rou6zAXhBj+Ss8h
+						3bONUquNMZmQ0K0ngp2G4+XIJy99GDDZfCUKxeliu0OjA42B6iJJq+QRQo3PLyUz
+						3h1Vaw5jqt9lQJc/AgMBAAGjSzBJMCgGA1UdEQQhMB+CHWRpZ2ktd2ViLXN2ci5k
+						aWdpdG9yaWFsLmNvLnVrMB0GA1UdDgQWBBTTnfZ7sgdhNZp0vUUtK2ZWGR9tqjAN
+						BgkqhkiG9w0BAQUFAAOCAQEAtMa03ENgZE9c8LgdaiK4lLjbxXGEr16QAkScjodF
+						Vm0mO/Ohda2avbqFtRXU3u987dcZ9InQ+dCrtfXnU8qRjXc68YYA+ZrKhnMQXmMA
+						9y9pDu8QxhMR+kQLTVAcseX1sStZYoxA7zboO3CZ/aDUvdvkVFHH5mlEZuzBeQys
+						/7kzMosrFpe4dwQiHE9zk+tJjMHoEiHbN0xevID70j7rcO8NHUsYl6vkvqZRKcEJ
+						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>
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
new file mode 100644
index 00000000..a88beeab
--- /dev/null
+++ b/swamid-interfederations-2.0/ukfederation.ecu.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+      <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>
+						MIIDRDCCAiygAwIBAgIVANMvXrP3yd50wehorJHIv4sqdsdqMA0GCSqGSIb3DQEB
+						BQUAMCExHzAdBgNVBAMTFnVrZmVkZXJhdGlvbi5lY3UuYWMudWswHhcNMTMwOTI1
+						MTA0NDIzWhcNMzMwOTI1MTA0NDIzWjAhMR8wHQYDVQQDExZ1a2ZlZGVyYXRpb24u
+						ZWN1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuN/sVb/k
+						dm7u9DJjDZ9sc7w6LeK24doCHc1Se1g/01ii5FSL8paysmNW1AexblCq3pO4z286
+						zDjXAvJn2X41YJb1JYXtdbp++VPhJ0c/wNMZhZZgN3zdMYmEqyVZHQphuJPCFvs4
+						j/sKm2wArc7XsG7G2wuvayQ4yhrA6AFPB+LtsVbml1MbpL9JgixQNWaOUELT7g/Z
+						/fSzuVdJ7Gj0VwUDuEc9VQsfizGzoq5aPUtEJshI64PbJQEYchSqL97Jk4CqZ+pl
+						CyHdW7uy306t5bS2LxuhOZoZWqVqEttmSjiygwydV1bigROBVizDPU1JZ7hmq6x6
+						Q9VUR2jQ0usmeQIDAQABo3MwcTBQBgNVHREESTBHghZ1a2ZlZGVyYXRpb24uZWN1
+						LmFjLnVrhi1odHRwczovL3VrZmVkZXJhdGlvbi5lY3UuYWMudWsvaWRwL3NoaWJi
+						b2xldGgwHQYDVR0OBBYEFDJlcovxD/rhWuukxo82lQ4WNsIfMA0GCSqGSIb3DQEB
+						BQUAA4IBAQA2qsCup37tuAq6LrQR54tEToCV4aAoDgSahDrubmCI0IhFRhtNycRC
+						eVe/eWW0ZjJvZ5ycTWH8UmHcWTU0DFPz1iyLPFe/0Zn5KU/K91XhE7w5TUM9oX66
+						3EU0IpBGa2UaMINDkSYI1Qd6mHc4ilVyqCgCPNbh8aF7CS2rNLIPLpUF/kgcR4/C
+						xueo9DB8f06YkzjvhRVYt+08OVkt0vrJy34huV6/eqP9fxcAy9eJ+2O/pNqX5Bsa
+						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>
+						MIIDRDCCAiygAwIBAgIVANMvXrP3yd50wehorJHIv4sqdsdqMA0GCSqGSIb3DQEB
+						BQUAMCExHzAdBgNVBAMTFnVrZmVkZXJhdGlvbi5lY3UuYWMudWswHhcNMTMwOTI1
+						MTA0NDIzWhcNMzMwOTI1MTA0NDIzWjAhMR8wHQYDVQQDExZ1a2ZlZGVyYXRpb24u
+						ZWN1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuN/sVb/k
+						dm7u9DJjDZ9sc7w6LeK24doCHc1Se1g/01ii5FSL8paysmNW1AexblCq3pO4z286
+						zDjXAvJn2X41YJb1JYXtdbp++VPhJ0c/wNMZhZZgN3zdMYmEqyVZHQphuJPCFvs4
+						j/sKm2wArc7XsG7G2wuvayQ4yhrA6AFPB+LtsVbml1MbpL9JgixQNWaOUELT7g/Z
+						/fSzuVdJ7Gj0VwUDuEc9VQsfizGzoq5aPUtEJshI64PbJQEYchSqL97Jk4CqZ+pl
+						CyHdW7uy306t5bS2LxuhOZoZWqVqEttmSjiygwydV1bigROBVizDPU1JZ7hmq6x6
+						Q9VUR2jQ0usmeQIDAQABo3MwcTBQBgNVHREESTBHghZ1a2ZlZGVyYXRpb24uZWN1
+						LmFjLnVrhi1odHRwczovL3VrZmVkZXJhdGlvbi5lY3UuYWMudWsvaWRwL3NoaWJi
+						b2xldGgwHQYDVR0OBBYEFDJlcovxD/rhWuukxo82lQ4WNsIfMA0GCSqGSIb3DQEB
+						BQUAA4IBAQA2qsCup37tuAq6LrQR54tEToCV4aAoDgSahDrubmCI0IhFRhtNycRC
+						eVe/eWW0ZjJvZ5ycTWH8UmHcWTU0DFPz1iyLPFe/0Zn5KU/K91XhE7w5TUM9oX66
+						3EU0IpBGa2UaMINDkSYI1Qd6mHc4ilVyqCgCPNbh8aF7CS2rNLIPLpUF/kgcR4/C
+						xueo9DB8f06YkzjvhRVYt+08OVkt0vrJy34huV6/eqP9fxcAy9eJ+2O/pNqX5Bsa
+						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>
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
new file mode 100644
index 00000000..cfad71d2
--- /dev/null
+++ b/swamid-interfederations-2.0/ukmyms01-zone02.smg-uk.com-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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>
+      <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
+						eS1vcmFia3Rlc3QtMDEudGxyLnRob21zb24uY29tMIIBIjANBgkqhkiG9w0BAQEF
+						AAOCAQ8AMIIBCgKCAQEA2sDwDbm2t6Jc0L89Mj3GXl9RaTsEwCCJ2UNBppGmmc06
+						4oucpILb2Yd6KqBsKBaYC0ue3tlwkdyPlDMR/6+E+dJi478+dMb8mX2URLlILIln
+						QyWZkf6tp1q1F7rSK7DG4A5jF6nt6WxJlWDp6pOPcM7vkaPcRGw4PyAlgq6E8klo
+						noiX4AOIkOfi+11uJii9LqWk9XdwtrIzDd/El2uGkgcLLnwzpWDV2A0tKAEy8WHR
+						UWsotnzmCYfIBMal6o/5fJ7k3KYEOzF90WpYuf7InFGUEzl86rJRWNZtY1h7jepS
+						otzMbzn7Q5Ljc4MYjbXG4BmCw2JC7XCkjKQy7TuNbQIDAQABo4GKMIGHMGYGA1Ud
+						EQRfMF2CIXVrbXktb3JhYmt0ZXN0LTAxLnRsci50aG9tc29uLmNvbYY4aHR0cHM6
+						Ly91a215LW9yYWJrdGVzdC0wMS50bHIudGhvbXNvbi5jb20vaWRwL3NoaWJib2xl
+						dGgwHQYDVR0OBBYEFGnD/uW9bTDxa7yN/FtkfYvhMESnMA0GCSqGSIb3DQEBBQUA
+						A4IBAQAV1L5ji+TIyn+BZr94DQOb6pkHAdFgceuq8YxBJoW9oKNJwC9K6lQp0Wus
+						q5J4RlIErH3M+q8txtm1J5oH2C9KxPOw1Htw8KSKQfT5LD98HVETMdOGCmmtX5IO
+						GLiegJTiXazfmecTi9xi1pVOfVLn97uCY7TK5I0YFDkFN2Whf4GNXY8w9iDGCyN8
+						4c6mJD3kCkjWv06ITX/OgTGpHDPobiNu4aEQpMokmw7fE8ff+fBLIEhKQ7y+Zovz
+						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>
+						MIIDcTCCAlmgAwIBAgIUHY8B0tLuriNFq39X7sA2Pna5FmwwDQYJKoZIhvcNAQEF
+						BQAwLDEqMCgGA1UEAxMhdWtteS1vcmFia3Rlc3QtMDEudGxyLnRob21zb24uY29t
+						MB4XDTE0MDIwNjE1MjcxOFoXDTM0MDIwNjE1MjcxOFowLDEqMCgGA1UEAxMhdWtt
+						eS1vcmFia3Rlc3QtMDEudGxyLnRob21zb24uY29tMIIBIjANBgkqhkiG9w0BAQEF
+						AAOCAQ8AMIIBCgKCAQEA2sDwDbm2t6Jc0L89Mj3GXl9RaTsEwCCJ2UNBppGmmc06
+						4oucpILb2Yd6KqBsKBaYC0ue3tlwkdyPlDMR/6+E+dJi478+dMb8mX2URLlILIln
+						QyWZkf6tp1q1F7rSK7DG4A5jF6nt6WxJlWDp6pOPcM7vkaPcRGw4PyAlgq6E8klo
+						noiX4AOIkOfi+11uJii9LqWk9XdwtrIzDd/El2uGkgcLLnwzpWDV2A0tKAEy8WHR
+						UWsotnzmCYfIBMal6o/5fJ7k3KYEOzF90WpYuf7InFGUEzl86rJRWNZtY1h7jepS
+						otzMbzn7Q5Ljc4MYjbXG4BmCw2JC7XCkjKQy7TuNbQIDAQABo4GKMIGHMGYGA1Ud
+						EQRfMF2CIXVrbXktb3JhYmt0ZXN0LTAxLnRsci50aG9tc29uLmNvbYY4aHR0cHM6
+						Ly91a215LW9yYWJrdGVzdC0wMS50bHIudGhvbXNvbi5jb20vaWRwL3NoaWJib2xl
+						dGgwHQYDVR0OBBYEFGnD/uW9bTDxa7yN/FtkfYvhMESnMA0GCSqGSIb3DQEBBQUA
+						A4IBAQAV1L5ji+TIyn+BZr94DQOb6pkHAdFgceuq8YxBJoW9oKNJwC9K6lQp0Wus
+						q5J4RlIErH3M+q8txtm1J5oH2C9KxPOw1Htw8KSKQfT5LD98HVETMdOGCmmtX5IO
+						GLiegJTiXazfmecTi9xi1pVOfVLn97uCY7TK5I0YFDkFN2Whf4GNXY8w9iDGCyN8
+						4c6mJD3kCkjWv06ITX/OgTGpHDPobiNu4aEQpMokmw7fE8ff+fBLIEhKQ7y+Zovz
+						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>
diff --git a/swamid-interfederations-2.0/ulster.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ulster.unidesk.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..502815bf
--- /dev/null
+++ b/swamid-interfederations-2.0/ulster.unidesk.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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://ulster.unidesk.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-11T09:59: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC/TCCAeWgAwIBAgIJAPHsl6kKrFrnMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEmxpdmUudW5pZGVzay5hYy51azAeFw0xMjA0MTExNDU4MjhaFw0yMjA0MDkx
+						NDU4MjhaMB0xGzAZBgNVBAMTEmxpdmUudW5pZGVzay5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAL9qh/Dehm5jJdWdeFPNKqcjMdiqii8Iz9Rc
+						tCAsEwRsYww4EQDG7MxG5hg4NSS+iIPFCp9gR+G7hTnZAMGgNpxs2vk4vs9lmhRY
+						GmB7Y1NFloP9Pcsu+MaufaLzxi6bzIXV4dBVHqVnIcgxchDIsXmPE6xlq4poEq+q
+						XJ3aFE/eWwxfwN9z0s5yeICzsil73xk9T9NLeNAeYq+jfVTcdqDbBHY6eHtMOYh/
+						uPVYYxkKXjkgSH5cwG0b+7qN4z+uzKDNBXxnI1Nz+bLOazXW6ljQIDtAPQZMJSlr
+						3OepVaQS+fMBi0Sku5yvADgINdXxkz6H4Zx4pZg/rTQBQ/8u2esCAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISbGl2ZS51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBQ2tPlzxC8e
+						akC2nh9qrG4TWfI3tzANBgkqhkiG9w0BAQUFAAOCAQEAWPY3Nv9ChZ+4XVNANhLq
+						fGF7SbiPmUNj9vWGNjCp8Ma0tdDOZPvqBRzxKkkR+LS+fHpSQQ54RuNeZrulWBiN
+						akZe3LZiSH9AHG2uD0lDuxr0UQt1AHGDiLjFXuRg9+CdqqrdT3Anmy6exDDfRsjH
+						k+ZJflkEtqTNd0dbEVlkYlg8Baqx/ZMOxkccx8PtQt1yptAMsH4Rn92vXLd9d3JM
+						H1mrFuiriqrgsAfVLmzc4WeGmB+dK01cSB+CY7hKnoe7ds1y7kNhOmZ9HP3Iy7ev
+						gF2RCdnqkP9zScihW4b20PlVa/sWMUyCj2uZE1lSO51PJcGVU0H/JFrBEpaM7u6t
+						jg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ulster.unidesk.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">Unidesk - University of Ulster</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:IS.Helpdesk@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IS Application Technology Management</md:GivenName>
+    <md:EmailAddress>mailto:apps-techmgt@mlist.is.ed.ac.uk</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
new file mode 100644
index 00000000..abfa5841
--- /dev/null
+++ b/swamid-interfederations-2.0/umbrella.psi.ch-.xml
@@ -0,0 +1,76 @@
+<?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>
+  </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>
+MIIDGDCCAgCgAwIBAgIJAPuvSPAzAC6mMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD3VtYnJlbGxhLnBzaS5jaDAeFw0xMzExMjgxMDQ2MjBaFw0xNjExMjcxMDQ2
+MjBaMBoxGDAWBgNVBAMTD3VtYnJlbGxhLnBzaS5jaDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMHaKoQKIBkNpDp0I5R2yZ7uy2WShKsDm9IMxz+D0EzL
+S7k/KCKIt15E6iksEvy6KhKQUmHDjx0T/W9D+hZkAj3NaSytBCB3phGrMUFSotw9
+/GSt0e/C4x0Bju/SD5OwLOAX5QvMJllMlkGTUXQ+T6LcNBcA5kSL/jza2vssAOC0
+9vz0zK7uAxGG2/IrZ55UGL6RFB5lV4m+45DLjd/bnmk0KzPDbfCgpnq+kc4NUFov
+ECrZUJ+CkOUdS6x+Jg4wsUyYWHAMA77JoQtJUWYzLMlaN/hfWoIwsG049Wp20+w3
+axkrc0u/Bd+YQB2e66sv+gzMfpxkoxs78qv9uJGaNo0CAwEAAaNhMF8wPgYDVR0R
+BDcwNYIPdW1icmVsbGEucHNpLmNohiJodHRwczovL3VtYnJlbGxhLnBzaS5jaC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBSycOrbvoq6pE/JYBQQAso92I6NXDANBgkqhkiG
+9w0BAQUFAAOCAQEAfarU3Y9Fi2+2Om89eMvkGB/29lZZnR+7w78sVyu6dZlMcJzT
+SJPNQXVbqAJfPEQLmSxBXxVwvoqEJH80c95xjt59p3CMuXKMxGZ+elpCin9fePrP
+pDkU/CXfNNSU1OIZnSttk6Yh6uQ814ZtxqZES1zDP63Ajm/aM9L2mrxD1UJ2OWAh
+RMaDxuEU6fZCZk9ej8os9Kf2k5XmJ8x5v9cJJ3dXFxEz7tGhb7wMSBlFIsdt+j3l
+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="eduPersonPrincipalName" Name="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="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">psi.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">PSI - Paul Scherrer Institut</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">PSI - Paul Scherrer Institute</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/unigepass.unige.it-idp.xml b/swamid-interfederations-2.0/unigepass.unige.it-idp.xml
new file mode 100644
index 00000000..e2750ffa
--- /dev/null
+++ b/swamid-interfederations-2.0/unigepass.unige.it-idp.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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:InformationURL xml:lang="it">https://unigepass.unige.it/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://unigepass.unige.it/idem</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>
+MIIEPDCCAySgAwIBAgIJAJUnUP5NQ2loMA0GCSqGSIb3DQEBBQUAMHExCzAJBgNV
+BAYTAklUMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZHZW5vdmExHjAc
+BgNVBAoTFVVuaXZlcnNpdGEnIGRpIEdlbm92YTEOMAwGA1UECxMFQ1NJVEExDDAK
+BgNVBAMTA2lkcDAeFw0xMjAyMDYxMDA2MDdaFw0xNTAyMDUxMDA2MDdaMHExCzAJ
+BgNVBAYTAklUMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZHZW5vdmEx
+HjAcBgNVBAoTFVVuaXZlcnNpdGEnIGRpIEdlbm92YTEOMAwGA1UECxMFQ1NJVEEx
+DDAKBgNVBAMTA2lkcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN9o
+HF2dS5fb+/z61/dra92RVq+Gd0B6oPdVfTCLb25y6R/74R/zcGQa6TxBimEtdXJy
+rdejUrzATgtIX4CkLNc85KKsLUyAJ3LNT/ekZe/uZJOCEZTHaN13bms8voHlZzSq
++b8jp4HWGz/bYFH0N3asX/kGDq26h/Wz24C+mpULcX3qXYWNcLKkAvs775umPaBr
+Lkaje1B/8+blAlaAgc4M64+8iyjZdQ/jtx3Ww6cGZAe85nE8cxPUGaM+QmVhl8sD
+5F7tF2I12Lgr2s3EA0mBTf45abHAGTPTO0mZjxU8GTc1ob16Y4PPT1A3LSCUeaUw
+RWZrgaDxBb4f7KVX3skCAwEAAaOB1jCB0zAdBgNVHQ4EFgQUKR4DrQG/j+YpGxit
+gm56qio8Ic4wgaMGA1UdIwSBmzCBmIAUKR4DrQG/j+YpGxitgm56qio8Ic6hdaRz
+MHExCzAJBgNVBAYTAklUMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZH
+ZW5vdmExHjAcBgNVBAoTFVVuaXZlcnNpdGEnIGRpIEdlbm92YTEOMAwGA1UECxMF
+Q1NJVEExDDAKBgNVBAMTA2lkcIIJAJUnUP5NQ2loMAwGA1UdEwQFMAMBAf8wDQYJ
+KoZIhvcNAQEFBQADggEBAAxbOLxwoht/pip4tsoLoCo6twBBvUQcdraUkd0nGxIW
+Fha0xD0TMHPeXXcjcRSf7+LW3Shfik8Du4fJObyD9tDkkX0b+wj4rIPIprnv5L4m
+PcO/yMKtJrq43DyJiwNHHomTbyFOiQ2Vsn2/Hm05mJ9wkl4/d5j1I4PrsOYy4p5i
+810XtjYqsJTSt/blUJSw4SKbhsm58fg/bN21ok9iDpCTHpNXrFgJqRc6nFOr9/AM
+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>
+MIIEPDCCAySgAwIBAgIJAJUnUP5NQ2loMA0GCSqGSIb3DQEBBQUAMHExCzAJBgNV
+BAYTAklUMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZHZW5vdmExHjAc
+BgNVBAoTFVVuaXZlcnNpdGEnIGRpIEdlbm92YTEOMAwGA1UECxMFQ1NJVEExDDAK
+BgNVBAMTA2lkcDAeFw0xMjAyMDYxMDA2MDdaFw0xNTAyMDUxMDA2MDdaMHExCzAJ
+BgNVBAYTAklUMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZHZW5vdmEx
+HjAcBgNVBAoTFVVuaXZlcnNpdGEnIGRpIEdlbm92YTEOMAwGA1UECxMFQ1NJVEEx
+DDAKBgNVBAMTA2lkcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN9o
+HF2dS5fb+/z61/dra92RVq+Gd0B6oPdVfTCLb25y6R/74R/zcGQa6TxBimEtdXJy
+rdejUrzATgtIX4CkLNc85KKsLUyAJ3LNT/ekZe/uZJOCEZTHaN13bms8voHlZzSq
++b8jp4HWGz/bYFH0N3asX/kGDq26h/Wz24C+mpULcX3qXYWNcLKkAvs775umPaBr
+Lkaje1B/8+blAlaAgc4M64+8iyjZdQ/jtx3Ww6cGZAe85nE8cxPUGaM+QmVhl8sD
+5F7tF2I12Lgr2s3EA0mBTf45abHAGTPTO0mZjxU8GTc1ob16Y4PPT1A3LSCUeaUw
+RWZrgaDxBb4f7KVX3skCAwEAAaOB1jCB0zAdBgNVHQ4EFgQUKR4DrQG/j+YpGxit
+gm56qio8Ic4wgaMGA1UdIwSBmzCBmIAUKR4DrQG/j+YpGxitgm56qio8Ic6hdaRz
+MHExCzAJBgNVBAYTAklUMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZH
+ZW5vdmExHjAcBgNVBAoTFVVuaXZlcnNpdGEnIGRpIEdlbm92YTEOMAwGA1UECxMF
+Q1NJVEExDDAKBgNVBAMTA2lkcIIJAJUnUP5NQ2loMAwGA1UdEwQFMAMBAf8wDQYJ
+KoZIhvcNAQEFBQADggEBAAxbOLxwoht/pip4tsoLoCo6twBBvUQcdraUkd0nGxIW
+Fha0xD0TMHPeXXcjcRSf7+LW3Shfik8Du4fJObyD9tDkkX0b+wj4rIPIprnv5L4m
+PcO/yMKtJrq43DyJiwNHHomTbyFOiQ2Vsn2/Hm05mJ9wkl4/d5j1I4PrsOYy4p5i
+810XtjYqsJTSt/blUJSw4SKbhsm58fg/bN21ok9iDpCTHpNXrFgJqRc6nFOr9/AM
+levf5fRUC2nfXJvxcaNuDs40n2+oSGK7RT708GJcNWlgv6JJ9gD+GJfekj7qbx0l
+i0udBCaIfD5C2h/9Gk8PJUEofI93dBwVkAZhFtr/42M=
+</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>
diff --git a/swamid-interfederations-2.0/uobhive.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/uobhive.sisoshibboleth.co.uk-entity.xml
new file mode 100644
index 00000000..cc81187c
--- /dev/null
+++ b/swamid-interfederations-2.0/uobhive.sisoshibboleth.co.uk-entity.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
+						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
+						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
+						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
+						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
+						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
+						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
+						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
+						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
+						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
+						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
+						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
+						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>
diff --git a/swamid-interfederations-2.0/uolics.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/uolics.sisoshibboleth.co.uk-entity.xml
new file mode 100644
index 00000000..84a9ffaa
--- /dev/null
+++ b/swamid-interfederations-2.0/uolics.sisoshibboleth.co.uk-entity.xml
@@ -0,0 +1,84 @@
+<?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>
+      <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>
+						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
+						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
+						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
+						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
+						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
+						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
+						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
+						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
+						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
+						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
+						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
+						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
+						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>
diff --git a/swamid-interfederations-2.0/upkcontent.imparando.com-shibboleth.xml b/swamid-interfederations-2.0/upkcontent.imparando.com-shibboleth.xml
new file mode 100644
index 00000000..a86174e1
--- /dev/null
+++ b/swamid-interfederations-2.0/upkcontent.imparando.com-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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>
+						MIIDSzCCAjOgAwIBAgIJAOd6oO6JdGfIMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+						BAMTHWltcC1jb250ZW50MDEtcC5pbXBhcmFuZG8uY29tMB4XDTEyMDUwODE1MjEw
+						MVoXDTIyMDUwNjE1MjEwMVowKDEmMCQGA1UEAxMdaW1wLWNvbnRlbnQwMS1wLmlt
+						cGFyYW5kby5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwCqZL
+						lGdDR1+8p9tWhNpAiWwR4N1Fe0ZuAosO++DU8ihOg9shAuaIbgavZ+LQDxDT4q60
+						H/NSpFm0L5NCNdJbztlZDST30MkvbQk/x6rVWUV7N/vmH2uGlbYfXLdSWiIJN0lt
+						BFZt9BejI85TLGcQQmU844KF1+QdlhcAETTvCJ9e4gJvOnua46WIDjcc+lE+a9fL
+						B6vto9gliTiKzP9AbrCOKo5lPgcxozJ5ZV77KckRYzJnwOna8GTqwiJXqhMB6uPi
+						aYVMhbT7tq1veiCvRT8ME/pZTNV3g5UVby6ZTsit19jATqQ0IRZdfLBzPMVf13f6
+						YXexYEP3N5sMCmnpAgMBAAGjeDB2MFUGA1UdEQROMEyCHWltcC1jb250ZW50MDEt
+						cC5pbXBhcmFuZG8uY29thitodHRwczovL3Vwa2NvbnRlbnQuaW1wYXJhbmRvLmNv
+						bS9zaGliYm9sZXRoMB0GA1UdDgQWBBSzFWIXER4HxW6ugBZoKX8DmGwYLjANBgkq
+						hkiG9w0BAQUFAAOCAQEAET9AJLSfmZZSI6yvQrQWTplBulwW7thsItdk/2YMY4In
+						OAFieBBkZehVWj2j+y8HytWgYh0S3WC3RQ3+/YPAAH/IN+k7y9MIsQBhKU27/FAR
+						LE7IdN0YqKBK/kHvKdCPQn9ePpwEhVR27yArZiVkb50PMX+YfkAZgS6rFg2M1NL9
+						tSuKU0Ka/7lb6xcc6naWaRfBxhUjMzKnWTFAgKF0873nr3TDvSokmJjvUrU5NHGG
+						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>
diff --git a/swamid-interfederations-2.0/upkdev.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/upkdev.bsp.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..d34e1487
--- /dev/null
+++ b/swamid-interfederations-2.0/upkdev.bsp.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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://upkdev.bsp.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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://upkdev.bsp.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>
+						MIIDBjCCAe6gAwIBAgIJAM3SwyRR3bgIMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFWJzcHdpbjI2LmJzcC5veC5hYy51azAeFw0xMTEyMDUxNjAwNDJaFw0yMTEy
+						MDIxNjAwNDJaMCAxHjAcBgNVBAMTFWJzcHdpbjI2LmJzcC5veC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjqdqsgyd/uQ08OxSRl4gAwYPFm
+						pgRRhOmjO2Om4ZWmRNawAngO6J3BFrSRQcIFXU18WS7gdKdgN1E5dLlujDjKsN/e
+						kPC5UJiPpMELAdiwrFMcQQGnPE53jI8Xj/HOTG3n66xRmrr3cuRRAE708i5NxShQ
+						uL2HDO0jZB8Er/Ie3Sp2Nzjzpcx5yHgb1yVd/UxOkKoR/QIafT7PUko2AcELvA44
+						shUthRUiSybsA9X8b6Ri3b+ewLRPUoDD1Th4zcG8D9KNL+ED8RsP9hwtZHrDXHwi
+						nnzYotblpAZOspxym6G+RUvSvx7s5mrXF8oAhQmluAAtEj/I3su8VgIw5g8CAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVYnNwd2luMjYuYnNwLm94LmFjLnVrMB0GA1UdDgQW
+						BBSTMLysVwykBrWtSKkiTJUDM/CzmjANBgkqhkiG9w0BAQUFAAOCAQEAhlmJteoW
+						GZ4iVYnltbjOne5bqHZSrv5q5bdPtjo1PsPxEqHE1+hUlbTbEot6T1ponxu8vpyi
+						vqDzSWq68O2uIq2Qa2qA1srl66tFYlJnrRIuPhH0qW9xk+eI23+SRzoiKl9PaVjJ
+						y1R1pKQG/WHaYFY7/UsLjDJjmqbk1qxWhl+4VaeOPCn35u/cA3qX2Amdk3RSRb+c
+						9GfwhbvtzlMBI3qA9frsr31AYBlKYxWh/rKVxAWzrle8GNYr2V2OJ17y5MdvTfVx
+						jAyhlvp7Bap+Lkn6LWNJ/LBpg90XSMC0mFuT88LXgA9LllTUR8EQeZpSDI3iC5HY
+						O0S/azG5O+MD0A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: UPKDEV Oracle Training Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops@admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stephan</md:GivenName>
+    <md:SurName>Eckweiler</md:SurName>
+    <md:EmailAddress>mailto:stephan.eckweiler@it.ox.ac.uk</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
new file mode 100644
index 00000000..bde61dda
--- /dev/null
+++ b/swamid-interfederations-2.0/upki.yamagata-u.ac.jp-idp-shibboleth.xml
@@ -0,0 +1,111 @@
+<?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>
+      <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>MIIE4jCCA8qgAwIBAgIIWt74yl1olCUwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UE
+BhMCSlAxETAPBgNVBAcTCEFjYWRlbWUyMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0
+aXR1dGUgb2YgSW5mb3JtYXRpY3MxDTALBgNVBAsTBFVQS0kxIDAeBgNVBAsTF05J
+SSBPcGVuIERvbWFpbiBDQSAtIEcyMB4XDTEzMDkwMzAxMjgwNloXDTE1MTAwMzAx
+MzgwNlowgZAxCzAJBgNVBAYTAkpQMREwDwYDVQQHEwhBY2FkZW1lMjEcMBoGA1UE
+ChMTWWFtYWdhdGEgVW5pdmVyc2l0eTEwMC4GA1UECxMnTmV0d29ya2luZyBhbmQg
+Q29tcHV0aW5nIFNlcnZpY2UgQ2VudGVyMR4wHAYDVQQDExV1cGtpLnlhbWFnYXRh
+LXUuYWMuanAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD4OcJv8dLw
+DP3jH22wAgoLUUNyl1v7BMmWwR8PCgulT07dSzXW375dglMeMpNHOF/KpcKMvDC9
+PW8kksnp5vMccvZqaK+Q1kNTBRayJ80aXaWnQv4Pbmj9zzs6VmoALJfXz4old8lm
+5jdvt7nK0xsp0K8wOaay/szCl0fvXzh4hz8zYNGDuKXe7CxVfqBCz5ldRiUUgqvz
+WAMOi8dhSVkwyhvJ6yU5TlSPrxF8UH4qscx0X5HW76Ep9kVsVLFf5mU8sFEUzkm7
+GCfPEZhWE8uvxdXQLJtHVUc0ZfjMcyP2Xf/rjP8VulxBi9/GKhblPVSSDx5CdmHW
+Cv/0Zf0B9DGXAgMBAAGjggFQMIIBTDAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAww
+CgYIKwYBBQUHAwEwHQYDVR0OBBYEFE1CS0AphFkIDNTzBPch15JEjH3IMB8GA1Ud
+IwQYMBaAFHsKB/cYyowO1tq8UIBsLEcC0Q37MCAGA1UdEQQZMBeCFXVwa2kueWFt
+YWdhdGEtdS5hYy5qcDBmBgNVHSAEXzBdME0GCiqDCIycHgECAgEwPzA9BggrBgEF
+BQcCARYxaHR0cHM6Ly9yZXBvMS5zZWNvbXRydXN0Lm5ldC9zcGNwcC9jcHMvaW5k
+ZXguaHRtbDAMBgoqgwiMmxtkhwUBMEgGA1UdHwRBMD8wPaA7oDmGN2h0dHA6Ly9y
+ZXBvMS5zZWNvbXRydXN0Lm5ldC9zcHBjYS9uaWkvb2RjYTIvZnVsbGNybC5jcmww
+EQYJYIZIAYb4QgEBBAQDAgZAMA0GCSqGSIb3DQEBBQUAA4IBAQAbFUlSVlJFBEy0
+NaFxmDDMGrFX5fjkbGOLh0hOPJrecRrnv/SM227gvHpo/Zc0762+66Ty/U1t/Azw
+Cg237c9AL9+t7xj6D/REuNezgwsW6kuKGAtG6hd3oU3InAq6KkJOqI9BXASX2VBb
+YOn5R9Z4cWNANR16LWi71ki99zahKnbgBdo+Ydh456BEs3fThfjEBtTQHXp7vHDS
+JWJDouOTVpVMxvA2ulQo1ZAHsUAEK9Ns5KccODUnm685W9oVk9EP678u8B3ypZu5
+Eio3ERhKLK04ADnzFOkVtRFQw7CWDfVNapssTuc0fim4kg/qesh1pbIl7YUe1BAy
+NDiDrLub</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>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>MIIE4jCCA8qgAwIBAgIIWt74yl1olCUwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UE
+BhMCSlAxETAPBgNVBAcTCEFjYWRlbWUyMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0
+aXR1dGUgb2YgSW5mb3JtYXRpY3MxDTALBgNVBAsTBFVQS0kxIDAeBgNVBAsTF05J
+SSBPcGVuIERvbWFpbiBDQSAtIEcyMB4XDTEzMDkwMzAxMjgwNloXDTE1MTAwMzAx
+MzgwNlowgZAxCzAJBgNVBAYTAkpQMREwDwYDVQQHEwhBY2FkZW1lMjEcMBoGA1UE
+ChMTWWFtYWdhdGEgVW5pdmVyc2l0eTEwMC4GA1UECxMnTmV0d29ya2luZyBhbmQg
+Q29tcHV0aW5nIFNlcnZpY2UgQ2VudGVyMR4wHAYDVQQDExV1cGtpLnlhbWFnYXRh
+LXUuYWMuanAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD4OcJv8dLw
+DP3jH22wAgoLUUNyl1v7BMmWwR8PCgulT07dSzXW375dglMeMpNHOF/KpcKMvDC9
+PW8kksnp5vMccvZqaK+Q1kNTBRayJ80aXaWnQv4Pbmj9zzs6VmoALJfXz4old8lm
+5jdvt7nK0xsp0K8wOaay/szCl0fvXzh4hz8zYNGDuKXe7CxVfqBCz5ldRiUUgqvz
+WAMOi8dhSVkwyhvJ6yU5TlSPrxF8UH4qscx0X5HW76Ep9kVsVLFf5mU8sFEUzkm7
+GCfPEZhWE8uvxdXQLJtHVUc0ZfjMcyP2Xf/rjP8VulxBi9/GKhblPVSSDx5CdmHW
+Cv/0Zf0B9DGXAgMBAAGjggFQMIIBTDAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAww
+CgYIKwYBBQUHAwEwHQYDVR0OBBYEFE1CS0AphFkIDNTzBPch15JEjH3IMB8GA1Ud
+IwQYMBaAFHsKB/cYyowO1tq8UIBsLEcC0Q37MCAGA1UdEQQZMBeCFXVwa2kueWFt
+YWdhdGEtdS5hYy5qcDBmBgNVHSAEXzBdME0GCiqDCIycHgECAgEwPzA9BggrBgEF
+BQcCARYxaHR0cHM6Ly9yZXBvMS5zZWNvbXRydXN0Lm5ldC9zcGNwcC9jcHMvaW5k
+ZXguaHRtbDAMBgoqgwiMmxtkhwUBMEgGA1UdHwRBMD8wPaA7oDmGN2h0dHA6Ly9y
+ZXBvMS5zZWNvbXRydXN0Lm5ldC9zcHBjYS9uaWkvb2RjYTIvZnVsbGNybC5jcmww
+EQYJYIZIAYb4QgEBBAQDAgZAMA0GCSqGSIb3DQEBBQUAA4IBAQAbFUlSVlJFBEy0
+NaFxmDDMGrFX5fjkbGOLh0hOPJrecRrnv/SM227gvHpo/Zc0762+66Ty/U1t/Azw
+Cg237c9AL9+t7xj6D/REuNezgwsW6kuKGAtG6hd3oU3InAq6KkJOqI9BXASX2VBb
+YOn5R9Z4cWNANR16LWi71ki99zahKnbgBdo+Ydh456BEs3fThfjEBtTQHXp7vHDS
+JWJDouOTVpVMxvA2ulQo1ZAHsUAEK9Ns5KccODUnm685W9oVk9EP678u8B3ypZu5
+Eio3ERhKLK04ADnzFOkVtRFQw7CWDfVNapssTuc0fim4kg/qesh1pbIl7YUe1BAy
+NDiDrLub</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:GivenName>Tomohiro</md:GivenName>
+    <md:SurName>ITO</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/usertest.sciquest.com.xml b/swamid-interfederations-2.0/usertest.sciquest.com.xml
new file mode 100644
index 00000000..816ab747
--- /dev/null
+++ b/swamid-interfederations-2.0/usertest.sciquest.com.xml
@@ -0,0 +1,50 @@
+<?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>
+						MIIC9DCCAl2gAwIBAgIITH47WRLwirIwDQYJKoZIhvcNAQEEBQAwXzELMAkGA1UEBhMCVVMxETAP
+						BgNVBAoTCFNjaVF1ZXN0MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEnMCUGA1UEAxMeU2NpUXVlc3Qg
+						Q2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTEzMDkwOTIwMjkzMVoXDTMzMDMzMTIwMjkzMVowYDEV
+						MBMGA1UEAxMMc2NpcXVlc3QuY29tMRQwEgYDVQQLEwtEZXZlbG9wbWVudDEXMBUGA1UEChMOU2Np
+						UXVlc3QsIEluYy4xCzAJBgNVBAgTAk5DMQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBAJAwZSK6e1O56akTZTxBKIuDkuUZDyJzSl4xaqPa8C6XWP7I+G6sFUbtHb3I
+						fY7FVmYkeS7Rx2hZA+AbNMGA3JdectjGfJoc2DYZ5ZW/Pk/hslSWJ/PGnJmJDomM90NNRYa0NPSK
+						XSl9KLEsBj+S5YGrC7NZR6L0NCrLiqRGXCwdqMSl2TORG3DjdVFnyp933vxjhnaJW7ihpIc4Ga0H
+						ORjj6zk2npzGhq71qmRwfxHFsRivFR1CBH3EVsqLCm3AXhVmqCuwJYmXjo26aZYOV61gvMht0oWq
+						hPI3LQXZ6nWwpPOCiyMBJAuhckZQQu0n81tJyII0J+fXJXzObJ9OJxUCAwEAAaM0MDIwDgYDVR0P
+						AQH/BAQDAgWgMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMEBggrBgEFBQcDAjANBgkqhkiG9w0BAQQF
+						AAOBgQAj3d6pxxPMxzet05eEemxV0wgP9L0F27/sTPsGioynIclNxKoAC5hoeiHAOVKw+8RTL3D/
+						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>
diff --git a/swamid-interfederations-2.0/utwente.nl-.xml b/swamid-interfederations-2.0/utwente.nl-.xml
new file mode 100644
index 00000000..c58e6260
--- /dev/null
+++ b/swamid-interfederations-2.0/utwente.nl-.xml
@@ -0,0 +1,48 @@
+<?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>
+  </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="9" width="108">https://static.surfconext.nl/media/idp/utwente.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">University of Twente Universiteit Twente ut utwente</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">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: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
new file mode 100644
index 00000000..86b4a1e6
--- /dev/null
+++ b/swamid-interfederations-2.0/v-shibboleth.cant-col.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,96 @@
+<?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>
+      <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
+						ZXRoLmNhbnQtY29sLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAujeuPszBocV2kcwkN8u7SVmHqcYGLLYzkz509WX4yp57LtK9PEo8wpoVoTBk
+						GOv9+Dq7hbtJ0fuwxYh0T5FqjTiTIX7oXa8Qwb0AmxQLeKFlOQ0HkkoieHyU4wed
+						o28K7HPYeRVFn+rkcxK2UiMg0KiIwNzNhTd78Clwt06FVvasuUE5V/ncwYJNEcVc
+						8M2BOMxtdeed8SP+Qio5GLMB53O9ziI/pYHB453pigwiFxUXoxVffA1kLcFL7iS6
+						inlKCsuF/WpzHksYCnbOItOnUm0GiC8nqJ/hl6fXfIMoA+0ijBurNyKBN3Vl0dC+
+						OX/TNW61giCUZUaSdWyF67jDHwIDAQABo30wezBaBgNVHREEUzBRght2LXNoaWJi
+						b2xldGguY2FudC1jb2wuYWMudWuGMmh0dHBzOi8vdi1zaGliYm9sZXRoLmNhbnQt
+						Y29sLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQLod2XYoE2pXu03e4G
+						e93I5bYcijANBgkqhkiG9w0BAQUFAAOCAQEAeZGPjbwyzjVemSC0DdfWX1OQNYDP
+						IxH4htEX55B9tNZ/7JfwO9vG72O7m3F9SKRZE/ZBYtcyBAdFRyrU+4OfHzUGdCxV
+						Efywf9VATF8k5HsTmQCC6nthSqUXQL0msNkNdujWdlvCuf2/BUgByq1X4WUTC/iD
+						WUQdKdYaNULgmyDjRprcpJjIGfu2XTR1KwwBafGBvBkpdjNPe5vqDO/2QMsdqYfx
+						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>
+						MIIDVzCCAj+gAwIBAgIUX0CFs7nNWuXu2lCNNauASex5B5wwDQYJKoZIhvcNAQEF
+						BQAwJjEkMCIGA1UEAxMbdi1zaGliYm9sZXRoLmNhbnQtY29sLmFjLnVrMB4XDTEz
+						MDkxNzEwMTg0MloXDTMzMDkxNzEwMTg0MlowJjEkMCIGA1UEAxMbdi1zaGliYm9s
+						ZXRoLmNhbnQtY29sLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+						AQEAujeuPszBocV2kcwkN8u7SVmHqcYGLLYzkz509WX4yp57LtK9PEo8wpoVoTBk
+						GOv9+Dq7hbtJ0fuwxYh0T5FqjTiTIX7oXa8Qwb0AmxQLeKFlOQ0HkkoieHyU4wed
+						o28K7HPYeRVFn+rkcxK2UiMg0KiIwNzNhTd78Clwt06FVvasuUE5V/ncwYJNEcVc
+						8M2BOMxtdeed8SP+Qio5GLMB53O9ziI/pYHB453pigwiFxUXoxVffA1kLcFL7iS6
+						inlKCsuF/WpzHksYCnbOItOnUm0GiC8nqJ/hl6fXfIMoA+0ijBurNyKBN3Vl0dC+
+						OX/TNW61giCUZUaSdWyF67jDHwIDAQABo30wezBaBgNVHREEUzBRght2LXNoaWJi
+						b2xldGguY2FudC1jb2wuYWMudWuGMmh0dHBzOi8vdi1zaGliYm9sZXRoLmNhbnQt
+						Y29sLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQLod2XYoE2pXu03e4G
+						e93I5bYcijANBgkqhkiG9w0BAQUFAAOCAQEAeZGPjbwyzjVemSC0DdfWX1OQNYDP
+						IxH4htEX55B9tNZ/7JfwO9vG72O7m3F9SKRZE/ZBYtcyBAdFRyrU+4OfHzUGdCxV
+						Efywf9VATF8k5HsTmQCC6nthSqUXQL0msNkNdujWdlvCuf2/BUgByq1X4WUTC/iD
+						WUQdKdYaNULgmyDjRprcpJjIGfu2XTR1KwwBafGBvBkpdjNPe5vqDO/2QMsdqYfx
+						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>
diff --git a/swamid-interfederations-2.0/va-idp.lanet.lv.xml b/swamid-interfederations-2.0/va-idp.lanet.lv.xml
new file mode 100644
index 00000000..cc60978e
--- /dev/null
+++ b/swamid-interfederations-2.0/va-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?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>
+      <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>
+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>
+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>
diff --git a/swamid-interfederations-2.0/vea-idp.lanet.lv.xml b/swamid-interfederations-2.0/vea-idp.lanet.lv.xml
new file mode 100644
index 00000000..59d0137d
--- /dev/null
+++ b/swamid-interfederations-2.0/vea-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?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>
+      <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>
+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>
+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>
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
new file mode 100644
index 00000000..280c3e6b
--- /dev/null
+++ b/swamid-interfederations-2.0/verify.cranfield.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,62 @@
+<?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>
+      <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>
+						MIIDDzCCAfegAwIBAgIJAKvu+ZotXOBYMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51azAeFw0xMjA0MTIxNTA4MDhaFw0y
+						MjA0MTAxNTA4MDhaMCMxITAfBgNVBAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAONwiFdIwZkaerJXg8Wm
+						47ddT4dPw4AYVWgk2Uy64qQvAgbaSQi1mknnR27bhWyg5iCA3z9IrfLtLmF6O4do
+						Q5nMjXcnCVivz0hubTlFLgqtbo1XXddm+WYrpsoBhATbgLcz8XG/TdQWzqPjf6xR
+						jslpbjf8YTDCigoLpxnrBfJeY8ns81RaxtDOS/eg5JgjpohSbnJK5kum4twpEVPK
+						/Z6EmoIKsCQ2YTzcn1PmlxT3czYxBS5Hr54tt1W7JUtZPlrWyMJnQVof7MZSTeLr
+						piH74BxtfbN1n7AwWvGSdj7D8saRahKv9YzexaGKNggAlXE7lwDSRAagh/MKIX4V
+						oasCAwEAAaNGMEQwIwYDVR0RBBwwGoIYZGlnaXRhcnkuZGFyZS51bGNjLmFjLnVr
+						MB0GA1UdDgQWBBQJeESLMMOvuBxCw/egquAAUDHR2zANBgkqhkiG9w0BAQUFAAOC
+						AQEAPF1yxkncDbJ0WwRpnleXV2P7GGDKenIbcIH69ad+0IARiyCvKJxX1vpfkD2C
+						Fmis9+MURBeMMpRUpRsIGh9O2SMMQT/aTMHqoSWOMGiJW9fM6PCS18Z5Zx4aTgyq
+						O1ez0wHjbR1vW/TfSM/b6A2ovLqR+6bbbaymu0wu5UbNofG1uSRgkKT9kgeiGLWq
+						VqagedqlmGej4hnCq2/+hMGTdeRiCrgFwUwVL8ZLfs8YptRka8WPuEsXieI7m7rf
+						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>
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
new file mode 100644
index 00000000..f91be2a4
--- /dev/null
+++ b/swamid-interfederations-2.0/verify.dmu.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,64 @@
+<?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>
+      <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>
+						MIIDDzCCAfegAwIBAgIJAKvu+ZotXOBYMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51azAeFw0xMjA0MTIxNTA4MDhaFw0y
+						MjA0MTAxNTA4MDhaMCMxITAfBgNVBAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAONwiFdIwZkaerJXg8Wm
+						47ddT4dPw4AYVWgk2Uy64qQvAgbaSQi1mknnR27bhWyg5iCA3z9IrfLtLmF6O4do
+						Q5nMjXcnCVivz0hubTlFLgqtbo1XXddm+WYrpsoBhATbgLcz8XG/TdQWzqPjf6xR
+						jslpbjf8YTDCigoLpxnrBfJeY8ns81RaxtDOS/eg5JgjpohSbnJK5kum4twpEVPK
+						/Z6EmoIKsCQ2YTzcn1PmlxT3czYxBS5Hr54tt1W7JUtZPlrWyMJnQVof7MZSTeLr
+						piH74BxtfbN1n7AwWvGSdj7D8saRahKv9YzexaGKNggAlXE7lwDSRAagh/MKIX4V
+						oasCAwEAAaNGMEQwIwYDVR0RBBwwGoIYZGlnaXRhcnkuZGFyZS51bGNjLmFjLnVr
+						MB0GA1UdDgQWBBQJeESLMMOvuBxCw/egquAAUDHR2zANBgkqhkiG9w0BAQUFAAOC
+						AQEAPF1yxkncDbJ0WwRpnleXV2P7GGDKenIbcIH69ad+0IARiyCvKJxX1vpfkD2C
+						Fmis9+MURBeMMpRUpRsIGh9O2SMMQT/aTMHqoSWOMGiJW9fM6PCS18Z5Zx4aTgyq
+						O1ez0wHjbR1vW/TfSM/b6A2ovLqR+6bbbaymu0wu5UbNofG1uSRgkKT9kgeiGLWq
+						VqagedqlmGej4hnCq2/+hMGTdeRiCrgFwUwVL8ZLfs8YptRka8WPuEsXieI7m7rf
+						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>
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
new file mode 100644
index 00000000..2339c7d6
--- /dev/null
+++ b/swamid-interfederations-2.0/verify.sheffield.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,64 @@
+<?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>
+      <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>
+						MIIDDzCCAfegAwIBAgIJAKvu+ZotXOBYMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51azAeFw0xMjA0MTIxNTA4MDhaFw0y
+						MjA0MTAxNTA4MDhaMCMxITAfBgNVBAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAONwiFdIwZkaerJXg8Wm
+						47ddT4dPw4AYVWgk2Uy64qQvAgbaSQi1mknnR27bhWyg5iCA3z9IrfLtLmF6O4do
+						Q5nMjXcnCVivz0hubTlFLgqtbo1XXddm+WYrpsoBhATbgLcz8XG/TdQWzqPjf6xR
+						jslpbjf8YTDCigoLpxnrBfJeY8ns81RaxtDOS/eg5JgjpohSbnJK5kum4twpEVPK
+						/Z6EmoIKsCQ2YTzcn1PmlxT3czYxBS5Hr54tt1W7JUtZPlrWyMJnQVof7MZSTeLr
+						piH74BxtfbN1n7AwWvGSdj7D8saRahKv9YzexaGKNggAlXE7lwDSRAagh/MKIX4V
+						oasCAwEAAaNGMEQwIwYDVR0RBBwwGoIYZGlnaXRhcnkuZGFyZS51bGNjLmFjLnVr
+						MB0GA1UdDgQWBBQJeESLMMOvuBxCw/egquAAUDHR2zANBgkqhkiG9w0BAQUFAAOC
+						AQEAPF1yxkncDbJ0WwRpnleXV2P7GGDKenIbcIH69ad+0IARiyCvKJxX1vpfkD2C
+						Fmis9+MURBeMMpRUpRsIGh9O2SMMQT/aTMHqoSWOMGiJW9fM6PCS18Z5Zx4aTgyq
+						O1ez0wHjbR1vW/TfSM/b6A2ovLqR+6bbbaymu0wu5UbNofG1uSRgkKT9kgeiGLWq
+						VqagedqlmGej4hnCq2/+hMGTdeRiCrgFwUwVL8ZLfs8YptRka8WPuEsXieI7m7rf
+						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>
diff --git a/swamid-interfederations-2.0/verify.studentbeans.com-shibboleth.xml b/swamid-interfederations-2.0/verify.studentbeans.com-shibboleth.xml
new file mode 100644
index 00000000..03b508ec
--- /dev/null
+++ b/swamid-interfederations-2.0/verify.studentbeans.com-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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>
+    <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>
+      <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:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEODCCAyCgAwIBAgIJANJg6RwX4lGaMA0GCSqGSIb3DQEBBQUAMIGcMQswCQYD
+						VQQGEwJVSzEPMA0GA1UECAwGTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xHDAaBgNV
+						BAoME1RoZSBCZWFucyBHcm91cCBMdGQxIDAeBgNVBAMMF3ZlcmlmeS5zdHVkZW50
+						YmVhbnMuY29tMSswKQYJKoZIhvcNAQkBFhxkZXZlbG9wZXJzQHRoZWJlYW5zZ3Jv
+						dXAuY29tMB4XDTE0MDQxMDE1MzcyNloXDTI0MDQwNzE1MzcyNlowgZwxCzAJBgNV
+						BAYTAlVLMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEcMBoGA1UE
+						CgwTVGhlIEJlYW5zIEdyb3VwIEx0ZDEgMB4GA1UEAwwXdmVyaWZ5LnN0dWRlbnRi
+						ZWFucy5jb20xKzApBgkqhkiG9w0BCQEWHGRldmVsb3BlcnNAdGhlYmVhbnNncm91
+						cC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqGDfRStUUNFor
+						otpdWs83wj0xQQ4sP0PfIyWV7kjGNSBA4WuyqX/nxz0prwJfOKzdNKcCdM9ZR8vD
+						AzjeDJ5Y2vneAKhmGMjucEPoy5Zb9dC6fFP2M6mmM47oAFGT2rzTZKFWbAKyV0f8
+						zE6K+Ddq//dmkA5IwTWpq63c/ouEtG8IP8kGdthpQLmNvhg1C0Afko/xydvs2LXh
+						y3XZUxKEDSu3NhvIWxE4iv7TTs4vnXvQLmPd3xSWQZEbd+/golvl0hs6tsBCQR8T
+						fUjgUCatbzT177hkhhHNkhlYLaUtf6k/9mO1U1t8aIDA+wlA0Js+irTqxLi4OmgK
+						2XtMjERRAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
+						U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSq41Sfw3DoEWvPwtTW
+						7Z2Za78S0DAfBgNVHSMEGDAWgBSq41Sfw3DoEWvPwtTW7Z2Za78S0DANBgkqhkiG
+						9w0BAQUFAAOCAQEAfxOkl3ajUkZMYII16kS/SFEQGCQ+KGAvaBFZsVm0fkdGKLhm
+						fCM56Y9yx38PNUG90AACWSxGAjzvRbwV6AwLgOtqO9yGUQMtMgITRa6Gw35DVhWT
+						Iz6w5KFhKX0iCM+NGAQaPGnM0c5Y7zwyI/fBeO9VfAcXUwBPu1eUeoQitzv6/XXz
+						LzmtbQlpgBWPfi30tXx0ZfJALdWkP54Bbubw7nC8KlMZInpTdtot/CYqk6K1yZ5K
+						dbTF8jXsONg/RSWzM2N6J42swNHz1NzcVCbwtvlu8sPzLWftRGLZFLWpj3SJR3mr
+						UKG+a99pFdmiJhaVmr6ppycpR94IcDJb+8Px5A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.studentbeans.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <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="0"/>
+    <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="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </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
new file mode 100644
index 00000000..ef262a5b
--- /dev/null
+++ b/swamid-interfederations-2.0/verify2.newsbank.com-shibboleth.xml
@@ -0,0 +1,69 @@
+<?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>
+      <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>
+						MIIDJDCCAgygAwIBAgIJAMub3zkdNgfVMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFHZlcmlmeTIubmV3c2JhbmsuY29tMB4XDTExMDcxNDEyMzkzMVoXDTMxMDcw
+						OTEyMzkzMVowHzEdMBsGA1UEAxMUdmVyaWZ5Mi5uZXdzYmFuay5jb20wggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCX4nO4n/OE9kthul9beskkdjpdOzIh
+						3DCLzOw1S8vvsfUmVEcYHw7kFEvyJ1v3OrBqWunnkOtRdPWK8LmMiLK/G28vKqWE
+						/xDDuJtYN4u4imHXCSHtLWw9v96U/z47BuMBsrllveKRjGqirlXmmaPc/qJwDonB
+						v341/6wi3CbEd0y5RuhHf1Bh6q9jdWUe6rZ1sIE6wEc4MiYY1ZVO/Ihln3PTvDrr
+						pU1W9mwuWbF71qHYGbo9FB0JKVdKWFeXqdojKc9C1Zv+knDLgnmgO3AFYWubgDps
+						9reaYU/sqyII/v4FmyK09wLYCc2zwR9nrbooV8H36rBWW6aq7j2GGg9vAgMBAAGj
+						YzBhMEAGA1UdEQQ5MDeCFHZlcmlmeTIubmV3c2JhbmsuY29thh92ZXJpZnkyLm5l
+						d3NiYW5rLmNvbS9zaGliYm9sZXRoMB0GA1UdDgQWBBSI7BA1evnVwylG4+BNrHGA
+						4dGR1jANBgkqhkiG9w0BAQUFAAOCAQEAIeJ9mn0EjTRcMBieZ4+TQRJCUtl726xj
+						imqKZv+6A+kyMTfGRo4NmbYOVsTG6KJ9rVAwkEKzAKfXgVtProNiygU5x41ipRul
+						oE6mQF7lN6Uf1bWDdcRQw+REeDaB7vzxeiIfSh0XHPEELsqnihR25AD/9DwMixJC
+						iTHaRfGrVCY67k8BMpvNIFeDN6BFRkNjzGoQJBOg8j81fdKH4OkjqQ0SLg7X7zPT
+						+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>
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
new file mode 100644
index 00000000..3ecab91b
--- /dev/null
+++ b/swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.xml
@@ -0,0 +1,110 @@
+<?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>
+      <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="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>
+					      MIIFdjCCBF6gAwIBAgIQINOwQe4k09iKRAogjYscZDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowOjEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwx2aXAuZXNwY2ku
+ZnIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDG4kQF844cPIa0EonJ
+NOgAx1MC8skufPLiqMFNu9moOTuq7GBVYPgyjPt46xhWm6VvAMTwZHTSPS4NYQwy
+PwU8S6XRYLh+K5hJmeWras/UJFxsNMqwtA/5KRGYRDPKv6kA2oF7dWu9uA8e78L2
+YCGPcY3YVmURl0Hcsa4EN2fU2c3a00NDJjJKuk1QF/M4lh+SG8lzQJHDrVtkl4tg
+dO74GOq1hhY3wq4037Ybi7TnBDQ47MUtANpPmmOhnbUR8nXaNGpBfLX515qoyksr
+tlk7YeoyguEqWIoEHmxNzwuNqh2cVBJQassPzIYYQfabbO6SH/PQxri3kyzVs7eF
+IIxQ4a7ueI6sGDeuuMhLFGG6tvJOPw2K/9fsHGYdGtnUAF7PVmNCUkRC9P667baz
+cJL5wGkAS6yczTXAS14WwL+OPQldB15Etv9odQ8cp/xJWL+fkrx3GzG4lyzRPo2f
+w84G1YQt1PJ5VJ+gT+ZzUDAkTnYpV7Hw2DUm2EIUAMXRL2d/B17GyxKh+YvtWRsl
+r+MkLWjdb2RglF1EtKV8YvXiGk26gDc3J8ZkseOq8RkvYHqFfZl346I4ve1dwB++
+Hwc2AvVCkCWxczQs6kFkgx9kw+GrrFB3OLUB+/EOh39iB5FyC+EKt1TGPhE1r41F
+yjfR4oLG0niAJvbTYtDPZ6AN4wIDAQABo4IBejCCAXYwHwYDVR0jBBgwFoAUDL2T
+aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFGqL9qiZrqTzr2sVmqknWvntrCtV
+MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
+BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
+ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
+UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
+Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
+hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAoBgNVHREEITAfggx2aXAuZXNw
+Y2kuZnKCD29wZW5pZC5lc3BjaS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAJ3M5NRTg
+XfOhpzRIyBfNgEMV/D9n2h9vD4YqJI05bYhbELOD1wkmLcpFWSsDc0V1WxCHl9Dz
+y2YdRaq51NbeBlnh/Q8ulKqx//O+29R52AHD3p7Be4lynIHDRgOWWu9pzZTDd0yw
+MthAhzQKI6LenYb3jIJqy8OKgEAZB/kQcWfmVlXws7CyxFk6XJS7tIm52d9ywMGe
+/4Wpe4W1jHEWn4ngfgHIOZ33NHsze0p+A3lhQLQxQc2yYk2pfhwMq2a++veSqnrs
+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>
+					      MIIFdjCCBF6gAwIBAgIQINOwQe4k09iKRAogjYscZDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowOjEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwx2aXAuZXNwY2ku
+ZnIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDG4kQF844cPIa0EonJ
+NOgAx1MC8skufPLiqMFNu9moOTuq7GBVYPgyjPt46xhWm6VvAMTwZHTSPS4NYQwy
+PwU8S6XRYLh+K5hJmeWras/UJFxsNMqwtA/5KRGYRDPKv6kA2oF7dWu9uA8e78L2
+YCGPcY3YVmURl0Hcsa4EN2fU2c3a00NDJjJKuk1QF/M4lh+SG8lzQJHDrVtkl4tg
+dO74GOq1hhY3wq4037Ybi7TnBDQ47MUtANpPmmOhnbUR8nXaNGpBfLX515qoyksr
+tlk7YeoyguEqWIoEHmxNzwuNqh2cVBJQassPzIYYQfabbO6SH/PQxri3kyzVs7eF
+IIxQ4a7ueI6sGDeuuMhLFGG6tvJOPw2K/9fsHGYdGtnUAF7PVmNCUkRC9P667baz
+cJL5wGkAS6yczTXAS14WwL+OPQldB15Etv9odQ8cp/xJWL+fkrx3GzG4lyzRPo2f
+w84G1YQt1PJ5VJ+gT+ZzUDAkTnYpV7Hw2DUm2EIUAMXRL2d/B17GyxKh+YvtWRsl
+r+MkLWjdb2RglF1EtKV8YvXiGk26gDc3J8ZkseOq8RkvYHqFfZl346I4ve1dwB++
+Hwc2AvVCkCWxczQs6kFkgx9kw+GrrFB3OLUB+/EOh39iB5FyC+EKt1TGPhE1r41F
+yjfR4oLG0niAJvbTYtDPZ6AN4wIDAQABo4IBejCCAXYwHwYDVR0jBBgwFoAUDL2T
+aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFGqL9qiZrqTzr2sVmqknWvntrCtV
+MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
+BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
+ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
+UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
+Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
+hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAoBgNVHREEITAfggx2aXAuZXNw
+Y2kuZnKCD29wZW5pZC5lc3BjaS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAJ3M5NRTg
+XfOhpzRIyBfNgEMV/D9n2h9vD4YqJI05bYhbELOD1wkmLcpFWSsDc0V1WxCHl9Dz
+y2YdRaq51NbeBlnh/Q8ulKqx//O+29R52AHD3p7Be4lynIHDRgOWWu9pzZTDd0yw
+MthAhzQKI6LenYb3jIJqy8OKgEAZB/kQcWfmVlXws7CyxFk6XJS7tIm52d9ywMGe
+/4Wpe4W1jHEWn4ngfgHIOZ33NHsze0p+A3lhQLQxQc2yYk2pfhwMq2a++veSqnrs
+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://unknown.site.com</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/vision.port.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/vision.port.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..d8884205
--- /dev/null
+++ b/swamid-interfederations-2.0/vision.port.ac.uk-shibboleth.xml
@@ -0,0 +1,70 @@
+<?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>
+      <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>
+						MIIDZjCCAk4CCQCfVVv6ur+XEjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJH
+						QjESMBAGA1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpQb3J0c21vdXRoMSEwHwYD
+						VQQKExhVbml2ZXJzaXR5IG9mIFBvcnRzbW91dGgxGjAYBgNVBAMTEXZpc2lvbi5w
+						b3J0LmFjLnVrMB4XDTEyMDQzMDE5MjUxN1oXDTMyMDQyNTE5MjUxN1owdTELMAkG
+						A1UEBhMCR0IxEjAQBgNVBAgTCUhhbXBzaGlyZTETMBEGA1UEBxMKUG9ydHNtb3V0
+						aDEhMB8GA1UEChMYVW5pdmVyc2l0eSBvZiBQb3J0c21vdXRoMRowGAYDVQQDExF2
+						aXNpb24ucG9ydC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AMCQj6KNR/lLsY4C0QZ/9AajLoVmgosS8eU28X70hj4FYO72GtkpEhUAcPM+1jg8
+						7xswamsSssDiSwMDwWJOHD/Hg6QU0NiMCdrV92zsLMx/rNWgFnP0OxFhbugZOIaq
+						ephmCltpeIfK7D1+bLvmWxqCjHFXEcFAUBrr8D+2Xtn9CrAG21qhAhblt49hFloM
+						wEcd3kq0qpbutiSOcJbDisQn4tnLMg8C9RRf1/OpZiLC5lkMXcjJrF45OBodpHW/
+						chbK/NLWunZ1vU0eeCR1OHvnoAfAZbPFiRXARmkP/IlopH27C6fAs1kFrFIsH6al
+						Zdtr4gAtIhJly4ek3tfrMssCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAQ/AT6vSW
+						u/myKPyw5BT6oNUVHT3XODsrAV4ZuiF71OaV1W8+x78l6Nl3LRM3BhD5dPsQyFTy
+						Qf+GhQ72NKgrqWRJVlNsJKnQuMBasN75i3G7eoWvkfFVCUCTjKIdliN2JHBxAQ5N
+						PJ+5Hg5Z2vgqDZfqGP1bzAD0hByb0AU+Thc8nu8TwStzsKLPAmg8nU33V2L3G+wK
+						IbMqxWcz14xevKE9iewjRhI5stMrQySAcRUEr4w10t/xGNR+rWwfT+aFKi6t2DFc
+						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>
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
new file mode 100644
index 00000000..b3c0b146
--- /dev/null
+++ b/swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr-idp-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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="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>
+					      MIIDTDCCAjSgAwIBAgIVAMI/RmCj23hGRPU+v9uRMFWtW9obMA0GCSqGSIb3DQEB
+BQUAMCMxITAfBgNVBAMTGHZtLWlkcC5wYXJpcy1zb3Jib25uZS5mcjAeFw0xMzA3
+MjQxNDAxMDNaFw0zMzA3MjQxNDAxMDNaMCMxITAfBgNVBAMTGHZtLWlkcC5wYXJp
+cy1zb3Jib25uZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMK/
+pDQMCJZT2BMJ90P5vE9++hFyrdBmzGN/bxcPpJP+QU1pt0JtKG1YxAuGCIuWRYG2
+I1P1KIxyzHBl8hw3fG0JXosKwr2UgflOMLWLFpOpGboQWMH3DowM7/ljJYylEeO6
+PDUrjBUjPpdXmfGf+WWxp8Pg0vWXOW1qW4TND1n9+l2MBQaO8CBzg+eGG7G67u73
+xXl2VaYDZhgLHWHa72CpiCKZqZ23SWEuSDtgncQfnYUMHAxsCqAYPJVmAagAMsAN
+yaKhNHIEGC7fSemyDRRtAvaoWlTNsGvBu+nV0DPkJcH0vBWc+AxUAzDaAn/gRD8/
+FhEeCXXQI5I/up3XTe8CAwEAAaN3MHUwVAYDVR0RBE0wS4IYdm0taWRwLnBhcmlz
+LXNvcmJvbm5lLmZyhi9odHRwczovL3ZtLWlkcC5wYXJpcy1zb3Jib25uZS5mci9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8B2ktyp27dZeWdcyJelNcFHP7RgwDQYJ
+KoZIhvcNAQEFBQADggEBACXuIAmAz7T7SXDdAVkSUSaRCd0WzhvG8TtN+VWtl3Uu
+kDLaNuh/dFuk+nCIv5V6Wpof7eLi5RAzfe/iHGknL6W4frMqA9bkIPZCIFTpzUrp
+wO9+6ygvgDnsPqPBwH80Bn7GKBd0/sXSLfXWOlFehgKxOJ+zG0UwvhoID7IqDNQL
+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>
+					      MIIDSzCCAjOgAwIBAgIUc0FQTVYKXqv1YkZNpjccybeOcxMwDQYJKoZIhvcNAQEF
+BQAwIzEhMB8GA1UEAxMYdm0taWRwLnBhcmlzLXNvcmJvbm5lLmZyMB4XDTEzMDYx
+ODEzMTg0OFoXDTMzMDYxODEzMTg0OFowIzEhMB8GA1UEAxMYdm0taWRwLnBhcmlz
+LXNvcmJvbm5lLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgPr/
+zq25BPrGBr/mp2KiN/5DhfHpmyjlVOb6b0txBrdLP1s2WzgY0HJPFsxzrh2Ms91E
+apkaQLyB9iqQPL49QKybBuGRkj/wXXXULzlG4bciAJ4vTwsiChXmvG7L1GXfvqRX
+vLrXLGcSts3MKbKTopqsrYI2MnoTxu95FiUoaxseT+ogy+e31n6iKd6ncR09cYGN
+4aeh4eTRwIsEkrTwYWzQJO0m8UXc1WKzKyhqA+Z4mOMwQbq261M2UHfyimBHqOTt
+VXELAQTGLd/2vBsLa9imthQ+P9DoEaeYbssgnKkNQyoqbDpBAq0Zs457W2A4N6o8
+WCg5bxcOBowGbfAxEQIDAQABo3cwdTBUBgNVHREETTBLghh2bS1pZHAucGFyaXMt
+c29yYm9ubmUuZnKGL2h0dHBzOi8vdm0taWRwLnBhcmlzLXNvcmJvbm5lLmZyL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBT7V2DX3R7WhN/ABHzjj6lZgnJz1DANBgkq
+hkiG9w0BAQUFAAOCAQEAZLSTb8R1WTiDwWaRwDQ+W2Zv3cPWay9bN8zm/zGOHnuM
+8ksyIPTQ0navE6gzty8E9GXMD2ymTjuycMuTkR6xZP9F3SB6GRtNIljpLIYxOdbZ
+gYR1+xemNL+5i2VJ5C5Lah2pPVtUiiOUEd8EBHtq5l5hlMslZMFeKgriLnf9ah4l
+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://unknown.site.com</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
new file mode 100644
index 00000000..567b1f96
--- /dev/null
+++ b/swamid-interfederations-2.0/vm-jorum-live.mimas.ac.uk-shibboleth.xml
@@ -0,0 +1,83 @@
+<?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>
+      <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>
+						MIIDQDCCAiigAwIBAgIJANQP2jdRCfzwMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXZtLWpvcnVtLWxpdmUubWltYXMuYWMudWswHhcNMTIxMDAyMTM1MjE0WhcN
+						MjIwOTMwMTM1MjE0WjAkMSIwIAYDVQQDExl2bS1qb3J1bS1saXZlLm1pbWFzLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8gYKF0xuU66m0RX5
+						Od3jfU9l0GGu18RGmMjfEqWapq0jKgrcQJ7lnIK3ZXaCAk1tcNS1qOnm9KhXK5KA
+						7wKS0g6Mlp7xeT+rOHpKvSCC/TDPtf1XId4jA0HMTcSnDE1hmI/wauY+QRHWs7Ur
+						oIEUZMPOcMNhPZrJUoVxKaikXvSAyCqFN5R76MDToDDgOfPM1yNnNzyrnpUTQiEq
+						3GKo75cyT7T0G11CWQ8D8iJlOFepN4B0cZirgGl36z43TwJAXHLiAY3D9B60zI+R
+						om/0QSPaTkwh+HRedV3z0nz+fgjedVZ6pJeWzHOD3eSuXaP0curw44D7WqjjYjHL
+						4KIzTwIDAQABo3UwczBSBgNVHREESzBJghl2bS1qb3J1bS1saXZlLm1pbWFzLmFj
+						LnVrhixodHRwczovL3ZtLWpvcnVtLWxpdmUubWltYXMuYWMudWsvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUqorggIzoMEc9fZmWa6roOYbqzSswDQYJKoZIhvcNAQEFBQAD
+						ggEBAFb756zkwksgAxFut4fJ+IcKubtWZbmDTu2TnWyEQL8WKiAhi2jxdf7m/Y8M
+						+Bj2j1ukkoAxRUklRF4B1tdGIIcD8wB3pHDVjnPnH8rPeIOP8WCKPoWEBozpAb9B
+						ry1OnaoxidZBQRAB6Nv8YQ62UiOodcCaOeajRcdbGy3x4n47q/nLGc/rpcQEIBtV
+						asDFXqeKspdgzaZAvXmSPOVvRB/QYnLdjkVRTVfSx1+Lf55Rgvb1f0IqFlVhJtxJ
+						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>
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
new file mode 100644
index 00000000..50aad75f
--- /dev/null
+++ b/swamid-interfederations-2.0/vm-jorum.ds.man.ac.uk-shibboleth.xml
@@ -0,0 +1,83 @@
+<?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>
+      <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>
+						MIIDLTCCAhWgAwIBAgIJALvdFCXrleHwMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFHNoaWJ0ZXN0LmpvcnVtLmFjLnVrMB4XDTEyMTIxMjEyNTEyMFoXDTE3MTIx
+						MTEyNTEyMFowHzEdMBsGA1UEAxMUc2hpYnRlc3Quam9ydW0uYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4A9nXwKbBwc2kBco7STxNshEWvwDU
+						Ko9gyYVeny7EBti3FnyexaKdx5kSDOM0JLHO+gQKx/GVl0ZMqelZxnBqKsPN62d5
+						KSj2OsDPzlvYiyBHZybhyUKnjkOXB8/6Ndffu7wea1vTtSZPoNRjtQEDVCX7Qltd
+						mniATHBHsgLgbQX9WxxM27qC8+pw9G/a0Z+X3UZQBpsIJZE4EnY/oOOP3jbYlOSY
+						8hdAEKws3B8zd4R4/4fRkLqapi1h1qbTYRS+zozwdTr/yU7BeL4Av61thl3mMdhL
+						wolSWbwmZUTYmr3oEnajjQr2wCk0X4cuA4OchGIYAN+p5qkwap6Qigv/AgMBAAGj
+						bDBqMEkGA1UdEQRCMECCFHNoaWJ0ZXN0LmpvcnVtLmFjLnVrhihodHRwczovL3Zt
+						LWpvcnVtLmRzLm1hbi5hYy51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBQRO5UtVirW
+						XHM8XRY62cJN2fv9jDANBgkqhkiG9w0BAQUFAAOCAQEAVKfQ1b09D/qMa0bm1dRY
+						vnKo9sJb55b2HsORAnrBGatOA+/3UvJB2RHRpGZxIXxqQAkTxch1K2GsOfnEKvz/
+						tVxZbxWasiVe184HZaYjvudaf7RneW+2MVq+OugsXH+kVXtXPZd189ZO0XmhFTZX
+						jZy2DqL9aG3qvGX7/yX1uLEzltywMo0ba+imB4klXQgD0ZEH8qBaHcPjKaWSSAS/
+						izsVtVnLjEyZ91V2gHyMMKDm6y2eoZTQOisMfhf+ef6rjMIhwBxLNtf0GbsQc2BG
+						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>
diff --git a/swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..b0690e7c
--- /dev/null
+++ b/swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.xml
@@ -0,0 +1,57 @@
+<?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>
+      <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: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>
+					      MIIDJzCCAg+gAwIBAgIUa6YcSsah7wzB8e/uovuAIHgDDikwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPdm1mZXRpZC5pYW1tLmZyMB4XDTE0MDMxOTE0MzUxMloX
+DTM0MDMxOTE0MzUxMlowGjEYMBYGA1UEAxMPdm1mZXRpZC5pYW1tLmZyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgvu2YJSUPkAxdOhba3LMGpEcisXf
+VdNeH7ghFbg6CPBJUUNaDWftx8OqbB7q9UpYJRhSPxoZlsglDLCxmQPNH8zSC7F5
+Tg0cuRRMoUt7UopzEoDoeklLxfd8jTLXQBXdcQftKpZLuQAdSDuAMEW/n8pPTkCE
+Ujy7NkS7SwJTBz8aW2wiXiRrMoYO4MC0IxW0peQ9yp4ovjPqy8P/KfsPh/QjfevC
+PG+SH3J80NIjcSl6tf7CLJBVa4s/zfT6znpl1LB6qnV0gJ+jh+wSXIEsy+Q/Km/E
+VyiDxnl5NI04RKi7kDgPSpsbzAqa9oZrs9uZKIeer/lScG7oizWZZHDwXQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg92bWZldGlkLmlhbW0uZnKGJmh0dHBzOi8vdm1mZXRp
+ZC5pYW1tLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSRB4UIB+9SgknpoQOp
+MWDrw6esHjANBgkqhkiG9w0BAQUFAAOCAQEAK/jgKZJrp7uM7+h7wwHdByANU16I
+QVPXf5TNHqduJKKNgdZt84pq6ixn6WRxvFEuLWJdf2LRvRt2jwkaZEOM8gcZhUGq
+68F97X+xBDQt5iqMRmLVDnYsitc6osw5Kf4sxPdwDlt3k56aRl3vHADDsqK54vqI
+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://unknown.site.com</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
new file mode 100644
index 00000000..8d6b690f
--- /dev/null
+++ b/swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml
@@ -0,0 +1,125 @@
+<?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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.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</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Mid Sweden University</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 height="111" width="225" xml:lang="sv">https://www.miun.se/imagevault/publishedmedia/x4bl7padufcm1j4td3d7/logo.png</mdui:Logo>
+        <mdui:Logo height="111" width="225" xml:lang="en">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>
+MIIDJzCCAg+gAwIBAgIUREnpvBXjmkHQJD0xn6joE9UTMyMwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMB4XDTExMTIzMDEwMjMyNVoX
+DTMxMTIzMDEwMjMyNVowGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiJkrr5rb4DLITBdU0e/8/lBAnoQq
+Bx/coeuJzCNP2EtRKCqTHB+v77geB+zzUZz2xDVmVjqMiO2/yCtZtI1hsK9nuPbV
+EZe1AuyQph31ud3r2ZkT/eS+xbmTyxAkMYSqrj55OC1Dfk0AYHGpS46q3JURD0A8
+OYOQb74IB1iC2+da3VKKjkbVlymdULN+o5Fg+zAzFymClSbPP3+Vu6D/65L2r1Bg
+DDgq9qtFGXdopNHnDU2eY+rTQEipa0EpVG7gv77Q1GFA2f5BCNTuW9AQOKnXTkbO
+hb1bXylESEvNL57+l8/8qdDEJmcvwJRHttVpSlWpTYQKMXK9J5kB3YIhUQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg92bWlkZ3czLm1pdW4uc2WGJmh0dHBzOi8vdm1pZGd3
+My5taXVuLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRpUIa+z1bDfa7o0lKm
+pwa034YZhTANBgkqhkiG9w0BAQUFAAOCAQEAfgyLe7dVQXULh4wAVhCVeUNv40En
+hW929W1K+Zgtz+77nG5lnck88G2yrs15inPABkoGm6SYSYkycYeI7SY1rPy0aSMF
+DWSZLLppL5N1mLxsK+vbF8h3zHWJza8SrxmLoWN6FvM+bYcQb/Peg6MVFpAm3xSp
+EyV0GjP3wM/Qt05Pf26yvZRVXDingJ1RWIOwtNlCag8X/9yG+ktTdSaG+ecqXlq4
+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>
+MIIDJzCCAg+gAwIBAgIUREnpvBXjmkHQJD0xn6joE9UTMyMwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMB4XDTExMTIzMDEwMjMyNVoX
+DTMxMTIzMDEwMjMyNVowGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiJkrr5rb4DLITBdU0e/8/lBAnoQq
+Bx/coeuJzCNP2EtRKCqTHB+v77geB+zzUZz2xDVmVjqMiO2/yCtZtI1hsK9nuPbV
+EZe1AuyQph31ud3r2ZkT/eS+xbmTyxAkMYSqrj55OC1Dfk0AYHGpS46q3JURD0A8
+OYOQb74IB1iC2+da3VKKjkbVlymdULN+o5Fg+zAzFymClSbPP3+Vu6D/65L2r1Bg
+DDgq9qtFGXdopNHnDU2eY+rTQEipa0EpVG7gv77Q1GFA2f5BCNTuW9AQOKnXTkbO
+hb1bXylESEvNL57+l8/8qdDEJmcvwJRHttVpSlWpTYQKMXK9J5kB3YIhUQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg92bWlkZ3czLm1pdW4uc2WGJmh0dHBzOi8vdm1pZGd3
+My5taXVuLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRpUIa+z1bDfa7o0lKm
+pwa034YZhTANBgkqhkiG9w0BAQUFAAOCAQEAfgyLe7dVQXULh4wAVhCVeUNv40En
+hW929W1K+Zgtz+77nG5lnck88G2yrs15inPABkoGm6SYSYkycYeI7SY1rPy0aSMF
+DWSZLLppL5N1mLxsK+vbF8h3zHWJza8SrxmLoWN6FvM+bYcQb/Peg6MVFpAm3xSp
+EyV0GjP3wM/Qt05Pf26yvZRVXDingJ1RWIOwtNlCag8X/9yG+ktTdSaG+ecqXlq4
+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</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Mid Sweden University</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>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>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>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
new file mode 100644
index 00000000..a5b889dd
--- /dev/null
+++ b/swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-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">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.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">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>
+    MIIDKDCCAhACAQAwDQYJKoZIhvcNAQEFBQAwWjExMC8GA1UECxMoTlRJIC0gTnVj
+bGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxGDAW
+BgNVBAMTD3Ztc2hpYi51ZnJwZS5icjAeFw0xNDA0MjUyMDA4MzJaFw0xNzA0MjQy
+MDA4MzJaMFoxMTAvBgNVBAsTKE5USSAtIE51Y2xlbyBkZSBUZWNub2xvZ2lhIGRh
+IEluZm9ybWFjYW8xCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw92bXNoaWIudWZycGUu
+YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPVBiRXs5gBanImYgn
+tpcQpVepaJQTv+xGZH3GZGMzgHzniCvpemzNTcMruZlNVEpHjJWDNSiPgLoVyruG
+i/JjlwlDjNyI7xklMBWBYIvPAlYgnoiV5cVtv0eum8e99ftVMifBVpD7NRWleFZQ
+moAmoGMqNgVfuOHaJ4bnXx9kluFXsaVKVJtTSiXqamtdliMxNf+JCWsxGZnRfaVS
+Y8MvcYz94+/t77q8mQUusSzXmouK5h8/Px1MaqTn97BEELL/4lSR368K7bTFt6Re
+GWP3vDRQq3fbBnOkpP8tCGTGB5kPKvu+7ohiMOSYPEVumpw6fQLbNt+3h6u7M88l
+VRW3AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKF4iTFNslazhSUxZehAycdE+SFV
+oduDsDRA2q0ls46Q/hxpknmCtZC2jusrXx73BWcnzXixTWJIQDwzJK8AyZg6Qf6x
+anig/eIHv48U+D6pfdtFUDbSL2JeCe8oDJiMnEbAZvm4mTphUpmRcw1BHPH2kvVQ
+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>
+      
+MIIDKDCCAhACAQAwDQYJKoZIhvcNAQEFBQAwWjExMC8GA1UECxMoTlRJIC0gTnVj
+bGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxGDAW
+BgNVBAMTD3Ztc2hpYi51ZnJwZS5icjAeFw0xNDA0MjUyMDA4MzJaFw0xNzA0MjQy
+MDA4MzJaMFoxMTAvBgNVBAsTKE5USSAtIE51Y2xlbyBkZSBUZWNub2xvZ2lhIGRh
+IEluZm9ybWFjYW8xCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw92bXNoaWIudWZycGUu
+YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPVBiRXs5gBanImYgn
+tpcQpVepaJQTv+xGZH3GZGMzgHzniCvpemzNTcMruZlNVEpHjJWDNSiPgLoVyruG
+i/JjlwlDjNyI7xklMBWBYIvPAlYgnoiV5cVtv0eum8e99ftVMifBVpD7NRWleFZQ
+moAmoGMqNgVfuOHaJ4bnXx9kluFXsaVKVJtTSiXqamtdliMxNf+JCWsxGZnRfaVS
+Y8MvcYz94+/t77q8mQUusSzXmouK5h8/Px1MaqTn97BEELL/4lSR368K7bTFt6Re
+GWP3vDRQq3fbBnOkpP8tCGTGB5kPKvu+7ohiMOSYPEVumpw6fQLbNt+3h6u7M88l
+VRW3AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKF4iTFNslazhSUxZehAycdE+SFV
+oduDsDRA2q0ls46Q/hxpknmCtZC2jusrXx73BWcnzXixTWJIQDwzJK8AyZg6Qf6x
+anig/eIHv48U+D6pfdtFUDbSL2JeCe8oDJiMnEbAZvm4mTphUpmRcw1BHPH2kvVQ
+MKNAqfS7wH7beXEE283UQ6l6Sd45HEqaLAAqnF//j43t772tN3MtmL9Qd/WUyzTb
+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>
diff --git a/swamid-interfederations-2.0/vote.kcl.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/vote.kcl.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..92c1a989
--- /dev/null
+++ b/swamid-interfederations-2.0/vote.kcl.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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://vote.kcl.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vote.kcl.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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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://vote.kcl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vote.kcl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vote.kcl.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vote.kcl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vote.kcl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vote.kcl.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">Membership Solutions Limited: Kings College London Voting</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://vote.kcl.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/voting.wlv.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/voting.wlv.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..0f58a918
--- /dev/null
+++ b/swamid-interfederations-2.0/voting.wlv.ac.uk-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/vsp2.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/vsp2.edina.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..08fcbdfb
--- /dev/null
+++ b/swamid-interfederations-2.0/vsp2.edina.ac.uk-shibboleth.xml
@@ -0,0 +1,126 @@
+<?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>
+      <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>
+						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
+						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						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>
+						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
+						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						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>
diff --git a/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
new file mode 100644
index 00000000..79b8b0a5
--- /dev/null
+++ b/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
@@ -0,0 +1,84 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2010-02-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">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>
+      <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:Logo height="86" width="150">https://metadata.eduid.hu/logos/niifi.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="hu">http://vvc.niif.hu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">http://vvc.niif.hu/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>vvc.niif.hu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDpjCCAo6gAwIBAgIJAMjwevTdUaFoMA0GCSqGSIb3DQEBBQUAMEAxCzAJBgNV
+BAYTAkhVMQ0wCwYDVQQKEwROSUlGMQwwCgYDVQQLEwNBQUkxFDASBgNVBAMTC3Z2
+Yy5uaWlmLmh1MB4XDTEwMDIwMzExMTA0NVoXDTM3MDYyMTExMTA0NVowQDELMAkG
+A1UEBhMCSFUxDTALBgNVBAoTBE5JSUYxDDAKBgNVBAsTA0FBSTEUMBIGA1UEAxML
+dnZjLm5paWYuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoona+
+rrWD+FiNj++BK8vn/dQyMCteRKU4wa8ZTNycUjoP26eEOkBw6oqrnw1qyw3oKKUV
+fCEiIIlfXg9nJ5qMo7NTYKe/IlanYC+uGMTmT8DjgTH9fpA/8CoNjssuyAOhh0oE
+GdWoPcCd89K+II8uF7Fjz1EhP3WRhWfDTO+mfytMj4qwzV2oLUOfePt7LYMXNNoP
+kWAPa5bar/z0Nl244NjChWvSsM73r23yh1LTCmSH9Lhpotx/k+wvQybhraDhOE57
+NddmEL/5ylhX91Trsi32ukNO2XG4Ndbm5voonxeVRfB6j1rMa51SwEvTZkmDSThx
+7rvvzZ/f6x/9WdjDAgMBAAGjgaIwgZ8wHQYDVR0OBBYEFLwrQAopwhLyqnRtc3Bc
+A1NQJZaBMHAGA1UdIwRpMGeAFLwrQAopwhLyqnRtc3BcA1NQJZaBoUSkQjBAMQsw
+CQYDVQQGEwJIVTENMAsGA1UEChMETklJRjEMMAoGA1UECxMDQUFJMRQwEgYDVQQD
+Ewt2dmMubmlpZi5odYIJAMjwevTdUaFoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
+AQEFBQADggEBAHx0XxnnnmJztT/UEOrQ0nvR3NTGYJijfG68/bovwtrXJB+9plWT
+YyWyIeysddciTSgmaaVnGFw9jj8HtpuAvf3N5mKr6bELP8z7lhGa/WxKgjjv/ETT
+flNOCf8tkhxFJeSJC/Y03MOq+Xqb+6ZzriJIVNYhKDOxR+6inftRQSJ2NWmbgwur
+PYE/CpvqtDTrXeRnweZ1qAjWzKBswU5Un5mnPxcBPOoBuXtf3hhZU8/u4oXEBBQr
+sX0BsAFmY6VsJKO/UNB+AtAajgMZbngFXKBUCKDhSwmFUNjLda2MtF6WmuCUuMgQ
+sdV6d/pp47VnVpkLLCVTNunYA/WvlS+G5kU=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/SOAP"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/POST"/>
+    <md:AssertionConsumerService index="3" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/Artifact"/>
+    <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:ServiceDescription 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 </md:ServiceDescription>
+      <md:ServiceDescription 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.)</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:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eppn" 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:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="affiliation" 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</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
new file mode 100644
index 00000000..0775a2c0
--- /dev/null
+++ b/swamid-interfederations-2.0/vwww.itslearning.com-shibboleth.xml
@@ -0,0 +1,51 @@
+<?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>
+						MIIDSjCCAjKgAwIBAgIJAMta8TnXJcroMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG3Z3d3cuZWxvZ2luLml0c2xlYXJuaW5nLmNvbTAeFw0xMTAyMTgxMzA3NDZa
+						Fw0yMTAyMTUxMzA3NDZaMCYxJDAiBgNVBAMTG3Z3d3cuZWxvZ2luLml0c2xlYXJu
+						aW5nLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMi6jtOqE9dQ
+						0/ZrFLEue3bh9wHSsjzdCvM2YoTGhFuiNsdpaeeGb5A61xJFxBXEzM6CeWoQqCVq
+						V2yhfgUfvi0oerkhXrScWxTC+Na3YLL1wmfBRD8apCqB21B18GR2LMmaExKmnM0g
+						HRV4TL7Xf5tQwxRuvMOZVMFC0KOzSf7II70rj2pzdWV9nLZmOGreF7KSQd89v3F0
+						qBccgJzS81TG4n0HxUWWCdD3fdlP45RNX5uOwjU5F+tUPbfcbjyl8odL6YPicgCG
+						FMs2Z8jMtEPZ8lZpqBnb8dEsPW44CBYa4veEbUAlcVbjXMWrZCCJF4kFICYBLgnP
+						I1ckqaNBIAkCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
+						blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFEtsr6/AQyDcs5vC
+						dNu9H/ZlmO80MB8GA1UdIwQYMBaAFEtsr6/AQyDcs5vCdNu9H/ZlmO80MA0GCSqG
+						SIb3DQEBBQUAA4IBAQA+hJuHf93yK2ZfQT1U14Ojy9nkC25PlQU8N9fYCRBksGOV
+						DOGxeJL+o8EI2X86hPq3n2KdTlZsyZQwC0ilaOsWqogHh0VFMWN8Yr6aQuhTrNUS
+						0v2kDYbeBw3Ze867Skj8Yd7rbeEZ7qFReiXCjqs71vCRwuUnafqM5xK7NlgMZybl
+						YmKgFj2vl9a8kOCfSeYy32Nv6o5whRGYBPsfGb2SqacHqjiUA8oUpWgAdwSaw/+L
+						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>Aunkher</md:GivenName>
+    <md:SurName>Sidhu</md:SurName>
+    <md:EmailAddress>mailto:aunkher.sidhu@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sukesh</md:GivenName>
+    <md:SurName>Nischal</md:SurName>
+    <md:EmailAddress>mailto:sukesh.nischal@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wakeonlan.liv.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wakeonlan.liv.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..19f089a5
--- /dev/null
+++ b/swamid-interfederations-2.0/wakeonlan.liv.ac.uk-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wakeonlan.liv.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-04-08T16: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: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>
+						MIIDbDCCAlQCCQCrskmXeYbk3DANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
+						QjEQMA4GA1UECBMHRW5nbGFuZDETMBEGA1UEBxMKTWVyc2V5c2lkZTEkMCIGA1UE
+						ChMbVGhlIFVuaXZlcnNpdHkgb2YgTGl2ZXJwb29sMRwwGgYDVQQDExN3YWtlb25s
+						YW4ubGl2LmFjLnVrMB4XDTExMDIwMTExMzkyNFoXDTIxMDEyOTExMzkyNFoweDEL
+						MAkGA1UEBhMCR0IxEDAOBgNVBAgTB0VuZ2xhbmQxEzARBgNVBAcTCk1lcnNleXNp
+						ZGUxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIExpdmVycG9vbDEcMBoGA1UE
+						AxMTd2FrZW9ubGFuLmxpdi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBANqAaYk6iHP6srXSIiRIFL1uRJwfMI75m1gr+F4dcIhQLpB4VSRkLmik
+						Z4XDuKncuEZHDQjSxm108N/GAjFQkxQ5YiU/0ASBnUY4DfuReR9/6EbCyKWsLuAv
+						WO3xpJumK7llnspfNVG74r0vPYuAlyqPpKFXjBUOnm+S7EcF8ccXGN4EzUO3+qWJ
+						kmzt0O8WZKJky6Qe2Glny+pvPXBniqENbzbDKh3IvJmW1ImKTET92gxXXLGC/bXX
+						0uIoTP/rTdQ9Y82mcBY6JWXpT5Ne89yOdkXmFfUUv2rTOSwDiikNuPxWrg32Xco1
+						mMh9A4NBDByYWjIh96/L+JQqUDNg6v8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						KPJV9rQe79wsTDtRFpj1QiH6zT0uR/igAUmZfal8ejsPIMGGEGL5Uz0ZPqKKPXg8
+						uk0+fPBNLmlVqkWuZkEMFDN+JFnWxoBoXdbNQvW+LrtiSEYhh+hpn5n8k2l4XpSM
+						3AuZSP7nYAYzK2xQIECyNcfL+yQfZhdqzrSeuWh/PxUG5MHnQWyAlT9K+UXXiMUN
+						EIg5bTg1h2IIuyBWW6whf+jt2kJSSmX03E5oXB38tWC0/AV/xyuGev9BpWAAurps
+						Jx+MWwjd0O/ssDH8XhVwUE88bPDscP+4AUrDQ5dfVv7NWVcp9msiKCeh7oQT5HOK
+						8QUvTzj/aD2BLORCajWMtQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDbDCCAlQCCQCrskmXeYbk3DANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
+						QjEQMA4GA1UECBMHRW5nbGFuZDETMBEGA1UEBxMKTWVyc2V5c2lkZTEkMCIGA1UE
+						ChMbVGhlIFVuaXZlcnNpdHkgb2YgTGl2ZXJwb29sMRwwGgYDVQQDExN3YWtlb25s
+						YW4ubGl2LmFjLnVrMB4XDTExMDIwMTExMzkyNFoXDTIxMDEyOTExMzkyNFoweDEL
+						MAkGA1UEBhMCR0IxEDAOBgNVBAgTB0VuZ2xhbmQxEzARBgNVBAcTCk1lcnNleXNp
+						ZGUxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIExpdmVycG9vbDEcMBoGA1UE
+						AxMTd2FrZW9ubGFuLmxpdi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBANqAaYk6iHP6srXSIiRIFL1uRJwfMI75m1gr+F4dcIhQLpB4VSRkLmik
+						Z4XDuKncuEZHDQjSxm108N/GAjFQkxQ5YiU/0ASBnUY4DfuReR9/6EbCyKWsLuAv
+						WO3xpJumK7llnspfNVG74r0vPYuAlyqPpKFXjBUOnm+S7EcF8ccXGN4EzUO3+qWJ
+						kmzt0O8WZKJky6Qe2Glny+pvPXBniqENbzbDKh3IvJmW1ImKTET92gxXXLGC/bXX
+						0uIoTP/rTdQ9Y82mcBY6JWXpT5Ne89yOdkXmFfUUv2rTOSwDiikNuPxWrg32Xco1
+						mMh9A4NBDByYWjIh96/L+JQqUDNg6v8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						KPJV9rQe79wsTDtRFpj1QiH6zT0uR/igAUmZfal8ejsPIMGGEGL5Uz0ZPqKKPXg8
+						uk0+fPBNLmlVqkWuZkEMFDN+JFnWxoBoXdbNQvW+LrtiSEYhh+hpn5n8k2l4XpSM
+						3AuZSP7nYAYzK2xQIECyNcfL+yQfZhdqzrSeuWh/PxUG5MHnQWyAlT9K+UXXiMUN
+						EIg5bTg1h2IIuyBWW6whf+jt2kJSSmX03E5oXB38tWC0/AV/xyuGev9BpWAAurps
+						Jx+MWwjd0O/ssDH8XhVwUE88bPDscP+4AUrDQ5dfVv7NWVcp9msiKCeh7oQT5HOK
+						8QUvTzj/aD2BLORCajWMtQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Liverpool</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Liverpool: Wake On Lan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.liv.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Web Team</md:GivenName>
+    <md:EmailAddress>mailto:webmaster@liv.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Web Team</md:GivenName>
+    <md:EmailAddress>mailto:webmaster@liv.ac.uk</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
new file mode 100644
index 00000000..d25adc39
--- /dev/null
+++ b/swamid-interfederations-2.0/wakshib1.wakefield.ac.uk-shibboleth.xml
@@ -0,0 +1,99 @@
+<?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>
+      <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
+						a2VmaWVsZC5hYy51azAeFw0xNDExMDYxMDQxMTlaFw0zNDExMDExMDQxMTlaMHkx
+						CzAJBgNVBAYTAkdCMRcwFQYDVQQIEw5XZXN0IFlvcmtzaGlyZTESMBAGA1UEBxMJ
+						V2FrZWZpZWxkMRowGAYDVQQKExFXYWtlZmllbGQgQ29sbGVnZTEhMB8GA1UEAxMY
+						d2Frc2hpYjEud2FrZWZpZWxkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEA3w1GYtKzy9tPP8ZwCI11qZP5GX3Cm578CywOe7gb9ZhpQN7ZnozN
+						HH5d/O+jLLL7Mib0PxKKYZptBIl0uIVvwOQPIXLtBI+XENBlVOiMMIimOt+pCr12
+						Al5LdBNwuKB4ZFMSsgg5LwM7Z64GnP9npOOjYMBKK2qsiNDC7KcBiGPVMKgEM0N7
+						yguPdcy6DgHRMY0H+ZeT44Vhp2LkEfUOkVGwmfyTEBD8/5SgNjV+xmsvPBrTfNp3
+						jeCHHXVw+gFsOSRElE/Ah0DOZiJBJYhriBg+sK8BWIcbsbc5xs9Q1w44ws5YDues
+						8oYr6b5B/8fCfFv2rURIZUFMOqTw3YprkwIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+						AQA4EiC3dzyiJIYTKQhtWoV2BQ1AnHAwJPJAXf4jW7cpvCFMEvfN8ZOK/Lacfz5p
+						vITgJoBs2eBy0xO1eBQlKfe1kCWnxpOd918odQ9zf5VZhHocklY1ZimrF+n3nVCL
+						Kdojs4VmrEi0PLEtazYNBAig9dOJcHKY3qIIpFi2PKesdf9AuNt+Q04UqKKpRa7y
+						h92+bH74geOC/hOWBxH+3C8jIkfn/+K2K4NhqGlp8qOLkpgR3X87m0kSsBT9nbDc
+						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>
+						MIIDbjCCAlYCCQChpNcFSrUPmTANBgkqhkiG9w0BAQsFADB5MQswCQYDVQQGEwJH
+						QjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxEjAQBgNVBAcTCVdha2VmaWVsZDEa
+						MBgGA1UEChMRV2FrZWZpZWxkIENvbGxlZ2UxITAfBgNVBAMTGHdha3NoaWIxLndh
+						a2VmaWVsZC5hYy51azAeFw0xNDExMDYxMDQxMTlaFw0zNDExMDExMDQxMTlaMHkx
+						CzAJBgNVBAYTAkdCMRcwFQYDVQQIEw5XZXN0IFlvcmtzaGlyZTESMBAGA1UEBxMJ
+						V2FrZWZpZWxkMRowGAYDVQQKExFXYWtlZmllbGQgQ29sbGVnZTEhMB8GA1UEAxMY
+						d2Frc2hpYjEud2FrZWZpZWxkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEA3w1GYtKzy9tPP8ZwCI11qZP5GX3Cm578CywOe7gb9ZhpQN7ZnozN
+						HH5d/O+jLLL7Mib0PxKKYZptBIl0uIVvwOQPIXLtBI+XENBlVOiMMIimOt+pCr12
+						Al5LdBNwuKB4ZFMSsgg5LwM7Z64GnP9npOOjYMBKK2qsiNDC7KcBiGPVMKgEM0N7
+						yguPdcy6DgHRMY0H+ZeT44Vhp2LkEfUOkVGwmfyTEBD8/5SgNjV+xmsvPBrTfNp3
+						jeCHHXVw+gFsOSRElE/Ah0DOZiJBJYhriBg+sK8BWIcbsbc5xs9Q1w44ws5YDues
+						8oYr6b5B/8fCfFv2rURIZUFMOqTw3YprkwIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+						AQA4EiC3dzyiJIYTKQhtWoV2BQ1AnHAwJPJAXf4jW7cpvCFMEvfN8ZOK/Lacfz5p
+						vITgJoBs2eBy0xO1eBQlKfe1kCWnxpOd918odQ9zf5VZhHocklY1ZimrF+n3nVCL
+						Kdojs4VmrEi0PLEtazYNBAig9dOJcHKY3qIIpFi2PKesdf9AuNt+Q04UqKKpRa7y
+						h92+bH74geOC/hOWBxH+3C8jIkfn/+K2K4NhqGlp8qOLkpgR3X87m0kSsBT9nbDc
+						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>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index b9666602..62ba0244 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -1,199 +1,199 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://wayf.wayf.dk">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wayf.wayf.dk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">kb.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">hi.is</shibmd:Scope>
-      <shibmd:Scope regexp="false">ruc.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">tietgen.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">orphanage.wayf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ucl.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">aau.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">viauc.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ucc.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">drlund-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">iha.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sdu.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">itu.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">frberg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ags.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nordfyns-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">midtfyns-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">middelfart-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">opengym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">maribo-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">mulerne-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nakskov-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">norreg.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nyborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ribekatedralskole.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sctknud-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">svendborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">tgy.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">tornbjerg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vestfyns-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vucfyn.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosufyn.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sopu.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosufh.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">faaborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">og.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">aa.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">aip.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ak.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">akat.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">asg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">gg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">lg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">mg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ra.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">rs.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sgy.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosur.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sska.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sss.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">stv.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">udc.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vd.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vhg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">via.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">its.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sikker-adgang.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">regionsjaelland.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ibc.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">natmus.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">rungsted-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sst.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ucsj.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosuc.cphwest.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">cphwest.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dab.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">akf.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">bst.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dmi.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ism.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ens.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">fbo.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">fob.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">fsv.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">kuc.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">kul.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ami.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sfi.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ank.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vfc.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">stm.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vej.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dsl.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosu-syd.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">videndjurs.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">munkensdam.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">odensekatedralskole.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nghf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">cg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">hs-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">kolding-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">zbc.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">frsgym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">cbs.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosuesbjerg.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">uniit.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dskd.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ku.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">kristne-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eucsyd.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ikgym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dsn.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">naestved-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">learnmark.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">aabc.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vordingborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">aalborgstudenterkursus.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dmjx.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">hasseris-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">apoteket.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">erhvervsakademiaarhus.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">statsskolen.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ucsyd.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosusj.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">kadk.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dtu.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ucn.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">gribskovgymnasium.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">gefion-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">frhavn-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sde.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eal.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eucnvs.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">hrs.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vuc-vs.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sceu.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nykat-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vgtgym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">odense.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dalumls.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">fredericia-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ghg.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">au.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">koldcollege.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">knord.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">bggym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vibkat.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vghf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eucnord.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">phmetropol.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">horsensgym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eucvest.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">handelsskolen.com</shibmd:Scope>
-      <shibmd:Scope regexp="false">cphbusiness.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">kea.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nybuni.dans.kmd.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">statsbiblioteket.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">itcn.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosunord.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eadania.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">mf-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">techcollege.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">tradium.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dansidp.stads.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vucnordjylland.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">umit.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">bcsyd.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">campusvejle.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">rosborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">fhavnhs.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ah.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">create.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">es.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">hst.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">id.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">its.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">learning.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">m-tech.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">plan.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sbi.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">staff.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">student.aau.dk@aau.dk</shibmd:Scope>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
-      </saml:Attribute>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kb.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hi.is</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ruc.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tietgen.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">orphanage.wayf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aau.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">viauc.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucc.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drlund-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iha.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sdu.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itu.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frberg-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ags.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordfyns-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midtfyns-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">middelfart-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">opengym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">maribo-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mulerne-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nakskov-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">norreg.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nyborg-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ribekatedralskole.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sctknud-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svendborg-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tgy.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tornbjerg-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestfyns-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vucfyn.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sosufyn.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sopu.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sosufh.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">faaborg-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">og.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aa.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aip.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ak.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">akat.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asg.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eg.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gg.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lg.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mg.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ra.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rs.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sg.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgy.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sosur.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sska.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sss.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stv.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udc.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vd.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vhg.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">via.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">its.itsf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sikker-adgang.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">regionsjaelland.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibc.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">natmus.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rungsted-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sst.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsj.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sosuc.cphwest.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cphwest.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dab.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">akf.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bst.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmi.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ism.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fbo.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fob.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsv.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kuc.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kul.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ami.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfi.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ank.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfc.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stm.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vej.minibib.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dsl.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sosu-syd.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">videndjurs.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">munkensdam.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">odensekatedralskole.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nghf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cg-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kolding-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zbc.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frsgym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cbs.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sosuesbjerg.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniit.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dskd.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ku.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristne-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eucsyd.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ikgym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dsn.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">naestved-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">learnmark.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aabc.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vordingborg-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aalborgstudenterkursus.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmjx.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hasseris-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">apoteket.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">erhvervsakademiaarhus.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">statsskolen.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsyd.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sosusj.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kadk.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dtu.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucn.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gribskovgymnasium.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gefion-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frhavn-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sde.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eal.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eucnvs.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrs.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vuc-vs.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sceu.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nykat-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vgtgym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">odense.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dalumls.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fredericia-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ghg.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">au.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">koldcollege.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knord.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bggym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vibkat.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vghf.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eucnord.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phmetropol.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">horsensgym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eucvest.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">handelsskolen.com</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cphbusiness.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kea.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nybuni.dans.kmd.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">statsbiblioteket.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itcn.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sosunord.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eadania.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mf-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">techcollege.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tradium.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dansidp.stads.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vucnordjylland.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umit.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bcsyd.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campusvejle.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rosborg-gym.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhavnhs.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ah.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">create.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">es.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hst.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">id.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">its.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">learning.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">m-tech.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plan.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sbi.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staff.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.aau.dk@aau.dk</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIE3TCCA8WgAwIBAgISESFgDbqp6YXwPvILGKAnrUDtMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTIwMTA0MDkzNTU0WhcNMTcwMTAzMDkzNTU0WjBHMQswCQYDVQQGEwJESzEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwx3YXlmLndheWYuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAosqmcujXhA49vHQLLTKZxFTz3guMRnwHvUxz5vvuMPYVTGl+fXPdq9ULhkNc1jlCr4+pFOwLdy9zkuAn8dK7grQEaU58K0uF4MTyKixFnPvU3806roL8PnrmUQ2t8y76U9jzsk/B3Ggi5pVqhOktHpZyzz1yBpE14R+/DPzHrpKIFJY4N2uzoBrcEAsJY6aTUfIaB/NEpe4BY8sDZ3CTuU3tWUfhdlZESYsmngdnHD6k0HUKti9F43UM6JyN6fz7T70JlHAcTHzYKhjtPLcWG8lWFqNtry7fCYC5SlKn4zmyifoASxRoH3EuxtE/Fmmt+M6I83kg3H0R1b8PHimfAgMBAAGjggGxMIIBrTAOBgNVHQ8BAf8EBAMCBaAwTAYDVR0gBEUwQzBBBgkrBgEEAaAyAQowNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wFwYDVR0RBBAwDoIMd2F5Zi53YXlmLmRrMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nkb21haW52YWxnMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBBBggrBgEFBQcwAoY1aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nkb21haW52YWxnMi5jcnQwNQYIKwYBBQUHMAGGKWh0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc2RvbWFpbnZhbGcyMB0GA1UdDgQWBBS44PHFNUdj1NTiqkjShHfvW50SIzAfBgNVHSMEGDAWgBSWrfqwW7mDZCp2whyKadpC3P79KDANBgkqhkiG9w0BAQUFAAOCAQEAjqwtcRjT+gYKMhgwpJ4MNpL6W80efrcMDdWnZUJzN081ht0dcQqvdAVjkWylEQbbS1LXc9OZecRJGR1vxBzS7bq0lRauPuYodzOsDzP4cEW/W+PvWIEIpm5yIBZ31P7VnRpaRwmeff8OlhDOvM4+wdovRvIpLgyeyW05R2i4DenI8juCaWXNG+CATj35gW3uh/LD9DBzpZDoQ41/5yJPZUuiHfZtnW0M7oVnhidn5sT319Xiag3Jlqe7dx1D+b0oZVDTbwrECOdROTcbOkbGsr4VleBcTtL5RoF4cDokYB6LpIDmSMiBV6DztPcrPC/ERS/tEBMbfMWVAus4f0SvdQ==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIE3TCCA8WgAwIBAgISESFgDbqp6YXwPvILGKAnrUDtMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTIwMTA0MDkzNTU0WhcNMTcwMTAzMDkzNTU0WjBHMQswCQYDVQQGEwJESzEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwx3YXlmLndheWYuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAosqmcujXhA49vHQLLTKZxFTz3guMRnwHvUxz5vvuMPYVTGl+fXPdq9ULhkNc1jlCr4+pFOwLdy9zkuAn8dK7grQEaU58K0uF4MTyKixFnPvU3806roL8PnrmUQ2t8y76U9jzsk/B3Ggi5pVqhOktHpZyzz1yBpE14R+/DPzHrpKIFJY4N2uzoBrcEAsJY6aTUfIaB/NEpe4BY8sDZ3CTuU3tWUfhdlZESYsmngdnHD6k0HUKti9F43UM6JyN6fz7T70JlHAcTHzYKhjtPLcWG8lWFqNtry7fCYC5SlKn4zmyifoASxRoH3EuxtE/Fmmt+M6I83kg3H0R1b8PHimfAgMBAAGjggGxMIIBrTAOBgNVHQ8BAf8EBAMCBaAwTAYDVR0gBEUwQzBBBgkrBgEEAaAyAQowNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wFwYDVR0RBBAwDoIMd2F5Zi53YXlmLmRrMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nkb21haW52YWxnMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBBBggrBgEFBQcwAoY1aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nkb21haW52YWxnMi5jcnQwNQYIKwYBBQUHMAGGKWh0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc2RvbWFpbnZhbGcyMB0GA1UdDgQWBBS44PHFNUdj1NTiqkjShHfvW50SIzAfBgNVHSMEGDAWgBSWrfqwW7mDZCp2whyKadpC3P79KDANBgkqhkiG9w0BAQUFAAOCAQEAjqwtcRjT+gYKMhgwpJ4MNpL6W80efrcMDdWnZUJzN081ht0dcQqvdAVjkWylEQbbS1LXc9OZecRJGR1vxBzS7bq0lRauPuYodzOsDzP4cEW/W+PvWIEIpm5yIBZ31P7VnRpaRwmeff8OlhDOvM4+wdovRvIpLgyeyW05R2i4DenI8juCaWXNG+CATj35gW3uh/LD9DBzpZDoQ41/5yJPZUuiHfZtnW0M7oVnhidn5sT319Xiag3Jlqe7dx1D+b0oZVDTbwrECOdROTcbOkbGsr4VleBcTtL5RoF4cDokYB6LpIDmSMiBV6DztPcrPC/ERS/tEBMbfMWVAus4f0SvdQ==</ds:X509Certificate>
         </ds:X509Data>
@@ -211,4 +211,9 @@
     <md:OrganizationURL xml:lang="da">http://wayf.dk/index.php/da</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://wayf.dk/index.php/en</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>WAYF</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wccidp.west-cheshire.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wccidp.west-cheshire.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..05a78b70
--- /dev/null
+++ b/swamid-interfederations-2.0/wccidp.west-cheshire.ac.uk-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">west-cheshire.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEvTCCA6WgAwIBAgIRAOMjXtkA9D+adzV102mpa/QwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjA1MDEwMDAwMDBaFw0xNTA1MDEyMzU5NTlaMIGPMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIQ2hlc2hpcmUxEDAOBgNVBAcTB0NoZXN0ZXIxHjAc
+						BgNVBAoTFVdlc3QgQ2hlc2hpcmUgQ29sbGVnZTEZMBcGA1UECxMQTmV0d29yayBT
+						ZXJ2aWNlczEgMB4GA1UEAxMXaWRwLndlc3QtY2hlc2hpcmUuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvfeZkgveP3uRVPJzfiuIkTzsfbu7c
+						+/C7LwZjMk/lXvWqKPuV9jugbh0I+FuUVCVYaJbI9lPyILxpPZfO4mo7HYq8cUn3
+						A00D8AvZYZqjREfer3PPcxLOcgKSmtrO/mx7huGlsqlAqAz7UHwQJ58/HB5Bh70e
+						ZVskMpWQlcBHflBLxvwg8cDEHGs0cwWLiUb3V4SIB80HpS+7UFhTX2nG1btxEnmG
+						wR9TD39J+VMrsxkr5WvRv7O1/C7FTPBJ1UDxRQiSwFnVWT5P5NbG2D4T34GR7NnE
+						HSQUR155Z567SE2SDXRHKNTcz6Qvo64Q4tye1xLBpPLvWRSc+ic1L1azAgMBAAGj
+						ggFqMIIBZjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
+						FgQUdrHKs7Btt/mw5oHrRinYB0VM2WEwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
+						/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
+						DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
+						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
+						AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0R
+						BBswGYIXaWRwLndlc3QtY2hlc2hpcmUuYWMudWswDQYJKoZIhvcNAQEFBQADggEB
+						AD/TU5WWbwg2IIyWbu7SUdVeWsnQWssDZBiip6AE3h6I/Rq2OigDvoRdn9ybhRfl
+						1U05NWI0/W76mYo3TUr+nxZju1MXXsvERs4F5RtlqePF1o2WRtQ+92DQaLRckb0f
+						JViRM+JWit4qnFMTWOLDk802pjba8mVBbnxWecHJM/6PIw4nESBNGqAg07r8g9jA
+						uxxgdS6uh84jCcFHakUMP+Zdy0T6wA0lC9sBDV7kj0EFuO5uijCtSAcftJ+naBNf
+						1dMExDLjkPc2Y4pPuiTJdu91yHOPMTAszTsD2yLn5sKCKt20nhlaMnLqBOS3nbJJ
+						3pLY0aKnOvHt3rHUc0qw/bg=
+					</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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEvTCCA6WgAwIBAgIRAOMjXtkA9D+adzV102mpa/QwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjA1MDEwMDAwMDBaFw0xNTA1MDEyMzU5NTlaMIGPMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIQ2hlc2hpcmUxEDAOBgNVBAcTB0NoZXN0ZXIxHjAc
+						BgNVBAoTFVdlc3QgQ2hlc2hpcmUgQ29sbGVnZTEZMBcGA1UECxMQTmV0d29yayBT
+						ZXJ2aWNlczEgMB4GA1UEAxMXaWRwLndlc3QtY2hlc2hpcmUuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvfeZkgveP3uRVPJzfiuIkTzsfbu7c
+						+/C7LwZjMk/lXvWqKPuV9jugbh0I+FuUVCVYaJbI9lPyILxpPZfO4mo7HYq8cUn3
+						A00D8AvZYZqjREfer3PPcxLOcgKSmtrO/mx7huGlsqlAqAz7UHwQJ58/HB5Bh70e
+						ZVskMpWQlcBHflBLxvwg8cDEHGs0cwWLiUb3V4SIB80HpS+7UFhTX2nG1btxEnmG
+						wR9TD39J+VMrsxkr5WvRv7O1/C7FTPBJ1UDxRQiSwFnVWT5P5NbG2D4T34GR7NnE
+						HSQUR155Z567SE2SDXRHKNTcz6Qvo64Q4tye1xLBpPLvWRSc+ic1L1azAgMBAAGj
+						ggFqMIIBZjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
+						FgQUdrHKs7Btt/mw5oHrRinYB0VM2WEwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
+						/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
+						DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
+						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
+						AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+						dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0R
+						BBswGYIXaWRwLndlc3QtY2hlc2hpcmUuYWMudWswDQYJKoZIhvcNAQEFBQADggEB
+						AD/TU5WWbwg2IIyWbu7SUdVeWsnQWssDZBiip6AE3h6I/Rq2OigDvoRdn9ybhRfl
+						1U05NWI0/W76mYo3TUr+nxZju1MXXsvERs4F5RtlqePF1o2WRtQ+92DQaLRckb0f
+						JViRM+JWit4qnFMTWOLDk802pjba8mVBbnxWecHJM/6PIw4nESBNGqAg07r8g9jA
+						uxxgdS6uh84jCcFHakUMP+Zdy0T6wA0lC9sBDV7kj0EFuO5uijCtSAcftJ+naBNf
+						1dMExDLjkPc2Y4pPuiTJdu91yHOPMTAszTsD2yLn5sKCKt20nhlaMnLqBOS3nbJJ
+						3pLY0aKnOvHt3rHUc0qw/bg=
+					</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>
diff --git a/swamid-interfederations-2.0/web.chorus.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/web.chorus.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..a03e7992
--- /dev/null
+++ b/swamid-interfederations-2.0/web.chorus.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,84 @@
+<?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://web.chorus.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="2014-11-17T12:19: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://web.chorus.ox.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>
+						MIIC3zCCAcegAwIBAgIJALFL+iOr5QKwMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+						BAMTCHVuc3NvcHMxMB4XDTE0MDkxOTE1MzAxM1oXDTI0MDkxNjE1MzAxM1owEzER
+						MA8GA1UEAxMIdW5zc29wczEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC9jXikIGweeUQMxRFMd2cQHoFDStW8pj5E5dwQvkTiyBRy70CYGgNKil8fGPZM
+						54PHToqXCBKv310cC4RhnSKSbLi+zXduSEzf0GLcsI6mXV+BPzlPuZsZSlIulIEo
+						8DPyLrJT8Z9tNa1Oi33Jo/Rc53OF0up3e6XBBNh78jQEjiTo82PcSecgi9Bg/4yl
+						d7hFdPOKWc34EMi0V2mHLRqiL9V5YSSbfTVxJ3I/35/X9Bzo3a+47a86fhxJ9kh3
+						W2/T6wHMvjYJnGmblhN7MmvVefhHWNIA4F9DVUCQoHed/nU56kY2HIULt/eIxD0s
+						oLkKg9nTYs7qrW9/u3OTEyC3AgMBAAGjNjA0MBMGA1UdEQQMMAqCCHVuc3NvcHMx
+						MB0GA1UdDgQWBBSBQh+JSuz8W3Jxuk3CYYSenJCR2DANBgkqhkiG9w0BAQUFAAOC
+						AQEAhIY0m1pjMYxgVnHL+AsV2XMNif/xaeSKIH3HAz0j8/7mL1wUub4mf4c5lu3c
+						DnzHMe1yY60+x+7kSiq+K5L+dbPWT7NvLWSNqfV+vPJKxuGpBOFq9kVVr9x2uNM4
+						bhlPpiDfcoozMF6R0Jnj34iuHAQgSpTfKTjECMNOT9v8jEruFzJxqqnl8H0RX408
+						lLx8XMjbVIErKSUgZT0K42rhOa+7nlAinV1SufvHQLjb8bKdnsbNIauCH8aBcs7D
+						94H1j90T/JvshPULLqAgq7FWeXRIqe4YhUT6gqjElnz3L9G+zG+1g/XCkTMdY2X9
+						TTVomgOCogTGw8rJ7I2OxSFpFw==
+					</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://web.chorus.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://web.chorus.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.chorus.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.chorus.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://web.chorus.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.chorus.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.chorus.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 Chorus Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://web.chorus.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SO Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:sohelpdesk.com.uk@unify.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SO Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:sohelpdesk.com.uk@unify.com</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
new file mode 100644
index 00000000..cb2b1985
--- /dev/null
+++ b/swamid-interfederations-2.0/webauth.soton.ac.uk-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1jpCZisLONgRWYF6
+						eIRxN/OeO5cmtJC68LoWLabPIAH3Utieb2l163wbmIWQRnHjp8wigbP+5vub9FDe
+						+dgfafv24r6+yU/Bsv6I+lJQomloEcCdWKkNK8V/BOoQ8n0HcEo4ukOzVwneA9sn
+						3wtMMAY5dByvsHaevxjfQljjBsRDKqyQN7x/2Gu67l38OEnWqRkgIUFKdzqBptDy
+						O4NgI6aQ0zjJGrOXBjEu/t9eerAoLeXr+LBY+bqp9UvzSLivb6j5IsXTqj67UivU
+						APqMC2lY3DF7z+vNwu4qgpFOOrEWZJy8AP8HrTBf2bqljem/2Q/lr5dPfNHkDo9f
+						qmmKEwIDAQABo20wazBKBgNVHREEQzBBghN3ZWJhdXRoLnNvdG9uLmFjLnVrhipo
+						dHRwczovL3dlYmF1dGguc290b24uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
+						BBYEFKDUEPWk3MtQPCK0I9c6YmU4qbOhMA0GCSqGSIb3DQEBBQUAA4IBAQAXvdp3
+						MHQnqe5F0+rS71cPQpU3cM4tehQoDO1392rfxuYyAsTWDUfRRMIpagtRYpwJeUy9
+						cD6uhQwojjjE+lNrWCqIrIlI2Vu3Hb0CC3m11VlduKqRCBysQyOSH4zAH9a49d6Y
+						KWHHxbfrHzuE9v53RCNIVVU/h+zwMbZ7O6fBFeZYx/Rf4pt7kcvaoGE9kb3162kW
+						XstkUhyLjuJXIPWBlkWBjIbkFKmCFN4IHIi9nz/sqVvBnbHzr8Njk9YIf/lMx4Us
+						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>
+						MIIDODCCAiCgAwIBAgIVAOWKrrq2ddtGOxs+OVFZBurJpwm8MA0GCSqGSIb3DQEB
+						BQUAMB4xHDAaBgNVBAMTE3dlYmF1dGguc290b24uYWMudWswHhcNMTAwODE2MTY1
+						NTQwWhcNMzAwODE2MTY1NTQwWjAeMRwwGgYDVQQDExN3ZWJhdXRoLnNvdG9uLmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1jpCZisLONgRWYF6
+						eIRxN/OeO5cmtJC68LoWLabPIAH3Utieb2l163wbmIWQRnHjp8wigbP+5vub9FDe
+						+dgfafv24r6+yU/Bsv6I+lJQomloEcCdWKkNK8V/BOoQ8n0HcEo4ukOzVwneA9sn
+						3wtMMAY5dByvsHaevxjfQljjBsRDKqyQN7x/2Gu67l38OEnWqRkgIUFKdzqBptDy
+						O4NgI6aQ0zjJGrOXBjEu/t9eerAoLeXr+LBY+bqp9UvzSLivb6j5IsXTqj67UivU
+						APqMC2lY3DF7z+vNwu4qgpFOOrEWZJy8AP8HrTBf2bqljem/2Q/lr5dPfNHkDo9f
+						qmmKEwIDAQABo20wazBKBgNVHREEQzBBghN3ZWJhdXRoLnNvdG9uLmFjLnVrhipo
+						dHRwczovL3dlYmF1dGguc290b24uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
+						BBYEFKDUEPWk3MtQPCK0I9c6YmU4qbOhMA0GCSqGSIb3DQEBBQUAA4IBAQAXvdp3
+						MHQnqe5F0+rS71cPQpU3cM4tehQoDO1392rfxuYyAsTWDUfRRMIpagtRYpwJeUy9
+						cD6uhQwojjjE+lNrWCqIrIlI2Vu3Hb0CC3m11VlduKqRCBysQyOSH4zAH9a49d6Y
+						KWHHxbfrHzuE9v53RCNIVVU/h+zwMbZ7O6fBFeZYx/Rf4pt7kcvaoGE9kb3162kW
+						XstkUhyLjuJXIPWBlkWBjIbkFKmCFN4IHIi9nz/sqVvBnbHzr8Njk9YIf/lMx4Us
+						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>
diff --git a/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml b/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml
new file mode 100644
index 00000000..a0326a1f
--- /dev/null
+++ b/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <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>
+      <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"/>
+    </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
+BAMTEXdlYmluYXIubm9yZHUubmV0MB4XDTEyMTAxMTA3MzUzNloXDTIyMTAwOTA3
+MzUzNlowHDEaMBgGA1UEAxMRd2ViaW5hci5ub3JkdS5uZXQwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCkHGDzNHGHWdCZ8xkrLKElxJmO1uWZ5+GAr46J
+4x+xYdhTUEHr1Jy+G6l+4SPFSV7wtXE5g5LWaLyWqb3zC5DeWRU9PNxGAZ6FcGMK
+6KM3ZAmvx/FmJnD1cDrAo3duI0qt9mr1bAZLv3JIRSXwKV77x5qRhfA6D2ZVXe+j
+J/TtrlqiSkAANNQZFF0lkyITi2WKkN/5nAW9NyqZVNYVcpl5+yilQ7W5wdBJQFg5
+i7vQT/1WvPlpPLB9xOK8mukf4q0EJk6Geqt0tLG4kPkTEWs4PAnyeB0z7kg8vemy
+0gKBj+1pB8TDz0LTx4fSN944UfnHmRKdQSQnCTdA6YbLKLQTAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXdlYmluYXIubm9yZHUubmV0MB0GA1UdDgQWBBQBb9YMEUHgM4WU
+OlNGdlSA6gB0ATANBgkqhkiG9w0BAQUFAAOCAQEAFBir0eA2EEqSQXEYjF0Zr3bs
+tbkwFFL05JuIliuHv6It9Cxo6D+/B0eylFvGQeC6lvH6l1DI8SreYrVsVu4NOMbP
+VcKD7hHqYQPIJAM7I68nwyQq6cTeydqZcwe16x6vnEk0v0QyURMAFlFotZtYAMhh
+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 Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" 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" isRequired="false"/>
+    </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>noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblearn.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/weblearn.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..12d06104
--- /dev/null
+++ b/swamid-interfederations-2.0/weblearn.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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://weblearn.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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://weblearn.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>
+						MIIDIDCCAgigAwIBAgIJAN09ZW7wF+DGMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEXdlYmxlYXJuLm94LmFjLnVrMB4XDTEyMDEyMDE2MzY1MFoXDTIyMDExNzE2
+						MzY1MFowHDEaMBgGA1UEAxMRd2VibGVhcm4ub3guYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQC3LIZO1N6lP1r5+teOxfmGLNdEwXBzSOndeplc
+						Ih2/H6Z3MIerP2weWV/B9jUeDcYT9YGNFHkMRG2FTdHtvS0h/yC/TJOOKy37pqzM
+						NiwA1xmmIny/NPhGgIxnjqjAktvtwcGEflb0yoQKkKllA9lotmni6C8jb6PrCqeZ
+						YZEq/ficN0Y2fET7l6//Zstld7b6y2/v/CkU/Wy1On5AD5nrO9Ucolq91NnrZc4E
+						XqXHQK0SduW+Nb/0zUCX3nl5G0Q0dMbPtc08tTaODSwAt94ycTXwgZkeusVEMVbE
+						cS6ZrWHD+mW4nZdy5vgxNlI5ki9ALHbym0RBlW7VcETr1Hq3AgMBAAGjZTBjMEIG
+						A1UdEQQ7MDmCEXdlYmxlYXJuLm94LmFjLnVrhiRodHRwczovL3dlYmxlYXJuLm94
+						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFB8DKsVAeiS3EpqWuj4eKj1oa8q0
+						MA0GCSqGSIb3DQEBBQUAA4IBAQAb1I5WQNm7Ikoes6JkF4pteKR6ELZM9qOKFwwT
+						VSvZ3Dq0FRUYyB06DF/ZNodhvzBNT90N03gB63hNAOWJaW7CPb2d9ZaUG3kQj5ey
+						xCkdu5qs0qwvxzZ44zQgLiobRzjVX5tTQkAurKuGBexe53yvjrhDDnkyZznFwO/e
+						csdgyJtDrThEVyxzFgROfKepiy80V9+Z0kycDY13v1L+ijBcp1b+plj8poqQx4K5
+						Q+uqGo+bvKXrOuCtSWxgsNMNWPh1bMYZLv3P3k98OFJpPHT7yiJq9I+PxcVuQcXF
+						1z2NTzQyONeHUtg8j9A+hog2VXyv3vODtgIv3XG2cuT4fNTn
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Weblearn</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oucs.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/weblicht.sfs.uni-tuebingen.de.xml b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
index 14fee192..17eaf2dc 100644
--- a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
+++ b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
@@ -1,84 +1,97 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://weblicht.sfs.uni-tuebingen.de">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor 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="2010-06-11T09:42:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">weblicht</mdui:DisplayName>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">WebLicht</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WebLicht</mdui:DisplayName>
+        <mdui:Description xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</mdui:Description>
+        <mdui:Description xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/Main_Page</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/Main_Page</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/WebLicht_Privacy_Policy_Document</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
         <ds:X509Data>
-          <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIED+vXfzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
-YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
-dWViaW5nZW4uZGUwHhcNMTAwNDE5MTMyNjA3WhcNMTUwNDE4MTMyNjA3WjCByzEL
-MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xKDAm
-BgNVBAsTH1NlbWluYXIgZnVlciBTcHJhY2h3aXNzZW5zY2hhZnQxDjAMBgNVBAsT
-BURTUElOMREwDwYDVQQLEwhXZWJMaWNodDEmMCQGA1UEAxMdd2VibGljaHQuc2Zz
-LnVuaS10dWViaW5nZW4uZGUxJjAkBgkqhkiG9w0BCQEWF2VoQHNmcy51bmktdHVl
-YmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJJ+lISL
-liCGHMdtC5EKdkSPkZIEfGf6u0I2YT+u/bX37XL4yOvmMxJxRLQM4oEvnE67n8k8
-4qe06B8xErFh3KqgC5Q5keUlQmXJu4wvABnk9AuxlwJKuGXI3PetBYfhid10A7Iu
-3Ki0s3j7+7yYTG6xXJt4qrE7rV/v79zBQcoKOwu1AMdfV9q8GRShEXCQ82P4IITT
-Q4z513p1e0mscDdBIunH6aThNCJA9rUBwEVX90HX5KHaOPSksHISylhjl/++XJFy
-/0wBpiZ4+7pN2S/go9J8A153NZSPhF2M5deyWgjT/K2LSudLnegIlRFTq1Kv89eE
-bF/ZaHuNvakbqQIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
-HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRmWkIAb3Vr
-zkTtELxvwSx4nngcUDAfBgNVHSMEGDAWgBSwwbtoNX/i1kGcGnGv4PxBNM3DqDAi
-BgNVHREEGzAZgRdlaEBzZnMudW5pLXR1ZWJpbmdlbi5kZTCBkwYDVR0fBIGLMIGI
-MEKgQKA+hjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVlLWNh
-L3B1Yi9jcmwvZ19jYWNybC5jcmwwQqBAoD6GPGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBrAYIKwYB
-BQUHAQEEgZ8wgZwwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-Y2xhc3NpYy11bml0dWUtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwTAYIKwYB
-BQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2Ev
-cHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGxJyokA
-uUwUFzvszzutQNicSlWWHmrB6g63cRkbgBMsNGFwIyhrizCJtPYTDAbJ1lG2PrYj
-YpbhHR4892JIAm1IkyR4sJvAKXgnzNHtTy1ZTmlP7BjekPb6pcSRWAra84A+bOWY
-+Q3KRITfEcUfsFw/PWYO8qwDurTWGBK3ReWkwLJ9y89XZDXQZt4A9RQnnBvnC7RU
-kLkAmxRV27neEuG8eh0tuFXStHuLbClnNnHaAt1c8m2awjWCWShG5cTR99muSJTc
-NGifdwt0qWax50ASplgOtT/GZAw2E7HEEgbDA+6JcKpVlh+UMnk2JN+nkkKUjgnD
-wN2yHSwHNNMiiGY=</ds:X509Certificate>
+          <ds:X509SubjectName>emailAddress=wladmin@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=SfS,O=Universitaet Tuebingen,L=Tuebingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKzCCBROgAwIBAgIHF3iUXPRQADANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQG
+EwJERTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMT
+R2xvYmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVu
+aS10dWViaW5nZW4uZGUwHhcNMTQwNDI0MTM1MTA4WhcNMTkwMjA0MDAwMDAwWjCB
+wjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
+A1UEBxMJVHVlYmluZ2VuMR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgVHVlYmluZ2Vu
+MQwwCgYDVQQLEwNTZlMxJjAkBgNVBAMTHXdlYmxpY2h0LnNmcy51bmktdHVlYmlu
+Z2VuLmRlMSswKQYJKoZIhvcNAQkBFhx3bGFkbWluQHNmcy51bmktdHVlYmluZ2Vu
+LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2KsTGSUCY/epaymY
+W3kqRl84RcNArc5w05x0rEi1qQUpAL1V7K7rJ/p5ZnjxqEhXEqYZXWh0ebkYWgzZ
+jr1Bs3mV1XVJ/9HrwRSFcNdyyFPmmP3Glsaculyn3zIQ4UcPyLk/kRlg37rx5nKj
+m3DZdrk345mjHO6MknFMSuh2TosI0tNhaa4rrRMJTlcOVJpiVlAF/DSZgwPjI6Yl
+5aHKes43tkCx1LJxDRAz9i/DaW4HdYNcwW3A0qlkRKRZqqVwRCG3Z5b9qdSry6t0
+UmmXMLYAxaStHVBx8d3eYWURfMLbvnpGKwWl0XGZQcevA9SzWswdmF/3X7zAmVAQ
+4L2qUQIDAQABo4ICbjCCAmowOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEw
+EQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQE
+AwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU9cQi9vwBJfcH9+Ae
+ytdTniex90EwHwYDVR0jBBgwFoAUsMG7aDV/4tZBnBpxr+D8QTTNw6gwRgYDVR0R
+BD8wPYIdd2VibGljaHQuc2ZzLnVuaS10dWViaW5nZW4uZGWBHHdsYWRtaW5Ac2Zz
+LnVuaS10dWViaW5nZW4uZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMEKgQKA+hjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVl
+LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsG
+AQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1Aw
+TAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0
+dWUtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NhY2VydC9n
+X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGZ9bLdCBVw1Txf0f59QvfPe
+Ic02a/QJieoXre844zW5ISZwp14vGy+yzk4BK1tSovtxwf/FHiC7Uoqi+T9cL7E5
+yBbP2Y6cBHJuxy4YyXLimJoO7NWBDW+MOQRN1HjI5KXTMhhzmI81iofZbBlZwCSe
+pUzeHCt4KF3LDrrvNy4YiziDuojh23MHEv8W1/aNhX4F0T+MvwO2dGxAbax7XgLL
+ndO3/u6io4gRQiXZrrAS+1ZXGybrr6gUBN6popli1bR148tWwZNzwe1NjbGBIA5a
+ydKuf18CBYHeixW6XzkCMEdcRTec/qVTn7stpLtuuC5TCblNKGDKmhx9Mec+1Jo=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">WebLicht</md:ServiceName>
+    <md: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:ServiceName xml:lang="sv">WebLicht</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Web-based linguistic chaining tool.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Web-based linguistic chaining tool.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Web-based linguistic chaining tool.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
+      <md:ServiceDescription xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</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="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="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="technical">
-    <md:GivenName>Thomas</md:GivenName>
-    <md:SurName>Zastrow</md:SurName>
-    <md:EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
+    <md:GivenName>Department of Linguistics, General and Computational Linguistics</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>Thomas</md:GivenName>
-    <md:SurName>Zastrow</md:SurName>
-    <md:EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
+    <md:GivenName>Department of Linguistics, General and Computational Linguistics</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.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
new file mode 100644
index 00000000..86629204
--- /dev/null
+++ b/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml
@@ -0,0 +1,138 @@
+<?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:saml="urn:oasis:names:tc:SAML: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>
+      <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 height="50" width="50" xml:lang="sv">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo height="50" width="50" xml:lang="en">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.uu.se/#2</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.uu.se/english.html#2</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">uppsala+universitet</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>uu.se</mdui:DomainHint>
+        <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>
+MIIDJDCCAgygAwIBAgIVAIag2ZIg3gkA4LMqyU2fUtoGVTW1MA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDndlYmxvZ2luLnV1LnNlMB4XDTEzMTAyMjEyMjIxOVoX
+DTMzMTAyMjEyMjIxOVowGTEXMBUGA1UEAxMOd2VibG9naW4udXUuc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNjYagdexM5SeQsnG410D2/9el0tGH
+FL+LaDPQ2nLVWAMfYrn0PfEQ7WGG4Glpi1cAjIAG5Qq/8e05shDQ2dRFNx95wfL6
+245X3Hgroqmg4ki6VX0WOwcrBYKybRgQ6Ba9qQuhzFp1yBzD+3XlBmfOClKYkdt0
+wYsYKoA+CvmVIyy22SCh0b4qCsr+gCeCZan3zUsfQrV4Xo6aYVye+eXzZFrICwxG
+Ni8s6xfaxjL6xMEoV2ZqiRa8FUiOQBENxLRA0bGU6JuGT5i9hFu4HliRlnj3h98+
+EEb0QWDf2yrjX01IMflfWhnSiYuUXYLUvFhjTOdTlZqzjDfDpI3dAmNfAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDndlYmxvZ2luLnV1LnNlhiVodHRwczovL3dlYmxvZ2lu
+LnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBROWOq2WSHlPf+65TyF1Ccg
+DawzRTANBgkqhkiG9w0BAQUFAAOCAQEAdCIFbW6SF9+FDVJwmFiy6AEmIS9Z0ME6
+cdt5ZXpsTVwlWw3dOiPWKjOxV0V/7y/Fmj8amZIWsy1NqMSqLseObiXwVp+nh0Jw
+7qQYO85+bHMSYsr8w8a9fbu+/MeehOEDawD1QC2+AmuSTB2zt1GPcvE83XGaq83G
+zpE/7CP1aFhJGZFlxIjN6h7d+KK0vmmjH9CIcXlbFYSy3Njq4SNizc4LwNNMFYjB
+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>
+MIIDJDCCAgygAwIBAgIVAIag2ZIg3gkA4LMqyU2fUtoGVTW1MA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDndlYmxvZ2luLnV1LnNlMB4XDTEzMTAyMjEyMjIxOVoX
+DTMzMTAyMjEyMjIxOVowGTEXMBUGA1UEAxMOd2VibG9naW4udXUuc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNjYagdexM5SeQsnG410D2/9el0tGH
+FL+LaDPQ2nLVWAMfYrn0PfEQ7WGG4Glpi1cAjIAG5Qq/8e05shDQ2dRFNx95wfL6
+245X3Hgroqmg4ki6VX0WOwcrBYKybRgQ6Ba9qQuhzFp1yBzD+3XlBmfOClKYkdt0
+wYsYKoA+CvmVIyy22SCh0b4qCsr+gCeCZan3zUsfQrV4Xo6aYVye+eXzZFrICwxG
+Ni8s6xfaxjL6xMEoV2ZqiRa8FUiOQBENxLRA0bGU6JuGT5i9hFu4HliRlnj3h98+
+EEb0QWDf2yrjX01IMflfWhnSiYuUXYLUvFhjTOdTlZqzjDfDpI3dAmNfAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDndlYmxvZ2luLnV1LnNlhiVodHRwczovL3dlYmxvZ2lu
+LnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBROWOq2WSHlPf+65TyF1Ccg
+DawzRTANBgkqhkiG9w0BAQUFAAOCAQEAdCIFbW6SF9+FDVJwmFiy6AEmIS9Z0ME6
+cdt5ZXpsTVwlWw3dOiPWKjOxV0V/7y/Fmj8amZIWsy1NqMSqLseObiXwVp+nh0Jw
+7qQYO85+bHMSYsr8w8a9fbu+/MeehOEDawD1QC2+AmuSTB2zt1GPcvE83XGaq83G
+zpE/7CP1aFhJGZFlxIjN6h7d+KK0vmmjH9CIcXlbFYSy3Njq4SNizc4LwNNMFYjB
+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>akka-datordrift@its.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala University</md:Company>
+    <md:SurName>SAML2 admins</md:SurName>
+    <md:EmailAddress>akka-datordrift@its.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>IT Servicedesk</md:SurName>
+    <md:EmailAddress>helpdesk@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 18 4714400</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin2.geant.net-adfs-services-trust.xml b/swamid-interfederations-2.0/weblogin2.geant.net-adfs-services-trust.xml
new file mode 100644
index 00000000..3b1bd061
--- /dev/null
+++ b/swamid-interfederations-2.0/weblogin2.geant.net-adfs-services-trust.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://weblogin2.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-03-18T15:23:31Z">
+      <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" 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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT Intranet</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A collaboration platform for GÉANT Project participants.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://weblogin2.geant.net/PrivacyPolicy/GEANTIntranetPrivacyPolicy.htm</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>
+						MIIEfzCCA2egAwIBAgIQQSSnV5Mk/EXZxgrsbnU7ajANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDMwNjAwMDAwMFoXDTE2MDMwNTIzNTk1OVowRzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSIwIAYDVQQDExlzcDIwMTMtaGEt
+						YWRmczIuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						qzeOIPfgr/SneQUtjqDRGLbG4YKxmo2zfAIF+wjaYXnDTq/yWt852nImchvCgjWu
+						eXnHJ6oZZGdaN4kMgPh1oxqJ4UE6dXY9HEoru/Awp2P/CGiYOQ4Q5u5+AyFznGRx
+						y2uNYrD85C6uTIgiKytH6Lai8f6dFxHKO/u8o+kbrl2Z1CkAf6wePu2H5a44tGnF
+						SP/s7lW4ScSthNz1OF8BoPFKpWUmJk/584rZZjR+fqB9fQBwxRoRBCFZTduXP0G9
+						861BS6Nt6Dfuli9jdCBC0L8ai4fH43a94EQVmMfcjImrkYBg7v6lVS4IY75ONiOt
+						sObamvbT+yNEuqw0jBjmKwIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUDL2TaAzz
+						3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBQXWZZ8RdkPMtC2o0RF+T+gH7VsMA4G
+						A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+						BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
+						BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
+						QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
+						cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
+						dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAkBgNVHREEHTAbghlzcDIwMTMtaGEt
+						YWRmczIuZ2VhbnQubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCRJqxXjeInIqlPLH5+
+						iFqL92oLPKiJDqlDWpzR9P0xF7IS4oBApWZ3f2Rgcx1dtwUf7TakMpAuxIxzMjfP
+						xaik/AuInMjxKU9AJS/lRlLogT3YXZ2aAGZbt2P/hYn4mdn5ryB9WF/w7mnyrpBb
+						o7vllsYXYmRX/c0MEPYfSMoKxomRAY2ViIh83m4sYk8+Nkm+3I9t0O3wBqaQYqpc
+						Mg48AG2JwLeuKUIC+faPOckeMXdrknL0Ra7Vb+eRoEKCqw3L9ka5/rloFNEN+hMZ
+						zubyfY3feeIV+kq3YNmjCwhDqckv5kXAdnkFprjB3X/xNfML2Jum02hKkff4AYfP
+						2IOi
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEfzCCA2egAwIBAgIQF6zX9vs9vNm8j+JNDERNrzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDMwNjAwMDAwMFoXDTE2MDMwNTIzNTk1OVowRzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSIwIAYDVQQDExlzcDIwMTMtaGEt
+						YWRmczEuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						uKfTJW51WQmvVJxulyh0wNtFIPPLzggtQIeUOvPGiTXexjTrr53MJq45xCa/7mCM
+						pfmtoH8ab1BjXRUzdiz4/YuXdCrkOL/tr9Mb4S/DndLdLfeOrvD3ybgq8Xar1YYL
+						7Xzi1N3eHVoAvl/CQv4VWtw2Vi64uRox8BaF1UtHnwTeAvAhGzn/q7kaaaKSfJJa
+						9dyfyuOyeST6mrxFz9vb4EQ5Lun4XDJCcP85RiiPBF1pkVgyVNtKfN1EMiuEzlUY
+						mUXVGnw7b/oHrvKTYD6XXXMCg9i9hc0ISS2Xwc4bMT5jtVoS1MSpV4rCBDmf5q75
+						QVS/sRGhlGS6XWsiUFElJQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUDL2TaAzz
+						3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFIeBraKafW8VLXEb6g6HwVi6+8nVMA4G
+						A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+						BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
+						BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
+						QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
+						cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
+						dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAkBgNVHREEHTAbghlzcDIwMTMtaGEt
+						YWRmczEuZ2VhbnQubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQBzqXX72xflZ+TDvjBO
+						Zb8xzcHD2ejDznK3SfK15AvXFenR6BhLnAJO2bllnqh3BpB3IzVm7Qc3Sxt2SK/5
+						li8bnLC5Qw6jtHHZtrIJiU5OQNQaln2rwR4rxE9NZs+RR7KjBUwLMhFvm+Akqr8g
+						oYOqvI8nIiC5IVzKss30nqQRnyl8nJK2sV/pQ78E9kF397uINVme1uFCMzXnAO9S
+						Ry3GIMFd4ky6VaECWVQANXusa3cklaFk4Bl8HwihDqqZCBvu8u6LZCbnlwX4ruLH
+						2+TAfutGBPunq7oftkXZ1qWqt5LQF7kReueHyd+Dplaxj3s6Kk/7HhfUXRC8mfNB
+						BDy6
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin2.geant.net/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin2.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://weblogin2.geant.net/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weblogin2.geant.net/adfs/ls/" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">GÉANT Intranet</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">A collaboration platform for GÉANT Project participants.</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 Intranet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dante.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>DANTE IT Support</md:GivenName>
+    <md:EmailAddress>mailto:DANTEITSupport@dante.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>DANTE IT</md:GivenName>
+    <md:EmailAddress>mailto:it@dante.net</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
new file mode 100644
index 00000000..39de8fce
--- /dev/null
+++ b/swamid-interfederations-2.0/webteam-stg.twig-world.com-shibboleth-sp.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIDRzCCAi+gAwIBAgIJALXTHCbfgCS8MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGndlYnRlYW0tc3RnLnR3aWctd29ybGQuY29tMB4XDTE0MDgwNjEwMzYwOFoX
+						DTI0MDgwMzEwMzYwOFowJTEjMCEGA1UEAxMad2VidGVhbS1zdGcudHdpZy13b3Js
+						ZC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4OCFhW7johUxf
+						Fy7AifqG8vfGzzBCyvfswAUgFVUlKf3RWX34iXCq41lin+nwBgoyb7rcTpfy7tSZ
+						+fwcFc1WVQ+uvpRrN6qEsqCsGhD8LS9H7Wq1bSpquUhOi6D36Iy6mk2nQyxEmolG
+						o8v53xI2WWj70tzfyZc0DVA19uIJLzUJZacKEvxzIpExLfFmuDwteTjmn+KWuiuG
+						bF0S2POzTxhkpDE8gVDy4q5yrOL78wjU17a0kGSq0gBMu3GwXA42CpNnRw+NTnhX
+						28QstYfUa30otWlnfCdytnQtMKfoDktvIIp9tfpLH3SU7RJblqQpN23DfGdAYZon
+						q6iM5xmlAgMBAAGjejB4MFcGA1UdEQRQME6CGndlYnRlYW0tc3RnLnR3aWctd29y
+						bGQuY29thjBodHRwczovL3dlYnRlYW0tc3RnLnR3aWctd29ybGQuY29tL3NoaWJi
+						b2xldGgtc3AwHQYDVR0OBBYEFMOoBiGzHjejkj5Sw1kETc3xV6fVMA0GCSqGSIb3
+						DQEBBQUAA4IBAQBT9q8vClGHr0KgQcM/hwo3Jjh/dPo9B2Bw8+6UJKLtpd8bIzaZ
+						lpCHHfEHyRZtxuBU4uI25ciDnkzYZYKBvsT4ZNN/A499+7fUVJrT2cI/mrVjoEy5
+						V2RsqTwT/NZt+eXTKzRAFq9VFLAMlIJ8vpSZJPvbbLHA6eG3juis837D+hgVDvRg
+						gLGUzyNQ6stXTg7VeD1N1QJe6U2133hWwrdoTsvyU89LpTYh3HwHBr8cb+eeq/yQ
+						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>Jim</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:jsmith@twig-world.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jim</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:jsmith@twig-world.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
new file mode 100644
index 00000000..49e0779e
--- /dev/null
+++ b/swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml
@@ -0,0 +1,122 @@
+<?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/cesnet</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>
+      <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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIC7jCCAdYCCQCRzSvIiTLzPDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJD
+WjEPMA0GA1UEChMGQ0VTTkVUMRkwFwYDVQQDExB3aG9hbWkuY2VzbmV0LmN6MB4X
+DTExMDYyODE3MTUxNloXDTIxMDYyNTE3MTUxNlowOTELMAkGA1UEBhMCQ1oxDzAN
+BgNVBAoTBkNFU05FVDEZMBcGA1UEAxMQd2hvYW1pLmNlc25ldC5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALVaOoSPi3RrWjAIk9qneCw48UDTRqsZ
+saD3YGWGpUzigUqAIFgNewH4gFyZskhgeUB185iBCgsb5+oiNwdGKvm0dSRS8qlo
+vjzbeBP7sSVbgmOeeRy6W9AD8cA7HMrrHXxLn7LFGk2czY+dtEWkA0CFVYOR/JGX
+2a8g0YfHqRypU7DKqoo5feB7eUclzwhiZ9jsjqbE//M3LUk/QPIbxfimB8XFY7tV
+ijdFXkmSyz84FDZhCQ4eypu5Pn6+ov4BF/MXZGjFSsBbUKWL4UDAyL+y7LlzvsZq
+sJ4crixV7D3+ChkCaimW2+ETRZF/3F7c52SiqIgjCnvUV90ttGqQWrsCAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAjxVz8kXKKtoM449sxOGg1+pp/rio4vUpZ//nSfwf
+HnbZdesPoLoE58o+U5E3+e5hcN9jRbOEYyFt1oR9uTmYyo19G6CARvN3HNbUL5dW
+ID4yEvYy54tvokxqWNisk5NtXgOmOD+U2NX0FwAkoCDYOKboASeZ5PTQ5uvIo2Cm
+ljL8VHxgCZ+N4/UYnz3xAiJBKXCFLNgTMVIM2HKNYioKUqxubVDapR9E94vLzuvs
+9NVKKQfcm4DAMfylJKBLMGFNdqNwiFmczxxkOr3Me+vn+Tb7XRzT1tSmQkwilpmY
+i/DVjni4yQ3gisrqPcpvzGZCN/doncbNZ5ZRUerR17Waeg==
+                    </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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIC7jCCAdYCCQCRzSvIiTLzPDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJD
+WjEPMA0GA1UEChMGQ0VTTkVUMRkwFwYDVQQDExB3aG9hbWkuY2VzbmV0LmN6MB4X
+DTExMDYyODE3MTUxNloXDTIxMDYyNTE3MTUxNlowOTELMAkGA1UEBhMCQ1oxDzAN
+BgNVBAoTBkNFU05FVDEZMBcGA1UEAxMQd2hvYW1pLmNlc25ldC5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALVaOoSPi3RrWjAIk9qneCw48UDTRqsZ
+saD3YGWGpUzigUqAIFgNewH4gFyZskhgeUB185iBCgsb5+oiNwdGKvm0dSRS8qlo
+vjzbeBP7sSVbgmOeeRy6W9AD8cA7HMrrHXxLn7LFGk2czY+dtEWkA0CFVYOR/JGX
+2a8g0YfHqRypU7DKqoo5feB7eUclzwhiZ9jsjqbE//M3LUk/QPIbxfimB8XFY7tV
+ijdFXkmSyz84FDZhCQ4eypu5Pn6+ov4BF/MXZGjFSsBbUKWL4UDAyL+y7LlzvsZq
+sJ4crixV7D3+ChkCaimW2+ETRZF/3F7c52SiqIgjCnvUV90ttGqQWrsCAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAjxVz8kXKKtoM449sxOGg1+pp/rio4vUpZ//nSfwf
+HnbZdesPoLoE58o+U5E3+e5hcN9jRbOEYyFt1oR9uTmYyo19G6CARvN3HNbUL5dW
+ID4yEvYy54tvokxqWNisk5NtXgOmOD+U2NX0FwAkoCDYOKboASeZ5PTQ5uvIo2Cm
+ljL8VHxgCZ+N4/UYnz3xAiJBKXCFLNgTMVIM2HKNYioKUqxubVDapR9E94vLzuvs
+9NVKKQfcm4DAMfylJKBLMGFNdqNwiFmczxxkOr3Me+vn+Tb7XRzT1tSmQkwilpmY
+i/DVjni4yQ3gisrqPcpvzGZCN/doncbNZ5ZRUerR17Waeg==
+                    </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>
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
new file mode 100644
index 00000000..0bcba035
--- /dev/null
+++ b/swamid-interfederations-2.0/wifi.dir.garr.it:12081-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIEbjCCA1agAwIBAgIRALxMXgZtagsFRXGxHmc7ojQwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzA3MDUwMDAwMDBaFw0xNjA3MDQyMzU5NTlaMD4xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQd2lmaS5kaXIu
+Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM1nKllgz7Q6
+u14Q9efpbAAculFFENIAIIJQVCU/rE7HFPGxxaEDxpBWpq7oUAd9wYT+sFiQk1Zf
+kFwWCxbpwqftLBytbCpOFmzqxcKqtaBX4d8qkBI8v4fIOjYPeC6inMXLZOf+3/QL
+ITNjj70N2S3GXm+JvNBhVik1UiQ3HxVJbjUHAyj33RaMfQGQNonu4H1YOBWTTtXw
+FY1hHAERTRfJBDv7LzGoYo1e6gOYyz2QHNJO3hzHWG+MHZfAA1RpIHO6v9Xs67ZG
+uN9FoeAQMZ89L7Xc8a4b+paS2ShD4BZcw5Htxn8qhdbWfhBfZOUbK+8TQWUO6MNT
+ri2whivd78cCAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+R+qQ47ntMB0GA1UdDgQWBBR6K1Z+w6BoJOYYHclzDHTOD4QsETAOBgNVHQ8BAf8E
+BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQd2lmaS5kaXIuZ2Fyci5pdDAN
+BgkqhkiG9w0BAQUFAAOCAQEApWK44BT0P8QiG0UbsMl3x8nW93tHdrIeuXd/2ET1
+43pIBU6o+cvCZolOzzmU5D3tQuvG3+Uhs5aBKDA3sdklV1wK85Tf/FrVGw5OFlxn
+UCXWIXAHYqZrUZVSBJiUsGLhyNxtME/wL5vgjBFtnBUagkYZAoSI6HIAPFC4WmAG
+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>
diff --git a/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml b/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml
new file mode 100644
index 00000000..a211d9f2
--- /dev/null
+++ b/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml
@@ -0,0 +1,151 @@
+<?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>
+  </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="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>
+					      MIIFaDCCBFCgAwIBAgIRAIaYj8BPcZAQKLmv64xhNrYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MDgwMDAwMDBaFw0xNzA0MDcyMzU5NTlaMDsxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNd2lmaS5lc3Bj
+aS5mcjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANg1N9YQejPppU6s
+vgTVJm78QhVwG1qelsOkcrpG4bzhcJN95zBV/ERuyuJ3YjwqZSYsvgcZcdOJymwf
+zVKLKh7AvDuPL+x6Iz3VSqdl3/n0SfnQP3wCM6upabxikEhLg2mROQEDN2ZnKnNq
+NMWzy0oIuf9TBhbJDddJewQtvHS/OJxqOO3f9S76xqLq9dZhKbMNE8GqWXakAr8f
+oItuYZvc5UapiqngRjB78aOsHjETH3vkE200Gk97wrjIeN0LrBhKcofG88NDeJhN
+zczseS5FwoawYsgA5AAGTFDkg2dydnvZF6hhd/EJ1uEgguCWVCSZQmPSXkzlaoSg
+GAHKx+qdCFkQDipZqVRRpdWCLfRK+qvchu1E+dhzqkvTe4kX/xcvCwKWUJ0I+vlM
+dwzd8o637i6yn736TMnZG6hSMTFDhv9WN5VjD19RkIA5mETXp3KzpMNG+tmn8TPN
+uIPFpcreqQyD+qbRAH5XX5GNATY5P5HWKd+V3QJtqW0QCjen/Viq7o0avEVgmLCi
+dFuabXZo9ta/GgOIsi0n8D3uQiJ0V1snLPFjBemfXevwoI5PyHA+Yya1lLdFQ2QT
+wHyh7B0I/IoTyMoWQI9pixbiyWel6JkLRPzNJqhlB8bKqnH4HR7kgq9itZkFEz2G
+ebZXFLgYWCMvkvj8vXCCYy69I4orAgMBAAGjggFqMIIBZjAfBgNVHSMEGDAWgBQM
+vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUFJC/ROWw0QdJWifZ4Eo9CDHp
+MiswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EM
+AQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
+VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
+cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
+MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDXdpZmku
+ZXNwY2kuZnIwDQYJKoZIhvcNAQEFBQADggEBACcP3xTaWd7EVf5hDvqI7vqrbbor
+zjvEAwdsMXGxtDqJm0Y9G3qk0Cin3vf0beZDWK2DtcYfTf1QIjJT23d+434W457S
+Fj2gVppPEgZ4eFoPIH7KChRul4LXBkyvY4vLw67fQGk8/sr44j9KBUA7vUTsaqIy
+/NW6SgLNx+/NtLF5w5odwoZc6YLfj/YEIc/pLv5wwK556+2jf0p2YnmO99Up+G2U
+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>
+					      MIIFaDCCBFCgAwIBAgIRAIaYj8BPcZAQKLmv64xhNrYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MDgwMDAwMDBaFw0xNzA0MDcyMzU5NTlaMDsxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNd2lmaS5lc3Bj
+aS5mcjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANg1N9YQejPppU6s
+vgTVJm78QhVwG1qelsOkcrpG4bzhcJN95zBV/ERuyuJ3YjwqZSYsvgcZcdOJymwf
+zVKLKh7AvDuPL+x6Iz3VSqdl3/n0SfnQP3wCM6upabxikEhLg2mROQEDN2ZnKnNq
+NMWzy0oIuf9TBhbJDddJewQtvHS/OJxqOO3f9S76xqLq9dZhKbMNE8GqWXakAr8f
+oItuYZvc5UapiqngRjB78aOsHjETH3vkE200Gk97wrjIeN0LrBhKcofG88NDeJhN
+zczseS5FwoawYsgA5AAGTFDkg2dydnvZF6hhd/EJ1uEgguCWVCSZQmPSXkzlaoSg
+GAHKx+qdCFkQDipZqVRRpdWCLfRK+qvchu1E+dhzqkvTe4kX/xcvCwKWUJ0I+vlM
+dwzd8o637i6yn736TMnZG6hSMTFDhv9WN5VjD19RkIA5mETXp3KzpMNG+tmn8TPN
+uIPFpcreqQyD+qbRAH5XX5GNATY5P5HWKd+V3QJtqW0QCjen/Viq7o0avEVgmLCi
+dFuabXZo9ta/GgOIsi0n8D3uQiJ0V1snLPFjBemfXevwoI5PyHA+Yya1lLdFQ2QT
+wHyh7B0I/IoTyMoWQI9pixbiyWel6JkLRPzNJqhlB8bKqnH4HR7kgq9itZkFEz2G
+ebZXFLgYWCMvkvj8vXCCYy69I4orAgMBAAGjggFqMIIBZjAfBgNVHSMEGDAWgBQM
+vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUFJC/ROWw0QdJWifZ4Eo9CDHp
+MiswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EM
+AQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
+VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
+cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
+MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDXdpZmku
+ZXNwY2kuZnIwDQYJKoZIhvcNAQEFBQADggEBACcP3xTaWd7EVf5hDvqI7vqrbbor
+zjvEAwdsMXGxtDqJm0Y9G3qk0Cin3vf0beZDWK2DtcYfTf1QIjJT23d+434W457S
+Fj2gVppPEgZ4eFoPIH7KChRul4LXBkyvY4vLw67fQGk8/sr44j9KBUA7vUTsaqIy
+/NW6SgLNx+/NtLF5w5odwoZc6YLfj/YEIc/pLv5wwK556+2jf0p2YnmO99Up+G2U
+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>
+					      MIIFpjCCBI6gAwIBAgIRAOE+20QrI5x/Eygq7lsxhZAwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMjAzMTkwMDAwMDBaFw0xNTAzMTkyMzU5NTlaMIGCMQswCQYD
+VQQGEwJGUjE8MDoGA1UEChMzRWNvbGUgU3VwZXJpZXVyZSBkZSBQaHlzaXF1ZSBl
+dCBDaGltaWUgSW5kdXN0cmllbGxlMR0wGwYDVQQLExRTZXJ2aWNlIEluZm9ybWF0
+aXF1ZTEWMBQGA1UEAxMNd2lmaS5lc3BjaS5mcjCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBALok3W16b6iUybJIMb7NeUtTv0h5ygPqEZRH1vVm/tsDE027
+16hrdkpSsSwP7fi2xm8x5vH7BSOjV0EtzTWsYG6R6pWkLQ+ktMGvQe3VbdmNrCAa
+/dBK2vKtwDAHES91rcQkM6mO8JTtXWrO2V+N15ttlt70gS3OgJI9Uhi8jl3JgHBq
+lEGhJz58NI1cVwDeUD0agxoz+KkPve5FB+PHASypzPZZ7GyVx5y9CE+p2+bvD+KL
+EKZR5WjXJi+nhycFsRizWAnCCAf2t0I8oky8PzQSf/eaayv+EuUnkvJNR8UXIhWE
+n6mfee+omYOoSnEgivHHJbVuJIgo1QK/+r2dYrGNPmhA7ApQqQvtjwciwwczjpe+
+vCLsrfl+jT8WFgS118huBWUS6itNG+h5pdifLdB56Y4xg+lxdsRV8XRKTZu5ttzt
+nrfkZivVtJ+1/GOcpFsvD/IHM8Z0pARxhZDbI6flbEFw7Vx2HfLiPfmWwWMK6tSL
+7IU0slg+K2ANtxhhBiFrCn0FAieCVyGHdfR7fDvzJcAYYSUyiumF00tWNDfa8Ac7
+Epbcb2/sNwfoXrLJPAL+Bhgry4kn4k6isN8RtyU6t+MaZ179VWZkOJi4e5Sy4PBx
+ERkMP7oD89UZa1sDyzBJ01CNidl83zEp+yVQrhLZb3gpVCJ74ogyazqa59SrAgMB
+AAGjggFgMIIBXDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV
+HQ4EFgQUMNLf8y6GUobcx6Q1ie9thLI8LUkwDgYDVR0PAQH/BAQDAgWgMAwGA1Ud
+EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR
+MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50
+Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG
+CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGAYD
+VR0RBBEwD4INd2lmaS5lc3BjaS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAY3w5yCh9
+6lr26I9dpFUQsVkiAJdMaKzXcGnLoI3wUA7CcYG76ae0m7QxNbbIjxXdhYbDgyn8
+PVGsMLejGWbjgePf5UhvVyaPWQVB/burU95HfD6pDS2D+/NJYQowVjgf8Meh4Nb6
+1tURmrwzVkwLkIHvTSQ011dZJEQe6aockASx6GMtd7hlm87Rndk0Jm9a6pQtzHjY
+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="1"/>
+    <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="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="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://unknown.site.com</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.edugain.org-shibboleth.xml b/swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml
new file mode 100644
index 00000000..d0ea3d33
--- /dev/null
+++ b/swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.edugain.org/shibboleth" 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">
+  <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: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>
+      <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: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>
+MIIC9zCCAd+gAwIBAgIJAMU9QRxFmNAuMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEHdpa2kuZWR1Z2Fpbi5vcmcwHhcNMTMwNzA0MTAzMTE0WhcNMjMwNzAyMTAz
+MTE0WjAbMRkwFwYDVQQDExB3aWtpLmVkdWdhaW4ub3JnMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAnspkp3AJPuXFtIhJc3XTBKG8xF3Qk5CMvmDercSB
+iBBJrQXsAKY+wEzZkH3gc3kFDP5J0uLHQ0wjZhwL5F7XBcqiIvbavIRtcxqVLGwQ
+bySVZOfWimpm9LSguiJciJv5dPqhIyMHHkExhi6WLlqY9Am3vkvep5th7nZJ/Idt
+XMMb+PkhSfmQRoZyZGh5n7nkbY88w3DHH9+i1HbyaCNS/+m2/BxQarEKWEWMngcm
+yZX+eAY70QX8O9p3RTS3PT8fhgXp+gbCQWec33c1dbC37RZZQg3Iku4qlZIQc4ER
+SCIkFF4x0qSCPjwDVHX2d2UypHJnbve2tKahUeOyXhtGEwIDAQABoz4wPDAbBgNV
+HREEFDASghB3aWtpLmVkdWdhaW4ub3JnMB0GA1UdDgQWBBQmj8sgTfdCBiqStP+T
+QyNcyrFNRTANBgkqhkiG9w0BAQUFAAOCAQEAXSa71FEzhRl0gbcHK3cKI/8SRsuM
+BSJJNS/3fHQgr3q3Kozffd5r8i1sVQWd76FqjmN2ueqkYBT0XAAFTnvWUnhzSX6o
+ZR7cNBsibRZHqbMQPOnxWk2IKafGT8HG+BTX/TD6ghX8OXbixuB9I+n9jNTphFGi
+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 Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/POST" index="4" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <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" 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="eduPersonPrincipalName" Name="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="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="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: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
new file mode 100644
index 00000000..32c6f55b
--- /dev/null
+++ b/swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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="fi">Helsingin yliopiston Wiki-palvelu</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Helsinki Wiki Service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Tool for group collaboration and web-publishing.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://wiki.helsinki.fi/tietosuojaseloste.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">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>MIIE3DCCA8SgAwIBAgIQHvsLUtobn4QCPblS1Go+ZzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMDMyMDAwMDAwMFoXDTE1MDMyMDIzNTk1OVowgbYxCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQREwUwMDAxNDEQMA4GA1UECBMHVXVzaW1hYTERMA8GA1UE
+BxMISGVsc2lua2kxIjAgBgNVBAkTGVBMIDI2IChUZW9sbGlzdXVza2F0dSAyMykx
+HzAdBgNVBAoTFlVuaXZlcnNpdHkgb2YgSGVsc2lua2kxEjAQBgNVBAsTCUlUIENl
+bnRlcjEZMBcGA1UEAxMQd2lraS5oZWxzaW5raS5maTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAJa+NschpDfTZTMY6WAawa6aKcw9SybYVLvdB33QqALl
+IHY4ZciSmtB03g8r0tYJhYjSJrX/jxQ++Ur8eeHCXOYDbZ+wLJw9iXVAPj3nYcOH
+Jt2aF7+aDyYtmo7kqjkhUfNigJ+Lx3C9PYThPa84+tsnvMjpmlqr8X/vTmjPKAxP
+ZzTUUaeK3v4WjQo+HeKGD+48pbARnZukWNNy5ruHwdcxUsqx4Y1AnPJdrSmYhpbx
+mPRgnd+DDJW9auj0NS29e9p7MmncDeFAsKsY0XYWcliU6okoLE8/Cj6OpIn1dBRe
+4eUQ2miyNuR4TYtN8am9GOAnN26ZGpJNYKRPPwugGksCAwEAAaOCAWMwggFfMB8G
+A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSjzyD/fgp/
+JLTN79lDRdn/VZsJpzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
+AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghB3aWtp
+LmhlbHNpbmtpLmZpMA0GCSqGSIb3DQEBBQUAA4IBAQAYVwB58egt9eARJEYY2nqX
+uBC85chsu5tO5JgN5fRBTC9h+3d83X5ArZm4Lt0ruki/b9eqtdH/sQcfqemKuFab
+4LlchbV7POnRiIbMyDf5gQXQAudP4JheLDxvTnQblnRblwSNrIAZnjls48SiZAJF
+EKnVWUH+2qiFmShHUxHllnrrbbZtrxD3AAjKnDyShzaat5+Io9HEJZ0c7BUWN0pb
+wK1A8To/939K5dMZ78pJnrWNVWGcU20FitYZx/QtfHR5jmm9xWQyjXxYb90oseqw
+av3W2z9P6X70jYlPJNL2MEi1L0imk1o/VYmmGl5ngGfO8XuIRkq6f4ozfwpvHcTD</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md: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.ligo.org-shibboleth-sp.xml b/swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml
new file mode 100644
index 00000000..671d942c
--- /dev/null
+++ b/swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml
@@ -0,0 +1,88 @@
+<?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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0: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="https://incommon.org"/>
+  </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>
+MIIEVjCCAz6gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
+ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
+BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
+dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMDAyMDMyMDAyMTBaFw0yMDAy
+MDMyMDAyMTBaMGkxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
+FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxFjAU
+BgNVBAMTDXdpa2kubGlnby5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCsizfsa9/YZeLqX0vLLrPxFG0M1cRzSOGOpfxwo3iYPbsw08uFuYjufCaT
+fDQr9T+ZimAlpBP4+yETnYa9R/A65Zmv7ydyge8SfKIdMRY2U23PSBQKMRTp/EdC
++LFAVZQWlKNmfb9ajrFo776dWU1ZU9NHFkX3dMTeH+BI+kRIMZnlPp7urSutuLMj
+DhoT41XufOUeJUwFm+7g1lf+cbCSPmgRGEa46gHBI+572mOCck7GN0+Zj0H74o5i
+esZrMDf08E6qsH6KnahuMuZH22L25KHULq4P9ByNFGDScvgj34HlLo91J4SzHTjS
+wx/JNBwg4V1bV4o9SGvCrRLBrSr/AgMBAAGjgekwgeYwDAYDVR0TAQH/BAIwADAO
+BgNVHQ8BAf8EBAMCBLAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBkG
+A1UdIAQSMBAwDgYMKwYBBAGB+kYCAQIBMDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6
+Ly9jYS5saWdvLm9yZy81NDE0MDRjMy81NDE0MDRjMy5jcmwwHwYDVR0jBBgwFoAU
+Um7de6pvhVwIItOXn61/I1YeatEwMAYDVR0RBCkwJ4INd2lraS5saWdvLm9yZ4EW
+c2NvdHQua29yYW5kYUBMSUdPLk9SRzANBgkqhkiG9w0BAQUFAAOCAQEAnrDCVAKE
+sv/StHC2c6VwYtrW14rgn/gmOYTWvfioYmteCuS5bqADuCN1qdNxi5nHsgXhX7UE
+aaLeOKBqhNbqu+YiS/va0Kk3Azq7BS+KC0iBhHMM+ZZ86jl93ItV/xsuBc5v/AWx
+jqqsEN8CN35bvZaNwm0mBARfhVll2b2T3r80mdmVbekcJKEry4H0ogGgYWNkcBt3
+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>
diff --git a/swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml b/swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml
new file mode 100644
index 00000000..1bc381ab
--- /dev/null
+++ b/swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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>
+						MIIDAzCCAeugAwIBAgIJAI2lVwLRmJlYMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFHdpa2kubW9vbnNob3QuamEubmV0MB4XDTE0MDEyMjE1NTUyMloXDTI0MDEy
+						MDE1NTUyMlowHzEdMBsGA1UEAxMUd2lraS5tb29uc2hvdC5qYS5uZXQwggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWGUu/30A3CbAtbHJxdqCH3sOeEBRh
+						8zlXj4fg9hFnq+QGZFnprYbBGiJIlCrbESqX5xcJb1B36NbyW2G0FvUVzi6H+RlG
+						t686NKc+NIODcbf4YiOcvn9Ixaxmd2q4/9c/3FBXlFm60chf3hENK9hF6kaw4LUd
+						nXdkL6r4Ha2q2csGUSjWaPlS6azgn+Wx+KFE6AVdVRhhrkeuoU6qko+waPPjXjJG
+						gzIfBs45AYwb6t5rw+7oaKWeDMR1pIDa3YkhyvLpeesi+ZXW+CzzWPO7LK6ffedB
+						n4GOZkArOBo8y/KV6qt67w6wVujD9oW3bNTmt4zh6SPpK/qqUOPe4jZLAgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFHdpa2kubW9vbnNob3QuamEubmV0MB0GA1UdDgQWBBQX
+						l8auIWrO6aWUz4kAMl1ft5iPLjANBgkqhkiG9w0BAQUFAAOCAQEAEQirkb8jdIye
+						bieiVOnSdkHSgR+9Nigf7DHEF0F1IXMVCKYONud2O4ospFignlg5UnPV1nrul6Fz
+						c681gz4a0mY0Rkhg0noTbsfDsxmeddWBl2exsS8aLfoMcLmN2XaAPoiyXkUB07VM
+						KfuD9TOWjaWBTUXGxqxvWxqYGyMqY/8K0YFmzOSlW3o38Wnal6BmBU70YdUeGpb9
+						k/GRL1yvGpuhK1LGzCdtu0tg/tpLDB6vYqAUJOI9A/0nnavZ8ZRb7qyUU8hnxbGK
+						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 Collections and Janet 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.shibboleth.net-shibboleth.xml b/swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml
new file mode 100644
index 00000000..b94a00ae
--- /dev/null
+++ b/swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml
@@ -0,0 +1,115 @@
+<?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>
+      <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>
+						MIIDQjCCAiqgAwIBAgIJAMI1r/DZzTEJMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ
+						kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMRwwGgYD
+						VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTEzMTEyNTE0NTcyOFoXDTM3MDMw
+						NDE0NTcyOFowTzETMBEGCgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkW
+						CnNoaWJib2xldGgxHDAaBgNVBAMTE3dpa2kuc2hpYmJvbGV0aC5uZXQwggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1viMiWhYa8cmxJ6rQ8yORYMD6Gx5n
+						r/r9wQko+Tbjl/qGS0LaTfPQCokvwrD06506MPHainaMqbjlO4gDjq2LpU9/iy0s
+						iLuY7UHgDqNNZOELBTQOMwLAFcuEA10FCWjJRglT+6w3xEFeU+dZkBXV1VvKBvsZ
+						SiuQw437CcV3ueEF4+ZB0l9uyq8o3wzKRZ9DnpyFL7SUJiHJPuqqXZuyQnjLrbVZ
+						KjjumGnY3LJTUo1xoUEuhqj5RMfspn2oc5YnIYka5YrCBmYKJV3QtCFbLA/cz8nF
+						m+lOvYGz8nl3wHNkZIVRoetVw/Mhf7lzex0rh3XBdS6vVcT75uH0X1OPAgMBAAGj
+						ITAfMB0GA1UdDgQWBBQe1XwZavrgAhRXrfhv1gGUwSkc7DANBgkqhkiG9w0BAQUF
+						AAOCAQEADCGhWJ+oZ8ltcjJ7D66rMg1HOZT6GFCVeZ7MfhY/KFrvsnITNbTA+SgZ
+						tCJt/BLlZXxpzmix19bD9bNwqEMo7WSqBy77X7SS97ZXti6y6vwAz8h78vzQopOd
+						rnn8XXyWxtrtRRCK4RMpZGrVm3sfBPW68j9hiPHZqewE4nLavjCki/I9rCMe5dJE
+						3+ZRf4Ip/9hYqM+a5Chcvbo2zJEOtw+EUQqNTZ51j33H/2qF9UoSpt74UFh+Jd5y
+						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">
+				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 Collections and Janet 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
new file mode 100644
index 00000000..c5c3d7ef
--- /dev/null
+++ b/swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml
@@ -0,0 +1,140 @@
+<?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>
+      <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
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
+aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
+MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
+bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
+cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
+RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
+l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
+/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
+UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
+amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
+AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
+G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
+ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
+dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
+cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
+KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
+BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
+bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
+ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
+DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
+8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
+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: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
+bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
+cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
+RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
+l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
+/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
+UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
+amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
+AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
+G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
+ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
+dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
+cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
+KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
+BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
+bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
+ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
+DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
+8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
+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: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>
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
new file mode 100644
index 00000000..9019bf60
--- /dev/null
+++ b/swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIC0zCCAbugAwIBAgIJAJ5lZZ3UDF+vMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+						BAMTBHdvb2wwHhcNMTAwNzIxMTUwNjAyWhcNMjAwNzE4MTUwNjAyWjAPMQ0wCwYD
+						VQQDEwR3b29sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq9QD8/89
+						D4fl/yN46TE0Et2YC+V42N2i+mVGf5RSajMAL5/kA72SMDKlLs3l8npwHhQYqbx1
+						ku4UX+q+VwWTzRu5zzX0LHIstRQwexB9ht6LHt+Uh+keEz/uIagt1J8ORtH1yU81
+						r/q+pvnmzInZ8fMTEntwrnZmHZr1OxXrd55YlpYIFbGqHsnov9jmSQcpHRe3dGMN
+						wuFvxL9xZO3dFem0hL3HpB/i2rObcTx9QXjCmf3SwaKOOA9Mug9bxCHUmd15eS8h
+						X396YwLmsl5OeIRceedKj1zW3xLAeqckyPJ9hjIY5qcRpnnRnKRUxTe+jNbWc+hf
+						8TBhvibjUUwmUQIDAQABozIwMDAPBgNVHREECDAGggR3b29sMB0GA1UdDgQWBBSV
+						6Mqy3JMWnbtIamyrPz/QWZVA5jANBgkqhkiG9w0BAQUFAAOCAQEAnb8LFzMKf73A
+						Mt8+ATRNF2kGgTbNybqCCYytGtwRCklUm/2+ZyjxygRWBzZ+GhRf1n9lKtgaJVzr
+						dCD0Xe52goYAfZTzf/QV05IHu6rpVDa4z96UlOa138GW5iwPMrvwAktEQVR8OePo
+						gx51PZjK4oz1i6RnwOcMQo5Qoa9pIW2ikoH9DvpP9vzWEhZ00fk7Rw3iy4VMnZL2
+						lcL8YuTGkE1YWdFoQHkQpZ1fAHZ6cJMLcqFGLMRWGrDUqtIT1c507zFu9VLLuMGT
+						+/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>
+						MIIC0zCCAbugAwIBAgIJAJ5lZZ3UDF+vMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+						BAMTBHdvb2wwHhcNMTAwNzIxMTUwNjAyWhcNMjAwNzE4MTUwNjAyWjAPMQ0wCwYD
+						VQQDEwR3b29sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq9QD8/89
+						D4fl/yN46TE0Et2YC+V42N2i+mVGf5RSajMAL5/kA72SMDKlLs3l8npwHhQYqbx1
+						ku4UX+q+VwWTzRu5zzX0LHIstRQwexB9ht6LHt+Uh+keEz/uIagt1J8ORtH1yU81
+						r/q+pvnmzInZ8fMTEntwrnZmHZr1OxXrd55YlpYIFbGqHsnov9jmSQcpHRe3dGMN
+						wuFvxL9xZO3dFem0hL3HpB/i2rObcTx9QXjCmf3SwaKOOA9Mug9bxCHUmd15eS8h
+						X396YwLmsl5OeIRceedKj1zW3xLAeqckyPJ9hjIY5qcRpnnRnKRUxTe+jNbWc+hf
+						8TBhvibjUUwmUQIDAQABozIwMDAPBgNVHREECDAGggR3b29sMB0GA1UdDgQWBBSV
+						6Mqy3JMWnbtIamyrPz/QWZVA5jANBgkqhkiG9w0BAQUFAAOCAQEAnb8LFzMKf73A
+						Mt8+ATRNF2kGgTbNybqCCYytGtwRCklUm/2+ZyjxygRWBzZ+GhRf1n9lKtgaJVzr
+						dCD0Xe52goYAfZTzf/QV05IHu6rpVDa4z96UlOa138GW5iwPMrvwAktEQVR8OePo
+						gx51PZjK4oz1i6RnwOcMQo5Qoa9pIW2ikoH9DvpP9vzWEhZ00fk7Rw3iy4VMnZL2
+						lcL8YuTGkE1YWdFoQHkQpZ1fAHZ6cJMLcqFGLMRWGrDUqtIT1c507zFu9VLLuMGT
+						+/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/iss/</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/wireless.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wireless.balliol.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..4b9b986c
--- /dev/null
+++ b/swamid-interfederations-2.0/wireless.balliol.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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://wireless.balliol.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="2013-07-04T20:18: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wireless.balliol.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>
+						MIIDEjCCAfqgAwIBAgIJAL0W0N8MnpwIMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXdpcmVsZXNzLmJhbGxpb2wub3guYWMudWswHhcNMTMwNzAzMTU0NDQ3WhcN
+						MjMwNzAxMTU0NDQ3WjAkMSIwIAYDVQQDExl3aXJlbGVzcy5iYWxsaW9sLm94LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl1qmnXqFQamtt0U8
+						fM++v+tB39nr+IEiEWbApx+B/eq4ZgCwzlknQYYmb6lFk8s3mbdOvNUkFFzxRU89
+						jtdFEaMv9BE2GZCcmS8jlBUfJjRoGtj3qPeLhIgnw4pvy0XhN6GBEGjJmfEaLj6H
+						lTaogehd3nn/xo/Tv95kX8PKvmiROn+DEDP7UjAVGDwWCXPpxb9PnUhuuy9qscmN
+						FnTTgHyv+euhX2vS5FmKh8Y4nYPG3+tUB/6vcM8ht2ufjnGc2HDAs+uWCfTtt9Ii
+						sfmzDugU/ofp4lz716wdTMk3TvvVZz4ka4BdmpkaKiQPgAmEt8id+IwLBtJe3hzy
+						UpF2uQIDAQABo0cwRTAkBgNVHREEHTAbghl3aXJlbGVzcy5iYWxsaW9sLm94LmFj
+						LnVrMB0GA1UdDgQWBBSW1Hxc9OSMoWtdwVj5ZeOjkPHG+TANBgkqhkiG9w0BAQUF
+						AAOCAQEADUulFlwmminMcwKs8F69Tgz7LLK99Cm6CLGacbInrwUUzmWVe3dXjvfd
+						VVt2sV6p6DN/wZNiMcLOok13ozgNJZmRX59B0Du/+iFJMaA6v+UpUP7xjLUr0d9Z
+						wbnY41XW2Ne/Ncuob6fugIRgRvL4hyYwwxweeET1w7ALWeljHE54Rd6yOM71xlF9
+						xFjcoY+Zzmup2CeUd1XVGh6qz5o2IqlHFdx2GiU+2yMefLf4e/Lp5OLeUhzAWRDL
+						4xEP7LxWJRlHWhsQf5fSl9Hv0uZsrm77uA8gtN0OtXS3ZQjM7h5u/CexvhUTr+7Z
+						jCw+THjJifsi/CB6ktA9EASTK9vGrw==
+					</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://wireless.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wireless.balliol.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://wireless.balliol.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://wireless.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wireless.balliol.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 - Balliol Wireless Registration</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Plummer</md:SurName>
+    <md:EmailAddress>mailto:ian.plummer@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Plummer</md:SurName>
+    <md:EmailAddress>mailto:ian.plummer@balliol.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wolf-print.wolf.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wolf-print.wolf.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..4936b18b
--- /dev/null
+++ b/swamid-interfederations-2.0/wolf-print.wolf.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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://wolf-print.wolf.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wolf-print.wolf.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>
+						MIIDDzCCAfegAwIBAgIJANOq9kmAYRWdMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHdvbGYtcHJpbnQud29sZi5veC5hYy51azAeFw0xMDEwMjgxMzA0NDRaFw0y
+						MDEwMjUxMzA0NDRaMCMxITAfBgNVBAMTGHdvbGYtcHJpbnQud29sZi5veC5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoxdlwPXfGThJT5GBUs
+						fVVZVXVHc50sRYZDS2Cs7EQJw4omts2DmN+sRMva8Rpg3GMW8HsaEtzgsvfSXZvp
+						S6zFluzdLEOrayxQWemAumYXWbMVGIQjN0olKOQzMPDvdUHesdcLZABdsxXqrEYB
+						PURPLCiMN75i9Rl6C3JJay9z2wzU1QSnsT9g8xvpVG1jO/OKvC+MnENWUhfAK0gw
+						bVqm10vmvfy8FWn+XSbif02kDMvcXVOm1t7gqkmPlXYDE58iVCg2Gwc2MQbfJKfd
+						R7Hj0RziwsmC7MaxARBGnx8yWh3Eu+u73GEU858sCIqU5gAfT4S+O62I2D38baYl
+						MlMCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd29sZi1wcmludC53b2xmLm94LmFjLnVr
+						MB0GA1UdDgQWBBQVWTsmA9E39YYdAz35w5h8M2CxEDANBgkqhkiG9w0BAQUFAAOC
+						AQEAI/suxhJXyu5lgBh23wP97d3Mo/LXZ6QxqgFV0PPpADQxnQiEIFwvOcJ4S0sK
+						xpdh2Ens5sEowOE110ExqRhPRs8SnpV83tumJMKrFM+sT1+UdmKlKP9ZHwuctghy
+						kYfT1FiZcQ4xCP/pL60MDEUHKSQsLOEmINDDeg35oHKUV5/w+DxowvkHCFHExTEK
+						OoBkuRw2/wvTRdy8kDWV1XpaVfUj7ci/5F+onPybMpcEStKoDFvtMoxMeoV/j+Ip
+						d0Pm166IMhjBQxteWIvPAw9F8QWEbDHL2X7rtjDT61obKLKKlr+RI7SwSd+rmmG+
+						Nt9+nCX95b/RaMAOP1/SUQcLTA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDzCCAfegAwIBAgIJANOq9kmAYRWdMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHdvbGYtcHJpbnQud29sZi5veC5hYy51azAeFw0xMDEwMjgxMzA0NDRaFw0y
+						MDEwMjUxMzA0NDRaMCMxITAfBgNVBAMTGHdvbGYtcHJpbnQud29sZi5veC5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoxdlwPXfGThJT5GBUs
+						fVVZVXVHc50sRYZDS2Cs7EQJw4omts2DmN+sRMva8Rpg3GMW8HsaEtzgsvfSXZvp
+						S6zFluzdLEOrayxQWemAumYXWbMVGIQjN0olKOQzMPDvdUHesdcLZABdsxXqrEYB
+						PURPLCiMN75i9Rl6C3JJay9z2wzU1QSnsT9g8xvpVG1jO/OKvC+MnENWUhfAK0gw
+						bVqm10vmvfy8FWn+XSbif02kDMvcXVOm1t7gqkmPlXYDE58iVCg2Gwc2MQbfJKfd
+						R7Hj0RziwsmC7MaxARBGnx8yWh3Eu+u73GEU858sCIqU5gAfT4S+O62I2D38baYl
+						MlMCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd29sZi1wcmludC53b2xmLm94LmFjLnVr
+						MB0GA1UdDgQWBBQVWTsmA9E39YYdAz35w5h8M2CxEDANBgkqhkiG9w0BAQUFAAOC
+						AQEAI/suxhJXyu5lgBh23wP97d3Mo/LXZ6QxqgFV0PPpADQxnQiEIFwvOcJ4S0sK
+						xpdh2Ens5sEowOE110ExqRhPRs8SnpV83tumJMKrFM+sT1+UdmKlKP9ZHwuctghy
+						kYfT1FiZcQ4xCP/pL60MDEUHKSQsLOEmINDDeg35oHKUV5/w+DxowvkHCFHExTEK
+						OoBkuRw2/wvTRdy8kDWV1XpaVfUj7ci/5F+onPybMpcEStKoDFvtMoxMeoV/j+Ip
+						d0Pm166IMhjBQxteWIvPAw9F8QWEbDHL2X7rtjDT61obKLKKlr+RI7SwSd+rmmG+
+						Nt9+nCX95b/RaMAOP1/SUQcLTA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wolf-print.wolf.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://wolf-print.wolf.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://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wolf-print.wolf.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: Wolfson Print Server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wolfson.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Wolfson IT Team</md:GivenName>
+    <md:EmailAddress>mailto:it.support@wolfson.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Wolfson IT Team</md:GivenName>
+    <md:EmailAddress>mailto:it.support@wolfson.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/worc-helium.worc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/worc-helium.worc.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..37811ea5
--- /dev/null
+++ b/swamid-interfederations-2.0/worc-helium.worc.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,81 @@
+<?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://worc-helium.worc.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="2014-05-28T11:00: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://worc-helium.worc.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>
+						MIIDEjCCAfqgAwIBAgIJAPxhwWeLeBDXMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXdvcmMtaGVsaXVtLndvcmMub3guYWMudWswHhcNMTQwNTIwMDgyNTU4WhcN
+						MjQwNTE3MDgyNTU4WjAkMSIwIAYDVQQDExl3b3JjLWhlbGl1bS53b3JjLm94LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmLbLe8TwEjaaC03R
+						MrxiOUoNbl6NWPFHCJIDQx+iZxLiz2z2m2XoxV6hAo665LEfLw9W2J7ezs65c1pH
+						NANZZDCYbP1RfQnwUhi+RUD2HRnUVkxtpEVlFRKYGY/BrPFmDZrl3JYkpKAo8Bat
+						QgmppFeAfk6vq1XiKQHaJNZ9u70J/OJJyfaySk+TuIENHKXJPLoj96PyqSYDJR8s
+						yzHb/4rlgQw4Re9lt2qca2jgSvSLRHUKh6HZP1aDC8MfTDVv8SYW4lN0tVCoOR7i
+						S/ilVQ0bzXqmP+wV0jcC7pZFKfJVg0lghQ9IYlTqkXpZTxVkpq5QUnUJzQIeBJJE
+						PuX2VwIDAQABo0cwRTAkBgNVHREEHTAbghl3b3JjLWhlbGl1bS53b3JjLm94LmFj
+						LnVrMB0GA1UdDgQWBBRb2Hss1FfaYrDXm3LjSbSUoBFm3DANBgkqhkiG9w0BAQUF
+						AAOCAQEAd8t3tqqcV3bkE0RY+fqe927xLwv+Wu/d6x7XdyWnEuF2sBlPFrXOvQGI
+						Dn/lLXcBKTegExgMWJMJWfvDdvnFJNE3bEIFPzbAVflIrEFCpjRQddeyuai2zhXI
+						uSJ3MY2TtkdrL3NwkXcW1iWJC53cEMCVCOL2F1Iu//aDnLb2cJ4EserpHd7tW7SW
+						ljqH7+Oh6I4We8uAHXLATIx5AWiJb3eBDTIW4+2ONMTmM1h46w5PaEZc18Q33V8l
+						s8OgMS4FQndWsAxmlifeTc8Q43CYwnUptF4O9L6G2m+tY7MZYmXs4NlIyjcNrjo4
+						L0NVEMMPEA9hZ7XNpgNMgL66E6tSMg==
+					</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://worc-helium.worc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://worc-helium.worc.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://worc-helium.worc.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://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://worc-helium.worc.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, Worcester College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.worc.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Karen</md:GivenName>
+    <md:SurName>Wells</md:SurName>
+    <md:EmailAddress>mailto:computing.manager@worc.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Karen</md:GivenName>
+    <md:SurName>Wells</md:SurName>
+    <md:EmailAddress>mailto:computing.manager@worc.ox.ac.uk</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
new file mode 100644
index 00000000..df9b7d42
--- /dev/null
+++ b/swamid-interfederations-2.0/www-cvdc.eng.cam.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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-cvdc.eng.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>
+      <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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
+						RsenNm/aXp0wIU+jHVmi/GAPCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
+						RsenNm/aXp0wIU+jHVmi/GAPCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..dde6086e
--- /dev/null
+++ b/swamid-interfederations-2.0/www-falcon.csx.cam.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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-falcon.csx.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>
+      <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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
+						RsenNm/aXp0wIU+jHVmi/GAPCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
+						RsenNm/aXp0wIU+jHVmi/GAPCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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.idcore.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-test.idcore.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..158399cc
--- /dev/null
+++ b/swamid-interfederations-2.0/www-test.idcore.ac.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-12T09:09: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>
+      <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>
+						MIIDGzCCAgOgAwIBAgIJAJAAsD9TBIokMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+						BAMTHGFwcHMtZHJ1cGFsLXRlc3QuaXMuZWQuYWMudWswHhcNMTIwNjIxMTM1MTEx
+						WhcNMjIwNjE5MTM1MTExWjAnMSUwIwYDVQQDExxhcHBzLWRydXBhbC10ZXN0Lmlz
+						LmVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsMDP26L7
+						g+8UPTb9SyIKN2gkQGpqAfE7rai2kkkTw3Pz+JIKSmf609LCRydnMXOwNFzzIX68
+						lT6pUMsVrWSNRKS7h03Ujbnc//r6gqCjoJJw3tPxCKk8MoasN5exGDlgSaIsTf0L
+						Yr1hLe+bUKzs4NOV8fGw+HFyehWjR3DprsAt717vxvKbzZdyVzRhQok1LreYE3xz
+						u/tXD6fvAO99F7aXs1sXZsa9+lc3hBMChpP3aHWIwel+/XvKnNT3c0UcnIMt9Nuo
+						mz6S7tIG8YDQZv6WYpHigNFSlTi5jWv/JmysJqMMP1929MQWiqpIp8XWlYiCNndN
+						aKSkNPFHi9UZpQIDAQABo0owSDAnBgNVHREEIDAeghxhcHBzLWRydXBhbC10ZXN0
+						LmlzLmVkLmFjLnVrMB0GA1UdDgQWBBQYjX3CQsxxS53S0yuL0TxYm1eEZzANBgkq
+						hkiG9w0BAQUFAAOCAQEASy0ZIXokG/4YXV5WV+97ZALmrf3FQnh2LIAwaC9k7wL0
+						77ROaZAsYBI06Qg6b7DKOc8TF2gmLQy7snPLsE/uwFfh/MyntwthukTh0lh0EkOt
+						mCF8ptuumVmspW/n2+jxFEPBoj5LRAqYDjxqCvO8XXLgrjYnp0NMAf8s7Wp1bRbT
+						K3xhbxOKR7EnLYMdDIIoupmdKj7jOZd/hJHayXOw2JAPrtJqXHeFk48eAGuaiU8z
+						nbfZgQy3OZ9zShOmhaJpShvkgztB0r1q55RzjQfdTYN5pfDBspKndopTxqBhdGqD
+						VBgdEXg/axCSZt/2f8yLZu21VjLiSHjqdx3XCjYE5g==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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="0"/>
+    <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="0"/>
+    <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="1"/>
+    <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="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-test.idcore.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.idcore.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.idcore.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">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
new file mode 100644
index 00000000..452649e2
--- /dev/null
+++ b/swamid-interfederations-2.0/www-test.portal.ted.is.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,58 @@
+<?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>
+      <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>
+						MIIDAzCCAeugAwIBAgIJAOMgICS11sdUMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFHNhdC1lcC1rYjF0LmVkLmFjLnVrMB4XDTEyMDIwODE2MzY0OFoXDTIyMDIw
+						NTE2MzY0OFowHzEdMBsGA1UEAxMUc2F0LWVwLWtiMXQuZWQuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDd9RUakCgNBsMGvzseWGolUEC6nv25
+						0wFKO5jgPrYrmMO8CCFOFN5MxbNDCkcZ0Lkl57AaDYnKLpiK1EqA2mP4rem2qarp
+						n8RIPwLv0VQYbpGPlxzyAg8HGYRavly5IDHUK5IaYnTRWbhs/h+y4YaOqRlZdOj+
+						YDsW8bzMIxra9HuTuqz+Z6xepWLoa0MsT7cD4iSty5N5xZSCgxRTz/tNHi+yV+WD
+						qv+B1mTF9pLrm1JQdASbe0y0S3rlVnSXLX7CCu068QA8XQ6kDfi+xW84ljJntMh/
+						E2eHvJjl8QS64hpk/PhZDmKDEP7wATSRUhZTjChoPst0KPxZmhwPij6nAgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFHNhdC1lcC1rYjF0LmVkLmFjLnVrMB0GA1UdDgQWBBSK
+						i14hxOCvF3sTtaqlXQOEYDkIVDANBgkqhkiG9w0BAQUFAAOCAQEAEur8MAx1hdS2
+						gpu0IMPvYt8LZretTqnlrqaWiS0fWZVb3+RUzAqQV6NFRxipgt2db/oEr12FJMlq
+						uRbHu3S5i9ZDjV9/YMfnZsLxTJDKeKo5p7l8eOcomgaQM8y4C4eUvxdV08NwnHso
+						23tC9GnAemQ4jbBUsrI0m7iwBE9RsXlL92LAfvb1iAEaJWrj+K197isJruH2bGqx
+						h88+QH0mrfm76MrrEViDCmmWdIsgE2vUv4VhbFQT4+CYSc5zNjI0ZDWFfOuvGxvy
+						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>
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
new file mode 100644
index 00000000..01f770e6
--- /dev/null
+++ b/swamid-interfederations-2.0/www-test.ted.is.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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>
+      <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>
+						MIIDBjCCAe6gAwIBAgIJAPxnziiUKyZ8MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXNhdC13ZWIta2IxdC5lZC5hYy51azAeFw0xMzA3MTIxMDUzMjdaFw0yMzA3
+						MTAxMDUzMjdaMCAxHjAcBgNVBAMTFXNhdC13ZWIta2IxdC5lZC5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfQj3Fn3JObYydckX3u9Dgezz1N
+						uVQK64kW5bCjUOT6/KxL8nHOOrPKwcbEUF064oRDPVxgJ3zbK2JCgKZWEWAU6ASy
+						KJ23D7kkNdMWiBO41XYDyBuRI3KChJbG7nJqEMCM2P9VPlCTzQGy8iCcVKoRKZfa
+						hnpkxOcLhX70jJ0pIlXAFA10qW9jc5KxFIRZXWP+4r0A3zcdSLsqKkTdUt2jRb81
+						oKlSn109dSQ4pV+hZ+LCpll64LxxDNXEGHeBTM+YHJB4Yp85a+r9Tsas1crstwyc
+						i5R2MorDFB2w+Pht7rae3GrIMYuwJ9GyalJaKVCcA4t57irCa5uLv6413UUCAwEA
+						AaNDMEEwIAYDVR0RBBkwF4IVc2F0LXdlYi1rYjF0LmVkLmFjLnVrMB0GA1UdDgQW
+						BBQZ60I7N9IvNRrNpbwngvPuMBFzXTANBgkqhkiG9w0BAQUFAAOCAQEAFuXgykYH
+						RzeNpD2HxF7BsMxfuYR/nKhwn2KpL/zjGHqrEsYlpiHtlS9rmYFUv8Z82QQZEvhF
+						hbEvVnWKd1Q0YaGHJa4BDVU1pSkCcvZjn798FvsOET7prY1zJqbjwBnBWC0grbUL
+						RVct5cZ3xl7UjkprTAlGBP2uYJCgoAphtoXLSox1n2Yd4UQ4X+JHRWqhL5aqW8YA
+						pkuYejIZPEvWevPpt7h817zE0VwGTGcIOUnrN3qVFWtiTFW/6cHPa0gkCpa0/4y5
+						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>
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
new file mode 100644
index 00000000..1b819e97
--- /dev/null
+++ b/swamid-interfederations-2.0/www-trg.eng.cam.ac.uk-shibboleth.xml
@@ -0,0 +1,67 @@
+<?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>
+    <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>
+      <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>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
+						RsenNm/aXp0wIU+jHVmi/GAPCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..3ee7fdd0
--- /dev/null
+++ b/swamid-interfederations-2.0/www-trn.portal.ted.is.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,58 @@
+<?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>
+      <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>
+						MIIDADCCAeigAwIBAgIJAN7T0EIFcj+3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE3NhdC1lcC10cm4uZWQuYWMudWswHhcNMTIwMjIxMTUzODI1WhcNMjIwMjE4
+						MTUzODI1WjAeMRwwGgYDVQQDExNzYXQtZXAtdHJuLmVkLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqH4g2Mo3OewCnOBlEc6S/XQiTa5Yiiy
+						iem1v/tgiq2mtAFcVw0fx8LFPpsg7MRX90kLLWqCNcz8N5ITHep5BZ9dh5qIT4LI
+						oDwePP+TKPC0JAkHZfw64nWZuUqemUhy0J8EzID6MYPU+24L7n6ZEvvEqXfjd9Xw
+						E1JX3Va31u+NEGJ78zwXcxb891cSe6CsvDB3XBhT2tOjo/JlD51Nn49KQIivNtrA
+						1e+f0FQFEJdQ8mCcaUUYpEnQOPs7dPuNrxv9GOwWfg8wyxJsKayGpAuG0F0XGi2x
+						90ZSRQw5ysS+gKKnRpNceHFUwen3a2CJS3cWuKErviYMFOMKIWnEDwIDAQABo0Ew
+						PzAeBgNVHREEFzAVghNzYXQtZXAtdHJuLmVkLmFjLnVrMB0GA1UdDgQWBBRWcmiz
+						GfJpbTYdEdwguTdbmCTV3TANBgkqhkiG9w0BAQUFAAOCAQEAlNapAzLaJ27lpOq2
+						xzDVyslkaY3uh9gs/LGs63sumPzVxSqMzrStn4mokpbKCEbr6K7RucFtmQ4L90G5
+						ynMAPalY6MI9t8BNQg7I9zUunMgfq3DvIvjJYJZhaskYbZMS3UMJJlS51M4JjqnC
+						esKPEIanLfc0zuUdmtTof3D2QZSmK0oNdRBkuAWuzKqkTUEIekoO8dYgj9WjHY4o
+						nXNtk63bUSagWx661sSPlR5+dZUN7FW0jZ/KWaQWxwvVbiAiTdL6E8ugEB1wy2PX
+						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>
diff --git a/swamid-interfederations-2.0/www.123library.org-oa-metadata.xml b/swamid-interfederations-2.0/www.123library.org-oa-metadata.xml
new file mode 100644
index 00000000..0aec4033
--- /dev/null
+++ b/swamid-interfederations-2.0/www.123library.org-oa-metadata.xml
@@ -0,0 +1,54 @@
+<?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>
+						MIIDfDCCAmSgAwIBAgIJAOqpAln6yGDwMA0GCSqGSIb3DQEBBQUAMDIxEzARBgNV
+						BAoTCjEyM0xpYnJhcnkxGzAZBgNVBAMTEnd3dy4xMjNsaWJyYXJ5Lm9yZzAeFw0x
+						NTAxMDkxNjI0NTVaFw0yNTAxMDYxNjI0NTVaMDIxEzARBgNVBAoTCjEyM0xpYnJh
+						cnkxGzAZBgNVBAMTEnd3dy4xMjNsaWJyYXJ5Lm9yZzCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBALNX0cg2tfg5w/8mF6+jaYx5vJYaY2viY90ZPZD4YiVF
+						Evr0yHv40gdZoDaPrQpI/z+krN1Hv8zz2aFi2jkSJ6udzVCmzV1fxVSeUtAyW7j/
+						dQDuApuBmReKdsBKbUUH0cOehMdPwJM5jUm8BUpUKd1jO5/b3AhNZWQnxeDJVmzy
+						CdHGc3BJhe7RBi7hLJTlX/1AbD1dHLMjU/U2813rt+MB+QfPVzuCkajNNA5pY6OJ
+						ksDx/Q9SGZLgrGvFUE64MH/ffvQ8/jR33aJAQ7v1y463MpVQqxZLlxh/GtSPu9nD
+						zqYSl80fTFns7omQ/uOQv1y91SMe42M8qGysv3HaRL0CAwEAAaOBlDCBkTAdBgNV
+						HQ4EFgQUrxHW4/Azow1MEfosgbCPRp3DNacwYgYDVR0jBFswWYAUrxHW4/Azow1M
+						EfosgbCPRp3DNaehNqQ0MDIxEzARBgNVBAoTCjEyM0xpYnJhcnkxGzAZBgNVBAMT
+						End3dy4xMjNsaWJyYXJ5Lm9yZ4IJAOqpAln6yGDwMAwGA1UdEwQFMAMBAf8wDQYJ
+						KoZIhvcNAQEFBQADggEBAATMW4Py6IHcQbxj26vK9mQNlpWAy/Ah2fp5CFhpm2PK
+						DsGjjf4Wn4NWQyc2G7bmCPLRYQa2douIBzWpZ1n3S/tnaf2855LHsa/WV8gKuoN4
+						xFpGWiS8c7KOZvhJuvqP1K9mAMBbCeEocFB+OpzwvpVn0chSzBfs89aVDO7iHXpJ
+						YHz4dJsJ76McTVdPTAKila/Hjgq4dt4xRodj45MlgX3SApqQLQnLJPZoF40Ug478
+						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>
diff --git a/swamid-interfederations-2.0/www.2simple.com-shibboleth.xml b/swamid-interfederations-2.0/www.2simple.com-shibboleth.xml
new file mode 100644
index 00000000..e241f056
--- /dev/null
+++ b/swamid-interfederations-2.0/www.2simple.com-shibboleth.xml
@@ -0,0 +1,83 @@
+<?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>
+      <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>
+						MIIDXjCCAkYCCQDmolVNvs2UvTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJH
+						QjEYMBYGA1UECBMPIEdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHTAb
+						BgNVBAoTFDJTaW1wbGUgU29mdHdhcmUgTHRkMRgwFgYDVQQDEw93d3cuMnNpbXBs
+						ZS5jb20wHhcNMTEwNTE5MTcyMjA1WhcNMjEwNTE2MTcyMjA1WjBxMQswCQYDVQQG
+						EwJHQjEYMBYGA1UECBMPIEdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24x
+						HTAbBgNVBAoTFDJTaW1wbGUgU29mdHdhcmUgTHRkMRgwFgYDVQQDEw93d3cuMnNp
+						bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgNPBDxQsr
+						2fBkIAAonSWIntDbWMJz9nqUmvcDUe66MaktRpJlWzPwf8PY8uRY11fLqURcbuhi
+						lXU0r3flglnosshwR3NmngKvHeGN0xPt9HE5zbEfNGGameP8i3f3UpvjI2Kzqnf1
+						Va/E+pvYYyH5rMsxi6LhCyKBpA4GDIXobJL/nACuYW1bmshrzBPfsEkUqmd0X5k0
+						83fPz68XzXcLnH8cRq9jXPphrjrkFEJzBM7fA05EwNa/r1Qauzydsfvew+KoLaH4
+						w7aAqZ/C5WQFFnp4HdiRJZVplcnRsBT239COpcfyChsn6twDd3RqZNWajP12uJbD
+						1D8Nn84Y7ojDAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACTk9iu5EEUrwqm0mgL6
+						/X8Yrw3SCFKIKoWFzGD6JeCmTZmWx/Of53yhszBqa8xWZVtKDRaR9gCC6aKDN+aK
+						Hn35J4H91FNmBH4LxihBhYRvM0Tf4EgFea0ybQuz/nxhCW+d5qZ+7UEtY++EEffU
+						8ptlZ2lX1ZdafBKsFJhFscQaaC1EdY/k/IoIC0BQ2gDVj+UpfVHEci5c2S/uxCI/
+						HwFwogiOsSg4OoO2CK/iSqv5aYbb1sg33VbMO2nKp/s+v6g201aU0d05Ap9e5hQh
+						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>
diff --git a/swamid-interfederations-2.0/www.abersu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.abersu.co.uk-shibboleth.xml
new file mode 100644
index 00000000..c2e637a0
--- /dev/null
+++ b/swamid-interfederations-2.0/www.abersu.co.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
diff --git a/swamid-interfederations-2.0/www.abintegro.com-shibboleth.xml b/swamid-interfederations-2.0/www.abintegro.com-shibboleth.xml
new file mode 100644
index 00000000..17145a8c
--- /dev/null
+++ b/swamid-interfederations-2.0/www.abintegro.com-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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">Online access to the Abintegro Career Centre</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC3zCCAcegAwIBAgIJAJ2y3/Ipx0rcMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+						BAMTCGFiaW50YWEyMB4XDTEzMDgxNDIzMTI1NFoXDTIzMDgxMjIzMTI1NFowEzER
+						MA8GA1UEAxMIYWJpbnRhYTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC9NZvmrSYjcTzr0HKkQTo7sftSQsJ8C24K0H7hv4xa2k3xTRsJ3x1cR3VSohpV
+						Th9j6KqpEItOh3kK5nr5yjyTsekWF/vrdtvZzzI95eAtcvFP5dXNdMIUkcbbOnys
+						bYKFVzdtKw9ZwejZvkzbzQ7n6kUTyhLlZIUma3rQNhYWmmyVFVSRqbXX5XkgqjKG
+						5MIy42nGIfOVF+RdnkA5u+t2zlUdJuyhLJfyrfovnf/Ttdw1lpJ0zzqEvFPHa5Dx
+						1W9B2tama+MURTJfO9ZRgckx4qGpL+vuZKDs1gynzzwhqff476UNlYeTDTZzAB8u
+						uLObbBZszG/3rM+Kdjfo0sKPAgMBAAGjNjA0MBMGA1UdEQQMMAqCCGFiaW50YWEy
+						MB0GA1UdDgQWBBRUIJFi6Zdg8nwr4/rA63aWklFizzANBgkqhkiG9w0BAQUFAAOC
+						AQEAqfryYrk6Ha9xkgPbauuJFXGLlcSPnUUJK8wLhTFX3asacroLYVYxMF6bty2I
+						8Hm/WerHTYLvdyvR8z+cwar74PqPHsql1kjGikZwWNTeQbt8L5r+MY6R+qVTyIXL
+						0QygcVpFA8/07uIV/MO6ldsLu/IXMwFt7VWwlueq744pi9ACDjaLwhZ9QcegFOKa
+						k0bU3yG5Uj27MYAxRjBTMH7YFV0RcrBdczeWw4ivNourUbYnhHOpjKBmyLt3haSz
+						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>
diff --git a/swamid-interfederations-2.0/www.accessible.com-shibboleth-sp.xml b/swamid-interfederations-2.0/www.accessible.com-shibboleth-sp.xml
new file mode 100644
index 00000000..52990fb8
--- /dev/null
+++ b/swamid-interfederations-2.0/www.accessible.com-shibboleth-sp.xml
@@ -0,0 +1,81 @@
+<?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>
+      <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>
+						MIIC3zCCAcegAwIBAgIJAJ+6AdB4y2zzMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+						BAMTCHNlcnZlcjAxMB4XDTEyMDQxMDAxNDE0MFoXDTIyMDQwODAxNDE0MFowEzER
+						MA8GA1UEAxMIc2VydmVyMDEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDWNb/VquX0JPLbLTH53stVrwc2e4B+XCr/WrM1JXmXk2pvOa6S388U9XwqtB9r
+						6SW+zyAZlItnajD55oSFUDI+pyUyBqICzAyGXq2iXfCEpy4i5uozdAakeuUp4bUB
+						YyZXvjqb8Naee1HH8QP9W3ua9VjTara3/mrD5B5gm27ViGRJsT+gn1mJq5mka9AB
+						XG41dZJFZDB2faqk2eRWdxFqB38FVjBMYbswI2dlptKJTLZFMB8oSeEpqsjNHYRp
+						M4bEPn8vu4PpDK4LruxLDApQLWUqy9MP1vxwbHP60HtMa026cl9+tYlD6iMGPxnE
+						sFhhekzNbwCv+yvj36cioNArAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHNlcnZlcjAx
+						MB0GA1UdDgQWBBTUDXOIGI4cirL8eFZPfagMyT6jUjANBgkqhkiG9w0BAQUFAAOC
+						AQEAmiBakqubDVjKl3RtwYVmWac/2SbU84E8U8f/3sbPfiYhxYidVdu81DSyHF23
+						Lx+2K2m0Fa/DHx0ZjGjtcxZlL06gYYovW1kg30MIorZ+QUyGVCr8zIGvyKruQlGG
+						0drNsH9XZhzOv/SmOEf/KgnOHQUpYePwkU4SKYDAMTTq0/tc4XZch7NjDQKP21e6
+						k3woa7JmUDwH/9QPjFzNjPQTR/2QMDb14JQEqraA1n7BTuIqIiCpR+V1GgLl1cNK
+						/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>
diff --git a/swamid-interfederations-2.0/www.annualreviews.org-shibboleth.xml b/swamid-interfederations-2.0/www.annualreviews.org-shibboleth.xml
new file mode 100644
index 00000000..80293b57
--- /dev/null
+++ b/swamid-interfederations-2.0/www.annualreviews.org-shibboleth.xml
@@ -0,0 +1,52 @@
+<?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>
+						MIIDrzCCApegAwIBAgIJAISIclSx3A7XMA0GCSqGSIb3DQEBBQUAMIGWMQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEeMBwGA1UEAxMVd3d3LmFubnVhbHJldmlld3Mub3Jn
+						MB4XDTEwMDkxNjE4MTAyNloXDTIwMDkxMzE4MTAyNlowgZYxCzAJBgNVBAYTAlVT
+						MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEdMBsG
+						A1UEChMUQXR5cG9uIFN5c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBTeXN0
+						ZW1zLCBJbmMuMR4wHAYDVQQDExV3d3cuYW5udWFscmV2aWV3cy5vcmcwggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHRNaQRFxhtFGzrqtVl8hZpLM31/aP
+						W/y6ETnsG2NMXo5coglRVKpzykWyFTTgjX0/yXFtmJ7zTo4Aye1crn2FFKTYDYBX
+						aGx+MI/nTaVqz031hZ5gfDHwPtjYken9kBs9cl8MTvDT0vUz/PglkR+BP+Ccp7Jk
+						NQOcZ9BEye+L6B1muiTMxzZxiaWcwBzU++K4LUcYTzKGcRsyQvjJ6s6fGxryc+gT
+						VDfyOWmB7LiE7x+5MukPht+WLsJqkTlLJlho/GkuoxUMZesALS3P/OwPMuDCXLI3
+						ngCRx4JDJFw6n8xCv6tboI3JKbSA3g/6KfFQMaw6nBNEbQ7aNbQjJqVlAgMBAAEw
+						DQYJKoZIhvcNAQEFBQADggEBAC/ayKMZPSGElvNUCtGsTZXvaBieWIMbsga3bGGV
+						Zwi8CB2hRy0INVe+TVSbTVD4KY/Y2gZ8bHo3xF0JvpIiFMECJ1QE0TTxzOz3bbT9
+						L7EL5UGpDLXUYZ0y/6k5wOmtErr/qZ4Vpuix8Y5TB8s0SRiBi9A4hneB6h8/q4nm
+						CLvgTsxOooeBfCe2MIy4ivgjjWNR9RGFXDHRHGPczspu3EPZufJXiTrQt7JdePJe
+						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:1.0:profiles:artifact-01" Location="https://www.annualreviews.org/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.annualreviews.org/action/samlACS" 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
new file mode 100644
index 00000000..5babaf17
--- /dev/null
+++ b/swamid-interfederations-2.0/www.archer.ac.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAPNKT3NJhvy6MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHd3dy5hcmNoZXIuYWMudWswHhcNMTQwODI3MTUxNjExWhcNMjQwODI0MTUx
+						NjExWjAbMRkwFwYDVQQDExB3d3cuYXJjaGVyLmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEA2glxhYdtiCZ1hmouXkzW5UivP7rf/ro9gBIjJvcl
+						08BWT5r3dluh+SL7qHsPN+ej8ygoS3iGVeSjFD3CizzqG4OtyUtPiB5TMOWrbrmj
+						ZzbixIKM4weAtSoJdHvboy6Qlt170ZaQoqz4rqAc66kJTI1ILzyE+uBCyfV2GUfm
+						Z0/ZXe0syjKPo85N0779rCfYmnUTx6jojS1pT1neclayO/VEgj4RbW1hkoK+hgVU
+						uZsQPD/Ei+LNykBFuKkRhZp1Sg27KOaS0wrYJjkqjKC5xlj7xnSX6ynVnjzaRb6V
+						dPNx6XuHKAgFXxNhzzck844ILL1jlMjQerFqvdtlyJ2V3wIDAQABoz4wPDAbBgNV
+						HREEFDASghB3d3cuYXJjaGVyLmFjLnVrMB0GA1UdDgQWBBTO2VNhV9Q2f2wqQuTG
+						E8x16++mCDANBgkqhkiG9w0BAQUFAAOCAQEAiPBzjUdPLQeenN8ajRudraWnB2b5
+						0gyPpNCbm10P/Xb58zRIrNdrnC6PoxIYqfpA2+/TErNx9PjUHaJq2h7mwhH5SVQf
+						moWQNrvsVq99g7oFrMre7/V5sne0kRe2cHK4bvLKAXGOhGxJcQAVoRkL//rHXzmz
+						cjonxObbFuxU1sF3D6GdHdPgI2pGMaoeikyY6NX43AZ0xOFUEIYlWL6JlJdtZ/dC
+						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: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
new file mode 100644
index 00000000..bfc48c85
--- /dev/null
+++ b/swamid-interfederations-2.0/www.ascopubs.org-shibboleth.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <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
new file mode 100644
index 00000000..ec5e8479
--- /dev/null
+++ b/swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml
@@ -0,0 +1,80 @@
+<?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>
+						MIIDnDCCAoSgAwIBAgIEUe5jgTANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
+						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
+						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDcyMzEx
+						MDUzN1oXDTE2MDcyMjExMDUzN1owgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
+						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
+						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
+						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAKz4tWwjcP2+Ld9vIqdI9ssmUF7yJVnDUoJqAPhejPOFSvrEZrjvofnY
+						6VIcPcL3tyUADrD/vTRCb3T1FuQKsRnXgYzYI9o84hK6IZyTVzzD1G3Kil5ivsNq
+						ndv5hcMNfbH5kjGLfKvgHixrkR5HkLfITBghQydtCur4Yze0+u3mFu4OTabmqILH
+						hcnWlLPohznyRtx5F3fTtFFC/cUHAonymmH8OG3xQOhLFR1dSK5i2oGoRdqme6mR
+						FiFHS8832tGjqsb072rFdpxKSmPLxz0vBxoa/YVw0RP6OYgt5Gze6mPOv1rFE5jq
+						nMegHU7gLilsR6AS9GQoE+KUNiBeYhsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						OlI/iGvczpy+BZErTXPBvizoKvFJzoi5Ri+zRRu+49qR67uMrnpKAQ51Weae6kj8
+						tz0+iQIcKbyOO/9A+7Iu55PWruI4w0Qe4c8cCmFg5crORj2Orel3IMrT5s4XXOZ2
+						MHweTl9+ZGFpshUYbSdPvj2vN8RhpC1c644lHVK0xceVxd3pFZA6VdtKfrnjyfXH
+						t2m6Pzr00zEvxcvZch5rXdtH/tdSp8fRQzAoAWB1MBXTLBL1xztRSTacPMJYdiNP
+						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>
+						MIIDnDCCAoSgAwIBAgIEUe5jgTANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
+						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
+						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDcyMzEx
+						MDUzN1oXDTE2MDcyMjExMDUzN1owgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
+						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
+						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
+						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAKz4tWwjcP2+Ld9vIqdI9ssmUF7yJVnDUoJqAPhejPOFSvrEZrjvofnY
+						6VIcPcL3tyUADrD/vTRCb3T1FuQKsRnXgYzYI9o84hK6IZyTVzzD1G3Kil5ivsNq
+						ndv5hcMNfbH5kjGLfKvgHixrkR5HkLfITBghQydtCur4Yze0+u3mFu4OTabmqILH
+						hcnWlLPohznyRtx5F3fTtFFC/cUHAonymmH8OG3xQOhLFR1dSK5i2oGoRdqme6mR
+						FiFHS8832tGjqsb072rFdpxKSmPLxz0vBxoa/YVw0RP6OYgt5Gze6mPOv1rFE5jq
+						nMegHU7gLilsR6AS9GQoE+KUNiBeYhsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						OlI/iGvczpy+BZErTXPBvizoKvFJzoi5Ri+zRRu+49qR67uMrnpKAQ51Weae6kj8
+						tz0+iQIcKbyOO/9A+7Iu55PWruI4w0Qe4c8cCmFg5crORj2Orel3IMrT5s4XXOZ2
+						MHweTl9+ZGFpshUYbSdPvj2vN8RhpC1c644lHVK0xceVxd3pFZA6VdtKfrnjyfXH
+						t2m6Pzr00zEvxcvZch5rXdtH/tdSp8fRQzAoAWB1MBXTLBL1xztRSTacPMJYdiNP
+						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">Publishing Technology 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>Peter</md:GivenName>
+    <md:SurName>Arbuthnott</md:SurName>
+    <md:EmailAddress>mailto:openathens@publishingtechnology.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
new file mode 100644
index 00000000..7bc2b2d0
--- /dev/null
+++ b/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml
@@ -0,0 +1,75 @@
+<?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"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol 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>
+						MIIEfjCCA2agAwIBAgIRAPknBmCnCjGeotNVf6CLdX8wDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzA0MTkwMDAwMDBaFw0xNjA0MTgyMzU5NTlaMEYxITAfBgNV
+						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEhMB8GA1UEAxMYYXVkaW9uZXR3
+						b3JrLmxnZmwub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						z9k7esVlz6i3hdvNKkWxIeMt744FHvw4B2MwjVS3x/P79/daDwKaHP12SrT+NbLb
+						msujv8MiljxUYVSfJE/oSxtZNZPUi04xNpiBL6IKeCQoW4KWiSkyBy5PpuT5b0fP
+						zgK0sRGNlquoJZpOyCwan75WlFRQmhIeSd/pGfyzzic4xlOBlsxQEzjH3RIgUCEn
+						QSn4RHxCO0lG8qtoMO+W8UNS0DLJlByCxAlB7D5BpWNTKSfzwxQLjrk5wtxYFyTx
+						8Hg0FrtG48YJCrB7ojbdbq7k4wxImVqdF/3diQGS4GFDvAVj5YFlUpQjhKzXe07T
+						2V1xF60sd7Y6XVuj/pZ0bQIDAQABo4IBdTCCAXEwHwYDVR0jBBgwFoAUDL2TaAzz
+						3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKu6x/xS9uGWbmtyeijYnV+tciEDMA4G
+						A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+						BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
+						BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
+						QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
+						cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
+						dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAjBgNVHREEHDAaghhhdWRpb25ldHdv
+						cmsubGdmbC5vcmcudWswDQYJKoZIhvcNAQEFBQADggEBABvf+bM1ua7K8UQtqK0Q
+						uBTxc+krTRg1Du680rxmFRdKRFtwkzCW+2bXFoMnZSLbS+sFbKUXe805GATZh6DI
+						5eMuAU2DCcMpqtgSkB0cxYYBUNIYElBDyEmiGOfUEJZR+Vr4CrUxnteHbl++mzoY
+						DXOwBM7YjzK/Fh7eIBEdexnxqrDMHf676j5oulzmQ/uvmeVq+r9iP8ei5vqrkvsa
+						KBJX1oimGt9bb+ZIH7D+Ck88dwh/JQOpJzllZDoLflm0UMatS53Rm6cwCuczQ3A6
+						W5eqaVcnOgT2hA6dDtraW94YH4POo7+eI2rc+XEzyviy/IzF5v9ICxAABWyePG1H
+						++0=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..195d775e
--- /dev/null
+++ b/swamid-interfederations-2.0/www.bathspasu.co.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
diff --git a/swamid-interfederations-2.0/www.bathstudent.com-shibboleth.xml b/swamid-interfederations-2.0/www.bathstudent.com-shibboleth.xml
new file mode 100644
index 00000000..957e6120
--- /dev/null
+++ b/swamid-interfederations-2.0/www.bathstudent.com-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
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
new file mode 100644
index 00000000..e037aaf1
--- /dev/null
+++ b/swamid-interfederations-2.0/www.bfi.org.uk-inview-shibboleth.xml
@@ -0,0 +1,85 @@
+<?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>
+						MIIC3zCCAcegAwIBAgIJAJCZAVBpmy3YMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+						BAMTCHJvYmluc29uMB4XDTA5MTAwMTE0MTA0NFoXDTE5MDkyOTE0MTA0NFowEzER
+						MA8GA1UEAxMIcm9iaW5zb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC8gOXUZXEl3AdPbrI44ra8gDLytogk10Iu3DSwv56II/tF+yPcfUeT2sLRSOZG
+						zqrAMBBsgJlCv1GEq94ybtdjjIJvPTzOp3IMPQkQU3SBZnq05rGLvsIgYyu4yg8z
+						4MWit9JDCyQjRLZ/ayVUog1Xh4Q1Ml/Rv3BAeSHxtjjE7TaXQ9UjM9ebJ42wCjEp
+						9swilxUA1OU+vJOpbcP6VVhBxe6ZstCNtEHeCnTDZtNJW2PIJaL2MopRPx7MqiV6
+						+ySSkDc/u/UaepNTwgtfIHK7GFD62PilOrlS/PE73MVlUK7sLfJFaMYIUzaNxzUd
+						hcRJRaqPkKtgTkM2ph6vC+tPAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHJvYmluc29u
+						MB0GA1UdDgQWBBT5snOaM5DTvRHkjANs/TyJcZ7zLTANBgkqhkiG9w0BAQUFAAOC
+						AQEAXuGwikXA4QCegNWBpXH0Rz/0scLjRLYKELH+oJPJkaw2PdTjRspiq1a6npJ/
+						stBZnAA+P1Uv8z2P1V9ZJKnu1r3H/Ud16nTYohZE/xvLojjo8lI9xE16PMr2yYyO
+						n+NJ3zBlTltEVI7e49iS0yxVDrbfOVyZJvtXvAxx+Lg+zQI2v5UT0qnxtzOKdavI
+						Prf8Iq9rlOp3e21QQxTXdxAB3eGwne2r9xRphIicUq2l2beiCWP/7xrBs9HIxC1c
+						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>
+						MIIC3zCCAcegAwIBAgIJAJCZAVBpmy3YMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+						BAMTCHJvYmluc29uMB4XDTA5MTAwMTE0MTA0NFoXDTE5MDkyOTE0MTA0NFowEzER
+						MA8GA1UEAxMIcm9iaW5zb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC8gOXUZXEl3AdPbrI44ra8gDLytogk10Iu3DSwv56II/tF+yPcfUeT2sLRSOZG
+						zqrAMBBsgJlCv1GEq94ybtdjjIJvPTzOp3IMPQkQU3SBZnq05rGLvsIgYyu4yg8z
+						4MWit9JDCyQjRLZ/ayVUog1Xh4Q1Ml/Rv3BAeSHxtjjE7TaXQ9UjM9ebJ42wCjEp
+						9swilxUA1OU+vJOpbcP6VVhBxe6ZstCNtEHeCnTDZtNJW2PIJaL2MopRPx7MqiV6
+						+ySSkDc/u/UaepNTwgtfIHK7GFD62PilOrlS/PE73MVlUK7sLfJFaMYIUzaNxzUd
+						hcRJRaqPkKtgTkM2ph6vC+tPAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHJvYmluc29u
+						MB0GA1UdDgQWBBT5snOaM5DTvRHkjANs/TyJcZ7zLTANBgkqhkiG9w0BAQUFAAOC
+						AQEAXuGwikXA4QCegNWBpXH0Rz/0scLjRLYKELH+oJPJkaw2PdTjRspiq1a6npJ/
+						stBZnAA+P1Uv8z2P1V9ZJKnu1r3H/Ud16nTYohZE/xvLojjo8lI9xE16PMr2yYyO
+						n+NJ3zBlTltEVI7e49iS0yxVDrbfOVyZJvtXvAxx+Lg+zQI2v5UT0qnxtzOKdavI
+						Prf8Iq9rlOp3e21QQxTXdxAB3eGwne2r9xRphIicUq2l2beiCWP/7xrBs9HIxC1c
+						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>
diff --git a/swamid-interfederations-2.0/www.bioone.org-shibboleth.xml b/swamid-interfederations-2.0/www.bioone.org-shibboleth.xml
new file mode 100644
index 00000000..71bea61b
--- /dev/null
+++ b/swamid-interfederations-2.0/www.bioone.org-shibboleth.xml
@@ -0,0 +1,52 @@
+<?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>
+						MIIDoTCCAomgAwIBAgIJAJjXSA+eCVerMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEXMBUGA1UEAxMOd3d3LmJpb29uZS5vcmcwHhcNMTAx
+						MDIyMDAyOTE1WhcNMjAxMDE5MDAyOTE1WjCBjzELMAkGA1UEBhMCVVMxEzARBgNV
+						BAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC1NhbnRhIENsYXJhMR0wGwYDVQQKExRB
+						dHlwb24gU3lzdGVtcywgSW5jLjEdMBsGA1UECxMUQXR5cG9uIFN5c3RlbXMsIElu
+						Yy4xFzAVBgNVBAMTDnd3dy5iaW9vbmUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAq9l9fHkQV6d18ZBMtv1oAsyV2spBF4o5FCta4jLiVrcx6TAh
+						eY+1djxN0smEpiflND9YyncINW/QxTr4VkJaRrURGalwPYUnEDMbUeDCZGdjmuHn
+						ijesTi34lBnjz8FeIIoB/1YlCSVffVxxOLw6AhVDuBixH+n1MK3AvMaV7+6k7iar
+						59570440WqpQMpWVJm+a1EgyS4WF5SjW8PI3VDfrJCC76Qg6YCKXhdO56sFZ8fOe
+						m+6nUdkZRSUEDZ6jG9nF2rFKdxrlTCEpVXrSViiuAGrwcNXxIF07M/cdW4gh2J1n
+						anOVWYhax9gL0PPXptkCjQxiJKK8oKF/qU5YvQIDAQABMA0GCSqGSIb3DQEBBQUA
+						A4IBAQCXFBWSkhl6SXKrjBTJGR2Ed7QdRhhZJFgglA0NZJ0eGHE0tTmF34Htgr+D
+						rjxXukFop7y+zuEg51CCNExeiIn8boC6/Bi1N5wnXKgBxejuF5WTRqua7PehfcUk
+						sAcyQfiT42U4qL/Y5cCVvVjyjOn4vB9QInt6w0t2JB0KhdkTlzHPFGNhIr6JielL
+						OysB8mqF8SvNWTA8FXtsoj/xMzTZmOhbEr6LWeCRsATxTEnfts9XKrnvr6QvLzOp
+						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:1.0:profiles:artifact-01" Location="https://www.bioone.org/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bioone.org/action/samlACS" 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
new file mode 100644
index 00000000..834a6dc2
--- /dev/null
+++ b/swamid-interfederations-2.0/www.birpublications.org-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+						MIID+jCCAuKgAwIBAgIJAPs6J7wBa9+AMA0GCSqGSIb3DQEBBQUAMFExIDAeBgNV
+						BAMTF3d3dy5iaXJwdWJsaWNhdGlvbnMub3JnMS0wKwYDVQQDEyRiaXJwdWJzLmJp
+						ci1wcm9kLmxpdGVyYXR1bW9ubGluZS5jb20wHhcNMTQwMTI0MTEyNzAzWhcNMjQw
+						MTIyMTEyNzAzWjBRMSAwHgYDVQQDExd3d3cuYmlycHVibGljYXRpb25zLm9yZzEt
+						MCsGA1UEAxMkYmlycHVicy5iaXItcHJvZC5saXRlcmF0dW1vbmxpbmUuY29tMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1jmEDJ8jXi2v5lHPaFJlwecK
+						1QrpkwvX0LBTH79TVTHx2pi8anBUJzCwB0igLIH2sGZab5YZuUX95rUUkbigbK2Z
+						j+29kMamegKNa5P04i2g+M898/4ylemYsiuQPUSHvvnR4xN/wesNyEhNvGXkBU0n
+						mA5MrHIfJb7XHlhsQHNzk88+MMUylkuxIxLHZKdCAV7otSAz/J85gw1kbxwfOnh9
+						0DhRkDh6hXaxIbX1zMk+D8yAeiG3nuHYRYbjfeqt/dmZVSOSQT6zPxPfOdfMe7d/
+						mEPf+RLf88ItXhsWSHrby5Dd3sLNRHccfM6eG04zCs88lrinzyteNrQnviD5qwID
+						AQABo4HUMIHRMIGvBgNVHREEgacwgaSCF3d3dy5iaXJwdWJsaWNhdGlvbnMub3Jn
+						hipodHRwczovL3d3dy5iaXJwdWJsaWNhdGlvbnMub3JnL3NoaWJib2xldGiCJGJp
+						cnB1YnMuYmlyLXByb2QubGl0ZXJhdHVtb25saW5lLmNvbYY3aHR0cHM6Ly9iaXJw
+						dWJzLmJpci1wcm9kLmxpdGVyYXR1bW9ubGluZS5jb20vc2hpYmJvbGV0aDAdBgNV
+						HQ4EFgQUKbT4MojJhlu+5CjDCYfsbGBg5lAwDQYJKoZIhvcNAQEFBQADggEBAI3E
+						8w2mbN8mc+2ynACKQ0b+fzSzuSYmwkzCNrPlxpZfgqtKzPfy+Z3N1qGBLpLEArnS
+						lTWJO2pOzI9sPAlPROl5ovpUky8SRneOeclpzzLFQJau9FJuG/x/tfLj7RQkkewK
+						d5I4e6B2H+q3KF8n6KnvJr4uh4SGfFu5EXAbIg0HpBEh5sFTFmSY/RNWLg45Quo4
+						d+1by3NzthGQKaQQB1vB8OevylY9O4elEPcTocDAGblsownCzcHhueScH+7uNMKB
+						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:1.0:profiles:artifact-01" Location="https://www.birpublications.org/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.birpublications.org/action/samlACS" 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.bjhcm.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.bjhcm.co.uk-shibboleth.xml
new file mode 100644
index 00000000..c5109d83
--- /dev/null
+++ b/swamid-interfederations-2.0/www.bjhcm.co.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.bjhcm.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>
+						MIIFBDCCA+ygAwIBAgIJAJ0dMnvmlXpZMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
+						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGzAZBgNV
+						BAoTEk1hIEhlYWx0aGNhcmUgTHRkLjEMMAoGA1UECxMDd2ViMRgwFgYDVQQDEw93
+						d3cuYmpoY20uY28udWsxLTArBgkqhkiG9w0BCQEWHnRvbS5wb2xsYXJkQG1hcmth
+						bGxlbmdyb3VwLmNvbTAeFw0xMDExMTgwOTM4MTJaFw0yMDExMTUwOTM4MTJaMIGj
+						MQswCQYDVQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24x
+						GzAZBgNVBAoTEk1hIEhlYWx0aGNhcmUgTHRkLjEMMAoGA1UECxMDd2ViMRgwFgYD
+						VQQDEw93d3cuYmpoY20uY28udWsxLTArBgkqhkiG9w0BCQEWHnRvbS5wb2xsYXJk
+						QG1hcmthbGxlbmdyb3VwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAMFJMPZrCB4R0FGaIwXrM56fwY75Rt9sA2oAL5VitN01BhItwr1+VA+Agl6s
+						Icm/nkhQt5P6Rk6JAc//cgft37u2CpC3JLryLR4xL4lmSHofcRsRABs8+/BqDfDz
+						D7pupIMeeUV0wJqV7EECzdGY2n4QDe/oHMRlWQVEYSSOrZNqgpOXD3c51HxJeMs2
+						EUbOMonjxp8NVXZFdgeDNXwys+rsA81PipU+PMhVF5pCtPnwWlwd91G+3Q/VqyiR
+						mWynFz7KcWsBFI9Ms/JHnbLdHknMs1yvbPJF8JdpxktaRyQAFuwy7Iag4/9CFDul
+						3yCL7Ubn6q+8MYdO+nUZsSN01z0CAwEAAaOCATcwggEzMAkGA1UdEwQCMAAwLAYJ
+						YIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1Ud
+						DgQWBBRdDheBuWTHljSJkR0G+mboL7G+wTCB2AYDVR0jBIHQMIHNgBRdDheBuWTH
+						ljSJkR0G+mboL7G+waGBqaSBpjCBozELMAkGA1UEBhMCR0IxDzANBgNVBAgTBkxv
+						bmRvbjEPMA0GA1UEBxMGTG9uZG9uMRswGQYDVQQKExJNYSBIZWFsdGhjYXJlIEx0
+						ZC4xDDAKBgNVBAsTA3dlYjEYMBYGA1UEAxMPd3d3LmJqaGNtLmNvLnVrMS0wKwYJ
+						KoZIhvcNAQkBFh50b20ucG9sbGFyZEBtYXJrYWxsZW5ncm91cC5jb22CCQCdHTJ7
+						5pV6WTANBgkqhkiG9w0BAQUFAAOCAQEAcAIeF4Vx7UA/+lEoZ5VB+5cfKodmIorI
+						oxbwQcKVvCrC5aziWcPVpzCE3u4lS4Qad2YJFzHSUyHQQ37IrmrfzEhctFJAxvaX
+						QF/XmEj+CW0OkaDxWSYTZfzL3XJk3OA213pbq6ORo3qVNQB5lwajhq0cK12G+Jzm
+						W/lRqlPGzX0MFVafCrgkCrD1qgg+w5T6KGNtMWZUtsjpD+WN64kUoV9pKU8itUf5
+						iaKjGvk2mhyFQ/jC5HMLSc6w//OmpSjsrQmg7R7sDoZsPgPMM6EGUfwIBfWDqqEM
+						FkiDK5odPpv8XOuhavrPqL9CL3sRnGMezE7UyPX/rytg4BeOytPubA==
+					</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.bjhcm.co.uk/auth/rcv/ukfed" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bjhcm.co.uk/auth/rcv/ukfed" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MA Healthcare Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MA Healthcare Limited: bjhcm.co.uk</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bjhcm.co.uk/</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>Ella</md:GivenName>
+    <md:SurName>Horswell</md:SurName>
+    <md:EmailAddress>mailto:ella.horswell@fsite.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.blikbook.com-shibboleth.xml b/swamid-interfederations-2.0/www.blikbook.com-shibboleth.xml
new file mode 100644
index 00000000..26f931c8
--- /dev/null
+++ b/swamid-interfederations-2.0/www.blikbook.com-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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.blikbook.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-09T13:52: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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.blikbook.com/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>
+						MIICzTCCAbWgAwIBAgIJAKNuWk4C+NN7MA0GCSqGSIb3DQEBBQUAMA0xCzAJBgNV
+						BAMTAjE0MB4XDTEzMDkwNTE4NTM0M1oXDTIzMDkwMzE4NTM0M1owDTELMAkGA1UE
+						AxMCMTQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnU7lRsAO3JWdF
+						CV6hbwomTdJAw5Q75PHIVIDhgk6WFtKhBjiUSJDKv+1H2AreuEYGpRX7crXJ8JeR
+						4ox4dB1FKr76FsNS2d38VkgzmyVTyAj1YgFZS5PKrzIogh4s2/h+DFGu2FAkgdFs
+						qXf/B+sWAnbDyfgr7wp+QzfVscCYHFDtmrul9EoYD704Emk3H4ViEZLZHjw9UCHl
+						HCUA2mNFKQu6hBRPLy//9yvyvbb5SuxmVVExPTpaUwqDtYlgajeI0pno1cRckGkf
+						A6W4teAaNTxqEstYWOO8VxmhT5SfzaW2EwvKRlnELoWnUjXkvaPBbL00BN7ge4Qs
+						Np1lDzcBAgMBAAGjMDAuMA0GA1UdEQQGMASCAjE0MB0GA1UdDgQWBBSlgdjTlZKI
+						9VBvUaa8t9oNtgHOmDANBgkqhkiG9w0BAQUFAAOCAQEAYvPZozk1OlBNuSP6+ewU
+						n+KivoAQGT8AiLbtjVziG74zqTfUoro9GDdGpLiq9lAodgGMkUou3gpEyVbI1oOa
+						AJF35OSCHPgy+I5czpDM/ir25tyFsO8CsJfMH56DwB8fGYr4x3cHFkm++kZj2Ew6
+						VfYnG4+9paWJcUU6kdgxhNRQpiSVbDmZ/NP/Z8GR02tkZNGm0vJgaPRI8FmxUIjL
+						1mBPt1KOIRpN+RTQZ7G24iamdHVkzeYW5PnzFv9KWtC7CzCMdcML333WFliSn//G
+						GOD58oPBiX7W3bcbxgiMeI2vQe3/wmOH8sRDMOCUheWd5tt2WpA0asts4k7kOfm6
+						sw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIICzTCCAbWgAwIBAgIJAKNuWk4C+NN7MA0GCSqGSIb3DQEBBQUAMA0xCzAJBgNV
+						BAMTAjE0MB4XDTEzMDkwNTE4NTM0M1oXDTIzMDkwMzE4NTM0M1owDTELMAkGA1UE
+						AxMCMTQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnU7lRsAO3JWdF
+						CV6hbwomTdJAw5Q75PHIVIDhgk6WFtKhBjiUSJDKv+1H2AreuEYGpRX7crXJ8JeR
+						4ox4dB1FKr76FsNS2d38VkgzmyVTyAj1YgFZS5PKrzIogh4s2/h+DFGu2FAkgdFs
+						qXf/B+sWAnbDyfgr7wp+QzfVscCYHFDtmrul9EoYD704Emk3H4ViEZLZHjw9UCHl
+						HCUA2mNFKQu6hBRPLy//9yvyvbb5SuxmVVExPTpaUwqDtYlgajeI0pno1cRckGkf
+						A6W4teAaNTxqEstYWOO8VxmhT5SfzaW2EwvKRlnELoWnUjXkvaPBbL00BN7ge4Qs
+						Np1lDzcBAgMBAAGjMDAuMA0GA1UdEQQGMASCAjE0MB0GA1UdDgQWBBSlgdjTlZKI
+						9VBvUaa8t9oNtgHOmDANBgkqhkiG9w0BAQUFAAOCAQEAYvPZozk1OlBNuSP6+ewU
+						n+KivoAQGT8AiLbtjVziG74zqTfUoro9GDdGpLiq9lAodgGMkUou3gpEyVbI1oOa
+						AJF35OSCHPgy+I5czpDM/ir25tyFsO8CsJfMH56DwB8fGYr4x3cHFkm++kZj2Ew6
+						VfYnG4+9paWJcUU6kdgxhNRQpiSVbDmZ/NP/Z8GR02tkZNGm0vJgaPRI8FmxUIjL
+						1mBPt1KOIRpN+RTQZ7G24iamdHVkzeYW5PnzFv9KWtC7CzCMdcML333WFliSn//G
+						GOD58oPBiX7W3bcbxgiMeI2vQe3/wmOH8sRDMOCUheWd5tt2WpA0asts4k7kOfm6
+						sw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.blikbook.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.blikbook.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.blikbook.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.blikbook.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.blikbook.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.blikbook.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.blikbook.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.blikbook.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.blikbook.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.blikbook.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.blikbook.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.blikbook.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.blikbook.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.blikbook.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.blikbook.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">BlikBook Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">BlikBook</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.blikbook.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Deepak</md:GivenName>
+    <md:SurName>Colluru</md:SurName>
+    <md:EmailAddress>mailto:deepak@blikbook.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Giles</md:GivenName>
+    <md:SurName>Greenway</md:SurName>
+    <md:EmailAddress>mailto:giles@blikbook.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
new file mode 100644
index 00000000..ccd6b9bd
--- /dev/null
+++ b/swamid-interfederations-2.0/www.bridgemaneducation.com-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+						MIIDZDCCAkwCCQDwazyRKFeJxDANBgkqhkiG9w0BAQUFADB0MQswCQYDVQQGEwJH
+						QjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHjAcBgNVBAoTFUJy
+						aWRnZW1hbiBBcnQgTGlicmFyeTEjMCEGA1UEAxMad3d3LmJyaWRnZW1hbmVkdWNh
+						dGlvbi5jb20wHhcNMTAwODIwMTA0NjUyWhcNMzAwNTA3MTA0NjUyWjB0MQswCQYD
+						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHjAcBgNV
+						BAoTFUJyaWRnZW1hbiBBcnQgTGlicmFyeTEjMCEGA1UEAxMad3d3LmJyaWRnZW1h
+						bmVkdWNhdGlvbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc
+						r1Z/EjsTgw8PlvVdpS1KV66O5QA5Kl8XR+wM+VUz1sRm6WaN8bGv96XJkw/1K96g
+						+6SssA6bNuqxJ5vRLyDGNFCwfrqh+Peqd2EPAqmkkjZ1wHaYkHHQlt9SO6Yzr8t6
+						//l4mHVG3hf+NRW6ULCR8OXDOvvLXiVHEWUhU9R0ihE9gvbyOAsIMOJ3FQW663gv
+						8kP7dxLAiK5MZ+M8jVWsQ/4qV1TuEipF7QySz7KJCfYf15b/cjirm/Rq/TPD1v5i
+						v6XUqd01TpEZ20UCirqy5j0DUkdB77M9qlJPVon8MPNtUZJAwpUKtMgUscD6N1FB
+						DoRT2qLbSTgDNCcYcn69AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACEJlFGX1o/F
+						5G1kKFT+LgX/KuPVI7qBkb5NVzMGvLaQ2Ntz7wTWL6X0w/z9hHGEnXpr0Zc8HNNT
+						cOs5pqDaMRLREMuwaQ+H53zgVgoVvgxdfywzZOFpLghvDOlbDqhdQ/4U4DfvaiPD
+						OVsrpdM9zbOHZmbvdarfgC181gnT1Adu6xpJcHRXlLpJk10IYGfQfSvJl3AEYCkg
+						HiBaJEKUJYBBvjAyPFaMt6jaV3YDgYs1quUwx1a0lAg8DZMXoaKJpJavwhwCpUvC
+						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>
+						MIIDZDCCAkwCCQDwazyRKFeJxDANBgkqhkiG9w0BAQUFADB0MQswCQYDVQQGEwJH
+						QjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHjAcBgNVBAoTFUJy
+						aWRnZW1hbiBBcnQgTGlicmFyeTEjMCEGA1UEAxMad3d3LmJyaWRnZW1hbmVkdWNh
+						dGlvbi5jb20wHhcNMTAwODIwMTA0NjUyWhcNMzAwNTA3MTA0NjUyWjB0MQswCQYD
+						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHjAcBgNV
+						BAoTFUJyaWRnZW1hbiBBcnQgTGlicmFyeTEjMCEGA1UEAxMad3d3LmJyaWRnZW1h
+						bmVkdWNhdGlvbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc
+						r1Z/EjsTgw8PlvVdpS1KV66O5QA5Kl8XR+wM+VUz1sRm6WaN8bGv96XJkw/1K96g
+						+6SssA6bNuqxJ5vRLyDGNFCwfrqh+Peqd2EPAqmkkjZ1wHaYkHHQlt9SO6Yzr8t6
+						//l4mHVG3hf+NRW6ULCR8OXDOvvLXiVHEWUhU9R0ihE9gvbyOAsIMOJ3FQW663gv
+						8kP7dxLAiK5MZ+M8jVWsQ/4qV1TuEipF7QySz7KJCfYf15b/cjirm/Rq/TPD1v5i
+						v6XUqd01TpEZ20UCirqy5j0DUkdB77M9qlJPVon8MPNtUZJAwpUKtMgUscD6N1FB
+						DoRT2qLbSTgDNCcYcn69AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACEJlFGX1o/F
+						5G1kKFT+LgX/KuPVI7qBkb5NVzMGvLaQ2Ntz7wTWL6X0w/z9hHGEnXpr0Zc8HNNT
+						cOs5pqDaMRLREMuwaQ+H53zgVgoVvgxdfywzZOFpLghvDOlbDqhdQ/4U4DfvaiPD
+						OVsrpdM9zbOHZmbvdarfgC181gnT1Adu6xpJcHRXlLpJk10IYGfQfSvJl3AEYCkg
+						HiBaJEKUJYBBvjAyPFaMt6jaV3YDgYs1quUwx1a0lAg8DZMXoaKJpJavwhwCpUvC
+						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>Naomi</md:GivenName>
+    <md:SurName>Hepworth</md:SurName>
+    <md:EmailAddress>mailto:naomi.hepworth@bridgemanimages.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Naomi</md:GivenName>
+    <md:SurName>Hepworth</md:SurName>
+    <md:EmailAddress>mailto:naomi.hepworth@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
new file mode 100644
index 00000000..a941708a
--- /dev/null
+++ b/swamid-interfederations-2.0/www.brightonsu.com-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
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
new file mode 100644
index 00000000..4c9e9840
--- /dev/null
+++ b/swamid-interfederations-2.0/www.british-history.ac.uk-shibboleth.xml
@@ -0,0 +1,100 @@
+<?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>
+    <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
+					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>
+						MIIDEjCCAfqgAwIBAgIJALh/eAye3WYvMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXd3dy5icml0aXNoLWhpc3RvcnkuYWMudWswHhcNMTAwOTAyMDczODE4WhcN
+						MjAwODMwMDczODE4WjAkMSIwIAYDVQQDExl3d3cuYnJpdGlzaC1oaXN0b3J5LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv5Fo2rXmIk7rzSrS
+						r2l8ComzSzAubn2P+3aH0kXln8uijcbKjqp16eSnaRO3hjPVGqxiUpERX/vkSRYf
+						YQi1BXJSTc965iQi6YbQLtUESCMHaGnhMQTA94n3R0dF1lRjn19SoLvKq16nInxc
+						V8mdKZtP0fsLVxflrjemmnl7i56HZFXPjfBcTHzlUnIT2VOhC/hOqTyeSAEOuTKO
+						ePTH0udgPVTOLKzU6xxrR2QgDx/v7XH/KDraqlBThM/5yvS15IpdTmxWGyGlJx+Q
+						i8s1+KuRf20JTi9s41o3csrCs/iRuTcccDFI4J5Bu96CmT+hLh+zioQF/UfNsI/H
+						b5TUbQIDAQABo0cwRTAkBgNVHREEHTAbghl3d3cuYnJpdGlzaC1oaXN0b3J5LmFj
+						LnVrMB0GA1UdDgQWBBRB18xhmEjac8eJrYMgCbrBrF3oJjANBgkqhkiG9w0BAQUF
+						AAOCAQEAeKbONxHaEPx/1HTc/jfFLRagds7HYz3Ce4QKxrvge/TK4oObe8ZiICYM
+						4sTaeRkT3ioBt1Gm3ZCGtiUM5pg7QtUwG3HXBfqv/8Z1swfOxUDebab6m04aMk2i
+						2rb7aArAHATlV5a72H5CAWeEaif6WclWWo7rgTl8f7akYNt7qkZKttoHj0aWfNum
+						ecepIeAKuyBkUex3UCvzQlEr67A0wlxPSqUm9UNtYMB5KgTJjzSWVennzzRcqUFT
+						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>
+						MIIDEjCCAfqgAwIBAgIJALh/eAye3WYvMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXd3dy5icml0aXNoLWhpc3RvcnkuYWMudWswHhcNMTAwOTAyMDczODE4WhcN
+						MjAwODMwMDczODE4WjAkMSIwIAYDVQQDExl3d3cuYnJpdGlzaC1oaXN0b3J5LmFj
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv5Fo2rXmIk7rzSrS
+						r2l8ComzSzAubn2P+3aH0kXln8uijcbKjqp16eSnaRO3hjPVGqxiUpERX/vkSRYf
+						YQi1BXJSTc965iQi6YbQLtUESCMHaGnhMQTA94n3R0dF1lRjn19SoLvKq16nInxc
+						V8mdKZtP0fsLVxflrjemmnl7i56HZFXPjfBcTHzlUnIT2VOhC/hOqTyeSAEOuTKO
+						ePTH0udgPVTOLKzU6xxrR2QgDx/v7XH/KDraqlBThM/5yvS15IpdTmxWGyGlJx+Q
+						i8s1+KuRf20JTi9s41o3csrCs/iRuTcccDFI4J5Bu96CmT+hLh+zioQF/UfNsI/H
+						b5TUbQIDAQABo0cwRTAkBgNVHREEHTAbghl3d3cuYnJpdGlzaC1oaXN0b3J5LmFj
+						LnVrMB0GA1UdDgQWBBRB18xhmEjac8eJrYMgCbrBrF3oJjANBgkqhkiG9w0BAQUF
+						AAOCAQEAeKbONxHaEPx/1HTc/jfFLRagds7HYz3Ce4QKxrvge/TK4oObe8ZiICYM
+						4sTaeRkT3ioBt1Gm3ZCGtiUM5pg7QtUwG3HXBfqv/8Z1swfOxUDebab6m04aMk2i
+						2rb7aArAHATlV5a72H5CAWeEaif6WclWWo7rgTl8f7akYNt7qkZKttoHj0aWfNum
+						ecepIeAKuyBkUex3UCvzQlEr67A0wlxPSqUm9UNtYMB5KgTJjzSWVennzzRcqUFT
+						JyLIrCA/d3S+4FGrnDNNVr0KWD/h2M53lhk5ohh147oP6qwVOwqalnMIqzHDjFrm
+						Vh9RR1SnWTuXhAGE8kZHTZLj7wi3sg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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>Adam</md:GivenName>
+    <md:SurName>Crymble</md:SurName>
+    <md:EmailAddress>mailto:adam.crymble@sas.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Crymble</md:SurName>
+    <md:EmailAddress>mailto:adam.crymble@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
new file mode 100644
index 00000000..2db9d4e8
--- /dev/null
+++ b/swamid-interfederations-2.0/www.britishonlinearchives.co.uk-oa-metadata.xml
@@ -0,0 +1,81 @@
+<?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>
+						MIIDYzCCAkugAwIBAgIJAIntgQVy9bMDMA0GCSqGSIb3DQEBBQUAMEgxIDAeBgNV
+						BAoMF0JyaXRpc2ggT25saW5lIEFyY2hpdmVzMSQwIgYDVQQDDBticml0aXNob25s
+						aW5lYXJjaGl2ZXMuY28udWswHhcNMTQxMjIyMTczNTE1WhcNMjQxMjE5MTczNTE1
+						WjBIMSAwHgYDVQQKDBdCcml0aXNoIE9ubGluZSBBcmNoaXZlczEkMCIGA1UEAwwb
+						YnJpdGlzaG9ubGluZWFyY2hpdmVzLmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEArBXm14IC8EPPKMLqv8Mxc6lnsDNeT4ZQqQpsF3Kz325jqZnZ
+						+4qUFliWnopWDHOPvdVDnnZg5ymSzinO2jKZcweM4yvBthDG/Wp3JNci11jgZk9h
+						C/zyoByJ5qrKrtrDjYFW5zwAcOGrSbYGeA+cKG28FoeuVowvXavMnI8ZG5SaRcfP
+						gVe9tGGeZOToVJpE3TNE5fEQA1vKCOvgoT7ED7Oqu513FFeUgINZv6R+o0xwuBc1
+						y78xfG90PUJYZZzDW4r1ZqK1yxjHVnZZetOmJIFukQ9roooN0Obar5/o8SSmGcsS
+						2TuOvURvNP8qedUQEKNZf3eoHGRwXem4yfgYwwIDAQABo1AwTjAdBgNVHQ4EFgQU
+						jiD0ReK+F12gvk35faGLaMANkigwHwYDVR0jBBgwFoAUjiD0ReK+F12gvk35faGL
+						aMANkigwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAHZPJrhAtjWu4
+						dl0m80tGN28YEJ4JTudooDQbUggD3bmf32P1l3gRxUt6JYyfcmzN8xTHQZureVB9
+						NqxJ5UrEyVuFc6criS233tITks8ujfERX8L602gRIdvnqcrb//uqq86KdWc53fyR
+						nFSfnnMQlRfHHXdwe4kB8tI5Q5GoWB2oIYxW/iePE93unoB6f12ueqji+FaaSih2
+						s2YzFjlH1ERAupJq1xeqnO6DJ8J9BN/+h/Pm0ykn/8SmhI6fXiLqfkEqG/fAK+Lj
+						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>
+						MIIDYzCCAkugAwIBAgIJAIntgQVy9bMDMA0GCSqGSIb3DQEBBQUAMEgxIDAeBgNV
+						BAoMF0JyaXRpc2ggT25saW5lIEFyY2hpdmVzMSQwIgYDVQQDDBticml0aXNob25s
+						aW5lYXJjaGl2ZXMuY28udWswHhcNMTQxMjIyMTczNTE1WhcNMjQxMjE5MTczNTE1
+						WjBIMSAwHgYDVQQKDBdCcml0aXNoIE9ubGluZSBBcmNoaXZlczEkMCIGA1UEAwwb
+						YnJpdGlzaG9ubGluZWFyY2hpdmVzLmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEArBXm14IC8EPPKMLqv8Mxc6lnsDNeT4ZQqQpsF3Kz325jqZnZ
+						+4qUFliWnopWDHOPvdVDnnZg5ymSzinO2jKZcweM4yvBthDG/Wp3JNci11jgZk9h
+						C/zyoByJ5qrKrtrDjYFW5zwAcOGrSbYGeA+cKG28FoeuVowvXavMnI8ZG5SaRcfP
+						gVe9tGGeZOToVJpE3TNE5fEQA1vKCOvgoT7ED7Oqu513FFeUgINZv6R+o0xwuBc1
+						y78xfG90PUJYZZzDW4r1ZqK1yxjHVnZZetOmJIFukQ9roooN0Obar5/o8SSmGcsS
+						2TuOvURvNP8qedUQEKNZf3eoHGRwXem4yfgYwwIDAQABo1AwTjAdBgNVHQ4EFgQU
+						jiD0ReK+F12gvk35faGLaMANkigwHwYDVR0jBBgwFoAUjiD0ReK+F12gvk35faGL
+						aMANkigwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAHZPJrhAtjWu4
+						dl0m80tGN28YEJ4JTudooDQbUggD3bmf32P1l3gRxUt6JYyfcmzN8xTHQZureVB9
+						NqxJ5UrEyVuFc6criS233tITks8ujfERX8L602gRIdvnqcrb//uqq86KdWc53fyR
+						nFSfnnMQlRfHHXdwe4kB8tI5Q5GoWB2oIYxW/iePE93unoB6f12ueqji+FaaSih2
+						s2YzFjlH1ERAupJq1xeqnO6DJ8J9BN/+h/Pm0ykn/8SmhI6fXiLqfkEqG/fAK+Lj
+						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>
diff --git a/swamid-interfederations-2.0/www.bucksstudentsunion.org-shibboleth.xml b/swamid-interfederations-2.0/www.bucksstudentsunion.org-shibboleth.xml
new file mode 100644
index 00000000..2ad0d03b
--- /dev/null
+++ b/swamid-interfederations-2.0/www.bucksstudentsunion.org-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
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
new file mode 100644
index 00000000..f0c4f2e4
--- /dev/null
+++ b/swamid-interfederations-2.0/www.callforparticipants.com-institutional-login-entity.xml
@@ -0,0 +1,86 @@
+<?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>
+						MIID6DCCAtACCQCgXYYpGzPTKTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
+						R0IxGDAWBgNVBAgTD05vdHRpbmdoYW1zaGlyZTETMBEGA1UEBxMKTm90dGluZ2hh
+						bTEiMCAGA1UEChMZQ2FsbCBGb3IgUGFydGljaXBhbnRzIEx0ZDEgMB4GA1UEAxMX
+						Y2FsbGZvcnBhcnRpY2lwYW50cy5jb20xMTAvBgkqhkiG9w0BCQEWIml0LXN1cHBv
+						cnRAY2FsbGZvcnBhcnRpY2lwYW50cy5jb20wHhcNMTQwNjI3MTA1MTE3WhcNNDEx
+						MTExMTA1MTE3WjCBtTELMAkGA1UEBhMCR0IxGDAWBgNVBAgTD05vdHRpbmdoYW1z
+						aGlyZTETMBEGA1UEBxMKTm90dGluZ2hhbTEiMCAGA1UEChMZQ2FsbCBGb3IgUGFy
+						dGljaXBhbnRzIEx0ZDEgMB4GA1UEAxMXY2FsbGZvcnBhcnRpY2lwYW50cy5jb20x
+						MTAvBgkqhkiG9w0BCQEWIml0LXN1cHBvcnRAY2FsbGZvcnBhcnRpY2lwYW50cy5j
+						b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwB5uFFfe8R6HSW2xm
+						LiFIvRAAhMNEG/xxc8fNqXuI6WpF0bvwruLfxapJtcQoBHW1j7LDcFU+FHH8Xwsx
+						DcFCMTTa04ynMTOBi+/+9jLfCGIedmkinPyYB80rowsYLP7ReCYHYRoe1heJXzei
+						3rcK+iA5SHqLoyrw7nNeW0WdEwd7KkEAUSn8iLQSRXgF6SV+f7T8a2ZeV4ImL8vl
+						lMeZtkhIiLGhmtoJUulsg/7Mcd6ZrzYtXo9/0ZKUERlhZKVr/8r8tY7Bvk7rvUbS
+						TaUG3WCnJBXYlUL5U2OpmujSs26o53KgVXYEIfjGW+a2lPon6veJAz7BP+hnaG0h
+						8UZHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAB4vASnaNIhyQSXPJCiX8MJpMOeI
+						S3YB23NXLSHopT0jjOyl5pUegl0BeIgCtwMzp2uWVR7LfbsOwGGuSGN1xsCs9C9C
+						B2eTpaMh7z7LM9CVQPMeHhJ/FWEhm5GbvvtiXOVNKSFc7Sr2ZLPZBtBHCvO1IyJh
+						Ww4pWyqV6FzcB5DLDneqYudz2coG24Mjiwd51bWnMwrK1P2DyqO+GgWRnamNbaSB
+						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>
+						MIID6DCCAtACCQCgXYYpGzPTKTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
+						R0IxGDAWBgNVBAgTD05vdHRpbmdoYW1zaGlyZTETMBEGA1UEBxMKTm90dGluZ2hh
+						bTEiMCAGA1UEChMZQ2FsbCBGb3IgUGFydGljaXBhbnRzIEx0ZDEgMB4GA1UEAxMX
+						Y2FsbGZvcnBhcnRpY2lwYW50cy5jb20xMTAvBgkqhkiG9w0BCQEWIml0LXN1cHBv
+						cnRAY2FsbGZvcnBhcnRpY2lwYW50cy5jb20wHhcNMTQwNjI3MTA1MTE3WhcNNDEx
+						MTExMTA1MTE3WjCBtTELMAkGA1UEBhMCR0IxGDAWBgNVBAgTD05vdHRpbmdoYW1z
+						aGlyZTETMBEGA1UEBxMKTm90dGluZ2hhbTEiMCAGA1UEChMZQ2FsbCBGb3IgUGFy
+						dGljaXBhbnRzIEx0ZDEgMB4GA1UEAxMXY2FsbGZvcnBhcnRpY2lwYW50cy5jb20x
+						MTAvBgkqhkiG9w0BCQEWIml0LXN1cHBvcnRAY2FsbGZvcnBhcnRpY2lwYW50cy5j
+						b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwB5uFFfe8R6HSW2xm
+						LiFIvRAAhMNEG/xxc8fNqXuI6WpF0bvwruLfxapJtcQoBHW1j7LDcFU+FHH8Xwsx
+						DcFCMTTa04ynMTOBi+/+9jLfCGIedmkinPyYB80rowsYLP7ReCYHYRoe1heJXzei
+						3rcK+iA5SHqLoyrw7nNeW0WdEwd7KkEAUSn8iLQSRXgF6SV+f7T8a2ZeV4ImL8vl
+						lMeZtkhIiLGhmtoJUulsg/7Mcd6ZrzYtXo9/0ZKUERlhZKVr/8r8tY7Bvk7rvUbS
+						TaUG3WCnJBXYlUL5U2OpmujSs26o53KgVXYEIfjGW+a2lPon6veJAz7BP+hnaG0h
+						8UZHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAB4vASnaNIhyQSXPJCiX8MJpMOeI
+						S3YB23NXLSHopT0jjOyl5pUegl0BeIgCtwMzp2uWVR7LfbsOwGGuSGN1xsCs9C9C
+						B2eTpaMh7z7LM9CVQPMeHhJ/FWEhm5GbvvtiXOVNKSFc7Sr2ZLPZBtBHCvO1IyJh
+						Ww4pWyqV6FzcB5DLDneqYudz2coG24Mjiwd51bWnMwrK1P2DyqO+GgWRnamNbaSB
+						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>
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
new file mode 100644
index 00000000..32885a92
--- /dev/null
+++ b/swamid-interfederations-2.0/www.cans.org.uk-shibboleth-sp.xml
@@ -0,0 +1,64 @@
+<?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>
+    <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>
+      <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>
+						MIIDPzCCAiegAwIBAgIJALDeNSvqu4X6MA0GCSqGSIb3DQEBBQUAMDMxMTAvBgNV
+						BAMTKHdlYnN0YXJzLWNhbnMuc2VydmVycy5yYmwtbWVyLm1pc3AuY28udWswHhcN
+						MTEwNzI1MjAyMjI2WhcNMjEwNzIyMjAyMjI2WjAzMTEwLwYDVQQDEyh3ZWJzdGFy
+						cy1jYW5zLnNlcnZlcnMucmJsLW1lci5taXNwLmNvLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEA0UhAljwZVOdU7bOCYe+ZQrhWqePftNspOCkP0HP7
+						r0++0yD+HQUaAHEU1drhm8tXlNfKoFTHlBk6w9fbC45auasz093CgjNNYO5jsgZ4
+						E7IQ59PaGlDSE80jKugD0+ZQGAsSQEzTDlOX8yKJ8hbbbAf1zuaIznH8u3kc8RkB
+						HCXPLWAxCcqgKLh4188SeeZXUewn8uNqR6GGgdOcaPmLdrgKLJ/+mDPtkLAB6pvm
+						TQYGdwkHbVnggtCUk8GPQHHJ3HnrY6hGTxm/bkVeABXeVXZAKPTAgOk5UFzqUwLR
+						Xd7W89PavWoYNlG2Uhq8X/n3h9+9XA6ldR4tSSN5e38HswIDAQABo1YwVDAzBgNV
+						HREELDAqgih3ZWJzdGFycy1jYW5zLnNlcnZlcnMucmJsLW1lci5taXNwLmNvLnVr
+						MB0GA1UdDgQWBBTqtW8nIPlLZA2OyhfmRhZW5jR/mjANBgkqhkiG9w0BAQUFAAOC
+						AQEApfwxvHulgw7+D+XvhgxEoViwpHd6Z8JhWgnsbt0JiRwDwWEzhhsM9QEF4gZM
+						5ZdL56yL3ATZ4j5uFiZcBF2Kv2yOufbI2OkBM6rjV4+NBFReAGS0ugZs49SZ5V1U
+						XBxeX5vL1uuHjzJbvvwQr4ton7p4qeSO6duJkiCI5XIPrf4NXodla711SuM3q+L4
+						zLpI8uIaKJwCnsIMeJm0pj2zojM7SVOPUYEtpAuxb6gBSeSB9IYttVjKn0USpthC
+						0WyK0Tt3t/i0LHeIbcaOpcPdnjr/x7Dg8/9X1DRfpJMDK5UogWENLgN9fz0SdqDp
+						ubozEJC8LUak3g0570yFN0h++A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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="0"/>
+    <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="0"/>
+    <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="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cans.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cans.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cans.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cans.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </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
new file mode 100644
index 00000000..3c3c0606
--- /dev/null
+++ b/swamid-interfederations-2.0/www.cardiffmetsu.co.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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> 
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.cardiffstudents.com-shibboleth.xml b/swamid-interfederations-2.0/www.cardiffstudents.com-shibboleth.xml
new file mode 100644
index 00000000..4712ef69
--- /dev/null
+++ b/swamid-interfederations-2.0/www.cardiffstudents.com-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
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
new file mode 100644
index 00000000..adee114d
--- /dev/null
+++ b/swamid-interfederations-2.0/www.careers.lon.ac.uk-democareerstagged-shibboleth.xml
@@ -0,0 +1,94 @@
+<?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>
+      <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>
+						MIIDGDCCAgCgAwIBAgIJAJPY5z7XWwecMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG3RjZy13ZWIxLnVuaXZlcnNlLmxvbi5hYy51azAeFw0xMzA2MjAwNzUwMjFa
+						Fw0yMzA2MTgwNzUwMjFaMCYxJDAiBgNVBAMTG3RjZy13ZWIxLnVuaXZlcnNlLmxv
+						bi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVPfarGmlNH
+						byNDjzAe8EaEy8kSPir6g14yBFx2wavVMvILMvvsdudXIPrDVzwjHNyvnsx5bK1Z
+						0TMzbOcv9tWJQWEnG54xkJOBneYzkZKcZOrJ58rDgNhjhdexOdzq9Ic5e19aBpCh
+						4kjHgUepgniO4CjAFlDeT3ThQU7Q1STPUgL4htN+TgqAKyRB/ilMZnUsWSHccEch
+						SscRHfOXBOUGl/SGYzptObMwFkgcc0kC3tM56+z3NQKNc/ZarHzUC/eCZMSKbOXM
+						JKKvf2oQa9z7eTt2Z6p4Esm2DC7L7d71kh3BVGWJ9FljMnFGIeXWWxpP19atSmBX
+						pIl9oytWqpsCAwEAAaNJMEcwJgYDVR0RBB8wHYIbdGNnLXdlYjEudW5pdmVyc2Uu
+						bG9uLmFjLnVrMB0GA1UdDgQWBBT7n0r/QCgVlX57qNrTb+YZIY1IVzANBgkqhkiG
+						9w0BAQUFAAOCAQEArbtu3ISAd2Mx+c1X4xlHRxzc2dwVAQLlF+zLpu5/lK4hLc/+
+						A8unPMGchiAFx95lkmbVgOIIkixQHLyCs5dNa+Ml0iCAoHwBRPffCQuj5S9NBwt/
+						UqADrDkfc0+zmBJXNE89/ucvWYlryDVz5ogDlBfkUya9KNL/QFW2eh6U2ucnBhJA
+						uf1LxIE8rMHJ2q8owx+0AfzltZLjJfIUTu70QJngcQEXCDVasX5hc66c/w3RJHSe
+						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>
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
new file mode 100644
index 00000000..413b9e92
--- /dev/null
+++ b/swamid-interfederations-2.0/www.careers.lon.ac.uk-thecareersgroup-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+      <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>
+						MIIDITCCAgmgAwIBAgIJAKcSnujgFBigMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+						BAMTHnRjZy13ZWIwMS5jYXJlZXJzLmxvbmRvbi5hYy51azAeFw0xNDA0MjkxNTA3
+						NDFaFw0yNDA0MjYxNTA3NDFaMCkxJzAlBgNVBAMTHnRjZy13ZWIwMS5jYXJlZXJz
+						LmxvbmRvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ0W
+						poEfm842a/7+ehVrbjNkY9Zs8jowF606BEqmvGUPnGRi2YPqbDNUlK/qz4/kS5xE
+						UagpIqjiL+ZJjMXZgqyUWphA8WcnfYTRavJuqbpn09BCj7fxB0QUP4MpMk1zMeVE
+						s2TuYpPUil/gNnQMBBC0vusBbclINRZ+53RA1uwTdz9gjyG8BxhJRn4pY25u41qu
+						WIFnEEZcr+mLTLN3eUEn3me+vf26HtkEBUPM+ULe2oie2tpLVvSUN3i4A30GBpcA
+						dYxlv8SC/o3oTzMvEYsdfAOi6x+3JOukveVXTF/Kgo1GLKMyiCa6C0S7sVUk07ml
+						I01jehQP4YgCc3cBNRECAwEAAaNMMEowKQYDVR0RBCIwIIIedGNnLXdlYjAxLmNh
+						cmVlcnMubG9uZG9uLmFjLnVrMB0GA1UdDgQWBBSp/LCOlFdBmbRsT+pO/N3DB2Qs
+						PjANBgkqhkiG9w0BAQUFAAOCAQEAjjzOjBN8kPmSVlNYudkkELYAz4goTXNgWK0q
+						QwbMAS37kFBS1SWUVz/IHpz6I14LmjPCg/1eyjVI/ePjXmT9pZ0TL7tPAn1iesdj
+						1aPnHblUul47Y1Fbpcg8wRXKZ2pIMe2Jt8H/UgsvvOi/9AA8xIzvrmJc1fiTjCG7
+						03KWg/hUdiKDV1QQV9s46WTyJhgyALIQ1zArJVFa8k+SPkTwIr7UsWFVAkmXDBMS
+						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>
diff --git a/swamid-interfederations-2.0/www.careers.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.careers.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..107f8979
--- /dev/null
+++ b/swamid-interfederations-2.0/www.careers.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-28T11:49: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.careers.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>
+						MIIDKzCCAhOgAwIBAgIJAKLT36LHYvclMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGmNhcy13ZWJzZXJ2ZXIuY2FzLm94LmFjLnVrMB4XDTE0MTAyMzE1NTAyN1oX
+						DTI0MTAyMDE1NTAyN1owJTEjMCEGA1UEAxMaY2FzLXdlYnNlcnZlci5jYXMub3gu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDR6Q04iL3jR3oU
+						sySnZ5F9DDseuV33hBS8/meYFa6vxWg//bvdZSkPfrUvmCKuPOJOJR+c+hIcgE7n
+						j6SX2OikmV9ffX/Hf7rmmShhE7KsuRI+u7DVhuWAhth5SPsJ58HChIcgOVzaG/Y8
+						TBfcFOGwT9PsJfM21yKexx4r7F85ghg/bRxWzrYtt9V8iH/9GkhvTG52/3/H4r0E
+						djx5cjWGWHpAoOI4cpocD2fD+hrhVfddlQbnoIrJXYAr/mnOFsCe9EXWz3yHajiV
+						6BNiZ7YQ8bksb0Fs+04lOJJTA+bl6fU6jHu27lPoTuFjjSbjP5DmODYZcVReZtpV
+						BIxaVyEbAgMBAAGjXjBcMDsGA1UdEQQ0MDKCGmNhcy13ZWJzZXJ2ZXIuY2FzLm94
+						LmFjLnVrhhR3d3cuY2FyZWVycy5veC5hYy51azAdBgNVHQ4EFgQUOp4S1i97HslI
+						CAvETjdX3hklGtMwDQYJKoZIhvcNAQEFBQADggEBAAE3mAzXIYYSJn603hy8TDIx
+						sV9fKNzxTIHZZyTTRNeA2drgoqSJcu4uK1kZNblf2C/O9Y1ndi9hzDQ2hUYiP6lH
+						5ItyjgTs70MTtrTOjaD//oUzk3RH+7dYxLbky+WqBE3atuO6LU5wbUF7ro41G2ga
+						6KayOZG6xXWvvh5/1+tU6/GlM29DX+gxkitTzqsd0YXFzrHFJTUPSVqbeAx36vqY
+						4BDB+eW3lvRBh9PwS12hOhFKU2o0cyHylBLUNVCxVvyTt1QSib4B1zsAp6vYYfr8
+						VliUnZa2BBl0uf4sXtVfg1iRvgVWE584lqdBCYW8k8Y/7R0MsCc8A+73HqrsnV8=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.careers.ox.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.careers.ox.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.careers.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - The Careers Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.careers.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@careers.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@careers.ox.ac.uk</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
new file mode 100644
index 00000000..b4f65981
--- /dev/null
+++ b/swamid-interfederations-2.0/www.cartoons.ac.uk-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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.cartoons.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>
+      <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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIICzjCCAbagAwIBAgIBADANBgkqhkiG9w0BAQUFADAQMQ4wDAYDVQQDEwVjd3d3
+						MTAeFw0xMDAyMjMxNjExMzVaFw0yMDAyMjExNjExMzVaMBAxDjAMBgNVBAMTBWN3
+						d3cxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwMqCZUo+LIGMYOD5
+						RIfyspWlagIPIp81zGdqqM1rIEpM95QLHfssoJXY69P/Iojfdb/x8K3GJ+nWQNoe
+						CANW8N5JRnZl+jKYqUcFMFUgxKmuccO/2zSiu9M8ad+fOgtm6wWWJq9F9yefYAuT
+						RE+k9thXcilCIY681eBEuHdI1hjvldVXV+P61cdJp3L4WmjD2f7GR6TurFe1P94x
+						pFsTYGptvxWPTp6w8g/WEdGi+UAmqYoKdBRv1rNLuiYOoRnlhDp9+CvPrOdBTijI
+						GFqXlq/w0MaAIIJgZPgJTjFKrzN3rt/5dv3SDDfzhduoE5ox8WPZmNm21cIhCokF
+						jv/8kwIDAQABozMwMTAQBgNVHREECTAHggVjd3d3MTAdBgNVHQ4EFgQU7CyjvMqG
+						8d2QhxGXK+Xbt8Ppb2MwDQYJKoZIhvcNAQEFBQADggEBAAONU7dbP1sXpO9fIHn6
+						rYjQ1g5z8qoBHYGWnjJI6bnY687kxC6j4lGZ/aK2fhWSlXZet/Vazmhy8ZC2I8TI
+						sg+YUsVBdgnFGZQXZtD/4I/Fn2pjFRfathgbsIll1nKOcJJApxXKYXimNcRHPbpo
+						2IT6jesMavssckqXL+yrs+/Y93zD3LsKpv4JqCXlnd++WsQTrWiqfrlV2hUbeoj/
+						hQORVPgsCNo4frw2GhEgMf7x+2ExtEU2YOGoshYn2LgR8wSFVu4SqHOvUFXvpibY
+						ME7Ylv10JKK8LtZy3SD0t9MmDQewAgi5hIH4UbXYXx3mNGcidUnc42Due57YgYE2
+						DXY=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIICzjCCAbagAwIBAgIBADANBgkqhkiG9w0BAQUFADAQMQ4wDAYDVQQDEwVjd3d3
+						MTAeFw0xMDAyMjMxNjExMzVaFw0yMDAyMjExNjExMzVaMBAxDjAMBgNVBAMTBWN3
+						d3cxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwMqCZUo+LIGMYOD5
+						RIfyspWlagIPIp81zGdqqM1rIEpM95QLHfssoJXY69P/Iojfdb/x8K3GJ+nWQNoe
+						CANW8N5JRnZl+jKYqUcFMFUgxKmuccO/2zSiu9M8ad+fOgtm6wWWJq9F9yefYAuT
+						RE+k9thXcilCIY681eBEuHdI1hjvldVXV+P61cdJp3L4WmjD2f7GR6TurFe1P94x
+						pFsTYGptvxWPTp6w8g/WEdGi+UAmqYoKdBRv1rNLuiYOoRnlhDp9+CvPrOdBTijI
+						GFqXlq/w0MaAIIJgZPgJTjFKrzN3rt/5dv3SDDfzhduoE5ox8WPZmNm21cIhCokF
+						jv/8kwIDAQABozMwMTAQBgNVHREECTAHggVjd3d3MTAdBgNVHQ4EFgQU7CyjvMqG
+						8d2QhxGXK+Xbt8Ppb2MwDQYJKoZIhvcNAQEFBQADggEBAAONU7dbP1sXpO9fIHn6
+						rYjQ1g5z8qoBHYGWnjJI6bnY687kxC6j4lGZ/aK2fhWSlXZet/Vazmhy8ZC2I8TI
+						sg+YUsVBdgnFGZQXZtD/4I/Fn2pjFRfathgbsIll1nKOcJJApxXKYXimNcRHPbpo
+						2IT6jesMavssckqXL+yrs+/Y93zD3LsKpv4JqCXlnd++WsQTrWiqfrlV2hUbeoj/
+						hQORVPgsCNo4frw2GhEgMf7x+2ExtEU2YOGoshYn2LgR8wSFVu4SqHOvUFXvpibY
+						ME7Ylv10JKK8LtZy3SD0t9MmDQewAgi5hIH4UbXYXx3mNGcidUnc42Due57YgYE2
+						DXY=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..ae2b7b8d
--- /dev/null
+++ b/swamid-interfederations-2.0/www.ccinform.co.uk-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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>
+						MIIDZTCCAk2gAwIBAgIJAKKRPRBvWSX/MA0GCSqGSIb3DQEBBQUAMEkxKjAoBgNV
+						BAoMIVJlZWQgQnVzaW5lc3MgSW5mb3JtYXRpb24gTGltaXRlZDEbMBkGA1UEAwwS
+						d3d3LmNjaW5mb3JtLmNvLnVrMB4XDTEzMDkyNjEzNTY1N1oXDTIzMDkyNDEzNTY1
+						N1owSTEqMCgGA1UECgwhUmVlZCBCdXNpbmVzcyBJbmZvcm1hdGlvbiBMaW1pdGVk
+						MRswGQYDVQQDDBJ3d3cuY2NpbmZvcm0uY28udWswggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQCiSfdM8paAx3KGFEkvIiJmFArz//0sKDgaaXY3vZVd6Stp
+						9LZffRwcJvn6bk8uLYysQt8PZW6kOTiixg3bDCVZMEzt2bq4y8evv0ewOFD3Vjc9
+						wOSor5sP3TpY4F+qzbJrpEbl+iv2JPZ+SjUnpmAdc0VRi1ZnjaSqhfu/qZ75Cri6
+						k6HMxtWxn7vXD8blFpYca2QRplBQWPYuCFNzzzXgjiImJWCYMGsVt79rbg92OV4p
+						3TcCoPzZUzLrhrSjfO348jWYURQQ9xKq6kXeF28CJ9p2FU2y/gcdrihgwaphI9pf
+						AFcoTpW2DpUXY/IYePqbTX0WmStxScXvu2/iCbnjAgMBAAGjUDBOMB0GA1UdDgQW
+						BBRAUKgdenTd14XFc5yK+VGRJ8kdoTAfBgNVHSMEGDAWgBRAUKgdenTd14XFc5yK
+						+VGRJ8kdoTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCMyWIX9ktw
+						4r/H9lNuRYQupri7ms/5DxbzXqYQVXIMwFMSeoo1flg6QtBvNcP7sKSlnZMQ4GDP
+						lVuzhS689QFBfFQjTrAoa+R+I48ko9gGkiNf34aQ4pla6ACZ57TpkGgwQWDbGGVs
+						aPIvsdzLALl3jcqTX7IGDYodV7EJAX/lBkq+9WKVHcNQRzf8UhTC+K7KUDJKtA43
+						VEcVnYm5fLKRJbNk4QV62rEk7/fH1bmIVU9Sw3Uh+atVV0hO9pjM0nySYpp87QIA
+						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>Kim</md:GivenName>
+    <md:SurName>Poupart</md:SurName>
+    <md:EmailAddress>mailto:Kim.poupart@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Gale</md:SurName>
+    <md:EmailAddress>mailto:mark.gale@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Farr</md:SurName>
+    <md:EmailAddress>mailto:Andrew.Farr@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
new file mode 100644
index 00000000..3006e2e2
--- /dev/null
+++ b/swamid-interfederations-2.0/www.childlink.co.uk-shibboleth.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.childlink.co.uk/shibboleth">
+  <md:Extensions>
+    <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>
+      <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>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC/DCCAeQCCQCh6QBQgqGHfDANBgkqhkiG9w0BAQUFADBAMQswCQYDVQQGEwJH
+						QjETMBEGA1UEChMKQ2hpbGQgTGluazEcMBoGA1UEAxMTd3d3LmNoaWxkbGluay5j
+						by51azAeFw0xNDA0MTAxMDExMDlaFw0zNDA0MDUxMDExMDlaMEAxCzAJBgNVBAYT
+						AkdCMRMwEQYDVQQKEwpDaGlsZCBMaW5rMRwwGgYDVQQDExN3d3cuY2hpbGRsaW5r
+						LmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs4Z92m8/+i1t
+						2UfQc99uMI8HNlYLHtu5gR1TtvsOSQG+SBtQmB2NkpxyVL3XkasTRPT0knwWTxgu
+						TTLDuCVDeL9lr2t1DF9tCCXJWy1jCWxrcn3tUhwAV6ki4cIPmGrv+voKyAt4eY7m
+						wTYLD0QRQ8qYcIHd1m1kP7PEiHy3Tejd3ZoeWYRCiko0HDLGW9PTAZAniSQAWPRT
+						KhuiLHOOA1SRnk+EkoDAZzV9PcpzGayhIKDH3asqpi06asAbU1wfmZBL9Yxh+QHv
+						SK8l3ZI91SN78024wp5kTeIaulsY84XgQyFgxXtRaAehGko/sfMS09yBBDHHS/fl
+						5z0lm/QOZwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBLvSfOj2ehKrEGA+lzNXwx
+						S9gc8jORwmN8Q1jBqdO3URMbmY8d9kgX+qYoNHKuDv3dhMQzqmcbPnH8lVpd8JSr
+						C77QYlULzeRgLQm7CVxnafMTUFyLjNrH5OGj+FixSjAaajxPjO2dV2D7d4sglvRG
+						KBupx5dqhqaAaMS01tXMRcHWylHkg1/UWxhunnVDs8vAzKhGOF1SvdRG8jB3zuJa
+						nKVEi4fGw65i9apDSYscpk2Kvyeu89/UGTq1N3UZdZqkIMgr/Y9TZL5w+n4kl1aN
+						T58weS7Nep9P2UuLPrDhrbAGb0fT0LHFBkeMy2Z8/5JH5HRqCt60B9Z0Xtz7/Fyh
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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.chinaclubhq.com-entity.xml b/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml
new file mode 100644
index 00000000..3c8b0115
--- /dev/null
+++ b/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.chinaclubhq.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:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSDCCAjACCQDTBID4Eqw+IzANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
+						QjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxFDASBgNVBAoT
+						C0NoaW5hQ2x1YkhRMRwwGgYDVQQDExN3d3cuY2hpbmFjbHViaHEuY29tMB4XDTEw
+						MDQyMjE5MTUzNloXDTIwMDQxOTE5MTUzNlowZjELMAkGA1UEBhMCR0IxETAPBgNV
+						BAgTCFNjb3RsYW5kMRAwDgYDVQQHEwdHbGFzZ293MRQwEgYDVQQKEwtDaGluYUNs
+						dWJIUTEcMBoGA1UEAxMTd3d3LmNoaW5hY2x1YmhxLmNvbTCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBANdpg+XIGnOtjrFhtXN/rird61Wa27r+U248wWyU
+						Ug/2Ky8Lr72eC0L20ORbwcsRVsXRaac1cQCV+lr8o8PM8sHhMv9Q7KCbn2HsHMwd
+						gdk+BjmH5ZyYEAZxgjEgqfpMpVdEVzlxzntwlLjyqziXFhFXxBirtFHgsi6Kto3c
+						/SwS56jT3Yt01kqwiLi+jaXlAJ+2zHsWc/HG0jWR8eRXcGvGtvPpNCHHA5Yv93wH
+						OyIG6vd9uJaL1dk6cWzWQrV4JhB6qorWzY01NboRaafTQFnh1LbWkoJN9zQWQJA+
+						0H4iOs/lwEaktc1x9VGlEgV94gZ0cty0OGUB1CjXEO8FWYECAwEAATANBgkqhkiG
+						9w0BAQUFAAOCAQEAiKNnZFMygZp36olHU6mebTi2CTFXSNR2RsnvLYjwM0JxxS7o
+						z2/fAq19V7BNrDHuJ26neeJ7Js8Pjl7dDPqBPaTlW1lph/QlLk7jbnmt+cPXHTk5
+						0Mh9F2YvufWb3DQs4ZvWOPWzW2kZ5AOYLxD37gwlnFjpyRLBMPqVxoDlXJ0GWuPI
+						O2bM3y5fBwbYlK6St9lwVBhTIzbfnnXitpg9Qmimlmj+jTsjqbzBk9n15zteIxz7
+						pg8iwBXfG3LGb7WrogiKUlwhhLC3VxvgJoot65ZmSL7xmxPC+Av9zCA5NxmiYvaW
+						Bwu7XKdd6JJuG9RviWxFRAH/3lllp8XqjrcTqg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSDCCAjACCQDTBID4Eqw+IzANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
+						QjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxFDASBgNVBAoT
+						C0NoaW5hQ2x1YkhRMRwwGgYDVQQDExN3d3cuY2hpbmFjbHViaHEuY29tMB4XDTEw
+						MDQyMjE5MTUzNloXDTIwMDQxOTE5MTUzNlowZjELMAkGA1UEBhMCR0IxETAPBgNV
+						BAgTCFNjb3RsYW5kMRAwDgYDVQQHEwdHbGFzZ293MRQwEgYDVQQKEwtDaGluYUNs
+						dWJIUTEcMBoGA1UEAxMTd3d3LmNoaW5hY2x1YmhxLmNvbTCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBANdpg+XIGnOtjrFhtXN/rird61Wa27r+U248wWyU
+						Ug/2Ky8Lr72eC0L20ORbwcsRVsXRaac1cQCV+lr8o8PM8sHhMv9Q7KCbn2HsHMwd
+						gdk+BjmH5ZyYEAZxgjEgqfpMpVdEVzlxzntwlLjyqziXFhFXxBirtFHgsi6Kto3c
+						/SwS56jT3Yt01kqwiLi+jaXlAJ+2zHsWc/HG0jWR8eRXcGvGtvPpNCHHA5Yv93wH
+						OyIG6vd9uJaL1dk6cWzWQrV4JhB6qorWzY01NboRaafTQFnh1LbWkoJN9zQWQJA+
+						0H4iOs/lwEaktc1x9VGlEgV94gZ0cty0OGUB1CjXEO8FWYECAwEAATANBgkqhkiG
+						9w0BAQUFAAOCAQEAiKNnZFMygZp36olHU6mebTi2CTFXSNR2RsnvLYjwM0JxxS7o
+						z2/fAq19V7BNrDHuJ26neeJ7Js8Pjl7dDPqBPaTlW1lph/QlLk7jbnmt+cPXHTk5
+						0Mh9F2YvufWb3DQs4ZvWOPWzW2kZ5AOYLxD37gwlnFjpyRLBMPqVxoDlXJ0GWuPI
+						O2bM3y5fBwbYlK6St9lwVBhTIzbfnnXitpg9Qmimlmj+jTsjqbzBk9n15zteIxz7
+						pg8iwBXfG3LGb7WrogiKUlwhhLC3VxvgJoot65ZmSL7xmxPC+Av9zCA5NxmiYvaW
+						Bwu7XKdd6JJuG9RviWxFRAH/3lllp8XqjrcTqg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.chinaclubhq.com/joomla/components/com_idemauth/simplesamlphp/www/saml2/sp/SingleLogoutService.php"/>
+    <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.chinaclubhq.com/joomla/components/com_idemauth/simplesamlphp/www/saml2/sp/AssertionConsumerService.php" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">World Club HQ Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">World Club HQ</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ukclubhq.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Colin</md:GivenName>
+    <md:SurName>Maclean</md:SurName>
+    <md:EmailAddress>mailto:colin@chinaclubhq.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Colin</md:GivenName>
+    <md:SurName>Maclean</md:SurName>
+    <md:EmailAddress>mailto:colin@chinaclubhq.com</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
new file mode 100644
index 00000000..b8843fc1
--- /dev/null
+++ b/swamid-interfederations-2.0/www.climatescience.cam.ac.uk-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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>
+      <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>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						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>
diff --git a/swamid-interfederations-2.0/www.clinicalskills.net-oa-metadata.xml b/swamid-interfederations-2.0/www.clinicalskills.net-oa-metadata.xml
new file mode 100644
index 00000000..d17d8b1c
--- /dev/null
+++ b/swamid-interfederations-2.0/www.clinicalskills.net-oa-metadata.xml
@@ -0,0 +1,91 @@
+<?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>
+      <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">Online reference guide to clinical skills and procedures, used to support training and education in universities and NHS trusts. It is highly illustrated, regularly updated to include newly published guidance, and contains hundreds of links to allow users to read around the subject in depth.</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>
+						MIIDlzCCAn+gAwIBAgIJAII5hEvc9GZvMA0GCSqGSIb3DQEBBQUAMDsxGDAWBgNV
+						BAoTD0NsaW5pY2FsIFNraWxsczEfMB0GA1UEAxMWd3d3LmNsaW5pY2Fsc2tpbGxz
+						Lm5ldDAeFw0xNDAyMTQxMjE0NTRaFw0yNDAyMTIxMjE0NTRaMDsxGDAWBgNVBAoT
+						D0NsaW5pY2FsIFNraWxsczEfMB0GA1UEAxMWd3d3LmNsaW5pY2Fsc2tpbGxzLm5l
+						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOkuFOB7vIDqq7M0w62M
+						ONAq6Pr9vRJJyNIHbcdZAw2MKNQJw7FE+R7X6VKFu2qFdBYeVnjzWI0vQnyLA5wv
+						nt96HJwCBvM+1cfqnIGvdgmhelHAvK/ZPP17fZ2euJtML7HrlQ3nxCs6OxsO6n+1
+						9hF+xS+eki8WzNdLG0HDAcFdr1ys+HF0Hu/C/D5YOWeNTzuFL7pdazwgfvIyUbT1
+						fBPpT//QO1M9RBWoivgwoF7kXfy0hysomP7PlLgPkQDyzszjm2fAprfoLLQcr9ax
+						L75Jnr0wOb6lCSoOe22HwCpUMQitkZr3IiUStBXBBrvyTra52eobk1ngR+/BqCvq
+						FPECAwEAAaOBnTCBmjAdBgNVHQ4EFgQUf6p5SckCilLUUD767uUSvCdeBIUwawYD
+						VR0jBGQwYoAUf6p5SckCilLUUD767uUSvCdeBIWhP6Q9MDsxGDAWBgNVBAoTD0Ns
+						aW5pY2FsIFNraWxsczEfMB0GA1UEAxMWd3d3LmNsaW5pY2Fsc2tpbGxzLm5ldIIJ
+						AII5hEvc9GZvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAF46NcyG
+						Y50s/QaVVJDN7SeqlOjZyRA80a/jCh+6lqC4ngyJQG92ulmbLI2GrvVfuz9Fe2OX
+						XczWMCKqub3g54Vg3gOBu9dH2foHh21HTL3gE6rw2bblnllS89y7zMGw0V49Vgsl
+						V/MnBKRPejSISzFg2lqy0mTw72+hn5gV6Zk6DuHKqlhSKhSIFI/d5PTwmTXi64We
+						zdifZjWM3w7Cif7N2GQMeNWlKfRUvjvqqEWeex/jGF6MWeVQSGCsA7GW9mC7/u5t
+						EWfSO8QIOMns+3i+UOqT6NIYIfLfUITfezCBSM4SyNnio5KT7batP3KA8sFqnt3c
+						6xopoim6k8K8AQI=
+					</ds:X509Certificate>
+        </ds: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+gAwIBAgIJAII5hEvc9GZvMA0GCSqGSIb3DQEBBQUAMDsxGDAWBgNV
+						BAoTD0NsaW5pY2FsIFNraWxsczEfMB0GA1UEAxMWd3d3LmNsaW5pY2Fsc2tpbGxz
+						Lm5ldDAeFw0xNDAyMTQxMjE0NTRaFw0yNDAyMTIxMjE0NTRaMDsxGDAWBgNVBAoT
+						D0NsaW5pY2FsIFNraWxsczEfMB0GA1UEAxMWd3d3LmNsaW5pY2Fsc2tpbGxzLm5l
+						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOkuFOB7vIDqq7M0w62M
+						ONAq6Pr9vRJJyNIHbcdZAw2MKNQJw7FE+R7X6VKFu2qFdBYeVnjzWI0vQnyLA5wv
+						nt96HJwCBvM+1cfqnIGvdgmhelHAvK/ZPP17fZ2euJtML7HrlQ3nxCs6OxsO6n+1
+						9hF+xS+eki8WzNdLG0HDAcFdr1ys+HF0Hu/C/D5YOWeNTzuFL7pdazwgfvIyUbT1
+						fBPpT//QO1M9RBWoivgwoF7kXfy0hysomP7PlLgPkQDyzszjm2fAprfoLLQcr9ax
+						L75Jnr0wOb6lCSoOe22HwCpUMQitkZr3IiUStBXBBrvyTra52eobk1ngR+/BqCvq
+						FPECAwEAAaOBnTCBmjAdBgNVHQ4EFgQUf6p5SckCilLUUD767uUSvCdeBIUwawYD
+						VR0jBGQwYoAUf6p5SckCilLUUD767uUSvCdeBIWhP6Q9MDsxGDAWBgNVBAoTD0Ns
+						aW5pY2FsIFNraWxsczEfMB0GA1UEAxMWd3d3LmNsaW5pY2Fsc2tpbGxzLm5ldIIJ
+						AII5hEvc9GZvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAF46NcyG
+						Y50s/QaVVJDN7SeqlOjZyRA80a/jCh+6lqC4ngyJQG92ulmbLI2GrvVfuz9Fe2OX
+						XczWMCKqub3g54Vg3gOBu9dH2foHh21HTL3gE6rw2bblnllS89y7zMGw0V49Vgsl
+						V/MnBKRPejSISzFg2lqy0mTw72+hn5gV6Zk6DuHKqlhSKhSIFI/d5PTwmTXi64We
+						zdifZjWM3w7Cif7N2GQMeNWlKfRUvjvqqEWeex/jGF6MWeVQSGCsA7GW9mC7/u5t
+						EWfSO8QIOMns+3i+UOqT6NIYIfLfUITfezCBSM4SyNnio5KT7batP3KA8sFqnt3c
+						6xopoim6k8K8AQI=
+					</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>
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
new file mode 100644
index 00000000..fe8e45fe
--- /dev/null
+++ b/swamid-interfederations-2.0/www.cnn.group.cam.ac.uk-shibboleth.xml
@@ -0,0 +1,67 @@
+<?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>
+    <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>
+      <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>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
+						RsenNm/aXp0wIU+jHVmi/GAPCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..8a9eb9f4
--- /dev/null
+++ b/swamid-interfederations-2.0/www.communistpartyarchive.org.uk-oa-metadata.xml
@@ -0,0 +1,85 @@
+<?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>
+						MIIDzTCCArWgAwIBAgIJANL2QbULh4NnMA0GCSqGSIb3DQEBBQUAME0xIDAeBgNV
+						BAoTF0NvbW11bmlzdCBQYXJ0eSBBcmNoaXZlMSkwJwYDVQQDEyB3d3cuY29tbXVu
+						aXN0cGFydHlhcmNoaXZlLm9yZy51azAeFw0xMjA4MDcwOTU2MzFaFw0yMjA4MDUw
+						OTU2MzFaME0xIDAeBgNVBAoTF0NvbW11bmlzdCBQYXJ0eSBBcmNoaXZlMSkwJwYD
+						VQQDEyB3d3cuY29tbXVuaXN0cGFydHlhcmNoaXZlLm9yZy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBALBBdaQ3L6V12/DE7TBeX3F0Rv/YwdXOqY2l
+						LmBKNpjlrUH5NgWV7SFNZ/M6FMujjpBxgJ6duJRYIqgUs8471krbW3ARi3GpX60G
+						wJWjfio4ZwDXv82o+Tafh6F936LwdU9AtswDcmA6MBiueV4s3cnoyY+pHBpzrxH4
+						LeSAUeCgTVHps1oaPMBc3/dIJMpPRGGkBI+e7P3k1529lVnX7qTKzr3QK+tcWCM4
+						b3WeievcKInQJZUJ96t2zoDfcISnorx/1bZ68dG7N49QYfPdz8HUM7Q26j6eoYg1
+						FaF2tYRk3YDLSmgxQ+MvWIouExSycBBmBvT7mlvQNpHdAhNEKZECAwEAAaOBrzCB
+						rDAdBgNVHQ4EFgQUEH2vsDmRr7SvveavUuqSeAT574gwfQYDVR0jBHYwdIAUEH2v
+						sDmRr7SvveavUuqSeAT574ihUaRPME0xIDAeBgNVBAoTF0NvbW11bmlzdCBQYXJ0
+						eSBBcmNoaXZlMSkwJwYDVQQDEyB3d3cuY29tbXVuaXN0cGFydHlhcmNoaXZlLm9y
+						Zy51a4IJANL2QbULh4NnMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+						ADvVdVP4IMEvIyT3VW7715A78q2eaXGr8HaXy2UP3fyJtauR7P7A4t2lBKpsTNwK
+						dP0JYNIF/iavfD4KElg4z0egQb3tAK5AG2m4AE3Iei9wQKhO38kU/nCYS1MnrD/Y
+						oQikQE0EXee0I4hj9jZUeHtJphigNEtiIRZ/cKXpvRxDZudiklCf+Y/uKXbB4B5R
+						wgs2lGyckw7YMMheECpuSI7zVyls4pQP3iczc3dO8hQvVHIT10CeKgSeVyr2KvME
+						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>
+						MIIDzTCCArWgAwIBAgIJANL2QbULh4NnMA0GCSqGSIb3DQEBBQUAME0xIDAeBgNV
+						BAoTF0NvbW11bmlzdCBQYXJ0eSBBcmNoaXZlMSkwJwYDVQQDEyB3d3cuY29tbXVu
+						aXN0cGFydHlhcmNoaXZlLm9yZy51azAeFw0xMjA4MDcwOTU2MzFaFw0yMjA4MDUw
+						OTU2MzFaME0xIDAeBgNVBAoTF0NvbW11bmlzdCBQYXJ0eSBBcmNoaXZlMSkwJwYD
+						VQQDEyB3d3cuY29tbXVuaXN0cGFydHlhcmNoaXZlLm9yZy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBALBBdaQ3L6V12/DE7TBeX3F0Rv/YwdXOqY2l
+						LmBKNpjlrUH5NgWV7SFNZ/M6FMujjpBxgJ6duJRYIqgUs8471krbW3ARi3GpX60G
+						wJWjfio4ZwDXv82o+Tafh6F936LwdU9AtswDcmA6MBiueV4s3cnoyY+pHBpzrxH4
+						LeSAUeCgTVHps1oaPMBc3/dIJMpPRGGkBI+e7P3k1529lVnX7qTKzr3QK+tcWCM4
+						b3WeievcKInQJZUJ96t2zoDfcISnorx/1bZ68dG7N49QYfPdz8HUM7Q26j6eoYg1
+						FaF2tYRk3YDLSmgxQ+MvWIouExSycBBmBvT7mlvQNpHdAhNEKZECAwEAAaOBrzCB
+						rDAdBgNVHQ4EFgQUEH2vsDmRr7SvveavUuqSeAT574gwfQYDVR0jBHYwdIAUEH2v
+						sDmRr7SvveavUuqSeAT574ihUaRPME0xIDAeBgNVBAoTF0NvbW11bmlzdCBQYXJ0
+						eSBBcmNoaXZlMSkwJwYDVQQDEyB3d3cuY29tbXVuaXN0cGFydHlhcmNoaXZlLm9y
+						Zy51a4IJANL2QbULh4NnMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+						ADvVdVP4IMEvIyT3VW7715A78q2eaXGr8HaXy2UP3fyJtauR7P7A4t2lBKpsTNwK
+						dP0JYNIF/iavfD4KElg4z0egQb3tAK5AG2m4AE3Iei9wQKhO38kU/nCYS1MnrD/Y
+						oQikQE0EXee0I4hj9jZUeHtJphigNEtiIRZ/cKXpvRxDZudiklCf+Y/uKXbB4B5R
+						wgs2lGyckw7YMMheECpuSI7zVyls4pQP3iczc3dO8hQvVHIT10CeKgSeVyr2KvME
+						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>
diff --git a/swamid-interfederations-2.0/www.crcnetbase.com-shibboleth.xml b/swamid-interfederations-2.0/www.crcnetbase.com-shibboleth.xml
new file mode 100644
index 00000000..85f63864
--- /dev/null
+++ b/swamid-interfederations-2.0/www.crcnetbase.com-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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>
+						MIIEbjCCA1agAwIBAgIJANEyiht0lGz3MA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEfMB0GA1UEAxMWd3d3Lm1vcmdhbmNsYXlwb29sLmNv
+						bTEeMBwGCSqGSIb3DQEJARYPdmFrZUBhdHlwb24uY29tMB4XDTA5MDcyMzE4MjQz
+						M1oXDTE5MDcyMTE4MjQzM1owgbcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxp
+						Zm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEdMBsGA1UEChMUQXR5cG9uIFN5
+						c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR8wHQYD
+						VQQDExZ3d3cubW9yZ2FuY2xheXBvb2wuY29tMR4wHAYJKoZIhvcNAQkBFg92YWtl
+						QGF0eXBvbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1jZrb
+						EIm3NwRJ8SkkHkvjKSWe4vuqyfO1D1MAVZzy5FzSLOeup4qEyCDkwtzrN3vSYNa1
+						4qovhIs+Eeap6FXH3XkhzZluSn4rKM/IoetfcP74l99cIzn4xMZfknhk9NNnb2vE
+						L/dJSu/8LyGFxr2b8c5cdYzgFiN77peyf4kOYCMJhC5xYXogrtFlmzkhbk6CRK36
+						QELJmbcegneoglceycLwmunJvhbkIagouT/AFxm7m9FFR2AbGQ2m52DdCSJdY6Q/
+						+cRnIO3p3Jar0D+huhNPlTyH5XNw41kPH4WvQiYAq7j40cFEwYHU4hOrBkKrdLUz
+						hPjVz1iquFai4gY1AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
+						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSntSFOeKeT
+						NvcbAlIaG09llX2rAzAfBgNVHSMEGDAWgBSntSFOeKeTNvcbAlIaG09llX2rAzAN
+						BgkqhkiG9w0BAQUFAAOCAQEAQguA1fll3LnjT1NokQTeSc1gmZIlbD318j6SKojU
+						zDYXinKZtzK9T0t1e1BFlOnbPGN1Fu1VkGLuOp5Z5/AJqMJJ9hfSOTjtz99AUk20
+						Ojgsw76oZ5nwqvk2lxKregha/GIkT7nJp8ycuQVI1ahnh142BDrfuB5DFAcHvi1q
+						v3NXHQuorkykb0mBuduNW+Uvk2T7wiNzruCOpBJGZzJZw3/FNXGCb3MmtaJgf7Br
+						+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>
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
new file mode 100644
index 00000000..8ea65bbb
--- /dev/null
+++ b/swamid-interfederations-2.0/www.creativeclub.co.uk-shibboleth-sp.xml
@@ -0,0 +1,90 @@
+<?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>
+						MIIDMDCCAhigAwIBAgIJAJNBy2AlSZCeMA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
+						BAMTI3VrLWJyby1paXMtMS50aG9tc29uLWludGVybWVkaWEubmV0MB4XDTA5MDYz
+						MDA5NTAzMFoXDTE5MDYyODA5NTAzMFowLjEsMCoGA1UEAxMjdWstYnJvLWlpcy0x
+						LnRob21zb24taW50ZXJtZWRpYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQCfJy+boHJDh9FkG5nnjeFbooXmLO8jzEemA+Y4IOaHnLkLVwVG6EKS
+						6rfM6vx+xrCxiVmRw9MZ4OaIuvLs6zMup8GfWWA4b2nBX47m4LOMZ8o24iSTkzV+
+						rIerApEnAtTWZeVrVlt+iXwtOG0vRQnsnUEQfc7bWNi2MbOiAnGGu3mInOQRSRKd
+						J++owbwu6swr/BMPV2VbtnaHlqS5oB53K4VcmyWDa1L5bwoljHMR++kjnoaYMfD3
+						BY5ptVSPnXzLuP7PhKiT2Q4ZtuovQQiRRRauZjh15l3h4zcpiBrVP1hWYS67WMW/
+						L/dousPDjtTSZHw4sMp1xZnYMuJ2GVDFAgMBAAGjUTBPMC4GA1UdEQQnMCWCI3Vr
+						LWJyby1paXMtMS50aG9tc29uLWludGVybWVkaWEubmV0MB0GA1UdDgQWBBQ4E1v3
+						u6BpS67jBb9VGJdSo3CNcDANBgkqhkiG9w0BAQUFAAOCAQEAcU4fTT8j/+B5Br48
+						7gTwG6cjyc/YFcfvWkPeQ1ZnhnXm/rQ0vy5WZL4KZ3EIRopfVuNbmudu2etoM569
+						uoVzMdbSdRkFAJK61lViEqtBrbpNgFVIEBWJzzQQWfrc9NOQrbFU/lzQSw9YS2a9
+						AaNlVgSAo0o7auuZQP/dVXQ4SPXRxatszMWhU0EcrGwULFZ0eVu4NoICCnqR1c8p
+						/+Ja7rfVNsWnCNjjj0BS3sb/6w/TjEuC0Y6BfDRXmj8Q10/2JGsrHzKhf5ohsjlt
+						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>
+						MIIDMDCCAhigAwIBAgIJAJNBy2AlSZCeMA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
+						BAMTI3VrLWJyby1paXMtMS50aG9tc29uLWludGVybWVkaWEubmV0MB4XDTA5MDYz
+						MDA5NTAzMFoXDTE5MDYyODA5NTAzMFowLjEsMCoGA1UEAxMjdWstYnJvLWlpcy0x
+						LnRob21zb24taW50ZXJtZWRpYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQCfJy+boHJDh9FkG5nnjeFbooXmLO8jzEemA+Y4IOaHnLkLVwVG6EKS
+						6rfM6vx+xrCxiVmRw9MZ4OaIuvLs6zMup8GfWWA4b2nBX47m4LOMZ8o24iSTkzV+
+						rIerApEnAtTWZeVrVlt+iXwtOG0vRQnsnUEQfc7bWNi2MbOiAnGGu3mInOQRSRKd
+						J++owbwu6swr/BMPV2VbtnaHlqS5oB53K4VcmyWDa1L5bwoljHMR++kjnoaYMfD3
+						BY5ptVSPnXzLuP7PhKiT2Q4ZtuovQQiRRRauZjh15l3h4zcpiBrVP1hWYS67WMW/
+						L/dousPDjtTSZHw4sMp1xZnYMuJ2GVDFAgMBAAGjUTBPMC4GA1UdEQQnMCWCI3Vr
+						LWJyby1paXMtMS50aG9tc29uLWludGVybWVkaWEubmV0MB0GA1UdDgQWBBQ4E1v3
+						u6BpS67jBb9VGJdSo3CNcDANBgkqhkiG9w0BAQUFAAOCAQEAcU4fTT8j/+B5Br48
+						7gTwG6cjyc/YFcfvWkPeQ1ZnhnXm/rQ0vy5WZL4KZ3EIRopfVuNbmudu2etoM569
+						uoVzMdbSdRkFAJK61lViEqtBrbpNgFVIEBWJzzQQWfrc9NOQrbFU/lzQSw9YS2a9
+						AaNlVgSAo0o7auuZQP/dVXQ4SPXRxatszMWhU0EcrGwULFZ0eVu4NoICCnqR1c8p
+						/+Ja7rfVNsWnCNjjj0BS3sb/6w/TjEuC0Y6BfDRXmj8Q10/2JGsrHzKhf5ohsjlt
+						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>
diff --git a/swamid-interfederations-2.0/www.dailywhat.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.dailywhat.org.uk-shibboleth.xml
new file mode 100644
index 00000000..3ce2b2b1
--- /dev/null
+++ b/swamid-interfederations-2.0/www.dailywhat.org.uk-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJAO7V64q3+QyMMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXRpbi1laC13ZWIwMDEwHhcNMTMwOTIxMTgzNDUzWhcNMjMwOTE5MTgzNDUz
+						WjAYMRYwFAYDVQQDEw10aW4tZWgtd2ViMDAxMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA1u0wwroEU98KO6FGUH6IPwjCBQOb9EiK9eWStt9wTmfPIvK6
+						cW4iqKvWxv/Ic89+mZGhJUgUqAgiMGpG8geQMtSDw/PxG0SCt5m5X3LE38pLrktF
+						CJ9Z1MezuVMKhy/mxB7IWAuGTcuY+X8bGpt5BmtenOC2u2Of4PhG6OA5U+7R2hfn
+						YGxJRaGyzaaL+L69sElGZ8nG1ag/jvJ6VQ+uGpB6pM7e5gCdEnseM/ruLxgmi1tY
+						mnXvIHr2oPlGIDCFor+l53BK5gbdxBBfgxy+NtJA6rd9TDwBZ+922KKCCYlxAxzn
+						RcFapFbp2MLxeU1lLJ4qxEGb8x7IW3/IWcK+PQIDAQABozswOTAYBgNVHREEETAP
+						gg10aW4tZWgtd2ViMDAxMB0GA1UdDgQWBBTDGP+cpqj3AiOmkJqDHmwChMkESzAN
+						BgkqhkiG9w0BAQUFAAOCAQEAvXMz3dAhtPMjjZxukiDzUv/M24SPbqdAjkl0TRTD
+						l+VrbACwKPrg5X4cz2jRhcCk27rtcqaTJivQtYeNgOeFhyttSDn+XBksEE8+dTtj
+						7C7pBF3nNXTelefmyvGhFZBcFtL0OGtzD+JWyqi/SE1r663RbkKDq62PVZrumH95
+						gTmainsoFW14kPR3ZrdJsjUhmI/q5YfM8TiNebBD3el4x+CvlmtX+o7UndTEzb6R
+						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>
diff --git a/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml b/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml
new file mode 100644
index 00000000..5296242f
--- /dev/null
+++ b/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.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"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDqjCCApKgAwIBAgIJAPw17BZZ42GoMA0GCSqGSIb3DQEBBQUAMGExCzAJBgNV
+						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
+						VQQKEwlzZW1hbnRpY28xGjAYBgNVBAMTEXd3dy5kYXdzb25lcmEuY29tMB4XDTE0
+						MTEyMDE0MTAwMFoXDTM0MTExNTE0MTAwMFowYTELMAkGA1UEBhMCVUsxDzANBgNV
+						BAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24xEjAQBgNVBAoTCXNlbWFudGlj
+						bzEaMBgGA1UEAxMRd3d3LmRhd3NvbmVyYS5jb20wggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQDHgNVCzYLg7SD9tKfQV00YAlrk5468kdoro4kdCSr3lnro
+						BRtqzU6ZJtAUFG/eUALLvAGm/q0gK1DYLlfjhYccUsXwzRajQUdjmxuLenkg1bIO
+						b8JIhyo0UTQniZH+4JSEvcH81Iusq1TRPAcpVxZn2lFv2qaArO+jRpAbbnnZApx1
+						DMspj+twl8Kd+MUfibLNGFRJgqmJAwifPAD+cNEr0fOlVI0M4tye5xLPnx0YsGe1
+						5u4D7l7NmPpYuPu/isWTlMIcbMJFEpExLGzi9GTfRbLdmytVp12geoWR2nxv9uaU
+						ygslHl+e8P45tpl0w6az/NlCw6v60Y7EgdROuj7rAgMBAAGjZTBjMEIGA1UdEQQ7
+						MDmCEXd3dy5kYXdzb25lcmEuY29thiRodHRwczovL3d3dy5kYXdzb25lcmEuY29t
+						L3NoaWJib2xldGgwHQYDVR0OBBYEFMtE823I+0YS2aPs/H9Ga0Jwi+NCMA0GCSqG
+						SIb3DQEBBQUAA4IBAQAJg9+Sr/kF5Wjo7f1FZEg46JbjJeoI4exlvyCe0NK7z1qX
+						m5pX1qYwWPQ7LaXX7Zp3/OiK7GZ9PwjxPPos9SCCxIHiXUbQiVE0lZak2gmVQBtR
+						5g5+mlEMzK5JdS/LpBg73bt9GmDOD8DW/gh5jK8leFeMYpB6S7kQtHBQjOCh25pK
+						71r8Nn896gV+5qH8gGZl3n0sh3wFmCEm6MWMeO9O7sQ9mOpCyURGga0z9pNhuDT+
+						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: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
new file mode 100644
index 00000000..947f99f1
--- /dev/null
+++ b/swamid-interfederations-2.0/www.degruyter.com-shibboleth.xml
@@ -0,0 +1,65 @@
+<?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>
+						MIIDGzCCAgOgAwIBAgIEJQQdIDANBgkqhkiG9w0BAQsFADAcMRowGAYDVQQDExF3
+						d3cuZGVncnV5dGVyLmNvbTAeFw0xNTAxMTUxNzE0MTdaFw0xODAyMDMxNzE0MTda
+						MBwxGjAYBgNVBAMTEXd3dy5kZWdydXl0ZXIuY29tMIIBIjANBgkqhkiG9w0BAQEF
+						AAOCAQ8AMIIBCgKCAQEAl4aKz3klp19cqVt/ayGr+UGIOBaROpLPEKlZtCUVq4rE
+						/3X0LPEVOzmqWtxzRDhIsGBjuwgt1D/RFbY+1+YU3CL6B+wOOOBGOPcj1gr7ZLPK
+						GTODNErwJCjzslISqbK9d1vpg5yI84bb8+IpYLb0XmsIoOkldxRHbmgcpfwt9GSm
+						GngjsuMAbWc8L9a62iPeWlPBryCoYgQFH6FIhIACGJcrroP1+o+NZXFeQtbDXKCt
+						v1gWTAPHvY2qLfc6qa+6DX+qMcWydtm46nNWrtvfkeQVnUxr0DcB68UafGbB3Vbu
+						tbqU3afSodVKcsWgHaebgvoLhq/rmoeQ0PDPQVFKgwIDAQABo2UwYzBCBgNVHREE
+						OzA5ghF3d3cuZGVncnV5dGVyLmNvbYYkaHR0cHM6Ly93d3cuZGVncnV5dGVyLmNv
+						bS9zaGliYm9sZXRoMB0GA1UdDgQWBBSOhPCjGa1k6lBcSkwexlPasUaNjDANBgkq
+						hkiG9w0BAQsFAAOCAQEAFuKYNHwtCWU+iLXQRtat7nf0OpmjHiDwmi/BjVAt7OBZ
+						zsgXQdfPk13YxlHlf++tvUnw2MOaIudtwZaITXRK6tSJ/I00PzNjofLVjsonz33O
+						U5SmD94GNuBjcPJfvX7tHstOwlRYDmkIxMsdikfjyNLuahV0oRvh/igdKXH8ivv+
+						CYuKzYRYn4wW24lUwj3CGbieBfOvnnpUEhCxRPDD12vdlWxI0/RDZzyERg82nYI7
+						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:it@ifactory.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matt</md:GivenName>
+    <md:SurName>Warren</md:SurName>
+    <md:EmailAddress>mailto:it@ifactory.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Harlan</md:GivenName>
+    <md:SurName>McCanne</md:SurName>
+    <md:EmailAddress>mailto:it@ifactory.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>iFactory</md:GivenName>
+    <md:EmailAddress>mailto:it@ifactory.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
new file mode 100644
index 00000000..3b3132a7
--- /dev/null
+++ b/swamid-interfederations-2.0/www.demontfortstudents.com-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.dental-nursing.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.dental-nursing.co.uk-shibboleth.xml
new file mode 100644
index 00000000..8ba09cd7
--- /dev/null
+++ b/swamid-interfederations-2.0/www.dental-nursing.co.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.dental-nursing.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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFHzCCBAegAwIBAgIJAO3bFAht6jveMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
+						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGzAZBgNV
+						BAoTEk1hIEhlYWx0aGNhcmUgTHRkLjEMMAoGA1UECxMDd2ViMSEwHwYDVQQDExh3
+						d3cuZGVudGFsLW51cnNpbmcuY28udWsxLTArBgkqhkiG9w0BCQEWHnRvbS5wb2xs
+						YXJkQG1hcmthbGxlbmdyb3VwLmNvbTAeFw0xMDA5MjExMDM3NDVaFw0yMDA5MTgx
+						MDM3NDVaMIGsMQswCQYDVQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQH
+						EwZMb25kb24xGzAZBgNVBAoTEk1hIEhlYWx0aGNhcmUgTHRkLjEMMAoGA1UECxMD
+						d2ViMSEwHwYDVQQDExh3d3cuZGVudGFsLW51cnNpbmcuY28udWsxLTArBgkqhkiG
+						9w0BCQEWHnRvbS5wb2xsYXJkQG1hcmthbGxlbmdyb3VwLmNvbTCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBANyYOQPecEPtsxn6zw2LIM3aorwo5lExVnFI
+						ZZXvSU6YssKuUOzEc2YLtdkF1nUksuSXC5I13aqj0z4757bd/xcJpS36KpEtr6Qe
+						qAkat7dHuT5sfjqyGGaQ7RRxKcIvMXMeW4V46XDegtEmwL1ilybvAzIx0fv5bm6P
+						z6lSev5EmRpAN+tou33hbVwrDd4Sds+UYoJHq1y0M7T+ovWhN1etHC77QVwX+NCz
+						kR4bCRpmAF4Lz7blaFkn+BuszCz2nyOnw0H+btbnSs3YaRrscSfctnjoAV2skiK2
+						MsIuBN1OmnKhFYkrBhxgOsdhKwLS5+/GZgDMTvBbI+0PCs/KcYsCAwEAAaOCAUAw
+						ggE8MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
+						IENlcnRpZmljYXRlMB0GA1UdDgQWBBSHeKW6zoDujt//wMKWMMY83Wu+TTCB4QYD
+						VR0jBIHZMIHWgBSHeKW6zoDujt//wMKWMMY83Wu+TaGBsqSBrzCBrDELMAkGA1UE
+						BhMCR0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRswGQYDVQQK
+						ExJNYSBIZWFsdGhjYXJlIEx0ZC4xDDAKBgNVBAsTA3dlYjEhMB8GA1UEAxMYd3d3
+						LmRlbnRhbC1udXJzaW5nLmNvLnVrMS0wKwYJKoZIhvcNAQkBFh50b20ucG9sbGFy
+						ZEBtYXJrYWxsZW5ncm91cC5jb22CCQDt2xQIbeo73jANBgkqhkiG9w0BAQUFAAOC
+						AQEAcwNLd3oH5qHpsb6IJj8nQYY2CBzbQ2MurKn1ME4aCAENQ+E1mzPDM3+sdvI9
+						tZhbgbGhMEfZ+Ck55X0D7bNdWR/991i3FLXUt/QcGRzsgo41QGcBWfNDIt4tU1Bj
+						WPx119cGSLnA6MAEpG2w0TPyPQPXmzVOd8XtXXAkbTpwQ6+LLFMyTWnVMGRY2HzP
+						B3nzmP0gQvMUK5zC8hwCRGNvM+qLJPeN1vEppQ43cRy9acpVmkgWerfABujpgNww
+						pg+A+ta/ABwVcOPREbpouH/ccqSN/mHOnjperu+vPGm9xSA+r9owsHziQC9/mZIQ
+						RCLd7MNy18GIZyYDwbGO+7anbA==
+					</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.dental-nursing.co.uk/auth/rcv/ukfed" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dental-nursing.co.uk/auth/rcv/ukfed" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MA Healthcare Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MA Healthcare Limited: dental-nursing.co.uk</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dental-nursing.co.uk/about.shtml</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>Tim</md:GivenName>
+    <md:SurName>Hillman</md:SurName>
+    <md:EmailAddress>mailto:tim.hillman@fsite.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
new file mode 100644
index 00000000..1a82e9b9
--- /dev/null
+++ b/swamid-interfederations-2.0/www.digitalmeasures.com-shibboleth-sp-.xml
@@ -0,0 +1,63 @@
+<?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"/>
+  </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
+						bWVhc3VyZXMuY29tMScwJQYJKoZIhvcNAQkBFhh0ZWNoQGRpZ2l0YWxtZWFzdXJl
+						cy5jb20wHhcNMDkxMjAyMTg1NTAzWhcNMTkxMTMwMTg1NTAzWjCBmzELMAkGA1UE
+						BhMCVVMxEjAQBgNVBAgTCVdpc2NvbnNpbjESMBAGA1UEBxMJTWlsd2F1a2VlMRkw
+						FwYDVQQKExBEaWdpdGFsIE1lYXN1cmVzMSAwHgYDVQQDExd3d3cuZGlnaXRhbG1l
+						YXN1cmVzLmNvbTEnMCUGCSqGSIb3DQEJARYYdGVjaEBkaWdpdGFsbWVhc3VyZXMu
+						Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApdU5Pa3MRsljSruF
+						+oUUNr7KAUeRh8kJRdvHQIUQKDrLUrgGDJxVFEd4kAO0jd+cljJ+Ks8blQtZpqz3
+						8HBpwDV1p5Vh+pne0p6lUCiUY9ZhqC7b6nZhuZMJGsROfYcnzS4fYrLV8MmTJ4hU
+						CDfyIXCLIlNAwuOwRLWJ6Kg3C9vOdP72z0BWxGzFUsNMSixWVSl5hcehkPskezLd
+						sHZFC1bfTWrmIuVdvKRp1XWnqC0Ha6HyAXfkKosWg9f71KCMwpTKqXwtj47cXMgA
+						wmShTH8OwQ1C2rXxVPWzNjfE5xFI/7Fo26mftzQGwkJ2laaRbioygZhGgpfEP1Mk
+						Z0a0swIDAQABo4IBBDCCAQAwHQYDVR0OBBYEFHyhAmBoAKyaxI2a6+6vknnzbtI0
+						MIHQBgNVHSMEgcgwgcWAFHyhAmBoAKyaxI2a6+6vknnzbtI0oYGhpIGeMIGbMQsw
+						CQYDVQQGEwJVUzESMBAGA1UECBMJV2lzY29uc2luMRIwEAYDVQQHEwlNaWx3YXVr
+						ZWUxGTAXBgNVBAoTEERpZ2l0YWwgTWVhc3VyZXMxIDAeBgNVBAMTF3d3dy5kaWdp
+						dGFsbWVhc3VyZXMuY29tMScwJQYJKoZIhvcNAQkBFhh0ZWNoQGRpZ2l0YWxtZWFz
+						dXJlcy5jb22CCQCPfsJIofBkDDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
+						A4IBAQAeUkRH04tZvqAcBCxmQyRdIDEvBw8+IG6zzL8Ap4dJLSBc4D9uUZtIq8Xu
+						ZDnrOcQ9O2Udsno523aONEOsiCTazJRhNJKTGkXXeQiJhGnzXmOokkIeGJI9efNJ
+						4GAVI9ZrxEh+ZgKQpLuZpCO+d/RwKqtbOJWL8u4QccYH2stK1dO4M6yUe7b9PnwP
+						F2HUBMtW7B3xfRZyy1qQTpJ3oVp2nPTDtStIioPuqB1y+sl76jR503ABPnz77wyV
+						vh8D4o/W5q32axmmKH3s85TeSyUoQ4RS7/NgsjYQI7lnODeVSgWcUl1+c+NfPNiu
+						1vpIbPTlEVEvmNPl69Zi3A9T7I/p
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md: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.dl.begellhouse.com-shibboleth.xml b/swamid-interfederations-2.0/www.dl.begellhouse.com-shibboleth.xml
new file mode 100644
index 00000000..68fd09bd
--- /dev/null
+++ b/swamid-interfederations-2.0/www.dl.begellhouse.com-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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>
+						MIIDATCCAemgAwIBAgIBADANBgkqhkiG9w0BAQUFADAhMR8wHQYDVQQDExZ3d3cu
+						ZGwuYmVnZWxsaG91c2UuY29tMB4XDTA5MTEwMjE3MzYzNVoXDTE5MTAzMTE3MzYz
+						NVowITEfMB0GA1UEAxMWd3d3LmRsLmJlZ2VsbGhvdXNlLmNvbTCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAMuFDBpujB8wIt6HdNkuWSn9PBX2obMNrsqY
+						NMHFPRNP0t8T7NwuOm9qRbvL/W+ViiVCAphbJK5BdgQBQd1O/S90ViBuPGQ3INVg
+						uLiWiuon37yUb/pAhn/4tSi8rEv5LYJmwvmZmJSV8gBwb03i1LYGb2aF3nGqffNy
+						TiObBhFOUaoyWBi+X4+MQT8DHyV9T1E9mTXDsWGPm2hb5htSxloDgrnqrVFhShzv
+						LtV4+4ksGTA/GRNriuYgcpiB1PEvnMfiVASysOOKWojEEQ3U0e2Q2lyEiczH+MFL
+						OkmrUMbYPXxNdck9mhREPbckZbJasKHGetDoy4XsHh5DyRl102kCAwEAAaNEMEIw
+						IQYDVR0RBBowGIIWd3d3LmRsLmJlZ2VsbGhvdXNlLmNvbTAdBgNVHQ4EFgQUD6sj
+						78W4QOa1Vp52Ui0rw8eeb2EwDQYJKoZIhvcNAQEFBQADggEBAADoC2XeOIaCYrC8
+						6tWbcuSq6trWxyTDH+Vz5Pe6cR+UVwsaQ2/3NAzqxQ2gZRJU2A/UoFoC9CuiBvv9
+						XenHkZu3a8wRoG1SxhrNkC98D4o4wxp0IlU7R2KEJte+UHLNZ1Om0EjHkva1JrB1
+						UV+o7xI8AFxu3Ym9m5UW7mqs2eo29xbkJ+TEyW/SifXkp9kowFPGyQlfFY14x3Xb
+						Dftb5D+IXvsPJAVKfqiMUuDN5r4JtrEnhx4J2QrC2OF061JTrDINitdSN+k1cAhO
+						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>
+						MIIDATCCAemgAwIBAgIBADANBgkqhkiG9w0BAQUFADAhMR8wHQYDVQQDExZ3d3cu
+						ZGwuYmVnZWxsaG91c2UuY29tMB4XDTA5MTEwMjE3MzYzNVoXDTE5MTAzMTE3MzYz
+						NVowITEfMB0GA1UEAxMWd3d3LmRsLmJlZ2VsbGhvdXNlLmNvbTCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAMuFDBpujB8wIt6HdNkuWSn9PBX2obMNrsqY
+						NMHFPRNP0t8T7NwuOm9qRbvL/W+ViiVCAphbJK5BdgQBQd1O/S90ViBuPGQ3INVg
+						uLiWiuon37yUb/pAhn/4tSi8rEv5LYJmwvmZmJSV8gBwb03i1LYGb2aF3nGqffNy
+						TiObBhFOUaoyWBi+X4+MQT8DHyV9T1E9mTXDsWGPm2hb5htSxloDgrnqrVFhShzv
+						LtV4+4ksGTA/GRNriuYgcpiB1PEvnMfiVASysOOKWojEEQ3U0e2Q2lyEiczH+MFL
+						OkmrUMbYPXxNdck9mhREPbckZbJasKHGetDoy4XsHh5DyRl102kCAwEAAaNEMEIw
+						IQYDVR0RBBowGIIWd3d3LmRsLmJlZ2VsbGhvdXNlLmNvbTAdBgNVHQ4EFgQUD6sj
+						78W4QOa1Vp52Ui0rw8eeb2EwDQYJKoZIhvcNAQEFBQADggEBAADoC2XeOIaCYrC8
+						6tWbcuSq6trWxyTDH+Vz5Pe6cR+UVwsaQ2/3NAzqxQ2gZRJU2A/UoFoC9CuiBvv9
+						XenHkZu3a8wRoG1SxhrNkC98D4o4wxp0IlU7R2KEJte+UHLNZ1Om0EjHkva1JrB1
+						UV+o7xI8AFxu3Ym9m5UW7mqs2eo29xbkJ+TEyW/SifXkp9kowFPGyQlfFY14x3Xb
+						Dftb5D+IXvsPJAVKfqiMUuDN5r4JtrEnhx4J2QrC2OF061JTrDINitdSN+k1cAhO
+						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>
diff --git a/swamid-interfederations-2.0/www.e-lawstudent.com-shibboleth.xml b/swamid-interfederations-2.0/www.e-lawstudent.com-shibboleth.xml
new file mode 100644
index 00000000..c9d0cd54
--- /dev/null
+++ b/swamid-interfederations-2.0/www.e-lawstudent.com-shibboleth.xml
@@ -0,0 +1,66 @@
+<?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"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol 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>
+						MIIDADCCAeigAwIBAgIJAJlseYQQY0a6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE3M0MC5jYWxsaWR1czAwMS5uZXQwHhcNMTEwODI5MDk0OTI5WhcNMjEwODI2
+						MDk0OTI5WjAeMRwwGgYDVQQDExNzNDAuY2FsbGlkdXMwMDEubmV0MIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1eUIR/msK6qUkytHjlDDNix9MOeBQYFc
+						zz5ZPvTepv3We7/eKWU2mEkISXjuLproiSGl7gZqDP9mxeqkZXj8oyOpZRgFOtWn
+						EzmAIH7LWJPClMcupHw9RL2IZ9fNOfqVjXiVnQYefYZg4yT5jVJNDIgLnxQRqw9M
+						xPllqf6kIsNqzTA6QuMzyPJtSQ3OreU3pxFBj+sRHwlcXQkWdNLS3Axc7BpMFswK
+						OHUva8CT1ZPM2lblcNxgXpzLzFGemW/gwOlXVJvpWiEzjvsX2Cv5VTG5iwyOTraD
+						c3bGtUbAnyYRrIZIX8Pbide8htHOkRlzDWlKyNBQYMgspbGyuu899wIDAQABo0Ew
+						PzAeBgNVHREEFzAVghNzNDAuY2FsbGlkdXMwMDEubmV0MB0GA1UdDgQWBBTu83Y4
+						lye8+8s6OPUR7SK51J0jfTANBgkqhkiG9w0BAQUFAAOCAQEAYiq3EmHidGJT7i8l
+						vi/U4H+pi3ih8kSCu/TNZ2QLbjZYgrVJzQGOZImHZE8LDV2aNBvbiM/Il3Va52F4
+						NEHbx4dIlEx4SEqeaSd0FUyvOdv79JgvoIk3pMbox0TLeowslIbSkmrW00Y6gKOk
+						r7doWnBKNiAjDU6s37sUiOl6UUIxtJI4PcM7oed7T7vkR72iyK/m1Pw+E84Tu8wF
+						77NVal8Al4NNNeWepX7XLqifjoZ7rgdeAr9LWAakjnNs0r++hxOaKGdB6UBA3bDE
+						KmpxYZDCeeCRX2kzgxVvOCSh/EIu6FSVtYogyMJcTJhfjpIP9c++PnmKaXvvrdku
+						k7tDPQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..c0cc3a18
--- /dev/null
+++ b/swamid-interfederations-2.0/www.ebi.ac.uk-ega-.xml
@@ -0,0 +1,76 @@
+<?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>
+      <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
+BAMTFHZlcy1lYmktMTAuZWJpLmFjLnVrMB4XDTEyMTEyMjA5MTc1MloXDTIyMTEy
+MDA5MTc1MlowHzEdMBsGA1UEAxMUdmVzLWViaS0xMC5lYmkuYWMudWswggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjS5ePByst+LtG8/i7+C7nl/qWQLsF
+mgFWJIafuoUSc/Iy85sQCJYUSpwMvaV+XqxjMjQj79z0aOkA0wyw+MnRnAQnr9jJ
+adbVNMwZOlqPPXAXfZmwW1DkM2fdz8COipBfW9b5lvNu1hZ8Rm0nd1biSxp1+AhL
+4p6FXqM0pjXMO4mZnesmPkoC9IK5TcpVpOE3WWazsLCTlSmE7+iDLO6dwkEE4IYV
+/zRkrQ56hBIxCVui/hrXatbcJy8dPn6JREsnYhZCTJclb+liqxcv9c266aUx5hTf
+WItvFQNkpPp7FsJhzEZOMcUkGebWLr/n5Dw6ERR+/ZM1n/1rhdzfD9hdAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHZlcy1lYmktMTAuZWJpLmFjLnVrMB0GA1UdDgQWBBTg
+/BOPCQZP1Tpzz3MVM/ijVkrHVjANBgkqhkiG9w0BAQUFAAOCAQEAZQf3HB46uhJ+
+vw+3ir6C5r9+6H3B4wVFVgXm9XIZB2orryui4Pub/jfoSoxUFkM65G0lnTqtZ66z
+rOTPJz202ya77jRn2uTXmy2YLLPO5aWPqlgGwrCche1RoFoCUEi9vMACp0XDosEO
+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>
diff --git a/swamid-interfederations-2.0/www.edgehillsu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.edgehillsu.org.uk-shibboleth.xml
new file mode 100644
index 00000000..689a3ccb
--- /dev/null
+++ b/swamid-interfederations-2.0/www.edgehillsu.org.uk-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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.edgehillsu.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.edgehillsu.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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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.edgehillsu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.edgehillsu.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.edgehillsu.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: Edge Hill Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.edgehillsu.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.elgaronline.com-oa-metadata.xml b/swamid-interfederations-2.0/www.elgaronline.com-oa-metadata.xml
new file mode 100644
index 00000000..3061d362
--- /dev/null
+++ b/swamid-interfederations-2.0/www.elgaronline.com-oa-metadata.xml
@@ -0,0 +1,79 @@
+<?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>
+						MIIDBDCCAeygAwIBAgIEU6rnhTANBgkqhkiG9w0BAQUFADBEMSQwIgYDVQQKExtF
+						ZHdhcmQgRWxnYXIgUHVibGlzaGluZyBMdGQxHDAaBgNVBAMTE3d3dy5lbGdhcm9u
+						bGluZS5jb20wHhcNMTQwNjI1MTUxNTE3WhcNMjQwNjIyMTUxNTE3WjBEMSQwIgYD
+						VQQKExtFZHdhcmQgRWxnYXIgUHVibGlzaGluZyBMdGQxHDAaBgNVBAMTE3d3dy5l
+						bGdhcm9ubGluZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDk
+						zi0IFONPfHSf+k9V6m3TUL7jmAyEzOMRsNd3xe8VDzompult1mnkRNQsJtXlH8dT
+						9zlsa8Sg7GWZuB33GUDZAduwh2zrDLHEX26zcRiwVMEGHO+ExZtb3Tj6rYIabd3M
+						K7omCRTXKoGgpjembqpUSkyfo1tXb0n3VLWSg+c0rD3OsxmlSKYGOIM/IJWLeETf
+						RFO+/wbMBiznGB2v0gE1OwBMuW9MhJGNuTzl6JBzsUtWaxve6uUaFGO0VsJkgt+1
+						blkMrfKLxeBNpCwjJ0p5uf2NFzQqSyGutY4WOUKJikJGAgwewI1eGGMXAu5yILDG
+						Tx4qzyn9Y3FAOXv6awbVAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAFejm2GsOBLa
+						3MjfY1y5gF0O3CB9S3PUAgA2p1wB0j+MzThgw6qlCWCCAoBmqNIWQ9b7ehGf2gXU
+						UXI01W5ze1FLZap/B04GHbdSVPg7zc/Wp5+lnb+J0V28sPMXT3n7r6Kpp4vmnmub
+						hc4j8O9cJrleXFtB2w5rkgPqX2/Ws9eWK5Ngbri+PDw/b0OtaHJimsl8IzftdmBb
+						fYKS821VM/dQ463zbqZ0Vj1hwXL+y4bc1WPjNHxiY4uQfEVfw5lBEZBHG2o2g3ys
+						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>
+						MIIDBDCCAeygAwIBAgIEU6rnhTANBgkqhkiG9w0BAQUFADBEMSQwIgYDVQQKExtF
+						ZHdhcmQgRWxnYXIgUHVibGlzaGluZyBMdGQxHDAaBgNVBAMTE3d3dy5lbGdhcm9u
+						bGluZS5jb20wHhcNMTQwNjI1MTUxNTE3WhcNMjQwNjIyMTUxNTE3WjBEMSQwIgYD
+						VQQKExtFZHdhcmQgRWxnYXIgUHVibGlzaGluZyBMdGQxHDAaBgNVBAMTE3d3dy5l
+						bGdhcm9ubGluZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDk
+						zi0IFONPfHSf+k9V6m3TUL7jmAyEzOMRsNd3xe8VDzompult1mnkRNQsJtXlH8dT
+						9zlsa8Sg7GWZuB33GUDZAduwh2zrDLHEX26zcRiwVMEGHO+ExZtb3Tj6rYIabd3M
+						K7omCRTXKoGgpjembqpUSkyfo1tXb0n3VLWSg+c0rD3OsxmlSKYGOIM/IJWLeETf
+						RFO+/wbMBiznGB2v0gE1OwBMuW9MhJGNuTzl6JBzsUtWaxve6uUaFGO0VsJkgt+1
+						blkMrfKLxeBNpCwjJ0p5uf2NFzQqSyGutY4WOUKJikJGAgwewI1eGGMXAu5yILDG
+						Tx4qzyn9Y3FAOXv6awbVAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAFejm2GsOBLa
+						3MjfY1y5gF0O3CB9S3PUAgA2p1wB0j+MzThgw6qlCWCCAoBmqNIWQ9b7ehGf2gXU
+						UXI01W5ze1FLZap/B04GHbdSVPg7zc/Wp5+lnb+J0V28sPMXT3n7r6Kpp4vmnmub
+						hc4j8O9cJrleXFtB2w5rkgPqX2/Ws9eWK5Ngbri+PDw/b0OtaHJimsl8IzftdmBb
+						fYKS821VM/dQ463zbqZ0Vj1hwXL+y4bc1WPjNHxiY4uQfEVfw5lBEZBHG2o2g3ys
+						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>
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
new file mode 100644
index 00000000..06d97651
--- /dev/null
+++ b/swamid-interfederations-2.0/www.elsevierclinicalskills.co.uk-oa-metadata.xml
@@ -0,0 +1,89 @@
+<?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>
+						MIIEJzCCAw+gAwIBAgIJAK+ojEV2iGtzMA0GCSqGSIb3DQEBBQUAMGoxPTA7BgNV
+						BAoTNEVsc2V2aWVyIEhlYWx0aCBTY2llbmNlcyAoVUspIC0gTW9zYnkgTnVyc2lu
+						ZyBTa2lsbHMxKTAnBgNVBAMTIHd3dy5lbHNldmllcmNsaW5pY2Fsc2tpbGxzLmNv
+						LnVrMB4XDTEzMDIyNzE2MjQ1NloXDTIzMDIyNTE2MjQ1NlowajE9MDsGA1UEChM0
+						RWxzZXZpZXIgSGVhbHRoIFNjaWVuY2VzIChVSykgLSBNb3NieSBOdXJzaW5nIFNr
+						aWxsczEpMCcGA1UEAxMgd3d3LmVsc2V2aWVyY2xpbmljYWxza2lsbHMuY28udWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3MpV6gXZUm8WGAzI02cK0
+						YqaCgXf1G761y1EQt0Z7+xcRlCvcPL7wjRTrZplD0cQDtmyOHgMMyr3xOXB2S8Kl
+						KgE6SMynaCMCNFKAedLvNK/b68/rHs5bk02RG3PCFngkeBTClXx9Y4l6n90CF2uC
+						vuKTIUJSwWJZr1YVPn+DRu1fQdjeQOLP0JofhfMn+VC6ghBz5xqMIBmFuH6Cq7dt
+						6EyrTg9miRNkNQEZYp1JOR/4emdHUu+aYe0E7TnvmXqx6+Zm0kBfv3DTLThydj0n
+						T03CaOi5DjT7ZyfSvLYhBR4ENhmUnyHlzIcMSGas4QULGbrKASJ3AdEZzN04Vsr3
+						AgMBAAGjgc8wgcwwHQYDVR0OBBYEFIq467HyDK0dwBAwU9NuYKMhR9jMMIGcBgNV
+						HSMEgZQwgZGAFIq467HyDK0dwBAwU9NuYKMhR9jMoW6kbDBqMT0wOwYDVQQKEzRF
+						bHNldmllciBIZWFsdGggU2NpZW5jZXMgKFVLKSAtIE1vc2J5IE51cnNpbmcgU2tp
+						bGxzMSkwJwYDVQQDEyB3d3cuZWxzZXZpZXJjbGluaWNhbHNraWxscy5jby51a4IJ
+						AK+ojEV2iGtzMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJaZ+wfY
+						HQ26OdiMB6G5OVmUPKYSkvzt6cu4SCB9bSvszgNMvWpA2dlJvXaYIyBpITbHuMW4
+						nUvrCuCYhFvPXKMpUGMdYPtFGxc9qJjRlwQfS6Udwf+8DjKMSM9wqHluMhuavHX5
+						A/A1PDMmEEzgMf44LeChHFVq7yRtGJFkUKU0HxhwFuEJnN6/0xxDOv1iyzHRHXqT
+						RZgLKPYNjUmOvEEHYGqNGdPFJQl+RRIgnuwE+sjQY8iAituymisM666gP7sN/4mg
+						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>
+						MIIEJzCCAw+gAwIBAgIJAK+ojEV2iGtzMA0GCSqGSIb3DQEBBQUAMGoxPTA7BgNV
+						BAoTNEVsc2V2aWVyIEhlYWx0aCBTY2llbmNlcyAoVUspIC0gTW9zYnkgTnVyc2lu
+						ZyBTa2lsbHMxKTAnBgNVBAMTIHd3dy5lbHNldmllcmNsaW5pY2Fsc2tpbGxzLmNv
+						LnVrMB4XDTEzMDIyNzE2MjQ1NloXDTIzMDIyNTE2MjQ1NlowajE9MDsGA1UEChM0
+						RWxzZXZpZXIgSGVhbHRoIFNjaWVuY2VzIChVSykgLSBNb3NieSBOdXJzaW5nIFNr
+						aWxsczEpMCcGA1UEAxMgd3d3LmVsc2V2aWVyY2xpbmljYWxza2lsbHMuY28udWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3MpV6gXZUm8WGAzI02cK0
+						YqaCgXf1G761y1EQt0Z7+xcRlCvcPL7wjRTrZplD0cQDtmyOHgMMyr3xOXB2S8Kl
+						KgE6SMynaCMCNFKAedLvNK/b68/rHs5bk02RG3PCFngkeBTClXx9Y4l6n90CF2uC
+						vuKTIUJSwWJZr1YVPn+DRu1fQdjeQOLP0JofhfMn+VC6ghBz5xqMIBmFuH6Cq7dt
+						6EyrTg9miRNkNQEZYp1JOR/4emdHUu+aYe0E7TnvmXqx6+Zm0kBfv3DTLThydj0n
+						T03CaOi5DjT7ZyfSvLYhBR4ENhmUnyHlzIcMSGas4QULGbrKASJ3AdEZzN04Vsr3
+						AgMBAAGjgc8wgcwwHQYDVR0OBBYEFIq467HyDK0dwBAwU9NuYKMhR9jMMIGcBgNV
+						HSMEgZQwgZGAFIq467HyDK0dwBAwU9NuYKMhR9jMoW6kbDBqMT0wOwYDVQQKEzRF
+						bHNldmllciBIZWFsdGggU2NpZW5jZXMgKFVLKSAtIE1vc2J5IE51cnNpbmcgU2tp
+						bGxzMSkwJwYDVQQDEyB3d3cuZWxzZXZpZXJjbGluaWNhbHNraWxscy5jby51a4IJ
+						AK+ojEV2iGtzMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJaZ+wfY
+						HQ26OdiMB6G5OVmUPKYSkvzt6cu4SCB9bSvszgNMvWpA2dlJvXaYIyBpITbHuMW4
+						nUvrCuCYhFvPXKMpUGMdYPtFGxc9qJjRlwQfS6Udwf+8DjKMSM9wqHluMhuavHX5
+						A/A1PDMmEEzgMf44LeChHFVq7yRtGJFkUKU0HxhwFuEJnN6/0xxDOv1iyzHRHXqT
+						RZgLKPYNjUmOvEEHYGqNGdPFJQl+RRIgnuwE+sjQY8iAituymisM666gP7sN/4mg
+						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>
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com-entity.xml b/swamid-interfederations-2.0/www.emeraldinsight.com-entity.xml
new file mode 100644
index 00000000..db3b9cf4
--- /dev/null
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com-entity.xml
@@ -0,0 +1,152 @@
+<?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>
+      <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>
+						MIIDUTCCAjmgAwIBAgIJANuHp/m5TCXsMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
+						BAMTIWVtLWwxLXJoLXN2cjAxLmVtZXJhbGRpbnNpZ2h0LmNvbTAeFw0xMTA4MTEw
+						ODM1MTJaFw0yMTA4MDgwODM1MTJaMCwxKjAoBgNVBAMTIWVtLWwxLXJoLXN2cjAx
+						LmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAL7nJHjWMmZxHtjdwAYdXKCZwObQn8nDKWS71kULyYRgcxkVxULE+Q8sazuA
+						0bsX3Q4PQUeP6C+xuyBXzHi9XZy6Ef4hoIHo6p9qI7EboB7Qu1MebGROWca0Dtd9
+						zyadDe4y61J8BlE5euVCvbpGkHSSuFVvz0ThhTdC61vAPzvl71R5sqWxUm8xIPDT
+						0TryzRgOA0LsOH3tXsaxQ5Jb5d6G+X6+6K2flFCY8QKbrnxcMKXvTbPpMprTIa1N
+						bUT+XFONWmplOvyjHQH1GdIDQCPKc4aT3WyIA3MxnWfzpPsP8Sdi7Z+QyhXGEgOP
+						obM+cagbqe/E/Om1gUgI3a6F/z0CAwEAAaN2MHQwUwYDVR0RBEwwSoIhZW0tbDEt
+						cmgtc3ZyMDEuZW1lcmFsZGluc2lnaHQuY29thiVodHRwczovL3d3dy5lbWVyYWxk
+						aW5zaWdodC5jb20vZW50aXR5MB0GA1UdDgQWBBT8iPZbLVpj12PDMabI7c5IEAQ0
+						+zANBgkqhkiG9w0BAQUFAAOCAQEAVMg4wyJ1FHeFYIuJ/zBzqPgZRD/dRQ/P64Bg
+						lkM/XKtTEkDL5nizTdMcm5qUB8sSLUpZIyuPUSy8AmYZ+FgvU6SqjW1WIhRzlnYG
+						yl3bKyl0Ji8r7We5lAhLgLnr1FTo3r9ROVd+S/BC3J7CZVE8Jcqo6AS66gTtGBja
+						xwoQYnowMJKcoCFqPkRlPL25ystxifcSpgaaRnVJMik/JHO2IwLLti+WAUj6kwCM
+						uCbrLPgzpR6W8YOkDzUH3rvANVZ5GKgqWNA/u8NfC6WRcA1Sktx2nLnK8Mw3d14g
+						MvgwMr/rwl/SPLLZ0KDGqJ8iSYjIZQKsJ/JXP9xmaeEQW6v35w==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md: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 07391e53..d8ea7d19 100644
--- a/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml
@@ -1,50 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.emeraldinsight.com/shibboleth">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+<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>
+      <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>MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYwNjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZNgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5YKFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178KfsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQIDAQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRwczovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUj3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193ff50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGYMaa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3dBt7qcpd9uOc=</ds:X509Certificate>
+          <ds:X509Certificate>
+						MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYw
+						NjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZ
+						NgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7
+						LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5Y
+						KFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4
+						acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178K
+						fsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQID
+						AQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRw
+						czovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						j3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+
+						F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B
+						0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu
+						01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193f
+						f50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGY
+						Maa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3d
+						Bt7qcpd9uOc=
+					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYwNjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZNgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5YKFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178KfsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQIDAQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRwczovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUj3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193ff50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGYMaa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3dBt7qcpd9uOc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/action/saml2artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/action/saml2post" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/action/samlACS" index="1"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Emerald Insight</md:ServiceName>
-      <md:ServiceName xml:lang="da">Emerald Insight</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to provide personalized access to journals and papers on social sciences</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at give adgang til Emerald Insights tidsskrifter og artikler indenfor socialvidenskab</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
+    <md: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">Emerald Group Publishing</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Emerald Group Publishing</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.emeraldgrouppublishing.com</md:OrganizationURL>
+    <md: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:Company>Atypon Systems Inc.</md:Company>
     <md:GivenName>SSO-Support</md:GivenName>
-    <md:SurName>SSO-Support</md:SurName>
-    <md:EmailAddress>SSO-Support@atypon.com</md:EmailAddress>
-    <md:TelephoneNumber>+14089881240</md:TelephoneNumber>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:Company>Atypon Systems Inc.</md:Company>
     <md:GivenName>SSO-Tech</md:GivenName>
-    <md:SurName>SSO-Tech</md:SurName>
-    <md:EmailAddress>SSO-Tech@atypon.com</md:EmailAddress>
-    <md:TelephoneNumber>+14089881240</md:TelephoneNumber>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.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
new file mode 100644
index 00000000..3c9cd295
--- /dev/null
+++ b/swamid-interfederations-2.0/www.era-test.lib.ed.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,78 @@
+<?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>
+      <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>
+						MIIDFTCCAf2gAwIBAgIJALOvgJMUhk7DMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGmxhYy1yZXBvLXRlc3Q3LmlzLmVkLmFjLnVrMB4XDTEzMDEyODE1MjA1M1oX
+						DTIzMDEyNjE1MjA1M1owJTEjMCEGA1UEAxMabGFjLXJlcG8tdGVzdDcuaXMuZWQu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5EWuWmRSvs/o3
+						6B8gmu0G99ZSTP42sQItX+evSRr++rXjZXVmqG0KqMD3adk8Ocj33u9r9PuxHyr1
+						r5TyD0y9nzzm4zMLce4gy+xOWhswFkyJEwcxNxEwWi851g6eczVPoMrunNMijT8m
+						k+LLc9wwYd6DtYimue774b4WNQf74/4JBbkzgpcc3himZHd+G07eOeEVa9f00djX
+						CzvpoBj4NTc+MCh+cy2Tht1jfnJ+qDimwcalxKrqrh5gpkEKhhqDuae22O0YNvSc
+						qn0UmcW8TMMfELxWoTCQqrhjUmj+W81pA3DscKjIBrCw5JO2jx26G7T7aVwup+4F
+						rxIoMVxFAgMBAAGjSDBGMCUGA1UdEQQeMByCGmxhYy1yZXBvLXRlc3Q3LmlzLmVk
+						LmFjLnVrMB0GA1UdDgQWBBSrFc86IEslzFbTxavZOub0iPEckTANBgkqhkiG9w0B
+						AQUFAAOCAQEAq8KlygpvbFKXBFSTMZ3LRXa0yaFzmF6O6LnzhxPqBixLAMf0r2p8
+						VOodPnPCcxpJb0hb2I334gt8DEk+ZqSKhWXUvtwbzanyIek79mTfs6X0PF4a3RbQ
+						1NzqpKPVebeZj1WytH4pbQ99vmkruwlg/gB8QDi1FGL2T8fDLPZ9s7ML//MyRvcI
+						V2JsDcGNJie/kRsvOLHgX5UsHXVaCv6sLgbghj7y3YPiuIJP1INYmqdaVyIXOhrb
+						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>
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
new file mode 100644
index 00000000..d3562a75
--- /dev/null
+++ b/swamid-interfederations-2.0/www.era.lib.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,78 @@
+<?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>
+      <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>
+						MIIDFTCCAf2gAwIBAgIJAIOsYTB61XKdMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGmxhYy1yZXBvLWxpdmU3LmlzLmVkLmFjLnVrMB4XDTEzMDMyOTE0MTMxNFoX
+						DTIzMDMyNzE0MTMxNFowJTEjMCEGA1UEAxMabGFjLXJlcG8tbGl2ZTcuaXMuZWQu
+						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+zOVnC2mBcnCT
+						fr26aA/wrJLM65swDcG8Lt7gwHxntEg9tOwrU3Rl35XMPSPbXZU0TWyWdDAW3/PC
+						9i0271PkaygdChqNLf+1norKfmWMzogCiabPSkXInm8qfEWV4gwIa8SFtQ/cQCLF
+						F8nn5AWtXilZbvOas7LPdoQQ8w6m8GFotkEEmATaanVMFbovITbs2xqIqvwSMYwu
+						JzMYzehMeSnceRxuhyuP4xLAMz+UYlzjq6bljIIke3xUcaeZCt4hihJi7JhKiFQa
+						IxenT1bGglNvSQmIWCfiG5ax6zobIrMG5iH2PdtzY/C9YSJpZNrCDyRe+i5IWonM
+						/Hq+4wSrAgMBAAGjSDBGMCUGA1UdEQQeMByCGmxhYy1yZXBvLWxpdmU3LmlzLmVk
+						LmFjLnVrMB0GA1UdDgQWBBRwFfQJ/pyvVGsQAwTPkd3s4eVQRzANBgkqhkiG9w0B
+						AQUFAAOCAQEAf3EeDDtDZSMO4cF6IZFkLRlWMZjEYbnNcBgimbAB1rqCvXQo1NqT
+						xDyKpZ8Lfxax1dsvdotu9ltkFkmSLTF8lAHkNDu8VB2XvOWJG5Zy57xmaRPpDj1z
+						ese9Mz2wHuFEngOh4CuTPTCvYv80VtSVBh4xmGSqC0HWcfrcKvxhwVz3RmyDtiaV
+						gPqu9DPDi6CHtxNn9TRhfTZck2NBGn2hPW2Zzt+L9KSNi9goUsHYUC4q9v17v0v4
+						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>
diff --git a/swamid-interfederations-2.0/www.essexstudent.com-shibboleth.xml b/swamid-interfederations-2.0/www.essexstudent.com-shibboleth.xml
new file mode 100644
index 00000000..14a59de3
--- /dev/null
+++ b/swamid-interfederations-2.0/www.essexstudent.com-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.euppublishing.com-shibboleth.xml b/swamid-interfederations-2.0/www.euppublishing.com-shibboleth.xml
new file mode 100644
index 00000000..21dc0086
--- /dev/null
+++ b/swamid-interfederations-2.0/www.euppublishing.com-shibboleth.xml
@@ -0,0 +1,52 @@
+<?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>
+						MIIDrzCCApegAwIBAgIJAPbC/ThktAkhMA0GCSqGSIb3DQEBBQUAMIGWMQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEeMBwGA1UEAxMVd3d3LmV1cHB1Ymxpc2hpbmcuY29t
+						MB4XDTA5MTEyNTE5MzUxMFoXDTE5MTEyMzE5MzUxMFowgZYxCzAJBgNVBAYTAlVT
+						MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEdMBsG
+						A1UEChMUQXR5cG9uIFN5c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBTeXN0
+						ZW1zLCBJbmMuMR4wHAYDVQQDExV3d3cuZXVwcHVibGlzaGluZy5jb20wggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwvbPrKwrgbolzvuT5ru6f90JUh/P9
+						RK+DggKww8r/wmfAi2HDRa51Lcpjp4UosVnV4RjTVBS7G73lRIpbkt29EANAIxLo
+						WA/9RgTv4JO3bu0hxrHEkWsX3LCeAOGGAnOO24k3OCKEUeVssm+4u0x4/zKB541Z
+						SE8nexXu/PnHZHSgZP4+hQ8D19fRmLLtqaI67SKGuZob60St/JqCgf1/UFFRTmBl
+						b8mnre1n6jsl7uTfCh0WEmI9xr7DkVb+z2FxfIzSt4F4atC5ZVvME3lRTvuu0VRZ
+						nAnNd+vv1pP7ybRwhroUzRDBUUzLDrc6gRKQAug20gmOy8iculZyjB1xAgMBAAEw
+						DQYJKoZIhvcNAQEFBQADggEBAKX2oU8Q6150mQ5dCH1RFyX3qDYcPTlDOB/uGxHa
+						6IPeF2iPF+xh3aZQ6x3qHafDSPREVMELDdDdk+FuS08fOyGoEwX/tr04uKYex8FG
+						IxB49UbcuG7QcHlj3aV4RY1u2oztIO/4LUpqCyXrtICSK4JHuXjPdPgwvSlPspig
+						yC4ZlUrZ78JZXVOAbXqtaylM7bIvnDhcz+4mwYyijXgRSEygf5XTU87rkZxcvTWv
+						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:1.0:profiles:artifact-01" Location="https://www.euppublishing.com/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.euppublishing.com/action/samlACS" 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
new file mode 100644
index 00000000..7145ee5f
--- /dev/null
+++ b/swamid-interfederations-2.0/www.europeansources.info-shibboleth-sp.xml
@@ -0,0 +1,92 @@
+<?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>
+      <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>
+						MIIDPzCCAiegAwIBAgIJAKXvxs0f16ZOMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy5ldXJvcGVhbnNvdXJjZXMuaW5mbzAeFw0xMDExMDUwNDA1NDBaFw0z
+						MDEwMzEwNDA1NDBaMCMxITAfBgNVBAMTGHd3dy5ldXJvcGVhbnNvdXJjZXMuaW5m
+						bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALtY3r1/Ce/g21A23jIA
+						A+p5vLCT5Ys1rEMQfTG2v2TSaMadE+Cv+cs6Srid0ViHzIrNnniBtccbGxjie0Jn
+						/wogTebE5mot9SikTg8NBZ4DPBWZGbL7K2pDKkzCEseXgpitrKq8LNfTSpypLEKL
+						Mgus2F2a0MPIMqnmaNDLFbw5vP2VM5Xl9C9J6+ze0XzAQqLyfveaELgapFNXZNvH
+						w4L2dsIL1bl07EaXxW71fbY5dHfO4V81bc+2Y7huDn8MaaYMFT6JhPLa7oUwtftt
+						Mp/LsjneIrSTW22VwGNrqE4/bvpFJPJWT3JT/t/+MQ+sP8KHCkzXNYJgpy1lIew3
+						nwMCAwEAAaN2MHQwUwYDVR0RBEwwSoIYd3d3LmV1cm9wZWFuc291cmNlcy5pbmZv
+						hi5odHRwczovL3d3dy5ldXJvcGVhbnNvdXJjZXMuaW5mby9zaGliYm9sZXRoLXNw
+						MB0GA1UdDgQWBBTuv2FY5i6UPbuqzxAnAuce+GomvzANBgkqhkiG9w0BAQUFAAOC
+						AQEAKNnwdcrSsx7LQSzpxcggbMkOJdk1BBdMc1vAn4NGBoOK4qDrbj+M7a9S+tRP
+						7WjCdhxl+1fjYH7FuN05EoecHLuBqp6TWW2BRRetk7K4fE3LeuowIknu9ZxS9OrY
+						eyZJMNlOx8Qlu8YOIMbhjgWBoMjz3tNf/AX7umjTWZYNftEnopxPY6SLLSjPvDN7
+						W0aUUZxfepCHC3ChYL24fHsDzPOB75N6XfoGbiIig8QCFSXGgHNybjVMgMvsnL02
+						+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>
+						MIIDPzCCAiegAwIBAgIJAKXvxs0f16ZOMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy5ldXJvcGVhbnNvdXJjZXMuaW5mbzAeFw0xMDExMDUwNDA1NDBaFw0z
+						MDEwMzEwNDA1NDBaMCMxITAfBgNVBAMTGHd3dy5ldXJvcGVhbnNvdXJjZXMuaW5m
+						bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALtY3r1/Ce/g21A23jIA
+						A+p5vLCT5Ys1rEMQfTG2v2TSaMadE+Cv+cs6Srid0ViHzIrNnniBtccbGxjie0Jn
+						/wogTebE5mot9SikTg8NBZ4DPBWZGbL7K2pDKkzCEseXgpitrKq8LNfTSpypLEKL
+						Mgus2F2a0MPIMqnmaNDLFbw5vP2VM5Xl9C9J6+ze0XzAQqLyfveaELgapFNXZNvH
+						w4L2dsIL1bl07EaXxW71fbY5dHfO4V81bc+2Y7huDn8MaaYMFT6JhPLa7oUwtftt
+						Mp/LsjneIrSTW22VwGNrqE4/bvpFJPJWT3JT/t/+MQ+sP8KHCkzXNYJgpy1lIew3
+						nwMCAwEAAaN2MHQwUwYDVR0RBEwwSoIYd3d3LmV1cm9wZWFuc291cmNlcy5pbmZv
+						hi5odHRwczovL3d3dy5ldXJvcGVhbnNvdXJjZXMuaW5mby9zaGliYm9sZXRoLXNw
+						MB0GA1UdDgQWBBTuv2FY5i6UPbuqzxAnAuce+GomvzANBgkqhkiG9w0BAQUFAAOC
+						AQEAKNnwdcrSsx7LQSzpxcggbMkOJdk1BBdMc1vAn4NGBoOK4qDrbj+M7a9S+tRP
+						7WjCdhxl+1fjYH7FuN05EoecHLuBqp6TWW2BRRetk7K4fE3LeuowIknu9ZxS9OrY
+						eyZJMNlOx8Qlu8YOIMbhjgWBoMjz3tNf/AX7umjTWZYNftEnopxPY6SLLSjPvDN7
+						W0aUUZxfepCHC3ChYL24fHsDzPOB75N6XfoGbiIig8QCFSXGgHNybjVMgMvsnL02
+						+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>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:smith@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
new file mode 100644
index 00000000..1f4bb940
--- /dev/null
+++ b/swamid-interfederations-2.0/www.eusa.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
diff --git a/swamid-interfederations-2.0/www.exacteditions.com-shibboleth.xml b/swamid-interfederations-2.0/www.exacteditions.com-shibboleth.xml
new file mode 100644
index 00000000..d8529641
--- /dev/null
+++ b/swamid-interfederations-2.0/www.exacteditions.com-shibboleth.xml
@@ -0,0 +1,156 @@
+<?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"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn: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
+						b25zLmNvbTEpMCcGCSqGSIb3DQEJARYac3lzYWRtaW5AZXhhY3RlZGl0aW9ucy5j
+						b20wHhcNMTIxMjA1MTA0NzE5WhcNMjIxMjAzMTA0NzE5WjCBmDELMAkGA1UEBhMC
+						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRowGAYDVQQKExFF
+						eGFjdEVkaXRpb25zIEx0ZDEgMB4GA1UEAxMXbG9naW4uZXhhY3RlZGl0aW9ucy5j
+						b20xKTAnBgkqhkiG9w0BCQEWGnN5c2FkbWluQGV4YWN0ZWRpdGlvbnMuY29tMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzooyLuz1P5Qs4C0CZddAq4Ck
+						zkLR04FgM97g8h41A1zDl3LpoILduq/KhKALIBMT3PPoctapBQFMgDtqBWzlQKJQ
+						wIEF4JkZ7BAvSNg9+bDJs1uUMt0O2Q7vbpjEEX4yDDuQ/tayJKzC7Ak6LXuGPtuc
+						5+t5Hf4WNLrzOBPgkR0il/ndUPLr7KJSV7M6LwUbfmGpgmtgY0h+Tw0E/WJqKnnb
+						/raLTqzA8diyn4CflRG214ClyUiQ5Z4r6bQ77QkNTTHTXrrQNn5ldGri8ZcESmqu
+						BrvFDHTH3CQWk4+d8XYZIRVNWen9gSrIs7NQ3de4JQ3CWkhtFXzalZnUOPwRqwID
+						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
+						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQURh5aI0DQPxc3lwxBVaRrOB4/Rzgw
+						HwYDVR0jBBgwFoAURh5aI0DQPxc3lwxBVaRrOB4/RzgwDQYJKoZIhvcNAQEFBQAD
+						ggEBAKVhcW6weezQma6IkhLqLzfxtGuEe41Aky7KQyHC350hWgWs377WLBVpEcVH
+						Cba/IEGQFz0hJlXFXHPjI+htQSkIFREHuc1SmL9CBsYS1G/4+Rt3TukjzP/MogiU
+						BdV2TmE10Y6f2Q1ZQfKQaUjOgPwr/odpUZoT5EBx1Z0/JybrDVmJxxKW5CT4sWvW
+						1PaHcO6MXXTYXUFW10yGFGGkkd3mz6vCUjz2fW9AfybyEeexs3oSW9Icg95WxYdO
+						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>
+						MIIEMDCCAxigAwIBAgIJAISCsINDzLsWMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
+						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGjAYBgNV
+						BAoTEUV4YWN0RWRpdGlvbnMgTHRkMSAwHgYDVQQDExdsb2dpbi5leGFjdGVkaXRp
+						b25zLmNvbTEpMCcGCSqGSIb3DQEJARYac3lzYWRtaW5AZXhhY3RlZGl0aW9ucy5j
+						b20wHhcNMTIxMjA1MTA0NzE5WhcNMjIxMjAzMTA0NzE5WjCBmDELMAkGA1UEBhMC
+						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRowGAYDVQQKExFF
+						eGFjdEVkaXRpb25zIEx0ZDEgMB4GA1UEAxMXbG9naW4uZXhhY3RlZGl0aW9ucy5j
+						b20xKTAnBgkqhkiG9w0BCQEWGnN5c2FkbWluQGV4YWN0ZWRpdGlvbnMuY29tMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzooyLuz1P5Qs4C0CZddAq4Ck
+						zkLR04FgM97g8h41A1zDl3LpoILduq/KhKALIBMT3PPoctapBQFMgDtqBWzlQKJQ
+						wIEF4JkZ7BAvSNg9+bDJs1uUMt0O2Q7vbpjEEX4yDDuQ/tayJKzC7Ak6LXuGPtuc
+						5+t5Hf4WNLrzOBPgkR0il/ndUPLr7KJSV7M6LwUbfmGpgmtgY0h+Tw0E/WJqKnnb
+						/raLTqzA8diyn4CflRG214ClyUiQ5Z4r6bQ77QkNTTHTXrrQNn5ldGri8ZcESmqu
+						BrvFDHTH3CQWk4+d8XYZIRVNWen9gSrIs7NQ3de4JQ3CWkhtFXzalZnUOPwRqwID
+						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
+						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQURh5aI0DQPxc3lwxBVaRrOB4/Rzgw
+						HwYDVR0jBBgwFoAURh5aI0DQPxc3lwxBVaRrOB4/RzgwDQYJKoZIhvcNAQEFBQAD
+						ggEBAKVhcW6weezQma6IkhLqLzfxtGuEe41Aky7KQyHC350hWgWs377WLBVpEcVH
+						Cba/IEGQFz0hJlXFXHPjI+htQSkIFREHuc1SmL9CBsYS1G/4+Rt3TukjzP/MogiU
+						BdV2TmE10Y6f2Q1ZQfKQaUjOgPwr/odpUZoT5EBx1Z0/JybrDVmJxxKW5CT4sWvW
+						1PaHcO6MXXTYXUFW10yGFGGkkd3mz6vCUjz2fW9AfybyEeexs3oSW9Icg95WxYdO
+						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>
+						MIID8DCCAtigAwIBAgIJAKxba9CqnWAUMA0GCSqGSIb3DQEBBQUAMHkxCzAJBgNV
+						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEbMBkGA1UE
+						ChMSRXhhY3QgRWRpdGlvbnMgTHRkMQswCQYDVQQLEwJJVDEeMBwGA1UEAxMVd3d3
+						LmV4YWN0ZWRpdGlvbnMuY29tMB4XDTEwMDkwNjExMTY0NVoXDTIwMDkwMzExMTY0
+						NVoweTELMAkGA1UEBhMCR0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9u
+						ZG9uMRswGQYDVQQKExJFeGFjdCBFZGl0aW9ucyBMdGQxCzAJBgNVBAsTAklUMR4w
+						HAYDVQQDExV3d3cuZXhhY3RlZGl0aW9ucy5jb20wggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQDXxRMVhOzIQL1SIn7l2fbUOxi6uRY48V/owYArPGWRgRYz
+						Lvs97rM5O/4SHKgvwEcnr7cUA+4800RwNFZYAMwmAlsGZA5mY2pM51Gs07r/2ivX
+						bfalA2AaXFje/VQ6IqvDWCvLaZyrGfW+kxJqAgZn7yQEZvmIIHkcwpLeWim2kpgx
+						NrsfrsYa9Nypj2GRL1hNDyd9McQLtE+3BHZNBrgjoqVHBcaViutGaVm+NNzNoLQq
+						N6Jmxts9rqxaO4uCi3GOSHF4Wq6kwZ6G4q+NLd2aHyU8m+bygTD1zTKInw8Va3ow
+						EgctIZrtAgWeQMbcOu0K28X4eC6x+Nj2m6F/JppzAgMBAAGjezB5MAkGA1UdEwQC
+						MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
+						MB0GA1UdDgQWBBRM5kk9f2DeMFkEc2yiaG74jtrINzAfBgNVHSMEGDAWgBRM5kk9
+						f2DeMFkEc2yiaG74jtrINzANBgkqhkiG9w0BAQUFAAOCAQEAwbyMXwjSBkutbny+
+						1PxWMuIKhWCEkKh/yNAs/7DBJkg1ytRryV3nXYmn0AQ0TwEouebQzG3mxDNZBMF3
+						em2+1p4MLUaEos0XTze3OhVECYo231fw1YrioW9M8LEJzkcytvA5WY2avsXOeJRa
+						uPp/iZNz6/4v0Sap+vij1u+pMQ5rV5pPL5cLmF6I0BHS93L5ky8J3Hz4oJMA1rJa
+						Hivwzjz5aLgvSWrxrWj733BvjmE7+/i/CVRi3S73fP9SrY4jAwbyxVlVdmwA/Q0s
+						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>
+						MIID8DCCAtigAwIBAgIJAKxba9CqnWAUMA0GCSqGSIb3DQEBBQUAMHkxCzAJBgNV
+						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEbMBkGA1UE
+						ChMSRXhhY3QgRWRpdGlvbnMgTHRkMQswCQYDVQQLEwJJVDEeMBwGA1UEAxMVd3d3
+						LmV4YWN0ZWRpdGlvbnMuY29tMB4XDTEwMDkwNjExMTY0NVoXDTIwMDkwMzExMTY0
+						NVoweTELMAkGA1UEBhMCR0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9u
+						ZG9uMRswGQYDVQQKExJFeGFjdCBFZGl0aW9ucyBMdGQxCzAJBgNVBAsTAklUMR4w
+						HAYDVQQDExV3d3cuZXhhY3RlZGl0aW9ucy5jb20wggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQDXxRMVhOzIQL1SIn7l2fbUOxi6uRY48V/owYArPGWRgRYz
+						Lvs97rM5O/4SHKgvwEcnr7cUA+4800RwNFZYAMwmAlsGZA5mY2pM51Gs07r/2ivX
+						bfalA2AaXFje/VQ6IqvDWCvLaZyrGfW+kxJqAgZn7yQEZvmIIHkcwpLeWim2kpgx
+						NrsfrsYa9Nypj2GRL1hNDyd9McQLtE+3BHZNBrgjoqVHBcaViutGaVm+NNzNoLQq
+						N6Jmxts9rqxaO4uCi3GOSHF4Wq6kwZ6G4q+NLd2aHyU8m+bygTD1zTKInw8Va3ow
+						EgctIZrtAgWeQMbcOu0K28X4eC6x+Nj2m6F/JppzAgMBAAGjezB5MAkGA1UdEwQC
+						MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
+						MB0GA1UdDgQWBBRM5kk9f2DeMFkEc2yiaG74jtrINzAfBgNVHSMEGDAWgBRM5kk9
+						f2DeMFkEc2yiaG74jtrINzANBgkqhkiG9w0BAQUFAAOCAQEAwbyMXwjSBkutbny+
+						1PxWMuIKhWCEkKh/yNAs/7DBJkg1ytRryV3nXYmn0AQ0TwEouebQzG3mxDNZBMF3
+						em2+1p4MLUaEos0XTze3OhVECYo231fw1YrioW9M8LEJzkcytvA5WY2avsXOeJRa
+						uPp/iZNz6/4v0Sap+vij1u+pMQ5rV5pPL5cLmF6I0BHS93L5ky8J3Hz4oJMA1rJa
+						Hivwzjz5aLgvSWrxrWj733BvjmE7+/i/CVRi3S73fP9SrY4jAwbyxVlVdmwA/Q0s
+						A7ecb0GjcvX16ir1D/d6Y3/E0guV3Ri4GpJ8/K3sz65n6Gqiwfm5yuehIOvniQih
+						BvmkLw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..4ba7aaf6
--- /dev/null
+++ b/swamid-interfederations-2.0/www.exeterguild.org-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.future-science.com-shibboleth.xml b/swamid-interfederations-2.0/www.future-science.com-shibboleth.xml
new file mode 100644
index 00000000..ff1ae02e
--- /dev/null
+++ b/swamid-interfederations-2.0/www.future-science.com-shibboleth.xml
@@ -0,0 +1,54 @@
+<?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>
+						MIID8TCCAtmgAwIBAgIJAK72JYaVEOKrMA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEfMB0GA1UEAxMWd3d3LmZ1dHVyZS1zY2llbmNlLmNv
+						bTEeMBwGCSqGSIb3DQEJARYPdmFrZUBhdHlwb24uY29tMB4XDTA5MTAwNjE3NDMy
+						M1oXDTE5MTAwNDE3NDMyM1owgbcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxp
+						Zm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEdMBsGA1UEChMUQXR5cG9uIFN5
+						c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR8wHQYD
+						VQQDExZ3d3cuZnV0dXJlLXNjaWVuY2UuY29tMR4wHAYJKoZIhvcNAQkBFg92YWtl
+						QGF0eXBvbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/HtWP
+						CPuovxFL1y8Ozgg7LtETgC7/fROj9bKoWeaYRMWlK2X5AVRrwk0E2PSAdb7TKcve
+						WxpgNYba9wWHOg0jC9DYtEMHV+LBRW7AXClme/RPYhC47unmhrF2NU+Vi/VIrD1t
+						dz9rNNxq8oJNorhZSv6xx49hSbB5wqsFZ1G4wnskA7gxye80BEwY4pUTs7ISb6LW
+						oLekbcRMtJJGQLqcegu3GXGekf6iRalL87boJ5nosZ+TwCf1ZTA/8ixc1BzzPmgB
+						/cj8KYefduCHyCJw1OkR8AgC2eayLLdn3txfkhUYfuyoqJx4+ZnMh3O/g+yV1CTm
+						TchBqZuEch0fAPw7AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBABNUiw9k/fp21JOG
+						3EkMMDqpj2SMVWMzKLDmUeSkYi0h3cVr1xQqjUvCT0g8Jasn52t2d+d8ValvJURQ
+						IFaYdTcovhWg81/5Hs426CnPPAz52xhMBG4D6lWq70zHEjouhSdXdQHCzt29gWHr
+						oU+Tud/tjX1Oq9/YXwXt60oimvu9O59OTZH+qsHZUFinIvLV2lPeHFv96ajVxa1P
+						ZGzmgtTGMVPhI3dw6xtManC5zfL9EpcI3lQFRpeQ9nPNYteDuuJ0NVqRL/8GIAus
+						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:1.0:profiles:artifact-01" Location="https://www.future-science.com/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.future-science.com/action/samlACS" 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
new file mode 100644
index 00000000..a9a81eb9
--- /dev/null
+++ b/swamid-interfederations-2.0/www.futuremedicine.com-shibboleth.xml
@@ -0,0 +1,54 @@
+<?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>
+						MIID8TCCAtmgAwIBAgIJAJ/77lkMaSGrMA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEfMB0GA1UEAxMWd3d3LmZ1dHVyZW1lZGljaW5lLmNv
+						bTEeMBwGCSqGSIb3DQEJARYPdmFrZUBhdHlwb24uY29tMB4XDTA5MTAyMDIwMDgz
+						MFoXDTE5MTAxODIwMDgzMFowgbcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxp
+						Zm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEdMBsGA1UEChMUQXR5cG9uIFN5
+						c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR8wHQYD
+						VQQDExZ3d3cuZnV0dXJlbWVkaWNpbmUuY29tMR4wHAYJKoZIhvcNAQkBFg92YWtl
+						QGF0eXBvbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD2IolM
+						mAnByBWRn9mH2ZgyhN4KN18sMwlebyxrBCZhJOujYy//cbdF7I3tFLYPXhjqqhaa
+						aGFWkqSI47mbWX4OisiIY5JGdDMux76PQDno+oiiC10Hv2gbVZg7HH9TfaH3huBj
+						T5nyI1iCD5EYjJScda0PBDuGa8I4w7+3HigzpX1i6byUgQS482fPMRIlHYEZhj99
+						udmTrTqf6G55Ftooe4YZVogiUJGfZ8HN8x62JkLTRXYYlvTTDXD4u64cmJfnXQ5R
+						SZXWT6qklJGBGFWaOfUvdcWKPcrk6VMvu6qWVFpAjzhvkprgxH2jOU2L0jq6bmV+
+						FbHL6XfOzYNd7IRxAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBABfRCQbbPRMMrFXP
+						LQcmKtEHoLRyrgp8V/Otj4fVzp3vrgQLq6a3pleT8ypb4KEWmLfKuJ94Ew4HoQDo
+						TebFPPD37AJd6UynhKonh6KDW6SphFHr6mbyo3RoPLlK0ksWcKa4eyOXTTCHeQ5R
+						cZEndtU6U7kAynxPaKAJjGM4FJeiCNKxrfrAiTckIkT9L4+AOCS6YAmM2axVZVnL
+						CYtfL5oR2aEzKbxYlFbHiS7aW8bcu6xU6ngCO198AOZYgTDLj/fkyOBy9ANlkeZh
+						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:1.0:profiles:artifact-01" Location="https://www.futuremedicine.com/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.futuremedicine.com/action/samlACS" 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
new file mode 100644
index 00000000..9f6367f6
--- /dev/null
+++ b/swamid-interfederations-2.0/www.fxu.org.uk-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
diff --git a/swamid-interfederations-2.0/www.gkunions.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.gkunions.co.uk-shibboleth.xml
new file mode 100644
index 00000000..64f11b35
--- /dev/null
+++ b/swamid-interfederations-2.0/www.gkunions.co.uk-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
diff --git a/swamid-interfederations-2.0/www.glew.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.glew.org.uk-shibboleth.xml
new file mode 100644
index 00000000..ec09548b
--- /dev/null
+++ b/swamid-interfederations-2.0/www.glew.org.uk-shibboleth.xml
@@ -0,0 +1,68 @@
+<?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>
+      <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>
+						MIIDJzCCAg+gAwIBAgIJAONwxil6WuG0MA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
+						BAMTIHMxNTQwNDg4Ni5vbmxpbmVob21lLXNlcnZlci5pbmZvMB4XDTEyMDcyNzEw
+						MDQzNFoXDTIyMDcyNTEwMDQzNFowKzEpMCcGA1UEAxMgczE1NDA0ODg2Lm9ubGlu
+						ZWhvbWUtc2VydmVyLmluZm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDRvVh211zdEJqy++pyzLM4OrFLrCIaceSEZNHRM/NvhU3wpeaD3TjACHr96yhg
+						FfpAtnwv2psto3uOGqtrRLFr5pEAxw+8j3FE3tCu896V3XTque8LrKbYTvBErWd0
+						yYyU/38mX5roVlI6s8Jyl+sOox6BfQsy1slMD9EOL/8qd7rfE0uftvZ63SMJJRea
+						UPP3oMJW6k5C+n1uHPUbfakcVjuxd32Cd6oPiEaVpBW6/um10tfdAV0xA2i7pQBr
+						q8yfRantSUAUUOyGjLB19P63/r8BzkgVnkhkcJy/mzbju4240lZvNFzJEaqq7in0
+						KFAa6GE9QmRySrx7J/aaRDqVAgMBAAGjTjBMMCsGA1UdEQQkMCKCIHMxNTQwNDg4
+						Ni5vbmxpbmVob21lLXNlcnZlci5pbmZvMB0GA1UdDgQWBBSn6CELRx3aEXbVPcA3
+						Z5LHvXlUtDANBgkqhkiG9w0BAQUFAAOCAQEAw2OvHP2BT1/KtDrbojIQRjTHJgl/
+						z2ufah7O8fc+u9Vms9hu6KTGytQYjs9R+mjI9Jh39QQn+Cgx63oq6p7lHxnb74dC
+						wmWYEq1ZVtj1O1YwWeZqN1JozQQPpnET3bDW3qK9H7e+LSdmpIr7fYC0vYFoSIpa
+						0wgVD2/V6Km5hQbrFhvsmUSKgyuUZjlRPhiD3vE3UxGfKhAS3Y5aE8u43AwuPfXK
+						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>
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
new file mode 100644
index 00000000..4b2a80c2
--- /dev/null
+++ b/swamid-interfederations-2.0/www.goglasgow.org.uk-shibboleth-sp.xml
@@ -0,0 +1,76 @@
+<?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>
+      <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>
+						MIIEgDCCA2igAwIBAgIJAPMjaLYGwUMUMA0GCSqGSIb3DQEBBQUAMIHAMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxHTAb
+						BgNVBAoTFEdsYXNnb3cgQ2l0eSBDb3VuY2lsMSAwHgYDVQQLExdHYXRld2F5IFNo
+						YXJlZCBTZXJ2aWNlczEdMBsGA1UEAxMUd3d3LmdvZ2xhc2dvdy5vcmcudWsxLDAq
+						BgkqhkiG9w0BCQEWHWFsaXN0YWlyLmdpbGxlc3BpZUBjZWcub3JnLnVrMB4XDTEz
+						MDYyNDA5MzQxMloXDTIzMDYyMjA5MzQxMlowgcAxCzAJBgNVBAYTAkdCMREwDwYD
+						VQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dvdzEdMBsGA1UEChMUR2xhc2dv
+						dyBDaXR5IENvdW5jaWwxIDAeBgNVBAsTF0dhdGV3YXkgU2hhcmVkIFNlcnZpY2Vz
+						MR0wGwYDVQQDExR3d3cuZ29nbGFzZ293Lm9yZy51azEsMCoGCSqGSIb3DQEJARYd
+						YWxpc3RhaXIuZ2lsbGVzcGllQGNlZy5vcmcudWswggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQCuXaIfYI28Kv8qtSKiTVEEluuBBvp49gwR99Pk/5a96IdE
+						ugnvRlJkKBAqzcHu1bmzbej/2QgbHi75pQd1QfSf0g5rf2yZnCnuRXkHKFL5bXtx
+						JPaHOEJbTR+7PZgiTHL7LGrdzaYwJMslzNSQrsfvSc+ckulLg7rpfV6PZRISoyih
+						Tiqw7/OekZJMHeBV0nTrg4ZKO7thf/SComBdy8C4PcxFf60D2EsvHN5zUi9RWuOg
+						qk88jIjaL6WpjagtOarM0RzdN06MFTLMZKHcM7KypG9PNP6IqgngJWGR4RuPjBCh
+						901EJbNnXKNIgCQ1erFDq/egJWUGV6Ib5jSfjaVfAgMBAAGjezB5MAkGA1UdEwQC
+						MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
+						MB0GA1UdDgQWBBRAj9Nhd6oa2Pulo9Nyyhpgmg4ogTAfBgNVHSMEGDAWgBRAj9Nh
+						d6oa2Pulo9Nyyhpgmg4ogTANBgkqhkiG9w0BAQUFAAOCAQEAR2UuikFjGKF8bVi7
+						dzBd9gFcKJ0lRb4lOo3BIm1pO63D8KtUXIIvlbD/MeTGoT9yNV1gZe98Blbjq6Rg
+						In3V5jfQjZxHajEWY19aRRgu2b3OVLP1BXffuDxTdh5RN2t1vkhu619Clip1uPB9
+						y+NU2HPaqn/yKOwI2/Z2G5OkoArn/TzOSVzF29HV5BkD62KdDxysLeRi1IKSYGik
+						ecna87vaWMR0ITJSB7QMW3ZFjhS557rH9pLVFC6/M78QH9R+54Lz5EXkbZq9738H
+						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>
diff --git a/swamid-interfederations-2.0/www.guilfordjournals.com-shibboleth.xml b/swamid-interfederations-2.0/www.guilfordjournals.com-shibboleth.xml
new file mode 100644
index 00000000..b9539da9
--- /dev/null
+++ b/swamid-interfederations-2.0/www.guilfordjournals.com-shibboleth.xml
@@ -0,0 +1,52 @@
+<?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>
+						MIIDrTCCApWgAwIBAgIJAKnRupkZlL3vMA0GCSqGSIb3DQEBBQUAMIGVMQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEdMBsGA1UEAxMUZ3VpbGZvcmRqb3VybmFscy5jb20w
+						HhcNMTEwNjI4MjE1MjI0WhcNMjEwNjI1MjE1MjI0WjCBlTELMAkGA1UEBhMCVVMx
+						EzARBgNVBAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC1NhbnRhIENsYXJhMR0wGwYD
+						VQQKExRBdHlwb24gU3lzdGVtcywgSW5jLjEdMBsGA1UECxMUQXR5cG9uIFN5c3Rl
+						bXMsIEluYy4xHTAbBgNVBAMTFGd1aWxmb3Jkam91cm5hbHMuY29tMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAukY3Suc40qnHE6QmmMhIkFT74Pn1V/NB
+						rak3v7CSX0SZaF5eWhHE2qgnObdCCNzEOwKMprP0/cyLM4AfLou90RE9a3VyMu6k
+						f/DmMf5ZLJIIP6SF7y94N+gswlbPh9IXxQVAp7rR4qEqdYKThC3hz+/8G4UPFr+g
+						hy4xzz/Op35Zo2GYapsyuvclhzyfjj/YjT9CliNeGktdq6O97obw5oz5ZaAVlWlq
+						Sf6P0EKQUWRUxPfyutbjUVkuGWZtRJOXC3QZxhsvby31Rh2g5gIB2KiynKURGCl8
+						136mP4X2wVGqHnEdiA4+R4ofAEuBpuqSBeW4yAGUdLqVzxEcFl+m6wIDAQABMA0G
+						CSqGSIb3DQEBBQUAA4IBAQBR7zjTkZGpMUIQn8F/2yZcFu/Ub8j5Goop4FCLfuyN
+						LkVUwceiKlYVB05ZHr3TtHcyGjv2+19Ueo8QuNuI5BzqMRimfsiYdR6y44A1T5N6
+						YHi+cqfv6eKvXw+qLJ4k49ctR+8zV8YTVLgBBW3UJLW+r6MMUXtLfdBJGFigg/WT
+						u/VDMQFnTBgvQ0nSUnhuu3A8w+wXA2Yvk0gXIpnySD7ZhP99WcFDjFqwaYiu8iVS
+						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:1.0:profiles:artifact-01" Location="https://guilfordjournals.com/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://guilfordjournals.com/action/samlACS" 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
new file mode 100644
index 00000000..03e1d1a6
--- /dev/null
+++ b/swamid-interfederations-2.0/www.hallamstudentsunion.com-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+      <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>
+					MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+					BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+					WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+					AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+					FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+					Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+					kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+					0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+					5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+					gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+					BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+					EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+					70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+					QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+					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>
diff --git a/swamid-interfederations-2.0/www.hellou.com-shibboleth.xml b/swamid-interfederations-2.0/www.hellou.com-shibboleth.xml
new file mode 100644
index 00000000..513565bd
--- /dev/null
+++ b/swamid-interfederations-2.0/www.hellou.com-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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>
+      <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>
+						MIIC6DCCAdCgAwIBAgIJAKwi1R+TxXbDMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+						BAMTC2hlbGxvdS12bS0xMB4XDTEzMDYyNTEyMDczNloXDTIzMDYyMzEyMDczNlow
+						FjEUMBIGA1UEAxMLaGVsbG91LXZtLTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQDJcyWp4ZGOxVrc36Ncn4VAQLv4e1dgwn4V/ucyO39OSKgdsvAtr44m
+						KQP8ZBWbaCMPrRvAwW1I1bC9wcQzSLxOId/GPhZ531kwR/OhzaWEVi/ikrYBeWHZ
+						oJlIO2UQrMSt7GTRkMzE8UVsr7feL9FrtMxQk2a5BHkJMmz3c5lSR4aZIofF2qtl
+						LYJULFstJ0MNhQQjg8wX+eITXaVr02Qrja8W/AAXJRRDTLpgdpHF/kEdwUb0AuXi
+						NH8l9aEr1W0m4pglOIlGRg00Kh8sLwhWsRJ+LU6k5WpAFivdUHqJWwW8q734qwN1
+						v+qglQT6TfKBU+PLVLb9uO2RCDioysGVAgMBAAGjOTA3MBYGA1UdEQQPMA2CC2hl
+						bGxvdS12bS0xMB0GA1UdDgQWBBRvuVuGzl6/mdTbh+eNbjBS8s7EqzANBgkqhkiG
+						9w0BAQUFAAOCAQEAHyNrqqJLLoKi9TQ4KKgLrESdlIBOspbkpD7tXBK1q5vV8zyr
+						uAuevt9jCwuXsCctxR8/7oMJcE/4thxDYSxDCUssm5VVk7Sa422AeT+fzZuHSE9h
+						rNT8MjIEewCtYbt78b2ZaSLboRQ5Fp43I1WdAgYHOfadBPXJL1YbRFVeneKVgKtj
+						p8hidkLo0y8xx0nAZRUwMqqDOHNp/V/+DfJT14/Uzlzku1wmDvyKmmVVAhyvBHbr
+						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>
diff --git a/swamid-interfederations-2.0/www.icevirtuallibrary.com-shibboleth.xml b/swamid-interfederations-2.0/www.icevirtuallibrary.com-shibboleth.xml
new file mode 100644
index 00000000..d65f489d
--- /dev/null
+++ b/swamid-interfederations-2.0/www.icevirtuallibrary.com-shibboleth.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.icevirtuallibrary.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>
+						MIIDkjCCAnqgAwIBAgIETFGlqTANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMCR0IxFDASBgNV
+						BAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNVBAoTFVB1Ymxpc2hpbmcgVGVj
+						aG5vbG9neTEUMBIGA1UECxMLRW5naW5lZXJpbmcxHjAcBgNVBAMTFVB1Ymxpc2hpbmcgVGVjaG5v
+						bG9neTAeFw0xMDA3MjkxNjAwNDFaFw0yMDA3MjYxNjAwNDFaMIGKMQswCQYDVQQGEwJHQjEUMBIG
+						A1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEeMBwGA1UEChMVUHVibGlzaGluZyBU
+						ZWNobm9sb2d5MRQwEgYDVQQLEwtFbmdpbmVlcmluZzEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNo
+						bm9sb2d5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgDY7L3DZLJU1rL/0YYxpu3mN
+						pkyQ8aJvVwF3JRBD5NbV7eOCE4VmGhQVfHHSAv6jvcIyjDzIIVhFdFN/m8nud5xlIRWqkK2UB4r/
+						gfwQEPbcM+cKNUPwtVqk9z1XRIp338/vsu+LvC6F8+s8vkk95pnVShbVcTacfQLbOQEFNRDmSN5w
+						TVQUyHqm/pWknUz5Ot56JGXEOP0OXCqmpN4ajFdmPuC4ZQzra8A/noMKu2SBtYXGhrweqoPZRnJC
+						YUgzmSoKJrYsEuemkod2eGjdlVlGh3UT2iK+Cz/16G6zXmvUDCwxRULkYLYlUPSXih+S2T1Nbl4T
+						3NrmFpbWaQ4gSwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQACtChlhIaqb33d447kMf6Lup5cXbN7
+						rIEzbUf94mQTn8G50fs1udmRT7oaAokkh2FFlpRWLgdmHUVGmBNWtdF6ncHOKFXqdTFgCNeVZL7h
+						I8O6DPCAza4Ty7johPW9UL3PKj7ILTKh096EHFkryD4GAy8VGGEjR2rHQk0mSX7WFO2EfjIxGZUm
+						WQAbupXydVS4KEwl0FL5hIapvWWIVux97S+KKrsZQAi7QwfaY/2gjFP6bO6R+5kW52qrkhFVBnbY
+						CBn3v35bYqvPRQ6eQhp+1In1tWKybpA6aJOutsdEO4Z0ocWyw5d3oErlveYSNhQPubCO4XaMeEvY
+						zvIF4NlO
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.icevirtuallibrary.com/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.icevirtuallibrary.com/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Publishing Technology plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Publishing Technology: ICE Virtual Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.icevirtuallibrary.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Librarians</md:GivenName>
+    <md:EmailAddress>mailto:librarians@icevl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hatim</md:GivenName>
+    <md:SurName>Ghadiyali</md:SurName>
+    <md:EmailAddress>mailto:Hatim.Ghadiyali@publishingtechnology.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
new file mode 100644
index 00000000..e91c58ba
--- /dev/null
+++ b/swamid-interfederations-2.0/www.idcore.ac.uk-shibboleth.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIDDDCCAfSgAwIBAgIJAK7gd0sjQD2JMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF2FwcHMtZHJ1cGFsLmlzLmVkLmFjLnVrMB4XDTEyMDgyOTE1MTIxNVoXDTIy
+						MDgyNzE1MTIxNVowIjEgMB4GA1UEAxMXYXBwcy1kcnVwYWwuaXMuZWQuYWMudWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBP5Wgep0NwhDiAP5y9UHc
+						FRRZJ4fiL3mfrY4oQ2PvFsvN/jtDhuEuhHBsEpVOlcbKuaCUg9paOc68vIRMA6dC
+						dcfXXJNuQR5EGy/zWRZIefnvkw7oCsBYVJ+UjXcslXPaGXxpHFaTtN4vrtqaaoGO
+						aYNaIf32wSdyTl8sRgTobNzPWopnK6m1ekXrT154CZvNxwp6+kM90F0IBnb5Jvf4
+						buNIE0jOy2YlkZTdKgH9Kb7tmmHQ3gbtFdACFLXAMGs5CWGOnQ/1YoBQwFBOgOA/
+						W/9G/ZfhLhzEb0tb0PxmqsOZ96vzIqs2hd9IQECGQRgi0YV4ONhZE1dmLKTUmvzv
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2FwcHMtZHJ1cGFsLmlzLmVkLmFjLnVrMB0G
+						A1UdDgQWBBSh9CWZWwNRL+PnLAu7iijpQJysdTANBgkqhkiG9w0BAQUFAAOCAQEA
+						aSfbpYHZPKsyE0TjG3+ucOQB3qJ+tv2XREPZ/fLtxq8Hg5bMQHuOYOspkXYR9fH3
+						F5Hw6X/f9DowHflKU7HHWwc5TVa6P+vHVb6jGRopECgbU7nek/gfpjuA6I5VKlGA
+						yjJU2HXGnFJ+DamnYoH5tB5IcMqXJ4zop9KqCXHJbRCPJ0LVgarKhVQbxVK8sQ4O
+						PSI2TFKA8/4KbNfVe5L09FBKdsteBkrynMq+XvyRDdsyIgtyJm9uCRb6afaA+ukv
+						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>
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
new file mode 100644
index 00000000..c370c641
--- /dev/null
+++ b/swamid-interfederations-2.0/www.images.group.cam.ac.uk-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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>
+      <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>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						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>
diff --git a/swamid-interfederations-2.0/www.imperialhomesolutions.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.imperialhomesolutions.co.uk-shibboleth.xml
new file mode 100644
index 00000000..1f8c20c2
--- /dev/null
+++ b/swamid-interfederations-2.0/www.imperialhomesolutions.co.uk-shibboleth.xml
@@ -0,0 +1,105 @@
+<?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>
+      <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>
+						MIIC5TCCAc2gAwIBAgIJAPDeYJ9fK7sUMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+						BAMTCmNwNS0zNTM0OTQwHhcNMTQwNDIyMDc0MzU1WhcNMjQwNDE5MDc0MzU1WjAV
+						MRMwEQYDVQQDEwpjcDUtMzUzNDk0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAut1QMxWT6HWYp+apapBDYazxaeutbzmKH4LpLgnsLQQtNgWqx3Fer888
+						0h7vp0nMYKeZaB0kTliyBIxzYLc0CsfaKqm20QiOWfTlg53cdikVrtGDLc4id9zv
+						DQJhMjwgUXKvs0XwJN7yKsq8eSOCYyCE1TpJfK0VT4HHfh/Wn17QFNTDoR+jJ2i7
+						4bpxnaAOPI+/4vyW56fTDpLV9XwhtVv179zkloHfccbDRc57QvRrxMy3I7uQtU79
+						cr8QQ7CjpzjG43D1ncI741lVQcUimn2DDy282cgcFTaIif3mjVx51qIbrRqYfKsd
+						3rAMy5Bj2bleoOnpTwK0wJFbCNBkaQIDAQABozgwNjAVBgNVHREEDjAMggpjcDUt
+						MzUzNDk0MB0GA1UdDgQWBBQNe+WX17m5BA+2JOe1ipAKtySOTDANBgkqhkiG9w0B
+						AQUFAAOCAQEAIWpKD5IuImla1LnqP8sZn9NyKlYAKKZ36eiU6oTGGnGiWf4Wtd78
+						f/OP+hHUs05Jb6a1+JpoJhe5JUkadcNOizXtpp6xfq2Tb3C/iO+m68V+Og9K2fm3
+						yzOlWWQjfaiZUuf20Y+UCjP7IGHUyhAHve0ECYcqway3Kbz82KiopbhcoQJK93qf
+						hFPMyE5VqqCHA4B/rUj6ZsaBjGxTGZ0bopaAScMsUJpZ5LP4+NK+6aO1V4RZtve1
+						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>
diff --git a/swamid-interfederations-2.0/www.independence.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.independence.co.uk-shibboleth.xml
new file mode 100644
index 00000000..0c43e486
--- /dev/null
+++ b/swamid-interfederations-2.0/www.independence.co.uk-shibboleth.xml
@@ -0,0 +1,68 @@
+<?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>
+      <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"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDDCCAfSgAwIBAgIJALdHDkKittLZMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF3JlYWwxLnJlYWxuZXQyMDAwLmNvLnVrMB4XDTExMDgwMjEyMTYxNVoXDTIx
+						MDczMDEyMTYxNVowIjEgMB4GA1UEAxMXcmVhbDEucmVhbG5ldDIwMDAuY28udWsw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/Ogks/sRjSvAzujMkoEn7
+						89fJQ4EHrCbnvAF/7dAKRhsr2Yalkvuf6oNI+SI7NL1lUiNWOBYyIVBEl2Q9gyi3
+						5/AWMPDe0c1Kw7Y0lBBvKDEzyixlSfTh/Nszh4qgaVBvV1qaFc65SK4m+EWXoB+3
+						T1lUX/5upB188Xj4xtl+QDv1iPGNBRlfstG9RUMVgNHeHTCYLdWYQv+ZubbBJUkX
+						SZ+xedFVulYAMPn5qjh2F0z0fTw6yzY9arrWRohbVoZyUXODO+ekGTGMj4OHJk2a
+						BVvRzeCburjo8NRV58kq97zqEgPYqFeTj9eFxN7nkej5VRD3FWBPtH63DTLVIdAB
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3JlYWwxLnJlYWxuZXQyMDAwLmNvLnVrMB0G
+						A1UdDgQWBBQW+gIr9QKPFZn7blTtjZ4W/zt3JzANBgkqhkiG9w0BAQUFAAOCAQEA
+						B52AFbao2FOGfM1rS/XAy8j3qrLVJOPoEGevcN6lA+J0xfzLIQnqGgLNagIYMR/t
+						MMTLNK/Z7fTPQsDEXXr3aH+yKBjctyWz3vAkVM7r/JzopxSCuwzVNkawDqfeyXVW
+						ZkQfI16kQXh/Rdom2K6MMHG8YEKvc1w2UlnjX8qo7N8n2NqZiDZvvB1rP12ER0cq
+						QrQo1cgAM2crAb7eVXHxYVlfMqnD4y4xVkcwf1hoYEfxjFWExRKp+pom4tffxXs2
+						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>
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
new file mode 100644
index 00000000..eef7ee37
--- /dev/null
+++ b/swamid-interfederations-2.0/www.infectiousdisease.cam.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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.infectiousdisease.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.infectiousdisease.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>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
+						RsenNm/aXp0wIU+jHVmi/GAPCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
+						RsenNm/aXp0wIU+jHVmi/GAPCQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..9cf4514d
--- /dev/null
+++ b/swamid-interfederations-2.0/www.ingentaconnect.com-shibboleth.xml
@@ -0,0 +1,51 @@
+<?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>
+						MIIDbjCCAlagAwIBAgIES2K7ITANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJH
+						QjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEiMCAGA1UE
+						ChMZUHVibGlzaGluZyBUZWNobm9sb2d5IHBsYzEfMB0GA1UEAxMWd3d3LmluZ2Vu
+						dGFjb25uZWN0LmNvbTAeFw0xMDAxMjkxMDQwMzNaFw0yMDAxMjcxMDQwMzNaMHkx
+						CzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hm
+						b3JkMSIwIAYDVQQKExlQdWJsaXNoaW5nIFRlY2hub2xvZ3kgcGxjMR8wHQYDVQQD
+						ExZ3d3cuaW5nZW50YWNvbm5lY3QuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEArI43vZrkFNp7iDu15WSeQJHypb1dyWNnpHOwGiw5C2E5hlR9EoP8
+						1oIHAeviGP6ux25Jcpw60glnEJ/kXO7lXsq7qCHjfP0zFHtL0GB2g8TicQYOXSmq
+						2AlpWs6kXo4sNpzsVxfFUjE0XFH8fJ/xTmgXYZ0usz+AQ3cThMPqh14s+Y04ti4n
+						CmXFlQJvTaB68fYPn2LeArZV3peW1A9i6yqjJJJWesJwa8LIS6DFJto/MqgRVkPY
+						t09MzppaB5P50kfyZ6c4wHsn+e1eskP5MTbgwTZCtw6gKDrQHiXmsW/64yT0cg6b
+						zv3CWcvCatmKwQdZK8CnEI5eO9lSW7h/mwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+						AQCBMD1O5Vl0JjhkzhAGj4bxdVIiORt5XC5WA8t86tGRsM+/AGG7sOOWCDKwj0xo
+						EUkhSbsGksXyoiap/FGXCzEgyXIYPtr/SgwR/hcVd9aqlhCQJ2Fy06cMfPZYmJ+c
+						rv9YuSO0Bs0zqnsYVf+Sw+8fDNPcY5R4afYcUAh+VngzPc2TOV+RxgDC69laBqHU
+						4WhrXwC348vHmWnLbc+F4JG+ELE3Lid9WX/ieFC/wt3xqbpzaVPQPpi+G1PS7Wux
+						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">Publishing Technology 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>Dave</md:GivenName>
+    <md:SurName>Lord</md:SurName>
+    <md:EmailAddress>mailto:Dave.Lord@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.it.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..8300155b
--- /dev/null
+++ b/swamid-interfederations-2.0/www.it.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.it.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-12T12:56: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">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC9DCCAdygAwIBAgIJALiR16U+pefzMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+						BAMTD3d3dy5pdC5veC5hYy51azAeFw0xNDA5MDkwNjU5NTFaFw0yNDA5MDYwNjU5
+						NTFaMBoxGDAWBgNVBAMTD3d3dy5pdC5veC5hYy51azCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAOABFZclDrQXCNO8wK1S1Tt8039mZWM/56weI2lVBwmN
+						aai/dxp6Gm+vKqGAT6kjEKJfJ3pZolQgW5mCae/3OA8MAn0R8qS9X/rD9BxI5Ojt
+						cGKDJnEjjbmPr52NdYqyIYj20LN3bu4CW/8fDIc7UKKN22D2er8QS/qUVzjwtgju
+						aMh98joueAhStymx23IJXFhFMrg/Rq8JWdavUMCZbbs/RrrBQT5fIINJHvax0/fS
+						gxRRCzu4tm28PoC9Sk0S52DlL0zUCgowuWyUCr60ki/ACi+aCvf0GHStDnvdWixE
+						CMLnab/B4XFOv35fIBfq3ZXZ1tJwVI0uAhbqeXbjK/UCAwEAAaM9MDswGgYDVR0R
+						BBMwEYIPd3d3Lml0Lm94LmFjLnVrMB0GA1UdDgQWBBTuCDHn6ylly7cHFIau2Gav
+						jZRgLjANBgkqhkiG9w0BAQUFAAOCAQEAfqLFckAdO1Q1EWGbNCs1rMRRnrQhOJgY
+						5qbsoBKjfAij1z2avZJLtoqNmiSglMRJAaQymrx4lRUeZeZMWKvftE11c+9HRmq9
+						EN4fOmHyWttTc7QUtq+28Xj7N5t1yCYJPK04GcCoGy3x3ZF+Z08vCzIEk2OceE0r
+						duOhRjYNHwG+VZjOnhBKWOs6UeYSHEci4XKr7fF4ocCkoww1/edkVuZD2pGy7Sao
+						P/JIEQd+URAlarYO35ZmHsYStSGbaQqm219AXhRuI3AgwhwEeyNFPqH+R5iYq5Nk
+						UOpxlu7UHRZ26ugA3ldH/hcFkRPpDdopu7qESNCfpanceMeXx3Re8A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.it.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://www.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dandy-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dandy-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dandy-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dandy-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - www.it.ox.ac.uk</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NSMS</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</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
new file mode 100644
index 00000000..a70942b0
--- /dev/null
+++ b/swamid-interfederations-2.0/www.itslearning.com-shibboleth.xml
@@ -0,0 +1,51 @@
+<?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>
+						MIIDQDCCAiigAwIBAgIJAOCa2W5sQVpdMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFmVsb2dpbi5pdHNsZWFybmluZy5jb20wHhcNMTEwMTI1MDk0MTIyWhcNMjEw
+						MTIyMDk0MTIyWjAhMR8wHQYDVQQDExZlbG9naW4uaXRzbGVhcm5pbmcuY29tMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3/pjEfFtjLzqjahh8G57a4bE
+						xgDVLPMsVrYkxMwmjR0fvMjGD/WIldj/XKBga7EzMfSSqAtGcluHwcQotZn3VKzI
+						+pp5SDGnjaZLb5Dlx4Pqn8QXtv9fFdTU8bkk4nWJLAabrBV1PDNlc9TvLYo4BEKh
+						uK6WvNIZqshS4NX241PcyIW+/tbs3gY4ZpqCIgF21cX+UHX+JWxHrgKzWRXlpYRX
+						8/La7yxJxNsgeQfsNO9et8nAGcMFpATGGK9N4IcSzdlZM0vPLTcP5NrYhVrc4p/v
+						Sh2wVgCAX0RM4xXTKZSPiv2bbXqz1m+61cdY+097umpFqKP/4LcgRrOWyn8DoQID
+						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
+						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUK1LiEqSXXlTIZiRAUXIdhrxt50Yw
+						HwYDVR0jBBgwFoAUK1LiEqSXXlTIZiRAUXIdhrxt50YwDQYJKoZIhvcNAQEFBQAD
+						ggEBAF2W34ZCfjR4aZcTcNwLwAJBJZWNoJTpkzl6DiTLSTpmXjcDSVQQCUontqjp
+						WDatCmrM/5JamvZaNfyJ1tHrkNwvKEsvTzalLFs00E9GcOQq8I/Xfj6uBGAYICB5
+						eSKnhIHMJDlSc6ilYxDlB8KJM4UFXQ+SIsJLcX9AbsdHI0X/s68c42/teSQgN2Yc
+						wtiCUhjKgaY1iI6B/CaS0akF+hK4wi3+vV9Iis3zjOPZgmf6K+n/5HGKmplQF2H4
+						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>Aunkher</md:GivenName>
+    <md:SurName>Sidhu</md:SurName>
+    <md:EmailAddress>mailto:aunkher.sidhu@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sukesh</md:GivenName>
+    <md:SurName>Nischal</md:SurName>
+    <md:EmailAddress>mailto:sukesh.nischal@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
new file mode 100644
index 00000000..77471e9e
--- /dev/null
+++ b/swamid-interfederations-2.0/www.j2e.com-shibboleth.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.j2e.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>
+						MIIDCTCCAfGgAwIBAgIJAPqSMDPu7s7hMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnNlcnZlcjQwMjE1LnVrMm5ldC5jb20wHhcNMTAwODEyMTE0MTU2WhcNMjAw
+						ODA5MTE0MTU2WjAhMR8wHQYDVQQDExZzZXJ2ZXI0MDIxNS51azJuZXQuY29tMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm00KE1iG3uVXv+86GKejBCib
+						7bDRpAE5jS+NN/X+f7ix+pzYFbzAQrSfg97oJtaWTzmp2zULk5lsMVWIJbiyG/Uz
+						FpJgBhBf0lzHsVNKEnunJckoz5bYpgpCnVx9V2XrFw+tes7Sl5LhXiFdwqV8ottG
+						SrovCOzl74g4zn50g5wZsUticBrqWFNlSbFQISXFtFCUbqL4zf8zA/Wx6c3HEMZL
+						1WKPSHUbPgIjil0DPjEd0AToKZspcZozcRLWQ1iSPtswGuNin7FpVu+8M5szZY6f
+						rpiKTNfhYFNQxNKV5dnLCMlmVWqYIk3ZCfVJlxmP72DbRuJL6Vhd6wD7hYjatwID
+						AQABo0QwQjAhBgNVHREEGjAYghZzZXJ2ZXI0MDIxNS51azJuZXQuY29tMB0GA1Ud
+						DgQWBBT/nC5f54/+gnhLUYLGGV5YsxtdxzANBgkqhkiG9w0BAQUFAAOCAQEAlOyp
+						YMgWX6wsU/I2hIf1pkPBjsJCxC82pNCZjcSwZuAowueVnt5Xr70UjiAuwgLjJgQH
+						RARZKrWJ8mIkJrWbPi0/uLN8xV72e6V8F2MFTAWVvQ7Se8Bor4Q2fI7NvMwRrCbY
+						YhhlNdVyfNYzUikw5g8YDODoUA1cg1twOu/a0zt4GqCtqjGMLVASNBYud/UMtOAo
+						gI0klRGMhY5nZzvy/rBZL0WFaXsQ6Fk0Ywn+YQ6HZjTnQO23+T9vUXMBMEmomF2B
+						i291jv0WzvQWVDfWSxY3Z869r+Y/bFqbhv9YXKwDSOx52sscAl1yjy0vDwuMKHyr
+						FzKrATccENnvJUM7hQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDCTCCAfGgAwIBAgIJAPqSMDPu7s7hMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnNlcnZlcjQwMjE1LnVrMm5ldC5jb20wHhcNMTAwODEyMTE0MTU2WhcNMjAw
+						ODA5MTE0MTU2WjAhMR8wHQYDVQQDExZzZXJ2ZXI0MDIxNS51azJuZXQuY29tMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm00KE1iG3uVXv+86GKejBCib
+						7bDRpAE5jS+NN/X+f7ix+pzYFbzAQrSfg97oJtaWTzmp2zULk5lsMVWIJbiyG/Uz
+						FpJgBhBf0lzHsVNKEnunJckoz5bYpgpCnVx9V2XrFw+tes7Sl5LhXiFdwqV8ottG
+						SrovCOzl74g4zn50g5wZsUticBrqWFNlSbFQISXFtFCUbqL4zf8zA/Wx6c3HEMZL
+						1WKPSHUbPgIjil0DPjEd0AToKZspcZozcRLWQ1iSPtswGuNin7FpVu+8M5szZY6f
+						rpiKTNfhYFNQxNKV5dnLCMlmVWqYIk3ZCfVJlxmP72DbRuJL6Vhd6wD7hYjatwID
+						AQABo0QwQjAhBgNVHREEGjAYghZzZXJ2ZXI0MDIxNS51azJuZXQuY29tMB0GA1Ud
+						DgQWBBT/nC5f54/+gnhLUYLGGV5YsxtdxzANBgkqhkiG9w0BAQUFAAOCAQEAlOyp
+						YMgWX6wsU/I2hIf1pkPBjsJCxC82pNCZjcSwZuAowueVnt5Xr70UjiAuwgLjJgQH
+						RARZKrWJ8mIkJrWbPi0/uLN8xV72e6V8F2MFTAWVvQ7Se8Bor4Q2fI7NvMwRrCbY
+						YhhlNdVyfNYzUikw5g8YDODoUA1cg1twOu/a0zt4GqCtqjGMLVASNBYud/UMtOAo
+						gI0klRGMhY5nZzvy/rBZL0WFaXsQ6Fk0Ywn+YQ6HZjTnQO23+T9vUXMBMEmomF2B
+						i291jv0WzvQWVDfWSxY3Z869r+Y/bFqbhv9YXKwDSOx52sscAl1yjy0vDwuMKHyr
+						FzKrATccENnvJUM7hQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <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:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.j2e.com/secure/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.j2e.com/secure/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.j2e.com/secure/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.j2e.com/secure/Shibboleth.sso/NIM/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
new file mode 100644
index 00000000..e4ff9968
--- /dev/null
+++ b/swamid-interfederations-2.0/www.jbe-platform.com-shibboleth.xml
@@ -0,0 +1,53 @@
+<?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>
+						MIIDujCCAqKgAwIBAgIET+iFsjANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMC
+						TkwxEjAQBgNVBAgTCUFtc3RlcmRhbTESMBAGA1UEBxMJQW1zdGVyZGFtMSowKAYD
+						VQQKEyFKb2huIEJlbmphbWlucyBQdWJsaXNoaW5nIENvbXBhbnkxIjAgBgNVBAsT
+						GUpvaG4gQmVuamFtaW5zIGUtUGxhdGZvcm0xFzAVBgNVBAMTDkpvaG4gQmVuamFt
+						aW5zMB4XDTEyMDYyNTE1MzcyMloXDTIyMDYyMzE1MzcyMlowgZ4xCzAJBgNVBAYT
+						Ak5MMRIwEAYDVQQIEwlBbXN0ZXJkYW0xEjAQBgNVBAcTCUFtc3RlcmRhbTEqMCgG
+						A1UEChMhSm9obiBCZW5qYW1pbnMgUHVibGlzaGluZyBDb21wYW55MSIwIAYDVQQL
+						ExlKb2huIEJlbmphbWlucyBlLVBsYXRmb3JtMRcwFQYDVQQDEw5Kb2huIEJlbmph
+						bWluczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALMqOR4PgDreV+UO
+						vuPNESTuAQTSyYG5UpY6x4AbEkm3zt4wNsU5DmkDgmpkk9c99nTsVvlbPZwfpfO6
+						AyEo40IUZAgJoStP7xQG80E3t+PQoiLpuVgyHqNLQDNw6C1QRIyDviY9ensHCLyG
+						o2mhNrtZ8VWus1MPU5vwvy8i7DNJG5g2e7RDhGuZKCylJveOS9TWqg29m3y9INJ3
+						vit56JKThUO8z1q5lq8+N/Qypxp7zKh0n1Ro9IyhJIB6hbTCghzUjolA9Mf8Tyg4
+						ow47u/F9G2tpSwAPdFbu64Js28VTlI0oPuR1t1ZEK0cMcNGJA76UR0YCkp3XZ5uq
+						XlYzXzMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAsCtP8WizYJ+mrsh/JlO5ECd0
+						lz1/AM8X6C6t+gjGevBETt63/U7LitxJz/ScuZil3KxMlt9KaZpizeo8ae6X5ILX
+						cG9V90x+FCrsFjSIJIssu2sbXzOWrfQlF6j6VOvCIYC/EWhiK8Bw9sjPlhXruAg3
+						Ylwm/tXxEuiPHxX6tgZJY5pHBY+E5Hl9NDh0DYVBb1kg+ITqzpfKK/Si0RDndzUi
+						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">Publishing Technology 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>Talvinder</md:GivenName>
+    <md:SurName>Matharu</md:SurName>
+    <md:EmailAddress>mailto:openathens@publishingtechnology.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
new file mode 100644
index 00000000..211618dc
--- /dev/null
+++ b/swamid-interfederations-2.0/www.jisc-collections.ac.uk-shibboleth.xml
@@ -0,0 +1,70 @@
+<?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>
+      <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"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUjCCAjoCCQDzQJpygfVTxjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJH
+						QjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGTAXBgNVBAoTEEpJ
+						U0MgQ29sbGVjdGlvbnMxHzAdBgNVBAMTFmppc2MtY29sbGVjdGlvbnMuYWMudWsw
+						HhcNMTEwMTI4MTU1ODE2WhcNMjEwMTI1MTU1ODE2WjBrMQswCQYDVQQGEwJHQjEP
+						MA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGTAXBgNVBAoTEEpJU0Mg
+						Q29sbGVjdGlvbnMxHzAdBgNVBAMTFmppc2MtY29sbGVjdGlvbnMuYWMudWswggEi
+						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOi5rCHkxIFijmIutmjK46cxws
+						rCD8GwR12njggDuiMp51xoIjsZPvjLUam1NC1ik9JTQKNdGUnJDi9Mg0EJ0di06i
+						tuoKle7qO526zB6/V7mTDYp+VHuipEr1w55f4UTxcgjxyzAM64P0Nth+4tmYY9dF
+						0eNNkSozotaCyqdh8WuTNsE4m2A5AlYD5pMLWpJcKLJqbBIx+XH23k4nBQceuYk8
+						iiKN4alJ8pFQcuzh8Bxxby9lKYjavSamjBi/MhhMMWwMd5O7PJHCj0Voyem9PGZG
+						HbQYAjjqYHzVQXHYlLWAYeyYrq6r1mB9VhLofOcSTxgn7GniD/lNAi607DTLAgMB
+						AAEwDQYJKoZIhvcNAQEFBQADggEBADSgmIvVUoZs5T/sk04+xC6hij0xQouwi0+O
+						W8b4SGdMRrgn9nZ+8XRlhaGu9Nk4Vr9HU1djNbvaVw9DiJJ8j24Aggl1TP3THG6l
+						LvzeK6zmwGqxWKPJH5Fr4t3jKqNauFEDxlbA30Qj8VzFO/KSN6aRvrkeuPnJOmcf
+						tRjvWI+4CWEugY71OJjukJ8dNT3DOZLuLfHqzIDjAbrpFKeq+ktbAkR+CIdx59Go
+						/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 Collections and Janet 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
new file mode 100644
index 00000000..00e1778f
--- /dev/null
+++ b/swamid-interfederations-2.0/www.jiscmail.ac.uk-shibboleth.xml
@@ -0,0 +1,71 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAMnG2CD3FyHGMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEGppc2MudXMubHNvZnQuc2UwHhcNMTIwNjIyMTQzNjIyWhcNMjIwNjIwMTQz
+						NjIyWjAbMRkwFwYDVQQDExBqaXNjLnVzLmxzb2Z0LnNlMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEA1dFfOJ0m8dRlEY9n1D927Ectjg2wAVdiKt58zyoK
+						54RQC4B/hO0mdegjZnHGrHDzBis3MkZvlU6FityLmCFmPSMqXrVQNaYFvfCsNgMw
+						6NTveQihtjuK0oeoqKp6XxlQCMrx07vTdFDl7D9KStkJsny4De/or8PSHgkItmnS
+						T+4LG+rZ6YiJDwqG+p1TPbrokYLb8cqfnLehwEYXy9XK1aw9niGRuW10Bot+rqr8
+						2T18Ua62H9aAgkd7Agkvs6VreE/JN04nL3Vgyw0m5KQtSKpY/jK8VjsgVwnduaXh
+						YuewUItomHtfmeRyiUqWMgCU9iGFPVMfmjfO2Gx+fclENQIDAQABoz4wPDAbBgNV
+						HREEFDASghBqaXNjLnVzLmxzb2Z0LnNlMB0GA1UdDgQWBBRBpxVcwZ+DwDeciyWy
+						MpQiE6KHMTANBgkqhkiG9w0BAQUFAAOCAQEAyREmFIBTYtOSGx/a1jy6pXfCsV04
+						Yvba0tJbdm67J35jl+yfPNSr1RvSHa0e6shjTDCDn2v+r8c2T1IAdpGdptcVEL6c
+						Cf8ns7Jvkf0ypdD6cZVQjMxtNPT1Okl6r0zZAJ/mJS7EZHoxjSzN0BM95upJmyyw
+						V0jSlzJlIBn8ZumF7/uhyQvhzaonn0Q5mBN1bR8BaXEZ8OgrcxjNdTeOiomg0Ygr
+						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: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.jordanpublishingcpd.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.jordanpublishingcpd.co.uk-shibboleth.xml
new file mode 100644
index 00000000..98755e8b
--- /dev/null
+++ b/swamid-interfederations-2.0/www.jordanpublishingcpd.co.uk-shibboleth.xml
@@ -0,0 +1,69 @@
+<?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.jordanpublishingcpd.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:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Jordan Publishing / Family Law</mdui:DisplayName>
+        <mdui:Description xml:lang="en">For access to law reports, case law, commentary, precedents and legal and administrative changes.</mdui:Description>
+        <mdui:Logo height="64" width="252">https://www.jordanpublishingcpd.co.uk/jordanslogo.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDYjCCAkoCCQCgLsM5xyLGGDANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJH
+						QjEQMA4GA1UECBMHQnJpc3RvbDEQMA4GA1UEBxMHQnJpc3RvbDEYMBYGA1UEChMP
+						Sm9yZGFucyBMaW1pdGVkMSYwJAYDVQQDEx13d3cuam9yZGFucHVibGlzaGluZ2Nw
+						ZC5jby51azAeFw0xMTEwMTAwOTUzMDBaFw00MTEwMDIwOTUzMDBaMHMxCzAJBgNV
+						BAYTAkdCMRAwDgYDVQQIEwdCcmlzdG9sMRAwDgYDVQQHEwdCcmlzdG9sMRgwFgYD
+						VQQKEw9Kb3JkYW5zIExpbWl0ZWQxJjAkBgNVBAMTHXd3dy5qb3JkYW5wdWJsaXNo
+						aW5nY3BkLmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuFsJ
+						DikTpQWue+TeFD7f/SxyB95/b4D1a/4L04NtzzauQ9G+IZmtzoVvIadkYNZEqBA6
+						gyYddDxQ2z74PO/NUY04xicrwMLsm51CZz6UpZcA/g3Plr0qCNKpQdR6xiZwbH5r
+						QPvNDVpR+k1tcI/ylmvH5XW/XOHqIpr1cWAINiBCs4YXNy26c0V/1iBApKRovTyY
+						Oy2ZqxDLzC1l4xe8AliI318JcIm6ObOk3Z8OjmtzKla58xtjswvQsLVyIlb/10eA
+						XZUUHBjhgl8ule7T9isYtJ250xcfYW37Px8eERxOyTuCi7NEkQGiniSEnzp9PP5P
+						Uf4sugluTP/MRvKkqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBJ5V21s9XjpfI5
+						t+vb7eleCZOdrFOA0ON9l24CDTADuhakdFA473JgIvjGk2m/VbH5nLZDI26IRIuv
+						lm2G6eaE2FZrDCu/EScmm4G8UxuYWXXj2+grYeWJ/o9U5Zbm38a2j/z2guDCfaO2
+						+3DYYegalq7klPCuwdvN9lObF/8elD3NAx7sFgR0DAyZNF57ppejnrC3yVpyWizO
+						/0hdLckeOfpxUyal2UFB0H7hUqShfBJiJykMczpocFYRPEuOr+21Z89eoAQbplfM
+						ln8E55bf4eHw1k6Wb95K3VeDqwSznFWVXIkxEiWXCuKXxHd+J145S3YZe5ayeRvz
+						wdxJFa0Y
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jordanpublishingcpd.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.jordanpublishingcpd.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.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jordan Publishing Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Jordan Publishing / Family Law</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jordanpublishing.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Withers</md:SurName>
+    <md:EmailAddress>mailto:simon_withers@jordanpublishing.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jordan Publishing technical support</md:GivenName>
+    <md:EmailAddress>mailto:electronic@jordanpublishing.co.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
new file mode 100644
index 00000000..2b9b059e
--- /dev/null
+++ b/swamid-interfederations-2.0/www.jospt.org-shibboleth.xml
@@ -0,0 +1,51 @@
+<?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>
+						MIIDEDCCAfigAwIBAgIJAIF4dsDgrPDHMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXd3dy5qb3NwdC5vcmcwHhcNMTMwODA4MjEwMzAzWhcNMjMwODA2MjEwMzAz
+						WjAYMRYwFAYDVQQDEw13d3cuam9zcHQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA0jDyU9Tft9v4c5QCjZ1TP5rSA+yjVs4hSljUr8J+4BLg+L1Z
+						U//Tn8BtEQG8tcpdwJxmhCi01ZiSgViLVZ0OfVJocdn282S/2DvSdE+fAIhexVzM
+						cbOzgBxQH3B9EuOYECQjavGyGagG1sMIAlck+DrGSsC1yWUgh21aGnIIWK5HYFa6
+						sS7/YgMuE5aw+1ewFJGlQa0qR99YU2S4ZFVSu6gKqHPcVs7LZ6x2QbQClXA5DoHb
+						BEE1uWxW+c/v1hjeQveqKsIbfedMyqaBspafo7AvoGls8qeOjoReh4VVJ8P/7dJD
+						jpQ5+PdGso8ALwIRr8KQ0ZqBY8sHW7capIKnHQIDAQABo10wWzA6BgNVHREEMzAx
+						gg13d3cuam9zcHQub3JnhiBodHRwczovL3d3dy5qb3NwdC5vcmcvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUarBeRQXn6LreSYYMrC8hkzu3BGcwDQYJKoZIhvcNAQEFBQAD
+						ggEBADjQK43pDKaXuxThco8kTtlOdlil/WwxIW2w5q1RNCKYVqlKo9Rzy7oGcGnZ
+						BSYknAHpSbA/NwDWlpCFOExpqbQVhlGE0GhY4wO5dzvVWeq9vKGxsRCFzKrtM4UR
+						zpVen/oOF4YAiVczjaN0tP/7F8mR46ulOFYYkeD1K9iNeCX5ZrJyzDOOHnMUdvzg
+						GepkKFygBC5jioSy4EdcfNA619eMKi5NmHStuRzY4cl9TBDNr9A+cgXZFNq+FXnE
+						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:1.0:profiles:artifact-01" Location="https://www.jospt.org/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jospt.org/action/samlACS" 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
new file mode 100644
index 00000000..d1b876f0
--- /dev/null
+++ b/swamid-interfederations-2.0/www.jove.com-shibboleth.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jove.com/shibboleth">
+  <md:Extensions>
+    <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:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC4jCCAcqgAwIBAgIJAMmZMgpgR98FMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+						BAMTCWpvdmUtc2l0ZTAeFw0xNDA4MjYxOTI5NDVaFw0yNDA4MjMxOTI5NDVaMBQx
+						EjAQBgNVBAMTCWpvdmUtc2l0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAJpYESYD4dYzXNtXUSDK3W59M7Mr5MdCZxbr8I508aQkXIDwjBNqtr6a7Hat
+						Her5Zr7FU8jaddsO5hgFaOwdN/5EZfqpSDdS6YCop7Y7b5MuKW2IXQqyl3Uf6NVB
+						uFb24x8Jq9PzmpWXE0O+qiRubp9kVR2DsIv5QJcAmMJn46jAyJefqOTTtoeOT9PH
+						HOuOd21k8zRmeFQq2hYgL+8pkVN6KvJMSR8+a7V0xL4TinO2NLgU+REPkh8dZwKk
+						v3YiX5Zy4NHsn8BkdNwlTkB2Opd90ociYnvvWjsLcM0jHLDs+Kg1BBqbtFFE2Aiv
+						WioIclBIAGURdZnHyn5bviGp8E0CAwEAAaM3MDUwFAYDVR0RBA0wC4IJam92ZS1z
+						aXRlMB0GA1UdDgQWBBQJINSSKzlDshwkhXdHrjR2mNn+zjANBgkqhkiG9w0BAQUF
+						AAOCAQEAhrtgkBsbRvQLDtyhGbtMPbTTlGDHrnOXUFx5TqqyGCqYgp86n7awj2kU
+						ypRW27QZr6a7LnyznASyXWWak0JXb90ZvPMR8bpvPEYR1HbGVQ94/+KlOtsR3SjP
+						0swPElIYm9Ff3oNaM0uh3YAi9qhB/ZrTJmXcTDLZDgC3jOApjNV2nvtjb2Bu0ysN
+						yKyJd48ZF72SR5zQKq4S7OcbHtttrk0/xeEHomt+Xw0PzB265Vr14OZoAO91jEvP
+						dU4byrEQ+k+7huxTc6arI5cagwL8GnpH6I0M6Ouj8T4RTmXHKWseJDXYCc9WNlN/
+						qa6mttqxIIeSvf7w0qq4buQC7/jHWQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <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:PAOS" Location="https://www.jove.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jove.com/Shibboleth.sso/SAML/POST" index="4"/>
+  </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.jstor.org-shibboleth.xml b/swamid-interfederations-2.0/www.jstor.org-shibboleth.xml
new file mode 100644
index 00000000..8446058a
--- /dev/null
+++ b/swamid-interfederations-2.0/www.jstor.org-shibboleth.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jstor.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>
+						MIIDLDCCAhSgAwIBAgIJAO/X91yads6bMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXd3dy5qc3Rvci5vcmcwHhcNMTAwMjI2MjAwOTM1WhcNMjAwMzA1MjAwOTM1
+						WjAYMRYwFAYDVQQDEw13d3cuanN0b3Iub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAw7BvEJwj35DHu9tuWh/vA8EP+KAgS6VJhKfPDNR2EFrxFgD4
+						FAXJ7WPpF5A0Le1YuYK6JX2Ud5K5uTGAzVg8V1JpFDXy+WXnNebQIWUl3cR3+uAO
+						evP0PRYENkD5oBIt8+maWvH2ualYRuX0Bz6MNqLZKz9EkUYF2FQs42h93X8K+ySY
+						zr8AwmnXbsReMXrvFvwJ0KAxCIgatkSRcCyjih5S+dqxn1NN41jIaptofBMrF1Dl
+						hIlMTxe5CAyAAZgTpI1Qm+i19KLuWqbP4HcOa1w8Heiv3bH8HCSzekTPTMWr3anX
+						q1Jv81wCldLijykb3gSPmPrVmUmdbsmB2iVymwIDAQABo3kwdzAdBgNVHQ4EFgQU
+						eV7t5OZc4Yb7ZjJTzWQYOTmNJHUwSAYDVR0jBEEwP4AUeV7t5OZc4Yb7ZjJTzWQY
+						OTmNJHWhHKQaMBgxFjAUBgNVBAMTDXd3dy5qc3Rvci5vcmeCCQDv1/dcmnbOmzAM
+						BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCcd/tR8Hm2a/G4eRYtDAFZ
+						00hj0LDsY6g7tKlumG9YkQnClLHcjNkofkGEkMgcbAerrPly+gebQKDWv6HqKR76
+						8SYFWYnk5GaoNsMyYbHuxDpJIL1b/55u1JUQKW3VEExB8xIfxnXHojsrtktnufSv
+						SpOxSE35MNv5c7khBeQ+lu+69YDc30/5H3AiEpJgCvmxkCIS1Z8WCCWJq7SaR+HQ
+						chQqK/VS9i2CsHaU3CwZapCqrMaftVoQNo7WfFHkvX7NH4YrNGM5ORE5yEHjP3LI
+						+f+BedC/QRSjPImH8Pjm/iEQ7tbCrouRqz/PJWDoJ+2WJPl+t/aud7L+DVlogKKz
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jstor.org/action/samlACS" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.jstor.org/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cicada.jstor.org/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://omega.jstor.org/action/samlACS" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://firefly.jstor.org/action/samlACS" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.jstor.org/action/samlACS" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cricket.jstor.org/action/samlACS" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ithaka Harbors, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ithaka Harbors: JSTOR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jstor.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>JSTOR User Services</md:GivenName>
+    <md:EmailAddress>mailto:support@jstor.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Vlahakis</md:SurName>
+    <md:EmailAddress>mailto:Peter.Vlahakis@ithaka.org</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
new file mode 100644
index 00000000..0a3f2a4d
--- /dev/null
+++ b/swamid-interfederations-2.0/www.jusp.mimas.ac.uk-shibboleth.xml
@@ -0,0 +1,107 @@
+<?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"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis: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. 
+					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>
+						MIIEMTCCAxmgAwIBAgIJALKqYz/D1BgYMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
+						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
+						CxMFTWltYXMxHTAbBgNVBAMTFHd3dy5qdXNwLm1pbWFzLmFjLnVrMB4XDTEzMDUy
+						MDEzMTcxOFoXDTIzMDUxODEzMTcxOFowgY0xCzAJBgNVBAYTAkdCMRMwEQYDVQQI
+						EwpNYW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVyMSUwIwYDVQQKExxUaGUg
+						VW5pdmVyc2l0eSBvZiBNYW5jaGVzdGVyMQ4wDAYDVQQLEwVNaW1hczEdMBsGA1UE
+						AxMUd3d3Lmp1c3AubWltYXMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQDz5+7xpkieZXmqZ6NQcjLc0cPLnyqjHYKO/qJEmBOeSQ4SuHO3cblq
+						NRZHc0Ee/OnwGG+Z95qJLb3sJcg87sFaEpokcpQg6QAmAQx6TJTw3EibdPbTmlcp
+						sh6jeNuZ8jzLwj6LS4Q3Gsta9R0gWzoHsy2uaXkHBWjLDRDXSM5ykYbsH9uv5G+r
+						zpSPLzmzRfCSep5kIXkYNEAO6YFCpWmuxrnhmH37K26ufyTNFLsa/nFaDzHRFvOB
+						Lqp/kGEoCobHQRkVpWIA30NkNHf3xTdRim8cf2fTbLAMvTvLwk15hEhsofx5vm17
+						PsnuzOJz0p7hLl+UgQjDkT4cC8RKTrNBAgMBAAGjgZEwgY4wCQYDVR0TBAIwADAL
+						BgNVHQ8EBAMCBLAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1Ud
+						EQQYMBaCFHd3dy5qdXNwLm1pbWFzLmFjLnVrMDQGA1UdEgQtMCuBKW1pbWFzLXNo
+						aWItdGVjaEBsaXN0c2Vydi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUA
+						A4IBAQAaJrZS+hCYXWz1OhLpLBmrXwGeFFMe6atZiAol0iqFEEI5lxRPUCv//mcj
+						zGl7ckpj3QGnGNK/yy0Iw1f8ozDqYQc15EKXrr4ysRLDIiHmV6vp6t0E42KufUr8
+						CCuGWOApwh0G9MLGC/L/nT1ktlA7QpwAu2i/pwIwtmzxka45H6UTBH6+nZcV68+c
+						lKacUeUUWaQPSU6xX7nZQ8RAxL/rk9YampkcmMl9jjXKZxPfEHh/FcoX7McEmVOB
+						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>
+						MIIEMTCCAxmgAwIBAgIJALKqYz/D1BgYMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
+						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
+						CxMFTWltYXMxHTAbBgNVBAMTFHd3dy5qdXNwLm1pbWFzLmFjLnVrMB4XDTEzMDUy
+						MDEzMTcxOFoXDTIzMDUxODEzMTcxOFowgY0xCzAJBgNVBAYTAkdCMRMwEQYDVQQI
+						EwpNYW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVyMSUwIwYDVQQKExxUaGUg
+						VW5pdmVyc2l0eSBvZiBNYW5jaGVzdGVyMQ4wDAYDVQQLEwVNaW1hczEdMBsGA1UE
+						AxMUd3d3Lmp1c3AubWltYXMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQDz5+7xpkieZXmqZ6NQcjLc0cPLnyqjHYKO/qJEmBOeSQ4SuHO3cblq
+						NRZHc0Ee/OnwGG+Z95qJLb3sJcg87sFaEpokcpQg6QAmAQx6TJTw3EibdPbTmlcp
+						sh6jeNuZ8jzLwj6LS4Q3Gsta9R0gWzoHsy2uaXkHBWjLDRDXSM5ykYbsH9uv5G+r
+						zpSPLzmzRfCSep5kIXkYNEAO6YFCpWmuxrnhmH37K26ufyTNFLsa/nFaDzHRFvOB
+						Lqp/kGEoCobHQRkVpWIA30NkNHf3xTdRim8cf2fTbLAMvTvLwk15hEhsofx5vm17
+						PsnuzOJz0p7hLl+UgQjDkT4cC8RKTrNBAgMBAAGjgZEwgY4wCQYDVR0TBAIwADAL
+						BgNVHQ8EBAMCBLAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1Ud
+						EQQYMBaCFHd3dy5qdXNwLm1pbWFzLmFjLnVrMDQGA1UdEgQtMCuBKW1pbWFzLXNo
+						aWItdGVjaEBsaXN0c2Vydi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUA
+						A4IBAQAaJrZS+hCYXWz1OhLpLBmrXwGeFFMe6atZiAol0iqFEEI5lxRPUCv//mcj
+						zGl7ckpj3QGnGNK/yy0Iw1f8ozDqYQc15EKXrr4ysRLDIiHmV6vp6t0E42KufUr8
+						CCuGWOApwh0G9MLGC/L/nT1ktlA7QpwAu2i/pwIwtmzxka45H6UTBH6+nZcV68+c
+						lKacUeUUWaQPSU6xX7nZQ8RAxL/rk9YampkcmMl9jjXKZxPfEHh/FcoX7McEmVOB
+						Hc6B9zDGUrAOwbap5IBazxgixzhlNLvnLBorLMTMtZNAQ5I8r9q1etiGsMwQxcbo
+						XSDkRlSDzotmgLAQd0N3B9PAolHl
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..cf171589
--- /dev/null
+++ b/swamid-interfederations-2.0/www.jvcs.ja.net-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.jvcs.ja.net/Shibboleth.sso/WAYF"/>
+      <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>
+						MIIEoTCCA4mgAwIBAgIRAOQkbG3H7xylghDVHFZCEb4wDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMjExMTMwMDAwMDBaFw0xNTExMTMyMzU5NTlaMHwxCzAJBgNV
+						BAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEQMA4GA1UEBxMHQ2hpbHRvbjEc
+						MBoGA1UEChMTVGhlIEpOVCBBc3NvY2lhdGlvbjENMAsGA1UECxMESlZDUzEYMBYG
+						A1UEAxMPd3d3Lmp2Y3MuamEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEArDwlmcEvi4O4XtwsJ2xcF28iRgGonGFbVIMTJ6UFHDlLhjJXBOZzEJxu
+						FtzoxW2S83/qsJlmLVMwu/Zlf84+/H+SVK80JIkH49W8TvbjFPV84VjCCrRaKUSc
+						PQTswIpSpJNFNaYQWIKyX/mZYu/HaT9lMHr19RumNNx1bHHJheLnxgoQngku9BKR
+						cLDm5yu95+R6elbKA/Er6jtuQ96S0JnJAxxAojEqbM6tSHRcgJt5srmm3IAHhnAH
+						XKXbkRSzsQlXto2oNVFkfmiMVEO2KK2+4f9j6COTXxcuqs0+UwfwNO7IDX8KROih
+						0jOYhSrkcSku0khqFwXgpA3IP4VyLQIDAQABo4IBYjCCAV4wHwYDVR0jBBgwFoAU
+						DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFJPQAcWDAXWfuLg75mvRv3WS
+						r3BmMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
+						AQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1Ud
+						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD3d3dy5qdmNzLmphLm5l
+						dDANBgkqhkiG9w0BAQUFAAOCAQEAQ7H6wBrBIG3sl2tGThlycIwMhs+rQGfK3yA+
+						Q6aqTbWvbyGotl2fw64fsgbrQVJmDIFxZO8/MbnFADD+j7NVpXYVN6ZLTcCuIUgL
+						ErlHBCZzEf/ksSPit7BXOEh32I+IyI4oMexuE8UsF78p1i1KsM52KJ/aAEcp/cxo
+						YgI87EEm4p90UjuMJVoH/Ln02RLoTOobzzIMWks1/+da8GrsMaL/JP5q//6/boZe
+						lAW5NzjIVxak0+mkL9m/M3Ye7ciDPkI48KxUZ3/HU/vjuKpzlcrkZKZkiyqVh066
+						l3iQ7f3NCuwCg4Tz4RGKYusa1ZjKWwicFd/KcwGv18osrZH7xQ==
+					</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.jvcs.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jvcs.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jvcs.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jvcs.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jvcs.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <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:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jvcs.ja.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jvcs.ja.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jvcs.ja.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jvcs.ja.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jvcs.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.jvcs.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jvcs.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jvcs.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jvcs.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jvcs.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <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: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 Collections and Janet 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
new file mode 100644
index 00000000..e767d8f2
--- /dev/null
+++ b/swamid-interfederations-2.0/www.jwatch.org-shibboleth.xml
@@ -0,0 +1,80 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <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
new file mode 100644
index 00000000..83aa6852
--- /dev/null
+++ b/swamid-interfederations-2.0/www.k-int.com-shibboleth.xml
@@ -0,0 +1,67 @@
+<?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>
+      <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>
+						MIIDADCCAeigAwIBAgIJAPE1DaMBDG/KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE2RldmVsb3Blci5rLWludC5jb20wHhcNMTMxMjE1MTI1OTM3WhcNMjMxMjEz
+						MTI1OTM3WjAeMRwwGgYDVQQDExNkZXZlbG9wZXIuay1pbnQuY29tMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1X9UPpMcPP6583r9Apa8PNw0btsNcU83
+						Jfi/fPAGhXBTEKW0g83Heurx/VSpdWNuZzqvgV84qZDdOsk6VKKbaYDJ4Z59cqX6
+						kbc8DECOf16fyjjfqZmVRfVmk+gXOVjsWCReF4ju4Il74xDPaHu8gXiZFRzYJJtL
+						ZlFxn6rRleDFBJ/OEgrkN2XFupmhYWtUjxd24tbudVBvoKq00ry8wWHSMxJrJzAO
+						ai2wd+Kvf7OzBRS2oNcp6c/ZJzKcD8G/LSZ61tG/33ch0/zvdHd+70DfNE5eNGA4
+						vQqykydToBDL/2SVJJQ0RmeU6IXnaPv0RgEtvzUWHf5s6HZvxwFI+QIDAQABo0Ew
+						PzAeBgNVHREEFzAVghNkZXZlbG9wZXIuay1pbnQuY29tMB0GA1UdDgQWBBQc7dBS
+						20D1r2+c/kRdq5LNfXNk5TANBgkqhkiG9w0BAQUFAAOCAQEAhz6Cg8zQPe37crrd
+						4saHx5e5PhFjEMWumgwgUNX7Nt7J1OSYrisRZ3CPfg+8CbUXMQw9SS5lIsuI1amg
+						GUAR/+9dQFyfT+E1efV0JHV8KZs80YllXIlYoWgIvlBq4NCVOiuIzkkv3kHXbOA5
+						18OJNC3fqXAzYZbuCtMf7OWhelbxlAXB4a9HEB1MqpHgk68SeQWeTkvICbRREPQJ
+						0szpJq5d2J84k8pwsb6wWoL4+nd4A4hM85v61Lz2pP6w2HDqkBdrPjo3IZ2/g7nu
+						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>
diff --git a/swamid-interfederations-2.0/www.karger.com-shibboleth.xml b/swamid-interfederations-2.0/www.karger.com-shibboleth.xml
new file mode 100644
index 00000000..a9084b5b
--- /dev/null
+++ b/swamid-interfederations-2.0/www.karger.com-shibboleth.xml
@@ -0,0 +1,108 @@
+<?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>
+      <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>
+						MIIE0jCCA7qgAwIBAgIUQot+8Tys7kUS2TfX/xaj84TfBuswDQYJKoZIhvcNAQEL
+						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDYxNjE0MDQ1
+						MloXDTE1MDYxNjE0MDQ1MFowZTELMAkGA1UEBhMCQ0gxCzAJBgNVBAgTAkJTMQ4w
+						DAYDVQQHEwVCYXNlbDEVMBMGA1UEChMMUy4gS2FyZ2VyIEFHMQswCQYDVQQLEwJJ
+						VDEVMBMGA1UEAxQMKi5rYXJnZXIuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+						MIIBCgKCAQEAql8PRT6rzzneWsRjM4430HJhH1JxT9BsxK7gLi28y0x//G/8QxRo
+						oEuu+NVAWJPhI/F4BUiTiQhAYP/Z5JWLy8UMnaad/SXZ83fu0G5QF5zmjhsDfy3L
+						fyogFUoiDm2lcEU/t3uAZwEj/zi88NiQgVRVGvf1USSPn8tsvQdTZK9JGHptguK4
+						PPDqOtboF4sVP4RlXR1Auq41JTMkIxAqGVm+PzRSoulRxk3gOgYb0Oezn8mFxVA1
+						EIHucPtCAM+QgJ8iZGakoOfOCsLaO/wBqg+D+5Hov/24JLNyt7XEQejBGQ5TRu/K
+						IZCBlW6uDHqIqczJyY1Xpf53tfkfqNwxaQIDAQABo4IBkDCCAYwwcwYIKwYBBQUH
+						AQEEZzBlMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5j
+						b20wNwYIKwYBBQUHMAKGK2h0dHA6Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5jb20v
+						cXZzc2xnMi5jcnQwFwYDVR0RBBAwDoIMKi5rYXJnZXIuY29tMFEGA1UdIARKMEgw
+						RgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cucXVvdmFk
+						aXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
+						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSRGWKtWxenMPvw3jkl
+						sb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnF1b3ZhZGlzZ2xv
+						YmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQUjR1TjwarXvE0CJiTqSo9HCrS
+						0DUwDQYJKoZIhvcNAQELBQADggEBANY+3r4W+lxHC+/KkS+ACivLR5SKX5VAVR9F
+						GpPzJllwqWcfmn1FZy3Y31MDCYw4pfyOuFEDTH2EMxDabl5wkVTBj1lKqQ4+bO4C
+						+z151Go84yz5bMAEAiovutWq1UExhmoYgAmlzg6JRsmtI8U6v5o0Wk+QaibddoXN
+						igze1YsiLLROI4rbcdkI9dr8ygGBbMWLw/EuS6V+fxdfLoF7buDlvLUBHLCKI+FS
+						8vtGHabPgXBMau3Wyel5UmFkcxbHGGClBNkhcYr65XbnbUGsa3eUyC0bR2nh3C1g
+						GJMdRZq07yO0YxP9+RyFJxtKzTRVPj3E43Ikc9gapir0SBynBjk=
+					</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>
diff --git a/swamid-interfederations-2.0/www.kclsu.org-shibboleth.xml b/swamid-interfederations-2.0/www.kclsu.org-shibboleth.xml
new file mode 100644
index 00000000..c246f8dc
--- /dev/null
+++ b/swamid-interfederations-2.0/www.kclsu.org-shibboleth.xml
@@ -0,0 +1,64 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.kedst.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.kedst.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..b2d6b01b
--- /dev/null
+++ b/swamid-interfederations-2.0/www.kedst.ac.uk-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsQ0D7j8KO9M/zkvZ4pYNu88G9i1/
+						s8yUlzlusFV8JUoqEczha+XS92o21kwek+iloEjyNMYr1O4cQOXEqwYx3BYlBERP
+						PoEmzVnQ+yZ3IGfhrjkUz21KxiSrfui95uoiuJ3mSOv3F8AEFXS4l/FxJ2Pr+37r
+						Y1/XcyXsk5GlG9DURuTErcd7zWJIiKT6lAQvaLPWCY/uxcQXNQ3nSkyl66r0gcz1
+						QFZgX9dEJZ5CFjIUvfKnFUq89UxDPtAFYsSemDCFQs0y4s7vclfnCsPJNErbRz9C
+						PvtZyy8O6vLwqeYLGae6TxTWxTudbdle6ZotR4SAhd5lGeGDgz8ENpJ01QIDAQAB
+						o2UwYzBCBgNVHREEOzA5gg93d3cua2Vkc3QuYWMudWuGJmh0dHBzOi8vd3d3Lmtl
+						ZHN0LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTIOI+mXXvpeOykustH
+						i52xXKA2PjANBgkqhkiG9w0BAQUFAAOCAQEAgNBCAJj8ik9sqc4Wd9C3s6MV3dsW
+						9uxoPtUQx8+mmmwJx6mp4XSqO1Y1il4nQUXe+jvlRG2QE1kftwf/HCIY+CiTiKBz
+						+C3fvQDwbGUNO+hu19IEKWaaMAJPQdj1G7Lu7rEfyBq2/kgAAT822KXHGzwLWl3f
+						UidggbqOvDH4OS4t0bun2+dZTMq53UlEhd0C7mXI0AoO+LDW58eTv5RToflSAX9O
+						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>
+						MIIDJzCCAg+gAwIBAgIURfg2ZT8NtoYlOeAkg68kLNLvU1IwDQYJKoZIhvcNAQEF
+						BQAwGjEYMBYGA1UEAxMPd3d3LmtlZHN0LmFjLnVrMB4XDTA5MDgwNDA4NDg1MVoX
+						DTI5MDgwNDA4NDg1MVowGjEYMBYGA1UEAxMPd3d3LmtlZHN0LmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsQ0D7j8KO9M/zkvZ4pYNu88G9i1/
+						s8yUlzlusFV8JUoqEczha+XS92o21kwek+iloEjyNMYr1O4cQOXEqwYx3BYlBERP
+						PoEmzVnQ+yZ3IGfhrjkUz21KxiSrfui95uoiuJ3mSOv3F8AEFXS4l/FxJ2Pr+37r
+						Y1/XcyXsk5GlG9DURuTErcd7zWJIiKT6lAQvaLPWCY/uxcQXNQ3nSkyl66r0gcz1
+						QFZgX9dEJZ5CFjIUvfKnFUq89UxDPtAFYsSemDCFQs0y4s7vclfnCsPJNErbRz9C
+						PvtZyy8O6vLwqeYLGae6TxTWxTudbdle6ZotR4SAhd5lGeGDgz8ENpJ01QIDAQAB
+						o2UwYzBCBgNVHREEOzA5gg93d3cua2Vkc3QuYWMudWuGJmh0dHBzOi8vd3d3Lmtl
+						ZHN0LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTIOI+mXXvpeOykustH
+						i52xXKA2PjANBgkqhkiG9w0BAQUFAAOCAQEAgNBCAJj8ik9sqc4Wd9C3s6MV3dsW
+						9uxoPtUQx8+mmmwJx6mp4XSqO1Y1il4nQUXe+jvlRG2QE1kftwf/HCIY+CiTiKBz
+						+C3fvQDwbGUNO+hu19IEKWaaMAJPQdj1G7Lu7rEfyBq2/kgAAT822KXHGzwLWl3f
+						UidggbqOvDH4OS4t0bun2+dZTMq53UlEhd0C7mXI0AoO+LDW58eTv5RToflSAX9O
+						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>
diff --git a/swamid-interfederations-2.0/www.kentunion.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.kentunion.co.uk-shibboleth.xml
new file mode 100644
index 00000000..9d722466
--- /dev/null
+++ b/swamid-interfederations-2.0/www.kentunion.co.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
diff --git a/swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml
new file mode 100644
index 00000000..118c405a
--- /dev/null
+++ b/swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml
@@ -0,0 +1,120 @@
+<?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>
+						MIIGDzCCBPegAwIBAgIQJh9i1AJonsnAFcGwgs/cvzANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwNDE2
+						MDAwMDAwWhcNMTgwNDE3MjM1OTU5WjCB+TELMAkGA1UEBhMCR0IxEjAQBgNVBAgT
+						CU1pZGRsZXNleDEQMA4GA1UEBxQHSGFtcHRvbjERMA8GA1UEChQIS2V5IE5vdGUx
+						ETAPBgNVBAsUCEtleSBOb3RlMTUwMwYDVQQLFCxUZXJtcyBvZiB1c2UgYXQgd3d3
+						LnZlcmlzaWduLmNvLnVrL3JwYSAoYykwNTEiMCAGA1UECxMZQXV0aGVudGljYXRl
+						ZCBieSBWZXJpU2lnbjEnMCUGA1UECxMeTWVtYmVyLCBWZXJpU2lnbiBUcnVzdCBO
+						ZXR3b3JrMRowGAYDVQQDFBF3d3cua2V5bm90ZS5jby51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBANjKlKP40hmfmHrQdPo2rI+zJUl9eMvL5qNzLgAN
+						QnOgojsZFwpQ3UJxIcm8Od2eIWd1xJne5ijHaeTniBxeJOj2PfDVzFxuvPWXcMYs
+						wusvAOgEcSDjhe2Qk4hBY0dd1T0IvU+8zRK6I+lGfZGkP7kNc+jq6ATyxXB3ayb1
+						1/3yCljsnj27CH5hrym8IA7MCOZhYFXux66LGhT0c4WpKICIGapM6NLDDRI+zqQO
+						C7JUh/7bteC332DJlpp/hEedtcytwdznAsfuFYAqLW0m2C1+F0m42hRYRsdK/8BE
+						wZVvmVEtQ5nD0PhWJle+p5qY2vOsnCoux4w2d8vMnCVQWSECAwEAAaOCAdMwggHP
+						MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6
+						Ly9TVlJTZWN1cmUtRzMtY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmww
+						RgYDVR0gBD8wPTA7BgtghkgBhvhFAQcXAzAsMCoGCCsGAQUFBwIBFh5odHRwczov
+						L3d3dy52ZXJpc2lnbi5jby51ay9ycGEwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+						AQUFBwMCMB8GA1UdIwQYMBaAFA1EXBZTRMGCfh0gqyX0AWPYvnmlMHYGCCsGAQUF
+						BwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNpZ24uY29tMEAG
+						CCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJlLUczLWFpYS52ZXJpc2lnbi5jb20v
+						U1ZSU2VjdXJlRzMuY2VyMG4GCCsGAQUFBwEMBGIwYKFeoFwwWjBYMFYWCWltYWdl
+						L2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4mymsSweLIQUYMCYWJGh0dHA6
+						Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjANBgkqhkiG9w0BAQUFAAOC
+						AQEAVwvsWtkpYSAGQkJ2TV0wfnFg+tMRCSu3nB4KEYCremLxItsnnGuyDLb8/EYT
+						Mfwdr26NKunr+50Ry85EwmAPeYbx6NY9kLb2s/XyujeGHQaDOQTXMRtXvEYoJ5vw
+						lNqMPy5O1Ih3W4TJi+CeX2TVaX4PNS2PKv6GKfIKZC0aWP6ZSurvyBUoI5jaMcoj
+						0/2IqQ9HIxlRdTEIXGuvPfCMzQmQ48RmLHw3ImTb91JkQM31/FwsiIidjWkkgq5M
+						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>
+						MIIGDzCCBPegAwIBAgIQJh9i1AJonsnAFcGwgs/cvzANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwNDE2
+						MDAwMDAwWhcNMTgwNDE3MjM1OTU5WjCB+TELMAkGA1UEBhMCR0IxEjAQBgNVBAgT
+						CU1pZGRsZXNleDEQMA4GA1UEBxQHSGFtcHRvbjERMA8GA1UEChQIS2V5IE5vdGUx
+						ETAPBgNVBAsUCEtleSBOb3RlMTUwMwYDVQQLFCxUZXJtcyBvZiB1c2UgYXQgd3d3
+						LnZlcmlzaWduLmNvLnVrL3JwYSAoYykwNTEiMCAGA1UECxMZQXV0aGVudGljYXRl
+						ZCBieSBWZXJpU2lnbjEnMCUGA1UECxMeTWVtYmVyLCBWZXJpU2lnbiBUcnVzdCBO
+						ZXR3b3JrMRowGAYDVQQDFBF3d3cua2V5bm90ZS5jby51azCCASIwDQYJKoZIhvcN
+						AQEBBQADggEPADCCAQoCggEBANjKlKP40hmfmHrQdPo2rI+zJUl9eMvL5qNzLgAN
+						QnOgojsZFwpQ3UJxIcm8Od2eIWd1xJne5ijHaeTniBxeJOj2PfDVzFxuvPWXcMYs
+						wusvAOgEcSDjhe2Qk4hBY0dd1T0IvU+8zRK6I+lGfZGkP7kNc+jq6ATyxXB3ayb1
+						1/3yCljsnj27CH5hrym8IA7MCOZhYFXux66LGhT0c4WpKICIGapM6NLDDRI+zqQO
+						C7JUh/7bteC332DJlpp/hEedtcytwdznAsfuFYAqLW0m2C1+F0m42hRYRsdK/8BE
+						wZVvmVEtQ5nD0PhWJle+p5qY2vOsnCoux4w2d8vMnCVQWSECAwEAAaOCAdMwggHP
+						MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6
+						Ly9TVlJTZWN1cmUtRzMtY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmww
+						RgYDVR0gBD8wPTA7BgtghkgBhvhFAQcXAzAsMCoGCCsGAQUFBwIBFh5odHRwczov
+						L3d3dy52ZXJpc2lnbi5jby51ay9ycGEwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+						AQUFBwMCMB8GA1UdIwQYMBaAFA1EXBZTRMGCfh0gqyX0AWPYvnmlMHYGCCsGAQUF
+						BwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNpZ24uY29tMEAG
+						CCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJlLUczLWFpYS52ZXJpc2lnbi5jb20v
+						U1ZSU2VjdXJlRzMuY2VyMG4GCCsGAQUFBwEMBGIwYKFeoFwwWjBYMFYWCWltYWdl
+						L2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4mymsSweLIQUYMCYWJGh0dHA6
+						Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjANBgkqhkiG9w0BAQUFAAOC
+						AQEAVwvsWtkpYSAGQkJ2TV0wfnFg+tMRCSu3nB4KEYCremLxItsnnGuyDLb8/EYT
+						Mfwdr26NKunr+50Ry85EwmAPeYbx6NY9kLb2s/XyujeGHQaDOQTXMRtXvEYoJ5vw
+						lNqMPy5O1Ih3W4TJi+CeX2TVaX4PNS2PKv6GKfIKZC0aWP6ZSurvyBUoI5jaMcoj
+						0/2IqQ9HIxlRdTEIXGuvPfCMzQmQ48RmLHw3ImTb91JkQM31/FwsiIidjWkkgq5M
+						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>Vipul</md:GivenName>
+    <md:SurName>Agarwal</md:SurName>
+    <md:EmailAddress>mailto:vipul@byng-systems.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Vipul</md:GivenName>
+    <md:SurName>Agarwal</md:SurName>
+    <md:EmailAddress>mailto:vipul@byng-systems.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ollie</md:GivenName>
+    <md:SurName>Maitland</md:SurName>
+    <md:EmailAddress>mailto:ollie@byng-systems.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@byng-systems.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.klarro.net-shibboleth.xml b/swamid-interfederations-2.0/www.klarro.net-shibboleth.xml
new file mode 100644
index 00000000..7a8ec55c
--- /dev/null
+++ b/swamid-interfederations-2.0/www.klarro.net-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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.klarro.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-27T15: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:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.klarro.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>
+						MIIC3DCCAcSgAwIBAgIJAIt6YjNtpR2RMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB0RhblRlc3QwHhcNMTMwNjE5MTYxNTMzWhcNMjMwNjE3MTYxNTMzWjASMRAw
+						DgYDVQQDEwdEYW5UZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						wdnVZ1MhtfN0ukc6dLjy5QjoRSXWQCFGpZ5QvZNtP3xsKSqX8iOhm1ZmH1l1K0Y5
+						ZV3HC44bNA92cGpsq9sMknjkarkmH439iiXgt9qUMIMynxpPmY6GkDJzecw437CX
+						CXKf8DihNAldXEKUc3CzP4Vk4lNI8e+ektHq7wV3lLQrG3qyJ65g3jWVO84RnXPm
+						B9f3wQqW3R/zroCGxjcBvO901JNCuOQHtUrO7mHlJoQBJq4ARQkUbvtNSB6dQqS5
+						Z/YhDSKxq9AXTXzmRssc9Ke8NQxMNh74cFF+El8s6SMA8hnGP4mEAlr8FGt0aIA+
+						1kkaIetVBGQuKVyVKtLD7wIDAQABozUwMzASBgNVHREECzAJggdEYW5UZXN0MB0G
+						A1UdDgQWBBT4QfMQ8phl2CCuvtshXflmGE9IRzANBgkqhkiG9w0BAQUFAAOCAQEA
+						J+s9az6w7b47PnAFU1DSHMjeFKTmc9hHmyp0V9PQWP5ONO2W8aebU5fIPlQ1H0UW
+						cq4GBDGB00I48DulVZ6eZTGb7V2PQrjWkBTx+zTchMj/C8y0WwILDb2lSmX8lSrg
+						hWqVtEpvi3bJAuq4Z9wJrtMn/meOAUOJd8jMum66iFHJ2Sx4p8RII+pxs815DsYc
+						LP1zfxaGdMeSAiTLn9pGMpNCykpLu5MYgRsZYg11rxtzK7xnxVGZBT+/bEXYrvxk
+						yyI3tafZkac5nvFsbdP1CVTkxLXhjoC/cOraO4qLe6XccTTzeRP06u9IYWkd21Xs
+						KEvVQWisWGKnGQlunjVxaQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC3DCCAcSgAwIBAgIJAIt6YjNtpR2RMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+						BAMTB0RhblRlc3QwHhcNMTMwNjE5MTYxNTMzWhcNMjMwNjE3MTYxNTMzWjASMRAw
+						DgYDVQQDEwdEYW5UZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						wdnVZ1MhtfN0ukc6dLjy5QjoRSXWQCFGpZ5QvZNtP3xsKSqX8iOhm1ZmH1l1K0Y5
+						ZV3HC44bNA92cGpsq9sMknjkarkmH439iiXgt9qUMIMynxpPmY6GkDJzecw437CX
+						CXKf8DihNAldXEKUc3CzP4Vk4lNI8e+ektHq7wV3lLQrG3qyJ65g3jWVO84RnXPm
+						B9f3wQqW3R/zroCGxjcBvO901JNCuOQHtUrO7mHlJoQBJq4ARQkUbvtNSB6dQqS5
+						Z/YhDSKxq9AXTXzmRssc9Ke8NQxMNh74cFF+El8s6SMA8hnGP4mEAlr8FGt0aIA+
+						1kkaIetVBGQuKVyVKtLD7wIDAQABozUwMzASBgNVHREECzAJggdEYW5UZXN0MB0G
+						A1UdDgQWBBT4QfMQ8phl2CCuvtshXflmGE9IRzANBgkqhkiG9w0BAQUFAAOCAQEA
+						J+s9az6w7b47PnAFU1DSHMjeFKTmc9hHmyp0V9PQWP5ONO2W8aebU5fIPlQ1H0UW
+						cq4GBDGB00I48DulVZ6eZTGb7V2PQrjWkBTx+zTchMj/C8y0WwILDb2lSmX8lSrg
+						hWqVtEpvi3bJAuq4Z9wJrtMn/meOAUOJd8jMum66iFHJ2Sx4p8RII+pxs815DsYc
+						LP1zfxaGdMeSAiTLn9pGMpNCykpLu5MYgRsZYg11rxtzK7xnxVGZBT+/bEXYrvxk
+						yyI3tafZkac5nvFsbdP1CVTkxLXhjoC/cOraO4qLe6XccTTzeRP06u9IYWkd21Xs
+						KEvVQWisWGKnGQlunjVxaQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.klarro.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.klarro.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.klarro.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.klarro.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.klarro.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.klarro.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.klarro.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.klarro.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.klarro.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.klarro.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.klarro.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.klarro.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.klarro.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.klarro.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.klarro.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">BlikBook Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">BlikBook Pre-deploy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.klarro.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Deepak</md:GivenName>
+    <md:SurName>Colluru</md:SurName>
+    <md:EmailAddress>mailto:deepak@blikbook.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Giles</md:GivenName>
+    <md:SurName>Greenway</md:SurName>
+    <md:EmailAddress>mailto:giles@blikbook.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
new file mode 100644
index 00000000..95b2d3be
--- /dev/null
+++ b/swamid-interfederations-2.0/www.knodium.com-Shibboleth.sso-Metadata.xml
@@ -0,0 +1,92 @@
+<?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>
+      <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>
+						MIIC9DCCAdygAwIBAgIJAMLknMjt03SjMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+						BAMTD3d3dy5rbm9kaXVtLmNvbTAeFw0xMjA5MTAxNTI2NTZaFw0yMjA5MDgxNTI2
+						NTZaMBoxGDAWBgNVBAMTD3d3dy5rbm9kaXVtLmNvbTCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAMS5B0GMXiaYkvtJDFNsrRNMfFF5WZOTdOdFh4VK2G1C
+						c4Jo+WInPbjfB+l3gNji634Qc06ke0A74GyRTf19pIcKpmB6pyEtjt/0vgInT3Ax
+						ZI38HVgCk1WHwpg5LLzRI4FkzpIIX/SfB7KYB6WDA0AXbE8id2KXaxuCNrGYvoU6
+						orz7Gt+FERDUooNli1Z97ZQ6o6MogAeHizRTpWhWVqIVLKxvAZ42+OXw2OwGzOeL
+						OkefcJ5l/AwJbmEM+19yqdSB4e6VqF+ApsR/NbJaE5kz7GhvitK0FWkrP31bVj5t
+						0pFmyFwYRohge0FFw0wX/vojPZqqBjOM5HafUmDB4PUCAwEAAaM9MDswGgYDVR0R
+						BBMwEYIPd3d3Lmtub2RpdW0uY29tMB0GA1UdDgQWBBQysHs0AHbWoM4U7GlNVirq
+						6w1N4DANBgkqhkiG9w0BAQUFAAOCAQEAY9843vk3HlJssWlGnq5djjjzOeMZ6qPa
+						GXNZBZGi9LI3P4xAkW0fCnUygcb5MZaHdB+RuINEdXj+npITszfLtnj2m4BCq2IN
+						evmRUQRc7F27b9aoUuhYl0q6/Z9MFOjdjzQb6LT1duCDPq83kFp0gS57fqQP97F0
+						8Hbzw5ZdLWALzsDuxU9FGRU5gdZNDmXkzymluKMZRchLuJrJhsRDPb34xmcH7RKF
+						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>
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
new file mode 100644
index 00000000..4b08e2b5
--- /dev/null
+++ b/swamid-interfederations-2.0/www.languagesciences.cam.ac.uk-shibboleth.xml
@@ -0,0 +1,66 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-09T09:24: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>
+      <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>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
+						RsenNm/aXp0wIU+jHVmi/GAPCQ== </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..a1802f44
--- /dev/null
+++ b/swamid-interfederations-2.0/www.lawtel.com-oa-metadata.xml
@@ -0,0 +1,81 @@
+<?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>
+						MIIDZDCCAkygAwIBAgIJAIQlCctZBRSMMA0GCSqGSIb3DQEBBQUAMCoxDzANBgNV
+						BAoTBkxhd3RlbDEXMBUGA1UEAxMOd3d3Lmxhd3RlbC5jb20wHhcNMTIwNTIxMTUz
+						MzE1WhcNMjIwNTE5MTUzMzE1WjAqMQ8wDQYDVQQKEwZMYXd0ZWwxFzAVBgNVBAMT
+						Dnd3dy5sYXd0ZWwuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						1aHAf0QUNyTTU43/uAAgmTXyljMIEkiAbTYDdOKL/783B9Jancwz5Wcwr1uCqFRB
+						9dyeElckxc1vUpdx6Nj81cX6MbhDsCGpnw2sHeWi5pFJ1J6uOL3DR4wtE758XJep
+						xhdMZpZXJ1F7kA/aJPS+3u1XfgAj5Wop1Lj0o9EtsEm97/VViMN39OsMAWVYsYlJ
+						UdMvP6oxXADr2jQEPXyD/vr3Z0yzBwUKnx/xW95h4G8mmwAKOkPNwgHjO/qYzCSy
+						cLNCL/1B21R05ZogulZGJlNrMHTuhFzT3t6zDpABQA9QAm9CWQQ3RT7shl0Qtflu
+						fi5UV1TOka/oetMJEwxNeQIDAQABo4GMMIGJMB0GA1UdDgQWBBSfkHk8bDqllx8D
+						lARoOx4aWRVruzBaBgNVHSMEUzBRgBSfkHk8bDqllx8DlARoOx4aWRVru6EupCww
+						KjEPMA0GA1UEChMGTGF3dGVsMRcwFQYDVQQDEw53d3cubGF3dGVsLmNvbYIJAIQl
+						CctZBRSMMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAI5u8pzk5pFL
+						8GE7AJO8xu43xmPoXZJQI8jtXZ67xA0zDl/YKi7lyAtITABLi0no05j/B6bs30ah
+						ZJWIhpo1heA1Aqsvg8cc+wsMGA0G0BWRm581pdooU37lf8E6jHrHEcYnMREOLR4n
+						tB+Q5JBgE7gNXnrPtKuREyXFpMVuIJaed9L2XRn0dqq8BdMH7L8INOXW2wr+Yb86
+						9N5cUMdyvc/CgmvgBL859khThBVONs9kQaQqY0GANNEKnBXKOiWZsW3bcIGq8idV
+						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>
+						MIIDZDCCAkygAwIBAgIJAIQlCctZBRSMMA0GCSqGSIb3DQEBBQUAMCoxDzANBgNV
+						BAoTBkxhd3RlbDEXMBUGA1UEAxMOd3d3Lmxhd3RlbC5jb20wHhcNMTIwNTIxMTUz
+						MzE1WhcNMjIwNTE5MTUzMzE1WjAqMQ8wDQYDVQQKEwZMYXd0ZWwxFzAVBgNVBAMT
+						Dnd3dy5sYXd0ZWwuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						1aHAf0QUNyTTU43/uAAgmTXyljMIEkiAbTYDdOKL/783B9Jancwz5Wcwr1uCqFRB
+						9dyeElckxc1vUpdx6Nj81cX6MbhDsCGpnw2sHeWi5pFJ1J6uOL3DR4wtE758XJep
+						xhdMZpZXJ1F7kA/aJPS+3u1XfgAj5Wop1Lj0o9EtsEm97/VViMN39OsMAWVYsYlJ
+						UdMvP6oxXADr2jQEPXyD/vr3Z0yzBwUKnx/xW95h4G8mmwAKOkPNwgHjO/qYzCSy
+						cLNCL/1B21R05ZogulZGJlNrMHTuhFzT3t6zDpABQA9QAm9CWQQ3RT7shl0Qtflu
+						fi5UV1TOka/oetMJEwxNeQIDAQABo4GMMIGJMB0GA1UdDgQWBBSfkHk8bDqllx8D
+						lARoOx4aWRVruzBaBgNVHSMEUzBRgBSfkHk8bDqllx8DlARoOx4aWRVru6EupCww
+						KjEPMA0GA1UEChMGTGF3dGVsMRcwFQYDVQQDEw53d3cubGF3dGVsLmNvbYIJAIQl
+						CctZBRSMMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAI5u8pzk5pFL
+						8GE7AJO8xu43xmPoXZJQI8jtXZ67xA0zDl/YKi7lyAtITABLi0no05j/B6bs30ah
+						ZJWIhpo1heA1Aqsvg8cc+wsMGA0G0BWRm581pdooU37lf8E6jHrHEcYnMREOLR4n
+						tB+Q5JBgE7gNXnrPtKuREyXFpMVuIJaed9L2XRn0dqq8BdMH7L8INOXW2wr+Yb86
+						9N5cUMdyvc/CgmvgBL859khThBVONs9kQaQqY0GANNEKnBXKOiWZsW3bcIGq8idV
+						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>
diff --git a/swamid-interfederations-2.0/www.learninggrids.com-shibboleth.xml b/swamid-interfederations-2.0/www.learninggrids.com-shibboleth.xml
new file mode 100644
index 00000000..27946ba5
--- /dev/null
+++ b/swamid-interfederations-2.0/www.learninggrids.com-shibboleth.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.learninggrids.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>
+						MIIDGTCCAgGgAwIBAgIJAMKYSg+3GU17MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFHNwLmxlYXJuaW5nZ3JpZHMuY29tMB4XDTEwMDQwOTE0MzI0MVoXDTIwMDQw
+						NjE0MzI0MVowHzEdMBsGA1UEAxMUc3AubGVhcm5pbmdncmlkcy5jb20wggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCT1mJfobR9rxjkPud227louYV544Lv
+						Kub5HQMU56EhOmenz8Wp9XTjJNqcko/k82N6XD0RqC/M6YRiUmOV16Yk0urTXaKe
+						kL/SLkVMNZxOEZ8oXLkysw0E2jFhKyB1kx7T7t2eLw/RM7fXo7KQyBl/ahKM0LVJ
+						F7vhL1n6eCuU6uOAkSsWmYlULjSOTaH2IPKUsaNVjqPn5gQfgs+G453dJnRbwdmh
+						fsKGImH5CWfCGUKpd3PTVJtveXWWzz4+gPfS+hN4patbj2L7unLFZLyi1f+EFpry
+						ePT4C8YFYBHUhtoDAsfnPdXZpu5t4pXhyP3RBjeMHppKmxS5cUmDH+sbAgMBAAGj
+						WDBWMDUGA1UdEQQuMCyCFHNwLmxlYXJuaW5nZ3JpZHMuY29thhRzcC5sZWFybmlu
+						Z2dyaWRzLmNvbTAdBgNVHQ4EFgQUzt6Iwba+1fpMyELfdUCRMh49LF8wDQYJKoZI
+						hvcNAQEFBQADggEBAIExIazrssEJfB0OAtCS2rodzsrH7GsTzkPZ8ylRC4b2eXHU
+						AVncNc4nWdLhPuXACSgH8+kL8dOEL3BGDZNc3UwJKyzODv9+PGhGxFHDDbK0JGTn
+						dpSl2dXCKv5rTteTdejjgMZcU0mL6Fntv4HYlgTPG+77UyMM8WfbwIGeWQT3XM66
+						xM/K9NUuHPp3wUJ9801cV3XvB8ojILIZwIRbbKze2NgK8Eda3eC5gQWSH1WBvCav
+						hH4a83QfDDECmHpUVa/eHYkfjWLBNtG7KdGwBLRSH1GbmpUSe0TEwW0wWGCU3R4D
+						OM66RXoED823lMyOTZ6WpPEuAzAAysHcpXP2PlQ=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDGTCCAgGgAwIBAgIJAMKYSg+3GU17MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFHNwLmxlYXJuaW5nZ3JpZHMuY29tMB4XDTEwMDQwOTE0MzI0MVoXDTIwMDQw
+						NjE0MzI0MVowHzEdMBsGA1UEAxMUc3AubGVhcm5pbmdncmlkcy5jb20wggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCT1mJfobR9rxjkPud227louYV544Lv
+						Kub5HQMU56EhOmenz8Wp9XTjJNqcko/k82N6XD0RqC/M6YRiUmOV16Yk0urTXaKe
+						kL/SLkVMNZxOEZ8oXLkysw0E2jFhKyB1kx7T7t2eLw/RM7fXo7KQyBl/ahKM0LVJ
+						F7vhL1n6eCuU6uOAkSsWmYlULjSOTaH2IPKUsaNVjqPn5gQfgs+G453dJnRbwdmh
+						fsKGImH5CWfCGUKpd3PTVJtveXWWzz4+gPfS+hN4patbj2L7unLFZLyi1f+EFpry
+						ePT4C8YFYBHUhtoDAsfnPdXZpu5t4pXhyP3RBjeMHppKmxS5cUmDH+sbAgMBAAGj
+						WDBWMDUGA1UdEQQuMCyCFHNwLmxlYXJuaW5nZ3JpZHMuY29thhRzcC5sZWFybmlu
+						Z2dyaWRzLmNvbTAdBgNVHQ4EFgQUzt6Iwba+1fpMyELfdUCRMh49LF8wDQYJKoZI
+						hvcNAQEFBQADggEBAIExIazrssEJfB0OAtCS2rodzsrH7GsTzkPZ8ylRC4b2eXHU
+						AVncNc4nWdLhPuXACSgH8+kL8dOEL3BGDZNc3UwJKyzODv9+PGhGxFHDDbK0JGTn
+						dpSl2dXCKv5rTteTdejjgMZcU0mL6Fntv4HYlgTPG+77UyMM8WfbwIGeWQT3XM66
+						xM/K9NUuHPp3wUJ9801cV3XvB8ojILIZwIRbbKze2NgK8Eda3eC5gQWSH1WBvCav
+						hH4a83QfDDECmHpUVa/eHYkfjWLBNtG7KdGwBLRSH1GbmpUSe0TEwW0wWGCU3R4D
+						OM66RXoED823lMyOTZ6WpPEuAzAAysHcpXP2PlQ=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.learninggrids.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.learninggrids.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.learninggrids.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.learninggrids.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.learninggrids.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.learninggrids.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.learninggrids.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.learninggrids.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.learninggrids.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.learninggrids.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.learninggrids.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.learninggrids.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.learninggrids.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.learninggrids.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.learninggrids.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Crick Software Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">LearningGrids from Crick Software Ltd - Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cricksoft.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Burt</md:SurName>
+    <md:EmailAddress>mailto:andrew.burt@cricksoft.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Burt</md:SurName>
+    <md:EmailAddress>mailto:andrew.burt@cricksoft.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
new file mode 100644
index 00000000..46b7b260
--- /dev/null
+++ b/swamid-interfederations-2.0/www.leedsuniversityunion.org.uk-shibboleth.xml
@@ -0,0 +1,64 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml b/swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml
new file mode 100644
index 00000000..26a6014a
--- /dev/null
+++ b/swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml
@@ -0,0 +1,85 @@
+<?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>
+      <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>
+						MIIDMDCCAhigAwIBAgIJAKDOIiXpyPeZMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFW9ubGluZS5saWViZXJ0cHViLmNvbTAeFw0xNDAzMTQwNTAzNDlaFw0xNzAz
+						MTMwNTAzNDlaMCAxHjAcBgNVBAMTFW9ubGluZS5saWViZXJ0cHViLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM7/SYDfsaPbVYvAvpyFaTm0N9gF
+						F3WclCufGBuJBHr985O6elVYWrANB0CLyIdUlHN6eCKTcZTv+aKD4gHX4ECDxnfj
+						ozWWL8e2xbAAWq7Q9e8Br9UQGMFcVe4n3gOoeazUDBXMDMR/XC9zX4SZgUij6Zk6
+						1W3sNHXkT/+olQriyyWD9UmF+TZcqySxQaaiDXen3yVsqU542slFWHLCXN9DZGZ4
+						PtmBPInLWFD1D9oyXwg7F+nlielFxbY2MlT01O4URSZb8cIOOgXDGqFhcL1EytTY
+						3FTQXgoa3gVFVz00u/zHyCIT7HjoDUcUSrbR/FTy5l2JVomFwY6BeQLVRCkCAwEA
+						AaNtMGswSgYDVR0RBEMwQYIVb25saW5lLmxpZWJlcnRwdWIuY29thihodHRwczov
+						L29ubGluZS5saWViZXJ0cHViLmNvbS9zaGliYm9sZXRoMB0GA1UdDgQWBBTUYAZ/
+						lW3+Qwv4itlnK8u9Mnus5jANBgkqhkiG9w0BAQUFAAOCAQEADCOUTrrLrH0I6BAO
+						aYbHu8hxIiwLKln0jUmCNcLhYfSDNErdCBkQ65FT7fuVFIBNFmvvmYbbelgVT5O+
+						gRN63p56RN9YSHGm4vTz59WWKlce6db87ZYy5SJneyOsVSj1eQ3VXA2mTV/v7beH
+						TvKOCRq1pLXrTW3CyvdBHbKCdXqN9JHXSc0Hw4afGEOecnrq3DoyBxh3/LX6i4Ty
+						kphk7xLp8dhGzs767f6GflqekCETspWcenJAJkzztaZfVr5AUMU4/nzhCEbTb6L3
+						H4DFy1CDquP13ggw0RaFwt090YnGMoTxkwIHbNHOk0b3ja9yD2qxqfNmnGPscktq
+						ghHcPQ==
+					</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>
+						MIIDMDCCAhigAwIBAgIJAIA3TR3Mqzn9MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFW9ubGluZS5saWViZXJ0cHViLmNvbTAeFw0xMjA0MDYyMDAwMDRaFw0xNTA0
+						MDYyMDAwMDRaMCAxHjAcBgNVBAMTFW9ubGluZS5saWViZXJ0cHViLmNvbTCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK6DZ2kiyRCZQ3nAG0A2383d4R8L
+						GhfewFJ6sns+taH7SQTgJj4XxpCSPHQXTrToMyfMwcZ7uttKhPHrWipx8vG4ghAv
+						3WNd+QFqO/kbeBb/7qVYh24Nd4qwzaHKceUcDHBdMX3KOsz0ZJ2SnGsv41Hn4y/n
+						Y++Xoi4iJsSFXK4KhGTVqReOL6IQ+nkUP75O+ifq2jxhwGGU7xHiXyU/N0CNkuIo
+						8cF8TKwuOZudBAYL1ELxtQJXar8d1RJ6MFpDcgoJmRKL6zFUqWsSJnumWmSPLWLL
+						FjYKVHjxZIiFIFmUkP316SdYRCMNPLUXFntaDYqAoPN4+SVmdqJmF9ajfmcCAwEA
+						AaNtMGswSgYDVR0RBEMwQYIVb25saW5lLmxpZWJlcnRwdWIuY29thihodHRwczov
+						L29ubGluZS5saWViZXJ0cHViLmNvbS9zaGliYm9sZXRoMB0GA1UdDgQWBBT40fD0
+						nCRtAzbqhf/X354aeW5mczANBgkqhkiG9w0BAQUFAAOCAQEAfFvZ6nc9J6f8KBNh
+						twzlIZtiTyC6YC+Y6ly0m9OukvtcAONLsT/1mykPv3v6Q80noWHJhYHeHw5huDfz
+						JYB0btKX8lbk87Y8p9zPdy5h8OB4TK2i4TMGtcXDeXE9PHenzxjf6fXNrLsKesWt
+						7qxdjVVlTK+mNy+UtH0lQR1pQwHSPArK+R0J/qgLdZCzIJt3UUf8Wx92MD8armHK
+						U4rlNhgdYjRn8TWzfm1zxlmdTtNHDRUR4hGH8ruzueInfmkeC8KsmTLBoafZ/5HW
+						jA7zGk30WjvkkDeMJ6D4lwBs4tW6dNY9RoXgBBpJKeAfmNBgGTNg39ajyJGS4Drr
+						yEPyLg==
+					</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>
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
new file mode 100644
index 00000000..c5f137a2
--- /dev/null
+++ b/swamid-interfederations-2.0/www.listening-books.org.uk-shibboleth-sp.xml
@@ -0,0 +1,66 @@
+<?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>
+      <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>
+						MIIDFTCCAf2gAwIBAgIJAKDYQGOVxDtoMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGnRncGx3ZWIwMS50Z3BsaG9zdGVkLmxvY2FsMB4XDTExMTAyMDEwMjUxN1oX
+						DTIxMTAxNzEwMjUxN1owJTEjMCEGA1UEAxMadGdwbHdlYjAxLnRncGxob3N0ZWQu
+						bG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDN2HILHmtyg26I
+						knBnnJ0C/MGIYoDGyYvy+ECjDj2QeEYJKx7ew9shXOkeHgrwBbxyDvsSf1dY2fnI
+						6WF9iVtzIw0imhxPNvNqrQT21zMNK/UsPd2jj8rgBpG8BAnPviKFACgvOcV/jwWn
+						kMlYtcBVMivFomIvwCG907vVth/az8X26jRhQJ2stWJkST5VJ6hY2ynhjuqrveMC
+						tUN9nOVp2gh5tx1DgIKQS4k9FMlNL0CdS0jNqt5L+pmn67oBrPrJm8T643BYgvl6
+						UhoR2+M7BfyNy+y5GsmNysgKBQ7AY7kMBgQTOBecgfsN9rilljpB/ajMq3shGXYG
+						u3xpXxy7AgMBAAGjSDBGMCUGA1UdEQQeMByCGnRncGx3ZWIwMS50Z3BsaG9zdGVk
+						LmxvY2FsMB0GA1UdDgQWBBRktKsDD89ocGlu6WacWrHMS/q5WjANBgkqhkiG9w0B
+						AQUFAAOCAQEAq7ISl1XdEGVH72x0o9PqdeWv8e6w9iyyXlc7no1ugkM7qcXrzfEn
+						EuRn+vd7FVYw0WQDa+YbdMiY0iT/Mt094WUTFU+tUcfgbJLskLqsHrJhdwpI6GVX
+						lKICBk4ck20Hb9a6DAMHCOlMl5jyVTbtfDmsDE45QnRzwKmyItGPulup/WsRN6cw
+						ljVoBNnM64z/4Espp7Hqh9MT3elQnzCOYZH+qIwmLWvulpeLICokPW0SqIRzPx14
+						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>
diff --git a/swamid-interfederations-2.0/www.litencyc.com-shibboleth.xml b/swamid-interfederations-2.0/www.litencyc.com-shibboleth.xml
new file mode 100644
index 00000000..0c10ac54
--- /dev/null
+++ b/swamid-interfederations-2.0/www.litencyc.com-shibboleth.xml
@@ -0,0 +1,85 @@
+<?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>
+      <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"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDCTCCAfGgAwIBAgIJAKScrCvlkuwdMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFmRvbVUtMTItMzEtMzgtMDctMjYtOTUwHhcNMTIwNzExMjEyMzI4WhcNMjIw
+						NzA5MjEyMzI4WjAhMR8wHQYDVQQDExZkb21VLTEyLTMxLTM4LTA3LTI2LTk1MIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5I+4aMcaXfWFVtJOunjKb4+X
+						1cK9g+so8YOGFM/vCLTWqe1Be/8yHbpOsx8ivyLzCUhgTsBp0rvVsDCzJtIzwSBZ
+						6nOqCP+sm9QSMj8u8zIAhDzQ7qhTF07cvgC7pAjrQPFuq+Rq22ky2foYlfrXonbI
+						SXgKLXpvIdGsZ/DE4ywBoL7AlFCLaSc8JHEwAuhJ0QbIVD6UixvgjC/g702CI1+f
+						Uh6pHlO8IXIwvYGnzhRk1tpXxiCXeWvGsJtC1dahzxcSKjwNUFuTVJ+TgQkd83sw
+						qPf9cqHJYRt7m3qtJGg48qoRlN8p4tohjPpWMraxiAoVB+FbA8InI3dxHvE0bQID
+						AQABo0QwQjAhBgNVHREEGjAYghZkb21VLTEyLTMxLTM4LTA3LTI2LTk1MB0GA1Ud
+						DgQWBBS+EvnRtGsmIntM+sicbzq78PUsqzANBgkqhkiG9w0BAQUFAAOCAQEAzvjC
+						l4jY9WPYMmLPdCqKmN8WfYYaV22iaYH1q/jlOlh90XZLN8NM89YWbpsdJi9zVvgU
+						iA6RbiamzHyGnQwpo1nvJxI2f+cKBDb7wFk3wj3BFyzeF4L66kM6xbqrG/WHYVbV
+						D6Ybrj15Q/o1aE2vGH4bZH62Tzturlqol70YdyfSvK/kuC5UeTsyF+mXbytIWy/s
+						mfVmJNHhN0Lnm28uAtHcyzC5WS06kmMmOzwlhYlmBr7CfvnmbH/7tTAFX6ybvfWe
+						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>
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
new file mode 100644
index 00000000..b782cf5e
--- /dev/null
+++ b/swamid-interfederations-2.0/www.login.amdigital.co.uk-shibboleth.xml
@@ -0,0 +1,101 @@
+<?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>
+      <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>
+						MIIDQDCCAiigAwIBAgIJAOnoeaY+22sjMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXd3dy5sb2dpbi5hbWRpZ2l0YWwuY28udWswHhcNMTMxMTIwMTYyNzE4WhcN
+						MTgxMTE5MTYyNzE4WjAkMSIwIAYDVQQDExl3d3cubG9naW4uYW1kaWdpdGFsLmNv
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwXZuSpA1eklgnNFN
+						7cYjfzOg87Q4W87KhDui8HmowwT+tBRV9aK9RNFOHUmZKmatrb21961DakpvyFqo
+						i4y2PgCK9x5tcP5z0stQCiJXz/GT7Nm4mqxCS9klruJJYkzIQENLo1gClAGDPejq
+						0yuxrRn0X0V+kkjmJfhtj6a4vQsQiI1YxLNfPWRcUq+aY5R5J2hOBduYRn13+6q3
+						oLGGY2kEzTwngPz4m1PqNKNCmb4yh5XUTXpgezUIdUOqU5lJ37yZKI3eyxZ67hV7
+						beQWNq8YM+Mtc9ixQ0MXQw/U0uxc44OtwbJwh01oyS/d2A4LDrDltJL+RlUXtzcc
+						4+loHQIDAQABo3UwczBSBgNVHREESzBJghl3d3cubG9naW4uYW1kaWdpdGFsLmNv
+						LnVrhixodHRwczovL3d3dy5sb2dpbi5hbWRpZ2l0YWwuY28udWsvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUMG4nqf/bwYPBqgWIdiRkXSCtscIwDQYJKoZIhvcNAQEFBQAD
+						ggEBAHdJJS5QMsr/cP/m+VLjrFCz8Ml6Bi8GUIU2SIUsIC/3/j63XCFlxIsym1rn
+						c/dH4eAqTz/LETocV6DNhhn6PaykG4UArmTxwsn3bMweKoEwaRil1RlW4OjIObf4
+						Vlbw8Tjk9FYykL4G/LzDmdIhv8lneYDJT/F49OTmPr7K9k+JP59l1w49bf8vsZpo
+						04zpJsF8r9kckt62qAKuKPins7pqw3o9/MYZtO59VAQkMfdEvUEXKmTgG09PoIFN
+						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>
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
new file mode 100644
index 00000000..14906ccb
--- /dev/null
+++ b/swamid-interfederations-2.0/www.login.dumgal.ac.uk-oala-metadata.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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>
+						MIIDwTCCAqmgAwIBAgIJAIgvuI4PmdjVMA0GCSqGSIb3DQEBBQUAMEkxJjAkBgNV
+						BAoTHUR1bWZyaWVzIGFuZCBHYWxsb3dheSBDb2xsZWdlMR8wHQYDVQQDExZ3d3cu
+						bG9naW4uZHVtZ2FsLmFjLnVrMB4XDTE0MDMyMDEzNTcwOFoXDTI0MDMxNzEzNTcw
+						OFowSTEmMCQGA1UEChMdRHVtZnJpZXMgYW5kIEdhbGxvd2F5IENvbGxlZ2UxHzAd
+						BgNVBAMTFnd3dy5sb2dpbi5kdW1nYWwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQCoxfB66zAeC16RLp8dFbrBpfi9zddARRAb317m5UYig1oL
+						0ht7+rajRx9Y7it4GVum3gnEcZ0U7IAvUoGCavGTcg3NFrgFHCNDKnP0C55dTfs1
+						ABToyUsQP6J4iAyGZL7gttdcw2iKwLO2GgfgvMm6K5SltKvmg/MTL1l0FNAY/1aE
+						AWO2vVLottFJjB1InHYRTiY9rWSwzf6NVbiMHt8pok8dE8MSjQvzH6jNZYKj6ib7
+						0jIXScx1f+JTH5LCyKU4q9SsWbE3flU7r2Zq2Vkcg7v1wmY2v/KwYt+zbtEwwi6z
+						2JyNpaL0XoK/9owkm3zQwi51NgP4DHXeyfxRtcpRAgMBAAGjgaswgagwHQYDVR0O
+						BBYEFEXErYTB8YyULUKnLraEy0cuWijsMHkGA1UdIwRyMHCAFEXErYTB8YyULUKn
+						LraEy0cuWijsoU2kSzBJMSYwJAYDVQQKEx1EdW1mcmllcyBhbmQgR2FsbG93YXkg
+						Q29sbGVnZTEfMB0GA1UEAxMWd3d3LmxvZ2luLmR1bWdhbC5hYy51a4IJAIgvuI4P
+						mdjVMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEkNkJE/FfIjeoC+
+						BIA49Ig2Csb7N/oY2X9FxMXvNcRNEJ2hxEi6lqCzTjkjooQcTCpWvm0gszwwB9ny
+						0lYzJU8Rbx1PyQfYDrKuagJ2lkDEBKJYpnWrl5+63q8RhYZ9WqHfdL/K16LwhtRN
+						a4dq0ZRZ6a9EAgIOcJoyMXgR9nBxQ1DwT3HmpuXWR9++/7mXOg0AHg27066nW8Oz
+						+fGvILEhti+R7JHgIUrT3W10tavHhNiZ5pw0sfF1bSMODTa6kKw6rCPH+7bmSwqe
+						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>
diff --git a/swamid-interfederations-2.0/www.londonmetsu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.londonmetsu.org.uk-shibboleth.xml
new file mode 100644
index 00000000..82af0599
--- /dev/null
+++ b/swamid-interfederations-2.0/www.londonmetsu.org.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.lrb.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.lrb.co.uk-shibboleth.xml
new file mode 100644
index 00000000..23393e35
--- /dev/null
+++ b/swamid-interfederations-2.0/www.lrb.co.uk-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata: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-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>
+      <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"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC7jCCAdagAwIBAgIJANyqIs0OWWWhMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXd3dy5scmIuY28udWswHhcNMTMwNDEwMTUwODQ5WhcNMjMwNDA4MTUwODQ5
+						WjAYMRYwFAYDVQQDEw13d3cubHJiLmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAu8m19a1SY54Kh43Uwe0g/Q2nJInoV7MhgrZ3afYRXzSnulOd
+						XSv9AxWl0WqlzxVlAC9ak1AKJEFMkhyg0z7DPQHDmboixrQBP1jxvPxvq1EQ2B2G
+						RwlQTNwxyOs4Ud10y/X5uZKBYKfwb7Xr6wJVug2Jk3g0m9Q/xOB5vFdytmVo0Htd
+						X8JzDYiovHh8/01nw1zqRL9XYYfDqTzlIzkVzMpaXUtlEUySY+Pk/KP9LW612NLj
+						0leIa6umDD3o1ZfhlTBcsMrzrVmGq8MZE4JAXM05DZ3hEZpXmr9xQ6vAx0U8kigg
+						XWfw31ME2r/mfdySgRdPDEinr3OEe6oJsS8gDwIDAQABozswOTAYBgNVHREEETAP
+						gg13d3cubHJiLmNvLnVrMB0GA1UdDgQWBBQqFtNRW4fjzMcAqBf0Uofy4ZeW+TAN
+						BgkqhkiG9w0BAQUFAAOCAQEAW1hamIuAkBxhF/uQ4cpKvKy75st3aI/rmiFZcCFh
+						YHK5SZUj5DIfreGZG02onq3/dA7Kj9rjiEIFXnBULpcNulp3DcpVKkoxkfnV180A
+						Zltn8jPSbrzNGpb536PMYa21yycxBxh0uR+IbznLqlVhQCmQI5/7HOAPihUvV/w5
+						ulQI3JKrLeE42xPVToBYWCk4SrfciKq06ZZG1s1WbYkf1uracUDpZZ8g2YkvQrdK
+						eGkLyLvQrBJ3Rfmx2ukVAk5y/ajluFz9DQrG/jc5H9J6/ql4BXhfXsAH+PiIxbzI
+						KsYWHAVwkTwGO4W2Vf2JeTWKbVpWYsr7Ct32TqFFMS09FA==
+					</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.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
new file mode 100644
index 00000000..38360f9f
--- /dev/null
+++ b/swamid-interfederations-2.0/www.lsbsu.org-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.lsesu.com-shibboleth.xml b/swamid-interfederations-2.0/www.lsesu.com-shibboleth.xml
new file mode 100644
index 00000000..e9f2cd61
--- /dev/null
+++ b/swamid-interfederations-2.0/www.lsesu.com-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
diff --git a/swamid-interfederations-2.0/www.ltscotland.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.ltscotland.org.uk-shibboleth.xml
new file mode 100644
index 00000000..4936fa0d
--- /dev/null
+++ b/swamid-interfederations-2.0/www.ltscotland.org.uk-shibboleth.xml
@@ -0,0 +1,66 @@
+<?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>
+    <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>
+      <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>
+						MIIDEjCCAfqgAwIBAgIJAMFVcb/xT28pMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGWx0c2Utd2ViMDEubHRzY290bGFuZC5jb20wHhcNMTAwNDA2MTEwODMzWhcN
+						MjAwNDAzMTEwODMzWjAkMSIwIAYDVQQDExlsdHNlLXdlYjAxLmx0c2NvdGxhbmQu
+						Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0cNyCYPET1vjazeG
+						oTDedpNCEKqceFny1kyLJRwdu8D76/4Y/U9G0lLcWo25xFwnu8bBYP0Wx1ARelQH
+						VnZK8iiauUMKeu1N6Pq/4zRXUQzI5+SCEKfGGh4IqV4W1eid0WET30PdziNo8s5q
+						0A6kp4FIKYD5EKZwVALe57/b2tAFFyf37jxZTZxvrLWJDUdC4lwK32hbormk3Pi9
+						qKwOUlxYgkKcwxVWbUGHWpUI1DWfpvqsRObQTCXbPfbtBWtdrRRwIlHQjY+Ns0Hk
+						Au8xKXLEFllu1t0XCJ7fTimJ0XwiqGh7sLcQnc2W63hZOkKHgESjVHEIUjH1pZaZ
+						VLEbIQIDAQABo0cwRTAkBgNVHREEHTAbghlsdHNlLXdlYjAxLmx0c2NvdGxhbmQu
+						Y29tMB0GA1UdDgQWBBQs0eoj0gCKFhGV81jjIuGRu7jYRjANBgkqhkiG9w0BAQUF
+						AAOCAQEAfIQzlxcJDwFgeghBOThTNYlWWrTg9sBGX2ScJrTdpZ2YCBVCiqJzvHbs
+						CVVm/wxXg6RszMl6jZJUMCZo+uCFRjP/VVaZYdHxGOYwz2U68gUeO41dlF7MlC++
+						/dIuKK+XXRyrM49hwdDZS14mQTkor6Kt8zpabLtn6FCpr8tDEtXuFn28PiyWyxq3
+						JimO/CV4gydrnNg2iGkZHHP46dkIvi0mIqMVv8OTwqgSdpe1i/HldGZ5IWGdouIZ
+						YJH+7toasSbjwqMusDEt0GMuMM0QqM8SFsTaAp7rBjnepE2gYVTK+RGloI+CCVoD
+						2XXgRAd0fVakFAhtv93JvF7VW3e5TA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..09888650
--- /dev/null
+++ b/swamid-interfederations-2.0/www.luu.org.uk-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.magonlinelibrary.com-shibboleth.xml b/swamid-interfederations-2.0/www.magonlinelibrary.com-shibboleth.xml
new file mode 100644
index 00000000..06fdf6e4
--- /dev/null
+++ b/swamid-interfederations-2.0/www.magonlinelibrary.com-shibboleth.xml
@@ -0,0 +1,52 @@
+<?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>
+						MIIDPDCCAiSgAwIBAgIJAOxJ6oH31iOVMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy5tYWdvbmxpbmVsaWJyYXJ5LmNvbTAeFw0xMzExMTkxNDAwNDNaFw0y
+						MzExMTcxNDAwNDNaMCMxITAfBgNVBAMTGHd3dy5tYWdvbmxpbmVsaWJyYXJ5LmNv
+						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANX7vUWYKC2Ke/ZrzYvD
+						Gw5Mm0NrEf0aMwrnw2wvsS2lncSUXj8bDTwQi3x+xC0/1hmNFEpRnhfyu5JwKDXP
+						yw+38q8aE4B8p1s9HNvj0YJPlUTK15mQabc3HQ9S5goeYeUq+mZenoS84w1NBym+
+						Fu3jbWvaQAtrBlbJP8/+U6OLMVdesqUNTK3IAOu3NHuk8mdFmOSDExznHbHhgzpz
+						s9Tu5lhyS62gUayA6YpQWOw6EUjiRmsAMwcSwXeD1lPwNt1veW0RELdciMscGHAP
+						SkeSwGCSl5BY5vOg5kGF21SRlfbnvnAoe1DlPrT6AghiK2K7VIARoElc4QnyFDNc
+						5Z0CAwEAAaNzMHEwUAYDVR0RBEkwR4IYd3d3Lm1hZ29ubGluZWxpYnJhcnkuY29t
+						hitodHRwczovL3d3dy5tYWdvbmxpbmVsaWJyYXJ5LmNvbS9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBQAs2Jn/mvqHwTEVKRDRTew/qJkNzANBgkqhkiG9w0BAQUFAAOCAQEA
+						F8SJ0Rggh6WOg1tu1WIOi2uDZmqK1x1sljbH7RjKuAafvDf2ihVEzcW6LzFez3Ew
+						MXOkx6uOYq3+TpqWP6ofjKW/pDrfBap9QV7/H6S55Qamqmi9u6UgMK4AITGE2M94
+						YBmAISSAOL2syhb9fpGIG7r5w6gs7NvkrrQ0Ua6jMQ8x5vSH65tKboN+unXw/n1n
+						hPb5xbuJl8vC0BI0lMZ6lWddY8aAs1cjoyjSKP3JyM/noIv+U1bm2vPeYATHgKNI
+						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:1.0:profiles:artifact-01" Location="https://www.magonlinelibrary.com/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.magonlinelibrary.com/action/samlACS" 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="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
new file mode 100644
index 00000000..2d8bdb57
--- /dev/null
+++ b/swamid-interfederations-2.0/www.maneyonline.com-shibboleth.xml
@@ -0,0 +1,51 @@
+<?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>
+						MIIDKDCCAhCgAwIBAgIJAJDMcsKQ9DnAMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE3d3dy5tYW5leW9ubGluZS5jb20wHhcNMTMxMjEwMjAyODE3WhcNMjMxMjA4
+						MjAyODE3WjAeMRwwGgYDVQQDExN3d3cubWFuZXlvbmxpbmUuY29tMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2eA38F/RgHF6yDJANjrq+qtQrS7BbYeG
+						b47pP8OqzkjVBIQVhnIwEcfCbVym+dVUX1DZRK4YsmxzmHl/FZtSb86lR2LWlSGJ
+						rvj/ggUAS1MyrGKa5FIpaP87fknDrR8sU04dzu0Rv2ttrrIaRB/GJZLERY0upRYX
+						aVtnvebsk2XZaoGPdRdb/eFsejsA/BNSOnZkw02RYbbMhotiqRGEu1trjDAJMPDS
+						c9ceQt9LNTGnraqAZwy7kWbKz76jLl9s6+uvNRkKxJ4IizZa7xAGuB3d33J4Whwz
+						FOk9j501pq05p934onj+W5vODoy6/JZHAcT/DuLj1SLKA0MlAzdaGwIDAQABo2kw
+						ZzBGBgNVHREEPzA9ghN3d3cubWFuZXlvbmxpbmUuY29thiZodHRwczovL3d3dy5t
+						YW5leW9ubGluZS5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUC7pAjMI3gjmg/6ZP
+						QVGTu4ka0zQwDQYJKoZIhvcNAQEFBQADggEBACiWbtf8AxBWSPuR94PO7Xnytt2N
+						ErSriysu6Y2lqOcjsSpaTPs8X1yZFMuDXE1aKtPgPfpnEz8ktBlLI00zmMr+qAOW
+						pCLTzjKzVvC/7sIXWn+KwPOA8qbp/SzbqAfJJy2vua7tvKzbYigxbGwoQHrg8aSO
+						Pmz35Dd+kfdAR/Y9GGaJ8cS4zXfVSJ4vQ5blWlEHMf9eQy0mz4534FRdiiYPGr0K
+						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:1.0:profiles:artifact-01" Location="https://www.maneyonline.com/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.maneyonline.com/action/samlACS" 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
new file mode 100644
index 00000000..ac212239
--- /dev/null
+++ b/swamid-interfederations-2.0/www.mecenat.eu-sp.xml
@@ -0,0 +1,109 @@
+<?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>
+      <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>
+						MIIEBTCCAu2gAwIBAgIJAPs0Eng4fXs9MA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
+						VQQGEwJTRTEYMBYGA1UECAwPVmFzdHJhIEdvdGFsYW5kMRMwEQYDVQQHDApHb3Ro
+						ZW5idXJnMRMwEQYDVQQKDApNZWNlbmF0IEFCMQswCQYDVQQLDAJJVDEaMBgGA1UE
+						AwwRd3d3Lm1lY2VuYXQuZXUvc3AxHDAaBgkqhkiG9w0BCQEWDWl0QG1lY2VuYXQu
+						c2UwHhcNMTQxMTI1MDc0NjM1WhcNMzQxMTIwMDc0NjM1WjCBmDELMAkGA1UEBhMC
+						U0UxGDAWBgNVBAgMD1Zhc3RyYSBHb3RhbGFuZDETMBEGA1UEBwwKR290aGVuYnVy
+						ZzETMBEGA1UECgwKTWVjZW5hdCBBQjELMAkGA1UECwwCSVQxGjAYBgNVBAMMEXd3
+						dy5tZWNlbmF0LmV1L3NwMRwwGgYJKoZIhvcNAQkBFg1pdEBtZWNlbmF0LnNlMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAthw09/uFrfgj4G7p5IGgeTl+
+						upIQ10NpsvNsemRCv2G7kqWXlOgFXKm3m+aL71VposZKwgkPtp/RmFPedylSw6PQ
+						IcPIICqDhQo2g5REPJtb7US3q9DuA4QFr2UkM5QLD0Uuvrm1T6ENW0dXYmRM5SXS
+						OkqmVgbREhVeE4kyzhW5TneQQxbDMquPAlLSmPER89+2RYyr+FOGAfulQn4bRAro
+						PBpP+KORTFNOKpxsFp745dJ/3MV6ljqjWkqnF0aGYdOKTX+D0qg+hdCWJ+7II0K1
+						N1cbx+OsQkYc6J7wS45R1SN4Ii1vQO13UbYlOgMCSnss69SedACTfbhr9+JyewID
+						AQABo1AwTjAdBgNVHQ4EFgQU+NQXtvX4maXi6ZW8lBSczzekUbowHwYDVR0jBBgw
+						FoAU+NQXtvX4maXi6ZW8lBSczzekUbowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
+						AQUFAAOCAQEAI1h9/Wl4HbO0y2AOP2ju0GcglBCaiHl+2/8QKBtzxncqUg3JrdGV
+						bQKpFbDWLekY50ckYG74+dhB0WdtAlE7XhSih4S4ddNhycariZxkHKYwoWKIrg28
+						C/WJyklWIQ2PjN6gEEHr7FgOH76tVJi+kVZd0+9sjLtpbTaA1mc7SqGpCp/eGHu1
+						NNpUXR11EaizV0z/Txc/NNnkSReDQz3noo+ocByF2gObCj/gtrDkPA5usf82Oe24
+						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>
+						MIIEBTCCAu2gAwIBAgIJAPs0Eng4fXs9MA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
+						VQQGEwJTRTEYMBYGA1UECAwPVmFzdHJhIEdvdGFsYW5kMRMwEQYDVQQHDApHb3Ro
+						ZW5idXJnMRMwEQYDVQQKDApNZWNlbmF0IEFCMQswCQYDVQQLDAJJVDEaMBgGA1UE
+						AwwRd3d3Lm1lY2VuYXQuZXUvc3AxHDAaBgkqhkiG9w0BCQEWDWl0QG1lY2VuYXQu
+						c2UwHhcNMTQxMTI1MDc0NjM1WhcNMzQxMTIwMDc0NjM1WjCBmDELMAkGA1UEBhMC
+						U0UxGDAWBgNVBAgMD1Zhc3RyYSBHb3RhbGFuZDETMBEGA1UEBwwKR290aGVuYnVy
+						ZzETMBEGA1UECgwKTWVjZW5hdCBBQjELMAkGA1UECwwCSVQxGjAYBgNVBAMMEXd3
+						dy5tZWNlbmF0LmV1L3NwMRwwGgYJKoZIhvcNAQkBFg1pdEBtZWNlbmF0LnNlMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAthw09/uFrfgj4G7p5IGgeTl+
+						upIQ10NpsvNsemRCv2G7kqWXlOgFXKm3m+aL71VposZKwgkPtp/RmFPedylSw6PQ
+						IcPIICqDhQo2g5REPJtb7US3q9DuA4QFr2UkM5QLD0Uuvrm1T6ENW0dXYmRM5SXS
+						OkqmVgbREhVeE4kyzhW5TneQQxbDMquPAlLSmPER89+2RYyr+FOGAfulQn4bRAro
+						PBpP+KORTFNOKpxsFp745dJ/3MV6ljqjWkqnF0aGYdOKTX+D0qg+hdCWJ+7II0K1
+						N1cbx+OsQkYc6J7wS45R1SN4Ii1vQO13UbYlOgMCSnss69SedACTfbhr9+JyewID
+						AQABo1AwTjAdBgNVHQ4EFgQU+NQXtvX4maXi6ZW8lBSczzekUbowHwYDVR0jBBgw
+						FoAU+NQXtvX4maXi6ZW8lBSczzekUbowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
+						AQUFAAOCAQEAI1h9/Wl4HbO0y2AOP2ju0GcglBCaiHl+2/8QKBtzxncqUg3JrdGV
+						bQKpFbDWLekY50ckYG74+dhB0WdtAlE7XhSih4S4ddNhycariZxkHKYwoWKIrg28
+						C/WJyklWIQ2PjN6gEEHr7FgOH76tVJi+kVZd0+9sjLtpbTaA1mc7SqGpCp/eGHu1
+						NNpUXR11EaizV0z/Txc/NNnkSReDQz3noo+ocByF2gObCj/gtrDkPA5usf82Oe24
+						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>
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
new file mode 100644
index 00000000..1e863891
--- /dev/null
+++ b/swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
@@ -0,0 +1,57 @@
+<?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" 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>
+      <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 height="120" width="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" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>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
new file mode 100644
index 00000000..97ebf1e6
--- /dev/null
+++ b/swamid-interfederations-2.0/www.medicinescomplete.com-mc-shibboleth.xml
@@ -0,0 +1,69 @@
+<?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"/>
+  </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">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>
+						MIIFZTCCBE2gAwIBAgISESFAs6LrxE6kf3dqQJu3Dy3vMA0GCSqGSIb3DQEBBQUA
+						MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYD
+						VQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzIw
+						HhcNMTMwODIyMTQyOTQwWhcNMTgwODIyMTQyOTQwWjCBlTELMAkGA1UEBhMCR0Ix
+						FzAVBgNVBAgTDkdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xOjA4BgNV
+						BAoTMVRoZSBSb3lhbCBQaGFybWFjZXV0aWNhbCBTb2NpZXR5IG9mIEdyZWF0IEJy
+						aXRhaW4xIDAeBgNVBAMMFyoubWVkaWNpbmVzY29tcGxldGUuY29tMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2XOqzYc15XJX3l6tjtr2A/zHGyDqryJv
+						duUDJ+B85UYj0vh2xHDXwlsdd3+T5e9Eumo3NhAVpTN6j3jv5crLYL+M2DsbPSPY
+						r76amB7WWkfGJMTPBZo6wvoeNDOdfjVG30P71qpdz5ZRTElLqYKN3/tlXPoiL7Il
+						Nt5I+18JVwKCs5eKSftSzuJjd9NUAjqHicouEE2mtXNE0luflz5Yh2/wTA/AmryQ
+						nYfaW6KFloeNzPEfd8xMGfhfUr2PjPbSrlYVYxz0cvkWaR1Q98heD9kI33ys6gl+
+						CrbM5sJ3kcTnsrtqG0cNnwUCnTv9KzzG7x2/8u8w8ncrCMlG46F4ZQIDAQABo4IB
+						5DCCAeAwDgYDVR0PAQH/BAQDAgWgMEkGA1UdIARCMEAwPgYGZ4EMAQICMDQwMgYI
+						KwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkv
+						MDkGA1UdEQQyMDCCFyoubWVkaWNpbmVzY29tcGxldGUuY29tghVtZWRpY2luZXNj
+						b21wbGV0ZS5jb20wCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
+						BQUHAwIwRQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL2NybC5nbG9iYWxzaWduLmNv
+						bS9ncy9nc29yZ2FuaXphdGlvbnZhbGcyLmNybDCBlgYIKwYBBQUHAQEEgYkwgYYw
+						RwYIKwYBBQUHMAKGO2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5jb20vY2FjZXJ0
+						L2dzb3JnYW5pemF0aW9udmFsZzIuY3J0MDsGCCsGAQUFBzABhi9odHRwOi8vb2Nz
+						cDIuZ2xvYmFsc2lnbi5jb20vZ3Nvcmdhbml6YXRpb252YWxnMjAdBgNVHQ4EFgQU
+						6hkvlxO56ZLnbe1cuDX/EuZJjJIwHwYDVR0jBBgwFoAUXUayjcRLdBy77fVztjq3
+						OI91nn4wDQYJKoZIhvcNAQEFBQADggEBAJOp4lsEMzzLYU0nufnXFdUPQshtGRGN
+						CSq7bb6+hFUQsMdxXQndbbB4j1Ooc93wdJPoPT4BWdGx52jpEHtL5oYPOzvz2y5L
+						rOx/qLYHZJARVKvL2jzWTDSxDFmjROay2BF/gYPA8oOzVFWXVWTOVrG+VO8ZE99s
+						o1cD79wTxPNZDduPRpMo+gPO2mHgbM2I1ex+81KIu0r69H/DSOjpxpXM2IVx6n75
+						zLwgFCx6+rsu3VEoJL7fcmI9tV4nHSgvX0BbxVN0hiMSmmLyVS4VHV3Sd5hUq0Ni
+						rGza4ZQu2FDvZCTsVhGeJY0WfVMF9XwyyptsUSurLL0+xH4/ureEj/A=
+					</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.medicinescomplete.com/mc/shibboleth" index="0"/>
+  </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: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 3d8e4e57..9ab4b938 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,28 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.meertens.knaw.nl/Shibboleth.sso/Metadata">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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://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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.meertens.knaw.nl/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">CLARIN-NL Meertens Institute</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">CLARIN-NL Meertens Institute</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fi">CLARIN-NL Meertens Institute</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This SP regulates access to the Meertens Institute Archive and selected services for humanities research in the domain of Dutch</mdui:Description>
-        <mdui:Description xml:lang="fi">Tämä Palveluntarjoaja säätelee pääsyä Meertens instituutin arkisto ja asiantuntijapalvelut humanististen tutkimustoiminnan ...</mdui:Description>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Meertens Institute Archive</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Meertens Institute</mdui:DisplayName>
+        <mdui:Description xml:lang="de">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: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:Keywords xml:lang="en">Meertens research documentation language culture humanities archive</mdui:Keywords>
-        <mdui:Keywords xml:lang="fi">Meertens tutkimus asiakirjat kieli kulttuuri humanististen arkisto</mdui:Keywords>
         <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/collections/data-protection</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.meertens.knaw.nl/cms/en/collections/data-protection</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <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
@@ -54,46 +59,61 @@ KpxjeDWUTpopH0JEVvSgX0Tn9pVFVq5F4cial+yOpwDxZvAOwjJlWotoqnyVsDOn
 uESSSj1tVqW+2zqLTdzOpWaP0kWlu7wrL5PzqWhaPVChL+KYs40TNd2XK1rlOtNe
 WWcZ8uJ+ftZDNEGNvaTnRZLhxGxE9OWThvwL0iyOw8vEcWHm2JNRy3VkSvguFDcM
 MXWm4sBAe8iEXXkAxrflHdBubei1FTexa+Kl9lQ/ICrpmT+V1Jyi4DrdvS0+2ijb
-SF7hTs3mZvR2FPh5VJ0vBUC7QOXB5RBcP6vy4H25WiovevzKOg==</ds:X509Certificate>
+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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">CLARIN-NL Meertens instituutin</md:ServiceName>
-      <md:ServiceName xml:lang="en">CLARIN-NL Meertens Institute</md:ServiceName>
-      <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 Name="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.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
+    <md: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:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="5"/>
+    <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="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="10"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Meertens Institute Archive</md:ServiceName>
+      <md:ServiceName xml:lang="en">Meertens Institute</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">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: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="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="eduPersonPrincipalName" Name="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">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="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: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="technical">
+  <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:ContactPerson contactType="support">
-    <md:GivenName>KNAW</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@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
new file mode 100644
index 00000000..ccfb38a0
--- /dev/null
+++ b/swamid-interfederations-2.0/www.mitpressjournals.org-shibboleth.xml
@@ -0,0 +1,52 @@
+<?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>
+						MIIDtTCCAp2gAwIBAgIJAOSUQ1IxKrLFMA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEhMB8GA1UEAxMYd3d3Lm1pdHByZXNzam91cm5hbHMu
+						b3JnMB4XDTEwMDQyOTE4NTUwOVoXDTIwMDQyNjE4NTUwOVowgZkxCzAJBgNVBAYT
+						AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEd
+						MBsGA1UEChMUQXR5cG9uIFN5c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBT
+						eXN0ZW1zLCBJbmMuMSEwHwYDVQQDExh3d3cubWl0cHJlc3Nqb3VybmFscy5vcmcw
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBPu6I5h+u+RBjd9CGQZ+S
+						LCJgGLTT6QA2ZA0jeBwpy49IiMt1XritmWpth6+6Ujl7AfJo9IdVkAyxftbLyZoq
+						X1AFJalhC0PVgijowgQ/dyf0bRwR220GAlfRhXu6bgVyd9AdHcxbwSu6mEXCg6yx
+						Jg/sELZd6YBUyXjoRLavPOJkoVT+bABMYJEK7cmMnf3dfC7qn5AM8nOqa/b7vTSl
+						+6cKazBv9jPZz98vbfKaz7if/WHOOdyZQxtdhs7m4bRLo4eiulzZl90IlHkTyIPt
+						RVij6cXOYlj9LqYD/omAOsIx/HJOj+POh0bTYEezY487Iz51FfOhTox1NV3UVoTv
+						AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGNaKJAhMr+Ms9tqT2SQ5ZSqjU9AKleg
+						257H7SjInDwq3BfDCh7GBJtZ2HziUXUuq4Cu9ufhvyI03aiEkTumupNI27Hhy/jR
+						914HO+RAbOe3v6H6sPSpPSLPVza/wI4UD2i6dwgf8Gb0+WZAputqV80Uu6dd9CNc
+						8x8SH2yVkEwrsS+ropXyxA5+oqvHVeCdsoPSYy2sueQzls8bawTjk7Ukv4DrmFbD
+						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:1.0:profiles:artifact-01" Location="https://www.mitpressjournals.org/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mitpressjournals.org/action/samlACS" 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.mmunion.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.mmunion.co.uk-shibboleth.xml
new file mode 100644
index 00000000..070ab24c
--- /dev/null
+++ b/swamid-interfederations-2.0/www.mmunion.co.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.mmunion.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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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.mmunion.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mmunion.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mmunion.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mmunion.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mmunion.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mmunion.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mmunion.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mmunion.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mmunion.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mmunion.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mmunion.co.uk/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mmunion.co.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mmunion.co.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mmunion.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.mmunion.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: MM Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mmunion.co.uk/</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.morganclaypool.com-shibboleth.xml b/swamid-interfederations-2.0/www.morganclaypool.com-shibboleth.xml
new file mode 100644
index 00000000..4d521b1a
--- /dev/null
+++ b/swamid-interfederations-2.0/www.morganclaypool.com-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
+						MIIEbjCCA1agAwIBAgIJANEyiht0lGz3MA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEfMB0GA1UEAxMWd3d3Lm1vcmdhbmNsYXlwb29sLmNv
+						bTEeMBwGCSqGSIb3DQEJARYPdmFrZUBhdHlwb24uY29tMB4XDTA5MDcyMzE4MjQz
+						M1oXDTE5MDcyMTE4MjQzM1owgbcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxp
+						Zm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEdMBsGA1UEChMUQXR5cG9uIFN5
+						c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR8wHQYD
+						VQQDExZ3d3cubW9yZ2FuY2xheXBvb2wuY29tMR4wHAYJKoZIhvcNAQkBFg92YWtl
+						QGF0eXBvbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1jZrb
+						EIm3NwRJ8SkkHkvjKSWe4vuqyfO1D1MAVZzy5FzSLOeup4qEyCDkwtzrN3vSYNa1
+						4qovhIs+Eeap6FXH3XkhzZluSn4rKM/IoetfcP74l99cIzn4xMZfknhk9NNnb2vE
+						L/dJSu/8LyGFxr2b8c5cdYzgFiN77peyf4kOYCMJhC5xYXogrtFlmzkhbk6CRK36
+						QELJmbcegneoglceycLwmunJvhbkIagouT/AFxm7m9FFR2AbGQ2m52DdCSJdY6Q/
+						+cRnIO3p3Jar0D+huhNPlTyH5XNw41kPH4WvQiYAq7j40cFEwYHU4hOrBkKrdLUz
+						hPjVz1iquFai4gY1AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
+						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSntSFOeKeT
+						NvcbAlIaG09llX2rAzAfBgNVHSMEGDAWgBSntSFOeKeTNvcbAlIaG09llX2rAzAN
+						BgkqhkiG9w0BAQUFAAOCAQEAQguA1fll3LnjT1NokQTeSc1gmZIlbD318j6SKojU
+						zDYXinKZtzK9T0t1e1BFlOnbPGN1Fu1VkGLuOp5Z5/AJqMJJ9hfSOTjtz99AUk20
+						Ojgsw76oZ5nwqvk2lxKregha/GIkT7nJp8ycuQVI1ahnh142BDrfuB5DFAcHvi1q
+						v3NXHQuorkykb0mBuduNW+Uvk2T7wiNzruCOpBJGZzJZw3/FNXGCb3MmtaJgf7Br
+						+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:1.0:profiles:artifact-01" Location="https://www.morganclaypool.com/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.morganclaypool.com/action/samlACS" 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
new file mode 100644
index 00000000..d9caf323
--- /dev/null
+++ b/swamid-interfederations-2.0/www.myinterfase.com-shibboleth.xml
@@ -0,0 +1,118 @@
+<?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>
+      <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>
+						MIIEqjCCA5KgAwIBAgIJALAy5mejW0XwMA0GCSqGSIb3DQEBBAUAMIGUMQswCQYD
+						VQQGEwJVUzEOMAwGA1UECBMFVGV4YXMxDzANBgNVBAcTBkF1c3RpbjEZMBcGA1UE
+						ChMQQ1NPIFJlc2VhcmNoIEluYzETMBEGA1UECxMKcHJvZHVjdGlvbjEMMAoGA1UE
+						AxMDY3NvMSYwJAYJKoZIhvcNAQkBFhdzdXBwb3J0QGNzb3Jlc2VhcmNoLmNvbTAe
+						Fw0wODA3MjgxODQ3MjdaFw0xODA3MjYxODQ3MjdaMIGUMQswCQYDVQQGEwJVUzEO
+						MAwGA1UECBMFVGV4YXMxDzANBgNVBAcTBkF1c3RpbjEZMBcGA1UEChMQQ1NPIFJl
+						c2VhcmNoIEluYzETMBEGA1UECxMKcHJvZHVjdGlvbjEMMAoGA1UEAxMDY3NvMSYw
+						JAYJKoZIhvcNAQkBFhdzdXBwb3J0QGNzb3Jlc2VhcmNoLmNvbTCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAJYDztkLmhjwhZrFuCNLMi5bDoiLm/mdSEih
+						yeEl5pTMdaw2ZF4I19+DtKxK7PcWSSXWKJfVfD93kys8eZ+xx9fBNiFVqZdkk7Z9
+						jUAhG5NB/kvLVNrEP2i4ZryXaLpbes/9HSKP2ZE6Iozdz45Ie7tbig6lN3itqDiE
+						/AXDTnpBEB2WXaxlIomCzPbWm3bjFEbTOpzaAeyQBv9paxftSvrOREI18Ubv8OYj
+						gWszVWTQLuNg7FCivZTk7REerI5hXNVsB0KY2FeIEUqqajxIxlj+vCZTTOhjeHLA
+						QKIMkVFAmWEn6zLQDGI8yV4ooab6P1eZNs/vSmY/Foc6Z4fBrkcCAwEAAaOB/DCB
+						+TAdBgNVHQ4EFgQUok5bi4sjD0Ud4emkOVF1Or5db/IwgckGA1UdIwSBwTCBvoAU
+						ok5bi4sjD0Ud4emkOVF1Or5db/KhgZqkgZcwgZQxCzAJBgNVBAYTAlVTMQ4wDAYD
+						VQQIEwVUZXhhczEPMA0GA1UEBxMGQXVzdGluMRkwFwYDVQQKExBDU08gUmVzZWFy
+						Y2ggSW5jMRMwEQYDVQQLEwpwcm9kdWN0aW9uMQwwCgYDVQQDEwNjc28xJjAkBgkq
+						hkiG9w0BCQEWF3N1cHBvcnRAY3NvcmVzZWFyY2guY29tggkAsDLmZ6NbRfAwDAYD
+						VR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOCAQEAOUVYBoiWvLmhKqYmMXQAMjUx
+						OpJPCel/bjMfW4Wlp+2yOuQcuqc9ZkFUME6tjqOgSuQkkU6R88h9jeeZX+s5TAVF
+						dPImqHPM/rcLGnoe1Wa/6UR6Zwcp4rsFSDu0+7Jd3PKG3j6lKWezUXargrJZdG5u
+						tXuwJf+f6QUiWWNiQI40kF7FhqlCWJ0CqXvNBGRXmdVwLQrADUUyNs4N3DM3hVDS
+						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>
diff --git a/swamid-interfederations-2.0/www.napierstudents.com-shibboleth.xml b/swamid-interfederations-2.0/www.napierstudents.com-shibboleth.xml
new file mode 100644
index 00000000..d9bbb11f
--- /dev/null
+++ b/swamid-interfederations-2.0/www.napierstudents.com-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.nejm.org-shibboleth.xml b/swamid-interfederations-2.0/www.nejm.org-shibboleth.xml
new file mode 100644
index 00000000..ec87dae5
--- /dev/null
+++ b/swamid-interfederations-2.0/www.nejm.org-shibboleth.xml
@@ -0,0 +1,51 @@
+<?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>
+						MIIDDDCCAfSgAwIBAgIJAIBpEkq6FhlUMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+						BAMTDHd3dy5uZWptLm9yZzAeFw0xMzA3MTAyMTA3MDJaFw0yMzA3MDgyMTA3MDJa
+						MBcxFTATBgNVBAMTDHd3dy5uZWptLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBANK1qbc1ivsRyR7Lch3ED1VC9eB76M93xlw4cNo/dvOZIxKDXj08
+						iKA0m6Ku3/iyiXHvCpVlwTgI4Ip/Xt6lFFWBpY4+jd+ava+E9+ANCWOQJf9G62qo
+						bvaz8PQRxXKEck+rWLDnWja5GgXHzTiPZpdNeiN3HxbDXbqzZyiOBESwEeMXuMuB
+						COs+iDVh4BhrhL0hD9976og0YyFlpZNnN0wkHJuhCVdWgwscK4sheTM/Hl4FCxb6
+						HogoNWsnURLZCIvd9QfHJ+K33LN3zUbjJFBcN4LjhE9mt13gwliiXDwNl0RdYxvB
+						epOKacojBJlV2kJdhe3G9olGYgX1GDTEA3UCAwEAAaNbMFkwOAYDVR0RBDEwL4IM
+						d3d3Lm5lam0ub3Jnhh9odHRwczovL3d3dy5uZWptLm9yZy9zaGliYm9sZXRoMB0G
+						A1UdDgQWBBTWPgvv+5CtphKIteQIzAPkFdbZ8jANBgkqhkiG9w0BAQUFAAOCAQEA
+						A5NpngLVi9/1vHPrbLVhXwkrVlBfGvirUNgLlfp29pO2EXHhPcpyMZXRM9hkttGu
+						lEJetzEXKVMaNyhoqnvnQ1JqCt4rFp/PV+MQO1ZPxJ4nPcXU3kdAJG3VuSu7jRRZ
+						iyS7KYql93SEwfOyIuPB/lPnOQ3uHV94bRGgfYnTq8S1NAdEXp/rMWM4yWPF+8nq
+						kBkgu74s1BfumuoQbNNatX/yAxy8kSiPLOWQpotcA1JR6qQ02PlphNp33+T6asTn
+						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:1.0:profiles:artifact-01" Location="https://www.nejm.org/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nejm.org/action/samlACS" 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.nordbiomed.net-saml-sp.xml b/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
index dc9bf88c..25ec62a5 100644
--- a/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
+++ b/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.nordbiomed.net/saml/sp">
+<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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Nordbiomed.net Moodle</mdui:DisplayName>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Nordbiomed.net Moodle</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Nordbiomed.net Moodle</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Biomedicine online courses for Nordbiomed students in Moodle</mdui:Description>
+        <mdui:DisplayName xml:lang="fi">Nordbiomed.net Moodle</mdui:DisplayName>
         <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:Description xml:lang="sv">Moodle webkurser om biomedicin för studenter på Nordbiomed programmet.</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>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIRANbySfQqDQ9zZ4V2aSBw+r4wDQYJKoZIhvcNAQEFBQAw
 QTELMAkGA1UEBhMCRlIxEjAQBgNVBAoTCUdBTkRJIFNBUzEeMBwGA1UEAxMVR2Fu
@@ -61,10 +62,10 @@ CAKgw6g9qQ==</ds:X509Certificate>
       <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 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: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.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+      <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>
diff --git a/swamid-interfederations-2.0/www.nrcresearchpress.com-shibboleth.xml b/swamid-interfederations-2.0/www.nrcresearchpress.com-shibboleth.xml
new file mode 100644
index 00000000..09e89064
--- /dev/null
+++ b/swamid-interfederations-2.0/www.nrcresearchpress.com-shibboleth.xml
@@ -0,0 +1,52 @@
+<?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>
+						MIIDtTCCAp2gAwIBAgIJALKKItp/j602MA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEhMB8GA1UEAxMYd3d3Lm5yY3Jlc2VhcmNocHJlc3Mu
+						Y29tMB4XDTExMDExODIyMTkyOFoXDTIxMDExNTIyMTkyOFowgZkxCzAJBgNVBAYT
+						AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEd
+						MBsGA1UEChMUQXR5cG9uIFN5c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBT
+						eXN0ZW1zLCBJbmMuMSEwHwYDVQQDExh3d3cubnJjcmVzZWFyY2hwcmVzcy5jb20w
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcz5rmUAuG5ucWJq6TAKiy
+						jdkO5jrOKk+rUFbtvHqCdEy0ndFUraE+sQO4zuRabXKzI6p7sF090VqDi9NZ4Zq0
+						uK2m6Wuwkzr5DRstBamZXzUZdFZ/NOQxFIQbhx+ZNVx02IlK89CZmzRzaczqgwtd
+						j0IPZY2SpWeZuRfFZ0H6IBI/I5rL+HaokTdZaYgRUasqu7HFdKquN369iP7Qqe7l
+						Yhm9XtVnEMLsHuPy1gNkyOddLdHKt9oKzKkql7IkhcGbE/f4YrKIqxC5SvdSE9cg
+						ih+IO/OAyHn+cS0LqNCECRbdnViUgUaSr5/s9FXTTMsEMtJtgZQyEzGW9B9omLhJ
+						AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADcSQSrkKZG/QL6LSKSG8rKB0BxWNFvO
+						3mEBndEEsioTZzPGzSfuMcEDdICWyILaXN7HraUkTCvSD1N9n/AS8uu+jCoe+f8z
+						cV3f15LjxYyZI9ZmO9eixGA2huK2LsRzAj93TWYK7Q0CuZrTq/3J/vJ+xvM2habG
+						PToSEnpA/ALGVSXSxGpLJYn84qX9ub0yX1yYNmleylRkHqFwYHvdU5Hk7UZdrCKZ
+						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:1.0:profiles:artifact-01" Location="https://www.nrcresearchpress.com/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nrcresearchpress.com/action/samlACS" 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
new file mode 100644
index 00000000..258a418c
--- /dev/null
+++ b/swamid-interfederations-2.0/www.numeriquepremium.com-shibboleth.xml
@@ -0,0 +1,82 @@
+<?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>
+						MIIDpjCCAo6gAwIBAgIEVClg0jANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxIzAhBgNV
+						BAoTGlB1Ymxpc2hpbmcgVGVjaG5vbG9neSBQbGMuMRkwFwYDVQQLExBTY2hvbGFy
+						bHkgT25saW5lMR4wHAYDVQQDExVQdWJsaXNoaW5nIFRlY2hub2xvZ3kwHhcNMTQw
+						OTI5MTMzODI2WhcNMTkwOTI4MTMzODI2WjCBlDELMAkGA1UEBhMCR0IxFDASBgNV
+						BAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxIzAhBgNVBAoTGlB1Ymxp
+						c2hpbmcgVGVjaG5vbG9neSBQbGMuMRkwFwYDVQQLExBTY2hvbGFybHkgT25saW5l
+						MR4wHAYDVQQDExVQdWJsaXNoaW5nIFRlY2hub2xvZ3kwggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCNSLZQXjnJCmfO04AwRYEK/6ylqGB33Pdl2S1j5JgC
+						KNxcRWLVBts0i9L1Csmpk44Sx+gVbRLnMjoZxwT7XezB3MvAH390sdOpJEKhM6b7
+						JOEl+iub4G82jwGmoQVMRwUQ9dMcdzJY6LVuUri5UmldDRpd60whIip7GJhCdIwz
+						Akh6RJyYDua9R3GHdxYWMooekmgj75CUL6PtUN6jTdnlct48zPVzA1KNGxKaICs0
+						yy4cmTBbPVB9w5lM4pgCS8uHyTHsQZ1n3vnn0EuEf0rbHKPtc/TDhTV9GbNtJJws
+						pkaniaHmlMg1f7cfA37PDJOK7OzTn0FcgfXSO4DCfe8fAgMBAAEwDQYJKoZIhvcN
+						AQEFBQADggEBAGsjQgkLeTxZ/GPFKgGso5vqtENIZmyAAHt9KbRw3Fku1Z/xQ6US
+						8EKYGN3fkPZ9E4UUGZCe2O7Lo6N5Pt7Kt6TbPhae4vkmE/Nm2i5YvjWn+fgO9/NF
+						NSI0XmDOvGZokbGUDwZrrhibzHxGIcyaA1oodF37/oz3r10rZkLauW//CmOf6OUC
+						rGnKBPoQG2kIyG8rWoKDzWtcRcdqDea9kdZwmDftizoLtJtKIyW8FavtknHpRTSI
+						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>
+						MIIDpjCCAo6gAwIBAgIEVClg0jANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxIzAhBgNV
+						BAoTGlB1Ymxpc2hpbmcgVGVjaG5vbG9neSBQbGMuMRkwFwYDVQQLExBTY2hvbGFy
+						bHkgT25saW5lMR4wHAYDVQQDExVQdWJsaXNoaW5nIFRlY2hub2xvZ3kwHhcNMTQw
+						OTI5MTMzODI2WhcNMTkwOTI4MTMzODI2WjCBlDELMAkGA1UEBhMCR0IxFDASBgNV
+						BAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxIzAhBgNVBAoTGlB1Ymxp
+						c2hpbmcgVGVjaG5vbG9neSBQbGMuMRkwFwYDVQQLExBTY2hvbGFybHkgT25saW5l
+						MR4wHAYDVQQDExVQdWJsaXNoaW5nIFRlY2hub2xvZ3kwggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQCNSLZQXjnJCmfO04AwRYEK/6ylqGB33Pdl2S1j5JgC
+						KNxcRWLVBts0i9L1Csmpk44Sx+gVbRLnMjoZxwT7XezB3MvAH390sdOpJEKhM6b7
+						JOEl+iub4G82jwGmoQVMRwUQ9dMcdzJY6LVuUri5UmldDRpd60whIip7GJhCdIwz
+						Akh6RJyYDua9R3GHdxYWMooekmgj75CUL6PtUN6jTdnlct48zPVzA1KNGxKaICs0
+						yy4cmTBbPVB9w5lM4pgCS8uHyTHsQZ1n3vnn0EuEf0rbHKPtc/TDhTV9GbNtJJws
+						pkaniaHmlMg1f7cfA37PDJOK7OzTn0FcgfXSO4DCfe8fAgMBAAEwDQYJKoZIhvcN
+						AQEFBQADggEBAGsjQgkLeTxZ/GPFKgGso5vqtENIZmyAAHt9KbRw3Fku1Z/xQ6US
+						8EKYGN3fkPZ9E4UUGZCe2O7Lo6N5Pt7Kt6TbPhae4vkmE/Nm2i5YvjWn+fgO9/NF
+						NSI0XmDOvGZokbGUDwZrrhibzHxGIcyaA1oodF37/oz3r10rZkLauW//CmOf6OUC
+						rGnKBPoQG2kIyG8rWoKDzWtcRcdqDea9kdZwmDftizoLtJtKIyW8FavtknHpRTSI
+						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">Publishing Technology 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>Hatim</md:GivenName>
+    <md:SurName>Ghadiyali</md:SurName>
+    <md:EmailAddress>mailto:openathens@publishingtechnology.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
new file mode 100644
index 00000000..69d33986
--- /dev/null
+++ b/swamid-interfederations-2.0/www.nusu.co.uk-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
diff --git a/swamid-interfederations-2.0/www.oecd-ilibrary.org-shibboleth.xml b/swamid-interfederations-2.0/www.oecd-ilibrary.org-shibboleth.xml
new file mode 100644
index 00000000..637d0702
--- /dev/null
+++ b/swamid-interfederations-2.0/www.oecd-ilibrary.org-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+						MIIDnDCCAoSgAwIBAgIEU6fsvDANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
+						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
+						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTE0MDYyMzA5
+						MDA0NFoXDTI0MDYyMDA5MDA0NFowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
+						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
+						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
+						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAMJbxnl5Rx6RuPMTlI3nGIdJXPsJO/Do8vlgH8h0bkfohj84PGLpAMdm
+						jWL0uY6u59j3Akt7YM6A8eDAzeVNtODqi56RgDWyp1MW/yq3rr6IZA9JEexQnDdS
+						Vddr2hNf0JLKrFnMhNzkEPvj+4Qs/Q3+33npU3wdDD9CU+BTTgv1atl8grrVyglh
+						/oUVSkydsMmel9wmm+kJRdwomiZ1dsh72IJQl6CcE1vG5g7sAcDJuErPZ5IRgr5Q
+						qh3nFleyzguMB/lB/6Mr46CgRTCNvZC9zQZR4sEYzZ4fnKEtbKtS0kta2yb5RvlD
+						3PugoRAuv/P7fjMMYMVm3mL/zQpm3RECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						Mr7kjkL0xx8oLvFqarA/43YMGosHo5ODq6t903VeJ6j3g/b3c27j+Lzn4VfqMCPS
+						cWD5m3IefUtidZwYyoWhwFO6dQUHs1gNP9YfBqSPrZ0txFfVapPigo3CQrDJSu3E
+						g5c8Cts7NFCakPgKSM+zl8KsN3v74igfyJRPQaLGx2DXJzUanvKBnCHkpj7//JIl
+						kAIKM8SXkjCICZtzbbGdtAOz4vMaawT87/CKZF2gwtI0YjbjlsMaxTDh/H3Qdyp6
+						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">Publishing Technology 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@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Babu</md:GivenName>
+    <md:SurName>Panneerselvam</md:SurName>
+    <md:EmailAddress>mailto:babu.panneerselvam@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Talvinder</md:GivenName>
+    <md:SurName>Matharu</md:SurName>
+    <md:EmailAddress>mailto:Talvinder.matharu@publishingtechnology.com</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
new file mode 100644
index 00000000..e62333e1
--- /dev/null
+++ b/swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIEgzCCA2ugAwIBAgIQAcOBBEDrU0NaTC9JniJAAjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDYyMzAwMDAwMFoXDTE3MDYyMjIzNTk1OVowSTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSQwIgYDVQQDExt3d3cub3BlbmFj
+Y2Vzc3JlcG9zaXRvcnkuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQC5FlOs0obBs1hyIZkL9ZIySN0OIOIRr0FMaxM2X0ROLUruSg7FvLuMtBf6a5EC
+ELEpkasqJU/T7MoHhOTG1S1pAcx9aQ1AfKB1fJPu7//s6nLMvDV8GzrV9dhEl7MW
+hqHobSjBQsq2cfdic9YvFMW2+dY/fvS0Cqlk0Ga9edM7HFDJ9gVKl6j6G4HbMXXA
+ln/0HplJCG1PyZ50URd3giVuM38SSkQ2V9WtsL4cjENJ7XECFXh1uikqPTsnRHD+
+7dJPw8c+j3/MKqk1d/ZMZ0CnuWsNWD6g+a2TpADUssioabQ9FxyJk4UNdGrqdVIc
+Hpj1Ah+bwMvR1rBY08E+Gi2lAgMBAAGjggF4MIIBdDAfBgNVHSMEGDAWgBQMvZNo
+DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUjtXXHKbMBYRtpsvnZvTF0zJ+oaQw
+DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
+MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCYGA1UdEQQfMB2CG3d3dy5vcGVu
+YWNjZXNzcmVwb3NpdG9yeS5pdDANBgkqhkiG9w0BAQUFAAOCAQEAPJVl6xygzniD
+Zd+1rE7mCqLa4b/by2up2mg4CGED05mIX+XD3XFlVnHY2S4KM/E8Ac0VkiLZmDdG
+dm0Z2MDBSbDZKFfdNvC3/8kFYMtXhhk8Owrg+l+MY1QxjzlC0BD9eisIL7uSf7p0
+W580j+lzHziV0KDB//HekpLtRgJHoYOxMxrvhIYexiptNuhRswO6Og8UZ7CsrA5q
+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>
diff --git a/swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml b/swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml
new file mode 100644
index 00000000..fdca00e9
--- /dev/null
+++ b/swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+    <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>
+      <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>
+						MIIFzjCCA7YCCQCicdy6qcU4XDANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
+						VVMxCzAJBgNVBAgMAklMMRAwDgYDVQQHDAdDaGljYWdvMSAwHgYDVQQKDBdPcGVu
+						IFNjaWVuY2UgRGF0YSBDbG91ZDEqMCgGA1UECwwhTGFib3JhdG9yeSBmb3IgQWR2
+						YW5jZWQgQ29tcHV0aW5nMSUwIwYDVQQDDBxjYS5vcGVuc2NpZW5jZWRhdGFjbG91
+						ZC5vcmcgMB4XDTE0MDQxMDE5MTkzNFoXDTE3MDEwNDE5MTkzNFowga8xCzAJBgNV
+						BAYTAlVTMQswCQYDVQQIDAJJTDEQMA4GA1UEBwwHQ2hpY2FnbzEdMBsGA1UECgwU
+						T3BlblNjaWVuY2VEYXRhQ2xvdWQxDDAKBgNVBAsMA0xBQzElMCMGA1UEAwwcd3d3
+						Lm9wZW5zY2llbmNlZGF0YWNsb3VkLm9yZzEtMCsGCSqGSIb3DQEJARYeYWRtaW5A
+						b3BlbnNjaWVuY2VkYXRhY2xvdWQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+						MIICCgKCAgEAodVxMyIqjyYoqmT2ZknJSL8/DejA1HRYGZQGIwCh10mrE+s6Vf5x
+						3ydeoR7sjEnMHjxa3UFXeD8K/LRSKGZkIJJhXUiwNCBAWgg4T27WtiCvdLYYyrN4
+						hGmwvi9V2/ddhcRP92B8MNrK0RhpLhWWpZ7t5uakp0EZi5YUqvIBLdB9Fefg1zGw
+						FgcQvhQPMXxeCF6cU+VcKA+DWpQ8hO3TQHxdjtJAiZhb7WfufHMJp7Xtx3tYS+so
+						UFk0zSau/NBabk0bWmJ1D6ugjLC7HvjrNN2d6vU8I5Fob3fkNa1O3HruTavm1FpV
+						ktrQgdz8xK+HrkZmR+G3bxHXpo/jqoiuzb7Xq1z7Xiv/EXcMK78ym0+lLPYeCAXL
+						CKDpnZebgGkljd4tSyh1yRhCaQ4oa4S9T8hL0MVb3J+9Ofk8KfC0QJ0JXoNUZ+3m
+						ZbnI04ZopEWEB9XYFPOBSX9XSVWdOE1ABeeMuc8X/pIeXlVlNll02v10Yp8iA+Y8
+						YHaOe8aabFUJ40VaI32hDEBz9foCdwL7Xz60udKFRp1fVRiyCmFAOBkimwOAC8CL
+						0yCE8ruURYCLkC3jQkQDORK1syRB1zh84jQPpon17R5CJ5l0YsvV5L6RSK/Q61m5
+						omTO0pLrXkJj+w9+tppSEOHKKjRTpYO/KHqK9rW/Ew3OLSDGq49uIX0CAwEAATAN
+						BgkqhkiG9w0BAQUFAAOCAgEAtw/aDtRhxKp826bD1q3vGO3wQOcXCDzZu2ijHQAE
+						LYmLVGWinizo2sJEGTs0INwJ01M0Y/OQrnkNf9RQs+ouwRFU3VL5YHL9wVselo62
+						wLKlqI9k2QEFREbUWSGPg/6ktp+fQz/XY4FdPx+wJ0zWPOardNMs77jXWwlnkVfM
+						LQS3CTuYxlPITTF0eceARwptCscnYo8g7+wVXPa2f1pnqGh1DPjUchVCaHtW5Pz0
+						ZOyQUYYQu+WQ7/7MIlEqCherfDcXLJrF/Wv80Fe/Zo3dSNOc2FIQiKrrwsA4bQrI
+						BWVtMBT9IHIHaD7rsyps9IPJIQhUHILuGgRvWog/NBOFMuL9owCQmYIQG6vlSrLM
+						oH3AyJDUMwR5/RDfFjvqmFuyuoLsMjr7Fz+1XDuVToZ5uL+S/qK+zXBDF4w1Knt6
+						4Ytqy45dZIYVIJ8nP5GD3WljcPOu5bAHQIXH+zysDG1lKW1F0KnPOI1lh30uTdT9
+						NJJfXoMBlmLtdf/2ald3J32/SlaNax9POIZ5yQanYeKkOYxkiMUegYBdBLOIA+NP
+						LZFDCh2ujwE/5X6w7SExIhPDYLcYa6AzAY2OfFxuIhmGvA6upfaKXNtxZnMCaKMA
+						3KLFMdyPSUD5vEEOjLDTxHnldmawa+nG4PcJFLyC57kZz4znZwZXGB3NryX7v5JE
+						orI=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..32a0f98d
--- /dev/null
+++ b/swamid-interfederations-2.0/www.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ox.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:24: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">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC6zCCAdOgAwIBAgIJAPx/LwmeUGTyMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+						BAMTDHd3dy5veC5hYy51azAeFw0xNDA3MjkwODExNTNaFw0yNDA3MjYwODExNTNa
+						MBcxFTATBgNVBAMTDHd3dy5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAOc2rOr/XaHUNhfWxfolloVnnDDY3BvIP/AWugahGYXEelclRaNX
+						95rh21w+Pw6qcMwkaCoc8LBNE2O7ReUp2zUWsB1t87w8v8XDUPEpPAQ9XVTHFGAt
+						4A93oYO8UuZPC6CoPu2guuXJT+gS5jiswk/R3729CUlphY/Ov9+QO1jfuoNu8mGY
+						FllFALRsDKc8PH83UuEhF4R9rtz1LYoD/vs6NjR+n1dovkRMqxRZBxuEgcEX1tft
+						WciPXI4Nk4DbbgOPgmcl0dPUK+IMTLLQF/So/qO02cxDZKp9DA+rws79J0qPOOUQ
+						AaYqFjB8qRjKfs9xUrCviXNHzgWmLKbEUkUCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+						d3d3Lm94LmFjLnVrMB0GA1UdDgQWBBRdot3++gHpLRLS+MGj/T9eobiBrjANBgkq
+						hkiG9w0BAQUFAAOCAQEALUNCD99LKk+88GfsmMNIczRzOEQynKD1i5X6247/5zs+
+						w81ezac3VrDk09O9PFhkeh4D32KupXWQ4+bY7ijlBj/BVDhrrgKZZeD5mu+J8Ru+
+						Ypz4r7bV+t8dUukfNy6xLMqePEmrmhLgWql0EtOpRrsZC/GNdpkl+kJG3EoPt8cZ
+						umV/wHnzjahIYYKQ2YyrwU6tT/jMDciNSZOEJOoVkujmhu3yK0eIwfAJQzJ90fGg
+						t/KiRYU/XnfJ+HdgNOth5XvmNSG3gmzVtGVLbPbfp7i4sCHMOD5FzSziYwp6m6Pn
+						Q9nQhuIfcxbBFG6jt794VKX50sAROXsVPFcYfT3gTg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.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://www.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.oxfordtoday.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.oxfordtoday.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.oxfordtoday.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oxfordtoday.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
+  </md:SPSSODescriptor>
+  <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>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</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
new file mode 100644
index 00000000..c940e60b
--- /dev/null
+++ b/swamid-interfederations-2.0/www.pathcal.ac.uk-shibboleth.xml
@@ -0,0 +1,98 @@
+<?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>
+      <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>
+						MIIDIDCCAgigAwIBAgIJAP0iPdXcGeGuMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+						BAMTEXd3dy5wYXRoY2FsLmFjLnVrMB4XDTExMDMzMDE1MTIzNVoXDTIxMDMyNzE1
+						MTIzNVowHDEaMBgGA1UEAxMRd3d3LnBhdGhjYWwuYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCl7DYwQXP82QOrgN1cMH+8KqLz2e9wgOM66+0X
+						Nds/VycQAEP29h1DiYQbl/154Vqvf2E9PSlCz1gNLJjdEvnCrbTyECPNt9BG2H8n
+						sDnGSzYpmAGiq42QiuPxa2LGdS9HpPDipxJCEs35HmeOeqFOIQtoUpmtAA9XRnth
+						WG4C1JF8dZNAWpjpFzNCvLZHDUiZzJPgQjdQZ76UBEMoXYX7jDM4cAXHqNuRvFo6
+						icFowW5TAtcx1WXL0HwRHxHRCRfWKDANn7HeN8H9Jk5M1lkRhN0DOu1RJN+8RBaI
+						NJ5WnM3lY1oNZos2ui78+mXX5kdHStG9E+vfwUxBh23tmOfJAgMBAAGjZTBjMEIG
+						A1UdEQQ7MDmCEXd3dy5wYXRoY2FsLmFjLnVrhiRodHRwczovL3d3dy5wYXRoY2Fs
+						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFBQnhIEnumryfjPopVA9OUDmxyks
+						MA0GCSqGSIb3DQEBBQUAA4IBAQAj+C0DVNjbwW7LxXwNAAXbYLDNQDm+wNwLvOV2
+						k01FyU3k0M8F4F86i8Zh/fj1xZ3pZfV6uZcvB9CtIMqLG5aDKRBWqRqWGG8OvhAn
+						J0JBLmbhcz40RbfmeZUoq0+Zy8gGxARR/kjaZ16U4t5rgG7fSJlBiSsdu4FPjGNx
+						3GzdsKqAZRjDhs7Ar7OltkqGz/ko4V/ok+WP7aTdzXWMe++ZSyyNxTNVVdSO+L3j
+						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>
diff --git a/swamid-interfederations-2.0/www.pbyp.co.uk-sp-shibboleth.xml b/swamid-interfederations-2.0/www.pbyp.co.uk-sp-shibboleth.xml
new file mode 100644
index 00000000..5c272c3c
--- /dev/null
+++ b/swamid-interfederations-2.0/www.pbyp.co.uk-sp-shibboleth.xml
@@ -0,0 +1,80 @@
+<?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.pbyp.co.uk/sp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-13T09:49:22Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://pbyp.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pbyp.co.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Personalisation by Pieces (PbyP)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Personalisation by Pieces (PbyP) is an approach
+					to teaching and learning developed by Cambridge Education in 2006. It is a
+					framework to support personalised learning based on core skills and competencies.</mdui:Description>
+        <mdui:Logo height="100" width="252">https://services.camb-ed.com/images/ce-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>
+						MIIDFTCCAf2gAwIBAgIJAJX1RdJ8skE0MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGm50ZGQzMDEzLXZtMDEuY2FtYmJlLmxvY2FsMB4XDTEyMDYxMzA1NDM0NloX
+						DTIyMDYxMTA1NDM0NlowJTEjMCEGA1UEAxMabnRkZDMwMTMtdm0wMS5jYW1iYmUu
+						bG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeQA65YfW/dJ4n
+						CcZdPN2415+xiP5HNH/iRXhfBTEr+QN5QP3z1ylRidTHWNz5S2e1HfTsbdPLJygj
+						W7NxXLu6YFi79TopSUVCOpBEqOcXldR5YPtTRJtNProb5vUIP1iix1d9KoBPufsZ
+						Y5kk9156EwA47C/HMFdV8y71yKbhojbSlKTvxdkaYkrB0YFbo125SMeJP/JnVW32
+						WJ4+qVGQzzTGAV8/KTNOGovGj1uz8fJVAIBoIpJQAAuWq8Aoo8F135iHU4uiQROE
+						3jGs/iW0f2cdENQn5l0bCjnZmvnx5o/oIdvU0YjHaAMsjs8OUfg64o/kOQ4vq4y4
+						iOUiQrTHAgMBAAGjSDBGMCUGA1UdEQQeMByCGm50ZGQzMDEzLXZtMDEuY2FtYmJl
+						LmxvY2FsMB0GA1UdDgQWBBR7Na1DFuvXRKD/IWAWCFpXlM6NCTANBgkqhkiG9w0B
+						AQUFAAOCAQEABwfDIGzHs+Np3N2BQUhvDMVz6aP4RS3Nqv9DsnyxBv3RkQJ6q+oB
+						eESW5oQCgGRK0jlUSjFuc5liZA7KM6NcT32HuJOcFpTcKIffA3uKVNK5FScbr89O
+						8LpN3xxBeVbVlhHmj2LQ1hmB4DLikk/19F3J9amTthw6BIztTo3P5aT988eC8QOo
+						i41vNMju3zx6tkO49RXCDLDcGd4hxIXrE/zeJzGSUdgOSZ3yahNzQyjwE3y1zFId
+						C88bOQzKf/M2cgegVSbjJBhqTOIWYJsb62Jd3CTHaj7nkvZfv82B3UTxO9o2bvKD
+						u2nA/TyhOJ/2oTDY+YdGCx3lJ8qykSVXow==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pbyp.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pbyp.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pbyp.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pbyp.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pbyp.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pbyp.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pbyp.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pbyp.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pbyp.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pbyp.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pbyp.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cambridge Education Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cambridge Education Limited Personalisation by Pieces</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.camb-ed.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Bell</md:SurName>
+    <md:EmailAddress>mailto:simon.bell@camb-ed.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Zishan</md:GivenName>
+    <md:SurName>Sheikh</md:SurName>
+    <md:EmailAddress>mailto:Zishan.sheikh@camb-ed.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Bell</md:SurName>
+    <md:EmailAddress>mailto:simon.bell@camb-ed.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Zishan</md:GivenName>
+    <md:SurName>Sheikh</md:SurName>
+    <md:EmailAddress>mailto:Zishan.sheikh@camb-ed.com</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
new file mode 100644
index 00000000..8a33ae0e
--- /dev/null
+++ b/swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.pi-navigator.com/shibboleth/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:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIE4jCCA8qgAwIBAgIJAPEDnthEYHnfMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYD
+						VQQGEwJHQjEQMA4GA1UECBMHRW5nbGFuZDEPMA0GA1UEBxMGTG9uZG9uMSAwHgYD
+						VQQKExdQZXJmZWN0IEluZm9ybWF0aW9uIEx0ZDELMAkGA1UECxMCSVQxHTAbBgNV
+						BAMTFHd3dy5waS1uYXZpZ2F0b3IuY29tMSYwJAYJKoZIhvcNAQkBFhdwYXVsbWNs
+						QHBlcmZlY3RpbmZvLmNvbTAeFw0xMDA5MTMxNDQzMjJaFw0yMDA5MTIxNDQzMjJa
+						MIGmMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHRW5nbGFuZDEPMA0GA1UEBxMGTG9u
+						ZG9uMSAwHgYDVQQKExdQZXJmZWN0IEluZm9ybWF0aW9uIEx0ZDELMAkGA1UECxMC
+						SVQxHTAbBgNVBAMTFHd3dy5waS1uYXZpZ2F0b3IuY29tMSYwJAYJKoZIhvcNAQkB
+						FhdwYXVsbWNsQHBlcmZlY3RpbmZvLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBANKeCAsU0e0XEDmN1ohQGYixwausIq03G4+/xH2si8JMMo9XtmXC
+						eGiXNWvw+HNPLN2ChXPtVUUz5Yspu9LXw/vzxk2AcM7ELRVf4g47FnmG/I+lT6H0
+						pw1hFeLcdCP5tIorGDogRkwOKk2q+zDQDbjxnNKM5jyRg2P1qLQBwMDHkUpDZwuH
+						3/Hf3PzB8UXjtJuuWRU3Cg8yDAHfGxR+fvcfvUC4K85lrfG69FAVj6WwDMdDF5Xc
+						KgoKGDyQHtcTUNs52YmKPfWtyqTTvwHhyNxPDhuaskWtC80RUAKsAo7p0uKzzySz
+						TxSZpvSVGMnxY7eJvyNKxkCg8NGOTI95lAECAwEAAaOCAQ8wggELMB0GA1UdDgQW
+						BBQ3nYviL+W5+KE/F5aNGat+PN6AGTCB2wYDVR0jBIHTMIHQgBQ3nYviL+W5+KE/
+						F5aNGat+PN6AGaGBrKSBqTCBpjELMAkGA1UEBhMCR0IxEDAOBgNVBAgTB0VuZ2xh
+						bmQxDzANBgNVBAcTBkxvbmRvbjEgMB4GA1UEChMXUGVyZmVjdCBJbmZvcm1hdGlv
+						biBMdGQxCzAJBgNVBAsTAklUMR0wGwYDVQQDExR3d3cucGktbmF2aWdhdG9yLmNv
+						bTEmMCQGCSqGSIb3DQEJARYXcGF1bG1jbEBwZXJmZWN0aW5mby5jb22CCQDxA57Y
+						RGB53zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBh2gbU/cgGYnuW
+						rkOCesoCpB/1wowMYvVb1iQJeSGtfTe96c/M2i3HdgLsj88zhCOANY7D4/V24Nco
+						kPKI8xyW90XtJZ4ZUYC9wgVwYoUOCuxUMS3/mQjJ6+DBXQG595gsn4NDseP/kuXM
+						deuHXBqxMIZ78aEPSX9DPqTEx803nQmiI78Qci9xwnBRKnmP2+PmK4xLUm9ogeCs
+						CXRgygMPP9WmpS8vSiUG04Dycu+c7Zh2EBzH7LHey9reE2T9pWxJW4k8iw5P0r+y
+						U4KKQy2lPVLHTtmiDdo3PVX4jrKA0QN6KMrAHNq1SwLitONOgjY/cxUlkLXMcBxC
+						xToFAE6F
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.pi-navigator.com/shibboleth/AuthReceiver.aspx" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.pi-navigator.com/shibboleth/AuthReceiver.aspx" index="2"/>
+  </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
new file mode 100644
index 00000000..00d83fc9
--- /dev/null
+++ b/swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEHDCCAwSgAwIBAgIJAJuSt635KQAmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+						VQQGEwJHQjEYMBYGA1UECAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25k
+						b24xIjAgBgNVBAoMGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsM
+						AklUMSMwIQYDVQQDDBp3d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTAeFw0xMDEy
+						MTAwNjIyMzJaFw0yMDEyMDcwNjIyMzJaMIGOMQswCQYDVQQGEwJHQjEYMBYGA1UE
+						CAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xIjAgBgNVBAoMGUV1
+						cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsMAklUMSMwIQYDVQQDDBp3
+						d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBANY09Jl65SJ1NUm1lrht4U2e4NAB0nnoM9YrTlUCwfqljmSRbbNc
+						YVpCzfjop/Z956K2ePUnrVCY6vGXBlAxUBf8ugMek1JfK1lYH+USogWbQ38iNH/W
+						BmN7MI+ZH76nRZ3bcWnSk16suus5mmNd5FZVbdpUcW3Vhi7ZHmAHtwQySJLvxAMs
+						uYGAqVcxPGBZjrG1C6nvPR22I51Tli7nh8uFziCaWmUAjLnyU+k/1GXHsWip9YPu
+						zgXe699GsPcb8GfPLCKfOnL/qNa1dU7vVD6MRz/egKri1djGgWQPYXAIs/F5cfl3
+						t2UC0+1VmSricGkN88tz+bQAA0PpGeLmVDECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJDmPtO/5kuHAA1GkiygcECQIgM+MB8GA1UdIwQYMBaAFJDmPtO/5kuH
+						AA1GkiygcECQIgM+MA0GCSqGSIb3DQEBBQUAA4IBAQCwDNd27UiliU2+jRit019f
+						eAz1mpoC4Bxq11rvUyuqWmIdEZC60riLxsTmukGWRI0TnGTPt2oVKr2y8luT7RZF
+						CItFWKcxS6yN4BHSMp3bj6LAgk/KrwpGWu3pKG4rVtfDjrRwjX54f/hF+DPViSbD
+						UcO/MiPwHo9+Ooj8OrLrwpsotCqwCaEnLrjpR4Vw5Kc510tNuca2MVD7Ppkh1+vx
+						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>
+						MIIEHDCCAwSgAwIBAgIJAJuSt635KQAmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+						VQQGEwJHQjEYMBYGA1UECAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25k
+						b24xIjAgBgNVBAoMGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsM
+						AklUMSMwIQYDVQQDDBp3d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTAeFw0xMDEy
+						MTAwNjIyMzJaFw0yMDEyMDcwNjIyMzJaMIGOMQswCQYDVQQGEwJHQjEYMBYGA1UE
+						CAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xIjAgBgNVBAoMGUV1
+						cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsMAklUMSMwIQYDVQQDDBp3
+						d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBANY09Jl65SJ1NUm1lrht4U2e4NAB0nnoM9YrTlUCwfqljmSRbbNc
+						YVpCzfjop/Z956K2ePUnrVCY6vGXBlAxUBf8ugMek1JfK1lYH+USogWbQ38iNH/W
+						BmN7MI+ZH76nRZ3bcWnSk16suus5mmNd5FZVbdpUcW3Vhi7ZHmAHtwQySJLvxAMs
+						uYGAqVcxPGBZjrG1C6nvPR22I51Tli7nh8uFziCaWmUAjLnyU+k/1GXHsWip9YPu
+						zgXe699GsPcb8GfPLCKfOnL/qNa1dU7vVD6MRz/egKri1djGgWQPYXAIs/F5cfl3
+						t2UC0+1VmSricGkN88tz+bQAA0PpGeLmVDECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJDmPtO/5kuHAA1GkiygcECQIgM+MB8GA1UdIwQYMBaAFJDmPtO/5kuH
+						AA1GkiygcECQIgM+MA0GCSqGSIb3DQEBBQUAA4IBAQCwDNd27UiliU2+jRit019f
+						eAz1mpoC4Bxq11rvUyuqWmIdEZC60riLxsTmukGWRI0TnGTPt2oVKr2y8luT7RZF
+						CItFWKcxS6yN4BHSMp3bj6LAgk/KrwpGWu3pKG4rVtfDjrRwjX54f/hF+DPViSbD
+						UcO/MiPwHo9+Ooj8OrLrwpsotCqwCaEnLrjpR4Vw5Kc510tNuca2MVD7Ppkh1+vx
+						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: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
new file mode 100644
index 00000000..22844692
--- /dev/null
+++ b/swamid-interfederations-2.0/www.portal.ted.is.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,58 @@
+<?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>
+      <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>
+						MIIDADCCAeigAwIBAgIJAMszihLucz6hMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE3NhdC1lcC1rYjEuZWQuYWMudWswHhcNMTIwMzA1MTY1NjMyWhcNMjIwMzAz
+						MTY1NjMyWjAeMRwwGgYDVQQDExNzYXQtZXAta2IxLmVkLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzQOJ96cEk18YvMHn0Dg71j6V1PUt2gNr
+						932yD1ZmnFawDcB8bIvvVadllB0L0Ww2VnKh6x2dsn03366QGvT8jjEBqz/2Djni
+						6ym0g5H1Ql6ttdmihP7fV1TUE0gS3bMKw+s/axerzqYCD7Q6m1gY8p0eAPNN4oP+
+						T5u88GsOYmNa13w9NqXceCmGvA9SJFD/dQQWC9G5pQs3umqpKFjLvclZcKy9Gj2Q
+						b3LdGY/QMjSEJ24aH6xA8X6VKDc7ByzDk2IC2b4UEgVBBC3Y+50J4b3UdcS1ZU3P
+						b61GuEZ4FT5ber4zAfPjdPM1Q+6j+lbex76Lp03FU+RTJRUztSSoSwIDAQABo0Ew
+						PzAeBgNVHREEFzAVghNzYXQtZXAta2IxLmVkLmFjLnVrMB0GA1UdDgQWBBR/ayuV
+						LIFWwzUssHpUcvMr/ZS4QjANBgkqhkiG9w0BAQUFAAOCAQEAgdp151G2iRytTqdG
+						9BavSjFEcL23m8sW8RN/RvR/yZKuuLGVYIePgl2VMT9FrGy1GX4OxsApkhm2E5a6
+						jMelTpnm3qUwjryEWVVLSGMLP9mi49xzSOrU7pK7FseyxJP+loRJ5hO1laJIVS/u
+						WpNzjYn7QG+jHk5Eh3A3K6KlxZJmZTCBLXhOHzYXY8BBhEhtdDsFY+tPfiw+twVO
+						MonDchFnqWwDwsypFdPb5PcjtnLig1XXQCyVDkzGmqtNLMmu6d56Waox71G/KaMO
+						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>
diff --git a/swamid-interfederations-2.0/www.publicinformationonline.com-shibboleth.xml b/swamid-interfederations-2.0/www.publicinformationonline.com-shibboleth.xml
new file mode 100644
index 00000000..3282c1ac
--- /dev/null
+++ b/swamid-interfederations-2.0/www.publicinformationonline.com-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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>
+						MIIEbDCCA1SgAwIBAgIJAKyY0ChRtdbhMA0GCSqGSIb3DQEBBQUAMIG2MQswCQYD
+						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMRowGAYD
+						VQQKDBFEYW5keSBCb29rc2VsbGVyczEaMBgGA1UECwwRRGFuZHkgQm9va3NlbGxl
+						cnMxKDAmBgNVBAMMH3d3dy5wdWJsaWNpbmZvcm1hdGlvbm9ubGluZS5jb20xIjAg
+						BgkqhkiG9w0BCQEWE2JhcnJpZUBtb2RlemVyby5uZXQwHhcNMTEwNDE1MTEyNjUw
+						WhcNMzEwNDEwMTEyNjUwWjCBtjELMAkGA1UEBhMCR0IxEDAOBgNVBAgMB0VuZ2xh
+						bmQxDzANBgNVBAcMBkxvbmRvbjEaMBgGA1UECgwRRGFuZHkgQm9va3NlbGxlcnMx
+						GjAYBgNVBAsMEURhbmR5IEJvb2tzZWxsZXJzMSgwJgYDVQQDDB93d3cucHVibGlj
+						aW5mb3JtYXRpb25vbmxpbmUuY29tMSIwIAYJKoZIhvcNAQkBFhNiYXJyaWVAbW9k
+						ZXplcm8ubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3dZdcWh2
+						ftVD3ymAbP2E+EgXwTu1nmYBzby4KA73men52OPI29lOSxloCZN/JMfJaOe49YI9
+						QcdC484zzlCbOp8gkcdYTvjtatfA16j66IAiJHNW+BMPv9BAw9OO3iwZLlnGg5yt
+						X7x4U4CQbpxr2s1KYlCqhuy1VEDem2I8C/B+TjKlvpoWuNIGuJ7p7J2CL5CAm+ao
+						iQp/uQ7EYI2nLat0kq/6aXcOtVCZXFVBDYHEAytcUbMTkWKFKxohR6JtaD3p2RK2
+						8OysXG1DGvi0A71Nhr5Lhw9GWM2IbayLv9u2bGA6aYam7dEhNA05/g5TqptgS69T
+						0g9AwTg7Z2ku9QIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1P
+						cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUkgXL/CZUCTeG
+						Ea4CYrPGxPRUIfIwHwYDVR0jBBgwFoAUkgXL/CZUCTeGEa4CYrPGxPRUIfIwDQYJ
+						KoZIhvcNAQEFBQADggEBAEbijLDE6hiyM6FE3XsojBOHJsgfAdR91aWZwIAEHZy8
+						GZOU//mxolb+Jt9T35LQWMhGBqXEIOIQzXaSlWSU8GwSt8YkdpGkyXnRli/vC0mD
+						OhMNkMc7EqndNiAKVlYXhBTH64fahWmwMJY7R3GHCP3fE19Dy4p8dQ/gRVpkgWVw
+						dChnmk/ZIC4cagvNDe3gN9lxQCUODoZKgbAdI0PVJ/8TdxgTbT7G5wXo4sPyVXqE
+						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>
diff --git a/swamid-interfederations-2.0/www.purplemash.com-shibboleth.xml b/swamid-interfederations-2.0/www.purplemash.com-shibboleth.xml
new file mode 100644
index 00000000..7aa4d2fe
--- /dev/null
+++ b/swamid-interfederations-2.0/www.purplemash.com-shibboleth.xml
@@ -0,0 +1,77 @@
+<?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"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn: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>
+						MIIFvDCCBKSgAwIBAgIQedbd2FYSblApoSo8f3SkHzANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTMwMzA2
+						MDAwMDAwWhcNMTYwMzEwMjM1OTU5WjCB9zELMAkGA1UEBhMCR0IxFzAVBgNVBAgT
+						DkdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQHFAZMb25kb24xHTAbBgNVBAoUFDJTaW1w
+						bGUgU29mdHdhcmUgTHRkMTUwMwYDVQQLFCxUZXJtcyBvZiB1c2UgYXQgd3d3LnZl
+						cmlzaWduLmNvLnVrL3JwYSAoYykwNTEiMCAGA1UECxMZQXV0aGVudGljYXRlZCBi
+						eSBWZXJpU2lnbjEnMCUGA1UECxMeTWVtYmVyLCBWZXJpU2lnbiBUcnVzdCBOZXR3
+						b3JrMRswGQYDVQQDFBJ3d3cucHVycGxlbWFzaC5jb20wggEiMA0GCSqGSIb3DQEB
+						AQUAA4IBDwAwggEKAoIBAQDYk0LoU5Ca8CYovaGDYQqfH2OejPsxBs4K9u+2JrVy
+						HcbZW4bEtWNWPUaM/5bmxLLzi1Vb/ctmbZxVRQqo+R3EN9wjKeE9/t0eNNjCW6KV
+						9pIyJ4+joCh9PIrxVShJnh1cYgWYZ5ielcnp4IBgDbH6h0VnKyUXQxKyjg/taJIS
+						wMwVf5yLHxdnXYBpY5LQmCjg2mb4Q+y0gmzUGGzRYSD4Yu/jf0qMCUgq7IKtT0Tu
+						3qJ7wt+/JSamA+qpurAArFMENKCkPXAkFphL9SCJWf9Hq6pj6/Tb7tCpq+4JVN4h
+						c8MQQvTsHhsFUvM+UKNzJH+JjIOlSCx/4lSV+v2UE9IzAgMBAAGjggGCMIIBfjAd
+						BgNVHREEFjAUghJ3d3cucHVycGxlbWFzaC5jb20wCQYDVR0TBAIwADAOBgNVHQ8B
+						Af8EBAMCBaAwRQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL1NWUlNlY3VyZS1HMy1j
+						cmwudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNybDBDBgNVHSAEPDA6MDgGCmCG
+						SAGG+EUBBzYwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cudmVyaXNpZ24uY29t
+						L2NwczAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAU
+						DURcFlNEwYJ+HSCrJfQBY9i+eaUwdgYIKwYBBQUHAQEEajBoMCQGCCsGAQUFBzAB
+						hhhodHRwOi8vb2NzcC52ZXJpc2lnbi5jb20wQAYIKwYBBQUHMAKGNGh0dHA6Ly9T
+						VlJTZWN1cmUtRzMtYWlhLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jZXIwDQYJ
+						KoZIhvcNAQEFBQADggEBAHurI13mhFg7MlMd+A05vhU5VUHjx01azNOf36sWdg4e
+						hoIDEXpMW0BD1cXz87++5N5/BP7Zoo5JD9vA0+KK6t7RbFEEIxahsm3j2390lujt
+						7lyIIIzKRka/HE929NafGZ/ApR8Krc1ts+PkXVs5jZwMpb9MdL2J29FikkedfpMy
+						U9xky9R251Koq7UbBJuIAeVzUzRfcNC8ZNn17QOXwoGkhP61RnLlTPJbKSo9psag
+						2Q7lF55ncL2z/vvFT5gL0vu0kEQZ1up7xNkLy+nhtFLxrMgVGg5Npxgr2acWZvJ1
+						kssxNuC2fc8ocVlJPTZFvGOvgCZMP0sVZr+D3Ege3k8=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..e91073b0
--- /dev/null
+++ b/swamid-interfederations-2.0/www.qmsu.org-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
diff --git a/swamid-interfederations-2.0/www.qoam.eu-.xml b/swamid-interfederations-2.0/www.qoam.eu-.xml
new file mode 100644
index 00000000..36d25bf3
--- /dev/null
+++ b/swamid-interfederations-2.0/www.qoam.eu-.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.qoam.eu/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-06-02T14: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 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">QOAM - Quality Open Access Market</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Quality Open Access Market is primarily for authors who want to publish their article in open access in a high quality journal and for a reasonable price.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.qoam.eu/oamarket/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.qoam.eu/oamarket/about#privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo width="65" height="65">https://static.surfconext.nl/media/sp/OAmarket.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>MIIDQDCCAiigAwIBAgIJAJcxeRXdkrZFMA0GCSqGSIb3DQEBCwUAME4xCzAJBgNVBAYTAk5MMRAwDgYDVQQKEwdxb2FtLm5sMRAwDgYDVQQDEwdxb2FtLm5sMRswGQYJKoZIhvcNAQkBFgxpbmZvQHFvYW0ubmwwHhcNMTQwNDA0MDkzMjIwWhcNMjQwNDAxMDkzMjIwWjBOMQswCQYDVQQGEwJOTDEQMA4GA1UEChMHcW9hbS5ubDEQMA4GA1UEAxMHcW9hbS5ubDEbMBkGCSqGSIb3DQEJARYMaW5mb0Bxb2FtLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy+ZlubUDIVxCkaxhs3JV4M6Yx7oOmmg6v2hPTTff1xhp1w5EjKK3lqHKsTafhR3XpgZEEyNu9Q5YDAh1wTXWxodz4tvkYIArggTAKwygMK88b4VsBqwRmySwc4e5GOhZEo4epdumAv0ZIjiGch2FQpu1HkjOODOAc9nxf22gYkgjxgDZy5whSsaSBshUkFep3IO73h9SMHJw6M6/vKKFOVGqxtCYMd8lv+5eTfzaoJezeOiIsnJRafzt/u5FsQon4mzx121UPQlrKf3LNj7VTrlMpXttrAUlOLzUG1wTelIGzEqUIV6xqmzbyk9c/MR4Dmvq3CJ8q5mpAmyzZMufHwIDAQABoyEwHzAdBgNVHREEFjAUggdxb2FtLm5sggkqLnFvYW0ubmwwDQYJKoZIhvcNAQELBQADggEBAGZICIIb3zJL8af2x956KZqSJ5nFkdpTou3VO8HqCp4LpUt1xrWMtfvczJya+b/5l2qKsgHeA4+dR4GPvA1fARbnJjjPAEXiBue8hI6kdZi0QggeovpfuYqlPhpa//S7ofv0zlq9h08R/BW8r/BtjDL67cra17eGv+3RlqOZ7IEGPJHXnXRhzVUEi6iNlrlnEyyuT0A2IjkCWWUx3LfvIpNnWxhQxmciWgn+Fbj9etFO+gpEKSodCOF6k+ki5ieGL5KZvxypzNS0wAVOmUAbmtPU/3cyh7YRKDXawz5lZ6P0HQ2zwo2QgJ3iGZjNouxtd9dGnCt0sIpSoUZw6mYs+CM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIJAJcxeRXdkrZFMA0GCSqGSIb3DQEBCwUAME4xCzAJBgNVBAYTAk5MMRAwDgYDVQQKEwdxb2FtLm5sMRAwDgYDVQQDEwdxb2FtLm5sMRswGQYJKoZIhvcNAQkBFgxpbmZvQHFvYW0ubmwwHhcNMTQwNDA0MDkzMjIwWhcNMjQwNDAxMDkzMjIwWjBOMQswCQYDVQQGEwJOTDEQMA4GA1UEChMHcW9hbS5ubDEQMA4GA1UEAxMHcW9hbS5ubDEbMBkGCSqGSIb3DQEJARYMaW5mb0Bxb2FtLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy+ZlubUDIVxCkaxhs3JV4M6Yx7oOmmg6v2hPTTff1xhp1w5EjKK3lqHKsTafhR3XpgZEEyNu9Q5YDAh1wTXWxodz4tvkYIArggTAKwygMK88b4VsBqwRmySwc4e5GOhZEo4epdumAv0ZIjiGch2FQpu1HkjOODOAc9nxf22gYkgjxgDZy5whSsaSBshUkFep3IO73h9SMHJw6M6/vKKFOVGqxtCYMd8lv+5eTfzaoJezeOiIsnJRafzt/u5FsQon4mzx121UPQlrKf3LNj7VTrlMpXttrAUlOLzUG1wTelIGzEqUIV6xqmzbyk9c/MR4Dmvq3CJ8q5mpAmyzZMufHwIDAQABoyEwHzAdBgNVHREEFjAUggdxb2FtLm5sggkqLnFvYW0ubmwwDQYJKoZIhvcNAQELBQADggEBAGZICIIb3zJL8af2x956KZqSJ5nFkdpTou3VO8HqCp4LpUt1xrWMtfvczJya+b/5l2qKsgHeA4+dR4GPvA1fARbnJjjPAEXiBue8hI6kdZi0QggeovpfuYqlPhpa//S7ofv0zlq9h08R/BW8r/BtjDL67cra17eGv+3RlqOZ7IEGPJHXnXRhzVUEi6iNlrlnEyyuT0A2IjkCWWUx3LfvIpNnWxhQxmciWgn+Fbj9etFO+gpEKSodCOF6k+ki5ieGL5KZvxypzNS0wAVOmUAbmtPU/3cyh7YRKDXawz5lZ6P0HQ2zwo2QgJ3iGZjNouxtd9dGnCt0sIpSoUZw6mYs+CM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-logout.php/qoam-wayf"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-acs.php/qoam-wayf" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml1-acs.php/qoam-wayf" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-acs.php/qoam-wayf" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml1-acs.php/qoam-wayf/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">QOAM</md:ServiceName>
+      <md:ServiceName xml:lang="nl">QOAM</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Quality Open Access Market is primarily for authors who want to publish their article in open access in a high quality journal and for a reasonable price.</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: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.25178.1.2.9" 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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">QOAM</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">QOAM</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qoam.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>info@qoam.eu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Leo</md:GivenName>
+    <md:SurName>Waaijers</md:SurName>
+    <md:EmailAddress>leowaa@xs4all.nl</md:EmailAddress>
+    <md:TelephoneNumber>+31 24 36 17961</md:TelephoneNumber>
+  </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
new file mode 100644
index 00000000..2ca7ed6f
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rcpsych.org-shibboleth.xml
@@ -0,0 +1,82 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</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
new file mode 100644
index 00000000..7caf6988
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-rediristestidp.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
+ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
+tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
+oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
+vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
+7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
+UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
+IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
+ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
+8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
+2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
+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
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
+ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
+tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
+oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
+vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
+7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
+UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
+IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
+ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
+8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
+2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
+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>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-umaidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-umaidp.xml
new file mode 100644
index 00000000..2c5aee4e
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-umaidp.xml
@@ -0,0 +1,68 @@
+<?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>
+      <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
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
+ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
+tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
+oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
+vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
+7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
+UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
+IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
+ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
+8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
+2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
+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="http://sir.rediris.es/uma/saml2/idp/SingleLogoutService.php" ResponseLocation="http://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="http://sir.rediris.es/uma/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://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="http://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-unedidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-unedidp.xml
new file mode 100644
index 00000000..59cb1f65
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-unedidp.xml
@@ -0,0 +1,68 @@
+<?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>
+      <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
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
+ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
+tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
+oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
+vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
+7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
+UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
+IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
+ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
+8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
+2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
+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="http://sir.rediris.es/uned/saml2/idp/SingleLogoutService.php" ResponseLocation="http://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="http://sir.rediris.es/uned/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://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="http://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">Universidad Nacional de Educación a Distancia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">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
new file mode 100644
index 00000000..fbf34181
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-uocidp.xml
@@ -0,0 +1,68 @@
+<?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>
+      <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
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
+ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
+tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
+oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
+vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
+7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
+UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
+IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
+ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
+8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
+2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
+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="http://sir.rediris.es/uoc/saml2/idp/SingleLogoutService.php" ResponseLocation="http://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="http://sir.rediris.es/uoc/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://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="http://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-urvidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-urvidp.xml
new file mode 100644
index 00000000..3d18c3f4
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-urvidp.xml
@@ -0,0 +1,70 @@
+<?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>
+      <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
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
+ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
+tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
+oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
+vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
+7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
+UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
+IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
+ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
+8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
+2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
+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="http://sir.rediris.es/urv/saml2/idp/SingleLogoutService.php" ResponseLocation="http://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="http://sir.rediris.es/urv/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://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="http://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">Rovira i Virgili University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">Universidad Rovira i Virgili</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="ca">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.refworks.com-shibboleth-sp.xml b/swamid-interfederations-2.0/www.refworks.com-shibboleth-sp.xml
new file mode 100644
index 00000000..070fe253
--- /dev/null
+++ b/swamid-interfederations-2.0/www.refworks.com-shibboleth-sp.xml
@@ -0,0 +1,95 @@
+<?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>
+						MIIEQjCCAyqgAwIBAgIJAPi0oqIBy55FMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
+						VQQGEwJVUzERMA8GA1UECBMITWFyeWxhbmQxETAPBgNVBAcTCEJldGhlc2RhMRUw
+						EwYDVQQKEwxQcm9RdWVzdCBMTEMxFTATBgNVBAsTDFJlZldvcmtzL0NPUzEZMBcG
+						A1UEAxMQd3d3LnJlZndvcmtzLmNvbTEjMCEGCSqGSIb3DQEJARYUbmtlbm5leUBy
+						ZWZ3b3Jrcy5jb20wHhcNMDgxMjE1MjIwMzA1WhcNMTgxMjEzMjIwMzA1WjCBoTEL
+						MAkGA1UEBhMCVVMxETAPBgNVBAgTCE1hcnlsYW5kMREwDwYDVQQHEwhCZXRoZXNk
+						YTEVMBMGA1UEChMMUHJvUXVlc3QgTExDMRUwEwYDVQQLEwxSZWZXb3Jrcy9DT1Mx
+						GTAXBgNVBAMTEHd3dy5yZWZ3b3Jrcy5jb20xIzAhBgkqhkiG9w0BCQEWFG5rZW5u
+						ZXlAcmVmd29ya3MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						0BNHVpHg+SvSXBH7Z9XWTpiRLEWISoqsL6N1hR7DaJeM7lqIkH3OuL9g1q76/75v
+						3zrV0QqSF1xj7rM1Lq5ZJd8O2mLdlWHZvdYSmJQNu5hrnOcqv5eDuc2GsXaaI7FE
+						+ipw4xamo8ei3wm0BP3hCHGRS71iwk3lwVteSfWDpGxPBNTR1szx0tazTH2gwkmN
+						Txlcxkim+tgdH4etIyCSgweRvb/9jG6y/nRvBB2j7CykzfM2E2tkA63cfax+P5Wd
+						Crk7CCcgNrIcWr9dmP5wyerwbW1u9wZJOJYAhZDEY497h1bRxXJcwT+P1ZhYTJdk
+						VCbAFSgxsNwOEtVGIJ7JNwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
+						DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUqaa3
+						a9bD274+w6y7JHvNGkoZRs4wHwYDVR0jBBgwFoAUqaa3a9bD274+w6y7JHvNGkoZ
+						Rs4wDQYJKoZIhvcNAQEFBQADggEBAHjTPGg2GmOXGh0cboOOkFYXtXZmk3wXePyr
+						Fa8OHe5CqEhZhcidRq1IrPt/QDF76KofX43SnpJ24Hha1RuXDKQu5vV387TwUTdl
+						ufWJrWpAZybWZ55OMpG1crHbuozEFW+GGJ34s4e6fygeIcLTigkN6rf5WkbLBVyX
+						6qqB4GNdfqj+18xbVaM7yWMk0ShlBzFMl15DO25zoAh+l/J3Ti1vDbbusjE27H7D
+						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>
diff --git a/swamid-interfederations-2.0/www.rememberingscotlandatwar.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.rememberingscotlandatwar.org.uk-shibboleth.xml
new file mode 100644
index 00000000..85d10d3c
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rememberingscotlandatwar.org.uk-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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>
+      <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>
+						MIIDJzCCAg+gAwIBAgIJALeFq3bo7Ze3MA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
+						BAMTIGRzdnIwMDg4MDguc2NyZWVubWVkaWFob3N0LmNvLnVrMB4XDTEwMDIwMjEx
+						MDQ1NFoXDTIwMDEzMTExMDQ1NFowKzEpMCcGA1UEAxMgZHN2cjAwODgwOC5zY3Jl
+						ZW5tZWRpYWhvc3QuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCunuAbL1nB1VndiIfV9Hb3Y03c0PCbeKLPhKOQ5rH+An2g/hJbkBF0BWYmn5+E
+						2rPO4wEm+bFp517Rf30uBGTF4wQH7gx2n7PxVglF59jtlz4baMA3oB+1GJsEyWxS
+						zKMZLOPsVF4N1bn2TdoGDgWFjoEQ48U0lcRdpizoqrH6/0NzLZNrRdJD8VF58wt2
+						Z4qIHpg7yTVn4b8XXjwmgAG6HdvGYjYVegZ6MeEyKBLmiSRvhNuvMqdDCOJ8faBn
+						p0KlFV3dEdozo8cUdRkaE0ymcrJWxGJqVYIklf+lZM/MkEPg6c6YKNr45bXggAPT
+						k5dvuO3usoRBsCILY+RimGD/AgMBAAGjTjBMMCsGA1UdEQQkMCKCIGRzdnIwMDg4
+						MDguc2NyZWVubWVkaWFob3N0LmNvLnVrMB0GA1UdDgQWBBSDyYRWFylm8mEJiCCT
+						Edrvtk+jszANBgkqhkiG9w0BAQUFAAOCAQEAZpGY80g01GaQsb4vZK4AtugiMRkd
+						BadzM+Na1TGytZJCCo9ykYCnNZ6DawCgDYzgQNoyp4Ys+h7SzmI8XN4zyXY5dWJv
+						7varqf1JScLFBkrMHeYVJu+RkWvXZX/JKJwA2Dq21nk2JD+A5VELZLpqMb9+pfw5
+						3V8GlKep4X0lkbg/bAvXp5VESrT/Rp9x1LYSd5Wzd5mZFxL+ZeRPZ96k/4rcDvNN
+						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>
+						MIIDJzCCAg+gAwIBAgIJALeFq3bo7Ze3MA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
+						BAMTIGRzdnIwMDg4MDguc2NyZWVubWVkaWFob3N0LmNvLnVrMB4XDTEwMDIwMjEx
+						MDQ1NFoXDTIwMDEzMTExMDQ1NFowKzEpMCcGA1UEAxMgZHN2cjAwODgwOC5zY3Jl
+						ZW5tZWRpYWhvc3QuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCunuAbL1nB1VndiIfV9Hb3Y03c0PCbeKLPhKOQ5rH+An2g/hJbkBF0BWYmn5+E
+						2rPO4wEm+bFp517Rf30uBGTF4wQH7gx2n7PxVglF59jtlz4baMA3oB+1GJsEyWxS
+						zKMZLOPsVF4N1bn2TdoGDgWFjoEQ48U0lcRdpizoqrH6/0NzLZNrRdJD8VF58wt2
+						Z4qIHpg7yTVn4b8XXjwmgAG6HdvGYjYVegZ6MeEyKBLmiSRvhNuvMqdDCOJ8faBn
+						p0KlFV3dEdozo8cUdRkaE0ymcrJWxGJqVYIklf+lZM/MkEPg6c6YKNr45bXggAPT
+						k5dvuO3usoRBsCILY+RimGD/AgMBAAGjTjBMMCsGA1UdEQQkMCKCIGRzdnIwMDg4
+						MDguc2NyZWVubWVkaWFob3N0LmNvLnVrMB0GA1UdDgQWBBSDyYRWFylm8mEJiCCT
+						Edrvtk+jszANBgkqhkiG9w0BAQUFAAOCAQEAZpGY80g01GaQsb4vZK4AtugiMRkd
+						BadzM+Na1TGytZJCCo9ykYCnNZ6DawCgDYzgQNoyp4Ys+h7SzmI8XN4zyXY5dWJv
+						7varqf1JScLFBkrMHeYVJu+RkWvXZX/JKJwA2Dq21nk2JD+A5VELZLpqMb9+pfw5
+						3V8GlKep4X0lkbg/bAvXp5VESrT/Rp9x1LYSd5Wzd5mZFxL+ZeRPZ96k/4rcDvNN
+						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>
diff --git a/swamid-interfederations-2.0/www.researchprofessional.com-shibboleth.xml b/swamid-interfederations-2.0/www.researchprofessional.com-shibboleth.xml
new file mode 100644
index 00000000..4aff2c3c
--- /dev/null
+++ b/swamid-interfederations-2.0/www.researchprofessional.com-shibboleth.xml
@@ -0,0 +1,106 @@
+<?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>
+      <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:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIID6jCCAtKgAwIBAgIJALmfy/1EwX4NMA0GCSqGSIb3DQEBBQUAMHYxCzAJBgNV
+						BAYTAkdCMRcwFQYDVQQIEw5HcmVhdGVyIExvbmRvbjEPMA0GA1UEBxMGTG9uZG9u
+						MRYwFAYDVQQKEw1SZXNlYXJjaCBMdGQuMSUwIwYDVQQDExx3d3cucmVzZWFyY2hw
+						cm9mZXNzaW9uYWwuY29tMB4XDTEzMDcyNDExMTUzNFoXDTIzMDcyMjExMTUzNFow
+						djELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDkdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQH
+						EwZMb25kb24xFjAUBgNVBAoTDVJlc2VhcmNoIEx0ZC4xJTAjBgNVBAMTHHd3dy5y
+						ZXNlYXJjaHByb2Zlc3Npb25hbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQDr6isqSDUBMLp8dqaP5zhEJ4IF+cOm46VCvsH7gLkSRPiU8SXuosB9
+						o8wcHQD4SRzdZueZ/8Pv9Dq86+d+jih2wzBzIr1ZQmwCYKdCeuVQ/NrFYOW/K/zJ
+						HI2D8wWdnMRbDHQbBnpLIiI9AeNE3DlzerFfeqXc/amrlaWgCm7oKIfmn5diJmKm
+						0qwlPuHyzCh4qwRPvFofSkuyOTzjdEhuYPoJ/GDuwQOWKzvRrwyr2LNywbesRG76
+						Erlw/jIfEld8FlJjAvAkDWpR4ZJM+K1/Gnrw/emGJbTULj5rV4tqtcRDkkzxvJlo
+						P8tmBdTTFeQKa8fAN8TdqJz5nTA1noP1AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJ
+						YIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1Ud
+						DgQWBBRkhl/nawpdfr1xWIgUhBkBU0z8EzAfBgNVHSMEGDAWgBRkhl/nawpdfr1x
+						WIgUhBkBU0z8EzANBgkqhkiG9w0BAQUFAAOCAQEA3rqSgq+7fQHLsQSuSZ5ZAXa5
+						iiah5Lh0nrwNAnx4NNiRo/XreA4zS27f58BWZjETCv7X8phegFLKZawe87VrHiUT
+						cktHPT1yD6LFvB/iw6KR/lmH0ssrHtXpag5V6vQVheU01kxmE1TrVqdlxR3aBX87
+						AScHf43WyOPMzr798LFCOm/RFwEUYhZMtp9DMf9SOUtOA0OrZHv6AP5kclGZkq4+
+						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: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
new file mode 100644
index 00000000..8191ebc5
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rguunion.co.uk-shibboleth.xml
@@ -0,0 +1,62 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
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
new file mode 100644
index 00000000..486b7fcd
--- /dev/null
+++ b/swamid-interfederations-2.0/www.ripdev.co.uk-oa-metadata.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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>
+						MIIDiDCCAnCgAwIBAgIJAL/6MNP9H2wJMA0GCSqGSIb3DQEBBQUAMDYxGTAXBgNV
+						BAoTEFRlc3QgYXBwbGljYXRpb24xGTAXBgNVBAMTEHd3dy5yaXBkZXYuY28udWsw
+						HhcNMTQwOTAyMTU1NTI2WhcNMjQwODMwMTU1NTI2WjA2MRkwFwYDVQQKExBUZXN0
+						IGFwcGxpY2F0aW9uMRkwFwYDVQQDExB3d3cucmlwZGV2LmNvLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwlcdLQ2hQWS+SRjt5QEgZ/OLdp0B4OZF
+						8+fA4zz6ChjVctZNxXj2+nv9dTNNqLdBYM60fUzEO5aw0ZSwGfsqydi2ChNr0tYV
+						gYWIhptsF09GsuRig396jXk76MnHIjEyPPkd38tpUJadrJL3ON+5RA8ZT/wvPH3f
+						NE5t3Skig+sfSHm98aOCUPmHKHHRMGyZcKgVtQ4Jak8NpCvVbKRZBLrMGrR9Niuf
+						+/I/A+7bye8KZWtdj7gheURvnWUV/90WDJyAZ1hAEweWXdezAm/h6o1xjlSQ67Um
+						sP10MGcIn0eybKwMjEW6Z275gKArXof9A0+S2rxhRxTejg/bbEBDLwIDAQABo4GY
+						MIGVMB0GA1UdDgQWBBQY/i2dHz4lM3HxLuYTVY0gzyCvHDBmBgNVHSMEXzBdgBQY
+						/i2dHz4lM3HxLuYTVY0gzyCvHKE6pDgwNjEZMBcGA1UEChMQVGVzdCBhcHBsaWNh
+						dGlvbjEZMBcGA1UEAxMQd3d3LnJpcGRldi5jby51a4IJAL/6MNP9H2wJMAwGA1Ud
+						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHewb7qtFmo7XZOJExxQ92nS0EA9
+						BXbvnO/m1PPsk8/86U5FWYNmXFBROF6W5Xhoi+6YsqmVUxtnpCKioDlG0q8j4n0d
+						aF9IifSckmrFoyOR3xQtqxFD+33AdXMliM9X8YRliEnsK7pAbVrQKx5lgfNItDUq
+						fVnBpVHyc2It1F4wXI/Q4AAOIReAfWJhOebzZX1HJR35jgW4e7k43ws6+ugwePoT
+						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>
+						MIIDiDCCAnCgAwIBAgIJAL/6MNP9H2wJMA0GCSqGSIb3DQEBBQUAMDYxGTAXBgNV
+						BAoTEFRlc3QgYXBwbGljYXRpb24xGTAXBgNVBAMTEHd3dy5yaXBkZXYuY28udWsw
+						HhcNMTQwOTAyMTU1NTI2WhcNMjQwODMwMTU1NTI2WjA2MRkwFwYDVQQKExBUZXN0
+						IGFwcGxpY2F0aW9uMRkwFwYDVQQDExB3d3cucmlwZGV2LmNvLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwlcdLQ2hQWS+SRjt5QEgZ/OLdp0B4OZF
+						8+fA4zz6ChjVctZNxXj2+nv9dTNNqLdBYM60fUzEO5aw0ZSwGfsqydi2ChNr0tYV
+						gYWIhptsF09GsuRig396jXk76MnHIjEyPPkd38tpUJadrJL3ON+5RA8ZT/wvPH3f
+						NE5t3Skig+sfSHm98aOCUPmHKHHRMGyZcKgVtQ4Jak8NpCvVbKRZBLrMGrR9Niuf
+						+/I/A+7bye8KZWtdj7gheURvnWUV/90WDJyAZ1hAEweWXdezAm/h6o1xjlSQ67Um
+						sP10MGcIn0eybKwMjEW6Z275gKArXof9A0+S2rxhRxTejg/bbEBDLwIDAQABo4GY
+						MIGVMB0GA1UdDgQWBBQY/i2dHz4lM3HxLuYTVY0gzyCvHDBmBgNVHSMEXzBdgBQY
+						/i2dHz4lM3HxLuYTVY0gzyCvHKE6pDgwNjEZMBcGA1UEChMQVGVzdCBhcHBsaWNh
+						dGlvbjEZMBcGA1UEAxMQd3d3LnJpcGRldi5jby51a4IJAL/6MNP9H2wJMAwGA1Ud
+						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHewb7qtFmo7XZOJExxQ92nS0EA9
+						BXbvnO/m1PPsk8/86U5FWYNmXFBROF6W5Xhoi+6YsqmVUxtnpCKioDlG0q8j4n0d
+						aF9IifSckmrFoyOR3xQtqxFD+33AdXMliM9X8YRliEnsK7pAbVrQKx5lgfNItDUq
+						fVnBpVHyc2It1F4wXI/Q4AAOIReAfWJhOebzZX1HJR35jgW4e7k43ws6+ugwePoT
+						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>
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
new file mode 100644
index 00000000..9a6b4cf1
--- /dev/null
+++ b/swamid-interfederations-2.0/www.ripfa.org.uk-oa-metadata.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIDWzCCAkOgAwIBAgIJAP9VQ0E4SPcHMA0GCSqGSIb3DQEBBQUAMCcxDjAMBgNV
+						BAoTBVJpUGZBMRUwEwYDVQQDEwxyaXBmYS5vcmcudWswHhcNMTQwMTA1MDkwOTUx
+						WhcNMjQwMTAzMDkwOTUxWjAnMQ4wDAYDVQQKEwVSaVBmQTEVMBMGA1UEAxMMcmlw
+						ZmEub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzo3T6m/Q
+						IHr+ZiZqoRWpNcavL2ObQCXGrKMGo9SP/zsKZGSTWj0w+pKNTQAC+o4issxq+2f2
+						cwBBKQmaJmvs+6FDzynRZ4RZTrCgT0ZV6wiqnHSRALLDEe1GatE5YatnAl9JqDcy
+						oOC144EXG3Q2z31ts0/9Xbmz9VPvfBPcXZnhBmdeqKLoCM3nxOMIiiNwp4gZID+y
+						ORveB5zn7lg4vfW63/fCN2ea4Vwbg4wUcwwBZplDn+z2wApU92OA9/WTYIK6gtgw
+						JalJXnFI9yCzQyBQUYGpJi8hSGX0qyT69/7r1QdBg2pIE5Lw/b79lN4kdXFhrX3u
+						BAOMKUiKpok3+wIDAQABo4GJMIGGMB0GA1UdDgQWBBR48j+MpOWAOUt0lOLls9z/
+						OgulhzBXBgNVHSMEUDBOgBR48j+MpOWAOUt0lOLls9z/Ogulh6ErpCkwJzEOMAwG
+						A1UEChMFUmlQZkExFTATBgNVBAMTDHJpcGZhLm9yZy51a4IJAP9VQ0E4SPcHMAwG
+						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEBIsOYvJUIw4bpOEHHOIYwt
+						ZHaIfAyIjoW2jZ0MyEjHUS5V/pPWgf6shc5oG8OgDkgp7AumeexNA6L4EEae+9N2
+						oWq3NIKXZazjdDeVR7w7RAmMRqc0ApAE3OT4jemdM6kbqqo+GRK4XhvtMD0O9BWx
+						LT5rvxT/bO7gASiBWGDIYiXrtoc/FPu33Sy4JQrbUZLU/fpfRfwfrzA9f2+6SRJQ
+						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>
+						MIIDWzCCAkOgAwIBAgIJAP9VQ0E4SPcHMA0GCSqGSIb3DQEBBQUAMCcxDjAMBgNV
+						BAoTBVJpUGZBMRUwEwYDVQQDEwxyaXBmYS5vcmcudWswHhcNMTQwMTA1MDkwOTUx
+						WhcNMjQwMTAzMDkwOTUxWjAnMQ4wDAYDVQQKEwVSaVBmQTEVMBMGA1UEAxMMcmlw
+						ZmEub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzo3T6m/Q
+						IHr+ZiZqoRWpNcavL2ObQCXGrKMGo9SP/zsKZGSTWj0w+pKNTQAC+o4issxq+2f2
+						cwBBKQmaJmvs+6FDzynRZ4RZTrCgT0ZV6wiqnHSRALLDEe1GatE5YatnAl9JqDcy
+						oOC144EXG3Q2z31ts0/9Xbmz9VPvfBPcXZnhBmdeqKLoCM3nxOMIiiNwp4gZID+y
+						ORveB5zn7lg4vfW63/fCN2ea4Vwbg4wUcwwBZplDn+z2wApU92OA9/WTYIK6gtgw
+						JalJXnFI9yCzQyBQUYGpJi8hSGX0qyT69/7r1QdBg2pIE5Lw/b79lN4kdXFhrX3u
+						BAOMKUiKpok3+wIDAQABo4GJMIGGMB0GA1UdDgQWBBR48j+MpOWAOUt0lOLls9z/
+						OgulhzBXBgNVHSMEUDBOgBR48j+MpOWAOUt0lOLls9z/Ogulh6ErpCkwJzEOMAwG
+						A1UEChMFUmlQZkExFTATBgNVBAMTDHJpcGZhLm9yZy51a4IJAP9VQ0E4SPcHMAwG
+						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEBIsOYvJUIw4bpOEHHOIYwt
+						ZHaIfAyIjoW2jZ0MyEjHUS5V/pPWgf6shc5oG8OgDkgp7AumeexNA6L4EEae+9N2
+						oWq3NIKXZazjdDeVR7w7RAmMRqc0ApAE3OT4jemdM6kbqqo+GRK4XhvtMD0O9BWx
+						LT5rvxT/bO7gASiBWGDIYiXrtoc/FPu33Sy4JQrbUZLU/fpfRfwfrzA9f2+6SRJQ
+						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>
diff --git a/swamid-interfederations-2.0/www.ripfa.org.uk-openathens.xml b/swamid-interfederations-2.0/www.ripfa.org.uk-openathens.xml
new file mode 100644
index 00000000..4002b823
--- /dev/null
+++ b/swamid-interfederations-2.0/www.ripfa.org.uk-openathens.xml
@@ -0,0 +1,87 @@
+<?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>
+						MIID7TCCAtWgAwIBAgIJAMbb5T7zPYR8MA0GCSqGSIb3DQEBBQUAMFcxKDAmBgNV
+						BAoTH1Jlc2VhcmNoIGluIFByYWN0aWNlIGZvciBBZHVsdHMxKzApBgNVBAMTInJl
+						c2VhcmNoaW5wcmFjdGljZWZvcmFkdWx0cy5vcmcudWswHhcNMTMwMzEyMTgwNzQx
+						WhcNMjMwMzEwMTgwNzQxWjBXMSgwJgYDVQQKEx9SZXNlYXJjaCBpbiBQcmFjdGlj
+						ZSBmb3IgQWR1bHRzMSswKQYDVQQDEyJyZXNlYXJjaGlucHJhY3RpY2Vmb3JhZHVs
+						dHMub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs0+abLKR
+						2q3TOwffRMpTBYdYXnUAfvedOXW60IZLw1Af+ByabKXC7abynfHDMYNwyPEOwZAn
+						TT+czovqmCAQEd9PpVX9iCSTP4suKy1B1M9+Ae8h0AHvKtGXGubU+WhJg6lsRXZR
+						5CwA2P8BabMtnP6aDQ/i6C6Jy4IBQjVn/KdYkjez/zWcGICC47pLCp6C2kh9I/kp
+						DaxyF/KLo7oqZmrGWaoMtrIUOwTs19CbF44JUBVeQ5STFlYAuQQqBTGvaOoVZRKx
+						6XhckRq6htG3MgbWIJjXpfAt9Ehpixv0c2CP4yN7GRGPGoc2umN5cR1PLdrUDTXz
+						lJLUk1B4BxW3JwIDAQABo4G7MIG4MB0GA1UdDgQWBBTdCZQfxzH22Dvs5XDGiSVW
+						Wfe16zCBiAYDVR0jBIGAMH6AFN0JlB/HMfbYO+zlcMaJJVZZ97XroVukWTBXMSgw
+						JgYDVQQKEx9SZXNlYXJjaCBpbiBQcmFjdGljZSBmb3IgQWR1bHRzMSswKQYDVQQD
+						EyJyZXNlYXJjaGlucHJhY3RpY2Vmb3JhZHVsdHMub3JnLnVrggkAxtvlPvM9hHww
+						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEABe6Xc8hDvMtXB83WH233
+						scyqQy98iQ7MSREgOriOHqdQHCiroNBp6Nhd+wO/wdnxK+14sllcX7Fk/4Sp2spz
+						XsBh/HKt2qf+tPOsRAUEkIooVwMeCRG5vPxm2nGxRVAbxp9Cg+LNQnMSXjBxAkeb
+						kN/aSr67S10Sy2/9h91RXWfpchHkj3qN+1lcdMd1CPLXDz1HqGeE4rxz5oowI+qQ
+						Q1tzByG2zLblM/DwaGQFO1A7/6RuxIAszVVM/hkmAnGfggQbBzspo78+TK8w0Eqs
+						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>
+						MIID7TCCAtWgAwIBAgIJAMbb5T7zPYR8MA0GCSqGSIb3DQEBBQUAMFcxKDAmBgNV
+						BAoTH1Jlc2VhcmNoIGluIFByYWN0aWNlIGZvciBBZHVsdHMxKzApBgNVBAMTInJl
+						c2VhcmNoaW5wcmFjdGljZWZvcmFkdWx0cy5vcmcudWswHhcNMTMwMzEyMTgwNzQx
+						WhcNMjMwMzEwMTgwNzQxWjBXMSgwJgYDVQQKEx9SZXNlYXJjaCBpbiBQcmFjdGlj
+						ZSBmb3IgQWR1bHRzMSswKQYDVQQDEyJyZXNlYXJjaGlucHJhY3RpY2Vmb3JhZHVs
+						dHMub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs0+abLKR
+						2q3TOwffRMpTBYdYXnUAfvedOXW60IZLw1Af+ByabKXC7abynfHDMYNwyPEOwZAn
+						TT+czovqmCAQEd9PpVX9iCSTP4suKy1B1M9+Ae8h0AHvKtGXGubU+WhJg6lsRXZR
+						5CwA2P8BabMtnP6aDQ/i6C6Jy4IBQjVn/KdYkjez/zWcGICC47pLCp6C2kh9I/kp
+						DaxyF/KLo7oqZmrGWaoMtrIUOwTs19CbF44JUBVeQ5STFlYAuQQqBTGvaOoVZRKx
+						6XhckRq6htG3MgbWIJjXpfAt9Ehpixv0c2CP4yN7GRGPGoc2umN5cR1PLdrUDTXz
+						lJLUk1B4BxW3JwIDAQABo4G7MIG4MB0GA1UdDgQWBBTdCZQfxzH22Dvs5XDGiSVW
+						Wfe16zCBiAYDVR0jBIGAMH6AFN0JlB/HMfbYO+zlcMaJJVZZ97XroVukWTBXMSgw
+						JgYDVQQKEx9SZXNlYXJjaCBpbiBQcmFjdGljZSBmb3IgQWR1bHRzMSswKQYDVQQD
+						EyJyZXNlYXJjaGlucHJhY3RpY2Vmb3JhZHVsdHMub3JnLnVrggkAxtvlPvM9hHww
+						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEABe6Xc8hDvMtXB83WH233
+						scyqQy98iQ7MSREgOriOHqdQHCiroNBp6Nhd+wO/wdnxK+14sllcX7Fk/4Sp2spz
+						XsBh/HKt2qf+tPOsRAUEkIooVwMeCRG5vPxm2nGxRVAbxp9Cg+LNQnMSXjBxAkeb
+						kN/aSr67S10Sy2/9h91RXWfpchHkj3qN+1lcdMd1CPLXDz1HqGeE4rxz5oowI+qQ
+						Q1tzByG2zLblM/DwaGQFO1A7/6RuxIAszVVM/hkmAnGfggQbBzspo78+TK8w0Eqs
+						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>
diff --git a/swamid-interfederations-2.0/www.rocksbackpages.com-shibboleth.xml b/swamid-interfederations-2.0/www.rocksbackpages.com-shibboleth.xml
new file mode 100644
index 00000000..d83e8eb2
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rocksbackpages.com-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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>
+      <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>
+						MIIDVDCCAjwCCQCtwU/QO/+YATANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJH
+						QjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGjAYBgNVBAoTEUJh
+						Y2twYWdlcyBMaW1pdGVkMR8wHQYDVQQDExZ3d3cucm9ja3NiYWNrcGFnZXMuY29t
+						MB4XDTE0MDQxMDA4MDQ1MloXDTM0MDQwNTA4MDQ1MlowbDELMAkGA1UEBhMCR0Ix
+						DzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRowGAYDVQQKExFCYWNr
+						cGFnZXMgTGltaXRlZDEfMB0GA1UEAxMWd3d3LnJvY2tzYmFja3BhZ2VzLmNvbTCC
+						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO3tyz8rgNIqPcwgzPedsKqb
+						mSIri8V5XFJQC7WDP87T+Mx9HA4O+f9ImX/u6bwflg4MvKquYO3on6v5GbWZ6Z5p
+						elAecnNW45S7N61gqZ1tKKBkXODYe7GrnT5C9ykHdrfgh0Byz/eZFCdKKZ+yoLeR
+						Sb6LQ716VjgQH7V1UqKETwjZw5EwXt3PPJG3Mz5MfruHr9Xnp0NpdL4YzqwGGC7O
+						SXFNktpk2JN1ffVKJl4fTwBS7gY1/Si0qko5Rxb4QeWjQLxmkg0RzxD0aLg74Ijb
+						BC1sGtetMmUHb3ltLBMmtFCCNVR/hlDMMWpsByrpeHEMv2026XTPWOFQuKHcPvkC
+						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAs8/NlVj6QBC5k+ZTE8ZONZEbVfHEwm/Z
+						8WHEYvL24czGzX6E6QnSzCjZUZ2COF4wF1NnMx/31whFw03+coD+WCWZesug5rFN
+						4Qm2khl/5nffXGcFRCx4aIPLvjTgwGRzHVIf232gMP0F7p1lPnTP1KH5kNOGAFeR
+						7N6sNuweGigZNnG1LxoJwDvgoYHX2Mk4vAg2CuWpSwvZoQZBt8OE1P+rgNXxXN8Z
+						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>
diff --git a/swamid-interfederations-2.0/www.rsmjournals.com-shibboleth.xml b/swamid-interfederations-2.0/www.rsmjournals.com-shibboleth.xml
new file mode 100644
index 00000000..0bce9be3
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rsmjournals.com-shibboleth.xml
@@ -0,0 +1,80 @@
+<?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>
+      <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>
+						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
+						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
+						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
+						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
+						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
+						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
+						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
+						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
+						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
+						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
+						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
+						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
+						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
+						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
+						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
+						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
+						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
+						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
+						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>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga</md:GivenName>
+    <md:SurName>Biasotti</md:SurName>
+    <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
new file mode 100644
index 00000000..f96dcd80
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rusu.co.uk-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
diff --git a/swamid-interfederations-2.0/www.sauws.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.sauws.org.uk-shibboleth.xml
new file mode 100644
index 00000000..ed07ff25
--- /dev/null
+++ b/swamid-interfederations-2.0/www.sauws.org.uk-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
diff --git a/swamid-interfederations-2.0/www.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.sbs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..bcb7b79f
--- /dev/null
+++ b/swamid-interfederations-2.0/www.sbs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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.sbs.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-04T14:07: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sbs.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>
+						MIIC9zCCAd+gAwIBAgIJAKtJW6P66mO4MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHd3dy5zYnMub3guYWMudWswHhcNMTMwOTAyMTQwNjUxWhcNMjMwODMxMTQw
+						NjUxWjAbMRkwFwYDVQQDExB3d3cuc2JzLm94LmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAmsdbrSCkH5ZFU6C2mwfXmWXdQRTzEXj2HSzcxvHQ
+						gLX6fnB4f83GeMWRiZibJKlXqbl4FzXcpHD9jt6hjGIN5gO7cSdnuGXN9Uk0KFK3
+						x+DvUxbxb4ZyHpJ/Zm+U740xMJrxmdT5yIpR4OqvZ5A8nmmVpHJWDhywoCv07nVD
+						HtStOXw3uGJkGWBZbthhsT7kepw3JBQYsrIpGw+Dj+TZ95GJGKDF4Pw5i5erlVjr
+						f3ZBzesK2Bd2NzVqPqVMasTwV48ea4r6I9HaPF3TrysTsiYWryXJI6IdHsUUx+LN
+						KIksFW5t5jyV8wCvKnfqb0QAQeFbqXIe0SGvC/OKVSMkdwIDAQABoz4wPDAbBgNV
+						HREEFDASghB3d3cuc2JzLm94LmFjLnVrMB0GA1UdDgQWBBTKEr4Z+YHBBfBATGJ3
+						O0k9PamaNjANBgkqhkiG9w0BAQUFAAOCAQEAkj8zXH2bFg6ZIzQoFpjjW3hUiY6z
+						eDChMmiy9TXhlXp33Sx8ojM90XulrieY0KWqKfssEvF1EFTqOybvp9AOxyh6FSJB
+						QvafBExWMOxD9IscIQb9kx3jGOGp95NfhCE2Td3KDl5+LwRWJwxnKq1d1ApY6rLI
+						MMa1T5eHs6IFSBq7twfZWDAOycSpp5uY0+k3TD736d1Hmdc+vlau5c43HHLA5qcS
+						N4H/o5imvlkGpTRxpxgsYOezQnX05Cy64Lp1Hvagg1766ZTT3zKLSG3s175lnCQ5
+						blf8Z3Cb7eBFE/7iAeAbOoyyvGjB+y/XQjWvXJwXkWTLlYrZna6PGQ+ocw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sbs.ox.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.sbs.ox.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.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS Team</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Aaron</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</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
new file mode 100644
index 00000000..b82794cc
--- /dev/null
+++ b/swamid-interfederations-2.0/www.school-portal.co.uk-shibboleth-sp.xml
@@ -0,0 +1,100 @@
+<?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>
+						MIIE8TCCA9mgAwIBAgIJAM7Pg7fr+cKKMA0GCSqGSIb3DQEBBQUAMIGrMQswCQYD
+						VQQGEwJHQjESMBAGA1UECBMJQmVya3NoaXJlMRAwDgYDVQQHEwdSZWFkaW5nMRsw
+						GQYDVQQKExJVbmlTZXJ2aXR5IExpbWl0ZWQxEDAOBgNVBAsTB1N1cHBvcnQxIDAe
+						BgNVBAMTF3d3dy5zY2hvb2wtcG9ydGFsLmNvLnVrMSUwIwYJKoZIhvcNAQkBFhZz
+						dXBwb3J0QHVuaXNlcnZpdHkuY29tMB4XDTExMDMzMDEzNDgxOVoXDTIxMDMyNzEz
+						NDgxOVowgasxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlCZXJrc2hpcmUxEDAOBgNV
+						BAcTB1JlYWRpbmcxGzAZBgNVBAoTElVuaVNlcnZpdHkgTGltaXRlZDEQMA4GA1UE
+						CxMHU3VwcG9ydDEgMB4GA1UEAxMXd3d3LnNjaG9vbC1wb3J0YWwuY28udWsxJTAj
+						BgkqhkiG9w0BCQEWFnN1cHBvcnRAdW5pc2Vydml0eS5jb20wggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDUMkvx0wIC8biqHJx0WvOa99Lrow43Zks4NSoZ
+						g6SJRJIFuqaxQBt3/PgGj5T9n3psWT3DFJNTgOpIgydqp/+swQ9TTLxcmsX7qCke
+						105z5j2OjV0VySclV2as1B63Aaugyc5lDV4ES3HV1bKbdQbJwQDLYBNbRXqsxciG
+						FdIuec17GOIlEOnM+gcx3z2yq0TCx6aPfyRm/ookHPJua/vtDJPGCHlGd7k/kHhB
+						VVITm1BbtXT6J+dNF7BXkDzH1+CqFHUcIx45MJLu2tyhHOiuYRMs59Ul4N1TIgCa
+						FjOqA8gQtSrd7i15CKgCfyQcH/XaEGw8IgaJ4g/cDYqyxQWZAgMBAAGjggEUMIIB
+						EDAdBgNVHQ4EFgQUL7mt/WQeUEByCdGzFnowAEsQpIswgeAGA1UdIwSB2DCB1YAU
+						L7mt/WQeUEByCdGzFnowAEsQpIuhgbGkga4wgasxCzAJBgNVBAYTAkdCMRIwEAYD
+						VQQIEwlCZXJrc2hpcmUxEDAOBgNVBAcTB1JlYWRpbmcxGzAZBgNVBAoTElVuaVNl
+						cnZpdHkgTGltaXRlZDEQMA4GA1UECxMHU3VwcG9ydDEgMB4GA1UEAxMXd3d3LnNj
+						aG9vbC1wb3J0YWwuY28udWsxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAdW5pc2Vy
+						dml0eS5jb22CCQDOz4O36/nCijAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
+						A4IBAQCzblIudcBQ05klAftWWLTSxh8cAv7A+3QFGoQOSO7BJocSX/7sBJ2px1Hx
+						vJgTnn2Qm7wy9UQ1dpDrKpgk+3WpB2Fp3OHmqh/fqgvhe9bNYISDy9QIudCLASEJ
+						ThfaFVFpiSAab6qXbDVIbS+Emmbq4oeLuK2vxh0nf5CormNButRnrt8xmdMzg20b
+						ftqs96cb5cQsRLB0yM/qAtKCUZKZEUkCRz4oE/xYVDschoYlk6lh2snACWHtXorV
+						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>
+						MIIE8TCCA9mgAwIBAgIJAM7Pg7fr+cKKMA0GCSqGSIb3DQEBBQUAMIGrMQswCQYD
+						VQQGEwJHQjESMBAGA1UECBMJQmVya3NoaXJlMRAwDgYDVQQHEwdSZWFkaW5nMRsw
+						GQYDVQQKExJVbmlTZXJ2aXR5IExpbWl0ZWQxEDAOBgNVBAsTB1N1cHBvcnQxIDAe
+						BgNVBAMTF3d3dy5zY2hvb2wtcG9ydGFsLmNvLnVrMSUwIwYJKoZIhvcNAQkBFhZz
+						dXBwb3J0QHVuaXNlcnZpdHkuY29tMB4XDTExMDMzMDEzNDgxOVoXDTIxMDMyNzEz
+						NDgxOVowgasxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlCZXJrc2hpcmUxEDAOBgNV
+						BAcTB1JlYWRpbmcxGzAZBgNVBAoTElVuaVNlcnZpdHkgTGltaXRlZDEQMA4GA1UE
+						CxMHU3VwcG9ydDEgMB4GA1UEAxMXd3d3LnNjaG9vbC1wb3J0YWwuY28udWsxJTAj
+						BgkqhkiG9w0BCQEWFnN1cHBvcnRAdW5pc2Vydml0eS5jb20wggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDUMkvx0wIC8biqHJx0WvOa99Lrow43Zks4NSoZ
+						g6SJRJIFuqaxQBt3/PgGj5T9n3psWT3DFJNTgOpIgydqp/+swQ9TTLxcmsX7qCke
+						105z5j2OjV0VySclV2as1B63Aaugyc5lDV4ES3HV1bKbdQbJwQDLYBNbRXqsxciG
+						FdIuec17GOIlEOnM+gcx3z2yq0TCx6aPfyRm/ookHPJua/vtDJPGCHlGd7k/kHhB
+						VVITm1BbtXT6J+dNF7BXkDzH1+CqFHUcIx45MJLu2tyhHOiuYRMs59Ul4N1TIgCa
+						FjOqA8gQtSrd7i15CKgCfyQcH/XaEGw8IgaJ4g/cDYqyxQWZAgMBAAGjggEUMIIB
+						EDAdBgNVHQ4EFgQUL7mt/WQeUEByCdGzFnowAEsQpIswgeAGA1UdIwSB2DCB1YAU
+						L7mt/WQeUEByCdGzFnowAEsQpIuhgbGkga4wgasxCzAJBgNVBAYTAkdCMRIwEAYD
+						VQQIEwlCZXJrc2hpcmUxEDAOBgNVBAcTB1JlYWRpbmcxGzAZBgNVBAoTElVuaVNl
+						cnZpdHkgTGltaXRlZDEQMA4GA1UECxMHU3VwcG9ydDEgMB4GA1UEAxMXd3d3LnNj
+						aG9vbC1wb3J0YWwuY28udWsxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAdW5pc2Vy
+						dml0eS5jb22CCQDOz4O36/nCijAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
+						A4IBAQCzblIudcBQ05klAftWWLTSxh8cAv7A+3QFGoQOSO7BJocSX/7sBJ2px1Hx
+						vJgTnn2Qm7wy9UQ1dpDrKpgk+3WpB2Fp3OHmqh/fqgvhe9bNYISDy9QIudCLASEJ
+						ThfaFVFpiSAab6qXbDVIbS+Emmbq4oeLuK2vxh0nf5CormNButRnrt8xmdMzg20b
+						ftqs96cb5cQsRLB0yM/qAtKCUZKZEUkCRz4oE/xYVDschoYlk6lh2snACWHtXorV
+						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>John</md:GivenName>
+    <md:SurName>Burns</md:SurName>
+    <md:EmailAddress>mailto:john.burns@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
new file mode 100644
index 00000000..14513da8
--- /dev/null
+++ b/swamid-interfederations-2.0/www.sci-ware-customer.com-preprod-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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>
+      <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"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDDCCAfSgAwIBAgIJAPOcCZG4kjBhMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF3NlY3ByZXdlYjEuc2NpLXdhcmUuY29tMB4XDTEzMDkwMzE0MjMyN1oXDTIz
+						MDkwMTE0MjMyN1owIjEgMB4GA1UEAxMXc2VjcHJld2ViMS5zY2ktd2FyZS5jb20w
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3p6apDMPvuzis5U7s2CMe
+						ox+i1ffSlt2ONB0pKnwdOyeAtqZgeiviuTww18icZy7olWYSSSumi0bANS7VJi8n
+						EOI+yGl6kjNf6X33BNyO/B0afgX++d3sx02TlDtuqWqh2Oi67qdQPD/LVKWEB4bM
+						lgK2Yf6Km8cfHl8dkR9Cfblt/AAOV5iE6HZDNiXdKj4suxoxjiOhI9JcDf1gicQB
+						ObXDu+dkfXIlyOI3r8JqOWsqWwW4E5UuJ4+XEIsCjrQAqAj2/NJ+fy6Pr/uAbsVb
+						C4VWPJm4bdThGybNUDr2LGjbmnTLHwVp6yhcSnu7TAACljeltamWLoXD8TBz8doh
+						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3NlY3ByZXdlYjEuc2NpLXdhcmUuY29tMB0G
+						A1UdDgQWBBT94xDOhvG4i9HPxirLA3BO5Dg57DANBgkqhkiG9w0BAQUFAAOCAQEA
+						BVkY4FYZ/6gbtuk/UQnbJnWWELy9vLV29OvrjTCe6QM+F8yFYkWme9LtFulfr9NM
+						XIIavSmKI2RKnn/NLpYP2wDHNs+p+3c4JNJohJc2Dv3w2+MC4LMV/hezXXinGon1
+						VpEJ3oP4n301o56/rGb+8eEFrCaaQlmtuwLfaKcKuW5ZNLNjtNwcPzNJ3GNH43MS
+						SfSvzCcjoVWMmCNm2W8HpheZCgWawg0X02h22WJ6nLYzvdTxaIXHYrMdNl6XV5u5
+						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>
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
new file mode 100644
index 00000000..7fa1ed55
--- /dev/null
+++ b/swamid-interfederations-2.0/www.sci-ware-customer.com-prod-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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>
+      <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"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDEjCCAfqgAwIBAgIJAKlKWUryntpMMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXByaW1lcHJkd2ViMS5zY2ktd2FyZS5jb20wHhcNMTMwOTAzMTExMjEwWhcN
+						MjMwOTAxMTExMjEwWjAkMSIwIAYDVQQDExlwcmltZXByZHdlYjEuc2NpLXdhcmUu
+						Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsbBRJSDJTCy3wMgv
+						6ZrBBI0uezsJcx29t6kW+Qk+5bwEhB8jcYf/LNSpnVs8GKpuxScPxXLOp8PSn0g5
+						smhtTdCc5Ejsluu7SM6vd70o0YkufgCih3qtIKnFVgR++G5s5//uaY/3z6eO47YT
+						av+X9gagf8GlJCums10JcVTNqwmZlsoa9WSaprXOlcBij6zqqWvsv1en37KkE699
+						FEK779lvNleZWW8gK+QpsNSOMcIH2qTDNRHxpWRw61iMay33ec7M3wMivX13VKLV
+						fEbWi7OxG0tRSYQDZtrqDHSTzyJ4h6MexQj9sVrJYftCb7w51tf8l0X6zmMsdFLs
+						ouB8gQIDAQABo0cwRTAkBgNVHREEHTAbghlwcmltZXByZHdlYjEuc2NpLXdhcmUu
+						Y29tMB0GA1UdDgQWBBTCBrpWzU/p3zVsmMp+CJkBA4cuHDANBgkqhkiG9w0BAQUF
+						AAOCAQEAT02NyaYkpI8qwUt1BLp4Papn82/4dQwxz9E9zYTpqBwAUaDrXpC+T62Q
+						8KIq9rAGrefopyxJ8nMFJi+zUlaKKnkE6vCGtHC2isaH5MYa+h6fiLzhEsa3mB9B
+						+K+lrr3EjXiAxcb2/pRVdO85XGSD8mbXyxaB0ZcD4scC32mrccBdLL+jda5KAw7Z
+						IS7teotcfyoewPeFFVjZ98U6FFLguL25Sp5SsJerWsHVv9uDw+4gCoEk0jfOjMQU
+						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>
diff --git a/swamid-interfederations-2.0/www.scl.org-shibboleth.xml b/swamid-interfederations-2.0/www.scl.org-shibboleth.xml
new file mode 100644
index 00000000..48b73cb2
--- /dev/null
+++ b/swamid-interfederations-2.0/www.scl.org-shibboleth.xml
@@ -0,0 +1,67 @@
+<?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>
+      <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>
+						MIIDJjCCAg4CCQDUnjO6ZKGpPDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJH
+						QjEQMA4GA1UECBMHRW5nbGFuZDEQMA4GA1UEBxMHQnJpc3RvbDEMMAoGA1UEChMD
+						U0NMMRQwEgYDVQQDEwt3d3cuc2NsLm9yZzAeFw0xMTA0MTMxMTQ2MTVaFw0yMTA0
+						MTAxMTQ2MTVaMFUxCzAJBgNVBAYTAkdCMRAwDgYDVQQIEwdFbmdsYW5kMRAwDgYD
+						VQQHEwdCcmlzdG9sMQwwCgYDVQQKEwNTQ0wxFDASBgNVBAMTC3d3dy5zY2wub3Jn
+						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy3dMA/CF2Urq/i+ITSiF
+						5jnIrgtLvWkm3xwb2qSsuTtbREzkbKpyMbYLUinmowJHWMRqLtVpuZrhouxrJdrb
+						++TPoMnI4AZkyGTVEij9sBhfJEjh67ce2V+KEzk1G0DYcvZVdKQHptybQ/pUzsCg
+						AeZDy1K+BcOnR31ANzEFsmY6s1RnMmclyekup5E9Fhm81QlMCfJH9BJMVU1reXyq
+						ivgG7CTGnR5joHzZvPmVJyChkLh2SkKB8nvn2mguhqnZD5uTJnPoal7oP01vsW8h
+						l+akEPSBilIDnrJuxpzCyeedcgkqck2J2035aQg0bgglpjv8lK0LJqEnJMWJ/LjQ
+						bwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCgCVwrXMMUZ1krLhkXm24HjiM1ZUVZ
+						5PM5Q2XAE7ZEwFbJRf41TZlkv1l0lStZgXArERXLS7oBxVSlieyMLT67fFmezsUb
+						VrM/Jekt4AwnyayDocZxwVhxyy7YgJXx1RZld+2ErfuOHLD1HVdZK/3EEhIkL1w3
+						ptnBXke5XaL9tBl8LoFG2XyUgf2vRq9GFxp1wyWcgzU+KVvUBnPeG0M0KdyY8NOt
+						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>
diff --git a/swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..88d39ea1
--- /dev/null
+++ b/swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml
@@ -0,0 +1,132 @@
+<?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>
+      <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>
+						MIIEpzCCA4+gAwIBAgIJAJr9uyuwy/Y2MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEP
+						MA0GA1UEChMGUkNBSE1TMQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jh
+						bi5hYy51azEkMCIGCSqGSIb3DQEJARYVd2ViYWRtaW5zQHNjcmFuLmFjLnVrMB4X
+						DTEwMDIyMjExNDU1OVoXDTIwMDIyMDExNDU1OVowgZMxCzAJBgNVBAYTAkdCMREw
+						DwYDVQQIEwhTY290bGFuZDESMBAGA1UEBxMJRWRpbmJ1cmdoMQ8wDQYDVQQKEwZS
+						Q0FITVMxDjAMBgNVBAsTBVNjcmFuMRYwFAYDVQQDDA0qLnNjcmFuLmFjLnVrMSQw
+						IgYJKoZIhvcNAQkBFhV3ZWJhZG1pbnNAc2NyYW4uYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDEywuow7F7KjwlfTa4vj/2QWvtexIy+OO0hWvn
+						SJ8B3goDjqaC7Mv1fNJdxtZMl/kR6ZfMT86Xa2VfK47NOe14jJDgZxN/0lbwsLwb
+						GyyxcZeDg0NCcv/jFKUiH6m2jSLkpSrSTHuUqRUhGpR0wcr3+HZjLZrpHI0FQ5EH
+						cnkhg1fYwZ5Z6vth+0NhZt9HjWLrUtia4Bj0orj0MkUAKlGEBudrPsC/OITO9oUp
+						pXV0PBi0hILJdbgeJXDFhxfcEpCczQlQgdx/KWD6q/6nSOmT9hNGMjkiprn/w/q1
+						SsAMRqSfrWrR6q8hWTkWmNsm/c39bJFuMvkfkiOgvvBVqE3nAgMBAAGjgfswgfgw
+						HQYDVR0OBBYEFG8UIQ7Hc9WHtlS6PKYYP/7RWNcrMIHIBgNVHSMEgcAwgb2AFG8U
+						IQ7Hc9WHtlS6PKYYP/7RWNcroYGZpIGWMIGTMQswCQYDVQQGEwJHQjERMA8GA1UE
+						CBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEPMA0GA1UEChMGUkNBSE1T
+						MQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jhbi5hYy51azEkMCIGCSqG
+						SIb3DQEJARYVd2ViYWRtaW5zQHNjcmFuLmFjLnVrggkAmv27K7DL9jYwDAYDVR0T
+						BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAWSSnSaVz28lDBISUNRmNJFwKvjo5
+						nC4+WM7h6Tg9QbC/EYNCwkH7bOoEcCJs28jn0EwRfn4GUgc1LFkf9UYc3rJ+mihD
+						+RZDHjaJSZDbQgZI55y8dpuYT8r70rCg+xtq1Iwv0NzcM+Q/3cEeiMlIXY6YFAAA
+						Dsp1/4NlItMUs6ZwAyMLjyIlSjIHjTVLI2bRTDlY4nUgZhqz4spvqDtnmq7PERUN
+						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>
diff --git a/swamid-interfederations-2.0/www.sdeo.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.sdeo.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..839a3d15
--- /dev/null
+++ b/swamid-interfederations-2.0/www.sdeo.ac.uk-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIC8TCCAdmgAwIBAgIJAPNguqNnSFj+MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+						BAMTDnd3dy5zZGVvLmFjLnVrMB4XDTE0MDgxNDE0MzMzMVoXDTI0MDgxMTE0MzMz
+						MVowGTEXMBUGA1UEAxMOd3d3LnNkZW8uYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQC8jVkdArAQ8ngJOd4S1c7ChUaYBpxSv4MwhugEoyFjHqC8
+						tzhQHYHQEgCY5WxqnNaVExWXVqKPaQxgHtDQbiKU019yOYlpXK3+FfCjLBgEMDni
+						MUrUAhBaOQlIdkbfXSq5dRfDx3KjRmXbeuhKfC/pHSLJ1Fer0c8r7z6zN6iXgzsI
+						5iVQL5lPJvCeBh6Af/fbp2FHkmIAqctN8yQfpfskCMugxebH1sUa/nvrVJtf8fqQ
+						DAZrmF5foRy7pENW0bPvdZDhH2nL0O4Qw6mNO8n1b438vS4fiYuXEU/bE4cp9YuZ
+						9MqDdXhHT2LvqqBmVLAHV85Xos/1W6NHXxoK9XpzAgMBAAGjPDA6MBkGA1UdEQQS
+						MBCCDnd3dy5zZGVvLmFjLnVrMB0GA1UdDgQWBBR6m5nWMYxvlH0uKtTjMCJOFX9B
+						+jANBgkqhkiG9w0BAQUFAAOCAQEAgTX3B7chPGaD1758ssHPw7v5HzwtV4KUzM5t
+						a3UvzNYQoSlipXieO2ySckD66K/UM7i3ORF5TJW/2xzo54yKBaZDg/mTZGp3v0tv
+						Z4qvT5tlbygizHMz+Cdh8Ete8uBbRIG87Sr7GaR8ZMRNjaz7v3mqgKB6zUBdjjWx
+						L2+UFp82CgxFjkZDWabONQV+bRRku0wBsRYqikrarLzcV7wS0EM4Li3LVAyj2P9e
+						+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>
diff --git a/swamid-interfederations-2.0/www.service4mobility.com-europe.xml b/swamid-interfederations-2.0/www.service4mobility.com-europe.xml
new file mode 100644
index 00000000..9faff5a4
--- /dev/null
+++ b/swamid-interfederations-2.0/www.service4mobility.com-europe.xml
@@ -0,0 +1,129 @@
+<?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>
+      <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>
+						MIIFtDCCBJygAwIBAgIQJF23Zp+qyEMZ5HUvD3iMRDANBgkqhkiG9w0BAQUFADCB
+						vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
+						VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
+						DTEyMDQxNzAwMDAwMFoXDTE4MDQxMTIzNTk1OVowgbcxCzAJBgNVBAYTAkFUMQ8w
+						DQYDVQQIEwZWaWVubmExDzANBgNVBAcUBlZpZW5uYTEuMCwGA1UEChQlU09QIEhp
+						bG1iYXVlciAmIE1hdWJlcmdlciBHbWJIICYgQ29LRzEzMDEGA1UECxQqVGVybXMg
+						b2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MSEwHwYDVQQDFBh3
+						d3cuc2VydmljZTRtb2JpbGl0eS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQDImV6SV6GEilkTyCyeQyTBxPHlsbldKUPfLNpaAiyPBNZ0J5R9kC8q
+						c+RG5tKxNRgcuEz3s2SIghle8MSEhjtaGOYf/XVAHKnNGaPRvxFa9AOlxa2xBUXP
+						k9NIh1G0Zx/GBcKY0BHVv1898c3LlMAWjYHO4XWzjvtn4YYXM8m3m5gURinNLKev
+						sVdchBYmaV+IWwpBRyx7KDEdiE94ibHbdf8IrP6hndX4HI1JWz8MdxQzHIVvASck
+						m+jzQhSFuBx4GXDqmPFPfM58nrWBSJDcrOlf8a2WzfBYUJZNECttBK+9F4ORzn9y
+						siQdBeUEEca0zdP8A9KfWnDUIQ9T6FlvAgMBAAGjggGzMIIBrzAJBgNVHRMEAjAA
+						MAsGA1UdDwQEAwIFoDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYIKwYB
+						BQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwQQYDVR0fBDowODA2
+						oDSgMoYwaHR0cDovL1NWUkludGwtRzMtY3JsLnZlcmlzaWduLmNvbS9TVlJJbnRs
+						RzMuY3JsMCgGA1UdJQQhMB8GCCsGAQUFBwMBBggrBgEFBQcDAgYJYIZIAYb4QgQB
+						MHIGCCsGAQUFBwEBBGYwZDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNp
+						Z24uY29tMDwGCCsGAQUFBzAChjBodHRwOi8vU1ZSSW50bC1HMy1haWEudmVyaXNp
+						Z24uY29tL1NWUkludGxHMy5jZXIwbgYIKwYBBQUHAQwEYjBgoV6gXDBaMFgwVhYJ
+						aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUS2u5KJYGDLvQUjibKaxLB4shBRgwJhYk
+						aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nbzEuZ2lmMA0GCSqGSIb3DQEB
+						BQUAA4IBAQAJgRv/2HJ0856/SkHlepMDyAnrr/uRF2LIRwONAAV2V0vt7dW0Te4e
+						fvUtR/npPPcERdO5rZ729xswY/7uE2ZsK21PVqF+QMKSSTXcoFLe+47KcWaao2+U
+						r9NQ4KIwJcbCqeXfTLqYq7Dxfn1UWBa6xMPflPZhYIevuF26t/nzgQLcmF4olosN
+						qGTo2CaqSN1Cj9Bjydh74BUcamnmNdUFrQ0pU/29XMEFMtacoN8ohvXcwEn2oCB5
+						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>
+						MIIFtDCCBJygAwIBAgIQJF23Zp+qyEMZ5HUvD3iMRDANBgkqhkiG9w0BAQUFADCB
+						vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
+						VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
+						DTEyMDQxNzAwMDAwMFoXDTE4MDQxMTIzNTk1OVowgbcxCzAJBgNVBAYTAkFUMQ8w
+						DQYDVQQIEwZWaWVubmExDzANBgNVBAcUBlZpZW5uYTEuMCwGA1UEChQlU09QIEhp
+						bG1iYXVlciAmIE1hdWJlcmdlciBHbWJIICYgQ29LRzEzMDEGA1UECxQqVGVybXMg
+						b2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MSEwHwYDVQQDFBh3
+						d3cuc2VydmljZTRtb2JpbGl0eS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQDImV6SV6GEilkTyCyeQyTBxPHlsbldKUPfLNpaAiyPBNZ0J5R9kC8q
+						c+RG5tKxNRgcuEz3s2SIghle8MSEhjtaGOYf/XVAHKnNGaPRvxFa9AOlxa2xBUXP
+						k9NIh1G0Zx/GBcKY0BHVv1898c3LlMAWjYHO4XWzjvtn4YYXM8m3m5gURinNLKev
+						sVdchBYmaV+IWwpBRyx7KDEdiE94ibHbdf8IrP6hndX4HI1JWz8MdxQzHIVvASck
+						m+jzQhSFuBx4GXDqmPFPfM58nrWBSJDcrOlf8a2WzfBYUJZNECttBK+9F4ORzn9y
+						siQdBeUEEca0zdP8A9KfWnDUIQ9T6FlvAgMBAAGjggGzMIIBrzAJBgNVHRMEAjAA
+						MAsGA1UdDwQEAwIFoDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYIKwYB
+						BQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwQQYDVR0fBDowODA2
+						oDSgMoYwaHR0cDovL1NWUkludGwtRzMtY3JsLnZlcmlzaWduLmNvbS9TVlJJbnRs
+						RzMuY3JsMCgGA1UdJQQhMB8GCCsGAQUFBwMBBggrBgEFBQcDAgYJYIZIAYb4QgQB
+						MHIGCCsGAQUFBwEBBGYwZDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNp
+						Z24uY29tMDwGCCsGAQUFBzAChjBodHRwOi8vU1ZSSW50bC1HMy1haWEudmVyaXNp
+						Z24uY29tL1NWUkludGxHMy5jZXIwbgYIKwYBBQUHAQwEYjBgoV6gXDBaMFgwVhYJ
+						aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUS2u5KJYGDLvQUjibKaxLB4shBRgwJhYk
+						aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nbzEuZ2lmMA0GCSqGSIb3DQEB
+						BQUAA4IBAQAJgRv/2HJ0856/SkHlepMDyAnrr/uRF2LIRwONAAV2V0vt7dW0Te4e
+						fvUtR/npPPcERdO5rZ729xswY/7uE2ZsK21PVqF+QMKSSTXcoFLe+47KcWaao2+U
+						r9NQ4KIwJcbCqeXfTLqYq7Dxfn1UWBa6xMPflPZhYIevuF26t/nzgQLcmF4olosN
+						qGTo2CaqSN1Cj9Bjydh74BUcamnmNdUFrQ0pU/29XMEFMtacoN8ohvXcwEn2oCB5
+						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>
diff --git a/swamid-interfederations-2.0/www.sgsu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.sgsu.org.uk-shibboleth.xml
new file mode 100644
index 00000000..dfe9db47
--- /dev/null
+++ b/swamid-interfederations-2.0/www.sgsu.org.uk-shibboleth.xml
@@ -0,0 +1,65 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.solentsu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.solentsu.co.uk-shibboleth.xml
new file mode 100644
index 00000000..cb2287c7
--- /dev/null
+++ b/swamid-interfederations-2.0/www.solentsu.co.uk-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
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
new file mode 100644
index 00000000..a45377ab
--- /dev/null
+++ b/swamid-interfederations-2.0/www.sso.uni-erlangen.de-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,149 @@
+<?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>
+      <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: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
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4xKDAmBgNV
+BAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxDTALBgNVBAsTBFJS
+WkUxDzANBgNVBAMTBkZBVS1DQTEmMCQGCSqGSIb3DQEJARYXY2FAcnJ6ZS51bmkt
+ZXJsYW5nZW4uZGUwHhcNMTQxMjAzMTA0NTI4WhcNMTkwNzA5MjM1OTAwWjCBgzEL
+MAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4x
+KDAmBgNVBAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxDTALBgNV
+BAsTBFJSWkUxFzAVBgNVBAMTDnd3dy5zc28uZmF1LmRlMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEArDMkYLXoej9jjWq+K4hCcm8dRgyxbpMQevfdKBhp
+ipHjFPs9xphbtYyVUY/y7b+3NpnQ7rTxR8OX8js4/P9faTW2lUN3L3a8X0cGm7h/
+LyHC9tPZSbsSosJXZ8ws7UebzpNSo0EtykmQcpLifPh0VazcZ1EIu1xbG3mqLTs6
+Zz0YEyhHxhBPAi3rsl3mUPLOi7wv97fRkkfWvMdg4oENeqbpqEg0uIlJIBo/DTNP
+lVumxsv5GyKLC87mfGerdnNB0FUVDOortb279XaQnIdhWFZLtvUNls6jpkLX424Z
+V2TqL8jvGnbSIFw23qFVQJoh4ZphEefP9dgpU04gBQ2r7hbV5hvEyPE2u1iGvS0w
+EstLcZZEAYiz3cKsf/u6vfO44Y8aO9cisrOlF7W8wlVT6unagdZMMue+dEiLYoX0
+4CNgcyHYAxEmZdzsfXBNGeLLsHgI05DL4uejCtE99mCigGUHUnzCJtosz13zpnt0
+l0A/6iXa3NLydrjN+t2RNnI1Y07MzN0TUiF6G28gzzM2Km/dmdQePeCepjpIwE/4
+jPckWX4RhGxyWtr8ttjRGW3+aSpoQRolGEmMu/I7Kk4kOT/P8EReHtQ7ItG7yGez
+e1Bl6SweY7mqlcx7ioXjnPqTyl0yQSTth+LftyMnA57BaQ3bJoTCxiPoUMe2dx4K
+y68CAwEAAaOCAy4wggMqME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMDMBEG
+DysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiwe
+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0G
+A1UdDgQWBBRZl7XWoTH9fNNalFv7PVzbARELxDAfBgNVHSMEGDAWgBT0c/P6xkKz
+xlxpwFi+dDj5YSuOYjCB1wYDVR0RBIHPMIHMgg1vcGVuaWQuZmF1LmRlgg9vcGVu
+aWQucnJ6ZS5uZXSCHnNzby1wcm94eS5ycnplLnVuaS1lcmxhbmdlbi5kZYIKc3Nv
+LmZhdS5kZYIYc3NvLnJyemUudW5pLWVybGFuZ2VuLmRlghNzc28udW5pLWVybGFu
+Z2VuLmRlghF3d3cub3BlbmlkLmZhdS5kZYITd3d3Lm9wZW5pZC5ycnplLm5ldIIO
+d3d3LnNzby5mYXUuZGWCF3d3dy5zc28udW5pLWVybGFuZ2VuLmRlMIGfBgNVHR8E
+gZcwgZQwSKBGoESGQmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWVybGFuZ2Vu
+LW51ZXJuYmVyZy1jYS9wdWIvY3JsL2NhY3JsLmNybDBIoEagRIZCaHR0cDovL2Nk
+cDIucGNhLmRmbi5kZS91bmktZXJsYW5nZW4tbnVlcm5iZXJnLWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMIHtBggrBgEFBQcBAQSB4DCB3TAzBggrBgEFBQcwAYYnaHR0cDov
+L29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMFIGCCsGAQUFBzAChkZo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1lcmxhbmdlbi1udWVybmJlcmctY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MFIGCCsGAQUFBzAChkZodHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL3VuaS1lcmxhbmdlbi1udWVybmJlcmctY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQB/I2I90bVOWDyl0KBKFhUTE3Pe
+lYO7R1fbNDz31MfFPBf3R8cKQmWOmRZbR3xGtsyEox1DxXF/TEJvMVtTADsWSfn9
+8T+wbXXObBC4weNWiEgw6QTAIyV+etFrl34ah7bAeEVRTbgjMUGw2pI8inQ3lmwI
+2hBS1hczWlpjZGLsmaWECo4WOEDmfE0Y/DvJM92Ha5zwrcYMSv67UgRRB1BuiYzX
+OJTEVIhCG9C3vx/ua306YZX12QHrPtyUEMJcYqkP2hloKY/iJCaLXCBwcBv9OYPl
+pEpqprRECWq3dNLXmUBnqHCsiPa4TY2gVssAlQcmsasBj7ieuhFktDD/Y0vP
+</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>www.sso.fau.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.sso.fau.de,OU=Regionales Rechenzentrum Erlangen (RRZE),O=Universitaet Erlangen-Nuernberg,L=Erlangen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIHCTCCBfGgAwIBAgIHFVh6d4xjCjANBgkqhkiG9w0BAQUFADCBozELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4xKDAmBgNV
+BAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxDTALBgNVBAsTBFJS
+WkUxDzANBgNVBAMTBkZBVS1DQTEmMCQGCSqGSIb3DQEJARYXY2FAcnJ6ZS51bmkt
+ZXJsYW5nZW4uZGUwHhcNMTMwMzA3MjA0NzM2WhcNMTgwMzA2MjA0NzM2WjCBpzEL
+MAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4x
+KDAmBgNVBAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxMTAvBgNV
+BAsTKFJlZ2lvbmFsZXMgUmVjaGVuemVudHJ1bSBFcmxhbmdlbiAoUlJaRSkxFzAV
+BgNVBAMTDnd3dy5zc28uZmF1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAs/qsX/p+z8uxh3feD2sZWdb/NpOI5/YkPeXYQPQAdlRKBijHLohlLRAz
+CNFU7YWhy/FxY4uLE97h0hPVpoxCPlOW5qh56C1ZEWGBdhJImfYpzJbB2UIIUUR2
+WXLjZPyQObzxocui2M3XWa/uhpc3nPvBC/HLzr4fbU0f20D9hr0MXFurfuhGID+j
+t1jRsVWTjMWEVDAXDduKYUCAqrp1RlSc/H6z4WFeiQ92+4Q/+axig6KRkg0e0LBh
+MDA3ozIODmfFDIuo++rGvHWG47GLbLQyJLLeGkPlxxqo8uvVhtENxd5jrIkZrRd8
+y+dFr+jRh36DMmJGTzVkeweZPT2ZpQIDAQABo4IDOjCCAzYwOQYDVR0gBDIwMDAR
+Bg8rBgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
+BQUHAwEwHQYDVR0OBBYEFGL4MCMuRKr8cD0oslgL7QGRYj+uMB8GA1UdIwQYMBaA
+FPRz8/rGQrPGXGnAWL50OPlhK45iMIHvBgNVHREEgecwgeSCDW9wZW5pZC5mYXUu
+ZGWCD29wZW5pZC5ycnplLm5ldIIec3NvLXByb3h5LnJyemUudW5pLWVybGFuZ2Vu
+LmRlggpzc28uZmF1LmRlghhzc28ucnJ6ZS51bmktZXJsYW5nZW4uZGWCE3Nzby51
+bmktZXJsYW5nZW4uZGWCEXd3dy5vcGVuaWQuZmF1LmRlghN3d3cub3BlbmlkLnJy
+emUubmV0gg53d3cuc3NvLmZhdS5kZYIXd3d3LnNzby51bmktZXJsYW5nZW4uZGWB
+FnNzby1hZG1pbnNAcnJ6ZS5mYXUuZGUwgZ8GA1UdHwSBlzCBlDBIoEagRIZCaHR0
+cDovL2NkcDEucGNhLmRmbi5kZS91bmktZXJsYW5nZW4tbnVlcm5iZXJnLWNhL3B1
+Yi9jcmwvY2FjcmwuY3JsMEigRqBEhkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
+aS1lcmxhbmdlbi1udWVybmJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwge0GCCsG
+AQUFBwEBBIHgMIHdMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
+L09DU1AtU2VydmVyL09DU1AwUgYIKwYBBQUHMAKGRmh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvdW5pLWVybGFuZ2VuLW51ZXJuYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwUgYIKwYBBQUHMAKGRmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWVy
+bGFuZ2VuLW51ZXJuYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
+hvcNAQEFBQADggEBALIsNWnuaDrQA7Tu1ReusFhrkdOKpIH90mMWOBXZoUTPxEaK
+n86rjUAoFj1u1NlWyUrMYRWneXlvy3jQ3KEo7H6nJiEoa7LH1siTNcmOjDiN1dqA
+PO6+zAiESP5Xwsr2D1msyPXade0ra2PFSeG4XZ6hF/KEEYN0xxFpPbrvBD/fa+MU
+fp8NqxF7uANosdABgJs9RFmEmGuWd/Rc3aGzd3+dGwh9nFnKxON9fTrOlXNxa9Og
+jO0N75bg2RQTXLaMZLlUoVGE7n6FljoKjyiXlvUBSSeErakYPLpvgolN6QwAkM2j
+c/GLdms9imUWk7YQ8hzH7aUxdRWOmXLmc+2n/lY=
+</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: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.sss.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.sss.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..283b9463
--- /dev/null
+++ b/swamid-interfederations-2.0/www.sss.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,82 @@
+<?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.sss.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="2013-02-01T16:42: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sss.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>
+						MIIDCTCCAfGgAwIBAgIJAOH4G+VuojucMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHd3dy5zc3Mub3guYWMudWswHhcNMTMwMTMxMTYyODE2WhcNMjMwMTI5MTYy
+						ODE2WjAbMRkwFwYDVQQDExB3d3cuc3NzLm94LmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAvBi0PwHPy7hLbzkt71L0SiFqPitwDSfQ2ZlL2YXk
+						dmulWfUgojJEo6H0b3eM9tUA8P1IADnKOKjmNeKAa9HqE4kfB1lzYS9iV/4i2dis
+						Zg3tqITFjaxhZ+2x5Jhr/tuqU568K9Dz3US9tVWQqNg+W/Wve1YGPYlv4e8UNVtl
+						TBYMV5Dv6Cftnq4HdmhSirng5v/wQGTNREjfoiUHmD8ZZ6YwyAqpTlRCLQy1mNxT
+						p7i/vpe+i35GoMITpH8ZKIVrJEXJKYA3npF0tdiPgd4We+Rn//yHDTWU1cltZ1It
+						9gqnsWN5dldcKMWGRKhd2M0hzPZTUGrV94AAOQhgc3WoUQIDAQABo1AwTjAtBgNV
+						HREEJjAkghB3d3cuc3NzLm94LmFjLnVrhhB3d3cuc3NzLm94LmFjLnVrMB0GA1Ud
+						DgQWBBQLYrqBm6zLEN3bNXHxocMiBRr9LTANBgkqhkiG9w0BAQUFAAOCAQEAHK7z
+						mWgHDjQm7w7dXEQyeXEJ8xVW34UrSsZgt7uBy+1nxpbHzb09aNYUObfIvgRpAt1W
+						6Z67i2Jzjq4DqWeL2NpsCEgDm3eNO++Aw/uypNiA2PaVmXU//6m9uXIm+Chuq4Qy
+						yD58hcy/W1nJ+EVYraWzY/a4nD6gujQgGttu6z5a8icIIAVOO1ipa47r1YbLo5y+
+						m7NxcUKdhMANsSxVES4L9S/an+hztldZtSxCePBBcOOcRTFKpmbw2OFp384pjD5Y
+						ECbSLCxnYuKCLtM99vOqVoSZrLvYURsFu7Xe6KH1rMwliAoPsuPQf9pZDhROoCYF
+						oK7HZPfIVarlAW4SnQ==
+					</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.sss.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sss.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://www.sss.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://www.sss.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sss.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sss.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sss.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 - ESD Live Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jason</md:GivenName>
+    <md:SurName>Harris</md:SurName>
+    <md:EmailAddress>mailto:Jason.Harris@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.staffsubs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.staffsubs.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..389fb9f6
--- /dev/null
+++ b/swamid-interfederations-2.0/www.staffsubs.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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.staffsubs.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="2014-10-02T11:30: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.staffsubs.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>
+						MIIDCTCCAfGgAwIBAgIJAOFx/II0dT0qMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnd3dy5zdGFmZnN1YnMub3guYWMudWswHhcNMTQxMDAxMTI1MjE1WhcNMjQw
+						OTI4MTI1MjE1WjAhMR8wHQYDVQQDExZ3d3cuc3RhZmZzdWJzLm94LmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4HVi9g+ykcr2sPcI0wScBuFR
+						4u+dx+t043JTIIz0GoGUFCDGRvPkuFqWDdEXaqCCHn5fgQ+OV6a2N3WbJSorJvsA
+						1YOcwVyFew2CwWZmU4t6hlCrZObbhmdCBePXPBv06qge/3b6GviwaBINpEvuq8id
+						sENNJVikDLJvGu8sDTc5qHEvGF5dGVHN6xYePwcDkuEha5gcgNa9SZERPY0tgM3N
+						GbwO4+Vd1Jxz2G+UDKIaFjC/j6E47OWMNmy+gwUhZdIeYF0Z04GtLG5M/0dmgtqv
+						4tfTmMbDNRPQPrTW+0Y/OtmnG00KQWxq49syCsEAkpLIQ5TdJDobdVHbf0CWJwID
+						AQABo0QwQjAhBgNVHREEGjAYghZ3d3cuc3RhZmZzdWJzLm94LmFjLnVrMB0GA1Ud
+						DgQWBBRPsi6qZ3/pP7C2K53aj3dcsZ8cuDANBgkqhkiG9w0BAQUFAAOCAQEAl9gw
+						cJLhHS2jZkeys6V1MjVahhJ0yzwR2f/ZxljqMlDE+EVsFdYvZHqc9GyKy9aLUIi+
+						wLnw9yZzLKUoV9Nj++so6/XW+gLb704S/bFY7/gFK1xB7/dVqwFIswBJE8gQbrrk
+						jJ7xitSTzwe5JLUdsykCp9ydPOJN6a1O81zUnyFTzhdkqvjcm7+dow3hJ+LlVjLv
+						ntGwu12fmBeGSRaM2pBXjOScD2Je9kMCRMDpfBFkpOnRLiVAYfzyHmCkEBgGTeYG
+						mVFHI2Wocap0++wO3hcdrzQMUjLdo9vamBIGERZTpOZ1gYAnF645dq2kceKt7pI6
+						oHBipfiT+f27wP8VHQ==
+					</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.staffsubs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.staffsubs.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://www.staffsubs.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://www.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.staffsubs.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 Staff Subscriptions Site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ops Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rob</md:GivenName>
+    <md:SurName>Hebron</md:SurName>
+    <md:EmailAddress>mailto:rob.hebron@it.ox.ac.uk</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
new file mode 100644
index 00000000..c0dfc22f
--- /dev/null
+++ b/swamid-interfederations-2.0/www.sthelenslife.net-shibboleth-sp.xml
@@ -0,0 +1,58 @@
+<?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>
+      <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>
+						MIIDLDCCAhSgAwIBAgIJAMzAs1ASwVMDMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFHd3dy5zdGhlbGVuc2xpZmUubmV0MB4XDTExMDgzMTEzMTk0M1oXDTIxMDgy
+						ODEzMTk0M1owHzEdMBsGA1UEAxMUd3d3LnN0aGVsZW5zbGlmZS5uZXQwggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDsKV5eWwWRG6z8eVRrTLoDtZcSftHI
+						BYUX13hrU8cE1IofG58fDeoJhwJY0joxnnpwNQZGNolX0EIIjNNbW9CSckPwJxSl
+						RTHXK2J6R4PjMePxLNAetK9V0oxC0PMz28n30N6iyP/LyYr9+rdYyLElQawtM2ZN
+						2U7erDr215gP7GDd6sqWmp+s6hKhHdjLFbCLBgTOlCFVMiz17x4Z0DbemQZsbmja
+						j7YdIcVeqTNLludEKIcg5Hl7XXyXbiAyBnlK1S0ljW89+2b6g9Kr2aVNBg3hRi6O
+						Tdru8W+kbkvU5JxGK7hOSZZtRiZi9YO9wcbsuQh43mVfyyTS6+4TQsd3AgMBAAGj
+						azBpMEgGA1UdEQRBMD+CFHd3dy5zdGhlbGVuc2xpZmUubmV0hidodHRwczovL3d3
+						dy5zdGhlbGVuc2xpZmUubmV0L3NoaWJib2xldGgwHQYDVR0OBBYEFHcQZY+V9asV
+						5kkMf9gJVci4/nK4MA0GCSqGSIb3DQEBBQUAA4IBAQDjzLkEqEVDhilutvybAtkZ
+						QaO++l/AlDpB8Bb4E2EdeKxIFXRxWoRmPT4SFtbKlGRMG6Pw9hpC6ujw9s+oNq2E
+						GRnGRT44qUcd3YpUdjS2puF13vtqY7q+dWgMk2WzI+5v+I8DckPo0j603F9rlGgR
+						WUT2yIvdX+m/AEMeWowT5qYfv0Qdmf7dWrn/H4ITlUb8Rw10DtFL5aWSEu+lVK0E
+						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>John</md:GivenName>
+    <md:SurName>Burns</md:SurName>
+    <md:EmailAddress>mailto:john.burns@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
new file mode 100644
index 00000000..ee817ba6
--- /dev/null
+++ b/swamid-interfederations-2.0/www.stirlingstudentsunion.com-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.studentsystem.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.studentsystem.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..d9b8aac8
--- /dev/null
+++ b/swamid-interfederations-2.0/www.studentsystem.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,114 @@
+<?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.studentsystem.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.studentsystem.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>
+						MIIFkjCCBHqgAwIBAgIJAKjDVvtOMyd+MA0GCSqGSIb3DQEBBQUAMIHSMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
+						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
+						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEjMCEGA1UEAxMad3d3LnN0dWRlbnRzeXN0
+						ZW0ub3guYWMudWsxLzAtBgkqhkiG9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFk
+						bWluLm94LmFjLnVrMB4XDTEyMDMwNTEyMjM0M1oXDTIyMDMwMzEyMjM0M1owgdIx
+						CzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hm
+						b3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVz
+						aW5lc3MgU2VydmljZXMgYW5kIFByb2plY3RzMSMwIQYDVQQDExp3d3cuc3R1ZGVu
+						dHN5c3RlbS5veC5hYy51azEvMC0GCSqGSIb3DQEJARYgb3BzLXRlYW1AbWFpbGxp
+						c3QuYWRtaW4ub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDqNGg54tTuSJwAJ11jkiN+ZGQPPTfw0akmyDLZsr8J4bg9VWMVdGGELR5mSG2O
+						bKtei9yazwqLJMKdJb7AQqDq+fXnYiuMyIU1mnogwCS2abLZ1kvpdx2ajH2A58XG
+						wt4F/JvZ8tgDYeU7zAydlZKqkYaSKmg+rEJBVqi60OZAkj1Tlvvv+NcfzK3S9hBR
+						5yrCaV9ShoakUhJijyke3nsI1dRcAh8WZQCLvItQGAPilp2TmLLH+4wZRH/xV6yE
+						0/hWHUr+AO1CuqgDRQnlWfEQWhpaGZTK2eMZsquXNibKeXG7+HQN8nvNwhK1QSCg
+						cEGDGmMjqmm0yEDM7QNfnoSJAgMBAAGjggFnMIIBYzAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQUhUt5A5DKRLfeRmp3FQO28O07HfEwggEHBgNVHSMEgf8wgfyAFIVLeQOQykS3
+						3kZqdxUDtvDtOx3xoYHYpIHVMIHSMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hm
+						b3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5pdmVyc2l0eSBv
+						ZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNlcnZpY2VzIGFuZCBQcm9qZWN0
+						czEjMCEGA1UEAxMad3d3LnN0dWRlbnRzeXN0ZW0ub3guYWMudWsxLzAtBgkqhkiG
+						9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFkbWluLm94LmFjLnVrggkAqMNW+04z
+						J34wDQYJKoZIhvcNAQEFBQADggEBALnfPqYUF7KMTz7xRgBQYykNhHilX/aoSBjQ
+						Fweaw6/bFUenm2ItcyLvbQav+XHfw3/EEGeY9XaJnNr4LK+eCnYwsbZi+1+4QpNy
+						orLL5umOjbfCd3INB6RQ6AMduzgMR+gHlw1WiORMnux9mybEjV5TFs80xNe9meTh
+						7Eyn+gf1wrtDfgEg5H4S69o0DDyMPnHu1EhdFb3Ombbwdmhpf+DwGktSl/XTaequ
+						duJB3GIBnEwBv2PsZtWslTqJNWyQSdBpSr3kuxbwjiFZ9Oy7YWb5CuqA1APETfHW
+						d5gNVy5VMpjKL6KHcDbZovZtIcJxUbNbXuBBO1DW6DZUJc22Fao=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFkjCCBHqgAwIBAgIJAKjDVvtOMyd+MA0GCSqGSIb3DQEBBQUAMIHSMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
+						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
+						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEjMCEGA1UEAxMad3d3LnN0dWRlbnRzeXN0
+						ZW0ub3guYWMudWsxLzAtBgkqhkiG9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFk
+						bWluLm94LmFjLnVrMB4XDTEyMDMwNTEyMjM0M1oXDTIyMDMwMzEyMjM0M1owgdIx
+						CzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hm
+						b3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVz
+						aW5lc3MgU2VydmljZXMgYW5kIFByb2plY3RzMSMwIQYDVQQDExp3d3cuc3R1ZGVu
+						dHN5c3RlbS5veC5hYy51azEvMC0GCSqGSIb3DQEJARYgb3BzLXRlYW1AbWFpbGxp
+						c3QuYWRtaW4ub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDqNGg54tTuSJwAJ11jkiN+ZGQPPTfw0akmyDLZsr8J4bg9VWMVdGGELR5mSG2O
+						bKtei9yazwqLJMKdJb7AQqDq+fXnYiuMyIU1mnogwCS2abLZ1kvpdx2ajH2A58XG
+						wt4F/JvZ8tgDYeU7zAydlZKqkYaSKmg+rEJBVqi60OZAkj1Tlvvv+NcfzK3S9hBR
+						5yrCaV9ShoakUhJijyke3nsI1dRcAh8WZQCLvItQGAPilp2TmLLH+4wZRH/xV6yE
+						0/hWHUr+AO1CuqgDRQnlWfEQWhpaGZTK2eMZsquXNibKeXG7+HQN8nvNwhK1QSCg
+						cEGDGmMjqmm0yEDM7QNfnoSJAgMBAAGjggFnMIIBYzAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQUhUt5A5DKRLfeRmp3FQO28O07HfEwggEHBgNVHSMEgf8wgfyAFIVLeQOQykS3
+						3kZqdxUDtvDtOx3xoYHYpIHVMIHSMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hm
+						b3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5pdmVyc2l0eSBv
+						ZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNlcnZpY2VzIGFuZCBQcm9qZWN0
+						czEjMCEGA1UEAxMad3d3LnN0dWRlbnRzeXN0ZW0ub3guYWMudWsxLzAtBgkqhkiG
+						9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFkbWluLm94LmFjLnVrggkAqMNW+04z
+						J34wDQYJKoZIhvcNAQEFBQADggEBALnfPqYUF7KMTz7xRgBQYykNhHilX/aoSBjQ
+						Fweaw6/bFUenm2ItcyLvbQav+XHfw3/EEGeY9XaJnNr4LK+eCnYwsbZi+1+4QpNy
+						orLL5umOjbfCd3INB6RQ6AMduzgMR+gHlw1WiORMnux9mybEjV5TFs80xNe9meTh
+						7Eyn+gf1wrtDfgEg5H4S69o0DDyMPnHu1EhdFb3Ombbwdmhpf+DwGktSl/XTaequ
+						duJB3GIBnEwBv2PsZtWslTqJNWyQSdBpSr3kuxbwjiFZ9Oy7YWb5CuqA1APETfHW
+						d5gNVy5VMpjKL6KHcDbZovZtIcJxUbNbXuBBO1DW6DZUJc22Fao=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystem.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://www.studentsystem.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://www.studentsystem.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studentsystem.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: Oracle Student Systems</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help OSS single sign on</md:GivenName>
+    <md:EmailAddress>mailto:help_oss_single_sign_on@admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical OSS single sign on</md:GivenName>
+    <md:EmailAddress>mailto:technical_oss_single_sign_on@admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studentsystemdr.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.studentsystemdr.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..1644386f
--- /dev/null
+++ b/swamid-interfederations-2.0/www.studentsystemdr.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,115 @@
+<?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.studentsystemdr.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-10-20T13:54: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.studentsystemdr.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>
+						MIIFQjCCBCqgAwIBAgIJAOQhP/3zz2g2MA0GCSqGSIb3DQEBBQUAMIHGMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
+						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
+						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czElMCMGA1UEAxMcd3d3LnN0dWRlbnRzeXN0
+						ZW1kci5veC5hYy51azEhMB8GCSqGSIb3DQEJARYSb3BzQGFkbWluLm94LmFjLnVr
+						MB4XDTEwMTAxOTE1MTA0NloXDTIwMTAxNjE1MTA0NlowgcYxCzAJBgNVBAYTAkdC
+						MRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQK
+						ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2Vydmlj
+						ZXMgYW5kIFByb2plY3RzMSUwIwYDVQQDExx3d3cuc3R1ZGVudHN5c3RlbWRyLm94
+						LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3Wv3CtiHdbvqih6Hu7CKKrRjNhmOn
+						MewIs3DGuBwGUb/i5LRjX0o6AbtJk9azG7HhoUeKGrLVdtruHCUIuHLXd0c883bt
+						5MwzRC9YSA+/pSKxj2LcAvhCA2fNZ3C1hL053GD0ndKq0pNAiYPsj9tUWBJrN8wR
+						huD+tx0ss+B4YXfFTsTblGcaXDzcXWdl/F41v0NUBWcfQ8dlfdJRuX/Usz7rejbD
+						vsBgh5uSG4OZv+Eiu/W89yXNITV4h6Fg+0dcUfZniMFYyLIUku4luMlq7+iG72RD
+						SULiuTY7Pz45IGE0e/RjkSwF7VtUMpMBqYg4UIKyHmDGFk3yGCN9myHpAgMBAAGj
+						ggEvMIIBKzAdBgNVHQ4EFgQU7VlGiJb4IfSORwJ2tns3OPj6HSswgfsGA1UdIwSB
+						8zCB8IAU7VlGiJb4IfSORwJ2tns3OPj6HSuhgcykgckwgcYxCzAJBgNVBAYTAkdC
+						MRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQK
+						ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2Vydmlj
+						ZXMgYW5kIFByb2plY3RzMSUwIwYDVQQDExx3d3cuc3R1ZGVudHN5c3RlbWRyLm94
+						LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQDkIT/9
+						889oNjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCM8HFwrwani+OZ
+						WilKPwX0ZoePWdZx0z01h0MkUG/5KfnaIwYgelwayBDzZkNGXID7kR//1CK3zReT
+						/8fqqF8dOBu3/mwzUIM+HTeJ7oZft2db07lAMMxceJh0r/iVfAYMbdb9GJLFGo6u
+						jT8uJPMedmLdw0HGYhBgddzGCwQAxEXQj3f+z7tjmwFfxjm8mbeymsej1OI9vTXk
+						KkB9vFHT7f2IXtUn0FcU7lfDFecUFZTy4ht9sFMcz7yxSuXdXcEK4WVtRsPEDtFl
+						eZ5JwdaE7y7vnC0qdyme1Me2ojk43A4d5GvkAVP7tDEm6UmRNAM9zAq0JwhJZRCH
+						B4rL+Zur
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFQjCCBCqgAwIBAgIJAOQhP/3zz2g2MA0GCSqGSIb3DQEBBQUAMIHGMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
+						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
+						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czElMCMGA1UEAxMcd3d3LnN0dWRlbnRzeXN0
+						ZW1kci5veC5hYy51azEhMB8GCSqGSIb3DQEJARYSb3BzQGFkbWluLm94LmFjLnVr
+						MB4XDTEwMTAxOTE1MTA0NloXDTIwMTAxNjE1MTA0NlowgcYxCzAJBgNVBAYTAkdC
+						MRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQK
+						ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2Vydmlj
+						ZXMgYW5kIFByb2plY3RzMSUwIwYDVQQDExx3d3cuc3R1ZGVudHN5c3RlbWRyLm94
+						LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3Wv3CtiHdbvqih6Hu7CKKrRjNhmOn
+						MewIs3DGuBwGUb/i5LRjX0o6AbtJk9azG7HhoUeKGrLVdtruHCUIuHLXd0c883bt
+						5MwzRC9YSA+/pSKxj2LcAvhCA2fNZ3C1hL053GD0ndKq0pNAiYPsj9tUWBJrN8wR
+						huD+tx0ss+B4YXfFTsTblGcaXDzcXWdl/F41v0NUBWcfQ8dlfdJRuX/Usz7rejbD
+						vsBgh5uSG4OZv+Eiu/W89yXNITV4h6Fg+0dcUfZniMFYyLIUku4luMlq7+iG72RD
+						SULiuTY7Pz45IGE0e/RjkSwF7VtUMpMBqYg4UIKyHmDGFk3yGCN9myHpAgMBAAGj
+						ggEvMIIBKzAdBgNVHQ4EFgQU7VlGiJb4IfSORwJ2tns3OPj6HSswgfsGA1UdIwSB
+						8zCB8IAU7VlGiJb4IfSORwJ2tns3OPj6HSuhgcykgckwgcYxCzAJBgNVBAYTAkdC
+						MRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQK
+						ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2Vydmlj
+						ZXMgYW5kIFByb2plY3RzMSUwIwYDVQQDExx3d3cuc3R1ZGVudHN5c3RlbWRyLm94
+						LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQDkIT/9
+						889oNjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCM8HFwrwani+OZ
+						WilKPwX0ZoePWdZx0z01h0MkUG/5KfnaIwYgelwayBDzZkNGXID7kR//1CK3zReT
+						/8fqqF8dOBu3/mwzUIM+HTeJ7oZft2db07lAMMxceJh0r/iVfAYMbdb9GJLFGo6u
+						jT8uJPMedmLdw0HGYhBgddzGCwQAxEXQj3f+z7tjmwFfxjm8mbeymsej1OI9vTXk
+						KkB9vFHT7f2IXtUn0FcU7lfDFecUFZTy4ht9sFMcz7yxSuXdXcEK4WVtRsPEDtFl
+						eZ5JwdaE7y7vnC0qdyme1Me2ojk43A4d5GvkAVP7tDEm6UmRNAM9zAq0JwhJZRCH
+						B4rL+Zur
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystemdr.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://www.studentsystemdr.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://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studentsystemdr.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: OSS Student tier DR Live</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops@admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Livings</md:SurName>
+    <md:EmailAddress>mailto:tom.livings@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studsys.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.studsys.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..f9bdebc5
--- /dev/null
+++ b/swamid-interfederations-2.0/www.studsys.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,74 @@
+<?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.studsys.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.studsys.ox.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>
+						MIIFCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UEBhMCR0Ix
+						FDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoT
+						FFVuaXZlcnNpdHkgb2YgT3hmb3JkMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEdMBsG
+						A1UEAxMUd3d3LnN0dWRzeXMub3guYWMudWsxLzAtBgkqhkiG9w0BCQEWIG9wcy10
+						ZWFtQG1haWxsaXN0LmFkbWluLm94LmFjLnVrMB4XDTEyMDkxNDEwMzE1NVoXDTMy
+						MDkwOTEwMzE1NVowgbkxCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGly
+						ZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9y
+						ZDEUMBIGA1UECxMLSVQgU2VydmljZXMxHTAbBgNVBAMTFHd3dy5zdHVkc3lzLm94
+						LmFjLnVrMS8wLQYJKoZIhvcNAQkBFiBvcHMtdGVhbUBtYWlsbGlzdC5hZG1pbi5v
+						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJeAGPAZmoFV
+						jI0SuVzqP6xQA6FpqzrcwNF/iNN5OODL1ulgvGQOi3g8ThAoeYk0dO19pDhGd/86
+						44D8rXesekGWhUzP+Ww/8DjSJsaSUWq4leXcqYDcF8j8cgcHffUT3XLphZmI9DmU
+						1lLmkz7I6Oylgfx+ZZ+NtrL3y/JJWtUwF9x1LRwR6T+/eJXxnw4fxzfo5ndEHFhl
+						5/659TaCImKBm3g9aOOg1Wmnx0C+vpC14wY8NUoQVHN4gqq/jH5TXYtdm96ZJyLU
+						NzoXn3feSbMdUERSagvwJLbSM32W5i5jm7yyunKMUDYuDNpnJrA7RBgWc5K6rB34
+						SSBeNcRCODUCAwEAAaOCARowggEWMB0GA1UdDgQWBBSlpmuzhZ+Foz77+wtzD+j3
+						THbupzCB5gYDVR0jBIHeMIHbgBSlpmuzhZ+Foz77+wtzD+j3THbup6GBv6SBvDCB
+						uTELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZP
+						eGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRQwEgYDVQQLEwtJ
+						VCBTZXJ2aWNlczEdMBsGA1UEAxMUd3d3LnN0dWRzeXMub3guYWMudWsxLzAtBgkq
+						hkiG9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFkbWluLm94LmFjLnVrggEAMAwG
+						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAE7kCZ+U1ggqaC+4uVyB0f3c
+						YWRc9G4voJrN+RhYYCB8QfFaV6Z8VHV8jgJHYvBQVSz90lJkPI3Y7zxj3hx7/k8u
+						3dQSrYS1oAAao6+LtdDTldPa9JL2WWtO5cbHT2em5eoRmALFawru+kzcFkG/xzUU
+						Syx3Mmypm4vOJPylzk4XMnINdn1WeHc5uuQfxo7/JeItYO5i9dSQ2xII8bsREhp+
+						NfrvBYnZJLqjqjxturZlrCC9GHb8FBl82Go0Ms4ZK3U388O6lWrNTuwS/tY26tla
+						2yob86I5X9ytflI0zaH8qhvHelwbRG3PKepXpvAKiMDU2UzP2FOcvOn+NN612O0=                       
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsys.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://www.studsys.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://www.studsys.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studsys.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: Student System</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ops</md:GivenName>
+    <md:EmailAddress>mailto:ops@admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Livings</md:SurName>
+    <md:EmailAddress>mailto:tom.livings@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studsysdr.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.studsysdr.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..651ce502
--- /dev/null
+++ b/swamid-interfederations-2.0/www.studsysdr.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,113 @@
+<?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.studsysdr.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-10-20T13:54: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.studsysdr.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>
+						MIIFMDCCBBigAwIBAgIJAKFUyKodFCpAMA0GCSqGSIb3DQEBBQUAMIHAMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
+						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
+						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEfMB0GA1UEAxMWd3d3LnN0dWRzeXNkci5v
+						eC5hYy51azEhMB8GCSqGSIb3DQEJARYSb3BzQGFkbWluLm94LmFjLnVrMB4XDTEw
+						MTAxOTE1MTU1M1oXDTIwMTAxNjE1MTU1M1owgcAxCzAJBgNVBAYTAkdCMRQwEgYD
+						VQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2
+						ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2VydmljZXMgYW5k
+						IFByb2plY3RzMR8wHQYDVQQDExZ3d3cuc3R1ZHN5c2RyLm94LmFjLnVrMSEwHwYJ
+						KoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQDYn8bydKw2kkvWZOo21iJlFc7HpJlz7mu9OaPMo0PNOlAB
+						ySERgfBF+84LjXgyzlOfM5me+ouWVoio37dB/0IPB9kcW6BoRUV05qYGeq+OJB8V
+						J4aUxANEneFpQV4QN5kygga91uHMedndjMJueORdmpRbaQse7n4lTL4YTblnga3/
+						ixL2bLfHfvYZ5q7hm8cxlbKhg0TiyjMjJ9HB2caIRxAmU+3jsAasFGZuT905IquG
+						AT2S9t97okzocS6ZRZY5bb0MSSRZCjCBx2SeKfxOieaz+csKhQ+kbmfKCopB0Jgd
+						26lUTadRhjOShP5k5iWx7aD+OvmjJe0YJVhh1sCfAgMBAAGjggEpMIIBJTAdBgNV
+						HQ4EFgQUziI8Ht93ixzAsvwUSo/GWpXmdRcwgfUGA1UdIwSB7TCB6oAUziI8Ht93
+						ixzAsvwUSo/GWpXmdRehgcakgcMwgcAxCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
+						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5
+						IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2VydmljZXMgYW5kIFByb2pl
+						Y3RzMR8wHQYDVQQDExZ3d3cuc3R1ZHN5c2RyLm94LmFjLnVrMSEwHwYJKoZIhvcN
+						AQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQChVMiqHRQqQDAMBgNVHRMEBTADAQH/
+						MA0GCSqGSIb3DQEBBQUAA4IBAQAGnpSzNXPStqoQYhiaRcsJ/8w2ooK4IcW2kYd1
+						mKm8xklL9cnBYpUkUCe1p26sMN8UVlXobH7fdAarYvkL2MWNYLiHmESYQ+k46vEr
+						N7FGROpQ94oFOSPvJCJQJj6uPemLiMyDWVq1JZnyIY4rggjDL72YJLSC3+pfB6iy
+						9A3b6P3tt+zt+qA/GbbPV3Ydz3z91gj752geICCrq3bMetSq6okMgbaljmf/XkMK
+						58UxgghQcXsCGBSO6OlKrT6ziQ3Aw0F2XnTWFBApxNfnotnpxlLoZQ6oAoUDUqPR
+						Kf8Nk0dJF9igV6Sd1QvvoclJMdhReqCsqr9xxVSfGQIINRJR
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFMDCCBBigAwIBAgIJAKFUyKodFCpAMA0GCSqGSIb3DQEBBQUAMIHAMQswCQYD
+						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
+						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
+						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEfMB0GA1UEAxMWd3d3LnN0dWRzeXNkci5v
+						eC5hYy51azEhMB8GCSqGSIb3DQEJARYSb3BzQGFkbWluLm94LmFjLnVrMB4XDTEw
+						MTAxOTE1MTU1M1oXDTIwMTAxNjE1MTU1M1owgcAxCzAJBgNVBAYTAkdCMRQwEgYD
+						VQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2
+						ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2VydmljZXMgYW5k
+						IFByb2plY3RzMR8wHQYDVQQDExZ3d3cuc3R1ZHN5c2RyLm94LmFjLnVrMSEwHwYJ
+						KoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
+						A4IBDwAwggEKAoIBAQDYn8bydKw2kkvWZOo21iJlFc7HpJlz7mu9OaPMo0PNOlAB
+						ySERgfBF+84LjXgyzlOfM5me+ouWVoio37dB/0IPB9kcW6BoRUV05qYGeq+OJB8V
+						J4aUxANEneFpQV4QN5kygga91uHMedndjMJueORdmpRbaQse7n4lTL4YTblnga3/
+						ixL2bLfHfvYZ5q7hm8cxlbKhg0TiyjMjJ9HB2caIRxAmU+3jsAasFGZuT905IquG
+						AT2S9t97okzocS6ZRZY5bb0MSSRZCjCBx2SeKfxOieaz+csKhQ+kbmfKCopB0Jgd
+						26lUTadRhjOShP5k5iWx7aD+OvmjJe0YJVhh1sCfAgMBAAGjggEpMIIBJTAdBgNV
+						HQ4EFgQUziI8Ht93ixzAsvwUSo/GWpXmdRcwgfUGA1UdIwSB7TCB6oAUziI8Ht93
+						ixzAsvwUSo/GWpXmdRehgcakgcMwgcAxCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
+						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5
+						IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2VydmljZXMgYW5kIFByb2pl
+						Y3RzMR8wHQYDVQQDExZ3d3cuc3R1ZHN5c2RyLm94LmFjLnVrMSEwHwYJKoZIhvcN
+						AQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQChVMiqHRQqQDAMBgNVHRMEBTADAQH/
+						MA0GCSqGSIb3DQEBBQUAA4IBAQAGnpSzNXPStqoQYhiaRcsJ/8w2ooK4IcW2kYd1
+						mKm8xklL9cnBYpUkUCe1p26sMN8UVlXobH7fdAarYvkL2MWNYLiHmESYQ+k46vEr
+						N7FGROpQ94oFOSPvJCJQJj6uPemLiMyDWVq1JZnyIY4rggjDL72YJLSC3+pfB6iy
+						9A3b6P3tt+zt+qA/GbbPV3Ydz3z91gj752geICCrq3bMetSq6okMgbaljmf/XkMK
+						58UxgghQcXsCGBSO6OlKrT6ziQ3Aw0F2XnTWFBApxNfnotnpxlLoZQ6oAoUDUqPR
+						Kf8Nk0dJF9igV6Sd1QvvoclJMdhReqCsqr9xxVSfGQIINRJR
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsysdr.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://www.studsysdr.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://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studsysdr.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: OSS Staff tier DR Live</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops@admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Livings</md:SurName>
+    <md:EmailAddress>mailto:tom.livings@it.ox.ac.uk</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
new file mode 100644
index 00000000..87f9f72d
--- /dev/null
+++ b/swamid-interfederations-2.0/www.sussexstudent.com-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.suug.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.suug.co.uk-shibboleth.xml
new file mode 100644
index 00000000..fecbb318
--- /dev/null
+++ b/swamid-interfederations-2.0/www.suug.co.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
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
new file mode 100644
index 00000000..c5e25cc0
--- /dev/null
+++ b/swamid-interfederations-2.0/www.swansea-union.co.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
diff --git a/swamid-interfederations-2.0/www.tandfebooks.com-shibboleth.xml b/swamid-interfederations-2.0/www.tandfebooks.com-shibboleth.xml
new file mode 100644
index 00000000..154d4c10
--- /dev/null
+++ b/swamid-interfederations-2.0/www.tandfebooks.com-shibboleth.xml
@@ -0,0 +1,52 @@
+<?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>
+						MIIDqzCCApOgAwIBAgIJAMt/QdGE5hPLMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
+						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
+						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
+						b24gU3lzdGVtcywgSW5jLjEcMBoGA1UEAxMTd3d3LnRhbmRmZWJvb2tzLmNvbTAe
+						Fw0xMjAyMjAyMDI3NTNaFw0yMjAyMTcyMDI3NTNaMIGUMQswCQYDVQQGEwJVUzET
+						MBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExHTAbBgNV
+						BAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlwb24gU3lzdGVt
+						cywgSW5jLjEcMBoGA1UEAxMTd3d3LnRhbmRmZWJvb2tzLmNvbTCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAMTY5ygzkDHzb+UXnQrrh3qvPfzax9zG5v2G
+						X8JszKRVebzH2Aq0a7/B1pWLbON6bA+EdW9AHhGabcK01VtRGA/pm6ASvozsO5I8
+						TGrBc7Gzq2Pb92Wid4u7Ai7gm7lLZNbaRsEdMVy9EZu7an15+vLGoWp/TfNSCXmB
+						1QyJH9uABduXp0dM6aophIIzbMzIVb2i0rmf7D3nUeGi/+0mqv7zCPykwdgRUORf
+						Sc5pC8QY2B6u/d1ZHZW/tfZtOHYBkY5bu6c20Y338lsiSCgA0rfpoBjArdsvmC+Y
+						VKB4eNNZ3LqohYYcr9eukIHx0c9UYHnd68RM8W0rSIp5QdW3pzECAwEAATANBgkq
+						hkiG9w0BAQUFAAOCAQEAhiPqifO9fklkF6j+//td0fJNsKxJsxKHRIeznMEt9Utk
+						ah8qEz6MLT/j51PnrXpG4n+YAtxmQ2JPO/FVH5NbqSxWERrvqbUxgp5+AiVr8Uvs
+						BsmnNG7ZwgC0qxKJwSduW+Der4ss4L/pUm78+0xjPbQDczkZ9DTKR7p93JJlUaGG
+						8dZf6/GkUSxNIzZiVH7Md8DA9d20feXFiWjMYURIn4HysYLsT0/14o+X41NogxIH
+						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:1.0:profiles:artifact-01" Location="https://www.tandfebooks.com/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tandfebooks.com/action/samlACS" 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
new file mode 100644
index 00000000..57f95d4c
--- /dev/null
+++ b/swamid-interfederations-2.0/www.tandfonline.com-shibboleth.xml
@@ -0,0 +1,49 @@
+<?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>
+						MIIDKDCCAhCgAwIBAgIJAMO9zKBOInK0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE3d3dy50YW5kZm9ubGluZS5jb20wHhcNMTQwMzE0MDUwNDAyWhcNMTcwMzEz
+						MDUwNDAyWjAeMRwwGgYDVQQDExN3d3cudGFuZGZvbmxpbmUuY29tMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+7mPo1QcQmquZzEQh1lPd0/52x3tUmeS
+						h+BnInF0Ddi412jA/73bOkJw8DUCeFMpyDLq5KIEh5hpWko/hiN2MV440jHOOz4c
+						C6q6FIKo0VbnIG1J8W3llePya/7RgXMApLZIO9JlTbru2qcCibgk9cjnKdLYGRLQ
+						OQYZJs4QyA9nN9n53e7Ov7JVOb7R1y77o8h39JhLNCvDlySfhDTeggal2yNb24xf
+						eL4Ee5cKOWdgyo6g5FkHmXn5jsIeBhdI26PyJa46s2/v+3vRzYg/7SpXPj5jZ5JH
+						9VmweGU01MjqvHQVYd7Bfi0Ndik4otfE5nneOQngI3fR5nWV5oGngwIDAQABo2kw
+						ZzBGBgNVHREEPzA9ghN3d3cudGFuZGZvbmxpbmUuY29thiZodHRwczovL3d3dy50
+						YW5kZm9ubGluZS5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTh9Dhbn3dZ+Os2eC
+						RsJIDjh7+mowDQYJKoZIhvcNAQEFBQADggEBABhElasaAVvlbl3ZvZQlhEcQpqQD
+						TvZRxncGrz6moC3pHnUho0L3ZphAnMyHUQlZfg8uZuJBeWTOPYCIYuqQXn+pQ+Si
+						S9n2L8UnoCgNI3df9DDYb7tzpSipYGEXGOw2RUWr1PUD8GQtzP5jkzMPs0eAm/U3
+						pmChGsS7HZbNle9fyBUha2UFebCWFhjUm2iLsN2+kCOkfxEpwLTy26cz1MBqkhDN
+						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>
diff --git a/swamid-interfederations-2.0/www.teamseer.com-ukfederation.xml b/swamid-interfederations-2.0/www.teamseer.com-ukfederation.xml
new file mode 100644
index 00000000..b445b528
--- /dev/null
+++ b/swamid-interfederations-2.0/www.teamseer.com-ukfederation.xml
@@ -0,0 +1,71 @@
+<?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>
+      <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>
+						MIIDaTCCAlGgAwIBAgIJAICE7/jPSr5LMA0GCSqGSIb3DQEBBQUAMEsxCzAJBgNV
+						BAYTAlVLMRMwEQYDVQQIDApTb21lLVN0YXRlMQ8wDQYDVQQHDAZMb25kb24xFjAU
+						BgNVBAoMDUFjY2VzcyBVSyBMdGQwHhcNMTQxMjA5MTEwNTI5WhcNMjQxMjE2MTEw
+						NTI5WjBLMQswCQYDVQQGEwJVSzETMBEGA1UECAwKU29tZS1TdGF0ZTEPMA0GA1UE
+						BwwGTG9uZG9uMRYwFAYDVQQKDA1BY2Nlc3MgVUsgTHRkMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAwWHYHwKuB/4PcaGPXVjO/nhbVBtEVdgjTL47KV9W
+						45LGBCUx9FhgqOEKOMzFHDkV1aX8A7sfCHHTq64sg7DCepfXMO+fWQ3Cuw0xZ5/h
+						Hv4dKwpc3w9g83b5SXGrOA2jQwU/s+mV9I6UKw60kkxIuxr+gE3iNPHKLuMDfk+N
+						7Rhb3DAat9tfQJWgWV71e4bapCX5dYm18nl7ILsqZC/CkZs7ITN4GiJsa2f46/UR
+						RRvfwiFvqIrLz8Xeel3GgI9ajgon44XizbTez6DUa5rX5NWzNWYsS8OiAnP9gQHr
+						PKUhs7OhvRtfMq/TE4NHcU7JNXfR81JVmIZ0n/ty4hGUFwIDAQABo1AwTjAdBgNV
+						HQ4EFgQUJFlLp9zjeGPbXAfqzt8W8qvDU+wwHwYDVR0jBBgwFoAUJFlLp9zjeGPb
+						XAfqzt8W8qvDU+wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAhnmk
+						R5GKW7v5nah8a7Q0hDJuOaM1Nw7XupqjFvoBrb8bYftKxUlORmQDcnSbLrT8PncN
+						81H5xPhSNKvz1TcR/nnnN2KVFIukrOOrxFOu3UB3r2W83ToIzlB4wvOhxh1gfp0n
+						DurQ3Hqsnq0VI7YRuAqDKVOS7dZGn7ueYer8OQZhqAHvudtWFE5yShZLDmJVX06c
+						mMmYQV6H2AJ1m8VtZ3iMaOHYdYZECb8VIZTSD3C2Cu7RIGlu0ZkGBH6sXV4R/kfw
+						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>
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
new file mode 100644
index 00000000..279fb08d
--- /dev/null
+++ b/swamid-interfederations-2.0/www.ted.is.ed.ac.uk-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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>
+      <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>
+						MIIDAzCCAeugAwIBAgIJAJ3YiJdUsT7jMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+						BAMTFHNhdC13ZWIta2IxLmVkLmFjLnVrMB4XDTEzMDgyMzEwMDgxN1oXDTIzMDgy
+						MTEwMDgxN1owHzEdMBsGA1UEAxMUc2F0LXdlYi1rYjEuZWQuYWMudWswggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrFiKhdOEvU89ij8mKMa7NdLRqsFVl
+						mNqHpoBoiQrkDQLJfMnZfnPmEW03DEXRP3bCUSd/luVnT9wpwGY7Q1pLbj94SY+M
+						sNt9en45BA1IkMeATfgyr37t88JjlubD6vTX1WsvectZHalqEBnvV/ls/8qr04vF
+						rHx11uvw16mkoPwBkaVrcQKXd2Nez7vTwJ8xBuCaYLiVXdVDdfXIPlya26obsRdp
+						DUUfOtiW3EijOGV3DXVVxLeeJBhjQABG7cwFqcOOEHstgcutgI8TlNTlN06Jhn2H
+						/xzhqqXJ2XNmRxL4t4JP0exfdFkKHcH9FMTnL7Rs/yoCpkQoX1vp7p1DAgMBAAGj
+						QjBAMB8GA1UdEQQYMBaCFHNhdC13ZWIta2IxLmVkLmFjLnVrMB0GA1UdDgQWBBQL
+						y0wikQoOdbzvgXOhl9gORZdTkjANBgkqhkiG9w0BAQUFAAOCAQEAd85npv0bEMrp
+						Pk60lSMv2S8JDAlK4o9uh/QIzk0scfJkJKAJsrVc8NJ7OFfLFCmCIKLmUVJBTe1G
+						O12NYxJC6nvsuQArkmVvqUKrAsmBO7Z+00vcW82HuxdCcIpl85GrX5yOOGgP3kMp
+						V8LKUSLktqcVeUE1hiTCHYTEyml1L/1iucB4bGWXrDXvBvQUlUAeVk40Qx6iSNE6
+						mIuZGGSoua0Mh2D5wCNnju41QILozm0W9lGYdzYsarfltKE7BVQlglOGnbJhIFVy
+						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>
diff --git a/swamid-interfederations-2.0/www.theacademiclibrary.com-shibboleth.xml b/swamid-interfederations-2.0/www.theacademiclibrary.com-shibboleth.xml
new file mode 100644
index 00000000..7e2d1ebb
--- /dev/null
+++ b/swamid-interfederations-2.0/www.theacademiclibrary.com-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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"/>
+  </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>
+						MIID1DCCArwCCQD9Y+KomO9ukjANBgkqhkiG9w0BAQUFADCBqzELMAkGA1UEBhMC
+						R0IxEDAOBgNVBAgTB0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEhMB8GA1UEChMY
+						VGhlIEFjYWRlbWljIExpYnJhcnkgTHRkMQswCQYDVQQLEwJJVDEdMBsGA1UEAxMU
+						VGhlIEFjYWRlbWljIExpYnJhcnkxKjAoBgkqhkiG9w0BCQEWG2luZm9AdGhlYWNh
+						ZGVtaWNsaWJyYXJ5LmNvbTAeFw0xMTA2MjkxMzU5MjNaFw0zMTA2MjQxMzU5MjNa
+						MIGrMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHRW5nbGFuZDEPMA0GA1UEBxMGTG9u
+						ZG9uMSEwHwYDVQQKExhUaGUgQWNhZGVtaWMgTGlicmFyeSBMdGQxCzAJBgNVBAsT
+						AklUMR0wGwYDVQQDExRUaGUgQWNhZGVtaWMgTGlicmFyeTEqMCgGCSqGSIb3DQEJ
+						ARYbaW5mb0B0aGVhY2FkZW1pY2xpYnJhcnkuY29tMIIBIjANBgkqhkiG9w0BAQEF
+						AAOCAQ8AMIIBCgKCAQEArlZeMdafmBZRy0it8Gq4kFczwd6flPFFqv7pYMFdB0rs
+						zhZqqlsMEb9OA9rJIyoiaf1p2UZdeXqymUE8v5+F69/Z7Oo7LgOM7eF3UPPsy0+G
+						nTFKQag49b0n7H7ykpaLC6gaEzWPbgUZKSsbQ8Jx4EWsEXL11MP3U4iRwqEwm16V
+						BFfC2t6hrBIP+igj7e5lOWidHs5t8RLziN1xmC8bsVvBMLBT7fEP1LAXoLcnn/Y8
+						GsiewWfffCBmwNFat6MkzCkdh3UAbxcg2x3Nuj9ayq33G2x5wZBhA/nsgZERhV+A
+						AtuokFyyaq4JlRTgaKCUvmqmuztPdqwr+bCN9IipLQIDAQABMA0GCSqGSIb3DQEB
+						BQUAA4IBAQAwa4Y9YQoU+1legqiHTu9EMEapPOSI1IPwIxrYXvazKSbT6hQ13Tii
+						pWjYRU6hDuVlMLYPs+HiiiOYhGQ0bB0HjIJiZhTRhVEmok5uJFUtJVounIA/Z/W6
+						gycuhukZEDMZU+LMv3QXX4Yi13uFUh0E87hRjEgLAQ+AYoEUvdxm5WsY7gXu7k7h
+						SEspacCKffZwP6vH5zlzK8OZ5kL1vKM/ZCrk/mT/V+QiarI04mwk5gKHOidHe2Ms
+						IrC5pzCgN8Vy0am0QOFmRZVeXNFUt6cJCenXXh0P0qZgOXyjI+bhtzbKOc3bCcqq
+						eJSiWxJhFLlf2d1X7PiPTLqUlhwY/QXK
+					</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.theacademiclibrary.com/openathens/openathenssp_isapi.dll" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.theacademiclibrary.com/openathens/openathenssp_isapi.dll" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.theacademiclibrary.com/shib/shibrcv.oasp" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.theacademiclibrary.com/shib/shibrcv.oasp" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.theacademiclibrary.com/shibrcv.oasp" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.theacademiclibrary.com/shibrcv.oasp" index="6"/>
+  </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
new file mode 100644
index 00000000..79924f93
--- /dev/null
+++ b/swamid-interfederations-2.0/www.theunionmmu.org-shibboleth.xml
@@ -0,0 +1,66 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
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
new file mode 100644
index 00000000..774f9faf
--- /dev/null
+++ b/swamid-interfederations-2.0/www.tigtagworld.co.uk-shibboleth-sp.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIDMzCCAhugAwIBAgIJAPUDpIXdPLQCMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXd3dy50aWd0YWd3b3JsZC5jby51azAeFw0xMzEyMDkxNTE0MDNaFw0yMzEy
+						MDcxNTE0MDNaMCAxHjAcBgNVBAMTFXd3dy50aWd0YWd3b3JsZC5jby51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2eUNw4sKscVcTmTWYUqKpujQA6
+						Ysyi/nwDvPo8PfQU6wTmMdEcKXMOjZsow/QutghdQuVq1jNr4A13BLUrgvdMfZLj
+						e1P+2kYuDJU0A1iVtin30x7GqZpgD3OMlszQGaV/TUNypgY62x9Sqh88zzX+8r+t
+						/xWvd47jDO5m6vhP2zZHY3Fz+Jrs4V7H3zNk2NCMEumHbOVgX45selWJfp7Ro6v8
+						HN2G9eH719bhFdQliSbBAkjnfjU0sTadWvXBx8OF1Ecq98O+hxxnNuSBYTZvTpAw
+						daBjD/kcLVs96PKYXP8VtA5IQpRyYdjlOaqEDDZF+i20hdcvlQx/U/pkE4sCAwEA
+						AaNwMG4wTQYDVR0RBEYwRIIVd3d3LnRpZ3RhZ3dvcmxkLmNvLnVrhitodHRwczov
+						L3d3dy50aWd0YWd3b3JsZC5jby51ay9zaGliYm9sZXRoLXNwMB0GA1UdDgQWBBRy
+						io1sVRyt8tHXK4jOqpqBVVfwRzANBgkqhkiG9w0BAQUFAAOCAQEAbq3uePohbhLy
+						jcS7TYj0mDHXyF9spiYzADXfhX88P43MjdBzMkqUqNR/22LC1W6nSbRBTU4Zj17E
+						B1ZHHXZR8tP47JZEqmmzuFreaONr7aHOczJdYQirG7IA6MJlFZDErzeHG9QqdFbH
+						f/Ky6+S0GChOxccumyBfRKtwIs7NP3fkDqh8KU0evdItzSoZtMBFEKR9v7116+Mv
+						EhuVc4TsNZNqufBQ3yxvERxMyX5Uvhb+2TGfzZAshDfBcvn34Ga7VfUM5CJILNXZ
+						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>Jim</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:jsmith@twig-world.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jim</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:jsmith@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
new file mode 100644
index 00000000..77ec6fe0
--- /dev/null
+++ b/swamid-interfederations-2.0/www.twigonglow.com-shibboleth-sp.xml
@@ -0,0 +1,69 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-22T15:15: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>
+      <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>
+						MIIDJzCCAg+gAwIBAgIJAMTlVAXkOmrZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnd3dy50d2lnb25nbG93LmNvbTAeFw0xMjExMTMxMTAxNDVaFw0yMjExMTEx
+						MTAxNDVaMB0xGzAZBgNVBAMTEnd3dy50d2lnb25nbG93LmNvbTCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAKZvpD5K0jQvz3y9mkhLylUzqC+bZrGmyuIE
+						9LAdDXh/9LpxgxnY+an/FnIQzrKFLyw+4t8H1QSLWyTLK8MA8b6tJjBxznvUv8Qk
+						IpBAmBXWSkPQSHgbIoTFivb6iIVJq9h7yLi0JM7GpM4SS/ed+JiYiBM1C89/iaks
+						s1kpbN9TYrqN0YBkogTe1NIJMDp13SagmR2WjmnzQKtCH8z3DQDA3MrrP+KIbp5Z
+						Qm6Nlk+XQv51Mg5b/8qMgBoekB6cTI+HEIXJauJyPfCPL0hysnNUzR57BGG04ol4
+						Vx/eIKKvzRSwRowSGIxIcIGzUk9lg1PIt7RXPcTHANqppLGZIusCAwEAAaNqMGgw
+						RwYDVR0RBEAwPoISd3d3LnR3aWdvbmdsb3cuY29thihodHRwczovL3d3dy50d2ln
+						b25nbG93LmNvbS9zaGliYm9sZXRoLXNwMB0GA1UdDgQWBBRHiLe+VeAuCc/Ly0mK
+						I5tvs+uuujANBgkqhkiG9w0BAQUFAAOCAQEAJZHQuo5dFz0F77boWcIjUTH9eHtH
+						HUYbLsotM1Xin8k0vQIwkqQcIByBHLlM/ScVKku4u8a5maAawSr6IZVvBbpYgYsO
+						O0GZpHD45GFBIMQsgd+tTGlHus/t0048J5j3GPqx1NTMGs80DnCXAq9fLKjpil4i
+						/mfAfP6CSrguh2rCvVndSrTLIHJfQ+d6Up8h24LYKzhHVQmdqgsSQAWg1yUacFER
+						ud1Wodm6t+Nrbyh4XA3YbekaxHPRO9bBIjo+sncONDf6JfFL57s4i74LeZVOMeQC
+						yFFf/Cs64qzIILqKQWM0wqZq1vOavCR+OhOTdyjjKejhDKb9CWLzXSuOFw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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>Jim</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:jsmith@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
new file mode 100644
index 00000000..801e9b63
--- /dev/null
+++ b/swamid-interfederations-2.0/www.ubu.org.uk-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..a38865bb
--- /dev/null
+++ b/swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.xml
@@ -0,0 +1,59 @@
+<?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>
+      <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="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>
+					      MIIDFDCCAfygAwIBAgIVAPhF6Z+pMtMAffPTgC8LNS+CPPoMMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCnd3dy51Y28uZnIwHhcNMTEwNzIwMTQyMzUwWhcNMzEw
+NzIwMTQyMzUwWjAVMRMwEQYDVQQDEwp3d3cudWNvLmZyMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA0mhB2HdGNn2tfVrT9ciREesIHvTSoXnI6AQpqD9K
+LlB7bIjUX9EyfVXlg2fvcJYyfGeuQL1mbK0bXuM0AUX4aO3kf5vrtVLO0npQSuE4
+reAThATYtCsor30uTOb8YcCANJ0OcnN8jm+GgZmroUIakyl2RRPMtuc+RBx8lnh4
+N+Tac1OssR1Zdx8peAtV0MvXoC6hy5/Rp1i1/QiKX4QHQh85GMPG5wANRpag4U+9
+FPhRikDdwMH+gYyTY2zcAYxdyRJNK1dKtYVSSlW+JoX0JgL8vOcC+H5lHsDpHjK1
+y0k39zeVSURgOxu7U04ZPNclt4qYo6MHi7Gc+LLtyoO7zwIDAQABo1swWTA4BgNV
+HREEMTAvggp3d3cudWNvLmZyhiFodHRwczovL3d3dy51Y28uZnIvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFD9XAALJ3NCu1Z7q/lcamqo6vefAMA0GCSqGSIb3DQEB
+BQUAA4IBAQCKoc/CFYtJwGptZuJYo9da4NQ2jk2FvqX5o0AyT7cmimU8tj1B41m9
+DkVjwq2HPeTbcDUoECZJFoisIaQOuoxXxSvA8yYTtgBYUQEvqMOwLG+9cCjkT7V9
+hw9qQmD0JVSknJslFuLoqn88bodKPJE1u7Sgfk/huMEZItLBG/6EMKCINuN+nLt3
+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://unknown.site.com</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
new file mode 100644
index 00000000..af59863e
--- /dev/null
+++ b/swamid-interfederations-2.0/www.udsu.co.uk-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
diff --git a/swamid-interfederations-2.0/www.umaber.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.umaber.co.uk-shibboleth.xml
new file mode 100644
index 00000000..2f43bdba
--- /dev/null
+++ b/swamid-interfederations-2.0/www.umaber.co.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
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
new file mode 100644
index 00000000..10083980
--- /dev/null
+++ b/swamid-interfederations-2.0/www.uni-market.co.uk-shibboleth.xml
@@ -0,0 +1,93 @@
+<?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>
+      <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>
+						MIIDEjCCAfqgAwIBAgIJAPKUQx9woPqmMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+						BAMTGXdpbndlYi5haG95Y3JlYXRpdmUuY28udWswHhcNMTQwODEwMTgxMTE5WhcN
+						MjQwODA3MTgxMTE5WjAkMSIwIAYDVQQDExl3aW53ZWIuYWhveWNyZWF0aXZlLmNv
+						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyLXxWI85NIE5c6aX
+						Yr/pSs4idUsamvXpiU4axlmxeMzcn4bBirEwpZGAZPD9jLi2dns3PFIGFydADaHG
+						c2xY6SWbdmdCA8L5EK16dTGqKGFDy4m0PEq46ox1ketycF4r65pTyuyQONkhxMWh
+						RpvIMlpFvjCWk3/sa/EaGcpgPDBHvcSJ9x9ZxKc18SSed9o899iFWlRPv6psNFGn
+						WYNlgpYkSkJ+LxwIBJ+LG2Lz5DxjIfdb+pvlQhgYM8Sxz76QepdyrRp5w929eHoJ
+						2JQxrlLOVW+dUIoO0G0OV2zGhSzRYGh1H8rG1kG6x576PNYlQFGu5SnNjv60q3y0
+						mlA09QIDAQABo0cwRTAkBgNVHREEHTAbghl3aW53ZWIuYWhveWNyZWF0aXZlLmNv
+						LnVrMB0GA1UdDgQWBBTdoi7+xHZHOmkdGmrRSsiggP0MCzANBgkqhkiG9w0BAQUF
+						AAOCAQEAoIKdKeJLleub2HSGF/Ur7Uoxtus7cbAWZ1zpIrrcuvOWisLKobRRP2Uh
+						D1qTAuCO5lNYki91eRS2HVNWBxUR2+0g6wFN+U2c5ZvJ71iW6LFTXcq+vAyc7UVa
+						dvm4lcI6uBS8G749NdCzJ7mzURgBP0aN5Nj6GNjsQUHFkXhS4QGrhqJeIc+qjM+P
+						xAz0otM+AqrXyY9jPraynGlxlsVzyiEJ6NmRFTRkKh8rbiGM2Iy1C773D8x0t08d
+						de+OUXKbGNRAy5mJkyMA0XXgxq4UvcNZmfe5YhZA7JU+AfbnqvCn5sA70/pBKNJl
+						bdvahAEjafZSly34jyYdcIJnysYhzQ==
+					</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>Ahoy Creative</md:GivenName>
+    <md:EmailAddress>mailto:domains@ahoy.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
new file mode 100644
index 00000000..61f951e8
--- /dev/null
+++ b/swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml
@@ -0,0 +1,219 @@
+<?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>
+      <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>
+						MIIDVzCCAj+gAwIBAgIJANZRUr3l66IUMA0GCSqGSIb3DQEBBQUAMDsxOTA3BgNV
+						BAMTMGVjMi00Ni0xMzctMy0xNjIuZXUtd2VzdC0xLmNvbXB1dGUuYW1hem9uYXdz
+						LmNvbTAeFw0xMjA1MTQwOTExNThaFw0yMjA1MTIwOTExNThaMDsxOTA3BgNVBAMT
+						MGVjMi00Ni0xMzctMy0xNjIuZXUtd2VzdC0xLmNvbXB1dGUuYW1hem9uYXdzLmNv
+						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMOKLRNP923gpEphaq9H
+						lqaeg3wIr6k6CQEZTnVeXHaqBS1T/IeLChh0MGikmqzAGz4gL3Jp7xg+LjAb7fHW
+						s84wG6ZkDFxy2plDsNoVPatzgKQYtiXsGqtlXdW8UzTpIpsvVAlJ+QGqhIibAZWK
+						aIsU6V38NGafvB4UWFlIpbECHgFz41x1cmK7gYFD7wzsA6hojAOWaY8UmQgW+nJn
+						4WxKl+gDe8qUiwdMzrEUK1yOFjsDuqdHnejSrtyc8b7iccE7hzo1Y/kw40FVG7gW
+						oiKrzF49G14BiHwkt448mCiXGDMnFM0TYfs1nkS/FdTpyhHgICu1qHX8pqJnnNbn
+						uNMCAwEAAaNeMFwwOwYDVR0RBDQwMoIwZWMyLTQ2LTEzNy0zLTE2Mi5ldS13ZXN0
+						LTEuY29tcHV0ZS5hbWF6b25hd3MuY29tMB0GA1UdDgQWBBRAI6NKxAK3XKLGUqTb
+						gJhCWI0FuzANBgkqhkiG9w0BAQUFAAOCAQEAf+1jf17uxp5uGeGJUFI/t2bhxnfD
+						TbmnNBzQST5/+VK+qNAc6tCw+0gngBGREBkdVmcebIw8AmfhciDqe3xEl3Pp2oWT
+						HSnbl7bZnoG90FlxEbHm8THMNFjTDTmrlX37ldH5mfiP0EOFpMaCmlkNr9D617tF
+						gZ2xUEelwk+5dg5RpIHsgOnVr6zcUMdYHZPs64O/kySxnuN+PaOIOt9JERw1jHT6
+						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: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:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml b/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml
new file mode 100644
index 00000000..4df0b937
--- /dev/null
+++ b/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml
@@ -0,0 +1,229 @@
+<?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>
+      <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>
+						MIIDVzCCAj+gAwIBAgIJANZRUr3l66IUMA0GCSqGSIb3DQEBBQUAMDsxOTA3BgNV
+						BAMTMGVjMi00Ni0xMzctMy0xNjIuZXUtd2VzdC0xLmNvbXB1dGUuYW1hem9uYXdz
+						LmNvbTAeFw0xMjA1MTQwOTExNThaFw0yMjA1MTIwOTExNThaMDsxOTA3BgNVBAMT
+						MGVjMi00Ni0xMzctMy0xNjIuZXUtd2VzdC0xLmNvbXB1dGUuYW1hem9uYXdzLmNv
+						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMOKLRNP923gpEphaq9H
+						lqaeg3wIr6k6CQEZTnVeXHaqBS1T/IeLChh0MGikmqzAGz4gL3Jp7xg+LjAb7fHW
+						s84wG6ZkDFxy2plDsNoVPatzgKQYtiXsGqtlXdW8UzTpIpsvVAlJ+QGqhIibAZWK
+						aIsU6V38NGafvB4UWFlIpbECHgFz41x1cmK7gYFD7wzsA6hojAOWaY8UmQgW+nJn
+						4WxKl+gDe8qUiwdMzrEUK1yOFjsDuqdHnejSrtyc8b7iccE7hzo1Y/kw40FVG7gW
+						oiKrzF49G14BiHwkt448mCiXGDMnFM0TYfs1nkS/FdTpyhHgICu1qHX8pqJnnNbn
+						uNMCAwEAAaNeMFwwOwYDVR0RBDQwMoIwZWMyLTQ2LTEzNy0zLTE2Mi5ldS13ZXN0
+						LTEuY29tcHV0ZS5hbWF6b25hd3MuY29tMB0GA1UdDgQWBBRAI6NKxAK3XKLGUqTb
+						gJhCWI0FuzANBgkqhkiG9w0BAQUFAAOCAQEAf+1jf17uxp5uGeGJUFI/t2bhxnfD
+						TbmnNBzQST5/+VK+qNAc6tCw+0gngBGREBkdVmcebIw8AmfhciDqe3xEl3Pp2oWT
+						HSnbl7bZnoG90FlxEbHm8THMNFjTDTmrlX37ldH5mfiP0EOFpMaCmlkNr9D617tF
+						gZ2xUEelwk+5dg5RpIHsgOnVr6zcUMdYHZPs64O/kySxnuN+PaOIOt9JERw1jHT6
+						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: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: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
new file mode 100644
index 00000000..1fee5628
--- /dev/null
+++ b/swamid-interfederations-2.0/www.upay.co.uk-shibboleth-sp.xml
@@ -0,0 +1,67 @@
+<?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.upay.co.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-29T15:41: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>
+      <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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.upay.co.uk/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDCTCCAfGgAwIBAgIJAPuCQS/zC4R2MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnUwMTU4MjQuY2FzaGxlc3MubG9jYWwwHhcNMTIwNTI4MTQwMDI3WhcNMjIw
+						NTI2MTQwMDI3WjAhMR8wHQYDVQQDExZ1MDE1ODI0LmNhc2hsZXNzLmxvY2FsMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylulP1Jro85baAfyhsYZlfMP
+						PZWBKbntkMX59cZHY9GdQxJvxOWaew7PP5vMPbXlntPoLRo07E086jOmYZwsR/YF
+						HnXX/JDnGoUaNPxEjllzsIaSkrC3NTN1yYhUuRWDZ4iXHfK9MXjfsZPi07dLY84E
+						BLTOS7Y/AWs0gDM428GbWAPVZUitiNxeYVM4/AoflNAwdCYbzFtObgiayUNJ5Lny
+						acR3i4yGTrfQnlvk8CwUtYSHFMv3mwoff3Mwqi4s+6gl0KExm/HdokJQQ2JrZsdC
+						Cxr74jbQ63dTY0fa2LT/Iu1Il70zDtEKfjs8p9RCWF0jGHiYXTalW1MXqjltbQID
+						AQABo0QwQjAhBgNVHREEGjAYghZ1MDE1ODI0LmNhc2hsZXNzLmxvY2FsMB0GA1Ud
+						DgQWBBTfgLOw2BB/94hVVe6sGztOy8FtZzANBgkqhkiG9w0BAQUFAAOCAQEAWxDq
+						U9phfn4hdENxWAPa+WkEtl9K5R/fabWcKYseolrkgLimEBHwrlsnvwG1+N3KUvxm
+						OAQ4mwzAMdzR5BT3T2nECeSPuIjYHhYDMHT3NQo0EPugBKRiHHCbGtbq1koVhker
+						u1D7q7vdwrpuafZOaBKxN6J33hOVDdkiCDwMvkgyiBDpe5L8KleiCMpnF2mMobxF
+						R1+JIciWhw8MKc2WfekC/yXPzAHvJen7/xbCk6mn03m65aUhQ/mS5swiULmmnkpk
+						0eEFK2StndDnHHteY0pFIbFv0wX7/PzIN9HHmLMd2vMhX9LOpMX5j8J14VB9HVm+
+						XXxEezyYkBQIe2xJxg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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="0"/>
+    <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="0"/>
+    <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="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.upay.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.upay.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.upay.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.upay.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </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
new file mode 100644
index 00000000..b2b2d1cf
--- /dev/null
+++ b/swamid-interfederations-2.0/www.upsu.com-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.uusuvote.com-shibboleth.xml b/swamid-interfederations-2.0/www.uusuvote.com-shibboleth.xml
new file mode 100644
index 00000000..43dc5e4a
--- /dev/null
+++ b/swamid-interfederations-2.0/www.uusuvote.com-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.vho.de-idpvzg.xml b/swamid-interfederations-2.0/www.vho.de-idpvzg.xml
new file mode 100644
index 00000000..e0cb1519
--- /dev/null
+++ b/swamid-interfederations-2.0/www.vho.de-idpvzg.xml
@@ -0,0 +1,150 @@
+<?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>
+      <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,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGfzCCBWegAwIBAgIED/+i6zANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
+PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
+dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
+MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwNTA0MTM0NzA3
+WhcNMTUwNTAzMTM0NzA3WjCBnDELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
+UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
+bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
+QmlibGlvdGhlazETMBEGA1UEAxMKd3d3LnZoby5kZTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBAMxWPQ1x7VFjjh85oQNHMLrIR7U9ZlB5Hc+hHs5YWLDv
+eRfoW/C3LZF8sLkd1BH1bd9W6EuB5IRzPSHxn10mxYQWfezalgY/NCSxag5EUzJG
+o45Shd5B//dBXMFuVxd3mCGZ7Gpi2YwvKQZOjPTgs6WJeCsNy9nsrNe8dhK3rswV
+I/f5pjhHDd5o43348uMY4bjVmtBke2IWo/PY4OMZIxsHMm5wu3mW9VfmTx2Deb2G
+8PUHNeqdiyv1AfOsCgRC8BhHq5tg0tzA8u52CDXFIR7zuvlPdBN/LMb6DMIdyE5C
+qFGabY/n/EKFexAiTz+evlpHihPTjx0s00lnd4W0yPwZEtaGxzcOnLygE/NjoGA+
+2Dym0Oo+NnGAvFN2FVTRrqKJV/6D/3Oh1xX2yAAMYv+1GlyeJOReCD+Fki5cHo/J
+bgpu1yC23wYrst/25BIlPvDxrdveZuVTdXc4n7n51PBTX70R/GvkQ9Sv9T5yGwbV
+CnT1ostCj/QwwAyxC8H1dch5hEvRRQy+zme5AXcwXhtAjErUEmkn13eXRWQwLkrt
+ZcbBY8ibdlQhdguwXdtkrS38tX4WyFd4j51olwoEPLXjU52u96nCjkHtO6GyXnU9
++ZcWSxJePmrmGWxOtu3NsOpcm9RhrtOlDxYp7n17tZ64pIZFIiPbv2fGMXStPJNz
+AgMBAAGjggGmMIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFIHlCTp0Hw2ixtPSg7IXjQOH
+onjFMB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBcGA1UdEQQQMA6B
+DGJvcmVsQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYB
+BQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+Z3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQEFBQADggEBAE/4u0zjwF5+yQkcpeCNoSdH8JIhMJofYyWfQPD+
+Q36nQBqrolaFCe94zThj+gJmabfIDEvpwCLCa2YtCDosWsI9rX4GF1ZUsxKqxgBB
+IH1rFZlKKEeDYieR8lRH4vy4RGh9dkvhhXLgyrekt3iyfWHxCz/n47awnmYgO2st
+dqh2nY2bXoDASUlgzO59ghsfi6pT5WAGRUwZhMS3iErLglDYoT6AqEdr406TWeLp
+Mw04ESW7mR05nhLcIBNf23UPKjMpNTwBQC1BAbssGMMMbPojg1K+80aLKAB32ZPw
+CFNwbRrYB0gGPASPkZD9WxiosAZp/uqr6QTZIUDSSmWt2B0=
+</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,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGfzCCBWegAwIBAgIED/+i6zANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
+PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
+dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
+MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwNTA0MTM0NzA3
+WhcNMTUwNTAzMTM0NzA3WjCBnDELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
+UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
+bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
+QmlibGlvdGhlazETMBEGA1UEAxMKd3d3LnZoby5kZTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBAMxWPQ1x7VFjjh85oQNHMLrIR7U9ZlB5Hc+hHs5YWLDv
+eRfoW/C3LZF8sLkd1BH1bd9W6EuB5IRzPSHxn10mxYQWfezalgY/NCSxag5EUzJG
+o45Shd5B//dBXMFuVxd3mCGZ7Gpi2YwvKQZOjPTgs6WJeCsNy9nsrNe8dhK3rswV
+I/f5pjhHDd5o43348uMY4bjVmtBke2IWo/PY4OMZIxsHMm5wu3mW9VfmTx2Deb2G
+8PUHNeqdiyv1AfOsCgRC8BhHq5tg0tzA8u52CDXFIR7zuvlPdBN/LMb6DMIdyE5C
+qFGabY/n/EKFexAiTz+evlpHihPTjx0s00lnd4W0yPwZEtaGxzcOnLygE/NjoGA+
+2Dym0Oo+NnGAvFN2FVTRrqKJV/6D/3Oh1xX2yAAMYv+1GlyeJOReCD+Fki5cHo/J
+bgpu1yC23wYrst/25BIlPvDxrdveZuVTdXc4n7n51PBTX70R/GvkQ9Sv9T5yGwbV
+CnT1ostCj/QwwAyxC8H1dch5hEvRRQy+zme5AXcwXhtAjErUEmkn13eXRWQwLkrt
+ZcbBY8ibdlQhdguwXdtkrS38tX4WyFd4j51olwoEPLXjU52u96nCjkHtO6GyXnU9
++ZcWSxJePmrmGWxOtu3NsOpcm9RhrtOlDxYp7n17tZ64pIZFIiPbv2fGMXStPJNz
+AgMBAAGjggGmMIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFIHlCTp0Hw2ixtPSg7IXjQOH
+onjFMB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBcGA1UdEQQQMA6B
+DGJvcmVsQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYB
+BQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+Z3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQEFBQADggEBAE/4u0zjwF5+yQkcpeCNoSdH8JIhMJofYyWfQPD+
+Q36nQBqrolaFCe94zThj+gJmabfIDEvpwCLCa2YtCDosWsI9rX4GF1ZUsxKqxgBB
+IH1rFZlKKEeDYieR8lRH4vy4RGh9dkvhhXLgyrekt3iyfWHxCz/n47awnmYgO2st
+dqh2nY2bXoDASUlgzO59ghsfi6pT5WAGRUwZhMS3iErLglDYoT6AqEdr406TWeLp
+Mw04ESW7mR05nhLcIBNf23UPKjMpNTwBQC1BAbssGMMMbPojg1K+80aLKAB32ZPw
+CFNwbRrYB0gGPASPkZD9WxiosAZp/uqr6QTZIUDSSmWt2B0=
+</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>
diff --git a/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml b/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
new file mode 100644
index 00000000..c98e25f1
--- /dev/null
+++ b/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-20T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">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>
+      <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:Logo height="86" width="100">https://metadata.eduid.hu/logos/videotorium.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="hu">http://videotorium.hu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">http://videotorium.hu/hu/contents/userstos</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>vportal.niif.hu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIC9DCCAdygAwIBAgIJAMKdDVZkKR0MMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD3Zwb3J0YWwubmlpZi5odTAeFw0wOTExMjAxMjMzMjRaFw0xOTExMTgxMjMz
+MjRaMBoxGDAWBgNVBAMTD3Zwb3J0YWwubmlpZi5odTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAOhapHXauA4X/BNSZIhLERDmHjx/7zdw1dxgmkr8GmDz
+EH1BGZ6/nSdXMAhkrI1HVOGiSz6QhR0l2r6A7mSLXh8u0Sjc3TzCSsAIzz/ygh6V
+ljl5WMRE9u9uxtkvd+5d4cZP4lUbL9aFOTvNBh3Gizy7oZwWjbp64rSupRNqnz8J
+FGFPyPnRpXo8HjpNHYeaLyqOqTww9lHTlGWKTqibsyV7CctiFKbADlU2ol/8cdKL
+iSVAWqlsIed3proxg0fgHskpmyB8cFr77lylFnirJGRXjXMXlVwr1XxlOghfJqBs
+Rxz/wKMXvMNr9sWYoDw14kYBls8S9RCDNF34Fx+UOcECAwEAAaM9MDswGgYDVR0R
+BBMwEYIPdnBvcnRhbC5uaWlmLmh1MB0GA1UdDgQWBBQgKCZFxt8oR2XfhQ7zGmF7
+auxUdzANBgkqhkiG9w0BAQUFAAOCAQEAX+R7y/xZi46N65LoxI7OS0a0U9vVh4Px
+GfylYafbDpPy+FPw1Dh6IqG1R8gt1TSRUouVdoRb9b2k8CjAAkRq4lbF5XctWcsW
+qMEU69BcUlbzzAtgnpgghVSk8dFlMrEWugQvzd6RL4HDPPrvFsjdMj52+p1mBMtw
+9SUrazPp+hU1y8zeDdocI2RdyLEhArR5xQVKmV32hDFr754zNdZorvcRuuarkO83
+b1732Lc//S38m9Co/U1WAPN2sSUN5S7yIZ/EjubTbvf8gcGvEHT1rffoOzqHksfc
+d+gG9nbNZLO6xZJJEwNwPcOoxEWZXhv3ynvCtFcuvmtcGQazcy0s9Q==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
+    <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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://videotorium.hu/Shibboleth.sso/SAML2/POST"/>
+    <md:AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/POST"/>
+    <md:AssertionConsumerService index="3" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/Artifact"/>
+    <md:AssertionConsumerService index="4" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/Artifact"/>
+    <md:AssertionConsumerService index="5" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://videotorium.hu/Shibboleth.sso/SAML2/Artifact"/>
+    <md:AssertionConsumerService index="6" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/POST"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="hu">Videotorium</md:ServiceName>
+      <md:ServiceName xml:lang="en">Videotorium</md:ServiceName>
+      <md:ServiceDescription 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. </md:ServiceDescription>
+      <md:ServiceDescription 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.</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:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="surname"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eppn"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType" 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.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="affiliation" 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</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
new file mode 100644
index 00000000..67df6a48
--- /dev/null
+++ b/swamid-interfederations-2.0/www.vist.org.uk-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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>
+      <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>
+						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
+						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
+						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
+						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
+						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
+						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
+						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
+						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
+						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
+						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
+						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
+						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
+						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
+						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>
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
new file mode 100644
index 00000000..2af3f75a
--- /dev/null
+++ b/swamid-interfederations-2.0/www.vutbr.cz-SSO-saml2-idp.xml
@@ -0,0 +1,60 @@
+<?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>
+      <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="84" width="180">https://www2.eduid.cz/idp-loga/vut.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>
diff --git a/swamid-interfederations-2.0/www.walesdtc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.walesdtc.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..9bad99f0
--- /dev/null
+++ b/swamid-interfederations-2.0/www.walesdtc.ac.uk-shibboleth.xml
@@ -0,0 +1,79 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAPbailijb9L3MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHNvY3NpMDEuY2YuYWMudWswHhcNMTMwMzI2MDk0NDQ2WhcNMjMwMzI0MDk0
+						NDQ2WjAbMRkwFwYDVQQDExBzb2NzaTAxLmNmLmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEA0ujf4w6Wex5S5yUwoVVgRe3Idf4qrmCg9JTCq9xJ
+						XOVhWbYusvj70tVT0hLrlHafwjby3OzrPEUfct/9H02YUGoqjSXPxTDiPOENZzsW
+						jE2YHjotmOHEtilSJnyvOQpTfJFv8S2HbA4NoXJR9OOTsy+8YgLrLHS8zzpPpEcC
+						DQOlsRlb1kqdkfpgpGEadhFy8XB9iGhVIuJDEr/p1Q+c5zcBCXwrFy2p8XjgAEj4
+						fRaHaW5uDhdXFTrl0icKTElrAoyqs+Pot44TRUNG/B/4SLsMKCapHvDLjxJRobx2
+						9KR7Bvwyf397i2nQqdrjVFsqtj89Asv0lUxm6DtUGz4y9QIDAQABoz4wPDAbBgNV
+						HREEFDASghBzb2NzaTAxLmNmLmFjLnVrMB0GA1UdDgQWBBSw4X82LGsMUJHKB8Gj
+						tSyINoYALzANBgkqhkiG9w0BAQUFAAOCAQEAyZGq7fE3UF+pIIyEq3/2wkktaJZN
+						a6QW3X0WXJ2SDHZLBVpz4tqIHeFIM0IKliKvfg/7mgD42x3dB4w9+mdIrYhPn/BI
+						GdpNTxW+NnGBW7CwEtLkBtkmQRYUXFSu5CJHF8Epe1TeNmd3DBMx5BdruFPrL/Rv
+						zxKp5iQima7G/GzVSqAWKfswtpC3nw15I2UylDnPUaSw0W4fFViFiVjfS5wOQicg
+						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>
diff --git a/swamid-interfederations-2.0/www.warwicksu.com-shibboleth.xml b/swamid-interfederations-2.0/www.warwicksu.com-shibboleth.xml
new file mode 100644
index 00000000..8b911fa0
--- /dev/null
+++ b/swamid-interfederations-2.0/www.warwicksu.com-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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>
+						MIIDGDCCAgCgAwIBAgIJALHfJpUPBSpAMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG3dlYnNydi5zdW5pb24ud2Fyd2ljay5hYy51azAeFw0wOTEyMTgxNDI5NDRa
+						Fw0xOTEyMTYxNDI5NDRaMCYxJDAiBgNVBAMTG3dlYnNydi5zdW5pb24ud2Fyd2lj
+						ay5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPeWU4LIz/q4
+						1T0o8E/Bxum3k6vrWQ8LxESY7ZKWZ9LXH3UE9iTWX8Imt0H1iuAgF2aqperi+iYJ
+						ajsapIvp16vWle8kf9Nl47CYwqYGi+26M+ZnKVRdLWfPt9O1SZ6TN4ed57sCUXL2
+						0W+10Pd2f3odMDlrPOYdL5Jmr9dmu9/o3h10GqrQShVL59Bgh3myGH6zwomnHK85
+						wzA1ihDHGTx/EQodaUnTJV/+oQiFNhX79C/qeJD524VuEyz2S+vtCsmmCKMfaR38
+						slH7luklFZF/zrQqjgCkr0Xo4+PYZFK574yaN5dL2wA5U4zC81sN+R0X8UggxCk2
+						DuMKwkXpP6kCAwEAAaNJMEcwJgYDVR0RBB8wHYIbd2Vic3J2LnN1bmlvbi53YXJ3
+						aWNrLmFjLnVrMB0GA1UdDgQWBBTe+5nssBuK7Tob4tI4foxYDaLJTTANBgkqhkiG
+						9w0BAQUFAAOCAQEA6QSS5qeUN2/Ee3peHAtrS7uSh+67vnQ2Wc9Txgm0EFenK+oV
+						nf6kNerS+KC8E5bfNTMlHdA/Tt9GBozrHzC98kreqLY/L5qKjLPGV13m9L+hpebO
+						ncjl+PgLL99ykWDTyzWE4DFrnmOaatds3j5Si0TmgoACVdh81jn29a6ws/fkn2nl
+						ogEC4aAlAyXe0iz6wO13CUDjPfxTPvbu1CnolRhSc08WeuHULTDbYtS7d8KVKmDi
+						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>
+						MIIDGDCCAgCgAwIBAgIJALHfJpUPBSpAMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+						BAMTG3dlYnNydi5zdW5pb24ud2Fyd2ljay5hYy51azAeFw0wOTEyMTgxNDI5NDRa
+						Fw0xOTEyMTYxNDI5NDRaMCYxJDAiBgNVBAMTG3dlYnNydi5zdW5pb24ud2Fyd2lj
+						ay5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPeWU4LIz/q4
+						1T0o8E/Bxum3k6vrWQ8LxESY7ZKWZ9LXH3UE9iTWX8Imt0H1iuAgF2aqperi+iYJ
+						ajsapIvp16vWle8kf9Nl47CYwqYGi+26M+ZnKVRdLWfPt9O1SZ6TN4ed57sCUXL2
+						0W+10Pd2f3odMDlrPOYdL5Jmr9dmu9/o3h10GqrQShVL59Bgh3myGH6zwomnHK85
+						wzA1ihDHGTx/EQodaUnTJV/+oQiFNhX79C/qeJD524VuEyz2S+vtCsmmCKMfaR38
+						slH7luklFZF/zrQqjgCkr0Xo4+PYZFK574yaN5dL2wA5U4zC81sN+R0X8UggxCk2
+						DuMKwkXpP6kCAwEAAaNJMEcwJgYDVR0RBB8wHYIbd2Vic3J2LnN1bmlvbi53YXJ3
+						aWNrLmFjLnVrMB0GA1UdDgQWBBTe+5nssBuK7Tob4tI4foxYDaLJTTANBgkqhkiG
+						9w0BAQUFAAOCAQEA6QSS5qeUN2/Ee3peHAtrS7uSh+67vnQ2Wc9Txgm0EFenK+oV
+						nf6kNerS+KC8E5bfNTMlHdA/Tt9GBozrHzC98kreqLY/L5qKjLPGV13m9L+hpebO
+						ncjl+PgLL99ykWDTyzWE4DFrnmOaatds3j5Si0TmgoACVdh81jn29a6ws/fkn2nl
+						ogEC4aAlAyXe0iz6wO13CUDjPfxTPvbu1CnolRhSc08WeuHULTDbYtS7d8KVKmDi
+						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>
diff --git a/swamid-interfederations-2.0/www.westlaw.co.uk-metadata.xml b/swamid-interfederations-2.0/www.westlaw.co.uk-metadata.xml
new file mode 100644
index 00000000..34d29892
--- /dev/null
+++ b/swamid-interfederations-2.0/www.westlaw.co.uk-metadata.xml
@@ -0,0 +1,84 @@
+<?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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDjCCAfagAwIBAgIETjbD0TANBgkqhkiG9w0BAQUFADBJMSkwJwYDVQQKEyBUaG9tc29uIFJl
+						dXRlcnMgKExlZ2FsKSBMaW1pdGVkLjEcMBoGA1UEAxMTbG9naW4ud2VzdGxhdy5jby51azAeFw0x
+						MTA4MDExNTE4NDFaFw0yMTA3MjkxNTE4NDFaMEkxKTAnBgNVBAoTIFRob21zb24gUmV1dGVycyAo
+						TGVnYWwpIExpbWl0ZWQuMRwwGgYDVQQDExNsb2dpbi53ZXN0bGF3LmNvLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjqegY1cVyO5Y8nIZFAoZZitBVfBgocOQt0xCykkT0i7jXKsT
+						2PAtCpLIyHfS6bQk19c0MwT+jeVpoMGEQNT9pBBX6zQvCTrKPO6sK/Zcxdlvuh4AJH0wrUMj6abl
+						vpNUKuA/SLgL3p2PGcvLA3GhV721LW8Z5DuxZw7N423Y0HYOpmlI8+37UBDNHtHJwNmt4Qly8CrB
+						nXb+8/6m3YaYLRCr1lP8Dxq/zWjFWuPd/hj/OFyfsMezOlvzXsjc0ST6YcpRjSiqPYOKgX6g8hMD
+						rePGbr+LAjjfeK5MmWCV/sGI4IC/QnQJ0IZ+caejJYA7G95aZcGKHu5FgDL1b7ES7QIDAQABMA0G
+						CSqGSIb3DQEBBQUAA4IBAQBU/dwEsds+SSTk9SSvUidLWjJT+OGfrdyQitN3M9qpTeSx29VzjxkS
+						/CePYfxhy+1p4D7lNWyUTIL4uoy29c4r52ev/JAVYnlQCie2/ElHuZs/rMlsWCFtZ8+fEAsouaDg
+						l64efxlzyis0f8jv41GaYi/zCp2AG1G6+3ldSlGSPKrEUbvC4L2OcShLpu5Px3yhYBPf/4BvildQ
+						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>
diff --git a/swamid-interfederations-2.0/www.wheredoyoustand.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.wheredoyoustand.org.uk-shibboleth.xml
new file mode 100644
index 00000000..3ed55768
--- /dev/null
+++ b/swamid-interfederations-2.0/www.wheredoyoustand.org.uk-shibboleth.xml
@@ -0,0 +1,91 @@
+<?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>
+      <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>
+						MIIDFTCCAf2gAwIBAgIJAJk9Zq3V7q4aMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGnd3dy53aGVyZWRveW91c3RhbmQub3JnLnVrMB4XDTEzMDUzMDE1MjI0NloX
+						DTIzMDUyODE1MjI0NlowJTEjMCEGA1UEAxMad3d3LndoZXJlZG95b3VzdGFuZC5v
+						cmcudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBIOP3wjI3TysI
+						t2rRpeIE71BV2jCDMXG/1MaiyVOvXOGKvRCIpRD/fbiOo7F/4ItDevi8JG7OgMCA
+						a9vetz10IFyAynsgNYDL/QioF+ioryGsfnpMxOdy12FCx+LcoL3/AoPbRcyQWyp9
+						ZTQe2tx6TrIO0lMoHzVXWtkGg0JbfaySXebbRuczjql1ymTp7PwGWdcU9qayfKlC
+						S92wsvPNs+wYzmKNKqq88fdS27ZgAq3KkOxhXJiUSKuTKDQ2S/9PibTHF8xVuOa6
+						60YT8FHoBJgy8cKjAZysZuFuaVvMfALvAx4XqW7bcrvH2w0yCRX/c2n3FpCoFxuE
+						KcbBVQcrAgMBAAGjSDBGMCUGA1UdEQQeMByCGnd3dy53aGVyZWRveW91c3RhbmQu
+						b3JnLnVrMB0GA1UdDgQWBBSTEMJNGHiMrWb3/4bTPaygblO/YTANBgkqhkiG9w0B
+						AQUFAAOCAQEAaPA+M2xtKHcfs9j5Mlt3Ypm1sWXEHhW/z7zfYmL1mOs3L/QM18Fg
+						qo8GsPj2b3Ezzl4ntzjXOWsE/pbcJY3HsZg+U/ocBGIWfNqqWJw0BlfxfvzC9JD1
+						tWc4qrLnbfG/tPUU7R1LTIj3lJoSn4LEhRxpQwu/H1wY3gnBNPQHu9uvphlL8KUs
+						2VTl/SfeSDXiMGTBu0R11Q/iN01D1FJpmJsTYEYAVvDAOVdbGWzUynXzxg5Tq58b
+						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>
diff --git a/swamid-interfederations-2.0/www.wolvesunion.org-shibboleth.xml b/swamid-interfederations-2.0/www.wolvesunion.org-shibboleth.xml
new file mode 100644
index 00000000..cda0e777
--- /dev/null
+++ b/swamid-interfederations-2.0/www.wolvesunion.org-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml b/swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml
new file mode 100644
index 00000000..2e6a0c0b
--- /dev/null
+++ b/swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml
@@ -0,0 +1,50 @@
+<?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>
+						MIIDODCCAiCgAwIBAgIJAN8rvfQxRosjMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+						BAMTF3d3dy53b3JsZHNjaWVudGlmaWMuY29tMB4XDTEyMDkyMTE4MDY1MloXDTE1
+						MDkyMTE4MDY1MlowIjEgMB4GA1UEAxMXd3d3Lndvcmxkc2NpZW50aWZpYy5jb20w
+						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMBlFtBSLSMwwtYOqU6Upi
+						TYajGEjgmMEr7b7UjV0vWrjGNKspZVXfFGZa27XfhrdZ1ekRPQQ5s5BoxukXuk18
+						SObgG+2PgIYNU888sgimadjowXMMNASBd+mSMYuFz2roY7T3lgYqEB9IApNQzYsV
+						3k/Lj1SC0s/vfkxUxV0RP0qWQi+57f/pS2Z7S0tOyJQ7mxwJ3/DIiJ1yzo1BeRFA
+						MLbwPF1tkI5s/QOjZZdLPkZtCzc9wXFj4GQ82/3eOXpoXO0nNRFyh/DTMwT6djVJ
+						Snc6kWVRct0ZAtKRR6tWuKOvOSijR7ls0g30z5hkGMxhd9OUI+Y51+6zDGAXdsz3
+						AgMBAAGjcTBvME4GA1UdEQRHMEWCF3d3dy53b3JsZHNjaWVudGlmaWMuY29thipo
+						dHRwczovL3d3dy53b3JsZHNjaWVudGlmaWMuY29tL3NoaWJib2xldGgwHQYDVR0O
+						BBYEFCdkPpMBahBeOaQ9iAd+kq7dJXxiMA0GCSqGSIb3DQEBBQUAA4IBAQCM39BN
+						gmVXOVt2zbqKJ5QCKpvs4z5CdOsPiomT71FSGT+mUOVLAjgzvEMxMWinp7f9Bq2a
+						BRVpGFtbUEatr9cF7FzmD0zfXJsrMLRmhvh9QmF4v+AQb4VTlzHNXywyTx9m9rsk
+						LvVmbteXmVHQVOUd5WXjGPzj0e4LpyPbPfXS7wBvugbOUr4wSr5pSVvJq4wBTeKS
+						O9dz5WxRkasHt0ygZSkAdcjHRqgGhJQTPxPCGkGanuRq3AvK4APyBbVmkXTHDTTU
+						VXgvYj3Ojap/CpCctwreorQx6ur/ZMUj0+8TOtPpPeFVv/XCcJ6Yvlb+oBfYMb98
+						mIu7OuMzvnTSQKHo
+					</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:1.0:profiles:artifact-01" Location="https://www.worldscientific.com/action/samlACS" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.worldscientific.com/action/samlACS" 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
new file mode 100644
index 00000000..bdd1d5d1
--- /dev/null
+++ b/swamid-interfederations-2.0/www.yourstudentsunion.com-shibboleth.xml
@@ -0,0 +1,88 @@
+<?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>
+      <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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
+						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
+						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
+						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
+						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
+						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
+						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
+						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
+						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
+						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
+						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
+						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
+						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
+						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>
diff --git a/swamid-interfederations-2.0/www.yourunion.net-shibboleth.xml b/swamid-interfederations-2.0/www.yourunion.net-shibboleth.xml
new file mode 100644
index 00000000..0a124918
--- /dev/null
+++ b/swamid-interfederations-2.0/www.yourunion.net-shibboleth.xml
@@ -0,0 +1,63 @@
+<?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>
+      <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>
+						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
+						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
+						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
+						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
+						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
+						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
+						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
+						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
+						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
+						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
+						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
+						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
+						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>
diff --git a/swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml b/swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml
new file mode 100644
index 00000000..9c1874fb
--- /dev/null
+++ b/swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml
@@ -0,0 +1,85 @@
+<?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>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc: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
+BAMTDXd3dzMuZWR1aWQuY3owHhcNMTQwMjAxMTc1ODA1WhcNMTcwMTMxMTc1ODA1
+WjAYMRYwFAYDVQQDEw13d3czLmVkdWlkLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAyNfO9oxDUu8gABeGHQ6hvtQRYEsp5DnPy40Lugfetbr49eX2
+demuocrQIMUY8i/r1wo+ZRhVtPKYj36/OGUrYh3nNpYsVKO3VIk1CNTWwuQi/wuH
+zH5RUAh0aHGIA4zGYOfUnaczACjxN5aKOuoVlXIJ7eMuVsKGfA8og+VO4A+lhY8B
+pXgk13OuR73wSbbwROHwPQa58rjFir88Al70KycuYTv5F7WcTzBEy+ag6nAGz+fP
+DR9OKWfSepFNqom6PUAUCyXQdjn07sy2EnoE4BODKnX+yueXWaXk8DAwK7uUfk45
+NS7vJEToXCCDBqRJMncNzD9jngIp64SQFIMppwIDAQABo10wWzA6BgNVHREEMzAx
+gg13d3czLmVkdWlkLmN6hiBodHRwczovL3d3dzMuZWR1aWQuY3ovc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUIzEka3BrLts+IxnQs5Vu9e1E3ucwDQYJKoZIhvcNAQEFBQAD
+ggEBABCZ7nwiWmW6njEBHHabyX6FhaurJ73UlDO3JS7mUKjycFkA0HlabWWEeTON
+jcdtHHOzxPodqNe2dtQKa/+fauvTsnKQkBj/f6ESGQAXySuKVgZUs3aXG7C86i01
+lYMJE03P1TwHX60felfwbR4xKRoypz9pOcmqdjxMOpb0+teajFjOShL/Lm0HQs4H
+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>
diff --git a/swamid-interfederations-2.0/wwwtest.york.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wwwtest.york.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..681160d6
--- /dev/null
+++ b/swamid-interfederations-2.0/wwwtest.york.ac.uk-shibboleth.xml
@@ -0,0 +1,89 @@
+<?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://wwwtest.york.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>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wwwtest.york.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>
+						MIIC/TCCAeWgAwIBAgIJAMpppKRb3Aa9MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnd3d3Rlc3QueW9yay5hYy51azAeFw0xMDA0MjgwNzUxMzFaFw0yMDA0MjUw
+						NzUxMzFaMB0xGzAZBgNVBAMTEnd3d3Rlc3QueW9yay5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAOev3cDnTddwIwV1D6Be/OTdiR0bkXVLwVXg
+						BQrPVS7agammnWqmr6IMSHUrrx7SE83W8Bnsd2pZwWKd9sYLOuldcuROSMJPWHNk
+						x4S876XI/gTzciuw6pUOI+lfW/eTcXzFsnPeo1Co+ixURSAp6mg5MG3LzOmNgqN6
+						zElyuEIEnopnccPWYYH0Sx7J+frN39FT8dRlm7p0i/iK0aQHTLBM3m1lmVthdXeo
+						6e6SnEqAEkw9yWdBAoGUiXrYL3sxkJl1Osgs6JknHnzemDgJM4oKiFOsLZ9dUlc5
+						mdyXyn4DMczvdbAk28TkBlvzobbaRQJmlssLL75TsL+VW90Hq38CAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISd3d3dGVzdC55b3JrLmFjLnVrMB0GA1UdDgQWBBR+cm91kjXz
+						R9qmvtX0UMEs+TryyTANBgkqhkiG9w0BAQUFAAOCAQEA2yvE/7/5Vz+BNFPKtv6L
+						LEnLoFhzJpS4w0JOX/Z2Ym+R9DkAVVaN9ePlkkfy16T4j6OzXTTa3fu8oauayw5d
+						x4KCqeD/mTbE4kSJImNOofh+Jm35ImXFTiLS7kGljl+eVgmclxo6mxMs/fzPQ49o
+						uKlO4U5whclaxTEbsmsZ9JgLKEQUilHUzTqp6/EbuIo8ixC/tl1QdS2e1VQ3rAzj
+						DnkGe+8RmWThnmvC3CfOTlTFg89iembQ/DhtG5b8xsGcGEbSbBixtfzgQ+sfTQhC
+						4ck/5yXbFICjI9Ev6zmgYQXlhkOh7SC4uIgmef8PDpBcKBs3QlwgTkmCOHkohf/+
+						Ig==
+					</ds:X509Certificate>
+        </ds: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/TCCAeWgAwIBAgIJAMpppKRb3Aa9MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEnd3d3Rlc3QueW9yay5hYy51azAeFw0xMDA0MjgwNzUxMzFaFw0yMDA0MjUw
+						NzUxMzFaMB0xGzAZBgNVBAMTEnd3d3Rlc3QueW9yay5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAOev3cDnTddwIwV1D6Be/OTdiR0bkXVLwVXg
+						BQrPVS7agammnWqmr6IMSHUrrx7SE83W8Bnsd2pZwWKd9sYLOuldcuROSMJPWHNk
+						x4S876XI/gTzciuw6pUOI+lfW/eTcXzFsnPeo1Co+ixURSAp6mg5MG3LzOmNgqN6
+						zElyuEIEnopnccPWYYH0Sx7J+frN39FT8dRlm7p0i/iK0aQHTLBM3m1lmVthdXeo
+						6e6SnEqAEkw9yWdBAoGUiXrYL3sxkJl1Osgs6JknHnzemDgJM4oKiFOsLZ9dUlc5
+						mdyXyn4DMczvdbAk28TkBlvzobbaRQJmlssLL75TsL+VW90Hq38CAwEAAaNAMD4w
+						HQYDVR0RBBYwFIISd3d3dGVzdC55b3JrLmFjLnVrMB0GA1UdDgQWBBR+cm91kjXz
+						R9qmvtX0UMEs+TryyTANBgkqhkiG9w0BAQUFAAOCAQEA2yvE/7/5Vz+BNFPKtv6L
+						LEnLoFhzJpS4w0JOX/Z2Ym+R9DkAVVaN9ePlkkfy16T4j6OzXTTa3fu8oauayw5d
+						x4KCqeD/mTbE4kSJImNOofh+Jm35ImXFTiLS7kGljl+eVgmclxo6mxMs/fzPQ49o
+						uKlO4U5whclaxTEbsmsZ9JgLKEQUilHUzTqp6/EbuIo8ixC/tl1QdS2e1VQ3rAzj
+						DnkGe+8RmWThnmvC3CfOTlTFg89iembQ/DhtG5b8xsGcGEbSbBixtfzgQ+sfTQhC
+						4ck/5yXbFICjI9Ev6zmgYQXlhkOh7SC4uIgmef8PDpBcKBs3QlwgTkmCOHkohf/+
+						Ig==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of York</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of York: Test version of main York website</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/x-oecd-beta-01.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/x-oecd-beta-01.ingenta.com-shibboleth.xml
new file mode 100644
index 00000000..7fe305d0
--- /dev/null
+++ b/swamid-interfederations-2.0/x-oecd-beta-01.ingenta.com-shibboleth.xml
@@ -0,0 +1,60 @@
+<?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>
+						MIIDnDCCAoSgAwIBAgIEU2tnmDANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
+						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
+						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTE0MDUwODEx
+						MTY0MFoXDTI0MDUwNTExMTY0MFowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
+						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
+						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
+						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+						AQoCggEBAJhZ4xIrZ0sdEnD8M8ZTpP6YaSyA0jsfK/rNMLTGeVFgeN/2yS2RYMYa
+						PwL2kr+NG1Q/EhoY2LPsdeleBEweBW0oqyinPCEskfEQJAw6FWYS8UtFBITxLhRG
+						RVQgTB6XzfTOQaLS3EzCrWKtT3BsUtM5nwBQmVBOIcjaFGQFfA1Qk4yXcPfHoABU
+						o+mCN7DUMI8zSZ7LqLxv2/Q3WeNy5CTwFjbl2HifcTaVXMmk3Ym2jFmOQnHU67lC
+						bCkknfPsecfFoZOdi+8KeLoe+1fIfhkzxA3kT1xm+3C6FgZ6TnTJfydIVWDedord
+						ijT+CPprceWHZXjfIllVRo5jGgX1QqECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+						PPTJxpYCAYlDv2El6CJm0vHAK8nlNTBRqudglU19cK8uCgiGkaWERurPqG90SnXB
+						WXDH1cKUQUxzbYFY3hIRi1KPvHnIGkp+HDjgyB2sBJRCPpAs9t0Th1m3IjDNH6Fx
+						F5dS4ldukylOJ9etIM+IUZEGR3/lOYlOBVOPfb3cUIekFaWVb/MfVV/wvx95DqyC
+						4Nf3zHiJEikNgFwI1sVwDWGBtxQQc1bfDL4Q/r2SMGR0KlRoArLX5MEDnxs/hnNT
+						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">Publishing Technology 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@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Babu</md:GivenName>
+    <md:SurName>Panneerselvam</md:SurName>
+    <md:EmailAddress>mailto:babu.panneerselvam@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Talvinder</md:GivenName>
+    <md:SurName>Matharu</md:SurName>
+    <md:EmailAddress>mailto:Talvinder.matharu@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/x5-poc.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/x5-poc.bsp.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..c12ad651
--- /dev/null
+++ b/swamid-interfederations-2.0/x5-poc.bsp.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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://x5-poc.bsp.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-23T12:29:44Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://x5-poc.bsp.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>
+						MIIDFTCCAf2gAwIBAgIJAMdr2z4/Liv2MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE3g1LXBvYy5ic3Aub3guYWMudWswHhcNMTIwNTE4MTQ1NzQwWhcNMjIwNTE2
+						MTQ1NzQwWjAeMRwwGgYDVQQDExN4NS1wb2MuYnNwLm94LmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtqQqj6F4saV794vfadGlVcOtJ/heiGE8
+						TJJrh7/eHH60AzhleK1NJh/NFunFslWEaIoqOE6SlgZe+NypsanyaGo3ygQHxXba
+						4Vq6dzvOj1LRF6YxA29AMtF8vSTcxKNnKnpa4OimrIIifVZrt0vCxnBvylmfGiQz
+						zQXdEcKVeaaVne+j1oO8eKqbFBV/p4DKKmdLJykMDRhSnx1wO8n4y/Xhojc0OgFl
+						Ou+y9vzPOIfvDyKZM02WpVJwec9TJFrYoNecjhcJk/mKkVf1sH6YeBlqbtb2AaZO
+						FWZAKFOuqr3JGqNVmz7d6S64i96oT1sljJp0LAHTKgPlPtLTXn4TPQIDAQABo1Yw
+						VDAzBgNVHREELDAqghN4NS1wb2MuYnNwLm94LmFjLnVrhhN4NS1wb2MuYnNwLm94
+						LmFjLnVrMB0GA1UdDgQWBBSX8k+Umv4AqD325y80eaY9ha72TDANBgkqhkiG9w0B
+						AQUFAAOCAQEAOSdfNDLlhZvQcNwLb59aEbtIwUoCGpGP5ky2xPsKpaqnP9HUjzDu
+						9fqcQn4Uwfd/YTIMrvOerS1va77Z7BG6y6KISDfsHz/hZZYAgUWSAtGRyqGX0Czm
+						kVGgg6ASKtS7xje/JMYfJqwGimQG1nTKNIXs/YuMletUOxc9gUUJLyEMo26Eg7ac
+						a0FFxRRMcq9opIQl4EfXb7M6F7MMDwlP9o1ZZXh93oW32qyl5S+3NaRhUrnapRSC
+						TjPbpaP3feSUwE1wNVX0bznzNvnUR8Zov+/ZP6RtdsogtRjHJcIoEjhMaA+dLl8e
+						AWNCOFrJI/ZEstVwoK3oUpt8kPGT1PrDtg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: X5 Proof of Concept Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nick</md:GivenName>
+    <md:SurName>Letellier</md:SurName>
+    <md:EmailAddress>mailto:nick.letellier@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/x5-qa.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/x5-qa.bsp.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..4f5233ed
--- /dev/null
+++ b/swamid-interfederations-2.0/x5-qa.bsp.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,61 @@
+<?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://x5-qa.bsp.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-23T09:48: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>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://x5-qa.bsp.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> 
+						MIIDETCCAfmgAwIBAgIJALT+QUXBSZeDMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+						BAMTEng1LXFhLmJzcC5veC5hYy51azAeFw0xMjEwMTkwOTQwMTJaFw0yMjEwMTcw
+						OTQwMTJaMB0xGzAZBgNVBAMTEng1LXFhLmJzcC5veC5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAKEKyMazhRGGodfwZDljiQZOKgx73F7nJpR1
+						OotpgBlUw06aUI8ayaz38THfi3HeEcbqMrVWo/gO9l/hrbtqTzQ6pW39204BKoyv
+						aeiT3y7Zox8Dn6tjJUsOVFMVCy4hDLoJ577IdL3yX42zeGsbLkzvGJcJ2C4HsW1m
+						FXWFUv1fSKm76W/cFQF0HuJ1hCZ8DOcnpoAmokE0jPerGbRKWJewQ3+xaB7SNqp9
+						icNxIzOmnd4eFFxP/6veM3ckBF1bbWAOB1fQRBdGK24JQMIC9J/ibuwf/QTMzD2i
+						iBjVCIDnILrVdBbSLtVmKNMFZOK2sBiL7IYuXtuoIWf9RWh1zvECAwEAAaNUMFIw
+						MQYDVR0RBCowKIISeDUtcWEuYnNwLm94LmFjLnVrhhJ4NS1xYS5ic3Aub3guYWMu
+						dWswHQYDVR0OBBYEFMjXSu1rl1SQXLkzWctcqzz3VhapMA0GCSqGSIb3DQEBBQUA
+						A4IBAQAhPszsE9vpMD9xqO6tnXMzEDRHeubZQRfpUUq3Wu/YAGEnZkmA0dAtlvPX
+						V5QxXhK9IGLYrxLuwlOzgowb001uyvxxqhbTdAFmKB7wabWLnBg/8SJpDBp6sBMe
+						fa4OJ3NZ17FN/EkXtp9VDQO992x8OsFYwZcLrHxBaQqC9lcCskIm04b5AQUc8STU
+						MwNUAkof7SVjRHh6YDDJ1rm8GteKWMgzsoArLLRKtPpOXRHxKWwnbO2zrkK6cUO5
+						M3orN7xlXTBbSgM6UXtpTyXPXDf7GbwhN6q0dhHN0+YZY9mr0L2dq6Detym7fOVF
+						dOSjq/lxxyKOR4Ey9R9suqDKD1EB
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - X5 QA Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Malin</md:SurName>
+    <md:EmailAddress>mailto:ben.malin@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/x5.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/x5.bsp.ox.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..8b15f004
--- /dev/null
+++ b/swamid-interfederations-2.0/x5.bsp.ox.ac.uk-shibboleth.xml
@@ -0,0 +1,82 @@
+<?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://x5.bsp.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="2013-01-29T15:16:45Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://x5.bsp.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>
+						MIIDBTCCAe2gAwIBAgIJAMmy4gd9Qw27MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+						BAMTD3g1LmJzcC5veC5hYy51azAeFw0xMzAxMjUxNTAwNTlaFw0yMzAxMjMxNTAw
+						NTlaMBoxGDAWBgNVBAMTD3g1LmJzcC5veC5hYy51azCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAOFtH+ma1qU5/TPtzKAw6kjCFpZo460ST1gggaVG1gHg
+						rHSiXf5G53yk5yG4BNFYAj2TFa0aJBJM+JFHMLRxI1A96EZcLYasi4r2yShxd9r6
+						0yeZKxp2ljKOy28B7u6gfML+14ReEbPVVs+yFIjCwTP4Igs93AwTYLDQeo8TuDFI
+						112MXK9aod7rAAQlwhxFuge3+BaXAyENiMUxAJ+4g4efgGGoQMAxSw3USt1FJAtx
+						FMs6Ei2MC86gvdgEaukQxV9sF3tDYI6yfi7gJD3F39xplIljacz9z/fs1zwCV8CD
+						tmhubbNyPxxp1fq3x177UCXyvGDT/E1ChVqgwhfVWM0CAwEAAaNOMEwwKwYDVR0R
+						BCQwIoIPeDUuYnNwLm94LmFjLnVrhg94NS5ic3Aub3guYWMudWswHQYDVR0OBBYE
+						FFZISugxUOdaP19x8/pT/4sdzlP4MA0GCSqGSIb3DQEBBQUAA4IBAQCw5dR+3EKz
+						1sfuEvuI/fYOEHs81jR7PJyvPSt4pIgeDo+m3TxHg9vaoFt9fp3NHGkxYZ+6Qtkr
+						YySBeZqK5UvzABWOuiQz8KAV0Mszpviq+4lfOPLzlzaMhhARaoYAbrI+swsaBUU3
+						sfCX4Mmafa9YAvR9dps3qU0IKV4IVgtWnSMdUGItfLYWGYvlKiIAOO0xlMhvePgM
+						ARFRTzU8SdMVEwAsweXn0M1EVugrJJilALPCqkBvA843J0QnGS8IpT0s+4r6WeO2
+						ZJLbXz5vPPbE/bi5SJyjQdaOT6V2r2gvdedt1jvB2NQSWW85QktE3yAvxmLXGoyJ
+						ngpHHGJFadEq
+					</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://x5.bsp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5.bsp.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://x5.bsp.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://x5.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://x5.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://x5.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://x5.bsp.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 - X5 Live Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Operations Team</md:GivenName>
+    <md:EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jason</md:GivenName>
+    <md:SurName>Harris</md:SurName>
+    <md:EmailAddress>mailto:Jason.Harris@it.ox.ac.uk</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
new file mode 100644
index 00000000..daf73904
--- /dev/null
+++ b/swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml
@@ -0,0 +1,95 @@
+<?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>
+						MIIEvjCCA6agAwIBAgIRALSYUpFQm2Mr61Bf8QmF8iIwDQYJKoZIhvcNAQEFBQAw
+						ga4xCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhJbGxpbm9pczEQMA4GA1UEBxMHQ2hp
+						Y2FnbzEhMB8GA1UEChMYVHJ1c3R3YXZlIEhvbGRpbmdzLCBJbmMuMTYwNAYDVQQD
+						Ey1UcnVzdHdhdmUgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0EsIExldmVsIDIx
+						HzAdBgkqhkiG9w0BCQEWEGNhQHRydXN0d2F2ZS5jb20wHhcNMTIxMDA4MTExMzMw
+						WhcNMTUxMDA4MTIyNTIyWjBzMRowGAYDVQQDExF3d3cueHBlcnRoci5jby51azEP
+						MA0GA1UEBxMGU3V0dG9uMQ8wDQYDVQQIEwZTdXJyZXkxCzAJBgNVBAYTAkdCMSYw
+						JAYDVQQKEx1SZWVkIEJ1c2luZXNzIEluZm9ybWF0aW9uIEx0ZDCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBAMgoLbdAtISqHU+dde46IYDoRyBmip0Mlgo/
+						zLl/sg/gJlErbbhQTtOAFzzmS5E8H8gsCmz8gDu+oCoXfAMHN46AAG0jF/rked1k
+						JRn9rYCTq04f/rfVO/VBQ7zqQG4Vi9dcH6ujY6osH1VECtvjxxcM7ClAeK5TdLfF
+						87+hX32HHreQW/BhmmeDSlr4uZA8zayUDC4XiTc4xV8TymY4+ugYCPX23x+h+O0W
+						Tp8I7mCpwvmm2YL+RFH27ic+nyM2fsX9HAtyLr9sRGajY0F4kDVPjg7F1/NY8q4N
+						Y6/gyvZBUrDgzhYrvfuVSt0On8oNayiywOVvri8CA4OnNv85XocCAwEAAaOCAQ8w
+						ggELMAkGA1UdEwQCMAAwHQYDVR0OBBYEFGgErn/u6irVYnZSfjMK45hhaYoKMB8G
+						A1UdIwQYMBaAFF3ZlppAxyfLLJui7M8Zq8ivzIZIMAsGA1UdDwQEAwIFoDAdBgNV
+						HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwNQYDVR0fBC4wLDAqoCigJoYkaHR0
+						cDovL2NybC50cnVzdHdhdmUuY29tL09WQ0FfTDIuY3JsMFsGA1UdIARUMFIwEgYQ
+						KwYBBAGB7RgDAwMDBAQDADA8Bg8rBgEEAYHtGAMDAwMEBAMwKTAnBggrBgEFBQcC
+						ARYbaHR0cDovL3NzbC50cnVzdHdhdmUuY29tL0NBMA0GCSqGSIb3DQEBBQUAA4IB
+						AQC/jvJs1ktcF4uc/qsOU7zH09JTUAYlD9sjbiPA/jO6jdS020qNfZWoirE0euSW
+						YvT+hpaF9jQ4+Spr2neCm0Y4/B2x8/A/rkZBjWoXLXaVUff4RVmlNtGUAupAkw/p
+						7tjZBMHlmaa28Ew7fV8G4m29tGiUSoANPjEu0UT2VRGLBDtFzXoA7Yft92bG783T
+						xLu6rzjVV2yvfpY5GtPhDMj2T0NQ5COaJW/DLERB3g0nRAp5KQ3y4L+5gfo+z4m8
+						RzJhXAeY8xmxUXMrlFAnvEUWiroABVYj3ibtQhF3zIPj75Sh/LWR0JT6LPi0+Oad
+						wgtaLXzI5Rb185tFhF2ObFsY
+					</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>
+						MIIEMTCCAxmgAwIBAgIRANJmy62dRlQsRbM9eBFfwaUwDQYJKoZIhvcNAQEFBQAw
+						SDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9u
+						MRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTAeFw0xMjA3MjUwNzM2NDFaFw0xNTA4
+						MjYwOTAxMTZaMHExGDAWBgNVBAMUDyoueHBlcnRoci5jby51azEPMA0GA1UEBxMG
+						U3V0dG9uMQ8wDQYDVQQIEwZTdXJyZXkxCzAJBgNVBAYTAkdCMSYwJAYDVQQKEx1S
+						ZWVkIEJ1c2luZXNzIEluZm9ybWF0aW9uIEx0ZDCCASIwDQYJKoZIhvcNAQEBBQAD
+						ggEPADCCAQoCggEBAMgoLbdAtISqHU+dde46IYDoRyBmip0Mlgo/zLl/sg/gJlEr
+						bbhQTtOAFzzmS5E8H8gsCmz8gDu+oCoXfAMHN46AAG0jF/rked1kJRn9rYCTq04f
+						/rfVO/VBQ7zqQG4Vi9dcH6ujY6osH1VECtvjxxcM7ClAeK5TdLfF87+hX32HHreQ
+						W/BhmmeDSlr4uZA8zayUDC4XiTc4xV8TymY4+ugYCPX23x+h+O0WTp8I7mCpwvmm
+						2YL+RFH27ic+nyM2fsX9HAtyLr9sRGajY0F4kDVPjg7F1/NY8q4NY6/gyvZBUrDg
+						zhYrvfuVSt0On8oNayiywOVvri8CA4OnNv85XocCAwEAAaOB7DCB6TAJBgNVHRME
+						AjAAMB0GA1UdDgQWBBRoBK5/7uoq1WJ2Un4zCuOYYWmKCjAfBgNVHSMEGDAWgBRC
+						MrYW+gT9/l1LesP990xAHVpDrzALBgNVHQ8EBAMCBaAwEwYDVR0lBAwwCgYIKwYB
+						BQUHAwEwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5j
+						b20vU1RDQS5jcmwwRAYDVR0gBD0wOzA5BgxghkgBhv1kAQECAwEwKTAnBggrBgEF
+						BQcCARYbaHR0cDovL3NzbC50cnVzdHdhdmUuY29tL0NBMA0GCSqGSIb3DQEBBQUA
+						A4IBAQBA3ueO9F9vI4eJb8trFi90caKoxvQ77Kwb5sOI1dQ8V8G4ZkzdDErZk0R2
+						GoJNUBSisafG04hEeF67v+SwJLx7Ye7V+wVFgrl3ux6PvaBcwEmaI43cUSVHoHDm
+						M0EYhrObf103NP8ecuzf2gu15uQt8uxId0CJJRdkis+Mq7JMM1aI40lcKZtBZMC0
+						k013yqpgBpqjDxGKgpWjzyI/uWDuXAQw58WP3MOSRUU/Um6cXwTKqjAatfrIrhf0
+						Bp7+ojPob81sAJqxNbAGbXvZLGS0U/juaLi7aNje+DnqwUkQIpVnVtE5n2HLvkbh
+						qgB6j/wEdhppfAvFEntHvow73izn
+					</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>David</md:GivenName>
+    <md:SurName>Shepherd</md:SurName>
+    <md:EmailAddress>mailto:david.shepherd@xperthr.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Farr</md:SurName>
+    <md:EmailAddress>mailto:Andrew.Farr@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
new file mode 100644
index 00000000..83729fc0
--- /dev/null
+++ b/swamid-interfederations-2.0/xploreuat.ieee.org-shibboleth-sp.xml
@@ -0,0 +1,48 @@
+<?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>
+						MIICtjCCAZ6gAwIBAgIEUcCIQjANBgkqhkiG9w0BAQUFADAdMRswGQYDVQQDExJ4cGxvcmV1YXQu
+						aWVlZS5vcmcwHhcNMTMwNjE4MTYxODEwWhcNMTYwNjE3MTYxODEwWjAdMRswGQYDVQQDExJ4cGxv
+						cmV1YXQuaWVlZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMJ0TBsTib1e6j
+						9YowCopEZ42Qa2Sie35zYvVOPBYQtPaFH8vnCvRZM83gVKxj3G8LCyu7XnHfjm8unR5jUn6tmI4N
+						H+G13cIwC12p1dkot2SxPTh7H6rWMdJiQMQJ00INgpeKE3dB3D6GxcuWjwYLsts8lvk8IuhCjuIh
+						5FwDrFPD0T1HNIArg3y7iE9mMAPWr6lAFwHkHfGl9fb6Ic6ihxeFyDwOfPlmSZV0ivUq7+rteEQY
+						b8h4Rr2pSLkL7ZTcYMrLjXFzca8cOdlaf+oTGWFik7/vGrsCAPSdF4tZnJ1xFl+EqOBJyCsGabYi
+						TlVsq0dLwi35ewh0/tgTFMiJAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAH5knWR/f9aq52LG1uQO
+						YnqWj7GwU+6MT9UxPZllvUVrb0icSxiAAlQ0+PqmQtL59vOYnP/ndFMKR0cYFKBoLMKIGfuo8/4q
+						aUyBHHvMbPErbc2518DH4BnD4e6nHY1+2EqispzNkohx2cyHRM/LuvQGjHEFPgV0eadjKT75rPKQ
+						d10xGdIKPL1f38NkoMsALGAPI5vhXnMD3xihF1VgIk1jFV96FQh6TBY7TwRBeAwv0MsKx9njtST1
+						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>
diff --git a/swamid-interfederations-2.0/youidlite.youid.net-idp-shibboleth.xml b/swamid-interfederations-2.0/youidlite.youid.net-idp-shibboleth.xml
new file mode 100644
index 00000000..c993f19d
--- /dev/null
+++ b/swamid-interfederations-2.0/youidlite.youid.net-idp-shibboleth.xml
@@ -0,0 +1,97 @@
+<?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>
+      <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
+						ZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCBYPbq7OB/Qqs8F6U5
+						vJ9e1oAwLlW17j2DMTV3vGqBk+F3Er1Zu97STKlhRQNHdBrH5S176Re2xbYyHQyc
+						erLd5rc8Gd0gCMr2TtvmXoCLOT1ToObM6pZy014yCrGUjtaI0z6HxZKsGi+QtDPi
+						s9AYYhINTv4MJyuZWH0a5w2YgoU0gQAvubCGeHmtbT/fEC0kcXCOXcljXJONyZVl
+						dH6PTlSxzuU44lLDssvrnPnb07pQLbV9oXtZBN5Tp/7UA8JM5d+VMC1vqcM2Mjm2
+						cm7pQz9hLAQschFh2jv/uHqyrH+0BibfVssQj2H+KjPk6qHmpkwt92rW+Jn7Bh3N
+						NcbTAgMBAAGjbTBrMEoGA1UdEQRDMEGCE3lvdWlkbGl0ZS55b3VpZC5uZXSGKmh0
+						dHBzOi8veW91aWRsaXRlLnlvdWlkLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
+						FgQUAteTwYYaGMljF20EP0WeZ76psFIwDQYJKoZIhvcNAQEFBQADggEBAA1uyLQR
+						RAGMPHDD+fis2bqS7Fz2GyXx/EsjW6GccOVGMShLcuDitzeI8YqNwvPK3AJY9pyW
+						FjsLULR++K2RTNhXAAsG+kL7aHT8GtP8u8T304stuPgLG87BrIatXiizUPUnUaMv
+						sz3EKWbnTP4qt1U4EkcuMQs9XBcNlvF9DTe4FdSA477b7Rr0slBDXEtysxAlZr70
+						QqCLOxffcf6mmPf44qfkgnYOroEeF2zDHUiwUFFdGNnJ0TxpddCLwAzdZ7nZl9ah
+						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>
+						MIIDNzCCAh+gAwIBAgIUa8xPw+mOVIxAKWoeoNJ1T1hc6p4wDQYJKoZIhvcNAQEF
+						BQAwHjEcMBoGA1UEAxMTeW91aWRsaXRlLnlvdWlkLm5ldDAeFw0xNDA2MTExMjQ4
+						MDhaFw0zNDA2MTExMjQ4MDhaMB4xHDAaBgNVBAMTE3lvdWlkbGl0ZS55b3VpZC5u
+						ZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCBYPbq7OB/Qqs8F6U5
+						vJ9e1oAwLlW17j2DMTV3vGqBk+F3Er1Zu97STKlhRQNHdBrH5S176Re2xbYyHQyc
+						erLd5rc8Gd0gCMr2TtvmXoCLOT1ToObM6pZy014yCrGUjtaI0z6HxZKsGi+QtDPi
+						s9AYYhINTv4MJyuZWH0a5w2YgoU0gQAvubCGeHmtbT/fEC0kcXCOXcljXJONyZVl
+						dH6PTlSxzuU44lLDssvrnPnb07pQLbV9oXtZBN5Tp/7UA8JM5d+VMC1vqcM2Mjm2
+						cm7pQz9hLAQschFh2jv/uHqyrH+0BibfVssQj2H+KjPk6qHmpkwt92rW+Jn7Bh3N
+						NcbTAgMBAAGjbTBrMEoGA1UdEQRDMEGCE3lvdWlkbGl0ZS55b3VpZC5uZXSGKmh0
+						dHBzOi8veW91aWRsaXRlLnlvdWlkLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
+						FgQUAteTwYYaGMljF20EP0WeZ76psFIwDQYJKoZIhvcNAQEFBQADggEBAA1uyLQR
+						RAGMPHDD+fis2bqS7Fz2GyXx/EsjW6GccOVGMShLcuDitzeI8YqNwvPK3AJY9pyW
+						FjsLULR++K2RTNhXAAsG+kL7aHT8GtP8u8T304stuPgLG87BrIatXiizUPUnUaMv
+						sz3EKWbnTP4qt1U4EkcuMQs9XBcNlvF9DTe4FdSA477b7Rr0slBDXEtysxAlZr70
+						QqCLOxffcf6mmPf44qfkgnYOroEeF2zDHUiwUFFdGNnJ0TxpddCLwAzdZ7nZl9ah
+						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>
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
new file mode 100644
index 00000000..efac7b75
--- /dev/null
+++ b/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081-shibboleth.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 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: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>
+      <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>
+MIIEpTCCA42gAwIBAgIRAK+9wyhwi2cPugqoTWMzt7wwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMEwxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEnMCUGA1UEAxMeemVyb3NoZWxs
+LmlyY2NzLXN0ZWxsYW1hcmlzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAovLKJXlXtWpDN5QxJI/gsBNZb1qMKFC28k/8KNMWRK1J7iJnvSB10qxY
+DIp/N9f5KuOfE/LWEpn0CRYczS0lKvT9ZHxvu//dXF83+CTuwLdYLInlx98gS47K
+eKoJkTSCS3i6nXXu5pkZ3r73eO4Q9F78kWhZp9VGO6FXcqpAWPDXPiX4tySlnZHE
+bVcgKzrop4mYMEwj6/etuqid2FIEE8cttyn0TSZIAqQpvQl6ny53Ew/zNYrfT2yY
+oJhWt7tdGo+icZJ8ajJU1QTAZjGdrxZOcdrVTO8+2G3p6wXIBApEOlY1GtpVvSHy
+tQbatYv3lqykV7sU4fWYcAJ0c1XyIQIDAQABo4IBljCCAZIwHwYDVR0jBBgwFoAU
+DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBSOJjQD1lbPrYadWn8cPsv5
+C+CBMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeB
+DAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzBEBgNVHREEPTA7gh56ZXJv
+c2hlbGwuaXJjY3Mtc3RlbGxhbWFyaXMuaXSCGXdpZmkuaXJjY3Mtc3RlbGxhbWFy
+aXMuaXQwDQYJKoZIhvcNAQEFBQADggEBABmEJgMv0YbYXVbsojatdIXj8AJo0E9Z
+sCjTrGicfPXMqCBo1/h+k2fKfkBEZHgMH+bg/VwSzwnU6LSMnMPZWsHQ6dof697Y
+RLeYr22GJWHkTrHWH+ur2FaB/VzMaRMpBnK084mSrnKmKI2hTHdrv7wYX8lnuYhs
+2k87PGWZAyyfdes9ciVS+wtLVpiauMYkvbdeiYwFkjQaRAWfxzfuXLlDfHT6OD/2
+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>
+MIIEpTCCA42gAwIBAgIRAK+9wyhwi2cPugqoTWMzt7wwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMEwxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEnMCUGA1UEAxMeemVyb3NoZWxs
+LmlyY2NzLXN0ZWxsYW1hcmlzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAovLKJXlXtWpDN5QxJI/gsBNZb1qMKFC28k/8KNMWRK1J7iJnvSB10qxY
+DIp/N9f5KuOfE/LWEpn0CRYczS0lKvT9ZHxvu//dXF83+CTuwLdYLInlx98gS47K
+eKoJkTSCS3i6nXXu5pkZ3r73eO4Q9F78kWhZp9VGO6FXcqpAWPDXPiX4tySlnZHE
+bVcgKzrop4mYMEwj6/etuqid2FIEE8cttyn0TSZIAqQpvQl6ny53Ew/zNYrfT2yY
+oJhWt7tdGo+icZJ8ajJU1QTAZjGdrxZOcdrVTO8+2G3p6wXIBApEOlY1GtpVvSHy
+tQbatYv3lqykV7sU4fWYcAJ0c1XyIQIDAQABo4IBljCCAZIwHwYDVR0jBBgwFoAU
+DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBSOJjQD1lbPrYadWn8cPsv5
+C+CBMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeB
+DAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzBEBgNVHREEPTA7gh56ZXJv
+c2hlbGwuaXJjY3Mtc3RlbGxhbWFyaXMuaXSCGXdpZmkuaXJjY3Mtc3RlbGxhbWFy
+aXMuaXQwDQYJKoZIhvcNAQEFBQADggEBABmEJgMv0YbYXVbsojatdIXj8AJo0E9Z
+sCjTrGicfPXMqCBo1/h+k2fKfkBEZHgMH+bg/VwSzwnU6LSMnMPZWsHQ6dof697Y
+RLeYr22GJWHkTrHWH+ur2FaB/VzMaRMpBnK084mSrnKmKI2hTHdrv7wYX8lnuYhs
+2k87PGWZAyyfdes9ciVS+wtLVpiauMYkvbdeiYwFkjQaRAWfxzfuXLlDfHT6OD/2
+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>
diff --git a/swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml
new file mode 100644
index 00000000..473d8f32
--- /dev/null
+++ b/swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zetoc.mimas.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-07T14:00: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>
+      <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>
+						MIIEKDCCAxCgAwIBAgIJAODl1JSkgO8pMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYD
+						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
+						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
+						CxMFTWltYXMxGjAYBgNVBAMTEXpldG9jLm1pbWFzLmFjLnVrMB4XDTEzMDUzMDE1
+						MzE0OVoXDTIzMDUyODE1MzE0OVowgYoxCzAJBgNVBAYTAkdCMRMwEQYDVQQIEwpN
+						YW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVyMSUwIwYDVQQKExxUaGUgVW5p
+						dmVyc2l0eSBvZiBNYW5jaGVzdGVyMQ4wDAYDVQQLEwVNaW1hczEaMBgGA1UEAxMR
+						emV0b2MubWltYXMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQCjrE063k8TK8+loGlnrm+DMGxnoUUE1Q1dBljnc6krZnlwQVN4FoYMmcRBeJ++
+						gvlWb9OepFILRWrMZyeKbsVGS7P+i1YKP6qPtU6dGYwxiSCmnMyZJJ1zbYbmKVyY
+						LSfJLqROoGGpBbvQWFhvXxVFLvhXIATtW4xXp0m0nIi57Km1NIz8qoCqbJ2aWMzQ
+						t6rDAHx60NmMEl6umlz/CE+XnfVQP9TSCkwEMsO7FLuXwhsMapIgYGpAV4SMLBjz
+						nYEUpuur9EEVd0MnlD8Nq+nqr8Nt5VQc6RYlFFcszLsTNaXJCxdtcH7PeKhMaY+C
+						K8xQPxLnHBSpW3d/HhAyeWaFAgMBAAGjgY4wgYswCQYDVR0TBAIwADALBgNVHQ8E
+						BAMCBLAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBwGA1UdEQQVMBOC
+						EXpldG9jLm1pbWFzLmFjLnVrMDQGA1UdEgQtMCuBKW1pbWFzLXNoaWItdGVjaEBs
+						aXN0c2Vydi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBD2LxB
+						NOJMU4rrC/TqxFJI7WCvR1z3RORHHhyxV6QSnvU+yTx348XwTrfW9y67QAQtm772
+						4DuF/gVoQE3lVt5sGIr96szEsIHasz16+Q3leVlV8IHwb7LZS8q3g/i/CnKZ4kBO
+						dfjaDQiMvmvpzrWAQKW2W7/0U2cNq1eYCr4gP/xdQiEKmKbqEBo8p21F4+sGCxHx
+						9mtElQ0wBqV3xGSLzoh0hGDR7a94kskUA0ilTZC2bHsHf2jH65kZs+oc7Po+eqpj
+						hwLrdq22270F8hgo4EPDPAgngmgL4YHNU5vXfO8C2qbdJwF6Ie4wI5U/SeiARYiO
+						HzhFwIeEOToreweN
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zetoc.mimas.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://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://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://zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://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://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://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">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/zididp.uni-graz.at-idp-shibboleth.xml b/swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml
new file mode 100644
index 00000000..89180971
--- /dev/null
+++ b/swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml
@@ -0,0 +1,170 @@
+<?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>
+      <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>
+MIID8TCCAtmgAwIBAgILAQAAAAABHJ3GXLgwDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
+bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
+MDkyNjA4Mjg1NFoXDTExMDkyNjA4Mjg1NFowgZwxCzAJBgNVBAYTAkFUMSgwJgYD
+VQQKEx9LYXJsLUZyYW56ZW5zLVVuaXZlcnNpdGFldCBHcmF6MQwwCgYDVQQLEwNa
+SUQxHjAcBgNVBAMTFXppZDEyOTE1Mi51bmktZ3Jhei5hdDEYMBYGA1UEAxMPaWRw
+LnVuaS1ncmF6LmF0MRswGQYDVQQDExJ6aWRpZHAudW5pLWdyYXouYXQwgZ8wDQYJ
+KoZIhvcNAQEBBQADgY0AMIGJAoGBALtSK1LsNVQ3eyIh4bS3fAmwjAHCzq1jd9NU
+wQFHrFPTzhObsZQM1Pc//QnTXH3x9bSAebR8WI+SmlRpe/p7BvGkEQDS45k6UZ7Y
+CicOizdCqN/iLr/XqwkUFcmVXN/mcoWFsc+637MUqj6O/Yl3f5jTRwacxUgn9pSs
+JHw9FAIrAgMBAAGjgfMwgfAwDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVl
+oz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBTeRMWMrXJOPmghKlcEp0lPrACE
+8jA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2Vk
+dWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6
+Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAR
+BglghkgBhvhCAQEEBAMCBsAwDQYJKoZIhvcNAQEFBQADggEBAGI02zqTHQP4SHrF
+cCE35HpamKHY3c6EqsiLVVInsKAK3XGSlJgbr+ao7WryiXuayxopO/z+ioNxzeve
+Z8r7MUtlx/WjTq05kxdzVEjqCZvTjIe0rfpI6vnaoOW2BLkhnLk63pq9Yv0wUtA2
+WvfWgO+7ckZvWr1lAY4ZtM8ReSzSpE2Zgzj8LVegu5ZllBTdq0HK8FuLvjfBD5BM
+R05jQr92kSpWuJP3W73z5eJmhRjfkrsA/amYJ2tmR2cpOchaVUF/aWqifql4T4w9
+iwXgV22Ekaxei+vI9Lfz5w9hD/mLbFGUlA3TAs1c+7bYYCzkrpa1s0FE287zOLAL
+9QEPjwI=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIID2DCCAsACCQC6ske5V5+nWTANBgkqhkiG9w0BAQUFADCBrTEaMBgGA1UEChMR
+VW5pdmVyc2l0YWV0IEdyYXoxHzAdBgNVBAsTFkluZm9ybWF0aW9uc21hbmFnZW1l
+bnQxJDAiBgkqhkiG9w0BCQEWFWNlcnRhZG1pbkB1bmktZ3Jhei5hdDENMAsGA1UE
+BxMER3JhejEPMA0GA1UECBMGc3R5cmlhMQswCQYDVQQGEwJBVDEbMBkGA1UEAxMS
+emlkaWRwLnVuaS1ncmF6LmF0MB4XDTE0MDkxNzExMjU1OVoXDTM0MDkxMjExMjU1
+OVowga0xGjAYBgNVBAoTEVVuaXZlcnNpdGFldCBHcmF6MR8wHQYDVQQLExZJbmZv
+cm1hdGlvbnNtYW5hZ2VtZW50MSQwIgYJKoZIhvcNAQkBFhVjZXJ0YWRtaW5AdW5p
+LWdyYXouYXQxDTALBgNVBAcTBEdyYXoxDzANBgNVBAgTBnN0eXJpYTELMAkGA1UE
+BhMCQVQxGzAZBgNVBAMTEnppZGlkcC51bmktZ3Jhei5hdDCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKdi7feZnBDwtrWaXh17FKpVELVl+G+nCoAQ+6W9
+/Ypxhnil/DTw5FeTbEGsRY0FeaNuSCalAbnRoujSevkEfbnXEVjHH7Kenvq11N5J
+EWmt9im07Ed3DkI0CTBLKDsX/PSlORYC4wEttv2owTxXeb57uvcgBjx4kVjeYoFQ
+pgM2lOGy3Hor9t8rQPhggjBgsEi6tzz5BfTUiy/xDP6Ghxkrk33f7rHhRhR759u4
+xXGzdzgUsZtriMVnoOsqWk39SiFYB0p8RQOComQlp0B8sOuco6lP7X4bta90K5nI
+x2dPqrMjSBdCH+k1EQoqhwIqZSdiJvYqY1ujs8mSTsthq6sCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAUGdarc5KLh56hxfUD77PfvTO/N1t/mRyCxa+scH7EMr+98PW
+kktOoT3UOoAA9Z6A26wIVUBWCna551+Nd3MCBSooVPFxqWo+mGIj4ySnzslJbbv2
+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: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://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>
+MIID8TCCAtmgAwIBAgILAQAAAAABHJ3GXLgwDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
+bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
+MDkyNjA4Mjg1NFoXDTExMDkyNjA4Mjg1NFowgZwxCzAJBgNVBAYTAkFUMSgwJgYD
+VQQKEx9LYXJsLUZyYW56ZW5zLVVuaXZlcnNpdGFldCBHcmF6MQwwCgYDVQQLEwNa
+SUQxHjAcBgNVBAMTFXppZDEyOTE1Mi51bmktZ3Jhei5hdDEYMBYGA1UEAxMPaWRw
+LnVuaS1ncmF6LmF0MRswGQYDVQQDExJ6aWRpZHAudW5pLWdyYXouYXQwgZ8wDQYJ
+KoZIhvcNAQEBBQADgY0AMIGJAoGBALtSK1LsNVQ3eyIh4bS3fAmwjAHCzq1jd9NU
+wQFHrFPTzhObsZQM1Pc//QnTXH3x9bSAebR8WI+SmlRpe/p7BvGkEQDS45k6UZ7Y
+CicOizdCqN/iLr/XqwkUFcmVXN/mcoWFsc+637MUqj6O/Yl3f5jTRwacxUgn9pSs
+JHw9FAIrAgMBAAGjgfMwgfAwDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVl
+oz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBTeRMWMrXJOPmghKlcEp0lPrACE
+8jA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2Vk
+dWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6
+Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAR
+BglghkgBhvhCAQEEBAMCBsAwDQYJKoZIhvcNAQEFBQADggEBAGI02zqTHQP4SHrF
+cCE35HpamKHY3c6EqsiLVVInsKAK3XGSlJgbr+ao7WryiXuayxopO/z+ioNxzeve
+Z8r7MUtlx/WjTq05kxdzVEjqCZvTjIe0rfpI6vnaoOW2BLkhnLk63pq9Yv0wUtA2
+WvfWgO+7ckZvWr1lAY4ZtM8ReSzSpE2Zgzj8LVegu5ZllBTdq0HK8FuLvjfBD5BM
+R05jQr92kSpWuJP3W73z5eJmhRjfkrsA/amYJ2tmR2cpOchaVUF/aWqifql4T4w9
+iwXgV22Ekaxei+vI9Lfz5w9hD/mLbFGUlA3TAs1c+7bYYCzkrpa1s0FE287zOLAL
+9QEPjwI=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIID2DCCAsACCQC6ske5V5+nWTANBgkqhkiG9w0BAQUFADCBrTEaMBgGA1UEChMR
+VW5pdmVyc2l0YWV0IEdyYXoxHzAdBgNVBAsTFkluZm9ybWF0aW9uc21hbmFnZW1l
+bnQxJDAiBgkqhkiG9w0BCQEWFWNlcnRhZG1pbkB1bmktZ3Jhei5hdDENMAsGA1UE
+BxMER3JhejEPMA0GA1UECBMGc3R5cmlhMQswCQYDVQQGEwJBVDEbMBkGA1UEAxMS
+emlkaWRwLnVuaS1ncmF6LmF0MB4XDTE0MDkxNzExMjU1OVoXDTM0MDkxMjExMjU1
+OVowga0xGjAYBgNVBAoTEVVuaXZlcnNpdGFldCBHcmF6MR8wHQYDVQQLExZJbmZv
+cm1hdGlvbnNtYW5hZ2VtZW50MSQwIgYJKoZIhvcNAQkBFhVjZXJ0YWRtaW5AdW5p
+LWdyYXouYXQxDTALBgNVBAcTBEdyYXoxDzANBgNVBAgTBnN0eXJpYTELMAkGA1UE
+BhMCQVQxGzAZBgNVBAMTEnppZGlkcC51bmktZ3Jhei5hdDCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKdi7feZnBDwtrWaXh17FKpVELVl+G+nCoAQ+6W9
+/Ypxhnil/DTw5FeTbEGsRY0FeaNuSCalAbnRoujSevkEfbnXEVjHH7Kenvq11N5J
+EWmt9im07Ed3DkI0CTBLKDsX/PSlORYC4wEttv2owTxXeb57uvcgBjx4kVjeYoFQ
+pgM2lOGy3Hor9t8rQPhggjBgsEi6tzz5BfTUiy/xDP6Ghxkrk33f7rHhRhR759u4
+xXGzdzgUsZtriMVnoOsqWk39SiFYB0p8RQOComQlp0B8sOuco6lP7X4bta90K5nI
+x2dPqrMjSBdCH+k1EQoqhwIqZSdiJvYqY1ujs8mSTsthq6sCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAUGdarc5KLh56hxfUD77PfvTO/N1t/mRyCxa+scH7EMr+98PW
+kktOoT3UOoAA9Z6A26wIVUBWCna551+Nd3MCBSooVPFxqWo+mGIj4ySnzslJbbv2
+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: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="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
new file mode 100644
index 00000000..57ef95da
--- /dev/null
+++ b/swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml
@@ -0,0 +1,227 @@
+<?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>
+      <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
+BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
+WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
+MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
+MTExN1oXDTE5MDcwOTIzNTkwMFowgdgxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
+b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
+VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
+b3JtYXRpb25zdmVyYXJiZWl0dW5nMR8wHQYDVQQDExZ6aXZpZHAudW5pLW11ZW5z
+dGVyLmRlMScwJQYJKoZIhvcNAQkBFhh3d3dhZG1pbkB1bmktbXVlbnN0ZXIuZGUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDs1fLiqaQJyAodfjyh3/G5
+YN6BhkHxnfeqmvoq9IgdJdn4X/kYPo2Mm/qE1qKebW73YJcgJJ6UoIfORVdZIpdu
+q/0ijQQVwkplC07RGzhhlhgIOGmybMpHt4e5LTnmI1aBLI+ZFsLkc2nEY9lEhRBH
+rSsMfQS/2qNJ5Hd71X/ITjwIByDpjsorHBfa8qQfJWsa+C/M3NjP7maITpDVPZ2k
+u1wwoenTZRMn3Tzzte9nP+GcHxG+hMx5qCNKQPblBnuUinYvAPirMsMQZGM/ZthN
+ujIAkzq7wzLP5z+H9icc4Ap9vEoEWdBhvZY5aZU7HwFm6MnNOBYkRl/SMjNGOwvf
+AgMBAAGjggI6MIICNjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
+BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
+BQUHAwEwHQYDVR0OBBYEFNq4Ch52JoFfVrqS4GJd45Hr9MMgMB8GA1UdIwQYMBaA
+FL6eUaLJkny7YIvmsGhkd1pSGaEAMCEGA1UdEQQaMBiCFnppdmlkcC51bmktbXVl
+bnN0ZXIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUH
+AQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
+UC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
+Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBVWV/BKM9kUH2geEkG7sa9DYJwvkJgZvmZ
+uSs96xhhHGvJ/8q5ZDMc1C5bFYjdOW9oGz6wtMTaj/Re7KbhMDi4M7WMjQX4hYx+
+5WFoCdhgRIBkXS6Nfi+UHEWVo/BLUZzZiwg2bG5Z0RPIcaxJUq387s+Qf76SHm3f
+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
+BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
+WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
+MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
+MTExN1oXDTE5MDcwOTIzNTkwMFowgdgxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
+b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
+VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
+b3JtYXRpb25zdmVyYXJiZWl0dW5nMR8wHQYDVQQDExZ6aXZpZHAudW5pLW11ZW5z
+dGVyLmRlMScwJQYJKoZIhvcNAQkBFhh3d3dhZG1pbkB1bmktbXVlbnN0ZXIuZGUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDs1fLiqaQJyAodfjyh3/G5
+YN6BhkHxnfeqmvoq9IgdJdn4X/kYPo2Mm/qE1qKebW73YJcgJJ6UoIfORVdZIpdu
+q/0ijQQVwkplC07RGzhhlhgIOGmybMpHt4e5LTnmI1aBLI+ZFsLkc2nEY9lEhRBH
+rSsMfQS/2qNJ5Hd71X/ITjwIByDpjsorHBfa8qQfJWsa+C/M3NjP7maITpDVPZ2k
+u1wwoenTZRMn3Tzzte9nP+GcHxG+hMx5qCNKQPblBnuUinYvAPirMsMQZGM/ZthN
+ujIAkzq7wzLP5z+H9icc4Ap9vEoEWdBhvZY5aZU7HwFm6MnNOBYkRl/SMjNGOwvf
+AgMBAAGjggI6MIICNjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
+BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
+BQUHAwEwHQYDVR0OBBYEFNq4Ch52JoFfVrqS4GJd45Hr9MMgMB8GA1UdIwQYMBaA
+FL6eUaLJkny7YIvmsGhkd1pSGaEAMCEGA1UdEQQaMBiCFnppdmlkcC51bmktbXVl
+bnN0ZXIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUH
+AQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
+UC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
+Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBVWV/BKM9kUH2geEkG7sa9DYJwvkJgZvmZ
+uSs96xhhHGvJ/8q5ZDMc1C5bFYjdOW9oGz6wtMTaj/Re7KbhMDi4M7WMjQX4hYx+
+5WFoCdhgRIBkXS6Nfi+UHEWVo/BLUZzZiwg2bG5Z0RPIcaxJUq387s+Qf76SHm3f
+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
+BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
+WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
+MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
+MTExN1oXDTE5MDcwOTIzNTkwMFowgdgxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
+b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
+VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
+b3JtYXRpb25zdmVyYXJiZWl0dW5nMR8wHQYDVQQDExZ6aXZpZHAudW5pLW11ZW5z
+dGVyLmRlMScwJQYJKoZIhvcNAQkBFhh3d3dhZG1pbkB1bmktbXVlbnN0ZXIuZGUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDs1fLiqaQJyAodfjyh3/G5
+YN6BhkHxnfeqmvoq9IgdJdn4X/kYPo2Mm/qE1qKebW73YJcgJJ6UoIfORVdZIpdu
+q/0ijQQVwkplC07RGzhhlhgIOGmybMpHt4e5LTnmI1aBLI+ZFsLkc2nEY9lEhRBH
+rSsMfQS/2qNJ5Hd71X/ITjwIByDpjsorHBfa8qQfJWsa+C/M3NjP7maITpDVPZ2k
+u1wwoenTZRMn3Tzzte9nP+GcHxG+hMx5qCNKQPblBnuUinYvAPirMsMQZGM/ZthN
+ujIAkzq7wzLP5z+H9icc4Ap9vEoEWdBhvZY5aZU7HwFm6MnNOBYkRl/SMjNGOwvf
+AgMBAAGjggI6MIICNjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
+BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
+BQUHAwEwHQYDVR0OBBYEFNq4Ch52JoFfVrqS4GJd45Hr9MMgMB8GA1UdIwQYMBaA
+FL6eUaLJkny7YIvmsGhkd1pSGaEAMCEGA1UdEQQaMBiCFnppdmlkcC51bmktbXVl
+bnN0ZXIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUH
+AQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
+UC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
+Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBVWV/BKM9kUH2geEkG7sa9DYJwvkJgZvmZ
+uSs96xhhHGvJ/8q5ZDMc1C5bFYjdOW9oGz6wtMTaj/Re7KbhMDi4M7WMjQX4hYx+
+5WFoCdhgRIBkXS6Nfi+UHEWVo/BLUZzZiwg2bG5Z0RPIcaxJUq387s+Qf76SHm3f
+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
+BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
+WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
+MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
+MTExN1oXDTE5MDcwOTIzNTkwMFowgdgxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
+b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
+VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
+b3JtYXRpb25zdmVyYXJiZWl0dW5nMR8wHQYDVQQDExZ6aXZpZHAudW5pLW11ZW5z
+dGVyLmRlMScwJQYJKoZIhvcNAQkBFhh3d3dhZG1pbkB1bmktbXVlbnN0ZXIuZGUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDs1fLiqaQJyAodfjyh3/G5
+YN6BhkHxnfeqmvoq9IgdJdn4X/kYPo2Mm/qE1qKebW73YJcgJJ6UoIfORVdZIpdu
+q/0ijQQVwkplC07RGzhhlhgIOGmybMpHt4e5LTnmI1aBLI+ZFsLkc2nEY9lEhRBH
+rSsMfQS/2qNJ5Hd71X/ITjwIByDpjsorHBfa8qQfJWsa+C/M3NjP7maITpDVPZ2k
+u1wwoenTZRMn3Tzzte9nP+GcHxG+hMx5qCNKQPblBnuUinYvAPirMsMQZGM/ZthN
+ujIAkzq7wzLP5z+H9icc4Ap9vEoEWdBhvZY5aZU7HwFm6MnNOBYkRl/SMjNGOwvf
+AgMBAAGjggI6MIICNjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
+BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
+BQUHAwEwHQYDVR0OBBYEFNq4Ch52JoFfVrqS4GJd45Hr9MMgMB8GA1UdIwQYMBaA
+FL6eUaLJkny7YIvmsGhkd1pSGaEAMCEGA1UdEQQaMBiCFnppdmlkcC51bmktbXVl
+bnN0ZXIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUH
+AQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
+UC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
+Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBVWV/BKM9kUH2geEkG7sa9DYJwvkJgZvmZ
+uSs96xhhHGvJ/8q5ZDMc1C5bFYjdOW9oGz6wtMTaj/Re7KbhMDi4M7WMjQX4hYx+
+5WFoCdhgRIBkXS6Nfi+UHEWVo/BLUZzZiwg2bG5Z0RPIcaxJUq387s+Qf76SHm3f
+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>